diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 9835b7654612..093239566ce3 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -26,17 +26,18 @@ /lib/asserts.nix @edolstra @nbp @Profpatsch # Nixpkgs Internals -/default.nix @nbp -/pkgs/top-level/default.nix @nbp @Ericson2314 -/pkgs/top-level/impure.nix @nbp @Ericson2314 -/pkgs/top-level/stage.nix @nbp @Ericson2314 @matthewbauer -/pkgs/top-level/splice.nix @Ericson2314 @matthewbauer -/pkgs/top-level/release-cross.nix @Ericson2314 @matthewbauer -/pkgs/stdenv/generic @Ericson2314 @matthewbauer -/pkgs/stdenv/cross @Ericson2314 @matthewbauer -/pkgs/build-support/cc-wrapper @Ericson2314 @orivej -/pkgs/build-support/bintools-wrapper @Ericson2314 @orivej -/pkgs/build-support/setup-hooks @Ericson2314 +/default.nix @nbp +/pkgs/top-level/default.nix @nbp @Ericson2314 +/pkgs/top-level/impure.nix @nbp @Ericson2314 +/pkgs/top-level/stage.nix @nbp @Ericson2314 @matthewbauer +/pkgs/top-level/splice.nix @Ericson2314 @matthewbauer +/pkgs/top-level/release-cross.nix @Ericson2314 @matthewbauer +/pkgs/stdenv/generic @Ericson2314 @matthewbauer +/pkgs/stdenv/cross @Ericson2314 @matthewbauer +/pkgs/build-support/cc-wrapper @Ericson2314 @orivej +/pkgs/build-support/bintools-wrapper @Ericson2314 @orivej +/pkgs/build-support/setup-hooks @Ericson2314 +/pkgs/build-support/setup-hooks/auto-patchelf.sh @aszlig # Nixpkgs build-support /pkgs/build-support/writers @lassulus @Profpatsch @@ -220,3 +221,6 @@ /pkgs/development/compilers/go @kalbasit @Mic92 @zowoq /pkgs/development/go-modules @kalbasit @Mic92 @zowoq /pkgs/development/go-packages @kalbasit @Mic92 @zowoq + +# Cinnamon +/pkgs/desktops/cinnamon @mkg20001 diff --git a/.github/workflows/editorconfig.yml b/.github/workflows/editorconfig.yml index 6935d0bbd21f..270728a61c6f 100644 --- a/.github/workflows/editorconfig.yml +++ b/.github/workflows/editorconfig.yml @@ -25,7 +25,7 @@ jobs: - name: Fetch editorconfig-checker if: env.PR_DIFF env: - ECC_VERSION: "2.2.0" + ECC_VERSION: "2.3.1" 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" && \ diff --git a/.github/workflows/manual-nixos.yml b/.github/workflows/manual-nixos.yml new file mode 100644 index 000000000000..a75e84029301 --- /dev/null +++ b/.github/workflows/manual-nixos.yml @@ -0,0 +1,28 @@ +name: "Build NixOS manual" + +on: + pull_request_target: + branches: + - master + paths: + - 'nixos/**' + +jobs: + nixos: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + with: + # pull_request_target checks out the base branch by default + ref: refs/pull/${{ github.event.pull_request.number }}/merge + - uses: cachix/install-nix-action@v12 + with: + # explicitly enable sandbox + extra_nix_config: sandbox = true + - uses: cachix/cachix-action@v8 + with: + # This cache is for the nixos/nixpkgs manual builds and should not be trusted or used elsewhere. + name: nixpkgs-ci + signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}' + - name: Building NixOS manual + run: NIX_PATH=nixpkgs=$(pwd) nix-build --option restrict-eval true nixos/release.nix -A manual.x86_64-linux diff --git a/.github/workflows/manual-nixpkgs.yml b/.github/workflows/manual-nixpkgs.yml new file mode 100644 index 000000000000..7596719d9b50 --- /dev/null +++ b/.github/workflows/manual-nixpkgs.yml @@ -0,0 +1,28 @@ +name: "Build Nixpkgs manual" + +on: + pull_request_target: + branches: + - master + paths: + - 'doc/**' + +jobs: + nixpkgs: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + with: + # pull_request_target checks out the base branch by default + ref: refs/pull/${{ github.event.pull_request.number }}/merge + - uses: cachix/install-nix-action@v12 + with: + # explicitly enable sandbox + extra_nix_config: sandbox = true + - uses: cachix/cachix-action@v8 + with: + # This cache is for the nixos/nixpkgs manual builds and should not be trusted or used elsewhere. + name: nixpkgs-ci + signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}' + - name: Building Nixpkgs manual + run: NIX_PATH=nixpkgs=$(pwd) nix-build --option restrict-eval true pkgs/top-level/release.nix -A manual diff --git a/.github/workflows/rebase-staging.yml b/.github/workflows/rebase-staging.yml index 8214787778ed..41b06f95668a 100644 --- a/.github/workflows/rebase-staging.yml +++ b/.github/workflows/rebase-staging.yml @@ -11,6 +11,10 @@ jobs: runs-on: ubuntu-latest if: github.repository_owner == 'NixOS' && github.event.issue.pull_request != '' && contains(github.event.comment.body, '/rebase-staging') steps: + - uses: peter-evans/create-or-update-comment@v1 + with: + comment-id: ${{ github.event.comment.id }} + reactions: eyes - uses: scherermichael-oss/action-has-permission@1.0.6 id: check-write-access with: diff --git a/COPYING b/COPYING index a422167e1174..fe46c6a1d82d 100644 --- a/COPYING +++ b/COPYING @@ -1,4 +1,4 @@ -Copyright (c) 2003-2020 Eelco Dolstra and the Nixpkgs/NixOS contributors +Copyright (c) 2003-2021 Eelco Dolstra and the Nixpkgs/NixOS contributors Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the diff --git a/doc/builders/packages/cataclysm-dda.section.md b/doc/builders/packages/cataclysm-dda.section.md index ae2ee56a010e..1173fe32adae 100644 --- a/doc/builders/packages/cataclysm-dda.section.md +++ b/doc/builders/packages/cataclysm-dda.section.md @@ -1,4 +1,4 @@ -# Cataclysm: Dark Days Ahead +# Cataclysm: Dark Days Ahead {#cataclysm-dark-days-ahead} ## How to install Cataclysm DDA diff --git a/doc/builders/packages/emacs.section.md b/doc/builders/packages/emacs.section.md index e9b89d086d68..b4723a22bb1c 100644 --- a/doc/builders/packages/emacs.section.md +++ b/doc/builders/packages/emacs.section.md @@ -2,12 +2,12 @@ ## Configuring Emacs {#sec-emacs-config} -The Emacs package comes with some extra helpers to make it easier to configure. `emacsWithPackages` allows you to manage packages from ELPA. This means that you will not have to install that packages from within Emacs. For instance, if you wanted to use `company` `counsel`, `flycheck`, `ivy`, `magit`, `projectile`, and `use-package` you could use this as a `~/.config/nixpkgs/config.nix` override: +The Emacs package comes with some extra helpers to make it easier to configure. `emacs.pkgs.withPackages` allows you to manage packages from ELPA. This means that you will not have to install that packages from within Emacs. For instance, if you wanted to use `company` `counsel`, `flycheck`, `ivy`, `magit`, `projectile`, and `use-package` you could use this as a `~/.config/nixpkgs/config.nix` override: ```nix { packageOverrides = pkgs: with pkgs; { - myEmacs = emacsWithPackages (epkgs: (with epkgs.melpaStablePackages; [ + myEmacs = emacs.pkgs.withPackages (epkgs: (with epkgs.melpaStablePackages; [ company counsel flycheck @@ -84,7 +84,7 @@ You can install it like any other packages via `nix-env -iA myEmacs`. However, t (projectile-global-mode)) ''; - myEmacs = emacsWithPackages (epkgs: (with epkgs.melpaStablePackages; [ + myEmacs = emacs.pkgs.withPackages (epkgs: (with epkgs.melpaStablePackages; [ (runCommand "default.el" {} '' mkdir -p $out/share/emacs/site-lisp cp ${myEmacsConfig} $out/share/emacs/site-lisp/default.el @@ -103,14 +103,14 @@ You can install it like any other packages via `nix-env -iA myEmacs`. However, t This provides a fairly full Emacs start file. It will load in addition to the user's presonal config. You can always disable it by passing `-q` to the Emacs command. -Sometimes `emacsWithPackages` is not enough, as this package set has some priorities imposed on packages (with the lowest priority assigned to Melpa Unstable, and the highest for packages manually defined in `pkgs/top-level/emacs-packages.nix`). But you can't control this priorities when some package is installed as a dependency. You can override it on per-package-basis, providing all the required dependencies manually - but it's tedious and there is always a possibility that an unwanted dependency will sneak in through some other package. To completely override such a package you can use `overrideScope'`. +Sometimes `emacs.pkgs.withPackages` is not enough, as this package set has some priorities imposed on packages (with the lowest priority assigned to Melpa Unstable, and the highest for packages manually defined in `pkgs/top-level/emacs-packages.nix`). But you can't control this priorities when some package is installed as a dependency. You can override it on per-package-basis, providing all the required dependencies manually - but it's tedious and there is always a possibility that an unwanted dependency will sneak in through some other package. To completely override such a package you can use `overrideScope'`. ```nix overrides = self: super: rec { haskell-mode = self.melpaPackages.haskell-mode; ... }; -((emacsPackagesGen emacs).overrideScope' overrides).emacsWithPackages +((emacsPackagesFor emacs).overrideScope' overrides).emacs.pkgs.withPackages (p: with p; [ # here both these package will use haskell-mode of our own choice ghc-mod diff --git a/doc/builders/packages/fish.section.md b/doc/builders/packages/fish.section.md new file mode 100644 index 000000000000..3086bd68348f --- /dev/null +++ b/doc/builders/packages/fish.section.md @@ -0,0 +1,50 @@ +# Fish {#sec-fish} + +Fish is a "smart and user-friendly command line shell" with support for plugins. + + +## Vendor Fish scripts {#sec-fish-vendor} + +Any package may ship its own Fish completions, configuration snippets, and +functions. Those should be installed to +`$out/share/fish/vendor_{completions,conf,functions}.d` respectively. + +When the `programs.fish.enable` and +`programs.fish.vendor.{completions,config,functions}.enable` options from the +NixOS Fish module are set to true, those paths are symlinked in the current +system environment and automatically loaded by Fish. + + +## Packaging Fish plugins {#sec-fish-plugins-pkg} + +While packages providing standalone executables belong to the top level, +packages which have the sole purpose of extending Fish belong to the +`fishPlugins` scope and should be registered in +`pkgs/shells/fish/plugins/default.nix`. + +The `buildFishPlugin` utility function can be used to automatically copy Fish +scripts from `$src/{completions,conf,conf.d,functions}` to the standard vendor +installation paths. It also sets up the test environment so that the optional +`checkPhase` is executed in a Fish shell with other already packaged plugins +and package-local Fish functions specified in `checkPlugins` and +`checkFunctionDirs` respectively. + +See `pkgs/shells/fish/plugins/pure.nix` for an example of Fish plugin package +using `buildFishPlugin` and running unit tests with the `fishtape` test runner. + + +## Fish wrapper {#sec-fish-wrapper} + +The `wrapFish` package is a wrapper around Fish which can be used to create +Fish shells initialised with some plugins as well as completions, configuration +snippets and functions sourced from the given paths. This provides a convenient +way to test Fish plugins and scripts without having to alter the environment. + +```nix +wrapFish { + pluginPkgs = with fishPlugins; [ pure foreign-env ]; + completionDirs = []; + functionDirs = []; + confDirs = [ "/path/to/some/fish/init/dir/" ]; +} +``` diff --git a/doc/builders/packages/index.xml b/doc/builders/packages/index.xml index 732560ec1992..ab335e24ff99 100644 --- a/doc/builders/packages/index.xml +++ b/doc/builders/packages/index.xml @@ -11,6 +11,7 @@ + diff --git a/doc/builders/trivial-builders.chapter.md b/doc/builders/trivial-builders.chapter.md index c39803fbe339..32944567c053 100644 --- a/doc/builders/trivial-builders.chapter.md +++ b/doc/builders/trivial-builders.chapter.md @@ -37,7 +37,7 @@ This works just like `runCommand`. The only difference is that it also provides Variant of `runCommand` that forces the derivation to be built locally, it is not substituted. This is intended for very cheap commands (<1s execution time). It saves on the network roundrip and can speed up a build. -::: {.note} +::: note This sets [`allowSubstitutes` to `false`](https://nixos.org/nix/manual/#adv-attr-allowSubstitutes), so only use `runCommandLocal` if you are certain the user will always have a builder for the `system` of the derivation. This should be true for most trivial use cases (e.g. just copying some files to a different location or adding symlinks), because there the `system` is usually the same as `builtins.currentSystem`. ::: diff --git a/doc/contributing/coding-conventions.xml b/doc/contributing/coding-conventions.xml index e587275a6383..cb6d60c2c138 100644 --- a/doc/contributing/coding-conventions.xml +++ b/doc/contributing/coding-conventions.xml @@ -178,6 +178,15 @@ args.stdenv.mkDerivation (args // { + + + Prefer using the top-level lib over its alias + stdenv.lib. lib is unrelated to + stdenv, and so stdenv.lib should only + be used as a convenience alias when developing to avoid having to modify + the function inputs just to test something out. + +
diff --git a/doc/languages-frameworks/agda.section.md b/doc/languages-frameworks/agda.section.md index 5ba4e285f424..66b4a2083021 100644 --- a/doc/languages-frameworks/agda.section.md +++ b/doc/languages-frameworks/agda.section.md @@ -1,9 +1,4 @@ ---- -title: Agda -author: Alex Rice (alexarice) -date: 2020-01-06 ---- -# Agda +# Agda {#agda} ## How to use Agda diff --git a/doc/languages-frameworks/android.section.md b/doc/languages-frameworks/android.section.md index f4f6c086a805..62e544cd48b6 100644 --- a/doc/languages-frameworks/android.section.md +++ b/doc/languages-frameworks/android.section.md @@ -1,9 +1,4 @@ ---- -title: Android -author: Sander van der Burg -date: 2018-11-18 ---- -# Android +# Android {#android} The Android build environment provides three major features and a number of supporting features. @@ -18,21 +13,19 @@ with import {}; let androidComposition = androidenv.composeAndroidPackages { - toolsVersion = "25.2.5"; - platformToolsVersion = "27.0.1"; - buildToolsVersions = [ "27.0.3" ]; + toolsVersion = "26.1.1"; + platformToolsVersion = "30.0.5"; + buildToolsVersions = [ "30.0.3" ]; includeEmulator = false; - emulatorVersion = "27.2.0"; - platformVersions = [ "24" ]; + emulatorVersion = "30.3.4"; + platformVersions = [ "28" "29" "30" ]; includeSources = false; - includeDocs = false; includeSystemImages = false; - systemImageTypes = [ "default" ]; - abiVersions = [ "armeabi-v7a" ]; - lldbVersions = [ "2.0.2558144" ]; - cmakeVersions = [ "3.6.4111459" ]; - includeNDK = false; - ndkVersion = "16.1.4479499"; + systemImageTypes = [ "google_apis_playstore" ]; + abiVersions = [ "armeabi-v7a" "arm64-v8a" ]; + cmakeVersions = [ "3.10.2" ]; + includeNDK = true; + ndkVersion = "22.0.7026061"; useGoogleAPIs = false; useGoogleTVAddOns = false; includeExtras = [ @@ -51,13 +44,11 @@ The following parameters are supported: * `toolsVersion`, specifies the version of the tools package to use * `platformsToolsVersion` specifies the version of the `platform-tools` plugin -* `buildToolsVersion` specifies the versions of the `build-tools` plugins to +* `buildToolsVersions` specifies the versions of the `build-tools` plugins to use. * `includeEmulator` specifies whether to deploy the emulator package (`false` by default). When enabled, the version of the emulator to deploy can be specified by setting the `emulatorVersion` parameter. -* `includeDocs` specifies whether the documentation catalog should be included. -* `lldbVersions` specifies what LLDB versions should be deployed. * `cmakeVersions` specifies which CMake versions should be deployed. * `includeNDK` specifies that the Android NDK bundle should be included. Defaults to: `false`. @@ -87,6 +78,38 @@ For each requested system image we can specify the following options: Most of the function arguments have reasonable default settings. +You can specify license names: + +* `extraLicenses` is a list of of license names. + You can get these names from repo.json or `querypackages.sh licenses`. The SDK + license (`android-sdk-license`) is accepted for you if you set accept_license + to true. If you are doing something like working with preview SDKs, you will + want to add `android-sdk-preview-license` or whichever license applies here. + +Additionally, you can override the repositories that composeAndroidPackages will +pull from: + +* `repoJson` specifies a path to a generated repo.json file. You can generate this + by running `generate.sh`, which in turn will call into `mkrepo.rb`. +* `repoXmls` is an attribute set containing paths to repo XML files. If specified, + it takes priority over `repoJson`, and will trigger a local build writing out a + repo.json to the Nix store based on the given repository XMLs. + +```nix +repoXmls = { + packages = [ ./xml/repository2-1.xml ]; + images = [ + ./xml/android-sys-img2-1.xml + ./xml/android-tv-sys-img2-1.xml + ./xml/android-wear-sys-img2-1.xml + ./xml/android-wear-cn-sys-img2-1.xml + ./xml/google_apis-sys-img2-1.xml + ./xml/google_apis_playstore-sys-img2-1.xml + ]; + addons = [ ./xml/addon2-1.xml ]; +}; +``` + When building the above expression with: ```bash @@ -109,8 +132,8 @@ in androidComposition.platform-tools ``` -Using predefine Android package compositions --------------------------------------------- +Using predefined Android package compositions +--------------------------------------------- In addition to composing an Android package set manually, it is also possible to use a predefined composition that contains all basic packages for a specific Android version, such as version 9.0 (API-level 28). @@ -214,27 +237,104 @@ androidenv.emulateApp { In addition to prebuilt APKs, you can also bind the APK parameter to a `buildApp {}` function invocation shown in the previous example. +Notes on environment variables in Android projects +-------------------------------------------------- +* `ANDROID_SDK_ROOT` should point to the Android SDK. In your Nix expressions, this should be + `${androidComposition.androidsdk}/libexec/android-sdk`. Note that `ANDROID_HOME` is deprecated, + but if you rely on tools that need it, you can export it too. +* `ANDROID_NDK_ROOT` should point to the Android NDK, if you're doing NDK development. + In your Nix expressions, this should be `${ANDROID_SDK_ROOT}/ndk-bundle`. + +If you are running the Android Gradle plugin, you need to export GRADLE_OPTS to override aapt2 +to point to the aapt2 binary in the Nix store as well, or use a FHS environment so the packaged +aapt2 can run. If you don't want to use a FHS environment, something like this should work: + +```nix +let + buildToolsVersion = "30.0.3"; + + # Use buildToolsVersion when you define androidComposition + androidComposition = <...>; +in +pkgs.mkShell rec { + ANDROID_SDK_ROOT = "${androidComposition.androidsdk}/libexec/android-sdk"; + ANDROID_NDK_ROOT = "${ANDROID_SDK_ROOT}/ndk-bundle"; + + # Use the same buildToolsVersion here + GRADLE_OPTS = "-Dorg.gradle.project.android.aapt2FromMavenOverride=${ANDROID_SDK_ROOT}/build-tools/${buildToolsVersion}/aapt2"; +} +``` + +If you are using cmake, you need to add it to PATH in a shell hook or FHS env profile. +The path is suffixed with a build number, but properly prefixed with the version. +So, something like this should suffice: + +```nix +let + cmakeVersion = "3.10.2"; + + # Use cmakeVersion when you define androidComposition + androidComposition = <...>; +in +pkgs.mkShell rec { + ANDROID_SDK_ROOT = "${androidComposition.androidsdk}/libexec/android-sdk"; + ANDROID_NDK_ROOT = "${ANDROID_SDK_ROOT}/ndk-bundle"; + + # Use the same cmakeVersion here + shellHook = '' + export PATH="$(echo "$ANDROID_SDK_ROOT/cmake/${cmakeVersion}".*/bin):$PATH" + ''; +} +``` + +Note that running Android Studio with ANDROID_SDK_ROOT set will automatically write a +`local.properties` file with `sdk.dir` set to $ANDROID_SDK_ROOT if one does not already +exist. If you are using the NDK as well, you may have to add `ndk.dir` to this file. + +An example shell.nix that does all this for you is provided in examples/shell.nix. +This shell.nix includes a shell hook that overwrites local.properties with the correct +sdk.dir and ndk.dir values. This will ensure that the SDK and NDK directories will +both be correct when you run Android Studio inside nix-shell. + +Notes on improving build.gradle compatibility +--------------------------------------------- +Ensure that your buildToolsVersion and ndkVersion match what is declared in androidenv. +If you are using cmake, make sure its declared version is correct too. + +Otherwise, you may get cryptic errors from aapt2 and the Android Gradle plugin warning +that it cannot install the build tools because the SDK directory is not writeable. + +```gradle +android { + buildToolsVersion "30.0.3" + ndkVersion = "22.0.7026061" + externalNativeBuild { + cmake { + version "3.10.2" + } + } +} + +``` + Querying the available versions of each plugin ---------------------------------------------- -When using any of the previously shown functions, it may be a bit inconvenient -to find out what options are supported, since the Android SDK provides many -plugins. +repo.json provides all the options in one file now. -A shell script in the `pkgs/development/mobile/androidenv/` sub directory can be used to retrieve all +A shell script in the `pkgs/development/mobile/androidenv/` subdirectory can be used to retrieve all possible options: ```bash -sh ./querypackages.sh packages build-tools +./querypackages.sh packages ``` -The above command-line instruction queries all build-tools versions in the -generated `packages.nix` expression. +The above command-line instruction queries all package versions in repo.json. Updating the generated expressions ---------------------------------- -Most of the Nix expressions are generated from XML files that the Android -package manager uses. To update the expressions run the `generate.sh` script -that is stored in the `pkgs/development/mobile/androidenv/` sub directory: +repo.json is generated from XML files that the Android Studio package manager uses. +To update the expressions run the `generate.sh` script that is stored in the +`pkgs/development/mobile/androidenv/` subdirectory: ```bash ./generate.sh diff --git a/doc/languages-frameworks/coq.section.md b/doc/languages-frameworks/coq.section.md index 714e84efc8db..5e16a4c546a3 100644 --- a/doc/languages-frameworks/coq.section.md +++ b/doc/languages-frameworks/coq.section.md @@ -1,40 +1,79 @@ -# Coq {#sec-language-coq} +# Coq and coq packages {#sec-language-coq} -Coq libraries should be installed in `$(out)/lib/coq/${coq.coq-version}/user-contrib/`. Such directories are automatically added to the `$COQPATH` environment variable by the hook defined in the Coq derivation. +## Coq derivation: `coq` -Some extensions (plugins) might require OCaml and sometimes other OCaml packages. The `coq.ocamlPackages` attribute can be used to depend on the same package set Coq was built against. +The Coq derivation is overridable through the `coq.override overrides`, where overrides is an attribute set which contains the arguments to override. We recommend overriding either of the following -Coq libraries may be compatible with some specific versions of Coq only. The `compatibleCoqVersions` attribute is used to precisely select those versions of Coq that are compatible with this derivation. +* `version` (optional, defaults to the latest version of Coq selected for nixpkgs, see `pkgs/top-level/coq-packages` to witness this choice), which follows the conventions explained in the `coqPackages` section below, +* `customOCamlPackage` (optional, defaults to `null`, which lets Coq choose a version automatically), which can be set to any of the ocaml packages attribute of `ocaml-ng` (such as `ocaml-ng.ocamlPackages_4_10` which is the default for Coq 8.11 for example). +* `coq-version` (optional, defaults to the short version e.g. "8.10"), is a version number of the form "x.y" that indicates which Coq's version build behavior to mimic when using a source which is not a release. E.g. `coq.override { version = "d370a9d1328a4e1cdb9d02ee032f605a9d94ec7a"; coq-version = "8.10"; }`. -Here is a simple package example. It is a pure Coq library, thus it depends on Coq. It builds on the Mathematical Components library, thus it also takes `mathcomp` as `buildInputs`. Its `Makefile` has been generated using `coq_makefile` so we only have to set the `$COQLIB` variable at install time. +## Coq packages attribute sets: `coqPackages` + +The recommended way of defining a derivation for a Coq library, is to use the `coqPackages.mkCoqDerivation` function, which is essentially a specialization of `mkDerivation` taking into account most of the specifics of Coq libraries. The following attributes are supported: + +* `pname` (required) is the name of the package, +* `version` (optional, defaults to `null`), is the version to fetch and build, + this attribute is interpreted in several ways depending on its type and pattern: + * if it is a known released version string, i.e. from the `release` attribute below, the according release is picked, and the `version` attribute of the resulting derivation is set to this release string, + * if it is a majorMinor `"x.y"` prefix of a known released version (as defined above), then the latest `"x.y.z"` known released version is selected (for the ordering given by `versionAtLeast`), + * if it is a path or a string representing an absolute path (i.e. starting with `"/"`), the provided path is selected as a source, and the `version` attribute of the resulting derivation is set to `"dev"`, + * if it is a string of the form `owner:branch` then it tries to download the `branch` of owner `owner` for a project of the same name using the same vcs, and the `version` attribute of the resulting derivation is set to `"dev"`, additionally if the owner is not provided (i.e. if the `owner:` prefix is missing), it defaults to the original owner of the package (see below), + * if it is a string of the form `"#N"`, and the domain is github, then it tries to download the current head of the pull request `#N` from github, +* `defaultVersion` (optional). Coq libraries may be compatible with some specific versions of Coq only. The `defaultVersion` attribute is used when no `version` is provided (or if `version = null`) to select the version of the library to use by default, depending on the context. This selection will mainly depend on a `coq` version number but also possibly on other packages versions (e.g. `mathcomp`). If its value ends up to be `null`, the package is marked for removal in end-user `coqPackages` attribute set. +* `release` (optional, defaults to `{}`), lists all the known releases of the library and for each of them provides an attribute set with at least a `sha256` attribute (you may use the shell command `nix-prefetch-url --unpack ` to find it, where `` is for example `https://github.com/owner/repo/archive/version.tar.gz`), each attribute set of the list of releases also takes optional overloading arguments for the fetcher as below (i.e.`domain`, `owner`, `repo`, `rev` assuming the default fetcher is used) and optional overrides for the result of the fetcher (i.e. `version` and `src`). +* `fetcher` (optional, default to a generic fetching mechanism supporting github or gitlab based infrastructures), is a function that takes at least an `owner`, a `repo`, a `rev`, and a `sha256` and returns an attribute set with a `version` and `src`. +* `repo` (optional, defaults to the value of `pname`), +* `owner` (optional, defaults to `"coq-community"`). +* `domain` (optional, defaults to `"github.com"`), domains including the strings `"github"` or `"gitlab"` in their names are automatically supported, otherwise, one must change the `fetcher` argument to support them (cf `pkgs/development/coq-modules/heq/default.nix` for an example), +* `releaseRev` (optional, defaults to `(v: v)`), provides a default mapping from release names to revision hashes/branch names/tags, +* `displayVersion` (optional), provides a way to alter the computation of `name` from `pname`, by explaining how to display version numbers, +* `namePrefix` (optional), provides a way to alter the computation of `name` from `pname`, by explaining which dependencies must occur in `name`, +* `extraBuildInputs` (optional), by default `buildInputs` just contains `coq`, this allows to add more build inputs, +* `mlPlugin` (optional, defaults to `false`). Some extensions (plugins) might require OCaml and sometimes other OCaml packages. Standard dependencies can be added by setting the current option to `true`. For a finer grain control, the `coq.ocamlPackages` attribute can be used in `extraBuildInputs` to depend on the same package set Coq was built against. +* `enableParallelBuilding` (optional, defaults to `true`), since it is activated by default, we provide a way to disable it. +* `extraInstallFlags` (optional), allows to extend `installFlags` which initializes the variable `COQMF_COQLIB` so as to install in the proper subdirectory. Indeed Coq libraries should be installed in `$(out)/lib/coq/${coq.coq-version}/user-contrib/`. Such directories are automatically added to the `$COQPATH` environment variable by the hook defined in the Coq derivation. +* `setCOQBIN` (optional, defaults to `true`), by default, the environment variable `$COQBIN` is set to the current Coq's binary, but one can disable this behavior by setting it to `false`, +* `useMelquiondRemake` (optional, default to `null`) is an attribute set, which, if given, overloads the `preConfigurePhases`, `configureFlags`, `buildPhase`, and `installPhase` attributes of the derivation for a specific use in libraries using `remake` as set up by Guillaume Melquiond for `flocq`, `gappalib`, `interval`, and `coquelicot` (see the corresponding derivation for concrete examples of use of this option). For backward compatibility, the attribute `useMelquiondRemake.logpath` must be set to the logical root of the library (otherwise, one can pass `useMelquiondRemake = {}` to activate this without backward compatibility). +* `dropAttrs`, `keepAttrs`, `dropDerivationAttrs` are all optional and allow to tune which attribute is added or removed from the final call to `mkDerivation`. + +It also takes other standard `mkDerivation` attributes, they are added as such, except for `meta` which extends an automatically computed `meta` (where the `platform` is the same as `coq` and the homepage is automatically computed). + +Here is a simple package example. It is a pure Coq library, thus it depends on Coq. It builds on the Mathematical Components library, thus it also takes some `mathcomp` derivations as `extraBuildInputs`. ```nix -{ stdenv, fetchFromGitHub, coq, mathcomp }: - -stdenv.mkDerivation rec { - name = "coq${coq.coq-version}-multinomials-${version}"; - version = "1.0"; - src = fetchFromGitHub { - owner = "math-comp"; - repo = "multinomials"; - rev = version; - sha256 = "1qmbxp1h81cy3imh627pznmng0kvv37k4hrwi2faa101s6bcx55m"; +{ coq, mkCoqDerivation, mathcomp, mathcomp-finmap, mathcomp-bigenough, + lib, version ? null }: +with lib; mkCoqDerivation { + /* namePrefix leads to e.g. `name = coq8.11-mathcomp1.11-multinomials-1.5.2` */ + namePrefix = [ "coq" "mathcomp" ]; + pname = "multinomials"; + owner = "math-comp"; + inherit version; + defaultVersion = with versions; switch [ coq.version mathcomp.version ] [ + { cases = [ (range "8.7" "8.12") "1.11.0" ]; out = "1.5.2"; } + { cases = [ (range "8.7" "8.11") (range "1.8" "1.10") ]; out = "1.5.0"; } + { cases = [ (range "8.7" "8.10") (range "1.8" "1.10") ]; out = "1.4"; } + { cases = [ "8.6" (range "1.6" "1.7") ]; out = "1.1"; } + ] null; + release = { + "1.5.2".sha256 = "15aspf3jfykp1xgsxf8knqkxv8aav2p39c2fyirw7pwsfbsv2c4s"; + "1.5.1".sha256 = "13nlfm2wqripaq671gakz5mn4r0xwm0646araxv0nh455p9ndjs3"; + "1.5.0".sha256 = "064rvc0x5g7y1a0nip6ic91vzmq52alf6in2bc2dmss6dmzv90hw"; + "1.5.0".rev = "1.5"; + "1.4".sha256 = "0vnkirs8iqsv8s59yx1fvg1nkwnzydl42z3scya1xp1b48qkgn0p"; + "1.3".sha256 = "0l3vi5n094nx3qmy66hsv867fnqm196r8v605kpk24gl0aa57wh4"; + "1.2".sha256 = "1mh1w339dslgv4f810xr1b8v2w7rpx6fgk9pz96q0fyq49fw2xcq"; + "1.1".sha256 = "1q8alsm89wkc0lhcvxlyn0pd8rbl2nnxg81zyrabpz610qqjqc3s"; + "1.0".sha256 = "1qmbxp1h81cy3imh627pznmng0kvv37k4hrwi2faa101s6bcx55m"; }; - buildInputs = [ coq ]; - propagatedBuildInputs = [ mathcomp ]; - - installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/"; + propagatedBuildInputs = + [ mathcomp.ssreflect mathcomp.algebra mathcomp-finmap mathcomp-bigenough ]; meta = { description = "A Coq/SSReflect Library for Monoidal Rings and Multinomials"; - inherit (src.meta) homepage; - license = stdenv.lib.licenses.cecill-b; - inherit (coq.meta) platforms; - }; - - passthru = { - compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" ]; + license = licenses.cecill-c; }; } ``` diff --git a/doc/languages-frameworks/crystal.section.md b/doc/languages-frameworks/crystal.section.md index af0853dbf75b..74790132974a 100644 --- a/doc/languages-frameworks/crystal.section.md +++ b/doc/languages-frameworks/crystal.section.md @@ -1,4 +1,4 @@ -# Crystal +# Crystal {#crystal} ## Building a Crystal package diff --git a/doc/languages-frameworks/emscripten.section.md b/doc/languages-frameworks/emscripten.section.md index 3663f962d5f2..a5c15b43ac89 100644 --- a/doc/languages-frameworks/emscripten.section.md +++ b/doc/languages-frameworks/emscripten.section.md @@ -1,4 +1,4 @@ -# Emscripten +# Emscripten {#emscripten} [Emscripten](https://github.com/kripken/emscripten): An LLVM-to-JavaScript Compiler @@ -102,7 +102,7 @@ See the `zlib` example: echo "================= /testing zlib using node =================" ''; - postPatch = pkgs.stdenv.lib.optionalString pkgs.stdenv.isDarwin '' + postPatch = pkgs.lib.optionalString pkgs.stdenv.isDarwin '' substituteInPlace configure \ --replace '/usr/bin/libtool' 'ar' \ --replace 'AR="libtool"' 'AR="ar"' \ diff --git a/doc/languages-frameworks/haskell.section.md b/doc/languages-frameworks/haskell.section.md index 67318a5b7467..1fda505a2255 100644 --- a/doc/languages-frameworks/haskell.section.md +++ b/doc/languages-frameworks/haskell.section.md @@ -1,10 +1,4 @@ ---- -title: User's Guide for Haskell in Nixpkgs -author: Peter Simons -date: 2015-06-01 ---- - -# Haskell +# Haskell {#haskell} The documentation for the Haskell infrastructure is published at . The source code for that diff --git a/doc/languages-frameworks/idris.section.md b/doc/languages-frameworks/idris.section.md index f071b9ce1785..2d06c4a19de5 100644 --- a/doc/languages-frameworks/idris.section.md +++ b/doc/languages-frameworks/idris.section.md @@ -1,4 +1,4 @@ -# Idris +# Idris {#idris} ## Installing Idris diff --git a/doc/languages-frameworks/ios.section.md b/doc/languages-frameworks/ios.section.md index 768e0690b962..a162e8d19fd3 100644 --- a/doc/languages-frameworks/ios.section.md +++ b/doc/languages-frameworks/ios.section.md @@ -1,9 +1,4 @@ ---- -title: iOS -author: Sander van der Burg -date: 2019-11-10 ---- -# iOS +# iOS {#ios} This component is basically a wrapper/workaround that makes it possible to expose an Xcode installation as a Nix package by means of symlinking to the diff --git a/doc/languages-frameworks/lua.section.md b/doc/languages-frameworks/lua.section.md index a0e9917b8ec5..d81949c75f69 100644 --- a/doc/languages-frameworks/lua.section.md +++ b/doc/languages-frameworks/lua.section.md @@ -1,10 +1,4 @@ ---- -title: Lua -author: Matthieu Coudron -date: 2019-02-05 ---- - -# User's Guide to Lua Infrastructure +# User's Guide to Lua Infrastructure {#users-guide-to-lua-infrastructure} ## Using Lua @@ -187,7 +181,7 @@ luaposix = buildLuarocksPackage { disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); propagatedBuildInputs = [ bit32 lua std_normalize ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/luaposix/luaposix/"; description = "Lua bindings for POSIX"; maintainers = with maintainers; [ vyp lblasc ]; @@ -249,4 +243,3 @@ Following rules should be respected: * Make sure libraries build for all Lua interpreters. * Commit names of Lua libraries should reflect that they are Lua libraries, so write for example `luaPackages.luafilesystem: 1.11 -> 1.12`. - diff --git a/doc/languages-frameworks/maven.section.md b/doc/languages-frameworks/maven.section.md index fe183e7ba3cc..7a863c500bc3 100644 --- a/doc/languages-frameworks/maven.section.md +++ b/doc/languages-frameworks/maven.section.md @@ -1,10 +1,4 @@ ---- -title: Maven -author: Farid Zakaria -date: 2020-10-15 ---- - -# Maven +# Maven {#maven} Maven is a well-known build tool for the Java ecosystem however it has some challenges when integrating into the Nix build system. @@ -122,7 +116,7 @@ The first step will be to build the Maven project as a fixed-output derivation i > Traditionally the Maven repository is at `~/.m2/repository`. We will override this to be the `$out` directory. ```nix -{ stdenv, maven }: +{ stdenv, lib, maven }: stdenv.mkDerivation { name = "maven-repository"; buildInputs = [ maven ]; @@ -145,7 +139,7 @@ stdenv.mkDerivation { outputHashAlgo = "sha256"; outputHashMode = "recursive"; # replace this with the correct SHA256 - outputHash = stdenv.lib.fakeSha256; + outputHash = lib.fakeSha256; } ``` diff --git a/doc/languages-frameworks/node.section.md b/doc/languages-frameworks/node.section.md index 2120adfc0b49..847db22941fd 100644 --- a/doc/languages-frameworks/node.section.md +++ b/doc/languages-frameworks/node.section.md @@ -1,5 +1,5 @@ -Node.js -======= +# Node.js {#node.js} + The `pkgs/development/node-packages` folder contains a generated collection of [NPM packages](https://npmjs.com/) that can be installed with the Nix package manager. diff --git a/doc/languages-frameworks/ocaml.section.md b/doc/languages-frameworks/ocaml.section.md index 1c5a5473a05e..fa85a27e84f0 100644 --- a/doc/languages-frameworks/ocaml.section.md +++ b/doc/languages-frameworks/ocaml.section.md @@ -7,7 +7,7 @@ Given that most of the OCaml ecosystem is now built with dune, nixpkgs includes Here is a simple package example. It defines an (optional) attribute `minimumOCamlVersion` that will be used to throw a descriptive evaluation error if building with an older OCaml is attempted. It uses the `fetchFromGitHub` fetcher to get its source. It sets the `doCheck` (optional) attribute to `true` which means that tests will be run with `dune runtest -p angstrom` after the build (`dune build -p angstrom`) is complete. It uses `alcotest` as a build input (because it is needed to run the tests) and `bigstringaf` and `result` as propagated build inputs (thus they will also be available to libraries depending on this library). The library will be installed using the `angstrom.install` file that dune generates. ```nix -{ stdenv +{ lib , fetchFromGitHub , buildDunePackage , alcotest @@ -35,8 +35,8 @@ buildDunePackage rec { meta = { homepage = "https://github.com/inhabitedtype/angstrom"; description = "OCaml parser combinators built for speed and memory efficiency"; - license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ sternenseemann ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ sternenseemann ]; }; } ``` @@ -44,7 +44,7 @@ buildDunePackage rec { Here is a second example, this time using a source archive generated with `dune-release`. It is a good idea to use this archive when it is available as it will usually contain substituted variables such as a `%%VERSION%%` field. This library does not depend on any other OCaml library and no tests are run after building it. ```nix -{ stdenv +{ lib , fetchurl , buildDunePackage }: @@ -60,7 +60,7 @@ buildDunePackage rec { sha256 = "1msg3vycd3k8qqj61sc23qks541cxpb97vrnrvrhjnqxsqnh6ygq"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/flowtype/ocaml-wtf8"; description = "WTF-8 is a superset of UTF-8 that allows unpaired surrogates."; license = licenses.mit; diff --git a/doc/languages-frameworks/perl.section.md b/doc/languages-frameworks/perl.section.md index 2b31da84553e..309d8ebcc2b3 100644 --- a/doc/languages-frameworks/perl.section.md +++ b/doc/languages-frameworks/perl.section.md @@ -110,7 +110,7 @@ ClassC3Componentised = buildPerlPackage rec { On Darwin, if a script has too many `-Idir` flags in its first line (its “shebang line”), it will not run. This can be worked around by calling the `shortenPerlShebang` function from the `postInstall` phase: ```nix -{ stdenv, buildPerlPackage, fetchurl, shortenPerlShebang }: +{ stdenv, lib, buildPerlPackage, fetchurl, shortenPerlShebang }: ImageExifTool = buildPerlPackage { pname = "Image-ExifTool"; @@ -121,8 +121,8 @@ ImageExifTool = buildPerlPackage { sha256 = "0d8v48y94z8maxkmw1rv7v9m0jg2dc8xbp581njb6yhr7abwqdv3"; }; - buildInputs = stdenv.lib.optional stdenv.isDarwin shortenPerlShebang; - postInstall = stdenv.lib.optional stdenv.isDarwin '' + buildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; + postInstall = lib.optional stdenv.isDarwin '' shortenPerlShebang $out/bin/exiftool ''; }; @@ -151,7 +151,7 @@ $ nix-generate-from-cpan XML::Simple propagatedBuildInputs = [ XMLNamespaceSupport XMLSAX XMLSAXExpat ]; meta = { description = "An API for simple XML files"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; ``` diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index 8a2fe2711c7a..2dea2cb1bcc9 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -1,4 +1,4 @@ -# Python +# Python {#python} ## User Guide diff --git a/doc/languages-frameworks/r.section.md b/doc/languages-frameworks/r.section.md index d4e1617779ce..32a39ade2796 100644 --- a/doc/languages-frameworks/r.section.md +++ b/doc/languages-frameworks/r.section.md @@ -1,5 +1,4 @@ -R -= +# R {#r} ## Installation @@ -106,6 +105,12 @@ mv cran-packages.nix.new cran-packages.nix Rscript generate-r-packages.R bioc > bioc-packages.nix.new mv bioc-packages.nix.new bioc-packages.nix + +Rscript generate-r-packages.R bioc-annotation > bioc-annotation-packages.nix.new +mv bioc-annotation-packages.nix.new bioc-annotation-packages.nix + +Rscript generate-r-packages.R bioc-experiment > bioc-experiment-packages.nix.new +mv bioc-experiment-packages.nix.new bioc-experiment-packages.nix ``` `generate-r-packages.R ` reads `-packages.nix`, therefor the renaming. diff --git a/doc/languages-frameworks/rust.section.md b/doc/languages-frameworks/rust.section.md index 0230993d3f08..092e84461b81 100644 --- a/doc/languages-frameworks/rust.section.md +++ b/doc/languages-frameworks/rust.section.md @@ -1,10 +1,4 @@ ---- -title: Rust -author: Matthias Beyer -date: 2017-03-05 ---- - -# Rust +# Rust {#rust} To install the rust compiler and cargo put @@ -27,18 +21,18 @@ Rust applications are packaged by using the `buildRustPackage` helper from `rust ``` rustPlatform.buildRustPackage rec { pname = "ripgrep"; - version = "11.0.2"; + version = "12.1.1"; src = fetchFromGitHub { owner = "BurntSushi"; repo = pname; rev = version; - sha256 = "1iga3320mgi7m853la55xip514a3chqsdi1a1rwv25lr9b1p7vd3"; + sha256 = "1hqps7l5qrjh9f914r5i6kmcz6f1yb951nv4lby0cjnp5l253kps"; }; - cargoSha256 = "17ldqr3asrdcsh4l29m3b5r37r5d0b3npq1lrgjmxb6vlx6a36qh"; + cargoSha256 = "03wf9r2csi6jpa7v5sw5lpxkrk4wfzwmzx7k3991q3bdjzcwnnwp"; - meta = with stdenv.lib; { + meta = with lib; { description = "A fast line-oriented regex search tool, similar to ag and ack"; homepage = "https://github.com/BurntSushi/ripgrep"; license = licenses.unlicense; @@ -47,10 +41,31 @@ rustPlatform.buildRustPackage rec { } ``` -`buildRustPackage` requires a `cargoSha256` attribute which is computed over -all crate sources of this package. Currently it is obtained by inserting a -fake checksum into the expression and building the package once. The correct -checksum can then be taken from the failed build. +`buildRustPackage` requires either the `cargoSha256` or the +`cargoHash` attribute which is computed over all crate sources of this +package. `cargoHash256` is used for traditional Nix SHA-256 hashes, +such as the one in the example above. `cargoHash` should instead be +used for [SRI](https://www.w3.org/TR/SRI/) hashes. For example: + +``` + cargoHash = "sha256-l1vL2ZdtDRxSGvP0X/l3nMw8+6WF67KPutJEzUROjg8="; +``` + +Both types of hashes are permitted when contributing to nixpkgs. The +Cargo hash is obtained by inserting a fake checksum into the +expression and building the package once. The correct checksum can +then be taken from the failed build. A fake hash can be used for +`cargoSha256` as follows: + +``` + cargoSha256 = lib.fakeSha256; +``` + +For `cargoHash` you can use: + +``` + cargoHash = lib.fakeHash; +``` Per the instructions in the [Cargo Book](https://doc.rust-lang.org/cargo/guide/cargo-toml-vs-cargo-lock.html) best practices guide, Rust applications should always commit the `Cargo.lock` diff --git a/doc/languages-frameworks/texlive.section.md b/doc/languages-frameworks/texlive.section.md index 9584c56bb52f..c3028731f4e9 100644 --- a/doc/languages-frameworks/texlive.section.md +++ b/doc/languages-frameworks/texlive.section.md @@ -1,4 +1,3 @@ - # TeX Live {#sec-language-texlive} Since release 15.09 there is a new TeX Live packaging that lives entirely under attribute `texlive`. diff --git a/doc/languages-frameworks/titanium.section.md b/doc/languages-frameworks/titanium.section.md index 7a97664ec598..57360f034b9f 100644 --- a/doc/languages-frameworks/titanium.section.md +++ b/doc/languages-frameworks/titanium.section.md @@ -1,9 +1,4 @@ ---- -title: Titanium -author: Sander van der Burg -date: 2018-11-18 ---- -# Titanium +# Titanium {#titanium} The Nixpkgs repository contains facilities to deploy a variety of versions of the [Titanium SDK](https://www.appcelerator.com) versions, a cross-platform diff --git a/doc/languages-frameworks/vim.section.md b/doc/languages-frameworks/vim.section.md index 84ad567e8c21..155dacc237b3 100644 --- a/doc/languages-frameworks/vim.section.md +++ b/doc/languages-frameworks/vim.section.md @@ -1,9 +1,4 @@ ---- -title: User's Guide for Vim in Nixpkgs -author: Marc Weber -date: 2016-06-25 ---- -# Vim +# Vim {#vim} Both Neovim and Vim can be configured to include your favorite plugins and additional libraries. diff --git a/doc/preface.chapter.md b/doc/preface.chapter.md index 549e42de7aa0..64c921c711bf 100644 --- a/doc/preface.chapter.md +++ b/doc/preface.chapter.md @@ -1,10 +1,4 @@ ---- -title: Preface -author: Frederik Rietdijk -date: 2015-11-25 ---- - -# Preface +# Preface {#preface} The Nix Packages collection (Nixpkgs) is a set of thousands of packages for the [Nix package manager](https://nixos.org/nix/), released under a diff --git a/doc/stdenv/meta.xml b/doc/stdenv/meta.xml index c9d1b1362193..10802d1af59f 100644 --- a/doc/stdenv/meta.xml +++ b/doc/stdenv/meta.xml @@ -5,7 +5,7 @@ Nix packages can declare meta-attributes that contain information about a package such as a description, its homepage, its license, and so on. For instance, the GNU Hello package has a meta declaration like this: -meta = with stdenv.lib; { +meta = with lib; { description = "A program that produces a familiar, friendly greeting"; longDescription = '' GNU Hello is a program that prints "Hello, world!" when you run it. @@ -155,7 +155,7 @@ hello-2.3 A program that produces a familiar, friendly greeting - Single license referenced by attribute (preferred) stdenv.lib.licenses.gpl3Only. + Single license referenced by attribute (preferred) lib.licenses.gpl3Only. @@ -170,7 +170,7 @@ hello-2.3 A program that produces a familiar, friendly greeting - Multiple licenses referenced by attribute (preferred) with stdenv.lib.licenses; [ asl20 free ofl ]. + Multiple licenses referenced by attribute (preferred) with lib.licenses; [ asl20 free ofl ]. @@ -211,9 +211,9 @@ hello-2.3 A program that produces a familiar, friendly greeting The list of Nix platform types on which the package is supported. Hydra builds packages according to the platform specified. If no platform is specified, the package does not have prebuilt binaries. An example is: -meta.platforms = stdenv.lib.platforms.linux; +meta.platforms = lib.platforms.linux; - Attribute Set stdenv.lib.platforms defines various common lists of platforms types. + Attribute Set lib.platforms defines various common lists of platforms types. @@ -262,7 +262,7 @@ meta.platforms = stdenv.lib.platforms.linux; The list of Nix platform types for which the Hydra instance at hydra.nixos.org will build the package. (Hydra is the Nix-based continuous build system.) It defaults to the value of meta.platforms. Thus, the only reason to set meta.hydraPlatforms is if you want hydra.nixos.org to build the package on a subset of meta.platforms, or not at all, e.g. -meta.platforms = stdenv.lib.platforms.linux; +meta.platforms = lib.platforms.linux; meta.hydraPlatforms = []; @@ -294,7 +294,7 @@ meta.hydraPlatforms = []; Licenses - The meta.license attribute should preferrably contain a value from stdenv.lib.licenses defined in nixpkgs/lib/licenses.nix, or in-place license description of the same format if the license is unlikely to be useful in another expression. + The meta.license attribute should preferrably contain a value from lib.licenses defined in nixpkgs/lib/licenses.nix, or in-place license description of the same format if the license is unlikely to be useful in another expression. @@ -302,7 +302,7 @@ meta.hydraPlatforms = []; - stdenv.lib.licenses.free, "free" + lib.licenses.free, "free" @@ -312,7 +312,7 @@ meta.hydraPlatforms = []; - stdenv.lib.licenses.unfreeRedistributable, "unfree-redistributable" + lib.licenses.unfreeRedistributable, "unfree-redistributable" @@ -325,7 +325,7 @@ meta.hydraPlatforms = []; - stdenv.lib.licenses.unfree, "unfree" + lib.licenses.unfree, "unfree" @@ -335,7 +335,7 @@ meta.hydraPlatforms = []; - stdenv.lib.licenses.unfreeRedistributableFirmware, "unfree-redistributable-firmware" + lib.licenses.unfreeRedistributableFirmware, "unfree-redistributable-firmware" diff --git a/doc/stdenv/platform-notes.xml b/doc/stdenv/platform-notes.xml index 5a266fdc0eea..cc8efaece129 100644 --- a/doc/stdenv/platform-notes.xml +++ b/doc/stdenv/platform-notes.xml @@ -32,7 +32,7 @@ stdenv.mkDerivation { stdenv.mkDerivation { name = "libfoo-1.2.3"; # ... - makeFlags = stdenv.lib.optional stdenv.isDarwin "LDFLAGS=-Wl,-install_name,$(out)/lib/libfoo.dylib"; + makeFlags = lib.optional stdenv.isDarwin "LDFLAGS=-Wl,-install_name,$(out)/lib/libfoo.dylib"; } diff --git a/doc/using/configuration.xml b/doc/using/configuration.xml index 336bdf5b2656..1e1df867e08e 100644 --- a/doc/using/configuration.xml +++ b/doc/using/configuration.xml @@ -157,7 +157,7 @@ The following example configuration whitelists the licenses amd and wtfpl: { - whitelistedLicenses = with stdenv.lib.licenses; [ amd wtfpl ]; + whitelistedLicenses = with lib.licenses; [ amd wtfpl ]; } @@ -165,7 +165,7 @@ The following example configuration blacklists the gpl3Only and agpl3Only licenses: { - blacklistedLicenses = with stdenv.lib.licenses; [ agpl3Only gpl3Only ]; + blacklistedLicenses = with lib.licenses; [ agpl3Only gpl3Only ]; } diff --git a/flake.nix b/flake.nix index cf0185d3ad6a..537f91ee5e71 100644 --- a/flake.nix +++ b/flake.nix @@ -39,6 +39,11 @@ modules = modules ++ [ ./nixos/modules/virtualisation/qemu-vm.nix { virtualisation.useBootLoader = true; } + ({ config, ... }: { + virtualisation.useEFIBoot = + config.boot.loader.systemd-boot.enable || + config.boot.loader.efi.canTouchEfiVariables; + }) ]; })).config; in diff --git a/lib/licenses.nix b/lib/licenses.nix index 64f10a7f2527..ebeb1377339b 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -817,14 +817,54 @@ lib.mapAttrs (n: v: v // { shortName = n; }) { }; } // { # TODO: remove legacy aliases - agpl3 = lib.licenses.agpl3Only; - fdl11 = lib.licenses.fdl11Only; - fdl12 = lib.licenses.fdl12Only; - fdl13 = lib.licenses.fdl13Only; - gpl1 = lib.licenses.gpl1Only; - gpl2 = lib.licenses.gpl2Only; - gpl3 = lib.licenses.gpl3Only; - lgpl2 = lib.licenses.lgpl2Only; - lgpl21 = lib.licenses.lgpl21Only; - lgpl3 = lib.licenses.lgpl3Only; + agpl3 = spdx { + spdxId = "AGPL-3.0"; + fullName = "GNU Affero General Public License v3.0"; + deprecated = true; + }; + fdl11 = spdx { + spdxId = "GFDL-1.1"; + fullName = "GNU Free Documentation License v1.1"; + deprecated = true; + }; + fdl12 = spdx { + spdxId = "GFDL-1.2"; + fullName = "GNU Free Documentation License v1.2"; + deprecated = true; + }; + fdl13 = spdx { + spdxId = "GFDL-1.3"; + fullName = "GNU Free Documentation License v1.3"; + deprecated = true; + }; + gpl1 = spdx { + spdxId = "GPL-1.0"; + fullName = "GNU General Public License v1.0"; + deprecated = true; + }; + gpl2 = spdx { + spdxId = "GPL-2.0"; + fullName = "GNU General Public License v2.0"; + deprecated = true; + }; + gpl3 = spdx { + spdxId = "GPL-3.0"; + fullName = "GNU General Public License v3.0"; + deprecated = true; + }; + lgpl2 = spdx { + spdxId = "LGPL-2.0"; + fullName = "GNU Library General Public License v2"; + deprecated = true; + }; + lgpl21 = spdx { + spdxId = "LGPL-2.1"; + fullName = "GNU Lesser General Public License v2.1"; + deprecated = true; + }; + lgpl3 = spdx { + spdxId = "LGPL-3.0"; + fullName = "GNU Lesser General Public License v3.0"; + deprecated = true; + }; } diff --git a/lib/systems/default.nix b/lib/systems/default.nix index e31a8e65f2a0..4edcbeb36f16 100644 --- a/lib/systems/default.nix +++ b/lib/systems/default.nix @@ -124,6 +124,8 @@ rec { then "${qemu-user}/bin/qemu-${final.qemuArch}" else if final.isWasi then "${pkgs.wasmtime}/bin/wasmtime" + else if final.isMmix + then "${pkgs.mmixware}/bin/mmix" else throw "Don't know how to run ${final.config} executables."; } // mapAttrs (n: v: v final.parsed) inspect.predicates diff --git a/lib/systems/platforms.nix b/lib/systems/platforms.nix index a0dccc859883..fdd127e5541f 100644 --- a/lib/systems/platforms.nix +++ b/lib/systems/platforms.nix @@ -490,8 +490,9 @@ rec { # ARM else if platform.isAarch32 then let - version = platform.parsed.cpu.version or ""; - in if lib.versionOlder version "6" then sheevaplug + version = platform.parsed.cpu.version or null; + in if version == null then pcBase + else if lib.versionOlder version "6" then sheevaplug else if lib.versionOlder version "7" then raspberrypi else armv7l-hf-multiplatform else if platform.isAarch64 then aarch64-multiplatform diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 5ce46ff64365..aec5a67ddc95 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -70,6 +70,18 @@ githubId = 7414843; name = "Nicholas von Klitzing"; }; + _3noch = { + email = "eacameron@gmail.com"; + github = "3noch"; + githubId = 882455; + name = "Elliot Cameron"; + }; + _6AA4FD = { + email = "f6442954@gmail.com"; + github = "6AA4FD"; + githubId = 12578560; + name = "Quinn Bohner"; + }; a1russell = { email = "adamlr6+pub@gmail.com"; github = "a1russell"; @@ -1150,6 +1162,12 @@ githubId = 37907; name = "Julian Stecklina"; }; + bloomvdomino = { + name = "Laura Fäßler"; + email = "0x@ytex.de"; + github = "bloomvdomino"; + githubId = 33204710; + }; bluescreen303 = { email = "mathijs@bluescreen303.nl"; github = "bluescreen303"; @@ -3613,6 +3631,12 @@ email = "t@larkery.com"; name = "Tom Hinton"; }; + hirenashah = { + email = "hiren@hiren.io"; + github = "hirenashah"; + githubId = 19825977; + name = "Hiren Shah"; + }; hjones2199 = { email = "hjones2199@gmail.com"; github = "hjones2199"; @@ -3693,6 +3717,12 @@ githubId = 2789926; name = "Imran Hossain"; }; + iammrinal0 = { + email = "nixpkgs@mrinalpurohit.in"; + github = "iammrinal0"; + githubId = 890062; + name = "Mrinal"; + }; iand675 = { email = "ian@iankduncan.com"; github = "iand675"; @@ -3741,6 +3771,12 @@ githubId = 7481521; name = "Balázs Lengyel"; }; + ilian = { + email = "ilian@tuta.io"; + github = "ilian"; + githubId = 25505957; + name = "Ilian"; + }; ilikeavocadoes = { email = "ilikeavocadoes@hush.com"; github = "ilikeavocadoes"; @@ -3923,6 +3959,12 @@ githubId = 2179419; name = "Arseniy Seroka"; }; + jakeisnt = { + name = "Jacob Chvatal"; + email = "jake@isnt.online"; + github = "jakeisnt"; + githubId = 29869612; + }; jakelogemann = { email = "jake.logemann@gmail.com"; github = "jakelogemann"; @@ -4618,12 +4660,24 @@ githubId = 2029444; name = "James Kent"; }; + ketzacoatl = { + email = "ketzacoatl@protonmail.com"; + github = "ketzacoatl"; + githubId = 10122937; + name = "ketzacoatl"; + }; kevincox = { email = "kevincox@kevincox.ca"; github = "kevincox"; githubId = 494012; name = "Kevin Cox"; }; + kevingriffin = { + email = "me@kevin.jp"; + github = "kevingriffin"; + githubId = 209729; + name = "Kevin Griffin"; + }; kfollesdal = { email = "kfollesdal@gmail.com"; github = "kfollesdal"; @@ -5448,6 +5502,12 @@ githubId = 346094; name = "Michael Alyn Miller"; }; + manojkarthick = { + email = "smanojkarthick@gmail.com"; + github = "manojkarthick"; + githubId = 7802795; + name = "Manoj Karthick"; + }; manveru = { email = "m.fellinger@gmail.com"; github = "manveru"; @@ -5648,6 +5708,12 @@ githubId = 2971615; name = "Marius Bergmann"; }; + mcaju = { + email = "cajum.bugs@yandex.com"; + github = "CajuM"; + githubId = 10420834; + name = "Mihai-Drosi Caju"; + }; mcbeth = { email = "mcbeth@broggs.org"; github = "mcbeth"; @@ -5869,6 +5935,12 @@ githubId = 1387206; name = "Mike Sperber"; }; + milesbreslin = { + email = "milesbreslin@gmail.com"; + github = "milesbreslin"; + githubId = 38543128; + name = "Miles Breslin"; + }; millerjason = { email = "mailings-github@millerjason.com"; github = "millerjason"; @@ -6343,6 +6415,12 @@ githubId = 364510; name = "Tobias Geerinckx-Rice"; }; + ndl = { + email = "ndl@endl.ch"; + github = "ndl"; + githubId = 137805; + name = "Alexander Tsvyashchenko"; + }; neeasade = { email = "nathanisom27@gmail.com"; github = "neeasade"; @@ -6487,12 +6565,6 @@ github = "NobbZ"; githubId = 58951; }; - nocent = { - email = "nocent@protonmail.ch"; - github = "nocent"; - githubId = 25505957; - name = "nocent"; - }; nocoolnametom = { email = "nocoolnametom@gmail.com"; github = "nocoolnametom"; @@ -6699,6 +6771,12 @@ githubId = 111265; name = "Ozan Sener"; }; + otavio = { + email = "otavio.salvador@ossystems.com.br"; + github = "otavio"; + githubId = 25278; + name = "Otavio Salvador"; + }; otwieracz = { email = "slawek@otwiera.cz"; github = "otwieracz"; @@ -6937,6 +7015,12 @@ githubId = 28323; name = "Peter Simons"; }; + petterstorvik = { + email = "petterstorvik@gmail.com"; + github = "storvik"; + githubId = 3438604; + name = "Petter Storvik"; + }; philandstuff = { email = "philip.g.potter@gmail.com"; github = "philandstuff"; @@ -7509,6 +7593,12 @@ githubId = 395821; name = "rht"; }; + rhoriguchi = { + email = "ryan.horiguchi@gmail.com"; + github = "rhoriguchi "; + githubId = 6047658; + name = "Ryan Horiguchi"; + }; richardipsum = { email = "richardipsum@fastmail.co.uk"; github = "richardipsum"; @@ -7947,6 +8037,12 @@ githubId = 720864; name = "Sébastien Bourdeauducq"; }; + sbond75 = { + name = "sbond75"; + email = "43617712+sbond75@users.noreply.github.com"; + github = "sbond75"; + githubId = 43617712; + }; sboosali = { email = "SamBoosalis@gmail.com"; github = "sboosali"; @@ -8801,6 +8897,12 @@ githubId = 2389333; name = "Andy Tockman"; }; + Technical27 = { + email = "38222826+Technical27@users.noreply.github.com"; + github = "Technical27"; + githubId = 38222826; + name = "Aamaruvi Yogamani"; + }; teh = { email = "tehunger@gmail.com"; github = "teh"; @@ -8819,6 +8921,12 @@ githubId = 649832; name = "Teo Klestrup Röijezon"; }; + terin = { + email = "terinjokes@gmail.com"; + github = "terinjokes"; + githubId = 273509; + name = "Terin Stock"; + }; terlar = { email = "terlar@gmail.com"; github = "terlar"; @@ -9396,6 +9504,12 @@ fingerprint = "4D23 ECDF 880D CADF 5ECA 4458 874B D6F9 16FA A742"; }]; }; + vel = { + email = "llathasa@outlook.com"; + github = "llathasa-veleth"; + githubId = 61933599; + name = "vel"; + }; velovix = { email = "xaviosx@gmail.com"; github = "velovix"; @@ -10132,6 +10246,16 @@ github = "ymarkus"; githubId = 62380378; }; + ymatsiuk = { + name = "Yurii Matsiuk"; + email = "ymatsiuk@users.noreply.github.com"; + github = "ymatsiuk"; + githubId = 24990891; + keys = [{ + longkeyid = "rsa4096/0x61302290298601AA"; + fingerprint = "7BB8 84B5 74DA FDB1 E194 ED21 6130 2290 2986 01AA"; + }]; + }; ymeister = { name = "Yuri Meister"; email = "47071325+ymeister@users.noreply.github.com"; diff --git a/maintainers/scripts/check-hydra-by-maintainer.nix b/maintainers/scripts/check-hydra-by-maintainer.nix new file mode 100644 index 000000000000..cecf65ec66dc --- /dev/null +++ b/maintainers/scripts/check-hydra-by-maintainer.nix @@ -0,0 +1,67 @@ +{ maintainer }: +let + pkgs = import ./../../default.nix { }; + maintainer_ = pkgs.lib.maintainers.${maintainer}; + packagesWith = cond: return: prefix: set: + (pkgs.lib.flatten + (pkgs.lib.mapAttrsToList + (name: pkg: + let + result = builtins.tryEval + ( + if pkgs.lib.isDerivation pkg && cond name pkg then + # Skip packages whose closure fails on evaluation. + # This happens for pkgs like `python27Packages.djangoql` + # that have disabled Python pkgs as dependencies. + builtins.seq pkg.outPath + [ (return "${prefix}${name}") ] + else if pkg.recurseForDerivations or false || pkg.recurseForRelease or false + # then packagesWith cond return pkg + then packagesWith cond return "${name}." pkg + else [ ] + ); + in + if result.success then result.value + else [ ] + ) + set + ) + ); + + packages = packagesWith + (name: pkg: + ( + if builtins.hasAttr "meta" pkg && builtins.hasAttr "maintainers" pkg.meta + then + ( + if builtins.isList pkg.meta.maintainers + then builtins.elem maintainer_ pkg.meta.maintainers + else maintainer_ == pkg.meta.maintainers + ) + else false + ) + ) + (name: name) + ("") + pkgs; + +in +pkgs.stdenv.mkDerivation { + name = "nixpkgs-update-script"; + buildCommand = '' + echo "" + echo "----------------------------------------------------------------" + echo "" + echo "nix-shell maintainers/scripts/check-hydra-by-maintainer.nix --argstr maintainer SuperSandro2000" + echo "" + echo "----------------------------------------------------------------" + exit 1 + ''; + shellHook = '' + unset shellHook # do not contaminate nested shells + echo "Please stand by" + echo nix-shell -p hydra-check --run "hydra-check ${builtins.concatStringsSep " " packages}" + nix-shell -p hydra-check --run "hydra-check ${builtins.concatStringsSep " " packages}" + exit $? + ''; +} diff --git a/maintainers/scripts/fetch-kde-qt.sh b/maintainers/scripts/fetch-kde-qt.sh index c6c980dd0cb6..22d78151978b 100755 --- a/maintainers/scripts/fetch-kde-qt.sh +++ b/maintainers/scripts/fetch-kde-qt.sh @@ -14,13 +14,12 @@ fi tmp=$(mktemp -d) pushd $tmp >/dev/null -wget -nH -r -c --no-parent "${WGET_ARGS[@]}" -A '*.tar.xz.sha256' -A '*.mirrorlist' >/dev/null -find -type f -name '*.mirrorlist' -delete +wget -nH -r -c --no-parent "${WGET_ARGS[@]}" >/dev/null csv=$(mktemp) find . -type f | while read src; do # Sanitize file name - filename=$(gawk '{ print $2 }' "$src" | tr '@' '_') + filename=$(basename "$src" | tr '@' '_') nameVersion="${filename%.tar.*}" name=$(echo "$nameVersion" | sed -e 's,-[[:digit:]].*,,' | sed -e 's,-opensource-src$,,' | sed -e 's,-everywhere-src$,,') version=$(echo "$nameVersion" | sed -e 's,^\([[:alpha:]][[:alnum:]]*-\)\+,,') @@ -40,8 +39,8 @@ gawk -F , "{ print \$1 }" $csv | sort | uniq | while read name; do latestVersion=$(echo "$versions" | sort -rV | head -n 1) src=$(gawk -F , "/^$name,$latestVersion,/ { print \$3 }" $csv) filename=$(gawk -F , "/^$name,$latestVersion,/ { print \$4 }" $csv) - url="$(dirname "${src:2}")/$filename" - sha256=$(gawk '{ print $1 }' "$src") + url="${src:2}" + sha256=$(nix-hash --type sha256 --base32 --flat "$src") cat >>"$SRCS" < A profile with most (vanilla) hardening options enabled by default, - potentially at the cost of features and performance. + potentially at the cost of stability, features and performance. @@ -21,4 +21,12 @@ xlink:href="https://github.com/nixos/nixpkgs/tree/master/nixos/modules/profiles/hardened.nix"> profile source for further detail on which settings are altered. + + + This profile enables options that are known to affect system + stability. If you experience any stability issues when using the + profile, try disabling it. If you report an issue and use this + profile, always mention that you do. + +
diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml index 3da8080958ee..0b1d0d509d78 100644 --- a/nixos/doc/manual/release-notes/rl-2009.xml +++ b/nixos/doc/manual/release-notes/rl-2009.xml @@ -1343,6 +1343,14 @@ CREATE ROLE postgres LOGIN SUPERUSER; It was chosen to do this as it has a usability breaking issue (see issue #98819) that makes it unsuitable to be a default app. + + + Issue #98819 + is now fixed and gnome3.epiphany is once + again installed by default. + + diff --git a/nixos/doc/manual/release-notes/rl-2103.xml b/nixos/doc/manual/release-notes/rl-2103.xml index 38262b508994..e46d1ca403f3 100644 --- a/nixos/doc/manual/release-notes/rl-2103.xml +++ b/nixos/doc/manual/release-notes/rl-2103.xml @@ -107,6 +107,15 @@ user D-Bus session available also for non-graphical logins. + + + The networking.wireless.iwd module now installs + the upstream-provided 80-iwd.link file, which sets the NamePolicy= + for all wlan devices to "keep kernel", to avoid race conditions + between iwd and networkd. If you don't want this, you can set + systemd.network.links."80-iwd" = lib.mkForce {}. + + rubyMinimal was removed due to being unused and @@ -168,6 +177,38 @@ /var/lib/powerdns to /run/pdns. + + + xfsprogs was update from 4.19 to 5.10. It now enables reflink support by default on filesystem creation. + Support for reflinks was added with an experimental status to kernel 4.9 and deemed stable in kernel 4.16. + If you want to be able to mount XFS filesystems created with this release of xfsprogs on kernel releases older than those, you need to format them + with mkfs.xfs -m reflink=0. + + + + + The uWSGI server is now built with POSIX capabilities. As a consequence, + root is no longer required in emperor mode and the service defaults to + running as the unprivileged uwsgi user. Any additional + capability can be added via the new option + . + The previous behaviour can be restored by setting: + + = "root"; + = "root"; + = + { + uid = "uwsgi"; + gid = "uwsgi"; + }; + + + + Another incompatibility from the previous release is that vassals running under a + different user or group need to use immediate-{uid,gid} + instead of the usual uid,gid options. + + btc1 has been abandoned upstream, and removed. @@ -215,6 +256,22 @@ which is the new stable release. OpenAFS 1.6 was removed. + + + MariaDB has been updated to 10.5. + Before you upgrade, it would be best to take a backup of your database and read + + Incompatible Changes Between 10.4 and 10.5. + After the upgrade you will need to run mysql_upgrade. + + + + + The TokuDB storage engine dropped in mariadb 10.5 and removed in mariadb 10.6. + It is recommended to switch to RocksDB. See also TokuDB and + MDEV-19780: Remove the TokuDB storage engine. + + The openldap module now has support for OLC-style @@ -278,6 +335,16 @@ = true; + + + The services.tor module has a new exhaustively typed option following RFC 0042; backward compatibility with old options has been preserved when aliasing was possible. + The corresponding systemd service has been hardened, + but there is a chance that the service still requires more permissions, + so please report any related trouble on the bugtracker. + Onion services v3 are now supported in . + A new option as been introduced for allowing connections on all the TCP ports configured. + + The options services.slurm.dbdserver.storagePass @@ -287,6 +354,12 @@ This avoids that the password gets exposed in the nix store. + + + The wafHook hook does not wrap Python anymore. + Packages depending on wafHook need to include any Python into their nativeBuildInputs. + + Starting with version 1.7.0, the project formerly named CodiMD @@ -295,6 +368,68 @@ Based on , existing installations will continue to work. + + + The fish-foreign-env package has been replaced with + fishPlugins.foreign-env, in which the fish + functions have been relocated to the + vendor_functions.d directory to be loaded automatically. + + + + + The prometheus json exporter is now managed by the prometheus community. Together with additional features + some backwards incompatibilities were introduced. + Most importantly the exporter no longer accepts a fixed command-line parameter to specify the URL of the + endpoint serving JSON. It now expects this URL to be passed as an URL parameter, when scraping the exporter's + /probe endpoint. + In the prometheus scrape configuration the scrape target might look like this: + +http://some.json-exporter.host:7979/probe?target=https://example.com/some/json/endpoint + + + + Existing configuration for the exporter needs to be updated, but can partially be re-used. + Documentation is available in the upstream repository and a small example for NixOS is available + in the corresponding NixOS test. + + + These changes also affect , which is + just a preconfigured instance of the json exporter. + + + For more information, take a look at the + official documentation of the json_exporter. + + + + + Androidenv was updated, removing the includeDocs and lldbVersions + arguments. Docs only covered a single version of the Android SDK, LLDB is now bundled with the NDK, + and both are no longer available to download from the Android package repositories. Additionally, since + the package lists have been updated, some older versions of Android packages may not be bundled. If you + depend on older versions of Android packages, we recommend overriding the repo. + + + Android packages are now loaded from a repo.json file created by parsing Android repo XML files. The arguments + repoJson and repoXmls have been added to allow overriding the built-in + androidenv repo.json with your own. Additionally, license files are now written to allow compatibility + with Gradle-based tools, and the extraLicenses argument has been added to accept more + SDK licenses if your project requires it. See the androidenv documentation for more details. + + + + + The Searx module has been updated with the ability to configure the + service declaratively and uWSGI integration. + The option services.searx.configFile has been renamed + to for consistency with + the new . In addition, the + searx uid and gid reservations have been removed + since they were not necessary: the service is now running with a + dynamically allocated uid. + + @@ -446,6 +581,17 @@ The option's description was incorrect regarding ownership management and has been simplified greatly. + + + The GNOME desktop manager once again installs gnome3.epiphany by default. + + + + + NixOS now generates empty /etc/netgroup. + /etc/netgroup defines network-wide groups and may affect to setups using NIS. + + diff --git a/nixos/maintainers/scripts/ec2/create-amis.sh b/nixos/maintainers/scripts/ec2/create-amis.sh index ec2eb5366790..691d7fcfcba4 100755 --- a/nixos/maintainers/scripts/ec2/create-amis.sh +++ b/nixos/maintainers/scripts/ec2/create-amis.sh @@ -219,7 +219,7 @@ upload_image() { log "Registering snapshot $snapshot_id as AMI" local block_device_mappings=( - "DeviceName=/dev/xvda,Ebs={SnapshotId=$snapshot_id,VolumeSize=$image_logical_gigabytes,DeleteOnTermination=true,VolumeType=gp2}" + "DeviceName=/dev/xvda,Ebs={SnapshotId=$snapshot_id,VolumeSize=$image_logical_gigabytes,DeleteOnTermination=true,VolumeType=gp3}" ) local extra_flags=( diff --git a/nixos/modules/config/console.nix b/nixos/modules/config/console.nix index b8d52d1a8fc7..ab1667605177 100644 --- a/nixos/modules/config/console.nix +++ b/nixos/modules/config/console.nix @@ -145,7 +145,8 @@ in ''; systemd.services.systemd-vconsole-setup = - { before = [ "display-manager.service" ]; + { + before = optional config.services.xserver.enable "display-manager.service"; after = [ "systemd-udev-settle.service" ]; restartTriggers = [ vconsoleConf consoleEnv ]; }; diff --git a/nixos/modules/config/networking.nix b/nixos/modules/config/networking.nix index 4cb7d81c9972..c09588834cf1 100644 --- a/nixos/modules/config/networking.nix +++ b/nixos/modules/config/networking.nix @@ -193,6 +193,10 @@ in cat ${escapeShellArgs cfg.hostFiles} > $out ''; + # /etc/netgroup: Network-wide groups. + netgroup.text = mkDefault '' + ''; + # /etc/host.conf: resolver configuration file "host.conf".text = '' multi on diff --git a/nixos/modules/config/system-path.nix b/nixos/modules/config/system-path.nix index 27d1cef849bc..aee7a041d043 100644 --- a/nixos/modules/config/system-path.nix +++ b/nixos/modules/config/system-path.nix @@ -144,6 +144,7 @@ in "/share/kservicetypes5" "/share/kxmlgui5" "/share/systemd" + "/share/thumbnailers" ]; system.path = pkgs.buildEnv { diff --git a/nixos/modules/config/update-users-groups.pl b/nixos/modules/config/update-users-groups.pl index 758237152932..44040217b027 100644 --- a/nixos/modules/config/update-users-groups.pl +++ b/nixos/modules/config/update-users-groups.pl @@ -227,6 +227,15 @@ foreach my $u (@{$spec->{users}}) { $u->{hashedPassword} = hashPassword($u->{password}); } + if (!defined $u->{shell}) { + if (defined $existing) { + $u->{shell} = $existing->{shell}; + } else { + warn "warning: no declarative or previous shell for ‘$name’, setting shell to nologin\n"; + $u->{shell} = "/run/current-system/sw/bin/nologin"; + } + } + $u->{fakePassword} = $existing->{fakePassword} // "x"; $usersOut{$name} = $u; diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix index a95763380986..e90a7d567d42 100644 --- a/nixos/modules/config/users-groups.nix +++ b/nixos/modules/config/users-groups.nix @@ -153,7 +153,7 @@ let }; shell = mkOption { - type = types.either types.shellPackage types.path; + type = types.nullOr (types.either types.shellPackage types.path); default = pkgs.shadow; defaultText = "pkgs.shadow"; example = literalExample "pkgs.bashInteractive"; diff --git a/nixos/modules/hardware/opentabletdriver.nix b/nixos/modules/hardware/opentabletdriver.nix index b759bcf034ee..295e23e6164f 100644 --- a/nixos/modules/hardware/opentabletdriver.nix +++ b/nixos/modules/hardware/opentabletdriver.nix @@ -5,6 +5,8 @@ let cfg = config.hardware.opentabletdriver; in { + meta.maintainers = with lib.maintainers; [ thiagokokada ]; + options = { hardware.opentabletdriver = { enable = mkOption { @@ -24,6 +26,15 @@ in ''; }; + package = mkOption { + type = types.package; + default = pkgs.opentabletdriver; + defaultText = "pkgs.opentabletdriver"; + description = '' + OpenTabletDriver derivation to use. + ''; + }; + daemon = { enable = mkOption { default = true; @@ -37,9 +48,9 @@ in }; config = mkIf cfg.enable { - environment.systemPackages = with pkgs; [ opentabletdriver ]; + environment.systemPackages = [ cfg.package ]; - services.udev.packages = with pkgs; [ opentabletdriver ]; + services.udev.packages = [ cfg.package ]; boot.blacklistedKernelModules = cfg.blacklistedKernelModules; @@ -50,7 +61,7 @@ in serviceConfig = { Type = "simple"; - ExecStart = "${opentabletdriver}/bin/otd-daemon -c ${opentabletdriver}/lib/OpenTabletDriver/Configurations"; + ExecStart = "${cfg.package}/bin/otd-daemon -c ${cfg.package}/lib/OpenTabletDriver/Configurations"; Restart = "on-failure"; }; }; diff --git a/nixos/modules/i18n/input-method/default.nix b/nixos/modules/i18n/input-method/default.nix index 0d6dd3399bfc..2e7cfaab7b7c 100644 --- a/nixos/modules/i18n/input-method/default.nix +++ b/nixos/modules/i18n/input-method/default.nix @@ -29,7 +29,7 @@ in options.i18n = { inputMethod = { enabled = mkOption { - type = types.nullOr (types.enum [ "ibus" "fcitx" "nabi" "uim" "hime" ]); + type = types.nullOr (types.enum [ "ibus" "fcitx" "fcitx5" "nabi" "uim" "hime" ]); default = null; example = "fcitx"; description = '' diff --git a/nixos/modules/i18n/input-method/fcitx5.nix b/nixos/modules/i18n/input-method/fcitx5.nix new file mode 100644 index 000000000000..44962d202fe1 --- /dev/null +++ b/nixos/modules/i18n/input-method/fcitx5.nix @@ -0,0 +1,33 @@ +{ config, pkgs, lib, ... }: + +with lib; + +let + im = config.i18n.inputMethod; + cfg = im.fcitx5; + fcitx5Package = pkgs.fcitx5-with-addons.override { inherit (cfg) addons; }; +in + { + options = { + i18n.inputMethod.fcitx5 = { + addons = mkOption { + type = with types; listOf package; + default = []; + example = with pkgs; [ fcitx5-rime ]; + description = '' + Enabled Fcitx5 addons. + ''; + }; + }; + }; + + config = mkIf (im.enabled == "fcitx5") { + i18n.inputMethod.package = fcitx5Package; + + environment.variables = { + GTK_IM_MODULE = "fcitx"; + QT_IM_MODULE = "fcitx"; + XMODIFIERS = "@im=fcitx"; + }; + }; + } diff --git a/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix b/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix index a5bc436be826..e4ec2d6240d0 100644 --- a/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix +++ b/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix @@ -17,8 +17,7 @@ # The serial ports listed here are: # - ttyS0: for Tegra (Jetson TX1) # - ttyAMA0: for QEMU's -machine virt - # Also increase the amount of CMA to ensure the virtual console on the RPi3 works. - boot.kernelParams = ["cma=32M" "console=ttyS0,115200n8" "console=ttyAMA0,115200n8" "console=tty0"]; + boot.kernelParams = ["console=ttyS0,115200n8" "console=ttyAMA0,115200n8" "console=tty0"]; boot.initrd.availableKernelModules = [ # Allows early (earlier) modesetting for the Raspberry Pi @@ -30,13 +29,25 @@ sdImage = { populateFirmwareCommands = let configTxt = pkgs.writeText "config.txt" '' + [pi3] kernel=u-boot-rpi3.bin + [pi4] + kernel=u-boot-rpi4.bin + enable_gic=1 + armstub=armstub8-gic.bin + + # Otherwise the resolution will be weird in most cases, compared to + # what the pi3 firmware does by default. + disable_overscan=1 + + [all] # Boot in 64-bit mode. arm_64bit=1 - # U-Boot used to need this to work, regardless of whether UART is actually used or not. - # TODO: check when/if this can be removed. + # U-Boot needs this to work, regardless of whether UART is actually used or not. + # Look in arch/arm/mach-bcm283x/Kconfig in the U-Boot tree to see if this is still + # a requirement in the future. enable_uart=1 # Prevent the firmware from smashing the framebuffer setup done by the mainline kernel @@ -45,8 +56,17 @@ ''; in '' (cd ${pkgs.raspberrypifw}/share/raspberrypi/boot && cp bootcode.bin fixup*.dat start*.elf $NIX_BUILD_TOP/firmware/) - cp ${pkgs.ubootRaspberryPi3_64bit}/u-boot.bin firmware/u-boot-rpi3.bin + + # Add the config cp ${configTxt} firmware/config.txt + + # Add pi3 specific files + cp ${pkgs.ubootRaspberryPi3_64bit}/u-boot.bin firmware/u-boot-rpi3.bin + + # Add pi4 specific files + cp ${pkgs.ubootRaspberryPi4_64bit}/u-boot.bin firmware/u-boot-rpi4.bin + cp ${pkgs.raspberrypi-armstubs}/armstub8-gic.bin firmware/armstub8-gic.bin + cp ${pkgs.raspberrypifw}/share/raspberrypi/boot/bcm2711-rpi-4-b.dtb firmware/ ''; populateRootCommands = '' mkdir -p ./files/boot diff --git a/nixos/modules/installer/cd-dvd/sd-image-raspberrypi4.nix b/nixos/modules/installer/cd-dvd/sd-image-raspberrypi4.nix index 87545e842030..5bdec7de86e8 100644 --- a/nixos/modules/installer/cd-dvd/sd-image-raspberrypi4.nix +++ b/nixos/modules/installer/cd-dvd/sd-image-raspberrypi4.nix @@ -3,36 +3,6 @@ { config, lib, pkgs, ... }: { - imports = [ - ../../profiles/base.nix - ../../profiles/installation-device.nix - ./sd-image.nix - ]; - - boot.loader.grub.enable = false; - boot.loader.raspberryPi.enable = true; - boot.loader.raspberryPi.version = 4; + imports = [ ./sd-image-aarch64.nix ]; boot.kernelPackages = pkgs.linuxPackages_rpi4; - - boot.consoleLogLevel = lib.mkDefault 7; - - sdImage = { - firmwareSize = 128; - firmwarePartitionName = "NIXOS_BOOT"; - # This is a hack to avoid replicating config.txt from boot.loader.raspberryPi - populateFirmwareCommands = - "${config.system.build.installBootLoader} ${config.system.build.toplevel} -d ./firmware"; - # As the boot process is done entirely in the firmware partition. - populateRootCommands = ""; - }; - - fileSystems."/boot/firmware" = { - # This effectively "renames" the attrsOf entry set in sd-image.nix - mountPoint = "/boot"; - neededForBoot = true; - }; - - # the installation media is also the installation target, - # so we don't want to provide the installation configuration.nix. - installer.cloneConfig = false; } diff --git a/nixos/modules/installer/cd-dvd/system-tarball-fuloong2f.nix b/nixos/modules/installer/cd-dvd/system-tarball-fuloong2f.nix index 6d4ba96dba0c..8159576a62ac 100644 --- a/nixos/modules/installer/cd-dvd/system-tarball-fuloong2f.nix +++ b/nixos/modules/installer/cd-dvd/system-tarball-fuloong2f.nix @@ -104,7 +104,7 @@ in ''; # Some more help text. - services.mingetty.helpLine = + services.getty.helpLine = '' Log in as "root" with an empty password. ${ diff --git a/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix b/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix index 0e67ae7de698..95579f3ca06d 100644 --- a/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix +++ b/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix @@ -122,7 +122,7 @@ in device = "/dev/something"; }; - services.mingetty = { + services.getty = { # Some more help text. helpLine = '' Log in as "root" with an empty password. ${ diff --git a/nixos/modules/installer/tools/nixos-enter.sh b/nixos/modules/installer/tools/nixos-enter.sh index c72ef6e9c28b..450d77618148 100644 --- a/nixos/modules/installer/tools/nixos-enter.sh +++ b/nixos/modules/installer/tools/nixos-enter.sh @@ -69,6 +69,9 @@ mount --rbind /sys "$mountPoint/sys" # Run the activation script. Set $LOCALE_ARCHIVE to supress some Perl locale warnings. LOCALE_ARCHIVE="$system/sw/lib/locale/locale-archive" chroot "$mountPoint" "$system/activate" 1>&2 || true + + # Create /tmp + chroot "$mountPoint" systemd-tmpfiles --create --remove --exclude-prefix=/dev 1>&2 || true ) exec chroot "$mountPoint" "${command[@]}" diff --git a/nixos/modules/misc/documentation.nix b/nixos/modules/misc/documentation.nix index fe0263f158f4..d81d6c6cb9b8 100644 --- a/nixos/modules/misc/documentation.nix +++ b/nixos/modules/misc/documentation.nix @@ -261,7 +261,7 @@ in ++ optionals cfg.doc.enable ([ manual.manualHTML nixos-help ] ++ optionals config.services.xserver.enable [ pkgs.nixos-icons ]); - services.mingetty.helpLine = mkIf cfg.doc.enable ( + services.getty.helpLine = mkIf cfg.doc.enable ( "\nRun 'nixos-help' for the NixOS manual." ); }) diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index cf0198d7b93d..feb9c68301d5 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -143,7 +143,7 @@ in nix-ssh = 104; dictd = 105; couchdb = 106; - searx = 107; + #searx = 107; # dynamically allocated as of 2020-10-27 kippo = 108; jenkins = 109; systemd-journal-gateway = 110; @@ -457,7 +457,7 @@ in #nix-ssh = 104; # unused dictd = 105; couchdb = 106; - searx = 107; + #searx = 107; # dynamically allocated as of 2020-10-27 kippo = 108; jenkins = 109; systemd-journal-gateway = 110; diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 90f40db7834b..a71c804428da 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -82,6 +82,7 @@ ./hardware/xpadneo.nix ./i18n/input-method/default.nix ./i18n/input-method/fcitx.nix + ./i18n/input-method/fcitx5.nix ./i18n/input-method/hime.nix ./i18n/input-method/ibus.nix ./i18n/input-method/nabi.nix @@ -101,6 +102,7 @@ ./misc/version.nix ./misc/nixops-autoluks.nix ./programs/adb.nix + ./programs/appgate-sdp.nix ./programs/atop.nix ./programs/autojump.nix ./programs/bandwhich.nix @@ -226,6 +228,7 @@ ./services/audio/icecast.nix ./services/audio/liquidsoap.nix ./services/audio/mpd.nix + ./services/audio/mpdscribble.nix ./services/audio/mopidy.nix ./services/audio/roon-server.nix ./services/audio/slimserver.nix @@ -492,6 +495,7 @@ ./services/misc/nix-ssh-serve.nix ./services/misc/novacomd.nix ./services/misc/nzbget.nix + ./services/misc/nzbhydra2.nix ./services/misc/octoprint.nix ./services/misc/osrm.nix ./services/misc/packagekit.nix @@ -540,6 +544,7 @@ ./services/monitoring/do-agent.nix ./services/monitoring/fusion-inventory.nix ./services/monitoring/grafana.nix + ./services/monitoring/grafana-image-renderer.nix ./services/monitoring/grafana-reporter.nix ./services/monitoring/graphite.nix ./services/monitoring/hdaps.nix @@ -745,6 +750,7 @@ ./services/networking/skydns.nix ./services/networking/shadowsocks.nix ./services/networking/shairport-sync.nix + ./services/networking/shellhub-agent.nix ./services/networking/shorewall.nix ./services/networking/shorewall6.nix ./services/networking/shout.nix @@ -850,7 +856,7 @@ ./services/torrent/peerflix.nix ./services/torrent/rtorrent.nix ./services/torrent/transmission.nix - ./services/ttys/agetty.nix + ./services/ttys/getty.nix ./services/ttys/gpm.nix ./services/ttys/kmscon.nix ./services/wayland/cage.nix @@ -894,6 +900,7 @@ ./services/web-apps/selfoss.nix ./services/web-apps/shiori.nix ./services/web-apps/virtlyst.nix + ./services/web-apps/whitebophir.nix ./services/web-apps/wordpress.nix ./services/web-apps/youtrack.nix ./services/web-apps/zabbix.nix @@ -949,6 +956,7 @@ ./services/x11/urxvtd.nix ./services/x11/window-managers/awesome.nix ./services/x11/window-managers/default.nix + ./services/x11/window-managers/clfswm.nix ./services/x11/window-managers/fluxbox.nix ./services/x11/window-managers/icewm.nix ./services/x11/window-managers/bspwm.nix diff --git a/nixos/modules/profiles/all-hardware.nix b/nixos/modules/profiles/all-hardware.nix index 19f821ae17f3..d460c52dbefd 100644 --- a/nixos/modules/profiles/all-hardware.nix +++ b/nixos/modules/profiles/all-hardware.nix @@ -3,8 +3,10 @@ # enabled in the initrd. Its primary use is in the NixOS installation # CDs. -{ ... }: - +{ pkgs, lib,... }: +let + platform = pkgs.stdenv.hostPlatform; +in { # The initrd has to contain any module that might be necessary for @@ -42,7 +44,10 @@ "virtio_net" "virtio_pci" "virtio_blk" "virtio_scsi" "virtio_balloon" "virtio_console" # VMware support. - "mptspi" "vmw_balloon" "vmwgfx" "vmw_vmci" "vmw_vsock_vmci_transport" "vmxnet3" "vsock" + "mptspi" "vmxnet3" "vsock" + ] ++ lib.optional platform.isx86 "vmw_balloon" + ++ lib.optionals (!platform.isAarch64) [ # not sure where else they're missing + "vmw_vmci" "vmwgfx" "vmw_vsock_vmci_transport" # Hyper-V support. "hv_storvsc" diff --git a/nixos/modules/profiles/hardened.nix b/nixos/modules/profiles/hardened.nix index 42ed62b06304..680fa40b9119 100644 --- a/nixos/modules/profiles/hardened.nix +++ b/nixos/modules/profiles/hardened.nix @@ -1,5 +1,10 @@ # A profile with most (vanilla) hardening options enabled by default, -# potentially at the cost of features and performance. +# potentially at the cost of stability, features and performance. +# +# This profile enables options that are known to affect system +# stability. If you experience any stability issues when using the +# profile, try disabling it. If you report an issue and use this +# profile, always mention that you do. { config, lib, pkgs, ... }: diff --git a/nixos/modules/profiles/installation-device.nix b/nixos/modules/profiles/installation-device.nix index e68ea1b08776..7dc493fb495d 100644 --- a/nixos/modules/profiles/installation-device.nix +++ b/nixos/modules/profiles/installation-device.nix @@ -45,10 +45,10 @@ with lib; }; # Automatically log in at the virtual consoles. - services.mingetty.autologinUser = "nixos"; + services.getty.autologinUser = "nixos"; # Some more help text. - services.mingetty.helpLine = '' + services.getty.helpLine = '' The "nixos" and "root" accounts have empty passwords. An ssh daemon is running. You then must set a password diff --git a/nixos/modules/programs/appgate-sdp.nix b/nixos/modules/programs/appgate-sdp.nix new file mode 100644 index 000000000000..1dec4ecf9ecc --- /dev/null +++ b/nixos/modules/programs/appgate-sdp.nix @@ -0,0 +1,23 @@ +{ config, pkgs, lib, ... }: + +with lib; + +{ + options = { + programs.appgate-sdp = { + enable = mkEnableOption + "AppGate SDP VPN client"; + }; + }; + + config = mkIf config.programs.appgate-sdp.enable { + boot.kernelModules = [ "tun" ]; + environment.systemPackages = [ pkgs.appgate-sdp ]; + services.dbus.packages = [ pkgs.appgate-sdp ]; + systemd = { + packages = [ pkgs.appgate-sdp ]; + # https://github.com/NixOS/nixpkgs/issues/81138 + services.appgatedriver.wantedBy = [ "multi-user.target" ]; + }; + }; +} diff --git a/nixos/modules/programs/command-not-found/command-not-found.pl b/nixos/modules/programs/command-not-found/command-not-found.pl index ab7aa204653c..7515dd975c31 100644 --- a/nixos/modules/programs/command-not-found/command-not-found.pl +++ b/nixos/modules/programs/command-not-found/command-not-found.pl @@ -27,8 +27,8 @@ if (!defined $res || scalar @$res == 0) { my $package = @$res[0]->{package}; if ($ENV{"NIX_AUTO_INSTALL"} // "") { print STDERR <{package}\n" foreach @$res; + print STDERR " nix-shell -p $_->{package}\n" foreach @$res; } exit 127; diff --git a/nixos/modules/programs/fish.nix b/nixos/modules/programs/fish.nix index 50d1077dd410..34a0dc6a2df3 100644 --- a/nixos/modules/programs/fish.nix +++ b/nixos/modules/programs/fish.nix @@ -112,7 +112,7 @@ in environment.etc."fish/nixos-env-preinit.fish".text = '' # This happens before $__fish_datadir/config.fish sets fish_function_path, so it is currently # unset. We set it and then completely erase it, leaving its configuration to $__fish_datadir/config.fish - set fish_function_path ${pkgs.fish-foreign-env}/share/fish-foreign-env/functions $__fish_datadir/functions + set fish_function_path ${pkgs.fishPlugins.foreign-env}/share/fish/vendor_functions.d $__fish_datadir/functions # source the NixOS environment config if [ -z "$__NIXOS_SET_ENVIRONMENT_DONE" ] @@ -128,7 +128,7 @@ in # if we haven't sourced the general config, do it if not set -q __fish_nixos_general_config_sourced - set fish_function_path ${pkgs.fish-foreign-env}/share/fish-foreign-env/functions $fish_function_path + set --prepend fish_function_path ${pkgs.fishPlugins.foreign-env}/share/fish/vendor_functions.d fenv source /etc/fish/foreign-env/shellInit > /dev/null set -e fish_function_path[1] @@ -142,7 +142,7 @@ in # if we haven't sourced the login config, do it status --is-login; and not set -q __fish_nixos_login_config_sourced and begin - set fish_function_path ${pkgs.fish-foreign-env}/share/fish-foreign-env/functions $fish_function_path + set --prepend fish_function_path ${pkgs.fishPlugins.foreign-env}/share/fish/vendor_functions.d fenv source /etc/fish/foreign-env/loginShellInit > /dev/null set -e fish_function_path[1] @@ -158,7 +158,7 @@ in and begin ${fishAliases} - set fish_function_path ${pkgs.fish-foreign-env}/share/fish-foreign-env/functions $fish_function_path + set --prepend fish_function_path ${pkgs.fishPlugins.foreign-env}/share/fish/vendor_functions.d fenv source /etc/fish/foreign-env/interactiveShellInit > /dev/null set -e fish_function_path[1] diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix index a428103eaa96..1522111dbddf 100644 --- a/nixos/modules/security/pam.nix +++ b/nixos/modules/security/pam.nix @@ -394,7 +394,7 @@ let ${optionalString cfg.requireWheel "auth required pam_wheel.so use_uid"} ${optionalString cfg.logFailures - "auth required pam_tally.so"} + "auth required pam_faillock.so"} ${optionalString (config.security.pam.enableSSHAgentAuth && cfg.sshAgentAuth) "auth sufficient ${pkgs.pam_ssh_agent_auth}/libexec/pam_ssh_agent_auth.so file=${lib.concatStringsSep ":" config.services.openssh.authorizedKeysFiles}"} ${optionalString cfg.fprintAuth diff --git a/nixos/modules/services/audio/mpd.nix b/nixos/modules/services/audio/mpd.nix index e09e4861646c..2e5953dc6f44 100644 --- a/nixos/modules/services/audio/mpd.nix +++ b/nixos/modules/services/audio/mpd.nix @@ -10,6 +10,14 @@ let gid = config.ids.gids.mpd; cfg = config.services.mpd; + credentialsPlaceholder = (creds: + let + placeholders = (imap0 + (i: c: ''password "{{password-${toString i}}}@${concatStringsSep "," c.permissions}"'') + creds); + in + concatStringsSep "\n" placeholders); + mpdConf = pkgs.writeText "mpd.conf" '' # This file was automatically generated by NixOS. Edit mpd's configuration # via NixOS' configuration.nix, as this file will be rewritten upon mpd's @@ -32,6 +40,8 @@ let } ''} + ${optionalString (cfg.credentials != []) (credentialsPlaceholder cfg.credentials)} + ${cfg.extraConfig} ''; @@ -152,16 +162,35 @@ in { ''; }; - credentialsFile = mkOption { - type = types.path; + credentials = mkOption { + type = types.listOf (types.submodule { + options = { + passwordFile = mkOption { + type = types.path; + description = '' + Path to file containing the password. + ''; + }; + permissions = let + perms = ["read" "add" "control" "admin"]; + in mkOption { + type = types.listOf (types.enum perms); + default = [ "read" ]; + description = '' + List of permissions that are granted with this password. + Permissions can be "${concatStringsSep "\", \"" perms}". + ''; + }; + }; + }); description = '' - Path to a file to be merged with the settings during the service startup. - Useful to merge a file which is better kept out of the Nix store - because it contains sensible data like MPD's password. Example may look like this: - password "myMpdPassword@read,add,control,admin" + Credentials and permissions for accessing the mpd server. ''; - default = "/dev/null"; - example = "/var/lib/secrets/mpd.conf"; + default = []; + example = [ + {passwordFile = "/var/lib/secrets/mpd_readonly_password"; permissions = [ "read" ];} + {passwordFile = "/var/lib/secrets/mpd_admin_password"; permissions = ["read" "add" "control" "admin"];} + ]; }; fluidsynth = mkOption { @@ -201,12 +230,16 @@ in { serviceConfig = mkMerge [ { User = "${cfg.user}"; - ExecStart = "${pkgs.mpd}/bin/mpd --no-daemon /etc/mpd.conf"; - ExecStartPre = pkgs.writeScript "mpd-start-pre" '' - #!${pkgs.runtimeShell} + ExecStart = "${pkgs.mpd}/bin/mpd --no-daemon /run/mpd/mpd.conf"; + ExecStartPre = pkgs.writeShellScript "mpd-start-pre" '' set -euo pipefail - cat ${mpdConf} ${cfg.credentialsFile} > /etc/mpd.conf + install -m 600 ${mpdConf} /run/mpd/mpd.conf + ${optionalString (cfg.credentials != []) + "${pkgs.replace}/bin/replace-literal -fe ${ + concatStringsSep " -a " (imap0 (i: c: "\"{{password-${toString i}}}\" \"$(cat ${c.passwordFile})\"") cfg.credentials) + } /run/mpd/mpd.conf"} ''; + RuntimeDirectory = "mpd"; Type = "notify"; LimitRTPRIO = 50; LimitRTTIME = "infinity"; @@ -230,14 +263,6 @@ in { }) ]; }; - environment.etc."mpd.conf" = { - mode = "0640"; - group = cfg.group; - user = cfg.user; - # To be modified by the service' ExecStartPre - text = '' - ''; - }; users.users = optionalAttrs (cfg.user == name) { ${name} = { diff --git a/nixos/modules/services/audio/mpdscribble.nix b/nixos/modules/services/audio/mpdscribble.nix new file mode 100644 index 000000000000..642d8743935f --- /dev/null +++ b/nixos/modules/services/audio/mpdscribble.nix @@ -0,0 +1,202 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.mpdscribble; + mpdCfg = config.services.mpd; + + endpointUrls = { + "last.fm" = "http://post.audioscrobbler.com"; + "libre.fm" = "http://turtle.libre.fm"; + "jamendo" = "http://postaudioscrobbler.jamendo.com"; + "listenbrainz" = "http://proxy.listenbrainz.org"; + }; + + mkSection = secname: secCfg: '' + [${secname}] + url = ${secCfg.url} + username = ${secCfg.username} + password = {{${secname}_PASSWORD}} + journal = /var/lib/mpdscribble/${secname}.journal + ''; + + endpoints = concatStringsSep "\n" (mapAttrsToList mkSection cfg.endpoints); + cfgTemplate = pkgs.writeText "mpdscribble.conf" '' + ## This file was automatically genenrated by NixOS and will be overwritten. + ## Do not edit. Edit your NixOS configuration instead. + + ## mpdscribble - an audioscrobbler for the Music Player Daemon. + ## http://mpd.wikia.com/wiki/Client:mpdscribble + + # HTTP proxy URL. + ${optionalString (cfg.proxy != null) "proxy = ${cfg.proxy}"} + + # The location of the mpdscribble log file. The special value + # "syslog" makes mpdscribble use the local syslog daemon. On most + # systems, log messages will appear in /var/log/daemon.log then. + # "-" means log to stderr (the current terminal). + log = - + + # How verbose mpdscribble's logging should be. Default is 1. + verbose = ${toString cfg.verbose} + + # How often should mpdscribble save the journal file? [seconds] + journal_interval = ${toString cfg.journalInterval} + + # The host running MPD, possibly protected by a password + # ([PASSWORD@]HOSTNAME). + host = ${(optionalString (cfg.passwordFile != null) "{{MPD_PASSWORD}}@") + cfg.host} + + # The port that the MPD listens on and mpdscribble should try to + # connect to. + port = ${toString cfg.port} + + ${endpoints} + ''; + + cfgFile = "/run/mpdscribble/mpdscribble.conf"; + + replaceSecret = secretFile: placeholder: targetFile: + optionalString (secretFile != null) '' + ${pkgs.replace}/bin/replace-literal -ef ${placeholder} "$(cat ${secretFile})" ${targetFile}''; + + preStart = pkgs.writeShellScript "mpdscribble-pre-start" '' + cp -f "${cfgTemplate}" "${cfgFile}" + ${replaceSecret cfg.passwordFile "{{MPD_PASSWORD}}" cfgFile} + ${concatStringsSep "\n" (mapAttrsToList (secname: cfg: + replaceSecret cfg.passwordFile "{{${secname}_PASSWORD}}" cfgFile) + cfg.endpoints)} + ''; + + localMpd = (cfg.host == "localhost" || cfg.host == "127.0.0.1"); + +in { + ###### interface + + options.services.mpdscribble = { + + enable = mkEnableOption "mpdscribble"; + + proxy = mkOption { + default = null; + type = types.nullOr types.str; + description = '' + HTTP proxy URL. + ''; + }; + + verbose = mkOption { + default = 1; + type = types.int; + description = '' + Log level for the mpdscribble daemon. + ''; + }; + + journalInterval = mkOption { + default = 600; + example = 60; + type = types.int; + description = '' + How often should mpdscribble save the journal file? [seconds] + ''; + }; + + host = mkOption { + default = (if mpdCfg.network.listenAddress != "any" then + mpdCfg.network.listenAddress + else + "localhost"); + type = types.str; + description = '' + Host for the mpdscribble daemon to search for a mpd daemon on. + ''; + }; + + passwordFile = mkOption { + default = if localMpd then + (findFirst + (c: any (x: x == "read") c.permissions) + { passwordFile = null; } + mpdCfg.credentials).passwordFile + else + null; + type = types.nullOr types.str; + description = '' + File containing the password for the mpd daemon. + If there is a local mpd configured using + the default is automatically set to a matching passwordFile of the local mpd. + ''; + }; + + port = mkOption { + default = mpdCfg.network.port; + type = types.port; + description = '' + Port for the mpdscribble daemon to search for a mpd daemon on. + ''; + }; + + endpoints = mkOption { + type = (let + endpoint = { name, ... }: { + options = { + url = mkOption { + type = types.str; + default = endpointUrls.${name} or ""; + description = + "The url endpoint where the scrobble API is listening."; + }; + username = mkOption { + type = types.str; + description = '' + Username for the scrobble service. + ''; + }; + passwordFile = mkOption { + type = types.nullOr types.str; + description = + "File containing the password, either as MD5SUM or cleartext."; + }; + }; + }; + in types.attrsOf (types.submodule endpoint)); + default = { }; + example = { + "last.fm" = { + username = "foo"; + passwordFile = "/run/secrets/lastfm_password"; + }; + }; + description = '' + Endpoints to scrobble to. + If the endpoint is one of "${ + concatStringsSep "\", \"" (attrNames endpointUrls) + }" the url is set automatically. + ''; + }; + + }; + + ###### implementation + + config = mkIf cfg.enable { + systemd.services.mpdscribble = { + after = [ "network.target" ] ++ (optional localMpd "mpd.service"); + description = "mpdscribble mpd scrobble client"; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + DynamicUser = true; + StateDirectory = "mpdscribble"; + RuntimeDirectory = "mpdscribble"; + RuntimeDirectoryMode = "700"; + # TODO use LoadCredential= instead of running preStart with full privileges? + ExecStartPre = "+${preStart}"; + ExecStart = + "${pkgs.mpdscribble}/bin/mpdscribble --no-daemon --conf ${cfgFile}"; + }; + }; + }; + +} diff --git a/nixos/modules/services/backup/tarsnap.nix b/nixos/modules/services/backup/tarsnap.nix index e1200731c2ca..d31b92abde0a 100644 --- a/nixos/modules/services/backup/tarsnap.nix +++ b/nixos/modules/services/backup/tarsnap.nix @@ -29,13 +29,7 @@ in options = { services.tarsnap = { - enable = mkOption { - type = types.bool; - default = false; - description = '' - Enable periodic tarsnap backups. - ''; - }; + enable = mkEnableOption "periodic tarsnap backups"; keyfile = mkOption { type = types.str; @@ -279,7 +273,8 @@ in Tarsnap archive configurations. Each attribute names an archive to be created at a given time interval, according to the options associated with it. When uploading to the tarsnap server, - archive names are suffixed by a 1 second resolution timestamp. + archive names are suffixed by a 1 second resolution timestamp, + with the format %Y%m%d%H%M%S. For each member of the set is created a timer which triggers the instanced tarsnap-archive-name service unit. You may use diff --git a/nixos/modules/services/databases/openldap.nix b/nixos/modules/services/databases/openldap.nix index 94a5c573768b..f0efc659cff7 100644 --- a/nixos/modules/services/databases/openldap.nix +++ b/nixos/modules/services/databases/openldap.nix @@ -244,7 +244,7 @@ in { }; }; - meta.maintainers = with lib.maintainters; [ mic92 kwohlfahrt ]; + meta.maintainers = with lib.maintainers; [ mic92 kwohlfahrt ]; config = mkIf cfg.enable { assertions = map (opt: { diff --git a/nixos/modules/services/databases/redis.nix b/nixos/modules/services/databases/redis.nix index 6b8853ae390b..9628d30e76a3 100644 --- a/nixos/modules/services/databases/redis.nix +++ b/nixos/modules/services/databases/redis.nix @@ -4,31 +4,16 @@ with lib; let cfg = config.services.redis; - redisBool = b: if b then "yes" else "no"; - condOption = name: value: if value != null then "${name} ${toString value}" else ""; - redisConfig = pkgs.writeText "redis.conf" '' - port ${toString cfg.port} - ${condOption "bind" cfg.bind} - ${condOption "unixsocket" cfg.unixSocket} - daemonize no - supervised systemd - loglevel ${cfg.logLevel} - logfile ${cfg.logfile} - syslog-enabled ${redisBool cfg.syslog} - databases ${toString cfg.databases} - ${concatMapStrings (d: "save ${toString (builtins.elemAt d 0)} ${toString (builtins.elemAt d 1)}\n") cfg.save} - dbfilename dump.rdb - dir /var/lib/redis - ${if cfg.slaveOf != null then "slaveof ${cfg.slaveOf.ip} ${toString cfg.slaveOf.port}" else ""} - ${condOption "masterauth" cfg.masterAuth} - ${condOption "requirepass" cfg.requirePass} - appendOnly ${redisBool cfg.appendOnly} - appendfsync ${cfg.appendFsync} - slowlog-log-slower-than ${toString cfg.slowLogLogSlowerThan} - slowlog-max-len ${toString cfg.slowLogMaxLen} - ${cfg.extraConfig} - ''; + mkValueString = value: + if value == true then "yes" + else if value == false then "no" + else generators.mkValueStringDefault { } value; + + redisConfig = pkgs.writeText "redis.conf" (generators.toKeyValue { + listsAsDuplicateKeys = true; + mkKeyValue = generators.mkKeyValueDefault { inherit mkValueString; } " "; + } cfg.settings); in { imports = [ @@ -37,6 +22,7 @@ in (mkRemovedOptionModule [ "services" "redis" "dbFilename" ] "The redis module now uses /var/lib/redis/dump.rdb as database dump location.") (mkRemovedOptionModule [ "services" "redis" "appendOnlyFilename" ] "This option was never used.") (mkRemovedOptionModule [ "services" "redis" "pidFile" ] "This option was removed.") + (mkRemovedOptionModule [ "services" "redis" "extraConfig" ] "Use services.redis.settings instead.") ]; ###### interface @@ -191,10 +177,20 @@ in description = "Maximum number of items to keep in slow log."; }; - extraConfig = mkOption { - type = types.lines; - default = ""; - description = "Extra configuration options for redis.conf."; + settings = mkOption { + type = with types; attrsOf (oneOf [ bool int str (listOf str) ]); + default = {}; + description = '' + Redis configuration. Refer to + + for details on supported values. + ''; + example = literalExample '' + { + unixsocketperm = "700"; + loadmodule = [ "/path/to/my_module.so" "/path/to/other_module.so" ]; + } + ''; }; }; @@ -225,6 +221,30 @@ in environment.systemPackages = [ cfg.package ]; + services.redis.settings = mkMerge [ + { + port = cfg.port; + daemonize = false; + supervised = "systemd"; + loglevel = cfg.logLevel; + logfile = cfg.logfile; + syslog-enabled = cfg.syslog; + databases = cfg.databases; + save = map (d: "${toString (builtins.elemAt d 0)} ${toString (builtins.elemAt d 1)}") cfg.save; + dbfilename = "dump.rdb"; + dir = "/var/lib/redis"; + appendOnly = cfg.appendOnly; + appendfsync = cfg.appendFsync; + slowlog-log-slower-than = cfg.slowLogLogSlowerThan; + slowlog-max-len = cfg.slowLogMaxLen; + } + (mkIf (cfg.bind != null) { bind = cfg.bind; }) + (mkIf (cfg.unixSocket != null) { unixsocket = cfg.unixSocket; }) + (mkIf (cfg.slaveOf != null) { slaveof = "${cfg.slaveOf.ip} ${cfg.slaveOf.port}"; }) + (mkIf (cfg.masterAuth != null) { masterauth = cfg.masterAuth; }) + (mkIf (cfg.requirePass != null) { requirepass = cfg.requirePass; }) + ]; + systemd.services.redis = { description = "Redis Server"; diff --git a/nixos/modules/services/desktops/pipewire.nix b/nixos/modules/services/desktops/pipewire.nix index 0ef988d9e69f..134becf6b0c4 100644 --- a/nixos/modules/services/desktops/pipewire.nix +++ b/nixos/modules/services/desktops/pipewire.nix @@ -93,11 +93,11 @@ in { assertions = [ { assertion = cfg.pulse.enable -> !config.hardware.pulseaudio.enable; - message = "PipeWire based PulseAudio server emulation replaces PulseAudio"; + message = "PipeWire based PulseAudio server emulation replaces PulseAudio. This option requires `hardware.pulseaudio.enable` to be set to false"; } { assertion = cfg.jack.enable -> !config.services.jack.jackd.enable; - message = "PipeWire based JACK emulation doesn't use the JACK service"; + message = "PipeWire based JACK emulation doesn't use the JACK service. This option requires `services.jack.jackd.enable` to be set to false"; } ]; diff --git a/nixos/modules/services/development/hoogle.nix b/nixos/modules/services/development/hoogle.nix index cbf13f027de2..a661e3acae3e 100644 --- a/nixos/modules/services/development/hoogle.nix +++ b/nixos/modules/services/development/hoogle.nix @@ -49,6 +49,11 @@ in { default = "https://hoogle.haskell.org"; }; + host = mkOption { + type = types.str; + description = "Set the host to bind on."; + default = "127.0.0.1"; + }; }; config = mkIf cfg.enable { @@ -59,7 +64,7 @@ in { serviceConfig = { Restart = "always"; - ExecStart = ''${hoogleEnv}/bin/hoogle server --local --port ${toString cfg.port} --home ${cfg.home}''; + ExecStart = ''${hoogleEnv}/bin/hoogle server --local --port ${toString cfg.port} --home ${cfg.home} --host ${cfg.host}''; DynamicUser = true; diff --git a/nixos/modules/services/editors/emacs.xml b/nixos/modules/services/editors/emacs.xml index 302aa1ed7c48..fd99ee9442c9 100644 --- a/nixos/modules/services/editors/emacs.xml +++ b/nixos/modules/services/editors/emacs.xml @@ -156,7 +156,7 @@ $ ./result/bin/emacs let myEmacs = pkgs.emacs; - emacsWithPackages = (pkgs.emacsPackagesGen myEmacs).emacsWithPackages; + emacsWithPackages = (pkgs.emacsPackagesFor myEmacs).emacsWithPackages; in emacsWithPackages (epkgs: (with epkgs.melpaStablePackages; [ magit # ; Integrate git <C-x g> @@ -254,10 +254,10 @@ in Querying Emacs packages " -qaP -A emacsPackages.elpaPackages -nix-env -f "" -qaP -A emacsPackages.melpaPackages -nix-env -f "" -qaP -A emacsPackages.melpaStablePackages -nix-env -f "" -qaP -A emacsPackages.orgPackages +nix-env -f "" -qaP -A emacs.pkgs.elpaPackages +nix-env -f "" -qaP -A emacs.pkgs.melpaPackages +nix-env -f "" -qaP -A emacs.pkgs.melpaStablePackages +nix-env -f "" -qaP -A emacs.pkgs.orgPackages ]]> diff --git a/nixos/modules/services/mail/mailman.nix b/nixos/modules/services/mail/mailman.nix index bf19da32324a..832b496f31c9 100644 --- a/nixos/modules/services/mail/mailman.nix +++ b/nixos/modules/services/mail/mailman.nix @@ -367,7 +367,7 @@ in { mailman-web-setup = { description = "Prepare mailman-web files and database"; - before = [ "uwsgi.service" "mailman-uwsgi.service" ]; + before = [ "mailman-uwsgi.service" ]; requiredBy = [ "mailman-uwsgi.service" ]; restartTriggers = [ config.environment.etc."mailman3/settings.py".source ]; script = '' diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix index 795a76f748a7..1dcdcab8d481 100644 --- a/nixos/modules/services/mail/postfix.nix +++ b/nixos/modules/services/mail/postfix.nix @@ -25,8 +25,6 @@ let clientRestrictions = concatStringsSep ", " (clientAccess ++ dnsBl); - smtpTlsSecurityLevel = if cfg.useDane then "dane" else "may"; - mainCf = let escape = replaceStrings ["$"] ["$$"]; mkList = items: "\n " + concatStringsSep ",\n " items; @@ -510,14 +508,6 @@ in ''; }; - useDane = mkOption { - type = types.bool; - default = false; - description = '' - Sets smtp_tls_security_level to "dane" rather than "may". See postconf(5) for details. - ''; - }; - sslCert = mkOption { type = types.str; default = ""; @@ -819,13 +809,13 @@ in // optionalAttrs cfg.enableHeaderChecks { header_checks = [ "regexp:/etc/postfix/header_checks" ]; } // optionalAttrs (cfg.tlsTrustedAuthorities != "") { smtp_tls_CAfile = cfg.tlsTrustedAuthorities; - smtp_tls_security_level = smtpTlsSecurityLevel; + smtp_tls_security_level = mkDefault "may"; } // optionalAttrs (cfg.sslCert != "") { smtp_tls_cert_file = cfg.sslCert; smtp_tls_key_file = cfg.sslKey; - smtp_tls_security_level = smtpTlsSecurityLevel; + smtp_tls_security_level = mkDefault "may"; smtpd_tls_cert_file = cfg.sslCert; smtpd_tls_key_file = cfg.sslKey; @@ -969,5 +959,9 @@ in imports = [ (mkRemovedOptionModule [ "services" "postfix" "sslCACert" ] "services.postfix.sslCACert was replaced by services.postfix.tlsTrustedAuthorities. In case you intend that your server should validate requested client certificates use services.postfix.extraConfig.") + + (mkChangedOptionModule [ "services" "postfix" "useDane" ] + [ "services" "postfix" "config" "smtp_tls_security_level" ] + (config: mkIf config.services.postfix.useDane "dane")) ]; } diff --git a/nixos/modules/services/misc/gitea.nix b/nixos/modules/services/misc/gitea.nix index af80e99746be..ac702a05ee8b 100644 --- a/nixos/modules/services/misc/gitea.nix +++ b/nixos/modules/services/misc/gitea.nix @@ -605,5 +605,5 @@ in timerConfig.OnCalendar = cfg.dump.interval; }; }; - meta.maintainers = with lib.maintainers; [ srhb ]; + meta.maintainers = with lib.maintainers; [ srhb ma27 ]; } diff --git a/nixos/modules/services/misc/matrix-synapse.xml b/nixos/modules/services/misc/matrix-synapse.xml index fbfa838b168b..5544c2035fb7 100644 --- a/nixos/modules/services/misc/matrix-synapse.xml +++ b/nixos/modules/services/misc/matrix-synapse.xml @@ -69,6 +69,9 @@ in { # i.e. to delegate from the host being accessible as ${config.networking.domain} # to another host actually running the Matrix homeserver. "${config.networking.domain}" = { + enableACME = true; + forceSSL = true; + locations."= /.well-known/matrix/server".extraConfig = let # use 443 instead of the default 8448 port to unite diff --git a/nixos/modules/services/misc/nzbhydra2.nix b/nixos/modules/services/misc/nzbhydra2.nix new file mode 100644 index 000000000000..c396b4b8f6e9 --- /dev/null +++ b/nixos/modules/services/misc/nzbhydra2.nix @@ -0,0 +1,78 @@ +{ config, pkgs, lib, ... }: + +with lib; + +let cfg = config.services.nzbhydra2; + +in { + options = { + services.nzbhydra2 = { + enable = mkEnableOption "NZBHydra2"; + + dataDir = mkOption { + type = types.str; + default = "/var/lib/nzbhydra2"; + description = "The directory where NZBHydra2 stores its data files."; + }; + + openFirewall = mkOption { + type = types.bool; + default = false; + description = + "Open ports in the firewall for the NZBHydra2 web interface."; + }; + + package = mkOption { + type = types.package; + default = pkgs.nzbhydra2; + defaultText = "pkgs.nzbhydra2"; + description = "NZBHydra2 package to use."; + }; + }; + }; + + config = mkIf cfg.enable { + systemd.tmpfiles.rules = + [ "d '${cfg.dataDir}' 0700 nzbhydra2 nzbhydra2 - -" ]; + + systemd.services.nzbhydra2 = { + description = "NZBHydra2"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + + serviceConfig = { + Type = "simple"; + User = "nzbhydra2"; + Group = "nzbhydra2"; + ExecStart = + "${cfg.package}/bin/nzbhydra2 --nobrowser --datafolder '${cfg.dataDir}'"; + Restart = "on-failure"; + # Hardening + NoNewPrivileges = true; + PrivateTmp = true; + PrivateDevices = true; + DevicePolicy = "closed"; + ProtectSystem = "strict"; + ReadWritePaths = cfg.dataDir; + ProtectHome = "read-only"; + ProtectControlGroups = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + RestrictAddressFamilies ="AF_UNIX AF_INET AF_INET6 AF_NETLINK"; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + LockPersonality = true; + }; + }; + + networking.firewall = mkIf cfg.openFirewall { allowedTCPPorts = [ 5076 ]; }; + + users.users.nzbhydra2 = { + group = "nzbhydra2"; + isSystemUser = true; + }; + + users.groups.nzbhydra2 = {}; + }; +} diff --git a/nixos/modules/services/monitoring/grafana-image-renderer.nix b/nixos/modules/services/monitoring/grafana-image-renderer.nix new file mode 100644 index 000000000000..a010a5316bae --- /dev/null +++ b/nixos/modules/services/monitoring/grafana-image-renderer.nix @@ -0,0 +1,150 @@ +{ lib, pkgs, config, ... }: + +with lib; + +let + cfg = config.services.grafana-image-renderer; + + format = pkgs.formats.json { }; + + configFile = format.generate "grafana-image-renderer-config.json" cfg.settings; +in { + options.services.grafana-image-renderer = { + enable = mkEnableOption "grafana-image-renderer"; + + chromium = mkOption { + type = types.package; + description = '' + The chromium to use for image rendering. + ''; + }; + + verbose = mkEnableOption "verbosity for the service"; + + provisionGrafana = mkEnableOption "Grafana configuration for grafana-image-renderer"; + + settings = mkOption { + type = types.submodule { + freeformType = format.type; + + options = { + service = { + port = mkOption { + type = types.port; + default = 8081; + description = '' + The TCP port to use for the rendering server. + ''; + }; + logging.level = mkOption { + type = types.enum [ "error" "warning" "info" "debug" ]; + default = "info"; + description = '' + The log-level of the grafana-image-renderer.service-unit. + ''; + }; + }; + rendering = { + width = mkOption { + default = 1000; + type = types.ints.positive; + description = '' + Width of the PNG used to display the alerting graph. + ''; + }; + height = mkOption { + default = 500; + type = types.ints.positive; + description = '' + Height of the PNG used to display the alerting graph. + ''; + }; + mode = mkOption { + default = "default"; + type = types.enum [ "default" "reusable" "clustered" ]; + description = '' + Rendering mode of grafana-image-renderer: + + default: Creates on browser-instance + per rendering request. + reusable: One browser instance + will be started and reused for each rendering request. + clustered: allows to precisely + configure how many browser-instances are supposed to be used. The values + for that mode can be declared in rendering.clustering. + + + ''; + }; + args = mkOption { + type = types.listOf types.str; + default = [ "--no-sandbox" ]; + description = '' + List of CLI flags passed to chromium. + ''; + }; + }; + }; + }; + + default = {}; + + description = '' + Configuration attributes for grafana-image-renderer. + + See + for supported values. + ''; + }; + }; + + config = mkIf cfg.enable { + assertions = [ + { assertion = cfg.provisionGrafana -> config.services.grafana.enable; + message = '' + To provision a Grafana instance to use grafana-image-renderer, + `services.grafana.enable` must be set to `true`! + ''; + } + ]; + + services.grafana.extraOptions = mkIf cfg.provisionGrafana { + RENDERING_SERVER_URL = "http://localhost:${toString cfg.settings.service.port}/render"; + RENDERING_CALLBACK_URL = "http://localhost:${toString config.services.grafana.port}"; + }; + + services.grafana-image-renderer.chromium = mkDefault pkgs.chromium; + + services.grafana-image-renderer.settings = { + rendering = mapAttrs (const mkDefault) { + chromeBin = "${cfg.chromium}/bin/chromium"; + verboseLogging = cfg.verbose; + timezone = config.time.timeZone; + }; + + services = { + logging.level = mkIf cfg.verbose (mkDefault "debug"); + metrics.enabled = mkDefault false; + }; + }; + + systemd.services.grafana-image-renderer = { + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + description = " A Grafana backend plugin that handles rendering of panels & dashboards to PNGs using headless browser (Chromium/Chrome)"; + + environment = { + PUPPETEER_SKIP_CHROMIUM_DOWNLOAD = "true"; + }; + + serviceConfig = { + DynamicUser = true; + PrivateTmp = true; + ExecStart = "${pkgs.grafana-image-renderer}/bin/grafana-image-renderer server --config=${configFile}"; + Restart = "always"; + }; + }; + }; + + meta.maintainers = with maintainers; [ ma27 ]; +} diff --git a/nixos/modules/services/monitoring/grafana.nix b/nixos/modules/services/monitoring/grafana.nix index b0c81a46d4d8..c8515c4b8988 100644 --- a/nixos/modules/services/monitoring/grafana.nix +++ b/nixos/modules/services/monitoring/grafana.nix @@ -5,10 +5,11 @@ with lib; let cfg = config.services.grafana; opt = options.services.grafana; + declarativePlugins = pkgs.linkFarm "grafana-plugins" (builtins.map (pkg: { name = pkg.pname; path = pkg; }) cfg.declarativePlugins); envOptions = { PATHS_DATA = cfg.dataDir; - PATHS_PLUGINS = "${cfg.dataDir}/plugins"; + PATHS_PLUGINS = if builtins.isNull cfg.declarativePlugins then "${cfg.dataDir}/plugins" else declarativePlugins; PATHS_LOGS = "${cfg.dataDir}/log"; SERVER_PROTOCOL = cfg.protocol; @@ -260,6 +261,12 @@ in { defaultText = "pkgs.grafana"; type = types.package; }; + declarativePlugins = mkOption { + type = with types; nullOr (listOf path); + default = null; + description = "If non-null, then a list of packages containing Grafana plugins to install. If set, plugins cannot be manually installed."; + example = literalExample "with pkgs.grafanaPlugins; [ grafana-piechart-panel ]"; + }; dataDir = mkOption { description = "Data directory."; diff --git a/nixos/modules/services/monitoring/prometheus/default.nix b/nixos/modules/services/monitoring/prometheus/default.nix index ace62342c9c6..9103a6f932db 100644 --- a/nixos/modules/services/monitoring/prometheus/default.nix +++ b/nixos/modules/services/monitoring/prometheus/default.nix @@ -112,17 +112,21 @@ let http://tools.ietf.org/html/rfc4366#section-3.1 ''; }; - remote_timeout = mkDefOpt types.str "30s" '' - Timeout for requests to the remote write endpoint. - ''; - relabel_configs = mkOpt (types.listOf promTypes.relabel_config) '' - List of remote write relabel configurations. - List of relabel configurations. - ''; name = mkOpt types.string '' - Name of the remote write config, which if specified must be unique among remote write configs. + Name of the remote read config, which if specified must be unique among remote read configs. The name will be used in metrics and logging in place of a generated value to help users distinguish between - remote write configs. + remote read configs. + ''; + required_matchers = mkOpt (types.attrsOf types.str) '' + An optional list of equality matchers which have to be + present in a selector to query the remote read endpoint. + ''; + remote_timeout = mkOpt types.str '' + Timeout for requests to the remote read endpoint. + ''; + read_recent = mkOpt types.bool '' + Whether reads should be made for queries for time ranges that + the local storage should have complete data for. ''; basic_auth = mkOpt (types.submodule { options = { @@ -136,30 +140,22 @@ let password_file = mkOpt types.str "HTTP password file"; }; }) '' - Sets the `Authorization` header on every remote write request with the + Sets the `Authorization` header on every remote read request with the configured username and password. password and password_file are mutually exclusive. ''; bearer_token = mkOpt types.str '' - Sets the `Authorization` header on every remote write request with + Sets the `Authorization` header on every remote read request with the configured bearer token. It is mutually exclusive with `bearer_token_file`. ''; bearer_token_file = mkOpt types.str '' - Sets the `Authorization` header on every remote write request with the bearer token + Sets the `Authorization` header on every remote read request with the bearer token read from the configured file. It is mutually exclusive with `bearer_token`. ''; tls_config = mkOpt promTypes.tls_config '' - Configures the remote write request's TLS settings. + Configures the remote read request's TLS settings. ''; proxy_url = mkOpt types.str "Optional Proxy URL."; - metadata_config = { - send = mkDefOpt types.bool "true" '' - Whether metric metadata is sent to remote storage or not. - ''; - send_interval = mkDefOpt types.str "1m" '' - How frequently metric metadata is sent to remote storage. - ''; - }; }; }; @@ -172,13 +168,12 @@ let http://tools.ietf.org/html/rfc4366#section-3.1 ''; }; - remote_timeout = mkDefOpt types.str "30s" '' + remote_timeout = mkOpt types.str '' Timeout for requests to the remote write endpoint. ''; - relabel_configs = mkOpt (types.listOf promTypes.relabel_config) '' - List of remote write relabel configurations. - List of relabel configurations. - ''; + write_relabel_configs = mkOpt (types.listOf promTypes.relabel_config) '' + List of remote write relabel configurations. + ''; name = mkOpt types.string '' Name of the remote write config, which if specified must be unique among remote write configs. The name will be used in metrics and logging in place of a generated value to help users distinguish between @@ -212,14 +207,50 @@ let Configures the remote write request's TLS settings. ''; proxy_url = mkOpt types.str "Optional Proxy URL."; - metadata_config = { - send = mkDefOpt types.bool "true" '' - Whether metric metadata is sent to remote storage or not. - ''; - send_interval = mkDefOpt types.str "1m" '' - How frequently metric metadata is sent to remote storage. - ''; - }; + queue_config = mkOpt (types.submodule { + options = { + capacity = mkOpt types.int '' + Number of samples to buffer per shard before we block reading of more + samples from the WAL. It is recommended to have enough capacity in each + shard to buffer several requests to keep throughput up while processing + occasional slow remote requests. + ''; + max_shards = mkOpt types.int '' + Maximum number of shards, i.e. amount of concurrency. + ''; + min_shards = mkOpt types.int '' + Minimum number of shards, i.e. amount of concurrency. + ''; + max_samples_per_send = mkOpt types.int '' + Maximum number of samples per send. + ''; + batch_send_deadline = mkOpt types.str '' + Maximum time a sample will wait in buffer. + ''; + min_backoff = mkOpt types.str '' + Initial retry delay. Gets doubled for every retry. + ''; + max_backoff = mkOpt types.str '' + Maximum retry delay. + ''; + }; + }) '' + Configures the queue used to write to remote storage. + ''; + metadata_config = mkOpt (types.submodule { + options = { + send = mkOpt types.bool '' + Whether metric metadata is sent to remote storage or not. + ''; + send_interval = mkOpt types.str '' + How frequently metric metadata is sent to remote storage. + ''; + }; + }) '' + Configures the sending of series metadata to remote storage. + Metadata configuration is subject to change at any point + or be removed in future releases. + ''; }; }; @@ -339,6 +370,14 @@ let List of file service discovery configurations. ''; + gce_sd_configs = mkOpt (types.listOf promTypes.gce_sd_config) '' + List of Google Compute Engine service discovery configurations. + + See the + relevant Prometheus configuration docs for more detail. + ''; + static_configs = mkOpt (types.listOf promTypes.static_config) '' List of labeled target groups for this job. ''; @@ -524,6 +563,52 @@ let }; }; + promTypes.gce_sd_config = types.submodule { + options = { + # Use `mkOption` instead of `mkOpt` for project and zone because they are + # required configuration values for `gce_sd_config`. + project = mkOption { + type = types.str; + description = '' + The GCP Project. + ''; + }; + + zone = mkOption { + type = types.str; + description = '' + The zone of the scrape targets. If you need multiple zones use multiple + gce_sd_configs. + ''; + }; + + filter = mkOpt types.str '' + Filter can be used optionally to filter the instance list by other + criteria Syntax of this filter string is described here in the filter + query parameter section: . + ''; + + refresh_interval = mkDefOpt types.str "60s" '' + Refresh interval to re-read the cloud instance list. + ''; + + port = mkDefOpt types.port "80" '' + The port to scrape metrics from. If using the public IP address, this + must instead be specified in the relabeling rule. + ''; + + tag_separator = mkDefOpt types.str "," '' + The tag separator used to separate concatenated GCE instance network tags. + + See the GCP documentation on network tags for more information: + ''; + }; + }; + promTypes.relabel_config = types.submodule { options = { source_labels = mkOpt (types.listOf types.str) '' @@ -554,10 +639,10 @@ let regular expression matches. ''; - action = mkDefOpt (types.enum ["replace" "keep" "drop"]) "replace" '' + action = + mkDefOpt (types.enum ["replace" "keep" "drop" "hashmod" "labelmap" "labeldrop" "labelkeep"]) "replace" '' Action to perform based on regex matching. ''; - }; }; diff --git a/nixos/modules/services/monitoring/prometheus/exporters.nix b/nixos/modules/services/monitoring/prometheus/exporters.nix index 683dc0390c59..1fd85c66f843 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters.nix @@ -23,6 +23,7 @@ let exporterOpts = genAttrs [ "apcupsd" "bind" + "bird" "blackbox" "collectd" "dnsmasq" @@ -47,6 +48,7 @@ let "rspamd" "rtl_433" "snmp" + "smokeping" "sql" "surfboard" "tor" @@ -234,8 +236,6 @@ in services.prometheus.exporters.minio.minioAddress = mkDefault "http://localhost:9000"; services.prometheus.exporters.minio.minioAccessKey = mkDefault config.services.minio.accessKey; services.prometheus.exporters.minio.minioAccessSecret = mkDefault config.services.minio.secretKey; - })] ++ [(mkIf config.services.rspamd.enable { - services.prometheus.exporters.rspamd.url = mkDefault "http://localhost:11334/stat"; })] ++ [(mkIf config.services.prometheus.exporters.rtl_433.enable { hardware.rtl-sdr.enable = mkDefault true; })] ++ [(mkIf config.services.nginx.enable { diff --git a/nixos/modules/services/monitoring/prometheus/exporters/bird.nix b/nixos/modules/services/monitoring/prometheus/exporters/bird.nix new file mode 100644 index 000000000000..d8a526eafcea --- /dev/null +++ b/nixos/modules/services/monitoring/prometheus/exporters/bird.nix @@ -0,0 +1,46 @@ +{ config, lib, pkgs, options }: + +with lib; + +let + cfg = config.services.prometheus.exporters.bird; +in +{ + port = 9324; + extraOpts = { + birdVersion = mkOption { + type = types.enum [ 1 2 ]; + default = 2; + description = '' + Specifies whether BIRD1 or BIRD2 is in use. + ''; + }; + birdSocket = mkOption { + type = types.path; + default = "/var/run/bird.ctl"; + description = '' + Path to BIRD2 (or BIRD1 v4) socket. + ''; + }; + newMetricFormat = mkOption { + type = types.bool; + default = true; + description = '' + Enable the new more-generic metric format. + ''; + }; + }; + serviceOpts = { + serviceConfig = { + SupplementaryGroups = singleton (if cfg.birdVersion == 1 then "bird" else "bird2"); + ExecStart = '' + ${pkgs.prometheus-bird-exporter}/bin/bird_exporter \ + -web.listen-address ${cfg.listenAddress}:${toString cfg.port} \ + -bird.socket ${cfg.birdSocket} \ + -bird.v2=${if cfg.birdVersion == 2 then "true" else "false"} \ + -format.new=${if cfg.newMetricFormat then "true" else "false"} \ + ${concatStringsSep " \\\n " cfg.extraFlags} + ''; + }; + }; +} diff --git a/nixos/modules/services/monitoring/prometheus/exporters/json.nix b/nixos/modules/services/monitoring/prometheus/exporters/json.nix index bd0026b55f72..1800da69a255 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/json.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/json.nix @@ -8,28 +8,36 @@ in { port = 7979; extraOpts = { - url = mkOption { - type = types.str; - description = '' - URL to scrape JSON from. - ''; - }; configFile = mkOption { type = types.path; description = '' Path to configuration file. ''; }; - listenAddress = {}; # not used }; serviceOpts = { serviceConfig = { ExecStart = '' - ${pkgs.prometheus-json-exporter}/bin/prometheus-json-exporter \ - --port ${toString cfg.port} \ - ${cfg.url} ${escapeShellArg cfg.configFile} \ + ${pkgs.prometheus-json-exporter}/bin/json_exporter \ + --config.file ${escapeShellArg cfg.configFile} \ + --web.listen-address="${cfg.listenAddress}:${toString cfg.port}" \ ${concatStringsSep " \\\n " cfg.extraFlags} ''; }; }; + imports = [ + (mkRemovedOptionModule [ "url" ] '' + This option was removed. The URL of the endpoint serving JSON + must now be provided to the exporter by prometheus via the url + parameter `target'. + + In prometheus a scrape URL would look like this: + + http://some.json-exporter.host:7979/probe?target=https://example.com/some/json/endpoint + + For more information, take a look at the official documentation + (https://github.com/prometheus-community/json_exporter) of the json_exporter. + '') + ({ options.warnings = options.warnings; options.assertions = options.assertions; }) + ]; } diff --git a/nixos/modules/services/monitoring/prometheus/exporters/rspamd.nix b/nixos/modules/services/monitoring/prometheus/exporters/rspamd.nix index 1f02ae207249..78fe120e4d93 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/rspamd.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/rspamd.nix @@ -10,64 +10,55 @@ let echo '${builtins.toJSON conf}' | ${pkgs.buildPackages.jq}/bin/jq '.' > $out ''; - generateConfig = extraLabels: (map (path: { - name = "rspamd_${replaceStrings [ "." " " ] [ "_" "_" ] path}"; - path = "$.${path}"; - labels = extraLabels; - }) [ - "actions.'add header'" - "actions.'no action'" - "actions.'rewrite subject'" - "actions.'soft reject'" - "actions.greylist" - "actions.reject" - "bytes_allocated" - "chunks_allocated" - "chunks_freed" - "chunks_oversized" - "connections" - "control_connections" - "ham_count" - "learned" - "pools_allocated" - "pools_freed" - "read_only" - "scanned" - "shared_chunks_allocated" - "spam_count" - "total_learns" - ]) ++ [{ - name = "rspamd_statfiles"; - type = "object"; - path = "$.statfiles[*]"; - labels = recursiveUpdate { - symbol = "$.symbol"; - type = "$.type"; - } extraLabels; - values = { - revision = "$.revision"; - size = "$.size"; - total = "$.total"; - used = "$.used"; - languages = "$.languages"; - users = "$.users"; - }; - }]; + generateConfig = extraLabels: { + metrics = (map (path: { + name = "rspamd_${replaceStrings [ "." " " ] [ "_" "_" ] path}"; + path = "$.${path}"; + labels = extraLabels; + }) [ + "actions.'add header'" + "actions.'no action'" + "actions.'rewrite subject'" + "actions.'soft reject'" + "actions.greylist" + "actions.reject" + "bytes_allocated" + "chunks_allocated" + "chunks_freed" + "chunks_oversized" + "connections" + "control_connections" + "ham_count" + "learned" + "pools_allocated" + "pools_freed" + "read_only" + "scanned" + "shared_chunks_allocated" + "spam_count" + "total_learns" + ]) ++ [{ + name = "rspamd_statfiles"; + type = "object"; + path = "$.statfiles[*]"; + labels = recursiveUpdate { + symbol = "$.symbol"; + type = "$.type"; + } extraLabels; + values = { + revision = "$.revision"; + size = "$.size"; + total = "$.total"; + used = "$.used"; + languages = "$.languages"; + users = "$.users"; + }; + }]; + }; in { port = 7980; extraOpts = { - listenAddress = {}; # not used - - url = mkOption { - type = types.str; - description = '' - URL to the rspamd metrics endpoint. - Defaults to http://localhost:11334/stat when - is true. - ''; - }; - extraLabels = mkOption { type = types.attrsOf types.str; default = { @@ -84,9 +75,25 @@ in }; }; serviceOpts.serviceConfig.ExecStart = '' - ${pkgs.prometheus-json-exporter}/bin/prometheus-json-exporter \ - --port ${toString cfg.port} \ - ${cfg.url} ${prettyJSON (generateConfig cfg.extraLabels)} \ + ${pkgs.prometheus-json-exporter}/bin/json_exporter \ + --config.file ${prettyJSON (generateConfig cfg.extraLabels)} \ + --web.listen-address "${cfg.listenAddress}:${toString cfg.port}" \ ${concatStringsSep " \\\n " cfg.extraFlags} ''; + + imports = [ + (mkRemovedOptionModule [ "url" ] '' + This option was removed. The URL of the rspamd metrics endpoint + must now be provided to the exporter by prometheus via the url + parameter `target'. + + In prometheus a scrape URL would look like this: + + http://some.rspamd-exporter.host:7980/probe?target=http://some.rspamd.host:11334/stat + + For more information, take a look at the official documentation + (https://github.com/prometheus-community/json_exporter) of the json_exporter. + '') + ({ options.warnings = options.warnings; options.assertions = options.assertions; }) + ]; } diff --git a/nixos/modules/services/monitoring/prometheus/exporters/smokeping.nix b/nixos/modules/services/monitoring/prometheus/exporters/smokeping.nix new file mode 100644 index 000000000000..0a7bb9c27be2 --- /dev/null +++ b/nixos/modules/services/monitoring/prometheus/exporters/smokeping.nix @@ -0,0 +1,60 @@ +{ config, lib, pkgs, options }: + +with lib; + +let + cfg = config.services.prometheus.exporters.smokeping; + goDuration = types.mkOptionType { + name = "goDuration"; + description = "Go duration (https://golang.org/pkg/time/#ParseDuration)"; + check = x: types.str.check x && builtins.match "(-?[0-9]+(\.[0-9]+)?(ns|us|µs|ms|s|m|h))+" x != null; + inherit (types.str) merge; + }; +in +{ + port = 9374; + extraOpts = { + telemetryPath = mkOption { + type = types.str; + default = "/metrics"; + description = '' + Path under which to expose metrics. + ''; + }; + pingInterval = mkOption { + type = goDuration; + default = "1s"; + description = '' + Interval between pings. + ''; + }; + buckets = mkOption { + type = types.commas; + default = "5e-05,0.0001,0.0002,0.0004,0.0008,0.0016,0.0032,0.0064,0.0128,0.0256,0.0512,0.1024,0.2048,0.4096,0.8192,1.6384,3.2768,6.5536,13.1072,26.2144"; + description = '' + List of buckets to use for the response duration histogram. + ''; + }; + hosts = mkOption { + type = with types; listOf str; + description = '' + List of endpoints to probe. + ''; + }; + }; + serviceOpts = { + serviceConfig = { + AmbientCapabilities = [ "CAP_NET_RAW" ]; + ExecStart = '' + ${pkgs.prometheus-smokeping-prober}/bin/smokeping_prober \ + --web.listen-address ${cfg.listenAddress}:${toString cfg.port} \ + --web.telemetry-path ${cfg.telemetryPath} \ + --buckets ${cfg.buckets} \ + --ping.interval ${cfg.pingInterval} \ + --privileged \ + ${concatStringsSep " \\\n " cfg.extraFlags} \ + ${concatStringsSep " " cfg.hosts} + ''; + }; + }; +} diff --git a/nixos/modules/services/networking/iwd.nix b/nixos/modules/services/networking/iwd.nix index 6be67a8b96f4..99e5e78badd2 100644 --- a/nixos/modules/services/networking/iwd.nix +++ b/nixos/modules/services/networking/iwd.nix @@ -22,6 +22,11 @@ in { systemd.packages = [ pkgs.iwd ]; + systemd.network.links."80-iwd" = { + matchConfig.Type = "wlan"; + linkConfig.NamePolicy = "keep kernel"; + }; + systemd.services.iwd.wantedBy = [ "multi-user.target" ]; }; diff --git a/nixos/modules/services/networking/murmur.nix b/nixos/modules/services/networking/murmur.nix index c6e5649ec479..b03630208df8 100644 --- a/nixos/modules/services/networking/murmur.nix +++ b/nixos/modules/services/networking/murmur.nix @@ -109,6 +109,13 @@ in description = "Host to bind to. Defaults binding on all addresses."; }; + package = mkOption { + type = types.package; + default = pkgs.murmur; + defaultText = "pkgs.murmur"; + description = "Overridable attribute of the murmur package to use."; + }; + password = mkOption { type = types.str; default = ""; @@ -299,7 +306,7 @@ in Type = if forking then "forking" else "simple"; PIDFile = mkIf forking "/run/murmur/murmurd.pid"; EnvironmentFile = mkIf (cfg.environmentFile != null) cfg.environmentFile; - ExecStart = "${pkgs.murmur}/bin/murmurd -ini /run/murmur/murmurd.ini"; + ExecStart = "${cfg.package}/bin/murmurd -ini /run/murmur/murmurd.ini"; Restart = "always"; RuntimeDirectory = "murmur"; RuntimeDirectoryMode = "0700"; diff --git a/nixos/modules/services/networking/privoxy.nix b/nixos/modules/services/networking/privoxy.nix index e3b34cb0c616..7caae3282032 100644 --- a/nixos/modules/services/networking/privoxy.nix +++ b/nixos/modules/services/networking/privoxy.nix @@ -16,7 +16,7 @@ let ${concatMapStrings (f: "actionsfile ${f}\n") cfg.actionsFiles} ${concatMapStrings (f: "filterfile ${f}\n") cfg.filterFiles} '' + optionalString cfg.enableTor '' - forward-socks4a / ${config.services.tor.client.socksListenAddressFaster} . + forward-socks5t / 127.0.0.1:9063 . toggle 1 enable-remote-toggle 0 enable-edit-actions 0 @@ -123,6 +123,11 @@ in serviceConfig.ProtectSystem = "full"; }; + services.tor.settings.SOCKSPort = mkIf cfg.enableTor [ + # Route HTTP traffic over a faster port (without IsolateDestAddr). + { addr = "127.0.0.1"; port = 9063; IsolateDestAddr = false; } + ]; + }; meta.maintainers = with lib.maintainers; [ rnhmjoj ]; diff --git a/nixos/modules/services/networking/searx.nix b/nixos/modules/services/networking/searx.nix index 60fb3d5d6d44..a515e4a3dc3b 100644 --- a/nixos/modules/services/networking/searx.nix +++ b/nixos/modules/services/networking/searx.nix @@ -1,34 +1,114 @@ -{ config, lib, pkgs, ... }: +{ options, config, lib, pkgs, ... }: with lib; let - + runDir = "/run/searx"; cfg = config.services.searx; - configFile = cfg.configFile; + generateConfig = '' + cd ${runDir} + + # write NixOS settings as JSON + cat <<'EOF' > settings.yml + ${builtins.toJSON cfg.settings} + EOF + + # substitute environment variables + env -0 | while IFS='=' read -r -d ''' n v; do + sed "s#@$n@#$v#g" -i settings.yml + done + + # set strict permissions + chmod 400 settings.yml + ''; + + settingType = with types; (oneOf + [ bool int float str + (listOf settingType) + (attrsOf settingType) + ]) // { description = "JSON value"; }; in { + imports = [ + (mkRenamedOptionModule + [ "services" "searx" "configFile" ] + [ "services" "searx" "settingsFile" ]) + ]; + ###### interface options = { services.searx = { - enable = mkEnableOption - "the searx server. See https://github.com/asciimoo/searx"; + enable = mkOption { + type = types.bool; + default = false; + relatedPackages = [ "searx" ]; + description = "Whether to enable Searx, the meta search engine."; + }; - configFile = mkOption { + environmentFile = mkOption { type = types.nullOr types.path; default = null; - description = " - The path of the Searx server configuration file. If no file - is specified, a default file is used (default config file has - debug mode enabled). - "; + description = '' + Environment file (see systemd.exec(5) + "EnvironmentFile=" section for the syntax) to define variables for + Searx. This option can be used to safely include secret keys into the + Searx configuration. + ''; + }; + + settings = mkOption { + type = types.attrsOf settingType; + default = { }; + example = literalExample '' + { server.port = 8080; + server.bind_address = "0.0.0.0"; + server.secret_key = "@SEARX_SECRET_KEY@"; + + engines = lib.singleton + { name = "wolframalpha"; + shortcut = "wa"; + api_key = "@WOLFRAM_API_KEY@"; + engine = "wolframalpha_api"; + }; + } + ''; + description = '' + Searx settings. These will be merged with (taking precedence over) + the default configuration. It's also possible to refer to + environment variables + (defined in ) + using the syntax @VARIABLE_NAME@. + + + For available settings, see the Searx + docs. + + + ''; + }; + + settingsFile = mkOption { + type = types.path; + default = "${runDir}/settings.yml"; + description = '' + The path of the Searx server settings.yml file. If no file is + specified, a default file is used (default config file has debug mode + enabled). Note: setting this options overrides + . + + + This file, along with any secret key it contains, will be copied + into the world-readable Nix store. + + + ''; }; package = mkOption { @@ -38,6 +118,38 @@ in description = "searx package to use."; }; + runInUwsgi = mkOption { + type = types.bool; + default = false; + description = '' + Whether to run searx in uWSGI as a "vassal", instead of using its + built-in HTTP server. This is the recommended mode for public or + large instances, but is unecessary for LAN or local-only use. + + + The built-in HTTP server logs all queries by default. + + + ''; + }; + + uwsgiConfig = mkOption { + type = options.services.uwsgi.instance.type; + default = { http = ":8080"; }; + example = literalExample '' + { + disable-logging = true; + http = ":8080"; # serve via HTTP... + socket = "/run/searx/searx.sock"; # ...or UNIX socket + } + ''; + description = '' + Additional configuration of the uWSGI vassal running searx. It + should notably specify on which interfaces and ports the vassal + should listen. + ''; + }; + }; }; @@ -45,36 +157,74 @@ in ###### implementation - config = mkIf config.services.searx.enable { + config = mkIf cfg.enable { + environment.systemPackages = [ cfg.package ]; users.users.searx = - { uid = config.ids.uids.searx; - description = "Searx user"; - createHome = true; - home = "/var/lib/searx"; + { description = "Searx daemon user"; + group = "searx"; + isSystemUser = true; }; - users.groups.searx = - { gid = config.ids.gids.searx; + users.groups.searx = { }; + + systemd.services.searx-init = { + description = "Initialise Searx settings"; + serviceConfig = { + Type = "oneshot"; + RemainAfterExit = true; + User = "searx"; + RuntimeDirectory = "searx"; + RuntimeDirectoryMode = "750"; + } // optionalAttrs (cfg.environmentFile != null) + { EnvironmentFile = builtins.toPath cfg.environmentFile; }; + script = generateConfig; + }; + + systemd.services.searx = mkIf (!cfg.runInUwsgi) { + description = "Searx server, the meta search engine."; + wantedBy = [ "network.target" "multi-user.target" ]; + requires = [ "searx-init.service" ]; + after = [ "searx-init.service" ]; + serviceConfig = { + User = "searx"; + Group = "searx"; + ExecStart = "${cfg.package}/bin/searx-run"; + } // optionalAttrs (cfg.environmentFile != null) + { EnvironmentFile = builtins.toPath cfg.environmentFile; }; + environment.SEARX_SETTINGS_PATH = cfg.settingsFile; + }; + + systemd.services.uwsgi = mkIf (cfg.runInUwsgi) + { requires = [ "searx-init.service" ]; + after = [ "searx-init.service" ]; }; - systemd.services.searx = - { - description = "Searx server, the meta search engine."; - after = [ "network.target" ]; - wantedBy = [ "multi-user.target" ]; - serviceConfig = { - User = "searx"; - ExecStart = "${cfg.package}/bin/searx-run"; - }; - } // (optionalAttrs (configFile != null) { - environment.SEARX_SETTINGS_PATH = configFile; - }); + services.searx.settings = { + # merge NixOS settings with defaults settings.yml + use_default_settings = mkDefault true; + }; - environment.systemPackages = [ cfg.package ]; + services.uwsgi = mkIf (cfg.runInUwsgi) { + enable = true; + plugins = [ "python3" ]; + + instance.type = "emperor"; + instance.vassals.searx = { + type = "normal"; + strict = true; + immediate-uid = "searx"; + immediate-gid = "searx"; + lazy-apps = true; + enable-threads = true; + module = "searx.webapp"; + env = [ "SEARX_SETTINGS_PATH=${cfg.settingsFile}" ]; + pythonPackages = self: [ cfg.package ]; + } // cfg.uwsgiConfig; + }; }; - meta.maintainers = with lib.maintainers; [ rnhmjoj ]; + meta.maintainers = with maintainers; [ rnhmjoj ]; } diff --git a/nixos/modules/services/networking/shellhub-agent.nix b/nixos/modules/services/networking/shellhub-agent.nix new file mode 100644 index 000000000000..4ce4b8250bc3 --- /dev/null +++ b/nixos/modules/services/networking/shellhub-agent.nix @@ -0,0 +1,91 @@ +{ config, lib, pkgs, ... }: + +with lib; +let + cfg = config.services.shellhub-agent; +in { + + ###### interface + + options = { + + services.shellhub-agent = { + + enable = mkOption { + type = types.bool; + default = false; + description = '' + Whether to enable the ShellHub Agent daemon, which allows + secure remote logins. + ''; + }; + + package = mkOption { + type = types.package; + default = pkgs.shellhub-agent; + defaultText = "pkgs.shellhub-agent"; + description = '' + Which ShellHub Agent package to use. + ''; + }; + + tenantId = mkOption { + type = types.str; + example = "ba0a880c-2ada-11eb-a35e-17266ef329d6"; + description = '' + The tenant ID to use when connecting to the ShellHub + Gateway. + ''; + }; + + server = mkOption { + type = types.str; + default = "https://cloud.shellhub.io"; + description = '' + Server address of ShellHub Gateway to connect. + ''; + }; + + privateKey = mkOption { + type = types.path; + default = "/var/lib/shellhub-agent/private.key"; + description = '' + Location where to store the ShellHub Agent private + key. + ''; + }; + }; + }; + + ###### implementation + + config = mkIf cfg.enable { + + systemd.services.shellhub-agent = { + description = "ShellHub Agent"; + + wantedBy = [ "multi-user.target" ]; + requires = [ "local-fs.target" ]; + wants = [ "network-online.target" ]; + after = [ + "local-fs.target" + "network.target" + "network-online.target" + "time-sync.target" + ]; + + environment.SERVER_ADDRESS = cfg.server; + environment.PRIVATE_KEY = cfg.privateKey; + environment.TENANT_ID = cfg.tenantId; + + serviceConfig = { + # The service starts sessions for different users. + User = "root"; + Restart = "on-failure"; + ExecStart = "${cfg.package}/bin/agent"; + }; + }; + + environment.systemPackages = [ cfg.package ]; + }; +} diff --git a/nixos/modules/services/security/fprintd.nix b/nixos/modules/services/security/fprintd.nix index cbac4ef05b8d..48f8a9616c3e 100644 --- a/nixos/modules/services/security/fprintd.nix +++ b/nixos/modules/services/security/fprintd.nix @@ -43,9 +43,9 @@ in config = mkIf cfg.enable { - services.dbus.packages = [ pkgs.fprintd ]; + services.dbus.packages = [ cfg.package ]; - environment.systemPackages = [ pkgs.fprintd ]; + environment.systemPackages = [ cfg.package ]; systemd.packages = [ cfg.package ]; diff --git a/nixos/modules/services/security/tor.nix b/nixos/modules/services/security/tor.nix index 1cceee065b1b..390dcfccfec3 100644 --- a/nixos/modules/services/security/tor.nix +++ b/nixos/modules/services/security/tor.nix @@ -1,297 +1,300 @@ { config, lib, pkgs, ... }: +with builtins; with lib; let cfg = config.services.tor; - torDirectory = "/var/lib/tor"; - torRunDirectory = "/run/tor"; - - opt = name: value: optionalString (value != null) "${name} ${value}"; - optint = name: value: optionalString (value != null && value != 0) "${name} ${toString value}"; - - isolationOptions = { - type = types.listOf (types.enum [ - "IsolateClientAddr" - "IsolateSOCKSAuth" - "IsolateClientProtocol" - "IsolateDestPort" - "IsolateDestAddr" + stateDir = "/var/lib/tor"; + runDir = "/run/tor"; + descriptionGeneric = option: '' + See torrc manual. + ''; + bindsPrivilegedPort = + any (p0: + let p1 = if p0 ? "port" then p0.port else p0; in + if p1 == "auto" then false + else let p2 = if isInt p1 then p1 else toInt p1; in + p1 != null && 0 < p2 && p2 < 1024) + (flatten [ + cfg.settings.ORPort + cfg.settings.DirPort + cfg.settings.DNSPort + cfg.settings.ExtORPort + cfg.settings.HTTPTunnelPort + cfg.settings.NATDPort + cfg.settings.SOCKSPort + cfg.settings.TransPort ]); + optionBool = optionName: mkOption { + type = with types; nullOr bool; + default = null; + description = descriptionGeneric optionName; + }; + optionInt = optionName: mkOption { + type = with types; nullOr int; + default = null; + description = descriptionGeneric optionName; + }; + optionString = optionName: mkOption { + type = with types; nullOr str; + default = null; + description = descriptionGeneric optionName; + }; + optionStrings = optionName: mkOption { + type = with types; listOf str; default = []; - example = [ - "IsolateClientAddr" - "IsolateSOCKSAuth" - "IsolateClientProtocol" - "IsolateDestPort" - "IsolateDestAddr" + description = descriptionGeneric optionName; + }; + optionAddress = mkOption { + type = with types; nullOr str; + default = null; + example = "0.0.0.0"; + description = '' + IPv4 or IPv6 (if between brackets) address. + ''; + }; + optionUnix = mkOption { + type = with types; nullOr path; + default = null; + description = '' + Unix domain socket path to use. + ''; + }; + optionPort = mkOption { + type = with types; nullOr (oneOf [port (enum ["auto"])]); + default = null; + }; + optionPorts = optionName: mkOption { + type = with types; listOf port; + default = []; + description = descriptionGeneric optionName; + }; + optionIsolablePort = with types; oneOf [ + port (enum ["auto"]) + (submodule ({config, ...}: { + options = { + addr = optionAddress; + port = optionPort; + flags = optionFlags; + SessionGroup = mkOption { type = nullOr int; default = null; }; + } // genAttrs isolateFlags (name: mkOption { type = types.bool; default = false; }); + config = { + flags = filter (name: config.${name} == true) isolateFlags ++ + optional (config.SessionGroup != null) "SessionGroup=${toString config.SessionGroup}"; + }; + })) + ]; + optionIsolablePorts = optionName: mkOption { + default = []; + type = with types; either optionIsolablePort (listOf optionIsolablePort); + description = descriptionGeneric optionName; + }; + isolateFlags = [ + "IsolateClientAddr" + "IsolateClientProtocol" + "IsolateDestAddr" + "IsolateDestPort" + "IsolateSOCKSAuth" + "KeepAliveIsolateSOCKSAuth" + ]; + optionSOCKSPort = doConfig: let + flags = [ + "CacheDNS" "CacheIPv4DNS" "CacheIPv6DNS" "GroupWritable" "IPv6Traffic" + "NoDNSRequest" "NoIPv4Traffic" "NoOnionTraffic" "OnionTrafficOnly" + "PreferIPv6" "PreferIPv6Automap" "PreferSOCKSNoAuth" "UseDNSCache" + "UseIPv4Cache" "UseIPv6Cache" "WorldWritable" + ] ++ isolateFlags; + in with types; oneOf [ + port (submodule ({config, ...}: { + options = { + unix = optionUnix; + addr = optionAddress; + port = optionPort; + flags = optionFlags; + SessionGroup = mkOption { type = nullOr int; default = null; }; + } // genAttrs flags (name: mkOption { type = types.bool; default = false; }); + config = mkIf doConfig { # Only add flags in SOCKSPort to avoid duplicates + flags = filter (name: config.${name} == true) flags ++ + optional (config.SessionGroup != null) "SessionGroup=${toString config.SessionGroup}"; + }; + })) ]; - description = "Tor isolation options"; + optionFlags = mkOption { + type = with types; listOf str; + default = []; + }; + optionORPort = optionName: mkOption { + default = []; + example = 443; + type = with types; oneOf [port (enum ["auto"]) (listOf (oneOf [ + port + (enum ["auto"]) + (submodule ({config, ...}: + let flags = [ "IPv4Only" "IPv6Only" "NoAdvertise" "NoListen" ]; + in { + options = { + addr = optionAddress; + port = optionPort; + flags = optionFlags; + } // genAttrs flags (name: mkOption { type = types.bool; default = false; }); + config = { + flags = filter (name: config.${name} == true) flags; + }; + })) + ]))]; + description = descriptionGeneric optionName; + }; + optionBandwith = optionName: mkOption { + type = with types; nullOr (either int str); + default = null; + description = descriptionGeneric optionName; + }; + optionPath = optionName: mkOption { + type = with types; nullOr path; + default = null; + description = descriptionGeneric optionName; }; - - torRc = '' - User tor - DataDirectory ${torDirectory} - ${optionalString cfg.enableGeoIP '' - GeoIPFile ${cfg.package.geoip}/share/tor/geoip - GeoIPv6File ${cfg.package.geoip}/share/tor/geoip6 - ''} - - ${optint "ControlPort" cfg.controlPort} - ${optionalString cfg.controlSocket.enable "ControlPort unix:${torRunDirectory}/control GroupWritable RelaxDirModeCheck"} - '' - # Client connection config - + optionalString cfg.client.enable '' - SOCKSPort ${cfg.client.socksListenAddress} ${toString cfg.client.socksIsolationOptions} - SOCKSPort ${cfg.client.socksListenAddressFaster} - ${opt "SocksPolicy" cfg.client.socksPolicy} - - ${optionalString cfg.client.transparentProxy.enable '' - TransPort ${cfg.client.transparentProxy.listenAddress} ${toString cfg.client.transparentProxy.isolationOptions} - ''} - - ${optionalString cfg.client.dns.enable '' - DNSPort ${cfg.client.dns.listenAddress} ${toString cfg.client.dns.isolationOptions} - AutomapHostsOnResolve 1 - AutomapHostsSuffixes ${concatStringsSep "," cfg.client.dns.automapHostsSuffixes} - ''} - '' - # Explicitly disable the SOCKS server if the client is disabled. In - # particular, this makes non-anonymous hidden services possible. - + optionalString (! cfg.client.enable) '' - SOCKSPort 0 - '' - # Relay config - + optionalString cfg.relay.enable '' - ORPort ${toString cfg.relay.port} - ${opt "Address" cfg.relay.address} - ${opt "Nickname" cfg.relay.nickname} - ${opt "ContactInfo" cfg.relay.contactInfo} - - ${optint "RelayBandwidthRate" cfg.relay.bandwidthRate} - ${optint "RelayBandwidthBurst" cfg.relay.bandwidthBurst} - ${opt "AccountingMax" cfg.relay.accountingMax} - ${opt "AccountingStart" cfg.relay.accountingStart} - - ${if (cfg.relay.role == "exit") then - opt "ExitPolicy" cfg.relay.exitPolicy - else - "ExitPolicy reject *:*"} - - ${optionalString (elem cfg.relay.role ["bridge" "private-bridge"]) '' - BridgeRelay 1 - ServerTransportPlugin ${concatStringsSep "," cfg.relay.bridgeTransports} exec ${pkgs.obfs4}/bin/obfs4proxy managed - ExtORPort auto - ${optionalString (cfg.relay.role == "private-bridge") '' - ExtraInfoStatistics 0 - PublishServerDescriptor 0 - ''} - ''} - '' - # Hidden services - + concatStrings (flip mapAttrsToList cfg.hiddenServices (n: v: '' - HiddenServiceDir ${torDirectory}/onion/${v.name} - ${optionalString (v.version != null) "HiddenServiceVersion ${toString v.version}"} - ${flip concatMapStrings v.map (p: '' - HiddenServicePort ${toString p.port} ${p.destination} - '')} - ${optionalString (v.authorizeClient != null) '' - HiddenServiceAuthorizeClient ${v.authorizeClient.authType} ${concatStringsSep "," v.authorizeClient.clientNames} - ''} - '')) - + cfg.extraConfig; - - torRcFile = pkgs.writeText "torrc" torRc; - + mkValueString = k: v: + if v == null then "" + else if isBool v then + (if v then "1" else "0") + else if v ? "unix" && v.unix != null then + "unix:"+v.unix + + optionalString (v ? "flags") (" " + concatStringsSep " " v.flags) + else if v ? "port" && v.port != null then + optionalString (v ? "addr" && v.addr != null) "${v.addr}:" + + toString v.port + + optionalString (v ? "flags") (" " + concatStringsSep " " v.flags) + else if k == "ServerTransportPlugin" then + optionalString (v.transports != []) "${concatStringsSep "," v.transports} exec ${v.exec}" + else if k == "HidServAuth" then + concatMapStringsSep "\n${k} " (settings: settings.onion + " " settings.auth) v + else generators.mkValueStringDefault {} v; + genTorrc = settings: + generators.toKeyValue { + listsAsDuplicateKeys = true; + mkKeyValue = k: generators.mkKeyValueDefault { mkValueString = mkValueString k; } " " k; + } + (lib.mapAttrs (k: v: + # Not necesssary, but prettier rendering + if elem k [ "AutomapHostsSuffixes" "DirPolicy" "ExitPolicy" "SocksPolicy" ] + && v != [] + then concatStringsSep "," v + else v) + (lib.filterAttrs (k: v: !(v == null || v == "")) + settings)); + torrc = pkgs.writeText "torrc" ( + genTorrc cfg.settings + + concatStrings (mapAttrsToList (name: onion: + "HiddenServiceDir ${onion.path}\n" + + genTorrc onion.settings) cfg.relay.onionServices) + ); in { imports = [ - (mkRemovedOptionModule [ "services" "tor" "client" "privoxy" "enable" ] '' - Use services.privoxy.enable and services.privoxy.enableTor instead. - '') - (mkRenamedOptionModule [ "services" "tor" "relay" "portSpec" ] [ "services" "tor" "relay" "port" ]) + (mkRenamedOptionModule [ "services" "tor" "client" "dns" "automapHostsSuffixes" ] [ "services" "tor" "settings" "AutomapHostsSuffixes" ]) + (mkRemovedOptionModule [ "services" "tor" "client" "dns" "isolationOptions" ] "Use services.tor.settings.DNSPort instead.") + (mkRemovedOptionModule [ "services" "tor" "client" "dns" "listenAddress" ] "Use services.tor.settings.DNSPort instead.") + (mkRemovedOptionModule [ "services" "tor" "client" "privoxy" "enable" ] "Use services.privoxy.enable and services.privoxy.enableTor instead.") + (mkRemovedOptionModule [ "services" "tor" "client" "socksIsolationOptions" ] "Use services.tor.settings.SOCKSPort instead.") + (mkRemovedOptionModule [ "services" "tor" "client" "socksListenAddressFaster" ] "Use services.tor.settings.SOCKSPort instead.") + (mkRenamedOptionModule [ "services" "tor" "client" "socksPolicy" ] [ "services" "tor" "settings" "SocksPolicy" ]) + (mkRemovedOptionModule [ "services" "tor" "client" "transparentProxy" "isolationOptions" ] "Use services.tor.settings.TransPort instead.") + (mkRemovedOptionModule [ "services" "tor" "client" "transparentProxy" "listenAddress" ] "Use services.tor.settings.TransPort instead.") + (mkRenamedOptionModule [ "services" "tor" "controlPort" ] [ "services" "tor" "settings" "ControlPort" ]) + (mkRemovedOptionModule [ "services" "tor" "extraConfig" ] "Plese use services.tor.settings instead.") + (mkRenamedOptionModule [ "services" "tor" "hiddenServices" ] [ "services" "tor" "relay" "onionServices" ]) + (mkRenamedOptionModule [ "services" "tor" "relay" "accountingMax" ] [ "services" "tor" "settings" "AccountingMax" ]) + (mkRenamedOptionModule [ "services" "tor" "relay" "accountingStart" ] [ "services" "tor" "settings" "AccountingStart" ]) + (mkRenamedOptionModule [ "services" "tor" "relay" "address" ] [ "services" "tor" "settings" "Address" ]) + (mkRenamedOptionModule [ "services" "tor" "relay" "bandwidthBurst" ] [ "services" "tor" "settings" "BandwidthBurst" ]) + (mkRenamedOptionModule [ "services" "tor" "relay" "bandwidthRate" ] [ "services" "tor" "settings" "BandwidthRate" ]) + (mkRenamedOptionModule [ "services" "tor" "relay" "bridgeTransports" ] [ "services" "tor" "settings" "ServerTransportPlugin" "transports" ]) + (mkRenamedOptionModule [ "services" "tor" "relay" "contactInfo" ] [ "services" "tor" "settings" "ContactInfo" ]) + (mkRenamedOptionModule [ "services" "tor" "relay" "exitPolicy" ] [ "services" "tor" "settings" "ExitPolicy" ]) (mkRemovedOptionModule [ "services" "tor" "relay" "isBridge" ] "Use services.tor.relay.role instead.") (mkRemovedOptionModule [ "services" "tor" "relay" "isExit" ] "Use services.tor.relay.role instead.") + (mkRenamedOptionModule [ "services" "tor" "relay" "nickname" ] [ "services" "tor" "settings" "Nickname" ]) + (mkRenamedOptionModule [ "services" "tor" "relay" "port" ] [ "services" "tor" "settings" "ORPort" ]) + (mkRenamedOptionModule [ "services" "tor" "relay" "portSpec" ] [ "services" "tor" "settings" "ORPort" ]) ]; options = { services.tor = { - enable = mkOption { - type = types.bool; - default = false; - description = '' - Enable the Tor daemon. By default, the daemon is run without - relay, exit, bridge or client connectivity. - ''; - }; + enable = mkEnableOption ''Tor daemon. + By default, the daemon is run without + relay, exit, bridge or client connectivity''; + + openFirewall = mkEnableOption "opening of the relay port(s) in the firewall"; package = mkOption { type = types.package; default = pkgs.tor; defaultText = "pkgs.tor"; example = literalExample "pkgs.tor"; - description = '' - Tor package to use - ''; + description = "Tor package to use."; }; - enableGeoIP = mkOption { - type = types.bool; - default = true; - description = '' - Whenever to configure Tor daemon to use GeoIP databases. + enableGeoIP = mkEnableOption ''use of GeoIP databases. + Disabling this will disable by-country statistics for bridges and relays + and some client and third-party software functionality'' // { default = true; }; - Disabling this will disable by-country statistics for - bridges and relays and some client and third-party software - functionality. - ''; - }; - - extraConfig = mkOption { - type = types.lines; - default = ""; - description = '' - Extra configuration. Contents will be added verbatim to the - configuration file at the end. - ''; - }; - - controlPort = mkOption { - type = types.nullOr (types.either types.int types.str); - default = null; - example = 9051; - description = '' - If set, Tor will accept connections on the specified port - and allow them to control the tor process. - ''; - }; - - controlSocket = { - enable = mkOption { - type = types.bool; - default = false; - description = '' - Whether to enable Tor control socket. Control socket is created - in ${torRunDirectory}/control - ''; - }; - }; + controlSocket.enable = mkEnableOption ''control socket, + created in ${runDir}/control''; client = { - enable = mkOption { - type = types.bool; - default = false; - description = '' - Whether to enable Tor daemon to route application - connections. You might want to disable this if you plan - running a dedicated Tor relay. - ''; - }; + enable = mkEnableOption ''the routing of application connections. + You might want to disable this if you plan running a dedicated Tor relay''; + + transparentProxy.enable = mkEnableOption "transparent proxy"; + dns.enable = mkEnableOption "DNS resolver"; socksListenAddress = mkOption { - type = types.str; - default = "127.0.0.1:9050"; - example = "192.168.0.1:9100"; + type = optionSOCKSPort false; + default = {addr = "127.0.0.1"; port = 9050; IsolateDestAddr = true;}; + example = {addr = "192.168.0.1"; port = 9090; IsolateDestAddr = true;}; description = '' Bind to this address to listen for connections from - Socks-speaking applications. Provides strong circuit - isolation, separate circuit per IP address. + Socks-speaking applications. ''; }; - socksListenAddressFaster = mkOption { - type = types.str; - default = "127.0.0.1:9063"; - example = "192.168.0.1:9101"; - description = '' - Bind to this address to listen for connections from - Socks-speaking applications. Same as - but uses weaker - circuit isolation to provide performance suitable for a - web browser. - ''; - }; - - socksPolicy = mkOption { - type = types.nullOr types.str; - default = null; - example = "accept 192.168.0.0/16, reject *"; - description = '' - Entry policies to allow/deny SOCKS requests based on IP - address. First entry that matches wins. If no SocksPolicy - is set, we accept all (and only) requests from - . - ''; - }; - - socksIsolationOptions = mkOption (isolationOptions // { - default = ["IsolateDestAddr"]; - }); - - transparentProxy = { - enable = mkOption { - type = types.bool; - default = false; - description = "Whether to enable tor transparent proxy"; - }; - - listenAddress = mkOption { - type = types.str; - default = "127.0.0.1:9040"; - example = "192.168.0.1:9040"; - description = '' - Bind transparent proxy to this address. - ''; - }; - - isolationOptions = mkOption isolationOptions; - }; - - dns = { - enable = mkOption { - type = types.bool; - default = false; - description = "Whether to enable tor dns resolver"; - }; - - listenAddress = mkOption { - type = types.str; - default = "127.0.0.1:9053"; - example = "192.168.0.1:9053"; - description = '' - Bind tor dns to this address. - ''; - }; - - isolationOptions = mkOption isolationOptions; - - automapHostsSuffixes = mkOption { - type = types.listOf types.str; - default = [".onion" ".exit"]; - example = [".onion"]; - description = "List of suffixes to use with automapHostsOnResolve"; + onionServices = mkOption { + description = descriptionGeneric "HiddenServiceDir"; + default = {}; + example = { + "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" = { + clientAuthorizations = ["/run/keys/tor/alice.prv.x25519"]; + }; }; + type = types.attrsOf (types.submodule ({name, config, ...}: { + options.clientAuthorizations = mkOption { + description = '' + Clients' authorizations for a v3 onion service, + as a list of files containing each one private key, in the format: + descriptor:x25519:<base32-private-key> + '' + descriptionGeneric "_client_authorization"; + type = with types; listOf path; + default = []; + example = ["/run/keys/tor/alice.prv.x25519"]; + }; + })); }; }; relay = { - enable = mkOption { - type = types.bool; - default = false; - description = '' - Whether to enable relaying TOR traffic for others. + enable = mkEnableOption ''relaying of Tor traffic for others. - See - for details. + See + for details. - Setting this to true requires setting - - and - - options. - ''; - }; + Setting this to true requires setting + + and + + options''; role = mkOption { type = types.enum [ "exit" "relay" "bridge" "private-bridge" ]; @@ -310,13 +313,13 @@ in Running an exit relay may expose you to abuse complaints. See - + for more info. You can specify which services Tor users may access via - your exit relay using option. + your exit relay using option. @@ -369,15 +372,14 @@ in WARNING: THE FOLLOWING PARAGRAPH IS NOT LEGAL ADVICE. - Consult with your lawer when in doubt. + Consult with your lawyer when in doubt. This role should be safe to use in most situations (unless the act of forwarding traffic for others is a punishable offence under your local laws, which - would be pretty insane as it would make ISP - illegal). + would be pretty insane as it would make ISP illegal). @@ -404,7 +406,7 @@ in Use this if you want to run a private bridge, for - example because you'll give out your bridge address + example because you'll give out your bridge addr manually to your friends. @@ -426,269 +428,393 @@ in ''; }; - bridgeTransports = mkOption { - type = types.listOf types.str; - default = ["obfs4"]; - example = ["obfs2" "obfs3" "obfs4" "scramblesuit"]; - description = "List of pluggable transports"; - }; - - nickname = mkOption { - type = types.str; - default = "anonymous"; - description = '' - A unique handle for your TOR relay. - ''; - }; - - contactInfo = mkOption { - type = types.nullOr types.str; - default = null; - example = "admin@relay.com"; - description = '' - Contact information for the relay owner (e.g. a mail - address and GPG key ID). - ''; - }; - - accountingMax = mkOption { - type = types.nullOr types.str; - default = null; - example = "450 GBytes"; - description = '' - Specify maximum bandwidth allowed during an accounting period. This - allows you to limit overall tor bandwidth over some time period. - See the AccountingMax option by looking at the - tor manual tor - 1 for more. - - Note this limit applies individually to upload and - download; if you specify "500 GBytes" - here, then you may transfer up to 1 TBytes of overall - bandwidth (500 GB upload, 500 GB download). - ''; - }; - - accountingStart = mkOption { - type = types.nullOr types.str; - default = null; - example = "month 1 1:00"; - description = '' - Specify length of an accounting period. This allows you to limit - overall tor bandwidth over some time period. See the - AccountingStart option by looking at the tor - manual tor - 1 for more. - ''; - }; - - bandwidthRate = mkOption { - type = types.nullOr types.int; - default = null; - example = 100; - description = '' - Specify this to limit the bandwidth usage of relayed (server) - traffic. Your own traffic is still unthrottled. Units: bytes/second. - ''; - }; - - bandwidthBurst = mkOption { - type = types.nullOr types.int; - default = cfg.relay.bandwidthRate; - example = 200; - description = '' - Specify this to allow bursts of the bandwidth usage of relayed (server) - traffic. The average usage will still be as specified in relayBandwidthRate. - Your own traffic is still unthrottled. Units: bytes/second. - ''; - }; - - address = mkOption { - type = types.nullOr types.str; - default = null; - example = "noname.example.com"; - description = '' - The IP address or full DNS name for advertised address of your relay. - Leave unset and Tor will guess. - ''; - }; - - port = mkOption { - type = types.either types.int types.str; - example = 143; - description = '' - What port to advertise for Tor connections. This corresponds to the - ORPort section in the Tor manual; see - tor - 1 for more details. - - At a minimum, you should just specify the port for the - relay to listen on; a common one like 143, 22, 80, or 443 - to help Tor users who may have very restrictive port-based - firewalls. - ''; - }; - - exitPolicy = mkOption { - type = types.nullOr types.str; - default = null; - example = "accept *:6660-6667,reject *:*"; - description = '' - A comma-separated list of exit policies. They're - considered first to last, and the first match wins. If you - want to _replace_ the default exit policy, end this with - either a reject *:* or an accept *:*. Otherwise, you're - _augmenting_ (prepending to) the default exit policy. - Leave commented to just use the default, which is - available in the man page or at - . - - Look at - - for issues you might encounter if you use the default - exit policy. - - If certain IPs and ports are blocked externally, e.g. by - your firewall, you should update your exit policy to - reflect this -- otherwise Tor users will be told that - those destinations are down. - ''; + onionServices = mkOption { + description = descriptionGeneric "HiddenServiceDir"; + default = {}; + example = { + "example.org/www" = { + map = [ 80 ]; + authorizedClients = [ + "descriptor:x25519:XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX" + ]; + }; + }; + type = types.attrsOf (types.submodule ({name, config, ...}: { + options.path = mkOption { + type = types.path; + description = '' + Path where to store the data files of the hidden service. + If the is null + this defaults to ${stateDir}/onion/$onion, + otherwise to ${runDir}/onion/$onion. + ''; + }; + options.secretKey = mkOption { + type = with types; nullOr path; + default = null; + example = "/run/keys/tor/onion/expyuzz4wqqyqhjn/hs_ed25519_secret_key"; + description = '' + Secret key of the onion service. + If null, Tor reuses any preexisting secret key (in ) + or generates a new one. + The associated public key and hostname are deterministically regenerated + from this file if they do not exist. + ''; + }; + options.authorizeClient = mkOption { + description = descriptionGeneric "HiddenServiceAuthorizeClient"; + default = null; + type = types.nullOr (types.submodule ({...}: { + options = { + authType = mkOption { + type = types.enum [ "basic" "stealth" ]; + description = '' + Either "basic" for a general-purpose authorization protocol + or "stealth" for a less scalable protocol + that also hides service activity from unauthorized clients. + ''; + }; + clientNames = mkOption { + type = with types; nonEmptyListOf (strMatching "[A-Za-z0-9+-_]+"); + description = '' + Only clients that are listed here are authorized to access the hidden service. + Generated authorization data can be found in ${stateDir}/onion/$name/hostname. + Clients need to put this authorization data in their configuration file using + . + ''; + }; + }; + })); + }; + options.authorizedClients = mkOption { + description = '' + Authorized clients for a v3 onion service, + as a list of public key, in the format: + descriptor:x25519:<base32-public-key> + '' + descriptionGeneric "_client_authorization"; + type = with types; listOf str; + default = []; + example = ["descriptor:x25519:XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"]; + }; + options.map = mkOption { + description = descriptionGeneric "HiddenServicePort"; + type = with types; listOf (oneOf [ + port (submodule ({...}: { + options = { + port = optionPort; + target = mkOption { + default = null; + type = nullOr (submodule ({...}: { + options = { + unix = optionUnix; + addr = optionAddress; + port = optionPort; + }; + })); + }; + }; + })) + ]); + apply = map (v: if isInt v then {port=v; target=null;} else v); + }; + options.version = mkOption { + description = descriptionGeneric "HiddenServiceVersion"; + type = with types; nullOr (enum [2 3]); + default = null; + }; + options.settings = mkOption { + description = '' + Settings of the onion service. + '' + descriptionGeneric "_hidden_service_options"; + default = {}; + type = types.submodule { + freeformType = with types; + (attrsOf (nullOr (oneOf [str int bool (listOf str)]))) // { + description = "settings option"; + }; + options.HiddenServiceAllowUnknownPorts = optionBool "HiddenServiceAllowUnknownPorts"; + options.HiddenServiceDirGroupReadable = optionBool "HiddenServiceDirGroupReadable"; + options.HiddenServiceExportCircuitID = mkOption { + description = descriptionGeneric "HiddenServiceExportCircuitID"; + type = with types; nullOr (enum ["haproxy"]); + default = null; + }; + options.HiddenServiceMaxStreams = mkOption { + description = descriptionGeneric "HiddenServiceMaxStreams"; + type = with types; nullOr (ints.between 0 65535); + default = null; + }; + options.HiddenServiceMaxStreamsCloseCircuit = optionBool "HiddenServiceMaxStreamsCloseCircuit"; + options.HiddenServiceNumIntroductionPoints = mkOption { + description = descriptionGeneric "HiddenServiceNumIntroductionPoints"; + type = with types; nullOr (ints.between 0 20); + default = null; + }; + options.HiddenServiceSingleHopMode = optionBool "HiddenServiceSingleHopMode"; + options.RendPostPeriod = optionString "RendPostPeriod"; + }; + }; + config = { + path = mkDefault ((if config.secretKey == null then stateDir else runDir) + "/onion/${name}"); + settings.HiddenServiceVersion = config.version; + settings.HiddenServiceAuthorizeClient = + if config.authorizeClient != null then + config.authorizeClient.authType + " " + + concatStringsSep "," config.authorizeClient.clientNames + else null; + settings.HiddenServicePort = map (p: mkValueString "" p.port + " " + mkValueString "" p.target) config.map; + }; + })); }; }; - hiddenServices = mkOption { + settings = mkOption { description = '' - A set of static hidden services that terminate their Tor - circuits at this node. - - Every element in this set declares a virtual onion host. - - You can specify your onion address by putting corresponding - private key to an appropriate place in ${torDirectory}. - - For services without private keys in ${torDirectory} Tor - daemon will generate random key pairs (which implies random - onion addresses) on restart. The latter could take a while, - please be patient. - - - Hidden services can be useful even if you don't intend to - actually hide them, since they can - also be seen as a kind of NAT traversal mechanism. - - E.g. the example will make your sshd, whatever runs on - "8080" and your mail server available from anywhere where - the Tor network is available (which, with the help from - bridges, is pretty much everywhere), even if both client - and server machines are behind NAT you have no control - over. - + See torrc manual + for documentation. ''; default = {}; - example = literalExample '' - { "my-hidden-service-example".map = [ - { port = 22; } # map ssh port to this machine's ssh - { port = 80; toPort = 8080; } # map http port to whatever runs on 8080 - { port = "sip"; toHost = "mail.example.com"; toPort = "imap"; } # because we can - ]; - } - ''; - type = types.attrsOf (types.submodule ({name, ...}: { - options = { - - name = mkOption { - type = types.str; - description = '' - Name of this tor hidden service. - - This is purely descriptive. - - After restarting Tor daemon you should be able to - find your .onion address in - ${torDirectory}/onion/$name/hostname. - ''; - }; - - map = mkOption { - default = []; - description = "Port mapping for this hidden service."; - type = types.listOf (types.submodule ({config, ...}: { - options = { - - port = mkOption { - type = types.either types.int types.str; - example = 80; - description = '' - Hidden service port to "bind to". - ''; - }; - - destination = mkOption { - internal = true; - type = types.str; - description = "Forward these connections where?"; - }; - - toHost = mkOption { - type = types.str; - default = "127.0.0.1"; - description = "Mapping destination host."; - }; - - toPort = mkOption { - type = types.either types.int types.str; - example = 8080; - description = "Mapping destination port."; - }; - - }; - - config = { - toPort = mkDefault config.port; - destination = mkDefault "${config.toHost}:${toString config.toPort}"; - }; - })); - }; - - authorizeClient = mkOption { - default = null; - description = "If configured, the hidden service is accessible for authorized clients only."; - type = types.nullOr (types.submodule ({...}: { - - options = { - - authType = mkOption { - type = types.enum [ "basic" "stealth" ]; - description = '' - Either "basic" for a general-purpose authorization protocol - or "stealth" for a less scalable protocol - that also hides service activity from unauthorized clients. - ''; - }; - - clientNames = mkOption { - type = types.nonEmptyListOf (types.strMatching "[A-Za-z0-9+-_]+"); - description = '' - Only clients that are listed here are authorized to access the hidden service. - Generated authorization data can be found in ${torDirectory}/onion/$name/hostname. - Clients need to put this authorization data in their configuration file using HidServAuth. - ''; - }; - }; - })); - }; - - version = mkOption { - default = null; - description = "Rendezvous service descriptor version to publish for the hidden service. Currently, versions 2 and 3 are supported. (Default: 2)"; - type = types.nullOr (types.enum [ 2 3 ]); - }; + type = types.submodule { + freeformType = with types; + (attrsOf (nullOr (oneOf [str int bool (listOf str)]))) // { + description = "settings option"; + }; + options.Address = optionString "Address"; + options.AssumeReachable = optionBool "AssumeReachable"; + options.AccountingMax = optionBandwith "AccountingMax"; + options.AccountingStart = optionString "AccountingStart"; + options.AuthDirHasIPv6Connectivity = optionBool "AuthDirHasIPv6Connectivity"; + options.AuthDirListBadExits = optionBool "AuthDirListBadExits"; + options.AuthDirPinKeys = optionBool "AuthDirPinKeys"; + options.AuthDirSharedRandomness = optionBool "AuthDirSharedRandomness"; + options.AuthDirTestEd25519LinkKeys = optionBool "AuthDirTestEd25519LinkKeys"; + options.AuthoritativeDirectory = optionBool "AuthoritativeDirectory"; + options.AutomapHostsOnResolve = optionBool "AutomapHostsOnResolve"; + options.AutomapHostsSuffixes = optionStrings "AutomapHostsSuffixes" // { + default = [".onion" ".exit"]; + example = [".onion"]; }; - - config = { - name = mkDefault name; + options.BandwidthBurst = optionBandwith "BandwidthBurst"; + options.BandwidthRate = optionBandwith "BandwidthRate"; + options.BridgeAuthoritativeDir = optionBool "BridgeAuthoritativeDir"; + options.BridgeRecordUsageByCountry = optionBool "BridgeRecordUsageByCountry"; + options.BridgeRelay = optionBool "BridgeRelay" // { default = false; }; + options.CacheDirectory = optionPath "CacheDirectory"; + options.CacheDirectoryGroupReadable = optionBool "CacheDirectoryGroupReadable"; # default is null and like "auto" + options.CellStatistics = optionBool "CellStatistics"; + options.ClientAutoIPv6ORPort = optionBool "ClientAutoIPv6ORPort"; + options.ClientDNSRejectInternalAddresses = optionBool "ClientDNSRejectInternalAddresses"; + options.ClientOnionAuthDir = mkOption { + description = descriptionGeneric "ClientOnionAuthDir"; + default = null; + type = with types; nullOr path; }; - })); + options.ClientPreferIPv6DirPort = optionBool "ClientPreferIPv6DirPort"; # default is null and like "auto" + options.ClientPreferIPv6ORPort = optionBool "ClientPreferIPv6ORPort"; # default is null and like "auto" + options.ClientRejectInternalAddresses = optionBool "ClientRejectInternalAddresses"; + options.ClientUseIPv4 = optionBool "ClientUseIPv4"; + options.ClientUseIPv6 = optionBool "ClientUseIPv6"; + options.ConnDirectionStatistics = optionBool "ConnDirectionStatistics"; + options.ConstrainedSockets = optionBool "ConstrainedSockets"; + options.ContactInfo = optionString "ContactInfo"; + options.ControlPort = mkOption rec { + description = descriptionGeneric "ControlPort"; + default = []; + example = [{port = 9051;}]; + type = with types; oneOf [port (enum ["auto"]) (listOf (oneOf [ + port (enum ["auto"]) (submodule ({config, ...}: let + flags = ["GroupWritable" "RelaxDirModeCheck" "WorldWritable"]; + in { + options = { + unix = optionUnix; + flags = optionFlags; + addr = optionAddress; + port = optionPort; + } // genAttrs flags (name: mkOption { type = types.bool; default = false; }); + config = { + flags = filter (name: config.${name} == true) flags; + }; + })) + ]))]; + }; + options.ControlPortFileGroupReadable= optionBool "ControlPortFileGroupReadable"; + options.ControlPortWriteToFile = optionPath "ControlPortWriteToFile"; + options.ControlSocket = optionPath "ControlSocket"; + options.ControlSocketsGroupWritable = optionBool "ControlSocketsGroupWritable"; + options.CookieAuthFile = optionPath "CookieAuthFile"; + options.CookieAuthFileGroupReadable = optionBool "CookieAuthFileGroupReadable"; + options.CookieAuthentication = optionBool "CookieAuthentication"; + options.DataDirectory = optionPath "DataDirectory" // { default = stateDir; }; + options.DataDirectoryGroupReadable = optionBool "DataDirectoryGroupReadable"; + options.DirPortFrontPage = optionPath "DirPortFrontPage"; + options.DirAllowPrivateAddresses = optionBool "DirAllowPrivateAddresses"; + options.DormantCanceledByStartup = optionBool "DormantCanceledByStartup"; + options.DormantOnFirstStartup = optionBool "DormantOnFirstStartup"; + options.DormantTimeoutDisabledByIdleStreams = optionBool "DormantTimeoutDisabledByIdleStreams"; + options.DirCache = optionBool "DirCache"; + options.DirPolicy = mkOption { + description = descriptionGeneric "DirPolicy"; + type = with types; listOf str; + default = []; + example = ["accept *:*"]; + }; + options.DirPort = optionORPort "DirPort"; + options.DirReqStatistics = optionBool "DirReqStatistics"; + options.DisableAllSwap = optionBool "DisableAllSwap"; + options.DisableDebuggerAttachment = optionBool "DisableDebuggerAttachment"; + options.DisableNetwork = optionBool "DisableNetwork"; + options.DisableOOSCheck = optionBool "DisableOOSCheck"; + options.DNSPort = optionIsolablePorts "DNSPort"; + options.DoSCircuitCreationEnabled = optionBool "DoSCircuitCreationEnabled"; + options.DoSConnectionEnabled = optionBool "DoSConnectionEnabled"; # default is null and like "auto" + options.DoSRefuseSingleHopClientRendezvous = optionBool "DoSRefuseSingleHopClientRendezvous"; + options.DownloadExtraInfo = optionBool "DownloadExtraInfo"; + options.EnforceDistinctSubnets = optionBool "EnforceDistinctSubnets"; + options.EntryStatistics = optionBool "EntryStatistics"; + options.ExitPolicy = optionStrings "ExitPolicy" // { + default = ["reject *:*"]; + example = ["accept *:*"]; + }; + options.ExitPolicyRejectLocalInterfaces = optionBool "ExitPolicyRejectLocalInterfaces"; + options.ExitPolicyRejectPrivate = optionBool "ExitPolicyRejectPrivate"; + options.ExitPortStatistics = optionBool "ExitPortStatistics"; + options.ExitRelay = optionBool "ExitRelay"; # default is null and like "auto" + options.ExtORPort = mkOption { + description = descriptionGeneric "ExtORPort"; + default = null; + type = with types; nullOr (oneOf [ + port (enum ["auto"]) (submodule ({...}: { + options = { + addr = optionAddress; + port = optionPort; + }; + })) + ]); + apply = p: if isInt p || isString p then { port = p; } else p; + }; + options.ExtORPortCookieAuthFile = optionPath "ExtORPortCookieAuthFile"; + options.ExtORPortCookieAuthFileGroupReadable = optionBool "ExtORPortCookieAuthFileGroupReadable"; + options.ExtendAllowPrivateAddresses = optionBool "ExtendAllowPrivateAddresses"; + options.ExtraInfoStatistics = optionBool "ExtraInfoStatistics"; + options.FascistFirewall = optionBool "FascistFirewall"; + options.FetchDirInfoEarly = optionBool "FetchDirInfoEarly"; + options.FetchDirInfoExtraEarly = optionBool "FetchDirInfoExtraEarly"; + options.FetchHidServDescriptors = optionBool "FetchHidServDescriptors"; + options.FetchServerDescriptors = optionBool "FetchServerDescriptors"; + options.FetchUselessDescriptors = optionBool "FetchUselessDescriptors"; + options.ReachableAddresses = optionStrings "ReachableAddresses"; + options.ReachableDirAddresses = optionStrings "ReachableDirAddresses"; + options.ReachableORAddresses = optionStrings "ReachableORAddresses"; + options.GeoIPFile = optionPath "GeoIPFile"; + options.GeoIPv6File = optionPath "GeoIPv6File"; + options.GuardfractionFile = optionPath "GuardfractionFile"; + options.HidServAuth = mkOption { + description = descriptionGeneric "HidServAuth"; + default = []; + type = with types; listOf (oneOf [ + (submodule { + options = { + onion = mkOption { + type = strMatching "[a-z2-7]{16}(\\.onion)?"; + description = "Onion address."; + example = "xxxxxxxxxxxxxxxx.onion"; + }; + auth = mkOption { + type = strMatching "[A-Za-z0-9+/]{22}"; + description = "Authentication cookie."; + }; + }; + }) + ]); + }; + options.HiddenServiceNonAnonymousMode = optionBool "HiddenServiceNonAnonymousMode"; + options.HiddenServiceStatistics = optionBool "HiddenServiceStatistics"; + options.HSLayer2Nodes = optionStrings "HSLayer2Nodes"; + options.HSLayer3Nodes = optionStrings "HSLayer3Nodes"; + options.HTTPTunnelPort = optionIsolablePorts "HTTPTunnelPort"; + options.IPv6Exit = optionBool "IPv6Exit"; + options.KeyDirectory = optionPath "KeyDirectory"; + options.KeyDirectoryGroupReadable = optionBool "KeyDirectoryGroupReadable"; + options.LogMessageDomains = optionBool "LogMessageDomains"; + options.LongLivedPorts = optionPorts "LongLivedPorts"; + options.MainloopStats = optionBool "MainloopStats"; + options.MaxAdvertisedBandwidth = optionBandwith "MaxAdvertisedBandwidth"; + options.MaxCircuitDirtiness = optionInt "MaxCircuitDirtiness"; + options.MaxClientCircuitsPending = optionInt "MaxClientCircuitsPending"; + options.NATDPort = optionIsolablePorts "NATDPort"; + options.NewCircuitPeriod = optionInt "NewCircuitPeriod"; + options.Nickname = optionString "Nickname"; + options.ORPort = optionORPort "ORPort"; + options.OfflineMasterKey = optionBool "OfflineMasterKey"; + options.OptimisticData = optionBool "OptimisticData"; # default is null and like "auto" + options.PaddingStatistics = optionBool "PaddingStatistics"; + options.PerConnBWBurst = optionBandwith "PerConnBWBurst"; + options.PerConnBWRate = optionBandwith "PerConnBWRate"; + options.PidFile = optionPath "PidFile"; + options.ProtocolWarnings = optionBool "ProtocolWarnings"; + options.PublishHidServDescriptors = optionBool "PublishHidServDescriptors"; + options.PublishServerDescriptor = mkOption { + description = descriptionGeneric "PublishServerDescriptor"; + type = with types; nullOr (enum [false true 0 1 "0" "1" "v3" "bridge"]); + default = null; + }; + options.ReducedExitPolicy = optionBool "ReducedExitPolicy"; + options.RefuseUnknownExits = optionBool "RefuseUnknownExits"; # default is null and like "auto" + options.RejectPlaintextPorts = optionPorts "RejectPlaintextPorts"; + options.RelayBandwidthBurst = optionBandwith "RelayBandwidthBurst"; + options.RelayBandwidthRate = optionBandwith "RelayBandwidthRate"; + #options.RunAsDaemon + options.Sandbox = optionBool "Sandbox"; + options.ServerDNSAllowBrokenConfig = optionBool "ServerDNSAllowBrokenConfig"; + options.ServerDNSAllowNonRFC953Hostnames = optionBool "ServerDNSAllowNonRFC953Hostnames"; + options.ServerDNSDetectHijacking = optionBool "ServerDNSDetectHijacking"; + options.ServerDNSRandomizeCase = optionBool "ServerDNSRandomizeCase"; + options.ServerDNSResolvConfFile = optionPath "ServerDNSResolvConfFile"; + options.ServerDNSSearchDomains = optionBool "ServerDNSSearchDomains"; + options.ServerTransportPlugin = mkOption { + description = descriptionGeneric "ServerTransportPlugin"; + default = null; + type = with types; nullOr (submodule ({...}: { + options = { + transports = mkOption { + description = "List of pluggable transports."; + type = listOf str; + example = ["obfs2" "obfs3" "obfs4" "scramblesuit"]; + }; + exec = mkOption { + type = types.str; + description = "Command of pluggable transport."; + }; + }; + })); + }; + options.SocksPolicy = optionStrings "SocksPolicy" // { + example = ["accept *:*"]; + }; + options.SOCKSPort = mkOption { + description = descriptionGeneric "SOCKSPort"; + default = if cfg.settings.HiddenServiceNonAnonymousMode == true then [{port = 0;}] else []; + example = [{port = 9090;}]; + type = types.listOf (optionSOCKSPort true); + }; + options.TestingTorNetwork = optionBool "TestingTorNetwork"; + options.TransPort = optionIsolablePorts "TransPort"; + options.TransProxyType = mkOption { + description = descriptionGeneric "TransProxyType"; + type = with types; nullOr (enum ["default" "TPROXY" "ipfw" "pf-divert"]); + default = null; + }; + #options.TruncateLogFile + options.UnixSocksGroupWritable = optionBool "UnixSocksGroupWritable"; + options.UseDefaultFallbackDirs = optionBool "UseDefaultFallbackDirs"; + options.UseMicrodescriptors = optionBool "UseMicrodescriptors"; + options.V3AuthUseLegacyKey = optionBool "V3AuthUseLegacyKey"; + options.V3AuthoritativeDirectory = optionBool "V3AuthoritativeDirectory"; + options.VersioningAuthoritativeDirectory = optionBool "VersioningAuthoritativeDirectory"; + options.VirtualAddrNetworkIPv4 = optionString "VirtualAddrNetworkIPv4"; + options.VirtualAddrNetworkIPv6 = optionString "VirtualAddrNetworkIPv6"; + options.WarnPlaintextPorts = optionPorts "WarnPlaintextPorts"; + }; }; }; }; @@ -696,79 +822,216 @@ in config = mkIf cfg.enable { # Not sure if `cfg.relay.role == "private-bridge"` helps as tor # sends a lot of stats - warnings = optional (cfg.relay.enable && cfg.hiddenServices != {}) + warnings = optional (cfg.settings.BridgeRelay && + flatten (mapAttrsToList (n: o: o.map) cfg.relay.onionServices) != []) '' Running Tor hidden services on a public relay makes the presence of hidden services visible through simple statistical analysis of publicly available data. + See https://trac.torproject.org/projects/tor/ticket/8742 You can safely ignore this warning if you don't intend to actually hide your hidden services. In either case, you can always create a container/VM with a separate Tor daemon instance. - ''; + '' ++ + flatten (mapAttrsToList (n: o: + optional (o.settings.HiddenServiceVersion == 2) [ + (optional (o.settings.HiddenServiceExportCircuitID != null) '' + HiddenServiceExportCircuitID is used in the HiddenService: ${n} + but this option is only for v3 hidden services. + '') + ] ++ + optional (o.settings.HiddenServiceVersion != 2) [ + (optional (o.settings.HiddenServiceAuthorizeClient != null) '' + HiddenServiceAuthorizeClient is used in the HiddenService: ${n} + but this option is only for v2 hidden services. + '') + (optional (o.settings.RendPostPeriod != null) '' + RendPostPeriod is used in the HiddenService: ${n} + but this option is only for v2 hidden services. + '') + ] + ) cfg.relay.onionServices); users.groups.tor.gid = config.ids.gids.tor; users.users.tor = { description = "Tor Daemon User"; createHome = true; - home = torDirectory; + home = stateDir; group = "tor"; uid = config.ids.uids.tor; }; - # We have to do this instead of using RuntimeDirectory option in - # the service below because systemd has no way to set owners of - # RuntimeDirectory and putting this into the service below - # requires that service to relax it's sandbox since this needs - # writable /run - systemd.services.tor-init = - { description = "Tor Daemon Init"; - wantedBy = [ "tor.service" ]; - script = '' - install -m 0700 -o tor -g tor -d ${torDirectory} ${torDirectory}/onion - install -m 0750 -o tor -g tor -d ${torRunDirectory} - ''; - serviceConfig = { - Type = "oneshot"; - RemainAfterExit = true; - }; - }; + services.tor.settings = mkMerge [ + (mkIf cfg.enableGeoIP { + GeoIPFile = "${cfg.package.geoip}/share/tor/geoip"; + GeoIPv6File = "${cfg.package.geoip}/share/tor/geoip6"; + }) + (mkIf cfg.controlSocket.enable { + ControlPort = [ { unix = runDir + "/control"; GroupWritable=true; RelaxDirModeCheck=true; } ]; + }) + (mkIf cfg.relay.enable ( + optionalAttrs (cfg.relay.role != "exit") { + ExitPolicy = mkForce ["reject *:*"]; + } // + optionalAttrs (elem cfg.relay.role ["bridge" "private-bridge"]) { + BridgeRelay = true; + ExtORPort.port = mkDefault "auto"; + ServerTransportPlugin.transports = mkDefault ["obfs4"]; + ServerTransportPlugin.exec = mkDefault "${pkgs.obfs4}/bin/obfs4proxy managed"; + } // optionalAttrs (cfg.relay.role == "private-bridge") { + ExtraInfoStatistics = false; + PublishServerDescriptor = false; + } + )) + (mkIf (!cfg.relay.enable) { + # Avoid surprises when leaving ORPort/DirPort configurations in cfg.settings, + # because it would still enable Tor as a relay, + # which can trigger all sort of problems when not carefully done, + # like the blocklisting of the machine's IP addresses + # by some hosting providers... + DirPort = mkForce []; + ORPort = mkForce []; + PublishServerDescriptor = mkForce false; + }) + (mkIf cfg.client.enable ( + { SOCKSPort = [ cfg.client.socksListenAddress ]; + } // optionalAttrs cfg.client.transparentProxy.enable { + TransPort = [{ addr = "127.0.0.1"; port = 9040; }]; + } // optionalAttrs cfg.client.dns.enable { + DNSPort = [{ addr = "127.0.0.1"; port = 9053; }]; + AutomapHostsOnResolve = true; + } // optionalAttrs (flatten (mapAttrsToList (n: o: o.clientAuthorizations) cfg.client.onionServices) != []) { + ClientOnionAuthDir = runDir + "/ClientOnionAuthDir"; + } + )) + ]; - systemd.services.tor = - { description = "Tor Daemon"; - path = [ pkgs.tor ]; + networking.firewall = mkIf cfg.openFirewall { + allowedTCPPorts = + concatMap (o: optional (isInt o && o > 0 || o ? "port" && isInt o.port && o.port > 0) o.port) + (flatten [ + cfg.settings.ORPort + cfg.settings.DirPort + ]); + }; - wantedBy = [ "multi-user.target" ]; - after = [ "tor-init.service" "network.target" ]; - restartTriggers = [ torRcFile ]; + systemd.services.tor = { + description = "Tor Daemon"; + path = [ pkgs.tor ]; - serviceConfig = - { Type = "simple"; - # Translated from the upstream contrib/dist/tor.service.in - 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; - Restart = "on-failure"; - LimitNOFILE = 32768; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + restartTriggers = [ torrc ]; - # Hardening - # this seems to unshare /run despite what systemd.exec(5) says - PrivateTmp = mkIf (!cfg.controlSocket.enable) "yes"; - PrivateDevices = "yes"; - ProtectHome = "yes"; - ProtectSystem = "strict"; - InaccessiblePaths = "/home"; - ReadOnlyPaths = "/"; - ReadWritePaths = [ torDirectory torRunDirectory ]; - NoNewPrivileges = "yes"; - - # tor.service.in has this in, but this line it fails to spawn a namespace when using hidden services - #CapabilityBoundingSet = "CAP_SETUID CAP_SETGID CAP_NET_BIND_SERVICE"; - }; + serviceConfig = { + Type = "simple"; + User = "tor"; + Group = "tor"; + ExecStartPre = [ + "${cfg.package}/bin/tor -f ${torrc} --verify-config" + # DOC: Appendix G of https://spec.torproject.org/rend-spec-v3 + ("+" + pkgs.writeShellScript "ExecStartPre" (concatStringsSep "\n" (flatten (["set -eu"] ++ + mapAttrsToList (name: onion: + optional (onion.authorizedClients != []) '' + rm -rf ${escapeShellArg onion.path}/authorized_clients + install -d -o tor -g tor -m 0700 ${escapeShellArg onion.path} ${escapeShellArg onion.path}/authorized_clients + '' ++ + imap0 (i: pubKey: '' + echo ${pubKey} | + install -o tor -g tor -m 0400 /dev/stdin ${escapeShellArg onion.path}/authorized_clients/${toString i}.auth + '') onion.authorizedClients ++ + optional (onion.secretKey != null) '' + install -d -o tor -g tor -m 0700 ${escapeShellArg onion.path} + key="$(cut -f1 -d: ${escapeShellArg onion.secretKey})" + case "$key" in + ("== ed25519v"*"-secret") + install -o tor -g tor -m 0400 ${escapeShellArg onion.secretKey} ${escapeShellArg onion.path}/hs_ed25519_secret_key;; + (*) echo >&2 "NixOS does not (yet) support secret key type for onion: ${name}"; exit 1;; + esac + '' + ) cfg.relay.onionServices ++ + mapAttrsToList (name: onion: imap0 (i: prvKeyPath: + let hostname = removeSuffix ".onion" name; in '' + printf "%s:" ${escapeShellArg hostname} | cat - ${escapeShellArg prvKeyPath} | + install -o tor -g tor -m 0700 /dev/stdin \ + ${runDir}/ClientOnionAuthDir/${escapeShellArg hostname}.${toString i}.auth_private + '') onion.clientAuthorizations) + cfg.client.onionServices + )))) + ]; + ExecStart = "${cfg.package}/bin/tor -f ${torrc}"; + ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; + KillSignal = "SIGINT"; + TimeoutSec = 30; + Restart = "on-failure"; + LimitNOFILE = 32768; + RuntimeDirectory = [ + # g+x allows access to the control socket + "tor" + "tor/root" + # g+x can't be removed in ExecStart=, but will be removed by Tor + "tor/ClientOnionAuthDir" + ]; + RuntimeDirectoryMode = "0710"; + StateDirectoryMode = "0700"; + StateDirectory = [ + "tor" + "tor/onion" + ] ++ + flatten (mapAttrsToList (name: onion: + optional (onion.secretKey == null) "tor/onion/${name}" + ) cfg.relay.onionServices); + # The following options are only to optimize: + # systemd-analyze security tor + RootDirectory = runDir + "/root"; + RootDirectoryStartOnly = true; + #InaccessiblePaths = [ "-+${runDir}/root" ]; + UMask = "0066"; + BindPaths = [ stateDir ]; + BindReadOnlyPaths = [ storeDir "/etc" ]; + AmbientCapabilities = [""] ++ lib.optional bindsPrivilegedPort "CAP_NET_BIND_SERVICE"; + CapabilityBoundingSet = [""] ++ lib.optional bindsPrivilegedPort "CAP_NET_BIND_SERVICE"; + # ProtectClock= adds DeviceAllow=char-rtc r + DeviceAllow = ""; + LockPersonality = true; + MemoryDenyWriteExecute = true; + NoNewPrivileges = true; + PrivateDevices = true; + PrivateMounts = true; + PrivateNetwork = mkDefault false; + PrivateTmp = true; + # Tor cannot currently bind privileged port when PrivateUsers=true, + # see https://gitlab.torproject.org/legacy/trac/-/issues/20930 + PrivateUsers = !bindsPrivilegedPort; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectSystem = "strict"; + RemoveIPC = true; + RestrictAddressFamilies = [ "AF_UNIX" "AF_INET" "AF_INET6" ]; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + # See also the finer but experimental option settings.Sandbox + SystemCallFilter = [ + "@system-service" + # Groups in @system-service which do not contain a syscall listed by: + # perf stat -x, 2>perf.log -e 'syscalls:sys_enter_*' tor + # in tests, and seem likely not necessary for tor. + "~@aio" "~@chown" "~@keyring" "~@memlock" "~@resources" "~@setuid" "~@timer" + ]; + SystemCallArchitectures = "native"; + SystemCallErrorNumber = "EPERM"; }; + }; environment.systemPackages = [ cfg.package ]; }; + + meta.maintainers = with lib.maintainers; [ julm ]; } diff --git a/nixos/modules/services/ttys/agetty.nix b/nixos/modules/services/ttys/getty.nix similarity index 64% rename from nixos/modules/services/ttys/agetty.nix rename to nixos/modules/services/ttys/getty.nix index d07746be2377..ecfabef5fb13 100644 --- a/nixos/modules/services/ttys/agetty.nix +++ b/nixos/modules/services/ttys/getty.nix @@ -3,9 +3,19 @@ with lib; let + cfg = config.services.getty; - autologinArg = optionalString (config.services.mingetty.autologinUser != null) "--autologin ${config.services.mingetty.autologinUser}"; - gettyCmd = extraArgs: "@${pkgs.util-linux}/sbin/agetty agetty --login-program ${pkgs.shadow}/bin/login ${autologinArg} ${extraArgs}"; + loginArgs = [ + "--login-program" "${pkgs.shadow}/bin/login" + ] ++ optionals (cfg.autologinUser != null) [ + "--autologin" cfg.autologinUser + ] ++ optionals (cfg.loginOptions != null) [ + "--login-options" cfg.loginOptions + ]; + + gettyCmd = extraArgs: + "@${pkgs.util-linux}/sbin/agetty agetty ${escapeShellArgs loginArgs} " + + extraArgs; in @@ -13,9 +23,13 @@ in ###### interface + imports = [ + (mkRenamedOptionModule [ "services" "mingetty" ] [ "services" "getty" ]) + ]; + options = { - services.mingetty = { + services.getty = { autologinUser = mkOption { type = types.nullOr types.str; @@ -26,10 +40,27 @@ in ''; }; + loginOptions = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + Template for arguments to be passed to + login + 1. + + See agetty + 1 for details, + including security considerations. If unspecified, agetty + will not be invoked with a + option. + ''; + example = "-h darkstar -- \u"; + }; + greetingLine = mkOption { type = types.str; description = '' - Welcome line printed by mingetty. + Welcome line printed by agetty. The default shows current NixOS version label, machine type and tty. ''; }; @@ -38,7 +69,7 @@ in type = types.lines; default = ""; description = '' - Help line printed by mingetty below the welcome line. + Help line printed by agetty below the welcome line. Used by the installation CD to give some hints on how to proceed. ''; @@ -65,7 +96,7 @@ in config = { # Note: this is set here rather than up there so that changing # nixos.label would not rebuild manual pages - services.mingetty.greetingLine = mkDefault ''<<< Welcome to NixOS ${config.system.nixos.label} (\m) - \l >>>''; + services.getty.greetingLine = mkDefault ''<<< Welcome to NixOS ${config.system.nixos.label} (\m) - \l >>>''; systemd.services."getty@" = { serviceConfig.ExecStart = [ @@ -76,7 +107,7 @@ in }; systemd.services."serial-getty@" = - let speeds = concatStringsSep "," (map toString config.services.mingetty.serialSpeed); in + let speeds = concatStringsSep "," (map toString config.services.getty.serialSpeed); in { serviceConfig.ExecStart = [ "" # override upstream default with an empty ExecStart (gettyCmd "%I ${speeds} $TERM") @@ -106,8 +137,8 @@ in { # Friendly greeting on the virtual consoles. source = pkgs.writeText "issue" '' - ${config.services.mingetty.greetingLine} - ${config.services.mingetty.helpLine} + ${config.services.getty.greetingLine} + ${config.services.getty.helpLine} ''; }; diff --git a/nixos/modules/services/web-apps/ihatemoney/default.nix b/nixos/modules/services/web-apps/ihatemoney/default.nix index 68769ac8c031..b4987fa4702c 100644 --- a/nixos/modules/services/web-apps/ihatemoney/default.nix +++ b/nixos/modules/services/web-apps/ihatemoney/default.nix @@ -44,7 +44,7 @@ let in { options.services.ihatemoney = { - enable = mkEnableOption "ihatemoney webapp. Note that this will set uwsgi to emperor mode running as root"; + enable = mkEnableOption "ihatemoney webapp. Note that this will set uwsgi to emperor mode"; backend = mkOption { type = types.enum [ "sqlite" "postgresql" ]; default = "sqlite"; @@ -116,16 +116,13 @@ in services.uwsgi = { enable = true; plugins = [ "python3" ]; - # the vassal needs to be able to setuid - user = "root"; - group = "root"; instance = { type = "emperor"; vassals.ihatemoney = { type = "normal"; strict = true; - uid = user; - gid = group; + immediate-uid = user; + immediate-gid = group; # apparently flask uses threads: https://github.com/spiral-project/ihatemoney/commit/c7815e48781b6d3a457eaff1808d179402558f8c enable-threads = true; module = "wsgi:application"; diff --git a/nixos/modules/services/web-apps/nextcloud.xml b/nixos/modules/services/web-apps/nextcloud.xml index 02e4dba28610..f71c8df6c6d4 100644 --- a/nixos/modules/services/web-apps/nextcloud.xml +++ b/nixos/modules/services/web-apps/nextcloud.xml @@ -10,6 +10,10 @@ services.nextcloud. A desktop client is packaged at pkgs.nextcloud-client. + + The current default by NixOS is nextcloud20 which is also the latest + major version available. +
Basic usage @@ -210,7 +214,7 @@ nextcloud17 = generic { version = "17.0.x"; sha256 = "0000000000000000000000000000000000000000000000000000"; - insecure = true; + eol = true; }; } diff --git a/nixos/modules/services/web-apps/whitebophir.nix b/nixos/modules/services/web-apps/whitebophir.nix new file mode 100644 index 000000000000..a19812547c44 --- /dev/null +++ b/nixos/modules/services/web-apps/whitebophir.nix @@ -0,0 +1,45 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.whitebophir; +in { + options = { + services.whitebophir = { + enable = mkEnableOption "whitebophir, an online collaborative whiteboard server (persistent state will be maintained under /var/lib/whitebophir)"; + + package = mkOption { + default = pkgs.whitebophir; + defaultText = "pkgs.whitebophir"; + type = types.package; + description = "Whitebophir package to use."; + }; + + port = mkOption { + type = types.port; + default = 5001; + description = "Port to bind to."; + }; + }; + }; + + config = mkIf cfg.enable { + systemd.services.whitebophir = { + description = "Whitebophir Service"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + environment = { + PORT = "${toString cfg.port}"; + WBO_HISTORY_DIR = "/var/lib/whitebophir"; + }; + + serviceConfig = { + DynamicUser = true; + ExecStart = "${cfg.package}/bin/whitebophir"; + Restart = "always"; + StateDirectory = "whitebophir"; + }; + }; + }; +} diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index 62671e9d7484..d6f463be9e81 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -27,6 +27,33 @@ let ) cfg.virtualHosts; enableIPv6 = config.networking.enableIPv6; + defaultFastcgiParams = { + SCRIPT_FILENAME = "$document_root$fastcgi_script_name"; + QUERY_STRING = "$query_string"; + REQUEST_METHOD = "$request_method"; + CONTENT_TYPE = "$content_type"; + CONTENT_LENGTH = "$content_length"; + + SCRIPT_NAME = "$fastcgi_script_name"; + REQUEST_URI = "$request_uri"; + DOCUMENT_URI = "$document_uri"; + DOCUMENT_ROOT = "$document_root"; + SERVER_PROTOCOL = "$server_protocol"; + REQUEST_SCHEME = "$scheme"; + HTTPS = "$https if_not_empty"; + + GATEWAY_INTERFACE = "CGI/1.1"; + SERVER_SOFTWARE = "nginx/$nginx_version"; + + REMOTE_ADDR = "$remote_addr"; + REMOTE_PORT = "$remote_port"; + SERVER_ADDR = "$server_addr"; + SERVER_PORT = "$server_port"; + SERVER_NAME = "$server_name"; + + REDIRECT_STATUS = "200"; + }; + recommendedProxyConfig = pkgs.writeText "nginx-recommended-proxy-headers.conf" '' proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; @@ -179,6 +206,12 @@ let ${cfg.httpConfig} }''} + ${optionalString (cfg.streamConfig != "") '' + stream { + ${cfg.streamConfig} + } + ''} + ${cfg.appendConfig} ''; @@ -283,6 +316,10 @@ let proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection $connection_upgrade; ''} + ${concatStringsSep "\n" + (mapAttrsToList (n: v: ''fastcgi_param ${n} "${v}";'') + (optionalAttrs (config.fastcgiParams != {}) + (defaultFastcgiParams // config.fastcgiParams)))} ${optionalString (config.index != null) "index ${config.index};"} ${optionalString (config.tryFiles != null) "try_files ${config.tryFiles};"} ${optionalString (config.root != null) "root ${config.root};"} @@ -452,6 +489,21 @@ in "; }; + streamConfig = mkOption { + type = types.lines; + default = ""; + example = '' + server { + listen 127.0.0.1:53 udp reuseport; + proxy_timeout 20s; + proxy_pass 192.168.0.1:53535; + } + ''; + description = " + Configuration lines to be set inside the stream block. + "; + }; + eventsConfig = mkOption { type = types.lines; default = ""; diff --git a/nixos/modules/services/web-servers/nginx/location-options.nix b/nixos/modules/services/web-servers/nginx/location-options.nix index f2fc07255725..5a7f5188b6cf 100644 --- a/nixos/modules/services/web-servers/nginx/location-options.nix +++ b/nixos/modules/services/web-servers/nginx/location-options.nix @@ -101,6 +101,16 @@ with lib; ''; }; + fastcgiParams = mkOption { + type = types.attrsOf types.str; + default = {}; + description = '' + FastCGI parameters to override. Unlike in the Nginx + configuration file, overriding only some default parameters + won't unset the default values for other parameters. + ''; + }; + extraConfig = mkOption { type = types.lines; default = ""; diff --git a/nixos/modules/services/web-servers/uwsgi.nix b/nixos/modules/services/web-servers/uwsgi.nix index 936e211ec713..506cd364a65a 100644 --- a/nixos/modules/services/web-servers/uwsgi.nix +++ b/nixos/modules/services/web-servers/uwsgi.nix @@ -5,11 +5,24 @@ with lib; let cfg = config.services.uwsgi; + isEmperor = cfg.instance.type == "emperor"; + + imperialPowers = + [ + # spawn other user processes + "CAP_SETUID" "CAP_SETGID" + "CAP_SYS_CHROOT" + # transfer capabilities + "CAP_SETPCAP" + # create other user sockets + "CAP_CHOWN" + ]; + buildCfg = name: c: let plugins = if any (n: !any (m: m == n) cfg.plugins) (c.plugins or []) - then throw "`plugins` attribute in UWSGI configuration contains plugins not in config.services.uwsgi.plugins" + then throw "`plugins` attribute in uWSGI configuration contains plugins not in config.services.uwsgi.plugins" else c.plugins or cfg.plugins; hasPython = v: filter (n: n == "python${v}") plugins != []; @@ -18,7 +31,7 @@ let python = if hasPython2 && hasPython3 then - throw "`plugins` attribute in UWSGI configuration shouldn't contain both python2 and python3" + throw "`plugins` attribute in uWSGI configuration shouldn't contain both python2 and python3" else if hasPython2 then cfg.package.python2 else if hasPython3 then cfg.package.python3 else null; @@ -43,7 +56,7 @@ let oldPaths = filter (x: x != null) (map getPath env'); in env' ++ [ "PATH=${optionalString (oldPaths != []) "${last oldPaths}:"}${pythonEnv}/bin" ]; } - else if c.type == "emperor" + else if isEmperor then { emperor = if builtins.typeOf c.vassals != "set" then c.vassals else pkgs.buildEnv { @@ -51,7 +64,7 @@ let paths = mapAttrsToList buildCfg c.vassals; }; } // removeAttrs c [ "type" "vassals" ] - else throw "`type` attribute in UWSGI configuration should be either 'normal' or 'emperor'"; + else throw "`type` attribute in uWSGI configuration should be either 'normal' or 'emperor'"; }; in pkgs.writeTextDir "${name}.json" (builtins.toJSON uwsgiCfg); @@ -79,7 +92,7 @@ in { }; instance = mkOption { - type = with lib.types; let + type = with types; let valueType = nullOr (oneOf [ bool int @@ -137,31 +150,65 @@ in { user = mkOption { type = types.str; default = "uwsgi"; - description = "User account under which uwsgi runs."; + description = "User account under which uWSGI runs."; }; group = mkOption { type = types.str; default = "uwsgi"; - description = "Group account under which uwsgi runs."; + description = "Group account under which uWSGI runs."; + }; + + capabilities = mkOption { + type = types.listOf types.str; + apply = caps: caps ++ optionals isEmperor imperialPowers; + default = [ ]; + example = literalExample '' + [ + "CAP_NET_BIND_SERVICE" # bind on ports <1024 + "CAP_NET_RAW" # open raw sockets + ] + ''; + description = '' + Grant capabilities to the uWSGI instance. See the + capabilities(7) for available values. + + + uWSGI runs as an unprivileged user (even as Emperor) with the minimal + capabilities required. This option can be used to add fine-grained + permissions without running the service as root. + + + When in Emperor mode, any capability to be inherited by a vassal must + be specified again in the vassal configuration using cap. + See the uWSGI docs + for more information. + + + ''; }; }; }; config = mkIf cfg.enable { + systemd.tmpfiles.rules = optional (cfg.runDir != "/run/uwsgi") '' + d ${cfg.runDir} 775 ${cfg.user} ${cfg.group} + ''; + systemd.services.uwsgi = { wantedBy = [ "multi-user.target" ]; - preStart = '' - mkdir -p ${cfg.runDir} - chown ${cfg.user}:${cfg.group} ${cfg.runDir} - ''; serviceConfig = { + User = cfg.user; + Group = cfg.group; Type = "notify"; - ExecStart = "${cfg.package}/bin/uwsgi --uid ${cfg.user} --gid ${cfg.group} --json ${buildCfg "server" cfg.instance}/server.json"; + ExecStart = "${cfg.package}/bin/uwsgi --json ${buildCfg "server" cfg.instance}/server.json"; ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; ExecStop = "${pkgs.coreutils}/bin/kill -INT $MAINPID"; NotifyAccess = "main"; KillSignal = "SIGQUIT"; + AmbientCapabilities = cfg.capabilities; + CapabilityBoundingSet = cfg.capabilities; }; }; diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index 68a65d77d62f..a36a47d376b6 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -19,7 +19,7 @@ let defaultFavoriteAppsOverride = '' [org.gnome.shell] - favorite-apps=[ 'org.gnome.Geary.desktop', 'org.gnome.Calendar.desktop', 'org.gnome.Music.desktop', 'org.gnome.Photos.desktop', 'org.gnome.Nautilus.desktop' ] + favorite-apps=[ 'org.gnome.Epiphany.desktop', 'org.gnome.Geary.desktop', 'org.gnome.Calendar.desktop', 'org.gnome.Music.desktop', 'org.gnome.Photos.desktop', 'org.gnome.Nautilus.desktop' ] ''; nixos-gsettings-desktop-schemas = let @@ -409,9 +409,7 @@ in baobab cheese eog - /* Not in good standing on nixos: - * https://github.com/NixOS/nixpkgs/issues/98819 - /* epiphany */ + epiphany gedit gnome-calculator gnome-calendar diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix index a9b0b8dc23fb..5f1c099c283d 100644 --- a/nixos/modules/services/x11/desktop-managers/plasma5.nix +++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix @@ -8,8 +8,7 @@ let cfg = xcfg.desktopManager.plasma5; inherit (pkgs) kdeApplications kdeFrameworks plasma5; - libsForQt5 = pkgs.libsForQt514; - qt5 = pkgs.qt514; + inherit (pkgs) qt5 libsForQt5; inherit (pkgs) writeText; pulseaudio = config.hardware.pulseaudio; diff --git a/nixos/modules/services/x11/window-managers/clfswm.nix b/nixos/modules/services/x11/window-managers/clfswm.nix index 176c1f461271..171660c53ac3 100644 --- a/nixos/modules/services/x11/window-managers/clfswm.nix +++ b/nixos/modules/services/x11/window-managers/clfswm.nix @@ -15,10 +15,10 @@ in services.xserver.windowManager.session = singleton { name = "clfswm"; start = '' - ${pkgs.clfswm}/bin/clfswm & + ${pkgs.lispPackages.clfswm}/bin/clfswm & waitPID=$! ''; }; - environment.systemPackages = [ pkgs.clfswm ]; + environment.systemPackages = [ pkgs.lispPackages.clfswm ]; }; } diff --git a/nixos/modules/services/x11/window-managers/default.nix b/nixos/modules/services/x11/window-managers/default.nix index 87702c58727a..9ca24310e567 100644 --- a/nixos/modules/services/x11/window-managers/default.nix +++ b/nixos/modules/services/x11/window-managers/default.nix @@ -13,6 +13,7 @@ in ./berry.nix ./bspwm.nix ./cwm.nix + ./clfswm.nix ./dwm.nix ./evilwm.nix ./exwm.nix diff --git a/nixos/modules/services/x11/window-managers/exwm.nix b/nixos/modules/services/x11/window-managers/exwm.nix index 88e13f4dbfb0..3e97d28d83b5 100644 --- a/nixos/modules/services/x11/window-managers/exwm.nix +++ b/nixos/modules/services/x11/window-managers/exwm.nix @@ -48,7 +48,7 @@ in description = '' Extra packages available to Emacs. The value must be a function which receives the attrset defined in - emacsPackages as the sole argument. + emacs.pkgs as the sole argument. ''; }; }; diff --git a/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix b/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix index 337afe9ef628..ba936b265732 100644 --- a/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix +++ b/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix @@ -20,7 +20,7 @@ let timeoutStr = if blCfg.timeout == null then "-1" else toString blCfg.timeout; isAarch64 = pkgs.stdenv.hostPlatform.isAarch64; - optional = pkgs.stdenv.lib.optionalString; + optional = pkgs.lib.optionalString; configTxt = pkgs.writeText "config.txt" ('' diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index 86bfde6349c3..cb9735ae04f7 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -22,7 +22,7 @@ let rootModules = config.boot.initrd.availableKernelModules ++ config.boot.initrd.kernelModules; kernel = modulesTree; firmware = firmware; - allowMissing = true; + allowMissing = false; }; @@ -513,7 +513,12 @@ in }; boot.initrd.compressor = mkOption { - default = "gzip"; + default = ( + if lib.versionAtLeast config.boot.kernelPackages.kernel.version "5.9" + then "zstd" + else "gzip" + ); + defaultText = "zstd if the kernel supports it (5.9+), gzip if not."; type = types.unspecified; # We don't have a function type... description = '' The compressor to use on the initrd image. May be any of: diff --git a/nixos/modules/system/boot/tmp.nix b/nixos/modules/system/boot/tmp.nix index 26eb172210e7..837e308cbea9 100644 --- a/nixos/modules/system/boot/tmp.nix +++ b/nixos/modules/system/boot/tmp.nix @@ -30,7 +30,13 @@ with lib; config = { - systemd.additionalUpstreamSystemUnits = optional config.boot.tmpOnTmpfs "tmp.mount"; + systemd.mounts = mkIf config.boot.tmpOnTmpfs [ + { + what = "tmpfs"; + where = "/tmp"; + mountConfig.Options = [ "mode=1777" "strictatime" "rw" "nosuid" "nodev" "size=50%" ]; + } + ]; systemd.tmpfiles.rules = optional config.boot.cleanTmpDir "D! /tmp 1777 root root"; diff --git a/nixos/modules/virtualisation/amazon-init.nix b/nixos/modules/virtualisation/amazon-init.nix index 8c12e0e49bf5..c5470b7af09b 100644 --- a/nixos/modules/virtualisation/amazon-init.nix +++ b/nixos/modules/virtualisation/amazon-init.nix @@ -7,7 +7,7 @@ let echo "attempting to fetch configuration from EC2 user data..." export HOME=/root - export PATH=${pkgs.lib.makeBinPath [ config.nix.package pkgs.systemd pkgs.gnugrep pkgs.git pkgs.gnutar pkgs.gzip pkgs.gnused config.system.build.nixos-rebuild]}:$PATH + export PATH=${pkgs.lib.makeBinPath [ config.nix.package pkgs.systemd pkgs.gnugrep pkgs.git pkgs.gnutar pkgs.gzip pkgs.gnused pkgs.xz config.system.build.nixos-rebuild]}:$PATH export NIX_PATH=nixpkgs=/nix/var/nix/profiles/per-user/root/channels/nixos:nixos-config=/etc/nixos/configuration.nix:/nix/var/nix/profiles/per-user/root/channels userData=/etc/ec2-metadata/user-data diff --git a/nixos/modules/virtualisation/docker.nix b/nixos/modules/virtualisation/docker.nix index ec257801b330..70d6fcc89674 100644 --- a/nixos/modules/virtualisation/docker.nix +++ b/nixos/modules/virtualisation/docker.nix @@ -155,19 +155,17 @@ in users.groups.docker.gid = config.ids.gids.docker; systemd.packages = [ cfg.package ]; - # TODO: remove once docker 20.10 is released - systemd.enableUnifiedCgroupHierarchy = false; - systemd.services.docker = { wantedBy = optional cfg.enableOnBoot "multi-user.target"; environment = proxy_env; serviceConfig = { + Type = "notify"; ExecStart = [ "" '' ${cfg.package}/bin/dockerd \ --group=docker \ - --host=fd:// \ + --host=unix:// \ --log-driver=${cfg.logDriver} \ ${optionalString (cfg.storageDriver != null) "--storage-driver=${cfg.storageDriver}"} \ ${optionalString cfg.liveRestore "--live-restore" } \ diff --git a/nixos/modules/virtualisation/ec2-amis.nix b/nixos/modules/virtualisation/ec2-amis.nix index 3da63078a214..892af513b032 100644 --- a/nixos/modules/virtualisation/ec2-amis.nix +++ b/nixos/modules/virtualisation/ec2-amis.nix @@ -329,24 +329,24 @@ let self = { "20.03".ap-east-1.hvm-ebs = "ami-0d18fdd309cdefa86"; "20.03".sa-east-1.hvm-ebs = "ami-09859378158ae971d"; - # 20.09.1632.a6a3a368dda - "20.09".eu-west-1.hvm-ebs = "ami-01a79d5ce435f4db3"; - "20.09".eu-west-2.hvm-ebs = "ami-0cbe14f32904e6331"; - "20.09".eu-west-3.hvm-ebs = "ami-07f493412d6213de6"; - "20.09".eu-central-1.hvm-ebs = "ami-01d4a0c2248cbfe38"; - "20.09".eu-north-1.hvm-ebs = "ami-0003f54dd99d68e0f"; - "20.09".us-east-1.hvm-ebs = "ami-068a62d478710462d"; - "20.09".us-east-2.hvm-ebs = "ami-01ac677ff61399caa"; - "20.09".us-west-1.hvm-ebs = "ami-04befdb203b4b17f6"; - "20.09".us-west-2.hvm-ebs = "ami-0fb7bd4a43261c6b2"; - "20.09".ca-central-1.hvm-ebs = "ami-06d5ee429f153f856"; - "20.09".ap-southeast-1.hvm-ebs = "ami-0db0304e23c535b2a"; - "20.09".ap-southeast-2.hvm-ebs = "ami-045983c4db7e36447"; - "20.09".ap-northeast-1.hvm-ebs = "ami-0beb18d632cf64e5a"; - "20.09".ap-northeast-2.hvm-ebs = "ami-0dd0316af578862db"; - "20.09".ap-south-1.hvm-ebs = "ami-008d15ced81c88aed"; - "20.09".ap-east-1.hvm-ebs = "ami-071f49713f86ea965"; - "20.09".sa-east-1.hvm-ebs = "ami-05ded1ae35209b5a8"; + # 20.09.2016.19db3e5ea27 + "20.09".eu-west-1.hvm-ebs = "ami-0057cb7d614329fa2"; + "20.09".eu-west-2.hvm-ebs = "ami-0d46f16e0bb0ec8fd"; + "20.09".eu-west-3.hvm-ebs = "ami-0e8985c3ea42f87fe"; + "20.09".eu-central-1.hvm-ebs = "ami-0eed77c38432886d2"; + "20.09".eu-north-1.hvm-ebs = "ami-0be5bcadd632bea14"; + "20.09".us-east-1.hvm-ebs = "ami-0a2cce52b42daccc8"; + "20.09".us-east-2.hvm-ebs = "ami-09378bf487b07a4d8"; + "20.09".us-west-1.hvm-ebs = "ami-09b4337b2a9e77485"; + "20.09".us-west-2.hvm-ebs = "ami-081d3bb5fbee0a1ac"; + "20.09".ca-central-1.hvm-ebs = "ami-020c24c6c607e7ac7"; + "20.09".ap-southeast-1.hvm-ebs = "ami-08f648d5db009e67d"; + "20.09".ap-southeast-2.hvm-ebs = "ami-0be390efaccbd40f9"; + "20.09".ap-northeast-1.hvm-ebs = "ami-0c3311601cbe8f927"; + "20.09".ap-northeast-2.hvm-ebs = "ami-0020146701f4d56cf"; + "20.09".ap-south-1.hvm-ebs = "ami-0117e2bd876bb40d1"; + "20.09".ap-east-1.hvm-ebs = "ami-0c42f97e5b1fda92f"; + "20.09".sa-east-1.hvm-ebs = "ami-021637976b094959d"; latest = self."20.09"; }; in self diff --git a/nixos/modules/virtualisation/lxc-container.nix b/nixos/modules/virtualisation/lxc-container.nix index d49364840187..e47bd59dc016 100644 --- a/nixos/modules/virtualisation/lxc-container.nix +++ b/nixos/modules/virtualisation/lxc-container.nix @@ -11,7 +11,7 @@ with lib; users.users.root.initialHashedPassword = mkOverride 150 ""; # Some more help text. - services.mingetty.helpLine = + services.getty.helpLine = '' Log in as "root" with an empty password. diff --git a/nixos/modules/virtualisation/lxd.nix b/nixos/modules/virtualisation/lxd.nix index 3958fc2c1d7c..103e689abae8 100644 --- a/nixos/modules/virtualisation/lxd.nix +++ b/nixos/modules/virtualisation/lxd.nix @@ -100,6 +100,10 @@ in packages = [ cfg.lxcPackage ]; }; + # TODO: remove once LXD gets proper support for cgroupsv2 + # (currently most of the e.g. CPU accounting stuff doesn't work) + systemd.enableUnifiedCgroupHierarchy = false; + systemd.services.lxd = { description = "LXD Container Management Daemon"; diff --git a/nixos/modules/virtualisation/oci-containers.nix b/nixos/modules/virtualisation/oci-containers.nix index a46dd65eb491..ee9fe62187d3 100644 --- a/nixos/modules/virtualisation/oci-containers.nix +++ b/nixos/modules/virtualisation/oci-containers.nix @@ -176,10 +176,10 @@ let description = '' Define which other containers this one depends on. They will be added to both After and Requires for the unit. - Use the same name as the attribute under virtualisation.oci-containers. + Use the same name as the attribute under virtualisation.oci-containers.containers. ''; example = literalExample '' - virtualisation.oci-containers = { + virtualisation.oci-containers.containers = { node1 = {}; node2 = { dependsOn = [ "node1" ]; diff --git a/nixos/modules/virtualisation/podman.nix b/nixos/modules/virtualisation/podman.nix index f554aeffb451..36c0ca8dfea3 100644 --- a/nixos/modules/virtualisation/podman.nix +++ b/nixos/modules/virtualisation/podman.nix @@ -1,6 +1,8 @@ { config, lib, pkgs, utils, ... }: let cfg = config.virtualisation.podman; + toml = pkgs.formats.toml { }; + nvidia-docker = pkgs.nvidia-docker.override { containerRuntimePath = "${pkgs.runc}/bin/runc"; }; inherit (lib) mkOption types; @@ -53,6 +55,14 @@ in ''; }; + enableNvidia = mkOption { + type = types.bool; + default = false; + description = '' + Enable use of NVidia GPUs from within podman containers. + ''; + }; + extraPackages = mkOption { type = with types; listOf package; default = [ ]; @@ -78,21 +88,37 @@ in }; - config = lib.mkIf cfg.enable { + config = lib.mkIf cfg.enable (lib.mkMerge [ + { + environment.systemPackages = [ cfg.package ] + ++ lib.optional cfg.dockerCompat dockerCompat; - environment.systemPackages = [ cfg.package ] - ++ lib.optional cfg.dockerCompat dockerCompat; + environment.etc."cni/net.d/87-podman-bridge.conflist".source = utils.copyFile "${pkgs.podman-unwrapped.src}/cni/87-podman-bridge.conflist"; - environment.etc."cni/net.d/87-podman-bridge.conflist".source = utils.copyFile "${pkgs.podman-unwrapped.src}/cni/87-podman-bridge.conflist"; - - # Enable common /etc/containers configuration - virtualisation.containers.enable = true; - - assertions = [{ - assertion = cfg.dockerCompat -> !config.virtualisation.docker.enable; - message = "Option dockerCompat conflicts with docker"; - }]; - - }; + virtualisation.containers = { + enable = true; # Enable common /etc/containers configuration + containersConf.extraConfig = lib.optionalString cfg.enableNvidia + (builtins.readFile (toml.generate "podman.nvidia.containers.conf" { + engine = { + conmon_env_vars = [ "PATH=${lib.makeBinPath [ nvidia-docker ]}" ]; + runtimes.nvidia = [ "${nvidia-docker}/bin/nvidia-container-runtime" ]; + }; + })); + }; + assertions = [ + { + assertion = cfg.dockerCompat -> !config.virtualisation.docker.enable; + message = "Option dockerCompat conflicts with docker"; + } + { + assertion = cfg.enableNvidia -> !config.virtualisation.docker.enableNvidia; + message = "Option enableNvidia conflicts with docker.enableNvidia"; + } + ]; + } + (lib.mkIf cfg.enableNvidia { + environment.etc."nvidia-container-runtime/config.toml".source = "${nvidia-docker}/etc/podman-config.toml"; + }) + ]); } diff --git a/nixos/tests/3proxy.nix b/nixos/tests/3proxy.nix index de3056f6710f..dfc4b35a772d 100644 --- a/nixos/tests/3proxy.nix +++ b/nixos/tests/3proxy.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "3proxy"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ misuzu ]; }; diff --git a/nixos/tests/agda.nix b/nixos/tests/agda.nix index 3b3eb2803bdd..bbdeb7395aa7 100644 --- a/nixos/tests/agda.nix +++ b/nixos/tests/agda.nix @@ -9,7 +9,7 @@ let in { name = "agda"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ alexarice turion ]; }; diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 659e538b31d0..7d83b952f948 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -158,6 +158,7 @@ in home-assistant = handleTest ./home-assistant.nix {}; hostname = handleTest ./hostname.nix {}; hound = handleTest ./hound.nix {}; + hub = handleTest ./git/hub.nix {}; hydra = handleTest ./hydra {}; i3wm = handleTest ./i3wm.nix {}; icingaweb2 = handleTest ./icingaweb2.nix {}; @@ -273,6 +274,7 @@ in novacomd = handleTestOn ["x86_64-linux"] ./novacomd.nix {}; nsd = handleTest ./nsd.nix {}; nzbget = handleTest ./nzbget.nix {}; + nzbhydra2 = handleTest ./nzbhydra2.nix {}; oh-my-zsh = handleTest ./oh-my-zsh.nix {}; openarena = handleTest ./openarena.nix {}; openldap = handleTest ./openldap.nix {}; @@ -280,6 +282,7 @@ in openssh = handleTest ./openssh.nix {}; openstack-image-metadata = (handleTestOn ["x86_64-linux"] ./openstack-image.nix {}).metadata or {}; openstack-image-userdata = (handleTestOn ["x86_64-linux"] ./openstack-image.nix {}).userdata or {}; + opentabletdriver = handleTest ./opentabletdriver.nix {}; image-contents = handleTest ./image-contents.nix {}; orangefs = handleTest ./orangefs.nix {}; os-prober = handleTestOn ["x86_64-linux"] ./os-prober.nix {}; @@ -339,6 +342,7 @@ in sbt-extras = handleTest ./sbt-extras.nix {}; scala = handleTest ./scala.nix {}; sddm = handleTest ./sddm.nix {}; + searx = handleTest ./searx.nix {}; service-runner = handleTest ./service-runner.nix {}; shadow = handleTest ./shadow.nix {}; shadowsocks = handleTest ./shadowsocks {}; diff --git a/nixos/tests/ammonite.nix b/nixos/tests/ammonite.nix index e9f06358e13f..4b674f35e3cb 100644 --- a/nixos/tests/ammonite.nix +++ b/nixos/tests/ammonite.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "ammonite"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ nequissimus ]; }; diff --git a/nixos/tests/atd.nix b/nixos/tests/atd.nix index c3abe5c253df..ad4d60067cf1 100644 --- a/nixos/tests/atd.nix +++ b/nixos/tests/atd.nix @@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "atd"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ bjornfor ]; }; diff --git a/nixos/tests/avahi.nix b/nixos/tests/avahi.nix index c1a9114a40f6..ebb46838325f 100644 --- a/nixos/tests/avahi.nix +++ b/nixos/tests/avahi.nix @@ -8,7 +8,7 @@ # Test whether `avahi-daemon' and `libnss-mdns' work as expected. import ./make-test-python.nix { name = "avahi"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ eelco ]; }; diff --git a/nixos/tests/awscli.nix b/nixos/tests/awscli.nix index 35bdd6d99b1a..e6741fcf1412 100644 --- a/nixos/tests/awscli.nix +++ b/nixos/tests/awscli.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "awscli"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ nequissimus ]; }; diff --git a/nixos/tests/babeld.nix b/nixos/tests/babeld.nix index fafa788ba57b..5817ea4ce142 100644 --- a/nixos/tests/babeld.nix +++ b/nixos/tests/babeld.nix @@ -1,7 +1,7 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : { name = "babeld"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ hexa ]; }; diff --git a/nixos/tests/bat.nix b/nixos/tests/bat.nix index 8e65e235d94f..0f548a590fb0 100644 --- a/nixos/tests/bat.nix +++ b/nixos/tests/bat.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "bat"; - meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ nequissimus ]; }; + meta = with pkgs.lib.maintainers; { maintainers = [ nequissimus ]; }; machine = { pkgs, ... }: { environment.systemPackages = [ pkgs.bat ]; }; diff --git a/nixos/tests/bcachefs.nix b/nixos/tests/bcachefs.nix index 3f116d7df92a..146225e72cee 100644 --- a/nixos/tests/bcachefs.nix +++ b/nixos/tests/bcachefs.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "bcachefs"; - meta.maintainers = with pkgs.stdenv.lib.maintainers; [ chiiruno ]; + meta.maintainers = with pkgs.lib.maintainers; [ chiiruno ]; machine = { pkgs, ... }: { virtualisation.emptyDiskImages = [ 4096 ]; diff --git a/nixos/tests/bitcoind.nix b/nixos/tests/bitcoind.nix index 9068b29b8e5c..3e9e085287ac 100644 --- a/nixos/tests/bitcoind.nix +++ b/nixos/tests/bitcoind.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "bitcoind"; - meta = with pkgs.stdenv.lib; { + meta = with pkgs.lib; { maintainers = with maintainers; [ _1000101 ]; }; diff --git a/nixos/tests/bittorrent.nix b/nixos/tests/bittorrent.nix index c195b60cd569..ee7a582922ce 100644 --- a/nixos/tests/bittorrent.nix +++ b/nixos/tests/bittorrent.nix @@ -35,7 +35,7 @@ in { name = "bittorrent"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ domenkozar eelco rob bobvanderlinden ]; }; diff --git a/nixos/tests/bitwarden.nix b/nixos/tests/bitwarden.nix index a47c77cec213..5345c7245d00 100644 --- a/nixos/tests/bitwarden.nix +++ b/nixos/tests/bitwarden.nix @@ -27,7 +27,7 @@ let makeBitwardenTest = backend: makeTest { name = "bitwarden_rs-${backend}"; meta = { - maintainers = with pkgs.stdenv.lib.maintainers; [ jjjollyjim ]; + maintainers = with pkgs.lib.maintainers; [ jjjollyjim ]; }; nodes = { diff --git a/nixos/tests/blockbook-frontend.nix b/nixos/tests/blockbook-frontend.nix index 742a02999e74..e17a2d057797 100644 --- a/nixos/tests/blockbook-frontend.nix +++ b/nixos/tests/blockbook-frontend.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "blockbook-frontend"; - meta = with pkgs.stdenv.lib; { + meta = with pkgs.lib; { maintainers = with maintainers; [ _1000101 ]; }; diff --git a/nixos/tests/boot-stage1.nix b/nixos/tests/boot-stage1.nix index cfb2ccb82856..ce86fc5f494d 100644 --- a/nixos/tests/boot-stage1.nix +++ b/nixos/tests/boot-stage1.nix @@ -158,5 +158,5 @@ import ./make-test-python.nix ({ pkgs, ... }: { machine.succeed('pgrep -a -f "^kcanary$"') ''; - meta.maintainers = with pkgs.stdenv.lib.maintainers; [ aszlig ]; + meta.maintainers = with pkgs.lib.maintainers; [ aszlig ]; }) diff --git a/nixos/tests/borgbackup.nix b/nixos/tests/borgbackup.nix index bf37eb8607b2..fae1d2d07138 100644 --- a/nixos/tests/borgbackup.nix +++ b/nixos/tests/borgbackup.nix @@ -36,7 +36,7 @@ let in { name = "borgbackup"; - meta = with pkgs.stdenv.lib; { + meta = with pkgs.lib; { maintainers = with maintainers; [ dotlambda ]; }; diff --git a/nixos/tests/buildbot.nix b/nixos/tests/buildbot.nix index 0d979dc2d054..11f9fbef635e 100644 --- a/nixos/tests/buildbot.nix +++ b/nixos/tests/buildbot.nix @@ -109,5 +109,5 @@ import ./make-test-python.nix { bbworker.fail("nc -z bbmaster 8011") ''; - meta.maintainers = with pkgs.stdenv.lib.maintainers; [ nand0p ]; + meta.maintainers = with pkgs.lib.maintainers; [ nand0p ]; } {} diff --git a/nixos/tests/buildkite-agents.nix b/nixos/tests/buildkite-agents.nix index a6f33e0143c5..6674a0e884ed 100644 --- a/nixos/tests/buildkite-agents.nix +++ b/nixos/tests/buildkite-agents.nix @@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "buildkite-agent"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ flokli ]; }; diff --git a/nixos/tests/caddy.nix b/nixos/tests/caddy.nix index a21dbec248ab..063f83a2f3d3 100644 --- a/nixos/tests/caddy.nix +++ b/nixos/tests/caddy.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "caddy"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ xfix Br1ght0ne ]; }; diff --git a/nixos/tests/cadvisor.nix b/nixos/tests/cadvisor.nix index 664aa3ad876a..c372dea301d2 100644 --- a/nixos/tests/cadvisor.nix +++ b/nixos/tests/cadvisor.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ... } : { name = "cadvisor"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ offline ]; }; diff --git a/nixos/tests/cage.nix b/nixos/tests/cage.nix index a6f73e00c066..1ae07b6fd2ff 100644 --- a/nixos/tests/cage.nix +++ b/nixos/tests/cage.nix @@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "cage"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ matthewbauer flokli ]; }; diff --git a/nixos/tests/cagebreak.nix b/nixos/tests/cagebreak.nix index e5f9a29fb18d..87f43cc3c321 100644 --- a/nixos/tests/cagebreak.nix +++ b/nixos/tests/cagebreak.nix @@ -9,7 +9,7 @@ let in { name = "cagebreak"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ berbiche ]; }; diff --git a/nixos/tests/ceph-multi-node.nix b/nixos/tests/ceph-multi-node.nix index e26c6d5d670c..4e6d644f96c8 100644 --- a/nixos/tests/ceph-multi-node.nix +++ b/nixos/tests/ceph-multi-node.nix @@ -218,7 +218,7 @@ let ''; in { name = "basic-multi-node-ceph-cluster"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ lejonet ]; }; diff --git a/nixos/tests/ceph-single-node.nix b/nixos/tests/ceph-single-node.nix index 98528f6317bc..19919371a3ca 100644 --- a/nixos/tests/ceph-single-node.nix +++ b/nixos/tests/ceph-single-node.nix @@ -184,7 +184,7 @@ let ''; in { name = "basic-single-node-ceph-cluster"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ lejonet johanot ]; }; diff --git a/nixos/tests/charliecloud.nix b/nixos/tests/charliecloud.nix index acba41e228a6..28c3e2f2dbf7 100644 --- a/nixos/tests/charliecloud.nix +++ b/nixos/tests/charliecloud.nix @@ -11,7 +11,7 @@ import ./make-test-python.nix ({ pkgs, ...} : let in { name = "charliecloud"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ bzizou ]; }; diff --git a/nixos/tests/cjdns.nix b/nixos/tests/cjdns.nix index d72236d415d4..dc5f371c74d8 100644 --- a/nixos/tests/cjdns.nix +++ b/nixos/tests/cjdns.nix @@ -19,7 +19,7 @@ in import ./make-test-python.nix ({ pkgs, ...} : { name = "cjdns"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ ehmry ]; }; diff --git a/nixos/tests/clickhouse.nix b/nixos/tests/clickhouse.nix index 2d8a7cf7aa9f..98d8b4b46525 100644 --- a/nixos/tests/clickhouse.nix +++ b/nixos/tests/clickhouse.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "clickhouse"; - meta.maintainers = with pkgs.stdenv.lib.maintainers; [ ma27 ]; + meta.maintainers = with pkgs.lib.maintainers; [ ma27 ]; machine = { services.clickhouse.enable = true; diff --git a/nixos/tests/cloud-init.nix b/nixos/tests/cloud-init.nix index d59d222974b5..e06cbd056a32 100644 --- a/nixos/tests/cloud-init.nix +++ b/nixos/tests/cloud-init.nix @@ -40,7 +40,7 @@ let }; in makeTest { name = "cloud-init"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ lewo ]; }; machine = { ... }: diff --git a/nixos/tests/cockroachdb.nix b/nixos/tests/cockroachdb.nix index d0cc5e19837c..d793842f0ab2 100644 --- a/nixos/tests/cockroachdb.nix +++ b/nixos/tests/cockroachdb.nix @@ -99,7 +99,7 @@ let in import ./make-test-python.nix ({ pkgs, ...} : { name = "cockroachdb"; - meta.maintainers = with pkgs.stdenv.lib.maintainers; + meta.maintainers = with pkgs.lib.maintainers; [ thoughtpolice ]; nodes = { diff --git a/nixos/tests/containers-bridge.nix b/nixos/tests/containers-bridge.nix index 2c8e8fa5370f..1208aa8fced7 100644 --- a/nixos/tests/containers-bridge.nix +++ b/nixos/tests/containers-bridge.nix @@ -9,7 +9,7 @@ in import ./make-test-python.nix ({ pkgs, ...} : { name = "containers-bridge"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ aristid aszlig eelco kampfschlaefer ]; }; diff --git a/nixos/tests/containers-extra_veth.nix b/nixos/tests/containers-extra_veth.nix index 7d30b3f76cd7..212f3d0f46cb 100644 --- a/nixos/tests/containers-extra_veth.nix +++ b/nixos/tests/containers-extra_veth.nix @@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "containers-extra_veth"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ kampfschlaefer ]; }; diff --git a/nixos/tests/containers-hosts.nix b/nixos/tests/containers-hosts.nix index d6fb4a761eef..65a983c42a78 100644 --- a/nixos/tests/containers-hosts.nix +++ b/nixos/tests/containers-hosts.nix @@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "containers-hosts"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ montag451 ]; }; diff --git a/nixos/tests/containers-imperative.nix b/nixos/tests/containers-imperative.nix index c4f2002918fc..393b4a5135dd 100644 --- a/nixos/tests/containers-imperative.nix +++ b/nixos/tests/containers-imperative.nix @@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "containers-imperative"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ aristid aszlig eelco kampfschlaefer ]; }; diff --git a/nixos/tests/containers-ip.nix b/nixos/tests/containers-ip.nix index 8583a08c6258..0265ed92d41c 100644 --- a/nixos/tests/containers-ip.nix +++ b/nixos/tests/containers-ip.nix @@ -15,7 +15,7 @@ let in import ./make-test-python.nix ({ pkgs, ...} : { name = "containers-ipv4-ipv6"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ aristid aszlig eelco kampfschlaefer ]; }; diff --git a/nixos/tests/containers-macvlans.nix b/nixos/tests/containers-macvlans.nix index 0e8f67bc76f0..9425252cb886 100644 --- a/nixos/tests/containers-macvlans.nix +++ b/nixos/tests/containers-macvlans.nix @@ -8,7 +8,7 @@ in import ./make-test-python.nix ({ pkgs, ...} : { name = "containers-macvlans"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ montag451 ]; }; diff --git a/nixos/tests/containers-physical_interfaces.nix b/nixos/tests/containers-physical_interfaces.nix index e800751a23c2..0b55c3418edf 100644 --- a/nixos/tests/containers-physical_interfaces.nix +++ b/nixos/tests/containers-physical_interfaces.nix @@ -1,7 +1,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "containers-physical_interfaces"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ kampfschlaefer ]; }; diff --git a/nixos/tests/containers-portforward.nix b/nixos/tests/containers-portforward.nix index 1e2c2c6c374f..d0be3c7d43ec 100644 --- a/nixos/tests/containers-portforward.nix +++ b/nixos/tests/containers-portforward.nix @@ -9,7 +9,7 @@ in import ./make-test-python.nix ({ pkgs, ...} : { name = "containers-portforward"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ aristid aszlig eelco kampfschlaefer ianwookim ]; }; diff --git a/nixos/tests/containers-reloadable.nix b/nixos/tests/containers-reloadable.nix index 2d81f1639387..877246917672 100644 --- a/nixos/tests/containers-reloadable.nix +++ b/nixos/tests/containers-reloadable.nix @@ -16,7 +16,7 @@ let }; in { name = "containers-reloadable"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ danbst ]; }; diff --git a/nixos/tests/containers-restart_networking.nix b/nixos/tests/containers-restart_networking.nix index b50dadd13e47..b35552b5b191 100644 --- a/nixos/tests/containers-restart_networking.nix +++ b/nixos/tests/containers-restart_networking.nix @@ -19,7 +19,7 @@ let in import ./make-test-python.nix ({ pkgs, ...} : { name = "containers-restart_networking"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ kampfschlaefer ]; }; diff --git a/nixos/tests/containers-tmpfs.nix b/nixos/tests/containers-tmpfs.nix index 171e8f01c7b9..e1ab098e985d 100644 --- a/nixos/tests/containers-tmpfs.nix +++ b/nixos/tests/containers-tmpfs.nix @@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "containers-tmpfs"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ kampka ]; }; diff --git a/nixos/tests/convos.nix b/nixos/tests/convos.nix index af2758c857d0..a13870d17084 100644 --- a/nixos/tests/convos.nix +++ b/nixos/tests/convos.nix @@ -6,7 +6,7 @@ let in { name = "convos"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ sgo ]; }; diff --git a/nixos/tests/couchdb.nix b/nixos/tests/couchdb.nix index 57b79e29b433..d038ee7d890d 100644 --- a/nixos/tests/couchdb.nix +++ b/nixos/tests/couchdb.nix @@ -19,7 +19,7 @@ with lib; { name = "couchdb"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ fpletz ]; }; diff --git a/nixos/tests/cri-o.nix b/nixos/tests/cri-o.nix index f13f1bdacb6a..91d46657f241 100644 --- a/nixos/tests/cri-o.nix +++ b/nixos/tests/cri-o.nix @@ -1,7 +1,7 @@ # 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; + maintainers = with pkgs.lib.maintainers; teams.podman.members; nodes = { crio = { diff --git a/nixos/tests/deluge.nix b/nixos/tests/deluge.nix index 3cf179a38216..300bc0a1157b 100644 --- a/nixos/tests/deluge.nix +++ b/nixos/tests/deluge.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "deluge"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ flokli ]; }; diff --git a/nixos/tests/dnscrypt-proxy2.nix b/nixos/tests/dnscrypt-proxy2.nix index b614d912a9f4..1ba5d983e9b9 100644 --- a/nixos/tests/dnscrypt-proxy2.nix +++ b/nixos/tests/dnscrypt-proxy2.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "dnscrypt-proxy2"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ joachifm ]; }; diff --git a/nixos/tests/dnscrypt-wrapper/default.nix b/nixos/tests/dnscrypt-wrapper/default.nix index 1dc925f4de7a..d5c09172308c 100644 --- a/nixos/tests/dnscrypt-wrapper/default.nix +++ b/nixos/tests/dnscrypt-wrapper/default.nix @@ -1,6 +1,6 @@ import ../make-test-python.nix ({ pkgs, ... }: { name = "dnscrypt-wrapper"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ rnhmjoj ]; }; diff --git a/nixos/tests/docker-edge.nix b/nixos/tests/docker-edge.nix index 703179eef195..c6a1a0830189 100644 --- a/nixos/tests/docker-edge.nix +++ b/nixos/tests/docker-edge.nix @@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "docker"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ nequissimus offline ]; }; diff --git a/nixos/tests/docker-registry.nix b/nixos/tests/docker-registry.nix index 2928fd8141a4..1d449db45191 100644 --- a/nixos/tests/docker-registry.nix +++ b/nixos/tests/docker-registry.nix @@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "docker-registry"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ globin ma27 ironpinguin ]; }; diff --git a/nixos/tests/docker-tools-cross.nix b/nixos/tests/docker-tools-cross.nix index d433b5508fc9..a7a6a31475d6 100644 --- a/nixos/tests/docker-tools-cross.nix +++ b/nixos/tests/docker-tools-cross.nix @@ -35,7 +35,7 @@ let in { name = "docker-tools"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ roberth ]; }; diff --git a/nixos/tests/docker-tools-overlay.nix b/nixos/tests/docker-tools-overlay.nix index 1a0e0ea67750..98eb72866156 100644 --- a/nixos/tests/docker-tools-overlay.nix +++ b/nixos/tests/docker-tools-overlay.nix @@ -3,7 +3,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "docker-tools-overlay"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ lnl7 ]; }; diff --git a/nixos/tests/docker-tools.nix b/nixos/tests/docker-tools.nix index 8402ba68b720..6638ec4927ce 100644 --- a/nixos/tests/docker-tools.nix +++ b/nixos/tests/docker-tools.nix @@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "docker-tools"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ lnl7 ]; }; @@ -247,5 +247,12 @@ import ./make-test-python.nix ({ pkgs, ... }: { ).strip() == "${if pkgs.system == "aarch64-linux" then "amd64" else "arm64"}" ) + + with subtest("buildLayeredImage doesn't dereference /nix/store symlink layers"): + docker.succeed( + "docker load --input='${examples.layeredStoreSymlink}'", + "docker run --rm ${examples.layeredStoreSymlink.imageName} bash -c 'test -L ${examples.layeredStoreSymlink.passthru.symlink}'", + "docker rmi ${examples.layeredStoreSymlink.imageName}", + ) ''; }) diff --git a/nixos/tests/docker.nix b/nixos/tests/docker.nix index a4a61468f33d..58e33535ed31 100644 --- a/nixos/tests/docker.nix +++ b/nixos/tests/docker.nix @@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "docker"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ nequissimus offline ]; }; diff --git a/nixos/tests/documize.nix b/nixos/tests/documize.nix index 3be20a780d31..d5a77ffcd4f2 100644 --- a/nixos/tests/documize.nix +++ b/nixos/tests/documize.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : { name = "documize"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ ma27 ]; }; diff --git a/nixos/tests/dokuwiki.nix b/nixos/tests/dokuwiki.nix index 58069366ca36..40475d789d47 100644 --- a/nixos/tests/dokuwiki.nix +++ b/nixos/tests/dokuwiki.nix @@ -32,7 +32,7 @@ let in { name = "dokuwiki"; - meta = with pkgs.stdenv.lib; { + meta = with pkgs.lib; { maintainers = with maintainers; [ _1000101 ]; }; machine = { ... }: { diff --git a/nixos/tests/dovecot.nix b/nixos/tests/dovecot.nix index bcbe234fd805..1129e3b45d9d 100644 --- a/nixos/tests/dovecot.nix +++ b/nixos/tests/dovecot.nix @@ -4,8 +4,11 @@ import ./make-test-python.nix { machine = { pkgs, ... }: { imports = [ common/user-account.nix ]; services.postfix.enable = true; - services.dovecot2.enable = true; - services.dovecot2.protocols = [ "imap" "pop3" ]; + services.dovecot2 = { + enable = true; + protocols = [ "imap" "pop3" ]; + modules = [ pkgs.dovecot_pigeonhole ]; + }; environment.systemPackages = let sendTestMail = pkgs.writeScriptBin "send-testmail" '' #!${pkgs.runtimeShell} diff --git a/nixos/tests/elk.nix b/nixos/tests/elk.nix index 7e87197ed9f3..8488c97c01e8 100644 --- a/nixos/tests/elk.nix +++ b/nixos/tests/elk.nix @@ -12,7 +12,7 @@ let mkElkTest = name : elk : import ./make-test-python.nix ({ inherit name; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ eelco offline basvandijk ]; }; nodes = { diff --git a/nixos/tests/emacs-daemon.nix b/nixos/tests/emacs-daemon.nix index b89d9b1bde69..58bcd095990a 100644 --- a/nixos/tests/emacs-daemon.nix +++ b/nixos/tests/emacs-daemon.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "emacs-daemon"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ ]; }; diff --git a/nixos/tests/engelsystem.nix b/nixos/tests/engelsystem.nix index 39c10718093f..7be3b8a5a1fe 100644 --- a/nixos/tests/engelsystem.nix +++ b/nixos/tests/engelsystem.nix @@ -2,7 +2,7 @@ import ./make-test-python.nix ( { pkgs, lib, ... }: { name = "engelsystem"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ talyz ]; }; diff --git a/nixos/tests/enlightenment.nix b/nixos/tests/enlightenment.nix index 0132b98b1cbb..cc1da649d493 100644 --- a/nixos/tests/enlightenment.nix +++ b/nixos/tests/enlightenment.nix @@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "enlightenment"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ romildo ]; }; diff --git a/nixos/tests/env.nix b/nixos/tests/env.nix index e603338e489b..fc96ace6b2d2 100644 --- a/nixos/tests/env.nix +++ b/nixos/tests/env.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "environment"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ nequissimus ]; }; diff --git a/nixos/tests/ergo.nix b/nixos/tests/ergo.nix index 8cdbbf62a956..b49e0c9dfed7 100644 --- a/nixos/tests/ergo.nix +++ b/nixos/tests/ergo.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "ergo"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ mmahut ]; }; diff --git a/nixos/tests/etcd-cluster.nix b/nixos/tests/etcd-cluster.nix index 19c5d9158236..410cb654794f 100644 --- a/nixos/tests/etcd-cluster.nix +++ b/nixos/tests/etcd-cluster.nix @@ -97,7 +97,7 @@ import ./make-test-python.nix ({ pkgs, ... } : let in { name = "etcd"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ offline ]; }; diff --git a/nixos/tests/etcd.nix b/nixos/tests/etcd.nix index 842724343841..702bbb668f57 100644 --- a/nixos/tests/etcd.nix +++ b/nixos/tests/etcd.nix @@ -3,7 +3,7 @@ import ./make-test-python.nix ({ pkgs, ... } : { name = "etcd"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ offline ]; }; diff --git a/nixos/tests/etesync-dav.nix b/nixos/tests/etesync-dav.nix index 286f919aa8c1..da5c056f5349 100644 --- a/nixos/tests/etesync-dav.nix +++ b/nixos/tests/etesync-dav.nix @@ -1,7 +1,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "etesync-dav"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ _3699n ]; }; diff --git a/nixos/tests/fenics.nix b/nixos/tests/fenics.nix index 7252d19e4e65..56f09d6a27e4 100644 --- a/nixos/tests/fenics.nix +++ b/nixos/tests/fenics.nix @@ -29,7 +29,7 @@ in { name = "fenics"; meta = { - maintainers = with pkgs.stdenv.lib.maintainers; [ knedlsepp ]; + maintainers = with pkgs.lib.maintainers; [ knedlsepp ]; }; nodes = { diff --git a/nixos/tests/ferm.nix b/nixos/tests/ferm.nix index 112b5f19a7de..be43877445eb 100644 --- a/nixos/tests/ferm.nix +++ b/nixos/tests/ferm.nix @@ -1,7 +1,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "ferm"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ mic92 ]; }; diff --git a/nixos/tests/firefox.nix b/nixos/tests/firefox.nix index 07e25bd4ca72..4262f5443bf8 100644 --- a/nixos/tests/firefox.nix +++ b/nixos/tests/firefox.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, esr ? false, ... }: { name = "firefox"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ eelco shlevy ]; }; diff --git a/nixos/tests/firejail.nix b/nixos/tests/firejail.nix index 5f122c3fa94d..6c42c37b2813 100644 --- a/nixos/tests/firejail.nix +++ b/nixos/tests/firejail.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "firejail"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ sgo ]; }; diff --git a/nixos/tests/firewall.nix b/nixos/tests/firewall.nix index 09a1fef852e6..5c434c1cb6d6 100644 --- a/nixos/tests/firewall.nix +++ b/nixos/tests/firewall.nix @@ -2,7 +2,7 @@ import ./make-test-python.nix ( { pkgs, ... } : { name = "firewall"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ eelco ]; }; diff --git a/nixos/tests/freeswitch.nix b/nixos/tests/freeswitch.nix index 349d0e7bc6f0..bcc6a9cb3586 100644 --- a/nixos/tests/freeswitch.nix +++ b/nixos/tests/freeswitch.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "freeswitch"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ misuzu ]; }; nodes = { diff --git a/nixos/tests/gerrit.nix b/nixos/tests/gerrit.nix index 6cee64a20095..b6b6486fae86 100644 --- a/nixos/tests/gerrit.nix +++ b/nixos/tests/gerrit.nix @@ -9,7 +9,7 @@ let in { name = "gerrit"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ flokli zimbatm ]; }; diff --git a/nixos/tests/git/hub.nix b/nixos/tests/git/hub.nix new file mode 100644 index 000000000000..51ec3d5b4129 --- /dev/null +++ b/nixos/tests/git/hub.nix @@ -0,0 +1,17 @@ +import ../make-test-python.nix ({ pkgs, ...} : { + name = "hub"; + meta = with pkgs.lib.maintainers; { + maintainers = [ nequissimus ]; + }; + + nodes.hub = { pkgs, ... }: + { + environment.systemPackages = [ pkgs.gitAndTools.hub ]; + }; + + testScript = + '' + assert "git version ${pkgs.git.version}\nhub version ${pkgs.gitAndTools.hub.version}\n" in hub.succeed("hub version") + assert "These GitHub commands are provided by hub" in hub.succeed("hub help") + ''; +}) diff --git a/nixos/tests/gitdaemon.nix b/nixos/tests/gitdaemon.nix index c4a707943ef1..d0156fb9a49f 100644 --- a/nixos/tests/gitdaemon.nix +++ b/nixos/tests/gitdaemon.nix @@ -7,7 +7,7 @@ let in { name = "gitdaemon"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ tilpner ]; }; diff --git a/nixos/tests/gitlab.nix b/nixos/tests/gitlab.nix index 1214cddd0937..ba085338944a 100644 --- a/nixos/tests/gitlab.nix +++ b/nixos/tests/gitlab.nix @@ -5,7 +5,7 @@ let in import ./make-test-python.nix ({ pkgs, lib, ...} : with lib; { name = "gitlab"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ globin ]; }; diff --git a/nixos/tests/gitolite-fcgiwrap.nix b/nixos/tests/gitolite-fcgiwrap.nix index 414b7d6fe7ef..fc9b214b762e 100644 --- a/nixos/tests/gitolite-fcgiwrap.nix +++ b/nixos/tests/gitolite-fcgiwrap.nix @@ -13,7 +13,7 @@ import ./make-test-python.nix ( { name = "gitolite-fcgiwrap"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ bbigras ]; }; diff --git a/nixos/tests/gitolite.nix b/nixos/tests/gitolite.nix index a928645bd80f..128677cebde3 100644 --- a/nixos/tests/gitolite.nix +++ b/nixos/tests/gitolite.nix @@ -51,7 +51,7 @@ in { name = "gitolite"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ bjornfor ]; }; diff --git a/nixos/tests/go-neb.nix b/nixos/tests/go-neb.nix index 531ab5a66714..f8801ff68d64 100644 --- a/nixos/tests/go-neb.nix +++ b/nixos/tests/go-neb.nix @@ -1,7 +1,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "go-neb"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ hexa maralorn ]; }; diff --git a/nixos/tests/gocd-agent.nix b/nixos/tests/gocd-agent.nix index 5b630a40736e..75edf43ee295 100644 --- a/nixos/tests/gocd-agent.nix +++ b/nixos/tests/gocd-agent.nix @@ -11,7 +11,7 @@ in import ./make-test-python.nix ({ pkgs, ...} : { name = "gocd-agent"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ grahamc swarren83 ]; # gocd agent needs to register with the autoregister key created on first server startup, diff --git a/nixos/tests/gocd-server.nix b/nixos/tests/gocd-server.nix index 20faf85a1ccd..aff651c5278f 100644 --- a/nixos/tests/gocd-server.nix +++ b/nixos/tests/gocd-server.nix @@ -6,7 +6,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "gocd-server"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ swarren83 ]; }; diff --git a/nixos/tests/google-oslogin/default.nix b/nixos/tests/google-oslogin/default.nix index 97783c81f397..dea660ed05a4 100644 --- a/nixos/tests/google-oslogin/default.nix +++ b/nixos/tests/google-oslogin/default.nix @@ -11,7 +11,7 @@ let ''; in { name = "google-oslogin"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ adisbladis flokli ]; }; diff --git a/nixos/tests/gotify-server.nix b/nixos/tests/gotify-server.nix index c0b8ba43548a..051666fbe72e 100644 --- a/nixos/tests/gotify-server.nix +++ b/nixos/tests/gotify-server.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : { name = "gotify-server"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ ma27 ]; }; diff --git a/nixos/tests/grafana.nix b/nixos/tests/grafana.nix index 4b453ece7f1e..4ba091b893f4 100644 --- a/nixos/tests/grafana.nix +++ b/nixos/tests/grafana.nix @@ -17,6 +17,10 @@ let }; extraNodeConfs = { + declarativePlugins = { + services.grafana.declarativePlugins = [ pkgs.grafanaPlugins.grafana-clock-panel ]; + }; + postgresql = { services.grafana.database = { host = "127.0.0.1:5432"; @@ -52,7 +56,7 @@ let nameValuePair dbName (mkMerge [ baseGrafanaConf (extraNodeConfs.${dbName} or {}) - ])) [ "sqlite" "postgresql" "mysql" ]); + ])) [ "sqlite" "declarativePlugins" "postgresql" "mysql" ]); in { name = "grafana"; @@ -66,6 +70,14 @@ in { testScript = '' start_all() + with subtest("Declarative plugins installed"): + declarativePlugins.wait_for_unit("grafana.service") + declarativePlugins.wait_for_open_port(3000) + declarativePlugins.succeed( + "curl -sSfN -u testadmin:snakeoilpwd http://127.0.0.1:3000/api/plugins | grep -q grafana-clock-panel" + ) + declarativePlugins.shutdown() + with subtest("Successful API query as admin user with sqlite db"): sqlite.wait_for_unit("grafana.service") sqlite.wait_for_open_port(3000) diff --git a/nixos/tests/grocy.nix b/nixos/tests/grocy.nix index 7fa479ed2c42..220c55b1f634 100644 --- a/nixos/tests/grocy.nix +++ b/nixos/tests/grocy.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "grocy"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ ma27 ]; }; diff --git a/nixos/tests/gvisor.nix b/nixos/tests/gvisor.nix index 4d68a1d8a5f8..77ff29341bed 100644 --- a/nixos/tests/gvisor.nix +++ b/nixos/tests/gvisor.nix @@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "gvisor"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ andrew-d ]; }; diff --git a/nixos/tests/haka.nix b/nixos/tests/haka.nix index 3ca19cb0971c..dd65a6bcf115 100644 --- a/nixos/tests/haka.nix +++ b/nixos/tests/haka.nix @@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "haka"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ tvestelind ]; }; diff --git a/nixos/tests/handbrake.nix b/nixos/tests/handbrake.nix index e5fb6b269b19..226dc8b2aa8a 100644 --- a/nixos/tests/handbrake.nix +++ b/nixos/tests/handbrake.nix @@ -9,7 +9,7 @@ in { name = "handbrake"; meta = { - maintainers = with pkgs.stdenv.lib.maintainers; [ danieldk ]; + maintainers = with pkgs.lib.maintainers; [ danieldk ]; }; machine = { pkgs, ... }: { diff --git a/nixos/tests/hardened.nix b/nixos/tests/hardened.nix index ab5fa609e072..d3f1f3172965 100644 --- a/nixos/tests/hardened.nix +++ b/nixos/tests/hardened.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, latestKernel ? false, ... } : { name = "hardened"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ joachifm ]; }; diff --git a/nixos/tests/hitch/default.nix b/nixos/tests/hitch/default.nix index 8a2193e75f2a..a1d8e6162606 100644 --- a/nixos/tests/hitch/default.nix +++ b/nixos/tests/hitch/default.nix @@ -1,7 +1,7 @@ import ../make-test-python.nix ({ pkgs, ... }: { name = "hitch"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ jflanglois ]; }; machine = { pkgs, ... }: { diff --git a/nixos/tests/hocker-fetchdocker/default.nix b/nixos/tests/hocker-fetchdocker/default.nix index 978dbf310b12..e3979db3c60b 100644 --- a/nixos/tests/hocker-fetchdocker/default.nix +++ b/nixos/tests/hocker-fetchdocker/default.nix @@ -1,6 +1,6 @@ import ../make-test-python.nix ({ pkgs, ...} : { name = "test-hocker-fetchdocker"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ ixmatus ]; broken = true; # tries to download from registry-1.docker.io - how did this ever work? }; diff --git a/nixos/tests/home-assistant.nix b/nixos/tests/home-assistant.nix index a93a28d877a3..131f50747fef 100644 --- a/nixos/tests/home-assistant.nix +++ b/nixos/tests/home-assistant.nix @@ -6,7 +6,7 @@ let mqttPassword = "secret"; in { name = "home-assistant"; - meta = with pkgs.stdenv.lib; { + meta = with pkgs.lib; { maintainers = with maintainers; [ dotlambda ]; }; diff --git a/nixos/tests/hostname.nix b/nixos/tests/hostname.nix index 3b87303d73e7..e598549ef1d2 100644 --- a/nixos/tests/hostname.nix +++ b/nixos/tests/hostname.nix @@ -13,7 +13,7 @@ let in makeTest { name = "hostname-${fqdn}"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ primeos blitz ]; }; diff --git a/nixos/tests/hound.nix b/nixos/tests/hound.nix index b8b10022bd92..4f51db1de9de 100644 --- a/nixos/tests/hound.nix +++ b/nixos/tests/hound.nix @@ -1,7 +1,7 @@ # Test whether `houndd` indexes nixpkgs import ./make-test-python.nix ({ pkgs, ... } : { name = "hound"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ grahamc ]; }; machine = { pkgs, ... }: { diff --git a/nixos/tests/hydra/common.nix b/nixos/tests/hydra/common.nix index 312c52e889a9..1a3a4d8fb3d4 100644 --- a/nixos/tests/hydra/common.nix +++ b/nixos/tests/hydra/common.nix @@ -19,7 +19,7 @@ buildInputs = [ pkgs.makeWrapper ]; installPhase = "install -m755 -D ${./create-trivial-project.sh} $out/bin/create-trivial-project.sh"; postFixup = '' - wrapProgram "$out/bin/create-trivial-project.sh" --prefix PATH ":" ${pkgs.stdenv.lib.makeBinPath [ pkgs.curl ]} --set EXPR_PATH ${trivialJob} + wrapProgram "$out/bin/create-trivial-project.sh" --prefix PATH ":" ${pkgs.lib.makeBinPath [ pkgs.curl ]} --set EXPR_PATH ${trivialJob} ''; }; in { diff --git a/nixos/tests/hydra/default.nix b/nixos/tests/hydra/default.nix index e91a1cd3359d..d92f032b8292 100644 --- a/nixos/tests/hydra/default.nix +++ b/nixos/tests/hydra/default.nix @@ -16,7 +16,7 @@ let makeHydraTest = with pkgs.lib; name: package: makeTest { name = "hydra-${name}"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ pstn lewo ma27 ]; }; diff --git a/nixos/tests/i3wm.nix b/nixos/tests/i3wm.nix index b527aa706ad2..59b4ffe3986e 100644 --- a/nixos/tests/i3wm.nix +++ b/nixos/tests/i3wm.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "i3wm"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ aszlig ]; }; diff --git a/nixos/tests/icingaweb2.nix b/nixos/tests/icingaweb2.nix index 2f65604539c1..e631e667bd50 100644 --- a/nixos/tests/icingaweb2.nix +++ b/nixos/tests/icingaweb2.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "icingaweb2"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ das_j ]; }; diff --git a/nixos/tests/iftop.nix b/nixos/tests/iftop.nix index 8a161027c2ad..6d0090b39463 100644 --- a/nixos/tests/iftop.nix +++ b/nixos/tests/iftop.nix @@ -4,7 +4,7 @@ with lib; { name = "iftop"; - meta.maintainers = with pkgs.stdenv.lib.maintainers; [ ma27 ]; + meta.maintainers = with pkgs.lib.maintainers; [ ma27 ]; nodes = { withIftop = { diff --git a/nixos/tests/influxdb.nix b/nixos/tests/influxdb.nix index 04ef80461010..03026f8404be 100644 --- a/nixos/tests/influxdb.nix +++ b/nixos/tests/influxdb.nix @@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "influxdb"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ offline ]; }; diff --git a/nixos/tests/initrd-network.nix b/nixos/tests/initrd-network.nix index 9c35b7305768..14e7e7d40bc5 100644 --- a/nixos/tests/initrd-network.nix +++ b/nixos/tests/initrd-network.nix @@ -1,7 +1,7 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : { name = "initrd-network"; - meta.maintainers = [ pkgs.stdenv.lib.maintainers.eelco ]; + meta.maintainers = [ pkgs.lib.maintainers.eelco ]; machine = { ... }: { imports = [ ../modules/profiles/minimal.nix ]; diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index d80cfb4bd83f..de4bb399c16e 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -270,7 +270,7 @@ let makeTest { inherit enableOCR; name = "installer-" + name; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { # put global maintainers here, individuals go into makeInstallerTest fkt call maintainers = (meta.maintainers or []); }; diff --git a/nixos/tests/ipfs.nix b/nixos/tests/ipfs.nix index 9c0ff5306e06..f8683b0a8580 100644 --- a/nixos/tests/ipfs.nix +++ b/nixos/tests/ipfs.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "ipfs"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ mguentner ]; }; diff --git a/nixos/tests/ipv6.nix b/nixos/tests/ipv6.nix index ba464b57447b..f9d6d82b54ac 100644 --- a/nixos/tests/ipv6.nix +++ b/nixos/tests/ipv6.nix @@ -3,7 +3,7 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : { name = "ipv6"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ eelco ]; }; diff --git a/nixos/tests/jenkins.nix b/nixos/tests/jenkins.nix index cd64ff512878..5898adab759a 100644 --- a/nixos/tests/jenkins.nix +++ b/nixos/tests/jenkins.nix @@ -5,7 +5,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "jenkins"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ bjornfor coconnor domenkozar eelco ]; }; diff --git a/nixos/tests/jitsi-meet.nix b/nixos/tests/jitsi-meet.nix index 42762dfdad8e..dec49c83121b 100644 --- a/nixos/tests/jitsi-meet.nix +++ b/nixos/tests/jitsi-meet.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "jitsi-meet"; - meta = with pkgs.stdenv.lib; { + meta = with pkgs.lib; { maintainers = teams.jitsi.members; }; diff --git a/nixos/tests/jq.nix b/nixos/tests/jq.nix index 20b67522ee6e..075e6c43c09d 100644 --- a/nixos/tests/jq.nix +++ b/nixos/tests/jq.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "jq"; - meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ nequissimus ]; }; + meta = with pkgs.lib.maintainers; { maintainers = [ nequissimus ]; }; nodes.jq = { pkgs, ... }: { environment.systemPackages = [ pkgs.jq ]; }; diff --git a/nixos/tests/k3s.nix b/nixos/tests/k3s.nix index 5bda6f493f0e..494a3b68b59d 100644 --- a/nixos/tests/k3s.nix +++ b/nixos/tests/k3s.nix @@ -31,7 +31,7 @@ let in { name = "k3s"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ euank ]; }; diff --git a/nixos/tests/kafka.nix b/nixos/tests/kafka.nix index 373e939c00d0..d5c54f7d9910 100644 --- a/nixos/tests/kafka.nix +++ b/nixos/tests/kafka.nix @@ -8,7 +8,7 @@ with pkgs.lib; let makeKafkaTest = name: kafkaPackage: (import ./make-test-python.nix ({ inherit name; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ nequissimus ]; }; diff --git a/nixos/tests/kernel-latest.nix b/nixos/tests/kernel-latest.nix index f09d0926d223..323dde267a42 100644 --- a/nixos/tests/kernel-latest.nix +++ b/nixos/tests/kernel-latest.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "kernel-latest"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ nequissimus ]; }; diff --git a/nixos/tests/kernel-lts.nix b/nixos/tests/kernel-lts.nix index bad706d63c03..9b03e9db6d84 100644 --- a/nixos/tests/kernel-lts.nix +++ b/nixos/tests/kernel-lts.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "kernel-lts"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ nequissimus ]; }; diff --git a/nixos/tests/kernel-testing.nix b/nixos/tests/kernel-testing.nix index b7e10ebd5bd1..017007c0aec8 100644 --- a/nixos/tests/kernel-testing.nix +++ b/nixos/tests/kernel-testing.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "kernel-testing"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ nequissimus ]; }; diff --git a/nixos/tests/keycloak.nix b/nixos/tests/keycloak.nix index f448a0f7095f..45d8677af567 100644 --- a/nixos/tests/keycloak.nix +++ b/nixos/tests/keycloak.nix @@ -10,7 +10,7 @@ let { pkgs, databaseType, ... }: { name = "keycloak"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ talyz ]; }; diff --git a/nixos/tests/knot.nix b/nixos/tests/knot.nix index 8bab917a351e..22279292f77f 100644 --- a/nixos/tests/knot.nix +++ b/nixos/tests/knot.nix @@ -37,7 +37,7 @@ let ''; in { name = "knot"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ hexa ]; }; diff --git a/nixos/tests/krb5/deprecated-config.nix b/nixos/tests/krb5/deprecated-config.nix index be6ebce9e051..9a9cafd4b13e 100644 --- a/nixos/tests/krb5/deprecated-config.nix +++ b/nixos/tests/krb5/deprecated-config.nix @@ -3,7 +3,7 @@ import ../make-test-python.nix ({ pkgs, ...} : { name = "krb5-with-deprecated-config"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ eqyiel ]; }; diff --git a/nixos/tests/krb5/example-config.nix b/nixos/tests/krb5/example-config.nix index e2e10a9fda89..0932c71dd970 100644 --- a/nixos/tests/krb5/example-config.nix +++ b/nixos/tests/krb5/example-config.nix @@ -3,7 +3,7 @@ import ../make-test-python.nix ({ pkgs, ...} : { name = "krb5-with-example-config"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ eqyiel ]; }; diff --git a/nixos/tests/leaps.nix b/nixos/tests/leaps.nix index ec5b69a76290..5cc387c86a45 100644 --- a/nixos/tests/leaps.nix +++ b/nixos/tests/leaps.nix @@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "leaps"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ qknight ]; }; diff --git a/nixos/tests/lightdm.nix b/nixos/tests/lightdm.nix index 46c2ed7ccc59..9611bdbdafec 100644 --- a/nixos/tests/lightdm.nix +++ b/nixos/tests/lightdm.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "lightdm"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ aszlig worldofpeace ]; }; diff --git a/nixos/tests/limesurvey.nix b/nixos/tests/limesurvey.nix index dad807fb7330..b60e80be2444 100644 --- a/nixos/tests/limesurvey.nix +++ b/nixos/tests/limesurvey.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "limesurvey"; - meta.maintainers = [ pkgs.stdenv.lib.maintainers.aanderse ]; + meta.maintainers = [ pkgs.lib.maintainers.aanderse ]; machine = { ... }: { services.limesurvey = { diff --git a/nixos/tests/locate.nix b/nixos/tests/locate.nix index 8818607f955e..67ae610fe012 100644 --- a/nixos/tests/locate.nix +++ b/nixos/tests/locate.nix @@ -2,7 +2,7 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: let inherit (import ./ssh-keys.nix pkgs) snakeOilPrivateKey snakeOilPublicKey; in { name = "locate"; - meta.maintainers = with pkgs.stdenv.lib.maintainers; [ chkno ]; + meta.maintainers = with pkgs.lib.maintainers; [ chkno ]; nodes = rec { a = { diff --git a/nixos/tests/login.nix b/nixos/tests/login.nix index d36c1a91be43..4d1dcc8cc32d 100644 --- a/nixos/tests/login.nix +++ b/nixos/tests/login.nix @@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, latestKernel ? false, ... }: { name = "login"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ eelco ]; }; @@ -50,7 +50,7 @@ import ./make-test-python.nix ({ pkgs, latestKernel ? false, ... }: with subtest("Virtual console logout"): machine.send_chars("exit\n") machine.wait_until_fails("pgrep -u alice bash") - machine.screenshot("mingetty") + machine.screenshot("getty") with subtest("Check whether ctrl-alt-delete works"): machine.send_key("ctrl-alt-delete") diff --git a/nixos/tests/lsd.nix b/nixos/tests/lsd.nix index e7525c97e323..c643f2f0b7b7 100644 --- a/nixos/tests/lsd.nix +++ b/nixos/tests/lsd.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "lsd"; - meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ nequissimus ]; }; + meta = with pkgs.lib.maintainers; { maintainers = [ nequissimus ]; }; nodes.lsd = { pkgs, ... }: { environment.systemPackages = [ pkgs.lsd ]; }; diff --git a/nixos/tests/lxd-nftables.nix b/nixos/tests/lxd-nftables.nix index 4ca02067a0ae..a62d5a3064df 100644 --- a/nixos/tests/lxd-nftables.nix +++ b/nixos/tests/lxd-nftables.nix @@ -8,7 +8,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "lxd-nftables"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ patryk27 ]; }; diff --git a/nixos/tests/lxd.nix b/nixos/tests/lxd.nix index d1e642383cf8..ab56b75c02e4 100644 --- a/nixos/tests/lxd.nix +++ b/nixos/tests/lxd.nix @@ -47,7 +47,7 @@ let in { name = "lxd"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ patryk27 ]; }; diff --git a/nixos/tests/magic-wormhole-mailbox-server.nix b/nixos/tests/magic-wormhole-mailbox-server.nix index 144a07e13492..afdf7124fdc5 100644 --- a/nixos/tests/magic-wormhole-mailbox-server.nix +++ b/nixos/tests/magic-wormhole-mailbox-server.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "magic-wormhole-mailbox-server"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ mmahut ]; }; diff --git a/nixos/tests/magnetico.nix b/nixos/tests/magnetico.nix index e79a728b2ac8..8433a974f453 100644 --- a/nixos/tests/magnetico.nix +++ b/nixos/tests/magnetico.nix @@ -5,7 +5,7 @@ let in { name = "magnetico"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ rnhmjoj ]; }; diff --git a/nixos/tests/matrix-synapse.nix b/nixos/tests/matrix-synapse.nix index 6c8f1e188d52..9a1ff8a0d3ed 100644 --- a/nixos/tests/matrix-synapse.nix +++ b/nixos/tests/matrix-synapse.nix @@ -29,7 +29,7 @@ import ./make-test-python.nix ({ pkgs, ... } : let in { name = "matrix-synapse"; - meta = with pkgs.stdenv.lib; { + meta = with pkgs.lib; { maintainers = teams.matrix.members; }; diff --git a/nixos/tests/metabase.nix b/nixos/tests/metabase.nix index 65619cc793a7..370114e92223 100644 --- a/nixos/tests/metabase.nix +++ b/nixos/tests/metabase.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "metabase"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ mmahut ]; }; diff --git a/nixos/tests/minecraft-server.nix b/nixos/tests/minecraft-server.nix index 53780e4636ca..e6e0bca972a9 100644 --- a/nixos/tests/minecraft-server.nix +++ b/nixos/tests/minecraft-server.nix @@ -4,7 +4,7 @@ let rcon-port = 43000; in import ./make-test-python.nix ({ pkgs, ... }: { name = "minecraft-server"; - meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ nequissimus ]; }; + meta = with pkgs.lib.maintainers; { maintainers = [ nequissimus ]; }; nodes.server = { ... }: { environment.systemPackages = [ pkgs.mcrcon ]; diff --git a/nixos/tests/miniflux.nix b/nixos/tests/miniflux.nix index 7d83d061a9df..9f8b52c3c857 100644 --- a/nixos/tests/miniflux.nix +++ b/nixos/tests/miniflux.nix @@ -11,7 +11,7 @@ in with lib; { name = "miniflux"; - meta.maintainers = with pkgs.stdenv.lib.maintainers; [ bricewge ]; + meta.maintainers = with pkgs.lib.maintainers; [ bricewge ]; nodes = { default = diff --git a/nixos/tests/minio.nix b/nixos/tests/minio.nix index 02d1f7aa6c20..e49c517098ae 100644 --- a/nixos/tests/minio.nix +++ b/nixos/tests/minio.nix @@ -20,7 +20,7 @@ let ''; in { name = "minio"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ bachp ]; }; diff --git a/nixos/tests/misc.nix b/nixos/tests/misc.nix index 40661cdca0a1..fda2e60a41b6 100644 --- a/nixos/tests/misc.nix +++ b/nixos/tests/misc.nix @@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, ...} : rec { name = "misc"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ eelco ]; }; diff --git a/nixos/tests/molly-brown.nix b/nixos/tests/molly-brown.nix index 09ce42726ca9..bfc036e81ba0 100644 --- a/nixos/tests/molly-brown.nix +++ b/nixos/tests/molly-brown.nix @@ -4,7 +4,7 @@ import ./make-test-python.nix ({ pkgs, ... }: in { name = "molly-brown"; - meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ ehmry ]; }; + meta = with pkgs.lib.maintainers; { maintainers = [ ehmry ]; }; nodes = { diff --git a/nixos/tests/mongodb.nix b/nixos/tests/mongodb.nix index 1a7123883018..9c6fdfb1ca76 100644 --- a/nixos/tests/mongodb.nix +++ b/nixos/tests/mongodb.nix @@ -26,7 +26,7 @@ import ./make-test-python.nix ({ pkgs, ... }: in { name = "mongodb"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ bluescreen303 offline cstrahan rvl phile314 ]; }; diff --git a/nixos/tests/morty.nix b/nixos/tests/morty.nix index 924dce2717e3..9909596820d3 100644 --- a/nixos/tests/morty.nix +++ b/nixos/tests/morty.nix @@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "morty"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ leenaars ]; }; diff --git a/nixos/tests/mosquitto.nix b/nixos/tests/mosquitto.nix index 1f2fdf4237fa..308c1396013d 100644 --- a/nixos/tests/mosquitto.nix +++ b/nixos/tests/mosquitto.nix @@ -7,7 +7,7 @@ let topic = "test/foo"; in { name = "mosquitto"; - meta = with pkgs.stdenv.lib; { + meta = with pkgs.lib; { maintainers = with maintainers; [ peterhoeg ]; }; diff --git a/nixos/tests/mpd.nix b/nixos/tests/mpd.nix index 7af8640de71c..63d15e813afe 100644 --- a/nixos/tests/mpd.nix +++ b/nixos/tests/mpd.nix @@ -43,7 +43,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: }; in { name = "mpd"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ emmanuelrosa ]; }; diff --git a/nixos/tests/mumble.nix b/nixos/tests/mumble.nix index cb3e0ec42fc5..717f3c789288 100644 --- a/nixos/tests/mumble.nix +++ b/nixos/tests/mumble.nix @@ -14,7 +14,7 @@ let in { name = "mumble"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ thoughtpolice eelco ]; }; diff --git a/nixos/tests/munin.nix b/nixos/tests/munin.nix index 7b674db7768d..4ec17e0339df 100644 --- a/nixos/tests/munin.nix +++ b/nixos/tests/munin.nix @@ -3,7 +3,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "munin"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ domenkozar eelco ]; }; @@ -27,7 +27,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { }; # increase the systemd timer interval so it fires more often - systemd.timers.munin-cron.timerConfig.OnCalendar = pkgs.stdenv.lib.mkForce "*:*:0/10"; + systemd.timers.munin-cron.timerConfig.OnCalendar = pkgs.lib.mkForce "*:*:0/10"; }; }; diff --git a/nixos/tests/mutable-users.nix b/nixos/tests/mutable-users.nix index 49c7f78b82ed..e3f002d9b198 100644 --- a/nixos/tests/mutable-users.nix +++ b/nixos/tests/mutable-users.nix @@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "mutable-users"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ gleber ]; }; diff --git a/nixos/tests/mxisd.nix b/nixos/tests/mxisd.nix index b2b60db4d822..22755ea353b6 100644 --- a/nixos/tests/mxisd.nix +++ b/nixos/tests/mxisd.nix @@ -1,7 +1,7 @@ import ./make-test-python.nix ({ pkgs, ... } : { name = "mxisd"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ mguentner ]; }; diff --git a/nixos/tests/mysql/mariadb-galera-mariabackup.nix b/nixos/tests/mysql/mariadb-galera-mariabackup.nix index cae55878060c..a4b893a9f33a 100644 --- a/nixos/tests/mysql/mariadb-galera-mariabackup.nix +++ b/nixos/tests/mysql/mariadb-galera-mariabackup.nix @@ -6,7 +6,7 @@ let in { name = "mariadb-galera-mariabackup"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ izorkin ]; }; diff --git a/nixos/tests/mysql/mariadb-galera-rsync.nix b/nixos/tests/mysql/mariadb-galera-rsync.nix index 4318efae8a93..6fb3cfef8d73 100644 --- a/nixos/tests/mysql/mariadb-galera-rsync.nix +++ b/nixos/tests/mysql/mariadb-galera-rsync.nix @@ -6,7 +6,7 @@ let in { name = "mariadb-galera-rsync"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ izorkin ]; }; diff --git a/nixos/tests/mysql/mysql-backup.nix b/nixos/tests/mysql/mysql-backup.nix index c4c1079a8a64..d428fb6c16e6 100644 --- a/nixos/tests/mysql/mysql-backup.nix +++ b/nixos/tests/mysql/mysql-backup.nix @@ -1,7 +1,7 @@ # Test whether mysqlBackup option works import ./../make-test-python.nix ({ pkgs, ... } : { name = "mysql-backup"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ rvl ]; }; diff --git a/nixos/tests/mysql/mysql-replication.nix b/nixos/tests/mysql/mysql-replication.nix index b5e003250193..ad84c801ea10 100644 --- a/nixos/tests/mysql/mysql-replication.nix +++ b/nixos/tests/mysql/mysql-replication.nix @@ -7,7 +7,7 @@ in { name = "mysql-replication"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ eelco shlevy ]; }; diff --git a/nixos/tests/mysql/mysql.nix b/nixos/tests/mysql/mysql.nix index 5437a2860437..50ad5c68aef1 100644 --- a/nixos/tests/mysql/mysql.nix +++ b/nixos/tests/mysql/mysql.nix @@ -1,6 +1,6 @@ import ./../make-test-python.nix ({ pkgs, ...} : { name = "mysql"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ eelco shlevy ]; }; @@ -98,7 +98,7 @@ import ./../make-test-python.nix ({ pkgs, ...} : { }]; services.mysql.settings = { mysqld = { - plugin-load-add = [ "ha_tokudb.so" "ha_rocksdb.so" ]; + plugin-load-add = [ "ha_rocksdb.so" ]; }; }; services.mysql.package = pkgs.mariadb; @@ -185,19 +185,5 @@ import ./../make-test-python.nix ({ pkgs, ...} : { mariadb.succeed( "echo 'use testdb; drop table rocksdb;' | sudo -u testuser mysql -u testuser" ) - '' + pkgs.stdenv.lib.optionalString pkgs.stdenv.isx86_64 '' - # Check if TokuDB plugin works - mariadb.succeed( - "echo 'use testdb; create table tokudb (test_id INT, PRIMARY KEY (test_id)) ENGINE = TokuDB;' | sudo -u testuser mysql -u testuser" - ) - mariadb.succeed( - "echo 'use testdb; insert into tokudb values (25);' | sudo -u testuser mysql -u testuser" - ) - mariadb.succeed( - "echo 'use testdb; select test_id from tokudb;' | sudo -u testuser mysql -u testuser -N | grep 25" - ) - mariadb.succeed( - "echo 'use testdb; drop table tokudb;' | sudo -u testuser mysql -u testuser" - ) ''; }) diff --git a/nixos/tests/nagios.nix b/nixos/tests/nagios.nix index 6f5d44472878..e4d8dabedf72 100644 --- a/nixos/tests/nagios.nix +++ b/nixos/tests/nagios.nix @@ -1,7 +1,7 @@ import ./make-test-python.nix ( { pkgs, ... }: { name = "nagios"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ symphorien ]; }; diff --git a/nixos/tests/nano.nix b/nixos/tests/nano.nix index 9e0a9e147f2c..6585a6842e85 100644 --- a/nixos/tests/nano.nix +++ b/nixos/tests/nano.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "nano"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ nequissimus ]; }; diff --git a/nixos/tests/nat.nix b/nixos/tests/nat.nix index 0d1f7aaedfa2..545eb46f2bf5 100644 --- a/nixos/tests/nat.nix +++ b/nixos/tests/nat.nix @@ -23,7 +23,7 @@ import ./make-test-python.nix ({ pkgs, lib, withFirewall, withConntrackHelpers ? { name = "nat" + (if withFirewall then "WithFirewall" else "Standalone") + (lib.optionalString withConntrackHelpers "withConntrackHelpers"); - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ eelco rob ]; }; diff --git a/nixos/tests/ncdns.nix b/nixos/tests/ncdns.nix index 9960ac63e26b..50193676f34f 100644 --- a/nixos/tests/ncdns.nix +++ b/nixos/tests/ncdns.nix @@ -24,7 +24,7 @@ in { name = "ncdns"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ rnhmjoj ]; }; diff --git a/nixos/tests/ndppd.nix b/nixos/tests/ndppd.nix index b67b26a79341..e79e2a097b40 100644 --- a/nixos/tests/ndppd.nix +++ b/nixos/tests/ndppd.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : { name = "ndppd"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ fpletz ]; }; diff --git a/nixos/tests/netdata.nix b/nixos/tests/netdata.nix index 4ddc96e8bc22..0f26630da9d4 100644 --- a/nixos/tests/netdata.nix +++ b/nixos/tests/netdata.nix @@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "netdata"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ cransom ]; }; diff --git a/nixos/tests/networking-proxy.nix b/nixos/tests/networking-proxy.nix index bae9c66ed61a..62b5e690f6d1 100644 --- a/nixos/tests/networking-proxy.nix +++ b/nixos/tests/networking-proxy.nix @@ -12,7 +12,7 @@ let default-config = { }; in import ./make-test-python.nix ({ pkgs, ...} : { name = "networking-proxy"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ ]; }; diff --git a/nixos/tests/nextcloud/basic.nix b/nixos/tests/nextcloud/basic.nix index 72fb020dca70..78142d379664 100644 --- a/nixos/tests/nextcloud/basic.nix +++ b/nixos/tests/nextcloud/basic.nix @@ -3,7 +3,7 @@ import ../make-test-python.nix ({ pkgs, ...}: let adminuser = "root"; in { name = "nextcloud-basic"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ globin eqyiel ]; }; diff --git a/nixos/tests/nextcloud/with-mysql-and-memcached.nix b/nixos/tests/nextcloud/with-mysql-and-memcached.nix index bec3815a3e14..82041874de43 100644 --- a/nixos/tests/nextcloud/with-mysql-and-memcached.nix +++ b/nixos/tests/nextcloud/with-mysql-and-memcached.nix @@ -3,7 +3,7 @@ import ../make-test-python.nix ({ pkgs, ...}: let adminuser = "root"; in { name = "nextcloud-with-mysql-and-memcached"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ eqyiel ]; }; diff --git a/nixos/tests/nextcloud/with-postgresql-and-redis.nix b/nixos/tests/nextcloud/with-postgresql-and-redis.nix index 40a208115c32..81af620598ee 100644 --- a/nixos/tests/nextcloud/with-postgresql-and-redis.nix +++ b/nixos/tests/nextcloud/with-postgresql-and-redis.nix @@ -3,7 +3,7 @@ import ../make-test-python.nix ({ pkgs, ...}: let adminuser = "custom-admin-username"; in { name = "nextcloud-with-postgresql-and-redis"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ eqyiel ]; }; diff --git a/nixos/tests/nexus.nix b/nixos/tests/nexus.nix index 1ec5c40476a6..2a30a4eb2cc8 100644 --- a/nixos/tests/nexus.nix +++ b/nixos/tests/nexus.nix @@ -5,7 +5,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "nexus"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ ironpinguin ma27 ]; }; diff --git a/nixos/tests/nfs/simple.nix b/nixos/tests/nfs/simple.nix index c49ebddc2fdd..630c68a5b05d 100644 --- a/nixos/tests/nfs/simple.nix +++ b/nixos/tests/nfs/simple.nix @@ -19,7 +19,7 @@ in { name = "nfs"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ eelco ]; }; diff --git a/nixos/tests/nginx-sandbox.nix b/nixos/tests/nginx-sandbox.nix index 514318c9456c..2d512725f265 100644 --- a/nixos/tests/nginx-sandbox.nix +++ b/nixos/tests/nginx-sandbox.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "nginx-sandbox"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ izorkin ]; }; diff --git a/nixos/tests/nginx-sso.nix b/nixos/tests/nginx-sso.nix index 8834fc31c387..aeb89859c73f 100644 --- a/nixos/tests/nginx-sso.nix +++ b/nixos/tests/nginx-sso.nix @@ -1,7 +1,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "nginx-sso"; meta = { - maintainers = with pkgs.stdenv.lib.maintainers; [ delroth ]; + maintainers = with pkgs.lib.maintainers; [ delroth ]; }; machine = { diff --git a/nixos/tests/nginx.nix b/nixos/tests/nginx.nix index 18822f095688..5686afcd043e 100644 --- a/nixos/tests/nginx.nix +++ b/nixos/tests/nginx.nix @@ -6,7 +6,7 @@ # 3. nginx doesn't restart on configuration changes (only reloads) import ./make-test-python.nix ({ pkgs, ... }: { name = "nginx"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ mbbx6spp danbst ]; }; diff --git a/nixos/tests/novacomd.nix b/nixos/tests/novacomd.nix index 940210dee235..b470c117e1e1 100644 --- a/nixos/tests/novacomd.nix +++ b/nixos/tests/novacomd.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "novacomd"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ dtzWill ]; }; diff --git a/nixos/tests/nsd.nix b/nixos/tests/nsd.nix index bcc14e817a87..a558ee0a4254 100644 --- a/nixos/tests/nsd.nix +++ b/nixos/tests/nsd.nix @@ -7,7 +7,7 @@ let }; in import ./make-test-python.nix ({ pkgs, ...} : { name = "nsd"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ aszlig ]; }; diff --git a/nixos/tests/nzbget.nix b/nixos/tests/nzbget.nix index b39c9b035e61..d6111ba079c8 100644 --- a/nixos/tests/nzbget.nix +++ b/nixos/tests/nzbget.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "nzbget"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ aanderse flokli ]; }; @@ -10,7 +10,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { # hack, don't add (unfree) unrar to nzbget's path, # so we can run this test in CI - systemd.services.nzbget.path = pkgs.stdenv.lib.mkForce [ pkgs.p7zip ]; + systemd.services.nzbget.path = pkgs.lib.mkForce [ pkgs.p7zip ]; }; }; diff --git a/nixos/tests/nzbhydra2.nix b/nixos/tests/nzbhydra2.nix new file mode 100644 index 000000000000..c82c756c3a1c --- /dev/null +++ b/nixos/tests/nzbhydra2.nix @@ -0,0 +1,17 @@ +import ./make-test-python.nix ({ lib, ... }: + + with lib; + + { + name = "nzbhydra2"; + meta.maintainers = with maintainers; [ jamiemagee ]; + + nodes.machine = { pkgs, ... }: { services.nzbhydra2.enable = true; }; + + testScript = '' + machine.start() + machine.wait_for_unit("nzbhydra2.service") + machine.wait_for_open_port(5076) + machine.succeed("curl --fail http://localhost:5076/") + ''; + }) diff --git a/nixos/tests/openarena.nix b/nixos/tests/openarena.nix index 395ed9153ea1..461a35e89fe7 100644 --- a/nixos/tests/openarena.nix +++ b/nixos/tests/openarena.nix @@ -11,7 +11,7 @@ let in { name = "openarena"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ fpletz ]; }; diff --git a/nixos/tests/openssh.nix b/nixos/tests/openssh.nix index e9692b503272..003813379e69 100644 --- a/nixos/tests/openssh.nix +++ b/nixos/tests/openssh.nix @@ -4,7 +4,7 @@ let inherit (import ./ssh-keys.nix pkgs) snakeOilPrivateKey snakeOilPublicKey; in { name = "openssh"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ aszlig eelco ]; }; diff --git a/nixos/tests/opentabletdriver.nix b/nixos/tests/opentabletdriver.nix new file mode 100644 index 000000000000..832d4c25a540 --- /dev/null +++ b/nixos/tests/opentabletdriver.nix @@ -0,0 +1,27 @@ +import ./make-test-python.nix ( { pkgs, ... }: { + name = "opentabletdriver"; + meta = { + maintainers = with pkgs.lib.maintainers; [ thiagokokada ]; + }; + + machine = { pkgs, ... }: + { + imports = [ + ./common/user-account.nix + ./common/x11.nix + ]; + test-support.displayManager.auto.user = "alice"; + hardware.opentabletdriver.enable = true; + }; + + testScript = + '' + machine.start() + machine.wait_for_x() + machine.wait_for_unit("opentabletdriver.service", "alice") + + machine.succeed("cat /etc/udev/rules.d/30-opentabletdriver.rules") + # Will fail if service is not running + machine.succeed("otd detect") + ''; +}) diff --git a/nixos/tests/overlayfs.nix b/nixos/tests/overlayfs.nix index 33794deb9ed8..142e7d378b2f 100644 --- a/nixos/tests/overlayfs.nix +++ b/nixos/tests/overlayfs.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "overlayfs"; - meta.maintainers = with pkgs.stdenv.lib.maintainers; [ bachp ]; + meta.maintainers = with pkgs.lib.maintainers; [ bachp ]; machine = { pkgs, ... }: { virtualisation.emptyDiskImages = [ 512 ]; diff --git a/nixos/tests/packagekit.nix b/nixos/tests/packagekit.nix index 7e93ad35e80a..28d1374bf92c 100644 --- a/nixos/tests/packagekit.nix +++ b/nixos/tests/packagekit.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "packagekit"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ peterhoeg ]; }; diff --git a/nixos/tests/pantheon.nix b/nixos/tests/pantheon.nix index c0434f20754c..3894440333c9 100644 --- a/nixos/tests/pantheon.nix +++ b/nixos/tests/pantheon.nix @@ -3,7 +3,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "pantheon"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = pkgs.pantheon.maintainers; }; diff --git a/nixos/tests/peerflix.nix b/nixos/tests/peerflix.nix index 6e534dedc471..4800413783b1 100644 --- a/nixos/tests/peerflix.nix +++ b/nixos/tests/peerflix.nix @@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "peerflix"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ offline ]; }; diff --git a/nixos/tests/pgmanage.nix b/nixos/tests/pgmanage.nix index 4f5dbed24a97..6f8f2f965340 100644 --- a/nixos/tests/pgmanage.nix +++ b/nixos/tests/pgmanage.nix @@ -6,7 +6,7 @@ let in { name = "pgmanage"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ basvandijk ]; }; nodes = { diff --git a/nixos/tests/pinnwand.nix b/nixos/tests/pinnwand.nix index 2204e74b2c28..0c583e1104de 100644 --- a/nixos/tests/pinnwand.nix +++ b/nixos/tests/pinnwand.nix @@ -25,7 +25,7 @@ let in { name = "pinnwand"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers =[ hexa ]; }; diff --git a/nixos/tests/plasma5.nix b/nixos/tests/plasma5.nix index 7b17321e2e11..f09859a055d5 100644 --- a/nixos/tests/plasma5.nix +++ b/nixos/tests/plasma5.nix @@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "plasma5"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ ttuegel ]; }; diff --git a/nixos/tests/postgis.nix b/nixos/tests/postgis.nix index 84bbb0bc8ec6..9d81ebaad85f 100644 --- a/nixos/tests/postgis.nix +++ b/nixos/tests/postgis.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "postgis"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ lsix ]; }; diff --git a/nixos/tests/postgresql-wal-receiver.nix b/nixos/tests/postgresql-wal-receiver.nix index 432b46234f9c..0e8b3bfd6c34 100644 --- a/nixos/tests/postgresql-wal-receiver.nix +++ b/nixos/tests/postgresql-wal-receiver.nix @@ -1,11 +1,19 @@ +{ system ? builtins.currentSystem, + config ? {}, + pkgs ? import ../.. { inherit system config; } +}: + +with import ../lib/testing-python.nix { inherit system pkgs; }; + let + lib = pkgs.lib; + # 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 - + let pkg = pkgs."${postgresqlPackage}"; postgresqlDataDir = "/var/lib/postgresql/${pkg.psqlSchema}"; replicationUser = "wal_receiver_user"; @@ -19,7 +27,7 @@ let then pkgs.writeTextDir "recovery.signal" "" else pkgs.writeTextDir "recovery.conf" "restore_command = 'cp ${walBackupDir}/%f %p'"; - in { + in makeTest { name = "postgresql-wal-receiver-${postgresqlPackage}"; meta.maintainers = with lib.maintainers; [ pacien ]; @@ -104,7 +112,7 @@ let "test $(sudo -u postgres psql --pset='pager=off' --tuples-only --command='select count(distinct val) from dummy;') -eq 100" ) ''; - }); + }; }; # Maps the generic function over all attributes of PostgreSQL packages diff --git a/nixos/tests/postgresql.nix b/nixos/tests/postgresql.nix index 3201e22555ea..091e64294ac5 100644 --- a/nixos/tests/postgresql.nix +++ b/nixos/tests/postgresql.nix @@ -23,7 +23,7 @@ let ''; make-postgresql-test = postgresql-name: postgresql-package: backup-all: makeTest { name = postgresql-name; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ zagy ]; }; diff --git a/nixos/tests/printing.nix b/nixos/tests/printing.nix index 355c94a03861..6a1801fb2884 100644 --- a/nixos/tests/printing.nix +++ b/nixos/tests/printing.nix @@ -35,7 +35,7 @@ let in { name = "printing"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ domenkozar eelco matthewbauer ]; }; diff --git a/nixos/tests/privacyidea.nix b/nixos/tests/privacyidea.nix index 45c7cd37c241..b71ff0a1669f 100644 --- a/nixos/tests/privacyidea.nix +++ b/nixos/tests/privacyidea.nix @@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, ...} : rec { name = "privacyidea"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ fpletz ]; }; diff --git a/nixos/tests/prometheus-exporters.nix b/nixos/tests/prometheus-exporters.nix index ffa7f420c093..8fcb0a7aa2c3 100644 --- a/nixos/tests/prometheus-exporters.nix +++ b/nixos/tests/prometheus-exporters.nix @@ -96,6 +96,31 @@ let ''; }; + bird = { + exporterConfig = { + enable = true; + }; + metricProvider = { + services.bird2.enable = true; + services.bird2.config = '' + protocol kernel MyObviousTestString { + ipv4 { + import all; + export none; + }; + } + + protocol device { + } + ''; + }; + exporterTest = '' + wait_for_unit("prometheus-bird-exporter.service") + wait_for_open_port(9324) + succeed("curl -sSf http://localhost:9324/metrics | grep -q 'MyObviousTestString'") + ''; + }; + blackbox = { exporterConfig = { enable = true; @@ -197,10 +222,11 @@ let exporterConfig = { enable = true; url = "http://localhost"; - configFile = pkgs.writeText "json-exporter-conf.json" (builtins.toJSON [{ - name = "json_test_metric"; - path = "$.test"; - }]); + configFile = pkgs.writeText "json-exporter-conf.json" (builtins.toJSON { + metrics = [ + { name = "json_test_metric"; path = "$.test"; } + ]; + }); }; metricProvider = { systemd.services.prometheus-json-exporter.after = [ "nginx.service" ]; @@ -216,7 +242,9 @@ let wait_for_open_port(80) wait_for_unit("prometheus-json-exporter.service") wait_for_open_port(7979) - succeed("curl -sSf localhost:7979/metrics | grep -q 'json_test_metric 1'") + succeed( + "curl -sSf 'localhost:7979/probe?target=http://localhost' | grep -q 'json_test_metric 1'" + ) ''; }; @@ -634,7 +662,7 @@ let wait_for_open_port(11334) wait_for_open_port(7980) wait_until_succeeds( - "curl -sSf localhost:7980/metrics | grep -q 'rspamd_scanned{host=\"rspamd\"} 0'" + "curl -sSf 'localhost:7980/probe?target=http://localhost:11334/stat' | grep -q 'rspamd_scanned{host=\"rspamd\"} 0'" ) ''; }; @@ -670,6 +698,27 @@ let ''; }; + smokeping = { + exporterConfig = { + enable = true; + hosts = ["127.0.0.1"]; + }; + exporterTest = '' + wait_for_unit("prometheus-smokeping-exporter.service") + wait_for_open_port(9374) + wait_until_succeeds( + "curl -sSf localhost:9374/metrics | grep '{}' | grep -qv ' 0$'".format( + 'smokeping_requests_total{host="127.0.0.1",ip="127.0.0.1"} ' + ) + ) + wait_until_succeeds( + "curl -sSf localhost:9374/metrics | grep -q '{}'".format( + 'smokeping_response_ttl{host="127.0.0.1",ip="127.0.0.1"}' + ) + ) + ''; + }; + snmp = { exporterConfig = { enable = true; diff --git a/nixos/tests/proxy.nix b/nixos/tests/proxy.nix index 6a14a9af59ae..f8a3d576903e 100644 --- a/nixos/tests/proxy.nix +++ b/nixos/tests/proxy.nix @@ -11,7 +11,7 @@ let }; in { name = "proxy"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ eelco ]; }; diff --git a/nixos/tests/pt2-clone.nix b/nixos/tests/pt2-clone.nix index b502172e2ee5..3c090b7de428 100644 --- a/nixos/tests/pt2-clone.nix +++ b/nixos/tests/pt2-clone.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "pt2-clone"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ fgaz ]; }; diff --git a/nixos/tests/quagga.nix b/nixos/tests/quagga.nix index 04590aa0eb38..9aed49bf452f 100644 --- a/nixos/tests/quagga.nix +++ b/nixos/tests/quagga.nix @@ -23,7 +23,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "quagga"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ tavyc ]; }; diff --git a/nixos/tests/quorum.nix b/nixos/tests/quorum.nix index d5906806a0a2..498b55ace7af 100644 --- a/nixos/tests/quorum.nix +++ b/nixos/tests/quorum.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "quorum"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ mmahut ]; }; diff --git a/nixos/tests/rabbitmq.nix b/nixos/tests/rabbitmq.nix index f403e4ac2edc..8a7fcc0e8991 100644 --- a/nixos/tests/rabbitmq.nix +++ b/nixos/tests/rabbitmq.nix @@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "rabbitmq"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ eelco offline ]; }; diff --git a/nixos/tests/redis.nix b/nixos/tests/redis.nix index 529965d7acde..ca1715614359 100644 --- a/nixos/tests/redis.nix +++ b/nixos/tests/redis.nix @@ -1,6 +1,10 @@ -import ./make-test-python.nix ({ pkgs, ...} : { +import ./make-test-python.nix ({ pkgs, ... }: +let + redisSocket = "/run/redis/redis.sock"; +in +{ name = "redis"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ flokli ]; }; @@ -10,7 +14,20 @@ import ./make-test-python.nix ({ pkgs, ...} : { { services.redis.enable = true; - services.redis.unixSocket = "/run/redis/redis.sock"; + services.redis.unixSocket = redisSocket; + + # Allow access to the unix socket for the "redis" group. + services.redis.settings.unixsocketperm = "770"; + + users.users."member" = { + createHome = false; + description = "A member of the redis group"; + extraGroups = [ + "redis" + ]; + group = "users"; + shell = "/bin/sh"; + }; }; }; @@ -18,7 +35,11 @@ import ./make-test-python.nix ({ pkgs, ...} : { start_all() machine.wait_for_unit("redis") machine.wait_for_open_port("6379") + + # The unix socket is accessible to the redis group + machine.succeed('su member -c "redis-cli ping | grep PONG"') + machine.succeed("redis-cli ping | grep PONG") - machine.succeed("redis-cli -s /run/redis/redis.sock ping | grep PONG") + machine.succeed("redis-cli -s ${redisSocket} ping | grep PONG") ''; }) diff --git a/nixos/tests/resolv.nix b/nixos/tests/resolv.nix index b506f87451ee..f0aa7e42aaf3 100644 --- a/nixos/tests/resolv.nix +++ b/nixos/tests/resolv.nix @@ -1,7 +1,7 @@ # Test whether DNS resolving returns multiple records and all address families. import ./make-test-python.nix ({ pkgs, ... } : { name = "resolv"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ ckauhaus ]; }; diff --git a/nixos/tests/restic.nix b/nixos/tests/restic.nix index dad5bdfff27d..0cc8bd39afbb 100644 --- a/nixos/tests/restic.nix +++ b/nixos/tests/restic.nix @@ -19,7 +19,7 @@ import ./make-test-python.nix ( { name = "restic"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ bbigras i077 ]; }; diff --git a/nixos/tests/ripgrep.nix b/nixos/tests/ripgrep.nix index 9f76290488fa..3ff3bf4be151 100644 --- a/nixos/tests/ripgrep.nix +++ b/nixos/tests/ripgrep.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "ripgrep"; - meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ nequissimus ]; }; + meta = with pkgs.lib.maintainers; { maintainers = [ nequissimus ]; }; nodes.ripgrep = { pkgs, ... }: { environment.systemPackages = [ pkgs.ripgrep ]; }; diff --git a/nixos/tests/robustirc-bridge.nix b/nixos/tests/robustirc-bridge.nix index a5c22d73a34f..8493fd628212 100644 --- a/nixos/tests/robustirc-bridge.nix +++ b/nixos/tests/robustirc-bridge.nix @@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "robustirc-bridge"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ hax404 ]; }; diff --git a/nixos/tests/roundcube.nix b/nixos/tests/roundcube.nix index 97e1125694b6..763f10a7a2dd 100644 --- a/nixos/tests/roundcube.nix +++ b/nixos/tests/roundcube.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "roundcube"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ globin ]; }; diff --git a/nixos/tests/rsyslogd.nix b/nixos/tests/rsyslogd.nix index 50523920c60b..f35db3bd44b8 100644 --- a/nixos/tests/rsyslogd.nix +++ b/nixos/tests/rsyslogd.nix @@ -9,7 +9,7 @@ with pkgs.lib; { test1 = makeTest { name = "rsyslogd-test1"; - meta.maintainers = [ pkgs.stdenv.lib.maintainers.aanderse ]; + meta.maintainers = [ pkgs.lib.maintainers.aanderse ]; machine = { config, pkgs, ... }: { services.rsyslogd.enable = true; @@ -25,7 +25,7 @@ with pkgs.lib; test2 = makeTest { name = "rsyslogd-test2"; - meta.maintainers = [ pkgs.stdenv.lib.maintainers.aanderse ]; + meta.maintainers = [ pkgs.lib.maintainers.aanderse ]; machine = { config, pkgs, ... }: { services.rsyslogd.enable = true; diff --git a/nixos/tests/samba-wsdd.nix b/nixos/tests/samba-wsdd.nix index 1edef6c0056d..e7dd17c089a3 100644 --- a/nixos/tests/samba-wsdd.nix +++ b/nixos/tests/samba-wsdd.nix @@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "samba-wsdd"; - meta.maintainers = with pkgs.stdenv.lib.maintainers; [ izorkin ]; + meta.maintainers = with pkgs.lib.maintainers; [ izorkin ]; nodes = { client_wsdd = { pkgs, ... }: { diff --git a/nixos/tests/sanoid.nix b/nixos/tests/sanoid.nix index 66ddaad60ea2..da6d4c9ffe82 100644 --- a/nixos/tests/sanoid.nix +++ b/nixos/tests/sanoid.nix @@ -9,7 +9,7 @@ import ./make-test-python.nix ({ pkgs, ... }: let }; in { name = "sanoid"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ lopsided98 ]; }; diff --git a/nixos/tests/sbt-extras.nix b/nixos/tests/sbt-extras.nix index d63113f943e4..f1672bf20665 100644 --- a/nixos/tests/sbt-extras.nix +++ b/nixos/tests/sbt-extras.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "sbt-extras"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ nequissimus ]; }; diff --git a/nixos/tests/sbt.nix b/nixos/tests/sbt.nix index 004d9c2e140a..22541232ba65 100644 --- a/nixos/tests/sbt.nix +++ b/nixos/tests/sbt.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "sbt"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ nequissimus ]; }; diff --git a/nixos/tests/scala.nix b/nixos/tests/scala.nix index f99d9e563ffe..4fc3f8aa7b0a 100644 --- a/nixos/tests/scala.nix +++ b/nixos/tests/scala.nix @@ -8,7 +8,7 @@ with pkgs.lib; let common = name: package: (import ./make-test-python.nix ({ inherit name; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ nequissimus ]; }; diff --git a/nixos/tests/sddm.nix b/nixos/tests/sddm.nix index f9b961163c3c..d7c65fa33d67 100644 --- a/nixos/tests/sddm.nix +++ b/nixos/tests/sddm.nix @@ -37,7 +37,7 @@ let autoLogin = { name = "sddm-autologin"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ ttuegel ]; }; diff --git a/nixos/tests/searx.nix b/nixos/tests/searx.nix new file mode 100644 index 000000000000..357ade105358 --- /dev/null +++ b/nixos/tests/searx.nix @@ -0,0 +1,113 @@ +import ./make-test-python.nix ({ pkgs, ...} : + +{ + name = "searx"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ rnhmjoj ]; + }; + + # basic setup: searx running the built-in webserver + nodes.base = { ... }: { + imports = [ ../modules/profiles/minimal.nix ]; + + services.searx = { + enable = true; + environmentFile = pkgs.writeText "secrets" '' + WOLFRAM_API_KEY = sometoken + SEARX_SECRET_KEY = somesecret + ''; + + settings.server = + { port = "8080"; + bind_address = "0.0.0.0"; + secret_key = "@SEARX_SECRET_KEY@"; + }; + settings.engines = [ + { name = "wolframalpha"; + api_key = "@WOLFRAM_API_KEY@"; + engine = "wolframalpha_api"; + } + { name = "startpage"; + shortcut = "start"; + } + ]; + }; + + }; + + # fancy setup: run in uWSGI and use nginx as proxy + nodes.fancy = { ... }: { + imports = [ ../modules/profiles/minimal.nix ]; + + services.searx = { + enable = true; + # searx refuses to run if unchanged + settings.server.secret_key = "somesecret"; + + runInUwsgi = true; + uwsgiConfig = { + # serve using the uwsgi protocol + socket = "/run/searx/uwsgi.sock"; + chmod-socket = "660"; + + # use /searx as url "mountpoint" + mount = "/searx=searx.webapp:application"; + module = ""; + manage-script-name = true; + }; + }; + + # use nginx as reverse proxy + services.nginx.enable = true; + services.nginx.virtualHosts.localhost = { + locations."/searx".extraConfig = + '' + include ${pkgs.nginx}/conf/uwsgi_params; + uwsgi_pass unix:/run/searx/uwsgi.sock; + ''; + locations."/searx/static/".alias = "${pkgs.searx}/share/static/"; + }; + + # allow nginx access to the searx socket + users.users.nginx.extraGroups = [ "searx" ]; + + }; + + testScript = + '' + base.start() + + with subtest("Settings have been merged"): + base.wait_for_unit("searx-init") + base.wait_for_file("/run/searx/settings.yml") + output = base.succeed( + "${pkgs.yq-go}/bin/yq r /run/searx/settings.yml" + " 'engines.(name==startpage).shortcut'" + ).strip() + assert output == "start", "Settings not merged" + + with subtest("Environment variables have been substituted"): + base.succeed("grep -q somesecret /run/searx/settings.yml") + base.succeed("grep -q sometoken /run/searx/settings.yml") + base.copy_from_vm("/run/searx/settings.yml") + + with subtest("Basic setup is working"): + base.wait_for_open_port(8080) + base.wait_for_unit("searx") + base.succeed( + "${pkgs.curl}/bin/curl --fail http://localhost:8080" + ) + base.shutdown() + + with subtest("Nginx+uWSGI setup is working"): + fancy.start() + fancy.wait_for_open_port(80) + fancy.wait_for_unit("uwsgi") + fancy.succeed( + "${pkgs.curl}/bin/curl --fail http://localhost/searx >&2" + ) + fancy.succeed( + "${pkgs.curl}/bin/curl --fail http://localhost/searx/static/js/bootstrap.min.js >&2" + ) + ''; +}) diff --git a/nixos/tests/service-runner.nix b/nixos/tests/service-runner.nix index 55fbbb729344..58f46735f56d 100644 --- a/nixos/tests/service-runner.nix +++ b/nixos/tests/service-runner.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "service-runner"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ roberth ]; }; diff --git a/nixos/tests/shadow.nix b/nixos/tests/shadow.nix index 0cc1d6811400..e5755e8e0878 100644 --- a/nixos/tests/shadow.nix +++ b/nixos/tests/shadow.nix @@ -2,9 +2,10 @@ let password1 = "foobar"; password2 = "helloworld"; password3 = "bazqux"; + password4 = "asdf123"; in import ./make-test-python.nix ({ pkgs, ... }: { name = "shadow"; - meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ nequissimus ]; }; + meta = with pkgs.lib.maintainers; { maintainers = [ nequissimus ]; }; nodes.shadow = { pkgs, ... }: { environment.systemPackages = [ pkgs.shadow ]; @@ -19,6 +20,10 @@ in import ./make-test-python.nix ({ pkgs, ... }: { password = password2; shell = pkgs.shadow; }; + users.ash = { + password = password4; + shell = pkgs.bash; + }; }; }; @@ -41,6 +46,15 @@ in import ./make-test-python.nix ({ pkgs, ... }: { shadow.wait_for_file("/tmp/1") assert "emma" in shadow.succeed("cat /tmp/1") + with subtest("Switch user"): + shadow.send_chars("su - ash\n") + shadow.sleep(2) + shadow.send_chars("${password4}\n") + shadow.sleep(2) + shadow.send_chars("whoami > /tmp/3\n") + shadow.wait_for_file("/tmp/3") + assert "ash" in shadow.succeed("cat /tmp/3") + with subtest("Change password"): shadow.send_key("alt-f3") shadow.wait_until_succeeds(f"[ $(fgconsole) = 3 ]") diff --git a/nixos/tests/signal-desktop.nix b/nixos/tests/signal-desktop.nix index 65ae49a267d9..c424288e00a9 100644 --- a/nixos/tests/signal-desktop.nix +++ b/nixos/tests/signal-desktop.nix @@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "signal-desktop"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ flokli ]; }; diff --git a/nixos/tests/simple.nix b/nixos/tests/simple.nix index 3810a2cd3a58..b4d90f750ecf 100644 --- a/nixos/tests/simple.nix +++ b/nixos/tests/simple.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "simple"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ eelco ]; }; diff --git a/nixos/tests/smokeping.nix b/nixos/tests/smokeping.nix index 4f8f0fcc9fe2..4ac672b814bd 100644 --- a/nixos/tests/smokeping.nix +++ b/nixos/tests/smokeping.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "smokeping"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ cransom ]; }; diff --git a/nixos/tests/snapcast.nix b/nixos/tests/snapcast.nix index 92534f102819..a69b7afe99da 100644 --- a/nixos/tests/snapcast.nix +++ b/nixos/tests/snapcast.nix @@ -6,7 +6,7 @@ let httpPort = 10080; in { name = "snapcast"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ hexa ]; }; diff --git a/nixos/tests/sogo.nix b/nixos/tests/sogo.nix index 016331a9eed6..3f600b4cd555 100644 --- a/nixos/tests/sogo.nix +++ b/nixos/tests/sogo.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "sogo"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ ajs124 das_j ]; }; diff --git a/nixos/tests/solr.nix b/nixos/tests/solr.nix index dc5770e16bc7..86efe87c7078 100644 --- a/nixos/tests/solr.nix +++ b/nixos/tests/solr.nix @@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "solr"; - meta.maintainers = [ pkgs.stdenv.lib.maintainers.aanderse ]; + meta.maintainers = [ pkgs.lib.maintainers.aanderse ]; machine = { config, pkgs, ... }: diff --git a/nixos/tests/spike.nix b/nixos/tests/spike.nix index 47763e75ffa2..cb89df73877b 100644 --- a/nixos/tests/spike.nix +++ b/nixos/tests/spike.nix @@ -1,11 +1,11 @@ import ./make-test-python.nix ({ pkgs, ... }: let - riscvPkgs = import ../.. { crossSystem = pkgs.stdenv.lib.systems.examples.riscv64-embedded; }; + riscvPkgs = import ../.. { crossSystem = pkgs.lib.systems.examples.riscv64-embedded; }; in { name = "spike"; - meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ blitz ]; }; + meta = with pkgs.lib.maintainers; { maintainers = [ blitz ]; }; machine = { pkgs, lib, ... }: { environment.systemPackages = [ pkgs.spike riscvPkgs.riscv-pk riscvPkgs.hello ]; diff --git a/nixos/tests/sssd-ldap.nix b/nixos/tests/sssd-ldap.nix index 4831eaa4ba20..e3119348eac7 100644 --- a/nixos/tests/sssd-ldap.nix +++ b/nixos/tests/sssd-ldap.nix @@ -10,7 +10,7 @@ in import ./make-test-python.nix { name = "sssd-ldap"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ bbigras ]; }; diff --git a/nixos/tests/sssd.nix b/nixos/tests/sssd.nix index 4c6ca86c74c8..5c1abdca6aef 100644 --- a/nixos/tests/sssd.nix +++ b/nixos/tests/sssd.nix @@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "sssd"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ bbigras ]; }; machine = { pkgs, ... }: { diff --git a/nixos/tests/strongswan-swanctl.nix b/nixos/tests/strongswan-swanctl.nix index 152c0d61c543..0cf181ee62a5 100644 --- a/nixos/tests/strongswan-swanctl.nix +++ b/nixos/tests/strongswan-swanctl.nix @@ -31,7 +31,7 @@ let proposals = [ "aes128-sha256-x25519" ]; in { name = "strongswan-swanctl"; - meta.maintainers = with pkgs.stdenv.lib.maintainers; [ basvandijk ]; + meta.maintainers = with pkgs.lib.maintainers; [ basvandijk ]; nodes = { alice = { ... } : { diff --git a/nixos/tests/sudo.nix b/nixos/tests/sudo.nix index 8c38f1b47ef0..2a85c490665a 100644 --- a/nixos/tests/sudo.nix +++ b/nixos/tests/sudo.nix @@ -6,7 +6,7 @@ let in import ./make-test-python.nix ({ pkgs, ...} : { name = "sudo"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ lschuermann ]; }; diff --git a/nixos/tests/switch-test.nix b/nixos/tests/switch-test.nix index 9ef96cec5ef3..78adf7ffa7da 100644 --- a/nixos/tests/switch-test.nix +++ b/nixos/tests/switch-test.nix @@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "switch-test"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ gleber ]; }; diff --git a/nixos/tests/syncthing-init.nix b/nixos/tests/syncthing-init.nix index 0a01da52b68b..4581e3fd4fbe 100644 --- a/nixos/tests/syncthing-init.nix +++ b/nixos/tests/syncthing-init.nix @@ -4,7 +4,7 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: let in { name = "syncthing-init"; - meta.maintainers = with pkgs.stdenv.lib.maintainers; [ lassulus ]; + meta.maintainers = with pkgs.lib.maintainers; [ lassulus ]; machine = { services.syncthing = { diff --git a/nixos/tests/syncthing-relay.nix b/nixos/tests/syncthing-relay.nix index c144bf7fca37..a0233c969ec0 100644 --- a/nixos/tests/syncthing-relay.nix +++ b/nixos/tests/syncthing-relay.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: { name = "syncthing-relay"; - meta.maintainers = with pkgs.stdenv.lib.maintainers; [ delroth ]; + meta.maintainers = with pkgs.lib.maintainers; [ delroth ]; machine = { environment.systemPackages = [ pkgs.jq ]; diff --git a/nixos/tests/syncthing.nix b/nixos/tests/syncthing.nix index ac9df5e50c8c..5536b7055cc9 100644 --- a/nixos/tests/syncthing.nix +++ b/nixos/tests/syncthing.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: { name = "syncthing"; - meta.maintainers = with pkgs.stdenv.lib.maintainers; [ chkno ]; + meta.maintainers = with pkgs.lib.maintainers; [ chkno ]; nodes = rec { a = { diff --git a/nixos/tests/systemd-analyze.nix b/nixos/tests/systemd-analyze.nix index a78ba08cd55c..186f5aee7b85 100644 --- a/nixos/tests/systemd-analyze.nix +++ b/nixos/tests/systemd-analyze.nix @@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, latestKernel ? false, ... }: { name = "systemd-analyze"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ raskin ]; }; diff --git a/nixos/tests/systemd-boot.nix b/nixos/tests/systemd-boot.nix index 7a663dd9b428..3c93cb82d646 100644 --- a/nixos/tests/systemd-boot.nix +++ b/nixos/tests/systemd-boot.nix @@ -18,7 +18,7 @@ in { basic = makeTest { name = "systemd-boot"; - meta.maintainers = with pkgs.stdenv.lib.maintainers; [ danielfullmer ]; + meta.maintainers = with pkgs.lib.maintainers; [ danielfullmer ]; machine = common; @@ -42,7 +42,7 @@ in # Boot without having created an EFI entry--instead using default "/EFI/BOOT/BOOTX64.EFI" fallback = makeTest { name = "systemd-boot-fallback"; - meta.maintainers = with pkgs.stdenv.lib.maintainers; [ danielfullmer ]; + meta.maintainers = with pkgs.lib.maintainers; [ danielfullmer ]; machine = { pkgs, lib, ... }: { imports = [ common ]; @@ -68,7 +68,7 @@ in update = makeTest { name = "systemd-boot-update"; - meta.maintainers = with pkgs.stdenv.lib.maintainers; [ danielfullmer ]; + meta.maintainers = with pkgs.lib.maintainers; [ danielfullmer ]; machine = common; diff --git a/nixos/tests/systemd-journal.nix b/nixos/tests/systemd-journal.nix index c50c151ae10d..6ab7c7246318 100644 --- a/nixos/tests/systemd-journal.nix +++ b/nixos/tests/systemd-journal.nix @@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "systemd-journal"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ lewo ]; }; @@ -13,6 +13,8 @@ import ./make-test-python.nix ({ pkgs, ... }: testScript = '' machine.wait_for_unit("multi-user.target") + machine.succeed("journalctl --grep=systemd") + machine.succeed( "${pkgs.curl}/bin/curl -s localhost:19531/machine | ${pkgs.jq}/bin/jq -e '.hostname == \"machine\"'" ) diff --git a/nixos/tests/systemd-networkd-dhcpserver.nix b/nixos/tests/systemd-networkd-dhcpserver.nix index f1a2662f8cb4..b52c1499718b 100644 --- a/nixos/tests/systemd-networkd-dhcpserver.nix +++ b/nixos/tests/systemd-networkd-dhcpserver.nix @@ -3,7 +3,7 @@ # reachable via the DHCP allocated address. import ./make-test-python.nix ({pkgs, ...}: { name = "systemd-networkd-dhcpserver"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ tomfitzhenry ]; }; nodes = { diff --git a/nixos/tests/systemd-networkd-ipv6-prefix-delegation.nix b/nixos/tests/systemd-networkd-ipv6-prefix-delegation.nix index 99395fe3023f..bce78f09fdcc 100644 --- a/nixos/tests/systemd-networkd-ipv6-prefix-delegation.nix +++ b/nixos/tests/systemd-networkd-ipv6-prefix-delegation.nix @@ -9,7 +9,7 @@ import ./make-test-python.nix ({pkgs, ...}: { name = "systemd-networkd-ipv6-prefix-delegation"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ andir ]; }; nodes = { diff --git a/nixos/tests/systemd-networkd.nix b/nixos/tests/systemd-networkd.nix index d5fb2431dbad..4f2cb75f5a0c 100644 --- a/nixos/tests/systemd-networkd.nix +++ b/nixos/tests/systemd-networkd.nix @@ -61,7 +61,7 @@ let generateNodeConf = { lib, pkgs, config, privk, pubk, peerId, nodeId, ...}: { }; in import ./make-test-python.nix ({pkgs, ... }: { name = "networkd"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ ninjatrappeur ]; }; nodes = { diff --git a/nixos/tests/teeworlds.nix b/nixos/tests/teeworlds.nix index edf588968788..17e9eeb869b0 100644 --- a/nixos/tests/teeworlds.nix +++ b/nixos/tests/teeworlds.nix @@ -10,7 +10,7 @@ let in { name = "teeworlds"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ hax404 ]; }; diff --git a/nixos/tests/telegraf.nix b/nixos/tests/telegraf.nix index 7f4b36752582..d99680ce2c3c 100644 --- a/nixos/tests/telegraf.nix +++ b/nixos/tests/telegraf.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "telegraf"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ mic92 ]; }; diff --git a/nixos/tests/tor.nix b/nixos/tests/tor.nix index ad07231557c3..c061f59226cf 100644 --- a/nixos/tests/tor.nix +++ b/nixos/tests/tor.nix @@ -17,7 +17,7 @@ rec { environment.systemPackages = with pkgs; [ netcat ]; services.tor.enable = true; services.tor.client.enable = true; - services.tor.controlPort = 9051; + services.tor.settings.ControlPort = 9051; }; testScript = '' diff --git a/nixos/tests/trac.nix b/nixos/tests/trac.nix index af7182d1e185..d6914c100817 100644 --- a/nixos/tests/trac.nix +++ b/nixos/tests/trac.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "trac"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ mmahut ]; }; diff --git a/nixos/tests/traefik.nix b/nixos/tests/traefik.nix index 0e21a7cf8437..4eeae29acadf 100644 --- a/nixos/tests/traefik.nix +++ b/nixos/tests/traefik.nix @@ -2,7 +2,7 @@ # and a Docker container. import ./make-test-python.nix ({ pkgs, ... }: { name = "traefik"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ joko ]; }; diff --git a/nixos/tests/transmission.nix b/nixos/tests/transmission.nix index 37c0352dcfb8..7e2648804de2 100644 --- a/nixos/tests/transmission.nix +++ b/nixos/tests/transmission.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "transmission"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ coconnor ]; }; diff --git a/nixos/tests/trezord.nix b/nixos/tests/trezord.nix index 7c8370f409ed..fb60cb4aff10 100644 --- a/nixos/tests/trezord.nix +++ b/nixos/tests/trezord.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "trezord"; - meta = with pkgs.stdenv.lib; { + meta = with pkgs.lib; { maintainers = with maintainers; [ mmahut _1000101 ]; }; nodes = { diff --git a/nixos/tests/trickster.nix b/nixos/tests/trickster.nix index e32f919a1ada..acb2e735c39f 100644 --- a/nixos/tests/trickster.nix +++ b/nixos/tests/trickster.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "trickster"; - meta = with pkgs.stdenv.lib; { + meta = with pkgs.lib; { maintainers = with maintainers; [ _1000101 ]; }; diff --git a/nixos/tests/tuptime.nix b/nixos/tests/tuptime.nix index 36ce2b1ae192..6d37e3069839 100644 --- a/nixos/tests/tuptime.nix +++ b/nixos/tests/tuptime.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "tuptime"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ evils ]; }; diff --git a/nixos/tests/ucg.nix b/nixos/tests/ucg.nix index 47507aee07c1..7769fd01fce4 100644 --- a/nixos/tests/ucg.nix +++ b/nixos/tests/ucg.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "ucg"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ AndersonTorres ]; }; diff --git a/nixos/tests/udisks2.nix b/nixos/tests/udisks2.nix index 50a023968918..1f01cc6de4d6 100644 --- a/nixos/tests/udisks2.nix +++ b/nixos/tests/udisks2.nix @@ -11,7 +11,7 @@ in { name = "udisks2"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ eelco ]; }; diff --git a/nixos/tests/unbound.nix b/nixos/tests/unbound.nix index dc8e5a9d3ed8..c88231636226 100644 --- a/nixos/tests/unbound.nix +++ b/nixos/tests/unbound.nix @@ -38,7 +38,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: in { name = "unbound"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ andir ]; }; diff --git a/nixos/tests/upnp.nix b/nixos/tests/upnp.nix index 046c0a56b2a7..451c8607d0eb 100644 --- a/nixos/tests/upnp.nix +++ b/nixos/tests/upnp.nix @@ -15,7 +15,7 @@ let in { name = "upnp"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ bobvanderlinden ]; }; diff --git a/nixos/tests/uwsgi.nix b/nixos/tests/uwsgi.nix index 5c0b294e2d29..80dcde324aad 100644 --- a/nixos/tests/uwsgi.nix +++ b/nixos/tests/uwsgi.nix @@ -1,36 +1,53 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "uwsgi"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ lnl7 ]; }; machine = { pkgs, ... }: { - services.uwsgi.enable = true; - services.uwsgi.plugins = [ "python3" "php" ]; - services.uwsgi.instance = { - type = "emperor"; - vassals.python = { + users.users.hello = + { isSystemUser = true; + group = "hello"; + }; + users.groups.hello = { }; + + services.uwsgi = { + enable = true; + plugins = [ "python3" "php" ]; + capabilities = [ "CAP_NET_BIND_SERVICE" ]; + instance.type = "emperor"; + + instance.vassals.hello = { type = "normal"; - master = true; - workers = 2; - http = ":8000"; + immediate-uid = "hello"; + immediate-gid = "hello"; module = "wsgi:application"; + http = ":80"; + cap = "net_bind_service"; + pythonPackages = self: [ self.flask ]; chdir = pkgs.writeTextDir "wsgi.py" '' from flask import Flask + import subprocess application = Flask(__name__) @application.route("/") def hello(): - return "Hello World!" + return "Hello, World!" + + @application.route("/whoami") + def whoami(): + whoami = "${pkgs.coreutils}/bin/whoami" + proc = subprocess.run(whoami, capture_output=True) + return proc.stdout.decode().strip() ''; - pythonPackages = self: with self; [ flask ]; }; - vassals.php = { + + instance.vassals.php = { type = "normal"; master = true; workers = 2; - http-socket = ":8001"; + http-socket = ":8000"; http-socket-modifier1 = 14; php-index = "index.php"; php-docroot = pkgs.writeTextDir "index.php" '' @@ -44,9 +61,21 @@ import ./make-test-python.nix ({ pkgs, ... }: '' machine.wait_for_unit("multi-user.target") machine.wait_for_unit("uwsgi.service") - machine.wait_for_open_port(8000) - machine.wait_for_open_port(8001) - assert "Hello World" in machine.succeed("curl -fv 127.0.0.1:8000") - assert "Hello World" in machine.succeed("curl -fv 127.0.0.1:8001") + + with subtest("uWSGI has started"): + machine.wait_for_unit("uwsgi.service") + + with subtest("Vassal can bind on port <1024"): + machine.wait_for_open_port(80) + hello = machine.succeed("curl -f http://machine").strip() + assert "Hello, World!" in hello, f"Excepted 'Hello, World!', got '{hello}'" + + with subtest("Vassal is running as dedicated user"): + username = machine.succeed("curl -f http://machine/whoami").strip() + assert username == "hello", f"Excepted 'hello', got '{username}'" + + with subtest("PHP plugin is working"): + machine.wait_for_open_port(8000) + assert "Hello World" in machine.succeed("curl -fv http://machine:8000") ''; }) diff --git a/nixos/tests/vault.nix b/nixos/tests/vault.nix index ac8cf0703da5..ffdc39574720 100644 --- a/nixos/tests/vault.nix +++ b/nixos/tests/vault.nix @@ -1,7 +1,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "vault"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ lnl7 ]; }; machine = { pkgs, ... }: { diff --git a/nixos/tests/vector.nix b/nixos/tests/vector.nix index e96c3ad152f3..583e60ddc568 100644 --- a/nixos/tests/vector.nix +++ b/nixos/tests/vector.nix @@ -7,7 +7,7 @@ with pkgs.lib; { test1 = makeTest { name = "vector-test1"; - meta.maintainers = [ pkgs.stdenv.lib.maintainers.happysalada ]; + meta.maintainers = [ pkgs.lib.maintainers.happysalada ]; machine = { config, pkgs, ... }: { services.vector = { diff --git a/nixos/tests/victoriametrics.nix b/nixos/tests/victoriametrics.nix index fff8d7005da1..5e364b67bf87 100644 --- a/nixos/tests/victoriametrics.nix +++ b/nixos/tests/victoriametrics.nix @@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "victoriametrics"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ yorickvp ]; }; diff --git a/nixos/tests/virtualbox.nix b/nixos/tests/virtualbox.nix index 900ee610a70b..0a7369b0fa2a 100644 --- a/nixos/tests/virtualbox.nix +++ b/nixos/tests/virtualbox.nix @@ -402,7 +402,7 @@ let # (keep black happy) ''; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ aszlig cdepillabout ]; }; }; diff --git a/nixos/tests/wasabibackend.nix b/nixos/tests/wasabibackend.nix index d169ad152722..1832698ab698 100644 --- a/nixos/tests/wasabibackend.nix +++ b/nixos/tests/wasabibackend.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "wasabibackend"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ mmahut ]; }; diff --git a/nixos/tests/web-servers/unit-php.nix b/nixos/tests/web-servers/unit-php.nix index 033036ee7667..24d6f5f16a72 100644 --- a/nixos/tests/web-servers/unit-php.nix +++ b/nixos/tests/web-servers/unit-php.nix @@ -4,7 +4,7 @@ import ../make-test-python.nix ({pkgs, ...}: in { name = "unit-php-test"; - meta.maintainers = with pkgs.stdenv.lib.maintainers; [ izorkin ]; + meta.maintainers = with pkgs.lib.maintainers; [ izorkin ]; machine = { config, lib, pkgs, ... }: { services.unit = { diff --git a/nixos/tests/wireguard/basic.nix b/nixos/tests/wireguard/basic.nix index 25d706ae2e52..a31e92e8649d 100644 --- a/nixos/tests/wireguard/basic.nix +++ b/nixos/tests/wireguard/basic.nix @@ -6,7 +6,7 @@ import ../make-test-python.nix ({ pkgs, lib, ...} : in { name = "wireguard"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ ma27 ]; }; diff --git a/nixos/tests/wireguard/generated.nix b/nixos/tests/wireguard/generated.nix index cdf15483265c..84a35d29b453 100644 --- a/nixos/tests/wireguard/generated.nix +++ b/nixos/tests/wireguard/generated.nix @@ -1,7 +1,7 @@ { kernelPackages ? null }: import ../make-test-python.nix ({ pkgs, lib, ... } : { name = "wireguard-generated"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ ma27 grahamc ]; }; diff --git a/nixos/tests/wireguard/namespaces.nix b/nixos/tests/wireguard/namespaces.nix index c47175ceafc8..93dc84a8768e 100644 --- a/nixos/tests/wireguard/namespaces.nix +++ b/nixos/tests/wireguard/namespaces.nix @@ -17,7 +17,7 @@ in import ../make-test-python.nix ({ pkgs, lib, ... } : { name = "wireguard-with-namespaces"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ asymmetric ]; }; diff --git a/nixos/tests/wireguard/wg-quick.nix b/nixos/tests/wireguard/wg-quick.nix index 5472d21cd1ec..8cf8c307de38 100644 --- a/nixos/tests/wireguard/wg-quick.nix +++ b/nixos/tests/wireguard/wg-quick.nix @@ -7,7 +7,7 @@ import ../make-test-python.nix ({ pkgs, lib, ... }: in { name = "wg-quick"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ xwvvvvwx ]; }; diff --git a/nixos/tests/wordpress.nix b/nixos/tests/wordpress.nix index 5d740502bb57..a5c10c2de741 100644 --- a/nixos/tests/wordpress.nix +++ b/nixos/tests/wordpress.nix @@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "wordpress"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ flokli grahamc # under duress! diff --git a/nixos/tests/xautolock.nix b/nixos/tests/xautolock.nix index 4a8d3f4cebf7..2d29f80b3fee 100644 --- a/nixos/tests/xautolock.nix +++ b/nixos/tests/xautolock.nix @@ -4,7 +4,7 @@ with lib; { name = "xautolock"; - meta.maintainers = with pkgs.stdenv.lib.maintainers; [ ma27 ]; + meta.maintainers = with pkgs.lib.maintainers; [ ma27 ]; nodes.machine = { imports = [ ./common/x11.nix ./common/user-account.nix ]; diff --git a/nixos/tests/xmonad.nix b/nixos/tests/xmonad.nix index 308dbca154fd..078cd2118107 100644 --- a/nixos/tests/xmonad.nix +++ b/nixos/tests/xmonad.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "xmonad"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ nequissimus ]; }; diff --git a/nixos/tests/xmpp/ejabberd.nix b/nixos/tests/xmpp/ejabberd.nix index 2b09f99f5fd9..7926fe80de2f 100644 --- a/nixos/tests/xmpp/ejabberd.nix +++ b/nixos/tests/xmpp/ejabberd.nix @@ -1,6 +1,6 @@ import ../make-test-python.nix ({ pkgs, ... }: { name = "ejabberd"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ ajs124 ]; }; nodes = { diff --git a/nixos/tests/xrdp.nix b/nixos/tests/xrdp.nix index 6d7f2b9249ff..92eb7d4772ef 100644 --- a/nixos/tests/xrdp.nix +++ b/nixos/tests/xrdp.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "xrdp"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ volth ]; }; diff --git a/nixos/tests/xss-lock.nix b/nixos/tests/xss-lock.nix index b77bbbbb3c4e..71f56e32c58a 100644 --- a/nixos/tests/xss-lock.nix +++ b/nixos/tests/xss-lock.nix @@ -4,7 +4,7 @@ with lib; { name = "xss-lock"; - meta.maintainers = with pkgs.stdenv.lib.maintainers; [ ma27 ]; + meta.maintainers = with pkgs.lib.maintainers; [ ma27 ]; nodes = { simple = { diff --git a/nixos/tests/xterm.nix b/nixos/tests/xterm.nix index 9f30543bf385..078d1dca9642 100644 --- a/nixos/tests/xterm.nix +++ b/nixos/tests/xterm.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "xterm"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ nequissimus ]; }; diff --git a/nixos/tests/yabar.nix b/nixos/tests/yabar.nix index b374ef296807..545fe544d534 100644 --- a/nixos/tests/yabar.nix +++ b/nixos/tests/yabar.nix @@ -4,7 +4,7 @@ with lib; { name = "yabar"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ ma27 ]; }; diff --git a/nixos/tests/yggdrasil.nix b/nixos/tests/yggdrasil.nix index 1d7541308b48..0b58ad29aa2b 100644 --- a/nixos/tests/yggdrasil.nix +++ b/nixos/tests/yggdrasil.nix @@ -23,7 +23,7 @@ let in import ./make-test-python.nix ({ pkgs, ...} : { name = "yggdrasil"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ gazally ]; }; diff --git a/nixos/tests/yq.nix b/nixos/tests/yq.nix index 7c0e8e3d055a..cdcb3d6e2462 100644 --- a/nixos/tests/yq.nix +++ b/nixos/tests/yq.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "yq"; - meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ nequissimus ]; }; + meta = with pkgs.lib.maintainers; { maintainers = [ nequissimus ]; }; nodes.yq = { pkgs, ... }: { environment.systemPackages = with pkgs; [ jq yq ]; }; diff --git a/nixos/tests/zfs.nix b/nixos/tests/zfs.nix index e05cd540227a..08a0867f1a87 100644 --- a/nixos/tests/zfs.nix +++ b/nixos/tests/zfs.nix @@ -14,7 +14,7 @@ let }: makeTest { name = "zfs-" + name; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ adisbladis ]; }; diff --git a/nixos/tests/zookeeper.nix b/nixos/tests/zookeeper.nix index 2bcf5ff0faab..0ee2673886a7 100644 --- a/nixos/tests/zookeeper.nix +++ b/nixos/tests/zookeeper.nix @@ -5,7 +5,7 @@ let in { name = "zookeeper"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ nequissimus ztzg ]; }; diff --git a/nixos/tests/zsh-history.nix b/nixos/tests/zsh-history.nix index 4380ec9adfd2..caed45e851d4 100644 --- a/nixos/tests/zsh-history.nix +++ b/nixos/tests/zsh-history.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "zsh-history"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ kampka ]; }; diff --git a/pkgs/applications/accessibility/contrast/default.nix b/pkgs/applications/accessibility/contrast/default.nix index 8f70f632cd6e..1d18f4a92302 100644 --- a/pkgs/applications/accessibility/contrast/default.nix +++ b/pkgs/applications/accessibility/contrast/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitLab , cairo , dbus @@ -62,7 +62,7 @@ rustPlatform.buildRustPackage rec { checkPhase = null; installPhase = null; - meta = with stdenv.lib; { + meta = with lib; { description = "Checks whether the contrast between two colors meet the WCAG requirements"; homepage = "https://gitlab.gnome.org/World/design/contrast"; license = licenses.gpl3; diff --git a/pkgs/applications/accessibility/mousetweaks/default.nix b/pkgs/applications/accessibility/mousetweaks/default.nix index b645bc61848b..769ea241de89 100644 --- a/pkgs/applications/accessibility/mousetweaks/default.nix +++ b/pkgs/applications/accessibility/mousetweaks/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig +{ lib, stdenv, fetchurl, pkgconfig , glib, gtk3, gnome3, gsettings-desktop-schemas, wrapGAppsHook , libX11, libXtst, libXfixes, libXcursor }: @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Provides mouse accessibility enhancements for the GNOME desktop"; longDescription = '' Mousetweaks provides mouse accessibility enhancements for the GNOME diff --git a/pkgs/applications/audio/a2jmidid/default.nix b/pkgs/applications/audio/a2jmidid/default.nix index 984048828923..35c9cda1821c 100644 --- a/pkgs/applications/audio/a2jmidid/default.nix +++ b/pkgs/applications/audio/a2jmidid/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, makeWrapper, pkgconfig, alsaLib, dbus, libjack2 +{ lib, stdenv, fetchFromGitHub, fetchpatch, makeWrapper, pkgconfig, alsaLib, dbus, libjack2 , python3Packages , meson, ninja }: stdenv.mkDerivation rec { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { substituteInPlace $out/bin/a2j --replace "a2j_control" "$out/bin/a2j_control" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Daemon for exposing legacy ALSA sequencer applications in JACK MIDI system"; license = licenses.gpl2; maintainers = [ maintainers.goibhniu ]; diff --git a/pkgs/applications/audio/aacgain/default.nix b/pkgs/applications/audio/aacgain/default.nix index 83b359b1b1cb..d4fc3fbe698e 100644 --- a/pkgs/applications/audio/aacgain/default.nix +++ b/pkgs/applications/audio/aacgain/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, fetchpatch }: +{ lib, stdenv, fetchFromGitLab, fetchpatch }: stdenv.mkDerivation { name = "aacgain-1.9.0"; @@ -53,7 +53,7 @@ stdenv.mkDerivation { install -D aacgain/aacgain "$out/bin/aacgain" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "ReplayGain for AAC files"; homepage = "https://aacgain.altosdesign.com"; license = licenses.gpl2; diff --git a/pkgs/applications/audio/abcde/default.nix b/pkgs/applications/audio/abcde/default.nix index 4cb28e512a72..a90051136cb9 100644 --- a/pkgs/applications/audio/abcde/default.nix +++ b/pkgs/applications/audio/abcde/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libcdio-paranoia, cddiscid, wget, which, vorbis-tools, id3v2, eyeD3 +{ lib, stdenv, fetchurl, libcdio-paranoia, cddiscid, wget, which, vorbis-tools, id3v2, eyeD3 , lame, flac, glyr , perlPackages , makeWrapper }: @@ -45,7 +45,7 @@ in done ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://abcde.einval.com/wiki/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ gebner ]; diff --git a/pkgs/applications/audio/adlplug/default.nix b/pkgs/applications/audio/adlplug/default.nix index 7dcc13eb96d5..cdf9e3e538ee 100644 --- a/pkgs/applications/audio/adlplug/default.nix +++ b/pkgs/applications/audio/adlplug/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, libjack2, alsaLib +{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, libjack2, alsaLib , freetype, libX11, libXrandr, libXinerama, libXext, libXcursor , fetchpatch, fmt , adlplugChip ? "-DADLplug_CHIP=OPL3" @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ cmake pkgconfig fmt ]; - meta = with stdenv.lib; { + meta = with lib; { description = "OPL3 and OPN2 FM Chip Synthesizer"; homepage = src.meta.homepage; license = licenses.boost; diff --git a/pkgs/applications/audio/airwave/default.nix b/pkgs/applications/audio/airwave/default.nix index 176d1d4cfb37..d541afd2de3d 100644 --- a/pkgs/applications/audio/airwave/default.nix +++ b/pkgs/applications/audio/airwave/default.nix @@ -1,4 +1,4 @@ -{ stdenv, multiStdenv, cmake, fetchFromGitHub, file, libX11, makeWrapper +{ lib, stdenv, multiStdenv, cmake, fetchFromGitHub, file, libX11, makeWrapper , qt5, requireFile, unzip, wine }: @@ -73,7 +73,7 @@ multiStdenv.mkDerivation { wrapProgram $out/libexec/airwave-host-64.exe --set WINELOADER ${wine-xembed}/bin/wine64 ''; - meta = with stdenv.lib; { + meta = with lib; { description = "WINE-based VST bridge for Linux VST hosts"; longDescription = '' Airwave is a wine based VST bridge, that allows for the use of diff --git a/pkgs/applications/audio/aj-snapshot/default.nix b/pkgs/applications/audio/aj-snapshot/default.nix index f781aad905d0..e4a196d0f6bf 100644 --- a/pkgs/applications/audio/aj-snapshot/default.nix +++ b/pkgs/applications/audio/aj-snapshot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, jack2Full, minixml, pkgconfig }: +{ lib, stdenv, fetchurl, alsaLib, jack2Full, minixml, pkgconfig }: stdenv.mkDerivation rec { name = packageName + "-" + version ; @@ -15,12 +15,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ alsaLib minixml jack2Full ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Tool for storing/restoring JACK and/or ALSA connections to/from cml files"; longDescription = '' - Aj-snapshot is a small program that can be used to make snapshots of the connections made between JACK and/or ALSA clients. - Because JACK can provide both audio and MIDI support to programs, aj-snapshot can store both types of connections for JACK. - ALSA, on the other hand, only provides routing facilities for MIDI clients. + Aj-snapshot is a small program that can be used to make snapshots of the connections made between JACK and/or ALSA clients. + Because JACK can provide both audio and MIDI support to programs, aj-snapshot can store both types of connections for JACK. + ALSA, on the other hand, only provides routing facilities for MIDI clients. You can also run aj-snapshot in daemon mode if you want to have your connections continually restored. ''; diff --git a/pkgs/applications/audio/ams-lv2/default.nix b/pkgs/applications/audio/ams-lv2/default.nix index 34f5667bfcaa..99c3ca736076 100644 --- a/pkgs/applications/audio/ams-lv2/default.nix +++ b/pkgs/applications/audio/ams-lv2/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub, cairo, fftw, gtkmm2, lv2, lvtk, pkgconfig -, wafHook }: +{ lib, stdenv, fetchFromGitHub, cairo, fftw, gtkmm2, lv2, lvtk, pkgconfig +, wafHook, python3 }: stdenv.mkDerivation rec { pname = "ams-lv2"; @@ -12,10 +12,10 @@ stdenv.mkDerivation rec { sha256 = "1lz2mvk4gqsyf92yxd3aaldx0d0qi28h4rnnvsaz4ls0ccqm80nk"; }; - nativeBuildInputs = [ pkgconfig wafHook ]; + nativeBuildInputs = [ pkgconfig wafHook python3 ]; buildInputs = [ cairo fftw gtkmm2 lv2 lvtk ]; - meta = with stdenv.lib; { + meta = with lib; { description = "An LV2 port of the internal modules found in Alsa Modular Synth"; homepage = "https://github.com/blablack/ams-lv2"; license = licenses.gpl3; diff --git a/pkgs/applications/audio/ams/default.nix b/pkgs/applications/audio/ams/default.nix index e6c4fbe802e1..188584b8e732 100644 --- a/pkgs/applications/audio/ams/default.nix +++ b/pkgs/applications/audio/ams/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchgit , automake , alsaLib @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { qttools ]); - meta = with stdenv.lib; { + meta = with lib; { description = "Realtime modular synthesizer for ALSA"; homepage = "http://alsamodular.sourceforge.net"; license = licenses.gpl2; diff --git a/pkgs/applications/audio/ardour/5.nix b/pkgs/applications/audio/ardour/5.nix index 86879e4e5bd8..4a0656ed9ce2 100644 --- a/pkgs/applications/audio/ardour/5.nix +++ b/pkgs/applications/audio/ardour/5.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchgit , alsaLib , aubio @@ -143,7 +143,7 @@ in stdenv.mkDerivation rec { install -vDm 644 "ardour.1"* -t "$out/share/man/man1" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Multi-track hard disk recording software"; longDescription = '' Ardour is a digital audio workstation (DAW), You can use it to diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/applications/audio/ardour/default.nix index 314153bf260c..26e25c687e77 100644 --- a/pkgs/applications/audio/ardour/default.nix +++ b/pkgs/applications/audio/ardour/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchgit , alsaLib , aubio @@ -162,7 +162,7 @@ stdenv.mkDerivation rec { LINKFLAGS = "-lpthread"; - meta = with stdenv.lib; { + meta = with lib; { description = "Multi-track hard disk recording software"; longDescription = '' Ardour is a digital audio workstation (DAW), You can use it to diff --git a/pkgs/applications/audio/artyFX/default.nix b/pkgs/applications/audio/artyFX/default.nix index 8cf9bec2e3df..84914e3e798a 100644 --- a/pkgs/applications/audio/artyFX/default.nix +++ b/pkgs/applications/audio/artyFX/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub , cairomm, cmake, libjack2, libpthreadstubs, libXdmcp, libxshmfence, libsndfile, lv2, ntk, pkgconfig }: +{ lib, stdenv, fetchFromGitHub , cairomm, cmake, libjack2, libpthreadstubs, libXdmcp, libxshmfence, libsndfile, lv2, ntk, pkg-config }: stdenv.mkDerivation rec { pname = "artyFX"; @@ -12,10 +12,10 @@ stdenv.mkDerivation rec { sha256 = "0wwg8ivnpyy0235bapjy4g0ij85zq355jwi6c1nkrac79p4z9ail"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cairomm cmake libjack2 libpthreadstubs libXdmcp libxshmfence libsndfile lv2 ntk ]; + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ cairomm libjack2 libpthreadstubs libXdmcp libxshmfence libsndfile lv2 ntk ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://openavproductions.com/artyfx/"; description = "A LV2 plugin bundle of artistic realtime effects"; license = licenses.gpl2; diff --git a/pkgs/applications/audio/ashuffle/default.nix b/pkgs/applications/audio/ashuffle/default.nix index 6bb21b5edaab..f21cb9e3907f 100644 --- a/pkgs/applications/audio/ashuffle/default.nix +++ b/pkgs/applications/audio/ashuffle/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkg-config, mpd_clientlib, meson, ninja }: +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, mpd_clientlib, meson, ninja }: stdenv.mkDerivation rec { pname = "ashuffle"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config meson ninja ]; buildInputs = [ mpd_clientlib ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/joshkunz/ashuffle"; description = "Automatic library-wide shuffle for mpd"; maintainers = [ maintainers.tcbravo ]; diff --git a/pkgs/applications/audio/aucatctl/default.nix b/pkgs/applications/audio/aucatctl/default.nix index 4aff3e1f7bfb..ad9fefb68b9f 100644 --- a/pkgs/applications/audio/aucatctl/default.nix +++ b/pkgs/applications/audio/aucatctl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, sndio, libbsd }: +{ lib, stdenv, fetchurl, sndio, libbsd }: stdenv.mkDerivation rec { pname = "aucatctl"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { --replace '#include ' '#include ' ''; - meta = with stdenv.lib; { + meta = with lib; { description = "The aucatctl utility sends MIDI messages to control sndiod and/or aucat volumes"; homepage = "http://www.sndio.org"; diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix index 20526c8c6c56..1f5468f7db38 100644 --- a/pkgs/applications/audio/audacity/default.nix +++ b/pkgs/applications/audio/audacity/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchzip, wxGTK30, pkgconfig, file, gettext, +{ lib, stdenv, fetchzip, wxGTK30, pkgconfig, file, gettext, libvorbis, libmad, libjack2, lv2, lilv, serd, sord, sratom, suil, alsaLib, libsndfile, soxr, flac, lame, expat, libid3tag, ffmpeg_3, soundtouch, /*, portaudio - given up fighting their portaudio.patch */ - autoconf, automake, libtool - }: + cmake +}: with stdenv.lib; @@ -15,16 +15,8 @@ stdenv.mkDerivation rec { sha256 = "1xk0piv72d2xd3p7igr916fhcbrm76fhjr418k1rlqdzzg1hfljn"; }; - preConfigure = /* we prefer system-wide libs */ '' - autoreconf -vi # use system libraries - - # we will get a (possibly harmless) warning during configure without this - substituteInPlace configure \ - --replace /usr/bin/file ${file}/bin/file - ''; - - configureFlags = [ - "--with-libsamplerate" + cmakeFlags = [ + "-DCMAKE_BUILD_TYPE=Release" ]; # audacity only looks for lame and ffmpeg at runtime, so we need to link them in manually @@ -43,19 +35,17 @@ stdenv.mkDerivation rec { "-lswscale" ]; - nativeBuildInputs = [ pkgconfig autoconf automake libtool ]; + nativeBuildInputs = [ pkgconfig cmake ]; buildInputs = [ file gettext wxGTK30 expat alsaLib libsndfile soxr libid3tag libjack2 lv2 lilv serd sord sratom suil wxGTK30.gtk ffmpeg_3 libmad lame libvorbis flac soundtouch ]; #ToDo: detach sbsms - enableParallelBuilding = true; - dontDisableStatic = true; doCheck = false; # Test fails - meta = with stdenv.lib; { + meta = with lib; { description = "Sound editor with graphical UI"; homepage = "https://www.audacityteam.org/"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/audio/audio-recorder/default.nix b/pkgs/applications/audio/audio-recorder/default.nix index eee293b76c2f..a66bb50f082c 100644 --- a/pkgs/applications/audio/audio-recorder/default.nix +++ b/pkgs/applications/audio/audio-recorder/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , pkgconfig, intltool , glib, dbus, gtk3, libappindicator-gtk3, gst_all_1 , librsvg, wrapGAppsHook @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav ]) ++ stdenv.lib.optional pulseaudioSupport libpulseaudio; - meta = with stdenv.lib; { + meta = with lib; { description = "Audio recorder for GNOME and Unity Desktops"; longDescription = '' This program allows you to record your favourite music or audio to a file. diff --git a/pkgs/applications/audio/autotalent/default.nix b/pkgs/applications/audio/autotalent/default.nix index 8efa26777864..ba96aa51d606 100644 --- a/pkgs/applications/audio/autotalent/default.nix +++ b/pkgs/applications/audio/autotalent/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip }: +{ lib, stdenv, fetchzip }: stdenv.mkDerivation rec { pname = "autotalent"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { sed -r 's/^const LADSPA_Descriptor \*/__attribute__ ((visibility ("default"))) \0/' -i autotalent.c ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://tombaran.info/autotalent.html"; description = "A real-time pitch correction LADSPA plugin (no MIDI control)"; license = licenses.gpl2; diff --git a/pkgs/applications/audio/axoloti/default.nix b/pkgs/applications/audio/axoloti/default.nix index 3d907e421b3e..df885c90371f 100644 --- a/pkgs/applications/audio/axoloti/default.nix +++ b/pkgs/applications/audio/axoloti/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchurl, makeWrapper, unzip +{ lib, stdenv, fetchFromGitHub, fetchurl, makeWrapper, unzip , gnumake, gcc-arm-embedded, binutils-arm-embedded , dfu-util-axoloti, jdk, ant, libfaketime }: @@ -87,7 +87,7 @@ stdenv.mkDerivation rec { makeWrapper ${jdk}/bin/java $out/bin/axoloti --add-flags "-Daxoloti_release=$out/share/axoloti -Daxoloti_runtime=$out/share/axoloti -jar $out/share/axoloti/Axoloti.jar" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.axoloti.com"; description = '' Sketching embedded digital audio algorithms. diff --git a/pkgs/applications/audio/axoloti/dfu-util.nix b/pkgs/applications/audio/axoloti/dfu-util.nix index 80ec696c6459..4b4b5ce56780 100644 --- a/pkgs/applications/audio/axoloti/dfu-util.nix +++ b/pkgs/applications/audio/axoloti/dfu-util.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libusb1-axoloti }: +{ lib, stdenv, fetchurl, pkgconfig, libusb1-axoloti }: stdenv.mkDerivation rec { pname = "dfu-util"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0n7h08avlzin04j93m6hkq9id6hxjiiix7ff9gc2n89aw6dxxjsm"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Device firmware update (DFU) USB programmer"; longDescription = '' dfu-util is a program that implements the host (PC) side of the USB diff --git a/pkgs/applications/audio/axoloti/libusb1.nix b/pkgs/applications/audio/axoloti/libusb1.nix index 255cf3f5e3bf..e95b391fc781 100644 --- a/pkgs/applications/audio/axoloti/libusb1.nix +++ b/pkgs/applications/audio/axoloti/libusb1.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { sed 's,-ludev,-L${lib.getLib systemd}/lib -ludev,' -i $out/lib/libusb-1.0.la ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.libusb.info"; description = "User-space USB library"; platforms = platforms.unix; diff --git a/pkgs/applications/audio/bambootracker/default.nix b/pkgs/applications/audio/bambootracker/default.nix index f1f97de256e6..8e9a566c172b 100644 --- a/pkgs/applications/audio/bambootracker/default.nix +++ b/pkgs/applications/audio/bambootracker/default.nix @@ -1,5 +1,5 @@ { mkDerivation -, stdenv +, lib, stdenv , fetchFromGitHub , qmake , qtbase @@ -40,7 +40,7 @@ mkDerivation rec { ++ optional pulseSupport "CONFIG+=use_pulse" ++ optionals jackSupport [ "CONFIG+=use_jack" "CONFIG+=jack_has_rename" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A tracker for YM2608 (OPNA) which was used in NEC PC-8801/9801 series computers"; homepage = "https://github.com/rerrahkr/BambooTracker"; license = licenses.gpl2Only; diff --git a/pkgs/applications/audio/baudline/default.nix b/pkgs/applications/audio/baudline/default.nix index 0d95675d1e67..2f695b6ed7b4 100644 --- a/pkgs/applications/audio/baudline/default.nix +++ b/pkgs/applications/audio/baudline/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libXmu, libXt, libX11, libXext, libXxf86vm, libjack2 +{ lib, stdenv, fetchurl, libXmu, libXt, libX11, libXext, libXxf86vm, libjack2 , makeWrapper }: @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Scientific signal analysis application"; longDescription = '' Baudline is a time-frequency browser designed for scientific diff --git a/pkgs/applications/audio/bchoppr/default.nix b/pkgs/applications/audio/bchoppr/default.nix index 33827287712a..ffe9e549eb23 100644 --- a/pkgs/applications/audio/bchoppr/default.nix +++ b/pkgs/applications/audio/bchoppr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkg-config, cairo, libX11, lv2 }: +{ lib, stdenv, fetchFromGitHub, pkg-config, cairo, libX11, lv2 }: stdenv.mkDerivation rec { pname = "bchoppr"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = https://github.com/sjaehn/BChoppr; description = "An audio stream chopping LV2 plugin"; maintainers = [ maintainers.magnetophon ]; diff --git a/pkgs/applications/audio/bitmeter/default.nix b/pkgs/applications/audio/bitmeter/default.nix index ac05a9367cc9..ebea6251dfb0 100644 --- a/pkgs/applications/audio/bitmeter/default.nix +++ b/pkgs/applications/audio/bitmeter/default.nix @@ -1,4 +1,4 @@ -{ stdenv, autoreconfHook, fetchurl, libjack2, gtk2, pkgconfig }: +{ lib, stdenv, autoreconfHook, fetchurl, libjack2, gtk2, pkgconfig }: stdenv.mkDerivation rec { pname = "bitmeter"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { }) ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://devel.tlrmx.org/audio/bitmeter/"; description = "Also known as jack bitscope. Useful to detect denormals"; license = licenses.gpl2; diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix index 61d522f677fe..97c27d4ad9af 100644 --- a/pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix +++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix @@ -83,7 +83,7 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A digital audio workstation"; longDescription = '' Bitwig Studio is a multi-platform music-creation system for diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix index 6841cd6e75d9..31086b3674d9 100644 --- a/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix +++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix @@ -1,23 +1,77 @@ -{ fetchurl, bitwig-studio1, pulseaudio, libjack2, xorg }: +{ stdenv, fetchurl, alsaLib, cairo, dpkg, freetype +, gdk-pixbuf, glib, gtk3, lib, xorg +, libglvnd, libjack2, ffmpeg_3 +, libxkbcommon, xdg_utils, zlib, pulseaudio +, wrapGAppsHook, makeWrapper }: -bitwig-studio1.overrideAttrs (oldAttrs: rec { - name = "bitwig-studio-${version}"; - version = "3.2.8"; +stdenv.mkDerivation rec { + pname = "bitwig-studio"; + version = "3.3.1"; src = fetchurl { - url = "https://downloads.bitwig.com/stable/${version}/bitwig-studio-${version}.deb"; - sha256 = "18ldgmnv7bigb4mch888kjpf4abalpiwmlhwd7rjb9qf6p72fhpj"; + url = "https://downloads.bitwig.com/stable/${version}/${pname}-${version}.deb"; + sha256 = "0f7xysk0cl48q7i28m25hasmrp30grgm3kah0s7xmkjgm33887pi"; }; - buildInputs = oldAttrs.buildInputs ++ [ xorg.libXtst ]; + nativeBuildInputs = [ dpkg makeWrapper wrapGAppsHook ]; - runtimeDependencies = [ pulseaudio libjack2 ]; + unpackCmd = '' + mkdir -p root + dpkg-deb -x $curSrc root + ''; + + dontBuild = true; + dontWrapGApps = true; # we only want $gappsWrapperArgs here + + buildInputs = with xorg; [ + alsaLib cairo freetype gdk-pixbuf glib gtk3 libxcb xcbutil xcbutilwm zlib libXtst libxkbcommon pulseaudio libjack2 libX11 libglvnd libXcursor stdenv.cc.cc.lib + ]; + + binPath = lib.makeBinPath [ + xdg_utils ffmpeg_3 + ]; + + ldLibraryPath = lib.strings.makeLibraryPath buildInputs; installPhase = '' - ${oldAttrs.installPhase} - - # recover commercial jre - rm -f $out/libexec/lib/jre - cp -r opt/bitwig-studio/lib/jre $out/libexec/lib + mkdir -p $out/bin + cp -r opt/bitwig-studio $out/libexec + ln -s $out/libexec/bitwig-studio $out/bin/bitwig-studio + cp -r usr/share $out/share + substitute usr/share/applications/bitwig-studio.desktop \ + $out/share/applications/bitwig-studio.desktop \ + --replace /usr/bin/bitwig-studio $out/bin/bitwig-studio ''; -}) + + postFixup = '' + # patchelf fails to set rpath on BitwigStudioEngine, so we use + # the LD_LIBRARY_PATH way + + find $out -type f -executable \ + -not -name '*.so.*' \ + -not -name '*.so' \ + -not -name '*.jar' \ + -not -path '*/resources/*' | \ + while IFS= read -r f ; do + patchelf --set-interpreter "${stdenv.cc.bintools.dynamicLinker}" $f + wrapProgram $f \ + "''${gappsWrapperArgs[@]}" \ + --prefix PATH : "${binPath}" \ + --prefix LD_LIBRARY_PATH : "${ldLibraryPath}" + done + + ''; + + meta = with lib; { + description = "A digital audio workstation"; + longDescription = '' + Bitwig Studio is a multi-platform music-creation system for + production, performance and DJing, with a focus on flexible + editing tools and a super-fast workflow. + ''; + homepage = "https://www.bitwig.com/"; + license = licenses.unfree; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ bfortz michalrus mrVanDalo ]; + }; +} diff --git a/pkgs/applications/audio/bjumblr/default.nix b/pkgs/applications/audio/bjumblr/default.nix index e1a5bee64b30..cc6df2328e07 100644 --- a/pkgs/applications/audio/bjumblr/default.nix +++ b/pkgs/applications/audio/bjumblr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libX11, cairo, lv2, pkgconfig, libsndfile }: +{ lib, stdenv, fetchFromGitHub, libX11, cairo, lv2, pkgconfig, libsndfile }: stdenv.mkDerivation rec { pname = "BJumblr"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { installFlags = [ "PREFIX=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/sjaehn/BJumblr"; description = "Pattern-controlled audio stream / sample re-sequencer LV2 plugin"; maintainers = [ maintainers.magnetophon ]; diff --git a/pkgs/applications/audio/bristol/default.nix b/pkgs/applications/audio/bristol/default.nix index 704b888e2293..d58ff73bb70a 100644 --- a/pkgs/applications/audio/bristol/default.nix +++ b/pkgs/applications/audio/bristol/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, libjack2, pkgconfig, libpulseaudio, xorg }: +{ lib, stdenv, fetchurl, alsaLib, libjack2, pkgconfig, libpulseaudio, xorg }: stdenv.mkDerivation rec { pname = "bristol"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { sed -e "s@\`which brighton\`@$out/bin/brighton@g" -i bin/startBristol ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A range of synthesiser, electric piano and organ emulations"; homepage = "http://bristol.sourceforge.net"; license = licenses.gpl3; diff --git a/pkgs/applications/audio/bs1770gain/default.nix b/pkgs/applications/audio/bs1770gain/default.nix deleted file mode 100644 index 76a789356193..000000000000 --- a/pkgs/applications/audio/bs1770gain/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, fetchurl, ffmpeg, sox }: - -stdenv.mkDerivation rec { - pname = "bs1770gain"; - version = "0.5.2"; - - src = fetchurl { - url = "mirror://sourceforge/bs1770gain/${pname}-${version}.tar.gz"; - sha256 = "1p6yz5q7czyf9ard65sp4kawdlkg40cfscr3b24znymmhs3p7rbk"; - }; - - buildInputs = [ ffmpeg sox ]; - - NIX_CFLAGS_COMPILE = "-Wno-error"; - - meta = with stdenv.lib; { - description = "A audio/video loudness scanner implementing ITU-R BS.1770"; - license = licenses.gpl2Plus; - homepage = "http://bs1770gain.sourceforge.net/"; - platforms = platforms.all; - }; -} diff --git a/pkgs/applications/audio/bschaffl/default.nix b/pkgs/applications/audio/bschaffl/default.nix index c0d11e1fe5ac..c8fae58ac2fb 100644 --- a/pkgs/applications/audio/bschaffl/default.nix +++ b/pkgs/applications/audio/bschaffl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkg-config, cairo, libX11, lv2 }: +{ lib, stdenv, fetchFromGitHub, pkg-config, cairo, libX11, lv2 }: stdenv.mkDerivation rec { pname = "bschaffl"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/sjaehn/BSchaffl"; description = "Pattern-controlled MIDI amp & time stretch LV2 plugin"; maintainers = [ maintainers.magnetophon ]; diff --git a/pkgs/applications/audio/bsequencer/default.nix b/pkgs/applications/audio/bsequencer/default.nix index 093e9450de8b..93e010d826dc 100644 --- a/pkgs/applications/audio/bsequencer/default.nix +++ b/pkgs/applications/audio/bsequencer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, xorg, cairo, lv2, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, xorg, cairo, lv2, pkgconfig }: stdenv.mkDerivation rec { pname = "BSEQuencer"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { installFlags = [ "PREFIX=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/sjaehn/BSEQuencer"; description = "Multi channel MIDI step sequencer LV2 plugin"; maintainers = [ maintainers.magnetophon ]; diff --git a/pkgs/applications/audio/bshapr/default.nix b/pkgs/applications/audio/bshapr/default.nix index aa4374c79bc1..e4f96e396c9b 100644 --- a/pkgs/applications/audio/bshapr/default.nix +++ b/pkgs/applications/audio/bshapr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, xorg, cairo, lv2, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, xorg, cairo, lv2, pkgconfig }: stdenv.mkDerivation rec { pname = "BShapr"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { installFlags = [ "PREFIX=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/sjaehn/BShapr"; description = "Beat / envelope shaper LV2 plugin"; maintainers = [ maintainers.magnetophon ]; diff --git a/pkgs/applications/audio/bslizr/default.nix b/pkgs/applications/audio/bslizr/default.nix index e239a89b8995..c833bd1262b1 100644 --- a/pkgs/applications/audio/bslizr/default.nix +++ b/pkgs/applications/audio/bslizr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, xorg, cairo, lv2, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, xorg, cairo, lv2, pkgconfig }: stdenv.mkDerivation rec { pname = "BSlizr"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { installFlags = [ "PREFIX=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/sjaehn/BSlizr"; description = "Sequenced audio slicing effect LV2 plugin (step sequencer effect)"; maintainers = [ maintainers.magnetophon ]; diff --git a/pkgs/applications/audio/calf/default.nix b/pkgs/applications/audio/calf/default.nix index bbeef4c395a2..8fecd558e678 100644 --- a/pkgs/applications/audio/calf/default.nix +++ b/pkgs/applications/audio/calf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cairo, expat, fftwSinglePrec, fluidsynth, glib +{ lib, stdenv, fetchurl, cairo, expat, fftwSinglePrec, fluidsynth, glib , gtk2, libjack2, ladspaH , libglade, lv2, pkgconfig }: stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { libglade lv2 pkgconfig ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://calf-studio-gear.org"; description = "A set of high quality open source audio plugins for musicians"; license = licenses.lgpl2; diff --git a/pkgs/applications/audio/cantata/default.nix b/pkgs/applications/audio/cantata/default.nix index 85806ca9a0d2..bbdcbc21b789 100644 --- a/pkgs/applications/audio/cantata/default.nix +++ b/pkgs/applications/audio/cantata/default.nix @@ -75,8 +75,6 @@ in mkDerivation { nativeBuildInputs = [ cmake pkgconfig qttools ]; - enableParallelBuilding = true; - cmakeFlags = lib.flatten [ (fstats withTaglib [ "TAGLIB" "TAGLIB_EXTRAS" ]) (fstats withReplaygain [ "FFMPEG" "MPG123" "SPEEXDSP" ]) diff --git a/pkgs/applications/audio/carla/default.nix b/pkgs/applications/audio/carla/default.nix index 8a566c249917..883daa2ddef9 100644 --- a/pkgs/applications/audio/carla/default.nix +++ b/pkgs/applications/audio/carla/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, alsaLib, file, fluidsynth, ffmpeg_3, jack2, +{ lib, stdenv, fetchFromGitHub, alsaLib, file, fluidsynth, ffmpeg_3, jack2, liblo, libpulseaudio, libsndfile, pkgconfig, python3Packages, which, withFrontend ? true, withQt ? true, qtbase ? null, wrapQtAppsHook ? null, @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://kxstudio.sf.net/carla"; description = "An audio plugin host"; longDescription = '' diff --git a/pkgs/applications/audio/caudec/default.nix b/pkgs/applications/audio/caudec/default.nix index c95390958637..013cf9ef7075 100644 --- a/pkgs/applications/audio/caudec/default.nix +++ b/pkgs/applications/audio/caudec/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, bash, bc, findutils, flac, lame, opusTools, procps, sox }: +{ lib, stdenv, fetchurl, makeWrapper, bash, bc, findutils, flac, lame, opusTools, procps, sox }: let version = "1.7.5"; @@ -30,7 +30,7 @@ stdenv.mkDerivation { done ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://caudec.net/"; description = "A multiprocess audio converter that supports many formats (FLAC, MP3, Ogg Vorbis, Windows codecs and many more)"; license = licenses.gpl3; diff --git a/pkgs/applications/audio/cava/default.nix b/pkgs/applications/audio/cava/default.nix index a92a5325f16d..d024128c821a 100644 --- a/pkgs/applications/audio/cava/default.nix +++ b/pkgs/applications/audio/cava/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, alsaLib, fftw, +{ lib, stdenv, fetchFromGitHub, autoreconfHook, alsaLib, fftw, libpulseaudio, ncurses }: stdenv.mkDerivation rec { @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { --replace "/usr/share/consolefonts" "$out/share/consolefonts" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Console-based Audio Visualizer for Alsa"; homepage = "https://github.com/karlstav/cava"; license = licenses.mit; diff --git a/pkgs/applications/audio/cd-discid/default.nix b/pkgs/applications/audio/cd-discid/default.nix index 2ceb5f6d09a2..5dcb178dc79f 100644 --- a/pkgs/applications/audio/cd-discid/default.nix +++ b/pkgs/applications/audio/cd-discid/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv +{ fetchurl, lib, stdenv , IOKit ? null }: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [] ++ stdenv.lib.optional stdenv.isDarwin IOKit; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://linukz.org/cd-discid.shtml"; license = licenses.gpl2Plus; maintainers = [ maintainers.rycee ]; diff --git a/pkgs/applications/audio/cdparanoia/default.nix b/pkgs/applications/audio/cdparanoia/default.nix index 0658305723c4..54d55d1c1b6f 100644 --- a/pkgs/applications/audio/cdparanoia/default.nix +++ b/pkgs/applications/audio/cdparanoia/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, gnu-config, IOKit, Carbon }: +{ lib, stdenv, fetchurl, autoreconfHook, gnu-config, IOKit, Carbon }: stdenv.mkDerivation rec { name = "cdparanoia-III-10.2"; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { cp ${gnu-config}/config.guess configure.guess ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://xiph.org/paranoia"; description = "A tool and library for reading digital audio from CDs"; license = with licenses; [ gpl2Plus lgpl21Plus ]; diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix index d9d1a11ce1db..500fb3293566 100644 --- a/pkgs/applications/audio/clementine/default.nix +++ b/pkgs/applications/audio/clementine/default.nix @@ -1,4 +1,4 @@ -{ stdenv, mkDerivation, fetchFromGitHub, fetchpatch, boost, cmake, chromaprint, gettext, gst_all_1, liblastfm +{ lib, stdenv, mkDerivation, fetchFromGitHub, fetchpatch, boost, cmake, chromaprint, gettext, gst_all_1, liblastfm , qtbase, qtx11extras , taglib, fftw, glew, qjson, sqlite, libgpod, libplist, usbmuxd, libmtp , libpulseaudio, gvfs, libcdio, libechonest, libspotify, pcre, projectm, protobuf @@ -79,8 +79,6 @@ let "-DSPOTIFY_BLOB=OFF" ]; - enableParallelBuilding = true; - passthru.unfree = unfree; postInstall = '' @@ -88,7 +86,7 @@ let --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.clementine-player.org"; description = "A multiplatform music player"; license = licenses.gpl3Plus; @@ -122,8 +120,8 @@ let ln -s "${free}/share/$dir" "$out/share/$dir" done ''; - enableParallelBuilding = true; - meta = with stdenv.lib; { + + meta = with lib; { homepage = "https://www.clementine-player.org"; description = "Spotify integration for Clementine"; # The blob itself is Apache-licensed, although libspotify is unfree. diff --git a/pkgs/applications/audio/clerk/default.nix b/pkgs/applications/audio/clerk/default.nix index 912662b7726c..03c693da15a5 100644 --- a/pkgs/applications/audio/clerk/default.nix +++ b/pkgs/applications/audio/clerk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, makeWrapper, rofi, mpc_cli, perl, +{ lib, stdenv, fetchFromGitHub, makeWrapper, rofi, mpc_cli, perl, util-linux, pythonPackages, libnotify }: stdenv.mkDerivation { @@ -21,7 +21,7 @@ stdenv.mkDerivation { --prefix PATH : "${stdenv.lib.makeBinPath [ rofi mpc_cli perl util-linux libnotify ]}" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "An MPD client built on top of rofi"; homepage = "https://github.com/carnager/clerk"; license = licenses.mit; diff --git a/pkgs/applications/audio/cmt/default.nix b/pkgs/applications/audio/cmt/default.nix index 96cc3c573198..bb23f9b62bbd 100644 --- a/pkgs/applications/audio/cmt/default.nix +++ b/pkgs/applications/audio/cmt/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , ladspaH }: @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { mkdir -p $out/lib/ladspa ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Computer Music Toolkit"; homepage = "https://www.ladspa.org/cmt"; license = licenses.gpl2; diff --git a/pkgs/applications/audio/cmus/default.nix b/pkgs/applications/audio/cmus/default.nix index 3e5916ba0983..2c8bf47cee97 100644 --- a/pkgs/applications/audio/cmus/default.nix +++ b/pkgs/applications/audio/cmus/default.nix @@ -1,4 +1,4 @@ -{ config, stdenv, fetchFromGitHub, runCommand, ncurses, pkgconfig +{ config, lib, stdenv, fetchFromGitHub, runCommand, ncurses, pkgconfig , libiconv, CoreAudio , alsaSupport ? stdenv.isLinux, alsaLib ? null @@ -126,7 +126,7 @@ stdenv.mkDerivation rec { makeFlags = [ "LD=$(CC)" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Small, fast and powerful console music player for Linux and *BSD"; homepage = "https://cmus.github.io/"; license = licenses.gpl2; diff --git a/pkgs/applications/audio/cmusfm/default.nix b/pkgs/applications/audio/cmusfm/default.nix index 3e8360e1eaf6..c07b887192a3 100644 --- a/pkgs/applications/audio/cmusfm/default.nix +++ b/pkgs/applications/audio/cmusfm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, curl, libnotify, gdk-pixbuf }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, curl, libnotify, gdk-pixbuf }: stdenv.mkDerivation { version = "2020-07-23"; @@ -14,7 +14,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ curl libnotify gdk-pixbuf ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Last.fm and Libre.fm standalone scrobbler for the cmus music player"; longDescription = '' Features: diff --git a/pkgs/applications/audio/cozy-audiobooks/default.nix b/pkgs/applications/audio/cozy-audiobooks/default.nix index 1a78b783f53a..a30d604e3465 100644 --- a/pkgs/applications/audio/cozy-audiobooks/default.nix +++ b/pkgs/applications/audio/cozy-audiobooks/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , ninja , meson , pkgconfig @@ -78,7 +78,7 @@ python3Packages.buildPythonApplication rec { ln -s $out/bin/com.github.geigi.cozy $out/bin/cozy ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A modern audio book player for Linux using GTK 3"; homepage = "https://cozy.geigi.de/"; maintainers = [ maintainers.makefu ]; diff --git a/pkgs/applications/audio/csa/default.nix b/pkgs/applications/audio/csa/default.nix index 756c21892fb2..5121f6d616b2 100644 --- a/pkgs/applications/audio/csa/default.nix +++ b/pkgs/applications/audio/csa/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "csa"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { # so we remove one of them: postInstall = "rm $out/lib/ladspa/celllm_3890.*"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://sourceforge.net/projects/csa/"; description = "A group of LADSPA Audio plugins for FM broadcast and more"; longDescription = '' diff --git a/pkgs/applications/audio/csound/csound-qt/default.nix b/pkgs/applications/audio/csound/csound-qt/default.nix index e6060c056ccb..ba9df9039f6c 100644 --- a/pkgs/applications/audio/csound/csound-qt/default.nix +++ b/pkgs/applications/audio/csound/csound-qt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, csound, desktop-file-utils, +{ lib, stdenv, csound, desktop-file-utils, fetchFromGitHub, python, python-qt, qmake, qtwebengine, qtxmlpatterns, rtmidi, fetchpatch }: @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { "SHARE_DIR=${placeholder "out"}/share" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "CsoundQt is a frontend for Csound with editor, integrated help, widgets and other features"; homepage = "https://csoundqt.github.io/"; license = licenses.gpl2; diff --git a/pkgs/applications/audio/csound/default.nix b/pkgs/applications/audio/csound/default.nix index d91e550334b6..5a6a290af768 100644 --- a/pkgs/applications/audio/csound/default.nix +++ b/pkgs/applications/audio/csound/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, libsndfile, libsamplerate, flex, bison, boost, gettext +{ lib, stdenv, fetchFromGitHub, cmake, libsndfile, libsamplerate, flex, bison, boost, gettext , alsaLib ? null , libpulseaudio ? null , libjack2 ? null @@ -19,8 +19,6 @@ stdenv.mkDerivation rec { # version and remove fluidsynth 1.x from nixpkgs again. version = "6.15.0"; - enableParallelBuilding = true; - hardeningDisable = [ "format" ]; src = fetchFromGitHub { @@ -40,7 +38,7 @@ stdenv.mkDerivation rec { liblo ladspa-sdk fluidsynth eigen curl tcltk fltk ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Sound design, audio synthesis, and signal processing system, providing facilities for music composition and performance on all major operating systems and platforms"; homepage = "http://www.csounds.com/"; license = licenses.gpl2; diff --git a/pkgs/applications/audio/curseradio/default.nix b/pkgs/applications/audio/curseradio/default.nix index 1dd5f9ee5eb2..82f3b130e6ea 100644 --- a/pkgs/applications/audio/curseradio/default.nix +++ b/pkgs/applications/audio/curseradio/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, substituteAll, python3Packages, mpv }: +{ lib, stdenv, fetchFromGitHub, substituteAll, python3Packages, mpv }: python3Packages.buildPythonApplication rec { version = "0.2"; @@ -27,7 +27,7 @@ python3Packages.buildPythonApplication rec { # No tests doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Command line radio player"; homepage = "https://github.com/chronitis/curseradio"; license = licenses.mit; diff --git a/pkgs/applications/audio/deadbeef/default.nix b/pkgs/applications/audio/deadbeef/default.nix index 6b92d1263e33..0259f522d804 100644 --- a/pkgs/applications/audio/deadbeef/default.nix +++ b/pkgs/applications/audio/deadbeef/default.nix @@ -1,4 +1,4 @@ -{ config, stdenv, fetchFromGitHub +{ config, lib, stdenv, fetchFromGitHub , autoconf , automake , libtool @@ -106,7 +106,7 @@ stdenv.mkDerivation rec { ./autogen.sh ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Ultimate Music Player for GNU/Linux"; homepage = "http://deadbeef.sourceforge.net/"; license = licenses.gpl2; diff --git a/pkgs/applications/audio/deadbeef/plugins/headerbar-gtk3.nix b/pkgs/applications/audio/deadbeef/plugins/headerbar-gtk3.nix index 337d570a9353..819192fc1d4a 100644 --- a/pkgs/applications/audio/deadbeef/plugins/headerbar-gtk3.nix +++ b/pkgs/applications/audio/deadbeef/plugins/headerbar-gtk3.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, libxml2, deadbeef, glib, gtk3 }: +{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, libxml2, deadbeef, glib, gtk3 }: stdenv.mkDerivation rec { pname = "deadbeef-headerbar-gtk3-plugin"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { preConfigure = "./autogen.sh"; - meta = with stdenv.lib; { + meta = with lib; { description = "Plug-in that adds GTK 3 header bar to the DeaDBeeF music player"; homepage = "https://github.com/saivert/ddb_misc_headerbar_GTK3"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/audio/deadbeef/plugins/infobar.nix b/pkgs/applications/audio/deadbeef/plugins/infobar.nix index 294d3a0ad8bf..d5894e2fdbc3 100644 --- a/pkgs/applications/audio/deadbeef/plugins/infobar.nix +++ b/pkgs/applications/audio/deadbeef/plugins/infobar.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, deadbeef, gtk3, libxml2 }: +{ lib, stdenv, fetchurl, pkgconfig, deadbeef, gtk3, libxml2 }: stdenv.mkDerivation rec { pname = "deadbeef-infobar-plugin"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { broken = true; # crashes DeaDBeeF and is abandoned (https://bitbucket.org/dsimbiriatin/deadbeef-infobar/issues/38/infobar-causes-deadbeef-180-to-crash) description = "DeaDBeeF Infobar Plugin"; homepage = "https://bitbucket.org/dsimbiriatin/deadbeef-infobar"; diff --git a/pkgs/applications/audio/deadbeef/plugins/lyricbar.nix b/pkgs/applications/audio/deadbeef/plugins/lyricbar.nix index 699f9d86f68d..ad388e23d9f9 100644 --- a/pkgs/applications/audio/deadbeef/plugins/lyricbar.nix +++ b/pkgs/applications/audio/deadbeef/plugins/lyricbar.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, deadbeef, gtkmm3, libxmlxx3 }: +{ lib, stdenv, fetchFromGitHub, pkgconfig, deadbeef, gtkmm3, libxmlxx3 }: stdenv.mkDerivation { pname = "deadbeef-lyricbar-plugin"; @@ -16,7 +16,7 @@ stdenv.mkDerivation { buildFlags = [ "gtk3" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Plugin for DeaDBeeF audio player that fetches and shows the song’s lyrics"; homepage = "https://github.com/C0rn3j/deadbeef-lyricbar"; license = licenses.mit; diff --git a/pkgs/applications/audio/deadbeef/plugins/mpris2.nix b/pkgs/applications/audio/deadbeef/plugins/mpris2.nix index 95606a869b7f..7bc0a4d1fa6f 100644 --- a/pkgs/applications/audio/deadbeef/plugins/mpris2.nix +++ b/pkgs/applications/audio/deadbeef/plugins/mpris2.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, deadbeef, glib }: +{ lib, stdenv, fetchurl, pkgconfig, deadbeef, glib }: stdenv.mkDerivation rec { pname = "deadbeef-mpris2-plugin"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ deadbeef glib ]; - meta = with stdenv.lib; { + meta = with lib; { description = "MPRISv2 plugin for the DeaDBeeF music player"; homepage = "https://github.com/Serranya/deadbeef-mpris2-plugin/"; license = licenses.gpl2; diff --git a/pkgs/applications/audio/denemo/default.nix b/pkgs/applications/audio/denemo/default.nix index 313c7cbfd42f..ea152b59a507 100644 --- a/pkgs/applications/audio/denemo/default.nix +++ b/pkgs/applications/audio/denemo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig +{ lib, stdenv, fetchurl, pkgconfig , libjack2, gettext, intltool, guile_2_0, lilypond , glib, libxml2, librsvg, libsndfile, aubio , gtk3, gtksourceview, evince, fluidsynth, rubberband @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { pkgconfig ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Music notation and composition software used with lilypond"; homepage = "http://denemo.org"; license = licenses.gpl3; diff --git a/pkgs/applications/audio/dfasma/default.nix b/pkgs/applications/audio/dfasma/default.nix index 6df4679d1d5f..20a1044fe24d 100644 --- a/pkgs/applications/audio/dfasma/default.nix +++ b/pkgs/applications/audio/dfasma/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, stdenv, fetchFromGitHub, fftw, libsndfile, qtbase, qtmultimedia, qmake }: +{ mkDerivation, lib, stdenv, fetchFromGitHub, fftw, libsndfile, qtbase, qtmultimedia, qmake }: let @@ -9,7 +9,7 @@ let repo = "REAPER"; owner = "gillesdegottex"; }; - meta = with stdenv.lib; { + meta = with lib; { license = licenses.asl20; }; }; @@ -21,7 +21,7 @@ let repo = "libqaudioextra"; owner = "gillesdegottex"; }; - meta = with stdenv.lib; { + meta = with lib; { license = licenses.gpl3Plus; }; }; @@ -49,7 +49,7 @@ in mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Analyse and compare audio files in time and frequency"; longDescription = '' DFasma is free open-source software to compare audio files by time and diff --git a/pkgs/applications/audio/dirt/default.nix b/pkgs/applications/audio/dirt/default.nix index 5e0cf3616fe5..333c1d08b3aa 100644 --- a/pkgs/applications/audio/dirt/default.nix +++ b/pkgs/applications/audio/dirt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libsndfile, libsamplerate, liblo, libjack2 }: +{ lib, stdenv, fetchFromGitHub, libsndfile, libsamplerate, liblo, libjack2 }: stdenv.mkDerivation { name = "dirt-2018-01-01"; @@ -19,7 +19,7 @@ stdenv.mkDerivation { cp -r samples $out/share/dirt/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "An unimpressive thingie for playing bits of samples with some level of accuracy"; homepage = "https://github.com/tidalcycles/Dirt"; license = licenses.gpl3; diff --git a/pkgs/applications/audio/distrho/default.nix b/pkgs/applications/audio/distrho/default.nix index e39cef3fb0e4..a217e4709548 100644 --- a/pkgs/applications/audio/distrho/default.nix +++ b/pkgs/applications/audio/distrho/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , alsaLib , fetchFromGitHub , freetype @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { libXrender ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://distrho.sourceforge.net/ports"; description = "Linux audio plugins and LV2 ports"; longDescription = '' diff --git a/pkgs/applications/audio/dr14_tmeter/default.nix b/pkgs/applications/audio/dr14_tmeter/default.nix index 272701b36804..92e6eb2b3236 100644 --- a/pkgs/applications/audio/dr14_tmeter/default.nix +++ b/pkgs/applications/audio/dr14_tmeter/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python3Packages, pkgs }: +{ lib, stdenv, fetchFromGitHub, python3Packages, pkgs }: python3Packages.buildPythonApplication rec { pname = "dr14_tmeter"; @@ -20,7 +20,7 @@ python3Packages.buildPythonApplication rec { # There are no tests doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Compute the DR14 of a given audio file according to the procedure described by the Pleasurize Music Foundation"; license = licenses.gpl3Plus; homepage = "http://dr14tmeter.sourceforge.net/"; diff --git a/pkgs/applications/audio/dragonfly-reverb/default.nix b/pkgs/applications/audio/dragonfly-reverb/default.nix index e5cbcd4a2e20..0ada1dfeaa6f 100644 --- a/pkgs/applications/audio/dragonfly-reverb/default.nix +++ b/pkgs/applications/audio/dragonfly-reverb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libjack2, libGL, pkgconfig, xorg }: +{ lib, stdenv, fetchFromGitHub, libjack2, libGL, pkgconfig, xorg }: stdenv.mkDerivation rec { pname = "dragonfly-reverb"; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/michaelwillis/dragonfly-reverb"; description = "A hall-style reverb based on freeverb3 algorithms"; maintainers = [ maintainers.magnetophon ]; diff --git a/pkgs/applications/audio/drumgizmo/default.nix b/pkgs/applications/audio/drumgizmo/default.nix index 9e24c4a1c295..f69e101877bc 100644 --- a/pkgs/applications/audio/drumgizmo/default.nix +++ b/pkgs/applications/audio/drumgizmo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, alsaLib, expat, glib, libjack2, libXext, libX11, libpng +{ lib, stdenv, fetchurl, fetchpatch, alsaLib, expat, glib, libjack2, libXext, libX11, libpng , libpthreadstubs, libsmf, libsndfile, lv2, pkgconfig, zita-resampler }: @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { libsmf libsndfile lv2 pkgconfig zita-resampler ]; - meta = with stdenv.lib; { + meta = with lib; { description = "An LV2 sample based drum plugin"; homepage = "https://www.drumgizmo.org"; license = licenses.lgpl3; diff --git a/pkgs/applications/audio/dsf2flac/default.nix b/pkgs/applications/audio/dsf2flac/default.nix index 031203dda756..db07acf7c36c 100644 --- a/pkgs/applications/audio/dsf2flac/default.nix +++ b/pkgs/applications/audio/dsf2flac/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, boost, flac, id3lib, pkg-config +{ lib, stdenv, fetchFromGitHub, autoreconfHook, boost, flac, id3lib, pkg-config , taglib, zlib }: stdenv.mkDerivation rec { @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A DSD to FLAC transcoding tool"; homepage = "https://github.com/hank/dsf2flac"; license = licenses.gpl2; diff --git a/pkgs/applications/audio/easytag/default.nix b/pkgs/applications/audio/easytag/default.nix index 3f294342da70..5ea0871b62b0 100644 --- a/pkgs/applications/audio/easytag/default.nix +++ b/pkgs/applications/audio/easytag/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk3, glib, libid3tag, id3lib, taglib +{ lib, stdenv, fetchurl, pkgconfig, intltool, gtk3, glib, libid3tag, id3lib, taglib , libvorbis, libogg, opusfile, flac, itstool, libxml2, gsettings-desktop-schemas , gnome3, wrapGAppsHook }: @@ -31,7 +31,7 @@ in stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "View and edit tags for various audio files"; homepage = "https://wiki.gnome.org/Apps/EasyTAG"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/audio/ecasound/default.nix b/pkgs/applications/audio/ecasound/default.nix index adb6f6b74274..505e5a604ca2 100644 --- a/pkgs/applications/audio/ecasound/default.nix +++ b/pkgs/applications/audio/ecasound/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchurl +, pkg-config , alsaLib , audiofile , libjack2 @@ -9,9 +10,14 @@ , libsndfile , lilv , lv2 +, ncurses +, readline }: -# TODO: fix readline, ncurses, lilv, liblo, liboil and python. See configure log. +# TODO: fix python. See configure log. +# fix -Dnullptr=0 cludge below. +# The error is +# /nix/store/*-lilv-0.24.10/include/lilv-0/lilv/lilvmm.hpp:272:53: error: 'nullptr' was not declared in this scope stdenv.mkDerivation rec { pname = "ecasound"; @@ -22,7 +28,34 @@ stdenv.mkDerivation rec { sha256 = "1m7njfjdb7sqf0lhgc4swihgdr4snkg8v02wcly08wb5ar2fr2s6"; }; - buildInputs = [ alsaLib audiofile libjack2 liblo liboil libsamplerate libsndfile lilv lv2 ]; + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + alsaLib + audiofile + libjack2 + liblo + liboil + libsamplerate + libsndfile + lilv + lv2 + ncurses + readline + ]; + + strictDeps = true; + + configureFlags = "--enable-liblilv --with-extra-cppflags=-Dnullptr=0"; + + postPatch = '' + sed -i -e ' + s@^#include @#include @ + s@^#include @#include @ + ' ecasound/eca-curses.cpp + ''; meta = { description = "Software package designed for multitrack audio processing"; diff --git a/pkgs/applications/audio/ekho/default.nix b/pkgs/applications/audio/ekho/default.nix index 0e2c950051a5..86bf4faaa173 100644 --- a/pkgs/applications/audio/ekho/default.nix +++ b/pkgs/applications/audio/ekho/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig +{ lib, stdenv, fetchurl, pkgconfig , libsndfile, libpulseaudio }: @@ -8,7 +8,7 @@ in stdenv.mkDerivation rec { pname = "ekho"; inherit version; - meta = with stdenv.lib; { + meta = with lib; { description = "Chinese text-to-speech software"; homepage = "http://www.eguidedog.net/ekho.php"; longDescription = '' diff --git a/pkgs/applications/audio/ensemble-chorus/default.nix b/pkgs/applications/audio/ensemble-chorus/default.nix index e2413a4fe87f..65dac936a386 100644 --- a/pkgs/applications/audio/ensemble-chorus/default.nix +++ b/pkgs/applications/audio/ensemble-chorus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fltk, alsaLib, freetype, libXrandr, libXinerama, libXcursor, lv2, libjack2, cmake, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, fltk, alsaLib, freetype, libXrandr, libXinerama, libXcursor, lv2, libjack2, cmake, pkgconfig }: stdenv.mkDerivation rec { pname = "ensemble-chorus"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { fltk alsaLib freetype libXrandr libXinerama libXcursor lv2 libjack2 ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/jpcima/ensemble-chorus"; description = "Digital model of electronic string ensemble chorus"; maintainers = [ maintainers.magnetophon ]; diff --git a/pkgs/applications/audio/eq10q/default.nix b/pkgs/applications/audio/eq10q/default.nix index c614b96f6385..6c627c835ae5 100644 --- a/pkgs/applications/audio/eq10q/default.nix +++ b/pkgs/applications/audio/eq10q/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, cmake, fftw, gtkmm2, libxcb, lv2, pkgconfig +{ stdenv, fetchurl, fetchpatch, cmake, fftw, gtkmm2, libxcb, lv2, pkg-config , xorg }: stdenv.mkDerivation rec { pname = "eq10q"; @@ -8,8 +8,8 @@ stdenv.mkDerivation rec { sha256 = "16mhcav8gwkp29k9ki4dlkajlcgh1i2wvldabxb046d37dq4qzrk"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake fftw gtkmm2 libxcb lv2 xorg.libpthreadstubs xorg.libXdmcp xorg.libxshmfence ]; + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ fftw gtkmm2 libxcb lv2 xorg.libpthreadstubs xorg.libXdmcp xorg.libxshmfence ]; patches = [ (fetchpatch { diff --git a/pkgs/applications/audio/espeak-ng/default.nix b/pkgs/applications/audio/espeak-ng/default.nix index a284be438325..720e1d4484a4 100644 --- a/pkgs/applications/audio/espeak-ng/default.nix +++ b/pkgs/applications/audio/espeak-ng/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { patchelf --set-rpath "$(patchelf --print-rpath $out/bin/espeak-ng)" $out/bin/speak-ng ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Open source speech synthesizer that supports over 70 languages, based on eSpeak"; homepage = "https://github.com/espeak-ng/espeak-ng"; changelog = "https://github.com/espeak-ng/espeak-ng/blob/${version}/CHANGELOG.md"; diff --git a/pkgs/applications/audio/espeak/default.nix b/pkgs/applications/audio/espeak/default.nix index aa68fd5363d6..b155c1c41b60 100644 --- a/pkgs/applications/audio/espeak/default.nix +++ b/pkgs/applications/audio/espeak/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, portaudio }: +{ lib, stdenv, fetchurl, unzip, portaudio }: stdenv.mkDerivation rec { name = "espeak-1.48.04"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { makeFlags="PREFIX=$out DATADIR=$out/share/espeak-data" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Compact open source software speech synthesizer"; homepage = "http://espeak.sourceforge.net/"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/audio/espeak/edit.nix b/pkgs/applications/audio/espeak/edit.nix index 6bcffcbc5c34..e027bb03cfca 100644 --- a/pkgs/applications/audio/espeak/edit.nix +++ b/pkgs/applications/audio/espeak/edit.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, unzip, portaudio, wxGTK, sox }: +{ lib, stdenv, fetchurl, pkgconfig, unzip, portaudio, wxGTK, sox }: stdenv.mkDerivation rec { name = "espeakedit-1.48.03"; @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { cp src/espeakedit "$out/bin" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Phoneme editor for espeak"; homepage = "http://espeak.sourceforge.net/"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/audio/eteroj.lv2/default.nix b/pkgs/applications/audio/eteroj.lv2/default.nix index c86e7b5e9ba1..ee95ce43ff52 100644 --- a/pkgs/applications/audio/eteroj.lv2/default.nix +++ b/pkgs/applications/audio/eteroj.lv2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, libuv, lv2 }: +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, libuv, lv2 }: stdenv.mkDerivation rec { pname = "eteroj.lv2"; @@ -12,9 +12,9 @@ stdenv.mkDerivation rec { }; buildInputs = [ libuv lv2 ]; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; - meta = with stdenv.lib; { + meta = with lib; { description = "OSC injection/ejection from/to UDP/TCP/Serial for LV2"; homepage = "https://open-music-kontrollers.ch/lv2/eteroj"; license = licenses.artistic2; diff --git a/pkgs/applications/audio/faust/faust1.nix b/pkgs/applications/audio/faust/faust1.nix index 16956433655c..efa97738d3c3 100644 --- a/pkgs/applications/audio/faust/faust1.nix +++ b/pkgs/applications/audio/faust/faust1.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , coreutils , fetchurl , makeWrapper @@ -16,7 +16,7 @@ let sha256 = "0d1fqwymyfb73zkmpwv4zk4gsg4ji7qs20mfsr20skmnqx30xvna"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://faust.grame.fr/"; downloadPage = "https://sourceforge.net/projects/faudiostream/files/"; license = licenses.gpl2; diff --git a/pkgs/applications/audio/faust/faust2.nix b/pkgs/applications/audio/faust/faust2.nix index 1c096374a42b..4c0229e8f34e 100644 --- a/pkgs/applications/audio/faust/faust2.nix +++ b/pkgs/applications/audio/faust/faust2.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , coreutils , fetchFromGitHub , makeWrapper @@ -30,7 +30,7 @@ let fetchSubmodules = true; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://faust.grame.fr/"; downloadPage = "https://github.com/grame-cncm/faust/"; license = licenses.gpl2; diff --git a/pkgs/applications/audio/faust/faustlive.nix b/pkgs/applications/audio/faust/faustlive.nix index 907ea3ed7caf..852a4d68e6a6 100644 --- a/pkgs/applications/audio/faust/faustlive.nix +++ b/pkgs/applications/audio/faust/faustlive.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , llvm, qt48Full, qrencode, libmicrohttpd_0_9_70, libjack2, alsaLib, faust, curl , bc, coreutils, which, libsndfile, pkg-config }: @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { install rsrc/FaustLive.desktop "$out/share/applications" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A standalone just-in-time Faust compiler"; longDescription = '' FaustLive is a standalone just-in-time Faust compiler. It tries to bring diff --git a/pkgs/applications/audio/fdkaac/default.nix b/pkgs/applications/audio/fdkaac/default.nix index 8969f3a47b23..31b009c41333 100644 --- a/pkgs/applications/audio/fdkaac/default.nix +++ b/pkgs/applications/audio/fdkaac/default.nix @@ -1,4 +1,4 @@ -{ stdenv, autoreconfHook, fetchFromGitHub, fdk_aac }: +{ lib, stdenv, autoreconfHook, fetchFromGitHub, fdk_aac }: stdenv.mkDerivation rec { pname = "fdkaac"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Command line encoder frontend for libfdk-aac encder"; longDescription = '' fdkaac reads linear PCM audio in either WAV, raw PCM, or CAF format, diff --git a/pkgs/applications/audio/flac/default.nix b/pkgs/applications/audio/flac/default.nix index bd8b9bea82b7..b4e4af9f5169 100644 --- a/pkgs/applications/audio/flac/default.nix +++ b/pkgs/applications/audio/flac/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libogg }: +{ lib, stdenv, fetchurl, libogg }: stdenv.mkDerivation rec { name = "flac-1.3.3"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "out" "man" "doc" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://xiph.org/flac/"; description = "Library and tools for encoding and decoding the FLAC lossless audio file format"; platforms = platforms.all; diff --git a/pkgs/applications/audio/flac123/default.nix b/pkgs/applications/audio/flac123/default.nix index 6f13b710effc..09c7b44d92dd 100644 --- a/pkgs/applications/audio/flac123/default.nix +++ b/pkgs/applications/audio/flac123/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, flac, libao, libogg, popt }: +{ lib, stdenv, fetchurl, autoreconfHook, flac, libao, libogg, popt }: stdenv.mkDerivation rec { pname = "flac123"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ flac libao libogg popt ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://flac-tools.sourceforge.net/"; description = "A command-line program for playing FLAC audio files"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/audio/flacon/default.nix b/pkgs/applications/audio/flacon/default.nix index aaa0712c42fd..b9750dd649ae 100644 --- a/pkgs/applications/audio/flacon/default.nix +++ b/pkgs/applications/audio/flacon/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { --prefix PATH : "$bin_path"; ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Extracts audio tracks from an audio CD image to separate tracks"; homepage = "https://flacon.github.io/"; diff --git a/pkgs/applications/audio/fomp/default.nix b/pkgs/applications/audio/fomp/default.nix index a712eef06501..006dbaf79803 100644 --- a/pkgs/applications/audio/fomp/default.nix +++ b/pkgs/applications/audio/fomp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, lv2, pkgconfig, python2, wafHook }: +{ lib, stdenv, fetchurl, lv2, pkgconfig, python2, wafHook }: stdenv.mkDerivation rec { pname = "fomp"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig wafHook ]; buildInputs = [ lv2 python2 ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://drobilla.net/software/fomp/"; description = "An LV2 port of the MCP, VCO, FIL, and WAH plugins by Fons Adriaensen"; license = licenses.gpl2; diff --git a/pkgs/applications/audio/foo-yc20/default.nix b/pkgs/applications/audio/foo-yc20/default.nix index 4ec69c62b1ae..6f91f1e19774 100644 --- a/pkgs/applications/audio/foo-yc20/default.nix +++ b/pkgs/applications/audio/foo-yc20/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libjack2, gtk2, lv2, faust, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, libjack2, gtk2, lv2, faust, pkgconfig }: stdenv.mkDerivation { version = "git-2015-05-21"; @@ -18,7 +18,7 @@ stdenv.mkDerivation { # remove lv2 until https://github.com/sampov2/foo-yc20/issues/6 is resolved postInstallFixup = "rm -rf $out/lib/lv2"; - meta = with stdenv.lib; { + meta = with lib; { broken = true; # see: https://github.com/sampov2/foo-yc20/issues/7 description = "A Faust implementation of a 1969 designed Yamaha combo organ, the YC-20"; homepage = "https://github.com/sampov2/foo-yc20"; diff --git a/pkgs/applications/audio/freqtweak/default.nix b/pkgs/applications/audio/freqtweak/default.nix index 046c8c8aac8a..113894a9357d 100644 --- a/pkgs/applications/audio/freqtweak/default.nix +++ b/pkgs/applications/audio/freqtweak/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, pkg-config, fftwFloat, libjack2, libsigcxx, libxml2, wxGTK }: +{ lib, stdenv, fetchFromGitHub, autoconf, automake, pkg-config, fftwFloat, libjack2, libsigcxx, libxml2, wxGTK }: stdenv.mkDerivation rec { pname = "freqtweak"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = http://essej.net/freqtweak/; description = "Realtime audio frequency spectral manipulation"; maintainers = [ maintainers.magnetophon ]; diff --git a/pkgs/applications/audio/ft2-clone/default.nix b/pkgs/applications/audio/ft2-clone/default.nix index 7045d6811d38..b231b4a69ed2 100644 --- a/pkgs/applications/audio/ft2-clone/default.nix +++ b/pkgs/applications/audio/ft2-clone/default.nix @@ -1,33 +1,55 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , cmake , nixosTests , alsaLib , SDL2 , libiconv +, CoreAudio +, CoreMIDI +, CoreServices +, Cocoa }: stdenv.mkDerivation rec { pname = "ft2-clone"; - version = "1.41_fix"; + version = "1.42"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "ft2-clone"; rev = "v${version}"; - sha256 = "0c7jli79ckachl5n2rbhc4yzml8nc36pl9yzxcwgaz544q8pzmaa"; + sha256 = "0w3c1rgm8qlqi50gavrcjz40xb0nkis4i9mvpwmvzmdv9nipxry9"; }; + # Adapt the linux-only CMakeLists to darwin (more reliable than make-macos.sh) + postPatch = stdenv.lib.optionalString stdenv.isDarwin '' + sed -i -e 's@__LINUX_ALSA__@__MACOSX_CORE__@' -e 's@asound@@' CMakeLists.txt + ''; + nativeBuildInputs = [ cmake ]; buildInputs = [ SDL2 ] ++ stdenv.lib.optional stdenv.isLinux alsaLib - ++ stdenv.lib.optional stdenv.isDarwin libiconv; + ++ stdenv.lib.optionals stdenv.isDarwin [ + libiconv + CoreAudio + CoreMIDI + CoreServices + Cocoa + ]; + + NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin [ + "-framework CoreAudio" + "-framework CoreMIDI" + "-framework CoreServices" + "-framework Cocoa" + ]; passthru.tests = { ft2-clone-starts = nixosTests.ft2-clone; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A highly accurate clone of the classic Fasttracker II software for MS-DOS"; homepage = "https://16-bits.org/ft2.php"; license = licenses.bsd3; diff --git a/pkgs/applications/audio/fverb/default.nix b/pkgs/applications/audio/fverb/default.nix index 289553795743..2cd723b73bc9 100644 --- a/pkgs/applications/audio/fverb/default.nix +++ b/pkgs/applications/audio/fverb/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , pkg-config }: @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { patchShebangs ./dpf/utils/generate-ttl.sh ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A stereo variant of the reverberator by Jon Dattorro, for lv2"; homepage = "https://github.com/jpcima/fverb"; license = licenses.bsd2; diff --git a/pkgs/applications/audio/game-music-emu/default.nix b/pkgs/applications/audio/game-music-emu/default.nix index 51f895ea2d5f..a2aebc58a825 100644 --- a/pkgs/applications/audio/game-music-emu/default.nix +++ b/pkgs/applications/audio/game-music-emu/default.nix @@ -1,21 +1,21 @@ -{ stdenv, fetchurl, cmake }: +{ lib, stdenv, fetchurl, cmake }: stdenv.mkDerivation rec { - version = "0.6.1"; + version = "0.6.3"; pname = "game-music-emu"; src = fetchurl { - url = "https://bitbucket.org/mpyne/game-music-emu/downloads/${pname}-${version}.tar.bz2"; - sha256 = "08fk7zddpn7v93d0fa7fcypx7hvgwx9b5psj9l6m8b87k2hbw4fw"; + url = "https://bitbucket.org/mpyne/game-music-emu/downloads/${pname}-${version}.tar.xz"; + sha256 = "07857vdkak306d9s5g6fhmjyxk7vijzjhkmqb15s7ihfxx9lx8xb"; }; - buildInputs = [ cmake ]; + nativeBuildInputs = [ cmake ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://bitbucket.org/mpyne/game-music-emu/wiki/Home"; description = "A collection of video game music file emulators"; license = licenses.lgpl21Plus; platforms = platforms.all; - maintainers = [ ]; + maintainers = with maintainers; [ luc65r ]; }; } diff --git a/pkgs/applications/audio/gbsplay/default.nix b/pkgs/applications/audio/gbsplay/default.nix index f89b8ed399b4..7cee125f6e7d 100644 --- a/pkgs/applications/audio/gbsplay/default.nix +++ b/pkgs/applications/audio/gbsplay/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libpulseaudio }: +{ lib, stdenv, fetchFromGitHub, libpulseaudio }: stdenv.mkDerivation { name = "gbsplay-2016-12-17"; @@ -19,7 +19,7 @@ stdenv.mkDerivation { makeFlags = [ "tests=" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "gameboy sound player"; license = licenses.gpl1; platforms = ["i686-linux" "x86_64-linux"]; diff --git a/pkgs/applications/audio/geonkick/default.nix b/pkgs/applications/audio/geonkick/default.nix index 804aaf75febe..6812cb4ef0fb 100644 --- a/pkgs/applications/audio/geonkick/default.nix +++ b/pkgs/applications/audio/geonkick/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchFromGitLab, cmake, pkg-config, redkite, libsndfile, rapidjson +{ lib, stdenv, fetchFromGitLab, cmake, pkg-config, redkite, libsndfile, rapidjson , libjack2, lv2, libX11, cairo }: stdenv.mkDerivation rec { pname = "geonkick"; - version = "2.5.1"; + version = "2.6.1"; src = fetchFromGitLab { owner = "iurie-sw"; repo = pname; rev = "v${version}"; - sha256 = "14svwrxqw15j6wjy3x8s28yyrafa31bm7d1ns5h6gvpndccwc1kw"; + sha256 = "1l647j11pb9lkknnh4q99mmfcvr644b02lfcdjh98z60vqm1s54c"; }; nativeBuildInputs = [ cmake pkg-config ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { "-DCMAKE_INSTALL_LIBDIR=lib" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://gitlab.com/iurie-sw/geonkick"; description = "A free software percussion synthesizer"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/audio/giada/default.nix b/pkgs/applications/audio/giada/default.nix index 1408deba97d3..c9b3216edef9 100644 --- a/pkgs/applications/audio/giada/default.nix +++ b/pkgs/applications/audio/giada/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , autoreconfHook , fltk @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { src/core/{conf,init,midiMapConf,patch}.cpp ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A free, minimal, hardcore audio tool for DJs, live performers and electronic musicians"; homepage = "https://giadamusic.com/"; license = licenses.gpl3; diff --git a/pkgs/applications/audio/gigedit/default.nix b/pkgs/applications/audio/gigedit/default.nix index 08eec3135081..a97d1d3516f0 100644 --- a/pkgs/applications/audio/gigedit/default.nix +++ b/pkgs/applications/audio/gigedit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoconf, automake, intltool, libtool, pkgconfig, which +{ lib, stdenv, fetchurl, autoconf, automake, intltool, libtool, pkgconfig, which , docbook_xml_dtd_45, docbook_xsl, gtkmm2, libgig, libsndfile, libxslt }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.linuxsampler.org"; description = "Gigasampler file access library"; license = licenses.gpl2; diff --git a/pkgs/applications/audio/gjay/default.nix b/pkgs/applications/audio/gjay/default.nix index 9e016c68608b..f2ba8ab3bfa9 100644 --- a/pkgs/applications/audio/gjay/default.nix +++ b/pkgs/applications/audio/gjay/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, mpd_clientlib, dbus-glib, audacious, gtk2, gsl +{ lib, stdenv, fetchurl, pkgconfig, mpd_clientlib, dbus-glib, audacious, gtk2, gsl , libaudclient }: stdenv.mkDerivation { @@ -15,7 +15,7 @@ stdenv.mkDerivation { hardeningDisable = [ "format" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Generates playlists such that each song sounds good following the previous song"; homepage = "http://gjay.sourceforge.net/"; license = licenses.gpl2; diff --git a/pkgs/applications/audio/gmpc/default.nix b/pkgs/applications/audio/gmpc/default.nix index 7ae02ae38d85..d3d0d5fcd0a1 100644 --- a/pkgs/applications/audio/gmpc/default.nix +++ b/pkgs/applications/audio/gmpc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libtool, intltool, pkgconfig, glib +{ lib, stdenv, fetchurl, libtool, intltool, pkgconfig, glib , gtk2, curl, mpd_clientlib, libsoup, gob2, vala, libunique , libSM, libICE, sqlite, hicolor-icon-theme, wrapGAppsHook }: @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { libunique libmpd libSM libICE sqlite hicolor-icon-theme ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://gmpclient.org"; description = "A GTK2 frontend for Music Player Daemon"; license = licenses.gpl2; diff --git a/pkgs/applications/audio/gnome-podcasts/default.nix b/pkgs/applications/audio/gnome-podcasts/default.nix index da51f105075a..8686150c08ad 100644 --- a/pkgs/applications/audio/gnome-podcasts/default.nix +++ b/pkgs/applications/audio/gnome-podcasts/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , rustPlatform , fetchFromGitLab , fetchpatch @@ -72,7 +72,7 @@ rustPlatform.buildRustPackage rec { patchShebangs scripts/compile-gschema.py scripts/cargo.sh scripts/test.sh ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Listen to your favorite podcasts"; homepage = "https://wiki.gnome.org/Apps/Podcasts"; license = licenses.gpl3; diff --git a/pkgs/applications/audio/google-musicmanager/default.nix b/pkgs/applications/audio/google-musicmanager/default.nix index b4fe78dcbfcd..a202b3ad2806 100644 --- a/pkgs/applications/audio/google-musicmanager/default.nix +++ b/pkgs/applications/audio/google-musicmanager/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , flac, expat, libidn, qtbase, qtwebkit, libvorbis }: assert stdenv.hostPlatform.system == "x86_64-linux"; @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { $out/opt/google/musicmanager/MusicManager ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Uploads music from your computer to Google Play"; homepage = "https://support.google.com/googleplay/answer/1229970"; license = licenses.unfree; diff --git a/pkgs/applications/audio/gpodder/default.nix b/pkgs/applications/audio/gpodder/default.nix index b153298d978b..082630269595 100644 --- a/pkgs/applications/audio/gpodder/default.nix +++ b/pkgs/applications/audio/gpodder/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python3, python3Packages, intltool +{ lib, stdenv, fetchFromGitHub, python3, python3Packages, intltool , glibcLocales, gnome3, gtk3, wrapGAppsHook , gobject-introspection }: @@ -67,7 +67,7 @@ python3Packages.buildPythonApplication rec { LC_ALL=C PYTHONPATH=./src:$PYTHONPATH python3 -m gpodder.unittests ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A podcatcher written in python"; longDescription = '' gPodder downloads and manages free audio and video content (podcasts) diff --git a/pkgs/applications/audio/gradio/default.nix b/pkgs/applications/audio/gradio/default.nix index 384235fc0650..f9fda0fe7bd3 100644 --- a/pkgs/applications/audio/gradio/default.nix +++ b/pkgs/applications/audio/gradio/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig +{ lib, stdenv, fetchFromGitHub, pkgconfig , python3 , gsettings-desktop-schemas , desktop-file-utils @@ -62,7 +62,7 @@ in stdenv.mkDerivation { patches = [ ./0001-Remove-post-install-script-that-hardcodes-paths.patch ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/haecker-felix/gradio"; description = "A GTK3 app for finding and listening to internet radio stations"; license = licenses.gpl3; diff --git a/pkgs/applications/audio/greg/default.nix b/pkgs/applications/audio/greg/default.nix index c243a81ac2eb..46e1baed07d3 100644 --- a/pkgs/applications/audio/greg/default.nix +++ b/pkgs/applications/audio/greg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pythonPackages }: +{ lib, stdenv, fetchFromGitHub, pythonPackages }: with pythonPackages; buildPythonApplication rec { pname = "greg"; @@ -15,7 +15,7 @@ with pythonPackages; buildPythonApplication rec { propagatedBuildInputs = [ setuptools feedparser ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/manolomartinez/greg"; description = "A command-line podcast aggregator"; license = licenses.gpl3; diff --git a/pkgs/applications/audio/gtkpod/default.nix b/pkgs/applications/audio/gtkpod/default.nix index 1f293fe2d796..c504f19de393 100644 --- a/pkgs/applications/audio/gtkpod/default.nix +++ b/pkgs/applications/audio/gtkpod/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, wrapGAppsHook, intltool, libgpod, curl, flac, +{ lib, stdenv, fetchurl, pkgconfig, wrapGAppsHook, intltool, libgpod, curl, flac, gnome3, gtk3, gettext, perlPackages, flex, libid3tag, gdl, libvorbis, gdk-pixbuf }: @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "GTK Manager for an Apple ipod"; homepage = "http://gtkpod.sourceforge.net"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/audio/guitarix/default.nix b/pkgs/applications/audio/guitarix/default.nix index d74f1c8728f5..41c7db959e0b 100644 --- a/pkgs/applications/audio/guitarix/default.nix +++ b/pkgs/applications/audio/guitarix/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , avahi , bluez @@ -100,7 +100,7 @@ stdenv.mkDerivation rec { "--install-roboto-font" ] ++ optional optimizationSupport "--optimization"; - meta = with stdenv.lib; { + meta = with lib; { description = "A virtual guitar amplifier for Linux running with JACK"; longDescription = '' guitarix is a virtual guitar amplifier for Linux running with diff --git a/pkgs/applications/audio/gwc/default.nix b/pkgs/applications/audio/gwc/default.nix index d9631ac45e6b..d6e7c0807a37 100644 --- a/pkgs/applications/audio/gwc/default.nix +++ b/pkgs/applications/audio/gwc/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , autoreconfHook , pkg-config @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = false; # Fails to generate machine.h in time. - meta = with stdenv.lib; { + meta = with lib; { description = "GUI application for removing noise (hiss, pops and clicks) from audio files"; homepage = "https://github.com/AlisterH/gwc/"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/audio/gxmatcheq-lv2/default.nix b/pkgs/applications/audio/gxmatcheq-lv2/default.nix index b2d99e0eba86..42e5cd726c73 100644 --- a/pkgs/applications/audio/gxmatcheq-lv2/default.nix +++ b/pkgs/applications/audio/gxmatcheq-lv2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, xorg, xorgproto, cairo, lv2, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, xorg, xorgproto, cairo, lv2, pkgconfig }: stdenv.mkDerivation rec { pname = "GxMatchEQ.lv2"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { installFlags = [ "INSTALL_DIR=$(out)/lib/lv2" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/brummer10/GxMatchEQ.lv2"; description = "Matching Equalizer to apply EQ curve from one source to another source"; maintainers = [ maintainers.magnetophon ]; diff --git a/pkgs/applications/audio/gxplugins-lv2/default.nix b/pkgs/applications/audio/gxplugins-lv2/default.nix index fa80611fc280..9201ff730d90 100644 --- a/pkgs/applications/audio/gxplugins-lv2/default.nix +++ b/pkgs/applications/audio/gxplugins-lv2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, xorg, xorgproto, cairo, lv2, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, xorg, xorgproto, cairo, lv2, pkgconfig }: stdenv.mkDerivation rec { pname = "GxPlugins.lv2"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/brummer10/GxPlugins.lv2"; description = "A set of extra lv2 plugins from the guitarix project"; maintainers = [ maintainers.magnetophon ]; diff --git a/pkgs/applications/audio/helio-workstation/default.nix b/pkgs/applications/audio/helio-workstation/default.nix index a4f586712831..980b312ba6c4 100644 --- a/pkgs/applications/audio/helio-workstation/default.nix +++ b/pkgs/applications/audio/helio-workstation/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , alsaLib, freetype, xorg, curl, libGL, libjack2, gnome3 , pkgconfig, makeWrapper }: @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { --replace "/usr/bin/helio" "$out/bin/Helio" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "One music sequencer for all major platforms, both desktop and mobile"; homepage = "https://helio.fm/"; license = licenses.gpl3Only; diff --git a/pkgs/applications/audio/helm/default.nix b/pkgs/applications/audio/helm/default.nix index 145ba68b08b1..d20bbb8e573d 100644 --- a/pkgs/applications/audio/helm/default.nix +++ b/pkgs/applications/audio/helm/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , fetchpatch , xorg @@ -52,7 +52,7 @@ make DESTDIR="$out" install ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://tytel.org/helm"; description = "A free, cross-platform, polyphonic synthesizer"; longDescription = '' diff --git a/pkgs/applications/audio/hybridreverb2/default.nix b/pkgs/applications/audio/hybridreverb2/default.nix index 831df6ba3c8d..a8bb81de717b 100644 --- a/pkgs/applications/audio/hybridreverb2/default.nix +++ b/pkgs/applications/audio/hybridreverb2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchzip, cmake, pkgconfig, lv2, alsaLib, libjack2, +{ lib, stdenv, fetchFromGitHub, fetchzip, cmake, pkgconfig, lv2, alsaLib, libjack2, freetype, libX11, gtk3, pcre, libpthreadstubs, libXdmcp, libxkbcommon, epoxy, at-spi2-core, dbus, curl, fftwFloat }: @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { cp -r ${impulseDB}/* $out/share/${pname}/ ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www2.ika.ruhr-uni-bochum.de/HybridReverb2"; description = "Reverb effect using hybrid impulse convolution"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/audio/hydrogen/0.nix b/pkgs/applications/audio/hydrogen/0.nix index b3aff4e4c509..774b2a934471 100644 --- a/pkgs/applications/audio/hydrogen/0.nix +++ b/pkgs/applications/audio/hydrogen/0.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, cmake +{ lib, stdenv, fetchurl, pkgconfig, cmake , alsaLib, boost, glib, lash, libjack2, libarchive, libsndfile, lrdf, qt4 }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { alsaLib boost glib lash libjack2 libarchive libsndfile lrdf qt4 ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Advanced drum machine"; homepage = "http://www.hydrogen-music.org"; license = licenses.gpl2; diff --git a/pkgs/applications/audio/hydrogen/default.nix b/pkgs/applications/audio/hydrogen/default.nix index c6d307e2c163..728f0e90a990 100644 --- a/pkgs/applications/audio/hydrogen/default.nix +++ b/pkgs/applications/audio/hydrogen/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, wrapQtAppsHook +{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, wrapQtAppsHook , alsaLib, ladspa-sdk, lash, libarchive, libjack2, liblo, libpulseaudio, libsndfile, lrdf , qtbase, qttools, qtxmlpatterns }: @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { "-DWANT_DEBUG=OFF" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Advanced drum machine"; homepage = "http://www.hydrogen-music.org"; license = licenses.gpl2; diff --git a/pkgs/applications/audio/id3v2/default.nix b/pkgs/applications/audio/id3v2/default.nix index 75d999ede1d7..f6c88bc456e9 100644 --- a/pkgs/applications/audio/id3v2/default.nix +++ b/pkgs/applications/audio/id3v2/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, id3lib, groff, zlib}: +{lib, stdenv, fetchurl, id3lib, groff, zlib}: stdenv.mkDerivation rec { pname = "id3v2"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { mkdir -p $out/{bin,share/man/man1} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A command line editor for id3v2 tags"; homepage = "http://id3v2.sourceforge.net/"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/audio/infamousPlugins/default.nix b/pkgs/applications/audio/infamousPlugins/default.nix index 9ba835eb7eae..ce3121e2f958 100644 --- a/pkgs/applications/audio/infamousPlugins/default.nix +++ b/pkgs/applications/audio/infamousPlugins/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, cairomm, cmake, lv2, libpthreadstubs, libXdmcp, libXft, ntk, pcre, fftwFloat, zita-resampler }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, pkgconfig, cairomm, cmake, lv2, libpthreadstubs, libXdmcp, libXft, ntk, pcre, fftwFloat, zita-resampler }: stdenv.mkDerivation rec { pname = "infamousPlugins"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig cmake ]; buildInputs = [ cairomm lv2 libpthreadstubs libXdmcp libXft ntk pcre fftwFloat zita-resampler ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://ssj71.github.io/infamousPlugins"; description = "A collection of open-source LV2 plugins"; longDescription = '' diff --git a/pkgs/applications/audio/ingen/default.nix b/pkgs/applications/audio/ingen/default.nix index c5d4b3f87f49..9bb6ddd6a985 100644 --- a/pkgs/applications/audio/ingen/default.nix +++ b/pkgs/applications/audio/ingen/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, boost, ganv, glibmm, gtkmm2, libjack2, lilv +{ lib, stdenv, fetchgit, boost, ganv, glibmm, gtkmm2, libjack2, lilv , lv2, makeWrapper, pkgconfig, python, raul, rdflib, serd, sord, sratom , wafHook , suil @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A modular audio processing system using JACK and LV2 or LADSPA plugins"; homepage = "http://drobilla.net/software/ingen"; license = licenses.agpl3Plus; diff --git a/pkgs/applications/audio/ir.lv2/default.nix b/pkgs/applications/audio/ir.lv2/default.nix index aa5eeae0a46c..bc3049dc6b34 100644 --- a/pkgs/applications/audio/ir.lv2/default.nix +++ b/pkgs/applications/audio/ir.lv2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fftw, gtk2, lv2, libsamplerate, libsndfile, pkgconfig, zita-convolver }: +{ lib, stdenv, fetchFromGitHub, fftw, gtk2, lv2, libsamplerate, libsndfile, pkgconfig, zita-convolver }: stdenv.mkDerivation rec { pname = "ir.lv2"; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { install -Dm755 convert4chan "$out/bin/convert4chan" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://factorial.hu/plugins/lv2/ir"; description = "Zero-latency, realtime, high performance signal convolver especially for creating reverb effects"; license = licenses.gpl2; diff --git a/pkgs/applications/audio/jaaa/default.nix b/pkgs/applications/audio/jaaa/default.nix index 80f15935af23..035e15abb23f 100644 --- a/pkgs/applications/audio/jaaa/default.nix +++ b/pkgs/applications/audio/jaaa/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, libclthreads, libclxclient, libX11, libXft, libXrender, fftwFloat, libjack2, zita-alsa-pcmi }: +{ lib, stdenv, fetchurl, alsaLib, libclthreads, libclxclient, libX11, libXft, libXrender, fftwFloat, libjack2, zita-alsa-pcmi }: stdenv.mkDerivation rec { pname = "jaaa"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { cd ./source/ ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://kokkinizita.linuxaudio.org/linuxaudio/index.html"; description = "JACK and ALSA Audio Analyser"; license = licenses.gpl2; diff --git a/pkgs/applications/audio/jack-capture/default.nix b/pkgs/applications/audio/jack-capture/default.nix index e443a0a52694..0cf21c6a8c8f 100644 --- a/pkgs/applications/audio/jack-capture/default.nix +++ b/pkgs/applications/audio/jack-capture/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libjack2, libsndfile, pkgconfig }: +{ lib, stdenv, fetchurl, libjack2, libsndfile, pkgconfig }: stdenv.mkDerivation rec { pname = "jack_capture"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A program for recording soundfiles with jack"; homepage = "http://archive.notam02.no/arkiv/src"; license = licenses.gpl2; diff --git a/pkgs/applications/audio/jack-oscrolloscope/default.nix b/pkgs/applications/audio/jack-oscrolloscope/default.nix index 08263f2abddc..ffd9ec5cbc35 100644 --- a/pkgs/applications/audio/jack-oscrolloscope/default.nix +++ b/pkgs/applications/audio/jack-oscrolloscope/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, SDL, libjack2, libGLU, libGL, pkgconfig }: +{ lib, stdenv, fetchurl, SDL, libjack2, libGLU, libGL, pkgconfig }: stdenv.mkDerivation rec { pname = "jack_oscrolloscope"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { mv jack_oscrolloscope $out/bin/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A simple waveform viewer for JACK"; homepage = "http://das.nasophon.de/jack_oscrolloscope"; license = licenses.gpl2; diff --git a/pkgs/applications/audio/jackmeter/default.nix b/pkgs/applications/audio/jackmeter/default.nix index 2a75b384af5c..d049cf81b11d 100644 --- a/pkgs/applications/audio/jackmeter/default.nix +++ b/pkgs/applications/audio/jackmeter/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libjack2 ]; - meta = { + meta = { description = "Console jack loudness meter"; homepage = "https://www.aelius.com/njh/jackmeter/"; license = stdenv.lib.licenses.gpl2; diff --git a/pkgs/applications/audio/jalv/default.nix b/pkgs/applications/audio/jalv/default.nix index 39f1467138db..d3ed57436c95 100644 --- a/pkgs/applications/audio/jalv/default.nix +++ b/pkgs/applications/audio/jalv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gtk2, libjack2, lilv, lv2, pkgconfig, python +{ lib, stdenv, fetchurl, gtk2, libjack2, lilv, lv2, pkgconfig, python , serd, sord , sratom, suil, wafHook }: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { gtk2 libjack2 lilv lv2 python serd sord sratom suil ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A simple but fully featured LV2 host for Jack"; homepage = "http://drobilla.net/software/jalv"; license = licenses.isc; diff --git a/pkgs/applications/audio/jamin/default.nix b/pkgs/applications/audio/jamin/default.nix index 57caf4672d38..7f6501a473d8 100644 --- a/pkgs/applications/audio/jamin/default.nix +++ b/pkgs/applications/audio/jamin/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fftwFloat, gtk2, ladspaPlugins, libjack2, liblo, libxml2 +{ lib, stdenv, fetchurl, fftwFloat, gtk2, ladspaPlugins, libjack2, liblo, libxml2 , makeWrapper, pkgconfig, perlPackages }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/jamin --set LADSPA_PATH ${ladspaPlugins}/lib/ladspa ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://jamin.sourceforge.net"; description = "JACK Audio Mastering interface"; license = licenses.gpl2; diff --git a/pkgs/applications/audio/kapitonov-plugins-pack/default.nix b/pkgs/applications/audio/kapitonov-plugins-pack/default.nix index 53b55332f5d9..4409437ebf20 100644 --- a/pkgs/applications/audio/kapitonov-plugins-pack/default.nix +++ b/pkgs/applications/audio/kapitonov-plugins-pack/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, faust, meson, ninja, pkg-config +{ lib, stdenv, fetchFromGitHub, faust, meson, ninja, pkg-config , boost, cairo, fftw, gnome3, ladspa-sdk, libxcb, lv2, xcbutilwm , zita-convolver, zita-resampler }: @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { zita-resampler ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Set of LADSPA and LV2 plugins for guitar sound processing"; homepage = https://github.com/olegkapitonov/Kapitonov-Plugins-Pack; license = licenses.gpl3; diff --git a/pkgs/applications/audio/keyfinder-cli/default.nix b/pkgs/applications/audio/keyfinder-cli/default.nix index 4bb1d63a1e71..d6e96d908344 100644 --- a/pkgs/applications/audio/keyfinder-cli/default.nix +++ b/pkgs/applications/audio/keyfinder-cli/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libav, libkeyfinder }: +{ lib, stdenv, fetchFromGitHub, libav, libkeyfinder }: stdenv.mkDerivation rec { pname = "keyfinder-cli"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { inherit (src.meta) homepage; description = "Musical key detection for digital audio (command-line tool)"; longDescription = '' diff --git a/pkgs/applications/audio/keyfinder/default.nix b/pkgs/applications/audio/keyfinder/default.nix index 710c1e807929..187d3a58b171 100644 --- a/pkgs/applications/audio/keyfinder/default.nix +++ b/pkgs/applications/audio/keyfinder/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libav_0_8, libkeyfinder, qtbase, qtxmlpatterns, qmake, taglib }: +{ lib, stdenv, fetchFromGitHub, libav_0_8, libkeyfinder, qtbase, qtxmlpatterns, qmake, taglib }: stdenv.mkDerivation rec { pname = "keyfinder"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Musical key detection for digital audio (graphical UI)"; longDescription = '' KeyFinder is an open source key detection tool, for DJs interested in diff --git a/pkgs/applications/audio/kid3/default.nix b/pkgs/applications/audio/kid3/default.nix index c0900c56d0bd..340a661a9502 100644 --- a/pkgs/applications/audio/kid3/default.nix +++ b/pkgs/applications/audio/kid3/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl -, pkgconfig, cmake, python3, ffmpeg_3, phonon, automoc4 +{ lib, stdenv, fetchurl +, pkg-config, cmake, python3, ffmpeg_3, phonon, automoc4 , chromaprint, docbook_xml_dtd_45, docbook_xsl, libxslt , id3lib, taglib, mp4v2, flac, libogg, libvorbis , zlib, readline , qtbase, qttools, qtmultimedia, qtquickcontrols @@ -15,12 +15,11 @@ stdenv.mkDerivation rec { sha256 = "sha256-WYuEOqMu2VMOv6mkVCRXnmInFER/DWfPNqYuaTJ3vAc="; }; - nativeBuildInputs = [ wrapQtAppsHook ]; - buildInputs = [ - pkgconfig cmake python3 ffmpeg_3 phonon automoc4 - chromaprint docbook_xml_dtd_45 docbook_xsl libxslt - id3lib taglib mp4v2 flac libogg libvorbis zlib readline - qtbase qttools qtmultimedia qtquickcontrols ]; + nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; + buildInputs = [ python3 ffmpeg_3 phonon automoc4 chromaprint + docbook_xml_dtd_45 docbook_xsl libxslt id3lib taglib mp4v2 flac + libogg libvorbis zlib readline qtbase qttools qtmultimedia + qtquickcontrols ]; cmakeFlags = [ "-DWITH_APPS=Qt;CLI" ]; NIX_LDFLAGS = "-lm -lpthread"; @@ -29,9 +28,7 @@ stdenv.mkDerivation rec { export DOCBOOKDIR="${docbook_xsl}/xml/xsl/docbook/" ''; - enableParallelBuilding = true; - - meta = with stdenv.lib; { + meta = with lib; { description = "A simple and powerful audio tag editor"; longDescription = '' If you want to easily tag multiple MP3, Ogg/Vorbis, FLAC, MPC, MP4/AAC, diff --git a/pkgs/applications/audio/klystrack/default.nix b/pkgs/applications/audio/klystrack/default.nix index 5e8dc060c28c..ea8cfcec2e43 100644 --- a/pkgs/applications/audio/klystrack/default.nix +++ b/pkgs/applications/audio/klystrack/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch +{ lib, stdenv, fetchFromGitHub, fetchpatch , SDL2, SDL2_image , pkgconfig }: @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { --replace "klystrack %f" "$out/bin/klystrack %f" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A chiptune tracker"; homepage = "https://kometbomb.github.io/klystrack"; license = licenses.mit; diff --git a/pkgs/applications/audio/kmetronome/default.nix b/pkgs/applications/audio/kmetronome/default.nix index 30a4d5f3684a..415bfe370269 100644 --- a/pkgs/applications/audio/kmetronome/default.nix +++ b/pkgs/applications/audio/kmetronome/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, pkgconfig, qttools, alsaLib, drumstick, qtbase, qtsvg }: +{ lib, stdenv, fetchurl, cmake, pkgconfig, qttools, alsaLib, drumstick, qtbase, qtsvg }: stdenv.mkDerivation rec { pname = "kmetronome"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ alsaLib drumstick qtbase qtsvg ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://kmetronome.sourceforge.io/"; description = "ALSA MIDI metronome with Qt interface"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/audio/ladspa-plugins/default.nix b/pkgs/applications/audio/ladspa-plugins/default.nix index a0fc8631fb39..855056c6c156 100644 --- a/pkgs/applications/audio/ladspa-plugins/default.nix +++ b/pkgs/applications/audio/ladspa-plugins/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, automake, fftw, ladspaH, libxml2, pkgconfig +{ lib, stdenv, fetchurl, autoreconfHook, automake, fftw, ladspaH, libxml2, pkgconfig , perlPackages }: stdenv.mkDerivation rec { @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { cp ${automake}/share/automake-*/mkinstalldirs . ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://plugin.org.uk/"; description = "LADSPA format audio plugins"; license = licenses.gpl2; diff --git a/pkgs/applications/audio/lash/default.nix b/pkgs/applications/audio/lash/default.nix index cb0a3ee05e12..26a8568f01aa 100644 --- a/pkgs/applications/audio/lash/default.nix +++ b/pkgs/applications/audio/lash/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, gtk2, libjack2, libuuid, libxml2 +{ lib, stdenv, fetchurl, alsaLib, gtk2, libjack2, libuuid, libxml2 , makeWrapper, pkgconfig, readline }: assert libuuid != null; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A Linux Audio Session Handler"; longDescription = '' Session management system for GNU/Linux audio applications. diff --git a/pkgs/applications/audio/librespot/default.nix b/pkgs/applications/audio/librespot/default.nix index 6061edac0250..241a89caa0b5 100644 --- a/pkgs/applications/audio/librespot/default.nix +++ b/pkgs/applications/audio/librespot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform, pkgconfig, openssl, withRodio ? true +{ lib, stdenv, fetchFromGitHub, rustPlatform, pkgconfig, openssl, withRodio ? true , withALSA ? true, alsaLib ? null, withPulseAudio ? false, libpulseaudio ? null , withPortAudio ? false, portaudio ? null }: @@ -37,7 +37,7 @@ rustPlatform.buildRustPackage rec { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Open Source Spotify client library and playback daemon"; homepage = "https://github.com/librespot-org/librespot"; license = with licenses; [ mit ]; diff --git a/pkgs/applications/audio/linuxsampler/default.nix b/pkgs/applications/audio/linuxsampler/default.nix index 6b6cfd55926b..5eda9e92123c 100644 --- a/pkgs/applications/audio/linuxsampler/default.nix +++ b/pkgs/applications/audio/linuxsampler/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoconf, automake, bison, libtool, pkgconfig, which +{ lib, stdenv, fetchurl, autoconf, automake, bison, libtool, pkgconfig, which , alsaLib, asio, libjack2, libgig, libsndfile, lv2 }: stdenv.mkDerivation rec { @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.linuxsampler.org"; description = "Sampler backend"; longDescription = '' diff --git a/pkgs/applications/audio/littlegptracker/default.nix b/pkgs/applications/audio/littlegptracker/default.nix index 2fb453cf19c5..9772425535f3 100644 --- a/pkgs/applications/audio/littlegptracker/default.nix +++ b/pkgs/applications/audio/littlegptracker/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , unstableGitUpdater , SDL @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { passthru.updateScript = unstableGitUpdater { }; - meta = with stdenv.lib; { + meta = with lib; { description = "A music tracker similar to lsdj optimised to run on portable game consoles"; longDescription = '' LittleGPTracker (a.k.a 'The piggy', 'lgpt') is a music tracker optimised diff --git a/pkgs/applications/audio/lmms/default.nix b/pkgs/applications/audio/lmms/default.nix index b01c4055e406..ef95bf594944 100644 --- a/pkgs/applications/audio/lmms/default.nix +++ b/pkgs/applications/audio/lmms/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, alsaLib ? null, fftwFloat, fltk13 +{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, alsaLib ? null, fftwFloat, fltk13 , fluidsynth_1 ? null, lame ? null, libgig ? null, libjack2 ? null, libpulseaudio ? null , libsamplerate, libsoundio ? null, libsndfile, libvorbis ? null, portaudio ? null , qtbase, qtx11extras, qttools, SDL ? null, mkDerivation }: @@ -37,9 +37,8 @@ mkDerivation rec { ]; cmakeFlags = [ "-DWANT_QT5=ON" ]; - enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "DAW similar to FL Studio (music production software)"; homepage = "https://lmms.io"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/audio/ltc-tools/default.nix b/pkgs/applications/audio/ltc-tools/default.nix index c986e3af288e..31986762fc1f 100644 --- a/pkgs/applications/audio/ltc-tools/default.nix +++ b/pkgs/applications/audio/ltc-tools/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, pkgconfig, libltc, libsndfile, jack2}: +{lib, stdenv, fetchFromGitHub, pkgconfig, libltc, libsndfile, jack2}: stdenv.mkDerivation rec { pname = "ltc-tools"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/x42/ltc-tools"; description = "Tools to deal with linear-timecode (LTC)"; license = licenses.gpl2; diff --git a/pkgs/applications/audio/luppp/default.nix b/pkgs/applications/audio/luppp/default.nix index 6cf2575b8e5f..ac7ff3a3084d 100644 --- a/pkgs/applications/audio/luppp/default.nix +++ b/pkgs/applications/audio/luppp/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , meson , ninja @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { ntk ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://openavproductions.com/luppp/"; # https does not work description = "A music creation tool, intended for live use"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/audio/lv2-cpp-tools/default.nix b/pkgs/applications/audio/lv2-cpp-tools/default.nix index d98135fb0149..b6e878d48367 100644 --- a/pkgs/applications/audio/lv2-cpp-tools/default.nix +++ b/pkgs/applications/audio/lv2-cpp-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, pkgconfig, lv2, gtkmm2, boost }: +{ lib, stdenv, fetchzip, pkgconfig, lv2, gtkmm2, boost }: stdenv.mkDerivation rec { pname = "lv2-cpp-tools"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ lv2 gtkmm2 boost ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://ll-plugins.nongnu.org/hacking.html"; description = "Tools and libraries that may come in handy when writing LV2 plugins in C++"; license = licenses.gpl3; diff --git a/pkgs/applications/audio/lv2bm/default.nix b/pkgs/applications/audio/lv2bm/default.nix index 99a2665bc129..8f997a28193b 100644 --- a/pkgs/applications/audio/lv2bm/default.nix +++ b/pkgs/applications/audio/lv2bm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, glib, libsndfile, lilv, lv2, pkgconfig, serd, sord, sratom }: +{ lib, stdenv, fetchFromGitHub, glib, libsndfile, lilv, lv2, pkgconfig, serd, sord, sratom }: stdenv.mkDerivation rec { pname = "lv2bm"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { make install PREFIX=$out ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/portalmod/lv2bm"; description = "A benchmark tool for LV2 plugins"; license = licenses.gpl3; diff --git a/pkgs/applications/audio/mamba/default.nix b/pkgs/applications/audio/mamba/default.nix index dc8620fdd4e1..022b41007c14 100644 --- a/pkgs/applications/audio/mamba/default.nix +++ b/pkgs/applications/audio/mamba/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , pkg-config , cairo @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/brummer10/Mamba"; description = "Virtual MIDI keyboard for Jack Audio Connection Kit"; license = licenses.bsd0; diff --git a/pkgs/applications/audio/mda-lv2/default.nix b/pkgs/applications/audio/mda-lv2/default.nix index 2464abb6585c..b53ea7a79636 100644 --- a/pkgs/applications/audio/mda-lv2/default.nix +++ b/pkgs/applications/audio/mda-lv2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fftwSinglePrec, lv2, pkgconfig, wafHook }: +{ lib, stdenv, fetchurl, fftwSinglePrec, lv2, pkgconfig, wafHook, python3 }: stdenv.mkDerivation rec { pname = "mda-lv2"; @@ -9,10 +9,10 @@ stdenv.mkDerivation rec { sha256 = "1a3cv6w5xby9yn11j695rbh3c4ih7rxfxmkca9s1324ljphh06m8"; }; - nativeBuildInputs = [ pkgconfig wafHook ]; + nativeBuildInputs = [ pkgconfig wafHook python3 ]; buildInputs = [ fftwSinglePrec lv2 ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://drobilla.net/software/mda-lv2/"; description = "An LV2 port of the MDA plugins by Paul Kellett"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/audio/melmatcheq.lv2/default.nix b/pkgs/applications/audio/melmatcheq.lv2/default.nix index d5aa481e8233..55c6e4c185a4 100644 --- a/pkgs/applications/audio/melmatcheq.lv2/default.nix +++ b/pkgs/applications/audio/melmatcheq.lv2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, xorg, xorgproto, cairo, lv2, pkg-config }: +{ lib, stdenv, fetchFromGitHub, xorg, xorgproto, cairo, lv2, pkg-config }: stdenv.mkDerivation rec { pname = "MelMatchEQ.lv2"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { installFlags = [ "INSTALL_DIR=$(out)/lib/lv2" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/brummer10/MelMatchEQ.lv2"; description = "a profiling EQ using a 26 step Mel Frequency Band"; maintainers = with maintainers; [ magnetophon ]; diff --git a/pkgs/applications/audio/meterbridge/default.nix b/pkgs/applications/audio/meterbridge/default.nix index 9d807358cd5a..fbf23fbbd58a 100644 --- a/pkgs/applications/audio/meterbridge/default.nix +++ b/pkgs/applications/audio/meterbridge/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, SDL, SDL_image, libjack2 +{ lib, stdenv, fetchurl, pkgconfig, SDL, SDL_image, libjack2 }: stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { [ pkgconfig SDL SDL_image libjack2 ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Various meters (VU, PPM, DPM, JF, SCO) for Jack Audio Connection Kit"; homepage = "http://plugin.org.uk/meterbridge/"; license = licenses.gpl2; diff --git a/pkgs/applications/audio/mhwaveedit/default.nix b/pkgs/applications/audio/mhwaveedit/default.nix index 67204260da24..c87a050ed33b 100644 --- a/pkgs/applications/audio/mhwaveedit/default.nix +++ b/pkgs/applications/audio/mhwaveedit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, makeWrapper, SDL, alsaLib, autoreconfHook, gtk2, libjack2, ladspaH +{ lib, stdenv, fetchFromGitHub, makeWrapper, SDL, alsaLib, autoreconfHook, gtk2, libjack2, ladspaH , ladspaPlugins, libsamplerate, libsndfile, pkgconfig, libpulseaudio, lame , vorbis-tools }: @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { --prefix PATH : ${vorbis-tools}/bin/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Graphical program for editing, playing and recording sound files"; homepage = "https://github.com/magnush/mhwaveedit"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/audio/mid2key/default.nix b/pkgs/applications/audio/mid2key/default.nix index 071b18e5a8a6..2e72a011921c 100644 --- a/pkgs/applications/audio/mid2key/default.nix +++ b/pkgs/applications/audio/mid2key/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, libX11, libXi, libXtst, xorgproto }: +{ lib, stdenv, fetchurl, alsaLib, libX11, libXi, libXtst, xorgproto }: stdenv.mkDerivation rec { name = "mid2key-r1"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { installPhase = "mkdir -p $out/bin && mv mid2key $out/bin"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://code.google.com/p/mid2key/"; description = "A simple tool which maps midi notes to simulated keystrokes"; license = licenses.gpl3; diff --git a/pkgs/applications/audio/midas/generic.nix b/pkgs/applications/audio/midas/generic.nix index 769593919d46..8f2e29ee95b4 100644 --- a/pkgs/applications/audio/midas/generic.nix +++ b/pkgs/applications/audio/midas/generic.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { $out/bin/${baseName} ''; - meta = with stdenv.lib; { + meta = with lib; { inherit homepage; description = "Editor for the ${brand} ${type} digital mixer"; license = licenses.unfree; diff --git a/pkgs/applications/audio/midi-visualizer/default.nix b/pkgs/applications/audio/midi-visualizer/default.nix index 4def69bedced..58f8fee3cefc 100644 --- a/pkgs/applications/audio/midi-visualizer/default.nix +++ b/pkgs/applications/audio/midi-visualizer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkg-config, libX11, glfw, makeWrapper, +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, libX11, glfw, makeWrapper, libXrandr, libXinerama, libXcursor, gtk3, ffmpeg-full, ...}: stdenv.mkDerivation rec { @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A small MIDI visualizer tool, using OpenGL"; homepage = "https://github.com/kosua20/MIDIVisualizer"; license = licenses.mit; diff --git a/pkgs/applications/audio/midisheetmusic/default.nix b/pkgs/applications/audio/midisheetmusic/default.nix index 388fc2a1b3ea..1f408f6f6281 100644 --- a/pkgs/applications/audio/midisheetmusic/default.nix +++ b/pkgs/applications/audio/midisheetmusic/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , mono, dotnetPackages, makeWrapper , gtk2, cups, timidity }: @@ -52,7 +52,7 @@ in stdenv.mkDerivation { --add-flags $out/bin/.MidiSheetMusic.exe ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Convert MIDI Files to Piano Sheet Music for two hands"; homepage = "http://midisheetmusic.com"; license = licenses.gpl2; diff --git a/pkgs/applications/audio/milkytracker/default.nix b/pkgs/applications/audio/milkytracker/default.nix index 405787e88714..b061b48abc84 100644 --- a/pkgs/applications/audio/milkytracker/default.nix +++ b/pkgs/applications/audio/milkytracker/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, makeWrapper +{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, makeWrapper , SDL2, alsaLib, libjack2, lhasa, perl, rtmidi, zlib, zziplib }: stdenv.mkDerivation rec { - version = "1.02.00"; + version = "1.03.00"; pname = "milkytracker"; src = fetchFromGitHub { owner = "milkytracker"; repo = "MilkyTracker"; rev = "v${version}"; - sha256 = "05a6d7l98k9i82dwrgi855dnccm3f2lkb144gi244vhk1156n0ca"; + sha256 = "025fj34gq2kmkpwcswcyx7wdxb89vm944dh685zi4bxx0hz16vvk"; }; nativeBuildInputs = [ cmake pkgconfig makeWrapper ]; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { install -Dm644 $src/resources/milkytracker.appdata $out/share/appdata/milkytracker.appdata.xml ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Music tracker application, similar to Fasttracker II"; homepage = "http://milkytracker.org"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/audio/mixxx/default.nix b/pkgs/applications/audio/mixxx/default.nix index 576dd4d97b35..ef0db55f090f 100644 --- a/pkgs/applications/audio/mixxx/default.nix +++ b/pkgs/applications/audio/mixxx/default.nix @@ -1,4 +1,4 @@ -{ stdenv, mkDerivation, fetchurl, fetchFromGitHub, chromaprint +{ lib, stdenv, mkDerivation, fetchurl, fetchFromGitHub, chromaprint , fftw, flac, faad2, glibcLocales, mp4v2 , libid3tag, libmad, libopus, libshout, libsndfile, libusb1, libvorbis , libGLU, libxcb, lilv, lv2, opusfile @@ -48,7 +48,7 @@ mkDerivation rec { "--set LOCALE_ARCHIVE ${glibcLocales}/lib/locale/locale-archive" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://mixxx.org"; description = "Digital DJ mixing software"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/audio/moc/default.nix b/pkgs/applications/audio/moc/default.nix index 9f68f8bb8e8e..96a4ab9fdaa3 100644 --- a/pkgs/applications/audio/moc/default.nix +++ b/pkgs/applications/audio/moc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig +{ lib, stdenv, fetchurl, pkgconfig , ncurses, db , popt, libtool # Sound sub-systems , alsaSupport ? true, alsaLib @@ -94,7 +94,7 @@ in stdenv.mkDerivation rec { "--without-rcc" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "An ncurses console audio player designed to be powerful and easy to use"; homepage = "http://moc.daper.net/"; license = licenses.gpl2; diff --git a/pkgs/applications/audio/mod-distortion/default.nix b/pkgs/applications/audio/mod-distortion/default.nix index 765def25d600..7c9f2acfd844 100644 --- a/pkgs/applications/audio/mod-distortion/default.nix +++ b/pkgs/applications/audio/mod-distortion/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, lv2 }: +{ lib, stdenv, fetchFromGitHub, lv2 }: stdenv.mkDerivation { pname = "mod-distortion-git"; @@ -15,7 +15,7 @@ stdenv.mkDerivation { installFlags = [ "INSTALL_PATH=$(out)/lib/lv2" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/portalmod/mod-distortion"; description = "Analog distortion emulation lv2 plugins"; license = licenses.gpl3; diff --git a/pkgs/applications/audio/molot-lite/default.nix b/pkgs/applications/audio/molot-lite/default.nix index 5c5aa5055370..d30b6bcad2fb 100644 --- a/pkgs/applications/audio/molot-lite/default.nix +++ b/pkgs/applications/audio/molot-lite/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, lv2 }: +{ lib, stdenv, fetchurl, unzip, lv2 }: stdenv.mkDerivation { pname = "molot-lite"; @@ -27,7 +27,7 @@ stdenv.mkDerivation { make install INSTALL_DIR=$out/lib/lv2 -C Molot_Stereo_Lite ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Stereo and mono audio signal dynamic range compressor in LV2 format"; homepage = "https://sourceforge.net/projects/molot/"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/audio/monkeys-audio/default.nix b/pkgs/applications/audio/monkeys-audio/default.nix index adc8eb2087e5..62b63f7e1cab 100644 --- a/pkgs/applications/audio/monkeys-audio/default.nix +++ b/pkgs/applications/audio/monkeys-audio/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation rec { version = "3.99-u4-b5"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0kjfwzfxfx7f958b2b1kf8yj655lp0ppmn0sh57gbkjvj8lml7nz"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Lossless audio codec"; platforms = platforms.linux; license = licenses.lgpl2; diff --git a/pkgs/applications/audio/mopidy/default.nix b/pkgs/applications/audio/mopidy/default.nix index fc532482cba4..f4d4e416de40 100644 --- a/pkgs/applications/audio/mopidy/default.nix +++ b/pkgs/applications/audio/mopidy/default.nix @@ -14,9 +14,9 @@ let mopidy-gmusic = callPackage ./gmusic.nix { }; - mopidy-local = callPackage ./local.nix { }; + mopidy-iris = callPackage ./iris.nix { }; - mopidy-spotify = callPackage ./spotify.nix { }; + mopidy-local = callPackage ./local.nix { }; mopidy-moped = callPackage ./moped.nix { }; @@ -26,20 +26,21 @@ let mopidy-mpris = callPackage ./mpris.nix { }; + mopidy-musicbox-webclient = callPackage ./musicbox-webclient.nix { }; + + mopidy-scrobbler = callPackage ./scrobbler.nix { }; + mopidy-somafm = callPackage ./somafm.nix { }; - mopidy-spotify-tunigo = callPackage ./spotify-tunigo.nix { }; - - mopidy-youtube = callPackage ./youtube.nix { }; - mopidy-soundcloud = callPackage ./soundcloud.nix { }; - mopidy-musicbox-webclient = callPackage ./musicbox-webclient.nix { }; + mopidy-spotify = callPackage ./spotify.nix { }; - mopidy-iris = callPackage ./iris.nix { }; + mopidy-spotify-tunigo = callPackage ./spotify-tunigo.nix { }; mopidy-tunein = callPackage ./tunein.nix { }; + mopidy-youtube = callPackage ./youtube.nix { }; }; in self diff --git a/pkgs/applications/audio/mopidy/gmusic.nix b/pkgs/applications/audio/mopidy/gmusic.nix index 1e5e42ac2f34..54af3bc68f1e 100644 --- a/pkgs/applications/audio/mopidy/gmusic.nix +++ b/pkgs/applications/audio/mopidy/gmusic.nix @@ -1,4 +1,4 @@ -{ stdenv, python3Packages, mopidy }: +{ lib, stdenv, python3Packages, mopidy }: python3Packages.buildPythonApplication rec { pname = "mopidy-gmusic"; @@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.mopidy.com/"; description = "Mopidy extension for playing music from Google Play Music"; license = licenses.asl20; diff --git a/pkgs/applications/audio/mopidy/iris.nix b/pkgs/applications/audio/mopidy/iris.nix index a8530a30458f..05827b0bb565 100644 --- a/pkgs/applications/audio/mopidy/iris.nix +++ b/pkgs/applications/audio/mopidy/iris.nix @@ -1,4 +1,4 @@ -{ stdenv, python3Packages, mopidy }: +{ lib, stdenv, python3Packages, mopidy }: python3Packages.buildPythonApplication rec { pname = "Mopidy-Iris"; @@ -20,7 +20,7 @@ python3Packages.buildPythonApplication rec { # no tests implemented doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/jaedb/Iris"; description = "A fully-functional Mopidy web client encompassing Spotify and many other backends"; license = licenses.asl20; diff --git a/pkgs/applications/audio/mopidy/local.nix b/pkgs/applications/audio/mopidy/local.nix index 6cbb8424d35d..de748ea7b325 100644 --- a/pkgs/applications/audio/mopidy/local.nix +++ b/pkgs/applications/audio/mopidy/local.nix @@ -1,6 +1,7 @@ { lib , mopidy , python3Packages +, fetchpatch }: python3Packages.buildPythonApplication rec { @@ -21,6 +22,14 @@ python3Packages.buildPythonApplication rec { python3Packages.pytestCheckHook ]; + patches = [ + # Fix tests for Mopidy≥3.1.0. Remove with the next release. + (fetchpatch { + url = "https://github.com/mopidy/mopidy-local/commit/f1d7598d3a9587f0823acb97ecb615f4f4817fd2.patch"; + sha256 = "193kd5zwsr0qpp2y8icdy13vqpglmjdm7x1rw5hliwyq18a34vjp"; + }) + ]; + meta = with lib; { homepage = "https://github.com/mopidy/mopidy-local"; description = "Mopidy extension for playing music from your local music archive"; diff --git a/pkgs/applications/audio/mopidy/moped.nix b/pkgs/applications/audio/mopidy/moped.nix index ffd9af76d173..8daaef7d45d9 100644 --- a/pkgs/applications/audio/mopidy/moped.nix +++ b/pkgs/applications/audio/mopidy/moped.nix @@ -1,4 +1,4 @@ -{ stdenv, pythonPackages, mopidy, glibcLocales }: +{ lib, stdenv, pythonPackages, mopidy, glibcLocales }: pythonPackages.buildPythonApplication rec { pname = "Mopidy-Moped"; @@ -16,7 +16,7 @@ pythonPackages.buildPythonApplication rec { # no tests implemented doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/martijnboland/moped"; description = "A web client for Mopidy"; license = licenses.mit; diff --git a/pkgs/applications/audio/mopidy/mopidy.nix b/pkgs/applications/audio/mopidy/mopidy.nix index eb5672fe135b..55b7646af075 100644 --- a/pkgs/applications/audio/mopidy/mopidy.nix +++ b/pkgs/applications/audio/mopidy/mopidy.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchFromGitHub, pythonPackages, wrapGAppsHook +{ lib, stdenv, fetchFromGitHub, pythonPackages, wrapGAppsHook , gst_all_1, glib-networking, gobject-introspection }: pythonPackages.buildPythonApplication rec { pname = "mopidy"; - version = "3.0.2"; + version = "3.1.1"; src = fetchFromGitHub { owner = "mopidy"; repo = "mopidy"; rev = "v${version}"; - sha256 = "1n9lpgq0p112cjgsrc1cd6mnffk56y36g2c5skk9cqzw27qrkd15"; + sha256 = "14m80z9spi2vhfs2bbff7ky80mr6bksl4550y17hwd7zpkid60za"; }; nativeBuildInputs = [ wrapGAppsHook ]; @@ -38,11 +38,7 @@ pythonPackages.buildPythonApplication rec { # There are no tests doCheck = false; - preFixup = '' - gappsWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH") - ''; - - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.mopidy.com/"; description = '' An extensible music server that plays music from local disk, Spotify, diff --git a/pkgs/applications/audio/mopidy/mopify.nix b/pkgs/applications/audio/mopidy/mopify.nix index a9902ca41721..17e68c165394 100644 --- a/pkgs/applications/audio/mopidy/mopify.nix +++ b/pkgs/applications/audio/mopidy/mopify.nix @@ -1,4 +1,4 @@ -{ stdenv, pythonPackages, mopidy }: +{ lib, stdenv, pythonPackages, mopidy }: pythonPackages.buildPythonApplication rec { pname = "Mopidy-Mopify"; @@ -14,7 +14,7 @@ pythonPackages.buildPythonApplication rec { # no tests implemented doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/dirkgroenen/mopidy-mopify"; description = "A mopidy webclient based on the Spotify webbased interface"; license = licenses.gpl3; diff --git a/pkgs/applications/audio/mopidy/mpd.nix b/pkgs/applications/audio/mopidy/mpd.nix index 4dd32ea3aa35..8d6d7a1528b9 100644 --- a/pkgs/applications/audio/mopidy/mpd.nix +++ b/pkgs/applications/audio/mopidy/mpd.nix @@ -1,4 +1,4 @@ -{ stdenv, python3Packages, mopidy }: +{ lib, stdenv, python3Packages, mopidy }: python3Packages.buildPythonApplication rec { pname = "Mopidy-MPD"; @@ -15,7 +15,7 @@ python3Packages.buildPythonApplication rec { doCheck = false; pythonImportsCheck = [ "mopidy_mpd" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/mopidy/mopidy-mpd"; description = "Mopidy extension for controlling playback from MPD clients"; license = licenses.asl20; diff --git a/pkgs/applications/audio/mopidy/mpris.nix b/pkgs/applications/audio/mopidy/mpris.nix index 1c6d841a34e4..868dbaf30358 100644 --- a/pkgs/applications/audio/mopidy/mpris.nix +++ b/pkgs/applications/audio/mopidy/mpris.nix @@ -1,4 +1,4 @@ -{ stdenv, python3Packages, mopidy }: +{ lib, stdenv, python3Packages, mopidy }: python3Packages.buildPythonApplication rec { pname = "mopidy-mpris"; @@ -17,7 +17,7 @@ python3Packages.buildPythonApplication rec { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.mopidy.com/"; description = "Mopidy extension for controlling Mopidy through D-Bus using the MPRIS specification"; license = licenses.asl20; diff --git a/pkgs/applications/audio/mopidy/musicbox-webclient.nix b/pkgs/applications/audio/mopidy/musicbox-webclient.nix index b10accedc6f8..1e2cb8d06094 100644 --- a/pkgs/applications/audio/mopidy/musicbox-webclient.nix +++ b/pkgs/applications/audio/mopidy/musicbox-webclient.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pythonPackages, mopidy }: +{ lib, stdenv, fetchFromGitHub, pythonPackages, mopidy }: pythonPackages.buildPythonApplication rec { pname = "mopidy-musicbox-webclient"; @@ -15,7 +15,7 @@ pythonPackages.buildPythonApplication rec { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Mopidy extension for playing music from SoundCloud"; license = licenses.mit; broken = stdenv.isDarwin; diff --git a/pkgs/applications/audio/mopidy/scrobbler.nix b/pkgs/applications/audio/mopidy/scrobbler.nix new file mode 100644 index 000000000000..be38c6a7040d --- /dev/null +++ b/pkgs/applications/audio/mopidy/scrobbler.nix @@ -0,0 +1,24 @@ +{ lib, stdenv, python3Packages, mopidy }: + +python3Packages.buildPythonApplication rec { + pname = "Mopidy-Scrobbler"; + version = "2.0.1"; + + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "11vxgax4xgkggnq4fr1rh2rcvzspkkimck5p3h4phdj3qpnj0680"; + }; + + propagatedBuildInputs = with python3Packages; [ mopidy pylast ]; + + # no tests implemented + doCheck = false; + pythonImportsCheck = [ "mopidy_scrobbler" ]; + + meta = with lib; { + homepage = "https://github.com/mopidy/mopidy-scrobbler"; + description = "Mopidy extension for scrobbling played tracks to Last.fm."; + license = licenses.asl20; + maintainers = with maintainers; [ jakeisnt ]; + }; +} diff --git a/pkgs/applications/audio/mopidy/somafm.nix b/pkgs/applications/audio/mopidy/somafm.nix index 2e3380fa20f8..afa46726db7e 100644 --- a/pkgs/applications/audio/mopidy/somafm.nix +++ b/pkgs/applications/audio/mopidy/somafm.nix @@ -1,4 +1,4 @@ -{ stdenv, python3Packages, mopidy }: +{ lib, stdenv, python3Packages, mopidy }: python3Packages.buildPythonApplication rec { pname = "mopidy-somafm"; @@ -16,7 +16,7 @@ python3Packages.buildPythonApplication rec { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = https://www.mopidy.com/; description = "Mopidy extension for playing music from SomaFM"; license = licenses.mit; diff --git a/pkgs/applications/audio/mopidy/soundcloud.nix b/pkgs/applications/audio/mopidy/soundcloud.nix index 8002feb0f901..bdc3523652c0 100644 --- a/pkgs/applications/audio/mopidy/soundcloud.nix +++ b/pkgs/applications/audio/mopidy/soundcloud.nix @@ -1,21 +1,21 @@ -{ stdenv, fetchFromGitHub, pythonPackages, mopidy }: +{ lib, stdenv, fetchFromGitHub, pythonPackages, mopidy }: pythonPackages.buildPythonApplication rec { pname = "mopidy-soundcloud"; - version = "2.1.0"; + version = "3.0.1"; src = fetchFromGitHub { owner = "mopidy"; repo = "mopidy-soundcloud"; rev = "v${version}"; - sha256 = "131qdm9i0j3ayff0js11qcmbjv50ws5s6iiqr6x5b66ymjl4scfv"; + sha256 = "18wiiv4rca9vibvnc27f3q4apf8n61kbp7mdbm2pmz86qwmd47pa"; }; propagatedBuildInputs = [ mopidy ]; doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Mopidy extension for playing music from SoundCloud"; license = licenses.mit; maintainers = [ maintainers.spwhitt ]; diff --git a/pkgs/applications/audio/mopidy/spotify-tunigo.nix b/pkgs/applications/audio/mopidy/spotify-tunigo.nix index 4b75af5ed579..8fafab0970f8 100644 --- a/pkgs/applications/audio/mopidy/spotify-tunigo.nix +++ b/pkgs/applications/audio/mopidy/spotify-tunigo.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pythonPackages, mopidy, mopidy-spotify }: +{ lib, stdenv, fetchFromGitHub, pythonPackages, mopidy, mopidy-spotify }: pythonPackages.buildPythonApplication rec { pname = "mopidy-spotify-tunigo"; @@ -15,7 +15,7 @@ pythonPackages.buildPythonApplication rec { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Mopidy extension for providing the browse feature of Spotify"; license = licenses.asl20; maintainers = [ maintainers.spwhitt ]; diff --git a/pkgs/applications/audio/mopidy/spotify.nix b/pkgs/applications/audio/mopidy/spotify.nix index 32019c74f86d..57ba6ea1f615 100644 --- a/pkgs/applications/audio/mopidy/spotify.nix +++ b/pkgs/applications/audio/mopidy/spotify.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pythonPackages, mopidy }: +{ lib, stdenv, fetchurl, pythonPackages, mopidy }: pythonPackages.buildPythonApplication rec { pname = "mopidy-spotify"; @@ -13,7 +13,7 @@ pythonPackages.buildPythonApplication rec { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.mopidy.com/"; description = "Mopidy extension for playing music from Spotify"; license = licenses.asl20; diff --git a/pkgs/applications/audio/mopidy/tunein.nix b/pkgs/applications/audio/mopidy/tunein.nix index 90deea7c02ba..776b4a0afb54 100644 --- a/pkgs/applications/audio/mopidy/tunein.nix +++ b/pkgs/applications/audio/mopidy/tunein.nix @@ -1,4 +1,4 @@ -{ stdenv, python3Packages, mopidy }: +{ lib, stdenv, python3Packages, mopidy }: python3Packages.buildPythonApplication rec { pname = "mopidy-tunein"; @@ -16,7 +16,7 @@ python3Packages.buildPythonApplication rec { pythonImportsCheck = [ "mopidy_tunein.tunein" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Mopidy extension for playing music from tunein"; homepage = "https://github.com/kingosticks/mopidy-tunein"; license = licenses.asl20; diff --git a/pkgs/applications/audio/mopidy/youtube.nix b/pkgs/applications/audio/mopidy/youtube.nix index a115812b86a6..35a85b958018 100644 --- a/pkgs/applications/audio/mopidy/youtube.nix +++ b/pkgs/applications/audio/mopidy/youtube.nix @@ -1,13 +1,13 @@ -{ stdenv, python3Packages, mopidy }: +{ lib, stdenv, python3Packages, mopidy }: python3Packages.buildPythonApplication rec { pname = "mopidy-youtube"; - version = "3.1"; + version = "3.2"; src = python3Packages.fetchPypi { inherit version; pname = "Mopidy-YouTube"; - sha256 = "1bn3nxianbal9f81z9wf2cxi893hndvrz2zdqvh1zpxrhs0cr038"; + sha256 = "0wmalfqnskglssq3gj6kkrq6h6c9yab503y72afhkm7n9r5c57zz"; }; patchPhase = "sed s/bs4/beautifulsoup4/ -i setup.cfg"; @@ -21,7 +21,7 @@ python3Packages.buildPythonApplication rec { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Mopidy extension for playing music from YouTube"; license = licenses.asl20; maintainers = [ maintainers.spwhitt ]; diff --git a/pkgs/applications/audio/mp3blaster/default.nix b/pkgs/applications/audio/mp3blaster/default.nix index 74814a1b7ceb..d7795524529a 100644 --- a/pkgs/applications/audio/mp3blaster/default.nix +++ b/pkgs/applications/audio/mp3blaster/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ncurses, libvorbis, SDL }: +{ lib, stdenv, fetchFromGitHub, ncurses, libvorbis, SDL }: stdenv.mkDerivation rec { pname = "mp3blaster"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { "-Wno-reserved-user-defined-literal" ]); - meta = with stdenv.lib; { + meta = with lib; { description = "An audio player for the text console"; homepage = "http://www.mp3blaster.org/"; license = licenses.gpl2; diff --git a/pkgs/applications/audio/mp3gain/default.nix b/pkgs/applications/audio/mp3gain/default.nix index 9bf0b5b8f64c..fb774476a2e2 100644 --- a/pkgs/applications/audio/mp3gain/default.nix +++ b/pkgs/applications/audio/mp3gain/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, unzip, mpg123 }: +{ lib, stdenv, fetchurl, fetchpatch, unzip, mpg123 }: stdenv.mkDerivation { name = "mp3gain-1.6.2"; @@ -25,11 +25,11 @@ stdenv.mkDerivation { install -vD mp3gain "$out/bin/mp3gain" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Lossless mp3 normalizer with statistical analysis"; homepage = "http://mp3gain.sourceforge.net/"; license = licenses.lgpl21; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ devhell ]; }; } diff --git a/pkgs/applications/audio/mp3splt/default.nix b/pkgs/applications/audio/mp3splt/default.nix index 323854575ea7..2ff147fa919e 100644 --- a/pkgs/applications/audio/mp3splt/default.nix +++ b/pkgs/applications/audio/mp3splt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libmp3splt }: +{ lib, stdenv, fetchurl, pkgconfig, libmp3splt }: stdenv.mkDerivation rec { pname = "mp3splt"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "man" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Utility to split mp3, ogg vorbis and FLAC files without decoding"; homepage = "https://sourceforge.net/projects/mp3splt/"; license = licenses.gpl2; diff --git a/pkgs/applications/audio/mpc/default.nix b/pkgs/applications/audio/mpc/default.nix index a226b720df9b..a00ac7868b3d 100644 --- a/pkgs/applications/audio/mpc/default.nix +++ b/pkgs/applications/audio/mpc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, mpd_clientlib, sphinx, libiconv }: +{ lib, stdenv, fetchFromGitHub, meson, ninja, pkgconfig, mpd_clientlib, sphinx, libiconv }: stdenv.mkDerivation rec { pname = "mpc"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkgconfig sphinx ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A minimalist command line interface to MPD"; homepage = "https://www.musicpd.org/clients/mpc/"; license = licenses.gpl2; diff --git a/pkgs/applications/audio/mpg321/default.nix b/pkgs/applications/audio/mpg321/default.nix index 63b8e2d867a7..1f98d31eb9c5 100644 --- a/pkgs/applications/audio/mpg321/default.nix +++ b/pkgs/applications/audio/mpg321/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, fetchpatch, libao, libmad, libid3tag, zlib, alsaLib +{lib, stdenv, fetchurl, fetchpatch, libao, libmad, libid3tag, zlib, alsaLib # Specify default libao output plugin to use (e.g. "alsa", "pulse" …). # If null, it will use the libao system default. , defaultAudio ? null @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { installTargets = [ "install" "install-man" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Command-line MP3 player"; homepage = "http://mpg321.sourceforge.net/"; license = licenses.gpl2; diff --git a/pkgs/applications/audio/munt/default.nix b/pkgs/applications/audio/munt/default.nix index 2e072efe7991..8d8ab419fdb4 100644 --- a/pkgs/applications/audio/munt/default.nix +++ b/pkgs/applications/audio/munt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, mkDerivation, fetchFromGitHub, cmake, qtbase, alsaLib, makeDesktopItem, libjack2 }: +{ lib, stdenv, mkDerivation, fetchFromGitHub, cmake, qtbase, alsaLib, makeDesktopItem, libjack2 }: let desktopItem = makeDesktopItem rec { @@ -28,7 +28,7 @@ in mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ qtbase alsaLib libjack2 ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Multi-platform software synthesiser emulating Roland MT-32, CM-32L, CM-64 and LAPC-I devices"; homepage = "http://munt.sourceforge.net/"; license = with licenses; [ lgpl21 gpl3 ]; diff --git a/pkgs/applications/audio/mup/default.nix b/pkgs/applications/audio/mup/default.nix index 0227255d38dc..8f1d5c38b341 100644 --- a/pkgs/applications/audio/mup/default.nix +++ b/pkgs/applications/audio/mup/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, bison, flex, ghostscript, groff, netpbm +{ lib, stdenv, fetchurl, autoreconfHook, bison, flex, ghostscript, groff, netpbm , fltk, libXinerama, libXpm, libjpeg }: @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = false; # Undeclared dependencies + https://stackoverflow.com/a/19822767/1687334 for prolog.ps. - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.arkkra.com/"; description = "Music typesetting program (ASCII to PostScript and MIDI)"; license = licenses.bsd3; diff --git a/pkgs/applications/audio/muse/default.nix b/pkgs/applications/audio/muse/default.nix index e7332aa18759..a583e45be2cc 100644 --- a/pkgs/applications/audio/muse/default.nix +++ b/pkgs/applications/audio/muse/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, qttools, wrapQtAppsHook +{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, qttools, wrapQtAppsHook , alsaLib, dssi, fluidsynth, ladspaH, lash, libinstpatch, libjack2, liblo , libsamplerate, libsndfile, lilv, lrdf, lv2, qtsvg, rtaudio, rubberband, sord }: @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { libsamplerate libsndfile lilv lrdf lv2 qtsvg rtaudio rubberband sord ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://muse-sequencer.github.io/"; description = "MIDI/Audio sequencer with recording and editing capabilities"; longDescription = '' diff --git a/pkgs/applications/audio/musescore/darwin.nix b/pkgs/applications/audio/musescore/darwin.nix index 4a2ae29f36ad..8cc876ab19e8 100644 --- a/pkgs/applications/audio/musescore/darwin.nix +++ b/pkgs/applications/audio/musescore/darwin.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { chmod a+x "$out/Applications/${appName}.app/Contents/MacOS/mscore" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Music notation and composition software"; homepage = "https://musescore.org/"; license = licenses.gpl2; diff --git a/pkgs/applications/audio/musescore/default.nix b/pkgs/applications/audio/musescore/default.nix index 18026808b2b7..fa05e45b6689 100644 --- a/pkgs/applications/audio/musescore/default.nix +++ b/pkgs/applications/audio/musescore/default.nix @@ -40,7 +40,7 @@ mkDerivation rec { qtscript qtsvg qttools qtwebengine qtxmlpatterns ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Music notation and composition software"; homepage = "https://musescore.org/"; license = licenses.gpl2; diff --git a/pkgs/applications/audio/musikcube/default.nix b/pkgs/applications/audio/musikcube/default.nix index 10a3b3b87358..fba80928b0d1 100644 --- a/pkgs/applications/audio/musikcube/default.nix +++ b/pkgs/applications/audio/musikcube/default.nix @@ -10,7 +10,7 @@ , libmicrohttpd , ncurses , pulseaudio -, stdenv +, lib, stdenv , taglib , systemdSupport ? stdenv.isLinux, systemd }: @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { "-DDISABLE_STRIP=true" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A fully functional terminal-based music player, library, and streaming audio server"; homepage = "https://musikcube.com/"; maintainers = [ maintainers.aanderse ]; diff --git a/pkgs/applications/audio/musly/default.nix b/pkgs/applications/audio/musly/default.nix index 7ef2b400b769..1e8d29d37707 100644 --- a/pkgs/applications/audio/musly/default.nix +++ b/pkgs/applications/audio/musly/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, eigen, libav }: +{ lib, stdenv, fetchFromGitHub, cmake, eigen, libav }: stdenv.mkDerivation { pname = "musly"; version = "unstable-2017-04-26"; @@ -16,7 +16,7 @@ stdenv.mkDerivation { install_name_tool -change libmusly_resample.dylib $out/lib/libmusly_resample.dylib $out/lib/libmusly.dylib '' else ""; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.musly.org"; description = "A fast and high-quality audio music similarity library written in C/C++"; longDescription = '' diff --git a/pkgs/applications/audio/ncmpc/default.nix b/pkgs/applications/audio/ncmpc/default.nix index 97aa06453e52..2deff6162fbe 100644 --- a/pkgs/applications/audio/ncmpc/default.nix +++ b/pkgs/applications/audio/ncmpc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, glib, ncurses +{ lib, stdenv, fetchFromGitHub, meson, ninja, pkgconfig, glib, ncurses , mpd_clientlib, gettext, boost , pcreSupport ? false , pcre ? null @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { "-Ddocumentation=disabled" ] ++ optional (!pcreSupport) "-Dregex=disabled"; - meta = with stdenv.lib; { + meta = with lib; { description = "Curses-based interface for MPD (music player daemon)"; homepage = "https://www.musicpd.org/clients/ncmpc/"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/audio/ncpamixer/default.nix b/pkgs/applications/audio/ncpamixer/default.nix index 89a0da5e0d63..70acc81404e5 100644 --- a/pkgs/applications/audio/ncpamixer/default.nix +++ b/pkgs/applications/audio/ncpamixer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, ncurses, libpulseaudio, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, cmake, ncurses, libpulseaudio, pkg-config }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ ncurses libpulseaudio ]; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; configurePhase = '' make PREFIX=$out build/Makefile @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { make build ''; - meta = with stdenv.lib; { + meta = with lib; { description = "An ncurses mixer for PulseAudio inspired by pavucontrol"; homepage = "https://github.com/fulhax/ncpamixer"; license = licenses.mit; diff --git a/pkgs/applications/audio/ncspot/default.nix b/pkgs/applications/audio/ncspot/default.nix index a1019880318e..9cc96bd03a70 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.6"; + version = "0.3.0"; src = fetchFromGitHub { owner = "hrkfdn"; repo = "ncspot"; rev = "v${version}"; - sha256 = "0x40qzgw9zcih4q6mzclb7gqkw8h76hrmqzmg6nimpla29jcdxss"; + sha256 = "1dfq6ickx24cq8zhhm0a8x5ycd0iygw065qd2blcgl0fim350zw9"; }; - cargoSha256 = "1pfl7cblf7d4ci514vlkdh1ybgby71x4aszxmlsrqmn92bq56jys"; + cargoSha256 = "0z4af575rx6ggjxsw1q18kwsb4cvyy1kzfkp32v9n74krmy0fk8p"; cargoBuildFlags = [ "--no-default-features" "--features" "${lib.concatStringsSep "," features}" ]; diff --git a/pkgs/applications/audio/netease-music-tui/default.nix b/pkgs/applications/audio/netease-music-tui/default.nix index 88e8ba6d0bc6..0322459685f2 100644 --- a/pkgs/applications/audio/netease-music-tui/default.nix +++ b/pkgs/applications/audio/netease-music-tui/default.nix @@ -7,7 +7,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "betta-cyber"; repo = "netease-music-tui"; - rev = "${version}"; + rev = version; sha256 = "0m5b3q493d32kxznm4apn56216l07b1c49km236i03mpfvdw7m1f"; }; diff --git a/pkgs/applications/audio/new-session-manager/default.nix b/pkgs/applications/audio/new-session-manager/default.nix new file mode 100644 index 000000000000..8d359b29201d --- /dev/null +++ b/pkgs/applications/audio/new-session-manager/default.nix @@ -0,0 +1,27 @@ +{ lib, stdenv, fetchFromGitHub, meson, pkg-config, ninja, liblo, libjack2, fltk }: + +stdenv.mkDerivation rec { + pname = "new-session-manager"; + version = "1.4.0"; + + src = fetchFromGitHub { + owner = "linuxaudio"; + repo = "new-session-manager"; + rev = "v${version}"; + sha256 = "PqOv4tx3NLxL2+GWIUVgL72EQYMyDPIMrAkyby3TZ+0="; + }; + + nativeBuildInputs = [ meson pkg-config ninja ]; + + buildInputs = [ liblo libjack2 fltk ]; + + hardeningDisable = [ "format" ]; + + meta = with lib; { + homepage = "https://linuxaudio.github.io/new-session-manager/"; + description = "A session manager designed for audio applications."; + maintainers = [ maintainers._6AA4FD ]; + license = licenses.gpl3Plus; + platforms = ["x86_64-linux"]; + }; +} diff --git a/pkgs/applications/audio/ninjas2/default.nix b/pkgs/applications/audio/ninjas2/default.nix index 3a23347c1e76..5af483ecfe3f 100644 --- a/pkgs/applications/audio/ninjas2/default.nix +++ b/pkgs/applications/audio/ninjas2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libjack2, libGL, pkgconfig, xorg, mesa, libsndfile, libsamplerate }: +{ lib, stdenv, fetchFromGitHub, libjack2, libGL, pkgconfig, xorg, mesa, libsndfile, libsamplerate }: stdenv.mkDerivation rec { pname = "ninjas2"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/clearly-broken-software/ninjas2"; description = "sample slicer plugin for LV2, VST, and jack standalone"; license = with licenses; [ gpl3 ]; diff --git a/pkgs/applications/audio/noise-repellent/default.nix b/pkgs/applications/audio/noise-repellent/default.nix index 3b2f233c6afe..88281cd0989a 100644 --- a/pkgs/applications/audio/noise-repellent/default.nix +++ b/pkgs/applications/audio/noise-repellent/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, fftwFloat, lv2 }: +{ lib, stdenv, fetchFromGitHub, meson, ninja, pkgconfig, fftwFloat, lv2 }: stdenv.mkDerivation rec { pname = "noise-repellent"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { fftwFloat lv2 ]; - meta = with stdenv.lib; { + meta = with lib; { description = "An lv2 plugin for broadband noise reduction"; homepage = "https://github.com/lucianodato/noise-repellent"; license = licenses.gpl3; diff --git a/pkgs/applications/audio/noisetorch/default.nix b/pkgs/applications/audio/noisetorch/default.nix index 1796927f5298..bb22b3cec221 100644 --- a/pkgs/applications/audio/noisetorch/default.nix +++ b/pkgs/applications/audio/noisetorch/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, rnnoise-plugin }: +{ lib, stdenv, buildGoModule, fetchFromGitHub, rnnoise-plugin }: buildGoModule rec { pname = "NoiseTorch"; @@ -36,7 +36,7 @@ buildGoModule rec { cp assets/noisetorch.desktop $out/share/applications/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Virtual microphone device with noise supression for PulseAudio"; homepage = "https://github.com/lawl/NoiseTorch"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/audio/nootka/default.nix b/pkgs/applications/audio/nootka/default.nix index b0d4843aecd5..b1b60540b8c2 100644 --- a/pkgs/applications/audio/nootka/default.nix +++ b/pkgs/applications/audio/nootka/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake +{ lib, stdenv, fetchurl, cmake , alsaLib, fftwSinglePrec, libjack2, libpulseaudio, libvorbis, soundtouch, qtbase }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { "-DENABLE_PULSEAUDIO=ON" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Application for practicing playing musical scores and ear training"; homepage = "https://nootka.sourceforge.io/"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/audio/nootka/unstable.nix b/pkgs/applications/audio/nootka/unstable.nix index 16df55c1dfba..1fb70c195dc0 100644 --- a/pkgs/applications/audio/nootka/unstable.nix +++ b/pkgs/applications/audio/nootka/unstable.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake +{ lib, stdenv, fetchurl, cmake , alsaLib, fftwSinglePrec, libjack2, libpulseaudio, libvorbis, soundtouch , qtbase, qtdeclarative, qtquickcontrols2 }: @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { "-DENABLE_PULSEAUDIO=ON" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Application for practicing playing musical scores and ear training"; homepage = "https://nootka.sourceforge.io/"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/audio/normalize/default.nix b/pkgs/applications/audio/normalize/default.nix index 0aa264116932..78951c67e8d8 100644 --- a/pkgs/applications/audio/normalize/default.nix +++ b/pkgs/applications/audio/normalize/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libmad }: +{ lib, stdenv, fetchurl, libmad }: stdenv.mkDerivation rec { pname = "normalize"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ libmad ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.nongnu.org/normalize/"; description = "Audio file normalizer"; license = licenses.gpl2; diff --git a/pkgs/applications/audio/nova-filters/default.nix b/pkgs/applications/audio/nova-filters/default.nix index bc5a3efc59a3..ed5ec3617142 100644 --- a/pkgs/applications/audio/nova-filters/default.nix +++ b/pkgs/applications/audio/nova-filters/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, sconsPackages, boost, ladspaH, pkgconfig }: +{lib, stdenv, fetchurl, sconsPackages, boost, ladspaH, pkgconfig }: stdenv.mkDerivation { version = "0.2-2"; @@ -21,7 +21,7 @@ stdenv.mkDerivation { sed -i "s/= check/= detail::filter_base::check/" nova/source/dsp/filter.hpp ''; - meta = with stdenv.lib; { + meta = with lib; { description = "LADSPA plugins based on filters of nova"; homepage = "http://klingt.org/~tim/nova-filters/"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/audio/ocenaudio/default.nix b/pkgs/applications/audio/ocenaudio/default.nix index 83b1ef3b0430..c3ab0ffcebd1 100644 --- a/pkgs/applications/audio/ocenaudio/default.nix +++ b/pkgs/applications/audio/ocenaudio/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { ln -s ${bzip2.out}/lib/libbz2.so.1 $out/libbz2.so.1.0 ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Cross-platform, easy to use, fast and functional audio editor"; homepage = "https://www.ocenaudio.com"; license = licenses.unfree; diff --git a/pkgs/applications/audio/openmpt123/default.nix b/pkgs/applications/audio/openmpt123/default.nix index 4d1387bf6331..486a98275114 100644 --- a/pkgs/applications/audio/openmpt123/default.nix +++ b/pkgs/applications/audio/openmpt123/default.nix @@ -1,4 +1,4 @@ -{ config, stdenv, fetchurl, zlib, pkgconfig, mpg123, libogg, libvorbis, portaudio, libsndfile, flac +{ config, lib, stdenv, fetchurl, zlib, pkgconfig, mpg123, libogg, libvorbis, portaudio, libsndfile, flac , usePulseAudio ? config.pulseaudio or false, libpulseaudio }: let @@ -21,7 +21,7 @@ in stdenv.mkDerivation { configureFlags = stdenv.lib.optional (!usePulseAudio) "--without-pulseaudio"; - meta = with stdenv.lib; { + meta = with lib; { description = "A cross-platform command-line based module file player"; homepage = "https://lib.openmpt.org/libopenmpt/"; license = licenses.bsd3; diff --git a/pkgs/applications/audio/opusfile/default.nix b/pkgs/applications/audio/opusfile/default.nix index 8c83eb01b368..34813c05e5b2 100644 --- a/pkgs/applications/audio/opusfile/default.nix +++ b/pkgs/applications/audio/opusfile/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, openssl, libogg, libopus }: +{ lib, stdenv, fetchurl, pkgconfig, openssl, libogg, libopus }: stdenv.mkDerivation rec { name = "opusfile-0.12"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { patches = [ ./include-multistream.patch ]; configureFlags = [ "--disable-examples" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "High-level API for decoding and seeking in .opus files"; homepage = "https://www.opus-codec.org/"; license = licenses.bsd3; diff --git a/pkgs/applications/audio/opustags/default.nix b/pkgs/applications/audio/opustags/default.nix index 8e5546aec8b6..83cf44853a5a 100644 --- a/pkgs/applications/audio/opustags/default.nix +++ b/pkgs/applications/audio/opustags/default.nix @@ -1,24 +1,37 @@ -{ stdenv, lib, cmake, pkgconfig, libogg, fetchFromGitHub, libiconv }: +{ stdenv, lib, fetchFromGitHub, cmake, pkg-config, libiconv, libogg +, ffmpeg, glibcLocales, perl, perlPackages }: + stdenv.mkDerivation rec { pname = "opustags"; - version = "1.4.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = "fmang"; repo = "opustags"; rev = version; - sha256 = "1y0czl72paawy342ff9ickaamkih43k59yfcdw7bnddypyfa7nbg"; + sha256 = "1wsfw713rhi2gg5xc04cx5i31hlw0l3wdflj3r1y8w45bdk6ag1z"; }; buildInputs = [ libogg ]; - nativeBuildInputs = [ cmake pkgconfig ] ++ lib.optional stdenv.isDarwin libiconv; + nativeBuildInputs = [ cmake pkg-config ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; + + doCheck = true; + + checkInputs = [ ffmpeg glibcLocales perl ] ++ (with perlPackages; [ ListMoreUtils ]); + + checkPhase = '' + export LANG="en_US.UTF-8" + export LC_ALL="en_US.UTF-8" + make check + ''; meta = with lib; { homepage = "https://github.com/fmang/opustags"; description = "Ogg Opus tags editor"; platforms = platforms.all; - maintainers = [ maintainers.kmein ]; + broken = stdenv.isDarwin; + maintainers = with maintainers; [ kmein SuperSandro2000 ]; license = licenses.bsd3; }; } diff --git a/pkgs/applications/audio/orca-c/default.nix b/pkgs/applications/audio/orca-c/default.nix index 74c74578beb9..4cd5d52613ad 100644 --- a/pkgs/applications/audio/orca-c/default.nix +++ b/pkgs/applications/audio/orca-c/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ncurses, portmidi }: +{ lib, stdenv, fetchFromGitHub, ncurses, portmidi }: stdenv.mkDerivation { pname = "orca-c"; @@ -22,7 +22,7 @@ stdenv.mkDerivation { install build/orca $out/bin/orca ''; - meta = with stdenv.lib; { + meta = with lib; { description = "An esoteric programming language designed to quickly create procedural sequencers"; homepage = "https://github.com/hundredrabbits/Orca-c"; license = licenses.mit; diff --git a/pkgs/applications/audio/osmid/default.nix b/pkgs/applications/audio/osmid/default.nix index 2e31efd8172c..f16b146e616a 100644 --- a/pkgs/applications/audio/osmid/default.nix +++ b/pkgs/applications/audio/osmid/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , cmake , alsaLib @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/llloret/osmid"; description = "A lightweight, portable, easy to use tool to convert MIDI to OSC and OSC to MIDI"; license = licenses.mit; diff --git a/pkgs/applications/audio/padthv1/default.nix b/pkgs/applications/audio/padthv1/default.nix index e321119d838f..4db337917ed6 100644 --- a/pkgs/applications/audio/padthv1/default.nix +++ b/pkgs/applications/audio/padthv1/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libjack2, alsaLib, libsndfile, liblo, lv2, qt5, fftwFloat, mkDerivation }: +{ lib, stdenv, fetchurl, pkgconfig, libjack2, alsaLib, libsndfile, liblo, lv2, qt5, fftwFloat, mkDerivation }: mkDerivation rec { pname = "padthv1"; @@ -13,7 +13,7 @@ mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; - meta = with stdenv.lib; { + meta = with lib; { description = "polyphonic additive synthesizer"; homepage = "http://padthv1.sourceforge.net/"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/audio/pamix/default.nix b/pkgs/applications/audio/pamix/default.nix index cc5d84d9471b..deb8bec28c20 100644 --- a/pkgs/applications/audio/pamix/default.nix +++ b/pkgs/applications/audio/pamix/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , pkgconfig, cmake , libpulseaudio, ncurses }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ libpulseaudio ncurses ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Pulseaudio terminal mixer"; homepage = "https://github.com/patroclos/PAmix"; license = licenses.mit; diff --git a/pkgs/applications/audio/pamixer/default.nix b/pkgs/applications/audio/pamixer/default.nix index 3e2192c04148..244e688fe571 100644 --- a/pkgs/applications/audio/pamixer/default.nix +++ b/pkgs/applications/audio/pamixer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, boost, libpulseaudio }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, boost, libpulseaudio }: stdenv.mkDerivation rec { pname = "pamixer"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { install -Dm755 pamixer -t $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Pulseaudio command line mixer"; longDescription = '' Features: diff --git a/pkgs/applications/audio/paprefs/default.nix b/pkgs/applications/audio/paprefs/default.nix index b5ec1206ce3d..f2ac17f15567 100644 --- a/pkgs/applications/audio/paprefs/default.nix +++ b/pkgs/applications/audio/paprefs/default.nix @@ -1,5 +1,5 @@ { fetchurl -, stdenv +, lib, stdenv , meson , ninja , gettext @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { gtkmm3 ]; - meta = with stdenv.lib; { + meta = with lib; { description = "PulseAudio Preferences"; longDescription = '' diff --git a/pkgs/applications/audio/parlatype/default.nix b/pkgs/applications/audio/parlatype/default.nix index b9babddb800f..7ca0d347fea1 100644 --- a/pkgs/applications/audio/parlatype/default.nix +++ b/pkgs/applications/audio/parlatype/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, meson, gtk3, at-spi2-core, dbus, gst_all_1, sphinxbase, pocketsphinx, ninja, gettext, appstream-glib, python3, glib, gobject-introspection, gsettings-desktop-schemas, itstool, wrapGAppsHook, hicolor-icon-theme }: +{ lib, stdenv, fetchFromGitHub, pkgconfig, meson, gtk3, at-spi2-core, dbus, gst_all_1, sphinxbase, pocketsphinx, ninja, gettext, appstream-glib, python3, glib, gobject-introspection, gsettings-desktop-schemas, itstool, wrapGAppsHook, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "parlatype"; @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { export GST_PLUGIN_SYSTEM_PATH_1_0="$out/lib/gstreamer-1.0/:$GST_PLUGIN_SYSTEM_PATH_1_0" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "GNOME audio player for transcription"; longDescription = '' Parlatype is a minimal audio player for manual speech transcription, written for the GNOME desktop environment. diff --git a/pkgs/applications/audio/paulstretch/default.nix b/pkgs/applications/audio/paulstretch/default.nix index f6cee7672f7c..f56ad4f59301 100644 --- a/pkgs/applications/audio/paulstretch/default.nix +++ b/pkgs/applications/audio/paulstretch/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch +{ lib, stdenv, fetchFromGitHub, fetchpatch , audiofile, libvorbis, fltk, fftw, fftwFloat , minixml, pkgconfig, libmad, libjack2, portaudio, libsamplerate }: @@ -44,7 +44,7 @@ stdenv.mkDerivation { install -Dm555 ./paulstretch $out/bin/paulstretch ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Produces high quality extreme sound stretching"; longDescription = '' This is a program for stretching the audio. It is suitable only for diff --git a/pkgs/applications/audio/pavucontrol/default.nix b/pkgs/applications/audio/pavucontrol/default.nix index f0a0956f662b..ffc56e54586c 100644 --- a/pkgs/applications/audio/pavucontrol/default.nix +++ b/pkgs/applications/audio/pavucontrol/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchpatch, stdenv, pkgconfig, intltool, libpulseaudio, +{ fetchurl, fetchpatch, lib, stdenv, pkgconfig, intltool, libpulseaudio, gtkmm3 , libcanberra-gtk3, gnome3, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-lynx" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "PulseAudio Volume Control"; longDescription = '' diff --git a/pkgs/applications/audio/petrifoo/default.nix b/pkgs/applications/audio/petrifoo/default.nix index 322eba2b9521..fb29f9b13e2b 100644 --- a/pkgs/applications/audio/petrifoo/default.nix +++ b/pkgs/applications/audio/petrifoo/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, alsaLib, cmake, gtk2, libjack2, libgnomecanvas +{ lib, stdenv, fetchurl, alsaLib, cmake, gtk2, libjack2, libgnomecanvas , libpthreadstubs, libsamplerate, libsndfile, libtool, libxml2 -, pkgconfig, openssl }: +, pkg-config, openssl }: stdenv.mkDerivation rec { pname = "petri-foo"; @@ -11,12 +11,12 @@ stdenv.mkDerivation rec { sha256 = "0b25iicgn8c42487fdw32ycfrll1pm2zjgy5djvgw6mfcaa4gizh"; }; - buildInputs = - [ alsaLib cmake gtk2 libjack2 libgnomecanvas libpthreadstubs - libsamplerate libsndfile libtool libxml2 pkgconfig openssl - ]; + nativeBuildInputs = [ cmake pkg-config ]; - meta = with stdenv.lib; { + buildInputs = [ alsaLib gtk2 libjack2 libgnomecanvas libpthreadstubs + libsamplerate libsndfile libtool libxml2 openssl ]; + + meta = with lib; { description = "MIDI controllable audio sampler"; longDescription = "a fork of Specimen"; homepage = "http://petri-foo.sourceforge.net"; diff --git a/pkgs/applications/audio/pianobar/default.nix b/pkgs/applications/audio/pianobar/default.nix index 4cdf415d26bf..b53c088b7af9 100644 --- a/pkgs/applications/audio/pianobar/default.nix +++ b/pkgs/applications/audio/pianobar/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, libao, json_c, libgcrypt, ffmpeg_3, curl }: +{ fetchurl, lib, stdenv, pkgconfig, libao, json_c, libgcrypt, ffmpeg_3, curl }: stdenv.mkDerivation rec { name = "pianobar-2020.04.05"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { CC = "gcc"; CFLAGS = "-std=c99"; - meta = with stdenv.lib; { + meta = with lib; { description = "A console front-end for Pandora.com"; homepage = "https://6xq.net/pianobar/"; platforms = platforms.unix; diff --git a/pkgs/applications/audio/pianobooster/default.nix b/pkgs/applications/audio/pianobooster/default.nix index b92808775c8a..f1d35d7e78e0 100644 --- a/pkgs/applications/audio/pianobooster/default.nix +++ b/pkgs/applications/audio/pianobooster/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkg-config, qttools +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, qttools , alsaLib, ftgl, libGLU, libjack2, qtbase, rtmidi, wrapQtAppsHook }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { "-DOpenGL_GL_PREFERENCE=GLVND" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A MIDI file player that teaches you how to play the piano"; homepage = "https://github.com/captnfab/PianoBooster"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/audio/picard/default.nix b/pkgs/applications/audio/picard/default.nix index 17d68c1e5dda..8a7c1b322454 100644 --- a/pkgs/applications/audio/picard/default.nix +++ b/pkgs/applications/audio/picard/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python3Packages, fetchFromGitHub, gettext, chromaprint, qt5 +{ lib, stdenv, python3Packages, fetchFromGitHub, gettext, chromaprint, qt5 , enablePlayback ? true , gst_all_1 }: @@ -12,13 +12,13 @@ let ; in pythonPackages.buildPythonApplication rec { pname = "picard"; - version = "2.5.5"; + version = "2.5.6"; src = fetchFromGitHub { owner = "metabrainz"; repo = pname; rev = "release-${version}"; - sha256 = "0i97cfnfgg4g13ms8x3bq279s4r7jckxxrv3sdz7dxpcn6gkw35s"; + sha256 = "1mkbg44bm642mlpfxsdlw947var6a3sf9m6c897b4n0742hsdkbc"; }; nativeBuildInputs = [ gettext qt5.wrapQtAppsHook qt5.qtbase ] @@ -54,7 +54,7 @@ in pythonPackages.buildPythonApplication rec { '' ; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://picard.musicbrainz.org/"; description = "The official MusicBrainz tagger"; maintainers = with maintainers; [ ehmry ]; diff --git a/pkgs/applications/audio/picoloop/default.nix b/pkgs/applications/audio/picoloop/default.nix index 69052988f26f..519888982ce4 100644 --- a/pkgs/applications/audio/picoloop/default.nix +++ b/pkgs/applications/audio/picoloop/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libpulseaudio, SDL2, SDL2_image, SDL2_ttf, alsaLib, libjack2 }: +{ lib, stdenv, fetchFromGitHub, libpulseaudio, SDL2, SDL2_image, SDL2_ttf, alsaLib, libjack2 }: stdenv.mkDerivation rec { pname = "picoloop"; @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { cp {font.*,LICENSE} $out/share ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A synth and a stepsequencer (a clone of the famous nanoloop)"; homepage = "https://github.com/yoyz/picoloop"; platforms = platforms.linux; diff --git a/pkgs/applications/audio/pithos/default.nix b/pkgs/applications/audio/pithos/default.nix index 6c3ffebc8c95..550cfc909d9c 100644 --- a/pkgs/applications/audio/pithos/default.nix +++ b/pkgs/applications/audio/pithos/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, appstream-glib +{ lib, stdenv, fetchFromGitHub, meson, ninja, pkgconfig, appstream-glib , wrapGAppsHook, pythonPackages, gtk3, gnome3, gobject-introspection , libnotify, libsecret, gst_all_1 }: @@ -27,7 +27,7 @@ pythonPackages.buildPythonApplication rec { (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-ugly gst-plugins-bad ]) ++ (with pythonPackages; [ pygobject3 pylast ]); - meta = with stdenv.lib; { + meta = with lib; { description = "Pandora Internet Radio player for GNOME"; homepage = "https://pithos.github.io/"; license = licenses.gpl3; diff --git a/pkgs/applications/audio/playbar2/default.nix b/pkgs/applications/audio/playbar2/default.nix index 15385e91927c..7545c17131f9 100644 --- a/pkgs/applications/audio/playbar2/default.nix +++ b/pkgs/applications/audio/playbar2/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , cmake , extra-cmake-modules , plasma-framework @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { kwindowsystem ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Mpris2 Client for Plasma5"; homepage = "https://github.com/audoban/PlayBar2"; license = licenses.gpl3; diff --git a/pkgs/applications/audio/plugin-torture/default.nix b/pkgs/applications/audio/plugin-torture/default.nix index 3c852cf450e9..b906e0336014 100644 --- a/pkgs/applications/audio/plugin-torture/default.nix +++ b/pkgs/applications/audio/plugin-torture/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, boost, ladspaH, lilv, lv2, pkgconfig, serd, sord, sratom }: +{ lib, stdenv, fetchFromGitHub, boost, ladspaH, lilv, lv2, pkgconfig, serd, sord, sratom }: stdenv.mkDerivation { pname = "plugin-torture"; @@ -20,7 +20,7 @@ stdenv.mkDerivation { cp find-safe-plugins $out/bin/ ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/cth103/plugin-torture"; description = "A tool to test LADSPA and LV2 plugins"; license = licenses.gpl2; diff --git a/pkgs/applications/audio/plujain-ramp/default.nix b/pkgs/applications/audio/plujain-ramp/default.nix new file mode 100644 index 000000000000..56f4d6da050a --- /dev/null +++ b/pkgs/applications/audio/plujain-ramp/default.nix @@ -0,0 +1,27 @@ +{ lib, stdenv, fetchFromGitHub, lv2 }: + +stdenv.mkDerivation rec { + version = "v1.1.3"; + pname = "plujain-ramp"; + + src = fetchFromGitHub { + owner = "Houston4444"; + repo = "plujain-ramp"; + rev = "1bc1fed211e140c7330d6035122234afe78e5257"; + sha256 = "1k7qpr8c15d623c4zqxwdklp98amildh03cqsnqq5ia9ba8z3016"; + }; + + buildInputs = [ + lv2 + ]; + + installFlags = [ "INSTALL_PATH=$(out)/lib/lv2" ]; + + meta = with lib; { + description = "A mono rhythmic tremolo LV2 Audio Plugin"; + homepage = "https://github.com/Houston4444/plujain-ramp"; + license = licenses.gpl2Only; + platforms = platforms.linux; + maintainers = [ maintainers.hirenashah ]; + }; +} diff --git a/pkgs/applications/audio/pmidi/default.nix b/pkgs/applications/audio/pmidi/default.nix index 3491afaaf7a7..28e9788acbf2 100644 --- a/pkgs/applications/audio/pmidi/default.nix +++ b/pkgs/applications/audio/pmidi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib +{ lib, stdenv, fetchurl, alsaLib , version ? "1.7.1" , sourceSha256 ? "051mv6f13c8y13c1iv3279k1hhzpz4fm9sfczhgp9sim2bjdj055" }: @@ -13,7 +13,7 @@ stdenv.mkDerivation { buildInputs = [ alsaLib ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.parabola.me.uk/alsa/pmidi.html"; description = "A straightforward command line program to play midi files through the ALSA sequencer"; maintainers = with maintainers; [ lheckemann ]; diff --git a/pkgs/applications/audio/polyphone/default.nix b/pkgs/applications/audio/polyphone/default.nix index 270d51840d78..f54e8e8e9f02 100644 --- a/pkgs/applications/audio/polyphone/default.nix +++ b/pkgs/applications/audio/polyphone/default.nix @@ -1,4 +1,4 @@ -{ stdenv, mkDerivation, fetchFromGitHub, qmake, pkgconfig, alsaLib, libjack2, portaudio, libogg, flac, libvorbis, rtmidi, qtsvg }: +{ lib, stdenv, mkDerivation, fetchFromGitHub, qmake, pkgconfig, alsaLib, libjack2, portaudio, libogg, flac, libvorbis, rtmidi, qtsvg }: mkDerivation rec { version = "2.2.0"; @@ -39,7 +39,7 @@ mkDerivation rec { "INCLUDEPATH+=${libjack2}/include/jack" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A soundfont editor for creating musical instruments"; homepage = "https://www.polyphone-soundfonts.com/"; license = licenses.gpl3; diff --git a/pkgs/applications/audio/ponymix/default.nix b/pkgs/applications/audio/ponymix/default.nix index 6c289a97384f..fb28b10448d4 100644 --- a/pkgs/applications/audio/ponymix/default.nix +++ b/pkgs/applications/audio/ponymix/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libpulseaudio, libnotify, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, libpulseaudio, libnotify, pkgconfig }: stdenv.mkDerivation rec { pname = "ponymix"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { postPatch = ''substituteInPlace Makefile --replace "\$(DESTDIR)/usr" "$out"''; - meta = with stdenv.lib; { + meta = with lib; { description = "CLI PulseAudio Volume Control"; homepage = "https://github.com/falconindy/ponymix"; license = licenses.mit; diff --git a/pkgs/applications/audio/pt2-clone/default.nix b/pkgs/applications/audio/pt2-clone/default.nix index 6fb2fb9687f0..011ef8d12e5c 100644 --- a/pkgs/applications/audio/pt2-clone/default.nix +++ b/pkgs/applications/audio/pt2-clone/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , cmake , nixosTests @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "pt2-clone"; - version = "1.27"; + version = "1.28"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "pt2-clone"; rev = "v${version}"; - sha256 = "1hg36pfzgdbhd5bkzi3cpn6v39q8xis2jk7w6qm615r587393pwd"; + sha256 = "1c2x43f46l7556kl9y9qign0g6ywdkh7ywkzv6c9y63n68ph20x2"; }; nativeBuildInputs = [ cmake ]; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { pt2-clone-opens = nixosTests.pt2-clone; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A highly accurate clone of the classic ProTracker 2.3D software for Amiga"; homepage = "https://16-bits.org/pt2.php"; license = licenses.bsd3; diff --git a/pkgs/applications/audio/ptcollab/default.nix b/pkgs/applications/audio/ptcollab/default.nix index ff190fdcdd36..36495986201f 100644 --- a/pkgs/applications/audio/ptcollab/default.nix +++ b/pkgs/applications/audio/ptcollab/default.nix @@ -1,5 +1,5 @@ { mkDerivation -, stdenv +, lib, stdenv , fetchFromGitHub , qmake , qtbase @@ -22,7 +22,7 @@ mkDerivation rec { buildInputs = [ qtbase qtmultimedia libvorbis ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Experimental pxtone editor where you can collaborate with friends"; homepage = "https://yuxshao.github.io/ptcollab/"; license = licenses.mit; diff --git a/pkgs/applications/audio/puddletag/default.nix b/pkgs/applications/audio/puddletag/default.nix index 55cde08fe871..94a571df2944 100644 --- a/pkgs/applications/audio/puddletag/default.nix +++ b/pkgs/applications/audio/puddletag/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python3Packages, wrapQtAppsHook, chromaprint }: +{ lib, stdenv, fetchFromGitHub, python3Packages, wrapQtAppsHook, chromaprint }: python3Packages.buildPythonApplication rec { pname = "puddletag"; @@ -30,7 +30,7 @@ python3Packages.buildPythonApplication rec { dontStrip = true; # we are not generating any binaries - meta = with stdenv.lib; { + meta = with lib; { description = "An audio tag editor similar to the Windows program, Mp3tag"; homepage = "https://docs.puddletag.net"; license = licenses.gpl3; diff --git a/pkgs/applications/audio/pulseaudio-ctl/default.nix b/pkgs/applications/audio/pulseaudio-ctl/default.nix index 6a19d959a23d..245c58a21196 100644 --- a/pkgs/applications/audio/pulseaudio-ctl/default.nix +++ b/pkgs/applications/audio/pulseaudio-ctl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, makeWrapper +{ lib, stdenv, fetchFromGitHub, makeWrapper , bc, dbus, gawk, gnused, libnotify, pulseaudio }: let @@ -31,7 +31,7 @@ in stdenv.mkDerivation rec { --prefix PATH : ${path} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Control pulseaudio volume from the shell or mapped to keyboard shortcuts. No need for alsa-utils"; homepage = "https://bbs.archlinux.org/viewtopic.php?id=124513"; license = licenses.mit; diff --git a/pkgs/applications/audio/pulseaudio-dlna/default.nix b/pkgs/applications/audio/pulseaudio-dlna/default.nix index c0986880c094..3c80a5212861 100644 --- a/pkgs/applications/audio/pulseaudio-dlna/default.nix +++ b/pkgs/applications/audio/pulseaudio-dlna/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, stdenv, pythonPackages +{ fetchFromGitHub, lib, stdenv, pythonPackages , mp3Support ? true, lame ? null , opusSupport ? true, opusTools ? null , faacSupport ? false, faac ? null @@ -44,7 +44,7 @@ pythonPackages.buildPythonApplication { $out/bin/pulseaudio-dlna --help > /dev/null ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A lightweight streaming server which brings DLNA / UPNP and Chromecast support to PulseAudio and Linux"; homepage = "https://github.com/masmu/pulseaudio-dlna"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/audio/pulseaudio-dlna/zeroconf.nix b/pkgs/applications/audio/pulseaudio-dlna/zeroconf.nix index efe39aa1600e..e28aabe8dab1 100644 --- a/pkgs/applications/audio/pulseaudio-dlna/zeroconf.nix +++ b/pkgs/applications/audio/pulseaudio-dlna/zeroconf.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , ifaddr @@ -21,7 +21,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ netifaces six enum-compat ifaddr ] ++ stdenv.lib.optionals (pythonOlder "3.5") [ typing ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A pure python implementation of multicast DNS service discovery"; homepage = "https://github.com/jstasiak/python-zeroconf"; license = licenses.lgpl21; diff --git a/pkgs/applications/audio/pulseaudio-modules-bt/default.nix b/pkgs/applications/audio/pulseaudio-modules-bt/default.nix index 42e780af0989..c7dc2cc3b1d3 100644 --- a/pkgs/applications/audio/pulseaudio-modules-bt/default.nix +++ b/pkgs/applications/audio/pulseaudio-modules-bt/default.nix @@ -81,7 +81,7 @@ in stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/EHfive/pulseaudio-modules-bt"; description = "LDAC, aptX, aptX HD, AAC codecs (A2DP Audio) support for Linux PulseAudio"; platforms = platforms.linux; diff --git a/pkgs/applications/audio/pulseeffects/default.nix b/pkgs/applications/audio/pulseeffects/default.nix index a66cd0052772..f0f3ad60b410 100644 --- a/pkgs/applications/audio/pulseeffects/default.nix +++ b/pkgs/applications/audio/pulseeffects/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , meson , ninja @@ -45,13 +45,13 @@ let ]; in stdenv.mkDerivation rec { pname = "pulseeffects"; - version = "4.8.3"; + version = "4.8.4"; src = fetchFromGitHub { owner = "wwmm"; repo = "pulseeffects"; rev = "v${version}"; - sha256 = "0k5p5y3im7xnf0ikaghh56nfhirkdwf95c8fr17wasgdpw2m86i2"; + sha256 = "19sndxvszafbd1l2033g2irpx2jrwi5bpbx8r35047wi0z7djiag"; }; nativeBuildInputs = [ @@ -104,7 +104,7 @@ in stdenv.mkDerivation rec { BOOST_INCLUDEDIR = "${stdenv.lib.getDev boost}/include"; BOOST_LIBRARYDIR = "${stdenv.lib.getLib boost}/lib"; - meta = with stdenv.lib; { + meta = with lib; { description = "Limiter, compressor, reverberation, equalizer and auto volume effects for Pulseaudio applications"; homepage = "https://github.com/wwmm/pulseeffects"; license = licenses.gpl3; diff --git a/pkgs/applications/audio/puredata/default.nix b/pkgs/applications/audio/puredata/default.nix index 4b221cd1a76b..9bc6903e51b8 100644 --- a/pkgs/applications/audio/puredata/default.nix +++ b/pkgs/applications/audio/puredata/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, gettext, makeWrapper +{ lib, stdenv, fetchurl, autoreconfHook, gettext, makeWrapper , alsaLib, libjack2, tk, fftw }: @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/pd --prefix PATH : ${tk}/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = ''A real-time graphical programming environment for audio, video, and graphical processing''; homepage = "http://puredata.info"; diff --git a/pkgs/applications/audio/qjackctl/default.nix b/pkgs/applications/audio/qjackctl/default.nix index 4ac64afe8547..51972e6bfebe 100644 --- a/pkgs/applications/audio/qjackctl/default.nix +++ b/pkgs/applications/audio/qjackctl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, mkDerivation, fetchFromGitHub +{ lib, stdenv, mkDerivation, fetchFromGitHub , pkg-config, cmake, alsaLib, libjack2, dbus, qtbase, qttools, qtx11extras # Enable jack session support , jackSession ? false @@ -36,7 +36,7 @@ mkDerivation rec { "-DCONFIG_JACK_SESSION=${toString jackSession}" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A Qt application to control the JACK sound server daemon"; homepage = "https://github.com/rncbc/qjackctl"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/audio/qmidiarp/default.nix b/pkgs/applications/audio/qmidiarp/default.nix index 4bbfe79a2c9f..4fa165a05a9c 100644 --- a/pkgs/applications/audio/qmidiarp/default.nix +++ b/pkgs/applications/audio/qmidiarp/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchgit , automake , autoreconfHook @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { qttools ]); - meta = with stdenv.lib; { + meta = with lib; { description = "An advanced MIDI arpeggiator"; longDescription = '' An advanced MIDI arpeggiator, programmable step sequencer and LFO for Linux. diff --git a/pkgs/applications/audio/qmidiroute/default.nix b/pkgs/applications/audio/qmidiroute/default.nix index 2a83d98b6ea3..ee983f780145 100644 --- a/pkgs/applications/audio/qmidiroute/default.nix +++ b/pkgs/applications/audio/qmidiroute/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, qt4, alsaLib }: +{ lib, stdenv, fetchurl, pkgconfig, qt4, alsaLib }: stdenv.mkDerivation rec { version = "0.4.0"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ qt4 alsaLib ]; - meta = with stdenv.lib; { + meta = with lib; { description = "MIDI event processor and router"; longDescription = '' qmidiroute is a versatile MIDI event processor and router for the ALSA diff --git a/pkgs/applications/audio/qmmp/default.nix b/pkgs/applications/audio/qmmp/default.nix index e6f41711fdf6..f5015325d850 100644 --- a/pkgs/applications/audio/qmmp/default.nix +++ b/pkgs/applications/audio/qmmp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, mkDerivation, fetchurl, cmake, pkgconfig, xlibsWrapper +{ lib, stdenv, mkDerivation, fetchurl, cmake, pkgconfig, xlibsWrapper , qtbase, qttools, qtmultimedia, qtx11extras # transports , curl, libmms @@ -51,9 +51,7 @@ mkDerivation rec { libsamplerate ]; - enableParallelBuilding = true; - - meta = with stdenv.lib; { + meta = with lib; { description = "Qt-based audio player that looks like Winamp"; homepage = "http://qmmp.ylsoftware.com/"; license = licenses.gpl2; diff --git a/pkgs/applications/audio/qsampler/default.nix b/pkgs/applications/audio/qsampler/default.nix index 1f65b3748381..0418957dee0b 100644 --- a/pkgs/applications/audio/qsampler/default.nix +++ b/pkgs/applications/audio/qsampler/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoconf, automake, libtool, pkgconfig, qttools +{ lib, stdenv, fetchurl, autoconf, automake, libtool, pkgconfig, qttools , liblscp, libgig, qtbase, mkDerivation }: mkDerivation rec { @@ -17,7 +17,7 @@ mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.linuxsampler.org"; description = "Graphical frontend to LinuxSampler"; license = licenses.gpl2; diff --git a/pkgs/applications/audio/qsynth/default.nix b/pkgs/applications/audio/qsynth/default.nix index af59bb56eb9a..1ea7852dc102 100644 --- a/pkgs/applications/audio/qsynth/default.nix +++ b/pkgs/applications/audio/qsynth/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, fluidsynth, libjack2, autoconf, pkgconfig +{ lib, stdenv, fetchurl, alsaLib, fluidsynth, libjack2, autoconf, pkgconfig , mkDerivation, qtbase, qttools, qtx11extras }: @@ -17,7 +17,7 @@ mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Fluidsynth GUI"; homepage = "https://sourceforge.net/projects/qsynth"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/audio/qtractor/default.nix b/pkgs/applications/audio/qtractor/default.nix index f2d5ae1c8092..493a99f6b71b 100644 --- a/pkgs/applications/audio/qtractor/default.nix +++ b/pkgs/applications/audio/qtractor/default.nix @@ -24,7 +24,7 @@ , serd , sord , sratom -, stdenv +, lib, stdenv , suil }: @@ -69,7 +69,7 @@ mkDerivation rec { suil ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Audio/MIDI multi-track sequencer"; homepage = "https://qtractor.sourceforge.io"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix index 386a5110a817..00da41e308a8 100644 --- a/pkgs/applications/audio/quodlibet/default.nix +++ b/pkgs/applications/audio/quodlibet/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python3, wrapGAppsHook, gettext, libsoup, gnome3, gtk3, gdk-pixbuf, librsvg, +{ lib, stdenv, fetchurl, python3, wrapGAppsHook, gettext, libsoup, gnome3, gtk3, gdk-pixbuf, librsvg, tag ? "", xvfb_run, dbus, glibcLocales, glib, glib-networking, gobject-introspection, hicolor-icon-theme, gst_all_1, withGstPlugins ? true, xineBackend ? false, xineLib, @@ -67,7 +67,7 @@ python3.pkgs.buildPythonApplication rec { preFixup = stdenv.lib.optionalString (kakasi != null) "gappsWrapperArgs+=(--prefix PATH : ${kakasi}/bin)"; - meta = with stdenv.lib; { + meta = with lib; { description = "GTK-based audio player written in Python, using the Mutagen tagging library"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/audio/radiotray-ng/default.nix b/pkgs/applications/audio/radiotray-ng/default.nix index 014906594a7d..9c5e6a931a97 100644 --- a/pkgs/applications/audio/radiotray-ng/default.nix +++ b/pkgs/applications/audio/radiotray-ng/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , cmake, pkgconfig # Transport , curl @@ -80,8 +80,6 @@ stdenv.mkDerivation rec { "-DBUILD_TESTS=${if doCheck then "ON" else "OFF"}" ]; - enableParallelBuilding = true; - checkInputs = [ gtest ]; doCheck = !stdenv.isAarch64; # single failure that I can't explain @@ -90,7 +88,7 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/rt2rtng --prefix PYTHONPATH : $PYTHONPATH ''; - meta = with stdenv.lib; { + meta = with lib; { description = "An internet radio player for linux"; homepage = "https://github.com/ebruck/radiotray-ng"; license = licenses.gpl3; diff --git a/pkgs/applications/audio/rakarrack/default.nix b/pkgs/applications/audio/rakarrack/default.nix index 4548f9ba624f..8b5dd869e82e 100644 --- a/pkgs/applications/audio/rakarrack/default.nix +++ b/pkgs/applications/audio/rakarrack/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, alsaUtils, fltk, libjack2, libXft, +{ lib, stdenv, fetchurl, alsaLib, alsaUtils, fltk, libjack2, libXft, libXpm, libjpeg, libpng, libsamplerate, libsndfile, zlib }: stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ alsaLib alsaUtils fltk libjack2 libXft libXpm libjpeg libpng libsamplerate libsndfile zlib ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Multi-effects processor emulating a guitar effects pedalboard"; homepage = "http://rakarrack.sourceforge.net"; license = licenses.gpl2; diff --git a/pkgs/applications/audio/real_time_config_quick_scan/default.nix b/pkgs/applications/audio/real_time_config_quick_scan/default.nix index 5193d2899d30..3fb476b65cc4 100644 --- a/pkgs/applications/audio/real_time_config_quick_scan/default.nix +++ b/pkgs/applications/audio/real_time_config_quick_scan/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, perlPackages, makeWrapper }: +{ lib, stdenv, fetchFromGitHub, perlPackages, makeWrapper }: stdenv.mkDerivation rec { pname = "realTimeConfigQuickScan"; @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { --set PERL5LIB "$out/share/$pname:${with perlPackages; makePerlPath [ Tk ]}" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Linux configuration checker for systems to be used for real-time audio"; homepage = "https://github.com/raboof/realtimeconfigquickscan"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/audio/reaper/default.nix b/pkgs/applications/audio/reaper/default.nix index e15addd78b1e..09f8bcfd6b68 100644 --- a/pkgs/applications/audio/reaper/default.nix +++ b/pkgs/applications/audio/reaper/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoPatchelfHook, makeWrapper +{ lib, stdenv, fetchurl, autoPatchelfHook, makeWrapper , alsaLib, xorg, libjack2 , gtk3, pango, gdk-pixbuf, cairo, glib, freetype , libpulseaudio, xdg_utils @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "reaper"; - version = "6.12c"; + version = "6.19"; src = fetchurl { url = "https://www.reaper.fm/files/${stdenv.lib.versions.major version}.x/reaper${builtins.replaceStrings ["."] [""] version}_linux_x86_64.tar.xz"; - sha256 = "1xnd4qvgwsz1dmgb656i611776dqcb84m1gh30i8jhpwcr9ym46w"; + sha256 = "1cdy5ilpfidz7xyqn2i41szr24ilcmpl35aw1vbashf0b6dg48la"; }; nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { ln -s $out/opt/REAPER/reamote-server $out/bin/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Digital audio workstation"; homepage = "https://www.reaper.fm/"; license = licenses.unfree; diff --git a/pkgs/applications/audio/rhythmbox/default.nix b/pkgs/applications/audio/rhythmbox/default.nix index 79560451e540..c07d73530b5a 100644 --- a/pkgs/applications/audio/rhythmbox/default.nix +++ b/pkgs/applications/audio/rhythmbox/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig +{ lib, stdenv, fetchurl, pkgconfig , python3 , perl , perlPackages @@ -57,7 +57,7 @@ in stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://wiki.gnome.org/Apps/Rhythmbox"; description = "A music playing application for GNOME"; license = licenses.gpl2; diff --git a/pkgs/applications/audio/rkrlv2/default.nix b/pkgs/applications/audio/rkrlv2/default.nix index 59979c410838..19fca6af988d 100644 --- a/pkgs/applications/audio/rkrlv2/default.nix +++ b/pkgs/applications/audio/rkrlv2/default.nix @@ -1,26 +1,26 @@ -{ stdenv, fetchFromGitHub, -automake, pkgconfig, lv2, fftw, cmake, xorg, libjack2, libsamplerate, libsndfile -}: +{ lib, stdenv, fetchFromGitHub, pkg-config, lv2, fftw, cmake, libXpm +, libXft, libjack2, libsamplerate, libsndfile }: stdenv.mkDerivation rec { - repo = "rkrlv2"; - name = "${repo}-b2.0"; + pname = "rkrlv2"; + version = "beta_3"; src = fetchFromGitHub { owner = "ssj71"; - inherit repo; - rev = "beta_2"; - sha256 = "128jcilbrd1l65c01w2bazsb21x78mng0jjkhi3x9crf1n9qbh2m"; + repo = pname; + rev = version; + sha256 = "WjpPNUEYw4aGrh57J+7kkxKFXgCJWNaWAmueFbNUJJo="; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = with xorg; [ automake lv2 fftw cmake libXpm libjack2 libsamplerate libsndfile libXft ]; + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ libXft libXpm lv2 fftw libjack2 libsamplerate libsndfile ]; - meta = { + meta = with lib; { description = "Rakarrak effects ported to LV2"; homepage = "https://github.com/ssj71/rkrlv2"; - license = stdenv.lib.licenses.gpl3; - maintainers = [ stdenv.lib.maintainers.joelmo ]; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl2Only; + maintainers = [ maintainers.joelmo ]; + platforms = platforms.unix; + broken = stdenv.isAarch64; # g++: error: unrecognized command line option '-mfpmath=sse' }; } diff --git a/pkgs/applications/audio/rosegarden/default.nix b/pkgs/applications/audio/rosegarden/default.nix index 8bda179df149..31fce7460770 100644 --- a/pkgs/applications/audio/rosegarden/default.nix +++ b/pkgs/applications/audio/rosegarden/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, makedepend, perl, pkgconfig, qttools, wrapQtAppsHook +{ lib, stdenv, fetchurl, cmake, makedepend, perl, pkgconfig, qttools, wrapQtAppsHook , dssi, fftwSinglePrec, ladspaH, ladspaPlugins, libjack2, alsaLib , liblo, libsamplerate, libsndfile, lirc ? null, lrdf, qtbase }: @@ -33,9 +33,7 @@ stdenv.mkDerivation (rec { alsaLib ]; - enableParallelBuilding = true; - - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.rosegardenmusic.com/"; description = "Music composition and editing environment"; longDescription = '' diff --git a/pkgs/applications/audio/rubyripper/default.nix b/pkgs/applications/audio/rubyripper/default.nix index eb6de8431803..b7abfa40b863 100644 --- a/pkgs/applications/audio/rubyripper/default.nix +++ b/pkgs/applications/audio/rubyripper/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ruby, cdparanoia, makeWrapper }: +{ lib, stdenv, fetchurl, ruby, cdparanoia, makeWrapper }: stdenv.mkDerivation rec { version = "0.6.2"; pname = "rubyripper"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { --prefix PATH : "${cdparanoia}/bin" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "High quality CD audio ripper"; platforms = platforms.linux; license = licenses.gpl3; diff --git a/pkgs/applications/audio/sc68/default.nix b/pkgs/applications/audio/sc68/default.nix index 683aa9c36bca..2ea9b123c086 100644 --- a/pkgs/applications/audio/sc68/default.nix +++ b/pkgs/applications/audio/sc68/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchsvn , pkg-config , which @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { buildInputs = [ libao zlib curl ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Atari ST and Amiga music player"; homepage = "http://sc68.atari.org/project.html"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/audio/schismtracker/default.nix b/pkgs/applications/audio/schismtracker/default.nix index 7f6762958a34..02c8f28da657 100644 --- a/pkgs/applications/audio/schismtracker/default.nix +++ b/pkgs/applications/audio/schismtracker/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , autoreconfHook , alsaLib, python, SDL }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { buildInputs = [ SDL ] ++ stdenv.lib.optional stdenv.isLinux alsaLib; - meta = with stdenv.lib; { + meta = with lib; { description = "Music tracker application, free reimplementation of Impulse Tracker"; homepage = "http://schismtracker.org/"; license = licenses.gpl2; diff --git a/pkgs/applications/audio/seq24/default.nix b/pkgs/applications/audio/seq24/default.nix index c8347d70b1d9..aa3abd3f0f39 100644 --- a/pkgs/applications/audio/seq24/default.nix +++ b/pkgs/applications/audio/seq24/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, gtkmm2, libjack2, pkgconfig }: +{ lib, stdenv, fetchurl, alsaLib, gtkmm2, libjack2, pkgconfig }: stdenv.mkDerivation rec { pname = "seq24"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ alsaLib gtkmm2 libjack2 ]; nativeBuildInputs = [ pkgconfig ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Minimal loop based midi sequencer"; homepage = "http://www.filter24.org/seq24"; license = licenses.gpl2; diff --git a/pkgs/applications/audio/seq66/default.nix b/pkgs/applications/audio/seq66/default.nix index 6b3a3939b43f..93f9e9503b95 100644 --- a/pkgs/applications/audio/seq66/default.nix +++ b/pkgs/applications/audio/seq66/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, qttools, which +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, qttools, which , alsaLib, libjack2, liblo, qtbase }: @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/ahlstromcj/seq66"; description = "Loop based midi sequencer with Qt GUI derived from seq24 and sequencer64"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/audio/setbfree/default.nix b/pkgs/applications/audio/setbfree/default.nix index a7500f8c6a5e..0f3b2fcfa953 100644 --- a/pkgs/applications/audio/setbfree/default.nix +++ b/pkgs/applications/audio/setbfree/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, alsaLib, freetype, ftgl, libjack2, libX11, lv2 +{ lib, stdenv, fetchzip, alsaLib, freetype, ftgl, libjack2, libX11, lv2 , libGLU, libGL, pkgconfig, ttf_bitstream_vera }: @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ttf_bitstream_vera ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A DSP tonewheel organ emulator"; homepage = "http://setbfree.org"; license = licenses.gpl2; diff --git a/pkgs/applications/audio/sfizz/default.nix b/pkgs/applications/audio/sfizz/default.nix index b4ff5fc56d56..4ba30935089c 100644 --- a/pkgs/applications/audio/sfizz/default.nix +++ b/pkgs/applications/audio/sfizz/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub , cmake, libjack2, libsndfile, pkgconfig }: +{ lib, stdenv, fetchFromGitHub , cmake, libjack2, libsndfile, pkgconfig }: stdenv.mkDerivation rec { pname = "sfizz"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { "-DSFIZZ_TESTS=ON" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/sfztools/sfizz"; description = "SFZ jack client and LV2 plugin"; license = licenses.bsd2; diff --git a/pkgs/applications/audio/sfxr/default.nix b/pkgs/applications/audio/sfxr/default.nix index fbd0f3c5def3..9e5195b2caaf 100644 --- a/pkgs/applications/audio/sfxr/default.nix +++ b/pkgs/applications/audio/sfxr/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , pkgconfig , desktop-file-utils @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { makeFlags = [ "DESTDIR=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.drpetter.se/project_sfxr.html"; description = "A videogame sound effect generator"; license = licenses.mit; diff --git a/pkgs/applications/audio/shortwave/default.nix b/pkgs/applications/audio/shortwave/default.nix index 3572bbf88abb..2cc8c53f6072 100644 --- a/pkgs/applications/audio/shortwave/default.nix +++ b/pkgs/applications/audio/shortwave/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitLab , cargo , dbus @@ -73,7 +73,7 @@ rustPlatform.buildRustPackage rec { patchShebangs build-aux/meson/postinstall.py ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://gitlab.gnome.org/World/Shortwave"; description = "Find and listen to internet radio stations"; longDescription = '' diff --git a/pkgs/applications/audio/sisco.lv2/default.nix b/pkgs/applications/audio/sisco.lv2/default.nix index 07215fc42f87..311edbbae89f 100644 --- a/pkgs/applications/audio/sisco.lv2/default.nix +++ b/pkgs/applications/audio/sisco.lv2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, lv2, pkgconfig, libGLU, libGL, cairo, pango, libjack2 }: +{ lib, stdenv, fetchFromGitHub, lv2, pkgconfig, libGLU, libGL, cairo, pango, libjack2 }: let name = "sisco.lv2-${version}"; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { sisco_VERSION = version; preConfigure = "makeFlagsArray=(PREFIX=$out)"; - meta = with stdenv.lib; { + meta = with lib; { description = "Simple audio oscilloscope with variable time scale, triggering, cursors and numeric readout in LV2 plugin format"; homepage = "http://x42.github.io/sisco.lv2/"; license = licenses.gpl2; diff --git a/pkgs/applications/audio/sndpeek/default.nix b/pkgs/applications/audio/sndpeek/default.nix index d239fda11aee..a8dfe759d625 100644 --- a/pkgs/applications/audio/sndpeek/default.nix +++ b/pkgs/applications/audio/sndpeek/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libsndfile, freeglut, alsaLib, mesa, libGLU, libX11, libXmu +{ lib, stdenv, fetchurl, libsndfile, freeglut, alsaLib, mesa, libGLU, libX11, libXmu , libXext, libXi }: stdenv.mkDerivation rec { @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { mv sndpeek $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Real-time 3D animated audio display/playback"; longDescription = '' sndpeek is just what it sounds (and looks) like: diff --git a/pkgs/applications/audio/sonic-lineup/default.nix b/pkgs/applications/audio/sonic-lineup/default.nix index 526dd245691b..87803e684857 100644 --- a/pkgs/applications/audio/sonic-lineup/default.nix +++ b/pkgs/applications/audio/sonic-lineup/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, boost, bzip2, fftw, fftwFloat, libfishsound +{ lib, stdenv, fetchurl, alsaLib, boost, bzip2, fftw, fftwFloat, libfishsound , libid3tag, liblo, libmad, liboggz, libpulseaudio, libsamplerate , libsndfile, lrdf, opusfile, portaudio, rubberband, serd, sord, capnproto , wrapQtAppsHook, pkgconfig @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { sed -i 's/sub_test_svcore_/#sub_test_svcore_/' sonic-lineup.pro ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Comparative visualisation of related audio recordings"; homepage = "https://www.sonicvisualiser.org/sonic-lineup/"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/audio/sonic-visualiser/default.nix b/pkgs/applications/audio/sonic-visualiser/default.nix index 2593bf38d194..f2df119fcc68 100644 --- a/pkgs/applications/audio/sonic-visualiser/default.nix +++ b/pkgs/applications/audio/sonic-visualiser/default.nix @@ -1,6 +1,6 @@ # TODO add plugins having various licenses, see http://www.vamp-plugins.org/download.html -{ stdenv, fetchurl, alsaLib, bzip2, fftw, libjack2, libX11, liblo +{ lib, stdenv, fetchurl, alsaLib, bzip2, fftw, libjack2, libX11, liblo , libmad, lrdf, librdf_raptor, librdf_rasqal, libsamplerate , libsndfile, pkg-config, libpulseaudio, qtbase, qtsvg, redland , rubberband, serd, sord, vamp-plugin-sdk, fftwFloat @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "View and analyse contents of music audio files"; homepage = "https://www.sonicvisualiser.org/"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/audio/sooperlooper/default.nix b/pkgs/applications/audio/sooperlooper/default.nix index f1c76bf0d33c..e9ec7b33f747 100644 --- a/pkgs/applications/audio/sooperlooper/default.nix +++ b/pkgs/applications/audio/sooperlooper/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , autoreconfHook , pkgconfig @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A live looping sampler capable of immediate loop recording, overdubbing, multiplying, reversing and more"; longDescription = '' It allows for multiple simultaneous multi-channel loops limited only by your computer's available memory. diff --git a/pkgs/applications/audio/sorcer/default.nix b/pkgs/applications/audio/sorcer/default.nix index ad5f8fda1a99..59c7d91a3e38 100644 --- a/pkgs/applications/audio/sorcer/default.nix +++ b/pkgs/applications/audio/sorcer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub , boost, cairomm, cmake, libsndfile, lv2, ntk, pkgconfig, python }: +{ lib, stdenv, fetchFromGitHub , boost, cairomm, cmake, libsndfile, lv2, ntk, pkg-config, python }: stdenv.mkDerivation rec { pname = "sorcer"; @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1x7pi77nal10717l02qpnhrx6d7w5nqrljkn9zx5w7gpb8fpb3vp"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ boost cairomm cmake libsndfile lv2 ntk python ]; + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ boost cairomm libsndfile lv2 ntk python ]; postPatch = '' # Fix build with lv2 1.18: https://github.com/brummer10/guitarix/commit/c0334c72 @@ -25,10 +25,10 @@ stdenv.mkDerivation rec { cp -a ../presets/* "$out/lib/lv2" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://openavproductions.com/sorcer/"; description = "A wavetable LV2 plugin synth, targeted at the electronic / dubstep genre"; - license = licenses.gpl3; + license = licenses.gpl3Plus; maintainers = [ maintainers.magnetophon ]; platforms = platforms.linux; }; diff --git a/pkgs/applications/audio/sound-juicer/default.nix b/pkgs/applications/audio/sound-juicer/default.nix index 89653a59f437..e8ab895579ca 100644 --- a/pkgs/applications/audio/sound-juicer/default.nix +++ b/pkgs/applications/audio/sound-juicer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, gtk3, intltool, itstool, libxml2, brasero +{ lib, stdenv, fetchurl, pkgconfig, glib, gtk3, intltool, itstool, libxml2, brasero , libcanberra-gtk3, gnome3, gst_all_1, libmusicbrainz5, libdiscid, isocodes , gsettings-desktop-schemas, wrapGAppsHook }: @@ -30,7 +30,7 @@ in stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A Gnome CD Ripper"; homepage = "https://wiki.gnome.org/Apps/SoundJuicer"; maintainers = [ maintainers.bdimcheff ]; diff --git a/pkgs/applications/audio/soundkonverter/default.nix b/pkgs/applications/audio/soundkonverter/default.nix index 992dd728e765..e8704ff61919 100644 --- a/pkgs/applications/audio/soundkonverter/default.nix +++ b/pkgs/applications/audio/soundkonverter/default.nix @@ -62,7 +62,7 @@ mkDerivation rec { stripLen = 1; }) ]; - enableParallelBuilding = true; + nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig kdelibs4support makeWrapper ]; propagatedBuildInputs = [ libkcddb kconfig kconfigwidgets ki18n kdelibs4support kio solid kwidgetsaddons kxmlgui qtbase phonon]; buildInputs = [ taglib ] ++ runtimeDeps; diff --git a/pkgs/applications/audio/soundtracker/default.nix b/pkgs/applications/audio/soundtracker/default.nix index 1fd341765b09..aa78bbf3de8e 100644 --- a/pkgs/applications/audio/soundtracker/default.nix +++ b/pkgs/applications/audio/soundtracker/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , pkg-config , autoconf @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A music tracking tool similar in design to the DOS program FastTracker and the Amiga legend ProTracker"; longDescription = '' SoundTracker is a pattern-oriented music editor (similar to the DOS diff --git a/pkgs/applications/audio/spectmorph/default.nix b/pkgs/applications/audio/spectmorph/default.nix index ece6689a9d07..055ed99dbeb6 100644 --- a/pkgs/applications/audio/spectmorph/default.nix +++ b/pkgs/applications/audio/spectmorph/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libjack2, lv2, glib, qt5, libao, cairo, libsndfile, fftwFloat }: +{ lib, stdenv, fetchurl, pkgconfig, libjack2, lv2, glib, qt5, libao, cairo, libsndfile, fftwFloat }: stdenv.mkDerivation rec { pname = "spectmorph"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Allows to analyze samples of musical instruments, and to combine them (morphing) to construct hybrid sounds"; homepage = "http://spectmorph.org"; license = licenses.gpl3; diff --git a/pkgs/applications/audio/speech-denoiser/default.nix b/pkgs/applications/audio/speech-denoiser/default.nix index 9c18665d3993..34b372f964e6 100644 --- a/pkgs/applications/audio/speech-denoiser/default.nix +++ b/pkgs/applications/audio/speech-denoiser/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, lv2, meson, ninja }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, lv2, meson, ninja }: let speech-denoiser-src = fetchFromGitHub { @@ -34,7 +34,7 @@ stdenv.mkDerivation { --replace "cc.find_library('rnnoise-nu',dirs: meson.current_source_dir() + '/rnnoise/.libs/',required : true)" "cc.find_library('rnnoise-nu', required : true)" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Speech denoise lv2 plugin based on RNNoise library"; homepage = "https://github.com/lucianodato/speech-denoiser"; license = licenses.lgpl3; diff --git a/pkgs/applications/audio/spek/default.nix b/pkgs/applications/audio/spek/default.nix index d6918b192315..d4b83605c321 100644 --- a/pkgs/applications/audio/spek/default.nix +++ b/pkgs/applications/audio/spek/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, intltool, pkgconfig, ffmpeg, wxGTK30-gtk3, wrapGAppsHook }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, intltool, pkgconfig, ffmpeg, wxGTK30-gtk3, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "spek"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ ffmpeg wxGTK30-gtk3 wxGTK30-gtk3.gtk ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Analyse your audio files by showing their spectrogram"; homepage = "http://spek.cc/"; license = licenses.gpl3; diff --git a/pkgs/applications/audio/split2flac/default.nix b/pkgs/applications/audio/split2flac/default.nix index efad434e3079..689e9e1cb24b 100644 --- a/pkgs/applications/audio/split2flac/default.nix +++ b/pkgs/applications/audio/split2flac/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, makeWrapper +{ lib, stdenv, fetchFromGitHub, makeWrapper , shntool, cuetools , flac, faac, mp4v2, wavpack, mac , imagemagick, libiconv, enca, lame, pythonPackages, vorbis-tools @@ -52,7 +52,7 @@ in stdenv.mkDerivation rec { ${wrapSplit2flac "wav"} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Split flac/ape/wv/wav + cue sheet into separate tracks"; homepage = "https://github.com/ftrvxmtrx/split2flac"; license = licenses.mit; diff --git a/pkgs/applications/audio/spotify-cli-linux/default.nix b/pkgs/applications/audio/spotify-cli-linux/default.nix index da41fb6b64ed..593ad9468eba 100644 --- a/pkgs/applications/audio/spotify-cli-linux/default.nix +++ b/pkgs/applications/audio/spotify-cli-linux/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python3Packages, dbus }: +{ lib, stdenv, python3Packages, dbus }: python3Packages.buildPythonApplication rec { pname = "spotify-cli-linux"; version = "1.6.0"; @@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec { # upstream has no code tests, but uses its "tests" for linting and formatting checks doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://pwittchen.github.io/spotify-cli-linux/"; maintainers = [ maintainers.kmein ]; description = "A command line interface to Spotify on Linux."; diff --git a/pkgs/applications/audio/spotify-tui/default.nix b/pkgs/applications/audio/spotify-tui/default.nix index a2001996c988..55a725e59b0a 100644 --- a/pkgs/applications/audio/spotify-tui/default.nix +++ b/pkgs/applications/audio/spotify-tui/default.nix @@ -1,27 +1,34 @@ -{ stdenv, fetchFromGitHub, rustPlatform, pkgconfig, openssl, python3, libxcb, AppKit, Security }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, installShellFiles, pkgconfig, openssl, python3, libxcb, AppKit, Security }: rustPlatform.buildRustPackage rec { pname = "spotify-tui"; - version = "0.22.0"; + version = "0.23.0"; src = fetchFromGitHub { owner = "Rigellute"; repo = "spotify-tui"; rev = "v${version}"; - sha256 = "0w1y37qh9n3936d59hvqzjz2878x2nwxqxc4s7mp4f9xqcfl0c5r"; + sha256 = "082y5m2vglzx9kdc2088zynz0njcnljnb0y170igmlsxq9wkrgg2"; }; - cargoSha256 = "1ri054p08si95x1gh2bkh4fk50ja79c5izzjnkvs0yhfj1wzbghi"; + cargoSha256 = "100c7x603qyhav3p24clwfal4ngh0258x9lqsi84kcj4wq2f3i8f"; - nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkgconfig python3 ]; + nativeBuildInputs = [ installShellFiles ] ++ stdenv.lib.optionals stdenv.isLinux [ pkgconfig python3 ]; buildInputs = [ ] ++ stdenv.lib.optionals stdenv.isLinux [ openssl libxcb ] ++ stdenv.lib.optionals stdenv.isDarwin [ AppKit Security ]; - meta = with stdenv.lib; { + postInstall = '' + for shell in bash fish zsh; do + $out/bin/spt --completions $shell > spt.$shell + installShellCompletion spt.$shell + done + ''; + + meta = with lib; { description = "Spotify for the terminal written in Rust"; homepage = "https://github.com/Rigellute/spotify-tui"; - changelog = "https://github.com/Rigellute/spotify-tui/releases/tag/v${version}"; + changelog = "https://github.com/Rigellute/spotify-tui/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ jwijenbergh ]; }; diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index ff44f14476f1..bfc8757445c9 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, squashfsTools, xorg, alsaLib, makeWrapper, openssl, freetype +{ fetchurl, lib, stdenv, squashfsTools, xorg, alsaLib, makeWrapper, openssl, freetype , glib, pango, cairo, atk, gdk-pixbuf, gtk2, cups, nspr, nss, libpng, libnotify , libgcrypt, systemd, fontconfig, dbus, expat, ffmpeg_3, curl, zlib, gnome3 , at-spi2-atk, at-spi2-core, libpulseaudio, libdrm, mesa @@ -158,7 +158,7 @@ stdenv.mkDerivation { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.spotify.com/"; description = "Play music from the Spotify music service"; license = licenses.unfree; diff --git a/pkgs/applications/audio/spotifyd/default.nix b/pkgs/applications/audio/spotifyd/default.nix index c4e1695f0835..737b8656c6a2 100644 --- a/pkgs/applications/audio/spotifyd/default.nix +++ b/pkgs/applications/audio/spotifyd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPackages_1_45, pkgconfig, openssl +{ lib, stdenv, fetchFromGitHub, rustPackages_1_45, pkgconfig, openssl , withALSA ? true, alsaLib ? null , withPulseAudio ? false, libpulseaudio ? null , withPortAudio ? false, portaudio ? null @@ -39,7 +39,7 @@ rustPackages_1_45.rustPlatform.buildRustPackage rec { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "An open source Spotify client running as a UNIX daemon"; homepage = "https://github.com/Spotifyd/spotifyd"; license = with licenses; [ gpl3 ]; diff --git a/pkgs/applications/audio/spotifywm/default.nix b/pkgs/applications/audio/spotifywm/default.nix index a51e82f29c4b..2241db126b81 100644 --- a/pkgs/applications/audio/spotifywm/default.nix +++ b/pkgs/applications/audio/spotifywm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, spotify, xorg, runtimeShell }: +{ lib, stdenv, fetchFromGitHub, spotify, xorg, runtimeShell }: stdenv.mkDerivation { pname = "spotifywm-unstable"; version = "2016-11-28"; @@ -21,7 +21,7 @@ stdenv.mkDerivation { install -Dm755 spotifywm $out/bin/spotifywm ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/dasJ/spotifywm"; description = "Wrapper around Spotify that correctly sets class name before opening the window"; license = licenses.mit; diff --git a/pkgs/applications/audio/squeezelite/default.nix b/pkgs/applications/audio/squeezelite/default.nix index c6a78f090058..d5c84888eeb0 100644 --- a/pkgs/applications/audio/squeezelite/default.nix +++ b/pkgs/applications/audio/squeezelite/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , alsaLib, flac, libmad, libvorbis, mpg123 , dsdSupport ? true , faad2Support ? true, faad2 @@ -60,7 +60,7 @@ in stdenv.mkDerivation { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Lightweight headless squeezebox client emulator"; homepage = "https://github.com/ralph-irving/squeezelite"; license = with licenses; [ gpl3 ] ++ optional dsdSupport bsd2; diff --git a/pkgs/applications/audio/squishyball/default.nix b/pkgs/applications/audio/squishyball/default.nix index e6dd48018e74..06ff5f3909dc 100644 --- a/pkgs/applications/audio/squishyball/default.nix +++ b/pkgs/applications/audio/squishyball/default.nix @@ -1,4 +1,4 @@ -{ stdenv, autoreconfHook, fetchsvn, flac, libao, libvorbis, ncurses +{ lib, stdenv, autoreconfHook, fetchsvn, flac, libao, libvorbis, ncurses , opusfile, pkgconfig }: @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { cp squishyball.1 $out/share/man/man1 ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A tool to perform sample comparison testing on the command line"; longDescription = '' squishyball is a simple command-line utility for performing diff --git a/pkgs/applications/audio/ssrc/default.nix b/pkgs/applications/audio/ssrc/default.nix index 9d519e14147b..3516c6e4db0c 100644 --- a/pkgs/applications/audio/ssrc/default.nix +++ b/pkgs/applications/audio/ssrc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "ssrc"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { cp ssrc ssrc_hp $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A high quality audio sampling rate converter"; longDescription = '' This program converts sampling rates of PCM wav files. This diff --git a/pkgs/applications/audio/stochas/default.nix b/pkgs/applications/audio/stochas/default.nix index 402d3f1b6fa2..0c50cda8e6c0 100644 --- a/pkgs/applications/audio/stochas/default.nix +++ b/pkgs/applications/audio/stochas/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkg-config, libX11, libXrandr, libXinerama, libXext, libXcursor, freetype, alsaLib, libjack2 }: +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, libX11, libXrandr, libXinerama, libXext, libXcursor, freetype, alsaLib, libjack2 }: stdenv.mkDerivation rec { pname = "stochas"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { cp -r stochas_artefacts/Release/VST3/Stochas.vst3 $out/lib/vst3 ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Probabilistic polyrhythmic sequencer plugin"; homepage = "https://stochas.org/"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/audio/stone-phaser/default.nix b/pkgs/applications/audio/stone-phaser/default.nix index d36b28df978a..7fb4a5410fb4 100644 --- a/pkgs/applications/audio/stone-phaser/default.nix +++ b/pkgs/applications/audio/stone-phaser/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, xorg, cairo, lv2, libjack2, mesa, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, xorg, cairo, lv2, libjack2, mesa, pkgconfig }: stdenv.mkDerivation rec { pname = "stone-phaser"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { installFlags = [ "PREFIX=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/jpcima/stone-phaser"; description = "A classic analog phaser effect, made with DPF and Faust"; maintainers = [ maintainers.magnetophon ]; diff --git a/pkgs/applications/audio/strawberry/default.nix b/pkgs/applications/audio/strawberry/default.nix index c2f1a0db701c..53a4cc96437c 100644 --- a/pkgs/applications/audio/strawberry/default.nix +++ b/pkgs/applications/audio/strawberry/default.nix @@ -35,13 +35,13 @@ mkDerivation rec { pname = "strawberry"; - version = "0.8.4"; + version = "0.8.5"; src = fetchFromGitHub { owner = "jonaski"; repo = pname; rev = version; - sha256 = "145djlfvbkx2b1wqipk51mz82dhm27vmh9x00lkn24q1xz1y6h5n"; + sha256 = "sha256-+ZQ80J94Teqt4Gy6fw/pS7FwILK/TPehtJDy72Bdy1E="; }; buildInputs = [ diff --git a/pkgs/applications/audio/streamripper/default.nix b/pkgs/applications/audio/streamripper/default.nix index 1411fe59b30f..7d21e816667f 100644 --- a/pkgs/applications/audio/streamripper/default.nix +++ b/pkgs/applications/audio/streamripper/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl , glib, pkgconfig, libogg, libvorbis, libmad }: +{ lib, stdenv, fetchurl , glib, pkgconfig, libogg, libvorbis, libmad }: stdenv.mkDerivation rec { pname = "streamripper"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ glib libogg libvorbis libmad ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://streamripper.sourceforge.net/"; description = "Application that lets you record streaming mp3 to your hard drive"; license = licenses.gpl2; diff --git a/pkgs/applications/audio/string-machine/default.nix b/pkgs/applications/audio/string-machine/default.nix index 67053baa35ff..a146ea8cd977 100644 --- a/pkgs/applications/audio/string-machine/default.nix +++ b/pkgs/applications/audio/string-machine/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, boost, cairo, lv2, pkg-config }: +{ lib, stdenv, fetchFromGitHub, boost, cairo, lv2, pkg-config }: stdenv.mkDerivation rec { pname = "string-machine"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { "PREFIX=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/jpcima/string-machine"; description = "Digital model of electronic string ensemble instrument"; maintainers = [ maintainers.magnetophon ]; diff --git a/pkgs/applications/audio/sublime-music/default.nix b/pkgs/applications/audio/sublime-music/default.nix index 7e3c1b9164f1..1f74998166fb 100644 --- a/pkgs/applications/audio/sublime-music/default.nix +++ b/pkgs/applications/audio/sublime-music/default.nix @@ -1,5 +1,4 @@ { lib, python3Packages, gobject-introspection, gtk3, pango, wrapGAppsHook - , chromecastSupport ? false , serverSupport ? false , keyringSupport ? true @@ -51,6 +50,10 @@ python3Packages.buildPythonApplication rec { # https://github.com/NixOS/nixpkgs/issues/56943 strictDeps = false; + # no tests + doCheck = false; + pythonImportsCheck = [ "sublime" ]; + meta = with lib; { description = "GTK3 Subsonic/Airsonic client"; homepage = "https://sublimemusic.app/"; diff --git a/pkgs/applications/audio/sunvox/default.nix b/pkgs/applications/audio/sunvox/default.nix index 2cd48806f7d0..12397f2fdbff 100644 --- a/pkgs/applications/audio/sunvox/default.nix +++ b/pkgs/applications/audio/sunvox/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, alsaLib, libX11, libXi, SDL2 }: +{ lib, stdenv, fetchurl, unzip, alsaLib, libX11, libXi, SDL2 }: let libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc alsaLib libX11 libXi SDL2 ]; @@ -13,11 +13,11 @@ let in stdenv.mkDerivation rec { pname = "SunVox"; - version = "1.9.5d"; + version = "1.9.6c"; src = fetchurl { url = "http://www.warmplace.ru/soft/sunvox/sunvox-${version}.zip"; - sha256 = "04f7psm0lvc09nw7d2wp0sncf37bym2v7hhxp4v8c8gdgayj7k8m"; + sha256 = "0lqzr68n2c6aifw2vbyars91wn1chmgb9xfdk463g4vjqiava3ih"; }; buildInputs = [ unzip ]; @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { ln -s "$bin" $out/bin/sunvox ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Small, fast and powerful modular synthesizer with pattern-based sequencer"; license = licenses.unfreeRedistributable; homepage = "http://www.warmplace.ru/soft/sunvox/"; diff --git a/pkgs/applications/audio/surge/default.nix b/pkgs/applications/audio/surge/default.nix index 1614bbfae667..831253246947 100644 --- a/pkgs/applications/audio/surge/default.nix +++ b/pkgs/applications/audio/surge/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, git, pkg-config, python3 +{ lib, stdenv, fetchFromGitHub, cmake, git, pkg-config, python3 , cairo, libsndfile, libxcb, libxkbcommon, xcbutil, xcbutilcursor, xcbutilkeysyms, zenity }: @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { build/surge-headless ''; - meta = with stdenv.lib; { + meta = with lib; { description = "LV2 & VST3 synthesizer plug-in (previously released as Vember Audio Surge)"; homepage = "https://surge-synthesizer.github.io"; license = licenses.gpl3; diff --git a/pkgs/applications/audio/svox/default.nix b/pkgs/applications/audio/svox/default.nix index d5b67819cb07..044fd176481f 100644 --- a/pkgs/applications/audio/svox/default.nix +++ b/pkgs/applications/audio/svox/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, popt }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, popt }: stdenv.mkDerivation { pname = "svox"; @@ -20,7 +20,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ autoreconfHook ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Text-to-speech engine"; homepage = "https://android.googlesource.com/platform/external/svox"; platforms = platforms.linux; diff --git a/pkgs/applications/audio/swh-lv2/default.nix b/pkgs/applications/audio/swh-lv2/default.nix index 02499d54476f..ccec7b9171f8 100644 --- a/pkgs/applications/audio/swh-lv2/default.nix +++ b/pkgs/applications/audio/swh-lv2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fftwSinglePrec, libxslt, lv2, pkgconfig }: +{ lib, stdenv, fetchurl, fftwSinglePrec, libxslt, lv2, pkgconfig }: stdenv.mkDerivation rec { pname = "swh-lv2"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { installPhase = "make install-system"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://plugin.org.uk"; description = "LV2 version of Steve Harris' SWH plugins"; longDescription = '' diff --git a/pkgs/applications/audio/synthv1/default.nix b/pkgs/applications/audio/synthv1/default.nix index 74f68283fd60..f10b20bfc3c0 100644 --- a/pkgs/applications/audio/synthv1/default.nix +++ b/pkgs/applications/audio/synthv1/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, stdenv, fetchurl, pkgconfig, qtbase, qttools, libjack2, alsaLib, liblo, lv2 }: +{ mkDerivation, lib, stdenv, fetchurl, pkgconfig, qtbase, qttools, libjack2, alsaLib, liblo, lv2 }: mkDerivation rec { pname = "synthv1"; @@ -13,7 +13,7 @@ mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; - meta = with stdenv.lib; { + meta = with lib; { description = "An old-school 4-oscillator subtractive polyphonic synthesizer with stereo fx"; homepage = "https://synthv1.sourceforge.io/"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/audio/talentedhack/default.nix b/pkgs/applications/audio/talentedhack/default.nix index b30cf59f7b30..0dd9a03739df 100644 --- a/pkgs/applications/audio/talentedhack/default.nix +++ b/pkgs/applications/audio/talentedhack/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, lv2, fftwFloat, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, lv2, fftwFloat, pkgconfig }: stdenv.mkDerivation rec { pname = "talentedhack"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { cp *.so *.ttl $d ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/jeremysalwen/TalentedHack"; description = "LV2 port of Autotalent pitch correction plugin"; license = licenses.gpl3; diff --git a/pkgs/applications/audio/tambura/default.nix b/pkgs/applications/audio/tambura/default.nix index 96f9bb7053e0..b1a6513c7f73 100644 --- a/pkgs/applications/audio/tambura/default.nix +++ b/pkgs/applications/audio/tambura/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }: +{ lib, stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }: stdenv.mkDerivation rec { pname = "Tambura"; version = "1.0"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { cp -r ${pname}.lv2/ $out/lib/lv2 ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A FAUST patch inspired by the Indian Tambura/Tanpura - a four string drone instrument, known for its unique rich harmonic timbre"; homepage = "https://github.com/olilarkin/Tambura"; license = licenses.gpl2; diff --git a/pkgs/applications/audio/tamgamp.lv2/default.nix b/pkgs/applications/audio/tamgamp.lv2/default.nix index 9f51f9d022d8..2907a5277ee2 100644 --- a/pkgs/applications/audio/tamgamp.lv2/default.nix +++ b/pkgs/applications/audio/tamgamp.lv2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkg-config, lv2, zita-resampler }: +{ lib, stdenv, fetchFromGitHub, pkg-config, lv2, zita-resampler }: stdenv.mkDerivation rec { pname = "tamgamp.lv2"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/sadko4u/tamgamp.lv2"; description = "Guitar amplifier simulator"; longDescription = '' diff --git a/pkgs/applications/audio/tap-plugins/default.nix b/pkgs/applications/audio/tap-plugins/default.nix new file mode 100644 index 000000000000..2b04b450deca --- /dev/null +++ b/pkgs/applications/audio/tap-plugins/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl, ladspa-sdk, pkgs, ... }: + +stdenv.mkDerivation rec { + pname = "tap-plugins"; + version = "1.0.1"; + + src = pkgs.fetchFromGitHub { + owner = "tomszilagyi"; + repo = pname; + rev = "v${version}"; + sha256 = "0c6qhyf8smlypc36vmpr42dm3mrzk6pg9cc9r0vx22qbrd5zfpjw"; + }; + + buildInputs = [ ladspa-sdk ]; + + preInstall = '' + substituteInPlace Makefile --replace /usr/local "$out" + ''; + + meta = with stdenv.lib; { + description = "Tom's Audio Processing plugins"; + longDescription = '' + A number of LADSPA plugins including: TAP AutoPanner, TAP Chorus/Flanger, TAP DeEsser, + TAP Dynamics (Mono & Stereo), TAP Equalizer and TAP Equalizer/BW, TAP Fractal Doubler, TAP Pink/Fractal Noise, + TAP Pitch Shifter, TAP Reflector, TAP Reverberator, TAP Rotary Speaker, TAP Scaling Limiter, + TAP Sigmoid Booster, TAP Stereo Echo, TAP Tremolo, TAP TubeWarmth, TAP Vibrato. + ''; + homepage = "http://tap-plugins.sourceforge.net/ladspa.html"; + license = licenses.gpl3; + maintainers = [ maintainers.fps ]; + }; +} diff --git a/pkgs/applications/audio/tetraproc/default.nix b/pkgs/applications/audio/tetraproc/default.nix index 8780e54bb7c3..1fe56096e951 100644 --- a/pkgs/applications/audio/tetraproc/default.nix +++ b/pkgs/applications/audio/tetraproc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper +{ lib, stdenv, fetchurl, makeWrapper , expat, fftwFloat, fontconfig, freetype, libjack2, jack2Full, libclthreads, libclxclient , libsndfile, libxcb, xorg }: @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/tetraproc --prefix PATH : "${jack2Full}/bin" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Converts the A-format signals from a tetrahedral Ambisonic microphone into B-format signals ready for recording"; homepage = "http://kokkinizita.linuxaudio.org/linuxaudio/"; license = licenses.gpl2; diff --git a/pkgs/applications/audio/tony/default.nix b/pkgs/applications/audio/tony/default.nix index 011d80253647..8d3ba620f9dc 100644 --- a/pkgs/applications/audio/tony/default.nix +++ b/pkgs/applications/audio/tony/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, wrapQtAppsHook +{ lib, stdenv, fetchurl, pkgconfig, wrapQtAppsHook , alsaLib, boost, bzip2, fftw, fftwFloat, libX11, libfishsound, libid3tag , libjack2, liblo, libmad, libogg, liboggz, libpulseaudio, libsamplerate , libsndfile, lrdf, opusfile, qtbase, qtsvg, rubberband, serd, sord @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Pitch and note annotation of unaccompanied melody"; homepage = "https://www.sonicvisualiser.org/tony/"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/audio/transcode/default.nix b/pkgs/applications/audio/transcode/default.nix index c7ee3914f25c..cc3c8c7a0f0a 100644 --- a/pkgs/applications/audio/transcode/default.nix +++ b/pkgs/applications/audio/transcode/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, flac, lame, zlib, libjpeg, libvorbis, libtheora, libxml2 +{ lib, stdenv, fetchurl, flac, lame, zlib, libjpeg, libvorbis, libtheora, libxml2 , lzo, libdvdread, pkgconfig, x264, libmpeg2, xvidcore }: stdenv.mkDerivation rec { @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Suite of command line utilities for transcoding video and audio codecs, and for converting between different container formats"; homepage = "http://www.transcoding.org/"; license = licenses.lgpl2Plus; diff --git a/pkgs/applications/audio/traverso/default.nix b/pkgs/applications/audio/traverso/default.nix index 63ba44bec35a..f9395ec6fa2b 100644 --- a/pkgs/applications/audio/traverso/default.nix +++ b/pkgs/applications/audio/traverso/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, stdenv, fetchurl, cmake, pkgconfig +{ mkDerivation, lib, stdenv, fetchurl, cmake, pkgconfig , alsaLib, fftw, flac, lame, libjack2, libmad, libpulseaudio , libsamplerate, libsndfile, libvorbis, portaudio, qtbase, wavpack }: @@ -18,10 +18,9 @@ mkDerivation { cmakeFlags = [ "-DWANT_PORTAUDIO=1" "-DWANT_PULSEAUDIO=1" "-DWANT_MP3_ENCODE=1" "-DWANT_LV2=0" ]; - enableParallelBuilding = true; hardeningDisable = [ "format" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Cross-platform multitrack audio recording and audio editing suite"; homepage = "https://traverso-daw.org/"; license = with licenses; [ gpl2Plus lgpl21Plus ]; diff --git a/pkgs/applications/audio/tree-from-tags/default.nix b/pkgs/applications/audio/tree-from-tags/default.nix index 3b25b4218f19..4bf4db09ac07 100644 --- a/pkgs/applications/audio/tree-from-tags/default.nix +++ b/pkgs/applications/audio/tree-from-tags/default.nix @@ -1,4 +1,4 @@ -{ stdenv, bundlerEnv, ruby, fetchFromGitHub }: +{ lib, stdenv, bundlerEnv, ruby, fetchFromGitHub }: let version = "1.1"; gems = bundlerEnv { @@ -28,7 +28,7 @@ EOF chmod +x $bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Create file hierarchies from media tags"; homepage = "https://www.emacswiki.org/emacs/Bongo"; platforms = ruby.meta.platforms; diff --git a/pkgs/applications/audio/tunefish/default.nix b/pkgs/applications/audio/tunefish/default.nix index 72802c4f8784..6dc1eb339627 100644 --- a/pkgs/applications/audio/tunefish/default.nix +++ b/pkgs/applications/audio/tunefish/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkg-config, python3 +{ lib, stdenv, fetchFromGitHub, pkg-config, python3 , alsaLib, curl, freetype, gtk3, libGL, libX11, libXext, libXinerama, webkitgtk }: @@ -33,7 +33,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://tunefish-synth.com/"; description = "Virtual analog synthesizer LV2 plugin"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/audio/uade123/default.nix b/pkgs/applications/audio/uade123/default.nix index 9130461e4d72..09e066dadac7 100644 --- a/pkgs/applications/audio/uade123/default.nix +++ b/pkgs/applications/audio/uade123/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, which, libao, pkgconfig }: +{ lib, stdenv, fetchurl, which, libao, pkgconfig }: let version = "2.13"; @@ -15,7 +15,7 @@ in stdenv.mkDerivation { enableParallelBuilding = true; hardeningDisable = [ "format" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Plays old Amiga tunes through UAE emulation and cloned m68k-assembler Eagleplayer API"; homepage = "http://zakalwe.fi/uade/"; license = licenses.gpl2; diff --git a/pkgs/applications/audio/uhhyou.lv2/default.nix b/pkgs/applications/audio/uhhyou.lv2/default.nix index 732e9d8433f6..9c748929d625 100644 --- a/pkgs/applications/audio/uhhyou.lv2/default.nix +++ b/pkgs/applications/audio/uhhyou.lv2/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , pkg-config , python3 @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Audio plugins for Linux"; longDescription = '' Plugin List: diff --git a/pkgs/applications/audio/vcv-rack/default.nix b/pkgs/applications/audio/vcv-rack/default.nix index 18d8f7415b56..27844841482c 100644 --- a/pkgs/applications/audio/vcv-rack/default.nix +++ b/pkgs/applications/audio/vcv-rack/default.nix @@ -1,4 +1,4 @@ -{ stdenv, makeWrapper, fetchFromBitbucket, fetchFromGitHub, pkgconfig +{ lib, stdenv, makeWrapper, fetchzip, fetchFromGitHub, pkgconfig , alsaLib, curl, glew, glfw, gtk2-x11, jansson, libjack2, libXext, libXi , libzip, rtaudio, rtmidi, speex, libsamplerate }: @@ -7,10 +7,8 @@ let # Others are downloaded with `make deps`. Due to previous issues with the # `glfw` submodule (see above) and because we can not access the network when # building in a sandbox, we fetch the dependency source manually. - pfft-source = fetchFromBitbucket { - owner = "jpommier"; - repo = "pffft"; - rev = "74d7261be17cf659d5930d4830609406bd7553e3"; + pfft-source = fetchzip { + url = "https://vcvrack.com/downloads/dep/pffft.zip"; sha256 = "084csgqa6f1a270bhybjayrh3mpyi2jimc87qkdgsqcp8ycsx1l1"; }; nanovg-source = fetchFromGitHub { @@ -91,7 +89,7 @@ with stdenv.lib; stdenv.mkDerivation rec { wrapProgram $out/bin/Rack --add-flags "-s $out/share/vcv-rack" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Open-source virtual modular synthesizer"; homepage = "https://vcvrack.com/"; # The source is BSD-3 licensed, some of the art is CC-BY-NC 4.0 or under a diff --git a/pkgs/applications/audio/vimpc/default.nix b/pkgs/applications/audio/vimpc/default.nix index bcbfa6d3874f..b0412005aba2 100644 --- a/pkgs/applications/audio/vimpc/default.nix +++ b/pkgs/applications/audio/vimpc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, mpd_clientlib, ncurses, pcre, pkgconfig +{ lib, stdenv, fetchFromGitHub, autoreconfHook, mpd_clientlib, ncurses, pcre, pkgconfig , taglib, curl }: stdenv.mkDerivation rec { @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { cp doc/vimpcrc.example $out/etc ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A vi/vim inspired client for the Music Player Daemon (mpd)"; homepage = "https://github.com/boysetsfrog/vimpc"; license = licenses.gpl3; diff --git a/pkgs/applications/audio/virtual-ans/default.nix b/pkgs/applications/audio/virtual-ans/default.nix index 24e112aff2b4..dd7e8b062da7 100644 --- a/pkgs/applications/audio/virtual-ans/default.nix +++ b/pkgs/applications/audio/virtual-ans/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchzip , libX11 , libXi @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { else if stdenv.isx86_64 then "pixilang_linux_x86_64" else ""; - meta = with stdenv.lib; { + meta = with lib; { description = "Photoelectronic microtonal/spectral musical instrument"; longDescription = '' Virtual ANS is a software simulator of the unique Russian synthesizer ANS diff --git a/pkgs/applications/audio/vkeybd/default.nix b/pkgs/applications/audio/vkeybd/default.nix index 0e8f12823d1e..3409d8a49070 100644 --- a/pkgs/applications/audio/vkeybd/default.nix +++ b/pkgs/applications/audio/vkeybd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, libX11, makeWrapper, tcl, tk }: +{ lib, stdenv, fetchurl, alsaLib, libX11, makeWrapper, tcl, tk }: stdenv.mkDerivation rec { pname = "vkeybd"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/vkeybd --set TK_LIBRARY "${tk}/lib/${tk.libPrefix}" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Virtual MIDI keyboard"; homepage = "https://www.alsa-project.org/~tiwai/alsa.html"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/audio/vocal/default.nix b/pkgs/applications/audio/vocal/default.nix index b519003a9ec9..fb1046aab52e 100644 --- a/pkgs/applications/audio/vocal/default.nix +++ b/pkgs/applications/audio/vocal/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , nix-update-script , cmake @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { }; - meta = with stdenv.lib; { + meta = with lib; { description = "The podcast client for the modern free desktop"; longDescription = '' Vocal is a powerful, fast, and intuitive application that helps users find new podcasts, manage their libraries, and enjoy the best that indepedent audio and video publishing has to offer. Vocal features full support for both episode downloading and streaming, native system integration, iTunes store search and top 100 charts (with international results support), iTunes link parsing, OPML importing and exporting, and so much more. Plus, it has great smart features like automatically keeping your library clean from old files, and the ability to set custom skip intervals. diff --git a/pkgs/applications/audio/vocproc/default.nix b/pkgs/applications/audio/vocproc/default.nix index ddaa5b790e27..dce4ed36aac1 100644 --- a/pkgs/applications/audio/vocproc/default.nix +++ b/pkgs/applications/audio/vocproc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, pkgconfig, lvtk, lv2, fftw, lv2-cpp-tools, gtkmm2 }: +{ lib, stdenv, fetchzip, pkgconfig, lvtk, lv2, fftw, lv2-cpp-tools, gtkmm2 }: stdenv.mkDerivation rec { pname = "vocproc"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { "INSTALL_DIR=$(out)/lib/lv2" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://hyperglitch.com/dev/VocProc"; description = "An LV2 plugin for pitch shifting (with or without formant correction), vocoding, automatic pitch correction and harmonizing of singing voice (harmonizer)"; license = licenses.gpl2; diff --git a/pkgs/applications/audio/vorbis-tools/default.nix b/pkgs/applications/audio/vorbis-tools/default.nix index 2270e56e62ac..b50912f26d75 100644 --- a/pkgs/applications/audio/vorbis-tools/default.nix +++ b/pkgs/applications/audio/vorbis-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchzip, libogg, libvorbis, libao, pkgconfig, curl +{ lib, stdenv, fetchurl, fetchzip, libogg, libvorbis, libao, pkgconfig, curl , speex, flac }: let @@ -23,7 +23,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libogg libvorbis libao curl speex flac ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Extra tools for Ogg-Vorbis audio codec"; longDescription = '' A set of command-line tools to manipulate Ogg Vorbis audio diff --git a/pkgs/applications/audio/waon/default.nix b/pkgs/applications/audio/waon/default.nix index bc05547e641d..78e4fb1a5c55 100644 --- a/pkgs/applications/audio/waon/default.nix +++ b/pkgs/applications/audio/waon/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fftw, gtk2, libao, libsamplerate +{ lib, stdenv, fetchFromGitHub, fftw, gtk2, libao, libsamplerate , libsndfile, ncurses, pkgconfig }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { install -Dt $out/bin waon pv gwaon ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A Wave-to-Notes transcriber"; homepage = "https://kichiki.github.io/WaoN/"; license = licenses.gpl2; diff --git a/pkgs/applications/audio/whipper/default.nix b/pkgs/applications/audio/whipper/default.nix index 3ff1368c9432..227091dd5819 100644 --- a/pkgs/applications/audio/whipper/default.nix +++ b/pkgs/applications/audio/whipper/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python3, cdparanoia, cdrdao, flac +{ lib, stdenv, fetchFromGitHub, python3, cdparanoia, cdrdao, flac , sox, accuraterip-checksum, libsndfile, util-linux, substituteAll }: python3.pkgs.buildPythonApplication rec { @@ -52,7 +52,7 @@ python3.pkgs.buildPythonApplication rec { HOME=$TMPDIR ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/whipper-team/whipper"; description = "A CD ripper aiming for accuracy over speed"; maintainers = with maintainers; [ rycee emily ]; diff --git a/pkgs/applications/audio/wolf-shaper/default.nix b/pkgs/applications/audio/wolf-shaper/default.nix index ca16d60bea88..e724e934e52b 100644 --- a/pkgs/applications/audio/wolf-shaper/default.nix +++ b/pkgs/applications/audio/wolf-shaper/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub , libjack2, lv2, xorg, liblo, libGL, libXcursor, pkgconfig }: +{ lib, stdenv, fetchFromGitHub , libjack2, lv2, xorg, liblo, libGL, libXcursor, pkgconfig }: stdenv.mkDerivation rec { pname = "wolf-shaper"; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { cp -r bin/wolf-shaper $out/bin/ ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://pdesaulniers.github.io/wolf-shaper/"; description = "Waveshaper plugin with spline-based graph editor"; license = licenses.gpl3; diff --git a/pkgs/applications/audio/x42-avldrums/default.nix b/pkgs/applications/audio/x42-avldrums/default.nix index fb05a50b4e59..b2b9a4c233d1 100644 --- a/pkgs/applications/audio/x42-avldrums/default.nix +++ b/pkgs/applications/audio/x42-avldrums/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, cairo, glib, libGLU, lv2, pango }: +{ lib, stdenv, fetchFromGitHub, pkgconfig, cairo, glib, libGLU, lv2, pango }: stdenv.mkDerivation rec { pname = "x42-avldrums"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Drum sample player LV2 plugin dedicated to Glen MacArthur's AVLdrums"; homepage = "https://x42-plugins.com/x42/x42-avldrums"; maintainers = with maintainers; [ magnetophon orivej ]; diff --git a/pkgs/applications/audio/x42-gmsynth/default.nix b/pkgs/applications/audio/x42-gmsynth/default.nix index 7a96e3fd4f2f..dad6d05f9040 100644 --- a/pkgs/applications/audio/x42-gmsynth/default.nix +++ b/pkgs/applications/audio/x42-gmsynth/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, glib, lv2 }: +{ lib, stdenv, fetchFromGitHub, pkgconfig, glib, lv2 }: stdenv.mkDerivation rec { pname = "x42-gmsynth"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Chris Colins' General User soundfont player LV2 plugin"; homepage = "https://x42-plugins.com/x42/x42-gmsynth"; maintainers = with maintainers; [ orivej ]; diff --git a/pkgs/applications/audio/xmp/default.nix b/pkgs/applications/audio/xmp/default.nix index d234f6b6b8cc..d38faa6925dc 100644 --- a/pkgs/applications/audio/xmp/default.nix +++ b/pkgs/applications/audio/xmp/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchurl, pkgconfig, alsaLib, libxmp }: +{ lib, stdenv, fetchurl, pkgconfig, alsaLib, libxmp }: stdenv.mkDerivation rec { name = "xmp-4.1.0"; - meta = with stdenv.lib; { + meta = with lib; { description = "Extended module player"; homepage = "http://xmp.sourceforge.net/"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/audio/xsynth-dssi/default.nix b/pkgs/applications/audio/xsynth-dssi/default.nix index c0803ffa4185..e8f6bd94bb4b 100644 --- a/pkgs/applications/audio/xsynth-dssi/default.nix +++ b/pkgs/applications/audio/xsynth-dssi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, autoconf, automake, dssi, gtk2, libjack2, +{ lib, stdenv, fetchurl, alsaLib, autoconf, automake, dssi, gtk2, libjack2, ladspaH, ladspaPlugins, liblo, pkgconfig }: stdenv.mkDerivation rec { @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { cp src/.libs/* $out/lib ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Classic-analog (VCOs-VCF-VCA) style software synthesizer"; longDescription = '' Xsynth-DSSI is a classic-analog (VCOs-VCF-VCA) style software diff --git a/pkgs/applications/audio/xtuner/default.nix b/pkgs/applications/audio/xtuner/default.nix index 57ce3ab15114..c51852179114 100644 --- a/pkgs/applications/audio/xtuner/default.nix +++ b/pkgs/applications/audio/xtuner/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , pkg-config , cairo @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/brummer10/XTuner"; description = "Tuner for Jack Audio Connection Kit"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/audio/ympd/default.nix b/pkgs/applications/audio/ympd/default.nix index 8f86d6e7ba93..72c17aed52ed 100644 --- a/pkgs/applications/audio/ympd/default.nix +++ b/pkgs/applications/audio/ympd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, mpd_clientlib, openssl }: +{ stdenv, fetchFromGitHub, cmake, pkg-config, mpd_clientlib, openssl }: stdenv.mkDerivation rec { pname = "ympd"; @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1nvb19jd556v2h2bi7w4dcl507p3p8xvjkqfzrcsy7ccy3502brq"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake mpd_clientlib openssl ]; + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ mpd_clientlib openssl ]; meta = { homepage = "https://www.ympd.org"; diff --git a/pkgs/applications/audio/yoshimi/default.nix b/pkgs/applications/audio/yoshimi/default.nix index 2b0a89bbaf5b..7f5b0e8d008a 100644 --- a/pkgs/applications/audio/yoshimi/default.nix +++ b/pkgs/applications/audio/yoshimi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub , alsaLib, boost, cairo, cmake, fftwSinglePrec, fltk, pcre +{ lib, stdenv, fetchFromGitHub , alsaLib, boost, cairo, cmake, fftwSinglePrec, fltk, pcre , libjack2, libsndfile, libXdmcp, readline, lv2, libGLU, libGL, minixml, pkgconfig, zlib, xorg }: @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DFLTK_MATH_LIBRARY=${stdenv.glibc.out}/lib/libm.so" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "High quality software synthesizer based on ZynAddSubFX"; longDescription = '' Yoshimi delivers the same synthesizer capabilities as diff --git a/pkgs/applications/audio/zam-plugins/default.nix b/pkgs/applications/audio/zam-plugins/default.nix index edcc70f9912f..82993ec2673b 100644 --- a/pkgs/applications/audio/zam-plugins/default.nix +++ b/pkgs/applications/audio/zam-plugins/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, boost, libX11, libGL, liblo, libjack2, ladspaH, lv2, pkgconfig, rubberband, libsndfile, fftwFloat, libsamplerate }: +{ lib, stdenv, fetchFromGitHub, boost, libX11, libGL, liblo, libjack2, ladspaH, lv2, pkgconfig, rubberband, libsndfile, fftwFloat, libsamplerate }: stdenv.mkDerivation rec { pname = "zam-plugins"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.zamaudio.com/?p=976"; description = "A collection of LV2/LADSPA/VST/JACK audio plugins by ZamAudio"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/audio/zita-ajbridge/default.nix b/pkgs/applications/audio/zita-ajbridge/default.nix index ad2ea53e9f7e..4b094864607c 100644 --- a/pkgs/applications/audio/zita-ajbridge/default.nix +++ b/pkgs/applications/audio/zita-ajbridge/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, libjack2, zita-alsa-pcmi, zita-resampler }: +{ lib, stdenv, fetchurl, alsaLib, libjack2, zita-alsa-pcmi, zita-resampler }: stdenv.mkDerivation rec { name = "zita-ajbridge-0.8.4"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Connect additional ALSA devices to JACK"; homepage = "http://kokkinizita.linuxaudio.org/linuxaudio/index.html"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/audio/zita-at1/default.nix b/pkgs/applications/audio/zita-at1/default.nix index d357febd882e..7a66ed42b053 100644 --- a/pkgs/applications/audio/zita-at1/default.nix +++ b/pkgs/applications/audio/zita-at1/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , cairo, fftwSinglePrec, libX11, libXft, libclthreads, libclxclient, libjack2 , xorgproto, zita-resampler }: @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Autotuner Jack application to correct the pitch of vocal tracks"; homepage = "https://kokkinizita.linuxaudio.org/linuxaudio/index.html"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/audio/zita-njbridge/default.nix b/pkgs/applications/audio/zita-njbridge/default.nix index 3a293cfc026f..142f9bc4d09b 100644 --- a/pkgs/applications/audio/zita-njbridge/default.nix +++ b/pkgs/applications/audio/zita-njbridge/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libjack2, zita-resampler }: +{ lib, stdenv, fetchurl, libjack2, zita-resampler }: stdenv.mkDerivation rec { version = "0.4.4"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ]; - meta = with stdenv.lib; { + meta = with lib; { description = "command line Jack clients to transmit full quality multichannel audio over a local IP network"; homepage = "http://kokkinizita.linuxaudio.org/linuxaudio/index.html"; license = licenses.gpl3; diff --git a/pkgs/applications/audio/zynaddsubfx/default.nix b/pkgs/applications/audio/zynaddsubfx/default.nix index 9a432f73d3f0..3d5f392205f9 100644 --- a/pkgs/applications/audio/zynaddsubfx/default.nix +++ b/pkgs/applications/audio/zynaddsubfx/default.nix @@ -1,30 +1,117 @@ -{ stdenv, fetchurl, alsaLib, cairo, cmake, libjack2, fftw, fltk13, lash, libjpeg -, libXpm, minixml, ntk, pkgconfig, zlib, liblo +{ lib +, stdenv +, fetchFromGitHub +, callPackage + + # Required build tools +, cmake +, makeWrapper +, pkg-config + + # Required dependencies +, fftw +, liblo +, minixml +, zlib + + # Optional dependencies +, alsaSupport ? true +, alsaLib +, dssiSupport ? false +, dssi +, ladspaH +, jackSupport ? true +, libjack2 +, lashSupport ? false +, lash +, ossSupport ? true +, portaudioSupport ? true +, portaudio + + # Optional GUI dependencies +, guiModule ? "off" +, cairo +, fltk13 +, libGL +, libjpeg +, libX11 +, libXpm +, ntk + + # Test dependencies +, cxxtest }: -stdenv.mkDerivation rec { +assert builtins.any (g: guiModule == g) [ "fltk" "ntk" "zest" "off" ]; + +let + guiName = { + "fltk" = "FLTK"; + "ntk" = "NTK"; + "zest" = "Zyn-Fusion"; + }.${guiModule}; + mruby-zest = callPackage ./mruby-zest { }; +in stdenv.mkDerivation rec { pname = "zynaddsubfx"; version = "3.0.5"; - src = fetchurl { - url = "mirror://sourceforge/zynaddsubfx/zynaddsubfx-${version}.tar.bz2"; - sha256 = "0qwzg14h043rmyf9jqdylxhyfy4sl0vsr0gjql51wjhid0i34ivl"; + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = version; + sha256 = "1vh1gszgjxwn8m32rk5222z1j2cnjax0bqpag7b47v6i36p2q4x8"; + fetchSubmodules = true; }; - buildInputs = [ alsaLib cairo libjack2 fftw fltk13 lash libjpeg libXpm minixml ntk zlib liblo ]; - nativeBuildInputs = [ cmake pkgconfig ]; - - patchPhase = '' + postPatch = '' substituteInPlace src/Misc/Config.cpp --replace /usr $out ''; - hardeningDisable = [ "format" ]; + nativeBuildInputs = [ cmake makeWrapper pkg-config ]; + + buildInputs = [ fftw liblo minixml zlib ] + ++ lib.optionals alsaSupport [ alsaLib ] + ++ lib.optionals dssiSupport [ dssi ladspaH ] + ++ lib.optionals jackSupport [ libjack2 ] + ++ lib.optionals lashSupport [ lash ] + ++ lib.optionals portaudioSupport [ portaudio ] + ++ lib.optionals (guiModule == "fltk") [ fltk13 libjpeg libXpm ] + ++ lib.optionals (guiModule == "ntk") [ ntk cairo libXpm ] + ++ lib.optionals (guiModule == "zest") [ libGL libX11 ]; + + cmakeFlags = [ "-DGuiModule=${guiModule}" ] + # OSS library is included in glibc. + # Must explicitly disable if support is not wanted. + ++ lib.optional (!ossSupport) "-DOssEnable=OFF" + # Find FLTK without requiring an OpenGL library in buildInputs + ++ lib.optional (guiModule == "fltk") "-DFLTK_SKIP_OPENGL=ON"; + + doCheck = true; + checkInputs = [ cxxtest ]; + + # When building with zest GUI, patch plugins + # and standalone executable to properly locate zest + postFixup = lib.optional (guiModule == "zest") '' + patchelf --set-rpath "${mruby-zest}:$(patchelf --print-rpath "$out/lib/lv2/ZynAddSubFX.lv2/ZynAddSubFX_ui.so")" \ + "$out/lib/lv2/ZynAddSubFX.lv2/ZynAddSubFX_ui.so" + + patchelf --set-rpath "${mruby-zest}:$(patchelf --print-rpath "$out/lib/vst/ZynAddSubFX.so")" \ + "$out/lib/vst/ZynAddSubFX.so" + + wrapProgram "$out/bin/zynaddsubfx" \ + --prefix PATH : ${mruby-zest} \ + --prefix LD_LIBRARY_PATH : ${mruby-zest} + ''; + + meta = with lib; { + description = "High quality software synthesizer (${guiName} GUI)"; + homepage = + if guiModule == "zest" + then "https://zynaddsubfx.sourceforge.io/zyn-fusion.html" + else "https://zynaddsubfx.sourceforge.io"; - meta = with stdenv.lib; { - description = "High quality software synthesizer"; - homepage = "http://zynaddsubfx.sourceforge.net"; license = licenses.gpl2; + maintainers = with maintainers; [ goibhniu metadark ]; platforms = platforms.linux; - maintainers = [ maintainers.goibhniu maintainers.nico202 ]; }; } diff --git a/pkgs/applications/audio/zynaddsubfx/mruby-zest/default.nix b/pkgs/applications/audio/zynaddsubfx/mruby-zest/default.nix new file mode 100644 index 000000000000..0096cc97ddbd --- /dev/null +++ b/pkgs/applications/audio/zynaddsubfx/mruby-zest/default.nix @@ -0,0 +1,109 @@ +{ lib, stdenv +, fetchFromGitHub +, bison +, git +, python2 +, rake +, ruby +, libGL +, libuv +, libX11 +}: + +let + mgem-list = fetchFromGitHub { + owner = "mruby"; + repo = "mgem-list"; + rev = "2033837203c8a141b1f9d23bb781fe0cbaefbd24"; + sha256 = "0igf2nsx5i6g0yf7sjxxkngyriv213d0sjs3yidrflrabiywpxmm"; + }; + + mruby-dir = fetchFromGitHub { + owner = "iij"; + repo = "mruby-dir"; + rev = "89dceefa1250fb1ae868d4cb52498e9e24293cd1"; + sha256 = "0zrhiy9wmwmc9ls62iyb2z86j2ijqfn7rn4xfmrbrfxygczarsm9"; + }; + + mruby-errno = fetchFromGitHub { + owner = "iij"; + repo = "mruby-errno"; + rev = "b4415207ff6ea62360619c89a1cff83259dc4db0"; + sha256 = "12djcwjjw0fygai5kssxbfs3pzh3cpnq07h9m2h5b51jziw380xj"; + }; + + mruby-file-stat = fetchFromGitHub { + owner = "ksss"; + repo = "mruby-file-stat"; + rev = "aa474589f065c71d9e39ab8ba976f3bea6f9aac2"; + sha256 = "1clarmr67z133ivkbwla1a42wcjgj638j9w0mlv5n21mhim9rid5"; + }; + + mruby-process = fetchFromGitHub { + owner = "iij"; + repo = "mruby-process"; + rev = "fe171fbe2a6cc3c2cf7d713641bddde71024f7c8"; + sha256 = "00yrzc371f90gl5m1gbkw0qq8c394bpifssjr8p1wh5fmzhxqyml"; + }; + + mruby-pack = fetchFromGitHub { + owner = "iij"; + repo = "mruby-pack"; + rev = "383a9c79e191d524a9a2b4107cc5043ecbf6190b"; + sha256 = "003glxgxifk4ixl12sy4gn9bhwvgb79b4wga549ic79isgv81w2d"; + }; +in +stdenv.mkDerivation rec { + pname = "mruby-zest"; + version = "3.0.5"; + + src = fetchFromGitHub { + owner = pname; + repo = "${pname}-build"; + rev = version; + sha256 = "0fxljrgamgz2rm85mclixs00b0f2yf109jc369039n1vf0l5m57d"; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ bison git python2 rake ruby ]; + buildInputs = [ libGL libuv libX11 ]; + + patches = [ + ./force-gcc-as-linker.patch + ./system-libuv.patch + ]; + + # Add missing dependencies of deps/mruby-dir-glob/mrbgem.rake + # Should be fixed in next release, see bcadb0a5490bd6d599f1a0e66ce09b46363c9dae + postPatch = '' + mkdir -p mruby/build/mrbgems + ln -s ${mgem-list} mruby/build/mrbgems/mgem-list + ln -s ${mruby-dir} mruby/build/mrbgems/mruby-dir + ln -s ${mruby-errno} mruby/build/mrbgems/mruby-errno + ln -s ${mruby-file-stat} mruby/build/mrbgems/mruby-file-stat + ln -s ${mruby-process} mruby/build/mrbgems/mruby-process + ln -s ${mruby-pack} mruby/build/mrbgems/mruby-pack + ''; + + installTargets = [ "pack" ]; + + postInstall = '' + ln -s "$out/zest" "$out/zyn-fusion" + cp -a package/{font,libzest.so,schema,zest} "$out" + + # mruby-widget-lib/src/api.c requires MainWindow.qml as part of a + # sanity check, even though qml files are compiled into the binary + # https://github.com/mruby-zest/mruby-zest-build/tree/3.0.5/src/mruby-widget-lib/src/api.c#L99-L116 + # https://github.com/mruby-zest/mruby-zest-build/tree/3.0.5/linux-pack.sh#L17-L18 + mkdir -p "$out/qml" + touch "$out/qml/MainWindow.qml" + ''; + + meta = with lib; { + description = "The Zest Framework used in ZynAddSubFX's UI"; + homepage = "https://github.com/mruby-zest"; + license = licenses.lgpl21; + maintainers = with maintainers; [ metadark ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/audio/zynaddsubfx/mruby-zest/force-gcc-as-linker.patch b/pkgs/applications/audio/zynaddsubfx/mruby-zest/force-gcc-as-linker.patch new file mode 100644 index 000000000000..c521d2407740 --- /dev/null +++ b/pkgs/applications/audio/zynaddsubfx/mruby-zest/force-gcc-as-linker.patch @@ -0,0 +1,13 @@ +diff --git a/mruby/tasks/toolchains/gcc.rake b/mruby/tasks/toolchains/gcc.rake +index f370c0ab..e5ab9f60 100644 +--- a/mruby/tasks/toolchains/gcc.rake ++++ b/mruby/tasks/toolchains/gcc.rake +@@ -22,7 +22,7 @@ MRuby::Toolchain.new(:gcc) do |conf, _params| + end + + conf.linker do |linker| +- linker.command = ENV['LD'] || 'gcc' ++ linker.command = 'gcc' + linker.flags = [ENV['LDFLAGS'] || %w()] + linker.libraries = %w(m) + linker.library_paths = [] diff --git a/pkgs/applications/audio/zynaddsubfx/mruby-zest/system-libuv.patch b/pkgs/applications/audio/zynaddsubfx/mruby-zest/system-libuv.patch new file mode 100644 index 000000000000..b7050abc1235 --- /dev/null +++ b/pkgs/applications/audio/zynaddsubfx/mruby-zest/system-libuv.patch @@ -0,0 +1,113 @@ +diff --git a/Makefile b/Makefile +index f3e3be2..2398852 100644 +--- a/Makefile ++++ b/Makefile +@@ -1,8 +1,3 @@ +-UV_DIR = libuv-v1.9.1 +-UV_FILE = $(UV_DIR).tar.gz +-UV_URL = http://dist.libuv.org/dist/v1.9.1/$(UV_FILE) +- +- + all: + ruby ./rebuild-fcache.rb + cd deps/nanovg/src && $(CC) nanovg.c -c -fPIC +@@ -10,12 +5,12 @@ all: + # cd deps/pugl && python2 ./waf configure --no-cairo --static + cd deps/pugl && python2 ./waf configure --no-cairo --static --debug + cd deps/pugl && python2 ./waf +- cd src/osc-bridge && CFLAGS="-I ../../deps/$(UV_DIR)/include " make lib ++ cd src/osc-bridge && make lib + cd mruby && MRUBY_CONFIG=../build_config.rb rake + $(CC) -shared -o libzest.so `find mruby/build/host -type f | grep -e "\.o$$" | grep -v bin` ./deps/libnanovg.a \ + ./deps/libnanovg.a \ + src/osc-bridge/libosc-bridge.a \ +- ./deps/$(UV_DIR)/.libs/libuv.a -lm -lX11 -lGL -lpthread ++ -luv -lm -lX11 -lGL -lpthread + $(CC) test-libversion.c deps/pugl/build/libpugl-0.a -ldl -o zest -lX11 -lGL -lpthread -I deps/pugl -std=gnu99 + + osx: +@@ -25,12 +20,12 @@ osx: + cd deps/pugl && python2 ./waf configure --no-cairo --static + # cd deps/pugl && python2 ./waf configure --no-cairo --static --debug + cd deps/pugl && python2 ./waf +- cd src/osc-bridge && CFLAGS="-I ../../deps/$(UV_DIR)/include " make lib ++ cd src/osc-bridge && make lib + cd mruby && MRUBY_CONFIG=../build_config.rb rake + $(CC) -shared -o libzest.so `find mruby/build/host -type f | grep -e "\.o$$" | grep -v bin` ./deps/libnanovg.a \ + ./deps/libnanovg.a \ + src/osc-bridge/libosc-bridge.a \ +- ./deps/$(UV_DIR)/.libs/libuv.a -lm -framework OpenGL -lpthread ++ -luv -lm -framework OpenGL -lpthread + $(CC) test-libversion.c deps/pugl/build/libpugl-0.a -ldl -o zest -framework OpenGL -framework AppKit -lpthread -I deps/pugl -std=gnu99 + + windows: +@@ -38,38 +33,14 @@ windows: + $(AR) rc deps/libnanovg.a deps/nanovg/src/*.o + cd deps/pugl && CFLAGS="-mstackrealign" python2 ./waf configure --no-cairo --static --target=win32 + cd deps/pugl && python2 ./waf +- cd src/osc-bridge && CFLAGS="-mstackrealign -I ../../deps/$(UV_DIR)/include " make lib ++ cd src/osc-bridge && CFLAGS="-mstackrealign" make lib + cd mruby && WINDOWS=1 MRUBY_CONFIG=../build_config.rb rake + $(CC) -mstackrealign -shared -o libzest.dll -static-libgcc `find mruby/build/w64 -type f | grep -e "\.o$$" | grep -v bin` \ + ./deps/libnanovg.a \ + src/osc-bridge/libosc-bridge.a \ +- ./deps/libuv-win.a \ +- -lm -lpthread -lws2_32 -lkernel32 -lpsapi -luserenv -liphlpapi -lglu32 -lgdi32 -lopengl32 ++ -luv -lm -lpthread -lws2_32 -lkernel32 -lpsapi -luserenv -liphlpapi -lglu32 -lgdi32 -lopengl32 + $(CC) -mstackrealign -DWIN32 test-libversion.c deps/pugl/build/libpugl-0.a -o zest.exe -lpthread -I deps/pugl -std=c99 -lws2_32 -lkernel32 -lpsapi -luserenv -liphlpapi -lglu32 -lgdi32 -lopengl32 + +- +-builddep: deps/libuv.a +-deps/libuv.a: +- cd deps/$(UV_DIR) && ./autogen.sh +- cd deps/$(UV_DIR) && CFLAGS=-fPIC ./configure +- cd deps/$(UV_DIR) && CFLAGS=-fPIC make +- cp deps/$(UV_DIR)/.libs/libuv.a deps/ +- +-builddepwin: deps/libuv-win.a +-deps/libuv-win.a: +- cd deps/$(UV_DIR) && ./autogen.sh +- cd deps/$(UV_DIR) && CFLAGS="-mstackrealign" ./configure --host=x86_64-w64-mingw32 +- cd deps/$(UV_DIR) && LD=x86_64-w64-mingw32-gcc make +- cp deps/$(UV_DIR)/.libs/libuv.a deps/libuv-win.a +- +-deps/$(UV_DIR): +- cd deps && wget -4 $(UV_URL) && tar xvf $(UV_FILE) +-setup: deps/$(UV_DIR) +- +-setupwin: +- cd deps && wget -4 $(UV_URL) +- cd deps && tar xvf $(UV_FILE) +- + push: + cd src/osc-bridge && git push + cd src/mruby-qml-parse && git push +diff --git a/build_config.rb b/build_config.rb +index 00f1f69..11ac15b 100644 +--- a/build_config.rb ++++ b/build_config.rb +@@ -96,7 +96,6 @@ build_type.new(build_name) do |conf| + conf.cc do |cc| + cc.include_paths << "#{`pwd`.strip}/../deps/nanovg/src" + cc.include_paths << "#{`pwd`.strip}/../deps/pugl/" +- cc.include_paths << "#{`pwd`.strip}/../deps/libuv-v1.9.1/include/" + cc.include_paths << "/usr/share/mingw-w64/include/" if windows + cc.include_paths << "/usr/x86_64-w64-mingw32/include/" if windows + cc.flags << "-DLDBL_EPSILON=1e-6" if windows +@@ -117,14 +116,14 @@ build_type.new(build_name) do |conf| + linker.flags_after_libraries << "#{`pwd`.strip}/../deps/pugl/build/libpugl-0.a" + linker.flags_after_libraries << "#{`pwd`.strip}/../deps/libnanovg.a" + if(!windows) +- linker.flags_after_libraries << "#{`pwd`.strip}/../deps/libuv.a" ++ linker.flags_after_libraries << "-luv" + if(ENV['OS'] != "Mac") + linker.libraries << 'GL' + linker.libraries << 'X11' + end + linker.flags_after_libraries << "-lpthread -ldl -lm" + else +- linker.flags_after_libraries << "#{`pwd`.strip}/../deps/libuv-win.a" ++ linker.flags_after_libraries << "-luv" + linker.flags_after_libraries << "-lws2_32 -lkernel32 -lpsapi -luserenv -liphlpapi" + linker.flags_after_libraries << "-lglu32 -lgdi32 -lopengl32" + end diff --git a/pkgs/applications/backup/areca/default.nix b/pkgs/applications/backup/areca/default.nix index b4d644430dd1..2cf0113cb5ab 100644 --- a/pkgs/applications/backup/areca/default.nix +++ b/pkgs/applications/backup/areca/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ant, jre, jdk, swt, acl, attr }: +{ lib, stdenv, fetchurl, ant, jre, jdk, swt, acl, attr }: stdenv.mkDerivation { name = "areca-7.5"; @@ -44,7 +44,7 @@ stdenv.mkDerivation { cp COPYING $out ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.areca-backup.org/"; description = "An Open Source personal backup solution"; license = licenses.gpl2; diff --git a/pkgs/applications/backup/deja-dup/default.nix b/pkgs/applications/backup/deja-dup/default.nix index d6ce864d6523..4ab491cb9a9d 100644 --- a/pkgs/applications/backup/deja-dup/default.nix +++ b/pkgs/applications/backup/deja-dup/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitLab , substituteAll , meson @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { "-Dduplicity_command=${duplicity}/bin/duplicity" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A simple backup tool"; longDescription = '' Déjà Dup is a simple backup tool. It hides the complexity \ diff --git a/pkgs/applications/backup/vdmfec/default.nix b/pkgs/applications/backup/vdmfec/default.nix index 1366bb484a91..2f9b4a4bfaea 100644 --- a/pkgs/applications/backup/vdmfec/default.nix +++ b/pkgs/applications/backup/vdmfec/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "vdmfec"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0i7q4ylx2xmzzq778anpkj4nqir5gf573n1lbpxnbc10ymsjq2rm"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A program that adds error correction blocks"; homepage = "http://members.tripod.com/professor_tom/archives/index.html"; maintainers = [ maintainers.ar1a ]; diff --git a/pkgs/applications/blockchains/aeon/default.nix b/pkgs/applications/blockchains/aeon/default.nix index 5e0c25466ebe..b9c8512ae136 100644 --- a/pkgs/applications/blockchains/aeon/default.nix +++ b/pkgs/applications/blockchains/aeon/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, git, doxygen, graphviz +{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, git, doxygen, graphviz , boost, miniupnpc, openssl, unbound, cppzmq , zeromq, pcsclite, readline, libsodium }: @@ -33,7 +33,7 @@ stdenv.mkDerivation { hardeningDisable = [ "fortify" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Private, secure, untraceable currency"; homepage = "http://www.aeon.cash/"; license = licenses.bsd3; diff --git a/pkgs/applications/blockchains/bitcoin-abc.nix b/pkgs/applications/blockchains/bitcoin-abc.nix index 81825d3d5b02..d2b69a32ab5a 100644 --- a/pkgs/applications/blockchains/bitcoin-abc.nix +++ b/pkgs/applications/blockchains/bitcoin-abc.nix @@ -32,8 +32,6 @@ mkDerivation rec { find ./. -type f -iname "*.sh" -exec chmod +x {} \; ''; - enableParallelBuilding = true; - meta = { description = "Peer-to-peer electronic cash system (Cash client)"; longDescription= '' diff --git a/pkgs/applications/blockchains/bitcoin-gold.nix b/pkgs/applications/blockchains/bitcoin-gold.nix index 7205e882c314..c108304ee378 100644 --- a/pkgs/applications/blockchains/bitcoin-gold.nix +++ b/pkgs/applications/blockchains/bitcoin-gold.nix @@ -19,7 +19,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - + pname = "bitcoin" + toString (optional (!withGui) "d") + "-gold"; version = "0.15.2"; diff --git a/pkgs/applications/blockchains/bitcoin-knots.nix b/pkgs/applications/blockchains/bitcoin-knots.nix index dd0132df4d94..a7fb005ea816 100644 --- a/pkgs/applications/blockchains/bitcoin-knots.nix +++ b/pkgs/applications/blockchains/bitcoin-knots.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , pkgconfig , autoreconfHook @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-incompatible-bdb" "--with-boost-libdir=${boost.out}/lib" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "An enhanced Bitcoin node software"; homepage = "https://bitcoinknots.org/"; license = licenses.mit; diff --git a/pkgs/applications/blockchains/cgminer/default.nix b/pkgs/applications/blockchains/cgminer/default.nix index 966303ec5a65..b7d9bcd583a2 100644 --- a/pkgs/applications/blockchains/cgminer/default.nix +++ b/pkgs/applications/blockchains/cgminer/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , pkgconfig , libtool @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { "--enable-keccak" "--enable-bflsc"]; - meta = with stdenv.lib; { + meta = with lib; { description = "CPU/GPU miner in c for bitcoin"; homepage = "https://github.com/ckolivas/cgminer"; license = licenses.gpl3; diff --git a/pkgs/applications/blockchains/dero.nix b/pkgs/applications/blockchains/dero.nix index 8aa693d28714..373170fe8ffd 100644 --- a/pkgs/applications/blockchains/dero.nix +++ b/pkgs/applications/blockchains/dero.nix @@ -15,8 +15,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ boost miniupnpc openssl lmdb unbound readline ]; - enableParallelBuilding = true; - meta = with lib; { description = "Secure, private blockchain with smart contracts based on Monero"; homepage = "https://dero.io/"; diff --git a/pkgs/applications/blockchains/electrs.nix b/pkgs/applications/blockchains/electrs.nix new file mode 100644 index 000000000000..0b0da5913ab9 --- /dev/null +++ b/pkgs/applications/blockchains/electrs.nix @@ -0,0 +1,30 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, llvmPackages +}: + +rustPlatform.buildRustPackage rec { + pname = "electrs"; + version = "0.8.6"; + + src = fetchFromGitHub { + owner = "romanz"; + repo = pname; + rev = "v${version}"; + sha256 = "0nnblxz4xr8k083wy3whx8qxqmdzbxsh5gd91161mrnvidganvgb"; + }; + + # needed for librocksdb-sys + nativeBuildInputs = [ llvmPackages.clang ]; + LIBCLANG_PATH = "${llvmPackages.libclang}/lib"; + + cargoSha256 = "11xwjcfc3kqjyp94qzmyb26xwynf4f1q3ac3rp7l7qq1njly07gr"; + + meta = with lib; { + description = "An efficient re-implementation of Electrum Server in Rust"; + homepage = "https://github.com/romanz/electrs"; + license = licenses.mit; + maintainers = with maintainers; [ prusnak ]; + }; +} diff --git a/pkgs/applications/blockchains/ergo/default.nix b/pkgs/applications/blockchains/ergo/default.nix index 6b686d0b2d6c..3c5bc5ea5ced 100644 --- a/pkgs/applications/blockchains/ergo/default.nix +++ b/pkgs/applications/blockchains/ergo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, jre }: +{ lib, stdenv, fetchurl, makeWrapper, jre }: stdenv.mkDerivation rec { pname = "ergo"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { makeWrapper ${jre}/bin/java $out/bin/ergo --add-flags "-jar $src" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Open protocol that implements modern scientific ideas in the blockchain area"; homepage = "https://ergoplatform.org/en/"; license = licenses.cc0; diff --git a/pkgs/applications/blockchains/ethabi.nix b/pkgs/applications/blockchains/ethabi.nix index ad574c82b464..ec142cc723ef 100644 --- a/pkgs/applications/blockchains/ethabi.nix +++ b/pkgs/applications/blockchains/ethabi.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform }: +{ lib, stdenv, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { pname = "ethabi"; @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1hx8qw51rl7sn9jmnclw0hc4rx619hf78hpaih5mvny3k0zgiwpm"; - meta = with stdenv.lib; { + meta = with lib; { description = "Ethereum function call encoding (ABI) utility"; homepage = "https://github.com/ethcore/ethabi/"; maintainers = [ maintainers.dbrock ]; diff --git a/pkgs/applications/blockchains/exodus/default.nix b/pkgs/applications/blockchains/exodus/default.nix index 3992c7824851..37ad808de8a6 100644 --- a/pkgs/applications/blockchains/exodus/default.nix +++ b/pkgs/applications/blockchains/exodus/default.nix @@ -1,14 +1,14 @@ { stdenv, lib, fetchurl, unzip, glib, systemd, nss, nspr, gtk3-x11, pango, atk, cairo, gdk-pixbuf, xorg, xorg_sys_opengl, util-linux, alsaLib, dbus, at-spi2-atk, -cups, vivaldi-ffmpeg-codecs, libpulseaudio, at-spi2-core }: +cups, vivaldi-ffmpeg-codecs, libpulseaudio, at-spi2-core, libxkbcommon, mesa }: stdenv.mkDerivation rec { pname = "exodus"; - version = "20.12.4"; + version = "21.1.7"; src = fetchurl { url = "https://downloads.exodus.io/releases/${pname}-linux-x64-${version}.zip"; - sha256 = "1j1iqmcbwfj72l7g83ah701bipas9cqwazyhh0af5hp2ckj9nmmf"; + sha256 = "sha256-im0z3g225EhboJFoHBweHefn2QAKvYGSAP7e4Mz6Jm8="; }; sourceRoot = "."; @@ -62,6 +62,8 @@ stdenv.mkDerivation rec { libpulseaudio systemd vivaldi-ffmpeg-codecs + libxkbcommon + mesa ]; in '' patchelf \ @@ -70,7 +72,7 @@ stdenv.mkDerivation rec { $out/Exodus ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.exodus.io/"; description = "Top-rated cryptocurrency wallet with Trezor integration and built-in Exchange"; license = licenses.unfree; diff --git a/pkgs/applications/blockchains/go-ethereum.nix b/pkgs/applications/blockchains/go-ethereum.nix index 24f58a6c2c34..3fc3a9109c5a 100644 --- a/pkgs/applications/blockchains/go-ethereum.nix +++ b/pkgs/applications/blockchains/go-ethereum.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, libobjc, IOKit }: +{ lib, stdenv, buildGoModule, fetchFromGitHub, libobjc, IOKit }: buildGoModule rec { pname = "go-ethereum"; @@ -37,7 +37,7 @@ buildGoModule rec { propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ libobjc IOKit ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://geth.ethereum.org/"; description = "Official golang implementation of the Ethereum protocol"; license = with licenses; [ lgpl3 gpl3 ]; diff --git a/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/pkgs/applications/blockchains/ledger-live-desktop/default.nix index bb2fc8933993..54805f2512fe 100644 --- a/pkgs/applications/blockchains/ledger-live-desktop/default.nix +++ b/pkgs/applications/blockchains/ledger-live-desktop/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeDesktopItem, appimageTools, imagemagick }: +{ lib, stdenv, fetchurl, makeDesktopItem, appimageTools, imagemagick }: let pname = "ledger-live-desktop"; @@ -26,7 +26,7 @@ in appimageTools.wrapType2 rec { --replace 'Exec=AppRun' 'Exec=${pname}' ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Wallet app for Ledger Nano S and Ledger Blue"; homepage = "https://www.ledger.com/live"; license = licenses.mit; diff --git a/pkgs/applications/blockchains/lndconnect/default.nix b/pkgs/applications/blockchains/lndconnect/default.nix new file mode 100644 index 000000000000..0d6f33ca3ac8 --- /dev/null +++ b/pkgs/applications/blockchains/lndconnect/default.nix @@ -0,0 +1,25 @@ +{ lib, buildGoPackage, fetchFromGitHub }: +buildGoPackage rec { + pname = "lndconnect"; + version = "0.2.0"; + + goPackagePath = "github.com/LN-Zap/lndconnect"; + + src = fetchFromGitHub { + owner = "LN-Zap"; + repo = pname; + rev = "v${version}"; + sha256 = "0zp23vp4i4csc6x1b6z39rqcmknxd508x6clr8ckdj2fwjwkyf5a"; + }; + + goDeps = ./deps.nix; + + meta = with lib; { + description = "Generate QRCode to connect apps to lnd Resources"; + license = licenses.mit; + homepage = "https://github.com/LN-Zap/lndconnect"; + maintainers = [ maintainers.xwvvvvwx ]; + platforms = platforms.linux; + }; +} + diff --git a/pkgs/applications/blockchains/lndconnect/deps.nix b/pkgs/applications/blockchains/lndconnect/deps.nix new file mode 100644 index 000000000000..5a31f0d57057 --- /dev/null +++ b/pkgs/applications/blockchains/lndconnect/deps.nix @@ -0,0 +1,129 @@ +[ + { + goPackagePath = "github.com/Baozisoftware/qrcode-terminal-go"; + fetch = { + type = "git"; + url = "https://github.com/Baozisoftware/qrcode-terminal-go"; + rev = "c0650d8dff0f053901ff16185217b950d5e7743c"; + sha256 = "166h9zy9y7ygayhybg7d080hpdcf1mvkf3rwnq5lqg8i3cg71s7b"; + }; + } + { + goPackagePath = "github.com/btcsuite/btcd"; + fetch = { + type = "git"; + url = "https://github.com/btcsuite/btcd"; + rev = "e9a51e8dcd673c563a549676ebd4384b0318a9b7"; + sha256 = "053pdhhycls7cpygg4rhc0y2p937ni4cgxylgxd1zpwffqdjsxrs"; + }; + } + { + goPackagePath = "github.com/btcsuite/btclog"; + fetch = { + type = "git"; + url = "https://github.com/btcsuite/btclog"; + rev = "84c8d2346e9fc8c7b947e243b9c24e6df9fd206a"; + sha256 = "02dl46wcnfpg9sqvg0ipipkpnd7lrf4fnvb9zy56jqa7mfcwc7wk"; + }; + } + { + goPackagePath = "github.com/btcsuite/btcutil"; + fetch = { + type = "git"; + url = "https://github.com/btcsuite/btcutil"; + rev = "063c4115b3a9a7201e82447875383890698abcb6"; + sha256 = "12dpy5ipmd751xb71hcmrl9xyl89r5rflnrvypnz1irairfqwjwm"; + }; + } + { + goPackagePath = "github.com/glendc/go-external-ip"; + fetch = { + type = "git"; + url = "https://github.com/glendc/go-external-ip"; + rev = "c872357d968e33d5d9c47ea2c603f3b411150ecc"; + sha256 = "1h9cdhab4fapa2p1r8sgl1pxv4qi1zskw8x0pj93a81y03zzr2l1"; + }; + } + { + goPackagePath = "github.com/jessevdk/go-flags"; + fetch = { + type = "git"; + url = "https://github.com/jessevdk/go-flags"; + rev = "c17162fe8fd74f119ff938c5c67af63e3bac5ded"; + sha256 = "0byp3f79b0399n7g6nm59afb6gj9cknfqgfqadvpppv7lvnd34jf"; + }; + } + { + goPackagePath = "github.com/lightningnetwork/lnd"; + fetch = { + type = "git"; + url = "https://github.com/lightningnetwork/lnd"; + rev = "fd962d322ae2a913cc357dbb63382f22a9a0a6ce"; + sha256 = "0yj2vqb9qg5v0rbchkpwhhw51rp31z76zchhhbc837sz8l8lryra"; + }; + } + { + goPackagePath = "github.com/mattn/go-colorable"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-colorable"; + rev = "f6c00982823144337e56cdb71c712eaac151d29c"; + sha256 = "08y5c01bvyqxraj3wc0di80gbp87178rsshb74x0p3m7wwfv82l3"; + }; + } + { + goPackagePath = "github.com/mattn/go-isatty"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-isatty"; + rev = "cb30d6282491c185f77d9bec5d25de1bb61a06bc"; + sha256 = "0v59mv94acd2m72q8adhigxkx1vn38l5h0d8hp0nxga2v9f3v8kd"; + }; + } + { + goPackagePath = "github.com/miekg/dns"; + fetch = { + type = "git"; + url = "https://github.com/miekg/dns"; + rev = "7a5f1127f7f4e461b7400d6a9df1bc523e7448fd"; + sha256 = "1xwg6zwlxwkm1x121b3idir76h7wr9wmcdmg4vgj9hma903s63md"; + }; + } + { + goPackagePath = "github.com/skip2/go-qrcode"; + fetch = { + type = "git"; + url = "https://github.com/skip2/go-qrcode"; + rev = "da1b6568686e89143e94f980a98bc2dbd5537f13"; + sha256 = "0pghd6y2x8a5fqy4rjn4d8j5jcslb236naycdza5an7vyvinsgs9"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "5c72a883971a4325f8c62bf07b6d38c20ea47a6a"; + sha256 = "1cimmqpajys001x6yq8ycklc4w34y7iwrksv7ayv7m7fgzhcjn3d"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "05aa5d4ee32165add31ddef9d5d3946713e5dc5e"; + sha256 = "1v532mdb32h2gan6lc9ssya2v1lk6nzyzqvxn5nkbxij9x4v1jkl"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "9d91bd62050c7b3011b7df0d2a4daa0042684420"; + sha256 = "0d2jjd7r0zwakd1d2g2qm59w6jc6sgg0sal5gc626i8nn9adj2jg"; + }; + } +] + diff --git a/pkgs/applications/blockchains/masari.nix b/pkgs/applications/blockchains/masari.nix index dfa005abb6ec..25301a87aeaa 100644 --- a/pkgs/applications/blockchains/masari.nix +++ b/pkgs/applications/blockchains/masari.nix @@ -15,8 +15,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ boost miniupnpc openssl lmdb unbound readline ]; - enableParallelBuilding = true; - meta = with lib; { description = "scalability-focused, untraceable, secure, and fungible cryptocurrency using the RingCT protocol"; homepage = "https://www.getmasari.org/"; diff --git a/pkgs/applications/blockchains/monero-gui/default.nix b/pkgs/applications/blockchains/monero-gui/default.nix index c25fd1b21510..a34e834d4a71 100644 --- a/pkgs/applications/blockchains/monero-gui/default.nix +++ b/pkgs/applications/blockchains/monero-gui/default.nix @@ -8,7 +8,7 @@ , monero, miniupnpc, unbound, readline , boost, libunwind, libsodium, pcsclite , randomx, zeromq, libgcrypt, libgpgerror -, hidapi, rapidjson +, hidapi, rapidjson, quirc , trezorSupport ? true , libusb1 ? null , protobuf ? null @@ -28,13 +28,13 @@ in stdenv.mkDerivation rec { pname = "monero-gui"; - version = "0.17.1.7"; + version = "0.17.1.9"; src = fetchFromGitHub { owner = "monero-project"; repo = "monero-gui"; rev = "v${version}"; - sha256 = "1dd2ddkxh9ynxnscysl46hj4dm063h1v13fnyah69am26qzzbby4"; + sha256 = "0143mmxk0jfb5pmjlx6v0knvf8v49kmkpjxlp6rw8lwnlf71xadn"; }; nativeBuildInputs = [ @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { monero miniupnpc unbound readline randomx libgcrypt libgpgerror boost libunwind libsodium pcsclite - zeromq hidapi rapidjson + zeromq hidapi rapidjson quirc ] ++ optionals trezorSupport [ libusb1 protobuf python3 ] ++ optionals stdenv.isDarwin [ qtmacextras ]; @@ -75,6 +75,10 @@ stdenv.mkDerivation rec { substituteInPlace CMakeLists.txt \ --replace 'add_subdirectory(monero)' \ 'add_subdirectory(monero EXCLUDE_FROM_ALL)' + + # use nixpkgs quirc + substituteInPlace CMakeLists.txt \ + --replace 'add_subdirectory(external)' "" ''; cmakeFlags = [ "-DARCH=${arch}" ]; diff --git a/pkgs/applications/blockchains/monero/default.nix b/pkgs/applications/blockchains/monero/default.nix index 3a254053714f..c9134e3ec47e 100644 --- a/pkgs/applications/blockchains/monero/default.nix +++ b/pkgs/applications/blockchains/monero/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch +{ lib, stdenv, fetchFromGitHub, fetchpatch , cmake, pkgconfig , boost, miniupnpc, openssl, unbound , zeromq, pcsclite, readline, libsodium, hidapi @@ -17,13 +17,13 @@ assert trezorSupport -> all (x: x!=null) [ libusb1 protobuf python3 ]; stdenv.mkDerivation rec { pname = "monero"; - version = "0.17.1.7"; + version = "0.17.1.9"; src = fetchFromGitHub { owner = "monero-project"; repo = "monero"; rev = "v${version}"; - sha256 = "1fdw4i4rw87yz3hz4yc1gdw0gr2mmf9038xaw2l4rrk5y50phjp4"; + sha256 = "0jqss4csvkcrhrmaa3vrnyv6yiwqpbfw7037clx9xcfm4qrrfiwy"; fetchSubmodules = true; }; @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "source" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Private, secure, untraceable currency"; homepage = "https://getmonero.org/"; license = licenses.bsd3; diff --git a/pkgs/applications/blockchains/mycrypto/default.nix b/pkgs/applications/blockchains/mycrypto/default.nix index 77e603e8380b..b884f044efe0 100644 --- a/pkgs/applications/blockchains/mycrypto/default.nix +++ b/pkgs/applications/blockchains/mycrypto/default.nix @@ -4,8 +4,8 @@ let pname = "MyCrypto"; - version = "1.7.12"; - sha256 = "0zmdmkli9zxygrcvrd4lbi0xqyq32dqlkxby8lsjknj1nd6l26n3"; + version = "1.7.13"; + sha256 = "15m21n68lxnz6fxwf1bb3cxg5qi6nrwcnqymiw8s9wizvv575vj7"; name = "${pname}-${version}"; src = fetchurl { diff --git a/pkgs/applications/blockchains/parity-ui/default.nix b/pkgs/applications/blockchains/parity-ui/default.nix index b18c121607ab..43b933d3e6ae 100644 --- a/pkgs/applications/blockchains/parity-ui/default.nix +++ b/pkgs/applications/blockchains/parity-ui/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgs, fetchurl, makeWrapper, nodePackages }: +{ lib, stdenv, pkgs, fetchurl, makeWrapper, nodePackages }: let @@ -38,7 +38,7 @@ in stdenv.mkDerivation rec { ln -s $out/share/parity-ui/parity-ui $out/bin/parity-ui ''; - meta = with stdenv.lib; { + meta = with lib; { description = "UI for Parity. Fast, light, robust Ethereum implementation"; homepage = "http://parity.io"; license = licenses.gpl3; diff --git a/pkgs/applications/blockchains/pivx.nix b/pkgs/applications/blockchains/pivx.nix index 6d6f881ae65f..dc80df74a455 100644 --- a/pkgs/applications/blockchains/pivx.nix +++ b/pkgs/applications/blockchains/pivx.nix @@ -1,10 +1,10 @@ -{ fetchFromGitHub, stdenv, pkgconfig, autoreconfHook, wrapQtAppsHook ? null +{ fetchFromGitHub, lib, stdenv, pkgconfig, autoreconfHook, wrapQtAppsHook ? null , openssl, db48, boost, zlib, miniupnpc, gmp , qrencode, glib, protobuf, yasm, libevent , util-linux, qtbase ? null, qttools ? null , enableUpnp ? false , disableWallet ? false -, disableDaemon ? false +, disableDaemon ? false , withGui ? false }: with stdenv.lib; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ++ optionals withGui [ "--with-gui=yes" "--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin" ]; - + enableParallelBuilding = true; doChecks = true; postBuild = '' @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { $out/bin/test_pivx ''; - meta = with stdenv.lib; { + meta = with lib; { description = "An open source crypto-currency focused on fast private transactions"; longDescription = '' PIVX is an MIT licensed, open source, blockchain-based cryptocurrency with diff --git a/pkgs/applications/blockchains/quorum.nix b/pkgs/applications/blockchains/quorum.nix index eb98777c587d..499e2a77c6f6 100644 --- a/pkgs/applications/blockchains/quorum.nix +++ b/pkgs/applications/blockchains/quorum.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildGoPackage, git, which, removeReferencesTo, go }: +{ lib, stdenv, fetchFromGitHub, buildGoPackage, git, which, removeReferencesTo, go }: buildGoPackage rec { pname = "quorum"; @@ -31,7 +31,7 @@ buildGoPackage rec { find $out -type f -exec ${removeReferencesTo}/bin/remove-references-to -t ${go} '{}' + ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A permissioned implementation of Ethereum supporting data privacy"; homepage = "https://www.goquorum.com/"; license = licenses.lgpl3; diff --git a/pkgs/applications/blockchains/stellar-core.nix b/pkgs/applications/blockchains/stellar-core.nix index 6bb717a0344b..925942c56e9b 100644 --- a/pkgs/applications/blockchains/stellar-core.nix +++ b/pkgs/applications/blockchains/stellar-core.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, autoconf, libtool, automake, pkgconfig, git +{ lib, stdenv, fetchgit, autoconf, libtool, automake, pkgconfig, git , bison, flex, postgresql }: let @@ -31,7 +31,7 @@ in stdenv.mkDerivation { ./autogen.sh ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Implements the Stellar Consensus Protocol, a federated consensus protocol"; longDescription = '' Stellar-core is the backbone of the Stellar network. It maintains a diff --git a/pkgs/applications/blockchains/sumokoin.nix b/pkgs/applications/blockchains/sumokoin.nix index beb294d2dfe0..ee817b581953 100644 --- a/pkgs/applications/blockchains/sumokoin.nix +++ b/pkgs/applications/blockchains/sumokoin.nix @@ -23,8 +23,6 @@ stdenv.mkDerivation rec { "-DLMDB_INCLUDE=${lmdb}/include" ]; - enableParallelBuilding = true; - meta = with lib; { description = "A fork of Monero and a truely fungible cryptocurrency"; homepage = "https://www.sumokoin.org/"; diff --git a/pkgs/applications/blockchains/tessera.nix b/pkgs/applications/blockchains/tessera.nix index 84f7925d2180..5b1392525534 100644 --- a/pkgs/applications/blockchains/tessera.nix +++ b/pkgs/applications/blockchains/tessera.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, jre }: +{ lib, stdenv, fetchurl, makeWrapper, jre }: stdenv.mkDerivation rec { pname = "tessera"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { makeWrapper ${jre}/bin/java $out/bin/tessera --add-flags "-jar $src" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Enterprise Implementation of Quorum's transaction manager"; homepage = "https://github.com/jpmorganchase/tessera"; license = licenses.asl20; diff --git a/pkgs/applications/blockchains/turbo-geth.nix b/pkgs/applications/blockchains/turbo-geth.nix index cf0b60ab9856..acb0eafb95e8 100644 --- a/pkgs/applications/blockchains/turbo-geth.nix +++ b/pkgs/applications/blockchains/turbo-geth.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "turbo-geth"; @@ -20,7 +20,7 @@ buildGoModule rec { "cmd/rpcdaemon" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/ledgerwatch/turbo-geth/"; description = "Ethereum node and geth fork focused on scalability and modularity"; license = with licenses; [ lgpl3 gpl3 ]; diff --git a/pkgs/applications/blockchains/wasabibackend/default.nix b/pkgs/applications/blockchains/wasabibackend/default.nix index 6b5358c9cf93..fd298debcb6f 100644 --- a/pkgs/applications/blockchains/wasabibackend/default.nix +++ b/pkgs/applications/blockchains/wasabibackend/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , fetchurl , makeWrapper @@ -90,7 +90,7 @@ stdenv.mkDerivation rec { # If we don't disable stripping the executable fails to start with segfault dontStrip = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Backend for the Wasabi Wallet"; homepage = "https://wasabiwallet.io/"; license = licenses.mit; diff --git a/pkgs/applications/blockchains/wasabiwallet/default.nix b/pkgs/applications/blockchains/wasabiwallet/default.nix index 4a0dbe83716a..ae9c8fa3e888 100644 --- a/pkgs/applications/blockchains/wasabiwallet/default.nix +++ b/pkgs/applications/blockchains/wasabiwallet/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , makeDesktopItem , curl @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { cp -v $desktopItem/share/applications/* $out/share/applications ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Privacy focused Bitcoin wallet"; homepage = "https://wasabiwallet.io/"; license = licenses.mit; diff --git a/pkgs/applications/blockchains/whirlpool-gui/default.nix b/pkgs/applications/blockchains/whirlpool-gui/default.nix index 9a660bb8bffb..3417f9b51856 100644 --- a/pkgs/applications/blockchains/whirlpool-gui/default.nix +++ b/pkgs/applications/blockchains/whirlpool-gui/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, callPackage, makeWrapper, makeDesktopItem +{ lib, stdenv, fetchFromGitHub, callPackage, makeWrapper, makeDesktopItem , nodejs, yarn, electron_7, jre8, tor }: let @@ -94,7 +94,7 @@ in stdenv.mkDerivation rec { outputHash = stdenv.lib.fakeSha256; }); - meta = with stdenv.lib; { + meta = with lib; { description = "Desktop GUI for Whirlpool by Samourai-Wallet"; homepage = https://www.samouraiwallet.com/whirlpool; license = licenses.unlicense; diff --git a/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix b/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix index 488ef4cfedd4..43f5bcd495a6 100644 --- a/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix +++ b/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, pkgconfig, linkFarm, lightdm-enso-os-greeter +{ lib, stdenv, fetchgit, pkgconfig, linkFarm, lightdm-enso-os-greeter , dbus, pcre, epoxy, libXdmcp, at-spi2-core, libxklavier, libxkbcommon, libpthreadstubs , gtk3, vala, cmake, libgee, libX11, lightdm, gdk-pixbuf, clutter-gtk, wrapGAppsHook, librsvg }: @@ -55,7 +55,7 @@ stdenv.mkDerivation { --replace "pantheon-greeter" "$out/bin/pantheon-greeter" ''; - meta = with stdenv.lib; { + meta = with lib; { description = '' A fork of pantheon greeter that positions elements in a central and vertigal manner and adds a blur effect to the background diff --git a/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix b/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix index 256ecd59f4e9..363e0503c2d6 100644 --- a/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix +++ b/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix @@ -1,4 +1,4 @@ -{ stdenv, linkFarm, lightdm-mini-greeter, fetchFromGitHub, autoreconfHook, pkgconfig, lightdm, gtk3, glib, gdk-pixbuf, wrapGAppsHook, librsvg }: +{ lib, stdenv, linkFarm, lightdm-mini-greeter, fetchFromGitHub, autoreconfHook, pkgconfig, lightdm, gtk3, glib, gdk-pixbuf, wrapGAppsHook, librsvg }: stdenv.mkDerivation rec { pname = "lightdm-mini-greeter"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { name = "lightdm-mini-greeter.desktop"; }]; - meta = with stdenv.lib; { + meta = with lib; { description = "A minimal, configurable, single-user GTK3 LightDM greeter"; homepage = "https://github.com/prikhi/lightdm-mini-greeter"; license = licenses.gpl3; diff --git a/pkgs/applications/display-managers/lightdm-tiny-greeter/default.nix b/pkgs/applications/display-managers/lightdm-tiny-greeter/default.nix index 7e37d1348749..29dece3e5cf7 100644 --- a/pkgs/applications/display-managers/lightdm-tiny-greeter/default.nix +++ b/pkgs/applications/display-managers/lightdm-tiny-greeter/default.nix @@ -1,4 +1,4 @@ -{ stdenv, linkFarm, lightdm-tiny-greeter, fetchFromGitHub +{ lib, stdenv, linkFarm, lightdm-tiny-greeter, fetchFromGitHub , pkgconfig, lightdm, gtk3, glib, wrapGAppsHook, conf ? "" }: stdenv.mkDerivation rec { @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { name = "lightdm-tiny-greeter.desktop"; }]; - meta = with stdenv.lib; { + meta = with lib; { description = "A tiny multi user lightdm greeter"; homepage = "https://github.com/off-world/lightdm-tiny-greeter"; license = licenses.bsd3; diff --git a/pkgs/applications/display-managers/lightdm/gtk-greeter.nix b/pkgs/applications/display-managers/lightdm/gtk-greeter.nix index a89e2b071133..b25e087a211d 100644 --- a/pkgs/applications/display-managers/lightdm/gtk-greeter.nix +++ b/pkgs/applications/display-managers/lightdm/gtk-greeter.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , lightdm_gtk_greeter , fetchurl , lightdm @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { name = "lightdm-gtk-greeter.desktop"; }]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://launchpad.net/lightdm-gtk-greeter"; platforms = platforms.linux; license = licenses.gpl3; diff --git a/pkgs/applications/display-managers/ly/default.nix b/pkgs/applications/display-managers/ly/default.nix index f16dd62bb1a4..d36c54189326 100644 --- a/pkgs/applications/display-managers/ly/default.nix +++ b/pkgs/applications/display-managers/ly/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitHub, linux-pam }: -stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "ly"; version = "0.2.1"; @@ -10,14 +10,14 @@ stdenv.mkDerivation rec { rev = version; sha256 = "16gjcrd4a6i4x8q8iwlgdildm7cpdsja8z22pf2izdm6rwfki97d"; fetchSubmodules = true; - }; + }; buildInputs = [ linux-pam ]; makeFlags = [ "FLAGS=-Wno-error" ]; installPhase = '' mkdir -p $out/bin - cp bin/ly $out/bin + cp bin/ly $out/bin ''; meta = with lib; { diff --git a/pkgs/applications/editors/amp/default.nix b/pkgs/applications/editors/amp/default.nix index 9be6d56ab345..54b3c646e256 100644 --- a/pkgs/applications/editors/amp/default.nix +++ b/pkgs/applications/editors/amp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform, openssl, pkgconfig, python3, xorg, cmake, libgit2, darwin +{ lib, stdenv, fetchFromGitHub, rustPlatform, openssl, pkgconfig, python3, xorg, cmake, libgit2, darwin , curl }: rustPlatform.buildRustPackage rec { @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { # Tests need to write to the theme directory in HOME. preCheck = "export HOME=`mktemp -d`"; - meta = with stdenv.lib; { + meta = with lib; { description = "A modern text editor inspired by Vim"; homepage = "https://amp.rs"; license = [ licenses.gpl3 ]; diff --git a/pkgs/applications/editors/android-studio/common.nix b/pkgs/applications/editors/android-studio/common.nix index cbd156d78e0e..d8f2d86daee3 100644 --- a/pkgs/applications/editors/android-studio/common.nix +++ b/pkgs/applications/editors/android-studio/common.nix @@ -41,6 +41,7 @@ , pkgsi686Linux , ps , setxkbmap +, lib , stdenv , systemd , unzip @@ -182,7 +183,7 @@ in runCommand passthru = { unwrapped = androidStudio; }; - meta = with stdenv.lib; { + meta = with lib; { description = "The Official IDE for Android (${channel} channel)"; longDescription = '' Android Studio is the official IDE for Android app development, based on diff --git a/pkgs/applications/editors/apostrophe/default.nix b/pkgs/applications/editors/apostrophe/default.nix index b3902293718e..cb8e9b7e3bbc 100644 --- a/pkgs/applications/editors/apostrophe/default.nix +++ b/pkgs/applications/editors/apostrophe/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, meson, ninja, cmake +{ lib, stdenv, fetchFromGitLab, meson, ninja, cmake , wrapGAppsHook, pkgconfig, desktop-file-utils , appstream-glib, pythonPackages, glib, gobject-introspection , gtk3, webkitgtk, glib-networking, gnome3, gspell, texlive @@ -46,7 +46,7 @@ in stdenv.mkDerivation rec { ) ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://gitlab.gnome.org/somas/apostrophe"; description = "A distraction free Markdown editor for GNU/Linux"; license = licenses.gpl3; diff --git a/pkgs/applications/editors/aseprite/default.nix b/pkgs/applications/editors/aseprite/default.nix index 4ba8932fec25..b44dc7c6d4f6 100644 --- a/pkgs/applications/editors/aseprite/default.nix +++ b/pkgs/applications/editors/aseprite/default.nix @@ -96,8 +96,6 @@ stdenv.mkDerivation rec { rm -rf "$out"/include "$out"/lib ''; - enableParallelBuilding = true; - passthru = { inherit skia; }; meta = with lib; { diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index 35640965c6fa..9d1d8d4113cc 100644 --- a/pkgs/applications/editors/atom/default.nix +++ b/pkgs/applications/editors/atom/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgs, fetchurl, wrapGAppsHook, gvfs, gtk3, atomEnv }: +{ lib, stdenv, pkgs, fetchurl, wrapGAppsHook, gvfs, gtk3, atomEnv }: let versions = { @@ -81,7 +81,7 @@ let sed -i -e "s|Exec=.*$|Exec=$out/bin/${pname}|" $out/share/applications/${pname}.desktop ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A hackable text editor for the 21st Century"; homepage = "https://atom.io/"; license = licenses.mit; diff --git a/pkgs/applications/editors/bless/default.nix b/pkgs/applications/editors/bless/default.nix index b3c3caae4e45..ab5f2ccc1041 100644 --- a/pkgs/applications/editors/bless/default.nix +++ b/pkgs/applications/editors/bless/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , autoreconfHook , pkgconfig @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/bless --prefix MONO_PATH : "$MPATH" --prefix LD_LIBRARY_PATH : "$MPATH" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/afrantzis/bless"; description = "Gtk# Hex Editor"; maintainers = [ maintainers.mkg20001 ]; diff --git a/pkgs/applications/editors/bluefish/default.nix b/pkgs/applications/editors/bluefish/default.nix index 48c83b053108..21da4de9c6d6 100644 --- a/pkgs/applications/editors/bluefish/default.nix +++ b/pkgs/applications/editors/bluefish/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, intltool, wrapGAppsHook, pkgconfig , gtk, libxml2 +{ lib, stdenv, fetchurl, intltool, wrapGAppsHook, pkgconfig , gtk, libxml2 , enchant, gucharmap, python, gnome3 }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ gnome3.adwaita-icon-theme gtk libxml2 enchant gucharmap python ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A powerful editor targeted towards programmers and webdevelopers"; homepage = "http://bluefish.openoffice.nl/"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/editors/bluej/default.nix b/pkgs/applications/editors/bluej/default.nix index 25caf4b7ac7f..af333e00961e 100644 --- a/pkgs/applications/editors/bluej/default.nix +++ b/pkgs/applications/editors/bluej/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, jdk }: +{ lib, stdenv, fetchurl, makeWrapper, jdk }: stdenv.mkDerivation rec { pname = "bluej"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { --add-flags "-Djavafx.embed.singleThread=true -Dawt.useSystemAAFontSettings=on -Xmx512M -cp \"$out/share/bluej/bluej.jar\" bluej.Boot" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A simple integrated development environment for Java"; homepage = "https://www.bluej.org/"; license = licenses.gpl2ClasspathPlus; diff --git a/pkgs/applications/editors/bonzomatic/default.nix b/pkgs/applications/editors/bonzomatic/default.nix index a12ccd257f8a..4b6480639b37 100644 --- a/pkgs/applications/editors/bonzomatic/default.nix +++ b/pkgs/applications/editors/bonzomatic/default.nix @@ -1,4 +1,4 @@ -{ stdenv, makeWrapper, fetchFromGitHub, cmake, alsaLib, mesa_glu, libXcursor, libXinerama, libXrandr, xorgserver }: +{ lib, stdenv, makeWrapper, fetchFromGitHub, cmake, alsaLib, mesa_glu, libXcursor, libXinerama, libXrandr, xorgserver }: stdenv.mkDerivation rec { pname = "bonzomatic"; @@ -11,19 +11,20 @@ stdenv.mkDerivation rec { sha256 = "12mdfjvbhdqz1585772rj4cap8m4ijfci6ib62jysxjf747k41fg"; }; - buildInputs = [ cmake makeWrapper alsaLib mesa_glu libXcursor libXinerama libXrandr xorgserver ]; + nativeBuildInputs = [ cmake makeWrapper ]; + buildInputs = [ alsaLib mesa_glu libXcursor libXinerama libXrandr xorgserver ]; postFixup = '' wrapProgram $out/bin/Bonzomatic --prefix LD_LIBRARY_PATH : "${alsaLib}/lib" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A live-coding tool for writing 2D fragment/pixel shaders"; license = with licenses; [ unlicense unfreeRedistributable # contains libbass.so in repository ]; - maintainers = [ maintainers.nocent ]; + maintainers = [ maintainers.ilian ]; platforms = [ "i686-linux" "x86_64-linux" ]; }; } diff --git a/pkgs/applications/editors/bvi/default.nix b/pkgs/applications/editors/bvi/default.nix index 8a61e0252bc3..ddef8467646b 100644 --- a/pkgs/applications/editors/bvi/default.nix +++ b/pkgs/applications/editors/bvi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses }: +{ lib, stdenv, fetchurl, ncurses }: stdenv.mkDerivation rec { pname = "bvi"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Hex editor with vim style keybindings"; homepage = "http://bvi.sourceforge.net/download.html"; license = licenses.gpl2; diff --git a/pkgs/applications/editors/bviplus/default.nix b/pkgs/applications/editors/bviplus/default.nix index 2cf094c091a6..e48a147e6daf 100644 --- a/pkgs/applications/editors/bviplus/default.nix +++ b/pkgs/applications/editors/bviplus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses }: +{ lib, stdenv, fetchurl, ncurses }: stdenv.mkDerivation rec { pname = "bviplus"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildFlags = [ "CFLAGS=-fgnu89-inline" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Ncurses based hex editor with a vim-like interface"; homepage = "http://bviplus.sourceforge.net"; license = licenses.gpl3; diff --git a/pkgs/applications/editors/code-browser/default.nix b/pkgs/applications/editors/code-browser/default.nix index ed11298c621a..3eecc471db94 100644 --- a/pkgs/applications/editors/code-browser/default.nix +++ b/pkgs/applications/editors/code-browser/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , copper , ruby @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { ] ++ stdenv.lib.optionals withQt [ "UI=qt" ] ++ stdenv.lib.optionals withGtk [ "UI=gtk" ]; - meta = with stdenv.lib; { + meta = with 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; diff --git a/pkgs/applications/editors/deadpixi-sam/default.nix b/pkgs/applications/editors/deadpixi-sam/default.nix index 65ec43939127..463865d26bf7 100644 --- a/pkgs/applications/editors/deadpixi-sam/default.nix +++ b/pkgs/applications/editors/deadpixi-sam/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, freetype, libX11, libXi, libXt, libXft }: +{ lib, stdenv, fetchFromGitHub, freetype, libX11, libXi, libXt, libXft }: stdenv.mkDerivation rec { version = "2017-10-27"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { mv deadpixi-sam.desktop $out/share/applications ''; - meta = with stdenv.lib; { + meta = with lib; { inherit (src.meta) homepage; description = "Updated version of the sam text editor"; license = with licenses; lpl-102; diff --git a/pkgs/applications/editors/dhex/default.nix b/pkgs/applications/editors/dhex/default.nix index 0a635b7ba82e..c4f43e71fe63 100644 --- a/pkgs/applications/editors/dhex/default.nix +++ b/pkgs/applications/editors/dhex/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ ncurses ]; - + installPhase = '' mkdir -p $out/bin mkdir -p $out/share/man/man1 diff --git a/pkgs/applications/editors/dit/default.nix b/pkgs/applications/editors/dit/default.nix index e89267d04c50..170019d27381 100644 --- a/pkgs/applications/editors/dit/default.nix +++ b/pkgs/applications/editors/dit/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { substituteInPlace Prototypes.h --replace 'tail' "$(type -P tail)" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A console text editor for Unix that you already know how to use"; homepage = "https://hisham.hm/dit/"; license = licenses.gpl2; diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix index 04b8a1de159a..000129f74dff 100644 --- a/pkgs/applications/editors/eclipse/plugins.nix +++ b/pkgs/applications/editors/eclipse/plugins.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchzip, unzip }: +{ lib, stdenv, fetchurl, fetchzip, unzip }: rec { @@ -105,7 +105,7 @@ rec { sha256 = "1cn64xj2bm69vnn9db2xxh6kq148v83w5nx3183mrqb59ym3v9kf"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/tobiasmelcher/EclipseAceJump"; description = "Provides fast jumps to text based on initial letter"; license = licenses.mit; @@ -128,7 +128,7 @@ rec { sha256 = "1j42l0xxzs89shqkyn91lb0gia10mifzy0i73c3n7gj7sv2ddbjq"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://mihai-nita.net/java/#ePluginAEC"; description = "Adds support for ANSI escape sequences in the Eclipse console"; license = licenses.asl20; @@ -151,7 +151,7 @@ rec { cp -v $src $dropinDir/${name}.jar ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A powerful parser generator for processing structured text or binary files"; homepage = "https://www.antlr.org/"; license = licenses.bsd3; @@ -174,7 +174,7 @@ rec { cp -v $src $dropinDir/${name}.jar ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A powerful parser generator for processing structured text or binary files"; homepage = "https://www.antlr.org/"; license = licenses.bsd3; @@ -197,7 +197,7 @@ rec { sha256 = "03iyb6j2srq74iigmg7dk098c2svyv0ygdfql5jqr44a32n07k8q"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://andrei.gmxhome.de/anyedit/"; description = "Adds new tools to the context menu of text-based editors"; license = licenses.epl10; @@ -220,7 +220,7 @@ rec { sha256 = "1n2rzybfcwp3ss2qi0fhd8vm38vdwav8j837lqiqlfcnvzwsk86m"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/cypher256/eclipse-encoding-plugin"; description = "Show file encoding and line ending for the active editor in the eclipse status bar"; license = licenses.epl10; @@ -243,7 +243,7 @@ rec { sha256 = "1vmsqv32jfl7anvdkw0vir342miv5sr9df7vd1w44lf1yf97vxlw"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://andrei.gmxhome.de/bytecode/"; description = "Shows disassembled bytecode of current java editor or class file"; license = licenses.bsd2; @@ -263,7 +263,7 @@ rec { sha256 = "1hbswcar3a5cw20mwrj82w9pvpkvvj6jrvqqf1lincva0r5sl7h8"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://eclipse.org/cdt/"; description = "C/C++ development tooling"; license = licenses.epl10; @@ -282,7 +282,7 @@ rec { sha256 = "07fymk705x4mwq7vh2i6frsf67jql4bzrkdzhb4n74zb0g1dib60"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://eclipse-cs.sourceforge.net/"; description = "Checkstyle integration into the Eclipse IDE"; license = licenses.lgpl21; @@ -306,7 +306,7 @@ rec { sha256 = "0wz61909bhqwzpqwll27ia0cn3anyp81haqx3rj1iq42cbl42h0y"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://eclipsecolorthemes.org/"; description = "Plugin to switch color themes conveniently and without side effects"; license = licenses.epl10; @@ -339,7 +339,7 @@ rec { propagatedBuildInputs = [ zest ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www2.cs.tum.edu/projects/cup/eclipse.php"; description = "IDE for developing CUP based parsers"; platforms = platforms.all; @@ -364,7 +364,7 @@ rec { ''; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.drools.org/"; description = "Drools is a Business Rules Management System (BRMS) solution"; license = licenses.asl20; @@ -381,7 +381,7 @@ rec { sha256 = "0w1kwcjh45p7msv5vpc8i6dsqwrnfmjama6vavpnxlji56jd3c43"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.eclemma.org/"; description = "EclEmma is a free Java code coverage tool for Eclipse"; license = licenses.epl10; @@ -404,7 +404,7 @@ rec { sha256 = "10p3mrbp9wi6jhlmmc23qv7frh605a23pqsc7w96569bsfb5wa8q"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://findbugs.sourceforge.net/"; description = "Plugin that uses static analysis to look for bugs in Java code"; license = licenses.epl10; @@ -423,7 +423,7 @@ rec { sha256 = "1g77jlhfa3csaxxps1z5lasrd9l2p5ajnddnq9ra5syw8ggkdc2h"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://gnuarmeclipse.livius.net/"; description = "GNU ARM Eclipse Plug-ins"; license = licenses.epl10; @@ -461,7 +461,7 @@ rec { propagatedBuildInputs = [ antlr-runtime_4_7 ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Adds support for JSON files to Eclipse"; homepage = "https://github.com/boothen/Json-Eclipse-Plugin"; license = licenses.epl10; @@ -480,7 +480,7 @@ rec { sha256 = "q0O6OE2u0bdz1+nOkzXDrrOOzoEbVaXnejx4lX7uZgk="; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.eclipse.org/jdt/"; description = "Eclipse Java development tools"; license = licenses.epl10; @@ -503,7 +503,7 @@ rec { sha256 = "0qdzlqcjcm2i4mwhmcdml0am83z1dayrcmf37ji7vmw6iwdk1xmp"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/angelozerr/jdt-codemining"; description = "Provides JDT Java CodeMining"; license = licenses.epl10; @@ -529,7 +529,7 @@ rec { ''; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/RustDT"; description = "Rust development tooling"; license = licenses.epl10; @@ -546,7 +546,7 @@ rec { sha256 = "13xgx2rwlll0l4bs0g6gyvrx5gcc0125vzn501fdj0wv2fqxn5lw"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://scala-ide.org/"; description = "The Scala IDE for Eclipse"; license = licenses.bsd3; @@ -565,7 +565,7 @@ rec { sha256 = "0aanqwx3gy1arpbkqd846381hiy6272lzwhfjl94x8jhfykpqqbj"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://spotbugs.github.io/"; description = "Plugin that uses static analysis to look for bugs in Java code"; license = licenses.lgpl21; @@ -588,7 +588,7 @@ rec { sha256 = "1j4zw6392q3q6z3pcy803k3g0p220gk1x19fs99p0rmmdz83lc8d"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://testng.org/doc/"; description = "Eclipse plugin for the TestNG testing framework"; license = licenses.asl20; @@ -610,7 +610,7 @@ rec { sha256 = "0nyirf6km97q211cxfy01kidxac20m8ba3kk9xj73ykrhsk3cxjp"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/vrapper/vrapper"; description = "A wrapper to provide a Vim-like input scheme for moving around and editing text"; license = licenses.gpl3; @@ -633,7 +633,7 @@ rec { sha256 = "1wpyw4z28ka60z36f8m71kz1giajcm26wb9bpv18sjiqwdgx9v0z"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/oyse/yedit"; description = "A YAML editor plugin for Eclipse"; license = licenses.epl10; @@ -651,7 +651,7 @@ rec { sha256 = "01scn7cmcrjcp387spjm8ifgwrwwi77ypildandbisfvhj3qqs7m"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.eclipse.org/gef/zest/"; description = "The Eclipse Visualization Toolkit"; platforms = platforms.all; diff --git a/pkgs/applications/editors/edbrowse/default.nix b/pkgs/applications/editors/edbrowse/default.nix index 4e727e9a22a6..86cc81a58c26 100644 --- a/pkgs/applications/editors/edbrowse/default.nix +++ b/pkgs/applications/editors/edbrowse/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, duktape, curl, pcre, readline, openssl, perl, html-tidy }: +{ lib, stdenv, fetchFromGitHub, duktape, curl, pcre, readline, openssl, perl, html-tidy }: stdenv.mkDerivation rec { pname = "edbrowse"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { rev = "v${version}"; sha256 = "0cw9d60mdhwna57r1vxn53s8gl81rr3cxnvm769ifq3xyh49vfcf"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Command Line Editor Browser"; longDescription = '' Edbrowse is a combination editor, browser, and mail client that is 100% text based. diff --git a/pkgs/applications/editors/edit/default.nix b/pkgs/applications/editors/edit/default.nix index 052206002610..ff4dcca89352 100644 --- a/pkgs/applications/editors/edit/default.nix +++ b/pkgs/applications/editors/edit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, unzip, pkgconfig, ncurses, libX11, libXft, cwebbin }: +{ lib, stdenv, fetchgit, unzip, pkgconfig, ncurses, libX11, libXft, cwebbin }: stdenv.mkDerivation { pname = "edit-nightly"; @@ -29,7 +29,7 @@ stdenv.mkDerivation { cp obj/edit $out/bin/edit ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A relaxing mix of Vi and ACME"; homepage = "http://c9x.me/edit"; license = licenses.publicDomain; diff --git a/pkgs/applications/editors/emacs-modes/color-theme-solarized/default.nix b/pkgs/applications/editors/emacs-modes/color-theme-solarized/default.nix index ba54e5f43412..ce85e9be4e9a 100644 --- a/pkgs/applications/editors/emacs-modes/color-theme-solarized/default.nix +++ b/pkgs/applications/editors/emacs-modes/color-theme-solarized/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchzip, emacs, color-theme}: +{lib, stdenv, fetchzip, emacs, color-theme}: let commit = "f3ca8902ea056fb8e46cb09f09c96294e31cd4ee"; in @@ -23,7 +23,7 @@ stdenv.mkDerivation { install *.el* $out/share/emacs/site-lisp ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Precision colors for machines and people"; homepage = "http://ethanschoonover.com/solarized"; maintainers = [ maintainers.samuelrivas ]; diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix index b473eb99c390..a4900ff951ad 100644 --- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix @@ -69,10 +69,10 @@ elpaBuild { pname = "adaptive-wrap"; ename = "adaptive-wrap"; - version = "0.7"; + version = "0.8"; src = fetchurl { - url = "https://elpa.gnu.org/packages/adaptive-wrap-0.7.el"; - sha256 = "10fb8gzvkbnrgzv28n1rczs03dvapr7rvi0kd73j6yf1zg2iz6qp"; + url = "https://elpa.gnu.org/packages/adaptive-wrap-0.8.tar"; + sha256 = "1gs1pqzywvvw4prj63vpj8abh8h14pjky11xfl23pgpk9l3ldrb0"; }; packageRequires = []; meta = { @@ -223,10 +223,10 @@ elpaBuild { pname = "auctex"; ename = "auctex"; - version = "12.3.1"; + version = "13.0.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/auctex-12.3.1.tar"; - sha256 = "0kn48mmsvp1yp8fjcl4lriymhyskv5s70wscmf596xf56s7mqas4"; + url = "https://elpa.gnu.org/packages/auctex-13.0.3.tar"; + sha256 = "1ljpkr0z15fyh907jbgky238dvci5vqi3xhvslyhblhp8sg9cbsi"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -264,16 +264,16 @@ license = lib.licenses.free; }; }) {}; - auto-overlays = callPackage ({ elpaBuild, fetchurl, lib }: + auto-overlays = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: elpaBuild { pname = "auto-overlays"; ename = "auto-overlays"; - version = "0.10.9"; + version = "0.10.10"; src = fetchurl { - url = "https://elpa.gnu.org/packages/auto-overlays-0.10.9.tar"; - sha256 = "0aqjp3bkd7mi191nm971z857s09py390ikcd93hyhmknblk0v14p"; + url = "https://elpa.gnu.org/packages/auto-overlays-0.10.10.tar"; + sha256 = "0wln6b4j3pd3mhx6sx0bnz74c4n6fidmkg77cqfpxs4j5l1zjp2z"; }; - packageRequires = []; + packageRequires = [ cl-lib ]; meta = { homepage = "https://elpa.gnu.org/packages/auto-overlays.html"; license = lib.licenses.free; @@ -437,10 +437,10 @@ elpaBuild { pname = "chess"; ename = "chess"; - version = "2.0.4"; + version = "2.0.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/chess-2.0.4.tar"; - sha256 = "1sq1bjmp513vldfh7hc2bbfc54665abqiz0kqgqq3gijckaxn5js"; + url = "https://elpa.gnu.org/packages/chess-2.0.5.tar"; + sha256 = "1a4iwjdh6k348df6qywjws9z9f862d62m0b2sz57z4xhywiyxpr7"; }; packageRequires = [ cl-lib ]; meta = { @@ -553,21 +553,6 @@ license = lib.licenses.free; }; }) {}; - company = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "company"; - ename = "company"; - version = "0.9.13"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/company-0.9.13.tar"; - sha256 = "1c9x9wlzzsn7vrsm57l2l44nqx455saa6wrm853szzg09qn8dlnw"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/company.html"; - license = lib.licenses.free; - }; - }) {}; company-ebdb = callPackage ({ company, ebdb, elpaBuild, fetchurl, lib }: elpaBuild { pname = "company-ebdb"; @@ -651,21 +636,6 @@ license = lib.licenses.free; }; }) {}; - cpio-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "cpio-mode"; - ename = "cpio-mode"; - version = "0.17"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/cpio-mode-0.17.tar"; - sha256 = "144ajbxmz6amb2234a278c9sl4zg69ndswb8vk0mcq8y9s2abm1x"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/cpio-mode.html"; - license = lib.licenses.free; - }; - }) {}; crisp = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "crisp"; @@ -685,10 +655,10 @@ elpaBuild { pname = "csv-mode"; ename = "csv-mode"; - version = "1.13"; + version = "1.14"; src = fetchurl { - url = "https://elpa.gnu.org/packages/csv-mode-1.13.tar"; - sha256 = "0g9rj8sgdbzqnqqvhx3022zz665wqam2nlxsbhzz2393cz11y0d2"; + url = "https://elpa.gnu.org/packages/csv-mode-1.14.tar"; + sha256 = "1jz4134pk8dwzsqih9wybx4l9yl244cgcilw8rdnnqmm8i6vxgrp"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -726,21 +696,6 @@ license = lib.licenses.free; }; }) {}; - dash = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "dash"; - ename = "dash"; - version = "2.12.0"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/dash-2.12.0.tar"; - sha256 = "02r547vian59zr55z6ri4p2b7q5y5k256wi9j8a317vjzyh54m05"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/dash.html"; - license = lib.licenses.free; - }; - }) {}; dbus-codegen = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: elpaBuild { pname = "dbus-codegen"; @@ -771,29 +726,14 @@ license = lib.licenses.free; }; }) {}; - delight = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib, nadvice }: - elpaBuild { - pname = "delight"; - ename = "delight"; - version = "1.7"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/delight-1.7.el"; - sha256 = "0pihsghrf9xnd1kqlq48qmjcmp5ra95wwwgrb3l8m1wagmmc0bi1"; - }; - packageRequires = [ cl-lib nadvice ]; - meta = { - homepage = "https://elpa.gnu.org/packages/delight.html"; - license = lib.licenses.free; - }; - }) {}; dict-tree = callPackage ({ elpaBuild, fetchurl, heap, lib, tNFA, trie }: elpaBuild { pname = "dict-tree"; ename = "dict-tree"; - version = "0.14"; + version = "0.16"; src = fetchurl { - url = "https://elpa.gnu.org/packages/dict-tree-0.14.el"; - sha256 = "1k00k3510bgq7rijvrxbx4b7qlq2abq1dyyn51zgm8q0qk68p5jq"; + url = "https://elpa.gnu.org/packages/dict-tree-0.16.tar"; + sha256 = "1myf26g3jjk2v8yp3k2n8m45vi20452wd7w2bja8csfkk0qx3300"; }; packageRequires = [ heap tNFA trie ]; meta = { @@ -801,36 +741,6 @@ license = lib.licenses.free; }; }) {}; - diff-hl = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "diff-hl"; - ename = "diff-hl"; - version = "1.8.7"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/diff-hl-1.8.7.tar"; - sha256 = "1qcwicflvm6dxcflnlg891hyzwp2q79fdkdbdwp1440a0j09riam"; - }; - packageRequires = [ cl-lib emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/diff-hl.html"; - license = lib.licenses.free; - }; - }) {}; - diffview = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "diffview"; - ename = "diffview"; - version = "1.0"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/diffview-1.0.el"; - sha256 = "1gkdmzmgjixz9nak7dxvqy28kz0g7i672gavamwgnc1jl37wkcwi"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/diffview.html"; - license = lib.licenses.free; - }; - }) {}; dired-du = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "dired-du"; @@ -846,21 +756,6 @@ license = lib.licenses.free; }; }) {}; - dired-git-info = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "dired-git-info"; - ename = "dired-git-info"; - version = "0.3.1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/dired-git-info-0.3.1.el"; - sha256 = "1kd0rpw7l32wvwi7q8s0inx4bc66xrl7hkllnlicyczsnzw2z52z"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/dired-git-info.html"; - license = lib.licenses.free; - }; - }) {}; disk-usage = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "disk-usage"; @@ -876,21 +771,6 @@ license = lib.licenses.free; }; }) {}; - dismal = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "dismal"; - ename = "dismal"; - version = "1.5"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/dismal-1.5.tar"; - sha256 = "1vhs6w6c2klsrfjpw8vr5c4gwiw83ppdjhsn2la0fvkm60jmc476"; - }; - packageRequires = [ cl-lib ]; - meta = { - homepage = "https://elpa.gnu.org/packages/dismal.html"; - license = lib.licenses.free; - }; - }) {}; djvu = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "djvu"; @@ -966,59 +846,14 @@ license = lib.licenses.free; }; }) {}; - ebdb-gnorb = callPackage ({ ebdb, elpaBuild, fetchurl, gnorb, lib }: - elpaBuild { - pname = "ebdb-gnorb"; - ename = "ebdb-gnorb"; - version = "1.0.2"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/ebdb-gnorb-1.0.2.el"; - sha256 = "0bma7mqilp3lfgv0z2mk6nnqzh1nn1prkz2aiwrs4hxwydmda13i"; - }; - packageRequires = [ ebdb gnorb ]; - meta = { - homepage = "https://elpa.gnu.org/packages/ebdb-gnorb.html"; - license = lib.licenses.free; - }; - }) {}; - ebdb-i18n-chn = callPackage ({ ebdb, elpaBuild, fetchurl, lib, pyim }: - elpaBuild { - pname = "ebdb-i18n-chn"; - ename = "ebdb-i18n-chn"; - version = "1.3.1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/ebdb-i18n-chn-1.3.1.el"; - sha256 = "02drr89i4kzjm1rs22sj0nv9sj95dmqk40xvxd75qzfn8y33k9vl"; - }; - packageRequires = [ ebdb pyim ]; - meta = { - homepage = "https://elpa.gnu.org/packages/ebdb-i18n-chn.html"; - license = lib.licenses.free; - }; - }) {}; - ediprolog = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "ediprolog"; - ename = "ediprolog"; - version = "2.1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/ediprolog-2.1.el"; - sha256 = "1piimsmzpirw8plrpy79xbpnvynzzhcxi31g6lg6is8gridiv3md"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/ediprolog.html"; - license = lib.licenses.free; - }; - }) {}; eev = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "eev"; ename = "eev"; - version = "20201013"; + version = "20210102"; src = fetchurl { - url = "https://elpa.gnu.org/packages/eev-20201013.tar"; - sha256 = "1frwlcqi8kjm13x3i6pw70kqcr306rikaanyfxyn6i5brm1ncxk8"; + url = "https://elpa.gnu.org/packages/eev-20210102.tar"; + sha256 = "14vpgcncmzzbv8v78v221hdhigvk00vqiizwd8dy0b7hqz6gl0rq"; }; packageRequires = [ emacs ]; meta = { @@ -1026,21 +861,24 @@ license = lib.licenses.free; }; }) {}; - eglot = callPackage ({ elpaBuild + eglot = callPackage ({ eldoc + , elpaBuild , emacs , fetchurl , flymake ? null , jsonrpc - , lib }: + , lib + , project + , xref }: elpaBuild { pname = "eglot"; ename = "eglot"; - version = "1.6"; + version = "1.7"; src = fetchurl { - url = "https://elpa.gnu.org/packages/eglot-1.6.tar"; - sha256 = "15hd6sx7qrpvlvhwwkcgdiki8pswwf4mm7hkm0xvznskfcp44spx"; + url = "https://elpa.gnu.org/packages/eglot-1.7.tar"; + sha256 = "1zvs144hxq2mmq1h0ynx9hy7yyccb46f3pjg9mgq8v9cw5y678vk"; }; - packageRequires = [ emacs flymake jsonrpc ]; + packageRequires = [ eldoc emacs flymake jsonrpc project xref ]; meta = { homepage = "https://elpa.gnu.org/packages/eglot.html"; license = lib.licenses.free; @@ -1096,44 +934,14 @@ license = lib.licenses.free; }; }) {}; - electric-spacing = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "electric-spacing"; - ename = "electric-spacing"; - version = "5.0"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/electric-spacing-5.0.el"; - sha256 = "1jk6v84z0n8jljzsz4wk7rgzh7drpfvxf4bp6xis8gapnd3ycfyv"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/electric-spacing.html"; - license = lib.licenses.free; - }; - }) {}; - elisp-benchmarks = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "elisp-benchmarks"; - ename = "elisp-benchmarks"; - version = "1.9"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/elisp-benchmarks-1.9.tar"; - sha256 = "14qmybmjlgkjns6vlbsf46f276ykydnbm0f6mij2w3b9qx7z2nb2"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/elisp-benchmarks.html"; - license = lib.licenses.free; - }; - }) {}; emms = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib, seq }: elpaBuild { pname = "emms"; ename = "emms"; - version = "6.2"; + version = "6.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/emms-6.2.tar"; - sha256 = "0d95sjrh9vpl41vz26y8clgji987z15lj4ky2kr9yrl0zpa8yv35"; + url = "https://elpa.gnu.org/packages/emms-6.3.tar"; + sha256 = "12cfq503li0gcqmm5bmqz8yjvfdif5xvz0l9vx3g5jl6ljygwgmf"; }; packageRequires = [ cl-lib seq ]; meta = { @@ -1156,21 +964,6 @@ license = lib.licenses.free; }; }) {}; - epoch-view = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "epoch-view"; - ename = "epoch-view"; - version = "0.0.1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/epoch-view-0.0.1.el"; - sha256 = "1wy25ryyg9f4v83qjym2pwip6g9mszhqkf5a080z0yl47p71avfx"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/epoch-view.html"; - license = lib.licenses.free; - }; - }) {}; ergoemacs-mode = callPackage ({ cl-lib ? null , elpaBuild , emacs @@ -1191,43 +984,6 @@ license = lib.licenses.free; }; }) {}; - excorporate = callPackage ({ elpaBuild - , emacs - , fetchurl - , fsm - , lib - , nadvice - , soap-client - , url-http-ntlm }: - elpaBuild { - pname = "excorporate"; - ename = "excorporate"; - version = "0.9.1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/excorporate-0.9.1.tar"; - sha256 = "15rk0br7dmvni10f3mm94ylybl3jbf2ps1sypis6hxbazxxr443j"; - }; - packageRequires = [ emacs fsm nadvice soap-client url-http-ntlm ]; - meta = { - homepage = "https://elpa.gnu.org/packages/excorporate.html"; - license = lib.licenses.free; - }; - }) {}; - expand-region = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "expand-region"; - ename = "expand-region"; - version = "0.11.0"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/expand-region-0.11.0.tar"; - sha256 = "1q6xaqkv40z4c6rgdkxqqkvxgsaj8yjqjrxi40kz5y0ck3bjrk0i"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/expand-region.html"; - license = lib.licenses.free; - }; - }) {}; exwm = callPackage ({ elpaBuild, fetchurl, lib, xelb }: elpaBuild { pname = "exwm"; @@ -1303,21 +1059,6 @@ license = lib.licenses.free; }; }) {}; - fountain-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "fountain-mode"; - ename = "fountain-mode"; - version = "2.7.3"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/fountain-mode-2.7.3.el"; - sha256 = "1sz3qp3y52d05jd006zc99r4ryignpa2jgfk72rw3zfqmikzv15j"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/fountain-mode.html"; - license = lib.licenses.free; - }; - }) {}; frame-tabs = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "frame-tabs"; @@ -1378,21 +1119,6 @@ license = lib.licenses.free; }; }) {}; - ggtags = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "ggtags"; - ename = "ggtags"; - version = "0.8.13"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/ggtags-0.8.13.el"; - sha256 = "1qa7lcrcmf76sf6dy8sxbg4adq7rg59fm0n5848w3qxgsr0h45fg"; - }; - packageRequires = [ cl-lib emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/ggtags.html"; - license = lib.licenses.free; - }; - }) {}; gited = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "gited"; @@ -1509,10 +1235,10 @@ elpaBuild { pname = "gnus-mock"; ename = "gnus-mock"; - version = "0.4.5"; + version = "0.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/gnus-mock-0.4.5.tar"; - sha256 = "1hfh315vrxd54r2f1wpdfk06b7lhpab7knygav58vdwwdbndlqiz"; + url = "https://elpa.gnu.org/packages/gnus-mock-0.5.tar"; + sha256 = "1lyh1brb68zaasnw2brymsspcyl3jxmnvbvpvrqfxhhl3fq9nbv1"; }; packageRequires = []; meta = { @@ -1550,21 +1276,6 @@ license = lib.licenses.free; }; }) {}; - greenbar = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "greenbar"; - ename = "greenbar"; - version = "1.1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/greenbar-1.1.el"; - sha256 = "01ixv3489zdx2b67zqad6h7g8cpnzpzrvvkqyx7csqyrfx0qy27n"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/greenbar.html"; - license = lib.licenses.free; - }; - }) {}; guess-language = callPackage ({ cl-lib ? null , elpaBuild , emacs @@ -1617,36 +1328,6 @@ license = lib.licenses.free; }; }) {}; - hook-helpers = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "hook-helpers"; - ename = "hook-helpers"; - version = "1.1.1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/hook-helpers-1.1.1.tar"; - sha256 = "05nqlshdqh32smav58hzqg8wp04h7w9sxr239qrz4wqxwlxlv9im"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/hook-helpers.html"; - license = lib.licenses.free; - }; - }) {}; - html5-schema = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "html5-schema"; - ename = "html5-schema"; - version = "0.1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/html5-schema-0.1.tar"; - sha256 = "19k1jal6j64zq78w8h0lw7cljivmp2jzs5sa1ppc0mqkpn2hyq1i"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/html5-schema.html"; - license = lib.licenses.free; - }; - }) {}; hydra = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: elpaBuild { pname = "hydra"; @@ -1722,21 +1403,6 @@ license = lib.licenses.free; }; }) {}; - ivy-explorer = callPackage ({ elpaBuild, emacs, fetchurl, ivy, lib }: - elpaBuild { - pname = "ivy-explorer"; - ename = "ivy-explorer"; - version = "0.3.2"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/ivy-explorer-0.3.2.el"; - sha256 = "0q9gy9w22hnq30bfmnpqknk0qc1rcbjcybpjgb8hnlldvcci95l7"; - }; - packageRequires = [ emacs ivy ]; - meta = { - homepage = "https://elpa.gnu.org/packages/ivy-explorer.html"; - license = lib.licenses.free; - }; - }) {}; ivy-posframe = callPackage ({ elpaBuild , emacs , fetchurl @@ -1746,10 +1412,10 @@ elpaBuild { pname = "ivy-posframe"; ename = "ivy-posframe"; - version = "0.5.3"; + version = "0.5.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ivy-posframe-0.5.3.el"; - sha256 = "03ydfb155p5lak7nw4s79ab9zadwsjw1zggzwxgnlydsqdqbr6l6"; + url = "https://elpa.gnu.org/packages/ivy-posframe-0.5.5.tar"; + sha256 = "184730grclxmlw6nfs41d4g6fvz9c6xnclvwgqx1ii0xm7p9xy95"; }; packageRequires = [ emacs ivy posframe ]; meta = { @@ -1787,21 +1453,6 @@ license = lib.licenses.free; }; }) {}; - js2-mode = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "js2-mode"; - ename = "js2-mode"; - version = "20190219"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/js2-mode-20190219.tar"; - sha256 = "0jgqs7cwykw5ihdq9wp5qc05y6br9gsyfiylqhjq43z59673chcc"; - }; - packageRequires = [ cl-lib emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/js2-mode.html"; - license = lib.licenses.free; - }; - }) {}; json-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "json-mode"; @@ -1847,6 +1498,21 @@ license = lib.licenses.free; }; }) {}; + kiwix = callPackage ({ elpaBuild, emacs, fetchurl, lib, request }: + elpaBuild { + pname = "kiwix"; + ename = "kiwix"; + version = "1.0.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/kiwix-1.0.1.tar"; + sha256 = "1dly6pilf71hq3mra9kc63i6iynzkxjmp9gwy0rhnvhq4b4qr01d"; + }; + packageRequires = [ emacs request ]; + meta = { + homepage = "https://elpa.gnu.org/packages/kiwix.html"; + license = lib.licenses.free; + }; + }) {}; kmb = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "kmb"; @@ -2042,21 +1708,6 @@ license = lib.licenses.free; }; }) {}; - memory-usage = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "memory-usage"; - ename = "memory-usage"; - version = "0.2"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/memory-usage-0.2.el"; - sha256 = "03qwb7sprdh1avxv3g7hhnhl41pwvnpxcpnqrikl7picy78h1gwj"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/memory-usage.html"; - license = lib.licenses.free; - }; - }) {}; metar = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: elpaBuild { pname = "metar"; @@ -2132,36 +1783,6 @@ license = lib.licenses.free; }; }) {}; - mmm-mode = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "mmm-mode"; - ename = "mmm-mode"; - version = "0.5.8"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/mmm-mode-0.5.8.tar"; - sha256 = "05ckf4zapdpvnd3sqpw6kxaa567zh536a36m9qzx3sqyjbyn5fb4"; - }; - packageRequires = [ cl-lib ]; - meta = { - homepage = "https://elpa.gnu.org/packages/mmm-mode.html"; - license = lib.licenses.free; - }; - }) {}; - modus-operandi-theme = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "modus-operandi-theme"; - ename = "modus-operandi-theme"; - version = "0.12.0"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/modus-operandi-theme-0.12.0.el"; - sha256 = "1mllyysn701qfnglxs7n2f6mrzrz55v9hcwspvafc6fl2blr393y"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/modus-operandi-theme.html"; - license = lib.licenses.free; - }; - }) {}; modus-vivendi-theme = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "modus-vivendi-theme"; @@ -2381,21 +2002,6 @@ license = lib.licenses.free; }; }) {}; - olivetti = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "olivetti"; - ename = "olivetti"; - version = "1.7.1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/olivetti-1.7.1.el"; - sha256 = "1bk41bqri0ycpab46c7a6i5k3js1pm5k6d76y91mp3l2izy2bxwj"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/olivetti.html"; - license = lib.licenses.free; - }; - }) {}; omn-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "omn-mode"; @@ -2430,10 +2036,10 @@ elpaBuild { pname = "org"; ename = "org"; - version = "9.4"; + version = "9.4.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/org-9.4.tar"; - sha256 = "1awkrh3y90q7c0as3327rqj0zylf5cpjzr1pyvbzymli16irhwb6"; + url = "https://elpa.gnu.org/packages/org-9.4.4.tar"; + sha256 = "05ma8n6hr10323d85ay8ai0xrpc9q2m93n8avqh7j9fmmb3bhr0b"; }; packageRequires = []; meta = { @@ -2460,10 +2066,10 @@ elpaBuild { pname = "org-translate"; ename = "org-translate"; - version = "0.1.2"; + version = "0.1.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/org-translate-0.1.2.el"; - sha256 = "1087h6l5d8946dl4bg7g7is5pwc6004l4k9i2qcki4ahglvzdkz4"; + url = "https://elpa.gnu.org/packages/org-translate-0.1.3.el"; + sha256 = "0m52vv1961kf8f1gw8c4n02hxcvhdw3wgzmcxvjcdijfnjkarm33"; }; packageRequires = [ emacs org ]; meta = { @@ -2531,21 +2137,6 @@ license = lib.licenses.free; }; }) {}; - paced = callPackage ({ async, elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "paced"; - ename = "paced"; - version = "1.1.3"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/paced-1.1.3.tar"; - sha256 = "1gaszf68h0nnv6p6yzv48m24csw6v479nsq0f02y6slixxaflnwl"; - }; - packageRequires = [ async emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/paced.html"; - license = lib.licenses.free; - }; - }) {}; parsec = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "parsec"; @@ -2561,36 +2152,6 @@ license = lib.licenses.free; }; }) {}; - path-iterator = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "path-iterator"; - ename = "path-iterator"; - version = "1.0"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/path-iterator-1.0.tar"; - sha256 = "0kgl7rhv9x23jyr6ahfy6ql447zpz9fnmfwldkpn69g7jdx6a3cc"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/path-iterator.html"; - license = lib.licenses.free; - }; - }) {}; - peg = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "peg"; - ename = "peg"; - version = "1.0"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/peg-1.0.tar"; - sha256 = "0skr5dz9k34r409hisnj37n1b7n62l3md0glnfx578xkbmxlpcxl"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/peg.html"; - license = lib.licenses.free; - }; - }) {}; persist = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "persist"; @@ -2670,10 +2231,10 @@ elpaBuild { pname = "project"; ename = "project"; - version = "0.5.2"; + version = "0.5.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/project-0.5.2.el"; - sha256 = "181hls4phhj8kgpfcky6h0mgzpl9xj616abvcvx8mrn4nmpyh655"; + url = "https://elpa.gnu.org/packages/project-0.5.3.el"; + sha256 = "0cpf69m41h8gfcqnq72h11925zdk35b7hw7bfy83xm83xwp12rxx"; }; packageRequires = [ emacs xref ]; meta = { @@ -2681,44 +2242,14 @@ license = lib.licenses.free; }; }) {}; - psgml = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "psgml"; - ename = "psgml"; - version = "1.3.4"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/psgml-1.3.4.tar"; - sha256 = "1pgg9g040zsnvilvmwa73wyrvv9xh7gf6w1rkcx57qzg7yq4yaaj"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/psgml.html"; - license = lib.licenses.free; - }; - }) {}; - pspp-mode = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "pspp-mode"; - ename = "pspp-mode"; - version = "1.1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/pspp-mode-1.1.el"; - sha256 = "1qnwj7r367qs0ykw71c6s96ximgg2wb3hxg5fwsl9q2vfhbh35ca"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/pspp-mode.html"; - license = lib.licenses.free; - }; - }) {}; python = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "python"; ename = "python"; - version = "0.27"; + version = "0.27.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/python-0.27.el"; - sha256 = "03k527p1jp47hmm7rmld3cn9dls1smyspvgii2xn95jfvrp9klvv"; + url = "https://elpa.gnu.org/packages/python-0.27.1.el"; + sha256 = "0jygl2w8x73v22w0rzq75i2hnm3f46dzgg5x1ckz720nznvwwkka"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -3040,10 +2571,10 @@ elpaBuild { pname = "rt-liberation"; ename = "rt-liberation"; - version = "1.31"; + version = "2.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/rt-liberation-1.31.tar"; - sha256 = "0qqqqwdkb0h8137rqsr08179skl1475cg4hl7a987rmccys0j83c"; + url = "https://elpa.gnu.org/packages/rt-liberation-2.1.tar"; + sha256 = "1ahl1ys72rvqs2bf9zv9648h65fx0283ibqlk1b8ayahc04w6qbl"; }; packageRequires = []; meta = { @@ -3076,10 +2607,10 @@ elpaBuild { pname = "scanner"; ename = "scanner"; - version = "0.1"; + version = "0.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/scanner-0.1.tar"; - sha256 = "0hv4w7yzfdnz8vrfhw6i6agj9hs09vzsqr63nrp6dd93q0gk71mw"; + url = "https://elpa.gnu.org/packages/scanner-0.2.tar"; + sha256 = "1nbfpgndjkv7mr81bxy58k4y13lc4cidyz9mbwh7433r8rfhymb5"; }; packageRequires = [ dash emacs ]; meta = { @@ -3222,21 +2753,6 @@ license = lib.licenses.free; }; }) {}; - smalltalk-mode = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "smalltalk-mode"; - ename = "smalltalk-mode"; - version = "3.2.92"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/smalltalk-mode-3.2.92.tar"; - sha256 = "0zlp1pk88m1gybhnvcmm0bhrj6zvnjzhc26r1i4d56pyh6vwivfj"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/smalltalk-mode.html"; - license = lib.licenses.free; - }; - }) {}; smart-yank = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "smart-yank"; @@ -3327,21 +2843,6 @@ license = lib.licenses.free; }; }) {}; - spinner = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "spinner"; - ename = "spinner"; - version = "1.7.3"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/spinner-1.7.3.el"; - sha256 = "19kp1mmndbmw11sgvv2ggfjl4pyf5zrsbh3871f0965pw9z8vahd"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/spinner.html"; - license = lib.licenses.free; - }; - }) {}; sql-beeline = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "sql-beeline"; @@ -3432,21 +2933,6 @@ license = lib.licenses.free; }; }) {}; - swiper = callPackage ({ elpaBuild, emacs, fetchurl, ivy, lib }: - elpaBuild { - pname = "swiper"; - ename = "swiper"; - version = "0.13.1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/swiper-0.13.1.tar"; - sha256 = "0k39pa89y0bfvdfqg3nc5pjq5mwxwimc4ma3z28vaf14zd38x9m1"; - }; - packageRequires = [ emacs ivy ]; - meta = { - homepage = "https://elpa.gnu.org/packages/swiper.html"; - license = lib.licenses.free; - }; - }) {}; system-packages = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "system-packages"; @@ -3545,10 +3031,10 @@ elpaBuild { pname = "tramp"; ename = "tramp"; - version = "2.4.4.4"; + version = "2.5.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/tramp-2.4.4.4.tar"; - sha256 = "1f2d02xz3kpy50186wcy688lx76dv0gmrbkj2qdvifcwhyc26sz8"; + url = "https://elpa.gnu.org/packages/tramp-2.5.0.tar"; + sha256 = "1jpnqyk108nksaym2b9v243y5zkpr4px9d070wsb9cwm3xrcd8rh"; }; packageRequires = [ emacs ]; meta = { @@ -3590,10 +3076,10 @@ elpaBuild { pname = "trie"; ename = "trie"; - version = "0.4"; + version = "0.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/trie-0.4.el"; - sha256 = "0869fh3bghxil94wd9vgbb5bk1hx2qkh75vbvp0psmcima8dgzgw"; + url = "https://elpa.gnu.org/packages/trie-0.5.tar"; + sha256 = "1qbzxw7h3p3k3r3fzq66pj223vjiw20dvaljkb8w3r5q16fnav3p"; }; packageRequires = [ heap tNFA ]; meta = { @@ -3704,10 +3190,10 @@ elpaBuild { pname = "vcard"; ename = "vcard"; - version = "0.1"; + version = "0.2.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/vcard-0.1.tar"; - sha256 = "1awcm2s292r2nkyz5bwjaga46jsh5rn92469wrg1ag843mlyxbd0"; + url = "https://elpa.gnu.org/packages/vcard-0.2.1.tar"; + sha256 = "0nfrh1mz2h7h259kf7sj13z30kmjywfvs83ax5qjkfwxhqm03abf"; }; packageRequires = [ emacs ]; meta = { @@ -3715,21 +3201,6 @@ license = lib.licenses.free; }; }) {}; - vcl-mode = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "vcl-mode"; - ename = "vcl-mode"; - version = "1.1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/vcl-mode-1.1.el"; - sha256 = "1r70pmvr95k5f2xphvhliqvyh7al0qabm7wvkamximcssvs38q1h"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/vcl-mode.html"; - license = lib.licenses.free; - }; - }) {}; vdiff = callPackage ({ elpaBuild, emacs, fetchurl, hydra, lib }: elpaBuild { pname = "vdiff"; @@ -3825,21 +3296,6 @@ license = lib.licenses.free; }; }) {}; - w3 = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "w3"; - ename = "w3"; - version = "4.0.49"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/w3-4.0.49.tar"; - sha256 = "01n334b3gwx288xysa1vxsvb14avsz3syfigw85i7m5nizhikqbb"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/w3.html"; - license = lib.licenses.free; - }; - }) {}; wcheck-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "wcheck-mode"; @@ -3904,10 +3360,10 @@ elpaBuild { pname = "websocket"; ename = "websocket"; - version = "1.12"; + version = "1.13.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/websocket-1.12.tar"; - sha256 = "0ap4z80c6pzpb69wrx0hsvwzignxmd2b9xy974by9gf5xm2wpa8w"; + url = "https://elpa.gnu.org/packages/websocket-1.13.1.tar"; + sha256 = "1x664zswas0fpml7zaj59zy97avrm49zb80zd69rlkqzz1m45psc"; }; packageRequires = [ cl-lib ]; meta = { @@ -3915,36 +3371,6 @@ license = lib.licenses.free; }; }) {}; - which-key = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "which-key"; - ename = "which-key"; - version = "3.3.2"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/which-key-3.3.2.tar"; - sha256 = "01g5jcikhgxnri1rpbjq191220b4r3bimz2jzs1asc766w42q2gb"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/which-key.html"; - license = lib.licenses.free; - }; - }) {}; - windower = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "windower"; - ename = "windower"; - version = "0.0.1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/windower-0.0.1.el"; - sha256 = "19xizbfbnzhhmhlqy20ir1a1y87bjwrq67bcawxy6nxpkwbizsv7"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/windower.html"; - license = lib.licenses.free; - }; - }) {}; windresize = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "windresize"; @@ -4010,21 +3436,6 @@ license = lib.licenses.free; }; }) {}; - xclip = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "xclip"; - ename = "xclip"; - version = "1.10"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/xclip-1.10.el"; - sha256 = "0i3i9kwfg8qmhcmqhhnrb1kljgwkccv63s9q1mjwqfjldyfh8j8i"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/xclip.html"; - license = lib.licenses.free; - }; - }) {}; xelb = callPackage ({ cl-generic, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "xelb"; @@ -4074,10 +3485,10 @@ elpaBuild { pname = "xref"; ename = "xref"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/xref-1.0.3.el"; - sha256 = "1r531gl73y1br8g4n77gxbyj26yiaw7snjad21fgs5m80cka8fi3"; + url = "https://elpa.gnu.org/packages/xref-1.0.4.el"; + sha256 = "0hkm59qqlsfw3w9ws9xhpmmz30ylifmh05a00ba58zvv1kz04x1g"; }; packageRequires = [ emacs ]; meta = { diff --git a/pkgs/applications/editors/emacs-modes/elpa-packages.nix b/pkgs/applications/editors/emacs-modes/elpa-packages.nix index 57f5d7b85941..8b9ad33fce78 100644 --- a/pkgs/applications/editors/emacs-modes/elpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/elpa-packages.nix @@ -5,7 +5,7 @@ To update the list of packages from MELPA, 1. Run `./update-elpa`. -2. Check for evaluation errors: `nix-instantiate ../../../.. -A emacsPackagesNg.elpaPackages`. +2. Check for evaluation errors: `nix-instantiate ../../../.. -A emacs.pkgs.elpaPackages`. 3. `git commit -m "elpa-packages $(date -Idate)" -- elpa-generated.nix` ## Update from overlay diff --git a/pkgs/applications/editors/emacs-modes/manual-packages.nix b/pkgs/applications/editors/emacs-modes/manual-packages.nix index dfe287a7f402..1ff64fe28134 100644 --- a/pkgs/applications/editors/emacs-modes/manual-packages.nix +++ b/pkgs/applications/editors/emacs-modes/manual-packages.nix @@ -114,6 +114,19 @@ org-mac-link = callPackage ./org-mac-link { }; + ott-mode = self.trivialBuild { + pname = "ott-mod"; + + inherit (external.ott) src version; + + postUnpack = "mv $sourceRoot/emacs/ott-mode.el $sourceRoot"; + + meta = { + description = "Standalone package providing ott-mode without building ott and with compiled bytecode."; + inherit (external.Agda.meta) homepage license; + }; + }; + perl-completion = callPackage ./perl-completion { }; diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index 5a02c97b6d01..93e215753c79 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -6,8 +6,8 @@ To update the list of packages from MELPA, 1. Run ./update-melpa 2. Check for evaluation errors: -env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPackages.melpaStablePackages -env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPackages.melpaPackages +env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacs.pkgs..melpaStablePackages +env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacs.pkgs..melpaPackages 3. `git commit -m "melpa-packages: $(date -Idate)" recipes-archive-melpa.json` ## Update from overlay @@ -143,11 +143,6 @@ let flycheck-rtags = fix-rtags super.flycheck-rtags; - gnuplot = super.gnuplot.overrideAttrs (old: { - nativeBuildInputs = - (old.nativeBuildInputs or [ ]) ++ [ pkgs.autoreconfHook ]; - }); - pdf-tools = super.pdf-tools.overrideAttrs (old: { nativeBuildInputs = [ external.pkgconfig ]; buildInputs = with external; old.buildInputs ++ [ autoconf automake libpng zlib poppler ]; @@ -583,7 +578,8 @@ let }; vterm = super.vterm.overrideAttrs (old: { - buildInputs = old.buildInputs ++ [ self.emacs pkgs.cmake pkgs.libvterm-neovim ]; + nativeBuildInputs = [ pkgs.cmake ]; + buildInputs = old.buildInputs ++ [ self.emacs pkgs.libvterm-neovim ]; cmakeFlags = [ "-DEMACS_SOURCE=${self.emacs.src}" "-DUSE_SYSTEM_LIBVTERM=ON" diff --git a/pkgs/applications/editors/emacs-modes/org-generated.nix b/pkgs/applications/editors/emacs-modes/org-generated.nix index 23d36573bc2b..7adb58c8bd73 100644 --- a/pkgs/applications/editors/emacs-modes/org-generated.nix +++ b/pkgs/applications/editors/emacs-modes/org-generated.nix @@ -4,10 +4,10 @@ elpaBuild { pname = "org"; ename = "org"; - version = "20201207"; + version = "20210111"; src = fetchurl { - url = "https://orgmode.org/elpa/org-20201207.tar"; - sha256 = "0hryicg3nbvc17ypwdcx08kl8samd979388hw7jwbp5sw3v95y0c"; + url = "https://orgmode.org/elpa/org-20210111.tar"; + sha256 = "1hn3i583h3idmiv1plbp0p6qi3myl317vl43qyxjks2nvqfj5313"; }; packageRequires = []; meta = { @@ -19,10 +19,10 @@ elpaBuild { pname = "org-plus-contrib"; ename = "org-plus-contrib"; - version = "20201207"; + version = "20210111"; src = fetchurl { - url = "https://orgmode.org/elpa/org-plus-contrib-20201207.tar"; - sha256 = "07xmnxrn63ini3c8hfrgv13b28dh91x2lpf875fhi5wz70w0a9s4"; + url = "https://orgmode.org/elpa/org-plus-contrib-20210111.tar"; + sha256 = "1qw44y4v4vg0vhz1i55x4fjiaxfaqcch0mqm98sc5f31fw3r4zga"; }; packageRequires = []; meta = { diff --git a/pkgs/applications/editors/emacs-modes/org-packages.nix b/pkgs/applications/editors/emacs-modes/org-packages.nix index 1f37cf624f9f..b60af0e9334b 100644 --- a/pkgs/applications/editors/emacs-modes/org-packages.nix +++ b/pkgs/applications/editors/emacs-modes/org-packages.nix @@ -5,7 +5,7 @@ To update the list of packages from Org (ELPA), 1. Run `./update-org`. -2. Check for evaluation errors: `nix-instantiate ../../../.. -A emacsPackagesNg.orgPackages`. +2. Check for evaluation errors: `nix-instantiate ../../../.. -A emacs.pkgs.orgPackages`. 3. `git commit -m "org-packages $(date -Idate)" -- org-generated.nix` */ diff --git a/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json b/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json index a8d79b3d8cad..42d2c84311ac 100644 --- a/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json +++ b/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json @@ -111,14 +111,14 @@ "repo": "emacsorphanage/4clojure", "unstable": { "version": [ - 20200123, - 2008 + 20210102, + 459 ], "deps": [ "request" ], - "commit": "557eecb5da50fedd92840021c8b08d87dfdc782b", - "sha256": "19x653lzc1dxil4ix257hciidbdmbhaxhs6qhlkwi9ygjrlrgvnk" + "commit": "6f494d3905284ccdd57aae3d8ac16fc7ab431596", + "sha256": "19mbfh504mli8mnf95xaych45nqnayrspymf5r80dky4jv43zzv8" } }, { @@ -1110,20 +1110,20 @@ "auto-complete", "rtags" ], - "commit": "63a7d9b733def9fe76568f81321a65a450829575", - "sha256": "1nnjhfz7xm1ax38xkz0jvgzhfczlc4r9xlpzc24sisabkvlkivyw" + "commit": "39339388256df662d0084b4a094d03e52748f9e8", + "sha256": "0wp4mygsxzibra2p3m5rn9m0yd3fscd795k5xa0wxi5pwddv7dlg" }, "stable": { "version": [ - 2, - 38 + 3, + 23 ], "deps": [ "auto-complete", "rtags" ], - "commit": "9687ccdb9e539981e7934e768ea5c84464a61139", - "sha256": "1r6l7dgr2ch586zrdi5l8fhdj4qdva8ldz7cjvi2byc2pd2xs8rx" + "commit": "7169ed577d676690a3c6f0025b54e8477d80eacf", + "sha256": "1i94dizg3wvkvq8c2pf5bzkx8zwzcfi4p3l73c779y145bygssnq" } }, { @@ -1871,8 +1871,8 @@ "annotation", "eri" ], - "commit": "fdace3b9c446a1d621858dc343f5ed80422d0ea1", - "sha256": "0gx3a0gcr9x9zzgr1xa4lgwl0zwcqhmxn8gscmyspbx6dj4akvg0" + "commit": "c5400349d7d9cb1e54af19bdb2046b52ecada5bc", + "sha256": "02kma8f6v6vxzbfzd2limwabp8a5hzjyg9kfabgp1j0dwvsl64pf" }, "stable": { "version": [ @@ -1899,8 +1899,8 @@ "deps": [ "dash" ], - "commit": "2d65d925318006e2f6fa261ad192fbc2d212877b", - "sha256": "0x4630lz9s59hidpf4pqc3697fgd09ac3zjax0xq3kk1993hrpa2" + "commit": "4a620e62b5e645a48b0a818bf4eb19daea4977df", + "sha256": "0gy8x78av6z6hp5jccz7pnh6n0fnpfs5vfhfbxggj2qjfyxbvw1r" } }, { @@ -1953,11 +1953,11 @@ "repo": "takaxp/ah", "unstable": { "version": [ - 20191212, - 652 + 20201213, + 218 ], - "commit": "3ca848bcf1fc4c18b4a5329d1439c5effb7dcb97", - "sha256": "1lgxwhq5359qrn3zv5m9sssz93vbqa6bp49z526pck1bkf80s3vx" + "commit": "869219e7853510aeb00af3580aede0e5d49b324a", + "sha256": "02i6nrkbqf1bj2m4h81p5z1mi9lm92g9vm1mi6qny83zs64m2607" } }, { @@ -2331,14 +2331,14 @@ "repo": "domtronn/all-the-icons.el", "unstable": { "version": [ - 20200923, - 1339 + 20210106, + 1227 ], "deps": [ "memoize" ], - "commit": "6917b08f64dd8487e23769433d6cb9ba11f4152f", - "sha256": "0jzpil1k5brg4dvy0fxibbwwb2hkni5fkxng4n0wfv6099b2zc68" + "commit": "9aa16ae198073fe839a0abfa9a7d3a9dc85ef5f9", + "sha256": "1ll69hb7108fcklyagkvgxkr96nh9sp06kkr73kz92j4cljsahc6" }, "stable": { "version": [ @@ -2398,14 +2398,14 @@ "repo": "seagle0128/all-the-icons-ibuffer", "unstable": { "version": [ - 20201027, - 758 + 20201218, + 356 ], "deps": [ "all-the-icons" ], - "commit": "c41e12033712969bfa2e3e9f1c62feae866a48ac", - "sha256": "0v8vqgblqf1yq3rgr3lxnzjqq22lvmkjhgpd78acxd6ivq8fzqs4" + "commit": "0260cd194d150126bcb81823742ab53036942c73", + "sha256": "1snxbi5wv5qa78vx487rdrarpydrabxz3s6a9ck54wkf91mkbcvv" }, "stable": { "version": [ @@ -2460,15 +2460,15 @@ "repo": "seagle0128/all-the-icons-ivy-rich", "unstable": { "version": [ - 20200811, - 838 + 20201215, + 1647 ], "deps": [ "all-the-icons", "ivy-rich" ], - "commit": "6428cb39729b7290368c5b95f563a320c98f972d", - "sha256": "0b9d1cs39j8x238s14b1smrhanapwai123dvpplmgb07wmrwwwwg" + "commit": "6eb63a158cd5e1b47635704ebdd3e010e7b914f8", + "sha256": "1xvcgylx2h9mrpm56icqsflyxvy88mprgxrs6byhkvkm3p7jzin2" }, "stable": { "version": [ @@ -2717,14 +2717,14 @@ "repo": "DarwinAwardWinner/amx", "unstable": { "version": [ - 20200701, - 2108 + 20210101, + 1921 ], "deps": [ "s" ], - "commit": "ccfc92c600df681df5e8b5fecec328c462ceb71e", - "sha256": "0pdgicknrph4lfyjxwdqh7xwcfsnqnrx1l4xpd972ivy1n8s7783" + "commit": "b99149715266b5c2c48f5a0fc43716d36575da5f", + "sha256": "14k1wrjfhawb18fyrfdv2lv0nwfpliw0f14hrhdb3kmshp5dsb3x" }, "stable": { "version": [ @@ -2746,8 +2746,8 @@ "repo": "pythonic-emacs/anaconda-mode", "unstable": { "version": [ - 20200912, - 239 + 20210101, + 833 ], "deps": [ "dash", @@ -2755,14 +2755,14 @@ "pythonic", "s" ], - "commit": "39b1cf88c8c459901630d248d6135d8644075648", - "sha256": "0nwrs6cw2dpl522rrdhzrka4fkcw4f2grxlz0mjwwlaxafd2zc3y" + "commit": "80afec20f91f13614647b192522fff460505db6f", + "sha256": "04f6kw4rd8k6waiyfbk7x8qdrqm411mdsdzjh2w9rvmv7y36ckh8" }, "stable": { "version": [ 0, 1, - 12 + 14 ], "deps": [ "dash", @@ -2770,8 +2770,8 @@ "pythonic", "s" ], - "commit": "6be586123f606317c51e62239490af9843ba2d13", - "sha256": "1vydyyxd5n0pz0jlib3yvw8vnklp15nvyyj7qkm4wcyssi70q1rf" + "commit": "80afec20f91f13614647b192522fff460505db6f", + "sha256": "04f6kw4rd8k6waiyfbk7x8qdrqm411mdsdzjh2w9rvmv7y36ckh8" } }, { @@ -2979,8 +2979,8 @@ "repo": "davidshepherd7/anki-mode", "unstable": { "version": [ - 20200703, - 736 + 20201223, + 719 ], "deps": [ "dash", @@ -2988,8 +2988,8 @@ "request", "s" ], - "commit": "3918e4f7b2f14e485cc3acc927abe6563695963f", - "sha256": "16fx2w1nz6jxsrc9naykah3valab46xnwsmjz5lm9zl38g4ypyna" + "commit": "d9b84028cd6a1ae040fb5604080a8b5fa8138562", + "sha256": "0imx5g615lfz71jjrb3hm84ll8p0bkrfi6w1qwxjsqgrwbw77s14" }, "stable": { "version": [ @@ -3064,11 +3064,11 @@ "repo": "bastibe/annotate.el", "unstable": { "version": [ - 20201123, - 1732 + 20210108, + 1828 ], - "commit": "9320918b91c5ab3ee63f812a0479423233f95821", - "sha256": "16xffyf3ch7l644r50pdk7s82mppxhp5v7kz6m47gz81nnyd8kis" + "commit": "d4eff870d9c1575731890acfdde89511d0322ec1", + "sha256": "11k5j7xgnxq4s5ar56f3qmbr8vnrhi231zv0iiv2p0nqryaaj354" }, "stable": { "version": [ @@ -3106,8 +3106,8 @@ 20200914, 644 ], - "commit": "fdace3b9c446a1d621858dc343f5ed80422d0ea1", - "sha256": "0gx3a0gcr9x9zzgr1xa4lgwl0zwcqhmxn8gscmyspbx6dj4akvg0" + "commit": "c5400349d7d9cb1e54af19bdb2046b52ecada5bc", + "sha256": "02kma8f6v6vxzbfzd2limwabp8a5hzjyg9kfabgp1j0dwvsl64pf" }, "stable": { "version": [ @@ -3188,28 +3188,28 @@ "repo": "k1LoW/emacs-ansible", "unstable": { "version": [ - 20201001, - 838 + 20210103, + 543 ], "deps": [ "f", "s" ], - "commit": "cf6b8f06c2628357fc2a72ea9817a2c2d0ebf690", - "sha256": "1pj7z6hsrh6ih1m6x3lbs2af6y30yazc44ahgkdvi00ckd48akqp" + "commit": "40af0d2bbb6c5bbcf7aa9269ac9a07e22622d263", + "sha256": "12k8mwlyiipsdjq5h1v04g3aa7ymjyhmy14j6vzjil4w9l6xyvdh" }, "stable": { "version": [ 0, 3, - 1 + 2 ], "deps": [ "f", "s" ], - "commit": "b5ef59406604bc5027f4d816d90e633feef0149c", - "sha256": "1v56mz39vlszprd6m6virbv87qvsnb38n0h0yhqzcy85c2l0jzx3" + "commit": "40af0d2bbb6c5bbcf7aa9269ac9a07e22622d263", + "sha256": "12k8mwlyiipsdjq5h1v04g3aa7ymjyhmy14j6vzjil4w9l6xyvdh" } }, { @@ -3511,6 +3511,21 @@ "sha256": "0xpb8mmssajy42r2h1m9inhv1chx19wkp5p0p63nwpk7mhjj8bis" } }, + { + "ename": "apparmor-mode", + "commit": "6dece118970184e7fc2cfd3e26f97f2028d7f5f2", + "sha256": "1ilp4srliacwgvzkbkky6ka0p60ni6v4na270iniklmjglbbs5f0", + "fetcher": "github", + "repo": "alexmurray/apparmor-mode", + "unstable": { + "version": [ + 20201213, + 1118 + ], + "commit": "8c0c20b6896bba65c7f6cfe0a21e22b21a12c5f9", + "sha256": "1pr2qpvwfmqd0qysbdvaz0r0y7zznifridy0jyd8lwkddyi8jypf" + } + }, { "ename": "apples-mode", "commit": "5ca765a6a2f312f585624ec8b82dc9eb6b9bbc0c", @@ -3727,15 +3742,14 @@ "repo": "stardiviner/arduino-mode", "unstable": { "version": [ - 20200819, - 103 + 20201231, + 214 ], "deps": [ - "cl-lib", "spinner" ], - "commit": "16955f579c5caca223c0ba825075e3573dcf2288", - "sha256": "1vf3ahvs81i0fa3rbwz3i67ahf3x169pv879p5igxk93xf6whqnp" + "commit": "10af99792c8e4b97ea542c55bfed246781fdd1ba", + "sha256": "1gz4hmmijlilqqh7scyidh5kbbmyvq12dhnjgnn9h6y9q5qabibq" } }, { @@ -4470,15 +4484,15 @@ "repo": "auto-complete/auto-complete", "unstable": { "version": [ - 20201011, - 1341 + 20201213, + 1255 ], "deps": [ "cl-lib", "popup" ], - "commit": "51a2ea092d280ec4956dc4a104467f8b83b5e0de", - "sha256": "0hp0z6s2a6y7gkwjarihqdlx897p4ji1ddz3a5167whp3wb2dfrn" + "commit": "6bbb6c7ab8e5aa2d389807fce65bbc5ce7065900", + "sha256": "0cxs9is3ifn9grqaw50dvpsjkkmwh398a6lqc93fny7p6d1hd9ja" }, "stable": { "version": [ @@ -4799,11 +4813,11 @@ "repo": "jcs-elpa/auto-highlight-symbol", "unstable": { "version": [ - 20201018, - 1340 + 20210108, + 1841 ], - "commit": "0982390f19fee3c05856b9e4e40056dce4c4020d", - "sha256": "1vvk0vp61y63rjhfxk5ajs0m4p36pvbwb97sw66zdlrq5h33lmv9" + "commit": "5ad84d0a12b175360b18504cd04e6bf7ab1cf5c8", + "sha256": "0dpsqzl6nn08kg9d42a6zpk7jq6621c0hzf28c1ary4vzcwm4j9v" }, "stable": { "version": [ @@ -5248,8 +5262,8 @@ 20190331, 2230 ], - "commit": "d5909f4e237c27f638ef06725d04dd17f72d4740", - "sha256": "1bknlb9p576f0xrghh4paa23xkiyzlmlv97fr308mwwqs2g8d7ck" + "commit": "c6ccdc83e85719a8bb07ef715cf5fd06866a479c", + "sha256": "0z8rykhhhwccy0zg6v3gnghfiawqw3afv4pvxr1hrympiyhyvhvp" } }, { @@ -5340,11 +5354,11 @@ "repo": "avkoval/avk-emacs-themes", "unstable": { "version": [ - 20201120, - 1316 + 20201223, + 750 ], - "commit": "d35a50520c0ddfcf04a0d72eb64fead68039e8d8", - "sha256": "15n2vqz6apfrb9bn48989knzyffjzp30100x4q96pk2xic1zixri" + "commit": "d5471776c01a2bdf2a1fa255a79447489cf68e65", + "sha256": "1m1s7fzl8hxzkx0672l62jpkak0v8vdyb7l6nmw9648rww78gzyl" } }, { @@ -5355,14 +5369,14 @@ "repo": "abo-abo/avy", "unstable": { "version": [ - 20200624, - 1148 + 20201226, + 1734 ], "deps": [ "cl-lib" ], - "commit": "bbf1e7339eba06784dfe86643bb0fbddf5bb0342", - "sha256": "0jmjjckrmivfy2r527vynq9x0mzwcgcyclydar9fa2xb1wn669pd" + "commit": "e92cb37457b43336b765630dbfbea8ba4be601fa", + "sha256": "1w7421h9arxj39w4q3000avcbasl1c95r0hys7rchmlbkqas32cb" }, "stable": { "version": [ @@ -5377,6 +5391,25 @@ "sha256": "09qdni1s74i5pv8741szl5g4ynj8fxn0x65qmwa9rmfkbimnc0fs" } }, + { + "ename": "avy-embark-collect", + "commit": "81c3fffff154360fd4fecb34b1b7ce362bf4eb41", + "sha256": "0fxya97fkh3w18301n37yj07mik3r8aaa61dmb64raav40xza9ad", + "fetcher": "github", + "repo": "oantolin/embark", + "unstable": { + "version": [ + 20210112, + 2334 + ], + "deps": [ + "avy", + "embark" + ], + "commit": "94db870a7089cd3aeff994afde327e0c0acb2a27", + "sha256": "1i2niv9dwbrai9y9njp8h37wb8ssjavmghj2i9kld1d1jgmmnx1f" + } + }, { "ename": "avy-flycheck", "commit": "05755bed49219072d2ec98f0be5ecba4deda7cd1", @@ -5572,11 +5605,11 @@ "url": "https://bitbucket.org/pdo/axiom-environment", "unstable": { "version": [ - 20201118, - 1816 + 20201212, + 1109 ], - "commit": "9ef86ca16098050da4362f5aadaea64b0a093fc1", - "sha256": "0hyaa1nskm95scypdpbndmmdasq6cas85y6i2q1f8nq8a3qd5585" + "commit": "47d6dffc29286badb2b1d7143b219e5c1be15bdb", + "sha256": "1dppyda9jkwh6fj8m4kziq84w0b5yzxrhq87jhkv54jjra6yxbb4" } }, { @@ -5602,11 +5635,11 @@ "repo": "juergenhoetzel/babel", "unstable": { "version": [ - 20181201, - 919 + 20201210, + 1626 ], - "commit": "c25dedb5c7f2465b122102f02cd9845668818c20", - "sha256": "1ydb8zbg8n56wf5hb8i3i2s40mspqfkszfdd8v8jjqb5wm8q32rc" + "commit": "5db131f1edb85a31202fd77ed2fb8f68c0233845", + "sha256": "0s1p3w62hmpk1ifr0ciwhxfwdi5m48qqr4glqqbkfbhr8yv60r2h" }, "stable": { "version": [ @@ -6178,11 +6211,11 @@ "url": "https://git.savannah.nongnu.org/git/bbdb.git", "unstable": { "version": [ - 20200928, - 1749 + 20210108, + 38 ], - "commit": "d25c29822aff60ab44eb7b5e68e28bc7c2d5d9a9", - "sha256": "0sc2m1xxhw7rgzpk4bw4n3nivhv0byy8yflzvnaf9xkq7km7wv3z" + "commit": "03c9ab00642fd54d7fb601f95a094b8b7f0eefb0", + "sha256": "1nk4d3qb5ibdjp3jmlbf5751y8zd6gms9r19l3hk1ajkw94p43kn" }, "stable": { "version": [ @@ -6229,22 +6262,22 @@ }, { "ename": "bbdb-csv-import", - "commit": "76ac7178ee5381e08ae881f3fc6061106eeb1c1d", - "sha256": "0r7pc2ypd1ydqrnvcqmsg69rm047by7k0zhm563538ra82597wnm", - "fetcher": "gitlab", - "repo": "iankelling/bbdb-csv-import", + "commit": "950d78ae6586db7572291a21fa6fa3ef05259bfc", + "sha256": "0qy78yh4xyfah5wcndqly5rnddcdzj0yq2xh91vh39vhkl53kkgr", + "fetcher": "git", + "url": "https://git.sr.ht/~iank/bbdb-csv-import", "unstable": { "version": [ - 20180122, - 49 + 20140802, + 1142 ], "deps": [ "bbdb", "dash", "pcsv" ], - "commit": "dbc2e0fe9e8ae65e494011044d905ae79b3cee3e", - "sha256": "0n52arydcsmarkpqqwxvw686cypl7iz73kzizirdjhcqmzimx9pl" + "commit": "dc9e722d1c1fcd55b71625ee3f05a4921851d186", + "sha256": "0jkrznrfdh562bwy0adg1pzmqh6i766b5ki41g4pr9wcbmh937sn" } }, { @@ -6378,26 +6411,28 @@ "repo": "Sodaware/beeminder.el", "unstable": { "version": [ - 20200610, - 2311 + 20201227, + 1533 ], "deps": [ - "org" + "org", + "seq" ], - "commit": "8f86ae34ebd17324d98146a2b3a532d56dd1cdd0", - "sha256": "0jw62l1nnnnz4gr7jrk10jlf8ayjngyx9wm97fd339spiygld5pr" + "commit": "161d9c94c594614a01cb08219693d9e000af4f69", + "sha256": "0cfjrn4hkpxhmg07kdff6ifvv1aqaq6dah5bvdc0xhzlqznx72j4" }, "stable": { "version": [ 1, - 1, + 2, 0 ], "deps": [ - "org" + "org", + "seq" ], - "commit": "3e95a669474e27cd51a16caea030456377f83062", - "sha256": "1bj9yzjvglnb0f4glh8fg478xlm5nqmd9jqm1casdj5m30i4kafn" + "commit": "161d9c94c594614a01cb08219693d9e000af4f69", + "sha256": "0cfjrn4hkpxhmg07kdff6ifvv1aqaq6dah5bvdc0xhzlqznx72j4" } }, { @@ -6595,11 +6630,11 @@ "repo": "gilbertw1/better-jumper", "unstable": { "version": [ - 20201008, - 2001 + 20210110, + 1317 ], - "commit": "fe548d22c9228b60d9c8a2a452a6c2e03dfdf238", - "sha256": "0zcm80z3fq5185p676rcpdbhib2d6267j0jqp1wjj88pszyc035i" + "commit": "411ecdf6e7a3e1b4ced7605070d2309e5fc46556", + "sha256": "03jgfrpjlvn7fkv9grcqayphz2bjjkfh4rd6k1s7vmdpd3hm0xpb" } }, { @@ -6857,8 +6892,8 @@ "repo": "tmalsburg/helm-bibtex", "unstable": { "version": [ - 20200908, - 1017 + 20210108, + 1155 ], "deps": [ "biblio", @@ -6868,8 +6903,8 @@ "parsebib", "s" ], - "commit": "8d84d8beb3bfafaa060d7e956fcc569ecf010d9c", - "sha256": "1fnhi9dwq99jva3fmjknzlsklpm379ks8am7076xchv35609rgix" + "commit": "94807a3d3419f90b505eddc3272e244475eeb4f2", + "sha256": "08wfvqdzs05bmfjjaqfxffjbl4j7632bnpncs9khrh6lifz03xh2" }, "stable": { "version": [ @@ -7023,8 +7058,8 @@ 20200805, 1727 ], - "commit": "caa92f1d64fc25480551757d854b4b49981dfa6b", - "sha256": "088kl3bml0rs5bkfymgzr15ram9qvy66h1kaisrbkynh0yxvf8g9" + "commit": "365c73d2618dd0040a32c2601c5456ab5495b812", + "sha256": "10c0rmi5axypx0xy3fib739rjnakl32spwcirzxz1p5r0x9gya4a" }, "stable": { "version": [ @@ -7068,14 +7103,14 @@ "repo": "rnkn/binder", "unstable": { "version": [ - 20201208, - 1429 + 20201222, + 1603 ], "deps": [ "seq" ], - "commit": "bc63f9fdfe10fcf799abab3f8d8deb38c51e9f80", - "sha256": "1wcwb3m5i4z1dkkcj8xl1rlkkbf9scyx0mpdhi086dw70afrqwy3" + "commit": "8a10a66116797e132b19f57026a1976753d332e9", + "sha256": "0qjrcvmmhirzw08r81jnxl79kmgiwwhjnvif16amkf1l8r8qiawq" }, "stable": { "version": [ @@ -7461,8 +7496,8 @@ 20201116, 2341 ], - "commit": "79b3543ca5efc02e4981d8fb987d2e869986511b", - "sha256": "0vbj0wn0apsxaxj428lkg2ga37pin0jqd3n51r7yrgj8s92qfacj" + "commit": "dc69eb6e431151d3942cb812b7161e6f23c28c07", + "sha256": "0gxj8m8q4md1kaay5ymsyynw5990apnqxa6lw73y8w1py785drmn" }, "stable": { "version": [ @@ -7722,15 +7757,15 @@ "repo": "emacscollective/borg", "unstable": { "version": [ - 20201119, - 1841 + 20210105, + 1045 ], "deps": [ "epkg", "magit" ], - "commit": "79bfdbdf0b4a81ee3bab2c853040e57e5454e164", - "sha256": "1rjlkgk6vcfxzgsw44h5prqgpjc1w4sfvklzlbxhyx84x0fzygpb" + "commit": "5de2a7aa0c126f5b18506e187bca66079e68f51d", + "sha256": "18d845xpfp1dklqqghxxzy6zglm8w11lyi3ww44yfmrmxgi8xsvd" }, "stable": { "version": [ @@ -8102,25 +8137,25 @@ "repo": "plandes/bshell", "unstable": { "version": [ - 20190617, - 238 + 20201219, + 139 ], "deps": [ "buffer-manage" ], - "commit": "5cdffa393ec3f923736bc6459bc958829a321327", - "sha256": "0nfj00fgg7lsd5201qds7pniyn9lbnmmdbps5lkiqmbp6phksba9" + "commit": "469c841f19f28c271b4f172b40f3f9ca830254df", + "sha256": "0hchii00gi2cpzmb8n8r7dh6fr4x8x5p2n6c5d62wxwm6wpppyzp" }, "stable": { "version": [ 0, - 9 + 10 ], "deps": [ "buffer-manage" ], - "commit": "8d359f8a76749dcd5ca046b280a11fdb3f87cd23", - "sha256": "10nidam7zyqxc085v6f4mzz5d62p92k88vvcrv95i1sbzma7lz4f" + "commit": "469c841f19f28c271b4f172b40f3f9ca830254df", + "sha256": "0hchii00gi2cpzmb8n8r7dh6fr4x8x5p2n6c5d62wxwm6wpppyzp" } }, { @@ -8240,8 +8275,8 @@ 20180307, 2251 ], - "commit": "e093360e05164c78255866c1ac8f966aa38ba514", - "sha256": "1s35llycdhhclf9kl1q9l7zzzfqrnnvbiqv5csfw0mngfj0lz77f" + "commit": "b8ecbf0251a59c351a3e44607ee502af343da64b", + "sha256": "1zb4k5v4n6j42z7kzlw2y1jp4xbkp6w9zxls3ja36g326mz5mdjz" }, "stable": { "version": [ @@ -8260,27 +8295,27 @@ "repo": "plandes/buffer-manage", "unstable": { "version": [ - 20191015, - 1730 + 20201221, + 122 ], "deps": [ "choice-program", "dash" ], - "commit": "4fd0e6f9f3da31bc805be2000adf2c91088dd39b", - "sha256": "1an2w2s2xnmcj2knnax4mpv4wzcq31bvqcbhwasm39yzjlz7j5s9" + "commit": "800f22e024a2f364ac69d9efddd25ea0ac7c49c0", + "sha256": "04bpqd8rrg32y0z912d6x5bb55asp47vh6lnlwbs5ia0q53fqkgd" }, "stable": { "version": [ 0, - 10 + 12 ], "deps": [ "choice-program", "dash" ], - "commit": "f21bac39b3c890704a7b1b50e8d6bc39e6417a3d", - "sha256": "0hs3glwwp1b0i1gxp0ypyjwaw8pyi26a66y9dqv7sz0xsvnm3zbs" + "commit": "800f22e024a2f364ac69d9efddd25ea0ac7c49c0", + "sha256": "04bpqd8rrg32y0z912d6x5bb55asp47vh6lnlwbs5ia0q53fqkgd" } }, { @@ -8321,8 +8356,8 @@ "deps": [ "cl-lib" ], - "commit": "4a4ccb0d6916c3e9fba737bb7b48e8aac921954e", - "sha256": "1rg6iwswi82w8938pavwhvvr2z3ismb42asam2fkad47h2sgn0gz" + "commit": "bc84c2f79a33609cccf3c996101125859b2e26ab", + "sha256": "0xw3fs8v3ciw0kvdb2nvs4wk5fjpl012hisv9ypx0nhszzyggrs6" } }, { @@ -8411,8 +8446,8 @@ "repo": "alphapapa/bufler.el", "unstable": { "version": [ - 20201108, - 1800 + 20201226, + 2149 ], "deps": [ "dash", @@ -8421,8 +8456,8 @@ "magit-section", "pretty-hydra" ], - "commit": "d623605be961316be378ffcd1e97a85069f2f7cc", - "sha256": "0vysawxmzvdnk7s5i44644pvi5y6gxyvbnspn45vl8y0ifddv2g2" + "commit": "097f4349920215bdd829fceabc1afdbba172c32a", + "sha256": "1a4y3p7cwygw09b9f9j9m821aiyjiji55mrm83pvv0xzc9rhwd3h" }, "stable": { "version": [ @@ -8496,14 +8531,14 @@ "repo": "alezost/bui.el", "unstable": { "version": [ - 20200426, - 2219 + 20210108, + 1141 ], "deps": [ "dash" ], - "commit": "28a9b0a36cb69b931cf32db7546ad5c6589752cf", - "sha256": "1gwb95pjwv9k0iq290mcyyl0xasr3jldr086rrhabxpcc9ih3yv8" + "commit": "f3a137628e112a91910fd33c0cff0948fa58d470", + "sha256": "04b0c15g24474sy9kp198g28yikhpr0fvmx1kgwqq9ly4p5wyzla" }, "stable": { "version": [ @@ -8637,14 +8672,14 @@ "repo": "alphapapa/burly.el", "unstable": { "version": [ - 20201118, - 1308 + 20201211, + 58 ], "deps": [ "map" ], - "commit": "7c03d63500b3164d157f5760619e25d731d68802", - "sha256": "1jxrbw9p5i7x0q8v0gy5w0nb4c1mxr274qjdb3ipdggfh6amzl29" + "commit": "291c2b34eee255f64c0fd889b67dc11a3b69ef12", + "sha256": "0a9k47xn9fhhw6rl73gri2ykzag5c68drfc7c4r0f1nqp61smkkv" }, "stable": { "version": [ @@ -8789,19 +8824,19 @@ "repo": "jorgenschaefer/emacs-buttercup", "unstable": { "version": [ - 20201028, - 2204 + 20210105, + 2255 ], - "commit": "2f24a44f31caf5e832bd48438b5424193c5213d1", - "sha256": "0dxbn9h38a55jk91mrapsv7k7vdvijkakpcblnjpjd1ww5lkhcy8" + "commit": "1de6be465cfe2c3f00183de9351bd838690c9f81", + "sha256": "1w02p4bfkyga6sign4flq2kw0hawyvnv63410pyh8nm7acp311gg" }, "stable": { "version": [ 1, - 23 + 24 ], - "commit": "a9647cbb566eb488b7bbde44c4cdaf51b7915851", - "sha256": "0ym1hajy47n5f1rxic8qfxrwd8zc1r7csz1v4hrwhwm4qld4krfr" + "commit": "1de6be465cfe2c3f00183de9351bd838690c9f81", + "sha256": "1w02p4bfkyga6sign4flq2kw0hawyvnv63410pyh8nm7acp311gg" } }, { @@ -9254,21 +9289,21 @@ "repo": "chenyanming/calibredb.el", "unstable": { "version": [ - 20201115, - 617 + 20201225, + 854 ], "deps": [ "dash", "s", "transient" ], - "commit": "3f4ed7868bed75f633a8bc86909251a7b070dd55", - "sha256": "09j387rb8hdf5a0ivdr5mkwkcalvl2m9fvd99gjcrylby5xa25zw" + "commit": "1f38fc34a8c159846450d18b1ee50cc960349ee7", + "sha256": "18m8g9scjllckq1c71z2dl1khgjq02d65vjakxbiyp0c049f40mq" }, "stable": { "version": [ 2, - 7, + 8, 0 ], "deps": [ @@ -9276,8 +9311,8 @@ "s", "transient" ], - "commit": "4cd701c0ae63fb7c0bd6326b1acbaefaeb9d705a", - "sha256": "1w3kz9iny72gk54jdafz8sy5sv6hnpm3rw4fn1r8aznx4p00f9dy" + "commit": "a62d7de582b16490b1af5add7b24a67022be531b", + "sha256": "19gc05k2p1l8wlkrqij9cw6d61hzknd6a9n64kzlpi87cpbav3lv" } }, { @@ -9459,15 +9494,15 @@ "repo": "kwrooijen/cargo.el", "unstable": { "version": [ - 20200826, - 1537 + 20210103, + 2111 ], "deps": [ "markdown-mode", "rust-mode" ], - "commit": "91ccfef6e36ff9e96352a03c4a057b5ee181438d", - "sha256": "1hyz834hwashcxpv5kxlzn3n0h7a50lniwdwrb62390d0x8pm6vy" + "commit": "9c7d885562c7d5935ec2e97585acf95813a084be", + "sha256": "0j1ls97m4rc9mkjp57k4ba1ljvzlhmpn31z7drkqhx9yff0q0fan" }, "stable": { "version": [ @@ -9751,8 +9786,8 @@ 20200904, 1431 ], - "commit": "a66a7b16f13533afdd03e21eebcdd6309e469a13", - "sha256": "1x5qrzzsn977hyi8xnc37jrsq7adwg2jd1ln3vapfxr05pgiijk7" + "commit": "1cd0f65e4e116aaa1dddce98e95ce79911ff85ac", + "sha256": "1w9k8gadkm0l39j8i9n5c3zwsgv1rqi9q3gpx050wn5mv33aryak" } }, { @@ -9800,8 +9835,8 @@ 20200904, 1431 ], - "commit": "a66a7b16f13533afdd03e21eebcdd6309e469a13", - "sha256": "1x5qrzzsn977hyi8xnc37jrsq7adwg2jd1ln3vapfxr05pgiijk7" + "commit": "1cd0f65e4e116aaa1dddce98e95ce79911ff85ac", + "sha256": "1w9k8gadkm0l39j8i9n5c3zwsgv1rqi9q3gpx050wn5mv33aryak" } }, { @@ -9935,15 +9970,15 @@ "repo": "ema2159/centaur-tabs", "unstable": { "version": [ - 20201129, - 1538 + 20201213, + 949 ], "deps": [ "cl-lib", "powerline" ], - "commit": "b172646b49d00c7e11fe4a4eaa80bbf026e58ab5", - "sha256": "0g24drzxrdd84kz4dsvawj25wb3v92aanhixvdnpkkwq71clcq3r" + "commit": "23eda0a0292a84c7e0a0aa2b598f9e29c7e5b54f", + "sha256": "1zk0vf7yckv3zaws9z0svgbkvs94b2js1r9vjl6pxgxa2qc0khd6" }, "stable": { "version": [ @@ -9996,11 +10031,11 @@ "repo": "abo-abo/centimacro", "unstable": { "version": [ - 20140306, - 1427 + 20201225, + 1132 ], - "commit": "1b97a9b558ed9c49d5da1bfbf29b2506575c2742", - "sha256": "0zqrpaq9c3lm12jxnvysh8f3m3193k22zaj0ycscdqd1jpq4wcgh" + "commit": "0149877584b333c4f1953f0767f0cae23881b0df", + "sha256": "0w1qzn3jrxl7f6nrycpybx8jyz570yr58ayrf5nj6b3kj0v9n5cb" } }, { @@ -10070,8 +10105,8 @@ 20171115, 2108 ], - "commit": "bf0858085ae6afc02f87573a77ff4795517fd288", - "sha256": "0rch5z0mnv98bvc7w7p48pj1w7lgnwgfh4zy6n097vkbwp4lfcjg" + "commit": "fca303e3a22f72c1c4235e404bfdffd6031bd61c", + "sha256": "15wi6xc2ml549ps4ly2a2hxhrs957k6ynz1611zv7xskxkn9dwwd" }, "stable": { "version": [ @@ -10103,10 +10138,10 @@ }, { "ename": "cfml-mode", - "commit": "0d28507e1109195004a371fa201d914b995c2b4e", - "sha256": "0q88lxhkzzab4jjihk0livdpn6lsmd8l2s4brcbl8402m285sylp", + "commit": "858b9dd3723deb7da87c5a4db135b9098c7920ee", + "sha256": "09ic34pk3ccwda2gp42h9kv98b3k4b3069yqffa8621cjhz58fiw", "fetcher": "github", - "repo": "am2605/cfml-mode", + "repo": "amyers634/cfml-mode", "unstable": { "version": [ 20190617, @@ -10124,27 +10159,27 @@ "repo": "plandes/cframe", "unstable": { "version": [ - 20190616, - 1946 + 20201222, + 1930 ], "deps": [ "buffer-manage", "dash" ], - "commit": "38026cbd004231c5525bea31723ced39311bb408", - "sha256": "1j5g1gdd1fhqfwxgjjvy7ywhb3cfvdl5rxlklacy5qfs4dva8z06" + "commit": "38544521e82befc06e397123a118dd96dda2c6b6", + "sha256": "04bgmh4rknfkfash1igav55hflkkrnkchbph6z61w36dqam06381" }, "stable": { "version": [ 0, - 1 + 4 ], "deps": [ "buffer-manage", "dash" ], - "commit": "bb99672502046e87c8f029ce98c637f762a4fc54", - "sha256": "088px3wlvr4km913y7hajrjqnxnv6n325rk6353bkbah2d75vxq4" + "commit": "38544521e82befc06e397123a118dd96dda2c6b6", + "sha256": "04bgmh4rknfkfash1igav55hflkkrnkchbph6z61w36dqam06381" } }, { @@ -10155,29 +10190,30 @@ "repo": "Alexander-Miller/cfrs", "unstable": { "version": [ - 20191125, - 2007 + 20210108, + 1152 ], "deps": [ "dash", "posframe", "s" ], - "commit": "fc5effdc25a926eada4936e5506dcccdf3902137", - "sha256": "1d18wvx2szmpvj5v26qqp2qkdmb764sfkp2f864by2hpad0rx034" + "commit": "d4cee9074b31b283b1475bfc8fe3c63ab51dbb61", + "sha256": "122gls0zwxl3km5h0gw5ykccxxdfy8svvr7s7lm78ylmp6prpx2p" }, "stable": { "version": [ 1, - 3 + 5, + 1 ], "deps": [ "dash", "posframe", "s" ], - "commit": "de83b587affe374d1cf6e6c2d747696e6c33a817", - "sha256": "130g09i38k77y2kyirg54dglksl6vrypdhh4h2j8hzy1mipc5a43" + "commit": "f47e9b7b96172023cbc0e3aaeb62462829d3134d", + "sha256": "1sia4dnp2jfjx2npklgg9yhdgs5vzjxvyk6nj0z1fvpqxfdkg60m" } }, { @@ -10188,11 +10224,11 @@ "repo": "emacsmirror/cg", "unstable": { "version": [ - 20200305, - 1845 + 20201211, + 1238 ], - "commit": "b0e4cca3d8a28054b3af2f592b528903c7e7c111", - "sha256": "06ff0blmixn38z013pxj0a5qqn6aw09kv50zzyx5prdyzb57fx6h" + "commit": "6e0ad3007ab39e8438baaf87bde11aa72c6606f2", + "sha256": "152iqasjabrskwiyhik7v8vh2x14bglng3yg7yqx7xbw4jli4p8f" } }, { @@ -10203,11 +10239,11 @@ "repo": "challenger-deep-theme/emacs", "unstable": { "version": [ - 20191114, - 1339 + 20201214, + 1705 ], - "commit": "b8427b5c87948a183e2dd2b8920a54fbaae2738b", - "sha256": "05vgax8arz6l0a4x0gsh7gs0qasjf09xj973nb7k3w8gyzmy1z95" + "commit": "b0d5f103db8ee846580617cc3a2f44f89edd5a6d", + "sha256": "03k4bvidvhcfqvk3hqni546pfz6lb8jwhxynsyacq1vcmvx1j8xw" } }, { @@ -10296,8 +10332,8 @@ 20200616, 1418 ], - "commit": "feac50b87d2a596c5e5b7b82b79ddd65b6dedd8c", - "sha256": "1pms4s1qnf60d3amhx1lfa255ln5wypq0q6w918whhzi4l7mdyz4" + "commit": "a810347b43b024a86167ab9be935dcf56c122743", + "sha256": "0ljwjqsa76mv23fl13m2fclhjlpnw5pinjpphh4ldppz2xirwl0k" }, "stable": { "version": [ @@ -10623,22 +10659,25 @@ "repo": "plandes/choice-program", "unstable": { "version": [ - 20201208, - 313 + 20201217, + 1751 ], - "commit": "f95321f5e317225cd33824c32520fe7abb972e29", - "sha256": "02d6f2rqd5s5nbrg03n6lwbxdzyyb9m7ycckyj2qha8j4bpv6r0r" + "deps": [ + "dash" + ], + "commit": "b8b1b6c5568f8778783454d5747912487c8e69b8", + "sha256": "022xpsngfn0pjsgmpb24pg428xzkpk97yhfqjc7ppncizr61n5cv" }, "stable": { "version": [ 0, - 9 + 13 ], "deps": [ - "cl-lib" + "dash" ], - "commit": "215e8ab6acc47f240b12bd11ab387da7f5de885d", - "sha256": "14sp47l7j7sv3bsrnwzqz6mzn3wwv4s75r5my6vjh39pn0qshfh1" + "commit": "27d7219b775f3061536fdca6eb52142d6a21781c", + "sha256": "0az845mxnkzwsz5l2gkr8cwfvgmqbf4fxjxds46zax6701m3hy9b" } }, { @@ -10664,8 +10703,8 @@ "repo": "contrapunctus-1/chronometrist", "unstable": { "version": [ - 20200905, - 1617 + 20210106, + 2147 ], "deps": [ "anaphora", @@ -10674,14 +10713,14 @@ "seq", "ts" ], - "commit": "ad2a7fffed94c093e6d83a6938115f66e4e888f3", - "sha256": "0raa34888cyjqhr4562gbjdi4j4k5lpp0f4zwlxxrvfwn6yxwhm1" + "commit": "cef185de5ce47236c6ba70a7613f7aa51365e5ec", + "sha256": "10jc1xw3rz18h1an8psbmrp9a1y11xcf53j0hi7vvch85w75hfc6" }, "stable": { "version": [ 0, - 5, - 5 + 6, + 2 ], "deps": [ "anaphora", @@ -10690,8 +10729,8 @@ "seq", "ts" ], - "commit": "2331edbf00cf56f28905d5a91334af4b902cdb68", - "sha256": "1zccyfpgq68ixrcl8jq2r38165ngkqrb42y2hkyab6gxhvh4wkpl" + "commit": "cef185de5ce47236c6ba70a7613f7aa51365e5ec", + "sha256": "10jc1xw3rz18h1an8psbmrp9a1y11xcf53j0hi7vvch85w75hfc6" } }, { @@ -10702,28 +10741,28 @@ "repo": "contrapunctus-1/chronometrist-goal", "unstable": { "version": [ - 20200906, - 1522 + 20210104, + 336 ], "deps": [ "alert", "chronometrist" ], - "commit": "c8bb401155a8a2c5718ffd3667c516f8e178a1b5", - "sha256": "0lqllxhq8r38gm12ia5s2mjsv75l1d99dbning5lmwwbcyc9cn17" + "commit": "7a878bd3709b9638caff17b5f49b27c03b06862a", + "sha256": "1gyz0cfq7sqqrcj8d5ikm6xqmbg3njhmbi291fs5jr8bdqrcbbmg" }, "stable": { "version": [ 0, - 2, - 1 + 3, + 0 ], "deps": [ "alert", "chronometrist" ], - "commit": "e651821d0f64830235232082a8295e86a173574b", - "sha256": "02q9bksjs24hxl1lz93f16rvqyn6ah10acjg2yw7kx0nj3qxff8v" + "commit": "7a878bd3709b9638caff17b5f49b27c03b06862a", + "sha256": "1gyz0cfq7sqqrcj8d5ikm6xqmbg3njhmbi291fs5jr8bdqrcbbmg" } }, { @@ -10782,8 +10821,8 @@ "repo": "clojure-emacs/cider", "unstable": { "version": [ - 20201209, - 1121 + 20210104, + 915 ], "deps": [ "clojure-mode", @@ -10794,14 +10833,14 @@ "sesman", "spinner" ], - "commit": "b197dbcf2b74a2f8e80d65bcd0318d6b302370a5", - "sha256": "0kfldq02i7jh10xy54za88xa3fspkb9nkf8vaagzj00292x4sl53" + "commit": "3fac28541e03812990c771bd774bf8ea65c228c9", + "sha256": "1216nws4mcvmrlkdvpb83slqqwkqiwdyw0fxp2b1nkm2lmrcq7bs" }, "stable": { "version": [ + 1, 0, - 26, - 1 + 0 ], "deps": [ "clojure-mode", @@ -10812,8 +10851,8 @@ "sesman", "spinner" ], - "commit": "a89b694cc3cec0294d84bf9dbe1163ad2373e8db", - "sha256": "0m77jbxl380dp1wyj12m82bb06r80js8yxl530ryp1mwvy74f00d" + "commit": "140b062e62165e536dcdb878a00f492a1d5b3518", + "sha256": "143kh9k34yk0g6kdlkma6g432kmb2r9r1lhyq4irsw6d3vaql7dj" } }, { @@ -10965,8 +11004,8 @@ 20181024, 1256 ], - "commit": "414127acad8e2e0092ca60918e6a7cb89da6e28a", - "sha256": "08cfhk33xawj0jbgywfn1w0j7gjyj9bcghbrwn96fd7wwj3wh5j2" + "commit": "925451a00e6defd4f5ac1a7fd76ffefefdbce3ef", + "sha256": "0bmjrfijaicwa5vvlfr47xmjcgj2npmqfcj63nczxc316kka4q9q" }, "stable": { "version": [ @@ -10986,14 +11025,14 @@ "repo": "jorgenschaefer/circe", "unstable": { "version": [ - 20201207, - 1 + 20210111, + 2141 ], "deps": [ "cl-lib" ], - "commit": "107b74c9f4318eaa385819876cd8772ef650d1f4", - "sha256": "03whhp90wvbjc43qvbsraqi47dsi29mqbwrgxfhacjzqf73qffzx" + "commit": "265f36c1e6c8db598742778dc64f9799896f5dc1", + "sha256": "0vf76rrgkpybi67n14g6gn1a7by7b90gxa8rz2m50xl3vdphnibk" }, "stable": { "version": [ @@ -11038,6 +11077,24 @@ "sha256": "0s0iw5vclciziga78f1lvj6sdg84a132in39k4vz0pj598ypin1w" } }, + { + "ename": "circleci-api", + "commit": "d05bf29e8367d4942e13eb768f4db2b291f1281e", + "sha256": "16kcbh5d6yhqaircwzy7zhb2l3in62hz6khzarfadcsk9y47pp2s", + "fetcher": "github", + "repo": "sulami/circleci-api.el", + "unstable": { + "version": [ + 20201221, + 1036 + ], + "deps": [ + "request" + ], + "commit": "870d6b550210cb1fd97a8dabad2c284e54416b4b", + "sha256": "0ph12r4lfy653qbp00hbry06n0gddfm3c7kmqp2v3c03bdsn5l9c" + } + }, { "ename": "citeproc", "commit": "20aa56e9a4809cee1082224b1b4e65921a48bda1", @@ -11475,8 +11532,8 @@ "repo": "clojure-emacs/clj-refactor.el", "unstable": { "version": [ - 20200831, - 1244 + 20210101, + 1036 ], "deps": [ "cider", @@ -11489,8 +11546,8 @@ "seq", "yasnippet" ], - "commit": "6db85b37b57497b56d97d5e5512160e5db85f798", - "sha256": "1aig67ps65adsnpdkjvl0wdglzjzhw1jc2v1rdhyfszqk0w30sz9" + "commit": "9dcc50da7ce6f3c10276c87f09022e80c03e8bef", + "sha256": "10b83yyhkppgzjxaqk8l1c2476x8cvnpn6vf1gj2v5y23c7s2mbs" }, "stable": { "version": [ @@ -11853,16 +11910,16 @@ "repo": "clojure-emacs/clomacs", "unstable": { "version": [ - 20200808, - 2347 + 20201224, + 1358 ], "deps": [ "cider", "s", "simple-httpd" ], - "commit": "ada167954911bf1631ea73537b4b496f35f99a73", - "sha256": "0gc4c97s6y7al1777zmzvq1n30i532b4v8k2p7i71bzzijr97fml" + "commit": "ffcb122194507593815d67b26f5d2d8ffcc52bf8", + "sha256": "1dqcc5szghqxdhy8r0gq6s7bbv4zq0grsjjfh8n6wmsyd1svrd3k" }, "stable": { "version": [ @@ -12015,14 +12072,14 @@ "repo": "Lindydancer/cmake-font-lock", "unstable": { "version": [ - 20200914, - 1715 + 20210103, + 1558 ], "deps": [ "cmake-mode" ], - "commit": "47687b6ccd0e244691fb5907aaba609e5a42d787", - "sha256": "03am60wr5jzx1vqyvfc885z8vy959zypjbmar37ln2pffiz9510l" + "commit": "5e20ed32193c2c7ebae920a6a3cd711c8c950597", + "sha256": "030j8k2yi1vli7xw10vz24qigq7jxg8yhc15kwjscfczl38x8vh4" } }, { @@ -12042,8 +12099,8 @@ "s", "seq" ], - "commit": "3bc3b359a88db47fc20978bd1e9a6cbe0326ec31", - "sha256": "1g5fzzvjlr5jais11qdpqbgdvfq2c9k211lphdhwi0m26wqfdp3g" + "commit": "2330f91e51e6cf8a46ce595be3deb0feda223f75", + "sha256": "0y5wbnf1pkzi7jvbvfhybwvbymg13fknpsyychb6f9mdkzcmik4j" }, "stable": { "version": [ @@ -12067,20 +12124,20 @@ "url": "https://gitlab.kitware.com/cmake/cmake.git", "unstable": { "version": [ - 20201119, - 1544 + 20210104, + 1831 ], - "commit": "d5b12ddcbca4d0919056c7815a9335087e9f2638", - "sha256": "1hvqmdn3xf3x2gkr2zpsh0yn26zq5g1ch7m7cmhrki1dzkfm7jhd" + "commit": "20a7d4485cb3f6520abc22d22fd516a19e4cfdb2", + "sha256": "0ga09h0pqb2bpbp94l21kl6vfdcq7yk1w0m4vd2bhdxvfb9r4s0d" }, "stable": { "version": [ 3, 19, - 1 + 2 ], - "commit": "64fb825438a2fecb9eab9933d5d1b926bf6f294b", - "sha256": "16vdm76bx9a9viha4v4sgszin2qrvkqr7j4n671r8xm7cdiyc8b7" + "commit": "0932b1c2b29f4ad1228fa71bf4f5c089474d9882", + "sha256": "0c6vncdqps7i1a3gxm94pp0wrgs8xvq77br178xna398f3ckf26p" } }, { @@ -12250,14 +12307,14 @@ "repo": "xuchunyang/code-stats-emacs", "unstable": { "version": [ - 20200216, - 2020 + 20201209, + 2135 ], "deps": [ "request" ], - "commit": "0d5be395d4233ea533e6eddf50af725c51304205", - "sha256": "12b2skhp9x17ffh1jxpl0nw7cybq9a2iyqmp3fwmvrr51mdg6va1" + "commit": "9a467dfd6a3cef849468623e1c085cbf59dac154", + "sha256": "1ggmm2jnz4z247kgx87i6km5ya5jayr5qy2dmshfay5pnql12fz6" }, "stable": { "version": [ @@ -12437,14 +12494,14 @@ "repo": "ankurdave/color-identifiers-mode", "unstable": { "version": [ - 20201029, - 2325 + 20201216, + 2223 ], "deps": [ "dash" ], - "commit": "09684e62f0d28b22e60f3f6f50c5941549315134", - "sha256": "1kbb519h8ba0a428charybhwscggqza4j2wqghibkz2cgik99n2p" + "commit": "ca52e957254a07411c06716d2155968375943a12", + "sha256": "01g1x652gckzhihgiqx7jx58fd0ilv0yialfh3f8l1fsqw6cggqc" }, "stable": { "version": [ @@ -12580,11 +12637,11 @@ "repo": "purcell/color-theme-sanityinc-tomorrow", "unstable": { "version": [ - 20201013, - 551 + 20210107, + 2111 ], - "commit": "65dcfc9329c2eb228c12438e3831e3aeeb449470", - "sha256": "1l4dwn6fddix655ka9rlaqd9zyx62sxxa8nm9zwzp8nh5zdd93j4" + "commit": "71b72baed2008e38ad1eb6558934e64094351cd7", + "sha256": "1z39lha9jb1bxr1xlyy5clqqqvnafipx0rf8pdjw9qhbjh4kk2x1" }, "stable": { "version": [ @@ -12621,11 +12678,11 @@ "url": "https://git.sr.ht/~lthms/colorless-themes.el", "unstable": { "version": [ - 20201009, - 1533 + 20210102, + 1035 ], - "commit": "46d477ec5a367beb6c8e75e017ae2c3a31250136", - "sha256": "05c6ywzamnq1frmb8i07wjxrncl3fpkmns8dnc3v8si234gq3m72" + "commit": "c1ed1e12541cf05cc6c558d23c089c07e10b54d7", + "sha256": "02ai9yf7h3i81bg01w8nb4kdrcc94ladbrkw9vg3p40w617mjwlb" }, "stable": { "version": [ @@ -12857,11 +12914,11 @@ "repo": "remyferre/comment-dwim-2", "unstable": { "version": [ - 20201024, - 828 + 20210101, + 1820 ], - "commit": "396b03c67684461e194a45ce751508d37088469d", - "sha256": "1pmgprhl9fllpa06c4hxb5zss3qiq1lcqwqzlnq5n2lhv8lzk3h0" + "commit": "7cdafd6d98234a7402865b8abdae54a2f2551c94", + "sha256": "0f9gzgn4d2ir79nvv5vqhn4s4131dphzpfzfcb0iy4fx6mhmca5b" }, "stable": { "version": [ @@ -13024,11 +13081,11 @@ "repo": "company-mode/company-mode", "unstable": { "version": [ - 20201120, - 1115 + 20210103, + 1124 ], - "commit": "97cfbc3967c195fb4ccb171735b9b1dea97e681a", - "sha256": "16rb3giggnnkpla29c7p5r8hnaiyqvjjjd9idv18pqahs7w4cy7y" + "commit": "6116c4617a7934acfe84cb82a058e9b198f0f480", + "sha256": "1a9ax30g57187ma27kg3p3khci6903hf0anjsxy6s2slvvy8c3fm" }, "stable": { "version": [ @@ -13166,8 +13223,8 @@ "axiom-environment", "company" ], - "commit": "9ef86ca16098050da4362f5aadaea64b0a093fc1", - "sha256": "0hyaa1nskm95scypdpbndmmdasq6cas85y6i2q1f8nq8a3qd5585" + "commit": "47d6dffc29286badb2b1d7143b219e5c1be15bdb", + "sha256": "1dppyda9jkwh6fj8m4kziq84w0b5yzxrhq87jhkv54jjra6yxbb4" } }, { @@ -13198,8 +13255,8 @@ "repo": "sebastiencs/company-box", "unstable": { "version": [ - 20201004, - 735 + 20210103, + 1605 ], "deps": [ "company", @@ -13207,8 +13264,8 @@ "dash-functional", "frame-local" ], - "commit": "be37a9a30dc112ab172af21af694e2cb04a74f85", - "sha256": "13fgmdy51gqdwijqfvb784pirx4lgva0y7ysi0c3fcx8f82cdj59" + "commit": "ec8f44674dc10dd4d50785a1f97820b29d392ea2", + "sha256": "1bzmwf6nv10pipaa3934kkly4vyzdc7hcb4r7ygimqxxcx0zvipj" } }, { @@ -13443,28 +13500,28 @@ "repo": "dunn/company-emoji", "unstable": { "version": [ - 20201020, - 554 + 20201212, + 2325 ], "deps": [ "cl-lib", "company" ], - "commit": "514b33c29ff384188e90aceceabf305205837081", - "sha256": "0pa67yfcr8lrxdbvln8hs663gsxz38ggwpva7121ngascqgx42wp" + "commit": "4ba7dc60ba67f736e698a5fa0b754b866f36a646", + "sha256": "1rhf2hr345953mkn52i58aiq8j16ps2ckapd5f7jxmhkcpzxxfhk" }, "stable": { "version": [ 2, 6, - 0 + 1 ], "deps": [ "cl-lib", "company" ], - "commit": "514b33c29ff384188e90aceceabf305205837081", - "sha256": "0pa67yfcr8lrxdbvln8hs663gsxz38ggwpva7121ngascqgx42wp" + "commit": "4ba7dc60ba67f736e698a5fa0b754b866f36a646", + "sha256": "1rhf2hr345953mkn52i58aiq8j16ps2ckapd5f7jxmhkcpzxxfhk" } }, { @@ -13630,15 +13687,15 @@ "repo": "guidoschmidt/company-glsl", "unstable": { "version": [ - 20171015, - 1749 + 20210109, + 1403 ], "deps": [ "company", "glsl-mode" ], - "commit": "a262c12c3bcd0807718c4edcaf2b054e30ef0e26", - "sha256": "0338bym8ifvkgpbc4vyzf3nmlp6rc8lihyxcbym5m08612ln78mk" + "commit": "3a40501ba831a30a7fd3e8529b20d1305d0454aa", + "sha256": "0khpvi23jbgs2rbwjawl56a219z8r3i44s4zq10an91r0q8d8n4l" } }, { @@ -13951,6 +14008,40 @@ "sha256": "1y1fw926insgdl7ib9ynxjrxf3p6wfjkfxvf5vgdca7267cvcll1" } }, + { + "ename": "company-maxima", + "commit": "f4bac452d61b22312d1a4cd0bb29d2fdc6e1e1f6", + "sha256": "1sn6dw0w21v294mrxjzgb9dwfydz1rdghplkkvx4wdj1pvc78ffq", + "fetcher": "gitlab", + "repo": "sasanidas/maxima", + "unstable": { + "version": [ + 20201207, + 2204 + ], + "deps": [ + "company", + "maxima", + "seq" + ], + "commit": "1600cfc059a80ed8fa0d381b88f29ba658811cc5", + "sha256": "030sg31xh46vrmsafvn04sdvyv4vzqf8rf5ghrlina1gav6kybfd" + }, + "stable": { + "version": [ + 0, + 7, + 6 + ], + "deps": [ + "company", + "maxima", + "seq" + ], + "commit": "8d643a1776523ef1a6e0bff0bb0a390772fcc77d", + "sha256": "17m9x3yy0k63j59vx1sf25jcfb6b9yj0ggp2jiq1mih4b62rp97d" + } + }, { "ename": "company-nand2tetris", "commit": "90421372b3f60b59762279ac805c61a984606d11", @@ -14257,15 +14348,15 @@ "repo": "tumashu/company-posframe", "unstable": { "version": [ - 20201127, - 239 + 20201214, + 52 ], "deps": [ "company", "posframe" ], - "commit": "86428bf9ce50a14326f38942b9f1467dd5b483df", - "sha256": "05ays6xkqbxcfplvx7wfc2slflmwc3aw7vkixvabk0ilvisndvgm" + "commit": "5ea0b565972ca8d80f29a40068c65bab97384748", + "sha256": "18zlwcp1vcz82573nmkix1rixv54p9sjj0fhddmf3yc8hsy2mp4g" }, "stable": { "version": [ @@ -14296,8 +14387,8 @@ "company", "prescient" ], - "commit": "5d139e5b1fe03ccaddff8c250ab8e9d795071b95", - "sha256": "11hqy8chh29lrzk04dp3rwkvf4bj0xvg9hli3w1zx968x98lfvj0" + "commit": "42adc802d3ba6c747bed7ea1f6e3ffbbdfc7192d", + "sha256": "0v12707jwd2ynk8gp3shgarl6yp3ynal7d4jzds6l2lknr6wi50w" }, "stable": { "version": [ @@ -14485,20 +14576,20 @@ "company", "rtags" ], - "commit": "63a7d9b733def9fe76568f81321a65a450829575", - "sha256": "1nnjhfz7xm1ax38xkz0jvgzhfczlc4r9xlpzc24sisabkvlkivyw" + "commit": "39339388256df662d0084b4a094d03e52748f9e8", + "sha256": "0wp4mygsxzibra2p3m5rn9m0yd3fscd795k5xa0wxi5pwddv7dlg" }, "stable": { "version": [ - 2, - 38 + 3, + 23 ], "deps": [ "company", "rtags" ], - "commit": "9687ccdb9e539981e7934e768ea5c84464a61139", - "sha256": "1r6l7dgr2ch586zrdi5l8fhdj4qdva8ldz7cjvi2byc2pd2xs8rx" + "commit": "7169ed577d676690a3c6f0025b54e8477d80eacf", + "sha256": "1i94dizg3wvkvq8c2pf5bzkx8zwzcfi4p3l73c779y145bygssnq" } }, { @@ -14693,8 +14784,8 @@ "repo": "TommyX12/company-tabnine", "unstable": { "version": [ - 20201101, - 1948 + 20210111, + 347 ], "deps": [ "cl-lib", @@ -14703,8 +14794,8 @@ "s", "unicode-escape" ], - "commit": "da18b5e1f01facea1e9588f067ec79dc36e475fc", - "sha256": "0qaq5k5c6nnnk7rhi2n51nj4jgnrjf843p8qafcqbz120ynih1w1" + "commit": "a6edb64cd1087f0453d08a72c3c0169cebcd9f4c", + "sha256": "069zzs80zwxhhnwnvybyvhd0qrwdd60r7ihffn5bmngmxf5nmi8i" } }, { @@ -14979,14 +15070,14 @@ "repo": "daviderestivo/comware-router-mode", "unstable": { "version": [ - 20201112, - 1629 + 20201229, + 1706 ], "deps": [ "dash" ], - "commit": "471cde874999cc50b03d7c906802369ea5a5ffa4", - "sha256": "14cjnc09ms4cfp9nyp904gcp6rd5aflgp9vhb42gh4lzfzm3ppzj" + "commit": "f0f884f0fe9ab2c3420e62d27eadc59ac2209a4a", + "sha256": "1zcvpj7bxry2v8whijgpqw773l3l64nrgaxdwyd053ahl0nv7mpf" } }, { @@ -15203,17 +15294,55 @@ }, { "ename": "consult", - "commit": "488a72b896992984b048cc6ce4796ade11849bb0", - "sha256": "02z6h0x346230ayncsb8phks9mmjdq5mj9ja68380hl6gkic3407", + "commit": "1a1fbbfebeb88dab2d032e994ec21c976f059d22", + "sha256": "1jkqrc9wzk2dhajnd84avppynqcmly9vc35xhaqi4skhx5il24wb", "fetcher": "github", "repo": "minad/consult", "unstable": { "version": [ - 20201209, - 824 + 20210113, + 1 ], - "commit": "dadc87fe73a93d2ecc34a0f82636729e8fe2dcd7", - "sha256": "07ibxpbsv7mfxg8b04fw7517i54yky4y7h0wyg7f6lfmhb0zadq3" + "commit": "58be54e07f1d4e08769af77df7b51c8536891b53", + "sha256": "1z4478yrpa44kv584d17kicpp8as2jhxhrdrhxmn4xxwcrygl2hi" + } + }, + { + "ename": "consult-flycheck", + "commit": "1a1fbbfebeb88dab2d032e994ec21c976f059d22", + "sha256": "0gf7nb2zylmm53xszd53qp7byvlppd2j9lh61p8syanjssqy4j67", + "fetcher": "github", + "repo": "minad/consult", + "unstable": { + "version": [ + 20210112, + 1845 + ], + "deps": [ + "consult", + "flycheck" + ], + "commit": "58be54e07f1d4e08769af77df7b51c8536891b53", + "sha256": "1z4478yrpa44kv584d17kicpp8as2jhxhrdrhxmn4xxwcrygl2hi" + } + }, + { + "ename": "consult-selectrum", + "commit": "1a1fbbfebeb88dab2d032e994ec21c976f059d22", + "sha256": "08zhnzj70c3j4jkxa75a4wsaz1g35sc0wl7vkhjnhlpqhwidb2p5", + "fetcher": "github", + "repo": "minad/consult", + "unstable": { + "version": [ + 20210112, + 1916 + ], + "deps": [ + "consult", + "selectrum" + ], + "commit": "58be54e07f1d4e08769af77df7b51c8536891b53", + "sha256": "1z4478yrpa44kv584d17kicpp8as2jhxhrdrhxmn4xxwcrygl2hi" } }, { @@ -15529,14 +15658,14 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20201208, - 1022 + 20210109, + 1641 ], "deps": [ "swiper" ], - "commit": "ae9b121b834a68d11f79ca27b1e5c8790149ba2f", - "sha256": "160qs77b4sama17h8lhq60my44qh4c9aj1qj9jk02n64jfn44fm6" + "commit": "8f2abd397dba7205806cfa1615624adc8cd5145f", + "sha256": "0x3yy8q9ixs4zn7slhm7rskcvlsa8fdd2pbc075rx7chqzv6vc58" }, "stable": { "version": [ @@ -15551,6 +15680,25 @@ "sha256": "0ghcwrg8a6r5q6fw2x8s08cwlmnz2d8qjhisnjwbnc2l4cgqpd9p" } }, + { + "ename": "counsel-ag-popup", + "commit": "746d624efbf305a07c1eb68990b8bfb249e212fc", + "sha256": "148szhlv9pflf7zhc0ljmbsm32k7z8x03r0jqyypp6gfjbhf3l5w", + "fetcher": "github", + "repo": "gexplorer/counsel-ag-popup", + "unstable": { + "version": [ + 20210112, + 1320 + ], + "deps": [ + "counsel", + "transient" + ], + "commit": "b7179875a2185b7ed2460c71a786413be94bb6f6", + "sha256": "1fmsvznxglx97mwf6x51pnbg2flvivrbb5w2qpp72dlsfhgsa5jp" + } + }, { "ename": "counsel-bbdb", "commit": "0ed9bcdb1f25a6dd743c1dac2bb6cda73a5a5dc2", @@ -15676,26 +15824,26 @@ "repo": "redguardtoo/counsel-etags", "unstable": { "version": [ - 20201117, - 113 + 20201228, + 741 ], "deps": [ "counsel" ], - "commit": "89ed187095be956dbf97e813a7bbfdb87ee125ba", - "sha256": "02dhj8qry2j5v47cfr3f6yv5kzxwf1m1w9055ar4x74akgm7901w" + "commit": "c10951946d6dd935e4ab5d18db5da228e1c22806", + "sha256": "09n0mpp0pchb85f7qkizd686rpkfagmr7sd0sxsh81xhzdavam47" }, "stable": { "version": [ 1, 9, - 15 + 16 ], "deps": [ "counsel" ], - "commit": "d391b550a9d874409560e71d74cd13c14aacc6ab", - "sha256": "1kkck3cdq404czih8rhinammillhmy2iz10469z7iyzc35wrljyk" + "commit": "894cd7e25a2f96e29b70897ab799e7dd9e4f85fd", + "sha256": "01si554r0s6m7ypx1m2n0z6j6q6yihifz76dha6q6v56ixdlv626" } }, { @@ -15743,15 +15891,15 @@ "repo": "FelipeLema/emacs-counsel-gtags", "unstable": { "version": [ - 20201130, - 1401 + 20201211, + 1755 ], "deps": [ "counsel", "seq" ], - "commit": "1c0a0102931b73e0073307ba10ebfc47b2b145af", - "sha256": "137i0mwi12hfrdlb4h0vh9vwjw5yyq2p69ib9pfs4y8frhv350ad" + "commit": "e4a662c38cd217bae9c0bd80f2c9b53cc2cffcb7", + "sha256": "0gb8gbphckyk834mxl704fawvykigmk0cl8klmyfap0nb55h846b" }, "stable": { "version": [ @@ -15773,15 +15921,15 @@ "repo": "200ok-ch/counsel-jq", "unstable": { "version": [ - 20201203, - 901 + 20201230, + 1703 ], "deps": [ "ivy", "swiper" ], - "commit": "aaf33fc2447096cd0d03b77395fe2a95c9fe1481", - "sha256": "10rz0qm8a4bl0m86kx19zq8lri047p4sxqyny08bgm9pbam0wvwn" + "commit": "153d70b576df1d572c56d84039cb40749310cfe7", + "sha256": "1r8bbdbvxczbcw8359v9s451fnpcsna0hqg43k26cbwba137vxl7" }, "stable": { "version": [ @@ -16052,16 +16200,16 @@ "repo": "AdamNiederer/cov", "unstable": { "version": [ - 20201025, - 425 + 20201214, + 550 ], "deps": [ "elquery", "f", "s" ], - "commit": "d6cd3f6a857622f73779ffb2250902fc0c00f7f8", - "sha256": "1kazdbwdidwqi0zj3dxh0h53pw22pvvn8nhkkk6xkjiigjz85n89" + "commit": "5efa13e7d3e06f206b29879d8f66afd6b0d26f52", + "sha256": "01d7kgsdv09lllmhi2dvywb61n2aj3j665xcxqjidwfl03vsw16g" } }, { @@ -16511,11 +16659,11 @@ "repo": "crystal-lang-tools/emacs-crystal-mode", "unstable": { "version": [ - 20191121, - 1447 + 20201228, + 1539 ], - "commit": "f9e4db16ff9fdc6a296363aa35d19cfb4926e472", - "sha256": "1x0lmb48bza2w52s15288hpbipafs87lj5lv0ldd1q4r9yv0i102" + "commit": "15998140b0a4172cd4b4d14d0377fba96a8917fc", + "sha256": "0bdzffwp9hliy9bkvqn1p432yy161g7n7bl814mmi6zj4sfn1sy1" }, "stable": { "version": [ @@ -16562,26 +16710,26 @@ }, { "ename": "csharp-mode", - "commit": "736716bbcfd9c9fb1d10ce290cb4f66fe1c68f44", - "sha256": "17j84qrprq492dsn103dji8mvh29mbdlqlpsszbgfdgnpvfr1rv0", + "commit": "704aa5b8132a72770b5a3cf4f81d1dc154709fdf", + "sha256": "1s8bv738k3rz0lkpnlcg209qpqd28vx1np4zgas01mp9fhgyivkn", "fetcher": "github", - "repo": "josteink/csharp-mode", + "repo": "emacs-csharp/csharp-mode", "unstable": { "version": [ - 20201209, - 1122 + 20210112, + 1407 ], - "commit": "a6caa85b914ade93310da17f669a57c6f7ff94bb", - "sha256": "0k6y0ngpk0993p8y65a7yp377izzf1jjs6bpxmw0mc45sjwiqmwa" + "commit": "1de65568b3b98d2a1009df35760149ba571fc694", + "sha256": "0kbcdk9wr4bv8z0jdfglnzh24k08d4mgkh2qwsvna9wdbi2bpqds" }, "stable": { "version": [ 0, - 10, + 11, 0 ], - "commit": "80238e862dec17e3553e04e6f101a0cc42019f84", - "sha256": "0vwkbla2gkfa9dzxfvrvr7hd2z16769iwbycl7k6l701dnwli1fw" + "commit": "84664285a6d215998da763dc5d286d4f941df81e", + "sha256": "0aq6ln92jr3hcrd1592n4s5cb079fly7qaj2hm510p9zckyfx230" } }, { @@ -17138,11 +17286,11 @@ "repo": "mrkkrp/cyphejor", "unstable": { "version": [ - 20190713, - 1339 + 20210111, + 841 ], - "commit": "763531d077d02a4a45c58332b8a8b8300c090678", - "sha256": "0q0wjybmasrv04r09linnb3n1m7g7qylaynzmmsdrk59fwzda3c2" + "commit": "037c0f2d0cd0e23acd2aacb621d7694080f5eef6", + "sha256": "16jca2abc66vcf92js5m5489np7a4ymb27i78rkqwsrwcniz178j" }, "stable": { "version": [ @@ -17180,8 +17328,8 @@ 20190111, 2150 ], - "commit": "cedbd5840fde2c63549b64c35cd05ea5fb9fc524", - "sha256": "1l5j4phhmlzr14zczk9h63m8rw3z0avlvgs6pbhch5fvhs8fv4zi" + "commit": "320fa6d73811a3fc240b7ec6494bb13c74bcbbed", + "sha256": "1b86f7b5wqc3smkscs56012ikxsm0svyg0i0q5ahk57drkaaqll0" }, "stable": { "version": [ @@ -17347,8 +17495,8 @@ "repo": "jyp/dante", "unstable": { "version": [ - 20200921, - 723 + 20210101, + 907 ], "deps": [ "company", @@ -17359,8 +17507,8 @@ "lcr", "s" ], - "commit": "e2acbf6dd37818cbf479c9c3503d8a59192e34af", - "sha256": "18w9ifykrcxxjn9pwp3xfyxvx54c0icwsv0n12xfjghfdkph21qq" + "commit": "7b32bf21d5b9f7232c4b5c3760abf306e9ed9a0c", + "sha256": "1if4p6ikj7dry2c0xyli4m02f6xabriddm25xp4nksm8mj9cjgby" }, "stable": { "version": [ @@ -17401,8 +17549,8 @@ "posframe", "s" ], - "commit": "e582ff90c104703ed65c1f3174d4c4690e9cf1fd", - "sha256": "05rcpxg982amzk8abrrhzig2ax6rwm2bj1xvy29r8imvpayfm14f" + "commit": "612388d0b85e77972a9c28391bac6224a63408c7", + "sha256": "1z1vimfwjb5bfqdijh38cii222sw07l2mgbw4bwhwp93kasczw9a" }, "stable": { "version": [ @@ -17559,14 +17707,14 @@ "repo": "emacsfodder/emacs-theme-darktooth", "unstable": { "version": [ - 20190412, - 142 + 20201215, + 822 ], "deps": [ "autothemer" ], - "commit": "5cc7fbfb08d2f1a33b85eac92b6450407b915119", - "sha256": "164y8hrdz46gg1b6sfi7gdv7pj54hrin0lcmhxp6gc9x5dg3l354" + "commit": "ec03b30ee7f43f89ca4c382bb3fe4ee560c028a8", + "sha256": "00ijwqchvrwln2wl3nfcq5v3i2p232z4qsy67x1v51q20876mc9j" }, "stable": { "version": [ @@ -17655,11 +17803,11 @@ "repo": "magnars/dash.el", "unstable": { "version": [ - 20200803, - 1520 + 20210111, + 1247 ], - "commit": "0f238a9a466879ee96e5db0482019453718f342d", - "sha256": "0nnqkwcy66wjpynpm47kyzgv9wsb5vdfragy672s8wfagyf4331v" + "commit": "7a9c9378772b687a452966ce4745c54afb19a2fc", + "sha256": "14qj4zvbxqab6q2zbl46nvx5gyd897qxk6xapjxydfy6gsnan0y0" }, "stable": { "version": [ @@ -17728,14 +17876,14 @@ "repo": "magnars/dash.el", "unstable": { "version": [ - 20200617, - 702 + 20210103, + 1524 ], "deps": [ "dash" ], - "commit": "0f238a9a466879ee96e5db0482019453718f342d", - "sha256": "0nnqkwcy66wjpynpm47kyzgv9wsb5vdfragy672s8wfagyf4331v" + "commit": "7a9c9378772b687a452966ce4745c54afb19a2fc", + "sha256": "14qj4zvbxqab6q2zbl46nvx5gyd897qxk6xapjxydfy6gsnan0y0" }, "stable": { "version": [ @@ -17758,14 +17906,14 @@ "repo": "emacs-dashboard/emacs-dashboard", "unstable": { "version": [ - 20201209, - 1003 + 20210104, + 1605 ], "deps": [ "page-break-lines" ], - "commit": "197d9285c473afa524c45c737f4f61ea1caf8f0d", - "sha256": "18sqfs845xp16yqan4pbks4iy3z26988s7idby58333ky506lpl2" + "commit": "2b1ef13392be2f07d2a52636edf578b89512d501", + "sha256": "0lkx03y592jhac0s4d3vn5iqqsymqqwv7zzx5z0rpcyc46ym370r" }, "stable": { "version": [ @@ -17801,36 +17949,36 @@ }, { "ename": "dashboard-ls", - "commit": "656977197e0030525c52b14de8f6e1faa042daeb", - "sha256": "10dsdzps7kh3v5p5grdjwf2xjr7rvaiqp57fg9vh4pficvhylqaa", + "commit": "c011899d671f33ce6f303693a11c4f37e4c90fe7", + "sha256": "19hps917cys5bvplr9l4zzphhq6k9mpi1c4yjgslygx3svrfsxcf", "fetcher": "github", - "repo": "jcs-elpa/dashboard-ls", + "repo": "emacs-dashboard/dashboard-ls", "unstable": { "version": [ - 20201207, - 1616 + 20210108, + 1857 ], "deps": [ "dashboard", "f", "s" ], - "commit": "c97ea0b454ea78e55155fd4c52abc60753496cd8", - "sha256": "1dkgccj4ac2mis930qwsncjcygx729pgs0v00hpm23mnhc6mxx9b" + "commit": "91b3c79aa3af3842f1477825f967370414dc77b2", + "sha256": "0q456m64wkbwxc99bwr8b3n7z2f2qkrbcdij0kji35rg89rxbgph" }, "stable": { "version": [ 0, 2, - 1 + 2 ], "deps": [ "dashboard", "f", "s" ], - "commit": "c97ea0b454ea78e55155fd4c52abc60753496cd8", - "sha256": "1dkgccj4ac2mis930qwsncjcygx729pgs0v00hpm23mnhc6mxx9b" + "commit": "86ad7ca7b09e98524de6c64e1fd63f61d41f9177", + "sha256": "052072jk22dz141wsr6wg3wfnvwfaikalhmqc7mpp15iwwg1ppa4" } }, { @@ -18098,15 +18246,15 @@ "repo": "skk-dev/ddskk", "unstable": { "version": [ - 20200906, - 233 + 20210112, + 2013 ], "deps": [ "ccc", "cdb" ], - "commit": "a66a7b16f13533afdd03e21eebcdd6309e469a13", - "sha256": "1x5qrzzsn977hyi8xnc37jrsq7adwg2jd1ln3vapfxr05pgiijk7" + "commit": "1cd0f65e4e116aaa1dddce98e95ce79911ff85ac", + "sha256": "1w9k8gadkm0l39j8i9n5c3zwsgv1rqi9q3gpx050wn5mv33aryak" } }, { @@ -18322,6 +18470,21 @@ "sha256": "1842wikq24c8rg0ac84vb1qby9ng1nssxswyyni4kq85lng5lcrp" } }, + { + "ename": "default-font-presets", + "commit": "3b8b731674a5c5d4f83d998258a5d4c9aabb2048", + "sha256": "0hracb7krwgpnispnjgi86zaywq08mc3c8cyaxl82lc8jc9b05j2", + "fetcher": "gitlab", + "repo": "ideasman42/emacs-default-font-presets", + "unstable": { + "version": [ + 20201227, + 2319 + ], + "commit": "dd143e7e6cf5384d203a76e50fe677a77f1cd615", + "sha256": "1zpf35x1w4ldijqx3a2qlykhy9xgw3mqzxhfv0r3qn37k7lg0m58" + } + }, { "ename": "default-text-scale", "commit": "db5e0b70e2d9c80aa41ae2c397f822789c2d3cc2", @@ -18417,11 +18580,11 @@ "repo": "abo-abo/define-word", "unstable": { "version": [ - 20200824, - 1120 + 20210103, + 1812 ], - "commit": "3af6825c5f3bf4f6176a3f5b2e499616c65e2fe0", - "sha256": "1l418w5lhlyh62557ffrsisv7ips0ql7bpcxc32msc51dlh7ilhh" + "commit": "6e4a427503aef096484f88332962c346cdd10847", + "sha256": "1mpsc9cfdl5lzn2yzn63gxvshjl3m2aiwsv12g3qvya2a1xskjj8" }, "stable": { "version": [ @@ -18474,11 +18637,11 @@ "repo": "jrblevin/deft", "unstable": { "version": [ - 20200515, - 1513 + 20210101, + 1519 ], - "commit": "fca9ea05ef4fdac825e2ad3921baa7042f6b82c8", - "sha256": "0h5znwc4sa92l2472204yn60z30ysvkr9hphjga7kn4j4jgvqak1" + "commit": "c4af44827f4257e7619e63abfd22094a29a9ab52", + "sha256": "0xphl5r8q884ml6clrfrzaiqznfrrpsvysakigjqpgazic5d60g2" }, "stable": { "version": [ @@ -18665,11 +18828,11 @@ "repo": "DamienCassou/desktop-environment", "unstable": { "version": [ - 20201117, - 1653 + 20201229, + 1107 ], - "commit": "d8560e4fe98d75a47ab652ef44ced8660c956fb8", - "sha256": "1xsqhvprjd1097mdig14z83psi3jzfm6k8pdw43g9pqih404lg40" + "commit": "9ece03e3e687ff97d79eb2a9f6cc506a932f89ca", + "sha256": "1hsjzwwlhqxqgp5ii8a23wq2fc7a8dzfnqhjyakn39wp7dm925sz" }, "stable": { "version": [ @@ -18764,8 +18927,8 @@ "deps": [ "reformatter" ], - "commit": "97524f934556d561c6c9268ed719f027ed9f55e9", - "sha256": "1c8dzk19f3n5v1r43iaynd1cs2valypz0ldh8l22cdbg82smva1b" + "commit": "ad259c8a2292fb398dff1ce7d25c686edb02945d", + "sha256": "1vp8cjkkiih7cz5d8kcpc2ysq3iz4wr5wi2lkkkhp94k04jl5h1r" } }, { @@ -18945,26 +19108,26 @@ "repo": "dgutov/diff-hl", "unstable": { "version": [ - 20201201, - 1956 + 20210107, + 220 ], "deps": [ "cl-lib" ], - "commit": "c31af59cce04fdcf9d05da54a43d236a4869c251", - "sha256": "191vqwnalbynpj0r1v5v7qd35dih8k99kvm2gvpgpv5kg28gq3hm" + "commit": "89aeb2fc8b24b6c4de4394f85041c5dd5fa60dad", + "sha256": "17mar4w5q6yxqcz9qslnz6vg666l2mmy2fhja7r071x8hj5gla0c" }, "stable": { "version": [ 1, 8, - 7 + 8 ], "deps": [ "cl-lib" ], - "commit": "374b1d4b34876219218da7a539e7301259b56958", - "sha256": "0i7x6qgr3nydcwhw72sbc8z9x9dfhgkf0dqj9nakvx36vn1bblbq" + "commit": "b8b4f43af73f109bf1af0453a076c274164488cf", + "sha256": "075klzf66z1rvhpxv4j694pdkmi7f4fpw6c8q4ncz0h4y5wdbl8w" } }, { @@ -19220,11 +19383,11 @@ "repo": "gonewest818/dimmer.el", "unstable": { "version": [ - 20201203, - 545 + 20210109, + 1932 ], - "commit": "360e413f06d0da968af7cbb2a25d97a24765818f", - "sha256": "0fbr5s8zf5na8zsm5vq2ahkyr37azslnssa102mhkf67077lpy4n" + "commit": "8559fb73a2c96755cb30f560be82191164014b43", + "sha256": "0jb5ki27yvzli3yybglhcnkhzpjxv15zy646yaafszq232j1ylnk" }, "stable": { "version": [ @@ -19348,8 +19511,8 @@ "dash", "dired-hacks-utils" ], - "commit": "d6d4d1930969bbc22fd0551d5195887bf92cab3e", - "sha256": "0nhd2f6ybdcb4nb6klallvjfdfkfn1vp2j29zi1d7spi7ksv6l4f" + "commit": "d1a2bda6aa8f890cb367297ed93aee6d3b5ba388", + "sha256": "12m81a9kjhs4cyq3lym0vp5nx6z3sfnypyzrnia76x6rjvixjf6y" } }, { @@ -19360,16 +19523,16 @@ "repo": "Fuco1/dired-hacks", "unstable": { "version": [ - 20190515, - 1210 + 20210110, + 1714 ], "deps": [ "dash", "dired-hacks-utils", "f" ], - "commit": "d6d4d1930969bbc22fd0551d5195887bf92cab3e", - "sha256": "0nhd2f6ybdcb4nb6klallvjfdfkfn1vp2j29zi1d7spi7ksv6l4f" + "commit": "d1a2bda6aa8f890cb367297ed93aee6d3b5ba388", + "sha256": "12m81a9kjhs4cyq3lym0vp5nx6z3sfnypyzrnia76x6rjvixjf6y" } }, { @@ -19495,8 +19658,8 @@ "dired-hacks-utils", "f" ], - "commit": "d6d4d1930969bbc22fd0551d5195887bf92cab3e", - "sha256": "0nhd2f6ybdcb4nb6klallvjfdfkfn1vp2j29zi1d7spi7ksv6l4f" + "commit": "d1a2bda6aa8f890cb367297ed93aee6d3b5ba388", + "sha256": "12m81a9kjhs4cyq3lym0vp5nx6z3sfnypyzrnia76x6rjvixjf6y" } }, { @@ -19534,8 +19697,8 @@ "deps": [ "dash" ], - "commit": "d6d4d1930969bbc22fd0551d5195887bf92cab3e", - "sha256": "0nhd2f6ybdcb4nb6klallvjfdfkfn1vp2j29zi1d7spi7ksv6l4f" + "commit": "d1a2bda6aa8f890cb367297ed93aee6d3b5ba388", + "sha256": "12m81a9kjhs4cyq3lym0vp5nx6z3sfnypyzrnia76x6rjvixjf6y" } }, { @@ -19685,8 +19848,8 @@ "dash", "dired-hacks-utils" ], - "commit": "d6d4d1930969bbc22fd0551d5195887bf92cab3e", - "sha256": "0nhd2f6ybdcb4nb6klallvjfdfkfn1vp2j29zi1d7spi7ksv6l4f" + "commit": "d1a2bda6aa8f890cb367297ed93aee6d3b5ba388", + "sha256": "12m81a9kjhs4cyq3lym0vp5nx6z3sfnypyzrnia76x6rjvixjf6y" } }, { @@ -19704,8 +19867,8 @@ "dash", "dired-hacks-utils" ], - "commit": "d6d4d1930969bbc22fd0551d5195887bf92cab3e", - "sha256": "0nhd2f6ybdcb4nb6klallvjfdfkfn1vp2j29zi1d7spi7ksv6l4f" + "commit": "d1a2bda6aa8f890cb367297ed93aee6d3b5ba388", + "sha256": "12m81a9kjhs4cyq3lym0vp5nx6z3sfnypyzrnia76x6rjvixjf6y" } }, { @@ -19746,26 +19909,25 @@ "repo": "xuhdev/dired-quick-sort", "unstable": { "version": [ - 20201128, - 116 + 20201221, + 403 ], "deps": [ "hydra" ], - "commit": "9741bae65b5ca077a81589dcc6b3ca3c12f0f76f", - "sha256": "14chkh5zqrjs574jml8sq3d4xhq0fclbzifcnpph080vxspxr2xn" + "commit": "69b06f306a5fc2b38e707bae3ff1e35db2b39b6b", + "sha256": "01zdha3p7wsf98yayvwgpd4arcs7yhz62yk1nyq9n13hvmqg7dvk" }, "stable": { "version": [ 0, - 1, - 1 + 2 ], "deps": [ "hydra" ], - "commit": "868311eec176d9cc254730b305c1cab9ede82547", - "sha256": "0jngm5zrmbm2w45sq1kxf0bimkmrwxc2biyb5bx7422mqkcsg2fh" + "commit": "79e422be55c72bfe36d2ec8a838f19d1cc8d101a", + "sha256": "14hb3d76y4n8qvfl74v9hzgl6774bqdcmsa0npv3gs144fbx9prk" } }, { @@ -19783,8 +19945,8 @@ "dash", "dired-hacks-utils" ], - "commit": "d6d4d1930969bbc22fd0551d5195887bf92cab3e", - "sha256": "0nhd2f6ybdcb4nb6klallvjfdfkfn1vp2j29zi1d7spi7ksv6l4f" + "commit": "d1a2bda6aa8f890cb367297ed93aee6d3b5ba388", + "sha256": "12m81a9kjhs4cyq3lym0vp5nx6z3sfnypyzrnia76x6rjvixjf6y" } }, { @@ -19802,8 +19964,8 @@ "dash", "dired-hacks-utils" ], - "commit": "d6d4d1930969bbc22fd0551d5195887bf92cab3e", - "sha256": "0nhd2f6ybdcb4nb6klallvjfdfkfn1vp2j29zi1d7spi7ksv6l4f" + "commit": "d1a2bda6aa8f890cb367297ed93aee6d3b5ba388", + "sha256": "12m81a9kjhs4cyq3lym0vp5nx6z3sfnypyzrnia76x6rjvixjf6y" } }, { @@ -19867,27 +20029,27 @@ "repo": "stsquad/dired-rsync", "unstable": { "version": [ - 20201126, - 1319 + 20201224, + 2214 ], "deps": [ "dash", "s" ], - "commit": "fe5988154c843c70d080ae8a822f27ed83983d01", - "sha256": "1i2qsdbhmsrdx49lqn0fk69sk85ysdpa8c90gfz78vby4fjlb240" + "commit": "947a008387a939f466ca122bda2ea98bb17710e3", + "sha256": "19za6i96xrmczdh928n5ixd7j7pvy175sz1msaiwvdjwysjr8k51" }, "stable": { "version": [ 0, - 5 + 6 ], "deps": [ "dash", "s" ], - "commit": "707f527a5448f8fd881321f1d60e49821d3efe60", - "sha256": "1nq3d8py2zsji835wilg514z5j180k371pwqsqrmnnhq1cj4fkia" + "commit": "947a008387a939f466ca122bda2ea98bb17710e3", + "sha256": "19za6i96xrmczdh928n5ixd7j7pvy175sz1msaiwvdjwysjr8k51" } }, { @@ -19898,14 +20060,14 @@ "repo": "jojojames/dired-sidebar", "unstable": { "version": [ - 20200711, - 2031 + 20210109, + 1854 ], "deps": [ "dired-subtree" ], - "commit": "da77919081d9a4e73c2df63542353319381e4f89", - "sha256": "05h56wdl2xvc8davnx83ypg20fl7wlks97cafa4r2yf141xjc05h" + "commit": "18986f015c993508af0b1b4e43e11dbd7af98057", + "sha256": "1zla8q26sif8795n5vncwgz2j7c45bh3gnjkwqgpdg4carrw5s60" }, "stable": { "version": [ @@ -19952,15 +20114,15 @@ "repo": "Fuco1/dired-hacks", "unstable": { "version": [ - 20180922, - 1615 + 20210105, + 1127 ], "deps": [ "dash", "dired-hacks-utils" ], - "commit": "d6d4d1930969bbc22fd0551d5195887bf92cab3e", - "sha256": "0nhd2f6ybdcb4nb6klallvjfdfkfn1vp2j29zi1d7spi7ksv6l4f" + "commit": "d1a2bda6aa8f890cb367297ed93aee6d3b5ba388", + "sha256": "12m81a9kjhs4cyq3lym0vp5nx6z3sfnypyzrnia76x6rjvixjf6y" } }, { @@ -20010,6 +20172,21 @@ "sha256": "0ajj8d6k5in2hclcrqckinfh80ylddplva0ryfbkzsjkfq167cv2" } }, + { + "ename": "diredc", + "commit": "abaea37c792e6593665dc536e8803e0f591f7359", + "sha256": "09wfizmqp2njb2xi532qixs5syccmadpc5bbm55i7xfqrr52d7zy", + "fetcher": "github", + "repo": "Boruch-Baum/emacs-diredc", + "unstable": { + "version": [ + 20210113, + 1 + ], + "commit": "887434054c2cfc521ceb990266cc7bbc12c4a72a", + "sha256": "16rwxv2mrn79m8hqg79kq7z6fz2l8amh17kny4y3qnsvakpi0hch" + } + }, { "ename": "diredfl", "commit": "3da86e18d423198766455929da1dcb3a9a3be381", @@ -20400,8 +20577,8 @@ 20191130, 52 ], - "commit": "93aac853215d0902e7a30a6dd2b99d796da77df4", - "sha256": "186294rkmhwbh8x054w1hnqykp1iydxd490irl542j5alinv43qk" + "commit": "6abf276b8d66df4996c7e98e7a40cbad8747beb7", + "sha256": "17163bncxf11295bxzbmji09qy0klxzb0w8vxaazij6sxlk90mnm" } }, { @@ -20984,11 +21161,11 @@ "repo": "spotify/dockerfile-mode", "unstable": { "version": [ - 20201208, - 1348 + 20210106, + 235 ], - "commit": "6a56c1cc1713b501040b08fdbf0c4159a4fe95f9", - "sha256": "0l5pj85xpywfl2sgd4rgpvlxphc9alhhwi7ls0pa8wh2nry7ri5b" + "commit": "58b7380189de21496235382900838aa0db2dcf92", + "sha256": "1n3kis5g7m25sl68iw9jw7jkfz7jab82v37xk492d77rr9cbvjwx" }, "stable": { "version": [ @@ -21010,8 +21187,8 @@ "repo": "r0man/docopt.el", "unstable": { "version": [ - 20201121, - 1523 + 20201211, + 1008 ], "deps": [ "dash", @@ -21020,14 +21197,14 @@ "s", "transient" ], - "commit": "8a0e1777777d6ef7d144f1150b06ede9d9950220", - "sha256": "1m77nix3kwghwpbl5ins677f6qaxaczzg2k22ana3nsib8lvdkra" + "commit": "6e1105347decbf9b4b848d952858455f9b145c56", + "sha256": "0vkmgfgw8qica21hcqila62ivqxshkay2r2dyy4dxxj3xypk3083" }, "stable": { "version": [ 0, 1, - 0 + 1 ], "deps": [ "dash", @@ -21036,8 +21213,8 @@ "s", "transient" ], - "commit": "9546e43acc2c3193a58820a89814f1c580f0cb27", - "sha256": "0s4q1zk4aqz76392c030c4bs28nbngw1rw3mygrk3cqaqykg7mq4" + "commit": "6e1105347decbf9b4b848d952858455f9b145c56", + "sha256": "0vkmgfgw8qica21hcqila62ivqxshkay2r2dyy4dxxj3xypk3083" } }, { @@ -21048,11 +21225,11 @@ "repo": "progfolio/doct", "unstable": { "version": [ - 20200917, - 1712 + 20201229, + 2136 ], - "commit": "dabb30ebea866ef225b81561c8265d740b1e81c3", - "sha256": "0pbalf1a9jrfwb6h1zw3bxz16qn1md10w030hbcbm0dblafchz0y" + "commit": "36075595cf5cf6460f215735b1aa562d6a07a496", + "sha256": "1c8676b81dx8zhmbv3ymdyi21rx0x60a2v104i6p9l7c2yilq9c2" } }, { @@ -21167,16 +21344,16 @@ "repo": "seagle0128/doom-modeline", "unstable": { "version": [ - 20201128, - 1659 + 20210107, + 1407 ], "deps": [ "all-the-icons", "dash", "shrink-path" ], - "commit": "fb34eb5eb60f41ce1bc23c2bad6ac20de5669f22", - "sha256": "0swyhkzlz1znwddl0jzgxs7xyxz9shji5bnh91p5d5rq74j35f0k" + "commit": "4956606a5455a3968ca10cbdb8de3889e6bd1d85", + "sha256": "1agv0jdfqvyw227mr3c4wnpjby48ccggfjglbidnfl7knd9i982d" }, "stable": { "version": [ @@ -21201,14 +21378,14 @@ "repo": "hlissner/emacs-doom-themes", "unstable": { "version": [ - 20201121, - 2040 + 20210112, + 2045 ], "deps": [ "cl-lib" ], - "commit": "74ebd778571a2ba2a490d45a3f4161ea7251e050", - "sha256": "0wj7ysyyv2ycjiibyd8gda24g2zj1p51sh4ani9r13bs0idnq910" + "commit": "58b57ff4d65a94635d901763bb3ff0e956851ba4", + "sha256": "09z5myr8c5rlj81f980zdmn1m9ric0ndnh7pyzz7k0swqq02w79c" }, "stable": { "version": [ @@ -21656,6 +21833,21 @@ "sha256": "1bv4ivv9j5r0ax4vay1kmwv753y44qj6qprr38yh7ky0fpsml34c" } }, + { + "ename": "dtb-mode", + "commit": "0c33d49a8d79ee60571775fc224453a351b0ff48", + "sha256": "0s8jwmg2kafg31scl04swbx56dnxr2y3j56g95a4k4ffnb0q28n3", + "fetcher": "github", + "repo": "schspa/dtb-mode", + "unstable": { + "version": [ + 20210105, + 1132 + ], + "commit": "7f66de945a0be2be5a26b4619cae097288fb55cd", + "sha256": "1ljmjc0a0ich5wixqq8v0k7gh51va9smq5a340c23zfbia17mmw5" + } + }, { "ename": "dtk", "commit": "39333468fb6e9493deb86511f0032610a412ec8a", @@ -21673,8 +21865,8 @@ "s", "seq" ], - "commit": "282ad6f8eb21b5812521bd9e31d2323b8b9bd9cb", - "sha256": "0yy1jfdh3k0fj7mrl66g6ljp6q77b9xh4xywi80021a15vv1va57" + "commit": "86d1558711cc6e843a1a5470113ff9cb1ad608d8", + "sha256": "03k96gr7hxw76dpykbzjfvrpkl2m1ifm4y0jc9skf2p448fd1ssw" } }, { @@ -21835,8 +22027,8 @@ 20191016, 1241 ], - "commit": "08d27d547f09d86cf5d7230f8a5cbe027708f979", - "sha256": "0h43hcx447vp811jxdgan0b3cz21pzc1azhd47srmyca5jsfpklq" + "commit": "4d53aad7f8b91ec09a7c1691eb5392fa3d077a26", + "sha256": "1ija6kzzfvvx3vvjc7caa9ixf78g5nxb6g9g65y32m8zqdnclh0h" }, "stable": { "version": [ @@ -21928,11 +22120,11 @@ "repo": "dylan-lang/dylan-mode", "unstable": { "version": [ - 20200607, - 1911 + 20201212, + 2106 ], - "commit": "bdccb252dffa99a3a55dce446cc4a7ff4a8dc089", - "sha256": "09dgjwdsni936chj2b8r607bqa2vcav66mb49j5vi2lxiw60sg8m" + "commit": "6277d31e6ec896ceaa9533ed156cece26359ba17", + "sha256": "12wkm04smmd3hgx6k3waa0wma0p8r23nh1ksm484znd7gij2bcrl" } }, { @@ -22507,26 +22699,25 @@ "repo": "joostkremers/ebib", "unstable": { "version": [ - 20201203, - 927 + 20210110, + 1450 ], "deps": [ "parsebib" ], - "commit": "1274cba384a798faab6f6e1f20d349bbf3d48f94", - "sha256": "18ba50j42l4w33i3mbdy4d1izn724pa00zbyrcqd9hrhdma7hnhw" + "commit": "a0c1cd12f2a635c89f4ecad1f3ec5701a78ebd00", + "sha256": "03np9b9xkd2h7c6il2a6vvlpcm80vnaf16ryark9cv9wraa5q4d1" }, "stable": { "version": [ 2, - 27, - 2 + 29 ], "deps": [ "parsebib" ], - "commit": "f6411b41bd612a3747816c40c933c28402dd0b03", - "sha256": "194pzhi8kylawsnc0p02nds9vk7ghw88s1dvd355b7m2vp92cnlf" + "commit": "dd18665862413fc1e1aea0becb318a9e6d281d10", + "sha256": "1d0xnhdcsz2ysq145k2l0f2r4vb0pkai1v6wl6sfba7xi5fc323i" } }, { @@ -22943,16 +23134,16 @@ 20181016, 1125 ], - "commit": "5f6352f98f9795ea0423cb46e9b01dc54e523ab1", - "sha256": "0khf51sbjkqij36l00lby004ca9nb67xvksjnbafzp2bvwcs356j" + "commit": "1632acab5624637031326bd902e2ad7ccb6b4c90", + "sha256": "0m7gj224sqxjjw5sxky92fnrxg9jy4nf33kwf0aqxnfhqlgh545k" }, "stable": { "version": [ 1, - 15 + 16 ], - "commit": "4e959de2f78268b348d2eaac4e43c846792d345f", - "sha256": "0xxby3ghs38i1l7kag12rnzlzcg9297pm8k6kqq3aqzsg9d2950y" + "commit": "1632acab5624637031326bd902e2ad7ccb6b4c90", + "sha256": "0m7gj224sqxjjw5sxky92fnrxg9jy4nf33kwf0aqxnfhqlgh545k" } }, { @@ -22981,14 +23172,14 @@ "repo": "editorconfig/editorconfig-emacs", "unstable": { "version": [ - 20201122, - 1542 + 20210112, + 901 ], "deps": [ "cl-lib" ], - "commit": "da844718bfe1ca51919c63fdffedaba5d0cc1bba", - "sha256": "05ydgbc6dmrs3qfahcg8lmrfm74f5ij9yxn9nm1c3r5zxf759ajy" + "commit": "9dd9789b77521eb9d128f9ebd4cfc7ef45072d0f", + "sha256": "1fi3mn16pw7iflhwsnhvdgzyghzgmv1kxdiw4ycnc7rb4q162an5" }, "stable": { "version": [ @@ -23318,8 +23509,8 @@ 20200107, 2333 ], - "commit": "fc939c84a0ca6e8de844edfdcc0aacdfde577c66", - "sha256": "1r10ivaifxp4200vpmayjrnqanz9sp4bykknj5n2rsx078fsbb90" + "commit": "a874f97af30b59daefaf08e1b4b6846b2214d1a5", + "sha256": "1vqllbkiwjcq3y68cbrvh7xq4r4xsm04qh628sbc95l09gwrsk2x" }, "stable": { "version": [ @@ -23339,8 +23530,8 @@ "repo": "joaotavora/eglot", "unstable": { "version": [ - 20201103, - 1026 + 20210110, + 1646 ], "deps": [ "eldoc", @@ -23349,20 +23540,23 @@ "project", "xref" ], - "commit": "21726416e6e580b20dfa90833c6dab2a8a15ea48", - "sha256": "1al1a7np6127xw4ksqcwpm20v635pb83vfx8mr06wyzdbgls0plb" + "commit": "9da9d69a4296f2f0509c033a0aea263002ae5f4b", + "sha256": "1d5wdf6hyi46csgz4anv5jbgdzp7ys780fd1563lpmi9f0vzbi26" }, "stable": { "version": [ 1, - 6 + 7 ], "deps": [ + "eldoc", "flymake", - "jsonrpc" + "jsonrpc", + "project", + "xref" ], - "commit": "e02479a8c20cd79c3dfeb553deaaecd7d6e97e51", - "sha256": "13r1ysdhnxkc025wypwi6w507v18hm5qf0x29qrycql46f8klrjb" + "commit": "4edd4782f1c16c0516533b52e16b02b772812d16", + "sha256": "17aamcda6h92rrg23vjllwr9qirb4fyxz9x7wcddzi1cawkhsh8k" } }, { @@ -23466,8 +23660,8 @@ "repo": "millejoh/emacs-ipython-notebook", "unstable": { "version": [ - 20201128, - 2101 + 20210102, + 1351 ], "deps": [ "anaphora", @@ -23478,8 +23672,8 @@ "websocket", "with-editor" ], - "commit": "a019ee3994585e4ed4700d2591d693fda3232616", - "sha256": "0lks1pzp1rsb9xrf7fpfb6svzhrqzfmcahzij7psi02kxkq8zjyd" + "commit": "917f2a0b6ca76ed9e966985ca6f19d8b57690d40", + "sha256": "13ifj42v3sgyf7qbd13cyydy9jprlld16n5m172m06cxnixzrqi6" }, "stable": { "version": [ @@ -23645,8 +23839,8 @@ 20200912, 1653 ], - "commit": "6138ce5b0a9df779e33ef42eadc4c15a5cf65f39", - "sha256": "19qfpv0f0xhj04f572a20a0yd7qqhrivxjx9mfp15g43pgdp9ajz" + "commit": "215ff5e56cedcc18866aba6e451b61c06a050e74", + "sha256": "0qnyzvvpvzy3cvnq07yfi1v13i91qwa6xfb4p9j9yr2r3gsgdc1g" }, "stable": { "version": [ @@ -23859,6 +24053,9 @@ 20140111, 2201 ], + "deps": [ + "cl-lib" + ], "commit": "e7c333d4fc31a90f4dca951efe21129164b42605", "sha256": "00wp2swrmalcifx9fsvhz9pgbf6ixvn8dpz1lq6k6pj9h24pq7wh" }, @@ -23868,6 +24065,9 @@ 3, 1 ], + "deps": [ + "cl-lib" + ], "commit": "e96541c1f32e0a3aca4ad0a0eb382bd898250163", "sha256": "1i6j44ssxm1xdg0mf91nh1lnprwsaxsx8vsrf720nan7mfr283h5" } @@ -23948,8 +24148,8 @@ "repo": "rollacaster/elcontext", "unstable": { "version": [ - 20201129, - 1203 + 20210109, + 1238 ], "deps": [ "f", @@ -23958,8 +24158,8 @@ "osx-location", "uuidgen" ], - "commit": "077d36928993950c01bcdb92102a3d3c18d06bac", - "sha256": "1hj3m3y2an0axwkk75af2bd68sqcqf4j0l8dm6392xy4yipz5cj9" + "commit": "2efd3dd8c5176c4f071bb048be6cb069b05d6e9e", + "sha256": "1xi37jpx8wj2cq6n8la1p4wmqzrwga2ixp6rllbnbhq2fpm9fjsr" } }, { @@ -24019,11 +24219,11 @@ "repo": "doublep/eldev", "unstable": { "version": [ - 20201125, - 1919 + 20201223, + 2049 ], - "commit": "aa4360bcd72ca64913b2bad0056b0521d7e125ab", - "sha256": "1mmplyqi6krjgrrlh905pxvjz32d2vdkd3lkz00j82bjgxfxis7f" + "commit": "9ca9abb3edca233ab52ada40531bec4ce3a8e642", + "sha256": "1nz2y9nqyxlb7bsg9chgdjkqmsfklh39shlvqhwl15im144ww9f7" }, "stable": { "version": [ @@ -24175,8 +24375,8 @@ "deps": [ "dash" ], - "commit": "677424d2c6b05e0a3b03eb2e5e4bacef141a0a77", - "sha256": "0wf452gssmpdmqrpi7zf63vkis48yqv0ha5ic5mr7vwyfpx3qmgb" + "commit": "9856ff8e1351086d0d738c1db300af63d6c085ba", + "sha256": "0wfgz1ry1gqwk941fs4i3z8gq6s53v1fr2lwhsi06hvgs8nxaqgm" }, "stable": { "version": [ @@ -24207,6 +24407,21 @@ "sha256": "1qfjk928y8bnx2ksciv0f0ackahj78x3qsr84m9qcvsvlg9cql5p" } }, + { + "ename": "elegant-agenda-mode", + "commit": "74218fda67e2c9c082cc9e28a1ddea8a80cf729f", + "sha256": "0058brrv5kk2gqnj1ii0ahqf6jmjx6zv21mlmzszazqgxlgy3nfg", + "fetcher": "github", + "repo": "justinbarclay/elegant-agenda-mode", + "unstable": { + "version": [ + 20210106, + 1753 + ], + "commit": "6a812d7a22d9240cf5f1f40079b20ac6a083935c", + "sha256": "0ashjhghwdksjwbkhhwn0mjfzpvii05kj8wkgp9b9x13ipalqih3" + } + }, { "ename": "elein", "commit": "855ea20024b606314f8590129259747cac0bcc97", @@ -24254,11 +24469,11 @@ "repo": "skeeto/elfeed", "unstable": { "version": [ - 20201205, - 134 + 20201220, + 1359 ], - "commit": "cc9d3b2196fb1f43e081aac0759678e8c5ae1c3e", - "sha256": "04yp98jpm98c18pmrb07cwvg5xyhskszfwrypxw95m6wmhnij2x5" + "commit": "de4b64b3f5d9fd41d9dc72023632ae535dc912e2", + "sha256": "04x3589jc39j3q2la82cidw3zpph10p5sj57m1kfz3ajyvh7rlm0" }, "stable": { "version": [ @@ -24270,6 +24485,24 @@ "sha256": "0j8a94val4ml7g1vcjgzk1w89h55sxfdrwnncmz6qbh1y2xsz8c5" } }, + { + "ename": "elfeed-dashboard", + "commit": "339127464845e86419c6a88004fc16b60d675f57", + "sha256": "1ykg8gcsl7gf1w2xvd1wm088fw1l1mbsamx7drrvkdnpwxx6xiga", + "fetcher": "github", + "repo": "Manoj321/elfeed-dashboard", + "unstable": { + "version": [ + 20201218, + 347 + ], + "deps": [ + "elfeed" + ], + "commit": "9e8e212da9ea471bdc58bc0a1f5932833029bb38", + "sha256": "182kr8nqrnf1lpiqbl04qm6871yvk0z53dxxdjc2y9xnh6dvx460" + } + }, { "ename": "elfeed-goodies", "commit": "e6ebb8d23961fd9bfe101f7917caa3b405493f31", @@ -24355,26 +24588,26 @@ "repo": "sp1ff/elfeed-score", "unstable": { "version": [ - 20201101, - 1835 + 20201219, + 2359 ], "deps": [ "elfeed" ], - "commit": "2de8fd1f40780282f4c36bc47963f207d2257918", - "sha256": "0i1qh6rjdaqjrfn3n9hyf5f1c9ls0i75xl9pam61l1ngaq1w6r8z" + "commit": "5fff4152bdb2a5f38ab83f7fa6b2943647935f94", + "sha256": "18jwg4a2ssswvbw50z9b84ca76i3q6vmv0ab90p432pjywpkwh73" }, "stable": { "version": [ 0, - 5, - 5 + 6, + 4 ], "deps": [ "elfeed" ], - "commit": "2de8fd1f40780282f4c36bc47963f207d2257918", - "sha256": "0i1qh6rjdaqjrfn3n9hyf5f1c9ls0i75xl9pam61l1ngaq1w6r8z" + "commit": "5fff4152bdb2a5f38ab83f7fa6b2943647935f94", + "sha256": "18jwg4a2ssswvbw50z9b84ca76i3q6vmv0ab90p432pjywpkwh73" } }, { @@ -24392,8 +24625,8 @@ "elfeed", "simple-httpd" ], - "commit": "cc9d3b2196fb1f43e081aac0759678e8c5ae1c3e", - "sha256": "04yp98jpm98c18pmrb07cwvg5xyhskszfwrypxw95m6wmhnij2x5" + "commit": "de4b64b3f5d9fd41d9dc72023632ae535dc912e2", + "sha256": "04x3589jc39j3q2la82cidw3zpph10p5sj57m1kfz3ajyvh7rlm0" }, "stable": { "version": [ @@ -24462,29 +24695,29 @@ "repo": "Wilfred/elisp-def", "unstable": { "version": [ - 20200528, - 633 + 20201215, + 706 ], "deps": [ "dash", "f", "s" ], - "commit": "da1f76391ac0d277e3c5758203e0150f6bae0beb", - "sha256": "17zpil3zgi2j7a63lv5vas3ad6bvh45d9vnf2nb37z3id62rjdkd" + "commit": "679fa7d2d702263b6a55f30a1b8cfbb2fd817549", + "sha256": "0xzb89zk13db34kis68xc2b0b649335hxlnvjr4q1inf3yyzmiav" }, "stable": { "version": [ 1, - 0 + 1 ], "deps": [ "dash", "f", "s" ], - "commit": "5e0d766a5db537f4e7145c2053c22829d736ceba", - "sha256": "0l9az09yw40rr2xrvf01c3idfqplddr1kk880qscnzj8v9p06l4x" + "commit": "e374dfa1724c7ee34376305a94c5a31a052f4e3b", + "sha256": "1zd79yh8d5k2izkvd06splmw8b9pkqjnanzpmszngy83rnqzpyy0" } }, { @@ -24690,14 +24923,14 @@ "repo": "elixir-editors/emacs-elixir", "unstable": { "version": [ - 20201128, - 2057 + 20201216, + 1838 ], "deps": [ "pkg-info" ], - "commit": "b78e7f733be7bf2af35807d759e53b7d52323193", - "sha256": "1jrflpfxxxs9kvrf7qm149wp1br7bb2dxx0pyzdgny3zpif4vakh" + "commit": "9de08c17d54e190d220aa03cca58bd41497f44b6", + "sha256": "0v6w2qkw52zrq0wwly0dli7gii2g64194m5169zslfrhk9rymkyp" }, "stable": { "version": [ @@ -24769,8 +25002,8 @@ "repo": "jcollard/elm-mode", "unstable": { "version": [ - 20200602, - 500 + 20210106, + 228 ], "deps": [ "dash", @@ -24778,8 +25011,8 @@ "reformatter", "s" ], - "commit": "363da4b47c9de1ff091a8caf95fccc34188d59a3", - "sha256": "0nmhf4vql0nkc4igd9mp9v77cb0rsxfawb160f9mcgkdd6ahn3xj" + "commit": "706ffb8779c7ace330d6e020bb046e331266586a", + "sha256": "1rc6qdkiv13ggjwwcgzmri16i2g5x7jwbjc7g8590rndwbg9w9lc" }, "stable": { "version": [ @@ -25068,20 +25301,20 @@ "repo": "redguardtoo/elpa-mirror", "unstable": { "version": [ - 20201119, - 1306 + 20210107, + 219 ], - "commit": "c9d4f69dd0fd7a1be143ef512262d219d7c10eb6", - "sha256": "01gnyan4l04pvvpncpxydramd77v5dxcv8vby4k3lv731qqvp0nv" + "commit": "49088c9bcdd66316a133252cf657187c4064488a", + "sha256": "15n1gbr6h6nm856drss8d1yrc6a3x191bsikhw64zkf7bdlqnxaw" }, "stable": { "version": [ 2, 1, - 2 + 3 ], - "commit": "cdd83ff9965d8df7aaf95e5d7751d2feabbd5493", - "sha256": "0i7ayq9v06l0raw8fw557k159rids9avabbj79yzf6p0daq93xvk" + "commit": "49088c9bcdd66316a133252cf657187c4064488a", + "sha256": "15n1gbr6h6nm856drss8d1yrc6a3x191bsikhw64zkf7bdlqnxaw" } }, { @@ -25367,28 +25600,28 @@ "repo": "aki-s/elscreen-tab", "unstable": { "version": [ - 20190203, - 1619 + 20201229, + 1428 ], "deps": [ "dash", "elscreen" ], - "commit": "51360259326b8b4a5395a9f37dea8bf71ef2428a", - "sha256": "0472mr7r4ac8f16bq7zcybaxdvn2rqgaijckkbrcccivz3v1hky8" + "commit": "5d7a740e47a56365413d75f4f0553de74f5ca198", + "sha256": "1ypk6jj99pb41mi2cwz7jkrzy15mpd3ir176x52riix6737wmgcm" }, "stable": { "version": [ 1, - 0, + 1, 0 ], "deps": [ "dash", "elscreen" ], - "commit": "29d7a65c3e134dd476049c9aebc8d029238e71f7", - "sha256": "0303i61m1qg65d3i3hsy7pzdhw0icpx3im99qkfmy6lxi4h9nd0p" + "commit": "6ad77f972bde05e4e3d44f0d33b68ac41655e5f1", + "sha256": "0az5csc243p48g7mbx5yv16kg3171ykqy1zyw9wi3dwv07gqhyyb" } }, { @@ -25739,6 +25972,48 @@ "sha256": "0x4i2c493zb7cf0cnixsxiwl409faljd5sk05flkq88wjm176dcm" } }, + { + "ename": "embark", + "commit": "a33cbf1d5cb58d2bb7dc535391bb1e1b0e718261", + "sha256": "1pwcgxgmf1pzq76gi4nhb3pq93v0bv48qnn0djdsxkk1snh3v5ni", + "fetcher": "github", + "repo": "oantolin/embark", + "unstable": { + "version": [ + 20210112, + 2324 + ], + "commit": "2e879c2e28e4fe38677a9c2d9ee13f9c7071ef53", + "sha256": "19p10qzcr65n3mvmbnincq86dpyda7b3rb70cf04szpbki7did9g" + }, + "stable": { + "version": [ + 0, + 9 + ], + "commit": "8b1291dfd6187815158299d25dc32b0bbc5af71d", + "sha256": "0b1p3pmdy21bix3fh57c2kb5mp0bmrwdc5q9vfdb9pni9sxw3n6v" + } + }, + { + "ename": "embark-consult", + "commit": "91a9088e0d00483874a6dff4526cdeb6d3f7dba5", + "sha256": "0br3hmr4r3jrkla45byyvxrpv0gxv5lwkk4chiqr1k8j3fbkhwqx", + "fetcher": "github", + "repo": "oantolin/embark", + "unstable": { + "version": [ + 20210113, + 6 + ], + "deps": [ + "consult", + "embark" + ], + "commit": "2e879c2e28e4fe38677a9c2d9ee13f9c7071ef53", + "sha256": "19p10qzcr65n3mvmbnincq86dpyda7b3rb70cf04szpbki7did9g" + } + }, { "ename": "ember-mode", "commit": "9ac1eef4ad87b1b6b6d8e63d340ba03dc013425b", @@ -25891,27 +26166,27 @@ "url": "https://git.savannah.gnu.org/git/emms.git", "unstable": { "version": [ - 20201105, - 2351 + 20210112, + 2108 ], "deps": [ "cl-lib", "seq" ], - "commit": "6995bf6ee0cb87a36d2ac462c329326603f8662e", - "sha256": "0dp1cfgng2nhi1jfp88q2hp1k5xbd72p02prqj6iv3xd8dh1qjgk" + "commit": "d0142e771a4e9bd0d14f01ff020960759039e4d6", + "sha256": "07pv0pbgpmdlh8pzyni6h4bdajydxi7fdphrliq54pq1y9dx9zpn" }, "stable": { "version": [ 6, - 2 + 3 ], "deps": [ "cl-lib", "seq" ], - "commit": "6985faba91b9d48c48da55d2adf4a54ca332c1cb", - "sha256": "0pcg9g11y6mjcc035wqlnn87gh4d1gmaz7dxy9ll3nksj5vwyllm" + "commit": "a2738fe1a9013f641eeba31300e828e88b468b14", + "sha256": "0r2krmrhmwqcw3sdmy7z9rw4l222ja4jz8an8av11qjhpacr8v98" } }, { @@ -26222,15 +26497,15 @@ "repo": "iqbalansari/emacs-emojify", "unstable": { "version": [ - 20201130, - 1116 + 20210108, + 1111 ], "deps": [ "ht", "seq" ], - "commit": "4b96f37f315182f95d4ea9ff33a9b5af9f1b1620", - "sha256": "0xk8yv3icb7cik6qgc8c7v657zyyclbpgyra2djagwj5fnn3266n" + "commit": "cfa00865388809363df3f884b4dd554a5d44f835", + "sha256": "0dw0wkirphwk7iv61b9z5qbg850nnyrivi6d2a80al1nmxkla2sg" }, "stable": { "version": [ @@ -26286,8 +26561,8 @@ "repo": "Wilfred/emacs-refactor", "unstable": { "version": [ - 20200420, - 721 + 20210110, + 1928 ], "deps": [ "cl-lib", @@ -26300,8 +26575,8 @@ "projectile", "s" ], - "commit": "a8f6ab823453decf43f0764d02e554d05009a631", - "sha256": "0d1qd9jzmh0vg1in6q1xjlwq85sgds5lfvyg2wi6z8ci5a7m3ahs" + "commit": "d0540df81c1b5f9f75f69ff92331bbf4b16f2e2c", + "sha256": "1py0140pvi8vyy3digjsz3clp98md05mik8w2xnjb47mb4af39jb" }, "stable": { "version": [ @@ -26391,11 +26666,11 @@ "repo": "zenspider/enhanced-ruby-mode", "unstable": { "version": [ - 20200729, - 634 + 20201222, + 858 ], - "commit": "f0bffbe4b32bb59680f897731169442cce5a1eec", - "sha256": "0zjx6mz8kql9d09rzqircbqd9rcpfsn1k7nz9vwijp59m6mnjw1h" + "commit": "28f30c056cfe2fd7135a71576c183d242dff3b52", + "sha256": "1jslhi3nzn6b16481fkmq1mqrg7f8p5mqi4hqdkywpprqcygrwn1" }, "stable": { "version": [ @@ -26480,14 +26755,14 @@ "repo": "purcell/envrc", "unstable": { "version": [ - 20201114, - 240 + 20210106, + 2359 ], "deps": [ "seq" ], - "commit": "18caf5154f61d7f78cd4719d999e0fa6ef52345f", - "sha256": "09ww340nnnsqxkxr68rnd2h9lyi4sdngry30d57ps4g1p3phdfxd" + "commit": "d1b991f19a4c4781e73bbc3badd368727fae942c", + "sha256": "0ssf9i6iym2rb530k2w5aj392qa73i6p5y0vwrs5qhkv9lagqq7p" }, "stable": { "version": [ @@ -26524,7 +26799,7 @@ "stable": { "version": [ 0, - 5, + 6, 0 ], "deps": [ @@ -26533,8 +26808,8 @@ "magit", "s" ], - "commit": "11c99f7e1e2c1c7d70cbda496cb5b6c7f6e4082a", - "sha256": "1c5kzq3h7gr0459z364dyq5m8vq0ydclw5wphqj9fyg28mxjj6ns" + "commit": "6fa16c4ccaaebaef64dca0d3d29904c45fd6597d", + "sha256": "1y6n5b9pk4c3badzhwm7qv1jw60p34z55ljwhaaqlnmv7nq1qnj3" } }, { @@ -26595,14 +26870,14 @@ "repo": "emacscollective/epkg", "unstable": { "version": [ - 20201203, - 1723 + 20210105, + 1456 ], "deps": [ "closql" ], - "commit": "e5c3541b0a85b3a30ca4eaf578f1d0927e67a10e", - "sha256": "0h90q5g44xkq2r4vrvib2k55b7sm7v5bpksxy5pblv1m2vdsmwvk" + "commit": "94c8389a8b660a68ae7e5458583b06b30ba0edb9", + "sha256": "0r2lvcrs34ixk5xx81b20m0s8x795l7plmry394lgh28gwr437jj" }, "stable": { "version": [ @@ -26748,17 +27023,17 @@ }, { "ename": "eradio", - "commit": "b5c8621acac2bfb7859bf0b830994fc867ecdaa2", - "sha256": "0kan4ia1g9xsb53gkj43c6sn2009a9cm49x2c30ccj2gl999szq2", + "commit": "533c3f130d94335bf18907fefe2b5f1e047cdfbe", + "sha256": "0dxlsikgz1fbsypxxzczp6m4bbqh4kqv0f7w058z2sgzplybq3m4", "fetcher": "github", - "repo": "olav35/eradio", + "repo": "fossegrim/eradio", "unstable": { "version": [ - 20201204, - 2035 + 20201220, + 1010 ], - "commit": "893d499ef67065f56ef464fa8ede2e49d4597fe4", - "sha256": "0sxxkdsnz21pb1cn24c9qf3lypbgvr6z3bqda4k168ml4pbg4rlj" + "commit": "d9dcf81cfc5b0278a2ae51e77b3d44fa50e92ce8", + "sha256": "0i20g5c8sx8m5slldb765lbsxg3qdda1dqjl61s9idncp8dlllcl" } }, { @@ -27236,8 +27511,8 @@ 20200914, 644 ], - "commit": "fdace3b9c446a1d621858dc343f5ed80422d0ea1", - "sha256": "0gx3a0gcr9x9zzgr1xa4lgwl0zwcqhmxn8gscmyspbx6dj4akvg0" + "commit": "c5400349d7d9cb1e54af19bdb2046b52ecada5bc", + "sha256": "02kma8f6v6vxzbfzd2limwabp8a5hzjyg9kfabgp1j0dwvsl64pf" }, "stable": { "version": [ @@ -27258,20 +27533,20 @@ "repo": "erlang/otp", "unstable": { "version": [ - 20201112, - 1915 + 20201215, + 830 ], - "commit": "6b1435b92389bb6ce2d2613b66267c3a48abd0d6", - "sha256": "1xncnyp0904n287633dcl0f8mh5zhhq8shdjnjnb9fklglsbiad8" + "commit": "9072e6f7135d9c38e12cfca742e3312b572a2330", + "sha256": "1qr0sz0yd5zgzh0gyx238s8rs1j7fcl6dbx9kcqfv9awbsgjil7k" }, "stable": { "version": [ 23, - 1, - 5 + 2, + 1 ], - "commit": "600506690a10215a6c7e21eefbf855216cda4c33", - "sha256": "0pxf8h6dd1a1i7vlklc5jqbb6ab91axnldgg3vmvgff6a554xd7x" + "commit": "2c89431fa867d5b1cc56f26a9282bcfb6fcdec58", + "sha256": "1xya7rv9j2528w7x0kivb3zl0rdzdwv82xp22yh7bw22vhfyrk4y" } }, { @@ -28108,11 +28383,11 @@ "repo": "emacs-ess/ESS", "unstable": { "version": [ - 20201208, - 1047 + 20210109, + 1455 ], - "commit": "a23b04599bad080ed15c630469c113b2cb591507", - "sha256": "1y5gvza93wvf5ihncfdvfghz0zgnsmy1pq1rjbi0pv4gc39rifbj" + "commit": "a9e9367976658391126c907b6a5dfc8ad3033ebd", + "sha256": "076aizfh62z85wdqpiir75jc5qvl9n66mhdvfkjaqzlzlisrhqax" }, "stable": { "version": [ @@ -28313,8 +28588,8 @@ "cl-lib", "s" ], - "commit": "0ef8b536253c11da44a6788cc2c6e4d0ba7bbd6e", - "sha256": "1wg3hqq2faq20s5qmccz84jjwyjlygz0rrhz2rawck8srwwz45g5" + "commit": "fa1413737b8d5173a4db8c18d8de9ac798365d53", + "sha256": "1barvpcxw9v0gy16drcrmq2izmasm0icahnzrpyzdfnvcmvp3al7" }, "stable": { "version": [ @@ -28337,11 +28612,11 @@ "repo": "tali713/esxml", "unstable": { "version": [ - 20201130, - 809 + 20201226, + 2146 ], - "commit": "265646046b084621900767682adff6581933f044", - "sha256": "0hmmxchhqg6vipscn9ycbfm5p8bix22hipa2cl155wyqrm0cl7iz" + "commit": "f3d60206eda3cd66bea07c903198d12c4761e326", + "sha256": "1gyydxm1dja4qn9al7b5g9gm7y75qwbn516migxiy20vdzhvksfx" }, "stable": { "version": [ @@ -28353,6 +28628,24 @@ "sha256": "16jn404vfmsvm12wrf8iczqlgdf2iycbxrvalvzxnm2gr5dfzp7z" } }, + { + "ename": "eta", + "commit": "6566b2cf5be53047db6d076d47f29932ba589d09", + "sha256": "06xfkcnjq5w56vbxaq23lqhw2fl2gx2b0wj8ddvii3q3c432y4hq", + "fetcher": "github", + "repo": "zcaudate/eta", + "unstable": { + "version": [ + 20210103, + 645 + ], + "deps": [ + "ht" + ], + "commit": "850c3aff1d7999348aea30530e722e561b672f9c", + "sha256": "1ridnn2b1sp8rp3z9x3igavaq40d66chq25lhfimb6yw84544l0b" + } + }, { "ename": "etable", "commit": "afee0fed80f4fa444116b12653c034d760f5f1fb", @@ -28493,8 +28786,8 @@ "let-alist", "request" ], - "commit": "bfb8b4bfacbf16bb23e09a2b64b5383dd9cb9a47", - "sha256": "0fj9zn136izbq8r1p4b2ca9zzvxw5jl7h2gi4v3wf1wa15fkjzf5" + "commit": "36956db9fa65ff88f3213a80b11f1fad0765d972", + "sha256": "1aqwnfdp3cb7zc38iy37hyvzr0qii182c6w6z7k9rq1arjg1vs2b" } }, { @@ -28672,15 +28965,15 @@ "repo": "emacs-evil/evil", "unstable": { "version": [ - 20201107, - 1830 + 20210109, + 807 ], "deps": [ "cl-lib", "goto-chg" ], - "commit": "d6cf6680ec52733ea78dc530ed75fadc5171c758", - "sha256": "14rl6jx7cj336raxbksh3r2cplyifz8dghdhqvf7h1ng10sd9j6b" + "commit": "cc9d6886b418389752a0591b9fcb270e83234cf9", + "sha256": "14nin675kb2q7fchawj5f2r7bdga9cxp7jbhmaa8vac03zs6xb4x" }, "stable": { "version": [ @@ -28874,15 +29167,15 @@ "repo": "emacs-evil/evil-collection", "unstable": { "version": [ - 20201207, - 1906 + 20210112, + 956 ], "deps": [ "annalist", "evil" ], - "commit": "c9ccc3065f46c1654f1cc0d41cd2f5cff184d273", - "sha256": "1di2kc1ikrcvzf1p4nshlxdq5ndbg209kvhhdq3576xjw0ir90v5" + "commit": "8b1bcd7e49c3fb4ae047d65e22e652a2fb65fa3a", + "sha256": "1jymnkaby6860llr8d2vcyncr073pa12idgskzcvvf8ajxdi8gnl" }, "stable": { "version": [ @@ -29026,6 +29319,10 @@ 20180910, 1234 ], + "deps": [ + "cl-lib", + "evil" + ], "commit": "f4e9116bfbaac8c9d210c17ad488e0982291245f", "sha256": "1whppnlzkjig1yrz0fjvp8cy86215gjahgh88166nzk95wlc3pvf" }, @@ -29468,14 +29765,14 @@ "repo": "redguardtoo/evil-matchit", "unstable": { "version": [ - 20201129, - 1241 + 20210110, + 1011 ], "deps": [ "evil" ], - "commit": "6254f7c81284dd7d8249f81a6601069710432be7", - "sha256": "16s78wg904jrpa0nr9ahf6jpwd2rs9igsn4km24abdhiaxgkw04b" + "commit": "9cdaddd55d28b50d1319baee8038972796e8b178", + "sha256": "15j6li3fnj4q6l54c6r31ng3hrcb703c06c3wk5w4spc4nsgzfvc" }, "stable": { "version": [ @@ -29697,14 +29994,14 @@ "repo": "Somelauw/evil-org-mode", "unstable": { "version": [ - 20200922, - 1933 + 20201222, + 2023 ], "deps": [ "evil" ], - "commit": "a629fb705b0ac704580d5a5833a64716284074e7", - "sha256": "004098pxli12x75j9z0i650rvsf4al7rv3gj6r7mayv29939w8w7" + "commit": "80ef38fb378541937f6ddfe836809e76eda1e355", + "sha256": "19028laqnsl0h5nii7ykfh39srg94zhydhj1rcv52fs9nlg6c6dq" }, "stable": { "version": [ @@ -29733,8 +30030,8 @@ "deps": [ "evil" ], - "commit": "713b898b214a2e5ef2a4189674a2f21e72a55769", - "sha256": "084f6s6vfs5wx1h9wa6xazi9rjx3gfnini71cjqqrn51gahp5c9a" + "commit": "7d21ba71685b4b829c733288865054cc12783b8f", + "sha256": "1087rfvvqv9bp33vjbiwka511iha7468y86xigyvmy5wa729blzd" }, "stable": { "version": [ @@ -30225,8 +30522,8 @@ "deps": [ "evil" ], - "commit": "d6cf6680ec52733ea78dc530ed75fadc5171c758", - "sha256": "14rl6jx7cj336raxbksh3r2cplyifz8dghdhqvf7h1ng10sd9j6b" + "commit": "cc9d6886b418389752a0591b9fcb270e83234cf9", + "sha256": "14nin675kb2q7fchawj5f2r7bdga9cxp7jbhmaa8vac03zs6xb4x" }, "stable": { "version": [ @@ -30423,8 +30720,8 @@ "deps": [ "evil" ], - "commit": "bc25cae9fa5ab0ba1507827f0944f52ce0ca7462", - "sha256": "0xz2yjgz6h2d6h7gfhnvrylh8gj0s7vf45bvqa450j5579gz5sqz" + "commit": "290b5323542c46af364ec485c8ec9000040acf90", + "sha256": "0dr4dc9gbavbfmij399ac09mb109fwpf1xkfk8g4xzmphh4chcnz" } }, { @@ -30821,14 +31118,14 @@ "repo": "purcell/exec-path-from-shell", "unstable": { "version": [ - 20201105, - 2236 + 20201215, + 33 ], "deps": [ "cl-lib" ], - "commit": "4ea306a76f0f8371053dd12d77a3b5b4438974d3", - "sha256": "1s6raprqgyn64fhfbjiyp874nzxysr1ycdm5064721w3iz9rzzw0" + "commit": "d14d6d2966efe5a1409f84a6b9d998268f74761d", + "sha256": "0jgy17s7gkjpdls8ql8qfpncd5vrwm50i3svmnlqic6ds4mkc7s0" }, "stable": { "version": [ @@ -31303,8 +31600,8 @@ 20200327, 1810 ], - "commit": "7a585de01b6fee081eaa167b09d7e12d02cf4149", - "sha256": "11v8rbaiaihpky1m7azbflz77mwg76nbg8hsgybs86wyjk5797dv" + "commit": "d7e517f8e626035df3b63ec6fc07b85d48a996c5", + "sha256": "1br74wkzvq51wqhimsf0c7pzvfpcb80hb47dqjahh938y7x0fkdc" }, "stable": { "version": [ @@ -31496,19 +31793,19 @@ "repo": "WJCFerguson/emacs-faff-theme", "unstable": { "version": [ - 20201208, - 2051 + 20210108, + 1527 ], - "commit": "780460d8cbac2b2cca3d2914db317e1b6b807986", - "sha256": "0x8nqj4szgyvfmjifippri3jqw1kjhjysbqwli1dwi5lq9y4dx5v" + "commit": "e475a0805cd9f4bb0f7397e4d37b868f42d96c00", + "sha256": "1djgrjnqapxjpnjly3mk9xna27fgl53rj257slz2dm3svhyghk2n" }, "stable": { "version": [ 2, - 13 + 16 ], - "commit": "780460d8cbac2b2cca3d2914db317e1b6b807986", - "sha256": "0x8nqj4szgyvfmjifippri3jqw1kjhjysbqwli1dwi5lq9y4dx5v" + "commit": "e475a0805cd9f4bb0f7397e4d37b868f42d96c00", + "sha256": "1djgrjnqapxjpnjly3mk9xna27fgl53rj257slz2dm3svhyghk2n" } }, { @@ -31657,11 +31954,11 @@ "url": "https://framagit.org/steckerhalter/emacs-fasd.git", "unstable": { "version": [ - 20200925, - 1549 + 20210104, + 738 ], - "commit": "38555b501430bb684feb58901ede5347dca287c7", - "sha256": "0wncbk910c7nw3wi602psx5hc6cwzigim5ahyqmkm8gry3vhwbyd" + "commit": "c1d92553f33ebb018135c698db1a6d7f86731a26", + "sha256": "16if5pp2y5nxp37gl29l206dmika75fs2znfpks98iv9zwxpps2w" } }, { @@ -31849,11 +32146,11 @@ "repo": "yqrashawn/fd-dired", "unstable": { "version": [ - 20201124, - 126 + 20201217, + 547 ], - "commit": "313def22c88519e61279e858b4f53bb84a93da36", - "sha256": "0sp3a01qvxrszmcvdzplrhkiax4lhssz4idw78sxmm28j59m8p7x" + "commit": "9fb966df33e7dde9360b8707f7a0197694f46abd", + "sha256": "0gx84kr8fnx8nic3iasqjdi1z6g9shfghin13kh5i9h7d8n83xkq" }, "stable": { "version": [ @@ -31971,11 +32268,11 @@ "repo": "technomancy/fennel-mode", "unstable": { "version": [ - 20201114, - 132 + 20201221, + 543 ], - "commit": "fa56106eeb27de8c8f063f53e139e9bcf6004274", - "sha256": "1ph0x8qp736nr2zs3ffznmxd6hycgk1gv2hpw4kls3qkbcail387" + "commit": "bebc9dd58a845928114082c5ab4538b9869b4fc7", + "sha256": "1dyzfxcaq0gzw957386gapha4kai2y0hv6qqpv7gs4hsilvr8vzb" }, "stable": { "version": [ @@ -32144,11 +32441,11 @@ "repo": "davidshepherd7/fill-function-arguments", "unstable": { "version": [ - 20190710, - 929 + 20201223, + 819 ], - "commit": "295d55d6056e6f79b68283f7631f6438ea8a7b5f", - "sha256": "0nx3krpqn1c0xvr81504m4s84bkxpq42s97igmg6jfsjy7dphp2k" + "commit": "a0a2f8538c80ac08e497dea784fcb90c93ab465b", + "sha256": "0d9scijcr8qj7hqz6iicpkwhfs99ai1qxhx9rbgcs5gdp3xkrhw9" }, "stable": { "version": [ @@ -32270,26 +32567,20 @@ "repo": "technomancy/find-file-in-project", "unstable": { "version": [ - 20201111, - 407 + 20210112, + 532 ], - "deps": [ - "ivy" - ], - "commit": "c4dee37e0454cc169330c251a06e892e4a24f45a", - "sha256": "1yn4hjhaa74b67kfh7n24vic6yz3w0l5w7spchh2lbyr7s8mz90x" + "commit": "c4c7ec595c54c3006299717b1fd83e357864b2d5", + "sha256": "0mhp70h7n6h5s4dls5pslp45xxlrg6bbs7hkpbl3p1jhxx414fwr" }, "stable": { "version": [ - 5, - 7, - 13 + 6, + 0, + 0 ], - "deps": [ - "ivy" - ], - "commit": "c4dee37e0454cc169330c251a06e892e4a24f45a", - "sha256": "1yn4hjhaa74b67kfh7n24vic6yz3w0l5w7spchh2lbyr7s8mz90x" + "commit": "7cc9c05d05da5139e8361b72ca83ca30f44fae7d", + "sha256": "1iagywiihwv96y9p811xlx4cmbsj8h76niymprv1vm4fj6cmihr6" } }, { @@ -32602,11 +32893,11 @@ "repo": "marcowahl/fit-text-scale", "unstable": { "version": [ - 20200701, - 2239 + 20210112, + 2246 ], - "commit": "a87341d4fb2077076eb83af0fb510112900aaebe", - "sha256": "1ayswmb99mimsg6b05nnvm15yg8w2512sv1mjk1nbifz627vgq2x" + "commit": "3f93650a8e8899114ea48048b7962210f1024862", + "sha256": "1yjfvb2vn5pmrq5fw4sfx1lfkbnkwlc160izpvkrf9ww9xsas6al" }, "stable": { "version": [ @@ -32925,27 +33216,27 @@ "repo": "plandes/flex-compile", "unstable": { "version": [ - 20201110, - 122 + 20201218, + 1549 ], "deps": [ "buffer-manage", "dash" ], - "commit": "fdc8bb4d4030abd678d85be153f7849723e0601d", - "sha256": "047nl793p4nimw12hplmpvklbz4wgq1ii7z0jz7yip73sb69dwbq" + "commit": "bc1f0804f089686260b64d5e4dde80c0c9f6df21", + "sha256": "0l9dxh9578gsczhq944id0lacwdr4k7383d5i147v7c6l7s8d7sw" }, "stable": { "version": [ 0, - 6 + 7 ], "deps": [ "buffer-manage", "dash" ], - "commit": "9b09f830897e323b155ef857961ef838fdcf98b9", - "sha256": "17dv0zjma0h62p7nhshb63sigg8nyxhj98dknxjdrq0kgzziqfwi" + "commit": "bc1f0804f089686260b64d5e4dde80c0c9f6df21", + "sha256": "0l9dxh9578gsczhq944id0lacwdr4k7383d5i147v7c6l7s8d7sw" } }, { @@ -33272,8 +33563,8 @@ "repo": "flycheck/flycheck", "unstable": { "version": [ - 20201105, - 423 + 20201228, + 2104 ], "deps": [ "dash", @@ -33281,8 +33572,8 @@ "pkg-info", "seq" ], - "commit": "79c9245ee0bd1722d41c865fef69aa2b1ac08fde", - "sha256": "1rmyr04fikdplc3f1wybw8hqagcwhi5ld30a6aa2fm83iamyxzpf" + "commit": "01396a5eff9fa494285e0d3139838231c05e3948", + "sha256": "0s740sbchr84yddcg0zbs4v4s52smy178f8fq5y07i3vsdnfly8m" }, "stable": { "version": [ @@ -33372,8 +33663,8 @@ "deps": [ "flycheck" ], - "commit": "2e754a1ec8c423a3356443ab8128aa43a1a860b7", - "sha256": "0zhk3lx24rv28qp7qriria5ybbz6ajhwk1ks67srzs9lczvpx63j" + "commit": "99f5fa5b3d2f67807fba67754c77ddc63e9cf441", + "sha256": "09wx5xnjd1rrv1z1pv959wl67ihccvn7rbvjsrldar80jn4nhpmx" } }, { @@ -33733,8 +34024,8 @@ "deps": [ "flycheck" ], - "commit": "f9e4db16ff9fdc6a296363aa35d19cfb4926e472", - "sha256": "1x0lmb48bza2w52s15288hpbipafs87lj5lv0ldd1q4r9yv0i102" + "commit": "15998140b0a4172cd4b4d14d0377fba96a8917fc", + "sha256": "0bdzffwp9hliy9bkvqn1p432yy161g7n7bl814mmi6zj4sfn1sy1" }, "stable": { "version": [ @@ -34174,31 +34465,31 @@ }, { "ename": "flycheck-grammalecte", - "commit": "ddaffa55c1b99cce9097c019efe9a236e2f5a395", - "sha256": "1fblc6mvj9n676ci8597as3rnwh6hmbh2hfwr92gi1dd8ibnd2pn", + "commit": "2e7aee5074faedef4f2b989ffe05995b2f73bfbb", + "sha256": "031x2yh3wdklsm169h34sg0bzpl36nfms129zj4j0z99gw1kda3z", "fetcher": "git", - "url": "https://git.deparis.io/flycheck-grammalecte/", + "url": "https://git.umaneti.net/flycheck-grammalecte/", "unstable": { "version": [ - 20200515, - 1120 + 20210106, + 1422 ], "deps": [ "flycheck" ], - "commit": "8608df3144714d79b93afcfe13400693ed763ed8", - "sha256": "1ibcalim4mp9676szbvrf69nhfbc8vy47anmpqi9idjvdf6bpm75" + "commit": "69f1f276057dadc7aaa8d1669d68ab17986e5b37", + "sha256": "0ih0nakal36is0dci82gx4ijrvnpz9jpw1adprfara2cf8dx4rk6" }, "stable": { "version": [ 1, - 2 + 3 ], "deps": [ "flycheck" ], - "commit": "8608df3144714d79b93afcfe13400693ed763ed8", - "sha256": "1ibcalim4mp9676szbvrf69nhfbc8vy47anmpqi9idjvdf6bpm75" + "commit": "69f1f276057dadc7aaa8d1669d68ab17986e5b37", + "sha256": "0ih0nakal36is0dci82gx4ijrvnpz9jpw1adprfara2cf8dx4rk6" } }, { @@ -34436,8 +34727,8 @@ "deps": [ "flycheck" ], - "commit": "0662c314bd819f9b46f8b2b13f0c650445b3a8c5", - "sha256": "1wlvwi8y5pb3gy3j061v7krxfb1766yw5iika5ymk4zjg9g057vn" + "commit": "8e00b4c5951a9515a450a14aefe92e9f6ddcfbde", + "sha256": "1s505lk5rdc3p40w5g4cpzviaksclvfdisl457gpwjpjv0m7fwd4" } }, { @@ -34795,8 +35086,8 @@ "deps": [ "flycheck" ], - "commit": "cea2b5f58da85a53a846da7e12de32fc146b58be", - "sha256": "09qvg74fyfbhsi748vv4kl7b7vbnc224ark5vllm1ldjhnj2dq19" + "commit": "cf45af2a71f6e7a21e01c556613c5b5cdc983ac9", + "sha256": "1qhix0i8d9qrc0jg3r17v6fmrz07pjw5kk04fm72i8n4c16vb6r1" }, "stable": { "version": [ @@ -35321,20 +35612,20 @@ "flycheck", "rtags" ], - "commit": "63a7d9b733def9fe76568f81321a65a450829575", - "sha256": "1nnjhfz7xm1ax38xkz0jvgzhfczlc4r9xlpzc24sisabkvlkivyw" + "commit": "39339388256df662d0084b4a094d03e52748f9e8", + "sha256": "0wp4mygsxzibra2p3m5rn9m0yd3fscd795k5xa0wxi5pwddv7dlg" }, "stable": { "version": [ - 2, - 38 + 3, + 23 ], "deps": [ "flycheck", "rtags" ], - "commit": "9687ccdb9e539981e7934e768ea5c84464a61139", - "sha256": "1r6l7dgr2ch586zrdi5l8fhdj4qdva8ldz7cjvi2byc2pd2xs8rx" + "commit": "7169ed577d676690a3c6f0025b54e8477d80eacf", + "sha256": "1i94dizg3wvkvq8c2pf5bzkx8zwzcfi4p3l73c779y145bygssnq" } }, { @@ -35480,8 +35771,8 @@ "deps": [ "flycheck" ], - "commit": "3fa1615dd67c53b8ce69b8d3beaf412162b89f65", - "sha256": "1ss7s9s43wy90vjrck3i710blmarys1w4kqs57190nk1igay0lna" + "commit": "77a000095b321ac5d2378cf03ccf2377ccc37f59", + "sha256": "1rp0v681kvdsi84lk4m1lj8bfllwqw1ivl53q3zy34ja186xviww" }, "stable": { "version": [ @@ -35773,11 +36064,11 @@ "repo": "leotaku/flycheck-aspell", "unstable": { "version": [ - 20200902, - 2226 + 20201212, + 1038 ], - "commit": "2e754a1ec8c423a3356443ab8128aa43a1a860b7", - "sha256": "0zhk3lx24rv28qp7qriria5ybbz6ajhwk1ks67srzs9lczvpx63j" + "commit": "99f5fa5b3d2f67807fba67754c77ddc63e9cf441", + "sha256": "09wx5xnjd1rrv1z1pv959wl67ihccvn7rbvjsrldar80jn4nhpmx" } }, { @@ -36615,11 +36906,11 @@ "repo": "jojojames/flymake-racket", "unstable": { "version": [ - 20180912, - 109 + 20210105, + 606 ], - "commit": "d20fa60d66db3f7c2df0133814564ee5b36d2aba", - "sha256": "0fdrlzvznpqfyzy6v7rz4cj83fhdcpyhy37l7jjbb91cqqk2hjc2" + "commit": "3d3e5f2a9ab696670f9e52baa4dde7b84b7542df", + "sha256": "0p935dr74m73w2qs65a2x6chw2zrjq903vdwpmvq3pn2dk4djdf0" } }, { @@ -37453,8 +37744,8 @@ "repo": "magit/forge", "unstable": { "version": [ - 20201209, - 57 + 20210112, + 1148 ], "deps": [ "closql", @@ -37466,8 +37757,8 @@ "markdown-mode", "transient" ], - "commit": "aef11e481988073a0b842ec1fbe40440540db8bd", - "sha256": "0pia5lgfjj04gyq2nvwkfjpwz6l9rrq58mh1j2ql61zzfpfpy46n" + "commit": "47be4eebfa34f87e502aad30f59907ad09552979", + "sha256": "0fbj6css456abzslr09vxr46xikxydjh78kmd0kqfidsp1rx6xsj" }, "stable": { "version": [ @@ -37522,14 +37813,14 @@ "repo": "lassik/emacs-format-all-the-code", "unstable": { "version": [ - 20201123, - 839 + 20210107, + 1425 ], "deps": [ "language-id" ], - "commit": "c4ef7a266838cd3598b6b84e49f2267bb8c64d56", - "sha256": "0bz32aca3kvnpbdfyzarh6wd7i0vwc1z6ighk3dbag4dmkk6l47s" + "commit": "05bd6d0b4aa3d8b22291de5827da64b7be155590", + "sha256": "0fgc0kj9zb0f08i2mcm8ny9f8cqlk9v8185qmc6wmq1i7kaczsvr" }, "stable": { "version": [ @@ -37666,26 +37957,26 @@ "repo": "rnkn/fountain-mode", "unstable": { "version": [ - 20201126, - 716 + 20201226, + 1636 ], "deps": [ "seq" ], - "commit": "d29675d585c12abfa39b8f736384382c7423667d", - "sha256": "0gj5zsa271zwbd8n8l6kkan4x3xxs952hdnr8fghc9sfdizd497k" + "commit": "c7ac77fef71fc20c4c7bee73516ec3c0f656a91a", + "sha256": "00m4x3nylvwsaki6m7gvk1grcaap96rnx10mpsxlapkpbrydhpk0" }, "stable": { "version": [ 3, - 3, - 3 + 4, + 0 ], "deps": [ "seq" ], - "commit": "e46c5ce6b6d97493d73823deec088760446caaa3", - "sha256": "095nrkg2bap6rcg9hy3bh0nis4v2f8w8d9hnahkzsa3njlpqa4ka" + "commit": "3e7ef35fae455f77abb63c34e926c2d0e3070d7f", + "sha256": "161wn66gc2z7fd4f89827dpww6hjmnassbi15yis5rqbklj1h2z6" } }, { @@ -37747,15 +38038,15 @@ "repo": "alphapapa/frame-purpose.el", "unstable": { "version": [ - 20190114, - 1403 + 20201219, + 1340 ], "deps": [ "dash", "dash-functional" ], - "commit": "78f978f13589ec5c5370187c008c8aa83e6e71b4", - "sha256": "0zd981jsbf8fj5a3s7agbg32f6x3s7g87jlz13msgpgmkfhpx3gx" + "commit": "b4a259fa077671e2dcf33d11b42955c91e395b8b", + "sha256": "033vbvv4rrjbsfw0bbhhzx2754r96vy9h4n1y8jmxrqzs9wi5mmq" }, "stable": { "version": [ @@ -37803,8 +38094,8 @@ "dash", "s" ], - "commit": "3cd98cbf80b04ae2ebca1c67c52ba756116f6784", - "sha256": "0smyic3x3b98ipwhb9pw47nnymccy4w7k3dbng2g2zhgwi5pyc1k" + "commit": "187753b095a94f423763fe893408e1318fb7b2dc", + "sha256": "0b4aqilpxby3ac7rmcb4r6yhhlyjkrh47zhrshk8f3ndlyxbz9ch" }, "stable": { "version": [ @@ -37888,15 +38179,15 @@ "url": "https://git.launchpad.net/frecentf.el", "unstable": { "version": [ - 20200624, - 1534 + 20201217, + 2150 ], "deps": [ "frecency", "persist" ], - "commit": "d9d093365ffe12c46e81d16ee81850abd86a2177", - "sha256": "06w17km8hmlr2mrxi26g51mnfvcvilw91b17y52pmx09jgnqa9ac" + "commit": "23a41b8d06b1e345e6b99d1efd38a219f376faff", + "sha256": "1sgsi7kdk3r1lh0iilpyz241qpzj46xp4ifhbszjxs6p2gcwi5y9" } }, { @@ -37985,8 +38276,8 @@ "friendly-tramp-path", "with-shell-interpreter" ], - "commit": "5eecd7bb2c145fd4139f5c2538afc15b821ec102", - "sha256": "15q6q5w1wlda5wmyw8bd9bm7cqan28y5vzzr54rp02gbzc61v399" + "commit": "ad4ac00662829fa18858be02b322753ad091ffe3", + "sha256": "0xf71bvz4252y2jxkn9dpcmg5fvf9i049bbm8bvs7s9f6bcplba6" }, "stable": { "version": [ @@ -38012,15 +38303,16 @@ "repo": "p3r7/friendly-shell", "unstable": { "version": [ - 20200828, - 1218 + 20201212, + 2302 ], "deps": [ "cl-lib", + "dash", "with-shell-interpreter" ], - "commit": "5eecd7bb2c145fd4139f5c2538afc15b821ec102", - "sha256": "15q6q5w1wlda5wmyw8bd9bm7cqan28y5vzzr54rp02gbzc61v399" + "commit": "ad4ac00662829fa18858be02b322753ad091ffe3", + "sha256": "0xf71bvz4252y2jxkn9dpcmg5fvf9i049bbm8bvs7s9f6bcplba6" }, "stable": { "version": [ @@ -38052,8 +38344,8 @@ "dash", "with-shell-interpreter" ], - "commit": "5eecd7bb2c145fd4139f5c2538afc15b821ec102", - "sha256": "15q6q5w1wlda5wmyw8bd9bm7cqan28y5vzzr54rp02gbzc61v399" + "commit": "ad4ac00662829fa18858be02b322753ad091ffe3", + "sha256": "0xf71bvz4252y2jxkn9dpcmg5fvf9i049bbm8bvs7s9f6bcplba6" }, "stable": { "version": [ @@ -38190,16 +38482,15 @@ "repo": "fsharp/emacs-fsharp-mode", "unstable": { "version": [ - 20201208, - 1852 + 20210106, + 1632 ], "deps": [ - "dash", "eglot", "s" ], - "commit": "848ab1578658b97844e671e4f6dbdbd0f67a52ca", - "sha256": "08nyxyxag86nv6cbj9kmyh28kb52h6wf2l1w5qlq9pb00d5ck7h0" + "commit": "e3dccd65a16a1675722b1eed7aca1a729a2fc8ed", + "sha256": "1wyc3lzvjl01cy18cyzq1xms4kid9iqkm31fxrv87awmzpxsvqi5" }, "stable": { "version": [ @@ -38265,8 +38556,8 @@ "deps": [ "cl-lib" ], - "commit": "d78ae037780ee687b654ac0e8fc8f1b954493164", - "sha256": "0q5vff4mw77864igj5mqspdirc1q22rxa9sg7zcm9kskv8c4r4is" + "commit": "71ac38692ace9b90c27f214943e8e77542459b12", + "sha256": "14vcdvzn8pl15zcga925ldbvk7wl6bl6fvl9vd8gmhn6lcgl9b2b" }, "stable": { "version": [ @@ -38600,11 +38891,11 @@ "repo": "bling/fzf.el", "unstable": { "version": [ - 20201201, - 1842 + 20210101, + 1358 ], - "commit": "5d776acca230d781ba7647185b730c686622f876", - "sha256": "0rikrpvgnj1zlcr1fgcmi5xqmhr5xsdpphnqp947jr47q70v0qxx" + "commit": "c84beb96b959c0a20d70dad3bb9e3bc275a5b001", + "sha256": "1qb49qw0lyb2v3yn4jzq8fyq45akrl4078kg2q38g3gh9n29wf52" }, "stable": { "version": [ @@ -38749,11 +39040,11 @@ "repo": "wavexx/gcode-mode.el", "unstable": { "version": [ - 20201011, - 1745 + 20201218, + 2109 ], - "commit": "2192ec743b49d9adfb9116ab410b195725dc886a", - "sha256": "0q53795cprhj8g0dkh2njxmpgpgm7a66g4kqdh179m3xn1kinw50" + "commit": "a1e2c6cbf4e364991ab2209d5cd5a3b698d459d9", + "sha256": "0x6aqh415gbn9x7qyb74zmw5v1ghi7y0lknlbdccxx3j62fmmv8w" } }, { @@ -38764,11 +39055,11 @@ "repo": "godotengine/emacs-gdscript-mode", "unstable": { "version": [ - 20201026, - 1319 + 20210104, + 1919 ], - "commit": "75fe658ab88adbec95f226d24fd9d41c33c68dd5", - "sha256": "1b5k5wrlgsmvlfxy8whc26b462vyqqyk6vgsim00nn8ds0p3810n" + "commit": "b53d56e467a77dfd6c26eec5b78e2241083b1408", + "sha256": "120yjlwf8pyrv5n0bdzxnr2lbppwgir4l8c128jq0cx3mbfamjlz" }, "stable": { "version": [ @@ -38865,11 +39156,11 @@ "repo": "jaor/geiser", "unstable": { "version": [ - 20201202, - 1922 + 20210103, + 953 ], - "commit": "cd00be69b26e6fd748b183d127d8b6f4c91ba622", - "sha256": "0zxaayww9h3alc1h5zlpan28wgva561b4rlb8xk6s6gznpkc3gsp" + "commit": "c7a427edf33ab1ebdca7d3df67d740f97037a950", + "sha256": "0lvgmfwlmyxgbyqlw8c79q79ramws88s746nckz0qyy5fckx0ri3" }, "stable": { "version": [ @@ -39076,8 +39367,8 @@ "repo": "thisch/gerrit.el", "unstable": { "version": [ - 20201114, - 420 + 20201216, + 2245 ], "deps": [ "dash", @@ -39085,8 +39376,8 @@ "magit", "s" ], - "commit": "4c4fbd2b1b38202f701081ea8e892bd8e1a9042f", - "sha256": "1j62kwkpi5v84dvv0amacg1kgxh0asbwfq7iygrh6x3xlj3pg288" + "commit": "00b0201cef4fd2ade108289a8444e1b354a882f6", + "sha256": "0k9bwxqd2zs3bbikqgfnshk7snycfxkzlipih4m0pcnpk1fdp6sv" } }, { @@ -39196,29 +39487,30 @@ "repo": "sigma/gh.el", "unstable": { "version": [ - 20180308, - 2138 + 20201222, + 438 ], "deps": [ "logito", "marshal", "pcache" ], - "commit": "f029fc11f345ef04ab62ee91c38657e29c462fea", - "sha256": "1rgdpi8ld5hi2rp30p8sxbrl6z95nvq80jfp3zsr7cmsniwz0vv3" + "commit": "4b2dd0667ebe9c684c1de5bc96961c2ab0885c07", + "sha256": "11qjlwsiicnmgcy0yvpvagpcl31rrv5qzm18hlh16cyis4z3vngi" }, "stable": { "version": [ + 1, 0, - 10, - 0 + 1 ], "deps": [ "logito", + "marshal", "pcache" ], - "commit": "d0471dd1ba279072cbf8caf6368f3008d7120f25", - "sha256": "099msgsxdqyjrd18jv2mfkpaylp2scq18782354lcpr3fbp8vbsl" + "commit": "fa8d65f4ddc390d256eb76dd3f7e3afae02f23e7", + "sha256": "11qjlwsiicnmgcy0yvpvagpcl31rrv5qzm18hlh16cyis4z3vngi" } }, { @@ -39374,28 +39666,28 @@ "repo": "magit/ghub", "unstable": { "version": [ - 20201208, - 2056 + 20201211, + 1717 ], "deps": [ "let-alist", "treepy" ], - "commit": "a72a171b3c686b98ea2b5db11ad159b0febbf545", - "sha256": "02dh8wyq4ikix7awvib3h2imp6bq25l49yz9n7sjzcvc7b4wf92n" + "commit": "5fae5e31586a11a2025168030e0eb3876502611c", + "sha256": "0i19h9zl8wky1296f0d7dcx9dpfmfixinnaf4l1w1bf4p2xmyfiw" }, "stable": { "version": [ 3, 5, - 0 + 1 ], "deps": [ "let-alist", "treepy" ], - "commit": "47948b2482517d25d7412df34ae8be0a9f475f37", - "sha256": "0lqphkbxrayrcwkwkghfw39wwmc87fdayhl3fy790z7367ilsd1v" + "commit": "5fae5e31586a11a2025168030e0eb3876502611c", + "sha256": "0i19h9zl8wky1296f0d7dcx9dpfmfixinnaf4l1w1bf4p2xmyfiw" } }, { @@ -39725,16 +40017,16 @@ "repo": "magit/magit", "unstable": { "version": [ - 20201115, - 2313 + 20210102, + 1242 ], "deps": [ "dash", "transient", "with-editor" ], - "commit": "9e9f7cb3d260bd14e15307831a2820112c9a77ac", - "sha256": "1snbjfp35znmpa02mq0g75b24if74717f1lbij2h634pm7l5ndi1" + "commit": "25f432551347468ce97b8b03987e59092e91f8f0", + "sha256": "0vxsh75xynpfkfvmyyz8x3rppbwr9rgk7zjfil2af2kzba3p27vl" }, "stable": { "version": [ @@ -39758,34 +40050,32 @@ "repo": "emacs-stuff/git-commit-insert-issue", "unstable": { "version": [ - 20201008, - 955 + 20210107, + 2018 ], "deps": [ "bitbucket", - "github-issues", - "gitlab", + "ghub", "projectile", "s" ], - "commit": "aff85933e35eb36df28720d21f2c5b0a21e3646e", - "sha256": "1xms52rd8si208vlxp00asz5bs8s7ax1mywa1b1856gil0ygr7qh" + "commit": "6cfb8b4b5b23ae881cf3d005da4d7f60d91cd2cd", + "sha256": "02hag6jd55mqf0n90p0hvihmqjvd0cdlpm5knsxk3cll7fp0kkkr" }, "stable": { "version": [ 0, - 3, - 2 + 4, + 1 ], "deps": [ "bitbucket", - "github-issues", - "gitlab", + "ghub", "projectile", "s" ], - "commit": "a3cc128595eb6040713da308ac53c2d20259ca14", - "sha256": "0wxb5dqwvy82vgx6kl8yfg6sn0fi9mi6ghx93hxvayjb6x74p5c3" + "commit": "8a403005ea7f7611bb1bfd829eeefe5a4f10bb40", + "sha256": "0w5xl9r7sbhlwxzg391x50pnsjmjjakn761v3qg0lj6xhv23sdl5" } }, { @@ -39829,11 +40119,11 @@ "repo": "emacsorphanage/git-gutter", "unstable": { "version": [ - 20201203, - 500 + 20210109, + 640 ], - "commit": "56308dc1a1196583791cb24aa86b2669d343b9f3", - "sha256": "1yad6pyskc28hcva9v9v7d6lxp2dg3j0zvmp9pv2qs1105l590ic" + "commit": "5c2ae01562b3ff2def870ed822fd0869326977d6", + "sha256": "0bf12nfyhpvdbxajbwna2z19ii42ih8h4p8jrvgqvh0r3lhavdiw" }, "stable": { "version": [ @@ -39946,16 +40236,16 @@ "repo": "akirak/git-identity.el", "unstable": { "version": [ - 20200810, - 1106 + 20201223, + 948 ], "deps": [ "dash", "f", "hydra" ], - "commit": "6bf8b2cd72061eac5a4d247ba2fabdd8deafdea7", - "sha256": "1p6if6fvz6m7nnd7fl1j2dxg830ax06ln9wvm5anpsdky0lqwqyr" + "commit": "1c35e1693bbb7de41a8aac820a080a7299c13c17", + "sha256": "136j6gbpg8qx6ry1ryh4aal41b3c8pz7g2xisyipjj6p9lmykvqi" }, "stable": { "version": [ @@ -40019,20 +40309,20 @@ "repo": "sshaw/git-link", "unstable": { "version": [ - 20201124, - 155 + 20201214, + 2330 ], - "commit": "151df174a662ae6711f26f160e7759ea014f1a3c", - "sha256": "1h28gn5bvjpxqapd66dzlf1gp1nwpd5iajvv2fbldmrlxrilrcz6" + "commit": "9a3e893751791b17db85d691444e50e346cb2bd3", + "sha256": "1jdgkjiv6pn2whim71fsyfady8lv180y56j9z6bfx3gg3pp2dcbd" }, "stable": { "version": [ 0, 8, - 1 + 2 ], - "commit": "9ac2ed9c73176b8bd014fdbb1c500f44fa02e7de", - "sha256": "1rs7r8ig6xg0r2gcbya0dgbhmwxrhijfz4z5ayw57c2wqq5p6np7" + "commit": "9a3e893751791b17db85d691444e50e346cb2bd3", + "sha256": "1jdgkjiv6pn2whim71fsyfady8lv180y56j9z6bfx3gg3pp2dcbd" } }, { @@ -40322,15 +40612,15 @@ "repo": "dgtized/github-clone.el", "unstable": { "version": [ - 20160623, - 310 + 20210108, + 1920 ], "deps": [ "gh", "magit" ], - "commit": "467b40ca60a6c26257466ebc43c74414df7f19cc", - "sha256": "1gdx9sl509vn4bagqg8vi1wvj1h3ryfvd5ggs2mv9rry6x9dg823" + "commit": "9e40d6d3c6128407d7456bf71c95ad1fbb473b2a", + "sha256": "12mk8cl1mpfapdgxwcm6rlyfg9yyk2wk8hv2486hqb6qb77kdg9i" }, "stable": { "version": [ @@ -40587,6 +40877,24 @@ "sha256": "08hy7rbfazs6grkpk54i82bz0i0c74zcjk96cip8970h6jn3mj72" } }, + { + "ename": "gitignore-snippets", + "commit": "b1d03ee45e45fc6ec30936a5f4bd8b756728da31", + "sha256": "0mj0rrcd65py4w0ahy6l3yx6pmki2lqjhmi8hlxbjv0zzks71wy3", + "fetcher": "github", + "repo": "sei40kr/gitignore-snippets", + "unstable": { + "version": [ + 20201118, + 1551 + ], + "deps": [ + "yasnippet" + ], + "commit": "0de6945ff0fc6943eebcf92d1cbb66b6a1d8fa60", + "sha256": "07qrlyb0n9h3r3b9lvqbd1fi97g3xb27836lgbdpphvvyw92975q" + } + }, { "ename": "gitignore-templates", "commit": "4c9aa71eac2e68eb1925ed00a2c659c4375bd39c", @@ -40904,14 +41212,15 @@ "url": "https://git.launchpad.net/global-tags.el", "unstable": { "version": [ - 20201204, - 1812 + 20201215, + 1900 ], "deps": [ - "async" + "async", + "project" ], - "commit": "5e7738524789d5b95498e3b88621a3877eef5c50", - "sha256": "0qw3zi42kgf73k5f41h6dgssa49qp4bpxvw404f7627k4bxjw700" + "commit": "8f46692749e05113d4d14870dd67c6efa06626c7", + "sha256": "1sjv3ydqv1gv2nqbdwywj52xc2b2ix9f8sjb14022v0bwywk3v2j" } }, { @@ -41140,20 +41449,20 @@ "repo": "emacsorphanage/gnuplot", "unstable": { "version": [ - 20201207, - 1056 + 20210104, + 1052 ], - "commit": "fbb15b630de35b8f1396db6f26e966e9996a5a4f", - "sha256": "153sqq9i0ry4949nc33gl9w95kl1xkzf75djspz3lgfhpcs1rsvq" + "commit": "116cad8e09024223f97e81b0a4503cef20de9bf5", + "sha256": "09y177sq24gs7wwjihw59g0m4n1rv2ws9890ynxjxawv823r0fxm" }, "stable": { "version": [ 0, - 7, + 8, 0 ], - "commit": "aefd4f671485fbcea42511ce79a7a60e5e0110a3", - "sha256": "0bwri3cvm2vr27kyqkrddm28fs08axnd4nm9amfgp54xp20bn4yn" + "commit": "116cad8e09024223f97e81b0a4503cef20de9bf5", + "sha256": "09y177sq24gs7wwjihw59g0m4n1rv2ws9890ynxjxawv823r0fxm" } }, { @@ -41223,8 +41532,8 @@ "repo": "deusmax/gnus-notes", "unstable": { "version": [ - 20201010, - 1228 + 20210103, + 2050 ], "deps": [ "async", @@ -41235,14 +41544,14 @@ "org", "s" ], - "commit": "0c87d6300e50124489f46577776319f8935612c8", - "sha256": "0vjgk9m0pw254ivpr1db6lzs4a5h820pja174vslzh7dbby4rjg5" + "commit": "8cacba653f8912355d45847c5e5376eb83e6898f", + "sha256": "11d98vasn74p7ifyw8qnyzm4na8l0pnbh7a04cr2znnwqjbnzd7s" }, "stable": { "version": [ 0, - 3, - 2 + 4, + 1 ], "deps": [ "async", @@ -41253,8 +41562,8 @@ "org", "s" ], - "commit": "56403ee22242fd479c2aff85f4cf4133e32ca90a", - "sha256": "0g26ygcmbcmxbafvyw04xcqzg2dlava2rqa5m2lv0cxyi6rnvdhj" + "commit": "8cacba653f8912355d45847c5e5376eb83e6898f", + "sha256": "11d98vasn74p7ifyw8qnyzm4na8l0pnbh7a04cr2znnwqjbnzd7s" } }, { @@ -41265,20 +41574,20 @@ "repo": "unhammer/gnus-recent", "unstable": { "version": [ - 20200513, - 1038 + 20210107, + 1346 ], - "commit": "a7b131c5acd10df2949ef4f799af08ded013bc35", - "sha256": "0cx0764ksxmjnryjwya3h49r1c5npyipxv16amad1lyysm4a8q0a" + "commit": "6f13a00c5736c269ed850094cfbc9ea474e24dfe", + "sha256": "1x91da1vb48hn2qqdn144gj9n2sas252llcf5jlqqkl8w5wk6z3i" }, "stable": { "version": [ 0, - 3, + 4, 0 ], - "commit": "a7b131c5acd10df2949ef4f799af08ded013bc35", - "sha256": "0cx0764ksxmjnryjwya3h49r1c5npyipxv16amad1lyysm4a8q0a" + "commit": "6f13a00c5736c269ed850094cfbc9ea474e24dfe", + "sha256": "1x91da1vb48hn2qqdn144gj9n2sas252llcf5jlqqkl8w5wk6z3i" } }, { @@ -42056,20 +42365,20 @@ "repo": "emacsorphanage/god-mode", "unstable": { "version": [ - 20200708, - 2200 + 20210102, + 515 ], - "commit": "f51c8f60e55393cced8cb0bd4a5bf0ab1612caa4", - "sha256": "03n6zhxbgqzlrwl7jkmw3d5b78z2yw3qk8xk20x3wk3j58g9kk0j" + "commit": "02a402b2323e025f77e89cf56d5e678e31a2d2f6", + "sha256": "07xxj1wqxjvzlqp41xj9jz1jfbb8h4578xmbfaqi4isljbadj04k" }, "stable": { "version": [ 2, 17, - 2 + 3 ], - "commit": "2e519312fdef36dea523aa530d134a703d3032a6", - "sha256": "1gnwl81immxdq72hsxgic2631r4jsq9pv5jqh0jzji0q320m9xcl" + "commit": "a72feb2fe8b1a8993c472995d83d9c4718f7a7c1", + "sha256": "1wsc04l5j5a9y5439qx85pcchxjnjgcgwbffw3l30q9zlblvc58b" } }, { @@ -42104,11 +42413,11 @@ "repo": "minad/goggles", "unstable": { "version": [ - 20201205, - 957 + 20210102, + 1843 ], - "commit": "a5c527fbf904bac1c73d8b823202ca1f8a0318c9", - "sha256": "02kc4vjkf15za7mbcaq60125w6qp2gdgy5jia82hhni2q4h76nvn" + "commit": "b85915517d3326ca08af5768df75f0be21c7acc3", + "sha256": "13xrwv2wgmblrdcm656rly3xmlh6wmbwv592vjfrmvchrx39np26" } }, { @@ -42233,6 +42542,30 @@ "sha256": "1f3y46q7djr1riz7x26gc7a1gf9p8sfdrnlqyiwzmi9vkk6h8wdz" } }, + { + "ename": "good-scroll", + "commit": "f51029dd5dbfdcd70befae42e1706a309f642996", + "sha256": "1d0f5v0566n8k3vmh6ddbif6cmii8dk6nszkqjx5za09jilndnc9", + "fetcher": "github", + "repo": "io12/good-scroll.el", + "unstable": { + "version": [ + 20210105, + 903 + ], + "commit": "beac144c37227d23e5ceefb8ce1f45aa484ca5c9", + "sha256": "1yv07vpgqla7nk0imn7dlzsv392jvhk3w63frvhcmijq5ciafc45" + }, + "stable": { + "version": [ + 0, + 3, + 0 + ], + "commit": "a4e80bbf83872fa6c8ace5197693d2f81c4ff1cd", + "sha256": "0bh3wbaiavz033isgl0m7crjhfsb0gxsgsnh54aph7pdrffci0r6" + } + }, { "ename": "google", "commit": "45237d37da807559498bb958184e05109f880070", @@ -42340,8 +42673,8 @@ 20200809, 1430 ], - "commit": "0270073331de9358f29d049a27aa9145697d6dc7", - "sha256": "12nhl3h0f1kmv7ak9lh0p96k0f2284k20ilwn3ail7p2kpp8affk" + "commit": "6f7b75b2aa1ff4e50b6f1579cafddafae5705dbd", + "sha256": "1mcmv1p879nbbhwcimya5licq1mq0wkw5dgil7kqwicz5zzb8p2g" }, "stable": { "version": [ @@ -42619,14 +42952,14 @@ "magit-popup", "s" ], - "commit": "b59d258e04802f51b9c9e733f0febda6a7e1ffa4", - "sha256": "0cbm2bg7r19a8qgbqkpdnv5pdj8lrd0aklssv7lj0bwrm8330jna" + "commit": "50c576d6470e7ab9803ceb466ac34f936971dfc1", + "sha256": "0sria01kapgrxh0jpbgkhr9cr15nji09z1pk4fi650ckipr9alcw" }, "stable": { "version": [ 0, - 23, - 1 + 24, + 0 ], "deps": [ "dash", @@ -42634,8 +42967,8 @@ "magit-popup", "s" ], - "commit": "cfbe1d59b449be9b5378251bc6e52c65bc5e1cbd", - "sha256": "05f6i7v8v9g3w3cmz8c952djl652mj6qcwjx9iyl23h6knd1d9b1" + "commit": "1ec59a7c0002598c594fb58e03907d7ff0ca84b4", + "sha256": "0bz01ybpj1lk7g34n6wwy53aaa4jvs3xhsv50y34z5wvxa8ypdsj" } }, { @@ -43235,8 +43568,8 @@ 20200725, 725 ], - "commit": "91da46f29c455c3cd24b2a6b20ff2db2c4ce8cd6", - "sha256": "08bw5mllx3hsgz8b43dlqdqh2y8asw735623r174prhv84rnq1cq" + "commit": "7a37b76342ebcc30b08b1a6a7d8a043d7fede5b2", + "sha256": "0mcyj8g1d124zpif9m4x911d877fdf3hahdpp76grsvn2qpzq2az" }, "stable": { "version": [ @@ -43367,20 +43700,20 @@ "repo": "ROCKTAKEY/grugru", "unstable": { "version": [ - 20201116, - 430 + 20210112, + 935 ], - "commit": "521d51a02a3fb76b01b35090ee102d0562cba0e4", - "sha256": "105gcz6wmli73s68ha1lqp66p9w8qqfzn190rylrzmwhnar4kkaq" + "commit": "1911cecb0a48e653ed3c99d58a25266f01189722", + "sha256": "1a3pgzj943i0px7lc2qmsm3irybdl664xwvlcjx5axf16pdvlspl" }, "stable": { "version": [ 1, - 14, + 15, 0 ], - "commit": "ce3cc60a3ff3dc2fdc0e3edef7cc51fd4ccb3411", - "sha256": "0g8dz1p4gmd3lq8mjmpim5132l4wvc0r0aymiqffjcbmplsil3qx" + "commit": "e4ccfd416de6a5f70e3f1c718f773b9fa2e8e17a", + "sha256": "1gx1j5l0g7n706ri8rg20v6kkl393gbhh9wx8szzmcw0xjrawdzj" } }, { @@ -43423,14 +43756,14 @@ "repo": "greduan/emacs-theme-gruvbox", "unstable": { "version": [ - 20200807, - 855 + 20210105, + 1136 ], "deps": [ "autothemer" ], - "commit": "d4129a18e6cf476a472b4dc7dc12e8aafc17beca", - "sha256": "1yr8k4ymr8hinq4mrlxngsk39616p7k43n1brqww1xc84b4pvw00" + "commit": "0013c68458ae62fe1dc4bbbb23f6a54a9d41e398", + "sha256": "197r166c4pj0kc2v65rip93pcmmnm4li2jvagvajblang1svr2v0" }, "stable": { "version": [ @@ -43597,14 +43930,14 @@ "repo": "tmalsburg/guess-language.el", "unstable": { "version": [ - 20201124, - 1136 + 20201229, + 1021 ], "deps": [ "cl-lib" ], - "commit": "6aa88cf267593f85b63a770a890bb93f04dd53c2", - "sha256": "0nqqnvdchlflg01if4v5qrc214q8s8d1y02xkal627a0yy4lz2a2" + "commit": "afbc3456ebdfe4bb5f8754a91c8398f8b5b7636c", + "sha256": "1x0f3v98p6lxb31rgkv2a9kr5jqrmvpsa7nqr960s41rkyx4wvi6" } }, { @@ -43679,8 +44012,8 @@ "repo": "alezost/guix.el", "unstable": { "version": [ - 20201025, - 1644 + 20201222, + 907 ], "deps": [ "bui", @@ -43689,8 +44022,8 @@ "geiser", "magit-popup" ], - "commit": "41fba4eec845e050be92bfe76c0f7980bbe821bd", - "sha256": "058s6nq1px7xzcq3mhyh3qfg81kcv579rnih9bha66jidxb7dggj" + "commit": "bb2a0539f8d68b2292b3d0f3174c139b4c304028", + "sha256": "1qf584slf4lqg4qgxj7vblmx0f0jgas03m5cc93a3wfkgkfm19w6" }, "stable": { "version": [ @@ -43838,14 +44171,14 @@ "repo": "abrochard/emacs-habitica", "unstable": { "version": [ - 20190721, - 1620 + 20201210, + 1933 ], "deps": [ "org" ], - "commit": "c45c602ddf9d6cbb0e3baf5cb3e1b7ef90f2759d", - "sha256": "0wgnzn3z98bl28jgqi7xklw9fwx2wwgihj3mq0jb8ah4vn70d0j3" + "commit": "eeb0209fd638192f0b833526deb222f9f61361cb", + "sha256": "10z24hh1g9bf00maiwkjs324da55qqzxrz196rzs53i8lkli0xkd" } }, { @@ -44304,11 +44637,11 @@ "repo": "haskell/haskell-mode", "unstable": { "version": [ - 20201120, - 755 + 20201230, + 342 ], - "commit": "0d39c847fddddc5b76fe3c706e34ab45439760bc", - "sha256": "1rbl2yalcipqp7k2161ygmrmy2dr96jlkyk35jqb5i143gyg59w2" + "commit": "3a019e65b504861d7ea23afbfecd14e5ef63e846", + "sha256": "011x9mp4ili0g9dq6ql33dq7xgv479di37phai0q282hkh5487q0" }, "stable": { "version": [ @@ -44384,8 +44717,8 @@ 20181110, 1859 ], - "commit": "c12337a13ec3a1f04400d0ea51e6120ebe79efb9", - "sha256": "0nk7wm8ns721smbyr7wqxp3s4wbpwg594rcy79ai3fkfy1lb6k4y" + "commit": "f33ba22a6e5060fb14c9fd3dda728d6724f2f9dd", + "sha256": "1lmr8j2g7v3jn2q9h65c7qhzzk4asz0mlqarnl2h0g7xjk0wmi6z" } }, { @@ -44495,11 +44828,11 @@ "repo": "emacsorphanage/haxe-mode", "unstable": { "version": [ - 20201018, - 1357 + 20210108, + 1835 ], - "commit": "5e8183a275babdc7604ae01fc94853e60cb04a32", - "sha256": "0141xzgvv1xzlsaxls4qy9dzl57g1qy5r02x4qydq1p417r30pqc" + "commit": "fb3f3c9514e652f8955a67baeae13de264996860", + "sha256": "05kaxcazbr51chcmlx0fscwk32blj3lzndkr0qpbwfrn8n6mcmrg" }, "stable": { "version": [ @@ -44638,16 +44971,16 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20201117, - 815 + 20210111, + 2036 ], "deps": [ "async", "helm-core", "popup" ], - "commit": "75562eec4879e7f72119ceee40ab5087c705267e", - "sha256": "0d9jgp2pf61w52563dx84226gpskyp0j4rhw0fplcswm6fj0ggd3" + "commit": "77e5a433bfef84992c35f34de8211f84af536a10", + "sha256": "1wiyir8xcpv9wx3j77vz0yca6w40zvirfl97majy98dzmrzkrmzj" }, "stable": { "version": [ @@ -44952,16 +45285,16 @@ "repo": "tmalsburg/helm-bibtex", "unstable": { "version": [ - 20200429, - 1606 + 20201214, + 2111 ], "deps": [ "bibtex-completion", "cl-lib", "helm" ], - "commit": "8d84d8beb3bfafaa060d7e956fcc569ecf010d9c", - "sha256": "1fnhi9dwq99jva3fmjknzlsklpm379ks8am7076xchv35609rgix" + "commit": "94807a3d3419f90b505eddc3272e244475eeb4f2", + "sha256": "08wfvqdzs05bmfjjaqfxffjbl4j7632bnpncs9khrh6lifz03xh2" }, "stable": { "version": [ @@ -45122,15 +45455,15 @@ "repo": "alphapapa/bufler.el", "unstable": { "version": [ - 20200409, - 1253 + 20201216, + 826 ], "deps": [ "bufler", "helm" ], - "commit": "d623605be961316be378ffcd1e97a85069f2f7cc", - "sha256": "0vysawxmzvdnk7s5i44644pvi5y6gxyvbnspn45vl8y0ifddv2g2" + "commit": "097f4349920215bdd829fceabc1afdbba172c32a", + "sha256": "1a4y3p7cwygw09b9f9j9m821aiyjiji55mrm83pvv0xzc9rhwd3h" }, "stable": { "version": [ @@ -45566,14 +45899,14 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20201019, - 715 + 20210105, + 504 ], "deps": [ "async" ], - "commit": "75562eec4879e7f72119ceee40ab5087c705267e", - "sha256": "0d9jgp2pf61w52563dx84226gpskyp0j4rhw0fplcswm6fj0ggd3" + "commit": "77e5a433bfef84992c35f34de8211f84af536a10", + "sha256": "1wiyir8xcpv9wx3j77vz0yca6w40zvirfl97majy98dzmrzkrmzj" }, "stable": { "version": [ @@ -47438,14 +47771,14 @@ "repo": "istib/helm-mode-manager", "unstable": { "version": [ - 20151124, - 938 + 20210108, + 2330 ], "deps": [ "helm" ], - "commit": "5d9c3ca4f8205d07ff4e03c4c3e88f596751c1fc", - "sha256": "1lbxb4vnnv6s46m90qihkj99qdbdylwncwaijjfd7i2kap2ayawh" + "commit": "7df8ed3ddd46a0402838b748d317c01454346164", + "sha256": "0j1mlqdqii6vpp748ydvcs0fxlwkrwf5bsbys8h34rjhb7x75dq4" }, "stable": { "version": [ @@ -47501,14 +47834,14 @@ "repo": "emacs-helm/helm-mu", "unstable": { "version": [ - 20200823, - 1534 + 20210104, + 1214 ], "deps": [ "helm" ], - "commit": "c02bba3c6e52e623951781c98a1cf2ce923439e6", - "sha256": "0i9k03x6gnwfsf3r7m3yhmgf3y9hnc895mv5x4zdv1jazr4gc8gf" + "commit": "392a8c11ab27b625d9f863cdde14e09893401b15", + "sha256": "1l7l75g6sg8fhsd98pfc5qw6w05qq08ilvy6bpaxfz50g81saypg" } }, { @@ -47519,8 +47852,8 @@ "repo": "emacs-helm/helm-navi", "unstable": { "version": [ - 20200401, - 904 + 20201220, + 1823 ], "deps": [ "helm", @@ -47528,8 +47861,8 @@ "navi-mode", "s" ], - "commit": "9bba79119edd8959d26484326c2f6868b7d942c0", - "sha256": "136shiqwr7k95gqywrlqqykx1pgpvyjbfzggwj7q1akqjslxfffn" + "commit": "c5666cc171288d1fa892900ee66fba2a1c892c81", + "sha256": "1vs33n6fga8q4s129pl25bvbka5h0dalmbd8a92d92c9kmmb2m3q" } }, { @@ -47663,8 +47996,8 @@ "repo": "akirak/org-multi-wiki", "unstable": { "version": [ - 20201203, - 847 + 20210111, + 1022 ], "deps": [ "dash", @@ -47673,8 +48006,8 @@ "org-multi-wiki", "org-ql" ], - "commit": "8c0f56703d301cef6c41feb65bf60cc0da1518cb", - "sha256": "0zq8h2bl4gcanqvq730iip93h37rmj1j1w916yqr8rn7wap4pgls" + "commit": "c9005cbe4077cce3743b680dec97c11fa179bb36", + "sha256": "1428lky09cvlqdb8b9zf0x49cxmigrkhvhi391b2mj2qzgmjzcvm" }, "stable": { "version": [ @@ -47708,8 +48041,8 @@ "org-ql", "s" ], - "commit": "1389ccb46be0db0252196f52ee1337dc65dc1a2a", - "sha256": "17smsqy5y2sk3sasgl8dn49nk6s2z8wpr6h1b8g7ds62vc61rz7l" + "commit": "208e103ecc146db71d878df3bd09c6eb60c2797d", + "sha256": "09vdndp3935iy4flynbjpkvfax7vs1ppswl19wx4nn2rp7hdz8kp" }, "stable": { "version": [ @@ -47728,8 +48061,8 @@ "repo": "alphapapa/org-recent-headings", "unstable": { "version": [ - 20201118, - 737 + 20201213, + 837 ], "deps": [ "dash", @@ -47738,8 +48071,8 @@ "org-recent-headings", "s" ], - "commit": "11430626f7d83b8eafbaf34bb5eeeff458035187", - "sha256": "1z2rad7rvh125a91z2xnwd3zslqs2v5bwhb8p0lvnw3b7z6qy91y" + "commit": "5da516a1586675992c0122ed32978c18dda06318", + "sha256": "1xnhahgs1q6y7w0rrc33qbkdagjm6q71a4i0msi4gsfnnzwn4vam" } }, { @@ -48062,16 +48395,16 @@ "repo": "bbatsov/helm-projectile", "unstable": { "version": [ - 20201208, - 1837 + 20201217, + 908 ], "deps": [ "cl-lib", "helm", "projectile" ], - "commit": "e3d541c59505cd8c5843bbcf237c12e3d3288990", - "sha256": "171cykxdn38245fjphx9qx3zcdgrc5wvnp89bq53pvqjqk6b32d2" + "commit": "58123f14c392021714fc5d23b9f95c7f95ce07f1", + "sha256": "0w8267l136l9ci9b0rz0mshh8wcj7za9izvm64ks17lr8avm2his" }, "stable": { "version": [ @@ -48460,20 +48793,20 @@ "helm", "rtags" ], - "commit": "63a7d9b733def9fe76568f81321a65a450829575", - "sha256": "1nnjhfz7xm1ax38xkz0jvgzhfczlc4r9xlpzc24sisabkvlkivyw" + "commit": "39339388256df662d0084b4a094d03e52748f9e8", + "sha256": "0wp4mygsxzibra2p3m5rn9m0yd3fscd795k5xa0wxi5pwddv7dlg" }, "stable": { "version": [ - 2, - 38 + 3, + 23 ], "deps": [ "helm", "rtags" ], - "commit": "9687ccdb9e539981e7934e768ea5c84464a61139", - "sha256": "1r6l7dgr2ch586zrdi5l8fhdj4qdva8ldz7cjvi2byc2pd2xs8rx" + "commit": "7169ed577d676690a3c6f0025b54e8477d80eacf", + "sha256": "1i94dizg3wvkvq8c2pf5bzkx8zwzcfi4p3l73c779y145bygssnq" } }, { @@ -48580,14 +48913,14 @@ }, { "ename": "helm-searcher", - "commit": "aafea99e6091ada48708db7a42ffe13effa17a41", - "sha256": "063453h22811inn55z09kfz5a42lzjw3mv41ghwypnqgy0lnjs0r", + "commit": "9ff049623a64ceba2299f43babaede205ccdd67a", + "sha256": "06nhvkf1k7mrbdxliikn5q8kp6nw77zn2f1xifpzp2c6mwxm4idg", "fetcher": "github", - "repo": "jcs-elpa/helm-searcher", + "repo": "emacs-helm/helm-searcher", "unstable": { "version": [ - 20201001, - 838 + 20210108, + 1818 ], "deps": [ "f", @@ -48595,8 +48928,8 @@ "s", "searcher" ], - "commit": "7b3016faeca201843d849c00d11665a90c1709fb", - "sha256": "07whjqsi7jq4i3fypzasq2iivsj025x3701wfgsj2f02xyvgfk4p" + "commit": "d27c7cafc79b6e5e11881014eee9817e3897762f", + "sha256": "117m2c8ms66gqwsxgdwywx166bif2i2y5dgq1w0yw5j4h02q3ji7" }, "stable": { "version": [ @@ -48641,25 +48974,25 @@ "repo": "emacs-helm/helm-selector", "unstable": { "version": [ - 20200808, - 858 + 20201219, + 1639 ], "deps": [ "helm" ], - "commit": "a1920a885830693dd9b1d6af3dd60f1915d976f4", - "sha256": "134rxm4zicn565k3q5q15iiqcvcyiq6lsvmsqr53ifjjbq8pd9y6" + "commit": "6a943b9952c749c2a83c284cfcf5b56f5f6622ad", + "sha256": "0msc8byspjd0ygpbnxkiv2g9qv5kxpcp2vh2sjg7yxrfbishj8hq" }, "stable": { "version": [ 0, - 3 + 5 ], "deps": [ "helm" ], - "commit": "a1920a885830693dd9b1d6af3dd60f1915d976f4", - "sha256": "134rxm4zicn565k3q5q15iiqcvcyiq6lsvmsqr53ifjjbq8pd9y6" + "commit": "7542a6dffe338db8109b0233e4d4c8f4b22354a0", + "sha256": "1cv659sqmrvk316fp7mjc58vvbcg1j6s2q4rwgqrpbyszrxl3i63" } }, { @@ -48874,15 +49207,44 @@ "repo": "jamesnvc/helm-switch-shell", "unstable": { "version": [ - 20200831, - 1329 + 20210106, + 1810 ], "deps": [ - "dash", "helm" ], - "commit": "e9927561cfc62c8427e9d10526518d643f4bc26d", - "sha256": "1l4irigdirvbn1xh0py135q5463z8axdh0y0icvzinn7z1z0141j" + "commit": "9de26ca41e94c095c978ed920009de0280f5c4ec", + "sha256": "190bmn04g4nlcrpnsm465vyp0zcd2ryh13bc14f7w1vrmnw6ll1j" + } + }, + { + "ename": "helm-switch-to-repl", + "commit": "55308cb8dbedc704ab78aa7e1b08b3f34e316118", + "sha256": "1kb8my50ay6g8i6iq5kg9pp6yar3xx7yhqj1q1xzjhlm00dbcr8a", + "fetcher": "github", + "repo": "emacs-helm/helm-switch-to-repl", + "unstable": { + "version": [ + 20201214, + 1216 + ], + "deps": [ + "helm" + ], + "commit": "e6cae905c9d224bcca02437696afae7d6633c4a9", + "sha256": "1zwzpar34b98p0fiwy9q1bxrb67nv79pv9cz4kmyypclrmrhgqa2" + }, + "stable": { + "version": [ + 0, + 1, + 1 + ], + "deps": [ + "helm" + ], + "commit": "e6cae905c9d224bcca02437696afae7d6633c4a9", + "sha256": "1zwzpar34b98p0fiwy9q1bxrb67nv79pv9cz4kmyypclrmrhgqa2" } }, { @@ -49766,11 +50128,11 @@ "repo": "dgutov/highlight-escape-sequences", "unstable": { "version": [ - 20171117, - 1237 + 20201214, + 1730 ], - "commit": "08d846a7aa748209d65fecead2b6a766c3e5cb41", - "sha256": "05mc3w1f8ykf80914a1yddw6j8cmh0h57llm07xh89s53821v2is" + "commit": "fae976568c04b6fe8a9f2d854c8fe23b357a6878", + "sha256": "1a1jcmfijipxl5frkbliav06qd0r5yb1l7a8w2gx33bc6q09yahx" } }, { @@ -49895,23 +50257,26 @@ "repo": "tsdh/highlight-parentheses.el", "unstable": { "version": [ - 20200920, - 832 + 20210104, + 1625 + ], + "deps": [ + "cl-lib" + ], + "commit": "013ac29970d5209c14da0af6c5bb9bbbcca40c02", + "sha256": "01p8j248vcmbcdskr3146ag979c0m74gddy3yzp3x8hz9a4mgqx0" + }, + "stable": { + "version": [ + 2, + 0, + 0 ], "deps": [ "cl-lib" ], "commit": "e18f2c2b240d7586ff7ffdc2881079e2dd8944ca", "sha256": "1agdsqn3g18s9nicp23mlwvshxqskkbfzs9lgjmzxsa5628rxixc" - }, - "stable": { - "version": [ - 1, - 1, - 0 - ], - "commit": "5aa800a68e3795716de1e7f2722e836781190f31", - "sha256": "08ld4wjrkd77cghmrf1n2hn2yzid7bdqwz6b1rzzqaiwxl138iy9" } }, { @@ -50334,11 +50699,11 @@ "repo": "tarsius/hl-todo", "unstable": { "version": [ - 20200813, - 1419 + 20210105, + 744 ], - "commit": "0598b98f63b623c1778cbd2e2f60b774b7a311b9", - "sha256": "1y57q3s6hrjd134mkwzcz5ii2jichvccpvc6bcj1vfl4d7yrxsal" + "commit": "9661a462d86b22293caaa4c3d94f971a15dbf1d5", + "sha256": "0w0l990wqdv9fdxf8a02fx0aj6ffp83jp3zh81jf3j5i0l75xfkr" }, "stable": { "version": [ @@ -50358,16 +50723,16 @@ "repo": "narendraj9/hledger-mode", "unstable": { "version": [ - 20191012, - 1046 + 20201212, + 2121 ], "deps": [ "async", "htmlize", "popup" ], - "commit": "8206f3c5d8e5b9b084733879191ec3724b60494d", - "sha256": "16y3xb8kc4j72gv1d59g4jw21q53i474hiksa6dzxvxkzva4wzf9" + "commit": "bad680b33c2ca20a6088986a10735a5df3cb9996", + "sha256": "0vd2fn011l5iqi1ja8j3l0wq90wr70b8dk75mh3xrrl8jp55xwxl" } }, { @@ -50741,14 +51106,14 @@ "url": "https://scm.osdn.net/gitroot/howm/howm.git", "unstable": { "version": [ - 20201015, - 1133 + 20201231, + 1042 ], "deps": [ "cl-lib" ], - "commit": "ce77dfbb50815d55081b2462541954d11a76f308", - "sha256": "05z1473s63qjsn41y32zk9hli9mcy4nfx3iv79a6yl5yp4x0ivg6" + "commit": "c11a6b7ad3d683d2910572fa7f2a87ffdf503317", + "sha256": "0fjwgxaf7lzby6hz96xz9b97mv4vhczs14cq6j6vxygrkykafwam" } }, { @@ -51081,11 +51446,11 @@ "repo": "humanoid-colors/emacs-humanoid-themes", "unstable": { "version": [ - 20201208, - 1625 + 20210106, + 2120 ], - "commit": "d1d12a59daa4ba542854e9b59d73f1763219fb54", - "sha256": "1mxjx5ib5xzjmr0dbk0bsjr8mkxiq4yjwrhfah3xw7lm51j0d74n" + "commit": "c1f9989bcecd1d93a2d7469d6b5c812bd35fe0f3", + "sha256": "180hj0ww30kjr4nrnlp5r59xr6qpi7xhw19cp91syqhclzylkpqr" } }, { @@ -51199,11 +51564,11 @@ "repo": "Riyyi/emacs-hybrid-reverse", "unstable": { "version": [ - 20200830, - 331 + 20210107, + 1435 ], - "commit": "a28044a1dc42920b5107986dadef8322877c3d81", - "sha256": "0fxybcmnrgfa0xyj562nng6ff6jm9dk78bwdc8vs6ffyccd6dmij" + "commit": "30072ccf0a49bb47360dce12965db1b1e2f2b57d", + "sha256": "16p7k3lwlykpgrc2pkbdx7z209bzps9ksizjhgbcfbkn67xpavka" } }, { @@ -51635,19 +52000,19 @@ "repo": "oantolin/icomplete-vertical", "unstable": { "version": [ - 20201206, - 759 + 20210105, + 500 ], - "commit": "ef12199fdf53c4a0fe7691850e133dabba58b147", - "sha256": "04zfnjyy7v4acgh6bhkd71vmwhsghjncjyvn945jm6lx473k3j35" + "commit": "288166784de29db2f5f61722cc11151deca3f34a", + "sha256": "0if14qqixkkg8nfikfzhqqnsclhkbx4n8885gm9w0zlibkcj65pk" }, "stable": { "version": [ 0, - 2 + 3 ], - "commit": "2c328a19f617b538986977a897d3af051ae7f355", - "sha256": "1bm02qd71r3j35b861rgbxkv3kcmg2458c70vwfaw9sjjba0ssng" + "commit": "a4c65f213bd3d8be94fe8cb28ecf7ff3b44405d1", + "sha256": "02v190pb802vck7di39jyf5prvmfsgcxln8mgwsls2b4clx9da97" } }, { @@ -51658,28 +52023,27 @@ "repo": "plandes/icsql", "unstable": { "version": [ - 20201110, - 512 + 20201219, + 224 ], "deps": [ "buffer-manage", "choice-program" ], - "commit": "155051cc4122cc71e5b72c1e330b5115fe2dfde5", - "sha256": "04jrlkks3s3yri86vy3dk173yz76h4bnbk0vmby5lqpx2r1zvgh5" + "commit": "dbe4957b08b70e157a05a7d8db84a51aeb9400ca", + "sha256": "0rkby252cyj2dxs89qgifysk615wwr0cm4zdnmamyyqcwpc4c223" }, "stable": { "version": [ 0, - 0, - 1 + 2 ], "deps": [ "buffer-manage", "choice-program" ], - "commit": "415cfb7473537ea5a0f156c35f4dce0d2c49d124", - "sha256": "078cgskyzdx6sbyry20p6f3y5idd8fi8jhgm5bcyrj626nkf60f2" + "commit": "f4d40c48f770df68540934a3dfabd07d0edc081c", + "sha256": "1j70rljhmzh6ixxbf4cj8qkjkkl4l2mlj45dqls3b5h6kzxwg5cy" } }, { @@ -51869,16 +52233,16 @@ "repo": "DarwinAwardWinner/ido-completing-read-plus", "unstable": { "version": [ - 20200520, - 1535 + 20210103, + 1621 ], "deps": [ "cl-lib", "memoize", "seq" ], - "commit": "b9ca2566b867464c25b720e2148d240961c110e7", - "sha256": "1vkk311wghhnkmybv3h5a6hf3vxlgy03iqzwl6xyxdw3hgip8in5" + "commit": "f91e5a1d696c13db029fd62806fe9bcb9702be26", + "sha256": "0yhl6wa3fkvkfx87vhjl8dhn3igzrilby2vxhllgysb5kbd9adzc" }, "stable": { "version": [ @@ -52243,11 +52607,11 @@ "repo": "victorhge/iedit", "unstable": { "version": [ - 20201125, - 342 + 20210111, + 1147 ], - "commit": "313997a2504e565a34e84fdb59a5a7ffd223328b", - "sha256": "08gaz5ia70hg66a4i4gdyhnaggpf7m39gqilbx88dy9ccg4lywa0" + "commit": "6eb7ff8191b1d271b6f4e7feb608dc72ca203a39", + "sha256": "158fhgvrgm5q1krsc7cssj0ylzkyjrvivpwpdymb45d0x9msin61" }, "stable": { "version": [ @@ -52306,11 +52670,11 @@ "repo": "rolandwalker/ignoramus", "unstable": { "version": [ - 20160414, - 1409 + 20210108, + 2026 ], - "commit": "b37dc7c07edd9d152436f9019c14df158b599be3", - "sha256": "1b4r4h8yrs8zkyr1hnnx2wjrmm39wbqxfhyxpjb5pxi4zk3fh4rj" + "commit": "6a6578816ff7af8851f7db36b3465fa9d2c759c5", + "sha256": "04cl5y3ba8bip7fkz8dsxx5m7dc97qx6214fgxj16i0kyxpwfnbl" }, "stable": { "version": [ @@ -52535,6 +52899,30 @@ "sha256": "0g2gb7jrys81kphmhlvhvzwl8l75j36y6pqjawh9wmzzwad876q5" } }, + { + "ename": "imenu-extra", + "commit": "2ea763417b23f39519ea1bd333f407909293ebd9", + "sha256": "0w5w7pjh41xv1lwd157s4vk20w0hf3m2pl92kr0b2andrsakg783", + "fetcher": "github", + "repo": "redguardtoo/imenu-extra", + "unstable": { + "version": [ + 20201229, + 1035 + ], + "commit": "68b0aaaefc18b267e4e383df36a8dfb7448bc83c", + "sha256": "1mf8drn4acf0r2sjpprbjp4wv75jzy5j8b9p9snnj3991fk66yby" + }, + "stable": { + "version": [ + 0, + 0, + 1 + ], + "commit": "2bd6d28fa25ef8f9b477cad9d8d806ce9fbb9d52", + "sha256": "1qhpwdz3x7gd484db5x6gf777snxfpvk3f08dr0qbr5n1743qky7" + } + }, { "ename": "imenu-list", "commit": "86dea881a5b2d0458449f08b82c2614ad9abd068", @@ -52619,20 +53007,20 @@ "repo": "petergardfjall/emacs-immaterial-theme", "unstable": { "version": [ - 20201202, - 1801 + 20210109, + 1653 ], - "commit": "d965b9b29e1ade16aa92b934ac888616409a95c5", - "sha256": "1s72wj88rannk0byz3689yff3wks4k80xcxkcmh1c4gja6zbj99r" + "commit": "288b367ea0efccd5e98efbdf925591ffc989a654", + "sha256": "1y62yfg67lnbc89l6k4gw5fibahnlpn23g415a6zdk2vz89n6y0k" }, "stable": { "version": [ 0, - 6, - 2 + 7, + 0 ], - "commit": "fe8875f116cead5bff6befb6c77a6ebb6f20a490", - "sha256": "0gpy8pvaw66pvas1j1f74aa6fyxm1z43kqlan297l4jviw4rh4gs" + "commit": "288b367ea0efccd5e98efbdf925591ffc989a654", + "sha256": "1y62yfg67lnbc89l6k4gw5fibahnlpn23g415a6zdk2vz89n6y0k" } }, { @@ -52856,20 +53244,20 @@ "repo": "terlar/indent-info.el", "unstable": { "version": [ - 20200128, - 1052 + 20210111, + 745 ], - "commit": "9548f14e7f0f7220d6cd1b8e88756b89fc57c471", - "sha256": "1hmrg1pyzcldqh858j3zpb6y0ap4x6142m56pas0lyh65d2wzggk" + "commit": "05a787afeb9946714d8b0c724868195a678db49e", + "sha256": "14qjl5mw7zmrc2zbcid1alqh67f704giq49qyda8q8n82vi6g8a9" }, "stable": { "version": [ + 1, 0, - 2, 0 ], - "commit": "4713807101bff80b342d0f847da9006be001141b", - "sha256": "0sprs5qgrbvgxd6k8h8fyybxdxfd3izhvk1bh13vg238qbn09a26" + "commit": "05a787afeb9946714d8b0c724868195a678db49e", + "sha256": "14qjl5mw7zmrc2zbcid1alqh67f704giq49qyda8q8n82vi6g8a9" } }, { @@ -53094,11 +53482,11 @@ "repo": "nonsequitur/inf-ruby", "unstable": { "version": [ - 20200826, - 1458 + 20201228, + 1237 ], - "commit": "b0124578db09b64902c8ca981b02e74bec92ef36", - "sha256": "0ivk80x6sfns4c5s21sr4qrg1zysqq3s8rz2hx8s55f7jbq4k51w" + "commit": "1fc972ecda6a2155806d75d202481327703a0681", + "sha256": "0kv98g30kgfpyd0ghiclk17ac2y17j7bi77km59gdw5i1b5k1a27" }, "stable": { "version": [ @@ -53118,14 +53506,14 @@ "repo": "eschulte/jump.el", "unstable": { "version": [ - 20170913, - 916 + 20210110, + 2237 ], "deps": [ "cl-lib" ], - "commit": "e4f1372cf22e811faca52fc86bdd5d817498a4d8", - "sha256": "0354b64drvv8v5g13xy5nc1klwx4hldz1b5mf1frhna7h2dqz0j9" + "commit": "55caa66a7cc6e0b1a76143fd40eff38416928941", + "sha256": "03fh7i6blnbc0zbmp83fk095hr3q4fdvrvfxad74zghcbc2nk7b7" }, "stable": { "version": [ @@ -53420,11 +53808,11 @@ "repo": "ideasman42/emacs-inkpot-theme", "unstable": { "version": [ - 20201103, - 139 + 20210109, + 1112 ], - "commit": "fb5839ae7307a56a7f4d7ba71d05c9ecc051927e", - "sha256": "1qxmzdhyhh71yivdix1qg4d4wkv7rzfljby03bliv46165i2xsms" + "commit": "c010838770bad2a3fc37fcb5c497bf92d5aca27b", + "sha256": "0pf5q4n4p2szmvgh6zcfb7q9p58fac3k5bvqxq6wialz14m779lr" } }, { @@ -54098,11 +54486,11 @@ "repo": "ffevotte/isend-mode.el", "unstable": { "version": [ - 20190201, - 832 + 20210106, + 1506 ], - "commit": "38ace354d579eb364d4f95b9ea16081c171ea604", - "sha256": "19k09bxlq5a8ba3xb68cajv66qad5vh12k391kq9wcj4gjlniyjv" + "commit": "ea855f63be7febc15bd08aec6229fab9407734fb", + "sha256": "0avxwa6d19i5fns27vwpl95f5iawm710jlnrihi5i21ndfm4mcyw" } }, { @@ -54169,6 +54557,21 @@ "sha256": "0gslib1r9d9dqd9r89dfg8npkybjw2bjdrbs0z2qcnfa82x4fq4z" } }, + { + "ename": "ispc-mode", + "commit": "9ab74e0895e879a54fe80eb3afccd1c4cd9ef70d", + "sha256": "09ljkivgfwxx2c24a8c1080rzlimf5bck4rp41lgc5pk02p0y9rd", + "fetcher": "github", + "repo": "Munksgaard/ispc-mode", + "unstable": { + "version": [ + 20201215, + 852 + ], + "commit": "722fdc45da2714f8fe0757968589cdb5ccacc8a0", + "sha256": "1lv15306wy34a1l3a2lq2y8lpzg1jna0rzdjbddhdanf2b0rhs83" + } + }, { "ename": "iss-mode", "commit": "ecc9f618b9f065f593b91c1c1221a550ab752bae", @@ -54245,14 +54648,14 @@ "repo": "thierryvolpiatto/iterator", "unstable": { "version": [ - 20170207, - 838 + 20210109, + 1859 ], "deps": [ "cl-lib" ], - "commit": "9da54f9aed945b46866782cdf962c9e530419297", - "sha256": "0r50hdyr9s18p7ggiyv36g011jgg47bgszvjgcmpp23rz131mxyw" + "commit": "b514d4d1d0167e5973afbc93a34070d1aa967d82", + "sha256": "1xl64lz45z4s90ja96wy86qyr0xahk96v5rdvbamnfgw32kkxyh5" } }, { @@ -54300,11 +54703,11 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20201110, - 1021 + 20210109, + 1619 ], - "commit": "ae9b121b834a68d11f79ca27b1e5c8790149ba2f", - "sha256": "160qs77b4sama17h8lhq60my44qh4c9aj1qj9jk02n64jfn44fm6" + "commit": "8f2abd397dba7205806cfa1615624adc8cd5145f", + "sha256": "0x3yy8q9ixs4zn7slhm7rskcvlsa8fdd2pbc075rx7chqzv6vc58" }, "stable": { "version": [ @@ -54331,8 +54734,8 @@ "avy", "ivy" ], - "commit": "ae9b121b834a68d11f79ca27b1e5c8790149ba2f", - "sha256": "160qs77b4sama17h8lhq60my44qh4c9aj1qj9jk02n64jfn44fm6" + "commit": "8f2abd397dba7205806cfa1615624adc8cd5145f", + "sha256": "0x3yy8q9ixs4zn7slhm7rskcvlsa8fdd2pbc075rx7chqzv6vc58" } }, { @@ -54351,8 +54754,8 @@ "cl-lib", "swiper" ], - "commit": "8d84d8beb3bfafaa060d7e956fcc569ecf010d9c", - "sha256": "1fnhi9dwq99jva3fmjknzlsklpm379ks8am7076xchv35609rgix" + "commit": "94807a3d3419f90b505eddc3272e244475eeb4f2", + "sha256": "08wfvqdzs05bmfjjaqfxffjbl4j7632bnpncs9khrh6lifz03xh2" }, "stable": { "version": [ @@ -54549,6 +54952,40 @@ "sha256": "0ffajyl21vz4662738dgga140yrkkcfynhhnk42fzrn5z5zqlwp1" } }, + { + "ename": "ivy-file-preview", + "commit": "545ee0661388b1535ea58b526cecdd06b30ad48d", + "sha256": "0svw9sdlblv4m0dylrlyr0rvddhj1kkrilf3316vqsngnrwqj3vp", + "fetcher": "github", + "repo": "jcs-elpa/ivy-file-preview", + "unstable": { + "version": [ + 20201127, + 629 + ], + "deps": [ + "f", + "ivy", + "s" + ], + "commit": "402b4b915bc7daa14d16a48b47a2e453ce80dcd3", + "sha256": "0z1czcqdkdxn1c92fa640idacc8c1b9ykfk8r94d2174ki93jd9j" + }, + "stable": { + "version": [ + 0, + 4, + 3 + ], + "deps": [ + "f", + "ivy", + "s" + ], + "commit": "4727ac0dd7906807c830e2abdd3e081812105ad6", + "sha256": "0ia0a38f3dfiqz96fc405ax472zyj92yn61qs9mpdz8ql3pv2dwb" + } + }, { "ename": "ivy-fuz", "commit": "578c150cb8f61058f8003554d372944a990d7a7d", @@ -54652,8 +55089,8 @@ "hydra", "ivy" ], - "commit": "ae9b121b834a68d11f79ca27b1e5c8790149ba2f", - "sha256": "160qs77b4sama17h8lhq60my44qh4c9aj1qj9jk02n64jfn44fm6" + "commit": "8f2abd397dba7205806cfa1615624adc8cd5145f", + "sha256": "0x3yy8q9ixs4zn7slhm7rskcvlsa8fdd2pbc075rx7chqzv6vc58" }, "stable": { "version": [ @@ -54688,6 +55125,38 @@ "sha256": "034ln7r1fgsgpxgmk4iv08pkjkxmdc0c0q44hqv2ryb1zkbwija1" } }, + { + "ename": "ivy-migemo", + "commit": "78f8c6a81e7e8428b125413148e6bfe64c8ec7bd", + "sha256": "0ri8l9rb605fx5hhnpkmyaqflz73n4jsmzb42fsspwg2rwjfyafl", + "fetcher": "github", + "repo": "ROCKTAKEY/ivy-migemo", + "unstable": { + "version": [ + 20201214, + 307 + ], + "deps": [ + "ivy", + "migemo" + ], + "commit": "0f34245dae2f890c685be767e3dc2c24c65dfe28", + "sha256": "1d013v8nb83g1hkfc5vxf5y7m67fi8346xm912hyyy03871kb469" + }, + "stable": { + "version": [ + 1, + 1, + 0 + ], + "deps": [ + "ivy", + "migemo" + ], + "commit": "fc4f44750466ba9385e3313c85adf83a8e55a1fa", + "sha256": "0lax72js89k5g007ra6ngy9gnphny4bgjggnl9d3j3mizw9cynvn" + } + }, { "ename": "ivy-mpdel", "commit": "bb25443752e18e47afc63d5497cc5052c388a607", @@ -54787,28 +55256,28 @@ "repo": "tumashu/ivy-posframe", "unstable": { "version": [ - 20201124, - 404 + 20201215, + 39 ], "deps": [ "ivy", "posframe" ], - "commit": "08a00b81747c6b623dd1adc7491a1e2a4c3a3d2a", - "sha256": "123dmbdkad5dbsrgj75n6zpxrqzz5fbkqpa5il64zmlcq6jqy1kr" + "commit": "83047d440ff132d5a45acde5955f71853edeefb9", + "sha256": "03n1a9qzc53i3lx0ywayc2v8p0n4ydl7ly6niaj9dj15ik0nzxsp" }, "stable": { "version": [ 0, 5, - 3 + 5 ], "deps": [ "ivy", "posframe" ], - "commit": "08a00b81747c6b623dd1adc7491a1e2a4c3a3d2a", - "sha256": "123dmbdkad5dbsrgj75n6zpxrqzz5fbkqpa5il64zmlcq6jqy1kr" + "commit": "83047d440ff132d5a45acde5955f71853edeefb9", + "sha256": "03n1a9qzc53i3lx0ywayc2v8p0n4ydl7ly6niaj9dj15ik0nzxsp" } }, { @@ -54826,8 +55295,8 @@ "ivy", "prescient" ], - "commit": "5d139e5b1fe03ccaddff8c250ab8e9d795071b95", - "sha256": "11hqy8chh29lrzk04dp3rwkvf4bj0xvg9hli3w1zx968x98lfvj0" + "commit": "42adc802d3ba6c747bed7ea1f6e3ffbbdfc7192d", + "sha256": "0v12707jwd2ynk8gp3shgarl6yp3ynal7d4jzds6l2lknr6wi50w" }, "stable": { "version": [ @@ -54881,14 +55350,14 @@ "repo": "Yevgnen/ivy-rich", "unstable": { "version": [ - 20201125, - 433 + 20201224, + 4 ], "deps": [ "ivy" ], - "commit": "c0a164ce42920df0629c87dad5ea1bddc79ceac3", - "sha256": "0x2q8gnj324rnpyryyas8b1b9sljsp7dgwhn9rv0kjn99j1vaphy" + "commit": "f8a1f5c90d2a113b597ef5903634c089fce3365b", + "sha256": "1bwp26b7m3zxl00ywav7qfwlszxms3z00w41k7nvb47a4s0cvffl" }, "stable": { "version": [ @@ -54918,20 +55387,20 @@ "ivy", "rtags" ], - "commit": "63a7d9b733def9fe76568f81321a65a450829575", - "sha256": "1nnjhfz7xm1ax38xkz0jvgzhfczlc4r9xlpzc24sisabkvlkivyw" + "commit": "39339388256df662d0084b4a094d03e52748f9e8", + "sha256": "0wp4mygsxzibra2p3m5rn9m0yd3fscd795k5xa0wxi5pwddv7dlg" }, "stable": { "version": [ - 2, - 38 + 3, + 23 ], "deps": [ "ivy", "rtags" ], - "commit": "9687ccdb9e539981e7934e768ea5c84464a61139", - "sha256": "1r6l7dgr2ch586zrdi5l8fhdj4qdva8ldz7cjvi2byc2pd2xs8rx" + "commit": "7169ed577d676690a3c6f0025b54e8477d80eacf", + "sha256": "1i94dizg3wvkvq8c2pf5bzkx8zwzcfi4p3l73c779y145bygssnq" } }, { @@ -55275,14 +55744,14 @@ "repo": "emacs-jp/japanese-holidays", "unstable": { "version": [ - 20201030, - 1053 + 20201229, + 755 ], "deps": [ "cl-lib" ], - "commit": "a2075babc0c2158addeb6bec4fb4be604e75002c", - "sha256": "1n91ipgzxy36s96lv9w36wqcmlw2mjcm7rkj61z1infpgs6rm3v9" + "commit": "324b6bf2f55ec050bef49e001caedaabaf4fa35d", + "sha256": "1bxbxczsf0b7jiim2anjh16h243khyrcv4k07qg0yy8c9zrl18aq" } }, { @@ -55949,11 +56418,11 @@ "repo": "Michael-Allan/Java_Mode_Tamed", "unstable": { "version": [ - 20201205, - 2020 + 20201222, + 2048 ], - "commit": "c2a0d4aec1dfbc12a705dccb42d33259aef63690", - "sha256": "05hyjiskwki6ls2yfbjvs9qdy2d4zzkm9rhd5v4lpdpshdgdwj07" + "commit": "b028d48d22d72129b2b49d93298f65241de206fd", + "sha256": "1ky9vzvib9rp4k46n80hilff2yr5bg4ham1cx083nnaxshdw8n3b" } }, { @@ -55983,11 +56452,11 @@ "repo": "SebastianMeisel/journalctl-mode", "unstable": { "version": [ - 20200607, - 754 + 20201217, + 1625 ], - "commit": "e8e057f387266d1c11f8fb68023ceb9607404948", - "sha256": "1l9z0w8kb15vsfpwcl9rfhflmvy8illsssfqjxkcwl8d7pzfhm8n" + "commit": "c5bca1a5f42d2fe2a00fdf52fe480137ace971d3", + "sha256": "0m0d5kzw5cymnmnilm688dlkhh0g64d7qyv3nd6mxbgrii559v9r" }, "stable": { "version": [ @@ -56128,8 +56597,8 @@ 20180807, 1352 ], - "commit": "9d9460b17f59e4e7a4e5cc34576ba72b2ca56524", - "sha256": "0hil53mzvxz71l908wm6804migvm7hm0nwm8qpyy2dgnfzl996hg" + "commit": "aa3175de7da5e1243dfd1ad9a17dcfe85740415e", + "sha256": "01z9nq0yp47qcps7c7jzrb1fmcx7qbhr7ig056sp20jq7yn9r3dy" }, "stable": { "version": [ @@ -56319,24 +56788,24 @@ "repo": "mooz/js2-mode", "unstable": { "version": [ - 20201209, - 225 + 20201220, + 1718 ], "deps": [ "cl-lib" ], - "commit": "f7816bdd3e8e84ed1d64b6a13c9ba488363b7e91", - "sha256": "05j8m9bdljzscbl343aqqfcjxgvshrlygzqhd2wi8089mby7f59y" + "commit": "29979e5f3301796ba606759e39ee0b1b6a2a24f3", + "sha256": "1pvdzinxfd3b08d92cf5v0fk88dzlyw5r5g3hablh6gcfc9i57xx" }, "stable": { "version": [ - 20190219 + 20201220 ], "deps": [ "cl-lib" ], - "commit": "ed955e7f1608cfd2d2713129d65f5fd734842ae4", - "sha256": "0766bbr4piia9vfr4ivd2gwi8dxah654adv6h28ylz4q8xmfzm1b" + "commit": "f9564769e81c612b43f99802d6a2c5e6b1f8fca4", + "sha256": "00jy917cgp5xzfgs4m0spzlbqk8mg63layin8nxmn2647rfjnik4" } }, { @@ -56877,25 +57346,25 @@ "repo": "shg/julia-vterm.el", "unstable": { "version": [ - 20201202, - 845 + 20201223, + 741 ], "deps": [ "vterm" ], - "commit": "d4d5c50f1542d1128e334d32ce385891e0dca7e2", - "sha256": "13qi16qlx860a32bfl4l68szfgphv1vr0cd2k151zvqhdsf7fach" + "commit": "06ee45bffb6e711278a7af5207899d2b4316706c", + "sha256": "1zwhbwm285gqy9bfhlaaa9wp3lz959i3d1s41msl70jxbrnjz7pw" }, "stable": { "version": [ 0, - 10 + 11 ], "deps": [ "vterm" ], - "commit": "f7b790a49e15644fd4f36795efa412c59e33e49b", - "sha256": "1bdhkcy6pr387wf3s13vd5gyy4dwwy8blfdpk83lf7hw7grqzph2" + "commit": "06ee45bffb6e711278a7af5207899d2b4316706c", + "sha256": "1zwhbwm285gqy9bfhlaaa9wp3lz959i3d1s41msl70jxbrnjz7pw" } }, { @@ -56933,8 +57402,8 @@ "findr", "inflections" ], - "commit": "e4f1372cf22e811faca52fc86bdd5d817498a4d8", - "sha256": "0354b64drvv8v5g13xy5nc1klwx4hldz1b5mf1frhna7h2dqz0j9" + "commit": "55caa66a7cc6e0b1a76143fd40eff38416928941", + "sha256": "03fh7i6blnbc0zbmp83fk095hr3q4fdvrvfxad74zghcbc2nk7b7" }, "stable": { "version": [ @@ -57096,14 +57565,14 @@ "repo": "TxGVNN/emacs-k8s-mode", "unstable": { "version": [ - 20200803, - 1549 + 20201215, + 1656 ], "deps": [ "yaml-mode" ], - "commit": "bbceb256bf2b6a56c86aed5963102fb4898aadc9", - "sha256": "16ani1d8c9g3v1zpwxcczm5bjbkymd86i1adcvc9xcaz46v7sb3w" + "commit": "9d37e64b9bdc1778481687ca04e2ee5a96bc0474", + "sha256": "054pasvk5xspdndsc962z3d3z5jgpd28ysag5pxa8dfh3yz65vxq" }, "stable": { "version": [ @@ -57273,8 +57742,8 @@ "deps": [ "s" ], - "commit": "52b5be3277f65cb5ca657973e9bd7f914b996356", - "sha256": "0g2n73habz844f64p1x66kxpvadv9zh34qmxhql34c3w2sm9mmwf" + "commit": "af4034dcace867c4ede0bce744d5cb888c318f23", + "sha256": "1f352ki7yj1z5y2xpbmwi5f8nim208nbg94760hzwkjkk7rd71k2" } }, { @@ -57293,8 +57762,8 @@ "kaleidoscope", "s" ], - "commit": "52b5be3277f65cb5ca657973e9bd7f914b996356", - "sha256": "0g2n73habz844f64p1x66kxpvadv9zh34qmxhql34c3w2sm9mmwf" + "commit": "af4034dcace867c4ede0bce744d5cb888c318f23", + "sha256": "1f352ki7yj1z5y2xpbmwi5f8nim208nbg94760hzwkjkk7rd71k2" } }, { @@ -57387,28 +57856,28 @@ "repo": "ogdenwebb/emacs-kaolin-themes", "unstable": { "version": [ - 20201206, - 914 + 20201216, + 717 ], "deps": [ "autothemer", "cl-lib" ], - "commit": "65e46afa01da61506d23c16266fa4065b25aec6d", - "sha256": "1k3l0yvhkwv0mjhb0z5bq187ixw7avsjf2hyqq46dn3lp1xm0wyv" + "commit": "5694f27f6e17bf2d840fa04728d392b5df77e20c", + "sha256": "1c5hdr654f012lj3ssxsavbnij0i109nykwcsgl2c2pb9yxqr5rw" }, "stable": { "version": [ 1, 6, - 1 + 2 ], "deps": [ "autothemer", "cl-lib" ], - "commit": "1114a8d84b60eaf8cadb628a29e0eaf6b5906f69", - "sha256": "0hfwxbsq9hdascs2vp56yw86m0ha9148596gm27yiqm6di51l571" + "commit": "5694f27f6e17bf2d840fa04728d392b5df77e20c", + "sha256": "1c5hdr654f012lj3ssxsavbnij0i109nykwcsgl2c2pb9yxqr5rw" } }, { @@ -57513,20 +57982,20 @@ "repo": "ifosch/keepass-mode", "unstable": { "version": [ - 20200928, - 2106 + 20210110, + 630 ], - "commit": "f3d19b4deb14053785e660f1995994581536aecc", - "sha256": "1krxcsvqf9f4mi34kn2zgf82z1cai133sgpfa70f5wczqibhfg99" + "commit": "515343a7667b2bf4253309449f65a6eb94933df7", + "sha256": "0hrq521swki0l3m81wk9p7pkc5j99li441fb75h7107v6z0p102c" }, "stable": { "version": [ 0, 0, - 2 + 4 ], - "commit": "ad073eaab4f96ca033df023736d195dc3b611897", - "sha256": "0kyzcws47ch3pkw9ijb4gjr7l933c3mrxc9bsy16ddkc8dvl7yng" + "commit": "cd07542fddf080927eae927afdcf62be1b087503", + "sha256": "1syz5yds6b59dws6f8b6az2ng7czwnq34izlc9y25c8ng94bynm5" } }, { @@ -57600,11 +58069,11 @@ "repo": "emacsorphanage/key-chord", "unstable": { "version": [ - 20160227, - 1238 + 20201222, + 2030 ], - "commit": "72443e9ff3c4f1c3ccaced3130236801efde3d83", - "sha256": "15jfpysyydcvqlvdannxg2s4bh4i9z6i950fad1qlq43jfmq7k55" + "commit": "7f7fd7c5bd2b996fa054779357e1566f7989e07d", + "sha256": "18bmd510yksskf67hj7jzcqh8gaaf1ipq044k49469p5f8fhjy2l" }, "stable": { "version": [ @@ -57721,11 +58190,11 @@ "repo": "tarsius/keycast", "unstable": { "version": [ - 20201117, - 1552 + 20201229, + 1006 ], - "commit": "16d9961d15536054632be1eff75fd0fb1a4420f8", - "sha256": "1g9arjdhdpvsw47ny9gi5k758ya37yza4mr0rhbf02yvrqyfsrgr" + "commit": "b02892ec77ef8b83c957652c7859422d6f46e051", + "sha256": "1ggl3k2h9y7nwhawpddl0mk9smm5bpq42fyp1pq64z67zrb4217l" }, "stable": { "version": [ @@ -58156,19 +58625,17 @@ 20180702, 2029 ], - "commit": "e16794aa7d98f5b849222971f7a56fe8ab9a3d9c", - "sha256": "0chaxdwnbxwn0zx6w8bwx6sc3adb835rbppmbj1mdbj2hcx0zghd" + "commit": "554e98fb7c439d182a48dce7276932139a325f02", + "sha256": "1afw0ak9wbf63d23sfp78a9ial4vscw002p0b47rlsq895j683cb" }, "stable": { "version": [ 2, 0, - 0, - -1, - 4 + 0 ], - "commit": "d74461b200a2182581f229082b041a4c70a673cb", - "sha256": "0ymk105915prhmxw3nmmgr756hzxpxwds860x5aim8jjgxhky446" + "commit": "dedcb6bcabe3d8d6758dcee607e8c33b174d782b", + "sha256": "1v3iqh13lcn9jvw8ldymyp35j1k44wrqnhdmki220q940mar5cgz" } }, { @@ -58179,15 +58646,14 @@ "repo": "stardiviner/kiwix.el", "unstable": { "version": [ - 20200714, - 1357 + 20210105, + 1152 ], "deps": [ - "cl-lib", "request" ], - "commit": "cb3e2531a55b896b9b41f38f97a597c26433da8e", - "sha256": "077bng1mwnd1m8ji4a44aqly94d07k09grwk0j52kgxlhvv3p3di" + "commit": "6c64f7b0776d346561bc887042a6cc5053b723f1", + "sha256": "03b94jzmw12q71j8nv09nk9g00asc0a2g2sj2x534syifhksb9dr" }, "stable": { "version": [ @@ -58444,8 +58910,8 @@ "repo": "abrochard/kubel", "unstable": { "version": [ - 20201111, - 1534 + 20201223, + 1730 ], "deps": [ "dash", @@ -58453,8 +58919,8 @@ "transient", "yaml-mode" ], - "commit": "746c990d05af22942136b8f9ebe91e40ec044cec", - "sha256": "0rh6m7zp4phq826lxy950hwc1z8p8f3hrjwyny0r8wvwvqw4iwdd" + "commit": "9b1aa4830a4470ff8f11ecc0bc80b5cdaee473fd", + "sha256": "1n1z8w2n7raxfmd4la2knzvs9vnprcdhxjlp21k6r757k75na3qn" }, "stable": { "version": [ @@ -58479,15 +58945,15 @@ "repo": "abrochard/kubel", "unstable": { "version": [ - 20200312, - 1349 + 20201223, + 1657 ], "deps": [ "evil", "kubel" ], - "commit": "746c990d05af22942136b8f9ebe91e40ec044cec", - "sha256": "0rh6m7zp4phq826lxy950hwc1z8p8f3hrjwyny0r8wvwvqw4iwdd" + "commit": "9b1aa4830a4470ff8f11ecc0bc80b5cdaee473fd", + "sha256": "1n1z8w2n7raxfmd4la2knzvs9vnprcdhxjlp21k6r757k75na3qn" }, "stable": { "version": [ @@ -58741,16 +59207,16 @@ "repo": "Deducteam/lambdapi", "unstable": { "version": [ - 20200929, - 612 + 20210108, + 1551 ], "deps": [ "eglot", "highlight", "math-symbol-lists" ], - "commit": "75449aee4864f46dd75738206ce01ea6f54c1d7f", - "sha256": "0r1mrhvqs65a2v12ymp88viz6dybrrac4ym98g0alnmr19nqrq2d" + "commit": "038bc694d45d5069cf3488682928d2315f0b0d17", + "sha256": "081sik013p310idnnv60qa5pm1qpk61ibqhchsvindp5ssw7ln8w" } }, { @@ -58857,26 +59323,25 @@ "repo": "lassik/emacs-language-id", "unstable": { "version": [ - 20201109, - 1105 + 20201217, + 1633 ], "deps": [ "cl-lib" ], - "commit": "61907b8a8d2ad99ba184ae9611b51dc2a48ac2c1", - "sha256": "0vp9mm9gvwpabz9vz14vji2wmg2wdbzysarffq3n1i6044axdqzn" + "commit": "3f0ad28202207c266bd8fc7904b224db69ceccf6", + "sha256": "0rc6hggdqpfvcq1kx6ghnzqzn7842331b0qfng42vmqn44mk9skx" }, "stable": { "version": [ 0, - 8, - 1 + 10 ], "deps": [ "cl-lib" ], - "commit": "61907b8a8d2ad99ba184ae9611b51dc2a48ac2c1", - "sha256": "0vp9mm9gvwpabz9vz14vji2wmg2wdbzysarffq3n1i6044axdqzn" + "commit": "3f0ad28202207c266bd8fc7904b224db69ceccf6", + "sha256": "0rc6hggdqpfvcq1kx6ghnzqzn7842331b0qfng42vmqn44mk9skx" } }, { @@ -58917,8 +59382,8 @@ "repo": "mihaiolteanu/lastfm.el", "unstable": { "version": [ - 20201203, - 640 + 20201212, + 836 ], "deps": [ "anaphora", @@ -58927,8 +59392,8 @@ "request", "s" ], - "commit": "31e889476d2003da9a088848ca5212efceb31f7e", - "sha256": "0wp9j6ly3sylxzsbmx5nfj815wp2gxh8q5ka1xmfi2y1gy0vw3gp" + "commit": "276c30a16518e545c95b7d693bada3ec01ddd207", + "sha256": "1n58f9g5xgicmm9j3bdik1cpqcfs0pjrxqwnb1sfrck9c00482fk" }, "stable": { "version": [ @@ -58954,15 +59419,15 @@ "repo": "storvik/emacs-lastpass", "unstable": { "version": [ - 20200320, - 2117 + 20201229, + 2109 ], "deps": [ "cl-lib", "seq" ], - "commit": "ac472f844bd1e109c62479253cbc40bb5e50ed8f", - "sha256": "07bh7vkczzpmkbxxyyhn912b5rjm975a49y1bq08y4vd006zsq4x" + "commit": "2366de7824b6c5f8e9ec6811d219dc06794e8630", + "sha256": "065nbgcs2q8gqw8alfa6lbabma6vjsqzl4mfkfpzgk566dan2x1p" } }, { @@ -59157,14 +59622,14 @@ "url": "https://git.sr.ht/~lthms/colorless-themes.el", "unstable": { "version": [ - 20200213, - 2057 + 20201222, + 1627 ], "deps": [ "colorless-themes" ], - "commit": "46d477ec5a367beb6c8e75e017ae2c3a31250136", - "sha256": "05c6ywzamnq1frmb8i07wjxrncl3fpkmns8dnc3v8si234gq3m72" + "commit": "c1ed1e12541cf05cc6c558d23c089c07e10b54d7", + "sha256": "02ai9yf7h3i81bg01w8nb4kdrcc94ladbrkw9vg3p40w617mjwlb" }, "stable": { "version": [ @@ -59210,14 +59675,14 @@ "repo": "jyp/lcr", "unstable": { "version": [ - 20180902, - 1919 + 20210102, + 853 ], "deps": [ "dash" ], - "commit": "c14f40692292d59156c7632dbdd2867c086aa75f", - "sha256": "0mc55icihxqpf8b05990q1lc2nj2792wcgyr73xsiqx0963sjaj8" + "commit": "493424dab9f374c5521dca8714481b70cb3c3cfd", + "sha256": "10nvxvyz39avlf2v8d4lag7jj5x5p8jvaqiww7x6l992mp11hahk" }, "stable": { "version": [ @@ -59239,11 +59704,11 @@ "repo": "conao3/leaf.el", "unstable": { "version": [ - 20201110, - 1438 + 20201211, + 412 ], - "commit": "ef0bdd4c4b51e498ad20ded8db3bd81f57054966", - "sha256": "1x1192vs2gss5j0722bw296xsvs25f12m3faj26z5dsb8kiw7kgv" + "commit": "e0c4b7484ab6ee3bbf8413f620ccb99af4328d2f", + "sha256": "18vvl8a5s6n1kky31n0khnv89998gy9vfk5q58hkczfadc6nss76" }, "stable": { "version": [ @@ -59283,14 +59748,14 @@ "repo": "conao3/leaf-keywords.el", "unstable": { "version": [ - 20201204, - 1545 + 20201225, + 1406 ], "deps": [ "leaf" ], - "commit": "ef29ef0ba8e0168f14e5255491c1668673269a37", - "sha256": "04z5yir4anb0wnspya8gvcbyjb1qnwkhvb4k0dxivh5l35vr34v8" + "commit": "64c5ec702b7fab83770c539d613d8c6610ce510d", + "sha256": "0qzmnbn91g02g6vhilx081xz6n1360a3ri64rpzd8avcgmrkb1vr" }, "stable": { "version": [ @@ -59451,14 +59916,14 @@ "repo": "DamienCassou/ledger-import", "unstable": { "version": [ - 20200522, - 853 + 20210108, + 728 ], "deps": [ "ledger-mode" ], - "commit": "027a6caf173948feacd2f416a7995d82f82165e7", - "sha256": "08aqqhbrcgn72wjw4c9wq5pyxdswbhly2c2izmy316bjh3cqvbhf" + "commit": "d1eda3ccafbfabbcc51be364146e31450f11745f", + "sha256": "0w6qgqmcv1nyrgjqrb1ah4wj94rn7zn00g0kib4vmc83wcnmyrjb" }, "stable": { "version": [ @@ -59481,11 +59946,11 @@ "repo": "ledger/ledger-mode", "unstable": { "version": [ - 20200530, - 1710 + 20210106, + 227 ], - "commit": "805507fd6c14839be4efc7aee2017f9c03e36834", - "sha256": "1sil9kdkcb0r165qm8vpxll0ikfnm0cqjd3gmj8vi6k8n6awv9zv" + "commit": "bcd8cefb720702db88986a52bb66e08e2e451c05", + "sha256": "1l2lhz45lc7njdv3kl5g8z5ig6vykxlp446raaif14k2flhw24a0" }, "stable": { "version": [ @@ -59712,17 +60177,17 @@ }, { "ename": "leuven-theme", - "commit": "b09451f4eb2be820e94d3fecbf4ec7cecd2cabdc", - "sha256": "0pm5majr9cmj6g4zr7vb55ypk9fmfbvxx78mgmgignknbasq9g9a", + "commit": "c75a5db2c9724a513ad3f64fc138d8565d608eeb", + "sha256": "0468jbv04gwxhh9ag3yblzv1y1rxfr6yqr6dqfp11x6j8c910byr", "fetcher": "github", "repo": "fniessen/emacs-leuven-theme", "unstable": { "version": [ - 20201115, - 1052 + 20201207, + 2103 ], - "commit": "dd56f8df0d134c40f93abcfd2382cfddd97c7cad", - "sha256": "0d466z7ggcgh8rhx7245jl7zf1cd1dmpg1z3kq46yxqai4wzvdxv" + "commit": "898c1426c29abbb1c86a715b1323669e30d4699e", + "sha256": "0ijd0p6k9c2va19wrp1kpj2x4bzyj3vh244ka8jdmsmwmqfmvb2z" }, "stable": { "version": [ @@ -59775,8 +60240,8 @@ 20201007, 2214 ], - "commit": "f7c80281c7005ba5965a8fc410708c08119cfee6", - "sha256": "1k6zxyyq0ah3z3gicyxlhj95rnh1rylap33ff945y3h2nl32wlsi" + "commit": "e5f20c459a13b35ed1e71b1d2667363af168e958", + "sha256": "0fapq9b14lxx5qm55yhcj2f1ym0kfrh6796ffb2i032bprh8n3m6" }, "stable": { "version": [ @@ -59909,11 +60374,11 @@ "repo": "mpdel/libmpdel", "unstable": { "version": [ - 20201026, - 1122 + 20210107, + 950 ], - "commit": "e26060d2139841ef206704e7e0d2f9fa06a1884b", - "sha256": "0i48sdhrx1nqnca1kk1iaghb6b3nsxshs6bdd0zfs03b425hhlsv" + "commit": "9162a4b350c978f94dde6f75d60bc6a17e1dc18e", + "sha256": "0w45g4pkjsggv5yqw0zsnwqvzljapfvhxzf0vhnrqc446ys9jzp3" }, "stable": { "version": [ @@ -59962,8 +60427,8 @@ "deps": [ "yasnippet" ], - "commit": "6014e9f4ce1fa2054309343f08bd6751620b56a5", - "sha256": "0mrcxczz6j7alpq3fb2fcs24pl4y54i6rm8ly8xb0ib1r98kp874" + "commit": "a729748b7d7f38a916fe61f23db6e7446c0a5e8f", + "sha256": "1kld7xg1kxb9mq1g20rzay5zdnjyaw4ss7xksr97qik018vf22y8" } }, { @@ -60364,8 +60829,8 @@ "repo": "abo-abo/lispy", "unstable": { "version": [ - 20201109, - 1728 + 20201226, + 1746 ], "deps": [ "ace-window", @@ -60374,8 +60839,8 @@ "iedit", "zoutline" ], - "commit": "5c8a59ae7dd3dd342e7c86a8c0acdbd13e2989f3", - "sha256": "0738v9bp4dlxbwsnykvc35yh4dl4pvw25jl8srb7r3744ydvgyii" + "commit": "1ad128be0afc04b58967c1158439d99931becef4", + "sha256": "15an4nbpri49imvkbhhynsmczkzhl4i037r8hcg4mam3w5nw14y8" }, "stable": { "version": [ @@ -60497,11 +60962,11 @@ "repo": "rolandwalker/list-utils", "unstable": { "version": [ - 20200502, - 1309 + 20210111, + 1522 ], - "commit": "9bb2487c83ec46a0b6e6c4158af69334ac797b82", - "sha256": "07hbz2md52ccy95gv4d5n6szrfmpfqf3w4kwqdg2cf54c7kgf7hw" + "commit": "ca9654cd1418e874c876c6b3b7d4cd8339bfde77", + "sha256": "0pkkfjjpak8xxbzr2xl5ah3isrn0bm8d7zfhrmhivpzpkhgdzvfx" }, "stable": { "version": [ @@ -60641,14 +61106,14 @@ "repo": "sulami/literate-calc-mode.el", "unstable": { "version": [ - 20201025, - 2003 + 20201214, + 1221 ], "deps": [ "s" ], - "commit": "a50e897a816cb5580ad6ec867eeaae212e0e4798", - "sha256": "0z6y5f1rj28lbr30m6g4a9l6ahs66whi8861g4cx9xzhs84nwv5g" + "commit": "1cf4fa18731248c6519667c16a6832b616b2b86f", + "sha256": "19icc2c3s4jmn0i55dfllpvbwm6f3wmscfp8nrgini2wk89260jl" } }, { @@ -60788,20 +61253,20 @@ "repo": "donkirkby/live-py-plugin", "unstable": { "version": [ - 20200709, - 422 + 20210101, + 1827 ], - "commit": "185da3530e3145b7fea7d15e33a8b581bbe3a111", - "sha256": "1w32nzp0ym16wsagj933595wic7x8iswgr0fwpv4hkagvcgbqzn2" + "commit": "d489fafd824d3fbd26fadb7b60dd2533d32478a9", + "sha256": "13m65xvh172rs7pc4yshz41289h93fz4isrpracy2zi409ji3h37" }, "stable": { "version": [ 4, - 2, + 3, 0 ], - "commit": "de3ce16dbb054b6d1b14f3274935bbdccadd9790", - "sha256": "1vl6v8lsid4p82clvp62079jnxhmibza3p5hb1frdlsycyc9d1bv" + "commit": "c6d3d34bae62f1d5e986625db74f2076af258900", + "sha256": "1d022chhib61ghrf847f2w9baqiscpp1s2qvj9i84zmk7bndjvag" } }, { @@ -60879,6 +61344,21 @@ "sha256": "178ldzpk8a9m9abn8xlplxn5jgcca71dpkp82bs5g7bsccp3rx6p" } }, + { + "ename": "ll-debug", + "commit": "6449c1e4a9fd8dffcfea6e7245220012d1098ccc", + "sha256": "16nywhy0628lx6jb6kw7526r1qzaha1daf9vr16dwnrajn6q4a0w", + "fetcher": "github", + "repo": "replrep/ll-debug", + "unstable": { + "version": [ + 20201211, + 2010 + ], + "commit": "f551a7e1d5ecd64608db744d0f0e24aa0b8645fe", + "sha256": "1d8m7pbfny0bkbaq609k1m8y5cd2lm0w1dnl53lls9ahyz60hdk4" + } + }, { "ename": "lms", "commit": "7d6c24152f88dad15ef9f304c0016a97ede71dab", @@ -60887,11 +61367,11 @@ "url": "https://hg.serna.eu/emacs/lms", "unstable": { "version": [ - 20201011, - 1051 + 20201214, + 1852 ], - "commit": "ee479b60f2a4a49389c5962021e897eb686e7c20", - "sha256": "08k0d3rbf00w7056bsbrk782iaji19vhfw9dy2s41dwcd4v1w4ql" + "commit": "e6dae7465423a5304d0e38e92625383d07fe6f52", + "sha256": "1axxfh96pl2s0c301ak1gjh10k744wafnza3qx4sqaxcka5f6hc9" } }, { @@ -60902,14 +61382,14 @@ "repo": "daviderestivo/load-bash-alias", "unstable": { "version": [ - 20200106, - 2015 + 20201229, + 1711 ], "deps": [ "seq" ], - "commit": "999c613898085b37b9e16b60be1cbeaa9986d368", - "sha256": "1qhcx7c954q1liw3glhvbg5bph96j9bwf808g6l066n04xj5347i" + "commit": "7ff80e4507a1dd71865440cf009bfe0c33323fc2", + "sha256": "14rbsvyami7h7f5yjg731ppjv7fxp3aq8a9gpdzg61cilxv93dpj" } }, { @@ -61000,8 +61480,8 @@ 20191022, 1955 ], - "commit": "4934c0560d2f63e6314b4584211a0cc0a7e671c4", - "sha256": "03hwvx3h64jj9nylmzpv2241b5fi97anhjjpwc5sjmfsq1wbf432" + "commit": "284d7bb285bd382be6c1936077de7e2246fa2374", + "sha256": "16jslrdzxlcl6s5jiylqfv48xrm7fqk765jwcgzayjl94939r22l" } }, { @@ -61110,25 +61590,20 @@ "repo": "sigma/logito", "unstable": { "version": [ - 20120225, - 2055 + 20201226, + 534 ], - "deps": [ - "eieio" - ], - "commit": "824acb89d2cc18cb47281a4fbddd81ad244a2052", - "sha256": "0jpyd2f33pk984kg0q9hxdl4615jb7sxsggnb30mpz7a2ws479xr" + "commit": "d5934ce10ba3a70d3fcfb94d742ce3b9136ce124", + "sha256": "0bnkc6smvaq37q08q1wbrxw9mlcfbrax304fxw4fx7pc1587av0d" }, "stable": { "version": [ 0, - 1 + 2, + 0 ], - "deps": [ - "eieio" - ], - "commit": "824acb89d2cc18cb47281a4fbddd81ad244a2052", - "sha256": "0jpyd2f33pk984kg0q9hxdl4615jb7sxsggnb30mpz7a2ws479xr" + "commit": "d5934ce10ba3a70d3fcfb94d742ce3b9136ce124", + "sha256": "0bnkc6smvaq37q08q1wbrxw9mlcfbrax304fxw4fx7pc1587av0d" } }, { @@ -61409,8 +61884,8 @@ "repo": "emacs-lsp/lsp-dart", "unstable": { "version": [ - 20201206, - 1725 + 20210110, + 15 ], "deps": [ "dap-mode", @@ -61421,14 +61896,14 @@ "lsp-treemacs", "pkg-info" ], - "commit": "8180a46ea8699c461a49904432492c7e4e1f6df8", - "sha256": "1ms87gzz7ai4ziaigsrpjn8a659yq5c4h1rs1s0f1gdb3qxk43zc" + "commit": "be9f979fa9cb098d064c3ab26d1f7ea7c65cbd23", + "sha256": "03g97sm3y5y1y8crwlc8kvpgrrljyym5yq6qz9llpwy8cg9srchw" }, "stable": { "version": [ 1, 17, - 11 + 12 ], "deps": [ "dap-mode", @@ -61439,8 +61914,8 @@ "lsp-treemacs", "pkg-info" ], - "commit": "8180a46ea8699c461a49904432492c7e4e1f6df8", - "sha256": "1ms87gzz7ai4ziaigsrpjn8a659yq5c4h1rs1s0f1gdb3qxk43zc" + "commit": "be9f979fa9cb098d064c3ab26d1f7ea7c65cbd23", + "sha256": "03g97sm3y5y1y8crwlc8kvpgrrljyym5yq6qz9llpwy8cg9srchw" } }, { @@ -61502,15 +61977,15 @@ "repo": "emacs-lsp/lsp-haskell", "unstable": { "version": [ - 20201011, - 1941 + 20210108, + 1332 ], "deps": [ "haskell-mode", "lsp-mode" ], - "commit": "4d85cb3693d893ec34d8a0be9794d468a0a28b7b", - "sha256": "1pz07l4iywvcfmgfymh8avz5lp0yirqxbrv14ncl8p6dv9yrfwyb" + "commit": "5d3f4814f6ac44547a62551472cc76fbaebcccf7", + "sha256": "0qak0vl9jicx9sv4sa2ash5agxxsx8qycp4jk3wxs96q5kjshf62" } }, { @@ -61572,8 +62047,8 @@ "repo": "emacs-lsp/lsp-java", "unstable": { "version": [ - 20201105, - 1758 + 20210105, + 1625 ], "deps": [ "dap-mode", @@ -61586,8 +62061,8 @@ "request", "treemacs" ], - "commit": "f43b00acd86801aff76c9cdc01f9d7f4b83bf14f", - "sha256": "1xpjjz7m06yazlw7qp7i278f7v4a3n80kpcvck35ahg5ar8i111j" + "commit": "33364a268a61366f1a07596e9fe7bd0f6d73fd90", + "sha256": "0ii26773cm945z1s4vyfqgzjsizv1a9wiadgg3klnfz9748y93a4" }, "stable": { "version": [ @@ -61698,26 +62173,26 @@ "repo": "ROCKTAKEY/lsp-latex", "unstable": { "version": [ - 20200718, - 928 + 20210110, + 1914 ], "deps": [ "lsp-mode" ], - "commit": "a9a26a21bf16b9444021563d844719ace0c5c3b6", - "sha256": "1waysrxhihg099czr2hydsvipdm8kf1zxw725r84lv5363cijw0b" + "commit": "2140e65fc5d759cdf163128ef6ab15c246d6039b", + "sha256": "10qf62c6raqhikhmfrav6qhc1mj229mrabzs1swyc06sx1sgkiwf" }, "stable": { "version": [ 1, - 2, + 3, 0 ], "deps": [ "lsp-mode" ], - "commit": "a1376d3f4d4467aaf7fc5750c437e3edc91d2116", - "sha256": "044jivz2w6xs2kyjasndy00c0j9f63qf66s5wmkjjxbyamd7viwi" + "commit": "969846d5d0c9a9d1fc8deae30a0f664607f06e72", + "sha256": "1dz9yib9g7a5b1yipxjc6mqq9ffkpkm2icpj6xzanfdnc1ymj7c9" } }, { @@ -61728,8 +62203,8 @@ "repo": "emacs-lsp/lsp-metals", "unstable": { "version": [ - 20201123, - 851 + 20201230, + 706 ], "deps": [ "dap-mode", @@ -61741,8 +62216,8 @@ "lsp-treemacs", "treemacs" ], - "commit": "31dafff1ebcddb860567e9b0681731adf25b54e6", - "sha256": "0r2mhns4r58fcsyrb25610ayzll9qhza9rfjh3cz7kl6dzvpwv2l" + "commit": "c76eeb6b580fadf6a16357be8c22c197d22574fd", + "sha256": "0r1sihiximsgjf7dyh9rndxwy26d5kfz04y13b0gq2lhvrgjbbkv" }, "stable": { "version": [ @@ -61771,8 +62246,8 @@ "repo": "emacs-lsp/lsp-mode", "unstable": { "version": [ - 20201209, - 735 + 20210111, + 1652 ], "deps": [ "dash", @@ -61783,8 +62258,8 @@ "markdown-mode", "spinner" ], - "commit": "597febf55bffd5b30e3fac58ede4d0fe1f297f1a", - "sha256": "02agyi2599brzp3z936x0nwj8ylk0cackbq78dghnyrvm2438vri" + "commit": "df809cf4afca507761bdd5a85817d5258aef26c7", + "sha256": "14i3gwvf3adfp8f5kblmmvlyb9wj7s2kyscgpqr8k0zjhbj2ibj7" }, "stable": { "version": [ @@ -61940,8 +62415,8 @@ "ht", "lsp-mode" ], - "commit": "d9e7d3cf1bdc8ee0395c8df4408b05ee3ba9c22a", - "sha256": "092ivkhyhqwyzf94k8bjzykzx28lazyipi8ghz4lbkc57wwmjx39" + "commit": "71ff088ac4c93b0edd012f305a3dfd1602c5d21e", + "sha256": "03fgw10fq1s98xrmfzg8y9xv14yig3lgjc44x7mvlc5awsmv5lxa" } }, { @@ -62034,8 +62509,8 @@ "repo": "emacs-lsp/lsp-treemacs", "unstable": { "version": [ - 20201208, - 932 + 20201230, + 2214 ], "deps": [ "dash", @@ -62045,8 +62520,8 @@ "lsp-mode", "treemacs" ], - "commit": "642e922e16fd2b2c3cc075d7cba68448f1aaa006", - "sha256": "1c7w7p0xczaliq8snryi2rwhnvm6qg0yqrkjkpwsr6smami7g31b" + "commit": "64e375fcc700d4d47cf52ad912e6863d479e3bfa", + "sha256": "19wy4xk0ll8pxdyq74a0zjlqkssc6ww21ac79zihndv90604c5km" }, "stable": { "version": [ @@ -62073,8 +62548,8 @@ "repo": "emacs-lsp/lsp-ui", "unstable": { "version": [ - 20201209, - 332 + 20210110, + 1507 ], "deps": [ "dash", @@ -62082,8 +62557,8 @@ "lsp-mode", "markdown-mode" ], - "commit": "49bc5134c15d92b866c389c16e8e551a9285961a", - "sha256": "0if4rkpym0zp44m4hrw24yzg6wzrpz7nvvgqq2s1limjjsw1rzk1" + "commit": "fbe9a859f0b50097270ccf1314952de2d2039c12", + "sha256": "01xw3jpwffk5gg86s5n2i1jwn0xslc9bdbacfxy0iyrn6qp5jr1i" }, "stable": { "version": [ @@ -62112,8 +62587,8 @@ 20201110, 1250 ], - "commit": "d2ff3045b9694293a302fa60d7bd5d97f2673156", - "sha256": "1g5wkprz33az2kp8w46343nhri82g4ib8jahqi4lpn507307gchz" + "commit": "9454aeeb665df360543b47e162f03276a16b01a5", + "sha256": "0ssqqhvc08g5917i4lmsr698zr57v9hpnbw67l1lx48ra4vr6fcr" }, "stable": { "version": [ @@ -62527,8 +63002,8 @@ "repo": "magit/magit", "unstable": { "version": [ - 20201207, - 1723 + 20210105, + 1030 ], "deps": [ "async", @@ -62537,8 +63012,8 @@ "transient", "with-editor" ], - "commit": "9e9f7cb3d260bd14e15307831a2820112c9a77ac", - "sha256": "1snbjfp35znmpa02mq0g75b24if74717f1lbij2h634pm7l5ndi1" + "commit": "25f432551347468ce97b8b03987e59092e91f8f0", + "sha256": "0vxsh75xynpfkfvmyyz8x3rppbwr9rgk7zjfil2af2kzba3p27vl" }, "stable": { "version": [ @@ -62618,15 +63093,15 @@ "repo": "dandavison/magit-delta", "unstable": { "version": [ - 20200929, - 1335 + 20210104, + 1541 ], "deps": [ "magit", "xterm-color" ], - "commit": "b8526f890415374822514e488341d2b706d6bc2f", - "sha256": "1r809j0pj7lfv70dkqzgzahppzp0g5zsa3q18h68d35vanaicm2d" + "commit": "fc4de96e3faa1c983728239c5e41cc9f074b73a2", + "sha256": "0gyjsjjjdbns8vlbja8wvmba8sq85ah7cawqqm0xjinrpfrhh8b7" } }, { @@ -62877,15 +63352,15 @@ "repo": "magit/magit", "unstable": { "version": [ - 20200102, - 2204 + 20210103, + 1554 ], "deps": [ "libgit", "magit" ], - "commit": "9e9f7cb3d260bd14e15307831a2820112c9a77ac", - "sha256": "1snbjfp35znmpa02mq0g75b24if74717f1lbij2h634pm7l5ndi1" + "commit": "25f432551347468ce97b8b03987e59092e91f8f0", + "sha256": "0vxsh75xynpfkfvmyyz8x3rppbwr9rgk7zjfil2af2kzba3p27vl" } }, { @@ -63033,14 +63508,14 @@ "repo": "magit/magit", "unstable": { "version": [ - 20201201, - 1702 + 20210103, + 1631 ], "deps": [ "dash" ], - "commit": "9e9f7cb3d260bd14e15307831a2820112c9a77ac", - "sha256": "1snbjfp35znmpa02mq0g75b24if74717f1lbij2h634pm7l5ndi1" + "commit": "25f432551347468ce97b8b03987e59092e91f8f0", + "sha256": "0vxsh75xynpfkfvmyyz8x3rppbwr9rgk7zjfil2af2kzba3p27vl" }, "stable": { "version": [ @@ -63623,11 +64098,11 @@ "repo": "emacsorphanage/manage-minor-mode", "unstable": { "version": [ - 20200123, - 1406 + 20210108, + 1832 ], - "commit": "0dfab46a728a21c91658ffcb14101b182cf1b403", - "sha256": "1c17r1vz6181plbhb5nh36q6r2rwkrxhy45xmk7rjghmdd765f2r" + "commit": "f4b37fffec7b6608a597e6a3f6900634802807b4", + "sha256": "0shk5n4a88r347h1fhayn0gzi242mc5b7i6b4aw0s63kw2yd4h6r" }, "stable": { "version": [ @@ -63695,9 +64170,7 @@ 1106 ], "deps": [ - "git", "github-clone", - "magit", "org" ], "commit": "d65dbaa329ecf931f4142be72862972ea6a24e63", @@ -63831,11 +64304,11 @@ "repo": "minad/marginalia", "unstable": { "version": [ - 20201209, - 619 + 20210110, + 2056 ], - "commit": "31ba78b6c65be172aae2dde9bc0e6e91e229b082", - "sha256": "0f5ifm31zis7jh6r7a0jj8p439l1j2lh4hmn9ll08kms5almlbr6" + "commit": "09aaad9b01068481c71720058e9d828e0d87c806", + "sha256": "1j0k9ija5paidj7yvbagkkayz9bjwhia9yhmd2q4490ginbbxshs" } }, { @@ -63861,26 +64334,25 @@ "repo": "plandes/mark-thing-at", "unstable": { "version": [ - 20200427, - 1453 + 20201219, + 231 ], "deps": [ "choice-program" ], - "commit": "a69696635616c10184a3289d459d8eb532f04f47", - "sha256": "0iiwa5cv43177irm4kj9jzfr1jzkw0gw0rmy9vnnbggfgmklzxrq" + "commit": "a622d128afc8d2d67de897666a1e2eccba8d7818", + "sha256": "1zb0ynwficxninyw89z53qf78s1ns60nh4cyzk96m05jlcaa1s44" }, "stable": { "version": [ 0, - 0, - 2 + 3 ], "deps": [ "choice-program" ], - "commit": "a69696635616c10184a3289d459d8eb532f04f47", - "sha256": "0iiwa5cv43177irm4kj9jzfr1jzkw0gw0rmy9vnnbggfgmklzxrq" + "commit": "a622d128afc8d2d67de897666a1e2eccba8d7818", + "sha256": "1zb0ynwficxninyw89z53qf78s1ns60nh4cyzk96m05jlcaa1s44" } }, { @@ -63944,11 +64416,11 @@ "repo": "jrblevin/markdown-mode", "unstable": { "version": [ - 20201115, - 635 + 20210112, + 1557 ], - "commit": "dcad5572a30fce51b97963d3c869cce227c223a1", - "sha256": "1c8c6lwmpysg8l1lvsyg0f0h65kkcdmijk2500xh2s0fhbbjb2s0" + "commit": "3e380572a5177d0fa527c15efd15e340f53a923b", + "sha256": "1zhxw0cp95zy3qy9ai9k81zja5m31964nyyrjqzlywxx7zjk4x9g" }, "stable": { "version": [ @@ -64209,30 +64681,26 @@ "repo": "sigma/marshal.el", "unstable": { "version": [ - 20180124, - 1239 + 20201223, + 1853 ], "deps": [ - "eieio", - "ht", - "json" + "ht" ], - "commit": "f038689cbd5b3680b80b44edd0c7a63ca3038e26", - "sha256": "1n79im1r7h1ilvppn9alqwl96zhyxbm5hk7kbmqh022dggw0cx15" + "commit": "490496d974d03906f784707ecc2e0ac36ed84b96", + "sha256": "13yf61sw5rmqb8dshk1v9j348jkdfqql55dqvs9srb3ypj8b02v9" }, "stable": { "version": [ 0, - 8, - 2 + 9, + 1 ], "deps": [ - "eieio", - "ht", - "json" + "ht" ], - "commit": "d714219aeb388ded88582c47940f2c6febae333c", - "sha256": "1mr5p2yiad1k15byrlk0a784kj7rvibpn4li5phk4rnm0zg1xy9s" + "commit": "490496d974d03906f784707ecc2e0ac36ed84b96", + "sha256": "13yf61sw5rmqb8dshk1v9j348jkdfqql55dqvs9srb3ypj8b02v9" } }, { @@ -64297,19 +64765,39 @@ "repo": "cpaulik/emacs-material-theme", "unstable": { "version": [ - 20201116, - 1613 + 20201224, + 916 ], - "commit": "bd5b244715a2232fe016efb691425e12a2e3e108", - "sha256": "0rgvfaplcf1riqxv7kyjs4chhmqk9hppiqrv25fmvi6rmm6cw2a8" + "commit": "67a496c937542f6ee7c4a2164d23f0296ef3a645", + "sha256": "14n0s4yn76b7a0qifabp1lp9g0zq82xwahz1wb5wfyfc3d0px9ck" }, "stable": { "version": [ 1, - 3 + 4 ], - "commit": "2710e61ecee1bbec943538305c26af4fe4fca68a", - "sha256": "1qg59w216iv1yk594xjgazfqx5qhw3jgjqf32pcwwbkcnyj5f6zw" + "commit": "67a496c937542f6ee7c4a2164d23f0296ef3a645", + "sha256": "14n0s4yn76b7a0qifabp1lp9g0zq82xwahz1wb5wfyfc3d0px9ck" + } + }, + { + "ename": "math-preview", + "commit": "23d52ef76491c4f674e5a40dec1af1bf096e2a35", + "sha256": "1l80shb16vdmpyhnvi4n0xvkbfvkxrjx7mgv0agyrvdac35db3ii", + "fetcher": "gitlab", + "repo": "matsievskiysv/math-preview", + "unstable": { + "version": [ + 20210108, + 1121 + ], + "deps": [ + "dash", + "dash-functional", + "s" + ], + "commit": "6c83ab7c6e3df95e60e942a9017d0c218228d429", + "sha256": "1v32nip530j4lvvm9gsjr9f6i0p0i59lx3f3j32m25q0yvv4s8z6" } }, { @@ -64441,15 +64929,15 @@ "repo": "sasanidas/maxima", "unstable": { "version": [ - 20201207, - 2204 + 20201226, + 1538 ], "deps": [ "s", "test-simple" ], - "commit": "878132db3c9e0b5675888eedece1c7aa4246df43", - "sha256": "1a24hdnxlic5c473szvj2ard3sl3lm9g5p2x5xqk7pymqj72nan4" + "commit": "1600cfc059a80ed8fa0d381b88f29ba658811cc5", + "sha256": "030sg31xh46vrmsafvn04sdvyv4vzqf8rf5ghrlina1gav6kybfd" }, "stable": { "version": [ @@ -64879,15 +65367,16 @@ "repo": "DogLooksGood/meow", "unstable": { "version": [ - 20200727, - 851 + 20210112, + 700 ], "deps": [ "cl-lib", - "dash" + "dash", + "s" ], - "commit": "c9296491e923a678ac9a42a2743f21ce1e0552c4", - "sha256": "00636in9cgcnij1sz6vj5y5vijdd13g5akwj1facf0v4lrlvacpn" + "commit": "bfd5e52c826c27aab01aaded518179b1192a3620", + "sha256": "0w4aincibdfqcf9k3cgmsl054qx5rwhxcsqg8k676wg7b266wmrg" } }, { @@ -64901,8 +65390,8 @@ 20191025, 851 ], - "commit": "3dd8eec9cb1f66811e8b3db3e492a2f4b5ea51bc", - "sha256": "1w3ypkzg3vp76ab4l1gm4g333f5bniarbc80mslam0jmwswr83z1" + "commit": "fc2f6e575077970dbabaac7643b820fcfd9d4f72", + "sha256": "0vm5rm4lym49nj4jk62s2inznkwx4gyrwlkgcz3q0qygylnn3r52" }, "stable": { "version": [ @@ -65038,6 +65527,47 @@ "sha256": "0r9zzmglmkkmxcqh0pdlg279mpd524k2rwn56kyvj5i3i8zw9rpl" } }, + { + "ename": "metal-archives", + "commit": "6415e204d910ffb09faca4cf190989bebbecc730", + "sha256": "0vwq2qdnq1vvmsgxzhyxbgx7rf53yjxwh6nwbpjva5ipxf21j0ci", + "fetcher": "github", + "repo": "seblemaguer/metal-archives.el", + "unstable": { + "version": [ + 20201214, + 1027 + ], + "deps": [ + "alert", + "ht", + "request" + ], + "commit": "a7602a32e7fd3c7779bc5b5c5e398ea31713ee45", + "sha256": "0s7lzhnafw98447kgpwimlmvfwqaaljvnqwvqppgkqglk551lmd4" + } + }, + { + "ename": "metal-archives-shopping-list", + "commit": "1541b23e96898b11d24a309a69a732a88d99212b", + "sha256": "0lhq6lz1gnl8jgci28hc4nf7bdkrh94ni1xfjbd825rf7mg21n80", + "fetcher": "github", + "repo": "seblemaguer/metal-archives.el", + "unstable": { + "version": [ + 20201229, + 949 + ], + "deps": [ + "alert", + "ht", + "metal-archives", + "org-ml" + ], + "commit": "a7602a32e7fd3c7779bc5b5c5e398ea31713ee45", + "sha256": "0s7lzhnafw98447kgpwimlmvfwqaaljvnqwvqppgkqglk551lmd4" + } + }, { "ename": "metalheart-theme", "commit": "204dd67b24bf4f2305a14efb925c8fe004026694", @@ -65154,8 +65684,8 @@ 20201202, 203 ], - "commit": "cf20ca579120dd3a4126641a5bcc1dfc6289183c", - "sha256": "0041q1vxy6222ic8807yhxdxb0vsmzvndb9f50ymfx6zrjisydf7" + "commit": "b5ca49f83f0b178fab4683b8443083515caaa4c2", + "sha256": "0qv6gazz5p46y5p2wc0h9pa4qq45aqbzx2s54aq1vviwl8v9hpj7" }, "stable": { "version": [ @@ -65243,14 +65773,14 @@ "repo": "yoshinari-nomura/mhc", "unstable": { "version": [ - 20201113, - 3 + 20201227, + 406 ], "deps": [ "calfw" ], - "commit": "33d8ca1a1beb2b63e720e17525bdda3cc878e5ed", - "sha256": "1786r9jfxdsnbb7icy0ndg28p8srkr6mn3zs2r7iibr2ysk3rjvp" + "commit": "1cd9cbc7f8cfe40833d1af726644ae45a3d07dc0", + "sha256": "1cm7y1nfbl8625rpk5i9zcmp9p6rzqdzxy9wcjs8yrdfsc0biq3q" }, "stable": { "version": [ @@ -65426,11 +65956,11 @@ "repo": "muffinmad/emacs-mini-frame", "unstable": { "version": [ - 20201113, - 838 + 20201223, + 1013 ], - "commit": "31380e7688c5e82965f72e5707cbff3ec2712ba9", - "sha256": "1a5vyff17lj3f6xkzkp8fy0dli1w5dnp0bvm6cppjp3x1gnj7aj2" + "commit": "0912cf4f500403be32735bc50e331fd06910471f", + "sha256": "1hnhgx1nyhj814dlcg8mgijnfh30a5vzzinivh2ywgr151wv3b9w" } }, { @@ -65456,14 +65986,14 @@ "repo": "kiennq/emacs-mini-modeline", "unstable": { "version": [ - 20200801, - 1554 + 20201221, + 1825 ], "deps": [ "dash" ], - "commit": "a4455fb70c6b4062c63ce61af09d2af99683b492", - "sha256": "0bwlx937hx11d4mj5cqp5rg7dh02499z85irgaylwvnsnx5sbni4" + "commit": "7dcd0ab81bb7c298377708061176f5c5a50f77db", + "sha256": "1bik23ci0h9gki7ysw7r5wj5z9ib56167qzk7sac2wqw9xmi8dbb" }, "stable": { "version": [ @@ -65754,11 +66284,11 @@ "repo": "ayrat555/mix.el", "unstable": { "version": [ - 20200920, - 1500 + 20210105, + 1821 ], - "commit": "8a2f8c2df0e1817190c4dc0d2d7c7b5e5407744a", - "sha256": "0r8b3v4vp46afw8q5v03aifd1kpap79qc4af84placrhy80kya2v" + "commit": "39a7d3e35769086c0008389b3975dd90b91b657c", + "sha256": "0f74wb9f1j47qc0xhhn23i8nrsyznhngwvdrg62ixdzdz9z0z5hh" } }, { @@ -65769,11 +66299,11 @@ "repo": "jabranham/mixed-pitch", "unstable": { "version": [ - 20200916, - 2311 + 20210103, + 7 ], - "commit": "d305108f9520e196b533f05d1dcc284cf535faaf", - "sha256": "0yx89is3g2m8af8vfsz5rgjmfmx7mfrxlffb1x6y4b8lh9l0k6dj" + "commit": "beb22e85f6073a930f7338a78bd186e3090abdd7", + "sha256": "1dhljrh44dsnixd8hbb11k6dgap8r8n7jknhfy2afdzq889fih74" }, "stable": { "version": [ @@ -66023,28 +66553,20 @@ "repo": "sigma/mocker.el", "unstable": { "version": [ - 20150917, - 154 + 20201223, + 658 ], - "deps": [ - "eieio", - "el-x" - ], - "commit": "6a1d7c9189bd721debd1a60707526e43a733f537", - "sha256": "0i96fn5ji1z78in4nr316sgfp2mc8lmxijslw3k9q1v50j91bcya" + "commit": "5d739d5170ff42e841cd2755b68151918052da2b", + "sha256": "1dc514cqbfmg33sb3j90s5jmw6jnm3wzvs0zhw3maz13bp7w6z48" }, "stable": { "version": [ 0, - 3, - 1 + 5, + 0 ], - "deps": [ - "eieio", - "el-x" - ], - "commit": "55b078b53ea49e48bd1821d96f0fb86f794fdc6c", - "sha256": "1lav7am41v63xgavq8pr88y828jmd1cxd4prjq7jlbxm6nvrwxh2" + "commit": "5d739d5170ff42e841cd2755b68151918052da2b", + "sha256": "1dc514cqbfmg33sb3j90s5jmw6jnm3wzvs0zhw3maz13bp7w6z48" } }, { @@ -66252,11 +66774,11 @@ "repo": "protesilaos/modus-themes", "unstable": { "version": [ - 20201209, - 847 + 20210112, + 853 ], - "commit": "50c926dd2f94a1ef95e2b7763ff25b1b51452f7a", - "sha256": "03ismi6m336fga3qp93nxipaf53bdzqzn7ad1v5ak5zhvyp2j0xi" + "commit": "fba8fb08544dd4a19fcc5c0b2ca50490bf4b10e9", + "sha256": "025ak5yvy2920djia1976p1fyxdkl27jyhgi4gdsg8c13yr0asqk" }, "stable": { "version": [ @@ -66375,26 +66897,26 @@ "repo": "jpablobr/emacs-monkeytype", "unstable": { "version": [ - 20201208, - 1918 + 20210110, + 513 ], "deps": [ - "async" + "scrollable-quick-peek" ], - "commit": "919b24f3b18d70be8c43e792a4e81476d76166cc", - "sha256": "0fgdx8zm6lbp8dn9wrfgpm146h7p1hmz0r32mwb5y9wvwkglvqla" + "commit": "0e949d08198c0bd003f1d5c8cdceb7e36bef22f7", + "sha256": "0fgnfslhg10q96lyxfnpa7s8dvw5gjlll7p6qji2jfz3kncwhf5l" }, "stable": { "version": [ 0, 1, - 4 + 5 ], "deps": [ - "async" + "scrollable-quick-peek" ], - "commit": "919b24f3b18d70be8c43e792a4e81476d76166cc", - "sha256": "0fgdx8zm6lbp8dn9wrfgpm146h7p1hmz0r32mwb5y9wvwkglvqla" + "commit": "0e949d08198c0bd003f1d5c8cdceb7e36bef22f7", + "sha256": "0fgnfslhg10q96lyxfnpa7s8dvw5gjlll7p6qji2jfz3kncwhf5l" } }, { @@ -66405,11 +66927,11 @@ "repo": "ananthakumaran/monky", "unstable": { "version": [ - 20190619, - 1637 + 20201226, + 1950 ], - "commit": "9d379a2306a8b7cd9c4faba20490480acdc1d763", - "sha256": "0dvywqas1vx0f0qlly8259772zj64sygv3hnmm9yqzy4v725qbhp" + "commit": "e04632277ef24acacc029ae29db1fadc458ae83b", + "sha256": "0xzn9fgxvbpgx5wky8vdhd3bw7hy6h6hngx7l8a0qspg560r7hz1" }, "stable": { "version": [ @@ -66473,11 +66995,11 @@ "repo": "oneKelvinSmith/monokai-emacs", "unstable": { "version": [ - 20200918, - 1348 + 20201229, + 1001 ], - "commit": "791baae69b02ee007cde779a80abc1a6b5962cf7", - "sha256": "00r5i98lplsra7fwrvir9pr7mbc1kia0xlmrlgs0vmn4bhxa2fpc" + "commit": "c5a7978bfc2ad2aa90882e6b2583668dc7b3e1a5", + "sha256": "0p22mfb84ja35v52v4x5inzndcl1ac3g9vvl3s2m5zq68ljy2p18" }, "stable": { "version": [ @@ -66731,10 +67253,10 @@ }, { "ename": "most-used-words", - "commit": "5c240664b29e0e455d3d2503381b9db1ed0ea20f", - "sha256": "1129wbn7myzqijzcs1bsy3fh6iizijfpkpa1mw6j9s618anj282p", - "fetcher": "git", - "url": "https://github.com/udyantw/most-used-words.git", + "commit": "934e64df7fba95b6dc06e76382013dc4a9ced82f", + "sha256": "0dbjhqf5jxmicwl9allsr2vhqp4z6gkrwkdmnyphvn1kgr01kmjj", + "fetcher": "github", + "repo": "udyantw/most-used-words", "unstable": { "version": [ 20200808, @@ -66943,8 +67465,8 @@ 20200822, 1229 ], - "commit": "91cc1e19ef34aeb12888b697fefa52907f1a834d", - "sha256": "17dxx75z5fqvv0ams0mbj6p0wgjn4dnx61i9zljbg6l2fxbd7mwx" + "commit": "1f4fa17372bd196e87042738a16ab08bf904bcbf", + "sha256": "180glmkk6wnq5pc02543phih1f71vpvykqkwxs2qv7s7dyf2qg58" }, "stable": { "version": [ @@ -67070,15 +67592,15 @@ "repo": "mpdel/mpdel", "unstable": { "version": [ - 20201026, - 1123 + 20210107, + 1303 ], "deps": [ "libmpdel", "navigel" ], - "commit": "e937fbe0b98774e711134f3fac230a9fc66ac106", - "sha256": "1qiwk3ahjhdc6ac3k81qjl5vjjsxm1hd7wnl7whk2zwj7k12zb9j" + "commit": "6682446c6263a79e79c55cf32c0efb066245feec", + "sha256": "0q84gml1g9zwchp4h3r0xvj1sc1ynx0s2drfkpd357br3fw8ivzf" }, "stable": { "version": [ @@ -67382,8 +67904,8 @@ 20190609, 812 ], - "commit": "98110bb9c300fc9866dee8e0023355f9f79c9b96", - "sha256": "080s96jkcw2p288sp1vgds91rgl693iz6hi2dv56p2ih0nnivwlg" + "commit": "ccf85002b18fee54051dbfaf8d3931ca2a07db24", + "sha256": "1ysj9x9m1lxg1gy0z7y07qsi3g26qfqdwwa8kjkf40pchb2wxg0s" } }, { @@ -67477,27 +67999,27 @@ "repo": "lordpretzel/mu4e-views", "unstable": { "version": [ - 20200830, - 1608 + 20201229, + 216 ], "deps": [ "ht", "xwidgets-reuse" ], - "commit": "af3916b2639a5a94676d4f11471e25b63ba76d0a", - "sha256": "1h0anxs5xammkjky1syy9ja8xgskbf3j7a8hf12ggmihk9qa1dvk" + "commit": "55e5467a25d424b2c10b5392e68b370164efa230", + "sha256": "1gagaxpb4psshs8x61icilx4576al2qjs612d65ss857gfmzachi" }, "stable": { "version": [ 0, - 4 + 5 ], "deps": [ "ht", "xwidgets-reuse" ], - "commit": "4977f6517cf12ac994859c4ba992d5e2999ae016", - "sha256": "07y96ii3ysqlikq7cixcwf1mr7ysazmmnp42wzah02zdchj9irzh" + "commit": "33fa9f584034978006108a4498566e933493f852", + "sha256": "01636rhmgnjz9z81xppqlrlwwg0jcy48k9p3hh865wncp1q2jsb5" } }, { @@ -67620,11 +68142,11 @@ "url": "https://hg.osdn.net/view/multi-project/multi-project", "unstable": { "version": [ - 20191117, - 1203 + 20210105, + 1229 ], - "commit": "4045823d51f6330466b6ab83828b6c598ac817a0", - "sha256": "18z1mmmjq4xw238mw1417nlqv67qv07blz0lxhpl8m1wma4v96af" + "commit": "f71a56978a57ee5b08e75d01a5d6ec75f20cedba", + "sha256": "10fvwrd0l05lv05shrdl0cw1bg231djkz6gxlgccmdr97d01qwkl" } }, { @@ -67635,14 +68157,14 @@ "repo": "sagarjha/multi-run", "unstable": { "version": [ - 20190507, - 2349 + 20210108, + 336 ], "deps": [ "window-layout" ], - "commit": "c6256b0cc2876c29faf381d8324b31b911045a27", - "sha256": "07nd7lwrnz9j54hq33c8ii1pipd472qfsdifg6fid7kca0rychif" + "commit": "13d4d923535b5e8482b13ff76185203075fb26a3", + "sha256": "0b5pym2dk4rhrcbn0kgiaf6mqpwa45zfi5k2vh0lfzv9b45nngzs" }, "stable": { "version": [ @@ -67759,14 +68281,14 @@ "repo": "magnars/multiple-cursors.el", "unstable": { "version": [ - 20201018, - 538 + 20201215, + 1559 ], "deps": [ "cl-lib" ], - "commit": "83abb0533a9d9635bc86d6d52a4e7641b0eaaf63", - "sha256": "1p9wz300x9hpkl2lhh6xdcbn46aka5wrqmf20cs5w8dm7205yznc" + "commit": "a9d7764f80b241978f3d4e76bc981ef10bab5d70", + "sha256": "0r5dgzra3wimny5kaqhkfj1723mbwsdjabi26jp77hxkrhx7v905" }, "stable": { "version": [ @@ -67972,15 +68494,15 @@ "repo": "agzam/mw-thesaurus.el", "unstable": { "version": [ - 20190620, - 2330 + 20210106, + 1857 ], "deps": [ "dash", "request" ], - "commit": "8327bae11588bcad5d73dcfbeb5e8d10f623d6b6", - "sha256": "0snv5v4c5f0hnixrii16xp55w0faw3hirmaj19fnf76shnpg4kwy" + "commit": "cb0637bd3799820d6738f5d66b8bc2de2333e0e4", + "sha256": "1j5x1rfnxvghdmai7cv9sjqw1azq59pk8h5vm0krgnan2rpx5k4k" } }, { @@ -68592,15 +69114,15 @@ "repo": "alphapapa/navi", "unstable": { "version": [ - 20190720, - 2003 + 20201220, + 1727 ], "deps": [ "outorg", "outshine" ], - "commit": "7eb7cf0c4a6ee537ec462f5ec90f00d12e3ca9c2", - "sha256": "0ajmbsdz825v5fidnp30yv1jwl415vc67hlm05a65f92bhs6m3zq" + "commit": "cf97e1e338815ad3a4d0bbbf4ff6dd1a4e322ca8", + "sha256": "12nb7rha3fh29djwnnc28k8g5bnwk2cvijym1i4m4q1fpymfm4ri" }, "stable": { "version": [ @@ -68935,8 +69457,8 @@ "repo": "felko/neuron-mode", "unstable": { "version": [ - 20201204, - 1517 + 20201229, + 1005 ], "deps": [ "company", @@ -68944,8 +69466,8 @@ "markdown-mode", "s" ], - "commit": "dad8804d050ce4532053b739dcecb1f4d97ea3e4", - "sha256": "0xwfclszwjg12kp3bdp92yjc59d527w48awj9x4dz3ps438ia75z" + "commit": "81ed1f3288eab9aed2cb0b1eb11af69f988b7d0b", + "sha256": "1dgvlk0apd7ddzzg5jcpsrdhps37my59jyvkv1sqp31km0nby6qk" } }, { @@ -69176,11 +69698,11 @@ "repo": "m-cat/nimbus-theme", "unstable": { "version": [ - 20200812, - 915 + 20201222, + 1503 ], - "commit": "1a828c1fa0574503014afe8dda3229fb76a4bf64", - "sha256": "1qapsq7mxayjjr7y376p9vb7k871rwjgmyvmv756xg98lf7vm3fb" + "commit": "5ff56a6a68cde7cd0a67fc60e3e993be52604a6d", + "sha256": "1073x878gdg97xym31mx3l7zpbc51pkspigpxqlpq48q62llcigj" } }, { @@ -69194,8 +69716,8 @@ 20181024, 1439 ], - "commit": "58f77f972bcece256c16ca1cc4a933270b1ea1c1", - "sha256": "128mfqqz0p2skxsgzsvq320nscpqqgzibq4idcsszk43ynksihzf" + "commit": "fb824d27b39e10acb97f9b105df2d9485a4677e9", + "sha256": "0sliljjiikgrl4b2cp21hnc1qv9rjb3alj4hk2h334iddcah1klh" }, "stable": { "version": [ @@ -69293,11 +69815,11 @@ "repo": "NixOS/nix-mode", "unstable": { "version": [ - 20201202, - 1618 + 20201229, + 138 ], - "commit": "e32c6bf7ad6dfe1d7ef9ee07d4da6e50174037bf", - "sha256": "1qihka6vzlnd4ks4az2bj7zmbfxjcvhbadb3xwswzbyc87lgkr0g" + "commit": "53ea839a52335d089699d3530bae8ea5914cdbb6", + "sha256": "1gmsq0simdrk8w1ywls3bn224wxgc0v8dmcch75zjp34rx9fg11n" }, "stable": { "version": [ @@ -69557,16 +70079,16 @@ "repo": "dickmao/nntwitter", "unstable": { "version": [ - 20201129, - 2009 + 20210104, + 1423 ], "deps": [ "anaphora", "dash", "request" ], - "commit": "94916ad8c3e3bf697855c58257f92cd697c9521a", - "sha256": "19dk7mkjpmmzbq26kdpz032g16jlj3b7mbmgi5px9rfa9qm0v8qw" + "commit": "174eb3bdb1339872b62fe2bf0c27d9a3eb142d27", + "sha256": "089zsy7f69h6kj6rckn5big2bfdn6hgdwamacsgsb8fpsvmy3ai9" } }, { @@ -69592,26 +70114,26 @@ "repo": "emacscollective/no-littering", "unstable": { "version": [ - 20201130, - 1511 + 20210108, + 1350 ], "deps": [ "cl-lib" ], - "commit": "f14d5548211109b0e5e850706d8d2cc182dc60be", - "sha256": "0x43c749jbb9amkz4mpl0yn4b32v5wbzx8snig9700dvayjb4k89" + "commit": "6e8950ad296c0f57d80d034eb0b7adf538c02906", + "sha256": "10zjxc6ipm9330awx7k9hzjf28qpnaw2rcz67dc0jbdgxkn16gl8" }, "stable": { "version": [ 1, 2, - 0 + 1 ], "deps": [ "cl-lib" ], - "commit": "de7a73579659a97ebf67f82c500d0059a4b6a9df", - "sha256": "1hma9var0nmrmjlh16s49hbfc1s4jvfd2prqxf14lxfd51404niw" + "commit": "96ed5b8ecad8bcdcd212aacd9957276be3cf128e", + "sha256": "00chkzpjcdll907vpzfzmf9p3jprisnr8i0h1x5gixidwbfc2whi" } }, { @@ -69839,14 +70361,14 @@ "url": "https://git.sr.ht/~lthms/colorless-themes.el", "unstable": { "version": [ - 20200213, - 2057 + 20201222, + 1627 ], "deps": [ "colorless-themes" ], - "commit": "46d477ec5a367beb6c8e75e017ae2c3a31250136", - "sha256": "05c6ywzamnq1frmb8i07wjxrncl3fpkmns8dnc3v8si234gq3m72" + "commit": "c1ed1e12541cf05cc6c558d23c089c07e10b54d7", + "sha256": "02ai9yf7h3i81bg01w8nb4kdrcc94ladbrkw9vg3p40w617mjwlb" }, "stable": { "version": [ @@ -69898,20 +70420,20 @@ "url": "https://git.notmuchmail.org/git/notmuch", "unstable": { "version": [ - 20201206, - 2023 + 20201225, + 1832 ], - "commit": "adfded9ed0a5a4b06886f462314cd4511cb72d47", - "sha256": "1a3dmzxwl8b31m9rwjvqhgkk4cac2yg2blapp39szxmbb9vs768x" + "commit": "a12bf2a52a560cc27503add26e9c3087929b60ec", + "sha256": "1xwzxw9nfcm12zzgbndj4qzlx9mwxh4z57yyx1v6r3zzgr7qgcpn" }, "stable": { "version": [ 0, 31, - 2 + 3 ], - "commit": "02a7b026d938f53d9fd9b183ca2b3c44c92489f2", - "sha256": "0rbzpr03z8lsx660ciayy3fj872s2561yvam1wgjbb21phd8hacw" + "commit": "d812256aeb91646b5b1c644fa67f07c483cca651", + "sha256": "1wm1myzacz1dcg7vdfd3akia3xan7ssfspf1fflrwm18hdalss5v" } }, { @@ -70566,8 +71088,8 @@ "deps": [ "axiom-environment" ], - "commit": "9ef86ca16098050da4362f5aadaea64b0a093fc1", - "sha256": "0hyaa1nskm95scypdpbndmmdasq6cas85y6i2q1f8nq8a3qd5585" + "commit": "47d6dffc29286badb2b1d7143b219e5c1be15bdb", + "sha256": "1dppyda9jkwh6fj8m4kziq84w0b5yzxrhq87jhkv54jjra6yxbb4" } }, { @@ -70860,8 +71382,8 @@ "ess", "julia-mode" ], - "commit": "862f34da39faae87fc0900bb7006fb20fbd2b61a", - "sha256": "09gg0jbilrzz5fpvgkvig43k860044c0525y5lcgqns6gm0fs24h" + "commit": "b97ebf19c3d68ff946584e78ab7943f8a691ebe5", + "sha256": "1g9p3i6iwhgh6wj1k326lswms59nx4n1dyb7rr1qia1d0y3k1zym" }, "stable": { "version": [ @@ -70918,15 +71440,15 @@ "repo": "jdormit/ob-graphql", "unstable": { "version": [ - 20200108, - 2228 + 20201222, + 1515 ], "deps": [ "graphql-mode", "request" ], - "commit": "ced37c6761d69e1ff206ff0ebd633f0e4fd2ac54", - "sha256": "0575w89sr97dv4ccygbhj4k7rpk2934q9f0p3q0hxf8a5wikf493" + "commit": "7c35419f9eec5dc44967cbcfa13c7135b9a96bfc", + "sha256": "07syadvvdjrxbsgwil2pqcji2rznm64pz0cqb0d4g7kjbxby37gw" } }, { @@ -71216,8 +71738,8 @@ "deps": [ "restclient" ], - "commit": "f7449b2068498fe9d8ab9589e0a638148861533f", - "sha256": "0s3931w9ab3yfml2pmq71rw21yf6hpg7m3vihxyy3vs6zli1cvmq" + "commit": "0ebfc7c5ebf96d2fe1a476439831363a5a43b9b6", + "sha256": "0sc6rljlzm7g4v4l4ziqrr0ydbsyypbq0h19f9xafvnb2pn40j84" } }, { @@ -71573,8 +72095,8 @@ 20201204, 945 ], - "commit": "58f933600606f519b2c22eb2536a62298aadcbf7", - "sha256": "1i33m5cb21v5q4bdvih8hv8227awif87j4kl8w7yl9prn6mcs2w1" + "commit": "aa7e9df7b2ea20c16f17a4f7c40e2a86b106b182", + "sha256": "06841x8adncyw5r3n8xv05mlsb1iv9i8klxf1pj3021b9nbhjkii" }, "stable": { "version": [ @@ -71767,26 +72289,26 @@ "repo": "oer/oer-reveal", "unstable": { "version": [ - 20201207, - 1202 + 20210107, + 1519 ], "deps": [ "org-re-reveal" ], - "commit": "62c6d91bd5045f2ecb817fdea69d98b03126b715", - "sha256": "0pnsq52bggd1wk783mljza5sm8ymb1j5dqhv00n3l98061wbql9h" + "commit": "7edfa815105543a183b1503fa49531f77a713840", + "sha256": "09sl4bpd5k25cb82q57f39hb74hsilg9271zbs6nxvrshks23wy3" }, "stable": { "version": [ 3, - 11, + 15, 0 ], "deps": [ "org-re-reveal" ], - "commit": "4155e1b7d533cc107da74b4d6f463ed96b6dad39", - "sha256": "0pwpwxqd0mdp7dcir4yiigsybra1iv571ngn3yvprid8ji12h5sr" + "commit": "7edfa815105543a183b1503fa49531f77a713840", + "sha256": "09sl4bpd5k25cb82q57f39hb74hsilg9271zbs6nxvrshks23wy3" } }, { @@ -72101,8 +72623,8 @@ "repo": "OmniSharp/omnisharp-emacs", "unstable": { "version": [ - 20201002, - 1600 + 20201220, + 906 ], "deps": [ "auto-complete", @@ -72114,8 +72636,8 @@ "popup", "s" ], - "commit": "2aead2d276cb6bd6f01dac7845a593d25a469c41", - "sha256": "006wxbr0hb917zqp67hin6x8ag5aa90n5shwzwspq2sxhdy9819j" + "commit": "8ec59296b2e2a12d8ea146fb7056091fbb7bdd10", + "sha256": "02kx5gx1hk5r3lks3y9myq3x90zcz0snhckyf7sx45ydgnjxm5j4" }, "stable": { "version": [ @@ -72441,11 +72963,14 @@ "repo": "abo-abo/orca", "unstable": { "version": [ - 20200122, - 1511 + 20210105, + 1749 ], - "commit": "654f185861ed4fedfe1394db48a83639a0be57f6", - "sha256": "1dwps9zv1jnc7m75j5cdla14pnv2vnivm5bq0zcvqfsvilvd38ds" + "deps": [ + "zoutline" + ], + "commit": "c50b98da70d08b27ad1751c57bc7edcf27cd1d79", + "sha256": "19kgyxq3dci44hayzli3z528vs3mxfpsa5443wxf5pfgr7lkc9c0" } }, { @@ -72456,11 +72981,11 @@ "repo": "oantolin/orderless", "unstable": { "version": [ - 20200905, - 2113 + 20210105, + 448 ], - "commit": "e56eeef6e11909ccd62aa7250867dce803706d2c", - "sha256": "1g4963snkp1gxlf5h1h5kjn4pj55f844ajzx4n5nhkws44sr6isg" + "commit": "cbc0109eac542ef4fe0be027af1c62c4bbf846ee", + "sha256": "0cp8yspghfbgy2nhcqw8irqyhphw4jdr36864m45ralzzxc6lqac" }, "stable": { "version": [ @@ -72617,6 +73142,25 @@ "sha256": "1zfc93z6w5zvbqiypqvbnyv8ims1wgpcp61z1s152d0nq2y4pf50" } }, + { + "ename": "org-anki", + "commit": "9b79d06c02a7fa4d7d7255b07a3bf0d080b512d1", + "sha256": "0ydqymvhyi9xrx9x4j9l77if7cknybpz57ahqspylyg7p6v8qx06", + "fetcher": "github", + "repo": "eyeinsky/org-anki", + "unstable": { + "version": [ + 20201220, + 2144 + ], + "deps": [ + "ox-slimhtml", + "request" + ], + "commit": "efa9e3aa2d768c00440f745192aba6672b28d086", + "sha256": "009n23gcgyfylp4q6igj67r606syq2r43s86g12xkl3vmc14929b" + } + }, { "ename": "org-attach-screenshot", "commit": "f545cd8d1da39e7fbd61020e178de30053ba774b", @@ -72809,14 +73353,14 @@ "repo": "Kungsgeten/org-brain", "unstable": { "version": [ - 20201120, - 2132 + 20210108, + 1512 ], "deps": [ "org" ], - "commit": "1ae4fd46165fc56f34f36ce38cb2ae816b07e207", - "sha256": "1y80j75w80rlz1100lhxjr0bd5bzs4kak116zfw8sydvlr2q0px0" + "commit": "f7939ef5071895930eebccf490ea7cb25cc54b2c", + "sha256": "0lplrdy5432ckif94vl9phh07c6qfm8cxa1mjyn1dypn2sh8p9gi" } }, { @@ -72966,15 +73510,15 @@ "repo": "atheriel/org-clock-csv", "unstable": { "version": [ - 20200714, - 2109 + 20201222, + 1506 ], "deps": [ "org", "s" ], - "commit": "499b961f26e1f9a9898bf0b1725b49d783893639", - "sha256": "08li6il9rhbm62pcb15cd40b6vjqjlywk07jcs9m85q589v6q2yg" + "commit": "af94b58c2e179a5bcc938f339e93de0eee3da99c", + "sha256": "0637skvjs90cfd713q8dhl3xrya4hfy79x0nn1y51cp9lrniw6q2" }, "stable": { "version": [ @@ -73097,21 +73641,21 @@ "s", "seq" ], - "commit": "a3734368cd5a36541dab2fa8f7404cb850991b5b", - "sha256": "0vsi5z9n18w88q4k17p2iviqmg1bqy0ficw67ry4l9lalnq5x569" + "commit": "bab77ede4b1aaf879e7c24e0522da624ee23bf2e", + "sha256": "1bcvdl5h4nz2x1zvrq700vf2mbkyhvrslfkabmirhs7hd2q0n41n" }, "stable": { "version": [ 0, - 3 + 4 ], "deps": [ "dash", "s", "seq" ], - "commit": "e0fb2c04a55c55cbf59a85a0b2e23ef18370ca61", - "sha256": "1q5s2gj1968z23qf7ds2ychvvnzmlayh1v16krf0lf3zj7a3k20s" + "commit": "bab77ede4b1aaf879e7c24e0522da624ee23bf2e", + "sha256": "1bcvdl5h4nz2x1zvrq700vf2mbkyhvrslfkabmirhs7hd2q0n41n" } }, { @@ -73182,14 +73726,14 @@ "repo": "abo-abo/org-download", "unstable": { "version": [ - 20200914, - 1558 + 20210105, + 1758 ], "deps": [ "async" ], - "commit": "42ac361ef5502017e6fc1bceb00333eba90402f4", - "sha256": "0cg4y7hy7xbq4vrbdicfzgvyaf3cjbx2zkqd4yl0y2garz71j99l" + "commit": "97bec7412e1a4d6e9031c7a0568d0f065cd9fd00", + "sha256": "0jb49q2ayhw1s2dnd323lqc7fy9k3sznxn4dv73s4945j8w2lqcc" }, "stable": { "version": [ @@ -73475,26 +74019,26 @@ "repo": "io12/org-fragtog", "unstable": { "version": [ - 20200703, - 229 + 20201231, + 505 ], "deps": [ "org" ], - "commit": "92119e3ae7c9a0ae2b5c9d9e4801b5fdc4804ad7", - "sha256": "0hyhwbfhb7gj3wjv0722gmz637pd3l0k0gnk4z100v3crnk9rfs6" + "commit": "0151cabc7aa9f244f82e682b87713b344d780c23", + "sha256": "1szkx3n9gk6799rxv0jb3096pn2ssz82536x9a98xqwbimy4kvn6" }, "stable": { "version": [ 0, - 2, - 0 + 3, + 1 ], "deps": [ "org" ], - "commit": "92119e3ae7c9a0ae2b5c9d9e4801b5fdc4804ad7", - "sha256": "0hyhwbfhb7gj3wjv0722gmz637pd3l0k0gnk4z100v3crnk9rfs6" + "commit": "0151cabc7aa9f244f82e682b87713b344d780c23", + "sha256": "1szkx3n9gk6799rxv0jb3096pn2ssz82536x9a98xqwbimy4kvn6" } }, { @@ -73632,8 +74176,8 @@ "org-agenda-property", "org-edna" ], - "commit": "4716603f3719acd89a268fb907b91fd3d6af311a", - "sha256": "1sjdgdg0j8j7qd5scls9rbyk445bcmkf84iz4kgiyca7bb7rap57" + "commit": "8d7acda24a00ef94fd14a4e2ebe2606009eb46e9", + "sha256": "1h9gfy2assjl2l9dfyp40ypkdm541cisx84vnapjnr6i1bxsvdck" }, "stable": { "version": [ @@ -73741,6 +74285,35 @@ "sha256": "1y1nrw39bc1ng6p4asy4lv3y20vdvx1cqa03s5jf9nccddn5j924" } }, + { + "ename": "org-inline-pdf", + "commit": "d069aa75232fff5d8b5db485f037191181d8c4b6", + "sha256": "00f8gd34lsp96j20s6sax4hjwqsnrz4647xdchzxav7cpqjmky8m", + "fetcher": "github", + "repo": "shg/org-inline-pdf.el", + "unstable": { + "version": [ + 20210107, + 940 + ], + "deps": [ + "org" + ], + "commit": "a449c614d63712cd55e8c38d4679667117c132c1", + "sha256": "0grsmhif0pmdsvc6lifxip1jh57h5him6ipzkr1rvbs5l47qndk7" + }, + "stable": { + "version": [ + 0, + 2 + ], + "deps": [ + "org" + ], + "commit": "015c70a7305c251b72709b6e8dce4e1230e681c5", + "sha256": "1qc92xvgxmnwjixk8bxwbc1l1jj0qk9dg73jyaip6lk4g0wjk6xf" + } + }, { "ename": "org-iv", "commit": "e7db0c34f0f6fb9c3b9e581a74304cc9a26ed342", @@ -73803,14 +74376,14 @@ "repo": "bastibe/org-journal", "unstable": { "version": [ - 20201101, - 1438 + 20210109, + 913 ], "deps": [ "org" ], - "commit": "14ce0119fe2d89f2f2207788be2edce0b9372822", - "sha256": "0ba1rzgk1mw27jzb0bjvwgxjxim4mgs710jfazms2f7gdi328gbg" + "commit": "08d5fce95023c015372678d353388ad0dae8952b", + "sha256": "0f1826xi9z895a1wgnvvv5nqpi2r0l6f8h761zk8ng9j1rhkz865" }, "stable": { "version": [ @@ -73910,8 +74483,8 @@ "posframe", "s" ], - "commit": "e9d30ec4b1cbf4532051d0790948a95e1bd681c1", - "sha256": "182djf213raagpc8rhj1vxbn6imsp6lpabcsfajq9vxlvyx360xk" + "commit": "d8be05fd6857c72a1766e3fa9dafa1602ccf88e3", + "sha256": "0vidxcv07brz4adik1826g0v7zyyz80r84kzz01rcxcc471fl957" } }, { @@ -73922,14 +74495,14 @@ "repo": "stardiviner/org-link-beautify", "unstable": { "version": [ - 20201129, - 736 + 20210112, + 635 ], "deps": [ "all-the-icons" ], - "commit": "2c5f504cd3674db9f7ddd9aff0dd8b9ebdd8f0b3", - "sha256": "0yzidf1liw4nnd03sw8qsflplg1lc1w8y4kaklpbbk99rv5jf76s" + "commit": "9e924c1f7a8d893b59e3a62e8731e1bceded5b08", + "sha256": "13q7l77nij20ybpgqch5waj5n1kggcbd9xr44lqzar6s00zxc47d" } }, { @@ -74052,14 +74625,14 @@ "repo": "org-mime/org-mime", "unstable": { "version": [ - 20201105, - 2322 + 20201224, + 1404 ], "deps": [ "cl-lib" ], - "commit": "3974bd41902a810d18a787e49f07cddd7849c693", - "sha256": "0vchyd80ybvr6317dwm50nxcgxfrpc0bz6259vnrh24p5sb8shbj" + "commit": "b47811562ba5c0882e9bacf9124b18fb5d0f4a61", + "sha256": "0xnrgf5p9l920lfzfxa7msjfgm6ic7xfn4mycxjv9jmdnkdm85hw" }, "stable": { "version": [ @@ -74101,30 +74674,30 @@ "repo": "ndwarshuis/org-ml", "unstable": { "version": [ - 20201207, - 638 + 20201229, + 418 ], "deps": [ "dash", "org", "s" ], - "commit": "b644fdcc85090fd83827fb480482681409a3033e", - "sha256": "0b5shcqydxdp6hwfpxjcwzlmyhqb3jcmvysgk1kdvzjm5jcqz0y6" + "commit": "d856ac6f0afed0299a47ed77830c676fd0fa9e55", + "sha256": "1rydmbjzq24vzfpfrb93ad4wibhpc4rnk7crqbx1p11sdby85h95" }, "stable": { "version": [ 5, - 4, - 1 + 5, + 3 ], "deps": [ "dash", "org", "s" ], - "commit": "66354a0d4a50def2bc88e91a0301fd929a66e00a", - "sha256": "1risdrrqnj5fcnpybaqczavwd30dcfk89xd4sb578p8h8fz3hy0f" + "commit": "a396e4a11394b5e00aef1450488b61aeddbd9b55", + "sha256": "1rydmbjzq24vzfpfrb93ad4wibhpc4rnk7crqbx1p11sdby85h95" } }, { @@ -74177,14 +74750,14 @@ "repo": "jeremy-compostella/org-msg", "unstable": { "version": [ - 20201010, - 1531 + 20210105, + 2114 ], "deps": [ "htmlize" ], - "commit": "5f0f1a7a79245646bc1c85757f3277c35d6df007", - "sha256": "1c8qa01w3953d858s8r0z60xlvgqxhm0l1svfydl4anghq22wc48" + "commit": "bb378c7942804b81ac9ddf4b14381cd9d84c993c", + "sha256": "0qmbajl91a6xcjgd9537cw6r75ahycwz77rzc7svsa0rhjji8sh9" } }, { @@ -74195,8 +74768,8 @@ "repo": "akirak/org-multi-wiki", "unstable": { "version": [ - 20201203, - 847 + 20210111, + 1022 ], "deps": [ "dash", @@ -74204,8 +74777,8 @@ "org-ql", "s" ], - "commit": "8c0f56703d301cef6c41feb65bf60cc0da1518cb", - "sha256": "0zq8h2bl4gcanqvq730iip93h37rmj1j1w916yqr8rn7wap4pgls" + "commit": "c9005cbe4077cce3743b680dec97c11fa179bb36", + "sha256": "1428lky09cvlqdb8b9zf0x49cxmigrkhvhi391b2mj2qzgmjzcvm" }, "stable": { "version": [ @@ -74313,8 +74886,8 @@ "repo": "fuxialexander/org-pdftools", "unstable": { "version": [ - 20200929, - 2241 + 20210110, + 2132 ], "deps": [ "org", @@ -74322,8 +74895,8 @@ "org-pdftools", "pdf-tools" ], - "commit": "3c2b9a413eb841c781cfb49d8c343bf07aa0ad1f", - "sha256": "0hk6dldi7ccymypp6rrf370ccgps27yh6z53nhjbzc9phk1pkslm" + "commit": "812bbff3212097bb9f8d2acc4b25826ed45dde92", + "sha256": "1iaswir2fwbhnwlyi2a1h9azgfdsa8m5ydgyckf67a2y5ykwkwv7" } }, { @@ -74469,10 +75042,10 @@ }, { "ename": "org-password-manager", - "commit": "fba84d698f7d16ffc0dc16618efcd1cdc0b39d79", - "sha256": "0wxvl6ypgn6ky1z3dh33ya3rh73znkh5f8qhqwfmwp7hy2mbl4la", - "fetcher": "git", - "url": "https://github.com/leafac/org-password-manager", + "commit": "38249f32d150d10b6ed86679361d99ace2375a02", + "sha256": "148rv5kzmnqlfn8z2474wn0bxir49d4mb40mjrv76kvyzyj7nly9", + "fetcher": "github", + "repo": "leafac/org-password-manager", "unstable": { "version": [ 20180227, @@ -74508,16 +75081,16 @@ "repo": "fuxialexander/org-pdftools", "unstable": { "version": [ - 20200929, - 2241 + 20210110, + 2052 ], "deps": [ "org", "org-noter", "pdf-tools" ], - "commit": "3c2b9a413eb841c781cfb49d8c343bf07aa0ad1f", - "sha256": "0hk6dldi7ccymypp6rrf370ccgps27yh6z53nhjbzc9phk1pkslm" + "commit": "812bbff3212097bb9f8d2acc4b25826ed45dde92", + "sha256": "1iaswir2fwbhnwlyi2a1h9azgfdsa8m5ydgyckf67a2y5ykwkwv7" } }, { @@ -74621,8 +75194,8 @@ "elnode", "org-present" ], - "commit": "ba7e07af3bd1142e310e868893b919286758a007", - "sha256": "1vzipij1wy3g1lh13igbmf16p16llgnm90ydjrr6mlb35d141i20" + "commit": "dc3be74c544efc4723f5f64f54b4c74b523f0bbd", + "sha256": "0axl2wbkgb5vd7dm471gxw45lxv8za6wfcai15rjrfbhlxckj7l9" } }, { @@ -74769,8 +75342,8 @@ "repo": "alphapapa/org-ql", "unstable": { "version": [ - 20201204, - 414 + 20201213, + 1358 ], "deps": [ "dash", @@ -74785,8 +75358,8 @@ "transient", "ts" ], - "commit": "1389ccb46be0db0252196f52ee1337dc65dc1a2a", - "sha256": "17smsqy5y2sk3sasgl8dn49nk6s2z8wpr6h1b8g7ds62vc61rz7l" + "commit": "208e103ecc146db71d878df3bd09c6eb60c2797d", + "sha256": "09vdndp3935iy4flynbjpkvfax7vs1ppswl19wx4nn2rp7hdz8kp" }, "stable": { "version": [ @@ -74886,28 +75459,28 @@ "repo": "oer/org-re-reveal", "unstable": { "version": [ - 20201114, - 622 + 20210111, + 1807 ], "deps": [ "htmlize", "org" ], - "commit": "0062756e9a5b6ec96c7de5ca94372cc6495296a1", - "sha256": "1lm5aymzbbb5syffm2lh6alaqapjdigl7r5c1qcvyh7hzil36rsx" + "commit": "7b536b497edc46e6231f33d2c1eea9cd9a7eabbb", + "sha256": "16kpprrcylrysbpqsz2k47q0qb1yjz9y7az71aik1nskinnml83v" }, "stable": { "version": [ 3, - 4, - 3 + 6, + 0 ], "deps": [ "htmlize", "org" ], - "commit": "0062756e9a5b6ec96c7de5ca94372cc6495296a1", - "sha256": "1lm5aymzbbb5syffm2lh6alaqapjdigl7r5c1qcvyh7hzil36rsx" + "commit": "7b536b497edc46e6231f33d2c1eea9cd9a7eabbb", + "sha256": "16kpprrcylrysbpqsz2k47q0qb1yjz9y7az71aik1nskinnml83v" } }, { @@ -74918,15 +75491,15 @@ "repo": "oer/org-re-reveal-ref", "unstable": { "version": [ - 20200624, - 615 + 20210104, + 1650 ], "deps": [ "org-re-reveal", "org-ref" ], - "commit": "d60e7b000e863c60485f866f14f552506317f5b4", - "sha256": "03p3fhrllrx42dzx4v2lc4w6bpw5wxgncd8mivg3lqhkm8sb5qwj" + "commit": "2379e224d6acfdba3ee6f0de72805cdfa6b8e0f8", + "sha256": "1467vskijg2n8k7fa2jj2hz8xr2s04r8a89521wmz54cza21g5j4" }, "stable": { "version": [ @@ -74950,8 +75523,8 @@ "repo": "alphapapa/org-recent-headings", "unstable": { "version": [ - 20201118, - 737 + 20201213, + 747 ], "deps": [ "dash", @@ -74960,8 +75533,8 @@ "org", "s" ], - "commit": "11430626f7d83b8eafbaf34bb5eeeff458035187", - "sha256": "1z2rad7rvh125a91z2xnwd3zslqs2v5bwhb8p0lvnw3b7z6qy91y" + "commit": "5da516a1586675992c0122ed32978c18dda06318", + "sha256": "1xnhahgs1q6y7w0rrc33qbkdagjm6q71a4i0msi4gsfnnzwn4vam" }, "stable": { "version": [ @@ -75018,10 +75591,11 @@ "repo": "jkitchin/org-ref", "unstable": { "version": [ - 20201126, - 1924 + 20210111, + 1838 ], "deps": [ + "bibtex-completion", "dash", "f", "helm", @@ -75033,8 +75607,8 @@ "pdf-tools", "s" ], - "commit": "120509c38929cc25d814e9a42092c44cb34ec34e", - "sha256": "0l1il3dh4rcw5ylia2ywszmj6fpdfbvmr496scsdw4w0skrjpljw" + "commit": "e7aab97a39839cec7ba016bb5caaa9f9288bf21f", + "sha256": "16j8qb985jzjflgbnvd521wavsz5pmyhqds991pp0v12awm0dq7j" }, "stable": { "version": [ @@ -75160,8 +75734,8 @@ "repo": "org-roam/org-roam", "unstable": { "version": [ - 20201128, - 1144 + 20210111, + 1138 ], "deps": [ "dash", @@ -75171,8 +75745,8 @@ "org", "s" ], - "commit": "be95b42d32d9707309ab373f1d8182c84db41c5c", - "sha256": "17djynwjl11jmgx986f9zr0zd4sanadv6m9q4hg3ll46933mj8jx" + "commit": "05a9bc44f2d158cc355c904382f2c7b079aeee15", + "sha256": "18s3qp671g28qy1qllnm4lay7mvyar8qcqqjn8yd3417gxwndqhh" }, "stable": { "version": [ @@ -75200,15 +75774,15 @@ "repo": "org-roam/org-roam-bibtex", "unstable": { "version": [ - 20201207, - 741 + 20201220, + 1653 ], "deps": [ "bibtex-completion", "org-roam" ], - "commit": "c002d63fdb5cdb388dc376b14e8c1e599ffcb3b6", - "sha256": "0cll1pbpk6jldkv6apxmpzdy6dd9nyh72kbg7w1r4jrjmjzr9wx0" + "commit": "9ba15069c3f7ecd1080873cd3a7d587eb7c72d08", + "sha256": "0nfsrrca1p5xlildcbjisfhhrwiwgd6jv0nfn4a2gdpxd77v39d6" }, "stable": { "version": [ @@ -75232,8 +75806,8 @@ "repo": "org-roam/org-roam-server", "unstable": { "version": [ - 20201203, - 2002 + 20210109, + 935 ], "deps": [ "dash", @@ -75243,8 +75817,8 @@ "s", "simple-httpd" ], - "commit": "6cfb8d60abfecd985975f683e48e87d03a0f0212", - "sha256": "1rvlmldhvd2vr72j6sh9dn718c99rmzk7wdpra4lvs1x95rbvcp6" + "commit": "c7793202e9929dc2a415482779141e7b429421ce", + "sha256": "1z29xngyxmq0pd8kfx6z8n8hps4apnffnsi8qc0hvmyhp197hkqc" }, "stable": { "version": [ @@ -75289,25 +75863,26 @@ "repo": "tyler-dodge/org-runbook", "unstable": { "version": [ - 20200523, - 2004 + 20210102, + 1627 ], "deps": [ "dash", "f", "ht", + "ivy", "mustache", "s", "seq" ], - "commit": "27dafe2a470d54a2c664164b5f9cbd2a1e5d921e", - "sha256": "1bl8f7azkr2657izhcwxy8w8jz7qs2wkk843q2bzzdzixqadlabs" + "commit": "a05dcf6b9674406a9d616b53b4f199a3f87b3f2a", + "sha256": "0bj91c8zz804zclhl5ay8k2sjw9pi9mrkrjcmcs2h36klcb1x4qn" }, "stable": { "version": [ 1, 1, - 2 + 4 ], "deps": [ "dash", @@ -75317,8 +75892,8 @@ "s", "seq" ], - "commit": "27dafe2a470d54a2c664164b5f9cbd2a1e5d921e", - "sha256": "1bl8f7azkr2657izhcwxy8w8jz7qs2wkk843q2bzzdzixqadlabs" + "commit": "e5d1e30a05552ce1d63d13ada1487643a41b92cb", + "sha256": "093jbpanvpwxxdyb9136r804ai1147rbq1gfb7pdy0iymhrv3d9r" } }, { @@ -75446,8 +76021,8 @@ "repo": "alhassy/org-special-block-extras", "unstable": { "version": [ - 20201130, - 1159 + 20201222, + 234 ], "deps": [ "dash", @@ -75455,12 +76030,12 @@ "org", "s" ], - "commit": "90bcb2dbc09854d9599eeba5d503a079e7129bd0", - "sha256": "1czkasfmgsf5s2xq1a9xddvn5gbbhk1jgg56wg459n5zqpnz5s8f" + "commit": "61ff797d068947a4f1c172bb83aaf5cf897febf1", + "sha256": "112nbh12qgq3wy3p736k8hjzpaa621zv4x2rdbxhaib1il7x7i7p" }, "stable": { "version": [ - 1 + 2 ], "deps": [ "dash", @@ -75468,8 +76043,8 @@ "org", "s" ], - "commit": "d1054754d0701296bc0cde1fb022619b1f38dfde", - "sha256": "1fy1sgj3jg7l6fjl00dxb7npf7x8ldcbs81cs8w4b4ciklp30mzr" + "commit": "61ff797d068947a4f1c172bb83aaf5cf897febf1", + "sha256": "112nbh12qgq3wy3p736k8hjzpaa621zv4x2rdbxhaib1il7x7i7p" } }, { @@ -75480,30 +76055,30 @@ "repo": "ndwarshuis/org-sql", "unstable": { "version": [ - 20201121, - 2021 + 20201222, + 206 ], "deps": [ "dash", "org-ml", "s" ], - "commit": "0dc17dcf669abc0c5257abedc00b3e2a4116fcf8", - "sha256": "0cw2x9gnbsqg864p4w7whjpy8v9m5rgz3j9ca4l6y5arh03167xj" + "commit": "ddbab360a49d4c0cab964cd1fdb80d2135a10272", + "sha256": "0rhc5sb6drzndxay52qb3f1kbxfnwvz99i1jpjs4adsmyhx35xai" }, "stable": { "version": [ 1, - 0, - 3 + 1, + 0 ], "deps": [ "dash", "org-ml", "s" ], - "commit": "0dc17dcf669abc0c5257abedc00b3e2a4116fcf8", - "sha256": "0cw2x9gnbsqg864p4w7whjpy8v9m5rgz3j9ca4l6y5arh03167xj" + "commit": "6160de13bcef3ad91c706d8a7b1601703b424616", + "sha256": "0rhc5sb6drzndxay52qb3f1kbxfnwvz99i1jpjs4adsmyhx35xai" } }, { @@ -75578,11 +76153,11 @@ "repo": "bastibe/org-static-blog", "unstable": { "version": [ - 20201123, - 1409 + 20201221, + 1630 ], - "commit": "b104911cdded2547d5186d1765190857cca2587d", - "sha256": "09s519mjgmy5k0n4psf3x4gs5w6k77kpvpqb2s8fjplgf5ymhzm6" + "commit": "1dd66614cc54a2051646324c7910e3e295d1cc40", + "sha256": "18fawppxij4yd2w5s1h223v0jpv44dpxbja32w0n9975ip5ciir0" }, "stable": { "version": [ @@ -75602,26 +76177,25 @@ "repo": "alphapapa/org-sticky-header", "unstable": { "version": [ - 20191117, - 549 + 20201223, + 143 ], "deps": [ "org" ], - "commit": "1053ebdeb3bd14fc8d4538643532efb86d18b73c", - "sha256": "171j10ngngra45sxmlkzrcmhhqf2b6yjqq0r5gl16zcbgggg936a" + "commit": "79136b8c54c48547ba8a07a72a9790cb8e23ecbd", + "sha256": "1ijfy4yr39rrg58w5506pcb0xnqf2l5ammwl4z8r4mmknznysp9i" }, "stable": { "version": [ 1, - 0, 1 ], "deps": [ "org" ], - "commit": "2847035ec559a46bd7b555f220f819c88371d538", - "sha256": "0g6hdg11jzzpw7h0f6p795l5aj6pag2nhhfbx90cg28j61d28vwh" + "commit": "79136b8c54c48547ba8a07a72a9790cb8e23ecbd", + "sha256": "1ijfy4yr39rrg58w5506pcb0xnqf2l5ammwl4z8r4mmknznysp9i" } }, { @@ -75632,8 +76206,8 @@ "repo": "alphapapa/org-super-agenda", "unstable": { "version": [ - 20201121, - 941 + 20201211, + 918 ], "deps": [ "dash", @@ -75642,8 +76216,8 @@ "s", "ts" ], - "commit": "ac7f2ef05c161b10390141b6863b431dc9360edc", - "sha256": "0n4dg0hhb4nsfh65jm5q1jypxk9dnnm8gzw7gj6bxf4dm9677n99" + "commit": "f5e80e4d0da6b2eeda9ba21e021838fa6a495376", + "sha256": "18q1af3hjjbsny9lxqjsq68qjzzpdjqgx7npg7pl7k3hzdjaj42f" }, "stable": { "version": [ @@ -75731,15 +76305,15 @@ "repo": "abrochard/org-sync-snippets", "unstable": { "version": [ - 20190318, - 1744 + 20210111, + 1726 ], "deps": [ "f", "org" ], - "commit": "50cefe5a37196ed1af3d330d6871c3b37fa90d41", - "sha256": "13d1adymxn3b579syyaszgg98h3kh3hwn97pdfzghfli1cd9fb9y" + "commit": "88f995dea188b8a645a3388c42b62a2bb88953d3", + "sha256": "1ggn4y6sczl08mzbnzgjixgl685c71wqqffmng4gl67fs6wr6lrv" } }, { @@ -76033,11 +76607,11 @@ "repo": "takaxp/org-tree-slide", "unstable": { "version": [ - 20200611, - 1143 + 20201215, + 1117 ], - "commit": "18034c476038adcc1c4697168b8068f4d0ce62fe", - "sha256": "0mibyph6db08llgjcpzbrsj75zwrlg8rn2ckyq69c10gkxsq8dkk" + "commit": "d6e8e91433dfe4968f1343b483f2680f45a77d52", + "sha256": "1zz12xk8vl2qic5hpvl0jcwysbmrfb6rfigvf8hr3nhdm9fp36aw" }, "stable": { "version": [ @@ -76049,6 +76623,36 @@ "sha256": "0aacxxwhwjzby0f9r4q0lra5lqcrw5snnm1yc63jrs6c0ifakk45" } }, + { + "ename": "org-tree-slide-pauses", + "commit": "87a76bfd2a6baccb18be6e7917087ab1c7fbf948", + "sha256": "07idjfwrgmql504nmzkpx3z7695y2hbqk2r8fc73bgb2p29nzvkv", + "fetcher": "github", + "repo": "cnngimenez/org-tree-slide-pauses", + "unstable": { + "version": [ + 20201215, + 146 + ], + "deps": [ + "org-tree-slide" + ], + "commit": "f02af7102e9ecef7c3dac0d376d85bbb8c4de4cc", + "sha256": "0fzif0ss5yhvhj7q041qbpdb91az03zjf4rgs43a81g6a8qwi803" + }, + "stable": { + "version": [ + 0, + 1, + 0 + ], + "deps": [ + "org-tree-slide" + ], + "commit": "80d6e9279fad10bcff15fbce75726bb002da73c0", + "sha256": "03qhlgsj5m31q40vq196fxz5232mz2mwl9bbk22rlcj91k8b1j8r" + } + }, { "ename": "org-treescope", "commit": "2db07414d2d39b2d40a2ae91491032844b82d801", @@ -76188,8 +76792,8 @@ "repo": "alphapapa/org-web-tools", "unstable": { "version": [ - 20191217, - 1459 + 20201212, + 1058 ], "deps": [ "dash", @@ -76198,8 +76802,8 @@ "request", "s" ], - "commit": "ebc7888f4f4cad26ec1298edd7bf606a5ea2d564", - "sha256": "09ihqas9rx7c6146zmb3p0q395gxkfscxixlmz4v05smrhka1xz8" + "commit": "b94a07add8558ef7b0666173dbb8a2554f1d41a6", + "sha256": "08z5qc0gki5ci4cf2j4b7190vi2wpsb9qpq9768ifkhhm82mfawr" }, "stable": { "version": [ @@ -76484,11 +77088,11 @@ "repo": "kostafey/organic-green-theme", "unstable": { "version": [ - 20201010, - 1720 + 20201216, + 2240 ], - "commit": "debd4305ee29592eb5c2a87e1c78abdd30139043", - "sha256": "1si084giyf2r6069nsvyg1gcyx9lk85yzlf0ifjhkw6cv2gkfwgy" + "commit": "0ed99a9c0cf14be0a1f491518821f0e9b7e88b88", + "sha256": "1l70vvyv8walqjk96jgr8047fi0yiqz0lm3r0vh6xrh6phna5mcd" } }, { @@ -77483,15 +78087,15 @@ "repo": "jkitchin/ox-clip", "unstable": { "version": [ - 20191122, - 237 + 20210112, + 1746 ], "deps": [ "htmlize", "org" ], - "commit": "f5eac28734ea33d0b7a3dbe10b777907a91cf9f9", - "sha256": "05ndpkqr4kh2942ygjsa1w53056d60qvl0gmp30dxmzc57v0wb2x" + "commit": "d782d572c8684f313576d1bb63912654e42e65fc", + "sha256": "049a4azfls5l7l5wnwyj1380d5m5mhc5h56y742w8xpqdp18jbk4" } }, { @@ -77523,6 +78127,21 @@ "sha256": "057sqmvm8hwkhcg3yd4i8zz2xlqsqrpyiklyiw750s3i5mxdn0k7" } }, + { + "ename": "ox-gemini", + "commit": "d2d6a5503a853523ffbbdc4c0db5e76bb3ec7308", + "sha256": "15lsyyshardfs24qcwq4psriip02mprc3yvilqmcv3k72x05mh6c", + "fetcher": "git", + "url": "https://git.sr.ht/~abrahms/ox-gemini", + "unstable": { + "version": [ + 20210102, + 1517 + ], + "commit": "d88c10bcb10fc463fa5a2f6e29c8c94b75a314c0", + "sha256": "1f8kbg5vjd1k7fak3v56b77yk612j6vmzx4xzx3m2vq3f0nyxq29" + } + }, { "ename": "ox-gfm", "commit": "10e90430f29ce213fe57c507f06371ea0b29b66b", @@ -77607,8 +78226,8 @@ "deps": [ "org" ], - "commit": "f24c9bd522ae22bee2327c2b53858d0a5066707d", - "sha256": "1f48j4zpcamdcxjrz7mcrlavmn4qmnnwf871h0qw3v2ad8nk4jpk" + "commit": "6bc8ee08023695fa167ac0ddf1fc61e1975fa1ce", + "sha256": "0sb4ms9wd6085g6c6kfjm4bk9z1z02l8dbn15xs9axzksk4zcq6x" }, "stable": { "version": [ @@ -77782,8 +78401,8 @@ "ox-gfm", "s" ], - "commit": "8a00843a2a58e0c43cb53080d1005c619e4a9c88", - "sha256": "1kk13mj8bn6kvck95j7wx41maip4b9kpwdln00m5rj6z3d51nrly" + "commit": "e79c4c4429f64fe61cfa673dcd33273bba30f9db", + "sha256": "153sr1pnnlglzmsz9kx8d8h604j01anf85n57pdz2dnbh6wr2wak" } }, { @@ -77938,8 +78557,8 @@ 20201208, 1749 ], - "commit": "e153f4ff541fead4bce9d59820e7929debd0ce11", - "sha256": "1dmqaid08vhw4x1yapisqzga97nmvnbp9wnb6wd5kpmvyxwcamwn" + "commit": "b7b1d682a724ef4ea729327395aa6577cba27133", + "sha256": "1cznkrcxi0pfs7i1fvz6zg8b3z2axcmqmjw62s15p0fhn4d2czxf" }, "stable": { "version": [ @@ -77958,14 +78577,14 @@ "repo": "yjwen/org-reveal", "unstable": { "version": [ - 20201025, - 952 + 20201211, + 1518 ], "deps": [ "org" ], - "commit": "6542658d67965a24c0641845ca7cc0759c4a1fd2", - "sha256": "01c4q0hlr67kmxr0x53ic3dzfh5fmydri6hp14qr396jfbfw39z1" + "commit": "e8673f4825b1c6e97f8ba895ccaf8c460cba5a09", + "sha256": "08gsb4c7a3hvkp3vdzad2wbs3n6ldxddhqp7bxsgsw7z3gfb4snv" } }, { @@ -77976,14 +78595,14 @@ "repo": "choppsv1/org-rfc-export", "unstable": { "version": [ - 20190926, - 851 + 20201218, + 1356 ], "deps": [ "org" ], - "commit": "b86c9e6f21d99ea657b4f2224f816300485ed73f", - "sha256": "1lg4bs0dr4srcgqxv9qi6v53aqq9i8inc1q024ndag4bis2x1q01" + "commit": "1a49535cf927cd52ffa05c815b890888c4addf86", + "sha256": "001dv3zxsvh5zgrwn5jmib82bns4phbbd5kcy5mvmk7nyayrmq9p" } }, { @@ -78079,11 +78698,11 @@ "repo": "dantecatalfamo/ox-ssh", "unstable": { "version": [ - 20201017, - 2209 + 20201217, + 317 ], - "commit": "27f311382c6bc9192c6771f219d176836bd23286", - "sha256": "0vsk50d969yipywpc0imjsaj5d4d3x070klxpqccawziy60qdppf" + "commit": "1b39849e3a315de95543eb3cf69c42fa33a8f5cd", + "sha256": "0hcm91fh3qcxp6n40363sxdk3hz87vsmbw032d7iwb2wmdfwh6b4" } }, { @@ -78353,20 +78972,20 @@ "repo": "zenspider/package", "unstable": { "version": [ - 20201206, - 446 + 20201222, + 255 ], - "commit": "e612385c90eff5e347a9c449e233aed3a54e1a3d", - "sha256": "1w79apm5gg57np1mb0vkbvlgycp701f051k1lwg7njbqnfxp9cng" + "commit": "59b0f6daf219a2e0a0a0389d56471eb2a876f21d", + "sha256": "139ffhhjv45fbxqjasv46v0057sjbynqi9x6g7vikrph0js7bnja" }, "stable": { "version": [ 1, - 2, - 1 + 3, + 0 ], - "commit": "e612385c90eff5e347a9c449e233aed3a54e1a3d", - "sha256": "1w79apm5gg57np1mb0vkbvlgycp701f051k1lwg7njbqnfxp9cng" + "commit": "59b0f6daf219a2e0a0a0389d56471eb2a876f21d", + "sha256": "139ffhhjv45fbxqjasv46v0057sjbynqi9x6g7vikrph0js7bnja" } }, { @@ -78377,14 +78996,14 @@ "repo": "melpa/package-build", "unstable": { "version": [ - 20201206, - 2137 + 20210112, + 2058 ], "deps": [ "cl-lib" ], - "commit": "2807a0a434616c4c7a7039316f7b1e3a352c0c58", - "sha256": "0msl4vkxv7hl3k1ffy4j8g93zm8ba7wn81gbm8s6b1ggzyy4pk1s" + "commit": "35650f45063cf5f028ec406ded222f6bc59058f1", + "sha256": "08n8riq4vgaxgicns025mv1msw9vp8s25d82wa6c6ca3v9fdlvam" }, "stable": { "version": [ @@ -78421,15 +79040,15 @@ "repo": "purcell/package-lint", "unstable": { "version": [ - 20200906, - 512 + 20210111, + 341 ], "deps": [ "cl-lib", "let-alist" ], - "commit": "05596996286089acc7693b700c7c31780439e39f", - "sha256": "09ngfyh3l6shqmxzaaidr73r2j7am9il6wimvc4w1lbfvfxdjq7x" + "commit": "348b15a1da1d62dee378b33971e39758b96c6575", + "sha256": "0zj7qxb3b0yrrfwa8n9hhzrnsyh9msf38glmn8r087p27x0ifwzr" }, "stable": { "version": [ @@ -78452,14 +79071,14 @@ "repo": "purcell/package-lint", "unstable": { "version": [ - 20191116, - 45 + 20210110, + 2231 ], "deps": [ "package-lint" ], - "commit": "05596996286089acc7693b700c7c31780439e39f", - "sha256": "09ngfyh3l6shqmxzaaidr73r2j7am9il6wimvc4w1lbfvfxdjq7x" + "commit": "348b15a1da1d62dee378b33971e39758b96c6575", + "sha256": "0zj7qxb3b0yrrfwa8n9hhzrnsyh9msf38glmn8r087p27x0ifwzr" }, "stable": { "version": [ @@ -78586,11 +79205,11 @@ "repo": "kadena-io/pact-mode", "unstable": { "version": [ - 20191117, - 2337 + 20201219, + 2223 ], - "commit": "220bf985cb31d60f47042d5f424de8b9a589e544", - "sha256": "0cz87z2y54lqvsl2xhpjmndccj7051f2v9qpqrjr3qdwmfr6azsw" + "commit": "f48a4faf5f8f8435423bda3888eca6ee67ee13a9", + "sha256": "1cmw2pxnzdd3y3f78a6l6770z2nmh0f8mydfw13fh5yfqdhv4vgx" }, "stable": { "version": [ @@ -78625,19 +79244,19 @@ "repo": "purcell/page-break-lines", "unstable": { "version": [ - 20200305, - 244 + 20210104, + 2224 ], - "commit": "34cd91d841e5334c6966e25fbfd971a2dfbcee69", - "sha256": "0lakwlr9azqkxbh38vak2299m88073ylmza7vjfhdzr9dy1cnxq0" + "commit": "69caea070379f3324c530e96e06625c3cd097cb9", + "sha256": "0plfyzmh93x1r3zgfjyx23cc7vi1pcniipclzlms1iwfkl7zsqvp" }, "stable": { "version": [ 0, - 11 + 14 ], - "commit": "67b5928a7f14568baf2716b5741e13659a86b9ea", - "sha256": "1wp974716ih2cz9kdmdz7xwjy1qnnfzdzlfr9kchknagw8d9nn12" + "commit": "69caea070379f3324c530e96e06625c3cd097cb9", + "sha256": "0plfyzmh93x1r3zgfjyx23cc7vi1pcniipclzlms1iwfkl7zsqvp" } }, { @@ -78732,16 +79351,16 @@ "repo": "abo-abo/pamparam", "unstable": { "version": [ - 20201201, - 1621 + 20210105, + 1513 ], "deps": [ - "hydra", + "ivy-posframe", "lispy", "worf" ], - "commit": "aab22e32fcdc8e83fecbe248bb35f4583739f955", - "sha256": "1kdv5gj2ddiwzy79k4hszc5i3110171bs23vlajq9y31cszjn8jz" + "commit": "0ba91149095bee8c43688c68f83f4d365fbe6771", + "sha256": "0459qqhra9zx9klw89s5hjbka1kdh1nvhl6wc7igfklglzw0d7zs" } }, { @@ -79357,16 +79976,16 @@ "repo": "NicolasPetton/pass", "unstable": { "version": [ - 20190830, - 2017 + 20201230, + 1556 ], "deps": [ "f", "password-store", "password-store-otp" ], - "commit": "919d8e3826d556433ab67d4ee21a509d209d1baa", - "sha256": "03cf7d51p7d5a9nmlzp1k0n68j4n0di0nmpmcx3vlfd62lk3rs2p" + "commit": "a095d24cf06a7b0fbc3add480c101304a91cf788", + "sha256": "1nv6xs90zkv3qd0jxjwxlx132cz0ias0i7n2kvih6fp5gfkrzdci" }, "stable": { "version": [ @@ -79390,14 +80009,14 @@ "repo": "pjones/passmm", "unstable": { "version": [ - 20181130, - 1612 + 20210109, + 8 ], "deps": [ "password-store" ], - "commit": "b25a92048c788a8477cc5ffe14c0c4a4df19d79a", - "sha256": "1jg2rs010fmw10ld0bfl6x7af3v9yqfy9ga5ixmam3qpilc8c4fw" + "commit": "d78d1bf4f397180d2256248df589f33aafb4c8b4", + "sha256": "0r2nj2p6kx40lhmsv06xsyylj5b9lqji32rc4ipr1biaai52w2b6" }, "stable": { "version": [ @@ -79767,26 +80386,20 @@ "repo": "sigma/pcache", "unstable": { "version": [ - 20170105, - 2214 + 20201226, + 634 ], - "deps": [ - "eieio" - ], - "commit": "1f31433ad0b37a2e68d60ee043a8188ef1ce3176", - "sha256": "1bk6rg9qaaasbng6m6mdkjbwdm68zkr7mfwj18l34ivlz0f05sxw" + "commit": "893d2a637423bae2cc5e72c559e3a9d1518797c9", + "sha256": "1xxbi4lp4ygvciqmy8lp6zn47k954ziz5d95qz1l7a2jix3rxf1p" }, "stable": { "version": [ 0, - 4, - 2 + 5, + 1 ], - "deps": [ - "eieio" - ], - "commit": "025ef2411fa1bf82a9ac61dfdb7bd4cedaf2d740", - "sha256": "1jkdyacpcvbsm1g2rjpnk6hfr01r3j5ibgh09441scz41v6xk248" + "commit": "e2f17133e624237f852a3b8c0d7c136252cb8c1a", + "sha256": "0zmw3m86illywfn7kn9jgiq4b0hglj34mz0jji834iayjhkpkvr7" } }, { @@ -80093,6 +80706,24 @@ "sha256": "1b7csqypqkalkzq6vrbq5ry1gdk0qnhnk43rlj514mph0s1nywdd" } }, + { + "ename": "peertube", + "commit": "b6757bf92dc0f8bd1b96a3fd036f76c91b045b6e", + "sha256": "0y8vwz7l6aips9ldkd6lyx9l70c89kjwgzi3k6ajq7aw4r23wvlh", + "fetcher": "git", + "url": "https://git.sr.ht/~yoctocell/peertube", + "unstable": { + "version": [ + 20210101, + 1007 + ], + "deps": [ + "transmission" + ], + "commit": "bb529db154596e86327829edbd7144b67cf72255", + "sha256": "1vqlz6s57cqhbmxc9733crhb1z91lrhm0xmwfsq3yb30nfdwlyyb" + } + }, { "ename": "pelican-mode", "commit": "aede5994c2e76c7fd860661c1e3252fb741f9228", @@ -80370,25 +81001,25 @@ "repo": "nex3/perspective-el", "unstable": { "version": [ - 20201203, - 633 + 20210104, + 2243 ], "deps": [ "cl-lib" ], - "commit": "7d747f50464e5c518bc6963e66d6d378ac3e9add", - "sha256": "1y4mjbhig9x0xy7xvd16spgzzrj7jm6izfj04q4d5gv41xpqxfy3" + "commit": "2f2b59e693f08b8d9c81062fca25e6076b6e7f8d", + "sha256": "04r5h5zs5r6s22p5ynhpr860r2r552z9pyf4kbabfg1gz9jag7yp" }, "stable": { "version": [ 2, - 13 + 14 ], "deps": [ "cl-lib" ], - "commit": "1eb46847ea563e213e21e65ec65892e37aeda577", - "sha256": "17ldps10ap0yz3z9smdf4cr35xw3wscmqphad8d9ddd2jbqin6xg" + "commit": "2f2b59e693f08b8d9c81062fca25e6076b6e7f8d", + "sha256": "04r5h5zs5r6s22p5ynhpr860r2r552z9pyf4kbabfg1gz9jag7yp" } }, { @@ -80861,11 +81492,11 @@ "repo": "emacs-php/php-mode", "unstable": { "version": [ - 20201120, - 1807 + 20210103, + 1738 ], - "commit": "7e5722c8854d7465c93765653e6ec0897fb7cc7b", - "sha256": "0f4i76rbrhgmq4ba7r560yj0xnlmhv46inlp83bwl7cbcy1r679n" + "commit": "8cdc727e6d4eef81655b90574784e9540f407cda", + "sha256": "1v09ldgdjayj66q8vn97n6hh0zqk3pxqg100ibbcyz6vfrsa5pdm" }, "stable": { "version": [ @@ -81184,11 +81815,11 @@ "repo": "johanclaesson/picpocket", "unstable": { "version": [ - 20180914, - 1819 + 20210103, + 2315 ], - "commit": "6fd88b8711c4370662c0f9c462170187d092a046", - "sha256": "1mdzzxf7xm7zwrpnqqxa27d1cr31pd72d7ilbwljv13qp177a3yw" + "commit": "fa3a49f011b5ae139728548fec7375743f61c7c7", + "sha256": "1vb358jyfs3px70ah60dmlz5azdfkva9xrw3mgrr4060vcy7w4q1" } }, { @@ -81224,6 +81855,21 @@ "sha256": "1vwnybyrzk8nw2cs27yrsipxb6hmx7cs5d60yf00h0wiv3l6v3rr" } }, + { + "ename": "pikchr-mode", + "commit": "602e3c99f100286d52a9022800e9aac0b7fa97c5", + "sha256": "0rgmy0rckd84jiw3z0ll7pghfyczp4g75rlsda0n6bfdxg7dfk16", + "fetcher": "github", + "repo": "kljohann/pikchr-mode", + "unstable": { + "version": [ + 20201212, + 2228 + ], + "commit": "dd4bb08f189c96039128dddceba26bfdabd1431b", + "sha256": "0w964qn9qag4pfwrs9pyv226ivmy1lw4s068hyi9f0jkm2fhd2za" + } + }, { "ename": "pillar", "commit": "bff55f1182f3bd0bc8a8773921f703168d87de21", @@ -81584,11 +82230,11 @@ "repo": "juergenhoetzel/pkgbuild-mode", "unstable": { "version": [ - 20200818, - 1742 + 20210111, + 1508 ], - "commit": "887c01cb06420501c7780fb01a8a76bdb0864cca", - "sha256": "17v71sd1i7wyvjzz0nir7p28cskzgws4dcpm83ch1khhljh3r7kl" + "commit": "4d7c9f154652fbaa627899566c026c0c941bb146", + "sha256": "1gnlmwasci438d3j3fh6ivsdzb65lpjk87xx93hfzmg6wfas3j85" }, "stable": { "version": [ @@ -81607,14 +82253,14 @@ "repo": "abo-abo/plain-org-wiki", "unstable": { "version": [ - 20200617, - 828 + 20201217, + 1027 ], "deps": [ "ivy" ], - "commit": "5e32e7e6216e24d515624008fa0898077403aa7f", - "sha256": "0d3nhvkzzharjv54w3rinqcpwhqb61flgvvcngfdxkrgs1yazaqk" + "commit": "faeeb54ca808bbf0f4380a938e75805b7a78dbf7", + "sha256": "02nv0rsky418zd69icxbim1xw66n8rs586i0lnl1nczjdx8vcmr9" } }, { @@ -81654,6 +82300,24 @@ "sha256": "0rjxbk9fljnjmg00vdqcyynzg591cgknyy2d92xsxsyg4d28dvwi" } }, + { + "ename": "planemo-mode", + "commit": "a6d5c914a3cfa2e1c975b429f22a086c6da908ed", + "sha256": "0nvynr73q42l6kd9cj4pai95qpyirq7amsb518f9c45q5y175rfc", + "fetcher": "gitlab", + "repo": "mtekman/planemo-mode.el", + "unstable": { + "version": [ + 20201216, + 1122 + ], + "deps": [ + "dash" + ], + "commit": "9a981f79a2727f87689ae5a07368c41d35902a67", + "sha256": "1hx1mdbb25hggg4kwga97m3wysm0yj11hnnycmbwa85c9rn96jzv" + } + }, { "ename": "planet-theme", "commit": "855ea20024b606314f8590129259747cac0bcc97", @@ -82693,11 +83357,15 @@ "repo": "TatriX/pomidor", "unstable": { "version": [ - 20200722, - 1402 + 20210111, + 919 ], - "commit": "60da23c97c30e08254a914dca411b2e3fd639c99", - "sha256": "19a5155gxz97yqhfxp48d6lnhh0qqai4pd5rg1xy79mq0hxy31p7" + "deps": [ + "alert", + "dash" + ], + "commit": "52134701fa76b12252b06c9d6fd4e8665596a95a", + "sha256": "1h94dgjcbpd6vr1wgvajx7d0ikz5jl4zdmxjgqzff0cg2vqin3r6" }, "stable": { "version": [ @@ -82717,11 +83385,11 @@ "repo": "baudtack/pomodoro.el", "unstable": { "version": [ - 20190201, - 2152 + 20210111, + 1934 ], - "commit": "6cd665ceeaca1f70954aa4caef6f085179f94c69", - "sha256": "08z2nja3bhjgg6k7bb0cr8v02y8gaxkmxmfcvvgiixw3kfrnkpwn" + "commit": "662b1f176d6faddd07be32ee6eb974ca02d5ec03", + "sha256": "02iji913mh03hdlzdl4m7lfzzqp3p7437cay5mn8ba4prpqqz76j" } }, { @@ -82868,14 +83536,14 @@ "repo": "auto-complete/popup-el", "unstable": { "version": [ - 20200610, - 317 + 20210108, + 1821 ], "deps": [ "cl-lib" ], - "commit": "13364d7674535db225789b03da766746734a4f28", - "sha256": "0glwyrks761kpan3ff6a60mqd1hk11yd7rim1fanycmp711k610q" + "commit": "bd5a0df7e5bc68af46eef37afe9e80764a1d4fd8", + "sha256": "1y9wv5c9x1rsfdhh3r7mah7yyx2cs7asjzhgsn1pbq7zdjpv5p0p" }, "stable": { "version": [ @@ -82994,15 +83662,15 @@ "repo": "kostafey/popup-switcher", "unstable": { "version": [ - 20200701, - 2034 + 20201216, + 2229 ], "deps": [ "cl-lib", "popup" ], - "commit": "68bbe23f7ceaca889529be95762925ac29515545", - "sha256": "18nfrhmdjsgmrpr82qqmxj3rdv85ml2pkssrkrljzzgaxavx5ind" + "commit": "166a90c13310b829bd392235bf7cc1e45188faff", + "sha256": "1sgsryc5g2sxsr0mz8r8gs5i4kfh2mnxqs0vpkbmlsbcl40inm0k" } }, { @@ -83114,11 +83782,11 @@ "repo": "tumashu/posframe", "unstable": { "version": [ - 20201201, - 659 + 20210111, + 44 ], - "commit": "e1552c82dffaadc5e7de09a44880a498197ffbee", - "sha256": "0qzi4ivmv65x0gn6wbfz8w2m6pg476vk0041l599mnrh0g87dfw7" + "commit": "3543f1616a6a27a9156403d8677f04ec2f7fc129", + "sha256": "046vc10rwnmzwi85nlj8fxjgy48jhyigwpvw1skn0g1q7ximhdqr" }, "stable": { "version": [ @@ -83397,11 +84065,11 @@ "repo": "raxod502/prescient.el", "unstable": { "version": [ - 20201125, - 1428 + 20210101, + 2227 ], - "commit": "5d139e5b1fe03ccaddff8c250ab8e9d795071b95", - "sha256": "11hqy8chh29lrzk04dp3rwkvf4bj0xvg9hli3w1zx968x98lfvj0" + "commit": "42adc802d3ba6c747bed7ea1f6e3ffbbdfc7192d", + "sha256": "0v12707jwd2ynk8gp3shgarl6yp3ynal7d4jzds6l2lknr6wi50w" }, "stable": { "version": [ @@ -83465,15 +84133,15 @@ "repo": "jscheid/prettier.el", "unstable": { "version": [ - 20201209, - 837 + 20201222, + 953 ], "deps": [ "iter2", "nvm" ], - "commit": "673698ed70f2205230a052dd98f2cd2f1dd0c21f", - "sha256": "1r6prwaf3w6s2byzb10zzs2n105dayz998gh0ifmlla0mw58rnhy" + "commit": "5b584f21b8dd9a53ceb7745c2d91c513358892e7", + "sha256": "1m5298i60s1rdy2r8wnyialkfbafd99wp9q0bzsbr7grq3cdp2ic" }, "stable": { "version": [ @@ -83617,26 +84285,26 @@ "repo": "alphapapa/prism.el", "unstable": { "version": [ - 20200407, - 1148 + 20201228, + 141 ], "deps": [ "dash" ], - "commit": "b618f2cea2dbf7c13d8b4fec1760c346eb9ab036", - "sha256": "1fn6514ii2z1xbjzmp0h1mhxl1yaqqk4n6zgswhxdywni34cb6hs" + "commit": "e746822cd7d8a0dcf56902d32fbadb3297690590", + "sha256": "09pskvha06picdlgclvwijng712s3xd5mr3kxxpp6gb02qsiy3yy" }, "stable": { "version": [ 0, 2, - 2 + 3 ], "deps": [ "dash" ], - "commit": "b618f2cea2dbf7c13d8b4fec1760c346eb9ab036", - "sha256": "1fn6514ii2z1xbjzmp0h1mhxl1yaqqk4n6zgswhxdywni34cb6hs" + "commit": "d1d8121eb552a7c29c25cfa9ace19cba4ae1902c", + "sha256": "0m0jrgk09dp1n1l8nf1mlvhwrk8gnv4yclmh12vf9nmxidgdwspp" } }, { @@ -84031,14 +84699,14 @@ "repo": "bbatsov/projectile", "unstable": { "version": [ - 20201208, - 2044 + 20210104, + 1216 ], "deps": [ "pkg-info" ], - "commit": "0ff73ecf7f25f47382e2d28c8ab232c18609d515", - "sha256": "1fbsvl74271hrlii73lc9g0hk67mrp0dm1zbhbrc9b2cnc2nh88j" + "commit": "c31bd41c0b9d6fba8837ebfd3a31dec0b3cd73c6", + "sha256": "10pibv07mb3mwmz6r2kmd7xdz5rly7hfbxvhmxd536zbr2s9rr1j" }, "stable": { "version": [ @@ -84462,11 +85130,11 @@ "repo": "ProofGeneral/PG", "unstable": { "version": [ - 20201207, - 2131 + 20210110, + 1959 ], - "commit": "ad5105b58374f9ed5f83d5272688f5475bc0293b", - "sha256": "1iwhaa16nxd943lhzq85d4i8d1cjp2phb5qmn6jdk19yc5c40dvc" + "commit": "0d731606bee81b2d73895a23b69e84796ea7e4e7", + "sha256": "1j0fhd5cmhx6h3hnk2xb30hn6sxfp1js3zgldqpvk4qrws5vs25h" }, "stable": { "version": [ @@ -84569,8 +85237,8 @@ 20200619, 1742 ], - "commit": "26c0fbc15bd2ed8371df3f737951804f0a92db4b", - "sha256": "0p65cxzw8rlg36fva5is6kxgiwzshjaf0jk3l6vaylipq4gv86br" + "commit": "468bc193ec155756bccf2b2d9eeb8e003d95ce31", + "sha256": "0vp57802im4smywk84ad991mdh78hwbcm3yvd22n4yfspmr0lz7j" }, "stable": { "version": [ @@ -84621,11 +85289,11 @@ "repo": "stardiviner/proxy-mode", "unstable": { "version": [ - 20200913, - 38 + 20201214, + 727 ], - "commit": "efe2ad19a20898c145fd63b5f85f25b662f6ea43", - "sha256": "11l8v3igwwx0n0l3a069zzwzzj9q0p99l9x91sxzgw8v0g438vjx" + "commit": "dbf163413e9e404c652cc0ea7185c623016a38e1", + "sha256": "1c5m0gb4qms28vahvi5kam1qf1hnpd9v1f6cwxiqdj8aka9ll8sd" } }, { @@ -84725,15 +85393,15 @@ "repo": "thierryvolpiatto/psession", "unstable": { "version": [ - 20201111, - 1424 + 20210102, + 1856 ], "deps": [ "async", "cl-lib" ], - "commit": "4856442966f94fd2da486993a8d3e07f190d971f", - "sha256": "12vip32c6pszrvvnfd9k1mngmd4qzh5wvpc3ykjcil1f4mdfnlar" + "commit": "a3fbcbb94a41450c9a5fdbea3b4ac2134c2aa082", + "sha256": "1w0ifzmd35c9rrc1vwas63hz7f1l8w0dlzwikmiiza6jy51qn9dd" }, "stable": { "version": [ @@ -84813,14 +85481,14 @@ "repo": "nbfalcon/ptemplate", "unstable": { "version": [ - 20201126, - 1936 + 20201213, + 1355 ], "deps": [ "yasnippet" ], - "commit": "af370c74f5c2a780c0dfd2bb3e4a2388c11202cc", - "sha256": "0na5lrx3kn2j76vbc84qns3kym2pn67zv2s4b5whm1bpwqsr5ayl" + "commit": "7caca3ed9f2c1bce77943d8ef3db6721e2b027e5", + "sha256": "0p23rlhv7xqwhzd0a2ybvn799xpr2n7jdinx5r07sdxmsjrmgzv9" } }, { @@ -84831,14 +85499,14 @@ "repo": "nbfalcon/ptemplate-templates", "unstable": { "version": [ - 20201129, - 1306 + 20210109, + 2155 ], "deps": [ "ptemplate" ], - "commit": "17c3f270a97ea3f018536a7b8fb81101e46b1090", - "sha256": "1qmcvy5dwln2c7r6xw5z00d0h80ln799jv2qhbhcga24mz2f21zd" + "commit": "26f1e4d40ac0e89e82c3210591064770f86490bf", + "sha256": "1yjigz22laz0f5m10kcslhg184lsqsfr72samk59l13jpnr676qg" } }, { @@ -85027,14 +85695,11 @@ "repo": "purescript-emacs/purescript-mode", "unstable": { "version": [ - 20200708, - 827 + 20210109, + 244 ], - "deps": [ - "cl-lib" - ], - "commit": "154ad16b61fb9dec83a6c863ffaf92638278f00f", - "sha256": "14046nryg870s366j6hxqpwza0y057hxaiq3kwlnpf1avlzdwhib" + "commit": "8410baff69ba934b64d78340c7fd20aa1e67dbfb", + "sha256": "1gc5rg5rggljmcfz93kz03fy21455nvp7vz79pknqyf8k67aah4h" } }, { @@ -85429,8 +86094,8 @@ "repo": "tumashu/pyim", "unstable": { "version": [ - 20201130, - 309 + 20210109, + 1118 ], "deps": [ "async", @@ -85438,8 +86103,8 @@ "pyim-basedict", "xr" ], - "commit": "e9b46009c0e80f45ad95c64237bf69cb28dc12e7", - "sha256": "06ahzyi2h353xj17mzsm9fxmkc6cyzd1mjzmvqfw8cyv538nijc0" + "commit": "09a3b590cd83bf94b92ea772765db581e3aeb2f1", + "sha256": "0v5b7p8icn9gvdqmbh7xy79xnqi80qhskg00ag8zabmg624mpn2x" }, "stable": { "version": [ @@ -85506,14 +86171,14 @@ "repo": "tumashu/pyim-wbdict", "unstable": { "version": [ - 20200910, - 1445 + 20210111, + 923 ], "deps": [ "pyim" ], - "commit": "8b1f0dfa1c5f5f8e5fb110a0963603ee08d60932", - "sha256": "11y4xa27w8n16181bddxs8w5p7r2mk38l19id69w2xvvaqa36prf" + "commit": "62a1bd8b6070463e872137cf8eba50122b180e2c", + "sha256": "03zh5sdqc32q8an8k59csc95sczcs38ganxrg3lp2i2vn5ykza7h" }, "stable": { "version": [ @@ -85585,8 +86250,8 @@ 20200503, 1624 ], - "commit": "6e1cca143f2e0c6f20643573bfddb53ec02e66b4", - "sha256": "160aiz82wf6j6dv90rnzmlx79ijf0cl6xzixa7pa1nh77nqd1pq6" + "commit": "168bee7f23d9956c12b419b18aa9f5974151e3d7", + "sha256": "00y3klba3m1j43mfggh7pvy93khk1ga1lyb98r5mlfffrymvr209" } }, { @@ -85827,11 +86492,11 @@ "repo": "python-mode-devs/python-mode", "unstable": { "version": [ - 20201203, - 2019 + 20201230, + 2132 ], - "commit": "429c52ae6564c3e6d9cebd69e9726784eaf41b81", - "sha256": "1fkc7994hgw4iprklixyy962yw3p2mby202kcs9bnjq696j25kh7" + "commit": "41b123b4d4906cce7591900a952bb75a38c5296c", + "sha256": "1dl6vpwqxrdy26gh8kw5xkyj1ka88plm60c6ka2g6ji2s851b6ki" }, "stable": { "version": [ @@ -85851,8 +86516,8 @@ "repo": "wbolster/emacs-python-pytest", "unstable": { "version": [ - 20201120, - 2106 + 20210111, + 1046 ], "deps": [ "dash", @@ -85861,8 +86526,8 @@ "s", "transient" ], - "commit": "4a1c4c8915c12e540d41aae1d4e326a2362da541", - "sha256": "11hzh86mmi4hwiwnq1nfn6lizjk3pghi8j4m4cgam2zikapxq0wi" + "commit": "3fadf1f8bc363d57c54eedd1bf98e6d9db9f0a62", + "sha256": "0ij72rjf3qnsbg3zripxyx3lwzliplm24pfrg867dr6lxczkxwv2" }, "stable": { "version": [ @@ -85985,11 +86650,11 @@ "repo": "jorgenschaefer/pyvenv", "unstable": { "version": [ - 20201202, - 1040 + 20201227, + 1623 ], - "commit": "0bf4b87068e9040fc99afa85af1992247dd7aacd", - "sha256": "10dcigv25bs115d3m5nibvh1sxg99ni32cy5pyz616f2wz1zbph4" + "commit": "9b3678bc29192d2dba64df90fbdb17393ef8d877", + "sha256": "1pxinj6gc0mga0sl7y5ys3xsy94c33cbgahw418c36lhj8xxx21n" }, "stable": { "version": [ @@ -86008,11 +86673,11 @@ "repo": "psaris/q-mode", "unstable": { "version": [ - 20201011, - 103 + 20201231, + 140 ], - "commit": "df2123d4fe5c05a995721af8e8da98ff4a1f0717", - "sha256": "074lhq3qkran6kxk9lm6a095gspyxrq79xvsqzm50q87xk6ala3a" + "commit": "e4499e7fcdfafd8d1825eb705c34a7748ca5ee64", + "sha256": "1bb9w75rxvsx024y0yx41rrskkmhpyfslw3xi414d2w5wmh82zbm" } }, { @@ -86093,11 +86758,11 @@ "repo": "LesleyLai/emacs-qtcreator-theme", "unstable": { "version": [ - 20201129, - 1620 + 20201215, + 1523 ], - "commit": "ca5fd9a4552a7fc004579ed59c69fbc8f0083ac4", - "sha256": "1askzfnysv9nccf1mrkzk834ak5lja416b5mi5z5p7mrnn9vfn2d" + "commit": "515532b05063898459157d2ba5c10ec0d5a4b1bd", + "sha256": "00p7fapvprfkah14j1isrwnbq8npgn3yw3k4z8ki14mqhgras4hf" } }, { @@ -86146,11 +86811,11 @@ "repo": "quelpa/quelpa", "unstable": { "version": [ - 20201022, - 638 + 20210101, + 937 ], - "commit": "8e59bf825629388384324b3eea5d51958d7fd34e", - "sha256": "1hrhhiz0dd6403yv8jnjq6zjl1zjjaqxq97yvpwd4l0sx1sx0h6m" + "commit": "42835119977a6512274d8337e866479af4f26dec", + "sha256": "1qqzkk3ym4p3q8b33szmww4ixp1sjmirihnvkgmvfpv0rrc15icc" }, "stable": { "version": [ @@ -86442,15 +87107,15 @@ "repo": "greghendershott/racket-mode", "unstable": { "version": [ - 20201123, - 1623 + 20210110, + 1607 ], "deps": [ "faceup", "pos-tip" ], - "commit": "3563081f7de57198d5adba856a79f67b3b5ad675", - "sha256": "061q7sb1a9q0gipfw4na4418cpd5wdfgn4iwpdaf61g0w20y0qm2" + "commit": "871aff8dc5a4bbc6f1d760fdbceb1f71fcf70b1f", + "sha256": "1z8lxaj24ykpa27y6v5zjwmdnaxhd7m8my5q7yxr4inlzyhhgckp" } }, { @@ -86563,14 +87228,14 @@ "repo": "stardiviner/emacs-rainbow-fart", "unstable": { "version": [ - 20201130, - 639 + 20201228, + 6 ], "deps": [ "flycheck" ], - "commit": "fe5b01ec36bc5db7f578ba94593ac92fd653ea5e", - "sha256": "067zfgsbq7whg1mvwbp2j5f8i1x128nmv1b75vhgqvfykbxr0b47" + "commit": "63b6a77a38235e7917d200886922156506853c42", + "sha256": "1pfpinplhkn5d91rlbgh359w4d7hp399vpximipj69bnx3nizic6" } }, { @@ -87121,16 +87786,16 @@ "repo": "realgud/realgud", "unstable": { "version": [ - 20200923, - 610 + 20201221, + 1435 ], "deps": [ "load-relative", "loc-changes", "test-simple" ], - "commit": "ff660011c82c6af504915833e2d981a547b7ad58", - "sha256": "1cqzrp1fk4hk28fh0q9d448cjv47qgvxy2z786x2hpmb42izrc76" + "commit": "f73c039a340579a98e6716c901fd4e80e7eaa2eb", + "sha256": "0v6dysd9rzhb8aw3ws3wayprrx9ll59g3isib7ni2fl6krmvyjlx" }, "stable": { "version": [ @@ -87572,6 +88237,21 @@ "sha256": "0wk28blnfks987iby0p3qpd4nxnz6sqn4fx8g59gyddjhav51lri" } }, + { + "ename": "recomplete", + "commit": "4a3938f413ff1ceeb7ed6aedf0e3067073208068", + "sha256": "0ym5l5cpx464hxzww4m35rrlr4c5h8kl6090w2a7hck47kwyv8ni", + "fetcher": "gitlab", + "repo": "ideasman42/emacs-recomplete", + "unstable": { + "version": [ + 20201202, + 126 + ], + "commit": "d0e61f19a29108d676849e0925f00d002a26d32d", + "sha256": "1r3fmc5c2aqfqpfzdxkj6qi86j8vwmrj1gk3xz263pl3q96pzcya" + } + }, { "ename": "recover-buffers", "commit": "43b33cfb794c35de78fde6eabb71ffe01049d23d", @@ -87656,11 +88336,11 @@ "repo": "minad/recursion-indicator", "unstable": { "version": [ - 20201206, - 139 + 20201219, + 1739 ], - "commit": "7f737f667441f538c283cc1933e95cea844f1b04", - "sha256": "1lbfb8gl5jzfl4j5p5ab8ybgsa2zhg0ix3ld726ch0p8pcrjl3f9" + "commit": "54d9914b270975e92fec56bcb3911c7335aeed7d", + "sha256": "1v2maw9jpvvfv6a6qkh3nasshf3pjzbqpyxsarhk2054d982qy5c" } }, { @@ -87854,8 +88534,8 @@ 20200814, 435 ], - "commit": "45c0add95025f53ca644a6c8b9afa05b2da3c474", - "sha256": "1dfn7c3gpavpiwd73v2pasd8wd8b62dczhg9iv1cgh8vaqlsf92x" + "commit": "5aa8c1867950b9b2ba6e583271f9c0d715853c5a", + "sha256": "1aypb17k408i4lg9v3fnb5q2n8m3iry4ca4c7axjbvax09dawznk" }, "stable": { "version": [ @@ -88599,28 +89279,28 @@ "repo": "jcs-elpa/reveal-in-folder", "unstable": { "version": [ - 20201022, - 533 + 20201224, + 1242 ], "deps": [ "f", "s" ], - "commit": "30d9db25ca84e1bf3f4f8eda1a5fa23bb8e69182", - "sha256": "0hx77c7cygax0xqk12rj6ci9rvq5r9xyynhlfapb9ldzzp31g0dw" + "commit": "8163bcd16417b7c600ebc1f8142414da2b839f4d", + "sha256": "1hpvv4aak164bld7m2613c501cn7z4y73cnaxg2fnpwijgyyqaxq" }, "stable": { "version": [ 0, 1, - 0 + 1 ], "deps": [ "f", "s" ], - "commit": "30d9db25ca84e1bf3f4f8eda1a5fa23bb8e69182", - "sha256": "0hx77c7cygax0xqk12rj6ci9rvq5r9xyynhlfapb9ldzzp31g0dw" + "commit": "29240e4845a44d10134652b427580301318f1288", + "sha256": "0ckaq8z38mj17abzarvq0awsqvwnff22mxa6pgsl7ks67hzq5kb4" } }, { @@ -88708,11 +89388,11 @@ "repo": "mswift42/reykjavik-theme", "unstable": { "version": [ - 20180823, - 1544 + 20201219, + 947 ], - "commit": "2cd0043ae6d046f812a95bb26398ea23141beccc", - "sha256": "0rk0fw5b1lz7if779h3bngc86iix8v9k8bz3zw8icwfwmjsgg1fh" + "commit": "f6d8e83946633603234cd1dac725e17447f40bce", + "sha256": "07bbn4r4ry439b8cnqbzq20nh1w0n3rxsjsir9cfznp5rnc1b174" } }, { @@ -88750,15 +89430,15 @@ "repo": "dajva/rg.el", "unstable": { "version": [ - 20201018, - 1400 + 20201226, + 1050 ], "deps": [ "transient", "wgrep" ], - "commit": "151f3ed7dd0d5829a8aacc0e911d445ad00046cd", - "sha256": "13c9hlf3hrvqzcmbaqqbr91fz9wcf7fll4czvxsc3c58bhfqcsan" + "commit": "7055a673b557de8b886e08e15f9578676d729195", + "sha256": "0jf0z8n292qc3xahj18gl8jj41fdhhbkgi0yjmvv9lmmnj874waz" }, "stable": { "version": [ @@ -88907,8 +89587,8 @@ "repo": "DogLooksGood/emacs-rime", "unstable": { "version": [ - 20201129, - 1748 + 20210110, + 1153 ], "deps": [ "cl-lib", @@ -88916,8 +89596,8 @@ "popup", "posframe" ], - "commit": "0faa6e40d272fa79a4ce4f39901a811fc8191de0", - "sha256": "10hqalawki31q0z66n46sw57cc30iaf7hgcjkplnk79vp4290xph" + "commit": "88efb918d50bed46b2a8948a52293eba8fffdcac", + "sha256": "0zv9fm1iyclljyp54ynswd3971dmiaqq32ivfhvmn3mzz5h8xals" }, "stable": { "version": [ @@ -89122,14 +89802,14 @@ "repo": "dgutov/robe", "unstable": { "version": [ - 20201119, - 316 + 20201214, + 2255 ], "deps": [ "inf-ruby" ], - "commit": "f04dcc7f8d4c14ad4761bd534bf58a49a5f2957f", - "sha256": "0yl9casjj9sya03mgcyans5fh3kbrkl1g7g566nlf4n77yrajqwm" + "commit": "596d27e37440cad6cd65dcf83d03c502efc01eb4", + "sha256": "09gc6yy2d5z75s37zw1xiv0qh44nvf4j24w8qd15270wkaczfixa" }, "stable": { "version": [ @@ -89361,15 +90041,15 @@ "repo": "pezra/rspec-mode", "unstable": { "version": [ - 20200615, - 1443 + 20201228, + 1319 ], "deps": [ "cl-lib", "ruby-mode" ], - "commit": "f1029cad2a8d9fd096e9a0f1ae9e7d7e2c8bd1ec", - "sha256": "02818knhbnqqnfmlhzr2ak0i6cv6pmbxw2icns2lg8vfr430c286" + "commit": "92ef785010f6a68cbf73861e75ac6cf4e1832291", + "sha256": "1di1b9psmaqzhp0ik3niwgy43i0vj16m5fx7xnsyi0bvwv45cab8" }, "stable": { "version": [ @@ -89392,19 +90072,19 @@ "repo": "Andersbakken/rtags", "unstable": { "version": [ - 20201008, - 1707 + 20201218, + 1821 ], - "commit": "63a7d9b733def9fe76568f81321a65a450829575", - "sha256": "1nnjhfz7xm1ax38xkz0jvgzhfczlc4r9xlpzc24sisabkvlkivyw" + "commit": "39339388256df662d0084b4a094d03e52748f9e8", + "sha256": "0wp4mygsxzibra2p3m5rn9m0yd3fscd795k5xa0wxi5pwddv7dlg" }, "stable": { "version": [ - 2, - 38 + 3, + 23 ], - "commit": "9687ccdb9e539981e7934e768ea5c84464a61139", - "sha256": "1r6l7dgr2ch586zrdi5l8fhdj4qdva8ldz7cjvi2byc2pd2xs8rx" + "commit": "7169ed577d676690a3c6f0025b54e8477d80eacf", + "sha256": "1i94dizg3wvkvq8c2pf5bzkx8zwzcfi4p3l73c779y145bygssnq" } }, { @@ -89421,8 +90101,8 @@ "deps": [ "rtags" ], - "commit": "63a7d9b733def9fe76568f81321a65a450829575", - "sha256": "1nnjhfz7xm1ax38xkz0jvgzhfczlc4r9xlpzc24sisabkvlkivyw" + "commit": "39339388256df662d0084b4a094d03e52748f9e8", + "sha256": "0wp4mygsxzibra2p3m5rn9m0yd3fscd795k5xa0wxi5pwddv7dlg" }, "stable": { "version": [ @@ -89656,19 +90336,19 @@ "repo": "purcell/ruby-hash-syntax", "unstable": { "version": [ - 20200304, - 2214 + 20210106, + 224 ], - "commit": "d64036278dcfb4fa0603e6697142e02c2876f634", - "sha256": "02s494r9iy47jd74cd0z1dz1igh8rw2jbyybahy9pivmcn7fnqkr" + "commit": "d458fb5891e0da85271b1cba3ee0ee69ea66a374", + "sha256": "02bjxsi8vbpadwjlhkdgpm4bi091ry9rdvzwnqsr4lh0z7f0ab76" }, "stable": { "version": [ 0, - 6 + 7 ], - "commit": "89fc364a837d7a78ecce34380f09c073a83e30e0", - "sha256": "1nwf3681fa6lfqr14n9wihckpi220hvamv1ppzmrhn4k49vxljy8" + "commit": "d458fb5891e0da85271b1cba3ee0ee69ea66a374", + "sha256": "02bjxsi8vbpadwjlhkdgpm4bi091ry9rdvzwnqsr4lh0z7f0ab76" } }, { @@ -89940,24 +90620,22 @@ "repo": "brotzeit/rustic", "unstable": { "version": [ - 20201202, - 846 + 20210103, + 1235 ], "deps": [ - "async", "dash", "f", "ht", "let-alist", "markdown-mode", - "projectile", "s", "seq", "spinner", "xterm-color" ], - "commit": "91ad5db27b86bb2ba6f3019b764d0f45ec93f484", - "sha256": "02d6kn7lj1ql6yycvprzdicxb0n6ilb2xbc2qq9q7yn1ibyfymdj" + "commit": "4570312648cb8d4788f4fe749d67c0fce2de42e4", + "sha256": "1l6b0ljr6xwpjq46qgna2brprj81ppxwzhaj5s1xbwffzi67dc1z" } }, { @@ -89968,20 +90646,20 @@ "repo": "senny/rvm.el", "unstable": { "version": [ - 20201026, - 424 + 20201222, + 17 ], - "commit": "b2498a4a6952a32301544e103b31dc3b8df271ee", - "sha256": "0w6h02z82iyjxx9ra05yw6389mlfwmzmb6bh2vcy5093f2yfpk7w" + "commit": "c1f2642434b0f68d9baa0687127079ecd884ba12", + "sha256": "1fmrll8ffa90hi62a1kkxf8z952xglzmf2qb4l4j5wkh0yzyvnln" }, "stable": { "version": [ 1, 4, - 1 + 2 ], - "commit": "b2498a4a6952a32301544e103b31dc3b8df271ee", - "sha256": "0w6h02z82iyjxx9ra05yw6389mlfwmzmb6bh2vcy5093f2yfpk7w" + "commit": "16617c1fc7c0513e514cd658a93b5e5be2ff618f", + "sha256": "1j508b4frig410svh9cl4zrqgcp4z3p33r6mih6iil3n20akvyxn" } }, { @@ -90108,16 +90786,16 @@ "repo": "sagemath/sage-shell-mode", "unstable": { "version": [ - 20201108, - 943 + 20201225, + 1011 ], "deps": [ "cl-lib", "deferred", "let-alist" ], - "commit": "c19c3c681142154d6068d1e0236fea825eda2fe2", - "sha256": "10fmm38rlirbrjrkxp73x2wvcb1nkvp0pbg7czwzd6pilxlwsvcq" + "commit": "7fc47d5eab0efac009d5a9316e3dfa223595ab5a", + "sha256": "05r8z8wvsdwkbhsv5czrjwg5fq7232vsfcvkk7vj8arkfnhyg1yz" }, "stable": { "version": [ @@ -90332,14 +91010,14 @@ "repo": "nicolaisingh/saveplace-pdf-view", "unstable": { "version": [ - 20201130, - 222 + 20201216, + 934 ], "deps": [ "pdf-tools" ], - "commit": "88e07be656544bcdfa332d25880abff168ca1423", - "sha256": "0zn6mhq2cqjfir91w9zry6pi5r8jp4i2437lq8xfjdirrpa55lmy" + "commit": "b0370912049222f3a4c943856de3d69d48d53a35", + "sha256": "1ky1d3aycc1r96z3fy484p99xlmry9y9z61s7l7mw0m231k7kpbd" } }, { @@ -90430,8 +91108,8 @@ 20200830, 301 ], - "commit": "1896c18602265c9b41ff9c1b320699dd0b9b813c", - "sha256": "1d3r0r7932w7m3nmv435s0m8qv0ph3a40jpqi412yg7406l920l4" + "commit": "0f79135ef8d53d638012d4fd2bbc1b0f7bc22c04", + "sha256": "076hzca4ia0q8hv45i30k2h9g1m11iaimxhafs87a7hp2cmn7r9v" } }, { @@ -90821,6 +91499,39 @@ "sha256": "0mgc3wc1kga7n3zwy7i338vdxy0nfhv61ra9708lc14rx6zjwk9f" } }, + { + "ename": "scroll-on-jump", + "commit": "824ab5881f045a43056d9b143cc59267c43aec81", + "sha256": "03ra46xclmxrygpbbf05j9rx2q8qx70cxsqmhygqad5ij75h253k", + "fetcher": "gitlab", + "repo": "ideasman42/emacs-scroll-on-jump", + "unstable": { + "version": [ + 20210103, + 2120 + ], + "commit": "69c86542a148222a7571506a2515fc52529d209d", + "sha256": "00qddxcax55pmfai7083w08mgz6c3876jb5p7fas4j5h417c09yb" + } + }, + { + "ename": "scrollable-quick-peek", + "commit": "bd3e8860d02fcc30ee9692e09cd6492e164c0ec5", + "sha256": "09p63w6chb075agw1k90yg1xka5c6bjyhf70w534pik4jzm42lii", + "fetcher": "github", + "repo": "jpablobr/scrollable-quick-peek", + "unstable": { + "version": [ + 20201224, + 329 + ], + "deps": [ + "quick-peek" + ], + "commit": "3e3492145a61831661d6e97fdcb47b5b66c73287", + "sha256": "0gca860rhvcdjgm6k5pm6spznhg4787dqyjzfixvnffd5l93lcvc" + } + }, { "ename": "scrollkeeper", "commit": "d9ad5b16ff61c1f8ba1e030ee0988aa51a437022", @@ -91186,11 +91897,11 @@ "repo": "raxod502/selectrum", "unstable": { "version": [ - 20201207, - 1851 + 20210112, + 1945 ], - "commit": "632a22cd5edc34611d74eee3cd95fcaa19e699b4", - "sha256": "143chfxkbwa096l4r01pcj3slzzhvd8b0vvgvb8h0g4af90yfksn" + "commit": "95ec10ead32a229bf392cd629a79b5683085bd4e", + "sha256": "159asv71ja4hpdzmc23q6j2c4ffdbr176bg311gmg7ivqalmi3jl" }, "stable": { "version": [ @@ -91209,15 +91920,15 @@ "repo": "raxod502/prescient.el", "unstable": { "version": [ - 20201026, - 1413 + 20201214, + 227 ], "deps": [ "prescient", "selectrum" ], - "commit": "5d139e5b1fe03ccaddff8c250ab8e9d795071b95", - "sha256": "11hqy8chh29lrzk04dp3rwkvf4bj0xvg9hli3w1zx968x98lfvj0" + "commit": "42adc802d3ba6c747bed7ea1f6e3ffbbdfc7192d", + "sha256": "0v12707jwd2ynk8gp3shgarl6yp3ynal7d4jzds6l2lknr6wi50w" }, "stable": { "version": [ @@ -92161,8 +92872,8 @@ 20201021, 552 ], - "commit": "267d4220715eabacca1ad1661d76be5ceed7072c", - "sha256": "0xyrvvrckn8agg86kkr6821bj07s5an8w226k964f148jn84n86q" + "commit": "f29aadae07bd58689720271b1f6538edfec5c476", + "sha256": "130ydwzpzw4s4h3jhh5h066iib7s9c8xa43imvlvcqs3vghp7p1x" } }, { @@ -92250,6 +92961,21 @@ "sha256": "0yy97yzc8v1h0vjpm6zbrdwy8sd931mscrbrq1svvv2y227s4ffl" } }, + { + "ename": "show-font-mode", + "commit": "c93262f233f73417528e1d4ec254d1c39970a994", + "sha256": "1yv2b9p7ccv21fznl0j4jxd2gzxhahbisacany0p18v1fbkj9njf", + "fetcher": "github", + "repo": "melissaboiko/show-font-mode", + "unstable": { + "version": [ + 20201225, + 2217 + ], + "commit": "8503be7966d3bd8316039b5f49d3c37c7b97d10c", + "sha256": "188d6fpi8cws0dhlcpgvvixbmf6045vb1r7psbd3sqciv29xm1yh" + } + }, { "ename": "showtip", "commit": "ae489be43b1aee93614e40f492ebdf0b98a3fbc1", @@ -92471,13 +93197,13 @@ "version": [ 0, 3, - 2 + 3 ], "deps": [ "cl-lib" ], - "commit": "dccd8f7d6af2dde96718f557b37bc25adc61dd12", - "sha256": "103yvfgkj78i4bnv1fwk76izsa8h4wyj3vwj1vq7xggj607hkxzq" + "commit": "081d6b01e3ba0e60326558e545c4019219e046ce", + "sha256": "1bnmrwrhra6cpc3jjgwwzrydj5ps7q2dlkh2ag4j7rkyv4dlk351" } }, { @@ -92723,11 +93449,11 @@ "repo": "gexplorer/simple-modeline", "unstable": { "version": [ - 20201130, - 844 + 20201218, + 840 ], - "commit": "6bb96a00c5fcce48e681d8e75b000b4047815181", - "sha256": "0fgsrbpn8ybksrb0f1z7dzg1v5pshijv9ndr21hdhcwl1cwcv9f1" + "commit": "38973dec2912e2136d8fde5f2667063863fee15a", + "sha256": "0y70hc3x8rxr8b5x8d0a23gpcadzrn43wmrsvqqxmmkqqp45n7gj" }, "stable": { "version": [ @@ -92915,14 +93641,14 @@ "repo": "laishulu/emacs-smart-input-source", "unstable": { "version": [ - 20201125, - 1155 + 20201223, + 547 ], "deps": [ "terminal-focus-reporting" ], - "commit": "20479e5f4f26d18bd99c32bb0d6fb49d30904812", - "sha256": "1slrkkwc1fampcqaqc88d77kdcmanv3zj7qq6p59bqh9ynpsgy40" + "commit": "f2d4031711714b100ec81aac321917c40cf20dc9", + "sha256": "1b3nav38g95iasm1shsmw2xbw2jkgf1djddaknywcff129faqb9f" } }, { @@ -93167,27 +93893,28 @@ "repo": "slime/slime", "unstable": { "version": [ - 20200810, - 224 + 20210105, + 2148 ], "deps": [ "cl-lib", "macrostep" ], - "commit": "fb12bac676ab51b75be19197e21ab4674479d627", - "sha256": "1lqd6mk87kmmyb83qf4h0i5wpq3mnqwzl9gdcjildy7afsp3f1fk" + "commit": "48bfe6cccfdf879cd7137b00eb2ca160665a92f8", + "sha256": "1b3kjxjx30lan77vgiskvh9g5cqz4j44xa221vnh9ccixqwqhhim" }, "stable": { "version": [ 2, - 26 + 26, + 1 ], "deps": [ "cl-lib", "macrostep" ], - "commit": "fb12bac676ab51b75be19197e21ab4674479d627", - "sha256": "1lqd6mk87kmmyb83qf4h0i5wpq3mnqwzl9gdcjildy7afsp3f1fk" + "commit": "15cf0609d30255405957bf0612fd6291fea438bc", + "sha256": "11zb8aaay1yirql638ssbap4rnxdf6a4lwmqm761grgssk44rqpd" } }, { @@ -93392,19 +94119,20 @@ "repo": "joaotavora/sly", "unstable": { "version": [ - 20201208, - 1836 + 20210105, + 1102 ], - "commit": "41b1cc8087a435ea646e0b45feaaea1da14f5e29", - "sha256": "0bvr2rp5bc11f2fzw3r8y0625lk7z770c12ljbvhf5bm5m82h56y" + "commit": "dffdf3caa12e964127d6eb45ba92ac0442cc5a48", + "sha256": "0vv185gz3rkfng5y79dijfnc11p92qdz2kdza05avjbpqfs6l0zn" }, "stable": { "version": [ 2, - 22 + 26, + 1 ], - "commit": "8d9fdf34fe542ec280ee042ee7bdea16e512d3c0", - "sha256": "0zsliqfd92ivg2y2w1z6scn6i3w658x8bi1wd0rvf6mddc74lvj6" + "commit": "15cf0609d30255405957bf0612fd6291fea438bc", + "sha256": "11zb8aaay1yirql638ssbap4rnxdf6a4lwmqm761grgssk44rqpd" } }, { @@ -93661,14 +94389,11 @@ "repo": "jojojames/smart-jump", "unstable": { "version": [ - 20201113, - 2039 + 20210110, + 214 ], - "deps": [ - "dumb-jump" - ], - "commit": "8c6e9bdc86ea492fa618361a56a9784cc923b3e1", - "sha256": "0zscn6396bl5g9rdw2p6vv5nf5vgmhx562k9vgb72l5m81lxfvyj" + "commit": "947499023b7c31b99fc172e2a4c1a105ad9c8555", + "sha256": "1yyyh1507lr4dlp39k8slwfz0fdjh2hx5ypn5zx5hyjjncw7x2r7" } }, { @@ -93723,14 +94448,14 @@ "repo": "daviderestivo/smart-mode-line-atom-one-dark-theme", "unstable": { "version": [ - 20200106, - 2016 + 20201229, + 1711 ], "deps": [ "smart-mode-line" ], - "commit": "e281b52b164a477fcdb6a468976e8a1bdde1ca26", - "sha256": "0m4c63anrmbbdaf0chiagzgkcgbi30bhkjx3v7c4i9nk98yz9zkw" + "commit": "0c360f390cbeea59dceb99e8c499e0db7c323510", + "sha256": "1hm2mg4360p19fjmagds3bimclsxx6c0qy5z0f25fdk8zzzccmak" } }, { @@ -93902,15 +94627,15 @@ "repo": "Fuco1/smartparens", "unstable": { "version": [ - 20201128, - 2212 + 20201229, + 1937 ], "deps": [ "cl-lib", "dash" ], - "commit": "b8bdd9265e6950e038bbcd68ead5582c6964baf2", - "sha256": "1dlyp801fw3cmpi6ks3sq1kpz3wqzgh4i114pn333hifgbzl5p23" + "commit": "63695c64233d215a92bf08e762f643cdb595bdd9", + "sha256": "0yx9xamrpjpn6qshcdzc43pj3avb0nq4q40nmid28vb4giab4927" }, "stable": { "version": [ @@ -94245,15 +94970,15 @@ "repo": "kyleam/snakemake-mode", "unstable": { "version": [ - 20201109, - 315 + 20201224, + 1744 ], "deps": [ "cl-lib", "magit-popup" ], - "commit": "0e4ef118ca3af4a6851fe670cf8fe7472ba18393", - "sha256": "0cl956wav9vnsxz0ky0ykcjxa3m43zld8ybn24r5yy54kr00nicm" + "commit": "592901893f297099ffb759b4d1359bcd3411d1a9", + "sha256": "0rmvzrkx56zrlziln9cbq9p7lpm7jlv6i1mfrzrqhri239xlybn4" }, "stable": { "version": [ @@ -94389,6 +95114,21 @@ "sha256": "01l44lshw0zvykay9886s1vqryanagkd4ciw3ramchn0baqz11vl" } }, + { + "ename": "snow", + "commit": "4c8024abdb9843296860aaaf1528bc9dfbfbc6c7", + "sha256": "00wmb43znvqp57b5risznd4mwkvwfy65vfp922ix761hav6k0dpy", + "fetcher": "github", + "repo": "alphapapa/snow.el", + "unstable": { + "version": [ + 20201231, + 1632 + ], + "commit": "7ca25adc94148f182ac58c9f5d35f576a8a3131c", + "sha256": "1bpq8611yqvi7w58qylbyd2k7va6cbg12xyj6md7ipnq79wpfy4j" + } + }, { "ename": "soar-mode", "commit": "818113ef6f93cc86fd30441d508012e5baa71893", @@ -94523,14 +95263,14 @@ "repo": "bbatsov/solarized-emacs", "unstable": { "version": [ - 20201207, - 1431 + 20210112, + 1050 ], "deps": [ "dash" ], - "commit": "67f261c7b3d1a041e5c8964df680f8132703fc17", - "sha256": "03x5p135i2rshsvvsls2pl70mslzifzfznd310wiqgscg7vja1wy" + "commit": "93d124962106f4cec72e9c8ab8cb243c581d9d46", + "sha256": "11gsxakwmkymlmm8jjbkxi6ryhvfri06n2g8kh4s6abm15pnq6sh" }, "stable": { "version": [ @@ -94690,14 +95430,14 @@ "repo": "mtreca/emacs-theme-sorcery", "unstable": { "version": [ - 20200929, - 1001 + 20210101, + 1352 ], "deps": [ "autothemer" ], - "commit": "d438fe3f985f19ad0f7244ca780e474df8f31ce5", - "sha256": "01qpdp14vzlq3pzbw14ri1gwmw32lkijxsv1mn6b39m0xmsimnkj" + "commit": "5a1c4445b9e6e09589a299a9962a6973272a0c2f", + "sha256": "1b858049n6nw4qf60fmszjrhl80x7ssh32f7glj722kwy7404kdh" } }, { @@ -95228,6 +95968,21 @@ "sha256": "186qn9zbj4izvkhqwygv65rcx050wvi849ffmdw5l7bizd0m0zr6" } }, + { + "ename": "spdx", + "commit": "fb570e4a9a89319443c0df08980e7427aad7f1a0", + "sha256": "1yg5rks9j4rbx14fh6d8gyggmw62gc9jfnid10175czd4nzj8vab", + "fetcher": "github", + "repo": "condy0919/spdx.el", + "unstable": { + "version": [ + 20210109, + 1842 + ], + "commit": "e451b29f2702c60b664ad1e3e3ae253cfb969fa0", + "sha256": "0am4da6j5mianjj6ib5hf87z5v2q3wc8xlmgmna4mi70rx4bkz3x" + } + }, { "ename": "speech-tagger", "commit": "db80aa5d95846ee02a9d762aa68325ab5e37dcf7", @@ -95567,16 +96322,16 @@ }, { "ename": "spray", - "commit": "e4f5053aa4e1af3f636febe9c3ce8c6ae20c090d", - "sha256": "1h8lngcqa343mlc091zs419frgsla65khfj93lv9fil3xbgrm7m9", - "fetcher": "gitlab", - "repo": "iankelling/spray", + "commit": "b89bd1ada947b64f6c42dda14e626ef55127f8e5", + "sha256": "03f3zrgk7b36srdvd15m0b067577crjf605lw392sqhrarmw4rw6", + "fetcher": "git", + "url": "https://git.sr.ht/~iank/spray", "unstable": { "version": [ 20160304, 2220 ], - "commit": "00638bc916227f2f961013543d10e85a43a32e29", + "commit": "74d9dcfa2e8b38f96a43de9ab0eb13364300cb46", "sha256": "1avbfr32dvff26kgvd5vgan99nb5c6al9kv5xbmy2rcls17py7r2" } }, @@ -95805,11 +96560,19 @@ "repo": "cnngimenez/sqlite.el", "unstable": { "version": [ - 20180708, - 1711 + 20201227, + 1822 ], - "commit": "dad42b8bbca4994be1871343dd18fd6528ee5797", - "sha256": "06ln4vijl8kii3nzc5cscgsadx1fqgxksflijd3ain83bn8g4wrd" + "commit": "f3da716302c929b9df4ba0c281968f72a9d1d188", + "sha256": "00fkjsc01fymhjrzlx3anl9vj85yw4jlxvh77d0mvchwzym8wi8l" + }, + "stable": { + "version": [ + 1, + 0 + ], + "commit": "f3da716302c929b9df4ba0c281968f72a9d1d188", + "sha256": "00fkjsc01fymhjrzlx3anl9vj85yw4jlxvh77d0mvchwzym8wi8l" } }, { @@ -95885,8 +96648,8 @@ 20200813, 1430 ], - "commit": "a3a4df9875ea6ae21cfb483dfd7b5c92278fb1c3", - "sha256": "1lc8796r5vy4n9nz9q10qy4brzd7c7i7dsjmvci6c9f7blqnz1la" + "commit": "c10f71465a416050ee4b9633aeabaee823ff3ba9", + "sha256": "1a5bblc5sfd0akrvjs2hysjs7a9fz4p6y44l00nmk43yl7bh0678" }, "stable": { "version": [ @@ -95929,11 +96692,11 @@ "repo": "srfi-explorations/emacs-srfi", "unstable": { "version": [ - 20201129, - 2137 + 20210111, + 2324 ], - "commit": "22657a98d4cd7d0690dac0d437a27ec3eef6f1df", - "sha256": "0jdl6raw9nyylfdla40xlzxcacfk5nv4hr8279djyd68sjn62gbd" + "commit": "669532e3cf56232f22c3b318fcd4961a3789ecc0", + "sha256": "0n6hy9g95jpxh919m4vfs82bxzbyxr45w9khx4ckpsq1bp60dq29" }, "stable": { "version": [ @@ -96046,11 +96809,11 @@ "repo": "jhgorrell/ssh-config-mode-el", "unstable": { "version": [ - 20201103, - 334 + 20201223, + 1051 ], - "commit": "87e61e92501c1a976c37c0bb874f1929e2b7e7e6", - "sha256": "01z3wf2v8r584gdw6l05cvv344l6acarb57lm59m4y2kqqkw85jc" + "commit": "a236e04f2950bd9d7f7c79ad992d1f8b57df950d", + "sha256": "0d5vx8k18avnja6mlhzrsj3z5brs70fj3s7151zgjq5i12n6aqm2" } }, { @@ -96357,8 +97120,8 @@ 20200606, 1308 ], - "commit": "93c90734d7073bc68285dca5e450034f96376703", - "sha256": "022avhxsw50zs4i901zj56w15fzkpfgcwj8mr40lmbcmb6q7bbj0" + "commit": "417b344e3c97beb2e50c2c919b0d01cb0d4ed9a5", + "sha256": "105va5nb5wgqkw25rdc2d591c6fcd9wa3dzsyvg3y83fcxhqgi7g" }, "stable": { "version": [ @@ -96838,26 +97601,26 @@ "repo": "nflath/sudo-edit", "unstable": { "version": [ - 20200625, - 142 + 20210108, + 420 ], "deps": [ "cl-lib" ], - "commit": "0e2c32b5e5242d30f8780cbe8e1b1649476cac4d", - "sha256": "1z26i4hzi2mksl4nr8szzlnrnyv96fg7jjddbm5dp5dlmh2pndk1" + "commit": "a7ae1713bb659988bb1465a13b837fbc2d699504", + "sha256": "1hncxbg5lvywzkwvdmzvrz71midy4samjq2vvxxhz90z1y5l8l29" }, "stable": { "version": [ 0, 1, - 0 + 1 ], "deps": [ "cl-lib" ], - "commit": "bcb12aaa0da0c56d851cfa2f1b3ea4afdd2a755b", - "sha256": "1k6sx8k304dw9dlidnxcln9ip9cj3b6i196z98g9n0kcd1js9f99" + "commit": "a7ae1713bb659988bb1465a13b837fbc2d699504", + "sha256": "1hncxbg5lvywzkwvdmzvrz71midy4samjq2vvxxhz90z1y5l8l29" } }, { @@ -96953,11 +97716,11 @@ "repo": "mvarela/Sunburn-Theme", "unstable": { "version": [ - 20201203, - 1732 + 20201216, + 1539 ], - "commit": "cf2faed6fe96a8af18b1bc2121937cfb3a84018d", - "sha256": "1l2bai0dqhn763psavnraamyb4kvhw6r6g3hf4q6b6821h70b05k" + "commit": "6b5c14c76dcdfdb099102ef7a388b2f0c6f1951d", + "sha256": "0rnr2lwq5aw19c94h169i9d9rmd8wf387k7wjnx7r4llh990ajl8" } }, { @@ -97094,11 +97857,11 @@ "repo": "leafOfTree/svelte-mode", "unstable": { "version": [ - 20201009, - 831 + 20210111, + 1314 ], - "commit": "2a19e0aeea9dd90388d86d6adf2339c9c94b73e8", - "sha256": "17xdsgzjd4ys79053nmsfvhmx8c78zizka7hbka4y1j92lqm33gz" + "commit": "266db1fc882efe17bba7033d69ec663ab4cca5f9", + "sha256": "0v1brx89qswf9803spxi9rb02mfppg1fhx7azd9q7wvh4r1n98v3" } }, { @@ -97317,14 +98080,14 @@ "repo": "swift-emacs/swift-mode", "unstable": { "version": [ - 20201128, - 1029 + 20201231, + 1204 ], "deps": [ "seq" ], - "commit": "0bc8d8d80736d6d874edf8f59c0b37618368b183", - "sha256": "1srbbpp7dqzpfjk0a5l6li749qzwpb1vbqbf5jwiy7h99y43fa4q" + "commit": "95ff0041370660e839ed06aa92330694d8590d62", + "sha256": "14yfdcz78iygxzykwv21fy059ml2kwm9khrn0ysyjwnxnddvpc50" }, "stable": { "version": [ @@ -97407,8 +98170,8 @@ "deps": [ "ivy" ], - "commit": "ae9b121b834a68d11f79ca27b1e5c8790149ba2f", - "sha256": "160qs77b4sama17h8lhq60my44qh4c9aj1qj9jk02n64jfn44fm6" + "commit": "8f2abd397dba7205806cfa1615624adc8cd5145f", + "sha256": "0x3yy8q9ixs4zn7slhm7rskcvlsa8fdd2pbc075rx7chqzv6vc58" }, "stable": { "version": [ @@ -97648,16 +98411,16 @@ "repo": "bgwines/symbol-navigation-hydra", "unstable": { "version": [ - 20201205, - 1846 + 20201223, + 2054 ], "deps": [ "auto-highlight-symbol", "hydra", "multiple-cursors" ], - "commit": "9bbea3931348a69b3a05621296a7b096d7588456", - "sha256": "01n8q7pdmxq0lfianhywm94326x56v93bh03yr8s402y1i9ggca3" + "commit": "ed65cd9c22550e59f723d7fc36ecc313aedc83da", + "sha256": "19a5l2g5j58rfyws78jdnfd4g3dbc5chhq59xps7kghbzm0nmvvv" } }, { @@ -97723,54 +98486,44 @@ "repo": "countvajhula/symex.el", "unstable": { "version": [ - 20201205, - 2143 + 20201229, + 352 ], "deps": [ - "cider", - "cl-lib", "dash-functional", "evil", "evil-cleverparens", "evil-surround", - "geiser", "hydra", "lispy", "paredit", - "racket-mode", "seq", - "slime", "smartparens", "undo-tree" ], - "commit": "3cec3695ada5283c9de22496e0f8f37f92e2feb6", - "sha256": "0b1djw550790l45a774p9mqhf36m3k56ry85j5n5vcldqvy4v7yq" + "commit": "a0db2c80ccb6895981a6dfda7ef79fab201825cc", + "sha256": "1rpmxnz5xd02g0cfrn4l2ixh5bb6f9yvpp6n58mpriwdy99ndamn" }, "stable": { "version": [ 0, 8, - 0 + 1 ], "deps": [ - "cider", - "cl-lib", "dash-functional", "evil", "evil-cleverparens", "evil-surround", - "geiser", "hydra", "lispy", "paredit", - "racket-mode", "seq", - "slime", "smartparens", "undo-tree" ], - "commit": "3cec3695ada5283c9de22496e0f8f37f92e2feb6", - "sha256": "0b1djw550790l45a774p9mqhf36m3k56ry85j5n5vcldqvy4v7yq" + "commit": "2c9d94cf44ffc1337729db13f7ea3e3e8c470dbd", + "sha256": "02848n7b0gswdv01mk85xz3khkf24c4y1c0rsw09arnjjkhjgzwh" } }, { @@ -97904,14 +98657,14 @@ "repo": "emacs-berlin/syntactic-close", "unstable": { "version": [ - 20200909, - 1320 + 20210105, + 1400 ], "deps": [ "cl-lib" ], - "commit": "fbeb5c03b3ba94d7302c541ae7281a84de02b499", - "sha256": "1cwfnj0n64q632ldarhf2pg6nvkmw3hldb6kf60b96karp1qsrrc" + "commit": "ffe8b28907973fda775254432f88b55c92b5ae1f", + "sha256": "03qgrchvzw489594s6ghd0wmq53qzlxqsjlcwcnvlj185hg5fiwp" } }, { @@ -98015,11 +98768,11 @@ "repo": "jabranham/system-packages", "unstable": { "version": [ - 20200426, - 1714 + 20210103, + 8 ], - "commit": "92c58d98bc7282df9fd6f24436a105f5f518cde9", - "sha256": "01hj46zgs7a1as0r0x451ag2fb40pp3gyzycvj0gm328grn6vpmk" + "commit": "05add2fe051846e2ecb3c23ef22c41ecc59a1f36", + "sha256": "0n4qr5qqy6hbc1hg4wi1d2ckdl870v5mf9xhv5m9vrlwaphvnnjr" }, "stable": { "version": [ @@ -98350,11 +99103,11 @@ "repo": "11111000000/tao-theme-emacs", "unstable": { "version": [ - 20200325, - 344 + 20201222, + 602 ], - "commit": "34917843cde086943816d8a48977658c663a784e", - "sha256": "1ks4pnwp5fg2vswr93hrli2shfd7rrf3nwqwr1qwmqxhq1600f3x" + "commit": "468ee4f6ba7afb9dbfc8855ae2c333cb16ca4408", + "sha256": "0yqibx6wcdsj5k6130c3qp0hmj6zwhfjrrvw98lny23ksw6k0s3s" }, "stable": { "version": [ @@ -98374,11 +99127,11 @@ "repo": "saf-dmitry/taskpaper-mode", "unstable": { "version": [ - 20201207, - 1629 + 20210104, + 1044 ], - "commit": "d80c86c0842f77ba524867bf9e53b28a8627a665", - "sha256": "10rjnfqqgzbmzmfrgyqrx3hnrxr57knq8698azfyc46jvysrfhy3" + "commit": "e1bfc473df22605355cdfbb2adc55296018e94be", + "sha256": "0zkrs8gq2pmyynhgahzrpgy9ndpg77ql213vrh18ksfzaywdpqml" }, "stable": { "version": [ @@ -98559,34 +99312,34 @@ }, { "ename": "telega", - "commit": "e067f03ebe9dd8c90ceaa5a7983483087c74107f", - "sha256": "0n1n1fciwh7jbakdjkx36aq6k0is0c694j3n5dicwvfp7spca7p8", + "commit": "e5d96e72c0fb942e001f3001ce907be0117705a7", + "sha256": "1qn6gw8dqh335am0wx6dnfc7qxw8djypvvzbk5sl1zmzsg562sbq", "fetcher": "github", "repo": "zevlg/telega.el", "unstable": { "version": [ - 20201206, - 1235 + 20210112, + 1316 ], "deps": [ "rainbow-identifiers", "visual-fill-column" ], - "commit": "223e56eee186f4403b03196b3191f0c0d4353dce", - "sha256": "1jmyc6kask9ja07gqzi0rq6lrlj1hm85v7q6x4llbqch7ngb04l6" + "commit": "f74d685028fcb93e9f51023f0e186f0f012c9523", + "sha256": "1nk145vy5rb1b9rvcb54w836ys1xlqrm86z91gaax3zk6r6xdqdq" }, "stable": { "version": [ 0, - 6, - 28 + 7, + 1 ], "deps": [ "rainbow-identifiers", "visual-fill-column" ], - "commit": "e53996777570a5bed84d21f6c8defd4f51c8e255", - "sha256": "058x6svgy33lyqjqq0l3byv8bysqig9jmh3kx8shaqr0ypfrjhi3" + "commit": "1d28dc209e2acf1a3bf2852cc620b6e412ea73f9", + "sha256": "0h6kj3r36x26v6p4gkzg5s6fv0brlvrf6ycsdwnz27fw5sdb99k7" } }, { @@ -98704,11 +99457,11 @@ "repo": "clarete/templatel", "unstable": { "version": [ - 20201206, - 302 + 20210111, + 521 ], - "commit": "8c4ba0d5db5280a78d94bb1cc3dbd2f1abd37e9e", - "sha256": "177m72c2gdmp2jq55z1sgff8izpv39n1s7qsin2bfl4p9ccwywmr" + "commit": "6dd630e5786e500441b5acbfe5868d7172a2dbcf", + "sha256": "1kqxmainf31d1s2qbwanwzp9dij0i6zj9pp3833clnybf4l90cr6" }, "stable": { "version": [ @@ -99010,8 +99763,8 @@ 20180830, 719 ], - "commit": "8b84bf18f4c5f1b59a11692eb706f13c3598d9a5", - "sha256": "0bbcl0mq62f22n2aipgzx93164x81bgybfd0x7gvsfva76qs8pc4" + "commit": "6b1dbb2e96b3ff680dbe88153c4c569adbbd64ce", + "sha256": "05h62b06k2nfslh822mq3a7q0xvnm8whnj5xbnv3291i4a4v5x2b" } }, { @@ -99022,14 +99775,11 @@ "repo": "davidshepherd7/terminal-here", "unstable": { "version": [ - 20200617, - 714 + 20201230, + 1219 ], - "deps": [ - "cl-lib" - ], - "commit": "d8b95302abe6e4a8a91a4526441a1c5d51b886a6", - "sha256": "0b05arm8b95dkzj6m2kx7wb37z00y0bdsj3z34sjny75srph3c0c" + "commit": "cb561b5feb37a03a1c35708c3eebf9b51b01f7a0", + "sha256": "02vmy0xbssqvs97f7ypmk50hiyb7qdsbrmmnlf3mlm55c2abk73s" }, "stable": { "version": [ @@ -99477,11 +100227,11 @@ "repo": "hadronzoo/theme-changer", "unstable": { "version": [ - 20200919, - 2307 + 20201226, + 2256 ], - "commit": "13adb7d0cf0e8dfbb79b0f649d33474ddf4301a2", - "sha256": "0f8b81ck229z3gf34ic9v27w776fal16wg17mbiqxzj0pqfl6y9n" + "commit": "57b8c579f134374a45bec9043feff6b29bb4f108", + "sha256": "01c3n5ngbyw2p8h82hi00pjjfkaqm5lz8mnj2c0v504v23zvs3kk" }, "stable": { "version": [ @@ -99644,18 +100394,18 @@ 20200212, 1903 ], - "commit": "35d5f61e460a48a7f8e7813a91729a597b938e7a", - "sha256": "0xarzygijicc3a5m4vzmhkcrfjawfq3593rwkqdwfg3cgyskkh5j" + "commit": "ca45993f45837d9e209a1d1ad4479abab2125a36", + "sha256": "18gdyyhizfhbdy39j8ch4z5yhvbahzswyj7q29c21f5phmkpq1fj" }, "stable": { "version": [ - 2020, - 12, - 7, + 2021, + 1, + 11, 0 ], - "commit": "1aa52cbe490307cab99aaee5ff74e470576d35ea", - "sha256": "02z6cjfnq7mvgiw5qj2b0cilm064a6n8f80jsrqn086ikfhf8r1h" + "commit": "c72b2fa29856d45c91f5ed6c98fca6d723246977", + "sha256": "1y2hjw2a0dq6vzyfg7hcn09dbw00rfyblzibf5i7s08jbvp2zzin" } }, { @@ -99705,14 +100455,14 @@ "repo": "tidalcycles/Tidal", "unstable": { "version": [ - 20200523, - 833 + 20210107, + 1831 ], "deps": [ "haskell-mode" ], - "commit": "efba2f81cbd79f081cc5b84c98215aeb47d071de", - "sha256": "1mrhbcr5f4qif7kb1ywz07gvh4g4aafrh9991df6wicddlczrq5s" + "commit": "0a3a5f9d0aad689ad87649647944d6dca6c16bb5", + "sha256": "1lrwjxx0a3lalwbpndf751b1wn2yv3j2x58xa5kby63dxnxf77ph" }, "stable": { "version": [ @@ -99735,8 +100485,8 @@ "repo": "ananthakumaran/tide", "unstable": { "version": [ - 20201031, - 539 + 20201223, + 432 ], "deps": [ "cl-lib", @@ -99745,8 +100495,8 @@ "s", "typescript-mode" ], - "commit": "a43a37bfa23bd482cd96e55c0c39973f83128c57", - "sha256": "09c8pqlsi472mvxibh16k1b6398c2lwc4qlcm6irw1gf4w9q0xhj" + "commit": "ba09882d88dd0191e9c02c9b4e0fcd74199ff3cc", + "sha256": "1ivr9wj289zhsc4kkzmlbpxvl5nyhj6a0ir23i05fh5j93wc1da0" }, "stable": { "version": [ @@ -100221,8 +100971,8 @@ "deps": [ "cl-lib" ], - "commit": "d5909f4e237c27f638ef06725d04dd17f72d4740", - "sha256": "1bknlb9p576f0xrghh4paa23xkiyzlmlv97fr308mwwqs2g8d7ck" + "commit": "c6ccdc83e85719a8bb07ef715cf5fd06866a479c", + "sha256": "0z8rykhhhwccy0zg6v3gnghfiawqw3afv4pvxr1hrympiyhyvhvp" } }, { @@ -100590,8 +101340,8 @@ 20201101, 1045 ], - "commit": "107b74c9f4318eaa385819876cd8772ef650d1f4", - "sha256": "03whhp90wvbjc43qvbsraqi47dsi29mqbwrgxfhacjzqf73qffzx" + "commit": "265f36c1e6c8db598742778dc64f9799896f5dc1", + "sha256": "0vf76rrgkpybi67n14g6gn1a7by7b90gxa8rz2m50xl3vdphnibk" }, "stable": { "version": [ @@ -100694,11 +101444,11 @@ "repo": "magit/transient", "unstable": { "version": [ - 20201205, - 1610 + 20210103, + 1546 ], - "commit": "0d79ccfaf899f6192151d1191fbc234795489923", - "sha256": "077q180qx8q7r8pjqii823l3xpxaz8dfqy3rr31maynhbr1w46g3" + "commit": "90e640fe8fa3f309c7cf347501e86ca5cd0bd85e", + "sha256": "0fcwy6v409clw47mf6zir1qrkq9js1rh0f2wi8xijx3hidlqln0j" }, "stable": { "version": [ @@ -100728,6 +101478,25 @@ "sha256": "0gb4k3758bv25vdw30rq0vbs94vdyss0xsiyaxnmvpfnj0v9k2cq" } }, + { + "ename": "transient-posframe", + "commit": "616910997097f08d49004809cac3d995dcfe4bdc", + "sha256": "1dgcv51ychr575ckykwbz9cvnh6q9li4j11gg0mkqdd0x3srxfsf", + "fetcher": "github", + "repo": "yanghaoxie/transient-posframe", + "unstable": { + "version": [ + 20210102, + 130 + ], + "deps": [ + "posframe", + "transient" + ], + "commit": "dcd898d1d35183a7d4f2c8f0ebcb43b4f8e70ebe", + "sha256": "1aq1vbkww55xplyaa3xagz9z4kdlsxk13x054asnk0dqps4bcgbf" + } + }, { "ename": "transmission", "commit": "9ed7e414687c0bd82b140a1bd8044084d094d18f", @@ -100736,14 +101505,14 @@ "repo": "holomorph/transmission", "unstable": { "version": [ - 20201209, - 458 + 20210106, + 2057 ], "deps": [ "let-alist" ], - "commit": "deb7090e1e3faf50b691c5b73148be690575c76b", - "sha256": "16bn8y2sd7kzihp8bxh4vyay16y91q3yc0gcd0bzywcx3hijqlfc" + "commit": "7cf0d739a8a7834d6c3896b62122a0fc6953d371", + "sha256": "1gy4fmjpymabs4z5k3j07di6hqpx6w592w4qvq1iccapy1kqxbj1" }, "stable": { "version": [ @@ -100904,26 +101673,45 @@ "repo": "ubolonton/emacs-tree-sitter", "unstable": { "version": [ - 20201107, - 1648 + 20201229, + 1403 ], "deps": [ "tsc" ], - "commit": "887ad56d5c755d0007905d874e48eeedb2e8a383", - "sha256": "0fwl3m310l7f4cz58jak0ap2ilkml93my6w2fvyayv97ygn934r4" + "commit": "3dd686565b222fb00ff54b374333b48598f5317c", + "sha256": "1afalhxn6kcfbs1f2zirwhs68lskif17npda8iarpjbpm9bhml21" }, "stable": { "version": [ 0, - 12, - 1 + 13, + 0 ], "deps": [ "tsc" ], - "commit": "68757fb6f0ab7f2661b9abc8fda876453f27e3cd", - "sha256": "0vyd3j0wqric5b49f5pbrmlplpffw9wadmsl9h4wvgq61sn2ck3p" + "commit": "a3aef9113365032d55fedbbe08ab7b04f5268d14", + "sha256": "1n8mxd7fhs2brblrfr5892j5xqgh247d8ngnkhwq6acn8hfxn7qf" + } + }, + { + "ename": "tree-sitter-indent", + "commit": "fddb298f3020cd2eb7628f6282e0f35628a3eb17", + "sha256": "0krj3jqsmbi36jfzkic6g0h2zbqwwdp3yp0i034avjcb669l9fwj", + "fetcher": "git", + "url": "https://codeberg.org/FelipeLema/tree-sitter-indent.el.git", + "unstable": { + "version": [ + 20201231, + 1842 + ], + "deps": [ + "seq", + "tree-sitter" + ], + "commit": "a11aa84a768cff2d40db7ef0c6029742b7ce46a1", + "sha256": "1zxzmqdyw681vzxwhs7bi4xylqy99v0jajsv03mppsslxl4l2fwm" } }, { @@ -100934,26 +101722,26 @@ "repo": "ubolonton/emacs-tree-sitter", "unstable": { "version": [ - 20201205, - 431 + 20210106, + 1552 ], "deps": [ "tree-sitter" ], - "commit": "887ad56d5c755d0007905d874e48eeedb2e8a383", - "sha256": "0fwl3m310l7f4cz58jak0ap2ilkml93my6w2fvyayv97ygn934r4" + "commit": "3dd686565b222fb00ff54b374333b48598f5317c", + "sha256": "1afalhxn6kcfbs1f2zirwhs68lskif17npda8iarpjbpm9bhml21" }, "stable": { "version": [ 0, - 12, - 1 + 13, + 0 ], "deps": [ "tree-sitter" ], - "commit": "68757fb6f0ab7f2661b9abc8fda876453f27e3cd", - "sha256": "0vyd3j0wqric5b49f5pbrmlplpffw9wadmsl9h4wvgq61sn2ck3p" + "commit": "a3aef9113365032d55fedbbe08ab7b04f5268d14", + "sha256": "1n8mxd7fhs2brblrfr5892j5xqgh247d8ngnkhwq6acn8hfxn7qf" } }, { @@ -101000,11 +101788,12 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20201128, - 1158 + 20210108, + 1145 ], "deps": [ "ace-window", + "cfrs", "cl-lib", "dash", "f", @@ -101013,8 +101802,8 @@ "pfuture", "s" ], - "commit": "389bca1c3bdd4c4cf8245d6c4bdf8aa875e40d14", - "sha256": "0jbgmia6f610dsvjfccc06y90clradz3s5b867g5dbap4wxlwmfy" + "commit": "559fa09e32d5db7f620fdd08e03b938e67bf398b", + "sha256": "12r28i8dql9n808b4sry11r7w1sic0b3cqfs2w20wki77wb9isdx" }, "stable": { "version": [ @@ -101043,15 +101832,15 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20200819, - 1950 + 20210107, + 1251 ], "deps": [ "all-the-icons", "treemacs" ], - "commit": "389bca1c3bdd4c4cf8245d6c4bdf8aa875e40d14", - "sha256": "0jbgmia6f610dsvjfccc06y90clradz3s5b867g5dbap4wxlwmfy" + "commit": "559fa09e32d5db7f620fdd08e03b938e67bf398b", + "sha256": "12r28i8dql9n808b4sry11r7w1sic0b3cqfs2w20wki77wb9isdx" } }, { @@ -101062,15 +101851,15 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20200716, - 2041 + 20210107, + 1251 ], "deps": [ "evil", "treemacs" ], - "commit": "389bca1c3bdd4c4cf8245d6c4bdf8aa875e40d14", - "sha256": "0jbgmia6f610dsvjfccc06y90clradz3s5b867g5dbap4wxlwmfy" + "commit": "559fa09e32d5db7f620fdd08e03b938e67bf398b", + "sha256": "12r28i8dql9n808b4sry11r7w1sic0b3cqfs2w20wki77wb9isdx" }, "stable": { "version": [ @@ -101093,14 +101882,14 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20201005, - 1309 + 20210107, + 1251 ], "deps": [ "treemacs" ], - "commit": "389bca1c3bdd4c4cf8245d6c4bdf8aa875e40d14", - "sha256": "0jbgmia6f610dsvjfccc06y90clradz3s5b867g5dbap4wxlwmfy" + "commit": "559fa09e32d5db7f620fdd08e03b938e67bf398b", + "sha256": "12r28i8dql9n808b4sry11r7w1sic0b3cqfs2w20wki77wb9isdx" }, "stable": { "version": [ @@ -101123,16 +101912,16 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20201025, - 957 + 20210107, + 1251 ], "deps": [ "magit", "pfuture", "treemacs" ], - "commit": "389bca1c3bdd4c4cf8245d6c4bdf8aa875e40d14", - "sha256": "0jbgmia6f610dsvjfccc06y90clradz3s5b867g5dbap4wxlwmfy" + "commit": "559fa09e32d5db7f620fdd08e03b938e67bf398b", + "sha256": "12r28i8dql9n808b4sry11r7w1sic0b3cqfs2w20wki77wb9isdx" }, "stable": { "version": [ @@ -101156,16 +101945,16 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20200901, - 1550 + 20210107, + 1251 ], "deps": [ "dash", "persp-mode", "treemacs" ], - "commit": "389bca1c3bdd4c4cf8245d6c4bdf8aa875e40d14", - "sha256": "0jbgmia6f610dsvjfccc06y90clradz3s5b867g5dbap4wxlwmfy" + "commit": "559fa09e32d5db7f620fdd08e03b938e67bf398b", + "sha256": "12r28i8dql9n808b4sry11r7w1sic0b3cqfs2w20wki77wb9isdx" }, "stable": { "version": [ @@ -101189,16 +101978,16 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20200901, - 1550 + 20210107, + 1251 ], "deps": [ "dash", "perspective", "treemacs" ], - "commit": "389bca1c3bdd4c4cf8245d6c4bdf8aa875e40d14", - "sha256": "0jbgmia6f610dsvjfccc06y90clradz3s5b867g5dbap4wxlwmfy" + "commit": "559fa09e32d5db7f620fdd08e03b938e67bf398b", + "sha256": "12r28i8dql9n808b4sry11r7w1sic0b3cqfs2w20wki77wb9isdx" } }, { @@ -101209,15 +101998,15 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20200530, - 2129 + 20210107, + 1251 ], "deps": [ "projectile", "treemacs" ], - "commit": "389bca1c3bdd4c4cf8245d6c4bdf8aa875e40d14", - "sha256": "0jbgmia6f610dsvjfccc06y90clradz3s5b867g5dbap4wxlwmfy" + "commit": "559fa09e32d5db7f620fdd08e03b938e67bf398b", + "sha256": "12r28i8dql9n808b4sry11r7w1sic0b3cqfs2w20wki77wb9isdx" }, "stable": { "version": [ @@ -101425,15 +102214,15 @@ "repo": "alphapapa/ts.el", "unstable": { "version": [ - 20191010, - 210 + 20201212, + 1041 ], "deps": [ "dash", "s" ], - "commit": "df48734ef046547c1aa0de0f4c07d11964ef1f7f", - "sha256": "0hi0dfcwrr0vxp26v3f6radpmmwxbiz3px3br0cydfi6axikw9xl" + "commit": "b7ca357a0ed57694e0b25ec1b1ca12e24a4ce541", + "sha256": "12p4k8x1p0h94xcdis7m0vkzf41k5k3ijkaj838ywb7i74myfdxb" }, "stable": { "version": [ @@ -101471,20 +102260,20 @@ "repo": "ubolonton/emacs-tree-sitter", "unstable": { "version": [ - 20201116, - 1148 + 20201229, + 1403 ], - "commit": "887ad56d5c755d0007905d874e48eeedb2e8a383", - "sha256": "0fwl3m310l7f4cz58jak0ap2ilkml93my6w2fvyayv97ygn934r4" + "commit": "3dd686565b222fb00ff54b374333b48598f5317c", + "sha256": "1afalhxn6kcfbs1f2zirwhs68lskif17npda8iarpjbpm9bhml21" }, "stable": { "version": [ 0, - 12, - 1 + 13, + 0 ], - "commit": "68757fb6f0ab7f2661b9abc8fda876453f27e3cd", - "sha256": "0vyd3j0wqric5b49f5pbrmlplpffw9wadmsl9h4wvgq61sn2ck3p" + "commit": "a3aef9113365032d55fedbbe08ab7b04f5268d14", + "sha256": "1n8mxd7fhs2brblrfr5892j5xqgh247d8ngnkhwq6acn8hfxn7qf" } }, { @@ -101803,8 +102592,8 @@ 20201002, 1109 ], - "commit": "54f14c482701c4f937bf51469f70812624e07f87", - "sha256": "0rl5i34rdg3rk5s2xidf1yz6j5y30mb8qm6l4myw3r973fyasvlr" + "commit": "1043025d42602d560949955410d3afa2562130ee", + "sha256": "1p25fjmv9g0a980zvr4bpjj56xksaziynf4h6cvc6wiw08a9xbcw" }, "stable": { "version": [ @@ -102230,11 +103019,11 @@ "repo": "ideasman42/emacs-undo-fu-session", "unstable": { "version": [ - 20201016, - 2319 + 20201218, + 400 ], - "commit": "56cdd3538a058c6916bdf2d9010c2179f2505829", - "sha256": "04wq1alrzzlidcb4mjb5j7pg68pks1vgv7kvvmi6dzb3l602mb2a" + "commit": "702210384a0c68f04aabc23e08ebd4d6f43ea2c7", + "sha256": "0brd92jln528j7hh8gyv5wz451cfpayvkz9fic7b0wisnwgvq26b" } }, { @@ -102290,19 +103079,19 @@ "repo": "purcell/unfill", "unstable": { "version": [ - 20200304, - 2218 + 20210106, + 220 ], - "commit": "6a3f9e929489ebac5aa26862363410144d84409e", - "sha256": "0jdk2r6jlynswjz047zz2v3dyfq94inf1zbsriq1b8fmia018gah" + "commit": "8375d87ec184fbe964189e2f9b7263cdb1396694", + "sha256": "0pg64nza2mp4xyr69pjq51jsq1aaym0g38g4jzaxr0hh3w0ris1n" }, "stable": { "version": [ 0, - 2 + 3 ], - "commit": "88186dce0de69e8f4aeaf2bfdc77d62210f19cd8", - "sha256": "0wyradin5igp25nsd3n22i2ppxhmy49ac1iq1w2715v8pfmiydnc" + "commit": "8375d87ec184fbe964189e2f9b7263cdb1396694", + "sha256": "0pg64nza2mp4xyr69pjq51jsq1aaym0g38g4jzaxr0hh3w0ris1n" } }, { @@ -102321,6 +103110,18 @@ ], "commit": "a5fd4e326a0607acc3776c11f41826e60b6486c6", "sha256": "035k8fkvrcglqn15fqcd962jyr154b3y8iczddjjc6wfxp16i21x" + }, + "stable": { + "version": [ + 1, + 1, + 7 + ], + "deps": [ + "nadvice" + ], + "commit": "a5fd4e326a0607acc3776c11f41826e60b6486c6", + "sha256": "035k8fkvrcglqn15fqcd962jyr154b3y8iczddjjc6wfxp16i21x" } }, { @@ -102452,11 +103253,11 @@ "repo": "astoff/unicode-math-input.el", "unstable": { "version": [ - 20190813, - 1436 + 20210110, + 1431 ], - "commit": "ba45edbfb8fa453e29c4c6c73af60f06637951d6", - "sha256": "1sil8lnvpdwk0g30mbqymp6ib325q28a8zn3n9y6j39ngphpkffl" + "commit": "b46fc1d4cc5ab5c2bca3de1e5e43c8f53f1d343b", + "sha256": "1g84ynppdv46lhsrl0bgvdvlkijhzns4knkldgmbdhsjafvnz8cw" } }, { @@ -102552,11 +103353,11 @@ "repo": "sindikat/unidecode", "unstable": { "version": [ - 20180312, - 1926 + 20201213, + 1449 ], - "commit": "5502ada9287b4012eabb879f12f5b0a9df52c5b7", - "sha256": "03x3nakbhmakwm977mwrf8jifvjnfwzpjv6wrwpizbqjnkgfchmn" + "commit": "525b51b38f5b0435642005957740fe22ecb2a53c", + "sha256": "1jfaxz6z5lb24hygd7nx2a55blfbcf03225lc8ni2fbmkxx4dkir" } }, { @@ -102871,14 +103672,14 @@ "repo": "jwiegley/use-package", "unstable": { "version": [ - 20201110, - 2133 + 20210106, + 2145 ], "deps": [ "bind-key" ], - "commit": "caa92f1d64fc25480551757d854b4b49981dfa6b", - "sha256": "088kl3bml0rs5bkfymgzr15ram9qvy66h1kaisrbkynh0yxvf8g9" + "commit": "365c73d2618dd0040a32c2601c5456ab5495b812", + "sha256": "10c0rmi5axypx0xy3fib739rjnakl32spwcirzxz1p5r0x9gya4a" }, "stable": { "version": [ @@ -102910,8 +103711,8 @@ "key-chord", "use-package" ], - "commit": "caa92f1d64fc25480551757d854b4b49981dfa6b", - "sha256": "088kl3bml0rs5bkfymgzr15ram9qvy66h1kaisrbkynh0yxvf8g9" + "commit": "365c73d2618dd0040a32c2601c5456ab5495b812", + "sha256": "10c0rmi5axypx0xy3fib739rjnakl32spwcirzxz1p5r0x9gya4a" }, "stable": { "version": [ @@ -102973,8 +103774,8 @@ "system-packages", "use-package" ], - "commit": "caa92f1d64fc25480551757d854b4b49981dfa6b", - "sha256": "088kl3bml0rs5bkfymgzr15ram9qvy66h1kaisrbkynh0yxvf8g9" + "commit": "365c73d2618dd0040a32c2601c5456ab5495b812", + "sha256": "10c0rmi5axypx0xy3fib739rjnakl32spwcirzxz1p5r0x9gya4a" }, "stable": { "version": [ @@ -103063,8 +103864,8 @@ "deps": [ "s" ], - "commit": "e430695957011aeff51fe7e7ed1a154226f205f5", - "sha256": "09x64f7qqan6bdfqjfb6m29ql5hnsi6x2az6hpb0wpgdxgy1vbm6" + "commit": "e1cab50306375d1868ce8ab42394ed508bb67cb9", + "sha256": "12s6c94f9nxpf97crd8p6l844hrvgjbdryy7qpmybvb9zqlxlm9s" }, "stable": { "version": [ @@ -103079,6 +103880,21 @@ "sha256": "0iw4h9w5ddj61s5n9q23pcir1lnfqjasxsgh6x2rff3v997iv4g0" } }, + { + "ename": "utimeclock", + "commit": "f712b882b6961f3a83a9807e973fa6edc592c223", + "sha256": "1818i1b04mzx5015d5h5r1j9hbpg2x8xgszdq831c1sjhvnajh7z", + "fetcher": "gitlab", + "repo": "ideasman42/emacs-utimeclock", + "unstable": { + "version": [ + 20201213, + 438 + ], + "commit": "cd3ab3a419ed50f51a7746849c80cb69910b89ca", + "sha256": "0anmmy46cbph9sjngcz3hbyzir8glzb6fqzl36wzfnxj54rzcf7l" + } + }, { "ename": "utop", "commit": "30489fe52b4031184e54f994770aa3291257bc9d", @@ -103090,17 +103906,17 @@ 20190715, 1836 ], - "commit": "7bc5117d3449fc19f5c706a6decfdb2a30984507", - "sha256": "0fg1amarrwyfq76mv0w5z78qxs1x9vsvmzf7qzvnwh92n7lv6snb" + "commit": "a5ff52bbf608e1112b5c0d41a36e3267f39f4084", + "sha256": "125cv7kwvr1xj52yfb5qlra2li2hikbqnqvqdasn0rq3pkj7f02b" }, "stable": { "version": [ 2, - 6, + 7, 0 ], - "commit": "df2447a63de2fea0f56d8c63d35b0bf39e11c0f2", - "sha256": "1g0s46p8c5kbv1kxvvj838g8hghqbkykv94q6zwy0d7q8ai1kqrq" + "commit": "a5ff52bbf608e1112b5c0d41a36e3267f39f4084", + "sha256": "125cv7kwvr1xj52yfb5qlra2li2hikbqnqvqdasn0rq3pkj7f02b" } }, { @@ -103243,11 +104059,11 @@ "repo": "rrthomas/vala-mode", "unstable": { "version": [ - 20201019, - 1317 + 20201218, + 2109 ], - "commit": "6fcc4d87108179f973273dbc44c57fed44b061ae", - "sha256": "03wmnlpwi2wjm34ycffikdd3wgzy14kiida5lqx37js2am769jzh" + "commit": "d696a8177e94c81ea557ad364a3b3dcc3abbc50f", + "sha256": "0g5pdq757z9d8rk489n5ilhqipdc4i4sfkjwwrxyvgjlapjc04c0" } }, { @@ -103415,19 +104231,19 @@ "repo": "muffinmad/emacs-vc-hgcmd", "unstable": { "version": [ - 20200615, - 1823 + 20201211, + 1339 ], - "commit": "5c735b3e3897b7ba52b5ac4e6a2f43ca283fd52d", - "sha256": "050xk0rs7k79ymchqdkdmgpg3s22wpbdnzl3pz2wsghihkskz6q1" + "commit": "d23de9d10ff68b4c2302ab956f3ba3bb5d3858ee", + "sha256": "14c2brvw6vnf1h3lbpap4jh5d7mjnzxrbny4jk77832v09mj2ria" }, "stable": { "version": [ 1, - 12 + 13 ], - "commit": "5c735b3e3897b7ba52b5ac4e6a2f43ca283fd52d", - "sha256": "050xk0rs7k79ymchqdkdmgpg3s22wpbdnzl3pz2wsghihkskz6q1" + "commit": "d23de9d10ff68b4c2302ab956f3ba3bb5d3858ee", + "sha256": "14c2brvw6vnf1h3lbpap4jh5d7mjnzxrbny4jk77832v09mj2ria" } }, { @@ -103438,26 +104254,26 @@ "repo": "redguardtoo/vc-msg", "unstable": { "version": [ - 20191128, - 1010 + 20201210, + 157 ], "deps": [ "popup" ], - "commit": "93794111daa95b809e46e6d961ad5f68eb8f78ed", - "sha256": "11xci11lbw06syz3y6zhrbh7984mj523i5fphrmdqh76iivkphwh" + "commit": "6c94578b5c692ade27c8b34bf5d99333ee7b4680", + "sha256": "1p54m71ypvz7x5wyzv0lfrxfsx23ipmb4zkq6dm0ppgh9al9hd7k" }, "stable": { "version": [ 1, - 0, - 3 + 1, + 0 ], "deps": [ "popup" ], - "commit": "76951fccc2cf66916af2ae006dfa758583e2415d", - "sha256": "0zmpc2w02ynm6ck01q5l9kv5flbl5zkgxhxyplqddh37ml31pka0" + "commit": "6c94578b5c692ade27c8b34bf5d99333ee7b4680", + "sha256": "1p54m71ypvz7x5wyzv0lfrxfsx23ipmb4zkq6dm0ppgh9al9hd7k" } }, { @@ -103778,20 +104594,20 @@ "repo": "federicotdn/verb", "unstable": { "version": [ - 20201127, - 2022 + 20210104, + 2336 ], - "commit": "ea6be4ad2bf9fdd2907df51b1cf51dd5bd356c40", - "sha256": "0k8s43pqwicws9qaaa5nz7qkzg0dymbzrsdcb7gg3x6jzg1wy119" + "commit": "7ee2d15a14985f30ca2a750691817634b2382b38", + "sha256": "1viv0l0mrlavqnv57isjwza4dig3488i3d9gmb44n8dhjarfpv86" }, "stable": { "version": [ 2, 13, - 0 + 1 ], - "commit": "e714404d8b190e4c82383f9ffe1ff613f3efebe7", - "sha256": "0116n67d3d26mvifs6a7pn2yvj511nrmmnjkykjfb5i8dhpa0lyq" + "commit": "91827971f655936d8a8df95c9d2f39eaee667c97", + "sha256": "1bvvj25shkasy4b14ifkvh195w401xggmhjkflld5frzp7pm6zvp" } }, { @@ -104216,10 +105032,10 @@ }, { "ename": "visible-mark", - "commit": "76ac7178ee5381e08ae881f3fc6061106eeb1c1d", - "sha256": "1rp0gnz28m1drwb1hhsf0mwxzdppdi88hscf788qw8cw65gckv80", - "fetcher": "gitlab", - "repo": "iankelling/visible-mark", + "commit": "9c101affbe6d0e794e3ec6889745e4d05cb7e4fc", + "sha256": "1rpj2hfh009zlp14xv0qqlw5qmx2y1d57irbwcmzvxfa6lgahiw5", + "fetcher": "git", + "url": "https://git.sr.ht/~iank/visible-mark", "unstable": { "version": [ 20150624, @@ -104260,19 +105076,19 @@ "repo": "joostkremers/visual-fill-column", "unstable": { "version": [ - 20201008, - 919 + 20201229, + 2303 ], - "commit": "598bc992f050575c48db6fb9ea50794a5ce5d065", - "sha256": "1dfsh48p2mcab9axff74vqb8d003f8v6j0hh26y2gdlada7fn75g" + "commit": "5b08b9ae9da5b95e42e94e4c9ec01d63e8848ea2", + "sha256": "1zg69lqg7yxxr4bw5lhcs5r8pljqalxqqbzvv3zrcifx7n24qzi9" }, "stable": { "version": [ - 1, - 14 + 2, + 2 ], - "commit": "598bc992f050575c48db6fb9ea50794a5ce5d065", - "sha256": "1dfsh48p2mcab9axff74vqb8d003f8v6j0hh26y2gdlada7fn75g" + "commit": "68784162d758fbe6a91d04e9caa8f05683fb6ba9", + "sha256": "1wjb4zm9mx07v0qx2fxmclg4pg0ssgnf8lp89wc56kmc0s40jhii" } }, { @@ -104412,6 +105228,9 @@ 2, 0 ], + "deps": [ + "popup" + ], "commit": "224402532da28e45edd398fda61ecbddb97d22d3", "sha256": "0q1rwqjwqcnsr57s531pwlm464q8wx5vvdm5rj2xy9b3yi6phis1" } @@ -104547,11 +105366,11 @@ "repo": "jojojames/vscode-icon-emacs", "unstable": { "version": [ - 20191102, - 2010 + 20201214, + 2227 ], - "commit": "4304e9f0a47406048129dc62171f08b67325a2ed", - "sha256": "0dpmw1kg9ivrn92vis7bxs8nlb1ixk72fhd4s4f5c21k0j4s12rd" + "commit": "909151c8105861aa300f5601e333909d36d0ebf5", + "sha256": "1zxppynlapsc58hakmbc68x94qhvfrjc41y4ccl6vs0kvkcrs1kp" } }, { @@ -104562,11 +105381,11 @@ "repo": "akermu/emacs-libvterm", "unstable": { "version": [ - 20201206, - 205 + 20210111, + 522 ], - "commit": "a670b786539d3c8865d8f68fe0c67a2d4afbf1aa", - "sha256": "0s244crjkbzl2jhp9m4sm1xdhbpxwph0m3jg18livirgajvdz6hn" + "commit": "9d2ef5e535e79781a0c1d2523f82d096eb48765f", + "sha256": "03nslg391cagq9kdxkgyjcw3abfd5xswza5bq8rl8mrp9f8v7i17" } }, { @@ -104764,11 +105583,11 @@ "repo": "emacs-w3m/emacs-w3m", "unstable": { "version": [ - 20201129, - 2228 + 20210105, + 2310 ], - "commit": "267d4220715eabacca1ad1661d76be5ceed7072c", - "sha256": "0xyrvvrckn8agg86kkr6821bj07s5an8w226k964f148jn84n86q" + "commit": "f29aadae07bd58689720271b1f6538edfec5c476", + "sha256": "130ydwzpzw4s4h3jhh5h066iib7s9c8xa43imvlvcqs3vghp7p1x" } }, { @@ -104844,8 +105663,8 @@ 20200730, 240 ], - "commit": "7626678315918bdbb81ede68149f20a7d97a928f", - "sha256": "0dlhj32mkylji1d55pc593d3gn8babcs6s4c0c5sfm6jfz14m9j0" + "commit": "5e6deddda7a70f4b79832e9e8b6636418812e162", + "sha256": "195h5dnanicxksag72kp19nvsxsbqb34pr3pk6shki6yca2ks7yg" } }, { @@ -104890,16 +105709,29 @@ "repo": "abrochard/walkman", "unstable": { "version": [ - 20201124, - 1725 + 20201229, + 1811 ], "deps": [ "json-mode", "org", "transient" ], - "commit": "ade5f2a7c4a4260b39cfc23d40112b4fcb7a572b", - "sha256": "1ldy46sylhlm6zjk55lachz3vyx2klz30nj2ycc1m27568n7b1jy" + "commit": "00b4fd5cae7fe27085995dbb178828fb765c7edc", + "sha256": "1ya91159i58x4mccpnx429kq2k0xc04alikbly549qm8yw1y1hxg" + }, + "stable": { + "version": [ + 0, + 2 + ], + "deps": [ + "json-mode", + "org", + "transient" + ], + "commit": "00b4fd5cae7fe27085995dbb178828fb765c7edc", + "sha256": "1ya91159i58x4mccpnx429kq2k0xc04alikbly549qm8yw1y1hxg" } }, { @@ -104976,16 +105808,16 @@ "repo": "wanderlust/wanderlust", "unstable": { "version": [ - 20201128, - 2357 + 20210105, + 1556 ], "deps": [ "apel", "flim", "semi" ], - "commit": "5db307a0441b6b7aa4ecfd34344842d78f15611b", - "sha256": "03044c5lq9j5i1a5d0wy195m1n7353g2kjldinbla650fhwjhix1" + "commit": "cf16d1272cd04ccc845476a1db9fb2ab690b0f55", + "sha256": "05mx1g5gqrbzl4p41kxsk2hl15vrfx8nf97xf2zn9c9s8nq0qj0n" } }, { @@ -105221,11 +106053,11 @@ "repo": "fxbois/web-mode", "unstable": { "version": [ - 20201107, - 1152 + 20201227, + 1048 ], - "commit": "890e837f7ea49f54c02b107377036431cbe7adb6", - "sha256": "1mzxnzha4z1y4n1wr2kawidnlh30s4kvdbcavzicvvygvafdvc36" + "commit": "a3ce21f795e03c7a5489a24b2b3c4fce2d7a2f59", + "sha256": "1234cr8hd25z181vg64r10l4gmdc1nr7dij2qnp4xs9ag3zkdf1y" }, "stable": { "version": [ @@ -105314,11 +106146,11 @@ "repo": "eschulte/emacs-web-server", "unstable": { "version": [ - 20201030, - 1619 + 20201217, + 1252 ], - "commit": "7b517abf236e7fe718696a4cb7566d718ea68a3f", - "sha256": "0qbi6qwxvm1z5fws432jb7ir1x4abyy680i3ccpv7xpi81qwhw7i" + "commit": "4d865cc4720f668aed7a8c3bcfddfbf534ecfb67", + "sha256": "14kx3anbffs53hdcq7347b3rd33lk6ajvwrz5mhnnj1kmdxy7dxh" } }, { @@ -105357,6 +106189,36 @@ "sha256": "03dkabszk6ya3vaps1ap16psk5bbar8zd5ipn1lmyzsbd3hwm8mj" } }, + { + "ename": "weblorg", + "commit": "8c9f6e5452a31772f90c1b5a5fa34b5a833073bb", + "sha256": "0gcxksn353zl0kzi387dm3fyy9n4gpjsjy5qlbr7iq4pcby4zbjb", + "fetcher": "github", + "repo": "emacs-love/weblorg", + "unstable": { + "version": [ + 20210111, + 526 + ], + "deps": [ + "templatel" + ], + "commit": "1d0b5b9bc640a7147e1aa42867c7794fb5d039cc", + "sha256": "1fanpp3a40fkwdxc3ixvz6ykvkxh61mq2jxl1dgf0rrxc82mzhms" + }, + "stable": { + "version": [ + 0, + 1, + 0 + ], + "deps": [ + "templatel" + ], + "commit": "5ef2daff8498be07ea9b0f50a92d84c8d21d3a49", + "sha256": "14797vv2i3b5dgzdazacw2g9r3i5zam4xr3554xzpq1l8ran0g2p" + } + }, { "ename": "webpaste", "commit": "13847d91c1780783e516943adee8a3530c757e17", @@ -105397,25 +106259,25 @@ "repo": "ahyatt/emacs-websocket", "unstable": { "version": [ - 20201122, - 246 + 20210110, + 17 ], "deps": [ "cl-lib" ], - "commit": "36deb3ff85368d000a88435d5a645ffbab490654", - "sha256": "08q24pp6r8s74bxah6lk0rs9y4bygfpl4pcpw2yngd5i4wajsjvx" + "commit": "34e11124fdd9d73e431499ba8a6b6a8023519664", + "sha256": "066zql1zknnc1dlj9jj4dx7w8y8z2q6i2gnagy3jwwxc8j5pp0c2" }, "stable": { "version": [ 1, - 12 + 13 ], "deps": [ "cl-lib" ], - "commit": "491a60b8bb8a6c3bd081c70354ab82040b0a7db3", - "sha256": "0g0vy2yc118mcka9f26950gdmb780zpxck9y6nli602vj32dw1g2" + "commit": "34e11124fdd9d73e431499ba8a6b6a8023519664", + "sha256": "066zql1zknnc1dlj9jj4dx7w8y8z2q6i2gnagy3jwwxc8j5pp0c2" } }, { @@ -105521,11 +106383,11 @@ "repo": "jstaursky/weyland-yutani-theme", "unstable": { "version": [ - 20201208, - 1748 + 20201209, + 1505 ], - "commit": "5a68065a2b2d66aad75a832d19fc65b3d30ac0a0", - "sha256": "1s1j1lw1i98r1j7zsrhxpjjlvr7kqs3b03m4pj5mnd8g31ddvgb8" + "commit": "86c72ef8e3d25bee94c35254ad03b5d3e4836994", + "sha256": "148p1c6cwxcri2732ngbbmd27g1m61gsxbgs0f1qbpqhsy0pplz2" } }, { @@ -105695,11 +106557,11 @@ "repo": "justbur/emacs-which-key", "unstable": { "version": [ - 20200908, - 2301 + 20201216, + 1720 ], - "commit": "ca268fd313d3fb2bd03a8b5e4bdcca675ce58ca7", - "sha256": "0rvlhj05v5b67axv2l6mdz9112p5h8w465zii3xs2fpjhrpx6sxx" + "commit": "428aedfce0157920814fbb2ae5d00b4aea89df88", + "sha256": "116c3krgi7iyv708jwzqjz72wf1j1aczgv5cvkdscrn7zgpyvm8c" }, "stable": { "version": [ @@ -105880,14 +106742,14 @@ "repo": "purcell/whole-line-or-region", "unstable": { "version": [ - 20200924, - 129 + 20201214, + 650 ], "deps": [ "cl-lib" ], - "commit": "f0051d301f83d6dd26ce30a8ea039a8510c79cc0", - "sha256": "0y02938a02mb6imlljsz2i9d2ki37hiqyhlyq341la2dr6iwn8sl" + "commit": "4a1d44ec7b1421913cb39a6e83854329be910e68", + "sha256": "0az61n9c4mf2l68y67lmp34d678n13s06kpx62r4v5kaar2vhz8i" }, "stable": { "version": [ @@ -106008,6 +106870,40 @@ "sha256": "0qcnqwiylkkb7132bzra49k7jg8kq13jif8096vpg4xzpcq5lpj2" } }, + { + "ename": "wikinfo", + "commit": "c92d75c776bd5ef84b6e5991f4a9d1398b7044a3", + "sha256": "12vdymysak2d8xn3jklcvl7nw7w7ldkb6jyyvlwsf5z6sk8b3rx8", + "fetcher": "github", + "repo": "progfolio/wikinfo", + "unstable": { + "version": [ + 20210112, + 324 + ], + "commit": "b3c2824ab7cd653741b2b905f5c3279e312857cc", + "sha256": "01l3qwaqrcgrwlvfhxw2db06svcqhiahp6jbn8x8k5fmq7mk5hr3" + } + }, + { + "ename": "wikinforg", + "commit": "536407ae580d8921f40cb1480c0443ad3df5078c", + "sha256": "0v80kaq63h3a2ybfmwk0vm6n6fg4891m9arq6psd0y7f77af9hrs", + "fetcher": "github", + "repo": "progfolio/wikinforg", + "unstable": { + "version": [ + 20201227, + 1454 + ], + "deps": [ + "org", + "wikinfo" + ], + "commit": "8496c243f8d98ba2787b63f7d19fbae3831832d2", + "sha256": "1w7q3badp6r653grsblmnambv99r52c34gmnpdz0f5ybmw83002p" + } + }, { "ename": "wilt", "commit": "eea4f2ca8b4f9ea93cc02151fdda6cfee5b68b70", @@ -106286,11 +107182,11 @@ "repo": "dgtized/winnow.el", "unstable": { "version": [ - 20170903, - 1206 + 20210105, + 1919 ], - "commit": "18cb6b94338f3b7b4f2cd0331dad22f82dd9e0d3", - "sha256": "1wp00zxxcibvl6vjwmvhkgcbi76dyb2g8c30wy4kp7876cpc8hgv" + "commit": "761b15bc31696a4f80c5fd508c84b1f5b4190ec2", + "sha256": "1hl208sl8vq6mjv9a3f4xmj7732jy3mw4bikxcs5c1drlmqr3mxs" } }, { @@ -106401,14 +107297,14 @@ "repo": "magit/with-editor", "unstable": { "version": [ - 20201030, - 1232 + 20210110, + 1545 ], "deps": [ "async" ], - "commit": "6735180e73e787b79535c245b162249b70dbf841", - "sha256": "0hw6i5r3adkm4988badi94825lywkrh3sddiff4z04kj1nj15d0k" + "commit": "139ef3933ea7aa3fe67b87450a6a1ac0895e5c81", + "sha256": "1zdgn2ajpbdxnc7qf98z7590w8y1s0iqj27fv7m8ndkrn8c1cx0x" }, "stable": { "version": [ @@ -106731,8 +107627,8 @@ "repo": "abo-abo/worf", "unstable": { "version": [ - 20201114, - 1141 + 20201226, + 1859 ], "deps": [ "ace-link", @@ -106740,8 +107636,8 @@ "swiper", "zoutline" ], - "commit": "a341c87ab6e696968436b38c1c34488d50764f48", - "sha256": "14dlmpxxhhg3y55ysdgn4q65x3q94jk7xlmjhhz3abqc5xjbq127" + "commit": "7ddd86aa3c62955714c2d60decd7a78c06b4771a", + "sha256": "02ci6hnjv80n3gjl04lxkcjvc2bzvn34w0z721qira1g7m2ysa8a" }, "stable": { "version": [ @@ -106781,14 +107677,11 @@ "repo": "pashinin/workgroups2", "unstable": { "version": [ - 20200729, - 852 + 20201217, + 1159 ], - "deps": [ - "dash" - ], - "commit": "737306531f6834227eee2f63b197a23401003d23", - "sha256": "0f16a4zz5havxbadiv4h6msa30c1yfdkfk56gic5wapz4i26z3x7" + "commit": "c9403c68a7e6491134110d7cacc130c34eae85a0", + "sha256": "0zkg6b45nc8ap8c8r95r25wyxymnslp3k1x2mmnmj0ivyi0bxjib" }, "stable": { "version": [ @@ -106918,25 +107811,25 @@ "repo": "joostkremers/writeroom-mode", "unstable": { "version": [ - 20201107, - 2227 + 20201229, + 2242 ], "deps": [ "visual-fill-column" ], - "commit": "92c47dfa659c418700d064a479e30590bcfc1904", - "sha256": "0bn2ff9j8gy2nb5km2r8w45avcs98gab8fsvr9ph220p58jk805c" + "commit": "b648b340172ce4e44307375697e190bc723203e0", + "sha256": "03dq65wsfwf4xdl6rj5zpk72gwzwydfdapfz8gh797jn2mp1dqnk" }, "stable": { "version": [ 3, - 10 + 11 ], "deps": [ "visual-fill-column" ], - "commit": "6552c056b85fd26a3ac509100d9d5c5c3c19515a", - "sha256": "0la4q2dm123l4rdfh0ry03b99ihvh324y7iw12az909198bcx335" + "commit": "b508843b04e1adc4e2cc9a04ca3ad53d8b1bbbb4", + "sha256": "0y4jcja9kml1lq88r8b9myk39dgaggh7q7f3a43sj828hvzlccb7" } }, { @@ -107082,14 +107975,14 @@ "repo": "Lompik/x-path-walker", "unstable": { "version": [ - 20160922, - 1835 + 20201220, + 628 ], "deps": [ "helm-core" ], - "commit": "3b01dbd7a039c6c84fdf8c8ee53ba72090ee950a", - "sha256": "1gb3lnl3gvckbakc4fy22fcvif3xdfkdaw334xmp33phjb8gjqvj" + "commit": "e553968b6ddebe39ea00904a2e9ff4cff6096985", + "sha256": "0iq8pglzzx83k4wcld250vy0x3n9vz8689bwpbqkapg5p3m8c6v1" } }, { @@ -107148,11 +108041,11 @@ "repo": "xahlee/xah-css-mode", "unstable": { "version": [ - 20201207, - 2036 + 20201229, + 837 ], - "commit": "3971ebee16fe57107261f6eda6438a234637dc36", - "sha256": "1cmlv344wpcvriybcc52hg8xg6pdl041xpgsw6shrgys9hq5jdzd" + "commit": "5d9db23bbb982c28cbcf351957ef96ecd80e4c0b", + "sha256": "0f1dwl1nljxw94g6jkqv7rsyxnr9na0xxj447jhmsjyd3iry3g7n" } }, { @@ -107163,11 +108056,11 @@ "repo": "xahlee/xah-elisp-mode", "unstable": { "version": [ - 20201014, - 1717 + 20210112, + 109 ], - "commit": "fd7200afd199a52aea560173689039015aac595d", - "sha256": "0lg5yg1ckbqi5rw8y9jjymdqxl2z8ka959vghkbk7s9h8v6sidpq" + "commit": "134f9d259b68f5c3644dbed203d0d4142e2f3ce9", + "sha256": "15x15dzk67xif8ybnv9jid5xzmwimxx086ysdhryqqzrlxc3igiq" } }, { @@ -107178,11 +108071,11 @@ "repo": "xahlee/xah-find", "unstable": { "version": [ - 20190314, - 2039 + 20210111, + 334 ], - "commit": "a39f1ff9a7cf56e92b56c6f179741569b9172a48", - "sha256": "16d2dh08dxdm06ik3sfx00filxqpy646vv1qh5kb36zs8ydzjg3z" + "commit": "8948fa8f18023868731a1666f9893abc08f370e1", + "sha256": "1qk1scf085fc650km5hx2fp2chxj1a2hwp4bffxmp59mg78qpb71" } }, { @@ -107193,11 +108086,11 @@ "repo": "xahlee/xah-fly-keys", "unstable": { "version": [ - 20201208, - 2351 + 20210111, + 510 ], - "commit": "e6162ebb8ca24e1ae025e3cc125dfdc99e6ec622", - "sha256": "0zih4ynhq3jn0as9v22cbi5f097qxqkgj1y43ydlk4szixx952kf" + "commit": "bfb3c65ea6e578abab5294c1ef003ac0784446eb", + "sha256": "0jffl3fq7yzdfpk7jy45bwll88q6ds9bk218xgnhs6sfwk55k94d" } }, { @@ -107268,11 +108161,11 @@ "repo": "xahlee/xah-replace-pairs", "unstable": { "version": [ - 20180508, - 249 + 20210109, + 1741 ], - "commit": "4d845cfbce32d45befd7c454e3476c3ce40d2b43", - "sha256": "1mkglrc8mbsjag3pc9zrmqa9x3n009hza1p1jvn3n97wjpc1qxlk" + "commit": "a051568c21b0bd7907dffebdbe04d0110c038be0", + "sha256": "0z3cvajj5cf23h8lxlj10wm8rxh7vjpnsk8svryx5djd26ffpc11" } }, { @@ -107389,8 +108282,8 @@ "repo": "dandavison/xenops", "unstable": { "version": [ - 20201111, - 1643 + 20210103, + 1339 ], "deps": [ "aio", @@ -107401,8 +108294,8 @@ "f", "s" ], - "commit": "fd9a8ba23727170db9baef98950d51f4bfd99d34", - "sha256": "1g2bxwvhhn919wzgl4nlkisyl0886fs8bbdl0dn2ry7i3a732jbc" + "commit": "5812aa55a816bb66d90443a6a634069d9fbfecf1", + "sha256": "1nwhrbpqgbcv1467zyjwww6r04k965fkrkc5v3iqzkg88ld43sj0" } }, { @@ -107434,6 +108327,25 @@ "sha256": "0p9p3w8i5w1pzh3y3yxz0rg5gywfq4m5anbiyrdn84vdd42jij4x" } }, + { + "ename": "xmind-org", + "commit": "9bff1f465c7c1b97bb4debb9acb53b6192831631", + "sha256": "0ilb2l0zp60cv6igvrbyhjcvihm9gvy9q8zs7frxqgsadshx45jn", + "fetcher": "github", + "repo": "akirak/xmind-org-el", + "unstable": { + "version": [ + 20201202, + 1605 + ], + "deps": [ + "dash", + "org-ml" + ], + "commit": "ee09e382b3fefb67ccf3cd4db96a8dd2acc34045", + "sha256": "1icjdgyv5i640p8q8y06h7nhzi7is4szj19j3vbhh6yxbwzdhbn9" + } + }, { "ename": "xml+", "commit": "244388d158efda6fe8c1362a65b89b352c444422", @@ -107626,8 +108538,8 @@ 20200907, 811 ], - "commit": "bfbe9a70fb9fc7fdd24dcfa7085b16fb01f14501", - "sha256": "1bmsrj24apag8lwqzgs3gyfmxwmraq4psfcr8szib1f71yzq9sli" + "commit": "885184298ce1b6eb5d18922ea331623973082a15", + "sha256": "04pq8xffpj16kifkxr4w64kh77a1cghvy2725w5qbj75v95w6078" }, "stable": { "version": [ @@ -107668,6 +108580,21 @@ "sha256": "0kg1vdyjd0n48cb8bvjqskzd79s3bgdcpzn80gm2y78m280kakn8" } }, + { + "ename": "xref-rst", + "commit": "2f6748512dc546f84b13733086cefb158bc7787c", + "sha256": "0crzzalphr4865a78wih085ycscg78h288hlq0dh6qk50siaxk1m", + "fetcher": "gitlab", + "repo": "ideasman42/emacs-xref-rst", + "unstable": { + "version": [ + 20210110, + 640 + ], + "commit": "3e7360553f46461cbcacdb18cbb7a214d55b89f7", + "sha256": "1cqp0azbnhsi7l2xis6b0pwcpn4v40cqx5p79ymhhza8ch8q7rx6" + } + }, { "ename": "xresources-theme", "commit": "35763febad20f29320d459394f810668db6c3353", @@ -108071,11 +108998,11 @@ "repo": "Kungsgeten/yankpad", "unstable": { "version": [ - 20201118, - 844 + 20201228, + 1208 ], - "commit": "7aea1769d206c0051a014622ee64be4f4f1f0494", - "sha256": "08na5qixdhkdkbhssk12mspqalnbss8f77a2qgia3cwb0gm5ijvz" + "commit": "06d85f04133fbd49a6469174032f4c10a0abe98d", + "sha256": "16a4qfliym93rj7bsjijzwlv8r8h9kbxrd53wdk9fb6vgdk2vv9h" }, "stable": { "version": [ @@ -108194,11 +109121,11 @@ "repo": "emacsorphanage/yascroll", "unstable": { "version": [ - 20201018, - 1346 + 20210108, + 1826 ], - "commit": "cd66d81c5d4ba39da3c385d12d22f7103ecd67c5", - "sha256": "04mhjh163gp2shivxhilpacy22lrd2vswjf7934ldphw8qfahl2f" + "commit": "b9061340cc15a3ace3ca8c6e54512b481c71acf1", + "sha256": "1vr0p3q5pnnqpdfvnz29v8sjsldp22hghqb16gmj7l0n2xnlvyv3" }, "stable": { "version": [ @@ -108266,14 +109193,14 @@ "repo": "AndreaCrotti/yasnippet-snippets", "unstable": { "version": [ - 20201118, - 2148 + 20210105, + 1346 ], "deps": [ "yasnippet" ], - "commit": "9fc9c2144aa3db4d85fdd35f7df28e58aa1801b3", - "sha256": "1a0wf16ai4rlm3z3b7kk5000izq1xkjwc7cvjmxgmy02sa8bif69" + "commit": "899c027f442587e0f8ef90761f58b27907ca64b4", + "sha256": "1vl2y271y4vlgpnjb1fa24fsd77zmzha2miyqwnf9n9pdd96brjg" }, "stable": { "version": [ @@ -108836,20 +109763,20 @@ "repo": "eutropius225/zenscript-mode", "unstable": { "version": [ - 20201206, - 2129 + 20210102, + 1350 ], - "commit": "5ec8663f3d2e6391f18a9f3a78864bcf6962898a", - "sha256": "1j99gds76dvnkrqrddd1fw6k3f8x7zixdpdv71qsirjw8nvsyhk4" + "commit": "c33b4525502459fe60dd76b383e19919d450aeb8", + "sha256": "0v4limzd9d95wp7f32acln0h245d0zr88jb4a4szl053p6ynvbq0" }, "stable": { "version": [ 1, 2, - 0 + 1 ], - "commit": "5ec8663f3d2e6391f18a9f3a78864bcf6962898a", - "sha256": "1j99gds76dvnkrqrddd1fw6k3f8x7zixdpdv71qsirjw8nvsyhk4" + "commit": "c33b4525502459fe60dd76b383e19919d450aeb8", + "sha256": "0v4limzd9d95wp7f32acln0h245d0zr88jb4a4szl053p6ynvbq0" } }, { @@ -108951,15 +109878,15 @@ "repo": "EFLS/zetteldeft", "unstable": { "version": [ - 20201207, - 852 + 20201230, + 2127 ], "deps": [ "ace-window", "deft" ], - "commit": "cd5e0a9ef748ed9d0484f8bc1e123c50017882b6", - "sha256": "0ifcs6x3wx5jah223wchs03r8fmcjsza50shm2dbk8zzzfk6zv1k" + "commit": "ca3793959669b577296e1787aa029effa29a15c5", + "sha256": "1rxp0nwnjpwz3j44yj7afjj04hx4y3157a7vrgy0dlivhjzmdgag" }, "stable": { "version": [ @@ -109256,11 +110183,11 @@ "repo": "cyrus-and/zoom", "unstable": { "version": [ - 20200708, - 1105 + 20201215, + 1913 ], - "commit": "a373e7eed59ad93315e5ae88c816ca70404d2d34", - "sha256": "0dmpin0rlwib659s3g7qp48qmma50amj7zdk281b4j0bl6p3zkyc" + "commit": "c7beef180bc4037404e2d56b9ab9b7c76d1713a0", + "sha256": "0vzrg5vfb4rnripdxlnl2gs6mm85ysiwnn8rclsaljrmk5xrp5ls" }, "stable": { "version": [ diff --git a/pkgs/applications/editors/emacs-modes/session-management-for-emacs/default.nix b/pkgs/applications/editors/emacs-modes/session-management-for-emacs/default.nix index e4b739af0517..61749a89fde4 100644 --- a/pkgs/applications/editors/emacs-modes/session-management-for-emacs/default.nix +++ b/pkgs/applications/editors/emacs-modes/session-management-for-emacs/default.nix @@ -2,20 +2,20 @@ stdenv.mkDerivation { name = "session-management-for-emacs-2.2a"; - + src = fetchurl { url = "mirror://sourceforge/emacs-session/session-2.2a.tar.gz"; sha256 = "37dfba7420b5164eab90dafa9e8bf9a2c8f76505fe2fefa14a64e81fa76d0144"; }; buildInputs = [emacs]; - + installPhase = '' mkdir -p "$out/share/emacs/site-lisp" cp lisp/*.el "$out/share/emacs/site-lisp/" ''; - meta = { + meta = { /* installation: add to your ~/.emacs (require 'session) (add-hook 'after-init-hook 'session-initialize) diff --git a/pkgs/applications/editors/emacs-modes/sv-kalender/default.nix b/pkgs/applications/editors/emacs-modes/sv-kalender/default.nix index 211be0a90897..dd553fc19980 100644 --- a/pkgs/applications/editors/emacs-modes/sv-kalender/default.nix +++ b/pkgs/applications/editors/emacs-modes/sv-kalender/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, trivialBuild }: +{ fetchurl, lib, stdenv, trivialBuild }: trivialBuild { pname = "sv-kalender"; @@ -12,7 +12,7 @@ trivialBuild { ''; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Swedish calendar for Emacs"; homepage = "http://bigwalter.net/daniel/elisp/sv-kalender.el"; platforms = platforms.all; diff --git a/pkgs/applications/editors/emacs-modes/update-from-overlay b/pkgs/applications/editors/emacs-modes/update-from-overlay index fc5657e44196..886019716d49 100755 --- a/pkgs/applications/editors/emacs-modes/update-from-overlay +++ b/pkgs/applications/editors/emacs-modes/update-from-overlay @@ -2,18 +2,20 @@ #! nix-shell -i bash -p curl nix set -euxo pipefail +export NIXPKGS_ALLOW_BROKEN=1 + # This script piggybacks on the automatic code generation done by the nix-community emacs overlay # You can use this to avoid running lengthy code generation jobs locally curl -s -O https://raw.githubusercontent.com/nix-community/emacs-overlay/master/repos/elpa/elpa-generated.nix -nix-instantiate ../../../.. -A emacsPackagesNg.elpaPackages --show-trace -git diff --exit-code elpa-generated.nix > /dev/null || git commit -m "emacsPackages.elpa-packages: $(date --iso)" -- elpa-generated.nix +nix-instantiate ../../../.. -A emacs.pkgs.elpaPackages --show-trace +git diff --exit-code elpa-generated.nix > /dev/null || git commit -m "emacs.pkgs.elpa-packages: $(date --iso)" -- elpa-generated.nix curl -s -O https://raw.githubusercontent.com/nix-community/emacs-overlay/master/repos/org/org-generated.nix -nix-instantiate ../../../.. -A emacsPackagesNg.orgPackages --show-trace -git diff --exit-code org-generated.nix > /dev/null || git commit -m "emacsPackages.org-packages: $(date --iso)" -- org-generated.nix +nix-instantiate ../../../.. -A emacs.pkgs.orgPackages --show-trace +git diff --exit-code org-generated.nix > /dev/null || git commit -m "emacs.pkgs.org-packages: $(date --iso)" -- org-generated.nix curl -s -O https://raw.githubusercontent.com/nix-community/emacs-overlay/master/repos/melpa/recipes-archive-melpa.json -env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPackages.melpaStablePackages -env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPackages.melpaPackages -git diff --exit-code recipes-archive-melpa.json > /dev/null || git commit -m "emacsPackages.melpa-packages: $(date --iso)" -- recipes-archive-melpa.json +nix-instantiate --show-trace ../../../../ -A emacs.pkgs.melpaStablePackages +nix-instantiate --show-trace ../../../../ -A emacs.pkgs.melpaPackages +git diff --exit-code recipes-archive-melpa.json > /dev/null || git commit -m "emacs.pkgs.melpa-packages: $(date --iso)" -- recipes-archive-melpa.json diff --git a/pkgs/applications/editors/emacs-modes/updater-emacs.nix b/pkgs/applications/editors/emacs-modes/updater-emacs.nix index b5de993eaa76..bd965c8f1285 100644 --- a/pkgs/applications/editors/emacs-modes/updater-emacs.nix +++ b/pkgs/applications/editors/emacs-modes/updater-emacs.nix @@ -1,7 +1,7 @@ let pkgs = import ../../../.. {}; - emacsEnv = (pkgs.emacsPackagesFor pkgs.emacs).emacsWithPackages (epkgs: let + emacsEnv = pkgs.emacs.withPackages (epkgs: let promise = epkgs.trivialBuild { pname = "promise"; diff --git a/pkgs/applications/editors/emacs/generic.nix b/pkgs/applications/editors/emacs/generic.nix index 101dbdaa2e94..eef98943c3b6 100644 --- a/pkgs/applications/editors/emacs/generic.nix +++ b/pkgs/applications/editors/emacs/generic.nix @@ -11,6 +11,7 @@ , libtiff, librsvg, gconf, libxml2, imagemagick, gnutls, libselinux , alsaLib, cairo, acl, gpm, AppKit, GSS, ImageIO, m17n_lib, libotf , jansson, harfbuzz +, dontRecurseIntoAttrs ,emacsPackagesFor , libgccjit, targetPlatform, makeWrapper # native-comp params , systemd ? null , withX ? !stdenv.isDarwin @@ -40,9 +41,7 @@ assert withGTK3 -> !withGTK2 && gtk3-x11 != null; assert withXwidgets -> withGTK3 && webkitgtk != null; -let - -in stdenv.mkDerivation (lib.optionalAttrs nativeComp { +let emacs = stdenv.mkDerivation (lib.optionalAttrs nativeComp { NATIVE_FULL_AOT = "1"; LIBRARY_PATH = "${lib.getLib stdenv.cc.libc}/lib"; } // lib.optionalAttrs stdenv.isDarwin { @@ -175,9 +174,10 @@ in stdenv.mkDerivation (lib.optionalAttrs nativeComp { passthru = { inherit nativeComp; + pkgs = dontRecurseIntoAttrs (emacsPackagesFor emacs); }; - meta = with stdenv.lib; { + meta = with lib; { description = "The extensible, customizable GNU text editor"; homepage = "https://www.gnu.org/software/emacs/"; license = licenses.gpl3Plus; @@ -201,4 +201,5 @@ in stdenv.mkDerivation (lib.optionalAttrs nativeComp { separately. ''; }; -}) +}); +in emacs diff --git a/pkgs/applications/editors/emacs/macport.nix b/pkgs/applications/editors/emacs/macport.nix index f991fe7ea666..dd9a66734586 100644 --- a/pkgs/applications/editors/emacs/macport.nix +++ b/pkgs/applications/editors/emacs/macport.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, pkgconfig, texinfo, libxml2, gnutls, gettext, autoconf, automake, jansson +{ lib, stdenv, fetchurl, ncurses, pkgconfig, texinfo, libxml2, gnutls, gettext, autoconf, automake, jansson , AppKit, Carbon, Cocoa, IOKit, OSAKit, Quartz, QuartzCore, WebKit , ImageCaptureCore, GSS, ImageIO # These may be optional }: @@ -87,7 +87,7 @@ stdenv.mkDerivation rec { # lisp/net/tramp-tests.log doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "The extensible, customizable text editor"; homepage = "https://www.gnu.org/software/emacs/"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/editors/featherpad/default.nix b/pkgs/applications/editors/featherpad/default.nix index 8343472fa70a..dee0fe72ebb0 100644 --- a/pkgs/applications/editors/featherpad/default.nix +++ b/pkgs/applications/editors/featherpad/default.nix @@ -1,4 +1,4 @@ -{ stdenv, mkDerivation, pkgconfig, qmake, qttools, qtbase, qtsvg, qtx11extras, fetchFromGitHub }: +{ lib, stdenv, mkDerivation, pkgconfig, qmake, qttools, qtbase, qtsvg, qtx11extras, fetchFromGitHub }: mkDerivation rec { pname = "featherpad"; version = "0.10.0"; @@ -13,7 +13,7 @@ mkDerivation rec { nativeBuildInputs = [ qmake pkgconfig qttools ]; buildInputs = [ qtbase qtsvg qtx11extras ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Lightweight Qt5 Plain-Text Editor for Linux"; homepage = "https://github.com/tsujan/FeatherPad"; platforms = platforms.linux; diff --git a/pkgs/applications/editors/flpsed/default.nix b/pkgs/applications/editors/flpsed/default.nix index 3d6aac7e18e5..871d8489f61f 100644 --- a/pkgs/applications/editors/flpsed/default.nix +++ b/pkgs/applications/editors/flpsed/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fltk13, ghostscript }: +{ lib, stdenv, fetchurl, fltk13, ghostscript }: stdenv.mkDerivation rec { pname = "flpsed"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { -i src/GsWidget.cxx ''; - meta = with stdenv.lib; { + meta = with lib; { description = "WYSIWYG PostScript annotator"; homepage = "https://flpsed.org/flpsed.html"; license = licenses.gpl3; diff --git a/pkgs/applications/editors/focuswriter/default.nix b/pkgs/applications/editors/focuswriter/default.nix index c30cfcb1fb9c..1a5ce245153e 100644 --- a/pkgs/applications/editors/focuswriter/default.nix +++ b/pkgs/applications/editors/focuswriter/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, qmake, qttools, hunspell, qtbase, qtmultimedia, mkDerivation }: +{ lib, stdenv, fetchurl, pkgconfig, qmake, qttools, hunspell, qtbase, qtmultimedia, mkDerivation }: mkDerivation rec { pname = "focuswriter"; @@ -17,7 +17,7 @@ mkDerivation rec { qmakeFlags = [ "PREFIX=/" ]; installFlags = [ "INSTALL_ROOT=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Simple, distraction-free writing environment"; license = licenses.gpl3Plus; maintainers = with maintainers; [ madjar ]; diff --git a/pkgs/applications/editors/fte/default.nix b/pkgs/applications/editors/fte/default.nix index f19a264c06a5..3814c8a879fd 100644 --- a/pkgs/applications/editors/fte/default.nix +++ b/pkgs/applications/editors/fte/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, perl, libX11, libXpm, gpm, ncurses, slang }: +{ lib, stdenv, fetchurl, unzip, perl, libX11, libXpm, gpm, ncurses, slang }: stdenv.mkDerivation rec { name = "fte-0.50.02"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { installFlags = [ "PREFIX=$(out)" "INSTALL_NONROOT=1" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A free text editor for developers"; homepage = "http://fte.sourceforge.net/"; license = licenses.gpl2; diff --git a/pkgs/applications/editors/geany/default.nix b/pkgs/applications/editors/geany/default.nix index 124d4ee0417a..e6752386718e 100644 --- a/pkgs/applications/editors/geany/default.nix +++ b/pkgs/applications/editors/geany/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , gtk3 , which @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Small and lightweight IDE"; longDescription = '' Geany is a small and lightweight Integrated Development Environment. diff --git a/pkgs/applications/editors/ghostwriter/default.nix b/pkgs/applications/editors/ghostwriter/default.nix index 8c1b95a1d26e..4da73d0d2e61 100644 --- a/pkgs/applications/editors/ghostwriter/default.nix +++ b/pkgs/applications/editors/ghostwriter/default.nix @@ -1,25 +1,26 @@ -{ stdenv, mkDerivation, fetchFromGitHub, qmake, pkgconfig, qttools, qtwebengine, hunspell }: +{ lib, stdenv, mkDerivation, fetchFromGitHub, qmake, pkgconfig, qttools, qtwebengine, hunspell }: mkDerivation rec { pname = "ghostwriter"; - version = "1.8.1"; + version = "2.0.0-rc3"; src = fetchFromGitHub { owner = "wereturtle"; repo = pname; - rev = "v${version}"; - sha256 = "0jc6szfh5sdnafhwsr1xv7cn1fznniq58bix41hb9wlbkvq7wzi6"; + rev = version; + sha256 = "sha256-Ag97iE++f3nG2zlwqn0qxSL9RpF8O3XWH9NtQ5kFuWg="; }; nativeBuildInputs = [ qmake pkgconfig qttools ]; buildInputs = [ qtwebengine hunspell ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A cross-platform, aesthetic, distraction-free Markdown editor"; homepage = src.meta.homepage; license = licenses.gpl3Plus; platforms = platforms.unix; - maintainers = with maintainers; [ dotlambda ]; + maintainers = with maintainers; [ dotlambda erictapen ]; + broken = stdenv.isDarwin; }; } diff --git a/pkgs/applications/editors/gnome-builder/default.nix b/pkgs/applications/editors/gnome-builder/default.nix index 6704702837a6..6c91595c99a8 100644 --- a/pkgs/applications/editors/gnome-builder/default.nix +++ b/pkgs/applications/editors/gnome-builder/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , ctags , appstream-glib , desktop-file-utils @@ -138,7 +138,7 @@ stdenv.mkDerivation rec { passthru.updateScript = gnome3.updateScript { packageName = pname; }; - meta = with stdenv.lib; { + meta = with lib; { description = "An IDE for writing GNOME-based software"; longDescription = '' Global search, auto-completion, source code map, documentation diff --git a/pkgs/applications/editors/gnome-latex/default.nix b/pkgs/applications/editors/gnome-latex/default.nix index ffdeb21de7f3..692e07e52ca9 100644 --- a/pkgs/applications/editors/gnome-latex/default.nix +++ b/pkgs/applications/editors/gnome-latex/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, wrapGAppsHook, gsettings-desktop-schemas, gspell, gtksourceview4, libgee +{ lib, stdenv, fetchurl, wrapGAppsHook, gsettings-desktop-schemas, gspell, gtksourceview4, libgee , tepl, amtk, gnome3, glib, pkgconfig, intltool, itstool, libxml2 }: let version = "3.38.0"; @@ -37,7 +37,7 @@ in stdenv.mkDerivation { passthru.updateScript = gnome3.updateScript { packageName = pname; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://wiki.gnome.org/Apps/GNOME-LaTeX"; description = "A LaTeX editor for the GNOME desktop"; maintainers = [ maintainers.manveru ]; diff --git a/pkgs/applications/editors/gobby/default.nix b/pkgs/applications/editors/gobby/default.nix index e3d039e42232..4dc7ea33cddc 100644 --- a/pkgs/applications/editors/gobby/default.nix +++ b/pkgs/applications/editors/gobby/default.nix @@ -1,5 +1,5 @@ { avahiSupport ? false # build support for Avahi in libinfinity -, stdenv, fetchFromGitHub, autoconf, automake, pkgconfig, wrapGAppsHook, yelp-tools +, lib, stdenv, fetchFromGitHub, autoconf, automake, pkgconfig, wrapGAppsHook, yelp-tools , gtkmm3, gsasl, gtksourceview3, libxmlxx, libinfinity, intltool, itstool, gnome3 }: let @@ -18,7 +18,7 @@ in stdenv.mkDerivation { preConfigure = "./autogen.sh"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://gobby.0x539.de/"; description = "A GTK-based collaborative editor supporting multiple documents in one session and a multi-user chat"; license = stdenv.lib.licenses.gpl2Plus; diff --git a/pkgs/applications/editors/greenfoot/default.nix b/pkgs/applications/editors/greenfoot/default.nix index 8205d52b43a1..324d8b13f21e 100644 --- a/pkgs/applications/editors/greenfoot/default.nix +++ b/pkgs/applications/editors/greenfoot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, jdk }: +{ lib, stdenv, fetchurl, makeWrapper, jdk }: stdenv.mkDerivation rec { pname = "greenfoot"; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { --add-flags "-Djavafx.embed.singleThread=true -Dawt.useSystemAAFontSettings=on -Xmx512M -cp \"$out/share/greenfoot/bluej.jar\" bluej.Boot -greenfoot=true -bluej.compiler.showunchecked=false -greenfoot.scenarios=$out/share/doc/Greenfoot/scenarios -greenfoot.url.javadoc=file://$out/share/doc/Greenfoot/API" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A simple integrated development environment for Java"; homepage = "https://www.greenfoot.org/"; license = licenses.gpl2ClasspathPlus; diff --git a/pkgs/applications/editors/hecate/default.nix b/pkgs/applications/editors/hecate/default.nix index de57fb092157..a0fdcfbb3f66 100644 --- a/pkgs/applications/editors/hecate/default.nix +++ b/pkgs/applications/editors/hecate/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { version = "0.0.1"; @@ -15,7 +15,7 @@ buildGoPackage rec { goDeps = ./deps.nix; - meta = with stdenv.lib; { + meta = with lib; { inherit (src.meta) homepage; description = "terminal hex editor"; longDescription = "The Hex Editor From Hell!"; diff --git a/pkgs/applications/editors/hexdino/default.nix b/pkgs/applications/editors/hexdino/default.nix index 9722854b9804..5d782aa1abcb 100644 --- a/pkgs/applications/editors/hexdino/default.nix +++ b/pkgs/applications/editors/hexdino/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform, ncurses }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, ncurses }: rustPlatform.buildRustPackage { pname = "hexdino"; @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage { buildInputs = [ ncurses ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A hex editor with vim like keybindings written in Rust"; homepage = "https://github.com/Luz/hexdino"; license = licenses.mit; diff --git a/pkgs/applications/editors/jed/default.nix b/pkgs/applications/editors/jed/default.nix new file mode 100644 index 000000000000..e3be0139abf4 --- /dev/null +++ b/pkgs/applications/editors/jed/default.nix @@ -0,0 +1,95 @@ +{ stdenv, fetchzip +, pkg-config +, gpm +, libXext +, libXft +, libXt +, ncurses5 +, slang +} : + +stdenv.mkDerivation rec { + pname = "jed"; + version = "0.99-19"; + + src = fetchzip { + url = "https://www.jedsoft.org/releases/${pname}/${pname}-${version}.tar.bz2"; + sha256 = "sha256-vzeX0P+2+IuKtrX+2lQDeJj7VMDS6XurD2pb2jhxy2Q="; + }; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ + gpm + libXext + libXft + libXt + ncurses5 + slang + ]; + + configureFlags = [ + "CC=cc" + "--with-slang=${slang}" + "JED_ROOT=${placeholder "out"}/share/jed" + ]; + + makeFlags = [ + "jed" "xjed" "rgrep" + ]; + + postPatch = '' + for i in autoconf/Makefile autoconf/Makefile.in \ + doc/tm/Makefile src/Makefile.in; do + sed -e 's|/bin/cp|cp|' -i $i + done + for i in autoconf/aclocal.m4 configure; do + sed -e 's|ncurses5|ncurses|' -i $i + done + ''; + + postInstall = '' + install -D src/objs/rgrep $out/bin + ''; + + meta = with stdenv.lib; { + description = "A programmable text editor written around S-Lang"; + longDescription = '' + JED is a freely available text editor for Unix, VMS, MSDOS, OS/2, BeOS, + QNX, and win9X/NT platforms. Although it is a powerful editor designed for + use by programmers, its drop-down menu facility make it one of the + friendliest text editors around. Hence it is ideal for composing simple + email messages as well as editing complex programs in a variety of + computer languages. + + JED makes extensive use of the S-Lang library, which endows it with the + powerful S-Lang scripting language. Some of its features are: + + - Color syntax highlighting on color terminals, e.g., Linux console or a + remote color terminal via dialup (as well as Xjed) + - Folding support + - Drop-down menus on _ALL_ terminals/platforms + - Emulation of Emacs, EDT, Wordstar, Borland, and Brief editors + - Extensible in the C-like S-Lang language making the editor completely + customizable. + - Capable of reading GNU info files from within JED's info browser + - A variety of programming modes (with syntax highlighting) are available + including C, C++, FORTRAN, TeX, HTML, SH, python, IDL, DCL, NROFF... + - Edit TeX files with AUC-TeX style editing (BiBTeX support too) + - Asynchronous subprocess support allowing one to compile from within the + editor + - Built-in support for the GPM mouse driver on Linux console + - Abbreviation mode and Dynamic abbreviation mode + - 8 bit clean with mute/dead key support + - Supported on most Unix, VMS, OS/2, MSDOS (386+), win9X/NT, QNX, and BeOS + systems + - Rectangular cut/paste; regular expressions; incremental searches; search + replace across multiple files; multiple windows; multiple buffers; shell + modes; directory editor (dired); mail; rmail; ispell; and much, much + more + ''; + homepage = "https://www.jedsoft.org/jed/index.html"; + license = licenses.gpl2Plus; + platforms = slang.meta.platforms; + }; +} +# TODO: build tex documentation diff --git a/pkgs/applications/editors/jedit/default.nix b/pkgs/applications/editors/jedit/default.nix index 18fe236983ac..0d29eeb17dc2 100644 --- a/pkgs/applications/editors/jedit/default.nix +++ b/pkgs/applications/editors/jedit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ant, jdk, commonsBsf, commonsLogging, bsh }: +{ lib, stdenv, fetchurl, ant, jdk, commonsBsf, commonsLogging, bsh }: let version = "5.2.0"; @@ -52,7 +52,7 @@ stdenv.mkDerivation { chmod +x $out/bin/jedit ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Mature programmer's text editor (Java based)"; homepage = "http://www.jedit.org"; license = licenses.gpl2; diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 9638bea60c9a..d805d1796472 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -15,7 +15,7 @@ let lib.overrideDerivation (mkJetBrainsProduct { inherit name version src wmClass jdk; product = "CLion"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.jetbrains.com/clion/"; inherit description license; longDescription = '' @@ -83,7 +83,7 @@ let (mkJetBrainsProduct { inherit name version src wmClass jdk; product = "DataGrip"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.jetbrains.com/datagrip/"; inherit description license; longDescription = '' @@ -100,7 +100,7 @@ let lib.overrideDerivation (mkJetBrainsProduct { inherit name version src wmClass jdk; product = "Goland"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.jetbrains.com/go/"; inherit description license; longDescription = '' @@ -125,7 +125,7 @@ let (mkJetBrainsProduct { inherit name version src wmClass jdk; product = "IDEA"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.jetbrains.com/idea/"; inherit description license; longDescription = '' @@ -143,7 +143,7 @@ let (mkJetBrainsProduct rec { inherit name version src wmClass jdk; product = "MPS"; - meta = with stdenv.lib; { + meta = with lib; { homepage = https://www.jetbrains.com/mps/; inherit license description; longDescription = '' @@ -161,7 +161,7 @@ let (mkJetBrainsProduct { inherit name version src wmClass jdk; product = "PhpStorm"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.jetbrains.com/phpstorm/"; inherit description license; longDescription = '' @@ -178,7 +178,7 @@ let (mkJetBrainsProduct { inherit name version src wmClass jdk; product = "PyCharm"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.jetbrains.com/pycharm/"; inherit description license; longDescription = '' @@ -205,7 +205,7 @@ let lib.overrideDerivation (mkJetBrainsProduct { inherit name version src wmClass jdk; product = "Rider"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.jetbrains.com/rider/"; inherit description license; longDescription = '' @@ -231,7 +231,7 @@ let (mkJetBrainsProduct { inherit name version src wmClass jdk; product = "RubyMine"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.jetbrains.com/ruby/"; inherit description license; longDescription = description; @@ -244,7 +244,7 @@ let lib.overrideDerivation (mkJetBrainsProduct { inherit name version src wmClass jdk; product = "WebStorm"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.jetbrains.com/webstorm/"; inherit description license; longDescription = '' @@ -269,12 +269,12 @@ in clion = buildClion rec { name = "clion-${version}"; - version = "2020.3"; /* updated by script */ + version = "2020.3.1"; /* updated by script */ description = "C/C++ IDE. New. Intelligent. Cross-platform"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz"; - sha256 = "0kqja2c5pz0f9idc52mv7iy2pqq2kfcx4q4x1ywfn3gq3d8n5j7z"; /* updated by script */ + sha256 = "1jfvwir79s0kcqmlx6bbkmc42bplgl7814mnqfcsdzni1qv62pws"; /* updated by script */ }; wmClass = "jetbrains-clion"; update-channel = "CLion RELEASE"; # channel's id as in http://www.jetbrains.com/updates/updates.xml @@ -282,12 +282,12 @@ in datagrip = buildDataGrip rec { name = "datagrip-${version}"; - version = "2020.3"; /* updated by script */ + version = "2020.3.1"; /* updated by script */ description = "Your Swiss Army Knife for Databases and SQL"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/datagrip/${name}.tar.gz"; - sha256 = "1j0mlsiqh80mspi2x9mi0h5hxhg5gw6395hyl9w33q8dxm95mx2d"; /* updated by script */ + sha256 = "0jk7ywxk983ld5x71a59dh1hvlnli3sbvg7fbicahas5ml8clxfv"; /* updated by script */ }; wmClass = "jetbrains-datagrip"; update-channel = "DataGrip RELEASE"; @@ -295,12 +295,12 @@ in goland = buildGoland rec { name = "goland-${version}"; - version = "2020.3"; /* updated by script */ + version = "2020.3.1"; /* updated by script */ description = "Up and Coming Go IDE"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/go/${name}.tar.gz"; - sha256 = "0hj1xm3c71y2z1jyv7j3xf2lcj2y0kyvsxd3jjyyhs31w1f3394j"; /* updated by script */ + sha256 = "12gi1a2bmafmy7qgqwv3a7b5b46dlhw4ahmkm5pkq6pmxl4y6dmk"; /* updated by script */ }; wmClass = "jetbrains-goland"; update-channel = "GoLand RELEASE"; @@ -308,12 +308,12 @@ in idea-community = buildIdea rec { name = "idea-community-${version}"; - version = "2020.3"; /* updated by script */ + version = "2020.3.1"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, community edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz"; - sha256 = "0x1nsjw1m03iq7sd9i2qqlyribrzgi8yh6k5hnb630kvrxr8pxy6"; /* updated by script */ + sha256 = "0am4h8w1dmjl08iphqy78ivb91vkrvskg95dgm24zcj0n8rwmaq6"; /* updated by script */ }; wmClass = "jetbrains-idea-ce"; update-channel = "IntelliJ IDEA RELEASE"; @@ -321,12 +321,12 @@ in idea-ultimate = buildIdea rec { name = "idea-ultimate-${version}"; - version = "2020.3"; /* updated by script */ + version = "2020.3.1"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jbr.tar.gz"; - sha256 = "1l6bvfgzp27113rjy1y3jvp09cqx8gpnbgpwp83vsph7x0dhx8a3"; /* updated by script */ + sha256 = "1kwz0aq4b664awppakj4syppk218nynwxv4ngc7pa3k9v4g2sdah"; /* updated by script */ }; wmClass = "jetbrains-idea"; update-channel = "IntelliJ IDEA RELEASE"; @@ -347,12 +347,12 @@ in phpstorm = buildPhpStorm rec { name = "phpstorm-${version}"; - version = "2020.3"; /* updated by script */ + version = "2020.3.1"; /* updated by script */ description = "Professional IDE for Web and PHP developers"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz"; - sha256 = "1d5rx7p7lvjzgp57n980f2bfrj14p1f4hxmyvx5pzzd86q7hrcbq"; /* updated by script */ + sha256 = "1c5j3mbg8scsl4c90cjahdk5gs5q72y5a8fhkqa9zmy6di42k99x"; /* updated by script */ }; wmClass = "jetbrains-phpstorm"; update-channel = "PhpStorm RELEASE"; @@ -360,12 +360,12 @@ in pycharm-community = buildPycharm rec { name = "pycharm-community-${version}"; - version = "2020.3"; /* updated by script */ + version = "2020.3.2"; /* updated by script */ description = "PyCharm Community Edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "1c2izsqx27g4jy46iskx5zg00pd8jaf9x1p0vya4l2v5r49dk4jb"; /* updated by script */ + sha256 = "1z3w6aah635fdrhrzp5af6sgj269jk7mv8vgdd83gxillkx9vq9k"; /* updated by script */ }; wmClass = "jetbrains-pycharm-ce"; update-channel = "PyCharm RELEASE"; @@ -373,12 +373,12 @@ in pycharm-professional = buildPycharm rec { name = "pycharm-professional-${version}"; - version = "2020.3"; /* updated by script */ + version = "2020.3.2"; /* updated by script */ description = "PyCharm Professional Edition"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "1kzgy90zcligwa9r6r11kx99z0zm93mrzy700y2jwslyzapd16d0"; /* updated by script */ + sha256 = "1fbb8v40q7vgn5v5dyxb211abr8swnxa3gw18kh3vlk6yc2crzfw"; /* updated by script */ }; wmClass = "jetbrains-pycharm"; update-channel = "PyCharm RELEASE"; @@ -386,12 +386,12 @@ in rider = buildRider rec { name = "rider-${version}"; - version = "2020.2.4"; /* updated by script */ + version = "2020.3.2"; /* updated by script */ description = "A cross-platform .NET IDE based on the IntelliJ platform and ReSharper"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/rider/JetBrains.Rider-${version}.tar.gz"; - sha256 = "1anl48ifv5ayqn876dqckxc1b5fw1271pvamzf1vvk501wv6dpaf"; /* updated by script */ + sha256 = "1dkgbd2nqkjcswf7j3pnrsaq9n5wk42abz2c4wgkrh1zrpgihd0j"; /* updated by script */ }; wmClass = "jetbrains-rider"; update-channel = "Rider RELEASE"; @@ -399,12 +399,12 @@ in ruby-mine = buildRubyMine rec { name = "ruby-mine-${version}"; - version = "2020.3"; /* updated by script */ + version = "2020.3.1"; /* updated by script */ description = "The Most Intelligent Ruby and Rails IDE"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz"; - sha256 = "0ij6j9bxfqzj8gnrhhdgai22s1n5swd4waxd5zjvmv7q9j9cb2l5"; /* updated by script */ + sha256 = "0drxzz6k0cmhir4szg8nwmsi9qh380vrryghmpvx9w83yrcain4c"; /* updated by script */ }; wmClass = "jetbrains-rubymine"; update-channel = "RubyMine RELEASE"; @@ -412,12 +412,12 @@ in webstorm = buildWebStorm rec { name = "webstorm-${version}"; - version = "2020.3"; /* updated by script */ + version = "2020.3.1"; /* updated by script */ description = "Professional IDE for Web and JavaScript development"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz"; - sha256 = "0sk7slwfr9jasid09hxw81sik5srn35vif3pbzpybig3yszbv6ld"; /* updated by script */ + sha256 = "1bfq3xwnfz6f04d0lq584q7pg775a8y35b1b62w81dbfh43l4fj0"; /* updated by script */ }; wmClass = "jetbrains-webstorm"; update-channel = "WebStorm RELEASE"; diff --git a/pkgs/applications/editors/joe/default.nix b/pkgs/applications/editors/joe/default.nix index bb227512387d..4a335a351c75 100644 --- a/pkgs/applications/editors/joe/default.nix +++ b/pkgs/applications/editors/joe/default.nix @@ -1,18 +1,46 @@ -{ stdenv, fetchurl } : +{ lib, stdenv, fetchurl } : stdenv.mkDerivation rec { - version = "4.6"; pname = "joe"; + version = "4.6"; src = fetchurl { url = "mirror://sourceforge/joe-editor/${pname}-${version}.tar.gz"; sha256 = "1pmr598xxxm9j9dl93kq4dv36zyw0q2dh6d7x07hf134y9hhlnj9"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A full featured terminal-based screen editor"; + longDescription = '' + JOE (Joe's Own Editor) is a full featured terminal-based screen editor + which is distributed under the GNU General Public License (GPL). JOE has + been around since 1988 and comes standard with many Linux distributions. + + JOE is being maintained by its original author Joseph Allen, plus all of + the people who send bug reports, feature suggestions and patches to the + project web site. JOE is hosted by SourceForge.net and its source code is + controlled under Mercurial. + + JOE is a blending of MicroPro's venerable microcomputer word processor + WordStar and Richard Stallman's famous LISP based text editor GNU-EMACS + (but it does not use code from either program): most of the basic editing + keys are the same as in WordStar as is the overall feel of the editor. JOE + also has some of the key bindings and many of the powerful features of + EMACS. + + JOE is written in C and its only dependency is libc. This makes JOE very + easy to build (just "configure" and "make install"), making it feasible to + include on small systems and recovery disks. The compiled binary is about + 300K in x86. Note that JOE can use either the termcap or terminfo terminal + capabilities databases (or a built-in termcap entry for ANSI + terminals). The choice is controlled by a "configure" option. If terminfo + is used, a library is required to access the database (on some systems + this library is ncurses, but JOE does not use curses to control the + terminal - it has its own code for this). + ''; homepage = "https://joe-editor.sourceforge.io"; - license = licenses.gpl2; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/editors/jove/default.nix b/pkgs/applications/editors/jove/default.nix new file mode 100644 index 000000000000..4a22c4d4d955 --- /dev/null +++ b/pkgs/applications/editors/jove/default.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchFromGitHub +, groff +, ncurses +, makeWrapper +} : + +stdenv.mkDerivation rec { + pname = "jove"; + version = "4.17.3.6"; + + src = fetchFromGitHub { + owner = "jonmacs"; + repo = "jove"; + rev = version; + sha256 = "sha256-uQRNKV06ipOHrOsvsceqIFGGlRv5qOQy18q0tFkR6Kg="; + }; + + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ + groff + ncurses + ]; + + dontConfigure = true; + + preBuild = '' + makeFlagsArray+=(SYSDEFS="-DSYSVR4 -D_XOPEN_SOURCE=500" \ + TERMCAPLIB=-lncurses JOVEHOME=${placeholder "out"}) + ''; + + postInstall = '' + wrapProgram $out/bin/teachjove \ + --prefix PATH ":" "$out/bin" + ''; + + meta = with stdenv.lib; { + description = "Jonathan's Own Version or Emacs"; + homepage = "https://github.com/jonmacs/jove"; + license = licenses.bsd2; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/editors/jupp/default.nix b/pkgs/applications/editors/jupp/default.nix index 79db7b8a558a..e134113e23fa 100644 --- a/pkgs/applications/editors/jupp/default.nix +++ b/pkgs/applications/editors/jupp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, gpm }: +{ lib, stdenv, fetchurl, ncurses, gpm }: stdenv.mkDerivation rec { @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { "--enable-largefile" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A portable fork of Joe's editor"; longDescription = '' This is the portable version of JOE's Own Editor, which is currently diff --git a/pkgs/applications/editors/kakoune/plugins/case.kak.nix b/pkgs/applications/editors/kakoune/plugins/case.kak.nix index 6a2ef200e6e1..3fa91113bbad 100644 --- a/pkgs/applications/editors/kakoune/plugins/case.kak.nix +++ b/pkgs/applications/editors/kakoune/plugins/case.kak.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab }: +{ lib, stdenv, fetchFromGitLab }: stdenv.mkDerivation { name = "case.kak"; @@ -16,7 +16,7 @@ stdenv.mkDerivation { cp -r rc/case.kak $out/share/kak/autoload/plugins ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Case convention conversion for Kakoune"; homepage = "https://gitlab.com/FlyingWombat/case.kak"; license = licenses.unlicense; diff --git a/pkgs/applications/editors/kakoune/plugins/default.nix b/pkgs/applications/editors/kakoune/plugins/default.nix index 168c1d06b31e..950229baee08 100644 --- a/pkgs/applications/editors/kakoune/plugins/default.nix +++ b/pkgs/applications/editors/kakoune/plugins/default.nix @@ -13,4 +13,5 @@ kak-prelude = pkgs.callPackage ./kak-prelude.nix { }; kak-vertical-selection = pkgs.callPackage ./kak-vertical-selection.nix { }; openscad-kak = pkgs.callPackage ./openscad.kak.nix { }; + quickscope-kak = pkgs.callPackage ./quickscope.kak.nix { }; } diff --git a/pkgs/applications/editors/kakoune/plugins/kak-ansi.nix b/pkgs/applications/editors/kakoune/plugins/kak-ansi.nix index 408cba45fbe6..f34ee6d29990 100644 --- a/pkgs/applications/editors/kakoune/plugins/kak-ansi.nix +++ b/pkgs/applications/editors/kakoune/plugins/kak-ansi.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { name = "kak-ansi"; @@ -22,7 +22,7 @@ declare-option -hidden str ansi_filter %{'"$out"'/bin/kak-ansi-filter} ' rc/ansi.kak >$out/share/kak/autoload/plugins/ansi.kak ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Kakoune support for rendering ANSI code"; homepage = "https://github.com/eraserhd/kak-ansi"; license = licenses.unlicense; diff --git a/pkgs/applications/editors/kakoune/plugins/kak-fzf.nix b/pkgs/applications/editors/kakoune/plugins/kak-fzf.nix index 657f4a19bbfc..8a91f829c0c9 100644 --- a/pkgs/applications/editors/kakoune/plugins/kak-fzf.nix +++ b/pkgs/applications/editors/kakoune/plugins/kak-fzf.nix @@ -4,12 +4,13 @@ assert stdenv.lib.asserts.assertOneOf "fzf" fzf.pname [ "fzf" "skim" ]; stdenv.mkDerivation { name = "kak-fzf"; - version = "2020-05-24"; + version = "2020-07-26"; + src = fetchFromGitHub { owner = "andreyorst"; repo = "fzf.kak"; - rev = "b2aeb26473962ab0bf3b51ba5c81c50c1d8253d3"; - sha256 = "0bg845i814xh4y688p2zx726rsg0pd6nb4a7qv2fckmk639f4wzc"; + rev = "f23daa698ad95493fbd675ae153e3cac13ef34e9"; + hash = "sha256-BfXHTJ371ThOizMI/4BAbdJoaltGSP586hz4HqX1KWA="; }; configurePhase = '' diff --git a/pkgs/applications/editors/kakoune/plugins/kak-plumb.nix b/pkgs/applications/editors/kakoune/plugins/kak-plumb.nix index 7abef9305310..0c59ca9a08f0 100644 --- a/pkgs/applications/editors/kakoune/plugins/kak-plumb.nix +++ b/pkgs/applications/editors/kakoune/plugins/kak-plumb.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, kakoune-unwrapped, plan9port, ... }: +{ lib, stdenv, fetchFromGitHub, kakoune-unwrapped, plan9port, ... }: stdenv.mkDerivation rec { pname = "kak-plumb"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { chmod +x $out/bin/edit-client ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Kakoune integration with the Plan 9 plumber"; homepage = "https://github.com/eraserhd/kak-plumb"; license = licenses.unlicense; diff --git a/pkgs/applications/editors/kakoune/plugins/openscad.kak.nix b/pkgs/applications/editors/kakoune/plugins/openscad.kak.nix index 21c8b7a60cca..57c1033ebbdd 100644 --- a/pkgs/applications/editors/kakoune/plugins/openscad.kak.nix +++ b/pkgs/applications/editors/kakoune/plugins/openscad.kak.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation { pname = "openscad.kak"; @@ -15,7 +15,7 @@ stdenv.mkDerivation { install -Dm644 rc/openscad.kak -t $out/share/kak/autoload/plugins/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Syntax highlighting for OpenSCAD files"; homepage = "https://github.com/mayjs/openscad.kak"; license = licenses.unlicense; diff --git a/pkgs/applications/editors/kakoune/plugins/quickscope.kak.nix b/pkgs/applications/editors/kakoune/plugins/quickscope.kak.nix new file mode 100644 index 000000000000..f2fb1f5d57c3 --- /dev/null +++ b/pkgs/applications/editors/kakoune/plugins/quickscope.kak.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchgit, lua5_3 }: + +stdenv.mkDerivation rec { + pname = "quickscope-kak"; + version = "1.0.0"; + + src = fetchgit { + url = "https://git.sr.ht/~voroskoi/quickscope.kak"; + rev = "v${version}"; + sha256 = "0y1g3zpa2ql8l9rl5i2w84bka8a09kig9nq9zdchaff5pw660mcx"; + }; + + buildInputs = [ lua5_3 ]; + + installPhase = '' + mkdir -p $out/share/kak/autoload/plugins/ + cp quickscope.* $out/share/kak/autoload/plugins/ + # substituteInPlace does not like the pipe + sed -e 's,[|] *lua,|${lua5_3}/bin/lua,' quickscope.kak >$out/share/kak/autoload/plugins/quickscope.kak + ''; + + meta = with stdenv.lib; { + description = "Highlight f and t jump positions"; + homepage = "https://sr.ht/~voroskoi/quickscope.kak/"; + license = licenses.unlicense; + maintainers = with maintainers; [ eraserhd ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/editors/kdevelop5/kdevelop-pg-qt.nix b/pkgs/applications/editors/kdevelop5/kdevelop-pg-qt.nix index ad83bd43af2f..27cf579734e8 100644 --- a/pkgs/applications/editors/kdevelop5/kdevelop-pg-qt.nix +++ b/pkgs/applications/editors/kdevelop5/kdevelop-pg-qt.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, pkgconfig, extra-cmake-modules, qtbase }: +{ lib, stdenv, fetchurl, cmake, pkgconfig, extra-cmake-modules, qtbase }: let pname = "kdevelop-pg-qt"; @@ -7,17 +7,17 @@ let in stdenv.mkDerivation rec { name = "${pname}-${version}"; - + src = fetchurl { url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz"; sha256 = "0ay6m6j6zgrbcm48f14bass83bk4w5qnx76xihc05p69i9w32ff1"; }; nativeBuildInputs = [ cmake pkgconfig extra-cmake-modules ]; - + buildInputs = [ qtbase ]; - meta = with stdenv.lib; { + meta = with lib; { maintainers = [ maintainers.ambrop72 ]; platforms = platforms.linux; description = "Parser-generator from KDevplatform"; diff --git a/pkgs/applications/editors/kibi/default.nix b/pkgs/applications/editors/kibi/default.nix index 7945dedc52e1..07454d331c6f 100644 --- a/pkgs/applications/editors/kibi/default.nix +++ b/pkgs/applications/editors/kibi/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , rustPlatform }: @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1x5bvvq33380k2qhs1bwz3f9zl5q1sl7iic47pxfkzv24bpjnypb"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A text editor in ≤1024 lines of code, written in Rust"; homepage = "https://github.com/ilai-deutel/kibi"; license = licenses.mit; diff --git a/pkgs/applications/editors/kodestudio/default.nix b/pkgs/applications/editors/kodestudio/default.nix index 71fa2bcd41b5..d7f00a2e18ad 100644 --- a/pkgs/applications/editors/kodestudio/default.nix +++ b/pkgs/applications/editors/kodestudio/default.nix @@ -114,7 +114,7 @@ in --prefix LD_PRELOAD : ${stdenv.lib.makeLibraryPath [ libXScrnSaver ]}/libXss.so.1 ''; - meta = with stdenv.lib; { + meta = with lib; { description = '' An IDE for Kha based on Visual Studio Code ''; diff --git a/pkgs/applications/editors/leafpad/default.nix b/pkgs/applications/editors/leafpad/default.nix index 94fa0be01737..d37a2de28665 100644 --- a/pkgs/applications/editors/leafpad/default.nix +++ b/pkgs/applications/editors/leafpad/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, intltool, pkgconfig, gtk2 }: +{ lib, stdenv, fetchurl, intltool, pkgconfig, gtk2 }: stdenv.mkDerivation rec { version = "0.8.18.1"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { "--enable-chooser" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A notepad clone for GTK 2.0"; homepage = "http://tarot.freeshell.org/leafpad"; platforms = platforms.linux; diff --git a/pkgs/applications/editors/lighttable/default.nix b/pkgs/applications/editors/lighttable/default.nix index abf55b42c551..ff5b6e3862eb 100644 --- a/pkgs/applications/editors/lighttable/default.nix +++ b/pkgs/applications/editors/lighttable/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { cp "${desktopItem}/share/applications/LightTable.desktop" "$out"/share/applications/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "The next generation code editor"; homepage = "http://www.lighttable.com/"; license = licenses.gpl3; diff --git a/pkgs/applications/editors/lite/default.nix b/pkgs/applications/editors/lite/default.nix index 2f4397234984..a313ea18212f 100644 --- a/pkgs/applications/editors/lite/default.nix +++ b/pkgs/applications/editors/lite/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , SDL2 , lua52Packages @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { makeWrapper $out/lib/${pname}/lite $out/bin/lite ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A lightweight text editor written in Lua"; homepage = "https://github.com/rxi/lite"; license = licenses.mit; diff --git a/pkgs/applications/editors/marker/default.nix b/pkgs/applications/editors/marker/default.nix index 19ffdbd2c2c1..f974cc1ef42c 100644 --- a/pkgs/applications/editors/marker/default.nix +++ b/pkgs/applications/editors/marker/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , meson , ninja @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { pandoc ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://fabiocolacio.github.io/Marker/"; description = "Markdown editor for the Linux desktop"; maintainers = with maintainers; [ trepetti ]; diff --git a/pkgs/applications/editors/mg/default.nix b/pkgs/applications/editors/mg/default.nix index 6ba315e541bb..8878e01de67f 100644 --- a/pkgs/applications/editors/mg/default.nix +++ b/pkgs/applications/editors/mg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, ncurses, buildPackages }: +{ lib, stdenv, fetchFromGitHub, pkgconfig, ncurses, buildPackages }: stdenv.mkDerivation rec { pname = "mg"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Micro GNU/emacs, a portable version of the mg maintained by the OpenBSD team"; homepage = "https://man.openbsd.org/OpenBSD-current/man1/mg.1"; license = licenses.publicDomain; diff --git a/pkgs/applications/editors/mindforger/build.patch b/pkgs/applications/editors/mindforger/build.patch index e2745cbce2d0..e9b9244f8dbd 100644 --- a/pkgs/applications/editors/mindforger/build.patch +++ b/pkgs/applications/editors/mindforger/build.patch @@ -1,17 +1,8 @@ diff --git a/app/app.pro b/app/app.pro -index 4d47065..a39a320 100644 +index 29f9d9e..15fd2ff 100644 --- a/app/app.pro +++ b/app/app.pro -@@ -18,6 +18,8 @@ - TARGET = mindforger - TEMPLATE = app - -+include(../config.pri) -+ - QT += widgets - - mfner { -@@ -297,7 +299,7 @@ RESOURCES += \ +@@ -370,7 +370,7 @@ RESOURCES += \ # See http://doc.qt.io/qt-5/qmake-advanced-usage.html binfile.files += mindforger @@ -20,51 +11,11 @@ index 4d47065..a39a320 100644 INSTALLS += binfile # ######################################## -diff --git a/config.pri b/config.pri -new file mode 100644 -index 0000000..ce05df1 ---- /dev/null -+++ b/config.pri -@@ -0,0 +1,3 @@ -+isEmpty(PREFIX) { -+ PREFIX = /usr -+} -diff --git a/deps/discount/discount.pro b/deps/discount/discount.pro -index a8dfe35..ec16468 100644 ---- a/deps/discount/discount.pro -+++ b/deps/discount/discount.pro -@@ -5,6 +5,8 @@ - # Webpage: http://www.pell.portland.or.us/~orc/Code/discount/ - # - -+include(../../config.pri) -+ - QT -= core gui - - TARGET = discount -@@ -46,7 +48,7 @@ unix:!symbian { - maemo5 { - target.path = /opt/usr/lib - } else { -- target.path = /usr/lib -+ target.path = $$PREFIX/lib - } - INSTALLS += target - } diff --git a/mindforger.pro b/mindforger.pro -index ae627f2..0953856 100644 +index bd4f21d..6bb2dbc 100644 --- a/mindforger.pro +++ b/mindforger.pro -@@ -32,6 +32,8 @@ TEMPLATE = subdirs - - SUBDIRS = deps lib app - -+include(config.pri) -+ - # build dependencies - lib.depends = deps - app.depends = lib -@@ -44,20 +46,20 @@ app.depends = lib +@@ -43,20 +43,20 @@ app.depends = lib #IMPORTANT: binfile MUST be specified in app/app.pro (project next to/that builds binary) docfiles.files += doc/* diff --git a/pkgs/applications/editors/mindforger/default.nix b/pkgs/applications/editors/mindforger/default.nix index 82aa38c14499..a8e60cddfbb8 100644 --- a/pkgs/applications/editors/mindforger/default.nix +++ b/pkgs/applications/editors/mindforger/default.nix @@ -1,38 +1,37 @@ -{ mkDerivation, stdenv, fetchurl, qmake, qtbase, qtwebkit }: +{ mkDerivation +, cmark-gfm +, fetchurl +, qmake +, qtbase +, qtwebkit +, lib, stdenv +, wrapGAppsHook +}: mkDerivation rec { pname = "mindforger"; - version = "1.48.2"; + version = "1.52.0"; src = fetchurl { - url = "https://github.com/dvorka/mindforger/releases/download/1.48.0/mindforger_${version}.tgz"; - sha256 = "1wlrl8hpjcpnq098l3n2d1gbhbjylaj4z366zvssqvmafr72iyw4"; + url = "https://github.com/dvorka/mindforger/releases/download/${version}/mindforger_${version}.tgz"; + sha256 = "1pghsw8kwvjhg3jpmjs0n892h2l0pm0cs6ymi8b23fwk0kfj67rd"; }; - nativeBuildInputs = [ qmake ] ; - buildInputs = [ qtbase qtwebkit ] ; + nativeBuildInputs = [ qmake wrapGAppsHook ] ; + buildInputs = [ qtbase qtwebkit cmark-gfm ] ; doCheck = true; - enableParallelBuilding = true ; - patches = [ ./build.patch ] ; postPatch = '' - substituteInPlace deps/discount/version.c.in --subst-var-by TABSTOP 4 + substituteInPlace lib/src/install/installer.cpp --replace /usr "$out" substituteInPlace app/resources/gnome-shell/mindforger.desktop --replace /usr "$out" ''; - preConfigure = '' - export AC_PATH="$PATH" - pushd deps/discount - ./configure.sh - popd - ''; - qmakeFlags = [ "-r mindforger.pro" "CONFIG+=mfnoccache" ] ; - meta = with stdenv.lib; { + meta = with lib; { description = "Thinking Notebook & Markdown IDE"; longDescription = '' MindForger is actually more than an editor or IDE - it's human @@ -41,5 +40,6 @@ mkDerivation rec { homepage = "https://www.mindforger.com"; license = licenses.gpl2Plus; platforms = platforms.all; + maintainers = with maintainers; [ cyplo ]; }; } diff --git a/pkgs/applications/editors/mle/default.nix b/pkgs/applications/editors/mle/default.nix index 692b82dc6887..d57e4d36b4e3 100644 --- a/pkgs/applications/editors/mle/default.nix +++ b/pkgs/applications/editors/mle/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, termbox, pcre, uthash, lua5_3 }: +{ lib, stdenv, fetchFromGitHub, termbox, pcre, uthash, lua5_3 }: stdenv.mkDerivation rec { pname = "mle"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { installFlags = [ "prefix=${placeholder "out"}" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Small, flexible terminal-based text editor"; homepage = "https://github.com/adsr/mle"; license = licenses.asl20; diff --git a/pkgs/applications/editors/moe/default.nix b/pkgs/applications/editors/moe/default.nix index 060abda33d0d..4365c172f48f 100644 --- a/pkgs/applications/editors/moe/default.nix +++ b/pkgs/applications/editors/moe/default.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchurl -, lzip, ncurses +{ lib, stdenv +, fetchurl +, ncurses +, lzip }: -with stdenv.lib; stdenv.mkDerivation rec { - pname = "moe"; - version = "1.10"; + version = "1.11"; src = fetchurl { url = "mirror://gnu/moe/${pname}-${version}.tar.lz"; - sha256 = "0fymywdiy9xqppcmvgs7mf7d3gfrky3jp5jkxs2l3v93asml9zcc"; + sha256 = "sha256-DvvLz1pKjZZlQcbLCZugq2QWeANm286C2f+ZWoWl4vk="; }; prePatch = '' @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ lzip ]; buildInputs = [ ncurses ]; - meta = { + meta = with lib; { description = "A small, 8-bit clean editor"; longDescription = '' GNU moe is a powerful, 8-bit clean, console text editor for ISO-8859 and diff --git a/pkgs/applications/editors/monodevelop/default.nix b/pkgs/applications/editors/monodevelop/default.nix index 3a21eec07f42..9b576795be00 100644 --- a/pkgs/applications/editors/monodevelop/default.nix +++ b/pkgs/applications/editors/monodevelop/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , autoconf, automake, pkgconfig, shared-mime-info, intltool , glib, mono, gtk-sharp-2_0, gnome2, gnome-sharp, unzip , dotnetPackages @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { > export MONO_GAC_PREFIX=${gnome-sharp}:${gtk-sharp-2_0}:\$MONO_GAC_PREFIX > export PATH=${mono}/bin:\$PATH > export LD_LIBRARY_PATH=${stdenv.lib.makeLibraryPath [ glib gnome2.libgnomeui gnome2.gnome_vfs gnome-sharp gtk-sharp-2_0 gtk-sharp-2_0.gtk ]}:\$LD_LIBRARY_PATH - > + > EOF done @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { dontStrip = true; - meta = with stdenv.lib; { + meta = with lib; { platforms = platforms.linux; maintainers = with maintainers; [ obadz ]; broken = true; # 2018-09-21, build has failed since 2018-03-08 diff --git a/pkgs/applications/editors/music/tuxguitar/default.nix b/pkgs/applications/editors/music/tuxguitar/default.nix index 08841eb58100..e7cd319b8201 100644 --- a/pkgs/applications/editors/music/tuxguitar/default.nix +++ b/pkgs/applications/editors/music/tuxguitar/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, swt, jdk, makeWrapper, alsaLib, jack2, fluidsynth, libpulseaudio }: +{ lib, stdenv, fetchurl, swt, jdk, makeWrapper, alsaLib, jack2, fluidsynth, libpulseaudio }: let metadata = assert stdenv.hostPlatform.system == "i686-linux" || stdenv.hostPlatform.system == "x86_64-linux"; if stdenv.hostPlatform.system == "i686-linux" then @@ -31,7 +31,7 @@ in stdenv.mkDerivation rec { --prefix CLASSPATH : "${swt}/jars/swt.jar:$out/lib/tuxguitar.jar:$out/lib/itext.jar" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A multitrack guitar tablature editor"; longDescription = '' TuxGuitar is a multitrack guitar tablature editor and player written diff --git a/pkgs/applications/editors/ne/default.nix b/pkgs/applications/editors/ne/default.nix index 4faf1e28b1cc..fde6542f1605 100644 --- a/pkgs/applications/editors/ne/default.nix +++ b/pkgs/applications/editors/ne/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ncurses, texinfo, texlive, perl, ghostscript }: +{ lib, stdenv, fetchFromGitHub, ncurses, texinfo, texlive, perl, ghostscript }: stdenv.mkDerivation rec { pname = "ne"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=${placeholder "out"}" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "The nice editor"; homepage = "http://ne.di.unimi.it/"; longDescription = '' diff --git a/pkgs/applications/editors/nedit/default.nix b/pkgs/applications/editors/nedit/default.nix index e1d1fa3070a9..feaba31734c2 100644 --- a/pkgs/applications/editors/nedit/default.nix +++ b/pkgs/applications/editors/nedit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, xlibsWrapper, motif, libXpm }: +{ lib, stdenv, fetchurl, xlibsWrapper, motif, libXpm }: stdenv.mkDerivation rec { pname = "nedit"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { cp -p source/nedit source/nc $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://sourceforge.net/projects/nedit"; description = "A fast, compact Motif/X11 plain text editor"; platforms = with platforms; linux ++ darwin; diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix index b546aae790a7..b4ad25f60c25 100644 --- a/pkgs/applications/editors/neovim/default.nix +++ b/pkgs/applications/editors/neovim/default.nix @@ -48,7 +48,6 @@ in ]; dontFixCmake = true; - enableParallelBuilding = true; buildInputs = [ gperf diff --git a/pkgs/applications/editors/neovim/gnvim/default.nix b/pkgs/applications/editors/neovim/gnvim/default.nix index e6166dd14b19..f1d56584e499 100644 --- a/pkgs/applications/editors/neovim/gnvim/default.nix +++ b/pkgs/applications/editors/neovim/gnvim/default.nix @@ -1,4 +1,4 @@ -{ stdenv, rustPlatform, fetchFromGitHub, gtk, webkitgtk }: +{ lib, stdenv, rustPlatform, fetchFromGitHub, gtk, webkitgtk }: rustPlatform.buildRustPackage rec { pname = "gnvim-unwrapped"; @@ -41,7 +41,7 @@ rustPlatform.buildRustPackage rec { make install PREFIX="${placeholder "out"}" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "GUI for neovim, without any web bloat"; homepage = "https://github.com/vhakulinen/gnvim"; license = licenses.mit; diff --git a/pkgs/applications/editors/neovim/qt.nix b/pkgs/applications/editors/neovim/qt.nix index 323f08c23f87..8eaa9204c435 100644 --- a/pkgs/applications/editors/neovim/qt.nix +++ b/pkgs/applications/editors/neovim/qt.nix @@ -1,4 +1,4 @@ -{ stdenv, mkDerivation, fetchFromGitHub, cmake, doxygen, makeWrapper +{ lib, stdenv, mkDerivation, fetchFromGitHub, cmake, doxygen, makeWrapper , msgpack, neovim, pythonPackages, qtbase }: let @@ -27,8 +27,6 @@ let nativeBuildInputs = [ cmake doxygen ]; - enableParallelBuilding = true; - preCheck = '' # The GUI tests require a running X server, disable them sed -i ../test/CMakeLists.txt \ @@ -37,7 +35,7 @@ let doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Neovim client library and GUI, in Qt5"; homepage = "https://github.com/equalsraf/neovim-qt"; license = licenses.isc; diff --git a/pkgs/applications/editors/okteta/default.nix b/pkgs/applications/editors/okteta/default.nix index 382fcd44257e..d51f46b9e0a4 100644 --- a/pkgs/applications/editors/okteta/default.nix +++ b/pkgs/applications/editors/okteta/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, stdenv, fetchurl, extra-cmake-modules, kdoctools, qtscript, kconfig +{ mkDerivation, lib, stdenv, fetchurl, extra-cmake-modules, kdoctools, qtscript, kconfig , kinit, karchive, kcrash, kcmutils, kconfigwidgets, knewstuff, kparts , qca-qt5, shared-mime-info }: @@ -26,7 +26,7 @@ mkDerivation rec { kcrash ]; - meta = with stdenv.lib; { + meta = with lib; { license = licenses.gpl2; description = "A hex editor"; maintainers = with maintainers; [ peterhoeg bkchr ]; diff --git a/pkgs/applications/editors/quilter/default.nix b/pkgs/applications/editors/quilter/default.nix index b69d20850ad2..9834b78eae98 100644 --- a/pkgs/applications/editors/quilter/default.nix +++ b/pkgs/applications/editors/quilter/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, nix-update-script, pkgconfig, meson, ninja, python3, vala +{ lib, stdenv, fetchFromGitHub, nix-update-script, pkgconfig, meson, ninja, python3, vala , gtk3, desktop-file-utils, gtksourceview, webkitgtk, gtkspell3, pantheon , libgee, discount, wrapGAppsHook }: @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Focus on your writing - designed for elementary OS"; homepage = "https://github.com/lainsce/quilter"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/editors/qxmledit/default.nix b/pkgs/applications/editors/qxmledit/default.nix index cb658e8fcdac..4023861cc374 100644 --- a/pkgs/applications/editors/qxmledit/default.nix +++ b/pkgs/applications/editors/qxmledit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, +{ lib, stdenv, fetchFromGitHub, qmake, qtbase, qtxmlpatterns, qtsvg, qtscxml, qtquick1, libGLU }: stdenv.mkDerivation rec { @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { export QXMLEDIT_INST_DOC_DIR="$doc" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Simple XML editor based on qt libraries" ; homepage = "https://sourceforge.net/projects/qxmledit"; license = licenses.lgpl2; diff --git a/pkgs/applications/editors/qxw/default.nix b/pkgs/applications/editors/qxw/default.nix index aed69e4f568b..c36aba6d9bba 100644 --- a/pkgs/applications/editors/qxw/default.nix +++ b/pkgs/applications/editors/qxw/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkg-config, gtk2, pcre }: +{ lib, stdenv, fetchurl, pkg-config, gtk2, pcre }: stdenv.mkDerivation rec { pname = "qxw"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { s,/usr/games,/bin,' Makefile ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A program to help create and publish crosswords"; homepage = "https://www.quinapalus.com/qxw.html"; license = licenses.gpl2; diff --git a/pkgs/applications/editors/rehex/default.nix b/pkgs/applications/editors/rehex/default.nix index 0fe00d08405b..ec85ffde488a 100644 --- a/pkgs/applications/editors/rehex/default.nix +++ b/pkgs/applications/editors/rehex/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , capstone , jansson @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { makeFlags = [ "prefix=$(out)" ] ++ (stdenv.lib.optionals stdenv.isDarwin [ "-f Makefile.osx" ]); - meta = with stdenv.lib; { + meta = with lib; { description = "Reverse Engineers' Hex Editor"; longDescription = '' A cross-platform (Windows, Linux, Mac) hex editor for reverse diff --git a/pkgs/applications/editors/retext/default.nix b/pkgs/applications/editors/retext/default.nix index c32e83157561..99f7340f7536 100644 --- a/pkgs/applications/editors/retext/default.nix +++ b/pkgs/applications/editors/retext/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python3, fetchFromGitHub, wrapQtAppsHook, buildEnv, aspellDicts +{ lib, stdenv, python3, fetchFromGitHub, wrapQtAppsHook, buildEnv, aspellDicts # Use `lib.collect lib.isDerivation aspellDicts;` to make all dictionaries # available. , enchantAspellDicts ? with aspellDicts; [ en en-computers en-science ] @@ -55,7 +55,7 @@ in python.pkgs.buildPythonApplication { ) ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/retext-project/retext/"; description = "Simple but powerful editor for Markdown and reStructuredText"; license = licenses.gpl3; diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix index 3fe845a067b3..97e8378d94e8 100644 --- a/pkgs/applications/editors/rstudio/default.nix +++ b/pkgs/applications/editors/rstudio/default.nix @@ -109,8 +109,6 @@ mkDerivation rec { popd ''; - enableParallelBuilding = true; - cmakeFlags = [ "-DRSTUDIO_TARGET=Desktop" "-DQT_QMAKE_EXECUTABLE=$NIX_QT5_TMP/bin/qmake" ]; desktopItem = makeDesktopItem { diff --git a/pkgs/applications/editors/scite/default.nix b/pkgs/applications/editors/scite/default.nix index 4e92856fee24..0b72a57df3ec 100644 --- a/pkgs/applications/editors/scite/default.nix +++ b/pkgs/applications/editors/scite/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtk2 }: +{ lib, stdenv, fetchurl, pkgconfig, gtk2 }: stdenv.mkDerivation { pname = "scite"; @@ -23,7 +23,7 @@ stdenv.mkDerivation { make install prefix=$out/ ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.scintilla.org/SciTE.html"; description = "SCIntilla based Text Editor"; license = licenses.mit; diff --git a/pkgs/applications/editors/sigil/default.nix b/pkgs/applications/editors/sigil/default.nix index 18437f5ff49e..8e662d55523d 100644 --- a/pkgs/applications/editors/sigil/default.nix +++ b/pkgs/applications/editors/sigil/default.nix @@ -1,4 +1,4 @@ -{ stdenv, mkDerivation, fetchFromGitHub, cmake, pkgconfig, makeWrapper +{ lib, stdenv, mkDerivation, fetchFromGitHub, cmake, pkgconfig, makeWrapper , boost, xercesc, hunspell, zlib, pcre16 , qtbase, qttools, qtwebengine, qtxmlpatterns , python3Packages @@ -36,9 +36,7 @@ mkDerivation rec { ''${qtWrapperArgs[@]} ''; - enableParallelBuilding = true; - - meta = with stdenv.lib; { + meta = with lib; { description = "Free, open source, multi-platform ebook (ePub) editor"; homepage = "https://github.com/Sigil-Ebook/Sigil/"; license = licenses.gpl3; diff --git a/pkgs/applications/editors/spacevim/default.nix b/pkgs/applications/editors/spacevim/default.nix index b2eb6eecc193..02c6fd82d8c5 100644 --- a/pkgs/applications/editors/spacevim/default.nix +++ b/pkgs/applications/editors/spacevim/default.nix @@ -1,5 +1,5 @@ { ripgrep, gitAndTools, fzf, makeWrapper, vim_configurable, vimPlugins, fetchFromGitHub, writeTextDir -, stdenv, runCommandNoCC, remarshal, formats, spacevim_config ? import ./init.nix }: +, lib, stdenv, runCommandNoCC, remarshal, formats, spacevim_config ? import ./init.nix }: with stdenv; let format = formats.toml {}; @@ -42,7 +42,7 @@ in mkDerivation rec { --prefix PATH : ${lib.makeBinPath [ fzf gitAndTools.git ripgrep]} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Modern Vim distribution"; longDescription = '' SpaceVim is a distribution of the Vim editor that’s inspired by spacemacs. diff --git a/pkgs/applications/editors/standardnotes/default.nix b/pkgs/applications/editors/standardnotes/default.nix index e019814b3d67..e472df44a604 100644 --- a/pkgs/applications/editors/standardnotes/default.nix +++ b/pkgs/applications/editors/standardnotes/default.nix @@ -1,4 +1,4 @@ -{ stdenv, appimageTools, autoPatchelfHook, desktop-file-utils +{ lib, stdenv, appimageTools, autoPatchelfHook, desktop-file-utils , fetchurl, runtimeShell }: let @@ -44,7 +44,7 @@ in appimageTools.wrapType2 rec { rm usr/lib/* AppRun standard-notes.desktop .so* ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A simple and private notes app"; longDescription = '' Standard Notes is a private notes app that features unmatched simplicity, diff --git a/pkgs/applications/editors/sublime/3/common.nix b/pkgs/applications/editors/sublime/3/common.nix index 22c23280d17d..82d824b48770 100644 --- a/pkgs/applications/editors/sublime/3/common.nix +++ b/pkgs/applications/editors/sublime/3/common.nix @@ -1,6 +1,6 @@ { buildVersion, x32sha256, x64sha256, dev ? false }: -{ fetchurl, stdenv, xorg, glib, glibcLocales, gtk3, cairo, pango, libredirect, makeWrapper, wrapGAppsHook +{ fetchurl, lib, stdenv, xorg, glib, glibcLocales, gtk3, cairo, pango, libredirect, makeWrapper, wrapGAppsHook , pkexecPath ? "/run/wrappers/bin/pkexec" , writeScript, common-updater-scripts, curl, gnugrep , openssl, bzip2, bash, unzip, zip @@ -148,7 +148,7 @@ in stdenv.mkDerivation (rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Sophisticated text editor for code, markup and prose"; homepage = "https://www.sublimetext.com/"; maintainers = with maintainers; [ jtojnar wmertens demin-dmitriy zimbatm ]; diff --git a/pkgs/applications/editors/supertux-editor/default.nix b/pkgs/applications/editors/supertux-editor/default.nix index dc18bd694c69..b42ebe19f64c 100644 --- a/pkgs/applications/editors/supertux-editor/default.nix +++ b/pkgs/applications/editors/supertux-editor/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, mono, gtk-sharp-2_0, pkgconfig, makeWrapper, gnome2, gtk2 }: +{ lib, stdenv, fetchFromGitHub, mono, gtk-sharp-2_0, pkgconfig, makeWrapper, gnome2, gtk2 }: stdenv.mkDerivation { version = "git-2014-08-20"; pname = "supertux-editor"; @@ -30,7 +30,7 @@ stdenv.mkDerivation { # Always needed on Mono, otherwise nothing runs dontStrip = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Level editor for SuperTux"; homepage = "https://github.com/SuperTux/supertux-editor"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/editors/tecoc/default.nix b/pkgs/applications/editors/tecoc/default.nix index 3df13260d51f..50cad500c955 100644 --- a/pkgs/applications/editors/tecoc/default.nix +++ b/pkgs/applications/editors/tecoc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , ncurses }: stdenv.mkDerivation rec { @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { ln -s tecoc Inspect ) ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A clone of the good old TECO editor"; longDescription = '' For those who don't know: TECO is the acronym of Tape Editor and COrrector diff --git a/pkgs/applications/editors/texmacs/default.nix b/pkgs/applications/editors/texmacs/default.nix index 9c37d00c9ee1..f967f28f4df5 100644 --- a/pkgs/applications/editors/texmacs/default.nix +++ b/pkgs/applications/editors/texmacs/default.nix @@ -31,8 +31,6 @@ mkDerivation { sha256 = "04585hdh98fvyhj4wsxf69xal2wvfa6lg76gad8pr6ww9abi5105"; }; - enableParallelBuilding = true; - nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ guile_1_8 diff --git a/pkgs/applications/editors/textadept/10/default.nix b/pkgs/applications/editors/textadept/10/default.nix index 0456d013bbbe..4450fe77d183 100644 --- a/pkgs/applications/editors/textadept/10/default.nix +++ b/pkgs/applications/editors/textadept/10/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { "PREFIX=$(out) WGET=true PIXMAPS_DIR=$(out)/share/pixmaps" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "An extensible text editor based on Scintilla with Lua scripting"; homepage = "http://foicica.com/textadept"; license = licenses.mit; diff --git a/pkgs/applications/editors/textadept/11/default.nix b/pkgs/applications/editors/textadept/11/default.nix index 487f1b3767f1..017a2970c308 100644 --- a/pkgs/applications/editors/textadept/11/default.nix +++ b/pkgs/applications/editors/textadept/11/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { "PREFIX=$(out) WGET=true PIXMAPS_DIR=$(out)/share/pixmaps" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "An extensible text editor based on Scintilla with Lua scripting. Version 11_beta"; homepage = "http://foicica.com/textadept"; license = licenses.mit; diff --git a/pkgs/applications/editors/thonny/default.nix b/pkgs/applications/editors/thonny/default.nix index 0f05bf23c071..e98d57420e81 100644 --- a/pkgs/applications/editors/thonny/default.nix +++ b/pkgs/applications/editors/thonny/default.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchFromGitHub, python3 }: +{ lib, stdenv, fetchFromGitHub, python3 }: with python3.pkgs; buildPythonApplication rec { pname = "thonny"; - version = "3.3.1"; + version = "3.3.2"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "0nk4kx6apmnd6fyd9zw77yprjzgjf7micvcws2i2sci0d9fff34c"; + sha256 = "1pzy7v48x4ip8v6aqm8hl5ywx7xiqbsfypxxifih8gnlangp1n8y"; }; propagatedBuildInputs = with python3.pkgs; [ @@ -37,7 +37,7 @@ buildPythonApplication rec { # Tests need a DISPLAY doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Python IDE for beginners"; longDescription = '' Thonny is a Python IDE for beginners. It supports different ways diff --git a/pkgs/applications/editors/tiled/default.nix b/pkgs/applications/editors/tiled/default.nix index 10c0ed9ea79b..b58f5da6a967 100644 --- a/pkgs/applications/editors/tiled/default.nix +++ b/pkgs/applications/editors/tiled/default.nix @@ -1,4 +1,4 @@ -{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, qmake +{ lib, stdenv, mkDerivation, fetchFromGitHub, pkgconfig, qmake , python, qtbase, qttools }: mkDerivation rec { @@ -17,7 +17,7 @@ mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Free, easy to use and flexible tile map editor"; homepage = "https://www.mapeditor.org/"; license = with licenses; [ diff --git a/pkgs/applications/editors/tweak/default.nix b/pkgs/applications/editors/tweak/default.nix index 3dc7d04ede38..887a9a8e6923 100644 --- a/pkgs/applications/editors/tweak/default.nix +++ b/pkgs/applications/editors/tweak/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses }: +{ lib, stdenv, fetchurl, ncurses }: stdenv.mkDerivation rec { pname = "tweak"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses ]; preBuild = "substituteInPlace Makefile --replace '$(DESTDIR)/usr/local' $out"; - meta = with stdenv.lib; { + meta = with lib; { description = "An efficient hex editor"; homepage = "http://www.chiark.greenend.org.uk/~sgtatham/tweak"; license = licenses.mit; diff --git a/pkgs/applications/editors/vim/macvim.nix b/pkgs/applications/editors/vim/macvim.nix index d2cc14c30c48..e950e7685ef8 100644 --- a/pkgs/applications/editors/vim/macvim.nix +++ b/pkgs/applications/editors/vim/macvim.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, runCommand, ncurses, gettext +{ lib, stdenv, fetchFromGitHub, runCommand, ncurses, gettext , pkgconfig, cscope, ruby, tcl, perl, luajit , darwin @@ -175,7 +175,7 @@ stdenv.mkDerivation { (deny file-read* file-write* process-exec mach-lookup (subpath "/usr/local") (with no-log)) ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Vim - the text editor - for macOS"; homepage = "https://github.com/macvim-dev/macvim"; license = licenses.vim; diff --git a/pkgs/applications/editors/vim/vimacs.nix b/pkgs/applications/editors/vim/vimacs.nix index d067b4181213..cb77e60cf002 100644 --- a/pkgs/applications/editors/vim/vimacs.nix +++ b/pkgs/applications/editors/vim/vimacs.nix @@ -1,4 +1,4 @@ -{ stdenv, config, vim_configurable, macvim, vimPlugins +{ lib, stdenv, config, vim_configurable, macvim, vimPlugins , useMacvim ? stdenv.isDarwin && (config.vimacs.macvim or true) , vimacsExtraArgs ? "" }: @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Vim-Improved eMACS: Emacs emulation for Vim"; homepage = "http://algorithm.com.au/code/vimacs"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/editors/vis/default.nix b/pkgs/applications/editors/vis/default.nix index c8eb119eb07a..bd6eba94907f 100644 --- a/pkgs/applications/editors/vis/default.nix +++ b/pkgs/applications/editors/vis/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, makeWrapper, makeDesktopItem +{ lib, stdenv, fetchFromGitHub, pkgconfig, makeWrapper, makeDesktopItem , ncurses, libtermkey, lpeg, lua , acl ? null, libselinux ? null }: @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { terminal = "true"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A vim like editor"; homepage = "https://github.com/martanne/vis"; license = licenses.isc; diff --git a/pkgs/applications/editors/viw/default.nix b/pkgs/applications/editors/viw/default.nix index 4025bf252b30..3aad18ef11cb 100644 --- a/pkgs/applications/editors/viw/default.nix +++ b/pkgs/applications/editors/viw/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ncurses }: +{ lib, stdenv, fetchFromGitHub, ncurses }: stdenv.mkDerivation rec { pname = "viw"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { install -Dm 644 -t $out/share/doc/${pname} README.md ''; - meta = with stdenv.lib; { + meta = with lib; { description = "VI Worsened, a fun and light clone of VI"; homepage = "https://github.com/lpan/viw"; license = licenses.gpl3Only; diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index 911b497e8f02..7324a19620dc 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -40,7 +40,7 @@ in sourceRoot = ""; - meta = with stdenv.lib; { + meta = with lib; { description = '' Open source source code editor developed by Microsoft for Windows, Linux and macOS diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index 018cd710753c..cae161106151 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -1,11 +1,11 @@ -{ stdenv, callPackage, fetchurl }: +{ lib, stdenv, callPackage, fetchurl }: let inherit (stdenv.hostPlatform) system; plat = { x86_64-linux = "linux-x64"; - x86_64-darwin = "darwin"; + x86_64-darwin = "darwin-x64"; aarch64-linux = "linux-arm64"; armv7l-linux = "linux-armhf"; }.${system}; @@ -45,7 +45,7 @@ in inherit sha256; }; - meta = with stdenv.lib; { + meta = with lib; { description = '' Open source source code editor developed by Microsoft for Windows, Linux and macOS (VS Code without MS branding/telemetry/licensing) diff --git a/pkgs/applications/editors/wily/default.nix b/pkgs/applications/editors/wily/default.nix index ac741599bdab..3fe756bcf72b 100644 --- a/pkgs/applications/editors/wily/default.nix +++ b/pkgs/applications/editors/wily/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libX11, libXt } : +{ lib, stdenv, fetchurl, libX11, libXt } : stdenv.mkDerivation rec { version = "0.13.42"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { mkdir -p $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "An emulation of ACME"; homepage = "http://wily.sourceforge.net"; license = licenses.artistic1; diff --git a/pkgs/applications/editors/xmlcopyeditor/default.nix b/pkgs/applications/editors/xmlcopyeditor/default.nix index f3270fccdfe7..d9bf7f52b2c4 100644 --- a/pkgs/applications/editors/xmlcopyeditor/default.nix +++ b/pkgs/applications/editors/xmlcopyeditor/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, aspell, boost, expat, intltool, libxml2, libxslt, pcre, wxGTK, xercesc }: +{ lib, stdenv, fetchurl, aspell, boost, expat, intltool, libxml2, libxslt, pcre, wxGTK, xercesc }: stdenv.mkDerivation rec { pname = "xmlcopyeditor"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A fast, free, validating XML editor"; homepage = "http://xml-copy-editor.sourceforge.net/"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/editors/yi/wrapper.nix b/pkgs/applications/editors/yi/wrapper.nix index 243690bc2632..a7456590ab81 100644 --- a/pkgs/applications/editors/yi/wrapper.nix +++ b/pkgs/applications/editors/yi/wrapper.nix @@ -1,6 +1,6 @@ # To use this for hacking of your Yi config file, drop into a shell # with env attribute. -{ stdenv, makeWrapper +{ lib, stdenv, makeWrapper , haskellPackages , extraPackages ? (s: []) }: @@ -23,7 +23,7 @@ stdenv.mkDerivation { # For hacking purposes passthru.env = yiEnv; - meta = with stdenv.lib; { + meta = with lib; { description = "Allows Yi to find libraries and the compiler easily"; # This wrapper and wrapper only is under PD license = licenses.publicDomain; diff --git a/pkgs/applications/editors/zile/default.nix b/pkgs/applications/editors/zile/default.nix index 5181c2c67678..81c86fb400ed 100644 --- a/pkgs/applications/editors/zile/default.nix +++ b/pkgs/applications/editors/zile/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, glib, libgee, pkg-config, ncurses, boehmgc, perl, help2man, vala }: +{ fetchurl, lib, stdenv, glib, libgee, pkg-config, ncurses, boehmgc, perl, help2man, vala }: stdenv.mkDerivation rec { name = "zile-2.6.0.90"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { # XXX: Work around cross-compilation-unfriendly `gl_FUNC_FSTATAT' macro. gl_cv_func_fstatat_zero_flag="yes"; - meta = with stdenv.lib; { + meta = with lib; { description = "Lightweight Emacs clone"; longDescription = '' diff --git a/pkgs/applications/gis/gmt/dcw.nix b/pkgs/applications/gis/gmt/dcw.nix index 58390e892903..bc253f394c7f 100644 --- a/pkgs/applications/gis/gmt/dcw.nix +++ b/pkgs/applications/gis/gmt/dcw.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "dcw-gmt"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { cp -rv ./* $out/share/dcw-gmt ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.soest.hawaii.edu/pwessel/dcw/"; description = "Vector basemap of the world, for use with GMT"; longDescription = '' diff --git a/pkgs/applications/gis/gmt/default.nix b/pkgs/applications/gis/gmt/default.nix index f045ec067fee..0e2b45888b48 100644 --- a/pkgs/applications/gis/gmt/default.nix +++ b/pkgs/applications/gis/gmt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, curl, Accelerate, CoreGraphics, CoreVideo +{ lib, stdenv, fetchurl, cmake, curl, Accelerate, CoreGraphics, CoreVideo , fftwSinglePrec, netcdf, pcre, gdal, blas, lapack, glibc, ghostscript, dcw-gmt , gshhg-gmt }: @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { "-DBLAS_LIBRARY=${blas}/lib/libblas.so" ]); - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.generic-mapping-tools.org"; description = "Tools for manipulating geographic and cartesian data sets"; longDescription = '' diff --git a/pkgs/applications/gis/gmt/gshhg.nix b/pkgs/applications/gis/gmt/gshhg.nix index 0f22f87c89b5..62758c71d594 100644 --- a/pkgs/applications/gis/gmt/gshhg.nix +++ b/pkgs/applications/gis/gmt/gshhg.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "gshhg-gmt"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { cp -rv ./* $out/share/gshhg-gmt ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.soest.hawaii.edu/pwessel/gshhg/"; description = "High-resolution shoreline data set, for use with GMT"; longDescription = '' diff --git a/pkgs/applications/gis/openorienteering-mapper/default.nix b/pkgs/applications/gis/openorienteering-mapper/default.nix index 45c38b3e5732..e4307e244ad0 100644 --- a/pkgs/applications/gis/openorienteering-mapper/default.nix +++ b/pkgs/applications/gis/openorienteering-mapper/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , mkDerivation , fetchFromGitHub , substituteAll @@ -75,7 +75,7 @@ mkDerivation rec { ln -s $out/Applications/Mapper.app/Contents/MacOS/Mapper $out/bin/mapper ''; - meta = with stdenv.lib; { + meta = with lib; { description = '' OpenOrienteering Mapper is an orienteering mapmaking program and provides a free alternative to the existing proprietary solution. diff --git a/pkgs/applications/gis/whitebox-tools/default.nix b/pkgs/applications/gis/whitebox-tools/default.nix index 61c2bbc542cd..c31701901ec5 100644 --- a/pkgs/applications/gis/whitebox-tools/default.nix +++ b/pkgs/applications/gis/whitebox-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, rustPlatform, fetchFromGitHub, Security }: +{ lib, stdenv, rustPlatform, fetchFromGitHub, Security }: rustPlatform.buildRustPackage rec { pname = "whitebox_tools"; version = "1.4.0"; @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "09rz8f1xyc64qjbj6pgw8jxr2a7chghmdc6sfkbv7hdvx6vg4wvk"; - meta = with stdenv.lib; { + meta = with lib; { description = "An advanced geospatial data analysis platform"; homepage = "https://jblindsay.github.io/ghrg/WhiteboxTools/index.html"; license = licenses.mit; diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix index 558112763a23..9d52046ba0cb 100644 --- a/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -80,7 +80,7 @@ stdenv.mkDerivation { done ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.imagemagick.org/"; description = "A software suite to create, edit, compose, or convert bitmap images"; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index 0222efff6429..42f157e53139 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -96,7 +96,7 @@ stdenv.mkDerivation { done ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.imagemagick.org/"; description = "A software suite to create, edit, compose, or convert bitmap images"; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/applications/graphics/ahoviewer/default.nix b/pkgs/applications/graphics/ahoviewer/default.nix index c5f1bf868018..a994ae271c9c 100644 --- a/pkgs/applications/graphics/ahoviewer/default.nix +++ b/pkgs/applications/graphics/ahoviewer/default.nix @@ -1,4 +1,4 @@ -{ config, stdenv, fetchFromGitHub, pkgconfig, libconfig +{ config, lib, stdenv, fetchFromGitHub, pkgconfig, libconfig , gtkmm2, glibmm, libxml2, libsecret, curl, libzip , librsvg, gst_all_1, autoreconfHook, makeWrapper , useUnrar ? config.ahoviewer.useUnrar or false, unrar @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/ahodesuka/ahoviewer"; description = "A GTK2 image viewer, manga reader, and booru browser"; maintainers = with maintainers; [ skrzyp xzfc ]; diff --git a/pkgs/applications/graphics/alchemy/default.nix b/pkgs/applications/graphics/alchemy/default.nix index 6fc84e088dd3..27d5ece57fe6 100644 --- a/pkgs/applications/graphics/alchemy/default.nix +++ b/pkgs/applications/graphics/alchemy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jre, runtimeShell }: +{ lib, stdenv, fetchurl, jre, runtimeShell }: stdenv.mkDerivation rec { pname = "alchemy"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { chmod +x $out/bin/alchemy ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Drawing application"; longDescription = '' Alchemy is an open drawing project aimed at exploring how we can sketch, diff --git a/pkgs/applications/graphics/antimony/default.nix b/pkgs/applications/graphics/antimony/default.nix index 363f3b8c84d9..d92ad9998f2c 100644 --- a/pkgs/applications/graphics/antimony/default.nix +++ b/pkgs/applications/graphics/antimony/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libpng, python3 +{ lib, stdenv, fetchFromGitHub, libpng, python3 , libGLU, libGL, qtbase, wrapQtAppsHook, ncurses , cmake, flex, lemon }: @@ -40,9 +40,7 @@ in "-DGITBRANCH=${gitBranch}" ]; - enableParallelBuilding = true; - - meta = with stdenv.lib; { + meta = with lib; { description = "A computer-aided design (CAD) tool from a parallel universe"; homepage = "https://github.com/mkeeter/antimony"; license = licenses.mit; diff --git a/pkgs/applications/graphics/apitrace/default.nix b/pkgs/applications/graphics/apitrace/default.nix index e6865d2d8f07..462962d9e188 100644 --- a/pkgs/applications/graphics/apitrace/default.nix +++ b/pkgs/applications/graphics/apitrace/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, libX11, procps, python2, libdwarf, qtbase, qtwebkit, wrapQtAppsHook, libglvnd }: +{ lib, stdenv, fetchFromGitHub, cmake, libX11, procps, python2, libdwarf, qtbase, qtwebkit, wrapQtAppsHook, libglvnd }: stdenv.mkDerivation rec { pname = "apitrace"; @@ -27,13 +27,13 @@ stdenv.mkDerivation rec { # to the `RUNPATH` of dispatcher libraries `dlopen()` ing OpenGL drivers. # `RUNPATH` doesn't propagate throughout the whole application, but only # from the module performing the `dlopen()`. - # + # # Apitrace wraps programs by running them with `LD_PRELOAD` pointing to `.so` # files in $out/lib/apitrace/wrappers. - # + # # Theses wrappers effectively wrap the `dlopen()` calls from `libglvnd` # and other dispatcher libraries, and run `dlopen()` by themselves. - # + # # As `RUNPATH` doesn't propagate through the whole library, and they're now the # library doing the real `dlopen()`, they also need to have # `/run-opengl-driver[-32]` added to their `RUNPATH`. @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { wrapQtApp $out/bin/qapitrace ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://apitrace.github.io"; description = "Tools to trace OpenGL, OpenGL ES, Direct3D, and DirectDraw APIs"; license = licenses.mit; diff --git a/pkgs/applications/graphics/apngasm/2.nix b/pkgs/applications/graphics/apngasm/2.nix index 166bc135c193..0313115ddfa8 100644 --- a/pkgs/applications/graphics/apngasm/2.nix +++ b/pkgs/applications/graphics/apngasm/2.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, libpng, zlib, zopfli }: +{ lib, stdenv, fetchzip, libpng, zlib, zopfli }: stdenv.mkDerivation rec { pname = "apngasm"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Create highly optimized Animated PNG files from PNG/TGA images"; homepage = "http://apngasm.sourceforge.net/"; license = licenses.zlib; diff --git a/pkgs/applications/graphics/apngasm/default.nix b/pkgs/applications/graphics/apngasm/default.nix index 8d50696efcbd..1f58ee83e03a 100644 --- a/pkgs/applications/graphics/apngasm/default.nix +++ b/pkgs/applications/graphics/apngasm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, boost, libpng, zlib }: +{ lib, stdenv, fetchFromGitHub, cmake, boost, libpng, zlib }: stdenv.mkDerivation rec { pname = "apngasm"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ boost libpng zlib ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Create an APNG from multiple PNG files"; homepage = "https://github.com/apngasm/apngasm"; license = licenses.zlib; diff --git a/pkgs/applications/graphics/autopanosiftc/default.nix b/pkgs/applications/graphics/autopanosiftc/default.nix index 14af98ebc48b..5c649b384c78 100644 --- a/pkgs/applications/graphics/autopanosiftc/default.nix +++ b/pkgs/applications/graphics/autopanosiftc/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation { sha256 = "0dqk8ff82gmy4v5ns5nr9gpzkc1p7c2y8c8fkid102r47wsjk44s"; }; - buildInputs = [ cmake libpng libtiff libjpeg panotools libxml2 ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ libpng libtiff libjpeg panotools libxml2 ]; patches = [ (fetchurl { diff --git a/pkgs/applications/graphics/autotrace/default.nix b/pkgs/applications/graphics/autotrace/default.nix index cd7937f8a549..54cc09a4d18f 100644 --- a/pkgs/applications/graphics/autotrace/default.nix +++ b/pkgs/applications/graphics/autotrace/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, callPackage, libpng12, imagemagick +{ lib, stdenv, fetchurl, callPackage, libpng12, imagemagick , autoreconfHook, glib, pstoedit, pkgconfig, gettext, gd, darwin , runtimeShell }: @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { export PATH="$PATH:$PWD/wrappers" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://autotrace.sourceforge.net/"; description = "Utility for converting bitmap into vector graphics"; platforms = platforms.unix; diff --git a/pkgs/applications/graphics/avocode/default.nix b/pkgs/applications/graphics/avocode/default.nix index 6d4fa501710d..65fc56f81b1c 100644 --- a/pkgs/applications/graphics/avocode/default.nix +++ b/pkgs/applications/graphics/avocode/default.nix @@ -1,4 +1,4 @@ -{ stdenv, makeDesktopItem, fetchurl, unzip +{ lib, stdenv, makeDesktopItem, fetchurl, unzip , gdk-pixbuf, glib, gtk3, atk, at-spi2-atk, pango, cairo, freetype, fontconfig, dbus, nss, nspr, alsaLib, cups, expat, udev, gnome3 , xorg, mozjpeg, makeWrapper, wrapGAppsHook, libuuid, at-spi2-core }: @@ -92,7 +92,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://avocode.com/"; description = "The bridge between designers and developers"; license = licenses.unfree; diff --git a/pkgs/applications/graphics/azpainter/default.nix b/pkgs/applications/graphics/azpainter/default.nix index c2e7ce6f35d3..74dc55fc5e13 100644 --- a/pkgs/applications/graphics/azpainter/default.nix +++ b/pkgs/applications/graphics/azpainter/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , libX11, libXext, libXi , freetype, fontconfig , libpng, libjpeg @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { zlib ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Full color painting software for illustration drawing"; homepage = "https://osdn.net/projects/azpainter"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/graphics/batik/default.nix b/pkgs/applications/graphics/batik/default.nix index 52a2589b409c..4b5974825543 100644 --- a/pkgs/applications/graphics/batik/default.nix +++ b/pkgs/applications/graphics/batik/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation rec { pname = "batik"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "16sq90nbs6psgm3xz30sbs6r5dnpd3qzsvr1xvnp4yipwjcmhmkw"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Java based toolkit for handling SVG"; homepage = "https://xmlgraphics.apache.org/batik"; license = licenses.asl20; diff --git a/pkgs/applications/graphics/c3d/default.nix b/pkgs/applications/graphics/c3d/default.nix index 425ede037593..4317cc78cda3 100644 --- a/pkgs/applications/graphics/c3d/default.nix +++ b/pkgs/applications/graphics/c3d/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, itk4, Cocoa }: +{ lib, stdenv, fetchFromGitHub, cmake, itk4, Cocoa }: stdenv.mkDerivation rec { pname = "c3d"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ itk4 ] ++ stdenv.lib.optional stdenv.isDarwin Cocoa; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/pyushkevich/c3d"; description = "Medical imaging processing tool"; maintainers = with maintainers; [ bcdarwin ]; diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix index 27d4a4ab0e2e..c93b94ee1836 100644 --- a/pkgs/applications/graphics/darktable/default.nix +++ b/pkgs/applications/graphics/darktable/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libsoup, graphicsmagick, json-glib, wrapGAppsHook +{ lib, stdenv, fetchurl, libsoup, graphicsmagick, json-glib, wrapGAppsHook , cairo, cmake, ninja, curl, perl, llvm, desktop-file-utils, exiv2, glib , ilmbase, gtk3, intltool, lcms2, lensfun, libX11, libexif, libgphoto2, libjpeg , libpng, librsvg, libtiff, openexr, osm-gps-map, pkgconfig, sqlite, libxslt @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { ) ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Virtual lighttable and darkroom for photographers"; homepage = "https://www.darktable.org"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/graphics/deskew/default.nix b/pkgs/applications/graphics/deskew/default.nix index 6af6d93477a5..66309ebf7acf 100644 --- a/pkgs/applications/graphics/deskew/default.nix +++ b/pkgs/applications/graphics/deskew/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libtiff, fpc }: +{ lib, stdenv, fetchFromGitHub, libtiff, fpc }: stdenv.mkDerivation rec { @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { install -Dt $out/bin Bin/* ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A command line tool for deskewing scanned text documents"; homepage = "https://bitbucket.org/galfar/app-deskew/overview"; license = licenses.mit; diff --git a/pkgs/applications/graphics/dia/default.nix b/pkgs/applications/graphics/dia/default.nix index 6ec54201fbfa..da6047a02566 100644 --- a/pkgs/applications/graphics/dia/default.nix +++ b/pkgs/applications/graphics/dia/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, autoconf, automake, libtool, gtk2, pkgconfig, perlPackages, +{ lib, stdenv, fetchgit, autoconf, automake, libtool, gtk2, pkgconfig, perlPackages, libxml2, gettext, python, libxml2Python, docbook5, docbook_xsl, libxslt, intltool, libart_lgpl, withGNOME ? false, libgnomeui, gtk-mac-integration-gtk2 }: @@ -29,7 +29,7 @@ stdenv.mkDerivation { hardeningDisable = [ "format" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Gnome Diagram drawing software"; homepage = "http://live.gnome.org/Dia"; maintainers = with maintainers; [ raskin ]; diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix index 1e4b397db231..fcd871bf5ab3 100644 --- a/pkgs/applications/graphics/digikam/default.nix +++ b/pkgs/applications/graphics/digikam/default.nix @@ -109,13 +109,12 @@ mkDerivation rec { threadweaver ]; - enableParallelBuilding = true; - cmakeFlags = [ "-DENABLE_MYSQLSUPPORT=1" "-DENABLE_INTERNALMYSQL=1" "-DENABLE_MEDIAPLAYER=1" "-DENABLE_QWEBENGINE=on" + "-DENABLE_APPSTYLES=on" ]; dontWrapGApps = true; diff --git a/pkgs/applications/graphics/djview/default.nix b/pkgs/applications/graphics/djview/default.nix index 4d09f2ad5fe0..a7fc17ce29b1 100644 --- a/pkgs/applications/graphics/djview/default.nix +++ b/pkgs/applications/graphics/djview/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , mkDerivation , fetchurl , pkgconfig @@ -43,7 +43,7 @@ mkDerivation rec { mozillaPlugin = "/lib/mozilla/plugins"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A portable DjVu viewer (Qt5) and browser (nsdejavu) plugin"; homepage = "http://djvu.sourceforge.net/djview4.html"; license = licenses.gpl2; diff --git a/pkgs/applications/graphics/drawing/default.nix b/pkgs/applications/graphics/drawing/default.nix index fb68276b168c..a0d28689ae7b 100644 --- a/pkgs/applications/graphics/drawing/default.nix +++ b/pkgs/applications/graphics/drawing/default.nix @@ -20,7 +20,7 @@ python3.pkgs.buildPythonApplication rec { version = "0.4.13"; format = "other"; - + src = fetchFromGitHub { owner = "maoschanz"; repo = pname; diff --git a/pkgs/applications/graphics/drawio/default.nix b/pkgs/applications/graphics/drawio/default.nix index 892d81753e65..31dff2f9c2d6 100644 --- a/pkgs/applications/graphics/drawio/default.nix +++ b/pkgs/applications/graphics/drawio/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "drawio"; - version = "13.9.9"; + version = "14.1.5"; src = fetchurl { url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/draw.io-x86_64-${version}.rpm"; - hash = "sha256-+rNbLHpkFnvM7gDFbZ9AItPIA2IVTmscz+gTXF8riIY="; + hash = "sha256-dM/DGtUDnJBD4Cfhm/zbxfgBhUcIlEzlF4z3cmQuW14="; }; nativeBuildInputs = [ @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { --replace /opt/draw.io/drawio $out/bin/drawio ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A desktop application for creating diagrams"; homepage = "https://about.draw.io/"; license = licenses.asl20; diff --git a/pkgs/applications/graphics/emulsion/default.nix b/pkgs/applications/graphics/emulsion/default.nix new file mode 100644 index 000000000000..ba7ebfcfdff6 --- /dev/null +++ b/pkgs/applications/graphics/emulsion/default.nix @@ -0,0 +1,85 @@ +{ stdenv +, lib +, fetchFromGitHub +, rustPlatform +, installShellFiles +, makeWrapper +, pkg-config +, python3 +, libGL +, libX11 +, libXcursor +, libXi +, libXrandr +, libXxf86vm +, libxcb +, libxkbcommon +, wayland +, xdg_utils +, AppKit +, CoreGraphics +, CoreServices +, Foundation +, OpenGL +}: +let + rpathLibs = [ + libGL + libX11 + libXcursor + libXi + libXrandr + libXxf86vm + libxcb + ] ++ lib.optionals stdenv.isLinux [ + libxkbcommon + wayland + ]; +in +rustPlatform.buildRustPackage rec { + pname = "emulsion"; + version = "7.2"; + + src = fetchFromGitHub { + owner = "ArturKovacs"; + repo = pname; + rev = "v${version}"; + sha256 = "1king04p5j4gsvprrfppwaxa5jn4ga4nc0v63wl6fvq2ngwnkg4g"; + }; + + cargoSha256 = "19vb2q5w3063l7349p1b8q40n97a4hxdvc7h7qsx1iiwp75knbd0"; + + nativeBuildInputs = [ + installShellFiles + makeWrapper + pkg-config + python3 + ]; + + buildInputs = rpathLibs ++ lib.optionals stdenv.isDarwin [ + AppKit + CoreGraphics + CoreServices + Foundation + OpenGL + ]; + + installPhase = '' + runHook preInstall + install -D $releaseDir/emulsion $out/bin/emulsion + '' + lib.optionalString stdenv.isLinux '' + patchelf --set-rpath "${lib.makeLibraryPath rpathLibs}" $out/bin/emulsion + '' + '' + runHook postInstall + ''; + + dontPatchELF = true; + + meta = with lib; { + description = "A fast and minimalistic image viewer"; + homepage = "https://arturkovacs.github.io/emulsion-website/"; + maintainers = [ maintainers.magnetophon ]; + platforms = platforms.unix; + license = licenses.mit; + }; +} diff --git a/pkgs/applications/graphics/epeg/default.nix b/pkgs/applications/graphics/epeg/default.nix index bdbdf04bcd50..75f1fb9acd15 100644 --- a/pkgs/applications/graphics/epeg/default.nix +++ b/pkgs/applications/graphics/epeg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, libtool, autoconf, automake +{ lib, stdenv, fetchFromGitHub, pkgconfig, libtool, autoconf, automake , libjpeg, libexif }: @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ./autogen.sh ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/mattes/epeg"; description = "Insanely fast JPEG/ JPG thumbnail scaling"; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/applications/graphics/evilpixie/default.nix b/pkgs/applications/graphics/evilpixie/default.nix index 1f6a52aa0b0c..4c47283c42ac 100644 --- a/pkgs/applications/graphics/evilpixie/default.nix +++ b/pkgs/applications/graphics/evilpixie/default.nix @@ -22,13 +22,13 @@ let in mkDerivation rec { pname = "evilpixie"; - version = "0.2"; + version = "0.2.1"; src = fetchFromGitHub { owner = "bcampbell"; repo = "evilpixie"; rev = "v${version}"; - sha256 = "1yg4ic3kcxqmr7k5bbvrv5iavlnhpdx6510z5wha9k9k5q9c4dvh"; + sha256 = "0dwgfr8kmkfppgf5wx9i5f7fjz3gxk0ji1l06x1z4r3vj52hdbph"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/exrtools/default.nix b/pkgs/applications/graphics/exrtools/default.nix index 39c23eb4fe8c..c50b6d0c2ad8 100644 --- a/pkgs/applications/graphics/exrtools/default.nix +++ b/pkgs/applications/graphics/exrtools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, openexr, libpng12, libjpeg }: +{ lib, stdenv, fetchurl, pkgconfig, openexr, libpng12, libjpeg }: stdenv.mkDerivation rec { pname = "exrtools"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ stdenv openexr libpng12 libjpeg ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Collection of utilities for manipulating OpenEXR images"; homepage = "http://scanline.ca/exrtools"; platforms = platforms.linux; diff --git a/pkgs/applications/graphics/f3d/default.nix b/pkgs/applications/graphics/f3d/default.nix index c81ba1240173..e90d0e13f225 100644 --- a/pkgs/applications/graphics/f3d/default.nix +++ b/pkgs/applications/graphics/f3d/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, cmake, vtk_9, libX11, libGL, Cocoa, OpenGL }: +{ lib, stdenv, fetchFromGitLab, cmake, vtk_9, libX11, libGL, Cocoa, OpenGL }: stdenv.mkDerivation rec { pname = "f3d"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optionals stdenv.isLinux [ libGL libX11 ] ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa OpenGL ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Fast and minimalist 3D viewer using VTK"; homepage = "https://kitware.github.io/F3D"; license = licenses.bsd3; diff --git a/pkgs/applications/graphics/fbida/default.nix b/pkgs/applications/graphics/fbida/default.nix index 7f0167f98342..4754cc1a0241 100644 --- a/pkgs/applications/graphics/fbida/default.nix +++ b/pkgs/applications/graphics/fbida/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libjpeg, libexif, libungif, libtiff, libpng, libwebp, libdrm +{ lib, stdenv, fetchurl, libjpeg, libexif, libungif, libtiff, libpng, libwebp, libdrm , pkgconfig, freetype, fontconfig, which, imagemagick, curl, sane-backends, libXpm , epoxy, poppler, mesa, lirc }: @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { sed -e 's@$(HAVE_LINUX_FB_H)@yes@' -i GNUmakefile ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Image viewing and manipulation programs including fbi, fbgs, ida, exiftran and thumbnail.cgi"; homepage = "https://www.kraxel.org/blog/linux/fbida/"; license = licenses.gpl2; diff --git a/pkgs/applications/graphics/fig2dev/default.nix b/pkgs/applications/graphics/fig2dev/default.nix index cd7db3d29c50..c22bbbb48278 100644 --- a/pkgs/applications/graphics/fig2dev/default.nix +++ b/pkgs/applications/graphics/fig2dev/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ghostscript, libpng } : +{ lib, stdenv, fetchurl, ghostscript, libpng } : let version = "3.2.7b"; @@ -16,7 +16,7 @@ in stdenv.mkDerivation { GSEXE="${ghostscript}/bin/gs"; - meta = with stdenv.lib; { + meta = with lib; { description = "Tool to convert Xfig files to other formats"; homepage = "http://mcj.sourceforge.net/"; license = licenses.xfig; diff --git a/pkgs/applications/graphics/fluxus/default.nix b/pkgs/applications/graphics/fluxus/default.nix index f560ad45c574..05260dc9812a 100644 --- a/pkgs/applications/graphics/fluxus/default.nix +++ b/pkgs/applications/graphics/fluxus/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitLab , alsaLib , bzip2 @@ -87,7 +87,7 @@ stdenv.mkDerivation rec { cp -r build$out/* $out/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Livecoding environment for 3D graphics, sound, and games"; license = licenses.gpl2; homepage = "http://www.pawfal.org/fluxus/"; diff --git a/pkgs/applications/graphics/fondo/default.nix b/pkgs/applications/graphics/fondo/default.nix index 73cfdccea816..ee75d6e1ae05 100644 --- a/pkgs/applications/graphics/fondo/default.nix +++ b/pkgs/applications/graphics/fondo/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , nix-update-script , pantheon @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { }; - meta = with stdenv.lib; { + meta = with lib; { description = "Find the most beautiful wallpapers for your desktop"; homepage = "https://github.com/calo001/fondo"; license = licenses.agpl3Plus; diff --git a/pkgs/applications/graphics/freecad/default.nix b/pkgs/applications/graphics/freecad/default.nix index f1e366b65699..cb37a81d9e1a 100644 --- a/pkgs/applications/graphics/freecad/default.nix +++ b/pkgs/applications/graphics/freecad/default.nix @@ -1,4 +1,4 @@ -{ stdenv, mkDerivation, fetchFromGitHub, fetchpatch, cmake, ninja, coin3d, +{ lib, stdenv, mkDerivation, fetchFromGitHub, fetchpatch, cmake, ninja, coin3d, xercesc, ode, eigen, qtbase, qttools, qtwebengine, qtxmlpatterns, wrapQtAppsHook, opencascade-occt, gts, hdf5, vtk, medfile, zlib, python3Packages, swig, gfortran, libXmu, soqt, libf2c, libGLU, makeWrapper, pkgconfig, mpi ? null }: @@ -27,7 +27,7 @@ in mkDerivation rec { ]; buildInputs = [ - cmake coin3d xercesc ode eigen opencascade-occt gts + coin3d xercesc ode eigen opencascade-occt gts zlib swig gfortran soqt libf2c makeWrapper mpi vtk hdf5 medfile libGLU libXmu qtbase qttools qtwebengine qtxmlpatterns ] ++ (with pythonPackages; [ @@ -67,7 +67,7 @@ in mkDerivation rec { mv $out/share/doc $out ''; - meta = with stdenv.lib; { + meta = with lib; { description = "General purpose Open Source 3D CAD/MCAD/CAx/CAE/PLM modeler"; homepage = "https://www.freecadweb.org/"; license = licenses.lgpl2Plus; diff --git a/pkgs/applications/graphics/freepv/default.nix b/pkgs/applications/graphics/freepv/default.nix index 11d203746e1a..a0356d129818 100644 --- a/pkgs/applications/graphics/freepv/default.nix +++ b/pkgs/applications/graphics/freepv/default.nix @@ -9,8 +9,8 @@ stdenv.mkDerivation { sha256 = "1w19abqjn64w47m35alg7bcdl1p97nf11zn64cp4p0dydihmhv56"; }; - buildInputs = [ libjpeg libGLU libGL freeglut zlib cmake libX11 libxml2 libpng - libXxf86vm ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ libjpeg libGLU libGL freeglut zlib libX11 libxml2 libpng libXxf86vm ]; postPatch = '' sed -i -e '/GECKO/d' CMakeLists.txt diff --git a/pkgs/applications/graphics/fstl/default.nix b/pkgs/applications/graphics/fstl/default.nix index c96ea765d43f..e7eb2c4f92ac 100644 --- a/pkgs/applications/graphics/fstl/default.nix +++ b/pkgs/applications/graphics/fstl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, mkDerivation, qtbase, mesa_glu }: +{ lib, stdenv, fetchFromGitHub, mkDerivation, qtbase, mesa_glu }: mkDerivation rec { pname = "fstl"; @@ -13,7 +13,7 @@ mkDerivation rec { preBuild = '' qmake qt/fstl.pro ''; - + postInstall = stdenv.lib.optionalString stdenv.isDarwin '' mkdir -p $out/Applications mv fstl.app $out/Applications @@ -26,7 +26,7 @@ mkDerivation rec { sha256 = "028hzdv11hgvcpc36q5scf4nw1256qswh37xhfn5a0iv7wycmnif"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "The fastest STL file viewer"; homepage = "https://github.com/mkeeter/fstl"; license = licenses.mit; diff --git a/pkgs/applications/graphics/gcolor3/default.nix b/pkgs/applications/graphics/gcolor3/default.nix index 2962825e49b1..2771559416bf 100644 --- a/pkgs/applications/graphics/gcolor3/default.nix +++ b/pkgs/applications/graphics/gcolor3/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitLab , meson , ninja @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { patchShebangs meson_install.sh ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A simple color chooser written in GTK3"; homepage = "https://gitlab.gnome.org/World/gcolor3"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/graphics/geeqie/default.nix b/pkgs/applications/graphics/geeqie/default.nix index 629abb3321d5..7167700c244c 100644 --- a/pkgs/applications/graphics/geeqie/default.nix +++ b/pkgs/applications/graphics/geeqie/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, autoconf, automake, gettext, intltool +{ lib, stdenv, fetchurl, pkgconfig, autoconf, automake, gettext, intltool , gtk3, lcms2, exiv2, libchamplain, clutter-gtk, ffmpegthumbnailer, fbida , wrapGAppsHook, fetchpatch }: @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Lightweight GTK based image viewer"; longDescription = diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix index 84f5abfce063..c2e8a47420eb 100644 --- a/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/pkgs/applications/graphics/gimp/plugins/default.nix @@ -69,7 +69,7 @@ in }; NIX_LDFLAGS = "-lm"; hardeningDisable = [ "format" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "The GIMP Animation Package"; homepage = "https://www.gimp.org"; # The main code is given in GPLv3, but it has ffmpeg in it, and I think ffmpeg license @@ -93,7 +93,7 @@ in installPhase = "installPlugins fourier"; - meta = with stdenv.lib; { + meta = with lib; { description = "GIMP plug-in to do the fourier transform"; homepage = "https://people.via.ecp.fr/~remi/soft/gimp/gimp_plugin_en.php3#fourier"; license = with licenses; [ gpl3Plus ]; @@ -167,8 +167,6 @@ in variant = "gimp"; }; - ufraw = pkgs.ufraw.gimpPlugin; - gimplensfun = pluginDerivation rec { version = "unstable-2018-10-21"; name = "gimplensfun-${version}"; diff --git a/pkgs/applications/graphics/glabels/default.nix b/pkgs/applications/graphics/glabels/default.nix index be487fcb8a6b..c6b7b60c98e8 100644 --- a/pkgs/applications/graphics/glabels/default.nix +++ b/pkgs/applications/graphics/glabels/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, barcode, gnome3, autoreconfHook +{ lib, stdenv, fetchurl, barcode, gnome3, autoreconfHook , gtk3, gtk-doc, libxml2, librsvg , libtool, libe-book, gsettings-desktop-schemas , intltool, itstool, makeWrapper, pkgconfig, yelp-tools }: @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Create labels and business cards"; homepage = "https://glabels.org/"; license = with licenses; [ gpl3Plus lgpl3Plus ]; diff --git a/pkgs/applications/graphics/gnome-photos/default.nix b/pkgs/applications/graphics/gnome-photos/default.nix index 0d4b06c8c6d5..425762fdaa96 100644 --- a/pkgs/applications/graphics/gnome-photos/default.nix +++ b/pkgs/applications/graphics/gnome-photos/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , fetchpatch , at-spi2-core @@ -131,7 +131,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Access, organize and share your photos"; homepage = "https://wiki.gnome.org/Apps/Photos"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/graphics/gnuclad/default.nix b/pkgs/applications/graphics/gnuclad/default.nix index c36d576cc8e2..e4a82703febb 100644 --- a/pkgs/applications/graphics/gnuclad/default.nix +++ b/pkgs/applications/graphics/gnuclad/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://launchpad.net/gnuclad"; description = "gnuclad tries to help the environment by creating trees. Its primary use will be generating cladogram trees for the GNU/Linux distro timeline project"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/graphics/goxel/default.nix b/pkgs/applications/graphics/goxel/default.nix index 771109fb55d2..ec51e077c568 100644 --- a/pkgs/applications/graphics/goxel/default.nix +++ b/pkgs/applications/graphics/goxel/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, scons, pkgconfig, wrapGAppsHook +{ lib, stdenv, fetchFromGitHub, scons, pkgconfig, wrapGAppsHook , glfw3, gtk3, libpng12 }: stdenv.mkDerivation rec { @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { install -D ./goxel $out/bin/goxel ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Open Source 3D voxel editor"; homepage = "https://guillaumechereau.github.io/goxel/"; license = licenses.gpl3; diff --git a/pkgs/applications/graphics/gpicview/default.nix b/pkgs/applications/graphics/gpicview/default.nix index 9e3ab37c3223..e686aa4f3591 100644 --- a/pkgs/applications/graphics/gpicview/default.nix +++ b/pkgs/applications/graphics/gpicview/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, intltool, pkgconfig, gtk2, fetchpatch }: +{ lib, stdenv, fetchurl, intltool, pkgconfig, gtk2, fetchpatch }: stdenv.mkDerivation { name = "gpicview-0.2.4"; @@ -15,7 +15,7 @@ stdenv.mkDerivation { }) ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A simple and fast image viewer for X"; homepage = "http://lxde.sourceforge.net/gpicview/"; repositories.git = "git://lxde.git.sourceforge.net/gitroot/lxde/gpicview"; diff --git a/pkgs/applications/graphics/gqview/default.nix b/pkgs/applications/graphics/gqview/default.nix index 965ac5db6821..6ea67e332129 100644 --- a/pkgs/applications/graphics/gqview/default.nix +++ b/pkgs/applications/graphics/gqview/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, gtk2, libpng}: +{lib, stdenv, fetchurl, pkgconfig, gtk2, libpng}: assert pkgconfig != null && gtk2 != null && libpng != null; # Note that we cannot just copy gtk's png attribute, since gtk might @@ -20,7 +20,7 @@ stdenv.mkDerivation { NIX_LDFLAGS = "-lm"; - meta = with stdenv.lib; { + meta = with lib; { description = "A fast image viewer"; homepage = "http://gqview.sourceforge.net"; license = licenses.gpl2; diff --git a/pkgs/applications/graphics/gthumb/default.nix b/pkgs/applications/graphics/gthumb/default.nix index 7dbe03d9f281..c97e28c9f9af 100644 --- a/pkgs/applications/graphics/gthumb/default.nix +++ b/pkgs/applications/graphics/gthumb/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , fetchpatch , gnome3 @@ -101,7 +101,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://wiki.gnome.org/Apps/Gthumb"; description = "Image browser and viewer for GNOME"; platforms = platforms.linux; diff --git a/pkgs/applications/graphics/hello-wayland/default.nix b/pkgs/applications/graphics/hello-wayland/default.nix new file mode 100644 index 000000000000..b11e2be9daf6 --- /dev/null +++ b/pkgs/applications/graphics/hello-wayland/default.nix @@ -0,0 +1,33 @@ +{ stdenv, lib, fetchFromGitHub +, imagemagick, pkg-config, wayland, wayland-protocols +}: + +stdenv.mkDerivation { + pname = "hello-wayland-unstable"; + version = "2020-07-27"; + + src = fetchFromGitHub { + owner = "emersion"; + repo = "hello-wayland"; + rev = "501d0851cfa7f21c780c0eb52f0a6b23f02918c5"; + sha256 = "0dz6przqp57kw8ycja3gw6jp9x12217nwbwdpgmvw7jf0lzhk4xr"; + }; + + nativeBuildInputs = [ imagemagick pkg-config ]; + buildInputs = [ wayland wayland-protocols ]; + + installPhase = '' + runHook preBuild + mkdir -p $out/bin + install hello-wayland $out/bin + runHook postBuild + ''; + + meta = with lib; { + description = "Hello world Wayland client"; + homepage = "https://github.com/emersion/hello-wayland"; + maintainers = with maintainers; [ qyliss ]; + license = licenses.mit; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/graphics/hugin/default.nix b/pkgs/applications/graphics/hugin/default.nix index 7314ff893b00..17d1dc326766 100644 --- a/pkgs/applications/graphics/hugin/default.nix +++ b/pkgs/applications/graphics/hugin/default.nix @@ -1,4 +1,4 @@ -{ stdenv, cmake, fetchurl, gnumake, makeWrapper, pkgconfig, fetchpatch +{ lib, stdenv, cmake, fetchurl, gnumake, makeWrapper, pkgconfig, fetchpatch , autopanosiftc, boost, cairo, enblend-enfuse, exiv2, fftw, flann, gettext , glew, ilmbase, lcms2, lensfun, libjpeg, libpng, libtiff, libX11, libXi , libXmu, libGLU, libGL, openexr, panotools, perlPackages, sqlite, vigra, wxGTK, zlib @@ -31,8 +31,6 @@ stdenv.mkDerivation rec { # disable installation of the python scripting interface cmakeFlags = [ "-DBUILD_HSI:BOOl=OFF" ]; - enableParallelBuilding = true; - NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR"; postInstall = '' @@ -45,7 +43,7 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://hugin.sourceforge.net/"; description = "Toolkit for stitching photographs and assembling panoramas, together with an easy to use graphical front end"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/graphics/hydrus/default.nix b/pkgs/applications/graphics/hydrus/default.nix index 8e9998dde393..69fdb9e2e114 100644 --- a/pkgs/applications/graphics/hydrus/default.nix +++ b/pkgs/applications/graphics/hydrus/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , lzma , qt5 @@ -103,7 +103,7 @@ pythonPackages.buildPythonPackage { makeWrapperArgs+=("''${qtWrapperArgs[@]}") ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Danbooru-like image tagging and searching system for the desktop"; license = licenses.wtfpl; homepage = "https://hydrusnetwork.github.io/hydrus/"; diff --git a/pkgs/applications/graphics/ideogram/default.nix b/pkgs/applications/graphics/ideogram/default.nix index 9ae7ae2cb8ce..fbee1d5b0e83 100644 --- a/pkgs/applications/graphics/ideogram/default.nix +++ b/pkgs/applications/graphics/ideogram/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , nix-update-script , fetchpatch @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Insert emoji anywhere, even in non-native apps - designed for elementary OS"; homepage = "https://github.com/cassidyjames/ideogram"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/graphics/imagej/default.nix b/pkgs/applications/graphics/imagej/default.nix index d47369f5094a..7e3238e94bbc 100644 --- a/pkgs/applications/graphics/imagej/default.nix +++ b/pkgs/applications/graphics/imagej/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jre, unzip, makeWrapper }: +{ lib, stdenv, fetchurl, jre, unzip, makeWrapper }: # Note: # - User config dir is hard coded by upstream to $HOME/.imagej on linux systems @@ -31,7 +31,7 @@ let makeWrapper ${jre}/bin/java $out/bin/imagej \ --add-flags "-jar $out/share/java/ij.jar -ijpath $out/share" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://imagej.nih.gov/ij/"; description = "Image processing and analysis in Java"; longDescription = '' diff --git a/pkgs/applications/graphics/imgbrd-grabber/default.nix b/pkgs/applications/graphics/imgbrd-grabber/default.nix index 22a35b3a4cc3..c0115d95ac80 100644 --- a/pkgs/applications/graphics/imgbrd-grabber/default.nix +++ b/pkgs/applications/graphics/imgbrd-grabber/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , cmake , fetchFromGitHub , wrapQtAppsHook @@ -85,7 +85,7 @@ stdenv.mkDerivation rec { sourceRoot = "source/src"; - meta = with stdenv.lib; { + meta = with lib; { description = "Very customizable imageboard/booru downloader with powerful filenaming features"; license = licenses.asl20; homepage = "https://bionus.github.io/imgbrd-grabber/"; diff --git a/pkgs/applications/graphics/imgcat/default.nix b/pkgs/applications/graphics/imgcat/default.nix index 5943632930c5..cb2301d6339e 100644 --- a/pkgs/applications/graphics/imgcat/default.nix +++ b/pkgs/applications/graphics/imgcat/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, libtool, ncurses }: +{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, ncurses }: stdenv.mkDerivation rec { pname = "imgcat"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-Wno-error"; - meta = with stdenv.lib; { + meta = with lib; { description = "It's like cat, but for images"; homepage = "https://github.com/eddieantonio/imgcat"; license = licenses.isc; diff --git a/pkgs/applications/graphics/imlibsetroot/default.nix b/pkgs/applications/graphics/imlibsetroot/default.nix index 06549468efe9..d3640a656f13 100644 --- a/pkgs/applications/graphics/imlibsetroot/default.nix +++ b/pkgs/applications/graphics/imlibsetroot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libX11, libXinerama, imlib2 }: +{ lib, stdenv, fetchurl, libX11, libXinerama, imlib2 }: stdenv.mkDerivation { pname = "imlibsetroot"; @@ -19,7 +19,7 @@ stdenv.mkDerivation { install -m 755 imlibsetroot $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A Xinerama Aware Background Changer"; homepage = "http://robotmonkeys.net/2010/03/30/imlibsetroot/"; license = licenses.gpl2; diff --git a/pkgs/applications/graphics/imv/default.nix b/pkgs/applications/graphics/imv/default.nix index faf748730583..067abb785b47 100644 --- a/pkgs/applications/graphics/imv/default.nix +++ b/pkgs/applications/graphics/imv/default.nix @@ -1,66 +1,107 @@ -{ asciidoc +{ stdenv +, lib +, fetchFromGitHub +, asciidoc , cmocka , docbook_xsl -, fetchFromGitHub +, libxslt , fontconfig -, freeimage +, meson +, ninja +, pkgconfig , icu +, pango +, inih +, withWindowSystem ? "all" +, xorg +, libxkbcommon , libGLU -, libheif +, wayland +, withBackends ? [ "freeimage" "libtiff" "libjpeg" "libpng" "librsvg" "libnsgif" "libheif" ] +, freeimage +, libtiff , libjpeg_turbo , libpng , librsvg -, libtiff -, libxkbcommon -, libxslt , netsurf -, pango -, pkgconfig -, stdenv -, wayland +, libheif }: +let + windowSystems = { + all = windowSystems.x11 ++ windowSystems.wayland; + x11 = [ libGLU xorg.libxcb xorg.libX11 ]; + wayland = [ wayland ]; + }; + + backends = { + inherit freeimage libtiff libpng librsvg libheif; + libjpeg = libjpeg_turbo; + inherit (netsurf) libnsgif; + }; + + backendFlags = builtins.map + (b: if builtins.elem b withBackends + then "-D${b}=enabled" + else "-D${b}=disabled") + (builtins.attrNames backends); +in + +# check that given window system is valid +assert lib.assertOneOf "withWindowSystem" withWindowSystem + (builtins.attrNames windowSystems); +# check that every given backend is valid +assert builtins.all + (b: lib.assertOneOf "each backend" b (builtins.attrNames backends)) + withBackends; + stdenv.mkDerivation rec { pname = "imv"; - version = "4.1.0"; + version = "4.2.0"; src = fetchFromGitHub { owner = "eXeC64"; repo = "imv"; rev = "v${version}"; - sha256 = "0gk8g178i961nn3bls75a8qpv6wvfvav6hd9lxca1skaikd33zdx"; + sha256 = "07pcpppmfvvj0czfvp1cyq03ha0jdj4whl13lzvw37q3vpxs5qqh"; }; - nativeBuildInputs = [ asciidoc cmocka docbook_xsl libxslt ]; + mesonFlags = [ + "-Dwindows=${withWindowSystem}" + "-Dtest=enabled" + "-Dman=enabled" + ] ++ backendFlags; - buildInputs = [ - freeimage - icu - libGLU - libjpeg_turbo - librsvg - libxkbcommon - netsurf.libnsgif - pango + nativeBuildInputs = [ + asciidoc + cmocka + docbook_xsl + libxslt + meson + ninja pkgconfig - wayland ]; - installFlags = [ "PREFIX=$(out)" "CONFIGPREFIX=$(out)/etc" ]; + buildInputs = [ + icu + libxkbcommon + pango + inih + ] ++ windowSystems."${withWindowSystem}" + ++ builtins.map (b: backends."${b}") withBackends; - makeFlags = [ "BACKEND_LIBJPEG=yes" "BACKEND_LIBNSGIF=yes" ]; - - postFixup = '' + postFixup = lib.optionalString (withWindowSystem == "all") '' # The `bin/imv` script assumes imv-wayland or imv-x11 in PATH, # so we have to fix those to the binaries we installed into the /nix/store - sed -i "s|\bimv-wayland\b|$out/bin/imv-wayland|" $out/bin/imv - sed -i "s|\bimv-x11\b|$out/bin/imv-x11|" $out/bin/imv + substituteInPlace "$out/bin/imv" \ + --replace "imv-wayland" "$out/bin/imv-wayland" \ + --replace "imv-x11" "$out/bin/imv-x11" ''; doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A command line image viewer for tiling window managers"; homepage = "https://github.com/eXeC64/imv"; license = licenses.gpl2; diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index 810b19ba90a6..be89d32e722a 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , boehmgc , boost , cairo @@ -135,7 +135,7 @@ stdenv.mkDerivation rec { install_name_tool -change $out/lib/libinkscape_base.dylib $out/lib/inkscape/libinkscape_base.dylib $out/bin/inkview ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Vector graphics editor"; homepage = "https://www.inkscape.org"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/graphics/inkscape/extensions.nix b/pkgs/applications/graphics/inkscape/extensions.nix index 013d3bec3527..affd934e9368 100644 --- a/pkgs/applications/graphics/inkscape/extensions.nix +++ b/pkgs/applications/graphics/inkscape/extensions.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , runCommand , inkcut @@ -28,7 +28,7 @@ runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "This is an extension for creating hex grids in Inkscape. It can also be used to make brick patterns of staggered rectangles"; homepage = "https://github.com/lifelike/hexmapextension"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/graphics/jpeg-archive/default.nix b/pkgs/applications/graphics/jpeg-archive/default.nix index 8beaf43c089c..cac930dae143 100644 --- a/pkgs/applications/graphics/jpeg-archive/default.nix +++ b/pkgs/applications/graphics/jpeg-archive/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, mozjpeg, makeWrapper, coreutils, parallel, findutils }: +{ lib, stdenv, fetchFromGitHub, mozjpeg, makeWrapper, coreutils, parallel, findutils }: stdenv.mkDerivation { pname = "jpeg-archive"; @@ -32,7 +32,7 @@ stdenv.mkDerivation { --set PATH "$out/bin:${coreutils}/bin:${parallel}/bin:${findutils}/bin" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Utilities for archiving photos for saving to long term storage or serving over the web"; homepage = "https://github.com/danielgtaylor/jpeg-archive"; license = licenses.mit; diff --git a/pkgs/applications/graphics/jpeginfo/default.nix b/pkgs/applications/graphics/jpeginfo/default.nix index e15aedd77e1c..1660d89eacf9 100644 --- a/pkgs/applications/graphics/jpeginfo/default.nix +++ b/pkgs/applications/graphics/jpeginfo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libjpeg }: +{ lib, stdenv, fetchurl, libjpeg }: stdenv.mkDerivation rec { pname = "jpeginfo"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ libjpeg ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Prints information and tests integrity of JPEG/JFIF files"; homepage = "https://www.kokkonen.net/tjko/projects.html"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/graphics/jpegoptim/default.nix b/pkgs/applications/graphics/jpegoptim/default.nix index 265ce82b8ac3..6095d81c528d 100644 --- a/pkgs/applications/graphics/jpegoptim/default.nix +++ b/pkgs/applications/graphics/jpegoptim/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libjpeg }: +{ lib, stdenv, fetchurl, libjpeg }: stdenv.mkDerivation rec { version = "1.4.6"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ libjpeg ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Optimize JPEG files"; homepage = "https://www.kokkonen.net/tjko/projects.html"; license = licenses.gpl2; diff --git a/pkgs/applications/graphics/jpegrescan/default.nix b/pkgs/applications/graphics/jpegrescan/default.nix index 5fe35edabdf6..1a7320bf6930 100644 --- a/pkgs/applications/graphics/jpegrescan/default.nix +++ b/pkgs/applications/graphics/jpegrescan/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, makeWrapper, libjpeg_turbo, perl, perlPackages }: +{ lib, stdenv, fetchFromGitHub, makeWrapper, libjpeg_turbo, perl, perlPackages }: stdenv.mkDerivation rec { pname = "jpegrescan"; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { perl libjpeg_turbo makeWrapper ]; - meta = with stdenv.lib; { + meta = with lib; { description = "losslessly shrink any JPEG file"; homepage = "https://github.com/kud/jpegrescan"; license = licenses.publicDomain; diff --git a/pkgs/applications/graphics/k3d/default.nix b/pkgs/applications/graphics/k3d/default.nix index c74f35e4334a..c333ecaa99fd 100644 --- a/pkgs/applications/graphics/k3d/default.nix +++ b/pkgs/applications/graphics/k3d/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, ftgl, glew, asciidoc +{ lib, stdenv, fetchFromGitHub, fetchpatch, ftgl, glew, asciidoc , cmake, ninja, libGLU, libGL, zlib, python, expat, libxml2, libsigcxx, libuuid, freetype , libpng, boost, doxygen, cairomm, pkgconfig, libjpeg, libtiff , gettext, intltool, perl, gtkmm2, glibmm, gtkglext, libXmu }: @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-Wno-deprecated-declarations"; - meta = with stdenv.lib; { + meta = with lib; { description = "A 3D editor with support for procedural editing"; homepage = "http://www.k-3d.org/"; platforms = platforms.linux; diff --git a/pkgs/applications/graphics/kcc/default.nix b/pkgs/applications/graphics/kcc/default.nix index da3589189725..bbbd4ed351bc 100644 --- a/pkgs/applications/graphics/kcc/default.nix +++ b/pkgs/applications/graphics/kcc/default.nix @@ -14,7 +14,7 @@ mkDerivationWith python3Packages.buildPythonApplication rec { pname = "KindleComicConverter"; sha256 = "5dbee5dc5ee06a07316ae5ebaf21ffa1970094dbae5985ad735e2807ef112644"; }; - + propagatedBuildInputs = with python3Packages ; [ pillow pyqt5 diff --git a/pkgs/applications/graphics/kgraphviewer/default.nix b/pkgs/applications/graphics/kgraphviewer/default.nix index 9b96b30c62b1..4f3e08bf7b0f 100644 --- a/pkgs/applications/graphics/kgraphviewer/default.nix +++ b/pkgs/applications/graphics/kgraphviewer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, mkDerivation, fetchurl, cmake, extra-cmake-modules, pkgconfig, wrapGAppsHook +{ lib, stdenv, mkDerivation, fetchurl, cmake, extra-cmake-modules, pkgconfig, wrapGAppsHook , kconfig, kinit, kdoctools, kio, kparts, kwidgetsaddons , qtbase, qtsvg , boost, graphviz @@ -27,9 +27,7 @@ mkDerivation rec { kconfig kinit kio kparts kwidgetsaddons ]; - enableParallelBuilding = true; - - meta = with stdenv.lib; { + meta = with lib; { description = "A Graphviz dot graph viewer for KDE"; license = licenses.gpl2; maintainers = with maintainers; [ lethalman ]; diff --git a/pkgs/applications/graphics/kodelife/default.nix b/pkgs/applications/graphics/kodelife/default.nix index e5aac9b8823d..80abca80f87f 100644 --- a/pkgs/applications/graphics/kodelife/default.nix +++ b/pkgs/applications/graphics/kodelife/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchzip , alsaLib , glib @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { $out/bin/KodeLife ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://hexler.net/products/kodelife"; description = "Real-time GPU shader editor"; license = licenses.unfree; diff --git a/pkgs/applications/graphics/ktikz/default.nix b/pkgs/applications/graphics/ktikz/default.nix index d0d9f100878f..1872d976f8e3 100644 --- a/pkgs/applications/graphics/ktikz/default.nix +++ b/pkgs/applications/graphics/ktikz/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch +{ lib, stdenv, fetchFromGitHub, fetchpatch , pkgconfig, wrapQtAppsHook , poppler, gnuplot , qmake, qtbase, qttools @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { version = "0.12"; pname = "qtikz"; - meta = with stdenv.lib; { + meta = with lib; { description = "Editor for the TikZ language"; homepage = "https://github.com/fhackenberger/ktikz"; license = licenses.gpl2; diff --git a/pkgs/applications/graphics/lazpaint/default.nix b/pkgs/applications/graphics/lazpaint/default.nix index e53c36b59cd9..2756414d30de 100644 --- a/pkgs/applications/graphics/lazpaint/default.nix +++ b/pkgs/applications/graphics/lazpaint/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, lazarus, fpc, pango, cairo, glib +{ lib, stdenv, fetchFromGitHub, lazarus, fpc, pango, cairo, glib , atk, gtk2, libX11, gdk-pixbuf, busybox, python3, makeWrapper }: with stdenv; @@ -58,7 +58,7 @@ in stdenv.mkDerivation rec { --prefix PATH : ${stdenv.lib.makeBinPath [ python3 ]} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Image editor like PaintBrush or Paint.Net"; homepage = "https://sourceforge.net/projects/lazpaint/"; license = licenses.gpl3; diff --git a/pkgs/applications/graphics/leocad/default.nix b/pkgs/applications/graphics/leocad/default.nix index 5e950eeac04b..39a287900a9a 100644 --- a/pkgs/applications/graphics/leocad/default.nix +++ b/pkgs/applications/graphics/leocad/default.nix @@ -3,7 +3,7 @@ To use aditional parts libraries set the variable LEOCAD_LIB=/path/to/libs/ or use option -l /path/to/libs/ */ -{ stdenv, fetchFromGitHub, qt4, qmake4Hook, zlib }: +{ lib, stdenv, fetchFromGitHub, qt4, qmake4Hook, zlib }: stdenv.mkDerivation rec { pname = "leocad"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { export qmakeFlags="$qmakeFlags INSTALL_PREFIX=$out" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "CAD program for creating virtual LEGO models"; homepage = "https://www.leocad.org/"; license = licenses.gpl2; diff --git a/pkgs/applications/graphics/luminance-hdr/default.nix b/pkgs/applications/graphics/luminance-hdr/default.nix index 811a907746d5..9b1dbe537956 100644 --- a/pkgs/applications/graphics/luminance-hdr/default.nix +++ b/pkgs/applications/graphics/luminance-hdr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, mkDerivation, cmake, fetchFromGitHub, pkgconfig +{ lib, stdenv, mkDerivation, cmake, fetchFromGitHub, pkgconfig , boost, exiv2, fftwFloat, gsl , ilmbase, lcms2, libraw, libtiff, openexr , qtbase, qtdeclarative, qttools, qtwebengine, eigen @@ -24,7 +24,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://qtpfsgui.sourceforge.net/"; description = "A complete open source solution for HDR photography"; license = licenses.gpl2; diff --git a/pkgs/applications/graphics/mcomix3/default.nix b/pkgs/applications/graphics/mcomix3/default.nix index 24c80a6bd877..81077578eb27 100644 --- a/pkgs/applications/graphics/mcomix3/default.nix +++ b/pkgs/applications/graphics/mcomix3/default.nix @@ -87,7 +87,7 @@ python3.pkgs.buildPythonApplication rec { $out/bin/${pname} --help > /dev/null ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Comic book reader and image viewer; python3 fork of mcomix"; longDescription = '' User-friendly, customizable image viewer, specifically designed to handle diff --git a/pkgs/applications/graphics/meme/default.nix b/pkgs/applications/graphics/meme/default.nix index 5425b8bef23c..c894de2c9330 100644 --- a/pkgs/applications/graphics/meme/default.nix +++ b/pkgs/applications/graphics/meme/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , unstableGitUpdater , buildGoModule , fetchFromGitHub @@ -19,7 +19,7 @@ buildGoModule { passthru.updateScript = unstableGitUpdater { }; - meta = with stdenv.lib; { + meta = with lib; { description = "A command line utility for creating image macro style memes"; homepage = "https://github.com/nomad-software/meme"; license = licenses.mit; diff --git a/pkgs/applications/graphics/meshlab/default.nix b/pkgs/applications/graphics/meshlab/default.nix index 50962d54eb23..67b64ee575c0 100644 --- a/pkgs/applications/graphics/meshlab/default.nix +++ b/pkgs/applications/graphics/meshlab/default.nix @@ -84,8 +84,6 @@ mkDerivation rec { # | hardeningDisable = [ "format" ]; - enableParallelBuilding = true; - meta = { description = "A system for processing and editing 3D triangular meshes"; homepage = "https://www.meshlab.net/"; diff --git a/pkgs/applications/graphics/monado/default.nix b/pkgs/applications/graphics/monado/default.nix new file mode 100644 index 000000000000..395ae028423a --- /dev/null +++ b/pkgs/applications/graphics/monado/default.nix @@ -0,0 +1,130 @@ +{ lib, stdenv +, fetchFromGitLab +, fetchpatch +, writeText +, cmake +, doxygen +, glslang +, pkg-config +, python3 +, SDL2 +, dbus +, eigen +, ffmpeg +, gst-plugins-base +, gstreamer +, hidapi +, libGL +, libXau +, libXdmcp +, libXrandr +, libffi +, libjpeg +# , librealsense +, libsurvive +, libusb1 +, libuv +, libuvc +, libv4l +, libxcb +, opencv4 +, openhmd +, udev +, vulkan-headers +, vulkan-loader +, wayland +, wayland-protocols +, zlib +# Set as 'false' to build monado without service support, i.e. allow VR +# applications linking against libopenxr_monado.so to use OpenXR standalone +# instead of via the monado-service program. For more information see: +# https://gitlab.freedesktop.org/monado/monado/-/blob/master/doc/targets.md#xrt_feature_service-disabled +, serviceSupport ? true +}: + +stdenv.mkDerivation rec { + pname = "monado"; + version = "0.4.1"; + + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = pname; + repo = pname; + rev = "v${version}"; + sha256 = "114aif79dqyn2qg07mkv6lzmqn15k6fdcii818rdf5g4bp7zzzgm"; + }; + + patches = [ + # fix libsurvive autodetection, drop with the next version update + (fetchpatch { + url = "https://gitlab.freedesktop.org/monado/monado/-/commit/345e9eab56e2de9e8b07cf72c2a67cf2ebd01e62.patch"; + sha256 = "17c110an6sxc8rn7dfz30rfkbayg64w68licicwc8cqabi6cgrm3"; + }) + ]; + + nativeBuildInputs = [ + cmake + doxygen + glslang + pkg-config + python3 + ]; + + cmakeFlags = [ + "-DXRT_FEATURE_SERVICE=${if serviceSupport then "ON" else "OFF"}" + ]; + + buildInputs = [ + SDL2 + dbus + eigen + ffmpeg + gst-plugins-base + gstreamer + hidapi + libGL + libXau + libXdmcp + libXrandr + libjpeg + libffi + # librealsense.dev - see below + libsurvive + libusb1 + libuv + libuvc + libv4l + libxcb + opencv4 + openhmd + udev + vulkan-headers + vulkan-loader + wayland + wayland-protocols + zlib + ]; + + # realsense is disabled, the build ends with the following error: + # + # CMake Error in src/xrt/drivers/CMakeLists.txt: + # Imported target "realsense2::realsense2" includes non-existent path + # "/nix/store/2v95aps14hj3jy4ryp86vl7yymv10mh0-librealsense-2.41.0/include" + # in its INTERFACE_INCLUDE_DIRECTORIES. + # + # for some reason cmake is trying to use ${librealsense}/include + # instead of ${librealsense.dev}/include as an include directory + + # Help openxr-loader find this runtime + setupHook = writeText "setup-hook" '' + export XDG_CONFIG_DIRS=@out@/etc/xdg''${XDG_CONFIG_DIRS:+:''${XDG_CONFIG_DIRS}} + ''; + + meta = with lib; { + description = "Open source XR runtime"; + homepage = "https://monado.freedesktop.org/"; + license = licenses.boost; + maintainers = with maintainers; [ expipiplus1 prusnak ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/graphics/mtpaint/default.nix b/pkgs/applications/graphics/mtpaint/default.nix index 91278c9881fe..c002e2a8d054 100644 --- a/pkgs/applications/graphics/mtpaint/default.nix +++ b/pkgs/applications/graphics/mtpaint/default.nix @@ -1,26 +1,28 @@ { stdenv, fetchFromGitHub -, pkgconfig -, freetype, giflib, gtk2, lcms2, libjpeg, libpng, libtiff, openjpeg, gifsicle +, pkg-config +, freetype, giflib, gtk3, lcms2, libjpeg, libpng, libtiff, openjpeg, gifsicle }: stdenv.mkDerivation rec { p_name = "mtPaint"; - ver_maj = "3.49"; - ver_min = "12"; + ver_maj = "3.50"; + ver_min = "01"; name = "${p_name}-${ver_maj}.${ver_min}"; src = fetchFromGitHub { owner = "wjaguar"; repo = p_name; - rev = "6aed1b0441f99055fc7d475942f8bd5cb23c41f8"; - sha256 = "0bvf623g0n2ifijcxv1nw0z3wbs2vhhdky4n04ywsbjlykm44nd1"; + rev = "a4675ff5cd9fcd57d291444cb9f332b48f11243f"; + sha256 = "04wqxz8i655gz5rnz90cksy8v6m2jhcn1j8rzhqpp5xhawlmq24y"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ - freetype giflib gtk2 lcms2 libjpeg libpng libtiff openjpeg gifsicle + freetype giflib gtk3 lcms2 libjpeg libpng libtiff openjpeg gifsicle ]; + configureFlags = [ "gtk3" "intl" "man" ]; + meta = { description = "A simple GTK painting program"; longDescription = '' @@ -33,7 +35,7 @@ stdenv.mkDerivation rec { GNU/Linux, Windows and older PC hardware. ''; homepage = "http://mtpaint.sourceforge.net/"; - license = stdenv.lib.licenses.gpl3; + license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.vklquevs ]; }; diff --git a/pkgs/applications/graphics/mypaint/default.nix b/pkgs/applications/graphics/mypaint/default.nix index 7267e8401600..3b030a1eb578 100644 --- a/pkgs/applications/graphics/mypaint/default.nix +++ b/pkgs/applications/graphics/mypaint/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , gtk3 , gettext @@ -90,7 +90,7 @@ in buildPythonApplication rec { runHook postCheck ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A graphics application for digital painters"; homepage = "http://mypaint.org/"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/graphics/nomacs/default.nix b/pkgs/applications/graphics/nomacs/default.nix index d23c02dbbdff..3c571fedb830 100644 --- a/pkgs/applications/graphics/nomacs/default.nix +++ b/pkgs/applications/graphics/nomacs/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , mkDerivation , fetchFromGitHub , fetchpatch @@ -27,8 +27,6 @@ mkDerivation rec { sha256 = "1bq7bv4p7w67172y893lvpk90d6fgdpnylynbj2kn8m2hs6khya4"; }; - enableParallelBuilding = true; - setSourceRoot = '' sourceRoot=$(echo */ImageLounge) ''; @@ -52,7 +50,7 @@ mkDerivation rec { "-DENABLE_TRANSLATIONS=ON" "-DUSE_SYSTEM_QUAZIP=ON"]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://nomacs.org"; description = "Qt-based image viewer"; maintainers = with stdenv.lib.maintainers; [ mindavi ]; diff --git a/pkgs/applications/graphics/nufraw/default.nix b/pkgs/applications/graphics/nufraw/default.nix new file mode 100644 index 000000000000..e49093c568cb --- /dev/null +++ b/pkgs/applications/graphics/nufraw/default.nix @@ -0,0 +1,71 @@ +{ stdenv +, fetchurl +, lib + +, autoreconfHook +, bzip2 +, cfitsio +, exiv2 +, gettext +, gtk2 +, gtkimageview +, lcms2 +, lensfun +, libjpeg +, libtiff +, perl +, pkg-config +, zlib + +, addThumbnailer ? false +}: + +stdenv.mkDerivation rec { + pname = "nufraw"; + version = "0.43-3"; + + src = fetchurl { + url = "mirror://sourceforge/nufraw/nufraw-${version}.tar.gz"; + sha256 = "0b63qvw9r8kaqw36bk3a9zwxc41h8fr6498indkw4glrj0awqz9c"; + }; + + nativeBuildInputs = [ autoreconfHook gettext perl pkg-config ]; + + buildInputs = [ + bzip2 + cfitsio + exiv2 + gtk2 + gtkimageview + lcms2 + lensfun + libjpeg + libtiff + zlib + ]; + + configureFlags = [ + "--enable-contrast" + "--enable-dst-correction" + ]; + + postInstall = lib.optionalString addThumbnailer '' + mkdir -p $out/share/thumbnailers + substituteAll ${./nufraw.thumbnailer} $out/share/thumbnailers/${pname}.thumbnailer + ''; + + meta = with lib; { + homepage = "https://nufraw.sourceforge.io/"; + description = "Utility to read and manipulate raw images from digital cameras"; + longDescription = + '' + A new version of the popular raw digital images manipulator ufraw. + Forks from the version 0.23 of ufraw (that's why the first nufraw version is the 0.24). + Nufraw offers the same features (gimp plugin, batch, ecc) and the same quality of + ufraw in a brand new improved user interface. + ''; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ asbachb ]; + platforms = [ "x86_64-linux" "i686-linux" ]; + }; +} diff --git a/pkgs/applications/graphics/nufraw/nufraw.thumbnailer b/pkgs/applications/graphics/nufraw/nufraw.thumbnailer new file mode 100644 index 000000000000..34b2adc43aee --- /dev/null +++ b/pkgs/applications/graphics/nufraw/nufraw.thumbnailer @@ -0,0 +1,4 @@ +[Thumbnailer Entry] +TryExec=@out@/bin/nufraw-batch +Exec=@out@/bin/nufraw-batch --silent --size %s --out-type=png --noexif --output=%o --embedded-image %i +MimeType=image/x-canon-cr2;image/x-canon-crw;image/x-minolta-mrw;image/x-nikon-nef;image/x-pentax-pef;image/x-panasonic-rw2;image/x-panasonic-raw2;image/x-samsung-srw;image/x-olympus-orf;image/x-sony-arw diff --git a/pkgs/applications/graphics/ocrad/default.nix b/pkgs/applications/graphics/ocrad/default.nix index 80f592681110..476d56fb3fe3 100644 --- a/pkgs/applications/graphics/ocrad/default.nix +++ b/pkgs/applications/graphics/ocrad/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, lzip, texinfo }: +{ fetchurl, lib, stdenv, lzip, texinfo }: stdenv.mkDerivation rec { pname = "ocrad"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Optical character recognition (OCR) program & library"; longDescription = '' GNU Ocrad is an OCR (Optical Character Recognition) program based on diff --git a/pkgs/applications/graphics/ocrfeeder/default.nix b/pkgs/applications/graphics/ocrfeeder/default.nix index 28fe58183fae..95ff90a8eeff 100644 --- a/pkgs/applications/graphics/ocrfeeder/default.nix +++ b/pkgs/applications/graphics/ocrfeeder/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , pkg-config , gtk3 @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { gappsWrapperArgs+=(--prefix PATH : "${enginesPath}") ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://wiki.gnome.org/Apps/OCRFeeder"; description = "Complete Optical Character Recognition and Document Analysis and Recognition program"; maintainers = with maintainers; [ doronbehar ]; diff --git a/pkgs/applications/graphics/odafileconverter/default.nix b/pkgs/applications/graphics/odafileconverter/default.nix index 0d1d64f3dd05..a74043730bf5 100644 --- a/pkgs/applications/graphics/odafileconverter/default.nix +++ b/pkgs/applications/graphics/odafileconverter/default.nix @@ -43,7 +43,7 @@ in mkDerivation { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "For converting between different versions of .dwg and .dxf"; homepage = "https://www.opendesign.com/guestfiles/oda_file_converter"; license = licenses.unfree; diff --git a/pkgs/applications/graphics/openimageio/2.x.nix b/pkgs/applications/graphics/openimageio/2.x.nix index 89d49a151457..b200b9be8cd9 100644 --- a/pkgs/applications/graphics/openimageio/2.x.nix +++ b/pkgs/applications/graphics/openimageio/2.x.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , fetchpatch , boost @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { "-DCMAKE_INSTALL_LIBDIR=lib" # needs relative path for pkgconfig ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.openimageio.org"; description = "A library and tools for reading and writing images"; license = licenses.bsd3; diff --git a/pkgs/applications/graphics/openimageio/default.nix b/pkgs/applications/graphics/openimageio/default.nix index 1f2861e7109c..8bd82c783932 100644 --- a/pkgs/applications/graphics/openimageio/default.nix +++ b/pkgs/applications/graphics/openimageio/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, boost, cmake, ilmbase, libjpeg, libpng, libtiff +{ lib, stdenv, fetchFromGitHub, boost, cmake, ilmbase, libjpeg, libpng, libtiff , opencolorio, openexr, unzip }: @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { "dist_dir=" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.openimageio.org"; description = "A library and tools for reading and writing images"; license = licenses.bsd3; diff --git a/pkgs/applications/graphics/paraview/default.nix b/pkgs/applications/graphics/paraview/default.nix index d0c8d1c9ee94..6e4738dd07c1 100644 --- a/pkgs/applications/graphics/paraview/default.nix +++ b/pkgs/applications/graphics/paraview/default.nix @@ -1,6 +1,6 @@ { boost, cmake, fetchFromGitHub, ffmpeg, qtbase, qtx11extras, qttools, qtxmlpatterns, qtsvg, gdal, gfortran, libXt, makeWrapper, - mkDerivation, ninja, openmpi, python3, stdenv, tbb, libGLU, libGL }: + mkDerivation, ninja, openmpi, python3, lib, stdenv, tbb, libGLU, libGL }: mkDerivation rec { pname = "paraview"; @@ -81,7 +81,7 @@ mkDerivation rec { (python3.withPackages (ps: with ps; [ numpy matplotlib mpi4py ])) ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.paraview.org/"; description = "3D Data analysis and visualization application"; license = licenses.free; diff --git a/pkgs/applications/graphics/pbrt/default.nix b/pkgs/applications/graphics/pbrt/default.nix index fa3034cb3b07..9fdf92a4ae80 100644 --- a/pkgs/applications/graphics/pbrt/default.nix +++ b/pkgs/applications/graphics/pbrt/default.nix @@ -1,7 +1,6 @@ -{stdenv, fetchFromGitHub, flex, bison, cmake, git, zlib}: +{lib, stdenv, fetchFromGitHub, flex, bison, cmake, git, zlib}: stdenv.mkDerivation { - version = "2018-08-15"; pname = "pbrt-v3"; @@ -18,12 +17,13 @@ stdenv.mkDerivation { ./openexr-cmake-3.12.patch ]; - buildInputs = [ git flex bison cmake zlib ]; + nativeBuildInputs = [ flex bison cmake ]; + buildInputs = [ zlib ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://pbrt.org"; description = "The renderer described in the third edition of the book 'Physically Based Rendering: From Theory To Implementation'"; - platforms = platforms.linux ; + platforms = platforms.linux; license = licenses.bsd2; maintainers = [ maintainers.juliendehos ]; priority = 10; diff --git a/pkgs/applications/graphics/pdfcpu/default.nix b/pkgs/applications/graphics/pdfcpu/default.nix index 3f91fae0beb7..3a06c8e31f7d 100644 --- a/pkgs/applications/graphics/pdfcpu/default.nix +++ b/pkgs/applications/graphics/pdfcpu/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "pdfcpu"; @@ -18,7 +18,7 @@ buildGoModule rec { subPackages = [ "cmd/pdfcpu" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A PDF processor written in Go"; homepage = "https://pdfcpu.io"; license = licenses.asl20; diff --git a/pkgs/applications/graphics/pencil/default.nix b/pkgs/applications/graphics/pencil/default.nix index 19e8121ac08d..be3b07bf4cc7 100644 --- a/pkgs/applications/graphics/pencil/default.nix +++ b/pkgs/applications/graphics/pencil/default.nix @@ -96,7 +96,7 @@ in stdenv.mkDerivation rec { --prefix LD_LIBRARY_PATH : $out/opt/pencil ''; - meta = with stdenv.lib; { + meta = with lib; { description = "GUI prototyping/mockup tool"; homepage = "https://pencil.evolus.vn/"; license = licenses.gpl2; # Commercial license is also available diff --git a/pkgs/applications/graphics/photivo/default.nix b/pkgs/applications/graphics/photivo/default.nix index 09b5bd378397..b44130c47ae1 100644 --- a/pkgs/applications/graphics/photivo/default.nix +++ b/pkgs/applications/graphics/photivo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchhg, fetchpatch, cmake, qt4, fftw, graphicsmagick_q16, +{ lib, stdenv, fetchhg, fetchpatch, cmake, qt4, fftw, graphicsmagick_q16, lcms2, lensfun, pkgconfig, libjpeg, exiv2, liblqr1 }: stdenv.mkDerivation { @@ -32,9 +32,7 @@ stdenv.mkDerivation { buildInputs = [ qt4 fftw graphicsmagick_q16 lcms2 lensfun libjpeg exiv2 liblqr1 ]; - enableParallelBuilding = true; - - meta = with stdenv.lib; { + meta = with lib; { platforms = platforms.linux; license = licenses.gpl3; broken = true; # exiv2 0.27.1 FTBFS diff --git a/pkgs/applications/graphics/photoflare/default.nix b/pkgs/applications/graphics/photoflare/default.nix index f619d79c0f55..ca2455dd048c 100644 --- a/pkgs/applications/graphics/photoflare/default.nix +++ b/pkgs/applications/graphics/photoflare/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, stdenv, graphicsmagick, fetchFromGitHub, qmake, qtbase, qttools +{ mkDerivation, lib, stdenv, graphicsmagick, fetchFromGitHub, qmake, qtbase, qttools }: mkDerivation rec { @@ -21,7 +21,7 @@ mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A cross-platform image editor with a powerful features and a very friendly graphical user interface"; homepage = "https://photoflare.io"; maintainers = [ maintainers.omgbebebe ]; diff --git a/pkgs/applications/graphics/photoflow/default.nix b/pkgs/applications/graphics/photoflow/default.nix index cb8ef65b2e9e..436d6764c75f 100644 --- a/pkgs/applications/graphics/photoflow/default.nix +++ b/pkgs/applications/graphics/photoflow/default.nix @@ -22,7 +22,7 @@ , pcre , pkgconfig , pugixml -, stdenv +, lib, stdenv , swig , vips }: @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { "-DBUNDLED_GEXIV2=OFF" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A fully non-destructive photo retouching program providing a complete RAW image editing workflow"; homepage = "https://aferrero2707.github.io/PhotoFlow/"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/graphics/photoqt/default.nix b/pkgs/applications/graphics/photoqt/default.nix index 71c63bc82aa2..4f470b014afe 100644 --- a/pkgs/applications/graphics/photoqt/default.nix +++ b/pkgs/applications/graphics/photoqt/default.nix @@ -37,8 +37,6 @@ mkDerivation rec { export MAGICK_LOCATION="${graphicsmagick}/include/GraphicsMagick" ''; - enableParallelBuilding = true; - meta = { homepage = "https://photoqt.org/"; description = "Simple, yet powerful and good looking image viewer"; diff --git a/pkgs/applications/graphics/phototonic/default.nix b/pkgs/applications/graphics/phototonic/default.nix index 7020bf6c83e6..21960358a7bd 100644 --- a/pkgs/applications/graphics/phototonic/default.nix +++ b/pkgs/applications/graphics/phototonic/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, stdenv, fetchFromGitHub, qtbase, qmake, exiv2 }: +{ mkDerivation, lib, stdenv, fetchFromGitHub, qtbase, qmake, exiv2 }: mkDerivation rec { pname = "phototonic"; @@ -18,7 +18,7 @@ mkDerivation rec { sed -i 's;/usr;$$PREFIX/;g' phototonic.pro ''; - meta = with stdenv.lib; { + meta = with lib; { description = "An image viewer and organizer"; homepage = "https://sourceforge.net/projects/phototonic/"; license = licenses.gpl3; diff --git a/pkgs/applications/graphics/pick-colour-picker/default.nix b/pkgs/applications/graphics/pick-colour-picker/default.nix index e34d5a87a478..d4788b3c1e76 100644 --- a/pkgs/applications/graphics/pick-colour-picker/default.nix +++ b/pkgs/applications/graphics/pick-colour-picker/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , buildPythonPackage , pygobject3 @@ -50,7 +50,7 @@ buildPythonPackage rec { sed "s|os.environ.get('SNAP'), \"usr\"|'$out'|g" -i "$pickLoc/__main__.py" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://kryogenix.org/code/pick/"; license = licenses.mit; platforms = platforms.linux; diff --git a/pkgs/applications/graphics/potrace/default.nix b/pkgs/applications/graphics/potrace/default.nix index dd8e84349fad..9392f27c1713 100644 --- a/pkgs/applications/graphics/potrace/default.nix +++ b/pkgs/applications/graphics/potrace/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, zlib }: +{ lib, stdenv, fetchurl, zlib }: stdenv.mkDerivation rec { pname = "potrace"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://potrace.sourceforge.net/"; description = "A tool for tracing a bitmap, which means, transforming a bitmap into a smooth, scalable image"; platforms = platforms.unix; diff --git a/pkgs/applications/graphics/pqiv/default.nix b/pkgs/applications/graphics/pqiv/default.nix index 96efc091ef2b..969a3bcb9d14 100644 --- a/pkgs/applications/graphics/pqiv/default.nix +++ b/pkgs/applications/graphics/pqiv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig +{ lib, stdenv, fetchFromGitHub, pkgconfig , ffmpeg_3, gtk3, imagemagick, libarchive, libspectre, libwebp, poppler }: @@ -18,7 +18,7 @@ stdenv.mkDerivation (rec { prePatch = "patchShebangs ."; - meta = with stdenv.lib; { + meta = with lib; { description = "Powerful image viewer with minimal UI"; homepage = "http://www.pberndt.com/Programme/Linux/pqiv"; license = licenses.gpl3; diff --git a/pkgs/applications/graphics/processing/default.nix b/pkgs/applications/graphics/processing/default.nix index de5ae4fcbfd3..434f9fab88df 100644 --- a/pkgs/applications/graphics/processing/default.nix +++ b/pkgs/applications/graphics/processing/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchurl, xmlstarlet, makeWrapper, ant, jdk, rsync, javaPackages, libXxf86vm, gsettings-desktop-schemas }: +{ lib, stdenv, fetchFromGitHub, fetchurl, xmlstarlet, makeWrapper, ant, jdk, rsync, javaPackages, libXxf86vm, gsettings-desktop-schemas }: stdenv.mkDerivation rec { pname = "processing"; @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { --prefix LD_LIBRARY_PATH : ${libXxf86vm}/lib ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A language and IDE for electronic arts"; homepage = "https://processing.org"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/graphics/qcomicbook/default.nix b/pkgs/applications/graphics/qcomicbook/default.nix index f9dc494b4b35..65ecaa90784d 100644 --- a/pkgs/applications/graphics/qcomicbook/default.nix +++ b/pkgs/applications/graphics/qcomicbook/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, stdenv, fetchFromGitHub, pkgconfig, cmake, qtbase, qttools, qtx11extras, poppler }: +{ mkDerivation, lib, stdenv, fetchFromGitHub, pkgconfig, cmake, qtbase, qttools, qtx11extras, poppler }: mkDerivation rec { pname = "qcomicbook"; @@ -24,7 +24,7 @@ mkDerivation rec { --replace "Exec=qcomicbook" "Exec=$out/bin/qcomicbook" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/stolowski/QComicBook"; description = "Comic book reader in Qt5"; license = licenses.gpl2; diff --git a/pkgs/applications/graphics/qiv/default.nix b/pkgs/applications/graphics/qiv/default.nix index d3dd917d7b7d..e0426de6fb62 100644 --- a/pkgs/applications/graphics/qiv/default.nix +++ b/pkgs/applications/graphics/qiv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtk2, imlib2, file, lcms2, libexif } : +{ lib, stdenv, fetchurl, pkgconfig, gtk2, imlib2, file, lcms2, libexif } : stdenv.mkDerivation (rec { version = "2.3.2"; @@ -18,7 +18,7 @@ stdenv.mkDerivation (rec { substituteInPlace Makefile --replace /share/share/ /share/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Quick image viewer"; homepage = "http://spiegl.de/qiv/"; inherit version; diff --git a/pkgs/applications/graphics/qscreenshot/default.nix b/pkgs/applications/graphics/qscreenshot/default.nix index 1653ea927206..635da088e560 100644 --- a/pkgs/applications/graphics/qscreenshot/default.nix +++ b/pkgs/applications/graphics/qscreenshot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, dos2unix, which, qt, Carbon }: +{ lib, stdenv, fetchurl, dos2unix, which, qt, Carbon }: stdenv.mkDerivation rec { name = "qscreenshot-1.0"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sed -i "s|lrelease-qt4|lrelease|" src/src.pro ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Simple creation and editing of screenshots"; homepage = "https://sourceforge.net/projects/qscreenshot/"; license = licenses.gpl2; diff --git a/pkgs/applications/graphics/rapcad/default.nix b/pkgs/applications/graphics/rapcad/default.nix index 7e9547c1067c..e86436cd06f2 100644 --- a/pkgs/applications/graphics/rapcad/default.nix +++ b/pkgs/applications/graphics/rapcad/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchurl, cgal, boost, gmp, mpfr, flex, bison, dxflib, readline +{ lib, stdenv, fetchFromGitHub, fetchurl, cgal, boost, gmp, mpfr, flex, bison, dxflib, readline , qtbase, qmake, libGLU }: @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ qmake ]; buildInputs = [ qtbase cgal boost gmp mpfr flex bison dxflib readline libGLU ]; - meta = with stdenv.lib; { + meta = with lib; { license = licenses.gpl3; maintainers = [ maintainers.raskin ]; platforms = platforms.linux; diff --git a/pkgs/applications/graphics/rapid-photo-downloader/default.nix b/pkgs/applications/graphics/rapid-photo-downloader/default.nix index aa6db0accdba..73341cf2ea05 100644 --- a/pkgs/applications/graphics/rapid-photo-downloader/default.nix +++ b/pkgs/applications/graphics/rapid-photo-downloader/default.nix @@ -1,4 +1,4 @@ -{ stdenv, mkDerivationWith, fetchurl, python3Packages +{ lib, stdenv, mkDerivationWith, fetchurl, python3Packages , file, intltool, gobject-introspection, libgudev , udisks, gexiv2, gst_all_1, libnotify , exiftool, gdk-pixbuf, libmediainfo, vmtouch @@ -78,7 +78,7 @@ mkDerivationWith python3Packages.buildPythonApplication rec { ) ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Photo and video importer for cameras, phones, and memory cards"; homepage = "https://www.damonlynch.net/rapid/"; license = licenses.gpl3; diff --git a/pkgs/applications/graphics/rawtherapee/default.nix b/pkgs/applications/graphics/rawtherapee/default.nix index 4371bc5838ed..14a46bbfcc87 100644 --- a/pkgs/applications/graphics/rawtherapee/default.nix +++ b/pkgs/applications/graphics/rawtherapee/default.nix @@ -32,8 +32,6 @@ stdenv.mkDerivation rec { echo "set(HG_VERSION $version)" > $sourceRoot/ReleaseInfo.cmake ''; - enableParallelBuilding = true; - meta = { description = "RAW converter and digital photo processing software"; homepage = "http://www.rawtherapee.com/"; diff --git a/pkgs/applications/graphics/renderdoc/default.nix b/pkgs/applications/graphics/renderdoc/default.nix index c1255c016f4f..f9e3662f1b80 100644 --- a/pkgs/applications/graphics/renderdoc/default.nix +++ b/pkgs/applications/graphics/renderdoc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, mkDerivation +{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, mkDerivation , qtbase, qtx11extras, qtsvg, makeWrapper , vulkan-loader, libglvnd, xorg, python3, python3Packages , bison, pcre, automake, autoconf, addOpenGLRunpath @@ -61,9 +61,7 @@ mkDerivation rec { addOpenGLRunpath $out/lib/librenderdoc.so ''; - enableParallelBuilding = true; - - meta = with stdenv.lib; { + meta = with lib; { description = "A single-frame graphics debugger"; homepage = "https://renderdoc.org/"; license = licenses.mit; diff --git a/pkgs/applications/graphics/sane/backends/brscan4/default.nix b/pkgs/applications/graphics/sane/backends/brscan4/default.nix index 2ada41ac98a1..4ad5c24ddd68 100644 --- a/pkgs/applications/graphics/sane/backends/brscan4/default.nix +++ b/pkgs/applications/graphics/sane/backends/brscan4/default.nix @@ -11,7 +11,7 @@ let in stdenv.mkDerivation rec { name = "brscan4-0.4.8-1"; - src = + src = if stdenv.hostPlatform.system == "i686-linux" then fetchurl { url = "http://download.brother.com/welcome/dlf006646/${name}.i386.deb"; diff --git a/pkgs/applications/graphics/sane/backends/generic.nix b/pkgs/applications/graphics/sane/backends/generic.nix index d3e8b417017d..cef48daca11a 100644 --- a/pkgs/applications/graphics/sane/backends/generic.nix +++ b/pkgs/applications/graphics/sane/backends/generic.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , gettext, pkgconfig , avahi, libgphoto2, libieee1284, libjpeg, libpng, libtiff, libusb1, libv4l, net-snmp @@ -77,7 +77,7 @@ stdenv.mkDerivation { rm -f $out/etc/sane.d/net.conf '' + stdenv.lib.concatStrings (builtins.map installFirmware compatFirmware); - meta = with stdenv.lib; { + meta = with lib; { description = "SANE (Scanner Access Now Easy) backends"; longDescription = '' Collection of open-source SANE backends (device drivers). diff --git a/pkgs/applications/graphics/sane/frontends.nix b/pkgs/applications/graphics/sane/frontends.nix index 885dff311b8f..86a1f201f826 100644 --- a/pkgs/applications/graphics/sane/frontends.nix +++ b/pkgs/applications/graphics/sane/frontends.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, sane-backends, libX11, gtk2, pkgconfig, libusb-compat-0_1 ? null }: +{ lib, stdenv, fetchurl, sane-backends, libX11, gtk2, pkgconfig, libusb-compat-0_1 ? null }: stdenv.mkDerivation rec { pname = "sane-frontends"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Scanner Access Now Easy"; homepage = "http://www.sane-project.org/"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/graphics/scantailor/advanced.nix b/pkgs/applications/graphics/scantailor/advanced.nix index e4598193469b..361f1fa18094 100644 --- a/pkgs/applications/graphics/scantailor/advanced.nix +++ b/pkgs/applications/graphics/scantailor/advanced.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, mkDerivation +{ lib, stdenv, fetchFromGitHub, mkDerivation , cmake, libjpeg, libpng, libtiff, boost , qtbase, qttools }: @@ -16,7 +16,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake qttools ]; buildInputs = [ libjpeg libpng libtiff boost qtbase ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/4lex4/scantailor-advanced"; description = "Interactive post-processing tool for scanned pages"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/graphics/scantailor/default.nix b/pkgs/applications/graphics/scantailor/default.nix index bc54f3aa627a..5e05072f7b58 100644 --- a/pkgs/applications/graphics/scantailor/default.nix +++ b/pkgs/applications/graphics/scantailor/default.nix @@ -8,9 +8,8 @@ stdenv.mkDerivation { sha256 = "1pjx3a6hs16az6rki59bchy3biy7jndjx8r125q01aq7lbf5npgg"; }; - buildInputs = [ qt4 cmake libjpeg libtiff boost ]; - - enableParallelBuilding = true; + nativeBuildInputs = [ cmake ]; + buildInputs = [ qt4 libjpeg libtiff boost ]; meta = { homepage = "http://scantailor.org/"; diff --git a/pkgs/applications/graphics/screencloud/default.nix b/pkgs/applications/graphics/screencloud/default.nix index 11e37c4bf649..f5478f684fe6 100644 --- a/pkgs/applications/graphics/screencloud/default.nix +++ b/pkgs/applications/graphics/screencloud/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { # for tracking usage. consumerKey = "23e747012c68601f27ab69c6de129ed70552d55b6"; consumerSecret = "4701cb00c1bd357bbcae7c3d713dd216"; - + src = fetchFromGitHub { owner = "olav-st"; repo = "screencloud"; @@ -17,7 +17,8 @@ stdenv.mkDerivation rec { sha256 = "1s0dxa1sa37nvna5nfqdsp294810favj68qb7ghl78qna7zw0cim"; }; - buildInputs = [ cmake qt4 quazip qt-mobility qxt pythonPackages.python pythonPackages.pycrypto ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ qt4 quazip qt-mobility qxt pythonPackages.python pythonPackages.pycrypto ]; patchPhase = '' # Required to make the configure script work. Normally, screencloud's @@ -28,8 +29,6 @@ stdenv.mkDerivation rec { substituteInPlace "CMakeLists.txt" --replace "set(CMAKE_INSTALL_PREFIX \"/opt\")" "" ''; - enableParallelBuilding = true; - # We need to append /opt to our CMAKE_INSTALL_PREFIX, so we tell the Nix not # to add the argument for us. dontAddPrefix = true; diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix index c041d2dde8cc..992a7f787994 100644 --- a/pkgs/applications/graphics/shotwell/default.nix +++ b/pkgs/applications/graphics/shotwell/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , meson , ninja @@ -100,7 +100,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Popular photo organizer for the GNOME desktop"; homepage = "https://wiki.gnome.org/Apps/Shotwell"; license = licenses.lgpl21Plus; diff --git a/pkgs/applications/graphics/shutter/default.nix b/pkgs/applications/graphics/shutter/default.nix index cddc99eebe29..2d2e332977f0 100644 --- a/pkgs/applications/graphics/shutter/default.nix +++ b/pkgs/applications/graphics/shutter/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perlPackages, makeWrapper, imagemagick, gdk-pixbuf, librsvg +{ lib, stdenv, fetchurl, perlPackages, makeWrapper, imagemagick, gdk-pixbuf, librsvg , hicolor-icon-theme, procps }: @@ -36,7 +36,7 @@ stdenv.mkDerivation { --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Screenshot and annotation tool"; homepage = "https://shutter-project.org/"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/graphics/smartdeblur/default.nix b/pkgs/applications/graphics/smartdeblur/default.nix index 0df161cd4731..d9877afad86f 100644 --- a/pkgs/applications/graphics/smartdeblur/default.nix +++ b/pkgs/applications/graphics/smartdeblur/default.nix @@ -16,9 +16,8 @@ stdenv.mkDerivation rec { cd src ''; - enableParallelBuilding = true; - - buildInputs = [ cmake qt4 fftw ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ qt4 fftw ]; cmakeFlags = [ "-DUSE_SYSTEM_FFTW=ON" ]; diff --git a/pkgs/applications/graphics/solvespace/default.nix b/pkgs/applications/graphics/solvespace/default.nix index bd084b4287dc..26b544cf1c5d 100644 --- a/pkgs/applications/graphics/solvespace/default.nix +++ b/pkgs/applications/graphics/solvespace/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, cmake, pkgconfig, zlib, libpng, cairo, freetype +{ lib, stdenv, fetchgit, cmake, pkgconfig, zlib, libpng, cairo, freetype , json_c, fontconfig, gtkmm3, pangomm, glew, libGLU, xorg, pcre , wrapGAppsHook }: @@ -20,7 +20,6 @@ stdenv.mkDerivation rec { json_c fontconfig gtkmm3 pangomm glew libGLU xorg.libpthreadstubs xorg.libXdmcp pcre ]; - enableParallelBuilding = true; preConfigure = '' patch CMakeLists.txt < gimp != null; - -stdenv.mkDerivation { - pname = "ufraw"; - version = "unstable-2019-06-12"; - - # The original ufraw repo is unmaintained and broken; - # this is a fork that collects patches - src = fetchFromGitHub { - owner = "sergiomb2"; - repo = "ufraw"; - rev = "c65b4237dcb430fb274e4778afaf5df9a18e04e6"; - sha256 = "02icn67bsinvgliy62qa6v7gmwgp2sh15jvm8iiz3c7g1h74f0b7"; - }; - - outputs = [ "out" ] ++ stdenv.lib.optional withGimpPlugin "gimpPlugin"; - - nativeBuildInputs = [ autoconf automake autoreconfHook gettext perl pkgconfig ]; - - buildInputs = [ - bzip2 - cfitsio - exiv2 - gtk2 - gtkimageview - lcms2 - lensfun - libjpeg - libtiff - zlib - ] ++ stdenv.lib.optional withGimpPlugin gimp; - - configureFlags = [ - "--enable-contrast" - "--enable-dst-correction" - ] ++ stdenv.lib.optional withGimpPlugin "--with-gimp"; - - postInstall = stdenv.lib.optionalString withGimpPlugin '' - moveToOutput "lib/gimp" "$gimpPlugin" - ''; - - meta = with stdenv.lib; { - homepage = "https://github.com/sergiomb2/ufraw"; - - broken = true; # https://github.com/NixOS/nixpkgs/issues/97946 - - description = "Utility to read and manipulate raw images from digital cameras"; - - longDescription = - '' The Unidentified Flying Raw (UFRaw) is a utility to read and - manipulate raw images from digital cameras. It can be used on its - own or as a Gimp plug-in. It reads raw images using Dave Coffin's - raw conversion utility - DCRaw. UFRaw supports color management - workflow based on Little CMS, allowing the user to apply ICC color - profiles. For Nikon users UFRaw has the advantage that it can read - the camera's tone curves. - ''; - - license = licenses.gpl2Plus; - - maintainers = with maintainers; [ gloaming ]; - platforms = with platforms; all; - }; -} diff --git a/pkgs/applications/graphics/viewnior/default.nix b/pkgs/applications/graphics/viewnior/default.nix index 1addb2d7bd56..9718dee45dd8 100644 --- a/pkgs/applications/graphics/viewnior/default.nix +++ b/pkgs/applications/graphics/viewnior/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, desktop-file-utils, gtk2, libpng, exiv2, lcms +{ lib, stdenv, fetchFromGitHub, meson, ninja, pkgconfig, desktop-file-utils, gtk2, libpng, exiv2, lcms , intltool, gettext, shared-mime-info, glib, gdk-pixbuf, perl}: stdenv.mkDerivation rec { @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { perl ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Fast and simple image viewer"; longDescription = '' Viewnior is insipred by big projects like Eye of Gnome, because of it's diff --git a/pkgs/applications/graphics/write_stylus/default.nix b/pkgs/applications/graphics/write_stylus/default.nix index 3c2ad8f4fab0..d03c29a58ece 100644 --- a/pkgs/applications/graphics/write_stylus/default.nix +++ b/pkgs/applications/graphics/write_stylus/default.nix @@ -51,7 +51,7 @@ mkDerivation rec { $out/Write/Write ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.styluslabs.com/"; description = "Write is a word processor for handwriting"; platforms = platforms.linux; diff --git a/pkgs/applications/graphics/xfig/default.nix b/pkgs/applications/graphics/xfig/default.nix index fe5a13703329..3f35880b3f22 100644 --- a/pkgs/applications/graphics/xfig/default.nix +++ b/pkgs/applications/graphics/xfig/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, xlibsWrapper, makeWrapper, libXpm +{ lib, stdenv, fetchurl, xlibsWrapper, makeWrapper, libXpm , libXmu, libXi, libXp, Xaw3d, fig2dev }: @@ -32,7 +32,7 @@ in stdenv.mkDerivation { buildInputs = [ xlibsWrapper libXpm libXmu libXi libXp Xaw3d ]; - meta = with stdenv.lib; { + meta = with lib; { description = "An interactive drawing tool for X11"; longDescription = '' Note that you need to have the netpbm tools diff --git a/pkgs/applications/graphics/xlife/default.nix b/pkgs/applications/graphics/xlife/default.nix index cc7013739985..482134269d2b 100644 --- a/pkgs/applications/graphics/xlife/default.nix +++ b/pkgs/applications/graphics/xlife/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchsvn, xorg }: +{ lib, stdenv, fetchsvn, xorg }: stdenv.mkDerivation { pname = "xlife"; @@ -19,7 +19,7 @@ stdenv.mkDerivation { install -Dm755 lifeconv -t $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://litwr2.atspace.eu/xlife.php"; description = "Conway's Game of Life and other cellular automata, for X"; license = licenses.hpndSellVariant; diff --git a/pkgs/applications/graphics/xournal/default.nix b/pkgs/applications/graphics/xournal/default.nix index 8a5d9c3597b8..066e6cf2fb13 100644 --- a/pkgs/applications/graphics/xournal/default.nix +++ b/pkgs/applications/graphics/xournal/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeDesktopItem +{ lib, stdenv, fetchurl, makeDesktopItem , ghostscript, atk, gtk2, glib, fontconfig, freetype , libgnomecanvas, libgnomeprint, libgnomeprintui , pango, libX11, xorgproto, zlib, poppler @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { cp $out/share/xournal/pixmaps/xournal.png $out/share/icons ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://xournal.sourceforge.net/"; description = "Note-taking application (supposes stylus)"; maintainers = [ maintainers.guibert ]; diff --git a/pkgs/applications/graphics/xournalpp/default.nix b/pkgs/applications/graphics/xournalpp/default.nix index c21d0ed20545..c6aa330329c2 100644 --- a/pkgs/applications/graphics/xournalpp/default.nix +++ b/pkgs/applications/graphics/xournalpp/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , cmake @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Xournal++ is a handwriting Notetaking software with PDF annotation support"; homepage = "https://xournalpp.github.io/"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/graphics/xrgears/default.nix b/pkgs/applications/graphics/xrgears/default.nix new file mode 100644 index 000000000000..20e01a1701da --- /dev/null +++ b/pkgs/applications/graphics/xrgears/default.nix @@ -0,0 +1,48 @@ +{ lib, stdenv +, fetchFromGitLab +, glm +, glslang +, meson +, ninja +, openxr-loader +, pkg-config +, vulkan-headers +, vulkan-loader +, xxd +}: + +stdenv.mkDerivation rec { + pname = "xrgears"; + version = "unstable-2020-04-15"; + + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "monado"; + repo = "demos/xrgears"; + rev = "d0bee35fbf8f181e8313f1ead13d88c4fb85c154"; + sha256 = "1k0k8dkclyiav99kf0933kyd2ymz3hs1p0ap2wbciq9s62jgz29i"; + }; + + nativeBuildInputs = [ + glslang + meson + ninja + pkg-config + xxd + ]; + + buildInputs = [ + glm + openxr-loader + vulkan-headers + vulkan-loader + ]; + + meta = with lib; { + homepage = "https://gitlab.freedesktop.org/monado/demos/xrgears"; + description = "An OpenXR example using Vulkan for rendering"; + platforms = platforms.linux; + license = licenses.mit; + maintainers = with maintainers; [ expipiplus1 ]; + }; +} diff --git a/pkgs/applications/graphics/xzgv/default.nix b/pkgs/applications/graphics/xzgv/default.nix index 67f43faf99a3..d2c569b91c68 100644 --- a/pkgs/applications/graphics/xzgv/default.nix +++ b/pkgs/applications/graphics/xzgv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gtk2, libexif, pkgconfig, texinfo }: +{ lib, stdenv, fetchurl, gtk2, libexif, pkgconfig, texinfo }: stdenv.mkDerivation rec { pname = "xzgv"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { preInstall = '' mkdir -p $out/share/{app-install/desktop,applications,info,pixmaps} ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://sourceforge.net/projects/xzgv/"; description = "Picture viewer for X with a thumbnail-based selector"; license = licenses.gpl2; diff --git a/pkgs/applications/graphics/yed/default.nix b/pkgs/applications/graphics/yed/default.nix index d7c83704dca4..8a498fbe7ea3 100644 --- a/pkgs/applications/graphics/yed/default.nix +++ b/pkgs/applications/graphics/yed/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, makeWrapper, unzip, jre, wrapGAppsHook }: +{ lib, stdenv, fetchzip, makeWrapper, unzip, jre, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "yEd"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ''; dontWrapGApps = true; - meta = with stdenv.lib; { + meta = with lib; { license = licenses.unfree; homepage = "https://www.yworks.com/products/yed"; description = "A powerful desktop application that can be used to quickly and effectively generate high-quality diagrams"; diff --git a/pkgs/applications/graphics/zgv/default.nix b/pkgs/applications/graphics/zgv/default.nix index 6cc59a7e60bd..435f4ccaf6db 100644 --- a/pkgs/applications/graphics/zgv/default.nix +++ b/pkgs/applications/graphics/zgv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, SDL, SDL_image, libjpeg, libpng, libtiff }: +{ lib, stdenv, fetchurl, fetchpatch, pkgconfig, SDL, SDL_image, libjpeg, libpng, libtiff }: stdenv.mkDerivation rec { pname = "zgv"; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { cp src/zgv $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.svgalib.org/rus/zgv/"; description = "Picture viewer with a thumbnail-based selector"; license = licenses.gpl2; diff --git a/pkgs/applications/kde/akonadi-calendar.nix b/pkgs/applications/kde/akonadi-calendar.nix index 121e93d3f5c0..474672dfd7d9 100644 --- a/pkgs/applications/kde/akonadi-calendar.nix +++ b/pkgs/applications/kde/akonadi-calendar.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "akonadi-calendar"; + pname = "akonadi-calendar"; meta = { license = with lib.licenses; [ gpl2 lgpl21 ]; maintainers = kdepimTeam; diff --git a/pkgs/applications/kde/akonadi-contacts.nix b/pkgs/applications/kde/akonadi-contacts.nix index b09058b60be9..2076723a372b 100644 --- a/pkgs/applications/kde/akonadi-contacts.nix +++ b/pkgs/applications/kde/akonadi-contacts.nix @@ -8,7 +8,7 @@ }: mkDerivation { - name = "akonadi-contacts"; + pname = "akonadi-contacts"; meta = { license = with lib.licenses; [ gpl2 lgpl21 ]; maintainers = kdepimTeam; diff --git a/pkgs/applications/kde/akonadi-import-wizard.nix b/pkgs/applications/kde/akonadi-import-wizard.nix index cc1acbc6dd05..26b373fb3301 100644 --- a/pkgs/applications/kde/akonadi-import-wizard.nix +++ b/pkgs/applications/kde/akonadi-import-wizard.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "akonadi-import-wizard"; + pname = "akonadi-import-wizard"; meta = { license = with lib.licenses; [ gpl2Plus lgpl21Plus fdl12 ]; maintainers = kdepimTeam; diff --git a/pkgs/applications/kde/akonadi-mime.nix b/pkgs/applications/kde/akonadi-mime.nix index 0ed958b4e770..fbd028b1ec28 100644 --- a/pkgs/applications/kde/akonadi-mime.nix +++ b/pkgs/applications/kde/akonadi-mime.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "akonadi-mime"; + pname = "akonadi-mime"; meta = { license = with lib.licenses; [ gpl2 lgpl21 ]; maintainers = kdepimTeam; diff --git a/pkgs/applications/kde/akonadi-notes.nix b/pkgs/applications/kde/akonadi-notes.nix index 72c4d799239c..6db7e00be9b0 100644 --- a/pkgs/applications/kde/akonadi-notes.nix +++ b/pkgs/applications/kde/akonadi-notes.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "akonadi-notes"; + pname = "akonadi-notes"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; diff --git a/pkgs/applications/kde/akonadi-search.nix b/pkgs/applications/kde/akonadi-search.nix index 23ee6b1b9cc4..495b63abd443 100644 --- a/pkgs/applications/kde/akonadi-search.nix +++ b/pkgs/applications/kde/akonadi-search.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "akonadi-search"; + pname = "akonadi-search"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; diff --git a/pkgs/applications/kde/akonadi/default.nix b/pkgs/applications/kde/akonadi/default.nix index 6ffe1e2de8aa..d24e19f89e7e 100644 --- a/pkgs/applications/kde/akonadi/default.nix +++ b/pkgs/applications/kde/akonadi/default.nix @@ -1,12 +1,13 @@ { mkDerivation, lib, kdepimTeam, - extra-cmake-modules, shared-mime-info, qtbase, - boost, kcompletion, kconfigwidgets, kcrash, kdbusaddons, kdesignerplugin, - ki18n, kiconthemes, kio, kitemmodels, kwindowsystem, mysql, qttools, + extra-cmake-modules, shared-mime-info, qtbase, accounts-qt, + boost, kaccounts-integration, kcompletion, kconfigwidgets, kcrash, kdbusaddons, + kdesignerplugin, ki18n, kiconthemes, kio, kitemmodels, kwindowsystem, mysql, qttools, + signond, }: mkDerivation { - name = "akonadi"; + pname = "akonadi"; meta = { license = [ lib.licenses.lgpl21 ]; maintainers = kdepimTeam; @@ -19,8 +20,8 @@ mkDerivation { ]; nativeBuildInputs = [ extra-cmake-modules shared-mime-info ]; buildInputs = [ - kcompletion kconfigwidgets kcrash kdbusaddons kdesignerplugin ki18n - kiconthemes kio kwindowsystem qttools + kaccounts-integration kcompletion kconfigwidgets kcrash kdbusaddons kdesignerplugin + ki18n kiconthemes kio kwindowsystem accounts-qt qttools signond ]; propagatedBuildInputs = [ boost kitemmodels ]; outputs = [ "out" "dev" ]; diff --git a/pkgs/applications/kde/akonadiconsole.nix b/pkgs/applications/kde/akonadiconsole.nix index a02400847bb4..76e5ca480b47 100644 --- a/pkgs/applications/kde/akonadiconsole.nix +++ b/pkgs/applications/kde/akonadiconsole.nix @@ -7,7 +7,7 @@ }: mkDerivation { - name = "akonadiconsole"; + pname = "akonadiconsole"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; diff --git a/pkgs/applications/kde/akregator.nix b/pkgs/applications/kde/akregator.nix index 98d53bc80838..5cacfe0c04f0 100644 --- a/pkgs/applications/kde/akregator.nix +++ b/pkgs/applications/kde/akregator.nix @@ -10,7 +10,7 @@ }: mkDerivation { - name = "akregator"; + pname = "akregator"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; diff --git a/pkgs/applications/kde/ark/default.nix b/pkgs/applications/kde/ark/default.nix index 76cc423f5460..69a56254d65b 100644 --- a/pkgs/applications/kde/ark/default.nix +++ b/pkgs/applications/kde/ark/default.nix @@ -20,7 +20,7 @@ let in mkDerivation { - name = "ark"; + pname = "ark"; meta = { description = "Graphical file compression/decompression utility"; license = with lib.licenses; diff --git a/pkgs/applications/kde/baloo-widgets.nix b/pkgs/applications/kde/baloo-widgets.nix index 3479b6600fc9..887e7ea29860 100644 --- a/pkgs/applications/kde/baloo-widgets.nix +++ b/pkgs/applications/kde/baloo-widgets.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "baloo-widgets"; + pname = "baloo-widgets"; meta = { license = [ lib.licenses.lgpl21 ]; maintainers = [ lib.maintainers.ttuegel ]; diff --git a/pkgs/applications/kde/bomber.nix b/pkgs/applications/kde/bomber.nix index f42a6a01871b..c2a5329ee2a3 100644 --- a/pkgs/applications/kde/bomber.nix +++ b/pkgs/applications/kde/bomber.nix @@ -4,7 +4,7 @@ }: mkDerivation { - name = "bomber"; + pname = "bomber"; meta = with lib; { homepage = "https://kde.org/applications/en/games/org.kde.bomber"; description = "A single player arcade game"; diff --git a/pkgs/applications/kde/bovo.nix b/pkgs/applications/kde/bovo.nix index 4bd3113a051f..989a80aa29f5 100644 --- a/pkgs/applications/kde/bovo.nix +++ b/pkgs/applications/kde/bovo.nix @@ -4,7 +4,7 @@ }: mkDerivation { - name = "bovo"; + pname = "bovo"; meta = with lib; { homepage = "https://kde.org/applications/en/games/org.kde.bovo"; description = "Five in a row application"; diff --git a/pkgs/applications/kde/calendarsupport.nix b/pkgs/applications/kde/calendarsupport.nix index 1537bd25d55e..b316ab4e5689 100644 --- a/pkgs/applications/kde/calendarsupport.nix +++ b/pkgs/applications/kde/calendarsupport.nix @@ -1,16 +1,23 @@ { - mkDerivation, lib, kdepimTeam, + mkDerivation, lib, kdepimTeam, fetchpatch, extra-cmake-modules, kdoctools, akonadi, akonadi-calendar, akonadi-mime, akonadi-notes, kcalutils, kdepim-apps-libs, kholidays, kidentitymanagement, kmime, pimcommon, qttools, }: mkDerivation { - name = "calendarsupport"; + pname = "calendarsupport"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; }; + patches = [ + # Patch for Qt 5.15.2 until version 20.12.0 + (fetchpatch { + url = "https://invent.kde.org/pim/calendarsupport/-/commit/b4193facb223bd5b73a65318dec8ced51b66adf7.patch"; + sha256 = "sha256:1da11rqbxxrl06ld3avc41p064arz4n6w5nxq8r008v8ws3s64dy"; + }) + ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ akonadi akonadi-mime akonadi-notes kcalutils kdepim-apps-libs kholidays pimcommon qttools diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index 1f0f7b5ace3f..33f392fdccc7 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -35,15 +35,13 @@ let mkDerivation = args: let - inherit (args) name; - sname = args.sname or name; - inherit (srcs.${sname}) src version; + inherit (args) pname; + inherit (srcs.${pname}) src version; mkDerivation = libsForQt5.callPackage ({ mkDerivation }: mkDerivation) {}; in mkDerivation (args // { - pname = name; - inherit src version; + inherit pname version src; outputs = args.outputs or [ "out" ]; @@ -88,6 +86,7 @@ let gwenview = callPackage ./gwenview.nix {}; incidenceeditor = callPackage ./incidenceeditor.nix {}; k3b = callPackage ./k3b.nix {}; + kaccounts-integration = callPackage ./kaccounts-integration.nix {}; kaddressbook = callPackage ./kaddressbook.nix {}; kalarm = callPackage ./kalarm.nix {}; kalarmcal = callPackage ./kalarmcal.nix {}; diff --git a/pkgs/applications/kde/dolphin-plugins.nix b/pkgs/applications/kde/dolphin-plugins.nix index 5580952f40a0..37613f86a7f7 100644 --- a/pkgs/applications/kde/dolphin-plugins.nix +++ b/pkgs/applications/kde/dolphin-plugins.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "dolphin-plugins"; + pname = "dolphin-plugins"; meta = { license = [ lib.licenses.gpl2 ]; maintainers = [ lib.maintainers.ttuegel ]; diff --git a/pkgs/applications/kde/dolphin.nix b/pkgs/applications/kde/dolphin.nix index 76d4e989e8c3..3774c7e00b63 100644 --- a/pkgs/applications/kde/dolphin.nix +++ b/pkgs/applications/kde/dolphin.nix @@ -9,7 +9,7 @@ }: mkDerivation { - name = "dolphin"; + pname = "dolphin"; meta = { license = with lib.licenses; [ gpl2 fdl12 ]; maintainers = [ lib.maintainers.ttuegel ]; diff --git a/pkgs/applications/kde/dragon.nix b/pkgs/applications/kde/dragon.nix index 9dd55ec4b9c1..0ce6459e3f65 100644 --- a/pkgs/applications/kde/dragon.nix +++ b/pkgs/applications/kde/dragon.nix @@ -8,7 +8,7 @@ }: mkDerivation { - name = "dragon"; + pname = "dragon"; meta = { license = with lib.licenses; [ gpl2 fdl12 ]; description = "A simple media player for KDE"; diff --git a/pkgs/applications/kde/elisa.nix b/pkgs/applications/kde/elisa.nix index 5a77cfec2f5a..6252e53078f3 100644 --- a/pkgs/applications/kde/elisa.nix +++ b/pkgs/applications/kde/elisa.nix @@ -19,7 +19,7 @@ }: mkDerivation rec { - name = "elisa"; + pname = "elisa"; buildInputs = [ libvlc ]; diff --git a/pkgs/applications/kde/eventviews.nix b/pkgs/applications/kde/eventviews.nix index 495491f6d3c1..1a6cc9442b96 100644 --- a/pkgs/applications/kde/eventviews.nix +++ b/pkgs/applications/kde/eventviews.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "eventviews"; + pname = "eventviews"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; diff --git a/pkgs/applications/kde/fetch.sh b/pkgs/applications/kde/fetch.sh index dc023c57a7e6..e3bba77f9728 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.08.2/src) +WGET_ARGS=( http://download.kde.org/stable/release-service/20.08.3/src -A '*.tar.xz' ) diff --git a/pkgs/applications/kde/ffmpegthumbs.nix b/pkgs/applications/kde/ffmpegthumbs.nix index 225efba3768a..2a8b82352b40 100644 --- a/pkgs/applications/kde/ffmpegthumbs.nix +++ b/pkgs/applications/kde/ffmpegthumbs.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "ffmpegthumbs"; + pname = "ffmpegthumbs"; meta = { license = with lib.licenses; [ gpl2 bsd3 ]; maintainers = [ lib.maintainers.ttuegel ]; diff --git a/pkgs/applications/kde/filelight.nix b/pkgs/applications/kde/filelight.nix index a3be5be7f0a2..1aeff531862f 100644 --- a/pkgs/applications/kde/filelight.nix +++ b/pkgs/applications/kde/filelight.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "filelight"; + pname = "filelight"; meta = { license = with lib.licenses; [ gpl2 ]; maintainers = with lib.maintainers; [ fridh vcunat ]; diff --git a/pkgs/applications/kde/granatier.nix b/pkgs/applications/kde/granatier.nix index c02fa0fef2e7..b4aa2168e0d1 100644 --- a/pkgs/applications/kde/granatier.nix +++ b/pkgs/applications/kde/granatier.nix @@ -4,7 +4,7 @@ }: mkDerivation { - name = "granatier"; + pname = "granatier"; meta = with lib; { homepage = "https://kde.org/applications/en/games/org.kde.granatier"; description = "Clone of the classic Bomberman game"; diff --git a/pkgs/applications/kde/grantleetheme/default.nix b/pkgs/applications/kde/grantleetheme/default.nix index 92a0f1cde495..517cb072f74d 100644 --- a/pkgs/applications/kde/grantleetheme/default.nix +++ b/pkgs/applications/kde/grantleetheme/default.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "grantleetheme"; + pname = "grantleetheme"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; diff --git a/pkgs/applications/kde/gwenview.nix b/pkgs/applications/kde/gwenview.nix index 3d03d1dea3e7..0cd884d5401d 100644 --- a/pkgs/applications/kde/gwenview.nix +++ b/pkgs/applications/kde/gwenview.nix @@ -7,7 +7,7 @@ }: mkDerivation { - name = "gwenview"; + pname = "gwenview"; meta = { license = with lib.licenses; [ gpl2 fdl12 ]; maintainers = [ lib.maintainers.ttuegel ]; diff --git a/pkgs/applications/kde/incidenceeditor.nix b/pkgs/applications/kde/incidenceeditor.nix index 30955d1c2743..981c184d1515 100644 --- a/pkgs/applications/kde/incidenceeditor.nix +++ b/pkgs/applications/kde/incidenceeditor.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "incidenceeditor"; + pname = "incidenceeditor"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; diff --git a/pkgs/applications/kde/k3b.nix b/pkgs/applications/kde/k3b.nix index 35d55787ec78..cc9763961f85 100644 --- a/pkgs/applications/kde/k3b.nix +++ b/pkgs/applications/kde/k3b.nix @@ -8,7 +8,7 @@ }: mkDerivation { - name = "k3b"; + pname = "k3b"; meta = with lib; { license = with licenses; [ gpl2Plus ]; maintainers = with maintainers; [ sander phreedom ]; diff --git a/pkgs/applications/kde/kaccounts-integration.nix b/pkgs/applications/kde/kaccounts-integration.nix new file mode 100644 index 000000000000..ef69f564f128 --- /dev/null +++ b/pkgs/applications/kde/kaccounts-integration.nix @@ -0,0 +1,23 @@ +{ mkDerivation, lib, extra-cmake-modules, kdoctools, kcmutils, kcoreaddons, kwallet, accounts-qt, signond }: + +mkDerivation { + pname = "kaccounts-integration"; + meta = with lib; { + homepage = "https://community.kde.org/KTp/Setting_up_KAccounts"; + description = "Online accounts integration"; + maintainers = with maintainers; [ freezeboy ]; + license = licenses.gpl2Plus; + platforms = platforms.linux; + }; + nativeBuildInputs = [ + extra-cmake-modules + ]; + buildInputs = [ + kcmutils + kcoreaddons + kdoctools + kwallet + accounts-qt + signond + ]; +} diff --git a/pkgs/applications/kde/kaddressbook.nix b/pkgs/applications/kde/kaddressbook.nix index b4b0450e78bf..452c5142157d 100644 --- a/pkgs/applications/kde/kaddressbook.nix +++ b/pkgs/applications/kde/kaddressbook.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, kdepimTeam, + mkDerivation, lib, kdepimTeam, fetchpatch, extra-cmake-modules, kdoctools, akonadi, akonadi-search, grantlee, grantleetheme, kcmutils, kcompletion, kcrash, kdbusaddons, kdepim-apps-libs, ki18n, kontactinterface, kparts, @@ -8,11 +8,18 @@ }: mkDerivation { - name = "kaddressbook"; + pname = "kaddressbook"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; }; + patches = [ + # Patch for Qt 5.15.2 until version 20.12.0 + (fetchpatch { + url = "https://invent.kde.org/pim/kaddressbook/-/commit/8aee8d40ae2a1c920d3520163d550d3b49720226.patch"; + sha256 = "sha256:0dsy119cd5w9khiwgk6fb7xnjzmj94rfphf327k331lf15zq4853"; + }) + ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ akonadi akonadi-search grantlee grantleetheme kcmutils kcompletion kcrash diff --git a/pkgs/applications/kde/kalarm.nix b/pkgs/applications/kde/kalarm.nix index a1dec1179cc6..70ee3f741854 100644 --- a/pkgs/applications/kde/kalarm.nix +++ b/pkgs/applications/kde/kalarm.nix @@ -16,7 +16,7 @@ }: mkDerivation { - name = "kalarm"; + pname = "kalarm"; meta = { license = with lib.licenses; [ gpl2 ]; maintainers = [ lib.maintainers.rittelle ]; diff --git a/pkgs/applications/kde/kalarmcal.nix b/pkgs/applications/kde/kalarmcal.nix index 356c1e4812d6..5671174e9b1f 100644 --- a/pkgs/applications/kde/kalarmcal.nix +++ b/pkgs/applications/kde/kalarmcal.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "kalarmcal"; + pname = "kalarmcal"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; diff --git a/pkgs/applications/kde/kalzium.nix b/pkgs/applications/kde/kalzium.nix index cf579caa9cc8..3f51f068815b 100644 --- a/pkgs/applications/kde/kalzium.nix +++ b/pkgs/applications/kde/kalzium.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, openbabel, avogadro, qtscript, kparts, kplotting, kunitconversion }: mkDerivation { - name = "kalzium"; + pname = "kalzium"; meta = with lib; { homepage = "https://kde.org/applications/en/utilities/org.kde.kalzium"; description = "Program that shows you the Periodic Table of Elements"; diff --git a/pkgs/applications/kde/kapman.nix b/pkgs/applications/kde/kapman.nix index 5f4cc40138c0..01fa984e5933 100644 --- a/pkgs/applications/kde/kapman.nix +++ b/pkgs/applications/kde/kapman.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, libkdegames }: mkDerivation { - name = "kapman"; + pname = "kapman"; meta = with lib; { homepage = "https://kde.org/applications/en/games/org.kde.kapman"; description = "Clone of the well known game Pac-Man"; diff --git a/pkgs/applications/kde/kapptemplate.nix b/pkgs/applications/kde/kapptemplate.nix index a5e211318a26..7251648be09d 100644 --- a/pkgs/applications/kde/kapptemplate.nix +++ b/pkgs/applications/kde/kapptemplate.nix @@ -8,7 +8,7 @@ }: mkDerivation { - name = "kapptemplate"; + pname = "kapptemplate"; nativeBuildInputs = [ extra-cmake-modules cmake ]; diff --git a/pkgs/applications/kde/kate.nix b/pkgs/applications/kde/kate.nix index e0d0273efde1..1cc16496d121 100644 --- a/pkgs/applications/kde/kate.nix +++ b/pkgs/applications/kde/kate.nix @@ -8,7 +8,7 @@ }: mkDerivation { - name = "kate"; + pname = "kate"; meta = { license = with lib.licenses; [ gpl3 lgpl3 lgpl2 ]; maintainers = [ lib.maintainers.ttuegel ]; diff --git a/pkgs/applications/kde/katomic.nix b/pkgs/applications/kde/katomic.nix index 2690cfc05897..aa00d58c417e 100644 --- a/pkgs/applications/kde/katomic.nix +++ b/pkgs/applications/kde/katomic.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, libkdegames, knewstuff }: mkDerivation { - name = "katomic"; + pname = "katomic"; meta = with lib; { homepage = "https://kde.org/applications/en/games/org.kde.katomic"; description = "Fun educational game built around molecular geometry"; diff --git a/pkgs/applications/kde/kblackbox.nix b/pkgs/applications/kde/kblackbox.nix index ce0d8e36b91b..9f2f652f5586 100644 --- a/pkgs/applications/kde/kblackbox.nix +++ b/pkgs/applications/kde/kblackbox.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, libkdegames }: mkDerivation { - name = "kblackbox"; + pname = "kblackbox"; meta = with lib; { homepage = "https://kde.org/applications/en/games/org.kde.kblackbox"; description = "Game of hide and seek played on a grid of boxes"; diff --git a/pkgs/applications/kde/kblocks.nix b/pkgs/applications/kde/kblocks.nix index a11a6e257440..971901687f02 100644 --- a/pkgs/applications/kde/kblocks.nix +++ b/pkgs/applications/kde/kblocks.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, libkdegames }: mkDerivation { - name = "kblocks"; + pname = "kblocks"; meta = with lib; { homepage = "https://kde.org/applications/en/games/org.kde.kblocks"; description = "Classic falling blocks game"; diff --git a/pkgs/applications/kde/kbounce.nix b/pkgs/applications/kde/kbounce.nix index b67e3ce02173..d96c0f7f8273 100644 --- a/pkgs/applications/kde/kbounce.nix +++ b/pkgs/applications/kde/kbounce.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, extra-cmake-modules, libkdegames, kconfig, kcrash, kio, ki18n }: mkDerivation { - name = "kbounce"; + pname = "kbounce"; meta = with lib; { homepage = "https://kde.org/applications/en/games/org.kde.kbounce"; description = "Single player arcade game with the elements of puzzle"; diff --git a/pkgs/applications/kde/kbreakout.nix b/pkgs/applications/kde/kbreakout.nix index fbcddd46ca85..cf60ada3c00d 100644 --- a/pkgs/applications/kde/kbreakout.nix +++ b/pkgs/applications/kde/kbreakout.nix @@ -10,7 +10,7 @@ }: mkDerivation { - name = "kbreakout"; + pname = "kbreakout"; meta.license = with lib.licenses; [ lgpl21 gpl3 ]; outputs = [ "out" "dev" ]; nativeBuildInputs = [ diff --git a/pkgs/applications/kde/kcachegrind.nix b/pkgs/applications/kde/kcachegrind.nix index 16fc6c517774..308ed35dc4ed 100644 --- a/pkgs/applications/kde/kcachegrind.nix +++ b/pkgs/applications/kde/kcachegrind.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "kcachegrind"; + pname = "kcachegrind"; meta = { license = with lib.licenses; [ gpl2 ]; maintainers = with lib.maintainers; [ orivej ]; diff --git a/pkgs/applications/kde/kcalc.nix b/pkgs/applications/kde/kcalc.nix index 4e2a308b17f5..b24046df5f5f 100644 --- a/pkgs/applications/kde/kcalc.nix +++ b/pkgs/applications/kde/kcalc.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "kcalc"; + pname = "kcalc"; meta = { license = with lib.licenses; [ gpl2 ]; maintainers = [ lib.maintainers.fridh ]; diff --git a/pkgs/applications/kde/kcalutils.nix b/pkgs/applications/kde/kcalutils.nix index 2e389ec4ac7d..1fce68e7f464 100644 --- a/pkgs/applications/kde/kcalutils.nix +++ b/pkgs/applications/kde/kcalutils.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "kcalutils"; + pname = "kcalutils"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; diff --git a/pkgs/applications/kde/kcharselect.nix b/pkgs/applications/kde/kcharselect.nix index 4af712b1d5a5..d35ee5ee670c 100644 --- a/pkgs/applications/kde/kcharselect.nix +++ b/pkgs/applications/kde/kcharselect.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "kcharselect"; + pname = "kcharselect"; meta = { license = lib.licenses.gpl2Plus; maintainers = [ lib.maintainers.schmittlauch ]; diff --git a/pkgs/applications/kde/kcolorchooser.nix b/pkgs/applications/kde/kcolorchooser.nix index 45b32fbe832c..87ab22715615 100644 --- a/pkgs/applications/kde/kcolorchooser.nix +++ b/pkgs/applications/kde/kcolorchooser.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "kcolorchooser"; + pname = "kcolorchooser"; meta = { license = with lib.licenses; [ mit ]; maintainers = [ lib.maintainers.ttuegel ]; diff --git a/pkgs/applications/kde/kdebugsettings.nix b/pkgs/applications/kde/kdebugsettings.nix index a58e1b25a2ee..f4dd7ec145d0 100644 --- a/pkgs/applications/kde/kdebugsettings.nix +++ b/pkgs/applications/kde/kdebugsettings.nix @@ -7,7 +7,7 @@ }: mkDerivation { - name = "kdebugsettings"; + pname = "kdebugsettings"; meta = { license = with lib.licenses; [ gpl2 ]; maintainers = [ lib.maintainers.rittelle ]; diff --git a/pkgs/applications/kde/kdeconnect-kde.nix b/pkgs/applications/kde/kdeconnect-kde.nix index 83e54d1fa80c..8c7b2b635c09 100644 --- a/pkgs/applications/kde/kdeconnect-kde.nix +++ b/pkgs/applications/kde/kdeconnect-kde.nix @@ -26,15 +26,7 @@ }: mkDerivation { - name = "kdeconnect-kde"; - - patches = [ - # https://invent.kde.org/network/kdeconnect-kde/-/merge_requests/328 - (fetchpatch { - url = "https://invent.kde.org/network/kdeconnect-kde/-/commit/6101ef3ad07d865958d58a3d2736f5536f1c5719.diff"; - sha256 = "17mr7k13226vzcgxlmfs6q2mdc5j7vwp4iri9apmh6xlf6r591ac"; - }) - ]; + pname = "kdeconnect-kde"; buildInputs = [ kcmutils diff --git a/pkgs/applications/kde/kdegraphics-mobipocket.nix b/pkgs/applications/kde/kdegraphics-mobipocket.nix index e5f5b88ec440..bdfe5102c01a 100644 --- a/pkgs/applications/kde/kdegraphics-mobipocket.nix +++ b/pkgs/applications/kde/kdegraphics-mobipocket.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "kdegraphics-mobipocket"; + pname = "kdegraphics-mobipocket"; meta = { license = [ lib.licenses.gpl2Plus ]; maintainers = [ lib.maintainers.ttuegel ]; diff --git a/pkgs/applications/kde/kdegraphics-thumbnailers.nix b/pkgs/applications/kde/kdegraphics-thumbnailers.nix index 2e7887582f95..10280be3c30e 100644 --- a/pkgs/applications/kde/kdegraphics-thumbnailers.nix +++ b/pkgs/applications/kde/kdegraphics-thumbnailers.nix @@ -4,7 +4,7 @@ }: mkDerivation { - name = "kdegraphics-thumbnailers"; + pname = "kdegraphics-thumbnailers"; meta = { license = [ lib.licenses.lgpl21 ]; maintainers = [ lib.maintainers.ttuegel ]; diff --git a/pkgs/applications/kde/kdenetwork-filesharing.nix b/pkgs/applications/kde/kdenetwork-filesharing.nix index d251eb74f274..94656b026710 100644 --- a/pkgs/applications/kde/kdenetwork-filesharing.nix +++ b/pkgs/applications/kde/kdenetwork-filesharing.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "kdenetwork-filesharing"; + pname = "kdenetwork-filesharing"; meta = { license = [ lib.licenses.gpl2 lib.licenses.lgpl21 ]; maintainers = [ lib.maintainers.ttuegel ]; diff --git a/pkgs/applications/kde/kdenlive.nix b/pkgs/applications/kde/kdenlive.nix index b2abee579396..47afcd0a67e3 100644 --- a/pkgs/applications/kde/kdenlive.nix +++ b/pkgs/applications/kde/kdenlive.nix @@ -35,7 +35,7 @@ }: mkDerivation { - name = "kdenlive"; + pname = "kdenlive"; nativeBuildInputs = [ extra-cmake-modules kdoctools diff --git a/pkgs/applications/kde/kdepim-addons.nix b/pkgs/applications/kde/kdepim-addons.nix index e47aae89e603..0939b0ecd26f 100644 --- a/pkgs/applications/kde/kdepim-addons.nix +++ b/pkgs/applications/kde/kdepim-addons.nix @@ -9,7 +9,7 @@ }: mkDerivation { - name = "kdepim-addons"; + pname = "kdepim-addons"; meta = { license = with lib.licenses; [ gpl2Plus lgpl21Plus ]; maintainers = kdepimTeam; diff --git a/pkgs/applications/kde/kdepim-apps-libs/default.nix b/pkgs/applications/kde/kdepim-apps-libs/default.nix index 57c02ea4e84c..19f476fd781e 100644 --- a/pkgs/applications/kde/kdepim-apps-libs/default.nix +++ b/pkgs/applications/kde/kdepim-apps-libs/default.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "kdepim-apps-libs"; + pname = "kdepim-apps-libs"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; diff --git a/pkgs/applications/kde/kdepim-runtime/default.nix b/pkgs/applications/kde/kdepim-runtime/default.nix index e0a5d43e654f..335284aa6c4d 100644 --- a/pkgs/applications/kde/kdepim-runtime/default.nix +++ b/pkgs/applications/kde/kdepim-runtime/default.nix @@ -9,7 +9,7 @@ }: mkDerivation { - name = "kdepim-runtime"; + pname = "kdepim-runtime"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; diff --git a/pkgs/applications/kde/kdf.nix b/pkgs/applications/kde/kdf.nix index eef94fd5eb24..5c196d6a3b12 100644 --- a/pkgs/applications/kde/kdf.nix +++ b/pkgs/applications/kde/kdf.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "kdf"; + pname = "kdf"; meta = { license = with lib.licenses; [ gpl2 ]; maintainers = [ lib.maintainers.peterhoeg ]; diff --git a/pkgs/applications/kde/kdialog.nix b/pkgs/applications/kde/kdialog.nix index df301af0cbac..192bfda4c27b 100644 --- a/pkgs/applications/kde/kdialog.nix +++ b/pkgs/applications/kde/kdialog.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "kdialog"; + pname = "kdialog"; meta = { license = with lib.licenses; [ gpl2 fdl12 ]; diff --git a/pkgs/applications/kde/kdiamond.nix b/pkgs/applications/kde/kdiamond.nix index 6c124f9450ea..040806fd08e0 100644 --- a/pkgs/applications/kde/kdiamond.nix +++ b/pkgs/applications/kde/kdiamond.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, libkdegames, kconfig, knotifyconfig }: mkDerivation { - name = "kdiamond"; + pname = "kdiamond"; meta = with lib; { homepage = "https://kde.org/applications/en/games/org.kde.kdiamond"; description = "A single player puzzle game"; diff --git a/pkgs/applications/kde/keditbookmarks.nix b/pkgs/applications/kde/keditbookmarks.nix index efe247df7376..9deb1a3c0158 100644 --- a/pkgs/applications/kde/keditbookmarks.nix +++ b/pkgs/applications/kde/keditbookmarks.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "keditbookmarks"; + pname = "keditbookmarks"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kio kparts kwindowsystem ]; meta = with lib; { diff --git a/pkgs/applications/kde/kfind.nix b/pkgs/applications/kde/kfind.nix index 10932b38032c..fa0ef1c92203 100644 --- a/pkgs/applications/kde/kfind.nix +++ b/pkgs/applications/kde/kfind.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "kfind"; + pname = "kfind"; meta = { license = with lib.licenses; [ gpl2 ]; maintainers = [ lib.maintainers.iblech ]; diff --git a/pkgs/applications/kde/kfloppy.nix b/pkgs/applications/kde/kfloppy.nix index a8747047f42f..a88fd9283e06 100644 --- a/pkgs/applications/kde/kfloppy.nix +++ b/pkgs/applications/kde/kfloppy.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, extra-cmake-modules, kdoctools, kcompletion, kxmlgui }: mkDerivation { - name = "kfloppy"; + pname = "kfloppy"; meta = with lib; { homepage = "https://kde.org/applications/en/utilities/org.kde.kfloppy"; description = "Utility to format 3.5\" and 5.25\" floppy disks"; diff --git a/pkgs/applications/kde/kgeography.nix b/pkgs/applications/kde/kgeography.nix index c96c198cca9c..7a5d5516b5ef 100644 --- a/pkgs/applications/kde/kgeography.nix +++ b/pkgs/applications/kde/kgeography.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "kgeography"; + pname = "kgeography"; meta = { license = with lib.licenses; [ gpl2 ]; maintainers = [ lib.maintainers.globin ]; diff --git a/pkgs/applications/kde/kget.nix b/pkgs/applications/kde/kget.nix index 6a50f1d08d1c..b03246eacd59 100644 --- a/pkgs/applications/kde/kget.nix +++ b/pkgs/applications/kde/kget.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "kget"; + pname = "kget"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; diff --git a/pkgs/applications/kde/kgpg.nix b/pkgs/applications/kde/kgpg.nix index 944cff47e0d6..32ba95231cdb 100644 --- a/pkgs/applications/kde/kgpg.nix +++ b/pkgs/applications/kde/kgpg.nix @@ -7,7 +7,7 @@ }: mkDerivation { - name = "kgpg"; + pname = "kgpg"; nativeBuildInputs = [ extra-cmake-modules kdoctools makeWrapper ]; buildInputs = [ akonadi-contacts gnupg karchive kcodecs kcontacts kcoreaddons kcrash diff --git a/pkgs/applications/kde/khelpcenter.nix b/pkgs/applications/kde/khelpcenter.nix index 69b629bbeb90..77f30d8e69b6 100644 --- a/pkgs/applications/kde/khelpcenter.nix +++ b/pkgs/applications/kde/khelpcenter.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "khelpcenter"; + pname = "khelpcenter"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ grantlee kcmutils kconfig kcoreaddons kdbusaddons kdelibs4support khtml diff --git a/pkgs/applications/kde/kidentitymanagement.nix b/pkgs/applications/kde/kidentitymanagement.nix index 92fcc2387797..789206a16390 100644 --- a/pkgs/applications/kde/kidentitymanagement.nix +++ b/pkgs/applications/kde/kidentitymanagement.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "kidentitymanagement"; + pname = "kidentitymanagement"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; diff --git a/pkgs/applications/kde/kig.nix b/pkgs/applications/kde/kig.nix index 7b8589077952..1ca57d91c197 100644 --- a/pkgs/applications/kde/kig.nix +++ b/pkgs/applications/kde/kig.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "kig"; + pname = "kig"; meta = { license = with lib.licenses; [ gpl2 ]; maintainers = with lib.maintainers; [ raskin ]; diff --git a/pkgs/applications/kde/kigo.nix b/pkgs/applications/kde/kigo.nix index 6585f943f2a1..238158b524b3 100644 --- a/pkgs/applications/kde/kigo.nix +++ b/pkgs/applications/kde/kigo.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, libkdegames, knewstuff }: mkDerivation { - name = "kigo"; + pname = "kigo"; meta = with lib; { homepage = "https://kde.org/applications/en/games/org.kde.kigo"; description = "An open-source implementation of the popular Go game"; diff --git a/pkgs/applications/kde/killbots.nix b/pkgs/applications/kde/killbots.nix index ec9b6de82c90..ef81c3b5ec11 100644 --- a/pkgs/applications/kde/killbots.nix +++ b/pkgs/applications/kde/killbots.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, libkdegames }: mkDerivation { - name = "killbots"; + pname = "killbots"; meta = with lib; { homepage = "https://kde.org/applications/en/games/org.kde.killbots"; description = "A game where you avoid robots"; diff --git a/pkgs/applications/kde/kimap.nix b/pkgs/applications/kde/kimap.nix index 9e42c5710583..e93804bd885d 100644 --- a/pkgs/applications/kde/kimap.nix +++ b/pkgs/applications/kde/kimap.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "kimap"; + pname = "kimap"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; diff --git a/pkgs/applications/kde/kio-extras.nix b/pkgs/applications/kde/kio-extras.nix index a803ba72982d..fdc531d5d12d 100644 --- a/pkgs/applications/kde/kio-extras.nix +++ b/pkgs/applications/kde/kio-extras.nix @@ -7,7 +7,7 @@ }: mkDerivation { - name = "kio-extras"; + pname = "kio-extras"; meta = { license = with lib.licenses; [ gpl2 lgpl21 ]; maintainers = [ lib.maintainers.ttuegel ]; diff --git a/pkgs/applications/kde/kipi-plugins.nix b/pkgs/applications/kde/kipi-plugins.nix index 180d066a87cf..d79980a3a6f1 100644 --- a/pkgs/applications/kde/kipi-plugins.nix +++ b/pkgs/applications/kde/kipi-plugins.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "kipi-plugins"; + pname = "kipi-plugins"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ diff --git a/pkgs/applications/kde/kitinerary.nix b/pkgs/applications/kde/kitinerary.nix index 303ea6162ba4..cc71307f1acb 100644 --- a/pkgs/applications/kde/kitinerary.nix +++ b/pkgs/applications/kde/kitinerary.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "kitinerary"; + pname = "kitinerary"; meta = { license = with lib.licenses; [ lgpl21 ]; maintainers = [ lib.maintainers.bkchr ]; diff --git a/pkgs/applications/kde/kldap.nix b/pkgs/applications/kde/kldap.nix index 14a8aea5e67a..888ac59ddfb6 100644 --- a/pkgs/applications/kde/kldap.nix +++ b/pkgs/applications/kde/kldap.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "kldap"; + pname = "kldap"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; diff --git a/pkgs/applications/kde/kleopatra.nix b/pkgs/applications/kde/kleopatra.nix index c15c6eb78d69..f1f8ae9b375b 100644 --- a/pkgs/applications/kde/kleopatra.nix +++ b/pkgs/applications/kde/kleopatra.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "kleopatra"; + pname = "kleopatra"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; diff --git a/pkgs/applications/kde/klettres.nix b/pkgs/applications/kde/klettres.nix index aaddceb7bd6d..ca63c4f456e1 100644 --- a/pkgs/applications/kde/klettres.nix +++ b/pkgs/applications/kde/klettres.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, phonon, knewstuff }: mkDerivation { - name = "klettres"; + pname = "klettres"; meta = with lib; { homepage = "https://kde.org/applications/en/utilities/org.kde.klettres"; description = "An application specially designed to help the user to learn an alphabet"; diff --git a/pkgs/applications/kde/klines.nix b/pkgs/applications/kde/klines.nix index 7fadf409bd3d..336ea9a2506e 100644 --- a/pkgs/applications/kde/klines.nix +++ b/pkgs/applications/kde/klines.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, libkdegames }: mkDerivation { - name = "klines"; + pname = "klines"; meta = with lib; { homepage = "https://kde.org/applications/en/games/org.kde.klines"; description = "A simple but highly addictive one player game"; diff --git a/pkgs/applications/kde/kmag.nix b/pkgs/applications/kde/kmag.nix index fdac690cf22f..ba1bb8d18515 100644 --- a/pkgs/applications/kde/kmag.nix +++ b/pkgs/applications/kde/kmag.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio }: mkDerivation { - name = "kmag"; + pname = "kmag"; meta = with lib; { homepage = "https://kde.org/applications/en/utilities/org.kde.kmag"; description = "A small Linux utility to magnify a part of the screen"; diff --git a/pkgs/applications/kde/kmahjongg.nix b/pkgs/applications/kde/kmahjongg.nix index 93588b241e11..285cf8adff52 100644 --- a/pkgs/applications/kde/kmahjongg.nix +++ b/pkgs/applications/kde/kmahjongg.nix @@ -9,7 +9,7 @@ }: mkDerivation { - name = "kmahjongg"; + pname = "kmahjongg"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kdeclarative libkmahjongg knewstuff libkdegames ]; meta = { diff --git a/pkgs/applications/kde/kmail-account-wizard.nix b/pkgs/applications/kde/kmail-account-wizard.nix index f380315cce90..c0ab4ff947e9 100644 --- a/pkgs/applications/kde/kmail-account-wizard.nix +++ b/pkgs/applications/kde/kmail-account-wizard.nix @@ -7,7 +7,7 @@ }: mkDerivation { - name = "kmail-account-wizard"; + pname = "kmail-account-wizard"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; diff --git a/pkgs/applications/kde/kmail.nix b/pkgs/applications/kde/kmail.nix index d225eba82234..fa3fe033035f 100644 --- a/pkgs/applications/kde/kmail.nix +++ b/pkgs/applications/kde/kmail.nix @@ -11,7 +11,7 @@ }: mkDerivation { - name = "kmail"; + pname = "kmail"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; diff --git a/pkgs/applications/kde/kmailtransport.nix b/pkgs/applications/kde/kmailtransport.nix index d5832db570cc..5efdc959afb5 100644 --- a/pkgs/applications/kde/kmailtransport.nix +++ b/pkgs/applications/kde/kmailtransport.nix @@ -7,7 +7,7 @@ }: mkDerivation { - name = "kmailtransport"; + pname = "kmailtransport"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; diff --git a/pkgs/applications/kde/kmbox.nix b/pkgs/applications/kde/kmbox.nix index c1348edf3f6f..6f3db970b942 100644 --- a/pkgs/applications/kde/kmbox.nix +++ b/pkgs/applications/kde/kmbox.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "kmbox"; + pname = "kmbox"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; diff --git a/pkgs/applications/kde/kmime.nix b/pkgs/applications/kde/kmime.nix index ac877d85228c..51e78b5f6497 100644 --- a/pkgs/applications/kde/kmime.nix +++ b/pkgs/applications/kde/kmime.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "kmime"; + pname = "kmime"; meta = { license = [ lib.licenses.lgpl21 ]; maintainers = kdepimTeam; diff --git a/pkgs/applications/kde/kmines.nix b/pkgs/applications/kde/kmines.nix index edf3114244b9..66131df26c16 100644 --- a/pkgs/applications/kde/kmines.nix +++ b/pkgs/applications/kde/kmines.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, extra-cmake-modules, libkdegames, kconfig, kcrash, kdoctools, ki18n, kio }: mkDerivation { - name = "kmines"; + pname = "kmines"; meta = with lib; { homepage = "https://kde.org/applications/en/games/org.kde.kmines"; description = "A classic Minesweeper game"; diff --git a/pkgs/applications/kde/kmix.nix b/pkgs/applications/kde/kmix.nix index 8010c57d9278..207fba8e77b5 100644 --- a/pkgs/applications/kde/kmix.nix +++ b/pkgs/applications/kde/kmix.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "kmix"; + pname = "kmix"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = [ lib.maintainers.rongcuid ]; diff --git a/pkgs/applications/kde/kmplot.nix b/pkgs/applications/kde/kmplot.nix index c0c00f213400..04ccb809c79b 100644 --- a/pkgs/applications/kde/kmplot.nix +++ b/pkgs/applications/kde/kmplot.nix @@ -3,7 +3,7 @@ }: mkDerivation { - name = "kmplot"; + pname = "kmplot"; meta = { license = with lib.licenses; [ gpl2Plus fdl12 ]; maintainers = [ lib.maintainers.orivej ]; diff --git a/pkgs/applications/kde/knavalbattle.nix b/pkgs/applications/kde/knavalbattle.nix index 669f9961a497..155faf4e5399 100644 --- a/pkgs/applications/kde/knavalbattle.nix +++ b/pkgs/applications/kde/knavalbattle.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, libkdegames, kdnssd }: mkDerivation { - name = "knavalbattle"; + pname = "knavalbattle"; meta = with lib; { homepage = "https://kde.org/applications/en/games/org.kde.knavalbattle"; description = "Naval Battle is a ship sinking game"; diff --git a/pkgs/applications/kde/knetwalk.nix b/pkgs/applications/kde/knetwalk.nix index f34bb84f0a06..3a863b40a1c6 100644 --- a/pkgs/applications/kde/knetwalk.nix +++ b/pkgs/applications/kde/knetwalk.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, libkdegames }: mkDerivation { - name = "knetwalk"; + pname = "knetwalk"; meta = with lib; { homepage = "https://kde.org/applications/en/games/org.kde.knetwalk"; description = "A single player logic game"; diff --git a/pkgs/applications/kde/knights.nix b/pkgs/applications/kde/knights.nix index 8b71493ff186..084a2349fc1f 100644 --- a/pkgs/applications/kde/knights.nix +++ b/pkgs/applications/kde/knights.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, kplotting, plasma-framework, libkdegames }: mkDerivation { - name = "knights"; + pname = "knights"; meta = with lib; { homepage = "https://kde.org/applications/en/games/org.kde.knights"; description = "A chess game"; diff --git a/pkgs/applications/kde/knotes.nix b/pkgs/applications/kde/knotes.nix index 2dc2f48c1497..75b92eb07bba 100644 --- a/pkgs/applications/kde/knotes.nix +++ b/pkgs/applications/kde/knotes.nix @@ -13,7 +13,7 @@ }: mkDerivation { - name = "knotes"; + pname = "knotes"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kcompletion kconfig kconfigwidgets kcoreaddons kcrash diff --git a/pkgs/applications/kde/kolf.nix b/pkgs/applications/kde/kolf.nix index f9fa31b665b2..2f1189855be9 100644 --- a/pkgs/applications/kde/kolf.nix +++ b/pkgs/applications/kde/kolf.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "kolf"; + pname = "kolf"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ libkdegames kio ktextwidgets ]; meta = { diff --git a/pkgs/applications/kde/kollision.nix b/pkgs/applications/kde/kollision.nix index 6cb9995459a4..806b2f592338 100644 --- a/pkgs/applications/kde/kollision.nix +++ b/pkgs/applications/kde/kollision.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, libkdegames }: mkDerivation { - name = "kollision"; + pname = "kollision"; meta = with lib; { homepage = "https://kde.org/applications/en/games/org.kde.kollision"; description = "A casual game"; diff --git a/pkgs/applications/kde/kolourpaint.nix b/pkgs/applications/kde/kolourpaint.nix index 4501324a8717..66746cf466dc 100644 --- a/pkgs/applications/kde/kolourpaint.nix +++ b/pkgs/applications/kde/kolourpaint.nix @@ -7,7 +7,7 @@ }: mkDerivation { - name = "kolourpaint"; + pname = "kolourpaint"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kdelibs4support libkexiv2 ]; meta = { diff --git a/pkgs/applications/kde/kompare.nix b/pkgs/applications/kde/kompare.nix index 3a264e402574..a449a1e4f51e 100644 --- a/pkgs/applications/kde/kompare.nix +++ b/pkgs/applications/kde/kompare.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "kompare"; + pname = "kompare"; meta = { license = with lib.licenses; [ gpl2 ]; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ diff --git a/pkgs/applications/kde/konqueror.nix b/pkgs/applications/kde/konqueror.nix index 62ed3db063ea..72fcf8ff220a 100644 --- a/pkgs/applications/kde/konqueror.nix +++ b/pkgs/applications/kde/konqueror.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "konqueror"; + pname = "konqueror"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kdelibs4support kcmutils khtml kdesu diff --git a/pkgs/applications/kde/konquest.nix b/pkgs/applications/kde/konquest.nix index cfef018de6cc..7802b9c66c39 100644 --- a/pkgs/applications/kde/konquest.nix +++ b/pkgs/applications/kde/konquest.nix @@ -8,7 +8,7 @@ }: mkDerivation { - name = "konquest"; + pname = "konquest"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kdelibs4support libkdegames qtquickcontrols ]; meta = { diff --git a/pkgs/applications/kde/konsole.nix b/pkgs/applications/kde/konsole.nix index ed26dc08bb6c..b49507e0b8e3 100644 --- a/pkgs/applications/kde/konsole.nix +++ b/pkgs/applications/kde/konsole.nix @@ -8,7 +8,7 @@ }: mkDerivation { - name = "konsole"; + pname = "konsole"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = with lib.maintainers; [ ttuegel turion ]; diff --git a/pkgs/applications/kde/kontact.nix b/pkgs/applications/kde/kontact.nix index eb28458392ce..3dfa28e9dfe7 100644 --- a/pkgs/applications/kde/kontact.nix +++ b/pkgs/applications/kde/kontact.nix @@ -8,7 +8,7 @@ }: mkDerivation { - name = "kontact"; + pname = "kontact"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; diff --git a/pkgs/applications/kde/kontactinterface.nix b/pkgs/applications/kde/kontactinterface.nix index f2df628f3018..b7e033deb0a0 100644 --- a/pkgs/applications/kde/kontactinterface.nix +++ b/pkgs/applications/kde/kontactinterface.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "kontactinterface"; + pname = "kontactinterface"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; diff --git a/pkgs/applications/kde/korganizer.nix b/pkgs/applications/kde/korganizer.nix index 2f37a1bac0fd..f28e0406b134 100644 --- a/pkgs/applications/kde/korganizer.nix +++ b/pkgs/applications/kde/korganizer.nix @@ -11,7 +11,7 @@ }: mkDerivation { - name = "korganizer"; + pname = "korganizer"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; diff --git a/pkgs/applications/kde/kpat.nix b/pkgs/applications/kde/kpat.nix index 9ee573532378..d1e47af6b724 100644 --- a/pkgs/applications/kde/kpat.nix +++ b/pkgs/applications/kde/kpat.nix @@ -8,7 +8,7 @@ }: mkDerivation { - name = "kpat"; + pname = "kpat"; nativeBuildInputs = [ extra-cmake-modules shared-mime-info diff --git a/pkgs/applications/kde/kpimtextedit.nix b/pkgs/applications/kde/kpimtextedit.nix index 6f79a46202bd..2948075f6963 100644 --- a/pkgs/applications/kde/kpimtextedit.nix +++ b/pkgs/applications/kde/kpimtextedit.nix @@ -7,7 +7,7 @@ }: mkDerivation { - name = "kpimtextedit"; + pname = "kpimtextedit"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; diff --git a/pkgs/applications/kde/kpkpass.nix b/pkgs/applications/kde/kpkpass.nix index f31b37de9311..e7b814771220 100644 --- a/pkgs/applications/kde/kpkpass.nix +++ b/pkgs/applications/kde/kpkpass.nix @@ -4,7 +4,7 @@ }: mkDerivation { - name = "kpkpass"; + pname = "kpkpass"; meta = { license = with lib.licenses; [ lgpl21 ]; maintainers = [ lib.maintainers.bkchr ]; diff --git a/pkgs/applications/kde/kqtquickcharts.nix b/pkgs/applications/kde/kqtquickcharts.nix index 2b3dc5313d9a..669a38e37ca6 100644 --- a/pkgs/applications/kde/kqtquickcharts.nix +++ b/pkgs/applications/kde/kqtquickcharts.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "kqtquickcharts"; + pname = "kqtquickcharts"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = [ lib.maintainers.ttuegel ]; diff --git a/pkgs/applications/kde/krdc.nix b/pkgs/applications/kde/krdc.nix index 2b0a1a5c5141..01cc39d9895d 100644 --- a/pkgs/applications/kde/krdc.nix +++ b/pkgs/applications/kde/krdc.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "krdc"; + pname = "krdc"; nativeBuildInputs = [ extra-cmake-modules kdoctools makeWrapper ]; buildInputs = [ kcmutils kcompletion kconfig kdnssd knotifyconfig kwallet kwidgetsaddons diff --git a/pkgs/applications/kde/kreversi.nix b/pkgs/applications/kde/kreversi.nix index 9f4be46738be..351555b5f338 100644 --- a/pkgs/applications/kde/kreversi.nix +++ b/pkgs/applications/kde/kreversi.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, extra-cmake-modules, libkdegames, kdeclarative }: mkDerivation { - name = "kreversi"; + pname = "kreversi"; meta = with lib; { homepage = "https://kde.org/applications/en/games/org.kde.kreversi"; description = "A simple one player strategy game played against the computer"; diff --git a/pkgs/applications/kde/krfb.nix b/pkgs/applications/kde/krfb.nix index d2b96bf6100e..aa280d019b1d 100644 --- a/pkgs/applications/kde/krfb.nix +++ b/pkgs/applications/kde/krfb.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "krfb"; + pname = "krfb"; meta = { license = with lib.licenses; [ gpl2 fdl12 ]; maintainers = with lib.maintainers; [ jerith666 ]; diff --git a/pkgs/applications/kde/kruler.nix b/pkgs/applications/kde/kruler.nix index 2018245cfcb2..460675e8cb15 100644 --- a/pkgs/applications/kde/kruler.nix +++ b/pkgs/applications/kde/kruler.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "kruler"; + pname = "kruler"; meta = { license = with lib.licenses; [ gpl2 ]; maintainers = [ lib.maintainers.vandenoever ]; diff --git a/pkgs/applications/kde/kshisen.nix b/pkgs/applications/kde/kshisen.nix index 5be17bb8ee08..791e95af6905 100644 --- a/pkgs/applications/kde/kshisen.nix +++ b/pkgs/applications/kde/kshisen.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, libkdegames, libkmahjongg }: mkDerivation { - name = "kshisen"; + pname = "kshisen"; meta = with lib; { homepage = "https://kde.org/applications/en/games/org.kde.kshisen"; description = "A solitaire-like game played using the standard set of Mahjong tiles"; diff --git a/pkgs/applications/kde/ksmtp/default.nix b/pkgs/applications/kde/ksmtp/default.nix index 6a5f51a17bfe..3bf80f4abf52 100644 --- a/pkgs/applications/kde/ksmtp/default.nix +++ b/pkgs/applications/kde/ksmtp/default.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "ksmtp"; + pname = "ksmtp"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; diff --git a/pkgs/applications/kde/kspaceduel.nix b/pkgs/applications/kde/kspaceduel.nix index b18a3e7cf8f7..49ef76151eab 100644 --- a/pkgs/applications/kde/kspaceduel.nix +++ b/pkgs/applications/kde/kspaceduel.nix @@ -10,10 +10,10 @@ }: mkDerivation { - name = "kspaceduel"; + pname = "kspaceduel"; meta.license = with lib.licenses; [ lgpl21 gpl3 ]; outputs = [ "out" "dev" ]; - nativeBuildInputs = [ + nativeBuildInputs = [ cmake extra-cmake-modules ]; propagatedBuildInputs = [ diff --git a/pkgs/applications/kde/ksquares.nix b/pkgs/applications/kde/ksquares.nix index 12d989befe19..b48ee473523c 100644 --- a/pkgs/applications/kde/ksquares.nix +++ b/pkgs/applications/kde/ksquares.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, extra-cmake-modules, kdoctools, libkdegames, kconfig, kcrash, kxmlgui }: mkDerivation { - name = "ksquares"; + pname = "ksquares"; meta = with lib; { homepage = "https://kde.org/applications/en/games/org.kde.ksquares"; description = "A game of Dots and Boxes"; diff --git a/pkgs/applications/kde/ksudoku.nix b/pkgs/applications/kde/ksudoku.nix index 678c21d5870e..bf59c6e94c38 100644 --- a/pkgs/applications/kde/ksudoku.nix +++ b/pkgs/applications/kde/ksudoku.nix @@ -8,7 +8,7 @@ }: mkDerivation { - name = "ksudoku"; + pname = "ksudoku"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ libGLU kdeclarative libkdegames ]; meta = { diff --git a/pkgs/applications/kde/ksystemlog.nix b/pkgs/applications/kde/ksystemlog.nix index bec92d55966d..08f7ffb7e05c 100644 --- a/pkgs/applications/kde/ksystemlog.nix +++ b/pkgs/applications/kde/ksystemlog.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "ksystemlog"; + pname = "ksystemlog"; nativeBuildInputs = [ extra-cmake-modules gettext kdoctools ]; propagatedBuildInputs = [ karchive kconfig kio ]; diff --git a/pkgs/applications/kde/kteatime.nix b/pkgs/applications/kde/kteatime.nix index 812a13aa118b..639bd933103f 100644 --- a/pkgs/applications/kde/kteatime.nix +++ b/pkgs/applications/kde/kteatime.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kconfig, kcrash, kiconthemes, knotifyconfig }: mkDerivation { - name = "kteatime"; + pname = "kteatime"; meta = with lib; { homepage = "https://kde.org/applications/en/utilities/org.kde.kteatime"; description = "A handy timer for steeping tea"; diff --git a/pkgs/applications/kde/ktimer.nix b/pkgs/applications/kde/ktimer.nix index bdb8f2c687b1..7eab059f1a72 100644 --- a/pkgs/applications/kde/ktimer.nix +++ b/pkgs/applications/kde/ktimer.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio }: mkDerivation { - name = "ktimer"; + pname = "ktimer"; meta = with lib; { homepage = "https://kde.org/applications/en/utilities/org.kde.ktimer"; description = "A little tool to execute programs after some time"; diff --git a/pkgs/applications/kde/ktnef.nix b/pkgs/applications/kde/ktnef.nix index 61f8672e47d9..c264e0b53ca2 100644 --- a/pkgs/applications/kde/ktnef.nix +++ b/pkgs/applications/kde/ktnef.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "ktnef"; + pname = "ktnef"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; diff --git a/pkgs/applications/kde/ktouch.nix b/pkgs/applications/kde/ktouch.nix index 7e300ea7157e..9d31d4ec62b0 100644 --- a/pkgs/applications/kde/ktouch.nix +++ b/pkgs/applications/kde/ktouch.nix @@ -9,7 +9,7 @@ mkDerivation { - name = "ktouch"; + pname = "ktouch"; meta = { license = lib.licenses.gpl2; maintainers = [ lib.maintainers.schmittlauch ]; diff --git a/pkgs/applications/kde/kturtle.nix b/pkgs/applications/kde/kturtle.nix index c495b16fef79..d178f6515450 100644 --- a/pkgs/applications/kde/kturtle.nix +++ b/pkgs/applications/kde/kturtle.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, knewstuff }: mkDerivation { - name = "kturtle"; + pname = "kturtle"; meta = with lib; { homepage = "https://kde.org/applications/en/utilities/org.kde.kturtle"; description = "An educational programming environment for learning how to program"; diff --git a/pkgs/applications/kde/kwalletmanager.nix b/pkgs/applications/kde/kwalletmanager.nix index e39e7e5157d2..b5799a24e36a 100644 --- a/pkgs/applications/kde/kwalletmanager.nix +++ b/pkgs/applications/kde/kwalletmanager.nix @@ -13,7 +13,7 @@ }: mkDerivation { - name = "kwalletmanager"; + pname = "kwalletmanager"; meta = { license = with lib.licenses; [ gpl2 ]; maintainers = with lib.maintainers; [ fridh ]; diff --git a/pkgs/applications/kde/kwave.nix b/pkgs/applications/kde/kwave.nix index 1a831c7c8dd8..125e79c2c3cf 100644 --- a/pkgs/applications/kde/kwave.nix +++ b/pkgs/applications/kde/kwave.nix @@ -3,7 +3,7 @@ , libogg, libmad, libopus, libvorbis, fftw, librsvg, qtbase }: mkDerivation { - name = "kwave"; + pname = "kwave"; meta = with lib; { homepage = "https://kde.org/applications/en/multimedia/org.kde.kwave"; diff --git a/pkgs/applications/kde/libgravatar.nix b/pkgs/applications/kde/libgravatar.nix index 69a1b9e99cbb..51e3391b8e77 100644 --- a/pkgs/applications/kde/libgravatar.nix +++ b/pkgs/applications/kde/libgravatar.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "libgravatar"; + pname = "libgravatar"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; diff --git a/pkgs/applications/kde/libkcddb.nix b/pkgs/applications/kde/libkcddb.nix index 3fd486056542..3dde49605025 100644 --- a/pkgs/applications/kde/libkcddb.nix +++ b/pkgs/applications/kde/libkcddb.nix @@ -3,7 +3,7 @@ , libmusicbrainz5 }: mkDerivation { - name = "libkcddb"; + pname = "libkcddb"; meta = with lib; { license = with licenses; [ gpl2 lgpl21 bsd3 ]; maintainers = with maintainers; [ peterhoeg ]; diff --git a/pkgs/applications/kde/libkdcraw.nix b/pkgs/applications/kde/libkdcraw.nix index 70e3cb0e1956..1419fb0e980b 100644 --- a/pkgs/applications/kde/libkdcraw.nix +++ b/pkgs/applications/kde/libkdcraw.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, extra-cmake-modules, libraw, qtbase }: mkDerivation { - name = "libkdcraw"; + pname = "libkdcraw"; meta = { license = with lib.licenses; [ gpl2 lgpl21 bsd3 ]; maintainers = [ lib.maintainers.ttuegel ]; diff --git a/pkgs/applications/kde/libkdegames.nix b/pkgs/applications/kde/libkdegames.nix index 494b193b8326..830837756b8b 100644 --- a/pkgs/applications/kde/libkdegames.nix +++ b/pkgs/applications/kde/libkdegames.nix @@ -13,7 +13,7 @@ }: mkDerivation { - name = "libkdegames"; + pname = "libkdegames"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kdelibs4support qtdeclarative kdeclarative kdnssd knewstuff openal libsndfile diff --git a/pkgs/applications/kde/libkdepim.nix b/pkgs/applications/kde/libkdepim.nix index 92716e40a34f..cc0c15a9e060 100644 --- a/pkgs/applications/kde/libkdepim.nix +++ b/pkgs/applications/kde/libkdepim.nix @@ -7,7 +7,7 @@ }: mkDerivation { - name = "libkdepim"; + pname = "libkdepim"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; diff --git a/pkgs/applications/kde/libkexiv2.nix b/pkgs/applications/kde/libkexiv2.nix index 8c8d244d6f6e..8d9b3a820329 100644 --- a/pkgs/applications/kde/libkexiv2.nix +++ b/pkgs/applications/kde/libkexiv2.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, exiv2, extra-cmake-modules, qtbase }: mkDerivation { - name = "libkexiv2"; + pname = "libkexiv2"; meta = { license = with lib.licenses; [ gpl2 lgpl21 bsd3 ]; maintainers = [ lib.maintainers.ttuegel ]; diff --git a/pkgs/applications/kde/libkgapi.nix b/pkgs/applications/kde/libkgapi.nix index 0e1d71d2745f..979ca7e2f458 100644 --- a/pkgs/applications/kde/libkgapi.nix +++ b/pkgs/applications/kde/libkgapi.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "libkgapi"; + pname = "libkgapi"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; diff --git a/pkgs/applications/kde/libkipi.nix b/pkgs/applications/kde/libkipi.nix index c70d8407fc74..e94f0e6c4a82 100644 --- a/pkgs/applications/kde/libkipi.nix +++ b/pkgs/applications/kde/libkipi.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, extra-cmake-modules, kconfig, ki18n, kservice, kxmlgui }: mkDerivation { - name = "libkipi"; + pname = "libkipi"; meta = { license = with lib.licenses; [ gpl2 lgpl21 bsd3 ]; maintainers = [ lib.maintainers.ttuegel ]; diff --git a/pkgs/applications/kde/libkleo.nix b/pkgs/applications/kde/libkleo.nix index 0958a0e605f7..dd17345c5f17 100644 --- a/pkgs/applications/kde/libkleo.nix +++ b/pkgs/applications/kde/libkleo.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "libkleo"; + pname = "libkleo"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; diff --git a/pkgs/applications/kde/libkmahjongg.nix b/pkgs/applications/kde/libkmahjongg.nix index 295b97842686..b14e50f32bcc 100644 --- a/pkgs/applications/kde/libkmahjongg.nix +++ b/pkgs/applications/kde/libkmahjongg.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "libkmahjongg"; + pname = "libkmahjongg"; meta = { license = with lib.licenses; [ gpl2 ]; maintainers = with lib.maintainers; [ ]; diff --git a/pkgs/applications/kde/libkomparediff2.nix b/pkgs/applications/kde/libkomparediff2.nix index cae2aec5668d..93ac12d97d62 100644 --- a/pkgs/applications/kde/libkomparediff2.nix +++ b/pkgs/applications/kde/libkomparediff2.nix @@ -1,7 +1,7 @@ { mkDerivation, extra-cmake-modules, ki18n, kxmlgui, kcodecs, kio }: mkDerivation { - name = "libkomparediff2"; + pname = "libkomparediff2"; nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ kcodecs ki18n kxmlgui kio ]; } diff --git a/pkgs/applications/kde/libksane.nix b/pkgs/applications/kde/libksane.nix index f92f21de7fb8..33a2ef48f90b 100644 --- a/pkgs/applications/kde/libksane.nix +++ b/pkgs/applications/kde/libksane.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "libksane"; + pname = "libksane"; meta = with lib; { license = licenses.gpl2; maintainers = with maintainers; [ pshendry ]; diff --git a/pkgs/applications/kde/libksieve.nix b/pkgs/applications/kde/libksieve.nix index dd33f759c313..209647a4791f 100644 --- a/pkgs/applications/kde/libksieve.nix +++ b/pkgs/applications/kde/libksieve.nix @@ -7,7 +7,7 @@ }: mkDerivation { - name = "libksieve"; + pname = "libksieve"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; diff --git a/pkgs/applications/kde/mailcommon.nix b/pkgs/applications/kde/mailcommon.nix index 44edea8f55e9..c3a8659a735b 100644 --- a/pkgs/applications/kde/mailcommon.nix +++ b/pkgs/applications/kde/mailcommon.nix @@ -7,7 +7,7 @@ }: mkDerivation { - name = "mailcommon"; + pname = "mailcommon"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; diff --git a/pkgs/applications/kde/mailimporter.nix b/pkgs/applications/kde/mailimporter.nix index 5de58658777a..b1e0461a9593 100644 --- a/pkgs/applications/kde/mailimporter.nix +++ b/pkgs/applications/kde/mailimporter.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "mailimporter"; + pname = "mailimporter"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; diff --git a/pkgs/applications/kde/marble.nix b/pkgs/applications/kde/marble.nix index f690e453361b..525289bdc3b7 100644 --- a/pkgs/applications/kde/marble.nix +++ b/pkgs/applications/kde/marble.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "marble"; + pname = "marble"; meta.license = with lib.licenses; [ lgpl21 gpl3 ]; outputs = [ "out" "dev" ]; nativeBuildInputs = [ extra-cmake-modules kdoctools perl ]; diff --git a/pkgs/applications/kde/mbox-importer.nix b/pkgs/applications/kde/mbox-importer.nix index 0704003353ae..eadb27f05bc9 100644 --- a/pkgs/applications/kde/mbox-importer.nix +++ b/pkgs/applications/kde/mbox-importer.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "mbox-importer"; + pname = "mbox-importer"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; diff --git a/pkgs/applications/kde/messagelib.nix b/pkgs/applications/kde/messagelib.nix index e31e61d35ca3..d47a5504417a 100644 --- a/pkgs/applications/kde/messagelib.nix +++ b/pkgs/applications/kde/messagelib.nix @@ -9,7 +9,7 @@ }: mkDerivation { - name = "messagelib"; + pname = "messagelib"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; diff --git a/pkgs/applications/kde/minuet.nix b/pkgs/applications/kde/minuet.nix index 2c0f0a5092d8..ca7d6124ed59 100644 --- a/pkgs/applications/kde/minuet.nix +++ b/pkgs/applications/kde/minuet.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "minuet"; + pname = "minuet"; meta = with lib; { license = with licenses; [ lgpl21 gpl3 ]; maintainers = with maintainers; [ peterhoeg HaoZeke ]; diff --git a/pkgs/applications/kde/okular.nix b/pkgs/applications/kde/okular.nix index 288b2ceb807f..12537eba270a 100644 --- a/pkgs/applications/kde/okular.nix +++ b/pkgs/applications/kde/okular.nix @@ -9,7 +9,7 @@ }: mkDerivation { - name = "okular"; + pname = "okular"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ breeze-icons discount djvulibre ebook_tools kactivities karchive kbookmarks diff --git a/pkgs/applications/kde/picmi.nix b/pkgs/applications/kde/picmi.nix index dd09e8f9cd80..25734e318ab4 100644 --- a/pkgs/applications/kde/picmi.nix +++ b/pkgs/applications/kde/picmi.nix @@ -4,7 +4,7 @@ }: mkDerivation { - name = "picmi"; + pname = "picmi"; meta = with lib; { description = "Nonogram game"; longDescription = ''The goal is to reveal the hidden pattern in the board by coloring or diff --git a/pkgs/applications/kde/pim-data-exporter.nix b/pkgs/applications/kde/pim-data-exporter.nix index 82cdf19df948..746bb2aec2ad 100644 --- a/pkgs/applications/kde/pim-data-exporter.nix +++ b/pkgs/applications/kde/pim-data-exporter.nix @@ -8,7 +8,7 @@ }: mkDerivation { - name = "pim-data-exporter"; + pname = "pim-data-exporter"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; diff --git a/pkgs/applications/kde/pim-sieve-editor.nix b/pkgs/applications/kde/pim-sieve-editor.nix index c83df2e0e498..1f3f1542cdba 100644 --- a/pkgs/applications/kde/pim-sieve-editor.nix +++ b/pkgs/applications/kde/pim-sieve-editor.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "pim-sieve-editor"; + pname = "pim-sieve-editor"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; diff --git a/pkgs/applications/kde/pimcommon.nix b/pkgs/applications/kde/pimcommon.nix index 2e74f528aeb1..dff5e883cb5e 100644 --- a/pkgs/applications/kde/pimcommon.nix +++ b/pkgs/applications/kde/pimcommon.nix @@ -8,7 +8,7 @@ }: mkDerivation { - name = "pimcommon"; + pname = "pimcommon"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; diff --git a/pkgs/applications/kde/print-manager.nix b/pkgs/applications/kde/print-manager.nix index f0501ffadee4..2ea662419b17 100644 --- a/pkgs/applications/kde/print-manager.nix +++ b/pkgs/applications/kde/print-manager.nix @@ -8,7 +8,7 @@ }: mkDerivation { - name = "print-manager"; + pname = "print-manager"; meta = { license = [ lib.licenses.gpl2 ]; maintainers = [ lib.maintainers.ttuegel ]; diff --git a/pkgs/applications/kde/rocs.nix b/pkgs/applications/kde/rocs.nix index feae7ca81dec..45362d556a72 100644 --- a/pkgs/applications/kde/rocs.nix +++ b/pkgs/applications/kde/rocs.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "rocs"; + pname = "rocs"; meta = with lib; { homepage = "https://edu.kde.org/rocs/"; diff --git a/pkgs/applications/kde/spectacle.nix b/pkgs/applications/kde/spectacle.nix index b980ea21df2e..c6861b218deb 100644 --- a/pkgs/applications/kde/spectacle.nix +++ b/pkgs/applications/kde/spectacle.nix @@ -8,7 +8,7 @@ }: mkDerivation { - name = "spectacle"; + pname = "spectacle"; meta = with lib; { maintainers = with maintainers; [ ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ diff --git a/pkgs/applications/kde/srcs.nix b/pkgs/applications/kde/srcs.nix index 6966c07ec0af..5ff13eaf2408 100644 --- a/pkgs/applications/kde/srcs.nix +++ b/pkgs/applications/kde/srcs.nix @@ -4,1731 +4,1731 @@ { akonadi = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/akonadi-20.08.2.tar.xz"; - sha256 = "d3a4b3b3f543734ad5428ca0e573b8dbf9e05f42d51e1aab39b5b5266c16be7d"; - name = "akonadi-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/akonadi-20.08.3.tar.xz"; + sha256 = "1hwaan45cyw2nmfmdp5pbhvm00xdxy9la68ms3sa8a67zcsfljhl"; + name = "akonadi-20.08.3.tar.xz"; }; }; akonadi-calendar = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/akonadi-calendar-20.08.2.tar.xz"; - sha256 = "20173d00dc764f6a1e8e0b433d96b982ceadcb17e9bd067caf2967fd5440eb51"; - name = "akonadi-calendar-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/akonadi-calendar-20.08.3.tar.xz"; + sha256 = "18rwvn5i6i4ng335rxpwx3a2m4vyq96w9m3fa1gvmr8ls7vkaqrk"; + name = "akonadi-calendar-20.08.3.tar.xz"; }; }; akonadi-calendar-tools = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/akonadi-calendar-tools-20.08.2.tar.xz"; - sha256 = "2069cc3a12f0da3f10181c13d19b1048d8f2e0c0f4a4e14309a7e6f08aa74ab9"; - name = "akonadi-calendar-tools-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/akonadi-calendar-tools-20.08.3.tar.xz"; + sha256 = "1pnm3xi26bnbjmnv9zwi9w5rkr1pdry50hzy3gxw7b0g11zz036w"; + name = "akonadi-calendar-tools-20.08.3.tar.xz"; }; }; akonadiconsole = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/akonadiconsole-20.08.2.tar.xz"; - sha256 = "dc03a1986b6e7af0d26af927009d567da1e1835cc2bb5cc1b5732ffca3ecde9d"; - name = "akonadiconsole-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/akonadiconsole-20.08.3.tar.xz"; + sha256 = "061r0p9pj22x0hiz6piz4vramll3w5xy92sx8nfhcp2gmnvj9890"; + name = "akonadiconsole-20.08.3.tar.xz"; }; }; akonadi-contacts = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/akonadi-contacts-20.08.2.tar.xz"; - sha256 = "e4a2696e0e0cf69926d34f160a4581131a1da8244355787564b75dec06db1b30"; - name = "akonadi-contacts-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/akonadi-contacts-20.08.3.tar.xz"; + sha256 = "18n9x41fmh4q9q9lfv882iwk6j1hvgpl11y4qn873vwr9sdrcf4s"; + name = "akonadi-contacts-20.08.3.tar.xz"; }; }; akonadi-import-wizard = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/akonadi-import-wizard-20.08.2.tar.xz"; - sha256 = "639d72ae3d32f681ddb046a87d625871b485785602cf35b817e89004def4dc5e"; - name = "akonadi-import-wizard-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/akonadi-import-wizard-20.08.3.tar.xz"; + sha256 = "0gny0rxvyks5w4rdb73ly06lyvz7kcfvff1268bn6i96xr83kmim"; + name = "akonadi-import-wizard-20.08.3.tar.xz"; }; }; akonadi-mime = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/akonadi-mime-20.08.2.tar.xz"; - sha256 = "5699a1d44a9812c9530bc61af5822ff34a573b168d72230cd8261c05065c06e3"; - name = "akonadi-mime-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/akonadi-mime-20.08.3.tar.xz"; + sha256 = "12ps633y64mj72iryd9z2nmrf7lxbkqj7xnzj28549cvg6jizgl7"; + name = "akonadi-mime-20.08.3.tar.xz"; }; }; akonadi-notes = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/akonadi-notes-20.08.2.tar.xz"; - sha256 = "4897ca92d6b68f75254e1c419438275a94fa678c9f062dcd91c0267129886ca7"; - name = "akonadi-notes-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/akonadi-notes-20.08.3.tar.xz"; + sha256 = "1z90r37lqc7ydmily730idd4s8rcbr6i3a8x9m647snbala16z36"; + name = "akonadi-notes-20.08.3.tar.xz"; }; }; akonadi-search = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/akonadi-search-20.08.2.tar.xz"; - sha256 = "618400950fa44f0c578ab51c3b311a47e0b2df47203f754e50bcc363201a9fc7"; - name = "akonadi-search-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/akonadi-search-20.08.3.tar.xz"; + sha256 = "0izpkvjybp6r79rai0p5j74bm0f8ksgsl3z34ggb51j6vj9rla7h"; + name = "akonadi-search-20.08.3.tar.xz"; }; }; akregator = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/akregator-20.08.2.tar.xz"; - sha256 = "4de4bd31dede5c09e0eb9e14d1da1d1979409eb1e28df5f95963086d4a49edc9"; - name = "akregator-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/akregator-20.08.3.tar.xz"; + sha256 = "1gqh820s5by3r9lz7r16r0krh916idsks6sgy26hcrwfmva45wn5"; + name = "akregator-20.08.3.tar.xz"; }; }; analitza = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/analitza-20.08.2.tar.xz"; - sha256 = "2fad01bf48199e3671559ec9a619f0d590af331922899c793f96fc90860ec487"; - name = "analitza-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/analitza-20.08.3.tar.xz"; + sha256 = "16s6kjyclj73lq8z8mvrbsl75h1nrnv7syp6wpip6gvfs5ynai90"; + name = "analitza-20.08.3.tar.xz"; }; }; ark = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/ark-20.08.2.tar.xz"; - sha256 = "ec061ac07687b5a3541af293e3bc2aa7bedcfe0ef38ba6e57e2704068a726ffc"; - name = "ark-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/ark-20.08.3.tar.xz"; + sha256 = "03kwjp2nj570k9ph8bgj042sjj4x0h9jwv8nwx0pfpcxkgxv5pzy"; + name = "ark-20.08.3.tar.xz"; }; }; artikulate = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/artikulate-20.08.2.tar.xz"; - sha256 = "66545d85e25aa67816deea4b2b89b485181458a5bc117dad9588671d8b48b41c"; - name = "artikulate-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/artikulate-20.08.3.tar.xz"; + sha256 = "0bx97qi6zi7jmlzm3g7qamnzg0966g4w9xpskbxbr4cgjr312x19"; + name = "artikulate-20.08.3.tar.xz"; }; }; audiocd-kio = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/audiocd-kio-20.08.2.tar.xz"; - sha256 = "5f38c549fe8c3a4659ac8291c223327b765834e7668bc15a96047e20cdb11f01"; - name = "audiocd-kio-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/audiocd-kio-20.08.3.tar.xz"; + sha256 = "01n4nyda7l7by1nyx2sgxdl8qkdfndk0w6hj0qc6a7fllcfj5cpb"; + name = "audiocd-kio-20.08.3.tar.xz"; }; }; baloo-widgets = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/baloo-widgets-20.08.2.tar.xz"; - sha256 = "e1d14b8dba911ebc1cee76dbcd44fa200418ba959d86ce567093b5fc3b700a07"; - name = "baloo-widgets-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/baloo-widgets-20.08.3.tar.xz"; + sha256 = "0ciidrsvwc3ppxhw7w5116q4lfbsvij9jsvyzm292pmjln2vikrg"; + name = "baloo-widgets-20.08.3.tar.xz"; }; }; blinken = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/blinken-20.08.2.tar.xz"; - sha256 = "c6e74033ab8ece83618c5cda0ab3cf327514b8e2e6b0e9daf484ce88f671a65e"; - name = "blinken-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/blinken-20.08.3.tar.xz"; + sha256 = "1gfw0w66nm3sx81bnr0p0yz1bhjj63lvd3cr86x3b2pny5rcw1da"; + name = "blinken-20.08.3.tar.xz"; }; }; bomber = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/bomber-20.08.2.tar.xz"; - sha256 = "27c226b31bcdbbda0c9e304e428ca7451614c397a038e830f8052c381dae7215"; - name = "bomber-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/bomber-20.08.3.tar.xz"; + sha256 = "1nw1a9cf0nqgk00hvzcqch3bl97lx6bih0wsax5q0z1kzwlz0kgr"; + name = "bomber-20.08.3.tar.xz"; }; }; bovo = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/bovo-20.08.2.tar.xz"; - sha256 = "936cab24a13900765f0c5a5afb6f155cb5a05bdb067f86b77e33af5f0e4c37d2"; - name = "bovo-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/bovo-20.08.3.tar.xz"; + sha256 = "06pbivyvfgjx6zkadvwfwnrg9vjy4rf52k2a74qjcnl2ms16sr1g"; + name = "bovo-20.08.3.tar.xz"; }; }; calendarsupport = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/calendarsupport-20.08.2.tar.xz"; - sha256 = "83bcdd36689f762363a95b688b9377a3335b4fd58ad1d5efad36ad2b0cf7cc10"; - name = "calendarsupport-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/calendarsupport-20.08.3.tar.xz"; + sha256 = "09w06n745764fs440nh0piy5sahfn50kh3zrljhgzadcij6165vd"; + name = "calendarsupport-20.08.3.tar.xz"; }; }; cantor = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/cantor-20.08.2.tar.xz"; - sha256 = "aca92b6e40a9e05282eae2b55f7cc6bf88612ffa9b3dde1a239648be8e5bdc59"; - name = "cantor-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/cantor-20.08.3.tar.xz"; + sha256 = "1njqycx0v3zq5mdcvfdfgxs8vgl01v80s27qgapsxxrgr9hgxbhl"; + name = "cantor-20.08.3.tar.xz"; }; }; cervisia = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/cervisia-20.08.2.tar.xz"; - sha256 = "b3444ecd1078b92fad9b00297496dd3d92366a9c0bb56cfa138f28cc15db1389"; - name = "cervisia-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/cervisia-20.08.3.tar.xz"; + sha256 = "1bsc72kxcmzx25408ngzqzj4a0168vqfr3a2gvmm6d8klbgpm3gv"; + name = "cervisia-20.08.3.tar.xz"; }; }; dolphin = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/dolphin-20.08.2.tar.xz"; - sha256 = "bd13574610fc2108b9b04249cff70ca99958fe57a42fbf260ed16e5e377071bc"; - name = "dolphin-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/dolphin-20.08.3.tar.xz"; + sha256 = "107n763qix95b1hgy86hddpj9x2clzhaiw8q8yjn9lzj1rz5facx"; + name = "dolphin-20.08.3.tar.xz"; }; }; dolphin-plugins = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/dolphin-plugins-20.08.2.tar.xz"; - sha256 = "7eabeb295ae2932958992bf7273afcb8164fbe90a2574064983fb2ecbc57eeaf"; - name = "dolphin-plugins-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/dolphin-plugins-20.08.3.tar.xz"; + sha256 = "0fmay0sycfj9s7zyxbldgcal5lj2psi0n9zrgq812s5qr4rb5c8c"; + name = "dolphin-plugins-20.08.3.tar.xz"; }; }; dragon = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/dragon-20.08.2.tar.xz"; - sha256 = "cf7cce288fdeb12a0c86739741c6b901859e9b36d8fc9e7478c46f53cc74dd6c"; - name = "dragon-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/dragon-20.08.3.tar.xz"; + sha256 = "14qsb7h8w58i9jsh1gpcj8pwjgy7y3mqfy51hca82yrd82z5b9rn"; + name = "dragon-20.08.3.tar.xz"; }; }; elisa = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/elisa-20.08.2.tar.xz"; - sha256 = "6c04377dfd5e82b2b67b3a43cc3ffd3b206f24ab75c3fe18298ec80876dcc268"; - name = "elisa-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/elisa-20.08.3.tar.xz"; + sha256 = "0893nbj0jsapnfd09cp961k2m7lq6sjvzynpa4hfp9ch1jbc912c"; + name = "elisa-20.08.3.tar.xz"; }; }; eventviews = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/eventviews-20.08.2.tar.xz"; - sha256 = "ecac9ac6e6a6ed835b28048d8bfc09bac9a1e7a57c5dd0eba6f4360301b32af9"; - name = "eventviews-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/eventviews-20.08.3.tar.xz"; + sha256 = "158j5g3i0wbbxpg9jmr50dvbpms4c4vgcnpmn3b3vfbszzwsy6rg"; + name = "eventviews-20.08.3.tar.xz"; }; }; ffmpegthumbs = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/ffmpegthumbs-20.08.2.tar.xz"; - sha256 = "af5b3de86487d3ddccda34c5165a34427ef97fe1090108781eb38babc101740f"; - name = "ffmpegthumbs-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/ffmpegthumbs-20.08.3.tar.xz"; + sha256 = "186hpq949r3xx2a64nqjy4pcn67d6kdvsy80zr238lgb9qqcqygi"; + name = "ffmpegthumbs-20.08.3.tar.xz"; }; }; filelight = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/filelight-20.08.2.tar.xz"; - sha256 = "65f5f90d56d3449722647286324f8aae54754ec2a46c9aaa2e3bad92bae3433e"; - name = "filelight-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/filelight-20.08.3.tar.xz"; + sha256 = "1jljsnjdhnqphh1kanj6hi2rswq3i9119iah1j33jy5pladcyf5q"; + name = "filelight-20.08.3.tar.xz"; }; }; granatier = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/granatier-20.08.2.tar.xz"; - sha256 = "bb79b84b485bb194bf4edaa833e7705ec9fc0275301c70df78498b872de9ee57"; - name = "granatier-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/granatier-20.08.3.tar.xz"; + sha256 = "195bc2rcz11v76c0cwa9mb7rfixjn7sb0a52wrzz0sf9624m0rcs"; + name = "granatier-20.08.3.tar.xz"; }; }; grantlee-editor = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/grantlee-editor-20.08.2.tar.xz"; - sha256 = "353b2c58d169e8b3c91367a7ce8939ede39c289036e3617da019ae1045a81c7b"; - name = "grantlee-editor-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/grantlee-editor-20.08.3.tar.xz"; + sha256 = "1k2rdicd68jdk3pazyn3q0vj99n0vnkpzkrnacpymkjy85cjgrv9"; + name = "grantlee-editor-20.08.3.tar.xz"; }; }; grantleetheme = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/grantleetheme-20.08.2.tar.xz"; - sha256 = "8cb4d2f698cf7f44bf70322669809f07900021f215175c8db120abc0f2debf62"; - name = "grantleetheme-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/grantleetheme-20.08.3.tar.xz"; + sha256 = "07b7v5v2vyz3vyj1jjzryzaak8bbqg8a2caxwb6s7cwhy19y6my5"; + name = "grantleetheme-20.08.3.tar.xz"; }; }; gwenview = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/gwenview-20.08.2.tar.xz"; - sha256 = "580df49eb6852db4b1229f0326372dc7da7a08140d552da59a62ece08b03cc9d"; - name = "gwenview-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/gwenview-20.08.3.tar.xz"; + sha256 = "09mwp3z97hgd7c15w0hz8k61qn5icb81rj27nxzy877ph1xnrixc"; + name = "gwenview-20.08.3.tar.xz"; }; }; incidenceeditor = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/incidenceeditor-20.08.2.tar.xz"; - sha256 = "e9c24390b5951ef9f504a4dc432fea52ed7487288c424f073446e6c07e70c69a"; - name = "incidenceeditor-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/incidenceeditor-20.08.3.tar.xz"; + sha256 = "15kkl8z1nig9qyxfrq54c3sqh1xs1lzlbm5rphj34y0yb8dbn8kx"; + name = "incidenceeditor-20.08.3.tar.xz"; }; }; juk = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/juk-20.08.2.tar.xz"; - sha256 = "b19f59ad8c80c4c335469fbddde6db92112e286b1699964eab39a3d826c7ec60"; - name = "juk-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/juk-20.08.3.tar.xz"; + sha256 = "1jvj0r4grm55cnck4apnh4fh44mv1ycm0pprrkh57iwj1dlf7kif"; + name = "juk-20.08.3.tar.xz"; }; }; k3b = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/k3b-20.08.2.tar.xz"; - sha256 = "6370be558e93fed4605b7870b1d7ea324713c5a52370eab9c05d85fc3b76acd5"; - name = "k3b-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/k3b-20.08.3.tar.xz"; + sha256 = "0qg2p6gdg0clgv6qab5vr0i451m9hqqmpwq335w8m9nwb6wg30cx"; + name = "k3b-20.08.3.tar.xz"; }; }; kaccounts-integration = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kaccounts-integration-20.08.2.tar.xz"; - sha256 = "6678ee7d394b69a37e6a220a6cba3804f999997da5803da4bab1d8f329ff30fe"; - name = "kaccounts-integration-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kaccounts-integration-20.08.3.tar.xz"; + sha256 = "006cglw5ai274a1r5jbk109mdrvw8v6fp3cdyi1kbrq7lp3123a2"; + name = "kaccounts-integration-20.08.3.tar.xz"; }; }; kaccounts-providers = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kaccounts-providers-20.08.2.tar.xz"; - sha256 = "c719d7840ab118ff591e75e12869afc3118e5cdeb5c0415eba5b1f6993664c90"; - name = "kaccounts-providers-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kaccounts-providers-20.08.3.tar.xz"; + sha256 = "1vpv366bzj0sk7dqyxrq06a8ixgaaqi125mf2gmybvhj5yvrn3fp"; + name = "kaccounts-providers-20.08.3.tar.xz"; }; }; kaddressbook = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kaddressbook-20.08.2.tar.xz"; - sha256 = "8d2e5849dd8878806e8566ce43c139633c37f027f677603600c8acc0d0d41198"; - name = "kaddressbook-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kaddressbook-20.08.3.tar.xz"; + sha256 = "00mia1jh2c5rcnsyx3wizjdg65pvpazfb8ayppjzv4rrc2nhr9nn"; + name = "kaddressbook-20.08.3.tar.xz"; }; }; kajongg = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kajongg-20.08.2.tar.xz"; - sha256 = "1eb534ac6d1d3ca14b73bd6e5b626b988acafc30b168f54d48a493adc715ecde"; - name = "kajongg-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kajongg-20.08.3.tar.xz"; + sha256 = "0wr045xqm1q03vy0jbgrldpdc9k3lgnhd39yhi574la367ayffpa"; + name = "kajongg-20.08.3.tar.xz"; }; }; kalarm = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kalarm-20.08.2.tar.xz"; - sha256 = "e783c041ac4b162cf5254e37e53854835eda6c61ef3ae2358466000a8650a4da"; - name = "kalarm-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kalarm-20.08.3.tar.xz"; + sha256 = "0194rapyvnpmhkba0rgclrai1ywx9anr8dski0j6z1yg0kgav8df"; + name = "kalarm-20.08.3.tar.xz"; }; }; kalarmcal = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kalarmcal-20.08.2.tar.xz"; - sha256 = "0398a37f412eb03b5cbf2488ce7e0c38a069f1806bda4ea9bfce4fc67311a9a6"; - name = "kalarmcal-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kalarmcal-20.08.3.tar.xz"; + sha256 = "1i9hi3y4j2pmdmlj13kl13vfplxrh8w23fxz0mmawi1wn533fp66"; + name = "kalarmcal-20.08.3.tar.xz"; }; }; kalgebra = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kalgebra-20.08.2.tar.xz"; - sha256 = "c934dc8d92917e31c17efa5b64dbec4795439a5f26762e2f214b49028bfe264d"; - name = "kalgebra-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kalgebra-20.08.3.tar.xz"; + sha256 = "0k7miil5ilrw68j6xl9g6cf3zfw7g52h0gfwd5j248nx2nxr150c"; + name = "kalgebra-20.08.3.tar.xz"; }; }; kalzium = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kalzium-20.08.2.tar.xz"; - sha256 = "474f74cbb478d3f5f69b5785711ed969ac15d5e92aee5308c6118a9d12611016"; - name = "kalzium-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kalzium-20.08.3.tar.xz"; + sha256 = "1r80bnpdrybsdwcblpj7cg32dv90l79gs0i42gpm6inilfr3vp5n"; + name = "kalzium-20.08.3.tar.xz"; }; }; kamera = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kamera-20.08.2.tar.xz"; - sha256 = "ba28cab34267ce203b4b70f4a2c2b6a75849aec83dd2d73f6903894c5c125fdf"; - name = "kamera-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kamera-20.08.3.tar.xz"; + sha256 = "06fwxdgbyywdrf1r0w17w3chfr0s8jhqswz9chmdfds9f2bb45cr"; + name = "kamera-20.08.3.tar.xz"; }; }; kamoso = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kamoso-20.08.2.tar.xz"; - sha256 = "e7d0af2781ff077261886a1683aff1d518a17f9b6d83f84fa95a7633a00f1516"; - name = "kamoso-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kamoso-20.08.3.tar.xz"; + sha256 = "0zhl3va65ajz3hdggg0jvvgvj14s461pjw9adw9bnfcbs4jzkl2y"; + name = "kamoso-20.08.3.tar.xz"; }; }; kanagram = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kanagram-20.08.2.tar.xz"; - sha256 = "3f3f961aa847f26ac875104e82b8e7e73bbc049f20460117f849df91ba9b42e2"; - name = "kanagram-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kanagram-20.08.3.tar.xz"; + sha256 = "1cyx8yq03xaw34ic69ghz9gafk8l30qinp0kkp9a1wh4pry8rnxf"; + name = "kanagram-20.08.3.tar.xz"; }; }; kapman = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kapman-20.08.2.tar.xz"; - sha256 = "932bd697f2ca0e44af6be983dae3e13df9435642b91f0e1ebba7fd50291c2cbd"; - name = "kapman-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kapman-20.08.3.tar.xz"; + sha256 = "0nh1f0v026rib5ahj1mhvs99yabrgdq71bis465vfpm4favnirzy"; + name = "kapman-20.08.3.tar.xz"; }; }; kapptemplate = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kapptemplate-20.08.2.tar.xz"; - sha256 = "3bda6d9f6127e19357f071ca6f9f05890c35a6aaf86e54bce39381f0045b6b0c"; - name = "kapptemplate-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kapptemplate-20.08.3.tar.xz"; + sha256 = "1r98ym9sazjzknxfw58hjiyxhmi49fyhrdn02v0b8fm711vprxab"; + name = "kapptemplate-20.08.3.tar.xz"; }; }; kate = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kate-20.08.2.tar.xz"; - sha256 = "718e8230edfa16f93f54380c4e214a0f25f8a398fe74ad23f12b7dcffae419d0"; - name = "kate-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kate-20.08.3.tar.xz"; + sha256 = "1m7ximinknc0l9zqv4p25ybn6zysz59l4vvdb9xkhjp53aqskdz9"; + name = "kate-20.08.3.tar.xz"; }; }; katomic = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/katomic-20.08.2.tar.xz"; - sha256 = "bb94e81cb1122b57d2601f701bc51ff8fa27ac07a5de34e5c49928d50d46ed85"; - name = "katomic-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/katomic-20.08.3.tar.xz"; + sha256 = "1v31x6371r9ccvc676vq5dlpkp4829xf0r37dnvdxlfm22mgsdnk"; + name = "katomic-20.08.3.tar.xz"; }; }; kbackup = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kbackup-20.08.2.tar.xz"; - sha256 = "bb97dd10a64c42ae80c9c87442d3a06d3c18f4f5997bd3b6d1460dec655b3e0a"; - name = "kbackup-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kbackup-20.08.3.tar.xz"; + sha256 = "1sayzvj46ckhn5zgp7qi6zmrmd7bjh5mg05mcl5pfwv4dcvxkrng"; + name = "kbackup-20.08.3.tar.xz"; }; }; kblackbox = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kblackbox-20.08.2.tar.xz"; - sha256 = "714a8749a49d1a7938b74372138ae3e5bafef50de61207e63a6d2c60b6bfded2"; - name = "kblackbox-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kblackbox-20.08.3.tar.xz"; + sha256 = "0vka2pswbza1z8f97nhxcjrczx4w1x0qyjpzs9ycn9a14smqpsrh"; + name = "kblackbox-20.08.3.tar.xz"; }; }; kblocks = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kblocks-20.08.2.tar.xz"; - sha256 = "c82f8b6e722308a236d0057028d644ebf8105c9c902d799bc2fb3e1c1ff7c188"; - name = "kblocks-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kblocks-20.08.3.tar.xz"; + sha256 = "1jc063xn6dphydf49kv0izzy0nv06dr412xxjvkp7vccwv9qd5gf"; + name = "kblocks-20.08.3.tar.xz"; }; }; kbounce = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kbounce-20.08.2.tar.xz"; - sha256 = "371fbaf7c1faeacf1c74441ec1a58f1ced862f741e67123d2eb105f1d4f9b8e2"; - name = "kbounce-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kbounce-20.08.3.tar.xz"; + sha256 = "0863vlirljvf101mdv6jxprj9axs4cikrnld3wvxrcqw3w2dy6wy"; + name = "kbounce-20.08.3.tar.xz"; }; }; kbreakout = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kbreakout-20.08.2.tar.xz"; - sha256 = "b58b9dd26eff3960bc664076ddf4d0c81c7dfd5380be1d058b86de2d3f55d2ef"; - name = "kbreakout-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kbreakout-20.08.3.tar.xz"; + sha256 = "14nd1dnbdyxv59y8iildhydhxgal38hvj7bk6544glwl8yalak8z"; + name = "kbreakout-20.08.3.tar.xz"; }; }; kbruch = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kbruch-20.08.2.tar.xz"; - sha256 = "54c5997a8d6405439448dd929bf16017c9e5db052b30c9bf144c656c6d8b9e0b"; - name = "kbruch-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kbruch-20.08.3.tar.xz"; + sha256 = "03s1hl4h8rsx0gn7wqfssi1ga4igx48jb47gpw6f9rfjm8f199vb"; + name = "kbruch-20.08.3.tar.xz"; }; }; kcachegrind = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kcachegrind-20.08.2.tar.xz"; - sha256 = "e6b84a323a21ae7975ccc07154bcdc6eef1bc92818b800cfc5d546ada7f0387c"; - name = "kcachegrind-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kcachegrind-20.08.3.tar.xz"; + sha256 = "17j06z9cpj5qhfbp1xgw4qmhi4jckf2i99c9brys4ifb3p0rkbrs"; + name = "kcachegrind-20.08.3.tar.xz"; }; }; kcalc = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kcalc-20.08.2.tar.xz"; - sha256 = "76b6c8e44c789090c0155f79878df8f27c96d2df4273443b0f05a42ec81902cf"; - name = "kcalc-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kcalc-20.08.3.tar.xz"; + sha256 = "1mk30fkv51w3fqlpkzgm1yj5sp98h26kkphplqkjva5v6s1jzmjy"; + name = "kcalc-20.08.3.tar.xz"; }; }; kcalutils = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kcalutils-20.08.2.tar.xz"; - sha256 = "fccae5166b627f654412344d0090000ecd270af54b0cedb8648e35af26369cae"; - name = "kcalutils-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kcalutils-20.08.3.tar.xz"; + sha256 = "1i2yh4gvdwlylj7f7p32g1z7lzh3p19rrbd96l1gqhy700f2whpw"; + name = "kcalutils-20.08.3.tar.xz"; }; }; kcharselect = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kcharselect-20.08.2.tar.xz"; - sha256 = "9438e723469b6bf0d87b23965c6d925800ff35b2cc2214a7eeb5fb41009489e0"; - name = "kcharselect-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kcharselect-20.08.3.tar.xz"; + sha256 = "1p6rijjfa2jk4vr0ivjn6p5qf2ys5kvhw0cwfyjs45ff7zg0s2ga"; + name = "kcharselect-20.08.3.tar.xz"; }; }; kcolorchooser = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kcolorchooser-20.08.2.tar.xz"; - sha256 = "f314c31932704e7136b5fff89efe95e84e4215f3902089f9d838411f0fbc0c72"; - name = "kcolorchooser-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kcolorchooser-20.08.3.tar.xz"; + sha256 = "1874qa04whiivyydxfcn0f1xch515ga1af4ym42zqz64j3kq7i47"; + name = "kcolorchooser-20.08.3.tar.xz"; }; }; kcron = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kcron-20.08.2.tar.xz"; - sha256 = "ce72bb7c48606b0611cfe46a545224cca131d34a4b678c86d9ac473071833f83"; - name = "kcron-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kcron-20.08.3.tar.xz"; + sha256 = "1piwssyg9fvah25gql6w0n8xf634f6gy475cz52gb1bl7rp72q6j"; + name = "kcron-20.08.3.tar.xz"; }; }; kdebugsettings = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kdebugsettings-20.08.2.tar.xz"; - sha256 = "78502b1a52f9f81ff848e5b210b37a3a74da7c0032de2513f23c1d25cf801283"; - name = "kdebugsettings-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kdebugsettings-20.08.3.tar.xz"; + sha256 = "11xnvr9qib3hnp48whsw659c724s2114p5dr3fswvhm3hkw1aky7"; + name = "kdebugsettings-20.08.3.tar.xz"; }; }; kdeconnect-kde = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kdeconnect-kde-20.08.2.tar.xz"; - sha256 = "6d43e38620987de1ddcfdfa7d4e6e31ff383b806139ba02e69a99c3ddfb4ee67"; - name = "kdeconnect-kde-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kdeconnect-kde-20.08.3.tar.xz"; + sha256 = "0x10ga81qlsahavmv356xzjxyds41y2b4v338rqcyqkxvfmxj01k"; + name = "kdeconnect-kde-20.08.3.tar.xz"; }; }; kde-dev-scripts = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kde-dev-scripts-20.08.2.tar.xz"; - sha256 = "ff1a819991903b09bef3637b579d215e087310e39b98a1a6928e15f193aec056"; - name = "kde-dev-scripts-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kde-dev-scripts-20.08.3.tar.xz"; + sha256 = "0x8ba4mlxx17vk674738xln2dy696b148fa3s87za4yb4jj9gc5n"; + name = "kde-dev-scripts-20.08.3.tar.xz"; }; }; kde-dev-utils = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kde-dev-utils-20.08.2.tar.xz"; - sha256 = "21a4a11e102cbbd9fed955720966d7be2f7a615f57c9bf1dfc94ce973d25ffc3"; - name = "kde-dev-utils-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kde-dev-utils-20.08.3.tar.xz"; + sha256 = "0k7zb1km89nnqfi2p1mhp6dvwkhmgbcgw89301acag34yy954dvn"; + name = "kde-dev-utils-20.08.3.tar.xz"; }; }; kdeedu-data = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kdeedu-data-20.08.2.tar.xz"; - sha256 = "9030c39b92a7500254e8303ce246d2535cd66a203bb96b2670defd5288294ad1"; - name = "kdeedu-data-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kdeedu-data-20.08.3.tar.xz"; + sha256 = "1k164h4n8r4yjlll5900fz764lr0qiy3q1fpcpkr8f1n7qs7f797"; + name = "kdeedu-data-20.08.3.tar.xz"; }; }; kdegraphics-mobipocket = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kdegraphics-mobipocket-20.08.2.tar.xz"; - sha256 = "8972079756633abe8cbfaa39cdff9d56f89958861e6e418738311bcdc52771a5"; - name = "kdegraphics-mobipocket-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kdegraphics-mobipocket-20.08.3.tar.xz"; + sha256 = "0ifxbwn7pmxr7y4ri617a303b27nqwqa418isgfrfk11jc4yyxhq"; + name = "kdegraphics-mobipocket-20.08.3.tar.xz"; }; }; kdegraphics-thumbnailers = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kdegraphics-thumbnailers-20.08.2.tar.xz"; - sha256 = "977cf6c40ba00a8a391a951aab80c55d9615927a1ef4a7bb5eea2f6a83373532"; - name = "kdegraphics-thumbnailers-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kdegraphics-thumbnailers-20.08.3.tar.xz"; + sha256 = "0mbzkw7pxcfmkpb8ivhahnxkkrkjhmbjqy2l9gqx35gp5855gmxf"; + name = "kdegraphics-thumbnailers-20.08.3.tar.xz"; }; }; kdenetwork-filesharing = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kdenetwork-filesharing-20.08.2.tar.xz"; - sha256 = "f909ee8433baf906b6c23af4747d83ae3e151e213585abe01282213012228b3a"; - name = "kdenetwork-filesharing-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kdenetwork-filesharing-20.08.3.tar.xz"; + sha256 = "0id19wmiivdrx10r1hwbwi7bx6g1v9g5lpbhlmfrapvy82ijfmbg"; + name = "kdenetwork-filesharing-20.08.3.tar.xz"; }; }; kdenlive = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kdenlive-20.08.2.tar.xz"; - sha256 = "535df45a148f0f94271e045ef0c93575fded83da7a2b727aeaf90e61e1d7c418"; - name = "kdenlive-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kdenlive-20.08.3.tar.xz"; + sha256 = "187d5khqq9ckmqp8amd7ghlvig1z97w2jzm9s4zsfhjzyqv3d3wz"; + name = "kdenlive-20.08.3.tar.xz"; }; }; kdepim-addons = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kdepim-addons-20.08.2.tar.xz"; - sha256 = "f7ab0d9ee2b9351959199f8903c447c6cb82fd58d642b7039cd2b8e324038b01"; - name = "kdepim-addons-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kdepim-addons-20.08.3.tar.xz"; + sha256 = "17m8pwiig46pc6x4ylvymb3b6c7xcm2df3vjma665kcir1dr0q7p"; + name = "kdepim-addons-20.08.3.tar.xz"; }; }; kdepim-apps-libs = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kdepim-apps-libs-20.08.2.tar.xz"; - sha256 = "8c3ebdf7072d3a5a6ea2921697b28aa27e51ba43db152ea83a07b4b13c282434"; - name = "kdepim-apps-libs-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kdepim-apps-libs-20.08.3.tar.xz"; + sha256 = "08iw1p9mv4jic7pk6skxc5anp7k46lhcdqxpq1i6wlhbrk6bpsvg"; + name = "kdepim-apps-libs-20.08.3.tar.xz"; }; }; kdepim-runtime = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kdepim-runtime-20.08.2.tar.xz"; - sha256 = "3b475dfd394d5c09991eb4e1f0ddb3e2aa1f586ed75aa7961b159ef712d80132"; - name = "kdepim-runtime-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kdepim-runtime-20.08.3.tar.xz"; + sha256 = "0zz2zwq3gr177vgkwz6b70q4n2ra4ym58f167pgvi9kxv3884fib"; + name = "kdepim-runtime-20.08.3.tar.xz"; }; }; kdesdk-kioslaves = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kdesdk-kioslaves-20.08.2.tar.xz"; - sha256 = "5e79532675d717d906f6b43eea1cac20fe1513bcf497696251c00fe74e2f0f58"; - name = "kdesdk-kioslaves-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kdesdk-kioslaves-20.08.3.tar.xz"; + sha256 = "1kwzms0qha058cm92d4f8pr89r3bqaqx5zfw6gz05s6lg892j5in"; + name = "kdesdk-kioslaves-20.08.3.tar.xz"; }; }; kdesdk-thumbnailers = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kdesdk-thumbnailers-20.08.2.tar.xz"; - sha256 = "0b6809e2469d7057b6d674d5950fd4f6243a1d3d185452212522880c714c1c63"; - name = "kdesdk-thumbnailers-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kdesdk-thumbnailers-20.08.3.tar.xz"; + sha256 = "10fc0agpvzpqdxqynd70vzya0g1nbdw0ylbnl9w35n9jhww42jff"; + name = "kdesdk-thumbnailers-20.08.3.tar.xz"; }; }; kdf = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kdf-20.08.2.tar.xz"; - sha256 = "b33c043c18ae7b80b40e73c0a34759540724fa81815a6afa1e91e3ad44aec27e"; - name = "kdf-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kdf-20.08.3.tar.xz"; + sha256 = "02k5nhsf1zzkx9cl3r2500pj2zfmvjhlfsb3smgpka6in7iivxyp"; + name = "kdf-20.08.3.tar.xz"; }; }; kdialog = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kdialog-20.08.2.tar.xz"; - sha256 = "1bb808c2d01680e2396f282b798d9e22d2c1722f992c672eaf7451bf83a5d459"; - name = "kdialog-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kdialog-20.08.3.tar.xz"; + sha256 = "0knl6176bjazjiacg1qqaldlqcjlb3bi829sliq1sdh4lzzwrbzk"; + name = "kdialog-20.08.3.tar.xz"; }; }; kdiamond = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kdiamond-20.08.2.tar.xz"; - sha256 = "7bfc2b24d86c663bff719156ba20cd36017f1df647ee6769b5101aa6ab3e3e21"; - name = "kdiamond-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kdiamond-20.08.3.tar.xz"; + sha256 = "0ls1kg3wank1al46knq12jilmp8gaa4rn7zbgflcrhgy5gw8l5px"; + name = "kdiamond-20.08.3.tar.xz"; }; }; keditbookmarks = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/keditbookmarks-20.08.2.tar.xz"; - sha256 = "87d72e78c907e7829a642364f3a49dd0f0dea0c76e7a5c524a67f957dca94b9b"; - name = "keditbookmarks-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/keditbookmarks-20.08.3.tar.xz"; + sha256 = "0m8ap5hvjgldj9hdk6shpkv8xylhhjla2xn1zs86pvj4la3zh4f8"; + name = "keditbookmarks-20.08.3.tar.xz"; }; }; kfind = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kfind-20.08.2.tar.xz"; - sha256 = "2381bbe7793a666fa9463aead1246dc4244409f68375f6d75e1423be15b42d74"; - name = "kfind-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kfind-20.08.3.tar.xz"; + sha256 = "10i5mw6q2parq5w7pi955kgfvdlw8hwis2p7r9vkvabjdk69nkdr"; + name = "kfind-20.08.3.tar.xz"; }; }; kfloppy = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kfloppy-20.08.2.tar.xz"; - sha256 = "7f624d03dc3dc5099ac1479148800043195fa6c0e3bb6d7efcb452a76e99e191"; - name = "kfloppy-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kfloppy-20.08.3.tar.xz"; + sha256 = "1cp0pwgldscc7va508gk43im3fv0lsxd5sbhpw8kxlzjlpbwlp8v"; + name = "kfloppy-20.08.3.tar.xz"; }; }; kfourinline = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kfourinline-20.08.2.tar.xz"; - sha256 = "aed2ecdb40b2e3d5452b183a1817216373d32a0aab4eff02f6c823a6f8d801eb"; - name = "kfourinline-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kfourinline-20.08.3.tar.xz"; + sha256 = "0h1n44dncr2siw447n7b0gkx3380vajvqjsgjvapkg7m7bmz7nsv"; + name = "kfourinline-20.08.3.tar.xz"; }; }; kgeography = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kgeography-20.08.2.tar.xz"; - sha256 = "82c4798f3184c77d0be63aeb5e86c84240c9cb0aa0e66ff57f92c0b5c3748f19"; - name = "kgeography-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kgeography-20.08.3.tar.xz"; + sha256 = "1mk5cip55chc8pmh8wfl7an5x076ywisr0i7isqcjaij2cv54283"; + name = "kgeography-20.08.3.tar.xz"; }; }; kget = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kget-20.08.2.tar.xz"; - sha256 = "42993095d6325e921b6ed36f4b0a2153ffd5d68cfa3e6d3ced2db09e2a6aabb8"; - name = "kget-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kget-20.08.3.tar.xz"; + sha256 = "144ydk8bbfirph464mkkvwpnynj465i2ynhm8n9d330kcrhnaxd0"; + name = "kget-20.08.3.tar.xz"; }; }; kgoldrunner = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kgoldrunner-20.08.2.tar.xz"; - sha256 = "4bbcfcf5cf810e0b1f78e1a88d222631c07401187fb327deaa5ab6658483d351"; - name = "kgoldrunner-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kgoldrunner-20.08.3.tar.xz"; + sha256 = "101cdl04wb6xbq95b51ax36570y9ahkcy5gccqsyvc307ij9yg7r"; + name = "kgoldrunner-20.08.3.tar.xz"; }; }; kgpg = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kgpg-20.08.2.tar.xz"; - sha256 = "fc4ec5c38c3bdb02a399f0eb1e75da356a523ada369d5410c2f4e7f5f14a508f"; - name = "kgpg-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kgpg-20.08.3.tar.xz"; + sha256 = "1ip21yal37yxg5i5sfy6lgfb3sz9lld0dwa7a1w4lbddf9w3akd6"; + name = "kgpg-20.08.3.tar.xz"; }; }; khangman = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/khangman-20.08.2.tar.xz"; - sha256 = "7ff30ecbab7c9e8f44b7e8c3887ec78a918c919ce902005aeb7fb969ac995b28"; - name = "khangman-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/khangman-20.08.3.tar.xz"; + sha256 = "1zwdd2gpjkld3vkawp0lj83il257ryxf8wpmbgzn1wz8sxxi01jj"; + name = "khangman-20.08.3.tar.xz"; }; }; khelpcenter = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/khelpcenter-20.08.2.tar.xz"; - sha256 = "36051a4352a05dd9b74b4e325c0e16e30d6bd8b48d6c3d13980b39a77aab4e2d"; - name = "khelpcenter-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/khelpcenter-20.08.3.tar.xz"; + sha256 = "1xan4awwgs08k7ksfy80rfcxqd6bi8i1fjdgy55hh7wshv76zf5r"; + name = "khelpcenter-20.08.3.tar.xz"; }; }; kidentitymanagement = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kidentitymanagement-20.08.2.tar.xz"; - sha256 = "17a1fd47d91289519cafb12c0d917b4775496ada447cb6f4ba56dc42446152ec"; - name = "kidentitymanagement-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kidentitymanagement-20.08.3.tar.xz"; + sha256 = "0vkydvf4yw3qlqrg9m1zdm6j0c1crxdvc7l24yls9fjbj957vbls"; + name = "kidentitymanagement-20.08.3.tar.xz"; }; }; kig = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kig-20.08.2.tar.xz"; - sha256 = "401832d384e47ea6daf310f7e823ae6b8a55bc117b7570bd4bf36261d01587f5"; - name = "kig-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kig-20.08.3.tar.xz"; + sha256 = "1dvizdfkvl7p7hr4xm4zh51lpr8qr3s5j5zz162s7arr7sws4w8h"; + name = "kig-20.08.3.tar.xz"; }; }; kigo = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kigo-20.08.2.tar.xz"; - sha256 = "b9e6edd2e35e57edb3d89bb76f1d7e4a9e7f8fb64644b58012543a367834aa60"; - name = "kigo-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kigo-20.08.3.tar.xz"; + sha256 = "0sx3klivzn8h96mpnbkiv2nbi2l6w0j6fclj7q3ql3cm81jh6n15"; + name = "kigo-20.08.3.tar.xz"; }; }; killbots = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/killbots-20.08.2.tar.xz"; - sha256 = "332ebd24be6ea62c8621aeaa5b200d6ebf03ae0198a06693b36b2c80cac89d95"; - name = "killbots-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/killbots-20.08.3.tar.xz"; + sha256 = "1j41my0brpqpvd8xibv39z4x4kmw1sqz7wy7ibhh0zir3jh64n83"; + name = "killbots-20.08.3.tar.xz"; }; }; kimagemapeditor = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kimagemapeditor-20.08.2.tar.xz"; - sha256 = "fd8272978a7c3a1d95b20a5ec57ccf00d740a8d6eb483f0a204d03669215309c"; - name = "kimagemapeditor-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kimagemapeditor-20.08.3.tar.xz"; + sha256 = "1m9mrksdl08ijmpmx3lhdysnm70mrnqz9rlbcn1h95p2sq0bk8cg"; + name = "kimagemapeditor-20.08.3.tar.xz"; }; }; kimap = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kimap-20.08.2.tar.xz"; - sha256 = "bda4f4b4e94481b70cec270655c0fd2888da51106d80c0388ae5c0dc5d36e092"; - name = "kimap-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kimap-20.08.3.tar.xz"; + sha256 = "16paglkqgnyzwjydhn02qw7zg0d4casir4bsfch15wdmqv389mrg"; + name = "kimap-20.08.3.tar.xz"; }; }; kio-extras = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kio-extras-20.08.2.tar.xz"; - sha256 = "9d4b9cb5a4002ad2127c5c5c4d25ff95d53de32ea08348e8dc40fe83d950076e"; - name = "kio-extras-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kio-extras-20.08.3.tar.xz"; + sha256 = "0i7k9asc97r9z4lfk5hyf7mcbx0za7j6v4dhqn43j5v4x2i0201c"; + name = "kio-extras-20.08.3.tar.xz"; }; }; kio-gdrive = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kio-gdrive-20.08.2.tar.xz"; - sha256 = "71047e9f8e5ad9317cc3dbf1de2d121f322b5d968d3685351ef0d2aabe2f46ca"; - name = "kio-gdrive-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kio-gdrive-20.08.3.tar.xz"; + sha256 = "0pp0nvsnfdm8vskw194qjfac4agnlsjm44w1704b5sqx6i27dafy"; + name = "kio-gdrive-20.08.3.tar.xz"; }; }; kipi-plugins = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kipi-plugins-20.08.2.tar.xz"; - sha256 = "89de8f75dd01e2130c1e651bd04717ce4d35768202ae3e825c93c75c8312e583"; - name = "kipi-plugins-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kipi-plugins-20.08.3.tar.xz"; + sha256 = "1pplhv8yjfl1ifx9ykf4w2lgma8jvshihmd5c5mz9liqk3lawq15"; + name = "kipi-plugins-20.08.3.tar.xz"; }; }; kirigami-gallery = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kirigami-gallery-20.08.2.tar.xz"; - sha256 = "0b4a5cec32bdfaef42b790f1d249d227c9daf56e0f3c1e302d33ccaa485c28e5"; - name = "kirigami-gallery-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kirigami-gallery-20.08.3.tar.xz"; + sha256 = "0l100ng8ai55s0vl8nkpq4vysy2nc6sk1dbisc2mp7br74ykyfp9"; + name = "kirigami-gallery-20.08.3.tar.xz"; }; }; kiriki = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kiriki-20.08.2.tar.xz"; - sha256 = "42081e39c045bd830c6a79938a83690ea5641aa9e5437645234441da2d29b053"; - name = "kiriki-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kiriki-20.08.3.tar.xz"; + sha256 = "1gddjii84cbz1dg8k0pnd3dyzar4lvj03j9v84vabggjjjbpir0f"; + name = "kiriki-20.08.3.tar.xz"; }; }; kiten = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kiten-20.08.2.tar.xz"; - sha256 = "a7285d5880611da2202d0e3f8f2bf860f275932d3da54ff7aecc793225f7ad7d"; - name = "kiten-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kiten-20.08.3.tar.xz"; + sha256 = "0n9mq86gcl6s2f45l8lbp4gsdj356l78xjkdvm14f6qlh81vsqlc"; + name = "kiten-20.08.3.tar.xz"; }; }; kitinerary = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kitinerary-20.08.2.tar.xz"; - sha256 = "69d8b5f64774860e5098c1dbfb06d274da4379c04383c4f0f0e412481c48fa27"; - name = "kitinerary-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kitinerary-20.08.3.tar.xz"; + sha256 = "169pmy5fyjkbya8r2kdkd9s83sim0jplc3lx8bv2xh6r10mvzgm6"; + name = "kitinerary-20.08.3.tar.xz"; }; }; kjumpingcube = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kjumpingcube-20.08.2.tar.xz"; - sha256 = "0edba227e24b8aeda4e75bc6c25ad25b50ac624b5319a64ce20d6c3f7691a48a"; - name = "kjumpingcube-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kjumpingcube-20.08.3.tar.xz"; + sha256 = "19246jwwd686x8i0jrvz2c8mpkf6qhm7rnskzin59dqzr76xrpgz"; + name = "kjumpingcube-20.08.3.tar.xz"; }; }; kldap = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kldap-20.08.2.tar.xz"; - sha256 = "dfc8bd59d837766e741b33cf8486256b7bd5ffc33ff2aab240d47b4766ec8489"; - name = "kldap-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kldap-20.08.3.tar.xz"; + sha256 = "1ihaazsnb9r30m2qhzcp2ns9f5fs7l3agsc9f9wxi4cyw73bq0n3"; + name = "kldap-20.08.3.tar.xz"; }; }; kleopatra = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kleopatra-20.08.2.tar.xz"; - sha256 = "70ffa2d1549b6b4674a9cd92052174002d81fb236cfbf872187c6e3616191ba2"; - name = "kleopatra-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kleopatra-20.08.3.tar.xz"; + sha256 = "1r879g7hw3c5cww58z0kvqj47pgzbiq1vpgxz847smrylqajcpyi"; + name = "kleopatra-20.08.3.tar.xz"; }; }; klettres = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/klettres-20.08.2.tar.xz"; - sha256 = "9cef7dea479d27644e4812157d4cf3993dc3ee84b847377a17cec305a03a3156"; - name = "klettres-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/klettres-20.08.3.tar.xz"; + sha256 = "0irc0f7vjznlsczan30zzprbnvgnbg19vabr97cw9rkkfa28azx9"; + name = "klettres-20.08.3.tar.xz"; }; }; klickety = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/klickety-20.08.2.tar.xz"; - sha256 = "90665c5aeda52f55af8dcf3936e557ba431d9e48c6be361eaeb82117b6213a33"; - name = "klickety-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/klickety-20.08.3.tar.xz"; + sha256 = "1qsm9grmy0bnalpdghg48xi68zzk6ysmg6n0d74ldmmnirv3r0zf"; + name = "klickety-20.08.3.tar.xz"; }; }; klines = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/klines-20.08.2.tar.xz"; - sha256 = "8e8b897cdc3c31fada1dd2635da211def507f47c8062c6458f559283ae470edb"; - name = "klines-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/klines-20.08.3.tar.xz"; + sha256 = "1l95ph1sjp3r1q065k3rj18lm36krl7bh41zgqh021p692ywc48c"; + name = "klines-20.08.3.tar.xz"; }; }; kmag = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kmag-20.08.2.tar.xz"; - sha256 = "8e933e8ebbf0ab956e2a251312e3d4e027848dc2f2b4e8a7c7250b8fdf10ca05"; - name = "kmag-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kmag-20.08.3.tar.xz"; + sha256 = "0y44gz3qn91vl840xz25l5kc5jj82k5qqxkgsvvyld2s99rif84k"; + name = "kmag-20.08.3.tar.xz"; }; }; kmahjongg = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kmahjongg-20.08.2.tar.xz"; - sha256 = "98e34794560a062bd22950acc583b77a6f8d1d28aceb863604f5a6c98c6cc80d"; - name = "kmahjongg-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kmahjongg-20.08.3.tar.xz"; + sha256 = "0wgp9m7xzf5ysmrrnyng4p4jypvzfnqkyw62gknl0qhk531cgq3h"; + name = "kmahjongg-20.08.3.tar.xz"; }; }; kmail = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kmail-20.08.2.tar.xz"; - sha256 = "ff179b89836236174cd587ce4ea2a4320e58345d45582cb157186cfbb01e58f2"; - name = "kmail-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kmail-20.08.3.tar.xz"; + sha256 = "0g59s7wl0n4bp8kw559rdlamlqxl47qvwfms9kr9ign35rvs0ghg"; + name = "kmail-20.08.3.tar.xz"; }; }; kmail-account-wizard = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kmail-account-wizard-20.08.2.tar.xz"; - sha256 = "7cdb9b60b1a646f0c5c0d0e7dfbe357a9f66bb305afbccbb4b421ee6f6941df8"; - name = "kmail-account-wizard-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kmail-account-wizard-20.08.3.tar.xz"; + sha256 = "0vama5a02dfgxrl4iz88lbi8dvq3d9b055xil770d90pwp0sljcz"; + name = "kmail-account-wizard-20.08.3.tar.xz"; }; }; kmailtransport = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kmailtransport-20.08.2.tar.xz"; - sha256 = "8b12836b1ca0243819680cba73c809c491c5e7a8d1ea9d9dc23e7338aed69a0c"; - name = "kmailtransport-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kmailtransport-20.08.3.tar.xz"; + sha256 = "07552qj3ngwvyss7f8cy87c0gmzc47agn54wk85qq0v1fwr73n6z"; + name = "kmailtransport-20.08.3.tar.xz"; }; }; kmbox = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kmbox-20.08.2.tar.xz"; - sha256 = "4fa1ad98368130dcdc8ad71dba3084c489130b1e8fc4a2b119ffc6f56595ba73"; - name = "kmbox-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kmbox-20.08.3.tar.xz"; + sha256 = "0ipmwcicn3qklybqy9v41lh7byn7j62ja8b0xf06z9nliwkk4b0b"; + name = "kmbox-20.08.3.tar.xz"; }; }; kmime = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kmime-20.08.2.tar.xz"; - sha256 = "9f23e2814e62ae6c4a67fd3223315ef875776f9d098b4d11c7d06a726a725435"; - name = "kmime-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kmime-20.08.3.tar.xz"; + sha256 = "1ndbx712vm4v0fi7p8j28d8z35h3bmsixc97z5r9dg03v1kzd36v"; + name = "kmime-20.08.3.tar.xz"; }; }; kmines = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kmines-20.08.2.tar.xz"; - sha256 = "6b07a812497a665505b6b1e3a84ac0818f1a5e5757146cdbceec55e94bb41753"; - name = "kmines-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kmines-20.08.3.tar.xz"; + sha256 = "1mn5hip3vnzmkk1hy14glsplp7f5pm56yv0d5mz25icfgw0xa6lp"; + name = "kmines-20.08.3.tar.xz"; }; }; kmix = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kmix-20.08.2.tar.xz"; - sha256 = "73453f02a72384382fd7449215189e22b5e1600e9ef0c9cc910f3fddd09beb85"; - name = "kmix-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kmix-20.08.3.tar.xz"; + sha256 = "00gm93faqmqx0hhkxi3k2pn6sq82k2f622vqgk7mwznkpg66mf4k"; + name = "kmix-20.08.3.tar.xz"; }; }; kmousetool = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kmousetool-20.08.2.tar.xz"; - sha256 = "c1f70c172dc2ad7d937db5e6355522082f924ba45e7aac1bbb1c04e230f1d406"; - name = "kmousetool-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kmousetool-20.08.3.tar.xz"; + sha256 = "09qznykysr42rzz5cmqvhvz91cr8dbzwjd73hwaib2lfs3c2cgbl"; + name = "kmousetool-20.08.3.tar.xz"; }; }; kmouth = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kmouth-20.08.2.tar.xz"; - sha256 = "d206afecdbe5f063dfbf805956f475e95c7b0fd548fd5f1b4fd7376ea6747e96"; - name = "kmouth-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kmouth-20.08.3.tar.xz"; + sha256 = "0ajhnl1sjllfb42nyafpirmlgcs6waqp8qxvgsz5dk5zkb8daqmr"; + name = "kmouth-20.08.3.tar.xz"; }; }; kmplot = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kmplot-20.08.2.tar.xz"; - sha256 = "c3bc34a2d1bf4620745009b49b6541a16ac64eb3d1e6cf1ba936b14aa5d02e2b"; - name = "kmplot-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kmplot-20.08.3.tar.xz"; + sha256 = "0cv7q1wmbb3fkf4s6ns4q1il5zr4q02b3xghpp661ma82d8jhjcy"; + name = "kmplot-20.08.3.tar.xz"; }; }; knavalbattle = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/knavalbattle-20.08.2.tar.xz"; - sha256 = "2cd91ee61193810eee62e47f38f590e81b03287083f31564e0ebfd893d339ac9"; - name = "knavalbattle-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/knavalbattle-20.08.3.tar.xz"; + sha256 = "1028i8zl5ynm3vvqajsms2hq8gmmjmjc5dc6r3jyh6r964vxq3nq"; + name = "knavalbattle-20.08.3.tar.xz"; }; }; knetwalk = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/knetwalk-20.08.2.tar.xz"; - sha256 = "4a97f4b1af463e5e50698e8ac089cf6933fb66f25dd9b0fae3f1b1a51cbca3c0"; - name = "knetwalk-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/knetwalk-20.08.3.tar.xz"; + sha256 = "13pspvi2p68irpbr3f2ck78qmvfl3vahm5qjw2fwhidhpindf9nl"; + name = "knetwalk-20.08.3.tar.xz"; }; }; knights = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/knights-20.08.2.tar.xz"; - sha256 = "b62dda6e8b5bb85cc814f7244e39806e38c266be1bf3090eb6de59c8141fc1d4"; - name = "knights-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/knights-20.08.3.tar.xz"; + sha256 = "0zqb87mr2x085hi3r9cvdrx2kvxmclh4ffi1ajcb8v1f79wiwzin"; + name = "knights-20.08.3.tar.xz"; }; }; knotes = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/knotes-20.08.2.tar.xz"; - sha256 = "1e61f2c8b5fe9075f07be16543e3a7310bf533b6c2446f162f7196b41e3e6ecb"; - name = "knotes-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/knotes-20.08.3.tar.xz"; + sha256 = "0ysw8js2s6njilg4v4vqrl1bzcmqvk42l68pzvyflr112zviqz28"; + name = "knotes-20.08.3.tar.xz"; }; }; kolf = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kolf-20.08.2.tar.xz"; - sha256 = "834c1c6cdc62e650c7b0d36db26387cc4ebe2bb4b2e8fa06c0bf461e3a1e8c64"; - name = "kolf-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kolf-20.08.3.tar.xz"; + sha256 = "1ywyny8iq2sxglsvpgw6p3w3w567k6cw6waywfcfy0lcnfarg1n0"; + name = "kolf-20.08.3.tar.xz"; }; }; kollision = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kollision-20.08.2.tar.xz"; - sha256 = "9b6829f49d9baa89596ef8649996724db72c3c8eb793b9b6afc80dc0d07c0421"; - name = "kollision-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kollision-20.08.3.tar.xz"; + sha256 = "1l8a32bni40jz5jna0ip9ggbx7zp1hhiw2mip7v8f6qc4arbknl8"; + name = "kollision-20.08.3.tar.xz"; }; }; kolourpaint = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kolourpaint-20.08.2.tar.xz"; - sha256 = "fbcd875a4a407d9b1e5a637d4947bacfb50f39e10af3327f30fdbb953528aae0"; - name = "kolourpaint-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kolourpaint-20.08.3.tar.xz"; + sha256 = "0d64gnnb553rxscr8710h5bx8ijxd87jrbix07k41y79i5x60irh"; + name = "kolourpaint-20.08.3.tar.xz"; }; }; kompare = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kompare-20.08.2.tar.xz"; - sha256 = "4e52cb2c9e35e90fe77bfb23bd10c1931c56b11e3fec06c215730d60c47e8550"; - name = "kompare-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kompare-20.08.3.tar.xz"; + sha256 = "0r9m2vcw9hbdkfdy24pfpqs2b5r0jyxh1ma2h66hfv4ycd470ilc"; + name = "kompare-20.08.3.tar.xz"; }; }; konqueror = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/konqueror-20.08.2.tar.xz"; - sha256 = "f0622aa67ad0028e28bd6129688aab8946fb49492f0b335f6624ab7d4ef239d7"; - name = "konqueror-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/konqueror-20.08.3.tar.xz"; + sha256 = "1ssjj83jcbcq8i7wx5zd12z7crh2zg6awbpy38maq3c7747nqz7k"; + name = "konqueror-20.08.3.tar.xz"; }; }; konquest = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/konquest-20.08.2.tar.xz"; - sha256 = "cf97a6961b15b39f5bcdf541e52c137f1d67d0fa5ee259922b4e762edc4491eb"; - name = "konquest-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/konquest-20.08.3.tar.xz"; + sha256 = "1wq0j02dzdah6yhx8r2cg191617hid9fs780yr317fprkwkgb8cb"; + name = "konquest-20.08.3.tar.xz"; }; }; konsole = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/konsole-20.08.2.tar.xz"; - sha256 = "af08ac7666f1ba7c407205f32aaaf015329621247502e80d8df4abe103148951"; - name = "konsole-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/konsole-20.08.3.tar.xz"; + sha256 = "0jjidy756x8n456qbm977a73l8229kk8i489jh52296k8pkh6yjx"; + name = "konsole-20.08.3.tar.xz"; }; }; kontact = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kontact-20.08.2.tar.xz"; - sha256 = "232d9880df74ce0c7697f08b53ef9512ac9c11c3b04142ba7ba4b95091cb5396"; - name = "kontact-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kontact-20.08.3.tar.xz"; + sha256 = "0qasgxvq7xps0zxk4hf2sizmy90mxyq70m2pq49pq17ij2pa9ynl"; + name = "kontact-20.08.3.tar.xz"; }; }; kontactinterface = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kontactinterface-20.08.2.tar.xz"; - sha256 = "72d53dbea9db0b1f5654e13c18b4da3d256c6b9d08dfe4581cdf73e3552d2a07"; - name = "kontactinterface-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kontactinterface-20.08.3.tar.xz"; + sha256 = "1ah2814js08sm49ykarqdw7z03w4fbym5cc4vwmzimcvh2bc78j3"; + name = "kontactinterface-20.08.3.tar.xz"; }; }; kopete = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kopete-20.08.2.tar.xz"; - sha256 = "05f5d6236d4c96b9ce7ba5f24f4e06d7263a78cac27368a7e6b3e5075d42fbb1"; - name = "kopete-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kopete-20.08.3.tar.xz"; + sha256 = "1lsab66k0xq1g0w0cxcpadmf9kkc09x8wwbv4i8y3aj2mn7849gh"; + name = "kopete-20.08.3.tar.xz"; }; }; korganizer = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/korganizer-20.08.2.tar.xz"; - sha256 = "4f719ec12c52fc313997a187439dc6888fd030a4a1b2357db000abc0a19527b2"; - name = "korganizer-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/korganizer-20.08.3.tar.xz"; + sha256 = "112h6vn2y9d3q3z62cwg3zrak3xgx9affibc9cvr6fzhp4z0x9ps"; + name = "korganizer-20.08.3.tar.xz"; }; }; kpat = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kpat-20.08.2.tar.xz"; - sha256 = "e4aaed4e876212a926a05d252dab9d01f240d829e383c6072e168a4f78e6d446"; - name = "kpat-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kpat-20.08.3.tar.xz"; + sha256 = "1id4b9jkphi8pp29gc2vb3n9f0g8kl9yy5v8cnyv3jq673aj0fs9"; + name = "kpat-20.08.3.tar.xz"; }; }; kpimtextedit = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kpimtextedit-20.08.2.tar.xz"; - sha256 = "2dfbcdd53669c812234346b4d31b61af9c510bb4cb0b9912decea8d3c4d406a6"; - name = "kpimtextedit-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kpimtextedit-20.08.3.tar.xz"; + sha256 = "1m4r5zbhbjvj3za78xfp3dibyf7mp9gan5ir5zd0k2p7adp3i652"; + name = "kpimtextedit-20.08.3.tar.xz"; }; }; kpkpass = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kpkpass-20.08.2.tar.xz"; - sha256 = "ed699c75128ef299f06d699c80c69ac9529fa044db6f18a39d54a5e70d85108c"; - name = "kpkpass-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kpkpass-20.08.3.tar.xz"; + sha256 = "0zw3xx5mi38za0xbvld97f5bqvwwgyz47kybyrdm7jrhvmmiiiis"; + name = "kpkpass-20.08.3.tar.xz"; }; }; kqtquickcharts = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kqtquickcharts-20.08.2.tar.xz"; - sha256 = "2ba593a65c143cb56a3030f7ee0cced2df7c7e9431cebf1ae93be51c68b4c3b4"; - name = "kqtquickcharts-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kqtquickcharts-20.08.3.tar.xz"; + sha256 = "0l7v8vrc7by0w0yshnh21jaqhspmhkvm5cd0hpay6jc9v2azkcf3"; + name = "kqtquickcharts-20.08.3.tar.xz"; }; }; krdc = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/krdc-20.08.2.tar.xz"; - sha256 = "52ddd68bdb1b356be341cf3bc5405cb965f4e4f3da8bf4b28bfb62c7db21ac5f"; - name = "krdc-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/krdc-20.08.3.tar.xz"; + sha256 = "1g9lxdldljh5a2s4g7g9b98lij168l99ah0vr6nvdl53n35pfr8n"; + name = "krdc-20.08.3.tar.xz"; }; }; kreversi = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kreversi-20.08.2.tar.xz"; - sha256 = "22824dca9c8f07145a6fd9b7386867d8a8efff0fda6752f377230381a1cc71c2"; - name = "kreversi-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kreversi-20.08.3.tar.xz"; + sha256 = "0d3y072q61xcik9lf0pz0c9njvarwlvf6hqv5fp5jyqaf2902pmi"; + name = "kreversi-20.08.3.tar.xz"; }; }; krfb = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/krfb-20.08.2.tar.xz"; - sha256 = "5e90fb4f3bcf2c48b15ec33634d61464323ab5ce1c156a499f089d862dd041d4"; - name = "krfb-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/krfb-20.08.3.tar.xz"; + sha256 = "13nypbcdhh53wq72w59z5q46a09g1w4yyi1pmsjwa8r7jnk8cafk"; + name = "krfb-20.08.3.tar.xz"; }; }; kross-interpreters = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kross-interpreters-20.08.2.tar.xz"; - sha256 = "82da0302d2d292e86fa924c8bd1d4effb21f763c42c57affaddeff4777c43951"; - name = "kross-interpreters-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kross-interpreters-20.08.3.tar.xz"; + sha256 = "0mr5vpbbcv66s6dyrrypy1ai6ba744z8cn4r0iwys35p6am075qj"; + name = "kross-interpreters-20.08.3.tar.xz"; }; }; kruler = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kruler-20.08.2.tar.xz"; - sha256 = "ede45d9cdf1b514fb20ed3a97877689ec75904438b94735706eb638ba01ca778"; - name = "kruler-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kruler-20.08.3.tar.xz"; + sha256 = "1vhl8acccdqfdj7lci8r2mig9qf1js4f8v7b4fqljpnc3gdg8749"; + name = "kruler-20.08.3.tar.xz"; }; }; kshisen = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kshisen-20.08.2.tar.xz"; - sha256 = "d11030b101a409324661adf664d4298f34cc320abff80dba72d112cc3ae2d25d"; - name = "kshisen-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kshisen-20.08.3.tar.xz"; + sha256 = "1vy8qh8s60a4ikyw3sh4cbr3p3fk35d4dwdqc263gn4skyrsb1l9"; + name = "kshisen-20.08.3.tar.xz"; }; }; ksirk = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/ksirk-20.08.2.tar.xz"; - sha256 = "b7766f0976b3cc112d4c599d91c07d321829c9b1e8ef34d3d21ec4964026854a"; - name = "ksirk-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/ksirk-20.08.3.tar.xz"; + sha256 = "1kxc1b05r8x6pvaiwpvjpgrr88qkm5qs4d3s1ym8rki60c724qpl"; + name = "ksirk-20.08.3.tar.xz"; }; }; ksmtp = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/ksmtp-20.08.2.tar.xz"; - sha256 = "5f51e0c025b192719709ae763feeac94df893007b62b5a69b7b95ae9f2fdd8ee"; - name = "ksmtp-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/ksmtp-20.08.3.tar.xz"; + sha256 = "1p9clzvmsym2fijwvs3s0zqx57bk82mlks52j5ni3il6lvklaayc"; + name = "ksmtp-20.08.3.tar.xz"; }; }; ksnakeduel = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/ksnakeduel-20.08.2.tar.xz"; - sha256 = "b6f0f51f8fad795cd134f9426b1f1ba8ccceb72e304e8ba55e60af471ad282cc"; - name = "ksnakeduel-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/ksnakeduel-20.08.3.tar.xz"; + sha256 = "03ydbwknn20gadjpwcw0z8zw777hgj8j10w4gvp2dwpb07rdg1pn"; + name = "ksnakeduel-20.08.3.tar.xz"; }; }; kspaceduel = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kspaceduel-20.08.2.tar.xz"; - sha256 = "62b9526c031662c049aa90b06ed3e5e2ce8ae774f271e1f29430f23c1f6cd787"; - name = "kspaceduel-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kspaceduel-20.08.3.tar.xz"; + sha256 = "1ii3lnxd11d3ihl8j1abh9qn9q0qq8ra9hbrwjs5df2kk36bnirj"; + name = "kspaceduel-20.08.3.tar.xz"; }; }; ksquares = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/ksquares-20.08.2.tar.xz"; - sha256 = "e1f9fdfa9a4a8348a65e66d48b7389784a1db6c8799cea453d6da3a2a57aca59"; - name = "ksquares-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/ksquares-20.08.3.tar.xz"; + sha256 = "1ch7lbylzb9ngdzvpzqq5f30gkm2l4rzk6iqa8xm53rawr7jjqcy"; + name = "ksquares-20.08.3.tar.xz"; }; }; ksudoku = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/ksudoku-20.08.2.tar.xz"; - sha256 = "6fed393f734eb27d6c36ad7516bf29ff648d319f08d9f8bdc17a8030842d8e33"; - name = "ksudoku-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/ksudoku-20.08.3.tar.xz"; + sha256 = "0hnqbd3krxi3zwj8p4n9ydhwfwhw8wljhjdfv0llv0nhj1wb89p9"; + name = "ksudoku-20.08.3.tar.xz"; }; }; ksystemlog = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/ksystemlog-20.08.2.tar.xz"; - sha256 = "63c6a520b63f148de2e3996250a2fef22e1a3ce18e744a699ae21de96a2c4e53"; - name = "ksystemlog-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/ksystemlog-20.08.3.tar.xz"; + sha256 = "11fc2mn4hkcibpxp7s2gihpp05yix7ws84a0bm6vjiqlidmrk192"; + name = "ksystemlog-20.08.3.tar.xz"; }; }; kteatime = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kteatime-20.08.2.tar.xz"; - sha256 = "d8e69fdb124e8689c72e4b9fe39226cc49b1ca990478fbb68e02b37f0cd861ac"; - name = "kteatime-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kteatime-20.08.3.tar.xz"; + sha256 = "1vj738s2a7nnrvxi847mdmn1vg79kh9k8gqaflcwnvyxanf6n4f7"; + name = "kteatime-20.08.3.tar.xz"; }; }; ktimer = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/ktimer-20.08.2.tar.xz"; - sha256 = "69293b7296643c6543d0646d14f9c75479f29f129924258957a407b77539a4c2"; - name = "ktimer-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/ktimer-20.08.3.tar.xz"; + sha256 = "1rc1z93s24b7p2ixr4xbpg0sj8ls90gzfijwj9f8b0lrwd905ysv"; + name = "ktimer-20.08.3.tar.xz"; }; }; ktnef = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/ktnef-20.08.2.tar.xz"; - sha256 = "ab73736e386c2b52a14fb56f1184479ed1c83c0571e9e8518d2b94b1dcd2e47d"; - name = "ktnef-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/ktnef-20.08.3.tar.xz"; + sha256 = "1lj93sqyi522k91jiyf7d26vx5sgn5njhyaf8plsfz5rj82dw1m4"; + name = "ktnef-20.08.3.tar.xz"; }; }; ktouch = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/ktouch-20.08.2.tar.xz"; - sha256 = "1b073a92343c9a2c772cfaac4e9fa7b6e85750586e3a57da413e33cdba34b5f4"; - name = "ktouch-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/ktouch-20.08.3.tar.xz"; + sha256 = "1ssxd7f75866rn5k192bnm016d8674q13ibcgmaxqsmr7wqkyd39"; + name = "ktouch-20.08.3.tar.xz"; }; }; ktp-accounts-kcm = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/ktp-accounts-kcm-20.08.2.tar.xz"; - sha256 = "df709ee612ff4c71a43197762b8a9d296b5a43f6e0afe4d9c8d0bd88eef81465"; - name = "ktp-accounts-kcm-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/ktp-accounts-kcm-20.08.3.tar.xz"; + sha256 = "0039svbzx7fphyk6cw4hb8k4h7l6q31pbwvp6pvls450rycz8i8y"; + name = "ktp-accounts-kcm-20.08.3.tar.xz"; }; }; ktp-approver = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/ktp-approver-20.08.2.tar.xz"; - sha256 = "054db02db679d0a4600632700cdd57cae539159a0a8f01f479ea337d33d8a6bd"; - name = "ktp-approver-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/ktp-approver-20.08.3.tar.xz"; + sha256 = "1kqsdw7vkcd0ka98y2r7qz7dp5hsrr2m8k1xlh3gpj7fdxpla2bh"; + name = "ktp-approver-20.08.3.tar.xz"; }; }; ktp-auth-handler = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/ktp-auth-handler-20.08.2.tar.xz"; - sha256 = "a61557efa800d42fd8ed14efdb09d43310212976d737a4fd5272f502bacbc371"; - name = "ktp-auth-handler-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/ktp-auth-handler-20.08.3.tar.xz"; + sha256 = "0wbhg458ysipwma8sygimasq71sbrzmx3vwqi51ai8y5hwrx04j4"; + name = "ktp-auth-handler-20.08.3.tar.xz"; }; }; ktp-call-ui = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/ktp-call-ui-20.08.2.tar.xz"; - sha256 = "ecd38d8b9f24cf620b8c9c1935328af3142199c6aa87e69c734e43096e492ac5"; - name = "ktp-call-ui-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/ktp-call-ui-20.08.3.tar.xz"; + sha256 = "1fh8bz9kc6f8v28x12xp3vw19swgcq07zyjzhd6qcnwf1bv6gl7i"; + name = "ktp-call-ui-20.08.3.tar.xz"; }; }; ktp-common-internals = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/ktp-common-internals-20.08.2.tar.xz"; - sha256 = "807fcd6f9c415a0799057435f997e143e9584a94577f9afaa7fcc6a4197e7cb0"; - name = "ktp-common-internals-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/ktp-common-internals-20.08.3.tar.xz"; + sha256 = "193yx4g1fwlwysy5scb7m24wqmvwmfyyb9sv7arw7zn5czlg480z"; + name = "ktp-common-internals-20.08.3.tar.xz"; }; }; ktp-contact-list = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/ktp-contact-list-20.08.2.tar.xz"; - sha256 = "214d73532dc855a8a4b68730adf5cbd046aae89f2ee2ad5d9a4c25b4eff6acb0"; - name = "ktp-contact-list-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/ktp-contact-list-20.08.3.tar.xz"; + sha256 = "0093z17r1xqlb1zlgxfayrnrkyl8zmnnasfd8i97dx712wmbbxxa"; + name = "ktp-contact-list-20.08.3.tar.xz"; }; }; ktp-contact-runner = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/ktp-contact-runner-20.08.2.tar.xz"; - sha256 = "8e40e4ab7ce2c1c382b109a15f88f5e1c7d147c76ed36ca05ef6d9f3f58d3d45"; - name = "ktp-contact-runner-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/ktp-contact-runner-20.08.3.tar.xz"; + sha256 = "063jylnq3gm0s0jh1xs6b591a161sb6gdi840l40mqlhhg7i8x55"; + name = "ktp-contact-runner-20.08.3.tar.xz"; }; }; ktp-desktop-applets = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/ktp-desktop-applets-20.08.2.tar.xz"; - sha256 = "b0884360be80f89dee3852b023055220e3cdab2f422cc3812eda31169fba6298"; - name = "ktp-desktop-applets-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/ktp-desktop-applets-20.08.3.tar.xz"; + sha256 = "1i69qzfa455phjnd5ycflyggcbq7ycn2cc7a3ni5195isjzq6r6s"; + name = "ktp-desktop-applets-20.08.3.tar.xz"; }; }; ktp-filetransfer-handler = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/ktp-filetransfer-handler-20.08.2.tar.xz"; - sha256 = "c2ec5fd2a5746dd8ce1371c503c51feee206d8dfe7ca8cdaa71b8e925636a97c"; - name = "ktp-filetransfer-handler-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/ktp-filetransfer-handler-20.08.3.tar.xz"; + sha256 = "0a26ziacl3fkd0a0h1579jnwjzjlsz0zymj9k4da4sb60zad5y72"; + name = "ktp-filetransfer-handler-20.08.3.tar.xz"; }; }; ktp-kded-module = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/ktp-kded-module-20.08.2.tar.xz"; - sha256 = "307285b2d4e04c244691a6f2a285aec8ada26e0b01eb1fdbf2bc1da57b05828a"; - name = "ktp-kded-module-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/ktp-kded-module-20.08.3.tar.xz"; + sha256 = "105vh6b7a0v02arksbwxn30slpcg11cpvb7dqmvf041iyr13sqsv"; + name = "ktp-kded-module-20.08.3.tar.xz"; }; }; ktp-send-file = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/ktp-send-file-20.08.2.tar.xz"; - sha256 = "6c3fb09112d439ce2f0db3acdbc766e8a914d4dc7cbb6ab709922f8e95f2f0e1"; - name = "ktp-send-file-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/ktp-send-file-20.08.3.tar.xz"; + sha256 = "08pp3029jplc6rcbav40cgy787gn3jjl312gbgvnwzglxaqvcg4b"; + name = "ktp-send-file-20.08.3.tar.xz"; }; }; ktp-text-ui = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/ktp-text-ui-20.08.2.tar.xz"; - sha256 = "0f10612e08bc1ee04fb0a538337d760d7b79b5dac37bb58275998d16dbb5415c"; - name = "ktp-text-ui-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/ktp-text-ui-20.08.3.tar.xz"; + sha256 = "1anxl9wa5ndyi9r9w0kpivx8nv1xpx28xjvkdplkc75cc1wl88sw"; + name = "ktp-text-ui-20.08.3.tar.xz"; }; }; ktuberling = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/ktuberling-20.08.2.tar.xz"; - sha256 = "f9e4a0de3b92d015f8e7b862badf4bbf11b3ce2727aa607384a009247e7b7fad"; - name = "ktuberling-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/ktuberling-20.08.3.tar.xz"; + sha256 = "0q6ynmn6w5q65a77fq8n9vxqswrimln22b1zfgxmb2i3qwnhkrmz"; + name = "ktuberling-20.08.3.tar.xz"; }; }; kturtle = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kturtle-20.08.2.tar.xz"; - sha256 = "ca9bf47b2ec34744492f218c922b10d613b19fbbd2c75b6ddba157eef21337c7"; - name = "kturtle-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kturtle-20.08.3.tar.xz"; + sha256 = "0riv76vwvz94zixqhhwkxw8sz2r2xqai39yh9hr31d28q9rza384"; + name = "kturtle-20.08.3.tar.xz"; }; }; kubrick = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kubrick-20.08.2.tar.xz"; - sha256 = "02fed26a7246feffd668fbda939893295557c0571da64fdf195db93474653224"; - name = "kubrick-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kubrick-20.08.3.tar.xz"; + sha256 = "03k73gr33dr3va69vc70fsfcdwkqz70bg87yk2l2j33x8wsgl4wx"; + name = "kubrick-20.08.3.tar.xz"; }; }; kwalletmanager = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kwalletmanager-20.08.2.tar.xz"; - sha256 = "7950e250c5351a9b8e3b36165fa2003baa044bb2d3553a32360000a322bddad8"; - name = "kwalletmanager-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kwalletmanager-20.08.3.tar.xz"; + sha256 = "1l07vxl2x3jl8553rbvr3p0k3rc95nmrw4vhxxynl3102xshrg5i"; + name = "kwalletmanager-20.08.3.tar.xz"; }; }; kwave = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kwave-20.08.2.tar.xz"; - sha256 = "6e15a67022ef96f07b9825139cc7aaacbc6f60729570c31ce6cb25184602b434"; - name = "kwave-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kwave-20.08.3.tar.xz"; + sha256 = "0zk8ik03qcc6y0vhpih8sk2jpkxwxalmqmaan2767k9h92grdpc8"; + name = "kwave-20.08.3.tar.xz"; }; }; kwordquiz = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kwordquiz-20.08.2.tar.xz"; - sha256 = "57aa012f3aad128579f067668db1344306e2e23d6a89b47d413d6eee0da0e238"; - name = "kwordquiz-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kwordquiz-20.08.3.tar.xz"; + sha256 = "1kiqk3xyd0l7kqdxqjqs8mw4drcdbdri9xxi5gcav57ndcinknqb"; + name = "kwordquiz-20.08.3.tar.xz"; }; }; libgravatar = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/libgravatar-20.08.2.tar.xz"; - sha256 = "4c0a2eb073ef42a26813b93bd76aaa9e26a040a966329e6e3cf371d7de1e55f7"; - name = "libgravatar-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/libgravatar-20.08.3.tar.xz"; + sha256 = "09dvx2rb1j7q4r0gkbhz0vjk8ya3njqprpjqdhwcq7xwc2j9h0hr"; + name = "libgravatar-20.08.3.tar.xz"; }; }; libkcddb = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/libkcddb-20.08.2.tar.xz"; - sha256 = "545cf54ac454845c524ba7cd7ec289ac952fa1ce2bbae01411ba71c66a5ed08a"; - name = "libkcddb-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/libkcddb-20.08.3.tar.xz"; + sha256 = "0r36hs79hmq0znsds0d04lj7ffs6l2d866kyn1z1fdwr9b3crirg"; + name = "libkcddb-20.08.3.tar.xz"; }; }; libkcompactdisc = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/libkcompactdisc-20.08.2.tar.xz"; - sha256 = "37534f67af69775d6f786917920d2810a5d20f28df57e1a17aee9a7b30bbe302"; - name = "libkcompactdisc-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/libkcompactdisc-20.08.3.tar.xz"; + sha256 = "1nglk3kbx5czqla3cnpnf1fk71pf2cl9h6rgb40ak1xw4z31d456"; + name = "libkcompactdisc-20.08.3.tar.xz"; }; }; libkdcraw = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/libkdcraw-20.08.2.tar.xz"; - sha256 = "6fbf1a5ca5a439fabb01648cde4b57e1f3de2372b7f3b56ccae03f653490f1b2"; - name = "libkdcraw-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/libkdcraw-20.08.3.tar.xz"; + sha256 = "1806i99qsrmixdg5b0hyi8h55fk00q6wxsnrblbwcmsb268jddp7"; + name = "libkdcraw-20.08.3.tar.xz"; }; }; libkdegames = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/libkdegames-20.08.2.tar.xz"; - sha256 = "d9f0ab87dc4671a55ad8d2b7d3a54cbc444201c11ebae436e0107fe7067fb983"; - name = "libkdegames-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/libkdegames-20.08.3.tar.xz"; + sha256 = "1ccbcwwqb53bgqlr1rq9plpw21mipxp8rsi1f7l0p1jzpw054p08"; + name = "libkdegames-20.08.3.tar.xz"; }; }; libkdepim = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/libkdepim-20.08.2.tar.xz"; - sha256 = "3558c9af95c22bb4ce0ceeec483fada9e8e9f27de4ac34ffe44a4eb3b6d21101"; - name = "libkdepim-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/libkdepim-20.08.3.tar.xz"; + sha256 = "1v77g02v5sdqprh8psx5xpjgf8v91il60ca59yivm5jvc3hdf3f6"; + name = "libkdepim-20.08.3.tar.xz"; }; }; libkeduvocdocument = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/libkeduvocdocument-20.08.2.tar.xz"; - sha256 = "ef8e0b359e3cf1b3303da3795add1ced405d230f51895abe10d5a7989be03923"; - name = "libkeduvocdocument-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/libkeduvocdocument-20.08.3.tar.xz"; + sha256 = "0ghkx6x5sn5fl934ybhl32knwv9zky0n1vkjw2w93lpms45xmw76"; + name = "libkeduvocdocument-20.08.3.tar.xz"; }; }; libkexiv2 = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/libkexiv2-20.08.2.tar.xz"; - sha256 = "793c4d11bb1b60beca7b25a2427650b3f358364c55be022dfd4a7ccfd889578d"; - name = "libkexiv2-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/libkexiv2-20.08.3.tar.xz"; + sha256 = "1lh3947w6xgzl2r1wm6m4kd478q6bv89f0c3c38ldv30imfw7rfl"; + name = "libkexiv2-20.08.3.tar.xz"; }; }; libkgapi = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/libkgapi-20.08.2.tar.xz"; - sha256 = "f3fb015e8b8ac92c138e8a59e8e8b9333500e0ea314180cc1ad14e31248312df"; - name = "libkgapi-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/libkgapi-20.08.3.tar.xz"; + sha256 = "1kmgf9v9rvb67l7aw5xsx7v44l4pz8rl6p09lk26irq7gd4k68la"; + name = "libkgapi-20.08.3.tar.xz"; }; }; libkgeomap = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/libkgeomap-20.08.2.tar.xz"; - sha256 = "7149095aa0df4e3a184bb2a6fb8322e27e3a34eb3bc40cf370a09b21fb2a6ea0"; - name = "libkgeomap-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/libkgeomap-20.08.3.tar.xz"; + sha256 = "14ipksxnvgk2s1sw7a70153iy9aik9mf4i7k8y3pzdr3l3155ayk"; + name = "libkgeomap-20.08.3.tar.xz"; }; }; libkipi = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/libkipi-20.08.2.tar.xz"; - sha256 = "87ffa30b23779313a94953afe57d1b19515c3a2f311a2dea6449c9d96b09e5b1"; - name = "libkipi-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/libkipi-20.08.3.tar.xz"; + sha256 = "1b5qby7xm926qnzrf1zpb89fwx1a2syhqnznmdjxifj499p1jqjb"; + name = "libkipi-20.08.3.tar.xz"; }; }; libkleo = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/libkleo-20.08.2.tar.xz"; - sha256 = "34537b35e22cef85650ae6f9bf197518bb5a59e9614d6d86ba86f085fddd97c4"; - name = "libkleo-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/libkleo-20.08.3.tar.xz"; + sha256 = "1d6dal4qnrikg6ma2ird4b2sdivqqkkhamvd3s1srcxppc3aiq79"; + name = "libkleo-20.08.3.tar.xz"; }; }; libkmahjongg = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/libkmahjongg-20.08.2.tar.xz"; - sha256 = "032ac6d9e96cd9156f5153c01f881d0e442fda9de90398df320846095ba2c40a"; - name = "libkmahjongg-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/libkmahjongg-20.08.3.tar.xz"; + sha256 = "0xabp1vzbzs52m3bb9nzm1d9md1n4j4pr13izn6nv28ja7477nnm"; + name = "libkmahjongg-20.08.3.tar.xz"; }; }; libkomparediff2 = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/libkomparediff2-20.08.2.tar.xz"; - sha256 = "91b0b72d5c4e2ddd863636cca299660bfbb5b7a55773cbc51000fe9c1ca91a98"; - name = "libkomparediff2-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/libkomparediff2-20.08.3.tar.xz"; + sha256 = "0nk0jkf0jwaz1yqzzp44c6xyjgw42gclkcvw8w61w1f8sdl40wb8"; + name = "libkomparediff2-20.08.3.tar.xz"; }; }; libksane = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/libksane-20.08.2.tar.xz"; - sha256 = "21bb577d78e020281dfc6c993ab7fe286d648e72c851e45463a32969fbb35aa6"; - name = "libksane-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/libksane-20.08.3.tar.xz"; + sha256 = "0d2cnmvk16g1vnx9jd7jvp3bpw07ss54khmhqip8iskkvcfll9j0"; + name = "libksane-20.08.3.tar.xz"; }; }; libksieve = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/libksieve-20.08.2.tar.xz"; - sha256 = "589e4dc27d1d91d8c16879fa99aab45f3847a74e3e9357e3e037503e5515ee2e"; - name = "libksieve-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/libksieve-20.08.3.tar.xz"; + sha256 = "0bhpdqynazssql2iivvpb9l8npa441345gcn59fc0va6barl9sam"; + name = "libksieve-20.08.3.tar.xz"; }; }; lokalize = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/lokalize-20.08.2.tar.xz"; - sha256 = "c11616bc02763fb1f3b1abf0b2ba70d0c6c550435c94ff25c5096f9a90375e23"; - name = "lokalize-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/lokalize-20.08.3.tar.xz"; + sha256 = "0iab8sd1qh7h0zna7lc3v43z6rcmxba9v4nynhl5miiac4r6ddr8"; + name = "lokalize-20.08.3.tar.xz"; }; }; lskat = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/lskat-20.08.2.tar.xz"; - sha256 = "78f152f7af46345f65c3800f9c591fb204e917595c1f803c9c15148ef39c42b8"; - name = "lskat-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/lskat-20.08.3.tar.xz"; + sha256 = "1rcmh592w5gd5b69czfxycypidj74y2d91cw92rccariadz9vnjz"; + name = "lskat-20.08.3.tar.xz"; }; }; mailcommon = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/mailcommon-20.08.2.tar.xz"; - sha256 = "a4170ab9ff7680fb26c61474f42d5424716f4e91c1a5e9275cc1222491c9564d"; - name = "mailcommon-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/mailcommon-20.08.3.tar.xz"; + sha256 = "0bhs60cz4qcrqkmw2sm6cd2laq8lzj9vcwi8kjqkajsidh342wdv"; + name = "mailcommon-20.08.3.tar.xz"; }; }; mailimporter = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/mailimporter-20.08.2.tar.xz"; - sha256 = "a255b60378c1cf77e517919d072cb44bd8c25e8ed8f07429763bb7915b3cc711"; - name = "mailimporter-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/mailimporter-20.08.3.tar.xz"; + sha256 = "0w6yfgqx0adlkwx32vmb23kl6n50737jiabmad3pnhqw8rv41h80"; + name = "mailimporter-20.08.3.tar.xz"; }; }; marble = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/marble-20.08.2.tar.xz"; - sha256 = "f44ac10de33dc31ce1cb99635131fe2c7bf3f60f09204b2061f81042a725475c"; - name = "marble-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/marble-20.08.3.tar.xz"; + sha256 = "1xpxgy724z97k063fdk0l3mrl8i6nvnhj35b4987jqji76i92ffb"; + name = "marble-20.08.3.tar.xz"; }; }; mbox-importer = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/mbox-importer-20.08.2.tar.xz"; - sha256 = "3b3bee33683c534974255616f3b2f3baebf85363b2c24bbee9cc195ddf35ca9a"; - name = "mbox-importer-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/mbox-importer-20.08.3.tar.xz"; + sha256 = "1qh0f93df228cqlcqdwc7g6im3g0gkfmzir3ccsmb5iv0ygvjl6f"; + name = "mbox-importer-20.08.3.tar.xz"; }; }; messagelib = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/messagelib-20.08.2.tar.xz"; - sha256 = "5cf3a3f2b6473e60a7c2af10aa4eb1cfba25a4786132ee87b657b0dafb9f5028"; - name = "messagelib-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/messagelib-20.08.3.tar.xz"; + sha256 = "16amni6qrq96h8jr313gc7k9frwr20d4pk9y2i61a1xm2w3xsqd4"; + name = "messagelib-20.08.3.tar.xz"; }; }; minuet = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/minuet-20.08.2.tar.xz"; - sha256 = "24383168e2a0b7b319ecb37e2b1f3b039ad790a7e0f49385657f049565f1ef84"; - name = "minuet-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/minuet-20.08.3.tar.xz"; + sha256 = "1l45g7labnyz0pkwcfhjl5a3ypr7cy3bsshr06ab85364yjwazvi"; + name = "minuet-20.08.3.tar.xz"; }; }; okular = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/okular-20.08.2.tar.xz"; - sha256 = "6f1885ed8050a55bb2cbf05089b452f555852e003ec7fe89fe472c0dbc92e65b"; - name = "okular-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/okular-20.08.3.tar.xz"; + sha256 = "1q59ikcwsfgjc0202daingxv15iarnzba6szdncznzcafd6hhk9z"; + name = "okular-20.08.3.tar.xz"; }; }; palapeli = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/palapeli-20.08.2.tar.xz"; - sha256 = "a31b0db2f3e77eac8f527d26f8ed0400fe5bcdb3a3970b925f14886bd1bcd63e"; - name = "palapeli-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/palapeli-20.08.3.tar.xz"; + sha256 = "107z3izfznrq7g5aqb5a7r8a4ibaia90g334d7wwvd7prm7hdgfp"; + name = "palapeli-20.08.3.tar.xz"; }; }; parley = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/parley-20.08.2.tar.xz"; - sha256 = "cf2f00925730d8baec66d422f058e4b3e979678e79c57898ceffd8650720bda6"; - name = "parley-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/parley-20.08.3.tar.xz"; + sha256 = "0wli09zkk5z50y1gzp5wc9k056xjaadlq97j09lf6lqyg6kb56ya"; + name = "parley-20.08.3.tar.xz"; }; }; picmi = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/picmi-20.08.2.tar.xz"; - sha256 = "35f2bf3d8375618f97aee01c8f2421521b2cd5c11d7b14fc9a376026d74c82a5"; - name = "picmi-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/picmi-20.08.3.tar.xz"; + sha256 = "1lkpazsi9dyb2y9q5bk56d80x7x035rf4hdap25i8qfj3ilykv3w"; + name = "picmi-20.08.3.tar.xz"; }; }; pimcommon = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/pimcommon-20.08.2.tar.xz"; - sha256 = "cba9e66153d36debe3f046363af7ff40a4ba263f33bfe20c7ec10b5bf9183deb"; - name = "pimcommon-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/pimcommon-20.08.3.tar.xz"; + sha256 = "0mpl7li2y5xjzk4hdb85d1x7cz15cicd91c1krlw74q7pbrjinlq"; + name = "pimcommon-20.08.3.tar.xz"; }; }; pim-data-exporter = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/pim-data-exporter-20.08.2.tar.xz"; - sha256 = "54b09a3f763004c805cc0dce8ab2e665116b7ef29419f22ad413aa250dcb4ac0"; - name = "pim-data-exporter-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/pim-data-exporter-20.08.3.tar.xz"; + sha256 = "0f08c16d3730fbdsbrwlr9w5c4l9xcmd1bdbv5m38h5r2ddlkvzr"; + name = "pim-data-exporter-20.08.3.tar.xz"; }; }; pim-sieve-editor = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/pim-sieve-editor-20.08.2.tar.xz"; - sha256 = "e8c590a0fddc5292172115b11fb75c5f847347079100617dbf321875642d7098"; - name = "pim-sieve-editor-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/pim-sieve-editor-20.08.3.tar.xz"; + sha256 = "1falzw2a2v912fdzlyljsw9rcy1whrn9ys9ccrskkpvjn8y444x4"; + name = "pim-sieve-editor-20.08.3.tar.xz"; }; }; poxml = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/poxml-20.08.2.tar.xz"; - sha256 = "67d260349489e92ebce20253f9a3ccde5bb75eb13eb4d1a08a86c18c82e4a2a9"; - name = "poxml-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/poxml-20.08.3.tar.xz"; + sha256 = "0gzg3vbsjrfhs1jg59g7b3gf3b4qajiffkb94njkz8v1f0fadlxp"; + name = "poxml-20.08.3.tar.xz"; }; }; print-manager = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/print-manager-20.08.2.tar.xz"; - sha256 = "de21f8c428198b906f4ae438d6ced8d707b12c15578409c2aa2f7b2f73feb990"; - name = "print-manager-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/print-manager-20.08.3.tar.xz"; + sha256 = "18nl9gpmzz4g9fqzyvbh858nxz23b2vyi505qacqvcrz13r0l78z"; + name = "print-manager-20.08.3.tar.xz"; }; }; rocs = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/rocs-20.08.2.tar.xz"; - sha256 = "2d8efd62b89dd36033bb3d818c82fee67e6efa2d2bb98dda0d4eab13baaee485"; - name = "rocs-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/rocs-20.08.3.tar.xz"; + sha256 = "0bd9x7kh2s4z79ff9byd3ly7k040c574zwrrgi8sq21yd531hxhj"; + name = "rocs-20.08.3.tar.xz"; }; }; signon-kwallet-extension = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/signon-kwallet-extension-20.08.2.tar.xz"; - sha256 = "a271f4d09511171dcf1ebcdaf0b7205f9ee6a75b20ef0801f36d136f7b4a70dd"; - name = "signon-kwallet-extension-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/signon-kwallet-extension-20.08.3.tar.xz"; + sha256 = "1s0syq9aw2q34k1wxrpjqqi12xay1h0vc4s2d8l184hzzg8qq71i"; + name = "signon-kwallet-extension-20.08.3.tar.xz"; }; }; spectacle = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/spectacle-20.08.2.tar.xz"; - sha256 = "9a467ea3b05981d588d39573cca375636b825ad8cab8a36ce48dbbc12425ab0d"; - name = "spectacle-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/spectacle-20.08.3.tar.xz"; + sha256 = "16dwbsk9hik7gmz9s4x78hibz4x9d1fpx8x2i2giry5hwzknfcw4"; + name = "spectacle-20.08.3.tar.xz"; }; }; step = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/step-20.08.2.tar.xz"; - sha256 = "a52e4b6f281ba1a7afd4ab3ac7307080464147c4052ee222399135fe61ac7958"; - name = "step-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/step-20.08.3.tar.xz"; + sha256 = "05ljsmgpra1az64yddy8idi46cv3afaf2v4n7d5j81a8vvlz7fj1"; + name = "step-20.08.3.tar.xz"; }; }; svgpart = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/svgpart-20.08.2.tar.xz"; - sha256 = "3a46b5bd9acf5372f73b602d155517f0dff47f3337bd8a46a580aae7480dd771"; - name = "svgpart-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/svgpart-20.08.3.tar.xz"; + sha256 = "0wwq576dblqmfknr0qs8kskw7nar6hah95fqicdn97xdy4nvzhc6"; + name = "svgpart-20.08.3.tar.xz"; }; }; sweeper = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/sweeper-20.08.2.tar.xz"; - sha256 = "0c255ef15c1e32eb561b26f5b73a6c154730be583efbc5ee713aaed17de14091"; - name = "sweeper-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/sweeper-20.08.3.tar.xz"; + sha256 = "0i4zvbljdzkj47vh8kizam7vsc9k7mvf8dqd2j6ixr4p0cqvw5a8"; + name = "sweeper-20.08.3.tar.xz"; }; }; umbrello = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/umbrello-20.08.2.tar.xz"; - sha256 = "0357b44646c750253e3e7ee323b9e49e854c4c8cdf340eb5a11b2d42edfc4cd7"; - name = "umbrello-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/umbrello-20.08.3.tar.xz"; + sha256 = "1hh5gyggb4f3pjip8dfvx00hi83gj65c92jgzkzahj7p35mkplgl"; + name = "umbrello-20.08.3.tar.xz"; }; }; yakuake = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/yakuake-20.08.2.tar.xz"; - sha256 = "8a0aa3a97a9fdc781887a6cb6480cba5079cf8aacd3345b63f5eb6be4d91665a"; - name = "yakuake-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/yakuake-20.08.3.tar.xz"; + sha256 = "05zd2xm5vgrgz0bxbkh1mpiknlqzpzk5jb74lnd5x7wn5b80ngv0"; + name = "yakuake-20.08.3.tar.xz"; }; }; zeroconf-ioslave = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/zeroconf-ioslave-20.08.2.tar.xz"; - sha256 = "0ad34f8361ee3ecd669e396265135b534239994d3bec5e9e6a43b7b7bf5c04e4"; - name = "zeroconf-ioslave-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/zeroconf-ioslave-20.08.3.tar.xz"; + sha256 = "1afga0liiy9n98kb0gmxzbb6ckhdgbrdc4ig1x9pwp98wr1fzmcg"; + name = "zeroconf-ioslave-20.08.3.tar.xz"; }; }; } diff --git a/pkgs/applications/kde/yakuake.nix b/pkgs/applications/kde/yakuake.nix index f4f2c53522f0..10bf27038ae9 100644 --- a/pkgs/applications/kde/yakuake.nix +++ b/pkgs/applications/kde/yakuake.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "yakuake"; + pname = "yakuake"; buildInputs = [ karchive kcrash kdbusaddons ki18n kiconthemes knewstuff knotifications diff --git a/pkgs/applications/logging/humioctl/default.nix b/pkgs/applications/logging/humioctl/default.nix index bcaf4a3627fe..a5131d14ca9f 100644 --- a/pkgs/applications/logging/humioctl/default.nix +++ b/pkgs/applications/logging/humioctl/default.nix @@ -1,4 +1,4 @@ -{ buildGoModule, fetchFromGitHub, installShellFiles, stdenv }: +{ buildGoModule, fetchFromGitHub, installShellFiles, lib, stdenv }: let humioCtlVersion = "0.28.1"; @@ -30,7 +30,7 @@ in buildGoModule { installShellCompletion humioctl.{bash,zsh} ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/humio/cli"; description = "A CLI for managing and sending data to Humio"; license = licenses.asl20; diff --git a/pkgs/applications/misc/1password/default.nix b/pkgs/applications/misc/1password/default.nix index 34b9b21f57d5..4f4841bb2ed0 100644 --- a/pkgs/applications/misc/1password/default.nix +++ b/pkgs/applications/misc/1password/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchzip, autoPatchelfHook, fetchurl, xar, cpio }: +{ lib, stdenv, fetchzip, autoPatchelfHook, fetchurl, xar, cpio }: stdenv.mkDerivation rec { pname = "1password"; - version = "1.7.0"; + version = "1.8.0"; src = if stdenv.isLinux then fetchzip { url = { @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { "x86_64-linux" = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_amd64_v${version}.zip"; }.${stdenv.hostPlatform.system}; sha256 = { - "i686-linux" = "0fvi9pfcm6pfy628q2lg62bkikrgsisynrk3kkjisb9ldcyjgabw"; - "x86_64-linux" = "1iskhls8g8w2zhk79gprz4vzrmm7r7fq87gwgd4xmj5md4nkzran"; + "i686-linux" = "teoxscan+EZ76Q0sfKT6nt1w/LSsmDoiN2oh+NGO/4A="; + "x86_64-linux" = "nRK2GSwhQe5OgcAdR1fg0vUp3fzEkhwU/teIwsEEemw="; }.${stdenv.hostPlatform.system}; stripRoot = false; } else fetchurl { url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_darwin_amd64_v${version}.pkg"; - sha256 = "0x6s26zgjryzmcg9qxmv5s2vml06q96yqbapasjfxqc3l205lnnn"; + sha256 = "0pycia75vdfh6gxfd2hr32cxrryfxydid804n0v76l2fpr9v9v3d"; }; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ xar cpio ]; @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { $out/bin/op --version ''; - meta = with stdenv.lib; { + meta = with lib; { description = "1Password command-line tool"; homepage = "https://support.1password.com/command-line/"; downloadPage = "https://app-updates.agilebits.com/product_history/CLI"; diff --git a/pkgs/applications/misc/ArchiSteamFarm/default.nix b/pkgs/applications/misc/ArchiSteamFarm/default.nix index 8e55090e4c17..c753721adbf0 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/default.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, makeWrapper, dotnetCorePackages, jq }: +{ lib, stdenv, fetchurl, unzip, makeWrapper, dotnetCorePackages, jq }: stdenv.mkDerivation rec { pname = "ArchiSteamFarm"; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { --run "ln -sf $dist/www ." ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Application with primary purpose of idling Steam cards from multiple accounts simultaneously"; homepage = "https://github.com/JustArchiNET/ArchiSteamFarm"; license = licenses.asl20; diff --git a/pkgs/applications/misc/OSCAR/default.nix b/pkgs/applications/misc/OSCAR/default.nix index e619ad8c6971..7115801d00bb 100644 --- a/pkgs/applications/misc/OSCAR/default.nix +++ b/pkgs/applications/misc/OSCAR/default.nix @@ -1,4 +1,4 @@ -{ stdenv, mkDerivation, fetchFromGitLab, qmake, qtbase, qttools, qtserialport, libGLU }: +{ lib, stdenv, mkDerivation, fetchFromGitLab, qmake, qtbase, qttools, qtserialport, libGLU }: mkDerivation rec { pname = "OSCAR"; version = "1.2.0"; @@ -34,7 +34,7 @@ mkDerivation rec { install -T Building/Linux/OSCAR.desktop $out/share/applications/OSCAR.desktop ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.sleepfiles.com/OSCAR/"; description = "Software for reviewing and exploring data produced by CPAP and related machines used in the treatment of sleep apnea"; license = licenses.gpl3; diff --git a/pkgs/applications/misc/airtame/default.nix b/pkgs/applications/misc/airtame/default.nix index a5c08ad3642a..58fcf4cb10dd 100644 --- a/pkgs/applications/misc/airtame/default.nix +++ b/pkgs/applications/misc/airtame/default.nix @@ -69,7 +69,7 @@ in stdenv.mkDerivation rec { dontPatchELF = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://airtame.com/download"; description = "Wireless streaming client for Airtame devices"; license = licenses.unfree; diff --git a/pkgs/applications/misc/albert/default.nix b/pkgs/applications/misc/albert/default.nix index 5c43d717913b..9f4fc95df77d 100644 --- a/pkgs/applications/misc/albert/default.nix +++ b/pkgs/applications/misc/albert/default.nix @@ -18,8 +18,6 @@ mkDerivation rec { buildInputs = [ qtbase qtdeclarative qtsvg qtx11extras muparser python3 qtcharts ]; - enableParallelBuilding = true; - # We don't have virtualbox sdk so disable plugin cmakeFlags = [ "-DBUILD_VIRTUALBOX=OFF" "-DCMAKE_INSTALL_LIBDIR=libs" ]; diff --git a/pkgs/applications/misc/almanah/default.nix b/pkgs/applications/misc/almanah/default.nix index 7d5c468ab971..b2b6815f7df1 100644 --- a/pkgs/applications/misc/almanah/default.nix +++ b/pkgs/applications/misc/almanah/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , atk , cairo @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Small GTK application to allow to keep a diary of your life"; homepage = "https://wiki.gnome.org/Apps/Almanah_Diary"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/misc/antfs-cli/default.nix b/pkgs/applications/misc/antfs-cli/default.nix index 49da252b6c0d..133194f7af51 100644 --- a/pkgs/applications/misc/antfs-cli/default.nix +++ b/pkgs/applications/misc/antfs-cli/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchFromGitHub, python3Packages }: +{ lib, stdenv, fetchFromGitHub, python3Packages }: python3Packages.buildPythonApplication { pname = "antfs-cli"; version = "unstable-2017-02-11"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/Tigge/antfs-cli"; description = "Extracts FIT files from ANT-FS based sport watches"; license = licenses.mit; diff --git a/pkgs/applications/misc/ape/clex.nix b/pkgs/applications/misc/ape/clex.nix index c680ffe96783..a98695dab682 100644 --- a/pkgs/applications/misc/ape/clex.nix +++ b/pkgs/applications/misc/ape/clex.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "attempto-clex"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { cp clex_lexicon.pl $out ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Large lexicon for APE (~100,000 entries)"; license = licenses.gpl3; platforms = platforms.unix; diff --git a/pkgs/applications/misc/ape/default.nix b/pkgs/applications/misc/ape/default.nix index dda6c812c8d8..f16d6e157332 100644 --- a/pkgs/applications/misc/ape/default.nix +++ b/pkgs/applications/misc/ape/default.nix @@ -1,9 +1,9 @@ -{ stdenv, swiProlog, makeWrapper, +{ lib, stdenv, swiProlog, makeWrapper, fetchFromGitHub, lexiconPath ? "prolog/lexicon/clex_lexicon.pl", pname ? "ape", description ? "Parser for Attempto Controlled English (ACE)", - license ? with stdenv.lib; licenses.lgpl3 + license ? with lib; licenses.lgpl3 }: stdenv.mkDerivation rec { @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { makeWrapper $out/ape.exe $out/bin/ape --add-flags ace ''; - meta = with stdenv.lib; { + meta = with lib; { description = description; license = license; platforms = platforms.unix; diff --git a/pkgs/applications/misc/appeditor/default.nix b/pkgs/applications/misc/appeditor/default.nix index ab58f9237647..20ee9a254941 100644 --- a/pkgs/applications/misc/appeditor/default.nix +++ b/pkgs/applications/misc/appeditor/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , nix-update-script , vala @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Edit the Pantheon desktop application menu"; homepage = "https://github.com/donadigo/appeditor"; maintainers = with maintainers; [ xiorcale ] ++ pantheon.maintainers; diff --git a/pkgs/applications/misc/apvlv/default.nix b/pkgs/applications/misc/apvlv/default.nix index 48efafa74fcd..f80dfeb10751 100644 --- a/pkgs/applications/misc/apvlv/default.nix +++ b/pkgs/applications/misc/apvlv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, cmake, pkgconfig, pcre, libxkbcommon, epoxy +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, pkg-config, pcre, libxkbcommon, epoxy , gtk3, poppler, freetype, libpthreadstubs, libXdmcp, libxshmfence, wrapGAppsHook }: @@ -16,12 +16,12 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-I${poppler.dev}/include/poppler"; nativeBuildInputs = [ - pkgconfig + cmake + pkg-config wrapGAppsHook ]; buildInputs = [ - cmake poppler pcre libxkbcommon epoxy freetype gtk3 libpthreadstubs libXdmcp libxshmfence # otherwise warnings in compilation @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { install -D ../apvlv.desktop $out/share/applications/apvlv.desktop ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://naihe2010.github.io/apvlv/"; description = "PDF viewer with Vim-like behaviour"; longDescription = '' diff --git a/pkgs/applications/misc/archivy/default.nix b/pkgs/applications/misc/archivy/default.nix index 635cd9a991a6..c94011466ec3 100644 --- a/pkgs/applications/misc/archivy/default.nix +++ b/pkgs/applications/misc/archivy/default.nix @@ -47,7 +47,7 @@ python3.pkgs.buildPythonApplication rec { # __init__.py attempts to mkdir in read-only file system doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Self-hosted knowledge repository"; homepage = "https://archivy.github.io"; license = licenses.mit; diff --git a/pkgs/applications/misc/artha/default.nix b/pkgs/applications/misc/artha/default.nix index 648a2cfd9945..bc31b844f18d 100644 --- a/pkgs/applications/misc/artha/default.nix +++ b/pkgs/applications/misc/artha/default.nix @@ -1,4 +1,4 @@ -{ stdenv, autoreconfHook, fetchurl, dbus-glib, gtk2, pkgconfig, wordnet }: +{ lib, stdenv, autoreconfHook, fetchurl, dbus-glib, gtk2, pkgconfig, wordnet }: stdenv.mkDerivation { pname = "artha"; @@ -16,7 +16,7 @@ stdenv.mkDerivation { ./gio-underlink.patch ]; - meta = with stdenv.lib; { + meta = with lib; { description = "An offline thesaurus based on WordNet"; homepage = "http://artha.sourceforge.net"; license = licenses.gpl2; diff --git a/pkgs/applications/misc/asciiquarium/default.nix b/pkgs/applications/misc/asciiquarium/default.nix index 592c0938ffbd..a4276dac1d1f 100644 --- a/pkgs/applications/misc/asciiquarium/default.nix +++ b/pkgs/applications/misc/asciiquarium/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, perlPackages }: +{ lib, stdenv, fetchurl, makeWrapper, perlPackages }: let version = "1.1"; in stdenv.mkDerivation { @@ -20,7 +20,7 @@ in stdenv.mkDerivation { --set PERL5LIB ${perlPackages.makeFullPerlPath [ perlPackages.TermAnimation ] } ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Enjoy the mysteries of the sea from the safety of your own terminal!"; homepage = "https://robobunny.com/projects/asciiquarium/html/"; license = licenses.gpl2; diff --git a/pkgs/applications/misc/audio/wavrsocvt/default.nix b/pkgs/applications/misc/audio/wavrsocvt/default.nix index ebb04a30ab86..3b32f0d7f30b 100644 --- a/pkgs/applications/misc/audio/wavrsocvt/default.nix +++ b/pkgs/applications/misc/audio/wavrsocvt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation { name = "wavrsocvt-1.0.2.0"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { phases = [ "unpackPhase" "installPhase" ]; unpackPhase = '' - tar -zxf $src + tar -zxf $src ''; installPhase = '' @@ -19,7 +19,7 @@ stdenv.mkDerivation { cp wavrsocvt $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Convert .wav files into sound files for Lego NXT brick"; longDescription = '' wavrsocvt is a command-line utility which can be used from a diff --git a/pkgs/applications/misc/ausweisapp2/default.nix b/pkgs/applications/misc/ausweisapp2/default.nix index dc46edc070fd..e4305118b573 100644 --- a/pkgs/applications/misc/ausweisapp2/default.nix +++ b/pkgs/applications/misc/ausweisapp2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, mkDerivation, fetchFromGitHub, cmake, pkgconfig, pcsclite, qtsvg, qttools, qtwebsockets +{ lib, stdenv, mkDerivation, fetchFromGitHub, cmake, pkgconfig, pcsclite, qtsvg, qttools, qtwebsockets , qtquickcontrols2, qtgraphicaleffects }: mkDerivation rec { @@ -16,7 +16,7 @@ mkDerivation rec { buildInputs = [ qtsvg qttools qtwebsockets qtquickcontrols2 qtgraphicaleffects pcsclite ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Authentication software for the German ID card"; downloadPage = "https://github.com/Governikus/AusweisApp2/releases"; homepage = "https://www.ausweisapp.bund.de/ausweisapp2/"; diff --git a/pkgs/applications/misc/autospotting/default.nix b/pkgs/applications/misc/autospotting/default.nix index f2e922e5b4d1..0b57ad292661 100644 --- a/pkgs/applications/misc/autospotting/default.nix +++ b/pkgs/applications/misc/autospotting/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage { pname = "autospotting"; @@ -17,7 +17,7 @@ buildGoPackage { sed -i "s+github.com/cristim/autospotting/core+github.com/AutoSpotting/AutoSpotting/core+" autospotting.go ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/AutoSpotting/AutoSpotting"; description = "Automatically convert your existing AutoScaling groups to up to 90% cheaper spot instances with minimal configuration changes"; license = licenses.free; diff --git a/pkgs/applications/misc/avrdudess/default.nix b/pkgs/applications/misc/avrdudess/default.nix index f4a56e4f9240..4e5e253fd07f 100644 --- a/pkgs/applications/misc/avrdudess/default.nix +++ b/pkgs/applications/misc/avrdudess/default.nix @@ -1,4 +1,4 @@ -{ stdenv, runtimeShell, fetchurl, unzip, mono, avrdude, gtk2, xdg_utils }: +{ lib, stdenv, runtimeShell, fetchurl, unzip, mono, avrdude, gtk2, xdg_utils }: stdenv.mkDerivation { name = "avrdudess-2.2.20140102"; @@ -32,7 +32,7 @@ stdenv.mkDerivation { chmod a+x "$out/bin/"* ''; - meta = with stdenv.lib; { + meta = with lib; { description = "GUI for AVRDUDE (AVR microcontroller programmer)"; homepage = "https://github.com/zkemble/AVRDUDESS"; license = licenses.gpl3; diff --git a/pkgs/applications/misc/batsignal/default.nix b/pkgs/applications/misc/batsignal/default.nix index 90fca4ce28ce..93e16ea3469d 100644 --- a/pkgs/applications/misc/batsignal/default.nix +++ b/pkgs/applications/misc/batsignal/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libnotify, pkg-config, glib }: +{ lib, stdenv, fetchFromGitHub, libnotify, pkg-config, glib }: stdenv.mkDerivation rec { pname = "batsignal"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; installFlags = [ "PREFIX=${placeholder "out"}" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/electrickite/batsignal"; description = "Lightweight battery daemon written in C"; license = licenses.isc; diff --git a/pkgs/applications/misc/bicon/default.nix b/pkgs/applications/misc/bicon/default.nix index 41b0d3c13a80..72f5a639f11f 100644 --- a/pkgs/applications/misc/bicon/default.nix +++ b/pkgs/applications/misc/bicon/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , autoreconfHook , pkg-config @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { patchShebangs . ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A bidirectional console"; homepage = "https://github.com/behdad/bicon"; license = [ licenses.lgpl21 licenses.psfl licenses.bsd0 ]; diff --git a/pkgs/applications/misc/bleachbit/default.nix b/pkgs/applications/misc/bleachbit/default.nix index 3c11c7bfaf57..31da1e8d4955 100644 --- a/pkgs/applications/misc/bleachbit/default.nix +++ b/pkgs/applications/misc/bleachbit/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , python3Packages , fetchurl , gettext @@ -59,7 +59,7 @@ python3Packages.buildPythonApplication rec { strictDeps = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://bleachbit.sourceforge.net"; description = "A program to clean your computer"; longDescription = "BleachBit helps you easily clean your computer to free space and maintain privacy."; diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 9796aef9b7cb..9921fdc7a797 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -1,4 +1,4 @@ -{ config, stdenv, lib, fetchurl, boost, cmake, ffmpeg, gettext, glew +{ config, stdenv, lib, fetchurl, fetchzip, boost, cmake, ffmpeg, gettext, glew , ilmbase, libXi, libX11, libXext, libXrender , libjpeg, libpng, libsamplerate, libsndfile , libtiff, libGLU, libGL, openal, opencolorio, openexr, openimagedenoise, openimageio2, openjpeg, python3Packages @@ -13,9 +13,14 @@ }: with lib; +let + python = python3Packages.python; + optix = fetchzip { + url = "https://developer.download.nvidia.com/redist/optix/v7.0/OptiX-7.0.0-include.zip"; + sha256 = "1b3ccd3197anya2bj3psxdrvrpfgiwva5zfv2xmyrl73nb2dvfr7"; + }; -let python = python3Packages.python; in - +in stdenv.mkDerivation rec { pname = "blender"; version = "2.91.0"; @@ -111,7 +116,11 @@ stdenv.mkDerivation rec { # Clang doesn't support "-export-dynamic" ++ optional stdenv.cc.isClang "-DPYTHON_LINKFLAGS=" ++ optional jackaudioSupport "-DWITH_JACK=ON" - ++ optional cudaSupport "-DWITH_CYCLES_CUDA_BINARIES=ON"; + ++ optional cudaSupport [ + "-DWITH_CYCLES_CUDA_BINARIES=ON" + "-DWITH_CYCLES_DEVICE_OPTIX=ON" + "-DOPTIX_ROOT_DIR=${optix}" + ]; NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR -I${python}/include/${python.libPrefix}"; @@ -119,8 +128,6 @@ stdenv.mkDerivation rec { # libstdc++ in our RPATH. Sigh. NIX_LDFLAGS = optionalString cudaSupport "-rpath ${stdenv.cc.cc.lib}/lib"; - enableParallelBuilding = true; - blenderExecutable = placeholder "out" + (if stdenv.isDarwin then "/Blender.app/Contents/MacOS/Blender" else "/bin/blender"); # --python-expr is used to workaround https://developer.blender.org/T74304 @@ -139,12 +146,13 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "3D Creation/Animation/Publishing System"; homepage = "https://www.blender.org"; # They comment two licenses: GPLv2 and Blender License, but they # say: "We've decided to cancel the BL offering for an indefinite period." - license = licenses.gpl2Plus; + # OptiX, enabled with cudaSupport, is non-free. + license = with licenses; [ gpl2Plus ] ++ optional cudaSupport unfree; platforms = [ "x86_64-linux" "x86_64-darwin" ]; maintainers = with maintainers; [ goibhniu veprbl ]; }; diff --git a/pkgs/applications/misc/blogc/default.nix b/pkgs/applications/misc/blogc/default.nix index 72e26191456f..57be731a1213 100644 --- a/pkgs/applications/misc/blogc/default.nix +++ b/pkgs/applications/misc/blogc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, ronn, git, cmocka }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, ronn, git, cmocka }: stdenv.mkDerivation rec { pname = "blogc"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A blog compiler"; license = licenses.bsd3; homepage = "https://blogc.rgm.io"; diff --git a/pkgs/applications/misc/blugon/default.nix b/pkgs/applications/misc/blugon/default.nix index 9aa8d3da39a0..d11a61e440fb 100644 --- a/pkgs/applications/misc/blugon/default.nix +++ b/pkgs/applications/misc/blugon/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python3, libX11, libXrandr }: +{ lib, stdenv, fetchFromGitHub, python3, libX11, libXrandr }: stdenv.mkDerivation rec { pname = "blugon"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Simple and configurable Blue Light Filter for X"; longDescription = '' blugon is a simple and fast Blue Light Filter, that is highly configurable and provides a command line interface. diff --git a/pkgs/applications/misc/break-time/default.nix b/pkgs/applications/misc/break-time/default.nix index 4bcc4de5157d..05815e242f02 100644 --- a/pkgs/applications/misc/break-time/default.nix +++ b/pkgs/applications/misc/break-time/default.nix @@ -5,7 +5,7 @@ , pkg-config , python3 , rustPlatform -, stdenv +, lib, stdenv , wrapGAppsHook }: @@ -34,7 +34,7 @@ rustPlatform.buildRustPackage rec { openssl ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Break timer that forces you to take a break"; homepage = "https://github.com/cdepillabout/break-time"; license = with licenses; [ mit ]; diff --git a/pkgs/applications/misc/buku/default.nix b/pkgs/applications/misc/buku/default.nix index 459b2159a93f..772754ecc6d5 100644 --- a/pkgs/applications/misc/buku/default.nix +++ b/pkgs/applications/misc/buku/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python3, fetchFromGitHub }: +{ lib, stdenv, python3, fetchFromGitHub }: with python3.pkgs; buildPythonApplication rec { version = "4.5"; @@ -70,11 +70,11 @@ with python3.pkgs; buildPythonApplication rec { cp auto-completion/fish/* $out/share/fish/vendor_completions.d ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Private cmdline bookmark manager"; homepage = "https://github.com/jarun/Buku"; license = licenses.gpl3; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ matthiasbeyer infinisil ]; }; } diff --git a/pkgs/applications/misc/calcurse/default.nix b/pkgs/applications/misc/calcurse/default.nix index a3cad7d9f2e7..ba8edb2baa50 100644 --- a/pkgs/applications/misc/calcurse/default.nix +++ b/pkgs/applications/misc/calcurse/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, gettext, python3, python3Packages, makeWrapper }: +{ lib, stdenv, fetchurl, ncurses, gettext, python3, python3Packages, makeWrapper }: stdenv.mkDerivation rec { pname = "calcurse"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { patchPythonScript $out/bin/calcurse-caldav ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A calendar and scheduling application for the command line"; longDescription = '' calcurse is a calendar and scheduling application for the command line. It helps diff --git a/pkgs/applications/misc/candle/default.nix b/pkgs/applications/misc/candle/default.nix index 842ef2262d9f..d3357b41bd2e 100644 --- a/pkgs/applications/misc/candle/default.nix +++ b/pkgs/applications/misc/candle/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, stdenv, fetchFromGitHub, qtbase, qtserialport, qmake }: +{ mkDerivation, lib, stdenv, fetchFromGitHub, qtbase, qtserialport, qmake }: mkDerivation rec { pname = "candle"; @@ -12,7 +12,7 @@ mkDerivation rec { }; nativeBuildInputs = [ qmake ]; - + sourceRoot = "source/src"; installPhase = '' @@ -23,7 +23,7 @@ mkDerivation rec { buildInputs = [ qtbase qtserialport ]; - meta = with stdenv.lib; { + meta = with lib; { description = "GRBL controller application with G-Code visualizer written in Qt"; homepage = "https://github.com/Denvi/Candle"; license = licenses.gpl3; diff --git a/pkgs/applications/misc/cardpeek/default.nix b/pkgs/applications/misc/cardpeek/default.nix index 83340f78dd48..c565a1bf9941 100644 --- a/pkgs/applications/misc/cardpeek/default.nix +++ b/pkgs/applications/misc/cardpeek/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, +{ lib, stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, glib, gtk3, pcsclite, lua5_2, curl, readline }: let version = "0.8.4"; @@ -19,7 +19,7 @@ in enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/L1L1/cardpeek"; description = "A tool to read the contents of ISO7816 smart cards"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/misc/cataract/build.nix b/pkgs/applications/misc/cataract/build.nix index 1c33a92987c1..3347321d71d2 100644 --- a/pkgs/applications/misc/cataract/build.nix +++ b/pkgs/applications/misc/cataract/build.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchgit , autoreconfHook , glib @@ -31,7 +31,7 @@ stdenv.mkDerivation { cp src/cgg{,-dirgen} $out/bin/ ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://cgg.bzatek.net/"; description = "A simple static web photo gallery, designed to be clean and easily usable"; license = licenses.gpl2; diff --git a/pkgs/applications/misc/catclock/default.nix b/pkgs/applications/misc/catclock/default.nix index 6b4ab1f3a8bf..9c6b1812683a 100644 --- a/pkgs/applications/misc/catclock/default.nix +++ b/pkgs/applications/misc/catclock/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, xlibsWrapper, motif }: +{ lib, stdenv, fetchFromGitHub, xlibsWrapper, motif }: stdenv.mkDerivation { name = "catclock-2015-10-04"; @@ -22,7 +22,7 @@ stdenv.mkDerivation { buildInputs = [ xlibsWrapper motif ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://codefromabove.com/2014/05/catclock/"; license = with licenses; mit; maintainers = with maintainers; [ ramkromberg ]; diff --git a/pkgs/applications/misc/cbatticon/default.nix b/pkgs/applications/misc/cbatticon/default.nix index e7664244db7b..e77958b724d8 100644 --- a/pkgs/applications/misc/cbatticon/default.nix +++ b/pkgs/applications/misc/cbatticon/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, gettext, glib, gtk3, libnotify, wrapGAppsHook }: +{ lib, stdenv, fetchFromGitHub, pkgconfig, gettext, glib, gtk3, libnotify, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "cbatticon"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=${placeholder "out"}" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Lightweight and fast battery icon that sits in the system tray"; homepage = "https://github.com/valr/cbatticon"; license = licenses.gpl2; diff --git a/pkgs/applications/misc/cheat/default.nix b/pkgs/applications/misc/cheat/default.nix index 208c9c533137..988af330deb5 100644 --- a/pkgs/applications/misc/cheat/default.nix +++ b/pkgs/applications/misc/cheat/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , buildGoModule, installShellFiles }: buildGoModule rec { @@ -25,7 +25,7 @@ buildGoModule rec { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Create and view interactive cheatsheets on the command-line"; maintainers = with maintainers; [ mic92 ]; license = with licenses; [ gpl3 mit ]; diff --git a/pkgs/applications/misc/chewing-editor/default.nix b/pkgs/applications/misc/chewing-editor/default.nix index 3a89773b8587..e1a57bb5300f 100644 --- a/pkgs/applications/misc/chewing-editor/default.nix +++ b/pkgs/applications/misc/chewing-editor/default.nix @@ -1,4 +1,4 @@ -{ stdenv, mkDerivation, fetchFromGitHub, cmake, pkgconfig, libchewing, qtbase +{ lib, stdenv, mkDerivation, fetchFromGitHub, cmake, pkgconfig, libchewing, qtbase , qttools }: mkDerivation rec { @@ -17,7 +17,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ libchewing qtbase qttools ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Cross platform chewing user phrase editor"; longDescription = '' chewing-editor is a cross platform chewing user phrase editor. It provides a easy way to manage user phrase. With it, user can customize their user phrase to increase input performance. diff --git a/pkgs/applications/misc/cipher/default.nix b/pkgs/applications/misc/cipher/default.nix index 630519ff2bff..ccf7da70f6ee 100644 --- a/pkgs/applications/misc/cipher/default.nix +++ b/pkgs/applications/misc/cipher/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , nix-update-script , meson @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A simple application for encoding and decoding text, designed for elementary OS"; homepage = "https://github.com/arshubham/cipher"; maintainers = with maintainers; [ xiorcale ] ++ pantheon.maintainers; diff --git a/pkgs/applications/misc/clipit/default.nix b/pkgs/applications/misc/clipit/default.nix index cc6d7d29fcd4..97ac54731c9f 100644 --- a/pkgs/applications/misc/clipit/default.nix +++ b/pkgs/applications/misc/clipit/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, fetchpatch, stdenv +{ fetchFromGitHub, fetchpatch, lib, stdenv , autoreconfHook, intltool, pkgconfig , gtk3, libayatana-appindicator, xdotool, which, wrapGAppsHook }: @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { "--prefix" "PATH" ":" "${stdenv.lib.makeBinPath [ xdotool which ]}" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Lightweight GTK Clipboard Manager"; inherit (src.meta) homepage; license = licenses.gpl3; diff --git a/pkgs/applications/misc/clipmenu/default.nix b/pkgs/applications/misc/clipmenu/default.nix index 3227792d6a2f..e3a0046205e0 100644 --- a/pkgs/applications/misc/clipmenu/default.nix +++ b/pkgs/applications/misc/clipmenu/default.nix @@ -1,36 +1,46 @@ -{ clipnotify, makeWrapper, xsel, dmenu, util-linux, gawk, stdenv, fetchFromGitHub, fetchpatch, lib }: -let - runtimePath = lib.makeBinPath [ clipnotify xsel dmenu util-linux gawk ]; -in +{ stdenv +, lib +, fetchFromGitHub +, makeWrapper +, clipnotify +, coreutils +, dmenu +, gawk +, util-linux +, xdotool +, xsel +}: stdenv.mkDerivation rec { pname = "clipmenu"; - version = "6.1.0"; + version = "6.2.0"; src = fetchFromGitHub { owner = "cdown"; repo = "clipmenu"; rev = version; - sha256 = "0ddj5xcwrdb2qvrndvhv8j6swcqc8dvv5i00pqk35rfk5mrl4hwv"; + sha256 = "sha256-nvctEwyho6kl4+NXi76jT2kG7nchmI2a7mgxlgjXA5A="; }; - - patches = [ - (fetchpatch { - url = "https://github.com/cdown/clipmenu/commit/443b58583ef216e2405e4a38d401f7c36386d21e.patch"; - sha256 = "12m4rpw7jbr31c919llbsmn8dcf7yh9aijln4iym6h2lylzqzzdz"; - }) - ]; - + + postPatch = '' + sed -i init/clipmenud.service \ + -e "s,/usr/bin,$out/bin," + ''; + makeFlags = [ "PREFIX=$(out)" ]; buildInputs = [ makeWrapper ]; nativeBuildInputs = [ xsel clipnotify ]; - installPhase = '' - for bin in $out/bin/*; do - wrapProgram "$bin" --prefix PATH : "${runtimePath}" - done + postFixup = '' + sed -i "$out/bin/clipctl" -e 's,clipmenud\$,\.clipmenud-wrapped\$,' + + wrapProgram "$out/bin/clipmenu" \ + --prefix PATH : "${lib.makeBinPath [ xsel ]}" + + wrapProgram "$out/bin/clipmenud" \ + --set PATH "${lib.makeBinPath [ clipnotify coreutils gawk util-linux xdotool xsel ]}" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Clipboard management using dmenu"; inherit (src.meta) homepage; maintainers = with maintainers; [ jb55 ]; diff --git a/pkgs/applications/misc/cmatrix/default.nix b/pkgs/applications/misc/cmatrix/default.nix index fa0e10f9eef8..8008edf09969 100644 --- a/pkgs/applications/misc/cmatrix/default.nix +++ b/pkgs/applications/misc/cmatrix/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, ncurses }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, ncurses }: stdenv.mkDerivation rec { pname = "cmatrix"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ ncurses ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Simulates the falling characters theme from The Matrix movie"; license = licenses.gpl3; longDescription = '' diff --git a/pkgs/applications/misc/colort/default.nix b/pkgs/applications/misc/colort/default.nix index 1eda11890e79..a4283e5ebb93 100644 --- a/pkgs/applications/misc/colort/default.nix +++ b/pkgs/applications/misc/colort/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation { name = "colort-unstable-2017-03-12"; @@ -12,7 +12,7 @@ stdenv.mkDerivation { makeFlags = ["PREFIX=$(out)"]; - meta = with stdenv.lib; { + meta = with lib; { description = "A program for 'tinting' color values"; homepage = "https://github.com/neeasade/colort"; license = licenses.mit; diff --git a/pkgs/applications/misc/corectrl/default.nix b/pkgs/applications/misc/corectrl/default.nix index 090a63a32e4f..3e129a81b162 100644 --- a/pkgs/applications/misc/corectrl/default.nix +++ b/pkgs/applications/misc/corectrl/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitLab , extra-cmake-modules , botan2 @@ -59,7 +59,7 @@ stdenv.mkDerivation rec{ wrapQtApp $out/bin/corectrl --prefix PATH ":" ${binPath} ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://gitlab.com/corectrl/corectrl/"; description = "Control your computer hardware via application profiles"; longDescription = '' diff --git a/pkgs/applications/misc/coursera-dl/default.nix b/pkgs/applications/misc/coursera-dl/default.nix index bbb7c53b61f6..631d53b506fc 100644 --- a/pkgs/applications/misc/coursera-dl/default.nix +++ b/pkgs/applications/misc/coursera-dl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, glibcLocales, pandoc, python3 }: +{ lib, stdenv, fetchFromGitHub, glibcLocales, pandoc, python3 }: let pythonPackages = python3.pkgs; @@ -36,7 +36,7 @@ in pythonPackages.buildPythonApplication rec { py.test -k 'not test_get_credentials_with_keyring' . ''; - meta = with stdenv.lib; { + meta = with lib; { description = "CLI for downloading Coursera.org videos and naming them"; homepage = "https://github.com/coursera-dl/coursera-dl"; license = licenses.lgpl3Plus; diff --git a/pkgs/applications/misc/cpu-x/default.nix b/pkgs/applications/misc/cpu-x/default.nix index a92ca30c5d80..236c2d6d4332 100644 --- a/pkgs/applications/misc/cpu-x/default.nix +++ b/pkgs/applications/misc/cpu-x/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, gtk3, ncurses +{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, gtk3, ncurses , libcpuid, pciutils, procps, wrapGAppsHook, nasm, makeWrapper }: stdenv.mkDerivation rec { @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { --prefix PATH : ${stdenv.lib.makeBinPath [ stdenv.cc ]} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Free software that gathers information on CPU, motherboard and more"; homepage = src.meta.homepage; license = licenses.gpl3; diff --git a/pkgs/applications/misc/crow-translate/default.nix b/pkgs/applications/misc/crow-translate/default.nix new file mode 100644 index 000000000000..120bc768c398 --- /dev/null +++ b/pkgs/applications/misc/crow-translate/default.nix @@ -0,0 +1,74 @@ +{ stdenv +, mkDerivation +, fetchFromGitHub +, substituteAll +, cmake +, extra-cmake-modules +, qttools +, leptonica +, tesseract4 +, qtmultimedia +, qtx11extras +, qttranslations +}: +let + singleapplication = fetchFromGitHub { + owner = "itay-grudev"; + repo = "SingleApplication"; + rev = "v3.2.0"; + sha256 = "0w3z97dcqcz3bf7w6fja4smkafmx9kvhzb9px4k2nfmmyxh4yfma"; + }; + qtaskbarcontrol = fetchFromGitHub { + owner = "Skycoder42"; + repo = "QTaskbarControl"; + rev = "2.0.2"; + sha256 = "0iymcvq3pv07fs9l4kh6hi1igqr7957iqndhsmg9fqkalf8nqyad"; + }; + qhotkey = fetchFromGitHub { + owner = "Skycoder42"; + repo = "QHotkey"; + rev = "1.4.2"; + sha256 = "0391fkqrxqmzpvms4rk06aq05l308k6sadp6y3czq0gx2kng8mn9"; + }; + qonlinetranslator = fetchFromGitHub { + owner = "crow-translate"; + repo = "QOnlineTranslator"; + rev = "1.4.1"; + sha256 = "1c6a8mdxms5vh8l7shi2kqdhafbzm50pbz6g1hhgg6qslla0vfn0"; + }; +in +mkDerivation rec { + pname = "crow-translate"; + version = "2.6.2"; + + src = fetchFromGitHub { + owner = "crow-translate"; + repo = "crow-translate"; + rev = version; + sha256 = "1jgpqynmxmh6mrknpk5fh96lbdg799axp4cyn5rvalg3sdxajmqc"; + }; + + patches = [ + (substituteAll { + src = ./dont-fetch-external-libs.patch; + inherit singleapplication qtaskbarcontrol qhotkey qonlinetranslator; + }) + (substituteAll { + # See https://github.com/NixOS/nixpkgs/issues/86054 + src = ./fix-qttranslations-path.patch; + inherit qttranslations; + }) + ]; + + nativeBuildInputs = [ cmake extra-cmake-modules qttools ]; + + buildInputs = [ leptonica tesseract4 qtmultimedia qtx11extras ]; + + meta = with stdenv.lib; { + description = "A simple and lightweight translator that allows to translate and speak text using Google, Yandex and Bing"; + homepage = "https://crow-translate.github.io/"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ sikmir ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/crow-translate/dont-fetch-external-libs.patch b/pkgs/applications/misc/crow-translate/dont-fetch-external-libs.patch new file mode 100644 index 000000000000..b5f8d4606aa0 --- /dev/null +++ b/pkgs/applications/misc/crow-translate/dont-fetch-external-libs.patch @@ -0,0 +1,33 @@ +diff --git i/cmake/ExternalLibraries.cmake w/cmake/ExternalLibraries.cmake +index d8c88ae..47a12c0 100644 +--- i/cmake/ExternalLibraries.cmake ++++ w/cmake/ExternalLibraries.cmake +@@ -2,24 +2,20 @@ include(FetchContent) + + set(QAPPLICATION_CLASS QApplication) + FetchContent_Declare(SingleApplication +- GIT_REPOSITORY https://github.com/itay-grudev/SingleApplication +- GIT_TAG v3.2.0 ++ SOURCE_DIR @singleapplication@ + ) + + FetchContent_Declare(QTaskbarControl +- GIT_REPOSITORY https://github.com/Skycoder42/QTaskbarControl +- GIT_TAG 2.0.2 ++ SOURCE_DIR @qtaskbarcontrol@ + ) + + option(QHOTKEY_INSTALL OFF) + FetchContent_Declare(QHotkey +- GIT_REPOSITORY https://github.com/Skycoder42/QHotkey +- GIT_TAG 1.4.2 ++ SOURCE_DIR @qhotkey@ + ) + + FetchContent_Declare(QOnlineTranslator +- GIT_REPOSITORY https://github.com/crow-translate/QOnlineTranslator +- GIT_TAG 1.4.1 ++ SOURCE_DIR @qonlinetranslator@ + ) + + FetchContent_MakeAvailable(SingleApplication QTaskbarControl QHotkey QOnlineTranslator) diff --git a/pkgs/applications/misc/crow-translate/fix-qttranslations-path.patch b/pkgs/applications/misc/crow-translate/fix-qttranslations-path.patch new file mode 100644 index 000000000000..816b6c51886a --- /dev/null +++ b/pkgs/applications/misc/crow-translate/fix-qttranslations-path.patch @@ -0,0 +1,13 @@ +diff --git i/src/settings/appsettings.cpp w/src/settings/appsettings.cpp +index 7be4573..e65994e 100644 +--- i/src/settings/appsettings.cpp ++++ w/src/settings/appsettings.cpp +@@ -82,7 +82,7 @@ void AppSettings::applyLanguage(QLocale::Language lang) + QLocale::setDefault(QLocale(lang)); + + s_appTranslator.load(QLocale(), QStringLiteral(PROJECT_NAME), QStringLiteral("_"), QStandardPaths::locate(QStandardPaths::AppDataLocation, QStringLiteral("translations"), QStandardPaths::LocateDirectory)); +- s_qtTranslator.load(QLocale(), QStringLiteral("qt"), QStringLiteral("_"), QLibraryInfo::location(QLibraryInfo::TranslationsPath)); ++ s_qtTranslator.load(QLocale(), QStringLiteral("qt"), QStringLiteral("_"), QLatin1String("@qttranslations@/translations")); + } + + QLocale::Language AppSettings::defaultLanguage() diff --git a/pkgs/applications/misc/ctodo/default.nix b/pkgs/applications/misc/ctodo/default.nix index 602fe4308160..224a79881e04 100644 --- a/pkgs/applications/misc/ctodo/default.nix +++ b/pkgs/applications/misc/ctodo/default.nix @@ -1,25 +1,24 @@ -{ stdenv, cmake, fetchurl, ncurses, readline }: +{ lib, stdenv, fetchFromGitHub, cmake, ncurses, readline }: stdenv.mkDerivation rec { pname = "ctodo"; version = "1.3"; - src = fetchurl { - url = "https://github.com/Acolarh/ctodo/archive/v${version}.tar.gz"; - sha256 = "1k3raigcgpwa0h8zkv5x9rycnn2iqkb9qim4q9ydqy9wbv3m32jb"; + src = fetchFromGitHub { + owner = "Acolarh"; + repo = pname; + rev = "v${version}"; + sha256 = "0mqy5b35cbdwfpbs91ilsgz3wc4cky38xfz9pnr4q88q1vybigna"; }; - buildInputs = [ stdenv cmake ncurses readline ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ ncurses readline ]; - configurePhase = '' - cmake -DCMAKE_INSTALL_PREFIX=$out . - ''; - - meta = { + meta = with lib; { homepage = "http://ctodo.apakoh.dk/"; description = "A simple ncurses-based task list manager"; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.matthiasbeyer ]; - platforms = stdenv.lib.platforms.linux; + license = licenses.mit; + maintainers = [ maintainers.matthiasbeyer ]; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/misc/cum/default.nix b/pkgs/applications/misc/cum/default.nix index 2675a5f4fc5d..6b851e80f346 100644 --- a/pkgs/applications/misc/cum/default.nix +++ b/pkgs/applications/misc/cum/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python3Packages }: +{ lib, stdenv, python3Packages }: with python3Packages; @@ -26,7 +26,7 @@ buildPythonApplication rec { rm -rf $out/tests $out/LICENSE ''; - meta = with stdenv.lib; { + meta = with lib; { description = "comic updater, mangafied"; homepage = "https://github.com/Hamuko/cum"; license = licenses.asl20; diff --git a/pkgs/applications/misc/cura/lulzbot/libarcus.nix b/pkgs/applications/misc/cura/lulzbot/libarcus.nix index 5edaabbacb0f..1e186bdf5fd2 100644 --- a/pkgs/applications/misc/cura/lulzbot/libarcus.nix +++ b/pkgs/applications/misc/cura/lulzbot/libarcus.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchgit, fetchurl, cmake, sip, protobuf, pythonOlder }: +{ lib, stdenv, buildPythonPackage, fetchgit, fetchurl, cmake, sip, protobuf, pythonOlder }: buildPythonPackage { pname = "libarcus"; @@ -22,7 +22,7 @@ buildPythonPackage { sed -i '/SET(ENV{PYTHONPATH}/d' cmake/FindSIP.cmake ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Communication library between internal components for Ultimaker software"; homepage = "https://code.alephobjects.com/source/arcus/"; license = licenses.lgpl3Plus; diff --git a/pkgs/applications/misc/cura/lulzbot/libsavitar.nix b/pkgs/applications/misc/cura/lulzbot/libsavitar.nix index e32117a103ee..fb920235031f 100644 --- a/pkgs/applications/misc/cura/lulzbot/libsavitar.nix +++ b/pkgs/applications/misc/cura/lulzbot/libsavitar.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, pythonOlder, fetchgit, cmake, sip }: +{ lib, stdenv, buildPythonPackage, pythonOlder, fetchgit, cmake, sip }: buildPythonPackage { pname = "libsavitar-lulzbot"; @@ -23,7 +23,7 @@ buildPythonPackage { disabled = pythonOlder "3.4.0"; - meta = with stdenv.lib; { + meta = with lib; { description = "C++ implementation of 3mf loading with SIP python bindings"; homepage = "https://github.com/Ultimaker/libSavitar"; license = licenses.lgpl3Plus; diff --git a/pkgs/applications/misc/cura/lulzbot/uranium.nix b/pkgs/applications/misc/cura/lulzbot/uranium.nix index 2ce0fab170ea..77a4f3edef65 100644 --- a/pkgs/applications/misc/cura/lulzbot/uranium.nix +++ b/pkgs/applications/misc/cura/lulzbot/uranium.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, fetchurl, fetchgit, buildPythonPackage, fetchFromGitHub, python, cmake +{ lib, stdenv, callPackage, fetchurl, fetchgit, buildPythonPackage, fetchFromGitHub, python, cmake , pyqt5, numpy, scipy, shapely, libarcusLulzbot, doxygen, gettext, pythonOlder }: buildPythonPackage { @@ -27,7 +27,7 @@ buildPythonPackage { UM/Application.py ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A Python framework for building Desktop applications"; homepage = "https://code.alephobjects.com/diffusion/U/"; license = licenses.lgpl3Plus; diff --git a/pkgs/applications/misc/cura/plugins.nix b/pkgs/applications/misc/cura/plugins.nix index 9082feb38a7a..699df0e1936f 100644 --- a/pkgs/applications/misc/cura/plugins.nix +++ b/pkgs/applications/misc/cura/plugins.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, python3Packages }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, python3Packages }: let @@ -24,7 +24,7 @@ let cp -rv . $out/lib/cura/plugins/OctoPrintPlugin/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Enables printing directly to OctoPrint and monitoring the process"; homepage = "https://github.com/fieldOfView/Cura-OctoPrintPlugin"; license = licenses.agpl3; diff --git a/pkgs/applications/misc/cura/stable.nix b/pkgs/applications/misc/cura/stable.nix index 87d2aba891b6..5383cbe9a23a 100644 --- a/pkgs/applications/misc/cura/stable.nix +++ b/pkgs/applications/misc/cura/stable.nix @@ -1,4 +1,4 @@ -{ stdenv, python27Packages, curaengine, makeDesktopItem, fetchurl }: +{ lib, stdenv, python27Packages, curaengine, makeDesktopItem, fetchurl }: let py = python27Packages; version = "15.04"; @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { ln -s "$resources/images/c.png" "$out"/share/icons/cura.png ''; - meta = with stdenv.lib; { + meta = with lib; { description = "3D printing host software"; homepage = "https://github.com/daid/Cura"; license = licenses.agpl3; diff --git a/pkgs/applications/misc/curaengine/default.nix b/pkgs/applications/misc/curaengine/default.nix index 8993c01a6bd2..4a4558ba2893 100644 --- a/pkgs/applications/misc/curaengine/default.nix +++ b/pkgs/applications/misc/curaengine/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, libarcus, stb, protobuf }: +{ lib, stdenv, fetchFromGitHub, cmake, libarcus, stb, protobuf }: stdenv.mkDerivation rec { pname = "curaengine"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DCURA_ENGINE_VERSION=${version}" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A powerful, fast and robust engine for processing 3D models into 3D printing instruction"; homepage = "https://github.com/Ultimaker/CuraEngine"; license = licenses.agpl3; diff --git a/pkgs/applications/misc/curaengine/stable.nix b/pkgs/applications/misc/curaengine/stable.nix index 394a94f19ab8..23041c2fe37e 100644 --- a/pkgs/applications/misc/curaengine/stable.nix +++ b/pkgs/applications/misc/curaengine/stable.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: let version = "15.04.6"; in @@ -20,7 +20,7 @@ stdenv.mkDerivation { cp build/CuraEngine $out/bin/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Engine for processing 3D models into 3D printing instructions"; homepage = "https://github.com/Ultimaker/CuraEngine"; license = licenses.agpl3; diff --git a/pkgs/applications/misc/dasel/default.nix b/pkgs/applications/misc/dasel/default.nix index 8853ff266a6a..3a46b5e2f9a6 100644 --- a/pkgs/applications/misc/dasel/default.nix +++ b/pkgs/applications/misc/dasel/default.nix @@ -1,20 +1,20 @@ -{ stdenv +{ lib, stdenv , buildGoModule , fetchFromGitHub }: buildGoModule rec { pname = "dasel"; - version = "1.11.0"; + version = "1.12.2"; src = fetchFromGitHub { owner = "TomWright"; repo = pname; rev = "v${version}"; - sha256 = "1xyh41vb2rypajjzbysw6k8x39bna8j3fmxcqyjcrqs0dzx78nk3"; + sha256 = "/WB/SsOih0N5P4cUAD6zkCajplzZ/Jez0H80+CG08rc="; }; - vendorSha256 = "1il1vnv0v97qh8f47md5i6qaac2k8par0pd0z7zqg67vxq6gim85"; + vendorSha256 = "BdX4DO77mIf/+aBdkNVFUzClsIml1UMcgvikDbbdgcY="; buildFlagsArray = '' -ldflags=-s -w -X github.com/tomwright/dasel/internal.Version=${version} @@ -31,7 +31,7 @@ buildGoModule rec { fi ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Query and update data structures from the command line"; longDescription = '' Dasel (short for data-selector) allows you to query and modify data structures using selector strings. diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index 4e928ff34f06..e1c73393ec5f 100644 --- a/pkgs/applications/misc/dbeaver/default.nix +++ b/pkgs/applications/misc/dbeaver/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeDesktopItem, makeWrapper +{ lib, stdenv, fetchurl, makeDesktopItem, makeWrapper , fontconfig, freetype, glib, gtk3 , jdk, libX11, libXrender, libXtst, zlib }: @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "dbeaver-ce"; - version = "7.3.0"; + version = "7.3.2"; desktopItem = makeDesktopItem { name = "dbeaver"; @@ -30,10 +30,13 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://dbeaver.io/files/${version}/dbeaver-ce-${version}-linux.gtk.x86_64.tar.gz"; - sha256 = "sha256-JhEF2/97vo2FgzpCFkuc31aLl9qjKHV8RYXO5oBU1no="; + sha256 = "sha256-4BVXcR8/E4uIrPQJe9KU9577j4XLTxJWTO8g0vCHWts="; }; installPhase = '' + # remove bundled jre + rm -rf jre + mkdir -p $out/ cp -r . $out/dbeaver @@ -54,7 +57,7 @@ stdenv.mkDerivation rec { ln -s $out/dbeaver/icon.xpm $out/share/pixmaps/dbeaver.xpm ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://dbeaver.io/"; description = "Universal SQL Client for developers, DBA and analysts. Supports MySQL, PostgreSQL, MariaDB, SQLite, and more"; longDescription = '' diff --git a/pkgs/applications/misc/ddgr/default.nix b/pkgs/applications/misc/ddgr/default.nix index 1cac8811103d..850bca3320ea 100644 --- a/pkgs/applications/misc/ddgr/default.nix +++ b/pkgs/applications/misc/ddgr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python3, installShellFiles }: +{ lib, stdenv, fetchFromGitHub, python3, installShellFiles }: stdenv.mkDerivation rec { version = "1.9"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { installShellCompletion --zsh auto-completion/zsh/_ddgr ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/jarun/ddgr"; description = "Search DuckDuckGo from the terminal"; license = licenses.gpl3; diff --git a/pkgs/applications/misc/deadd-notification-center/default.nix b/pkgs/applications/misc/deadd-notification-center/default.nix index 98fe799b1100..8414e02eb889 100644 --- a/pkgs/applications/misc/deadd-notification-center/default.nix +++ b/pkgs/applications/misc/deadd-notification-center/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , autoPatchelfHook , gtk3 @@ -38,10 +38,10 @@ stdenv.mkDerivation rec { cp $src $out/bin/deadd-notification-center chmod +x $out/bin/deadd-notification-center - sed "s|##PREFIX##|$out|g" ${dbusService} > $out/share/dbus-1/services/com.ph-uhl.deadd.notification.service + sed "s|##PREFIX##|$out|g" ${dbusService} > $out/share/dbus-1/services/com.ph-uhl.deadd.notification.service ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A haskell-written notification center for users that like a desktop with style"; homepage = "https://github.com/phuhl/linux_notification_center"; license = licenses.bsd3; diff --git a/pkgs/applications/misc/deco/default.nix b/pkgs/applications/misc/deco/default.nix index ad8b56e830fa..2ea3483f1bac 100644 --- a/pkgs/applications/misc/deco/default.nix +++ b/pkgs/applications/misc/deco/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, scsh, feh, xorg }: +{ lib, stdenv, fetchFromGitHub, scsh, feh, xorg }: stdenv.mkDerivation rec { pname = "deco"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { substituteInPlace $out/bin/deco --replace "xdpyinfo" "${xorg.xdpyinfo}/bin/xdpyinfo" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/ebzzry/deco"; description = "A simple root image setter"; license = licenses.mit; diff --git a/pkgs/applications/misc/devdocs-desktop/default.nix b/pkgs/applications/misc/devdocs-desktop/default.nix index 7c1726961339..3425ceb44a93 100644 --- a/pkgs/applications/misc/devdocs-desktop/default.nix +++ b/pkgs/applications/misc/devdocs-desktop/default.nix @@ -1,4 +1,4 @@ -{ stdenv, appimageTools, fetchurl, gsettings-desktop-schemas, gtk3 }: +{ lib, stdenv, appimageTools, fetchurl, gsettings-desktop-schemas, gtk3 }: let version = "0.7.1"; @@ -29,7 +29,7 @@ in appimageTools.wrapType2 rec { --replace 'Exec=AppRun' 'Exec=${pname}' ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A full-featured desktop app for DevDocs.io"; longDescription = '' DevDocs.io combines multiple API documentations in a fast, organized, and searchable interface. This is an unofficial desktop app for it. diff --git a/pkgs/applications/misc/devilspie2/default.nix b/pkgs/applications/misc/devilspie2/default.nix index 2961baee1024..70fb38d17c40 100644 --- a/pkgs/applications/misc/devilspie2/default.nix +++ b/pkgs/applications/misc/devilspie2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, intltool, pkgconfig, glib, gtk, lua, libwnck3 }: +{ lib, stdenv, fetchurl, intltool, pkgconfig, glib, gtk, lua, libwnck3 }: stdenv.mkDerivation rec { pname = "devilspie2"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { cp devilspie2.1 $out/share/man/man1 ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A window matching utility"; longDescription = '' Devilspie2 is a window matching utility, allowing the user to diff --git a/pkgs/applications/misc/dfilemanager/default.nix b/pkgs/applications/misc/dfilemanager/default.nix index 69c7f0dc17fb..e9a50e88b23c 100644 --- a/pkgs/applications/misc/dfilemanager/default.nix +++ b/pkgs/applications/misc/dfilemanager/default.nix @@ -1,18 +1,18 @@ -{ stdenv, mkDerivation, fetchgit, cmake, file, qtbase, qttools, solid }: +{ stdenv, mkDerivation, fetchFromGitHub, cmake, file, qtbase, qttools, solid }: -let - version = "git-2016-01-10"; -in mkDerivation { pname = "dfilemanager"; - inherit version; - src = fetchgit { - url = "git://git.code.sf.net/p/dfilemanager/code"; - rev = "2c5078b05e0ad74c037366be1ab3e6a03492bde4"; - sha256 = "1qwhnlcc2j8sr1f3v63sxs3m7q7w1xy6c2jqsnznjgm23b5h3hxd"; + version = "git-2020-09-04"; + + src = fetchFromGitHub { + owner = "probonopd"; + repo = "dfilemanager"; + rev = "c592d643d76942dc2c2ccb6e4bfdf53f5e805e48"; + sha256 = "7hIgaWjjOck5i4QbeVeQK7yrjK4yDoAZ5qY9RhM5ABY="; }; - buildInputs = [ cmake qtbase qttools file solid ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ qtbase qttools file solid ]; cmakeFlags = [ "-DQT5BUILD=true" ]; diff --git a/pkgs/applications/misc/diff-pdf/default.nix b/pkgs/applications/misc/diff-pdf/default.nix index 83116da4df05..471755c6392b 100644 --- a/pkgs/applications/misc/diff-pdf/default.nix +++ b/pkgs/applications/misc/diff-pdf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, pkgconfig, cairo, poppler, wxGTK ? null, wxmac ? null, darwin ? null }: +{ lib, stdenv, fetchFromGitHub, autoconf, automake, pkgconfig, cairo, poppler, wxGTK ? null, wxmac ? null, darwin ? null }: let wxInputs = @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { preConfigure = "./bootstrap"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://vslavik.github.io/diff-pdf/"; description = "Simple tool for visually comparing two PDF files"; license = licenses.gpl2; diff --git a/pkgs/applications/misc/ding/default.nix b/pkgs/applications/misc/ding/default.nix index 374c4cf66487..4f06708e47e9 100644 --- a/pkgs/applications/misc/ding/default.nix +++ b/pkgs/applications/misc/ding/default.nix @@ -1,4 +1,4 @@ -{ aspell, aspellDicts_de, aspellDicts_en, buildEnv, fetchurl, fortune, gnugrep, makeWrapper, stdenv, tk, tre }: +{ aspell, aspellDicts_de, aspellDicts_en, buildEnv, fetchurl, fortune, gnugrep, makeWrapper, lib, stdenv, tk, tre }: let aspellEnv = buildEnv { name = "env-ding-aspell"; @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/ding --prefix PATH : ${stdenv.lib.makeBinPath [ gnugrep aspellEnv tk fortune ]} --prefix ASPELL_CONF : "\"prefix ${aspellEnv};\"" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Simple and fast dictionary lookup tool"; homepage = "https://www-user.tu-chemnitz.de/~fri/ding/"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/misc/djvulibre/default.nix b/pkgs/applications/misc/djvulibre/default.nix index afb7b6cf1391..d4384e829cf5 100644 --- a/pkgs/applications/misc/djvulibre/default.nix +++ b/pkgs/applications/misc/djvulibre/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , libjpeg , libtiff @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { ./CVE-2019-15145.patch ]; - meta = with stdenv.lib; { + meta = with lib; { description = "The big set of CLI tools to make/modify/optimize/show/export DJVU files"; homepage = "http://djvu.sourceforge.net"; license = licenses.gpl2; diff --git a/pkgs/applications/misc/dmensamenu/default.nix b/pkgs/applications/misc/dmensamenu/default.nix index cf02efdcece5..a0b4237c7f67 100644 --- a/pkgs/applications/misc/dmensamenu/default.nix +++ b/pkgs/applications/misc/dmensamenu/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonApplication, fetchFromGitHub, substituteAll, requests, dmenu }: +{ lib, stdenv, buildPythonApplication, fetchFromGitHub, substituteAll, requests, dmenu }: buildPythonApplication rec { pname = "dmensamenu"; @@ -25,7 +25,7 @@ buildPythonApplication rec { # No tests implemented doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/dotlambda/dmensamenu"; description = "Print German canteen menus using dmenu and OpenMensa"; license = licenses.mit; diff --git a/pkgs/applications/misc/dmenu/default.nix b/pkgs/applications/misc/dmenu/default.nix index f83c5fc7f01f..62f02ce67142 100644 --- a/pkgs/applications/misc/dmenu/default.nix +++ b/pkgs/applications/misc/dmenu/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libX11, libXinerama, libXft, zlib, patches ? null }: +{ lib, stdenv, fetchurl, libX11, libXinerama, libXft, zlib, patches ? null }: stdenv.mkDerivation rec { name = "dmenu-5.0"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { makeFlags = [ "CC:=$(CC)" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A generic, highly customizable, and efficient menu for the X Window System"; homepage = "https://tools.suckless.org/dmenu"; license = licenses.mit; diff --git a/pkgs/applications/misc/dmenu/wayland.nix b/pkgs/applications/misc/dmenu/wayland.nix index 250a7567d782..8d77588ce8f1 100644 --- a/pkgs/applications/misc/dmenu/wayland.nix +++ b/pkgs/applications/misc/dmenu/wayland.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, meson, ninja, cairo, pango, pkg-config, wayland-protocols +{ lib, stdenv, fetchFromGitHub, meson, ninja, cairo, pango, pkg-config, wayland-protocols , glib, wayland, libxkbcommon, makeWrapper }: @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { --prefix PATH : $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { license = licenses.mit; platforms = platforms.linux; description = "dmenu for wayland-compositors"; diff --git a/pkgs/applications/misc/dockbarx/default.nix b/pkgs/applications/misc/dockbarx/default.nix index 463f7db6b0c3..e0e9fcd6febf 100644 --- a/pkgs/applications/misc/dockbarx/default.nix +++ b/pkgs/applications/misc/dockbarx/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pythonPackages, gnome2, keybinder }: +{ lib, stdenv, fetchFromGitHub, pythonPackages, gnome2, keybinder }: pythonPackages.buildPythonApplication rec { ver = "0.93"; @@ -28,7 +28,10 @@ pythonPackages.buildPythonApplication rec { ++ (with gnome2; [ gnome_python gnome_python_desktop ]) ++ [ keybinder ]; - meta = with stdenv.lib; { + # no tests + doCheck = false; + + meta = with lib; { homepage = "https://launchpad.net/dockbar/"; description = "Lightweight taskbar / panel replacement for Linux which works as a stand-alone dock"; license = licenses.gpl3; diff --git a/pkgs/applications/misc/doomseeker/default.nix b/pkgs/applications/misc/doomseeker/default.nix index 999904a21d3c..37f75c4fdd5c 100644 --- a/pkgs/applications/misc/doomseeker/default.nix +++ b/pkgs/applications/misc/doomseeker/default.nix @@ -1,4 +1,4 @@ -{ stdenv, mkDerivation, cmake, fetchFromBitbucket, pkgconfig, qtbase, qttools, qtmultimedia, zlib, bzip2, xxd }: +{ lib, stdenv, mkDerivation, cmake, fetchFromBitbucket, pkgconfig, qtbase, qttools, qtmultimedia, zlib, bzip2, xxd }: mkDerivation { pname = "doomseeker"; @@ -18,7 +18,7 @@ mkDerivation { hardeningDisable = stdenv.lib.optional stdenv.isDarwin "format"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://doomseeker.drdteam.org/"; description = "Multiplayer server browser for many Doom source ports"; license = licenses.gpl2; diff --git a/pkgs/applications/misc/dotfiles/default.nix b/pkgs/applications/misc/dotfiles/default.nix index b515074fd475..913ed9523baa 100644 --- a/pkgs/applications/misc/dotfiles/default.nix +++ b/pkgs/applications/misc/dotfiles/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pythonPackages }: +{ lib, stdenv, pythonPackages }: pythonPackages.buildPythonApplication rec { pname = "dotfiles"; @@ -15,7 +15,7 @@ pythonPackages.buildPythonApplication rec { checkInputs = with pythonPackages; [ pytest ]; propagatedBuildInputs = with pythonPackages; [ click ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Easily manage your dotfiles"; homepage = "https://github.com/jbernard/dotfiles"; license = licenses.isc; diff --git a/pkgs/applications/misc/dstask/default.nix b/pkgs/applications/misc/dstask/default.nix index 0c2f25b2653f..78efa133c1e4 100644 --- a/pkgs/applications/misc/dstask/default.nix +++ b/pkgs/applications/misc/dstask/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "dstask"; @@ -32,7 +32,7 @@ buildGoModule rec { subPackages = [ "cmd/dstask.go" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Command line todo list with super-reliable git sync"; homepage = src.meta.homepage; license = licenses.mit; diff --git a/pkgs/applications/misc/dupeguru/default.nix b/pkgs/applications/misc/dupeguru/default.nix index 51e1b77096d2..7a9e29396405 100644 --- a/pkgs/applications/misc/dupeguru/default.nix +++ b/pkgs/applications/misc/dupeguru/default.nix @@ -1,4 +1,4 @@ -{stdenv, python3Packages, fetchpatch, gettext, qt5, fetchFromGitHub}: +{lib, stdenv, python3Packages, fetchpatch, gettext, qt5, fetchFromGitHub}: python3Packages.buildPythonApplication rec { pname = "dupeguru"; @@ -61,7 +61,7 @@ python3Packages.buildPythonApplication rec { wrapPythonProgramsIn "$out/share/dupeguru" "$out $pythonPath" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "GUI tool to find duplicate files in a system"; homepage = "https://github.com/arsenetar/dupeguru"; license = licenses.bsd3; diff --git a/pkgs/applications/misc/eaglemode/default.nix b/pkgs/applications/misc/eaglemode/default.nix index 052e290120d7..806d960222da 100644 --- a/pkgs/applications/misc/eaglemode/default.nix +++ b/pkgs/applications/misc/eaglemode/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, libX11, libXinerama, libjpeg, libpng, libtiff, pkgconfig, +{ lib, stdenv, fetchurl, perl, libX11, libXinerama, libjpeg, libpng, libtiff, pkgconfig, librsvg, glib, gtk2, libXext, libXxf86vm, poppler, xineLib, ghostscript, makeWrapper }: stdenv.mkDerivation rec { @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/eaglemode --set EM_DIR "$out" --prefix LD_LIBRARY_PATH : "$out/lib" --prefix PATH : "${ghostscript}/bin" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://eaglemode.sourceforge.net"; description = "Zoomable User Interface"; license = licenses.gpl3; diff --git a/pkgs/applications/misc/effitask/default.nix b/pkgs/applications/misc/effitask/default.nix index 26008c133b82..b80ec80746f3 100644 --- a/pkgs/applications/misc/effitask/default.nix +++ b/pkgs/applications/misc/effitask/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , rustPlatform , fetchFromGitHub , pkg-config @@ -34,7 +34,7 @@ rustPlatform.buildRustPackage rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Graphical task manager, based on the todo.txt format"; longDescription = '' To use it as todo.sh add-on, create a symlink like this: diff --git a/pkgs/applications/misc/electrum/dash.nix b/pkgs/applications/misc/electrum/dash.nix index 33a8284744e5..29ac8b4484b5 100644 --- a/pkgs/applications/misc/electrum/dash.nix +++ b/pkgs/applications/misc/electrum/dash.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python2Packages }: +{ lib, stdenv, fetchurl, python2Packages }: python2Packages.buildPythonApplication rec { version = "2.9.3.1"; @@ -37,7 +37,7 @@ python2Packages.buildPythonApplication rec { pyrcc4 icons.qrc -o gui/qt/icons_rc.py ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Electrum DASH"; homepage = "https://github.com/dashpay/electrum-dash"; license = licenses.gpl3; diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index ac963c890dcf..215aa3dd5f24 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , fetchFromGitHub , wrapQtAppsHook @@ -139,7 +139,7 @@ python3.pkgs.buildPythonApplication { ; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A lightweight Bitcoin wallet"; longDescription = '' An easy-to-use Bitcoin client featuring wallets generated from diff --git a/pkgs/applications/misc/electrum/ltc.nix b/pkgs/applications/misc/electrum/ltc.nix index 7d6480b4696c..ad6ed6f7a783 100644 --- a/pkgs/applications/misc/electrum/ltc.nix +++ b/pkgs/applications/misc/electrum/ltc.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , python3Packages , wrapQtAppsHook @@ -46,7 +46,7 @@ python3Packages.buildPythonApplication rec { $out/bin/electrum-ltc help >/dev/null ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Litecoin thin client"; longDescription = '' Electrum-LTC is a simple, but powerful Litecoin wallet. A twelve-word diff --git a/pkgs/applications/misc/elf-dissector/default.nix b/pkgs/applications/misc/elf-dissector/default.nix index 36ceb49d5c4b..6edbcc0cce2e 100644 --- a/pkgs/applications/misc/elf-dissector/default.nix +++ b/pkgs/applications/misc/elf-dissector/default.nix @@ -15,8 +15,6 @@ mkDerivation rec { buildInputs = [ kitemmodels libiberty libelf libdwarf libopcodes ]; - enableParallelBuilding = true; - meta = with lib; { homepage = "https://invent.kde.org/sdk/elf-dissector"; description = "Tools for inspecting, analyzing and optimizing ELF files"; diff --git a/pkgs/applications/misc/elfx86exts/cargo-lock.patch b/pkgs/applications/misc/elfx86exts/cargo-lock.patch new file mode 100644 index 000000000000..4f56b82368fa --- /dev/null +++ b/pkgs/applications/misc/elfx86exts/cargo-lock.patch @@ -0,0 +1,1091 @@ +diff --git a/Cargo.lock b/Cargo.lock +new file mode 100644 +index 0000000..55e4495 +--- /dev/null ++++ b/Cargo.lock +@@ -0,0 +1,1085 @@ ++# This file is automatically @generated by Cargo. ++# It is not intended for manual editing. ++[[package]] ++name = "aho-corasick" ++version = "0.7.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "memchr 2.3.3 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "arrayvec" ++version = "0.4.12" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "nodrop 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "atk" ++version = "0.7.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "atk-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "glib 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "atk-sys" ++version = "0.9.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", ++ "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "autocfg" ++version = "1.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "backtrace" ++version = "0.3.41" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "backtrace-sys 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "backtrace-sys" ++version = "0.1.35" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "bitflags" ++version = "1.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "cairo-rs" ++version = "0.7.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cairo-sys-rs 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "glib 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "cairo-sys-rs" ++version = "0.9.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", ++ "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "cc" ++version = "1.0.50" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "cfg-if" ++version = "0.1.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "chrono" ++version = "0.4.11" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "num-integer 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ++ "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "effitask" ++version = "0.1.0" ++dependencies = [ ++ "cairo-rs 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "chrono 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)", ++ "gdk 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "gdk-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "glib 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "gtk 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "human-panic 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "notify 4.0.15 (registry+https://github.com/rust-lang/crates.io-index)", ++ "pulldown-cmark 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "regex 1.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "relm 0.18.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "relm-attributes 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "relm-derive 0.18.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "todo-txt 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "xdg 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "filetime" ++version = "0.2.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", ++ "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "fragile" ++version = "0.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "fsevent" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "fsevent-sys 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "fsevent-sys" ++version = "2.0.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "fuchsia-zircon" ++version = "0.3.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "fuchsia-zircon-sys" ++version = "0.3.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "gdk" ++version = "0.11.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cairo-rs 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cairo-sys-rs 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "gdk-pixbuf 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "gdk-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "gio 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "gio-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "glib 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", ++ "pango 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "gdk-pixbuf" ++version = "0.7.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "gdk-pixbuf-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "gio 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "gio-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "glib 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "gdk-pixbuf-sys" ++version = "0.9.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "gio-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", ++ "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "gdk-sys" ++version = "0.9.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cairo-sys-rs 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "gdk-pixbuf-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "gio-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", ++ "pango-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "getopts" ++version = "0.2.21" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "getrandom" ++version = "0.1.14" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wasi 0.9.0+wasi-snapshot-preview1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "gio" ++version = "0.7.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "fragile 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "gio-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "glib 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "gio-sys" ++version = "0.9.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", ++ "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "glib" ++version = "0.8.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "glib-sys" ++version = "0.9.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", ++ "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "gobject-sys" ++version = "0.9.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", ++ "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "gtk" ++version = "0.7.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "atk 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cairo-rs 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cairo-sys-rs 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)", ++ "gdk 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "gdk-pixbuf 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "gdk-pixbuf-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "gdk-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "gio 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "gio-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "glib 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "gtk-sys 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", ++ "pango 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "pango-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "gtk-sys" ++version = "0.9.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "atk-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cairo-sys-rs 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "gdk-pixbuf-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "gdk-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "gio-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", ++ "pango-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "human-panic" ++version = "1.0.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "backtrace 0.3.41 (registry+https://github.com/rust-lang/crates.io-index)", ++ "os_type 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde_derive 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)", ++ "termcolor 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "toml 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "uuid 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "inotify" ++version = "0.7.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "inotify-sys 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "inotify-sys" ++version = "0.1.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "iovec" ++version = "0.1.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "kernel32-sys" ++version = "0.2.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "lazy_static" ++version = "1.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "lazycell" ++version = "1.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "lexical-core" ++version = "0.6.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "arrayvec 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "ryu 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "static_assertions 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "libc" ++version = "0.2.68" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "log" ++version = "0.4.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "memchr" ++version = "2.3.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "mio" ++version = "0.6.21" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)", ++ "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "mio-extras" ++version = "2.0.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "lazycell 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "mio 0.6.21 (registry+https://github.com/rust-lang/crates.io-index)", ++ "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "miow" ++version = "0.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "net2" ++version = "0.2.33" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "nodrop" ++version = "0.1.14" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "nom" ++version = "5.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "lexical-core 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "memchr 2.3.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "version_check 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "notify" ++version = "4.0.15" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "filetime 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "fsevent 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "fsevent-sys 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "inotify 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", ++ "mio 0.6.21 (registry+https://github.com/rust-lang/crates.io-index)", ++ "mio-extras 2.0.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "walkdir 2.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "num-integer" ++version = "0.1.42" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "num-traits" ++version = "0.2.11" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "os_type" ++version = "2.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "regex 1.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "pango" ++version = "0.7.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "glib 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", ++ "pango-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "pango-sys" ++version = "0.9.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", ++ "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "pkg-config" ++version = "0.3.17" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "ppv-lite86" ++version = "0.2.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "proc-macro2" ++version = "0.4.30" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "proc-macro2" ++version = "1.0.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "pulldown-cmark" ++version = "0.6.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "getopts 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)", ++ "memchr 2.3.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicase 2.6.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "quote" ++version = "0.6.13" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "quote" ++version = "1.0.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "proc-macro2 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand" ++version = "0.7.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_chacha 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand_chacha" ++version = "0.2.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "ppv-lite86 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand_core" ++version = "0.5.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand_hc" ++version = "0.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "redox_syscall" ++version = "0.1.56" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "regex" ++version = "1.3.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "aho-corasick 0.7.10 (registry+https://github.com/rust-lang/crates.io-index)", ++ "memchr 2.3.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "regex-syntax 0.6.17 (registry+https://github.com/rust-lang/crates.io-index)", ++ "thread_local 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "regex-syntax" ++version = "0.6.17" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "relm" ++version = "0.18.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cairo-rs 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "glib 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "gtk 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", ++ "syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "relm-attributes" ++version = "0.16.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", ++ "relm-gen-widget 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "relm-derive" ++version = "0.18.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", ++ "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", ++ "syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "relm-gen-widget" ++version = "0.16.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", ++ "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", ++ "syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rustc-demangle" ++version = "0.1.16" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "rustc_version" ++version = "0.2.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "ryu" ++version = "1.0.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "same-file" ++version = "1.0.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "winapi-util 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "semver" ++version = "0.9.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "semver-parser" ++version = "0.7.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "serde" ++version = "1.0.106" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "serde_derive" ++version = "1.0.106" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "proc-macro2 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)", ++ "quote 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "syn 1.0.17 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "slab" ++version = "0.4.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "static_assertions" ++version = "0.3.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "syn" ++version = "0.15.44" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", ++ "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "syn" ++version = "1.0.17" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "proc-macro2 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)", ++ "quote 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "termcolor" ++version = "1.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "winapi-util 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "thread_local" ++version = "1.0.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "time" ++version = "0.1.42" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", ++ "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "todo-txt" ++version = "1.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "chrono 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "nom 5.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "regex 1.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "toml" ++version = "0.5.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "serde 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "unicase" ++version = "2.6.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "version_check 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "unicode-width" ++version = "0.1.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "unicode-xid" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "unicode-xid" ++version = "0.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "uuid" ++version = "0.8.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "version_check" ++version = "0.9.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "walkdir" ++version = "2.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "same-file 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi-util 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "wasi" ++version = "0.9.0+wasi-snapshot-preview1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "winapi" ++version = "0.2.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "winapi" ++version = "0.3.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "winapi-build" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "winapi-i686-pc-windows-gnu" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "winapi-util" ++version = "0.1.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "winapi-x86_64-pc-windows-gnu" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "ws2_32-sys" ++version = "0.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "xdg" ++version = "2.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[metadata] ++"checksum aho-corasick 0.7.10 (registry+https://github.com/rust-lang/crates.io-index)" = "8716408b8bc624ed7f65d223ddb9ac2d044c0547b6fa4b0d554f3a9540496ada" ++"checksum arrayvec 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)" = "cd9fd44efafa8690358b7408d253adf110036b88f55672a933f01d616ad9b1b9" ++"checksum atk 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "86b7499272acf036bb5820c6e346bbfb5acc5dceb104bc2c4fd7e6e33dfcde6a" ++"checksum atk-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e552c1776737a4c80110d06b36d099f47c727335f9aaa5d942a72b6863a8ec6f" ++"checksum autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d" ++"checksum backtrace 0.3.41 (registry+https://github.com/rust-lang/crates.io-index)" = "a4ed64ae6d9ebfd9893193c4b2532b1292ec97bd8271c9d7d0fa90cd78a34cba" ++"checksum backtrace-sys 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)" = "7de8aba10a69c8e8d7622c5710229485ec32e9d55fdad160ea559c086fdcd118" ++"checksum bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" ++"checksum cairo-rs 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e05db47de3b0f09a222fa4bba2eab957d920d4243962a86b2d77ab401e4a359c" ++"checksum cairo-sys-rs 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ff65ba02cac715be836f63429ab00a767d48336efc5497c5637afb53b4f14d63" ++"checksum cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)" = "95e28fa049fda1c330bcf9d723be7663a899c4679724b34c81e9f5a326aab8cd" ++"checksum cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "b486ce3ccf7ffd79fdeb678eac06a9e6c09fc88d33836340becb8fffe87c5e33" ++"checksum chrono 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)" = "80094f509cf8b5ae86a4966a39b3ff66cd7e2a3e594accec3743ff3fabeab5b2" ++"checksum filetime 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)" = "f59efc38004c988e4201d11d263b8171f49a2e7ec0bdbb71773433f271504a5e" ++"checksum fragile 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "05f8140122fa0d5dcb9fc8627cfce2b37cc1500f752636d46ea28bc26785c2f9" ++"checksum fsevent 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5ab7d1bd1bd33cc98b0889831b72da23c0aa4df9cec7e0702f46ecea04b35db6" ++"checksum fsevent-sys 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f41b048a94555da0f42f1d632e2e19510084fb8e303b0daa2816e733fb3644a0" ++"checksum fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82" ++"checksum fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" ++"checksum gdk 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6243e995f41f3a61a31847e54cc719edce93dd9140c89dca3b9919be1cfe22d5" ++"checksum gdk-pixbuf 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9726408ee1bbada83094326a99b9c68fea275f9dbb515de242a69e72051f4fcc" ++"checksum gdk-pixbuf-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d8991b060a9e9161bafd09bf4a202e6fd404f5b4dd1a08d53a1e84256fb34ab0" ++"checksum gdk-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "6adf679e91d1bff0c06860287f80403e7db54c2d2424dce0a470023b56c88fbb" ++"checksum getopts 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)" = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5" ++"checksum getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb" ++"checksum gio 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6261b5d34c30c2d59f879e643704cf54cb44731f3a2038000b68790c03e360e3" ++"checksum gio-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4fad225242b9eae7ec8a063bb86974aca56885014672375e5775dc0ea3533911" ++"checksum glib 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "be27232841baa43e0fd5ae003f7941925735b2f733a336dc75f07b9eff415e7b" ++"checksum glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "95856f3802f446c05feffa5e24859fe6a183a7cb849c8449afc35c86b1e316e2" ++"checksum gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "31d1a804f62034eccf370006ccaef3708a71c31d561fee88564abe71177553d9" ++"checksum gtk 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "709f1074259d4685b96133f92b75c7f35b504715b0fcdc96ec95de2607296a60" ++"checksum gtk-sys 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "53def660c7b48b00b510c81ef2d2fbd3c570f1527081d8d7947f471513e1a4c1" ++"checksum human-panic 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "39f357a500abcbd7c5f967c1d45c8838585b36743823b9d43488f24850534e36" ++"checksum inotify 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "24e40d6fd5d64e2082e0c796495c8ef5ad667a96d03e5aaa0becfd9d47bcbfb8" ++"checksum inotify-sys 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e74a1aa87c59aeff6ef2cc2fa62d41bc43f54952f55652656b18a02fd5e356c0" ++"checksum iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e" ++"checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" ++"checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" ++"checksum lazycell 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b294d6fa9ee409a054354afc4352b0b9ef7ca222c69b8812cbea9e7d2bf3783f" ++"checksum lexical-core 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)" = "f86d66d380c9c5a685aaac7a11818bdfa1f733198dfd9ec09c70b762cd12ad6f" ++"checksum libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)" = "dea0c0405123bba743ee3f91f49b1c7cfb684eef0da0a50110f758ccf24cdff0" ++"checksum log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7" ++"checksum memchr 2.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400" ++"checksum mio 0.6.21 (registry+https://github.com/rust-lang/crates.io-index)" = "302dec22bcf6bae6dfb69c647187f4b4d0fb6f535521f7bc022430ce8e12008f" ++"checksum mio-extras 2.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "52403fe290012ce777c4626790c8951324a2b9e3316b3143779c72b029742f19" ++"checksum miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919" ++"checksum net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "42550d9fb7b6684a6d404d9fa7250c2eb2646df731d1c06afc06dcee9e1bcf88" ++"checksum nodrop 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb" ++"checksum nom 5.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0b471253da97532da4b61552249c521e01e736071f71c1a4f7ebbfbf0a06aad6" ++"checksum notify 4.0.15 (registry+https://github.com/rust-lang/crates.io-index)" = "80ae4a7688d1fab81c5bf19c64fc8db920be8d519ce6336ed4e7efe024724dbd" ++"checksum num-integer 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "3f6ea62e9d81a77cd3ee9a2a5b9b609447857f3d358704331e4ef39eb247fcba" ++"checksum num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "c62be47e61d1842b9170f0fdeec8eba98e60e90e5446449a0545e5152acd7096" ++"checksum os_type 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7edc011af0ae98b7f88cf7e4a83b70a54a75d2b8cb013d6efd02e5956207e9eb" ++"checksum pango 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "393fa071b144f8ffb83ede273758983cf414ca3c0b1d2a5a9ce325b3ba3dd786" ++"checksum pango-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "86b93d84907b3cf0819bff8f13598ba72843bee579d5ebc2502e4b0367b4be7d" ++"checksum pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)" = "05da548ad6865900e60eaba7f589cc0783590a92e940c26953ff81ddbab2d677" ++"checksum ppv-lite86 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "74490b50b9fbe561ac330df47c08f3f33073d2d00c150f719147d7c54522fa1b" ++"checksum proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)" = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759" ++"checksum proc-macro2 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)" = "df246d292ff63439fea9bc8c0a270bed0e390d5ebd4db4ba15aba81111b5abe3" ++"checksum pulldown-cmark 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1c205cc82214f3594e2d50686730314f817c67ffa80fe800cf0db78c3c2b9d9e" ++"checksum quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1" ++"checksum quote 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2bdc6c187c65bca4260c9011c9e3132efe4909da44726bad24cf7572ae338d7f" ++"checksum rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" ++"checksum rand_chacha 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" ++"checksum rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" ++"checksum rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" ++"checksum redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)" = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84" ++"checksum regex 1.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "7f6946991529684867e47d86474e3a6d0c0ab9b82d5821e314b1ede31fa3a4b3" ++"checksum regex-syntax 0.6.17 (registry+https://github.com/rust-lang/crates.io-index)" = "7fe5bd57d1d7414c6b5ed48563a2c855d995ff777729dcd91c369ec7fea395ae" ++"checksum relm 0.18.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d4127341a75eb96dc99ba39b87a2783bb011b20fbdbafc25ed2f58216d2ff714" ++"checksum relm-attributes 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4a8db24611fee7bb021f3aad7c4eaaba6d360947860b78b933a4d3ef86079b7f" ++"checksum relm-derive 0.18.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ec66397054dc1ea6c658159866b9978add6a90655aba5dd4a90c34d2e63f9d69" ++"checksum relm-gen-widget 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)" = "49ad47b054bdc12c90fb6b37c81ef785ee2a4a8a92c4e150b18325052766fbb0" ++"checksum rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783" ++"checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" ++"checksum ryu 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "535622e6be132bccd223f4bb2b8ac8d53cda3c7a6394944d3b2b33fb974f9d76" ++"checksum same-file 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" ++"checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" ++"checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" ++"checksum serde 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)" = "36df6ac6412072f67cf767ebbde4133a5b2e88e76dc6187fa7104cd16f783399" ++"checksum serde_derive 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)" = "9e549e3abf4fb8621bd1609f11dfc9f5e50320802273b12f3811a67e6716ea6c" ++"checksum slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8" ++"checksum static_assertions 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "7f3eb36b47e512f8f1c9e3d10c2c1965bc992bd9cdb024fa581e2194501c83d3" ++"checksum syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)" = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5" ++"checksum syn 1.0.17 (registry+https://github.com/rust-lang/crates.io-index)" = "0df0eb663f387145cab623dea85b09c2c5b4b0aef44e945d928e682fce71bb03" ++"checksum termcolor 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bb6bfa289a4d7c5766392812c0a1f4c1ba45afa1ad47803c11e1f407d846d75f" ++"checksum thread_local 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14" ++"checksum time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f" ++"checksum todo-txt 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0d77aa2f90bd72b990bb2b8de52289b7a34f51cf035627df5e3ce361b321b417" ++"checksum toml 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)" = "ffc92d160b1eef40665be3a05630d003936a3bc7da7421277846c2613e92c71a" ++"checksum unicase 2.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" ++"checksum unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "caaa9d531767d1ff2150b9332433f32a24622147e5ebb1f26409d5da67afd479" ++"checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" ++"checksum unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c" ++"checksum uuid 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9fde2f6a4bea1d6e007c4ad38c6839fa71cbb63b6dbf5b595aa38dc9b1093c11" ++"checksum version_check 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "078775d0255232fb988e6fccf26ddc9d1ac274299aaedcedce21c6f72cc533ce" ++"checksum walkdir 2.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "777182bc735b6424e1a57516d35ed72cb8019d85c8c9bf536dccb3445c1a2f7d" ++"checksum wasi 0.9.0+wasi-snapshot-preview1 (registry+https://github.com/rust-lang/crates.io-index)" = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" ++"checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" ++"checksum winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6" ++"checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" ++"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" ++"checksum winapi-util 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "fa515c5163a99cc82bab70fd3bfdd36d827be85de63737b40fcef2ce084a436e" ++"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" ++"checksum ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e" ++"checksum xdg 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d089681aa106a86fade1b0128fb5daf07d5867a509ab036d99988dec80429a57" diff --git a/pkgs/applications/misc/elfx86exts/default.nix b/pkgs/applications/misc/elfx86exts/default.nix new file mode 100644 index 000000000000..8fc7fb32743d --- /dev/null +++ b/pkgs/applications/misc/elfx86exts/default.nix @@ -0,0 +1,30 @@ +{ lib, stdenv +, rustPlatform +, fetchFromGitHub +}: + +rustPlatform.buildRustPackage rec { + pname = "elfx86exts"; + version = "0.4.3"; + + src = fetchFromGitHub { + owner = "pkgw"; + repo = pname; + rev = "${pname}@${version}"; + sha256 = "1j9ca2lyxjsrf0rsfv83xi53vj6jz5nb76xibh367brcsc26mvd6"; + }; + + cargoSha256 = "1dfhx40jr5llqa554wifd920mqdbm8s5fns98m6vcqdjxzan4nr2"; + + meta = with lib; { + description = "Decode x86 binaries and print out which instruction set extensions they use."; + longDescription = '' + Disassemble a binary containing x86 instructions and print out which extensions it uses. + Despite the utterly misleading name, this tool supports ELF and MachO binaries, and + perhaps PE-format ones as well. (It used to be more limited.) + ''; + homepage = "https://github.com/pkgw/elfx86exts"; + maintainers = with maintainers; [ rmcgibbo ]; + license = with licenses; [ mit ]; + }; +} diff --git a/pkgs/applications/misc/emem/default.nix b/pkgs/applications/misc/emem/default.nix index e0fcc221100e..ab718cdffcf2 100644 --- a/pkgs/applications/misc/emem/default.nix +++ b/pkgs/applications/misc/emem/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jdk }: +{ lib, stdenv, fetchurl, jdk }: stdenv.mkDerivation rec { pname = "emem"; @@ -28,7 +28,7 @@ EOF chmod +x $out/bin/${pname} ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/ebzzry/emem"; description = "A trivial Markdown to HTML converter"; license = licenses.epl10; diff --git a/pkgs/applications/misc/epdfview/default.nix b/pkgs/applications/misc/epdfview/default.nix index 7cbae2271aea..90884af9fdf4 100644 --- a/pkgs/applications/misc/epdfview/default.nix +++ b/pkgs/applications/misc/epdfview/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, gtk2, poppler }: +{ lib, stdenv, fetchurl, fetchpatch, pkgconfig, gtk2, poppler }: stdenv.mkDerivation rec { pname = "epdfview"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { }) ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://packages.debian.org/wheezy/epdfview"; description = "A lightweight PDF document viewer using Poppler and GTK"; longDescription = '' diff --git a/pkgs/applications/misc/et/default.nix b/pkgs/applications/misc/et/default.nix index 9ab3fda96dc2..0de4ad9e21f3 100644 --- a/pkgs/applications/misc/et/default.nix +++ b/pkgs/applications/misc/et/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, libnotify, gdk-pixbuf }: +{ lib, stdenv, fetchFromGitHub, pkgconfig, libnotify, gdk-pixbuf }: stdenv.mkDerivation rec { pname = "et"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { cp et-status.sh $out/bin/et-status ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Minimal libnotify-based (egg) timer"; homepage = "https://github.com/oxzi/et"; license = licenses.gpl3; diff --git a/pkgs/applications/misc/eureka-editor/default.nix b/pkgs/applications/misc/eureka-editor/default.nix index 7cee0487ea82..0b5922f8f699 100644 --- a/pkgs/applications/misc/eureka-editor/default.nix +++ b/pkgs/applications/misc/eureka-editor/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, fltk, zlib, xdg_utils, xorg, libjpeg, libGL }: +{ lib, stdenv, fetchzip, fltk, zlib, xdg_utils, xorg, libjpeg, libGL }: stdenv.mkDerivation rec { pname = "eureka-editor"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { cp misc/eureka.6 $out/man/man6 ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://eureka-editor.sourceforge.net"; description = "A map editor for the classic DOOM games, and a few related games such as Heretic and Hexen"; license = licenses.gpl2; diff --git a/pkgs/applications/misc/evtest/default.nix b/pkgs/applications/misc/evtest/default.nix index d6d20367b060..7ed1afd14f85 100644 --- a/pkgs/applications/misc/evtest/default.nix +++ b/pkgs/applications/misc/evtest/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, autoreconfHook, pkgconfig, libxml2 }: +{ lib, stdenv, fetchgit, autoreconfHook, pkgconfig, libxml2 }: stdenv.mkDerivation rec { pname = "evtest"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "168gdhzj11f4nk94a6z696sm8v1njzwww69bn6wr97l17897913g"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Simple tool for input event debugging"; license = stdenv.lib.licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/applications/misc/exercism/default.nix b/pkgs/applications/misc/exercism/default.nix index 87e59d4292fc..1eeeba1b4391 100644 --- a/pkgs/applications/misc/exercism/default.nix +++ b/pkgs/applications/misc/exercism/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "exercism"; @@ -17,7 +17,7 @@ buildGoModule rec { subPackages = [ "./exercism" ]; - meta = with stdenv.lib; { + meta = with lib; { inherit (src.meta) homepage; description = "A Go based command line tool for exercism.io"; license = licenses.mit; diff --git a/pkgs/applications/misc/expenses/default.nix b/pkgs/applications/misc/expenses/default.nix new file mode 100644 index 000000000000..6b118e541221 --- /dev/null +++ b/pkgs/applications/misc/expenses/default.nix @@ -0,0 +1,34 @@ +{ stdenv +, buildGoModule +, fetchFromGitHub +, sqlite +}: + +buildGoModule rec { + pname = "expenses"; + version = "0.2.1"; + + src = fetchFromGitHub { + owner = "manojkarthick"; + repo = "expenses"; + rev = "v${version}"; + sha256 = "11wxaqbnrrg0rykx5905chi6rhmai1nqggdbhh6hiappr5rksl0j"; + }; + + vendorSha256 = "1kwj63wl4kb16zl3lmi9bzj1az7vi453asdy52na0mjx4ymmjyk1"; + + # package does not contain any tests as of v0.2.1 + doCheck = false; + + buildInputs = [ sqlite ]; + + buildFlagsArray = [ + "-ldflags=-s -w -X github.com/manojkarthick/expenses/cmd.Version=${version}" + ]; + + meta = with stdenv.lib; { + description = "An interactive command line expense logger"; + license = licenses.mit; + maintainers = [ maintainers.manojkarthick ]; + }; +} diff --git a/pkgs/applications/misc/far2l/default.nix b/pkgs/applications/misc/far2l/default.nix index de2ed0d15964..75d0ec3f7965 100644 --- a/pkgs/applications/misc/far2l/default.nix +++ b/pkgs/applications/misc/far2l/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, makeWrapper, cmake, pkgconfig, wxGTK30, glib, pcre, m4, bash, +{ lib, stdenv, fetchFromGitHub, fetchpatch, makeWrapper, cmake, pkgconfig, wxGTK30, glib, pcre, m4, bash, xdg_utils, gvfs, zip, unzip, gzip, bzip2, gnutar, p7zip, xz, imagemagick, darwin }: let @@ -76,9 +76,7 @@ stdenv.mkDerivation rec { stripDebugList = [ "bin" "share" ]; - enableParallelBuilding = true; - - meta = with stdenv.lib; { + meta = with lib; { description = "An orthodox file manager"; homepage = "https://github.com/elfmz/far2l"; license = licenses.gpl2; diff --git a/pkgs/applications/misc/fbmenugen/default.nix b/pkgs/applications/misc/fbmenugen/default.nix index bc40f2dad831..26b8beab19cd 100644 --- a/pkgs/applications/misc/fbmenugen/default.nix +++ b/pkgs/applications/misc/fbmenugen/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , fluxbox , gnused @@ -65,7 +65,7 @@ perlPackages.buildPerlPackage rec { wrapProgram "$out/bin/${pname}" --prefix PERL5LIB : "$PERL5LIB" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/trizen/fbmenugen"; description = "Simple menu generator for the Fluxbox Window Manager"; license = licenses.gpl3; diff --git a/pkgs/applications/misc/fbreader/default.nix b/pkgs/applications/misc/fbreader/default.nix index 187988077435..fff5bf1680d5 100644 --- a/pkgs/applications/misc/fbreader/default.nix +++ b/pkgs/applications/misc/fbreader/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig +{ lib, stdenv, fetchFromGitHub, fetchpatch, pkgconfig , bzip2, curl, expat, fribidi, libunibreak, sqlite, zlib , uiTarget ? if !stdenv.isDarwin then "desktop" else "macosx" , uiType ? if !stdenv.isDarwin then "qt4" else "cocoa" @@ -63,7 +63,7 @@ stdenv.mkDerivation { NIX_CFLAGS_COMPILE = "-Wno-error=narrowing"; - meta = with stdenv.lib; { + meta = with lib; { description = "An e-book reader for Linux"; homepage = "http://www.fbreader.org/"; license = licenses.gpl3; diff --git a/pkgs/applications/misc/fehlstart/default.nix b/pkgs/applications/misc/fehlstart/default.nix index cae637c2c4a4..55d47459aedd 100644 --- a/pkgs/applications/misc/fehlstart/default.nix +++ b/pkgs/applications/misc/fehlstart/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgconfig, gtk2, keybinder, fetchFromGitLab }: +{ lib, stdenv, pkgconfig, gtk2, keybinder, fetchFromGitLab }: stdenv.mkDerivation { name = "fehlstart-9f4342d7"; @@ -18,7 +18,7 @@ stdenv.mkDerivation { export PREFIX=$out ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Small desktop application launcher with reasonable memory footprint"; homepage = "https://gitlab.com/fehlstart/fehlstart"; license = licenses.gpl3; diff --git a/pkgs/applications/misc/fff/default.nix b/pkgs/applications/misc/fff/default.nix index cf307afd1bdd..5b007ccb37fc 100644 --- a/pkgs/applications/misc/fff/default.nix +++ b/pkgs/applications/misc/fff/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, makeWrapper, bashInteractive, xdg_utils, file, coreutils, w3m, xdotool }: +{ lib, stdenv, fetchFromGitHub, makeWrapper, bashInteractive, xdg_utils, file, coreutils, w3m, xdotool }: stdenv.mkDerivation rec { pname = "fff"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { wrapProgram "$out/bin/fff" --prefix PATH : $pathAdd ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Fucking Fast File-Manager"; homepage = "https://github.com/dylanaraps/fff"; license = licenses.mit; diff --git a/pkgs/applications/misc/filet/default.nix b/pkgs/applications/misc/filet/default.nix index ee4b05fa689f..0ee3f6fb221a 100644 --- a/pkgs/applications/misc/filet/default.nix +++ b/pkgs/applications/misc/filet/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "filet"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A fucking fucking fast file fucker (afffff)"; homepage = "https://github.com/buffet/filet"; license = licenses.mpl20; diff --git a/pkgs/applications/misc/firestarter/default.nix b/pkgs/applications/misc/firestarter/default.nix index a03c87eb41b5..3af59d0ddfa5 100644 --- a/pkgs/applications/misc/firestarter/default.nix +++ b/pkgs/applications/misc/firestarter/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, glibc, python3, cudatoolkit, +{ lib, stdenv, fetchFromGitHub, glibc, python3, cudatoolkit, withCuda ? true }: @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { cp FIRESTARTER $out/bin/firestarter ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://tu-dresden.de/zih/forschung/projekte/firestarter"; description = "Processor Stress Test Utility"; platforms = platforms.linux; diff --git a/pkgs/applications/misc/flamerobin/default.nix b/pkgs/applications/misc/flamerobin/default.nix index 2e389c753e2e..8178288ba56e 100644 --- a/pkgs/applications/misc/flamerobin/default.nix +++ b/pkgs/applications/misc/flamerobin/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, wxGTK30, boost, firebird }: +{ lib, stdenv, fetchFromGitHub, wxGTK30, boost, firebird }: stdenv.mkDerivation rec { version = "0.9.3.1"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { "--disable-debug" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Database administration tool for Firebird RDBMS"; homepage = "https://github.com/mariuz/flamerobin"; license = licenses.bsdOriginal; diff --git a/pkgs/applications/misc/fme/default.nix b/pkgs/applications/misc/fme/default.nix index 34d5a45b8ea1..1a4b38a1cad3 100644 --- a/pkgs/applications/misc/fme/default.nix +++ b/pkgs/applications/misc/fme/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, pkgconfig, autoconf, automake, gettext +{ lib, stdenv, fetchurl, pkgconfig, autoconf, automake, gettext , fluxbox, bc, gtkmm2, glibmm, libglademm, libsigcxx }: stdenv.mkDerivation rec { pname = "fme"; version = "1.1.3"; - + src = fetchurl { url = "https://github.com/rdehouss/fme/archive/v${version}.tar.gz"; sha256 = "d1c81a6a38c0faad02943ad65d6d0314bd205c6de841669a2efe43e4c503e63d"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ./autogen.sh ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Editor for Fluxbox menus"; longDescription = '' Fluxbox Menu Editor is a menu editor for the Window Manager Fluxbox written in C++ diff --git a/pkgs/applications/misc/font-manager/default.nix b/pkgs/applications/misc/font-manager/default.nix index defbe7520d7c..8b8fc09f7d35 100644 --- a/pkgs/applications/misc/font-manager/default.nix +++ b/pkgs/applications/misc/font-manager/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, meson, ninja, gettext, python3, +{ lib, stdenv, fetchFromGitHub, meson, ninja, gettext, python3, pkgconfig, libxml2, json-glib , sqlite, itstool, librsvg, yelp-tools, vala, gtk3, gnome3, desktop-file-utils, wrapGAppsHook, gobject-introspection }: @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { patchShebangs meson_post_install.py ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://fontmanager.github.io/"; description = "Simple font management for GTK desktop environments"; longDescription = '' diff --git a/pkgs/applications/misc/fontpreview/default.nix b/pkgs/applications/misc/fontpreview/default.nix index 1d4e4d3e00fe..7fa2e4d89102 100644 --- a/pkgs/applications/misc/fontpreview/default.nix +++ b/pkgs/applications/misc/fontpreview/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { --prefix PATH : ${lib.makeBinPath [ xdotool fzf imagemagick sxiv getopt ]} ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/sdushantha/fontpreview"; description = "Highly customizable and minimal font previewer written in bash"; longDescription = '' diff --git a/pkgs/applications/misc/formatter/default.nix b/pkgs/applications/misc/formatter/default.nix index 85a70812cad1..71479c4ac3e8 100644 --- a/pkgs/applications/misc/formatter/default.nix +++ b/pkgs/applications/misc/formatter/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , nix-update-script , meson @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A simple formatter designed for elementary OS"; homepage = "https://github.com/Djaler/Formatter"; maintainers = with maintainers; [ xiorcale ] ++ pantheon.maintainers; diff --git a/pkgs/applications/misc/foxtrotgps/default.nix b/pkgs/applications/misc/foxtrotgps/default.nix index 9ac701014906..5d0f07492a1b 100644 --- a/pkgs/applications/misc/foxtrotgps/default.nix +++ b/pkgs/applications/misc/foxtrotgps/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchbzr, autoreconfHook, texinfo, help2man, imagemagick, pkg-config +{ lib, stdenv, fetchbzr, autoreconfHook, texinfo, help2man, imagemagick, pkg-config , curl, gnome2, gpsd, gtk2, wrapGAppsHook , intltool, libexif, python3Packages, sqlite }: @@ -49,7 +49,7 @@ in stdenv.mkDerivation rec { intltoolize --automake --copy --force ''; - meta = with stdenv.lib; { + meta = with lib; { description = "GPS/GIS application optimized for small screens"; longDescription = '' An easy to use, free & open-source GPS/GIS application that works well on diff --git a/pkgs/applications/misc/freemind/default.nix b/pkgs/applications/misc/freemind/default.nix index 5774320220a1..b87c43226e0a 100644 --- a/pkgs/applications/misc/freemind/default.nix +++ b/pkgs/applications/misc/freemind/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jdk, jre, ant }: +{ lib, stdenv, fetchurl, jdk, jre, ant }: stdenv.mkDerivation rec { pname = "freemind"; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { chmod +x $out/{bin/freemind,nix-support/dist/freemind.sh} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Mind-mapping software"; homepage = "http://freemind.sourceforge.net/wiki/index.php/Main_Page"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/misc/fsv/default.nix b/pkgs/applications/misc/fsv/default.nix index ff556621f9ae..71e60a11caa2 100644 --- a/pkgs/applications/misc/fsv/default.nix +++ b/pkgs/applications/misc/fsv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub, autoreconfHook +{ lib, stdenv, fetchurl, fetchFromGitHub, autoreconfHook , libtool, pkgconfig, gtk2, libGLU, file }: @@ -34,7 +34,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook libtool pkgconfig ]; buildInputs = [ file gtk2 libGLU gtkglarea ]; - meta = with stdenv.lib; { + meta = with lib; { description = "File system visualizer in cyberspace"; longDescription = '' fsv (pronounced eff-ess-vee) is a file system visualizer in cyberspace. diff --git a/pkgs/applications/misc/fusee-interfacee-tk/default.nix b/pkgs/applications/misc/fusee-interfacee-tk/default.nix index 91a7b0ed37fd..813b8113ee30 100644 --- a/pkgs/applications/misc/fusee-interfacee-tk/default.nix +++ b/pkgs/applications/misc/fusee-interfacee-tk/default.nix @@ -1,40 +1,40 @@ -{ stdenv , fetchFromGitHub , python3 , makeWrapper }: +{ lib, stdenv , fetchFromGitHub , python3 , makeWrapper }: -let pythonEnv = python3.withPackages(ps: [ ps.tkinter ps.pyusb ]); -in stdenv.mkDerivation rec { +let pythonEnv = python3.withPackages(ps: [ ps.tkinter ps.pyusb ]); +in stdenv.mkDerivation rec { pname = "fusee-interfacee-tk"; version = "1.0.1"; - src = fetchFromGitHub { + src = fetchFromGitHub { owner = "nh-server"; repo = pname; - rev = "V${version}"; + rev = "V${version}"; sha256 = "0ngwbwsj999flprv14xvhk7lp51nprrvcnlbnbk6y4qx5casm5md"; }; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ pythonEnv ]; - installPhase = '' + installPhase = '' mkdir -p $out/bin - - # The program isn't just called app, so I'm renaming it based on the repo name + + # The program isn't just called app, so I'm renaming it based on the repo name # It also isn't a standard program, so we need to append the shebang to the top - echo "#!${pythonEnv.interpreter}" > $out/bin/fusee-interfacee-tk + echo "#!${pythonEnv.interpreter}" > $out/bin/fusee-interfacee-tk cat app.py >> $out/bin/fusee-interfacee-tk - chmod +x $out/bin/fusee-interfacee-tk - - # app.py depends on these to run - cp *.py $out/bin/ + chmod +x $out/bin/fusee-interfacee-tk + + # app.py depends on these to run + cp *.py $out/bin/ cp intermezzo.bin $out/bin/intermezzo.bin ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/nh-server/fusee-interfacee-tk"; description = "A tool to send .bin files to a Nintendo Switch in RCM mode"; - longDescription = "A mod of falquinhos Fusée Launcher for use with Nintendo Homebrew Switch Guide. It also adds the ability to mount SD while in RCM. + longDescription = "A mod of falquinhos Fusée Launcher for use with Nintendo Homebrew Switch Guide. It also adds the ability to mount SD while in RCM. Must be run as sudo."; maintainers = with maintainers; [ kristian-brucaj ]; license = licenses.gpl2; }; -} +} diff --git a/pkgs/applications/misc/gImageReader/default.nix b/pkgs/applications/misc/gImageReader/default.nix index 2884fca62398..80ec6f82571a 100644 --- a/pkgs/applications/misc/gImageReader/default.nix +++ b/pkgs/applications/misc/gImageReader/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, libuuid +{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, libuuid , sane-backends, podofo, libjpeg, djvulibre, libxmlxx3, libzip, tesseract , intltool, poppler, json-glib , ninja @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { # interface type can be where is either gtk, qt5, qt4 cmakeFlags = [ "-DINTERFACE_TYPE=${variant}" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A simple Gtk/Qt front-end to tesseract-ocr"; homepage = "https://github.com/manisandro/gImageReader"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/misc/galculator/default.nix b/pkgs/applications/misc/galculator/default.nix index 1964ba6aaf73..6d7989412d44 100644 --- a/pkgs/applications/misc/galculator/default.nix +++ b/pkgs/applications/misc/galculator/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , autoreconfHook, intltool , gtk, pkgconfig, flex }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook intltool pkgconfig ]; buildInputs = [ gtk flex ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A GTK 2/3 algebraic and RPN calculator"; longDescription = '' galculator is a GTK 2 / GTK 3 based calculator. Its main features include: diff --git a/pkgs/applications/misc/gammu/default.nix b/pkgs/applications/misc/gammu/default.nix index ff3408eb8dd2..6f1b824925ff 100644 --- a/pkgs/applications/misc/gammu/default.nix +++ b/pkgs/applications/misc/gammu/default.nix @@ -25,8 +25,6 @@ stdenv.mkDerivation rec { ++ optionals dbiSupport [ libdbi libdbiDrivers ] ++ optionals postgresSupport [ postgresql ]; - enableParallelBuilding = true; - meta = { homepage = "https://wammu.eu/gammu/"; description = "Command line utility and library to control mobile phones"; diff --git a/pkgs/applications/misc/ganttproject-bin/default.nix b/pkgs/applications/misc/ganttproject-bin/default.nix index b36bd83e70f6..2b4504a1dce2 100644 --- a/pkgs/applications/misc/ganttproject-bin/default.nix +++ b/pkgs/applications/misc/ganttproject-bin/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, makeDesktopItem, makeWrapper +{ lib, stdenv, fetchzip, makeDesktopItem, makeWrapper , jre }: @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { cp -rv "${desktopItem}/share/applications" "$out/share" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Project scheduling and management"; homepage = "https://www.ganttproject.biz/"; downloadPage = "https://www.ganttproject.biz/download"; diff --git a/pkgs/applications/misc/gcstar/default.nix b/pkgs/applications/misc/gcstar/default.nix index b1ab386083ea..f482b8af2898 100644 --- a/pkgs/applications/misc/gcstar/default.nix +++ b/pkgs/applications/misc/gcstar/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitLab , perlPackages , wrapGAppsHook @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/gcstar --prefix PERL5LIB : $PERL5LIB ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://gitlab.com/Kerenoc/GCstar"; description = "Manage your collections of movies, games, books, music and more"; longDescription = '' diff --git a/pkgs/applications/misc/geoipupdate/default.nix b/pkgs/applications/misc/geoipupdate/default.nix index 707a7adb8a18..1e0aba0400f0 100644 --- a/pkgs/applications/misc/geoipupdate/default.nix +++ b/pkgs/applications/misc/geoipupdate/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "geoipupdate"; @@ -15,7 +15,7 @@ buildGoModule rec { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Automatic GeoIP database updater"; homepage = "https://github.com/maxmind/geoipupdate"; license = with licenses; [ asl20 ]; diff --git a/pkgs/applications/misc/getxbook/default.nix b/pkgs/applications/misc/getxbook/default.nix index 8ac0b000c46d..a69f8d7f0574 100644 --- a/pkgs/applications/misc/getxbook/default.nix +++ b/pkgs/applications/misc/getxbook/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl }: +{ lib, stdenv, fetchurl, openssl }: stdenv.mkDerivation rec { pname = "getxbook"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A collection of tools to download books from Google Books"; homepage = "https://njw.me.uk/getxbook/"; license = licenses.isc; diff --git a/pkgs/applications/misc/girara/default.nix b/pkgs/applications/misc/girara/default.nix index 35e9d16f9df0..4c61a4dad511 100644 --- a/pkgs/applications/misc/girara/default.nix +++ b/pkgs/applications/misc/girara/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig, check, dbus, xvfb_run, glib, gtk, gettext, libiconv, json_c, libintl +{ lib, stdenv, fetchurl, meson, ninja, pkgconfig, check, dbus, xvfb_run, glib, gtk, gettext, libiconv, json_c, libintl }: stdenv.mkDerivation rec { @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meson test --print-errorlogs ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://git.pwmt.org/pwmt/girara"; description = "User interface library"; longDescription = '' diff --git a/pkgs/applications/misc/glava/default.nix b/pkgs/applications/misc/glava/default.nix index 88991bb40a19..daa74c3a4147 100644 --- a/pkgs/applications/misc/glava/default.nix +++ b/pkgs/applications/misc/glava/default.nix @@ -1,4 +1,4 @@ -{ stdenv, writeScript, fetchFromGitHub +{ lib, stdenv, writeScript, fetchFromGitHub , libGL, libX11, libXext, python3, libXrandr, libXrender, libpulseaudio, libXcomposite , enableGlfw ? false, glfw, runtimeShell }: @@ -78,7 +78,7 @@ in chmod +x $out/bin/glava ''; - meta = with stdenv.lib; { + meta = with lib; { description = '' OpenGL audio spectrum visualizer ''; diff --git a/pkgs/applications/misc/glom/default.nix b/pkgs/applications/misc/glom/default.nix index 9af6e39cb9bb..0c2bb9304b14 100644 --- a/pkgs/applications/misc/glom/default.nix +++ b/pkgs/applications/misc/glom/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , pkgconfig , autoconf @@ -121,7 +121,7 @@ in stdenv.mkDerivation rec { ) ''; - meta = with stdenv.lib; { + meta = with lib; { description = "An easy-to-use database designer and user interface"; homepage = "http://www.glom.org/"; license = [ licenses.lgpl2 licenses.gpl2 ]; diff --git a/pkgs/applications/misc/gmrun/default.nix b/pkgs/applications/misc/gmrun/default.nix index 8ca4c6061629..b3ef510739bd 100644 --- a/pkgs/applications/misc/gmrun/default.nix +++ b/pkgs/applications/misc/gmrun/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, glib, gtk2, pkgconfig, popt }: +{ lib, stdenv, fetchurl, glib, gtk2, pkgconfig, popt }: let version = "0.9.2"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ./gmrun-0.9.2-xdg.patch ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Gnome Completion-Run Utility"; longDescription = '' A simple program which provides a "run program" window, featuring a bash-like TAB completion. diff --git a/pkgs/applications/misc/gnome-firmware-updater/default.nix b/pkgs/applications/misc/gnome-firmware-updater/default.nix index f007f0ae52e1..88be6b22f280 100644 --- a/pkgs/applications/misc/gnome-firmware-updater/default.nix +++ b/pkgs/applications/misc/gnome-firmware-updater/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitLab , fetchpatch , appstream-glib @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { "-Dconsolekit=false" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://gitlab.gnome.org/hughsie/gnome-firmware-updater"; description = "Tool for installing firmware on devices"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/misc/gnome-multi-writer/default.nix b/pkgs/applications/misc/gnome-multi-writer/default.nix index 06bc0024995d..628f93f5bbc6 100644 --- a/pkgs/applications/misc/gnome-multi-writer/default.nix +++ b/pkgs/applications/misc/gnome-multi-writer/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , appstream-glib , desktop-file-utils @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Tool for writing an ISO file to multiple USB devices at once"; homepage = "https://wiki.gnome.org/Apps/MultiWriter"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/misc/gnome-passwordsafe/default.nix b/pkgs/applications/misc/gnome-passwordsafe/default.nix index dc84b312626e..c6617cc2324c 100644 --- a/pkgs/applications/misc/gnome-passwordsafe/default.nix +++ b/pkgs/applications/misc/gnome-passwordsafe/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , meson , ninja , pkg-config @@ -68,7 +68,7 @@ python3.pkgs.buildPythonApplication rec { libpwquality # using the python bindings ]; - meta = with stdenv.lib; { + meta = with lib; { broken = stdenv.hostPlatform.isStatic; # libpwquality doesn't provide bindings when static description = "Password manager for GNOME which makes use of the KeePass v.4 format"; homepage = "https://gitlab.gnome.org/World/PasswordSafe"; diff --git a/pkgs/applications/misc/gnome-recipes/default.nix b/pkgs/applications/misc/gnome-recipes/default.nix index cb9d10377cb8..3e21e2cadb9f 100644 --- a/pkgs/applications/misc/gnome-recipes/default.nix +++ b/pkgs/applications/misc/gnome-recipes/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , meson , ninja @@ -69,7 +69,7 @@ in stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Recipe management application for GNOME"; homepage = "https://wiki.gnome.org/Apps/Recipes"; maintainers = teams.gnome.members; diff --git a/pkgs/applications/misc/gnome-usage/default.nix b/pkgs/applications/misc/gnome-usage/default.nix index 44d4727edba0..ad956e9d02a7 100644 --- a/pkgs/applications/misc/gnome-usage/default.nix +++ b/pkgs/applications/misc/gnome-usage/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , meson , ninja @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A nice way to view information about use of system resources, like memory and disk space"; license = licenses.gpl3; platforms = platforms.linux; diff --git a/pkgs/applications/misc/go-jira/default.nix b/pkgs/applications/misc/go-jira/default.nix index 001f3d1de4c2..c2871766debb 100644 --- a/pkgs/applications/misc/go-jira/default.nix +++ b/pkgs/applications/misc/go-jira/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "go-jira"; @@ -15,7 +15,7 @@ buildGoModule rec { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Simple command line client for Atlassian's Jira service written in Go"; homepage = "https://github.com/go-jira/jira"; license = licenses.asl20; diff --git a/pkgs/applications/misc/golden-cheetah/default.nix b/pkgs/applications/misc/golden-cheetah/default.nix index 362ba4a3a121..57e2d95f0430 100644 --- a/pkgs/applications/misc/golden-cheetah/default.nix +++ b/pkgs/applications/misc/golden-cheetah/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, mkDerivation +{ lib, stdenv, fetchFromGitHub, fetchpatch, mkDerivation , qtbase, qtsvg, qtserialport, qtwebengine, qtmultimedia, qttools , qtconnectivity, qtcharts, libusb-compat-0_1 , yacc, flex, zlib, qmake, makeDesktopItem, makeWrapper @@ -69,7 +69,7 @@ in mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Performance software for cyclists, runners and triathletes"; platforms = platforms.linux; maintainers = [ ]; diff --git a/pkgs/applications/misc/goldendict/default.nix b/pkgs/applications/misc/goldendict/default.nix index 65848fac95ec..0fb4b3f2b974 100644 --- a/pkgs/applications/misc/goldendict/default.nix +++ b/pkgs/applications/misc/goldendict/default.nix @@ -1,4 +1,4 @@ -{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig +{ lib, stdenv, mkDerivation, fetchFromGitHub, pkgconfig , libXtst, libvorbis, hunspell, lzo, xz, bzip2, libiconv , qtbase, qtsvg, qtwebkit, qtx11extras, qttools, qmake , withCC ? true, opencc @@ -59,7 +59,7 @@ mkDerivation rec { wrapQtApp $out/Applications/GoldenDict.app/Contents/MacOS/GoldenDict ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://goldendict.org/"; description = "A feature-rich dictionary lookup program"; platforms = with platforms; linux ++ darwin; diff --git a/pkgs/applications/misc/gollum/default.nix b/pkgs/applications/misc/gollum/default.nix index 9005f38f563b..e1698f06015d 100644 --- a/pkgs/applications/misc/gollum/default.nix +++ b/pkgs/applications/misc/gollum/default.nix @@ -1,4 +1,4 @@ -{ stdenv, bundlerEnv, ruby, makeWrapper, bundlerUpdateScript +{ lib, stdenv, bundlerEnv, ruby, makeWrapper, bundlerUpdateScript , git }: stdenv.mkDerivation rec { @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { passthru.updateScript = bundlerUpdateScript "gollum"; - meta = with stdenv.lib; { + meta = with lib; { description = "A simple, Git-powered wiki with a sweet API and local frontend"; homepage = "https://github.com/gollum/gollum"; changelog = "https://github.com/gollum/gollum/blob/v${version}/HISTORY.md"; diff --git a/pkgs/applications/misc/googleearth/default.nix b/pkgs/applications/misc/googleearth/default.nix index db3881063454..641e0896f4ee 100644 --- a/pkgs/applications/misc/googleearth/default.nix +++ b/pkgs/applications/misc/googleearth/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, glibc, libGLU, libGL, freetype, glib, libSM, libICE, libXi, libXv +{ lib, stdenv, fetchurl, glibc, libGLU, libGL, freetype, glib, libSM, libICE, libXi, libXv , libXrender, libXrandr, libXfixes, libXcursor, libXinerama, libXext, libX11 , zlib, fontconfig, dpkg, libproxy, libxml2, gst_all_1, dbus }: @@ -96,7 +96,7 @@ stdenv.mkDerivation rec { dontPatchELF = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A world sphere viewer"; homepage = "http://earth.google.com"; license = licenses.unfree; diff --git a/pkgs/applications/misc/googler/default.nix b/pkgs/applications/misc/googler/default.nix index 7a096b52314a..f7a29c257f42 100644 --- a/pkgs/applications/misc/googler/default.nix +++ b/pkgs/applications/misc/googler/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python, installShellFiles }: +{ lib, stdenv, fetchFromGitHub, python, installShellFiles }: stdenv.mkDerivation rec { pname = "googler"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { installShellCompletion --zsh auto-completion/zsh/_googler ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/jarun/googler"; description = "Google Search, Google Site Search, Google News from the terminal"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/misc/gosmore/default.nix b/pkgs/applications/misc/gosmore/default.nix index 4da6c6d07cc4..4d55129193ff 100644 --- a/pkgs/applications/misc/gosmore/default.nix +++ b/pkgs/applications/misc/gosmore/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchsvn, libxml2, gtk2, curl, pkgconfig } : +{ lib, stdenv, fetchsvn, libxml2, gtk2, curl, pkgconfig } : let version = "31801"; @@ -26,7 +26,7 @@ stdenv.mkDerivation { patches = [ ./pointer_int_comparison.patch ]; patchFlags = [ "-p1" "--binary" ]; # patch has dos style eol - meta = with stdenv.lib; { + meta = with lib; { description = "Open Street Map viewer"; homepage = "https://sourceforge.net/projects/gosmore/"; maintainers = with maintainers; [ diff --git a/pkgs/applications/misc/gpa/default.nix b/pkgs/applications/misc/gpa/default.nix index cd7b724a1d78..6bda23aebe07 100644 --- a/pkgs/applications/misc/gpa/default.nix +++ b/pkgs/applications/misc/gpa/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, intltool, pkgconfig, gtk2, gpgme, libgpgerror, libassuan }: +{ lib, stdenv, fetchurl, intltool, pkgconfig, gtk2, gpgme, libgpgerror, libassuan }: stdenv.mkDerivation rec { name = "gpa-0.10.0"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ intltool pkgconfig ]; buildInputs = [ gtk2 gpgme libgpgerror libassuan ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Graphical user interface for the GnuPG"; homepage = "https://www.gnupg.org/related_software/gpa/"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/misc/gphoto2/default.nix b/pkgs/applications/misc/gphoto2/default.nix index 7bda292a4cba..409aaded4b6f 100644 --- a/pkgs/applications/misc/gphoto2/default.nix +++ b/pkgs/applications/misc/gphoto2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig , gettext , libexif , libgphoto2 @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { readline ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A ready to use set of digital camera software applications"; longDescription = '' diff --git a/pkgs/applications/misc/gphoto2/gphotofs.nix b/pkgs/applications/misc/gphoto2/gphotofs.nix index 668706ca3895..c5511847ba02 100644 --- a/pkgs/applications/misc/gphoto2/gphotofs.nix +++ b/pkgs/applications/misc/gphoto2/gphotofs.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libtool, pkgconfig, libgphoto2, fuse, glib }: +{ lib, stdenv, fetchurl, libtool, pkgconfig, libgphoto2, fuse, glib }: stdenv.mkDerivation rec { pname = "gphoto2fs"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { libgphoto2 fuse glib libtool ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Fuse FS to mount a digital camera"; homepage = "http://www.gphoto.org/"; maintainers = [ maintainers.raskin ]; diff --git a/pkgs/applications/misc/gpsbabel/default.nix b/pkgs/applications/misc/gpsbabel/default.nix index 70862bb61e79..39cd4f40b4bd 100644 --- a/pkgs/applications/misc/gpsbabel/default.nix +++ b/pkgs/applications/misc/gpsbabel/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, zlib, which, IOKit, qtbase, libusb-compat-0_1 }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, libusb1, qtbase, zlib, IOKit, which, expat }: stdenv.mkDerivation rec { pname = "gpsbabel"; - version = "1.6.0"; + version = "1.7.0"; src = fetchFromGitHub { owner = "gpsbabel"; repo = "gpsbabel"; rev = "gpsbabel_${lib.replaceStrings ["."] ["_"] version}"; - sha256 = "0q17jhmaf7z5lld2ff7h6jb3v1yz8hbwd2rmaq2dsamc53dls8iw"; + sha256 = "010g0vd2f5knpq5p7qfnl31kv3r8m5sjdsafcinbj5gh02j2nzpy"; }; patches = [ @@ -18,9 +18,11 @@ stdenv.mkDerivation rec { }) ]; - buildInputs = [ zlib qtbase which libusb-compat-0_1 ] + buildInputs = [ libusb1 qtbase zlib ] ++ lib.optionals stdenv.isDarwin [ IOKit ]; + checkInputs = [ expat.dev which ]; # Avoid ./testo.d/kml.test: line 74: which: command not found. Skipping KML validation phase. + /* FIXME: Building the documentation, with "make doc", requires this: [ libxml2 libxslt perl docbook_xml_dtd_412 docbook_xsl fop ] @@ -41,6 +43,8 @@ stdenv.mkDerivation rec { patchShebangs testo substituteInPlace testo \ --replace "-x /usr/bin/hexdump" "" + + rm -v testo.d/alantrl.test '' # The raymarine and gtm tests fail on i686 despite -ffloat-store. + lib.optionalString stdenv.isi686 "rm -v testo.d/raymarine.test testo.d/gtm.test;" @@ -49,7 +53,7 @@ stdenv.mkDerivation rec { # The arc-project test fails on aarch64. + lib.optionalString stdenv.isAarch64 "rm -v testo.d/arc-project.test"; - meta = with stdenv.lib; { + meta = with lib; { description = "Convert, upload and download data from GPS and Map programs"; longDescription = '' GPSBabel converts waypoints, tracks, and routes between popular diff --git a/pkgs/applications/misc/gpsbabel/gui.nix b/pkgs/applications/misc/gpsbabel/gui.nix index 57eca9f47a58..b115329cf0d6 100644 --- a/pkgs/applications/misc/gpsbabel/gui.nix +++ b/pkgs/applications/misc/gpsbabel/gui.nix @@ -1,4 +1,4 @@ -{ stdenv, mkDerivation, qmake, qttools, qtwebkit, qttranslations, gpsbabel }: +{ lib, stdenv, mkDerivation, qmake, qttools, qtwebkit, qttranslations, gpsbabel }: mkDerivation { pname = "gpsbabel-gui"; @@ -39,7 +39,7 @@ mkDerivation { install -Dm644 *.qm coretool/*.qm -t $out/share/gpsbabel/translations ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Qt-based GUI for gpsbabel"; homepage = "http://www.gpsbabel.org/"; license = licenses.gpl2; diff --git a/pkgs/applications/misc/gpscorrelate/default.nix b/pkgs/applications/misc/gpscorrelate/default.nix index 42f522175b04..5d8296d337fa 100644 --- a/pkgs/applications/misc/gpscorrelate/default.nix +++ b/pkgs/applications/misc/gpscorrelate/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, stdenv, fetchpatch, pkgconfig, exiv2, libxml2, gtk3 +{ fetchFromGitHub, lib, stdenv, fetchpatch, pkgconfig, exiv2, libxml2, gtk3 , libxslt, docbook_xsl, docbook_xml_dtd_42, desktop-file-utils, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { installTargets = [ "install" "install-po" "install-desktop-file" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A GPS photo correlation tool, to add EXIF geotags"; longDescription = '' diff --git a/pkgs/applications/misc/gpsprune/default.nix b/pkgs/applications/misc/gpsprune/default.nix index 828b3ca9bf0b..2348384abd0f 100644 --- a/pkgs/applications/misc/gpsprune/default.nix +++ b/pkgs/applications/misc/gpsprune/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, makeDesktopItem, makeWrapper, unzip, jdk }: +{ fetchurl, lib, stdenv, makeDesktopItem, makeWrapper, unzip, jdk }: stdenv.mkDerivation rec { pname = "gpsprune"; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ${unzip}/bin/unzip -p $src tim/prune/gui/images/window_icon_64.png > $out/share/pixmaps/gpsprune.png ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Application for viewing, editing and converting GPS coordinate data"; homepage = "https://activityworkshop.net/software/gpsprune/"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/misc/gpx-viewer/default.nix b/pkgs/applications/misc/gpx-viewer/default.nix index 64296688c93e..2c14691869fc 100644 --- a/pkgs/applications/misc/gpx-viewer/default.nix +++ b/pkgs/applications/misc/gpx-viewer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, intltool, libxml2, pkgconfig, gnome3, libchamplain, gdl, shared-mime-info, desktop-file-utils, wrapGAppsHook }: +{ lib, stdenv, fetchurl, intltool, libxml2, pkgconfig, gnome3, libchamplain, gdl, shared-mime-info, desktop-file-utils, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "gpx-viewer"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ gdl libchamplain gnome3.adwaita-icon-theme libxml2 ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://blog.sarine.nl/tag/gpxviewer/"; description = "Simple tool to visualize tracks and waypoints stored in a gpx file"; platforms = with platforms; linux; diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix index 5374a18b154a..adafe8801f39 100644 --- a/pkgs/applications/misc/gpxsee/default.nix +++ b/pkgs/applications/misc/gpxsee/default.nix @@ -1,4 +1,4 @@ -{ stdenv, mkDerivation, fetchFromGitHub, qmake, qttools, qttranslations, substituteAll }: +{ lib, stdenv, mkDerivation, fetchFromGitHub, qmake, qttools, qttranslations, substituteAll }: mkDerivation rec { pname = "gpxsee"; @@ -29,7 +29,7 @@ mkDerivation rec { wrapQtApp $out/Applications/GPXSee.app/Contents/MacOS/GPXSee ''; - meta = with stdenv.lib; { + meta = with lib; { description = "GPS log file viewer and analyzer"; longDescription = '' GPXSee is a Qt-based GPS log file viewer and analyzer that supports diff --git a/pkgs/applications/misc/gramps/default.nix b/pkgs/applications/misc/gramps/default.nix index 1ef00efaf7b4..7b2c5a23f8b0 100644 --- a/pkgs/applications/misc/gramps/default.nix +++ b/pkgs/applications/misc/gramps/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gtk3, pythonPackages, intltool, gexiv2, +{ lib, stdenv, fetchFromGitHub, gtk3, pythonPackages, intltool, gexiv2, pango, gobject-introspection, wrapGAppsHook, gettext, # Optional packages: enableOSM ? true, osm-gps-map, @@ -12,8 +12,8 @@ in buildPythonApplication rec { version = "5.1.3"; pname = "gramps"; - nativeBuildInputs = [ wrapGAppsHook gettext ]; - buildInputs = [ intltool gtk3 gobject-introspection pango gexiv2 ] + nativeBuildInputs = [ wrapGAppsHook intltool gettext ]; + buildInputs = [ gtk3 gobject-introspection pango gexiv2 ] # Map support ++ stdenv.lib.optional enableOSM osm-gps-map # Graphviz support @@ -55,7 +55,7 @@ in buildPythonApplication rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Genealogy software"; homepage = "https://gramps-project.org"; license = licenses.gpl2; diff --git a/pkgs/applications/misc/green-pdfviewer/default.nix b/pkgs/applications/misc/green-pdfviewer/default.nix index 4e888f4faac8..876ab5625989 100644 --- a/pkgs/applications/misc/green-pdfviewer/default.nix +++ b/pkgs/applications/misc/green-pdfviewer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, poppler, pkgconfig, gdk-pixbuf, SDL, gtk2 }: +{ lib, stdenv, fetchFromGitHub, poppler, pkgconfig, gdk-pixbuf, SDL, gtk2 }: stdenv.mkDerivation { pname = "green-pdfviewer"; @@ -27,7 +27,7 @@ stdenv.mkDerivation { make install PREFIX=$out MANDIR=$out/share ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/schandinat/green/"; description = "Viewer for PDF files, uses SDL and libpoppler"; diff --git a/pkgs/applications/misc/gremlin-console/default.nix b/pkgs/applications/misc/gremlin-console/default.nix index 74485e2004aa..6c3ba132d0b2 100644 --- a/pkgs/applications/misc/gremlin-console/default.nix +++ b/pkgs/applications/misc/gremlin-console/default.nix @@ -1,4 +1,4 @@ -{ fetchzip, stdenv, makeWrapper, openjdk }: +{ fetchzip, lib, stdenv, makeWrapper, openjdk }: stdenv.mkDerivation rec { pname = "gremlin-console"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { --set CLASSPATH "$out/opt/lib/" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://tinkerpop.apache.org/"; description = "Console of the Apache TinkerPop graph computing framework"; license = licenses.asl20; diff --git a/pkgs/applications/misc/grsync/default.nix b/pkgs/applications/misc/grsync/default.nix index e1c9902c6ae7..f4d1b0852591 100644 --- a/pkgs/applications/misc/grsync/default.nix +++ b/pkgs/applications/misc/grsync/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, dee, gtk2, intltool, libdbusmenu-gtk2, libunity, pkg-config, rsync }: +{ lib, stdenv, fetchurl, dee, gtk2, intltool, libdbusmenu-gtk2, libunity, pkg-config, rsync }: stdenv.mkDerivation rec { version = "1.2.8"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { rsync ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Synchronize folders, files and make backups"; homepage = "http://www.opbyte.it/grsync/"; license = licenses.gpl1; diff --git a/pkgs/applications/misc/gsctl/default.nix b/pkgs/applications/misc/gsctl/default.nix index e80f43f5bd9b..101baa093966 100644 --- a/pkgs/applications/misc/gsctl/default.nix +++ b/pkgs/applications/misc/gsctl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "gsctl"; @@ -13,7 +13,7 @@ buildGoPackage rec { sha256 = "0s5bli08wfd9xszx3kc90k51vlgjc00r0qg4mikb6qdc4pxpgsxj"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "The Giant Swarm command line interface"; homepage = "https://github.com/giantswarm/gsctl"; license = licenses.asl20; diff --git a/pkgs/applications/misc/gtk2fontsel/default.nix b/pkgs/applications/misc/gtk2fontsel/default.nix index 21ad7d757a19..828cd952bbce 100644 --- a/pkgs/applications/misc/gtk2fontsel/default.nix +++ b/pkgs/applications/misc/gtk2fontsel/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, gtk2 }: +{lib, stdenv, fetchurl, pkgconfig, gtk2 }: stdenv.mkDerivation rec { version = "0.1"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { preferLocalBuild = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A font selection program for X11 using the GTK 2 toolkit"; longDescription = '' Font selection tool similar to xfontsel implemented using GTK 2. diff --git a/pkgs/applications/misc/gxneur/default.nix b/pkgs/applications/misc/gxneur/default.nix index adabe22c6b64..2e2e9f0850e0 100644 --- a/pkgs/applications/misc/gxneur/default.nix +++ b/pkgs/applications/misc/gxneur/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk2, xorg, glib, xneur, libglade, GConf, libappindicator-gtk2, pcre }: +{ lib, stdenv, fetchurl, pkgconfig, intltool, gtk2, xorg, glib, xneur, libglade, GConf, libappindicator-gtk2, pcre }: stdenv.mkDerivation { name = "gxneur-0.20.0"; @@ -17,7 +17,7 @@ stdenv.mkDerivation { libglade GConf pcre libappindicator-gtk2 ]; - meta = with stdenv.lib; { + meta = with lib; { description = "GUI for XNEUR keyboard layout switcher"; platforms = platforms.linux; license = with licenses; [ gpl2 gpl3 ]; diff --git a/pkgs/applications/misc/hamster/default.nix b/pkgs/applications/misc/hamster/default.nix index 57b36e00436e..855123ef7931 100644 --- a/pkgs/applications/misc/hamster/default.nix +++ b/pkgs/applications/misc/hamster/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python3Packages, intltool, glib, itstool +{ lib, stdenv, fetchFromGitHub, python3Packages, intltool, glib, itstool , wrapGAppsHook, gobject-introspection, pango, gdk-pixbuf, atk, wafHook }: python3Packages.buildPythonApplication rec { @@ -52,7 +52,7 @@ python3Packages.buildPythonApplication rec { wrapPythonProgramsIn $out/libexec "$out $pythonPath" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Time tracking application"; homepage = "http://projecthamster.org/"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/misc/haxor-news/default.nix b/pkgs/applications/misc/haxor-news/default.nix index 41aa71cb82e2..467cbfad6568 100644 --- a/pkgs/applications/misc/haxor-news/default.nix +++ b/pkgs/applications/misc/haxor-news/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python3, fetchpatch }: +{ lib, stdenv, fetchFromGitHub, python3, fetchpatch }: let @@ -50,7 +50,7 @@ buildPythonApplication rec { ${python.interpreter} -m unittest discover -s tests -v ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/donnemartin/haxor-news"; description = "Browse Hacker News like a haxor"; license = licenses.asl20; diff --git a/pkgs/applications/misc/hello/default.nix b/pkgs/applications/misc/hello/default.nix index 32c8c696730f..a885b1643fe2 100644 --- a/pkgs/applications/misc/hello/default.nix +++ b/pkgs/applications/misc/hello/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "hello"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A program that produces a familiar, friendly greeting"; longDescription = '' GNU Hello is a program that prints "Hello, world!" when you run it. diff --git a/pkgs/applications/misc/herbe/default.nix b/pkgs/applications/misc/herbe/default.nix new file mode 100644 index 000000000000..0d05228b63eb --- /dev/null +++ b/pkgs/applications/misc/herbe/default.nix @@ -0,0 +1,33 @@ +{ stdenv, lib, fetchFromGitHub, libX11, libXft, freetype, patches ? [ ], + extraLibs ? [ ] }: + +stdenv.mkDerivation rec { + pname = "herbe"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "dudik"; + repo = pname; + rev = version; + sha256 = "0358i5jmmlsvy2j85ij7m1k4ar2jr5lsv7y1c58dlf9710h186cv"; + }; + + inherit patches; + + postPatch = '' + sed -i 's_/usr/include/freetype2_${freetype.dev}/include/freetype2_' Makefile + ''; + + buildInputs = [ libX11 libXft freetype ] ++ extraLibs; + + makeFlags = [ "PREFIX=$(out)" ]; + + meta = with lib; { + description = "Daemon-less notifications without D-Bus"; + homepage = "https://github.com/dudik/herbe"; + license = licenses.mit; + # NOTE: Could also work on 'unix'. + platforms = platforms.linux; + maintainers = with maintainers; [ wishfort36 ]; + }; +} diff --git a/pkgs/applications/misc/hivemind/default.nix b/pkgs/applications/misc/hivemind/default.nix index 8a8f80f57977..fc22d3a854a6 100644 --- a/pkgs/applications/misc/hivemind/default.nix +++ b/pkgs/applications/misc/hivemind/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, runtimeShell }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub, runtimeShell }: buildGoPackage rec { pname = "hivemind"; @@ -16,7 +16,7 @@ buildGoPackage rec { sha256 = "0afcnd03wsdphbbpha65rv5pnv0x6ldnnm6rnv1m6xkkywgnzx95"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/DarthSim/"; description = "Process manager for Procfile-based applications"; license = with licenses; [ mit ]; diff --git a/pkgs/applications/misc/hr/default.nix b/pkgs/applications/misc/hr/default.nix index a0555f9032e9..706a8ff74955 100644 --- a/pkgs/applications/misc/hr/default.nix +++ b/pkgs/applications/misc/hr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "hr"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { mkdir -p $out/{bin,share} ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/LuRsT/hr"; description = "A horizontal bar for your terminal"; license = licenses.mit; diff --git a/pkgs/applications/misc/hubstaff/default.nix b/pkgs/applications/misc/hubstaff/default.nix index bbe05e0396bb..4cfb5703883f 100644 --- a/pkgs/applications/misc/hubstaff/default.nix +++ b/pkgs/applications/misc/hubstaff/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, makeWrapper, libX11, zlib, libSM, libICE +{ lib, stdenv, fetchurl, unzip, makeWrapper, libX11, zlib, libSM, libICE , libXext , freetype, libXrender, fontconfig, libXft, libXinerama , libXfixes, libXScrnSaver, libnotify, glib , gtk3, libappindicator-gtk3 , curl }: @@ -56,7 +56,7 @@ stdenv.mkDerivation { ln -s $opt/data/resources $opt/x86_64/resources ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Time tracking software"; homepage = "https://hubstaff.com/"; license = licenses.unfree; diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index 3ded9f013fbc..2d2ccefe934e 100644 --- a/pkgs/applications/misc/hugo/default.nix +++ b/pkgs/applications/misc/hugo/default.nix @@ -1,17 +1,17 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "hugo"; - version = "0.79.0"; + version = "0.80.0"; src = fetchFromGitHub { owner = "gohugoio"; repo = pname; rev = "v${version}"; - sha256 = "0i9c12w0jlfrqb5gygfn20rn41m7qy6ab03n779wbzwfqqz85mj6"; + sha256 = "0xs9y5lj0mya6ag625x8j91mn9l9r13gxaqxyvl1fl40y2yjz1zm"; }; - vendorSha256 = "0jb6aqdv9yx7fxbkgd73rx6kvxagxscrin5b5bal3ig7ys1ghpsp"; + vendorSha256 = "172mcs8p43bsdkd2hxg9qn6018fh8f36kxx0vgnq5q6fqsb6s1f6"; doCheck = false; @@ -21,7 +21,7 @@ buildGoModule rec { subPackages = [ "." ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A fast and modern static website engine"; homepage = "https://gohugo.io"; license = licenses.asl20; diff --git a/pkgs/applications/misc/imag/default.nix b/pkgs/applications/misc/imag/default.nix index f3d4e156d6cd..2f5597158389 100644 --- a/pkgs/applications/misc/imag/default.nix +++ b/pkgs/applications/misc/imag/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , rustPlatform , fetchFromGitHub , llvmPackages @@ -53,7 +53,7 @@ rustPlatform.buildRustPackage rec { installShellCompletion target/imag.{bash,fish} --zsh target/_imag ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Commandline personal information management suite"; homepage = "https://imag-pim.org/"; license = licenses.lgpl21; diff --git a/pkgs/applications/misc/inkcut/avoid-name-clash-between-inkcut-and-extension.patch b/pkgs/applications/misc/inkcut/avoid-name-clash-between-inkcut-and-extension.patch deleted file mode 100644 index 34e4e6f0e7fb..000000000000 --- a/pkgs/applications/misc/inkcut/avoid-name-clash-between-inkcut-and-extension.patch +++ /dev/null @@ -1,85 +0,0 @@ -From ddc1f9e63e7a769c71131b56f6a2a011c649635c Mon Sep 17 00:00:00 2001 -From: Arnout Engelen -Date: Tue, 24 Nov 2020 15:34:40 +0100 -Subject: [PATCH] Avoid name clash between inkscape plugin and inkcut itself - -Ohterwise, with an unfortunate PYTONPATH, inkcut would no longer -start since it'd try to invoke the inkcut.py from the extension -instead of the main application ---- - plugins/inkscape/{inkcut.py => inkcut4inkscape.py} | 2 +- - plugins/inkscape/inkcut_cut.inx | 2 +- - plugins/inkscape/inkcut_cut.py | 2 +- - plugins/inkscape/inkcut_open.inx | 2 +- - plugins/inkscape/inkcut_open.py | 2 +- - 5 files changed, 5 insertions(+), 5 deletions(-) - rename plugins/inkscape/{inkcut.py => inkcut4inkscape.py} (98%) - -diff --git a/plugins/inkscape/inkcut.py b/plugins/inkscape/inkcut4inkscape.py -similarity index 98% -rename from plugins/inkscape/inkcut.py -rename to plugins/inkscape/inkcut4inkscape.py -index 5b90475..7dc8d86 100644 ---- a/plugins/inkscape/inkcut.py -+++ b/plugins/inkscape/inkcut4inkscape.py -@@ -2,7 +2,7 @@ - # -*- coding: utf-8 -*- - """ - Inkcut, Plot HPGL directly from Inkscape. -- inkcut.py -+ inkcut4inkscape.py - - Copyright 2018 The Inkcut Team - -diff --git a/plugins/inkscape/inkcut_cut.inx b/plugins/inkscape/inkcut_cut.inx -index 4b44ae5..3db8721 100644 ---- a/plugins/inkscape/inkcut_cut.inx -+++ b/plugins/inkscape/inkcut_cut.inx -@@ -2,7 +2,7 @@ - <_name>Cut selection... - org.ekips.filter.inkcut.cut - inkcut_cut.py -- inkcut.py -+ inkcut4inkscape.py - inkex.py - - all -diff --git a/plugins/inkscape/inkcut_cut.py b/plugins/inkscape/inkcut_cut.py -index acaf812..777629a 100644 ---- a/plugins/inkscape/inkcut_cut.py -+++ b/plugins/inkscape/inkcut_cut.py -@@ -37,7 +37,7 @@ - else: - inkex.localize() - import subprocess --from inkcut import contains_text, convert_objects_to_paths -+from inkcut4inkscape import contains_text, convert_objects_to_paths - - - -diff --git a/plugins/inkscape/inkcut_open.inx b/plugins/inkscape/inkcut_open.inx -index 45ee585..2dcd38e 100644 ---- a/plugins/inkscape/inkcut_open.inx -+++ b/plugins/inkscape/inkcut_open.inx -@@ -2,7 +2,7 @@ - <_name>Open current document... - org.ekips.filter.inkcut.open - inkcut_open.py -- inkcut.py -+ inkcut4inkscape.py - inkex.py - - all -diff --git a/plugins/inkscape/inkcut_open.py b/plugins/inkscape/inkcut_open.py -index b4652eb..e4c2d62 100644 ---- a/plugins/inkscape/inkcut_open.py -+++ b/plugins/inkscape/inkcut_open.py -@@ -38,7 +38,7 @@ - inkex.localize() - import subprocess - --from inkcut import convert_objects_to_paths -+from inkcut4inkscape import convert_objects_to_paths - - DEBUG = False - try: diff --git a/pkgs/applications/misc/inkcut/default.nix b/pkgs/applications/misc/inkcut/default.nix index 481069feac07..4ca373ee2751 100644 --- a/pkgs/applications/misc/inkcut/default.nix +++ b/pkgs/applications/misc/inkcut/default.nix @@ -8,21 +8,15 @@ with python3Packages; buildPythonApplication rec { pname = "inkcut"; - version = "2.1.2"; + version = "2.1.3"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1zn5i69f3kimcwdd2qkqd3hd1hq76a6i5wxxfb91ih2hj04vdbmx"; + sha256 = "0px0xdv6kyzkkpmvryrdfavv1qy2xrqdxkpmhvx1gj649xcabv32"; }; - patches = [ - # https://github.com/inkcut/inkcut/pull/292 but downloaded - # because of https://github.com/NixOS/nixpkgs/issues/32084 - ./avoid-name-clash-between-inkcut-and-extension.patch - ]; - nativeBuildInputs = [ wrapQtAppsHook ]; propagatedBuildInputs = [ diff --git a/pkgs/applications/misc/ipmicfg/default.nix b/pkgs/applications/misc/ipmicfg/default.nix index f3d8d5cbc205..a2cee088e1df 100644 --- a/pkgs/applications/misc/ipmicfg/default.nix +++ b/pkgs/applications/misc/ipmicfg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip }: +{ lib, stdenv, fetchzip }: stdenv.mkDerivation rec { pname = "ipmicfg"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { dontPatchShebangs = true; # There are no scripts and it complains about null bytes. - meta = with stdenv.lib; { + meta = with lib; { description = "Supermicro IPMI configuration tool"; homepage = "http://www.supermicro.com/products/nfo/ipmi.cfm"; license = licenses.unfree; diff --git a/pkgs/applications/misc/ipmiview/default.nix b/pkgs/applications/misc/ipmiview/default.nix index f0e2b70d939a..415762eb6ffb 100644 --- a/pkgs/applications/misc/ipmiview/default.nix +++ b/pkgs/applications/misc/ipmiview/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , makeDesktopItem , makeWrapper @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { cd $WORK_DIR' ''; - meta = with stdenv.lib; { + meta = with lib; { license = licenses.unfree; maintainers = with maintainers; [ vlaci ]; platforms = [ "x86_64-linux" "i686-linux" ]; diff --git a/pkgs/applications/misc/j4-dmenu-desktop/default.nix b/pkgs/applications/misc/j4-dmenu-desktop/default.nix index 2b1b093fd354..eca79c6521c0 100644 --- a/pkgs/applications/misc/j4-dmenu-desktop/default.nix +++ b/pkgs/applications/misc/j4-dmenu-desktop/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, dmenu }: +{ lib, stdenv, fetchFromGitHub, cmake, dmenu }: stdenv.mkDerivation rec { pname = "j4-dmenu-desktop"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { "-DWITH_GIT_CATCH=OFF" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A wrapper for dmenu that recognize .desktop files"; homepage = "https://github.com/enkore/j4-dmenu-desktop"; license = licenses.gpl3; diff --git a/pkgs/applications/misc/jekyll/full/Gemfile b/pkgs/applications/misc/jekyll/full/Gemfile index 8e7499bad61a..2e72350f7e5e 100644 --- a/pkgs/applications/misc/jekyll/full/Gemfile +++ b/pkgs/applications/misc/jekyll/full/Gemfile @@ -14,6 +14,7 @@ gem "jekyll-coffeescript" gem "jekyll-feed", "~> 0.9" gem "jekyll-gist" gem "jekyll-paginate" +gem "jekyll-polyglot" gem "jekyll-redirect-from" gem "kramdown-syntax-coderay" gem "mime-types", "~> 3.0" diff --git a/pkgs/applications/misc/jekyll/full/Gemfile.lock b/pkgs/applications/misc/jekyll/full/Gemfile.lock index c4e759289d12..969909ca6d0a 100644 --- a/pkgs/applications/misc/jekyll/full/Gemfile.lock +++ b/pkgs/applications/misc/jekyll/full/Gemfile.lock @@ -64,6 +64,8 @@ GEM html-pipeline (~> 2.3) jekyll (>= 3.7, < 5.0) jekyll-paginate (1.1.0) + jekyll-polyglot (1.3.3) + jekyll (>= 3.0) jekyll-redirect-from (0.16.0) jekyll (>= 3.3, < 5.0) jekyll-sass-converter (2.1.0) @@ -140,6 +142,7 @@ DEPENDENCIES jekyll-gist jekyll-mentions jekyll-paginate + jekyll-polyglot jekyll-redirect-from jekyll-seo-tag jekyll-sitemap diff --git a/pkgs/applications/misc/jekyll/full/gemset.nix b/pkgs/applications/misc/jekyll/full/gemset.nix index c21d705fd267..bfbe428c861d 100644 --- a/pkgs/applications/misc/jekyll/full/gemset.nix +++ b/pkgs/applications/misc/jekyll/full/gemset.nix @@ -297,6 +297,17 @@ }; version = "1.1.0"; }; + jekyll-polyglot = { + dependencies = ["jekyll"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "4ad9140733250b65bc1ffab84650c588d036d23129e82f0349d31e56f1fe10a8"; + type = "gem"; + }; + version = "1.3.3"; + }; jekyll-redirect-from = { dependencies = ["jekyll"]; groups = ["default"]; @@ -723,4 +734,4 @@ }; version = "2.4.2"; }; -} \ No newline at end of file +} diff --git a/pkgs/applications/misc/jgmenu/default.nix b/pkgs/applications/misc/jgmenu/default.nix index e6a140ec7f96..62f15818966f 100644 --- a/pkgs/applications/misc/jgmenu/default.nix +++ b/pkgs/applications/misc/jgmenu/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , pkgconfig , python3Packages @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/johanmalm/jgmenu"; description = "Small X11 menu intended to be used with openbox and tint2"; license = licenses.gpl2; diff --git a/pkgs/applications/misc/joplin-desktop/default.nix b/pkgs/applications/misc/joplin-desktop/default.nix index bcd4f686f818..8433cc9c87f6 100644 --- a/pkgs/applications/misc/joplin-desktop/default.nix +++ b/pkgs/applications/misc/joplin-desktop/default.nix @@ -1,8 +1,8 @@ -{ stdenv, appimageTools, fetchurl, gsettings-desktop-schemas, gtk3, undmg }: +{ lib, stdenv, appimageTools, fetchurl, gsettings-desktop-schemas, gtk3, undmg }: let pname = "joplin-desktop"; - version = "1.4.19"; + version = "1.6.7"; name = "${pname}-${version}"; inherit (stdenv.hostPlatform) system; @@ -16,8 +16,8 @@ let src = fetchurl { url = "https://github.com/laurent22/joplin/releases/download/v${version}/Joplin-${version}.${suffix}"; sha256 = { - x86_64-linux = "1xyj30pnlczchbh4awb955sxh51v89d170f4yk0v1jkj7dg2wjgj"; - x86_64-darwin = "166yp2rr87p0lh64ngs498a50ahcann8z5s0g2p0azs6wi54a6kw"; + x86_64-linux = "0g1fac8l0w0b11bs4c9mi2k426hcqa7q4ks48fzxq0yl9ricjlrb"; + x86_64-darwin = "1h5crdjzvjg30hdmh3fkygxi5gy714wpz4gwy5dn8s3xr12mmgka"; }.${system} or throwSystem; }; @@ -25,7 +25,7 @@ let inherit name src; }; - meta = with stdenv.lib; { + meta = with lib; { description = "An open source note taking and to-do application with synchronisation capabilities"; longDescription = '' Joplin is a free, open source note taking and to-do application, which can diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix index eab2519ad08e..056d73ba76fb 100644 --- a/pkgs/applications/misc/josm/default.nix +++ b/pkgs/applications/misc/josm/default.nix @@ -1,20 +1,20 @@ -{ stdenv, fetchurl, fetchsvn, makeWrapper, unzip, jre, libXxf86vm }: +{ lib, stdenv, fetchurl, fetchsvn, makeWrapper, unzip, jre, libXxf86vm }: let pname = "josm"; - version = "17329"; + version = "17428"; srcs = { jar = fetchurl { url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - sha256 = "0hra146akadqz9acj1xa2vzrmipfzf8li7sgsmk169xr991y653k"; + sha256 = "0fhnq0836jp72br808hhw1ki70zc9wqcwfhnizb8pzjvs4wgx36w"; }; macosx = fetchurl { url = "https://josm.openstreetmap.de/download/macosx/josm-macosx-${version}.zip"; - sha256 = "0i09jnfqbcirmic9vayrp78lnyk4mfh7ax3v3cs8kyqhk930pscf"; + sha256 = "126yy6y7mkpqzkrkqkzzn3mwnl1yjkmd5k895k7mmk2inmcsvqgm"; }; pkg = fetchsvn { url = "https://josm.openstreetmap.de/svn/trunk/native/linux/tested"; rev = version; - sha256 = "0ybjca6dhnbwl3xqwrc91c444fzs1zrlnz7qr3l79s1vll9r4qd1"; + sha256 = "198kq490y5wzxz0a5prb9anykq6dzg0imxfkchsas233inbzggql"; }; }; in @@ -40,7 +40,7 @@ stdenv.mkDerivation { --prefix LD_LIBRARY_PATH ":" '${libXxf86vm}/lib' ''; - meta = with stdenv.lib; { + meta = with lib; { description = "An extensible editor for OpenStreetMap"; homepage = "https://josm.openstreetmap.de/"; changelog = "https://josm.openstreetmap.de/wiki/Changelog"; diff --git a/pkgs/applications/misc/jotta-cli/default.nix b/pkgs/applications/misc/jotta-cli/default.nix index 069d98111cc4..ad7ca25324d6 100644 --- a/pkgs/applications/misc/jotta-cli/default.nix +++ b/pkgs/applications/misc/jotta-cli/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip }: +{ lib, stdenv, fetchzip }: let arch = "amd64"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { $out/bin/jotta-cli completion > $out/share/bash-completion/completions/jotta-cli.bash ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Jottacloud CLI"; homepage = "https://www.jottacloud.com/"; downloadPage = "https://repo.jotta.us/archives/linux/"; diff --git a/pkgs/applications/misc/jp2a/default.nix b/pkgs/applications/misc/jp2a/default.nix index d30e5d96df45..a48716a3dd2b 100644 --- a/pkgs/applications/misc/jp2a/default.nix +++ b/pkgs/applications/misc/jp2a/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libjpeg, autoreconfHook }: +{ lib, stdenv, fetchFromGitHub, libjpeg, autoreconfHook }: stdenv.mkDerivation rec { version = "1.0.7"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ libjpeg ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://csl.name/jp2a/"; description = "A small utility that converts JPG images to ASCII"; license = licenses.gpl2; diff --git a/pkgs/applications/misc/jrnl/default.nix b/pkgs/applications/misc/jrnl/default.nix index 992b981c0037..7fc8ef88330f 100644 --- a/pkgs/applications/misc/jrnl/default.nix +++ b/pkgs/applications/misc/jrnl/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , python3 }: @@ -21,7 +21,7 @@ buildPythonApplication rec { # No tests in archive doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://maebert.github.io/jrnl/"; description = "A simple command line journal application that stores your journal in a plain text file"; license = licenses.mit; diff --git a/pkgs/applications/misc/k2pdfopt/default.nix b/pkgs/applications/misc/k2pdfopt/default.nix index be61a76190a2..7c2e2ac07110 100644 --- a/pkgs/applications/misc/k2pdfopt/default.nix +++ b/pkgs/applications/misc/k2pdfopt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, runCommand, fetchzip, fetchurl, fetchpatch, fetchFromGitHub +{ lib, stdenv, runCommand, fetchzip, fetchurl, fetchpatch, fetchFromGitHub , cmake, pkgconfig, zlib, libpng, makeWrapper , enableGSL ? true, gsl , enableGhostScript ? true, ghostscript @@ -161,7 +161,7 @@ in stdenv.mkDerivation rec { wrapProgram $out/bin/k2pdfopt --set-default TESSDATA_PREFIX ${tesseract4}/share/tessdata ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Optimizes PDF/DJVU files for mobile e-readers (e.g. the Kindle) and smartphones"; homepage = "http://www.willus.com/k2pdfopt"; license = licenses.gpl3; diff --git a/pkgs/applications/misc/k4dirstat/default.nix b/pkgs/applications/misc/k4dirstat/default.nix index 2b4ae320e4e0..1d6a6097d27c 100644 --- a/pkgs/applications/misc/k4dirstat/default.nix +++ b/pkgs/applications/misc/k4dirstat/default.nix @@ -6,7 +6,7 @@ , kio , kjobwidgets , kxmlgui -, stdenv +, lib, stdenv }: mkDerivation rec { @@ -23,7 +23,7 @@ mkDerivation rec { nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ kiconthemes kio kjobwidgets kxmlgui ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/jeromerobert/k4dirstat"; description = "A small utility program that sums up disk usage for directory trees"; license = licenses.gpl2; diff --git a/pkgs/applications/misc/kanboard/default.nix b/pkgs/applications/misc/kanboard/default.nix index ebe31b10c60e..722f2364ab3e 100644 --- a/pkgs/applications/misc/kanboard/default.nix +++ b/pkgs/applications/misc/kanboard/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "kanboard"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { cp -rv . $out/share/kanboard ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Kanban project management software"; homepage = "https://kanboard.net"; license = licenses.mit; diff --git a/pkgs/applications/misc/kapow/default.nix b/pkgs/applications/misc/kapow/default.nix index ccdc57dd0e67..49fbed7b1efb 100644 --- a/pkgs/applications/misc/kapow/default.nix +++ b/pkgs/applications/misc/kapow/default.nix @@ -1,4 +1,4 @@ -{ stdenv, qmake, fetchFromGitHub, qtbase, qttools, wrapQtAppsHook }: +{ lib, stdenv, qmake, fetchFromGitHub, qtbase, qttools, wrapQtAppsHook }: stdenv.mkDerivation rec { pname = "kapow"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ qtbase ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Punch clock to track time spent on projects"; homepage = "https://gottcode.org/kapow/"; maintainers = with maintainers; [ orivej ]; diff --git a/pkgs/applications/misc/keepass-plugins/keepassrpc/default.nix b/pkgs/applications/misc/keepass-plugins/keepassrpc/default.nix index b28914a44a81..cbcb88b9d1a8 100644 --- a/pkgs/applications/misc/keepass-plugins/keepassrpc/default.nix +++ b/pkgs/applications/misc/keepass-plugins/keepassrpc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildEnv, fetchurl, mono }: +{ lib, stdenv, buildEnv, fetchurl, mono }: let version = "1.14.0"; @@ -10,7 +10,7 @@ let sha256 = "1c410cc93c0252e7cfdb02507b8172c13e18d12c97f08630b721d897dc9b8b24"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "The KeePassRPC plugin that needs to be installed inside KeePass in order for Kee to be able to connect your browser to your passwords"; homepage = "https://github.com/kee-org/keepassrpc"; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/misc/keepass/extractWinRscIconsToStdFreeDesktopDir.sh b/pkgs/applications/misc/keepass/extractWinRscIconsToStdFreeDesktopDir.sh index 04485b146a04..dec7367379e4 100755 --- a/pkgs/applications/misc/keepass/extractWinRscIconsToStdFreeDesktopDir.sh +++ b/pkgs/applications/misc/keepass/extractWinRscIconsToStdFreeDesktopDir.sh @@ -43,7 +43,7 @@ if [ "ico" = "$rscFileExt" ]; then else wrestool -x --output=$tmp/ico -t14 $rscFile fi - + icotool --icon -x --palette-size=0 -o $tmp/png $tmp/ico/*.ico mkdir -p $out diff --git a/pkgs/applications/misc/keepassx/2.0.nix b/pkgs/applications/misc/keepassx/2.0.nix index fdd11db509fc..52feb338a151 100644 --- a/pkgs/applications/misc/keepassx/2.0.nix +++ b/pkgs/applications/misc/keepassx/2.0.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, libgcrypt, qt4, xorg, ... }: +{ stdenv, fetchurl, cmake, libgcrypt, qt4, xorg }: stdenv.mkDerivation rec { pname = "keepassx2"; @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1ia7cqx9ias38mnffsl7da7g1f66bcbjsi23k49sln0c6spb9zr3"; }; - buildInputs = [ cmake libgcrypt qt4 xorg.libXtst ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ libgcrypt qt4 xorg.libXtst ]; meta = { description = "Qt password manager compatible with its Win32 and Pocket PC versions"; diff --git a/pkgs/applications/misc/keeweb/default.nix b/pkgs/applications/misc/keeweb/default.nix index 8c1c56dacdc3..cf14679cd9bb 100644 --- a/pkgs/applications/misc/keeweb/default.nix +++ b/pkgs/applications/misc/keeweb/default.nix @@ -1,22 +1,24 @@ -{ stdenv, fetchurl, appimageTools, undmg, libsecret }: +{ lib, stdenv, fetchurl, appimageTools, undmg, libsecret }: let inherit (stdenv.hostPlatform) system; throwSystem = throw "Unsupported system: ${system}"; pname = "keeweb"; - version = "1.16.0"; + version = "1.16.5"; name = "${pname}-${version}"; suffix = { x86_64-linux = "linux.AppImage"; - x86_64-darwin = "mac.dmg"; + x86_64-darwin = "mac.x64.dmg"; + aarch64-darwin = "mac.arm64.dmg"; }.${system} or throwSystem; src = fetchurl { url = "https://github.com/keeweb/keeweb/releases/download/v${version}/KeeWeb-${version}.${suffix}"; sha256 = { - x86_64-linux = "1pivic7n5nv00s8bb51i2jz2mxgjn92hkc8n0p8662ai1cdng47g"; - x86_64-darwin = "0q6k0qgkgzid9yjbfsfpp8l9dr0n8xp25a4jf2bxwickm4irs9mz"; + x86_64-linux = "18qcr8zyn20n5zrrha0qwgq2ic10bp189fps87lbnmcjknrkac9g"; + x86_64-darwin = "0crpjkcqgs7q5c814bx2npjh9kpyyb87yagm5wcy9j21kwrbqv6k"; + aarch64-darwin = "1wkf9inrm5qg0c4xrk0s97mx5j21xvlqwwkvydl513gyfzi2g9gp"; }.${system} or throwSystem; }; @@ -24,12 +26,12 @@ let inherit name src; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Free cross-platform password manager compatible with KeePass"; homepage = "https://keeweb.info/"; license = licenses.mit; maintainers = with maintainers; [ sikmir ]; - platforms = [ "x86_64-linux" "x86_64-darwin" ]; + platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ]; }; linux = appimageTools.wrapType2 rec { diff --git a/pkgs/applications/misc/khal/default.nix b/pkgs/applications/misc/khal/default.nix index 3c46043256a2..7bd4a3bbf7f5 100644 --- a/pkgs/applications/misc/khal/default.nix +++ b/pkgs/applications/misc/khal/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgs, python3, fetchpatch, glibcLocales }: +{ lib, stdenv, pkgs, python3, fetchpatch, glibcLocales }: with python3.pkgs; buildPythonApplication rec { pname = "khal"; @@ -62,7 +62,7 @@ with python3.pkgs; buildPythonApplication rec { and not test_birthdays_no_year" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://lostpackets.de/khal/"; description = "CLI calendar application"; license = licenses.mit; diff --git a/pkgs/applications/misc/kiwix/default.nix b/pkgs/applications/misc/kiwix/default.nix index ff6b1e9de2dc..068f7833c863 100644 --- a/pkgs/applications/misc/kiwix/default.nix +++ b/pkgs/applications/misc/kiwix/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, pkgconfig +{ stdenv, fetchurl, makeWrapper, pkg-config , zip, python, zlib, which, icu, libmicrohttpd, lzma, aria2, wget, bc , libuuid, libX11, libXext, libXt, libXrender, glib, dbus, dbus-glib , gtk2, gdk-pixbuf, pango, cairo, freetype, fontconfig, alsaLib, atk, cmake @@ -38,7 +38,7 @@ let sha256 = "0sqk0vdwjq44jxbbkj1cy8qykrmafs1sickzldb2w2nshsnjshhg"; }; - buildInputs = [ cmake ]; + nativeBuildInputs = [ cmake ]; unpackPhase = '' # not a nice src archive: all the files are in the root :( @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { sha256 = "0577phhy2na59cpcqjgldvksp0jwczyg0l6c9ghnr19i375l7yqc"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ zip python zlib xapian which icu libmicrohttpd lzma zimlib ctpp2 aria2 wget bc libuuid makeWrapper pugixml diff --git a/pkgs/applications/misc/kjv/default.nix b/pkgs/applications/misc/kjv/default.nix index 307781931e97..5247207d1493 100644 --- a/pkgs/applications/misc/kjv/default.nix +++ b/pkgs/applications/misc/kjv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch }: +{ lib, stdenv, fetchFromGitHub, fetchpatch }: let @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { "PREFIX=${placeholder "out"}" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "The Bible, King James Version"; homepage = "https://github.com/bontibon/kjv"; license = licenses.publicDomain; diff --git a/pkgs/applications/misc/kondo/default.nix b/pkgs/applications/misc/kondo/default.nix index f47458f0f3ff..545dc85efebf 100644 --- a/pkgs/applications/misc/kondo/default.nix +++ b/pkgs/applications/misc/kondo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, rustPlatform, fetchFromGitHub }: +{ lib, stdenv, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "kondo"; @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1ax81a2828z3yla1psg5xi8ild65m6zcsvx48ncz902mpzqlj92b"; - meta = with stdenv.lib; { + meta = with lib; { description = "Save disk space by cleaning unneeded files from software projects"; homepage = "https://github.com/tbillington/kondo"; license = licenses.mit; diff --git a/pkgs/applications/misc/koreader/default.nix b/pkgs/applications/misc/koreader/default.nix index e870986a50aa..c3d7fbac12fd 100644 --- a/pkgs/applications/misc/koreader/default.nix +++ b/pkgs/applications/misc/koreader/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , makeWrapper , dpkg @@ -41,12 +41,12 @@ in stdenv.mkDerivation rec { } ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/koreader/koreader"; description = "An ebook reader application supporting PDF, DjVu, EPUB, FB2 and many more formats, running on Cervantes, Kindle, Kobo, PocketBook and Android devices"; platforms = intersectLists platforms.x86_64 platforms.linux; - license = licenses.agpl3; + license = licenses.agpl3Only; maintainers = with maintainers; [ contrun neonfuz]; }; } diff --git a/pkgs/applications/misc/kupfer/default.nix b/pkgs/applications/misc/kupfer/default.nix index f2744bf23ea5..ce21ea75b307 100644 --- a/pkgs/applications/misc/kupfer/default.nix +++ b/pkgs/applications/misc/kupfer/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , intltool , python3Packages @@ -44,7 +44,7 @@ buildPythonApplication rec { doCheck = false; # no tests - meta = with stdenv.lib; { + meta = with lib; { description = "A smart, quick launcher"; homepage = "https://kupferlauncher.github.io/"; license = licenses.gpl3; diff --git a/pkgs/applications/misc/lenmus/default.nix b/pkgs/applications/misc/lenmus/default.nix index 532166cf6fb0..a9aef85753ec 100644 --- a/pkgs/applications/misc/lenmus/default.nix +++ b/pkgs/applications/misc/lenmus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgconfig, fetchFromGitHub, fetchpatch +{ lib, stdenv, pkg-config, fetchFromGitHub, fetchpatch , cmake, boost , portmidi, sqlite , freetype, libpng, pngpp, zlib @@ -16,8 +16,6 @@ stdenv.mkDerivation rec { sha256 = "1n639xr1qxx6rhqs0c6sjxp3bv8cwkmw1vfk1cji7514gj2a9v3p"; }; - enableParallelBuilding = true; - patches = [ (fetchpatch { url = "https://github.com/lenmus/lenmus/commit/421760d84694a0e6e72d0e9b1d4fd30a7e129c6f.patch"; @@ -29,15 +27,15 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ - cmake boost + boost portmidi sqlite freetype libpng pngpp zlib wxGTK30 wxsqlite3 ]; - meta = with stdenv.lib; { + meta = with lib; { description = "LenMus Phonascus is a program for learning music"; longDescription = '' LenMus Phonascus is a free open source program (GPL v3) for learning music. diff --git a/pkgs/applications/misc/libosmocore/default.nix b/pkgs/applications/misc/libosmocore/default.nix index 8b36d384e153..27432a4dd75b 100644 --- a/pkgs/applications/misc/libosmocore/default.nix +++ b/pkgs/applications/misc/libosmocore/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig , pcsclite, talloc, python2, gnutls }: @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Set of Osmocom core libraries"; homepage = "https://github.com/osmocom/libosmocore"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/misc/librecad/default.nix b/pkgs/applications/misc/librecad/default.nix index 6f7967dfdfd5..676b7aea1e28 100644 --- a/pkgs/applications/misc/librecad/default.nix +++ b/pkgs/applications/misc/librecad/default.nix @@ -1,4 +1,5 @@ -{ boost +{ lib +, boost , fetchFromGitHub , fetchpatch , installShellFiles @@ -89,7 +90,7 @@ mkDerivationWith stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "2D CAD package based on Qt"; homepage = "https://librecad.org"; license = licenses.gpl2; diff --git a/pkgs/applications/misc/lifelines/default.nix b/pkgs/applications/misc/lifelines/default.nix index 7207dea9d522..50827355cac0 100644 --- a/pkgs/applications/misc/lifelines/default.nix +++ b/pkgs/applications/misc/lifelines/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gettext, libiconv, bison, ncurses, perl, autoreconfHook }: +{ lib, stdenv, fetchFromGitHub, gettext, libiconv, bison, ncurses, perl, autoreconfHook }: stdenv.mkDerivation rec { pname = "lifelines"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ autoreconfHook bison ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Genealogy tool with ncurses interface"; homepage = "https://lifelines.github.io/lifelines/"; license = licenses.mit; diff --git a/pkgs/applications/misc/lighthouse/default.nix b/pkgs/applications/misc/lighthouse/default.nix index 9e651c59d4eb..a54b8a54e8ba 100644 --- a/pkgs/applications/misc/lighthouse/default.nix +++ b/pkgs/applications/misc/lighthouse/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig +{ lib, stdenv, fetchFromGitHub, pkgconfig , libX11, libxcb, cairo, gtk2, pango, python27, python3 }: @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { postFixup = "chmod -x $out/share/lighthouse/.config/lighthouse/google.py"; - meta = with stdenv.lib; { + meta = with lib; { description = "A simple flexible popup dialog to run on X"; homepage = "https://github.com/emgram769/lighthouse"; license = licenses.mit; diff --git a/pkgs/applications/misc/llpp/default.nix b/pkgs/applications/misc/llpp/default.nix index c16322ad84fa..7004d0dce34f 100644 --- a/pkgs/applications/misc/llpp/default.nix +++ b/pkgs/applications/misc/llpp/default.nix @@ -47,11 +47,11 @@ stdenv.mkDerivation rec { --prefix PATH ":" "${procps}/bin" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://repo.or.cz/w/llpp.git"; description = "A MuPDF based PDF pager written in OCaml"; platforms = platforms.linux; - maintainers = with maintainers; [ pSub enzime ]; + maintainers = with maintainers; [ pSub ]; license = licenses.gpl3; }; } diff --git a/pkgs/applications/misc/loxodo/default.nix b/pkgs/applications/misc/loxodo/default.nix index 4b201c66fe5e..e32535d4445e 100644 --- a/pkgs/applications/misc/loxodo/default.nix +++ b/pkgs/applications/misc/loxodo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python27Packages, fetchgit }: +{ lib, stdenv, python27Packages, fetchgit }: let py = python27Packages; python = py.python; @@ -28,7 +28,7 @@ py.buildPythonApplication { EOF ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A Password Safe V3 compatible password vault"; homepage = "https://www.christoph-sommer.de/loxodo/"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/misc/ltwheelconf/default.nix b/pkgs/applications/misc/ltwheelconf/default.nix index 2ceb8e91def8..66d10f5e6b88 100644 --- a/pkgs/applications/misc/ltwheelconf/default.nix +++ b/pkgs/applications/misc/ltwheelconf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, libusb1, pkgconfig, fetchFromGitHub }: +{ lib, stdenv, libusb1, pkgconfig, fetchFromGitHub }: stdenv.mkDerivation { pname = "ltwheelconf"; @@ -19,7 +19,7 @@ stdenv.mkDerivation { cp ltwheelconf $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/thk/LTWheelConf"; description = "Logitech wheels configuration tool"; license = licenses.gpl3; diff --git a/pkgs/applications/misc/madonctl/default.nix b/pkgs/applications/misc/madonctl/default.nix index a61c66d93746..249ed48bd1c4 100644 --- a/pkgs/applications/misc/madonctl/default.nix +++ b/pkgs/applications/misc/madonctl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "madonctl"; @@ -21,7 +21,7 @@ buildGoPackage rec { goDeps = ./deps.nix; - meta = with stdenv.lib; { + meta = with lib; { description = "CLI for the Mastodon social network API"; homepage = "https://github.com/McKael/madonctl"; license = licenses.mit; diff --git a/pkgs/applications/misc/makeself/default.nix b/pkgs/applications/misc/makeself/default.nix index 993596aabe1d..205d526ed941 100644 --- a/pkgs/applications/misc/makeself/default.nix +++ b/pkgs/applications/misc/makeself/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, which }: +{ lib, stdenv, fetchFromGitHub, which }: stdenv.mkDerivation rec { version = "2.4.2"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { sed -e "s|^HEADER=.*|HEADER=$out/share/${pname}-${version}/makeself-header.sh|" -i $out/bin/makeself ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://megastep.org/makeself"; description = "Utility to create self-extracting packages"; license = licenses.gpl2; diff --git a/pkgs/applications/misc/mako/default.nix b/pkgs/applications/misc/mako/default.nix index e1b14acb46f4..3c1babaab370 100644 --- a/pkgs/applications/misc/mako/default.nix +++ b/pkgs/applications/misc/mako/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, scdoc +{ lib, stdenv, fetchFromGitHub, meson, ninja, pkgconfig, scdoc , systemd, pango, cairo, gdk-pixbuf , wayland, wayland-protocols , wrapGAppsHook }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dzsh-completions=true" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A lightweight Wayland notification daemon"; homepage = "https://wayland.emersion.fr/mako/"; license = licenses.mit; diff --git a/pkgs/applications/misc/masterpdfeditor/default.nix b/pkgs/applications/misc/masterpdfeditor/default.nix index d541c5e1289a..a743a9fbc27d 100644 --- a/pkgs/applications/misc/masterpdfeditor/default.nix +++ b/pkgs/applications/misc/masterpdfeditor/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Master PDF Editor"; homepage = "https://code-industry.net/free-pdf-editor/"; license = licenses.unfreeRedistributable; diff --git a/pkgs/applications/misc/masterpdfeditor4/default.nix b/pkgs/applications/misc/masterpdfeditor4/default.nix new file mode 100644 index 000000000000..b0252465bdef --- /dev/null +++ b/pkgs/applications/misc/masterpdfeditor4/default.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchurl, sane-backends, qtbase, qtsvg, autoPatchelfHook, lib, wrapQtAppsHook }: + +stdenv.mkDerivation rec { + pname = "masterpdfeditor4"; + version = "4.3.89"; + + src = fetchurl { + url = "https://code-industry.net/public/master-pdf-editor-${version}_qt5.amd64.tar.gz"; + sha256 = "0k5bzlhqglskiiq86nmy18mnh5bf2w3mr9cq3pibrwn5pisxnxxc"; + }; + + nativeBuildInputs = [ autoPatchelfHook wrapQtAppsHook ]; + + buildInputs = [ qtbase qtsvg sane-backends stdenv.cc.cc ]; + + installPhase = '' + runHook preInstall + + app_dir=$out/opt/masterpdfeditor4 + mkdir -p $out/bin + + substituteInPlace masterpdfeditor4.desktop \ + --replace 'Exec=/opt/master-pdf-editor-4' "Exec=$out/bin" \ + --replace 'Path=/opt/master-pdf-editor-4' "Path=$out/bin" \ + --replace 'Icon=/opt/master-pdf-editor-4' "Icon=$out/share/pixmaps" + + install -Dm644 -t $out/share/pixmaps masterpdfeditor4.png + install -Dm644 -t $out/share/applications masterpdfeditor4.desktop + install -Dm755 -t $app_dir masterpdfeditor4 + install -Dm644 license.txt $out/share/$name/LICENSE + ln -s $app_dir/masterpdfeditor4 $out/bin/masterpdfeditor4 + cp -v -r stamps templates lang fonts $app_dir + + runHook postInstall + ''; + + meta = with stdenv.lib; { + description = "Master PDF Editor - version 4, without watermark"; + homepage = "https://code-industry.net/free-pdf-editor/"; + license = licenses.unfreeRedistributable; + platforms = with platforms; [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/misc/mdp/default.nix b/pkgs/applications/misc/mdp/default.nix index b96c4d00214b..2c13ed4ecc9e 100644 --- a/pkgs/applications/misc/mdp/default.nix +++ b/pkgs/applications/misc/mdp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ncurses }: +{ lib, stdenv, fetchFromGitHub, ncurses }: stdenv.mkDerivation rec { version = "1.0.15"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/visit1985/mdp"; description = "A command-line based markdown presentation tool"; maintainers = with maintainers; [ matthiasbeyer vrthra ]; diff --git a/pkgs/applications/misc/mediaelch/default.nix b/pkgs/applications/misc/mediaelch/default.nix index c4ed0c975eab..d437cfda44fa 100644 --- a/pkgs/applications/misc/mediaelch/default.nix +++ b/pkgs/applications/misc/mediaelch/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , mkDerivation , fetchFromGitHub , qmake @@ -13,13 +13,13 @@ mkDerivation rec { pname = "mediaelch"; - version = "2.8.2"; + version = "2.8.4"; src = fetchFromGitHub { owner = "Komet"; repo = "MediaElch"; rev = "v${version}"; - sha256 = "0y26vfgrdym461lzmm5x3z5ai9ky09vlk3cy4sq6hwlj7mzcz0k7"; + sha256 = "00jwmpdwbn6rgaha0iimcbwg9pwb8ilpjgxhv0p13j2c6dcisjzh"; fetchSubmodules = true; }; @@ -31,7 +31,7 @@ mkDerivation rec { substituteInPlace MediaElch.pro --replace "/usr" "$out" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://mediaelch.de/mediaelch/"; description = "Media Manager for Kodi"; license = licenses.lgpl3Only; diff --git a/pkgs/applications/misc/mediainfo-gui/default.nix b/pkgs/applications/misc/mediainfo-gui/default.nix index b3e23f2245cf..99aada11f048 100644 --- a/pkgs/applications/misc/mediainfo-gui/default.nix +++ b/pkgs/applications/misc/mediainfo-gui/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, libmediainfo, wxGTK30-gtk3 +{ lib, stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, libmediainfo, wxGTK30-gtk3 , desktop-file-utils, libSM, imagemagick }: stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Supplies technical and tag information about a video or audio file (GUI version)"; longDescription = '' MediaInfo is a convenient unified display of the most relevant technical diff --git a/pkgs/applications/misc/mediainfo/default.nix b/pkgs/applications/misc/mediainfo/default.nix index 0fd3826f4e56..bb90d76977b9 100644 --- a/pkgs/applications/misc/mediainfo/default.nix +++ b/pkgs/applications/misc/mediainfo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, libmediainfo, zlib }: +{ lib, stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, libmediainfo, zlib }: stdenv.mkDerivation rec { version = "20.09"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Supplies technical and tag information about a video or audio file"; longDescription = '' MediaInfo is a convenient unified display of the most relevant technical diff --git a/pkgs/applications/misc/megacmd/default.nix b/pkgs/applications/misc/megacmd/default.nix index 899b069f0542..1e7aa1f56db6 100644 --- a/pkgs/applications/misc/megacmd/default.nix +++ b/pkgs/applications/misc/megacmd/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , autoconf , automake , c-ares @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { "--with-termcap" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "MEGA Command Line Interactive and Scriptable Application"; homepage = "https://mega.nz/"; license = licenses.unfree; diff --git a/pkgs/applications/misc/megasync/default.nix b/pkgs/applications/misc/megasync/default.nix index 3b25d7e606a6..b7f8c0a281d4 100644 --- a/pkgs/applications/misc/megasync/default.nix +++ b/pkgs/applications/misc/megasync/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , autoconf , automake , c-ares @@ -109,7 +109,7 @@ mkDerivation rec { popd ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Easy automated syncing between your computers and your MEGA Cloud Drive"; homepage = "https://mega.nz/"; diff --git a/pkgs/applications/misc/mencal/default.nix b/pkgs/applications/misc/mencal/default.nix index df0a4db7fc70..806d6a53cfaa 100644 --- a/pkgs/applications/misc/mencal/default.nix +++ b/pkgs/applications/misc/mencal/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl }: +{ lib, stdenv, fetchurl, perl }: stdenv.mkDerivation rec { name = "mencal-3.0"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ perl ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Menstruation calendar"; longDescription = '' Mencal is a simple variation of the well-known unix command cal. diff --git a/pkgs/applications/misc/menumaker/default.nix b/pkgs/applications/misc/menumaker/default.nix index f76d6cb6b8a8..192228de5d91 100644 --- a/pkgs/applications/misc/menumaker/default.nix +++ b/pkgs/applications/misc/menumaker/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pythonPackages }: +{ lib, stdenv, fetchurl, pythonPackages }: pythonPackages.buildPythonApplication rec { pname = "menumaker"; @@ -11,7 +11,7 @@ pythonPackages.buildPythonApplication rec { format = "other"; - meta = with stdenv.lib; { + meta = with lib; { description = "Heuristics-driven menu generator for several window managers"; homepage = "http://menumaker.sourceforge.net"; license = licenses.bsd2; diff --git a/pkgs/applications/misc/merkaartor/default.nix b/pkgs/applications/misc/merkaartor/default.nix index 79ee45b4c1c4..e73805f67b3a 100644 --- a/pkgs/applications/misc/merkaartor/default.nix +++ b/pkgs/applications/misc/merkaartor/default.nix @@ -1,18 +1,25 @@ -{ stdenv, fetchFromGitHub, makeWrapper, qmake, pkgconfig, boost, gdal, proj -, qtbase, qtsvg, qtwebview, qtwebkit }: +{ mkDerivation, lib, fetchFromGitHub, qmake, pkgconfig, fetchpatch +, boost, gdal, proj, qtbase, qtsvg, qtwebview, qtwebkit }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "merkaartor"; - version = "unstable-2019-11-12"; + version = "0.18.4"; src = fetchFromGitHub { owner = "openstreetmap"; repo = "merkaartor"; - rev = "29b3388680a03f1daac0037a2b504ea710da879a"; - sha256 = "0h3d3srzl06p2ajq911j05zr4vkl88qij18plydx45yqmvyvh0xz"; + rev = version; + sha256 = "vwO4/a7YF9KbpxcFGTFCdG6SfwEyhISlEtcA+rMebUA="; }; - nativeBuildInputs = [ makeWrapper qmake pkgconfig ]; + patches = [ + (fetchpatch { + url = "https://github.com/openstreetmap/merkaartor/commit/e72553a7ea2c7ba0634cc3afcd27a9f7cfef089c.patch"; + sha256 = "NAisplnS3xHSlRpX+fH15NpbaD+uM57OCsTYGKlIR7U="; + }) + ]; + + nativeBuildInputs = [ qmake pkgconfig ]; buildInputs = [ boost gdal proj qtbase qtsvg qtwebview qtwebkit ]; @@ -20,12 +27,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H"; - postInstall = '' - wrapProgram $out/bin/merkaartor \ - --set QT_QPA_PLATFORM_PLUGIN_PATH ${qtbase.bin}/lib/qt-*/plugins/platforms - ''; - - meta = with stdenv.lib; { + meta = with lib; { description = "OpenStreetMap editor"; homepage = "http://merkaartor.be/"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/misc/metamorphose2/default.nix b/pkgs/applications/misc/metamorphose2/default.nix index a81aec9d0364..277d00fe050b 100644 --- a/pkgs/applications/misc/metamorphose2/default.nix +++ b/pkgs/applications/misc/metamorphose2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, makeWrapper, gettext +{ lib, stdenv, fetchgit, makeWrapper, gettext , python27, python2Packages }: @@ -33,7 +33,7 @@ stdenv.mkDerivation { makeFlags = [ "PREFIX=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "a graphical mass renaming program for files and folders"; homepage = "https://github.com/metamorphose/metamorphose2"; license = with licenses; gpl3Plus; diff --git a/pkgs/applications/misc/metar/default.nix b/pkgs/applications/misc/metar/default.nix index f5185c639873..d9e1922f1c48 100644 --- a/pkgs/applications/misc/metar/default.nix +++ b/pkgs/applications/misc/metar/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, curl }: +{ lib, stdenv, fetchgit, curl }: stdenv.mkDerivation { name = "metar-20161013.1"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { buildInputs = [ curl ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/keesL/metar"; license = licenses.gpl2; maintainers = [ maintainers.zalakain ]; diff --git a/pkgs/applications/misc/minder/default.nix b/pkgs/applications/misc/minder/default.nix index bf94ac429947..1c25e5c3320c 100644 --- a/pkgs/applications/misc/minder/default.nix +++ b/pkgs/applications/misc/minder/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , pkgconfig, meson, ninja, python3 , wrapGAppsHook, vala, shared-mime-info , cairo, pantheon, glib, gtk3, libxml2, libgee, libarchive @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Mind-mapping application for Elementary OS"; homepage = "https://github.com/phase1geo/Minder"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/misc/minergate-cli/default.nix b/pkgs/applications/misc/minergate-cli/default.nix index 61b900c40122..59de7ba8a9e5 100644 --- a/pkgs/applications/misc/minergate-cli/default.nix +++ b/pkgs/applications/misc/minergate-cli/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, dpkg, makeWrapper, openssl }: +{ fetchurl, lib, stdenv, dpkg, makeWrapper, openssl }: stdenv.mkDerivation { version = "8.2"; @@ -19,14 +19,14 @@ stdenv.mkDerivation { interpreter=${stdenv.glibc}/lib/ld-linux-x86-64.so.2 patchelf --set-interpreter "$interpreter" $pgm - wrapProgram $pgm --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ openssl stdenv.cc.cc ]} + wrapProgram $pgm --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ openssl stdenv.cc.cc ]} rm $out/usr/bin/minergate-cli mkdir -p $out/bin ln -s $pgm $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Minergate CPU/GPU console client mining software"; homepage = "https://www.minergate.com/"; license = licenses.unfree; diff --git a/pkgs/applications/misc/minergate/default.nix b/pkgs/applications/misc/minergate/default.nix index 6fbe39c4da2d..18af19db5100 100644 --- a/pkgs/applications/misc/minergate/default.nix +++ b/pkgs/applications/misc/minergate/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, dpkg, makeWrapper, fontconfig, freetype, openssl, xorg, xkeyboard_config }: +{ fetchurl, lib, stdenv, dpkg, makeWrapper, fontconfig, freetype, openssl, xorg, xkeyboard_config }: stdenv.mkDerivation { version = "8.1"; @@ -26,7 +26,7 @@ stdenv.mkDerivation { ln -s $out/opt/minergate/minergate $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Minergate CPU/GPU mining software"; homepage = "https://www.minergate.com/"; license = licenses.unfree; diff --git a/pkgs/applications/misc/mkgmap/default.nix b/pkgs/applications/misc/mkgmap/default.nix index 9bd5be9dc801..0ef661333d6d 100644 --- a/pkgs/applications/misc/mkgmap/default.nix +++ b/pkgs/applications/misc/mkgmap/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , fetchsvn , jdk @@ -75,7 +75,7 @@ stdenv.mkDerivation { cp -r dist/examples $out/share/mkgmap/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Create maps for Garmin GPS devices from OpenStreetMap (OSM) data"; homepage = "http://www.mkgmap.org.uk"; license = licenses.gpl2Only; diff --git a/pkgs/applications/misc/mkgmap/splitter/default.nix b/pkgs/applications/misc/mkgmap/splitter/default.nix index df1c526fed61..98f6379700eb 100644 --- a/pkgs/applications/misc/mkgmap/splitter/default.nix +++ b/pkgs/applications/misc/mkgmap/splitter/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , fetchsvn , jdk @@ -68,7 +68,7 @@ stdenv.mkDerivation { --add-flags "-jar $out/share/java/splitter/splitter.jar" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Utility for splitting OpenStreetMap maps into tiles"; homepage = "http://www.mkgmap.org.uk"; license = licenses.gpl2Only; diff --git a/pkgs/applications/misc/moonlight-embedded/default.nix b/pkgs/applications/misc/moonlight-embedded/default.nix index 2ae3f1894d53..06835aad4d19 100644 --- a/pkgs/applications/misc/moonlight-embedded/default.nix +++ b/pkgs/applications/misc/moonlight-embedded/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, perl +{ lib, stdenv, fetchFromGitHub, cmake, perl , alsaLib, libevdev, libopus, udev, SDL2 , ffmpeg_3, pkgconfig, xorg, libvdpau, libpulseaudio, libcec , curl, expat, avahi, enet, libuuid, libva @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { xorg.libpthreadstubs curl expat avahi enet libuuid libva ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Open source implementation of NVIDIA's GameStream"; homepage = "https://github.com/irtimmer/moonlight-embedded"; license = licenses.gpl3; diff --git a/pkgs/applications/misc/mop/default.nix b/pkgs/applications/misc/mop/default.nix index be8176089240..07102fe56f23 100644 --- a/pkgs/applications/misc/mop/default.nix +++ b/pkgs/applications/misc/mop/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchgit }: +{ lib, stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { pname = "mop"; @@ -22,7 +22,7 @@ buildGoPackage rec { sha256 = "0zp51g9i8rw6acs4vnrxclbxa5z1v0a0m1xx27szszp0rphcczkx"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Simple stock tracker implemented in go"; homepage = "https://github.com/mop-tracker/mop"; license = licenses.mit; diff --git a/pkgs/applications/misc/mpvc/default.nix b/pkgs/applications/misc/mpvc/default.nix index eacc4b5758c3..64b55cce7a04 100644 --- a/pkgs/applications/misc/mpvc/default.nix +++ b/pkgs/applications/misc/mpvc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, socat, fetchFromGitHub, makeWrapper }: +{ lib, stdenv, socat, fetchFromGitHub, makeWrapper }: stdenv.mkDerivation { name = "mpvc-unstable-2017-03-18"; @@ -19,7 +19,7 @@ stdenv.mkDerivation { buildInputs = [ socat makeWrapper ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A mpc-like control interface for mpv"; homepage = "https://github.com/wildefyr/mpvc"; license = licenses.mit; diff --git a/pkgs/applications/misc/mqtt-bench/default.nix b/pkgs/applications/misc/mqtt-bench/default.nix index 1f6112d7d7bb..c01a1b9cbc69 100644 --- a/pkgs/applications/misc/mqtt-bench/default.nix +++ b/pkgs/applications/misc/mqtt-bench/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, fetchpatch }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub, fetchpatch }: buildGoPackage rec { pname = "mqtt-bench"; @@ -24,7 +24,7 @@ buildGoPackage rec { goDeps = ./deps.nix; - meta = with stdenv.lib; { + meta = with lib; { description = "Mosquitto benchmark tool"; homepage = "https://github.com/takanorig/mqtt-bench"; maintainers = with maintainers; [ disassembler ]; diff --git a/pkgs/applications/misc/mucommander/default.nix b/pkgs/applications/misc/mucommander/default.nix index a1e02dbe18e0..c42ae1e815b3 100644 --- a/pkgs/applications/misc/mucommander/default.nix +++ b/pkgs/applications/misc/mucommander/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gradle_6, perl, makeWrapper, jdk11, gsettings-desktop-schemas }: +{ lib, stdenv, fetchFromGitHub, gradle_6, perl, makeWrapper, jdk11, gsettings-desktop-schemas }: let version = "0.9.3-3"; @@ -76,7 +76,7 @@ in stdenv.mkDerivation { --set JAVA_HOME ${jdk11} ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.mucommander.com/"; description = "Cross-platform file manager"; license = licenses.gpl3; diff --git a/pkgs/applications/misc/multibootusb/default.nix b/pkgs/applications/misc/multibootusb/default.nix index c1c7b5a2706e..34671d9374f2 100644 --- a/pkgs/applications/misc/multibootusb/default.nix +++ b/pkgs/applications/misc/multibootusb/default.nix @@ -1,6 +1,6 @@ { fetchFromGitHub, libxcb, mtools, p7zip, parted, procps, qemu, unzip, zip, coreutils, gnugrep, which, gnused, e2fsprogs, autoPatchelfHook, gptfdisk, - python36Packages, qt5, runtimeShell, stdenv, util-linux, wrapQtAppsHook }: + python36Packages, qt5, runtimeShell, lib, stdenv, util-linux, wrapQtAppsHook }: # Note: Multibootusb is tricky to maintain. It relies on the # $PYTHONPATH variable containing some of their code, so that @@ -105,7 +105,7 @@ python36Packages.buildPythonApplication rec { ) ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Multiboot USB creator for Linux live disks"; homepage = "http://multibootusb.org/"; license = licenses.gpl2; diff --git a/pkgs/applications/misc/mupdf/1.17.nix b/pkgs/applications/misc/mupdf/1.17.nix index c6243e5f1d6b..bf66fc80bab9 100644 --- a/pkgs/applications/misc/mupdf/1.17.nix +++ b/pkgs/applications/misc/mupdf/1.17.nix @@ -80,7 +80,7 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://mupdf.com"; repositories.git = "git://git.ghostscript.com/mupdf.git"; description = "Lightweight PDF, XPS, and E-book viewer and toolkit written in portable C"; diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix index 836d970a2b55..09ad5fe98423 100644 --- a/pkgs/applications/misc/mupdf/default.nix +++ b/pkgs/applications/misc/mupdf/default.nix @@ -97,7 +97,7 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://mupdf.com"; repositories.git = "git://git.ghostscript.com/mupdf.git"; description = "Lightweight PDF, XPS, and E-book viewer and toolkit written in portable C"; diff --git a/pkgs/applications/misc/mwic/default.nix b/pkgs/applications/misc/mwic/default.nix index dffc27bd40b0..970c89b2acfc 100644 --- a/pkgs/applications/misc/mwic/default.nix +++ b/pkgs/applications/misc/mwic/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pythonPackages }: +{ lib, stdenv, fetchurl, pythonPackages }: stdenv.mkDerivation rec { version = "0.7.8"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { wrapPythonPrograms ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://jwilk.net/software/mwic"; description = "spell-checker that groups possible misspellings and shows them in their contexts"; license = licenses.mit; diff --git a/pkgs/applications/misc/mysql-workbench/default.nix b/pkgs/applications/misc/mysql-workbench/default.nix index 71adcdc0757b..34e124367ebf 100644 --- a/pkgs/applications/misc/mysql-workbench/default.nix +++ b/pkgs/applications/misc/mysql-workbench/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , substituteAll , cmake @@ -172,7 +172,7 @@ in stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Visual MySQL database modeling, administration and querying tool"; longDescription = '' MySQL Workbench is a modeling tool that allows you to design diff --git a/pkgs/applications/misc/mystem/default.nix b/pkgs/applications/misc/mystem/default.nix index 27caef9ea2eb..62c1834d26ad 100644 --- a/pkgs/applications/misc/mystem/default.nix +++ b/pkgs/applications/misc/mystem/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl }: +{lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "mystem"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) $out/bin/mystem ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Morphological analysis of Russian text"; homepage = "https://yandex.ru/dev/mystem/"; license = licenses.unfreeRedistributable; diff --git a/pkgs/applications/misc/nanoblogger/default.nix b/pkgs/applications/misc/nanoblogger/default.nix index cf7689367bd3..a4969a34a86f 100644 --- a/pkgs/applications/misc/nanoblogger/default.nix +++ b/pkgs/applications/misc/nanoblogger/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin cp -r * $out - cat > $out/bin/nb << EOF + cat > $out/bin/nb << EOF #!${bash}/bin/bash $out/nb "\$@" EOF diff --git a/pkgs/applications/misc/neap/default.nix b/pkgs/applications/misc/neap/default.nix index 992a3c0248a0..e5f50dd33706 100644 --- a/pkgs/applications/misc/neap/default.nix +++ b/pkgs/applications/misc/neap/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python2Packages }: +{ lib, stdenv, fetchFromGitHub, python2Packages }: stdenv.mkDerivation rec { pname = "neap"; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { wrapPythonPrograms ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Systray workspace pager"; homepage = "https://github.com/vzxwco/neap"; license = licenses.bsd2; diff --git a/pkgs/applications/misc/nix-tour/default.nix b/pkgs/applications/misc/nix-tour/default.nix index 05ef696f99b8..dda4dcb47e57 100644 --- a/pkgs/applications/misc/nix-tour/default.nix +++ b/pkgs/applications/misc/nix-tour/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, electron, runtimeShell } : +{ lib, stdenv, fetchgit, electron, runtimeShell } : stdenv.mkDerivation rec { pname = "nix-tour"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { chmod 0755 $out/bin/nix-tour ''; - meta = with stdenv.lib; { + meta = with lib; { description = "'the tour of nix' from nixcloud.io/tour as offline version"; homepage = "https://nixcloud.io/tour"; license = licenses.gpl2; diff --git a/pkgs/applications/misc/nixnote2/default.nix b/pkgs/applications/misc/nixnote2/default.nix index 92bb4ca22077..b23c41e6feec 100644 --- a/pkgs/applications/misc/nixnote2/default.nix +++ b/pkgs/applications/misc/nixnote2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, mkDerivation, fetchFromGitHub, boost +{ lib, stdenv, mkDerivation, fetchFromGitHub, boost , qtbase, qtwebkit, poppler, qmake, hunspell, html-tidy}: mkDerivation rec { @@ -35,7 +35,7 @@ mkDerivation rec { cp theme.ini $out/share/nixnote2/theme.ini ''; - meta = with stdenv.lib; { + meta = with lib; { description = "An unofficial client of Evernote"; homepage = "http://www.nixnote.org/"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/misc/notejot/default.nix b/pkgs/applications/misc/notejot/default.nix index d5d6aea49461..5a84f91bb741 100644 --- a/pkgs/applications/misc/notejot/default.nix +++ b/pkgs/applications/misc/notejot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, nix-update-script, vala, pkgconfig, meson, ninja, python3, pantheon +{ lib, stdenv, fetchFromGitHub, nix-update-script, vala, pkgconfig, meson, ninja, python3, pantheon , gtk3, gtksourceview, json-glib, libgee, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Stupidly-simple sticky notes applet"; homepage = "https://github.com/lainsce/notejot"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/misc/notify-osd-customizable/default.nix b/pkgs/applications/misc/notify-osd-customizable/default.nix index 36fa888e8884..aeeb1051b094 100644 --- a/pkgs/applications/misc/notify-osd-customizable/default.nix +++ b/pkgs/applications/misc/notify-osd-customizable/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , dbus-glib , fetchurl , glib @@ -38,7 +38,7 @@ in stdenv.mkDerivation rec { --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Daemon that displays passive pop-up notifications"; homepage = "https://launchpad.net/notify-osd"; license = licenses.gpl3; diff --git a/pkgs/applications/misc/notify-osd/default.nix b/pkgs/applications/misc/notify-osd/default.nix index e2bff0031186..bc2e40764043 100644 --- a/pkgs/applications/misc/notify-osd/default.nix +++ b/pkgs/applications/misc/notify-osd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, libwnck3, libnotify, dbus-glib, makeWrapper, gsettings-desktop-schemas }: +{ lib, stdenv, fetchurl, pkgconfig, glib, libwnck3, libnotify, dbus-glib, makeWrapper, gsettings-desktop-schemas }: stdenv.mkDerivation rec { pname = "notify-osd"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Daemon that displays passive pop-up notifications"; homepage = "https://launchpad.net/notify-osd"; license = licenses.gpl3; diff --git a/pkgs/applications/misc/nrsc5/default.nix b/pkgs/applications/misc/nrsc5/default.nix index ada603cba963..f00fd7894c75 100644 --- a/pkgs/applications/misc/nrsc5/default.nix +++ b/pkgs/applications/misc/nrsc5/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, +{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, cmake, rtl-sdr, libao, fftwFloat } : @@ -42,7 +42,7 @@ in stdenv.mkDerivation { cmakeFlags = [ "-DUSE_COLOR=ON" "-DUSE_FAAD2=ON" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/theori-io/nrsc5"; description = "HD-Radio decoder for RTL-SDR"; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/misc/nut/default.nix b/pkgs/applications/misc/nut/default.nix index 8f188818d4f7..d36efb483db1 100644 --- a/pkgs/applications/misc/nut/default.nix +++ b/pkgs/applications/misc/nut/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, neon, libusb-compat-0_1, openssl, udev, avahi, freeipmi +{ lib, stdenv, fetchurl, pkgconfig, neon, libusb-compat-0_1, openssl, udev, avahi, freeipmi , libtool, makeWrapper, autoreconfHook, fetchpatch }: @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { "$out/lib:${neon}/lib:${libusb-compat-0_1.out}/lib:${avahi}/lib:${freeipmi}/lib" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Network UPS Tools"; longDescription = '' Network UPS Tools is a collection of programs which provide a common diff --git a/pkgs/applications/misc/nwg-launchers/default.nix b/pkgs/applications/misc/nwg-launchers/default.nix index 77eae10293d4..e6575b780f7c 100644 --- a/pkgs/applications/misc/nwg-launchers/default.nix +++ b/pkgs/applications/misc/nwg-launchers/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , cmake , gtkmm3 @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { --prefix PATH : "${swaylock}/bin" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "GTK-based launchers: application grid, button bar, dmenu for sway and other window managers"; homepage = "https://github.com/nwg-piotr/nwg-launchers"; license = licenses.gpl3; diff --git a/pkgs/applications/misc/obinskit/default.nix b/pkgs/applications/misc/obinskit/default.nix index dc03b9b4f93c..ee31948c62d1 100644 --- a/pkgs/applications/misc/obinskit/default.nix +++ b/pkgs/applications/misc/obinskit/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc.lib libxkbcommon (lib.getLib systemd) xorg.libXt ]}" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Graphical configurator for Anne Pro and Anne Pro II keyboards"; homepage = "http://en.obins.net/obinskit/"; # https is broken license = licenses.unfree; diff --git a/pkgs/applications/misc/obsidian/default.nix b/pkgs/applications/misc/obsidian/default.nix index b33c091a581a..bfe215487afa 100644 --- a/pkgs/applications/misc/obsidian/default.nix +++ b/pkgs/applications/misc/obsidian/default.nix @@ -30,12 +30,12 @@ let in stdenv.mkDerivation rec { pname = "obsidian"; - version = "0.9.22"; + version = "0.10.6"; src = fetchurl { url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/obsidian-${version}.asar.gz"; - sha256 = "kIqNptt5fl3YORQ7iDqQ5d6Exu+P/nAvVCVgXMRQvpQ="; + sha256 = "KfGVc3nXu5ilYKQPLc5qaksTwsdhSVtty9CfjSoiCU8="; }; nativeBuildInputs = [ makeWrapper graphicsmagick ]; diff --git a/pkgs/applications/misc/ocropus/default.nix b/pkgs/applications/misc/ocropus/default.nix index ef371dc59fff..27b1b4ab98fa 100644 --- a/pkgs/applications/misc/ocropus/default.nix +++ b/pkgs/applications/misc/ocropus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchurl, pythonPackages, curl }: +{ lib, stdenv, fetchFromGitHub, fetchurl, pythonPackages, curl }: let getmodel = name: sha256: { @@ -49,7 +49,7 @@ pythonPackages.buildPythonApplication rec { PATH=".:$PATH" ./run-test ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Open source document analysis and OCR system"; license = licenses.asl20; homepage = "https://github.com/tmbdev/ocropy/"; diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix index 974b733ae640..f35d03c6d172 100644 --- a/pkgs/applications/misc/octoprint/default.nix +++ b/pkgs/applications/misc/octoprint/default.nix @@ -172,7 +172,7 @@ let passthru.python = self.python; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://octoprint.org/"; description = "The snappy web interface for your 3D printer"; license = licenses.agpl3; diff --git a/pkgs/applications/misc/octoprint/plugins.nix b/pkgs/applications/misc/octoprint/plugins.nix index 421690f29d46..df0409c8be48 100644 --- a/pkgs/applications/misc/octoprint/plugins.nix +++ b/pkgs/applications/misc/octoprint/plugins.nix @@ -23,7 +23,7 @@ in { sha256 = "0ij3rvdwya1sbymwm5swlh2j4jagb6fal945g88zrzh5xf26hzjh"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Marlin auto bed leveling control, mesh correction, and z probe handling"; homepage = "https://framagit.org/razer/Octoprint_ABL_Expert/"; license = licenses.agpl3; @@ -44,7 +44,7 @@ in { propagatedBuildInputs = with super; [ numpy ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Displays 3D mesh of bed topography report"; homepage = "https://github.com/jneilliii/OctoPrint-BedLevelVisualizer"; license = licenses.agpl3; @@ -63,7 +63,7 @@ in { sha256 = "1a7pxlmj1a7blkv97sn1k390pbjcxx2860011pbjcdnli74zpvv5"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Plugin for slicing via Cura Legacy from within OctoPrint"; homepage = "https://github.com/OctoPrint/OctoPrint-CuraEngineLegacy"; license = licenses.agpl3; @@ -82,7 +82,7 @@ in { sha256 = "1lbivg3rcjzv8zqvp8n8gcaczxdm7gvd5ihjb6jq0fgf958lv59n"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "OctoPrint-Plugin that sends the current progress of a print via M117 command"; homepage = "https://github.com/OllisGit/OctoPrint-DisplayLayerProgress"; license = licenses.agpl3; @@ -101,7 +101,7 @@ in { sha256 = "1yjj9lmxbzmzrn7gahw9lj7554fphalbjjp8ns0rr9py3rshwxkm"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Edit gcode on OctoPrint"; homepage = "https://github.com/ieatacid/OctoPrint-GcodeEditor"; license = licenses.agpl3; @@ -120,7 +120,7 @@ in { sha256 = "0vx06w9hqwy0k4r8g67y8gdckfdx7wl8ghfx6hmxc1s8fgkghfkc"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Displays GCode documentation for Marlin in the Octoprint terminal command line"; homepage = "https://github.com/costas-basdekis/MarlinGcodeDocumentation"; license = licenses.agpl3; @@ -141,7 +141,7 @@ in { propagatedBuildInputs = with super; [ paho-mqtt ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Publish printer status MQTT"; homepage = "https://github.com/OctoPrint/OctoPrint-MQTT"; license = licenses.agpl3; @@ -170,7 +170,7 @@ in { ./printtimegenius-logging.patch ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Better print time estimation for OctoPrint"; homepage = "https://github.com/eyal0/OctoPrint-PrintTimeGenius"; license = licenses.agpl3; @@ -194,7 +194,7 @@ in { sed /RPi.GPIO/d -i requirements.txt ''; - meta = with stdenv.lib; { + meta = with lib; { description = "OctoPrint plugin to control ATX/AUX power supply"; homepage = "https://github.com/kantlivelong/OctoPrint-PSUControl"; license = licenses.agpl3; @@ -213,7 +213,7 @@ in { sha256 = "0hhh5grmn32abkix1b9fr1d0pcpdi2r066iypcxdxcza9qzwjiyi"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A simple plugin that add an emergency stop buton on NavBar of OctoPrint"; homepage = "https://github.com/Sebclem/OctoPrint-SimpleEmergencyStop"; license = licenses.agpl3; @@ -232,7 +232,7 @@ in { sha256 = "0mkvh44fn2ch4z2avsdjwi1rp353ylmk9j5fln4x7rx8ph8y7g2b"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A simple stl viewer tab for OctoPrint"; homepage = "https://github.com/jneilliii/Octoprint-STLViewer"; license = licenses.agpl3; @@ -251,7 +251,7 @@ in { sha256 = "0j1qs6kyh947npdy7pqda25fjkqinpas3sy0qyscqlxi558lhvx2"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Beautiful themes for OctoPrint"; homepage = "https://github.com/birkbjo/OctoPrint-Themeify"; license = licenses.agpl3; @@ -270,7 +270,7 @@ in { sha256 = "10nxjrixg0i6n6x8ghc1ndshm25c97bvkcis5j9kmlkkzs36i2c6"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Show printers status in window title"; homepage = "https://github.com/MoonshineSG/OctoPrint-TitleStatus"; license = licenses.agpl3; @@ -289,7 +289,7 @@ in { sha256 = "1jlqjirc4ygl4k7jp93l2h6b18jap3mzz8sf2g61j9w0kgv9l365"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Touch friendly interface for a small TFT module or phone for OctoPrint"; homepage = "https://github.com/BillyBlaze/OctoPrint-TouchUI"; license = licenses.agpl3; @@ -308,7 +308,7 @@ in { sha256 = "15yg2blbgqp2gdpsqqm8qiiznq5qaq8wss07jimkl0865vrvlz7l"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A plugin for a better integration of Klipper into OctoPrint"; homepage = "https://github.com/AliceGrey/OctoprintKlipperPlugin"; license = licenses.agpl3; @@ -327,7 +327,7 @@ in { sha256 = "0p94jwd7kagh3sixhcrqmsgbay4aaf9l1pgyi2b45jym8pvld5n4"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A dashboard for Octoprint"; homepage = "https://github.com/StefanCohen/OctoPrint-Dashboard"; license = licenses.agpl3; diff --git a/pkgs/applications/misc/ola/default.nix b/pkgs/applications/misc/ola/default.nix index a9f12d572c8a..6524052e5f3b 100644 --- a/pkgs/applications/misc/ola/default.nix +++ b/pkgs/applications/misc/ola/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , autoreconfHook , bison @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A framework for controlling entertainment lighting equipment"; homepage = "https://www.openlighting.org/ola/"; maintainers = with maintainers; [ globin ]; diff --git a/pkgs/applications/misc/olifant/default.nix b/pkgs/applications/misc/olifant/default.nix index 21091b2583a5..b6d184efe46b 100644 --- a/pkgs/applications/misc/olifant/default.nix +++ b/pkgs/applications/misc/olifant/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , nix-update-script , fetchpatch @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A simple Mastodon client designed for elementary OS, originally developed by @bleakgrey"; homepage = "https://github.com/cleac/olifant"; license = licenses.gpl3; diff --git a/pkgs/applications/misc/omegat.nix b/pkgs/applications/misc/omegat.nix index 47536cc9f6a4..7b91d245f810 100644 --- a/pkgs/applications/misc/omegat.nix +++ b/pkgs/applications/misc/omegat.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, jdk, makeWrapper}: +{ lib, stdenv, fetchurl, unzip, jdk, makeWrapper}: stdenv.mkDerivation { version = "4.3.0"; @@ -25,7 +25,7 @@ stdenv.mkDerivation { chmod +x $out/bin/omegat ''; - meta = with stdenv.lib; { + meta = with lib; { description = "The free computer aided translation (CAT) tool for professionals"; longDescription = '' OmegaT is a free and open source multiplatform Computer Assisted Translation diff --git a/pkgs/applications/misc/onboard/default.nix b/pkgs/applications/misc/onboard/default.nix index e427519d4d6e..3c7f87ff9672 100644 --- a/pkgs/applications/misc/onboard/default.nix +++ b/pkgs/applications/misc/onboard/default.nix @@ -1,5 +1,5 @@ { fetchurl -, stdenv +, lib, stdenv , substituteAll , aspellWithDicts , at-spi2-core ? null @@ -172,7 +172,7 @@ python3.pkgs.buildPythonApplication rec { rm -rf $out/share/icons/ubuntu-mono-* ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://launchpad.net/onboard"; description = "Onscreen keyboard useful for tablet PC users and for mobility impaired users"; maintainers = with maintainers; [ johnramsden ]; diff --git a/pkgs/applications/misc/oneko/default.nix b/pkgs/applications/misc/oneko/default.nix index 1c5858b5677f..48b29f4b561d 100644 --- a/pkgs/applications/misc/oneko/default.nix +++ b/pkgs/applications/misc/oneko/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, imake, gccmakedep, xlibsWrapper }: +{ lib, stdenv, fetchurl, imake, gccmakedep, xlibsWrapper }: stdenv.mkDerivation rec { version_name = "1.2.sakura.5"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { makeFlags = [ "BINDIR=$(out)/bin" "MANPATH=$(out)/share/man" ]; installTargets = [ "install" "install.man" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Creates a cute cat chasing around your mouse cursor"; longDescription = '' Oneko changes your mouse cursor into a mouse diff --git a/pkgs/applications/misc/openbrf/default.nix b/pkgs/applications/misc/openbrf/default.nix index 8e990b6dffba..ec5d3c0a0752 100644 --- a/pkgs/applications/misc/openbrf/default.nix +++ b/pkgs/applications/misc/openbrf/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, stdenv, fetchFromGitHub, qtbase, vcg, glew, qmake, libGLU, libGL }: +{ mkDerivation, lib, stdenv, fetchFromGitHub, qtbase, vcg, glew, qmake, libGLU, libGL }: mkDerivation { @@ -37,7 +37,7 @@ mkDerivation { dontPatchELF = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A tool to edit resource files (BRF)"; homepage = "https://github.com/cfcohen/openbrf"; maintainers = with stdenv.lib.maintainers; [ abbradar ]; diff --git a/pkgs/applications/misc/opencpn/default.nix b/pkgs/applications/misc/opencpn/default.nix index f5a88cbaee17..a93f4b247408 100644 --- a/pkgs/applications/misc/opencpn/default.nix +++ b/pkgs/applications/misc/opencpn/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, cmake, gtk2, wxGTK30, libpulseaudio, curl, +{ stdenv, fetchFromGitHub, pkg-config, cmake, gtk2, wxGTK30, libpulseaudio, curl, gettext, glib, portaudio }: stdenv.mkDerivation rec { @@ -12,8 +12,8 @@ stdenv.mkDerivation rec { sha256 = "0yiqahkzwcbzgabc5xgxmwlngapkfiaqyva3mwz29xj0c5lg2bdk"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake gtk2 wxGTK30 libpulseaudio curl gettext + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ gtk2 wxGTK30 libpulseaudio curl gettext glib portaudio ]; cmakeFlags = [ @@ -21,8 +21,6 @@ stdenv.mkDerivation rec { "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include" ]; - enableParallelBuilding = true; - meta = { description = "A concise ChartPlotter/Navigator"; maintainers = [ stdenv.lib.maintainers.kragniz ]; diff --git a/pkgs/applications/misc/opentx/default.nix b/pkgs/applications/misc/opentx/default.nix index 6bdcd0da1fca..53dbde29a0ea 100644 --- a/pkgs/applications/misc/opentx/default.nix +++ b/pkgs/applications/misc/opentx/default.nix @@ -1,4 +1,4 @@ -{ stdenv, mkDerivation, fetchFromGitHub +{ lib, stdenv, mkDerivation, fetchFromGitHub , cmake, gcc-arm-embedded, python3Packages , qtbase, qtmultimedia, qttranslations, SDL, gtest , dfu-util, avrdude @@ -15,8 +15,6 @@ mkDerivation rec { sha256 = "1pp3k1802gl1rji98clv17wj0619dliq821mpi4446lk22q692yq"; }; - enableParallelBuilding = true; - nativeBuildInputs = [ cmake gcc-arm-embedded python3Packages.pillow ]; buildInputs = [ qtbase qtmultimedia qttranslations SDL ]; @@ -35,7 +33,7 @@ mkDerivation rec { #"-DAVRDUDE_PATH=${avrdude}/bin/avrdude" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "OpenTX Companion transmitter support software"; longDescription = '' OpenTX Companion is used for many different tasks like loading OpenTX diff --git a/pkgs/applications/misc/orca/default.nix b/pkgs/applications/misc/orca/default.nix index e438fd0762fa..be6928a87466 100644 --- a/pkgs/applications/misc/orca/default.nix +++ b/pkgs/applications/misc/orca/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , pkgconfig , fetchurl , buildPythonApplication @@ -97,7 +97,7 @@ buildPythonApplication rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://wiki.gnome.org/Projects/Orca"; description = "Screen reader"; longDescription = '' diff --git a/pkgs/applications/misc/osm2xmap/default.nix b/pkgs/applications/misc/osm2xmap/default.nix index 1c8933364984..3c06ed19e524 100644 --- a/pkgs/applications/misc/osm2xmap/default.nix +++ b/pkgs/applications/misc/osm2xmap/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libroxml, proj, libyamlcpp, boost } : +{ lib, stdenv, fetchFromGitHub, libroxml, proj, libyamlcpp, boost } : stdenv.mkDerivation rec { pname = "osm2xmap"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { buildInputs = [ libroxml proj libyamlcpp boost ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/sembruk/osm2xmap"; description = "Converter from OpenStreetMap data format to OpenOrienteering Mapper format"; license = licenses.gpl3; diff --git a/pkgs/applications/misc/osmctools/default.nix b/pkgs/applications/misc/osmctools/default.nix index b0f1f48d9aea..fc46ffb7ffac 100644 --- a/pkgs/applications/misc/osmctools/default.nix +++ b/pkgs/applications/misc/osmctools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, autoreconfHook, zlib }: +{ lib, stdenv, fetchFromGitLab, autoreconfHook, zlib }: stdenv.mkDerivation rec { pname = "osmctools"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ zlib ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Command line tools for transforming Open Street Map files"; homepage = [ "https://wiki.openstreetmap.org/wiki/osmconvert" diff --git a/pkgs/applications/misc/osmium-tool/default.nix b/pkgs/applications/misc/osmium-tool/default.nix index 892038c252ae..2397f3b8806b 100644 --- a/pkgs/applications/misc/osmium-tool/default.nix +++ b/pkgs/applications/misc/osmium-tool/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , cmake , installShellFiles @@ -7,19 +7,20 @@ , bzip2 , expat , libosmium +, lz4 , protozero , zlib }: stdenv.mkDerivation rec { pname = "osmium-tool"; - version = "1.12.1"; + version = "1.13.0"; src = fetchFromGitHub { owner = "osmcode"; repo = "osmium-tool"; rev = "v${version}"; - sha256 = "13142hj8gfgj6w51a62hjzfmzic90xgrnnlnb70hpdqjy86bxv7j"; + sha256 = "0rn67g4xf01i7pkxrdh87jdj2rzkw5pfkx5wkg9245z5yxjxhqj2"; }; nativeBuildInputs = [ @@ -33,6 +34,7 @@ stdenv.mkDerivation rec { bzip2 expat libosmium + lz4 protozero zlib ]; @@ -43,10 +45,10 @@ stdenv.mkDerivation rec { installShellCompletion --zsh ../zsh_completion/_osmium ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Multipurpose command line tool for working with OpenStreetMap data based on the Osmium library"; homepage = "https://osmcode.org/osmium-tool/"; - license = with licenses; [ gpl3 mit bsd3 ]; + license = with licenses; [ gpl3Plus mit bsd3 ]; maintainers = with maintainers; [ das-g ]; }; } diff --git a/pkgs/applications/misc/overmind/default.nix b/pkgs/applications/misc/overmind/default.nix index ca05facaa48f..537ae3741ef1 100644 --- a/pkgs/applications/misc/overmind/default.nix +++ b/pkgs/applications/misc/overmind/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "overmind"; - version = "2.1.1"; + version = "2.2.0"; goPackagePath = "github.com/DarthSim/overmind"; nativeBuildInputs = [ makeWrapper ]; @@ -15,7 +15,7 @@ buildGoPackage rec { owner = "DarthSim"; repo = pname; rev = "v${version}"; - sha256 = "0akqn8s1mgk5q00gzh3ymq7nrnkyi6avyaxxvbxnjyq9bxsqz327"; + sha256 = "00v6l4138vv32bqfkzrhk4hfl52a00rlg9ywhp4difgrnz7zj6xb"; }; goDeps = ./deps.nix; diff --git a/pkgs/applications/misc/overmind/deps.nix b/pkgs/applications/misc/overmind/deps.nix index afcc8d9726fe..b4c9211a24a1 100644 --- a/pkgs/applications/misc/overmind/deps.nix +++ b/pkgs/applications/misc/overmind/deps.nix @@ -45,15 +45,6 @@ sha256 = "1a82lclk56y7c44jg7wn5vq733dmn0g20r5yqbchrxnpfl75dw89"; }; } - { - goPackagePath = "github.com/pkg/term"; - fetch = { - type = "git"; - url = "https://github.com/pkg/term"; - rev = "aa71e9d9e942"; - sha256 = "1gyxnj4jq3z2k4gjwwlz8hn56c1ys8jvafdd61nd6qs8jwp6iqp3"; - }; - } { goPackagePath = "github.com/pmezard/go-difflib"; fetch = { @@ -126,15 +117,6 @@ sha256 = "0k1m83ji9l1a7ng8a7v40psbymxasmssbrrhpdv2wl4rhs0nc3np"; }; } - { - goPackagePath = "gopkg.in/urfave/cli.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/urfave/cli.v1"; - rev = "v1.20.0"; - sha256 = "0y6f4sbzkiiwrxbl15biivj8c7qwxnvm3zl2dd3mw4wzg4x10ygj"; - }; - } { goPackagePath = "gopkg.in/yaml.v2"; fetch = { diff --git a/pkgs/applications/misc/pastel/default.nix b/pkgs/applications/misc/pastel/default.nix index aaaf6dc778b9..7fd88348fe9e 100644 --- a/pkgs/applications/misc/pastel/default.nix +++ b/pkgs/applications/misc/pastel/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform, Security }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, Security }: rustPlatform.buildRustPackage rec { pname = "pastel"; @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { buildInputs = stdenv.lib.optional stdenv.isDarwin Security; - meta = with stdenv.lib; { + meta = with lib; { description = "A command-line tool to generate, analyze, convert and manipulate colors"; homepage = "https://github.com/sharkdp/pastel"; changelog = "https://github.com/sharkdp/pastel/releases/tag/v${version}"; diff --git a/pkgs/applications/misc/pbpst/default.nix b/pkgs/applications/misc/pbpst/default.nix index c1fd6c5d7cb8..ebca7a424091 100644 --- a/pkgs/applications/misc/pbpst/default.nix +++ b/pkgs/applications/misc/pbpst/default.nix @@ -1,4 +1,4 @@ -{ llvmPackages, stdenv, fetchFromGitHub +{ llvmPackages, lib, stdenv, fetchFromGitHub , python36Packages, which, pkgconfig, curl, git, gettext, jansson # Optional overrides @@ -39,7 +39,7 @@ llvmPackages.stdenv.mkDerivation rec { "--provider=${provider}" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A command-line libcurl C client for pb deployments"; inherit (src.meta) homepage; license = licenses.gpl2; diff --git a/pkgs/applications/misc/pcmanfm/default.nix b/pkgs/applications/misc/pcmanfm/default.nix index 202e7a2de95f..15aedb8e709e 100644 --- a/pkgs/applications/misc/pcmanfm/default.nix +++ b/pkgs/applications/misc/pcmanfm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, glib, intltool, libfm, libX11, pango, pkgconfig +{ lib, stdenv, fetchurl, glib, intltool, libfm, libX11, pango, pkgconfig , wrapGAppsHook, gnome3, withGtk3 ? true, gtk2, gtk3 }: let @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { configureFlags = optional withGtk3 "--with-gtk=3"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://blog.lxde.org/category/pcmanfm/"; license = licenses.gpl2Plus; description = "File manager with GTK interface"; diff --git a/pkgs/applications/misc/pcmanx-gtk2/default.nix b/pkgs/applications/misc/pcmanx-gtk2/default.nix index 6c3241d629b8..cb8b61507773 100644 --- a/pkgs/applications/misc/pcmanx-gtk2/default.nix +++ b/pkgs/applications/misc/pcmanx-gtk2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gtk2, libXft, intltool, automake, autoconf, libtool, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, gtk2, libXft, intltool, automake, autoconf, libtool, pkgconfig }: stdenv.mkDerivation rec { pname = "pcmanx-gtk2"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { cd libltdl; autoreconf; cd .. ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://pcman.ptt.cc"; license = licenses.gpl2; description = "Telnet BBS browser with GTK interface"; diff --git a/pkgs/applications/misc/pdf-quench/default.nix b/pkgs/applications/misc/pdf-quench/default.nix index c84c09e59a7e..907cceeb58b7 100644 --- a/pkgs/applications/misc/pdf-quench/default.nix +++ b/pkgs/applications/misc/pdf-quench/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgs, python3, wrapGAppsHook}: +{ lib, stdenv, fetchFromGitHub, pkgs, python3, wrapGAppsHook}: python3.pkgs.buildPythonApplication { pname = "pdf-quench"; @@ -27,7 +27,7 @@ python3.pkgs.buildPythonApplication { install -D -T -m 755 src/pdf_quench.py $out/bin/pdf-quench ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/linuxerwang/pdf-quench"; description = "A visual tool for cropping pdf files"; platforms = platforms.linux; diff --git a/pkgs/applications/misc/pdfdiff/default.nix b/pkgs/applications/misc/pdfdiff/default.nix index 93ca8c644798..31719cdfef2b 100644 --- a/pkgs/applications/misc/pdfdiff/default.nix +++ b/pkgs/applications/misc/pdfdiff/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pythonPackages, fetchurl, xpdf }: +{ lib, stdenv, pythonPackages, fetchurl, xpdf }: let py = pythonPackages; in @@ -32,7 +32,7 @@ py.buildPythonApplication rec { substituteInPlace $out/bin/pdfdiff --replace "#!/usr/bin/python" "#!${pythonPackages.python.interpreter}" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.cs.ox.ac.uk/people/cas.cremers/misc/pdfdiff.html"; description = "Tool to view the difference between two PDF or PS files"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/misc/pdfmod/default.nix b/pkgs/applications/misc/pdfmod/default.nix index 90107be64c72..76eeaa4da7fa 100644 --- a/pkgs/applications/misc/pdfmod/default.nix +++ b/pkgs/applications/misc/pdfmod/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { dontStrip = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://wiki.gnome.org/Attic/PdfMod"; description = "A simple application for modifying PDF documents"; platforms = platforms.all; diff --git a/pkgs/applications/misc/pdfpc/default.nix b/pkgs/applications/misc/pdfpc/default.nix index fc0bf62f1e9f..5714b04c7d1b 100644 --- a/pkgs/applications/misc/pdfpc/default.nix +++ b/pkgs/applications/misc/pdfpc/default.nix @@ -1,16 +1,17 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, vala, gtk3, libgee, fetchpatch -, poppler, libpthreadstubs, gstreamer, gst-plugins-base, gst-plugins-good, gst-libav, librsvg, pcre, gobject-introspection, wrapGAppsHook }: +{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, vala, gtk3, libgee, fetchpatch +, poppler, libpthreadstubs, gstreamer, gst-plugins-base, gst-plugins-good, gst-libav, librsvg, pcre, gobject-introspection, wrapGAppsHook +, webkitgtk, discount, json-glib }: stdenv.mkDerivation rec { name = "${product}-${version}"; product = "pdfpc"; - version = "4.4.1"; + version = "4.5.0"; src = fetchFromGitHub { repo = product; owner = product; rev = "v${version}"; - sha256 = "11n925c5jj3yfwnqkgxzqrmsrpqh8ls1g4idmqqzpsanpam1xvna"; + sha256 = "0bmy51w6ypz927hxwp5g7wapqvzqmsi3w32rch6i3f94kg1152ck"; }; nativeBuildInputs = [ @@ -27,11 +28,14 @@ stdenv.mkDerivation rec { gst-plugins-base (gst-plugins-good.override { gtkSupport = true; }) gst-libav + webkitgtk + discount + json-glib ]; cmakeFlags = stdenv.lib.optional stdenv.isDarwin "-DMOVIES=OFF"; - meta = with stdenv.lib; { + meta = with lib; { description = "A presenter console with multi-monitor support for PDF files"; homepage = "https://pdfpc.github.io/"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/misc/pdfsam-basic/default.nix b/pkgs/applications/misc/pdfsam-basic/default.nix index 039967f41820..2aeb3ba7f99f 100644 --- a/pkgs/applications/misc/pdfsam-basic/default.nix +++ b/pkgs/applications/misc/pdfsam-basic/default.nix @@ -1,4 +1,4 @@ -{ stdenv, makeDesktopItem, fetchurl, jdk11, wrapGAppsHook, glib }: +{ lib, stdenv, makeDesktopItem, fetchurl, jdk11, wrapGAppsHook, glib }: stdenv.mkDerivation rec { pname = "pdfsam-basic"; @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { categories = "Office;"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/torakiki/pdfsam"; description = "Multi-platform software designed to extract pages, split, merge, mix and rotate PDF files"; license = licenses.agpl3; diff --git a/pkgs/applications/misc/peaclock/default.nix b/pkgs/applications/misc/peaclock/default.nix index e824bbaf583b..619b6ed9b375 100644 --- a/pkgs/applications/misc/peaclock/default.nix +++ b/pkgs/applications/misc/peaclock/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, libpthreadstubs, icu }: +{ lib, stdenv, fetchFromGitHub, cmake, libpthreadstubs, icu }: stdenv.mkDerivation rec { pname = "peaclock"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ libpthreadstubs icu ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A clock, timer, and stopwatch for the terminal"; homepage = "https://octobanana.com/software/peaclock"; license = licenses.mit; diff --git a/pkgs/applications/misc/pell/default.nix b/pkgs/applications/misc/pell/default.nix index ae96ce6925e3..0b21de1e91e0 100644 --- a/pkgs/applications/misc/pell/default.nix +++ b/pkgs/applications/misc/pell/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, scsh, sox, libnotify }: +{ lib, stdenv, fetchFromGitHub, scsh, sox, libnotify }: stdenv.mkDerivation rec { pname = "pell"; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { substituteInPlace $out/bin/pell --replace "/usr/share/pell/offline.mp3" "$out/share/offline.mp3" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/ebzzry/pell"; description = "A simple host availability monitor"; license = licenses.mit; diff --git a/pkgs/applications/misc/pgadmin/default.nix b/pkgs/applications/misc/pgadmin/default.nix index b0aabead2457..f4981f6d3fb7 100644 --- a/pkgs/applications/misc/pgadmin/default.nix +++ b/pkgs/applications/misc/pgadmin/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, postgresql, wxGTK, libxml2, libxslt, openssl, zlib, makeDesktopItem }: +{ lib, stdenv, fetchurl, fetchpatch, postgresql, wxGTK, libxml2, libxslt, openssl, zlib, makeDesktopItem }: stdenv.mkDerivation rec { pname = "pgadmin3"; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { "--with-libxslt=${libxslt.dev}" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "PostgreSQL administration GUI tool"; homepage = "https://www.pgadmin.org"; license = licenses.gpl2; diff --git a/pkgs/applications/misc/pgmanage/default.nix b/pkgs/applications/misc/pgmanage/default.nix index 68f29cb9b9ac..b892ebb2a9e0 100644 --- a/pkgs/applications/misc/pgmanage/default.nix +++ b/pkgs/applications/misc/pgmanage/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, postgresql, openssl } : +{ lib, stdenv, fetchFromGitHub, postgresql, openssl } : stdenv.mkDerivation rec { pname = "pgmanage"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { buildInputs = [ postgresql openssl ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A fast replacement for PGAdmin"; longDescription = '' At the heart of pgManage is a modern, fast, event-based C-binary, built in diff --git a/pkgs/applications/misc/pgmodeler/default.nix b/pkgs/applications/misc/pgmodeler/default.nix index 7532c6e9bc91..67010e713c3c 100644 --- a/pkgs/applications/misc/pgmodeler/default.nix +++ b/pkgs/applications/misc/pgmodeler/default.nix @@ -1,29 +1,33 @@ -{ stdenv, lib, fetchFromGitHub, pkgconfig, qmake, mkDerivation, - qtsvg, - libxml2, postgresql }: +{ stdenv +, lib +, fetchFromGitHub +, pkg-config +, qmake +, mkDerivation +, qtsvg +, libxml2 +, postgresql +}: mkDerivation rec { pname = "pgmodeler"; - version = "0.9.2"; + version = "0.9.3"; src = fetchFromGitHub { owner = "pgmodeler"; repo = "pgmodeler"; rev = "v${version}"; - sha256 = "1wkvg20krfwkziz7skgmwlinx07jm5nl3455payg5brv69zf60kl"; + sha256 = "1bci5x418dbnkny7hn0b5q5lxyajrgl3frv41ji0hcw9vivrds2g"; }; - enableParallelBuilding = true; - - nativeBuildInputs = [ pkgconfig qmake ]; + nativeBuildInputs = [ pkg-config qmake ]; qmakeFlags = [ "pgmodeler.pro" "CONFIG+=release" ]; # todo: libpq would suffice here. Unfortunately this won't work, if one uses only postgresql.lib here. buildInputs = [ postgresql qtsvg ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A database modeling tool for PostgreSQL"; - longDescription = ''pgModeler (PostgreSQL Database Modeler) is an open source database modeling tool designed for PostgreSQL.''; homepage = "https://pgmodeler.io/"; license = licenses.gpl3; maintainers = [ maintainers.esclear ]; diff --git a/pkgs/applications/misc/phwmon/default.nix b/pkgs/applications/misc/phwmon/default.nix index 017383a79a2d..5800bcebef90 100644 --- a/pkgs/applications/misc/phwmon/default.nix +++ b/pkgs/applications/misc/phwmon/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation { buildInputs = [ pythonPackages.pygtk pythonPackages.psutil ]; pythonPath = [ pythonPackages.pygtk pythonPackages.psutil ]; - + patchPhase = '' substituteInPlace install.sh --replace "/usr/local" "$out" ''; - + installPhase = '' mkdir -p $out/bin $out/share/applications ./install.sh diff --git a/pkgs/applications/misc/pinfo/default.nix b/pkgs/applications/misc/pinfo/default.nix index 55093b21f950..8668807e81cc 100644 --- a/pkgs/applications/misc/pinfo/default.nix +++ b/pkgs/applications/misc/pinfo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, gettext, texinfo, ncurses, readline }: +{ lib, stdenv, fetchurl, autoreconfHook, gettext, texinfo, ncurses, readline }: stdenv.mkDerivation { name = "pinfo-0.6.10"; @@ -15,7 +15,7 @@ stdenv.mkDerivation { configureFlags = [ "--with-curses=${ncurses.dev}" "--with-readline=${readline.dev}" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A viewer for info files"; license = licenses.gpl2Plus; platforms = platforms.unix; diff --git a/pkgs/applications/misc/pipr/default.nix b/pkgs/applications/misc/pipr/default.nix index b3bde2a1c241..7332f2016894 100644 --- a/pkgs/applications/misc/pipr/default.nix +++ b/pkgs/applications/misc/pipr/default.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { wrapProgram "$out/bin/pipr" --prefix PATH : ${lib.makeBinPath [ bubblewrap ]} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A commandline-tool to interactively write shell pipelines"; homepage = "https://github.com/ElKowar/pipr"; license = licenses.mit; diff --git a/pkgs/applications/misc/plank/default.nix b/pkgs/applications/misc/plank/default.nix index 0ae9e7379e7c..cdc086861243 100644 --- a/pkgs/applications/misc/plank/default.nix +++ b/pkgs/applications/misc/plank/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , vala , atk @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { --replace "/usr/bin/file" "${file}/bin/file" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Elegant, simple, clean dock"; homepage = "https://launchpad.net/plank"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/misc/plasma-applet-volumewin7mixer/default.nix b/pkgs/applications/misc/plasma-applet-volumewin7mixer/default.nix index 820048bdd6b0..d9feb28c037b 100644 --- a/pkgs/applications/misc/plasma-applet-volumewin7mixer/default.nix +++ b/pkgs/applications/misc/plasma-applet-volumewin7mixer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, cmake, extra-cmake-modules, plasma-framework, kwindowsystem, plasma-pa, fetchFromGitHub }: +{ lib, stdenv, cmake, extra-cmake-modules, plasma-framework, kwindowsystem, plasma-pa, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "plasma-applet-volumewin7mixer"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake extra-cmake-modules ]; buildInputs = [ plasma-framework kwindowsystem plasma-pa ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A fork of the default volume plasmoid with a Windows 7 theme (vertical sliders)"; homepage = "https://github.com/Zren/plasma-applet-volumewin7mixer"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/misc/playonlinux/default.nix b/pkgs/applications/misc/playonlinux/default.nix index 3acb77545055..73d50209e90f 100644 --- a/pkgs/applications/misc/playonlinux/default.nix +++ b/pkgs/applications/misc/playonlinux/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , makeWrapper , fetchurl , cabextract @@ -27,7 +27,7 @@ let version = "4.4"; - binpath = stdenv.lib.makeBinPath [ + binpath = stdenv.lib.makeBinPath [ cabextract python gettext @@ -70,7 +70,7 @@ in stdenv.mkDerivation { nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ + buildInputs = [ xorg.libX11 libGL python @@ -103,7 +103,7 @@ in stdenv.mkDerivation { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "GUI for managing Windows programs under linux"; homepage = "https://www.playonlinux.com/"; license = licenses.gpl3; diff --git a/pkgs/applications/misc/plover/default.nix b/pkgs/applications/misc/plover/default.nix index 8ecc4f974b45..2a3368e351f7 100644 --- a/pkgs/applications/misc/plover/default.nix +++ b/pkgs/applications/misc/plover/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python27Packages, python36Packages, wmctrl, +{ lib, stdenv, fetchurl, python27Packages, python36Packages, wmctrl, qtbase, mkDerivationWith }: { @@ -6,7 +6,7 @@ pname = "plover"; version = "3.1.1"; - meta = with stdenv.lib; { + meta = with lib; { description = "OpenSteno Plover stenography software"; maintainers = with maintainers; [ twey kovirobi ]; license = licenses.gpl2; @@ -28,7 +28,7 @@ pname = "plover"; version = "4.0.0.dev8"; - meta = with stdenv.lib; { + meta = with lib; { description = "OpenSteno Plover stenography software"; maintainers = with maintainers; [ twey kovirobi ]; license = licenses.gpl2; diff --git a/pkgs/applications/misc/polybar/default.nix b/pkgs/applications/misc/polybar/default.nix index 940cd1cdc919..2556eb02062c 100644 --- a/pkgs/applications/misc/polybar/default.nix +++ b/pkgs/applications/misc/polybar/default.nix @@ -1,5 +1,5 @@ { cairo, cmake, fetchFromGitHub, libXdmcp, libpthreadstubs, libxcb, pcre, pkgconfig -, python3, stdenv, xcbproto, xcbutil, xcbutilcursor, xcbutilimage +, python3, lib, stdenv, xcbproto, xcbutil, xcbutilcursor, xcbutilimage , xcbutilrenderutil, xcbutilwm, xcbutilxrm, makeWrapper , removeReferencesTo @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://polybar.github.io/"; description = "A fast and easy-to-use tool for creating status bars"; longDescription = '' diff --git a/pkgs/applications/misc/posterazor/default.nix b/pkgs/applications/misc/posterazor/default.nix index 674570ec3dd7..602ac3e5e3b4 100644 --- a/pkgs/applications/misc/posterazor/default.nix +++ b/pkgs/applications/misc/posterazor/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, unzip, pkgconfig, libXpm, fltk13, freeimage }: +{ lib, stdenv, fetchurl, cmake, unzip, pkg-config, libXpm, fltk13, freeimage }: stdenv.mkDerivation { name = "posterazor-1.5.1"; @@ -10,8 +10,8 @@ stdenv.mkDerivation { hardeningDisable = [ "format" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake unzip libXpm fltk13 freeimage ]; + nativeBuildInputs = [ cmake pkg-config unzip ]; + buildInputs = [ libXpm fltk13 freeimage ]; unpackPhase = '' unzip $src -d posterazor @@ -28,7 +28,7 @@ stdenv.mkDerivation { cp PosteRazor $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://posterazor.sourceforge.net/"; description = "Cuts a raster image into pieces which can afterwards be printed out and assembled to a poster"; maintainers = [ maintainers.madjar ]; diff --git a/pkgs/applications/misc/prevo/data.nix b/pkgs/applications/misc/prevo/data.nix index 7f61f60bf6ae..efd19d7745ca 100644 --- a/pkgs/applications/misc/prevo/data.nix +++ b/pkgs/applications/misc/prevo/data.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, prevo-tools }: +{ lib, stdenv, fetchFromGitHub, prevo-tools }: stdenv.mkDerivation rec { pname = "prevo-data"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { cp prevo.db $out/share/prevo/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "data for offline version of the Esperanto dictionary Reta Vortaro"; longDescription = '' diff --git a/pkgs/applications/misc/prevo/default.nix b/pkgs/applications/misc/prevo/default.nix index 1f299b15d409..92d788695035 100644 --- a/pkgs/applications/misc/prevo/default.nix +++ b/pkgs/applications/misc/prevo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, symlinkJoin, prevo-tools, prevo-data, makeWrapper }: +{ lib, stdenv, symlinkJoin, prevo-tools, prevo-data, makeWrapper }: symlinkJoin rec { name = "prevo-${version}"; @@ -13,7 +13,7 @@ symlinkJoin rec { --prefix XDG_DATA_DIRS : "${prevo-data}/share" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "offline version of the Esperanto dictionary Reta Vortaro"; longDescription = '' PReVo is the "portable" ReVo, i.e., the offline version diff --git a/pkgs/applications/misc/prevo/tools.nix b/pkgs/applications/misc/prevo/tools.nix index 39c54b73b2fe..508f085bb44b 100644 --- a/pkgs/applications/misc/prevo/tools.nix +++ b/pkgs/applications/misc/prevo/tools.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, glib, expat +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, glib, expat , installShellFiles }: stdenv.mkDerivation rec { @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { installShellCompletion --bash src/prevo-completion ''; - meta = with stdenv.lib; { + meta = with lib; { description = "CLI tools for the offline version of the Esperanto dictionary Reta Vortaro"; longDescription = '' diff --git a/pkgs/applications/misc/printrun/default.nix b/pkgs/applications/misc/printrun/default.nix index cadd98c74260..13f9178f330c 100644 --- a/pkgs/applications/misc/printrun/default.nix +++ b/pkgs/applications/misc/printrun/default.nix @@ -1,17 +1,18 @@ -{ stdenv, python27Packages, fetchFromGitHub }: +{ lib, stdenv, python3Packages, fetchFromGitHub }: -python27Packages.buildPythonApplication rec { - name = "printrun-20150310"; +python3Packages.buildPythonApplication rec { + pname = "printrun"; + version = "2.0.0rc5"; src = fetchFromGitHub { owner = "kliment"; repo = "Printrun"; - rev = name; - sha256 = "09ijv8h4k5h15swg64s7igamvynawz7gdi7hiymzrzywdvr0zwsa"; + rev = "${pname}-${version}"; + sha256 = "179x8lwrw2h7cxnkq7izny6qcb4nhjnd8zx893i77zfhzsa6kx81"; }; - propagatedBuildInputs = with python27Packages; [ - wxPython30 pyserial dbus-python psutil numpy pyopengl pyglet cython + propagatedBuildInputs = with python3Packages; [ + appdirs cython dbus-python numpy six wxPython_4_0 psutil pyglet pyopengl pyserial ]; doCheck = false; @@ -28,7 +29,7 @@ python27Packages.buildPythonApplication rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Pronterface, Pronsole, and Printcore - Pure Python 3d printing host software"; homepage = "https://github.com/kliment/Printrun"; license = licenses.gpl3; diff --git a/pkgs/applications/misc/procmail/default.nix b/pkgs/applications/misc/procmail/default.nix index 1e6c558defbe..1244347cc53c 100644 --- a/pkgs/applications/misc/procmail/default.nix +++ b/pkgs/applications/misc/procmail/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation { name = "procmail-3.22"; @@ -29,7 +29,7 @@ stdenv.mkDerivation { sha256 = "05z1c803n5cppkcq99vkyd5myff904lf9sdgynfqngfk9nrpaz08"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Mail processing and filtering utility"; homepage = "http://www.procmail.org/"; license = licenses.gpl2; diff --git a/pkgs/applications/misc/projectlibre/default.nix b/pkgs/applications/misc/projectlibre/default.nix index 2a7a82bc74a4..fd83d74edd54 100644 --- a/pkgs/applications/misc/projectlibre/default.nix +++ b/pkgs/applications/misc/projectlibre/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, ant, jdk, makeWrapper, jre, coreutils, which }: +{ lib, stdenv, fetchgit, ant, jdk, makeWrapper, jre, coreutils, which }: stdenv.mkDerivation rec { pname = "projectlibre"; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { cp -R $resourcesPath/samples/* $out/share/projectlibre/samples ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.projectlibre.com/"; description = "Project-Management Software similar to MS-Project"; maintainers = [ maintainers.Mogria ]; diff --git a/pkgs/applications/misc/prusa-slicer/default.nix b/pkgs/applications/misc/prusa-slicer/default.nix index 79ad84e99be4..80936d910a3d 100644 --- a/pkgs/applications/misc/prusa-slicer/default.nix +++ b/pkgs/applications/misc/prusa-slicer/default.nix @@ -7,8 +7,6 @@ stdenv.mkDerivation rec { pname = "prusa-slicer"; version = "2.2.0"; - enableParallelBuilding = true; - nativeBuildInputs = [ cmake pkgconfig @@ -89,7 +87,7 @@ stdenv.mkDerivation rec { categories = "Development;"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "G-code generator for 3D printer"; homepage = "https://github.com/prusa3d/PrusaSlicer"; license = licenses.agpl3; diff --git a/pkgs/applications/misc/prusa-slicer/super-slicer.nix b/pkgs/applications/misc/prusa-slicer/super-slicer.nix index 2bc59e855a08..eed3bfc9c313 100644 --- a/pkgs/applications/misc/prusa-slicer/super-slicer.nix +++ b/pkgs/applications/misc/prusa-slicer/super-slicer.nix @@ -38,7 +38,7 @@ let categories = "Development;"; }; - meta = with stdenv.lib; { + meta = with lib; { inherit description; homepage = "https://github.com/supermerili/SuperSlicer"; license = licenses.agpl3; diff --git a/pkgs/applications/misc/pstree/default.nix b/pkgs/applications/misc/pstree/default.nix index 7aaa8a8c38d2..d25e4a6f90ba 100644 --- a/pkgs/applications/misc/pstree/default.nix +++ b/pkgs/applications/misc/pstree/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "pstree"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Show the set of running processes as a tree"; homepage = "http://www.thp.uni-duisburg.de/pstree/"; license = licenses.gpl2; diff --git a/pkgs/applications/misc/ptask/default.nix b/pkgs/applications/misc/ptask/default.nix index a5fd55c967bb..011b782053ea 100644 --- a/pkgs/applications/misc/ptask/default.nix +++ b/pkgs/applications/misc/ptask/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, makeWrapper, gtk3, json_c, taskwarrior }: +{ lib, stdenv, fetchurl, pkgconfig, makeWrapper, gtk3, json_c, taskwarrior }: stdenv.mkDerivation rec { name = "ptask-1.0.0"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { --prefix PATH : "${taskwarrior}/bin" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://wpitchoune.net/ptask/"; description = "GTK-based GUI for taskwarrior"; license = licenses.gpl2; diff --git a/pkgs/applications/misc/pwsafe/default.nix b/pkgs/applications/misc/pwsafe/default.nix index 6a9de9e600f4..c1b9d04d6730 100644 --- a/pkgs/applications/misc/pwsafe/default.nix +++ b/pkgs/applications/misc/pwsafe/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, zip, gettext, perl +{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, zip, gettext, perl , wxGTK30, libXext, libXi, libXt, libXtst, xercesc , qrencode, libuuid, libyubikey, yubikey-personalization , curl, openssl, file @@ -29,7 +29,6 @@ stdenv.mkDerivation rec { "-DNO_GTEST=ON" "-DCMAKE_CXX_FLAGS=-I${yubikey-personalization}/include/ykpers-1" ]; - enableParallelBuilding = true; postPatch = '' # Fix perl scripts used during the build. @@ -52,7 +51,7 @@ stdenv.mkDerivation rec { installFlags = [ "PREFIX=${placeholder "out"}" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A password database utility"; longDescription = '' Password Safe is a password database utility. Like many other diff --git a/pkgs/applications/misc/pydf/default.nix b/pkgs/applications/misc/pydf/default.nix index aa2835107088..0135e10d6df1 100644 --- a/pkgs/applications/misc/pydf/default.nix +++ b/pkgs/applications/misc/pydf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python3Packages }: +{ lib, stdenv, python3Packages }: python3Packages.buildPythonPackage rec { pname = "pydf"; @@ -15,7 +15,7 @@ python3Packages.buildPythonPackage rec { install -t $out/share/man/man1 -m 444 pydf.1 ''; - meta = with stdenv.lib; { + meta = with lib; { description = "colourised df(1)-clone"; homepage = "http://kassiopeia.juls.savba.sk/~garabik/software/pydf/"; license = licenses.publicDomain; diff --git a/pkgs/applications/misc/pyditz/cerberus.nix b/pkgs/applications/misc/pyditz/cerberus.nix index be12906e61ec..a26b6b014da4 100644 --- a/pkgs/applications/misc/pyditz/cerberus.nix +++ b/pkgs/applications/misc/pyditz/cerberus.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, pytestrunner, pytest }: +{ lib, stdenv, buildPythonPackage, fetchPypi, pytestrunner, pytest }: buildPythonPackage rec { pname = "Cerberus"; @@ -11,7 +11,7 @@ buildPythonPackage rec { checkInputs = [ pytestrunner pytest ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://python-cerberus.org/"; description = "Lightweight, extensible schema and data validation tool for Python dictionaries"; license = licenses.mit; diff --git a/pkgs/applications/misc/pyditz/default.nix b/pkgs/applications/misc/pyditz/default.nix index d8b2b2ec602e..268d2fb28609 100644 --- a/pkgs/applications/misc/pyditz/default.nix +++ b/pkgs/applications/misc/pyditz/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pythonPackages }: +{ lib, stdenv, pythonPackages }: with pythonPackages; @@ -19,7 +19,7 @@ in buildPythonApplication rec { ${python.interpreter} -m unittest discover ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://pythonhosted.org/pyditz/"; description = "Drop-in replacement for the Ditz distributed issue tracker"; maintainers = [ maintainers.ilikeavocadoes ]; diff --git a/pkgs/applications/misc/pytrainer/default.nix b/pkgs/applications/misc/pytrainer/default.nix index 00c451141792..eb775a1f6024 100644 --- a/pkgs/applications/misc/pytrainer/default.nix +++ b/pkgs/applications/misc/pytrainer/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , perl , python3 @@ -84,7 +84,7 @@ python3.pkgs.buildPythonApplication rec { ${python3.interpreter} setup.py test ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/pytrainer/pytrainer/wiki"; description = "Application for logging and graphing sporting excursions"; maintainers = [ maintainers.rycee ]; diff --git a/pkgs/applications/misc/qMasterPassword/default.nix b/pkgs/applications/misc/qMasterPassword/default.nix index c2adcabe414c..d3449da97f36 100644 --- a/pkgs/applications/misc/qMasterPassword/default.nix +++ b/pkgs/applications/misc/qMasterPassword/default.nix @@ -1,4 +1,4 @@ -{ stdenv, mkDerivation, fetchFromGitHub, qtbase, qmake, libX11, libXtst, openssl, libscrypt }: +{ lib, stdenv, mkDerivation, fetchFromGitHub, qtbase, qmake, libX11, libXtst, openssl, libscrypt }: mkDerivation rec { name = "qMasterPassword"; @@ -30,7 +30,7 @@ mkDerivation rec { mv data/icons/* $out/share/icons/qmasterpassword ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Stateless Master Password Manager"; longDescription = '' Access all your passwords using only a single master password. But in diff --git a/pkgs/applications/misc/qcad/default.nix b/pkgs/applications/misc/qcad/default.nix index a0d370c00ac1..ac1db54ebcea 100644 --- a/pkgs/applications/misc/qcad/default.nix +++ b/pkgs/applications/misc/qcad/default.nix @@ -10,7 +10,7 @@ , qtsvg , qtxmlpatterns , qttools -, stdenv +, lib, stdenv }: mkDerivationWith stdenv.mkDerivation rec { @@ -92,7 +92,7 @@ mkDerivationWith stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "2D CAD package based on Qt"; homepage = "https://qcad.org"; license = licenses.gpl3; diff --git a/pkgs/applications/misc/qdirstat/default.nix b/pkgs/applications/misc/qdirstat/default.nix index e9f049159bfa..a51bd3a80c05 100644 --- a/pkgs/applications/misc/qdirstat/default.nix +++ b/pkgs/applications/misc/qdirstat/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, qmake +{ lib, stdenv, fetchFromGitHub, qmake , coreutils, xdg_utils, bash , makeWrapper, perlPackages, mkDerivation }: @@ -47,7 +47,7 @@ mkDerivation { --set PERL5LIB "${perlPackages.makePerlPath [ perlPackages.URI ]}" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Graphical disk usage analyzer"; homepage = src.meta.homepage; license = licenses.gpl2; diff --git a/pkgs/applications/misc/qlandkartegt/default.nix b/pkgs/applications/misc/qlandkartegt/default.nix index 9ae65a962ddc..cb30571e0552 100644 --- a/pkgs/applications/misc/qlandkartegt/default.nix +++ b/pkgs/applications/misc/qlandkartegt/default.nix @@ -63,8 +63,6 @@ mkDerivation rec { "-DEXIF_INCLUDE_DIRS=${libexif}/include" ]; - enableParallelBuilding = true; - postPatch = '' substituteInPlace ConfigureChecks.cmake \ --replace \$\{PLUGIN_INSTALL_DIR\} "${garmindev}/lib/qlandkartegt" diff --git a/pkgs/applications/misc/qlandkartegt/garmindev.nix b/pkgs/applications/misc/qlandkartegt/garmindev.nix index 8705abd92596..07b58b72c494 100644 --- a/pkgs/applications/misc/qlandkartegt/garmindev.nix +++ b/pkgs/applications/misc/qlandkartegt/garmindev.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, libusb-compat-0_1 }: +{ lib, stdenv, fetchurl, cmake, libusb-compat-0_1 }: stdenv.mkDerivation rec { pname = "garmindev"; @@ -13,9 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ libusb-compat-0_1 ]; - enableParallelBuilding = true; - - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.qlandkarte.org/"; description = "Garmin Device Drivers for QlandkarteGT"; license = licenses.gpl2; diff --git a/pkgs/applications/misc/qlcplus/default.nix b/pkgs/applications/misc/qlcplus/default.nix index 452629b6181d..0f359007696d 100644 --- a/pkgs/applications/misc/qlcplus/default.nix +++ b/pkgs/applications/misc/qlcplus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, mkDerivation, fetchFromGitHub, qmake, pkgconfig, udev +{ lib, stdenv, mkDerivation, fetchFromGitHub, qmake, pkgconfig, udev , qtmultimedia, qtscript, alsaLib, ola, libftdi1, libusb-compat-0_1 , libsndfile, libmad }: @@ -35,7 +35,7 @@ mkDerivation rec { ln -sf $out/lib/*/libqlcplus* $out/lib ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A free and cross-platform software to control DMX or analog lighting systems like moving heads, dimmers, scanners etc"; maintainers = [ maintainers.globin ]; license = licenses.asl20; diff --git a/pkgs/applications/misc/qmetro/default.nix b/pkgs/applications/misc/qmetro/default.nix index 623bd050dc9b..70c41ff3142f 100644 --- a/pkgs/applications/misc/qmetro/default.nix +++ b/pkgs/applications/misc/qmetro/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qmake4Hook, unzip, qt4 }: +{ lib, stdenv, fetchurl, qmake4Hook, unzip, qt4 }: stdenv.mkDerivation rec { name = "${project}-${version}"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://sourceforge.net/projects/qmetro/"; description = "Worldwide transit maps viewer"; license = licenses.gpl3; diff --git a/pkgs/applications/misc/qolibri/default.nix b/pkgs/applications/misc/qolibri/default.nix index 913d2bc3c6ba..6cdd97e666f3 100644 --- a/pkgs/applications/misc/qolibri/default.nix +++ b/pkgs/applications/misc/qolibri/default.nix @@ -17,8 +17,6 @@ mkDerivation { libeb lzo qtbase qtmultimedia qttools qtwebengine ]; - enableParallelBuilding = true; - meta = with lib; { homepage = "https://github.com/ludios/qolibri"; description = "EPWING reader for viewing Japanese dictionaries"; diff --git a/pkgs/applications/misc/qsudo/default.nix b/pkgs/applications/misc/qsudo/default.nix index 63d97b3001c4..f7dbc9a90581 100644 --- a/pkgs/applications/misc/qsudo/default.nix +++ b/pkgs/applications/misc/qsudo/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , mkDerivation , fetchFromGitHub , qmake @@ -32,7 +32,7 @@ mkDerivation rec { substituteInPlace qsudo.pro --replace /usr/bin $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Graphical sudo utility from Project Trident"; homepage = "https://github.com/project-trident/qsudo"; license = licenses.bsd2; diff --git a/pkgs/applications/misc/qsyncthingtray/default.nix b/pkgs/applications/misc/qsyncthingtray/default.nix index 70d9f600fa03..cdb4f6038211 100644 --- a/pkgs/applications/misc/qsyncthingtray/default.nix +++ b/pkgs/applications/misc/qsyncthingtray/default.nix @@ -53,8 +53,6 @@ mkDerivation rec { runHook postInstall ''; - enableParallelBuilding = true; - meta = with lib; { homepage = "https://github.com/sieren/QSyncthingTray/"; description = "A Traybar Application for Syncthing written in C++"; diff --git a/pkgs/applications/misc/qt-box-editor/default.nix b/pkgs/applications/misc/qt-box-editor/default.nix index 852f0d30f9a5..5de2428250a0 100644 --- a/pkgs/applications/misc/qt-box-editor/default.nix +++ b/pkgs/applications/misc/qt-box-editor/default.nix @@ -1,5 +1,5 @@ { mkDerivation -, stdenv +, lib, stdenv , fetchFromGitHub , qtbase , qtsvg @@ -29,7 +29,7 @@ mkDerivation { printf "INSTALLS += target\ntarget.path = $out/bin" >> qt-box-editor.pro ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Editor of tesseract-ocr box files"; homepage = "https://github.com/zdenop/qt-box-editor"; license = licenses.asl20; diff --git a/pkgs/applications/misc/qtbitcointrader/default.nix b/pkgs/applications/misc/qtbitcointrader/default.nix index c5dfdf95fb5e..4ab70a5a8d7d 100644 --- a/pkgs/applications/misc/qtbitcointrader/default.nix +++ b/pkgs/applications/misc/qtbitcointrader/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, qt5, mkDerivation }: +{ lib, stdenv, fetchzip, qt5, mkDerivation }: let version = "1.40.43"; @@ -26,7 +26,7 @@ mkDerivation { runHook postConfigure ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Bitcoin trading client"; homepage = "https://centrabit.com/"; license = licenses.gpl3; diff --git a/pkgs/applications/misc/raiseorlaunch/default.nix b/pkgs/applications/misc/raiseorlaunch/default.nix index 6bbbc671bf86..e43cf7b95b93 100644 --- a/pkgs/applications/misc/raiseorlaunch/default.nix +++ b/pkgs/applications/misc/raiseorlaunch/default.nix @@ -10,9 +10,12 @@ python3Packages.buildPythonApplication rec { }; nativeBuildInputs = [ python3Packages.setuptools_scm ]; - checkInputs = [ python3Packages.pytest ]; pythonPath = with python3Packages; [ i3ipc ]; + # no tests + doCheck = false; + pythonImportsCheck = [ "raiseorlaunch" ]; + meta = with lib; { maintainers = with maintainers; [ winpat ]; description = "A run-or-raise-application-launcher for i3 window manager"; diff --git a/pkgs/applications/misc/reddsaver/default.nix b/pkgs/applications/misc/reddsaver/default.nix new file mode 100644 index 000000000000..2a6d613ed577 --- /dev/null +++ b/pkgs/applications/misc/reddsaver/default.nix @@ -0,0 +1,36 @@ +{ stdenv +, fetchFromGitHub +, rustPlatform +, openssl +, pkg-config +, Security +}: + +rustPlatform.buildRustPackage rec { + version = "0.2.2"; + pname = "reddsaver"; + + src = fetchFromGitHub { + owner = "manojkarthick"; + repo = "reddsaver"; + rev = "v${version}"; + sha256 = "0802jz503jhyz5q6mg1fj2bvkl4nggvs8y03zddd298ymplx5dbx"; + }; + + cargoSha256 = "0z8q187331j3rxj8hzym25pwrikxbd0r829v29y8w6v5n0hb47fs"; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ openssl ] + ++ stdenv.lib.optional stdenv.isDarwin Security; + + # package does not contain tests as of v0.2.2 + docCheck = false; + + meta = with stdenv.lib; { + description = "CLI tool to download saved images from Reddit"; + homepage = "https://github.com/manojkarthick/reddsaver"; + license = with licenses; [ mit /* or */ asl20 ]; + maintainers = [ maintainers.manojkarthick ]; + }; + +} diff --git a/pkgs/applications/misc/redshift-plasma-applet/default.nix b/pkgs/applications/misc/redshift-plasma-applet/default.nix index c14eee398cee..fa5ee0c753aa 100644 --- a/pkgs/applications/misc/redshift-plasma-applet/default.nix +++ b/pkgs/applications/misc/redshift-plasma-applet/default.nix @@ -1,4 +1,4 @@ -{ stdenv, cmake, extra-cmake-modules, plasma-framework, kwindowsystem, redshift, fetchFromGitHub, }: +{ lib, stdenv, cmake, extra-cmake-modules, plasma-framework, kwindowsystem, redshift, fetchFromGitHub, }: let version = "1.0.18"; in @@ -35,7 +35,7 @@ stdenv.mkDerivation { kwindowsystem ]; - meta = with stdenv.lib; { + meta = with lib; { description = "KDE Plasma 5 widget for controlling Redshift"; homepage = "https://github.com/kotelnik/plasma-applet-redshift-control"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/misc/redshift/default.nix b/pkgs/applications/misc/redshift/default.nix index 4d0c168962f9..6e48a75810e4 100644 --- a/pkgs/applications/misc/redshift/default.nix +++ b/pkgs/applications/misc/redshift/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchFromGitLab +{ lib, stdenv, fetchFromGitHub, fetchFromGitLab , autoconf, automake, gettext, intltool , libtool, pkgconfig, wrapGAppsHook, wrapPython, gobject-introspection , gtk3, python, pygobject3, pyxdg @@ -10,7 +10,7 @@ , withGeolocation ? true , withCoreLocation ? withGeolocation && stdenv.isDarwin, CoreLocation, Foundation, Cocoa , withGeoclue ? withGeolocation && stdenv.isLinux, geoclue -, withAppIndicator ? true, libappindicator, libayatana-appindicator +, withAppIndicator ? stdenv.isLinux, libappindicator, libayatana-appindicator }: let @@ -95,7 +95,7 @@ rec { sha256 = "12cb4gaqkybp4bkkns8pam378izr2mwhr2iy04wkprs2v92j7bz6"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Screen color temperature manager"; longDescription = '' Redshift adjusts the color temperature according to the position diff --git a/pkgs/applications/misc/regextester/default.nix b/pkgs/applications/misc/regextester/default.nix index 22f46eed7df4..a6762d7d8460 100644 --- a/pkgs/applications/misc/regextester/default.nix +++ b/pkgs/applications/misc/regextester/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , vala , gettext @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { ${glib.dev}/bin/glib-compile-schemas $out/share/glib-2.0/schemas ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A desktop application to test regular expressions interactively"; homepage = "https://github.com/artemanufrij/regextester"; maintainers = with maintainers; [ samdroid-apps ]; diff --git a/pkgs/applications/misc/remarkable/remarkable-mouse/default.nix b/pkgs/applications/misc/remarkable/remarkable-mouse/default.nix index 8d668f7a38d1..77538f243614 100644 --- a/pkgs/applications/misc/remarkable/remarkable-mouse/default.nix +++ b/pkgs/applications/misc/remarkable/remarkable-mouse/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonApplication, fetchPypi, python3Packages }: +{ lib, stdenv, buildPythonApplication, fetchPypi, python3Packages }: buildPythonApplication rec { pname = "remarkable-mouse"; @@ -11,7 +11,11 @@ buildPythonApplication rec { propagatedBuildInputs = with python3Packages; [ screeninfo paramiko pynput libevdev ]; - meta = with stdenv.lib; { + # no tests + doCheck = false; + pythonImportsCheck = [ "remarkable_mouse" ]; + + meta = with lib; { description = "A program to use a reMarkable as a graphics tablet"; homepage = "https://github.com/evidlo/remarkable_mouse"; license = licenses.gpl3; diff --git a/pkgs/applications/misc/remarkable/rmapi/default.nix b/pkgs/applications/misc/remarkable/rmapi/default.nix index 5ccf930e620f..22a154da4fd0 100644 --- a/pkgs/applications/misc/remarkable/rmapi/default.nix +++ b/pkgs/applications/misc/remarkable/rmapi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "rmapi"; @@ -15,7 +15,7 @@ buildGoModule rec { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "A Go app that allows access to the ReMarkable Cloud API programmatically"; homepage = "https://github.com/juruen/rmapi"; changelog = "https://github.com/juruen/rmapi/blob/v${version}/CHANGELOG.md"; diff --git a/pkgs/applications/misc/rofi-file-browser/default.nix b/pkgs/applications/misc/rofi-file-browser/default.nix index 10453b858491..d5b0944ac39c 100644 --- a/pkgs/applications/misc/rofi-file-browser/default.nix +++ b/pkgs/applications/misc/rofi-file-browser/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, rofi, gtk3 }: +{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, rofi, gtk3 }: stdenv.mkDerivation rec { pname = "rofi-file-browser-extended"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { dontUseCmakeBuildDir = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Use rofi to quickly open files"; homepage = "https://github.com/marvinkreis/rofi-file-browser-extended"; license = licenses.mit; diff --git a/pkgs/applications/misc/rofi-menugen/default.nix b/pkgs/applications/misc/rofi-menugen/default.nix index 088ec29ae37b..6c9e5f6feff8 100644 --- a/pkgs/applications/misc/rofi-menugen/default.nix +++ b/pkgs/applications/misc/rofi-menugen/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rofi, gnused }: +{ lib, stdenv, fetchFromGitHub, rofi, gnused }: stdenv.mkDerivation rec { rev = "168efd2608fdb88b1aff3e0244bda8402169f207"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { cp menugen $out/bin/rofi-menugen cp menugenbase $out/bin/rofi-menugenbase ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Generates menu based applications using rofi"; homepage = "https://github.com/octotep/menugen"; maintainers = with maintainers; [ ]; diff --git a/pkgs/applications/misc/rootbar/default.nix b/pkgs/applications/misc/rootbar/default.nix new file mode 100644 index 000000000000..d50cefb2a718 --- /dev/null +++ b/pkgs/applications/misc/rootbar/default.nix @@ -0,0 +1,45 @@ +{ lib, stdenv +, fetchhg +, pkg-config +, meson +, ninja +, gtk3 +, json_c +, libpulseaudio +, wayland +, wrapGAppsHook +}: + +stdenv.mkDerivation rec { + pname = "rootbar"; + version = "unstable-2020-11-13"; + + src = fetchhg { + url = "https://hg.sr.ht/~scoopta/rootbar"; + rev = "a018e10cfc5e"; + sha256 = "sha256-t6oDIYCVaCxaYy4bS1vxESaFDNxsx5JQLQK77eVuafE="; + }; + + nativeBuildInputs = [ + meson ninja pkg-config wrapGAppsHook + ]; + + buildInputs = [ + gtk3 + json_c + libpulseaudio + wayland + ]; + + meta = with lib; { + homepage = "https://github.com/alexays/waybar"; + description = "A bar for Wayland WMs"; + longDescription = '' + Root Bar is a bar for wlroots based wayland compositors such as sway and + was designed to address the lack of good bars for wayland. + ''; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/misc/rsclock/default.nix b/pkgs/applications/misc/rsclock/default.nix index e1ae63e09fd3..d7b38e2d665d 100644 --- a/pkgs/applications/misc/rsclock/default.nix +++ b/pkgs/applications/misc/rsclock/default.nix @@ -1,4 +1,4 @@ -{ stdenv, rustPlatform, fetchFromGitHub }: +{ lib, stdenv, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "rsClock"; @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "01dhkis6zswq1y40n7sdq9xv1sp61f2v7nfqbkicyjngmdrmcgrl"; - meta = with stdenv.lib; { + meta = with lib; { description = "A simple terminal clock written in Rust"; homepage = "https://github.com/valebes/rsClock"; license = licenses.mit; diff --git a/pkgs/applications/misc/rss-bridge-cli/default.nix b/pkgs/applications/misc/rss-bridge-cli/default.nix index f481f0953f81..4ab79440b239 100644 --- a/pkgs/applications/misc/rss-bridge-cli/default.nix +++ b/pkgs/applications/misc/rss-bridge-cli/default.nix @@ -1,4 +1,4 @@ -{ stdenv, writeShellScriptBin, rss-bridge, php }: +{ lib, stdenv, writeShellScriptBin, rss-bridge, php }: let phpWithExts = (php.withExtensions @@ -19,7 +19,7 @@ in (writeShellScriptBin "rss-bridge-cli" '' '').overrideAttrs (oldAttrs: rec { version = rss-bridge.version; - meta = with stdenv.lib; { + meta = with lib; { description = "Command-line interface for RSS-Bridge"; homepage = "https://github.com/RSS-Bridge/rss-bridge"; license = licenses.unlicense; diff --git a/pkgs/applications/misc/rtv/default.nix b/pkgs/applications/misc/rtv/default.nix index c4547e875130..343936962329 100644 --- a/pkgs/applications/misc/rtv/default.nix +++ b/pkgs/applications/misc/rtv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python3Packages }: +{ lib, stdenv, fetchFromGitHub, python3Packages }: with python3Packages; buildPythonApplication rec { @@ -37,7 +37,7 @@ buildPythonApplication rec { six ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/michael-lazar/rtv"; description = "Browse Reddit from your Terminal"; license = licenses.mit; diff --git a/pkgs/applications/misc/sc-im/default.nix b/pkgs/applications/misc/sc-im/default.nix index 6ee4695d1717..21cf60b60fcc 100644 --- a/pkgs/applications/misc/sc-im/default.nix +++ b/pkgs/applications/misc/sc-im/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, yacc, ncurses, libxml2, libzip, libxls, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, yacc, ncurses, libxml2, libzip, libxls, pkgconfig }: stdenv.mkDerivation rec { version = "0.7.0"; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { make install prefix= ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/andmarti1424/sc-im"; description = "SC-IM - Spreadsheet Calculator Improvised - SC fork"; license = licenses.bsdOriginal; diff --git a/pkgs/applications/misc/sdcv/default.nix b/pkgs/applications/misc/sdcv/default.nix index d220047a0a3b..ea3fc7d30f12 100644 --- a/pkgs/applications/misc/sdcv/default.nix +++ b/pkgs/applications/misc/sdcv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, glib, gettext, readline }: +{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, glib, gettext, readline }: stdenv.mkDerivation rec { pname = "sdcv"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-D__GNU_LIBRARY__"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://dushistov.github.io/sdcv/"; description = "Console version of StarDict"; maintainers = with maintainers; [ lovek323 ]; diff --git a/pkgs/applications/misc/sent/default.nix b/pkgs/applications/misc/sent/default.nix index fe8598e49157..f4b811e0752d 100644 --- a/pkgs/applications/misc/sent/default.nix +++ b/pkgs/applications/misc/sent/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, farbfeld, libX11, libXft, makeWrapper +{ lib, stdenv, fetchurl, farbfeld, libX11, libXft, makeWrapper , patches ? [] }: stdenv.mkDerivation rec { @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { wrapProgram "$out/bin/sent" --prefix PATH : "${farbfeld}/bin" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A simple plaintext presentation tool"; homepage = "https://tools.suckless.org/sent/"; license = licenses.isc; diff --git a/pkgs/applications/misc/sequeler/default.nix b/pkgs/applications/misc/sequeler/default.nix index d19621761407..ff7fc7dd0824 100644 --- a/pkgs/applications/misc/sequeler/default.nix +++ b/pkgs/applications/misc/sequeler/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, nix-update-script +{ lib, stdenv, fetchFromGitHub, nix-update-script , vala, meson, ninja, pkgconfig, pantheon, gettext, wrapGAppsHook, python3, desktop-file-utils , gtk3, glib, libgee, libgda, gtksourceview, libxml2, libsecret, libssh2 }: @@ -35,7 +35,7 @@ in stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Friendly SQL Client"; longDescription = '' Sequeler is a native Linux SQL client built in Vala and Gtk. It allows you diff --git a/pkgs/applications/misc/sidequest/default.nix b/pkgs/applications/misc/sidequest/default.nix index 883b3eec03db..ef4d472e74c9 100644 --- a/pkgs/applications/misc/sidequest/default.nix +++ b/pkgs/applications/misc/sidequest/default.nix @@ -44,7 +44,7 @@ passthru = { inherit pname version; - meta = with stdenv.lib; { + meta = with lib; { description = "An open app store and side-loading tool for Android-based VR devices such as the Oculus Go, Oculus Quest or Moverio BT 300"; homepage = "https://github.com/the-expanse/SideQuest"; downloadPage = "https://github.com/the-expanse/SideQuest/releases"; diff --git a/pkgs/applications/misc/signumone-ks/default.nix b/pkgs/applications/misc/signumone-ks/default.nix new file mode 100644 index 000000000000..cf6fcb201672 --- /dev/null +++ b/pkgs/applications/misc/signumone-ks/default.nix @@ -0,0 +1,55 @@ +{ stdenv, fetchurl, dpkg, autoPatchelfHook, makeWrapper, + atk, ffmpeg, gdk-pixbuf, glibc, gtk3, libav_0_8, libXtst }: + +stdenv.mkDerivation rec { + pname = "signumone-ks"; + version = "3.1.2"; + + src = fetchurl { + url = "https://cdn-dist.signum.one/${version}/${pname}-${version}.deb"; + sha256 = "4efd80e61619ccf26df1292194fcec68eb14d77dfcf0a1a673da4cf5bf41f4b7"; + }; + + # Necessary to avoid using multiple ffmpeg and gtk libs + autoPatchelfIgnoreMissingDeps = true; + + nativeBuildInputs = [ + autoPatchelfHook + dpkg + makeWrapper + ]; + + buildInputs = [ + atk glibc gdk-pixbuf stdenv.cc.cc ffmpeg + libav_0_8 gtk3 libXtst + ]; + + libPath = stdenv.lib.makeLibraryPath buildInputs; + + unpackPhase = '' + dpkg-deb -x ${src} ./ + ''; + + installPhase = '' + DESKTOP_PATH=$out/share/applications/signumone-ks.desktop + + mkdir -p $out/bin $out/share/applications + mv opt/SignumOne-KS/SignumOne-KS.desktop $DESKTOP_PATH + mv opt $out + + substituteInPlace $DESKTOP_PATH --replace 'Exec=/opt/SignumOne-KS' Exec=$out/bin + substituteInPlace $DESKTOP_PATH --replace 'Icon=' Icon=$out + + makeWrapper $out/opt/SignumOne-KS/SignumOne-KS \ + $out/bin/SignumOne-KS \ + --prefix LD_LIBRARY_PATH : ${libPath} + ''; + + meta = with stdenv.lib; { + description = "Digital signature tool for Costa Rican electronic invoicing"; + homepage = "https://signum.one/download.html"; + license = licenses.unfree; + maintainers = with maintainers; [ wolfangaukang ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/misc/simplenote/default.nix b/pkgs/applications/misc/simplenote/default.nix index fa0a47fdcb5e..bc5814add89b 100644 --- a/pkgs/applications/misc/simplenote/default.nix +++ b/pkgs/applications/misc/simplenote/default.nix @@ -23,7 +23,7 @@ let x86_64-linux = "123b0fh14068s2z3k6s5mmh46xwlz02qfnpmj838zlm5hckjmifv"; }.${system} or throwSystem; - meta = with stdenv.lib; { + meta = with lib; { description = "The simplest way to keep notes"; homepage = "https://github.com/Automattic/simplenote-electron"; license = licenses.gpl2; diff --git a/pkgs/applications/misc/slade/default.nix b/pkgs/applications/misc/slade/default.nix index e93baa997c86..ed0dde0ffaf6 100644 --- a/pkgs/applications/misc/slade/default.nix +++ b/pkgs/applications/misc/slade/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, wxGTK, gtk2, sfml, fluidsynth, curl, freeimage, ftgl, glew, zip }: +{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, wxGTK, gtk2, sfml, fluidsynth, curl, freeimage, ftgl, glew, zip }: stdenv.mkDerivation rec { pname = "slade"; @@ -14,9 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig zip ]; buildInputs = [ wxGTK gtk2 sfml fluidsynth curl freeimage ftgl glew ]; - enableParallelBuilding = true; - - meta = with stdenv.lib; { + meta = with lib; { description = "Doom editor"; homepage = "http://slade.mancubus.net/"; license = licenses.gpl2; diff --git a/pkgs/applications/misc/slade/git.nix b/pkgs/applications/misc/slade/git.nix index 1eaf907b7edf..b7fee00a40ff 100644 --- a/pkgs/applications/misc/slade/git.nix +++ b/pkgs/applications/misc/slade/git.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, wxGTK, gtk2, sfml, fluidsynth, curl, freeimage, ftgl, glew, zip }: +{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, wxGTK, gtk2, sfml, fluidsynth, curl, freeimage, ftgl, glew, zip }: stdenv.mkDerivation { name = "slade-git-3.1.2.2018.01.29"; @@ -14,9 +14,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake pkgconfig zip ]; buildInputs = [ wxGTK gtk2 sfml fluidsynth curl freeimage ftgl glew ]; - enableParallelBuilding = true; - - meta = with stdenv.lib; { + meta = with lib; { description = "Doom editor"; homepage = "http://slade.mancubus.net/"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/misc/sleepyhead/default.nix b/pkgs/applications/misc/sleepyhead/default.nix index 17c5ec9be265..1ea7893108db 100644 --- a/pkgs/applications/misc/sleepyhead/default.nix +++ b/pkgs/applications/misc/sleepyhead/default.nix @@ -24,7 +24,7 @@ in mkDerivation { patchPhase = '' patchShebangs configure ''; - + installPhase = if stdenv.isDarwin then '' mkdir -p $out/Applications cp -r sleepyhead/SleepyHead.app $out/Applications @@ -37,7 +37,7 @@ in mkDerivation { wrapQtApp "$out/Applications/SleepyHead.app/Contents/MacOS/SleepyHead" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://sleepyhead.jedimark.net/"; description = "Review and explore data produced by CPAP and related machines"; longDescription = '' diff --git a/pkgs/applications/misc/slic3r/default.nix b/pkgs/applications/misc/slic3r/default.nix index c8ecfbcb4a14..49ff51c2f485 100644 --- a/pkgs/applications/misc/slic3r/default.nix +++ b/pkgs/applications/misc/slic3r/default.nix @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { cp "$desktopItem"/share/applications/* "$out/share/applications/" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "G-code generator for 3D printers"; longDescription = '' Slic3r is the tool you need to convert a digital 3D model into printing diff --git a/pkgs/applications/misc/smos/default.nix b/pkgs/applications/misc/smos/default.nix index a1e118d76b38..7d994a749bd4 100644 --- a/pkgs/applications/misc/smos/default.nix +++ b/pkgs/applications/misc/smos/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , unzip }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { unpackCmd = "${unzip}/bin/unzip -d $out $curSrc"; sourceRoot = "."; - meta = with stdenv.lib; { + meta = with lib; { description = "A comprehensive self-management system"; homepage = https://smos.online; license = licenses.mit; diff --git a/pkgs/applications/misc/snowsql/default.nix b/pkgs/applications/misc/snowsql/default.nix index 720ee5f67996..692771960017 100644 --- a/pkgs/applications/misc/snowsql/default.nix +++ b/pkgs/applications/misc/snowsql/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , rpmextract , patchelf @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { --set LD_LIBRARY_PATH "${libPath}":"${placeholder "out"}"/lib64/snowflake/snowsql \ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Command line client for the Snowflake database"; homepage = "https://www.snowflake.com"; license = licenses.unfree; diff --git a/pkgs/applications/misc/speedread/default.nix b/pkgs/applications/misc/speedread/default.nix index 180b66fda8ce..a7b9cb591a5e 100644 --- a/pkgs/applications/misc/speedread/default.nix +++ b/pkgs/applications/misc/speedread/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, perl }: +{ lib, stdenv, fetchFromGitHub, perl }: stdenv.mkDerivation rec { name = "speedread-unstable-2016-09-21"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { install -m755 -D speedread $out/bin/speedread ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A simple terminal-based open source Spritz-alike"; longDescription = '' Speedread is a command line filter that shows input text as a diff --git a/pkgs/applications/misc/sqliteman/default.nix b/pkgs/applications/misc/sqliteman/default.nix index 27d5610956d0..a0ddf8db053e 100644 --- a/pkgs/applications/misc/sqliteman/default.nix +++ b/pkgs/applications/misc/sqliteman/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, qt4, qscintilla }: +{ lib, stdenv, fetchFromGitHub, cmake, qt4, qscintilla }: stdenv.mkDerivation rec { pname = "sqliteman"; @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1blzyh1646955d580f71slgdvz0nqx0qacryx0jc9w02yrag17cs"; }; - buildInputs = [ cmake qt4 qscintilla ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ qt4 qscintilla ]; prePatch = '' sed -i 's,m_file(0),m_file(QString()),' Sqliteman/sqliteman/main.cpp @@ -23,7 +24,7 @@ stdenv.mkDerivation rec { sed -i 's,PATHS ''${QT_LIBRARY_DIR},PATHS ${qscintilla}/libs,' cmake/modules/FindQScintilla.cmake ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A simple but powerful Sqlite3 GUI database manager"; homepage = "http://sqliteman.yarpen.cz/"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/misc/ssocr/default.nix b/pkgs/applications/misc/ssocr/default.nix index c52573785ef6..42bd58cd7831 100644 --- a/pkgs/applications/misc/ssocr/default.nix +++ b/pkgs/applications/misc/ssocr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, imlib2, libX11 }: +{ lib, stdenv, fetchFromGitHub, imlib2, libX11 }: stdenv.mkDerivation { pname = "ssocr"; @@ -11,11 +11,11 @@ stdenv.mkDerivation { sha256 = "0yzprwflky9a7zxa3zic7gvdwqg0zy49zvrqkdxng2k1ng78k3s7"; }; - nativeBuildInputs = [ imlib2 libX11 ]; + nativeBuildInputs = [ imlib2 libX11 ]; installFlags = [ "PREFIX=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Seven Segment Optical Character Recognition"; homepage = "https://github.com/auerswal/ssocr"; license = licenses.gpl3; diff --git a/pkgs/applications/misc/ssw/default.nix b/pkgs/applications/misc/ssw/default.nix index 7e1e40258106..f3dc8e136a1d 100644 --- a/pkgs/applications/misc/ssw/default.nix +++ b/pkgs/applications/misc/ssw/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkg-config, gtk3 }: +{ lib, stdenv, fetchurl, pkg-config, gtk3 }: stdenv.mkDerivation rec { pname = "ssw"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk3 ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.gnu.org/software/ssw/"; license = licenses.gpl3; description = "GNU Spread Sheet Widget"; diff --git a/pkgs/applications/misc/stog/default.nix b/pkgs/applications/misc/stog/default.nix index 7b497dc60e47..442750837bb5 100644 --- a/pkgs/applications/misc/stog/default.nix +++ b/pkgs/applications/misc/stog/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, ocaml, findlib, ocf, ptime, +{ lib, stdenv, fetchFromGitLab, ocaml, findlib, ocf, ptime, uutf, uri, ppx_blob, xtmpl, ocaml_lwt, higlo, omd }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { patches = [ ./install.patch ./uri.patch ]; - meta = with stdenv.lib; { + meta = with lib; { description = "XML documents and web site compiler"; homepage = "https://www.good-eris.net/stog"; license = licenses.lgpl3; diff --git a/pkgs/applications/misc/stretchly/default.nix b/pkgs/applications/misc/stretchly/default.nix index 95f361669737..e1591810c5b1 100644 --- a/pkgs/applications/misc/stretchly/default.nix +++ b/pkgs/applications/misc/stretchly/default.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { categories = "Utility;"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A break time reminder app"; longDescription = '' stretchly is a cross-platform electron app that reminds you to take diff --git a/pkgs/applications/misc/styx/default.nix b/pkgs/applications/misc/styx/default.nix index 06bf1bd5f2fa..e59f6710737a 100644 --- a/pkgs/applications/misc/styx/default.nix +++ b/pkgs/applications/misc/styx/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, caddy, asciidoctor +{ lib, stdenv, fetchFromGitHub, caddy, asciidoctor , file, lessc, sass, multimarkdown, linkchecker , perlPackages, python27 }: @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { cp -r themes/* $themes ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Nix based static site generator"; maintainers = with maintainers; [ ericsagnes ]; homepage = "https://styx-static.github.io/styx-site/"; diff --git a/pkgs/applications/misc/subsurface/default.nix b/pkgs/applications/misc/subsurface/default.nix index d8773240bac1..ab3423c47375 100644 --- a/pkgs/applications/misc/subsurface/default.nix +++ b/pkgs/applications/misc/subsurface/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub, autoreconfHook, cmake, wrapQtAppsHook, pkgconfig, qmake +{ lib, stdenv, fetchurl, fetchFromGitHub, autoreconfHook, cmake, wrapQtAppsHook, pkgconfig, qmake , curl, grantlee, libgit2, libusb-compat-0_1, libssh2, libxml2, libxslt, libzip, zlib , qtbase, qtconnectivity, qtlocation, qtsvg, qttools, qtwebkit, libXcomposite }: @@ -27,7 +27,7 @@ let enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.libdivecomputer.org"; description = "A cross-platform and open source library for communication with dive computers from various manufacturers"; maintainers = with maintainers; [ mguentner ]; @@ -63,7 +63,7 @@ let enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { inherit (src.meta) homepage; description = "QtLocation plugin for Google maps tile API"; maintainers = with maintainers; [ orivej ]; @@ -91,11 +91,9 @@ in stdenv.mkDerivation { "-DNO_PRINTING=OFF" ]; - enableParallelBuilding = true; - passthru = { inherit version libdc googlemaps; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A divelog program"; longDescription = '' Subsurface can track single- and multi-tank dives using air, Nitrox or TriMix. diff --git a/pkgs/applications/misc/swappy/default.nix b/pkgs/applications/misc/swappy/default.nix index ddd9b434852d..11798db34f52 100644 --- a/pkgs/applications/misc/swappy/default.nix +++ b/pkgs/applications/misc/swappy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , meson , ninja , wayland @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { "-Dc_args=-I${glib.dev}/include/gio-unix-2.0" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/jtheoof/swappy"; description = "A Wayland native snapshot editing tool, inspired by Snappy on macOS "; license = licenses.mit; diff --git a/pkgs/applications/misc/synapse/default.nix b/pkgs/applications/misc/synapse/default.nix index 751c0a48f5b3..6f8dd068de80 100644 --- a/pkgs/applications/misc/synapse/default.nix +++ b/pkgs/applications/misc/synapse/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gettext, pkgconfig, glib, libnotify, gtk3, libgee +{ lib, stdenv, fetchurl, gettext, pkgconfig, glib, libnotify, gtk3, libgee , keybinder3, json-glib, zeitgeist, vala, gobject-introspection }: @@ -22,7 +22,7 @@ in stdenv.mkDerivation rec { glib libnotify gtk3 libgee keybinder3 json-glib zeitgeist ]; - meta = with stdenv.lib; { + meta = with lib; { longDescription = '' Semantic launcher written in Vala that you can use to start applications as well as find and access relevant documents and files by making use of diff --git a/pkgs/applications/misc/syncthing-tray/default.nix b/pkgs/applications/misc/syncthing-tray/default.nix index 1cb5bb441ed8..ab57bf7a4302 100644 --- a/pkgs/applications/misc/syncthing-tray/default.nix +++ b/pkgs/applications/misc/syncthing-tray/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildGoPackage, pkgconfig, libappindicator-gtk3 }: +{ lib, stdenv, fetchFromGitHub, buildGoPackage, pkgconfig, libappindicator-gtk3 }: buildGoPackage rec { pname = "syncthing-tray"; @@ -18,7 +18,7 @@ buildGoPackage rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libappindicator-gtk3 ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Simple application tray for syncthing"; homepage = "https://github.com/alex2108/syncthing-tray"; license = licenses.mit; diff --git a/pkgs/applications/misc/synergy/default.nix b/pkgs/applications/misc/synergy/default.nix index b0722e18eeaa..3b1d04f3d38b 100644 --- a/pkgs/applications/misc/synergy/default.nix +++ b/pkgs/applications/misc/synergy/default.nix @@ -82,7 +82,7 @@ stdenv.mkDerivation rec { description = "Share one mouse and keyboard between multiple computers"; homepage = "http://synergy-project.org/"; license = licenses.gpl2; - maintainers = with maintainers; [ enzime ]; + maintainers = with maintainers; [ ]; platforms = platforms.all; }; } diff --git a/pkgs/applications/misc/systembus-notify/default.nix b/pkgs/applications/misc/systembus-notify/default.nix index 374adc6c89bf..6e5405ce988e 100644 --- a/pkgs/applications/misc/systembus-notify/default.nix +++ b/pkgs/applications/misc/systembus-notify/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, systemd }: +{ lib, stdenv, fetchFromGitHub, systemd }: stdenv.mkDerivation rec { pname = "systembus-notify"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "System bus notification daemon"; homepage = "https://github.com/rfjakob/systembus-notify"; license = licenses.mit; diff --git a/pkgs/applications/misc/tabula/default.nix b/pkgs/applications/misc/tabula/default.nix index 1b29118c9b14..1804f3c04e89 100644 --- a/pkgs/applications/misc/tabula/default.nix +++ b/pkgs/applications/misc/tabula/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, jre, makeWrapper }: +{ lib, stdenv, fetchzip, jre, makeWrapper }: stdenv.mkDerivation rec { @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A tool for liberating data tables locked inside PDF files"; longDescription = '' If you’ve ever tried to do anything with data provided to you in PDFs, you diff --git a/pkgs/applications/misc/tasknc/default.nix b/pkgs/applications/misc/tasknc/default.nix index 9080bec753de..d24a7d3e0d13 100644 --- a/pkgs/applications/misc/tasknc/default.nix +++ b/pkgs/applications/misc/tasknc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, makeWrapper, perl, ncurses5, taskwarrior }: +{ lib, stdenv, fetchFromGitHub, makeWrapper, perl, ncurses5, taskwarrior }: stdenv.mkDerivation rec { version = "2020-12-17"; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/lharding/tasknc"; description = "A ncurses wrapper around taskwarrior"; maintainers = with maintainers; [ matthiasbeyer infinisil ]; diff --git a/pkgs/applications/misc/taskopen/default.nix b/pkgs/applications/misc/taskopen/default.nix index a60ca997ee03..3632a282f7d7 100644 --- a/pkgs/applications/misc/taskopen/default.nix +++ b/pkgs/applications/misc/taskopen/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, makeWrapper, which, perl, perlPackages }: +{ fetchurl, lib, stdenv, makeWrapper, which, perl, perlPackages }: stdenv.mkDerivation { name = "taskopen-1.1.4"; @@ -24,7 +24,7 @@ stdenv.mkDerivation { --set PERL5LIB "$PERL5LIB" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Script for taking notes and open urls with taskwarrior"; homepage = "https://github.com/ValiValpas/taskopen"; platforms = platforms.linux; diff --git a/pkgs/applications/misc/tasksh/default.nix b/pkgs/applications/misc/tasksh/default.nix index 4c577049f44a..134d1373ad4b 100644 --- a/pkgs/applications/misc/tasksh/default.nix +++ b/pkgs/applications/misc/tasksh/default.nix @@ -1,11 +1,9 @@ -{ stdenv, fetchurl, cmake, readline }: +{ lib, stdenv, fetchurl, cmake, readline }: stdenv.mkDerivation rec { pname = "tasksh"; version = "1.2.0"; - enableParallelBuilding = true; - src = fetchurl { url = "https://taskwarrior.org/download/${pname}-${version}.tar.gz"; sha256 = "1z8zw8lld62fjafjvy248dncjk0i4fwygw0ahzjdvyyppx4zjhkf"; @@ -14,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ readline ]; nativeBuildInputs = [ cmake ]; - meta = with stdenv.lib; { + meta = with lib; { description = "REPL for taskwarrior"; homepage = "http://tasktools.org"; license = licenses.mit; diff --git a/pkgs/applications/misc/taskwarrior-tui/default.nix b/pkgs/applications/misc/taskwarrior-tui/default.nix new file mode 100644 index 000000000000..ae730d597ce7 --- /dev/null +++ b/pkgs/applications/misc/taskwarrior-tui/default.nix @@ -0,0 +1,28 @@ +{ lib, stdenv +, rustPlatform +, fetchFromGitHub +}: + +rustPlatform.buildRustPackage rec { + pname = "taskwarrior-tui"; + version = "0.9.5"; + + src = fetchFromGitHub { + owner = "kdheepak"; + repo = "taskwarrior-tui"; + rev = "v${version}"; + sha256 = "1348ypjphm5f46civbrcxbbahwwl2j47z1hg8ndq1cg2bh5wb8kg"; + }; + + # Because there's a test that requires terminal access + doCheck = false; + + cargoSha256 = "11zpy3whzir9mlbvf0jyscqwj9z44a6s5i1bc2cnxyciqy9b57md"; + + meta = with lib; { + description = "A terminal user interface for taskwarrior "; + homepage = "https://github.com/kdheepak/taskwarrior-tui"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ matthiasbeyer ]; + }; +} diff --git a/pkgs/applications/misc/taskwarrior/default.nix b/pkgs/applications/misc/taskwarrior/default.nix index e18b8d697fd8..b3f26c87c50e 100644 --- a/pkgs/applications/misc/taskwarrior/default.nix +++ b/pkgs/applications/misc/taskwarrior/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, libuuid, gnutls }: +{ lib, stdenv, fetchFromGitHub, cmake, libuuid, gnutls }: stdenv.mkDerivation rec { pname = "taskwarrior"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ln -s "../../../share/doc/task/scripts/zsh/_task" "$out/share/zsh/site-functions/" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Highly flexible command-line tool to manage TODO lists"; homepage = "https://taskwarrior.org"; license = licenses.mit; diff --git a/pkgs/applications/misc/tdrop/default.nix b/pkgs/applications/misc/tdrop/default.nix index f9e2ea34b39e..e8c42ab48d70 100644 --- a/pkgs/applications/misc/tdrop/default.nix +++ b/pkgs/applications/misc/tdrop/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ makeWrapper ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A Glorified WM-Independent Dropdown Creator"; homepage = "https://github.com/noctuid/tdrop"; license = licenses.bsd2; diff --git a/pkgs/applications/misc/tellico/default.nix b/pkgs/applications/misc/tellico/default.nix index fa725ad9c96c..7037b40816ca 100644 --- a/pkgs/applications/misc/tellico/default.nix +++ b/pkgs/applications/misc/tellico/default.nix @@ -42,7 +42,6 @@ mkDerivation rec { ]; buildInputs = [ - cmake exempi extra-cmake-modules karchive diff --git a/pkgs/applications/misc/termdown/default.nix b/pkgs/applications/misc/termdown/default.nix index ad6f9e9382b7..d8bb03138f32 100644 --- a/pkgs/applications/misc/termdown/default.nix +++ b/pkgs/applications/misc/termdown/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , buildPythonApplication , click @@ -20,7 +20,7 @@ buildPythonApplication rec { propagatedBuildInputs = [ dateutil click pyfiglet setuptools ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Starts a countdown to or from TIMESPEC"; longDescription = "Countdown timer and stopwatch in your terminal"; homepage = "https://github.com/trehn/termdown"; diff --git a/pkgs/applications/misc/terminal-parrot/default.nix b/pkgs/applications/misc/terminal-parrot/default.nix index 52116a52fbb7..e3e64cfd68af 100644 --- a/pkgs/applications/misc/terminal-parrot/default.nix +++ b/pkgs/applications/misc/terminal-parrot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "terminal-parrot"; @@ -15,7 +15,7 @@ buildGoModule rec { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Shows colorful, animated party parrot in your terminial"; homepage = "https://github.com/jmhobbs/terminal-parrot"; license = licenses.mit; diff --git a/pkgs/applications/misc/terminal-typeracer/default.nix b/pkgs/applications/misc/terminal-typeracer/default.nix index fa68703e8c0f..9b7adac9a2a9 100644 --- a/pkgs/applications/misc/terminal-typeracer/default.nix +++ b/pkgs/applications/misc/terminal-typeracer/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitLab , rustPlatform , pkg-config @@ -10,21 +10,21 @@ rustPlatform.buildRustPackage rec { pname = "terminal-typeracer"; - version = "2.0.2"; + version = "2.0.4"; src = fetchFromGitLab { owner = "ttyperacer"; repo = pname; rev = "v${version}"; - sha256 = "187xrqxalk2gxa22ki5q092llvliddrsc68cg4dvvy2xzq254jfy"; + sha256 = "RjGHY6KN6thxbg9W5FRwaAmUeD+5/WCeMCvzFHqZ+J4="; }; - cargoSha256 = "0ky8m23fjjbv7fr9776fjczpg0d43jxwnjxjpwz56jpynwnihfkl"; + cargoSha256 = "VSwku0rtQECirCHx2CXe72gCA+p3DdPC4YYwEYu8WfM="; buildInputs = [ openssl sqlite ] ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ]; nativeBuildInputs = [ pkg-config ]; - meta = with stdenv.lib; { + meta = with lib; { description = "An open source terminal based version of Typeracer written in rust"; homepage = "https://gitlab.com/ttyperacer/terminal-typeracer"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/misc/termpdf.py/default.nix b/pkgs/applications/misc/termpdf.py/default.nix index 5988f569109b..2541a17fc201 100644 --- a/pkgs/applications/misc/termpdf.py/default.nix +++ b/pkgs/applications/misc/termpdf.py/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonApplication , fetchFromGitHub , fetchPypi @@ -39,7 +39,7 @@ buildPythonApplication { # upstream doesn't contain tests doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = '' A graphical pdf (and epub, cbz, ...) reader that works inside the kitty terminal. diff --git a/pkgs/applications/misc/thinking-rock/default.nix b/pkgs/applications/misc/thinking-rock/default.nix index 2b5c9da4b17a..3bf3dda7ca4d 100644 --- a/pkgs/applications/misc/thinking-rock/default.nix +++ b/pkgs/applications/misc/thinking-rock/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, runtimeShell }: +{ lib, stdenv, fetchurl, runtimeShell }: stdenv.mkDerivation { name = "thinkingrock-binary-2.2.1"; @@ -32,7 +32,7 @@ stdenv.mkDerivation { installPhase = ":"; - meta = with stdenv.lib; { + meta = with lib; { description = "Task management system"; homepage = "http://www.thinkingrock.com.au/"; license = licenses.cddl; diff --git a/pkgs/applications/misc/tickrs/default.nix b/pkgs/applications/misc/tickrs/default.nix index 754de71f1ae7..ced50748d0f7 100644 --- a/pkgs/applications/misc/tickrs/default.nix +++ b/pkgs/applications/misc/tickrs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, rustPlatform, fetchFromGitHub, perl }: +{ lib, stdenv, rustPlatform, fetchFromGitHub, perl }: rustPlatform.buildRustPackage rec { pname = "tickrs"; @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ perl ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Realtime ticker data in your terminal"; homepage = "https://github.com/tarkah/tickrs"; license = licenses.mit; diff --git a/pkgs/applications/misc/timewarrior/default.nix b/pkgs/applications/misc/timewarrior/default.nix index 7b1d3c302b1d..41dc179efe09 100644 --- a/pkgs/applications/misc/timewarrior/default.nix +++ b/pkgs/applications/misc/timewarrior/default.nix @@ -1,11 +1,9 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "timewarrior"; version = "1.4.2"; - enableParallelBuilding = true; - src = fetchFromGitHub { owner = "GothenburgBitFactory"; repo = "timewarrior"; @@ -16,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A command-line time tracker"; homepage = "https://timewarrior.net"; license = licenses.mit; diff --git a/pkgs/applications/misc/tint2/default.nix b/pkgs/applications/misc/tint2/default.nix index 326dd3c0d92a..c78fe9afeda4 100644 --- a/pkgs/applications/misc/tint2/default.nix +++ b/pkgs/applications/misc/tint2/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitLab , pkg-config , cmake @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://gitlab.com/o9000/tint2"; description = "Simple panel/taskbar unintrusive and light (memory, cpu, aestetic)"; license = licenses.gpl2; diff --git a/pkgs/applications/misc/tipp10/default.nix b/pkgs/applications/misc/tipp10/default.nix index 689c5aa3a9ef..0658b43626ed 100644 --- a/pkgs/applications/misc/tipp10/default.nix +++ b/pkgs/applications/misc/tipp10/default.nix @@ -1,4 +1,4 @@ -{ cmake, stdenv, mkDerivation, fetchFromGitLab, +{ cmake, lib, stdenv, mkDerivation, fetchFromGitLab, qtmultimedia, qttools, ... }: mkDerivation rec { @@ -15,7 +15,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake qttools ]; buildInputs = [ qtmultimedia ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Learn and train typing with the ten-finger system"; homepage = "https://gitlab.com/a_a/tipp10"; license = licenses.gpl2; diff --git a/pkgs/applications/misc/tippecanoe/default.nix b/pkgs/applications/misc/tippecanoe/default.nix index 455876a772b4..9aeb726e5c2c 100644 --- a/pkgs/applications/misc/tippecanoe/default.nix +++ b/pkgs/applications/misc/tippecanoe/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, sqlite, zlib, perl }: +{ lib, stdenv, fetchFromGitHub, sqlite, zlib, perl }: stdenv.mkDerivation rec { pname = "tippecanoe"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Build vector tilesets from large collections of GeoJSON features"; homepage = "https://github.com/mapbox/tippecanoe"; license = licenses.bsd2; diff --git a/pkgs/applications/misc/tiramisu/default.nix b/pkgs/applications/misc/tiramisu/default.nix index e5cc9a1c1783..79286ff10c3c 100644 --- a/pkgs/applications/misc/tiramisu/default.nix +++ b/pkgs/applications/misc/tiramisu/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkg-config, glib }: +{ lib, stdenv, fetchFromGitHub, pkg-config, glib }: stdenv.mkDerivation rec { pname = "tiramisu"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Desktop notifications, the UNIX way"; longDescription = '' tiramisu is a notification daemon based on dunst that outputs notifications diff --git a/pkgs/applications/misc/tiv/default.nix b/pkgs/applications/misc/tiv/default.nix index 3790a9fdd069..1ee176166ea4 100644 --- a/pkgs/applications/misc/tiv/default.nix +++ b/pkgs/applications/misc/tiv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, imagemagick }: +{ lib, stdenv, fetchFromGitHub, imagemagick }: stdenv.mkDerivation rec { pname = "tiv"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { preConfigure = "cd src/main/cpp"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/stefanhaustein/TerminalImageViewer"; description = "Small C++ program to display images in a (modern) terminal using RGB ANSI codes and unicode block graphics characters"; license = licenses.asl20; diff --git a/pkgs/applications/misc/tnef/default.nix b/pkgs/applications/misc/tnef/default.nix index 40505c4fdbea..65e07915c760 100644 --- a/pkgs/applications/misc/tnef/default.nix +++ b/pkgs/applications/misc/tnef/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { version = "1.4.18"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Unpacks MIME attachments of type application/ms-tnef"; longDescription = '' TNEF is a program for unpacking MIME attachments of type "application/ms-tnef". This is a Microsoft only attachment. diff --git a/pkgs/applications/misc/todiff/default.nix b/pkgs/applications/misc/todiff/default.nix index 431f922eeeec..bc172c9b49fb 100644 --- a/pkgs/applications/misc/todiff/default.nix +++ b/pkgs/applications/misc/todiff/default.nix @@ -1,4 +1,4 @@ -{ stdenv, rustPlatform, fetchFromGitHub }: +{ lib, stdenv, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "todiff"; @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { checkPhase = "cargo test --features=integration_tests"; - meta = with stdenv.lib; { + meta = with lib; { description = "Human-readable diff for todo.txt files"; homepage = "https://github.com/Ekleog/todiff"; maintainers = with maintainers; [ ekleog ]; diff --git a/pkgs/applications/misc/todolist/default.nix b/pkgs/applications/misc/todolist/default.nix deleted file mode 100644 index 669c06a9480e..000000000000 --- a/pkgs/applications/misc/todolist/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: - -buildGoPackage rec { - pname = "todolist"; - version = "v0.8.1"; - - goPackagePath = "github.com/gammons/todolist"; - - src = fetchFromGitHub { - owner = "gammons"; - repo = "todolist"; - rev = version; - sha256 = "0dazfymby5xm4482p9cyj23djmkz5q7g79cqm2d85mczvz7vks8p"; - }; - - meta = with stdenv.lib; { - description = "Simple GTD-style todo list for the command line"; - homepage = "http://todolist.site"; - license = licenses.mit; - maintainers = with maintainers; [ uvnikita ]; - }; -} diff --git a/pkgs/applications/misc/tomboy/default.nix b/pkgs/applications/misc/tomboy/default.nix index ff4faf139e6c..b87d52fa6286 100644 --- a/pkgs/applications/misc/tomboy/default.nix +++ b/pkgs/applications/misc/tomboy/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation { --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ glib gtk-sharp-2_0 gtk-sharp-2_0.gtk gnome2.GConf ]} ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://wiki.gnome.org/Apps/Tomboy"; description = "A simple note-taking application with synchronization"; platforms = platforms.linux; diff --git a/pkgs/applications/misc/toot/default.nix b/pkgs/applications/misc/toot/default.nix index f46af56ed45f..d992d9cdc410 100644 --- a/pkgs/applications/misc/toot/default.nix +++ b/pkgs/applications/misc/toot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python3Packages }: +{ lib, stdenv, fetchFromGitHub, python3Packages }: python3Packages.buildPythonApplication rec { version = "0.27.0"; @@ -20,7 +20,7 @@ python3Packages.buildPythonApplication rec { py.test ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Mastodon CLI interface"; homepage = "https://github.com/ihabunek/toot"; license = licenses.gpl3; diff --git a/pkgs/applications/misc/tootle/default.nix b/pkgs/applications/misc/tootle/default.nix index 9c6008b79349..70568f92383f 100644 --- a/pkgs/applications/misc/tootle/default.nix +++ b/pkgs/applications/misc/tootle/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , nix-update-script , fetchpatch @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Simple Mastodon client designed for elementary OS"; homepage = "https://github.com/bleakgrey/tootle"; license = licenses.gpl3; diff --git a/pkgs/applications/misc/topydo/default.nix b/pkgs/applications/misc/topydo/default.nix index 6db651ff3929..4ff3090d1f85 100644 --- a/pkgs/applications/misc/topydo/default.nix +++ b/pkgs/applications/misc/topydo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python3Packages, fetchFromGitHub, glibcLocales }: +{ lib, stdenv, python3Packages, fetchFromGitHub, glibcLocales }: with python3Packages; @@ -33,7 +33,7 @@ buildPythonApplication rec { LC_ALL="en_US.UTF-8"; - meta = with stdenv.lib; { + meta = with lib; { description = "A cli todo application compatible with the todo.txt format"; homepage = "https://github.com/bram85/topydo"; license = licenses.gpl3; diff --git a/pkgs/applications/misc/translate-shell/default.nix b/pkgs/applications/misc/translate-shell/default.nix index 62e66055a2f9..94dc46560270 100644 --- a/pkgs/applications/misc/translate-shell/default.nix +++ b/pkgs/applications/misc/translate-shell/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, makeWrapper, curl, fribidi, rlwrap, gawk, groff, ncurses }: +{ lib, stdenv, fetchFromGitHub, makeWrapper, curl, fribidi, rlwrap, gawk, groff, ncurses }: stdenv.mkDerivation rec { pname = "translate-shell"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ]} ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.soimort.org/translate-shell"; description = "Command-line translator using Google Translate, Bing Translator, Yandex.Translate, and Apertium"; license = licenses.unlicense; diff --git a/pkgs/applications/misc/tthsum/default.nix b/pkgs/applications/misc/tthsum/default.nix index 792b80d04629..7db743559a4e 100644 --- a/pkgs/applications/misc/tthsum/default.nix +++ b/pkgs/applications/misc/tthsum/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "tthsum"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { doCheck = !stdenv.isDarwin; - meta = with stdenv.lib; { + meta = with lib; { description = "An md5sum-alike program that works with Tiger/THEX hashes"; longDescription = '' tthsum generates or checks TTH checksums (root of the THEX hash diff --git a/pkgs/applications/misc/tty-share/default.nix b/pkgs/applications/misc/tty-share/default.nix index a9fcb969f675..be9a0bafcc62 100644 --- a/pkgs/applications/misc/tty-share/default.nix +++ b/pkgs/applications/misc/tty-share/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: # Upstream has a `./vendor` directory with all deps which we rely upon. buildGoPackage rec { @@ -14,7 +14,7 @@ buildGoPackage rec { goPackagePath = "github.com/elisescu/tty-share"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://tty-share.com"; description = "Share terminal via browser for remote work or shared sessions"; platforms = platforms.linux; diff --git a/pkgs/applications/misc/tty-solitaire/default.nix b/pkgs/applications/misc/tty-solitaire/default.nix index 00e6efb713e5..9b2fcf3d17a1 100644 --- a/pkgs/applications/misc/tty-solitaire/default.nix +++ b/pkgs/applications/misc/tty-solitaire/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ncurses }: +{ lib, stdenv, fetchFromGitHub, ncurses }: stdenv.mkDerivation rec { pname = "tty-solitaire"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { makeFlags = [ "CC=cc" "PREFIX=${placeholder "out"}" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Klondike Solitaire in your ncurses terminal"; license = licenses.mit; homepage = "https://github.com/mpereira/tty-solitaire"; diff --git a/pkgs/applications/misc/tut/default.nix b/pkgs/applications/misc/tut/default.nix index d65e894417e6..1fa3e9b7883a 100644 --- a/pkgs/applications/misc/tut/default.nix +++ b/pkgs/applications/misc/tut/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "tut"; @@ -14,7 +14,7 @@ buildGoPackage rec { sha256 = "1l7lc6cjx97v9zhc0b6lfzqjmyv1i3qj83drkck36if3mc60vvwi"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A TUI for Mastodon with vim inspired keys"; homepage = "https://github.com/RasmusLindroth/tut"; license = licenses.mit; diff --git a/pkgs/applications/misc/tvbrowser/bin.nix b/pkgs/applications/misc/tvbrowser/bin.nix index 68d25e4e3de7..fa08b5f555a7 100644 --- a/pkgs/applications/misc/tvbrowser/bin.nix +++ b/pkgs/applications/misc/tvbrowser/bin.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, jre, makeDesktopItem }: +{ lib, stdenv, fetchurl, makeWrapper, jre, makeDesktopItem }: let desktopItem = makeDesktopItem { @@ -46,7 +46,7 @@ in stdenv.mkDerivation rec { --run "cd $out/share/java/${pname}" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Electronic TV Program Guide"; homepage = "https://www.tvbrowser.org/"; license = licenses.gpl3; diff --git a/pkgs/applications/misc/tzupdate/default.nix b/pkgs/applications/misc/tzupdate/default.nix index 8a18948da244..3873f8d248eb 100644 --- a/pkgs/applications/misc/tzupdate/default.nix +++ b/pkgs/applications/misc/tzupdate/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python3 }: +{ lib, stdenv, python3 }: let inherit (python3.pkgs) buildPythonApplication fetchPypi requests; @@ -14,7 +14,7 @@ buildPythonApplication rec { propagatedBuildInputs = [ requests ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Update timezone information based on geoip"; homepage = "https://github.com/cdown/tzupdate"; maintainers = [ maintainers.michaelpj ]; diff --git a/pkgs/applications/misc/udiskie/default.nix b/pkgs/applications/misc/udiskie/default.nix index a6efc492d8a3..e2178850da1c 100644 --- a/pkgs/applications/misc/udiskie/default.nix +++ b/pkgs/applications/misc/udiskie/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, asciidoc-full, gettext +{ lib, stdenv, fetchFromGitHub, asciidoc-full, gettext , gobject-introspection, gtk3, libappindicator-gtk3, libnotify, librsvg , udisks2, wrapGAppsHook , python3Packages @@ -53,7 +53,7 @@ python3Packages.buildPythonApplication rec { nosetests ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Removable disk automounter for udisks"; license = licenses.mit; homepage = "https://github.com/coldfix/udiskie"; diff --git a/pkgs/applications/misc/ulauncher/default.nix b/pkgs/applications/misc/ulauncher/default.nix index d2522360a753..117d9dc6aa7b 100644 --- a/pkgs/applications/misc/ulauncher/default.nix +++ b/pkgs/applications/misc/ulauncher/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , nix-update-script , python3Packages @@ -110,7 +110,7 @@ python3Packages.buildPythonApplication rec { }; - meta = with stdenv.lib; { + meta = with lib; { description = "A fast application launcher for Linux, written in Python, using GTK"; homepage = "https://ulauncher.io/"; license = licenses.gpl3; diff --git a/pkgs/applications/misc/ultralist/default.nix b/pkgs/applications/misc/ultralist/default.nix new file mode 100644 index 000000000000..2943fe29f4a0 --- /dev/null +++ b/pkgs/applications/misc/ultralist/default.nix @@ -0,0 +1,22 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "ultralist"; + version = "1.5.1"; + + src = fetchFromGitHub { + owner = "ultralist"; + repo = "ultralist"; + rev = version; + sha256 = "09kgf83jn5k35lyrnyzbsy0l1livzmy292qmlbx5dkdpaq5wxnmp"; + }; + + vendorSha256 = null; + + meta = with lib; { + description = "Simple GTD-style todo list for the command line"; + homepage = "https://ultralist.io"; + license = licenses.mit; + maintainers = with maintainers; [ uvnikita ]; + }; +} diff --git a/pkgs/applications/misc/upwork/default.nix b/pkgs/applications/misc/upwork/default.nix index 18c2bc129ccc..136c4c2745a8 100644 --- a/pkgs/applications/misc/upwork/default.nix +++ b/pkgs/applications/misc/upwork/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, dpkg, wrapGAppsHook, autoPatchelfHook, writeShellScript +{ lib, stdenv, fetchurl, dpkg, wrapGAppsHook, autoPatchelfHook, writeShellScript , alsaLib, atk, at-spi2-atk, at-spi2-core, cairo, cups, dbus, expat, fontconfig, freetype , gdk-pixbuf, glib, gtk3, libnotify, libX11, libXcomposite, libXcursor, libXdamage, libuuid , libXext, libXfixes, libXi, libXrandr, libXrender, libXtst, nspr, nss, libxcb @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { --prefix LD_LIBRARY_PATH : ${libPath} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Online freelancing platform desktop application for time tracking"; homepage = "https://www.upwork.com/ab/downloads/"; license = licenses.unfree; diff --git a/pkgs/applications/misc/urlscan/default.nix b/pkgs/applications/misc/urlscan/default.nix index c5edd9133b7d..3e97088371ac 100644 --- a/pkgs/applications/misc/urlscan/default.nix +++ b/pkgs/applications/misc/urlscan/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python3Packages, fetchFromGitHub }: +{ lib, stdenv, python3Packages, fetchFromGitHub }: python3Packages.buildPythonApplication rec { pname = "urlscan"; @@ -15,7 +15,7 @@ python3Packages.buildPythonApplication rec { doCheck = false; # No tests available - meta = with stdenv.lib; { + meta = with lib; { description = "Mutt and terminal url selector (similar to urlview)"; homepage = "https://github.com/firecat53/urlscan"; license = licenses.gpl2; diff --git a/pkgs/applications/misc/urlview/default.nix b/pkgs/applications/misc/urlview/default.nix index 6430a1bc7196..0374fb91844d 100644 --- a/pkgs/applications/misc/urlview/default.nix +++ b/pkgs/applications/misc/urlview/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, autoreconfHook }: +{ lib, stdenv, fetchurl, ncurses, autoreconfHook }: stdenv.mkDerivation rec { version = "0.9"; @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { patchShebangs $out/etc/urlview ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Extract URLs from text"; homepage = "https://packages.qa.debian.org/u/urlview.html"; license = licenses.gpl2; diff --git a/pkgs/applications/misc/usync/default.nix b/pkgs/applications/misc/usync/default.nix index 9234d8ad202a..8ab2a485a649 100644 --- a/pkgs/applications/misc/usync/default.nix +++ b/pkgs/applications/misc/usync/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, scsh, rsync, unison }: +{ lib, stdenv, fetchFromGitHub, scsh, rsync, unison }: stdenv.mkDerivation rec { pname = "usync"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { substituteInPlace $out/bin/$pname --replace "(unison " "(${unison}/bin/unison " ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/ebzzry/usync"; description = "A simple site-to-site synchronization tool"; license = licenses.mit; diff --git a/pkgs/applications/misc/verbiste/default.nix b/pkgs/applications/misc/verbiste/default.nix index a322756c157f..be354d60dc42 100644 --- a/pkgs/applications/misc/verbiste/default.nix +++ b/pkgs/applications/misc/verbiste/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libgnomeui, libxml2 }: +{ lib, stdenv, fetchurl, pkgconfig, libgnomeui, libxml2 }: stdenv.mkDerivation rec { pname = "verbiste"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://sarrazip.com/dev/verbiste.html"; description = "French and Italian verb conjugator"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/misc/vifm/default.nix b/pkgs/applications/misc/vifm/default.nix index 2c388e58fe11..64f0f6b7f5f7 100644 --- a/pkgs/applications/misc/vifm/default.nix +++ b/pkgs/applications/misc/vifm/default.nix @@ -31,7 +31,7 @@ in stdenv.mkDerivation rec { ${if mediaSupport then wrapVifmMedia else ""} ''; - meta = with stdenv.lib; { + meta = with lib; { description = ''A vi-like file manager${if isFullPackage then "; Includes support for optional features" else ""}''; maintainers = with maintainers; [ raskin ]; platforms = if mediaSupport then platforms.linux else platforms.unix; diff --git a/pkgs/applications/misc/viking/default.nix b/pkgs/applications/misc/viking/default.nix index 03d3256e375a..4e002d92ec5e 100644 --- a/pkgs/applications/misc/viking/default.nix +++ b/pkgs/applications/misc/viking/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchpatch, stdenv, makeWrapper +{ fetchurl, fetchpatch, lib, stdenv, makeWrapper , pkgconfig, intltool, gettext, gtk2, expat, curl , gpsd, bc, file, gnome-doc-utils, libexif, libxml2, libxslt, scrollkeeper , docbook_xml_dtd_412, gexiv2, gpsbabel, expect @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { --prefix PATH : "${expect}/bin" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "GPS data editor and analyzer"; longDescription = '' Viking is a free/open source program to manage GPS data. You diff --git a/pkgs/applications/misc/visidata/default.nix b/pkgs/applications/misc/visidata/default.nix index 450be72a28cb..2d0a55983430 100644 --- a/pkgs/applications/misc/visidata/default.nix +++ b/pkgs/applications/misc/visidata/default.nix @@ -15,13 +15,13 @@ }: buildPythonApplication rec { pname = "visidata"; - version = "2.1"; + version = "2.1.1"; src = fetchFromGitHub { owner = "saulpw"; repo = "visidata"; rev = "v${version}"; - sha256 = "1psb3ycrb7k00b5blg9zr52bzdxs1mkdc7rpjn4m9kh09yfs3sx4"; + sha256 = "018z06bfcw0l4k2zdwbgxna9fss4wdqj64ckw5qjis14sb3zkr28"; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/misc/volnoti/default.nix b/pkgs/applications/misc/volnoti/default.nix index 845bdae6bec7..c565bfe0ce3a 100644 --- a/pkgs/applications/misc/volnoti/default.nix +++ b/pkgs/applications/misc/volnoti/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch +{ lib, stdenv, fetchFromGitHub, fetchpatch , pkgconfig, dbus, gdk-pixbuf, glib, libX11, gtk2, librsvg , dbus-glib, autoreconfHook, wrapGAppsHook }: @@ -28,7 +28,7 @@ stdenv.mkDerivation { dbus gdk-pixbuf glib libX11 gtk2 dbus-glib librsvg ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Lightweight volume notification for Linux"; homepage = "https://github.com/davidbrazdil/volnoti"; license = licenses.gpl3; diff --git a/pkgs/applications/misc/vp/default.nix b/pkgs/applications/misc/vp/default.nix index 8bebed45fc41..d133331a0a7b 100644 --- a/pkgs/applications/misc/vp/default.nix +++ b/pkgs/applications/misc/vp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, SDL, SDL_image }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, SDL, SDL_image }: stdenv.mkDerivation rec { pname = "vp"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE="-I${SDL}/include/SDL -I${SDL_image}/include/SDL"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://brlcad.org/~erik/"; description = "SDL based picture viewer/slideshow"; platforms = platforms.unix; diff --git a/pkgs/applications/misc/vym/default.nix b/pkgs/applications/misc/vym/default.nix index ce45471c2f02..d198a15c2526 100644 --- a/pkgs/applications/misc/vym/default.nix +++ b/pkgs/applications/misc/vym/default.nix @@ -1,4 +1,4 @@ -{ stdenv, mkDerivation, fetchurl, pkgconfig, qmake, qtscript, qtsvg }: +{ lib, stdenv, mkDerivation, fetchurl, pkgconfig, qmake, qtscript, qtsvg }: mkDerivation rec { pname = "vym"; @@ -41,7 +41,7 @@ mkDerivation rec { dontGzipMan = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A mind-mapping software"; longDescription = '' VYM (View Your Mind) is a tool to generate and manipulate maps which show your thoughts. diff --git a/pkgs/applications/misc/waybar/default.nix b/pkgs/applications/misc/waybar/default.nix index 11a4b1a51aad..3bb96d7a7576 100644 --- a/pkgs/applications/misc/waybar/default.nix +++ b/pkgs/applications/misc/waybar/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, meson, pkgconfig, ninja, wrapGAppsHook +{ lib, stdenv, fetchFromGitHub, meson, pkgconfig, ninja, wrapGAppsHook , wayland, wlroots, gtkmm3, libsigcxx, jsoncpp, fmt, scdoc, spdlog, gtk-layer-shell , howard-hinnant-date, cmake , traySupport ? true, libdbusmenu-gtk3 @@ -61,7 +61,7 @@ --prefix PYTHONPATH : "$PYTHONPATH:$out/${python3.sitePackages}" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Highly customizable Wayland bar for Sway and Wlroots based compositors"; license = licenses.mit; maintainers = with maintainers; [ FlorianFranzen minijackson synthetica ]; diff --git a/pkgs/applications/misc/wcalc/default.nix b/pkgs/applications/misc/wcalc/default.nix index 94c56ba5439c..7541b759e06c 100644 --- a/pkgs/applications/misc/wcalc/default.nix +++ b/pkgs/applications/misc/wcalc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, mpfr, readline }: +{ lib, stdenv, fetchurl, mpfr, readline }: stdenv.mkDerivation rec { pname = "wcalc"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ mpfr readline ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A command line calculator"; homepage = "http://w-calc.sourceforge.net"; license = licenses.gpl2; diff --git a/pkgs/applications/misc/weather/default.nix b/pkgs/applications/misc/weather/default.nix index 7894bc2f5e4c..bd5a117f0f43 100644 --- a/pkgs/applications/misc/weather/default.nix +++ b/pkgs/applications/misc/weather/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pythonPackages, installShellFiles }: +{ lib, stdenv, fetchurl, pythonPackages, installShellFiles }: stdenv.mkDerivation rec { version = "2.4.1"; @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { installManPage weather.1 weatherrc.5 ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://fungi.yuggoth.org/weather"; description = "Quick access to current weather conditions and forecasts"; license = licenses.isc; diff --git a/pkgs/applications/misc/web-media-controller/default.nix b/pkgs/applications/misc/web-media-controller/default.nix index b2a3394f8aec..ccd1e2299022 100644 --- a/pkgs/applications/misc/web-media-controller/default.nix +++ b/pkgs/applications/misc/web-media-controller/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, glib, pcre, json-glib }: +{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, glib, pcre, json-glib }: stdenv.mkDerivation rec { pname = "wmc-mpris"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { "-DFIREFOX_MANIFEST_DESTINATION=${placeholder "out"}/lib/mozilla/native-messaging-hosts" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/f1u77y/wmc-mpris"; description = "MPRIS proxy for usage with 'Web Media Controller' web extension"; license = licenses.unlicense; diff --git a/pkgs/applications/misc/worker/default.nix b/pkgs/applications/misc/worker/default.nix index b19b1b86cf57..12ac72b6021a 100644 --- a/pkgs/applications/misc/worker/default.nix +++ b/pkgs/applications/misc/worker/default.nix @@ -1,4 +1,4 @@ -{ stdenv, libX11, fetchurl }: +{ lib, stdenv, libX11, fetchurl }: stdenv.mkDerivation rec { pname = "worker"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ libX11 ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A two-pane file manager with advanced file manipulation features"; homepage = "http://www.boomerangsworld.de/cms/worker/index.html"; license = licenses.gpl2; diff --git a/pkgs/applications/misc/workrave/default.nix b/pkgs/applications/misc/workrave/default.nix index b0020b64eded..aa769e7d8ee3 100644 --- a/pkgs/applications/misc/workrave/default.nix +++ b/pkgs/applications/misc/workrave/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, wrapGAppsHook +{ lib, stdenv, fetchFromGitHub, wrapGAppsHook , autoconf, autoconf-archive, automake, gettext, intltool, libtool, pkgconfig , libICE, libSM, libXScrnSaver, libXtst, cheetah , gobject-introspection, glib, glibmm, gtkmm3, atk, pango, pangomm, cairo @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A program to help prevent Repetitive Strain Injury"; longDescription = '' Workrave is a program that assists in the recovery and prevention of diff --git a/pkgs/applications/misc/xastir/default.nix b/pkgs/applications/misc/xastir/default.nix index 84e4eee2bddc..63240e0402fe 100644 --- a/pkgs/applications/misc/xastir/default.nix +++ b/pkgs/applications/misc/xastir/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook +{ lib, stdenv, fetchFromGitHub, autoreconfHook , curl, db, libgeotiff , libXpm, libXt, motif, pcre , perl, proj, rastermagick, shapelib @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { postPatch = "patchShebangs ."; - meta = with stdenv.lib; { + meta = with lib; { description = "Graphical APRS client"; homepage = "https://xastir.org"; license = licenses.gpl2; diff --git a/pkgs/applications/misc/xautoclick/default.nix b/pkgs/applications/misc/xautoclick/default.nix index f259b28131db..641d3b4e20cd 100644 --- a/pkgs/applications/misc/xautoclick/default.nix +++ b/pkgs/applications/misc/xautoclick/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, xorg, pkg-config +{ lib, stdenv, fetchFromGitHub, xorg, pkg-config , cmake, libevdev , gtkSupport ? true, gtk3, pcre, glib, wrapGAppsHook , fltkSupport ? true, fltk @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optionals fltkSupport [ fltk ] ++ stdenv.lib.optionals qtSupport [ qt5.qtbase qt5.wrapQtAppsHook ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Autoclicker application, which enables you to automatically click the left mousebutton"; homepage = "https://github.com/qarkai/xautoclick"; license = licenses.gpl2; diff --git a/pkgs/applications/misc/xbattbar/default.nix b/pkgs/applications/misc/xbattbar/default.nix index 0864e24f8c9d..93f5d1c2279c 100644 --- a/pkgs/applications/misc/xbattbar/default.nix +++ b/pkgs/applications/misc/xbattbar/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, libX11, perl, ... }: +{ lib, stdenv, fetchgit, libX11, perl, ... }: stdenv.mkDerivation rec { pname = "xbattbar"; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { install -m 0755 xbattbar-check-sys $out/libexec/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Display battery status in X11"; homepage = "https://salsa.debian.org/debian/xbattbar"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/misc/xchm/default.nix b/pkgs/applications/misc/xchm/default.nix index fb1b59ed01fa..f3764ce60f3f 100644 --- a/pkgs/applications/misc/xchm/default.nix +++ b/pkgs/applications/misc/xchm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, wxGTK30, chmlib }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, wxGTK30, chmlib }: stdenv.mkDerivation rec { pname = "xchm"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { export LDFLAGS="$LDFLAGS $(${wxGTK30}/bin/wx-config --libs | sed -e s@-pthread@@) -lwx_gtk2u_aui-3.0" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A viewer for Microsoft HTML Help files"; homepage = "https://github.com/rzvncj/xCHM"; license = licenses.gpl2; diff --git a/pkgs/applications/misc/xcruiser/default.nix b/pkgs/applications/misc/xcruiser/default.nix index 80a1ced563f8..2e4771563a04 100644 --- a/pkgs/applications/misc/xcruiser/default.nix +++ b/pkgs/applications/misc/xcruiser/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gccmakedep, imake, libXt, libXaw, libXpm, libXext }: +{ lib, stdenv, fetchurl, gccmakedep, imake, libXt, libXaw, libXpm, libXext }: stdenv.mkDerivation { name = "xcruiser-0.30"; @@ -16,7 +16,7 @@ stdenv.mkDerivation { "XAPPLOADDIR=$(out)/etc/X11/app-defaults" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Filesystem visualization utility"; longDescription = '' XCruiser, formerly known as XCruise, is a filesystem visualization utility. diff --git a/pkgs/applications/misc/xdgmenumaker/default.nix b/pkgs/applications/misc/xdgmenumaker/default.nix index b4d821e1deb1..c1af7ae373c6 100644 --- a/pkgs/applications/misc/xdgmenumaker/default.nix +++ b/pkgs/applications/misc/xdgmenumaker/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, txt2tags, python3Packages, glib, gobject-introspection, wrapGAppsHook }: +{ lib, stdenv, fetchFromGitHub, txt2tags, python3Packages, glib, gobject-introspection, wrapGAppsHook }: python3Packages.buildPythonApplication rec { pname = "xdgmenumaker"; @@ -38,7 +38,7 @@ python3Packages.buildPythonApplication rec { "DESTDIR=" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Command line tool that generates XDG menus for several window managers"; homepage = "https://github.com/gapan/xdgmenumaker"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/misc/xdragon/default.nix b/pkgs/applications/misc/xdragon/default.nix index 74f1f755ec8a..39f291a88493 100644 --- a/pkgs/applications/misc/xdragon/default.nix +++ b/pkgs/applications/misc/xdragon/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkg-config, gtk3 }: +{ lib, stdenv, fetchFromGitHub, pkg-config, gtk3 }: stdenv.mkDerivation rec { pname = "xdragon"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ln -s $out/bin/dragon $out/bin/xdragon ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Simple drag-and-drop source/sink for X (called dragon in upstream)"; homepage = "https://github.com/mwh/dragon"; license = licenses.gpl3; diff --git a/pkgs/applications/misc/xiphos/default.nix b/pkgs/applications/misc/xiphos/default.nix index a51cc18bc740..efdd7f2b0f15 100644 --- a/pkgs/applications/misc/xiphos/default.nix +++ b/pkgs/applications/misc/xiphos/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig +{ lib, stdenv, fetchFromGitHub, pkgconfig , python , intltool , docbook2x, docbook_xml_dtd_412, libxslt @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { wafConfigureFlags = [ "--enable-webkit2" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A GTK Bible study tool"; longDescription = '' Xiphos (formerly known as GnomeSword) is a Bible study tool diff --git a/pkgs/applications/misc/xkbd/default.nix b/pkgs/applications/misc/xkbd/default.nix index cbca2a33d59e..173ea71fe407 100644 --- a/pkgs/applications/misc/xkbd/default.nix +++ b/pkgs/applications/misc/xkbd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, freetype, libXrender, libXft, xorgproto +{ lib, stdenv, fetchFromGitHub, freetype, libXrender, libXft, xorgproto , xinput, libXi, libXext, libXtst, libXpm, libX11, autoreconfHook }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/mahatma-kaganovich/xkbd"; description = "onscreen soft keyboard for X11"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/misc/xkblayout-state/default.nix b/pkgs/applications/misc/xkblayout-state/default.nix index 296d6f38db64..4d1dd54bba6c 100644 --- a/pkgs/applications/misc/xkblayout-state/default.nix +++ b/pkgs/applications/misc/xkblayout-state/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qt4 }: +{ lib, stdenv, fetchurl, qt4 }: stdenv.mkDerivation rec { pname = "xkblayout-state"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { cp xkblayout-state $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A small command-line program to get/set the current XKB keyboard layout"; homepage = "https://github.com/nonpop/xkblayout-state"; license = licenses.gpl2; diff --git a/pkgs/applications/misc/xkbmon/default.nix b/pkgs/applications/misc/xkbmon/default.nix index 1e6384c7d576..cd7037872cb7 100644 --- a/pkgs/applications/misc/xkbmon/default.nix +++ b/pkgs/applications/misc/xkbmon/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libX11 }: +{ lib, stdenv, fetchFromGitHub, libX11 }: stdenv.mkDerivation rec { pname = "xkbmon"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { installPhase = "install -D -t $out/bin xkbmon"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/xkbmon/xkbmon"; description = "Command-line keyboard layout monitor for X11"; license = licenses.mit; diff --git a/pkgs/applications/misc/xmenu/default.nix b/pkgs/applications/misc/xmenu/default.nix index e84f95e09981..f29bfcb55fe1 100644 --- a/pkgs/applications/misc/xmenu/default.nix +++ b/pkgs/applications/misc/xmenu/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, imlib2, libX11, libXft, libXinerama }: +{ lib, stdenv, fetchFromGitHub, imlib2, libX11, libXft, libXinerama }: stdenv.mkDerivation rec { pname = "xmenu"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { postPatch = "sed -i \"s:/usr/local:$out:\" config.mk"; - meta = with stdenv.lib; { + meta = with lib; { description = "A menu utility for X"; homepage = "https://github.com/phillbush/xmenu"; license = licenses.mit; diff --git a/pkgs/applications/misc/xmind/default.nix b/pkgs/applications/misc/xmind/default.nix index 3e729af71fe5..7629b42c877f 100644 --- a/pkgs/applications/misc/xmind/default.nix +++ b/pkgs/applications/misc/xmind/default.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { ln -s ${jre} $out/libexec/jre ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Mind-mapping software"; longDescription = '' XMind is a mind mapping and brainstorming software. In addition diff --git a/pkgs/applications/misc/xneur/default.nix b/pkgs/applications/misc/xneur/default.nix index e75055e92b80..9c3795ef394d 100644 --- a/pkgs/applications/misc/xneur/default.nix +++ b/pkgs/applications/misc/xneur/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, xorg, pcre, gst_all_1, glib +{ lib, stdenv, fetchurl, pkgconfig, intltool, xorg, pcre, gst_all_1, glib , xosd, libnotify, enchant, wrapGAppsHook, gdk-pixbuf }: stdenv.mkDerivation { @@ -25,7 +25,7 @@ stdenv.mkDerivation { sed -e 's@for xosd_dir in@for xosd_dir in ${xosd} @' -i configure ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Utility for switching between keyboard layouts"; homepage = "https://xneur.ru"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/misc/xpad/default.nix b/pkgs/applications/misc/xpad/default.nix index 8944011a8d73..acb1cbf90e36 100644 --- a/pkgs/applications/misc/xpad/default.nix +++ b/pkgs/applications/misc/xpad/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , autoreconfHook, pkgconfig, wrapGAppsHook , glib, intltool, gtk3, gtksourceview }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib intltool gtk3 gtksourceview ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A sticky note application for jotting down things to remember"; homepage = "https://launchpad.net/xpad"; license = licenses.gpl3; diff --git a/pkgs/applications/misc/xpdf/default.nix b/pkgs/applications/misc/xpdf/default.nix index f5ec9b71503e..a6fadcf9d2fd 100644 --- a/pkgs/applications/misc/xpdf/default.nix +++ b/pkgs/applications/misc/xpdf/default.nix @@ -1,7 +1,7 @@ { enableGUI ? true , enablePDFtoPPM ? true , enablePrinting ? true -, stdenv, fetchzip, cmake, makeDesktopItem +, lib, stdenv, fetchzip, cmake, makeDesktopItem , zlib, libpng, cups ? null, freetype ? null , qtbase ? null, qtsvg ? null, wrapQtAppsHook }: @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { install -Dm644 $src/xpdf-qt/xpdf-icon.svg $out/share/pixmaps/xpdf.svg ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.xpdfreader.com"; description = "Viewer for Portable Document Format (PDF) files"; longDescription = '' diff --git a/pkgs/applications/misc/xpdf/libxpdf.nix b/pkgs/applications/misc/xpdf/libxpdf.nix index 7b7d9051ada3..342c00aa12e3 100644 --- a/pkgs/applications/misc/xpdf/libxpdf.nix +++ b/pkgs/applications/misc/xpdf/libxpdf.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl }: stdenv.mkDerivation { @@ -46,7 +46,7 @@ stdenv.mkDerivation { cp -v xpdf/*.h $out/include ''; - meta = with stdenv.lib; { + meta = with lib; { platforms = platforms.unix; license = licenses.gpl2; }; diff --git a/pkgs/applications/misc/xrandr-invert-colors/default.nix b/pkgs/applications/misc/xrandr-invert-colors/default.nix index 9d57b4fcfac0..0d5fbc336ae4 100644 --- a/pkgs/applications/misc/xrandr-invert-colors/default.nix +++ b/pkgs/applications/misc/xrandr-invert-colors/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, libXrandr}: +{ fetchurl, lib, stdenv, libXrandr}: stdenv.mkDerivation rec { version = "0.01"; @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { install xrandr-invert-colors $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Inverts the colors of your screen"; license = stdenv.lib.licenses.gpl3Plus; homepage = "https://github.com/zoltanp/xrandr-invert-colors"; maintainers = [stdenv.lib.maintainers.magnetophon ]; platforms = platforms.linux; - }; + }; } diff --git a/pkgs/applications/misc/xscope/default.nix b/pkgs/applications/misc/xscope/default.nix index 4db034476c7a..d2cc2bf7ad1c 100644 --- a/pkgs/applications/misc/xscope/default.nix +++ b/pkgs/applications/misc/xscope/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libXt }: +{ lib, stdenv, fetchurl, pkgconfig, libXt }: stdenv.mkDerivation rec { pname = "xscope"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libXt ]; - meta = with stdenv.lib; { + meta = with lib; { description = "program to monitor X11/Client conversations"; homepage = "https://cgit.freedesktop.org/xorg/app/xscope/"; license = with licenses; [ mit ]; diff --git a/pkgs/applications/misc/xsuspender/default.nix b/pkgs/applications/misc/xsuspender/default.nix index 02559691f4d1..a5bd8a02ebfe 100644 --- a/pkgs/applications/misc/xsuspender/default.nix +++ b/pkgs/applications/misc/xsuspender/default.nix @@ -19,8 +19,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig makeWrapper ]; buildInputs = [ glib libwnck3 ]; - enableParallelBuilding = true; - postInstall = '' wrapProgram $out/bin/xsuspender \ --prefix PATH : "${makeBinPath [ procps ]}" diff --git a/pkgs/applications/misc/xsw/default.nix b/pkgs/applications/misc/xsw/default.nix index c7c10254c0ca..d20489d37f3e 100644 --- a/pkgs/applications/misc/xsw/default.nix +++ b/pkgs/applications/misc/xsw/default.nix @@ -24,7 +24,7 @@ in stdenv.mkDerivation rec { ./parse.patch # Fixes compilation error by avoiding redundant definitions. ]; - meta = with stdenv.lib; { + meta = with lib; { inherit (src.meta) homepage; description = "A slide show presentation tool"; diff --git a/pkgs/applications/misc/xteddy/default.nix b/pkgs/applications/misc/xteddy/default.nix index 34ec17b0b9a5..717ba66feb86 100644 --- a/pkgs/applications/misc/xteddy/default.nix +++ b/pkgs/applications/misc/xteddy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, pkg-config, xorg, imlib2, makeWrapper }: +{ lib, stdenv, fetchFromGitLab, pkg-config, xorg, imlib2, makeWrapper }: stdenv.mkDerivation rec { pname = "xteddy"; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/xteddy --run "cd $out/share/images/" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Cuddly teddy bear for your X desktop"; homepage = "https://weber.itn.liu.se/~stegu/xteddy/"; license = licenses.gpl2; diff --git a/pkgs/applications/misc/xygrib/default.nix b/pkgs/applications/misc/xygrib/default.nix index e3d22b5d00a6..24f6b22b4e2b 100644 --- a/pkgs/applications/misc/xygrib/default.nix +++ b/pkgs/applications/misc/xygrib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, wrapQtAppsHook, cmake, bzip2, qtbase, qttools, libnova, proj, libpng, openjpeg } : +{ lib, stdenv, fetchFromGitHub, wrapQtAppsHook, cmake, bzip2, qtbase, qttools, libnova, proj, libpng, openjpeg } : stdenv.mkDerivation rec { version = "1.2.6.1"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ln -s $out/XyGrib/XyGrib $out/bin/xygrib ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://opengribs.org"; description = "Weather Forecast Visualization"; longDescription = ''XyGrib is a leading opensource weather visualization package. diff --git a/pkgs/applications/misc/yarssr/default.nix b/pkgs/applications/misc/yarssr/default.nix index 805c708ea00c..93e8f1fc9d75 100644 --- a/pkgs/applications/misc/yarssr/default.nix +++ b/pkgs/applications/misc/yarssr/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation { --set PERL5LIB "${perlPackages.makePerlPath perlDeps}" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/tsyrogit/zxcvbn-c"; description = "A fork of Yarssr (a RSS reader for the GNOME Tray) from http://yarssr.sf.net with various fixes"; license = licenses.gpl1; diff --git a/pkgs/applications/misc/yokadi/default.nix b/pkgs/applications/misc/yokadi/default.nix index 00507d2ee888..ca329521142c 100644 --- a/pkgs/applications/misc/yokadi/default.nix +++ b/pkgs/applications/misc/yokadi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, buildPythonApplication, dateutil, +{ lib, stdenv, fetchurl, buildPythonApplication, dateutil, sqlalchemy, setproctitle, icalendar }: buildPythonApplication rec { @@ -20,7 +20,7 @@ buildPythonApplication rec { # Yokadi doesn't have any tests doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "A command line oriented, sqlite powered, todo-list"; homepage = "https://yokadi.github.io/index.html"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/misc/yubioath-desktop/default.nix b/pkgs/applications/misc/yubioath-desktop/default.nix index 460b34416ff5..22385262a5d4 100644 --- a/pkgs/applications/misc/yubioath-desktop/default.nix +++ b/pkgs/applications/misc/yubioath-desktop/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, mkDerivation +{ lib, stdenv, fetchurl, mkDerivation , qmake, qtbase, qtquickcontrols2, qtgraphicaleffects , python3, pyotherside , pcsclite, yubikey-personalization @@ -51,7 +51,7 @@ mkDerivation rec { --replace 'Icon=yubioath' "Icon=$out/share/yubioath/icons/com.yubico.yubioath.png" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Yubico Authenticator"; longDescription = '' Application for generating Open Authentication (OATH) time-based TOTP and diff --git a/pkgs/applications/misc/zathura/djvu/default.nix b/pkgs/applications/misc/zathura/djvu/default.nix index 954df5301e31..a5ed7ab67812 100644 --- a/pkgs/applications/misc/zathura/djvu/default.nix +++ b/pkgs/applications/misc/zathura/djvu/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig, gtk, zathura_core, girara, djvulibre, gettext }: +{ lib, stdenv, fetchurl, meson, ninja, pkgconfig, gtk, zathura_core, girara, djvulibre, gettext }: stdenv.mkDerivation rec { pname = "zathura-djvu"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { PKG_CONFIG_ZATHURA_PLUGINDIR = "lib/zathura"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://pwmt.org/projects/zathura-djvu/"; description = "A zathura DJVU plugin"; longDescription = '' diff --git a/pkgs/applications/misc/zathura/wrapper.nix b/pkgs/applications/misc/zathura/wrapper.nix index 7cd52e0c74f1..60e3bb9fd535 100644 --- a/pkgs/applications/misc/zathura/wrapper.nix +++ b/pkgs/applications/misc/zathura/wrapper.nix @@ -7,10 +7,19 @@ symlinkJoin { buildInputs = [ makeWrapper ]; - postBuild = '' + postBuild = let + fishCompletion = "share/fish/vendor_completions.d/zathura.fish"; + in '' makeWrapper ${zathura_core.bin}/bin/zathura $out/bin/zathura \ --prefix PATH ":" "${lib.makeBinPath [ file ]}" \ --add-flags --plugins-dir="$out/lib/zathura" + + # zathura fish completion references the zathura_core derivation to + # check for supported plugins which live in the wrapper derivation, + # so we need to fix the path to reference $out instead. + rm "$out/${fishCompletion}" + substitute "${zathura_core.out}/${fishCompletion}" "$out/${fishCompletion}" \ + --replace "${zathura_core.out}" "$out" ''; meta = with lib; { diff --git a/pkgs/applications/misc/zola/default.nix b/pkgs/applications/misc/zola/default.nix index 377260a662db..99699d6e3ccb 100644 --- a/pkgs/applications/misc/zola/default.nix +++ b/pkgs/applications/misc/zola/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchFromGitHub, rustPlatform, cmake, pkg-config, openssl, oniguruma, CoreServices }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, cmake, pkg-config, openssl, oniguruma, CoreServices }: rustPlatform.buildRustPackage rec { pname = "zola"; - version = "0.12.2"; + version = "0.13.0"; src = fetchFromGitHub { owner = "getzola"; repo = pname; rev = "v${version}"; - sha256 = "sha256:0fb227kgani32ljnw73a0h5zn5361z5lraf79y34a0chcby2qv35"; + sha256 = "sha256-yTvFQWmNxoB+CNZLHGmzJq7mKuOUxUqV4g8PWlOlRbM="; }; - cargoSha256 = "sha256:0ilfr32zcajag05qcpwi5ixz250s427i4xrjf4wrk7qy32bblnr5"; + cargoSha256 = "sha256:19vijhcs1i02jhz68acil7psv3pcn0jzi1i4y2l05i4m3ayxivjf"; nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ openssl oniguruma ] @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { -t $out/share/fish/vendor_completions.d ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A fast static site generator with everything built-in"; homepage = "https://www.getzola.org/"; license = licenses.mit; diff --git a/pkgs/applications/misc/zscroll/default.nix b/pkgs/applications/misc/zscroll/default.nix index 402032b5cec3..748bc21ee35f 100644 --- a/pkgs/applications/misc/zscroll/default.nix +++ b/pkgs/applications/misc/zscroll/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python3, python3Packages, fetchFromGitHub }: +{ lib, stdenv, python3, python3Packages, fetchFromGitHub }: let version = "1.0"; in @@ -18,7 +18,7 @@ python3Packages.buildPythonApplication { propagatedBuildInputs = [ python3 ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A text scroller for use with panels and shells"; homepage = "https://github.com/noctuid/zscroll"; license = licenses.bsd2; diff --git a/pkgs/applications/networking/3proxy/default.nix b/pkgs/applications/networking/3proxy/default.nix index a1e54b502289..6636691468ea 100644 --- a/pkgs/applications/networking/3proxy/default.nix +++ b/pkgs/applications/networking/3proxy/default.nix @@ -1,26 +1,27 @@ -{ stdenv, fetchFromGitHub, coreutils }: +{ lib, stdenv, fetchFromGitHub, coreutils }: stdenv.mkDerivation rec { pname = "3proxy"; - version = "0.8.13"; + version = "0.9.3"; + src = fetchFromGitHub { owner = "z3APA3A"; repo = pname; rev = version; - sha256 = "1k5rqldiyakhwhplazlhswkgy3psdkpxhn85605ncwaqx49qy8vk"; + sha256 = "9aopwyz0U2bYTvx5YWLJo9EE8Xfb51IOguHRJodjpm8="; }; + makeFlags = [ + "-f Makefile.Linux" "INSTALL=${coreutils}/bin/install" - "prefix=$(out)" + "DESTDIR=${placeholder "out"}" ]; - preConfigure = '' - ln -s Makefile.Linux Makefile - ''; - meta = with stdenv.lib; { + + meta = with lib; { description = "Tiny free proxy server"; homepage = "https://github.com/z3APA3A/3proxy"; - license = licenses.gpl2; + license = licenses.bsd2; platforms = platforms.linux; - maintainers = [ maintainers.misuzu ]; + maintainers = with maintainers; [ misuzu ]; }; } diff --git a/pkgs/applications/networking/Sylk/default.nix b/pkgs/applications/networking/Sylk/default.nix index 9f5378d761aa..7391ad4c688c 100644 --- a/pkgs/applications/networking/Sylk/default.nix +++ b/pkgs/applications/networking/Sylk/default.nix @@ -2,7 +2,7 @@ let pname = "Sylk"; - version = "2.9.3"; + version = "2.9.4"; in appimageTools.wrapType2 rec { @@ -10,7 +10,7 @@ appimageTools.wrapType2 rec { src = fetchurl { url = "http://download.ag-projects.com/Sylk/Sylk-${version}-x86_64.AppImage"; - hash = "sha256-JH/TUGAYZTIb/L926CoYb5yzPtbOKVmnWRmHO6DxDyY="; + hash = "sha256-LnJ8Pd+AHIrHrYpIx+rxnFKZ1uh2viDHC5TaU1BL62s="; }; profile = '' diff --git a/pkgs/applications/networking/apache-directory-studio/default.nix b/pkgs/applications/networking/apache-directory-studio/default.nix index 141bbe654b7a..18f9a7990c3e 100644 --- a/pkgs/applications/networking/apache-directory-studio/default.nix +++ b/pkgs/applications/networking/apache-directory-studio/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jdk14, makeWrapper, autoPatchelfHook, makeDesktopItem, glib, libsecret }: +{ lib, stdenv, fetchurl, jdk, makeWrapper, autoPatchelfHook, makeDesktopItem, glib, libsecret }: let desktopItem = makeDesktopItem { @@ -39,12 +39,12 @@ stdenv.mkDerivation rec { makeWrapper "$dest/ApacheDirectoryStudio" \ "$out/bin/ApacheDirectoryStudio" \ - --prefix PATH : "${jdk14}/bin" + --prefix PATH : "${jdk}/bin" install -D icon.xpm "$out/share/pixmaps/apache-directory-studio.xpm" install -D -t "$out/share/applications" ${desktopItem}/share/applications/* ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Eclipse-based LDAP browser and directory client"; homepage = "https://directory.apache.org/studio/"; license = licenses.asl20; diff --git a/pkgs/applications/networking/appgate-sdp/default.nix b/pkgs/applications/networking/appgate-sdp/default.nix new file mode 100644 index 000000000000..bfe6ba97e4c2 --- /dev/null +++ b/pkgs/applications/networking/appgate-sdp/default.nix @@ -0,0 +1,169 @@ +{ alsaLib +, at-spi2-atk +, at-spi2-core +, atk +, bash +, cairo +, coreutils +, cups +, curl +, dbus +, dnsmasq +, dpkg +, e2fsprogs +, expat +, fetchurl +, gdk-pixbuf +, glib +, gtk3 +, icu +, iproute +, krb5 +, lib +, libX11 +, libXScrnSaver +, libXcomposite +, libXcursor +, libXdamage +, libXext +, libXfixes +, libXi +, libXrandr +, libXrender +, libXtst +, libsecret +, libuuid +, libxcb +, lttng-ust +, makeWrapper +, networkmanager +, nspr +, nss +, openssl +, pango +, procps +, python37 +, python37Packages +, stdenv +, systemd +, zlib +}: +with stdenv.lib; +let + deps = [ + alsaLib + at-spi2-atk + at-spi2-core + atk + cairo + cups + curl + dbus + expat + gdk-pixbuf + glib + gtk3 + icu + krb5 + libX11 + libXScrnSaver + libXcomposite + libXcursor + libXdamage + libXext + libXfixes + libXi + libXrandr + libXrender + libXtst + libsecret + libuuid + libxcb + lttng-ust + nspr + nss + openssl + pango + stdenv.cc.cc + systemd + zlib + ]; + rpath = stdenv.lib.makeLibraryPath deps ; +in +stdenv.mkDerivation rec { + pname = "appgate-sdp"; + version = "5.1.2"; + + src = fetchurl { + url = "https://bin.appgate-sdp.com/5.1/client/appgate-sdp_${version}_amd64.deb"; + sha256 = "0v4vfibg1giml3vfz2w7qypqzymvfchi5qm6vfagah2vfbkw7xc2"; + }; + + dontConfigure = true; + dontBuild = true; + enableParallelBuilding = true; + + buildInputs = [ + python37 + python37Packages.dbus-python + ]; + + nativeBuildInputs = [ + makeWrapper + dpkg + ]; + + unpackPhase = '' + dpkg-deb -x $src $out + ''; + + installPhase = '' + mkdir -p $out/bin + ln -s "$out/opt/appgate/appgate" "$out/bin/appgate" + cp -r $out/usr/share $out/share + + for file in $out/opt/appgate/linux/appgate-resolver.pre \ + $out/opt/appgate/linux/appgate-dumb-resolver.pre \ + $out/lib/systemd/system/appgatedriver.service \ + $out/lib/systemd/system/appgate-dumb-resolver.service \ + $out/lib/systemd/system/appgate-resolver.service + do + substituteInPlace $file \ + --replace "/bin/sh" "${bash}/bin/sh" \ + --replace "/opt/" "$out/opt/" \ + --replace "/usr/sbin/dnsmasq" "${dnsmasq}/bin/dnsmasq" \ + --replace "InaccessiblePaths=/mnt /srv /boot /media" "InaccessiblePaths=-/mnt -/srv -/boot -/media" \ + --replace "cat" "${coreutils}/bin/cat" \ + --replace "chattr" "${e2fsprogs}/bin/chattr" \ + --replace "mv" "${coreutils}/bin/mv" \ + --replace "pkill" "${procps}/bin/pkill" + done + + substituteInPlace $out/opt/appgate/linux/nm.py --replace "/usr/sbin/dnsmasq" "${dnsmasq}/bin/dnsmasq" + substituteInPlace $out/opt/appgate/linux/set_dns \ + --replace "service appgate-resolver stop" "${systemd.out}/bin/systemctl stop appgate-resolver" \ + --replace "/etc/appgate.conf" "$out/etc/appgate.conf" + + ''; + + postFixup = '' + find $out -type f -name "*.so" -exec patchelf --set-rpath '$ORIGIN:${rpath}' {} \; + for binary in $out/opt/appgate/appgate-driver \ + $out/opt/appgate/appgate \ + $out/opt/appgate/service/createdump \ + $out/opt/appgate/service/appgateservice.bin + do + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "$ORIGIN:$out/opt/appgate/service/:$out/opt/appgate/:${rpath}" $binary + done + + wrapProgram $out/opt/appgate/appgate-driver --prefix PATH : ${stdenv.lib.makeBinPath [ iproute networkmanager dnsmasq ]} + wrapProgram $out/opt/appgate/linux/set_dns --set PYTHONPATH $PYTHONPATH + ''; + meta = with lib; { + description = "Appgate SDP (Software Defined Perimeter) desktop client"; + homepage = https://www.appgate.com/support/software-defined-perimeter-support; + license = licenses.unfree; + platforms = platforms.linux; + maintainers = with maintainers; [ ymatsiuk ]; + }; +} diff --git a/pkgs/applications/networking/brig/default.nix b/pkgs/applications/networking/brig/default.nix index 66329b64eace..a56a586b82a1 100644 --- a/pkgs/applications/networking/brig/default.nix +++ b/pkgs/applications/networking/brig/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "brig"; @@ -15,7 +15,7 @@ buildGoPackage rec { sha256 = "0gi39jmnzqrgj146yw8lcmgmvzx7ii1dgw4iqig7kx8c0jiqi600"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "File synchronization on top of ipfs with git like interface and FUSE filesystem"; homepage = "https://github.com/sahib/brig"; license = licenses.agpl3; diff --git a/pkgs/applications/networking/browsers/amfora/default.nix b/pkgs/applications/networking/browsers/amfora/default.nix index 925cc1a4f912..e951f4c53c0f 100644 --- a/pkgs/applications/networking/browsers/amfora/default.nix +++ b/pkgs/applications/networking/browsers/amfora/default.nix @@ -1,25 +1,23 @@ -{ lib, fetchFromGitHub, buildGoModule }: +{ stdenv, lib, fetchFromGitHub, buildGoModule }: buildGoModule rec { pname = "amfora"; - version = "1.6.0"; + version = "1.7.2"; src = fetchFromGitHub { owner = "makeworld-the-better-one"; repo = "amfora"; rev = "v${version}"; - sha256 = "1f5r12hmdgj26p4ss5pcpfcvqlcn19fr9xvvvk2izckcr48p4fy7"; + sha256 = "KAOIx401G/kB/TclhidOnUja1P+mLo/mUwAqGJfVfyg="; }; - vendorSha256 = "0mkk7xxfxxp1w9890mkmag11mzxhy2zmh8v1macpyp1zmzgs21f8"; + vendorSha256 = "rOEM7iEkm42g8yJxY7qdTCSbkPMDHqlAsK7/ud8IDLY="; - postInstall = '' + postInstall = lib.optionalString (!stdenv.isDarwin) '' sed -i "s:amfora:$out/bin/amfora:" amfora.desktop install -Dm644 amfora.desktop -t $out/share/applications ''; - doCheck = false; - meta = with lib; { description = "A fancy terminal browser for the Gemini protocol"; homepage = "https://github.com/makeworld-the-better-one/amfora"; diff --git a/pkgs/applications/networking/browsers/asuka/default.nix b/pkgs/applications/networking/browsers/asuka/default.nix index 89f4fda88a18..89718100ab54 100644 --- a/pkgs/applications/networking/browsers/asuka/default.nix +++ b/pkgs/applications/networking/browsers/asuka/default.nix @@ -1,4 +1,4 @@ -{ stdenv, rustPlatform, fetchurl, pkgconfig, ncurses, openssl, Security }: +{ lib, stdenv, rustPlatform, fetchurl, pkgconfig, ncurses, openssl, Security }: rustPlatform.buildRustPackage rec { pname = "asuka"; @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ ncurses openssl ] ++ stdenv.lib.optional stdenv.isDarwin Security; - meta = with stdenv.lib; { + meta = with lib; { description = "Gemini Project client written in Rust with NCurses"; homepage = "https://git.sr.ht/~julienxx/asuka"; license = licenses.mit; diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index c1926820ece1..9eed9b627e67 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -88,16 +88,17 @@ in stdenv.mkDerivation rec { pname = "brave"; - version = "1.18.75"; + version = "1.18.77"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "1njgdw7ml30xs517brc7z7piy6lcylrfjhz6wn1dp7gywsxfgx1h"; + sha256 = "AV3bqtWaoy6AVnt8K/Qo+7hguAIsPJPZhgLSeOvJ7JY="; }; dontConfigure = true; dontBuild = true; dontPatchELF = true; + doInstallCheck = true; nativeBuildInputs = [ dpkg wrapGAppsHook ]; @@ -147,7 +148,14 @@ stdenv.mkDerivation rec { ln -sf ${xdg_utils}/bin/xdg-mime $out/opt/brave.com/brave/xdg-mime ''; - meta = with stdenv.lib; { + installCheckPhase = '' + # Bypass upstream wrapper which suppresses errors + $out/opt/brave.com/brave/brave --version + ''; + + passthru.updateScript = ./update.sh; + + meta = with lib; { homepage = "https://brave.com/"; description = "Privacy-oriented browser for Desktop and Laptop computers"; changelog = "https://github.com/brave/brave-browser/blob/v${version}/CHANGELOG.md"; diff --git a/pkgs/applications/networking/browsers/brave/update.sh b/pkgs/applications/networking/browsers/brave/update.sh new file mode 100755 index 000000000000..b7d974ad259d --- /dev/null +++ b/pkgs/applications/networking/browsers/brave/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://brave-browser-apt-release.s3.brave.com/dists/stable/main/binary-amd64/Packages | sed -r -n 's/^Version: (.*)/\1/p' | head -n1)" +update-source-version brave "$version" diff --git a/pkgs/applications/networking/browsers/browsh/default.nix b/pkgs/applications/networking/browsers/browsh/default.nix index 3662c3badd3e..cf1ae25974e8 100644 --- a/pkgs/applications/networking/browsers/browsh/default.nix +++ b/pkgs/applications/networking/browsers/browsh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchurl, fetchFromGitHub, go-bindata }: +{ lib, stdenv, buildGoPackage, fetchurl, fetchFromGitHub, go-bindata }: let version = "1.6.4"; @@ -51,7 +51,7 @@ in buildGoPackage rec { goDeps = ./deps.nix; - meta = with stdenv.lib; { + meta = with lib; { description = "A fully-modern text-based browser, rendering to TTY and browsers"; homepage = "https://www.brow.sh/"; maintainers = [ maintainers.kalbasit ]; diff --git a/pkgs/applications/networking/browsers/castor/default.nix b/pkgs/applications/networking/browsers/castor/default.nix index c9ad213cf1d1..6482ce59da6c 100644 --- a/pkgs/applications/networking/browsers/castor/default.nix +++ b/pkgs/applications/networking/browsers/castor/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , rustPlatform , pkg-config @@ -41,7 +41,7 @@ rustPlatform.buildRustPackage rec { # Sometimes tests fail when run in parallel cargoParallelTestThreads = false; - meta = with stdenv.lib; { + meta = with lib; { description = "A graphical client for plain-text protocols written in Rust with GTK. It currently supports the Gemini, Gopher and Finger protocols"; homepage = "https://sr.ht/~julienxx/Castor"; license = licenses.mit; diff --git a/pkgs/applications/networking/browsers/chromium/README.md b/pkgs/applications/networking/browsers/chromium/README.md index 8e4eae75f960..5b7c9fe55040 100644 --- a/pkgs/applications/networking/browsers/chromium/README.md +++ b/pkgs/applications/networking/browsers/chromium/README.md @@ -36,9 +36,6 @@ update `upstream-info.json`. After updates it is important to test at least `nixosTests.chromium` (or basic manual testing) and `google-chrome` (which reuses `upstream-info.json`). -After updating, please also update pkgs/development/tools/selenium/chromedriver/default.nix -to a matching version. - ## Backports All updates are considered security critical and should be ported to the stable diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 5be89852b389..e7661c32caa4 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -1,8 +1,8 @@ { "stable": { - "version": "87.0.4280.88", - "sha256": "1h09g9b2zxad85vd146ymvg3w2kpngpi78yig3dn1vrmhwr4aiiy", - "sha256bin64": "0n3fm6wf8zfkv135d50xl8xxrnng3q55vyxkck1da8jyvh18bijb", + "version": "87.0.4280.141", + "sha256": "0x9k809m36pfirnw2vnr9pk93nxdbgrvna0xf1rs3q91zkbr2x8l", + "sha256bin64": "0wq3yi0qyxzcid390w5rh4xjq92fjajvlifjl70g6sqnbk6vgvdp", "deps": { "gn": { "version": "2020-09-09", @@ -13,14 +13,14 @@ }, "chromedriver": { "version": "87.0.4280.88", - "sha256_linux": "11plh2hs2zpa14ymlbnj92pa58krl28yw4c0s55wk8qsxvzvl02m", + "sha256_linux": "1insh1imi25sj4hdkbll5rzwnag8wvfxv4ckshpq8akl8r13p6lj", "sha256_darwin": "048hsqp6575r980m769lzznvxypmfcwn89f1d3ik751ymzmb5r78" } }, "beta": { - "version": "88.0.4324.50", - "sha256": "17v0qp05785xc4whsbw6fmf0x5ccjx2mk6n4qy6z2mx2yjjjfv8q", - "sha256bin64": "01cphbd56l7g3cdmrvwynkzrpx9h3v7pz6ac76sxlp6irjzhbnva", + "version": "88.0.4324.79", + "sha256": "1xmssngzg370gazvqngw5mzhfq476fan5y3sp4ggs8fx5anh6jlz", + "sha256bin64": "16m2k4kr92236yvfnl276cy77d5324b7ca3grsw990c0b2kgizq7", "deps": { "gn": { "version": "2020-11-05", @@ -31,15 +31,15 @@ } }, "dev": { - "version": "89.0.4356.6", - "sha256": "1jq0wbaaz07kz2190rq3vl2b5spx3qfda4al9ygkm8man817d2nr", - "sha256bin64": "0dgvp2my328s4ah0hmp1hg1c3x21gkrz9mjvbfs54r2pjb7y5sbl", + "version": "89.0.4385.0", + "sha256": "0cwfwkaidxi86n80kcn3lxrwz90zp6ra9dib1nd4xnhpgl7vjjjf", + "sha256bin64": "1hvrdvmlqc95qb9gn7iihal4h1kzf6jqrhk9xvv45chsvwl79pmd", "deps": { "gn": { - "version": "2020-11-05", + "version": "2020-12-22", "url": "https://gn.googlesource.com/gn", - "rev": "53d92014bf94c3893886470a1c7c1289f8818db0", - "sha256": "1xcm07qjk6m2czi150fiqqxql067i832adck6zxrishm70c9jbr9" + "rev": "0d67e272bdb8145f87d238bc0b2cb8bf80ccec90", + "sha256": "07mrfl9hbjldbgidwwhr482a0s0ppqzwa5j7v5nbqxj18j55iril" } } }, diff --git a/pkgs/applications/networking/browsers/dillo/default.nix b/pkgs/applications/networking/browsers/dillo/default.nix index fa1fa76340c3..9da80576e95a 100644 --- a/pkgs/applications/networking/browsers/dillo/default.nix +++ b/pkgs/applications/networking/browsers/dillo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , fltk , openssl , libjpeg, libpng @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-ssl" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.dillo.org/"; description = "A fast graphical web browser with a small footprint"; longDescription = '' diff --git a/pkgs/applications/networking/browsers/elinks/default.nix b/pkgs/applications/networking/browsers/elinks/default.nix index 79f3cb76a01a..114bc93f3b9f 100644 --- a/pkgs/applications/networking/browsers/elinks/default.nix +++ b/pkgs/applications/networking/browsers/elinks/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, ncurses, xlibsWrapper, bzip2, zlib +{ lib, stdenv, fetchFromGitHub, fetchpatch, ncurses, xlibsWrapper, bzip2, zlib , brotli, zstd, lzma, openssl, autoreconfHook, gettext, pkgconfig, libev , gpm, libidn, tre, expat , # Incompatible licenses, LGPLv3 - GPLv2 @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional enablePerl "--with-perl" ; - meta = with stdenv.lib; { + meta = with lib; { description = "Full-featured text-mode web browser (package based on the fork felinks)"; homepage = "https://github.com/rkd77/felinks"; license = licenses.gpl2; diff --git a/pkgs/applications/networking/browsers/eolie/default.nix b/pkgs/applications/networking/browsers/eolie/default.nix index a16beb652089..53a32e09f878 100644 --- a/pkgs/applications/networking/browsers/eolie/default.nix +++ b/pkgs/applications/networking/browsers/eolie/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, meson, ninja, pkgconfig, nix-update-script +{ lib, stdenv, fetchgit, meson, ninja, pkgconfig, nix-update-script , python3, gtk3, libsecret, gst_all_1, webkitgtk, glib , glib-networking, gtkspell3, hunspell, desktop-file-utils , gobject-introspection, wrapGAppsHook, gnome3 }: @@ -72,7 +72,7 @@ python3.pkgs.buildPythonApplication rec { strictDeps = false; - meta = with stdenv.lib; { + meta = with lib; { description = "A new GNOME web browser"; homepage = "https://wiki.gnome.org/Apps/Eolie"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/networking/browsers/ephemeral/default.nix b/pkgs/applications/networking/browsers/ephemeral/default.nix index 6d8aa3649a90..ad2d69edd4e0 100644 --- a/pkgs/applications/networking/browsers/ephemeral/default.nix +++ b/pkgs/applications/networking/browsers/ephemeral/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , nix-update-script , desktop-file-utils @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "The always-incognito web browser"; homepage = "https://github.com/cassidyjames/ephemeral"; maintainers = with maintainers; [ xiorcale ] ++ pantheon.maintainers; diff --git a/pkgs/applications/networking/browsers/falkon/default.nix b/pkgs/applications/networking/browsers/falkon/default.nix index 3c2aace79b26..c1d40fa770ff 100644 --- a/pkgs/applications/networking/browsers/falkon/default.nix +++ b/pkgs/applications/networking/browsers/falkon/default.nix @@ -47,9 +47,7 @@ mkDerivation rec { wrapQtAppsHook ]; - enableParallelBuilding = true; - - meta = with stdenv.lib; { + meta = with lib; { description = "QtWebEngine based cross-platform web browser"; homepage = "https://community.kde.org/Incubator/Projects/Falkon"; license = licenses.gpl3; diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index 9bf5e837bf5d..6d29a7bda9d6 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 = "85.0b4"; + version = "85.0b6"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/ach/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/ach/firefox-85.0b6.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "04d5c5b64e906438122cfcd13c6a06d58bb1c0a2d2eaf66f52f91e103a5534ae"; + sha256 = "e6583b946d35db5b8d94bd33e183e397b85c6549a94961ec2cc395b30ba21b6b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/af/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/af/firefox-85.0b6.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "57bdfd3e6efe3c667ddb4c1e2421c191eedc407f578ee307b1ed916815726837"; + sha256 = "7f69bf9371454796ef6cc9469bf1ba6d6c7317a3e559fefafacb3c4d215eaa73"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/an/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/an/firefox-85.0b6.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "7ceb815590071691a3faa6f1d8215963b48c54c220c512499fb9642efc1492d4"; + sha256 = "02ce58a9be06d2632e87daeb0e832d18e896c0ae376171d0d265d108530bf8ed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/ar/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/ar/firefox-85.0b6.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "ce8b25f9ba3d21e87f660a17a90e770417e658f7280d0e41d0a5ff41164a2d43"; + sha256 = "04021d925774cfb01141f34a28800e339339f1b056255721d2c4aa4268156986"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/ast/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/ast/firefox-85.0b6.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "a220440bebd1c1179e6e2a483ae148ada05f86c3c5d68946bb3b14d301301a78"; + sha256 = "a85bc2a3c859b9b6e005c1cc5767f1519d255fac011208563c530d28bcec8935"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/az/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/az/firefox-85.0b6.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "b79a3e03d476d3667c28ed83dd84fb375013597d58e9e13f431eba13b509422f"; + sha256 = "d84113f01e450d76eccb1f464a3e6a44c3b5fd604c74891d175f0f7565c3b911"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/be/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/be/firefox-85.0b6.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "c8e00ae8a6d66a427212c1323a0f4860c25058c1d27fc0d3bb56612f0f2b785e"; + sha256 = "a2826a554577a666b337d95f2c46b292fbb228152282799f295994cb9f6b6563"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/bg/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/bg/firefox-85.0b6.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "cc63fb7773dfe6a9b84a7ddd80873c6f8fab3b0f12e15a0db862bac9006d86c4"; + sha256 = "c88db099ee75755d0e60cb8230731be9fafbf5ca3c0a6d0be232cfe1f93523eb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/bn/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/bn/firefox-85.0b6.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "9fdd2e50b1fd74a3cabe55c23ca44253e9b5a2791461a2f15713cab6f4700e6f"; + sha256 = "625377e2bb881aeac0659600def64039bbc1c8518c99acd102f9e47dc956af0d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/br/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/br/firefox-85.0b6.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "44d99c74041f227252989570c9fe1dc2a1519e195e6386d0dc78fbf43ec41e88"; + sha256 = "5fd3c63066e098dc87337c6e4fb53aede9c9d817e1bc06b1fe11597d68f60f3a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/bs/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/bs/firefox-85.0b6.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "7c3b4beb800c8e023fbc5655e6435b11f6ebf11c3d82a5b6a1df76df682f0666"; + sha256 = "85745ac8ae54b559592430744ce3a08566c1b20a078b961988870e570dba6eba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/ca-valencia/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/ca-valencia/firefox-85.0b6.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "b0676d544d8d2cc6c37a192adcd4e61038106c0e84066e68895642afc8e158a4"; + sha256 = "5ddd2c3244311bb975e510cefeb1c5e16f92de2d82ef7fd3f6cb6bc064fd70ef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/ca/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/ca/firefox-85.0b6.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "8f170b9356761ec175be3f417df624a78e939af931376f52d36f19b019c05338"; + sha256 = "e1d4f0ee1a72ea956966b07c3c48fcd089f5540ea1bf02857f41f125a9ab8762"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/cak/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/cak/firefox-85.0b6.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "ca966b90035591d3e5f886814664d2f203bc0b65e781f46566a51269811efcdd"; + sha256 = "519c50b7994b0d2bb3c162812424188958a51bdfe40d382db2e83912fb893484"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/cs/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/cs/firefox-85.0b6.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "31e19d69e03821c646d21969b48e5ba01c52b2d5d2538f7bd7e7b93c9a6f7bb8"; + sha256 = "37aeebb7dcd6240721c7377368751f2c48b3492846ef72d09e3fb5146db0cf5f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/cy/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/cy/firefox-85.0b6.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "dfe3974d2328fa535b79f3e18d699b8d62a053efd0248cc88d1152ff92604166"; + sha256 = "5902520410a45eacf141c9f8c414994298ec108ed0d97096f34156001373dccb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/da/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/da/firefox-85.0b6.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "86ba3d548eb3a6408b9234c382389c0fb5907c98eeab25cc39e810727570d2ae"; + sha256 = "787a26c9f978643e6afaf9dadd88f7adbc18f6d8f6b5814da4752c21faac4078"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/de/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/de/firefox-85.0b6.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "1cb610280c07e7af82df2dd283a6d35c1f63afe6f11a0fd7797efc4128ad126a"; + sha256 = "09f5f3edfca2b082ad6f96ecf7b97d336d81c3d63bf1588bc2f38ff91e2d641c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/dsb/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/dsb/firefox-85.0b6.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "555300937cd2d6e25085d5d3f4b699704ba3630ba4ce667a9ed3d67a9c9f5143"; + sha256 = "eef50a2a7b0109b62202922041dea12beea346e98fcd8d93f402ba7f08546dff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/el/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/el/firefox-85.0b6.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "b2bf744cbe21d23a1ed16310fe552197b129964a75aca4fc1c3759fb59782d7f"; + sha256 = "5ed270355c3fca3d8ce2ba15e2b9a322fa503339ef46c935851442523f91c277"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/en-CA/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/en-CA/firefox-85.0b6.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "422cbea99fd390c31868b0cf0e6bc8344cca9dc9540dd58b8b315f519a3c53cd"; + sha256 = "6343b55fa02570c7ed4c7eb47b6a8d6b0cbfb5cecb0199282b4cf58e5f344419"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/en-GB/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/en-GB/firefox-85.0b6.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "a996f6ea769ad846a69ab692b967ea23c4de461a922add22864fce6f97d04e30"; + sha256 = "863e118d3b6c0bf9e25bdef819ec0bb9d027802a99216640a4ee01650486ec8e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/en-US/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/en-US/firefox-85.0b6.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "aefbbe66cd209bdd9a1720562127560212f257229b799c45de5feb4173f10232"; + sha256 = "c5e58bb173cdaaf9ec09085e47d69c7601966ece7ef5aba85cffced211952e77"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/eo/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/eo/firefox-85.0b6.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "8237d0bdc5a0ed6873c4178a20e77bb2c86f833f02e6872852d8e35e36978459"; + sha256 = "a03057a3d852dbd8956aee7253e1a3b6550c843d8755d5c01fe2d72042c80c79"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/es-AR/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/es-AR/firefox-85.0b6.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "6d8b15775127619f923e7c255a01afcfd81d9d7bb01c0152e3aac3ef327b9ff2"; + sha256 = "f705f2e633f30fe83a2546847e0dcf6da76e2b9c7edb1a1cbb104c56d45610a6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/es-CL/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/es-CL/firefox-85.0b6.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "26dedb44f4dd064005a2cb935444acd0f6a99a451b87263775cad4506503bccf"; + sha256 = "1b04e80d0666900dba8356d761059bc99e39636b859059d34e79dca73bc6c97e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/es-ES/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/es-ES/firefox-85.0b6.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "96d8444ee16d78bbde1fca5a69d5f404bdb2199757c566cdf44416ef43761715"; + sha256 = "078b7cbd04e73f2a62c60ceaeb73edf1dce4ffd656e523acc901e234eb6ff972"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/es-MX/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/es-MX/firefox-85.0b6.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "ac4a2e7490b448a2654a0999b77e4e3e6e8dcd96c4239654dc8cc748f54d2ebc"; + sha256 = "7131fe554e6b1eaff8af3bd62a565d4db746eb5f65cc9eebe9d6a20921eae0e3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/et/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/et/firefox-85.0b6.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "d44ba8376fccea9feae2054a50db58a5d4abca559ebfe854821cca9342f05f42"; + sha256 = "131340d0124292055a8a3f6a7ad86e7f1d4648c47f18bcac37db0fb48b3150cb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/eu/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/eu/firefox-85.0b6.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "d7f2131c7125fa6ee78a978e11d0f5c4ebbd55f5fa9fd8ac644aa0a9f68d60bd"; + sha256 = "a3c9eff230311f0b449f977f0304eb664614ad683467b165ee6f656530df9caf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/fa/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/fa/firefox-85.0b6.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "2f63087cb94dee9a97cdf0641478b076f119bdf30dc0e3d35b9db67dd1e75cfb"; + sha256 = "69a84d5384d13c486c0cb9bea45ee78662d30fe12f1e46a582f55b3129be6093"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/ff/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/ff/firefox-85.0b6.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "e8bd39fe41b98ce4fd1e630d376e263815b60339947344d82a7fddfc4ac331d8"; + sha256 = "e25dd52c7241b2df8d1866c118233af0cefd99d4d15011faf5a2b0429c01675a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/fi/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/fi/firefox-85.0b6.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "d743df7df584c30ab237771778df1a06a01cb8801ad57233738a9e7ee7b5a453"; + sha256 = "1530c0d16b164a936d6b98d3ecdae44b8484d776767b307322f87f901b6c131a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/fr/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/fr/firefox-85.0b6.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "9426e988190c0f65cd87cb502064cc2cfa8146e1edc15aaff7ad3a28e8c30ae0"; + sha256 = "7589a12da470306b5212d669d5f2c527a400b4659d8a06f1e49a0a62f33f49ab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/fy-NL/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/fy-NL/firefox-85.0b6.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "80896d31f83bfbee9ac2b585894fbe0332c2516c7cb9eb06b10dd8169fb0a50b"; + sha256 = "f8a80894596182d66cf6ba9c2073619263f5262a187080e75eb2a3ce93095cb4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/ga-IE/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/ga-IE/firefox-85.0b6.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "678c24f47dda38562f15889bfef5de79e1375a85c8158697c37846252d55f4e9"; + sha256 = "97cf7abeaeb857fe20f0e31964eef346e4d4d9803af6b6c24bf26d436b4e42c4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/gd/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/gd/firefox-85.0b6.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "87d924efdea12fa98ebbe88d42afa5944b821c4081ee0a549e66393d69c1eb53"; + sha256 = "76a580744c26419c15862729ba1525dc2c5216b221dd74af80d1e09cfb1ffb25"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/gl/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/gl/firefox-85.0b6.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "61cb992a445cee2689e19415da53d5611d68f65acd8aceaada76b0999e50ec13"; + sha256 = "6b818eee14d5e4dd857a53982de224fadb454397c7efb18123c224baf513b222"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/gn/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/gn/firefox-85.0b6.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "95c3467048e7250dddfcb018ae8b8bcdb9de78b3a01076c4e1aefc937f4bc3b1"; + sha256 = "68dfc0c439e815242333fdc8bd9752dfeaa1d6583acdfa5cc4c7092eca637b49"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/gu-IN/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/gu-IN/firefox-85.0b6.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "1bdcef358bd0ac242dd0607545fc65ad98d0785898a6a53394d04c74c8ee0a22"; + sha256 = "b529c00e2c0520b6e7362b21e9fa045838837660ebe5ba46b755164ed7e434d4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/he/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/he/firefox-85.0b6.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "5f240e3754fb368288cab3f37ab250d6815dd1b792b77180fa5590e4d9c6acca"; + sha256 = "43d273ca9f65bf3584ecc98f5f2409a916957d0d70fb296aa504cbebdfe5ed75"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/hi-IN/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/hi-IN/firefox-85.0b6.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "9b0eb6eb03eeeeebc78c652f4e5bf511335ebad3afed9b31eeef8f5c830b0e1b"; + sha256 = "ffeae00deb60a0db7c977dc1541ab90e948b206a59717d60271eb0f6a166ebef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/hr/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/hr/firefox-85.0b6.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "53bd72eed8eda15e3dd1a070b221535bda8aee3930a713b121b84b64a2f95a3d"; + sha256 = "f81a32c1bf88acc3e5b26e61ac6c153f1b9bbc7cde1685f8c0a366a4c4808dd4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/hsb/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/hsb/firefox-85.0b6.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "e233c7ab46d0f3dece1d580c8a615156bb70df6937d47286c3a54b4d15cebac9"; + sha256 = "87e1a2cbdcbe4a7f2aff0537ad991ad39a8b992f38b6b2a0e2c4b2f65fd6c9d0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/hu/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/hu/firefox-85.0b6.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "2ffbc88d33631a5c0ebbc29b8f36c6b7f043b8faf0600398e24d48546d699eac"; + sha256 = "88f171d4f84e3f89d7c433d793ae0032572444b322d72fa19abacdd0481c5df7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/hy-AM/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/hy-AM/firefox-85.0b6.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "f6cbd70bd95642caf737684c8c429342e8f567061bfb680732382b5c5f93f1a2"; + sha256 = "f88e6eb48e2ddc8c8a11d92fd82884fb487958cb8c54fa5268f15076774e7e4a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/ia/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/ia/firefox-85.0b6.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "ae7c96c3120c1727c4d8ed4f9978aafe64740d49111bb6bd507e4a9e14d7dab2"; + sha256 = "0286e665df8b07339cb2a6f609623defaf489883b8865781aa7ba238d3c19f4e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/id/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/id/firefox-85.0b6.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "680f5f3dc843b7acf86c79fb3238796ce3d28b60da3b76f55a37652d1a11c176"; + sha256 = "e71c9712d22a1d573b12a5d4274ac5fa8a91a1ce98bad9f4922f7f11c0770707"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/is/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/is/firefox-85.0b6.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "ca40b8a9e99234faa67141732a5ef70e416e9aae08b4e8cbf6fe2ada9f0b7b4e"; + sha256 = "b61060e1f2aa2423cd9c2d9b79f8476927fa171abadd3d32885b7deeebf781ad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/it/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/it/firefox-85.0b6.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "ac8f5d43fc30760e68be4802514bf09fdb4940336d48844fe833d9290a10506c"; + sha256 = "6a2e987c69e384431cea1beff69059f0bf4259a80b318e8736c420cedf125187"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/ja/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/ja/firefox-85.0b6.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "13c66340765699d336926872065ce0edf7e14f43b2f16dc99aa277f5d64f2275"; + sha256 = "109736b666fbbb54ed5bfd1755092834f9c2670362ad272802643d5a98fb80bd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/ka/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/ka/firefox-85.0b6.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "16ef31cb13dc3c54196ed3dd6209bfdbed14460c38d3fc8cdce4ee7801322ac0"; + sha256 = "4b1249e8634b130b6fc9021f570e375bc2c1bf74d50f1789b3a1325c0fd771ae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/kab/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/kab/firefox-85.0b6.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "68aa1a647c86f2e9fe63bab675f7d851a08fb22d5ed72b10f2e6710e03e02672"; + sha256 = "a12af8d38c868d1af24d7a23faec32b79412768bf7438d3c2548d06676bb5d92"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/kk/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/kk/firefox-85.0b6.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "8603847204461f9370447c6c546c4bf985926353597aa7d9ecee9d46a810ba95"; + sha256 = "d844763e5f8475d9b2a81bc217b0b4840fc6fb18a037921266fe3ab4c835367a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/km/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/km/firefox-85.0b6.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "d552b9301ca160577d24267584fa3b8c45a1c6eb82cf540778a617eaebbff6e5"; + sha256 = "bd2216fb6c24932738935ee9d5ae73816cf70def1dee3b3317c99faf67496cd3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/kn/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/kn/firefox-85.0b6.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "b5f4259baa11d5010fdde27dbd583f56b0c9fafaeab9c7f31be87b9645478e6e"; + sha256 = "8a49b992da59ac781246bd8e7318a815659556c29279182cac6328fbbfcd3f35"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/ko/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/ko/firefox-85.0b6.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "e73be57006747f673e979741203537cbbd8f9fb6f4fb77cfc88a7d0c85c7a7de"; + sha256 = "c8a81f06e4dbcfbac2a6a065faab9981dc2503025918ee363d8b908ea6732b82"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/lij/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/lij/firefox-85.0b6.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "3190c816b7a2973aa7d2a0640fa4e174b02b62a62c28eed7e0df3b377242aec3"; + sha256 = "4c0c223829b974f26d3e34bf17b15112afba6709d7654a05e7ccc1a582d8cff4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/lt/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/lt/firefox-85.0b6.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "95a68d2d1a98bdda38e86f4c14c28669d2a11792fab561d6a8295c017d1a5068"; + sha256 = "07ad6f6accaa6246e23832e8cfb69f498ddb219d43787ac29688c99b9b359720"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/lv/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/lv/firefox-85.0b6.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "3460fb2356584ad3cd02905b9b3a70a569ef78666a69bff754fbd0b0eba0cd1f"; + sha256 = "ac9f4ffc8cdb4ee8f3d0602b0ed9de4005dded584b6896c0cf0053d9951a637c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/mk/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/mk/firefox-85.0b6.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "864d8ae602b06c75ebf0d0bb4b8fcc5722840db373bac1a5656a968df7aea6d8"; + sha256 = "a320b67f4b15d2fb5dc8ffd3dab13266810af06e0385f51b60d4ba5223ba4bbd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/mr/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/mr/firefox-85.0b6.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "09e63b52ae1de354e73838dd0a60de360fcffeaeedd8af316174866a43c49293"; + sha256 = "3dade192f5234bad52a08d380d4ef8119eef5211152a1755b6c6e5fd72eee3cb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/ms/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/ms/firefox-85.0b6.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "c1e47d112d887922d81458bba8a7afa0a706444624738df92cdbe395f4bc9d0f"; + sha256 = "77d4d9c8b5c6d308fca3f3519dfead9f75751ba93dfc1b2d5ef9ea880a1e2111"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/my/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/my/firefox-85.0b6.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "d78413226f8b87af0ef5baecad2ab4b9ced69358cca969635b4f71df645ccacc"; + sha256 = "25de0c8c747c3fd4093517efea1df8fb101b3a48612070f2d93c70901dee7792"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/nb-NO/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/nb-NO/firefox-85.0b6.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "5ecff68265d8ce7c5a59da0366570adafc69b8c05fc323e619a7ce08fdeb7108"; + sha256 = "96b31f76121bdb26840c693e2b3d70ad0ef0e0c7f194f650f9c683e92d5a85e8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/ne-NP/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/ne-NP/firefox-85.0b6.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "00824ae4fa57e98fba5fb1a46b86853a289e24341b94d2ede9e8e7d358d29e9a"; + sha256 = "32ce40ffe03dd2695a50b43135c4fb22f06cf10b19c2067c80b962409ee1a0d1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/nl/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/nl/firefox-85.0b6.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "a0b3a25bdc123bf9ea441456b7d1b3c6fe78ef1589b69742dc38f50d3d92d700"; + sha256 = "672bd93968e0a3cf3b280afdd52fbfe62a1bad524dceebe2e9fc953f4509aae2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/nn-NO/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/nn-NO/firefox-85.0b6.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "00f599f8850af9df078c5d296bfd50a7bdb012f7978e83828000371fbdd93509"; + sha256 = "2d003ab51d0531ba6f47aefbfa2f0b81fa815b378fefe318351b52a798a48e24"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/oc/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/oc/firefox-85.0b6.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "d03638662bd89dfaa1af08312b5361da04d5cb9c93f6eea9b2442bdde25d1eb3"; + sha256 = "6264b95a26189ba3e7f2490f5a122f9f42bca19cd31e6d3084b3bf2a1ea5e91f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/pa-IN/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/pa-IN/firefox-85.0b6.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "2b7d9ed3aca15e5bb22f3fcc5fa0e6289729e5a88d8a43602a9adf38c4e0a8a1"; + sha256 = "987fe7b39bc597e5bf2389f6d595fbe054dd3aff7febc48da19dcc2606454f5f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/pl/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/pl/firefox-85.0b6.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "afe081f1f64aee140eecf24b413f44fa04d999f3bb97a2862a8469732489e94c"; + sha256 = "6c163f9876d53f5607867de871dad27e236c6bf0a2a46ed24425190724554579"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/pt-BR/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/pt-BR/firefox-85.0b6.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "9e643c670efe00e9144529aa65c8f10ea2c8f7d5374a2d93c439a56cabad7d2f"; + sha256 = "71ed7be34b05652463232c449de558e9fcc4be0583516d5ab8a0fc0ae334f419"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/pt-PT/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/pt-PT/firefox-85.0b6.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "98cf63382a586b649b30685bee8591085edf46d747860fae751a5dc4ed183979"; + sha256 = "f1ecd7e990896d3471ffaddd1997b598b8fc3482caa3b6446a750a963ae71f10"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/rm/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/rm/firefox-85.0b6.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "e000820f06aef69922eb0305e4d70cdd1820f86a1bbb60cd0888cc5b5d6ce0b7"; + sha256 = "adcad49f775b592ab65080b8310d27ed26424f4aa547736dc100655586f263a4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/ro/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/ro/firefox-85.0b6.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "daf8f2419a8122ac4da0dd585bc466d404f9a1cceb82aea8732aa4ec112219b2"; + sha256 = "accd50a10d75fd234b38e50908d10fef5df4e6fc1873683f15656d695ccced9e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/ru/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/ru/firefox-85.0b6.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "c081fddcc21b73b421516d529d7abb6d463c804f1875b4b755d34c0be34cfb05"; + sha256 = "88b2f2176d8a739a639fb52eb8d0423343e5780e79f7986f066437ac33c74aa7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/si/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/si/firefox-85.0b6.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "607f0debcaeba1a5a6bc270e4a45793b56d4fb15580da6e264659fc3d4ed6577"; + sha256 = "c2337b0a041926adc3d82d986fdbe1dbbea22046ec149614712e806873f4b46b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/sk/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/sk/firefox-85.0b6.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "d3a06cb060f6ec2131705a75187dd5ca62fae91a22258c59f93c308151ff7b00"; + sha256 = "bd67822eb7aa7253fec770b39cc7e4389fa19373cc01d3a3b9e0568584cbef41"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/sl/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/sl/firefox-85.0b6.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "eb9c21cb4c577500464c8fde4091207a93ab96cd4a6119feac815242e846e65d"; + sha256 = "bb4c64f6e1a2f6b721e51ee26398a4f86cb67782eba15e9c8cfed472ff3ec597"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/son/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/son/firefox-85.0b6.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "ce5449dfb0201d3a2c4891519284903af46177739feeea4353720d108107ccc6"; + sha256 = "7a55a33a184131c74da3fc2dad0dad7bb7c1230a1740d71c19ff3752ac53c7c5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/sq/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/sq/firefox-85.0b6.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "65ab1b97653e2cb416d60f65d6fd7696cf7b5f63bb3b80d13fd199829247ca58"; + sha256 = "72e8271aef0c4d38d577c04d3927f325b13bddab57d115b553ba4015a2b5a12f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/sr/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/sr/firefox-85.0b6.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "16c5e71c6dc86688d3cddc0330fcc98a7e948773833c3f1d856b194541fecc3a"; + sha256 = "5c1bba66c4e173c9e531dd14d746a96fb4ee393db9d815cf6de8c0ff2304036e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/sv-SE/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/sv-SE/firefox-85.0b6.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "7bcae95e5c57d1b380458ab30e2dec9a7bd2c1bc6c2712fa44a9245639ac083e"; + sha256 = "1decd5cef4fcc9faaa05a261686101338e45a0da6485144455c49c3df142d2d5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/ta/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/ta/firefox-85.0b6.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "6f35fc2329ea0a96049c9cadaf925ed064e0f4b60bf12082029898396ab34dc6"; + sha256 = "6a259dad0ded91cd4544f45def61570e8c06de5adeaba5b19fd3136c6f52f4f3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/te/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/te/firefox-85.0b6.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "9f4c691b6943f715e6d6a1db9a36cc745614ac99a33767080157f852d8cae594"; + sha256 = "7096e5bf97b3392543ad75c685b2a6df2796a56e59237493aa869027c06213f3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/th/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/th/firefox-85.0b6.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "c15b8db3bbf1bd9362bb5f024daf0aee7ef3df8cd7864dbeec6a824449722063"; + sha256 = "52fc1ee59288de354e4dc4c1b46848651b4e462839a44157e2de101b4a538282"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/tl/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/tl/firefox-85.0b6.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "98837a0ce69e67b9bcc518c9953763331757870c5cf1ecaadb1cb37cb30338b4"; + sha256 = "bf36d8e31638ed4332d442fa5e5f020ce8282be5afa608a4ff51c7c84443a378"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/tr/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/tr/firefox-85.0b6.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "cec9efb3c0ffd4f7438964efd34d78b377f117fb0f9d051e103663a676d6a6cb"; + sha256 = "09bcb9b641a43272e4ce2f991e48b8665425763261bbc13e8a4e7d905797ca0f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/trs/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/trs/firefox-85.0b6.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "151687f7ed062ad3d0b46b113a26931c41dd375d324aa7055952492fd497c445"; + sha256 = "e146a0e6906d34958989ad0ebdef6e6c42c2844027951fe2a8aa163c8e10ff98"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/uk/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/uk/firefox-85.0b6.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "c0335c927cb343b3a48739949c3d8d1a813eb5caad4a989dd9a3fec16e4c5688"; + sha256 = "8ece3fb7b2f211331838d7980810a40c1b2c39dcac1bea22069ce9a303f0fdb3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/ur/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/ur/firefox-85.0b6.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "5b4a20c279161d910dd6730f1691d4a4bb8319a3e365bfbcc553a47e96d9db30"; + sha256 = "6fb0c5ad50d6002d00ece754309a1fb3074896fb5bdae482ca5170d928a1c9cf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/uz/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/uz/firefox-85.0b6.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "8fd7881da8c03c3b9313509047ee453d175c271fd086e27710bd0aba3fd319d3"; + sha256 = "769b217f7540a2a58cfb38d323dcd1647645f0e80e522ef9370dd553a2e36ae5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/vi/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/vi/firefox-85.0b6.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "7dcdea1143af2cfaf9974640d520fec1e44cc156d085432f52318b745dd21f6c"; + sha256 = "ce69530fe87da4c2b8afe2e465709a19ae88a418e559896da7ea3958cab91808"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/xh/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/xh/firefox-85.0b6.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "f502767929505209d05830b7d0075fcf8186349afe07e793afee560eed9aafc3"; + sha256 = "3c759f6a630200221b4bd96ddbfa363e46ec8a244c4fae1c66a6f8d66ffa4aa5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/zh-CN/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/zh-CN/firefox-85.0b6.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "9d8c003da5dc117cda204487ffd0dd95d9677d7e30e5f868e3a39d3146569da1"; + sha256 = "2d9620f5b4e34e5a9809898d739b94f9ecc0141e3a67e70da11aff8af19598ee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/zh-TW/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/zh-TW/firefox-85.0b6.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "ebdf6822810a97381e63c6c2bb08baea4c239c35b4c75e714da367f982080863"; + sha256 = "2fe6f83d79aa66aee1d5503a6ba6bfc37aa6e950ebfb570524c4a9ac254f4047"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/ach/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/ach/firefox-85.0b6.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "e63b45c8a34d286097825d2830b3697a2205fc8f62e7f7b19fa5569294d4fd3c"; + sha256 = "74822d1537a9b3fbc1fbf413339161b6b89a2bd127ebfcd7bdfca87fac82de29"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/af/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/af/firefox-85.0b6.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "93f0fa71381f937d07764ed4bbdb1ea167664fdb1ed40d063b4fb079ed485dea"; + sha256 = "1bf48b9bfae83d997ec1adfe04bdec7bd4e3f5f6a47e5a6e6400d08ab3b78058"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/an/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/an/firefox-85.0b6.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "1ce6d8e8ba3409b7b5886f87633609a8568ceabdef45beef623ebf74e4bdbd76"; + sha256 = "3c5baf233f01c519b053f3ad788d49d62f6dbf60746b0b31af2720fe2ac3bc23"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/ar/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/ar/firefox-85.0b6.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "990905d68a82f3eee04a9a8df4b291eb425469e6bf045a3a126bee08af2b785d"; + sha256 = "a1886b0394a417ac8bb840cde03b42d4fbd231e51155f7297d52eb7fefff2d3f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/ast/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/ast/firefox-85.0b6.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "606c37c4eda9d1f55e8a8fde0f8df822186995cef190e1644bcbe465cc1a0f54"; + sha256 = "54b7736cf05c9ba024b4df5d6403364210416279fd708326022828b799514809"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/az/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/az/firefox-85.0b6.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "0d2cd416e309ae19af4f3704823de50b560863dc1f1939e75663e9976cbb5c8f"; + sha256 = "1d363e82907335bde45f82e2314c3624a9fd590a49ee63421d05b0fdf7f2e582"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/be/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/be/firefox-85.0b6.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "fcf922756a6830d9bf76bed71579f4b6e2e47edafbb843ee2a490552cfc88f86"; + sha256 = "4602c533fc123382a208986694ddd00453c0eba6a15bc40c206a48121365325b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/bg/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/bg/firefox-85.0b6.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "9d40f252156d646363e65aca32ae4ebbeffe147dccb3d4989e79a57a4dca57fe"; + sha256 = "eb44d9b866c1913cd39bbd84b6157e40ae3012c48fb7b9b8274a538fb746b57d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/bn/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/bn/firefox-85.0b6.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "9471636ffff7f11db45001af18d86ae0d930517e09cd2aebb0a850a946b44917"; + sha256 = "07ae6203f29a8655c756469595ed25b586d20d73bee940fab2a036ded9a143c2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/br/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/br/firefox-85.0b6.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "4482fe50747f7fbf4db5ffb0b3c16bc0245fc0397f582e73c609a8cbbd48c1f8"; + sha256 = "a7b0b6f2c8bb7f8b33e8a8547ee1c1f2964947b3ed2bac05eb2a7f390475deee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/bs/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/bs/firefox-85.0b6.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "5357a4fb56a4aeeb43d98f5ace310000532da9088ca0cd06c818d3852fb38452"; + sha256 = "5dfc013f318e2c9decf3b1782cc772509bfffdd351fdda8adc06eb3fe8a32e5e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/ca-valencia/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/ca-valencia/firefox-85.0b6.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "1a22b215fa50f947afd5657ec702419ec708133f89f372d7667d12fe0e3b85eb"; + sha256 = "89dcf9884269c4b50203f5eef9aaf40531bb607553c953f5bc353388ef5c0d18"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/ca/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/ca/firefox-85.0b6.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "fd335110bb31eed1e1854d24c74c51b8ded826008e49d8ed6b1f7be85ef05753"; + sha256 = "481d6542181678e22b0a2a8e36b1c1f8b3bd19b1e899a240b7b84aa625cf858f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/cak/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/cak/firefox-85.0b6.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "b852765dd3dc4530c1d1d00232c6a615472d721d1f69cf303ddfd6d6b26d2745"; + sha256 = "8e158be85c9103c3013581d897d631dd4e62198756eb107a02fdf106cedea92a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/cs/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/cs/firefox-85.0b6.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "747f697ca9aca2b1982a95a3d05f4549d3f1b276cdac39e17670c0b101f8b704"; + sha256 = "f834b4e3085f7428b511a6d8ccaf2708a003136541de45842e387aaa2d1a0137"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/cy/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/cy/firefox-85.0b6.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "4bf87e33539d8bc383715b89a5fa5e1f5d1e272a7899689585f9fdb711a5e259"; + sha256 = "bf9d259767516e6f919c723217a83be34a2e4e390f67f3fb44c20d6f8152b62f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/da/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/da/firefox-85.0b6.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "bf9961aef493ceb1613c91d79ef1c7b718dc5e39fa3ad8dbfb012d51c16b1e5f"; + sha256 = "4aa90c940c08f68a8b0e63eea0a4e4e52f2a50f81edc900b0efc22f3adcd33f0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/de/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/de/firefox-85.0b6.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "e4e85f2d49dfd9b4bf62e4ee2e77d03660f0b6ae9ce7ee827a17f2f067768b59"; + sha256 = "e1d19e22368146eb9afbfa7535c60843583a538cd808bad2189b23f5a57d84e1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/dsb/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/dsb/firefox-85.0b6.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "71a3307575c45643d8121b64a345c19a6dbfa0924fa7d91b5913d52ce7a5d663"; + sha256 = "9a29e70939026b71eef2e3ca00d785a26d2668e5d7c0d329bc49fe6a35f9fc51"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/el/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/el/firefox-85.0b6.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "75bdc62ba592d48f172af3b072158e14ce0f433c7ee3b44f9bb0f4e0f9c71834"; + sha256 = "f3172deaa2b65bd3fe4cdd62a7fd4e81c936899cd83495c4f5e54d63fc8ba2e3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/en-CA/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/en-CA/firefox-85.0b6.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "c7e2bb86941274de33368c78122cb14bc52c4177de2b9cc757d269d9d7cff40d"; + sha256 = "009768d282619a145489ba9ddb4ac5d47eb0f686e41875d6cdfa97b7102df4b8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/en-GB/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/en-GB/firefox-85.0b6.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "46c5821f9e973a599c74445ab4a44ca31b3f76e18597f4e0d77479c1cd0d3841"; + sha256 = "4ab6d704389c53da46890471f8bb0a57ba488f78ee0f87c96da9f931931992c8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/en-US/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/en-US/firefox-85.0b6.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "4cd2facaa0b33b02228405e74689770516e6af6f07de8dac096bc66ca9a238bc"; + sha256 = "afcf3c95a99fac0fd4fd6a6c2b1cfaf717b41cd5673d5016f10dbe6f5b79fb3e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/eo/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/eo/firefox-85.0b6.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "6966ac14fa72fb627955e9281c6e54f23eb03b83647cd52934304d672adb6d5e"; + sha256 = "8106ce5dcb41ed97a3deb4d98b5af23eead4651046e758ffb6ae9eeb96f05944"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/es-AR/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/es-AR/firefox-85.0b6.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "ff32191b95dfba73d85caab8aca47e32b2579f92c9fedce14f6e16a6e42c2178"; + sha256 = "b1178b1975b132f0c524941d46e7cd357c0aa20b7ea4f4a87e6e9991b0761c7d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/es-CL/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/es-CL/firefox-85.0b6.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "a7c7a9f646492e8de8474f1869075c568774ccc0118c340721b70c06e5471a5a"; + sha256 = "923187af4eff228d5b3b99f21ae14101f1956fdf6fd2c0de80e1196333ff8baf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/es-ES/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/es-ES/firefox-85.0b6.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "71e78fc680de3dbd91b77bb13b113ee5f34463aaa4791a3b0a445a292e5d0732"; + sha256 = "99725d0085afcf7c6afd28090b75b3605d99df52d1d06c377ca50a6d6621fc4b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/es-MX/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/es-MX/firefox-85.0b6.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "9c357beab45fad0e56f957fa73b8900a916c6cbcc8b18bd5389c0a977ddcd18e"; + sha256 = "24f5b9a87604b82907a56071518649c535568e4ef0b5d045763459badff766c3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/et/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/et/firefox-85.0b6.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "a3de258fcfc4d633529566d2d8f7bb582683d6dc22cb3c9ad13a4914b84b6100"; + sha256 = "aac17f4409ef25d6c4edceba79d446bb22b654016b0ac50ba069ddcfd023355f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/eu/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/eu/firefox-85.0b6.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "092cb149621ff664ff4462c39266ea352971b30f5dfb0db163b62cd3af4e0fcb"; + sha256 = "fcdca8bc26eed4d49bb93007b49024d192be06508e5957fc1e3e42ef3c3b372e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/fa/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/fa/firefox-85.0b6.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "083d17daa3f86af4651cf433180750bcea6d00758ada3ade80bf2f713b3c04f7"; + sha256 = "9bf51b0df9d3cb62ec9a8675344aeedd2b4466854cebb000abd02d7c97da3777"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/ff/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/ff/firefox-85.0b6.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "7de0cfa6bbdd1061cad1a72d80f5f504dd163a066c9911e1c44428f02b1942d7"; + sha256 = "647f628344b3951a8cc3e857ae02da89a818a6f8dcfec61de006d9f5b90d51d7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/fi/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/fi/firefox-85.0b6.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "d718ce1837fcf64bf2b324724603559124697e58ddce8324c79e582c7f644205"; + sha256 = "1c49d3fd8a909c74abffb2221cd9811e15125651ca42d333d4ef5d8f322b8535"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/fr/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/fr/firefox-85.0b6.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "74e2ab8182100b7e69c62698bcf5b03cb127f4e90dcbeb35bba7d66b58a711e1"; + sha256 = "3be80ec1f775ed8c78c703ee064cfedc20aa57f948a8c732008a58ae45e946a0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/fy-NL/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/fy-NL/firefox-85.0b6.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "135317f51eb93e2bbc18401c8e5fd2c070b3688fc6a9bb54e9e78bb7f37c676c"; + sha256 = "5331c0de8436a7cf1117c92249066160930b3902ce3d157a0cca53d74a85cfdf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/ga-IE/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/ga-IE/firefox-85.0b6.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "77fc52e186c1f823067a7fdb549232a080753c813afdece12f49444bffa6507b"; + sha256 = "90b6957c43d85e223ef19496208e3df53ff82f5944bcf5c6152f83d76b744a7a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/gd/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/gd/firefox-85.0b6.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "abcaca790054b035687a78e9ae8151459af4b7f2d9d561d6ae41c87a0308c694"; + sha256 = "5398cb9d6672b35b72162dfca4f5e612a813dcfbcb547bc028d6e1c6da06c199"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/gl/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/gl/firefox-85.0b6.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "291adca54f86591fdb67c6a958eb7784b5d5d4996858ae8936a5615c89e2fb4a"; + sha256 = "775e8e385654b779a7be837e0de813e23ba9a3cbf6fa8748853684601d8a898d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/gn/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/gn/firefox-85.0b6.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "0c8dc262e96c0a912cc8aae7e1ec76da36091cea47ed535eddb8039564ed24d8"; + sha256 = "209ae5fe213270d765ec71875db6e1ae3c78ab2f704cd9077e2bdce4160db6fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/gu-IN/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/gu-IN/firefox-85.0b6.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "2fb8fe3c39353ae9b03018ab17a3531ae20e1a6794871a7ff02108484f641801"; + sha256 = "633ccd3a605887259b5a1d229c8661c4c83948e42e51ac87231457591c945efb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/he/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/he/firefox-85.0b6.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "3222cc40ba99d0833a3a8c5bd2e9e8c74ffe0e2209891899e9d37b6a35bd8e41"; + sha256 = "09f6069395ee4f8b7efbc8efe8311abbdd247af624dc045aa00e795e0b9e74a7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/hi-IN/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/hi-IN/firefox-85.0b6.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "bb633eeadb00cf6913190221e5720c68da8d7a7d5e51b5f1d32621ab35fdf7ad"; + sha256 = "9f99c34b11f0630ff93275810d686fcdd9f22ba4db6c173f6c748926d365c7cc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/hr/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/hr/firefox-85.0b6.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "21a8dd0e511ff658e09a5497925fba833c32d1bf6537f11e53eafb07d6bd8854"; + sha256 = "b79dd9c64d5b57082a22a2b0c98adf1b095c9e157622054e1ea51c876beadf07"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/hsb/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/hsb/firefox-85.0b6.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "c862804fc9602884bc8074631d51e091866177682a6767e5b4935a3315b2ea82"; + sha256 = "ac1c63c2f27e2eefab8d4fd0f5d928d2f6e3511fe6ce42a05b91f93c5cf5b782"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/hu/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/hu/firefox-85.0b6.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "bf92592b0f3697e828c9b07d24c5394ef6cd980c94248ceaaeb0181a1d0ddb24"; + sha256 = "401d74cb12c26412e7d5c31059deec4f8fd4494363f42d0c686a0711442d7c4f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/hy-AM/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/hy-AM/firefox-85.0b6.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "fe5686fbc9c1a173c4ce11695675a4aab2efb7d340bccef797d8a20eedadfbc4"; + sha256 = "ce726dae6c56bf8745037a2a303aa12d4196587562342d570914d9ac45ec3227"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/ia/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/ia/firefox-85.0b6.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "791423722d872ecf6c45e0f16b74626e19764c003cc5f2ac2fbe3e1bacea9422"; + sha256 = "7846e0c8330669416025f2a80bdde899fb18662eaa319518b9ad125dad40a4bb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/id/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/id/firefox-85.0b6.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "df4b06f6d4946d2dcd55130df46b7cf5e391ba433eef792854ef8338dbcd891c"; + sha256 = "9d16ff95e831721b146f7922bff50867e29268b52142ebf7524f85c0743677dc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/is/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/is/firefox-85.0b6.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "d60f08191a68e5f4cfaf5848c6d0a755c9033e853e6da08eab6b74362c220ab1"; + sha256 = "8e26a368ae652752873a7c1989d1d2dcb7376012b576f43b126dde9f074f01c2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/it/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/it/firefox-85.0b6.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "a1d38ce8785cc3f15d777e226aba48fa1448da021092d9aac340cd02ccfb5669"; + sha256 = "8a853b8fbaf02016103ab15a44081fd0893908371813d94d2e92393009e17684"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/ja/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/ja/firefox-85.0b6.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "02626394737a87d0dc80365b7ff7829bb1d1191a65a063d4d079735199ce2731"; + sha256 = "2d82c8260f92225c4138abe5bbb547ee132f24624de51ac8546fc8cc2d1c247c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/ka/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/ka/firefox-85.0b6.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "4581ada66c25d45db22d4cd41356e30b0b9fa88132758e219e15ed70dc4055a2"; + sha256 = "84a767c016dcce5e425d905a67e2244d1257c77d0e17da69c4c3c1ab85feafb1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/kab/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/kab/firefox-85.0b6.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "24b4d9cb927322b3805e930a54020fa84e3925d824363ef824501ff2769cb015"; + sha256 = "c4d217ecc85d4f3c5ac5fbacbc6d37e19885d2959126465f01f45f2026db5d2a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/kk/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/kk/firefox-85.0b6.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "868d5959ba761e578b5a2d00a29c244cfec0108a294fd52b18682cf31173b9c4"; + sha256 = "c2556486729ab7918eabd3fb917c71d3081e7926880712c6f78b847c868abfc0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/km/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/km/firefox-85.0b6.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "e5f63ff912c920d92d7608e2746d429737f0868bc5fe33d3c460ee1f745e242b"; + sha256 = "30a9d1df4d121c02a3c1bb0d3c1ba2ac0674586ea56870cf9b259041334b7545"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/kn/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/kn/firefox-85.0b6.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "65d45e29f289cdefecb369862fee62be698abad2b8452687507a52149b4d1de1"; + sha256 = "740a09e9152df1770ead58c1b4cbd5be307479edd29f0a14a96a3d578f90852b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/ko/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/ko/firefox-85.0b6.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "83a516bbf83574f20339382778378a889016e5947c882fab63aadb728023465d"; + sha256 = "eef655c31840dda8f5d972a1009deb7db42fef9a85f6d94fb8d7bb1080492b14"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/lij/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/lij/firefox-85.0b6.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "690522d1a0d67c5538d567accde52effeba8b16cb4c36920aef230a62e1f655d"; + sha256 = "6d5ac3729f737a0ecf115c4ba730ec12c43be59e00d9ff3e3df25eb95fa18920"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/lt/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/lt/firefox-85.0b6.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "f586dd3c96aa61d9aa19ad734f4a61c9e1f6a530795ad486a2a1ff4cb18f0854"; + sha256 = "da9a98bf577c1402ac07023fd2957fdf83385238dc6914403b3d3473fdc84608"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/lv/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/lv/firefox-85.0b6.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "002bdcaf29f65d2c81b607e36c280f73a08cefa32f9e878ca2c834b80eb69435"; + sha256 = "cbf2d767419494583b5a4393f4955ac5248a9f370c87006b9ff5a0b9ef2d46d6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/mk/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/mk/firefox-85.0b6.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "06179e95fce7f93f410983664077e4213f31272ea626a8b3fefe1e78dd0b7fa3"; + sha256 = "8c203265e7424c68617f24b0c254846ca3c9f795f59dec2b1ee90bd2e9e24fbb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/mr/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/mr/firefox-85.0b6.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "532c17600a7ccc995424759043f0dcf0df5a10870bd7daa92c39f3a2a0b11c68"; + sha256 = "2527688b01ade72c23c8a166bc3fe71ab6ebbefa53f95431ad748172c757fc32"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/ms/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/ms/firefox-85.0b6.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "b315e64474d410e4c6c403b1083b98fe5bba5f20fa4fcb115671c58075e1ad65"; + sha256 = "54345ecf9bac43aeb9dc5bcce2f6ab95873c30d167c9f0e25276260236349ac2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/my/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/my/firefox-85.0b6.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "848b472edef05971e5d6b003a1d3241c0d34a3f0b2a54ff97ed3a7f2ac96bdde"; + sha256 = "7d55f9c3b0372e8df4f1efed73e7904d6ca76d42384e1d69297209aee89eb538"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/nb-NO/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/nb-NO/firefox-85.0b6.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "ca2e64f608b908b752413d9da7c8ec2cf23ab2f49df6362ce381b0d31e9caf56"; + sha256 = "7323cac2c5cc65cf6717c8e93c81cd8aa1e42c4dc26a8fafdb01e909d0d03627"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/ne-NP/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/ne-NP/firefox-85.0b6.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "3386312e032b56457483fb46d935773adf12f3a3938ac4c6eb5b0c12242d93ce"; + sha256 = "5aa7399107c721555b840632c724f0ba8ea410561b36ba278304ae2672674d13"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/nl/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/nl/firefox-85.0b6.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "7bbf63a4acf403611daf55e6663d796a46201349d29531245261aa5a8457e4c7"; + sha256 = "134e77e589dde44918e383dd3e08489ba855d9e15d542283f26c465bd84a1677"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/nn-NO/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/nn-NO/firefox-85.0b6.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "f126bb842ae56504ff25f9ee0765cccf7b9a4bce1d45d382f6c13d23792bbf47"; + sha256 = "ee6da6a70f8565cade938fadb6d3b25c8edf860dc4210e26a1b93034adcb57da"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/oc/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/oc/firefox-85.0b6.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "3f4045cfe03eb4fcd16215b5693913577f6c5fc68ba74528c6575a5573528241"; + sha256 = "9fdd1fe265330c1b070d523e1af0d6dbde077583cb1e585b718112e49d044039"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/pa-IN/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/pa-IN/firefox-85.0b6.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "cd4e81e714f78303603c390b490144e27f5f83ad436e610842aa04c242c8a549"; + sha256 = "b7fc81bc71c30f48c40ec5fb4f8318973122523515c523ddcd98126c7c3750ed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/pl/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/pl/firefox-85.0b6.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "9147013773bab5f5da15e021becda90d63daf7f7068d7947f9d7eae3bdb0e124"; + sha256 = "09b877af3b15dad1e25f7c04a7e94990cd6e20705a26e3cf715a30626fa10646"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/pt-BR/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/pt-BR/firefox-85.0b6.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "20efb971aaaebe780b337d1525eac527dde028eadecd5247321a5db5f0217143"; + sha256 = "81db09ed98266347740569c02cf0993ffb532dcf9e5c814496cb3e4b23133b35"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/pt-PT/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/pt-PT/firefox-85.0b6.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "765cbe09264ffc15115da555500ae376bc1a91458c872ad7e4876701aab6f10b"; + sha256 = "94bc77310c90876b2f787c1c004212947572fc45864758a7f59d2e2ee9488a16"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/rm/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/rm/firefox-85.0b6.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "93f5d6ed649d275ad4ee1f9a7075e8b4270abe6275b57eca0759b2a8efb08cff"; + sha256 = "71ad541e5c119f05cea1ef6a730f860025d105112907f8dc6ba2a4d33f8efcd9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/ro/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/ro/firefox-85.0b6.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "aa44ba543a08a56f46e220f41695da4aa0fc97c9569563ff0555f308117cc983"; + sha256 = "d699396c833a48bab753a76456e653d90e62a0585a9c9ee9ffdc6b30d8958778"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/ru/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/ru/firefox-85.0b6.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "6a17313ad121e9821a766115259a8f29ace0ae683d18a86c844073e671a4b0cc"; + sha256 = "6bc991fd34ec649da0e85e5959197db7e92e2b52cd9b5b3abc3d631ec5cf5bd2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/si/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/si/firefox-85.0b6.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "2766789c614ca35f6ec7177464c5cd2f5df5ec1ccde71e1835efd6f3635e0de5"; + sha256 = "11de780455b3cca25ab64a58f3da00062fc29ef43973ab0d34435bb99463c23d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/sk/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/sk/firefox-85.0b6.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "7de262a9caaf141c37d819f89eb3b1ee7ab932b10e345e7f9a50db7f1e8cdfa9"; + sha256 = "773964f567fd6df114795d3f362e553664d028f5d6ef7bed5852397852f5412e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/sl/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/sl/firefox-85.0b6.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "e31fdd4a192daefe7a3946976c7682e15ebb61b598c5dcf8bb7a870efd3a9e27"; + sha256 = "284f486353dc7dd57f3dcdcc82314cb491f7a37d8aee04b2d35982f0bf9bbb0f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/son/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/son/firefox-85.0b6.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "532dd0db390b3d8da03cb5f01e26dbc0752365e782e0b2d11925c14f5dfd8f0d"; + sha256 = "e1ca542f40f91b69743ce53ba001e6b10b55a57701ad6354f025f0f6a2a66727"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/sq/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/sq/firefox-85.0b6.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "35c59d0543506c625fd6ab0c181566c5f370aee2504970fd37b50d0d34ed0e8e"; + sha256 = "8796aa6b9641a33558f4aa2c55cd425fcc9fe7e7c08fa7de2bb68341e337944f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/sr/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/sr/firefox-85.0b6.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "a6f9d8fdcfcb4b4a89e14b84e6a88bfdb0d6b578ee8e4129dc1f82bd933ecdcd"; + sha256 = "a4aa9131f1cd1aadb550f6ca312e490142c4caaeb6cf9d3f2e81699bd9050f0d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/sv-SE/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/sv-SE/firefox-85.0b6.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "664b8b51429c0267a745a69906f32757a28a4ae8b23bc2f591d3b190a3091379"; + sha256 = "995863c51f9f91f3667f3927b7135e995d47b2ebf5bb4d8ccab28b0825af41be"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/ta/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/ta/firefox-85.0b6.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "05679379a0abe41cf46ab182018810ca42cf8b81686f48c3c644928db85d4c76"; + sha256 = "e0318bf4e87f2bafa43939fe3931b626501fbb5bbb91db5b50b71d946332a66d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/te/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/te/firefox-85.0b6.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "1c884e460b6e5a0e0c27e087b3f81a3c4245f6a5ba5ea2784b2b0b61114462dd"; + sha256 = "0c1420ce0e3c4abdfe2ccbdacd1632c619438e84faa2cf29efead3a74ab437c4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/th/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/th/firefox-85.0b6.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "9ea2b02fba273e970bd2140e713468b300fda7cf50451f5f4f840220b782e1d7"; + sha256 = "db256f39058d8e6e8d8301ac0ee435ff41b1c547b9357f99c91c8de325da9298"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/tl/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/tl/firefox-85.0b6.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "ea9334cdbae5921720974575477da6310fb75c02eb068cb13d700b71df1596f9"; + sha256 = "fa02d3cc5fdd6512b84e04a27e0af95b01986403f16abc04484dbfe873fce537"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/tr/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/tr/firefox-85.0b6.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "c2314d1159313ae8d330244150cfafb5345d7515c5062c62ae31d916f69bf4ea"; + sha256 = "3a936bfe9b169dbb4f02f5984df1ccd0c37f19c7f83c05a56fbdb8ed3b6009eb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/trs/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/trs/firefox-85.0b6.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "769acc367c1dacee2617e784a98d4c546857123690f902783ed9f97c10062f8c"; + sha256 = "b995caf1c8128d8b6b60819d0ddcc3016f4247cf83cebe8c3aa2d1747f6520f5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/uk/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/uk/firefox-85.0b6.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "d9c179bc63a3c9d8ec4722afb4cf4a3cd4175d01542477fc132147521d7be0b4"; + sha256 = "e4f53e17928fdaa1d85c8272079e5717fb9c443dc2659ac08d95524703883e2a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/ur/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/ur/firefox-85.0b6.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "ed365cdf1f3ca389b308a2b9ee405917da0dd0cd1536c9c7a4e13949b118a2ca"; + sha256 = "84e7d6e01a570df7ef4b616e075cb93d1fc7fcd5da0a3adec179e99363ee5f92"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/uz/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/uz/firefox-85.0b6.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "b6437d5c406edfbe0c3a114d230a5b9beaefec04e48c92d01a7cf900f6dabd56"; + sha256 = "15bb01ebaab8ed4f022829b9bf7f16e2fb5fe90e5ca47e300e2cb2ccd66d922d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/vi/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/vi/firefox-85.0b6.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "1d6f91d852f0b20e357e1accc6c43ad93bcfe2e5a92f04a89c1d4bace70285cc"; + sha256 = "a8fc45cc1ffc151414621d8e4f36ead409582e298f7e86bc2943ed6f20dd7f90"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/xh/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/xh/firefox-85.0b6.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "597a04402d0d34f10c6e3fbd0f629eb45c6b3b8eba2c63917074bb34c47e8cf1"; + sha256 = "ac0089e7ce04b218eae0ce40245a75626523035218cdc7ca2551a9af8a18d33b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/zh-CN/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/zh-CN/firefox-85.0b6.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "e4df77f3447615bbbcb21904f15d2d18936ef7216c047a62c6901be00343df6d"; + sha256 = "eacf3a23fde07908effacbba3cc346d1e9af088ffde81711e3ab3e087bd86e6b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/zh-TW/firefox-85.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/zh-TW/firefox-85.0b6.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "f0d9f95b465bf5a60bb0ec5906354acb705e78ab7dcfdcf0c09a3f26e4fc7bfc"; + sha256 = "e31a9683560465fa6bc97edc46c42071431d62ba4a55f5f066d58ea60613990e"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index d86b9d6f9870..1bf97a8ad98c 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -193,7 +193,7 @@ stdenv.mkDerivation { then "http://archive.mozilla.org/pub/devedition/releases/" else "http://archive.mozilla.org/pub/firefox/releases/"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Mozilla Firefox, free web browser (binary package)"; homepage = "http://www.mozilla.org/firefox/"; license = { diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix index 5f16fb1914ab..a3c60e257833 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix @@ -1,965 +1,965 @@ { - version = "84.0b4"; + version = "85.0b6"; sources = [ - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/ach/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/ach/firefox-85.0b6.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "6b548e6e2753e4a0ad2ad5968c063b6f4c7866c297314ba9e807161f7c757275"; + sha256 = "eed87dd1f8683805d13f5d42f8d376ccc760c6c96b7b049ac6d5514e00122722"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/af/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/af/firefox-85.0b6.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "f75bfba14ae1a248918c0e433c343328305eb6372dd80aa343506437f631f2b6"; + sha256 = "233e9d412982933e2880d2c9b790d56cfdf15b1d55e8ee1f0819ec445faca451"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/an/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/an/firefox-85.0b6.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "d2e972f7d345720a89081fce3b9257942c93bdeb2a5c7dcede3c30282407f159"; + sha256 = "d0bfab4288fe0fb53e0e0087d68d79699774900dd79b5eb32b36d33d757043b2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/ar/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/ar/firefox-85.0b6.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "2731722dbd097875bb797a555e9a0ba3843deb159f7917626d8e97c1a3005e7a"; + sha256 = "d1181d7ea7d3e27f0ff531a3e3d547611f391e5ba0bbf0de4e3df6334b4b3e75"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/ast/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/ast/firefox-85.0b6.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "4d626c7f293226e9e18e28d069b40f75914f9387553d54588c34e7dd70ce1ae9"; + sha256 = "b9b08b7b267bb59b59e310b430298267d1b5ed89086b2dbe51f6f6550324e904"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/az/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/az/firefox-85.0b6.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "01a647694a6aa2bbd8ad531197565593783946ad248d34f86550d28b8be5b52b"; + sha256 = "cfdfdf835966e03a3ca036dba3fc175282c0a8ea8c8db9ab0391837e50507e7a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/be/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/be/firefox-85.0b6.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "49639180573943a4bd4d0672c5dec969850b4bfceca00c37575c6d0f2d589a7e"; + sha256 = "f32addb95c794a87ec44ac1a575ea0b9279c6f8b4bbd72b02793a289743f5028"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/bg/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/bg/firefox-85.0b6.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "c575261553cbc6afcc60650e21605e1298a122b975f6b6b2845a35725fe2ff25"; + sha256 = "511ecef8b5cefcdb6f7c0cfd257c156097af8f59e130b6b1d74340437014abc9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/bn/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/bn/firefox-85.0b6.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "5c5ebe2bfaaa7ea16ca4285d9806f3ecef1b29b61e5018920db27e050a4ef521"; + sha256 = "e76dd71557d5655e1fe13081511a6bb84cbfdad9bfdc7b44379c0d0dc8f38dd8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/br/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/br/firefox-85.0b6.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "29c764eff10d3756f258f0ac5cc9bec14cc46bb66d804eaca5548cebbaa067d6"; + sha256 = "3d941653521853e57c2db3a1abeb5fadc81b11050ca69811b010d5fc63936bd6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/bs/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/bs/firefox-85.0b6.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "7730a4c1e7d4d791fe35f000bba72d3652fe7289eb95f5e77b426995a63ef412"; + sha256 = "47059e2a4a5174357be3a1e23cc8a97a0c2fa4cee6e58f437d45502ecd329197"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/ca-valencia/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/ca-valencia/firefox-85.0b6.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "fe90ef596de4262d803fa282cce7b30c1c9bde896b31d7e47d8e862e38ca1037"; + sha256 = "47da19182c2ca2c8dc25acbba971cec2500097e20a977387c326036c9f4da527"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/ca/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/ca/firefox-85.0b6.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "f435a47a36affd5b59c7a6543f1c1c7e0dfead407138967a0f295dcd6093bed6"; + sha256 = "248fb9f284fa482307be01ac59f082b84475ab550d5d8e53168e239c74cd5892"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/cak/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/cak/firefox-85.0b6.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "ec4968ccfaea0a975a4f56aaae8290387707570cf899d078438ac2cb98244fe7"; + sha256 = "933e6a5f026eb2e50e8d40a90fde7db56325f7abe59caa99d2edc34bcad16f37"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/cs/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/cs/firefox-85.0b6.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "357c5372b6fade862671db66b90b3382749153c641bcd7c99f7b2a3c68c143fb"; + sha256 = "7d0943dcf8716eca125409310e821b87805b036cf01a9bf7ec06400b4e97b3e9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/cy/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/cy/firefox-85.0b6.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "5ce8f5e451fb2271635a2cada6c7b54a53936a1b912b777d54ce640cecb3d37e"; + sha256 = "d523417a57911df738d07fe6c899b95897686f8ea94e27cc778a02a21a417990"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/da/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/da/firefox-85.0b6.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "ac790fdafd2875d180be2375937b38546dd77d6e9b8428f4d44a2b780b4db14f"; + sha256 = "dd7c7acfe40232ac66cb60ee6b3bc6a1dd84d2930f507898d74ddef8e6a60355"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/de/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/de/firefox-85.0b6.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "6c5205a4d74da62927648f95a069ed6a68ab012f2cbe0c4cded3de8d40c3d325"; + sha256 = "51b8b9b772c901fd8b3bb61eebec4a0fd8541c51b9011be57cdb83311035e2bc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/dsb/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/dsb/firefox-85.0b6.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "516308e19f0373b3ff75e2e114fc7f1d2d370cd4a0f63f8bf74704eced2e0d56"; + sha256 = "b5175eb5e72644c3e7ed6dcbb1015716f923c50c59ce8e6ff3fea49195d08478"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/el/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/el/firefox-85.0b6.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "d35a67fcfc8c5c334f55d12810bdcbaab6b9cb5fd3aaa75c79977accf7429445"; + sha256 = "abfe077998a5f3bb2e1b4f2b69b84ca5af72e0d18dcb584bb0feae2e0023e299"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/en-CA/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/en-CA/firefox-85.0b6.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "e8d36d76d791108a6e514a649eebc9c4814aa8ccd4b21728e56a4e9839eef803"; + sha256 = "c8b8b4d9619348c9f97f03e222035eaef9d933d46526607ab2c42db7c4a5f21a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/en-GB/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/en-GB/firefox-85.0b6.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "9bb695670d7ee7a3a35d9adeef579e33f076fc1eca717149a5078134f584bf70"; + sha256 = "9dd9aeb143c9ac871e6c1cbe16b993f765d84b7fcdf50877e4cd89bb7281948a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/en-US/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/en-US/firefox-85.0b6.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "595b1004380ac96663c2d8889f02a681ad7c5c56e0f12cde4a26a6453d0a0ec5"; + sha256 = "df2d745d5353ad3d91d5c62c00ebabb17209e91aad52c240efeffe002e6696d6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/eo/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/eo/firefox-85.0b6.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "cb6ac56d074e91e2f5154c275c4c3a46e4392586451fdbba52fb419bbe085c64"; + sha256 = "7fd5df96fcc3a4ca2e960e83674e3120143eadd47c5b0360f11f573540d4f59c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/es-AR/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/es-AR/firefox-85.0b6.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "920e2aa05414fb72be7f24240636e7ce7b431776cc919c5a07c1361da3f66289"; + sha256 = "d22f3d4b6a2f3b18b375b2592d78cb06c7c92318c6cd4a5e8c70942300bfad94"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/es-CL/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/es-CL/firefox-85.0b6.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "9db297046da02c5c8e1f6d5ba0e4f6b35ec8b8d36335dd2f7933e49d86c207b3"; + sha256 = "a3f267296b829f6fd2344b3bc652abeba7780e0dc455f6f23fd2d7b66efdd846"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/es-ES/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/es-ES/firefox-85.0b6.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "ed94f3ded8f803f956290976cfa41a5c46b42da7f3158b4283445ded15fdd789"; + sha256 = "ffc5f413b90025e5452e57b07795721456aa37e4bbb2a6784e732e8a57232e9f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/es-MX/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/es-MX/firefox-85.0b6.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "11e2a8b7084ea002c6efd92fc86529e2dd09afbe4fe52285a3165733af95e132"; + sha256 = "c170fdce52b35551ae49d2cd330df761f0d0efc5628708edfa72aa513e89c99d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/et/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/et/firefox-85.0b6.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "0baa470895983b2c85f9ecc79f36fa1b6c8578c5bc22be76ef10d6e7f9e11ee9"; + sha256 = "d256ade3513817ffa8d79ac652fd51578ca5a9c53043898e7f3520ffe6365829"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/eu/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/eu/firefox-85.0b6.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "271141d85b5a0338445945208d515ab9ec6452253abddb1860c31cd61458de4b"; + sha256 = "0720a63b02f38ce97c902cc221a85e41ae0e2d36ecaac47f5f661d4be89b6abc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/fa/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/fa/firefox-85.0b6.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "d467a6e1eff3b2edad56c6b8b58a7fe2d7fa5c07524fc0d567b660b29169ddf9"; + sha256 = "78a4aa339dd5e56b4458ca2096b538bc27d272b953d207e44a41c8ab19de68b5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/ff/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/ff/firefox-85.0b6.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "4f117b8bd69c01cb6d38b927ab26cfe79fcd111fc9a4a2e53ae4ef936bc9806d"; + sha256 = "2de463eeb3f70f4d16ab677a6980c5fe229a69c1b0846804dcc58388b8679a7e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/fi/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/fi/firefox-85.0b6.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "6eb9d0c0d1ef84abf0af2a873334dea463d728ef5aff398417e2ea3104a4503e"; + sha256 = "ba880a3ff4e45c5d30d813a16e9fc088995a9c2fd2a32fda4d53c1e2ce74368f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/fr/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/fr/firefox-85.0b6.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "85d4b90fabcc03d3ac396bdba0749794bc3fe447c9f2ce793962a2acfc35918f"; + sha256 = "820cf6d9813048f95719d6599a9a4cae1862a6677dca3172b87339a0735ac37b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/fy-NL/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/fy-NL/firefox-85.0b6.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "462e14991e34122e2275bedcd6776d9f8a75242c2b06d84ef3dadab08428d48d"; + sha256 = "b2cbbac775d1b4a1d7e6930427198123e82f4959f3a65e38913d2238d6f3ad1b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/ga-IE/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/ga-IE/firefox-85.0b6.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "b0b7def94a250ec52fda4e4fe0de931209fe71eb06ce03de13bd7309c7f78d79"; + sha256 = "256cded01f746ed016894e7491af075b0d1ab08302ce76dc62e71b4a27e6c390"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/gd/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/gd/firefox-85.0b6.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "e3bc980f579132b68cdf06b06abe2303430df239444971010ef420f5fe1599f0"; + sha256 = "080ebf615b64afa8ae51fd198e5fcbe8bd8a9843ef5101c631c51ff880b2d46d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/gl/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/gl/firefox-85.0b6.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "66b9c65dedd1b57cfa2d960a40df72dca473f39f1cc585e1406abc64d68b1ce5"; + sha256 = "27b6a7f9d52f3fa96ec69d99ef18faacf856561c7df187ba2fb568654afb2e50"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/gn/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/gn/firefox-85.0b6.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "ad707ad91336de1c0d1f26fddebb95d25a8ff405bc3d576660ad9be0f5643939"; + sha256 = "2ad562144f3daa93ac986821b56ac8229fd89ce2820186d5d318759f4f863d17"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/gu-IN/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/gu-IN/firefox-85.0b6.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "585c76f373ef5c3f3b86a6cef4dfcdbffe3e314ba737a3f514bcd871140e5aaf"; + sha256 = "aaba5d2786dfe9cf2e5ef3f134a4f011deaf25f9e213c5295d905286881b4062"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/he/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/he/firefox-85.0b6.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "8f9ed5eb32fe9272f5adc22753997292cd2dab7b1368864b4f001eb0fffd7526"; + sha256 = "fee5b30ca488d1eca1551fc645319f47af658a80a0bcb4c68509cfc5aa398784"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/hi-IN/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/hi-IN/firefox-85.0b6.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "22d8b3d494f3b0dc5e347c0fedd5ab2ba32690c02993bd2a9066a987bb87aea8"; + sha256 = "ace82312d206cf07d54ba722ab0ed30717f8ef0c0fbe881123ce87a94f16b67b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/hr/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/hr/firefox-85.0b6.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "c3a70593633985fcc8974364db75f2998e450359d4a8b621f23e95df24cf8e6b"; + sha256 = "a017dd9dd83217affcd89d7493c91e605fee0e238ff03d3d45d10466df9a5ba4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/hsb/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/hsb/firefox-85.0b6.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "30701d1b25536a45a6a5613cbff8ac83bdec08d6421f1e37d9f0ae9c39ab6856"; + sha256 = "0d3f105a01e1f17f7ae0c95772d39a134f6435aacddc0eb5b4949a923df7b4e4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/hu/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/hu/firefox-85.0b6.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "bcb63dc6211b5c24536062ed6f8a424edf0ad553187b298874d97f75d363b1ea"; + sha256 = "51807ec5741e07265b090804d7ec3b4cd93c8f459ef956372981d9e150eb4eec"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/hy-AM/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/hy-AM/firefox-85.0b6.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "0278018d35f7be3e4c8da080bcd86e2bf08a544bfd452136483d2b21f91c582e"; + sha256 = "6955245256ec8ff28b0222cfd63cc9d77c2b9d4b379ef1e58293da7de0b579b0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/ia/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/ia/firefox-85.0b6.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "d5699f8b946bc551fea78389cc6e82a9ca58ca3a8a492cbe3b985ed655fd60d1"; + sha256 = "3d982431b0ef12cc6cc4010d4d1bc613184968a44c1f3f6ad08d8d52bcf1ef77"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/id/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/id/firefox-85.0b6.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "1e2c580382192e88094738a01bc99b7efda5a1010e1bb180e35b5701f03aef55"; + sha256 = "8fa2ac22a1c9a1074390cf49215198a49ad781129040eb5b17fac0d0d49f816c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/is/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/is/firefox-85.0b6.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "a541657165e18212f97261b2aba391434246688451cc9f2b643a57891dc0eb1a"; + sha256 = "e39e23190108c37bf146cdd9e1c913aafce616f89946904669f7485c806c7f4f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/it/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/it/firefox-85.0b6.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "5ecf7a03bc8e8d6329db2bca4296cf0d07b943ec9c9e0cbb2ffdaa4ecffcdf3a"; + sha256 = "3c5ec976abc93fc4b0cd2ee24babde515e92d9beb8d058ae6fd0007980210600"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/ja/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/ja/firefox-85.0b6.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "80d6148dbfa8e95e5292699b5326171f6a44eaa30dc4c84b233191a8505a248b"; + sha256 = "6e9ecc227336f2e5b193678666f02eb8d82bfc13bbace4bac7a7045a691af358"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/ka/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/ka/firefox-85.0b6.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "9f15ef55fab16e0086466e696f35dc3107451c2b9ccab9452901cf66723bf688"; + sha256 = "0550b02dc3ad2c2e4db998b7ccb90d7add1c1562b33fed34e0aebcb0c6157a4e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/kab/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/kab/firefox-85.0b6.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "762be8a3bee38ea5b939611b4fbc9fd5bfe71e80b685cb0a8937373aa19f94d6"; + sha256 = "5d2e3692c9791a29820d424af3e219e48a9fb766544c3f658bbf779f92e3dd06"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/kk/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/kk/firefox-85.0b6.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "65196c278a5a70c76315546465915626ed0c5f395af4ed1aed0ab2f27846aac4"; + sha256 = "c5949dfe7f7050b807b43b7050270c2bd748e688a6f54c7549859fc7f7b4b22b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/km/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/km/firefox-85.0b6.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "530010cb0d3393e47324c032d048a377ac5c9da16e73888db026f6cec61c3533"; + sha256 = "c3e1e899942db90fe8cf2accea2c6de703ddf1e1871b842d59ee5e69b0a37441"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/kn/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/kn/firefox-85.0b6.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "5233a8714e24a915404b3139aa3496812a4203b866cf4d870b013b940eba41ec"; + sha256 = "9da71516f7ac05965ee5045c957b1d2384a9e331a41db0c8ca648cce1c0bd40f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/ko/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/ko/firefox-85.0b6.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "5dfe6629926804ed0820d472e19e51223565b011dee3feb722a81faa58043744"; + sha256 = "3be5d104b4d9744911ed8a16b9186d3f0b2a83acee05cb1943e7e13bd14ed84f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/lij/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/lij/firefox-85.0b6.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "4bb4bd94ac7aa845a062c366ea47871293f7b5281a460d3547fc321b6430a3ec"; + sha256 = "02dc5a6fca7fbafd2096f452324356e271496601b0ce78f9d64436bf96d8c234"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/lt/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/lt/firefox-85.0b6.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "162d3705cbb8ef0b8036520d59e17eefd8e94bf27b9c1df027e9c0b26b3ebcca"; + sha256 = "0b719e71748e0c31f016fd56ec0940491a950b6bd02de3b96d66106b60574931"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/lv/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/lv/firefox-85.0b6.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "7498cb5bad8ccde4a82e2acf49e899a652086de5c2e0a63f833d5342e83bfa48"; + sha256 = "8d2400f28ecf500bd132a809219b5c1d5c9a469006c965754cff1b792ff9330a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/mk/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/mk/firefox-85.0b6.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "88ffd9ffb56000b42d3878654b6be2413189b93881d29809c5cfcbcd740349db"; + sha256 = "839aeb33e727f73e80cda1e1c025b969cd876a21ee56481afe9120bf0391898f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/mr/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/mr/firefox-85.0b6.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "cac6e4ea74b146d07afa79e85746d9678e6407c733a38367ed36e94821cc2f4a"; + sha256 = "ce978edb70a7137e70d8635cb874838b613dcf2f5fcb52d88e0a55177671c91d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/ms/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/ms/firefox-85.0b6.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "7e5eaf47c232fd25fb5c1e2de9d81351cfcf33c88c696a193219b0ff86a3c29f"; + sha256 = "69e4b20678c3fca5e0f9be238ddbdde264478a5d7e772299d5d2f489bb1e260e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/my/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/my/firefox-85.0b6.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "20b1756847b2cbfc98153ac0d9a646f129b83f5c1383067d7547e9c70409abfc"; + sha256 = "4d9f58323d15af78ba5f4d168097f20a59836ba4a0d7517a617eaa2959f6214f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/nb-NO/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/nb-NO/firefox-85.0b6.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "ac71d2e5520acaa352eba1f26576dc101b7b3a64971b36acbbfe7151b47e1344"; + sha256 = "b22cd9999df9160ff518f8a178b8795566e3e66cc3633199526790f91f2081cb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/ne-NP/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/ne-NP/firefox-85.0b6.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "90ff28f5e3ed56f5472e524f37288bad57045dc5491bc84f5e76f33d1d2cb046"; + sha256 = "648ee88b4291cc0f01c021dee76267f4a552c9a009f32dcc6649fa889e32a558"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/nl/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/nl/firefox-85.0b6.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "267c1d406006feae8bc350bcb58b4f73cc2403682c5786bb500bcafca4aa1ae9"; + sha256 = "f686a56aa16386380c04763c845aa90288bd88959e7c06e93d7120d037263b4e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/nn-NO/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/nn-NO/firefox-85.0b6.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "815e84bf8acb3cec68dd7fc06d7849240f71e73cd710538b9f8a887df73f98da"; + sha256 = "071f10187be11f066cbaf6e78464689799e6eea0d98cfd96a85e41557b7d9561"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/oc/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/oc/firefox-85.0b6.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "14717ad07784d231333584150f04118d22a8616fec76aab800d3208c514904fb"; + sha256 = "512c289cadfc4d3bcf3290feba112855610eabcf04db4bf5659b9dfe67d57ae9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/pa-IN/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/pa-IN/firefox-85.0b6.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "1c1470816615bb292f51cfd1a52002b5f2ed4444be41a3521ef1a40b4e64b2b4"; + sha256 = "5910003d1453d62747a00ad96fd08a32401729df14718695a4ca2c6d2bb3554f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/pl/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/pl/firefox-85.0b6.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "872a505769aff03597c71de66121fd007559c3f1cbb22c67661930de6e193634"; + sha256 = "15f5d9e9aeae9362857374c38e94f2dc7371b3d949ed73ee4dfb234370ebe0d3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/pt-BR/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/pt-BR/firefox-85.0b6.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "d0ef34afb32b0f6d1c266b99ea0f4a9015934112524eee0cadc66faa6898ae27"; + sha256 = "1067c3a6c646d86f57c75ec9ca452b12c25f9dcbfa0c723cd685d494f9e79411"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/pt-PT/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/pt-PT/firefox-85.0b6.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "e0b17a97217c799e4e0067e91374e63a6a99df827442d0193fcf47320af8a737"; + sha256 = "c743f319f5bf60758e4e9f5684378503df780eccf062e1566fbcbdc45c903116"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/rm/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/rm/firefox-85.0b6.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "0c031b6ae10918e65274f5ce95fd03d68011e36ab626e03ad9484ff40b36bc7e"; + sha256 = "6763de605975b7ead71356aac3d239f04cad9373d1fbcd4b7e3d16c87efcde94"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/ro/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/ro/firefox-85.0b6.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "256b81200a5b92763d368b9c5d6f29e191aa4f11b097de1773bc5557d748c3ea"; + sha256 = "aef0bb4fccc6814f225b4e6c073f5d825b6007ac420ad4febae195ad69d5fb71"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/ru/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/ru/firefox-85.0b6.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "734b7d94b896554d5fedfd94a84c827ad6737808cd1f7b5b13be20702d46315b"; + sha256 = "26a7a36e9e440587173660ee5192711b4d2807a1f735395f49fbcd36029261a4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/si/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/si/firefox-85.0b6.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "d2c9fee5e64b8063c834610c2671f9c3fa49a5e02fc7e3482890b534aeb66a7a"; + sha256 = "1a45ddfb2e3fd999e0517b6d5f2f0a645c6f6ced044d468826fb5af5513b9410"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/sk/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/sk/firefox-85.0b6.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "edcdf2a8a00e0402992862e28efb33614b9f1a4cdfed16316c5d4bbc229b298f"; + sha256 = "1431c0c4f69f68548912bd4c1ca705d2bf031d24c4789477fabcb07c81ee8190"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/sl/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/sl/firefox-85.0b6.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "d097a61adf0908041cb3cce76758f6da274cd7b3a006163b004f70e869947021"; + sha256 = "c408b950a78894d3aa25c7809db91009e9c62ad8fcb46128b3fadd16c286dace"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/son/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/son/firefox-85.0b6.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "d60731c5976825f0566502f6211d8e22388ec9d02bd122272f70a0830297e1fe"; + sha256 = "bec096139548f807eb186c7251830026e13672a7ffd6433f362718939292f28f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/sq/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/sq/firefox-85.0b6.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "5dffa799eec3baf2e55d7b690cf73c2b190e369bff32dd1800020c0fdf912c9d"; + sha256 = "0f2d27abe79792a7b43757d5ba9f911c2fb4d8949dfe3575d313171af47b7ab8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/sr/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/sr/firefox-85.0b6.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "abb5779af704c926ca90bd9b9a01eb8de1b1b4feae658d5911bc523739eda0d3"; + sha256 = "ab009023546e88becac31221e77ff580d0e4afa0349cf0b757ba5791bf93da60"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/sv-SE/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/sv-SE/firefox-85.0b6.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "2a228577a4d6c11a433b8c0340558aa638de175474491428b05509019920f8e1"; + sha256 = "0abde9db34df6dfc52a8c330b5ee053b0f4e7ab9ada8aba0c73265ea18caef0c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/ta/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/ta/firefox-85.0b6.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "82f0bec91719e7b2a355c9b0398b924ce4cf429bb11e99d566af9836f5087acb"; + sha256 = "eb3b06f339e147a5842290f1f81fe64a6cd962bbedd558ab6799fc2ae693a84e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/te/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/te/firefox-85.0b6.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "9e581d2dc107c385142c3bbb5476e3bd94e700cd8f9e36ead46d284d5708e9c2"; + sha256 = "ff9defea15c81409bcd792e309acd1625befd28226135725247bd930522a0c52"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/th/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/th/firefox-85.0b6.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "096ce747a12c0b773d34517efce6aa4aaaf09385c5cf088046f7217639a7ce9e"; + sha256 = "c1c60488aa488aacfd4e292c2ed8e89bfd16df176d9eff137bd84595cb238e42"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/tl/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/tl/firefox-85.0b6.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "3fc48cd9839ba88f246fb04fe34cc5760aa9e40c8fb782ea57347e32d66030f0"; + sha256 = "e37978b0ca1a8f1c6511ce2075ef50c2c1f562bf12fb08aaccaa6ab2a352dfc7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/tr/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/tr/firefox-85.0b6.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "087c629e5aea8fc698cbc5608c270a7099607b34c5852b3b3f4091af3b7c789f"; + sha256 = "764b92edd78a83a069ab7e0227766da90ea0c86021abed7e7a6ec107632f9699"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/trs/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/trs/firefox-85.0b6.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "4df467d46c5830a3d96f87294c3dfddcc397b73a372ba566900123f7ab86a6ee"; + sha256 = "e484d739d06204007319a209363e7246cca5649992b7473b5743ce383c8ee38c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/uk/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/uk/firefox-85.0b6.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "11090c8aa00533c456ce96cbb09691c816fa2f98ac421cf581c86bd2bef5f296"; + sha256 = "3b96a7266f2e0910b3153c1ae1edebf9e735d8f579689fc45cd5284c92d06a8f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/ur/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/ur/firefox-85.0b6.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "8e7a5cc3606dc6cf71de328863a9107c36024001a381baf00daab11bebb857d7"; + sha256 = "555ae2d93a212acfa8e4af43967d5a5935dfd6762287b3b32d475bc45a0bb1d4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/uz/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/uz/firefox-85.0b6.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "bb1846dd3b7bcf3b657d64bbd215301565dafee00eae96cee15fc71b40f49877"; + sha256 = "bb6dbff567ee057c65fc8aef70a18a03e0bca9652e2e3ed745925069f43a9186"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/vi/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/vi/firefox-85.0b6.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "375805742481f8f33adccbdc7e10f21ef0b1a0ab383c379e4dc13718c3f8fbf8"; + sha256 = "d37b36e3d15186dd48b5a8c885cf788621964f0ab0aa0d120876a28db2018dc6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/xh/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/xh/firefox-85.0b6.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "a8ce0836980441d1248f8bbd2e4bbc7a8269afe9bf8e3125bd9f4dd3acd06d7a"; + sha256 = "e9bef37ead8534c8f3e0882361ccc1818583907bb2279eb737aa9e90c9223108"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/zh-CN/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/zh-CN/firefox-85.0b6.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "8f491d8d1f61bf4a7f036efc047462bb04cf953e2a3a39cb5a326e49ed7a880e"; + sha256 = "3624c095348dd367c99248471cb2c76ee28c491c73f7cb8d6f0f2119a21e2c30"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/zh-TW/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/zh-TW/firefox-85.0b6.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "dc5a8ca6f8a3f40060d0d2abaf694a066960cbfea355678ac583c3977b37cbed"; + sha256 = "7dc0ebebaae2f4a26bfdc8524ea55ada023819d08c98554c9193d2731e88f3ba"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/ach/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/ach/firefox-85.0b6.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "f5b5a500581e52dfe5192135cfa06bf283ff23ca0b1b569db1f1bdcd359ad0b4"; + sha256 = "a20f683f1572a71f709fc240c8c9461af8fbc0af60af32e9d057e8da8ddc954b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/af/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/af/firefox-85.0b6.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "f96a13006c272edf5f60d6c04011e48729b5078fbde2238a0e5c422eb1293372"; + sha256 = "62dc60c4ee5ffa1fbc53ee4bda855824ffbb7514d40033f4a17293462b6ee0d7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/an/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/an/firefox-85.0b6.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "0bdbd429a512499dcd920ae695b61347196527ab30c601e1645385f3cdaff4ac"; + sha256 = "5b819b75a53e78adf628598bb98d6d704b61e5f009bf3e123a38d4fe0aac0c89"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/ar/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/ar/firefox-85.0b6.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "e0b6addd1b699c228aa353af879bbd263d1bd0e17aa033754abe864348adfc9a"; + sha256 = "64cab2b053e80195696cd00d01075c93c00fd51a80f9346f095065d1ef4abd02"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/ast/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/ast/firefox-85.0b6.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "3ffbc1b67d9cae58c2b21227e6456d9e6ca8a387cdbe8b5bbae9b1db553a34b4"; + sha256 = "1ec6ac90f4a35465d25edbace93a503026befb193ec62bd99db995d25eba7137"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/az/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/az/firefox-85.0b6.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "36c9ad3b07b6e032b38486e1d2a7a6b85b85dc84d8d0b9218fbd4c4a71e59e70"; + sha256 = "08021bf98c2b5d0cb3c0375d955c8b3dc03b6883d0b0ca674987cdeac5b9c7d0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/be/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/be/firefox-85.0b6.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "2ac1811463e482205f7dd27e4f98564146f089fb423405a8c3df8d2a10e45147"; + sha256 = "37a47bd94f3839b805f5a7136f085c8e4c027778dab78998deabe0e7c348158f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/bg/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/bg/firefox-85.0b6.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "174d0ab72bfb1a8ea811c1b77a9eb65871f68641b1703c3bbf02bad4d298460b"; + sha256 = "a8e779e51685ca4df1a110de3627b61e51a596a2b40f8ac7c1fcf2e923568ba8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/bn/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/bn/firefox-85.0b6.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "e6d1b74e56690abd5c2f0d2d1dae0b9ac6d16b28daf1964ecd87138a5de9fadf"; + sha256 = "7390ac3ac735a6fc9343c50591827fc90aca54ec8359c624447513759933f214"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/br/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/br/firefox-85.0b6.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "2ad97986bcdcdc2b988f1d50fef1a71d767119e03065ddc3e51ad38efc7dd351"; + sha256 = "739a7047060a32d1ffe9945cf0411e9622c2708707bf49ee08b6935156e114f7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/bs/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/bs/firefox-85.0b6.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "71c472c8dce7174ee8139360fd5b8528cba89f73dc186bdd08ed368917b8c41d"; + sha256 = "f176298a95b26a6959cd72a8ad03a3711153746ebac9559511aa19dd14100298"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/ca-valencia/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/ca-valencia/firefox-85.0b6.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "4e5245f658f5bf6f47d40e2437841213b03b9f6d12e83766621f5b59fb258eaa"; + sha256 = "714c46545143ba847f0b43d1d5436ba303b4f23e666bd15fb1881a0cda1eaf55"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/ca/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/ca/firefox-85.0b6.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "4de924505b98c029dbba0762723a3310b3d171f18072a1a51d4f9636aaca8831"; + sha256 = "087e0d3e8d429ddd86bb7d79a22402e782ace2deded642bc9c44ce5e66dd703d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/cak/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/cak/firefox-85.0b6.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "11fa8468ca6b3c51ed615d0375e63d85443beab66c10cbdc95fca817ada02215"; + sha256 = "07e75aa7f99c60b2632192ccf7064099ebde5606241151cae8a4d9c094bacca1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/cs/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/cs/firefox-85.0b6.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "c1bc48d54d0ea32731d4400c2b2fd817c5ed222cbe5fea20b3ee26ddeebab9d3"; + sha256 = "3c8ae427e81be331960c329b3d964afffacd621b718dc9df114e18d3c4710e80"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/cy/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/cy/firefox-85.0b6.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "02cf2dc5bb97e9497655c53ef45dda3495f280a333c94fcc51048852bc993a53"; + sha256 = "44be1f13ffa06c4f58af6bdf01f68a0189c30c436854c66536f2c97bbe5332bd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/da/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/da/firefox-85.0b6.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "6d36d0aa1ce447770c9a149a1df2c27731a31f5784b9f20ef536836e6e42819a"; + sha256 = "805d5d5c3ba6d60fa190b4b05210ddd655e70cfdcfecdc8096e9bdc6fd070fcf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/de/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/de/firefox-85.0b6.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "49eb555372658bf827adfc07b08c8ac46a6351f0ecd0fed0ad6d5c4975553c8e"; + sha256 = "a894b1e6da776681f2107a122858a1a8ddb74f25e0e2f6d88c18c6e80f61e5bd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/dsb/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/dsb/firefox-85.0b6.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "1c358edc0e6248773103ab92ef0bf6103dfcbfa2945602bbd2f49153ebc7c690"; + sha256 = "58123b90a6cfb155d358c3432d6ed95c1703a99896be2672d9ab6f68a020faa7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/el/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/el/firefox-85.0b6.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "a445f9806285ef0b036364a618c8d7ca226da899dfa33adbda5b2e327fe63dcb"; + sha256 = "7b10083111ad5f9fed2138c37e53d2d226c0f2c46bf57308b1bf5b9ddae606f0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/en-CA/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/en-CA/firefox-85.0b6.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "6d2590c0cc0aa28a1443185aec54f84973a31e79beccd5ca5700abfd8deebe2c"; + sha256 = "c363b7b16136efbfc66b8372bf8c2838bbc10db2a311668541ded0867db99595"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/en-GB/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/en-GB/firefox-85.0b6.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "71c4040c1326133f18ec7a07ea021b061b0994cf92aa113b358c5c0c10ebc59b"; + sha256 = "3948b70f35e76adbf380bdbad84436d155e2901246ac27836e731fd8e1c1e736"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/en-US/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/en-US/firefox-85.0b6.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "af3bcd19cd78dea23deaff0c2810282a68428eee4d45e2989c75cbce5ff97098"; + sha256 = "4e35172e333bb056f47673b7aba9986743596898377c71bd1c0b3c4658840f2c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/eo/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/eo/firefox-85.0b6.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "641def17e0d004f81cb176ccf70cbaa1df50fb204c3ff45a80800b76c21ed006"; + sha256 = "75b58c31907f673314185829c0a399820505973a5d58cf29ec64de5441c45617"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/es-AR/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/es-AR/firefox-85.0b6.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "0475e9de47c64b11470edf16f2819bfc1b1013f75ff6dd83da96bff1174db788"; + sha256 = "28cc600de58b575944d8bbd50d29f9eedb353f3960bcf0151cabf6f2a1e00aad"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/es-CL/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/es-CL/firefox-85.0b6.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "0f3c14175da4f59b745473df5f0256b582800b3c3dfabaa21e124b9ef100fc72"; + sha256 = "0b5d045b6d80925d85f8a3eb42da92ab046b1c3dc28ba3569b129c30f326d40d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/es-ES/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/es-ES/firefox-85.0b6.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "9a33525bcb9d10a10630d4c470877c8698f6da32671cbc47450c7fa4d2cba7de"; + sha256 = "ccea08271b38fda0a7cf75095d44ff56fcb6e7771c1ebe3d030b509df2961581"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/es-MX/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/es-MX/firefox-85.0b6.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "ba397ac159b77c9346b58e5c9e4bdffd21b5ac3fd3d4b67a2b67931916b2f830"; + sha256 = "8b551206bd37ebe4fb409a1d79db886466053de96a376770144769a2c9a0ad3a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/et/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/et/firefox-85.0b6.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "664672b4f5f713bee16024845f16555da16f758d8db674dc5ec7f0022d2b7000"; + sha256 = "edc27acb6ebd68dc581f33c8d89c0459c03471e1f127b5be158ec18e2edcc065"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/eu/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/eu/firefox-85.0b6.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "3230da6f19116ccf848855218df3fbace86af2d9085f4109a3006476807f464d"; + sha256 = "c5856ab6c5ebcff8befea2c2c6bd5d7eacad0dfed9570e005b1f9d52fd620b7a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/fa/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/fa/firefox-85.0b6.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "faf07d08ce391b1043d4081fc650e3ee78ca067a3a11a6e3ff87916f3ac7a557"; + sha256 = "208a7403e2a029c5d8c05ec52b84a45b307756e37e811e962ee79907516a5390"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/ff/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/ff/firefox-85.0b6.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "2c763d737cb112b77919594fe34061db5181a725cf518fc3cd9133be9bfd7cf6"; + sha256 = "368558aaea92e5b4752f57c42a56c7de27b6d31010e3e978595403cf2535a781"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/fi/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/fi/firefox-85.0b6.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "5a631720534e03e211936255012270e04918461112411e787ea02f138087c6b1"; + sha256 = "0a5dc2f46d22418d7ff242630b10b7020575d8b7be65f1eb8e55c71ab0d29b26"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/fr/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/fr/firefox-85.0b6.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "2b86ce004a5c42fd6f5cdda28439263357ce5428b6469440046ce6fe4d6157c2"; + sha256 = "667581bd459553f5767f675b01eb4a7fd6f182311697bdab38399a39d05cc9d0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/fy-NL/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/fy-NL/firefox-85.0b6.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "e0e81fb1494d86abdcab4cc9feb0f789ab304172c67da013f0a09ab2c2e3e676"; + sha256 = "39c1fd32733842767360176c9e1cc6b14f2bb985879816639f83d480f71c4281"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/ga-IE/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/ga-IE/firefox-85.0b6.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "ffcf120a36f7268ab2ae03fb1eb6d458fb63b00d41198bf7997290c28997205b"; + sha256 = "389f12d17bc5b2a3c9a4288e053b39109269c94d56f3cba5b804c75e05498028"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/gd/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/gd/firefox-85.0b6.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "a99d3471da7fa2e985fc562a4abe086de9096d2461a50841ad5c8e5d2891bf8b"; + sha256 = "bf1b66499533b977bfbedb74fdfea613cc6fd15809c39b2f2730a37cb29b69a9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/gl/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/gl/firefox-85.0b6.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "01412502c872561564e1dac95b12d27295be5c411d2bb1ebbd53cfb4dbadee3a"; + sha256 = "afcf26e568817414df71fb35debafe47f1c06b31cca80694b94c5a5ffdcdf523"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/gn/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/gn/firefox-85.0b6.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "a73ee3448bb7888acec856e3e3369e28f5fbb9c5d203892e4992f73b319fa394"; + sha256 = "ae79a2c5d6d8cb55642c744750b22753c09631c10b12fa28090f29eb6170fe14"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/gu-IN/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/gu-IN/firefox-85.0b6.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "3b7904059b38eea27b7901de41be029ea8ec23c3d2a8bbe8941d8852c55cfb97"; + sha256 = "86500091baae2bcc2d72b021c32889f4b59abd853e01dd3cb19dd7107c9cc6cf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/he/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/he/firefox-85.0b6.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "0bf4d3aa4f217e12b1f204bdb189625c6daae24cf5253bf4b1cd6288f2717873"; + sha256 = "a21cbd77270c7ac047e2b3eed1f17568dc8e3be4d99652c23f60391c5e758ec8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/hi-IN/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/hi-IN/firefox-85.0b6.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "4f95852212b0b08aa420c88e2ec7825913e3e82c1d2891fffdb11a8583bf46b8"; + sha256 = "5c3ba65e947bec3380caa2f23b92d19e6ed3c52275b9869ac4a995b8aad4c86f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/hr/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/hr/firefox-85.0b6.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "e30d3274103e39241e233aee994b5b8c2b39dbd190ffa1a9da99f8494ae833b1"; + sha256 = "cdc2fd0bbb6b94e11c9f0453473871220c92a89d92292e0bc57b2ce24c822ab4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/hsb/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/hsb/firefox-85.0b6.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "f401baba947e64ef4ef02cc5137c8623a99967ec8597e4e5c8987382dbc505a4"; + sha256 = "1d32367cc51905f2bf8682d08166ed433cb37d711ca5b299693e3899b5508628"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/hu/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/hu/firefox-85.0b6.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "70ac5b24deabcaf0b250575a0454a35e127cf15023a3546ae41c01942c64c59b"; + sha256 = "8b0daa49b706e033894ad8703dc322bf347a3fb66b03c18d0c3c0ac6da4bd0a7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/hy-AM/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/hy-AM/firefox-85.0b6.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "9dfa8b99f67ce66625e0c89c37f4ee36b23421ca89d4445deb5dc82eb0eb05a7"; + sha256 = "e0336bd76c5b1c554ee4689de92cc1eb1937d22bcae70f3132622f09d854e82a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/ia/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/ia/firefox-85.0b6.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "4445dc874962b72f7d9096cb46ff98987b56d9c2d3e0acd814fc8c59261363b2"; + sha256 = "33617f175a8d2b46e4ea03a0385755a0e9ff1a311397ef200b634ae9d16c2f76"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/id/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/id/firefox-85.0b6.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "16c6550910555ddfc395b0c9626dd6e41a4bc9bd4a8ddbfb2867faa991cd4ae4"; + sha256 = "db0ce57899c061a3065831f8188ea830b8fa3d01c43df5447c55b1fcf5b99376"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/is/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/is/firefox-85.0b6.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "1c208c0b99cd008d67e8c9c1d118f7b2c8c354b4dcf740554fc2474ff93b8a7c"; + sha256 = "920e894762732b7366d36f407562ea19a105e9a5634311bfdea7b88289527320"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/it/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/it/firefox-85.0b6.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "cac410ba1679d27565d63d3a70920d3ff262b6171dfe732c3ec7ee88d3386b14"; + sha256 = "107698ba86e4460ca51ece41c983448dea0ac7bfd20425bb1c990f21350bdcec"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/ja/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/ja/firefox-85.0b6.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "0b8c20ac0a4394c8c4a106e65d83718f639453e10c54906da04f4da536a218e4"; + sha256 = "0eca42b163a923617e757c170b5a255087d5519f4ab14279d6a3f3c42d14271e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/ka/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/ka/firefox-85.0b6.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "978aad2d0855ed8e364faf4a0522d7271bbd134c699da515db7e5c58dca79d49"; + sha256 = "15b553fe56e20b8168698f409358fbb8cf7a56ba4dcf4079e8718cad2a005735"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/kab/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/kab/firefox-85.0b6.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "f32b2f9cd504a6d4d5b5d2ce47368cad4317cb1249dbd7d925d0c48098fba8be"; + sha256 = "a56272b93828e6aff9db0769565199e107cd8864ebea666cd21d3f79ed8bfee5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/kk/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/kk/firefox-85.0b6.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "38e2fef40b71d50b85be7a2d2c44bc0b0bc569410782119fbe07aba00c8193f7"; + sha256 = "10f1289068c7613cd2611bc3e9b5e2804e77b5853e07489bb60841307fbe87af"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/km/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/km/firefox-85.0b6.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "c8a617eeaba39e138676c8412594329b00d372c40a0401a77e5bf974a407a3b1"; + sha256 = "43f933ba3aef69d3af8987fb7b7a40ad1bdb8bc1285a6995e3706fb2731ea0c0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/kn/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/kn/firefox-85.0b6.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "d1f19e2edfd1ee97b13b8e42c22f1409174c8fb4b024612d27cbb3ab9586ca1d"; + sha256 = "1d31536bced9c01229e9885153ef66875d67205196eb486a823161b96a14c520"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/ko/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/ko/firefox-85.0b6.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "8e1f68d6bf97644616e8d8a39443061fe99df088b42e5218beb823d8cd18b8e6"; + sha256 = "88364ae3eede1cd139077e5d7e2b588604d63deb49d6bb0933629a17209e78c2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/lij/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/lij/firefox-85.0b6.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "ba22770bc65b0033f424ce30df69a7d21a728245230696b412baf44aa9a111a9"; + sha256 = "88defc592a591dcdccc8fde193f6b03429c0be3d30291e50f3d599e88b55bc09"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/lt/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/lt/firefox-85.0b6.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "27ab65ac4ee08e2714ca7c493a4575352df4a06532773197a2bb3da86e9a18c9"; + sha256 = "646c90f4fd53a8dc995a28ff6ee444a10a6380c37b5f8d2505e9cd401bf29895"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/lv/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/lv/firefox-85.0b6.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "4a8f6944d9b6134d664e08eb404e130a218497b4957437b56e4487a8bc205ca5"; + sha256 = "416502c400bb436c4bf0a82c520045d44aea0968955528f8955446f4d9f3aa28"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/mk/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/mk/firefox-85.0b6.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "885893b0a9ef75cd623f21c720aee07357ff3b4b21ccfbe456fc11928ef7037f"; + sha256 = "62d6a1873b4cbf1650c731f588996d9c78bac8c286fb7bc2b22245bcdcfbdb94"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/mr/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/mr/firefox-85.0b6.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "55aa8e1e4b61eb3b9a26fe9abafa804e7b6d34ac1f36efadf10ee13d2cd934a6"; + sha256 = "cc7bbcc108a8f3b080ad957339b2a28a1733c1f4c9c9c4db226de65ed2650d3a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/ms/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/ms/firefox-85.0b6.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "61412fde864addb40fa2d0ab42f30cb9a7e1887cd130ab59880763d675b6f7fd"; + sha256 = "0a64005f83e01cc80d384d2ddc79fc582bf08d01c1e8ea3bd17ba9b6310db8b7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/my/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/my/firefox-85.0b6.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "cd7190acda6e20c22edcb99c88c15e87b4676b2dba7de0578d2ab32a22b2bc1b"; + sha256 = "4f0d3b2930fbfed624503bb13aa2c02b641997856f7e9a490d27371af3243908"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/nb-NO/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/nb-NO/firefox-85.0b6.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "97f16d919eb8321c71864daba7accfcd9bd86d4948bc86df44fa86a52649ad8e"; + sha256 = "2e037b5eebee8308034540f0944972432e6246fa6f418af3b3b17fcf407ea603"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/ne-NP/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/ne-NP/firefox-85.0b6.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "4ebbdfb4c75621a24b52853c3d94e178decfe3bcaaa1f8f92f42bf91eedd874f"; + sha256 = "89b1f631a3b68f497070af726ca6a8b2e6a747c75032701c935e0309b014a4da"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/nl/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/nl/firefox-85.0b6.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "4b14585bb554bc346565a69b6a4c10580345923f8e4dbda8b202e6b9e8cf1452"; + sha256 = "e861ed42e0e133e0f7ce1e094b69dbd0abd7a346842c3ae3b4a756d0f3a0b599"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/nn-NO/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/nn-NO/firefox-85.0b6.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "408f34fb48fe1fa93850857118fc4ed972139e273ed2521cd9f7169f8d4148cc"; + sha256 = "36dda4ae13eb19b8421e385284ec39d3ad10ac0da9530781f3a0a719a76fc92a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/oc/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/oc/firefox-85.0b6.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "0f7e1e4df86a931152206159a9f4e99b4241377c5545fb343eff86cd21869bec"; + sha256 = "6799c6eabebf9bc677808666ca724d1bb704e171197087cb828e9ccdb345f27f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/pa-IN/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/pa-IN/firefox-85.0b6.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "c7f85ae2c46585cab0aed8c41117ffd686fe0dac6e0ba64eb41bc22d4b8f01c9"; + sha256 = "3e2b342d2e12804b07497383c8e3e453851004aad50564cdb25ad9529679beef"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/pl/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/pl/firefox-85.0b6.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "2669e61a0d7da09684230c67c6d43091b3b51e12f291259a62c72ce124fa4c3c"; + sha256 = "d77d658d2040dec3453583e6fad0b1f214c924aa1f4121ca2f258211e9b8b558"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/pt-BR/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/pt-BR/firefox-85.0b6.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "10ac3662c49611f73fb96a13ef464c27b4ce08c25f0f44e253e6e5ce2239a45c"; + sha256 = "fd73d7bd16fdfc4774a3a4426cd63bc6dbc90e47ce316dea75c8483110f3015b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/pt-PT/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/pt-PT/firefox-85.0b6.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "a6e606c6d4ca032653b46966c0b90e001474907424f4fef46669e2363ffb89f1"; + sha256 = "05a37242735661f27736384ceaaaf30bd3eeac85ea8a6b7e03d5dc07bd9db735"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/rm/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/rm/firefox-85.0b6.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "a8a8ee42020f62b38c125002ff6b5ad975d1a24df4e64f354f58fd949517e3c0"; + sha256 = "dd57277dda625c767ed7e0f3ac15b5597f1b17c862f33724a300589bc760bbd5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/ro/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/ro/firefox-85.0b6.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "f405c06f8041e4c90caed14e7d6fac38467976fd71a214f06eab8c2113c386c0"; + sha256 = "c5bcce6dc1dffe36a02b473bc100bab080991dbc85a92b5606c4b1d440a6bae1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/ru/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/ru/firefox-85.0b6.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "acd2c0812a24b301aafb1278246495b07e346fbd9cd699da406b988dc3d393ee"; + sha256 = "1635583bed89c8efc3cccf6ccd294b2795defcdebac8d2faa2d0adb863200910"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/si/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/si/firefox-85.0b6.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "d444818f1e76a01a1170209497349331175ab9a761c27b31ddb89ff4d542ab9e"; + sha256 = "bf1d180a93b0d1c2c4a9a177b906db957fa92fd1e9afc070f208c48c65921f48"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/sk/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/sk/firefox-85.0b6.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "f2f3c9c4888f0055c10d1aae6cb1c40cc7f4d2bd1653e846768326e11b6ef2c6"; + sha256 = "3c06f3513ef00756d7aa09aff5acf7da408cc02567a8187f51d01a78f016f7ad"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/sl/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/sl/firefox-85.0b6.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "aeff79d992488895e47d3682d6b3661cfd1a86d39aff8c91313f057838075068"; + sha256 = "107db384d90cf468233ffaca01bc18e332d931dfe60ade299be3b788876479ba"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/son/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/son/firefox-85.0b6.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "860900ac8f3fde5511a294a4f41e553d4853c4592d4446441399fda78a91898a"; + sha256 = "75744dc4218b94400e480a30a93f697d5762e1d57e057ec5961ba76c0bbaa7f6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/sq/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/sq/firefox-85.0b6.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "9122e1837c732b8cf242f211937b3fc445b6a48da3db01cbaa4a0d00117848a8"; + sha256 = "a02be173b477a7accc7eb3ba61f868baa6116b2f3b6c11fbf91544d37b8b3c96"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/sr/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/sr/firefox-85.0b6.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "a3c15061deb11e870d83138bf65beb5a838cc3ba96d067d3e72f816f818da3c5"; + sha256 = "24397cab6c2f85bb59dae4b9b13136f4df73adc5d0ce1808615e96ca090b26c6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/sv-SE/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/sv-SE/firefox-85.0b6.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "cb3d2dcf7d80501a8fa38c50d0301af9562050bc64250cc1c6208467990795d6"; + sha256 = "3a10344dd08921246dc5ffc12e7bba8524bed0fa063ad0d369a9a3f3663ffc88"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/ta/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/ta/firefox-85.0b6.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "4ece8a45e79aae6e535d56370f8890c5d3045d0ca78bec67fe848367e518339a"; + sha256 = "c99dfb14a98f079a7275819bb1e7386eb1acbf9752cfa1a3c5dd7fd3b2d78cdd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/te/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/te/firefox-85.0b6.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "70996e39e5b38f7def90f1eadbdbb294992e4ad27a49d4941b3982a0d3f8421b"; + sha256 = "ffa4a07accc7bd9515f67a8a2a7abb881b517b2c3fda5f5cf9a7399ff1aeab0d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/th/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/th/firefox-85.0b6.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "36720f87e8b3ee23f15ff48514931747d05638194e9b13b30017e601b8a5c905"; + sha256 = "d3c3539566237f9df3236d3850771c7589fc0af6367b20bb62df3b0417954278"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/tl/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/tl/firefox-85.0b6.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "d433a22f97bcb69570933b1f371c248ebd2eb83a217bcc1989897c08175cbcd0"; + sha256 = "e5691a1dab9000bab76f516e77f8d846e4d6ba9eccb7ffce5da7685981263be2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/tr/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/tr/firefox-85.0b6.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "0787dd09f287aab492610d2ce23d0be7bc3a2158e84d7e94345358a750ddb752"; + sha256 = "a165c58b79094f3c28f29bab43ea8d2921099148da2247d9c3829c468a066fac"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/trs/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/trs/firefox-85.0b6.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "4d3bd35ed7c43eb502f482bb60da0dbf14714b35e2996362c835a0a35008308a"; + sha256 = "71a6466c49b1e4554ddca9798130425bf29de8ba22cb4204ee63df1399e15dd8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/uk/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/uk/firefox-85.0b6.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "8e1c371acd0bd1762c715c8e36dbc8df104351cbb3c37fab64c72b55bc98f006"; + sha256 = "dccca6a7697d16203325c956cad9b7ccc39e45d87fe50fd0a864cb92cb33889c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/ur/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/ur/firefox-85.0b6.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "14b6149229f49406755a5ee308e0e120964595a1f9a7f2f7e9cc2979a5cf561a"; + sha256 = "b94b825f2b70775093042ee10e3ba140ddf4882f2c54a46379790195aa932920"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/uz/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/uz/firefox-85.0b6.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "a8adf840548ac5974654234956957b8e53f3e36c83cfad4fa5c840c16e9e4d5c"; + sha256 = "eeeaf926708997925ad80bb8d62d0bb8badf464d030bde97c62239f90f9566d9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/vi/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/vi/firefox-85.0b6.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "fc9b023caaabb3a5a18a21a2d65195a7dc7b2655a5d9a1f4c75434cb1f02e4da"; + sha256 = "c465c1dd6e4df1011deefb9e75f778f000a2a48151d9447550f4ffa30da03400"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/xh/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/xh/firefox-85.0b6.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "940b4e34e92a0efa397d3944fb6b8c5afea57f29355c9f9621accb557efd9860"; + sha256 = "56420d01893a6ee9791f3984b4c8b676ffb0e300c734c9b90a8b2bfbbb3c3e44"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/zh-CN/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/zh-CN/firefox-85.0b6.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "b1284ea7ec8e42c6139249b1958380e672dd19e7b8c21d95e256e0d3265bd095"; + sha256 = "d19e07a9120f3de2169614c3ffa3323dd2712903bdedff446ed2063ee54ba95f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/zh-TW/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/zh-TW/firefox-85.0b6.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "ac76d109c7817b9c06356918860216a3e2f4f776a31a8690064593ffc43139d9"; + sha256 = "eefb93231e8603b69a793771f427de9f6520993744beb0f5de6bb1b06342b286"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 1620bc6063d7..dbca2e9c92c9 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 = "84.0.1"; + version = "84.0.2"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/ach/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/ach/firefox-84.0.2.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "576e937824252ead56b4b4472aaaf8e3553107c547bbff74457a0a1d33b721fa"; + sha256 = "00ad2b1cf208c43fef463979c39a6e1f272d360b4b539e3255aa9f17bbc115be"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/af/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/af/firefox-84.0.2.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "ef9509ce8cc5f766aa3072c78750babf1bc26b4211f0f5ac7a4c88a29cdac875"; + sha256 = "fa9b27a4e23dbad3bc87ba275df4cc87f44bfe13f009268f4ea70ff31ec6e847"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/an/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/an/firefox-84.0.2.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "7bdc125a9ed334f2b3989d40bcbbb526ef583823be5bbba590bdd7fb9562d32e"; + sha256 = "074206329118376889a1a8f414617c821e9fbbc35a8f9b8d38f3dcd1622280cc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/ar/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/ar/firefox-84.0.2.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "710d77fc45c4164c96194209d2dd615ce4cbe3583440f8f8eaef8697ec53a078"; + sha256 = "8871b4c191aed7f5923f4dd64254a41e03780c66f4179c3a54768758c2f99f5e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/ast/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/ast/firefox-84.0.2.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "910c6c17015632c3f996b4e7732fcc895eb9f966037f53934cb1810856c3e292"; + sha256 = "a2a143d21d9381410896ac90fd359a086859183fb5e8f18a71157be4263ae481"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/az/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/az/firefox-84.0.2.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "3c636e6b006c7ffdc01bafcb048fd15de7b414e63968e278a37be8faffa89fe1"; + sha256 = "f8493138759fbf0d2e9f13c3510c51b1b343fc2e10eef9b96d083a35e9a57a26"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/be/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/be/firefox-84.0.2.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "aa691e814c2452bef9cb7f75098ab94cdbe742b3d25c456178badd68169b3b2b"; + sha256 = "a943d5f372ab63cef96d351f52d248cd2b575756b8a53c9d17b88035c8022bad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/bg/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/bg/firefox-84.0.2.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "f6aeefe5aa099ac804bdd10bdd180d101c634ced146ed42cc025180a6bb9ea69"; + sha256 = "d3c12c9a43ae9728fffbcf016a03bcf1411fb891e8bb84a58b9f3cb5adfb9a68"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/bn/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/bn/firefox-84.0.2.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "91ffef38c34407d455294fd69e93fdb40256da5d06ac6a300cb48902991fb172"; + sha256 = "95c19322009f9f8be9f2e11d0baa530111db13fe65d93e93d97f8953e8653741"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/br/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/br/firefox-84.0.2.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "d3735936296f33773e8fce3f3beb3a183a5db1ab7d1f1163dd451ffa43bfa0d2"; + sha256 = "20178f91bbb29ab3994db94fcb0929a15754395a6c5c1a2a5f292a3e0fe97ff6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/bs/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/bs/firefox-84.0.2.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "a2fda7eed9a3fabb46a9e3049c1560f486fabf426a868b083b3c7d11447428ac"; + sha256 = "c61a7cf7cc981175a2041534dc90548be21973c7b520a6e4f3da45e7d8f5b509"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/ca-valencia/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/ca-valencia/firefox-84.0.2.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "b1430d43b273e1dbf7899c537d93dce0c0674633ad50726611eb1bbd5397843b"; + sha256 = "a52c5fdc41d360a660330ecc055ebd2206a7ada996af17bf76d97e5a82dc552d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/ca/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/ca/firefox-84.0.2.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "d06da0cc13e1bbd04f9bb0659fa4745da08d410710793c2dd52086b10ea82cef"; + sha256 = "1d827df4ff4ae8eecf1cbb888c8f011ab0320c05a878da0b24e8e0b4abfb1a59"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/cak/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/cak/firefox-84.0.2.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "66cbce52e16178231cfd884e88443f4d5825079c9df74a3f6ef5ad226ec87025"; + sha256 = "dfff83803ed04547aa8c8c9b12ee2fda7388017e8e17bab3d2d1244026779b8d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/cs/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/cs/firefox-84.0.2.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "7c3243b48f437ac0d95de2f819f6088d882c52f09e74f910f8c7cd21dc57b7b4"; + sha256 = "601b791c8829653f4eabb08c5d66fba83acddd001b1ccfe2f1f3b615808c9928"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/cy/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/cy/firefox-84.0.2.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "9bda66606c45b90de3ccef2c51d3a26d3456e312d145906070923924db2ee58a"; + sha256 = "aa14be4f6e6adebfd11e334a305355ed4cf199d3d578c7648b6f42fe73275b3d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/da/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/da/firefox-84.0.2.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "13727d086205c7ed560af7ec5fb4db2025dc24e327ad20c55244d9bcd0d54627"; + sha256 = "dcc37cc52c473b77f9944eae767cc218330bad1d4753e3da7ae9bc1d59b6ea5f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/de/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/de/firefox-84.0.2.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "50167ebb8277c08d6c13c07c5ae871222ded9f42295ba7604836ac550d3890a9"; + sha256 = "5d7332a8b02c84afdca3fa0876087312dc8abfb4307cfd12896aa9671b6dc855"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/dsb/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/dsb/firefox-84.0.2.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "62b96a0abcdff8e1299c01fb3ef1aa8de6bd895adfd20698b52d0dc2522c0160"; + sha256 = "a79e0512916e0258d73815fc32c343a908c2bf684a3ee55f6603ed2bff204261"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/el/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/el/firefox-84.0.2.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "6d22ca0a28bf6c752772b778239d42060ca2a9ab97f6f82c5f88a53f717d3496"; + sha256 = "fcf89299094d3757c8cec828ea43befc02cc258d3640f7474fc24dac63bcbafa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/en-CA/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/en-CA/firefox-84.0.2.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "22b40400ffe16f3bc9e9a720170f65d58464b0f0e2ebaf9fc3217edbab5e1fa8"; + sha256 = "7849e70478c410500f0e49cf3372e7b3395a8668e2df13641450db2e23485f0b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/en-GB/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/en-GB/firefox-84.0.2.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "169edb75ae396aa19fee5472731ada83faa351a2fa0d4d291cd394fe00a9b92e"; + sha256 = "6533bd93be6777db55a0787447b97d0cf32d770ab79dbb0a4689e528c277e807"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/en-US/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/en-US/firefox-84.0.2.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "077cb7a8954ad544692a03bde4edd31751e1a819bd229413e35508984abee5ac"; + sha256 = "4d987bc87b56dfd2518e162401496c247750ca0a18d8c9072c9ad1ecbd67cbb9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/eo/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/eo/firefox-84.0.2.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "619667619bed6f5bc99b373e779af6ec98e21218e0d0d2b0d703cb16dfb1f171"; + sha256 = "88bcb8ff61ad19d3a9975b8a8e302b2b4f37303c04e02770e5eaa6a99dc8a1eb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/es-AR/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/es-AR/firefox-84.0.2.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "e7ae3b3415db29b8779f69ff557409f64ed7f031201c942cbee2fcd0e08abbb0"; + sha256 = "44469a62926e451499b3f813034001dcd9228c80a05d9d69431b9918fdc6b99b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/es-CL/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/es-CL/firefox-84.0.2.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "7948825f75236751066a96e793b159538ee82c2315f07b9972f2204d27bd763f"; + sha256 = "81e42f8acedd167a1f69d500fca94752a5453e096b471d07e86adcd99e29b40e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/es-ES/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/es-ES/firefox-84.0.2.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "3f6ea39596f93e5625d79ba544d9f476158757931f3f7c59bad85d169ef99ccc"; + sha256 = "4b47dcf3b595b5c0011a8f8f56f938991cd68576cf4655e04e43ebec14e1256f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/es-MX/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/es-MX/firefox-84.0.2.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "aa220edf6cbf85e7605a0cde21fc7871939501a8459295b2142e4507e8699cab"; + sha256 = "c54dcd581d45d273b8b6138393a662b4618e8bd181f625cda6d23ca6b9baf358"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/et/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/et/firefox-84.0.2.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "63fcb11eac26f26721d6a60c1001d867bceaa21eee2c81efbea8e00253412082"; + sha256 = "2fa06a0e49fc69719acd018148a400c9fbfb3ad68ad13183b1c26971337474b3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/eu/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/eu/firefox-84.0.2.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "f49a421799e0691f475da2419ab786ac29caf67ed7413cb5b3736d7961309d17"; + sha256 = "9171ab64137fa21b4ee50598d244af0760898c6553ae060252109314b997fcf0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/fa/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/fa/firefox-84.0.2.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "ef1e5342a658923452bc839258f292619c2edff304448ab9d85d9215ace907d3"; + sha256 = "3b16e8290e15999a29a9ac92d8294ac212e4e9e4c96fe2ebba09ca43dc66edbe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/ff/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/ff/firefox-84.0.2.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "73ff19b083e8d8d6ba6e5ed1efd27f18caa9a285fd02bb27ae01190245eca577"; + sha256 = "1124cd9611e9ccbfe1255afaf8cf3591b0f61d0d2e63c4cae877209b8c591ba9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/fi/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/fi/firefox-84.0.2.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "c576045a05d15ae4c8d6c82fd17036546825f9be1675197a1296a7c8d431992a"; + sha256 = "e3afa4a74b325d52b6cca0436b36d7d5c0d4e2e50755da28aeb587411f705e8f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/fr/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/fr/firefox-84.0.2.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "428270e0c4a3d80d810a106795986f2680c3e55faf7fc975ebf56fc90c0ce797"; + sha256 = "c5470bf4a8a71985bb356c0e56b516108ee6abd6437815bfaf6e3c2f5fe09e46"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/fy-NL/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/fy-NL/firefox-84.0.2.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "0e272ab1540690cd688561b4efdf7429298ad087b51afeb1b735f8b7efbaae28"; + sha256 = "4608593cde1c810cfd1301f87fe348b5172d92863416b5b135e2adf8b41a5106"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/ga-IE/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/ga-IE/firefox-84.0.2.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "99e5381bfca90d1ebabbe00df75da91901f113ecd6e2aee1b16b5acef91bfaaf"; + sha256 = "64101b561b5adc391c79347b870784d18f9b8457ea8523b5cd8448aa6f9ea80e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/gd/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/gd/firefox-84.0.2.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "ddde6096a541ff100d38929cefa87c93128d10131a4cf42717e9a169b5f99caa"; + sha256 = "1048d1f82dc14c4da5954b3e8da2b0cddfe2ec31e9cd520a60202655771f260e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/gl/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/gl/firefox-84.0.2.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "98019391cc205449df19365459995d9711a1f73e94db226d7ae8c2172a14c8a0"; + sha256 = "bfd82fb48bd4e403f60acc217c48f42e2ad967f9810ad632e112354acdf6f459"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/gn/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/gn/firefox-84.0.2.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "ca5a642179426bed73c4e3ebfb66c287ee57b3cbbdb35df35b1aebc024c9c8ee"; + sha256 = "bf4d24303ee087df005cf04bb1511ebed5635c0b6a27154d292d00240ac35ac4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/gu-IN/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/gu-IN/firefox-84.0.2.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "2c4f645de88f4db3a2274a67876372baea53e3d0bd275d6d67ef60ed2ced0ca4"; + sha256 = "3669c53042edf83d37ad4e7ab7486f9ac3c2535811fd21fce45188b153b3eb66"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/he/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/he/firefox-84.0.2.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "f2e5ad70f26d393562cf4e0c3743dc01b1dc4ab9f77d88f92419acf8072d3ff0"; + sha256 = "cf83947396daac7bf4c53d97a58df2fc856056833a3547ca19289fb0b0f4b895"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/hi-IN/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/hi-IN/firefox-84.0.2.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "368a469ac2b44c0cb23adbf45c654ce2188e2674bc526a106f90159fdf35224c"; + sha256 = "f497cd8173fe2f4b4e14921805004ce81b5e8f63f70b3a135a9be787ad34693d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/hr/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/hr/firefox-84.0.2.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "4cc283202d36f691ed24e0295a9edd51369c996f4a6782ea2a38b57011310dff"; + sha256 = "6e2eb6ede94ff51ab5d2c57744c16738bba50beb5cb4140d42ae1085d6a186ec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/hsb/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/hsb/firefox-84.0.2.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "cdce15a29c601de89923f77b334ffacf2e2f3474e054499d03aaaa95aa4285c5"; + sha256 = "99fad7bdc3db88dd5fc2d6244f37716938f2fa44904ffabfe44a25840b390716"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/hu/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/hu/firefox-84.0.2.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "0def021e54c67a80d5416cff8da4fba48b5d47f1d8c6bd673ac2fc7a64200116"; + sha256 = "bd94dbefb12821ca1e0232dff9804ee7e1caf5fdd3a5823268f757b70f467930"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/hy-AM/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/hy-AM/firefox-84.0.2.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "f6a3cfbd4490d2d0cbc09f3ac15f9d723d485c64603549adb8a4c33d5af7823d"; + sha256 = "b9497158d7cce081fd9f6c4c0eab0871ae00eee7745b59544f63026b48757c83"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/ia/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/ia/firefox-84.0.2.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "69c93ac33a54358f1cb35204b5acbf3a818a4031737aea44684bf3bdadd93acc"; + sha256 = "cd4f2462e64989151e4962cd89f8d3e97f295505bf1c447db6549f898ec6a38b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/id/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/id/firefox-84.0.2.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "59236a0a6024013e7b4b21394f66a9d2b3ddfb27ce54c37a227127defec2bc09"; + sha256 = "0c0b086fc304ed4ab1f23b659999cb303b9016962d26f0509b73009a9c651ae8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/is/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/is/firefox-84.0.2.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "f13500ac51becd6cbfefb43cd98d3a6530dbb92bc88ad15b1714af775bc3e1c0"; + sha256 = "a7482f969ad5e537c1d8084cab54eb03b12860df4c084a7aaf51409577af6b49"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/it/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/it/firefox-84.0.2.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "77beebceeb36f1eaa00838f3e3739dd9549a7a02e15bbbd83454a1e86bc83c9c"; + sha256 = "2139dd8f281de5ef79c3a3671eaeb0704db0dcff286df6da44351fcc5d102864"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/ja/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/ja/firefox-84.0.2.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "bbb98b2bad26a554493d9fbefe1b4061f14dacf59a14cb8ccd92e728d906a676"; + sha256 = "818b66e1e9ff60f30bceb6b44acd2c704de5f64016de7bea45a4110118341314"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/ka/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/ka/firefox-84.0.2.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "20fc38d941e3aba6017143ac6865a5f210450b773a9d50c195a9b951e65ccdc2"; + sha256 = "805d101b7977061af0d5e3b99a8980b972aa4c8eb6ae9914d10c527a58a6aaed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/kab/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/kab/firefox-84.0.2.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "003d7d9d1f2b5f958e29168c698568f6c1e2c7c5c1ec652fab6f2b824828c0be"; + sha256 = "34a75868f2e8da1fb87235b29b2b1fa7d28b55dea8351a472cc1d752c1b084dc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/kk/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/kk/firefox-84.0.2.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "e16d8e9f41fbefc2b863978627eb66e1c82d53a9dc4b1acac912309d633f972f"; + sha256 = "a8c40b1ebac7d0375232518f35b854600f35e52dd6b0123e86a70cb0f3386406"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/km/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/km/firefox-84.0.2.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "e75aa98eba7a600e459e25b7e6d1311a00c16ddade46eeec18ca37b799e7a492"; + sha256 = "3ccc2a85edec4f90c39d23ba74474e27326ed18fd020847d567ed93406ca9678"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/kn/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/kn/firefox-84.0.2.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "282f240fae65764d4e1f5d5e3e0ec775ebd66dab4589b5ae9f34bcfb81f50996"; + sha256 = "634c0ba151f9334f4991c2f118b96de45d8a4fe359a08c3cb001f3b813d89198"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/ko/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/ko/firefox-84.0.2.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "2b5cc8a136b703db4fb59a2bf8ac24ab39416ff44f35836ff70b93e378727706"; + sha256 = "d085163b35684903418648648dca8ad078e1a89f611775ab4b01fb60aa4d1b2b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/lij/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/lij/firefox-84.0.2.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "4cb13be0d090d824b4b86e28f9c02d4c0875133603dec7a58b83ae67e86df30c"; + sha256 = "b676b6f955441df571541b52b6534ad12caf5df45d16dd374b3cda19d58e990c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/lt/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/lt/firefox-84.0.2.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "b6fa373facf8e8d4a7d4bdb97955820d450748009becf166c33faf936fd34cc0"; + sha256 = "eb5499c40bfc805599e51f490d1bd860c6c46512f927a47af3f9ae5bdb9e3fbc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/lv/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/lv/firefox-84.0.2.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "5522a451edec23255b2a8fab65d2680e9b3854998290a7dd33183238cb17d33e"; + sha256 = "935e736c0d46254d8429d87eb2a72e46c9c70c92ebdb1fd1077798e538af770f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/mk/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/mk/firefox-84.0.2.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "d0d96241bcbd32e000094008263a37543dfd4c5955b116f88118daff11759e0c"; + sha256 = "310fcae105829fd03ede31c32e1f078c69d1bed7880469976159968de1f7ccfb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/mr/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/mr/firefox-84.0.2.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "06593e4a56e5f76ffb765b605684349fbf31c8a0747cc90ef991c532df38d411"; + sha256 = "acd8be31fba57a9ced68960c1dd28c9e91a88433b0b885bd3f8e2656a639e3bc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/ms/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/ms/firefox-84.0.2.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "ffa6d0f8534253c5ea94df7aba31a06cdf9e294500781d25a31b8dcad15d5132"; + sha256 = "71a6a63883123b19e70c0bb1e6251550fa4b5035792c7b767d47839428d4e0a9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/my/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/my/firefox-84.0.2.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "dafa195bca8536709110ecda82e988bed254b145f00581561b18827fa41149d7"; + sha256 = "121264d0508aa26f9d6e89620bb1821d07763c28d5085b5cf7d0ce90704bf983"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/nb-NO/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/nb-NO/firefox-84.0.2.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "9a8e5175bb17ae3110a4ba74dcc575dd4b0fb44981f7152cc521ad017db7e2a8"; + sha256 = "9b930c9e5e92c01ae89c7388d6a168d83b4e95f945381f1301a6137795f4e017"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/ne-NP/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/ne-NP/firefox-84.0.2.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "4c2081207cfbc657d8f6a5ba781098f11adc5e159414036dc8217874a2c2d8b6"; + sha256 = "99994740252ec76e9728950d307762acec5ab6555d4b5921d89a083447bd7e70"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/nl/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/nl/firefox-84.0.2.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "947dc32c772a2205ab30fdd6d8bcf938642e9d734b58829d2dec5a1896ac6b4b"; + sha256 = "cbe751edd3b72a8cd823b9cf548ce77e3a148bceac4861853d1374e79c2cf694"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/nn-NO/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/nn-NO/firefox-84.0.2.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "89096b5f2ce27ece10be949b495aa41cd882bfb4a742cc3abfc66f36130313b4"; + sha256 = "f63c3f08d01d8963d8ec6047b69efec9f36a92d822a8ae966cc2a7d66f33f93e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/oc/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/oc/firefox-84.0.2.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "50f603507e5d276c5f3237d1554269faab573d8c194a488353227743b677ccc0"; + sha256 = "675090877a1cb5841ddb98c5ba8ebaba9d4ad2d4de9d17c7e9559ba6a8b2e1ec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/pa-IN/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/pa-IN/firefox-84.0.2.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "231739c85f20014f50a982b4ac0634a8a4147cb6de5ba39a9a11a944d4ff80ff"; + sha256 = "6fd35af9216a1099c246f9e12161384d6a5d1d24e846d3aabe5bef3a55b215b8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/pl/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/pl/firefox-84.0.2.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "9487ffb5fdfc2f7040a7f9bf2585af324782e2f3dfa996db719103b20d02bf55"; + sha256 = "54cae52178e21f0f2beabe1120746962141cbf79fb5dc6eef11ae1f2705e9e4d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/pt-BR/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/pt-BR/firefox-84.0.2.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "fd53dbc5724968b0bb2c2b78de96f3708d05758de63aeaa7fb942f9b64a0649f"; + sha256 = "f1dc18aea91440dfe5e34b332c2e2b2b0241d7af1c1a8f2a979eead34db64480"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/pt-PT/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/pt-PT/firefox-84.0.2.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "39211dde1b183c0453643fd6253fe6eea4dcf2b006842b1cd61e1ce142991a44"; + sha256 = "c2159af01743f1004e3dba0b99a2670155ae3e695f0fd0208b367f910bcba642"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/rm/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/rm/firefox-84.0.2.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "29cf408b9386907dd1e8a64f56aec2e0359de243c3d17fe2531c0f1c7285c205"; + sha256 = "211813cb32c9f2b0880c7116dc935929570c81937d3446aef506da3705172099"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/ro/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/ro/firefox-84.0.2.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "eced9ac8aa417dbb5dd725c952eaa977eca1b48a7271e9f8dcbe1ee46a4b1321"; + sha256 = "a2144bde6023d4b8468128c52015849e6a8f77c0c10d4851a9255f6204a98a77"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/ru/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/ru/firefox-84.0.2.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "7abfd2a2b30eb7744d890ba3a0589ac5017a9536c43fe3e154e60339d7b41544"; + sha256 = "098748cde08f1d362a8eed6432353a1edabc84579abb30aca983772c5b6ac36e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/si/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/si/firefox-84.0.2.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "e9e8c21b64f7f434db99b30b6e7190fa55f3b23a63dcdef120118d228ed533aa"; + sha256 = "41707b3e3b7dbaaea510c58ba503fe22de84963fe1979b2e4c7e00cdf1ded01a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/sk/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/sk/firefox-84.0.2.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "dd2e17cf612de02aa71a933a8b1f26e403e1be4da54e63530667e81441d5f6e9"; + sha256 = "4ba12f304145102db13feaca98f84bae5e06609c721967e1b69d68643a94c1db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/sl/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/sl/firefox-84.0.2.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "782e612494aa907990262c7ac7189e98d90336b270a806a8e191dcc1c8266218"; + sha256 = "2dfafc7ca5fdf0a03a8301f1daacc397fc49f3fae18f6ac6454b4110c5bdd65f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/son/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/son/firefox-84.0.2.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "7730614e4e22eb871dadcc13f62d0d2bc445aed89c1ab6eee2600aa6f7023fa1"; + sha256 = "13139fb6bb47472c2ce47dd535bdeea6fa90521681c2a8e8ea963bebecbdd54f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/sq/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/sq/firefox-84.0.2.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "6726cc2fa9c7b40e92d512b83bc0a974c3668a3854ac91aafa334b4d30b71ee7"; + sha256 = "9710315181f78df3673b71fef597b9498c0a860b167ab4b9c4e68df9c500a6be"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/sr/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/sr/firefox-84.0.2.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "22b443987fa62f4d753efc04ae926e3ed69ce84c56a2fc653994d886da10f9e6"; + sha256 = "bbd69589dc5a1fe7b3a0f74c0d8e20cb4cf6b7ed771faf7c161c96301736e89c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/sv-SE/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/sv-SE/firefox-84.0.2.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "3c4d26bce8cd12a6531fe15e3e7251ac9046bc7d1670df3754f0c379bb63ef50"; + sha256 = "a5769159d0c7bc89865ffe1e2fd6b88675afdbda29752ebdaae986f0ace7d3f4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/ta/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/ta/firefox-84.0.2.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "edbfebceb857824f331c46eb7611dfa9adbfcf6cc7b80075478059261b0de6bf"; + sha256 = "836aef11ef967ee8c74b9c4221525c31427ee509b798952b59a43a6c7c2169f8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/te/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/te/firefox-84.0.2.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "06f342dd81f0ff481de67fbbbd5bbbefda27629be688d854a226d515c872d69c"; + sha256 = "a8e091052e0f606ad8b29b344d65cd86ee45a2b349c99e462f96cc36c08c18e8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/th/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/th/firefox-84.0.2.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "1ccc1da981cd49effc811b4dd85a09bc584316b3ff50fcb05502e4618c465ea9"; + sha256 = "17679aff5806314398ffd9568be11157f41b0820313394f7c59c8bc69af8cff2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/tl/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/tl/firefox-84.0.2.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "b15095bba6ff763f01e7677359a0e8885164eedfee1836e0eb4e1822322050db"; + sha256 = "7fd68265f2d1187dab49480004355d241fbe628cf9bce7a613ed5e048df9223d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/tr/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/tr/firefox-84.0.2.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "e140a2196da9ae934134bd3ad3dafcf8766aa676f410047817ba01ab831b0ad0"; + sha256 = "0eeb30611cd3da04ef0c3439e59a3c2c46f2d38b566795691f8992041507550a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/trs/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/trs/firefox-84.0.2.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "3a8c6dd94d17c8ce892f7eec395f8f6676bf4fb18174a6dfadde41868f9d3e21"; + sha256 = "31ed82b3b45c9f9e6a84fb57b32c23468f42d4072b04437db5dd62f1d541ea80"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/uk/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/uk/firefox-84.0.2.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "d66bcb1f09213c34f14ec0cbd3687d8b5918afceacb2164e81ff94e681c432e0"; + sha256 = "bee267b4822a44edfcacd11bc6aa83ed2957dce95789926ea3cf3d714fd99542"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/ur/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/ur/firefox-84.0.2.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "0d9094f14a25b0bb3c7656fd524cd330c0b7a6334ab23c86a01ecd1beca14988"; + sha256 = "1da5fbc3e3b77a102d00bd1db146944640b9e8c5a9c7c5222a3570281846d1b5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/uz/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/uz/firefox-84.0.2.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "70d3cf8198442718cdb664dbd832c91d5252041fe1076faa0f790e63f0c22771"; + sha256 = "11b92211b88db216ee17537c27d86511f827a7435bbe3cc0ea39d0c015c55c0a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/vi/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/vi/firefox-84.0.2.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "17a0ee2e12c74e73fd1346257ae5f797c866f0c4081a154f6290e73f4be40f27"; + sha256 = "29e1f625c9862cb13b5f6238ba2f72200b864abf66ff44af11ca991c67a742d5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/xh/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xh/firefox-84.0.2.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "7383a176b5afc8319781586ece3eba752739499be2c6944050b57ef5b7b620f7"; + sha256 = "6e859ba83b1fcc2930db6ac53ddc5f36ec2bc325b034337c33a2e5b531f905d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/zh-CN/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/zh-CN/firefox-84.0.2.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "08881c7f4043a6e4bac11b4de388da773a374a6c83068723318ab6e1eb981fdf"; + sha256 = "afa32b9e1560aff7c7a6dd9d3c627690ee70c20ea5748f1754cc8ebdffeccb15"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/zh-TW/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/zh-TW/firefox-84.0.2.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "ed3bb049a2a80cf294b4b4c4ca0e980b38b6f18c4e931a63ff78e5707fc2daf3"; + sha256 = "5f0ec2ca348b788590ec4eb552d34c204612895145521eb53a3b1dd73c34eafc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/ach/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/ach/firefox-84.0.2.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "4bdaa5921976290cc5bb11f981d2f6559751a693a2bbe512b9e80eb5148b2e37"; + sha256 = "f003b9197505256cefcc96a07a3314ee9438a5024048d9815691d5f149233e67"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/af/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/af/firefox-84.0.2.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "853d005f8ac8e2e5e31e3a24057b458f1441d6ac97a41f414c0831295b91fcd2"; + sha256 = "67b9eecc70db21a150ad45682be637e3c6187cd8b0ca3fab9c20e12517372925"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/an/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/an/firefox-84.0.2.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "6409ce28faf1dd18f079891e373a61f0b1eb730b3d1c7559a13784192367577b"; + sha256 = "08fe11419370ed3e8a47819f22bed8f5cc4cadd3296dd69304a4fb5f5a7a5dd1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/ar/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/ar/firefox-84.0.2.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "9c9da9daad627f4c5dbe5588667cdf90fe8a582adaff962c674c483a5d80dd6f"; + sha256 = "fb85564a9037ee9168dfb14ed9f743affa5cd7829e2f2637f75184713db93712"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/ast/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/ast/firefox-84.0.2.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "609de4719323b676dc1a15da8d0295d3c67bb4ee271f70f28db97dacaae87f4f"; + sha256 = "89c659c314dfe2674ce65a37793c151db5c127452e786f77772c1db7b0fc1aa8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/az/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/az/firefox-84.0.2.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "f411a4a560d1a6db4daee06ee3a29d6a14cb5e6e1914aac54c19918b93569e3d"; + sha256 = "9062c6fcd28afd070baff45df8320aab43e61e7d6343945bd1304a2b8fcf78ce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/be/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/be/firefox-84.0.2.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "46d73bb13f113dd6dda069ba571e623b3f20f2b6e76f55f307690ee01eb4dba7"; + sha256 = "0043bb412b2ad9c4bd5f60199f8e3c3e1d81b8bd35d687c909ea65cf0a1eaedd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/bg/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/bg/firefox-84.0.2.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "0bbab0465efeac3cc3f72749242310e1456dbee915bfb08b7ff7e5f5c2fff0e8"; + sha256 = "97ebda162b20aefad89ea918896a1d0a2b7546a67b577000f4ddb6cb93bc5a32"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/bn/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/bn/firefox-84.0.2.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "c1d47ac9ed0e01a0ec77776bb6131ae38faa17a3da2d8bea723679e3cd158074"; + sha256 = "705b8e97ca21e14343f16c39ac5a081d866f7b422be154eb55cc4ebe728ef9a3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/br/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/br/firefox-84.0.2.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "b205df6c0016b2c3984b33c00c2153688c7ac162df1a3748b23ce081a87d46cb"; + sha256 = "8a61f457be78003ba212b9921a657428d117bdc978e1f62eb4ba2b2cfd553b13"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/bs/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/bs/firefox-84.0.2.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "85093f59d815cc1d45e6aa6f8ea6ea2972102248aa4973b4386e265f985c85a8"; + sha256 = "074a4153395b6397ffa5b2a74bb22b456e15357a760003a4dfc2c5974e8efa1f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/ca-valencia/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/ca-valencia/firefox-84.0.2.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "57b5054db2cb6987db174c1a32c5e87bc37f1de3ff3e1046421962fb50204af4"; + sha256 = "87109dec410e6f57199743666d46e81a42fe6364cb55742e24391d922bd8c0dd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/ca/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/ca/firefox-84.0.2.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "f57a9469122e99537dfe11984c11425008d81b738fb939297be2c1104858d52f"; + sha256 = "7ab7be9dd01b25f119de9a432b1487a506d5b8306b7c516614feb9a559de6cdc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/cak/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/cak/firefox-84.0.2.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "6a8d4e9b3555ebb7020e347bb59d426fb5ab0cb1fb5012fdd99d0e978675b994"; + sha256 = "e5518707de8deffc05024f76248711b59037f994a1b6883e65243a01a82076c7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/cs/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/cs/firefox-84.0.2.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "15d8e1ec0e3719228cd0d4f17667a08d4fadffdf2cae91abe47ddfe511d81046"; + sha256 = "682add587e420149a34cdba03a0b91a7190a33753bb40972836c8e12110ea356"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/cy/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/cy/firefox-84.0.2.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "412d19fa8e4c47c892780b225e6d320bc24b3adf482cb023964599ac35350433"; + sha256 = "396764a821b7333aae3dfa6924e5246ac6aeb613470e5098ff542aa5d7dca65d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/da/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/da/firefox-84.0.2.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "8116eb1c33d26e589c7cc3b7999159f7893018f7bdcf627d9b892b0f96a55e9f"; + sha256 = "28aa6f2f3ae2fd19b5b6d149c1bf735ae55c56ff3bee0646bef98dcdfcbf3dff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/de/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/de/firefox-84.0.2.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "433b02ea3b1d50e9a8287e6e264d518520f656fcbb9851068de1240599e4c512"; + sha256 = "eefb48753ea89ebbd27e7357a22ae7246086093d7054b684ed8f2ed1dbd66835"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/dsb/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/dsb/firefox-84.0.2.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "5d55fdf5976a0c1f3a79058b1993923ae67c063b6643695dee8bcb4faed06c74"; + sha256 = "65c947541d4c6125b292b6e5ac61486bb434b56a824e304c343464d4a8ac4021"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/el/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/el/firefox-84.0.2.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "668a9f735be42cdd57a8b7395c37703e6e1b30264aaf9201a801efe711dd008e"; + sha256 = "86d20281cd16436acc0c015b2a72775ab3beaf1f52348181131c210448dd9ccd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/en-CA/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/en-CA/firefox-84.0.2.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "9c20e6c096e1a7ab910d91380083e400f35052ed9ae72860b8ba66ac750c5fee"; + sha256 = "d71c02929a7e4b08bfe1d83eaa577755d7dd1074f2328c428bea73c1bdd82920"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/en-GB/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/en-GB/firefox-84.0.2.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "4de8ea0ba0e599529abde78983e04c509229bbae756c633fa929833b385f9519"; + sha256 = "5ef6635f57a34fab6dcc54462b621721063ab354798d8924e8621895fc3ed4ac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/en-US/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/en-US/firefox-84.0.2.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "6cf9fc509ef21c004a70810c8cd4c428593642edbdd5d4f4c455345391ba4def"; + sha256 = "7008acb0a5112d22b02f75fa8b46ecdb46dc2cb0ab691791595f2ac45187d6e5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/eo/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/eo/firefox-84.0.2.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "1ed7915f1cafa19d36465bb0d5f9fca8e57b7f0f8652dabcf90a4e232c0cccdd"; + sha256 = "e9dadf0b2b655bbcee8557805ee1b93cfef911c9c1a60d63b31afc84f06f9021"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/es-AR/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/es-AR/firefox-84.0.2.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "359234b846e364352a6af0a262db06b6e9f4a911c407bf35f1ad2f8460eff7ab"; + sha256 = "3ca485c3eda6a0d2cf348d2870fa708ad374dc0fc830696484e0c2ff5ef3c967"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/es-CL/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/es-CL/firefox-84.0.2.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "eae445daf305820692b7ee9d20dbd69f0da509716925db6c12eb7c2e7a521416"; + sha256 = "e69f6b048f42ff8eac54176d5b3c85cd31ce02794f22bce2a09fd262d62789a1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/es-ES/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/es-ES/firefox-84.0.2.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "36a2f4eca19bff55f998e8e36718d4a4bdad0eea5c53af1825f857834dc6a1d7"; + sha256 = "1cf1ea30406e16564fabd54b339ebd2111498eecbf25ec93c7401e2143e1d456"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/es-MX/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/es-MX/firefox-84.0.2.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "7f7f384bbe156e37af25cdc19a49ddf225692a2579ce5c7df37b8684f0318102"; + sha256 = "94a8ea4e1fb63470a46a83678f71698b151ebf9c57794a086a8982d29edc0706"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/et/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/et/firefox-84.0.2.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "39288f46064d259f4ac1f11481480b189d945608d4b3ece922b774ca31fbf95e"; + sha256 = "b4fde31f58defe8b35d4c9325f1485093bfb155c73f6d3c02fa3cdcbc8393105"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/eu/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/eu/firefox-84.0.2.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "7693f969f356f87db5d48266ac20a152bbb8946486ee60f5efa0225a83a25493"; + sha256 = "d84a2bdc2f55b57c612abbb0208ef4b7683ef7d696739e9b1a36238daf61ab9f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/fa/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/fa/firefox-84.0.2.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "ff189730d71b2ad0e2694a364bc0c0ee4de50efe30f44935b1cef0d89488f8f2"; + sha256 = "054e6269745c8ae120daab489a9157618956bf2ecbc309bc64b7fb2f73400766"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/ff/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/ff/firefox-84.0.2.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "b6f39b27d000fe98510da1d5be6b591e3a7cd1b6e2d2502bbe7e67b124822ed1"; + sha256 = "1ebef6026207141e0d3d37533ecff2b22a4e936e27a58939fbaa72d723078049"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/fi/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/fi/firefox-84.0.2.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "ec33e3bc8a549c1c2d5bdc0f45113d96d3c959d1d9232d08417c09821cbd8e42"; + sha256 = "9a8609ae113b392d3bcee30ae48c1e8b4ce6a1fc180c7f936c52934fa1911429"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/fr/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/fr/firefox-84.0.2.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "43e80f221e53db14a57da940d6ad98d639bffc94c71e08ff39501aafe319c3a3"; + sha256 = "afcc5075d8455d32360d5045125290c8b843e48f4b774ab48d5c2f49e1cd9fe2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/fy-NL/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/fy-NL/firefox-84.0.2.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "dbbe3af347ec5e8e856e4580889f99709231eb07631862ad4e8deb095f098390"; + sha256 = "232dd4a17ff87945b1ea11183fea8711c572e31d34898d15b378a54697c720b9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/ga-IE/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/ga-IE/firefox-84.0.2.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "4d5c8fec2f370840cf79c19774976585af0d8e09f13abcb4a594f3ebf9c52558"; + sha256 = "c68e57472d6837074bb8180063ce6eebf0396b187aa3d47ee9bccf1cd1529459"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/gd/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/gd/firefox-84.0.2.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "7ea8febc7443e1f7c732e07cc8bd027ed0a82eea018b6bf7c5979820821701ea"; + sha256 = "ed6ab375a3e487ee3c6f2d4017f8bde6c3ff29978a8b2f125b58e3ca2472ce38"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/gl/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/gl/firefox-84.0.2.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "207dfe2ed822245d089a4f1848fcf6c92e27715b4463bcdcdea2127e8ac8fae3"; + sha256 = "28993fb518753a241abb2e6a22583f8a318bfeeca4e0eca76bedfb2aa0a01e07"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/gn/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/gn/firefox-84.0.2.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "a07d734191885b4e5e66c1a5b2f64cbdcc133dd9a1cf8fdaea882a3a1ceec7ba"; + sha256 = "370637503e0fa36b937f32867bd68a300fe1bd8d99188ab86ad9392ab5b8a8b6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/gu-IN/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/gu-IN/firefox-84.0.2.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "af4146f86e4f5aa81d10067e21653e657620d9b0b51d564dca83c4435f6cca82"; + sha256 = "1fc77e276cf34424e3c7522af9bfb5d3dd43e33357ce01b696655c2a91a8f2a0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/he/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/he/firefox-84.0.2.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "608652ef032ccbd0d61070a32a2931764b86ea0d25afb12617338136f3f29e42"; + sha256 = "b1ffe2fcfd55fff2b696dd40d3292ad9cf2cde1179bd8c9c7103df9c902b276e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/hi-IN/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/hi-IN/firefox-84.0.2.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "1724879537c0472762dd93a2206f31767938881ab4113946076205342f8f5f7a"; + sha256 = "d13f74a4a45e7a20a1ec3354dce98f33bef647d6153aed2539cf567a6eb3fcfc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/hr/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/hr/firefox-84.0.2.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "727f4a1d3ef4e531027c5188798b8fd1aeab98bffe4c1f7f67d919aa8855e6bb"; + sha256 = "f0a288dc290d2665948e3536b7b52b799461bf060be38b957aff7cd52aac02ff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/hsb/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/hsb/firefox-84.0.2.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "6efd8dd2cf6f82b688632095a16c5e488578ac08227cbbcf2613f9b2852c9445"; + sha256 = "e395166b3039027e56eb6d2d7f97b121c1bd947cd6266829b949b221cbb2cb74"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/hu/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/hu/firefox-84.0.2.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "458e8452d89e61f8f4ac3d1ca3e41583fd26cfa897c4b36e0888a2174c853508"; + sha256 = "666b47226545e9e8f45ff09e3428d6317fbe67a197e13ada814b6a4f72544a98"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/hy-AM/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/hy-AM/firefox-84.0.2.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "b58af31a6ab2e224f9f50e88c1e97c8f4af273f5189c59f025c10d5589fc2d41"; + sha256 = "779111633101f8b7da4c84d3d085ab1e8e3502d255316d17eca653b0481d0885"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/ia/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/ia/firefox-84.0.2.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "de6bab3cc3e08fed14584d57a58b9310829ce17906561d880c06968d3ca6a879"; + sha256 = "e27ac7b8e8d2f3c4f453563d2d2efd3005b12be1696de453182a53a3de490ab1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/id/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/id/firefox-84.0.2.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "31cd054f01b8050fe70a95def464b76bfddff2277993c759395e13c3829c2c70"; + sha256 = "86dcf72326ea283bcfd612cbec0ea095be72fe16d446a317a31c886d91f5b452"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/is/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/is/firefox-84.0.2.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "fbb17534672c6b7c89dc51eca97ac9c0f807fce84a68bbf75f077ce1c6202725"; + sha256 = "17305f92a16967d941df34a59706f90b94b8c671d01e8aab768fbfd473a81f78"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/it/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/it/firefox-84.0.2.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "9fcfd33025b3d7b88238e6c51472a06b1b6bef56d1275a1aeecb66224f8d6d9b"; + sha256 = "4b2804d9c52c4f9202e867f2540523cc45675b5d34e46a8d59b044c88a840f5e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/ja/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/ja/firefox-84.0.2.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "37a234db4a8618cb125215ef51700fe72e29f2ac9328c4f5a319516f32eac7f4"; + sha256 = "6a8bc7abc0c320a31d7fac4e457bd46a3fe7379f795e8cb2f36b2de70bf048f3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/ka/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/ka/firefox-84.0.2.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "0875616e42bb71c79427a31c5adac9e1d9112c0bbeae866725ae9bd87ca915f8"; + sha256 = "de6b6be1696d20148cb94cfacaee0fe5ec128550de006a6f64723885d47a1352"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/kab/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/kab/firefox-84.0.2.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "88b6430577c73965bc229cc2875b138db1cc47ab27c7aed6c6004559f296d819"; + sha256 = "a898355c71d00c72aedb87901184f69d0598fabc4827c9070ebb900a48dbf152"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/kk/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/kk/firefox-84.0.2.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "6de277b39e76394245aaab0dfd4ccdcea4af5812fce20ff61faf9d62c22bd34f"; + sha256 = "1945b3526a8f52cc7cbaa30e344333c43c7d228d557a249fa4f41a8bb91eb4b1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/km/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/km/firefox-84.0.2.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "25c0e6752716e6fc4ed02b465b820661ec59ebf997bfaebdbfe172e2a18dc387"; + sha256 = "3e033fae06700495784b4eaa911309d250d3e55a94139a65f44248975c414980"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/kn/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/kn/firefox-84.0.2.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "f61cf632f934daada5d6d2164279981b5536d078ddb5b19e7146a7beb0917e23"; + sha256 = "b70553b460d0604bff55ea29657e74b1133995ae93bb958b6b20af366cce2eeb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/ko/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/ko/firefox-84.0.2.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "9e9000032c24fd20dd188c9306364ad79fc2d47b3433d36914a2caea716ff230"; + sha256 = "0ed0d1a0219ef92c0de45578c3674da0ba0e8fd9ed2e00afc01b05d53ea28112"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/lij/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/lij/firefox-84.0.2.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "1fd2f5ec8c3074845a27072d8eddf364384e7ce7494739af331a739249c34e4b"; + sha256 = "5fa837001b3bc5d9138ed14e22720933f28fedef63a7dd473976348448cebb30"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/lt/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/lt/firefox-84.0.2.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "e8b43ae1a3e3cf7d5fb955cfa772f5fbec525fc9c3deb0e81390b8fc53b70176"; + sha256 = "b54990d4737b71dfa235d20ee2f87367b72f0a1245585135a9918d2755b3d1cb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/lv/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/lv/firefox-84.0.2.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "00908977f480f6829761822a4f6f9800c3940faeac0362c46433813788ce1391"; + sha256 = "06ece913374b567ea10cd9377485d0793a12a151e9e3ba08e3c5433a5e772151"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/mk/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/mk/firefox-84.0.2.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "cc6a8e52d7e3940e2664b4659f4a33d452b1bea56d3d53c88c28afd604731118"; + sha256 = "dc69547cdf414f783017ebb8931dd24ad1b899f19bac20bca4d21ebe91963a0c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/mr/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/mr/firefox-84.0.2.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "4a16e203e5b02b146879722a1fe909bd964d712795841cbbd268acc34d5073c6"; + sha256 = "f503a40041ba0f4e44791f8d2e38c41f25698fd970457fd8cafd92d2d3e64102"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/ms/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/ms/firefox-84.0.2.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "2ebf161faa958992d3dbb9f7d70f7df058b93bc0627a4585fb3226a744c23ef6"; + sha256 = "07491c18e9fe0d7f97b24c8bcf571ede2c4effda58ceacb0395fb7ce9eae1eb7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/my/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/my/firefox-84.0.2.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "43255bc0c5a5adc89bb89ea9267b3d4b38d7432555c7285722228b174bf909a2"; + sha256 = "19d57112de4c6429e915568ae317c3bef2ef6d58d0c57d5a07be0cb2f1bc11d0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/nb-NO/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/nb-NO/firefox-84.0.2.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "153783b507cf3ec449e8a3d7db6ec523e956c23e1c01f9e26c0e6fc7547353b0"; + sha256 = "72e6576c3a725675c2514d39b3ea4497590410037aca696c5f3f3dd5109b3c09"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/ne-NP/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/ne-NP/firefox-84.0.2.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "8a3b9e8607565e6031f15a94ae4bcc6e6681d1705408f79483406cdfc04e6c4c"; + sha256 = "fb624e1ea63aca7f481024c40e7b5a47e504ea545169566f86e7ca24e36e7582"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/nl/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/nl/firefox-84.0.2.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "7d87b9188f74dc3f910761fc0e1c493c121ed6ab077a0fcf1c88af94fbca22a5"; + sha256 = "a1aab7534d0dde0c61c48bf0f33fb336c12b5d8c644e41188dad7c138531bbf7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/nn-NO/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/nn-NO/firefox-84.0.2.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "5d0177a4c13faa2cf9aa0edacbbd381d1ff5eb9ad17ae44ab507f3c8e582c360"; + sha256 = "d1c645cd0b65f8b48b0497b1a16b25a2e11d8de70bb3e37baf6f05c5750525cb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/oc/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/oc/firefox-84.0.2.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "cf8cd276252fccf07990c0a294e4628566ff3884cc062f26d6510dc042c6b5af"; + sha256 = "f110c97c8e464ace6026ddb3da15c13177455bcba067a54d4c531329a4cdfdab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/pa-IN/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/pa-IN/firefox-84.0.2.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "75ab886eb9fe8d0a2cb9b0544090bd4b818e510ae4c3b137323782237d1a2a77"; + sha256 = "4931270889eb97b55b3bea7177e778422045bfcebc25e4bc05019ffbde438c78"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/pl/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/pl/firefox-84.0.2.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "9a2007a58e264731fbc1691213cf4aba07f360e5c3ee455c6a9abd85078f447f"; + sha256 = "c0438fb22ef1c610afc16bfd689d1843d6099e91e6b8a30b03a2f692b609eb4a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/pt-BR/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/pt-BR/firefox-84.0.2.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "71b833c745a4fb334fc1aaa250b67d701cac46c3decec7b839e7554c30e4fbec"; + sha256 = "df61ec134c161d0f44ad0805bda8d1baa37d21c618c4f4d165e40996d7ba5956"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/pt-PT/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/pt-PT/firefox-84.0.2.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "a56ada11b7681238a17c3e02c90122d4632070d8385624b34e03ebd2803328e7"; + sha256 = "a09341dc8284b77fa3bd1c7d5fbc377a93cd21109e1330b0a2260613df3c4e5e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/rm/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/rm/firefox-84.0.2.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "c0cadeebef45884e11a67e1f45f0b36754fc6e2537b2575f06ec539a43986bce"; + sha256 = "19016551888f5104227e3cfed6c66b7ca11e11a31d9c007c3d00f6821126fd03"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/ro/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/ro/firefox-84.0.2.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "386f7557754cfb2887c7ff2be165d8b4cdc4cc4303fd26539b2d09de440b8c0f"; + sha256 = "d5cacf3a2c3cf9c3c6fe182005c038094fb6b8ae58ea169123e6289f7a2c5457"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/ru/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/ru/firefox-84.0.2.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "62ee54d895760e7a024fc4836096ad97b95b9bc0ca9d5900d551f86b16071aeb"; + sha256 = "8907175fd858dc243dafd4216b3602f154ce824a2388b714cee9352322781f39"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/si/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/si/firefox-84.0.2.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "37b2bf998d61de9ee9b372548d8ccc0a2b4cd098e26c7773829267379cf5bfc0"; + sha256 = "19be977d9110dddb944e0ca713aa986fb3c005a4f39bde23a4a0b907cb7d39df"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/sk/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/sk/firefox-84.0.2.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "30429ca6601f9276339f925614fd79b03ac54573564307ea84f0f87359bac7f3"; + sha256 = "2a7a5dfacaa016ae6d2dbb52d0803a8a27f74061a6bf71fcbac5fe2e10834374"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/sl/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/sl/firefox-84.0.2.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "412e8aed7694adc1870d4e2bd8eeef74eb63ba0699e815b1d2ec65d38de9b4ff"; + sha256 = "61c65884ba57fa5fd37919a390b8af4cb0d7abf31ead557f2967049c35a4bc72"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/son/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/son/firefox-84.0.2.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "864e49755554df5ba8d5669f1b3d683517f2eb44039a35097e3acada4b22171d"; + sha256 = "be825ca5923ec9aa37417d4d4842bd82ee4271ec201bb317e0b58f654fe8a7c1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/sq/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/sq/firefox-84.0.2.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "1449ff4fac39eb2c3f959a899d773e77e457639ebc4cb26dd9c4188395b9c831"; + sha256 = "c7ab49257d5e44bb96e8f39bb586e51a100b899fb6e595a86bf41ebc25b55021"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/sr/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/sr/firefox-84.0.2.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "51813e4ef930533045632fa516752303430ea9fdb848653c1233ddd9ef6d26c5"; + sha256 = "b22e12526457dfaaf976eb94262965c3bd46edf4a99380a430d75b2324ad654a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/sv-SE/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/sv-SE/firefox-84.0.2.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "82e3ce190978b83da1f88b175bcf4f1c95a1539e15375c856c54516333b8fc5d"; + sha256 = "5e024fc41d9287480ab09ea45d46e9dc358be53adce325826d9820b6cf3ab8ae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/ta/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/ta/firefox-84.0.2.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "09f104627061c25c188d6e945dc1915ac43af31c6a0a0a05e70f051915f3d2bc"; + sha256 = "529afecbbdfa2f934d755f80c7a0bc9d4bac5053cc0c6421c1687ab16e5b1f02"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/te/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/te/firefox-84.0.2.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "a58503877b476f20e176abfa0ca2e5406b8ae8877954924f63f6490c5be19526"; + sha256 = "d90b59759a4f24f9142250f6fe5853fa0e6afdc30bff7e735fc5b70a3b76f555"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/th/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/th/firefox-84.0.2.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "722f4194231fb315a07e0efcc922c6d62a8969321eadfccf2f6b74754b563d2a"; + sha256 = "023f86d83e23371bbbe68bb586a08e81a58cec027a44c0ddeb217ea1343b5cd5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/tl/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/tl/firefox-84.0.2.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "6299ac5b4b505549cea0dd465059191adbee72346cfec46b94c67e7f5e9bc399"; + sha256 = "2fd3a1f80900f16eac1de89c8a7a4f93cafef144a24d9c261b09549a3b659448"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/tr/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/tr/firefox-84.0.2.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "3e4755c497512bcb225a6e35e426db6772f263008f9d6c8495a8311d6d5ebfd4"; + sha256 = "1144aa3437ae67c6921ddeeceb59dad5767d1d59c7932fa0da460c64a4f5577f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/trs/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/trs/firefox-84.0.2.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "d6bc24f33f73fea25675a1bcb53a40d4dc123b6496f0087c25b4bd7f6ca717f0"; + sha256 = "1f3e1d5fec2b4d9b11c3c0ded1a68aa7e36d13fae472ce782fd820d4fd32a7c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/uk/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/uk/firefox-84.0.2.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "37b48b8cf2e57a3bacc2d3a5c139ac1d465e246a68fd33b87891e8c844af0088"; + sha256 = "165dfdd03c178af49d3f3139a0c9032431f92cf91e79d6842b5e0b006c73490c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/ur/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/ur/firefox-84.0.2.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "b3a45eb2ad18d1af426e82163b426ceba5adc47957ff771121ee4b172037b53b"; + sha256 = "6a91871a99188c0bc6a956d92382c800543d95a4d917e64d3295d9b1fe8971e6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/uz/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/uz/firefox-84.0.2.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "67539a5475aa12d25f8b83655cddc804d46b980e03908bb44f5378753abb649f"; + sha256 = "ade7a34f46893e3367384b414322895f5cd9ce0d341b7a7ddeb191fcc7679e5a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/vi/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/vi/firefox-84.0.2.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "ad894dd659f5c86e0b094b709d0d336516e29dea1d1d9ff35f264e6606e59938"; + sha256 = "aca136daf5a8d71b55e479a37a1d42569ee6c9086ac96bf98587948eb23c5f59"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/xh/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/xh/firefox-84.0.2.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "a43b653ad3a3d865c410103ccb66d3603a08cc37177d5279a1b326381631dcf5"; + sha256 = "6993f823fd76b8974334b37ebe9c683d43fd2524ea1c485ef0c53db993db15ef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/zh-CN/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/zh-CN/firefox-84.0.2.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "73e877c33aa5553f90ffc0c68b7416bb988477e55f53632d9f78526ca11a89ba"; + sha256 = "b179fb98b0eb374e28574a4eb61f86df8765ee5bac033e93ad6c3e71d010e7cc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/zh-TW/firefox-84.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/zh-TW/firefox-84.0.2.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "7f448ee87156e73cba4a9edcdd52299f6f70ef7660bad9ee6b7c60375d83e1e6"; + sha256 = "0c51a4e5afa22fac0c98e2e960168fb5625a29d2d9e1565ecd08080d83e72d73"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index b4e0d9c58267..d005b232f5ba 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 = "84.0.1"; + ffversion = "84.0.2"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "0sl93h7pjiznabv6865pdbal08nlqncnv3g40l02mgwbphjh5iqrr1bz14khaf58h4v1la090cj7z0gmd0c10xfrx6z7wngm152zz75"; + sha512 = "2cxybnrcr0n75hnw18rrymw1jsd5crqfgnpk10hywbmnkdc72fx5sk51cg890pzwfiagicxfxsacnm3f6g8135k0wsz4294xjjwkm1z"; }; meta = { @@ -31,10 +31,10 @@ rec { firefox-esr-78 = common rec { pname = "firefox-esr"; - ffversion = "78.5.0esr"; + ffversion = "78.6.1esr"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "20h53cn7p4dds1yfm166iwbjdmw4fkv5pfk4z0pni6x8ddjvg19imzs6ggmpnfhaji8mnlknm7xp5j7x9vi24awvdxdds5n88rh25hd"; + sha512 = "3kq9vb0a8qblqk995xqhghw5d694mr1cjd5alkkwxbdjhpc1mck0ayn40xjph0znga6qdcq8l366p0by8ifbsdhv0x39ng8nvx9jvdf"; }; meta = { diff --git a/pkgs/applications/networking/browsers/lagrange/default.nix b/pkgs/applications/networking/browsers/lagrange/default.nix new file mode 100644 index 000000000000..4ade911e1c7b --- /dev/null +++ b/pkgs/applications/networking/browsers/lagrange/default.nix @@ -0,0 +1,44 @@ +{ stdenv +, lib +, fetchFromGitHub +, cmake +, pkg-config +, libunistring +, openssl +, pcre +, SDL2 +, AppKit +}: + +stdenv.mkDerivation rec { + pname = "lagrange"; + version = "1.0.3"; + + src = fetchFromGitHub { + owner = "skyjake"; + repo = "lagrange"; + rev = "v${version}"; + sha256 = "1l9qcymjwg3wzbbi4hcyzfrxyqgz2xdy4ab3lr0zq38v025d794n"; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ cmake pkg-config ]; + + buildInputs = [ libunistring openssl pcre SDL2 ] + ++ lib.optional stdenv.isDarwin AppKit; + + hardeningDisable = lib.optional (!stdenv.cc.isClang) "format"; + + installPhase = if stdenv.isDarwin then '' + mkdir -p $out/Applications + mv Lagrange.app $out/Applications + '' else null; + + meta = with lib; { + description = "A Beautiful Gemini Client"; + homepage = "https://gmi.skyjake.fi/lagrange/"; + license = licenses.bsd2; + maintainers = with maintainers; [ sikmir ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/networking/browsers/links2/default.nix b/pkgs/applications/networking/browsers/links2/default.nix index 0db521f8ef59..f497a7f9a285 100644 --- a/pkgs/applications/networking/browsers/links2/default.nix +++ b/pkgs/applications/networking/browsers/links2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , gpm, openssl, pkgconfig, libev # Misc. , libpng, libjpeg, libtiff, librsvg # graphic formats , bzip2, zlib, xz # Transfer encodings @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional enableFB "--with-fb" ++ stdenv.lib.optional enableDirectFB "--with-directfb"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://links.twibright.com/"; description = "A small browser with some graphics support"; maintainers = with maintainers; [ raskin ]; diff --git a/pkgs/applications/networking/browsers/luakit/default.nix b/pkgs/applications/networking/browsers/luakit/default.nix index 42eb8bcb63a8..e634b0f566f6 100644 --- a/pkgs/applications/networking/browsers/luakit/default.nix +++ b/pkgs/applications/networking/browsers/luakit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, wrapGAppsHook +{ lib, stdenv, fetchFromGitHub, pkgconfig, wrapGAppsHook , help2man, luafilesystem, luajit, sqlite , webkitgtk, gtk3, gst_all_1, glib-networking }: @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { ) ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Fast, small, webkit-based browser framework extensible in Lua"; longDescription = '' Luakit is a highly configurable browser framework based on the WebKit web diff --git a/pkgs/applications/networking/browsers/lynx/default.nix b/pkgs/applications/networking/browsers/lynx/default.nix index 8aeee45b9e54..9c9ec5624c87 100644 --- a/pkgs/applications/networking/browsers/lynx/default.nix +++ b/pkgs/applications/networking/browsers/lynx/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPackages +{ lib, stdenv, buildPackages , fetchurl, pkgconfig, ncurses, gzip , sslSupport ? true, openssl ? null , nukeReferences @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { nuke-refs cfg_defs.h ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A text-mode web browser"; homepage = "https://lynx.invisible-island.net/"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/networking/browsers/midori/default.nix b/pkgs/applications/networking/browsers/midori/default.nix index 66f6384643ad..ca6d4335785e 100644 --- a/pkgs/applications/networking/browsers/midori/default.nix +++ b/pkgs/applications/networking/browsers/midori/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , cmake , ninja @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { libarchive ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Lightweight WebKitGTK web browser"; homepage = "https://www.midori-browser.org/"; license = with licenses; [ lgpl21Plus ]; diff --git a/pkgs/applications/networking/browsers/netsurf/browser.nix b/pkgs/applications/networking/browsers/netsurf/browser.nix index 407d94a4dc45..4dc3ee169572 100644 --- a/pkgs/applications/networking/browsers/netsurf/browser.nix +++ b/pkgs/applications/networking/browsers/netsurf/browser.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, makeWrapper, wrapGAppsHook +{ lib, stdenv, fetchurl, fetchpatch, makeWrapper, wrapGAppsHook # Buildtime dependencies. , check, pkgconfig, xxd @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { "TARGET=${uilib}" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.netsurf-browser.org/"; description = "A free, open source, small web browser"; longDescription = '' diff --git a/pkgs/applications/networking/browsers/netsurf/buildsystem.nix b/pkgs/applications/networking/browsers/netsurf/buildsystem.nix index 2d625b725446..4956c70655a7 100644 --- a/pkgs/applications/networking/browsers/netsurf/buildsystem.nix +++ b/pkgs/applications/networking/browsers/netsurf/buildsystem.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "netsurf-${libname}"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { "PREFIX=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.netsurf-browser.org/"; description = "NetSurf browser shared build system"; license = licenses.mit; diff --git a/pkgs/applications/networking/browsers/netsurf/libcss.nix b/pkgs/applications/networking/browsers/netsurf/libcss.nix index db907edd8799..b09701fc3678 100644 --- a/pkgs/applications/networking/browsers/netsurf/libcss.nix +++ b/pkgs/applications/networking/browsers/netsurf/libcss.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, perl +{ lib, stdenv, fetchurl, pkgconfig, perl , buildsystem , libparserutils , libwapcaplet @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE= "-Wno-error=implicit-fallthrough"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.netsurf-browser.org/projects/${libname}/"; description = "Cascading Style Sheets library for netsurf browser"; longDescription = '' diff --git a/pkgs/applications/networking/browsers/netsurf/libdom.nix b/pkgs/applications/networking/browsers/netsurf/libdom.nix index 3aa9e3a1878e..5bb628014374 100644 --- a/pkgs/applications/networking/browsers/netsurf/libdom.nix +++ b/pkgs/applications/networking/browsers/netsurf/libdom.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, expat +{ lib, stdenv, fetchurl, pkgconfig, expat , buildsystem , libparserutils , libwapcaplet @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { "NSSHARED=${buildsystem}/share/netsurf-buildsystem" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.netsurf-browser.org/projects/${libname}/"; description = "Document Object Model library for netsurf browser"; longDescription = '' diff --git a/pkgs/applications/networking/browsers/netsurf/libhubbub.nix b/pkgs/applications/networking/browsers/netsurf/libhubbub.nix index 53b8d270d4f6..3a1a29e743c0 100644 --- a/pkgs/applications/networking/browsers/netsurf/libhubbub.nix +++ b/pkgs/applications/networking/browsers/netsurf/libhubbub.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, perl +{ lib, stdenv, fetchurl, pkgconfig, perl , buildsystem , libparserutils }: @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { "NSSHARED=${buildsystem}/share/netsurf-buildsystem" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.netsurf-browser.org/projects/hubbub/"; description = "HTML5 parser library for netsurf browser"; longDescription = '' diff --git a/pkgs/applications/networking/browsers/netsurf/libnsbmp.nix b/pkgs/applications/networking/browsers/netsurf/libnsbmp.nix index 95487eed00fc..f25ccf963542 100644 --- a/pkgs/applications/networking/browsers/netsurf/libnsbmp.nix +++ b/pkgs/applications/networking/browsers/netsurf/libnsbmp.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig +{ lib, stdenv, fetchurl, pkgconfig , buildsystem }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { "NSSHARED=${buildsystem}/share/netsurf-buildsystem" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.netsurf-browser.org/"; description = "BMP Decoder for netsurf browser"; license = licenses.mit; diff --git a/pkgs/applications/networking/browsers/netsurf/libnsfb.nix b/pkgs/applications/networking/browsers/netsurf/libnsfb.nix index d37766f5330f..cb3a759acb85 100644 --- a/pkgs/applications/networking/browsers/netsurf/libnsfb.nix +++ b/pkgs/applications/networking/browsers/netsurf/libnsfb.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig +{ lib, stdenv, fetchurl, pkgconfig , uilib, SDL , buildsystem }: @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { "TARGET=${uilib}" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.netsurf-browser.org/projects/${libname}/"; description = "Netsurf framebuffer abstraction library"; license = licenses.mit; diff --git a/pkgs/applications/networking/browsers/netsurf/libnsgif.nix b/pkgs/applications/networking/browsers/netsurf/libnsgif.nix index d8683280c4e1..032d886085fb 100644 --- a/pkgs/applications/networking/browsers/netsurf/libnsgif.nix +++ b/pkgs/applications/networking/browsers/netsurf/libnsgif.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig +{ lib, stdenv, fetchurl, pkgconfig , buildsystem }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { "NSSHARED=${buildsystem}/share/netsurf-buildsystem" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.netsurf-browser.org/projects/${libname}/"; description = "GIF Decoder for netsurf browser"; license = licenses.mit; diff --git a/pkgs/applications/networking/browsers/netsurf/libnslog.nix b/pkgs/applications/networking/browsers/netsurf/libnslog.nix index 12fdcff50bd3..eba4952d7fc0 100644 --- a/pkgs/applications/networking/browsers/netsurf/libnslog.nix +++ b/pkgs/applications/networking/browsers/netsurf/libnslog.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, bison, flex +{ lib, stdenv, fetchurl, pkgconfig, bison, flex , buildsystem }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { "NSSHARED=${buildsystem}/share/netsurf-buildsystem" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.netsurf-browser.org/"; description = "NetSurf Parametric Logging Library"; license = licenses.isc; diff --git a/pkgs/applications/networking/browsers/netsurf/libnspsl.nix b/pkgs/applications/networking/browsers/netsurf/libnspsl.nix index 4338f78247c7..bfbd611000c8 100644 --- a/pkgs/applications/networking/browsers/netsurf/libnspsl.nix +++ b/pkgs/applications/networking/browsers/netsurf/libnspsl.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig +{ lib, stdenv, fetchurl, pkgconfig , buildsystem }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { "NSSHARED=${buildsystem}/share/netsurf-buildsystem" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.netsurf-browser.org/"; description = "NetSurf Public Suffix List - Handling library"; license = licenses.mit; diff --git a/pkgs/applications/networking/browsers/netsurf/libnsutils.nix b/pkgs/applications/networking/browsers/netsurf/libnsutils.nix index 42c8b8b06214..56e2e048b676 100644 --- a/pkgs/applications/networking/browsers/netsurf/libnsutils.nix +++ b/pkgs/applications/networking/browsers/netsurf/libnsutils.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig +{ lib, stdenv, fetchurl, pkgconfig , buildsystem }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { "NSSHARED=${buildsystem}/share/netsurf-buildsystem" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.netsurf-browser.org/projects/${libname}/"; description = "Generalised utility library for netsurf browser"; license = licenses.mit; diff --git a/pkgs/applications/networking/browsers/netsurf/libparserutils.nix b/pkgs/applications/networking/browsers/netsurf/libparserutils.nix index b96018d92eb8..ac50237cc49d 100644 --- a/pkgs/applications/networking/browsers/netsurf/libparserutils.nix +++ b/pkgs/applications/networking/browsers/netsurf/libparserutils.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl +{ lib, stdenv, fetchurl, perl , buildsystem }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { "NSSHARED=${buildsystem}/share/netsurf-buildsystem" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.netsurf-browser.org/projects/${libname}/"; description = "Parser building library for netsurf browser"; license = licenses.mit; diff --git a/pkgs/applications/networking/browsers/netsurf/libsvgtiny.nix b/pkgs/applications/networking/browsers/netsurf/libsvgtiny.nix index aef154bbc17c..66a2dbcf437f 100644 --- a/pkgs/applications/networking/browsers/netsurf/libsvgtiny.nix +++ b/pkgs/applications/networking/browsers/netsurf/libsvgtiny.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gperf +{ lib, stdenv, fetchurl, pkgconfig, gperf , buildsystem , libdom , libhubbub @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { "NSSHARED=${buildsystem}/share/netsurf-buildsystem" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.netsurf-browser.org/projects/${libname}/"; description = "NetSurf SVG decoder"; license = licenses.mit; diff --git a/pkgs/applications/networking/browsers/netsurf/libutf8proc.nix b/pkgs/applications/networking/browsers/netsurf/libutf8proc.nix index 59bae9e941eb..38680da1bcf3 100644 --- a/pkgs/applications/networking/browsers/netsurf/libutf8proc.nix +++ b/pkgs/applications/networking/browsers/netsurf/libutf8proc.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig +{ lib, stdenv, fetchurl, pkgconfig , buildsystem }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { "NSSHARED=${buildsystem}/share/netsurf-buildsystem" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.netsurf-browser.org/projects/${libname}/"; description = "UTF8 Processing library for netsurf browser"; license = licenses.mit; diff --git a/pkgs/applications/networking/browsers/netsurf/libwapcaplet.nix b/pkgs/applications/networking/browsers/netsurf/libwapcaplet.nix index 8c5af461fd06..318885bd2721 100644 --- a/pkgs/applications/networking/browsers/netsurf/libwapcaplet.nix +++ b/pkgs/applications/networking/browsers/netsurf/libwapcaplet.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , buildsystem }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-Wno-error=cast-function-type"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.netsurf-browser.org/projects/${libname}/"; description = "String internment library for netsurf browser"; license = licenses.mit; diff --git a/pkgs/applications/networking/browsers/netsurf/nsgenbind.nix b/pkgs/applications/networking/browsers/netsurf/nsgenbind.nix index 0be7adc4a595..d08f4dbccf60 100644 --- a/pkgs/applications/networking/browsers/netsurf/nsgenbind.nix +++ b/pkgs/applications/networking/browsers/netsurf/nsgenbind.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , flex, bison , buildsystem }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { "NSSHARED=${buildsystem}/share/netsurf-buildsystem" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.netsurf-browser.org/"; description = "Generator for JavaScript bindings for netsurf browser"; license = licenses.mit; diff --git a/pkgs/applications/networking/browsers/nyxt/default.nix b/pkgs/applications/networking/browsers/nyxt/default.nix index ff99b1c21ddd..b4bec6ead3f6 100644 --- a/pkgs/applications/networking/browsers/nyxt/default.nix +++ b/pkgs/applications/networking/browsers/nyxt/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { $out/bin/nyxt -h ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Infinitely extensible web-browser (with Lisp development files using WebKitGTK platform port)"; homepage = "https://nyxt.atlas.engineer"; license = licenses.bsd3; diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index 4b1efe9dba2f..753ea1dc08d5 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -113,7 +113,7 @@ in mkDerivationWith python3Packages.buildPythonApplication rec { --add-flags '--backend ${backend}' ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/The-Compiler/qutebrowser"; description = "Keyboard-focused browser with a minimal GUI"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/networking/browsers/surf/default.nix b/pkgs/applications/networking/browsers/surf/default.nix index 57eb4fad76b0..5ab7cb8d93b3 100644 --- a/pkgs/applications/networking/browsers/surf/default.nix +++ b/pkgs/applications/networking/browsers/surf/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ) ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A simple web browser based on WebKitGTK"; longDescription = '' surf is a simple web browser based on WebKitGTK. It is able to display 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 ab8a21c5b71b..8c70b13cfe15 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , makeDesktopItem @@ -390,7 +390,7 @@ stdenv.mkDerivation rec { $out/bin/tor-browser --version >/dev/null ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Tor Browser Bundle built by torproject.org"; longDescription = '' Tor Browser Bundle is a bundle of the Tor daemon, Tor Browser (heavily patched version of diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index cf37a31ee423..d19da31026e0 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, zlib, libX11, libXext, libSM, libICE, libxkbcommon +{ lib, stdenv, fetchurl, zlib, libX11, libXext, libSM, libICE, libxkbcommon , libXfixes, libXt, libXi, libXcursor, libXScrnSaver, libXcomposite, libXdamage, libXtst, libXrandr , alsaLib, dbus, cups, libexif, ffmpeg_3, systemd , freetype, fontconfig, libXft, libXrender, libxcb, expat @@ -86,7 +86,7 @@ in stdenv.mkDerivation rec { ln -sf ${vivaldi-widevine}/share/google/chrome/WidevineCdm $out/opt/${vivaldiName}/WidevineCdm ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A Browser for our Friends, powerful and personal"; homepage = "https://vivaldi.com"; license = licenses.unfree; diff --git a/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix b/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix index 2643bd3e58d9..d6703788ed92 100644 --- a/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix +++ b/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , dpkg }: @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { install -vD usr/lib/chromium-browser/libffmpeg.so $out/lib/libffmpeg.so ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Additional support for proprietary codecs for Vivaldi"; homepage = "https://ffmpeg.org/"; license = licenses.lgpl21; diff --git a/pkgs/applications/networking/browsers/vivaldi/widevine.nix b/pkgs/applications/networking/browsers/vivaldi/widevine.nix index 6e807aac5df6..3b3a0a858907 100644 --- a/pkgs/applications/networking/browsers/vivaldi/widevine.nix +++ b/pkgs/applications/networking/browsers/vivaldi/widevine.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , unzip }: @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { install -vD libwidevinecdm.so $out/share/google/chrome/WidevineCdm/_platform_specific/linux_x64/libwidevinecdm.so ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Widevine support for Vivaldi"; homepage = "https://www.widevine.com"; license = licenses.unfree; diff --git a/pkgs/applications/networking/c14/default.nix b/pkgs/applications/networking/c14/default.nix index 58d9d026f97d..572975f78d0b 100644 --- a/pkgs/applications/networking/c14/default.nix +++ b/pkgs/applications/networking/c14/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "c14-cli"; @@ -13,7 +13,7 @@ buildGoPackage rec { sha256 = "0b1piviy6vvdbak8y8bc24rk3c1fi67vv3352pmnzvrhsar2r5yf"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "C14 is designed for data archiving & long-term backups"; homepage = "https://www.online.net/en/storage/c14-cold-storage"; license = licenses.mit; diff --git a/pkgs/applications/networking/calls/default.nix b/pkgs/applications/networking/calls/default.nix index e57cf810491c..d163f8a7475a 100644 --- a/pkgs/applications/networking/calls/default.nix +++ b/pkgs/applications/networking/calls/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitLab , meson , ninja @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { runHook postCheck ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A phone dialer and call handler"; homepage = "https://source.puri.sm/Librem5/calls"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/networking/cawbird/default.nix b/pkgs/applications/networking/cawbird/default.nix index bd927d2b68e3..3394394afd49 100644 --- a/pkgs/applications/networking/cawbird/default.nix +++ b/pkgs/applications/networking/cawbird/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , glib , gtk3 @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { patchShebangs data/meson_post_install.py ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Native GTK Twitter client for the Linux desktop"; longDescription = "Cawbird is a modern, easy and fun Twitter client. Fork of the discontinued Corebird."; homepage = "https://ibboard.co.uk/cawbird/"; diff --git a/pkgs/applications/networking/charles/default.nix b/pkgs/applications/networking/charles/default.nix index 3dd9fe2c4f89..82c4ce0f1be6 100644 --- a/pkgs/applications/networking/charles/default.nix +++ b/pkgs/applications/networking/charles/default.nix @@ -1,5 +1,5 @@ { -stdenv +lib, stdenv , makeWrapper , makeDesktopItem , fetchurl @@ -45,7 +45,7 @@ let cp -r icon $out/share/icons/hicolor ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Web Debugging Proxy"; homepage = "https://www.charlesproxy.com/"; maintainers = [ maintainers.kalbasit ]; diff --git a/pkgs/applications/networking/cloudflared/default.nix b/pkgs/applications/networking/cloudflared/default.nix index 3e19af619db3..2b5f7a0e663f 100644 --- a/pkgs/applications/networking/cloudflared/default.nix +++ b/pkgs/applications/networking/cloudflared/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "cloudflared"; @@ -17,7 +17,7 @@ buildGoModule rec { buildFlagsArray = "-ldflags=-X main.Version=${version}"; - meta = with stdenv.lib; { + meta = with lib; { description = "CloudFlare Argo Tunnel daemon (and DNS-over-HTTPS client)"; homepage = "https://www.cloudflare.com/products/argo-tunnel"; license = licenses.unfree; diff --git a/pkgs/applications/networking/cluster/atlantis/default.nix b/pkgs/applications/networking/cluster/atlantis/default.nix index 15c5f0e97c4c..60be1d000b3d 100644 --- a/pkgs/applications/networking/cluster/atlantis/default.nix +++ b/pkgs/applications/networking/cluster/atlantis/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "atlantis"; @@ -17,7 +17,7 @@ buildGoModule rec { subPackages = [ "." ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/runatlantis/atlantis"; description = "Terraform Pull Request Automation"; license = licenses.asl20; diff --git a/pkgs/applications/networking/cluster/click/default.nix b/pkgs/applications/networking/cluster/click/default.nix index 2c0e73fb30db..f1895d074bc4 100644 --- a/pkgs/applications/networking/cluster/click/default.nix +++ b/pkgs/applications/networking/cluster/click/default.nix @@ -1,4 +1,4 @@ -{ darwin, fetchFromGitHub, rustPlatform, stdenv }: +{ darwin, fetchFromGitHub, rustPlatform, lib, stdenv }: with rustPlatform; @@ -17,7 +17,7 @@ buildRustPackage rec { buildInputs = stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; - meta = with stdenv.lib; { + meta = with lib; { description = ''The "Command Line Interactive Controller for Kubernetes"''; homepage = "https://github.com/databricks/click"; license = [ licenses.asl20 ]; diff --git a/pkgs/applications/networking/cluster/docker-machine/default.nix b/pkgs/applications/networking/cluster/docker-machine/default.nix index 93f5a85c33ad..5a4f6b7db0e5 100644 --- a/pkgs/applications/networking/cluster/docker-machine/default.nix +++ b/pkgs/applications/networking/cluster/docker-machine/default.nix @@ -1,5 +1,5 @@ # This file was generated by go2nix. -{ stdenv, buildGoPackage, fetchFromGitHub, installShellFiles }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub, installShellFiles }: buildGoPackage rec { pname = "machine"; @@ -23,7 +23,7 @@ buildGoPackage rec { popd ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://docs.docker.com/machine/"; description = "Docker Machine is a tool that lets you install Docker Engine on virtual hosts, and manage Docker Engine on the hosts"; license = licenses.asl20; diff --git a/pkgs/applications/networking/cluster/docker-machine/kvm.nix b/pkgs/applications/networking/cluster/docker-machine/kvm.nix index 024572ec3db9..50f2ab14a77b 100644 --- a/pkgs/applications/networking/cluster/docker-machine/kvm.nix +++ b/pkgs/applications/networking/cluster/docker-machine/kvm.nix @@ -1,5 +1,5 @@ # This file was generated by go2nix. -{ stdenv, buildGoPackage, fetchFromGitHub, libvirt, pkgconfig }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub, libvirt, pkgconfig }: buildGoPackage rec { pname = "docker-machine-kvm"; @@ -18,7 +18,7 @@ buildGoPackage rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libvirt ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/dhiltgen/docker-machine-kvm"; description = "KVM driver for docker-machine"; license = licenses.asl20; diff --git a/pkgs/applications/networking/cluster/docker-machine/xhyve.nix b/pkgs/applications/networking/cluster/docker-machine/xhyve.nix index a740d0486db5..49e59ab7093a 100644 --- a/pkgs/applications/networking/cluster/docker-machine/xhyve.nix +++ b/pkgs/applications/networking/cluster/docker-machine/xhyve.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, fetchpatch, pkgconfig, cctools, Hypervisor, vmnet }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub, fetchpatch, pkgconfig, cctools, Hypervisor, vmnet }: buildGoPackage rec { pname = "docker-machine-xhyve"; @@ -29,7 +29,7 @@ buildGoPackage rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ Hypervisor vmnet ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/machine-drivers/docker-machine-driver-xhyve"; description = "Xhyve driver for docker-machine"; license = licenses.bsd3; diff --git a/pkgs/applications/networking/cluster/flink/default.nix b/pkgs/applications/networking/cluster/flink/default.nix index f99c708161eb..d8b156bed88e 100644 --- a/pkgs/applications/networking/cluster/flink/default.nix +++ b/pkgs/applications/networking/cluster/flink/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, jre +{ lib, stdenv, fetchurl, makeWrapper, jre , version ? "1.6" }: let @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { EOF ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A distributed stream processing framework"; homepage = "https://flink.apache.org"; downloadPage = "https://flink.apache.org/downloads.html"; diff --git a/pkgs/applications/networking/cluster/fluxcd/default.nix b/pkgs/applications/networking/cluster/fluxcd/default.nix index bd903bf7253a..e368ecff8683 100644 --- a/pkgs/applications/networking/cluster/fluxcd/default.nix +++ b/pkgs/applications/networking/cluster/fluxcd/default.nix @@ -1,17 +1,17 @@ -{ stdenv, buildGoModule, fetchFromGitHub, installShellFiles }: +{ lib, stdenv, buildGoModule, fetchFromGitHub, installShellFiles }: buildGoModule rec { pname = "fluxcd"; - version = "0.5.0"; + version = "0.5.9"; src = fetchFromGitHub { owner = "fluxcd"; repo = "flux2"; rev = "v${version}"; - sha256 = "125im8br7x8djd6zagvikpc02k55pxbd97rjj3g2frj9plbryh8n"; + sha256 = "1fic1hgsjhail9p2ki7qqr0vl5av3gfb8y3h9ygzq4j869780bsq"; }; - vendorSha256 = "0f818a0z71nl061db93iqb87njx66vbrra1zh92warbx8djdsr7k"; + vendorSha256 = "15zn40pi1rw0yqxm9fpmj4l179rg846r3m89imh96g2v3gk8qqcv"; nativeBuildInputs = [ installShellFiles ]; @@ -28,7 +28,7 @@ buildGoModule rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Open and extensible continuous delivery solution for Kubernetes"; longDescription = '' Flux is a tool for keeping Kubernetes clusters in sync diff --git a/pkgs/applications/networking/cluster/fluxctl/default.nix b/pkgs/applications/networking/cluster/fluxctl/default.nix index c47896619513..4f1f57e45b7f 100644 --- a/pkgs/applications/networking/cluster/fluxctl/default.nix +++ b/pkgs/applications/networking/cluster/fluxctl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, installShellFiles }: +{ lib, stdenv, buildGoModule, fetchFromGitHub, installShellFiles }: buildGoModule rec { pname = "fluxctl"; @@ -28,7 +28,7 @@ buildGoModule rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "CLI client for Flux, the GitOps Kubernetes operator"; homepage = "https://github.com/fluxcd/flux"; license = licenses.asl20; diff --git a/pkgs/applications/networking/cluster/habitat/default.nix b/pkgs/applications/networking/cluster/habitat/default.nix index f2f3925fbe4d..9abaeef80137 100644 --- a/pkgs/applications/networking/cluster/habitat/default.nix +++ b/pkgs/applications/networking/cluster/habitat/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform, pkgconfig +{ lib, stdenv, fetchFromGitHub, rustPlatform, pkgconfig , libsodium, libarchive, openssl, zeromq }: rustPlatform.buildRustPackage rec { @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { runHook postCheck ''; - meta = with stdenv.lib; { + meta = with lib; { description = "An application automation framework"; homepage = "https://www.habitat.sh"; license = licenses.asl20; diff --git a/pkgs/applications/networking/cluster/hadoop/default.nix b/pkgs/applications/networking/cluster/hadoop/default.nix index 5fc35e6a0af1..88d4a88b67e2 100644 --- a/pkgs/applications/networking/cluster/hadoop/default.nix +++ b/pkgs/applications/networking/cluster/hadoop/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, pkgconfig, which, maven, cmake, jre, bash +{ lib, stdenv, fetchurl, makeWrapper, pkgconfig, which, maven, cmake, jre, bash , coreutils, glibc, protobuf2_5, fuse, snappy, zlib, bzip2, openssl, openssl_1_0_2 }: @@ -94,7 +94,7 @@ let done ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://hadoop.apache.org/"; description = "Framework for distributed processing of large data sets across clusters of computers"; license = licenses.asl20; diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix index 1cb7a257eccb..7d97896c360a 100644 --- a/pkgs/applications/networking/cluster/helm/default.nix +++ b/pkgs/applications/networking/cluster/helm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, installShellFiles }: +{ lib, stdenv, buildGoModule, fetchFromGitHub, installShellFiles }: buildGoModule rec { pname = "helm"; @@ -24,7 +24,7 @@ buildGoModule rec { installShellCompletion helm.{bash,zsh} ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/kubernetes/helm"; description = "A package manager for kubernetes"; license = licenses.asl20; diff --git a/pkgs/applications/networking/cluster/k9s/default.nix b/pkgs/applications/networking/cluster/k9s/default.nix index d45cbb19e71b..abc23058303b 100644 --- a/pkgs/applications/networking/cluster/k9s/default.nix +++ b/pkgs/applications/networking/cluster/k9s/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "k9s"; @@ -22,7 +22,7 @@ buildGoModule rec { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Kubernetes CLI To Manage Your Clusters In Style"; homepage = "https://github.com/derailed/k9s"; license = licenses.asl20; diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix index a81c33a84bb1..f3037cf8a363 100644 --- a/pkgs/applications/networking/cluster/kops/default.nix +++ b/pkgs/applications/networking/cluster/kops/default.nix @@ -39,7 +39,7 @@ let done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Easiest way to get a production Kubernetes up and running"; homepage = "https://github.com/kubernetes/kops"; changelog = "https://github.com/kubernetes/kops/tree/master/docs/releases"; diff --git a/pkgs/applications/networking/cluster/kubeless/default.nix b/pkgs/applications/networking/cluster/kubeless/default.nix index 6f6c8dc338bf..fd7eabf12761 100644 --- a/pkgs/applications/networking/cluster/kubeless/default.nix +++ b/pkgs/applications/networking/cluster/kubeless/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, installShellFiles }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub, installShellFiles }: buildGoPackage rec { pname = "kubeless"; @@ -28,7 +28,7 @@ buildGoPackage rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://kubeless.io"; description = "The Kubernetes Native Serverless Framework"; license = licenses.asl20; diff --git a/pkgs/applications/networking/cluster/kubelogin/default.nix b/pkgs/applications/networking/cluster/kubelogin/default.nix index ced9c43876f6..b1b107a2b032 100644 --- a/pkgs/applications/networking/cluster/kubelogin/default.nix +++ b/pkgs/applications/networking/cluster/kubelogin/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildGoModule, go }: +{ lib, stdenv, fetchFromGitHub, buildGoModule, go }: buildGoModule rec { pname = "kubelogin"; @@ -19,7 +19,7 @@ buildGoModule rec { -X main.goVersion=${stdenv.lib.getVersion go} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A Kubernetes credential plugin implementing Azure authentication"; inherit (src.meta) homepage; license = licenses.mit; diff --git a/pkgs/applications/networking/cluster/kubernix/default.nix b/pkgs/applications/networking/cluster/kubernix/default.nix index 2251b12e499a..1411892b75b8 100644 --- a/pkgs/applications/networking/cluster/kubernix/default.nix +++ b/pkgs/applications/networking/cluster/kubernix/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform }: +{ lib, stdenv, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { pname = "kubernix"; @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "17agwqx7nhzi124yq1s6zpqb227drrhp9c11r3jbicc08dz88bwg"; doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Single dependency Kubernetes clusters for local testing, experimenting and development"; homepage = "https://github.com/saschagrunert/kubernix"; license = with licenses; [ mit ]; diff --git a/pkgs/applications/networking/cluster/linkerd/default.nix b/pkgs/applications/networking/cluster/linkerd/default.nix index 63e4e59ff453..8718da462469 100644 --- a/pkgs/applications/networking/cluster/linkerd/default.nix +++ b/pkgs/applications/networking/cluster/linkerd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildGoModule }: +{ lib, stdenv, fetchFromGitHub, buildGoModule }: buildGoModule { pname = "linkerd-unstable"; @@ -17,7 +17,7 @@ buildGoModule { subPackages = [ "cli/cmd" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A service mesh for Kubernetes and beyond"; homepage = "https://linkerd.io/"; license = licenses.asl20; diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix index bd71f2f5c5ba..9acb5f319ca4 100644 --- a/pkgs/applications/networking/cluster/minikube/default.nix +++ b/pkgs/applications/networking/cluster/minikube/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildGoModule , fetchFromGitHub , go-bindata @@ -11,9 +11,9 @@ buildGoModule rec { pname = "minikube"; - version = "1.15.1"; + version = "1.16.0"; - vendorSha256 = "1xkk4f8qjqx5x878iniclni3jm2f7ka47va756vc3vk8p5s6vpdk"; + vendorSha256 = "0nc2f9h77h24f0nvai5wvgmf1gh09dqfwrb6d5qghmq03a459san"; doCheck = false; @@ -21,7 +21,7 @@ buildGoModule rec { owner = "kubernetes"; repo = "minikube"; rev = "v${version}"; - sha256 = "03knkc8z3vri73j1aa9ry6p1rxql3d75kphd429x5am856mpnn6g"; + sha256 = "00dn8yy7mna0j8rdcnxbgnd5vkjdkqij8akgqhvbd32kxpqss890"; }; nativeBuildInputs = [ go-bindata installShellFiles pkg-config which ]; @@ -45,7 +45,7 @@ buildGoModule rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://minikube.sigs.k8s.io"; description = "A tool that makes it easy to run Kubernetes locally"; license = licenses.asl20; diff --git a/pkgs/applications/networking/cluster/node-problem-detector/default.nix b/pkgs/applications/networking/cluster/node-problem-detector/default.nix index 61f0feced959..370a86db0e6c 100644 --- a/pkgs/applications/networking/cluster/node-problem-detector/default.nix +++ b/pkgs/applications/networking/cluster/node-problem-detector/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, systemd }: +{ lib, stdenv, buildGoModule, fetchFromGitHub, systemd }: buildGoModule rec { pname = "node-problem-detector"; @@ -36,7 +36,7 @@ buildGoModule rec { "-X k8s.io/${pname}/pkg/version.version=v${version}" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Various problem detectors running on the Kubernetes nodes"; homepage = "https://github.com/kubernetes/node-problem-detector"; changelog = "https://github.com/kubernetes/node-problem-detector/releases/tag/v${version}"; diff --git a/pkgs/applications/networking/cluster/nomad/0.11.nix b/pkgs/applications/networking/cluster/nomad/0.11.nix index 2fd7c0403a3c..58bdb694eed5 100644 --- a/pkgs/applications/networking/cluster/nomad/0.11.nix +++ b/pkgs/applications/networking/cluster/nomad/0.11.nix @@ -1,7 +1,11 @@ -{ callPackage, buildGoPackage }: +{ callPackage +, buildGoPackage +, nvidia_x11 +, nvidiaGpuSupport +}: callPackage ./generic.nix { - inherit buildGoPackage; + inherit buildGoPackage nvidia_x11 nvidiaGpuSupport; version = "0.11.8"; sha256 = "1dhh07bifr02jh2lls8fv1d9ra67ymgh8qxqvpvm0cd0qdd469z1"; } diff --git a/pkgs/applications/networking/cluster/nomad/0.12.nix b/pkgs/applications/networking/cluster/nomad/0.12.nix index 0120887957a8..b6e053e757de 100644 --- a/pkgs/applications/networking/cluster/nomad/0.12.nix +++ b/pkgs/applications/networking/cluster/nomad/0.12.nix @@ -1,7 +1,11 @@ -{ callPackage, buildGoPackage }: +{ callPackage +, buildGoPackage +, nvidia_x11 +, nvidiaGpuSupport +}: callPackage ./generic.nix { - inherit buildGoPackage; + inherit buildGoPackage nvidia_x11 nvidiaGpuSupport; version = "0.12.9"; sha256 = "1a0ig6pb0z3qp7zk4jgz3h241bifmjlyqsfikyy3sxdnzj7yha27"; } diff --git a/pkgs/applications/networking/cluster/nomad/1.0.nix b/pkgs/applications/networking/cluster/nomad/1.0.nix index 4b0b62400193..0b7b7c12d1a6 100644 --- a/pkgs/applications/networking/cluster/nomad/1.0.nix +++ b/pkgs/applications/networking/cluster/nomad/1.0.nix @@ -1,7 +1,11 @@ -{ callPackage, buildGoPackage }: +{ callPackage +, buildGoPackage +, nvidia_x11 +, nvidiaGpuSupport +}: callPackage ./generic.nix { - inherit buildGoPackage; + inherit buildGoPackage nvidia_x11 nvidiaGpuSupport; version = "1.0.1"; sha256 = "07k81csyxhgc7bgn297zlqyvc55qb5fmiavi7dk81rdpg5m2zjvv"; } diff --git a/pkgs/applications/networking/cluster/nomad/generic.nix b/pkgs/applications/networking/cluster/nomad/generic.nix index 0bfdb0b27f6e..dc22ab41d8b6 100644 --- a/pkgs/applications/networking/cluster/nomad/generic.nix +++ b/pkgs/applications/networking/cluster/nomad/generic.nix @@ -1,4 +1,12 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, version, sha256 }: +{ lib +, buildGoPackage +, fetchFromGitHub +, version +, sha256 +, nvidiaGpuSupport +, patchelf +, nvidia_x11 +}: buildGoPackage rec { pname = "nomad"; @@ -14,23 +22,33 @@ buildGoPackage rec { inherit rev sha256; }; + nativeBuildInputs = lib.optionals nvidiaGpuSupport [ + patchelf + ]; + # ui: # Nomad release commits include the compiled version of the UI, but the file # is only included if we build with the ui tag. - # nonvidia: - # We disable Nvidia GPU scheduling on Linux, as it doesn't work there: - # Ref: https://github.com/hashicorp/nomad/issues/5535 - preBuild = let - tags = ["ui"] - ++ stdenv.lib.optional stdenv.isLinux "nonvidia"; - tagsString = stdenv.lib.concatStringsSep " " tags; - in '' - export buildFlagsArray=( - -tags="${tagsString}" - ) - ''; + preBuild = + let + tags = [ "ui" ] ++ lib.optional (!nvidiaGpuSupport) "nonvidia"; + tagsString = lib.concatStringsSep " " tags; + in + '' + export buildFlagsArray=( + -tags="${tagsString}" + ) + ''; - meta = with stdenv.lib; { + # The dependency on NVML isn't explicit. We have to make it so otherwise the + # binary will not know where to look for the relevant symbols. + postFixup = lib.optionalString nvidiaGpuSupport '' + for bin in $out/bin/*; do + patchelf --add-needed "${nvidia_x11}/lib/libnvidia-ml.so" "$bin" + done + ''; + + meta = with lib; { homepage = "https://www.nomadproject.io/"; description = "A Distributed, Highly Available, Datacenter-Aware Scheduler"; platforms = platforms.unix; diff --git a/pkgs/applications/networking/cluster/octant/default.nix b/pkgs/applications/networking/cluster/octant/default.nix index 4ccc05189c9e..4eb2bf78b54a 100644 --- a/pkgs/applications/networking/cluster/octant/default.nix +++ b/pkgs/applications/networking/cluster/octant/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: let version = "0.16.3"; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { mv octant $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Highly extensible platform for developers to better understand the complexity of Kubernetes clusters."; longDescription = '' Octant is a tool for developers to understand how applications run on a Kubernetes cluster. diff --git a/pkgs/applications/networking/cluster/octant/plugins/starboard-octant-plugin.nix b/pkgs/applications/networking/cluster/octant/plugins/starboard-octant-plugin.nix index f7bcbca16c48..8e5942a033f9 100644 --- a/pkgs/applications/networking/cluster/octant/plugins/starboard-octant-plugin.nix +++ b/pkgs/applications/networking/cluster/octant/plugins/starboard-octant-plugin.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "starboard-octant-plugin"; - version = "0.7.1"; + version = "0.8.0"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "11c8znbijhvxl2mas205mb18sqw868l6c86ah5hlkqh3niq2gmv3"; + sha256 = "sha256-wMt/I2zpdM7l+YNwHkAA6sVRWUtlGpN+94jqx2Jy4HA="; }; - vendorSha256 = "0rmynfm5afjxc2lxy2rh9y6zhdd2q95wji2q8hcz78zank43rkcq"; + vendorSha256 = "sha256-fhIIqirEEdqn/n8bBtLw07fEGfnpC/8SOLbkhnytyME="; meta = with lib; { description = "Octant plugin for viewing Starboard security information"; diff --git a/pkgs/applications/networking/cluster/openshift/default.nix b/pkgs/applications/networking/cluster/openshift/default.nix index 34d362a4623b..ef9e6c74220a 100644 --- a/pkgs/applications/networking/cluster/openshift/default.nix +++ b/pkgs/applications/networking/cluster/openshift/default.nix @@ -67,7 +67,7 @@ in buildGoPackage rec { installShellCompletion --zsh contrib/completions/zsh/* ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Build, deploy, and manage your applications with Docker and Kubernetes"; license = licenses.asl20; homepage = "http://www.openshift.org"; diff --git a/pkgs/applications/networking/cluster/pig/default.nix b/pkgs/applications/networking/cluster/pig/default.nix index afcd736e629c..2a2c2c437224 100644 --- a/pkgs/applications/networking/cluster/pig/default.nix +++ b/pkgs/applications/networking/cluster/pig/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, hadoop, jre, bash }: +{ lib, stdenv, fetchurl, makeWrapper, hadoop, jre, bash }: stdenv.mkDerivation rec { @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://pig.apache.org/"; description = "High-level language for Apache Hadoop"; license = licenses.asl20; diff --git a/pkgs/applications/networking/cluster/popeye/default.nix b/pkgs/applications/networking/cluster/popeye/default.nix index 6e7eccac2063..650532ae8b96 100644 --- a/pkgs/applications/networking/cluster/popeye/default.nix +++ b/pkgs/applications/networking/cluster/popeye/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "popeye"; @@ -23,7 +23,7 @@ buildGoModule rec { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "A Kubernetes cluster resource sanitizer"; homepage = "https://github.com/derailed/popeye"; changelog = "https://github.com/derailed/popeye/releases/tag/v${version}"; diff --git a/pkgs/applications/networking/cluster/sonobuoy/default.nix b/pkgs/applications/networking/cluster/sonobuoy/default.nix index 668a229a62e5..f344b8c3eb97 100644 --- a/pkgs/applications/networking/cluster/sonobuoy/default.nix +++ b/pkgs/applications/networking/cluster/sonobuoy/default.nix @@ -1,11 +1,11 @@ { lib, buildGoModule, fetchFromGitHub }: -# SHA of ${version} for the tool's help output -let rev = "e03f9ee353717ccc5f58c902633553e34b2fe46a"; +# SHA of ${version} for the tool's help output. Unfortunately this is needed in build flags. +let rev = "f6e19140201d6bf2f1274bf6567087bc25154210"; in buildGoModule rec { pname = "sonobuoy"; - version = "0.19.0"; + version = "0.20.0"; # Do not forget to update `rev` above buildFlagsArray = let t = "github.com/vmware-tanzu/sonobuoy"; @@ -17,7 +17,7 @@ buildGoModule rec { ''; src = fetchFromGitHub { - sha256 = "1gw58a30akidk15wk8kk7f8lsyqr1q180j6fzr4462ahwxdbjgkr"; + sha256 = "11qawsv82i1pl4mwfc85wb4fbq961bplvmygnjfm79m8z87863ri"; rev = "v${version}"; repo = "sonobuoy"; owner = "vmware-tanzu"; diff --git a/pkgs/applications/networking/cluster/ssm-agent/default.nix b/pkgs/applications/networking/cluster/ssm-agent/default.nix index c6f9217b35b8..80c8244bee1b 100644 --- a/pkgs/applications/networking/cluster/ssm-agent/default.nix +++ b/pkgs/applications/networking/cluster/ssm-agent/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildGoPackage, bash, makeWrapper }: +{ lib, stdenv, fetchFromGitHub, buildGoPackage, bash, makeWrapper }: buildGoPackage rec { pname = "amazon-ssm-agent"; @@ -53,7 +53,7 @@ buildGoPackage rec { wrapProgram $out/bin/amazon-ssm-agent --prefix PATH : ${bash}/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Agent to enable remote management of your Amazon EC2 instance configuration"; homepage = "https://github.com/aws/amazon-ssm-agent"; license = licenses.asl20; diff --git a/pkgs/applications/networking/cluster/starboard/default.nix b/pkgs/applications/networking/cluster/starboard/default.nix index e8ffa353539e..3850eb756382 100644 --- a/pkgs/applications/networking/cluster/starboard/default.nix +++ b/pkgs/applications/networking/cluster/starboard/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "starboard"; - version = "0.7.1"; + version = "0.8.0"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "0p0c459xih580ix3279fr45mm3q9w887rs7w1yrikh09xpcisdfr"; + sha256 = "sha256-KRVMgrJ7xtv2SYa249sSDV8PObStAe+UGEgZWv43sk4="; }; - vendorSha256 = "07cz4p8k927ash5ncw1r56bcn592imgywbyzkvhnn50pap91m0q0"; + vendorSha256 = "sha256-AIMa0lUXFGvhnt8v7l+NIhXLlik5cGYL1OqINNElnx0="; subPackages = [ "cmd/starboard" ]; diff --git a/pkgs/applications/networking/cluster/tektoncd-cli/default.nix b/pkgs/applications/networking/cluster/tektoncd-cli/default.nix index aeaff2ff5f15..a2bb9da68054 100644 --- a/pkgs/applications/networking/cluster/tektoncd-cli/default.nix +++ b/pkgs/applications/networking/cluster/tektoncd-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "tektoncd-cli"; - version = "0.14.0"; + version = "0.15.0"; src = fetchFromGitHub { owner = "tektoncd"; repo = "cli"; rev = "v${version}"; - sha256 = "1mkbwh4cmhx9in928vlvs7xjjklpsxbv5niv8jmsbnifflg1an8p"; + sha256 = "0xb2zlpkh9cwinp6zj2jpv4wlws042ad1fa0wkcnnkh0vjm6mnrl"; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/cluster/terraform-compliance/default.nix b/pkgs/applications/networking/cluster/terraform-compliance/default.nix index 6205b3bf5fe5..5f71f8d70cb6 100644 --- a/pkgs/applications/networking/cluster/terraform-compliance/default.nix +++ b/pkgs/applications/networking/cluster/terraform-compliance/default.nix @@ -54,7 +54,7 @@ buildPythonApplication rec { meta = with lib; { description = "BDD test framework for terraform"; - homepage = https://github.com/eerkunt/terraform-compliance; + homepage = "https://github.com/eerkunt/terraform-compliance"; license = licenses.mit; maintainers = with maintainers; [ kalbasit ]; }; diff --git a/pkgs/applications/networking/cluster/terraform-inventory/default.nix b/pkgs/applications/networking/cluster/terraform-inventory/default.nix index 72e717d91662..7b9bf354af75 100644 --- a/pkgs/applications/networking/cluster/terraform-inventory/default.nix +++ b/pkgs/applications/networking/cluster/terraform-inventory/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub}: +{ lib, stdenv, buildGoPackage, fetchFromGitHub}: buildGoPackage rec { pname = "terraform-inventory"; @@ -18,7 +18,7 @@ buildGoPackage rec { goDeps = ./deps.nix; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/adammck/terraform-inventory"; description = "Terraform state to ansible inventory adapter"; license = licenses.mit; diff --git a/pkgs/applications/networking/cluster/terraform-providers/ansible/default.nix b/pkgs/applications/networking/cluster/terraform-providers/ansible/default.nix index bb634a78e23c..14d411c02396 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/ansible/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/ansible/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildGoPackage }: +{ lib, stdenv, fetchFromGitHub, buildGoPackage }: buildGoPackage rec { pname = "terraform-provider-ansible"; version = "1.0.3"; @@ -17,7 +17,7 @@ buildGoPackage rec { # if the versions are not provided via file paths. postBuild = "mv go/bin/terraform-provider-ansible{,_v${version}}"; - meta = with stdenv.lib; { + meta = with lib; { description = "A Terraform provider serving as an interop layer for an Ansible dynamic inventory script."; homepage = "https://github.com/nbering/terraform-provider-ansible"; license = licenses.mpl20; diff --git a/pkgs/applications/networking/cluster/terraform-providers/cloudfoundry/default.nix b/pkgs/applications/networking/cluster/terraform-providers/cloudfoundry/default.nix index 7e807d2ed5ce..0528bce81e3c 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/cloudfoundry/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/cloudfoundry/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "terraform-provider-cloudfoundry"; @@ -20,7 +20,7 @@ buildGoModule rec { passthru = { provider-source-address = "registry.terraform.io/cloudfoundry-community/cloudfoundry"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/cloudfoundry-community/terraform-provider-cloudfoundry"; description = "Terraform provider for cloudfoundry"; license = licenses.mpl20; diff --git a/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/default.nix b/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/default.nix index 6eaaa05106d1..47e4f30d0092 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildGoModule }: +{ lib, stdenv, fetchFromGitHub, buildGoModule }: buildGoModule rec { pname = "terraform-provider-elasticsearch"; version = "0.7.0"; @@ -20,7 +20,7 @@ buildGoModule rec { # if the versions are not provided via file paths. postInstall = "mv $out/bin/terraform-provider-elasticsearch{,_v${version}}"; - meta = with stdenv.lib; { + meta = with lib; { description = "Terraform provider for elasticsearch"; homepage = "https://github.com/phillbaker/terraform-provider-elasticsearch"; license = licenses.mpl20; diff --git a/pkgs/applications/networking/cluster/terraform-providers/gandi/default.nix b/pkgs/applications/networking/cluster/terraform-providers/gandi/default.nix index 4571d368991f..fe508f4fa2ef 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/gandi/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/gandi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildGoPackage }: +{ lib, stdenv, fetchFromGitHub, buildGoPackage }: buildGoPackage rec { pname = "terraform-provider-gandi"; version = "1.0.0"; @@ -17,7 +17,7 @@ buildGoPackage rec { # if the versions are not provided via file paths. postBuild = "mv go/bin/terraform-provider-gandi{,_v${version}}"; - meta = with stdenv.lib; { + meta = with lib; { description = "Terraform provider for the Gandi LiveDNS service."; homepage = "https://github.com/tiramiseb/terraform-provider-gandi"; license = licenses.mpl20; diff --git a/pkgs/applications/networking/cluster/terraform-providers/hcloud/default.nix b/pkgs/applications/networking/cluster/terraform-providers/hcloud/default.nix index 89a22c718efb..97331e683efb 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/hcloud/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/hcloud/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "terraform-provider-hcloud"; @@ -23,7 +23,7 @@ buildGoModule rec { postInstall = "mv $out/bin/terraform-provider-hcloud{,_v${version}}"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/cloudfoundry-community/terraform-provider-cloudfoundry"; description = "Terraform provider for cloudfoundry"; license = licenses.mpl20; diff --git a/pkgs/applications/networking/cluster/terraform-providers/keycloak/default.nix b/pkgs/applications/networking/cluster/terraform-providers/keycloak/default.nix index 7e9a9b830082..f2244345a9c3 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/keycloak/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/keycloak/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , buildGoModule }: @@ -20,7 +20,7 @@ buildGoModule rec { postInstall = "mv $out/bin/terraform-provider-keycloak{,_v${version}}"; - meta = with stdenv.lib; { + meta = with lib; { description = "Terraform provider for keycloak"; homepage = "https://github.com/mrparkers/terraform-provider-keycloak"; license = licenses.mpl20; diff --git a/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix b/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix index 4662a315a8c4..3caab38a3ef7 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, libvirt, pkgconfig, makeWrapper, cdrtools }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub, libvirt, pkgconfig, makeWrapper, cdrtools }: # USAGE: # install the following package globally or in nix-shell: @@ -42,7 +42,7 @@ buildGoPackage rec { # if the versions are not provided via file paths. postBuild = "mv go/bin/terraform-provider-libvirt{,_v${version}}"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/dmacvicar/terraform-provider-libvirt"; description = "Terraform provider for libvirt"; platforms = platforms.linux; diff --git a/pkgs/applications/networking/cluster/terraform-providers/linuxbox/default.nix b/pkgs/applications/networking/cluster/terraform-providers/linuxbox/default.nix index 60cd7f2d7637..f445d48eaee2 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/linuxbox/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/linuxbox/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "terraform-provider-linuxbox"; @@ -17,7 +17,7 @@ buildGoModule rec { passthru.provider-source-address = "registry.terraform.io/numtide/linuxbox"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/numtide/terraform-provider-linuxbox"; description = "Basic building block for Seed DevOps"; license = licenses.bsd3; diff --git a/pkgs/applications/networking/cluster/terraform-providers/lxd/default.nix b/pkgs/applications/networking/cluster/terraform-providers/lxd/default.nix index a583bc335142..6ccc551b4d31 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/lxd/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/lxd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "terraform-provider-lxd"; @@ -17,7 +17,7 @@ buildGoModule rec { postBuild = "mv ../go/bin/terraform-provider-lxd{,_v${version}}"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/sl1pm4t/terraform-provider-lxd"; description = "Terraform provider for lxd"; platforms = platforms.linux; diff --git a/pkgs/applications/networking/cluster/terraform-providers/shell/default.nix b/pkgs/applications/networking/cluster/terraform-providers/shell/default.nix index c0ee431fa405..4833a9677884 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/shell/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/shell/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildGoModule }: +{ lib, stdenv, fetchFromGitHub, buildGoModule }: buildGoModule rec { pname = "terraform-provider-shell"; version = "1.6.0"; @@ -20,7 +20,7 @@ buildGoModule rec { # if the versions are not provided via file paths. postInstall = "mv $out/bin/${pname}{,_v${version}}"; - meta = with stdenv.lib; { + meta = with lib; { inherit (src.meta) homepage; description = "Terraform provider for executing shell commands and saving output to state file"; changelog = "https://github.com/scottwinkler/terraform-provider-shell/releases/tag/v${version}"; diff --git a/pkgs/applications/networking/cluster/terraform-providers/vercel/default.nix b/pkgs/applications/networking/cluster/terraform-providers/vercel/default.nix index b4e17aabb45b..f4cfe6ba02f7 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/vercel/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/vercel/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "terraform-provider-vercel"; @@ -15,7 +15,7 @@ buildGoModule rec { postInstall = "mv $out/bin/terraform-provider-vercel{,_v${version}}"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/ondrejsika/terraform-provider-vercel"; description = "Terraform provider for Vercel"; maintainers = with maintainers; [ mmahut ]; diff --git a/pkgs/applications/networking/cluster/terraform-providers/vpsadmin/default.nix b/pkgs/applications/networking/cluster/terraform-providers/vpsadmin/default.nix index a4167d2b099e..4f56070fa51c 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/vpsadmin/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/vpsadmin/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildGoModule }: +{ lib, stdenv, fetchFromGitHub, buildGoModule }: buildGoModule rec { pname = "terraform-provider-vpsadmin"; version = "0.1.0"; @@ -20,7 +20,7 @@ buildGoModule rec { # if the versions are not provided via file paths. postInstall = "mv $out/bin/${pname}{,_v${version}}"; - meta = with stdenv.lib; { + meta = with lib; { description = "Terraform provider for vpsAdmin"; homepage = "https://github.com/vpsfreecz/terraform-provider-vpsadmin"; license = licenses.mpl20; diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 6052f6882bc4..a190994e7469 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -38,7 +38,7 @@ let subPackages = [ "." ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Tool for building, changing, and versioning infrastructure"; homepage = "https://www.terraform.io/"; @@ -137,8 +137,8 @@ let ]; in rec { terraform_0_12 = pluggable (generic { - version = "0.12.29"; - sha256 = "18i7vkvnvfybwzhww8d84cyh93xfbwswcnwfrgvcny1qwm8rsaj8"; + version = "0.12.30"; + sha256 = "0mv2nsy2ygb1kgkw98xckihcdqxpzhdmks5p2gi2l7wb7lx51yz2"; patches = [ ./provider-path.patch (fetchpatch { @@ -150,16 +150,16 @@ in rec { }); terraform_0_13 = pluggable (generic { - version = "0.13.5"; - sha256 = "1fnydzm5h65pdy2gkq403sllx05cvpldkdzdpcy124ywljb4x9d8"; + version = "0.13.6"; + sha256 = "04vas8i894ssfhncdvljdvmvj2qzfrcs20zcv71l1wmnnv9ibs6l"; patches = [ ./provider-path.patch ]; passthru = { inherit plugins; }; }); terraform_0_14 = pluggable (generic { - version = "0.14.3"; - sha256 = "0w2j1phjv989bspbyvkhr25bdz1zjch3zggwk2lgjyk77mdw5h20"; - vendorSha256 = "03dg703pw3h98vfvi2mnd2lw0mv6hlhvmc1l7ngrqdyv54cmihnp"; + version = "0.14.4"; + sha256 = "0kjbx1gshp1lvhnjfigfzza0sbl3m6d9qb3in7q5vc6kdkiplb66"; + vendorSha256 = "10vb6gsw7mha99lvx3lbgd80vf0imcqyc0va0y64f6wzaw557n7v"; 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 a6a9631481f6..387165150ea3 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.26.7"; + version = "0.27.1"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "v${version}"; - sha256 = "1431n6zs2mfkgh281xi0d7m9hxifrrsnd46fnpb54mr6lj9h0sdb"; + sha256 = "sha256-YZ/3qtukPoCbgzy1qr0MJHSdqovzmP/AQixLq6GO27Q"; }; - vendorSha256 = "18ix11g709fvh8h02k3p2bmzrq5fjzaqa50h3g74s3hyl2gc9s9h"; + vendorSha256 = "sha256-AMxBzUHRsq1HOMtvgYqIw22Cky7gQ7/2hI8wQnxaXb0="; doCheck = false; diff --git a/pkgs/applications/networking/cluster/terranix/default.nix b/pkgs/applications/networking/cluster/terranix/default.nix index 1954f867eb0e..89a96cc12ca5 100644 --- a/pkgs/applications/networking/cluster/terranix/default.nix +++ b/pkgs/applications/networking/cluster/terranix/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ... }: +{ lib, stdenv, fetchFromGitHub, ... }: stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { mv bin core modules lib $out/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A NixOS like terraform-json generator"; homepage = "https://terranix.org"; license = licenses.gpl3; diff --git a/pkgs/applications/networking/cluster/tilt/default.nix b/pkgs/applications/networking/cluster/tilt/default.nix index 42de638ec42c..9f2a223c4486 100644 --- a/pkgs/applications/networking/cluster/tilt/default.nix +++ b/pkgs/applications/networking/cluster/tilt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "tilt"; @@ -19,7 +19,7 @@ buildGoModule rec { buildFlagsArray = [ "-ldflags=-X main.version=${version}" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Local development tool to manage your developer instance when your team deploys to Kubernetes in production"; homepage = "https://tilt.dev/"; license = licenses.asl20; diff --git a/pkgs/applications/networking/cluster/velero/default.nix b/pkgs/applications/networking/cluster/velero/default.nix index 45cae94ec850..ec95b090c2e5 100644 --- a/pkgs/applications/networking/cluster/velero/default.nix +++ b/pkgs/applications/networking/cluster/velero/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, installShellFiles }: +{ lib, stdenv, buildGoModule, fetchFromGitHub, installShellFiles }: buildGoModule rec { pname = "velero"; @@ -32,7 +32,7 @@ buildGoModule rec { installShellCompletion velero.{bash,zsh} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A utility for managing disaster recovery, specifically for your Kubernetes cluster resources and persistent volumes"; homepage = "https://velero.io/"; diff --git a/pkgs/applications/networking/cluster/waypoint/default.nix b/pkgs/applications/networking/cluster/waypoint/default.nix index 9623d5af2f4b..32a4aa373a49 100644 --- a/pkgs/applications/networking/cluster/waypoint/default.nix +++ b/pkgs/applications/networking/cluster/waypoint/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "waypoint"; - version = "0.1.5"; + version = "0.2.0"; src = fetchFromGitHub { owner = "hashicorp"; repo = pname; rev = "v${version}"; - sha256 = "115cak87kpfjckqgn8ws09z1w8x8l9bch9xrm29k4r0zi71xparn"; + sha256 = "sha256-iGR2N1ZYA5G9K2cpfrwWRhSEfehRshx157ot1yq15AY="; }; deleteVendor = true; - vendorSha256 = "1xdari6841jp6lpjwydv19v3wafj17hmnwsa2b55iw6dysm4yxdr"; + vendorSha256 = "sha256-ArebHOjP3zvpASVAoaPXpSbrG/jq+Jbx7+EaQ1uHSVY="; subPackages = ["."]; diff --git a/pkgs/applications/networking/compactor/default.nix b/pkgs/applications/networking/compactor/default.nix index ed04e90bcdec..96b8b6933d85 100644 --- a/pkgs/applications/networking/compactor/default.nix +++ b/pkgs/applications/networking/compactor/default.nix @@ -1,5 +1,5 @@ { autoconf, automake, boost, cbor-diag, cddl, fetchFromGitHub, file, libctemplate, libmaxminddb -, libpcap, libtins, libtool, lzma, openssl, pkgconfig, stdenv, tcpdump, wireshark-cli +, libpcap, libtins, libtool, lzma, openssl, pkgconfig, lib, stdenv, tcpdump, wireshark-cli }: stdenv.mkDerivation rec { @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { rm test-scripts/same-tshark-output.sh ''; # TODO: https://github.com/dns-stats/compactor/issues/49 (failing test) - meta = with stdenv.lib; { + meta = with lib; { description = "Tools to capture DNS traffic and record it in C-DNS files"; homepage = "http://dns-stats.org/"; changelog = "https://github.com/dns-stats/${pname}/raw/${version}/ChangeLog.txt"; diff --git a/pkgs/applications/networking/datovka/default.nix b/pkgs/applications/networking/datovka/default.nix index 22bf982ec4cc..ca675dd7836c 100644 --- a/pkgs/applications/networking/datovka/default.nix +++ b/pkgs/applications/networking/datovka/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , mkDerivation , fetchurl , libxml2 @@ -22,7 +22,7 @@ mkDerivation rec { nativeBuildInputs = [ pkg-config ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Client application for operating Czech government-provided Databox infomation system"; homepage = "https://www.datovka.cz/"; license = licenses.lgpl3; diff --git a/pkgs/applications/networking/davmail/default.nix b/pkgs/applications/networking/davmail/default.nix index 38a08aaf4c06..bbb27672a7d2 100644 --- a/pkgs/applications/networking/davmail/default.nix +++ b/pkgs/applications/networking/davmail/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, jre, glib, libXtst, gtk2, makeWrapper, unzip }: +{ fetchurl, lib, stdenv, jre, glib, libXtst, gtk2, makeWrapper, unzip }: stdenv.mkDerivation rec { pname = "davmail"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ glib gtk2 libXtst ]} ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://davmail.sourceforge.net/"; description = "A Java application which presents a Microsoft Exchange server as local CALDAV, IMAP and SMTP servers"; maintainers = [ maintainers.hinton ]; diff --git a/pkgs/applications/networking/dsvpn/default.nix b/pkgs/applications/networking/dsvpn/default.nix index 04d3887bf4ed..f165e6a59942 100644 --- a/pkgs/applications/networking/dsvpn/default.nix +++ b/pkgs/applications/networking/dsvpn/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "dsvpn"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A Dead Simple VPN"; homepage = "https://github.com/jedisct1/dsvpn"; license = licenses.mit; diff --git a/pkgs/applications/networking/dyndns/cfdyndns/default.nix b/pkgs/applications/networking/dyndns/cfdyndns/default.nix index 60a7e5b2fb21..cedfcbdb5d1d 100644 --- a/pkgs/applications/networking/dyndns/cfdyndns/default.nix +++ b/pkgs/applications/networking/dyndns/cfdyndns/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl }: with rustPlatform; @@ -22,7 +22,7 @@ buildRustPackage rec { cp -p $releaseDir/cfdyndns $out/bin/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "CloudFlare Dynamic DNS Client"; homepage = "https://github.com/colemickens/cfdyndns"; license = stdenv.lib.licenses.mit; diff --git a/pkgs/applications/networking/esniper/default.nix b/pkgs/applications/networking/esniper/default.nix index 0282483df8dc..4c1b2bbea04f 100644 --- a/pkgs/applications/networking/esniper/default.nix +++ b/pkgs/applications/networking/esniper/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, openssl, curl, coreutils, gawk, bash, which }: +{ lib, stdenv, fetchgit, openssl, curl, coreutils, gawk, bash, which }: stdenv.mkDerivation { name = "esniper-2.35.0-21-g6379846"; @@ -21,7 +21,7 @@ stdenv.mkDerivation { chmod 555 "$out/bin/snipe" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Simple, lightweight tool for sniping eBay auctions"; homepage = "http://esniper.sourceforge.net"; license = licenses.gpl2; diff --git a/pkgs/applications/networking/feedreaders/canto-daemon/default.nix b/pkgs/applications/networking/feedreaders/canto-daemon/default.nix index 2992f28c58a0..a67e0c3aed2b 100644 --- a/pkgs/applications/networking/feedreaders/canto-daemon/default.nix +++ b/pkgs/applications/networking/feedreaders/canto-daemon/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python3Packages, }: +{ lib, stdenv, fetchFromGitHub, python3Packages, }: python3Packages.buildPythonApplication rec { version = "0.9.8"; @@ -17,7 +17,7 @@ python3Packages.buildPythonApplication rec { pythonImportsCheck = [ "canto_next" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Daemon for the canto Atom/RSS feed reader"; longDescription = '' Canto is an Atom/RSS feed reader for the console that is meant to be diff --git a/pkgs/applications/networking/feedreaders/castget/default.nix b/pkgs/applications/networking/feedreaders/castget/default.nix index 33f8d8ca2383..6aec4540147f 100644 --- a/pkgs/applications/networking/feedreaders/castget/default.nix +++ b/pkgs/applications/networking/feedreaders/castget/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { pkgconfig ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A simple, command-line based RSS enclosure downloader"; longDescription = '' castget is a simple, command-line based RSS enclosure downloader. It is diff --git a/pkgs/applications/networking/feedreaders/feedreader/default.nix b/pkgs/applications/networking/feedreaders/feedreader/default.nix index d050b75ac30a..2df2b9ce786a 100644 --- a/pkgs/applications/networking/feedreaders/feedreader/default.nix +++ b/pkgs/applications/networking/feedreaders/feedreader/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, nix-update-script, meson, ninja, pkgconfig, vala, gettext, python3 +{ lib, stdenv, fetchFromGitHub, nix-update-script, meson, ninja, pkgconfig, vala, gettext, python3 , appstream-glib, desktop-file-utils, wrapGAppsHook, gnome-online-accounts , gtk3, libgee, libpeas, librest, webkitgtk, gsettings-desktop-schemas, pantheon , curl, glib, gnome3, gst_all_1, json-glib, libnotify, libsecret, sqlite, gumbo, libxml2 @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A modern desktop application designed to complement existing web-based RSS accounts"; homepage = "https://jangernert.github.io/FeedReader/"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/networking/feedreaders/newsboat/default.nix b/pkgs/applications/networking/feedreaders/newsboat/default.nix index 3b8f6e0a0562..448590fbf116 100644 --- a/pkgs/applications/networking/feedreaders/newsboat/default.nix +++ b/pkgs/applications/networking/feedreaders/newsboat/default.nix @@ -1,4 +1,4 @@ -{ stdenv, rustPlatform, fetchFromGitHub, stfl, sqlite, curl, gettext, pkg-config, libxml2, json_c, ncurses +{ lib, stdenv, rustPlatform, fetchFromGitHub, stfl, sqlite, curl, gettext, pkg-config, libxml2, json_c, ncurses , asciidoctor, libiconv, Security, Foundation, makeWrapper }: rustPlatform.buildRustPackage rec { @@ -63,7 +63,7 @@ rustPlatform.buildRustPackage rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://newsboat.org/"; description = "A fork of Newsbeuter, an RSS/Atom feed reader for the text console"; maintainers = with maintainers; [ dotlambda nicknovitski ]; diff --git a/pkgs/applications/networking/feedreaders/rawdog/default.nix b/pkgs/applications/networking/feedreaders/rawdog/default.nix index 9435d995c351..d24e0fbf7170 100644 --- a/pkgs/applications/networking/feedreaders/rawdog/default.nix +++ b/pkgs/applications/networking/feedreaders/rawdog/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python2Packages }: +{ lib, stdenv, fetchurl, python2Packages }: python2Packages.buildPythonApplication rec { pname = "rawdog"; @@ -17,7 +17,7 @@ python2Packages.buildPythonApplication rec { namePrefix = ""; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://offog.org/code/rawdog/"; description = "RSS Aggregator Without Delusions Of Grandeur"; license = licenses.gpl2; diff --git a/pkgs/applications/networking/feedreaders/rssguard/default.nix b/pkgs/applications/networking/feedreaders/rssguard/default.nix index 13dc38aaba93..93b7c62ad962 100644 --- a/pkgs/applications/networking/feedreaders/rssguard/default.nix +++ b/pkgs/applications/networking/feedreaders/rssguard/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, qmake, qtwebengine, qttools, wrapGAppsHook, wrapQtAppsHook }: +{ lib, stdenv, fetchFromGitHub, qmake, qtwebengine, qttools, wrapGAppsHook, wrapQtAppsHook }: stdenv.mkDerivation rec { pname = "rssguard"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ qmake wrapGAppsHook wrapQtAppsHook ]; qmakeFlags = [ "CONFIG+=release" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Simple RSS/Atom feed reader with online synchronization"; longDescription = '' RSS Guard is a simple, light and easy-to-use RSS/ATOM feed aggregator diff --git a/pkgs/applications/networking/feedreaders/rsstail/default.nix b/pkgs/applications/networking/feedreaders/rsstail/default.nix index 66228efe8952..f83c91117551 100644 --- a/pkgs/applications/networking/feedreaders/rsstail/default.nix +++ b/pkgs/applications/networking/feedreaders/rsstail/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cppcheck, libmrss, libiconv }: +{ lib, stdenv, fetchFromGitHub, cppcheck, libmrss, libiconv }: stdenv.mkDerivation { pname = "rsstail"; @@ -23,7 +23,7 @@ stdenv.mkDerivation { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Monitor RSS feeds for new entries"; longDescription = '' RSSTail is more or less an RSS reader: it monitors an RSS feed and if it diff --git a/pkgs/applications/networking/firehol/default.nix b/pkgs/applications/networking/firehol/default.nix index de523b14ba64..904fd90e102e 100644 --- a/pkgs/applications/networking/firehol/default.nix +++ b/pkgs/applications/networking/firehol/default.nix @@ -20,69 +20,19 @@ stdenv.mkDerivation rec { patches = [ # configure tries to determine if `ping6` or the newer, combined # `ping` is installed by using `ping -6` which would fail. - (pkgs.writeText "firehol-ping6.patch" - '' - --- a/m4/ax_check_ping_ipv6.m4 - +++ b/m4/ax_check_ping_ipv6.m4 - @@ -42,16 +42,16 @@ AC_DEFUN([AX_CHECK_PING_IPV6], - - AC_CACHE_CHECK([whether ]PING[ has working -6 option], [ac_cv_ping_6_opt], - [ - - ac_cv_ping_6_opt=no - - if test -n "$PING"; then - - echo "Trying '$PING -6 -c 1 ::1'" >&AS_MESSAGE_LOG_FD - - $PING -6 -c 1 ::1 > conftest.out 2>&1 - - if test "$?" = 0; then - - ac_cv_ping_6_opt=yes - - fi - - cat conftest.out >&AS_MESSAGE_LOG_FD - - rm -f conftest.out - - fi - + ac_cv_ping_6_opt=yes - + #if test -n "$PING"; then - + # echo "Trying '$PING -6 -c 1 ::1'" >&AS_MESSAGE_LOG_FD - + # $PING -6 -c 1 ::1 > conftest.out 2>&1 - + # if test "$?" = 0; then - + # ac_cv_ping_6_opt=yes - + # fi - + # cat conftest.out >&AS_MESSAGE_LOG_FD - + # rm -f conftest.out - + #fi - ]) - - AS_IF([test "x$ac_cv_ping_6_opt" = "xyes"],[ - '') + ./firehol-ping6.patch # put firehol config files in /etc/firehol (not $out/etc/firehol) # to avoid error on startup, see #35114 - (pkgs.writeText "firehol-sysconfdir.patch" - '' - --- a/sbin/install.config.in.in - +++ b/sbin/install.config.in.in - @@ -4 +4 @@ - -SYSCONFDIR="@sysconfdir_POST@" - +SYSCONFDIR="/etc" - '') + ./firehol-sysconfdir.patch - # we must quote "$UNAME_CMD", or the dash in /nix/store/...-coreutils-.../bin/uname - # will be interpreted as IFS -> error. this might be considered an upstream bug - # but only appears when there are dashes in the command path - (pkgs.writeText "firehol-uname-command.patch" - '' - --- a/sbin/firehol - +++ b/sbin/firehol - @@ -10295,7 +10295,7 @@ - kmaj=$1 - kmin=$2 - - - set -- $($UNAME_CMD -r) - + set -- $("$UNAME_CMD" -r) - eval $kmaj=\$1 $kmin=\$2 - } - kernel_maj_min KERNELMAJ KERNELMIN - '') + # we must quote "$UNAME_CMD", or the dash in + # /nix/store/...-coreutils-.../bin/uname will be interpreted as + # IFS -> error. this might be considered an upstream bug but only + # appears when there are dashes in the command path + ./firehol-uname-command.patch ]; - + nativeBuildInputs = [ autoconf automake ]; buildInputs = [ curl iprange iproute ipset iptables iputils kmod @@ -94,7 +44,7 @@ stdenv.mkDerivation rec { "--disable-doc" "--disable-man" ] ++ lib.optional onlyQOS [ "--disable-firehol" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A firewall for humans"; longDescription = '' FireHOL, an iptables stateful packet filtering firewall for humans! diff --git a/pkgs/applications/networking/firehol/firehol-ping6.patch b/pkgs/applications/networking/firehol/firehol-ping6.patch new file mode 100644 index 000000000000..7e06e503ef6f --- /dev/null +++ b/pkgs/applications/networking/firehol/firehol-ping6.patch @@ -0,0 +1,29 @@ +--- a/m4/ax_check_ping_ipv6.m4 ++++ b/m4/ax_check_ping_ipv6.m4 +@@ -42,16 +42,16 @@ AC_DEFUN([AX_CHECK_PING_IPV6], + + AC_CACHE_CHECK([whether ]PING[ has working -6 option], [ac_cv_ping_6_opt], + [ +- ac_cv_ping_6_opt=no +- if test -n "$PING"; then +- echo "Trying '$PING -6 -c 1 ::1'" >&AS_MESSAGE_LOG_FD +- $PING -6 -c 1 ::1 > conftest.out 2>&1 +- if test "$?" = 0; then +- ac_cv_ping_6_opt=yes +- fi +- cat conftest.out >&AS_MESSAGE_LOG_FD +- rm -f conftest.out +- fi ++ ac_cv_ping_6_opt=yes ++ #if test -n "$PING"; then ++ # echo "Trying '$PING -6 -c 1 ::1'" >&AS_MESSAGE_LOG_FD ++ # $PING -6 -c 1 ::1 > conftest.out 2>&1 ++ # if test "$?" = 0; then ++ # ac_cv_ping_6_opt=yes ++ # fi ++ # cat conftest.out >&AS_MESSAGE_LOG_FD ++ # rm -f conftest.out ++ #fi + ]) + + AS_IF([test "x$ac_cv_ping_6_opt" = "xyes"],[ diff --git a/pkgs/applications/networking/firehol/firehol-sysconfdir.patch b/pkgs/applications/networking/firehol/firehol-sysconfdir.patch new file mode 100644 index 000000000000..c541dd585acc --- /dev/null +++ b/pkgs/applications/networking/firehol/firehol-sysconfdir.patch @@ -0,0 +1,5 @@ +--- a/sbin/install.config.in.in ++++ b/sbin/install.config.in.in +@@ -4,1 +4,1 @@ +-SYSCONFDIR="@sysconfdir_POST@" ++SYSCONFDIR="/etc" diff --git a/pkgs/applications/networking/firehol/firehol-uname-command.patch b/pkgs/applications/networking/firehol/firehol-uname-command.patch new file mode 100644 index 000000000000..92ab4cd93214 --- /dev/null +++ b/pkgs/applications/networking/firehol/firehol-uname-command.patch @@ -0,0 +1,11 @@ +--- a/sbin/firehol ++++ b/sbin/firehol +@@ -10295,7 +10295,7 @@ + kmaj=$1 + kmin=$2 + +- set -- $($UNAME_CMD -r) ++ set -- $("$UNAME_CMD" -r) + eval $kmaj=\$1 $kmin=\$2 + } + kernel_maj_min KERNELMAJ KERNELMIN diff --git a/pkgs/applications/networking/firehol/iprange.nix b/pkgs/applications/networking/firehol/iprange.nix index 75b4d5b40a6b..7dc43d5c116c 100644 --- a/pkgs/applications/networking/firehol/iprange.nix +++ b/pkgs/applications/networking/firehol/iprange.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "iprange"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0rymw4ydn09dng34q4g5111706fyppzs2gd5br76frgvfj4x2f71"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "manage IP ranges"; homepage = "https://github.com/firehol/iprange"; license = licenses.gpl2; diff --git a/pkgs/applications/networking/flent/default.nix b/pkgs/applications/networking/flent/default.nix index 319630ceff35..5f9350b70cd8 100644 --- a/pkgs/applications/networking/flent/default.nix +++ b/pkgs/applications/networking/flent/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonApplication, fetchPypi, matplotlib, procps, pyqt5, python +{ lib, stdenv, buildPythonApplication, fetchPypi, matplotlib, procps, pyqt5, python , pythonPackages, qt5, sphinx, xvfb_run }: buildPythonApplication rec { @@ -29,7 +29,7 @@ buildPythonApplication rec { makeWrapperArgs+=("''${qtWrapperArgs[@]}") ''; - meta = with stdenv.lib; { + meta = with lib; { description = "The FLExible Network Tester"; homepage = "https://flent.org"; license = licenses.gpl3; diff --git a/pkgs/applications/networking/flent/http-getter.nix b/pkgs/applications/networking/flent/http-getter.nix index 2a3d294c5ca6..21c9d3ca6fb1 100644 --- a/pkgs/applications/networking/flent/http-getter.nix +++ b/pkgs/applications/networking/flent/http-getter.nix @@ -1,5 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake -, curl, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, cmake, curl, pkg-config }: stdenv.mkDerivation { pname = "http-getter"; @@ -12,9 +11,10 @@ stdenv.mkDerivation { sha256 = "0plyqqwfm9bysichda0w3akbdxf6279wd4mx8mda0c4mxd4xy9nl"; }; - buildInputs = [ cmake pkgconfig curl ]; + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ curl ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/tohojo/http-getter"; description = "Simple getter for HTTP URLs using cURL"; platforms = platforms.unix; diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index 8ef1a6904415..2e5713627e4b 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "FlexGet"; - version = "3.1.91"; + version = "3.1.98"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "5d6668dd9721b60738ea44c616fcdee6210f7ef52b461eb13b77091caef4a832"; + sha256 = "d2d17a5ea821a580c55680294fce9ecf7012ef86c086c742414ec5bcb8468972"; }; postPatch = '' diff --git a/pkgs/applications/networking/ftp/filezilla/default.nix b/pkgs/applications/networking/ftp/filezilla/default.nix index 17306059e996..a24105f8315e 100644 --- a/pkgs/applications/networking/ftp/filezilla/default.nix +++ b/pkgs/applications/networking/ftp/filezilla/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , autoreconfHook , dbus @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://filezilla-project.org/"; description = "Graphical FTP, FTPS and SFTP client"; longDescription = '' diff --git a/pkgs/applications/networking/ftp/taxi/default.nix b/pkgs/applications/networking/ftp/taxi/default.nix index c629a8a07cd8..335b94cd2f43 100644 --- a/pkgs/applications/networking/ftp/taxi/default.nix +++ b/pkgs/applications/networking/ftp/taxi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, nix-update-script, pantheon, pkgconfig, meson, ninja, python3, vala +{ lib, stdenv, fetchFromGitHub, nix-update-script, pantheon, pkgconfig, meson, ninja, python3, vala , gtk3, libgee, libsoup, libsecret, gobject-introspection, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "The FTP Client that drives you anywhere"; homepage = "https://github.com/Alecaddd/taxi"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/networking/gdrive/default.nix b/pkgs/applications/networking/gdrive/default.nix index c5a5d1e970a6..b51512332c5a 100644 --- a/pkgs/applications/networking/gdrive/default.nix +++ b/pkgs/applications/networking/gdrive/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "gdrive"; @@ -14,7 +14,7 @@ buildGoPackage rec { inherit rev; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/prasmussen/gdrive"; description = "A command line utility for interacting with Google Drive"; platforms = platforms.unix; diff --git a/pkgs/applications/networking/gmailctl/default.nix b/pkgs/applications/networking/gmailctl/default.nix index a32da469719b..30a25dc9f70d 100644 --- a/pkgs/applications/networking/gmailctl/default.nix +++ b/pkgs/applications/networking/gmailctl/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildGoModule , fetchFromGitHub }: @@ -18,7 +18,7 @@ buildGoModule rec { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Declarative configuration for Gmail filters"; homepage = "https://github.com/mbrt/gmailctl"; license = licenses.mit; diff --git a/pkgs/applications/networking/gnome-network-displays/default.nix b/pkgs/applications/networking/gnome-network-displays/default.nix index 80fbb6dd6e74..5a865fddb594 100644 --- a/pkgs/applications/networking/gnome-network-displays/default.nix +++ b/pkgs/applications/networking/gnome-network-displays/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , fetchpatch # native @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { patchShebangs ./build-aux/meson/postinstall.py ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://gitlab.gnome.org/GNOME/gnome-network-displays"; description = "Miracast implementation for GNOME"; maintainers = with maintainers; [ doronbehar ]; diff --git a/pkgs/applications/networking/gns3/server.nix b/pkgs/applications/networking/gns3/server.nix index ad346104f969..c2ca0f580c35 100644 --- a/pkgs/applications/networking/gns3/server.nix +++ b/pkgs/applications/networking/gns3/server.nix @@ -53,7 +53,7 @@ in python.pkgs.buildPythonPackage { rm $out/bin/gns3loopback # For Windows only ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Graphical Network Simulator 3 server (${branch} release)"; longDescription = '' The GNS3 server manages emulators such as Dynamips, VirtualBox or diff --git a/pkgs/applications/networking/gopher/gopher/default.nix b/pkgs/applications/networking/gopher/gopher/default.nix index 4e5716386442..09b8f8aafcb3 100644 --- a/pkgs/applications/networking/gopher/gopher/default.nix +++ b/pkgs/applications/networking/gopher/gopher/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ncurses }: +{ lib, stdenv, fetchFromGitHub, ncurses }: stdenv.mkDerivation rec { pname = "gopher"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { preConfigure = "export LIBS=-lncurses"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://gopher.quux.org:70/devel/gopher"; description = "A ncurses gopher client"; platforms = platforms.linux; # clang doesn't like local regex.h diff --git a/pkgs/applications/networking/gopher/sacc/default.nix b/pkgs/applications/networking/gopher/sacc/default.nix index e10d97aeb42b..a3ead49c69f3 100644 --- a/pkgs/applications/networking/gopher/sacc/default.nix +++ b/pkgs/applications/networking/gopher/sacc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses +{ lib, stdenv, fetchurl, ncurses , patches ? [] # allow users to easily override config.def.h }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { --replace "/usr/local" "$out" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A terminal gopher client"; homepage = "gopher://bitreich.org/1/scm/sacc"; license = licenses.isc; diff --git a/pkgs/applications/networking/ids/suricata/default.nix b/pkgs/applications/networking/ids/suricata/default.nix index d6e9b2e74397..40dbbddbb3e3 100644 --- a/pkgs/applications/networking/ids/suricata/default.nix +++ b/pkgs/applications/networking/ids/suricata/default.nix @@ -148,7 +148,7 @@ stdenv.mkDerivation rec { --replace "/etc/suricata" "$out/etc/suricata" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A free and open source, mature, fast and robust network threat detection engine"; homepage = "https://suricata-ids.org"; license = licenses.gpl2; diff --git a/pkgs/applications/networking/ids/zeek/default.nix b/pkgs/applications/networking/ids/zeek/default.nix index 336e3be074dd..dc8fde4c6ca1 100644 --- a/pkgs/applications/networking/ids/zeek/default.nix +++ b/pkgs/applications/networking/ids/zeek/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , cmake , flex @@ -35,8 +35,6 @@ stdenv.mkDerivation rec { #see issue https://github.com/zeek/zeek/issues/804 to modify hardlinking duplicate files. inherit preConfigure; - enableParallelBuilding = true; - patches = stdenv.lib.optionals stdenv.cc.isClang [ # Fix pybind c++17 build with Clang. See: https://github.com/pybind/pybind11/issues/1604 (fetchpatch { @@ -53,7 +51,7 @@ stdenv.mkDerivation rec { "-DINSTALL_AUX_TOOLS=true" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Powerful network analysis framework much different from a typical IDS"; homepage = "https://www.zeek.org"; changelog = "https://github.com/zeek/zeek/blob/v${version}/CHANGES"; diff --git a/pkgs/applications/networking/ike/default.nix b/pkgs/applications/networking/ike/default.nix index 93858ba3027c..405827d8c5df 100644 --- a/pkgs/applications/networking/ike/default.nix +++ b/pkgs/applications/networking/ike/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, cmake, openssl, libedit, flex, bison, qt4, makeWrapper +{ lib, stdenv, fetchurl, fetchpatch, cmake, openssl, libedit, flex, bison, qt4, makeWrapper , gcc, nettools, iproute, linuxHeaders }: # NOTE: use $out/etc/iked.conf as sample configuration and also set: dhcp_file "/etc/iked.dhcp"; @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.shrew.net/software"; description = "IPsec Client for FreeBSD, NetBSD and many Linux based operating systems"; platforms = platforms.unix; diff --git a/pkgs/applications/networking/instant-messengers/SkypeExport/default.nix b/pkgs/applications/networking/instant-messengers/SkypeExport/default.nix index f5ec3d7b6bd0..bab9d12123df 100644 --- a/pkgs/applications/networking/instant-messengers/SkypeExport/default.nix +++ b/pkgs/applications/networking/instant-messengers/SkypeExport/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, boost166 }: +{ lib, stdenv, fetchFromGitHub, cmake, boost166 }: stdenv.mkDerivation rec { pname = "SkypeExport"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { preConfigure = "cd src/SkypeExport/_gccbuild/linux"; installPhase = "install -Dt $out/bin SkypeExport"; - meta = with stdenv.lib; { + meta = with lib; { description = "Export Skype history to HTML"; homepage = "https://github.com/Temptin/SkypeExport"; license = licenses.gpl2; diff --git a/pkgs/applications/networking/instant-messengers/blink/default.nix b/pkgs/applications/networking/instant-messengers/blink/default.nix index 28cc38360576..9dd6754af0cb 100644 --- a/pkgs/applications/networking/instant-messengers/blink/default.nix +++ b/pkgs/applications/networking/instant-messengers/blink/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchdarcs, pythonPackages, libvncserver, zlib +{ lib, stdenv, fetchdarcs, pythonPackages, libvncserver, zlib , gnutls, libvpx, makeDesktopItem, mkDerivationWith }: mkDerivationWith pythonPackages.buildPythonApplication rec { @@ -58,7 +58,7 @@ mkDerivationWith pythonPackages.buildPythonApplication rec { ) ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://icanblink.com/"; description = "A state of the art, easy to use SIP client for Voice, Video and IM"; platforms = platforms.linux; diff --git a/pkgs/applications/networking/instant-messengers/bluejeans/default.nix b/pkgs/applications/networking/instant-messengers/bluejeans/default.nix index 5e3f0bdb5d63..cce3a7edd792 100644 --- a/pkgs/applications/networking/instant-messengers/bluejeans/default.nix +++ b/pkgs/applications/networking/instant-messengers/bluejeans/default.nix @@ -116,7 +116,7 @@ stdenv.mkDerivation rec { patchShebangs "$out" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Video, audio, and web conferencing that works together with the collaboration tools you use every day"; homepage = "https://www.bluejeans.com"; license = licenses.unfree; diff --git a/pkgs/applications/networking/instant-messengers/cordless/default.nix b/pkgs/applications/networking/instant-messengers/cordless/default.nix index d3633e2245ff..5d95eddb6b63 100644 --- a/pkgs/applications/networking/instant-messengers/cordless/default.nix +++ b/pkgs/applications/networking/instant-messengers/cordless/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "cordless"; @@ -15,7 +15,7 @@ buildGoModule rec { vendorSha256 = "01anbhwgwam70dymcmvkia1xpw48658rq7wv4m7fiavxvnli6z2y"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/Bios-Marcel/cordless"; description = "Discord terminal client"; license = licenses.bsd3; diff --git a/pkgs/applications/networking/instant-messengers/coyim/default.nix b/pkgs/applications/networking/instant-messengers/coyim/default.nix index 67c2a0db2372..d16ad19428fc 100644 --- a/pkgs/applications/networking/instant-messengers/coyim/default.nix +++ b/pkgs/applications/networking/instant-messengers/coyim/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, pkgconfig, +{ lib, stdenv, buildGoPackage, fetchFromGitHub, pkgconfig, cairo, gdk-pixbuf, glib, gnome3, wrapGAppsHook, gtk3 }: buildGoPackage rec { @@ -18,7 +18,7 @@ buildGoPackage rec { buildInputs = [ glib cairo gdk-pixbuf gtk3 gnome3.adwaita-icon-theme ]; - meta = with stdenv.lib; { + meta = with lib; { description = "a safe and secure chat client"; homepage = "https://coy.im/"; license = licenses.gpl3; diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix index 03508c2ffb53..8e6725d6067f 100644 --- a/pkgs/applications/networking/instant-messengers/dino/default.nix +++ b/pkgs/applications/networking/instant-messengers/dino/default.nix @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Modern Jabber/XMPP Client using GTK/Vala"; homepage = "https://github.com/dino/dino"; license = licenses.gpl3; diff --git a/pkgs/applications/networking/instant-messengers/discord/base.nix b/pkgs/applications/networking/instant-messengers/discord/base.nix index 46c0cbef669e..72fb92b9d7cd 100644 --- a/pkgs/applications/networking/instant-messengers/discord/base.nix +++ b/pkgs/applications/networking/instant-messengers/discord/base.nix @@ -1,5 +1,5 @@ { pname, version, src, binaryName, desktopName -, autoPatchelfHook, fetchurl, makeDesktopItem, stdenv, wrapGAppsHook +, autoPatchelfHook, fetchurl, makeDesktopItem, lib, stdenv, wrapGAppsHook , alsaLib, at-spi2-atk, at-spi2-core, atk, cairo, cups, dbus, expat, fontconfig , freetype, gdk-pixbuf, glib, gtk3, libcxx, libdrm, libnotify, libpulseaudio, libuuid , libX11, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext @@ -69,7 +69,7 @@ in stdenv.mkDerivation rec { passthru.updateScript = ./update-discord.sh; - meta = with stdenv.lib; { + meta = with lib; { description = "All-in-one cross-platform voice and text chat for gamers"; homepage = "https://discordapp.com/"; downloadPage = "https://discordapp.com/download"; diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix index b6dfac397a11..cc5931f08edc 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , makeWrapper, makeDesktopItem, mkYarnPackage -, electron_9, element-web +, electron, element-web }: # Notes for maintainers: # * versions of `element-web` and `element-desktop` should be kept in sync. @@ -15,8 +15,6 @@ let rev = "v${version}"; sha256 = "sha256-mdHsw1Vi+2hrAF7biX3pJqfRaZU2lpw9zUZdcCm717g="; }; - electron = electron_9; - in mkYarnPackage rec { name = "element-desktop-${version}"; inherit version src; @@ -57,7 +55,7 @@ in mkYarnPackage rec { ''; # The desktop item properties should be kept in sync with data from upstream: - # https://github.com/vector-im/riot-desktop/blob/develop/package.json + # https://github.com/vector-im/element-desktop/blob/develop/package.json desktopItem = makeDesktopItem { name = "element-desktop"; exec = "${executableName} %u"; @@ -72,7 +70,7 @@ in mkYarnPackage rec { ''; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A feature-rich client for Matrix.org"; homepage = "https://element.io/"; license = licenses.asl20; diff --git a/pkgs/applications/networking/instant-messengers/element/update-element-desktop.sh b/pkgs/applications/networking/instant-messengers/element/update-element-desktop.sh index ecca3018e76f..69d0d3d70728 100755 --- a/pkgs/applications/networking/instant-messengers/element/update-element-desktop.sh +++ b/pkgs/applications/networking/instant-messengers/element/update-element-desktop.sh @@ -4,12 +4,12 @@ set -euo pipefail if [ "$#" -ne 1 ] || [[ "$1" == -* ]]; then - echo "Regenerates the Yarn dependency lock files for the element-desktop package." - echo "Usage: $0 " - exit 1 + echo "Regenerates the Yarn dependency lock files for the element-desktop package." + echo "Usage: $0 " + exit 1 fi -RIOT_WEB_SRC="https://raw.githubusercontent.com/vector-im/riot-desktop/$1" +RIOT_WEB_SRC="https://raw.githubusercontent.com/vector-im/element-desktop/$1" wget "$RIOT_WEB_SRC/package.json" -O element-desktop-package.json wget "$RIOT_WEB_SRC/yarn.lock" -O element-desktop-yarndeps.lock diff --git a/pkgs/applications/networking/instant-messengers/ferdi/default.nix b/pkgs/applications/networking/instant-messengers/ferdi/default.nix index 190050d8327b..458808c832da 100644 --- a/pkgs/applications/networking/instant-messengers/ferdi/default.nix +++ b/pkgs/applications/networking/instant-messengers/ferdi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, mkFranzDerivation, fetchurl }: +{ lib, stdenv, mkFranzDerivation, fetchurl }: mkFranzDerivation rec { pname = "ferdi"; @@ -8,7 +8,7 @@ mkFranzDerivation rec { url = "https://github.com/getferdi/ferdi/releases/download/v${version}/ferdi_${version}_amd64.deb"; sha256 = "0i24vcnq4iz5amqmn2fgk92ff9x9y7fg8jhc3g6ksvmcfly7af3k"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Combine your favorite messaging services into one application"; homepage = "https://getferdi.com/"; license = licenses.free; diff --git a/pkgs/applications/networking/instant-messengers/fractal/default.nix b/pkgs/applications/networking/instant-messengers/fractal/default.nix index bc6dbc5ce193..14cf45e97bbd 100644 --- a/pkgs/applications/networking/instant-messengers/fractal/default.nix +++ b/pkgs/applications/networking/instant-messengers/fractal/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitLab , nix-update-script , fetchpatch @@ -88,7 +88,7 @@ rustPlatform.buildRustPackage rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Matrix group messaging app"; homepage = "https://gitlab.gnome.org/GNOME/fractal"; license = licenses.gpl3; diff --git a/pkgs/applications/networking/instant-messengers/franz/default.nix b/pkgs/applications/networking/instant-messengers/franz/default.nix index 646a790fed25..a72ff17abcd4 100644 --- a/pkgs/applications/networking/instant-messengers/franz/default.nix +++ b/pkgs/applications/networking/instant-messengers/franz/default.nix @@ -1,4 +1,4 @@ -{ stdenv, mkFranzDerivation, fetchurl }: +{ lib, stdenv, mkFranzDerivation, fetchurl }: mkFranzDerivation rec { pname = "franz"; @@ -8,7 +8,7 @@ mkFranzDerivation rec { url = "https://github.com/meetfranz/franz/releases/download/v${version}/franz_${version}_amd64.deb"; sha256 = "1gn0n1hr6z2gsdnpxysyq6sm8y7cjr9jafhsam8ffw0bq74kph7p"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A free messaging app that combines chat & messaging services into one application"; homepage = "https://meetfranz.com"; license = licenses.free; diff --git a/pkgs/applications/networking/instant-messengers/freetalk/default.nix b/pkgs/applications/networking/instant-messengers/freetalk/default.nix index e24ac2e18317..2fe770e56ebf 100644 --- a/pkgs/applications/networking/instant-messengers/freetalk/default.nix +++ b/pkgs/applications/networking/instant-messengers/freetalk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , guile, pkgconfig, glib, loudmouth, gmp, libidn, readline, libtool , libunwind, ncurses, curl, jansson, texinfo , automake, autoconf }: @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { libunwind ncurses curl jansson ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Console XMPP client"; license = licenses.gpl3Plus ; maintainers = with maintainers; [ raskin ]; diff --git a/pkgs/applications/networking/instant-messengers/gitter/default.nix b/pkgs/applications/networking/instant-messengers/gitter/default.nix index 69a198480668..42827d43f0db 100644 --- a/pkgs/applications/networking/instant-messengers/gitter/default.nix +++ b/pkgs/applications/networking/instant-messengers/gitter/default.nix @@ -1,4 +1,4 @@ -{ stdenv, alsaLib, atk, at-spi2-core, cairo, cups, dbus, dpkg, expat, fetchurl +{ lib, stdenv, alsaLib, atk, at-spi2-core, cairo, cups, dbus, dpkg, expat, fetchurl , fontconfig, freetype, gdk-pixbuf, glib, gnome2, gtk3, libdrm, libX11 , libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext, libXfixes , libXi, libXrandr, libXrender, libXtst, libappindicator-gtk3, libcxx @@ -92,7 +92,7 @@ in stdenv.mkDerivation rec { categories = "Network;InstantMessaging;"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Where developers come to talk"; downloadPage = "https://gitter.im/apps"; license = licenses.mit; diff --git a/pkgs/applications/networking/instant-messengers/gomuks/default.nix b/pkgs/applications/networking/instant-messengers/gomuks/default.nix index 00134e2597be..3d1fc19113c6 100644 --- a/pkgs/applications/networking/instant-messengers/gomuks/default.nix +++ b/pkgs/applications/networking/instant-messengers/gomuks/default.nix @@ -1,17 +1,17 @@ -{ stdenv, buildGoModule, fetchFromGitHub, olm, makeDesktopItem }: +{ lib, stdenv, buildGoModule, fetchFromGitHub, olm, makeDesktopItem }: buildGoModule rec { pname = "gomuks"; - version = "0.2.1"; + version = "0.2.2"; src = fetchFromGitHub { owner = "tulir"; repo = pname; - rev = "v" + version; - sha256 = "0xa4ch4p48w6sd0f4s1sp0hl1w4fvzhff7w2ar19ki0ydy5g368n"; + rev = "v${version}"; + sha256 = "169xyd44jyfh5njwmhsmkah8njfgnp9q9c2b13p0ry5saicwm5h5"; }; - vendorSha256 = "1rhvwk8bdbbffhx2d03a8p9jc5c8v3pi7kw1dmyyngz6p7wq1g0x"; + vendorSha256 = "1l8qnz0qy90zpywfx7pbkqpxg7rkvc9j622zcmkf38kdc1z6w20a"; doCheck = false; @@ -32,7 +32,7 @@ buildGoModule rec { substituteAllInPlace $out/share/applications/* ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://maunium.net/go/gomuks/"; description = "A terminal based Matrix client written in Go"; license = licenses.gpl3; diff --git a/pkgs/applications/networking/instant-messengers/hipchat/default.nix b/pkgs/applications/networking/instant-messengers/hipchat/default.nix index 63cbb69b187d..27e1fc0cad31 100644 --- a/pkgs/applications/networking/instant-messengers/hipchat/default.nix +++ b/pkgs/applications/networking/instant-messengers/hipchat/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, xorg, freetype, fontconfig, openssl, glib, nss, nspr, expat +{ lib, stdenv, fetchurl, xorg, freetype, fontconfig, openssl, glib, nss, nspr, expat , alsaLib, dbus, zlib, libxml2, libxslt, makeWrapper, xkeyboard_config, systemd , libGL, xcbutilkeysyms, xdg_utils, libtool }: @@ -78,7 +78,7 @@ in stdenv.mkDerivation { --set QT_PLUGIN_PATH "$d/plugins" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Desktop client for HipChat services"; homepage = "http://www.hipchat.com"; license = licenses.unfree; diff --git a/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix b/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix index 4797bf5ffccb..c23d081866ba 100644 --- a/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix +++ b/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , appimageTools , makeWrapper @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc ]}" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Jitsi Meet desktop application powered by Electron"; homepage = "https://github.com/jitsi/jitsi-meet-electron"; license = licenses.asl20; diff --git a/pkgs/applications/networking/instant-messengers/jitsi/default.nix b/pkgs/applications/networking/instant-messengers/jitsi/default.nix index 938be9a9778d..137ad4d49b04 100644 --- a/pkgs/applications/networking/instant-messengers/jitsi/default.nix +++ b/pkgs/applications/networking/instant-messengers/jitsi/default.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://jitsi.org/"; description = "Open Source Video Calls and Chat"; license = licenses.lgpl21Plus; diff --git a/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix b/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix index 7e63161ff35a..686e9c476975 100644 --- a/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gnome2, gtk3, pango, atk, cairo, gdk-pixbuf, glib, +{ lib, stdenv, fetchurl, gnome2, gtk3, pango, atk, cairo, gdk-pixbuf, glib, freetype, fontconfig, dbus, libX11, xorg, libXi, libXcursor, libXdamage, libXrandr, libXcomposite, libXext, libXfixes, libXrender, libXtst, libXScrnSaver, nss, nspr, alsaLib, cups, expat, udev, wrapGAppsHook, @@ -88,7 +88,7 @@ in $out/share/mattermost-desktop/mattermost-desktop ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Mattermost Desktop client"; homepage = "https://about.mattermost.com/"; license = licenses.asl20; diff --git a/pkgs/applications/networking/instant-messengers/mcabber/default.nix b/pkgs/applications/networking/instant-messengers/mcabber/default.nix index 23db7d1ce257..8e5642855a39 100644 --- a/pkgs/applications/networking/instant-messengers/mcabber/default.nix +++ b/pkgs/applications/networking/instant-messengers/mcabber/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl, ncurses, pkgconfig, glib, loudmouth, libotr +{ lib, stdenv, fetchurl, openssl, ncurses, pkgconfig, glib, loudmouth, libotr , gpgme }: @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://mcabber.com/"; description = "Small Jabber console client"; license = licenses.gpl2; diff --git a/pkgs/applications/networking/instant-messengers/mikutter/default.nix b/pkgs/applications/networking/instant-messengers/mikutter/default.nix index 5c86157f5023..be84342787d2 100644 --- a/pkgs/applications/networking/instant-messengers/mikutter/default.nix +++ b/pkgs/applications/networking/instant-messengers/mikutter/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , bundlerEnv, ruby , alsaUtils, libnotify, which, wrapGAppsHook, gtk2, atk, gobject-introspection }: @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { --replace "$out/bin/.mikutter-wrapped" "$out/mikutter.rb" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "An extensible Twitter client"; homepage = "https://mikutter.hachune.net"; platforms = ruby.meta.platforms; diff --git a/pkgs/applications/networking/instant-messengers/mirage/default.nix b/pkgs/applications/networking/instant-messengers/mirage/default.nix index decdb18aa063..bcf3279d6a08 100644 --- a/pkgs/applications/networking/instant-messengers/mirage/default.nix +++ b/pkgs/applications/networking/instant-messengers/mirage/default.nix @@ -1,4 +1,4 @@ -{ stdenv, mkDerivation, fetchFromGitHub +{ lib, stdenv, mkDerivation, fetchFromGitHub , qmake, pkgconfig, olm, wrapQtAppsHook , qtbase, qtquickcontrols2, qtkeychain, qtmultimedia, qttools, qtgraphicaleffects , python3Packages, pyotherside, libXScrnSaver @@ -47,7 +47,7 @@ mkDerivation rec { "''${qtWrapperArgs[@]}" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A fancy, customizable, keyboard-operable Qt/QML+Python Matrix chat client for encrypted and decentralized communication"; homepage = "https://github.com/mirukana/mirage"; license = licenses.lgpl3; diff --git a/pkgs/applications/networking/instant-messengers/mm/default.nix b/pkgs/applications/networking/instant-messengers/mm/default.nix index a9306a751ac8..7229218a704d 100644 --- a/pkgs/applications/networking/instant-messengers/mm/default.nix +++ b/pkgs/applications/networking/instant-messengers/mm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchgit }: +{ lib, stdenv, buildGoModule, fetchgit }: buildGoModule { pname = "mm"; @@ -12,7 +12,7 @@ buildGoModule { vendorSha256 = "sha256-zJJ9PzQShv2iRNyCg1XVscbwjV9ZtMIojJDtXXm3rVM="; - meta = with stdenv.lib; { + meta = with lib; { description = "A file system based matrix client"; homepage = "https://git.lost.host/meutraa/mm"; license = licenses.isc; diff --git a/pkgs/applications/networking/instant-messengers/neochat/default.nix b/pkgs/applications/networking/instant-messengers/neochat/default.nix index 2a489ee3e713..03e74de7780d 100644 --- a/pkgs/applications/networking/instant-messengers/neochat/default.nix +++ b/pkgs/applications/networking/instant-messengers/neochat/default.nix @@ -1,5 +1,5 @@ { mkDerivation -, stdenv +, lib, stdenv , fetchFromGitLab , pkg-config , cmake @@ -57,7 +57,7 @@ mkDerivation rec { libpulseaudio ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A client for matrix, the decentralized communication protocol."; homepage = "https://apps.kde.org/en/neochat"; license = licenses.gpl3Only; diff --git a/pkgs/applications/networking/instant-messengers/nheko/default.nix b/pkgs/applications/networking/instant-messengers/nheko/default.nix index 80ffbebe9be3..a26d3c41b221 100644 --- a/pkgs/applications/networking/instant-messengers/nheko/default.nix +++ b/pkgs/applications/networking/instant-messengers/nheko/default.nix @@ -57,7 +57,7 @@ mkDerivation rec { qtgraphicaleffects ] ++ lib.optional stdenv.isDarwin qtmacextras; - meta = with stdenv.lib; { + meta = with lib; { description = "Desktop client for the Matrix protocol"; homepage = "https://github.com/Nheko-Reborn/nheko"; maintainers = with maintainers; [ ekleog fpletz ]; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/carbons/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/carbons/default.nix index 7c2150a584fe..2bb347611b83 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/carbons/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/carbons/default.nix @@ -1,4 +1,4 @@ -{ stdenv, libxml2, pidgin, pkgconfig, fetchFromGitHub } : +{ lib, stdenv, libxml2, pidgin, pkgconfig, fetchFromGitHub } : stdenv.mkDerivation rec { pname = "pidgin-carbons"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libxml2 pidgin ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/gkdr/carbons"; description = "XEP-0280: Message Carbons plugin for libpurple"; license = licenses.gpl2; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix index bdc16d101f55..c7bad49cebaa 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libotr, pidgin, intltool } : +{ lib, stdenv, fetchurl, libotr, pidgin, intltool } : stdenv.mkDerivation rec { name = "pidgin-otr-4.0.2"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ libotr pidgin intltool ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://otr.cypherpunks.ca/"; description = "Plugin for Pidgin 2.x which implements OTR Messaging"; license = licenses.gpl2; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix index 1fd248e0c89d..5f54d02ca9f6 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, pidgin, texLive, imagemagick, glib, gtk2 }: +{ lib, stdenv, fetchurl, pkgconfig, pidgin, texLive, imagemagick, glib, gtk2 }: let version = "1.5.0"; in @@ -23,7 +23,7 @@ stdenv.mkDerivation { wrapArgs = "--prefix PATH ':' ${stdenv.lib.makeBinPath [ texLive imagemagick ]}"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://sourceforge.net/projects/pidgin-latex/"; description = "LaTeX rendering plugin for Pidgin IM"; license = licenses.gpl2; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix index 067a71a93dd5..f72dd198b60f 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, pidgin, glib, json-glib, nss, nspr +{ lib, stdenv, fetchFromGitHub, pkgconfig, pidgin, glib, json-glib, nss, nspr , libsecret } : @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { pidgin glib json-glib nss nspr libsecret ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/EionRobb/pidgin-opensteamworks"; description = "Plugin for Pidgin 2.x which implements Steam Friends/Steam IM compatibility"; license = licenses.gpl3; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-osd/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-osd/default.nix index bf9979c19f25..4c7cb2c46bfa 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-osd/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-osd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pidgin, xosd +{ lib, stdenv, fetchFromGitHub, pidgin, xosd , autoreconfHook } : stdenv.mkDerivation rec { @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ xosd pidgin ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/mbroemme/pidgin-osd"; description = "Plugin for Pidgin which implements on-screen display via libxosd"; license = licenses.gpl3; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix index 72309e3479fe..59afb8bd65b0 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, pidgin, json-glib }: +{ lib, stdenv, fetchFromGitHub, pkgconfig, pidgin, json-glib }: stdenv.mkDerivation rec { pname = "pidgin-skypeweb"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { PKG_CONFIG_PURPLE_PLUGINDIR = "${placeholder "out"}/lib/purple-2"; PKG_CONFIG_PURPLE_DATADIR = "${placeholder "out"}/share"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/EionRobb/skype4pidgin"; description = "SkypeWeb plugin for Pidgin"; license = licenses.gpl3; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-xmpp-receipts/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-xmpp-receipts/default.nix index 463b6326b5a2..f545b65cd8ea 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-xmpp-receipts/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-xmpp-receipts/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pidgin } : +{ lib, stdenv, fetchFromGitHub, pidgin } : let version = "0.8"; @@ -21,7 +21,7 @@ stdenv.mkDerivation { cp xmpp-receipts.so $out/lib/pidgin/ ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://devel.kondorgulasch.de/pidgin-xmpp-receipts/"; description = "Message delivery receipts (XEP-0184) Pidgin plugin"; license = licenses.gpl3; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-discord/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-discord/default.nix index 0322005ae935..8128d0af7b7f 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-discord/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, pidgin, json-glib }: +{ lib, stdenv, fetchFromGitHub, pkgconfig, pidgin, json-glib }: stdenv.mkDerivation { pname = "purple-discord"; @@ -17,7 +17,7 @@ stdenv.mkDerivation { PKG_CONFIG_PURPLE_PLUGINDIR = "${placeholder "out"}/lib/purple-2"; PKG_CONFIG_PURPLE_DATADIR = "${placeholder "out"}/share"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/EionRobb/purple-discord"; description = "Discord plugin for Pidgin"; license = licenses.gpl3; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-facebook/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-facebook/default.nix index cff1bcc56b92..a45f91ec57fd 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-facebook/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-facebook/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchhg, pidgin, glib, json-glib, autoreconfHook }: +{ lib, stdenv, fetchFromGitHub, fetchhg, pidgin, glib, json-glib, autoreconfHook }: let @@ -55,7 +55,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ pidgin glib json-glib ]; - meta = with stdenv.lib; { + meta = with lib; { inherit (src.meta) homepage; description = "Facebook protocol plugin for libpurple"; license = licenses.gpl2; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-hangouts/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-hangouts/default.nix index 204d99f6d7ab..653708abe3b6 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-hangouts/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-hangouts/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchhg, pidgin, glib, json-glib, protobuf, protobufc }: +{ lib, stdenv, fetchhg, pidgin, glib, json-glib, protobuf, protobufc }: stdenv.mkDerivation { pname = "purple-hangouts-hg"; @@ -15,7 +15,7 @@ stdenv.mkDerivation { PKG_CONFIG_PURPLE_PLUGINDIR = "${placeholder "out"}/lib/purple-2"; PKG_CONFIG_PURPLE_DATADIR = "${placeholder "out"}/share"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://bitbucket.org/EionRobb/purple-hangouts"; description = "Native Hangouts support for pidgin"; license = licenses.gpl3; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-lurch/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-lurch/default.nix index 0a6aa1a133d6..2170aac16e05 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-lurch/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-lurch/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pidgin, minixml, libxml2, sqlite, libgcrypt }: +{ lib, stdenv, fetchFromGitHub, cmake, pidgin, minixml, libxml2, sqlite, libgcrypt }: stdenv.mkDerivation rec { pname = "purple-lurch"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { install -Dm755 -t $out/lib/purple-2 build/lurch.so ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/gkdr/lurch"; description = "XEP-0384: OMEMO Encryption for libpurple"; license = licenses.gpl3; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix index 4ded2ce1d0bf..75be98506aec 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, pidgin, json-glib, glib, http-parser, sqlite, olm, libgcrypt } : +{ lib, stdenv, fetchFromGitHub, pkgconfig, pidgin, json-glib, glib, http-parser, sqlite, olm, libgcrypt } : stdenv.mkDerivation rec { pname = "purple-matrix-unstable"; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { buildFlags = [ "CC=cc" ]; # fix build on darwin - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/matrix-org/purple-matrix"; description = "Matrix support for Pidgin / libpurple"; license = licenses.gpl2; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-plugin-pack/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-plugin-pack/default.nix index 6739befbfea4..edc047c78ba2 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-plugin-pack/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-plugin-pack/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pidgin, intltool, python } : +{ lib, stdenv, fetchurl, pidgin, intltool, python } : stdenv.mkDerivation rec { name = "purple-plugin-pack-2.7.0"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { buildInputs = [ pidgin intltool python ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://bitbucket.org/rekkanoryo/purple-plugin-pack"; description = "Plugin pack for Pidgin 2.x"; license = licenses.gpl2; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-slack/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-slack/default.nix index 5b3a1564aebf..547cd2b14278 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-slack/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-slack/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pidgin, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, pidgin, pkgconfig }: stdenv.mkDerivation { pname = "purple-slack-unstable"; @@ -17,7 +17,7 @@ stdenv.mkDerivation { PKG_CONFIG_PURPLE_PLUGINDIR = "${placeholder "out"}/lib/purple-2"; PKG_CONFIG_PURPLE_DATAROOTDIR = "${placeholder "out"}/share"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/dylex/slack-libpurple"; description = "Slack plugin for Pidgin"; license = licenses.gpl2; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-vk-plugin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-vk-plugin/default.nix index 76b242659e7a..327827b74f31 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-vk-plugin/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-vk-plugin/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation { sha256 = "02p57fgx8ml00cbrb4f280ak2802svz80836dzk9f1zwm1bcr2qc"; }; - buildInputs = [ pidgin cmake libxml2 ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ pidgin libxml2 ]; preConfigure = '' sed -i -e 's|DESTINATION.*PURPLE_PLUGIN_DIR}|DESTINATION lib/purple-2|' CMakeLists.txt diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-xmpp-http-upload/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-xmpp-http-upload/default.nix index 3277e12ec086..6ade8e5f19e5 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-xmpp-http-upload/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-xmpp-http-upload/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, pidgin, glib, libxml2 }: +{ lib, stdenv, fetchgit, pidgin, glib, libxml2 }: stdenv.mkDerivation { name = "purple-xmpp-upload-2017-12-31"; @@ -15,7 +15,7 @@ stdenv.mkDerivation { install -Dm644 -t $out/lib/purple-2 jabber_http_file_upload.so ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/Junker/purple-xmpp-http-upload"; description = "HTTP File Upload plugin for libpurple (XMPP Protocol XEP-0363)"; license = licenses.gpl3; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix index 3d1a6ac534c5..468d7f64c4cf 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pidgin, intltool, libxml2, gmime, nss }: +{ lib, stdenv, fetchurl, pidgin, intltool, libxml2, gmime, nss }: stdenv.mkDerivation rec { pname = "pidgin-sipe"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { postInstall = "ln -s \$out/lib/purple-2 \$out/share/pidgin-sipe"; - meta = with stdenv.lib; { + meta = with lib; { description = "SIPE plugin for Pidgin IM"; homepage = "http://sipe.sourceforge.net/"; license = licenses.gpl2; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix index 38424ca25979..a5593624691b 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, pkgconfig, pidgin, libwebp, libgcrypt, gettext } : +{ lib, stdenv, fetchgit, pkgconfig, pidgin, libwebp, libgcrypt, gettext } : let version = "1.3.1"; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { cp imgs/telegram48.png $out/pixmaps/pidgin/protocols/48 ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/majn/telegram-purple"; description = "Telegram for Pidgin / libpurple"; license = licenses.gpl2; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/tox-prpl/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/tox-prpl/default.nix index de48ee26a6ed..41c6a75310a6 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/tox-prpl/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/tox-prpl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libtoxcore, pidgin, autoreconfHook, libsodium }: +{ lib, stdenv, fetchFromGitHub, libtoxcore, pidgin, autoreconfHook, libsodium }: stdenv.mkDerivation rec { pname = "tox-prpl"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ libtoxcore pidgin libsodium ]; nativeBuildInputs = [ autoreconfHook ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/jin-eld/tox-prpl"; description = "Tox plugin for Pidgin / libpurple"; license = licenses.gpl3; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/window-merge/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/window-merge/default.nix index f576f2ad9c3e..c5437e965ed8 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/window-merge/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/window-merge/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pidgin } : +{ lib, stdenv, fetchurl, pidgin } : stdenv.mkDerivation rec { pname = "pidgin-window-merge"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ pidgin ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/dm0-/window_merge"; description = "Pidgin plugin that merges the Buddy List window with a conversation window"; license = licenses.gpl3; diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix index a269eead708a..c956864b83d7 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix @@ -72,7 +72,7 @@ let unwrapped = stdenv.mkDerivation rec { --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Multi-protocol instant messaging client"; homepage = "http://pidgin.im"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/networking/instant-messengers/psi/default.nix b/pkgs/applications/networking/instant-messengers/psi/default.nix index 08c3ab96210f..62b6c8f8e59c 100644 --- a/pkgs/applications/networking/instant-messengers/psi/default.nix +++ b/pkgs/applications/networking/instant-messengers/psi/default.nix @@ -21,7 +21,6 @@ mkDerivation rec { qtbase qtmultimedia qtx11extras qtwebengine libidn qca-qt5 libXScrnSaver hunspell ]; - enableParallelBuilding = true; meta = with lib; { homepage = "https://psi-im.org"; diff --git a/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix b/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix index d76b8dd206e4..06f02fa80946 100644 --- a/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix +++ b/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python2Packages, openssl }: +{ lib, stdenv, fetchFromGitHub, python2Packages, openssl }: python2Packages.buildPythonApplication rec { pname = "pybitmessage"; @@ -30,7 +30,7 @@ python2Packages.buildPythonApplication rec { ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://bitmessage.org/"; description = "The official Bitmessage client"; license = licenses.mit; diff --git a/pkgs/applications/networking/instant-messengers/qtox/default.nix b/pkgs/applications/networking/instant-messengers/qtox/default.nix index 2605d6dc0818..37527262b7fe 100644 --- a/pkgs/applications/networking/instant-messengers/qtox/default.nix +++ b/pkgs/applications/networking/instant-messengers/qtox/default.nix @@ -1,4 +1,4 @@ -{ stdenv, mkDerivation, fetchFromGitHub, cmake, pkg-config, perl +{ lib, stdenv, mkDerivation, fetchFromGitHub, cmake, pkg-config, perl , libtoxcore, libpthreadstubs, libXdmcp, libXScrnSaver , qtbase, qtsvg, qttools, qttranslations , ffmpeg_3, filter-audio, libexif, libsodium, libopus @@ -35,7 +35,7 @@ mkDerivation rec { "-DTIMESTAMP=1" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Qt Tox client"; homepage = "https://tox.chat"; license = licenses.gpl3; diff --git a/pkgs/applications/networking/instant-messengers/rambox/default.nix b/pkgs/applications/networking/instant-messengers/rambox/default.nix index cc9fab4d3752..bc26b68d2db7 100644 --- a/pkgs/applications/networking/instant-messengers/rambox/default.nix +++ b/pkgs/applications/networking/instant-messengers/rambox/default.nix @@ -41,7 +41,7 @@ in stdenv.mkDerivation rec { ) ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Free and Open Source messaging and emailing app that combines common web applications into one"; homepage = "https://rambox.pro"; license = licenses.mit; diff --git a/pkgs/applications/networking/instant-messengers/rambox/pro.nix b/pkgs/applications/networking/instant-messengers/rambox/pro.nix index 3cdf1339e3bf..1df0b597ae24 100644 --- a/pkgs/applications/networking/instant-messengers/rambox/pro.nix +++ b/pkgs/applications/networking/instant-messengers/rambox/pro.nix @@ -1,4 +1,4 @@ -{ autoPatchelfHook, electron_7, fetchurl, makeDesktopItem, makeWrapper, nodePackages, nss, stdenv, xdg_utils, xorg }: +{ autoPatchelfHook, electron_7, fetchurl, makeDesktopItem, makeWrapper, nodePackages, nss, lib, stdenv, xdg_utils, xorg }: let electron = electron_7; @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { categories = "Network;"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Messaging and emailing app that combines common web applications into one"; homepage = "https://rambox.pro"; license = licenses.unfree; diff --git a/pkgs/applications/networking/instant-messengers/ricochet/default.nix b/pkgs/applications/networking/instant-messengers/ricochet/default.nix index de46c891d1fa..322da86071c5 100644 --- a/pkgs/applications/networking/instant-messengers/ricochet/default.nix +++ b/pkgs/applications/networking/instant-messengers/ricochet/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, stdenv, fetchurl, pkgconfig, makeDesktopItem +{ mkDerivation, lib, stdenv, fetchurl, pkgconfig, makeDesktopItem , qtbase, qttools, qtmultimedia, qtquick1, qtquickcontrols , openssl, protobuf, qmake }: @@ -49,7 +49,7 @@ mkDerivation rec { # RCC: Error in 'translation/embedded.qrc': Cannot find file 'ricochet_en.qm' enableParallelBuilding = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Anonymous peer-to-peer instant messaging"; homepage = "https://ricochet.im"; license = licenses.bsd3; diff --git a/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix b/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix index 4a95debdfd10..801e68266803 100644 --- a/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix +++ b/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchgit , which , autoreconfHook @@ -52,7 +52,7 @@ let patchdir = "${src}/contrib/src"; restbed = import ./restbed.nix { - inherit stdenv fetchFromGitHub cmake asio openssl; + inherit stdenv lib fetchFromGitHub cmake asio openssl; patches = [ "${patchdir}/restbed/CMakeLists.patch" "${patchdir}/restbed/strand.patch" @@ -132,7 +132,7 @@ stdenv.mkDerivation { ln -s $out/dringctrl/dringctrl.py $out/bin/dringctrl.py ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A Voice-over-IP software phone"; longDescription = '' As the SIP/audio daemon and the user interface are separate processes, it diff --git a/pkgs/applications/networking/instant-messengers/ring-daemon/restbed.nix b/pkgs/applications/networking/instant-messengers/ring-daemon/restbed.nix index 775b9015eb0e..e2cdb1f05b0e 100644 --- a/pkgs/applications/networking/instant-messengers/ring-daemon/restbed.nix +++ b/pkgs/applications/networking/instant-messengers/ring-daemon/restbed.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , cmake , asio @@ -19,13 +19,10 @@ stdenv.mkDerivation { inherit patches; - buildInputs = [ - cmake - asio - openssl - ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ asio openssl ]; - meta = with stdenv.lib; { + meta = with lib; { description = "HTTP framework for building networked applications"; longDescription = '' HTTP framework for building networked applications that require seamless diff --git a/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix b/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix index 6b9593a24b7f..614ceeb0c324 100644 --- a/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix +++ b/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python27Packages, file }: +{ lib, stdenv, fetchurl, python27Packages, file }: let inherit (python27Packages) python; @@ -50,7 +50,7 @@ in done ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://sat.goffi.org/"; description = "A multi-frontend XMPP client"; platforms = platforms.linux; diff --git a/pkgs/applications/networking/instant-messengers/salut-a-toi/requirements.nix b/pkgs/applications/networking/instant-messengers/salut-a-toi/requirements.nix index 1a6811182453..c15b7ac45dd8 100644 --- a/pkgs/applications/networking/instant-messengers/salut-a-toi/requirements.nix +++ b/pkgs/applications/networking/instant-messengers/salut-a-toi/requirements.nix @@ -1,5 +1,5 @@ { fetchurl -, stdenv +, lib, stdenv , pythonPackages }: @@ -40,7 +40,7 @@ in { # error: invalid command 'test' doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://home.blarg.net/~steveha/pyfeed.html"; description = "Tools for syndication feeds"; }; @@ -57,7 +57,7 @@ in { propagatedBuildInputs = with pythonPackages; [twisted dateutil]; - meta = with stdenv.lib; { + meta = with lib; { description = "Some (mainly XMPP-related) additions to twisted"; homepage = "http://wokkel.ik.nu/"; license = licenses.mit; diff --git a/pkgs/applications/networking/instant-messengers/scudcloud/default.nix b/pkgs/applications/networking/instant-messengers/scudcloud/default.nix index b16659ba44cd..55935f69e1c8 100644 --- a/pkgs/applications/networking/instant-messengers/scudcloud/default.nix +++ b/pkgs/applications/networking/instant-messengers/scudcloud/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python3Packages }: +{ lib, stdenv, fetchurl, python3Packages }: let version = "1.63"; in python3Packages.buildPythonPackage { @@ -11,7 +11,7 @@ in python3Packages.buildPythonPackage { propagatedBuildInputs = with python3Packages; [ pyqt5_with_qtwebkit dbus-python jsmin ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Non-official desktop client for Slack"; homepage = "https://github.com/raelgc/scudcloud"; license = licenses.mit; diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 44df5f6be687..535a356bbaa2 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -25,7 +25,7 @@ let else ""); in stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "1.39.4"; # Please backport all updates to the stable channel. + version = "1.39.5"; # Please backport all updates to the stable channel. # All releases have a limited lifetime and "expire" 90 days after the release. # When releases "expire" the application becomes unusable until an update is # applied. The expiration date for the current release can be extracted with: @@ -35,7 +35,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "11rjz0vawwyny4rpdqsqyfh8pi177xykm69xxcj6kgcncxaxg0vb"; + sha256 = "1x29ri4jxd1q2wbv5gf26x986x9sms4rxnhj7d5rhm6pz2ihzb2a"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix index d4e43ed3a92d..068b939d515c 100644 --- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix +++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, dpkg +{ lib, stdenv, fetchurl, dpkg , alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, gdk-pixbuf, glib, glibc, gnome2, gnome3 , gtk3, libappindicator-gtk3, libnotify, libpulseaudio, libsecret, libv4l, nspr, nss, pango, systemd, wrapGAppsHook, xorg , at-spi2-atk, libuuid, at-spi2-core }: @@ -114,7 +114,7 @@ in stdenv.mkDerivation { --replace /usr/bin/ $out/bin/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Linux client for skype"; homepage = "https://www.skype.com"; license = licenses.unfree; diff --git a/pkgs/applications/networking/instant-messengers/slack-term/default.nix b/pkgs/applications/networking/instant-messengers/slack-term/default.nix index c862c253c00a..66d59346c4b1 100644 --- a/pkgs/applications/networking/instant-messengers/slack-term/default.nix +++ b/pkgs/applications/networking/instant-messengers/slack-term/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { # https://github.com/erroneousboat/slack-term @@ -14,7 +14,7 @@ buildGoPackage rec { sha256 = "1fbq7bdhy70hlkklppimgdjamnk0v059pg73xm9ax1f4616ki1m6"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Slack client for your terminal"; homepage = "https://github.com/erroneousboat/slack-term"; license = licenses.mit; diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix index 5f367c76a928..6c1e99a24dac 100644 --- a/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , dpkg , undmg @@ -65,7 +65,7 @@ let }; }.${system} or throwSystem; - meta = with stdenv.lib; { + meta = with lib; { description = "Desktop client for Slack"; homepage = "https://slack.com"; license = licenses.unfree; diff --git a/pkgs/applications/networking/instant-messengers/stride/default.nix b/pkgs/applications/networking/instant-messengers/stride/default.nix index 895ad30360e9..9096a925bbde 100644 --- a/pkgs/applications/networking/instant-messengers/stride/default.nix +++ b/pkgs/applications/networking/instant-messengers/stride/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, dpkg, alsaLib, atk, cairo, cups, dbus, expat, fontconfig +{ lib, stdenv, fetchurl, dpkg, alsaLib, atk, cairo, cups, dbus, expat, fontconfig , freetype, gdk-pixbuf, glib, gnome2, nspr, nss, pango, udev, xorg }: let fullPath = stdenv.lib.makeLibraryPath [ @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { "$out/bin/stride" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Desktop client for Atlassian Stride"; homepage = "https://www.stride.com/"; license = licenses.unfree; diff --git a/pkgs/applications/networking/instant-messengers/swift-im/default.nix b/pkgs/applications/networking/instant-messengers/swift-im/default.nix index c520835b1f0c..494a1f267f95 100644 --- a/pkgs/applications/networking/instant-messengers/swift-im/default.nix +++ b/pkgs/applications/networking/instant-messengers/swift-im/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, stdenv, fetchurl, pkgconfig, qttools, sconsPackages +{ mkDerivation, lib, stdenv, fetchurl, pkgconfig, qttools, sconsPackages , GConf, avahi, boost, hunspell, libXScrnSaver, libedit, libidn, libnatpmp, libxml2 , lua, miniupnpc, openssl, qtbase, qtmultimedia, qtsvg, qtwebkit, qtx11extras, zlib }: @@ -34,7 +34,7 @@ mkDerivation rec { installTargets = [ (placeholder "out") ]; installFlags = [ "SWIFT_INSTALLDIR=${placeholder "out"}" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://swift.im/"; description = "Qt XMPP client"; license = licenses.gpl3; diff --git a/pkgs/applications/networking/instant-messengers/teams/default.nix b/pkgs/applications/networking/instant-messengers/teams/default.nix index bf864eb41475..af3235bbdc7c 100644 --- a/pkgs/applications/networking/instant-messengers/teams/default.nix +++ b/pkgs/applications/networking/instant-messengers/teams/default.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { pname = "teams"; - version = "1.3.00.25560"; + version = "1.3.00.30857"; src = fetchurl { url = "https://packages.microsoft.com/repos/ms-teams/pool/main/t/teams/teams_${version}_amd64.deb"; - sha256 = "0kpcd9q6v2qh0dzddykisdbi3djbxj2rl70wchlzrb6bx95hkzmc"; + sha256 = "06r48h1fr2si2g5ng8hsnbcmr70iapnafj21v5bzrzzrigzb2n2h"; }; nativeBuildInputs = [ dpkg autoPatchelfHook wrapGAppsHook ]; @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { done; ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Microsoft Teams"; homepage = "https://teams.microsoft.com"; downloadPage = "https://teams.microsoft.com/downloads"; diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix index ba726d5b3771..33b8c5355f70 100644 --- a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix +++ b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, makeDesktopItem, zlib, glib, libpng, freetype, openssl +{ lib, stdenv, fetchurl, makeWrapper, makeDesktopItem, zlib, glib, libpng, freetype, openssl , xorg, fontconfig, qtbase, qtwebengine, qtwebchannel, qtsvg, qtwebsockets, xkeyboard_config , alsaLib, libpulseaudio ? null, libredirect, quazip, which, unzip, llvmPackages, writeShellScriptBin }: @@ -99,7 +99,7 @@ stdenv.mkDerivation rec { dontStrip = true; dontPatchELF = true; - meta = with stdenv.lib; { + meta = with lib; { description = "The TeamSpeak voice communication tool"; homepage = "https://teamspeak.com/"; license = { diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/server.nix b/pkgs/applications/networking/instant-messengers/teamspeak/server.nix index 521e60c78f00..3dfbb69e83c7 100644 --- a/pkgs/applications/networking/instant-messengers/teamspeak/server.nix +++ b/pkgs/applications/networking/instant-messengers/teamspeak/server.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, postgresql, autoPatchelfHook, writeScript }: +{ lib, stdenv, fetchurl, postgresql, autoPatchelfHook, writeScript }: let arch = if stdenv.is64bit then "amd64" else "x86"; @@ -51,7 +51,7 @@ in stdenv.mkDerivation rec { update-source-version teamspeak_server "$version" --system=x86_64-linux ''; - meta = with stdenv.lib; { + meta = with lib; { description = "TeamSpeak voice communication server"; homepage = "https://teamspeak.com/"; license = licenses.unfreeRedistributable; diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index d4cc5293a9be..8ea4362e7e34 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -52,8 +52,6 @@ in mkDerivation rec { pcre xorg.libpthreadstubs xorg.libXdmcp util-linux libselinux libsepol epoxy at-spi2-core libXtst ]; - enableParallelBuilding = true; - cmakeFlags = [ "-Ddisable_autoupdate=ON" # We're allowed to used the API ID of the Snap package: diff --git a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix index d81af8388aac..3cdaa72cfd2c 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libxslt, telepathy-glib, libxml2, dbus-glib, dbus +{ lib, stdenv, fetchurl, pkgconfig, libxslt, telepathy-glib, libxml2, dbus-glib, dbus , sqlite, libsoup, libnice, gnutls}: stdenv.mkDerivation rec { @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://telepathy.freedesktop.org/components/telepathy-gabble/"; description = "Jabber/XMPP connection manager for the Telepathy framework"; license = licenses.lgpl21Plus; diff --git a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix index f8e1f1f2c665..e96b35f21a8e 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, dbus-glib, libxml2, sqlite, telepathy-glib, pkgconfig +{ lib, stdenv, fetchurl, dbus-glib, libxml2, sqlite, telepathy-glib, pkgconfig , dconf, makeWrapper, intltool, libxslt, gobject-introspection, dbus }: stdenv.mkDerivation rec { @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Logger service for Telepathy framework"; homepage = "https://telepathy.freedesktop.org/components/telepathy-logger/"; license = licenses.lgpl21; diff --git a/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix index bc0657f7b1a7..1df59809146e 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , pkg-config , dconf @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "An account manager and channel dispatcher for the Telepathy framework"; homepage = "https://telepathy.freedesktop.org/components/telepathy-mission-control/"; license = licenses.lgpl21Only; diff --git a/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix index 6513c6324a61..dc0a16139ea9 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libxslt, glib, libxml2, telepathy-glib, avahi, libsoup +{ lib, stdenv, fetchurl, libxslt, glib, libxml2, telepathy-glib, avahi, libsoup , libuuid, openssl, pcre, sqlite, pkgconfig }: stdenv.mkDerivation rec { @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-avahi-tests" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Link-local XMPP connection manager for Telepathy"; platforms = platforms.gnu ++ platforms.linux; # Random choice maintainers = [ maintainers.lethalman ]; diff --git a/pkgs/applications/networking/instant-messengers/tensor/default.nix b/pkgs/applications/networking/instant-messengers/tensor/default.nix index 1ea249a8b51b..93b3315c1eff 100644 --- a/pkgs/applications/networking/instant-messengers/tensor/default.nix +++ b/pkgs/applications/networking/instant-messengers/tensor/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, stdenv, fetchgit, qtbase, qtquickcontrols, qmake, makeDesktopItem }: +{ mkDerivation, lib, stdenv, fetchgit, qtbase, qtquickcontrols, qmake, makeDesktopItem }: # we now have libqmatrixclient so a future version of tensor that supports it # should use that @@ -45,7 +45,7 @@ mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://matrix.org/docs/projects/client/tensor.html"; description = "Cross-platform Qt5/QML-based Matrix client"; license = licenses.gpl3; diff --git a/pkgs/applications/networking/instant-messengers/torchat/default.nix b/pkgs/applications/networking/instant-messengers/torchat/default.nix index 8231f481ee0d..087dd502946d 100644 --- a/pkgs/applications/networking/instant-messengers/torchat/default.nix +++ b/pkgs/applications/networking/instant-messengers/torchat/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python, unzip, wxPython, wrapPython, tor }: +{ lib, stdenv, fetchurl, python, unzip, wxPython, wrapPython, tor }: stdenv.mkDerivation rec { pname = "torchat"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { --add-flags "-O $out/lib/torchat/torchat.py" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/prof7bit/TorChat"; description = "Instant messaging application on top of the Tor network and it's location hidden services"; license = licenses.gpl3; diff --git a/pkgs/applications/networking/instant-messengers/toxic/default.nix b/pkgs/applications/networking/instant-messengers/toxic/default.nix index a2489427b946..4aee50453ed4 100644 --- a/pkgs/applications/networking/instant-messengers/toxic/default.nix +++ b/pkgs/applications/networking/instant-messengers/toxic/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libsodium, ncurses, curl +{ lib, stdenv, fetchFromGitHub, libsodium, ncurses, curl , libtoxcore, openal, libvpx, freealut, libconfig, pkgconfig, libopus , qrencode, gdk-pixbuf, libnotify }: @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ pkgconfig libconfig ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Reference CLI for Tox"; license = licenses.gpl3Plus; maintainers = with maintainers; [ ]; diff --git a/pkgs/applications/networking/instant-messengers/turses/default.nix b/pkgs/applications/networking/instant-messengers/turses/default.nix index b6017277b0a5..4b07289a11ca 100644 --- a/pkgs/applications/networking/instant-messengers/turses/default.nix +++ b/pkgs/applications/networking/instant-messengers/turses/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchpatch, python3Packages }: +{ lib, stdenv, fetchpatch, python3Packages }: with stdenv.lib; with python3Packages; @@ -44,7 +44,7 @@ buildPythonPackage rec { sed -i -e "s|self.observer.update.assert_called_once()|assert self.observer.update.call_count == 1|" tests/test_meta.py ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/louipc/turses"; description = "A Twitter client for the console"; license = licenses.gpl3; diff --git a/pkgs/applications/networking/instant-messengers/twinkle/default.nix b/pkgs/applications/networking/instant-messengers/twinkle/default.nix index b6f0b87dc848..004a4dab8236 100644 --- a/pkgs/applications/networking/instant-messengers/twinkle/default.nix +++ b/pkgs/applications/networking/instant-messengers/twinkle/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , cmake , libxml2 @@ -73,7 +73,7 @@ mkDerivation rec { /* "-DWITH_DIAMONDCARD=On" seems ancient and broken */ ]; - meta = with stdenv.lib; { + meta = with lib; { changelog = "https://github.com/LubosD/twinkle/blob/${version}/NEWS"; description = "A SIP-based VoIP client"; homepage = "http://twinkle.dolezel.info/"; diff --git a/pkgs/applications/networking/instant-messengers/utox/default.nix b/pkgs/applications/networking/instant-messengers/utox/default.nix index b360793e484b..01f2b9c5644c 100644 --- a/pkgs/applications/networking/instant-messengers/utox/default.nix +++ b/pkgs/applications/networking/instant-messengers/utox/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, check, cmake, pkgconfig +{ lib, stdenv, fetchFromGitHub, check, cmake, pkgconfig , libtoxcore, filter-audio, dbus, libvpx, libX11, openal, freetype, libv4l , libXrender, fontconfig, libXext, libXft, libsodium, libopus }: @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { doCheck = stdenv.hostPlatform == stdenv.buildPlatform; checkInputs = [ check ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Lightweight Tox client"; homepage = "https://github.com/uTox/uTox"; license = licenses.gpl3; diff --git a/pkgs/applications/networking/instant-messengers/vacuum/default.nix b/pkgs/applications/networking/instant-messengers/vacuum/default.nix index ed320d9679d6..0fc7e8b6d8ee 100644 --- a/pkgs/applications/networking/instant-messengers/vacuum/default.nix +++ b/pkgs/applications/networking/instant-messengers/vacuum/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , qt4, qmake4Hook, openssl , xorgproto, libX11, libXScrnSaver , xz, zlib @@ -31,7 +31,7 @@ stdenv.mkDerivation { hardeningDisable = [ "format" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "An XMPP client fully composed of plugins"; maintainers = [ maintainers.raskin ]; platforms = platforms.linux; diff --git a/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix b/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix index 2910c389daac..d7deb7ee052c 100644 --- a/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix +++ b/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix @@ -44,7 +44,7 @@ in stdenv.mkDerivation { cp -r --parents share/pixmaps $out ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Simple and Convenient Messaging App for VK"; homepage = "https://vk.com/messenger"; license = licenses.unfree; diff --git a/pkgs/applications/networking/instant-messengers/wavebox/default.nix b/pkgs/applications/networking/instant-messengers/wavebox/default.nix index bdc8aabf61cf..cddff29b5ed5 100644 --- a/pkgs/applications/networking/instant-messengers/wavebox/default.nix +++ b/pkgs/applications/networking/instant-messengers/wavebox/default.nix @@ -1,5 +1,5 @@ { alsaLib, autoPatchelfHook, fetchurl, gtk3, libnotify -, makeDesktopItem, makeWrapper, nss, stdenv, udev, xdg_utils +, makeDesktopItem, makeWrapper, nss, lib, stdenv, udev, xdg_utils , xorg }: @@ -57,7 +57,7 @@ in stdenv.mkDerivation { --prefix PATH : ${xdg_utils}/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Wavebox messaging application"; homepage = "https://wavebox.io"; license = licenses.mpl20; diff --git a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix index b198b954bd40..966583d2089a 100644 --- a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix @@ -31,7 +31,7 @@ let x86_64-linux = "033804nkz1fdmq3p8iplrlx708x1fjlr09bmrpy36lqg5h7m3yd6"; }.${system} or throwSystem; - meta = with stdenv.lib; { + meta = with lib; { description = "A modern, secure messenger for everyone"; longDescription = '' Wire Personal is a secure, privacy-friendly messenger. It combines useful diff --git a/pkgs/applications/networking/instant-messengers/xmpp-client/default.nix b/pkgs/applications/networking/instant-messengers/xmpp-client/default.nix index 52cf8e3279a0..a4c3f55b2996 100644 --- a/pkgs/applications/networking/instant-messengers/xmpp-client/default.nix +++ b/pkgs/applications/networking/instant-messengers/xmpp-client/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "xmpp-client"; @@ -16,7 +16,7 @@ buildGoPackage rec { goDeps = ./deps.nix; - meta = with stdenv.lib; { + meta = with lib; { description = "An XMPP client with OTR support"; homepage = "https://github.com/agl/xmpp-client"; license = licenses.bsd3; diff --git a/pkgs/applications/networking/ipfs-cluster/default.nix b/pkgs/applications/networking/ipfs-cluster/default.nix index 39f4d0d23343..69b2d9ef3094 100644 --- a/pkgs/applications/networking/ipfs-cluster/default.nix +++ b/pkgs/applications/networking/ipfs-cluster/default.nix @@ -1,22 +1,23 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "ipfs-cluster"; - version = "0.13.0"; - rev = "v${version}"; + version = "unstable-2020-10-20"; - vendorSha256 = "00fkyxxi4iz16v0j33270x8qrspqpsv9j6csnikjy0klyb038pfq"; + vendorSha256 = "0abfhl4v4yqy89aqn13ymj4rw5zhr92a9fh1abgpkr19adnyrs3d"; - doCheck = false; + patches = [ + ./test.patch + ]; src = fetchFromGitHub { owner = "ipfs"; repo = "ipfs-cluster"; - inherit rev; - sha256 = "0jf3ngxqkgss5f1kifp5lp3kllb21jxc475ysl01ma8l3smqdvya"; + rev = "c78f7839a2d5645806e01bfbf7af862600f8fbc4"; + sha256 = "0fschpysma2piy2bfas56yapxm2cl6nj986ww3sp7ysldjzadmkk"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Allocate, replicate, and track Pins across a cluster of IPFS daemons"; homepage = "https://cluster.ipfs.io/"; license = licenses.mit; diff --git a/pkgs/applications/networking/ipfs-cluster/test.patch b/pkgs/applications/networking/ipfs-cluster/test.patch new file mode 100644 index 000000000000..65f10fec8ef1 --- /dev/null +++ b/pkgs/applications/networking/ipfs-cluster/test.patch @@ -0,0 +1,12 @@ +diff --git a/peer_manager_test.go b/peer_manager_test.go +index 521e754..cf0d777 100644 +--- a/peer_manager_test.go ++++ b/peer_manager_test.go +@@ -76,6 +76,7 @@ func clusterAddr(c *Cluster) ma.Multiaddr { + } + + func TestClustersPeerAdd(t *testing.T) { ++ t.Skip("test is disabld by nixos") + ctx := context.Background() + clusters, mocks, boot := peerManagerClusters(t) + defer shutdownClusters(t, clusters, mocks) diff --git a/pkgs/applications/networking/ipfs/default.nix b/pkgs/applications/networking/ipfs/default.nix index 01e808a9e725..fd9d8bd0d347 100644 --- a/pkgs/applications/networking/ipfs/default.nix +++ b/pkgs/applications/networking/ipfs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchurl, nixosTests }: +{ lib, stdenv, buildGoModule, fetchurl, nixosTests }: buildGoModule rec { pname = "ipfs"; @@ -35,7 +35,7 @@ buildGoModule rec { --replace /usr/bin/ipfs $out/bin/ipfs ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A global, versioned, peer-to-peer filesystem"; homepage = "https://ipfs.io/"; license = licenses.mit; diff --git a/pkgs/applications/networking/ipget/default.nix b/pkgs/applications/networking/ipget/default.nix index f16031e9dc82..ded83f30a1af 100644 --- a/pkgs/applications/networking/ipget/default.nix +++ b/pkgs/applications/networking/ipget/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "ipget"; @@ -15,7 +15,7 @@ buildGoModule rec { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Retrieve files over IPFS and save them locally"; homepage = "https://ipfs.io/"; license = licenses.mit; diff --git a/pkgs/applications/networking/iptraf-ng/default.nix b/pkgs/applications/networking/iptraf-ng/default.nix index 1fc81be240bf..c90fd239267e 100644 --- a/pkgs/applications/networking/iptraf-ng/default.nix +++ b/pkgs/applications/networking/iptraf-ng/default.nix @@ -1,24 +1,27 @@ -{ stdenv, fetchurl, ncurses }: +{ lib, stdenv, fetchFromGitHub, ncurses }: stdenv.mkDerivation rec { - version = "1.1.4"; + version = "1.2.1"; pname = "iptraf-ng"; - src = fetchurl { - url = "https://fedorahosted.org/releases/i/p/iptraf-ng/${pname}-${version}.tar.gz"; - sha256 = "02gb8z9h2s6s1ybyikywz7jgb1mafdx88hijfasv3khcgkq0q53r"; + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "v${version}"; + sha256 = "1f91w1bjaayr6ld95z2q55ny983bb0m05k1jrw2bcddvcihaiqb1"; }; buildInputs = [ ncurses ]; - configurePhase = '' - ./configure --prefix=$out/usr --sysconfdir=$out/etc \ - --localstatedir=$out/var --sbindir=$out/bin - ''; + makeFlags = [ + "DESTDIR=$(out)" + "prefix=/usr" + "sbindir=/bin" + ]; hardeningDisable = [ "format" ]; - meta = { + meta = with lib; { description = "A console-based network monitoring utility (fork of iptraf)"; longDescription = '' IPTraf-ng is a console-based network monitoring utility. IPTraf-ng @@ -38,9 +41,9 @@ stdenv.mkDerivation rec { of the Linux kernel, so it can be used on a wide variety of supported network cards. ''; - homepage = "https://fedorahosted.org/iptraf-ng/"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.devhell ]; + homepage = "https://github.com/iptraf-ng/iptraf-ng"; + license = licenses.gpl2Only; + platforms = platforms.linux; + maintainers = with maintainers; [ devhell ]; }; } diff --git a/pkgs/applications/networking/irc/communi/default.nix b/pkgs/applications/networking/irc/communi/default.nix index f3a840e23d0f..5380bb5458ed 100644 --- a/pkgs/applications/networking/irc/communi/default.nix +++ b/pkgs/applications/networking/irc/communi/default.nix @@ -1,4 +1,4 @@ -{ fetchgit, libcommuni, qtbase, qmake, stdenv }: +{ fetchgit, libcommuni, qtbase, qmake, lib, stdenv }: stdenv.mkDerivation rec { pname = "communi"; @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { rm -rf lib ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A simple and elegant cross-platform IRC client"; homepage = "https://github.com/communi/communi-desktop"; license = licenses.bsd3; diff --git a/pkgs/applications/networking/irc/epic5/default.nix b/pkgs/applications/networking/irc/epic5/default.nix index cb2fa4ae6823..872c96ac7a01 100644 --- a/pkgs/applications/networking/irc/epic5/default.nix +++ b/pkgs/applications/networking/irc/epic5/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl, ncurses, libiconv, tcl, coreutils, fetchpatch }: +{ lib, stdenv, fetchurl, openssl, ncurses, libiconv, tcl, coreutils, fetchpatch }: stdenv.mkDerivation rec { pname = "epic5"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { --replace /bin/chmod ${coreutils}/bin/chmod \ ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://epicsol.org"; description = "A IRC client that offers a great ircII interface"; license = licenses.bsd3; diff --git a/pkgs/applications/networking/irc/glowing-bear/default.nix b/pkgs/applications/networking/irc/glowing-bear/default.nix index 59278dddad1a..bd7e05e8d389 100644 --- a/pkgs/applications/networking/irc/glowing-bear/default.nix +++ b/pkgs/applications/networking/irc/glowing-bear/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, stdenv }: +{ fetchFromGitHub, lib, stdenv }: stdenv.mkDerivation rec { pname = "glowing-bear"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { cp -R 3rdparty assets css directives js $out ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A web client for Weechat"; homepage = "https://github.com/glowing-bear/glowing-bear"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/networking/irc/hexchat/default.nix b/pkgs/applications/networking/irc/hexchat/default.nix index c5b2a9f1b28e..19f398bc59a4 100644 --- a/pkgs/applications/networking/irc/hexchat/default.nix +++ b/pkgs/applications/networking/irc/hexchat/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, gtk2, lua, perl, python3 +{ lib, stdenv, fetchFromGitHub, fetchpatch, pkgconfig, gtk2, lua, perl, python3 , pciutils, dbus-glib, libcanberra-gtk2, libproxy , enchant2, libnotify, openssl, isocodes , desktop-file-utils @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dwith-lua=lua" "-Dwith-text=true" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A popular and easy to use graphical IRC (chat) client"; homepage = "https://hexchat.github.io/"; license = licenses.gpl2; diff --git a/pkgs/applications/networking/irc/quassel/default.nix b/pkgs/applications/networking/irc/quassel/default.nix index 76743621fc74..842e160677e8 100644 --- a/pkgs/applications/networking/irc/quassel/default.nix +++ b/pkgs/applications/networking/irc/quassel/default.nix @@ -4,7 +4,7 @@ , tag ? "-kf5" # tag added to the package name , static ? false # link statically -, stdenv, fetchFromGitHub, cmake, makeWrapper, dconf +, lib, stdenv, fetchFromGitHub, cmake, makeWrapper, dconf , mkDerivation, qtbase, qtscript , phonon, libdbusmenu, qca-qt5 @@ -49,13 +49,11 @@ in (if !buildClient then stdenv.mkDerivation else mkDerivation) rec { ./0001-common-Disable-enum-type-stream-operators-for-Qt-5.1.patch ]; - enableParallelBuilding = true; - # Prevent ``undefined reference to `qt_version_tag''' in SSL check NIX_CFLAGS_COMPILE = "-DQT_NO_VERSION_TAGGING=1"; - buildInputs = - [ cmake makeWrapper qtbase ] + nativeBuildInputs = [ cmake makeWrapper ]; + buildInputs = [ qtbase ] ++ lib.optionals buildCore [qtscript qca-qt5] ++ lib.optionals buildClient [libdbusmenu phonon] ++ lib.optionals (buildClient && withKDE) [ @@ -85,7 +83,7 @@ in (if !buildClient then stdenv.mkDerivation else mkDerivation) rec { --prefix GIO_EXTRA_MODULES : "${dconf}/lib/gio/modules" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://quassel-irc.org/"; description = "Qt/KDE distributed IRC client suppporting a remote daemon"; longDescription = '' diff --git a/pkgs/applications/networking/irc/qweechat/default.nix b/pkgs/applications/networking/irc/qweechat/default.nix index 27adb2cefc5f..18a4872a44fa 100644 --- a/pkgs/applications/networking/irc/qweechat/default.nix +++ b/pkgs/applications/networking/irc/qweechat/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python27Packages }: +{ lib, stdenv, fetchFromGitHub, python27Packages }: python27Packages.buildPythonApplication rec { version = "2016-07-29"; @@ -21,7 +21,7 @@ python27Packages.buildPythonApplication rec { pyside setuptools ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/weechat/qweechat"; description = "Qt remote GUI for WeeChat"; license = licenses.gpl3; diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index 404810e5f245..7343b7e1a554 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, lib , ncurses, openssl, aspell, gnutls, gettext -, zlib, curl, pkgconfig, libgcrypt +, zlib, curl, pkg-config, libgcrypt , cmake, makeWrapper, libobjc, libresolv, libiconv , asciidoctor # manpages , guileSupport ? true, guile @@ -37,7 +37,6 @@ let outputs = [ "out" "man" ] ++ map (p: p.name) enabledPlugins; - enableParallelBuilding = true; cmakeFlags = with stdenv.lib; [ "-DENABLE_MAN=ON" "-DENABLE_DOC=ON" @@ -48,10 +47,10 @@ let ++ map (p: "-D${p.cmakeFlag}=" + (if p.enabled then "ON" else "OFF")) plugins ; + nativeBuildInputs = [ cmake pkg-config makeWrapper asciidoctor ]; buildInputs = with stdenv.lib; [ - ncurses openssl aspell gnutls gettext zlib curl pkgconfig - libgcrypt makeWrapper cmake asciidoctor - ] + ncurses openssl aspell gnutls gettext zlib curl + libgcrypt ] ++ optionals stdenv.isDarwin [ libobjc libresolv ] ++ concatMap (p: p.buildInputs) enabledPlugins ++ extraBuildInputs; diff --git a/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix b/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix index 9650f903ed6b..089271812a7a 100644 --- a/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix +++ b/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix @@ -1,4 +1,4 @@ -{ stdenv, substituteAll, buildEnv, fetchFromGitHub, python3Packages }: +{ lib, stdenv, substituteAll, buildEnv, fetchFromGitHub, python3Packages }: stdenv.mkDerivation rec { pname = "wee-slack"; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { install -D -m 0444 weemoji.json $out/share/wee-slack/weemoji.json ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/wee-slack/wee-slack"; license = licenses.mit; maintainers = with maintainers; [ willibutz ]; diff --git a/pkgs/applications/networking/irc/weechat/scripts/weechat-autosort/default.nix b/pkgs/applications/networking/irc/weechat/scripts/weechat-autosort/default.nix index 883ed793ced6..49e74e0203ac 100644 --- a/pkgs/applications/networking/irc/weechat/scripts/weechat-autosort/default.nix +++ b/pkgs/applications/networking/irc/weechat/scripts/weechat-autosort/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "weechat-autosort"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { install -D autosort.py $out/share/autosort.py ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Autosort is a weechat script to automatically or manually keep your buffers sorted"; homepage = "https://github.com/de-vri-es/weechat-autosort"; license = licenses.gpl3; diff --git a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/default.nix b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/default.nix index 5c734bf7de2b..24cf26fbaf55 100644 --- a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/default.nix +++ b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/default.nix @@ -1,4 +1,4 @@ -{ stdenv, curl, fetchFromGitHub, cjson, olm, luaffi }: +{ lib, stdenv, curl, fetchFromGitHub, cjson, olm, luaffi }: stdenv.mkDerivation { name = "weechat-matrix-bridge-2018-11-19"; @@ -36,7 +36,7 @@ stdenv.mkDerivation { cp ${luaffi}/lib/lua/${luaffi.lua.luaversion}/ffi.so $out/lib/ffi.so ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A WeeChat script in Lua that implements the matrix.org chat protocol"; homepage = "https://github.com/torhve/weechat-matrix-protocol-script"; maintainers = with maintainers; [ ]; diff --git a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix index 0b60617cbb38..b77d9c984de4 100644 --- a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix +++ b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix @@ -1,5 +1,5 @@ { buildPythonPackage -, stdenv +, lib, stdenv , python , fetchFromGitHub , pyopenssl @@ -71,7 +71,7 @@ in buildPythonPackage { dontPatchShebangs = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A Python plugin for Weechat that lets Weechat communicate over the Matrix protocol"; homepage = "https://github.com/poljar/weechat-matrix"; license = licenses.isc; 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 index d219aa481cdb..b55266e5f374 100644 --- a/pkgs/applications/networking/irc/weechat/scripts/weechat-notify-send/default.nix +++ b/pkgs/applications/networking/irc/weechat/scripts/weechat-notify-send/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libnotify }: +{ lib, stdenv, fetchFromGitHub, libnotify }: stdenv.mkDerivation rec { pname = "weechat-notify-send"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { --replace "'notify-send'" "'${libnotify}/bin/notify-send'" ''; - meta = with stdenv.lib; { + meta = with 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; diff --git a/pkgs/applications/networking/irc/weechat/scripts/weechat-otr/default.nix b/pkgs/applications/networking/irc/weechat/scripts/weechat-otr/default.nix index c7f2958cf553..987271e4ffa2 100644 --- a/pkgs/applications/networking/irc/weechat/scripts/weechat-otr/default.nix +++ b/pkgs/applications/networking/irc/weechat/scripts/weechat-otr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, substituteAll, buildEnv, fetchgit, fetchFromGitHub, python3Packages, gmp }: +{ lib, stdenv, substituteAll, buildEnv, fetchgit, fetchFromGitHub, python3Packages, gmp }: let # pure-python-otr (potr) requires an older version of pycrypto, which is @@ -61,7 +61,7 @@ in stdenv.mkDerivation rec { cp weechat_otr.py $out/share/weechat_otr.py ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/mmb/weechat-otr"; license = licenses.gpl3; maintainers = with maintainers; [ oxzi ]; diff --git a/pkgs/applications/networking/jmeter/default.nix b/pkgs/applications/networking/jmeter/default.nix index 3f626a6ac483..a8f947aebf77 100644 --- a/pkgs/applications/networking/jmeter/default.nix +++ b/pkgs/applications/networking/jmeter/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, jre, makeWrapper, coreutils }: +{ fetchurl, lib, stdenv, jre, makeWrapper, coreutils }: stdenv.mkDerivation rec { pname = "jmeter"; @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { timeout --kill=1s 1s $out/bin/jmeter-mirror-server.sh || test "$?" = "124" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A 100% pure Java desktop application designed to load test functional behavior and measure performance"; longDescription = '' The Apache JMeter desktop application is open source software, a 100% diff --git a/pkgs/applications/networking/jnetmap/default.nix b/pkgs/applications/networking/jnetmap/default.nix index e2a8a2d56bd1..bac0048cc28d 100644 --- a/pkgs/applications/networking/jnetmap/default.nix +++ b/pkgs/applications/networking/jnetmap/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jre, makeWrapper }: +{ lib, stdenv, fetchurl, jre, makeWrapper }: stdenv.mkDerivation rec { pname = "jnetmap"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { --add-flags "-jar \"$out/lib/jnetmap.jar\"" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Graphical network monitoring and documentation tool"; homepage = "http://www.rakudave.ch/jnetmap/"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/networking/libcoap/default.nix b/pkgs/applications/networking/libcoap/default.nix index 2448e8a76f35..188d19d59682 100644 --- a/pkgs/applications/networking/libcoap/default.nix +++ b/pkgs/applications/networking/libcoap/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, automake, autoconf, which, pkgconfig, libtool, stdenv }: +{ fetchFromGitHub, automake, autoconf, which, pkgconfig, libtool, lib, stdenv }: stdenv.mkDerivation rec { pname = "libcoap"; version = "4.2.1"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { "--disable-documentation" "--disable-shared" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/obgm/libcoap"; description = "A CoAP (RFC 7252) implementation in C"; platforms = platforms.linux; diff --git a/pkgs/applications/networking/lieer/default.nix b/pkgs/applications/networking/lieer/default.nix index 700ad011dff3..aee21dca6458 100644 --- a/pkgs/applications/networking/lieer/default.nix +++ b/pkgs/applications/networking/lieer/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchFromGitHub, python3Packages }: +{ lib, stdenv, fetchFromGitHub, python3Packages }: python3Packages.buildPythonApplication rec { pname = "lieer"; - version = "1.2"; + version = "1.3"; src = fetchFromGitHub { owner = "gauteh"; repo = "lieer"; rev = "v${version}"; - sha256 = "0qp8sycclzagkiszqk1pw2fr8s8s195bzy8r27dj7f5zx350nxk5"; + sha256 = "12sl7d381l1gjaam419xc8gxmsprxf0hgksz1f974qmmijvr02bh"; }; propagatedBuildInputs = with python3Packages; [ @@ -16,20 +16,25 @@ python3Packages.buildPythonApplication rec { oauth2client google_api_python_client tqdm + setuptools ]; - meta = with stdenv.lib; { - description = "Fast email-fetching and two-way tag synchronization between notmuch and GMail"; - longDescription = '' + # no tests + doCheck = false; + pythonImportsCheck = [ "lieer" ]; + + meta = with lib; { + description = "Fast email-fetching and two-way tag synchronization between notmuch and GMail"; + longDescription = '' This program can pull email and labels (and changes to labels) from your GMail account and store them locally in a maildir with the labels synchronized with a notmuch database. The changes to tags in the notmuch database may be pushed back remotely to your GMail account. ''; - homepage = "https://lieer.gaute.vetsj.com/"; + homepage = "https://lieer.gaute.vetsj.com/"; repositories.git = "https://github.com/gauteh/lieer.git"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ flokli kaiha ]; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ flokli kaiha ]; }; } diff --git a/pkgs/applications/networking/linssid/default.nix b/pkgs/applications/networking/linssid/default.nix index f458e03913ba..91c299d4fdab 100644 --- a/pkgs/applications/networking/linssid/default.nix +++ b/pkgs/applications/networking/linssid/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qtbase, qtsvg, qmake, pkgconfig, boost, wirelesstools, iw, qwt, wrapQtAppsHook }: +{ lib, stdenv, fetchurl, qtbase, qtsvg, qmake, pkgconfig, boost, wirelesstools, iw, qwt, wrapQtAppsHook }: stdenv.mkDerivation rec { pname = "linssid"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { qtWrapperArgs = [ ''--prefix PATH : ${stdenv.lib.makeBinPath [ wirelesstools iw ]}'' ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Graphical wireless scanning for Linux"; homepage = "https://sourceforge.net/projects/linssid/"; license = licenses.gpl3; diff --git a/pkgs/applications/networking/mailreaders/aerc/default.nix b/pkgs/applications/networking/mailreaders/aerc/default.nix index 781e6c8369d0..1bd8cbeceeb8 100644 --- a/pkgs/applications/networking/mailreaders/aerc/default.nix +++ b/pkgs/applications/networking/mailreaders/aerc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchurl +{ lib, stdenv, buildGoModule, fetchurl , go, ncurses, notmuch, scdoc , python3, perl, w3m, dante , fetchFromGitHub @@ -53,7 +53,7 @@ buildGoModule rec { ${stdenv.lib.makeBinPath [ w3m dante ]} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "An email client for your terminal"; homepage = "https://aerc-mail.org/"; maintainers = with maintainers; [ tadeokondrak ]; diff --git a/pkgs/applications/networking/mailreaders/afew/default.nix b/pkgs/applications/networking/mailreaders/afew/default.nix index 129120609ca5..dbc55850f9fd 100644 --- a/pkgs/applications/networking/mailreaders/afew/default.nix +++ b/pkgs/applications/networking/mailreaders/afew/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python3Packages, notmuch }: +{ lib, stdenv, python3Packages, notmuch }: python3Packages.buildPythonApplication rec { pname = "afew"; @@ -36,7 +36,7 @@ python3Packages.buildPythonApplication rec { ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/afewmail/afew"; description = "An initial tagging script for notmuch mail"; license = licenses.isc; diff --git a/pkgs/applications/networking/mailreaders/alpine/default.nix b/pkgs/applications/networking/mailreaders/alpine/default.nix index 83c2f3ca7ac3..62882818d726 100644 --- a/pkgs/applications/networking/mailreaders/alpine/default.nix +++ b/pkgs/applications/networking/mailreaders/alpine/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ncurses, tcl, openssl, pam, kerberos +{lib, stdenv, fetchurl, ncurses, tcl, openssl, pam, kerberos , openldap }: @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { "--with-c-client-target=slx" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Console mail reader"; license = licenses.asl20; maintainers = with maintainers; [ raskin ]; diff --git a/pkgs/applications/networking/mailreaders/astroid/default.nix b/pkgs/applications/networking/mailreaders/astroid/default.nix index 171136ce22ca..570b2d13be14 100644 --- a/pkgs/applications/networking/mailreaders/astroid/default.nix +++ b/pkgs/applications/networking/mailreaders/astroid/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, gnome3, gmime3, webkitgtk +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, gnome3, gmime3, webkitgtk, ronn , libsass, notmuch, boost, wrapGAppsHook, glib-networking, protobuf, vim_configurable -, gtkmm3, libpeas, gsettings-desktop-schemas -, python3, python3Packages -, vim ? vim_configurable.override { - features = "normal"; - gui = "auto"; - } -, ronn +, gtkmm3, libpeas, gsettings-desktop-schemas, gobject-introspection, python3 + +# vim to be used, should support the GUI mode. +, vim ? vim_configurable.override { features = "normal"; gui = "auto"; } + +# additional python3 packages to be available within plugins +, extraPythonPackages ? [] }: stdenv.mkDerivation rec { @@ -20,25 +20,33 @@ stdenv.mkDerivation rec { sha256 = "11cxbva9ni98gii59xmbxh4c6idcg3mg0pgdsp1c3j0yg7ix0lj3"; }; - nativeBuildInputs = [ cmake ronn pkgconfig wrapGAppsHook ]; + nativeBuildInputs = [ + cmake ronn pkg-config wrapGAppsHook gobject-introspection + python3 python3.pkgs.wrapPython + ]; buildInputs = [ gtkmm3 gmime3 webkitgtk libsass libpeas - python3 python3Packages.pygobject3 + python3 notmuch boost gsettings-desktop-schemas gnome3.adwaita-icon-theme glib-networking protobuf - ] ++ (if vim == null then [] else [ vim ]); + vim + ]; postPatch = '' sed -i "s~gvim ~${vim}/bin/vim -g ~g" src/config.cc sed -i "s~ -geom 10x10~~g" src/config.cc ''; - postInstall = '' - wrapProgram "$out/bin/astroid" --set CHARSET=en_us.UTF-8 + pythonPath = with python3.pkgs; requiredPythonModules [ pygobject3 ] ++ extraPythonPackages; + preFixup = '' + buildPythonPath "$out $pythonPath" + gappsWrapperArgs+=( + --prefix PYTHONPATH : "$program_PYTHONPATH" + ) ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://astroidmail.github.io/"; description = "GTK frontend to the notmuch mail system"; maintainers = with maintainers; [ bdimcheff SuprDewd ]; diff --git a/pkgs/applications/networking/mailreaders/balsa/default.nix b/pkgs/applications/networking/mailreaders/balsa/default.nix index 055aa15b2ec8..2570e425ae7f 100644 --- a/pkgs/applications/networking/mailreaders/balsa/default.nix +++ b/pkgs/applications/networking/mailreaders/balsa/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , glib , gmime3 @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://pawsa.fedorapeople.org/balsa/"; description = "An e-mail client for GNOME"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix index d3f5988b4747..65cb888ad6f7 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix +++ b/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gnome3, cmake, gettext, intltool, pkg-config, evolution-data-server +{ lib, stdenv, fetchurl, gnome3, cmake, gettext, intltool, pkg-config, evolution-data-server , sqlite, gtk3, webkitgtk, libgdata, libmspack }: stdenv.mkDerivation rec { @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Evolution connector for Microsoft Exchange Server protocols"; homepage = "https://gitlab.gnome.org/GNOME/evolution-ews"; license = "LGPL-2.1-only OR LGPL-3.0-only"; # https://gitlab.gnome.org/GNOME/evolution-ews/issues/111 diff --git a/pkgs/applications/networking/mailreaders/lumail/default.nix b/pkgs/applications/networking/mailreaders/lumail/default.nix index 3dd03c971203..0929919dcd06 100644 --- a/pkgs/applications/networking/mailreaders/lumail/default.nix +++ b/pkgs/applications/networking/mailreaders/lumail/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, lua, file, ncurses, gmime, pcre-cpp +{ lib, stdenv, fetchurl, pkgconfig, lua, file, ncurses, gmime, pcre-cpp , perl, perlPackages, makeWrapper , debugBuild ? false , alternativeGlobalConfigFilePath ? null @@ -72,7 +72,7 @@ stdenv.mkDerivation { "LUMAIL_LIBS=$(out)/etc/lumail2" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Console-based email client"; homepage = "https://lumail.org/"; license = licenses.gpl2; diff --git a/pkgs/applications/networking/mailreaders/mailnag/default.nix b/pkgs/applications/networking/mailreaders/mailnag/default.nix index d74797dbc50b..1fa9c66c8ff6 100644 --- a/pkgs/applications/networking/mailreaders/mailnag/default.nix +++ b/pkgs/applications/networking/mailreaders/mailnag/default.nix @@ -24,13 +24,13 @@ python3Packages.buildPythonApplication rec { pname = "mailnag"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "pulb"; repo = "mailnag"; rev = "v${version}"; - sha256 = "0q97v9i96br22z3h6r2mz79i68ib8m8x42yxky78szfrf8j60i30"; + sha256 = "08jqs3v01a9gkjca9xgjidhdgvnlm4541z9bwh9m3k5p2g76sz96"; }; buildInputs = [ @@ -49,7 +49,7 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ gettext wrapGAppsHook - # To later add plugins to + # To later add plugins to xorg.lndir ]; diff --git a/pkgs/applications/networking/mailreaders/mailnag/goa-plugin.nix b/pkgs/applications/networking/mailreaders/mailnag/goa-plugin.nix index b2eccdc134bc..4f60135cca19 100644 --- a/pkgs/applications/networking/mailreaders/mailnag/goa-plugin.nix +++ b/pkgs/applications/networking/mailreaders/mailnag/goa-plugin.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , python3Packages , gobject-introspection @@ -21,7 +21,7 @@ python3Packages.buildPythonPackage rec { gnome-online-accounts ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Mailnag GNOME Online Accounts plugin."; homepage = "https://github.com/pulb/mailnag-goa-plugin"; license = licenses.gpl2; diff --git a/pkgs/applications/networking/mailreaders/mailpile/default.nix b/pkgs/applications/networking/mailreaders/mailpile/default.nix index 6bd0995623db..3cd02e7467c5 100644 --- a/pkgs/applications/networking/mailreaders/mailpile/default.nix +++ b/pkgs/applications/networking/mailreaders/mailpile/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python2Packages, gnupg1orig, openssl, git }: +{ lib, stdenv, fetchFromGitHub, python2Packages, gnupg1orig, openssl, git }: python2Packages.buildPythonApplication rec { pname = "mailpile"; @@ -39,7 +39,7 @@ python2Packages.buildPythonApplication rec { # No tests were found doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "A modern, fast web-mail client with user-friendly encryption and privacy features"; homepage = "https://www.mailpile.is/"; license = [ licenses.asl20 licenses.agpl3 ]; diff --git a/pkgs/applications/networking/mailreaders/mailspring/default.nix b/pkgs/applications/networking/mailreaders/mailspring/default.nix index eb946e267b28..f0ab5f148f14 100644 --- a/pkgs/applications/networking/mailreaders/mailspring/default.nix +++ b/pkgs/applications/networking/mailreaders/mailspring/default.nix @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { --replace /usr/bin $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A beautiful, fast and maintained fork of Nylas Mail by one of the original authors"; longDescription = '' Mailspring is an open-source mail client forked from Nylas Mail and built with Electron. diff --git a/pkgs/applications/networking/mailreaders/meli/default.nix b/pkgs/applications/networking/mailreaders/meli/default.nix index 4f3a1ef3901f..519448c3ade1 100644 --- a/pkgs/applications/networking/mailreaders/meli/default.nix +++ b/pkgs/applications/networking/mailreaders/meli/default.nix @@ -49,7 +49,7 @@ rustPlatform.buildRustPackage rec { wrapProgram $out/bin/meli --set LD_LIBRARY_PATH ${notmuch}/lib ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Experimental terminal mail client aiming for configurability and extensibility with sane defaults"; homepage = "https://meli.delivery"; license = licenses.gpl3; diff --git a/pkgs/applications/networking/mailreaders/mlarchive2maildir/default.nix b/pkgs/applications/networking/mailreaders/mlarchive2maildir/default.nix index ce13a4de8d09..ea10bf892488 100644 --- a/pkgs/applications/networking/mailreaders/mlarchive2maildir/default.nix +++ b/pkgs/applications/networking/mailreaders/mlarchive2maildir/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python3, notmuch }: +{ lib, stdenv, python3, notmuch }: python3.pkgs.buildPythonApplication rec { pname = "mlarchive2maildir"; @@ -19,7 +19,7 @@ python3.pkgs.buildPythonApplication rec { six ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/flokli/mlarchive2maildir"; description = "Imports mail from (pipermail) archives into a maildir"; license = licenses.mit; diff --git a/pkgs/applications/networking/mailreaders/mmh/default.nix b/pkgs/applications/networking/mailreaders/mmh/default.nix index 7d6254ed13cc..5fcc060ffbfd 100644 --- a/pkgs/applications/networking/mailreaders/mmh/default.nix +++ b/pkgs/applications/networking/mailreaders/mmh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, autoreconfHook, flex }: +{ lib, stdenv, fetchurl, ncurses, autoreconfHook, flex }: let rev = "431604647f89d5aac7b199a7883e98e56e4ccf9e"; in stdenv.mkDerivation rec { pname = "mmh-unstable"; @@ -10,10 +10,15 @@ in stdenv.mkDerivation rec { sha256 = "1q97p4g3f1q2m567i2dbx7mm7ixw3g91ww2rymwj42cxk9iyizhv"; }; + postPatch = '' + substituteInPlace sbr/Makefile.in \ + --replace "ar " "${stdenv.cc.targetPrefix}ar " + ''; + buildInputs = [ ncurses ]; nativeBuildInputs = [ autoreconfHook flex ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Set of electronic mail handling programs"; homepage = "http://marmaro.de/prog/mmh"; license = licenses.bsd3; diff --git a/pkgs/applications/networking/mailreaders/msgviewer/default.nix b/pkgs/applications/networking/mailreaders/msgviewer/default.nix index 3461b3b560f9..d3bb47a911bd 100644 --- a/pkgs/applications/networking/mailreaders/msgviewer/default.nix +++ b/pkgs/applications/networking/mailreaders/msgviewer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, unzip, jre, runtimeShell }: +{ lib, stdenv, fetchurl, makeWrapper, unzip, jre, runtimeShell }: let version = "1.9"; @@ -28,7 +28,7 @@ in stdenv.mkDerivation { nativeBuildInputs = [ makeWrapper unzip ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Viewer for .msg files (MS Outlook)"; homepage = "https://www.washington.edu/alpine/"; license = licenses.asl20; diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix index 0596cd350dfb..f7b1b990acb8 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 = "2.0.3"; + version = "2.0.4"; src = fetchurl { url = "http://ftp.mutt.org/pub/mutt/${pname}-${version}.tar.gz"; - sha256 = "1vf1ab3mnx7p4s4n4pssajj211s3zr4730bwgsjx9gxcnyppqclw"; + sha256 = "1m4ig69qw4g3lhm4351snmy5i0ch65fqc9vqqdybr6jy21w7w225"; }; patches = optional smimeSupport (fetchpatch { diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix index cf78da9a5048..104e0da9a81e 100644 --- a/pkgs/applications/networking/mailreaders/neomutt/default.nix +++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gettext, makeWrapper, tcl, which, writeScript +{ lib, stdenv, fetchFromGitHub, gettext, makeWrapper, tcl, which, writeScript , ncurses, perl , cyrus_sasl, gss, gpgme, kerberos, libidn, libxml2, notmuch, openssl , lmdb, libxslt, docbook_xsl, docbook_xml_dtd_42, w3m, mailcap, runtimeShell, sqlite, zlib , glibcLocales @@ -94,7 +94,7 @@ stdenv.mkDerivation rec { checkTarget = "test"; postCheck = "unset NEOMUTT_TEST_DIR"; - meta = with stdenv.lib; { + meta = with lib; { description = "A small but very powerful text-based mail client"; homepage = "http://www.neomutt.org"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix b/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix index 19b90b534efb..fcb92d3fcc11 100644 --- a/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, glib, notmuch }: +{ lib, stdenv, fetchFromGitHub, pkgconfig, glib, notmuch }: let version = "9"; @@ -19,7 +19,7 @@ stdenv.mkDerivation { installPhase = "install -D notmuch-addrlookup $out/bin/notmuch-addrlookup"; - meta = with stdenv.lib; { + meta = with lib; { description = "Address lookup tool for Notmuch in C"; homepage = "https://github.com/aperezdc/notmuch-addrlookup-c"; maintainers = with maintainers; [ mog ]; diff --git a/pkgs/applications/networking/mailreaders/notmuch-bower/default.nix b/pkgs/applications/networking/mailreaders/notmuch-bower/default.nix index 214f4311e691..2e2b7da9a4ca 100644 --- a/pkgs/applications/networking/mailreaders/notmuch-bower/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch-bower/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gawk, mercury, pandoc, ncurses, gpgme }: +{ lib, stdenv, fetchFromGitHub, gawk, mercury, pandoc, ncurses, gpgme }: stdenv.mkDerivation rec { pname = "notmuch-bower"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/wangp/bower"; description = "A curses terminal client for the Notmuch email system"; maintainers = with maintainers; [ erictapen ]; diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/68.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/68.nix index 47af8a202439..fafd2c72c889 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/68.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/68.nix @@ -1,6 +1,6 @@ # This pakcage is keeped until Thunderbird 78 supports OpenPGP. # https://www.thunderbird.net/en-US/thunderbird/78.0.1/releasenotes/ -{ stdenv, fetchurl, config, makeWrapper +{ lib, stdenv, fetchurl, config, makeWrapper , alsaLib , at-spi2-atk , atk @@ -170,7 +170,7 @@ stdenv.mkDerivation { basePath = "pkgs/applications/networking/mailreaders/thunderbird-bin"; baseUrl = "http://archive.mozilla.org/pub/thunderbird/releases/"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Mozilla Thunderbird, a full-featured email client (binary package)"; homepage = "http://www.mozilla.org/thunderbird/"; license = { diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index b7858ba14e99..faf4fd7b452c 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.6.0"; + version = "78.6.1"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/af/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/af/thunderbird-78.6.1.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "7f8fd3a1f0e869ee03a4f120c88b606fbe4ae35d9865394fccd291caa9ae7069"; + sha256 = "f6fb6e449dbfb7478b5faffa0118845a2e55fb09e27f6b4bc63c4d8abd2f5db5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/ar/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/ar/thunderbird-78.6.1.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "73e7beba4e5a2b9cd92ded3ee8e662be9a80d65d59790ed1d5401b5a61c8d147"; + sha256 = "33f0010135377291851e06fd43fe797fc331d93e018e4410b878ea7056e149b9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/ast/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/ast/thunderbird-78.6.1.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "890cda9e6a9582d43d61c9b4deb2241f46d34dbac5516d9a808dfbb472a22eec"; + sha256 = "a5b4e9007b68abb9100f757d62ab976a4ecd8e7f389f896411b9957ecc175b62"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/be/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/be/thunderbird-78.6.1.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "b951394def900c975b2796e47d948c03c59f0fde445f22d1b9a0d89ae8b7dd83"; + sha256 = "ed9846f9e06dcbc60b6dfb08814d19111558f91e96181b73338af8dc30b89ad7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/bg/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/bg/thunderbird-78.6.1.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "2440a8ea3a49d4fe7a84b0c6e67a98889bf98c5f828699bd980705c100a0e585"; + sha256 = "c45a472030b9c42931966a8f90e0d9de9364a4bcca721678090a6702480a1a27"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/br/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/br/thunderbird-78.6.1.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "74b48030e64ff509379dd92d08734804006a8cc6176c69e387e03596138c48b0"; + sha256 = "37cda6ed4d6296d58b18b8325eeeeccc24088029999c4146ce429ff131eefab0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/ca/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/ca/thunderbird-78.6.1.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "4b951a13352db2cc90aadf94c1e57bc5b40660d82dab855aa80751bbce9aa3b8"; + sha256 = "be91d650c2e8e26afe64373c8ad9213c9b3f903c0037ef9fe215ac4b46b2fe4b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/cak/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/cak/thunderbird-78.6.1.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "bfb2ebc8a6b376603b9e310ad664a099725a29183c67b02ee13ecf3eb9a3bdac"; + sha256 = "5dab8ad6ab718855237fa5b43ac687e117e7eaeabc1702fe3cfc49af2f62fdf7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/cs/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/cs/thunderbird-78.6.1.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "de30e9d948ade3c82b7ebd58a3bbed5e880abcdb2d9c58f8e64d9d3d78bb336d"; + sha256 = "a6c4afa14cefb505aade5a9d8b48a12d9d4f4823c8db7356eb635dc1c492f592"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/cy/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/cy/thunderbird-78.6.1.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "b7d0bb95acb861c453d8649673d9e582920a6df6a9662b8a6f996636d54c68c2"; + sha256 = "f45e222a10bdfe13c51a49e834d10f00320d7cd4093160d7b3616fce01a208ff"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/da/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/da/thunderbird-78.6.1.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "2c4765b34f1d63a9eae942531b7f489150d6850f68487565082ea18c94f3ad0d"; + sha256 = "618d582a161d7ee6e7d304e200486b0af7df6cb1a0d154de9fd5ed208e71ef07"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/de/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/de/thunderbird-78.6.1.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "e29280a519f4eca06d4e5862085d8fb8cefb9577918ba953cdc6f63ffc44a6ed"; + sha256 = "79f86cc42efb58ba5b1da6d99c4f17ecbeafe235ed6fe03d772d48e3a4f9f4b1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/dsb/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/dsb/thunderbird-78.6.1.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "d638be5a999fd1b287628b449235e9995169c06c2cf46d1f7e6de282bf4357b8"; + sha256 = "13a929d9848809c9e44fe6d564fdd796fd3aa87103f6c9cbe5797d73ba4a858a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/el/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/el/thunderbird-78.6.1.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "34cbbca7eb8ecd5078d52d429b76ed0b5334398040d6e00aa5b5926bf8eeaba8"; + sha256 = "fb520853ca5aac6380411e86858f58040369100ef1602452d0b1d12dafa4bd89"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/en-CA/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/en-CA/thunderbird-78.6.1.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "d50be05404a4b51e3a9c2fc4a73d75504f11e12a7ba7331ca43d5f078f462303"; + sha256 = "ca00e11b378e00a1c551b45608e8261ca5cef088975925030b1c3294f8cd6935"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/en-GB/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/en-GB/thunderbird-78.6.1.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "4d11d73b268369117861250f4fecd5c6d19a904145caaaeb7ee86c7eb9e63f9f"; + sha256 = "fb792943477dfb5210b071832474e27a66290af49ed3204adbaef301bf97b9a8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/en-US/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/en-US/thunderbird-78.6.1.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "6691e528ac3fc88a023507e1172d67daac235fa1fce97e75e6fbd7072a493e0f"; + sha256 = "442cd017c9aa5321b7f59ca165f4a687e3619d2d5fefcb9af3127d2d8d0a69f7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/es-AR/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/es-AR/thunderbird-78.6.1.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "2f45d7f6e42fdef4f8bb8ab815879157cd962c91afa352a35f8cbc3fcf52fd82"; + sha256 = "c3b14e63e75efa1411480a8fb9df4e5f57c733f1782f122514c324d2cb943cbf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/es-ES/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/es-ES/thunderbird-78.6.1.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "7bf50cefecce82e20c06441f003cc51eb7cc16d3a0e55a118213eee78e8b8494"; + sha256 = "f0aad6c895034cd01d55a9e17f3ec81912767b46b3d1db65da24884ee2dfe532"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/et/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/et/thunderbird-78.6.1.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "2b2c624808f75ae0d713ad37e9959ad518ae5702caa10845fb3aa8089e77bc9c"; + sha256 = "07b29082709f888febae991196c05fc3de3b87a5b7371000d002ac59870c7d45"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/eu/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/eu/thunderbird-78.6.1.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "3495821650563af2a62f36f928fb7503568de920211b9ef2f21904884d4fa3ef"; + sha256 = "0b49e505114f24832f337d265a9bf092d25e653790c595c698f3e11a82fd11d3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/fa/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/fa/thunderbird-78.6.1.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "90b9ff389550e5801bc7ca7e1e4d7db5b281081bef2d0d30b7c2e9799e8cd0c9"; + sha256 = "b333b2a40b4c57ed00c9833bb32a88a72a4db3e4b376db07b84fc146df9fc6c3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/fi/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/fi/thunderbird-78.6.1.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "cd5819b7ed9e3017cbef8e1ca33cb92e1804fc8ece9edf6a74133db90b61ee6f"; + sha256 = "5e484dc76a50f77fbc24fac3c8d11f2b4501a3488b8dcc7cb5517b263833966c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/fr/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/fr/thunderbird-78.6.1.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "82b382d1ea014a26a397c3fe06c586732df756104533c7450494ad43b11e43a5"; + sha256 = "63e95323a8b93831516ce0015a052d316a6d501f6c7a4a0b1bed6dd367367aee"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/fy-NL/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/fy-NL/thunderbird-78.6.1.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "3b4b0c4a23ad63f2d152eb8741a30fe4092c2d37d1bbb2cd56eb75c85d885f4a"; + sha256 = "d05e85a3fa9a212160821bcf26cde73eab17ddd1f879c4e1e5d46d28f27bdf17"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/ga-IE/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/ga-IE/thunderbird-78.6.1.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "093b76080942d3e7584f7948dc65003c20878e8bf4bec4808669f012183cf97f"; + sha256 = "475f4176d529afcc25b5480762ac0cfddaf61e0bd95fffc3761c152b10094ba1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/gd/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/gd/thunderbird-78.6.1.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "a726c67ab384b58c3a1ff84a3a1fe95f73219996e7e26f5dcdfe5dda30d34cdf"; + sha256 = "13bbd007cab49ab1f37862392e3c02c5418deece6894fb2ddb1f15e9ce811bbf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/gl/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/gl/thunderbird-78.6.1.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "b731c512c61ece7b811d74e5f40cdae742207463799cccfa9906b43f58d5f2fb"; + sha256 = "8cb71820ff19c7a7c9186aefcd80cf27d0ace5331b320e2e4660d982921b6d96"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/he/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/he/thunderbird-78.6.1.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "d15591239235d2f7debc8454e65c1e67101b8f32901fcc7543025986c524b156"; + sha256 = "12092b25ae77177bac52dd0555136b041dc409507401566d8f0f0973a59eabce"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/hr/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/hr/thunderbird-78.6.1.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "003d02062016c8f13038e61f189b7ebb75753ffd9a55879e1f8fd3ee1c1f2a2f"; + sha256 = "b9cff4319fb62af844d278c93a649b85c64469aaaf9881a6788aa25498afe5ec"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/hsb/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/hsb/thunderbird-78.6.1.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "2325fd29cadc8c824ddd90ba7d0975ca42c2d9964c62269f0361b5318274155f"; + sha256 = "3bb8f6d9989270197e5b99fce18e2558daf19317b47bea50d8a30a7934c68859"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/hu/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/hu/thunderbird-78.6.1.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "15650cc17e75780f17927ced485a03a23dcf771dd7d8343b28acd0ae1f0e1f9e"; + sha256 = "253c65d5a1a0b8780f8add3fa532d10290d7aa86e99efa8ed1c881f6ff76e4ec"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/hy-AM/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/hy-AM/thunderbird-78.6.1.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "c20a4f0ccf2bce093986e3758784190215bf19d31469f6bb51f5a494ed54fb03"; + sha256 = "8dd61e4cbaddb8f97e466402e474adb6c22f2ac9b3d7ddeac53aecbb21ac1129"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/id/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/id/thunderbird-78.6.1.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "286eb0484f9a4b9c2d24dd836abcc07b00218a6c870535df1e4947482de1a79f"; + sha256 = "b03444c14c9f73dce2620f1acfa975e165b2ee33d27a8bf359dd3b3a0a22199e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/is/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/is/thunderbird-78.6.1.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "b291df9b76800c56424ed8c9ad8e55be68f2606968abef2eb83ee3c86d56fc6f"; + sha256 = "4d4e355365b20561b50f72027c160c2d0d3742a09654f6a2b5db80af4aa0b794"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/it/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/it/thunderbird-78.6.1.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "51d112544b67c44d82b4d0f54bd35f0dfb485917ad72c09ce6136a8750e58eb0"; + sha256 = "1ea72c07428ab4cff56541b6b18e571f1e0f0f22bd161071548d38746eee1015"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/ja/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/ja/thunderbird-78.6.1.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "931815f8f2e0e3a9e3b9eb150fe8f0112b26537b02cc0c0c0dce9c14c1959ac9"; + sha256 = "1983ca2ffd9a2c53a8ac46ee36757375f53d2f6c2ac519ce7fde004e11a6f48f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/ka/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/ka/thunderbird-78.6.1.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "d51b241842f8da9d6cfc8307b11b73fe813d46a7d6cd9651c46e1af18201e89c"; + sha256 = "339b7be89dfda68efb30c6f72036f94fbaba9b230977b27506edf9f1e70b572f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/kab/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/kab/thunderbird-78.6.1.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "935d2e485aff93ee91c20710c286cb591379f5fae1a34851454707710c75df88"; + sha256 = "5163897a19f9303a32dc69ad6697b458040ef09eb5b1b954617bd9833d66e491"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/kk/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/kk/thunderbird-78.6.1.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "4534b9c69f44c197997283f455d4b692ff96df122e9d633288d2874b8657833b"; + sha256 = "aa93b34afbe38389722959e5e8bfe788d158b2a186768bcd1a3469c5ab728d88"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/ko/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/ko/thunderbird-78.6.1.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "bb083026c53734d3956126a7bc11f1e02e122e463b0f8cb72757cc7cf94cb911"; + sha256 = "06fac9843688e278a56d3bd4d650cb9f2a369c09343663cbfd79054c80a24dde"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/lt/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/lt/thunderbird-78.6.1.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "a9cd61089e2898a3e27cd0d10d9295c295b579324a30ff58f7500c0dd9fa1977"; + sha256 = "6bb215f78165bd0377c983c544a84e4bd41053af475a544e61c78bb2ee0272b6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/ms/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/ms/thunderbird-78.6.1.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "f84ac7f403802271c2730979dd7da85ec976d970aa39c1f50215ba1902449245"; + sha256 = "59b93cc98131bd462279d36d2449176d1c4f546b4512a7316e88063ffcb1d66a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/nb-NO/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/nb-NO/thunderbird-78.6.1.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "98fd61d91149b26750f06e12f64605ffe04f243d96c5ead0d11a2a600c4baa7d"; + sha256 = "1d6f1b6d8db512d4ca330e4fd303efd2165cd7dea4055381b85d5c57534ad45c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/nl/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/nl/thunderbird-78.6.1.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "44dbe77dbfb8d74c2c79052e1152e0da0a751d0cccea5b643c5019704454b0ac"; + sha256 = "30693fe9a43221a3afe5755257e0dc0820fdbdb6fc6fcff2ae39475a70a8f9dd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/nn-NO/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/nn-NO/thunderbird-78.6.1.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "e88e668c434b5b2469ef8268985015735ba5ff8639a1c670d1c9d42e1dd0b30b"; + sha256 = "dd27afaba1b3354a8a865e297e107f7717a00f83156c92b22ee18a08d6b2ba2f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/pa-IN/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/pa-IN/thunderbird-78.6.1.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "388b87f10db2a0dc9c73580ccc5248c492d6274766e4350981f8289db39c95cf"; + sha256 = "90ca962ae6585842191bdbb8495b37b10fdd0b477760565369457e1945dcab6d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/pl/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/pl/thunderbird-78.6.1.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "cc0e7c7bf4fd33ab255b1bcca808e6ae84c9575b3555228f84da8dad83b02d2a"; + sha256 = "1eb445495e9ff8b4f18eea7ce86655a6470b1d33b524c7eeb8938ecf030f1f20"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/pt-BR/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/pt-BR/thunderbird-78.6.1.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "a8b4b7db5ed2a45af8bc595c85f15f9ea78d2a790bb62a9e419b7b2c78616a66"; + sha256 = "2b45cf19695837209ddb6e079a1c05d449962dee94afd5bfb62ba22124b6eaf9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/pt-PT/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/pt-PT/thunderbird-78.6.1.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "c4504cebf2b2c831ec94029605b3068ab1cf220d3cce33b085d658c20fbf4dc4"; + sha256 = "bf4d215bc674ffdc43f80a63f8a19e675209254e08e843b7ef447e488ce416ae"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/rm/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/rm/thunderbird-78.6.1.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "b1be40d4a3f6f26c9a06e3179244ae2ad9c9c259e76cdd695cb3f881e43de919"; + sha256 = "aa9ac4a13278437b400035205baf92556e09d3a333a8ce9a3c3df7b241851717"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/ro/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/ro/thunderbird-78.6.1.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "305ecbe685a107461aa3dad94e7b74d9f32b343a3d9813cf7d570e0919d5d931"; + sha256 = "edf568ef69d3b8444469d00d9295e377d4b7e8e1df5257b6a13b83cdc4c18b13"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/ru/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/ru/thunderbird-78.6.1.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "4d49f15c2c9e69a6156e89017c71f5cbda3114940bfdf273efd0e82dfcc3457b"; + sha256 = "22b27fbf138272264ee643fd6b55eb803fcce68682150daedde303ea6d297062"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/si/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/si/thunderbird-78.6.1.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "9d108c3b3d54d12c5008f0d77c4a6741ab94c7fcfec1cb4ff59bb2730938d01f"; + sha256 = "477906e0205fd6961a0b2ab2bff27577cc02ee3bf90c66329221b666cd726ba2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/sk/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/sk/thunderbird-78.6.1.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "a6e51284b554fd6a8970757d519870098baa26d3fd23561e335105ec5bf836ad"; + sha256 = "df25d31d5fc75ffb4e961f8cdbde64183cc507efb2833e58f13ea9e3b849105d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/sl/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/sl/thunderbird-78.6.1.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "99b80fb6efd174beaf885e3d5451557a353693158ef147c931aa4d8560966122"; + sha256 = "4a2e66d474f2a8fee6e7a7158145c9474f9f03173e9b3e0c78f906ba612af99d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/sq/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/sq/thunderbird-78.6.1.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "5bba738143daec5c687fedf566052c9d387a87520e510acdb963ae80c5d24b3c"; + sha256 = "fb602510a4b58e7a4574987638794a423991a147284babd6b40d3a8b4a859b19"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/sr/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/sr/thunderbird-78.6.1.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "c18424e503d87ee7ea940a4d9551b9ec51a90b76b73180c89541872dbba27674"; + sha256 = "12e203abd18020c9e22eb0142c916d084bc61afe3be55bd0555c1aeb8d11f086"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/sv-SE/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/sv-SE/thunderbird-78.6.1.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "d0eb7a8a1a6248e40142a62b61f9fe3e78bb8c277c9734d821358e0a075d5184"; + sha256 = "deef0110e1157c3a7521d1671cb54b8414d09b6cc2898f2bd3ba9f60e184ecd8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/th/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/th/thunderbird-78.6.1.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "04d3465fb8afcff051ce9a578901f3e9a8fbfab65f31cd7245b0b9321daa102f"; + sha256 = "2c963e0e3804b0e93b6e1c11d09974049f134c36f55f5d57f57449bdc6008326"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/tr/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/tr/thunderbird-78.6.1.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "46acaf32f9f035dd320d4e28d6b36ef8ce2d8ff5f753cfb6a7b02f37e8edb09f"; + sha256 = "8e4daca1bb4d4f93fa6f834c8d8269b91c0fb07f5310e7bccdae202b868c9758"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/uk/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/uk/thunderbird-78.6.1.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "60b0be6207532039958f03a81e5fdf070d15cd624a0583c4d8e87e0528ccd240"; + sha256 = "57c1aeaeae081a253557e558c79fd8f85591495a56e9f1bec9153dd51214abf2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/uz/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/uz/thunderbird-78.6.1.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "070963c90b858e9ab75cee1490671ec3f9f46190896eca554fde0ced205d0d44"; + sha256 = "6fcd73f96acf99decaa639cb0d1adf99d65be2dc75b9ca8ba2d15308ee524990"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/vi/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/vi/thunderbird-78.6.1.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "9040ed756aa19c0e850391bd9fa148eb0fbca45b84eea888c874a9c93ee0428b"; + sha256 = "108b21717a42c94ea38f46186f5ee3d570da56d9bacfb4eca9d9b14779e74237"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/zh-CN/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/zh-CN/thunderbird-78.6.1.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "caba2b9f3fabf1231b947c578c9761a241178f732c110fcd4cf620146ce5002b"; + sha256 = "09546642bc79c74a965e4700957c295527b7462d64744a651d5575127ce5c944"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/zh-TW/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/zh-TW/thunderbird-78.6.1.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "b48378e3833a0710bca60cb9c87396f0163cf9cd6211725ea711e116557e5abc"; + sha256 = "25f082fdf2051ceda74b12f3c6da76a18b66c928e204e9ce5364545540eee2a5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/af/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/af/thunderbird-78.6.1.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "b4ca4cd2535fb02c059db2783f2428634373730217d420530d7c2f6441191fe7"; + sha256 = "cc01b60e44a2449458af74acc1774266e7cb44ed4eadb9cea766195974694676"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/ar/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/ar/thunderbird-78.6.1.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "29c287ff2ce37f3d4c23770f85aa220d7b9265df2b188aa38730fca68f8ea40b"; + sha256 = "a51eca5032e0beb9dd16bb18e1efe3dde8343ad964dabd25457fc5deea61f858"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/ast/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/ast/thunderbird-78.6.1.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "e1267edf8d35bfaf1f2bab751b5235855ce9ab768acc607ff308021dc917cd8f"; + sha256 = "b6fed93d30de5635539e2a2f38e78b6e90df82ed79e9e3190f60389b598b928b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/be/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/be/thunderbird-78.6.1.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "1359027429e2c1ed2535f0878105bc0485f52b569aa342246d380acd1df13e4f"; + sha256 = "7d8e58062d885a35be4cb5e66ed9e1752ba7d1b21c615f255766cde5d737fedd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/bg/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/bg/thunderbird-78.6.1.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "4e2d1a02d6ef6ee123c68db8ff299037cbfa017334599f5e3ac7114ee3e8874b"; + sha256 = "daa18d443e9772f5d956f2b1aceb2186a20b39f18376d4a0ca021adc2436426e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/br/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/br/thunderbird-78.6.1.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "526e73827d595452c40bcd2066885d41a9497bf7d61043a5236d600cb9202e94"; + sha256 = "3d9fb8cb96a670225b30f898b83d7ceebf9a43b639e1e60d38478c2d9e1bb8f3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/ca/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/ca/thunderbird-78.6.1.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "73605bd265262a8f538b7d15b26915ecb030a76824a09192e7b2e897ac5affe5"; + sha256 = "624f313e09d8ec67ec08ee57a4ee78105e05d378c474d1cc005d12061e55f629"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/cak/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/cak/thunderbird-78.6.1.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "bbdcb9447938bc2ae8b4dc0a5a250cf82e316c7ef56abca2962f871abf9d1d4a"; + sha256 = "bd483d57306326d61b8bae407a4e4fffca4a6f6a6f57b6ebc4ee9f1b0bd2b38f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/cs/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/cs/thunderbird-78.6.1.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "4052bda928576a30657dc4087bdded6ea2339e271bff36194bbd37e610f55d13"; + sha256 = "0262e549c966460469ac870492587c66114bdb96ef92e48ce50d9f28ba3f3e5c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/cy/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/cy/thunderbird-78.6.1.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "d3b337be4b64903d075f8e2269ff5f88831d5a88f24a56deead19ea534867d10"; + sha256 = "3a22886e71d3eb8fa6aa683322db0cf19f14b80b4e97a2226dacfbcce7aa0574"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/da/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/da/thunderbird-78.6.1.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "96080cee994410b59935c0baaa4d8bc0c592d1654242b00540b3b1997398951a"; + sha256 = "5c008c00784ac37ecf56fe24f38952b111d531936de00f47034fbc5a46ba2158"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/de/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/de/thunderbird-78.6.1.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "46b4c8b867fbc4f5ed288f0c503a776a256c229799601d7810ac51b73685d6a2"; + sha256 = "f3a1f1bc1b8ec9701050440c9312440a29392118cb680d6485836197c07ba44d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/dsb/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/dsb/thunderbird-78.6.1.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "f1b8576a1c5ed9dea2b92b10b03e2f16e17207c1f5dce4f83556b11a846de754"; + sha256 = "fb4df74e6c293123fed6f1b7fc776cb2e1009f8655d27acc9c0cf6d5872190f8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/el/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/el/thunderbird-78.6.1.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "01d559767ff8a2562b81c7e42007993065b4d46319fe4890e157a2450a34875f"; + sha256 = "452ecc706867078d54190da0e25d346ee120ea4ebd6be6ac494f67709ffd1975"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/en-CA/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/en-CA/thunderbird-78.6.1.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "99571e51cc28c9dbc5aab42fa5d5f7f680fdfa287f7f8b96c5548949155735a5"; + sha256 = "941852cf3463df6d80686b1808f341a2e21206dfebcbcfd6bdea25adbae5580c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/en-GB/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/en-GB/thunderbird-78.6.1.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "e515ef917801e0fa67b9d4821f7185b21e36b35b7df8bb43b6a917851bcae753"; + sha256 = "83e49ecdebe816c02244d6c5db84ccf9953b2b7349e8e880c3febca7de7ffa09"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/en-US/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/en-US/thunderbird-78.6.1.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "cee59a70210f9fc8672a914179c957d67556b068d8ce9387c01636e89e54aba9"; + sha256 = "9a93ebefdca24266b55568538d834e139da78f5aea9f3e264c4feb40f8c4f820"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/es-AR/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/es-AR/thunderbird-78.6.1.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "e30605e7460ff80a1c26107d0393d7cd12ecfd95d55f256db6f808076d03c53d"; + sha256 = "88e1c5c7b4bc77005bcb384f578a99288bddd99877a10e95920a994767537f05"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/es-ES/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/es-ES/thunderbird-78.6.1.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "0e2301dd592c06a2628aeba21f38fe4b422ed2690531c1487e958c6cea1b236c"; + sha256 = "6ef1618adf242f6f1aad30d4d872f85d0135a3a86e3783b6ff5bd742c06e6806"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/et/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/et/thunderbird-78.6.1.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "d15684c68e9bef8902e9dcdb87bacda263953cc93ba7368b69fd318739b58fdf"; + sha256 = "701e0fe34fddbd85369550e3ac6aa099d93aff19207c750b74f0ea36e86857a6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/eu/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/eu/thunderbird-78.6.1.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "4144e7de84ce0a6b39d8c29a96221532951c76679a8ac5a85aa07a62b99680d6"; + sha256 = "08904babb0a69cd3bc19575d8e533804525b5786e1aebd3236785e7c574b113e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/fa/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/fa/thunderbird-78.6.1.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "028ac9a6ad5d6e7360e597d961a7422238d96cda848042975ececec6f3a06aa3"; + sha256 = "083c128daf6fd05d325282fb7c4648d6cb7c86209a6b940a07f2df730ca25906"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/fi/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/fi/thunderbird-78.6.1.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "ee5adee4c249edd9b61fcacc0a2150d4471a7897aa1057fe3ea04e16729de966"; + sha256 = "ffe71bf498ba41b5fc97f67a99e838b4fafbe383333b0dbc4ec306b362529574"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/fr/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/fr/thunderbird-78.6.1.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "d5d0190541184198a6c628b3c79c7dc96ec911ab195ed3419f33c4817d401e01"; + sha256 = "0160e46be32847dd1c4e597bd1dbd0734aa32a327df93b6d7266879b6c54733e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/fy-NL/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/fy-NL/thunderbird-78.6.1.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "c7b8ee6e8b66a6948f80f10e1ebf2d61c70e5be439f197953bff91f499fa8d51"; + sha256 = "e3292054a4c7d10add34480a828f35b09e103277ad754d4e45869c72a662ed5a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/ga-IE/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/ga-IE/thunderbird-78.6.1.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "32a1d8ded34b26136b2884d24f31c5b08c965c10061758b87df9510395f8dc7e"; + sha256 = "071efc85f1461c2bfee5c77222c117363b0f37714c25c65f0a6d1637df791aa3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/gd/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/gd/thunderbird-78.6.1.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "a65ff1d77deb34ed46bb84ab480afad20fcf417f39c714021ccd83b4a9d3212e"; + sha256 = "731768809717bb73432deff720252af855e71e7f7743f7316f60fd25f0ce046a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/gl/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/gl/thunderbird-78.6.1.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "87660c561fc92396c1eeafb82e907fbc2670b6649e2c7f0bdc73714fefa3de55"; + sha256 = "0d7f6686fc184f0c0efe3a44793e511c8e229265bf43aacecf766a7189ba323e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/he/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/he/thunderbird-78.6.1.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "1e5c7324c57de9e5e2a87dceb1d41994a74f55e108e8d97161e0fd428f6b197f"; + sha256 = "dc2dc901c86b5b0af5612e80ea8bb145e33670fbfe338599e3995c43115622a7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/hr/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/hr/thunderbird-78.6.1.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "cad204c16e1b8ee26809321aa27c73220e64bcd86d261474c636d088ade006e3"; + sha256 = "c720e60e7e0c6ea7bde01111a0bee647c05c17f6fd05a7e87d5733a55b4ab7e8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/hsb/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/hsb/thunderbird-78.6.1.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "9d3e8988b5e8a3f089a0334304e255a716bc24f4ec9b08dd6594b7ddb4daa3cd"; + sha256 = "f96276ffad03bfbe04ea7424e9d2fdbd2f3af89da54f2f48e5a36267f8b6a26d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/hu/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/hu/thunderbird-78.6.1.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "f46e9d49a74ccb2172c78e6e149149ff49c0be7c93336c62f8c17b30a1b1d15f"; + sha256 = "2376d64c5c2ea53ddf07bac4712e8375d91dc92e4c22eb123d6bea4258f5c194"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/hy-AM/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/hy-AM/thunderbird-78.6.1.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "f3f7e033489907339055d0ef02abf4a423434248b1a10623736fdcf09a3edd79"; + sha256 = "31a4d4fe82eb5b1dfc949728c9fc386b7a8f64a3c31428aafb58bd3eb3439253"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/id/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/id/thunderbird-78.6.1.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "581cbae2f96a616d29d30eda0dad30992eaa7fe71f65c20af10f528d130d83d1"; + sha256 = "c47d68876d3dc1789cfe921ba05096e45351c8df9bfcda01f9d5d7b40c484cd2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/is/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/is/thunderbird-78.6.1.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "8653b1e05517a723a4113995e0e69a73fa59196f5625e2c1b0e51d9d60561646"; + sha256 = "7bf6cf429ffaa4567180c56033666287e10c8a09478a077ba1ddd9b94f13d048"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/it/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/it/thunderbird-78.6.1.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "98faf75b5216cc75c2348962769fcdaa98ff59c4f4870b44cb6e7a69b7b5e9bc"; + sha256 = "ea1659937f1a9453513c3ce92e36fdf8c194dd1253bc723c4e0e0c2797c97a3f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/ja/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/ja/thunderbird-78.6.1.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "ad34916c36ac06eec4c1a900ff33639c6238e01c6426693261433b9bdf44ea91"; + sha256 = "c6fc0d5fa9d6eefbe8a8d867b96c1f4230ca3a8604c83eb963330212a6c8d633"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/ka/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/ka/thunderbird-78.6.1.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "c3468772b8667784814f6d323a74aef24f561cf3fbd2c5dfbfed16f73e7e7c6d"; + sha256 = "d05682cfcd90fc8072890e63fe3b9817b57759d0592876b53dbb1a1e9d024fa5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/kab/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/kab/thunderbird-78.6.1.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "1ba665c91e38df62809a601223238dc3c34a50c96e42e5792b145eb9aed3aef7"; + sha256 = "74a8edb8be388cf7a32904a123bd4bf6f98fbea229327eb38843900769dafb2f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/kk/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/kk/thunderbird-78.6.1.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "651fda1baa62acfae3f13bb65096368719461d206ce45b84a3ff5540e09d9e24"; + sha256 = "b4c1c9e4e7107ea47d5a4c271b581afd98be4f04c6fe9d427f30e7bea4d70fbf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/ko/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/ko/thunderbird-78.6.1.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "49b82df2eaa66e658b4ff0f84af7b128a92eddce7e9ce129f0f28b8239367967"; + sha256 = "de1d69f07f087fbbe0b085fbcf57fdf77baea36f09ad95594e9f3eabde835365"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/lt/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/lt/thunderbird-78.6.1.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "6d263e236457576a0e853fd0b00711182c34c32436f65c8fc952aa2810fa500d"; + sha256 = "a2b4dafb34e35da9d7ad939fcd00c1d8730aba99ba71efb1c62dac95cb873209"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/ms/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/ms/thunderbird-78.6.1.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "45b050930b8357e3a988701d46234ccdd43ba7b38e56b88d157dee6309c375c3"; + sha256 = "b8d998101f30ae03a94e6b9c802d41d0c7afe2f837f92be7ffb9ac37998c1ab6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/nb-NO/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/nb-NO/thunderbird-78.6.1.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "23760a375705d8c3d22aaefab60c9a761fe73f5d6c97f3a3621312ba362f77ef"; + sha256 = "5b2b419b1a79ff1ac28af11a9649a5f68c0eb06a813687280a8d01edf09db4e6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/nl/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/nl/thunderbird-78.6.1.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "8f006195886d26a519363c1a61940a53388952a67bae4fad07de50ab24ee21c5"; + sha256 = "428e422214e706c5cfcbbcf2bf1e9190168d9cbaaf7a9aa94dfbe078ca1fa38c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/nn-NO/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/nn-NO/thunderbird-78.6.1.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "85710ff8542c6d592a939a55300040633f5b8fa8587f5c6c0ba0c3c2c7e5e62e"; + sha256 = "0fb80dd45a0f7ddfcfe55d7f99d47279a083a4ca6d813d3791c21c14c759b1fe"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/pa-IN/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/pa-IN/thunderbird-78.6.1.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "cc1120713915ba43b74e9a4daa5814cf83b32317bc1503061c233e5fe28f8214"; + sha256 = "d4e17383fd04a300b416a291a1b50071284593e635c5c4cb101362dbb1602612"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/pl/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/pl/thunderbird-78.6.1.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "bf3da9722d7c9602304f64c7b11aba83cb899a23c1ddd179d5eb431aca23301b"; + sha256 = "c76deda25f28bc43489ef5c13c03f95c52c49b7c58311ea173c853ffe6de0a06"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/pt-BR/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/pt-BR/thunderbird-78.6.1.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "0104d48b2de1e26e3b66545a76b7892e2b1b17f56ebf8558353e031fb8741614"; + sha256 = "e7a29a78acd5a7daf2366f2b79f7a51df37f19687e84213de61af2065a011e8a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/pt-PT/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/pt-PT/thunderbird-78.6.1.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "b376bc3cc3f87484c9f976f30a3049bd4873ec67982574ec570c5c96d7643285"; + sha256 = "23cb3cab0228b1290d9315b2416940293df21a53231726937af133a20a102a7c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/rm/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/rm/thunderbird-78.6.1.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "d68e60b06b03b5313a1ddc42464ee5a3ead106655860e1d2c359802875276778"; + sha256 = "0c2175e117964deb87949a3047ce72a11ba7781581f6dcd583fecf51680a1573"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/ro/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/ro/thunderbird-78.6.1.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "051c01b3e2f69258e1d44599c6c485785c1624a67fa6548517ec242c69bf47fa"; + sha256 = "3b3395c39fa032ced0af7508c20a24341b1e893b26ac6430dfebd771ed86478b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/ru/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/ru/thunderbird-78.6.1.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "db0f48c765e7ec9c090e1d5f43f42faa5ac6cc9e4d593dbc6b8ff6f8f7210027"; + sha256 = "9933df6138ccf8042e82181e629b97166f7661d26dbeb524d0954ac13c9795be"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/si/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/si/thunderbird-78.6.1.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "fc104d206779b8b909f645a86151b193da0792c9af6360fbb4933d8224f23bb2"; + sha256 = "b50d48a71acd7c399877c5b6507bd0228c3ca88b3f7ee57748167d579d76c2a1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/sk/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/sk/thunderbird-78.6.1.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "d08d8fe02577ad931020fdfd45b673fd2b71e41d66c1532b8025012e493c869d"; + sha256 = "9a84aec070338c33eec3e617e19f7452c9436c4671cfca6374b45c4d146b7258"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/sl/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/sl/thunderbird-78.6.1.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "6907401bb3973911ece57b9b3bd56032b02c2c140ab79ec554f4574a7e2121cc"; + sha256 = "e8398068668cad4f0a0070d2545523c6d3cce2352e753355e8a195a90b3daaed"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/sq/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/sq/thunderbird-78.6.1.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "bca13f569b5cd0e6a4bac8ae59a8f1b228010a95871763600080473f45ffe5a2"; + sha256 = "91aa97a9ac1951bd43a46e7c2b36f7d865d307685b20c5dabe48c83714a82bc1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/sr/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/sr/thunderbird-78.6.1.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "df9328979af4c36d553992e0928d63a6cfcf0a54541e091fe7bb57e2e934057f"; + sha256 = "ef6b30e33e1ad8f771ef4b5a76305369e5cfeed47982a65996c9ceb23409f76a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/sv-SE/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/sv-SE/thunderbird-78.6.1.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "a310b66e76a2062354d2ec10dbe0827188610618ac87f866010b418d26032a50"; + sha256 = "48b9733a90ed561d7439369c115d9a2778bfbe83222e786564c98f7c5396de89"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/th/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/th/thunderbird-78.6.1.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "efb37f15a311d2c66678f42f13085e77eaf8819b2fe16ee52e3410dde5e85bee"; + sha256 = "9759c011a43e0622d4a42ac3462039d70eef678f633863ed24f3cb5736b4b8ed"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/tr/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/tr/thunderbird-78.6.1.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "4f9f9088ab91ebc3e4e022ba77cf8c168ab961c73317fccd07e987e38ec6eb57"; + sha256 = "5f9e153ca23c3ff3b9bcae816176cfb4c89845a05481d98b538254603e981896"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/uk/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/uk/thunderbird-78.6.1.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "d9c527045270007c74e84d9f77ab6cbab2f07112d8688757920f5adbc5bbdf1d"; + sha256 = "cde508d6b9e7590b50902afe6497328cf087cb7519ea4df2de0a5d47ee8e6034"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/uz/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/uz/thunderbird-78.6.1.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "9ea90845e8668afff622f412f571b59e03e6c02d49a4e47cb99ab93f5da822dd"; + sha256 = "0a533d7788c957aab3615a04eb0bc6db12acf92d4ccdef5d1763f0e8bf4f3dc3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/vi/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/vi/thunderbird-78.6.1.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "ccf4bd8c6269fb8ae15413923d556ecafb808ef205688dfb78379347a5bce5f4"; + sha256 = "4e30ead1cf49a7716c25759fd5e84efe3edc8dd5722367d50417f2b28e3fb376"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/zh-CN/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/zh-CN/thunderbird-78.6.1.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "22f0b4a72f995a9936fed178138d3e0c40fb3aefeda989c9ba83fc82a4296fcf"; + sha256 = "c673aead55f3762b68a9c692d422d61a407bca31cd9dbfbe63d8ec4292c24ed8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/zh-TW/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/zh-TW/thunderbird-78.6.1.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "b8c8633732641b8ab87bfc2a2867a95b817ce6d0fd0e8f569221bc51ac23e849"; + sha256 = "9c5d7cc03df92efa4be3dfc2f9521f77253fba4abd961a21e4d20ac19495244e"; } ]; } diff --git a/pkgs/applications/networking/mailreaders/thunderbird/68.nix b/pkgs/applications/networking/mailreaders/thunderbird/68.nix index 60dc12054841..ec26384261f9 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/68.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/68.nix @@ -327,7 +327,7 @@ stdenv.mkDerivation rec { gnugrep curl runtimeShell; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A full-featured e-mail client"; homepage = "https://www.thunderbird.net"; maintainers = with maintainers; [ diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index 66d2667e7ed0..ab4078d6a0d6 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -73,13 +73,13 @@ assert waylandSupport -> gtk3Support == true; stdenv.mkDerivation rec { pname = "thunderbird"; - version = "78.6.0"; + version = "78.6.1"; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; sha512 = - "0hx9gg3ngpvgshrz9j7ni4kh3chadqd5w5fpywjjw4naj0k53d0i9jjhq4p6fyvf6rb2g825ibqq794lr9drn6nrfndh5w1yn5lw69n"; + "1vzka0msy6gqyxgwyp2dknp6rmgzhcjsyq2hf798wf4wrb7rrrsyrgqrd8skss929wakda0slqng505lhig79za7wyyh531f7i9qbv7"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/mkchromecast/default.nix b/pkgs/applications/networking/mkchromecast/default.nix index 34f5be71ef35..b682c9e7351a 100644 --- a/pkgs/applications/networking/mkchromecast/default.nix +++ b/pkgs/applications/networking/mkchromecast/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , python3Packages , sox @@ -75,7 +75,7 @@ python3Packages.buildPythonApplication rec { --replace './bin/audiodevice' '${placeholder "out"}/bin/audiodevice' ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://mkchromecast.com/"; description = "Cast macOS and Linux Audio/Video to your Google Cast and Sonos Devices"; license = licenses.mit; diff --git a/pkgs/applications/networking/modem-manager-gui/default.nix b/pkgs/applications/networking/modem-manager-gui/default.nix index 64b1be363f34..2b4dabbedc5d 100644 --- a/pkgs/applications/networking/modem-manager-gui/default.nix +++ b/pkgs/applications/networking/modem-manager-gui/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , pkgconfig , python3 , fetchFromGitLab @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { patchShebangs man/manhelper.py ''; - meta = with stdenv.lib; { + meta = with lib; { description = "An app to send/receive SMS, make USSD requests, control mobile data usage and more"; longDescription = '' A simple GTK based GUI compatible with Modem manager, Wader and oFono diff --git a/pkgs/applications/networking/msmtp/default.nix b/pkgs/applications/networking/msmtp/default.nix index bfa98b94d0a8..468e65cf4d8c 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.13"; + version = "1.8.14"; src = fetchurl { url = "https://marlam.de/${pname}/releases/${pname}-${version}.tar.xz"; - sha256 = "1fcv99nis7c6yc63n04cncjysv9jndrp469gcfxh54aiinmlbadd"; + sha256 = "1W8GXXEUhunCNGGFFaAqSKSNq0BRs08+EI++y2+3c7Q="; }; patches = [ @@ -49,7 +49,7 @@ in stdenv.mkDerivation rec { chmod +x $out/bin/* ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Simple and easy to use SMTP client with excellent sendmail compatibility"; homepage = "https://marlam.de/msmtp/"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/networking/mullvad-vpn/default.nix b/pkgs/applications/networking/mullvad-vpn/default.nix index e6f5d6ac4ea2..8b78c49a2f57 100644 --- a/pkgs/applications/networking/mullvad-vpn/default.nix +++ b/pkgs/applications/networking/mullvad-vpn/default.nix @@ -80,7 +80,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/mullvad/mullvadvpn-app"; description = "Client for Mullvad VPN"; changelog = "https://github.com/mullvad/mullvadvpn-app/blob/${version}/CHANGELOG.md"; diff --git a/pkgs/applications/networking/ndppd/default.nix b/pkgs/applications/networking/ndppd/default.nix index 931453624811..ccaf3e0bbbb8 100644 --- a/pkgs/applications/networking/ndppd/default.nix +++ b/pkgs/applications/networking/ndppd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gzip }: +{ lib, stdenv, fetchFromGitHub, gzip }: stdenv.mkDerivation rec { pname = "ndppd"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { cp ndppd.conf-dist $out/etc/ndppd.conf ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A daemon that proxies NDP (Neighbor Discovery Protocol) messages between interfaces"; homepage = "https://github.com/DanielAdolfsson/ndppd"; license = licenses.gpl3; diff --git a/pkgs/applications/networking/netperf/default.nix b/pkgs/applications/networking/netperf/default.nix index c2e51ee743b5..47693cc97f1c 100644 --- a/pkgs/applications/networking/netperf/default.nix +++ b/pkgs/applications/networking/netperf/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "1wbbgdvhadd3qs3afv6i777argdpcyxkwz4yv6aqp223n8ki6dm8"; }; - buildInputs = stdenv.lib.optional (stdenv.hostPlatform.isx86) libsmbios; + buildInputs = stdenv.lib.optional (with stdenv.hostPlatform; isx86 && isLinux) libsmbios; nativeBuildInputs = [ autoreconfHook ]; autoreconfPhase = '' autoreconf -i -I src/missing/m4 @@ -24,7 +24,7 @@ stdenv.mkDerivation { homepage = "http://www.netperf.org/netperf/"; license = "Hewlett-Packard BSD-like license"; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.mmlb ]; }; } diff --git a/pkgs/applications/networking/newsreaders/liferea/default.nix b/pkgs/applications/networking/newsreaders/liferea/default.nix index 8ec460802375..f4e4c8279de8 100644 --- a/pkgs/applications/networking/newsreaders/liferea/default.nix +++ b/pkgs/applications/networking/newsreaders/liferea/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , pkg-config , intltool @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { gappsWrapperArgs+=(--prefix PYTHONPATH : "$program_PYTHONPATH") ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A GTK-based news feed aggregator"; homepage = "http://lzone.de/liferea/"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/networking/newsreaders/pan/default.nix b/pkgs/applications/networking/newsreaders/pan/default.nix index 6dc0630d2db2..ef022306d4bf 100644 --- a/pkgs/applications/networking/newsreaders/pan/default.nix +++ b/pkgs/applications/networking/newsreaders/pan/default.nix @@ -1,5 +1,5 @@ { spellChecking ? true -, stdenv, fetchurl, pkgconfig, gtk3, gtkspell3 ? null +, lib, stdenv, fetchurl, pkgconfig, gtk3, gtkspell3 ? null , gmime2, gettext, intltool, itstool, libxml2, libnotify, gnutls , makeWrapper, gnupg , gnomeSupport ? true, libsecret, gcr @@ -37,7 +37,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A GTK-based Usenet newsreader good at both text and binaries"; homepage = "http://pan.rebelbase.com/"; maintainers = [ maintainers.eelco ]; diff --git a/pkgs/applications/networking/newsreaders/quiterss/default.nix b/pkgs/applications/networking/newsreaders/quiterss/default.nix index 1cc4be8cb27a..176ce43af5f7 100644 --- a/pkgs/applications/networking/newsreaders/quiterss/default.nix +++ b/pkgs/applications/networking/newsreaders/quiterss/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, qmake, pkg-config, wrapQtAppsHook +{ lib, stdenv, fetchFromGitHub, qmake, pkg-config, wrapQtAppsHook , qtbase, qttools, qtwebkit, sqlite }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ qmake pkg-config wrapQtAppsHook ]; buildInputs = [ qtbase qttools qtwebkit sqlite.dev ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A Qt-based RSS/Atom news feed reader"; longDescription = '' QuiteRSS is a open-source cross-platform RSS/Atom news feeds reader diff --git a/pkgs/applications/networking/newsreaders/slrn/default.nix b/pkgs/applications/networking/newsreaders/slrn/default.nix index 1cc9c39c991d..e49ffe15ee28 100644 --- a/pkgs/applications/networking/newsreaders/slrn/default.nix +++ b/pkgs/applications/networking/newsreaders/slrn/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , slang, ncurses, openssl }: stdenv.mkDerivation rec { @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { buildInputs = [ slang ncurses openssl ]; - meta = with stdenv.lib; { + meta = with lib; { description = "The slrn (S-Lang read news) newsreader"; homepage = "http://slrn.sourceforge.net/index.html"; maintainers = with maintainers; [ ehmry ]; diff --git a/pkgs/applications/networking/offrss/default.nix b/pkgs/applications/networking/offrss/default.nix index 03159a61a404..19de00d7436e 100644 --- a/pkgs/applications/networking/offrss/default.nix +++ b/pkgs/applications/networking/offrss/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, curl, libmrss, podofo, libiconv }: +{ lib, stdenv, fetchurl, curl, libmrss, podofo, libiconv }: stdenv.mkDerivation { name = "offrss-1.3"; @@ -26,7 +26,7 @@ stdenv.mkDerivation { sha256 = "1akw1x84jj2m9z60cvlvmz21qwlaywmw18pl7lgp3bj5nw6250p6"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://vicerveza.homeunix.net/~viric/cgi-bin/offrss"; description = "Offline RSS/Atom reader"; license = licenses.agpl3Plus; diff --git a/pkgs/applications/networking/omping/default.nix b/pkgs/applications/networking/omping/default.nix index 33d5a5f51111..7e7cd47dbd0a 100644 --- a/pkgs/applications/networking/omping/default.nix +++ b/pkgs/applications/networking/omping/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch }: +{ lib, stdenv, fetchFromGitHub, fetchpatch }: stdenv.mkDerivation rec { pname = "omping"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Open Multicast Ping (omping) is a tool for testing IPv4/IPv6 multicast connectivity on a LAN"; license = licenses.mit; platforms = platforms.unix; diff --git a/pkgs/applications/networking/openbazaar/client.nix b/pkgs/applications/networking/openbazaar/client.nix index 1d055520d1f6..4352c44f72a4 100644 --- a/pkgs/applications/networking/openbazaar/client.nix +++ b/pkgs/applications/networking/openbazaar/client.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , gcc-unwrapped , dpkg @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ gcc-unwrapped.lib ]}" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Decentralized Peer to Peer Marketplace for Bitcoin - client"; homepage = "https://www.openbazaar.org/"; license = licenses.mit; diff --git a/pkgs/applications/networking/openbazaar/default.nix b/pkgs/applications/networking/openbazaar/default.nix index aa341b292245..caddae6d7752 100644 --- a/pkgs/applications/networking/openbazaar/default.nix +++ b/pkgs/applications/networking/openbazaar/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl }: @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { $out/bin/openbazaard ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Decentralized Peer to Peer Marketplace for Bitcoin - daemon"; homepage = "https://www.openbazaar.org/"; license = licenses.mit; diff --git a/pkgs/applications/networking/owamp/default.nix b/pkgs/applications/networking/owamp/default.nix index 3608ef982a9b..24369bfc8d55 100644 --- a/pkgs/applications/networking/owamp/default.nix +++ b/pkgs/applications/networking/owamp/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub +{lib, stdenv, fetchFromGitHub , autoconf, automake, mandoc }: stdenv.mkDerivation rec { @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ./bootstrap ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://software.internet2.edu/owamp/"; description = ''A tool for performing one-way active measurements''; platforms = platforms.linux; diff --git a/pkgs/applications/networking/owncloud-client/default.nix b/pkgs/applications/networking/owncloud-client/default.nix index d990dfb39d2b..c1711497f781 100644 --- a/pkgs/applications/networking/owncloud-client/default.nix +++ b/pkgs/applications/networking/owncloud-client/default.nix @@ -21,9 +21,7 @@ mkDerivation rec { "-DNO_SHIBBOLETH=1" ]; - enableParallelBuilding = true; - - meta = with stdenv.lib; { + meta = with lib; { description = "Synchronise your ownCloud with your computer using this desktop client"; homepage = "https://owncloud.org"; maintainers = [ maintainers.qknight ]; diff --git a/pkgs/applications/networking/p2p/deluge/1.nix b/pkgs/applications/networking/p2p/deluge/1.nix index aa70f969d221..4171efb7ce29 100644 --- a/pkgs/applications/networking/p2p/deluge/1.nix +++ b/pkgs/applications/networking/p2p/deluge/1.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, intltool, libtorrent-rasterbar, pythonPackages }: +{ lib, stdenv, fetchurl, fetchpatch, intltool, libtorrent-rasterbar, pythonPackages }: pythonPackages.buildPythonPackage rec { pname = "deluge"; @@ -31,7 +31,7 @@ pythonPackages.buildPythonPackage rec { cp deluge/data/share/applications/deluge.desktop $out/share/applications ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://deluge-torrent.org"; description = "Torrent client"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/networking/p2p/deluge/default.nix b/pkgs/applications/networking/p2p/deluge/default.nix index f9c421c40873..068776fe17a6 100644 --- a/pkgs/applications/networking/p2p/deluge/default.nix +++ b/pkgs/applications/networking/p2p/deluge/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, intltool, libtorrent-rasterbar, pythonPackages +{ lib, stdenv, fetchurl, intltool, libtorrent-rasterbar, pythonPackages , gtk3, glib, gobject-introspection, librsvg, wrapGAppsHook }: pythonPackages.buildPythonPackage rec { @@ -34,7 +34,7 @@ pythonPackages.buildPythonPackage rec { cp deluge/ui/data/share/applications/deluge.desktop $out/share/applications ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://deluge-torrent.org"; description = "Torrent client"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix b/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix index 9355bfa5b8d9..7c5ffabd860f 100644 --- a/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix +++ b/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, qt4, boost, bzip2, libX11 +{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, qt4, boost, bzip2, libX11 , fetchpatch, libiconv, pcre-cpp, libidn, lua5, miniupnpc, aspell, gettext }: stdenv.mkDerivation rec { @@ -54,9 +54,7 @@ stdenv.mkDerivation rec { "-DWITH_LUASCRIPTS=ON" ]; - enableParallelBuilding = true; - - meta = with stdenv.lib; { + meta = with lib; { description = "A cross-platform program that uses the Direct Connect and ADC protocols"; homepage = "https://github.com/eiskaltdcpp/eiskaltdcpp"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/networking/p2p/frostwire/default.nix b/pkgs/applications/networking/p2p/frostwire/default.nix index 65e2165f64ee..4253969a30ad 100644 --- a/pkgs/applications/networking/p2p/frostwire/default.nix +++ b/pkgs/applications/networking/p2p/frostwire/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gradle, perl, jre, makeWrapper, makeDesktopItem, mplayer }: +{ lib, stdenv, fetchFromGitHub, gradle, perl, jre, makeWrapper, makeDesktopItem, mplayer }: let version = "6.6.7-build-529"; @@ -84,7 +84,7 @@ in stdenv.mkDerivation { --add-flags "-Djava.library.path=$out/lib -jar $out/share/java/frostwire.jar" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.frostwire.com/"; description = "BitTorrent Client and Cloud File Downloader"; license = licenses.gpl2; diff --git a/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix b/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix index 8ef8740f4d2a..3dbbbbe072d2 100644 --- a/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix +++ b/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jre, makeWrapper }: +{ lib, stdenv, fetchurl, jre, makeWrapper }: with stdenv.lib; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { --prefix PATH : ${jre}/bin/ ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.frostwire.com/"; description = "BitTorrent Client and Cloud File Downloader"; license = licenses.gpl2; diff --git a/pkgs/applications/networking/p2p/gnunet/default.nix b/pkgs/applications/networking/p2p/gnunet/default.nix index 618ca0749125..20fb5d4e79c2 100644 --- a/pkgs/applications/networking/p2p/gnunet/default.nix +++ b/pkgs/applications/networking/p2p/gnunet/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, adns, curl, gettext, gmp, gnutls, libextractor +{ lib, stdenv, fetchurl, adns, curl, gettext, gmp, gnutls, libextractor , libgcrypt, libgnurl, libidn, libmicrohttpd, libtool, libunistring , makeWrapper, ncurses, pkgconfig, libxml2, sqlite, zlib , libpulseaudio, libopus, libogg, jansson, libsodium }: @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { make -k check ''; - meta = with stdenv.lib; { + meta = with lib; { description = "GNU's decentralized anonymous and censorship-resistant P2P framework"; longDescription = '' diff --git a/pkgs/applications/networking/p2p/ktorrent/default.nix b/pkgs/applications/networking/p2p/ktorrent/default.nix index 19be24bd1b18..94a4642b2de1 100644 --- a/pkgs/applications/networking/p2p/ktorrent/default.nix +++ b/pkgs/applications/networking/p2p/ktorrent/default.nix @@ -22,8 +22,6 @@ mkDerivation rec { libktorrent taglib libgcrypt kplotting ]; - enableParallelBuilding = true; - meta = with lib; { description = "KDE integrated BtTorrent client"; homepage = "https://www.kde.org/applications/internet/ktorrent/"; diff --git a/pkgs/applications/networking/p2p/ncdc/default.nix b/pkgs/applications/networking/p2p/ncdc/default.nix index c956f26b1165..e479da0f22a8 100644 --- a/pkgs/applications/networking/p2p/ncdc/default.nix +++ b/pkgs/applications/networking/p2p/ncdc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, zlib, bzip2, sqlite, pkgconfig, glib, gnutls }: +{ lib, stdenv, fetchurl, ncurses, zlib, bzip2, sqlite, pkgconfig, glib, gnutls }: stdenv.mkDerivation rec { pname = "ncdc"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ncurses zlib bzip2 sqlite glib gnutls ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Modern and lightweight direct connect client with a friendly ncurses interface"; homepage = "https://dev.yorhel.nl/ncdc"; license = licenses.mit; diff --git a/pkgs/applications/networking/p2p/opentracker/default.nix b/pkgs/applications/networking/p2p/opentracker/default.nix index 8beb2f7d3770..4e127a1e7b8a 100644 --- a/pkgs/applications/networking/p2p/opentracker/default.nix +++ b/pkgs/applications/networking/p2p/opentracker/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, libowfat, zlib }: +{ lib, stdenv, fetchgit, libowfat, zlib }: stdenv.mkDerivation { name = "opentracker-2018-05-26"; @@ -23,7 +23,7 @@ stdenv.mkDerivation { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://erdgeist.org/arts/software/opentracker/"; license = licenses.beerware; platforms = platforms.linux; diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix index 2e69ad23e14c..d83cc6ad184f 100644 --- a/pkgs/applications/networking/p2p/qbittorrent/default.nix +++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix @@ -44,8 +44,6 @@ mkDerivation rec { else "qbittorrent-nox" } --prefix PATH : ${makeBinPath [ python3 ]}"; - enableParallelBuilding = true; - meta = { description = "Featureful free software BitTorrent client"; homepage = "https://www.qbittorrent.org/"; diff --git a/pkgs/applications/networking/p2p/retroshare/default.nix b/pkgs/applications/networking/p2p/retroshare/default.nix index a6a0ab272873..412016e4877a 100644 --- a/pkgs/applications/networking/p2p/retroshare/default.nix +++ b/pkgs/applications/networking/p2p/retroshare/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libupnp, gpgme, gnome3, glib, libssh, pkgconfig, protobuf, bzip2 +{ lib, stdenv, fetchFromGitHub, libupnp, gpgme, gnome3, glib, libssh, pkgconfig, protobuf, bzip2 , libXScrnSaver, speex, curl, libxml2, libxslt, sqlcipher, libmicrohttpd, opencv, qmake, ffmpeg_3 , qtmultimedia, qtx11extras, qttools }: @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { cp libbitdht/src/bitdht/bdboot.txt $out/share/retroshare ''; - meta = with stdenv.lib; { + meta = with lib; { description = ""; homepage = "http://retroshare.sourceforge.net/"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/networking/p2p/stig/default.nix b/pkgs/applications/networking/p2p/stig/default.nix index d06a4d4d418a..08da6cdf6fab 100644 --- a/pkgs/applications/networking/p2p/stig/default.nix +++ b/pkgs/applications/networking/p2p/stig/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , python3Packages }: @@ -59,7 +59,7 @@ python3Packages.buildPythonApplication rec { "--deselect=tests/client_test/aiotransmission_test/rpc_test.py" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "TUI and CLI for the BitTorrent client Transmission"; homepage = "https://github.com/rndusr/stig"; license = licenses.gpl3; diff --git a/pkgs/applications/networking/p2p/synapse-bt/default.nix b/pkgs/applications/networking/p2p/synapse-bt/default.nix index e2847d88f8a7..ae2c3c2469fc 100644 --- a/pkgs/applications/networking/p2p/synapse-bt/default.nix +++ b/pkgs/applications/networking/p2p/synapse-bt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform, pkgconfig, openssl, CoreServices, Security }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, pkgconfig, openssl, CoreServices, Security }: rustPlatform.buildRustPackage rec { pname = "synapse-bt"; @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { cargoBuildFlags = [ "--all" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Flexible and fast BitTorrent daemon"; homepage = "https://synapse-bt.org/"; license = licenses.isc; diff --git a/pkgs/applications/networking/p2p/tixati/default.nix b/pkgs/applications/networking/p2p/tixati/default.nix index f8a70d322f03..7152570b6aca 100644 --- a/pkgs/applications/networking/p2p/tixati/default.nix +++ b/pkgs/applications/networking/p2p/tixati/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, glib, zlib, dbus, dbus-glib, gtk2, gdk-pixbuf, cairo, pango }: +{ lib, stdenv, fetchurl, glib, zlib, dbus, dbus-glib, gtk2, gdk-pixbuf, cairo, pango }: stdenv.mkDerivation rec { pname = "tixati"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { dontStrip = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Torrent client"; homepage = "http://www.tixati.com"; license = licenses.unfree; diff --git a/pkgs/applications/networking/p2p/torrential/default.nix b/pkgs/applications/networking/p2p/torrential/default.nix index d62e3b3b5a3f..ef2b97563bbc 100644 --- a/pkgs/applications/networking/p2p/torrential/default.nix +++ b/pkgs/applications/networking/p2p/torrential/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , nix-update-script , cmake @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Download torrents in style with this speedy, minimalist torrent client for elementary OS"; homepage = "https://github.com/davidmhewitt/torrential"; maintainers = with maintainers; [ xiorcale ] ++ pantheon.maintainers; diff --git a/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix b/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix index 8e74b82b69d3..fe93657048a9 100644 --- a/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix +++ b/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, autoconf, automake, libtool, wrapGAppsHook, fetchFromGitHub, pkgconfig +{ lib, stdenv, autoconf, automake, libtool, wrapGAppsHook, fetchFromGitHub, pkgconfig , intltool, gtk3, json-glib, curl, glib, autoconf-archive, appstream-glib, fetchpatch }: @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { doCheck = false; # fails with style validation error - meta = with stdenv.lib; { + meta = with lib; { description = "GTK remote control for the Transmission BitTorrent client"; homepage = "https://github.com/ajf8/transmission-remote-gtk"; license = licenses.gpl2; diff --git a/pkgs/applications/networking/p2p/tremc/default.nix b/pkgs/applications/networking/p2p/tremc/default.nix index 485366afe939..4d3b3d3f374d 100644 --- a/pkgs/applications/networking/p2p/tremc/default.nix +++ b/pkgs/applications/networking/p2p/tremc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python3Packages +{ lib, stdenv, fetchFromGitHub, python3Packages , x11Support ? !stdenv.isDarwin , xclip ? null , pbcopy ? null @@ -41,7 +41,7 @@ python3Packages.buildPythonApplication rec { wrapPythonPrograms ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Curses interface for transmission"; homepage = "https://github.com/tremc/tremc"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/networking/p2p/tribler/default.nix b/pkgs/applications/networking/p2p/tribler/default.nix index d30697a4df00..474d6a0c9f10 100644 --- a/pkgs/applications/networking/p2p/tribler/default.nix +++ b/pkgs/applications/networking/p2p/tribler/default.nix @@ -19,40 +19,41 @@ stdenv.mkDerivation rec { python3Packages.python ]; - pythonPath = [ - python3Packages.libtorrent-rasterbar - python3Packages.twisted - python3Packages.netifaces - python3Packages.pycrypto - python3Packages.pyasn1 - python3Packages.requests - python3Packages.m2crypto - python3Packages.pyqt5 - python3Packages.chardet - python3Packages.cherrypy - python3Packages.cryptography - python3Packages.libnacl - python3Packages.configobj - python3Packages.decorator - python3Packages.feedparser - python3Packages.service-identity - python3Packages.psutil - python3Packages.pillow - python3Packages.networkx - python3Packages.pony - python3Packages.lz4 - python3Packages.pyqtgraph + pythonPath = with python3Packages; [ + libtorrent-rasterbar + twisted + netifaces + pycrypto + pyasn1 + requests + m2crypto + pyqt5 + chardet + cherrypy + cryptography + libnacl + configobj + decorator + feedparser + service-identity + psutil + pillow + networkx + pony + lz4 + pyqtgraph # there is a BTC feature, but it requires some unclear version of # bitcoinlib, so this doesn't work right now. - # python3Packages.bitcoinlib + # bitcoinlib ]; postPatch = '' ${stdenv.lib.optionalString enablePlayer '' substituteInPlace "./TriblerGUI/vlc.py" --replace "ctypes.CDLL(p)" "ctypes.CDLL('${libvlc}/lib/libvlc.so')" - substituteInPlace "./TriblerGUI/widgets/videoplayerpage.py" --replace "if vlc and vlc.plugin_path" "if vlc" - substituteInPlace "./TriblerGUI/widgets/videoplayerpage.py" --replace "os.environ['VLC_PLUGIN_PATH'] = vlc.plugin_path" "os.environ['VLC_PLUGIN_PATH'] = '${libvlc}/lib/vlc/plugins'" + substituteInPlace "./TriblerGUI/widgets/videoplayerpage.py" \ + --replace "if vlc and vlc.plugin_path" "if vlc" \ + --replace "os.environ['VLC_PLUGIN_PATH'] = vlc.plugin_path" "os.environ['VLC_PLUGIN_PATH'] = '${libvlc}/lib/vlc/plugins'" ''} ''; @@ -78,7 +79,7 @@ stdenv.mkDerivation rec { cp $out/Tribler/Main/Build/Ubuntu/tribler.1 $out/share/man/man1/tribler.1 ''; - meta = with stdenv.lib; { + meta = with lib; { maintainers = with maintainers; [ xvapx ]; homepage = "https://www.tribler.org/"; description = "A completely decentralised P2P filesharing client based on the Bittorrent protocol"; diff --git a/pkgs/applications/networking/p2p/vuze/default.nix b/pkgs/applications/networking/p2p/vuze/default.nix index be2421ef4d26..557914439a9c 100644 --- a/pkgs/applications/networking/p2p/vuze/default.nix +++ b/pkgs/applications/networking/p2p/vuze/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchsvn, jdk, jre, ant, swt, makeWrapper }: +{ lib, stdenv, fetchsvn, jdk, jre, ant, swt, makeWrapper }: stdenv.mkDerivation rec { pname = "vuze"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { --add-flags "-Xmx256m -Djava.library.path=${swt}/lib -cp $out/share/java/Vuze_${version}-00.jar:${swt}/jars/swt.jar org.gudy.azureus2.ui.swt.Main" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Torrent client"; homepage = "http://www.vuze.com"; license = licenses.unfree; diff --git a/pkgs/applications/networking/p2p/zeronet/default.nix b/pkgs/applications/networking/p2p/zeronet/default.nix index ce5a99b1e5fc..7deddf8578bb 100644 --- a/pkgs/applications/networking/p2p/zeronet/default.nix +++ b/pkgs/applications/networking/p2p/zeronet/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python3Packages }: +{ lib, stdenv, fetchFromGitHub, python3Packages }: python3Packages.buildPythonApplication rec { pname = "zeronet"; @@ -32,7 +32,7 @@ python3Packages.buildPythonApplication rec { --set PATH ${python3Packages.python}/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Decentralized websites using Bitcoin crypto and BitTorrent network"; homepage = "https://zeronet.io/"; license = licenses.gpl2; diff --git a/pkgs/applications/networking/pcloud/default.nix b/pkgs/applications/networking/pcloud/default.nix index 7db633737d99..4229fef4fe6f 100644 --- a/pkgs/applications/networking/pcloud/default.nix +++ b/pkgs/applications/networking/pcloud/default.nix @@ -16,7 +16,7 @@ { # Build dependencies - appimageTools, autoPatchelfHook, fetchzip, stdenv, + appimageTools, autoPatchelfHook, fetchzip, lib, stdenv, # Runtime dependencies; # A few additional ones (e.g. Node) are already shipped together with the @@ -26,13 +26,13 @@ let pname = "pcloud"; - version = "1.8.8"; + version = "1.8.9"; name = "${pname}-${version}"; # Archive link's code thanks to: https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=pcloud-drive src = fetchzip { - url = "https://api.pcloud.com/getpubzip?code=XZpnMpXZPWyhRfdvXUhyY6XpdfmQmJiLRmmV&filename=${name}.zip"; - hash = "sha256-z9OeFkH6EVthg5Dz2mN3jlBTMhiMt/6bUIYFeMO6EXk="; + url = "https://api.pcloud.com/getpubzip?code=XZjfKzXZ6h3uGRFId48VRNHHkuqajhRvMlPV&filename=${name}.zip"; + hash = "sha256:1bwdwfwgy3wwzlggi8qhf5q2bq2kqiqi3mgvsr9w0mxyaxxv13r8"; }; appimageContents = appimageTools.extractType2 { @@ -100,7 +100,7 @@ in stdenv.mkDerivation { chmod +x bin/pcloud ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Secure and simple to use cloud storage for your files; pCloud Drive, Electron Edition"; homepage = "https://www.pcloud.com/"; license = licenses.unfree; diff --git a/pkgs/applications/networking/ping/default.nix b/pkgs/applications/networking/ping/default.nix index 8e4125ac72aa..a2d614ff5420 100644 --- a/pkgs/applications/networking/ping/default.nix +++ b/pkgs/applications/networking/ping/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , nix-update-script , meson @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A helpful tool that lets you debug what part of your API is causing you issues"; homepage = "https://github.com/jeremyvaartjes/ping"; maintainers = with maintainers; [ xiorcale ] ++ pantheon.maintainers; diff --git a/pkgs/applications/networking/pjsip/default.nix b/pkgs/applications/networking/pjsip/default.nix index 7319dd4a44fa..60b94bbf7f94 100644 --- a/pkgs/applications/networking/pjsip/default.nix +++ b/pkgs/applications/networking/pjsip/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, openssl, libsamplerate, alsaLib, AppKit }: +{ lib, stdenv, fetchFromGitHub, openssl, libsamplerate, alsaLib, AppKit }: stdenv.mkDerivation rec { pname = "pjsip"; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { # We need the libgcc_s.so.1 loadable (for pthread_cancel to work) dontPatchELF = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A multimedia communication library written in C, implementing standard based protocols such as SIP, SDP, RTP, STUN, TURN, and ICE"; homepage = "https://pjsip.org/"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/networking/protocol/default.nix b/pkgs/applications/networking/protocol/default.nix index 31b1bd6086ad..70723f486460 100644 --- a/pkgs/applications/networking/protocol/default.nix +++ b/pkgs/applications/networking/protocol/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonApplication, fetchFromGitHub }: +{ lib, stdenv, buildPythonApplication, fetchFromGitHub }: buildPythonApplication { pname = "protocol-unstable"; @@ -11,7 +11,7 @@ buildPythonApplication { sha256 = "13l10jhf4vghanmhh3pn91b2jdciispxy0qadz4n08blp85qn9cm"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "An ASCII Header Generator for Network Protocols"; homepage = "https://github.com/luismartingarcia/protocol"; license = licenses.gpl3; diff --git a/pkgs/applications/networking/ps2client/default.nix b/pkgs/applications/networking/ps2client/default.nix index 444a6dcf45c7..87d4e75c33e3 100644 --- a/pkgs/applications/networking/ps2client/default.nix +++ b/pkgs/applications/networking/ps2client/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation { version = "unstable-2018-10-18"; @@ -19,7 +19,7 @@ stdenv.mkDerivation { make PREFIX=$out install ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Desktop clients to interact with ps2link and ps2netfs"; homepage = "https://github.com/ps2dev/ps2client"; license = licenses.bsd3; diff --git a/pkgs/applications/networking/pyload/default.nix b/pkgs/applications/networking/pyload/default.nix index e81b8dc37ca5..dcfa88d9d4cd 100644 --- a/pkgs/applications/networking/pyload/default.nix +++ b/pkgs/applications/networking/pyload/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, pythonPackages, gocr, unrar, rhino, spidermonkey_38 }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, pythonPackages, gocr, unrar, rhino, spidermonkey_38 }: let beautifulsoup = pythonPackages.callPackage ./beautifulsoup.nix { @@ -50,7 +50,7 @@ in pythonPackages.buildPythonApplication rec { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Free and open source downloader for 1-click-hosting sites"; homepage = "https://github.com/pyload/pyload"; license = licenses.gpl3; diff --git a/pkgs/applications/networking/qv2ray/default.nix b/pkgs/applications/networking/qv2ray/default.nix index f4d41ee79e6d..fa8609ef532c 100644 --- a/pkgs/applications/networking/qv2ray/default.nix +++ b/pkgs/applications/networking/qv2ray/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , mkDerivation , fetchFromGitHub , qmake @@ -56,7 +56,7 @@ mkDerivation rec { qttools ]; - meta = with stdenv.lib; { + meta = with lib; { description = "An GUI frontend to v2ray"; homepage = "https://qv2ray.github.io/en/"; license = licenses.gpl3; diff --git a/pkgs/applications/networking/remote/anydesk/default.nix b/pkgs/applications/networking/remote/anydesk/default.nix index 643efd0f0f27..50516eab2f0e 100644 --- a/pkgs/applications/networking/remote/anydesk/default.nix +++ b/pkgs/applications/networking/remote/anydesk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, makeDesktopItem +{ lib, stdenv, fetchurl, makeWrapper, makeDesktopItem , atk, cairo, gdk-pixbuf, glib, gnome2, gtk2, libGLU, libGL, pango, xorg , lsb-release, freetype, fontconfig, polkit, polkit_gnome , pulseaudio }: @@ -79,7 +79,7 @@ in stdenv.mkDerivation rec { --subst-var out ''; - meta = with stdenv.lib; { + meta = with lib; { inherit description; homepage = "https://www.anydesk.com"; license = licenses.unfree; diff --git a/pkgs/applications/networking/remote/nice-dcv-client/default.nix b/pkgs/applications/networking/remote/nice-dcv-client/default.nix index 19e65c0bdb3d..3344174cb2a0 100644 --- a/pkgs/applications/networking/remote/nice-dcv-client/default.nix +++ b/pkgs/applications/networking/remote/nice-dcv-client/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , glib , libX11 @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { rm $out/lib64/dcvviewer/gio/modules/libdconfsettings.so ''; - meta = with stdenv.lib; { + meta = with lib; { description = "High-performance remote display protocol"; homepage = "https://aws.amazon.com/hpc/dcv/"; license = licenses.unfree; diff --git a/pkgs/applications/networking/remote/teamviewer/default.nix b/pkgs/applications/networking/remote/teamviewer/default.nix index 9c3ed826a2d5..c556ce35b2de 100644 --- a/pkgs/applications/networking/remote/teamviewer/default.nix +++ b/pkgs/applications/networking/remote/teamviewer/default.nix @@ -38,6 +38,13 @@ mkDerivation rec { ln -s /var/log/teamviewer $out/share/teamviewer/logfiles ln -s ${xdg_utils}/bin $out/share/teamviewer/tv_bin/xdg-utils + for i in 16 20 24 32 48 256; do + size=$i"x"$i + + mkdir -p $out/share/icons/hicolor/$size/apps + ln -s $out/share/teamviewer/tv_bin/desktop/teamviewer_$i.png $out/share/icons/hicolor/$size/apps/TeamViewer.png + done; + sed -i "s,/opt/teamviewer,$out/share/teamviewer,g" $out/share/teamviewer/tv_bin/desktop/com.teamviewer.*.desktop substituteInPlace $out/share/teamviewer/tv_bin/script/tvw_aux \ @@ -50,6 +57,7 @@ mkDerivation rec { wrapProgram $out/share/teamviewer/tv_bin/TeamViewer --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libXrandr libX11 ]}" wrapProgram $out/share/teamviewer/tv_bin/TeamViewer_Desktop --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [libXrandr libX11 libXext libXdamage libXtst libSM libXfixes ]}" + wrapQtApp $out/share/teamviewer/tv_bin/script/teamviewer wrapQtApp $out/bin/teamviewer ''; diff --git a/pkgs/applications/networking/remote/vmware-horizon-client/default.nix b/pkgs/applications/networking/remote/vmware-horizon-client/default.nix index 09b7011c3164..7d5b965e60fe 100644 --- a/pkgs/applications/networking/remote/vmware-horizon-client/default.nix +++ b/pkgs/applications/networking/remote/vmware-horizon-client/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildFHSUserEnv, fetchurl, makeWrapper, makeDesktopItem, libxslt, atk +{ lib, stdenv, buildFHSUserEnv, fetchurl, makeWrapper, makeDesktopItem, libxslt, atk , fontconfig, freetype, gdk-pixbuf, glib, gtk2, libudev0-shim, libxml2 , pango, pixman, libX11, libXext, libXinerama, libXrandr , libXrender , libXtst, libXcursor, libXi, libxkbfile , libXScrnSaver, zlib, liberation_ttf @@ -70,7 +70,7 @@ in stdenv.mkDerivation { ln -s "${vmwareFHSUserEnv}/bin/vmware-view" "$out/bin/" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Allows you to connect to your VMware Horizon virtual desktop"; homepage = "https://www.vmware.com/go/viewclients"; license = licenses.unfree; diff --git a/pkgs/applications/networking/remote/waypipe/default.nix b/pkgs/applications/networking/remote/waypipe/default.nix index 2c91d6496a0e..fcbad67038ce 100644 --- a/pkgs/applications/networking/remote/waypipe/default.nix +++ b/pkgs/applications/networking/remote/waypipe/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab +{ lib, stdenv, fetchFromGitLab , meson, ninja, pkg-config, scdoc , openssh , mesa, lz4, zstd, ffmpeg, libva @@ -6,14 +6,14 @@ stdenv.mkDerivation rec { pname = "waypipe-unstable"; - version = "0.7.1"; + version = "0.7.2"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "mstoeckl"; repo = "waypipe"; rev = "v${version}"; - sha256 = "00skyxmbssfxksb8wlqdr8gajpysadirjcn230fd5gaf5msvllx7"; + sha256 = "sha256-LtfrSEwZikOXp/fdyJ/+EylRx19zdsHMkrl1eEf1/aY="; }; postPatch = '' @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { mesa lz4 zstd ffmpeg libva ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A network proxy for Wayland clients (applications)"; longDescription = '' waypipe is a proxy for Wayland clients. It forwards Wayland messages and diff --git a/pkgs/applications/networking/remote/wayvnc/default.nix b/pkgs/applications/networking/remote/wayvnc/default.nix index e8fbec0d91a9..aa15ea97ecb6 100644 --- a/pkgs/applications/networking/remote/wayvnc/default.nix +++ b/pkgs/applications/networking/remote/wayvnc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, meson, pkg-config, ninja, scdoc +{ lib, stdenv, fetchFromGitHub, meson, pkg-config, ninja, scdoc , pixman, libxkbcommon, wayland, neatvnc, libdrm, libX11, aml }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson pkg-config ninja scdoc wayland ]; buildInputs = [ pixman libxkbcommon wayland neatvnc libdrm libX11 aml ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A VNC server for wlroots based Wayland compositors"; longDescription = '' This is a VNC server for wlroots based Wayland compositors. It attaches diff --git a/pkgs/applications/networking/remote/x2goclient/default.nix b/pkgs/applications/networking/remote/x2goclient/default.nix index 047458067357..6401393acda5 100644 --- a/pkgs/applications/networking/remote/x2goclient/default.nix +++ b/pkgs/applications/networking/remote/x2goclient/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, cups, libssh, libXpm, nx-libs, openldap, openssh +{ lib, stdenv, fetchgit, cups, libssh, libXpm, nx-libs, openldap, openssh , mkDerivation, qtbase, qtsvg, qtx11extras, qttools, phonon, pkgconfig }: mkDerivation { @@ -30,7 +30,7 @@ mkDerivation { qtWrapperArgs = [ ''--suffix PATH : ${nx-libs}/bin:${openssh}/libexec'' ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Graphical NoMachine NX3 remote desktop client"; homepage = "http://x2go.org/"; license = licenses.gpl2; diff --git a/pkgs/applications/networking/remote/x2goserver/default.nix b/pkgs/applications/networking/remote/x2goserver/default.nix index 1c20bd8b7a82..f30b21464e37 100644 --- a/pkgs/applications/networking/remote/x2goserver/default.nix +++ b/pkgs/applications/networking/remote/x2goserver/default.nix @@ -83,7 +83,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Remote desktop application, server component"; homepage = "http://x2go.org/"; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/networking/remote/xrdp/default.nix b/pkgs/applications/networking/remote/xrdp/default.nix index 9941951225ca..faa65379de49 100644 --- a/pkgs/applications/networking/remote/xrdp/default.nix +++ b/pkgs/applications/networking/remote/xrdp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, which, perl, autoconf, automake, libtool, openssl, systemd, pam, fuse, libjpeg, libopus, nasm, xorg }: +{ lib, stdenv, fetchFromGitHub, pkgconfig, which, perl, autoconf, automake, libtool, openssl, systemd, pam, fuse, libjpeg, libopus, nasm, xorg }: let xorgxrdp = stdenv.mkDerivation rec { @@ -94,7 +94,7 @@ let enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "An open source RDP server"; homepage = "https://github.com/neutrinolabs/xrdp"; license = licenses.asl20; diff --git a/pkgs/applications/networking/resilio-sync/default.nix b/pkgs/applications/networking/resilio-sync/default.nix index 537e0fc81800..ecdc21607377 100644 --- a/pkgs/applications/networking/resilio-sync/default.nix +++ b/pkgs/applications/networking/resilio-sync/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ... }: +{ lib, stdenv, fetchurl, ... }: let arch = { @@ -31,7 +31,7 @@ in stdenv.mkDerivation rec { --set-rpath ${libPath} "$out/bin/rslsync" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Automatically sync files via secure, distributed technology"; homepage = "https://www.resilio.com/"; license = licenses.unfreeRedistributable; diff --git a/pkgs/applications/networking/scaleft/default.nix b/pkgs/applications/networking/scaleft/default.nix index b1a754193ebf..67fb66feabb7 100644 --- a/pkgs/applications/networking/scaleft/default.nix +++ b/pkgs/applications/networking/scaleft/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, rpmextract, patchelf, bash }: +{ lib, stdenv, fetchurl, rpmextract, patchelf, bash }: stdenv.mkDerivation rec { pname = "scaleft"; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { patchShebangs $out ''; - meta = with stdenv.lib; { + meta = with lib; { description = "ScaleFT provides Zero Trust software which you can use to secure your internal servers and services"; homepage = "https://www.scaleft.com"; license = licenses.unfree; diff --git a/pkgs/applications/networking/seafile-client/default.nix b/pkgs/applications/networking/seafile-client/default.nix index 69b7b432b0a0..fb0c0a18ac5f 100644 --- a/pkgs/applications/networking/seafile-client/default.nix +++ b/pkgs/applications/networking/seafile-client/default.nix @@ -1,16 +1,16 @@ { mkDerivation, lib, fetchFromGitHub, pkgconfig, cmake, qtbase, qttools -, seafile-shared, ccnet, jansson, libsearpc +, seafile-shared, jansson, libsearpc , withShibboleth ? true, qtwebengine }: mkDerivation rec { pname = "seafile-client"; - version = "7.0.9"; + version = "8.0.1"; src = fetchFromGitHub { owner = "haiwen"; repo = "seafile-client"; - rev = "v${version}"; - sha256 = "0pcn6lfzma2hvpwsp9q0002wvym7zabpp8fvq29l101gzirn79m9"; + rev = "b4b944921c7efef13a93d693c45c997943899dec"; + sha256 = "2vV+6ZXjVg81JVLfWeD0UK+RdmpBxBU2Ozx790WFSyw="; }; nativeBuildInputs = [ pkgconfig cmake ]; @@ -21,7 +21,7 @@ mkDerivation rec { ++ lib.optional withShibboleth "-DBUILD_SHIBBOLETH_SUPPORT=ON"; qtWrapperArgs = [ - "--suffix PATH : ${lib.makeBinPath [ ccnet seafile-shared ]}" + "--suffix PATH : ${lib.makeBinPath [ seafile-shared ]}" ]; meta = with lib; { diff --git a/pkgs/applications/networking/shellhub-agent/default.nix b/pkgs/applications/networking/shellhub-agent/default.nix new file mode 100644 index 000000000000..db9e112a0639 --- /dev/null +++ b/pkgs/applications/networking/shellhub-agent/default.nix @@ -0,0 +1,48 @@ +{ lib, stdenv +, buildGoModule +, fetchFromGitHub +, genericUpdater +, common-updater-scripts +}: + +buildGoModule rec { + pname = "shellhub-agent"; + version = "0.4.2"; + + src = fetchFromGitHub { + owner = "shellhub-io"; + repo = "shellhub"; + rev = "v${version}"; + sha256 = "0cd41ing1pcf1bdaaq00w5h7lih5j2kcaa0m41g3ikm3vd1w5qna"; + }; + + modRoot = "./agent"; + + vendorSha256 = "19gsfhh6idqysdxhpq45sq35gw19adz9lp83krjlhzj1vqm59qma"; + + buildFlagsArray = [ "-ldflags=-s -w -X main.AgentVersion=v${version}" ]; + + passthru = { + updateScript = genericUpdater { + inherit pname version; + versionLister = "${common-updater-scripts}/bin/list-git-tags ${src.meta.homepage}"; + rev-prefix = "v"; + ignoredVersions = ".(rc|beta).*"; + }; + }; + + meta = with lib; { + description = + "Enables easy access any Linux device behind firewall and NAT"; + longDescription = '' + ShellHub is a modern SSH server for remotely accessing Linux devices via + command line (using any SSH client) or web-based user interface, designed + as an alternative to _sshd_. Think ShellHub as centralized SSH for the the + edge and cloud computing. + ''; + homepage = "https://shellhub.io/"; + license = licenses.asl20; + maintainers = with maintainers; [ otavio ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/networking/sieve-connect/default.nix b/pkgs/applications/networking/sieve-connect/default.nix index c81cc78a9b55..d4866d9f1a41 100644 --- a/pkgs/applications/networking/sieve-connect/default.nix +++ b/pkgs/applications/networking/sieve-connect/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, makeWrapper, perlPackages }: +{ lib, stdenv, fetchFromGitHub, makeWrapper, perlPackages }: stdenv.mkDerivation rec { pname = "sieve-connect"; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { TermReadKey TermReadLineGnu ]}" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A client for the MANAGESIEVE Protocol"; longDescription = '' This is sieve-connect. A client for the ManageSieve protocol, diff --git a/pkgs/applications/networking/sniffers/etherape/default.nix b/pkgs/applications/networking/sniffers/etherape/default.nix index 4cc4487c90ad..aba93e2d6d0b 100644 --- a/pkgs/applications/networking/sniffers/etherape/default.nix +++ b/pkgs/applications/networking/sniffers/etherape/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libtool, gtk3, libpcap, goocanvas2, +{ lib, stdenv, fetchurl, pkgconfig, libtool, gtk3, libpcap, goocanvas2, popt, itstool, libxml2 }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { libtool gtk3 libpcap goocanvas2 popt ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://etherape.sourceforge.net/"; license = stdenv.lib.licenses.gpl2Plus; platforms = with platforms; linux; diff --git a/pkgs/applications/networking/sniffers/ettercap/default.nix b/pkgs/applications/networking/sniffers/ettercap/default.nix index 8489b414cbc5..d3bfc148c42f 100644 --- a/pkgs/applications/networking/sniffers/ettercap/default.nix +++ b/pkgs/applications/networking/sniffers/ettercap/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, libpcap, libnet, zlib, curl, pcre +{ lib, stdenv, fetchFromGitHub, cmake, libpcap, libnet, zlib, curl, pcre , openssl, ncurses, glib, gtk3, atk, pango, flex, bison, geoip, harfbuzz , pkgconfig }: @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { # TODO: Remove after the next release (0.8.4 should work without this): NIX_CFLAGS_COMPILE = [ "-I${harfbuzz.dev}/include/harfbuzz" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Comprehensive suite for man in the middle attacks"; longDescription = '' Ettercap is a comprehensive suite for man in the middle attacks. It diff --git a/pkgs/applications/networking/sniffers/kismet/default.nix b/pkgs/applications/networking/sniffers/kismet/default.nix index 61d149ba5b8e..56260bd06fa6 100644 --- a/pkgs/applications/networking/sniffers/kismet/default.nix +++ b/pkgs/applications/networking/sniffers/kismet/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libpcap, pcre, libnl, zlib, libmicrohttpd +{ lib, stdenv, fetchurl, pkgconfig, libpcap, pcre, libnl, zlib, libmicrohttpd , sqlite, protobuf, protobufc, libusb1, libcap, binutils, elfutils , withNetworkManager ? false, glib, networkmanager , withPython ? false, python3 @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Wireless network sniffer"; homepage = "https://www.kismetwireless.net/"; license = licenses.gpl3; diff --git a/pkgs/applications/networking/sniffers/sngrep/default.nix b/pkgs/applications/networking/sniffers/sngrep/default.nix index 9dda62b3badb..b7a17896ec33 100644 --- a/pkgs/applications/networking/sniffers/sngrep/default.nix +++ b/pkgs/applications/networking/sniffers/sngrep/default.nix @@ -1,4 +1,4 @@ -{ stdenv, autoconf, automake, fetchFromGitHub, libpcap, ncurses, openssl, pcre }: +{ lib, stdenv, autoconf, automake, fetchFromGitHub, libpcap, ncurses, openssl, pcre }: stdenv.mkDerivation rec { pname = "sngrep"; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { preConfigure = "./bootstrap.sh"; - meta = with stdenv.lib; { + meta = with lib; { description = "A tool for displaying SIP calls message flows from terminal"; homepage = "https://github.com/irontec/sngrep"; license = licenses.gpl3; diff --git a/pkgs/applications/networking/sniffers/whsniff/default.nix b/pkgs/applications/networking/sniffers/whsniff/default.nix index d2e5803d58a1..6674808e91ba 100644 --- a/pkgs/applications/networking/sniffers/whsniff/default.nix +++ b/pkgs/applications/networking/sniffers/whsniff/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libusb1 }: +{ lib, stdenv, fetchFromGitHub, libusb1 }: stdenv.mkDerivation rec { pname = "whsniff"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { installFlags = [ "PREFIX=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/homewsn/whsniff"; description = "Packet sniffer for 802.15.4 wireless networks"; maintainers = with maintainers; [ snicket2100 ]; diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index 66292e20c525..0497472b90e3 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, pcre, perl, flex, bison, gettext, libpcap, libnl, c-ares +{ lib, stdenv, fetchurl, pkgconfig, pcre, perl, flex, bison, gettext, libpcap, libnl, c-ares , gnutls, libgcrypt, libgpgerror, geoip, openssl, lua5, python3, libcap, glib , libssh, nghttp2, zlib, cmake, fetchpatch, makeWrapper , withQt ? true, qt5 ? null @@ -12,7 +12,6 @@ with stdenv.lib; let version = "3.4.2"; variant = if withQt then "qt" else "cli"; - pcap = libpcap.override { withBluez = stdenv.isLinux; }; in stdenv.mkDerivation { pname = "wireshark-${variant}"; @@ -39,7 +38,7 @@ in stdenv.mkDerivation { ] ++ optional withQt qt5.wrapQtAppsHook; buildInputs = [ - gettext pcre perl pcap lua5 libssh nghttp2 openssl libgcrypt + gettext pcre perl libpcap lua5 libssh nghttp2 openssl libgcrypt libgpgerror gnutls geoip c-ares python3 glib zlib makeWrapper ] ++ optionals withQt (with qt5; [ qtbase qtmultimedia qtsvg qttools ]) ++ optionals stdenv.isLinux [ libcap libnl ] @@ -93,8 +92,6 @@ in stdenv.mkDerivation { cp ../wiretap/*.h $dev/include/wiretap ''); - enableParallelBuilding = true; - dontFixCmake = true; shellHook = '' @@ -102,7 +99,7 @@ in stdenv.mkDerivation { export WIRESHARK_RUN_FROM_BUILD_DIRECTORY=1 ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.wireshark.org/"; description = "Powerful network protocol analyzer"; license = licenses.gpl2; diff --git a/pkgs/applications/networking/sniproxy/default.nix b/pkgs/applications/networking/sniproxy/default.nix index 301802d322bd..f3eae72970fb 100644 --- a/pkgs/applications/networking/sniproxy/default.nix +++ b/pkgs/applications/networking/sniproxy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, gettext, libev, pcre, pkgconfig, udns }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, gettext, libev, pcre, pkgconfig, udns }: stdenv.mkDerivation rec { pname = "sniproxy"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ gettext libev pcre udns ]; - meta = with stdenv.lib; { + meta = with lib; { inherit (src.meta) homepage; description = "Transparent TLS and HTTP layer 4 proxy with SNI support"; license = licenses.bsd2; diff --git a/pkgs/applications/networking/soapui/default.nix b/pkgs/applications/networking/soapui/default.nix index 32a6423243e6..12301981f653 100644 --- a/pkgs/applications/networking/soapui/default.nix +++ b/pkgs/applications/networking/soapui/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, writeText, jdk, maven, makeWrapper }: +{ fetchurl, lib, stdenv, writeText, jdk, maven, makeWrapper }: stdenv.mkDerivation rec { pname = "soapui"; @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { '') ]; - meta = with stdenv.lib; { + meta = with lib; { description = "The Most Advanced REST & SOAP Testing Tool in the World"; homepage = "https://www.soapui.org/"; license = "SoapUI End User License Agreement"; diff --git a/pkgs/applications/networking/super-productivity/default.nix b/pkgs/applications/networking/super-productivity/default.nix index 3c4c0f0df3c0..065caa3d77e5 100644 --- a/pkgs/applications/networking/super-productivity/default.nix +++ b/pkgs/applications/networking/super-productivity/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, dpkg, makeWrapper +{ lib, stdenv, fetchurl, dpkg, makeWrapper , alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, glib , gnome2, gtk3, gdk-pixbuf, libnotify, libxcb, nspr, nss, pango , systemd, xorg, xprintidle-ng }: @@ -96,7 +96,7 @@ in stdenv.mkDerivation { dontStrip = true; - meta = with stdenv.lib; { + meta = with lib; { description = "To Do List / Time Tracker with Jira Integration"; homepage = "https://super-productivity.com"; license = licenses.mit; diff --git a/pkgs/applications/networking/sync/acd_cli/default.nix b/pkgs/applications/networking/sync/acd_cli/default.nix index c95647c78405..2f83873fbf8e 100644 --- a/pkgs/applications/networking/sync/acd_cli/default.nix +++ b/pkgs/applications/networking/sync/acd_cli/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildPythonApplication, fuse +{ lib, stdenv, fetchFromGitHub, buildPythonApplication, fuse , appdirs, colorama, dateutil, requests, requests_toolbelt , fusepy, sqlalchemy }: @@ -30,7 +30,7 @@ buildPythonApplication rec { lnOverBin acd_cli.py acdcli ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A command line interface and FUSE filesystem for Amazon Cloud Drive"; homepage = "https://github.com/yadayada/acd_cli"; license = licenses.gpl2; diff --git a/pkgs/applications/networking/sync/casync/default.nix b/pkgs/applications/networking/sync/casync/default.nix index 461de492ae2d..847e5c21da8c 100644 --- a/pkgs/applications/networking/sync/casync/default.nix +++ b/pkgs/applications/networking/sync/casync/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , meson, ninja, pkgconfig, python3, sphinx , acl, curl, fuse, libselinux, udev, xz, zstd , fuseSupport ? true @@ -42,7 +42,7 @@ stdenv.mkDerivation { export LC_ALL="en_US.utf-8" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Content-Addressable Data Synchronizer"; homepage = "https://github.com/systemd/casync"; license = licenses.lgpl21; diff --git a/pkgs/applications/networking/sync/desync/default.nix b/pkgs/applications/networking/sync/desync/default.nix index 9831ab34b2eb..689a2b3fddaa 100644 --- a/pkgs/applications/networking/sync/desync/default.nix +++ b/pkgs/applications/networking/sync/desync/default.nix @@ -1,22 +1,22 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "desync"; - version = "0.4.0"; - rev = "v${version}"; - - goPackagePath = "github.com/folbricht/desync"; + version = "0.9.0"; src = fetchFromGitHub { - inherit rev; + rev = "v${version}"; owner = "folbricht"; repo = "desync"; - sha256 = "17qh0g1paa7212j761q9z246k10a3xrwd8fgiizw3lr9adn50kdk"; + sha256 = "0j9hixgkja268r2zn2dglrmlrb2z57sgz6q3wqb8dfwpan7b5rsy"; }; - goDeps = ./deps.nix; + vendorSha256 = "1gajh99jb6mbwk93dypddhl7r7n8h2s11s3s82firbrb5k24s4pz"; - meta = with stdenv.lib; { + # nix builder doesn't have access to test data; tests fail for reasons unrelated to binary being bad. + doCheck = false; + + meta = with lib; { description = "Content-addressed binary distribution system"; longDescription = "An alternate implementation of the casync protocol and storage mechanism with a focus on production-readiness"; homepage = "https://github.com/folbricht/desync"; diff --git a/pkgs/applications/networking/sync/desync/deps.nix b/pkgs/applications/networking/sync/desync/deps.nix deleted file mode 100644 index 7f5f3251d162..000000000000 --- a/pkgs/applications/networking/sync/desync/deps.nix +++ /dev/null @@ -1,312 +0,0 @@ -[ - - { - goPackagePath = "github.com/datadog/zstd"; - fetch = { - type = "git"; - url = "https://github.com/datadog/zstd"; - rev = "v1.3.4"; - sha256 = "06wphl43ji23c0cmmm6fd3wszbwq36mdp1jarak2a6hmxl6yf0b8"; - }; - } - - { - 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/dchest/siphash"; - fetch = { - type = "git"; - url = "https://github.com/dchest/siphash"; - rev = "v1.2.0"; - sha256 = "01qhv9zd9l6p7pwf1fj022mp9s5496rk4lnm3yvpjsiwp6k4af8c"; - }; - } - - { - goPackagePath = "github.com/fatih/color"; - fetch = { - type = "git"; - url = "https://github.com/fatih/color"; - rev = "v1.7.0"; - sha256 = "0v8msvg38r8d1iiq2i5r4xyfx0invhc941kjrsg5gzwvagv55inv"; - }; - } - - { - goPackagePath = "github.com/folbricht/tempfile"; - fetch = { - type = "git"; - url = "https://github.com/folbricht/tempfile"; - rev = "v0.0.1"; - sha256 = "0vz08qvbniqxc24vhmcbq5ncnz97ncp4jbxgcf0hziazxfp114z3"; - }; - } - - { - goPackagePath = "github.com/go-ini/ini"; - fetch = { - type = "git"; - url = "https://github.com/go-ini/ini"; - rev = "v1.38.2"; - sha256 = "0xbnw1nd22q6k863n5gs0nxld15w0p8qxbhfky85akcb5rk1vwi9"; - }; - } - - { - goPackagePath = "github.com/gopherjs/gopherjs"; - fetch = { - type = "git"; - url = "https://github.com/gopherjs/gopherjs"; - rev = "0210a2f0f73c"; - sha256 = "1n80xjfc1dkxs8h8mkpw83n89wi5n7hzc3rxhwjs76rkxpq3rc9j"; - }; - } - - { - goPackagePath = "github.com/hanwen/go-fuse"; - fetch = { - type = "git"; - url = "https://github.com/hanwen/go-fuse"; - rev = "1d35017e9701"; - sha256 = "11rggvkd6lc5lcpsfvc9iip4z9cingzpkpshaskv2cirbxdynyi8"; - }; - } - - { - goPackagePath = "github.com/inconshreveable/mousetrap"; - fetch = { - type = "git"; - url = "https://github.com/inconshreveable/mousetrap"; - rev = "v1.0.0"; - sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152"; - }; - } - - { - goPackagePath = "github.com/jtolds/gls"; - fetch = { - type = "git"; - url = "https://github.com/jtolds/gls"; - rev = "v4.2.1"; - sha256 = "1vm37pvn0k4r6d3m620swwgama63laz8hhj3pyisdhxwam4m2g1h"; - }; - } - - { - goPackagePath = "github.com/kr/fs"; - fetch = { - type = "git"; - url = "https://github.com/kr/fs"; - rev = "v0.1.0"; - sha256 = "11zg176x9hr9q7fsk95r6q0wf214gg4czy02slax4x56n79g6a7q"; - }; - } - - { - goPackagePath = "github.com/mattn/go-colorable"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-colorable"; - rev = "v0.0.9"; - sha256 = "1nwjmsppsjicr7anq8na6md7b1z84l9ppnlr045hhxjvbkqwalvx"; - }; - } - - { - goPackagePath = "github.com/mattn/go-isatty"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-isatty"; - rev = "v0.0.4"; - sha256 = "0zs92j2cqaw9j8qx1sdxpv3ap0rgbs0vrvi72m40mg8aa36gd39w"; - }; - } - - { - goPackagePath = "github.com/mattn/go-runewidth"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-runewidth"; - rev = "v0.0.3"; - sha256 = "0lc39b6xrxv7h3v3y1kgz49cgi5qxwlygs715aam6ba35m48yi7g"; - }; - } - - { - goPackagePath = "github.com/minio/minio-go"; - fetch = { - type = "git"; - url = "https://github.com/minio/minio-go"; - rev = "v6.0.6"; - sha256 = "0bgivqw1n1189lksp85djw1rqcan2axyh4jv9q54iclrjkpbab37"; - }; - } - - { - goPackagePath = "github.com/mitchellh/go-homedir"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/go-homedir"; - rev = "v1.0.0"; - sha256 = "0f0z0aa4wivk4z1y503dmnw0k0g0g403dly8i4q263gfshs82sbq"; - }; - } - - { - goPackagePath = "github.com/pkg/errors"; - fetch = { - type = "git"; - url = "https://github.com/pkg/errors"; - rev = "v0.8.0"; - sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5"; - }; - } - - { - goPackagePath = "github.com/pkg/sftp"; - fetch = { - type = "git"; - url = "https://github.com/pkg/sftp"; - rev = "v1.8.2"; - sha256 = "040flbir6sv213xzs75vkd5fd7bmm3fqxfcnsx8fr77zkn52hm4m"; - }; - } - - { - 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/smartystreets/assertions"; - fetch = { - type = "git"; - url = "https://github.com/smartystreets/assertions"; - rev = "7c9eb446e3cf"; - sha256 = "1dix6qgaj6kw38hicy3zs3lvacl1kn0n267b3xw0vvdkqf1v0395"; - }; - } - - { - goPackagePath = "github.com/smartystreets/goconvey"; - fetch = { - type = "git"; - url = "https://github.com/smartystreets/goconvey"; - rev = "ef6db91d284a"; - sha256 = "16znlpsms8z2qc3airawyhzvrzcp70p9bx375i19bg489hgchxb7"; - }; - } - - { - goPackagePath = "github.com/spf13/cobra"; - fetch = { - type = "git"; - url = "https://github.com/spf13/cobra"; - rev = "v0.0.3"; - sha256 = "1q1nsx05svyv9fv3fy6xv6gs9ffimkyzsfm49flvl3wnvf1ncrkd"; - }; - } - - { - goPackagePath = "github.com/spf13/pflag"; - fetch = { - type = "git"; - url = "https://github.com/spf13/pflag"; - rev = "v1.0.2"; - sha256 = "005598piihl3l83a71ahj10cpq9pbhjck4xishx1b4dzc02r9xr2"; - }; - } - - { - goPackagePath = "github.com/stretchr/testify"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/testify"; - rev = "v1.2.2"; - sha256 = "0dlszlshlxbmmfxj5hlwgv3r22x0y1af45gn1vd198nvvs3pnvfs"; - }; - } - - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "0709b304e793"; - sha256 = "0i05s09y5pavmfh71fgih7syxg58x7a4krgd8am6d3mnahnmab5c"; - }; - } - - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "161cd47e91fd"; - sha256 = "0254ld010iijygbzykib2vags1dc0wlmcmhgh4jl8iny159lhbcv"; - }; - } - - { - goPackagePath = "golang.org/x/sync"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sync"; - rev = "1d60e4601c6f"; - sha256 = "046jlanz2lkxq1r57x9bl6s4cvfqaic6p2xybsj8mq1120jv4rs6"; - }; - } - - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "49385e6e1522"; - sha256 = "0spbldahns09fdxkxflb1x24f8k2awdlnr6k5i7ci4fqd19r1dv4"; - }; - } - - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "v0.3.0"; - sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19"; - }; - } - - { - goPackagePath = "gopkg.in/cheggaaa/pb.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/cheggaaa/pb.v1"; - rev = "v1.0.25"; - sha256 = "0vxqiw6f3xyv0zy3g4lksf8za0z8i0hvfpw92hqimsy84f79j3dp"; - }; - } - - { - goPackagePath = "gopkg.in/ini.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/ini.v1"; - rev = "v1.38.2"; - sha256 = "0xbnw1nd22q6k863n5gs0nxld15w0p8qxbhfky85akcb5rk1vwi9"; - }; - } -] diff --git a/pkgs/applications/networking/sync/lsyncd/default.nix b/pkgs/applications/networking/sync/lsyncd/default.nix index 9573e1717de9..06371f80ffe9 100644 --- a/pkgs/applications/networking/sync/lsyncd/default.nix +++ b/pkgs/applications/networking/sync/lsyncd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, cmake, lua, pkgconfig, rsync, +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, lua, pkgconfig, rsync, asciidoc, libxml2, docbook_xml_dtd_45, docbook_xsl, libxslt }: stdenv.mkDerivation rec { @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { asciidoc libxml2 docbook_xml_dtd_45 docbook_xsl libxslt ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/axkibe/lsyncd"; description = "A utility that synchronizes local directories with remote targets"; license = licenses.gpl2; diff --git a/pkgs/applications/networking/sync/onedrive/default.nix b/pkgs/applications/networking/sync/onedrive/default.nix index b41178922af9..a6175af3511d 100644 --- a/pkgs/applications/networking/sync/onedrive/default.nix +++ b/pkgs/applications/networking/sync/onedrive/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { installShellCompletion --zsh --name _${pname} contrib/completions/complete.zsh ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A complete tool to interact with OneDrive on Linux"; homepage = "https://github.com/abraunegg/onedrive"; license = licenses.gpl3; diff --git a/pkgs/applications/networking/sync/rclone/browser.nix b/pkgs/applications/networking/sync/rclone/browser.nix index fb2020f0d3a2..8dbbc0cf2218 100644 --- a/pkgs/applications/networking/sync/rclone/browser.nix +++ b/pkgs/applications/networking/sync/rclone/browser.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, wrapQtAppsHook, qtbase }: +{ lib, stdenv, fetchFromGitHub, cmake, wrapQtAppsHook, qtbase }: stdenv.mkDerivation rec { pname = "rclone-browser"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ qtbase ]; - meta = with stdenv.lib; { + meta = with lib; { inherit (src.meta) homepage; description = "Graphical Frontend to Rclone written in Qt"; license = licenses.unlicense; diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix index 2f0a9a044f24..75c6e877a1f2 100644 --- a/pkgs/applications/networking/sync/rclone/default.nix +++ b/pkgs/applications/networking/sync/rclone/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, buildPackages, installShellFiles }: +{ lib, stdenv, buildGoModule, fetchFromGitHub, buildPackages, installShellFiles }: buildGoModule rec { pname = "rclone"; @@ -36,7 +36,7 @@ buildGoModule rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Command line program to sync files and directories to and from major cloud storage"; homepage = "https://rclone.org"; license = licenses.mit; diff --git a/pkgs/applications/networking/sync/rsync/base.nix b/pkgs/applications/networking/sync/rsync/base.nix index da00b4cbc2ee..7c7d3a1f418e 100644 --- a/pkgs/applications/networking/sync/rsync/base.nix +++ b/pkgs/applications/networking/sync/rsync/base.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: rec { version = "3.2.3"; @@ -13,7 +13,7 @@ rec { sha256 = "1wj21v57v135n6fnmlm2dxmb9lhrrg62jgkggldp1gb7d6s4arny"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Fast incremental file transfer utility"; homepage = "https://rsync.samba.org/"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/networking/sync/rsync/default.nix b/pkgs/applications/networking/sync/rsync/default.nix index e07fecbf8936..f8fe9b666966 100644 --- a/pkgs/applications/networking/sync/rsync/default.nix +++ b/pkgs/applications/networking/sync/rsync/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, libiconv, zlib, popt +{ lib, stdenv, fetchurl, perl, libiconv, zlib, popt , enableACLs ? !(stdenv.isDarwin || stdenv.isSunOS || stdenv.isFreeBSD), acl ? null , enableLZ4 ? true, lz4 ? null , enableOpenSSL ? true, openssl ? null @@ -15,7 +15,7 @@ assert enableXXHash -> xxHash != null; assert enableZstd -> zstd != null; let - base = import ./base.nix { inherit stdenv fetchurl; }; + base = import ./base.nix { inherit lib stdenv fetchurl; }; in stdenv.mkDerivation rec { name = "rsync-${base.version}"; diff --git a/pkgs/applications/networking/sync/rsync/rrsync.nix b/pkgs/applications/networking/sync/rsync/rrsync.nix index 19be478b0f1e..2ec940d52a8b 100644 --- a/pkgs/applications/networking/sync/rsync/rrsync.nix +++ b/pkgs/applications/networking/sync/rsync/rrsync.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, perl, rsync }: +{ lib, stdenv, fetchurl, perl, rsync }: let - base = import ./base.nix { inherit stdenv fetchurl; }; + base = import ./base.nix { inherit stdenv lib fetchurl; }; in stdenv.mkDerivation { name = "rrsync-${base.version}"; diff --git a/pkgs/applications/networking/syncthing-gtk/default.nix b/pkgs/applications/networking/syncthing-gtk/default.nix index e432b3795172..a7f9c5f9f4be 100644 --- a/pkgs/applications/networking/syncthing-gtk/default.nix +++ b/pkgs/applications/networking/syncthing-gtk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, libnotify, librsvg, killall +{ lib, stdenv, fetchFromGitHub, fetchpatch, libnotify, librsvg, killall , gtk3, libappindicator-gtk3, substituteAll, syncthing, wrapGAppsHook , gnome3, buildPythonApplication, dateutil, pyinotify, pygobject3 , bcrypt, gobject-introspection, gsettings-desktop-schemas @@ -55,7 +55,7 @@ buildPythonApplication rec { substituteInPlace syncthing-gtk.desktop --replace "/usr/bin/syncthing-gtk" "$out/bin/syncthing-gtk" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "GTK3 & python based GUI for Syncthing"; homepage = "https://github.com/syncthing/syncthing-gtk"; license = licenses.gpl2; diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index 84b571a20f0c..c6767f2e0ae1 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -3,17 +3,17 @@ let common = { stname, target, postInstall ? "" }: buildGoModule rec { - version = "1.12.0"; + version = "1.12.1"; name = "${stname}-${version}"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; rev = "v${version}"; - sha256 = "09kqc66pnklhmlcn66c5zydnvy2mfs2hqzd1465ydww8bbgcncss"; + sha256 = "1jyqkprb9ps8xc86qnf140wbx5kvshyihxxgym409kfks6dk3cq5"; }; - vendorSha256 = "1jw0k1wm9mfsa2yr2fi2j8mrlykrlcwfnii07rafv9dnnwabs022"; + vendorSha256 = "1xlkc47wfhsf6gzq9sgimlzqnrqdsjgc1zzfkjp3xzbbv5ay7wca"; doCheck = false; diff --git a/pkgs/applications/networking/termius/default.nix b/pkgs/applications/networking/termius/default.nix index b4907cc8bdae..ff4a847aefe5 100644 --- a/pkgs/applications/networking/termius/default.nix +++ b/pkgs/applications/networking/termius/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { "''${gappsWrapperArgs[@]}" ''; - meta = with stdenv.lib; { + meta = with lib; { broken = true; description = "A cross-platform SSH client with cloud data sync and more"; homepage = "https://termius.com/"; diff --git a/pkgs/applications/networking/testssl/default.nix b/pkgs/applications/networking/testssl/default.nix index 0e0727d464f8..611f4cf0c1f7 100644 --- a/pkgs/applications/networking/testssl/default.nix +++ b/pkgs/applications/networking/testssl/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/testssl.sh --prefix PATH ':' ${lib.makeBinPath buildInputs} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "CLI tool to check a server's TLS/SSL capabilities"; longDescription = '' CLI tool which checks a server's service on any port for the support of diff --git a/pkgs/applications/networking/tsung/default.nix b/pkgs/applications/networking/tsung/default.nix index 7b142249687d..41bc6c64da80 100644 --- a/pkgs/applications/networking/tsung/default.nix +++ b/pkgs/applications/networking/tsung/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { --set PERL5LIB "${perlPackages.makePerlPath [ perlPackages.TemplateToolkit ]}" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://tsung.erlang-projects.org/"; description = "A high-performance benchmark framework for various protocols including HTTP, XMPP, LDAP, etc"; longDescription = '' diff --git a/pkgs/applications/networking/umurmur/default.nix b/pkgs/applications/networking/umurmur/default.nix index d16c1bb944a2..05aa66eb39cb 100644 --- a/pkgs/applications/networking/umurmur/default.nix +++ b/pkgs/applications/networking/umurmur/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, openssl, protobufc, libconfig }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, openssl, protobufc, libconfig }: stdenv.mkDerivation rec { pname = "umurmur"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { "--enable-shmapi" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Minimalistic Murmur (Mumble server)"; license = licenses.bsd3; homepage = "https://github.com/umurmur/umurmur"; diff --git a/pkgs/applications/networking/versus/default.nix b/pkgs/applications/networking/versus/default.nix index 1d2875e44e64..5e1b1e873c93 100644 --- a/pkgs/applications/networking/versus/default.nix +++ b/pkgs/applications/networking/versus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "versus"; @@ -13,7 +13,7 @@ buildGoModule rec { vendorSha256 = "1d12jcd8crxcgp5m8ga691wivim4cg8cbz4pzgxp0jhzg9jplpbv"; - meta = with stdenv.lib; { + meta = with lib; { description = "Benchmark multiple API endpoints against each other"; homepage = "https://github.com/INFURA/versus"; license = licenses.mit; diff --git a/pkgs/applications/networking/vnstat/default.nix b/pkgs/applications/networking/vnstat/default.nix index cd0f65d4d454..1db694326426 100644 --- a/pkgs/applications/networking/vnstat/default.nix +++ b/pkgs/applications/networking/vnstat/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gd, ncurses, sqlite, check }: +{ lib, stdenv, fetchurl, pkgconfig, gd, ncurses, sqlite, check }: stdenv.mkDerivation rec { pname = "vnstat"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Console-based network statistics utility for Linux"; longDescription = '' vnStat is a console-based network traffic monitor for Linux and BSD that diff --git a/pkgs/applications/networking/weather/meteo/default.nix b/pkgs/applications/networking/weather/meteo/default.nix index c0591f24c96d..3393dea929e6 100644 --- a/pkgs/applications/networking/weather/meteo/default.nix +++ b/pkgs/applications/networking/weather/meteo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, vala, python3, pkgconfig, meson, ninja, gtk3 +{ lib, stdenv, fetchFromGitLab, vala, python3, pkgconfig, meson, ninja, gtk3 , json-glib, libsoup, webkitgtk, geocode-glib, nix-update-script , libappindicator, desktop-file-utils, appstream, wrapGAppsHook }: @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { }; - meta = with stdenv.lib; { + meta = with lib; { description = "Know the forecast of the next hours & days"; homepage = "https://gitlab.com/bitseater/meteo"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/networking/znc/default.nix b/pkgs/applications/networking/znc/default.nix index 3487c72d4087..7e5231285451 100644 --- a/pkgs/applications/networking/znc/default.nix +++ b/pkgs/applications/networking/znc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl, pkgconfig +{ lib, stdenv, fetchurl, openssl, pkgconfig , withPerl ? false, perl , withPython ? false, python3 , withTcl ? false, tcl @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { ] ++ optional (!withIPv6) [ "--disable-ipv6" ] ++ optional withDebug [ "--enable-debug" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Advanced IRC bouncer"; homepage = "https://wiki.znc.in/ZNC"; maintainers = with maintainers; [ schneefux lnl7 ]; diff --git a/pkgs/applications/networking/znc/modules.nix b/pkgs/applications/networking/znc/modules.nix index c045598fc3b5..964afa459f4c 100644 --- a/pkgs/applications/networking/znc/modules.nix +++ b/pkgs/applications/networking/znc/modules.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, znc }: +{ lib, stdenv, fetchFromGitHub, znc }: let zncDerivation = a@{ @@ -29,7 +29,7 @@ in { sha256 = "1k7ifpqqzzf2j7w795q4mx1nvmics2higzjqr3mid3lp43sqg5s6"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Request backlog for IRC channels."; homepage = "https://github.com/fruitiex/znc-backlog/"; license = licenses.asl20; @@ -49,7 +49,7 @@ in { sha256 = "1jaspnrbv3pzsnbysqygc8s8g3q07zx5nlrdpgwv9j8aryg0pcnh"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "ZNC module for client specific buffers"; homepage = "https://github.com/CyberShadow/znc-clientbuffer"; license = licenses.asl20; @@ -69,7 +69,7 @@ in { sha256 = "0ikd3dzjjlr0gs0ikqfk50msm6mij99ln2rjzqavh58iwzr7n5r8"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "ZNC clientaway module"; homepage = "https://github.com/kylef/znc-contrib"; license = licenses.gpl2; @@ -109,7 +109,7 @@ in { sha256 = "0ikd3dzjjlr0gs0ikqfk50msm6mij99ln2rjzqavh58iwzr7n5r8"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "ZNC ignore module"; homepage = "https://github.com/kylef/znc-contrib"; license = licenses.gpl2; @@ -129,7 +129,7 @@ in { sha256 = "1gjr8yqgpkpcc18rf0zfgil3rcd1ihqk0q9f8rwbfvs5381h3c58"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Palaver ZNC module"; homepage = "https://github.com/cocodelabs/znc-palaver"; license = licenses.mit; @@ -149,7 +149,7 @@ in { sha256 = "0mgfajljy035051b2sx70i8xrb51zw9q2z64kf85zw1lynihzyh4"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "An advanced playback module for ZNC"; homepage = "https://github.com/jpnurmi/znc-playback"; license = licenses.asl20; diff --git a/pkgs/applications/office/abiword/default.nix b/pkgs/applications/office/abiword/default.nix index 4aa3f936b539..1a9073056e77 100644 --- a/pkgs/applications/office/abiword/default.nix +++ b/pkgs/applications/office/abiword/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtk3, fribidi +{ lib, stdenv, fetchurl, pkgconfig, gtk3, fribidi , libpng, popt, libgsf, enchant, wv, librsvg, bzip2, libjpeg, perl , boost, libxslt, goffice, wrapGAppsHook, gnome3 }: @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { libgsf enchant wv libjpeg perl boost libxslt goffice gnome3.adwaita-icon-theme ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Word processing program, similar to Microsoft Word"; homepage = "https://www.abisource.com/"; license = licenses.gpl3; diff --git a/pkgs/applications/office/aesop/default.nix b/pkgs/applications/office/aesop/default.nix index 0e76c101545b..aefa786d0609 100644 --- a/pkgs/applications/office/aesop/default.nix +++ b/pkgs/applications/office/aesop/default.nix @@ -1,4 +1,4 @@ -{ stdenv, vala, fetchFromGitHub, nix-update-script, pantheon, pkgconfig, meson, ninja, python3, gtk3 +{ lib, stdenv, vala, fetchFromGitHub, nix-update-script, pantheon, pkgconfig, meson, ninja, python3, gtk3 , desktop-file-utils, json-glib, libsoup, libgee, poppler, wrapGAppsHook, fetchpatch }: stdenv.mkDerivation rec { @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "The simplest PDF viewer around"; homepage = "https://github.com/lainsce/aesop"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/office/agenda/default.nix b/pkgs/applications/office/agenda/default.nix index 32cb2988ae30..9308fc6c6eac 100644 --- a/pkgs/applications/office/agenda/default.nix +++ b/pkgs/applications/office/agenda/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , nix-update-script , pantheon @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A simple, fast, no-nonsense to-do (task) list designed for elementary OS"; homepage = "https://github.com/dahenson/agenda"; maintainers = with maintainers; [ xiorcale ] ++ pantheon.maintainers; diff --git a/pkgs/applications/office/atlassian-cli/default.nix b/pkgs/applications/office/atlassian-cli/default.nix index ec8e2b396c58..d743baaed7e4 100644 --- a/pkgs/applications/office/atlassian-cli/default.nix +++ b/pkgs/applications/office/atlassian-cli/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, jre }: +{ lib, stdenv, fetchzip, jre }: stdenv.mkDerivation rec { pname = "atlassian-cli"; @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "An integrated family of CLI’s for various Atlassian applications"; homepage = "https://bobswift.atlassian.net/wiki/spaces/ACLI/overview"; license = licenses.unfreeRedistributable; diff --git a/pkgs/applications/office/beamerpresenter/default.nix b/pkgs/applications/office/beamerpresenter/default.nix index d18a757f6bb8..c07b4c5e1aa1 100644 --- a/pkgs/applications/office/beamerpresenter/default.nix +++ b/pkgs/applications/office/beamerpresenter/default.nix @@ -1,4 +1,4 @@ -{ stdenv, mkDerivation, fetchFromGitHub, installShellFiles, +{ lib, stdenv, mkDerivation, fetchFromGitHub, installShellFiles, qmake, qtbase, poppler, qtmultimedia }: mkDerivation rec { @@ -30,7 +30,7 @@ mkDerivation rec { installManPage man/*.{1,5} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Simple dual screen pdf presentation software"; homepage = "https://github.com/stiglers-eponym/BeamerPresenter"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/office/bookworm/default.nix b/pkgs/applications/office/bookworm/default.nix index 90b6c2fefc53..e6fa2884febb 100644 --- a/pkgs/applications/office/bookworm/default.nix +++ b/pkgs/applications/office/bookworm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pantheon, vala, python3, python2, pkgconfig, libxml2, meson, ninja, gtk3, gnome3, glib, webkitgtk, libgee +{ lib, stdenv, fetchFromGitHub, pantheon, vala, python3, python2, pkgconfig, libxml2, meson, ninja, gtk3, gnome3, glib, webkitgtk, libgee , gobject-introspection, sqlite, poppler, poppler_utils, html2text, curl, gnugrep, coreutils, bash, unzip, unar, wrapGAppsHook , appstream, desktop-file-utils }: @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { patchShebangs $out/share/bookworm/scripts/tasks/*.sh ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A simple, focused eBook reader"; longDescription = '' Read the books you love without having to worry about different format complexities like epub, pdf, mobi, cbr, etc. diff --git a/pkgs/applications/office/cb2bib/default.nix b/pkgs/applications/office/cb2bib/default.nix index f5b8b437249f..e57d490f05c1 100644 --- a/pkgs/applications/office/cb2bib/default.nix +++ b/pkgs/applications/office/cb2bib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qmake, qtbase, qtwebkit, qtx11extras, lzo, libX11 }: +{ lib, stdenv, fetchurl, qmake, qtbase, qtwebkit, qtx11extras, lzo, libX11 }: stdenv.mkDerivation rec { pname = "cb2bib"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { runHook postConfigure ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Rapidly extract unformatted, or unstandardized bibliographic references from email alerts, journal Web pages and PDF files"; homepage = "http://www.molspaces.com/d_cb2bib-overview.php"; maintainers = with maintainers; [ edwtjo ]; diff --git a/pkgs/applications/office/docear/default.nix b/pkgs/applications/office/docear/default.nix index fb9578c909df..e14fee010e87 100644 --- a/pkgs/applications/office/docear/default.nix +++ b/pkgs/applications/office/docear/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, runtimeShell, makeWrapper +{lib, stdenv, fetchurl, runtimeShell, makeWrapper , oraclejre , antialiasFont ? true }: @@ -30,7 +30,7 @@ stdenv.mkDerivation { chmod 0755 $out/bin/docear ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A unique solution to academic literature management"; homepage = "http://www.docear.org/"; # Licenses at: http://www.docear.org/software/download/ diff --git a/pkgs/applications/office/elementary-planner/default.nix b/pkgs/applications/office/elementary-planner/default.nix index acade32d744d..ff40d944c832 100644 --- a/pkgs/applications/office/elementary-planner/default.nix +++ b/pkgs/applications/office/elementary-planner/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , meson , ninja @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { ) ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Task manager with Todoist support designed for GNU/Linux 🚀️"; homepage = "https://planner-todo.web.app"; license = licenses.gpl3; diff --git a/pkgs/applications/office/envelope/default.nix b/pkgs/applications/office/envelope/default.nix index 450b52bc0ca1..6dc46d9dec6c 100644 --- a/pkgs/applications/office/envelope/default.nix +++ b/pkgs/applications/office/envelope/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , nix-update-script , fetchpatch @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Personal finance manager for elementary OS"; homepage = "https://github.com/cjfloss/envelope"; maintainers = with maintainers; [ xiorcale ] ++ pantheon.maintainers; diff --git a/pkgs/applications/office/espanso/default.nix b/pkgs/applications/office/espanso/default.nix index 14ac9ccbb30e..594c95d3d955 100644 --- a/pkgs/applications/office/espanso/default.nix +++ b/pkgs/applications/office/espanso/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , rustPlatform , pkgconfig @@ -42,7 +42,7 @@ rustPlatform.buildRustPackage rec { # Some tests require networking doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Cross-platform Text Expander written in Rust"; homepage = "https://espanso.org"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/office/flexibee/default.nix b/pkgs/applications/office/flexibee/default.nix index 52e58c5c9ccb..9dbdae3f0206 100644 --- a/pkgs/applications/office/flexibee/default.nix +++ b/pkgs/applications/office/flexibee/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, jre }: +{ lib, stdenv, fetchurl, makeWrapper, jre }: let version = "2020.2.6"; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Client for an accouting economic system"; homepage = "https://www.flexibee.eu/"; license = licenses.unfree; diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix index 29a96aac5c46..898ee032fc47 100644 --- a/pkgs/applications/office/gnucash/default.nix +++ b/pkgs/applications/office/gnucash/default.nix @@ -82,8 +82,6 @@ stdenv.mkDerivation rec { ''; doCheck = false; - enableParallelBuilding = true; - meta = { description = "Personal and small-business financial-accounting application"; diff --git a/pkgs/applications/office/gnumeric/default.nix b/pkgs/applications/office/gnumeric/default.nix index b0609863c5ad..ab8ec8212448 100644 --- a/pkgs/applications/office/gnumeric/default.nix +++ b/pkgs/applications/office/gnumeric/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkg-config, intltool, perlPackages +{ lib, stdenv, fetchurl, pkg-config, intltool, perlPackages , goffice, gnome3, wrapGAppsHook, gtk3, bison, python3Packages , itstool }: @@ -32,7 +32,7 @@ in stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "The GNOME Office Spreadsheet"; license = stdenv.lib.licenses.gpl2Plus; homepage = "http://projects.gnome.org/gnumeric/"; diff --git a/pkgs/applications/office/grisbi/default.nix b/pkgs/applications/office/grisbi/default.nix index 812218d0a38f..f52f9a3e9099 100644 --- a/pkgs/applications/office/grisbi/default.nix +++ b/pkgs/applications/office/grisbi/default.nix @@ -1,5 +1,5 @@ { fetchurl -, stdenv +, lib, stdenv , gtk , pkgconfig , libgsf @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { gnome3.adwaita-icon-theme ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A personnal accounting application"; longDescription = '' Grisbi is an application written by French developers, so it perfectly diff --git a/pkgs/applications/office/gtg/default.nix b/pkgs/applications/office/gtg/default.nix index 31266bf6142b..52558df5da81 100644 --- a/pkgs/applications/office/gtg/default.nix +++ b/pkgs/applications/office/gtg/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , meson , python3Packages @@ -61,7 +61,7 @@ python3Packages.buildPythonApplication rec { checkPhase = "xvfb-run python3 ../run-tests"; - meta = with stdenv.lib; { + meta = with lib; { description = " A personal tasks and TODO-list items organizer"; longDescription = '' "Getting Things GNOME" (GTG) is a personal tasks and ToDo list organizer inspired by the "Getting Things Done" (GTD) methodology. diff --git a/pkgs/applications/office/homebank/default.nix b/pkgs/applications/office/homebank/default.nix index dcda1c41e3c6..a0df71441142 100644 --- a/pkgs/applications/office/homebank/default.nix +++ b/pkgs/applications/office/homebank/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, gtk, pkgconfig, libofx, intltool, wrapGAppsHook +{ fetchurl, lib, stdenv, gtk, pkgconfig, libofx, intltool, wrapGAppsHook , libsoup, gnome3 }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk libofx intltool libsoup gnome3.adwaita-icon-theme ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Free, easy, personal accounting for everyone"; homepage = "http://homebank.free.fr/"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/office/ib/controller/default.nix b/pkgs/applications/office/ib/controller/default.nix index 7be7e4467b52..35aebf232606 100644 --- a/pkgs/applications/office/ib/controller/default.nix +++ b/pkgs/applications/office/ib/controller/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, jdk, ib-tws, xpra }: +{ lib, stdenv, fetchurl, unzip, jdk, ib-tws, xpra }: stdenv.mkDerivation rec { version = "2.14.0"; @@ -152,7 +152,7 @@ stdenv.mkDerivation rec { ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Automation Controller for the Trader Work Station of Interactive Brokers"; homepage = "https://github.com/ib-controller/ib-controller"; license = licenses.gpl3; diff --git a/pkgs/applications/office/ib/tws/default.nix b/pkgs/applications/office/ib/tws/default.nix index b8b31bed7c5e..403f675cb4ee 100644 --- a/pkgs/applications/office/ib/tws/default.nix +++ b/pkgs/applications/office/ib/tws/default.nix @@ -1,4 +1,4 @@ -{ stdenv, requireFile, jdk }: +{ lib, stdenv, requireFile, jdk }: stdenv.mkDerivation rec { version = "9542"; @@ -86,7 +86,7 @@ stdenv.mkDerivation rec { chmod u+x $out/bin/ib-gw ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Trader Work Station of Interactive Brokers"; homepage = "https://www.interactivebrokers.com"; license = licenses.unfree; diff --git a/pkgs/applications/office/jabref/default.nix b/pkgs/applications/office/jabref/default.nix index 03da2170b3d3..c593111f2f4a 100644 --- a/pkgs/applications/office/jabref/default.nix +++ b/pkgs/applications/office/jabref/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, makeDesktopItem, wrapGAppsHook, gtk3, gsettings-desktop-schemas +{ lib, stdenv, fetchurl, makeWrapper, makeDesktopItem, wrapGAppsHook, gtk3, gsettings-desktop-schemas , zlib , libX11, libXext, libXi, libXrender, libXtst, libGL, alsaLib, libav, cairo, freetype, pango, gdk-pixbuf, glib }: stdenv.mkDerivation rec { @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { cp unpacked/org.jabref/icons/jabref.svg $out/share/icons/jabref.svg ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Open source bibliography reference manager"; homepage = "https://www.jabref.org"; license = licenses.gpl2; diff --git a/pkgs/applications/office/jameica/default.nix b/pkgs/applications/office/jameica/default.nix index 6dc124c6a200..1585ebb4da73 100644 --- a/pkgs/applications/office/jameica/default.nix +++ b/pkgs/applications/office/jameica/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, makeDesktopItem, makeWrapper, ant, jdk, jre, gtk2, glib, xorg, Cocoa }: +{ lib, stdenv, fetchFromGitHub, makeDesktopItem, makeWrapper, ant, jdk, jre, gtk2, glib, xorg, Cocoa }: let _version = "2.8.6"; @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { --run "cd $out/share/java/" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.willuhn.de/products/jameica/"; description = "Free Runtime Environment for Java Applications"; longDescription = '' diff --git a/pkgs/applications/office/khronos/default.nix b/pkgs/applications/office/khronos/default.nix index b5cb94cda9b2..d35f8eec2eb1 100644 --- a/pkgs/applications/office/khronos/default.nix +++ b/pkgs/applications/office/khronos/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , nix-update-script , meson @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Track each task's time in a simple inobtrusive way"; homepage = "https://github.com/lainsce/khronos"; maintainers = with maintainers; [ xiorcale ] ++ pantheon.maintainers; diff --git a/pkgs/applications/office/kmymoney/default.nix b/pkgs/applications/office/kmymoney/default.nix index e15615f78a34..093d20906a4d 100644 --- a/pkgs/applications/office/kmymoney/default.nix +++ b/pkgs/applications/office/kmymoney/default.nix @@ -25,8 +25,6 @@ stdenv.mkDerivation rec { # Hidden dependency that wasn't included in CMakeLists.txt: NIX_CFLAGS_COMPILE = "-I${kitemmodels.dev}/include/KF5"; - enableParallelBuilding = true; - nativeBuildInputs = [ doxygen extra-cmake-modules graphviz kdoctools python2 python3Packages.wrapPython wrapQtAppsHook diff --git a/pkgs/applications/office/ledger-autosync/default.nix b/pkgs/applications/office/ledger-autosync/default.nix index 3a0f362dcf72..57d7e78d32ae 100644 --- a/pkgs/applications/office/ledger-autosync/default.nix +++ b/pkgs/applications/office/ledger-autosync/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python3Packages, fetchFromGitHub, ledger, hledger, useLedger ? true, useHledger ? true }: +{ lib, stdenv, python3Packages, fetchFromGitHub, ledger, hledger, useLedger ? true, useHledger ? true }: python3Packages.buildPythonApplication rec { pname = "ledger-autosync"; @@ -42,7 +42,7 @@ python3Packages.buildPythonApplication rec { nosetests -a generic -a ledger -a hledger ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/egh/ledger-autosync"; description = "OFX/CSV autosync for ledger and hledger"; license = licenses.gpl3; diff --git a/pkgs/applications/office/ledger/default.nix b/pkgs/applications/office/ledger/default.nix index 543545de2631..7f543c9bbcc6 100644 --- a/pkgs/applications/office/ledger/default.nix +++ b/pkgs/applications/office/ledger/default.nix @@ -21,8 +21,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake texinfo ]; - enableParallelBuilding = true; - cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" "-DBUILD_DOCS:BOOL=ON" diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index a8c0d4117a33..6d8983179dc4 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -300,8 +300,6 @@ in (mkDrv rec { cp -r sysui/desktop/icons "$out/share" sed -re 's@Icon=libreoffice(dev)?[0-9.]*-?@Icon=@' -i "$out/share/applications/"*.desktop - qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH") - mkdir -p $dev cp -r include $dev '' + lib.optionalString kdeIntegration '' diff --git a/pkgs/applications/office/marp/default.nix b/pkgs/applications/office/marp/default.nix index 5b05a9f164b7..e498f39949b9 100644 --- a/pkgs/applications/office/marp/default.nix +++ b/pkgs/applications/office/marp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, atomEnv, libXScrnSaver, gtk2 }: +{ lib, stdenv, fetchurl, atomEnv, libXScrnSaver, gtk2 }: stdenv.mkDerivation rec { pname = "marp"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { $out/bin/Marp ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Markdown presentation writer, powered by Electron"; homepage = "https://yhatt.github.io/marp/"; license = licenses.mit; diff --git a/pkgs/applications/office/mendeley/default.nix b/pkgs/applications/office/mendeley/default.nix index 192585bd4b5e..45af12ae0e35 100644 --- a/pkgs/applications/office/mendeley/default.nix +++ b/pkgs/applications/office/mendeley/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, mkDerivation, dpkg, which +{ fetchurl, lib, stdenv, mkDerivation, dpkg, which , makeWrapper , alsaLib , desktop-file-utils @@ -136,7 +136,7 @@ mkDerivation { updateScript = import ./update.nix { inherit writeScript runtimeShell; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.mendeley.com"; description = "A reference manager and academic social network"; license = licenses.unfree; diff --git a/pkgs/applications/office/moneyplex/default.nix b/pkgs/applications/office/moneyplex/default.nix index 85d9715bf396..cdea3cede11d 100644 --- a/pkgs/applications/office/moneyplex/default.nix +++ b/pkgs/applications/office/moneyplex/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, patchelf, coreutils, pcsclite +{ lib, stdenv, fetchurl, patchelf, coreutils, pcsclite , zlib, glib, gdk-pixbuf, gtk2, cairo, pango, libX11, atk, openssl , runtimeShell }: @@ -111,7 +111,7 @@ stdenv.mkDerivation { ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Moneyplex online banking software"; maintainers = with maintainers; [ tstrobel ]; platforms = platforms.linux; diff --git a/pkgs/applications/office/mytetra/default.nix b/pkgs/applications/office/mytetra/default.nix index 45d9e29ebe9a..f48ec3fb237c 100644 --- a/pkgs/applications/office/mytetra/default.nix +++ b/pkgs/applications/office/mytetra/default.nix @@ -1,4 +1,4 @@ -{ stdenv, mkDerivation, fetchurl, qmake, qtsvg, makeWrapper, xdg_utils }: +{ lib, stdenv, mkDerivation, fetchurl, qmake, qtsvg, makeWrapper, xdg_utils }: let version = "1.44.55"; @@ -29,7 +29,7 @@ in mkDerivation { --prefix PATH : ${xdg_utils}/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Smart manager for information collecting"; homepage = "https://webhamster.ru/site/page/index/articles/projectcode/138"; license = licenses.gpl3; diff --git a/pkgs/applications/office/notes-up/default.nix b/pkgs/applications/office/notes-up/default.nix index 6936387fb3cc..291e6f394930 100644 --- a/pkgs/applications/office/notes-up/default.nix +++ b/pkgs/applications/office/notes-up/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , nix-update-script , pantheon @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Markdown notes editor and manager designed for elementary OS" + stdenv.lib.optionalString withPantheon " - built with Contractor support"; homepage = "https://github.com/Philip-Scott/Notes-up"; diff --git a/pkgs/applications/office/osmo/default.nix b/pkgs/applications/office/osmo/default.nix index 507acb862a92..3513e44ed0c0 100644 --- a/pkgs/applications/office/osmo/default.nix +++ b/pkgs/applications/office/osmo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtk3, libxml2, gettext, libical, libnotify +{ lib, stdenv, fetchurl, pkgconfig, gtk3, libxml2, gettext, libical, libnotify , libarchive, gspell, webkitgtk, libgringotts, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 libxml2 libical libnotify libarchive gspell webkitgtk libgringotts ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A handy personal organizer"; homepage = "http://clayo.org/osmo/"; license = licenses.gpl2; diff --git a/pkgs/applications/office/p3x-onenote/default.nix b/pkgs/applications/office/p3x-onenote/default.nix index 55854be1020f..1653e9ec8223 100644 --- a/pkgs/applications/office/p3x-onenote/default.nix +++ b/pkgs/applications/office/p3x-onenote/default.nix @@ -1,4 +1,4 @@ -{ stdenv, appimageTools, desktop-file-utils, fetchurl }: +{ lib, stdenv, appimageTools, desktop-file-utils, fetchurl }: let version = "2020.10.111"; @@ -45,7 +45,7 @@ appimageTools.wrapType2 rec { --delete-original $out/p3x-onenote.desktop ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/patrikx3/onenote"; description = "Linux Electron Onenote - A Linux compatible version of OneNote"; license = licenses.mit; diff --git a/pkgs/applications/office/paperwork/paperwork-gtk.nix b/pkgs/applications/office/paperwork/paperwork-gtk.nix index c493421dd11b..847287c8c856 100644 --- a/pkgs/applications/office/paperwork/paperwork-gtk.nix +++ b/pkgs/applications/office/paperwork/paperwork-gtk.nix @@ -2,8 +2,6 @@ , python3Packages , gtk3 , cairo -, aspellDicts -, buildEnv , gnome3 , librsvg , xvfb_run @@ -40,16 +38,19 @@ python3Packages.buildPythonApplication rec { make l10n_compile ''; - ASPELL_CONF = "dict-dir ${buildEnv { - name = "aspell-all-dicts"; - paths = lib.collect lib.isDerivation aspellDicts; - }}/lib/aspell"; - postInstall = '' # paperwork-shell needs to be re-wrapped with access to paperwork cp ${python3Packages.paperwork-shell}/bin/.paperwork-cli-wrapped $out/bin/paperwork-cli # install desktop files and icons XDG_DATA_HOME=$out/share $out/bin/paperwork-gtk install --user + + # fixes [WARNING] [openpaperwork_core.resources.setuptools] Failed to find + # resource file paperwork_gtk.icon.out/paperwork_128.png, tried at path + # /nix/store/3n5lz6y8k9yks76f0nar3smc8djan3xr-paperwork-2.0.2/lib/python3.8/site-packages/paperwork_gtk/icon/out/paperwork_128.png. + site=$out/lib/${python3Packages.python.libPrefix}/site-packages/paperwork_gtk + for i in $site/data/paperwork_*.png; do + ln -s $i $site/icon/out; + done ''; checkInputs = [ xvfb_run dbus.daemon ]; diff --git a/pkgs/applications/office/paperwork/paperwork-shell.nix b/pkgs/applications/office/paperwork/paperwork-shell.nix index 1be6f329e3cf..7e633f54f9e1 100644 --- a/pkgs/applications/office/paperwork/paperwork-shell.nix +++ b/pkgs/applications/office/paperwork/paperwork-shell.nix @@ -10,6 +10,7 @@ , paperwork-backend , fabulous , getkey +, psutil , pkgs }: @@ -34,6 +35,7 @@ buildPythonPackage rec { paperwork-backend fabulous getkey + psutil ]; checkInputs = [ diff --git a/pkgs/applications/office/paperwork/src.nix b/pkgs/applications/office/paperwork/src.nix index 70770676edde..45c05cc4962e 100644 --- a/pkgs/applications/office/paperwork/src.nix +++ b/pkgs/applications/office/paperwork/src.nix @@ -1,12 +1,12 @@ {fetchFromGitLab}: rec { - version = "2.0.1"; + version = "2.0.2"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; repo = "paperwork"; group = "World"; owner = "OpenPaperwork"; rev = version; - sha256 = "16pc4drwpjl4937wdavs6wk0j1qs474b072wplhs8ywxfgqip1h4"; + sha256 = "1di7nnl8ywyiwfpl5m1kvip1m0hvijbmqmkdpviwqw7ajizrr1ly"; }; } diff --git a/pkgs/applications/office/pinpoint/default.nix b/pkgs/applications/office/pinpoint/default.nix index ce175d8517f5..6326df87ed2e 100644 --- a/pkgs/applications/office/pinpoint/default.nix +++ b/pkgs/applications/office/pinpoint/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, autoconf, automake, clutter, clutter-gst +{ fetchurl, lib, stdenv, pkgconfig, autoconf, automake, clutter, clutter-gst , gdk-pixbuf, cairo, clutter-gtk }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ autoconf automake clutter clutter-gst gdk-pixbuf cairo clutter-gtk ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://wiki.gnome.org/action/show/Apps/Pinpoint"; description = "A tool for making hackers do excellent presentations"; license = licenses.lgpl21; diff --git a/pkgs/applications/office/planner/default.nix b/pkgs/applications/office/planner/default.nix index f33946d6b5a2..dab567db898c 100644 --- a/pkgs/applications/office/planner/default.nix +++ b/pkgs/applications/office/planner/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitLab , pkgconfig , intltool @@ -56,7 +56,7 @@ in stdenv.mkDerivation { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://wiki.gnome.org/Apps/Planner"; description = "Project management application for GNOME"; longDescription = '' diff --git a/pkgs/applications/office/portfolio/default.nix b/pkgs/applications/office/portfolio/default.nix index d89284f90e5b..44c4a4e1f528 100644 --- a/pkgs/applications/office/portfolio/default.nix +++ b/pkgs/applications/office/portfolio/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , autoPatchelfHook , fetchurl , glibc @@ -24,11 +24,11 @@ let in stdenv.mkDerivation rec { pname = "PortfolioPerformance"; - version = "0.49.3"; + version = "0.50.0"; src = fetchurl { url = "https://github.com/buchen/portfolio/releases/download/${version}/PortfolioPerformance-${version}-linux.gtk.x86_64.tar.gz"; - sha256 = "1j8d3bih2hs1c1a6pjqpmdlh2hbj76s00srl0f850d06jhldg3p6"; + sha256 = "1jq4if5hx3fwag1dz38sj87av2na1kv4c36hai1gyz9w5qhjv7j8"; }; nativeBuildInputs = [ @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { ln -s $out/portfolio/icon.xpm $out/share/pixmaps/portfolio.xpm ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A simple tool to calculate the overall performance of an investment portfolio"; homepage = "https://www.portfolio-performance.info/"; license = licenses.epl10; diff --git a/pkgs/applications/office/scribus/default.nix b/pkgs/applications/office/scribus/default.nix index 779a5cb0fea3..4cc207753909 100644 --- a/pkgs/applications/office/scribus/default.nix +++ b/pkgs/applications/office/scribus/default.nix @@ -18,8 +18,6 @@ in stdenv.mkDerivation rec { sha256 = "0bq433myw6h1siqlsakxv6ghb002rp3mfz5k12bg68s0k6skn992"; }; - enableParallelBuilding = true; - nativeBuildInputs = [ pkgconfig cmake ]; buildInputs = with xorg; [ freetype lcms libtiff libxml2 libart_lgpl qt4 diff --git a/pkgs/applications/office/scribus/unstable.nix b/pkgs/applications/office/scribus/unstable.nix index c2c300b87486..8745dd37c98d 100644 --- a/pkgs/applications/office/scribus/unstable.nix +++ b/pkgs/applications/office/scribus/unstable.nix @@ -22,7 +22,7 @@ , qtbase , qtimageformats , qttools -, stdenv +, lib, stdenv }: let @@ -43,8 +43,6 @@ mkDerivation rec { sha256 = "sha256-1CV2lVOc+kDerYq9rwTFHjTU10vK1aLJNNCObp1Dt6s="; }; - enableParallelBuilding = true; - nativeBuildInputs = [ cmake pkgconfig @@ -72,7 +70,7 @@ mkDerivation rec { qttools ]; - meta = with stdenv.lib; { + meta = with lib; { maintainers = with maintainers; [ erictapen kiwi diff --git a/pkgs/applications/office/skanlite/default.nix b/pkgs/applications/office/skanlite/default.nix index 8e583f99a1a4..7436054715d8 100644 --- a/pkgs/applications/office/skanlite/default.nix +++ b/pkgs/applications/office/skanlite/default.nix @@ -1,4 +1,4 @@ -{ stdenv, mkDerivation, fetchurl, cmake, extra-cmake-modules, qtbase, +{ lib, stdenv, mkDerivation, fetchurl, cmake, extra-cmake-modules, qtbase, kcoreaddons, kdoctools, ki18n, kio, kxmlgui, ktextwidgets, libksane }: @@ -21,7 +21,7 @@ in mkDerivation rec { libksane ]; - meta = with stdenv.lib; { + meta = with lib; { description = "KDE simple image scanning application"; homepage = "http://www.kde.org/applications/graphics/skanlite/"; license = licenses.gpl2; diff --git a/pkgs/applications/office/softmaker/generic.nix b/pkgs/applications/office/softmaker/generic.nix index fbde26058e1b..7d936f400b87 100644 --- a/pkgs/applications/office/softmaker/generic.nix +++ b/pkgs/applications/office/softmaker/generic.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoPatchelfHook, makeDesktopItem, makeWrapper, copyDesktopItems +{ lib, stdenv, fetchurl, autoPatchelfHook, makeDesktopItem, makeWrapper, copyDesktopItems # Dynamic Libraries , curl, libGL, libX11, libXext, libXmu, libXrandr, libXrender @@ -119,7 +119,7 @@ in stdenv.mkDerivation { desktopItems = builtins.attrValues desktopItems; - meta = with stdenv.lib; { + meta = with lib; { description = "An office suite with a word processor, spreadsheet and presentation program"; homepage = "https://www.softmaker.com/"; license = licenses.unfree; diff --git a/pkgs/applications/office/spice-up/default.nix b/pkgs/applications/office/spice-up/default.nix index 0cf7e8c53f14..f40bc44e6eb8 100644 --- a/pkgs/applications/office/spice-up/default.nix +++ b/pkgs/applications/office/spice-up/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , nix-update-script , fetchpatch @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Create simple and beautiful presentations"; homepage = "https://github.com/Philip-Scott/Spice-up"; maintainers = with maintainers; [ samdroid-apps xiorcale ] ++ pantheon.maintainers; diff --git a/pkgs/applications/office/tagainijisho/default.nix b/pkgs/applications/office/tagainijisho/default.nix index d826b9f54f6a..18126b5e2b76 100644 --- a/pkgs/applications/office/tagainijisho/default.nix +++ b/pkgs/applications/office/tagainijisho/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qt4, cmake, sqlite }: +{ lib, stdenv, fetchurl, qt4, cmake, sqlite }: stdenv.mkDerivation { name = "tagainijisho-1.0.3"; @@ -7,9 +7,10 @@ stdenv.mkDerivation { sha256 = "0kmg1940yiqfm4vpifyj680283ids4nsij9s750nrshwxiwwbqvg"; }; - buildInputs = [ qt4 cmake sqlite ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ qt4 sqlite ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A free, open-source Japanese dictionary and kanji lookup tool"; homepage = "https://www.tagaini.net/"; license = with licenses; [ diff --git a/pkgs/applications/office/timekeeper/default.nix b/pkgs/applications/office/timekeeper/default.nix index 60b4bad60bb4..ba9390251fc5 100644 --- a/pkgs/applications/office/timekeeper/default.nix +++ b/pkgs/applications/office/timekeeper/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { install -Dm755 TimeKeeper/TimeKeeper $out/bin/timekeeper ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Log hours worked and make reports"; homepage = "https://github.com/bburdette/TimeKeeper"; maintainers = with maintainers; [ bburdette ]; diff --git a/pkgs/applications/office/timetable/default.nix b/pkgs/applications/office/timetable/default.nix index 838b1724ee86..fa70fdd30823 100644 --- a/pkgs/applications/office/timetable/default.nix +++ b/pkgs/applications/office/timetable/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , nix-update-script , glib @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Plot out your own timetable for the week and organize it"; homepage = "https://github.com/lainsce/timetable"; maintainers = [ maintainers.xiorcale ] ++ pantheon.maintainers; diff --git a/pkgs/applications/office/timeular/default.nix b/pkgs/applications/office/timeular/default.nix index f0fc5c3738cc..63f86171dce9 100644 --- a/pkgs/applications/office/timeular/default.nix +++ b/pkgs/applications/office/timeular/default.nix @@ -1,5 +1,5 @@ { - stdenv, + lib, stdenv, fetchurl, appimageTools, libsecret @@ -30,7 +30,7 @@ in appimageTools.wrapType2 rec { substituteInPlace $out/share/applications/timeular.desktop --replace 'Exec=AppRun' 'Exec=${pname}' ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Timetracking by flipping 8-sided dice"; longDescription = '' The Timeular Tracker is an 8-sided dice that sits on your desk. diff --git a/pkgs/applications/office/todoman/default.nix b/pkgs/applications/office/todoman/default.nix index 1c536458369d..dc788a6f1957 100644 --- a/pkgs/applications/office/todoman/default.nix +++ b/pkgs/applications/office/todoman/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , python3 , glibcLocales , installShellFiles @@ -60,7 +60,7 @@ buildPythonApplication rec { rm tests/test_cli.py ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/pimutils/todoman"; description = "Standards-based task manager based on iCalendar"; longDescription = '' diff --git a/pkgs/applications/office/treesheets/default.nix b/pkgs/applications/office/treesheets/default.nix index d316d4287072..552d28d1e950 100644 --- a/pkgs/applications/office/treesheets/default.nix +++ b/pkgs/applications/office/treesheets/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, wxGTK, makeWrapper }: +{ lib, stdenv, fetchFromGitHub, wxGTK, makeWrapper }: stdenv.mkDerivation rec { pname = "treesheets"; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { --replace "Icon=images/treesheets.svg" "Icon=$out/share/libexec/images/treesheets.svg" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Free Form Data Organizer"; longDescription = '' diff --git a/pkgs/applications/office/trilium/default.nix b/pkgs/applications/office/trilium/default.nix index 217f1fd85d62..bd067688fb48 100644 --- a/pkgs/applications/office/trilium/default.nix +++ b/pkgs/applications/office/trilium/default.nix @@ -1,4 +1,4 @@ -{ stdenv, nixosTests, fetchurl, autoPatchelfHook, atomEnv, makeWrapper, makeDesktopItem, gtk3, wrapGAppsHook, zlib, libxkbfile }: +{ lib, stdenv, nixosTests, fetchurl, autoPatchelfHook, atomEnv, makeWrapper, makeDesktopItem, gtk3, wrapGAppsHook, zlib, libxkbfile }: let description = "Trilium Notes is a hierarchical note taking application with focus on building large personal knowledge bases"; @@ -11,7 +11,7 @@ let categories = "Office"; }; - meta = with stdenv.lib; { + meta = with lib; { inherit description; homepage = "https://github.com/zadam/trilium"; license = licenses.agpl3; diff --git a/pkgs/applications/office/tudu/default.nix b/pkgs/applications/office/tudu/default.nix index 6094e02c5c1b..e353b43c7479 100644 --- a/pkgs/applications/office/tudu/default.nix +++ b/pkgs/applications/office/tudu/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses }: +{ lib, stdenv, fetchurl, ncurses }: stdenv.mkDerivation rec { pname = "tudu"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { --replace 'echo "main()' 'echo "int main()' ''; - meta = with stdenv.lib; { + meta = with lib; { description = "ncurses-based hierarchical todo list manager with vim-like keybindings"; homepage = "https://code.meskio.net/tudu/"; license = licenses.gpl3; diff --git a/pkgs/applications/office/watson/default.nix b/pkgs/applications/office/watson/default.nix index 00fa9416e172..30992e60a6fc 100644 --- a/pkgs/applications/office/watson/default.nix +++ b/pkgs/applications/office/watson/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pythonPackages, installShellFiles }: +{ lib, stdenv, fetchFromGitHub, pythonPackages, installShellFiles }: with pythonPackages; @@ -26,7 +26,7 @@ buildPythonApplication rec { propagatedBuildInputs = [ arrow click click-didyoumean requests ]; nativeBuildInputs = [ installShellFiles ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://tailordev.github.io/Watson/"; description = "A wonderful CLI to track your time!"; license = licenses.mit; diff --git a/pkgs/applications/office/wordgrinder/default.nix b/pkgs/applications/office/wordgrinder/default.nix index e50e319f319c..921ce4d5f3d2 100644 --- a/pkgs/applications/office/wordgrinder/default.nix +++ b/pkgs/applications/office/wordgrinder/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, makeWrapper +{ lib, stdenv, fetchFromGitHub, pkgconfig, makeWrapper , lua52Packages, libXft, ncurses, ninja, readline, zlib }: stdenv.mkDerivation rec { @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/xwordgrinder --set LUA_CPATH "${lua52Packages.luafilesystem}/lib/lua/5.2/lfs.so"; ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Text-based word processor"; homepage = "https://cowlark.com/wordgrinder"; license = licenses.mit; diff --git a/pkgs/applications/office/zim/default.nix b/pkgs/applications/office/zim/default.nix index 05a3c2de9b47..f34a3e806af7 100644 --- a/pkgs/applications/office/zim/default.nix +++ b/pkgs/applications/office/zim/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python3Packages, gtk3, gobject-introspection, wrapGAppsHook, gnome3 }: +{ lib, stdenv, fetchurl, python3Packages, gtk3, gobject-introspection, wrapGAppsHook, gnome3 }: # # TODO: Declare configuration options for the following optional dependencies: @@ -32,7 +32,7 @@ python3Packages.buildPythonApplication rec { ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A desktop wiki"; homepage = "http://zim-wiki.org"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/office/zotero/default.nix b/pkgs/applications/office/zotero/default.nix index d615f2a06f11..4b41655b9aea 100644 --- a/pkgs/applications/office/zotero/default.nix +++ b/pkgs/applications/office/zotero/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, wrapGAppsHook, makeDesktopItem +{ lib, stdenv, fetchurl, wrapGAppsHook, makeDesktopItem , atk , cairo , coreutils @@ -138,7 +138,7 @@ stdenv.mkDerivation rec { ) ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.zotero.org"; description = "Collect, organize, cite, and share your research sources"; license = licenses.agpl3; diff --git a/pkgs/applications/qubes/qubes-core-vchan-xen/default.nix b/pkgs/applications/qubes/qubes-core-vchan-xen/default.nix index f4d1b27478d4..3a1359ca573d 100644 --- a/pkgs/applications/qubes/qubes-core-vchan-xen/default.nix +++ b/pkgs/applications/qubes/qubes-core-vchan-xen/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , xen_4_10 }: @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { make install DESTDIR=$out PREFIX=/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Libraries required for the higher-level Qubes daemons and tools"; homepage = "https://qubes-os.org"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/radio/airspy/default.nix b/pkgs/applications/radio/airspy/default.nix index 67a59b68cd5b..f006eeb6756e 100644 --- a/pkgs/applications/radio/airspy/default.nix +++ b/pkgs/applications/radio/airspy/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { cmakeFlags = lib.optionals stdenv.isLinux [ "-DINSTALL_UDEV_RULES=ON" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/airspy/airspyone_host"; description = "Host tools and driver library for the AirSpy SDR"; license = licenses.bsd3; diff --git a/pkgs/applications/radio/aldo/default.nix b/pkgs/applications/radio/aldo/default.nix index 83bb520272ea..b850ea1014c6 100644 --- a/pkgs/applications/radio/aldo/default.nix +++ b/pkgs/applications/radio/aldo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, libao, autoreconfHook }: +{ lib, stdenv, fetchgit, libao, autoreconfHook }: let pname = "aldo"; @@ -16,7 +16,7 @@ in stdenv.mkDerivation { buildInputs = [ libao ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Morse code training program"; homepage = "http://aldo.nongnu.org/"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/radio/chirp/default.nix b/pkgs/applications/radio/chirp/default.nix index 8fb719567d55..6b84e47909dd 100644 --- a/pkgs/applications/radio/chirp/default.nix +++ b/pkgs/applications/radio/chirp/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , python2 }: @@ -15,7 +15,7 @@ python2.pkgs.buildPythonApplication rec { pygtk pyserial libxml2 future ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A free, open-source tool for programming your amateur radio"; homepage = "https://chirp.danplanet.com/"; license = licenses.gpl3; diff --git a/pkgs/applications/radio/cubicsdr/default.nix b/pkgs/applications/radio/cubicsdr/default.nix index c0dd4346d40a..d3b5b12836fd 100644 --- a/pkgs/applications/radio/cubicsdr/default.nix +++ b/pkgs/applications/radio/cubicsdr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, cmake, fftw, hamlib, libpulseaudio, libGL, libX11, liquid-dsp, +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, fftw, hamlib, libpulseaudio, libGL, libX11, liquid-dsp, pkgconfig, soapysdr-with-plugins, wxGTK31-gtk3, enableDigitalLab ? false }: stdenv.mkDerivation rec { @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DUSE_HAMLIB=ON" ] ++ stdenv.lib.optional enableDigitalLab "-DENABLE_DIGITAL_LAB=ON"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://cubicsdr.com"; description = "Software Defined Radio application"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/radio/dablin/default.nix b/pkgs/applications/radio/dablin/default.nix index 287649ddbe1e..0fb7317428ef 100644 --- a/pkgs/applications/radio/dablin/default.nix +++ b/pkgs/applications/radio/dablin/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig +{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig , mpg123, SDL2, gnome3, faad2, pcre } : @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ faad2 mpg123 SDL2 gnome3.gtkmm pcre ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Play DAB/DAB+ from ETI-NI aligned stream"; homepage = "https://github.com/Opendigitalradio/dablin"; license = with licenses; [ gpl3 lgpl21 ]; diff --git a/pkgs/applications/radio/dabtools/default.nix b/pkgs/applications/radio/dabtools/default.nix index 401e207ba4f6..04d1e6056de3 100644 --- a/pkgs/applications/radio/dabtools/default.nix +++ b/pkgs/applications/radio/dabtools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig +{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig , libusb1, rtl-sdr, fftw } : @@ -16,7 +16,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ rtl-sdr fftw libusb1 ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Commandline tools for DAB and DAB+ digital radio broadcasts"; homepage = "https://github.com/Opendigitalradio/dabtools"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/radio/dmrconfig/default.nix b/pkgs/applications/radio/dmrconfig/default.nix index 47b72669f8fd..4bf523a8b8b3 100644 --- a/pkgs/applications/radio/dmrconfig/default.nix +++ b/pkgs/applications/radio/dmrconfig/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , libusb1, systemd }: stdenv.mkDerivation rec { @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { install 99-dmr.rules $out/lib/udev/rules.d/99-dmr.rules ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Configuration utility for DMR radios"; longDescription = '' DMRconfig is a utility for programming digital radios via USB programming cable. diff --git a/pkgs/applications/radio/dsd/default.nix b/pkgs/applications/radio/dsd/default.nix index a369486278be..4b9fbcd6af25 100644 --- a/pkgs/applications/radio/dsd/default.nix +++ b/pkgs/applications/radio/dsd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake +{ lib, stdenv, fetchFromGitHub, cmake , mbelib, libsndfile, itpp , portaudioSupport ? true, portaudio ? null }: @@ -21,15 +21,13 @@ stdenv.mkDerivation rec { mbelib libsndfile itpp ] ++ stdenv.lib.optionals portaudioSupport [ portaudio ]; - enableParallelBuilding = true; - doCheck = true; preCheck = '' export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH''${DYLD_LIBRARY_PATH:+:}$PWD ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Digital Speech Decoder"; longDescription = '' DSD is able to decode several digital voice formats from discriminator diff --git a/pkgs/applications/radio/dump1090/default.nix b/pkgs/applications/radio/dump1090/default.nix index 6e70a9f8d032..f97ffb4d8070 100644 --- a/pkgs/applications/radio/dump1090/default.nix +++ b/pkgs/applications/radio/dump1090/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , pkgconfig , libbladeRF @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { cp -vr public_html $out/share/dump1090 ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A simple Mode S decoder for RTLSDR devices"; homepage = "https://github.com/flightaware/dump1090"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/radio/ebook2cw/default.nix b/pkgs/applications/radio/ebook2cw/default.nix index 5bd9e47ab716..4c8cd53ebd4d 100644 --- a/pkgs/applications/radio/ebook2cw/default.nix +++ b/pkgs/applications/radio/ebook2cw/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, lame, libvorbis, gettext }: +{ lib, stdenv, fetchgit, lame, libvorbis, gettext }: stdenv.mkDerivation rec { pname = "ebook2cw"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { makeFlags = [ "DESTDIR=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Convert ebooks to Morse MP3s/OGGs"; homepage = "http://fkurz.net/ham/ebook2cw.html"; license = licenses.gpl2; diff --git a/pkgs/applications/radio/gnss-sdr/default.nix b/pkgs/applications/radio/gnss-sdr/default.nix index d7e2d44c75ce..f48a21db75e7 100644 --- a/pkgs/applications/radio/gnss-sdr/default.nix +++ b/pkgs/applications/radio/gnss-sdr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , armadillo , boost , cmake @@ -8,7 +8,7 @@ , gflags , gnuradio , orc -, pkgconfig +, pkg-config , pythonPackages , uhd , log4cpp @@ -29,17 +29,16 @@ stdenv.mkDerivation rec { sha256 = "0a3k47fl5dizzhbqbrbmckl636lznyjby2d2nz6fz21637hvrnby"; }; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ armadillo boost.dev - cmake glog gmock openssl.dev gflags gnuradio orc - pkgconfig pythonPackages.Mako pythonPackages.six @@ -53,8 +52,6 @@ stdenv.mkDerivation rec { protobuf ]; - enableParallelBuilding = true; - cmakeFlags = [ "-DGFlags_ROOT_DIR=${gflags}/lib" "-DGLOG_INCLUDE_DIR=${glog}/include" @@ -72,7 +69,7 @@ stdenv.mkDerivation rec { "-DGFORTRAN=YES" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "An open source Global Navigation Satellite Systems software-defined receiver"; homepage = "https://gnss-sdr.org/"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/radio/gnuradio/ais.nix b/pkgs/applications/radio/gnuradio/ais.nix index 46d46d1c3255..9c993de65d01 100644 --- a/pkgs/applications/radio/gnuradio/ais.nix +++ b/pkgs/applications/radio/gnuradio/ais.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, boost, gnuradio +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, boost, gnuradio , makeWrapper, cppunit, gr-osmosdr, log4cpp , pythonSupport ? true, python, swig }: @@ -17,10 +17,9 @@ stdenv.mkDerivation { sha256 = "1b9j0kc74cw12a7jv4lii77dgzqzg2s8ndzp4xmisxksgva1qfvh"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ - cmake boost gnuradio makeWrapper cppunit gr-osmosdr log4cpp - ] ++ stdenv.lib.optionals pythonSupport [ python swig ]; + nativeBuildInputs = [ cmake makeWrapper pkg-config ]; + buildInputs = [ boost gnuradio cppunit gr-osmosdr log4cpp ] + ++ stdenv.lib.optionals pythonSupport [ python swig ]; postInstall = '' for prog in "$out"/bin/*; do @@ -28,9 +27,7 @@ stdenv.mkDerivation { done ''; - enableParallelBuilding = true; - - meta = with stdenv.lib; { + meta = with lib; { description = "Gnuradio block for ais"; homepage = "https://github.com/bistromath/gr-ais"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/radio/gnuradio/gsm.nix b/pkgs/applications/radio/gnuradio/gsm.nix index 4e2406fc07a0..39834540ff81 100644 --- a/pkgs/applications/radio/gnuradio/gsm.nix +++ b/pkgs/applications/radio/gnuradio/gsm.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, boost, gnuradio, log4cpp +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, boost, gnuradio, log4cpp , makeWrapper, cppunit, libosmocore, gr-osmosdr , pythonSupport ? true, python, swig }: @@ -16,9 +16,9 @@ stdenv.mkDerivation { sha256 = "13nnq927kpf91iqccr8db9ripy5czjl5jiyivizn6bia0bam2pvx"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ - cmake boost gnuradio makeWrapper cppunit libosmocore gr-osmosdr log4cpp + boost gnuradio makeWrapper cppunit libosmocore gr-osmosdr log4cpp ] ++ stdenv.lib.optionals pythonSupport [ python swig ]; postInstall = '' @@ -27,9 +27,7 @@ stdenv.mkDerivation { done ''; - enableParallelBuilding = true; - - meta = with stdenv.lib; { + meta = with lib; { description = "Gnuradio block for gsm"; homepage = "https://github.com/ptrkrysik/gr-gsm"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/radio/gnuradio/limesdr.nix b/pkgs/applications/radio/gnuradio/limesdr.nix index b2f99164bec6..1033b25cb3db 100644 --- a/pkgs/applications/radio/gnuradio/limesdr.nix +++ b/pkgs/applications/radio/gnuradio/limesdr.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, boost, gnuradio +{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, boost, gnuradio , pythonSupport ? true, python, swig, limesuite, log4cpp } : @@ -28,9 +28,7 @@ in stdenv.mkDerivation { ] ++ stdenv.lib.optionals pythonSupport [ python ]; - enableParallelBuilding = true; - - meta = with stdenv.lib; { + meta = with lib; { description = "Gnuradio source and sink blocks for LimeSDR"; homepage = "https://wiki.myriadrf.org/Gr-limesdr_Plugin_for_GNURadio"; license = licenses.mit; diff --git a/pkgs/applications/radio/gnuradio/nacl.nix b/pkgs/applications/radio/gnuradio/nacl.nix index 3435d5cdb4f0..e87d2a71b1c9 100644 --- a/pkgs/applications/radio/gnuradio/nacl.nix +++ b/pkgs/applications/radio/gnuradio/nacl.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, boost, gnuradio, uhd +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, boost, gnuradio, uhd , makeWrapper, libsodium, cppunit, log4cpp , pythonSupport ? true, python, swig }: @@ -16,9 +16,9 @@ stdenv.mkDerivation { sha256 = "018np0qlk61l7mlv3xxx5cj1rax8f1vqrsrch3higsl25yydbv7v"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ - cmake boost gnuradio uhd makeWrapper libsodium cppunit log4cpp + boost gnuradio uhd makeWrapper libsodium cppunit log4cpp ] ++ stdenv.lib.optionals pythonSupport [ python swig ]; postInstall = '' @@ -27,9 +27,7 @@ stdenv.mkDerivation { done ''; - enableParallelBuilding = true; - - meta = with stdenv.lib; { + meta = with lib; { description = "Gnuradio block for encryption"; homepage = "https://github.com/stwunsch/gr-nacl"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/radio/gnuradio/osmosdr.nix b/pkgs/applications/radio/gnuradio/osmosdr.nix index 9eb6fe648d02..90adcf5ffaef 100644 --- a/pkgs/applications/radio/gnuradio/osmosdr.nix +++ b/pkgs/applications/radio/gnuradio/osmosdr.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, cmake, pkgconfig, makeWrapper +{ lib, stdenv, fetchgit, cmake, pkg-config, makeWrapper , boost , pythonSupport ? true, python, swig , airspy @@ -23,10 +23,9 @@ stdenv.mkDerivation rec { sha256 = "0bf9bnc1c3c4yqqqgmg3nhygj6rcfmyk6pybi27f7461d2cw1drv"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ cmake makeWrapper pkg-config ]; buildInputs = [ - cmake makeWrapper boost log4cpp - airspy gnuradio hackrf libbladeRF rtl-sdr uhd + boost log4cpp airspy gnuradio hackrf libbladeRF rtl-sdr uhd ] ++ stdenv.lib.optionals stdenv.isLinux [ soapysdr-with-plugins ] ++ stdenv.lib.optionals pythonSupport [ python swig python.pkgs.cheetah ]; @@ -36,9 +35,7 @@ stdenv.mkDerivation rec { done ''; - enableParallelBuilding = true; - - meta = with stdenv.lib; { + meta = with lib; { description = "Gnuradio block for OsmoSDR and rtl-sdr"; homepage = "https://sdr.osmocom.org/trac/wiki/GrOsmoSDR"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/radio/gnuradio/rds.nix b/pkgs/applications/radio/gnuradio/rds.nix index 72838569bb3b..3c90a8ad9855 100644 --- a/pkgs/applications/radio/gnuradio/rds.nix +++ b/pkgs/applications/radio/gnuradio/rds.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, boost, gnuradio, log4cpp +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, boost, gnuradio, log4cpp , makeWrapper, pythonSupport ? true, python, swig }: @@ -15,9 +15,9 @@ stdenv.mkDerivation rec { sha256 = "0jkzchvw0ivcxsjhi1h0mf7k13araxf5m4wi5v9xdgqxvipjzqfy"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ - cmake boost gnuradio makeWrapper log4cpp + boost gnuradio makeWrapper log4cpp ] ++ stdenv.lib.optionals pythonSupport [ python swig ]; postInstall = '' @@ -26,9 +26,7 @@ stdenv.mkDerivation rec { done ''; - enableParallelBuilding = true; - - meta = with stdenv.lib; { + meta = with lib; { description = "Gnuradio block for radio data system"; homepage = "https://github.com/bastibl/gr-rds"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/radio/gqrx/default.nix b/pkgs/applications/radio/gqrx/default.nix index e06d04ca53f6..a4a1dfa61e40 100644 --- a/pkgs/applications/radio/gqrx/default.nix +++ b/pkgs/applications/radio/gqrx/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, qtbase, qtsvg, gnuradio, boost, gr-osmosdr +{ lib, stdenv, fetchFromGitHub, cmake, qtbase, qtsvg, gnuradio, boost, gr-osmosdr , mkDerivation # drivers (optional): , rtl-sdr, hackrf @@ -23,14 +23,12 @@ mkDerivation rec { qtbase qtsvg gnuradio boost gr-osmosdr rtl-sdr hackrf ] ++ stdenv.lib.optionals pulseaudioSupport [ libpulseaudio ]; - enableParallelBuilding = true; - postInstall = '' install -vD $src/gqrx.desktop -t "$out/share/applications/" install -vD $src/resources/icons/gqrx.svg -t "$out/share/pixmaps/" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Software defined radio (SDR) receiver"; longDescription = '' Gqrx is a software defined radio receiver powered by GNU Radio and the Qt diff --git a/pkgs/applications/radio/hackrf/default.nix b/pkgs/applications/radio/hackrf/default.nix index b0aaddcdc6b6..41df55a890d0 100644 --- a/pkgs/applications/radio/hackrf/default.nix +++ b/pkgs/applications/radio/hackrf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, libusb1, fftwSinglePrec }: +{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, libusb1, fftwSinglePrec }: stdenv.mkDerivation rec { pname = "hackrf"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { cd host ''; - meta = with stdenv.lib; { + meta = with lib; { description = "An open source SDR platform"; homepage = "https://greatscottgadgets.com/hackrf/"; license = licenses.gpl2; diff --git a/pkgs/applications/radio/kalibrate-hackrf/default.nix b/pkgs/applications/radio/kalibrate-hackrf/default.nix index 273d2d8c8e37..dc6b1325cf1c 100644 --- a/pkgs/applications/radio/kalibrate-hackrf/default.nix +++ b/pkgs/applications/radio/kalibrate-hackrf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, fftw, hackrf, libusb1 }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, fftw, hackrf, libusb1 }: stdenv.mkDerivation { name = "kalibrate-hackrf-unstable-20160827"; @@ -20,7 +20,7 @@ stdenv.mkDerivation { mv $out/bin/kal $out/bin/kal-hackrf ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Calculate local oscillator frequency offset in hackrf devices"; longDescription = '' Kalibrate, or kal, can scan for GSM base stations in a given frequency diff --git a/pkgs/applications/radio/kalibrate-rtl/default.nix b/pkgs/applications/radio/kalibrate-rtl/default.nix index 38913e827d09..536e83297c33 100644 --- a/pkgs/applications/radio/kalibrate-rtl/default.nix +++ b/pkgs/applications/radio/kalibrate-rtl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, autoreconfHook, pkgconfig, fftw, rtl-sdr, libusb1 }: +{ lib, stdenv, fetchgit, autoreconfHook, pkgconfig, fftw, rtl-sdr, libusb1 }: stdenv.mkDerivation { name = "kalibrate-rtl-20131214"; @@ -14,7 +14,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ fftw rtl-sdr libusb1 ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Calculate local oscillator frequency offset in RTL-SDR devices"; longDescription = '' Kalibrate, or kal, can scan for GSM base stations in a given frequency diff --git a/pkgs/applications/radio/limesuite/default.nix b/pkgs/applications/radio/limesuite/default.nix index 25f49c3a2d65..4272075a042b 100644 --- a/pkgs/applications/radio/limesuite/default.nix +++ b/pkgs/applications/radio/limesuite/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake +{ lib, stdenv, fetchFromGitHub, cmake , sqlite, wxGTK30-gtk3, libusb1, soapysdr , mesa_glu, libX11, gnuplot, fltk } : @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { install -Dm444 -t $out/share/limesuite bin/Release/lms7suite_mcu/* ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Driver and GUI for LMS7002M-based SDR platforms"; homepage = "https://github.com/myriadrf/LimeSuite"; license = licenses.asl20; diff --git a/pkgs/applications/radio/multimon-ng/default.nix b/pkgs/applications/radio/multimon-ng/default.nix index a51a67135c05..2524b48c9c27 100644 --- a/pkgs/applications/radio/multimon-ng/default.nix +++ b/pkgs/applications/radio/multimon-ng/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, qt4, qmake4Hook, libpulseaudio }: +{ lib, stdenv, fetchFromGitHub, qt4, qmake4Hook, libpulseaudio }: let version = "1.1.9"; in @@ -24,7 +24,7 @@ stdenv.mkDerivation { cp multimon-ng $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Multimon is a digital baseband audio protocol decoder"; longDescription = '' multimon-ng a fork of multimon, a digital baseband audio diff --git a/pkgs/applications/radio/qradiolink/default.nix b/pkgs/applications/radio/qradiolink/default.nix index 4c792811dc59..24c5f987f176 100644 --- a/pkgs/applications/radio/qradiolink/default.nix +++ b/pkgs/applications/radio/qradiolink/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, alsaLib, boost +{ lib, stdenv, fetchFromGitHub, alsaLib, boost , qt4, libpulseaudio, codec2, libconfig , gnuradio, gr-osmosdr, gsm , libopus, libjpeg, protobuf, qwt, speex @@ -50,7 +50,7 @@ in stdenv.mkDerivation { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "SDR transceiver application for analog and digital modes"; homepage = "http://qradiolink.org/"; license = licenses.agpl3; diff --git a/pkgs/applications/radio/qsstv/default.nix b/pkgs/applications/radio/qsstv/default.nix index d5d12a714031..ddf1d6c6febd 100644 --- a/pkgs/applications/radio/qsstv/default.nix +++ b/pkgs/applications/radio/qsstv/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, stdenv, fetchurl, qtbase, qmake, openjpeg, pkgconfig, fftw, +{ mkDerivation, lib, stdenv, fetchurl, qtbase, qmake, openjpeg, pkgconfig, fftw, libpulseaudio, alsaLib, hamlib, libv4l, fftwFloat }: mkDerivation rec { @@ -25,7 +25,7 @@ mkDerivation rec { install -D qsstv/icons/qsstv.png $out/share/pixmaps/qsstv.png ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Qt-based slow-scan TV and fax"; homepage = "http://users.telenet.be/on4qz/"; platforms = platforms.linux; diff --git a/pkgs/applications/radio/quisk/default.nix b/pkgs/applications/radio/quisk/default.nix index 86edfadcce11..c0dab8773c71 100644 --- a/pkgs/applications/radio/quisk/default.nix +++ b/pkgs/applications/radio/quisk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python38Packages, fetchPypi +{ lib, stdenv, python38Packages, fetchPypi , fftw, alsaLib, pulseaudio, wxPython_4_0 }: python38Packages.buildPythonApplication rec { @@ -16,7 +16,7 @@ python38Packages.buildPythonApplication rec { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "A SDR transceiver for radios that use the Hermes protocol"; longDescription = '' QUISK is a Software Defined Radio (SDR) transceiver. You supply radio diff --git a/pkgs/applications/radio/rtl-ais/default.nix b/pkgs/applications/radio/rtl-ais/default.nix index f806f07d597d..9f917329168d 100644 --- a/pkgs/applications/radio/rtl-ais/default.nix +++ b/pkgs/applications/radio/rtl-ais/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, libusb1, rtl-sdr }: +{ lib, stdenv, fetchFromGitHub, pkgconfig, libusb1, rtl-sdr }: stdenv.mkDerivation { name = "rtl-ais"; @@ -14,7 +14,7 @@ stdenv.mkDerivation { makeFlags = [ "PREFIX=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A simple AIS tuner and generic dual-frequency FM demodulator"; homepage = "https://github.com/dgiardini/rtl-ais"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/radio/rtl-sdr/default.nix b/pkgs/applications/radio/rtl-sdr/default.nix index 7e044296b02c..3f69f40424e3 100644 --- a/pkgs/applications/radio/rtl-sdr/default.nix +++ b/pkgs/applications/radio/rtl-sdr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, fetchpatch, cmake, pkgconfig, libusb1 }: +{ lib, stdenv, fetchgit, fetchpatch, cmake, pkgconfig, libusb1 }: stdenv.mkDerivation rec { pname = "rtl-sdr"; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { echo "Requires: libusb-1.0" >> "$pcfile" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Turns your Realtek RTL2832 based DVB dongle into a SDR receiver"; homepage = "http://sdr.osmocom.org/trac/wiki/rtl-sdr"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/radio/rtl_433/default.nix b/pkgs/applications/radio/rtl_433/default.nix index c84160c19eae..6f4460e6d6eb 100644 --- a/pkgs/applications/radio/rtl_433/default.nix +++ b/pkgs/applications/radio/rtl_433/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig +{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig , libusb1, rtl-sdr, soapysdr-with-plugins }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Decode traffic from devices that broadcast on 433.9 MHz, 868 MHz, 315 MHz, 345 MHz and 915 MHz"; homepage = "https://github.com/merbanan/rtl_433"; license = licenses.gpl2; diff --git a/pkgs/applications/radio/soapyairspy/default.nix b/pkgs/applications/radio/soapyairspy/default.nix index 4a69e52741e7..0541c3abf914 100644 --- a/pkgs/applications/radio/soapyairspy/default.nix +++ b/pkgs/applications/radio/soapyairspy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake +{ lib, stdenv, fetchFromGitHub, cmake , airspy, soapysdr } : @@ -21,7 +21,7 @@ in stdenv.mkDerivation { cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/pothosware/SoapyAirspy"; description = "SoapySDR plugin for Airspy devices"; license = licenses.mit; diff --git a/pkgs/applications/radio/soapyaudio/default.nix b/pkgs/applications/radio/soapyaudio/default.nix index ce5811b009ee..e12cced055c2 100644 --- a/pkgs/applications/radio/soapyaudio/default.nix +++ b/pkgs/applications/radio/soapyaudio/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkg-config +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config , hamlib, rtaudio, alsaLib, libpulseaudio, libjack2, libusb1, soapysdr } : @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { "-DUSE_HAMLIB=ON" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/pothosware/SoapyAudio"; description = "SoapySDR plugin for amateur radio and audio devices"; license = licenses.mit; diff --git a/pkgs/applications/radio/soapybladerf/default.nix b/pkgs/applications/radio/soapybladerf/default.nix index 7e2e17a84558..db9ad67ad401 100644 --- a/pkgs/applications/radio/soapybladerf/default.nix +++ b/pkgs/applications/radio/soapybladerf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig +{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig , libbladeRF, soapysdr } : @@ -22,7 +22,7 @@ in stdenv.mkDerivation { cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/pothosware/SoapyBladeRF"; description = "SoapySDR plugin for BladeRF devices"; license = licenses.lgpl21; diff --git a/pkgs/applications/radio/soapyhackrf/default.nix b/pkgs/applications/radio/soapyhackrf/default.nix index e472b1cc3ae9..105f0f423f46 100644 --- a/pkgs/applications/radio/soapyhackrf/default.nix +++ b/pkgs/applications/radio/soapyhackrf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig +{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig , hackrf, soapysdr } : @@ -21,7 +21,7 @@ in stdenv.mkDerivation { cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/pothosware/SoapyHackRF"; description = "SoapySDR plugin for HackRF devices"; license = licenses.mit; diff --git a/pkgs/applications/radio/soapyremote/default.nix b/pkgs/applications/radio/soapyremote/default.nix index b49debdb1af0..1433b1e9abba 100644 --- a/pkgs/applications/radio/soapyremote/default.nix +++ b/pkgs/applications/radio/soapyremote/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, soapysdr, avahi }: +{ lib, stdenv, fetchFromGitHub, cmake, soapysdr, avahi }: let version = "0.5.2"; @@ -19,7 +19,7 @@ in stdenv.mkDerivation { cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/pothosware/SoapyRemote"; description = "SoapySDR plugin for remote access to SDRs"; license = licenses.boost; diff --git a/pkgs/applications/radio/soapyrtlsdr/default.nix b/pkgs/applications/radio/soapyrtlsdr/default.nix index 8f342190ba7e..4be9e20d1f58 100644 --- a/pkgs/applications/radio/soapyrtlsdr/default.nix +++ b/pkgs/applications/radio/soapyrtlsdr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig +{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig , rtl-sdr, soapysdr } : @@ -21,7 +21,7 @@ in stdenv.mkDerivation { cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/pothosware/SoapyRTLSDR"; description = "SoapySDR plugin for RTL-SDR devices"; license = licenses.mit; diff --git a/pkgs/applications/radio/soapysdr/default.nix b/pkgs/applications/radio/soapysdr/default.nix index 676f7d3c839e..87f69377c62b 100644 --- a/pkgs/applications/radio/soapysdr/default.nix +++ b/pkgs/applications/radio/soapysdr/default.nix @@ -45,7 +45,7 @@ in stdenv.mkDerivation { done ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/pothosware/SoapySDR"; description = "Vendor and platform neutral SDR support library"; license = licenses.boost; diff --git a/pkgs/applications/radio/soapyuhd/default.nix b/pkgs/applications/radio/soapyuhd/default.nix index b2223d1abb70..864ceff4e1dd 100644 --- a/pkgs/applications/radio/soapyuhd/default.nix +++ b/pkgs/applications/radio/soapyuhd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkg-config +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config , uhd, boost, soapysdr } : @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { sed -i "s:DESTINATION .*uhd/modules:DESTINATION $out/lib/uhd/modules:" CMakeLists.txt ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/pothosware/SoapyAirspy"; description = "SoapySDR plugin for UHD devices"; license = licenses.gpl3Only; diff --git a/pkgs/applications/radio/soundmodem/default.nix b/pkgs/applications/radio/soundmodem/default.nix new file mode 100644 index 000000000000..7f1332a45a6a --- /dev/null +++ b/pkgs/applications/radio/soundmodem/default.nix @@ -0,0 +1,36 @@ +{ lib, stdenv, fetchurl, pkg-config, alsaLib, audiofile, gtk2, libxml2 }: + +stdenv.mkDerivation rec { + name = "soundmodem"; + version = "0.20"; + + src = fetchurl { + url = "https://archive.org/download/${name}-${version}/${name}-${version}.tar.gz"; + sha256 = "156l3wjnh5rcisxb42kcmlf74swf679v4xnj09zy5j74rd4h721z"; + }; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ alsaLib audiofile gtk2 libxml2 ]; + + patches = [ ./matFix.patch ]; + + doCheck = true; + + meta = with lib; { + description = "Audio based modem for ham radio supporting ax.25"; + longDescription = '' + This software allows a standard PC soundcard to be used as a packet radio "modem". The whole processing is done on the main processor CPU. + Unlike previous packet radio modem software, this new release offers several new benefits: + - Now uses standard operating system sound drivers (OSS/Free under Linux, /dev/audio under Solaris and DirectSound under Windows), thus runs on all soundcards for which drivers for the desired operating system are available. + - No fixed relationship between bitrate, sampling rate, and modem parameters. Modems may be parametrized, and multiple modems may even run on the same audio channel! + - Usermode solution allows the use of MMX, VIS, Floating point and other media instruction sets to speed up computation. + - Cross platform builds from a single source code provides ubiquitous availability. + ''; + #homepage = "http://gna.org/projects/soundmodem"; # official, but "Connection refused" + homepage = "http://soundmodem.vk4msl.id.au/"; + downloadPage = "https://archive.org/download/${name}-${version}/${name}-${version}.tar.gz"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ ymarkus ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/radio/soundmodem/matFix.patch b/pkgs/applications/radio/soundmodem/matFix.patch new file mode 100644 index 000000000000..55436cda3d41 --- /dev/null +++ b/pkgs/applications/radio/soundmodem/matFix.patch @@ -0,0 +1,11 @@ +--- a/matlib/mat.hh 2003-01-06 23:47:26.000000000 +0100 ++++ b/matlib/mat.copy.hh 2021-01-06 10:05:34.332415179 +0100 +@@ -91,7 +91,7 @@ + memcpy(c, r, d1 * d3 * sizeof(c[0])); + } + +-template void mdet(const T *c, unsigned int d) ++template int mdet(const T *c, unsigned int d) + { + T *c2; + unsigned int i, j, k, l; diff --git a/pkgs/applications/radio/svxlink/default.nix b/pkgs/applications/radio/svxlink/default.nix index e06fcb5d3e67..f2688db4ad1d 100644 --- a/pkgs/applications/radio/svxlink/default.nix +++ b/pkgs/applications/radio/svxlink/default.nix @@ -1,4 +1,4 @@ -{ stdenv, cmake, pkgconfig, fetchFromGitHub, makeDesktopItem, alsaLib, speex +{ lib, stdenv, cmake, pkgconfig, fetchFromGitHub, makeDesktopItem, alsaLib, speex , libopus, curl, gsm, libgcrypt, libsigcxx, popt, qtbase, qttools , wrapQtAppsHook, rtl-sdr, tcl, doxygen, groff }: @@ -29,7 +29,6 @@ in stdenv.mkDerivation rec { "-DRTLSDR_INCLUDE_DIRS=${rtl-sdr}/include" "../src" ]; - enableParallelBuilding = true; dontWrapQtApps = true; nativeBuildInputs = [ cmake pkgconfig doxygen groff wrapQtAppsHook ]; @@ -57,7 +56,7 @@ in stdenv.mkDerivation rec { wrapQtApp $out/bin/qtel ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Advanced repeater controller and EchoLink software"; longDescription = '' Advanced repeater controller and EchoLink software for Linux including a diff --git a/pkgs/applications/radio/tlf/default.nix b/pkgs/applications/radio/tlf/default.nix index fd9ab82b321c..a9fd0102dd17 100644 --- a/pkgs/applications/radio/tlf/default.nix +++ b/pkgs/applications/radio/tlf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, autoconf, automake, pkgconfig, glib +{ lib, stdenv, fetchFromGitHub, autoreconfHook, autoconf, automake, pkgconfig, glib , perl, ncurses5, hamlib, xmlrpc_c }: stdenv.mkDerivation rec { @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ln -s ${ncurses5.out}/lib/libtinfo.so.5 $out/lib/libtinfo.so.5 ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Advanced ham radio logging and contest program"; longDescription = '' TLF is a curses based console mode general logging and contest program for diff --git a/pkgs/applications/radio/tqsl/default.nix b/pkgs/applications/radio/tqsl/default.nix index fd5f5505a672..f0dd916a3354 100644 --- a/pkgs/applications/radio/tqsl/default.nix +++ b/pkgs/applications/radio/tqsl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, cmake, expat, openssl, zlib, db, curl, wxGTK }: +{ lib, stdenv, fetchurl, makeWrapper, cmake, expat, openssl, zlib, db, curl, wxGTK }: stdenv.mkDerivation rec { pname = "tqsl"; @@ -9,9 +9,8 @@ stdenv.mkDerivation rec { sha256 = "00v4n8pvi5qi2psjnrw611w5gg5bdlaxbsny535fsci3smyygpc0"; }; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ cmake makeWrapper ]; buildInputs = [ - cmake expat openssl zlib @@ -20,7 +19,7 @@ stdenv.mkDerivation rec { wxGTK ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Software for using the ARRL Logbook of the World"; homepage = "https://www.arrl.org/tqsl-download"; license = licenses.bsd3; diff --git a/pkgs/applications/radio/uhd/default.nix b/pkgs/applications/radio/uhd/default.nix index e7ddb5787fac..033c2c4e2a67 100644 --- a/pkgs/applications/radio/uhd/default.nix +++ b/pkgs/applications/radio/uhd/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , fetchFromGitHub , cmake @@ -54,8 +54,6 @@ stdenv.mkDerivation rec { sha256 = "1fir1a13ac07mqhm4sr34cixiqj2difxq0870qv1wr7a7cbfw6vp"; }; - enableParallelBuilding = true; - cmakeFlags = [ "-DENABLE_LIBUHD=ON" "-DENABLE_USB=ON" @@ -143,7 +141,7 @@ stdenv.mkDerivation rec { mv $out/lib/uhd/utils/uhd-usrp.rules $out/lib/udev/rules.d/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "USRP Hardware Driver (for Software Defined Radio)"; longDescription = '' The USRP Hardware Driver (UHD) software is the hardware driver for all diff --git a/pkgs/applications/radio/unixcw/default.nix b/pkgs/applications/radio/unixcw/default.nix index fe31fd133e79..ec449517fcf7 100644 --- a/pkgs/applications/radio/unixcw/default.nix +++ b/pkgs/applications/radio/unixcw/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, libpulseaudio, alsaLib , pkgconfig, qt5}: +{lib, stdenv, fetchurl, libpulseaudio, alsaLib , pkgconfig, qt5}: stdenv.mkDerivation rec { pname = "unixcw"; version = "3.5.1"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [libpulseaudio alsaLib pkgconfig qt5.qtbase]; CFLAGS ="-lasound -lpulse-simple"; - meta = with stdenv.lib; { + meta = with lib; { description = "sound characters as Morse code on the soundcard or console speaker"; longDescription = '' unixcw is a project providing libcw library and a set of programs diff --git a/pkgs/applications/radio/urh/default.nix b/pkgs/applications/radio/urh/default.nix index 5411571113d5..3a51f77d7bd6 100644 --- a/pkgs/applications/radio/urh/default.nix +++ b/pkgs/applications/radio/urh/default.nix @@ -5,13 +5,13 @@ python3Packages.buildPythonApplication rec { pname = "urh"; - version = "2.9.0"; + version = "2.9.1"; src = fetchFromGitHub { owner = "jopohl"; repo = pname; rev = "v${version}"; - sha256 = "1pcyj1vzv51j8rgi0hh9chw3vfkfi03bg1rg7gs4nk95ffmwx4pd"; + sha256 = "0s8zlq2bx6hp8c522rkxj9kbkf3a0qj6iyg7q9dcxmcl3q2sanq9"; }; nativeBuildInputs = [ qt5.wrapQtAppsHook ]; diff --git a/pkgs/applications/radio/welle-io/default.nix b/pkgs/applications/radio/welle-io/default.nix index 77969c5ca3f9..87c04dd3b98e 100644 --- a/pkgs/applications/radio/welle-io/default.nix +++ b/pkgs/applications/radio/welle-io/default.nix @@ -39,8 +39,6 @@ in mkDerivation { "-DRTLSDR=true" "-DSOAPYSDR=true" ]; - enableParallelBuilding = true; - meta = with lib; { description = "A DAB/DAB+ Software Radio"; homepage = "https://www.welle.io/"; diff --git a/pkgs/applications/radio/wsjtx/default.nix b/pkgs/applications/radio/wsjtx/default.nix index b11b6b474c64..debbaf0606f4 100644 --- a/pkgs/applications/radio/wsjtx/default.nix +++ b/pkgs/applications/radio/wsjtx/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, asciidoc, asciidoctor, autoconf, automake, cmake, +{ lib, stdenv, fetchurl, asciidoc, asciidoctor, autoconf, automake, cmake, docbook_xsl, fftw, fftwFloat, gfortran, libtool, libusb1, qtbase, qtmultimedia, qtserialport, qttools, texinfo, wrapQtAppsHook }: @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { # Remove Git dependency from superbuild since sources are included patches = [ ./super.patch ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Weak-signal digital communication modes for amateur radio"; longDescription = '' WSJT-X implements communication protocols or "modes" called FT4, FT8, JT4, diff --git a/pkgs/applications/radio/xlog/default.nix b/pkgs/applications/radio/xlog/default.nix index e92c216466fc..04797140b02b 100644 --- a/pkgs/applications/radio/xlog/default.nix +++ b/pkgs/applications/radio/xlog/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, glib, gtk2, pkgconfig, hamlib }: +{ lib, stdenv, fetchurl, glib, gtk2, pkgconfig, hamlib }: stdenv.mkDerivation rec { pname = "xlog"; version = "2.0.19"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib pkgconfig gtk2 hamlib ]; - meta = with stdenv.lib; { + meta = with lib; { description = "An amateur radio logging program"; longDescription = '' Xlog is an amateur radio logging program. diff --git a/pkgs/applications/science/astronomy/gpredict/default.nix b/pkgs/applications/science/astronomy/gpredict/default.nix index 1ae80c0b0aa6..a089bf6534b4 100644 --- a/pkgs/applications/science/astronomy/gpredict/default.nix +++ b/pkgs/applications/science/astronomy/gpredict/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool +{ lib, stdenv, fetchurl, pkgconfig, intltool , gtk3, glib, curl, goocanvas2, gpsd , hamlib, wrapGAppsHook }: @@ -17,7 +17,7 @@ in stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig intltool wrapGAppsHook ]; buildInputs = [ curl glib gtk3 goocanvas2 gpsd hamlib ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Real time satellite tracking and orbit prediction"; longDescription = '' Gpredict is a real time satellite tracking and orbit prediction program diff --git a/pkgs/applications/science/astronomy/openspace/default.nix b/pkgs/applications/science/astronomy/openspace/default.nix index 566fd61f1a7b..ca8651aa9e62 100644 --- a/pkgs/applications/science/astronomy/openspace/default.nix +++ b/pkgs/applications/science/astronomy/openspace/default.nix @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; + nativeBuildInputs = [ cmake makeWrapper ]; buildInputs = [ - makeWrapper cmake curl boost gdal glew soil libX11 libXi libXxf86vm libXcursor libXrandr libXinerama ]; diff --git a/pkgs/applications/science/astronomy/phd2/default.nix b/pkgs/applications/science/astronomy/phd2/default.nix index 98afba77c4f0..054a73dec7a0 100644 --- a/pkgs/applications/science/astronomy/phd2/default.nix +++ b/pkgs/applications/science/astronomy/phd2/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub, pkg-config, cmake, gtk3, - wxGTK30-gtk3, curl, gettext, glib, indilib, libnova }: +{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, gtk3, wxGTK30-gtk3, + curl, gettext, glib, indilib, libnova, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "phd2"; @@ -12,14 +12,19 @@ stdenv.mkDerivation rec { sha256 = "1ih7m9lilh12xbhmwm9kkicaqy72mi3firl6df7m5x38n2zj3zm4"; }; - nativeBuildInputs = [ cmake pkg-config ]; + nativeBuildInputs = [ cmake pkg-config wrapGAppsHook ]; buildInputs = [ gtk3 wxGTK30-gtk3 curl gettext glib indilib libnova ]; cmakeFlags = [ "-DOPENSOURCE_ONLY=1" ]; - meta = with stdenv.lib; { + # Fix broken wrapped name scheme by moving wrapped binary to where wrapper expects it + postFixup = '' + mv $out/bin/.phd2.bin-wrapped $out/bin/.phd2-wrapped.bin + ''; + + meta = with lib; { homepage = "https://openphdguiding.org/"; description = "Telescope auto-guidance application"; license = licenses.bsd3; diff --git a/pkgs/applications/science/astronomy/siril/default.nix b/pkgs/applications/science/astronomy/siril/default.nix index 7ae3e011973e..cd78b644eb05 100644 --- a/pkgs/applications/science/astronomy/siril/default.nix +++ b/pkgs/applications/science/astronomy/siril/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, fetchFromGitHub, pkg-config, meson, ninja, +{ lib, stdenv, fetchFromGitLab, fetchFromGitHub, pkg-config, meson, ninja, git, criterion, wrapGAppsHook, gtk3, libconfig, gnuplot, opencv, fftwFloat, cfitsio, gsl, exiv2, curl, librtprocess, ffmpeg, libraw, libtiff, libpng, libjpeg, libheif, ffms @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { cd nixbld ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.siril.org/"; description = "Astronomical image processing tool"; license = licenses.gpl3; diff --git a/pkgs/applications/science/astronomy/xearth/default.nix b/pkgs/applications/science/astronomy/xearth/default.nix index 752e25b4d8d3..57054cc491ac 100644 --- a/pkgs/applications/science/astronomy/xearth/default.nix +++ b/pkgs/applications/science/astronomy/xearth/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, imake, gccmakedep, libXt, libXext }: +{ lib, stdenv, fetchurl, imake, gccmakedep, libXt, libXext }: stdenv.mkDerivation rec { pname = "xearth"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { installFlags = [ "DESTDIR=$(out)/" "BINDIR=bin" "MANDIR=man/man1"]; installTargets = [ "install" "install.man" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "sets the X root window to an image of the Earth"; homepage = "http://xplanet.org"; longDescription = diff --git a/pkgs/applications/science/astronomy/xplanet/default.nix b/pkgs/applications/science/astronomy/xplanet/default.nix index a314678b6ea3..63a1feab42f1 100644 --- a/pkgs/applications/science/astronomy/xplanet/default.nix +++ b/pkgs/applications/science/astronomy/xplanet/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, fetchpatch, pkgconfig, freetype, pango, libpng, libtiff +{lib, stdenv, fetchurl, fetchpatch, pkgconfig, freetype, pango, libpng, libtiff , giflib, libjpeg, netpbm}: stdenv.mkDerivation rec { @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=c++11-narrowing"; - meta = with stdenv.lib; { + meta = with lib; { description = "Renders an image of the earth or other planets into the X root window"; homepage = "http://xplanet.sourceforge.net"; license = licenses.gpl2; diff --git a/pkgs/applications/science/biology/EZminc/default.nix b/pkgs/applications/science/biology/EZminc/default.nix index a9661ee2db78..17d8944128e2 100644 --- a/pkgs/applications/science/biology/EZminc/default.nix +++ b/pkgs/applications/science/biology/EZminc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, libminc, bicpl, itk4, fftwFloat, gsl }: +{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, libminc, bicpl, itk4, fftwFloat, gsl }: stdenv.mkDerivation rec { pname = "EZminc"; @@ -19,9 +19,7 @@ stdenv.mkDerivation rec { "-DEZMINC_BUILD_MRFSEG=TRUE" "-DEZMINC_BUILD_DD=TRUE" ]; - enableParallelBuilding = true; - - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/BIC-MNI/${pname}"; description = "Collection of Perl and shell scripts for processing MINC files"; maintainers = with maintainers; [ bcdarwin ]; diff --git a/pkgs/applications/science/biology/N3/default.nix b/pkgs/applications/science/biology/N3/default.nix index 13ffc305d392..2f4aa4ce3927 100644 --- a/pkgs/applications/science/biology/N3/default.nix +++ b/pkgs/applications/science/biology/N3/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, makeWrapper, +{ lib, stdenv, fetchFromGitHub, cmake, makeWrapper, perlPackages, libminc, EBTKS }: @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/BIC-MNI/N3"; description = "MRI non-uniformity correction for MINC files"; maintainers = with maintainers; [ bcdarwin ]; diff --git a/pkgs/applications/science/biology/ants/default.nix b/pkgs/applications/science/biology/ants/default.nix index ece218eea37d..7aa41bdf6f04 100644 --- a/pkgs/applications/science/biology/ants/default.nix +++ b/pkgs/applications/science/biology/ants/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, cmake, makeWrapper, itk4, vtk_7, Cocoa }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, makeWrapper, itk4, vtk_7, Cocoa }: stdenv.mkDerivation rec { pname = "ANTs"; @@ -24,15 +24,13 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DANTS_SUPERBUILD=FALSE" "-DUSE_VTK=TRUE" ]; - enableParallelBuilding = true; - postInstall = '' for file in $out/bin/*; do wrapProgram $file --set ANTSPATH "$out/bin" done ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/ANTsX/ANTs"; description = "Advanced normalization toolkit for medical image registration and other processing"; maintainers = with maintainers; [ bcdarwin ]; diff --git a/pkgs/applications/science/biology/aragorn/default.nix b/pkgs/applications/science/biology/aragorn/default.nix index 168bd5c6aa68..fa0c10b00c20 100644 --- a/pkgs/applications/science/biology/aragorn/default.nix +++ b/pkgs/applications/science/biology/aragorn/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { version = "1.2.38"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { mkdir -p $out/man/1 && cp aragorn.1 $out/man/1 ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Detects tRNA, mtRNA, and tmRNA genes in nucleotide sequences"; homepage = "http://mbio-serv2.mbioekol.lu.se/ARAGORN/"; license = licenses.gpl2; diff --git a/pkgs/applications/science/biology/bayescan/default.nix b/pkgs/applications/science/biology/bayescan/default.nix index 4e216fbdbe63..7c4f198b8427 100644 --- a/pkgs/applications/science/biology/bayescan/default.nix +++ b/pkgs/applications/science/biology/bayescan/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, llvmPackages }: +{ lib, stdenv, fetchurl, unzip, llvmPackages }: stdenv.mkDerivation rec { pname = "bayescan"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { cp -r ../*pdf ../input_examples ../"R functions" $out/share/doc/bayescan ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Detecting natural selection from population-based genetic data"; homepage = "http://cmpg.unibe.ch/software/BayeScan"; license = licenses.gpl3; diff --git a/pkgs/applications/science/biology/bcftools/default.nix b/pkgs/applications/science/biology/bcftools/default.nix index d1b033dc4e23..f4e2db01fbc5 100644 --- a/pkgs/applications/science/biology/bcftools/default.nix +++ b/pkgs/applications/science/biology/bcftools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, htslib, zlib, bzip2, lzma, curl, perl, python, bash }: +{ lib, stdenv, fetchurl, htslib, zlib, bzip2, lzma, curl, perl, python, bash }: stdenv.mkDerivation rec { pname = "bcftools"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Tools for manipulating BCF2/VCF/gVCF format, SNP and short indel sequence variants"; license = licenses.mit; homepage = "http://www.htslib.org/"; diff --git a/pkgs/applications/science/biology/bedtools/default.nix b/pkgs/applications/science/biology/bedtools/default.nix index f92e912f6800..cfa22ae5ac8b 100644 --- a/pkgs/applications/science/biology/bedtools/default.nix +++ b/pkgs/applications/science/biology/bedtools/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, zlib, python, bzip2, lzma}: +{lib, stdenv, fetchFromGitHub, zlib, python, bzip2, lzma}: stdenv.mkDerivation rec { pname = "bedtools"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildPhase = "make prefix=$out SHELL=${stdenv.shell} CXX=${cxx} CC=${cc} -j $NIX_BUILD_CORES"; installPhase = "make prefix=$out SHELL=${stdenv.shell} CXX=${cxx} CC=${cc} install"; - meta = with stdenv.lib; { + meta = with lib; { description = "A powerful toolset for genome arithmetic"; license = licenses.gpl2; homepage = "https://bedtools.readthedocs.io/en/latest/"; diff --git a/pkgs/applications/science/biology/bftools/default.nix b/pkgs/applications/science/biology/bftools/default.nix index 2ecefee340fd..89ebdcee65b9 100644 --- a/pkgs/applications/science/biology/bftools/default.nix +++ b/pkgs/applications/science/biology/bftools/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A bundle of scripts for using Bio-Formats on the command line with bioformats_package.jar already included"; license = licenses.gpl2; platforms = platforms.all; diff --git a/pkgs/applications/science/biology/blast/default.nix b/pkgs/applications/science/biology/blast/default.nix index 95a1b905e9e2..a72f16938d41 100644 --- a/pkgs/applications/science/biology/blast/default.nix +++ b/pkgs/applications/science/biology/blast/default.nix @@ -94,7 +94,7 @@ stdenv.mkDerivation rec { # Many tests require either network access or locally available databases doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = ''Basic Local Alignment Search Tool (BLAST) finds regions of similarity between biological sequences''; homepage = "https://blast.ncbi.nlm.nih.gov/Blast.cgi"; diff --git a/pkgs/applications/science/biology/bowtie/default.nix b/pkgs/applications/science/biology/bowtie/default.nix new file mode 100644 index 000000000000..916bba5c0512 --- /dev/null +++ b/pkgs/applications/science/biology/bowtie/default.nix @@ -0,0 +1,25 @@ +{ lib, stdenv, fetchFromGitHub, zlib }: + +stdenv.mkDerivation rec { + pname = "bowtie"; + version = "1.3.0"; + + src = fetchFromGitHub { + owner = "BenLangmead"; + repo = pname; + rev = "v${version}"; + sha256 = "0da2kzyfsn6xv8mlqsv2vv7k8g0c9d2vgqzq8yqk888yljdzcrjp"; + }; + + buildInputs = [ zlib ]; + + installFlags = [ "prefix=$(out)" ]; + + meta = with lib; { + description = "An ultrafast memory-efficient short read aligner"; + license = licenses.artistic2; + homepage = "http://bowtie-bio.sf.net/bowtie"; + maintainers = with maintainers; [ prusnak ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/science/biology/bowtie2/default.nix b/pkgs/applications/science/biology/bowtie2/default.nix index dc818e2fb868..715f5bb8bfa6 100644 --- a/pkgs/applications/science/biology/bowtie2/default.nix +++ b/pkgs/applications/science/biology/bowtie2/default.nix @@ -1,26 +1,26 @@ -{ stdenv, fetchFromGitHub, zlib, tbb, python, perl }: +{ lib, stdenv, fetchFromGitHub, cmake, tbb, zlib }: stdenv.mkDerivation rec { pname = "bowtie2"; - version = "2.3.5.1"; + version = "2.4.2"; src = fetchFromGitHub { owner = "BenLangmead"; repo = pname; rev = "v${version}"; - sha256 = "1l1f0yhjqqvy4lpxfml1xwv7ayimwbpzazvp0281gb4jb5f5mr1a"; + sha256 = "11apzq7l1lk3yxw97g9dfr0gwnvfh58x6apifcblgd66gbip3y1y"; }; - buildInputs = [ zlib tbb python perl ]; + nativeBuildInputs = [ cmake ]; - installFlags = [ "prefix=$(out)" ]; + buildInputs = [ tbb zlib ]; - meta = with stdenv.lib; { + meta = with lib; { description = "An ultrafast and memory-efficient tool for aligning sequencing reads to long reference sequences"; license = licenses.gpl3; homepage = "http://bowtie-bio.sf.net/bowtie2"; maintainers = with maintainers; [ rybern ]; platforms = platforms.all; - broken = stdenv.isAarch64; + broken = stdenv.isAarch64; # only x86 is supported }; } diff --git a/pkgs/applications/science/biology/bwa/default.nix b/pkgs/applications/science/biology/bwa/default.nix index 10859d9e8c13..a2a11b1d4517 100644 --- a/pkgs/applications/science/biology/bwa/default.nix +++ b/pkgs/applications/science/biology/bwa/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, zlib }: +{ lib, stdenv, fetchurl, zlib }: stdenv.mkDerivation rec { pname = "bwa"; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { install -vD -t $out/include bwt.h ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A software package for mapping low-divergent sequences against a large reference genome, such as the human genome"; license = licenses.gpl3; homepage = "http://bio-bwa.sourceforge.net/"; diff --git a/pkgs/applications/science/biology/cd-hit/default.nix b/pkgs/applications/science/biology/cd-hit/default.nix index 0db788b0f743..94012b1c2ff4 100644 --- a/pkgs/applications/science/biology/cd-hit/default.nix +++ b/pkgs/applications/science/biology/cd-hit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, makeWrapper, zlib, perl, perlPackages }: +{ lib, stdenv, fetchFromGitHub, makeWrapper, zlib, perl, perlPackages }: stdenv.mkDerivation rec { version = "4.8.1"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/plot_2d.pl --prefix PERL5LIB : $PERL5LIB wrapProgram $out/bin/clstr_list_sort.pl --prefix PERL5LIB : $PERL5LIB ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Clustering and comparing protein or nucleotide sequences"; homepage = "http://weizhongli-lab.org/cd-hit/"; license = licenses.gpl2; diff --git a/pkgs/applications/science/biology/clustal-omega/default.nix b/pkgs/applications/science/biology/clustal-omega/default.nix index 71cf87985376..6377e1fce855 100644 --- a/pkgs/applications/science/biology/clustal-omega/default.nix +++ b/pkgs/applications/science/biology/clustal-omega/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, argtable }: +{ lib, stdenv, fetchurl, argtable }: stdenv.mkDerivation rec { version = "1.2.4"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "General purpose multiple sequence alignment program for protein and DNA/RNA"; homepage = "http://www.clustal.org/omega/"; license = licenses.gpl2; diff --git a/pkgs/applications/science/biology/cmtk/default.nix b/pkgs/applications/science/biology/cmtk/default.nix index 41805c15aed5..ea4f55ba475a 100644 --- a/pkgs/applications/science/biology/cmtk/default.nix +++ b/pkgs/applications/science/biology/cmtk/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, cmake}: +{lib, stdenv, fetchurl, cmake}: stdenv.mkDerivation { name = "cmtk-3.3.1"; @@ -9,11 +9,11 @@ stdenv.mkDerivation { sha256 = "1nmsga9m7vcc4y4a6zl53ra3mwlgjwdgsq1j291awkn7zr1az6qs"; }; - buildInputs = [cmake]; + nativeBuildInputs = [ cmake ]; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=c++11-narrowing"; - meta = with stdenv.lib; { + meta = with lib; { description = "Computational Morphometry Toolkit "; longDescription = ''A software toolkit for computational morphometry of biomedical images, CMTK comprises a set of command line tools and a diff --git a/pkgs/applications/science/biology/conglomerate/default.nix b/pkgs/applications/science/biology/conglomerate/default.nix index 8fb8e17eef86..592ab2cd6633 100644 --- a/pkgs/applications/science/biology/conglomerate/default.nix +++ b/pkgs/applications/science/biology/conglomerate/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, coreutils, perlPackages, bicpl, libminc, zlib, minc_tools, +{ lib, stdenv, fetchFromGitHub, cmake, coreutils, perlPackages, bicpl, libminc, zlib, minc_tools, makeWrapper }: stdenv.mkDerivation rec { @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/BIC-MNI/conglomerate"; description = "More command-line utilities for working with MINC files"; maintainers = with maintainers; [ bcdarwin ]; diff --git a/pkgs/applications/science/biology/dcm2niix/default.nix b/pkgs/applications/science/biology/dcm2niix/default.nix index cfd1206f2314..7ec5476cb826 100644 --- a/pkgs/applications/science/biology/dcm2niix/default.nix +++ b/pkgs/applications/science/biology/dcm2niix/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , cmake , libyamlcpp @@ -16,11 +16,10 @@ stdenv.mkDerivation rec { sha256 = "1cncfwhyhmg18n970lkn6yvp0i74ajznsl8dqz00asqfzmg681n1"; }; - enableParallelBuilding = true; nativeBuildInputs = [ cmake git ]; buildInputs = [ libyamlcpp ]; - meta = with stdenv.lib; { + meta = with lib; { description = "DICOM to NIfTI converter"; longDescription = '' dcm2niix is a designed to convert neuroimaging data from the diff --git a/pkgs/applications/science/biology/delly/default.nix b/pkgs/applications/science/biology/delly/default.nix index 8f4dd7745269..7a7e3f13c7a3 100644 --- a/pkgs/applications/science/biology/delly/default.nix +++ b/pkgs/applications/science/biology/delly/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchpatch, fetchFromGitHub, htslib, zlib, bzip2, lzma, ncurses, boost }: +{ lib, stdenv, fetchpatch, fetchFromGitHub, htslib, zlib, bzip2, lzma, ncurses, boost }: stdenv.mkDerivation rec { pname = "delly"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Structural variant caller for mapped DNA sequenced data"; license = licenses.bsd3; maintainers = with maintainers; [ scalavision ]; diff --git a/pkgs/applications/science/biology/diamond/default.nix b/pkgs/applications/science/biology/diamond/default.nix index dd1e13ec7162..2e11c1d8c58c 100644 --- a/pkgs/applications/science/biology/diamond/default.nix +++ b/pkgs/applications/science/biology/diamond/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, zlib }: +{ lib, stdenv, fetchurl, cmake, zlib }: stdenv.mkDerivation { name = "diamond-0.8.36"; @@ -15,7 +15,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake ]; buildInputs = [ zlib ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Accelerated BLAST compatible local sequence aligner"; longDescription = '' A sequence aligner for protein and translated DNA diff --git a/pkgs/applications/science/biology/ecopcr/default.nix b/pkgs/applications/science/biology/ecopcr/default.nix index 2e744c7b2b9e..b3029f586add 100644 --- a/pkgs/applications/science/biology/ecopcr/default.nix +++ b/pkgs/applications/science/biology/ecopcr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gcc, zlib, python27 }: +{ lib, stdenv, fetchurl, gcc, zlib, python27 }: stdenv.mkDerivation rec { name = "ecopcr-0.8.0"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { chmod a+x $out/bin/ecoPCRFormat ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Electronic PCR software tool"; longDescription = '' ecoPCR is an electronic PCR software developed by the LECA. It diff --git a/pkgs/applications/science/biology/eggnog-mapper/default.nix b/pkgs/applications/science/biology/eggnog-mapper/default.nix index 3ef52e543933..c6defb245c7f 100644 --- a/pkgs/applications/science/biology/eggnog-mapper/default.nix +++ b/pkgs/applications/science/biology/eggnog-mapper/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, makeWrapper, python27Packages, wget, diamond, hmmer }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, makeWrapper, python27Packages, wget, diamond, hmmer }: python27Packages.buildPythonApplication rec { pname = "eggnog-mapper"; @@ -30,7 +30,7 @@ python27Packages.buildPythonApplication rec { # the user can download only those that interest them. doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Fast genome-wide functional annotation through orthology assignment"; license = licenses.gpl2; homepage = "https://github.com/eggnogdb/eggnog-mapper/wiki"; diff --git a/pkgs/applications/science/biology/est-sfs/default.nix b/pkgs/applications/science/biology/est-sfs/default.nix index 1b15c06c670a..814baa45d8c1 100644 --- a/pkgs/applications/science/biology/est-sfs/default.nix +++ b/pkgs/applications/science/biology/est-sfs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gsl }: +{ lib, stdenv, fetchurl, gsl }: stdenv.mkDerivation rec { pname = "est-sfs"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { cp est-sfs-documentation.pdf $out/share/doc/${pname} ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://sourceforge.net/projects/est-usfs"; description = "Estimate the unfolded site frequency spectrum and ancestral states"; license = licenses.gpl3; diff --git a/pkgs/applications/science/biology/exonerate/default.nix b/pkgs/applications/science/biology/exonerate/default.nix index b2c49ab00767..9f87d0117df5 100644 --- a/pkgs/applications/science/biology/exonerate/default.nix +++ b/pkgs/applications/science/biology/exonerate/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, glib, pkgconfig }: +{ lib, stdenv, fetchurl, glib, pkgconfig }: stdenv.mkDerivation rec { version = "2.4.0"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Generic tool for sequence alignment"; homepage = "https://www.ebi.ac.uk/about/vertebrate-genomics/software/exonerate"; license = licenses.gpl3; diff --git a/pkgs/applications/science/biology/fastp/default.nix b/pkgs/applications/science/biology/fastp/default.nix new file mode 100644 index 000000000000..e396c8597d24 --- /dev/null +++ b/pkgs/applications/science/biology/fastp/default.nix @@ -0,0 +1,30 @@ +{ lib, stdenv +, fetchFromGitHub +, zlib +}: + +stdenv.mkDerivation rec { + pname = "fastp"; + version = "0.20.1"; + + src = fetchFromGitHub { + owner = "OpenGene"; + repo = "fastp"; + rev = "v${version}"; + sha256 = "sha256-pANwppkO9pfV9vctB7HmNCzYRtf+Xt+5HMKzvFuvyFM="; + }; + + buildInputs = [ zlib ]; + + installPhase = '' + install -D fastp $out/bin/fastp + ''; + + meta = with lib; { + description = "Ultra-fast all-in-one FASTQ preprocessor"; + license = licenses.mit; + homepage = "https://github.com/OpenGene/fastp"; + maintainers = with maintainers; [ jbedo ]; + platforms = platforms.x86_64; + }; +} diff --git a/pkgs/applications/science/biology/freebayes/default.nix b/pkgs/applications/science/biology/freebayes/default.nix index bd80df56cb90..32ab614b9682 100644 --- a/pkgs/applications/science/biology/freebayes/default.nix +++ b/pkgs/applications/science/biology/freebayes/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, zlib, bzip2, lzma }: +{ lib, stdenv, fetchFromGitHub, zlib, bzip2, lzma }: stdenv.mkDerivation rec { pname = "freebayes"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { install -vD bin/freebayes bin/bamleftalign scripts/* -t $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Bayesian haplotype-based polymorphism discovery and genotyping"; license = licenses.mit; homepage = "https://github.com/ekg/freebayes"; diff --git a/pkgs/applications/science/biology/hisat2/default.nix b/pkgs/applications/science/biology/hisat2/default.nix index e641489b86c9..ab8e26f92a0d 100644 --- a/pkgs/applications/science/biology/hisat2/default.nix +++ b/pkgs/applications/science/biology/hisat2/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, unzip, which, python3, perl}: +{lib, stdenv, fetchFromGitHub, unzip, which, python3, perl}: stdenv.mkDerivation rec { pname = "hisat2"; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Graph based aligner"; license = licenses.gpl3; homepage = "https://ccb.jhu.edu/software/hisat2/index.shtml"; diff --git a/pkgs/applications/science/biology/hmmer/default.nix b/pkgs/applications/science/biology/hmmer/default.nix index 3b1420a18819..0f83178626bf 100644 --- a/pkgs/applications/science/biology/hmmer/default.nix +++ b/pkgs/applications/science/biology/hmmer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { version = "3.3.2"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0s9wf6n0qanbx8qs6igfl3vyjikwbrvh4d9d6mv54yp3xysykzlj"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Biosequence analysis using profile hidden Markov models"; longDescription = '' HMMER is used for searching sequence databases for sequence homologs, and for making sequence alignments. It implements methods using probabilistic models called profile hidden Markov models (profile HMMs). diff --git a/pkgs/applications/science/biology/igv/default.nix b/pkgs/applications/science/biology/igv/default.nix index 3f9cb1a288b3..ff05ef4b8df6 100644 --- a/pkgs/applications/science/biology/igv/default.nix +++ b/pkgs/applications/science/biology/igv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, jdk11 }: +{ lib, stdenv, fetchzip, jdk11 }: stdenv.mkDerivation rec { pname = "igv"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { chmod +x $out/bin/igvtools ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.broadinstitute.org/igv/"; description = "A visualization tool for interactive exploration of genomic datasets"; license = licenses.mit; diff --git a/pkgs/applications/science/biology/inormalize/default.nix b/pkgs/applications/science/biology/inormalize/default.nix index e6293bb90ef3..8ea115c6b25d 100644 --- a/pkgs/applications/science/biology/inormalize/default.nix +++ b/pkgs/applications/science/biology/inormalize/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, makeWrapper, +{ lib, stdenv, fetchFromGitHub, cmake, makeWrapper, perlPackages, libminc, EBTKS }: @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/BIC-MNI/${pname}"; description = "Program to normalize intensity of MINC files"; maintainers = with maintainers; [ bcdarwin ]; diff --git a/pkgs/applications/science/biology/itsx/default.nix b/pkgs/applications/science/biology/itsx/default.nix index 6f66cfc9cc37..843f0df57924 100644 --- a/pkgs/applications/science/biology/itsx/default.nix +++ b/pkgs/applications/science/biology/itsx/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, hmmer, perl }: +{ lib, stdenv, fetchurl, hmmer, perl }: stdenv.mkDerivation rec { version = "1.1.1"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { cp -r ITSx_db $out/share ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Improved software detection and extraction of ITS1 and ITS2 from ribosomal ITS sequences of fungi and other eukaryotes for use in environmental sequencing"; homepage = "https://microbiology.se/software/itsx/"; license = licenses.gpl3; diff --git a/pkgs/applications/science/biology/kallisto/default.nix b/pkgs/applications/science/biology/kallisto/default.nix index 014ae14cc794..203d0520660f 100644 --- a/pkgs/applications/science/biology/kallisto/default.nix +++ b/pkgs/applications/science/biology/kallisto/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoconf, cmake, hdf5, zlib }: +{ lib, stdenv, fetchFromGitHub, autoconf, cmake, hdf5, zlib }: stdenv.mkDerivation rec { pname = "kallisto"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { # Parallel build fails in some cases: https://github.com/pachterlab/kallisto/issues/160 enableParallelBuilding = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Program for quantifying abundances of transcripts from RNA-Seq data"; homepage = "https://pachterlab.github.io/kallisto"; license = licenses.bsd2; diff --git a/pkgs/applications/science/biology/kent/default.nix b/pkgs/applications/science/biology/kent/default.nix index 2ca5ad191d92..26c55d3dc383 100644 --- a/pkgs/applications/science/biology/kent/default.nix +++ b/pkgs/applications/science/biology/kent/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , libpng , libuuid , zlib @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { cp $NIX_BUILD_TOP/bin/x86_64/* $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "UCSC Genome Bioinformatics Group's suite of biological analysis tools, i.e. the kent utilities"; license = licenses.unfree; maintainers = with maintainers; [ scalavision ]; diff --git a/pkgs/applications/science/biology/kssd/default.nix b/pkgs/applications/science/biology/kssd/default.nix index 621a8ce15765..ef853d0cd47c 100644 --- a/pkgs/applications/science/biology/kssd/default.nix +++ b/pkgs/applications/science/biology/kssd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, zlib, automake, autoconf, libtool }: +{ lib, stdenv, fetchurl, zlib, automake, autoconf, libtool }: stdenv.mkDerivation rec { pname = "kssd"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { install -vD kssd $out/bin/kssd ''; - meta = with stdenv.lib; { + meta = with lib; { description = "K-mer substring space decomposition"; license = licenses.asl20; homepage = "https://github.com/yhg926/public_kssd"; diff --git a/pkgs/applications/science/biology/last/default.nix b/pkgs/applications/science/biology/last/default.nix index 0976e5a10802..3a36a2194a13 100644 --- a/pkgs/applications/science/biology/last/default.nix +++ b/pkgs/applications/science/biology/last/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, unzip, zlib, python3, parallel }: +{ lib, stdenv, fetchurl, unzip, zlib, python3, parallel }: stdenv.mkDerivation rec { pname = "last"; - version = "1145"; + version = "1170"; src = fetchurl { url = "http://last.cbrc.jp/last-${version}.zip"; - sha256 = "0g54nmxxrirgid1i1k5i6rf7vnjpk9548sy06yqb4fj7vdzqgq99"; + sha256 = "sha256-hBuG6QGXtBrvNrtaZU+i8gxu2ZQw+srFRkbuWoL5JHc="; }; nativeBuildInputs = [ unzip ]; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Genomic sequence aligner"; homepage = "http://last.cbrc.jp/"; license = licenses.gpl3; diff --git a/pkgs/applications/science/biology/lumpy/default.nix b/pkgs/applications/science/biology/lumpy/default.nix index f6267a2e017f..91a001744474 100644 --- a/pkgs/applications/science/biology/lumpy/default.nix +++ b/pkgs/applications/science/biology/lumpy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, htslib, zlib, curl, openssl, samblaster, sambamba +{ lib, stdenv, fetchFromGitHub, htslib, zlib, curl, openssl, samblaster, sambamba , samtools, hexdump, python2Packages, which }: let @@ -39,7 +39,7 @@ in stdenv.mkDerivation rec { sed -i 's|/build/source|'$out'|' $out/bin/lumpyexpress.config ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Probabilistic structural variant caller"; homepage = "https://github.com/arq5x/lumpy-sv"; maintainers = with maintainers; [ jbedo ]; diff --git a/pkgs/applications/science/biology/macse/default.nix b/pkgs/applications/science/biology/macse/default.nix index 59938addbe82..c78e142dcc6b 100644 --- a/pkgs/applications/science/biology/macse/default.nix +++ b/pkgs/applications/science/biology/macse/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jre, makeWrapper }: +{ lib, stdenv, fetchurl, jre, makeWrapper }: stdenv.mkDerivation rec { pname = "macse"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Multiple alignment of coding sequences"; homepage = "https://bioweb.supagro.inra.fr/macse/"; license = licenses.gpl2; diff --git a/pkgs/applications/science/biology/manta/default.nix b/pkgs/applications/science/biology/manta/default.nix index f0f0575e055a..1f46e0141da3 100644 --- a/pkgs/applications/science/biology/manta/default.nix +++ b/pkgs/applications/science/biology/manta/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, zlib, python2 }: +{ lib, stdenv, fetchFromGitHub, cmake, zlib, python2 }: stdenv.mkDerivation rec { pname = "manta"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { PYTHONPATH=$out/lib/python/pyflow:$PYTHONPATH python -c 'import pyflowTaskWrapper; import pyflow' ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Structural variant caller"; license = licenses.gpl3; homepage = "https://github.com/Illumina/manta"; diff --git a/pkgs/applications/science/biology/megahit/default.nix b/pkgs/applications/science/biology/megahit/default.nix index 35ef280ed676..ee2f16f389b2 100644 --- a/pkgs/applications/science/biology/megahit/default.nix +++ b/pkgs/applications/science/biology/megahit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, zlib }: +{ lib, stdenv, fetchFromGitHub, cmake, zlib }: stdenv.mkDerivation rec { pname = "megahit"; @@ -14,9 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ zlib ]; - enableParallelBuilding = true; - - meta = with stdenv.lib; { + meta = with lib; { description = "An ultra-fast single-node solution for large and complex metagenomics assembly via succinct de Bruijn graph"; license = licenses.gpl3; homepage = "https://github.com/voutcn/megahit"; diff --git a/pkgs/applications/science/biology/messer-slim/default.nix b/pkgs/applications/science/biology/messer-slim/default.nix index 201e38cfc538..876cc8ebaa71 100644 --- a/pkgs/applications/science/biology/messer-slim/default.nix +++ b/pkgs/applications/science/biology/messer-slim/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, cmake, gcc, gcc-unwrapped }: stdenv.mkDerivation rec { - version = "3.2.1"; + version = "3.2.1"; pname = "messer-slim"; src = fetchurl { @@ -9,11 +9,9 @@ stdenv.mkDerivation rec { sha256 = "1j3ssjvxpsc21mmzj59kwimglz8pdazi5w6wplmx11x744k77wa1"; }; - enableParallelBuilding = true; - nativeBuildInputs = [ cmake gcc gcc-unwrapped ]; - cmakeFlags = [ "-DCMAKE_AR=${gcc-unwrapped}/bin/gcc-ar" + cmakeFlags = [ "-DCMAKE_AR=${gcc-unwrapped}/bin/gcc-ar" "-DCMAKE_RANLIB=${gcc-unwrapped}/bin/gcc-ranlib" ]; meta = { @@ -24,4 +22,3 @@ stdenv.mkDerivation rec { platforms = stdenv.lib.platforms.all; }; } - diff --git a/pkgs/applications/science/biology/minc-tools/default.nix b/pkgs/applications/science/biology/minc-tools/default.nix index c594897f4b6f..3dece25915b4 100644 --- a/pkgs/applications/science/biology/minc-tools/default.nix +++ b/pkgs/applications/science/biology/minc-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, makeWrapper, flex, bison, perl, TextFormat, +{ lib, stdenv, fetchFromGitHub, cmake, makeWrapper, flex, bison, perl, TextFormat, libminc, libjpeg, nifticlib, zlib }: stdenv.mkDerivation rec { @@ -26,9 +26,7 @@ stdenv.mkDerivation rec { done ''; - enableParallelBuilding = true; - - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/BIC-MNI/minc-tools"; description = "Command-line utilities for working with MINC files"; maintainers = with maintainers; [ bcdarwin ]; diff --git a/pkgs/applications/science/biology/minc-widgets/default.nix b/pkgs/applications/science/biology/minc-widgets/default.nix index 497c39a52a4c..3af227d70a5a 100644 --- a/pkgs/applications/science/biology/minc-widgets/default.nix +++ b/pkgs/applications/science/biology/minc-widgets/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, makeWrapper, +{ lib, stdenv, fetchFromGitHub, cmake, makeWrapper, perlPackages, libminc, octave, coreutils, minc_tools }: @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/BIC-MNI/${pname}"; description = "Collection of Perl and shell scripts for processing MINC files"; maintainers = with maintainers; [ bcdarwin ]; diff --git a/pkgs/applications/science/biology/minia/default.nix b/pkgs/applications/science/biology/minia/default.nix index 2a80de733b08..6b6bc300e0d9 100644 --- a/pkgs/applications/science/biology/minia/default.nix +++ b/pkgs/applications/science/biology/minia/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, hdf5, boost }: +{ lib, stdenv, fetchFromGitHub, cmake, hdf5, boost }: stdenv.mkDerivation rec { pname = "minia"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { rm -rf thirdparty/gatb-core/gatb-core/thirdparty/{hdf5,boost} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Short read genome assembler"; homepage = "https://github.com/GATB/minia"; license = licenses.agpl3; diff --git a/pkgs/applications/science/biology/minimap2/default.nix b/pkgs/applications/science/biology/minimap2/default.nix index e33a17537910..ae327e2c43fd 100644 --- a/pkgs/applications/science/biology/minimap2/default.nix +++ b/pkgs/applications/science/biology/minimap2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, zlib }: +{ lib, stdenv, fetchFromGitHub, zlib }: stdenv.mkDerivation rec { pname = "minimap2"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { cp minimap2.1 $out/share/man/man1 ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A versatile pairwise aligner for genomic and spliced nucleotide sequences"; homepage = "https://lh3.github.io/minimap2"; license = licenses.mit; diff --git a/pkgs/applications/science/biology/mni_autoreg/default.nix b/pkgs/applications/science/biology/mni_autoreg/default.nix index 40ec9e0de6d2..b0ec8a70e149 100644 --- a/pkgs/applications/science/biology/mni_autoreg/default.nix +++ b/pkgs/applications/science/biology/mni_autoreg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, makeWrapper, perlPackages, libminc }: +{ lib, stdenv, fetchFromGitHub, cmake, makeWrapper, perlPackages, libminc }: stdenv.mkDerivation rec { pname = "mni_autoreg"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/BIC-MNI/mni_autoreg"; description = "Tools for automated registration using the MINC image format"; maintainers = with maintainers; [ bcdarwin ]; diff --git a/pkgs/applications/science/biology/mosdepth/default.nix b/pkgs/applications/science/biology/mosdepth/default.nix index d2b05943f7ce..4815ddf2f75c 100644 --- a/pkgs/applications/science/biology/mosdepth/default.nix +++ b/pkgs/applications/science/biology/mosdepth/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, nim, htslib, pcre}: +{lib, stdenv, fetchFromGitHub, nim, htslib, pcre}: let hts-nim = fetchFromGitHub { @@ -36,7 +36,7 @@ in stdenv.mkDerivation rec { installPhase = "install -Dt $out/bin mosdepth"; - meta = with stdenv.lib; { + meta = with lib; { description = "fast BAM/CRAM depth calculation for WGS, exome, or targeted sequencing"; license = licenses.mit; homepage = "https://github.com/brentp/mosdepth"; diff --git a/pkgs/applications/science/biology/mrbayes/default.nix b/pkgs/applications/science/biology/mrbayes/default.nix index 0ebd14411216..9acfea1a1463 100644 --- a/pkgs/applications/science/biology/mrbayes/default.nix +++ b/pkgs/applications/science/biology/mrbayes/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, readline}: +{lib, stdenv, fetchurl, readline}: stdenv.mkDerivation rec { # FIXME: replace Makefile so we can build MPI & MAC support @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { builder = ./builder.sh; buildInputs = [readline]; - meta = with stdenv.lib; { + meta = with lib; { description = "Bayesian Inference of Phylogeny"; longDescription = '' Bayesian inference of phylogeny is based upon a diff --git a/pkgs/applications/science/biology/muscle/default.nix b/pkgs/applications/science/biology/muscle/default.nix index 7ed18349259e..e7c1040e5930 100644 --- a/pkgs/applications/science/biology/muscle/default.nix +++ b/pkgs/applications/science/biology/muscle/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { _name = "muscle"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { install -vD muscle $out/bin/muscle ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A multiple sequence alignment method with reduced time and space complexity"; license = licenses.publicDomain; homepage = "https://www.drive5.com/muscle/"; diff --git a/pkgs/applications/science/biology/neuron/default.nix b/pkgs/applications/science/biology/neuron/default.nix index 8cad5f466c5f..048a9a5644d0 100644 --- a/pkgs/applications/science/biology/neuron/default.nix +++ b/pkgs/applications/science/biology/neuron/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , pkgconfig , automake @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ readline ncurses which libtool ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Simulation environment for empirically-based simulations of neurons and networks of neurons"; longDescription = "NEURON is a simulation environment for developing and exercising models of diff --git a/pkgs/applications/science/biology/niftyreg/default.nix b/pkgs/applications/science/biology/niftyreg/default.nix index fd7dc4f1fbb4..d5f625893e92 100644 --- a/pkgs/applications/science/biology/niftyreg/default.nix +++ b/pkgs/applications/science/biology/niftyreg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, zlib }: +{ lib, stdenv, fetchurl, cmake, zlib }: stdenv.mkDerivation rec { pname = "niftyreg"; @@ -13,9 +13,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ zlib ]; - enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://cmictig.cs.ucl.ac.uk/wiki/index.php/NiftyReg"; description = "Medical image registration software"; maintainers = with maintainers; [ bcdarwin ]; diff --git a/pkgs/applications/science/biology/niftyseg/default.nix b/pkgs/applications/science/biology/niftyseg/default.nix index 38194697223d..215ee35d78a4 100644 --- a/pkgs/applications/science/biology/niftyseg/default.nix +++ b/pkgs/applications/science/biology/niftyseg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, eigen, zlib }: +{ lib, stdenv, fetchurl, cmake, eigen, zlib }: stdenv.mkDerivation rec { pname = "niftyseg"; @@ -10,9 +10,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ eigen zlib ]; - enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://cmictig.cs.ucl.ac.uk/research/software/software-nifty/niftyseg"; description = "Software for medical image segmentation, bias field correction, and cortical thickness calculation"; maintainers = with maintainers; [ bcdarwin ]; diff --git a/pkgs/applications/science/biology/obitools/obitools3.nix b/pkgs/applications/science/biology/obitools/obitools3.nix index 076e459c8f0b..7ecee60c4b1b 100644 --- a/pkgs/applications/science/biology/obitools/obitools3.nix +++ b/pkgs/applications/science/biology/obitools/obitools3.nix @@ -26,8 +26,6 @@ pythonPackages.buildPythonApplication rec { doCheck = true; - enableParallelBuilding = true; - meta = with stdenv.lib ; { description = "Management of analyses and data in DNA metabarcoding"; homepage = "https://git.metabarcoding.org/obitools/obitools3"; diff --git a/pkgs/applications/science/biology/octopus/default.nix b/pkgs/applications/science/biology/octopus/default.nix index 7dee07275a0f..b7a4a4c1a2a0 100644 --- a/pkgs/applications/science/biology/octopus/default.nix +++ b/pkgs/applications/science/biology/octopus/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, cmake, boost, gmp, htslib, zlib, lzma, pkg-config}: +{lib, stdenv, fetchFromGitHub, cmake, boost, gmp, htslib, zlib, lzma, pkg-config}: stdenv.mkDerivation rec { pname = "octopus"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { mv $out/octopus $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Bayesian haplotype-based mutation calling"; license = licenses.mit; homepage = "https://github.com/luntergroup/octopus"; diff --git a/pkgs/applications/science/biology/picard-tools/default.nix b/pkgs/applications/science/biology/picard-tools/default.nix index af29dd77ac28..d18ca2e2a4f8 100644 --- a/pkgs/applications/science/biology/picard-tools/default.nix +++ b/pkgs/applications/science/biology/picard-tools/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, jre, makeWrapper}: +{lib, stdenv, fetchurl, jre, makeWrapper}: stdenv.mkDerivation rec { pname = "picard-tools"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { makeWrapper ${jre}/bin/java $out/bin/picard --add-flags "-jar $out/libexec/picard/picard.jar" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Tools for high-throughput sequencing (HTS) data and formats such as SAM/BAM/CRAM and VCF"; license = licenses.mit; homepage = "https://broadinstitute.github.io/picard/"; diff --git a/pkgs/applications/science/biology/platypus/default.nix b/pkgs/applications/science/biology/platypus/default.nix index 30e45d5af0ec..30bc68fb0e87 100644 --- a/pkgs/applications/science/biology/platypus/default.nix +++ b/pkgs/applications/science/biology/platypus/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, python27, htslib, zlib, makeWrapper}: +{lib, stdenv, fetchFromGitHub, python27, htslib, zlib, makeWrapper}: let python = python27.withPackages (ps: with ps; [ cython ]); @@ -28,7 +28,7 @@ in stdenv.mkDerivation { makeWrapper ${python}/bin/python $out/bin/platypus --add-flags "$out/libexec/platypus/bin/Platypus.py" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "The Platypus variant caller"; license = licenses.gpl3; homepage = "https://github.com/andyrimmer/Platypus"; diff --git a/pkgs/applications/science/biology/prodigal/default.nix b/pkgs/applications/science/biology/prodigal/default.nix index ba51c93c38c2..70069fe541d1 100644 --- a/pkgs/applications/science/biology/prodigal/default.nix +++ b/pkgs/applications/science/biology/prodigal/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "prodigal"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { "INSTALLDIR=$(out)/bin" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Fast, reliable protein-coding gene prediction for prokaryotic genomes"; homepage = "https://github.com/hyattpd/Prodigal"; license = licenses.gpl3; diff --git a/pkgs/applications/science/biology/raxml/default.nix b/pkgs/applications/science/biology/raxml/default.nix index 5c7353af9315..e4019295ece1 100644 --- a/pkgs/applications/science/biology/raxml/default.nix +++ b/pkgs/applications/science/biology/raxml/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , pkgs , mpi ? false @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "1jqjzhch0rips0vp04prvb8vmc20c5pdmsqn8knadcf91yy859fh"; }; - buildInputs = if mpi then [ pkgs.openmpi ] else []; + buildInputs = stdenv.lib.optionals mpi [ pkgs.openmpi ]; # TODO darwin, AVX and AVX2 makefile targets buildPhase = if mpi then '' @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { mkdir -p $out/bin && cp raxmlHPC-PTHREADS-SSE3 $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A tool for Phylogenetic Analysis and Post-Analysis of Large Phylogenies"; license = licenses.gpl3; homepage = "https://sco.h-its.org/exelixis/web/software/raxml/"; diff --git a/pkgs/applications/science/biology/sambamba/default.nix b/pkgs/applications/science/biology/sambamba/default.nix index 7e33a6612189..8802736efac8 100644 --- a/pkgs/applications/science/biology/sambamba/default.nix +++ b/pkgs/applications/science/biology/sambamba/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python3, which, dmd, ldc, zlib }: +{ lib, stdenv, fetchFromGitHub, python3, which, dmd, ldc, zlib }: stdenv.mkDerivation rec { pname = "sambamba"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { cp bin/sambamba-${version} $out/bin/sambamba ''; - meta = with stdenv.lib; { + meta = with lib; { description = "SAM/BAM processing tool"; homepage = "https://lomereiter.github.io/sambamba/"; maintainers = with maintainers; [ jbedo ]; diff --git a/pkgs/applications/science/biology/samblaster/default.nix b/pkgs/applications/science/biology/samblaster/default.nix index 6846e3c84fae..48c19666ba04 100644 --- a/pkgs/applications/science/biology/samblaster/default.nix +++ b/pkgs/applications/science/biology/samblaster/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "samblaster"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { cp samblaster $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Tool for marking duplicates and extracting discordant/split reads from SAM/BAM files"; maintainers = with maintainers; [ jbedo ]; license = licenses.mit; diff --git a/pkgs/applications/science/biology/samtools/default.nix b/pkgs/applications/science/biology/samtools/default.nix index 27ed79a1f6ca..7dd78ee2e635 100644 --- a/pkgs/applications/science/biology/samtools/default.nix +++ b/pkgs/applications/science/biology/samtools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, zlib, htslib, perl, ncurses ? null }: +{ lib, stdenv, fetchurl, zlib, htslib, perl, ncurses ? null }: stdenv.mkDerivation rec { pname = "samtools"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Tools for manipulating SAM/BAM/CRAM format"; license = licenses.mit; homepage = "http://www.htslib.org/"; diff --git a/pkgs/applications/science/biology/samtools/samtools_0_1_19.nix b/pkgs/applications/science/biology/samtools/samtools_0_1_19.nix index d62c2a1fe7b1..590f10dd87a1 100644 --- a/pkgs/applications/science/biology/samtools/samtools_0_1_19.nix +++ b/pkgs/applications/science/biology/samtools/samtools_0_1_19.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, zlib }: +{ lib, stdenv, fetchurl, zlib }: stdenv.mkDerivation rec { pname = "samtools"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { cp samtools.1 $out/share/man ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Tools for manipulating SAM/BAM/CRAM format"; license = licenses.mit; homepage = "http://samtools.sourceforge.net/"; diff --git a/pkgs/applications/science/biology/seaview/default.nix b/pkgs/applications/science/biology/seaview/default.nix index dfee97947825..27d83f3bf89e 100644 --- a/pkgs/applications/science/biology/seaview/default.nix +++ b/pkgs/applications/science/biology/seaview/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, coreutils, fltk, libjpeg }: +{ lib, stdenv, fetchurl, coreutils, fltk, libjpeg }: stdenv.mkDerivation rec { version = "5.0.4"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { patchPhase = "sed -i 's#PATH=/bin:/usr/bin rm#'${coreutils}/bin/rm'#' seaview.cxx"; installPhase = "mkdir -p $out/bin; cp seaview $out/bin"; - meta = with stdenv.lib; { + meta = with lib; { description = "GUI for molecular phylogeny"; longDescription = '' SeaView is a multiplatform, graphical user interface for multiple sequence alignment and molecular phylogeny. diff --git a/pkgs/applications/science/biology/snpeff/default.nix b/pkgs/applications/science/biology/snpeff/default.nix index 941f107a580f..32701af8392c 100644 --- a/pkgs/applications/science/biology/snpeff/default.nix +++ b/pkgs/applications/science/biology/snpeff/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, jre, unzip, makeWrapper}: +{lib, stdenv, fetchurl, jre, unzip, makeWrapper}: stdenv.mkDerivation rec { pname = "snpeff"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { makeWrapper ${jre}/bin/java $out/bin/snpsift --add-flags "-jar $out/libexec/snpeff/SnpSift.jar" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Genetic variant annotation and effect prediction toolbox"; license = licenses.lgpl3; homepage = "http://snpeff.sourceforge.net/"; diff --git a/pkgs/applications/science/biology/somatic-sniper/default.nix b/pkgs/applications/science/biology/somatic-sniper/default.nix index 17d9c3dbb55c..034409cfb013 100644 --- a/pkgs/applications/science/biology/somatic-sniper/default.nix +++ b/pkgs/applications/science/biology/somatic-sniper/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, cmake, zlib, ncurses}: +{lib, stdenv, fetchFromGitHub, cmake, zlib, ncurses}: stdenv.mkDerivation rec { pname = "somatic-sniper"; @@ -13,11 +13,12 @@ stdenv.mkDerivation rec { patches = [ ./somatic-sniper.patch ]; - buildInputs = [ cmake zlib ncurses ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ zlib ncurses ]; enableParallelBuilding = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Identify single nucleotide positions that are different between tumor and normal"; license = licenses.mit; homepage = "https://github.com/genome/somatic-sniper"; diff --git a/pkgs/applications/science/biology/sortmerna/default.nix b/pkgs/applications/science/biology/sortmerna/default.nix index 4e32669dfca9..01c65f4bcff4 100644 --- a/pkgs/applications/science/biology/sortmerna/default.nix +++ b/pkgs/applications/science/biology/sortmerna/default.nix @@ -1,4 +1,4 @@ -{ stdenv, cmake, rocksdb, rapidjson, pkgconfig, fetchFromGitHub, fetchpatch, zlib }: +{ lib, stdenv, cmake, rocksdb, rapidjson, pkgconfig, fetchFromGitHub, fetchpatch, zlib }: stdenv.mkDerivation rec { pname = "sortmerna"; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { "target_link_libraries(sortmerna Threads::Threads" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Tools for filtering, mapping, and OTU-picking from shotgun genomics data"; license = licenses.lgpl3; platforms = platforms.x86_64; diff --git a/pkgs/applications/science/biology/spades/default.nix b/pkgs/applications/science/biology/spades/default.nix index 776719579d97..ec381693aedf 100644 --- a/pkgs/applications/science/biology/spades/default.nix +++ b/pkgs/applications/science/biology/spades/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, zlib, bzip2, cmake, python3 }: +{ lib, stdenv, fetchurl, zlib, bzip2, cmake, python3 }: stdenv.mkDerivation rec { pname = "SPAdes"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sourceRoot = "${pname}-${version}/src"; - meta = with stdenv.lib; { + meta = with lib; { description = "St. Petersburg genome assembler: assembly toolkit containing various assembly pipelines"; license = licenses.gpl2; homepage = "http://cab.spbu.ru/software/spades/"; diff --git a/pkgs/applications/science/biology/star/default.nix b/pkgs/applications/science/biology/star/default.nix index f2e1a2a8fee5..a7fe948ecfd6 100644 --- a/pkgs/applications/science/biology/star/default.nix +++ b/pkgs/applications/science/biology/star/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, zlib }: +{ lib, stdenv, fetchFromGitHub, zlib }: stdenv.mkDerivation rec { pname = "star"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Spliced Transcripts Alignment to a Reference"; homepage = "https://github.com/alexdobin/STAR"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/science/biology/strelka/default.nix b/pkgs/applications/science/biology/strelka/default.nix index a32eddcb1cd9..8585f3770fbc 100644 --- a/pkgs/applications/science/biology/strelka/default.nix +++ b/pkgs/applications/science/biology/strelka/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, cmake, zlib, python2}: +{lib, stdenv, fetchFromGitHub, cmake, zlib, python2}: stdenv.mkDerivation rec { pname = "strelka"; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { popd ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Germline and small variant caller"; license = licenses.gpl3; homepage = "https://github.com/Illumina/strelka"; diff --git a/pkgs/applications/science/biology/sumatools/default.nix b/pkgs/applications/science/biology/sumatools/default.nix index 1e3b479d54fc..2a30f33172b9 100644 --- a/pkgs/applications/science/biology/sumatools/default.nix +++ b/pkgs/applications/science/biology/sumatools/default.nix @@ -1,8 +1,8 @@ -{ gccStdenv, fetchFromGitLab, zlib }: +{ lib, gccStdenv, fetchFromGitLab, zlib }: let stdenv = gccStdenv; - meta = with stdenv.lib; { + meta = with lib; { description = "Fast and exact comparison and clustering of sequences"; homepage = "https://metabarcoding.org/sumatra"; maintainers = [ maintainers.bzizou ]; diff --git a/pkgs/applications/science/biology/svaba/default.nix b/pkgs/applications/science/biology/svaba/default.nix index ae8dc95d6fea..87b77f6ac045 100644 --- a/pkgs/applications/science/biology/svaba/default.nix +++ b/pkgs/applications/science/biology/svaba/default.nix @@ -1,4 +1,4 @@ -{ stdenv, zlib, bzip2, lzma, fetchFromGitHub } : +{ lib, stdenv, zlib, bzip2, lzma, fetchFromGitHub } : stdenv.mkDerivation rec { version = "1.1.0"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Structural variant and INDEL caller for DNA sequencing data, using genome-wide local assembly"; license = licenses.gpl3; homepage = "https://github.com/walaj/svaba"; diff --git a/pkgs/applications/science/biology/tebreak/default.nix b/pkgs/applications/science/biology/tebreak/default.nix index 82c624ba7cd9..b70ac29e38f7 100644 --- a/pkgs/applications/science/biology/tebreak/default.nix +++ b/pkgs/applications/science/biology/tebreak/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, last, exonerate, minia, python3Packages, bwa +{ lib, stdenv, fetchFromGitHub, last, exonerate, minia, python3Packages, bwa , samtools, findutils, python }: python3Packages.buildPythonApplication rec { @@ -38,7 +38,7 @@ python3Packages.buildPythonApplication rec { ${python.interpreter} checktest.py ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Find and characterise transposable element insertions"; homepage = "https://github.com/adamewing/tebreak"; license = licenses.mit; diff --git a/pkgs/applications/science/biology/trimal/default.nix b/pkgs/applications/science/biology/trimal/default.nix index 8d7e62b61431..b27a63a2135a 100755 --- a/pkgs/applications/science/biology/trimal/default.nix +++ b/pkgs/applications/science/biology/trimal/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "trimal"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { cp -a trimal readal statal $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A tool for the automated removal of spurious sequences or poorly aligned regions from a multiple sequence alignment"; license = licenses.gpl3; platforms = platforms.linux; diff --git a/pkgs/applications/science/biology/varscan/default.nix b/pkgs/applications/science/biology/varscan/default.nix index e97c8f14451f..65a19b83a70e 100644 --- a/pkgs/applications/science/biology/varscan/default.nix +++ b/pkgs/applications/science/biology/varscan/default.nix @@ -1,12 +1,12 @@ -{stdenv, fetchurl, jre, makeWrapper}: +{lib, stdenv, fetchurl, jre, makeWrapper}: stdenv.mkDerivation rec { pname = "varscan"; - version = "2.4.2"; + version = "2.4.4"; src = fetchurl { - url = "https://github.com/dkoboldt/varscan/releases/download/${version}/VarScan.v${version}.jar"; - sha256 = "0cfhshinyqgwc6i7zf8lhbfybyly2x5anrz824zyvdhzz5i69zrl"; + url = "https://github.com/dkoboldt/varscan/raw/master/VarScan.v${version}.jar"; + sha256 = "sha256-+yO3KrZ2+1qJvQIJHCtsmv8hC5a+4E2d7mrvTYtygU0="; }; buildInputs = [ jre makeWrapper ]; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { makeWrapper ${jre}/bin/java $out/bin/varscan --add-flags "-jar $out/libexec/varscan/varscan.jar" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Variant calling and somatic mutation/CNV detection for next-generation sequencing data"; # VarScan 2 is free for non-commercial use by academic, # government, and non-profit/not-for-profit institutions. A diff --git a/pkgs/applications/science/biology/vcftools/default.nix b/pkgs/applications/science/biology/vcftools/default.nix index 52957b58bc92..61b2ea143b8d 100755 --- a/pkgs/applications/science/biology/vcftools/default.nix +++ b/pkgs/applications/science/biology/vcftools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, zlib, autoreconfHook, pkgconfig, perl }: +{ lib, stdenv, fetchFromGitHub, zlib, autoreconfHook, pkgconfig, perl }: stdenv.mkDerivation rec { pname = "vcftools"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ autoreconfHook pkgconfig zlib perl ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A set of tools written in Perl and C++ for working with VCF files, such as those generated by the 1000 Genomes Project"; license = licenses.lgpl3; platforms = platforms.linux; diff --git a/pkgs/applications/science/biology/whisper/default.nix b/pkgs/applications/science/biology/whisper/default.nix index 9e336600202b..8552eede170b 100644 --- a/pkgs/applications/science/biology/whisper/default.nix +++ b/pkgs/applications/science/biology/whisper/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchurl }: +{ lib, stdenv, fetchFromGitHub, fetchurl }: stdenv.mkDerivation rec { pname = "whisper"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Short read sequence mapper"; license = licenses.gpl3; homepage = "https://github.com/refresh-bio/whisper"; diff --git a/pkgs/applications/science/chemistry/d-seams/default.nix b/pkgs/applications/science/chemistry/d-seams/default.nix index 1c6395637573..cbe73bb7edc2 100644 --- a/pkgs/applications/science/chemistry/d-seams/default.nix +++ b/pkgs/applications/science/chemistry/d-seams/default.nix @@ -12,11 +12,10 @@ clangStdenv.mkDerivation rec { sha256 = "03zhhl9vhi3rhc3qz1g3zb89jksgpdlrk15fcr8xcz8pkj6r5b1i"; }; - enableParallelBuilding = true; nativeBuildInputs = [ cmake lua luaPackages.luafilesystem ]; buildInputs = [ fmt rang libyamlcpp eigen catch2 boost gsl liblapack blas ]; - meta = with stdenv.lib; { + meta = with lib; { description = "d-SEAMS: Deferred Structural Elucidation Analysis for Molecular Simulations"; longDescription = '' diff --git a/pkgs/applications/science/chemistry/jmol/default.nix b/pkgs/applications/science/chemistry/jmol/default.nix index e09abccad121..aa52fee0890d 100644 --- a/pkgs/applications/science/chemistry/jmol/default.nix +++ b/pkgs/applications/science/chemistry/jmol/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A Java 3D viewer for chemical structures"; homepage = "https://sourceforge.net/projects/jmol"; license = licenses.lgpl2; diff --git a/pkgs/applications/science/chemistry/molden/default.nix b/pkgs/applications/science/chemistry/molden/default.nix index 0d7e81cd9dab..ac3dd513f34b 100644 --- a/pkgs/applications/science/chemistry/molden/default.nix +++ b/pkgs/applications/science/chemistry/molden/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, which, gfortran, libGLU, xorg } : +{ lib, stdenv, fetchurl, which, gfortran, libGLU, xorg } : stdenv.mkDerivation rec { version = "6.3"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Display and manipulate molecular structures"; homepage = "http://www.cmbi.ru.nl/molden/"; license = { diff --git a/pkgs/applications/science/chemistry/octopus/default.nix b/pkgs/applications/science/chemistry/octopus/default.nix index f8eb064e1fd7..74ed1873efed 100644 --- a/pkgs/applications/science/chemistry/octopus/default.nix +++ b/pkgs/applications/science/chemistry/octopus/default.nix @@ -1,22 +1,34 @@ -{ stdenv, fetchFromGitLab, symlinkJoin, gfortran, perl, procps +{ lib, stdenv, fetchFromGitLab, symlinkJoin, gfortran, perl, procps , libyaml, libxc, fftw, blas, lapack, gsl, netcdf, arpack, autoreconfHook +, python3 }: assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { pname = "octopus"; - version = "10.0"; + version = "10.3"; src = fetchFromGitLab { owner = "octopus-code"; repo = "octopus"; rev = version; - sha256 = "1c6q20y0x9aacwa7vp6gj3yvfzain7hnk6skxmvg3wazp02l91kn"; + sha256 = "1axr3j53mi30gm3f645ga5jkhxbc7rbx432w2k2lgg6g9dv3fcs4"; }; nativeBuildInputs = [ perl procps autoreconfHook ]; - buildInputs = [ libyaml gfortran libxc blas lapack gsl fftw netcdf arpack ]; + buildInputs = [ + libyaml + gfortran + libxc + blas + lapack + gsl + fftw + netcdf + arpack + (python3.withPackages (ps: [ ps.pyyaml ])) + ]; configureFlags = [ "--with-yaml-prefix=${libyaml}" @@ -40,11 +52,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Real-space time dependent density-functional theory code"; homepage = "https://octopus-code.org"; maintainers = with maintainers; [ markuskowa ]; - license = licenses.gpl2; + license = with licenses; [ gpl2Only asl20 lgpl3Plus bsd3 ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/science/chemistry/openmolcas/default.nix b/pkgs/applications/science/chemistry/openmolcas/default.nix index 317a83371adb..1297e595b9a8 100644 --- a/pkgs/applications/science/chemistry/openmolcas/default.nix +++ b/pkgs/applications/science/chemistry/openmolcas/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, cmake, gfortran, perl +{ lib, stdenv, fetchFromGitLab, cmake, gfortran, perl , openblas, hdf5-cpp, python3, texlive , armadillo, openmpi, globalarrays, openssh , makeWrapper, fetchpatch @@ -38,8 +38,6 @@ in stdenv.mkDerivation { openssh ]; - enableParallelBuilding = true; - cmakeFlags = [ "-DOPENMP=ON" "-DGA=ON" @@ -67,7 +65,7 @@ in stdenv.mkDerivation { wrapProgram $out/bin/pymolcas --set MOLCAS $out ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Advanced quantum chemistry software package"; homepage = "https://gitlab.com/Molcas/OpenMolcas"; maintainers = [ maintainers.markuskowa ]; diff --git a/pkgs/applications/science/chemistry/quantum-espresso/default.nix b/pkgs/applications/science/chemistry/quantum-espresso/default.nix index 2443e6b23aba..717ff1dba82b 100644 --- a/pkgs/applications/science/chemistry/quantum-espresso/default.nix +++ b/pkgs/applications/science/chemistry/quantum-espresso/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , gfortran, fftw, blas, lapack , mpi ? null }: stdenv.mkDerivation rec { - version = "6.5"; + version = "6.6"; pname = "quantum-espresso"; src = fetchurl { url = "https://gitlab.com/QEF/q-e/-/archive/qe-${version}/q-e-qe-${version}.tar.gz"; - sha256 = "00nnsq1vq579xsmkvwrgs6bdqdcbdlsmcp4yfynnvs40ca52m2r5"; + sha256 = "0b3718bwdqfyssyz25jknijar79qh5cf1bbizv9faliz135mcilj"; }; passthru = { @@ -27,7 +27,7 @@ configureFlags = if (mpi != null) then [ "LD=${mpi}/bin/mpif90" ] else [ "LD=${g makeFlags = [ "all" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Electronic-structure calculations and materials modeling at the nanoscale"; longDescription = '' Quantum ESPRESSO is an integrated suite of Open-Source computer codes for diff --git a/pkgs/applications/science/chemistry/siesta/default.nix b/pkgs/applications/science/chemistry/siesta/default.nix index c053c0a09cdf..cb4667adcab4 100644 --- a/pkgs/applications/science/chemistry/siesta/default.nix +++ b/pkgs/applications/science/chemistry/siesta/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , gfortran, blas, lapack , mpi ? null, scalapack }: @@ -46,7 +46,7 @@ stdenv.mkDerivation { cp -a siesta $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A first-principles materials simulation code using DFT"; longDescription = '' SIESTA is both a method and its computer program diff --git a/pkgs/applications/science/electronics/alliance/default.nix b/pkgs/applications/science/electronics/alliance/default.nix index 861f6cea0b4b..081a4cab1df2 100644 --- a/pkgs/applications/science/electronics/alliance/default.nix +++ b/pkgs/applications/science/electronics/alliance/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , xorgproto, motif, libX11, libXt, libXpm, bison , flex, automake, autoconf, libtool, runtimeShell }: @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { chmod +x $out/bin/alliance-uninstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Complete set of free CAD tools and portable libraries for VLSI design"; homepage = "http://www-asim.lip6.fr/recherche/alliance/"; license = with licenses; gpl2Plus; diff --git a/pkgs/applications/science/electronics/appcsxcad/default.nix b/pkgs/applications/science/electronics/appcsxcad/default.nix index c2d7cefec9b8..7aafa70f7fa1 100644 --- a/pkgs/applications/science/electronics/appcsxcad/default.nix +++ b/pkgs/applications/science/electronics/appcsxcad/default.nix @@ -45,8 +45,6 @@ mkDerivation { rm $out/bin/AppCSXCAD.sh ''; - enableParallelBuilding = true; - meta = with lib; { description = "Minimal Application using the QCSXCAD library"; homepage = "https://github.com/thliebig/AppCSXCAD"; diff --git a/pkgs/applications/science/electronics/bitscope/common.nix b/pkgs/applications/science/electronics/bitscope/common.nix index acbdeb8cfaa2..8aade9dd2c89 100644 --- a/pkgs/applications/science/electronics/bitscope/common.nix +++ b/pkgs/applications/science/electronics/bitscope/common.nix @@ -7,7 +7,7 @@ , gtk2-x11 , makeWrapper , pango -, stdenv +, lib, stdenv , xorg }: @@ -22,7 +22,7 @@ let name = "${toolName}-${version}"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://bitscope.com/software/"; license = licenses.unfree; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/science/electronics/caneda/default.nix b/pkgs/applications/science/electronics/caneda/default.nix index c90ceac6788f..5cf9ab1ae6fb 100644 --- a/pkgs/applications/science/electronics/caneda/default.nix +++ b/pkgs/applications/science/electronics/caneda/default.nix @@ -14,8 +14,6 @@ mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ qtbase qttools qtsvg qwt ]; - enableParallelBuilding = true; - meta = { description = "Open source EDA software focused on easy of use and portability"; homepage = "http://caneda.org"; diff --git a/pkgs/applications/science/electronics/csxcad/default.nix b/pkgs/applications/science/electronics/csxcad/default.nix index adc6a60be853..d9953a785739 100644 --- a/pkgs/applications/science/electronics/csxcad/default.nix +++ b/pkgs/applications/science/electronics/csxcad/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , cmake , fparser @@ -37,9 +37,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - enableParallelBuilding = true; - - meta = with stdenv.lib; { + meta = with lib; { description = "A C++ library to describe geometrical objects"; homepage = "https://github.com/thliebig/CSXCAD"; license = licenses.lgpl3; diff --git a/pkgs/applications/science/electronics/diylc/default.nix b/pkgs/applications/science/electronics/diylc/default.nix new file mode 100644 index 000000000000..70d07460a751 --- /dev/null +++ b/pkgs/applications/science/electronics/diylc/default.nix @@ -0,0 +1,71 @@ +{ lib, stdenv, fetchurl, makeDesktopItem, unzip, bash, jre8 }: + +let + pname = "diylc"; + version = "4.15.1"; + files = { + app = fetchurl { + url = "https://github.com/bancika/diy-layout-creator/releases/download/v${version}/diylc-${version}.zip"; + sha256 = "09vzbxas654n8npxljqljf930y5gcjfvv3r4dv97dwk5sy66xvaf"; + }; + icon16 = fetchurl { + url = "https://raw.githubusercontent.com/bancika/diy-layout-creator/v${version}/diylc/diylc-core/src/org/diylc/core/images/icon_small.png"; + sha256 = "1is50aidfwzwfzwqv57s2hwhx0r5c21cp77bkl93xkdqkh2wd8x4"; + }; + icon32 = fetchurl { + url = "https://raw.githubusercontent.com/bancika/diy-layout-creator/v${version}/diylc/diylc-core/src/org/diylc/core/images/icon_medium.png"; + sha256 = "0a45p18n84xz1nd3zv3y16jlimvqzhbzg3q3f4lawgx4rcrn2n3d"; + }; + icon48 = fetchurl { + url = "https://raw.githubusercontent.com/bancika/diy-layout-creator/v${version}/diylc/diylc-core/src/org/diylc/core/images/icon_large.png"; + sha256 = "06dkz0dcy8hfmnzr5ri5n1sh8r7mg83kzbvs3zy58wwhgzs1ddk6"; + }; + }; + launcher = makeDesktopItem { + name = "diylc"; + desktopName = "DIY Layout Creator"; + comment = "Multi platform circuit layout and schematic drawing tool"; + exec = "diylc"; + icon = "diylc_icon"; + categories = "Development;Electronics;"; + }; +in +stdenv.mkDerivation rec { + inherit pname version; + + dontUnpack = true; + + buildInputs = [ jre8 ]; + nativeBuildInputs = [ unzip ]; + + installPhase = '' + install -d $out/share/diylc + ${unzip}/bin/unzip -UU ${files.app} -d $out/share/diylc + rm $out/share/diylc/diylc.exe + rm $out/share/diylc/run.sh + + # Nope, the icon cannot be named 'diylc' because KDE does not like it. + install -Dm644 ${files.icon16} $out/share/icons/hicolor/16x16/apps/diylc_icon.png + install -Dm644 ${files.icon32} $out/share/icons/hicolor/32x32/apps/diylc_icon.png + install -Dm644 ${files.icon48} $out/share/icons/hicolor/48x48/apps/diylc_icon.png + + install -d $out/share/applications + ln -s ${launcher}/share/applications/* $out/share/applications/ + + install -d $out/bin + cat < $out/bin/diylc + #!${bash}/bin/sh + cd $out/share/diylc + ${jre8}/bin/java -Xms512m -Xmx2048m -Dorg.diylc.scriptRun=true -Dfile.encoding=UTF-8 -cp diylc.jar:lib org.diylc.DIYLCStarter + EOF + chmod +x $out/bin/diylc + ''; + + meta = with lib; { + description = "Multi platform circuit layout and schematic drawing tool"; + homepage = "https://bancika.github.io/diy-layout-creator/"; + changelog = "https://github.com/bancika/diy-layout-creator/releases"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/science/electronics/dsview/default.nix b/pkgs/applications/science/electronics/dsview/default.nix index e61017ea330d..8c5e9e41aacc 100644 --- a/pkgs/applications/science/electronics/dsview/default.nix +++ b/pkgs/applications/science/electronics/dsview/default.nix @@ -34,8 +34,6 @@ mkDerivation rec { python3 ]; - enableParallelBuilding = true; - meta = with lib; { description = "A GUI program for supporting various instruments from DreamSourceLab, including logic analyzer, oscilloscope, etc"; homepage = "https://www.dreamsourcelab.com/"; diff --git a/pkgs/applications/science/electronics/dsview/libsigrok4dsl.nix b/pkgs/applications/science/electronics/dsview/libsigrok4dsl.nix index 7915cb0ba4ae..a2fcb9a929d7 100644 --- a/pkgs/applications/science/electronics/dsview/libsigrok4dsl.nix +++ b/pkgs/applications/science/electronics/dsview/libsigrok4dsl.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgconfig, autoreconfHook, +{ lib, stdenv, pkgconfig, autoreconfHook, glib, libzip, libserialport, check, libusb1, libftdi, systemd, alsaLib, dsview }: @@ -18,7 +18,7 @@ stdenv.mkDerivation { glib libzip libserialport libusb1 libftdi systemd check alsaLib ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A fork of the sigrok library for usage with DSView"; homepage = "https://www.dreamsourcelab.com/"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/science/electronics/dsview/libsigrokdecode4dsl.nix b/pkgs/applications/science/electronics/dsview/libsigrokdecode4dsl.nix index 72b2fa1b6854..2bab4b681d3f 100644 --- a/pkgs/applications/science/electronics/dsview/libsigrokdecode4dsl.nix +++ b/pkgs/applications/science/electronics/dsview/libsigrokdecode4dsl.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgconfig, autoreconfHook, +{ lib, stdenv, pkgconfig, autoreconfHook, glib, check, python3, dsview }: @@ -17,7 +17,7 @@ stdenv.mkDerivation { python3 glib check ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A fork of the sigrokdecode library for usage with DSView"; homepage = "https://www.dreamsourcelab.com/"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/science/electronics/eagle/eagle.nix b/pkgs/applications/science/electronics/eagle/eagle.nix index 400e5e300975..130146e0d9a1 100644 --- a/pkgs/applications/science/electronics/eagle/eagle.nix +++ b/pkgs/applications/science/electronics/eagle/eagle.nix @@ -1,4 +1,4 @@ -{ stdenv, mkDerivation, fetchurl, makeDesktopItem +{ lib, stdenv, mkDerivation, fetchurl, makeDesktopItem , libXrender, libXrandr, libXcursor, libX11, libXext, libXi, libxcb , libGL, glib, nss, nspr, expat, alsaLib , qtbase, qtdeclarative, qtsvg, qtlocation, qtwebchannel, qtwebengine @@ -70,7 +70,7 @@ let ln -s "$out/eagle-${version}/bin/eagle-logo.png" "$out"/share/icons/eagle.png ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Schematic editor and PCB layout tool from Autodesk (formerly CadSoft)"; homepage = "https://www.autodesk.com/products/eagle/overview"; license = licenses.unfree; diff --git a/pkgs/applications/science/electronics/eagle/eagle7.nix b/pkgs/applications/science/electronics/eagle/eagle7.nix index 5546bb910455..d826d2d2c24a 100644 --- a/pkgs/applications/science/electronics/eagle/eagle7.nix +++ b/pkgs/applications/science/electronics/eagle/eagle7.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeDesktopItem, patchelf, zlib, freetype, fontconfig +{ lib, stdenv, fetchurl, makeDesktopItem, patchelf, zlib, freetype, fontconfig , openssl, libXrender, libXrandr, libXcursor, libX11, libXext, libXi , libxcb, cups, xkeyboardconfig, runtimeShell }: @@ -87,7 +87,7 @@ stdenv.mkDerivation rec { ln -s "$out/eagle-${version}/bin/eagleicon50.png" "$out"/share/icons/eagle.png ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Schematic editor and PCB layout tool from CadSoft"; homepage = "http://www.cadsoftusa.com/"; license = licenses.unfree; diff --git a/pkgs/applications/science/electronics/fparser/default.nix b/pkgs/applications/science/electronics/fparser/default.nix index 55e40ca2b00b..73db0575d0b1 100644 --- a/pkgs/applications/science/electronics/fparser/default.nix +++ b/pkgs/applications/science/electronics/fparser/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , cmake }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - meta = with stdenv.lib; { + meta = with lib; { description = "C++ Library for Evaluating Mathematical Functions"; homepage = "https://github.com/thliebig/fparser"; license = licenses.lgpl3; diff --git a/pkgs/applications/science/electronics/geda/default.nix b/pkgs/applications/science/electronics/geda/default.nix index 54ab7ec57e27..c9a3dcf1aa03 100644 --- a/pkgs/applications/science/electronics/geda/default.nix +++ b/pkgs/applications/science/electronics/geda/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, guile, gtk2, flex, gawk, perl }: +{ lib, stdenv, fetchurl, pkgconfig, guile, gtk2, flex, gawk, perl }: stdenv.mkDerivation { pname = "geda"; @@ -15,7 +15,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ guile gtk2 flex gawk perl ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Full GPL'd suite of Electronic Design Automation tools"; homepage = "http://www.geda-project.org/"; maintainers = with maintainers; [ pjones ]; diff --git a/pkgs/applications/science/electronics/gerbv/default.nix b/pkgs/applications/science/electronics/gerbv/default.nix index b0317551df8d..a44a892eabeb 100644 --- a/pkgs/applications/science/electronics/gerbv/default.nix +++ b/pkgs/applications/science/electronics/gerbv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, pkgconfig, gettext, libtool, automake, autoconf, cairo, gtk2, autoreconfHook }: +{ lib, stdenv, fetchgit, pkgconfig, gettext, libtool, automake, autoconf, cairo, gtk2, autoreconfHook }: stdenv.mkDerivation { pname = "gerbv"; @@ -15,7 +15,7 @@ stdenv.mkDerivation { configureFlags = ["--disable-update-desktop-database"]; - meta = with stdenv.lib; { + meta = with lib; { description = "A Gerber (RS-274X) viewer"; homepage = "http://gerbv.geda-project.org/"; maintainers = with maintainers; [ mog ]; diff --git a/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix b/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix index 896a2a010844..47f901c0ba58 100644 --- a/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix +++ b/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, ninja, pkgconfig, python3Packages +{ lib, stdenv, fetchFromGitHub, cmake, ninja, pkgconfig, python3Packages , boost, rapidjson, qtbase, qtsvg, igraph, spdlog, wrapQtAppsHook , fmt, graphviz, llvmPackages ? null }: @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { # the qt mkDerivation - the latter forcibly overrides this. cmakeBuildType = "MinSizeRel"; - meta = with stdenv.lib; { + meta = with lib; { description = "A comprehensive reverse engineering and manipulation framework for gate-level netlists"; homepage = "https://github.com/emsec/hal"; license = licenses.mit; diff --git a/pkgs/applications/science/electronics/hyp2mat/default.nix b/pkgs/applications/science/electronics/hyp2mat/default.nix index 154b68dd5aa2..01d587fc1723 100644 --- a/pkgs/applications/science/electronics/hyp2mat/default.nix +++ b/pkgs/applications/science/electronics/hyp2mat/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , bison , flex @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Import Hyperlynx Boardsim files to openEMS, an open source 3D full-wave electromagnetic field solver"; homepage = "https://github.com/koendv/hyp2mat"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/science/electronics/kicad/i18n.nix b/pkgs/applications/science/electronics/kicad/i18n.nix index 95cea4fd7fc4..9a93e4ca7ce6 100644 --- a/pkgs/applications/science/electronics/kicad/i18n.nix +++ b/pkgs/applications/science/electronics/kicad/i18n.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , cmake , gettext , src @@ -11,7 +11,7 @@ stdenv.mkDerivation { pname = "kicad-i18n"; nativeBuildInputs = [ cmake gettext ]; - meta = with stdenv.lib; { + meta = with lib; { license = licenses.gpl2; # https://github.com/KiCad/kicad-i18n/issues/3 platforms = platforms.all; }; diff --git a/pkgs/applications/science/electronics/kicad/update.sh b/pkgs/applications/science/electronics/kicad/update.sh index cfd78323b77a..099440956ae7 100755 --- a/pkgs/applications/science/electronics/kicad/update.sh +++ b/pkgs/applications/science/electronics/kicad/update.sh @@ -144,7 +144,7 @@ for version in "${all_versions[@]}"; do for lib in "${libs[@]}"; do echo "Checking ${lib}" >&2 url="${gitlab}/libraries/kicad-${lib}.git" - lib_rev="$(${get_rev} "${url}" "${version}" | cut -f1 | head -n1)" + lib_rev="$(${get_rev} "${url}" "${version}" | cut -f1 | tail -n1)" has_rev="$(grep -sm 1 "\"${pname}\"" -A 19 "${file}" | grep -sm 1 "${lib_rev}" || true)" has_hash="$(grep -sm 1 "\"${pname}\"" -A 20 "${file}" | grep -sm 1 "${lib}.sha256" || true)" if [[ -n ${has_rev} && -n ${has_hash} && -z ${clean} ]]; then @@ -173,8 +173,8 @@ printf "}\n" } > "${tmp}" if grep '""' "${tmp}"; then - echo "empty value detected, out of space?" >&2 - exit "1" + echo "empty value detected, out of space?" >&2 + exit "1" fi mv "${tmp}" "${file}" diff --git a/pkgs/applications/science/electronics/kicad/versions.nix b/pkgs/applications/science/electronics/kicad/versions.nix index 9f00f3fa8ba8..8a5e5d8f5f5c 100644 --- a/pkgs/applications/science/electronics/kicad/versions.nix +++ b/pkgs/applications/science/electronics/kicad/versions.nix @@ -3,19 +3,19 @@ { "kicad" = { kicadVersion = { - version = "5.1.8"; + version = "5.1.9"; src = { - rev = "db9833491010954bc27fac92c83d2864bd95c23c"; - sha256 = "08ni9j2lw2hjc1csk6rkydcxwdal6da17ch60zkjij5vfsif2hix"; + rev = "73d0e3b20dec05c4350efa5b69916eb29a7bfcb5"; + sha256 = "1cqh3bc9y140hbryfk9qavs2y3lj5sm9q0qjxcf4mm472afzckky"; }; }; libVersion = { - version = "5.1.8"; + version = "5.1.9"; libSources = { - i18n.rev = "78adcd19e7ed53f4889d6db65a33dd8ec2d323e9"; - i18n.sha256 = "0x0w2m6d3xfm22y4anp5j2j67iwzby149ynj6qjlw2kcsi8kwk1j"; - symbols.rev = "bf475af94877e8fd9cf80e667578ff61835e02bb"; - symbols.sha256 = "1ii3r813653ng2ycggnknqx4g3ja7dbm4qyxrf9aq48ws0xkvhx3"; + i18n.rev = "04f3231f60d55400cb81564b2cd465a57d5192d5"; + i18n.sha256 = "04jq1dcag6i2ljjfqrib65mn4wg4c4nmi7i946l3bywc0rkqsx1f"; + symbols.rev = "6dec5004b6a2679c19d4857bda2f90c5ab3a5726"; + symbols.sha256 = "0n25rq32jwyigfw26faqraillwv6zbi2ywy26dkz5zqlf5xp56ad"; templates.rev = "1ccbaf3704e8ff4030d0915f71e051af621ef7d7"; templates.sha256 = "1a8xfcbdbb4ylrb5m7n2jjk9kwvgmlx1pmnn2cwj327a2b3m4jjs"; footprints.rev = "302ac78bac21825532f970fb92714fa5973ad79b"; @@ -27,25 +27,25 @@ }; "kicad-unstable" = { kicadVersion = { - version = "2020-12-01"; + version = "2020-12-23"; src = { - rev = "3c521942ed52e83482c82d426170b4fbf327f846"; - sha256 = "sha256:09qab69sy3n44kjlzxxx7gbksyr1kg8n14kz0zf8n71zfcqagci4"; + rev = "912657dd238ad78cfc5d9d5e426ea850d5554fb3"; + sha256 = "1p5kr4d4zpajwdmya1f351y1ix8qmvsx1hrnvhzh7yc3g72kgxah"; }; }; libVersion = { - version = "2020-12-01"; + version = "2020-12-23"; libSources = { i18n.rev = "e89d9a89bec59199c1ade56ee2556591412ab7b0"; - i18n.sha256 = "sha256:04zaqyhj3qr4ymyd3k5vjpcna64j8klpsygcgjcv29s3rdi8glfl"; + i18n.sha256 = "04zaqyhj3qr4ymyd3k5vjpcna64j8klpsygcgjcv29s3rdi8glfl"; symbols.rev = "e538abb015b4f289910a6f26b2f1b9cb8bf2efdb"; - symbols.sha256 = "sha256:117y4cm46anlrnw6y6mdjgl1a5gab6h6m7cwx3q7qb284m9bs5gi"; + symbols.sha256 = "117y4cm46anlrnw6y6mdjgl1a5gab6h6m7cwx3q7qb284m9bs5gi"; templates.rev = "32a4f6fab863976fdcfa232e3e08fdcf3323a954"; - templates.sha256 = "sha256:13r94dghrh9slpj7nkzv0zqv5hk49s6pxm4q5ndqx0y8037ivmhk"; + templates.sha256 = "13r94dghrh9slpj7nkzv0zqv5hk49s6pxm4q5ndqx0y8037ivmhk"; footprints.rev = "15ffd67e01257d4d8134dbd6708cb58977eeccbe"; - footprints.sha256 = "sha256:1ad5k3wh2zqfibrar7pd3g363jk2q51dvraxnq3zlxa2x4znh7mw"; + footprints.sha256 = "1ad5k3wh2zqfibrar7pd3g363jk2q51dvraxnq3zlxa2x4znh7mw"; packages3d.rev = "d8b7e8c56d535f4d7e46373bf24c754a8403da1f"; - packages3d.sha256 = "sha256:0dh8ixg0w43wzj5h3164dz6l1vl4llwxhi3qcdgj1lgvrs28aywd"; + packages3d.sha256 = "0dh8ixg0w43wzj5h3164dz6l1vl4llwxhi3qcdgj1lgvrs28aywd"; }; }; }; diff --git a/pkgs/applications/science/electronics/librepcb/default.nix b/pkgs/applications/science/electronics/librepcb/default.nix index 4b0a4108ab22..394a17876155 100644 --- a/pkgs/applications/science/electronics/librepcb/default.nix +++ b/pkgs/applications/science/electronics/librepcb/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { wrapQtApp $out/bin/librepcb ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A free EDA software to develop printed circuit boards"; homepage = "https://librepcb.org/"; maintainers = with maintainers; [ luz thoughtpolice ]; diff --git a/pkgs/applications/science/electronics/magic-vlsi/default.nix b/pkgs/applications/science/electronics/magic-vlsi/default.nix index 6667f2be9c3d..82d8dbd2ddc4 100644 --- a/pkgs/applications/science/electronics/magic-vlsi/default.nix +++ b/pkgs/applications/science/electronics/magic-vlsi/default.nix @@ -1,19 +1,37 @@ -{ stdenv, fetchurl -, m4, tcsh, libX11, tcl, tk -, cairo, ncurses, mesa_glu, python3 +{ lib, stdenv +, fetchurl +, python3 +, m4 +, cairo +, libX11 +, mesa_glu +, ncurses +, tcl +, tcsh +, tk }: stdenv.mkDerivation rec { pname = "magic-vlsi"; - version = "8.3.80"; + version = "8.3.109"; src = fetchurl { url = "http://opencircuitdesign.com/magic/archive/magic-${version}.tgz"; - sha256 = "0a5x4sh5xsr79pqbgv6221jc4fvaxkg2pvrdhy1cs4bmsc1sbm9j"; + sha256 = "sha256-ZK4OF5XwjW1OJmOVUFqLklfpM10eIwCILygqIyjRbEQ="; }; - buildInputs = [ m4 tcsh libX11 tcl tk cairo ncurses mesa_glu ]; nativeBuildInputs = [ python3 ]; + buildInputs = [ + cairo + libX11 + m4 + mesa_glu + ncurses + tcl + tcsh + tk + ]; + enableParallelBuilding = true; configureFlags = [ @@ -33,10 +51,10 @@ stdenv.mkDerivation rec { ./0002-fix-format-security.patch ]; - meta = with stdenv.lib; { + meta = with lib; { description = "VLSI layout tool written in Tcl"; homepage = "http://opencircuitdesign.com/magic/"; license = licenses.mit; - maintainers = with maintainers; [ anna328p thoughtpolice ]; + maintainers = with maintainers; [ anna328p thoughtpolice AndersonTorres ]; }; } diff --git a/pkgs/applications/science/electronics/nanovna-saver/default.nix b/pkgs/applications/science/electronics/nanovna-saver/default.nix index 62bda91e5008..9f959bddf2d2 100644 --- a/pkgs/applications/science/electronics/nanovna-saver/default.nix +++ b/pkgs/applications/science/electronics/nanovna-saver/default.nix @@ -2,7 +2,7 @@ , qtbase }: let - version = "0.3.7"; + version = "0.3.8"; pname = "nanovna-saver"; in mkDerivationWith python3Packages.buildPythonApplication { @@ -12,7 +12,7 @@ in mkDerivationWith python3Packages.buildPythonApplication { owner = "NanoVNA-Saver"; repo = pname; rev = "v${version}"; - sha256 = "0c22ckyypg91gfb2sdc684msw28nnb6r8cq3b362gafvv00a35mi"; + sha256 = "0z83rwpnbbs1n74mx8dgh1d1crp90mannj9vfy161dmy4wzc5kpv"; }; nativeBuildInputs = [ wrapQtAppsHook ]; diff --git a/pkgs/applications/science/electronics/ngspice/default.nix b/pkgs/applications/science/electronics/ngspice/default.nix index 5113dc778f62..f8fbdffc6340 100644 --- a/pkgs/applications/science/electronics/ngspice/default.nix +++ b/pkgs/applications/science/electronics/ngspice/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , bison , flex @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-x" "--with-x" "--with-readline" "--enable-xspice" "--enable-cider" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "The Next Generation Spice (Electronic Circuit Simulator)"; homepage = "http://ngspice.sourceforge.net"; license = with licenses; [ "BSD" gpl2 ]; diff --git a/pkgs/applications/science/electronics/openems/default.nix b/pkgs/applications/science/electronics/openems/default.nix index f7c8dd7467a3..e1063f8e26cf 100644 --- a/pkgs/applications/science/electronics/openems/default.nix +++ b/pkgs/applications/science/electronics/openems/default.nix @@ -63,8 +63,6 @@ stdenv.mkDerivation { -o $out/share/openEMS/matlab/h5readatt_octave.oct ''; - enableParallelBuilding = true; - meta = with lib; { description = "Open Source Electromagnetic Field Solver"; homepage = "http://openems.de/index.php/Main_Page.html"; diff --git a/pkgs/applications/science/electronics/pcb/default.nix b/pkgs/applications/science/electronics/pcb/default.nix index 4309f52e8b15..47de21739472 100644 --- a/pkgs/applications/science/electronics/pcb/default.nix +++ b/pkgs/applications/science/electronics/pcb/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , pkgconfig , gtk2 @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { "--disable-update-desktop-database" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Printed Circuit Board editor"; homepage = "http://pcb.geda-project.org/"; maintainers = with maintainers; [ mog ]; diff --git a/pkgs/applications/science/electronics/qfsm/default.nix b/pkgs/applications/science/electronics/qfsm/default.nix index 9b6e75c77ba8..a50609e84a8c 100644 --- a/pkgs/applications/science/electronics/qfsm/default.nix +++ b/pkgs/applications/science/electronics/qfsm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qt4, cmake, graphviz, pkgconfig }: +{ stdenv, fetchurl, qt4, cmake, graphviz, pkg-config }: stdenv.mkDerivation rec { name = "qfsm-0.54.0"; @@ -8,8 +8,8 @@ stdenv.mkDerivation rec { sha256 = "0rl7bc5cr29ng67yij4akciyid9z7npal812ys4c3m229vjvflrb"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ qt4 cmake graphviz ]; + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ qt4 graphviz ]; patches = [ ./drop-hardcoded-prefix.patch @@ -18,8 +18,6 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - enableParallelBuilding = true; - meta = { description = "Graphical editor for finite state machines"; homepage = "http://qfsm.sourceforge.net/"; diff --git a/pkgs/applications/science/electronics/qucs/default.nix b/pkgs/applications/science/electronics/qucs/default.nix index 62a9ae8b73be..9b143f1c3f1f 100644 --- a/pkgs/applications/science/electronics/qucs/default.nix +++ b/pkgs/applications/science/electronics/qucs/default.nix @@ -17,7 +17,8 @@ stdenv.mkDerivation rec { ./cmakelists.patch ]; - buildInputs = [ flex bison qt4 libX11 cmake gperf adms ]; + nativeBuildInputs = [ cmake flex bison ]; + buildInputs = [ qt4 libX11 gperf adms ]; meta = { description = "Integrated circuit simulator"; diff --git a/pkgs/applications/science/electronics/verilator/default.nix b/pkgs/applications/science/electronics/verilator/default.nix index ce8ebe42ea87..27423e753080 100644 --- a/pkgs/applications/science/electronics/verilator/default.nix +++ b/pkgs/applications/science/electronics/verilator/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , perl, flex, bison }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { doCheck = false; checkTarget = "test"; - meta = with stdenv.lib; { + meta = with lib; { description = "Fast and robust (System)Verilog simulator/compiler"; homepage = "https://www.veripool.org/wiki/verilator"; license = licenses.lgpl3; diff --git a/pkgs/applications/science/electronics/verilog/default.nix b/pkgs/applications/science/electronics/verilog/default.nix index 6217df2db8f8..081ca65f315e 100644 --- a/pkgs/applications/science/electronics/verilog/default.nix +++ b/pkgs/applications/science/electronics/verilog/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , autoconf , bison @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { popd ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Icarus Verilog compiler"; homepage = "http://iverilog.icarus.com/"; # https does not work license = with licenses; [ gpl2Plus lgpl21Plus ]; diff --git a/pkgs/applications/science/electronics/vhd2vl/default.nix b/pkgs/applications/science/electronics/vhd2vl/default.nix index be9e890fc8d5..4014f53f649f 100644 --- a/pkgs/applications/science/electronics/vhd2vl/default.nix +++ b/pkgs/applications/science/electronics/vhd2vl/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , fetchpatch , bison @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { cp src/vhd2vl $out/bin/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "VHDL to Verilog converter"; homepage = "https://github.com/ldoolitt/vhd2vl"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/science/electronics/xcircuit/default.nix b/pkgs/applications/science/electronics/xcircuit/default.nix index 52fe9b037414..d7bdf5c67c06 100644 --- a/pkgs/applications/science/electronics/xcircuit/default.nix +++ b/pkgs/applications/science/electronics/xcircuit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, automake, pkgconfig +{ lib, stdenv, fetchurl, autoreconfHook, automake, pkgconfig , cairo, ghostscript, ngspice, tcl, tk, xorg, zlib }: let @@ -25,7 +25,7 @@ in stdenv.mkDerivation { buildInputs = with xorg; [ cairo ghostscript libSM libXt libICE libX11 libXpm tcl tk zlib ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Generic drawing program tailored to circuit diagrams"; homepage = "http://opencircuitdesign.com/xcircuit"; license = licenses.gpl2; diff --git a/pkgs/applications/science/geometry/antiprism/default.nix b/pkgs/applications/science/geometry/antiprism/default.nix index 4691291a4257..8dee645646c5 100644 --- a/pkgs/applications/science/geometry/antiprism/default.nix +++ b/pkgs/applications/science/geometry/antiprism/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , autoreconfHook , libX11 @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ libX11 libGLU libGL.dev freeglut.dev ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.antiprism.com"; description = "A collection of programs for generating, manipulating, transforming and viewing polyhedra"; license = with licenses; [ mit ]; diff --git a/pkgs/applications/science/geometry/drgeo/default.nix b/pkgs/applications/science/geometry/drgeo/default.nix index 7bae3d414cbf..a147cb305ccc 100644 --- a/pkgs/applications/science/geometry/drgeo/default.nix +++ b/pkgs/applications/science/geometry/drgeo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libglade, gtk2, guile, libxml2, perl +{ lib, stdenv, fetchurl, libglade, gtk2, guile, libxml2, perl , intltool, libtool, pkgconfig }: stdenv.mkDerivation rec { @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { cp drgeo.desktop.in drgeo.desktop ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Interactive geometry program"; homepage = "https://sourceforge.net/projects/ofset"; license = licenses.gpl2; diff --git a/pkgs/applications/science/logic/abc/default.nix b/pkgs/applications/science/logic/abc/default.nix index 426c5a9df323..cbcd452033ca 100644 --- a/pkgs/applications/science/logic/abc/default.nix +++ b/pkgs/applications/science/logic/abc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , readline, cmake }: @@ -16,13 +16,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ readline ]; - enableParallelBuilding = true; installPhase = "mkdir -p $out/bin && mv abc $out/bin"; # needed by yosys passthru.rev = src.rev; - meta = with stdenv.lib; { + meta = with lib; { description = "A tool for squential logic synthesis and formal verification"; homepage = "https://people.eecs.berkeley.edu/~alanmi/abc"; license = licenses.mit; diff --git a/pkgs/applications/science/logic/acgtk/default.nix b/pkgs/applications/science/logic/acgtk/default.nix index ccd080005076..48563248773f 100644 --- a/pkgs/applications/science/logic/acgtk/default.nix +++ b/pkgs/applications/science/logic/acgtk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, dune, ocamlPackages }: +{ lib, stdenv, fetchurl, dune, ocamlPackages }: stdenv.mkDerivation { @@ -18,7 +18,7 @@ stdenv.mkDerivation { inherit (dune) installPhase; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://acg.loria.fr/"; description = "A toolkit for developing ACG signatures and lexicon"; license = licenses.cecill20; diff --git a/pkgs/applications/science/logic/aspino/default.nix b/pkgs/applications/science/logic/aspino/default.nix index c1cf9034c02a..f9cc97893da8 100644 --- a/pkgs/applications/science/logic/aspino/default.nix +++ b/pkgs/applications/science/logic/aspino/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub, zlib, boost }: +{ lib, stdenv, fetchurl, fetchFromGitHub, zlib, boost }: let glucose' = fetchurl { @@ -38,7 +38,7 @@ stdenv.mkDerivation { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "SAT/PseudoBoolean/MaxSat/ASP solver using glucose"; maintainers = with maintainers; [ gebner ]; platforms = platforms.unix; diff --git a/pkgs/applications/science/logic/avy/default.nix b/pkgs/applications/science/logic/avy/default.nix index 6b48c1e34488..6f8120c7b8e7 100644 --- a/pkgs/applications/science/logic/avy/default.nix +++ b/pkgs/applications/science/logic/avy/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - buildInputs = [ cmake zlib boost.out boost.dev ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ zlib boost.out boost.dev ]; NIX_CFLAGS_COMPILE = toString ([ "-Wno-narrowing" ] # Squelch endless stream of warnings on same few things ++ stdenv.lib.optionals stdenv.cc.isClang [ diff --git a/pkgs/applications/science/logic/boolector/default.nix b/pkgs/applications/science/logic/boolector/default.nix index 0364a76639aa..2898ce4e1f66 100644 --- a/pkgs/applications/science/logic/boolector/default.nix +++ b/pkgs/applications/science/logic/boolector/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { cp $out/include/boolector/btortypes.h $out/include/btortypes.h ''; - meta = with stdenv.lib; { + meta = with lib; { description = "An extremely fast SMT solver for bit-vectors and arrays"; homepage = "https://boolector.github.io"; license = licenses.mit; diff --git a/pkgs/applications/science/logic/btor2tools/default.nix b/pkgs/applications/science/logic/btor2tools/default.nix index 7d2aed7596e8..355274d1e1cd 100644 --- a/pkgs/applications/science/logic/btor2tools/default.nix +++ b/pkgs/applications/science/logic/btor2tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, cmake, fetchFromGitHub, fixDarwinDylibNames }: +{ lib, stdenv, cmake, fetchFromGitHub, fixDarwinDylibNames }: stdenv.mkDerivation rec { pname = "btor2tools"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "lib" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A generic parser and tool package for the BTOR2 format"; homepage = "https://github.com/Boolector/btor2tools"; license = licenses.mit; diff --git a/pkgs/applications/science/logic/cadical/default.nix b/pkgs/applications/science/logic/cadical/default.nix index e3707ff7dab1..ca5e6b5c4195 100644 --- a/pkgs/applications/science/logic/cadical/default.nix +++ b/pkgs/applications/science/logic/cadical/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "cadical"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { install -Dm0755 {LICEN?E,README*,VERSION} "$out/share/doc/${pname}-${version}/" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Simplified Satisfiability Solver"; maintainers = with maintainers; [ shnarazk ]; platforms = platforms.unix; diff --git a/pkgs/applications/science/logic/cedille/default.nix b/pkgs/applications/science/logic/cedille/default.nix index 7b181790f140..2b099e7664a6 100644 --- a/pkgs/applications/science/logic/cedille/default.nix +++ b/pkgs/applications/science/logic/cedille/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { cp -r lib/ $out/lib/cedille/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "An interactive theorem-prover and dependently typed programming language, based on extrinsic (aka Curry-style) type theory"; homepage = "https://cedille.github.io/"; license = licenses.mit; diff --git a/pkgs/applications/science/logic/celf/default.nix b/pkgs/applications/science/logic/celf/default.nix index 9dc20a61a4d2..044a6f3ca1c4 100644 --- a/pkgs/applications/science/logic/celf/default.nix +++ b/pkgs/applications/science/logic/celf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, smlnj }: +{ lib, stdenv, fetchFromGitHub, smlnj }: stdenv.mkDerivation rec { pname = "celf"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ./.mkexec ${smlnj}/bin/sml $out/bin celf ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Linear logic programming system"; homepage = "https://github.com/clf/celf"; license = licenses.gpl3; diff --git a/pkgs/applications/science/logic/clprover/clprover.nix b/pkgs/applications/science/logic/clprover/clprover.nix index e53bbe688371..f3049a659d11 100644 --- a/pkgs/applications/science/logic/clprover/clprover.nix +++ b/pkgs/applications/science/logic/clprover/clprover.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip }: +{ lib, stdenv, fetchzip }: stdenv.mkDerivation { pname = "clprover"; @@ -17,7 +17,7 @@ stdenv.mkDerivation { cp -r examples $out/share/clprover/examples ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Resolution-based theorem prover for Coalition Logic implemented in C++"; homepage = "http://cgi.csc.liv.ac.uk/~ullrich/CLProver++/"; license = licenses.gpl3; # Note that while the website states that it is GPLv2 but the file in the zip as well as the comments in the source state it is GPLv3 diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index 2ebe75d3bc50..fae17a5e09f2 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -5,57 +5,76 @@ # - The exact version can be specified through the `version` argument to # the derivation; it defaults to the latest stable version. -{ stdenv, fetchFromGitHub, writeText, pkgconfig, gnumake42 -, ocamlPackages, ncurses -, buildIde ? !(stdenv.isDarwin && stdenv.lib.versionAtLeast version "8.10") +{ lib, stdenv, fetchzip, writeText, pkgconfig, gnumake42 +, customOCamlPackages ? null +, ocamlPackages_4_05, ocamlPackages_4_09, ocamlPackages_4_10, ncurses +, buildIde ? !(stdenv.isDarwin && lib.versionAtLeast version "8.10") , glib, gnome3, wrapGAppsHook , csdp ? null -, version -}: - +, version, coq-version ? null, +}@args: +let lib = import ../../../../build-support/coq/extra-lib.nix {inherit (stdenv) lib;}; in +with builtins; with lib; let - sha256 = { - "8.5pl1" = "1976ki5xjg2r907xj9p7gs0kpdinywbwcqlgxqw75dgp0hkgi00n"; - "8.5pl2" = "109rrcrx7mz0fj7725kjjghfg5ydwb24hjsa5hspa27b4caah7rh"; - "8.5pl3" = "15c3rdk59nifzihsp97z4vjxis5xmsnrvpb86qiazj143z2fmdgw"; - "8.6" = "148mb48zpdax56c0blfi7v67lx014lnmrvxxasi28hsibyz2lvg4"; - "8.6.1" = "0llrxcxwy5j87vbbjnisw42rfw1n1pm5602ssx64xaxx3k176g6l"; - "8.7.0" = "1h18b7xpnx3ix9vsi5fx4zdcbxy7bhra7gd5c5yzxmk53cgf1p9m"; - "8.7.1" = "0gjn59jkbxwrihk8fx9d823wjyjh5m9gvj9l31nv6z6bcqhgdqi8"; - "8.7.2" = "0a0657xby8wdq4aqb2xsxp3n7pmc2w4yxjmrb2l4kccs1aqvaj4w"; - "8.8.0" = "13a4fka22hdxsjk11mgjb9ffzplfxyxp1sg5v1c8nk1grxlscgw8"; - "8.8.1" = "1hlf58gwazywbmfa48219amid38vqdl94yz21i11b4map6jfwhbk"; - "8.8.2" = "1lip3xja924dm6qblisk1bk0x8ai24s5xxqxphbdxj6djglj68fd"; - "8.9.0" = "1dkgdjc4n1m15m1p724hhi5cyxpqbjw6rxc5na6fl3v4qjjfnizh"; - "8.9.1" = "1xrq6mkhpq994bncmnijf8jwmwn961kkpl4mwwlv7j3dgnysrcv2"; - "8.10.0" = "138jw94wp4mg5dgjc2asn8ng09ayz1mxdznq342n0m469j803gzg"; - "8.10.1" = "072v2zkjzf7gj48137wpr3c9j0hg9pdhlr5l8jrgrwynld8fp7i4"; - "8.10.2" = "0znxmpy71bfw0p6x47i82jf5k7v41zbz9bdpn901ysn3ir8l3wrz"; - "8.11.0" = "1rfdic6mp7acx2zfwz7ziqk12g95bl9nyj68z4n20a5bcjv2pxpn"; - "8.11.1" = "0qriy9dy36dajsv5qmli8gd6v55mah02ya334nw49ky19v7518m0"; - "8.11.2" = "0f77ccyxdgbf1nrj5fa8qvrk1cyfy06fv8gj9kzfvlcgn0cf48sa"; - "8.12.0" = "18dc7k0piv6v064zgdadpw6mkkxk7j663hb3svgj5236fihjr0cz"; - "8.12.1" = "1rkcyjjrzcqw9xk93hsq0vvji4f8r5iq0f739mghk60bghkpnb7q"; - "8.12.2" = "18gscfm039pqhq4msq01nraig5dm9ab98bjca94zldf8jvdv0x2n"; - "8.13+beta1" = "1v4a6dpj41flspa4ihcr7m5ahqz10kbn62fmrldmv7gzq6jsyfyq"; - }.${version}; - coq-version = stdenv.lib.versions.majorMinor version; - versionAtLeast = stdenv.lib.versionAtLeast coq-version; - ideFlags = stdenv.lib.optionalString (buildIde && !versionAtLeast "8.10") + release = { + "8.5pl1".sha256 = "1976ki5xjg2r907xj9p7gs0kpdinywbwcqlgxqw75dgp0hkgi00n"; + "8.5pl2".sha256 = "109rrcrx7mz0fj7725kjjghfg5ydwb24hjsa5hspa27b4caah7rh"; + "8.5pl3".sha256 = "15c3rdk59nifzihsp97z4vjxis5xmsnrvpb86qiazj143z2fmdgw"; + "8.6.0".sha256 = "148mb48zpdax56c0blfi7v67lx014lnmrvxxasi28hsibyz2lvg4"; + "8.6.0".rev = "V8.6"; + "8.6.1".sha256 = "0llrxcxwy5j87vbbjnisw42rfw1n1pm5602ssx64xaxx3k176g6l"; + "8.7.0".sha256 = "1h18b7xpnx3ix9vsi5fx4zdcbxy7bhra7gd5c5yzxmk53cgf1p9m"; + "8.7.1".sha256 = "0gjn59jkbxwrihk8fx9d823wjyjh5m9gvj9l31nv6z6bcqhgdqi8"; + "8.7.2".sha256 = "0a0657xby8wdq4aqb2xsxp3n7pmc2w4yxjmrb2l4kccs1aqvaj4w"; + "8.8.0".sha256 = "13a4fka22hdxsjk11mgjb9ffzplfxyxp1sg5v1c8nk1grxlscgw8"; + "8.8.1".sha256 = "1hlf58gwazywbmfa48219amid38vqdl94yz21i11b4map6jfwhbk"; + "8.8.2".sha256 = "1lip3xja924dm6qblisk1bk0x8ai24s5xxqxphbdxj6djglj68fd"; + "8.9.0".sha256 = "1dkgdjc4n1m15m1p724hhi5cyxpqbjw6rxc5na6fl3v4qjjfnizh"; + "8.9.1".sha256 = "1xrq6mkhpq994bncmnijf8jwmwn961kkpl4mwwlv7j3dgnysrcv2"; + "8.10.0".sha256 = "138jw94wp4mg5dgjc2asn8ng09ayz1mxdznq342n0m469j803gzg"; + "8.10.1".sha256 = "072v2zkjzf7gj48137wpr3c9j0hg9pdhlr5l8jrgrwynld8fp7i4"; + "8.10.2".sha256 = "0znxmpy71bfw0p6x47i82jf5k7v41zbz9bdpn901ysn3ir8l3wrz"; + "8.11.0".sha256 = "1rfdic6mp7acx2zfwz7ziqk12g95bl9nyj68z4n20a5bcjv2pxpn"; + "8.11.1".sha256 = "0qriy9dy36dajsv5qmli8gd6v55mah02ya334nw49ky19v7518m0"; + "8.11.2".sha256 = "0f77ccyxdgbf1nrj5fa8qvrk1cyfy06fv8gj9kzfvlcgn0cf48sa"; + "8.12.0".sha256 = "18dc7k0piv6v064zgdadpw6mkkxk7j663hb3svgj5236fihjr0cz"; + "8.12.1".sha256 = "1rkcyjjrzcqw9xk93hsq0vvji4f8r5iq0f739mghk60bghkpnb7q"; + "8.12.2".sha256 = "18gscfm039pqhq4msq01nraig5dm9ab98bjca94zldf8jvdv0x2n"; + "8.13+beta1".sha256 = "1v4a6dpj41flspa4ihcr7m5ahqz10kbn62fmrldmv7gzq6jsyfyq"; + }; + releaseRev = v: "V${v}"; + fetched = import ../../../../build-support/coq/meta-fetch/default.nix + { inherit stdenv fetchzip; } + { inherit release releaseRev; location = { owner = "coq"; repo = "coq";}; } + args.version; + version = fetched.version; + coq-version = args.coq-version or (if version != "dev" then versions.majorMinor version else "dev"); + versionAtLeast = v: (coq-version == "dev") || (stdenv.lib.versionAtLeast coq-version v); + ideFlags = optionalString (buildIde && !versionAtLeast "8.10") "-lablgtkdir ${ocamlPackages.lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt"; csdpPatch = if csdp != null then '' substituteInPlace plugins/micromega/sos.ml --replace "; csdp" "; ${csdp}/bin/csdp" substituteInPlace plugins/micromega/coq_micromega.ml --replace "System.is_in_system_path \"csdp\"" "true" '' else ""; + ocamlPackages = if !isNull customOCamlPackages then customOCamlPackages + else with versions; switch coq-version [ + { case = range "8.11" "8.13"; out = ocamlPackages_4_10; } + { case = range "8.7" "8.10"; out = ocamlPackages_4_09; } + { case = range "8.5" "8.6"; out = ocamlPackages_4_05; } + ] ocamlPackages_4_10; + ocamlBuildInputs = [ ocamlPackages.ocaml ocamlPackages.findlib ] + ++ optional (!versionAtLeast "8.10") ocamlPackages.camlp5 + ++ optional (!versionAtLeast "8.13") ocamlPackages.num + ++ optional (versionAtLeast "8.13") ocamlPackages.zarith; self = stdenv.mkDerivation { pname = "coq"; - inherit version; + inherit (fetched) version src; passthru = { inherit coq-version; - inherit ocamlPackages; + inherit ocamlPackages ocamlBuildInputs; # For compatibility - inherit (ocamlPackages) ocaml camlp5 findlib num; + inherit (ocamlPackages) ocaml camlp5 findlib num ; emacsBufferSetup = pkgs: '' ; Propagate coq paths to children (inherit-local-permanent coq-prog-name "${self}/bin/coqtop") @@ -67,7 +86,7 @@ self = stdenv.mkDerivation { (coq-prog-args)) (mapc (lambda (arg) (when (file-directory-p (concat arg "/lib/coq/${coq-version}/user-contrib")) - (setenv "COQPATH" (concat (getenv "COQPATH") ":" arg "/lib/coq/${coq-version}/user-contrib")))) '(${stdenv.lib.concatStringsSep " " (map (pkg: "\"${pkg}\"") pkgs)})) + (setenv "COQPATH" (concat (getenv "COQPATH") ":" arg "/lib/coq/${coq-version}/user-contrib")))) '(${concatStringsSep " " (map (pkg: "\"${pkg}\"") pkgs)})) ; TODO Abstract this pattern from here and nixBufferBuilders.withPackages! (defvar nixpkgs--coq-buffer-count 0) (when (eq nixpkgs--coq-buffer-count 0) @@ -102,27 +121,12 @@ self = stdenv.mkDerivation { ''; }; - src = fetchFromGitHub { - owner = "coq"; - repo = "coq"; - rev = "V${version}"; - inherit sha256; - }; - - nativeBuildInputs = [ pkgconfig ] - ++ stdenv.lib.optional (!versionAtLeast "8.6") gnumake42 - ; - buildInputs = [ ncurses ocamlPackages.ocaml ocamlPackages.findlib ] - ++ stdenv.lib.optional (!versionAtLeast "8.10") ocamlPackages.camlp5 - ++ stdenv.lib.optional (!versionAtLeast "8.12") ocamlPackages.num - ++ stdenv.lib.optionals buildIde - (if versionAtLeast "8.10" - then [ ocamlPackages.lablgtk3-sourceview3 glib gnome3.defaultIconTheme wrapGAppsHook ] - else [ ocamlPackages.lablgtk ]); - - propagatedBuildInputs = - stdenv.lib.optional (versionAtLeast "8.13") ocamlPackages.zarith - ++ stdenv.lib.optional (coq-version == "8.12") ocamlPackages.num; + nativeBuildInputs = [ pkgconfig ] ++ optional (!versionAtLeast "8.6") gnumake42; + buildInputs = [ ncurses ] ++ ocamlBuildInputs + ++ optionals buildIde + (if versionAtLeast "8.10" + then [ ocamlPackages.lablgtk3-sourceview3 glib gnome3.defaultIconTheme wrapGAppsHook ] + else [ ocamlPackages.lablgtk ]); postPatch = '' UNAME=$(type -tp uname) @@ -162,7 +166,7 @@ self = stdenv.mkDerivation { ln -s $out/lib/coq $OCAMLFIND_DESTDIR/coq ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Coq proof assistant"; longDescription = '' Coq is a formal proof management system. It provides a formal language diff --git a/pkgs/applications/science/logic/coq2html/default.nix b/pkgs/applications/science/logic/coq2html/default.nix index e53e8e7392c0..46f2ebd775bf 100644 --- a/pkgs/applications/science/logic/coq2html/default.nix +++ b/pkgs/applications/science/logic/coq2html/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, ocaml }: +{ lib, stdenv, fetchgit, ocaml }: let version = "20170720"; @@ -21,7 +21,7 @@ stdenv.mkDerivation { cp coq2html $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "HTML documentation generator for Coq source files"; longDescription = '' coq2html is an HTML documentation generator for Coq source files. It is diff --git a/pkgs/applications/science/logic/cryptominisat/default.nix b/pkgs/applications/science/logic/cryptominisat/default.nix index ddbb140c9baa..042a4b23566c 100644 --- a/pkgs/applications/science/logic/cryptominisat/default.nix +++ b/pkgs/applications/science/logic/cryptominisat/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, python3, xxd, boost, fetchpatch }: +{ lib, stdenv, fetchFromGitHub, cmake, python3, xxd, boost, fetchpatch }: stdenv.mkDerivation rec { pname = "cryptominisat"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ python3 boost ]; nativeBuildInputs = [ cmake xxd ]; - meta = with stdenv.lib; { + meta = with lib; { description = "An advanced SAT Solver"; homepage = "https://github.com/msoos/cryptominisat"; license = licenses.mit; diff --git a/pkgs/applications/science/logic/cubicle/default.nix b/pkgs/applications/science/logic/cubicle/default.nix index bfb6a57fb33a..aa3fba635ffc 100644 --- a/pkgs/applications/science/logic/cubicle/default.nix +++ b/pkgs/applications/science/logic/cubicle/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocamlPackages }: +{ lib, stdenv, fetchurl, ocamlPackages }: stdenv.mkDerivation rec { pname = "cubicle"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = with ocamlPackages; [ ocaml findlib functory ]; - meta = with stdenv.lib; { + meta = with lib; { description = "An open source model checker for verifying safety properties of array-based systems"; homepage = "http://cubicle.lri.fr/"; license = licenses.asl20; diff --git a/pkgs/applications/science/logic/cvc3/default.nix b/pkgs/applications/science/logic/cvc3/default.nix index be80565115fe..63efe0a2d05b 100644 --- a/pkgs/applications/science/logic/cvc3/default.nix +++ b/pkgs/applications/science/logic/cvc3/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, flex, bison, gmp, perl }: +{ lib, stdenv, fetchurl, flex, bison, gmp, perl }: stdenv.mkDerivation rec { pname = "cvc3"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A prover for satisfiability modulo theory (SMT)"; maintainers = with maintainers; [ raskin ]; diff --git a/pkgs/applications/science/logic/cvc4/default.nix b/pkgs/applications/science/logic/cvc4/default.nix index 54a2f0225518..fd31a5732e38 100644 --- a/pkgs/applications/science/logic/cvc4/default.nix +++ b/pkgs/applications/science/logic/cvc4/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, cln, gmp, git, swig, pkgconfig +{ lib, stdenv, fetchFromGitHub, cmake, cln, gmp, git, swig, pkgconfig , readline, libantlr3c, boost, jdk, python3, antlr3_4 }: @@ -35,10 +35,7 @@ stdenv.mkDerivation rec { "-DCMAKE_BUILD_TYPE=Production" ]; - - enableParallelBuilding = true; - - meta = with stdenv.lib; { + meta = with lib; { description = "A high-performance theorem prover and SMT solver"; homepage = "http://cvc4.cs.stanford.edu/web/"; license = licenses.gpl3; diff --git a/pkgs/applications/science/logic/drat-trim/default.nix b/pkgs/applications/science/logic/drat-trim/default.nix index 81e20df33424..c58a29dc2894 100644 --- a/pkgs/applications/science/logic/drat-trim/default.nix +++ b/pkgs/applications/science/logic/drat-trim/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation { pname = "drat-trim-unstable"; @@ -19,7 +19,7 @@ stdenv.mkDerivation { install -Dt $out/bin drat-trim lrat-check ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A proof checker for unSAT proofs"; longDescription = '' DRAT-trim is a satisfiability proof checking and trimming diff --git a/pkgs/applications/science/logic/eprover/default.nix b/pkgs/applications/science/logic/eprover/default.nix index a3844dc3700b..14c46f88b27c 100644 --- a/pkgs/applications/science/logic/eprover/default.nix +++ b/pkgs/applications/science/logic/eprover/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, which }: +{ lib, stdenv, fetchurl, which }: stdenv.mkDerivation rec { pname = "eprover"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { "--man-prefix=$(out)/share/man" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Automated theorem prover for full first-order logic with equality"; homepage = "http://www.eprover.org/"; license = licenses.gpl2; diff --git a/pkgs/applications/science/logic/fast-downward/default.nix b/pkgs/applications/science/logic/fast-downward/default.nix index a46542095373..bc825703ee3a 100644 --- a/pkgs/applications/science/logic/fast-downward/default.nix +++ b/pkgs/applications/science/logic/fast-downward/default.nix @@ -16,8 +16,6 @@ stdenv.mkDerivation { cmakeFlags = lib.optional osi.withCplex [ "-DDOWNWARD_CPLEX_ROOT=${cplex}/cplex" ]; - enableParallelBuilding = true; - configurePhase = '' python build.py release ''; @@ -52,7 +50,7 @@ stdenv.mkDerivation { --replace 'args.build = "release"' "args.build = \"$out/libexec/fast-downward\"" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A domain-independent planning system"; homepage = "http://www.fast-downward.org/"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/science/logic/glucose/default.nix b/pkgs/applications/science/logic/glucose/default.nix index 0a8fad484da7..5ba8208d6e18 100644 --- a/pkgs/applications/science/logic/glucose/default.nix +++ b/pkgs/applications/science/logic/glucose/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, zlib }: +{ lib, stdenv, fetchurl, zlib }: stdenv.mkDerivation rec { pname = "glucose"; version = "4.1"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { install -Dm0755 ../{LICEN?E,README*,Changelog*} "$out/share/doc/${pname}-${version}/" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Modern, parallel SAT solver (sequential version)"; license = licenses.mit; platforms = platforms.unix; diff --git a/pkgs/applications/science/logic/glucose/syrup.nix b/pkgs/applications/science/logic/glucose/syrup.nix index 816f8504a52e..17342858fb8f 100644 --- a/pkgs/applications/science/logic/glucose/syrup.nix +++ b/pkgs/applications/science/logic/glucose/syrup.nix @@ -1,4 +1,4 @@ -{ stdenv, zlib, glucose }: +{ lib, stdenv, zlib, glucose }: stdenv.mkDerivation rec { pname = "glucose-syrup"; version = glucose.version; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { install -Dm0755 ../{LICEN?E,README*,Changelog*} "$out/share/doc/${pname}-${version}/" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Modern, parallel SAT solver (parallel version)"; license = licenses.unfreeRedistributable; platforms = platforms.unix; diff --git a/pkgs/applications/science/logic/hol/default.nix b/pkgs/applications/science/logic/hol/default.nix index dbafee7d6000..6fc7286154ae 100644 --- a/pkgs/applications/science/logic/hol/default.nix +++ b/pkgs/applications/science/logic/hol/default.nix @@ -1,4 +1,4 @@ -{stdenv, pkgs, fetchurl, graphviz, fontconfig, liberation_ttf, +{lib, stdenv, pkgs, fetchurl, graphviz, fontconfig, liberation_ttf, experimentalKernel ? true}: let @@ -65,7 +65,7 @@ stdenv.mkDerivation { # ln -s $out/src/hol4.${version}/bin $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Interactive theorem prover based on Higher-Order Logic"; longDescription = '' HOL4 is the latest version of the HOL interactive proof diff --git a/pkgs/applications/science/logic/hol_light/default.nix b/pkgs/applications/science/logic/hol_light/default.nix index 9c3030517e32..24faa98f777b 100644 --- a/pkgs/applications/science/logic/hol_light/default.nix +++ b/pkgs/applications/science/logic/hol_light/default.nix @@ -1,4 +1,4 @@ -{ stdenv, runtimeShell, fetchFromGitHub, fetchpatch, ocaml, num, camlp5 }: +{ lib, stdenv, runtimeShell, fetchFromGitHub, fetchpatch, ocaml, num, camlp5 }: let load_num = @@ -45,7 +45,7 @@ stdenv.mkDerivation { chmod a+x "$out/bin/hol_light" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Interactive theorem prover based on Higher-Order Logic"; homepage = "http://www.cl.cam.ac.uk/~jrh13/hol-light/"; license = licenses.bsd2; diff --git a/pkgs/applications/science/logic/iprover/default.nix b/pkgs/applications/science/logic/iprover/default.nix index 310a95d7e7a6..1f02d30cf253 100644 --- a/pkgs/applications/science/logic/iprover/default.nix +++ b/pkgs/applications/science/logic/iprover/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, eprover, zlib }: +{ lib, stdenv, fetchurl, ocaml, eprover, zlib }: stdenv.mkDerivation rec { pname = "iprover"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { chmod a+x "$out"/bin/iprover ''; - meta = with stdenv.lib; { + meta = with lib; { description = "An automated first-order logic theorem prover"; homepage = "http://www.cs.man.ac.uk/~korovink/iprover/"; maintainers = with maintainers; [ raskin gebner ]; diff --git a/pkgs/applications/science/logic/isabelle/default.nix b/pkgs/applications/science/logic/isabelle/default.nix index a12d75eabbe9..9472d4b9b29b 100644 --- a/pkgs/applications/science/logic/isabelle/default.nix +++ b/pkgs/applications/science/logic/isabelle/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, nettools, java, polyml, z3, rlwrap }: +{ lib, stdenv, fetchurl, perl, nettools, java, polyml, z3, rlwrap }: # nettools needed for hostname stdenv.mkDerivation rec { @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { bin/isabelle install $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A generic proof assistant"; longDescription = '' diff --git a/pkgs/applications/science/logic/key/default.nix b/pkgs/applications/science/logic/key/default.nix index b08c4d84d1fc..531081beafaf 100644 --- a/pkgs/applications/science/logic/key/default.nix +++ b/pkgs/applications/science/logic/key/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , unzip , jdk @@ -56,7 +56,7 @@ in stdenv.mkDerivation rec { touch $out ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Java formal verification tool"; homepage = "https://www.key-project.org"; # also https://formal.iti.kit.edu/key/ longDescription = '' diff --git a/pkgs/applications/science/logic/lean/default.nix b/pkgs/applications/science/logic/lean/default.nix index 88e1b4fbc0e1..5bf33a8a3591 100644 --- a/pkgs/applications/science/logic/lean/default.nix +++ b/pkgs/applications/science/logic/lean/default.nix @@ -1,19 +1,18 @@ -{ stdenv, fetchFromGitHub, cmake, gmp, coreutils }: +{ lib, stdenv, fetchFromGitHub, cmake, gmp, coreutils }: stdenv.mkDerivation rec { pname = "lean"; - version = "3.23.0"; + version = "3.24.0"; src = fetchFromGitHub { owner = "leanprover-community"; repo = "lean"; rev = "v${version}"; - sha256 = "09mklc1p6ms1jayg2f89hqfmhca3h5744lli936l38ypn1d00sxx"; + sha256 = "npzBuZ37KrUYwC0TglryVTqui/3/t1ma1Zjpnty0d7c="; }; nativeBuildInputs = [ cmake ]; buildInputs = [ gmp ]; - enableParallelBuilding = true; cmakeDir = "../src"; @@ -28,7 +27,7 @@ stdenv.mkDerivation rec { --replace "greadlink" "${coreutils}/bin/readlink" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Automatic and interactive theorem prover"; homepage = "https://leanprover.github.io/"; changelog = "https://github.com/leanprover-community/lean/blob/v${version}/doc/changes.md"; diff --git a/pkgs/applications/science/logic/lean2/default.nix b/pkgs/applications/science/logic/lean2/default.nix index 612c9d6f92a2..b3c6a51d440a 100644 --- a/pkgs/applications/science/logic/lean2/default.nix +++ b/pkgs/applications/science/logic/lean2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, gmp, mpfr, python +{ lib, stdenv, fetchFromGitHub, cmake, gmp, mpfr, python , gperftools, ninja, makeWrapper }: stdenv.mkDerivation { @@ -12,8 +12,8 @@ stdenv.mkDerivation { sha256 = "1xv3j487zhh1zf2b4v19xzw63s2sgjhg8d62a0kxxyknfmdf3khl"; }; - buildInputs = [ gmp mpfr cmake python gperftools ninja makeWrapper ]; - enableParallelBuilding = true; + nativeBuildInputs = [ cmake makeWrapper ninja ]; + buildInputs = [ gmp mpfr python gperftools ]; preConfigure = '' patchShebangs bin/leantags @@ -26,7 +26,7 @@ stdenv.mkDerivation { wrapProgram $out/bin/linja --prefix PATH : $out/bin:${ninja}/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Automatic and interactive theorem prover (version with HoTT support)"; homepage = "http://leanprover.github.io"; license = licenses.asl20; diff --git a/pkgs/applications/science/logic/leo2/default.nix b/pkgs/applications/science/logic/leo2/default.nix index b43bfb801358..520c47d7500b 100644 --- a/pkgs/applications/science/logic/leo2/default.nix +++ b/pkgs/applications/science/logic/leo2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, eprover, ocaml, perl, zlib }: +{ lib, stdenv, fetchurl, makeWrapper, eprover, ocaml, perl, zlib }: stdenv.mkDerivation rec { pname = "leo2"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { --add-flags "--atprc $out/etc/leoatprc" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A high-performance typed higher order prover"; maintainers = [ maintainers.raskin ]; platforms = platforms.linux; diff --git a/pkgs/applications/science/logic/lingeling/default.nix b/pkgs/applications/science/logic/lingeling/default.nix index 1805f6cdcc89..08bd0e4d6375 100644 --- a/pkgs/applications/science/logic/lingeling/default.nix +++ b/pkgs/applications/science/logic/lingeling/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , aiger }: @@ -39,7 +39,7 @@ stdenv.mkDerivation { outputs = [ "out" "dev" "lib" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Fast SAT solver"; homepage = "http://fmv.jku.at/lingeling/"; license = licenses.mit; diff --git a/pkgs/applications/science/logic/mcrl2/default.nix b/pkgs/applications/science/logic/mcrl2/default.nix index eb83eaf79c55..56898f163b99 100644 --- a/pkgs/applications/science/logic/mcrl2/default.nix +++ b/pkgs/applications/science/logic/mcrl2/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, cmake, libGLU, libGL, qt5, boost}: +{lib, stdenv, fetchurl, cmake, libGLU, libGL, qt5, boost}: stdenv.mkDerivation rec { version = "201707"; @@ -10,11 +10,10 @@ stdenv.mkDerivation rec { sha256 = "1c8h94ja7271ph61zrcgnjgblxppld6v22f7f900prjgzbcfy14m"; }; - buildInputs = [ cmake libGLU libGL qt5.qtbase boost ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ libGLU libGL qt5.qtbase boost ]; - enableParallelBuilding = true; - - meta = with stdenv.lib; { + meta = with lib; { description = "A toolset for model-checking concurrent systems and protocols"; longDescription = '' A formal specification language with an associated toolset, diff --git a/pkgs/applications/science/logic/metis-prover/default.nix b/pkgs/applications/science/logic/metis-prover/default.nix index 5755abfd9078..e30a897e5659 100644 --- a/pkgs/applications/science/logic/metis-prover/default.nix +++ b/pkgs/applications/science/logic/metis-prover/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, perl, mlton }: +{ lib, stdenv, fetchFromGitHub, perl, mlton }: stdenv.mkDerivation { pname = "metis-prover"; @@ -22,7 +22,7 @@ stdenv.mkDerivation { install -Dm0755 bin/mlton/metis $out/bin/metis ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Automatic theorem prover for first-order logic with equality"; homepage = "http://www.gilith.com/research/metis/"; license = licenses.mit; diff --git a/pkgs/applications/science/logic/minisat/default.nix b/pkgs/applications/science/logic/minisat/default.nix index df1800e6c31b..10d380882744 100644 --- a/pkgs/applications/science/logic/minisat/default.nix +++ b/pkgs/applications/science/logic/minisat/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, zlib }: +{ lib, stdenv, fetchFromGitHub, cmake, zlib }: stdenv.mkDerivation rec { pname = "minisat"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ zlib ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Compact and readable SAT solver"; maintainers = with maintainers; [ gebner raskin ]; platforms = platforms.unix; diff --git a/pkgs/applications/science/logic/monosat/default.nix b/pkgs/applications/science/logic/monosat/default.nix index 63440213920c..19fba6e29936 100644 --- a/pkgs/applications/science/logic/monosat/default.nix +++ b/pkgs/applications/science/logic/monosat/default.nix @@ -31,7 +31,8 @@ let core = stdenv.mkDerivation { name = "${pname}-${version}"; inherit src patches; - buildInputs = [ cmake zlib gmp jdk8 ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ zlib gmp jdk8 ]; cmakeFlags = [ "-DBUILD_STATIC=OFF" diff --git a/pkgs/applications/science/logic/open-wbo/default.nix b/pkgs/applications/science/logic/open-wbo/default.nix index c314127e74bf..77db8ae3384d 100644 --- a/pkgs/applications/science/logic/open-wbo/default.nix +++ b/pkgs/applications/science/logic/open-wbo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, zlib, gmp }: +{ lib, stdenv, fetchFromGitHub, zlib, gmp }: stdenv.mkDerivation { name = "open-wbo-2.0"; @@ -17,7 +17,7 @@ stdenv.mkDerivation { install -Dm0755 open-wbo_release $out/bin/open-wbo ''; - meta = with stdenv.lib; { + meta = with lib; { description = "State-of-the-art MaxSAT and Pseudo-Boolean solver"; maintainers = with maintainers; [ gebner ]; platforms = platforms.unix; diff --git a/pkgs/applications/science/logic/opensmt/default.nix b/pkgs/applications/science/logic/opensmt/default.nix index 1681d4545904..902dfc5765df 100644 --- a/pkgs/applications/science/logic/opensmt/default.nix +++ b/pkgs/applications/science/logic/opensmt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub +{ lib, stdenv, lib, fetchFromGitHub , cmake, libedit, gmpxx, bison, flex , enableReadline ? false, readline , gtest diff --git a/pkgs/applications/science/logic/ott/default.nix b/pkgs/applications/science/logic/ott/default.nix index 48ad63eaa993..15a9fa5ccab2 100644 --- a/pkgs/applications/science/logic/ott/default.nix +++ b/pkgs/applications/science/logic/ott/default.nix @@ -16,7 +16,13 @@ stdenv.mkDerivation rec { installTargets = "ott.install"; - postInstall = "opaline -prefix $out"; + postInstall = '' + opaline -prefix $out + '' + # There is `emacsPackages.ott-mode` for this now. + + '' + rm -r $out/share/emacs + ''; meta = { description = "A tool for the working semanticist"; diff --git a/pkgs/applications/science/logic/poly/default.nix b/pkgs/applications/science/logic/poly/default.nix index ee50a2d85040..db124c379cad 100644 --- a/pkgs/applications/science/logic/poly/default.nix +++ b/pkgs/applications/science/logic/poly/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, gmp, cmake, python}: +{lib, stdenv, fetchFromGitHub, gmp, cmake, python}: stdenv.mkDerivation rec { pname = "libpoly"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ gmp python ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/SRI-CSL/libpoly"; description = "C library for manipulating polynomials"; license = licenses.lgpl3; diff --git a/pkgs/applications/science/logic/prooftree/default.nix b/pkgs/applications/science/logic/prooftree/default.nix index 98313e48cb27..4db3c333e97e 100644 --- a/pkgs/applications/science/logic/prooftree/default.nix +++ b/pkgs/applications/science/logic/prooftree/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, ncurses, ocamlPackages }: +{ lib, stdenv, fetchurl, pkgconfig, ncurses, ocamlPackages }: stdenv.mkDerivation rec { pname = "prooftree"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { dontAddPrefix = true; configureFlags = [ "--prefix" "$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A program for proof-tree visualization"; longDescription = '' Prooftree is a program for proof-tree visualization during interactive diff --git a/pkgs/applications/science/logic/spass/default.nix b/pkgs/applications/science/logic/spass/default.nix index ece6f0b9f6a8..77b297b4fbbb 100644 --- a/pkgs/applications/science/logic/spass/default.nix +++ b/pkgs/applications/science/logic/spass/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bison, flex }: +{ lib, stdenv, fetchurl, bison, flex }: let baseVersion="3"; @@ -29,7 +29,7 @@ stdenv.mkDerivation { install -m0755 SPASS ${extraTools} $out/bin/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Automated theorem prover for first-order logic"; maintainers = with maintainers; [ diff --git a/pkgs/applications/science/logic/stp/default.nix b/pkgs/applications/science/logic/stp/default.nix index dd00eda1b571..42926a870816 100644 --- a/pkgs/applications/science/logic/stp/default.nix +++ b/pkgs/applications/science/logic/stp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, cmake, boost, bison, flex, fetchFromGitHub, perl +{ lib, stdenv, cmake, boost, bison, flex, fetchFromGitHub, perl , python3, python3Packages, zlib, minisat, cryptominisat }: stdenv.mkDerivation rec { @@ -24,10 +24,7 @@ stdenv.mkDerivation rec { ) ''; - # seems to build fine now, may revert if concurrency does become an issue - enableParallelBuilding = true; - - meta = with stdenv.lib; { + meta = with lib; { description = "Simple Theorem Prover"; maintainers = with maintainers; [ ]; platforms = platforms.linux; diff --git a/pkgs/applications/science/logic/tptp/default.nix b/pkgs/applications/science/logic/tptp/default.nix index 4c63f8e72a36..9c91eaddfc47 100644 --- a/pkgs/applications/science/logic/tptp/default.nix +++ b/pkgs/applications/science/logic/tptp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, yap, tcsh, perl, patchelf }: +{ lib, stdenv, fetchurl, yap, tcsh, perl, patchelf }: stdenv.mkDerivation rec { pname = "TPTP"; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { ln -s $sharedir/Scripts/tptp4X $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Thousands of problems for theorem provers and tools"; maintainers = with maintainers; [ raskin gebner ]; # 6.3 GiB of data. Installation is unpacking and editing a few files. diff --git a/pkgs/applications/science/logic/vampire/default.nix b/pkgs/applications/science/logic/vampire/default.nix index dca03823e9ea..b88544544462 100644 --- a/pkgs/applications/science/logic/vampire/default.nix +++ b/pkgs/applications/science/logic/vampire/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, z3, zlib }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, z3, zlib }: stdenv.mkDerivation rec { pname = "vampire"; @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { install -m0755 -D vampire_z3_rel* $out/bin/vampire ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://vprover.github.io/"; description = "The Vampire Theorem Prover"; platforms = platforms.unix; diff --git a/pkgs/applications/science/logic/verit/default.nix b/pkgs/applications/science/logic/verit/default.nix index f20a83241571..81acbe4f2d0b 100644 --- a/pkgs/applications/science/logic/verit/default.nix +++ b/pkgs/applications/science/logic/verit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, gmp, flex, bison }: +{ lib, stdenv, fetchurl, autoreconfHook, gmp, flex, bison }: stdenv.mkDerivation { pname = "veriT"; @@ -21,7 +21,7 @@ stdenv.mkDerivation { mkdir -p $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "An open, trustable and efficient SMT-solver"; homepage = "http://www.verit-solver.org/"; license = licenses.bsd3; diff --git a/pkgs/applications/science/logic/why3/default.nix b/pkgs/applications/science/logic/why3/default.nix index eacff32bdf62..deb40c742847 100644 --- a/pkgs/applications/science/logic/why3/default.nix +++ b/pkgs/applications/science/logic/why3/default.nix @@ -1,4 +1,4 @@ -{ callPackage, fetchurl, fetchpatch, stdenv +{ callPackage, fetchurl, fetchpatch, lib, stdenv , ocamlPackages, coqPackages, rubber, hevea, emacs }: stdenv.mkDerivation { @@ -39,7 +39,7 @@ stdenv.mkDerivation { passthru.withProvers = callPackage ./with-provers.nix {}; - meta = with stdenv.lib; { + meta = with lib; { description = "A platform for deductive program verification"; homepage = "http://why3.lri.fr/"; license = licenses.lgpl21; diff --git a/pkgs/applications/science/logic/yices/default.nix b/pkgs/applications/science/logic/yices/default.nix index b8dd528a11c1..a01a07b89540 100644 --- a/pkgs/applications/science/logic/yices/default.nix +++ b/pkgs/applications/science/logic/yices/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gmp-static, gperf, autoreconfHook, libpoly }: +{ lib, stdenv, fetchFromGitHub, gmp-static, gperf, autoreconfHook, libpoly }: stdenv.mkDerivation rec { pname = "yices"; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { ln -sfr $out/lib/libyices.so.{${version},${ver_XdotY}} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A high-performance theorem prover and SMT solver"; homepage = "http://yices.csl.sri.com"; license = licenses.gpl3; diff --git a/pkgs/applications/science/machine-learning/fasttext/default.nix b/pkgs/applications/science/machine-learning/fasttext/default.nix index 64124594e1e2..d05f93a4653a 100644 --- a/pkgs/applications/science/machine-learning/fasttext/default.nix +++ b/pkgs/applications/science/machine-learning/fasttext/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, cmake}: +{lib, stdenv, fetchFromGitHub, cmake}: stdenv.mkDerivation rec { pname = "fasttext"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Library for text classification and representation learning"; homepage = "https://fasttext.cc/"; license = licenses.mit; diff --git a/pkgs/applications/science/machine-learning/finalfrontier/default.nix b/pkgs/applications/science/machine-learning/finalfrontier/default.nix index f1a2dbaa54fb..f2468572101e 100644 --- a/pkgs/applications/science/machine-learning/finalfrontier/default.nix +++ b/pkgs/applications/science/machine-learning/finalfrontier/default.nix @@ -42,7 +42,7 @@ rustPlatform.buildRustPackage rec { installShellCompletion finalfrontier.{bash,fish,zsh} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Utility for training word and subword embeddings"; homepage = "https://github.com/finalfusion/finalfrontier/"; license = licenses.asl20; diff --git a/pkgs/applications/science/machine-learning/finalfusion-utils/default.nix b/pkgs/applications/science/machine-learning/finalfusion-utils/default.nix index eeeafdd3d98c..d976431e5549 100644 --- a/pkgs/applications/science/machine-learning/finalfusion-utils/default.nix +++ b/pkgs/applications/science/machine-learning/finalfusion-utils/default.nix @@ -46,7 +46,7 @@ rustPlatform.buildRustPackage rec { installShellCompletion finalfusion.{bash,fish,zsh} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Utility for converting, quantizing, and querying word embeddings"; homepage = "https://github.com/finalfusion/finalfusion-utils/"; license = licenses.asl20; diff --git a/pkgs/applications/science/machine-learning/labelimg/default.nix b/pkgs/applications/science/machine-learning/labelimg/default.nix index 18c304e83165..4bfd4b9421f6 100644 --- a/pkgs/applications/science/machine-learning/labelimg/default.nix +++ b/pkgs/applications/science/machine-learning/labelimg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python3Packages, fetchFromGitHub, qt5 }: +{ lib, stdenv, python3Packages, fetchFromGitHub, qt5 }: python3Packages.buildPythonApplication rec { pname = "labelImg"; version = "1.8.3"; @@ -27,7 +27,7 @@ preFixup = '' makeWrapperArgs+=("''${qtWrapperArgs[@]}") ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A graphical image annotation tool and label object bounding boxes in images"; homepage = "https://github.com/tzutalin/labelImg"; license = licenses.mit; diff --git a/pkgs/applications/science/machine-learning/shogun/default.nix b/pkgs/applications/science/machine-learning/shogun/default.nix index a2c26de7a2dc..7d052c6c5e9e 100644 --- a/pkgs/applications/science/machine-learning/shogun/default.nix +++ b/pkgs/applications/science/machine-learning/shogun/default.nix @@ -65,8 +65,9 @@ stdenv.mkDerivation rec { CCACHE_DISABLE="1"; CCACHE_DIR=".ccache"; + nativeBuildInputs = [ cmake ]; buildInputs = with lib; [ - blas lapack bzip2 cmake colpack curl ctags eigen hdf5 json_c lp_solve lzma lzo + blas lapack bzip2 colpack curl ctags eigen hdf5 json_c lp_solve lzma lzo protobuf nlopt snappy swig (libarchive.dev) libxml2 lapack glpk ] ++ optionals (pythonSupport) (with pythonPackages; [ python ply numpy ]) @@ -87,9 +88,7 @@ stdenv.mkDerivation rec { (flag "OpenCV" opencvSupport) ]; - enableParallelBuilding = true; - - meta = with stdenv.lib; { + meta = with lib; { description = "A toolbox which offers a wide range of efficient and unified machine learning methods"; homepage = "http://shogun-toolbox.org/"; license = licenses.gpl3; diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix index e4fbe8a7f2de..2191511a9c57 100644 --- a/pkgs/applications/science/math/R/default.nix +++ b/pkgs/applications/science/math/R/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bzip2, gfortran, libX11, libXmu, libXt, libjpeg, libpng +{ lib, stdenv, fetchurl, bzip2, gfortran, libX11, libXmu, libXt, libjpeg, libpng , libtiff, ncurses, pango, pcre2, perl, readline, tcl, texLive, tk, xz, zlib , less, texinfo, graphviz, icu, pkgconfig, bison, imake, which, jdk, blas, lapack , curl, Cocoa, Foundation, libobjc, libcxx, tzdata, fetchpatch @@ -86,7 +86,7 @@ stdenv.mkDerivation rec { setupHook = ./setup-hook.sh; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.r-project.org/"; description = "Free software environment for statistical computing and graphics"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/science/math/almonds/default.nix b/pkgs/applications/science/math/almonds/default.nix index 9edb0747b31e..7271b6d8755c 100644 --- a/pkgs/applications/science/math/almonds/default.nix +++ b/pkgs/applications/science/math/almonds/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python3, fetchFromGitHub, ncurses }: +{ lib, stdenv, python3, fetchFromGitHub, ncurses }: with python3.pkgs; buildPythonApplication rec { pname = "almonds"; @@ -17,7 +17,7 @@ with python3.pkgs; buildPythonApplication rec { checkPhase = "py.test"; - meta = with stdenv.lib; { + meta = with lib; { description = "Terminal Mandelbrot fractal viewer"; homepage = "https://github.com/Tenchi2xh/Almonds"; license = licenses.mit; diff --git a/pkgs/applications/science/math/bliss/default.nix b/pkgs/applications/science/math/bliss/default.nix index 9ab90134aad4..fe68d9d245c5 100644 --- a/pkgs/applications/science/math/bliss/default.nix +++ b/pkgs/applications/science/math/bliss/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, doxygen }: +{ lib, stdenv, fetchurl, unzip, doxygen }: stdenv.mkDerivation rec { pname = "bliss"; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { mv *.h *.hh $out/include/bliss ''; - meta = with stdenv.lib; { + meta = with lib; { description = "An open source tool for computing automorphism groups and canonical forms of graphs. It has both a command line user interface as well as C++ and C programming language APIs"; homepage = "http://www.tcs.hut.fi/Software/bliss/"; license = licenses.lgpl3; diff --git a/pkgs/applications/science/math/caffe/default.nix b/pkgs/applications/science/math/caffe/default.nix index 4a6a2dc6c7e0..565c6a17672d 100644 --- a/pkgs/applications/science/math/caffe/default.nix +++ b/pkgs/applications/science/math/caffe/default.nix @@ -46,8 +46,6 @@ stdenv.mkDerivation rec { sha256 = "104jp3cm823i3cdph7hgsnj6l77ygbwsy35mdmzhmsi4jxprd9j3"; }; - enableParallelBuilding = true; - nativeBuildInputs = [ cmake doxygen ]; cmakeFlags = @@ -127,7 +125,7 @@ stdenv.mkDerivation rec { -weights "${test_model_weights}" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Deep learning framework"; longDescription = '' Caffe is a deep learning framework made with expression, speed, and diff --git a/pkgs/applications/science/math/calculix/default.nix b/pkgs/applications/science/math/calculix/default.nix index e37e9d0910c3..e9766b32c2a4 100644 --- a/pkgs/applications/science/math/calculix/default.nix +++ b/pkgs/applications/science/math/calculix/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gfortran, arpack, spooles, blas, lapack }: +{ lib, stdenv, fetchurl, gfortran, arpack, spooles, blas, lapack }: stdenv.mkDerivation rec { pname = "calculix"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { install -Dm0755 ccx_${version} $out/bin/ccx ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.calculix.de/"; description = "Three-dimensional structural finite element program"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/science/math/cemu/default.nix b/pkgs/applications/science/math/cemu/default.nix index b41135229dd7..65dd05d3d62d 100644 --- a/pkgs/applications/science/math/cemu/default.nix +++ b/pkgs/applications/science/math/cemu/default.nix @@ -1,5 +1,5 @@ { fetchFromGitHub -, stdenv +, lib, stdenv , mkDerivation , SDL2 , libGL @@ -42,7 +42,7 @@ mkDerivation rec { "gui/qt" ]; - meta = with stdenv.lib; { + meta = with lib; { changelog = "https://github.com/CE-Programming/CEmu/releases/tag/v${version}"; description = "Third-party TI-84 Plus CE / TI-83 Premium CE emulator, focused on developer features"; homepage = "https://ce-programming.github.io/CEmu"; diff --git a/pkgs/applications/science/math/clp/default.nix b/pkgs/applications/science/math/clp/default.nix index 97ef3dd7543f..26c277c2685f 100644 --- a/pkgs/applications/science/math/clp/default.nix +++ b/pkgs/applications/science/math/clp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, zlib }: +{ lib, stdenv, fetchurl, zlib }: stdenv.mkDerivation rec { version = "1.17.6"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { license = licenses.epl10; homepage = "https://github.com/coin-or/Clp"; description = "An open-source linear programming solver written in C++"; diff --git a/pkgs/applications/science/math/cntk/default.nix b/pkgs/applications/science/math/cntk/default.nix index 401454a6b69b..a348210179e2 100644 --- a/pkgs/applications/science/math/cntk/default.nix +++ b/pkgs/applications/science/math/cntk/default.nix @@ -90,8 +90,6 @@ in stdenv.mkDerivation rec { done ''; - enableParallelBuilding = true; - meta = with lib; { # Newer cub is included with cudatoolkit now and it breaks the build. # https://github.com/Microsoft/CNTK/issues/3191 diff --git a/pkgs/applications/science/math/colpack/default.nix b/pkgs/applications/science/math/colpack/default.nix index 13a75ce4db2d..f203852c9657 100644 --- a/pkgs/applications/science/math/colpack/default.nix +++ b/pkgs/applications/science/math/colpack/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, libtool, gettext }: +{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, gettext }: stdenv.mkDerivation rec { @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ./configure --prefix=$out --enable-openmp ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A package comprising of implementations of algorithms for vertex coloring and derivative computation"; homepage = "http://cscapes.cs.purdue.edu/coloringpage/software.htm#functionalities"; diff --git a/pkgs/applications/science/math/cplex/default.nix b/pkgs/applications/science/math/cplex/default.nix index ec13f5252f13..39213aff09a6 100644 --- a/pkgs/applications/science/math/cplex/default.nix +++ b/pkgs/applications/science/math/cplex/default.nix @@ -1,4 +1,4 @@ -{ stdenv, makeWrapper, openjdk, gtk2, xorg, glibcLocales, releasePath ? null }: +{ lib, stdenv, makeWrapper, openjdk, gtk2, xorg, glibcLocales, releasePath ? null }: # To use this package, you need to download your own cplex installer from IBM # and override the releasePath attribute to point to the location of the file. @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { libSuffix = "${version}0"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Optimization solver for mathematical programming"; homepage = "https://www.ibm.com/be-en/marketplace/ibm-ilog-cplex"; license = licenses.unfree; diff --git a/pkgs/applications/science/math/form/default.nix b/pkgs/applications/science/math/form/default.nix index 091372792901..00f7d7e45365 100644 --- a/pkgs/applications/science/math/form/default.nix +++ b/pkgs/applications/science/math/form/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gmp, zlib }: +{ lib, stdenv, fetchurl, gmp, zlib }: stdenv.mkDerivation { version = "4.2.1"; @@ -12,7 +12,7 @@ stdenv.mkDerivation { buildInputs = [ gmp zlib ]; - meta = with stdenv.lib; { + meta = with lib; { description = "The FORM project for symbolic manipulation of very big expressions"; homepage = "https://www.nikhef.nl/~form/"; license = licenses.gpl3; diff --git a/pkgs/applications/science/math/geogebra/default.nix b/pkgs/applications/science/math/geogebra/default.nix index a6950ad3451c..a20b43c875e2 100644 --- a/pkgs/applications/science/math/geogebra/default.nix +++ b/pkgs/applications/science/math/geogebra/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jre, makeDesktopItem, makeWrapper, unzip, language ? "en_US" }: +{ lib, stdenv, fetchurl, jre, makeDesktopItem, makeWrapper, unzip, language ? "en_US" }: let pname = "geogebra"; version = "5-0-609-0"; @@ -19,7 +19,7 @@ let mimeType = "application/vnd.geogebra.file;application/vnd.geogebra.tool;"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Dynamic mathematics software with graphics, algebra and spreadsheets"; longDescription = '' Dynamic mathematics software for all levels of education that brings @@ -27,7 +27,7 @@ let calculus in one easy-to-use package. ''; homepage = "https://www.geogebra.org/"; - maintainers = with maintainers; [ ma27 ]; + maintainers = with maintainers; [ ]; license = with licenses; [ gpl3 cc-by-nc-sa-30 geogebra ]; platforms = with platforms; linux ++ darwin; hydraPlatforms = []; diff --git a/pkgs/applications/science/math/getdp/default.nix b/pkgs/applications/science/math/getdp/default.nix index ae93e89f1416..915c7e1147f1 100644 --- a/pkgs/applications/science/math/getdp/default.nix +++ b/pkgs/applications/science/math/getdp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, gfortran, blas, lapack, openmpi, petsc, python3 }: +{ lib, stdenv, fetchurl, cmake, gfortran, blas, lapack, openmpi, petsc, python3 }: stdenv.mkDerivation rec { name = "getdp-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake gfortran ]; buildInputs = [ blas lapack openmpi petsc python3 ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A General Environment for the Treatment of Discrete Problems"; longDescription = '' GetDP is a free finite element solver using mixed elements to discretize diff --git a/pkgs/applications/science/math/giac/default.nix b/pkgs/applications/science/math/giac/default.nix index b090274919bd..7825fc1d9a2e 100644 --- a/pkgs/applications/science/math/giac/default.nix +++ b/pkgs/applications/science/math/giac/default.nix @@ -100,7 +100,7 @@ stdenv.mkDerivation rec { done; ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A free computer algebra system (CAS)"; homepage = "https://www-fourier.ujf-grenoble.fr/~parisse/giac.html"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/science/math/ginac/default.nix b/pkgs/applications/science/math/ginac/default.nix index 3c129e8033bd..e20e15edeff1 100644 --- a/pkgs/applications/science/math/ginac/default.nix +++ b/pkgs/applications/science/math/ginac/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cln, pkgconfig, readline, gmp, python }: +{ lib, stdenv, fetchurl, cln, pkgconfig, readline, gmp, python }: stdenv.mkDerivation rec { name = "ginac-1.8.0"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-rpath" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "GiNaC is Not a CAS"; homepage = "http://www.ginac.de/"; maintainers = with maintainers; [ lovek323 ]; diff --git a/pkgs/applications/science/math/gretl/default.nix b/pkgs/applications/science/math/gretl/default.nix index 7d77453cbab0..b68a02e9ebbd 100644 --- a/pkgs/applications/science/math/gretl/default.nix +++ b/pkgs/applications/science/math/gretl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, curl, fftw, gmp, gnuplot, gtk3, gtksourceview3, json-glib +{ lib, stdenv, fetchurl, curl, fftw, gmp, gnuplot, gtk3, gtksourceview3, json-glib , lapack, libxml2, mpfr, openblas, pkg-config, readline }: stdenv.mkDerivation rec { @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A software package for econometric analysis"; longDescription = '' gretl is a cross-platform software package for econometric analysis, diff --git a/pkgs/applications/science/math/gurobi/default.nix b/pkgs/applications/science/math/gurobi/default.nix index 1aa7bce07c5d..f2f406991e30 100644 --- a/pkgs/applications/science/math/gurobi/default.nix +++ b/pkgs/applications/science/math/gurobi/default.nix @@ -48,7 +48,7 @@ in stdenv.mkDerivation rec { passthru.libSuffix = lib.replaceStrings ["."] [""] majorVersion; - meta = with stdenv.lib; { + meta = with lib; { description = "Optimization solver for mathematical programming"; homepage = "https://www.gurobi.com"; license = licenses.unfree; diff --git a/pkgs/applications/science/math/hmetis/default.nix b/pkgs/applications/science/math/hmetis/default.nix index b5e99a8dd75b..f25a0f13c7fb 100644 --- a/pkgs/applications/science/math/hmetis/default.nix +++ b/pkgs/applications/science/math/hmetis/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ghostscript }: +{ lib, stdenv, fetchurl, ghostscript }: stdenv.mkDerivation rec { pname = "hmetis"; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { mv libhmetis.a $out/lib ''; - meta = with stdenv.lib; { + meta = with lib; { description = "hMETIS is a set of programs for partitioning hypergraphs"; homepage = "http://glaros.dtc.umn.edu/gkhome/metis/hmetis/overview"; license = licenses.unfree; diff --git a/pkgs/applications/science/math/jags/default.nix b/pkgs/applications/science/math/jags/default.nix index 122c62888476..2e5986651342 100644 --- a/pkgs/applications/science/math/jags/default.nix +++ b/pkgs/applications/science/math/jags/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, gfortran, blas, lapack}: +{lib, stdenv, fetchurl, gfortran, blas, lapack}: stdenv.mkDerivation rec { name = "JAGS-4.3.0"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { buildInputs = [gfortran blas lapack]; configureFlags = [ "--with-blas=-lblas" "--with-lapack=-llapack" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Just Another Gibbs Sampler"; license = licenses.gpl2; homepage = "http://mcmc-jags.sourceforge.net"; diff --git a/pkgs/applications/science/math/lp_solve/default.nix b/pkgs/applications/science/math/lp_solve/default.nix index 673c28ffa77f..f944499af401 100644 --- a/pkgs/applications/science/math/lp_solve/default.nix +++ b/pkgs/applications/science/math/lp_solve/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { ) ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A Mixed Integer Linear Programming (MILP) solver"; homepage = "http://lpsolve.sourceforge.net"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/science/math/lrcalc/default.nix b/pkgs/applications/science/math/lrcalc/default.nix index ddd470e621a0..96eb77964516 100644 --- a/pkgs/applications/science/math/lrcalc/default.nix +++ b/pkgs/applications/science/math/lrcalc/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromBitbucket , fetchpatch , autoreconfHook @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { }) ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Littlewood-Richardson calculator"; homepage = "http://math.rutgers.edu/~asbuch/lrcalc/"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/science/math/mathematica/default.nix b/pkgs/applications/science/math/mathematica/default.nix index ea9a9c1b7554..e91ad5e5f8c9 100644 --- a/pkgs/applications/science/math/mathematica/default.nix +++ b/pkgs/applications/science/math/mathematica/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , coreutils , patchelf , requireFile @@ -154,7 +154,7 @@ stdenv.mkDerivation rec { # we did this in prefixup already dontPatchELF = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Wolfram Mathematica computational software system"; homepage = "http://www.wolfram.com/mathematica/"; license = licenses.unfree; diff --git a/pkgs/applications/science/math/mxnet/default.nix b/pkgs/applications/science/math/mxnet/default.nix index 3d74421669ea..ab360a963852 100644 --- a/pkgs/applications/science/math/mxnet/default.nix +++ b/pkgs/applications/science/math/mxnet/default.nix @@ -43,9 +43,7 @@ stdenv.mkDerivation rec { rm "$out"/lib/*.a ''; - enableParallelBuilding = true; - - meta = with stdenv.lib; { + meta = with lib; { description = "Lightweight, Portable, Flexible Distributed/Mobile Deep Learning with Dynamic, Mutation-aware Dataflow Dep Scheduler"; homepage = "https://mxnet.incubator.apache.org/"; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/applications/science/math/nasc/default.nix b/pkgs/applications/science/math/nasc/default.nix index 9d14df5a7988..37173f819785 100644 --- a/pkgs/applications/science/math/nasc/default.nix +++ b/pkgs/applications/science/math/nasc/default.nix @@ -1,6 +1,7 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , pkgconfig +, fetchpatch , python3 , meson , ninja @@ -31,6 +32,16 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; + patches = [ + # fix compilation with gcc10 + (fetchpatch { + url = "https://github.com/parnold-x/libqalculate/commit/4fa8f2cceada128ef19f82407226b2c230b780d5.patch"; + extraPrefix = "subprojects/libqalculate/"; + stripLen = "1"; + sha256 = "0kbff623zl0s6yx5avx068f2apwzxzvihjahja4qhlkqkhhzj9dm"; + }) + ]; + nativeBuildInputs = [ glib # post_install.py gtk3 # post_install.py @@ -70,7 +81,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { 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 diff --git a/pkgs/applications/science/math/palp/default.nix b/pkgs/applications/science/math/palp/default.nix index 9ae4fe1ba920..b5b9577d4930 100644 --- a/pkgs/applications/science/math/palp/default.nix +++ b/pkgs/applications/science/math/palp/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , dimensions ? 6 # works for <= dimensions dimensions, but is only optimized for that exact value , doSymlink ? true # symlink the executables to the default location (without dimension postfix) @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A Package for Analyzing Lattice Polytopes"; longDescription = '' A Package for Analyzing Lattice Polytopes (PALP) is a set of C diff --git a/pkgs/applications/science/math/pari/default.nix b/pkgs/applications/science/math/pari/default.nix index 7ec42d11ab14..dd965e17c73c 100644 --- a/pkgs/applications/science/math/pari/default.nix +++ b/pkgs/applications/science/math/pari/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , gmp , readline @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { makeFlags = [ "all" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Computer algebra system for high-performance number theory computations"; longDescription = '' PARI/GP is a widely used computer algebra system designed for fast diff --git a/pkgs/applications/science/math/pari/gp2c.nix b/pkgs/applications/science/math/pari/gp2c.nix index 082ff60c3e8d..23183f83b36b 100644 --- a/pkgs/applications/science/math/pari/gp2c.nix +++ b/pkgs/applications/science/math/pari/gp2c.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , pari , fetchurl , perl }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { "--with-paricfg=${pari}/lib/pari/pari.cfg" "--with-perl=${perl}/bin/perl" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A compiler to translate GP scripts to PARI programs"; homepage = "http://pari.math.u-bordeaux.fr/"; downloadPage = "http://pari.math.u-bordeaux.fr/download.html"; diff --git a/pkgs/applications/science/math/pynac/default.nix b/pkgs/applications/science/math/pynac/default.nix index e3474d865e2d..d49285c3e2f0 100644 --- a/pkgs/applications/science/math/pynac/default.nix +++ b/pkgs/applications/science/math/pynac/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , fetchurl , autoreconfHook @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { }) ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Python is Not a CAS -- modified version of Ginac"; longDescription = '' Pynac -- "Python is Not a CAS" is a modified version of Ginac that diff --git a/pkgs/applications/science/math/qalculate-gtk/default.nix b/pkgs/applications/science/math/qalculate-gtk/default.nix index 09ead07dc09d..d7d880df0403 100644 --- a/pkgs/applications/science/math/qalculate-gtk/default.nix +++ b/pkgs/applications/science/math/qalculate-gtk/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchFromGitHub, intltool, autoreconfHook, pkgconfig, libqalculate, gtk3, wrapGAppsHook }: +{ lib, stdenv, fetchFromGitHub, intltool, autoreconfHook, pkgconfig, libqalculate, gtk3, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "qalculate-gtk"; - version = "3.15.0"; + version = "3.16.0"; src = fetchFromGitHub { owner = "qalculate"; repo = "qalculate-gtk"; rev = "v${version}"; - sha256 = "1w0r9vv1h3zbfdvk8965g5plfkz5clf81riil5b394ms9vsw0bx5"; + sha256 = "1vqzrh5zxwfvih6c3lak0wkkw6bajl88xzl1zk84gxsk9wdymrk4"; }; hardeningDisable = [ "format" ]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ libqalculate gtk3 ]; enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "The ultimate desktop calculator"; homepage = "http://qalculate.github.io"; maintainers = with maintainers; [ gebner ]; diff --git a/pkgs/applications/science/math/ries/default.nix b/pkgs/applications/science/math/ries/default.nix index 4adf3ef2096e..e46553d7b09e 100644 --- a/pkgs/applications/science/math/ries/default.nix +++ b/pkgs/applications/science/math/ries/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip }: +{ lib, stdenv, fetchzip }: stdenv.mkDerivation { name = "ries-2018-04-11"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { makeFlags = [ "PREFIX=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://mrob.com/pub/ries/"; description = "Tool to produce a list of equations that approximately solve to a given number"; platforms = platforms.all; diff --git a/pkgs/applications/science/math/rofi-calc/default.nix b/pkgs/applications/science/math/rofi-calc/default.nix index ebf2d2f0475d..e7cf98c72666 100644 --- a/pkgs/applications/science/math/rofi-calc/default.nix +++ b/pkgs/applications/science/math/rofi-calc/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , autoreconfHook , pkgconfig @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { sed "s|qalc_binary = \"qalc\"|qalc_binary = \"${libqalculate}/bin/qalc\"|" -i src/calc.c ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Do live calculations in rofi!"; homepage = "https://github.com/svenstaro/rofi-calc"; license = licenses.mit; diff --git a/pkgs/applications/science/math/sage/patches/sympy-1.7-update.patch b/pkgs/applications/science/math/sage/patches/sympy-1.7-update.patch new file mode 100644 index 000000000000..1d21622a2354 --- /dev/null +++ b/pkgs/applications/science/math/sage/patches/sympy-1.7-update.patch @@ -0,0 +1,25 @@ +diff --git a/src/sage/interfaces/sympy.py b/src/sage/interfaces/sympy.py +index cc35a42a9f..6e577d5d8d 100644 +--- a/src/sage/interfaces/sympy.py ++++ b/src/sage/interfaces/sympy.py +@@ -397,7 +397,7 @@ def _sympysage_rf(self): + sage: from sympy import Symbol, rf + sage: _ = var('x, y') + sage: rfxy = rf(Symbol('x'), Symbol('y')) +- sage: assert rising_factorial(x,y)._sympy_() == rfxy.rewrite('gamma') ++ sage: assert rising_factorial(x,y)._sympy_() == rfxy.rewrite('gamma', piecewise=False) + sage: assert rising_factorial(x,y) == rfxy._sage_() + """ + from sage.arith.all import rising_factorial +diff --git a/src/sage/symbolic/expression.pyx b/src/sage/symbolic/expression.pyx +index 7c18ec1efa..c2619ac42d 100644 +--- a/src/sage/symbolic/expression.pyx ++++ b/src/sage/symbolic/expression.pyx +@@ -955,6 +955,6 @@ cdef class Expression(CommutativeRingElement): + sage: unicode_art(13 - I) + 13 - ⅈ + sage: unicode_art(1.3 - I) +- 1.3 - 1.0⋅ⅈ ++ 1.3 - ⅈ + sage: unicode_art(cos(I)) + cosh(1) diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index 8948621a025a..b8fb41596607 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -103,6 +103,9 @@ stdenv.mkDerivation rec { # adapt sage's Image class to pillow 8.0.1 (https://trac.sagemath.org/ticket/30971) ./patches/pillow-update.patch + + # fix test output with sympy 1.7 (https://trac.sagemath.org/ticket/30985) + ./patches/sympy-1.7-update.patch ]; patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches; diff --git a/pkgs/applications/science/math/sage/sage.nix b/pkgs/applications/science/math/sage/sage.nix index e2acef7b8eb5..b9256e32f8b1 100644 --- a/pkgs/applications/science/math/sage/sage.nix +++ b/pkgs/applications/science/math/sage/sage.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , makeWrapper , sage-tests , sage-with-env @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { kernelspec = jupyter-kernel-definition; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Open Source Mathematics Software, free alternative to Magma, Maple, Mathematica, and Matlab"; license = licenses.gpl2; maintainers = teams.sage.members; diff --git a/pkgs/applications/science/math/wxmaxima/default.nix b/pkgs/applications/science/math/wxmaxima/default.nix index 7a81a0d679a3..89bdc4155481 100644 --- a/pkgs/applications/science/math/wxmaxima/default.nix +++ b/pkgs/applications/science/math/wxmaxima/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , wrapGAppsHook, cmake, gettext , maxima, wxGTK, gnome3 }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { gappsWrapperArgs+=(--prefix PATH ":" ${maxima}/bin) ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Cross platform GUI for the computer algebra system Maxima"; license = licenses.gpl2; homepage = "https://wxmaxima-developers.github.io/wxmaxima/"; diff --git a/pkgs/applications/science/math/zegrapher/default.nix b/pkgs/applications/science/math/zegrapher/default.nix index c9eb72cca433..32633eb8015d 100644 --- a/pkgs/applications/science/math/zegrapher/default.nix +++ b/pkgs/applications/science/math/zegrapher/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , qmake , wrapQtAppsHook @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { boost ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://zegrapher.com/"; description = "An open source math plotter"; longDescription = '' diff --git a/pkgs/applications/science/misc/colmap/default.nix b/pkgs/applications/science/misc/colmap/default.nix index 83dff3e08f15..60f9810dfb6a 100644 --- a/pkgs/applications/science/misc/colmap/default.nix +++ b/pkgs/applications/science/misc/colmap/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchpatch, fetchFromGitHub, cmake, boost17x, ceres-solver, eigen, +{ mkDerivation, lib, fetchFromGitHub, cmake, boost17x, ceres-solver, eigen, freeimage, glog, libGLU, glew, qtbase, cudaSupport ? false, cudatoolkit ? null }: @@ -7,22 +7,15 @@ assert !cudaSupport || cudatoolkit != null; let boost_static = boost17x.override { enableStatic = true; }; in mkDerivation rec { - version = "3.5"; + version = "3.6"; pname = "colmap"; src = fetchFromGitHub { owner = "colmap"; repo = "colmap"; rev = version; - sha256 = "1vnb62p0y2bnga173wmjs0lnyqdjikv0fkcxjzxm8187khk2lly8"; + sha256 = "1kfivdmhpmdxjjf30rr57y2iy7xmdpg4h8aw3qgacv8ckfpgda3n"; }; - patches = [ - (fetchpatch { - url = "https://github.com/colmap/colmap/commit/6af3d8b0048cecc3b9fc6f4e78c3214dd038180b.patch"; - sha256 = "1zv5girmv4hv78w1xn131v8njwhpbyylc1m15731lnhrs8bri0jq"; - }) - ]; - buildInputs = [ boost_static ceres-solver eigen freeimage glog libGLU glew qtbase diff --git a/pkgs/applications/science/misc/convertall/default.nix b/pkgs/applications/science/misc/convertall/default.nix index 63ed18c89b2f..9a7ac2a8b13c 100644 --- a/pkgs/applications/science/misc/convertall/default.nix +++ b/pkgs/applications/science/misc/convertall/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python3, wrapQtAppsHook }: +{ lib, stdenv, fetchFromGitHub, python3, wrapQtAppsHook }: let inherit (python3.pkgs) wrapPython pyqt5; @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { makeQtWrapper $out/share/convertall/convertall.py $out/bin/convertall ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://convertall.bellz.org/"; description = "Graphical unit converter"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/science/misc/gephi/default.nix b/pkgs/applications/science/misc/gephi/default.nix index b6b53013cb4b..95112fa9098e 100644 --- a/pkgs/applications/science/misc/gephi/default.nix +++ b/pkgs/applications/science/misc/gephi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, jdk, maven, javaPackages }: +{ lib, stdenv, fetchFromGitHub, jdk, maven, javaPackages }: let version = "0.9.2"; @@ -55,7 +55,7 @@ stdenv.mkDerivation { echo "jdkhome=${jdk}" >> $out/etc/gephi.conf ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A platform for visualizing and manipulating large graphs"; homepage = "https://gephi.org"; license = licenses.gpl3; diff --git a/pkgs/applications/science/misc/gplates/default.nix b/pkgs/applications/science/misc/gplates/default.nix index 4bef967bc08a..d0315d159674 100644 --- a/pkgs/applications/science/misc/gplates/default.nix +++ b/pkgs/applications/science/misc/gplates/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qt4, qwt6_qt4, libGLU, libGL, glew, gdal, cgal +{ lib, stdenv, fetchurl, qt4, qwt6_qt4, libGLU, libGL, glew, gdal, cgal , proj, boost, cmake, python2, doxygen, graphviz, gmp, mpfr }: stdenv.mkDerivation rec { @@ -10,8 +10,9 @@ stdenv.mkDerivation rec { sha256 = "1jrcv498vpcs8xklhbsgg12yfa90f96p2mwq6x5sjnrlpf8mh50b"; }; + nativeBuildInputs = [ cmake ]; buildInputs = [ - qt4 qwt6_qt4 libGLU libGL glew gdal cgal proj cmake python2 + qt4 qwt6_qt4 libGLU libGL glew gdal cgal proj python2 doxygen graphviz gmp mpfr (boost.override { enablePython = true; @@ -21,7 +22,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_LINK="-ldl -lpthread -lutil"; - meta = with stdenv.lib; { + meta = with lib; { description = "Desktop software for the interactive visualisation of plate-tectonics"; homepage = "https://www.gplates.org"; license = licenses.gpl2; diff --git a/pkgs/applications/science/misc/netlogo/default.nix b/pkgs/applications/science/misc/netlogo/default.nix index af892441a472..b22c6294fba6 100644 --- a/pkgs/applications/science/misc/netlogo/default.nix +++ b/pkgs/applications/science/misc/netlogo/default.nix @@ -1,4 +1,4 @@ -{ jre, stdenv, fetchurl, makeWrapper, makeDesktopItem }: +{ jre, lib, stdenv, fetchurl, makeWrapper, makeDesktopItem }: let @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { cp ${desktopItem}/share/applications/* $out/share/applications ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A multi-agent programmable modeling environment"; longDescription = '' NetLogo is a multi-agent programmable modeling environment. It is used by diff --git a/pkgs/applications/science/misc/openmodelica/default.nix b/pkgs/applications/science/misc/openmodelica/default.nix index 268ae53401f5..8b027b52687e 100644 --- a/pkgs/applications/science/misc/openmodelica/default.nix +++ b/pkgs/applications/science/misc/openmodelica/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchgit, fetchsvn, autoconf, automake, libtool, gfortran, clang, cmake, gnumake, +{lib, stdenv, fetchgit, fetchsvn, autoconf, automake, libtool, gfortran, clang, cmake, gnumake, hwloc, jre, lapack, blas, hdf5, expat, ncurses, readline, qt4, webkitgtk, which, lp_solve, omniorb, sqlite, libatomic_ops, pkgconfig, file, gettext, flex, bison, doxygen, boost, openscenegraph, gnome2, xorg, git, bash, gtk2, makeWrapper }: @@ -22,8 +22,6 @@ stdenv.mkDerivation { hardeningDisable = [ "format" ]; - enableParallelBuilding = true; - patchPhase = '' cp -fv ${fakegit}/bin/checkout-git.sh libraries/checkout-git.sh cp -fv ${fakegit}/bin/checkout-svn.sh libraries/checkout-svn.sh @@ -44,7 +42,7 @@ stdenv.mkDerivation { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "An open-source Modelica-based modeling and simulation environment"; homepage = "https://openmodelica.org"; license = licenses.gpl3; diff --git a/pkgs/applications/science/misc/openmvs/default.nix b/pkgs/applications/science/misc/openmvs/default.nix index efdd86f0ab2d..ec22aaa599b2 100644 --- a/pkgs/applications/science/misc/openmvs/default.nix +++ b/pkgs/applications/science/misc/openmvs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, cmake +{ lib, stdenv, fetchFromGitHub, pkgconfig, cmake , eigen, opencv, ceres-solver, cgal, boost, vcg , gmp, mpfr, glog, gflags, libjpeg_turbo }: @@ -50,9 +50,7 @@ stdenv.mkDerivation { dontUseCmakeBuildDir = true; - enableParallelBuilding = true; - - meta = with stdenv.lib; { + meta = with lib; { description = "A library for computer-vision scientists and especially targeted to the Multi-View Stereo reconstruction community"; homepage = "http://cdcseacave.github.io/openMVS/"; license = licenses.agpl3; diff --git a/pkgs/applications/science/misc/rink/default.nix b/pkgs/applications/science/misc/rink/default.nix index 0b1ef2b16ea9..5670969e7a2d 100644 --- a/pkgs/applications/science/misc/rink/default.nix +++ b/pkgs/applications/science/misc/rink/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform, openssl, pkg-config, ncurses }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, openssl, pkg-config, ncurses }: rustPlatform.buildRustPackage rec { version = "0.5.1"; @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { # Some tests fail and/or attempt to use internet servers. doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Unit-aware calculator"; homepage = "https://rinkcalc.app"; license = with licenses; [ mpl20 gpl3 ]; diff --git a/pkgs/applications/science/misc/root/5.nix b/pkgs/applications/science/misc/root/5.nix index cab26577bd0b..d8e6ae06a24b 100644 --- a/pkgs/applications/science/misc/root/5.nix +++ b/pkgs/applications/science/misc/root/5.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, cmake, pcre, pkgconfig, python2 +{ lib, stdenv, fetchurl, fetchpatch, cmake, pcre, pkg-config, python2 , libX11, libXpm, libXft, libXext, libGLU, libGL, zlib, libxml2, lz4, lzma, gsl_1, xxHash , Cocoa, OpenGL, noSplash ? false }: @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1ln448lszw4d6jmbdphkr2plwxxlhmjkla48vmmq750xc1lxlfrc"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake pcre python2 zlib libxml2 lz4 lzma gsl_1 xxHash ] + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ pcre python2 zlib libxml2 lz4 lzma gsl_1 xxHash ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ libX11 libXpm libXft libXext libGLU libGL ] ++ stdenv.lib.optionals (stdenv.isDarwin) [ Cocoa OpenGL ] ; @@ -77,11 +77,9 @@ stdenv.mkDerivation rec { ] ++ stdenv.lib.optional stdenv.isDarwin "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks"; - enableParallelBuilding = true; - setupHook = ./setup-hook.sh; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://root.cern.ch/"; description = "A data analysis framework"; platforms = platforms.unix; diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix index 97d8d4e7cee5..8bfde114beb4 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -1,19 +1,20 @@ -{ stdenv, lib, fetchurl, makeWrapper, cmake, gl2ps, gsl, libX11, libXpm, libXft -, libXext, libGLU, libGL, libxml2, lz4, lzma, pcre, pkgconfig, python, xxHash -, zlib +{ stdenv, lib, fetchurl, makeWrapper, cmake, ftgl, gl2ps, glew, gsl, llvm_5 +, libX11, libXpm, libXft, libXext, libGLU, libGL, libxml2, lz4, lzma, pcre +, pkgconfig, python, xxHash, zlib, zstd +, libAfterImage, giflib, libjpeg, libtiff, libpng , Cocoa, OpenGL, noSplash ? false }: stdenv.mkDerivation rec { pname = "root"; - version = "6.18.04"; + version = "6.22.06"; src = fetchurl { url = "https://root.cern.ch/download/root_v${version}.source.tar.gz"; - sha256 = "196ghma6g5a7sqz52wyjkgvmh4hj4vqwppm0zwdypy33hgy8anii"; + sha256 = "0mqvj42nax0bmz8h83jjlwjm3xxjy1n0n10inc8csip9ly28fs64"; }; nativeBuildInputs = [ makeWrapper cmake pkgconfig ]; - buildInputs = [ gl2ps pcre zlib libxml2 lz4 lzma gsl xxHash python.pkgs.numpy ] + buildInputs = [ ftgl gl2ps glew pcre zlib zstd llvm_5 libxml2 lz4 lzma gsl xxHash libAfterImage giflib libjpeg libtiff libpng python.pkgs.numpy ] ++ lib.optionals (!stdenv.isDarwin) [ libX11 libXpm libXft libXext libGLU libGL ] ++ lib.optionals (stdenv.isDarwin) [ Cocoa OpenGL ] ; @@ -38,6 +39,7 @@ stdenv.mkDerivation rec { "-DCMAKE_INSTALL_INCLUDEDIR=include" "-Dalien=OFF" "-Dbonjour=OFF" + "-Dbuiltin_llvm=OFF" "-Dcastor=OFF" "-Dchirp=OFF" "-Dclad=OFF" @@ -69,9 +71,14 @@ stdenv.mkDerivation rec { "-Dxrootd=OFF" ] ++ stdenv.lib.optional (stdenv.cc.libc != null) "-DC_INCLUDE_DIRS=${stdenv.lib.getDev stdenv.cc.libc}/include" - ++ stdenv.lib.optional stdenv.isDarwin "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks"; + ++ stdenv.lib.optionals stdenv.isDarwin [ + "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks" + "-DCMAKE_DISABLE_FIND_PACKAGE_Python2=TRUE" - enableParallelBuilding = true; + # fatal error: module map file '/nix/store/-Libsystem-osx-10.12.6/include/module.modulemap' not found + # fatal error: could not build module '_Builtin_intrinsics' + "-Druntime_cxxmodules=OFF" + ]; postInstall = '' for prog in rootbrowse rootcp rooteventselector rootls rootmkdir rootmv rootprint rootrm rootslimtree; do @@ -82,7 +89,7 @@ stdenv.mkDerivation rec { setupHook = ./setup-hook.sh; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://root.cern.ch/"; description = "A data analysis framework"; platforms = platforms.unix; diff --git a/pkgs/applications/science/misc/root/sw_vers.patch b/pkgs/applications/science/misc/root/sw_vers.patch index 34af132c11f8..b2ee1b6a4ceb 100644 --- a/pkgs/applications/science/misc/root/sw_vers.patch +++ b/pkgs/applications/science/misc/root/sw_vers.patch @@ -1,19 +1,7 @@ -diff a/build/unix/compiledata.sh b/build/unix/compiledata.sh ---- a/build/unix/compiledata.sh -+++ b/build/unix/compiledata.sh -@@ -47,7 +47,7 @@ fi - - if [ "$ARCH" = "macosx" ] || [ "$ARCH" = "macosx64" ] || \ - [ "$ARCH" = "macosxicc" ]; then -- macosx_minor=`sw_vers | sed -n 's/ProductVersion://p' | cut -d . -f 2` -+ macosx_minor=12 - SOEXT="so" - if [ $macosx_minor -ge 5 ]; then - if [ "x`echo $SOFLAGS | grep -- '-install_name'`" != "x" ]; then diff a/cmake/modules/SetUpMacOS.cmake b/cmake/modules/SetUpMacOS.cmake --- a/cmake/modules/SetUpMacOS.cmake +++ b/cmake/modules/SetUpMacOS.cmake -@@ -2,17 +2,8 @@ set(ROOT_ARCHITECTURE macosx) +@@ -8,17 +8,10 @@ set(ROOT_ARCHITECTURE macosx) set(ROOT_PLATFORM macosx) if (CMAKE_SYSTEM_NAME MATCHES Darwin) @@ -21,8 +9,8 @@ diff a/cmake/modules/SetUpMacOS.cmake b/cmake/modules/SetUpMacOS.cmake - COMMAND cut -d . -f 1-2 - OUTPUT_VARIABLE MACOSX_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE) - -- MESSAGE(STATUS "Found a Mac OS X System ${MACOSX_VERSION}") -- + MESSAGE(STATUS "Found a macOS system ${MACOSX_VERSION}") + - if(MACOSX_VERSION VERSION_GREATER 10.7 AND ${CMAKE_CXX_COMPILER_ID} MATCHES Clang) set(libcxx ON CACHE BOOL "Build using libc++" FORCE) - endif() @@ -31,7 +19,7 @@ diff a/cmake/modules/SetUpMacOS.cmake b/cmake/modules/SetUpMacOS.cmake #TODO: check haveconfig and rpath -> set rpath true #TODO: check Thread, define link command #TODO: more stuff check configure script -@@ -25,23 +16,7 @@ if (CMAKE_SYSTEM_NAME MATCHES Darwin) +@@ -37,23 +30,7 @@ if (CMAKE_SYSTEM_NAME MATCHES Darwin) SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m64") SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m64") SET(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -m64") @@ -56,7 +44,7 @@ diff a/cmake/modules/SetUpMacOS.cmake b/cmake/modules/SetUpMacOS.cmake if (CMAKE_COMPILER_IS_GNUCXX) message(STATUS "Found GNU compiler collection") -@@ -104,7 +79,6 @@ if (CMAKE_SYSTEM_NAME MATCHES Darwin) +@@ -115,7 +92,6 @@ if (CMAKE_SYSTEM_NAME MATCHES Darwin) endif() #---Set Linker flags---------------------------------------------------------------------- @@ -67,33 +55,33 @@ diff a/cmake/modules/SetUpMacOS.cmake b/cmake/modules/SetUpMacOS.cmake diff a/config/root-config.in b/config/root-config.in --- a/config/root-config.in +++ b/config/root-config.in -@@ -306,12 +306,6 @@ macosxicc) - auxlibs="-lm -ldl" +@@ -312,12 +312,6 @@ macosxicc) ;; - macosx64) -- # MacOS X with gcc (GNU cc v4.x) in 64 bit mode + macosx64|macosxarm64) + # MacOS X with gcc (GNU cc v4.x) in 64 bit mode +- macosx_major=`sw_vers | sed -n 's/ProductVersion://p' | cut -d . -f 1 | sed -e 's/^[[:space:]]*//'` - macosx_minor=`sw_vers | sed -n 's/ProductVersion://p' | cut -d . -f 2` - # cannot find the one linked to libGraf if relocated after built -- if [ $macosx_minor -le 4 ]; then +- if [ $macosx_major -eq 10 -a $macosx_minor -le 4 ]; then - rootlibs="$rootlibs -lfreetype" - fi auxcflags="${cxxversionflag} -m64" auxldflags="-m64" auxlibs="-lm -ldl" -@@ -375,18 +369,11 @@ freebsd* | openbsd* | linux*) +@@ -378,18 +372,11 @@ freebsd* | openbsd* | linux*) + done + ;; macosx*) +- if [ \( $macosx_major -eq 10 -a $macosx_minor -ge 5 \) -o $macosx_major -gt 10 ]; then + auxcflags="-pthread $auxcflags" + auxlibs="-lpthread $auxlibs" +- else +- auxcflags="-D_REENTRANT $auxcflags" +- auxlibs="-lpthread $auxlibs" +- fi for f in $features ; do - if test "x$f" = "xthread" ; then -- if [ $macosx_minor -ge 5 ]; then - auxcflags="-pthread $auxcflags" - auxlibs="-lpthread $auxlibs" -- else -- auxcflags="-D_REENTRANT $auxcflags" -- auxlibs="-lpthread $auxlibs" -- fi - fi if test "x$f" = "xrpath" ; then -- if [ $macosx_minor -ge 5 ]; then +- if [ \( $macosx_major -eq 10 -a $macosx_minor -ge 5 \) -o $macosx_major -gt 10 ]; then auxlibs="-Wl,-rpath,$libdir $auxlibs" - fi fi diff --git a/pkgs/applications/science/misc/simgrid/default.nix b/pkgs/applications/science/misc/simgrid/default.nix index 11d73095834f..7cc702f2d538 100644 --- a/pkgs/applications/science/misc/simgrid/default.nix +++ b/pkgs/applications/science/misc/simgrid/default.nix @@ -92,8 +92,6 @@ stdenv.mkDerivation rec { EOW ''; - enableParallelBuilding = true; - meta = { description = "Framework for the simulation of distributed applications"; longDescription = '' diff --git a/pkgs/applications/science/misc/snakemake/default.nix b/pkgs/applications/science/misc/snakemake/default.nix index a03f7682a51c..6b3c405a9ac2 100644 --- a/pkgs/applications/science/misc/snakemake/default.nix +++ b/pkgs/applications/science/misc/snakemake/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python3Packages }: +{ lib, stdenv, python3Packages }: python3Packages.buildPythonApplication rec { pname = "snakemake"; @@ -28,7 +28,7 @@ python3Packages.buildPythonApplication rec { doCheck = false; # Tests depend on Google Cloud credentials at ${HOME}/gcloud-service-key.json - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://snakemake.readthedocs.io"; license = licenses.mit; description = "Python-based execution environment for make-like workflows"; diff --git a/pkgs/applications/science/misc/vite/default.nix b/pkgs/applications/science/misc/vite/default.nix index 0d749bb9be4f..6f7735db82e0 100644 --- a/pkgs/applications/science/misc/vite/default.nix +++ b/pkgs/applications/science/misc/vite/default.nix @@ -23,7 +23,8 @@ stdenv.mkDerivation { ln -sv "${externals}" externals ''; - buildInputs = [ cmake qt4 libGLU libGL ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ qt4 libGLU libGL ]; NIX_LDFLAGS = "-lGLU"; diff --git a/pkgs/applications/science/molecular-dynamics/dl-poly-classic/default.nix b/pkgs/applications/science/molecular-dynamics/dl-poly-classic/default.nix index 51978e95766d..16d858b00bed 100644 --- a/pkgs/applications/science/molecular-dynamics/dl-poly-classic/default.nix +++ b/pkgs/applications/science/molecular-dynamics/dl-poly-classic/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , gfortran, mpi }: @@ -27,7 +27,7 @@ stdenv.mkDerivation { cp -v ../execute/DLPOLY.X $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.ccp5.ac.uk/DL_POLY_C"; description = "DL_POLY Classic is a general purpose molecular dynamics simulation package"; license = licenses.bsdOriginal; diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix index 84dd3b729b2b..6a243c1d9174 100644 --- a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix +++ b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , cmake , hwloc @@ -54,7 +54,7 @@ in stdenv.mkDerivation rec { ] ); - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.gromacs.org"; license = licenses.gpl2; description = "Molecular dynamics software package"; diff --git a/pkgs/applications/science/molecular-dynamics/lammps/default.nix b/pkgs/applications/science/molecular-dynamics/lammps/default.nix index 5dc31695c60d..561bb119f12e 100644 --- a/pkgs/applications/science/molecular-dynamics/lammps/default.nix +++ b/pkgs/applications/science/molecular-dynamics/lammps/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , libpng, gzip, fftw, blas, lapack , mpi ? null }: @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { cp -v liblammps* $out/lib/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Classical Molecular Dynamics simulation code"; longDescription = '' LAMMPS is a classical molecular dynamics simulation code designed to diff --git a/pkgs/applications/science/molecular-dynamics/viennarna/default.nix b/pkgs/applications/science/molecular-dynamics/viennarna/default.nix new file mode 100644 index 000000000000..b3af602f578f --- /dev/null +++ b/pkgs/applications/science/molecular-dynamics/viennarna/default.nix @@ -0,0 +1,37 @@ +{ lib, stdenv +, fetchurl +, gsl +, mpfr +, perl +, python3 +}: + +stdenv.mkDerivation rec { + pname = "ViennaRNA"; + version = "2.4.17"; + + src = fetchurl { + url = "https://www.tbi.univie.ac.at/RNA/download/sourcecode/2_4_x/${pname}-${version}.tar.gz"; + sha256 = "08f1h2a8fn1s2zwf1244smiydhgwxgcnzy6irpdlmpvwygv0irmi"; + }; + + buildInputs = [ + gsl + mpfr + perl + python3 + ]; + + configureFlags = [ + "--with-cluster" + "--with-kinwalker" + ]; + + meta = with lib; { + description = "Prediction and comparison of RNA secondary structures"; + homepage = "https://www.tbi.univie.ac.at/RNA/"; + license = licenses.unfree; + maintainers = with maintainers; [ prusnak ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/science/physics/elmerfem/default.nix b/pkgs/applications/science/physics/elmerfem/default.nix index a76fe3a72774..6fa25ce66aeb 100644 --- a/pkgs/applications/science/physics/elmerfem/default.nix +++ b/pkgs/applications/science/physics/elmerfem/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, git, gfortran, openmpi, blas, liblapack, qt4, qwt6_qt4, pkg-config }: +{ lib, stdenv, fetchFromGitHub, cmake, git, gfortran, openmpi, blas, liblapack, qt4, qwt6_qt4, pkg-config }: stdenv.mkDerivation rec { pname = "elmerfem"; @@ -36,9 +36,7 @@ stdenv.mkDerivation rec { ./fix-cmake.patch ]; - enableParallelBuilding = true; - - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://elmerfem.org/"; description = "A finite element software for multiphysical problems"; platforms = platforms.unix; diff --git a/pkgs/applications/science/physics/quantomatic/default.nix b/pkgs/applications/science/physics/quantomatic/default.nix index a9c83310b2ff..c1400869a258 100644 --- a/pkgs/applications/science/physics/quantomatic/default.nix +++ b/pkgs/applications/science/physics/quantomatic/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jre, makeWrapper }: +{ lib, stdenv, fetchurl, jre, makeWrapper }: stdenv.mkDerivation rec { pname = "quantomatic"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { makeWrapper ${jre}/bin/java $out/bin/quantomatic --add-flags "-jar $out/libexec/quantomatic/quantomatic.jar" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A piece of software for reasoning about monoidal theories; in particular, quantum information processing"; license = licenses.gpl3; homepage = "https://quantomatic.github.io/"; diff --git a/pkgs/applications/science/physics/sherpa/default.nix b/pkgs/applications/science/physics/sherpa/default.nix index 93e402ec3ceb..9a3af78240ee 100644 --- a/pkgs/applications/science/physics/sherpa/default.nix +++ b/pkgs/applications/science/physics/sherpa/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gfortran, hepmc2, fastjet, lhapdf, rivet, sqlite }: +{ lib, stdenv, fetchurl, gfortran, hepmc2, fastjet, lhapdf, rivet, sqlite }: stdenv.mkDerivation rec { pname = "sherpa"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { "--enable-rivet=${rivet}" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Simulation of High-Energy Reactions of PArticles in lepton-lepton, lepton-photon, photon-photon, lepton-hadron and hadron-hadron collisions"; license = licenses.gpl2; homepage = "https://gitlab.com/sherpa-team/sherpa"; diff --git a/pkgs/applications/science/physics/xfitter/default.nix b/pkgs/applications/science/physics/xfitter/default.nix index cbb097350c71..0713825ccef0 100644 --- a/pkgs/applications/science/physics/xfitter/default.nix +++ b/pkgs/applications/science/physics/xfitter/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, apfel, apfelgrid, applgrid, blas, gfortran, lhapdf, lapack, libyaml, lynx +{ lib, stdenv, fetchurl, apfel, apfelgrid, applgrid, blas, gfortran, lhapdf, lapack, libyaml, lynx , mela, root5, qcdnum, which, libtirpc }: @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = [ "-I${libtirpc.dev}/include/tirpc" ]; NIX_LDFLAGS = [ "-ltirpc" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "The xFitter project is an open source QCD fit framework ready to extract PDFs and assess the impact of new data"; license = licenses.gpl3; homepage = "https://www.xfitter.org/xFitter"; diff --git a/pkgs/applications/science/programming/fdr/default.nix b/pkgs/applications/science/programming/fdr/default.nix index 4eeca5c1759b..3ac8267d8aea 100644 --- a/pkgs/applications/science/programming/fdr/default.nix +++ b/pkgs/applications/science/programming/fdr/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, qtbase, qtx11extras, ncurses5, xorg, zlib, python27Packages}: +{lib, stdenv, fetchurl, qtbase, qtx11extras, ncurses5, xorg, zlib, python27Packages}: stdenv.mkDerivation { name = "fdr-4.2.3"; src = fetchurl { @@ -58,7 +58,7 @@ stdenv.mkDerivation { done ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.cs.ox.ac.uk/projects/fdr/"; description = "The CSP refinement checker"; license = licenses.unfreeRedistributable; diff --git a/pkgs/applications/science/programming/groove/default.nix b/pkgs/applications/science/programming/groove/default.nix index 87b7b02317a2..958c452b9fce 100644 --- a/pkgs/applications/science/programming/groove/default.nix +++ b/pkgs/applications/science/programming/groove/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, makeWrapper, makeDesktopItem, icoutils, jre }: +{ lib, stdenv, fetchurl, unzip, makeWrapper, makeDesktopItem, icoutils, jre }: let desktopItem = makeDesktopItem { @@ -44,7 +44,7 @@ in stdenv.mkDerivation rec { icotool -x -i 2 -o $out/share/icons/hicolor/16x16/apps/groove.png groove-green-g.ico ''; - meta = with stdenv.lib; { + meta = with lib; { description = "GRaphs for Object-Oriented VErification"; homepage = "http://groove.cs.utwente.nl/"; license = licenses.asl20; diff --git a/pkgs/applications/science/programming/plm/default.nix b/pkgs/applications/science/programming/plm/default.nix index ebfb6471c632..852502e73b0f 100644 --- a/pkgs/applications/science/programming/plm/default.nix +++ b/pkgs/applications/science/programming/plm/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, makeWrapper, jre, gcc, valgrind}: +{lib, stdenv, fetchurl, makeWrapper, jre, gcc, valgrind}: # gcc and valgrind are not strict dependencies, they could be made # optional. They are here because plm can only help you learn C if you # have them installed. @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { --prefix PATH : "$PATH" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Free cross-platform programming exerciser"; license = licenses.gpl3; maintainers = [ ]; diff --git a/pkgs/applications/science/programming/scyther/cli.nix b/pkgs/applications/science/programming/scyther/cli.nix index 6623f5def4cb..0acf0989c636 100644 --- a/pkgs/applications/science/programming/scyther/cli.nix +++ b/pkgs/applications/science/programming/scyther/cli.nix @@ -6,12 +6,8 @@ stdenv.mkDerivation { inherit src meta; - buildInputs = [ - cmake - glibc.static - flex - bison - ]; + nativeBuildInputs = [ cmake flex bison ]; + buildInputs = [ glibc.static ]; patchPhase = '' # Since we're not in a git dir, the normal command this project uses to create this file wouldn't work diff --git a/pkgs/applications/science/robotics/betaflight-configurator/default.nix b/pkgs/applications/science/robotics/betaflight-configurator/default.nix index 66b9a1ef63a1..0b39c60b2833 100644 --- a/pkgs/applications/science/robotics/betaflight-configurator/default.nix +++ b/pkgs/applications/science/robotics/betaflight-configurator/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, unzip, makeDesktopItem, nwjs, wrapGAppsHook, gsettings-desktop-schemas, gtk3 }: +{lib, stdenv, fetchurl, unzip, makeDesktopItem, nwjs, wrapGAppsHook, gsettings-desktop-schemas, gtk3 }: let pname = "betaflight-configurator"; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { makeWrapper ${nwjs}/bin/nw $out/bin/${pname} --add-flags $out/opt/${pname} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "The Betaflight flight control system configuration tool"; longDescription = '' A crossplatform configuration tool for the Betaflight flight control system. diff --git a/pkgs/applications/science/robotics/mission-planner/default.nix b/pkgs/applications/science/robotics/mission-planner/default.nix index 5ae04d8a84b7..a299a66704d1 100644 --- a/pkgs/applications/science/robotics/mission-planner/default.nix +++ b/pkgs/applications/science/robotics/mission-planner/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeDesktopItem, makeWrapper, unzip, mono6 }: +{ lib, stdenv, fetchurl, makeDesktopItem, makeWrapper, unzip, mono6 }: let pname = "mission-planner"; @@ -44,7 +44,7 @@ in stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "An ArduPilot ground station"; longDescription = '' Full-featured ground station application for the ArduPilot open source diff --git a/pkgs/applications/science/robotics/qgroundcontrol/default.nix b/pkgs/applications/science/robotics/qgroundcontrol/default.nix index 8710b88ced36..023a4fc8b6a3 100644 --- a/pkgs/applications/science/robotics/qgroundcontrol/default.nix +++ b/pkgs/applications/science/robotics/qgroundcontrol/default.nix @@ -6,7 +6,7 @@ mkDerivation rec { pname = "qgroundcontrol"; - version = "4.0.10"; + version = "4.0.11"; qtInputs = [ qtbase qtcharts qtlocation qtserialport qtsvg qtquickcontrols2 @@ -62,7 +62,7 @@ mkDerivation rec { owner = "mavlink"; repo = pname; rev = "v${version}"; - sha256 = "1jmhhd2nwxq3m9rzzmrjls8f6hhj52ia71b1sv4vvcjh802cha8g"; + sha256 = "14pk1vmcpg2cc5p100chbhnynclcwyqmyb2n2w11vvk0l2c9z1gz"; fetchSubmodules = true; }; diff --git a/pkgs/applications/science/robotics/sumorobot-manager/default.nix b/pkgs/applications/science/robotics/sumorobot-manager/default.nix index 68b91dafb736..bd056a2ec21c 100644 --- a/pkgs/applications/science/robotics/sumorobot-manager/default.nix +++ b/pkgs/applications/science/robotics/sumorobot-manager/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python3, qt5, fetchFromGitHub, wrapPython, pyqt5, pyserial }: +{ lib, stdenv, python3, qt5, fetchFromGitHub, wrapPython, pyqt5, pyserial }: stdenv.mkDerivation rec { pname = "sumorobot-manager"; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { wrapPythonProgramsIn "$out/opt" "$pythonPath" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Desktop App for managing SumoRobots"; homepage = "https://www.robokoding.com/kits/sumorobot/sumomanager/"; license = licenses.mit; diff --git a/pkgs/applications/science/robotics/yarp/default.nix b/pkgs/applications/science/robotics/yarp/default.nix index df2c569a31c7..aa0062f8f3ac 100644 --- a/pkgs/applications/science/robotics/yarp/default.nix +++ b/pkgs/applications/science/robotics/yarp/default.nix @@ -11,9 +11,8 @@ stdenv.mkDerivation rec { sha256 = "0mphh899niy30xbjjwi9xpsliq8mladfldbbbjfngdrqfhiray1a"; }; - buildInputs = [ cmake ace ]; - - enableParallelBuilding = true; + nativeBuildInputs = [ cmake ]; + buildInputs = [ ace ]; cmakeFlags = [ "-DYARP_COMPILE_UNMAINTAINED:BOOL=ON" diff --git a/pkgs/applications/search/grepcidr/default.nix b/pkgs/applications/search/grepcidr/default.nix index 125e67938ecd..bdc660db45fc 100644 --- a/pkgs/applications/search/grepcidr/default.nix +++ b/pkgs/applications/search/grepcidr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "grepcidr"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { installFlags = [ "PREFIX=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Filter IPv4 and IPv6 addresses matching CIDR patterns"; homepage = "http://www.pc-tools.net/unix/grepcidr/"; license = licenses.gpl3; diff --git a/pkgs/applications/search/grepm/default.nix b/pkgs/applications/search/grepm/default.nix index d03d26d00004..7fef36d910ee 100644 --- a/pkgs/applications/search/grepm/default.nix +++ b/pkgs/applications/search/grepm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perlPackages, mutt }: +{ lib, stdenv, fetchurl, perlPackages, mutt }: stdenv.mkDerivation { pname = "grepm"; @@ -23,7 +23,7 @@ stdenv.mkDerivation { $out/bin/grepm ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Wrapper for grepmail utilizing mutt"; homepage = "http://www.barsnick.net/sw/grepm.html"; license = licenses.free; diff --git a/pkgs/applications/search/recoll/default.nix b/pkgs/applications/search/recoll/default.nix index 4939fcf56627..6d6f58fb5e20 100644 --- a/pkgs/applications/search/recoll/default.nix +++ b/pkgs/applications/search/recoll/default.nix @@ -91,7 +91,7 @@ mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A full-text search tool"; longDescription = '' Recoll is an Xapian frontend that can search through files, archive diff --git a/pkgs/applications/system/monitor/default.nix b/pkgs/applications/system/monitor/default.nix index 30ae9e51e9eb..11bdeeb3bf62 100644 --- a/pkgs/applications/system/monitor/default.nix +++ b/pkgs/applications/system/monitor/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , nix-update-script , meson @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Manage processes and monitor system resources"; longDescription = '' Manage processes and monitor system resources. diff --git a/pkgs/applications/terminal-emulators/alacritty/default.nix b/pkgs/applications/terminal-emulators/alacritty/default.nix index cd372b79c26b..13a67c6236ff 100644 --- a/pkgs/applications/terminal-emulators/alacritty/default.nix +++ b/pkgs/applications/terminal-emulators/alacritty/default.nix @@ -52,16 +52,16 @@ let in rustPlatform.buildRustPackage rec { pname = "alacritty"; - version = "0.6.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "alacritty"; repo = pname; rev = "v${version}"; - sha256 = "vQdNwNiUvoJWRT1foPRadirI2zWjnzU3sGnIxeHKlj8="; + sha256 = "8alCFtr+3aJsqQ2Ra8u5/SRHfDvMq2kRvRCKo/zwMK0="; }; - cargoSha256 = "1PQSg6EmwVMZj2ALw6qsbtPMCtALVHx5TR05FjGD/QE="; + cargoSha256 = "kqRlxieChnhWtYYf67gi+2bncIzO56xpnv2uLjcINVM="; nativeBuildInputs = [ cmake diff --git a/pkgs/applications/terminal-emulators/eterm/default.nix b/pkgs/applications/terminal-emulators/eterm/default.nix index b51acd9fa728..b72b31babe0b 100644 --- a/pkgs/applications/terminal-emulators/eterm/default.nix +++ b/pkgs/applications/terminal-emulators/eterm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , libX11, libXext, libXaw , pkgconfig, imlib2, libast }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ libX11 libXext libXaw imlib2 ]; propagatedBuildInputs = [ libast ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Terminal emulator"; homepage = "http://www.eterm.org"; license = licenses.bsd2; diff --git a/pkgs/applications/terminal-emulators/evilvte/default.nix b/pkgs/applications/terminal-emulators/evilvte/default.nix index 7a5284a527a6..40e723f16825 100644 --- a/pkgs/applications/terminal-emulators/evilvte/default.nix +++ b/pkgs/applications/terminal-emulators/evilvte/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, makeWrapper, pkgconfig, +{ lib, stdenv, fetchgit, makeWrapper, pkgconfig, gnome2, glib, pango, cairo, gdk-pixbuf, atk, freetype, xorg, configH ? "" }: @@ -25,7 +25,7 @@ stdenv.mkDerivation { make ''; - meta = with stdenv.lib; { + meta = with lib; { description = "VTE based, highly customizable terminal emulator"; homepage = "http://www.calno.com/evilvte"; license = licenses.gpl2; diff --git a/pkgs/applications/terminal-emulators/foot/default.nix b/pkgs/applications/terminal-emulators/foot/default.nix index 3d95f7c5772d..2b79c5362de1 100644 --- a/pkgs/applications/terminal-emulators/foot/default.nix +++ b/pkgs/applications/terminal-emulators/foot/default.nix @@ -1,35 +1,142 @@ -{ stdenv, fetchgit -, fcft, freetype, pixman, libxkbcommon, fontconfig, wayland -, meson, ninja, ncurses, scdoc, tllist, wayland-protocols, pkg-config +{ stdenv +, lib +, fetchzip +, fetchurl +, runCommandNoCC +, fcft +, freetype +, pixman +, libxkbcommon +, fontconfig +, wayland +, meson +, ninja +, ncurses +, scdoc +, tllist +, wayland-protocols +, pkg-config +, allowPgo ? true +, python3 # for PGO }: +let + version = "1.6.2"; + + # build stimuli file for PGO build and the script to generate it + # independently of the foot's build, so we can cache the result + # and avoid unnecessary rebuilds as it can take relatively long + # to generate + stimulusGenerator = stdenv.mkDerivation { + pname = "foot-generate-alt-random-writes"; + inherit version; + + src = fetchurl { + url = "https://codeberg.org/dnkl/foot/raw/tag/${version}/scripts/generate-alt-random-writes.py"; + sha256 = "0pnc5nvqrbgx5618ylrkrs9fyxjh4jcsbryfk6vlnk8x4wyyaibz"; + }; + + dontUnpack = true; + + buildInputs = [ python3 ]; + + installPhase = '' + install -Dm755 $src $out + ''; + }; + + stimuliFile = runCommandNoCC "pgo-stimulus-file" { } '' + ${stimulusGenerator} \ + --rows=67 --cols=135 \ + --scroll --scroll-region \ + --colors-regular --colors-bright --colors-256 --colors-rgb \ + --attr-bold --attr-italic --attr-underline \ + --sixel \ + --seed=2305843009213693951 \ + $out + ''; + + compilerName = + if stdenv.cc.isClang + then "clang" + else if stdenv.cc.isGNU + then "gcc" + else "unknown"; + + # https://codeberg.org/dnkl/foot/src/branch/master/INSTALL.md#performance-optimized-pgo + pgoCflags = { + "clang" = "-O3 -Wno-ignored-optimization-argument -Wno-profile-instr-out-of-date -Wno-profile-instr-unprofiled"; + "gcc" = "-O3 -Wno-missing-profile"; + }."${compilerName}"; + + # ar with lto support + ar = { + "clang" = "llvm-ar"; + "gcc" = "gcc-ar"; + "unknown" = "ar"; + }."${compilerName}"; + + # PGO only makes sense if we are not cross compiling and + # using a compiler which foot's PGO build supports (clang or gcc) + doPgo = allowPgo && (stdenv.hostPlatform == stdenv.buildPlatform) + && compilerName != "unknown"; +in stdenv.mkDerivation rec { pname = "foot"; - version = "1.5.1"; + inherit version; - src = fetchgit { - url = "https://codeberg.org/dnkl/foot.git"; - rev = version; - sha256 = "sha256-GAk2qkrgCNILJOeRcn1NT4t3w+R6WFTZ1goOhBEwKwc="; + src = fetchzip { + url = "https://codeberg.org/dnkl/${pname}/archive/${version}.tar.gz"; + sha256 = "08i3jmjky5s2nnc0c95c009cym91rs4sj4876sr4xnlkb7ab4812"; }; nativeBuildInputs = [ - meson ninja ncurses scdoc tllist wayland-protocols pkg-config - ]; + meson + ninja + ncurses + scdoc + tllist + wayland-protocols + pkg-config + ] ++ lib.optional stdenv.cc.isClang stdenv.cc.cc.llvm; + buildInputs = [ - fontconfig freetype pixman wayland libxkbcommon fcft + fontconfig + freetype + pixman + wayland + libxkbcommon + fcft ]; - # recommended build flags for foot as per INSTALL.md - # https://codeberg.org/dnkl/foot/src/branch/master/INSTALL.md#user-content-release-build + # recommended build flags for performance optimized foot builds + # https://codeberg.org/dnkl/foot/src/branch/master/INSTALL.md#release-build + CFLAGS = + if !doPgo + then "-O3 -fno-plt" + else pgoCflags; + + # ar with gcc plugins for lto objects preConfigure = '' - export CFLAGS+="-O3 -fno-plt" + export AR="${ar}" ''; mesonFlags = [ "--buildtype=release" "-Db_lto=true" ]; - meta = with stdenv.lib; { + # build and run binary generating PGO profiles, + # then reconfigure to build the normal foot binary utilizing PGO + preBuild = lib.optionalString doPgo '' + meson configure -Db_pgo=generate + ninja + ./pgo ${stimuliFile} ${stimuliFile} ${stimuliFile} + meson configure -Db_pgo=use + '' + lib.optionalString (doPgo && stdenv.cc.cc.pname == "clang") '' + llvm-profdata merge default_*profraw --output=default.profdata + ''; + + meta = with lib; { homepage = "https://codeberg.org/dnkl/foot/"; + changelog = "https://codeberg.org/dnkl/foot/releases/tag/${version}"; description = "A fast, lightweight and minimalistic Wayland terminal emulator"; license = licenses.mit; maintainers = [ maintainers.sternenseemann ]; diff --git a/pkgs/applications/terminal-emulators/germinal/default.nix b/pkgs/applications/terminal-emulators/germinal/default.nix new file mode 100644 index 000000000000..12d82290b1a6 --- /dev/null +++ b/pkgs/applications/terminal-emulators/germinal/default.nix @@ -0,0 +1,55 @@ +{ lib, stdenv +, fetchFromGitHub +, autoreconfHook +, pkg-config +, appstream-glib +, dbus +, pango +, pcre2 +, tmux +, vte +, wrapGAppsHook +}: + +stdenv.mkDerivation rec { + pname = "germinal"; + version = "26"; + + src = fetchFromGitHub { + owner = "Keruspe"; + repo = "Germinal"; + rev = "v${version}"; + sha256 = "sha256-HUi+skF4bJj5CY2cNTOC4tl7jhvpXYKqBx2rqKzjlo0="; + }; + + nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook ]; + buildInputs = [ + appstream-glib + dbus + pango + pcre2 + vte + ]; + + configureFlags = [ + "--with-dbusservicesdir=${placeholder "out"}/etc/dbus-1/system-services/" + ]; + + dontWrapGApps = true; + + fixupPhase = '' + runHook preFixup + wrapProgram $out/bin/germinal \ + --prefix PATH ":" "${stdenv.lib.makeBinPath [ tmux ]}" \ + "''${gappsWrapperArgs[@]}" + runHook postFixup + ''; + + meta = with lib; { + description = "A minimal terminal emulator"; + homepage = "https://github.com/Keruspe/Germinal"; + license = with licenses; gpl3Plus; + platforms = with platforms; unix; + maintainers = with maintainers; [ AndersonTorres ]; + }; +} diff --git a/pkgs/applications/terminal-emulators/guake/default.nix b/pkgs/applications/terminal-emulators/guake/default.nix index 481c7255441f..bdb3e65ed98a 100644 --- a/pkgs/applications/terminal-emulators/guake/default.nix +++ b/pkgs/applications/terminal-emulators/guake/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , python3 , glibcLocales @@ -66,7 +66,7 @@ python3.pkgs.buildPythonApplication rec { gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ libutempter ]}") ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Drop-down terminal for GNOME"; homepage = "http://guake-project.org"; license = licenses.gpl2; diff --git a/pkgs/applications/terminal-emulators/havoc/default.nix b/pkgs/applications/terminal-emulators/havoc/default.nix index a6d5278fc3c5..61fd5831dc98 100644 --- a/pkgs/applications/terminal-emulators/havoc/default.nix +++ b/pkgs/applications/terminal-emulators/havoc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , pkgconfig, libxkbcommon, wayland, wayland-protocols }: stdenv.mkDerivation rec { @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { install -D -m 644 README.md -t $out/share/doc/${pname}-${version}/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A minimal terminal emulator for Wayland"; homepage = "https://github.com/ii8/havoc"; license = with licenses; [ mit publicDomain ]; diff --git a/pkgs/applications/terminal-emulators/iterm2/default.nix b/pkgs/applications/terminal-emulators/iterm2/default.nix index e273eda45c31..ff5c7f8dae46 100644 --- a/pkgs/applications/terminal-emulators/iterm2/default.nix +++ b/pkgs/applications/terminal-emulators/iterm2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: /* This derivation is impure: it relies on an Xcode toolchain being installed @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { (deny file-read* file-write* process-exec mach-lookup (subpath "/usr/local") (with no-log)) ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A replacement for Terminal and the successor to iTerm"; homepage = "https://www.iterm2.com/"; license = licenses.gpl2; diff --git a/pkgs/applications/terminal-emulators/kitty/default.nix b/pkgs/applications/terminal-emulators/kitty/default.nix index 2fa03a97e8bc..b7541f2528d6 100644 --- a/pkgs/applications/terminal-emulators/kitty/default.nix +++ b/pkgs/applications/terminal-emulators/kitty/default.nix @@ -1,4 +1,4 @@ -{ stdenv, substituteAll, fetchFromGitHub, python3Packages, libunistring, +{ lib, stdenv, substituteAll, fetchFromGitHub, python3Packages, libunistring, harfbuzz, fontconfig, pkgconfig, ncurses, imagemagick, xsel, libstartup_notification, libGL, libX11, libXrandr, libXinerama, libXcursor, libxkbcommon, libXi, libXext, wayland-protocols, wayland, @@ -132,7 +132,7 @@ buildPythonApplication rec { echo "$terminfo" >> $out/nix-support/propagated-user-env-packages ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/kovidgoyal/kitty"; description = "A modern, hackable, featureful, OpenGL based terminal emulator"; license = licenses.gpl3; diff --git a/pkgs/applications/terminal-emulators/lilyterm/default.nix b/pkgs/applications/terminal-emulators/lilyterm/default.nix index 28f9625b5b66..96029259f15f 100644 --- a/pkgs/applications/terminal-emulators/lilyterm/default.nix +++ b/pkgs/applications/terminal-emulators/lilyterm/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { "--enable-safe-mode" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A fast, lightweight terminal emulator"; longDescription = '' LilyTerm is a terminal emulator based off of libvte that aims to be fast and lightweight. diff --git a/pkgs/applications/terminal-emulators/mrxvt/default.nix b/pkgs/applications/terminal-emulators/mrxvt/default.nix index 4dc70133ec47..e273e96cbedf 100644 --- a/pkgs/applications/terminal-emulators/mrxvt/default.nix +++ b/pkgs/applications/terminal-emulators/mrxvt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libX11, libXft, libXi, xorgproto, libSM, libICE +{ lib, stdenv, fetchurl, libX11, libXft, libXi, xorgproto, libSM, libICE , freetype, pkgconfig, which }: stdenv.mkDerivation { @@ -27,7 +27,7 @@ stdenv.mkDerivation { sha256 = "1mqhmnlz32lvld9rc6c1hyz7gjw4anwf39yhbsjkikcgj1das0zl"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Lightweight multitabbed feature-rich X11 terminal emulator"; longDescription = " Multitabbed lightweight terminal emulator based on rxvt. diff --git a/pkgs/applications/terminal-emulators/nimmm/default.nix b/pkgs/applications/terminal-emulators/nimmm/default.nix index 383057ca6551..648a3906fb50 100644 --- a/pkgs/applications/terminal-emulators/nimmm/default.nix +++ b/pkgs/applications/terminal-emulators/nimmm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, nim, termbox, pcre }: +{ lib, stdenv, fetchFromGitHub, nim, termbox, pcre }: let noise = fetchFromGitHub { @@ -45,7 +45,7 @@ in stdenv.mkDerivation rec { install -Dt $out/bin src/nimmm ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Terminal file manager written in nim"; homepage = "https://github.com/joachimschmidt557/nimmm"; license = licenses.gpl3; diff --git a/pkgs/applications/terminal-emulators/roxterm/default.nix b/pkgs/applications/terminal-emulators/roxterm/default.nix index 88ff0dc460ec..93c3ab099c96 100644 --- a/pkgs/applications/terminal-emulators/roxterm/default.nix +++ b/pkgs/applications/terminal-emulators/roxterm/default.nix @@ -1,7 +1,7 @@ { at-spi2-core, cmake, dbus, dbus-glib, docbook_xsl, epoxy, fetchpatch, fetchFromGitHub , glib, gtk3, harfbuzz, libXdmcp, libXtst, libpthreadstubs , libselinux, libsepol, libtasn1, libxkbcommon, libxslt, p11-kit, pcre2 -, pkgconfig, stdenv, util-linuxMinimal, vte, wrapGAppsHook, xmlto +, pkgconfig, lib, stdenv, util-linuxMinimal, vte, wrapGAppsHook, xmlto }: stdenv.mkDerivation rec { @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { libsepol libxkbcommon epoxy at-spi2-core libXtst libtasn1 p11-kit ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/realh/roxterm"; license = licenses.gpl3; description = "Tabbed, VTE-based terminal emulator"; diff --git a/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-autocomplete-all-the-things/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-autocomplete-all-the-things/default.nix index a4e03fa347f0..6217bc0659a2 100644 --- a/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-autocomplete-all-the-things/default.nix +++ b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-autocomplete-all-the-things/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "urxvt-autocomplete-all-the-things"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { cp autocomplete-ALL-the-things $out/lib/urxvt/perl ''; - meta = with stdenv.lib; { + meta = with lib; { description = "urxvt plugin allowing user to easily complete arbitrary text"; homepage = "https://github.com/Vifon/autocomplete-ALL-the-things"; license = licenses.gpl3; diff --git a/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-font-size/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-font-size/default.nix index f81709b97390..beecb3e278d5 100644 --- a/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-font-size/default.nix +++ b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-font-size/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, xrdb, xlsfonts }: +{ lib, stdenv, fetchFromGitHub, xrdb, xlsfonts }: stdenv.mkDerivation { name = "urxvt-font-size-2015-05-22"; @@ -20,7 +20,7 @@ stdenv.mkDerivation { cp font-size $out/lib/urxvt/perl ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Change the urxvt font size on the fly"; homepage = "https://github.com/majutsushi/urxvt-font-size"; license = licenses.mit; diff --git a/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-perl/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-perl/default.nix index 0c95acd72057..b9c72c97d6de 100644 --- a/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-perl/default.nix +++ b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-perl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, wmctrl }: +{ lib, stdenv, fetchFromGitHub, wmctrl }: stdenv.mkDerivation { name = "urxvt-perl-2015-01-16"; @@ -19,7 +19,7 @@ stdenv.mkDerivation { cp newterm $out/lib/urxvt/perl ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Perl extensions for the rxvt-unicode terminal emulator"; homepage = "https://github.com/effigies/urxvt-perl"; license = licenses.gpl3; diff --git a/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-perls/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-perls/default.nix index 53bb938c3330..33bf75c841bf 100644 --- a/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-perls/default.nix +++ b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-perls/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "urxvt-perls"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { $out/lib/urxvt/perl ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Perl extensions for the rxvt-unicode terminal emulator"; homepage = "https://github.com/muennich/urxvt-perls"; license = licenses.gpl2; diff --git a/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-resize-font/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-resize-font/default.nix index a056e603f004..95b369b70f99 100644 --- a/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-resize-font/default.nix +++ b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-resize-font/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation { pname = "urxvt-resize-font"; @@ -17,7 +17,7 @@ stdenv.mkDerivation { cp resize-font $out/lib/urxvt/perl ''; - meta = with stdenv.lib; { + meta = with lib; { description = "URxvt Perl extension for resizing the font"; homepage = "https://github.com/simmel/urxvt-resize-font"; license = licenses.mit; diff --git a/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-tabbedex/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-tabbedex/default.nix index 71a55f9293c6..4fc32f55e070 100644 --- a/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-tabbedex/default.nix +++ b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-tabbedex/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, perl }: +{ lib, stdenv, fetchFromGitHub, perl }: stdenv.mkDerivation rec { pname = "urxvt-tabbedex"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { installFlags = [ "PREFIX=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Tabbed plugin for rxvt-unicode with many enhancements (mina86's fork)"; homepage = "https://github.com/mina86/urxvt-tabbedex"; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-theme-switch/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-theme-switch/default.nix index 5a84a9b472a5..303555db7224 100644 --- a/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-theme-switch/default.nix +++ b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-theme-switch/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { rev = "cfcbcc3dd5a5b09a3fec0f6a1fea95f4a36a48c4"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { cp color-themes $out/lib/urxvt/perl ''; - meta = with stdenv.lib; { + meta = with lib; { description = "urxvt plugin that allows to switch color themes during runtime"; homepage = "https://github.com/felixr/urxvt-theme-switch"; license = "CCBYNC"; diff --git a/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-vtwheel/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-vtwheel/default.nix index eb520f38bedb..446126aad748 100644 --- a/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-vtwheel/default.nix +++ b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-vtwheel/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, perl }: +{ lib, stdenv, fetchgit, perl }: stdenv.mkDerivation { @@ -16,7 +16,7 @@ stdenv.mkDerivation { cp vtwheel $out/lib/urxvt/perl ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Pass mouse wheel commands to secondary screens (screen, less, nano, etc)"; homepage = "https://aur.archlinux.org/packages/urxvt-vtwheel"; license = licenses.mit; diff --git a/pkgs/applications/terminal-emulators/rxvt/default.nix b/pkgs/applications/terminal-emulators/rxvt/default.nix index c71973da13be..2c89940f7606 100644 --- a/pkgs/applications/terminal-emulators/rxvt/default.nix +++ b/pkgs/applications/terminal-emulators/rxvt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , pkgconfig, libtool , libX11, libXt, libXpm }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { LIBTOOL=${libtool}/bin/libtool ./configure --prefix=$out --enable-everything --enable-smart-resize --enable-256-color ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://rxvt.sourceforge.net/"; description = "Colour vt102 terminal emulator with less features and lower memory consumption"; longDescription = '' diff --git a/pkgs/applications/terminal-emulators/sakura/default.nix b/pkgs/applications/terminal-emulators/sakura/default.nix index 7cccec3b72fc..6aa1c4b44df4 100644 --- a/pkgs/applications/terminal-emulators/sakura/default.nix +++ b/pkgs/applications/terminal-emulators/sakura/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , cmake , pkgconfig @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { --suffix XDG_DATA_DIRS : ${gtk3}/share/gsettings-schemas/${gtk3.name}/ ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.pleyades.net/david/projects/sakura"; description = "A terminal emulator based on GTK and VTE"; longDescription = '' diff --git a/pkgs/applications/terminal-emulators/stupidterm/default.nix b/pkgs/applications/terminal-emulators/stupidterm/default.nix index 2016059d81e7..0d8c39a45f54 100644 --- a/pkgs/applications/terminal-emulators/stupidterm/default.nix +++ b/pkgs/applications/terminal-emulators/stupidterm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, vte, gtk, pcre2 }: +{ lib, stdenv, fetchFromGitHub, pkgconfig, vte, gtk, pcre2 }: stdenv.mkDerivation { pname = "stupidterm"; @@ -26,7 +26,7 @@ stdenv.mkDerivation { --replace "Exec=st" "Exec=$out/bin/stupidterm" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Simple wrapper around the VTE terminal emulator widget for GTK"; homepage = "https://github.com/esmil/stupidterm"; license = licenses.lgpl3Plus; diff --git a/pkgs/applications/terminal-emulators/terminator/default.nix b/pkgs/applications/terminal-emulators/terminator/default.nix index 5de8109e3a4d..80698c56cde7 100644 --- a/pkgs/applications/terminal-emulators/terminator/default.nix +++ b/pkgs/applications/terminal-emulators/terminator/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , python3 , keybinder3 @@ -61,7 +61,7 @@ python3.pkgs.buildPythonApplication rec { runHook postCheck ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Terminal emulator with support for tiling and tabs"; longDescription = '' The goal of this project is to produce a useful tool for arranging diff --git a/pkgs/applications/terminal-emulators/termite/default.nix b/pkgs/applications/terminal-emulators/termite/default.nix index 2f991ca1c7e6..20d1ad675a87 100644 --- a/pkgs/applications/terminal-emulators/termite/default.nix +++ b/pkgs/applications/terminal-emulators/termite/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, vte, gtk3, ncurses, pcre2, wrapGAppsHook }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, pkgconfig, vte, gtk3, ncurses, pcre2, wrapGAppsHook }: let @@ -67,7 +67,7 @@ in stdenv.mkDerivation rec { echo "$terminfo" >> $out/nix-support/propagated-user-env-packages ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A simple VTE-based terminal"; license = licenses.lgpl2Plus; homepage = "https://github.com/thestinger/termite/"; diff --git a/pkgs/applications/terminal-emulators/tilda/default.nix b/pkgs/applications/terminal-emulators/tilda/default.nix index 0a672b039f6b..1ea50cfff7a1 100644 --- a/pkgs/applications/terminal-emulators/tilda/default.nix +++ b/pkgs/applications/terminal-emulators/tilda/default.nix @@ -1,23 +1,35 @@ -{ stdenv, fetchFromGitHub, pkgconfig -, autoreconfHook, gettext, expat, pcre2 -, libconfuse, vte, gtk -, makeWrapper }: +{ lib, stdenv +, fetchFromGitHub +, autoreconfHook +, pkg-config +, expat +, gettext +, gtk +, libconfuse +, pcre2 +, vte +, makeWrapper +}: -with stdenv.lib; stdenv.mkDerivation rec { - pname = "tilda"; - version = "1.5.2"; + version = "1.5.4"; src = fetchFromGitHub { owner = "lanoxx"; repo = "tilda"; rev = "${pname}-${version}"; - sha256 = "0psq0f4s0s92bba6wwcf6b0j7i59b76svqxhvpavwv53yvhmmamn"; + sha256 = "sha256-uDx28jmjNUyzJbgTJiHbjI9U5mYb9bnfl/9AjbxNUWA="; }; - nativeBuildInputs = [ autoreconfHook makeWrapper pkgconfig ]; - buildInputs = [ gettext pcre2 libconfuse vte gtk ]; + nativeBuildInputs = [ autoreconfHook makeWrapper pkg-config ]; + buildInputs = [ + gettext + gtk + libconfuse + pcre2 + vte + ]; LD_LIBRARY_PATH = "${expat.out}/lib"; # ugly hack for xgettext to work during build @@ -30,10 +42,10 @@ stdenv.mkDerivation rec { --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" ''; - meta = { + meta = with lib; { description = "A Gtk based drop down terminal for Linux and Unix"; homepage = "https://github.com/lanoxx/tilda/"; - license = licenses.gpl3; + license = licenses.gpl3Plus; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.linux; }; diff --git a/pkgs/applications/terminal-emulators/tilix/default.nix b/pkgs/applications/terminal-emulators/tilix/default.nix index 4707685e3dab..ee9eac8e2675 100644 --- a/pkgs/applications/terminal-emulators/tilix/default.nix +++ b/pkgs/applications/terminal-emulators/tilix/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , fetchpatch , meson @@ -64,7 +64,7 @@ stdenv.mkDerivation { --replace "Exec=tilix" "Exec=$out/bin/tilix" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Tiling terminal emulator following the Gnome Human Interface Guidelines"; homepage = "https://gnunn1.github.io/tilix-web"; license = licenses.mpl20; diff --git a/pkgs/applications/terminal-emulators/wezterm/default.nix b/pkgs/applications/terminal-emulators/wezterm/default.nix index 35b2500c7c97..a30afa1ce68a 100644 --- a/pkgs/applications/terminal-emulators/wezterm/default.nix +++ b/pkgs/applications/terminal-emulators/wezterm/default.nix @@ -1,4 +1,5 @@ -{ rustPlatform +{ stdenv +, rustPlatform , lib , fetchFromGitHub @@ -8,6 +9,11 @@ , openssl , perl +# Apple frameworks +, CoreGraphics +, Cocoa +, Foundation + , dbus , libX11 , xcbutil @@ -25,6 +31,10 @@ }: let runtimeDeps = [ + zlib + fontconfig + freetype + ] ++ stdenv.lib.optionals (stdenv.isLinux) [ libX11 xcbutil libxcb @@ -33,13 +43,14 @@ let libxkbcommon dbus libglvnd - zlib egl-wayland wayland libGLU libGL - fontconfig - freetype + ] ++ stdenv.lib.optionals (stdenv.isDarwin) [ + Foundation + CoreGraphics + Cocoa ]; pname = "wezterm"; in @@ -67,10 +78,21 @@ rustPlatform.buildRustPackage { buildInputs = runtimeDeps; installPhase = '' + '' + stdenv.lib.optionalString stdenv.isLinux '' for artifact in wezterm wezterm-gui wezterm-mux-server strip-ansi-escapes; do patchelf --set-rpath "${lib.makeLibraryPath runtimeDeps}" $releaseDir/$artifact install -D $releaseDir/$artifact -t $out/bin done + '' + stdenv.lib.optionalString stdenv.isDarwin '' + mkdir -p "$out/Applications" + OUT_APP="$out/Applications/WezTerm.app" + cp -r assets/macos/WezTerm.app "$OUT_APP" + rm $OUT_APP/*.dylib + cp -r assets/shell-integration/* "$OUT_APP" + cp $releaseDir/wezterm "$OUT_APP" + cp $releaseDir/wezterm-mux-server "$OUT_APP" + cp $releaseDir/wezterm-gui "$OUT_APP" + cp $releaseDir/strip-ansi-escapes "$OUT_APP" ''; # prevent further changes to the RPATH diff --git a/pkgs/applications/terminal-emulators/x3270/default.nix b/pkgs/applications/terminal-emulators/x3270/default.nix index 747d26538764..7bc4941caf19 100644 --- a/pkgs/applications/terminal-emulators/x3270/default.nix +++ b/pkgs/applications/terminal-emulators/x3270/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl, m4, expat +{ lib, stdenv, fetchurl, openssl, m4, expat , libX11, libXt, libXaw, libXmu, bdftopcf, mkfontdir , fontadobe100dpi, fontadobeutopia100dpi, fontbh100dpi , fontbhlucidatypewriter100dpi, fontbitstream100dpi @@ -35,7 +35,7 @@ in stdenv.mkDerivation rec { expat ]; - meta = with stdenv.lib; { + meta = with lib; { description = "IBM 3270 terminal emulator for the X Window System"; homepage = "http://x3270.bgp.nu/index.html"; license = licenses.bsd3; diff --git a/pkgs/applications/version-management/bcompare/default.nix b/pkgs/applications/version-management/bcompare/default.nix index 5da3aee5d7b6..61ea5a9ddd4d 100644 --- a/pkgs/applications/version-management/bcompare/default.nix +++ b/pkgs/applications/version-management/bcompare/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { dontBuild = true; dontConfigure = true; - meta = with stdenv.lib; { + meta = with lib; { description = "GUI application that allows to quickly and easily compare files and folders"; longDescription = '' Beyond Compare is focused. Beyond Compare allows you to quickly and easily compare your files and folders. diff --git a/pkgs/applications/version-management/blackbox/default.nix b/pkgs/applications/version-management/blackbox/default.nix index 8c28a6789624..aee0e92e8064 100644 --- a/pkgs/applications/version-management/blackbox/default.nix +++ b/pkgs/applications/version-management/blackbox/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { version = "1.20181219"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { mkdir -p $out/bin && cp -r bin/* $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Safely store secrets in a VCS repo"; maintainers = with maintainers; [ ericsagnes ]; license = licenses.mit; diff --git a/pkgs/applications/version-management/cvs/default.nix b/pkgs/applications/version-management/cvs/default.nix index 07a6b7c993c8..273433298fa1 100644 --- a/pkgs/applications/version-management/cvs/default.nix +++ b/pkgs/applications/version-management/cvs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, nano }: +{ lib, stdenv, fetchurl, fetchpatch, nano }: stdenv.mkDerivation { name = "cvs-1.12.13"; @@ -32,7 +32,7 @@ stdenv.mkDerivation { doCheck = false; # fails 1 of 1 tests - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://cvs.nongnu.org"; description = "Concurrent Versions System - a source control system"; license = licenses.gpl2; # library is GPLv2, main is GPLv1 diff --git a/pkgs/applications/version-management/dvc/default.nix b/pkgs/applications/version-management/dvc/default.nix index b9ac8b139cbb..ac1659cccf8b 100644 --- a/pkgs/applications/version-management/dvc/default.nix +++ b/pkgs/applications/version-management/dvc/default.nix @@ -41,7 +41,7 @@ buildPythonApplication rec { distro appdirs ] - ++ lib.optional enableGoogle google_cloud_storage + ++ lib.optional enableGoogle google-cloud-storage ++ lib.optional enableAWS boto3 ++ lib.optional enableAzure azure-storage-blob ++ lib.optional enableSSH paramiko; diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix index 6d39ae0931cd..d68535e0a4c2 100644 --- a/pkgs/applications/version-management/fossil/default.nix +++ b/pkgs/applications/version-management/fossil/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , installShellFiles , tcl , libiconv @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { installShellCompletion --name fossil.bash tools/fossil-autocomplete.bash ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Simple, high-reliability, distributed software configuration management"; longDescription = '' Fossil is a software configuration management system. Fossil is diff --git a/pkgs/applications/version-management/gerrit/default.nix b/pkgs/applications/version-management/gerrit/default.nix index 5b4808e87a6b..2c5ddca5090f 100644 --- a/pkgs/applications/version-management/gerrit/default.nix +++ b/pkgs/applications/version-management/gerrit/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "gerrit"; - version = "3.2.3"; + version = "3.3.1"; src = fetchurl { url = "https://gerrit-releases.storage.googleapis.com/gerrit-${version}.war"; - sha256 = "0hdxbn5qqqjzpqfcydz33nc351zanxp0j2k0ivizx4dn40fnavd7"; + sha256 = "0swj3lmxwh4a0gnkirqrh7znzizsizy3cnlinhhsi319qns2szb1"; }; buildCommand = '' @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ]; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.gerritcodereview.com/index.md"; license = licenses.asl20; description = "A web based code review and repository management for the git version control system"; diff --git a/pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix b/pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix index 99c6323217ab..1ffc06536750 100644 --- a/pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix +++ b/pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jre, makeWrapper }: +{ lib, stdenv, fetchurl, jre, makeWrapper }: let version = "1.13.0"; @@ -26,7 +26,7 @@ in makeWrapper "${jre}/bin/java" $out/bin/bfg --add-flags "-cp $out/share/java/$jarName com.madgag.git.bfg.cli.Main" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://rtyley.github.io/bfg-repo-cleaner/"; # Descriptions taken with minor modification from the homepage of bfg-repo-cleaner description = "Removes large or troublesome blobs in a git repository like git-filter-branch does, but faster"; diff --git a/pkgs/applications/version-management/git-and-tools/bump2version/default.nix b/pkgs/applications/version-management/git-and-tools/bump2version/default.nix index eb44f6d412b5..393edc57dcc8 100644 --- a/pkgs/applications/version-management/git-and-tools/bump2version/default.nix +++ b/pkgs/applications/version-management/git-and-tools/bump2version/default.nix @@ -18,7 +18,7 @@ buildPythonApplication rec { pytest tests/ -k 'not usage_string_fork' ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Version-bump your software with a single command"; longDescription = '' A small command line tool to simplify releasing software by updating diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 46b27e95c798..2b0efdf69046 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -172,6 +172,8 @@ let inherit (darwin.apple_sdk.frameworks) Security; }; + git-when-merged = callPackage ./git-when-merged { }; + git-workspace = callPackage ./git-workspace { inherit (darwin.apple_sdk.frameworks) Security; }; diff --git a/pkgs/applications/version-management/git-and-tools/delta/default.nix b/pkgs/applications/version-management/git-and-tools/delta/default.nix index 0fa30651170a..465de2d1d2be 100644 --- a/pkgs/applications/version-management/git-and-tools/delta/default.nix +++ b/pkgs/applications/version-management/git-and-tools/delta/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "delta"; - version = "0.4.5"; + version = "0.5.1"; src = fetchFromGitHub { owner = "dandavison"; repo = pname; rev = version; - sha256 = "0rh902h76pn7ja5zizlfklmwcyyki4b0v4irw1j40cjjnah75ljp"; + sha256 = "17cmwkha25hwsvnjcp388zd9kwacfq7adjp0sjw59y0vyr1maf22"; }; - cargoSha256 = "1rniihx1rb18n2bp4b2yhn4ayih5cbcyqmiv6jckas7jwrgk6wra"; + cargoSha256 = "1bji818cmkl0286a4qcnfiwibnqd5q5fvzmzgk5cabrdwaag2ia5"; nativeBuildInputs = [ installShellFiles ]; @@ -34,6 +34,6 @@ rustPlatform.buildRustPackage rec { description = "A syntax-highlighting pager for git"; changelog = "https://github.com/dandavison/delta/releases/tag/${version}"; license = licenses.mit; - maintainers = with maintainers; [ marsam ma27 zowoq ]; + maintainers = with maintainers; [ marsam zowoq ]; }; } diff --git a/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix b/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix index ffdb788745a7..42ebe89cd4aa 100644 --- a/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix +++ b/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix @@ -1,4 +1,4 @@ -{stdenv, git, perl, ncurses, coreutils, fetchFromGitHub, makeWrapper, ...}: +{lib, stdenv, git, perl, ncurses, coreutils, fetchFromGitHub, makeWrapper, ...}: stdenv.mkDerivation rec { pname = "diff-so-fancy"; @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/so-fancy/diff-so-fancy"; description = "Good-looking diffs filter for git"; license = licenses.mit; 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 80f048d05752..5aea15769c0b 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,4 +1,4 @@ -{stdenv, fetchFromGitHub, git, mercurial, makeWrapper}: +{lib, stdenv, fetchFromGitHub, git, mercurial, makeWrapper}: stdenv.mkDerivation rec { pname = "fast-export"; @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { popd ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Import mercurial into git"; homepage = "https://repo.or.cz/w/fast-export.git"; license = licenses.gpl2; diff --git a/pkgs/applications/version-management/git-and-tools/ghorg/default.nix b/pkgs/applications/version-management/git-and-tools/ghorg/default.nix index 30049e845877..f7ce118bbc7c 100644 --- a/pkgs/applications/version-management/git-and-tools/ghorg/default.nix +++ b/pkgs/applications/version-management/git-and-tools/ghorg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "ghorg"; @@ -18,7 +18,7 @@ buildGoModule rec { buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Quickly clone an entire org/users repositories into one directory"; longDescription = '' ghorg allows you to quickly clone all of an orgs, or users repos into a diff --git a/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix b/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix index d8e34f570058..c4824b6c66f1 100644 --- a/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform, installShellFiles, libiconv, Security }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, installShellFiles, libiconv, Security }: rustPlatform.buildRustPackage rec { pname = "git-absorb"; @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/tummychow/git-absorb"; description = "git commit --fixup, but automatic"; license = [ licenses.bsd3 ]; diff --git a/pkgs/applications/version-management/git-and-tools/git-annex-metadata-gui/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex-metadata-gui/default.nix index cb0103df227a..1908b7539243 100644 --- a/pkgs/applications/version-management/git-and-tools/git-annex-metadata-gui/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-annex-metadata-gui/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonApplication, fetchFromGitHub, pyqt5, qt5, git-annex-adapter }: +{ lib, stdenv, buildPythonApplication, fetchFromGitHub, pyqt5, qt5, git-annex-adapter }: buildPythonApplication rec { pname = "git-annex-metadata-gui"; @@ -23,7 +23,7 @@ buildPythonApplication rec { propagatedBuildInputs = [ pyqt5 git-annex-adapter ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/alpernebbi/git-annex-metadata-gui"; description = "Graphical interface for git-annex metadata commands"; maintainers = with maintainers; [ dotlambda ]; diff --git a/pkgs/applications/version-management/git-and-tools/git-annex-remote-rclone/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex-remote-rclone/default.nix index 260e8024a8cc..ea44d7278f37 100644 --- a/pkgs/applications/version-management/git-and-tools/git-annex-remote-rclone/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-annex-remote-rclone/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rclone, makeWrapper }: +{ lib, stdenv, fetchFromGitHub, rclone, makeWrapper }: stdenv.mkDerivation rec { pname = "git-annex-remote-rclone"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { --prefix PATH ":" "${stdenv.lib.makeBinPath [ rclone ]}" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/DanielDent/git-annex-remote-rclone"; description = "Use rclone supported cloud storage providers with git-annex"; license = licenses.gpl3; diff --git a/pkgs/applications/version-management/git-and-tools/git-bug/default.nix b/pkgs/applications/version-management/git-and-tools/git-bug/default.nix index 7c345639e9f8..9ca5c707b5ce 100644 --- a/pkgs/applications/version-management/git-and-tools/git-bug/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-bug/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "git-bug"; @@ -29,7 +29,7 @@ buildGoModule rec { install -D -m 0644 -t "$out/share/man/man1" doc/man/* ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Distributed bug tracker embedded in Git"; homepage = "https://github.com/MichaelMure/git-bug"; license = licenses.gpl3; diff --git a/pkgs/applications/version-management/git-and-tools/git-bz/default.nix b/pkgs/applications/version-management/git-and-tools/git-bz/default.nix index 7f199894924e..20e6a993cab2 100644 --- a/pkgs/applications/version-management/git-and-tools/git-bz/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-bz/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit +{ lib, stdenv, fetchgit , asciidoc, docbook_xml_dtd_45, docbook_xsl, libxslt, makeWrapper, xmlto , pythonPackages }: @@ -31,7 +31,7 @@ stdenv.mkDerivation { --prefix PYTHONPATH : "$(toPythonPath "${pythonPackages.pysqlite}")" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Bugzilla integration for git"; longDescription = '' git-bz is a tool for integrating the Git command line with the diff --git a/pkgs/applications/version-management/git-and-tools/git-cola/default.nix b/pkgs/applications/version-management/git-and-tools/git-cola/default.nix index fa77b5307a37..e7e0e009d112 100644 --- a/pkgs/applications/version-management/git-and-tools/git-cola/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-cola/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python3Packages, gettext, git, qt5 }: +{ lib, stdenv, fetchFromGitHub, python3Packages, gettext, git, qt5 }: let inherit (python3Packages) buildPythonApplication pyqt5 sip pyinotify; @@ -26,7 +26,7 @@ in buildPythonApplication rec { ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/git-cola/git-cola"; description = "A sleek and powerful Git GUI"; license = licenses.gpl2; diff --git a/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix b/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix index 487f9b9625f4..08875dabd0fe 100644 --- a/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, git, gnupg, makeWrapper, openssl, stdenv +{ fetchFromGitHub, git, gnupg, makeWrapper, openssl, lib, stdenv , libxslt, docbook_xsl }: @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/git-crypt --prefix PATH : $out/bin:${git}/bin:${gnupg}/bin ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.agwa.name/projects/git-crypt"; description = "Transparent file encryption in git"; longDescription = '' diff --git a/pkgs/applications/version-management/git-and-tools/git-dit/default.nix b/pkgs/applications/version-management/git-and-tools/git-dit/default.nix index 9ec4e2530424..e41a8b3a5258 100644 --- a/pkgs/applications/version-management/git-and-tools/git-dit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-dit/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , openssl_1_0_2 , zlib @@ -45,7 +45,7 @@ buildRustPackage rec { Security ]; - meta = with stdenv.lib; { + meta = with lib; { inherit (src.meta) homepage; description = "Decentralized Issue Tracking for git"; # This has not had a release in years and its cargo vendored dependencies diff --git a/pkgs/applications/version-management/git-and-tools/git-extras/default.nix b/pkgs/applications/version-management/git-and-tools/git-extras/default.nix index d322a141cd94..3f6ea7972bac 100644 --- a/pkgs/applications/version-management/git-and-tools/git-extras/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-extras/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, unixtools, which }: +{ lib, stdenv, fetchzip, unixtools, which }: stdenv.mkDerivation rec { pname = "git-extras"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { install -D etc/git-extras-completion.zsh $out/share/zsh/site-functions/_git_extras ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/tj/git-extras"; description = "GIT utilities -- repo summary, repl, changelog population, author commit percentages and more"; license = licenses.mit; diff --git a/pkgs/applications/version-management/git-and-tools/git-fame/default.nix b/pkgs/applications/version-management/git-and-tools/git-fame/default.nix index 782579c70446..6084d496a565 100644 --- a/pkgs/applications/version-management/git-and-tools/git-fame/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-fame/default.nix @@ -1,4 +1,4 @@ -{ stdenv, bundlerEnv, ruby, bundlerUpdateScript }: +{ lib, stdenv, bundlerEnv, ruby, bundlerUpdateScript }: bundlerEnv { inherit ruby; @@ -9,7 +9,7 @@ bundlerEnv { passthru.updateScript = bundlerUpdateScript "gitAndTools.git-fame"; - meta = with stdenv.lib; { + meta = with lib; { description = '' A command-line tool that helps you summarize and pretty-print collaborators based on contributions ''; diff --git a/pkgs/applications/version-management/git-and-tools/git-filter-repo/default.nix b/pkgs/applications/version-management/git-and-tools/git-filter-repo/default.nix index c642f062c7b6..864ef51a5881 100644 --- a/pkgs/applications/version-management/git-and-tools/git-filter-repo/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-filter-repo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pythonPackages }: +{ lib, stdenv, fetchurl, pythonPackages }: stdenv.mkDerivation rec { pname = "git-filter-repo"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { install -Dm644 -t $out/share/man/man1 Documentation/man1/git-filter-repo.1 ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/newren/git-filter-repo"; description = "Quickly rewrite git repository history (filter-branch replacement)"; license = licenses.mit; diff --git a/pkgs/applications/version-management/git-and-tools/git-gone/default.nix b/pkgs/applications/version-management/git-and-tools/git-gone/default.nix index 13411ed4c41b..f08f57ee8bee 100644 --- a/pkgs/applications/version-management/git-and-tools/git-gone/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-gone/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform, pkgconfig, makeWrapper, openssl, git, libiconv, Security, installShellFiles }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, pkgconfig, makeWrapper, openssl, git, libiconv, Security, installShellFiles }: rustPlatform.buildRustPackage rec { pname = "git-gone"; @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { wrapProgram $out/bin/git-gone --prefix PATH : "${stdenv.lib.makeBinPath [ git ]}" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Cleanup stale Git branches of pull requests"; homepage = "https://github.com/lunaryorn/git-gone"; license = licenses.asl20; diff --git a/pkgs/applications/version-management/git-and-tools/git-hub/default.nix b/pkgs/applications/version-management/git-and-tools/git-hub/default.nix index 33b3d0bc167c..ac3de7cbc9ec 100644 --- a/pkgs/applications/version-management/git-and-tools/git-hub/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-hub/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gitMinimal, python2Packages }: +{ lib, stdenv, fetchFromGitHub, gitMinimal, python2Packages }: stdenv.mkDerivation rec { pname = "git-hub"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { rm -r $out/share/{doc,vim} ''; - meta = with stdenv.lib; { + meta = with lib; { inherit (src.meta) homepage; description = "Git command line interface to GitHub"; longDescription = '' diff --git a/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix b/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix index a2f319d82b0d..4ef97a30a1f5 100644 --- a/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, installShellFiles, rustPlatform, pkgconfig, openssl, darwin }: +{ lib, stdenv, fetchFromGitHub, installShellFiles, rustPlatform, pkgconfig, openssl, darwin }: with rustPlatform; @@ -26,7 +26,7 @@ buildRustPackage rec { installManPage $releaseDir/build/git-ignore-*/out/git-ignore.1 ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Quickly and easily fetch .gitignore templates from gitignore.io"; homepage = "https://github.com/sondr3/git-ignore"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix b/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix index 1edd48f92f15..2b76fb3dea50 100644 --- a/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix @@ -1,4 +1,4 @@ -{ stdenv, ncurses5, fetchFromGitHub, rustPlatform, libiconv, Security }: +{ lib, stdenv, ncurses5, fetchFromGitHub, rustPlatform, libiconv, Security }: rustPlatform.buildRustPackage rec { pname = "git-interactive-rebase-tool"; @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { cargoParallelTestThreads = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/MitMaro/git-interactive-rebase-tool"; description = "Native cross platform full feature terminal based sequence editor for git interactive rebase"; changelog = "https://github.com/MitMaro/git-interactive-rebase-tool/releases/tag/${version}"; diff --git a/pkgs/applications/version-management/git-and-tools/git-my/default.nix b/pkgs/applications/version-management/git-and-tools/git-my/default.nix index 2a8a262bf304..d8ce7a42bb59 100644 --- a/pkgs/applications/version-management/git-and-tools/git-my/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-my/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "git-my"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { install -Dm755 -t "$out"/bin ./git-my ''; - meta = with stdenv.lib; { + meta = with lib; { description = "List remote branches if they're merged and/or available locally"; homepage = "https://github.com/davidosomething/git-my"; diff --git a/pkgs/applications/version-management/git-and-tools/git-open/default.nix b/pkgs/applications/version-management/git-and-tools/git-open/default.nix index f7b2120cca02..ac28e5559503 100644 --- a/pkgs/applications/version-management/git-and-tools/git-open/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-open/default.nix @@ -1,4 +1,4 @@ -{stdenv, git, xdg_utils, gnugrep, fetchFromGitHub, makeWrapper}: +{lib, stdenv, git, xdg_utils, gnugrep, fetchFromGitHub, makeWrapper}: stdenv.mkDerivation rec { pname = "git-open"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { --prefix PATH : "${stdenv.lib.makeBinPath [ git xdg_utils gnugrep ]}" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/paulirish/git-open"; description = "Open the GitHub page or website for a repository in your browser"; license = licenses.mit; diff --git a/pkgs/applications/version-management/git-and-tools/git-radar/default.nix b/pkgs/applications/version-management/git-and-tools/git-radar/default.nix index fc4b5850f5c7..1cd14aa96927 100644 --- a/pkgs/applications/version-management/git-and-tools/git-radar/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-radar/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub}: +{lib, stdenv, fetchFromGitHub}: stdenv.mkDerivation rec { pname = "git-radar"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ln -s $out/git-radar $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/michaeldfallen/git-radar"; license = licenses.mit; description = "A tool you can add to your prompt to provide at-a-glance information on your git repo"; diff --git a/pkgs/applications/version-management/git-and-tools/git-recent/default.nix b/pkgs/applications/version-management/git-and-tools/git-recent/default.nix index a01b84a948ad..b3a371063f36 100644 --- a/pkgs/applications/version-management/git-and-tools/git-recent/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-recent/default.nix @@ -1,4 +1,4 @@ -{stdenv, git, less, fetchFromGitHub, makeWrapper +{lib, stdenv, git, less, fetchFromGitHub, makeWrapper # util-linuxMinimal is included because we need the column command , util-linux }: @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { --prefix PATH : "${stdenv.lib.makeBinPath [ git less util-linux ]}" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/paulirish/git-recent"; description = "See your latest local git branches, formatted real fancy"; license = licenses.mit; diff --git a/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix b/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix index 04787b0ce25b..16efc8cbca10 100644 --- a/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, docutils, makeWrapper +{ lib, stdenv, fetchFromGitHub, docutils, makeWrapper , gnupg, curl, rsync, coreutils , gawk, gnused, gnugrep }: @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { gawk gnused gnugrep ]}" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://spwhitton.name/tech/code/git-remote-gcrypt"; description = "A git remote helper for GPG-encrypted remotes"; license = licenses.gpl3; diff --git a/pkgs/applications/version-management/git-and-tools/git-reparent/default.nix b/pkgs/applications/version-management/git-and-tools/git-reparent/default.nix index c0de46264d05..7bc4a05e53cf 100644 --- a/pkgs/applications/version-management/git-and-tools/git-reparent/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-reparent/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, makeWrapper, git, gnused }: +{ lib, stdenv, fetchFromGitHub, makeWrapper, git, gnused }: stdenv.mkDerivation rec { pname = "git-reparent"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/git-reparent --prefix PATH : "${stdenv.lib.makeBinPath [ git gnused ]}" ''; - meta = with stdenv.lib; { + meta = with lib; { inherit (src.meta) homepage; description = "Git command to recommit HEAD with a new set of parents"; maintainers = [ maintainers.marsam ]; diff --git a/pkgs/applications/version-management/git-and-tools/git-secrets/default.nix b/pkgs/applications/version-management/git-and-tools/git-secrets/default.nix index 1beff2a118df..90c2b8842263 100644 --- a/pkgs/applications/version-management/git-and-tools/git-secrets/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-secrets/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, makeWrapper, git, coreutils }: +{ lib, stdenv, fetchFromGitHub, makeWrapper, git, coreutils }: stdenv.mkDerivation rec { pname = "git-secrets"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { --prefix PATH : "${stdenv.lib.makeBinPath [ git coreutils ]}" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Prevents you from committing secrets and credentials into git repositories"; homepage = "https://github.com/awslabs/git-secrets"; license = licenses.asl20; diff --git a/pkgs/applications/version-management/git-and-tools/git-standup/default.nix b/pkgs/applications/version-management/git-and-tools/git-standup/default.nix index ceb734f0f67f..541baee50a7f 100644 --- a/pkgs/applications/version-management/git-and-tools/git-standup/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-standup/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, makeWrapper, git }: +{ lib, stdenv, fetchFromGitHub, makeWrapper, git }: stdenv.mkDerivation rec { pname = "git-standup"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { --prefix PATH : "${stdenv.lib.makeBinPath [ git ]}" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Recall what you did on the last working day"; homepage = "https://github.com/kamranahmedse/git-standup"; license = licenses.mit; diff --git a/pkgs/applications/version-management/git-and-tools/git-subrepo/default.nix b/pkgs/applications/version-management/git-and-tools/git-subrepo/default.nix index 708014e4af8d..7fe9883c556d 100644 --- a/pkgs/applications/version-management/git-and-tools/git-subrepo/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-subrepo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, git, makeWrapper, which }: +{ lib, stdenv, fetchFromGitHub, git, makeWrapper, which }: stdenv.mkDerivation rec { pname = "git-subrepo"; @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { --prefix PATH : "${git}/bin" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/ingydotnet/git-subrepo"; description = "Git submodule alternative"; license = licenses.mit; diff --git a/pkgs/applications/version-management/git-and-tools/git-subset/default.nix b/pkgs/applications/version-management/git-and-tools/git-subset/default.nix index 9893e6dd7844..dd6902af243a 100644 --- a/pkgs/applications/version-management/git-and-tools/git-subset/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-subset/default.nix @@ -1,4 +1,4 @@ -{ stdenv, rustPlatform, fetchFromGitHub, pkg-config, openssl, curl, libiconv, Security }: +{ lib, stdenv, rustPlatform, fetchFromGitHub, pkg-config, openssl, curl, libiconv, Security }: rustPlatform.buildRustPackage rec { pname = "git-subset"; @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ curl libiconv Security ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Super fast Git tree filtering"; homepage = "https://github.com/jasonwhite/git-subset"; license = licenses.mit; diff --git a/pkgs/applications/version-management/git-and-tools/git-test/default.nix b/pkgs/applications/version-management/git-and-tools/git-test/default.nix index 27f9bcffa34e..de345f17cf01 100644 --- a/pkgs/applications/version-management/git-and-tools/git-test/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-test/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, makeWrapper, git }: +{ lib, stdenv, fetchFromGitHub, makeWrapper, git }: stdenv.mkDerivation rec { pname = "git-test"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { --prefix PATH : "${stdenv.lib.makeBinPath [ git ]}" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Test your commits"; homepage = "https://github.com/spotify/git-test"; license = licenses.asl20; diff --git a/pkgs/applications/version-management/git-and-tools/git-trim/default.nix b/pkgs/applications/version-management/git-and-tools/git-trim/default.nix index 33534334bea7..d827797b33a8 100644 --- a/pkgs/applications/version-management/git-and-tools/git-trim/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-trim/default.nix @@ -1,4 +1,4 @@ -{ stdenv, rustPlatform, fetchFromGitHub, pkg-config, openssl, libiconv, Security }: +{ lib, stdenv, rustPlatform, fetchFromGitHub, pkg-config, openssl, libiconv, Security }: rustPlatform.buildRustPackage rec { pname = "git-trim"; @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { # fails with sandbox doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Automatically trims your branches whose tracking remote refs are merged or gone"; homepage = "https://github.com/foriequal0/git-trim"; license = licenses.mit; diff --git a/pkgs/applications/version-management/git-and-tools/git-vanity-hash/default.nix b/pkgs/applications/version-management/git-and-tools/git-vanity-hash/default.nix index 839acc5cca59..77e077436169 100644 --- a/pkgs/applications/version-management/git-and-tools/git-vanity-hash/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-vanity-hash/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform }: +{ lib, stdenv, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { pname = "git-vanity-hash"; @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { cp README.md $out/share/doc/git-vanity-hash ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/prasmussen/git-vanity-hash"; description = "Tool for creating commit hashes with a specific prefix"; license = [ licenses.mit ]; diff --git a/pkgs/applications/version-management/git-and-tools/git-when-merged/default.nix b/pkgs/applications/version-management/git-and-tools/git-when-merged/default.nix new file mode 100644 index 000000000000..d020f351fedf --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/git-when-merged/default.nix @@ -0,0 +1,40 @@ +{ lib, stdenv, fetchFromGitHub, python3 }: + +stdenv.mkDerivation rec { + pname = "git-when-merged"; + version = "1.2.0"; + + src = fetchFromGitHub { + owner = "mhagger"; + repo = pname; + rev = "v${version}"; + sha256 = "0sw98gmsnd4iki9fx455jga9m80bxvvfgys8i1r2fc7d5whc2qa6"; + }; + + buildInputs = [ python3 ]; + + installPhase = '' + install -D --target-directory $out/bin/ bin/git-when-merged + ''; + + meta = with lib; { + description = + "Helps you figure out when and why a commit was merged into a branch"; + longDescription = '' + If you use standard Git workflows, then you create a feature + branch for each feature that you are working on. When the feature + is complete, you merge it into your master branch. You might even + have sub-feature branches that are merged into a feature branch + before the latter is merged. + + In such a workflow, the first-parent history of master consists + mainly of merges of feature branches into the mainline. git + when-merged can be used to ask, "When (and why) was commit C + merged into the current branch?" + ''; + homepage = "https://github.com/mhagger/git-when-merged"; + license = licenses.gpl2Only; + platforms = python3.meta.platforms; + maintainers = with maintainers; [ DamienCassou ]; + }; +} diff --git a/pkgs/applications/version-management/git-and-tools/git-workspace/default.nix b/pkgs/applications/version-management/git-and-tools/git-workspace/default.nix index 674bdd14247a..aa869c754dc1 100644 --- a/pkgs/applications/version-management/git-and-tools/git-workspace/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-workspace/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , rustPlatform , Security @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ openssl ] ++ stdenv.lib.optional stdenv.isDarwin Security; - meta = with stdenv.lib; { + meta = with lib; { description = "Sync personal and work git repositories from multiple providers"; homepage = "https://github.com/orf/git-workspace"; license = with licenses; [ mit ]; diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 57f6703762d1..8c7f323cbb66 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -23,7 +23,7 @@ assert sendEmailSupport -> perlSupport; assert svnSupport -> perlSupport; let - version = "2.29.2"; + version = "2.30.0"; svn = subversionClient.override { perlBindings = perlSupport; }; gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ]; @@ -35,7 +35,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "1h87yv117ypnc0yi86941089c14n91gixk8b6shj2y35prp47z7j"; + sha256 = "06ad6dylgla34k9am7d5z8y3rryc8ln3ibq5z0d74rcm20hm0wsm"; }; outputs = [ "out" ] ++ stdenv.lib.optional withManual "doc"; @@ -52,12 +52,6 @@ stdenv.mkDerivation { ./ssh-path.patch ./git-send-email-honor-PATH.patch ./installCheck-path.patch - (fetchpatch { - # https://github.com/git/git/pull/925 - name = "make-manual-reproducible.patch"; - url = "https://github.com/git/git/commit/7a68e9e0b8eda91eb576bbbc5ed66298f3ab761c.patch"; - sha256 = "02naws82pd3vvwrrgqn91kid8qkjihyjaz1ahgjz8qlmnn2avf5n"; - }) ]; postPatch = '' @@ -298,6 +292,7 @@ stdenv.mkDerivation { disable_test t0001-init shared disable_test t1301-shared-repo disable_test t5324-split-commit-graph 'split commit-graph respects core.sharedrepository' + disable_test t4129-apply-samemode 'do not use core.sharedRepository for working tree files' # Our patched gettext never fallbacks disable_test t0201-gettext-fallbacks diff --git a/pkgs/applications/version-management/git-and-tools/gita/default.nix b/pkgs/applications/version-management/git-and-tools/gita/default.nix index 3e07a93458b7..6f20e4a44c6f 100644 --- a/pkgs/applications/version-management/git-and-tools/gita/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gita/default.nix @@ -9,12 +9,12 @@ }: buildPythonApplication rec { - version = "0.10.10"; + version = "0.11.9"; pname = "gita"; src = fetchFromGitHub { - sha256 = "0k7hicncbrqvhmpq1w3v1309bqij6izw31xs8xcb8is85dvi754h"; - rev = "v${version}"; + sha256 = "9+zuLAx9lMfltsBqjvsivJ5wPnStPfq11XgGMv/JDpY="; + rev = version; repo = "gita"; owner = "nosarthur"; }; diff --git a/pkgs/applications/version-management/git-and-tools/gitbatch/default.nix b/pkgs/applications/version-management/git-and-tools/gitbatch/default.nix index 99a127f3d8f8..dc853be6772e 100644 --- a/pkgs/applications/version-management/git-and-tools/gitbatch/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gitbatch/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "gitbatch-unstable"; @@ -15,7 +15,7 @@ buildGoPackage rec { sha256 = "0613vfqdn3k0w7fm25rqnqdr67w9vii3i56dfslqcn1vqjfrff3q"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Running git UI commands"; homepage = "https://github.com/isacikgoz/gitbatch"; license = licenses.mit; diff --git a/pkgs/applications/version-management/git-and-tools/gitflow/default.nix b/pkgs/applications/version-management/git-and-tools/gitflow/default.nix index 1307573990a9..b9bca127472e 100644 --- a/pkgs/applications/version-management/git-and-tools/gitflow/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gitflow/default.nix @@ -1,4 +1,4 @@ -{ pkgs, stdenv, fetchFromGitHub }: +{ pkgs, lib, stdenv, fetchFromGitHub }: with pkgs.lib; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { --suffix PATH : ${pkgs.git}/bin ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/petervanderdoes/gitflow"; description = "Extend git with the Gitflow branching model"; longDescription = '' diff --git a/pkgs/applications/version-management/git-and-tools/gitin/default.nix b/pkgs/applications/version-management/git-and-tools/gitin/default.nix index af9aef6d39c6..c9111ea2c322 100644 --- a/pkgs/applications/version-management/git-and-tools/gitin/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gitin/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildGoPackage , fetchFromGitHub , pkgconfig @@ -23,7 +23,7 @@ buildGoPackage rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libgit2_0_27 ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/isacikgoz/gitin"; description = "Text-based user interface for git"; license = licenses.bsd3; diff --git a/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix b/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix index a6ca3126d5ce..f4b74405eba2 100644 --- a/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix @@ -1,4 +1,4 @@ -{ callPackage, stdenv, fetchFromGitHub, git, zsh, ...}: +{ callPackage, lib, stdenv, fetchFromGitHub, git, zsh, ...}: stdenv.mkDerivation rec { pname = "gitstatus"; @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { wait $! ''; - meta = with stdenv.lib; { + meta = with lib; { description = "10x faster implementation of `git status` command"; homepage = "https://github.com/romkatv/gitstatus"; license = licenses.gpl3Only; diff --git a/pkgs/applications/version-management/git-and-tools/gitui/default.nix b/pkgs/applications/version-management/git-and-tools/gitui/default.nix index f89349aaeaa5..20a446965f90 100644 --- a/pkgs/applications/version-management/git-and-tools/gitui/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gitui/default.nix @@ -1,4 +1,4 @@ -{ stdenv, rustPlatform, fetchFromGitHub, libiconv, perl, python3, Security, AppKit, openssl, xclip }: +{ lib, stdenv, rustPlatform, fetchFromGitHub, libiconv, perl, python3, Security, AppKit, openssl, xclip }: rustPlatform.buildRustPackage rec { pname = "gitui"; version = "0.11.0"; @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { ++ stdenv.lib.optional stdenv.isLinux xclip ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv Security AppKit ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Blazing fast terminal-ui for git written in rust"; homepage = "https://github.com/extrawurst/gitui"; license = licenses.mit; diff --git a/pkgs/applications/version-management/git-and-tools/grv/default.nix b/pkgs/applications/version-management/git-and-tools/grv/default.nix index 64a4f8a823ce..f7aae5ba8d27 100644 --- a/pkgs/applications/version-management/git-and-tools/grv/default.nix +++ b/pkgs/applications/version-management/git-and-tools/grv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, curl, ncurses, pkgconfig, readline +{ lib, stdenv, buildGoPackage, fetchFromGitHub, curl, ncurses, pkgconfig, readline , cmake }: let version = "0.3.2"; @@ -40,7 +40,7 @@ buildGoPackage { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "GRV is a terminal interface for viewing Git repositories"; homepage = "https://github.com/rgburke/grv"; license = licenses.gpl3; diff --git a/pkgs/applications/version-management/git-and-tools/hub/default.nix b/pkgs/applications/version-management/git-and-tools/hub/default.nix index be8136427971..4b189c55c8a8 100644 --- a/pkgs/applications/version-management/git-and-tools/hub/default.nix +++ b/pkgs/applications/version-management/git-and-tools/hub/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, groff, installShellFiles, util-linux }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub, git, groff, installShellFiles, util-linux, nixosTests }: buildGoPackage rec { pname = "hub"; @@ -20,6 +20,8 @@ buildGoPackage rec { postPatch = '' patchShebangs . + substituteInPlace git/git.go --replace "cmd.New(\"git\")" "cmd.New(\"${git}/bin/git\")" + substituteInPlace commands/args.go --replace "Executable: \"git\"" "Executable: \"${git}/bin/git\"" ''; postInstall = '' @@ -33,7 +35,9 @@ buildGoPackage rec { installManPage share/man/man[1-9]/*.[1-9] ''; - meta = with stdenv.lib; { + passthru.tests = { inherit (nixosTests) hub; }; + + meta = with lib; { description = "Command-line wrapper for git that makes you better at GitHub"; license = licenses.mit; homepage = "https://hub.github.com/"; diff --git a/pkgs/applications/version-management/git-and-tools/lab/default.nix b/pkgs/applications/version-management/git-and-tools/lab/default.nix index 3459f5099c97..437529cd73ad 100644 --- a/pkgs/applications/version-management/git-and-tools/lab/default.nix +++ b/pkgs/applications/version-management/git-and-tools/lab/default.nix @@ -1,32 +1,32 @@ -{ lib, buildGoModule, fetchFromGitHub, makeWrapper, xdg_utils }: +{ lib, buildGoModule, fetchFromGitHub, makeWrapper, xdg_utils, installShellFiles, git }: buildGoModule rec { pname = "lab"; - version = "0.17.2"; + version = "0.18.0"; src = fetchFromGitHub { owner = "zaquestion"; repo = "lab"; rev = "v${version}"; - sha256 = "0zkwvmzgj7h8lc8jkg2a81392b28c8hkwqzj6dds6q4asbmymx5c"; + sha256 = "1vl5ylix4h6z1vrdslv9qphgb6yqpqd4r54jzk5kd6zgrnf9c2zc"; }; subPackages = [ "." ]; - vendorSha256 = "1lrmafvv5zfn9kc0p8g5vdz351n1zbaqwhwk861fxys0rdpqskyc"; + vendorSha256 = "07zl5xhzgrgr5skba6cds5nal58pllf10gak0ap62j1k9gk2ych2"; doCheck = false; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper installShellFiles ]; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; postInstall = '' - mkdir -p "$out/share/bash-completion/completions" "$out/share/zsh/site-functions" - export LAB_CORE_HOST=a LAB_CORE_USER=b LAB_CORE_TOKEN=c - $out/bin/lab completion bash > $out/share/bash-completion/completions/lab - $out/bin/lab completion zsh > $out/share/zsh/site-functions/_lab - wrapProgram $out/bin/lab --prefix PATH ":" "${lib.makeBinPath [ xdg_utils ]}"; + wrapProgram $out/bin/lab --prefix PATH ":" "${lib.makeBinPath [ git xdg_utils ]}"; + for shell in bash fish zsh; do + $out/bin/lab completion $shell > lab.$shell + installShellCompletion lab.$shell + done ''; meta = with lib; { diff --git a/pkgs/applications/version-management/git-and-tools/lefthook/default.nix b/pkgs/applications/version-management/git-and-tools/lefthook/default.nix index a13e4b33d38e..ce7493088430 100644 --- a/pkgs/applications/version-management/git-and-tools/lefthook/default.nix +++ b/pkgs/applications/version-management/git-and-tools/lefthook/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub }: # Currently `buildGo114Module` is passed as `buildGoModule` from # `../default.nix`. Please remove the fixed 1.14 once a new release has been @@ -21,7 +21,7 @@ buildGoModule rec { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Fast and powerful Git hooks manager for any type of projects"; homepage = "https://github.com/Arkweid/lefthook"; license = licenses.mit; diff --git a/pkgs/applications/version-management/git-and-tools/pass-git-helper/default.nix b/pkgs/applications/version-management/git-and-tools/pass-git-helper/default.nix index 5914378f5b35..805afdf363c5 100644 --- a/pkgs/applications/version-management/git-and-tools/pass-git-helper/default.nix +++ b/pkgs/applications/version-management/git-and-tools/pass-git-helper/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonApplication, fetchFromGitHub, pyxdg, pytest }: +{ lib, stdenv, buildPythonApplication, fetchFromGitHub, pyxdg, pytest }: buildPythonApplication rec { pname = "pass-git-helper"; @@ -17,7 +17,7 @@ buildPythonApplication rec { export HOME=$(mktemp -d) ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/languitar/pass-git-helper"; description = "A git credential helper interfacing with pass, the standard unix password manager"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/version-management/git-and-tools/radicle-upstream/default.nix b/pkgs/applications/version-management/git-and-tools/radicle-upstream/default.nix index f7b6aa153140..26f46066531e 100644 --- a/pkgs/applications/version-management/git-and-tools/radicle-upstream/default.nix +++ b/pkgs/applications/version-management/git-and-tools/radicle-upstream/default.nix @@ -1,13 +1,13 @@ -{ stdenv, appimageTools, gsettings-desktop-schemas, gtk3, autoPatchelfHook, zlib, fetchurl }: +{ lib, stdenv, appimageTools, gsettings-desktop-schemas, gtk3, autoPatchelfHook, zlib, fetchurl }: let pname = "radicle-upstream"; - version = "0.1.5"; + version = "0.1.6"; name = "${pname}-${version}"; src = fetchurl { url = "https://releases.radicle.xyz/radicle-upstream-${version}.AppImage"; - sha256 = "1q5p6bvzi5awxd9a3xvvdhy26bz0dx8drb1z0zzqdvqqcxxyydq7"; + sha256 = "1s299rxala6gqj69j5q4d4n5wfdk2zsb4r9qrhml0m79b4f79yar"; }; contents = appimageTools.extractType2 { inherit name src; }; @@ -54,7 +54,7 @@ appimageTools.wrapType2 { $out/share/icons/hicolor/512x512/apps/${pname}.png ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A decentralized app for code collaboration"; homepage = "https://radicle.xyz/"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/version-management/git-and-tools/scmpuff/default.nix b/pkgs/applications/version-management/git-and-tools/scmpuff/default.nix index de8cb396b7fc..69062d305b7a 100644 --- a/pkgs/applications/version-management/git-and-tools/scmpuff/default.nix +++ b/pkgs/applications/version-management/git-and-tools/scmpuff/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "scmpuff"; @@ -14,7 +14,7 @@ buildGoPackage rec { sha256 = "0zrzzcs0i13pfwcqh8qb0sji54vh37rdr7qasg57y56cqpx16vl3"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Add numbered shortcuts to common git commands"; homepage = "https://github.com/mroth/scmpuff"; license = licenses.mit; diff --git a/pkgs/applications/version-management/git-and-tools/stgit/default.nix b/pkgs/applications/version-management/git-and-tools/stgit/default.nix index 1bad72296b4f..3a37c798a085 100644 --- a/pkgs/applications/version-management/git-and-tools/stgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/stgit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python3Packages, fetchFromGitHub, git, installShellFiles }: +{ lib, stdenv, python3Packages, fetchFromGitHub, git, installShellFiles }: python3Packages.buildPythonApplication rec { pname = "stgit"; @@ -21,7 +21,7 @@ python3Packages.buildPythonApplication rec { installShellCompletion --name _stg $out/share/stgit/completion/stgit.zsh ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A patch manager implemented on top of Git"; homepage = "http://procode.org/stgit/"; license = licenses.gpl2; diff --git a/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix b/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix index 75f6a9608412..8c73c00f00c2 100644 --- a/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix +++ b/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, qmake, qtbase, qttools, subversion, apr }: +{ lib, stdenv, fetchFromGitHub, qmake, qtbase, qttools, subversion, apr }: let version = "1.0.18"; @@ -25,7 +25,7 @@ stdenv.mkDerivation { NIX_LDFLAGS = "-lsvn_fs-1"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/svn-all-fast-export/svn2git"; description = "A fast-import based converter for an svn repo to git repos"; license = licenses.gpl3; diff --git a/pkgs/applications/version-management/git-and-tools/tig/default.nix b/pkgs/applications/version-management/git-and-tools/tig/default.nix index 9415c0eecf16..1a469970caf2 100644 --- a/pkgs/applications/version-management/git-and-tools/tig/default.nix +++ b/pkgs/applications/version-management/git-and-tools/tig/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ncurses, asciidoc, xmlto, docbook_xsl, docbook_xml_dtd_45 +{ lib, stdenv, fetchFromGitHub, ncurses, asciidoc, xmlto, docbook_xsl, docbook_xml_dtd_45 , readline, makeWrapper, git, libiconv, autoreconfHook, findXMLCatalogs, pkgconfig }: @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { --prefix PATH ':' "${git}/bin" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://jonas.github.io/tig/"; description = "Text-mode interface for git"; maintainers = with maintainers; [ bjornfor domenkozar qknight globin ]; diff --git a/pkgs/applications/version-management/git-and-tools/topgit/default.nix b/pkgs/applications/version-management/git-and-tools/topgit/default.nix index 9577b56b6c73..cbb341ae3eb3 100644 --- a/pkgs/applications/version-management/git-and-tools/topgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/topgit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, git, perl }: +{ lib, stdenv, fetchFromGitHub, git, perl }: stdenv.mkDerivation rec { pname = "topgit"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { install -Dm755 contrib/tg-completion.bash -t "$out/share/bash-completion/completions/" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "TopGit manages large amount of interdependent topic branches"; homepage = "https://github.com/mackyle/topgit"; license = licenses.gpl2; diff --git a/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix b/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix index c99c70379df4..faa4d66d7cae 100644 --- a/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix +++ b/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, git, makeWrapper, openssl, coreutils, util-linux, gnugrep, gnused, gawk }: +{ lib, stdenv, fetchFromGitHub, git, makeWrapper, openssl, coreutils, util-linux, gnugrep, gnused, gawk }: stdenv.mkDerivation rec { pname = "transcrypt"; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { chmod +x $out/bin/transcrypt-depspathprefix ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Transparently encrypt files within a Git repository"; longDescription = '' A script to configure transparent encryption of sensitive files stored in diff --git a/pkgs/applications/version-management/git-backup/default.nix b/pkgs/applications/version-management/git-backup/default.nix index d65e2cf6ebff..bb6216471256 100644 --- a/pkgs/applications/version-management/git-backup/default.nix +++ b/pkgs/applications/version-management/git-backup/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl, Security }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl, Security }: rustPlatform.buildRustPackage rec { pname = "git-backup"; @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ Security ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/jsdw/git-backup"; description = "A tool to help you backup your git repositories from services like GitHub"; license = licenses.mit; diff --git a/pkgs/applications/version-management/git-lfs/1.nix b/pkgs/applications/version-management/git-lfs/1.nix index 5b2a9906a4f8..3c758908cd49 100644 --- a/pkgs/applications/version-management/git-lfs/1.nix +++ b/pkgs/applications/version-management/git-lfs/1.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "git-lfs"; @@ -22,7 +22,7 @@ buildGoPackage rec { popd ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Git extension for versioning large files"; homepage = "https://git-lfs.github.com/"; license = [ licenses.mit ]; diff --git a/pkgs/applications/version-management/git-lfs/default.nix b/pkgs/applications/version-management/git-lfs/default.nix index d62498182087..c73a92771382 100644 --- a/pkgs/applications/version-management/git-lfs/default.nix +++ b/pkgs/applications/version-management/git-lfs/default.nix @@ -1,14 +1,14 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, ronn, installShellFiles }: +{ lib, buildGoPackage, fetchFromGitHub, ronn, installShellFiles }: buildGoPackage rec { pname = "git-lfs"; - version = "2.13.1"; + version = "2.13.2"; src = fetchFromGitHub { rev = "v${version}"; owner = "git-lfs"; repo = "git-lfs"; - sha256 = "0n4gi7sh6d1maqwp12fsznrky9xwkk2jrmxfwa2hnk8wb2rhvlrm"; + sha256 = "0gfpzdya48phwln61746ii78sq55mhzj938lz8x062xkkcsdvbf4"; }; goPackagePath = "github.com/git-lfs/git-lfs"; @@ -27,7 +27,7 @@ buildGoPackage rec { installManPage go/src/${goPackagePath}/man/*.{1,5} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Git extension for versioning large files"; homepage = "https://git-lfs.github.com/"; changelog = "https://github.com/git-lfs/git-lfs/blob/v${version}/CHANGELOG.md"; diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/applications/version-management/git-repo/default.nix index db18e765b009..fb0b153bc3ae 100644 --- a/pkgs/applications/version-management/git-repo/default.nix +++ b/pkgs/applications/version-management/git-repo/default.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchFromGitHub, makeWrapper +{ lib, stdenv, fetchFromGitHub, makeWrapper , python3, git, gnupg, less }: stdenv.mkDerivation rec { pname = "git-repo"; - version = "2.10"; + version = "2.11.1"; src = fetchFromGitHub { owner = "android"; repo = "tools_repo"; rev = "v${version}"; - sha256 = "0jd28281wys2iy7pbyyrzkzrkzq9ms7p9pbj6j2fha6bg1bh7rkz"; + sha256 = "sha256-6XsjxTYmjr/3smwwS7c+Mq1sqfgKAhWzHOY8TWlIKHU="; }; patches = [ ./import-ssl-module.patch ]; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { "${stdenv.lib.makeBinPath [ git gnupg less ]}" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Android's repo management tool"; longDescription = '' Repo is a Python script based on Git that helps manage many Git diff --git a/pkgs/applications/version-management/git-up/default.nix b/pkgs/applications/version-management/git-up/default.nix index 2a0a97771cbf..57a40de9d4a4 100644 --- a/pkgs/applications/version-management/git-up/default.nix +++ b/pkgs/applications/version-management/git-up/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pythonPackages, git }: +{ lib, stdenv, fetchurl, pythonPackages, git }: pythonPackages.buildPythonApplication rec { pname = "git-up"; @@ -26,7 +26,7 @@ pythonPackages.buildPythonApplication rec { rm -r $out/${pythonPackages.python.sitePackages}/PyGitUp/tests ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/msiemens/PyGitUp"; description = "A git pull replacement that rebases all local branches when pulling"; license = licenses.mit; diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix index ffbeb050956d..528e7c3dd995 100644 --- a/pkgs/applications/version-management/gitea/default.nix +++ b/pkgs/applications/version-management/gitea/default.nix @@ -37,7 +37,7 @@ buildGoPackage rec { preBuild = let tags = optional pamSupport "pam" - ++ optional sqliteSupport "sqlite"; + ++ optional sqliteSupport "sqlite sqlite_unlock_notify"; tagsString = concatStringsSep " " tags; in '' export buildFlagsArray=( diff --git a/pkgs/applications/version-management/gitinspector/default.nix b/pkgs/applications/version-management/gitinspector/default.nix index ac9670601553..68dd3c190bec 100644 --- a/pkgs/applications/version-management/gitinspector/default.nix +++ b/pkgs/applications/version-management/gitinspector/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, python2Packages}: +{ lib, stdenv, fetchzip, python2Packages}: python2Packages.buildPythonApplication rec { pname = "gitinspector"; @@ -15,7 +15,7 @@ python2Packages.buildPythonApplication rec { unittest2 ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/ejwa/gitinspector"; description = "Statistical analysis tool for git repositories"; license = licenses.gpl3; diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index e8c99198df40..c16e66c9e818 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, fetchFromGitHub, buildGoModule, ruby +{ lib, stdenv, fetchFromGitLab, fetchFromGitHub, buildGoModule, ruby , bundlerEnv, pkgconfig # libgit2 + dependencies , libgit2, openssl, zlib, pcre, http-parser }: @@ -61,7 +61,7 @@ in buildGoModule rec { outputs = [ "out" "ruby" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://gitlab.com/gitlab-org/gitaly"; description = "A Git RPC service for handling all the git calls made by GitLab"; platforms = platforms.linux; diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix index 14f7ce0f81e8..d1b5958c751d 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, buildGoModule, ruby }: +{ lib, stdenv, fetchFromGitLab, buildGoModule, ruby }: buildGoModule rec { pname = "gitlab-shell"; @@ -22,7 +22,7 @@ buildGoModule rec { ''; doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "SSH access and repository management app for GitLab"; homepage = "http://www.gitlab.com/"; platforms = platforms.linux; diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index e536d4fcbb1e..b38485716d7d 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, git, buildGoModule }: +{ lib, stdenv, fetchFromGitLab, git, buildGoModule }: buildGoModule rec { pname = "gitlab-workhorse"; @@ -17,7 +17,7 @@ buildGoModule rec { buildFlagsArray = "-ldflags=-X main.Version=${version}"; doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.gitlab.com/"; platforms = platforms.linux; maintainers = with maintainers; [ fpletz globin talyz ]; diff --git a/pkgs/applications/version-management/gitless/default.nix b/pkgs/applications/version-management/gitless/default.nix index 0cead50f0326..e53da902e138 100644 --- a/pkgs/applications/version-management/gitless/default.nix +++ b/pkgs/applications/version-management/gitless/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, python, stdenv }: +{ fetchFromGitHub, python, lib, stdenv }: with python.pkgs; buildPythonApplication rec { @@ -16,7 +16,7 @@ buildPythonApplication rec { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://gitless.com/"; description = "A version control system built on top of Git"; license = licenses.gpl2; diff --git a/pkgs/applications/version-management/gitolite/default.nix b/pkgs/applications/version-management/gitolite/default.nix index 5e2fdc087fe3..8dd2766ff0ed 100644 --- a/pkgs/applications/version-management/gitolite/default.nix +++ b/pkgs/applications/version-management/gitolite/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { echo ${version} > $out/bin/VERSION ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Finely-grained git repository hosting"; homepage = "https://gitolite.com/gitolite/index.html"; license = licenses.gpl2; diff --git a/pkgs/applications/version-management/gitoxide/default.nix b/pkgs/applications/version-management/gitoxide/default.nix index bdb3e4825b92..c345b8d7a80f 100644 --- a/pkgs/applications/version-management/gitoxide/default.nix +++ b/pkgs/applications/version-management/gitoxide/default.nix @@ -1,4 +1,4 @@ -{ lib, rustPlatform, fetchFromGitHub, pkg-config, openssl }: +{ lib, stdenv, rustPlatform, fetchFromGitHub, pkg-config, openssl, Security }: rustPlatform.buildRustPackage rec { pname = "gitoxide"; @@ -14,14 +14,14 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "mitUyf/z7EgjKzFy8ZER8Ceoe9tk6r0ctSYdDG87rIU="; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ]; + buildInputs = [ openssl ] + ++ stdenv.lib.optionals stdenv.isDarwin [ Security ]; # Needed to get openssl-sys to use pkgconfig. OPENSSL_NO_VENDOR = 1; meta = with lib; { - description = - "A command-line application for interacting with git repositories"; + description = "A command-line application for interacting with git repositories"; homepage = "https://github.com/Byron/gitoxide"; license = with licenses; [ mit /* or */ asl20 ]; maintainers = [ maintainers.syberant ]; diff --git a/pkgs/applications/version-management/gitstats/default.nix b/pkgs/applications/version-management/gitstats/default.nix index b7432385a232..ccd13ba818b4 100644 --- a/pkgs/applications/version-management/gitstats/default.nix +++ b/pkgs/applications/version-management/gitstats/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, perl, python, gnuplot, coreutils, gnugrep }: +{ lib, stdenv, fetchzip, perl, python, gnuplot, coreutils, gnugrep }: stdenv.mkDerivation rec { pname = "gitstats"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { install -Dm644 doc/gitstats.1 "$out"/share/man/man1/gitstats.1 ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://gitstats.sourceforge.net/"; description = "Git history statistics generator"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/version-management/gource/default.nix b/pkgs/applications/version-management/gource/default.nix index 683ad8711bf0..048ad4036652 100644 --- a/pkgs/applications/version-management/gource/default.nix +++ b/pkgs/applications/version-management/gource/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, SDL2, ftgl, pkgconfig, libpng, libjpeg, pcre +{ lib, stdenv, fetchurl, SDL2, ftgl, pkgconfig, libpng, libjpeg, pcre , SDL2_image, freetype, glew, libGLU, libGL, boost, glm }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://gource.io/"; description = "A Software version control visualization tool"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix index 5068dc15f48a..ecad825dc8b0 100644 --- a/pkgs/applications/version-management/meld/default.nix +++ b/pkgs/applications/version-management/meld/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , gettext , itstool @@ -59,7 +59,7 @@ python3.pkgs.buildPythonApplication rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Visual diff and merge tool"; homepage = "http://meldmerge.org/"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/version-management/monotone/default.nix b/pkgs/applications/version-management/monotone/default.nix index bf8e5652d99c..e08ea3c8cd8a 100644 --- a/pkgs/applications/version-management/monotone/default.nix +++ b/pkgs/applications/version-management/monotone/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, boost, zlib, botan, libidn +{ lib, stdenv, fetchurl, boost, zlib, botan, libidn , lua, pcre, sqlite, perl, pkgconfig, expect , bzip2, gmp, openssl }: @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { #doCheck = true; # some tests fail (and they take VERY long) - meta = with stdenv.lib; { + meta = with lib; { description = "A free distributed version control system"; maintainers = [ maintainers.raskin ]; platforms = platforms.unix; diff --git a/pkgs/applications/version-management/peru/default.nix b/pkgs/applications/version-management/peru/default.nix index 4cf2a2e864ca..d7ad9060879e 100644 --- a/pkgs/applications/version-management/peru/default.nix +++ b/pkgs/applications/version-management/peru/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python3Packages }: +{ lib, stdenv, fetchFromGitHub, python3Packages }: python3Packages.buildPythonApplication rec { pname = "peru"; @@ -18,7 +18,7 @@ python3Packages.buildPythonApplication rec { # No tests in archive doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/buildinspace/peru"; description = "A tool for including other people's code in your projects"; license = licenses.mit; diff --git a/pkgs/applications/version-management/pijul/default.nix b/pkgs/applications/version-management/pijul/default.nix index 1439f7922489..a4b8be651176 100644 --- a/pkgs/applications/version-management/pijul/default.nix +++ b/pkgs/applications/version-management/pijul/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchCrate , rustPlatform , pkg-config @@ -13,14 +13,14 @@ rustPlatform.buildRustPackage rec { pname = "pijul"; - version = "1.0.0-alpha.24"; + version = "1.0.0-alpha.31"; src = fetchCrate { inherit version pname; - sha256 = "1h1vgx0zlymnhalqsgmp9gv6sxbizmyryldx5vzl6djl23dvzd6s"; + sha256 = "sha256-dSwQlALN0E87o86sasuNFPTZN6SRCuxP6pI7wi4uRf4"; }; - cargoSha256 = "1yx7qqfyabhrf6mcca4frdcp9a426khp90nznhshhm71liqr9y44"; + cargoSha256 = "sha256-Xwk5bX9o41M/1BmkOpAscGQHikhzV+9qAwVz0qI7FRA"; cargoBuildFlags = stdenv.lib.optional gitImportSupport "--features=git"; @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec { CoreServices Security SystemConfiguration ])); - meta = with stdenv.lib; { + meta = with lib; { description = "A distributed version control system"; homepage = "https://pijul.org"; license = with licenses; [ gpl2Plus ]; diff --git a/pkgs/applications/version-management/redmine/default.nix b/pkgs/applications/version-management/redmine/default.nix index 4279fdd5f995..ab5b4ffded58 100644 --- a/pkgs/applications/version-management/redmine/default.nix +++ b/pkgs/applications/version-management/redmine/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bundlerEnv, ruby, makeWrapper }: +{ lib, stdenv, fetchurl, bundlerEnv, ruby, makeWrapper }: let version = "4.1.1"; @@ -42,7 +42,7 @@ in makeWrapper ${rubyEnv.wrappedRuby}/bin/ruby $out/bin/rdm-mailhandler.rb --add-flags $out/share/redmine/extra/mail_handler/rdm-mailhandler.rb ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.redmine.org/"; platforms = platforms.linux; maintainers = [ maintainers.aanderse ]; diff --git a/pkgs/applications/version-management/sit/default.nix b/pkgs/applications/version-management/sit/default.nix index d19f9862fca8..bd8d5db36be0 100644 --- a/pkgs/applications/version-management/sit/default.nix +++ b/pkgs/applications/version-management/sit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform, cmake, libzip, gnupg, +{ lib, stdenv, fetchFromGitHub, rustPlatform, cmake, libzip, gnupg, # Darwin libiconv, CoreFoundation, Security }: @@ -13,8 +13,9 @@ rustPlatform.buildRustPackage rec { sha256 = "06xkhlfix0h6di6cnvc4blbj3mjy90scbh89dvywbx16wjlc79pf"; }; - buildInputs = [ cmake libzip gnupg ] ++ - (if stdenv.isDarwin then [ libiconv CoreFoundation Security ] else []); + nativeBuildInputs = [ cmake ]; + buildInputs = [ libzip gnupg ] + ++ (stdenv.lib.optionals stdenv.isDarwin [ libiconv CoreFoundation Security ]); preCheck = '' export HOME=$(mktemp -d) @@ -22,7 +23,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "092yfpr2svp1qy7xis1q0sdkbsjmmswmdwb0rklrc0yhydcsghp9"; - meta = with stdenv.lib; { + meta = with lib; { description = "Serverless Information Tracker"; homepage = "https://sit.fyi/"; license = with licenses; [ asl20 /* or */ mit ]; diff --git a/pkgs/applications/version-management/smartgithg/default.nix b/pkgs/applications/version-management/smartgithg/default.nix index 51fe70d3952f..f2bd4bf576bc 100644 --- a/pkgs/applications/version-management/smartgithg/default.nix +++ b/pkgs/applications/version-management/smartgithg/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , makeDesktopItem , jre @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { ''; }; - meta = with stdenv.lib; { + meta = with lib; { description = "GUI for Git, Mercurial, Subversion"; homepage = "https://www.syntevo.com/smartgit/"; license = licenses.unfree; diff --git a/pkgs/applications/version-management/sourcehut/builds.nix b/pkgs/applications/version-management/sourcehut/builds.nix index e5fc7c338604..200d1d5384fb 100644 --- a/pkgs/applications/version-management/sourcehut/builds.nix +++ b/pkgs/applications/version-management/sourcehut/builds.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, buildPythonPackage +{ lib, stdenv, fetchgit, buildPythonPackage , python , buildGoModule , srht, redis, celery, pyyaml, markdown }: @@ -45,7 +45,9 @@ in buildPythonPackage rec { cp ${buildWorker "${src}/worker"}/bin/worker $out/bin/builds.sr.ht-worker ''; - meta = with stdenv.lib; { + dontUseSetuptoolsCheck = true; + + meta = with lib; { homepage = "https://git.sr.ht/~sircmpwn/builds.sr.ht"; description = "Continuous integration service for the sr.ht network"; license = licenses.agpl3; diff --git a/pkgs/applications/version-management/sourcehut/core.nix b/pkgs/applications/version-management/sourcehut/core.nix index 4252fac1165c..bcc47920ebeb 100644 --- a/pkgs/applications/version-management/sourcehut/core.nix +++ b/pkgs/applications/version-management/sourcehut/core.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, fetchNodeModules, buildPythonPackage +{ lib, stdenv, fetchgit, fetchNodeModules, buildPythonPackage , pgpy, flask, bleach, humanize, html5lib, markdown, psycopg2, pygments , requests, sqlalchemy, cryptography, beautifulsoup4, sqlalchemy-utils, prometheus_client , celery, alembic, importlib-metadata, mistletoe @@ -61,7 +61,7 @@ buildPythonPackage rec { dontUseSetuptoolsCheck = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://git.sr.ht/~sircmpwn/srht"; description = "Core modules for sr.ht"; license = licenses.bsd3; diff --git a/pkgs/applications/version-management/sourcehut/dispatch.nix b/pkgs/applications/version-management/sourcehut/dispatch.nix index fa557ce78aa2..c7c11cafc8b4 100644 --- a/pkgs/applications/version-management/sourcehut/dispatch.nix +++ b/pkgs/applications/version-management/sourcehut/dispatch.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, buildPythonPackage +{ lib, stdenv, fetchgit, buildPythonPackage , python , srht, pyyaml, PyGithub }: @@ -24,7 +24,9 @@ buildPythonPackage rec { export PKGVER=${version} ''; - meta = with stdenv.lib; { + dontUseSetuptoolsCheck = true; + + meta = with lib; { homepage = "https://dispatch.sr.ht/~sircmpwn/dispatch.sr.ht"; description = "Task dispatcher and service integration tool for the sr.ht network"; license = licenses.agpl3; diff --git a/pkgs/applications/version-management/sourcehut/git.nix b/pkgs/applications/version-management/sourcehut/git.nix index 3611ad93e17e..3ef49b796645 100644 --- a/pkgs/applications/version-management/sourcehut/git.nix +++ b/pkgs/applications/version-management/sourcehut/git.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, buildPythonPackage +{ lib, stdenv, fetchgit, buildPythonPackage , python , buildGoModule , srht, minio, pygit2, scmsrht }: @@ -67,7 +67,9 @@ in buildPythonPackage rec { cp ${buildAPI "${src}/api"}/bin/api $out/bin/gitsrht-api ''; - meta = with stdenv.lib; { + dontUseSetuptoolsCheck = true; + + meta = with lib; { homepage = "https://git.sr.ht/~sircmpwn/git.sr.ht"; description = "Git repository hosting service for the sr.ht network"; license = licenses.agpl3; diff --git a/pkgs/applications/version-management/sourcehut/hg.nix b/pkgs/applications/version-management/sourcehut/hg.nix index 73c9dfeb71e2..d0e140908469 100644 --- a/pkgs/applications/version-management/sourcehut/hg.nix +++ b/pkgs/applications/version-management/sourcehut/hg.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchhg, buildPythonPackage +{ lib, stdenv, fetchhg, buildPythonPackage , python , srht, hglib, scmsrht, unidiff }: @@ -25,7 +25,9 @@ buildPythonPackage rec { export PKGVER=${version} ''; - meta = with stdenv.lib; { + dontUseSetuptoolsCheck = true; + + meta = with lib; { homepage = "https://git.sr.ht/~sircmpwn/hg.sr.ht"; description = "Mercurial repository hosting service for the sr.ht network"; license = licenses.agpl3; diff --git a/pkgs/applications/version-management/sourcehut/hub.nix b/pkgs/applications/version-management/sourcehut/hub.nix index 5c9736564c39..8ea4961e7d45 100644 --- a/pkgs/applications/version-management/sourcehut/hub.nix +++ b/pkgs/applications/version-management/sourcehut/hub.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, buildPythonPackage +{ lib, stdenv, fetchgit, buildPythonPackage , python , srht }: @@ -22,7 +22,9 @@ buildPythonPackage rec { export PKGVER=${version} ''; - meta = with stdenv.lib; { + dontUseSetuptoolsCheck = true; + + meta = with lib; { homepage = "https://git.sr.ht/~sircmpwn/hub.sr.ht"; description = "Project hub service for the sr.ht network"; license = licenses.agpl3; diff --git a/pkgs/applications/version-management/sourcehut/lists.nix b/pkgs/applications/version-management/sourcehut/lists.nix index 880dc60f0b3a..a0b52a2d5640 100644 --- a/pkgs/applications/version-management/sourcehut/lists.nix +++ b/pkgs/applications/version-management/sourcehut/lists.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, buildPythonPackage +{ lib, stdenv, fetchgit, buildPythonPackage , python , srht, asyncpg, aiosmtpd, pygit2, emailthreads }: @@ -26,7 +26,9 @@ buildPythonPackage rec { export PKGVER=${version} ''; - meta = with stdenv.lib; { + dontUseSetuptoolsCheck = true; + + meta = with lib; { homepage = "https://git.sr.ht/~sircmpwn/lists.sr.ht"; description = "Mailing list service for the sr.ht network"; license = licenses.agpl3; diff --git a/pkgs/applications/version-management/sourcehut/man.nix b/pkgs/applications/version-management/sourcehut/man.nix index 8072c74d2d0f..26939d2bebec 100644 --- a/pkgs/applications/version-management/sourcehut/man.nix +++ b/pkgs/applications/version-management/sourcehut/man.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, buildPythonPackage +{ lib, stdenv, fetchgit, buildPythonPackage , python , srht, pygit2 }: @@ -23,7 +23,9 @@ buildPythonPackage rec { export PKGVER=${version} ''; - meta = with stdenv.lib; { + dontUseSetuptoolsCheck = true; + + meta = with lib; { homepage = "https://git.sr.ht/~sircmpwn/man.sr.ht"; description = "Wiki service for the sr.ht network"; license = licenses.agpl3; diff --git a/pkgs/applications/version-management/sourcehut/meta.nix b/pkgs/applications/version-management/sourcehut/meta.nix index 6cbae6715172..b6622d97487e 100644 --- a/pkgs/applications/version-management/sourcehut/meta.nix +++ b/pkgs/applications/version-management/sourcehut/meta.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, buildPythonPackage +{ lib, stdenv, fetchgit, buildPythonPackage , python , buildGoModule , pgpy, srht, redis, bcrypt, qrcode, stripe, zxcvbn, alembic, pystache @@ -48,7 +48,9 @@ in buildPythonPackage rec { cp ${buildAPI "${src}/api"}/bin/api $out/bin/metasrht-api ''; - meta = with stdenv.lib; { + dontUseSetuptoolsCheck = true; + + meta = with lib; { homepage = "https://git.sr.ht/~sircmpwn/meta.sr.ht"; description = "Account management service for the sr.ht network"; license = licenses.agpl3; diff --git a/pkgs/applications/version-management/sourcehut/paste.nix b/pkgs/applications/version-management/sourcehut/paste.nix index a2fdaa05efca..eaec8b710dd6 100644 --- a/pkgs/applications/version-management/sourcehut/paste.nix +++ b/pkgs/applications/version-management/sourcehut/paste.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, buildPythonPackage +{ lib, stdenv, fetchgit, buildPythonPackage , python , srht, pyyaml }: @@ -23,7 +23,9 @@ buildPythonPackage rec { export PKGVER=${version} ''; - meta = with stdenv.lib; { + dontUseSetuptoolsCheck = true; + + meta = with lib; { homepage = "https://git.sr.ht/~sircmpwn/paste.sr.ht"; description = "Ad-hoc text file hosting service for the sr.ht network"; license = licenses.agpl3; diff --git a/pkgs/applications/version-management/sourcehut/scm.nix b/pkgs/applications/version-management/sourcehut/scm.nix index 08739f6d8ab9..6e8b03835bc4 100644 --- a/pkgs/applications/version-management/sourcehut/scm.nix +++ b/pkgs/applications/version-management/sourcehut/scm.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, buildPythonPackage +{ lib, stdenv, fetchgit, buildPythonPackage , srht, redis, pyyaml, buildsrht , writeText }: @@ -27,7 +27,7 @@ buildPythonPackage rec { dontUseSetuptoolsCheck = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://git.sr.ht/~sircmpwn/git.sr.ht"; description = "Shared support code for sr.ht source control services."; license = licenses.agpl3; diff --git a/pkgs/applications/version-management/sourcehut/todo.nix b/pkgs/applications/version-management/sourcehut/todo.nix index 7528ae534fae..357dcd4d2e2a 100644 --- a/pkgs/applications/version-management/sourcehut/todo.nix +++ b/pkgs/applications/version-management/sourcehut/todo.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, buildPythonPackage +{ lib, stdenv, fetchgit, buildPythonPackage , python , srht, redis, alembic, pystache , pytest, factory_boy, writeText }: @@ -34,7 +34,7 @@ buildPythonPackage rec { dontUseSetuptoolsCheck = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://todo.sr.ht/~sircmpwn/todo.sr.ht"; description = "Ticket tracking service for the sr.ht network"; license = licenses.agpl3; diff --git a/pkgs/applications/version-management/sparkleshare/default.nix b/pkgs/applications/version-management/sparkleshare/default.nix index 6f639ecd77fa..a7d1f86652c1 100644 --- a/pkgs/applications/version-management/sparkleshare/default.nix +++ b/pkgs/applications/version-management/sparkleshare/default.nix @@ -1,5 +1,6 @@ { appindicator-sharp, + bash, coreutils, fetchFromGitHub, git, @@ -57,6 +58,7 @@ stdenv.mkDerivation rec { --set PATH ${symlinkJoin { name = "mono-path"; paths = [ + bash coreutils git git-lfs diff --git a/pkgs/applications/version-management/src/default.nix b/pkgs/applications/version-management/src/default.nix index 58549fed73a3..cddcd3d8aa29 100644 --- a/pkgs/applications/version-management/src/default.nix +++ b/pkgs/applications/version-management/src/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python, rcs, git, makeWrapper }: +{ lib, stdenv, fetchurl, python, rcs, git, makeWrapper }: stdenv.mkDerivation rec { pname = "src"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { --suffix PATH ":" "${rcs}/bin" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Simple single-file revision control"; longDescription = '' SRC, acronym of Simple Revision Control, is RCS/SCCS reloaded with a diff --git a/pkgs/applications/version-management/sublime-merge/common.nix b/pkgs/applications/version-management/sublime-merge/common.nix index ad540c46411d..6ed644d050e2 100644 --- a/pkgs/applications/version-management/sublime-merge/common.nix +++ b/pkgs/applications/version-management/sublime-merge/common.nix @@ -1,6 +1,6 @@ { buildVersion, sha256, dev ? false }: -{ fetchurl, stdenv, xorg, glib, libGL, glibcLocales, gtk3, cairo, pango, libredirect, makeWrapper, wrapGAppsHook +{ fetchurl, lib, stdenv, xorg, glib, libGL, glibcLocales, gtk3, cairo, pango, libredirect, makeWrapper, wrapGAppsHook , pkexecPath ? "/run/wrappers/bin/pkexec" , writeScript, common-updater-scripts, curl, gnugrep, coreutils }: @@ -117,7 +117,7 @@ in stdenv.mkDerivation (rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Git client from the makers of Sublime Text"; homepage = "https://www.sublimemerge.com"; maintainers = with maintainers; [ zookatron ]; diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index dffe3fadd74b..66d22e9d7182 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -5,7 +5,7 @@ , perlBindings ? false , javahlBindings ? false , saslSupport ? false -, stdenv, fetchurl, apr, aprutil, zlib, sqlite, openssl, lz4, utf8proc +, lib, stdenv, fetchurl, apr, aprutil, zlib, sqlite, openssl, lz4, utf8proc , apacheHttpd ? null, expat, swig ? null, jdk ? null, python ? null, perl ? null , sasl ? null, serf ? null }: @@ -95,7 +95,7 @@ let checkInputs = [ python ]; doCheck = false; # fails 10 out of ~2300 tests - meta = with stdenv.lib; { + meta = with lib; { description = "A version control system intended to be a compelling replacement for CVS in the open source community"; license = licenses.asl20; homepage = "http://subversion.apache.org/"; diff --git a/pkgs/applications/version-management/tortoisehg/default.nix b/pkgs/applications/version-management/tortoisehg/default.nix index 2743d4f827fb..6c97d1536619 100644 --- a/pkgs/applications/version-management/tortoisehg/default.nix +++ b/pkgs/applications/version-management/tortoisehg/default.nix @@ -4,16 +4,16 @@ let tortoisehgSrc = fetchurl rec { meta.name = "tortoisehg-${meta.version}"; - meta.version = "5.2.1"; - url = "https://bitbucket.org/tortoisehg/thg/get/14221e991a5b623e0072d3bd340b759dbe9072ca.tar.gz"; - sha256 = "01rpzf5z99izcdda1ps9bhqvhw6qghagd8c1y7x19rv223zi05dv"; + meta.version = "5.6"; + url = "https://www.mercurial-scm.org/release/tortoisehg/targz/tortoisehg-${meta.version}.tar.gz"; + sha256 = "031bafj88wggpvw0lgvl0djhlbhs9nls9vzwvni8yn0m0bgzc9gr"; }; tortoiseMercurial = mercurial.overridePythonAttrs (old: rec { inherit (tortoisehgSrc.meta) version; src = fetchurl { url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz"; - sha256 = "1pxkd37b0a1mi2zakk1hi122lgz1ffy2fxdnbs8acwlqpw55bc8q"; + sha256 = "1hk2y30zzdnlv8f71kabvh0xi9c7qhp28ksh20vpd0r712sv79yz"; }; }); diff --git a/pkgs/applications/version-management/vcprompt/default.nix b/pkgs/applications/version-management/vcprompt/default.nix index 85fe83996da3..d98f94477256 100644 --- a/pkgs/applications/version-management/vcprompt/default.nix +++ b/pkgs/applications/version-management/vcprompt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchhg, autoconf, sqlite }: +{ lib, stdenv, fetchhg, autoconf, sqlite }: stdenv.mkDerivation rec { pname = "vcprompt"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { makeFlags="$makeFlags PREFIX=$out" ''; - meta = with stdenv.lib; { + meta = with lib; { description = '' A little C program that prints a short string with barebones information about the current working directory for various version control systems diff --git a/pkgs/applications/version-management/vcsh/default.nix b/pkgs/applications/version-management/vcsh/default.nix index c4af492decea..e272342fe95d 100644 --- a/pkgs/applications/version-management/vcsh/default.nix +++ b/pkgs/applications/version-management/vcsh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, which, git, ronn, perlPackages }: +{ lib, stdenv, fetchFromGitHub, which, git, ronn, perlPackages }: stdenv.mkDerivation { version = "1.20170915"; # date of commit we're pulling @@ -16,7 +16,7 @@ stdenv.mkDerivation { installPhase = "make install PREFIX=$out"; - meta = with stdenv.lib; { + meta = with lib; { description = "Version Control System for $HOME"; homepage = "https://github.com/RichiH/vcsh"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/video/avidemux/default.nix b/pkgs/applications/video/avidemux/default.nix index 2dd6b12c14f8..69e33f986a8d 100644 --- a/pkgs/applications/video/avidemux/default.nix +++ b/pkgs/applications/video/avidemux/default.nix @@ -88,7 +88,7 @@ stdenv.mkDerivation rec { fixupPhase ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://fixounet.free.fr/avidemux/"; description = "Free video editor designed for simple video editing tasks"; maintainers = with maintainers; [ abbradar ma27 ]; diff --git a/pkgs/applications/video/avxsynth/default.nix b/pkgs/applications/video/avxsynth/default.nix index e818ef585c17..aed1bcef381d 100644 --- a/pkgs/applications/video/avxsynth/default.nix +++ b/pkgs/applications/video/avxsynth/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig , cairo, ffmpeg_3, ffms, libjpeg, log4cpp, pango , avxeditSupport ? false, qt4 ? null }: @@ -32,7 +32,7 @@ stdenv.mkDerivation { buildInputs = [ cairo ffmpeg_3 ffms libjpeg log4cpp pango ] ++ optional avxeditSupport qt4; - meta = with stdenv.lib; { + meta = with lib; { description = "A script system that allows advanced non-linear editing"; homepage = "https://github.com/avxsynth/avxsynth"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/video/bombono/default.nix b/pkgs/applications/video/bombono/default.nix index 05ba5ef19be7..7e366da43789 100644 --- a/pkgs/applications/video/bombono/default.nix +++ b/pkgs/applications/video/bombono/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , pkgconfig , fetchpatch @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "a DVD authoring program for personal computers"; homepage = "https://www.bombono.org/"; license = licenses.gpl2Only; diff --git a/pkgs/applications/video/byzanz/default.nix b/pkgs/applications/video/byzanz/default.nix index f5d40a5c34cc..705bac06eb65 100644 --- a/pkgs/applications/video/byzanz/default.nix +++ b/pkgs/applications/video/byzanz/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, wrapGAppsHook, which, gnome3, glib, intltool, pkgconfig, libtool, cairo, gtk3, gst_all_1, xorg }: +{ lib, stdenv, fetchgit, wrapGAppsHook, which, gnome3, glib, intltool, pkgconfig, libtool, cairo, gtk3, gst_all_1, xorg }: stdenv.mkDerivation { version = "0.2.3.alpha"; @@ -22,7 +22,7 @@ stdenv.mkDerivation { buildInputs = [ which gnome3.gnome-common glib intltool libtool cairo gtk3 xorg.xwininfo ] ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-bad gst-plugins-good gst-plugins-ugly gst-libav wrapGAppsHook ]); - meta = with stdenv.lib; { + meta = with lib; { description = "Tool to record a running X desktop to an animation suitable for presentation in a web browser"; homepage = "https://github.com/GNOME/byzanz"; license = licenses.gpl3; diff --git a/pkgs/applications/video/celluloid/default.nix b/pkgs/applications/video/celluloid/default.nix index ca9ecb48188c..b59a40c03a23 100644 --- a/pkgs/applications/video/celluloid/default.nix +++ b/pkgs/applications/video/celluloid/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , nix-update-script , meson @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Simple GTK frontend for the mpv video player"; longDescription = '' GNOME MPV interacts with mpv via the client API exported by libmpv, diff --git a/pkgs/applications/video/clipgrab/default.nix b/pkgs/applications/video/clipgrab/default.nix index fa6cf88440f1..7fcd3fce64d4 100644 --- a/pkgs/applications/video/clipgrab/default.nix +++ b/pkgs/applications/video/clipgrab/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeDesktopItem, ffmpeg_3 +{ lib, stdenv, fetchurl, makeDesktopItem, ffmpeg_3 , qmake, qttools, mkDerivation , qtbase, qtdeclarative, qtlocation, qtquickcontrols2, qtwebchannel, qtwebengine }: @@ -42,7 +42,7 @@ mkDerivation rec { cp -r ${desktopItem}/share/applications $out/share ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Video downloader for YouTube and other sites"; longDescription = '' ClipGrab is a free downloader and converter for YouTube, Vimeo, Metacafe, diff --git a/pkgs/applications/video/devede/default.nix b/pkgs/applications/video/devede/default.nix index 921548b5c08c..4b1b7ae0b602 100644 --- a/pkgs/applications/video/devede/default.nix +++ b/pkgs/applications/video/devede/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, python3Packages, ffmpeg_3, mplayer, vcdimager, cdrkit, dvdauthor +{ lib, stdenv, fetchFromGitLab, python3Packages, ffmpeg_3, mplayer, vcdimager, cdrkit, dvdauthor , gtk3, gettext, wrapGAppsHook, gdk-pixbuf, gobject-introspection }: let @@ -44,7 +44,7 @@ in buildPythonApplication rec { --replace "/usr/local/share" "$out/share" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "DVD Creator for Linux"; homepage = "http://www.rastersoft.com/programas/devede.html"; license = licenses.gpl3; diff --git a/pkgs/applications/video/droidcam/default.nix b/pkgs/applications/video/droidcam/default.nix new file mode 100644 index 000000000000..923c2a67b425 --- /dev/null +++ b/pkgs/applications/video/droidcam/default.nix @@ -0,0 +1,57 @@ +{ lib, stdenv, fetchFromGitHub +, ffmpeg, libjpeg_turbo, gtk3, alsaLib, speex, libusbmuxd, libappindicator-gtk3 +, pkg-config +}: + +stdenv.mkDerivation rec { + pname = "droidcam"; + version = "1.7"; + + src = fetchFromGitHub { + owner = "aramg"; + repo = "droidcam"; + rev = "v${version}"; + sha256 = "sha256-nIqiRWk3gKOWrreyLVT8McRsXClXjOa4y8xXr1ox9Lc="; + }; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + ffmpeg + libjpeg_turbo + gtk3 + alsaLib + speex + libusbmuxd + libappindicator-gtk3 + ]; + + postPatch = '' + substituteInPlace src/droidcam.c \ + --replace "/opt/droidcam-icon.png" "$out/share/icons/hicolor/droidcam.png" + ''; + + preBuild = '' + makeFlagsArray+=("JPEG=$(pkg-config --libs --cflags libturbojpeg)") + makeFlagsArray+=("USBMUXD=$(pkg-config --libs --cflags libusbmuxd-2.0)") + ''; + + installPhase = '' + runHook preInstall + + install -Dt $out/bin droidcam droidcam-cli + install -D icon2.png $out/share/icons/hicolor/droidcam.png + + runHook postInstall + ''; + + meta = with lib; { + description = "Linux client for DroidCam app"; + homepage = "https://github.com/aramg/droidcam"; + license = licenses.gpl2Only; + maintainers = [ maintainers.suhr ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/video/dvdauthor/default.nix b/pkgs/applications/video/dvdauthor/default.nix index af1fe24cbbf4..6ea3a53a0af2 100644 --- a/pkgs/applications/video/dvdauthor/default.nix +++ b/pkgs/applications/video/dvdauthor/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, imagemagick, libdvdread, libxml2, freetype, fribidi, libpng, zlib, pkgconfig +{ lib, stdenv, fetchurl, imagemagick, libdvdread, libxml2, freetype, fribidi, libpng, zlib, pkgconfig , flex, bison }: stdenv.mkDerivation rec { @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ./dvdauthor-imagemagick-0.7.0.patch ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Tools for generating DVD files to be played on standalone DVD players"; homepage = "http://dvdauthor.sourceforge.net/"; license = licenses.gpl2; diff --git a/pkgs/applications/video/dvdstyler/default.nix b/pkgs/applications/video/dvdstyler/default.nix index b78f9ed816b7..e3f7f8a0702b 100644 --- a/pkgs/applications/video/dvdstyler/default.nix +++ b/pkgs/applications/video/dvdstyler/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig +{ lib, stdenv, fetchurl, pkgconfig , flex, bison, gettext , xineUI, wxSVG , fontconfig @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { --prefix PATH ":" "${binPath}" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A DVD authoring software"; longDescription = '' DVDStyler is a cross-platform free DVD authoring application for the diff --git a/pkgs/applications/video/electronplayer/electronplayer.nix b/pkgs/applications/video/electronplayer/electronplayer.nix index 577c85c6b27c..a4ebbf159b88 100644 --- a/pkgs/applications/video/electronplayer/electronplayer.nix +++ b/pkgs/applications/video/electronplayer/electronplayer.nix @@ -1,4 +1,4 @@ -{ appimageTools, stdenv, fetchurl }: +{ appimageTools, lib, stdenv, fetchurl }: let pname = "electronplayer"; version = "2.0.8"; @@ -23,7 +23,7 @@ in appimageTools.wrapType2 { cp -r ${appimageContents}/usr/share/icons $out/share ''; - meta = with stdenv.lib; { + meta = with lib; { description = "An electron based web video services player"; homepage = "https://github.com/oscartbeaumont/ElectronPlayer"; license = licenses.mit; diff --git a/pkgs/applications/video/filebot/default.nix b/pkgs/applications/video/filebot/default.nix index e9ae14e19aa2..ba0627fc0fa1 100644 --- a/pkgs/applications/video/filebot/default.nix +++ b/pkgs/applications/video/filebot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openjdk11, makeWrapper, autoPatchelfHook +{ lib, stdenv, fetchurl, openjdk11, makeWrapper, autoPatchelfHook , zlib, libzen, libmediainfo, curl, libmms, glib }: @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { ln -s $out/opt/filebot.sh $out/bin/filebot ''; - meta = with stdenv.lib; { + meta = with lib; { description = "The ultimate TV and Movie Renamer"; longDescription = '' FileBot is the ultimate tool for organizing and renaming your Movies, TV diff --git a/pkgs/applications/video/gnome-mplayer/default.nix b/pkgs/applications/video/gnome-mplayer/default.nix index 3bd7785f201c..88dfe5b4b87d 100644 --- a/pkgs/applications/video/gnome-mplayer/default.nix +++ b/pkgs/applications/video/gnome-mplayer/default.nix @@ -1,4 +1,4 @@ -{stdenv, substituteAll, fetchFromGitHub, pkgconfig, gettext, glib, gtk3, gmtk, dbus, dbus-glib +{lib, stdenv, substituteAll, fetchFromGitHub, pkgconfig, gettext, glib, gtk3, gmtk, dbus, dbus-glib , libnotify, libpulseaudio, mplayer, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { }) ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Gnome MPlayer, a simple GUI for MPlayer"; homepage = "https://sites.google.com/site/kdekorte2/gnomemplayer"; license = licenses.gpl2; diff --git a/pkgs/applications/video/gnomecast/default.nix b/pkgs/applications/video/gnomecast/default.nix index e4814e40c1fd..bc045deb9ecb 100644 --- a/pkgs/applications/video/gnomecast/default.nix +++ b/pkgs/applications/video/gnomecast/default.nix @@ -1,4 +1,4 @@ -{ lib, python3Packages, gtk3, gobject-introspection, ffmpeg_3, wrapGAppsHook }: +{ stdenv, lib, python3Packages, gtk3, gobject-introspection, ffmpeg_3, wrapGAppsHook }: with python3Packages; buildPythonApplication rec { @@ -20,9 +20,13 @@ buildPythonApplication rec { gappsWrapperArgs+=(--prefix PATH : ${lib.makeBinPath [ ffmpeg_3 ]}) ''; + # no tests + doCheck = false; + meta = with lib; { description = "A native Linux GUI for Chromecasting local files"; homepage = "https://github.com/keredson/gnomecast"; license = with licenses; [ gpl3 ]; + broken = stdenv.isDarwin; }; } diff --git a/pkgs/applications/video/gpac/default.nix b/pkgs/applications/video/gpac/default.nix index aa66155d17ac..906d119dfc50 100644 --- a/pkgs/applications/video/gpac/default.nix +++ b/pkgs/applications/video/gpac/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, zlib }: +{ lib, stdenv, fetchFromGitHub, pkgconfig, zlib }: stdenv.mkDerivation rec { version = "1.0.1"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Open Source multimedia framework for research and academic purposes"; longDescription = '' GPAC is an Open Source multimedia framework for research and academic purposes. diff --git a/pkgs/applications/video/handbrake/default.nix b/pkgs/applications/video/handbrake/default.nix index 1e4b83da8144..16db55f060d2 100644 --- a/pkgs/applications/video/handbrake/default.nix +++ b/pkgs/applications/video/handbrake/default.nix @@ -131,7 +131,7 @@ _EOF cd build ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://handbrake.fr/"; description = "A tool for converting video files and ripping DVDs"; longDescription = '' diff --git a/pkgs/applications/video/hdhomerun-config-gui/default.nix b/pkgs/applications/video/hdhomerun-config-gui/default.nix index e1631150b8be..b44da238d1e1 100644 --- a/pkgs/applications/video/hdhomerun-config-gui/default.nix +++ b/pkgs/applications/video/hdhomerun-config-gui/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libhdhomerun, gcc, gnumake, pkg-config, gtk2 }: +{ lib, stdenv, fetchurl, libhdhomerun, gcc, gnumake, pkg-config, gtk2 }: stdenv.mkDerivation rec { pname = "hdhomerun-config-gui"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { install -vDm 755 src/hdhomerun_config_gui $out/usr/bin/hdhomerun_config_gui ''; - meta = with stdenv.lib; { + meta = with lib; { description = "GUI for configuring Silicondust HDHomeRun TV tuners"; homepage = "https://www.silicondust.com/support/linux"; license = licenses.gpl3Only; diff --git a/pkgs/applications/video/jellyfin-mpv-shim/default.nix b/pkgs/applications/video/jellyfin-mpv-shim/default.nix index 825aac4dad29..fe06e9431f9d 100644 --- a/pkgs/applications/video/jellyfin-mpv-shim/default.nix +++ b/pkgs/applications/video/jellyfin-mpv-shim/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonApplication, fetchFromGitHub, callPackage +{ lib, stdenv, buildPythonApplication, fetchFromGitHub, callPackage , mpv, python-mpv-jsonipc, jellyfin-apiclient-python , pillow, tkinter, pystray, jinja2, pywebview }: @@ -53,7 +53,11 @@ buildPythonApplication rec { pywebview ]; - meta = with stdenv.lib; { + # no tests + doCheck = false; + pythonImportsCheck = [ "jellyfin_mpv_shim" ]; + + meta = with lib; { homepage = "https://github.com/iwalton3/jellyfin-mpv-shim"; description = "Allows casting of videos to MPV via the jellyfin mobile and web app"; license = licenses.gpl3; diff --git a/pkgs/applications/video/jellyfin-mpv-shim/shader-pack.nix b/pkgs/applications/video/jellyfin-mpv-shim/shader-pack.nix index fd33e8c90b52..89a601af4add 100644 --- a/pkgs/applications/video/jellyfin-mpv-shim/shader-pack.nix +++ b/pkgs/applications/video/jellyfin-mpv-shim/shader-pack.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "jellyfin-mpv-shim-shader-pack"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { cp -a . $out ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/iwalton3/default-shader-pack"; description = "Preconfigured set of MPV shaders and configurations for MPV Shim media clients"; license = with licenses; [ mit lgpl3Plus unlicense ]; diff --git a/pkgs/applications/video/jftui/default.nix b/pkgs/applications/video/jftui/default.nix index 04ed4c16e2bf..b050e2636ccb 100644 --- a/pkgs/applications/video/jftui/default.nix +++ b/pkgs/applications/video/jftui/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , pkg-config , curl @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { install -Dm555 build/jftui $out/bin/jftui ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Jellyfin Terminal User Interface "; homepage = "https://github.com/Aanok/jftui"; license = licenses.unlicense; diff --git a/pkgs/applications/video/kazam/default.nix b/pkgs/applications/video/kazam/default.nix index 0cdd3db85257..d47b5fddf88c 100644 --- a/pkgs/applications/video/kazam/default.nix +++ b/pkgs/applications/video/kazam/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, substituteAll, python3, gst_all_1, wrapGAppsHook, gobject-introspection +{ lib, stdenv, fetchurl, substituteAll, python3, gst_all_1, wrapGAppsHook, gobject-introspection , gtk3, libwnck3, keybinder3, intltool, libcanberra-gtk3, libappindicator-gtk3, libpulseaudio , fetchpatch }: @@ -40,7 +40,7 @@ python3.pkgs.buildPythonApplication rec { # no tests doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "A screencasting program created with design in mind"; homepage = "https://code.launchpad.net/kazam"; license = licenses.lgpl3; diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix index a60250ee0ff1..4726c1b7b516 100644 --- a/pkgs/applications/video/kodi/default.nix +++ b/pkgs/applications/video/kodi/default.nix @@ -83,7 +83,6 @@ let repo = name; inherit rev sha256; }; - enableParallelBuilding = true; } // attrs'); ffmpeg = kodiDependency rec { @@ -242,8 +241,6 @@ in stdenv.mkDerivation { "-DGBM_RENDER_SYSTEM=gles" ]; - enableParallelBuilding = true; - # 14 tests fail but the biggest issue is that every test takes 30 seconds - # I'm guessing there is a thing waiting to time out doCheck = false; @@ -285,7 +282,7 @@ in stdenv.mkDerivation { pythonPackages = python2Packages; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Media center"; homepage = "https://kodi.tv/"; license = licenses.gpl2; diff --git a/pkgs/applications/video/kodi/plugins.nix b/pkgs/applications/video/kodi/plugins.nix index 12c16a744b08..a0ef8b7e8feb 100644 --- a/pkgs/applications/video/kodi/plugins.nix +++ b/pkgs/applications/video/kodi/plugins.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, fetchFromGitHub +{ lib, stdenv, callPackage, fetchFromGitHub , cmake, kodiPlain, libcec_platform, tinyxml, rapidxml , steam, udev, libusb1, jsoncpp, libhdhomerun, zlib , python2Packages, expat, glib, nspr, nss, openssl @@ -47,7 +47,8 @@ let self = rec { sha256 = "1r3gs3c6zczmm66qcxh9mr306clwb3p7ykzb70r3jv5jqggiz199"; }; - buildInputs = [ cmake kodiPlain libcec_platform tinyxml ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ kodiPlain libcec_platform tinyxml ]; }; mkKodiPlugin = { plugin, namespace, version, sourceDir ? null, ... }@args: @@ -75,8 +76,8 @@ let self = rec { dontStrip = true; - buildInputs = [ cmake kodiPlain kodi-platform libcec_platform ] - ++ extraBuildInputs; + nativeBuildInputs = [ cmake ]; + buildInputs = [ kodiPlain kodi-platform libcec_platform ] ++ extraBuildInputs; inherit extraRuntimeDependencies; @@ -518,7 +519,7 @@ let self = rec { sha256 = "044kkzcpzvbyih4vys33r4hqw38xa82snmvl4qj1r80wnszc8af1"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "SFTP Virtual Filesystem add-on for Kodi"; license = licenses.gpl2Plus; platforms = platforms.all; @@ -540,7 +541,7 @@ let self = rec { sha256 = "01qhv095h5j67ispm4iw18pd3kl7a0mnjkgm92al9qqiyif8lzgh"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "LibArchive Virtual Filesystem add-on for Kodi"; license = licenses.gpl2Plus; platforms = platforms.all; diff --git a/pkgs/applications/video/makemkv/default.nix b/pkgs/applications/video/makemkv/default.nix index 6f47307f4a6a..35b0d41907b8 100644 --- a/pkgs/applications/video/makemkv/default.nix +++ b/pkgs/applications/video/makemkv/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , mkDerivation , fetchurl , autoPatchelfHook @@ -13,21 +13,21 @@ }: let - version = "1.15.3"; + version = "1.15.4"; # Using two URLs as the first one will break as soon as a new version is released src_bin = fetchurl { urls = [ "http://www.makemkv.com/download/makemkv-bin-${version}.tar.gz" "http://www.makemkv.com/download/old/makemkv-bin-${version}.tar.gz" ]; - hash = "sha256-Y23aetnwqLGaBIgJ/AP0oCrh8P5jpVrcMJgmc0Oe+i8="; + hash = "sha256-Reun5hp7Rnsf6N5yL6iQ1Vbhnz/AKnt/jYRqyOK625o="; }; src_oss = fetchurl { urls = [ "http://www.makemkv.com/download/makemkv-oss-${version}.tar.gz" "http://www.makemkv.com/download/old/makemkv-oss-${version}.tar.gz" ]; - hash = "sha256-Qruq9YKAaNF1pDtOhptP95UjFL2NA4EuROR4v6XZHEw="; + hash = "sha256-gtBi1IRNF5ASk/ZdzkDmOuEIT9gazNaRNCftqbLEP+M="; }; in mkDerivation { pname = "makemkv"; @@ -58,7 +58,7 @@ in mkDerivation { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Convert blu-ray and dvd to mkv"; longDescription = '' makemkv is a one-click QT application that transcodes an encrypted diff --git a/pkgs/applications/video/mapmap/default.nix b/pkgs/applications/video/mapmap/default.nix index 003da6e6a941..284cc4ae58ac 100644 --- a/pkgs/applications/video/mapmap/default.nix +++ b/pkgs/applications/video/mapmap/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , fetchpatch , qttools @@ -67,7 +67,7 @@ mkDerivation rec { # rm -r $NIX_BUILD_TOP/__nix_qt5__ # ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Open source video mapping software"; homepage = "https://github.com/mapmapteam/mapmap"; license = licenses.gpl3; diff --git a/pkgs/applications/video/mediathekview/default.nix b/pkgs/applications/video/mediathekview/default.nix index 7c7ceb914ae7..6a8731dd72eb 100644 --- a/pkgs/applications/video/mediathekview/default.nix +++ b/pkgs/applications/video/mediathekview/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, jre }: +{ lib, stdenv, fetchurl, makeWrapper, jre }: stdenv.mkDerivation rec { version = "13.5.1"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { --add-flags "-Xmx1G -Djava.net.preferIPv4Stack=true -jar $out/lib/MediathekView.jar" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Offers access to the Mediathek of different tv stations (ARD, ZDF, Arte, etc.)"; homepage = "https://mediathekview.de/"; license = licenses.gpl3; diff --git a/pkgs/applications/video/mjpg-streamer/default.nix b/pkgs/applications/video/mjpg-streamer/default.nix index b6856f1a18e3..a82839ef7548 100644 --- a/pkgs/applications/video/mjpg-streamer/default.nix +++ b/pkgs/applications/video/mjpg-streamer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, libjpeg }: +{ lib, stdenv, fetchFromGitHub, cmake, libjpeg }: stdenv.mkDerivation { pname = "mjpg-streamer"; @@ -22,7 +22,7 @@ stdenv.mkDerivation { patchelf --set-rpath "$(patchelf --print-rpath $out/bin/mjpg_streamer):$out/lib/mjpg-streamer" $out/bin/mjpg_streamer ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/jacksonliam/mjpg-streamer"; description = "Takes JPGs from Linux-UVC compatible webcams, filesystem or other input plugins and streams them as M-JPEG via HTTP to webbrowsers, VLC and other software"; platforms = platforms.linux; diff --git a/pkgs/applications/video/mkclean/default.nix b/pkgs/applications/video/mkclean/default.nix index 36cd2206070c..05f1efc0f610 100644 --- a/pkgs/applications/video/mkclean/default.nix +++ b/pkgs/applications/video/mkclean/default.nix @@ -1,4 +1,4 @@ -{ dos2unix, fetchurl, stdenv }: +{ dos2unix, fetchurl, lib, stdenv }: stdenv.mkDerivation rec { pname = "mkclean"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { mv release/gcc_linux_*/* $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Command line tool to clean and optimize Matroska (.mkv / .mka / .mks / .mk3d) and WebM (.webm / .weba) files that have already been muxed"; homepage = "https://www.matroska.org"; license = licenses.bsdOriginal; diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix index 77bacea2a232..9ad64e72fd3a 100644 --- a/pkgs/applications/video/mkvtoolnix/default.nix +++ b/pkgs/applications/video/mkvtoolnix/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, pkgconfig, autoconf, automake, libiconv, drake +{ lib, stdenv, fetchFromGitLab, pkgconfig, autoconf, automake, libiconv, drake , ruby, docbook_xsl, file, xdg_utils, gettext, expat, boost, libebml, zlib , fmt, libmatroska, libogg, libvorbis, flac, libxslt, cmark, pcre2 , withGUI ? true @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { wrapQtApp $out/bin/mkvtoolnix-gui ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Cross-platform tools for Matroska"; homepage = "http://www.bunkus.org/videotools/mkvtoolnix/"; license = licenses.gpl2; diff --git a/pkgs/applications/video/motion/default.nix b/pkgs/applications/video/motion/default.nix index e25101250411..b37326471621 100644 --- a/pkgs/applications/video/motion/default.nix +++ b/pkgs/applications/video/motion/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig , ffmpeg, libjpeg, libmicrohttpd }: stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ ffmpeg libjpeg libmicrohttpd ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Monitors the video signal from cameras"; homepage = "https://motion-project.github.io/"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/video/mpc-qt/default.nix b/pkgs/applications/video/mpc-qt/default.nix index d9de3eb699d4..7c4126bb37c6 100644 --- a/pkgs/applications/video/mpc-qt/default.nix +++ b/pkgs/applications/video/mpc-qt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, mkDerivation, fetchFromGitLab, fetchpatch, pkg-config, qmake, qtx11extras, qttools, mpv }: +{ lib, stdenv, mkDerivation, fetchFromGitLab, fetchpatch, pkg-config, qmake, qtx11extras, qttools, mpv }: mkDerivation rec { pname = "mpc-qt"; @@ -24,11 +24,12 @@ mkDerivation rec { qmakeFlags = [ "QMAKE_LUPDATE=${qttools.dev}/bin/lupdate" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Media Player Classic Qute Theater"; homepage = "https://gitlab.com/mpc-qt/mpc-qt"; license = licenses.gpl2; platforms = platforms.unix; + broken = stdenv.isDarwin; maintainers = with maintainers; [ romildo ]; }; } diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 2b9605aa3c26..8d487fecfdec 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -1,4 +1,4 @@ -{ config, stdenv, fetchFromGitHub +{ config, lib, stdenv, fetchFromGitHub, fetchpatch , addOpenGLRunpath, docutils, perl, pkgconfig, python3, wafHook, which , ffmpeg, freefont_ttf, freetype, libass, libpthreadstubs, mujs , nv-codec-headers, lua, libuchardet, libiconv ? null @@ -104,6 +104,14 @@ in stdenv.mkDerivation rec { sha256 = "sha256-3l32qQBpvWVjbLp5CZtO039oDQeH7C/cNAKtJxrzlRk="; }; + patches = [ + # To make mpv build with libplacebo 3.104.0: + (fetchpatch { # vo_gpu: placebo: update for upstream API changes + url = "https://github.com/mpv-player/mpv/commit/7c4465cefb27d4e0d07535d368febdf77b579566.patch"; + sha256 = "1yfc6220ak5kc5kf7zklmsa944nr9q0qaa27l507pgrmvcyiyzrx"; + }) + ]; + postPatch = '' patchShebangs ./TOOLS/ ''; @@ -209,7 +217,7 @@ in stdenv.mkDerivation rec { addOpenGLRunpath $out/bin/mpv ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A media player that supports many video formats (MPlayer and mplayer2 fork)"; homepage = "https://mpv.io"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/video/mpv/scripts/mpris.nix b/pkgs/applications/video/mpv/scripts/mpris.nix index 5f2a21ea7e44..020c38c8b576 100644 --- a/pkgs/applications/video/mpv/scripts/mpris.nix +++ b/pkgs/applications/video/mpv/scripts/mpris.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchpatch, fetchFromGitHub, pkgconfig, glib, mpv-unwrapped }: +{ lib, stdenv, fetchpatch, fetchFromGitHub, pkgconfig, glib, mpv-unwrapped }: stdenv.mkDerivation rec { pname = "mpv-mpris"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { stripDebugList = [ "share/mpv/scripts" ]; passthru.scriptName = "mpris.so"; - meta = with stdenv.lib; { + meta = with lib; { description = "MPRIS plugin for mpv"; homepage = "https://github.com/hoyon/mpv-mpris"; license = licenses.mit; diff --git a/pkgs/applications/video/mpv/scripts/simple-mpv-webui.nix b/pkgs/applications/video/mpv/scripts/simple-mpv-webui.nix index d51434e241c9..0c0597d3afb2 100644 --- a/pkgs/applications/video/mpv/scripts/simple-mpv-webui.nix +++ b/pkgs/applications/video/mpv/scripts/simple-mpv-webui.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub }: stdenv.mkDerivation rec { pname = "simple-mpv-ui"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; passthru.scriptName = "webui.lua"; - meta = with stdenv.lib; { + meta = with lib; { description = "A web based user interface with controls for the mpv mediaplayer"; homepage = "https://github.com/open-dynaMIX/simple-mpv-webui"; maintainers = [ maintainers.cript0nauta ]; diff --git a/pkgs/applications/video/mpv/scripts/sponsorblock.nix b/pkgs/applications/video/mpv/scripts/sponsorblock.nix index 8213e514d2ba..79ede806b0ca 100644 --- a/pkgs/applications/video/mpv/scripts/sponsorblock.nix +++ b/pkgs/applications/video/mpv/scripts/sponsorblock.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, python3 }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, python3 }: # Usage: `pkgs.mpv.override { scripts = [ pkgs.mpvScripts.sponsorblock ]; }` stdenv.mkDerivation { @@ -41,7 +41,7 @@ stdenv.mkDerivation { passthru.scriptName = "sponsorblock.lua"; - meta = with stdenv.lib; { + meta = with lib; { description = "mpv script to skip sponsored segments of YouTube videos"; homepage = "https://github.com/po5/mpv_sponsorblock"; license = licenses.gpl3; diff --git a/pkgs/applications/video/mythtv/default.nix b/pkgs/applications/video/mythtv/default.nix index db8d192b7587..5a7896546442 100644 --- a/pkgs/applications/video/mythtv/default.nix +++ b/pkgs/applications/video/mythtv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, mkDerivation, fetchFromGitHub, which, qtbase, qtwebkit, qtscript, xlibsWrapper +{ lib, stdenv, mkDerivation, fetchFromGitHub, which, qtbase, qtwebkit, qtscript, xlibsWrapper , libpulseaudio, fftwSinglePrec , lame, zlib, libGLU, libGL, alsaLib, freetype , perl, pkgconfig , libsamplerate, libbluray, lzo, libX11, libXv, libXrandr, libXvMC, libXinerama, libXxf86vm , libXmu , yasm, libuuid, taglib, libtool, autoconf, automake, file, exiv2, linuxHeaders @@ -32,7 +32,7 @@ mkDerivation rec { configureFlags = [ "--dvb-path=${linuxHeaders}/include" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.mythtv.org/"; description = "Open Source DVR"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/video/natron/default.nix b/pkgs/applications/video/natron/default.nix index dede7d6b29e0..75d271c4878a 100644 --- a/pkgs/applications/video/natron/default.nix +++ b/pkgs/applications/video/natron/default.nix @@ -114,7 +114,7 @@ stdenv.mkDerivation { --set PYTHONPATH "$PYTHONPATH" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Node-graph based, open-source compositing software"; longDescription = '' Node-graph based, open-source compositing software. Similar in diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index cdecde6b869a..1f8357324ea3 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -1,4 +1,4 @@ -{ config, stdenv +{ config, lib, stdenv , mkDerivation , fetchFromGitHub , addOpenGLRunpath @@ -110,7 +110,7 @@ in mkDerivation rec { addOpenGLRunpath $out/lib/obs-plugins/*.so ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Free and open source software for video recording and live streaming"; longDescription = '' This project is a rewrite of what was formerly known as "Open Broadcaster diff --git a/pkgs/applications/video/obs-studio/obs-ndi.nix b/pkgs/applications/video/obs-studio/obs-ndi.nix index a250a365ac63..d9867b1bb2d2 100644 --- a/pkgs/applications/video/obs-studio/obs-ndi.nix +++ b/pkgs/applications/video/obs-studio/obs-ndi.nix @@ -5,7 +5,7 @@ # mkdir -p ~/.config/obs-studio/plugins/bin # ln -s ~/.nix-profile/lib/obs-plugins/obs-ndi.so ~/.config/obs-studio/plugins/bin/ -{ stdenv, fetchFromGitHub, obs-studio, cmake, qtbase, ndi }: +{ lib, stdenv, fetchFromGitHub, obs-studio, cmake, qtbase, ndi }: stdenv.mkDerivation rec { pname = "obs-ndi"; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { "-DCMAKE_CXX_FLAGS=-I${obs-studio.src}/UI/obs-frontend-api" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Network A/V plugin for OBS Studio"; homepage = "https://github.com/Palakis/obs-ndi"; maintainers = with maintainers; [ peti jshcmpbll ]; diff --git a/pkgs/applications/video/obs-studio/wlrobs.nix b/pkgs/applications/video/obs-studio/wlrobs.nix index 14bc80dd3880..eba1508387b7 100644 --- a/pkgs/applications/video/obs-studio/wlrobs.nix +++ b/pkgs/applications/video/obs-studio/wlrobs.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation { "-Duse_dmabuf=${lib.boolToString dmabufSupport}" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "An obs-studio plugin that allows you to screen capture on wlroots based wayland compositors"; homepage = "https://hg.sr.ht/~scoopta/wlrobs"; maintainers = with maintainers; [ grahamc ]; diff --git a/pkgs/applications/video/olive-editor/default.nix b/pkgs/applications/video/olive-editor/default.nix index b1e70cd037c7..9356e4676a2a 100644 --- a/pkgs/applications/video/olive-editor/default.nix +++ b/pkgs/applications/video/olive-editor/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, which, qmake, mkDerivation, +{ lib, stdenv, fetchFromGitHub, pkgconfig, which, qmake, mkDerivation, qtmultimedia, wrapQtAppsHook, frei0r, opencolorio, ffmpeg-full, CoreFoundation }: @@ -27,7 +27,7 @@ mkDerivation rec { qtmultimedia ] ++ stdenv.lib.optional stdenv.isDarwin CoreFoundation; - meta = with stdenv.lib; { + meta = with lib; { description = "Professional open-source NLE video editor"; homepage = "https://www.olivevideoeditor.org/"; downloadPage = "https://www.olivevideoeditor.org/download.php"; diff --git a/pkgs/applications/video/openshot-qt/default.nix b/pkgs/applications/video/openshot-qt/default.nix index 9245bdf03e43..f3c0187d9cb3 100644 --- a/pkgs/applications/video/openshot-qt/default.nix +++ b/pkgs/applications/video/openshot-qt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, mkDerivationWith, fetchFromGitHub, fetchpatch +{ lib, stdenv, mkDerivationWith, fetchFromGitHub, fetchpatch , doxygen, python3Packages, libopenshot , wrapGAppsHook, gtk3 , qtsvg }: @@ -42,7 +42,7 @@ mkDerivationWith python3Packages.buildPythonApplication rec { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://openshot.org/"; description = "Free, open-source video editor"; longDescription = '' @@ -55,8 +55,5 @@ mkDerivationWith python3Packages.buildPythonApplication rec { license = with licenses; gpl3Plus; maintainers = with maintainers; [ AndersonTorres ]; platforms = with platforms; unix; - # Cannot use a newer Qt (5.15) version because it requires qtwebkit - # and our qtwebkit fails to build with 5.15. 01bcfd3579219d60e5d07df309a000f96b2b658b - broken = true; }; } diff --git a/pkgs/applications/video/openshot-qt/libopenshot.nix b/pkgs/applications/video/openshot-qt/libopenshot.nix index 1b6084a1d2f9..1ab7a5266a23 100644 --- a/pkgs/applications/video/openshot-qt/libopenshot.nix +++ b/pkgs/applications/video/openshot-qt/libopenshot.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ stdenv, fetchFromGitHub, fetchpatch , pkgconfig, cmake, doxygen , libopenshot-audio, imagemagick, ffmpeg_3 , swig, python3 @@ -19,7 +19,15 @@ stdenv.mkDerivation rec { sha256 = "1mxjkgjmjzgf628y3rscc6rqf55hxgjpmvwxlncfk1216i5xskwp"; }; - patchPhase = '' + patches = [ + (fetchpatch { + name = "fix-build-with-gcc-10.patch"; + url = "https://github.com/OpenShot/libopenshot/commit/13290364e7bea54164ab83d973951f2898ad9e23.diff"; + sha256 = "0i7rpdsr8y9dphil8yq75qbh20vfqjc2hp5ahv0ws58z9wj6ngnz"; + }) + ]; + + postPatch = '' sed -i 's/{UNITTEST++_INCLUDE_DIR}/ENV{UNITTEST++_INCLUDE_DIR}/g' tests/CMakeLists.txt sed -i 's/{_REL_PYTHON_MODULE_PATH}/ENV{_REL_PYTHON_MODULE_PATH}/g' src/bindings/python/CMakeLists.txt export _REL_PYTHON_MODULE_PATH=$(toPythonPath $out) diff --git a/pkgs/applications/video/peek/default.nix b/pkgs/applications/video/peek/default.nix index 6ca5c5bed212..17f9d20695ea 100644 --- a/pkgs/applications/video/peek/default.nix +++ b/pkgs/applications/video/peek/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , nix-update-script , meson @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/phw/peek"; description = "Simple animated GIF screen recorder with an easy to use interface"; license = licenses.gpl3; diff --git a/pkgs/applications/video/pitivi/default.nix b/pkgs/applications/video/pitivi/default.nix index 7aef0bfd0353..c56878dea351 100644 --- a/pkgs/applications/video/pitivi/default.nix +++ b/pkgs/applications/video/pitivi/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , fetchurl , pkg-config @@ -96,7 +96,7 @@ python3Packages.buildPythonApplication rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Non-Linear video editor utilizing the power of GStreamer"; homepage = "http://pitivi.org/"; longDescription = '' diff --git a/pkgs/applications/video/plex-media-player/default.nix b/pkgs/applications/video/plex-media-player/default.nix index 107fd5f599ab..5f7f62a409b2 100644 --- a/pkgs/applications/video/plex-media-player/default.nix +++ b/pkgs/applications/video/plex-media-player/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchurl, pkgconfig, cmake, python3, mkDerivation +{ lib, stdenv, fetchFromGitHub, fetchurl, pkgconfig, cmake, python3, mkDerivation , libX11, libXrandr, qtbase, qtwebchannel, qtwebengine, qtx11extras , libvdpau, SDL2, mpv, libGL }: let @@ -38,7 +38,7 @@ in mkDerivation rec { passthru.updateScript = ./update.sh; - meta = with stdenv.lib; { + meta = with lib; { description = "Streaming media player for Plex"; license = licenses.gpl2; maintainers = with maintainers; [ ]; diff --git a/pkgs/applications/video/plex-mpv-shim/default.nix b/pkgs/applications/video/plex-mpv-shim/default.nix index e25c101b5dfb..7738dd99d215 100644 --- a/pkgs/applications/video/plex-mpv-shim/default.nix +++ b/pkgs/applications/video/plex-mpv-shim/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonApplication, fetchFromGitHub, mpv, requests, python-mpv-jsonipc }: +{ lib, stdenv, buildPythonApplication, fetchFromGitHub, mpv, requests, python-mpv-jsonipc }: buildPythonApplication rec { pname = "plex-mpv-shim"; @@ -13,7 +13,10 @@ buildPythonApplication rec { propagatedBuildInputs = [ mpv requests python-mpv-jsonipc ]; - meta = with stdenv.lib; { + # does not contain tests + doCheck = false; + + meta = with lib; { homepage = "https://github.com/iwalton3/plex-mpv-shim"; description = "Allows casting of videos to MPV via the Plex mobile and web app"; license = licenses.mit; diff --git a/pkgs/applications/video/pyca/default.nix b/pkgs/applications/video/pyca/default.nix index 0fed17bb9999..bf54c0a2d6cc 100644 --- a/pkgs/applications/video/pyca/default.nix +++ b/pkgs/applications/video/pyca/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonApplication, fetchFromGitHub, pycurl, dateutil, configobj, sqlalchemy, sdnotify, flask }: +{ lib, stdenv, buildPythonApplication, fetchFromGitHub, pycurl, dateutil, configobj, sqlalchemy, sdnotify, flask }: buildPythonApplication rec { pname = "pyca"; @@ -20,7 +20,7 @@ buildPythonApplication rec { flask ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A fully functional Opencast capture agent written in Python"; homepage = "https://github.com/opencast/pyCA"; license = licenses.lgpl3; diff --git a/pkgs/applications/video/qmediathekview/default.nix b/pkgs/applications/video/qmediathekview/default.nix index 7556727a80d3..0de021a82a18 100644 --- a/pkgs/applications/video/qmediathekview/default.nix +++ b/pkgs/applications/video/qmediathekview/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, stdenv, fetchFromGitHub, qtbase, qttools, xz, boost, qmake, pkgconfig }: +{ mkDerivation, lib, stdenv, fetchFromGitHub, qtbase, qttools, xz, boost, qmake, pkgconfig }: mkDerivation rec { pname = "QMediathekView"; @@ -22,7 +22,7 @@ mkDerivation rec { installFlags = [ "INSTALL_ROOT=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "An alternative Qt-based front-end for the database maintained by the MediathekView project"; inherit (src.meta) homepage; license = licenses.gpl3Plus; diff --git a/pkgs/applications/video/qmplay2/default.nix b/pkgs/applications/video/qmplay2/default.nix index b7f7f8c53023..ecedd730094c 100644 --- a/pkgs/applications/video/qmplay2/default.nix +++ b/pkgs/applications/video/qmplay2/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , pkg-config , cmake @@ -22,7 +22,7 @@ let pname = "qmplay2"; - version = "20.07.04"; + version = "20.12.16"; in stdenv.mkDerivation { inherit pname version; @@ -30,7 +30,7 @@ in stdenv.mkDerivation { owner = "zaps166"; repo = "QMPlay2"; rev = version; - sha256 = "sha256-sUDucxSvsdD2C2FSVrrXeHdNdrjECtJSXVr106OdHzA="; + sha256 = "sha256-+XXlQI9MyENioYmzqbbZYQ6kaMATBjPrPaErR2Vqhus="; fetchSubmodules = true; }; @@ -58,7 +58,7 @@ in stdenv.mkDerivation { ln -s $out/bin/QMPlay2 $out/bin/qmplay2 ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/zaps166/QMPlay2/"; description = "Qt-based Multimedia player"; longDescription = '' diff --git a/pkgs/applications/video/qstopmotion/default.nix b/pkgs/applications/video/qstopmotion/default.nix index dbb2128b50bf..008e73cd6ed7 100644 --- a/pkgs/applications/video/qstopmotion/default.nix +++ b/pkgs/applications/video/qstopmotion/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , mkDerivation , fetchurl , qtbase @@ -64,7 +64,7 @@ mkDerivation rec { grep -rl 'qwt' . | xargs sed -i 's@@@g' ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.qstopmotion.org"; description = "Create stopmotion animation with a (web)camera"; longDescription = '' diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix index 1b3ca2850482..bae6a0ac7f37 100644 --- a/pkgs/applications/video/shotcut/default.nix +++ b/pkgs/applications/video/shotcut/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , fetchpatch , mkDerivation @@ -83,7 +83,7 @@ mkDerivation rec { rev-prefix = "v"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A free, open source, cross-platform video editor"; longDescription = '' An official binary for Shotcut, which includes all the diff --git a/pkgs/applications/video/simplescreenrecorder/default.nix b/pkgs/applications/video/simplescreenrecorder/default.nix index 7176f5e2f09c..b42e14121529 100644 --- a/pkgs/applications/video/simplescreenrecorder/default.nix +++ b/pkgs/applications/video/simplescreenrecorder/default.nix @@ -1,4 +1,4 @@ -{ stdenv, mkDerivation, fetchurl, alsaLib, ffmpeg_3, libjack2, libX11, libXext, qtx11extras +{ lib, stdenv, mkDerivation, fetchurl, alsaLib, ffmpeg_3, libjack2, libX11, libXext, qtx11extras , libXfixes, libGLU, libGL, pkgconfig, libpulseaudio, qtbase, cmake, ninja }: @@ -29,7 +29,7 @@ mkDerivation rec { libpulseaudio qtbase qtx11extras ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A screen recorder for Linux"; homepage = "https://www.maartenbaert.be/simplescreenrecorder"; license = licenses.gpl3; diff --git a/pkgs/applications/video/streamlink-twitch-gui/bin.nix b/pkgs/applications/video/streamlink-twitch-gui/bin.nix index 1c955a36f34a..bc265d3e786b 100644 --- a/pkgs/applications/video/streamlink-twitch-gui/bin.nix +++ b/pkgs/applications/video/streamlink-twitch-gui/bin.nix @@ -1,8 +1,29 @@ -{ autoPatchelfHook, fetchurl, lib, makeDesktopItem, makeWrapper, stdenv, wrapGAppsHook -, at-spi2-core, atk, alsaLib, cairo, cups, dbus, expat, gcc-unwrapped -, gdk-pixbuf, glib, pango, gtk3-x11, libudev0-shim, libuuid, nss, nspr, xorg -, streamlink }: - +{ autoPatchelfHook +, fetchurl +, lib +, makeDesktopItem +, makeWrapper +, stdenv +, wrapGAppsHook +, at-spi2-core +, atk +, alsaLib +, cairo +, cups +, dbus +, expat +, gcc-unwrapped +, gdk-pixbuf +, glib +, pango +, gtk3-x11 +, libudev0-shim +, libuuid +, nss +, nspr +, xorg +, streamlink +}: let basename = "streamlink-twitch-gui"; runtimeLibs = lib.makeLibraryPath [ libudev0-shim ]; @@ -16,16 +37,16 @@ let in stdenv.mkDerivation rec { pname = "${basename}-bin"; - version = "1.10.0"; + version = "1.11.0"; src = fetchurl { url = "https://github.com/streamlink/${basename}/releases/download/v${version}/${basename}-v${version}-${arch}.tar.gz"; sha256 = if arch == "linux64" then - "17s9zbzj4pgz9mxxwjbp3788afkddc9s3p7xp28y5084z9wwzph2" + "0y96nziavvpdvrpn58p6a175kaa8cgadp19rnbm250x9cypn1d9y" else - "1pww05hr48m6v0g1sz48g1c7p615lig3s12l21xgyz4gkjzmjy22"; + "0sfmhqf55w7wavqy4idsqpkf5p7l8sapjxap6xvyzpz4z5z6xr7y"; }; nativeBuildInputs = with xorg; [ @@ -88,7 +109,7 @@ stdenv.mkDerivation rec { categories = "AudioVideo;Network;"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Twitch.tv browser for Streamlink"; longDescription = "Browse Twitch.tv and watch streams in your videoplayer of choice"; homepage = "https://streamlink.github.io/streamlink-twitch-gui/"; diff --git a/pkgs/applications/video/streamlink/default.nix b/pkgs/applications/video/streamlink/default.nix index 4c8800c918e2..97607f939fdd 100644 --- a/pkgs/applications/video/streamlink/default.nix +++ b/pkgs/applications/video/streamlink/default.nix @@ -1,21 +1,42 @@ -{ stdenv, pythonPackages, fetchFromGitHub, rtmpdump, ffmpeg_3 }: +{ lib +, pythonPackages +, fetchFromGitHub +, rtmpdump +, ffmpeg_3 +}: pythonPackages.buildPythonApplication rec { - version = "1.5.0"; pname = "streamlink"; + version = "2.0.0"; + disabled = pythonPackages.pythonOlder "3.5.0"; src = fetchFromGitHub { owner = "streamlink"; repo = "streamlink"; rev = version; - sha256 = "00pishpyim3mcvr9njcbfhj79j85b5xhkslk3mspc2csqknw4k61"; + sha256 = "+W9Nu5Ze08r7IlUZOkkVOz582E1Bbj0a3qIQHwxSmj8="; }; - checkInputs = with pythonPackages; [ pytest mock requests-mock freezegun ]; + checkInputs = with pythonPackages; [ + pytest + mock + requests-mock + freezegun + ]; - propagatedBuildInputs = (with pythonPackages; [ pycryptodome requests iso-639 iso3166 websocket_client isodate ]) ++ [ rtmpdump ffmpeg_3 ]; + propagatedBuildInputs = (with pythonPackages; [ + pycryptodome + requests + iso-639 + iso3166 + websocket_client + isodate + ]) ++ [ + rtmpdump + ffmpeg_3 + ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/streamlink/streamlink"; description = "CLI for extracting streams from various websites to video player of your choosing"; longDescription = '' @@ -27,6 +48,6 @@ pythonPackages.buildPythonApplication rec { ''; license = licenses.bsd2; platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ dezgeg zraexy enzime ]; + maintainers = with maintainers; [ dezgeg zraexy ]; }; } diff --git a/pkgs/applications/video/sub-batch/default.nix b/pkgs/applications/video/sub-batch/default.nix new file mode 100644 index 000000000000..244e826f0a24 --- /dev/null +++ b/pkgs/applications/video/sub-batch/default.nix @@ -0,0 +1,27 @@ +{ stdenv +, fetchFromGitHub +, rustPlatform +}: + +rustPlatform.buildRustPackage rec { + pname = "sub-batch"; + version = "0.3.0"; + + src = fetchFromGitHub { + owner = "kl"; + repo = pname; + # Upstream doesn't tag releases. + rev = "631bd6e2d931f8a8e12798f4b6460739a14bcfff"; + sha256 = "sha256-424e40v2LBxlmgDKxvsT/iuUn/IKWPKMwih0cSQ5sFE="; + }; + + cargoSha256 = "sha256-l+BTF9PGb8bG8QHhNCoBsrsVX8nlRjPlaea1ESFfMW0="; + + meta = with stdenv.lib; { + description = "Match and rename subtitle files to video files and perform other batch operations on subtitle files"; + homepage = "https://github.com/kl/sub-batch"; + license = licenses.mit; + maintainers = with maintainers; [ erictapen ]; + broken = stdenv.isDarwin; + }; +} diff --git a/pkgs/applications/video/subtitleeditor/default.nix b/pkgs/applications/video/subtitleeditor/default.nix index 29e2de6b6c0a..eea6353d66cd 100644 --- a/pkgs/applications/video/subtitleeditor/default.nix +++ b/pkgs/applications/video/subtitleeditor/default.nix @@ -35,6 +35,9 @@ stdenv.mkDerivation { gst_all_1.gstreamermm gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good + gst_all_1.gst-plugins-bad + gst_all_1.gst-plugins-ugly + gst_all_1.gst-libav hicolor-icon-theme libsigcxx libxmlxx diff --git a/pkgs/applications/video/tartube/default.nix b/pkgs/applications/video/tartube/default.nix index 23ee76eb4693..36375d9ecc06 100644 --- a/pkgs/applications/video/tartube/default.nix +++ b/pkgs/applications/video/tartube/default.nix @@ -10,17 +10,18 @@ , wrapGAppsHook , youtube-dl , glib +, ffmpeg }: python3Packages.buildPythonApplication rec { pname = "tartube"; - version = "2.1.0"; + version = "2.3.042"; src = fetchFromGitHub { owner = "axcore"; repo = "tartube"; rev = "v${version}"; - sha256 = "1klqjwqm29y2f6nc8gn222ykfvb5d64z1w2kifw9bq5bv0np9bda"; + sha256 = "117q4s2b2js3204506qv3kjcsy3amcf0mpwj6q0ixs1256ilkxwj"; }; nativeBuildInputs = [ @@ -37,6 +38,7 @@ python3Packages.buildPythonApplication rec { requests feedparser playsound + ffmpeg ]; buildInputs = [ @@ -48,7 +50,7 @@ python3Packages.buildPythonApplication rec { ]; postPatch = '' - sed -i "/^\s*install_requires/s/, 'gi'\|'gi', \|'gi'//" setup.py + sed -i "/^\s*install_requires/s/, 'pgi'\|'pgi', \|'pgi'//" setup.py ''; postInstall = '' diff --git a/pkgs/applications/video/tivodecode/default.nix b/pkgs/applications/video/tivodecode/default.nix index 33e04b77c4b4..706dbc187377 100644 --- a/pkgs/applications/video/tivodecode/default.nix +++ b/pkgs/applications/video/tivodecode/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: let version = "0.2pre4"; @@ -14,7 +14,7 @@ stdenv.mkDerivation { sha256 = "1pww5r2iygscqn20a1cz9xbfh18p84a6a5ifg4h5nvyn9b63k23q"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Converts a .TiVo file (produced by TiVoToGo) to a normal MPEG file"; homepage = "http://tivodecode.sourceforge.net"; platforms = platforms.unix; diff --git a/pkgs/applications/video/uvccapture/default.nix b/pkgs/applications/video/uvccapture/default.nix index f52ffa923d28..70c3baa0b811 100644 --- a/pkgs/applications/video/uvccapture/default.nix +++ b/pkgs/applications/video/uvccapture/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libjpeg }: +{ lib, stdenv, fetchurl, libjpeg }: let debianPatches = fetchurl { @@ -41,7 +41,7 @@ stdenv.mkDerivation { cp -v debian/uvccapture.1 "$out/share/man/man1/" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Capture image from USB webcam at a specified interval"; license = licenses.gpl2Plus; platforms = platforms.linux; diff --git a/pkgs/applications/video/vdr/default.nix b/pkgs/applications/video/vdr/default.nix index bc3d54f3b5b8..16aa2a3e6a5f 100644 --- a/pkgs/applications/video/vdr/default.nix +++ b/pkgs/applications/video/vdr/default.nix @@ -5,12 +5,12 @@ }: stdenv.mkDerivation rec { pname = "vdr"; - version = "2.4.4"; + version = "2.4.6"; src = fetchgit { url = "git://git.tvdr.de/vdr.git"; - rev = "V20404"; - sha256 = "1fzghnp5mpcwn3a3fyk3w8h15z4f2cnc75247kvxj1c9069mgnwa"; + rev = "V20406"; + sha256 = "sha256-te9lMmnWpesv+np2gJUDL17pI0WyVxhUnoBsFSRtOco="; }; enableParallelBuilding = true; diff --git a/pkgs/applications/video/vdr/plugins.nix b/pkgs/applications/video/vdr/plugins.nix index e72de8e61f20..55ac94d8c6c7 100644 --- a/pkgs/applications/video/vdr/plugins.nix +++ b/pkgs/applications/video/vdr/plugins.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchgit, vdr, alsaLib, fetchFromGitHub +{ lib, stdenv, fetchurl, fetchgit, vdr, alsaLib, fetchFromGitHub , libvdpau, libxcb, xcbutilwm, graphicsmagick, libav, pcre, xorgserver, ffmpeg_3 , libiconv, boost, libgcrypt, perl, util-linux, groff, libva, xorg, ncurses , callPackage @@ -37,7 +37,7 @@ in { makeFlags = [ "DESTDIR=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.saunalahti.fi/~rahrenbe/vdr/femon/"; description = "DVB Frontend Status Monitor plugin for VDR"; maintainers = [ maintainers.ck3d ]; @@ -72,7 +72,7 @@ in { rev = "d19657bae399e79df107e316ca40922d21393f80"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/pesintta/vdr-plugin-vaapidevice"; description = "VDR SoftHDDevice Plug-in (with VA-API VPP additions)"; maintainers = [ maintainers.ck3d ]; @@ -118,7 +118,7 @@ in { installFlags = buildFlags; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://projects.vdr-developer.org/projects/plg-markad"; description = "Ein Programm zum automatischen Setzen von Schnittmarken bei Werbeeinblendungen während einer Sendung."; maintainers = [ maintainers.ck3d ]; @@ -166,7 +166,7 @@ in { outputs = [ "out" "man" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://winni.vdr-developer.org/epgsearch"; description = "Searchtimer and replacement of the VDR program menu"; maintainers = [ maintainers.ck3d ]; @@ -193,7 +193,7 @@ in { sha256 = "0n7idpxqx7ayd63scl6xwdx828ik4kb2mwz0c30cfjnmnxxd45lw"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/FernetMenta/vdr-plugin-vnsiserver"; description = "VDR plugin to handle KODI clients."; maintainers = [ maintainers.ck3d ]; @@ -228,7 +228,7 @@ in { installPhase = ":"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://projects.vdr-developer.org/projects/plg-text2skin"; description = "VDR Text2Skin Plugin"; maintainers = [ maintainers.ck3d ]; @@ -329,7 +329,7 @@ in { installFlags = [ "DESTDIR=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/jowi24/vdr-fritz"; description = "A plugin for VDR to access AVMs Fritz Box routers"; maintainers = [ maintainers.ck3d ]; diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index 1c52a89e98d4..559398677a41 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook +{ lib, stdenv, fetchurl, autoreconfHook , libarchive, perl, xorg, libdvdnav, libbluray , zlib, a52dec, libmad, faad2, ffmpeg_3, alsaLib , pkgconfig, dbus, fribidi, freefont_ttf, libebml, libmatroska @@ -100,7 +100,7 @@ stdenv.mkDerivation rec { sed -i 's|^#define CONFIGURE_LINE.*$|#define CONFIGURE_LINE ""|g' config.h ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Cross-platform media player and streaming server"; homepage = "http://www.videolan.org/vlc/"; license = licenses.lgpl21Plus; diff --git a/pkgs/applications/video/vokoscreen/default.nix b/pkgs/applications/video/vokoscreen/default.nix index 94d0de20ccf7..c0b6853cf329 100644 --- a/pkgs/applications/video/vokoscreen/default.nix +++ b/pkgs/applications/video/vokoscreen/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, mkDerivation +{ lib, stdenv, fetchFromGitHub, mkDerivation , pkgconfig, qtbase, qttools, qmake, qtmultimedia, qtx11extras, alsaLib, libv4l, libXrandr , ffmpeg }: @@ -38,7 +38,7 @@ mkDerivation rec { substituteInPlace settings/QvkSettings.cpp --subst-var-by ffmpeg ${ffmpeg} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Simple GUI screencast recorder, using ffmpeg"; homepage = "https://linuxecke.volkoh.de/vokoscreen/vokoscreen.html"; longDescription = '' diff --git a/pkgs/applications/video/webtorrent_desktop/default.nix b/pkgs/applications/video/webtorrent_desktop/default.nix index 961cb403f13c..6b97fa63e0be 100644 --- a/pkgs/applications/video/webtorrent_desktop/default.nix +++ b/pkgs/applications/video/webtorrent_desktop/default.nix @@ -2,7 +2,7 @@ alsaLib, atk, cairo, cups, dbus, dpkg, expat, fetchurl, fetchzip, fontconfig, freetype, gdk-pixbuf, glib, gnome3, libX11, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext, libXfixes, libXi, libXrandr, libXrender, libXtst, - libxcb, nspr, nss, stdenv, udev, libuuid, pango, at-spi2-atk, at-spi2-core + libxcb, nspr, nss, lib, stdenv, udev, libuuid, pango, at-spi2-atk, at-spi2-core }: let @@ -84,7 +84,7 @@ --replace /opt/webtorrent-desktop $out/libexec ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Streaming torrent app for Mac, Windows, and Linux"; homepage = "https://webtorrent.io/desktop"; license = licenses.mit; diff --git a/pkgs/applications/video/wf-recorder/default.nix b/pkgs/applications/video/wf-recorder/default.nix index 09b67149f5a9..0b8d1ad22b9f 100644 --- a/pkgs/applications/video/wf-recorder/default.nix +++ b/pkgs/applications/video/wf-recorder/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, meson, ninja, pkg-config, wayland, scdoc +{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, wayland, scdoc , wayland-protocols, ffmpeg, x264, libpulseaudio, ocl-icd, opencl-headers }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { wayland-protocols ffmpeg x264 libpulseaudio ocl-icd opencl-headers ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Utility program for screen recording of wlroots-based compositors"; inherit (src.meta) homepage; changelog = "https://github.com/ammen99/wf-recorder/releases/tag/v${version}"; diff --git a/pkgs/applications/video/wxcam/default.nix b/pkgs/applications/video/wxcam/default.nix index 32712d5b9b07..9294c4d2cde1 100644 --- a/pkgs/applications/video/wxcam/default.nix +++ b/pkgs/applications/video/wxcam/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , pkgconfig , intltool , libX11, libXv, libSM @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { make install prefix="$out" wxcamdocdir="$out/share/doc/wxcam" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "An open-source, wxGTK-based webcam app for Linux"; longDescription = '' wxCam is a webcam application for linux. It supports video recording diff --git a/pkgs/applications/video/xine-ui/default.nix b/pkgs/applications/video/xine-ui/default.nix index f52db04928a4..c11d77c29744 100644 --- a/pkgs/applications/video/xine-ui/default.nix +++ b/pkgs/applications/video/xine-ui/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, xorg, libpng, xineLib, readline, ncurses, curl +{lib, stdenv, fetchurl, pkgconfig, xorg, libpng, xineLib, readline, ncurses, curl , lirc, shared-mime-info, libjpeg }: stdenv.mkDerivation rec { @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { LIRC_LIBS="-L ${lirc}/lib -llirc_client"; #NIX_LDFLAGS = "-lXext -lgcc_s"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.xine-project.org/"; description = "Xlib-based interface to Xine, a video player"; platforms = platforms.linux; diff --git a/pkgs/applications/video/xscast/default.nix b/pkgs/applications/video/xscast/default.nix index f9e6a3d6521f..050b5b32b198 100644 --- a/pkgs/applications/video/xscast/default.nix +++ b/pkgs/applications/video/xscast/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, makeWrapper, ffmpeg_3, imagemagick, dzen2, xorg }: +{ lib, stdenv, fetchFromGitHub, makeWrapper, ffmpeg_3, imagemagick, dzen2, xorg }: stdenv.mkDerivation { pname = "xscast-unstable"; @@ -26,7 +26,7 @@ stdenv.mkDerivation { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/KeyboardFire/xscast"; license = licenses.mit; description = "Screencasts of windows with list of keystrokes overlayed"; diff --git a/pkgs/applications/video/xvidcap/default.nix b/pkgs/applications/video/xvidcap/default.nix index 20d4d84741cc..0f7f9390daca 100644 --- a/pkgs/applications/video/xvidcap/default.nix +++ b/pkgs/applications/video/xvidcap/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perlPackages, pkgconfig, gtk2 +{ lib, stdenv, fetchurl, perlPackages, pkgconfig, gtk2 , scrollkeeper, libglade, libXmu, libX11, libXext, gettext , lame, libXfixes, libXdamage }: @@ -21,7 +21,7 @@ stdenv.mkDerivation { # !!! don't know why this is necessary NIX_LDFLAGS = "-lXext -lX11 -lz -lgcc_s"; - meta = with stdenv.lib; { + meta = with lib; { description = "Screencast video catpuring tool"; homepage = "http://xvidcap.sourceforge.net/"; license = stdenv.lib.licenses.gpl2; diff --git a/pkgs/applications/virtualization/8086tiny/default.nix b/pkgs/applications/virtualization/8086tiny/default.nix index db76efb96e5f..addab70c3b3d 100644 --- a/pkgs/applications/virtualization/8086tiny/default.nix +++ b/pkgs/applications/virtualization/8086tiny/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , localBios ? true, nasm ? null , sdlSupport ? true, SDL ? null }: @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { builder = ./builder.sh; - meta = with stdenv.lib; { + meta = with lib; { description = "An open-source small 8086 emulator"; longDescription = '' 8086tiny is a tiny, open-source (MIT), portable (little-endian hosts) diff --git a/pkgs/applications/virtualization/aqemu/default.nix b/pkgs/applications/virtualization/aqemu/default.nix index 9177f2645028..d31523e946ac 100644 --- a/pkgs/applications/virtualization/aqemu/default.nix +++ b/pkgs/applications/virtualization/aqemu/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, cmake, fetchFromGitHub, libvncserver, qemu, qtbase, stdenv +{ mkDerivation, cmake, fetchFromGitHub, libvncserver, qemu, qtbase, lib, stdenv }: mkDerivation rec { @@ -16,7 +16,7 @@ mkDerivation rec { buildInputs = [ libvncserver qtbase qemu ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A virtual machine manager GUI for qemu"; homepage = "https://github.com/tobimensch/aqemu"; license = licenses.gpl2; diff --git a/pkgs/applications/virtualization/cntr/default.nix b/pkgs/applications/virtualization/cntr/default.nix index ab9b63eb79b2..f7b7c99b5540 100644 --- a/pkgs/applications/virtualization/cntr/default.nix +++ b/pkgs/applications/virtualization/cntr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, rustPlatform, fetchFromGitHub }: +{ lib, stdenv, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "cntr"; @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-lblvun2T1qpFiowld77Ti2MFPzhs5pOWWRbErORXYCM="; - meta = with stdenv.lib; { + meta = with lib; { description = "A container debugging tool based on FUSE"; homepage = "https://github.com/Mic92/cntr"; license = licenses.mit; diff --git a/pkgs/applications/virtualization/conmon/default.nix b/pkgs/applications/virtualization/conmon/default.nix index e143ebcca755..2afb1e7874fd 100644 --- a/pkgs/applications/virtualization/conmon/default.nix +++ b/pkgs/applications/virtualization/conmon/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , pkg-config , glib @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { passthru.tests = { inherit (nixosTests) cri-o podman; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/containers/conmon"; description = "An OCI container runtime monitor"; license = licenses.asl20; diff --git a/pkgs/applications/virtualization/cri-o/default.nix b/pkgs/applications/virtualization/cri-o/default.nix index 54ffb036f3c3..7914fd243270 100644 --- a/pkgs/applications/virtualization/cri-o/default.nix +++ b/pkgs/applications/virtualization/cri-o/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , btrfs-progs , buildGoModule , fetchFromGitHub @@ -56,7 +56,7 @@ buildGoModule rec { passthru.tests = { inherit (nixosTests) cri-o; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://cri-o.io"; description = '' Open Container Initiative-based implementation of the diff --git a/pkgs/applications/virtualization/docker-compose/default.nix b/pkgs/applications/virtualization/docker-compose/default.nix index 766c81d6befe..e9e6092e1f9b 100644 --- a/pkgs/applications/virtualization/docker-compose/default.nix +++ b/pkgs/applications/virtualization/docker-compose/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonApplication, fetchPypi, pythonOlder +{ lib, stdenv, buildPythonApplication, fetchPypi, pythonOlder , installShellFiles , mock, pytest, nose , pyyaml, backports_ssl_match_hostname, colorama, docopt @@ -39,7 +39,7 @@ buildPythonApplication rec { installShellCompletion --zsh contrib/completion/zsh/_docker-compose ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://docs.docker.com/compose/"; description = "Multi-container orchestration for Docker"; license = licenses.asl20; diff --git a/pkgs/applications/virtualization/docker-slim/default.nix b/pkgs/applications/virtualization/docker-slim/default.nix index 9ba7ff5d66bc..6c1ef95cd6f7 100644 --- a/pkgs/applications/virtualization/docker-slim/default.nix +++ b/pkgs/applications/virtualization/docker-slim/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildGoPackage , fetchFromGitHub , makeWrapper @@ -36,7 +36,7 @@ buildGoPackage rec { wrapProgram "$out/bin/docker-slim" --add-flags '--state-path "$(pwd)"' ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Minify and secure Docker containers"; homepage = "https://dockersl.im/"; changelog = "https://github.com/docker-slim/docker-slim/blob/${version}/CHANGELOG.md"; diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 1f4d5e3aac64..8e75bf46f497 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, fetchpatch, buildGoPackage -, makeWrapper, installShellFiles, pkgconfig +, makeWrapper, installShellFiles, pkg-config , go-md2man, go, containerd, runc, docker-proxy, tini, libtool , sqlite, iproute, lvm2, systemd , btrfs-progs, iptables, e2fsprogs, xz, util-linux, xfsprogs, git @@ -12,6 +12,7 @@ with lib; rec { dockerGen = { version, rev, sha256 + , mobyRev, mobySha256 , runcRev, runcSha256 , containerdRev, containerdSha256 , tiniRev, tiniSha256 @@ -30,9 +31,7 @@ rec { patches = []; }); - docker-containerd = let - withlibseccomp = lib.versionAtLeast version "19.03"; - in containerd.overrideAttrs (oldAttrs: { + docker-containerd = containerd.overrideAttrs (oldAttrs: { name = "docker-containerd-${version}"; inherit version; src = fetchFromGitHub { @@ -41,11 +40,7 @@ rec { rev = containerdRev; sha256 = containerdSha256; }; - # disable completion, can be removed when docker uses containerd >= 1.4 - postInstall = []; - # This should be removed once Docker uses containerd >=1.4 - nativeBuildInputs = oldAttrs.nativeBuildInputs ++ lib.optional withlibseccomp pkgconfig; - buildInputs = oldAttrs.buildInputs ++ lib.optional withlibseccomp libseccomp; + buildInputs = oldAttrs.buildInputs ++ [ libseccomp ]; }); docker-tini = tini.overrideAttrs (oldAttrs: { @@ -64,16 +59,69 @@ rec { NIX_CFLAGS_COMPILE = "-DMINIMAL=ON"; }); + + moby = buildGoPackage ((optionalAttrs (stdenv.isLinux)) rec { + name = "moby-${version}"; + inherit version; + inherit docker-runc docker-containerd docker-proxy docker-tini; + + src = fetchFromGitHub { + owner = "moby"; + repo = "moby"; + rev = mobyRev; + sha256 = mobySha256; + }; + + goPackagePath = "github.com/docker/docker"; + + nativeBuildInputs = [ makeWrapper pkg-config go-md2man go libtool installShellFiles ]; + buildInputs = [ sqlite lvm2 btrfs-progs systemd libseccomp ]; + + extraPath = optionals (stdenv.isLinux) (makeBinPath [ iproute iptables e2fsprogs xz xfsprogs procps util-linux git ]); + + buildPhase = '' + export GOCACHE="$TMPDIR/go-cache" + # build engine + cd ./go/src/${goPackagePath} + export AUTO_GOPATH=1 + export DOCKER_GITCOMMIT="${rev}" + export VERSION="${version}" + ./hack/make.sh dynbinary + cd - + ''; + + postPatch = '' + patchShebangs . + substituteInPlace ./hack/make.sh --replace libsystemd-journal libsystemd + ''; + + installPhase = '' + cd ./go/src/${goPackagePath} + install -Dm755 ./bundles/dynbinary-daemon/dockerd $out/libexec/docker/dockerd + + makeWrapper $out/libexec/docker/dockerd $out/bin/dockerd \ + --prefix PATH : "$out/libexec/docker:$extraPath" + + ln -s ${docker-containerd}/bin/containerd $out/libexec/docker/containerd + ln -s ${docker-containerd}/bin/containerd-shim $out/libexec/docker/containerd-shim + ln -s ${docker-runc}/bin/runc $out/libexec/docker/runc + ln -s ${docker-proxy}/bin/docker-proxy $out/libexec/docker/docker-proxy + ln -s ${docker-tini}/bin/tini-static $out/libexec/docker/docker-init + + # systemd + install -Dm644 ./contrib/init/systemd/docker.service $out/etc/systemd/system/docker.service + ''; + + DOCKER_BUILDTAGS = [] + ++ optional (systemd != null) [ "journald" ] + ++ optional (btrfs-progs == null) "exclude_graphdriver_btrfs" + ++ optional (lvm2 == null) "exclude_graphdriver_devicemapper" + ++ optional (libseccomp != null) "seccomp"; + }); in buildGoPackage ((optionalAttrs (stdenv.isLinux) { - inherit docker-runc docker-containerd docker-proxy docker-tini; - - DOCKER_BUILDTAGS = [] - ++ optional (systemd != null) [ "journald" ] - ++ optional (btrfs-progs == null) "exclude_graphdriver_btrfs" - ++ optional (lvm2 == null) "exclude_graphdriver_devicemapper" - ++ optional (libseccomp != null) "seccomp"; + inherit docker-runc docker-containerd docker-proxy docker-tini moby; }) // rec { inherit version rev; @@ -82,97 +130,61 @@ rec { src = fetchFromGitHub { owner = "docker"; - repo = "docker-ce"; + repo = "cli"; rev = "v${version}"; sha256 = sha256; }; - patches = lib.optional (versionAtLeast version "19.03") [ - # Replace hard-coded cross-compiler with $CC - (fetchpatch { - url = https://github.com/docker/docker-ce/commit/2fdfb4404ab811cb00227a3de111437b829e55cf.patch; - sha256 = "1af20bzakhpfhaixc29qnl9iml9255xdinxdnaqp4an0n1xa686a"; - }) - ]; + goPackagePath = "github.com/docker/cli"; - goPackagePath = "github.com/docker/docker-ce"; - - nativeBuildInputs = [ pkgconfig go-md2man go libtool installShellFiles ]; + nativeBuildInputs = [ pkg-config go-md2man go libtool installShellFiles ]; buildInputs = [ makeWrapper ] ++ optionals (stdenv.isLinux) [ sqlite lvm2 btrfs-progs systemd libseccomp ]; - dontStrip = true; - + # Keep eyes on BUILDTIME format - https://github.com/docker/cli/blob/${version}/scripts/build/.variables buildPhase = '' export GOCACHE="$TMPDIR/go-cache" - '' + (optionalString (stdenv.isLinux) '' - # build engine - cd ./go/src/${goPackagePath}/components/engine - export AUTO_GOPATH=1 - export DOCKER_GITCOMMIT="${rev}" - export VERSION="${version}" - ./hack/make.sh dynbinary - cd - - '') + '' - # build cli - cd ./go/src/${goPackagePath}/components/cli + + cd ./go/src/${goPackagePath} # Mimic AUTO_GOPATH mkdir -p .gopath/src/github.com/docker/ ln -sf $PWD .gopath/src/github.com/docker/cli export GOPATH="$PWD/.gopath:$GOPATH" export GITCOMMIT="${rev}" export VERSION="${version}" + export BUILDTIME="1970-01-01T00:00:00Z" source ./scripts/build/.variables export CGO_ENABLED=1 go build -tags pkcs11 --ldflags "$LDFLAGS" github.com/docker/cli/cmd/docker cd - ''; - # systemd 230 no longer has libsystemd-journal as a separate entity from libsystemd postPatch = '' - substituteInPlace ./components/cli/scripts/build/.variables --replace "set -eu" "" - '' + optionalString (stdenv.isLinux) '' patchShebangs . - substituteInPlace ./components/engine/hack/make.sh --replace libsystemd-journal libsystemd - substituteInPlace ./components/engine/daemon/logger/journald/read.go --replace libsystemd-journal libsystemd + substituteInPlace ./scripts/build/.variables --replace "set -eu" "" + substituteInPlace ./scripts/docs/generate-man.sh --replace "-v md2man" "-v go-md2man" + substituteInPlace ./man/md2man-all.sh --replace md2man go-md2man ''; outputs = ["out" "man"]; - extraPath = optionals (stdenv.isLinux) (makeBinPath [ iproute iptables e2fsprogs xz xfsprogs procps util-linux git ]); - installPhase = '' cd ./go/src/${goPackagePath} - install -Dm755 ./components/cli/docker $out/libexec/docker/docker + install -Dm755 ./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 \ - --prefix PATH : "$out/libexec/docker:$extraPath" - - # docker uses containerd now - ln -s ${docker-containerd}/bin/containerd $out/libexec/docker/containerd - ln -s ${docker-containerd}/bin/containerd-shim $out/libexec/docker/containerd-shim - ln -s ${docker-runc}/bin/runc $out/libexec/docker/runc - ln -s ${docker-proxy}/bin/docker-proxy $out/libexec/docker/docker-proxy - ln -s ${docker-tini}/bin/tini-static $out/libexec/docker/docker-init - - # systemd - install -Dm644 ./components/engine/contrib/init/systemd/docker.service $out/etc/systemd/system/docker.service + # symlink docker daemon to docker cli derivation + ln -s ${moby}/bin/dockerd $out/bin/dockerd '' + '' # 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 + installShellCompletion --bash ./contrib/completion/bash/docker + installShellCompletion --fish ./contrib/completion/fish/docker.fish + installShellCompletion --zsh ./contrib/completion/zsh/_docker '' + lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' # Generate man pages from cobra commands echo "Generate man pages from cobra" @@ -199,30 +211,18 @@ rec { }); # Get revisions from - # https://github.com/docker/docker-ce/tree/${version}/components/engine/hack/dockerfile/install/* - - docker_18_09 = makeOverridable dockerGen rec { - version = "18.09.9"; + # https://github.com/moby/moby/tree/${version}/hack/dockerfile/install/* + docker_20_10 = makeOverridable dockerGen rec { + version = "20.10.2"; rev = "v${version}"; - sha256 = "0wqhjx9qs96q2jd091wffn3cyv2aslqn2cvpdpgljk8yr9s0yg7h"; - runcRev = "3e425f80a8c931f88e6d94a8c831b9d5aa481657"; - runcSha256 = "18psc830b2rkwml1x6vxngam5b5wi3pj14mw817rshpzy87prspj"; - containerdRev = "894b81a4b802e4eb2a91d1ce216b8817763c29fb"; - containerdSha256 = "0sp5mn5wd3xma4svm6hf67hyhiixzkzz6ijhyjkwdrc4alk81357"; - tiniRev = "fec3683b971d9c3ef73f284f176672c44b448662"; - tiniSha256 = "1h20i3wwlbd8x4jr2gz68hgklh0lb0jj7y5xk1wvr8y58fip1rdn"; - }; - - docker_19_03 = makeOverridable dockerGen rec { - version = "19.03.14"; - rev = "v${version}"; - sha256 = "0szr5dgfrypb5kyj5l1rf7rw4iqj0d0cyx6skdqlbgf4dqwa6g9y"; - runcRev = "dc9208a3303feef5b3839f4323d9beb36df0a9dd"; # v1.0.0-rc10 - runcSha256 = "0pi3rvj585997m4z9ljkxz2z9yxf9p2jr0pmqbqrc7bc95f5hagk"; - # Note: Once all packaged Docker versions use containerd <=1.2 or >=1.4 remove the libseccomp and pkgconfig inputs above - containerdRev = "ea765aba0d05254012b0b9e595e995c09186427f"; # v1.3.9 - containerdSha256 = "1isi1wgq61b4l0lxy1d8n6dnmcb8s5ihn2yqjb6525y3dj5c5i1j"; - tiniRev = "fec3683b971d9c3ef73f284f176672c44b448662"; # v0.18.0 + sha256 = "0z0hpm5hrqh7p8my8lmiwpym2shs48my6p0zv2cc34wym0hcly51"; + mobyRev = "v${version}"; + mobySha256 = "0c2zycpnwj4kh8m8xckv1raj3fx07q9bfaj46rr85jihm4p2dp5w"; + runcRev = "ff819c7e9184c13b7c2607fe6c30ae19403a7aff"; # v1.0.0-rc92 + runcSha256 = "0r4zbxbs03xr639r7848282j1ybhibfdhnxyap9p76j5w8ixms94"; + containerdRev = "269548fa27e0089a8b8278fc4fc781d7f65a939b"; # v1.4.3 + containerdSha256 = "09xvhjg5f8h90w1y94kqqnqzhbhd62dcdd9wb9sdqakisjk6zrl0"; + tiniRev = "de40ad007797e0dcd8b7126f27bb87401d224240"; # v0.19.0 tiniSha256 = "1h20i3wwlbd8x4jr2gz68hgklh0lb0jj7y5xk1wvr8y58fip1rdn"; }; } diff --git a/pkgs/applications/virtualization/docker/distribution.nix b/pkgs/applications/virtualization/docker/distribution.nix index a408d20f3ba0..f41862c0dd15 100644 --- a/pkgs/applications/virtualization/docker/distribution.nix +++ b/pkgs/applications/virtualization/docker/distribution.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "distribution"; @@ -14,7 +14,7 @@ buildGoPackage rec { sha256 = "1nx8b5a68rn81alp8wkkw6qd5v32mgf0fk23mxm60zdf63qk1nzw"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "The Docker toolset to pack, ship, store, and deliver content"; license = licenses.asl20; maintainers = [ maintainers.globin ]; diff --git a/pkgs/applications/virtualization/docker/proxy.nix b/pkgs/applications/virtualization/docker/proxy.nix index cb3518d7d3da..7fd7cda81e23 100644 --- a/pkgs/applications/virtualization/docker/proxy.nix +++ b/pkgs/applications/virtualization/docker/proxy.nix @@ -1,14 +1,14 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "docker-proxy-${rev}"; - rev = "7b2b1feb1de4817d522cc372af149ff48d25028e"; + rev = "fa125a3512ee0f6187721c88582bf8c4378bd4d7"; src = fetchFromGitHub { inherit rev; owner = "docker"; repo = "libnetwork"; - sha256 = "1ng577k11cyv207bp0vaz5jjfcn2igd6w95zn4izcq1nldzp5935"; + sha256 = "1r47y0gww3j7fas4kgiqbhrz5fazsx1c6sxnccdfhj8fzik77s9y"; }; goPackagePath = "github.com/docker/libnetwork"; @@ -19,7 +19,7 @@ buildGoPackage rec { install -m755 -D ./go/bin/proxy $out/bin/docker-proxy ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Docker proxy binary to forward traffic between host and containers"; license = licenses.asl20; homepage = "https://github.com/docker/libnetwork"; diff --git a/pkgs/applications/virtualization/driver/win-pvdrivers/default.nix b/pkgs/applications/virtualization/driver/win-pvdrivers/default.nix index faa1076e2998..e772a540b183 100644 --- a/pkgs/applications/virtualization/driver/win-pvdrivers/default.nix +++ b/pkgs/applications/virtualization/driver/win-pvdrivers/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit }: +{ lib, stdenv, fetchgit }: stdenv.mkDerivation { name = "win-pvdrivers-git-20150701"; @@ -20,7 +20,7 @@ stdenv.mkDerivation { cp -r amd64 $out/. ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Xen Subproject: Windows PV Driver"; homepage = "http://xenproject.org/downloads/windows-pv-drivers.html"; maintainers = [ maintainers.tstrobel ]; diff --git a/pkgs/applications/virtualization/driver/win-qemu/default.nix b/pkgs/applications/virtualization/driver/win-qemu/default.nix index 97a1f0b3039b..d8e233e35232 100644 --- a/pkgs/applications/virtualization/driver/win-qemu/default.nix +++ b/pkgs/applications/virtualization/driver/win-qemu/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, p7zip }: +{ lib, stdenv, fetchurl, p7zip }: stdenv.mkDerivation { name = "win-qemu-0.1.105-1"; @@ -28,7 +28,7 @@ stdenv.mkDerivation { in (copy "amd64" "w8.1") + (copy "x86" "w8.1"); - meta = with stdenv.lib; { + meta = with lib; { description = "Windows QEMU Drivers"; homepage = "https://fedoraproject.org/wiki/Windows_Virtio_Drivers"; maintainers = [ maintainers.tstrobel ]; diff --git a/pkgs/applications/virtualization/driver/win-signed-gplpv-drivers/default.nix b/pkgs/applications/virtualization/driver/win-signed-gplpv-drivers/default.nix index c4684a20914f..c4c5cb807284 100644 --- a/pkgs/applications/virtualization/driver/win-signed-gplpv-drivers/default.nix +++ b/pkgs/applications/virtualization/driver/win-signed-gplpv-drivers/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, p7zip }: +{ lib, stdenv, fetchurl, p7zip }: let src_x86 = fetchurl { @@ -31,7 +31,7 @@ stdenv.mkDerivation { cp amd64/* $out/amd64/. ''; - meta = with stdenv.lib; { + meta = with lib; { description = '' A collection of open source Window PV drivers that allow Windows to be para-virtualized. diff --git a/pkgs/applications/virtualization/driver/win-spice/default.nix b/pkgs/applications/virtualization/driver/win-spice/default.nix index f327512b128e..ba823fa2a41c 100644 --- a/pkgs/applications/virtualization/driver/win-spice/default.nix +++ b/pkgs/applications/virtualization/driver/win-spice/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, p7zip, win-virtio }: +{ lib, stdenv, fetchurl, p7zip, win-virtio }: let src_usbdk_x86 = fetchurl { @@ -60,7 +60,7 @@ stdenv.mkDerivation { in (copy "amd64" "w8.1") + (copy "x86" "w8.1"); - meta = with stdenv.lib; { + meta = with lib; { description = "Windows SPICE Drivers"; homepage = "https://www.spice-space.org/"; license = [ licenses.asl20 ]; # See https://github.com/vrozenfe/qxl-dod diff --git a/pkgs/applications/virtualization/driver/win-virtio/default.nix b/pkgs/applications/virtualization/driver/win-virtio/default.nix index f8a52f5b898d..565fc4cf533b 100644 --- a/pkgs/applications/virtualization/driver/win-virtio/default.nix +++ b/pkgs/applications/virtualization/driver/win-virtio/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, p7zip }: +{ lib, stdenv, fetchurl, p7zip }: stdenv.mkDerivation rec { pname = "win-virtio"; version = "0.1.141-1"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { in stdenv.lib.concatStringsSep "\n" ((map (copy "amd64" "w8.1") virtio) ++ (map (copy "x86" "w8.1") virtio)); - meta = with stdenv.lib; { + meta = with lib; { description = "Windows VirtIO Drivers"; homepage = "https://fedoraproject.org/wiki/Windows_Virtio_Drivers"; maintainers = [ maintainers.tstrobel ]; diff --git a/pkgs/applications/virtualization/dumb-init/default.nix b/pkgs/applications/virtualization/dumb-init/default.nix index 3d4df33300ed..80a76432f08b 100644 --- a/pkgs/applications/virtualization/dumb-init/default.nix +++ b/pkgs/applications/virtualization/dumb-init/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, glibc }: +{ lib, stdenv, fetchFromGitHub, glibc }: stdenv.mkDerivation rec { pname = "dumb-init"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A minimal init system for Linux containers"; homepage = "https://github.com/Yelp/dumb-init"; license = licenses.mit; diff --git a/pkgs/applications/virtualization/dynamips/default.nix b/pkgs/applications/virtualization/dynamips/default.nix index 6f35257b50fd..7f3320101530 100644 --- a/pkgs/applications/virtualization/dynamips/default.nix +++ b/pkgs/applications/virtualization/dynamips/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, libelf, libpcap }: +{ lib, stdenv, fetchFromGitHub, cmake, libelf, libpcap }: stdenv.mkDerivation rec { pname = "dynamips"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DDYNAMIPS_CODE=stable" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A Cisco router emulator"; longDescription = '' Dynamips is an emulator computer program that was written to emulate Cisco diff --git a/pkgs/applications/virtualization/ecs-agent/default.nix b/pkgs/applications/virtualization/ecs-agent/default.nix index 691c74301e39..41a093153331 100644 --- a/pkgs/applications/virtualization/ecs-agent/default.nix +++ b/pkgs/applications/virtualization/ecs-agent/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildGoPackage }: +{ lib, stdenv, fetchFromGitHub, buildGoPackage }: buildGoPackage rec { pname = "amazon-ecs-agent"; @@ -14,7 +14,7 @@ buildGoPackage rec { sha256 = "1l6c2if6wpjmq2hh6k818w38s1rsbwgd6igqy948dwcrb1g1mixr"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "The agent that runs on AWS EC2 container instances and starts containers on behalf of Amazon ECS"; homepage = "https://github.com/aws/amazon-ecs-agent"; license = licenses.asl20; diff --git a/pkgs/applications/virtualization/firecracker/default.nix b/pkgs/applications/virtualization/firecracker/default.nix index 98b95fa2bec3..f041ea7460c1 100644 --- a/pkgs/applications/virtualization/firecracker/default.nix +++ b/pkgs/applications/virtualization/firecracker/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv }: +{ fetchurl, lib, stdenv }: let version = "0.23.0"; @@ -51,7 +51,7 @@ stdenv.mkDerivation { install -D jailer $out/bin/jailer ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Secure, fast, minimal micro-container virtualization"; homepage = "http://firecracker-microvm.io"; license = licenses.asl20; diff --git a/pkgs/applications/virtualization/firectl/default.nix b/pkgs/applications/virtualization/firectl/default.nix index 523e96f347cc..0b5fc5dac52b 100644 --- a/pkgs/applications/virtualization/firectl/default.nix +++ b/pkgs/applications/virtualization/firectl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "firectl"; @@ -17,7 +17,7 @@ buildGoModule rec { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "A command-line tool to run Firecracker microVMs"; homepage = "https://github.com/firecracker-microvm/firectl"; license = licenses.asl20; diff --git a/pkgs/applications/virtualization/gvisor/default.nix b/pkgs/applications/virtualization/gvisor/default.nix index 576f2d9e6f23..54cf8094d646 100644 --- a/pkgs/applications/virtualization/gvisor/default.nix +++ b/pkgs/applications/virtualization/gvisor/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildBazelPackage , fetchFromGitHub , cacert @@ -91,7 +91,7 @@ in buildBazelPackage rec { ''; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Container Runtime Sandbox"; homepage = "https://github.com/google/gvisor"; license = licenses.asl20; diff --git a/pkgs/applications/virtualization/hercules/default.nix b/pkgs/applications/virtualization/hercules/default.nix index 8746e66668ff..f33055baacbc 100644 --- a/pkgs/applications/virtualization/hercules/default.nix +++ b/pkgs/applications/virtualization/hercules/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "hercules"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0zg6rwz8ib4alibf8lygi8qn69xx8n92kbi8b3jhi1ymb32mf349"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "IBM mainframe emulator"; homepage = "http://www.hercules-390.eu"; license = licenses.qpl; diff --git a/pkgs/applications/virtualization/lkl/default.nix b/pkgs/applications/virtualization/lkl/default.nix index 7a6ccc67bb50..aee2d493a706 100644 --- a/pkgs/applications/virtualization/lkl/default.nix +++ b/pkgs/applications/virtualization/lkl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, bc, python, bison, flex, fuse, libarchive +{ lib, stdenv, fetchFromGitHub, bc, python, bison, flex, fuse, libarchive , buildPackages }: stdenv.mkDerivation rec { @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "The Linux kernel as a library"; longDescription = '' LKL (Linux Kernel Library) aims to allow reusing the Linux kernel code as diff --git a/pkgs/applications/virtualization/looking-glass-client/default.nix b/pkgs/applications/virtualization/looking-glass-client/default.nix index 74370aafa40e..e7c8cc4d47a8 100644 --- a/pkgs/applications/virtualization/looking-glass-client/default.nix +++ b/pkgs/applications/virtualization/looking-glass-client/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, SDL2, SDL2_ttf, spice-protocol +{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, SDL2, SDL2_ttf, spice-protocol , fontconfig, libX11, freefont_ttf, nettle, libpthreadstubs, libXau, libXdmcp , libXi, libXext, wayland, libffi, libGLU, expat, libbfd }: @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { sourceRoot = "source/client"; NIX_CFLAGS_COMPILE = "-mavx"; # Fix some sort of AVX compiler problem. - meta = with stdenv.lib; { + meta = with lib; { description = "A KVM Frame Relay (KVMFR) implementation"; longDescription = '' Looking Glass is an open source application that allows the use of a KVM diff --git a/pkgs/applications/virtualization/nvidia-docker/default.nix b/pkgs/applications/virtualization/nvidia-docker/default.nix index d0d7125721f8..0df2efebd820 100644 --- a/pkgs/applications/virtualization/nvidia-docker/default.nix +++ b/pkgs/applications/virtualization/nvidia-docker/default.nix @@ -1,66 +1,99 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, callPackage, makeWrapper -, buildGoPackage, runc, glibc }: +{ stdenv +, lib +, fetchFromGitHub +, fetchpatch +, callPackage +, makeWrapper +, buildGoModule +, buildGoPackage +, glibc +, docker +, linkFarm +, containerRuntimePath ? "${docker}/libexec/docker/runc" +}: with lib; let - libnvidia-container = callPackage ./libnvc.nix { }; + isolatedContainerRuntimePath = linkFarm "isolated_container_runtime_path" [ + { + name = "runc"; + path = containerRuntimePath; + } + ]; - nvidia-container-runtime = fetchFromGitHub { - owner = "NVIDIA"; - repo = "nvidia-container-runtime"; - rev = "runtime-v2.0.0"; - sha256 = "0jcj5xxbg7x7gyhbb67h3ds6vly62gx7j02zm6lg102h34jajj7a"; - }; - - nvidia-container-runtime-hook = buildGoPackage { - pname = "nvidia-container-runtime-hook"; - version = "1.4.0"; - - goPackagePath = "nvidia-container-runtime-hook"; - - src = "${nvidia-container-runtime}/hook/nvidia-container-runtime-hook"; - }; - - nvidia-runc = runc.overrideAttrs (oldAttrs: rec { - name = "nvidia-runc"; - version = "1.0.0-rc6"; + nvidia-container-runtime = buildGoPackage rec { + pname = "nvidia-container-runtime"; + version = "3.4.0"; src = fetchFromGitHub { - owner = "opencontainers"; - repo = "runc"; + owner = "NVIDIA"; + repo = "nvidia-container-runtime"; rev = "v${version}"; - sha256 = "1jwacb8xnmx5fr86gximhbl9dlbdwj3rpf27hav9q1si86w5pb1j"; + sha256 = "095mks0r4079vawi50pk4zb5jk0g6s9idg2s1w55a0d27jkknldr"; }; - patches = [ "${nvidia-container-runtime}/runtime/runc/3f2f8b84a77f73d38244dd690525642a72156c64/0001-Add-prestart-hook-nvidia-container-runtime-hook-to-t.patch" ]; - }); + goPackagePath = "github.com/nvidia-container-runtime/src"; + buildFlagsArray = [ "-ldflags=" "-s -w" ]; + postInstall = '' + mv $out/bin/{src,nvidia-container-runtime} + ''; + }; -in stdenv.mkDerivation rec { + nvidia-container-toolkit = buildGoModule rec { + pname = "nvidia-container-toolkit"; + version = "1.3.0"; + src = fetchFromGitHub { + owner = "NVIDIA"; + repo = "nvidia-container-toolkit"; + rev = "v${version}"; + sha256 = "04284bhgx4j55vg9ifvbji2bvmfjfy3h1lq7q356ffgw3yr9n0hn"; + }; + vendorSha256 = "17zpiyvf22skfcisflsp6pn56y6a793jcx89kw976fq2x5br1bz7"; + buildFlagsArray = [ "-ldflags=" "-s -w" ]; + postInstall = '' + mv $out/bin/{pkg,${pname}} + cp $out/bin/{${pname},nvidia-container-runtime-hook} + ''; + }; + +in +stdenv.mkDerivation rec { pname = "nvidia-docker"; - version = "2.0.3"; + version = "2.5.0"; src = fetchFromGitHub { owner = "NVIDIA"; repo = "nvidia-docker"; rev = "v${version}"; - sha256 = "1vx5m591mnvcb9vy0196x5lh3r8swjsk0fnlv5h62m7m4m07v6wx"; + sha256 = "1n1k7fnimky67s12p2ycaq9mgk245fchq62vgd7bl3bzfcbg0z4h"; }; nativeBuildInputs = [ makeWrapper ]; buildPhase = '' mkdir bin + cp nvidia-docker bin + substituteInPlace bin/nvidia-docker --subst-var-by VERSION ${version} + cp ${libnvidia-container}/bin/nvidia-container-cli bin - cp ${nvidia-container-runtime-hook}/bin/nvidia-container-runtime-hook bin - cp ${nvidia-runc}/bin/runc bin/nvidia-container-runtime + cp ${nvidia-container-toolkit}/bin/nvidia-container-{toolkit,runtime-hook} bin + cp ${nvidia-container-runtime}/bin/nvidia-container-runtime bin ''; installPhase = '' mkdir -p $out/{bin,etc} cp -r bin $out + wrapProgram $out/bin/nvidia-container-cli \ --prefix LD_LIBRARY_PATH : /run/opengl-driver/lib:/run/opengl-driver-32/lib + + # nvidia-container-runtime invokes docker-runc or runc if that isn't available on PATH + wrapProgram $out/bin/nvidia-container-runtime --prefix PATH : ${isolatedContainerRuntimePath} + cp ${./config.toml} $out/etc/config.toml substituteInPlace $out/etc/config.toml --subst-var-by glibcbin ${lib.getBin glibc} + + cp ${./podman-config.toml} $out/etc/podman-config.toml + substituteInPlace $out/etc/podman-config.toml --subst-var-by glibcbin ${lib.getBin glibc} ''; meta = { @@ -68,5 +101,6 @@ in stdenv.mkDerivation rec { description = "NVIDIA container runtime for Docker"; license = licenses.bsd3; platforms = platforms.linux; + maintainers = with lib.maintainers; [ cpcloud ]; }; } diff --git a/pkgs/applications/virtualization/nvidia-docker/libnvc-ldconfig-and-path-fixes.patch b/pkgs/applications/virtualization/nvidia-docker/libnvc-ldconfig-and-path-fixes.patch index 9ae8d6b5e756..d4638791a01c 100644 --- a/pkgs/applications/virtualization/nvidia-docker/libnvc-ldconfig-and-path-fixes.patch +++ b/pkgs/applications/virtualization/nvidia-docker/libnvc-ldconfig-and-path-fixes.patch @@ -86,7 +86,7 @@ index 30e3cfd..6d12a50 100644 if (info->libs == NULL) goto fail; if (ldcache_resolve(&ld, LIB_ARCH, root, libs, -- info->libs, info->nlibs, select_libraries, info) < 0) +- info->libs, info->nlibs, select_libraries_fn, info) < 0) + info->libs, info->nlibs, info->nvrm_version) < 0) goto fail; @@ -95,7 +95,7 @@ index 30e3cfd..6d12a50 100644 if (info->libs32 == NULL) goto fail; if (ldcache_resolve(&ld, LIB32_ARCH, root, libs, -- info->libs32, info->nlibs32, select_libraries, info) < 0) +- info->libs32, info->nlibs32, select_libraries_fn, info) < 0) + info->libs32, info->nlibs32, info->nvrm_version) < 0) goto fail; rv = 0; diff --git a/pkgs/applications/virtualization/nvidia-docker/libnvc.nix b/pkgs/applications/virtualization/nvidia-docker/libnvc.nix index 6079f215ec80..95d66582618e 100644 --- a/pkgs/applications/virtualization/nvidia-docker/libnvc.nix +++ b/pkgs/applications/virtualization/nvidia-docker/libnvc.nix @@ -9,23 +9,23 @@ , libtirpc }: let - modp-ver = "396.51"; + modp-ver = "450.57"; nvidia-modprobe = fetchFromGitHub { owner = "NVIDIA"; repo = "nvidia-modprobe"; rev = modp-ver; - sha256 = "1fw2qwc84k64agw6fx2v0mjf88aggph9c6qhs4cv7l3gmflv8qbk"; + sha256 = "0r4f6lpbbqqs9932xd2mr7bxn6a3xdalcwq332fc1amrrkgzfyv7"; }; in stdenv.mkDerivation rec { pname = "libnvidia-container"; - version = "1.0.6"; + version = "1.3.1"; src = fetchFromGitHub { owner = "NVIDIA"; repo = "libnvidia-container"; rev = "v${version}"; - sha256 = "1pnpc9knwh8d1zqb28zc3spkjc00w0z10vd3jna8ksvpl35jl7w3"; + sha256 = "0j6b8z9x9hrrs4xp11zyjjd7kyl7fzcicpiis8k1qb1q2afnqsrq"; }; patches = [ @@ -58,7 +58,10 @@ stdenv.mkDerivation rec { mkdir -p deps/src/nvidia-modprobe-${modp-ver} cp -r ${nvidia-modprobe}/* deps/src/nvidia-modprobe-${modp-ver} chmod -R u+w deps/src - touch deps/src/nvidia-modprobe-${modp-ver}/.download_stamp + pushd deps/src + patch -p0 < ${./modprobe.patch} + touch nvidia-modprobe-${modp-ver}/.download_stamp + popd ''; NIX_CFLAGS_COMPILE = [ "-I${libtirpc.dev}/include/tirpc" ]; diff --git a/pkgs/applications/virtualization/nvidia-docker/modprobe.patch b/pkgs/applications/virtualization/nvidia-docker/modprobe.patch new file mode 100644 index 000000000000..8e7b0a723ec0 --- /dev/null +++ b/pkgs/applications/virtualization/nvidia-docker/modprobe.patch @@ -0,0 +1,29 @@ +diff -ruN nvidia-modprobe-450.57/modprobe-utils/nvidia-modprobe-utils.c nvidia-modprobe-450.57/modprobe-utils/nvidia-modprobe-utils.c +--- nvidia-modprobe-450.57/modprobe-utils/nvidia-modprobe-utils.c 2020-07-09 17:06:05.000000000 +0000 ++++ nvidia-modprobe-450.57/modprobe-utils/nvidia-modprobe-utils.c 2020-08-18 12:43:03.223871514 +0000 +@@ -840,10 +840,10 @@ + return mknod_helper(major, minor_num, vgpu_dev_name, NV_PROC_REGISTRY_PATH); + } + +-static int nvidia_cap_get_device_file_attrs(const char* cap_file_path, +- int *major, +- int *minor, +- char *name) ++int nvidia_cap_get_device_file_attrs(const char* cap_file_path, ++ int *major, ++ int *minor, ++ char *name) + { + char field[32]; + FILE *fp; +diff -ruN nvidia-modprobe-450.57/modprobe-utils/nvidia-modprobe-utils.h nvidia-modprobe-450.57/modprobe-utils/nvidia-modprobe-utils.h +--- nvidia-modprobe-450.57/modprobe-utils/nvidia-modprobe-utils.h 2020-07-09 17:06:05.000000000 +0000 ++++ nvidia-modprobe-450.57/modprobe-utils/nvidia-modprobe-utils.h 2020-08-18 12:43:44.227745050 +0000 +@@ -81,6 +81,7 @@ + int nvidia_nvswitch_get_file_state(int minor); + int nvidia_cap_mknod(const char* cap_file_path, int *minor); + int nvidia_cap_get_file_state(const char* cap_file_path); ++int nvidia_cap_get_device_file_attrs(const char* cap_file_path, int *major, int *minor, char *name); + int nvidia_get_chardev_major(const char *name); + + #endif /* NV_LINUX */ diff --git a/pkgs/applications/virtualization/nvidia-docker/podman-config.toml b/pkgs/applications/virtualization/nvidia-docker/podman-config.toml new file mode 100644 index 000000000000..eb39699b96b3 --- /dev/null +++ b/pkgs/applications/virtualization/nvidia-docker/podman-config.toml @@ -0,0 +1,13 @@ +disable-require = true +#swarm-resource = "DOCKER_RESOURCE_GPU" + +[nvidia-container-cli] +#root = "/run/nvidia/driver" +#path = "/usr/bin/nvidia-container-cli" +environment = [] +#debug = "/var/log/nvidia-container-runtime-hook.log" +ldcache = "/tmp/ld.so.cache" +load-kmods = true +no-cgroups = true +#user = "root:video" +ldconfig = "@@glibcbin@/bin/ldconfig" diff --git a/pkgs/applications/virtualization/open-vm-tools/default.nix b/pkgs/applications/virtualization/open-vm-tools/default.nix index 4cdce2172a21..a5c8d9769324 100644 --- a/pkgs/applications/virtualization/open-vm-tools/default.nix +++ b/pkgs/applications/virtualization/open-vm-tools/default.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { --prefix PATH ':' "${lib.makeBinPath [ iproute dbus systemd which ]}" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/vmware/open-vm-tools"; description = "Set of tools for VMWare guests to improve host-guest interaction"; longDescription = '' diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix index cd32c80f74eb..39097c8e5b3b 100644 --- a/pkgs/applications/virtualization/podman/default.nix +++ b/pkgs/applications/virtualization/podman/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , pkg-config , installShellFiles @@ -62,7 +62,7 @@ buildGoModule rec { passthru.tests = { inherit (nixosTests) podman; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://podman.io/"; description = "A program for managing pods, containers and container images"; license = licenses.asl20; diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 5d4b891ad5de..44dff9ad42a1 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, python, zlib, pkgconfig, glib +{ lib, stdenv, fetchurl, fetchpatch, python, zlib, pkgconfig, glib , perl, pixman, vde2, alsaLib, texinfo, flex , bison, lzo, snappy, libaio, gnutls, nettle, curl , makeWrapper @@ -6,7 +6,7 @@ , CoreServices, Cocoa, Hypervisor, rez, setfile , numaSupport ? stdenv.isLinux && !stdenv.isAarch32, numactl , seccompSupport ? stdenv.isLinux, libseccomp -, alsaSupport ? stdenv.lib.hasSuffix "linux" stdenv.hostPlatform.system && !nixosTestRunner +, alsaSupport ? lib.hasSuffix "linux" stdenv.hostPlatform.system && !nixosTestRunner , pulseSupport ? !stdenv.isDarwin && !nixosTestRunner, libpulseaudio , sdlSupport ? !stdenv.isDarwin && !nixosTestRunner, SDL2 , gtkSupport ? !stdenv.isDarwin && !xenSupport && !nixosTestRunner, gtk3, gettext, vte, wrapGAppsHook @@ -23,7 +23,7 @@ , tpmSupport ? true , hostCpuOnly ? false , hostCpuTargets ? (if hostCpuOnly - then (stdenv.lib.optional stdenv.isx86_64 "i386-softmmu" + then (lib.optional stdenv.isx86_64 "i386-softmmu" ++ ["${stdenv.hostPlatform.qemuArch}-softmmu"]) else null) , nixosTestRunner ? false @@ -180,7 +180,7 @@ stdenv.mkDerivation rec { qemu-system-i386 = "bin/qemu-system-i386"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.qemu.org/"; description = "A generic and open source machine emulator and virtualizer"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/virtualization/qtemu/default.nix b/pkgs/applications/virtualization/qtemu/default.nix index 29f0004be830..4c0f441d7819 100644 --- a/pkgs/applications/virtualization/qtemu/default.nix +++ b/pkgs/applications/virtualization/qtemu/default.nix @@ -1,4 +1,4 @@ -{ stdenv, mkDerivation, fetchFromGitLab, pkgconfig, qmake, qtbase, qemu, makeWrapper }: +{ lib, stdenv, mkDerivation, fetchFromGitLab, pkgconfig, qmake, qtbase, qemu, makeWrapper }: mkDerivation rec { pname = "qtemu"; @@ -35,7 +35,7 @@ mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Qt-based front-end for QEMU emulator"; homepage = "https://qtemu.org"; license = licenses.gpl2; diff --git a/pkgs/applications/virtualization/remotebox/default.nix b/pkgs/applications/virtualization/remotebox/default.nix index dcc5efb6504a..fa4f105f6e83 100644 --- a/pkgs/applications/virtualization/remotebox/default.nix +++ b/pkgs/applications/virtualization/remotebox/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, perl, perlPackages }: +{ lib, stdenv, fetchurl, makeWrapper, perl, perlPackages }: stdenv.mkDerivation rec { pname = "remotebox"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { cp -pv packagers-readme/*.desktop $out/share/applications ''; - meta = with stdenv.lib; { + meta = with lib; { description = "VirtualBox client with remote management"; homepage = "http://remotebox.knobgoblin.org.uk/"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/virtualization/seabios/default.nix b/pkgs/applications/virtualization/seabios/default.nix index cd03759045a0..f97f13dab2a4 100644 --- a/pkgs/applications/virtualization/seabios/default.nix +++ b/pkgs/applications/virtualization/seabios/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, iasl, python }: +{ lib, stdenv, fetchurl, iasl, python }: stdenv.mkDerivation rec { @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { cp out/Csm16.bin $out/Csm16.bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Open source implementation of a 16bit X86 BIOS"; longDescription = '' SeaBIOS is an open source implementation of a 16bit X86 BIOS. diff --git a/pkgs/applications/virtualization/singularity/default.nix b/pkgs/applications/virtualization/singularity/default.nix index b11f8d68189c..13f84736d9ec 100644 --- a/pkgs/applications/virtualization/singularity/default.nix +++ b/pkgs/applications/virtualization/singularity/default.nix @@ -65,7 +65,7 @@ buildGoPackage rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.sylabs.io/"; description = "Application containers for linux"; license = licenses.bsd3; diff --git a/pkgs/applications/virtualization/spike/default.nix b/pkgs/applications/virtualization/spike/default.nix index 0f397bc272a9..12dfc713fd2c 100644 --- a/pkgs/applications/virtualization/spike/default.nix +++ b/pkgs/applications/virtualization/spike/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, dtc, nixosTests }: +{ lib, stdenv, fetchgit, dtc, nixosTests }: stdenv.mkDerivation rec { pname = "spike"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { can-run-hello-world = nixosTests.spike; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A RISC-V ISA Simulator"; homepage = "https://github.com/riscv/riscv-isa-sim"; license = licenses.bsd3; diff --git a/pkgs/applications/virtualization/tini/default.nix b/pkgs/applications/virtualization/tini/default.nix index e3b1ccd4ce24..dd7bcb19978c 100644 --- a/pkgs/applications/virtualization/tini/default.nix +++ b/pkgs/applications/virtualization/tini/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, glibc }: +{ lib, stdenv, fetchFromGitHub, cmake, glibc }: stdenv.mkDerivation rec { version = "0.19.0"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ glibc glibc.static ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A tiny but valid init for containers"; homepage = "https://github.com/krallin/tini"; license = licenses.mit; diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix index 9673e93d0cc8..4a6b539b4fbd 100644 --- a/pkgs/applications/virtualization/virt-manager/default.nix +++ b/pkgs/applications/virtualization/virt-manager/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python3Packages, intltool, file +{ lib, stdenv, fetchurl, python3Packages, intltool, file , wrapGAppsHook, gtk-vnc, vte, avahi, dconf , gobject-introspection, libvirt-glib, system-libvirt , gsettings-desktop-schemas, glib, libosinfo, gnome3 @@ -56,7 +56,7 @@ python3Packages.buildPythonApplication rec { # Failed tests doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://virt-manager.org"; description = "Desktop user interface for managing virtual machines"; longDescription = '' diff --git a/pkgs/applications/virtualization/virt-top/default.nix b/pkgs/applications/virtualization/virt-top/default.nix index 692b5f01b5c6..8ff90a4150db 100644 --- a/pkgs/applications/virtualization/virt-top/default.nix +++ b/pkgs/applications/virtualization/virt-top/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, fetchpatch, ocamlPackages, autoreconfHook }: +{ lib, stdenv, fetchgit, fetchpatch, ocamlPackages, autoreconfHook }: stdenv.mkDerivation rec { pname = "virt-top"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { buildPhase = "make opt"; - meta = with stdenv.lib; { + meta = with lib; { description = "A top-like utility for showing stats of virtualized domains"; homepage = "https://people.redhat.com/~rjones/virt-top/"; license = licenses.gpl2; diff --git a/pkgs/applications/virtualization/vpcs/default.nix b/pkgs/applications/virtualization/vpcs/default.nix index ce08428eba0a..33d707a50079 100644 --- a/pkgs/applications/virtualization/vpcs/default.nix +++ b/pkgs/applications/virtualization/vpcs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "vpcs"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A simple virtual PC simulator"; longDescription = '' The VPCS (Virtual PC Simulator) can simulate up to 9 PCs. You can diff --git a/pkgs/applications/virtualization/xen/generic.nix b/pkgs/applications/virtualization/xen/generic.nix index 7cd02e69c5ef..4b03bb5da46d 100644 --- a/pkgs/applications/virtualization/xen/generic.nix +++ b/pkgs/applications/virtualization/xen/generic.nix @@ -1,5 +1,5 @@ config: -{ stdenv, cmake, pkgconfig, which +{ stdenv, cmake, pkg-config, which # Xen , bison, bzip2, checkpolicy, dev86, figlet, flex, gettext, glib @@ -66,7 +66,7 @@ stdenv.mkDerivation (rec { hardeningDisable = [ "stackprotector" "fortify" "pic" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ cmake which diff --git a/pkgs/applications/window-managers/2bwm/default.nix b/pkgs/applications/window-managers/2bwm/default.nix index 0a2dd63130eb..4072c74d7f83 100644 --- a/pkgs/applications/window-managers/2bwm/default.nix +++ b/pkgs/applications/window-managers/2bwm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, patches +{ lib, stdenv, fetchFromGitHub, patches , libxcb, xcbutilkeysyms, xcbutilwm , libX11, xcbutil, xcbutilxrm }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { installPhase = "make install DESTDIR=$out PREFIX=\"\""; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/venam/2bwm"; description = "A fast floating WM written over the XCB library and derived from mcwm"; license = licenses.mit; diff --git a/pkgs/applications/window-managers/afterstep/default.nix b/pkgs/applications/window-managers/afterstep/default.nix index 001e624e1bed..4bfe65438054 100644 --- a/pkgs/applications/window-managers/afterstep/default.nix +++ b/pkgs/applications/window-managers/afterstep/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig +{ lib, stdenv, fetchurl, pkgconfig , libjpeg, libtiff, libpng, freetype , fltk, gtk , libX11, libXext, libICE @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config dbus-1 --cflags)" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A NEXTStep-inspired window manager"; longDescription = '' AfterStep is a window manager for the Unix X Window diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix index 609723b42d41..0409954cfb1f 100644 --- a/pkgs/applications/window-managers/awesome/default.nix +++ b/pkgs/applications/window-managers/awesome/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, luaPackages, cairo, librsvg, cmake, imagemagick, pkgconfig, gdk-pixbuf +{ lib, stdenv, fetchFromGitHub, luaPackages, cairo, librsvg, cmake, imagemagick, pkgconfig, gdk-pixbuf , xorg, libstartup_notification, libxdg_basedir, libpthreadstubs , xcb-util-cursor, makeWrapper, pango, gobject-introspection , which, dbus, nettools, git, doxygen @@ -82,7 +82,7 @@ stdenv.mkDerivation rec { inherit lua; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Highly configurable, dynamic window manager for X"; homepage = "https://awesomewm.org/"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/window-managers/berry/default.nix b/pkgs/applications/window-managers/berry/default.nix index 64b7f2c1d2b9..b2d28ca55f23 100644 --- a/pkgs/applications/window-managers/berry/default.nix +++ b/pkgs/applications/window-managers/berry/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , libX11 , libXext @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { FREETYPEINC="${freetype.dev}/include/freetype2" ) ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A healthy, bite-sized window manager"; longDescription = '' berry is a healthy, bite-sized window manager written in C for unix diff --git a/pkgs/applications/window-managers/bevelbar/default.nix b/pkgs/applications/window-managers/bevelbar/default.nix index 40cebb572af3..74da42f88c94 100644 --- a/pkgs/applications/window-managers/bevelbar/default.nix +++ b/pkgs/applications/window-managers/bevelbar/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libX11, libXrandr, libXft }: +{ lib, stdenv, fetchFromGitHub, libX11, libXrandr, libXft }: stdenv.mkDerivation rec { pname = "bevelbar"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { installFlags = [ "prefix=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "An X11 status bar with fancy schmancy 1985-ish beveled borders"; inherit (src.meta) homepage; license = licenses.mit; diff --git a/pkgs/applications/window-managers/bspwm/default.nix b/pkgs/applications/window-managers/bspwm/default.nix index 7c7bdbe22a78..c07c3389e3c0 100644 --- a/pkgs/applications/window-managers/bspwm/default.nix +++ b/pkgs/applications/window-managers/bspwm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libxcb, libXinerama +{ lib, stdenv, fetchFromGitHub, libxcb, libXinerama , xcbutil, xcbutilkeysyms, xcbutilwm }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A tiling window manager based on binary space partitioning"; homepage = "https://github.com/baskerville/bspwm"; maintainers = with maintainers; [ meisternu epitrochoid rvolosatovs ]; diff --git a/pkgs/applications/window-managers/btops/default.nix b/pkgs/applications/window-managers/btops/default.nix index 132e2ba6ddd3..f0bb26f43e25 100644 --- a/pkgs/applications/window-managers/btops/default.nix +++ b/pkgs/applications/window-managers/btops/default.nix @@ -1,5 +1,5 @@ # This file was generated by https://github.com/kamilchm/go2nix v1.2.1 -{ stdenv, buildGoPackage, fetchgit }: +{ lib, stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { pname = "btops"; @@ -15,7 +15,7 @@ buildGoPackage rec { goDeps = ./deps.nix; - meta = with stdenv.lib; { + meta = with lib; { description = "bspwm desktop management that supports dymanic appending, removing, and renaming"; homepage = "https://github.com/cmschuetz/btops"; maintainers = with maintainers; [ mnacamura ]; diff --git a/pkgs/applications/window-managers/cage/default.nix b/pkgs/applications/window-managers/cage/default.nix index 372ad1e27fc3..e48be5809e9c 100644 --- a/pkgs/applications/window-managers/cage/default.nix +++ b/pkgs/applications/window-managers/cage/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , meson, ninja, pkg-config, wayland, scdoc, makeWrapper , wlroots, wayland-protocols, pixman, libxkbcommon , systemd, libGL, libX11 @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { # Tests Cage using the NixOS module by launching xterm: passthru.tests.basic-nixos-module-functionality = nixosTests.cage; - meta = with stdenv.lib; { + meta = with lib; { description = "A Wayland kiosk that runs a single, maximized application"; homepage = "https://www.hjdskes.nl/projects/cage/"; license = licenses.mit; diff --git a/pkgs/applications/window-managers/cagebreak/default.nix b/pkgs/applications/window-managers/cagebreak/default.nix index 36b3adb08e11..3d0825997897 100644 --- a/pkgs/applications/window-managers/cagebreak/default.nix +++ b/pkgs/applications/window-managers/cagebreak/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , meson, ninja, pkg-config, wayland, scdoc, makeWrapper , wlroots, wayland-protocols, pixman, libxkbcommon , cairo , pango, fontconfig, pandoc, systemd @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { passthru.tests.basic = nixosTests.cagebreak; - meta = with stdenv.lib; { + meta = with lib; { description = "A Wayland tiling compositor inspired by ratpoison"; homepage = "https://github.com/project-repo/cagebreak"; license = licenses.mit; diff --git a/pkgs/applications/window-managers/clfswm/default.nix b/pkgs/applications/window-managers/clfswm/default.nix index e3864319f7bb..1c6f92a38f29 100644 --- a/pkgs/applications/window-managers/clfswm/default.nix +++ b/pkgs/applications/window-managers/clfswm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, autoconf, sbcl, lispPackages, xdpyinfo, texinfo4 +{ lib, stdenv, fetchgit, autoconf, sbcl, lispPackages, xdpyinfo, texinfo4 , makeWrapper }: stdenv.mkDerivation { @@ -39,7 +39,7 @@ stdenv.mkDerivation { echo ${xdpyinfo} ${lispPackages.clx} ${lispPackages.cl-ppcre} > $out/nix-support/depends ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A(nother) Common Lisp FullScreen Window Manager"; homepage = "https://common-lisp.net/project/clfswm/"; license = licenses.gpl3; diff --git a/pkgs/applications/window-managers/cwm/default.nix b/pkgs/applications/window-managers/cwm/default.nix index 18baefdbf3eb..dc80b54bc693 100644 --- a/pkgs/applications/window-managers/cwm/default.nix +++ b/pkgs/applications/window-managers/cwm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libX11, libXinerama, libXrandr, libXft, yacc, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, libX11, libXinerama, libXrandr, libXft, yacc, pkgconfig }: stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { prePatch = ''sed -i "s@/usr/local@$out@" Makefile''; - meta = with stdenv.lib; { + meta = with lib; { description = "A lightweight and efficient window manager for X11"; homepage = "https://github.com/leahneukirchen/cwm"; maintainers = with maintainers; [ _0x4A6F mkf ]; diff --git a/pkgs/applications/window-managers/dwm/dwm-status.nix b/pkgs/applications/window-managers/dwm/dwm-status.nix index c7c72b4d4025..470c8ae2acca 100644 --- a/pkgs/applications/window-managers/dwm/dwm-status.nix +++ b/pkgs/applications/window-managers/dwm/dwm-status.nix @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec { wrapProgram $out/bin/dwm-status --prefix "PATH" : "${stdenv.lib.makeBinPath bins}" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Highly performant and configurable DWM status service"; homepage = "https://github.com/Gerschtli/dwm-status"; license = with licenses; [ mit ]; diff --git a/pkgs/applications/window-managers/dwm/git.nix b/pkgs/applications/window-managers/dwm/git.nix index 3751a8de69f7..814b6167d17b 100644 --- a/pkgs/applications/window-managers/dwm/git.nix +++ b/pkgs/applications/window-managers/dwm/git.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, libX11, libXinerama, libXft, patches ? [], conf ? null }: +{ lib, stdenv, fetchgit, libX11, libXinerama, libXft, patches ? [], conf ? null }: let name = "dwm-git-20180602"; @@ -27,7 +27,7 @@ stdenv.mkDerivation { buildPhase = "make"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://suckless.org/"; description = "Dynamic window manager for X, development version"; license = licenses.mit; diff --git a/pkgs/applications/window-managers/evilwm/default.nix b/pkgs/applications/window-managers/evilwm/default.nix index 64dc784e812f..94562cd0d224 100644 --- a/pkgs/applications/window-managers/evilwm/default.nix +++ b/pkgs/applications/window-managers/evilwm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libX11, libXext, libXrandr, libXrender, +{ lib, stdenv, fetchurl, libX11, libXext, libXrandr, libXrender, xorgproto, patches ? [] }: stdenv.mkDerivation rec { @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { # Allow users set their own list of patches inherit patches; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.6809.org.uk/evilwm/"; description = "Minimalist window manager for the X Window System"; diff --git a/pkgs/applications/window-managers/fbpanel/default.nix b/pkgs/applications/window-managers/fbpanel/default.nix index c44bf5f0bd88..e927db36fdd5 100644 --- a/pkgs/applications/window-managers/fbpanel/default.nix +++ b/pkgs/applications/window-managers/fbpanel/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig +{ lib, stdenv, fetchurl, pkgconfig , libX11, libXmu, libXpm, gtk2, libpng, libjpeg, libtiff, librsvg, gdk-pixbuf, gdk-pixbuf-xlib }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { NIX_LDFLAGS="-lX11"; - meta = with stdenv.lib; { + meta = with lib; { description = "A stand-alone panel"; maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; diff --git a/pkgs/applications/window-managers/hikari/default.nix b/pkgs/applications/window-managers/hikari/default.nix index d23d6c07af0e..8f9ec3e56a22 100644 --- a/pkgs/applications/window-managers/hikari/default.nix +++ b/pkgs/applications/window-managers/hikari/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, +{ lib, stdenv, fetchzip, pkgconfig, bmake, cairo, glib, libevdev, libinput, libxkbcommon, linux-pam, pango, pixman, libucl, wayland, wayland-protocols, wlroots, @@ -65,7 +65,7 @@ stdenv.mkDerivation { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Stacking Wayland compositor which is actively developed on FreeBSD but also supports Linux"; homepage = "https://hikari.acmelabs.space"; license = licenses.bsd2; diff --git a/pkgs/applications/window-managers/i3/altlayout.nix b/pkgs/applications/window-managers/i3/altlayout.nix index 973dee3eeed3..d66ae3572360 100644 --- a/pkgs/applications/window-managers/i3/altlayout.nix +++ b/pkgs/applications/window-managers/i3/altlayout.nix @@ -11,6 +11,10 @@ python3Packages.buildPythonApplication rec { pythonPath = with python3Packages; [ enum-compat i3ipc docopt ]; + doCheck = false; + + pythonImportsCheck = [ "i3altlayout" ]; + meta = with lib; { maintainers = with maintainers; [ magnetophon ]; description = "Helps you handle more efficiently your screen real estate in i3wm by auto-splitting windows on their longest side"; diff --git a/pkgs/applications/window-managers/i3/blocks-gaps.nix b/pkgs/applications/window-managers/i3/blocks-gaps.nix index 4a91865fecac..f314f340beef 100644 --- a/pkgs/applications/window-managers/i3/blocks-gaps.nix +++ b/pkgs/applications/window-managers/i3/blocks-gaps.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, stdenv, perl, makeWrapper +{ fetchFromGitHub, lib, stdenv, perl, makeWrapper , iproute, acpi, sysstat, alsaUtils , scripts ? [ "bandwidth" "battery" "cpu_usage" "disk" "iface" "load_average" "memory" "volume" "wifi" ] @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { --prefix PATH : ${makeBinPath (optional (elem "volume" scripts) alsaUtils)} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A flexible scheduler for your i3bar blocks -- this is a fork to use with i3-gaps"; homepage = "https://github.com/Airblader/i3blocks-gaps"; license = licenses.gpl3; diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix index 2ea2c8ac7766..999deed3c666 100644 --- a/pkgs/applications/window-managers/i3/default.nix +++ b/pkgs/applications/window-managers/i3/default.nix @@ -1,18 +1,18 @@ -{ fetchurl, stdenv, which, pkgconfig, makeWrapper, installShellFiles, libxcb, xcbutilkeysyms +{ fetchurl, lib, stdenv, pkg-config, makeWrapper, meson, ninja, installShellFiles, libxcb, xcbutilkeysyms , xcbutil, xcbutilwm, xcbutilxrm, libstartup_notification, libX11, pcre, libev , yajl, xcb-util-cursor, perl, pango, perlPackages, libxkbcommon , xorgserver, xvfb_run }: stdenv.mkDerivation rec { pname = "i3"; - version = "4.18.3"; + version = "4.19"; src = fetchurl { - url = "https://i3wm.org/downloads/${pname}-${version}.tar.bz2"; - sha256 = "03dijnwv2n8ak9jq59fhq0rc80m5wjc9d54fslqaivnnz81pkbjk"; + url = "https://i3wm.org/downloads/${pname}-${version}.tar.xz"; + sha256 = "0wjq6lkidg0g474xsln1fhbxci7zclq3748sda10f1n7q01qp95c"; }; - nativeBuildInputs = [ which pkgconfig makeWrapper installShellFiles ]; + nativeBuildInputs = [ pkg-config makeWrapper meson ninja installShellFiles ]; buildInputs = [ libxcb xcbutilkeysyms xcbutil xcbutilwm xcbutilxrm libxkbcommon @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { separateDebugInfo = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A tiling window manager"; homepage = "https://i3wm.org"; maintainers = with maintainers; [ modulistic fpletz globin ]; diff --git a/pkgs/applications/window-managers/i3/easyfocus.nix b/pkgs/applications/window-managers/i3/easyfocus.nix index 5c7a22eb7694..517971905f64 100644 --- a/pkgs/applications/window-managers/i3/easyfocus.nix +++ b/pkgs/applications/window-managers/i3/easyfocus.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, xorgproto, libxcb, xcbutilkeysyms +{ lib, stdenv, fetchFromGitHub, pkgconfig, xorgproto, libxcb, xcbutilkeysyms , xorg , i3ipc-glib , glib }: @@ -22,7 +22,7 @@ stdenv.mkDerivation { cp i3-easyfocus $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Focus and select windows in i3"; homepage = "https://github.com/cornerman/i3-easyfocus"; maintainers = with maintainers; [teto]; diff --git a/pkgs/applications/window-managers/i3/gaps.nix b/pkgs/applications/window-managers/i3/gaps.nix index 10f86132ea9a..52322d8e1948 100644 --- a/pkgs/applications/window-managers/i3/gaps.nix +++ b/pkgs/applications/window-managers/i3/gaps.nix @@ -1,21 +1,16 @@ -{ fetchurl, stdenv, i3, autoreconfHook }: +{ fetchurl, lib, stdenv, i3, autoreconfHook }: i3.overrideAttrs (oldAttrs : rec { name = "i3-gaps-${version}"; - version = "4.18.3"; + version = "4.19"; src = fetchurl { - url = "https://github.com/Airblader/i3/releases/download/${version}/i3-${version}.tar.bz2"; - sha256 = "1hcakwyz78lgp8mhqv7pw86jlb3m415pfql1q19rkijnhm3fn3ci"; + url = "https://github.com/Airblader/i3/releases/download/${version}/i3-${version}.tar.xz"; + sha256 = "0j19kj05fpjfnj50vyykk6jsr07hq9l26y8na55bb7yfrra8yp4h"; }; - nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ autoreconfHook ]; - - # fatal error: GENERATED_config_enums.h: No such file or directory - enableParallelBuilding = false; - - meta = with stdenv.lib; { + meta = with lib; { description = "A fork of the i3 tiling window manager with some additional features"; homepage = "https://github.com/Airblader/i3"; maintainers = with maintainers; [ fmthoma ]; diff --git a/pkgs/applications/window-managers/i3/i3ipc-glib.nix b/pkgs/applications/window-managers/i3/i3ipc-glib.nix index af353589a7ed..36b48fa3b07e 100644 --- a/pkgs/applications/window-managers/i3/i3ipc-glib.nix +++ b/pkgs/applications/window-managers/i3/i3ipc-glib.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, xorgproto, libxcb +{ lib, stdenv, fetchFromGitHub, pkgconfig, xorgproto, libxcb , autoreconfHook, json-glib, gtk-doc, which , gobject-introspection }: @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { gtkdocize ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A C interface library to i3wm"; homepage = "https://github.com/acrisci/i3ipc-glib"; maintainers = with maintainers; [teto]; diff --git a/pkgs/applications/window-managers/i3/layout-manager.nix b/pkgs/applications/window-managers/i3/layout-manager.nix index 2d75aebc8228..a69a1cd5a33c 100644 --- a/pkgs/applications/window-managers/i3/layout-manager.nix +++ b/pkgs/applications/window-managers/i3/layout-manager.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, vim, makeWrapper, jq, rofi, xrandr, xdotool, i3, gawk, libnotify }: +{ lib, stdenv, fetchFromGitHub, vim, makeWrapper, jq, rofi, xrandr, xdotool, i3, gawk, libnotify }: let path = stdenv.lib.makeBinPath [ vim jq rofi xrandr xdotool i3 gawk libnotify ]; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/klaxalk/i3-layout-manager"; description = "Saving, loading and managing layouts for i3wm"; license = licenses.mit; diff --git a/pkgs/applications/window-managers/i3/lock-color.nix b/pkgs/applications/window-managers/i3/lock-color.nix index f07a1926f6e4..7fe48189752c 100644 --- a/pkgs/applications/window-managers/i3/lock-color.nix +++ b/pkgs/applications/window-managers/i3/lock-color.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libxcb, +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libxcb, xcbutilkeysyms , xcbutilimage, pam, libX11, libev, cairo, libxkbcommon, libxkbfile, libjpeg_turbo, xcbutilxrm }: @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { mv $out/share/man/man1/i3lock.1 $out/share/man/man1/i3lock-color.1 sed -i 's/\(^\|\s\|"\)i3lock\(\s\|$\)/\1i3lock-color\2/g' $out/share/man/man1/i3lock-color.1 ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A simple screen locker like slock, enhanced version with extra configuration options"; longDescription = '' Simple screen locker. After locking, a colored background (default: white) or diff --git a/pkgs/applications/window-managers/i3/lock-fancy-rapid.nix b/pkgs/applications/window-managers/i3/lock-fancy-rapid.nix index f6e24d979a45..8884b1d5100c 100644 --- a/pkgs/applications/window-managers/i3/lock-fancy-rapid.nix +++ b/pkgs/applications/window-managers/i3/lock-fancy-rapid.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, xorg, i3lock }: +{ lib, stdenv, fetchFromGitHub, xorg, i3lock }: stdenv.mkDerivation rec { pname = "i3lock-fancy-rapid"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { install -D i3lock-fancy-rapid $out/bin/i3lock-fancy-rapid ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A faster implementation of i3lock-fancy"; homepage = "https://github.com/yvbbrjdr/i3lock-fancy-rapid"; maintainers = with maintainers; [ nickhu ]; diff --git a/pkgs/applications/window-managers/i3/lock-fancy.nix b/pkgs/applications/window-managers/i3/lock-fancy.nix index c71ed04e48d3..7e42a8efd7e9 100644 --- a/pkgs/applications/window-managers/i3/lock-fancy.nix +++ b/pkgs/applications/window-managers/i3/lock-fancy.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, coreutils, scrot, imagemagick, gawk +{ lib, stdenv, fetchFromGitHub, coreutils, scrot, imagemagick, gawk , i3lock-color, getopt, fontconfig }: @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { cp i3lock-fancy $out/bin/i3lock-fancy cp icons/lock*.png $out/share/i3lock-fancy/icons ''; - meta = with stdenv.lib; { + meta = with lib; { description = "i3lock is a bash script that takes a screenshot of the desktop, blurs the background and adds a lock icon and text"; homepage = "https://github.com/meskarune/i3lock-fancy"; maintainers = with maintainers; [ ]; diff --git a/pkgs/applications/window-managers/i3/lock.nix b/pkgs/applications/window-managers/i3/lock.nix index 7a2812c2cfe0..3b991d091ce9 100644 --- a/pkgs/applications/window-managers/i3/lock.nix +++ b/pkgs/applications/window-managers/i3/lock.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, which, pkgconfig, libxcb, xcbutilkeysyms, xcbutilimage, +{ fetchurl, lib, stdenv, which, pkgconfig, libxcb, xcbutilkeysyms, xcbutilimage, xcbutilxrm, pam, libX11, libev, cairo, libxkbcommon, libxkbfile }: stdenv.mkDerivation rec { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { cp *.1 $out/share/man/man1 ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A simple screen locker like slock"; longDescription = '' Simple screen locker. After locking, a colored background (default: white) or diff --git a/pkgs/applications/window-managers/i3/pystatus.nix b/pkgs/applications/window-managers/i3/pystatus.nix index beefdaf891c6..f8d12642999a 100644 --- a/pkgs/applications/window-managers/i3/pystatus.nix +++ b/pkgs/applications/window-managers/i3/pystatus.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , libpulseaudio , libnotify @@ -45,7 +45,7 @@ python3Packages.buildPythonApplication rec { # no tests in tarball doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/enkore/i3pystatus"; description = "A complete replacement for i3status"; longDescription = '' diff --git a/pkgs/applications/window-managers/i3/status-rust.nix b/pkgs/applications/window-managers/i3/status-rust.nix index 66373250f71d..d49f8ff6bd6b 100644 --- a/pkgs/applications/window-managers/i3/status-rust.nix +++ b/pkgs/applications/window-managers/i3/status-rust.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , rustPlatform , fetchFromGitHub , pkgconfig @@ -37,7 +37,7 @@ rustPlatform.buildRustPackage rec { # Currently no tests are implemented, so we avoid building the package twice doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Very resource-friendly and feature-rich replacement for i3status"; homepage = "https://github.com/greshake/i3status-rust"; license = licenses.gpl3; diff --git a/pkgs/applications/window-managers/i3/wk-switch.nix b/pkgs/applications/window-managers/i3/wk-switch.nix index 51881975266d..e7fd87aaf3b8 100644 --- a/pkgs/applications/window-managers/i3/wk-switch.nix +++ b/pkgs/applications/window-managers/i3/wk-switch.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python3Packages }: +{ lib, stdenv, fetchFromGitHub, python3Packages }: python3Packages.buildPythonApplication rec { pname = "i3-wk-switch"; @@ -21,7 +21,7 @@ python3Packages.buildPythonApplication rec { cp i3-wk-switch.py "$out/bin/i3-wk-switch" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "XMonad-like workspace switching for i3 and sway"; maintainers = with maintainers; [ synthetica ]; platforms = platforms.linux; diff --git a/pkgs/applications/window-managers/i3/wmfocus.nix b/pkgs/applications/window-managers/i3/wmfocus.nix index 5c9f2b779530..6f6a63eca097 100644 --- a/pkgs/applications/window-managers/i3/wmfocus.nix +++ b/pkgs/applications/window-managers/i3/wmfocus.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform +{ lib, stdenv, fetchFromGitHub, rustPlatform , xorg, python3, pkgconfig, cairo, libxkbcommon }: rustPlatform.buildRustPackage rec { @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { # users. cargoBuildFlags = [ "--features i3" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Visually focus windows by label"; homepage = "https://github.com/svenstaro/wmfocus"; license = licenses.mit; diff --git a/pkgs/applications/window-managers/icewm/default.nix b/pkgs/applications/window-managers/icewm/default.nix index b86e598a4d08..425f562dfd52 100644 --- a/pkgs/applications/window-managers/icewm/default.nix +++ b/pkgs/applications/window-managers/icewm/default.nix @@ -1,30 +1,86 @@ -{ stdenv, fetchFromGitHub, cmake, gettext, perl, asciidoc -, libjpeg, libtiff, libungif, libpng, imlib, expat -, freetype, fontconfig, pkgconfig, gdk-pixbuf, gdk-pixbuf-xlib, glib -, mkfontdir, libX11, libXft, libXext, libXinerama -, libXrandr, libICE, libSM, libXpm, libXdmcp, libxcb -, libpthreadstubs, pcre, libXdamage, libXcomposite, libXfixes -, libsndfile, fribidi }: +{ lib, stdenv +, fetchFromGitHub +, cmake +, pkg-config +, perl +, asciidoc +, expat +, fontconfig +, freetype +, fribidi +, gdk-pixbuf +, gdk-pixbuf-xlib +, gettext +, glib +, imlib2 +, libICE +, libSM +, libX11 +, libXcomposite +, libXdamage +, libXdmcp +, libXext +, libXfixes +, libXft +, libXinerama +, libXpm +, libXrandr +, libjpeg +, libpng +, libpthreadstubs +, libsndfile +, libtiff +, libungif +, libxcb +, mkfontdir +, pcre +}: -with stdenv.lib; stdenv.mkDerivation rec { pname = "icewm"; - version = "1.9.2"; + version = "2.0.0"; src = fetchFromGitHub { owner = "bbidulock"; repo = pname; rev = version; - sha256 = "16a9ikknjmhrrlc5r6z2ilkjj5vzyfk4ypwab39mg7vcmd7jzc41"; + sha256 = "sha256-WdRAWAQEf9c66MVrLAs5VgBDK5r4JKM2GrjAV4cuGfA="; }; - nativeBuildInputs = [ cmake pkgconfig perl asciidoc ]; + nativeBuildInputs = [ cmake pkg-config perl asciidoc ]; buildInputs = [ - gettext libjpeg libtiff libungif libpng imlib expat freetype fontconfig - gdk-pixbuf gdk-pixbuf-xlib glib mkfontdir libX11 libXft libXext libXinerama - libXrandr libICE libSM libXpm libXdmcp libxcb libpthreadstubs pcre - libsndfile fribidi libXdamage libXcomposite libXfixes ]; + expat + fontconfig + freetype + fribidi + gdk-pixbuf + gdk-pixbuf-xlib + gettext + glib + imlib2 + libICE + libSM + libX11 + libXcomposite + libXdamage + libXdmcp + libXext + libXfixes + libXft + libXinerama + libXpm + libXrandr + libjpeg + libpng + libpthreadstubs + libsndfile + libtiff + libungif + libxcb + mkfontdir + pcre + ]; cmakeFlags = [ "-DPREFIX=$out" "-DCFGDIR=/etc/icewm" ]; @@ -33,11 +89,20 @@ stdenv.mkDerivation rec { cp -r ../lib/themes/{gtk2,Natural,nice,nice2,warp3,warp4,yellowmotif} $out/share/icewm/themes/ ''; - meta = { + meta = with lib; { description = "A simple, lightweight X window manager"; longDescription = '' - IceWM is a window manager for the X Window System. The goal of - IceWM is speed, simplicity, and not getting in the user's way. + IceWM is a window manager for the X Window System. The goal of IceWM is + speed, simplicity, and not getting in the user’s way. It comes with a + taskbar with pager, global and per-window keybindings and a dynamic menu + system. Application windows can be managed by keyboard and mouse. Windows + can be iconified to the taskbar, to the tray, to the desktop or be made + hidden. They are controllable by a quick switch window (Alt+Tab) and in a + window list. A handful of configurable focus models are + menu-selectable. Setups with multiple monitors are supported by RandR and + Xinerama. IceWM is very configurable, themeable and well documented. It + includes an optional external background wallpaper manager with + transparency support, a simple session manager and a system tray. ''; homepage = "https://www.ice-wm.org/"; license = licenses.lgpl2; diff --git a/pkgs/applications/window-managers/jwm/jwm-settings-manager.nix b/pkgs/applications/window-managers/jwm/jwm-settings-manager.nix index d6fe5b4200c4..58105ec219b5 100644 --- a/pkgs/applications/window-managers/jwm/jwm-settings-manager.nix +++ b/pkgs/applications/window-managers/jwm/jwm-settings-manager.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, gettext, libXpm, libGL, fltk, hicolor-icon-theme, glib, gnome2, which }: +{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, gettext, libXpm, libGL, fltk, hicolor-icon-theme, glib, gnome2, which }: stdenv.mkDerivation { pname = "jwm-settings-manager"; @@ -34,7 +34,7 @@ stdenv.mkDerivation { --replace 'DESTINATION usr/share' "DESTINATION share" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A full configuration manager for JWM"; homepage = "https://joewing.net/projects/jwm"; license = licenses.gpl3; diff --git a/pkgs/applications/window-managers/leftwm/default.nix b/pkgs/applications/window-managers/leftwm/default.nix index 13c0818101f7..d0e883f89c8c 100644 --- a/pkgs/applications/window-managers/leftwm/default.nix +++ b/pkgs/applications/window-managers/leftwm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform, libX11, libXinerama, makeWrapper }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, libX11, libXinerama, makeWrapper }: let rpath = stdenv.lib.makeLibraryPath [ libXinerama libX11 ]; @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { wrapProgram $out/bin/leftwm-worker --prefix LD_LIBRARY_PATH : "${rpath}" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A tiling window manager for the adventurer"; homepage = "https://github.com/leftwm/leftwm"; license = licenses.mit; diff --git a/pkgs/applications/window-managers/lemonbar/default.nix b/pkgs/applications/window-managers/lemonbar/default.nix index 5bdb04688ca5..2a4004e55439 100644 --- a/pkgs/applications/window-managers/lemonbar/default.nix +++ b/pkgs/applications/window-managers/lemonbar/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, libxcb }: +{ lib, stdenv, fetchurl, perl, libxcb }: stdenv.mkDerivation { name = "lemonbar-1.4"; @@ -12,7 +12,7 @@ stdenv.mkDerivation { prePatch = ''sed -i "s@/usr@$out@" Makefile''; - meta = with stdenv.lib; { + meta = with lib; { description = "A lightweight xcb based bar"; homepage = "https://github.com/LemonBoy/bar"; maintainers = [ maintainers.meisternu ]; diff --git a/pkgs/applications/window-managers/lwm/default.nix b/pkgs/applications/window-managers/lwm/default.nix index 49cdc81b9ce0..cf1088c82231 100644 --- a/pkgs/applications/window-managers/lwm/default.nix +++ b/pkgs/applications/window-managers/lwm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , imake, libX11, libSM, libXext, libICE }: stdenv.mkDerivation rec { @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { install -m644 lwm.man $out/share/man/man1/lwm.1 ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Lightweight Window Manager"; longDescription = '' lwm is a window manager for X that tries to keep out of your face. There diff --git a/pkgs/applications/window-managers/neocomp/default.nix b/pkgs/applications/window-managers/neocomp/default.nix index 57968922c390..da6b5e2825d6 100644 --- a/pkgs/applications/window-managers/neocomp/default.nix +++ b/pkgs/applications/window-managers/neocomp/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , asciidoc , docbook_xml_dtd_45 @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { "#define MAX_PATH_LENGTH 128" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/DelusionalLogic/NeoComp"; license = licenses.gpl3; maintainers = with maintainers; [ twey ]; diff --git a/pkgs/applications/window-managers/notion/default.nix b/pkgs/applications/window-managers/notion/default.nix index a00462e81113..5d688f5e2353 100644 --- a/pkgs/applications/window-managers/notion/default.nix +++ b/pkgs/applications/window-managers/notion/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig +{ lib, stdenv, fetchFromGitHub, pkgconfig , lua, gettext, which, groff, xmessage, xterm , readline, fontconfig, libX11, libXext, libSM , libXinerama, libXrandr, libXft @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { --prefix PATH ":" "${xmessage}/bin:${xterm}/bin" \ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Tiling tabbed window manager"; homepage = "https://notionwm.net"; license = licenses.lgpl21; diff --git a/pkgs/applications/window-managers/pekwm/default.nix b/pkgs/applications/window-managers/pekwm/default.nix index da2c11c873b1..fcce16c08ba6 100644 --- a/pkgs/applications/window-managers/pekwm/default.nix +++ b/pkgs/applications/window-managers/pekwm/default.nix @@ -1,22 +1,39 @@ -{ stdenv, fetchurl, pkgconfig -, libpng, libjpeg -, libXext, libXft, libXpm, libXrandr, libXinerama }: +{ lib, stdenv +, fetchFromGitHub +, pkg-config +, cmake +, libXext +, libXft +, libXinerama +, libXpm +, libXrandr +, libjpeg +, libpng +}: stdenv.mkDerivation rec { - pname = "pekwm"; - version = "0.1.17"; + version = "0.1.18"; - src = fetchurl { - url = "https://www.pekwm.org/projects/pekwm/files/${pname}-${version}.tar.bz2"; - sha256 = "003x6bxj1lb2ljxz3v414bn0rdl6z68c0r185fxwgs1qkyzx67wa"; + src = fetchFromGitHub { + owner = "pekdon"; + repo = "pekwm"; + rev = "release-${version}"; + sha256 = "sha256-R1XDEk097ycMI3R4SjUEJv37CiMaDCQMvg7N8haN0MM="; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libpng libjpeg - libXext libXft libXpm libXrandr libXinerama ]; + nativeBuildInputs = [ pkg-config cmake ]; + buildInputs = [ + libXext + libXft + libXinerama + libXpm + libXrandr + libjpeg + libpng + ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A lightweight window manager"; longDescription = '' pekwm is a window manager that once upon a time was based on the @@ -24,7 +41,7 @@ stdenv.mkDerivation rec { longer resembles aewm++ at all. It has a much expanded feature-set, including window grouping (similar to ion, pwm, or fluxbox), autoproperties, xinerama, keygrabber that supports - keychains, and much more. + keychains, and much more. - Lightweight and Unobtrusive, a window manager shouldn't be noticed. - Very configurable, we all work and think in different ways. @@ -33,7 +50,7 @@ stdenv.mkDerivation rec { - Chainable Keygrabber, usability for everyone. ''; homepage = "http://www.pekwm.org"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.linux; }; diff --git a/pkgs/applications/window-managers/picom/default.nix b/pkgs/applications/window-managers/picom/default.nix index 064e555f3a5b..4287dd2db020 100644 --- a/pkgs/applications/window-managers/picom/default.nix +++ b/pkgs/applications/window-managers/picom/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, pkgconfig, uthash, asciidoc, docbook_xml_dtd_45 +{ stdenv, lib, fetchFromGitHub, pkg-config, uthash, asciidoc, docbook_xml_dtd_45 , docbook_xsl, libxslt, libxml2, makeWrapper, meson, ninja , xorgproto, libxcb ,xcbutilrenderutil, xcbutilimage, pixman, libev , dbus, libconfig, libdrm, libGL, pcre, libX11 @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config uthash asciidoc docbook_xml_dtd_45 @@ -35,10 +35,10 @@ stdenv.mkDerivation rec { libxdg_basedir ]; - NIX_CFLAGS_COMPILE = "-fno-strict-aliasing"; + mesonBuildType = "release"; mesonFlags = [ - "-Dbuild_docs=true" + "-Dwith_docs=true" ]; installFlags = [ "PREFIX=$(out)" ]; @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { ''; license = licenses.mit; homepage = "https://github.com/yshui/picom"; - maintainers = with maintainers; [ ertes enzime twey ]; + maintainers = with maintainers; [ ertes twey thiagokokada ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/window-managers/qtile/default.nix b/pkgs/applications/window-managers/qtile/default.nix index 280ec067658a..284a12e65f54 100644 --- a/pkgs/applications/window-managers/qtile/default.nix +++ b/pkgs/applications/window-managers/qtile/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python37Packages, glib, cairo, pango, pkgconfig, libxcb, xcbutilcursor }: +{ lib, stdenv, fetchFromGitHub, python37Packages, glib, cairo, pango, pkgconfig, libxcb, xcbutilcursor }: let cairocffi-xcffib = python37Packages.cairocffi.override { withXcffib = true; @@ -56,7 +56,7 @@ python37Packages.buildPythonApplication rec { doCheck = false; # Requires X server #TODO this can be worked out with the existing NixOS testing infrastructure. - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.qtile.org/"; license = licenses.mit; description = "A small, flexible, scriptable tiling window manager written in Python"; diff --git a/pkgs/applications/window-managers/ratpoison/default.nix b/pkgs/applications/window-managers/ratpoison/default.nix index 4c7cdf1069f9..30195ab91471 100644 --- a/pkgs/applications/window-managers/ratpoison/default.nix +++ b/pkgs/applications/window-managers/ratpoison/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, perl, autoconf, automake +{ lib, stdenv, fetchurl, pkgconfig, perl, autoconf, automake , libX11, xorgproto, libXt, libXpm, libXft, libXtst, libXi , libXrandr, fontconfig, freetype, readline }: @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { mv $out/share/ratpoison $contrib/share ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.nongnu.org/ratpoison/"; description = "Simple mouse-free tiling window manager"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/window-managers/sawfish/default.nix b/pkgs/applications/window-managers/sawfish/default.nix index 062597745194..7615c6c4bd80 100644 --- a/pkgs/applications/window-managers/sawfish/default.nix +++ b/pkgs/applications/window-managers/sawfish/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , pkg-config , which @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "An extensible, Lisp-based window manager"; longDescription = '' Sawfish is an extensible window manager using a Lisp-based scripting language. diff --git a/pkgs/applications/window-managers/spectrwm/default.nix b/pkgs/applications/window-managers/spectrwm/default.nix index c3ab55894860..6598fefaebd2 100644 --- a/pkgs/applications/window-managers/spectrwm/default.nix +++ b/pkgs/applications/window-managers/spectrwm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, xorg }: +{ lib, stdenv, fetchFromGitHub, pkgconfig, xorg }: stdenv.mkDerivation { pname = "spectrwm"; @@ -28,7 +28,7 @@ stdenv.mkDerivation { makeFlags = [ "PREFIX=${placeholder "out"}" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A tiling window manager"; homepage = "https://github.com/conformal/spectrwm"; maintainers = with maintainers; [ christianharke ]; diff --git a/pkgs/applications/window-managers/stalonetray/default.nix b/pkgs/applications/window-managers/stalonetray/default.nix index ad0baeb97dd2..47903bb2276e 100644 --- a/pkgs/applications/window-managers/stalonetray/default.nix +++ b/pkgs/applications/window-managers/stalonetray/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libX11, xorgproto }: +{ lib, stdenv, fetchurl, libX11, xorgproto }: stdenv.mkDerivation rec { pname = "stalonetray"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Stand alone tray"; homepage = "http://stalonetray.sourceforge.net"; license = licenses.gpl2; diff --git a/pkgs/applications/window-managers/stumpish/default.nix b/pkgs/applications/window-managers/stumpish/default.nix index c76a9ba762ef..c5c3d9db783e 100644 --- a/pkgs/applications/window-managers/stumpish/default.nix +++ b/pkgs/applications/window-managers/stumpish/default.nix @@ -1,4 +1,4 @@ -{ stdenv, substituteAll, fetchFromGitHub, gnused, ncurses, xorg, rlwrap }: +{ lib, stdenv, substituteAll, fetchFromGitHub, gnused, ncurses, xorg, rlwrap }: stdenv.mkDerivation { pname = "stumpish"; @@ -33,7 +33,7 @@ stdenv.mkDerivation { cp util/stumpish/stumpish $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/stumpwm/stumpwm-contrib"; description = "STUMPwm Interactive SHell"; license = licenses.gpl2; diff --git a/pkgs/applications/window-managers/stumpwm/default.nix b/pkgs/applications/window-managers/stumpwm/default.nix index b059423c23c4..4db5343498c7 100644 --- a/pkgs/applications/window-managers/stumpwm/default.nix +++ b/pkgs/applications/window-managers/stumpwm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, autoconf, sbcl, lispPackages, xdpyinfo, texinfo4 +{ lib, stdenv, fetchgit, autoconf, sbcl, lispPackages, xdpyinfo, texinfo4 , makeWrapper , rlwrap, gnused, gnugrep, coreutils, xprop , extraModulePaths ? [] , version }: @@ -93,7 +93,7 @@ stdenv.mkDerivation { inherit sbcl lispPackages contrib; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A tiling window manager for X11"; homepage = "https://github.com/stumpwm/"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/window-managers/sway/bg.nix b/pkgs/applications/window-managers/sway/bg.nix index 86301492c468..a4532960619f 100644 --- a/pkgs/applications/window-managers/sway/bg.nix +++ b/pkgs/applications/window-managers/sway/bg.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , meson, ninja, pkgconfig, scdoc , wayland, wayland-protocols, cairo, gdk-pixbuf }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { "-Dgdk-pixbuf=enabled" "-Dman-pages=enabled" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Wallpaper tool for Wayland compositors"; longDescription = '' A wallpaper utility for Wayland compositors, that is compatible with any diff --git a/pkgs/applications/window-managers/sway/contrib.nix b/pkgs/applications/window-managers/sway/contrib.nix index fd44f4a5be50..e04a6e1cb78c 100644 --- a/pkgs/applications/window-managers/sway/contrib.nix +++ b/pkgs/applications/window-managers/sway/contrib.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , coreutils @@ -55,7 +55,7 @@ grimshot = stdenv.mkDerivation rec { fi ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A helper for screenshots within sway"; homepage = "https://github.com/swaywm/sway/tree/master/contrib"; license = licenses.mit; diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix index 23dcf68bddf3..2b3c51a7340f 100644 --- a/pkgs/applications/window-managers/sway/default.nix +++ b/pkgs/applications/window-managers/sway/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, makeWrapper +{ lib, stdenv, fetchFromGitHub, makeWrapper , meson, ninja, pkg-config, wayland, scdoc , libxkbcommon, pcre, json_c, dbus, libevdev , pango, cairo, libinput, libcap, pam, gdk-pixbuf, librsvg @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { "-Ddefault-wallpaper=false" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "An i3-compatible tiling Wayland compositor"; longDescription = '' Sway is a tiling Wayland compositor and a drop-in replacement for the i3 diff --git a/pkgs/applications/window-managers/sway/idle.nix b/pkgs/applications/window-managers/sway/idle.nix index 486ab79598df..546999e60352 100644 --- a/pkgs/applications/window-managers/sway/idle.nix +++ b/pkgs/applications/window-managers/sway/idle.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , meson, ninja, pkgconfig, scdoc , wayland, wayland-protocols, systemd }: @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dman-pages=enabled" "-Dlogind=enabled" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Idle management daemon for Wayland"; longDescription = '' Sway's idle management daemon. It is compatible with any Wayland diff --git a/pkgs/applications/window-managers/sway/lock-effects.nix b/pkgs/applications/window-managers/sway/lock-effects.nix index 4bb4225d394d..e90aaf5efc23 100644 --- a/pkgs/applications/window-managers/sway/lock-effects.nix +++ b/pkgs/applications/window-managers/sway/lock-effects.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, +{ lib, stdenv, fetchFromGitHub, meson, ninja, pkgconfig, scdoc, wayland, wayland-protocols, libxkbcommon, cairo, gdk-pixbuf, pam @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { "-Dpam=enabled" "-Dgdk-pixbuf=enabled" "-Dman-pages=enabled" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Screen locker for Wayland"; longDescription = '' Swaylock, with fancy effects diff --git a/pkgs/applications/window-managers/sway/lock-fancy.nix b/pkgs/applications/window-managers/sway/lock-fancy.nix index 338d626d9908..710dff73452d 100644 --- a/pkgs/applications/window-managers/sway/lock-fancy.nix +++ b/pkgs/applications/window-managers/sway/lock-fancy.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, coreutils, grim, gawk, swaylock +{ lib, stdenv, fetchFromGitHub, coreutils, grim, gawk, swaylock , imagemagick, getopt, fontconfig, makeWrapper }: @@ -37,7 +37,7 @@ in stdenv.mkDerivation rec { --prefix PATH : "${depsPath}" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "This is an swaylock bash script that takes a screenshot of the desktop, blurs the background and adds a lock icon and text"; homepage = "https://github.com/Big-B/swaylock-fancy"; license = licenses.mit; diff --git a/pkgs/applications/window-managers/sway/lock.nix b/pkgs/applications/window-managers/sway/lock.nix index 7cbba5e981bf..51e7bf345943 100644 --- a/pkgs/applications/window-managers/sway/lock.nix +++ b/pkgs/applications/window-managers/sway/lock.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , meson, ninja, pkgconfig, scdoc , wayland, wayland-protocols, libxkbcommon, cairo, gdk-pixbuf, pam }: @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { "-Dpam=enabled" "-Dgdk-pixbuf=enabled" "-Dman-pages=enabled" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Screen locker for Wayland"; longDescription = '' swaylock is a screen locking utility for Wayland compositors. diff --git a/pkgs/applications/window-managers/sxhkd/default.nix b/pkgs/applications/window-managers/sxhkd/default.nix index ac28abc31d3f..427f4c92f7bd 100644 --- a/pkgs/applications/window-managers/sxhkd/default.nix +++ b/pkgs/applications/window-managers/sxhkd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, asciidoc, libxcb, xcbutil, xcbutilkeysyms +{ lib, stdenv, fetchFromGitHub, asciidoc, libxcb, xcbutil, xcbutilkeysyms , xcbutilwm }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Simple X hotkey daemon"; homepage = "https://github.com/baskerville/sxhkd"; license = licenses.bsd2; diff --git a/pkgs/applications/window-managers/trayer/default.nix b/pkgs/applications/window-managers/trayer/default.nix index 5c3d8710e35d..e7fc397e123c 100644 --- a/pkgs/applications/window-managers/trayer/default.nix +++ b/pkgs/applications/window-managers/trayer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, gdk-pixbuf, gtk2 }: +{ lib, stdenv, fetchFromGitHub, pkgconfig, gdk-pixbuf, gtk2 }: stdenv.mkDerivation rec { name = "trayer-1.1.8"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/sargon/trayer-srg"; license = licenses.mit; description = "A lightweight GTK2-based systray for UNIX desktop"; diff --git a/pkgs/applications/window-managers/vwm/default.nix b/pkgs/applications/window-managers/vwm/default.nix index 8eb42bb9a97d..1b70706d0d3e 100644 --- a/pkgs/applications/window-managers/vwm/default.nix +++ b/pkgs/applications/window-managers/vwm/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ncurses, pkgconfig, glib, libviper, libpseudo, gpm, +{lib, stdenv, fetchurl, ncurses, pkgconfig, glib, libviper, libpseudo, gpm, libvterm}: stdenv.mkDerivation rec { @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ncurses glib libviper libpseudo gpm libvterm ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://vwm.sourceforge.net/"; description = "Dynamic window manager for the console"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/window-managers/windowchef/default.nix b/pkgs/applications/window-managers/windowchef/default.nix index 0f65e4443ca4..f5a5e6dbd5c9 100644 --- a/pkgs/applications/window-managers/windowchef/default.nix +++ b/pkgs/applications/window-managers/windowchef/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libxcb, libXrandr +{ lib, stdenv, fetchFromGitHub, libxcb, libXrandr , xcbutil, xcbutilkeysyms, xcbutilwm, xcbproto }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A stacking window manager that cooks windows with orders from the Waitron"; homepage = "https://github.com/tudurom/windowchef"; maintainers = with maintainers; [ bhougland ]; diff --git a/pkgs/applications/window-managers/windowmaker/default.nix b/pkgs/applications/window-managers/windowmaker/default.nix index 9f5d2e2539df..6bb0586ffed7 100644 --- a/pkgs/applications/window-managers/windowmaker/default.nix +++ b/pkgs/applications/window-managers/windowmaker/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig +{ lib, stdenv, fetchurl, pkgconfig , libX11, libXext, libXft, libXmu, libXinerama, libXrandr, libXpm , imagemagick, libpng, libjpeg, libexif, libtiff, libungif, libwebp }: @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { "--disable-magick" # Many distros reported imagemagick fails to be found ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://windowmaker.org/"; description = "NeXTSTEP-like window manager"; longDescription = '' diff --git a/pkgs/applications/window-managers/windowmaker/dockapps/AlsaMixer-app.nix b/pkgs/applications/window-managers/windowmaker/dockapps/AlsaMixer-app.nix index 4ec021644011..43080f2eae7d 100644 --- a/pkgs/applications/window-managers/windowmaker/dockapps/AlsaMixer-app.nix +++ b/pkgs/applications/window-managers/windowmaker/dockapps/AlsaMixer-app.nix @@ -1,4 +1,4 @@ -{ stdenv, dockapps-sources, pkg-config, libX11, libXpm, libXext, alsaLib }: +{ lib, stdenv, dockapps-sources, pkg-config, libX11, libXpm, libXext, alsaLib }: stdenv.mkDerivation rec { pname = "AlsaMixer.app"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ln -s ${placeholder "out"}/bin/AlsaMixer.app ${placeholder "out"}/bin/AlsaMixer ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Alsa mixer application for Windowmaker"; homepage = "https://www.dockapps.net/alsamixerapp"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/window-managers/windowmaker/dockapps/libdockapp.nix b/pkgs/applications/window-managers/windowmaker/dockapps/libdockapp.nix index bcdef42a78a0..aaf99ec932e6 100644 --- a/pkgs/applications/window-managers/windowmaker/dockapps/libdockapp.nix +++ b/pkgs/applications/window-managers/windowmaker/dockapps/libdockapp.nix @@ -1,4 +1,4 @@ -{ stdenv, dockapps-sources, autoreconfHook, pkg-config +{ lib, stdenv, dockapps-sources, autoreconfHook, pkg-config , libX11, libXext, libXpm, mkfontdir, fontutil }: stdenv.mkDerivation rec { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { "--with-font=no" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A library providing a framework for dockapps"; homepage = "https://www.dockapps.net/libdockapp"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/window-managers/windowmaker/dockapps/wmCalClock.nix b/pkgs/applications/window-managers/windowmaker/dockapps/wmCalClock.nix index f8ea781858a4..9f49b4508c1c 100644 --- a/pkgs/applications/window-managers/windowmaker/dockapps/wmCalClock.nix +++ b/pkgs/applications/window-managers/windowmaker/dockapps/wmCalClock.nix @@ -1,4 +1,4 @@ -{ stdenv, dockapps-sources +{ lib, stdenv, dockapps-sources , libX11, libXpm, libXext }: stdenv.mkDerivation rec { @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { installFlags = [ "DESTDIR=${placeholder "out"}" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A Calendar clock with antialiased text"; homepage = "https://www.dockapps.net/wmcalclock"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/window-managers/windowmaker/dockapps/wmsm-app.nix b/pkgs/applications/window-managers/windowmaker/dockapps/wmsm-app.nix index dd25ee2b2fce..e427a85d0386 100644 --- a/pkgs/applications/window-managers/windowmaker/dockapps/wmsm-app.nix +++ b/pkgs/applications/window-managers/windowmaker/dockapps/wmsm-app.nix @@ -1,4 +1,4 @@ -{ stdenv, dockapps-sources +{ lib, stdenv, dockapps-sources , libX11 , libXpm , libXext @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { installFlags = [ "PREFIX=${placeholder "out"}/bin" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "System monitor for Windowmaker"; homepage = "https://www.dockapps.net/wmsmapp"; license = licenses.gpl2; diff --git a/pkgs/applications/window-managers/windowmaker/dockapps/wmsystemtray.nix b/pkgs/applications/window-managers/windowmaker/dockapps/wmsystemtray.nix index 6ec62af5d36e..cde55e016985 100644 --- a/pkgs/applications/window-managers/windowmaker/dockapps/wmsystemtray.nix +++ b/pkgs/applications/window-managers/windowmaker/dockapps/wmsystemtray.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libX11, libXpm, libXext, libXfixes, libXmu }: +{ lib, stdenv, fetchurl, pkgconfig, libX11, libXpm, libXext, libXfixes, libXmu }: stdenv.mkDerivation rec { pname = "wmsystemtray"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 libXpm libXext libXfixes libXmu ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A system tray for Windowmaker"; homepage = "http://wmsystemtray.sourceforge.net"; license = licenses.gpl2Only; diff --git a/pkgs/applications/window-managers/wio/default.nix b/pkgs/applications/window-managers/wio/default.nix new file mode 100644 index 000000000000..b001b6a64f96 --- /dev/null +++ b/pkgs/applications/window-managers/wio/default.nix @@ -0,0 +1,57 @@ +{ lib, stdenv, fetchgit +, meson +, ninja +, pkg-config +, alacritty +, cage +, cairo +, libxkbcommon +, udev +, wayland +, wayland-protocols +, wlroots +, xwayland +, makeWrapper +}: + +stdenv.mkDerivation rec { + pname = "wio"; + version = "unstable-2020-11-02"; + + src = fetchgit { + url = "https://git.sr.ht/~sircmpwn/wio"; + rev = "31b742e473b15a2087be740d1de28bc2afd47a4d"; + sha256 = "1vpvlahv6dmr7vfb11p5cc5ds2y2vfvcb877nkqx18yin6pg357l"; + }; + + nativeBuildInputs = [ meson ninja pkg-config makeWrapper ]; + buildInputs = [ + cairo + libxkbcommon + udev + wayland + wayland-protocols + wlroots + xwayland + ]; + + postInstall = '' + wrapProgram $out/bin/wio \ + --prefix PATH ":" "${stdenv.lib.makeBinPath [ alacritty cage ]}" + ''; + + meta = with lib; { + description = "That Plan 9 feel, for Wayland"; + longDescription = '' + Wio is a Wayland compositor for Linux and FreeBSD which has a similar look + and feel to plan9's rio. + ''; + homepage = "https://wio-project.org/"; + license = licenses.mit; + platforms = with platforms; linux; + maintainers = with maintainers; [ AndersonTorres ]; + }; + + passthru.providedSessions = [ "wio" ]; +} +# TODO: factor Linux-specific options diff --git a/pkgs/applications/window-managers/wmfs/default.nix b/pkgs/applications/window-managers/wmfs/default.nix index a53fc560abca..83c7d787d882 100644 --- a/pkgs/applications/window-managers/wmfs/default.nix +++ b/pkgs/applications/window-managers/wmfs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gnumake, +{ lib, stdenv, fetchFromGitHub, gnumake, libX11, libXinerama, libXrandr, libXpm, libXft, imlib2 }: stdenv.mkDerivation { pname = "wmfs"; @@ -33,7 +33,7 @@ stdenv.mkDerivation { "MANPREFIX=${placeholder "out"}/share/man" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Window manager from scratch"; license = licenses.bsd2; maintainers = [ maintainers.balsoft ]; diff --git a/pkgs/applications/window-managers/xmonad/log-applet/default.nix b/pkgs/applications/window-managers/xmonad/log-applet/default.nix index ffd804eaba0e..744ae6257907 100644 --- a/pkgs/applications/window-managers/xmonad/log-applet/default.nix +++ b/pkgs/applications/window-managers/xmonad/log-applet/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, glib, dbus-glib +{ lib, stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, glib, dbus-glib , desktopSupport ? "gnomeflashback", xorg , gtk2 , gtk3, gnome3, mate @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { # --define-variable=prefix=$prefix PKG_CONFIG_LIBXFCE4PANEL_1_0_LIBDIR = "$(out)/lib"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/kalj/xmonad-log-applet"; license = licenses.bsd3; broken = desktopSupport == "gnomeflashback"; diff --git a/pkgs/applications/window-managers/yabar/build.nix b/pkgs/applications/window-managers/yabar/build.nix index 10806ba78cfe..c4b4f5cc8c4f 100644 --- a/pkgs/applications/window-managers/yabar/build.nix +++ b/pkgs/applications/window-managers/yabar/build.nix @@ -45,11 +45,11 @@ stdenv.mkDerivation { } ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A modern and lightweight status bar for X window managers"; homepage = "https://github.com/geommer/yabar"; license = licenses.mit; platforms = platforms.linux; - maintainers = with maintainers; [ ma27 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/build-support/bintools-wrapper/add-flags.sh b/pkgs/build-support/bintools-wrapper/add-flags.sh index e99beb381586..3b94daba65d7 100644 --- a/pkgs/build-support/bintools-wrapper/add-flags.sh +++ b/pkgs/build-support/bintools-wrapper/add-flags.sh @@ -3,6 +3,7 @@ var_templates_list=( NIX_IGNORE_LD_THROUGH_GCC NIX_LDFLAGS NIX_LDFLAGS_BEFORE + NIX_DYNAMIC_LINKER NIX_LDFLAGS_AFTER NIX_LDFLAGS_HARDEN NIX_HARDENING_ENABLE @@ -25,6 +26,10 @@ if [ -e @out@/nix-support/libc-ldflags ]; then NIX_LDFLAGS_@suffixSalt@+=" $(< @out@/nix-support/libc-ldflags)" fi +if [ -z "$NIX_DYNAMIC_LINKER_@suffixSalt@" ] && [ -e @out@/nix-support/ld-set-dynamic-linker ]; then + NIX_DYNAMIC_LINKER_@suffixSalt@="$(< @out@/nix-support/dynamic-linker)" +fi + if [ -e @out@/nix-support/libc-ldflags-before ]; then NIX_LDFLAGS_BEFORE_@suffixSalt@="$(< @out@/nix-support/libc-ldflags-before) $NIX_LDFLAGS_BEFORE_@suffixSalt@" fi diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix index 6da0e58436d0..bd3ebdf800e2 100644 --- a/pkgs/build-support/bintools-wrapper/default.nix +++ b/pkgs/build-support/bintools-wrapper/default.nix @@ -237,19 +237,14 @@ stdenv.mkDerivation { if [ -n "''${dynamicLinker-}" ]; then echo $dynamicLinker > $out/nix-support/dynamic-linker - '' + (if targetPlatform.isDarwin then '' - printf "export LD_DYLD_PATH=%q\n" "$dynamicLinker" >> $out/nix-support/setup-hook - '' else '' - if [ -e ${libc_lib}/lib/32/ld-linux.so.2 ]; then - echo ${libc_lib}/lib/32/ld-linux.so.2 > $out/nix-support/dynamic-linker-m32 - fi - '' - # The dynamic linker is passed in `ldflagsBefore' to allow - # explicit overrides of the dynamic linker by callers to ld - # (the *last* value counts, so ours should come first). - + '' - echo -dynamic-linker "$dynamicLinker" >> $out/nix-support/libc-ldflags-before - '') + '' + ${if targetPlatform.isDarwin then '' + printf "export LD_DYLD_PATH=%q\n" "$dynamicLinker" >> $out/nix-support/setup-hook + '' else '' + if [ -e ${libc_lib}/lib/32/ld-linux.so.2 ]; then + echo ${libc_lib}/lib/32/ld-linux.so.2 > $out/nix-support/dynamic-linker-m32 + fi + touch $out/nix-support/ld-set-dynamic-linker + ''} fi '') diff --git a/pkgs/build-support/bintools-wrapper/ld-wrapper.sh b/pkgs/build-support/bintools-wrapper/ld-wrapper.sh index 81b5a90edd5c..9d02f99851a5 100644 --- a/pkgs/build-support/bintools-wrapper/ld-wrapper.sh +++ b/pkgs/build-support/bintools-wrapper/ld-wrapper.sh @@ -20,6 +20,7 @@ if [ -z "${NIX_BINTOOLS_WRAPPER_FLAGS_SET_@suffixSalt@:-}" ]; then source @out@/nix-support/add-flags.sh fi +setDynamicLinker=1 # Optionally filter out paths not refering to the store. expandResponseParams "$@" @@ -47,6 +48,11 @@ if [[ "${NIX_ENFORCE_PURITY:-}" = 1 && -n "${NIX_STORE:-}" # Our ld is not built with sysroot support (Can we fix that?) : else + if [[ "$p" = -static || "$p" = -static-pie ]]; then + # Using a dynamic linker for static binaries can lead to crashes. + # This was observed for rust binaries. + setDynamicLinker=0 + fi rest+=("$p") fi n+=1 @@ -63,6 +69,11 @@ extraBefore=(${hardeningLDFlags[@]+"${hardeningLDFlags[@]}"}) if [ -z "${NIX_LDFLAGS_SET_@suffixSalt@:-}" ]; then extraAfter+=($NIX_LDFLAGS_@suffixSalt@) extraBefore+=($NIX_LDFLAGS_BEFORE_@suffixSalt@) + # By adding dynamic linker to extraBefore we allow the users set their + # own dynamic linker as NIX_LD_FLAGS will override earlier set flags + if [[ "$setDynamicLinker" = 1 && -n "$NIX_DYNAMIC_LINKER_@suffixSalt@" ]]; then + extraBefore+=("-dynamic-linker" "$NIX_DYNAMIC_LINKER_@suffixSalt@") + fi fi extraAfter+=($NIX_LDFLAGS_AFTER_@suffixSalt@) @@ -134,7 +145,7 @@ then done fi -if [ -e "@out@/nix-support/dynamic-linker-m32" ] && (( "$link32" )); then +if [[ "$link32" = "1" && "$setDynamicLinker" = 1 && -e "@out@/nix-support/dynamic-linker-m32" ]]; then # We have an alternate 32-bit linker and we're producing a 32-bit ELF, let's # use it. extraAfter+=( diff --git a/pkgs/build-support/build-fhs-userenv/chrootenv/default.nix b/pkgs/build-support/build-fhs-userenv/chrootenv/default.nix index 70a7a43bd398..6ab697c3696f 100644 --- a/pkgs/build-support/build-fhs-userenv/chrootenv/default.nix +++ b/pkgs/build-support/build-fhs-userenv/chrootenv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, meson, ninja, pkgconfig, glib }: +{ lib, stdenv, meson, ninja, pkgconfig, glib }: stdenv.mkDerivation { name = "chrootenv"; @@ -7,7 +7,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ meson ninja pkgconfig ]; buildInputs = [ glib ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Setup mount/user namespace for FHS emulation"; license = licenses.mit; maintainers = with maintainers; [ yegortimoshenko ]; diff --git a/pkgs/build-support/cc-wrapper/cc-wrapper.sh b/pkgs/build-support/cc-wrapper/cc-wrapper.sh index 7e734f57773e..1450218aff27 100644 --- a/pkgs/build-support/cc-wrapper/cc-wrapper.sh +++ b/pkgs/build-support/cc-wrapper/cc-wrapper.sh @@ -28,6 +28,7 @@ cc1=0 [[ "@prog@" = *++ ]] && isCpp=1 || isCpp=0 cppInclude=1 cInclude=1 +setDynamicLinker=1 expandResponseParams "$@" declare -i n=0 @@ -58,6 +59,8 @@ while (( "$n" < "$nParams" )); do cppInclude=0 elif [ "$p" = -nostdinc++ ]; then cppInclude=0 + elif [[ "$p" = -static || "$p" = -static-pie ]]; then + setDynamicLinker=0 elif [[ "$p" != -?* ]]; then # A dash alone signifies standard input; it is not a flag nonFlagArgs=1 @@ -152,6 +155,9 @@ if [ "$dontLink" != 1 ]; then for i in $NIX_LDFLAGS_BEFORE_@suffixSalt@; do extraBefore+=("-Wl,$i") done + if [[ "$setDynamicLinker" = 1 && -n "$NIX_DYNAMIC_LINKER_@suffixSalt@" ]]; then + extraBefore+=("-Wl,-dynamic-linker=$NIX_DYNAMIC_LINKER_@suffixSalt@") + fi for i in $NIX_LDFLAGS_@suffixSalt@; do if [ "${i:0:3}" = -L/ ]; then extraAfter+=("$i") diff --git a/pkgs/build-support/coq/default.nix b/pkgs/build-support/coq/default.nix new file mode 100644 index 000000000000..7e925e2473e1 --- /dev/null +++ b/pkgs/build-support/coq/default.nix @@ -0,0 +1,92 @@ +{ lib, stdenv, coqPackages, coq, fetchzip }@args: +let lib = import ./extra-lib.nix {inherit (args) lib;}; in +with builtins; with lib; +let + isGitHubDomain = d: match "^github.*" d != null; + isGitLabDomain = d: match "^gitlab.*" d != null; +in +{ pname, + version ? null, + fetcher ? null, + owner ? "coq-community", + domain ? "github.com", + repo ? pname, + defaultVersion ? null, + releaseRev ? (v: v), + displayVersion ? {}, + release ? {}, + extraBuildInputs ? [], + namePrefix ? [], + enableParallelBuilding ? true, + extraInstallFlags ? [], + setCOQBIN ? true, + mlPlugin ? false, + useMelquiondRemake ? null, + dropAttrs ? [], + keepAttrs ? [], + dropDerivationAttrs ? [], + ... +}@args: +let + args-to-remove = foldl (flip remove) ([ + "version" "fetcher" "repo" "owner" "domain" "releaseRev" + "displayVersion" "defaultVersion" "useMelquiondRemake" + "release" "extraBuildInputs" "extraPropagatedBuildInputs" "namePrefix" "meta" + "extraInstallFlags" "setCOQBIN" "mlPlugin" + "dropAttrs" "dropDerivationAttrs" "keepAttrs" ] ++ dropAttrs) keepAttrs; + fetch = import ../coq/meta-fetch/default.nix + { inherit stdenv fetchzip; } ({ + inherit release releaseRev; + location = { inherit domain owner repo; }; + } // optionalAttrs (args?fetcher) {inherit fetcher;}); + fetched = fetch (if !isNull version then version else defaultVersion); + namePrefix = args.namePrefix or [ "coq" ]; + display-pkg = n: sep: v: + let d = displayVersion.${n} or (if sep == "" then ".." else true); in + n + optionalString (v != "" && v != null) (switch d [ + { case = true; out = sep + v; } + { case = "."; out = sep + versions.major v; } + { case = ".."; out = sep + versions.majorMinor v; } + { case = "..."; out = sep + versions.majorMinorPatch v; } + { case = isFunction; out = optionalString (d v != "") (sep + d v); } + { case = isString; out = optionalString (d != "") (sep + d); } + ] "") + optionalString (v == null) "-broken"; + append-version = p: n: p + display-pkg n "" coqPackages.${n}.version + "-"; + prefix-name = foldl append-version "" namePrefix; + var-coqlib-install = (optionalString (versions.isGe "8.7" coq.coq-version) "COQMF_") + "COQLIB"; +in + +stdenv.mkDerivation (removeAttrs ({ + + name = prefix-name + (display-pkg pname "-" fetched.version); + + inherit (fetched) version src; + + buildInputs = [ coq ] ++ optionals mlPlugin coq.ocamlBuildInputs ++ extraBuildInputs; + inherit enableParallelBuilding; + + meta = ({ platforms = coq.meta.platforms; } // + (switch domain [{ + case = pred.union isGitHubDomain isGitLabDomain; + out = { homepage = "https://${domain}/${owner}/${repo}"; }; + }] {}) // + optionalAttrs (fetched.broken or false) { coqFilter = true; broken = true; }) // + (args.meta or {}) ; + +} // +(optionalAttrs setCOQBIN { COQBIN = "${coq}/bin/"; }) // +(optionalAttrs (!args?installPhase && !args?useMelquiondRemake) { + installFlags = + [ "${var-coqlib-install}=$(out)/lib/coq/${coq.coq-version}/" ] ++ + optional (match ".*doc$" (args.installTargets or "") != null) + "DOCDIR=$(out)/share/coq/${coq.coq-version}/" ++ + extraInstallFlags; +}) // +(optionalAttrs (args?useMelquiondRemake) rec { + COQUSERCONTRIB = "$out/lib/coq/${coq.coq-version}/user-contrib"; + preConfigurePhases = "autoconf"; + configureFlags = [ "--libdir=${COQUSERCONTRIB}/${useMelquiondRemake.logpath or ""}" ]; + buildPhase = "./remake -j$NIX_BUILD_CORES"; + installPhase = "./remake install"; +}) // +(removeAttrs args args-to-remove)) dropDerivationAttrs) diff --git a/pkgs/build-support/coq/extra-lib.nix b/pkgs/build-support/coq/extra-lib.nix new file mode 100644 index 000000000000..65b48f511267 --- /dev/null +++ b/pkgs/build-support/coq/extra-lib.nix @@ -0,0 +1,145 @@ +{ lib }: +with builtins; with lib; recursiveUpdate lib (rec { + + versions = + let + truncate = n: v: concatStringsSep "." (take n (splitVersion v)); + opTruncate = op: v0: v: let n = length (splitVersion v0); in + op (truncate n v) (truncate n v0); + in rec { + + /* Get string of the first n parts of a version string. + + Example: + - truncate 2 "1.2.3-stuff" + => "1.2" + + - truncate 4 "1.2.3-stuff" + => "1.2.3.stuff" + */ + + inherit truncate; + + /* Get string of the first three parts (major, minor and patch) + of a version string. + + Example: + majorMinorPatch "1.2.3-stuff" + => "1.2.3" + */ + majorMinorPatch = truncate 3; + + /* Version comparison predicates, + - isGe v0 v <-> v is greater or equal than v0 [*] + - isLe v0 v <-> v is lesser or equal than v0 [*] + - isGt v0 v <-> v is strictly greater than v0 [*] + - isLt v0 v <-> v is strictly lesser than v0 [*] + - isEq v0 v <-> v is equal to v0 [*] + - range low high v <-> v is between low and high [**] + + [*] truncating v to the same number of digits as v0 + [**] truncating v to low for the lower bound and high for the upper bound + + Examples: + - isGe "8.10" "8.10.1" + => true + - isLe "8.10" "8.10.1" + => true + - isGt "8.10" "8.10.1" + => false + - isGt "8.10.0" "8.10.1" + => true + - isEq "8.10" "8.10.1" + => true + - range "8.10" "8.11" "8.11.1" + => true + - range "8.10" "8.11+" "8.11.0" + => false + - range "8.10" "8.11+" "8.11+beta1" + => false + + */ + isGe = opTruncate versionAtLeast; + isGt = opTruncate (flip versionOlder); + isLe = opTruncate (flip versionAtLeast); + isLt = opTruncate versionOlder; + isEq = opTruncate pred.equal; + range = low: high: pred.inter (versions.isGe low) (versions.isLe high); + }; + + /* Returns a list of list, splitting it using a predicate. + This is analoguous to builtins.split sep list, + with a predicate as a separator and a list instead of a string. + + Type: splitList :: (a -> bool) -> [a] -> [[a]] + + Example: + splitList (x: x == "x") [ "y" "x" "z" "t" ] + => [ [ "y" ] "x" [ "z" "t" ] ] + */ + splitList = pred: l: # put in file lists + let loop = (vv: v: l: if l == [] then vv ++ [v] + else let hd = head l; tl = tail l; in + if pred hd then loop (vv ++ [ v hd ]) [] tl else loop vv (v ++ [hd]) tl); + in loop [] [] l; + + pred = { + /* Predicate intersection, union, and complement */ + inter = p: q: x: p x && q x; + union = p: q: x: p x || q x; + compl = p: x: ! p x; + true = p: true; + false = p: false; + + /* predicate "being equal to y" */ + equal = y: x: x == y; + }; + + /* Emulate a "switch - case" construct, + instead of relying on `if then else if ...` */ + /* Usage: + ```nix + switch-if [ + if-clause-1 + .. + if-clause-k + ] default-out + ``` + where a if-clause has the form `{ cond = b; out = r; }` + the first branch such as `b` is true */ + + switch-if = c: d: (findFirst (getAttr "cond") {} c).out or d; + + /* Usage: + ```nix + switch x [ + simple-clause-1 + .. + simple-clause-k + ] default-out + ``` + where a simple-clause has the form `{ case = p; out = r; }` + the first branch such as `p x` is true + or + ```nix + switch [ x1 .. xn ] [ + complex-clause-1 + .. + complex-clause-k + ] default-out + ``` + where a complex-clause is either a simple-clause + or has the form { cases = [ p1 .. pn ]; out = r; } + in which case the first branch such as all `pi x` are true + + if the variables p are not functions, + they are converted to a equal p + if out is missing the default-out is taken */ + + switch = var: clauses: default: with pred; let + compare = f: if isFunction f then f else equal f; + combine = cl: var: + if cl?case then compare cl.case var + else all (equal true) (zipListsWith compare cl.cases var); in + switch-if (map (cl: { cond = combine cl var; inherit (cl) out; }) clauses) default; +}) diff --git a/pkgs/build-support/coq/meta-fetch/default.nix b/pkgs/build-support/coq/meta-fetch/default.nix new file mode 100644 index 000000000000..580d58395ef4 --- /dev/null +++ b/pkgs/build-support/coq/meta-fetch/default.nix @@ -0,0 +1,66 @@ +{ stdenv, fetchzip }@args: +let lib = import ../extra-lib.nix {inherit (args.stdenv) lib;}; in +with builtins; with lib; +let + default-fetcher = {domain ? "github.com", owner ? "", repo, rev, name ? "source", sha256 ? null, ...}@args: + let ext = if args?sha256 then "zip" else "tar.gz"; + fmt = if args?sha256 then "zip" else "tarball"; + pr = match "^#(.*)$" rev; + url = switch-if [ + { cond = isNull pr && !isNull (match "^github.*" domain); + out = "https://${domain}/${owner}/${repo}/archive/${rev}.${ext}"; } + { cond = !isNull pr && !isNull (match "^github.*" domain); + out = "https://api.${domain}/repos/${owner}/${repo}/${fmt}/pull/${head pr}/head"; } + { cond = isNull pr && !isNull (match "^gitlab.*" domain); + out = "https://${domain}/${owner}/${repo}/-/archive/${rev}/${repo}-${rev}.${ext}"; } + { cond = !isNull (match "(www.)?mpi-sws.org" domain); + out = "https://www.mpi-sws.org/~${owner}/${repo}/download/${repo}-${rev}.${ext}";} + ] (throw "meta-fetch: no fetcher found for domain ${domain} on ${rev}"); + fetch = x: if args?sha256 then fetchzip (x // { inherit sha256; }) else fetchTarball x; + in fetch { inherit url ; }; +in +{ + fetcher ? default-fetcher, + location, + release ? {}, + releaseRev ? (v: v), +}: +let isVersion = x: isString x && match "^/.*" x == null && release?${x}; + shortVersion = x: if (isString x && match "^/.*" x == null) + then findFirst (v: versions.majorMinor v == x) null + (sort versionAtLeast (attrNames release)) + else null; + isShortVersion = x: shortVersion x != null; + isPathString = x: isString x && match "^/.*" x != null && pathExists x; in +arg: +switch arg [ + { case = isNull; out = { version = "broken"; src = ""; broken = true; }; } + { case = isPathString; out = { version = "dev"; src = arg; }; } + { case = pred.union isVersion isShortVersion; + out = let v = if isVersion arg then arg else shortVersion arg; in + if !release.${v}?sha256 then throw "meta-fetch: a sha256 must be provided for each release" + else { + version = release.${v}.version or v; + src = release.${v}.src or fetcher (location // { rev = releaseRev v; } // release.${v}); + }; + } + { case = isString; + out = let + splitted = filter isString (split ":" arg); + rev = last splitted; + has-owner = length splitted > 1; + version = "dev"; in { + inherit version; + src = fetcher (location // { inherit rev; } // + (optionalAttrs has-owner { owner = head splitted; })); + }; } + { case = isAttrs; + out = let + { version = arg.version or "dev"; + src = (arg.fetcher or fetcher) (location // (arg.location or {})); + }; } + { case = isPath; + out = { + version = "dev" ; + src = builtins.path {path = arg; name = location.name or "source";}; }; } +] (throw "not a valid source description") diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 276c7cd1bdb8..ae97d5691331 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -35,7 +35,6 @@ system, # Note: This is the cross system we're compiling for }: -# WARNING: this API is unstable and may be subject to backwards-incompatible changes in the future. let mkDbExtraCommand = contents: let diff --git a/pkgs/build-support/docker/examples.nix b/pkgs/build-support/docker/examples.nix index 85ddeb257405..86375a40baa0 100644 --- a/pkgs/build-support/docker/examples.nix +++ b/pkgs/build-support/docker/examples.nix @@ -416,4 +416,15 @@ rec { contents = crossPkgs.hello; }; + # layered image where a store path is itself a symlink + layeredStoreSymlink = + let + target = pkgs.writeTextDir "dir/target" "Content doesn't matter."; + symlink = pkgs.runCommandNoCC "symlink" {} "ln -s ${target} $out"; + in + pkgs.dockerTools.buildLayeredImage { + name = "layeredstoresymlink"; + tag = "latest"; + contents = [ pkgs.bash symlink ]; + } // { passthru = { inherit symlink; }; }; } diff --git a/pkgs/build-support/docker/stream_layered_image.py b/pkgs/build-support/docker/stream_layered_image.py index cbae0f723f92..e35bd0b0e8c0 100644 --- a/pkgs/build-support/docker/stream_layered_image.py +++ b/pkgs/build-support/docker/stream_layered_image.py @@ -83,7 +83,11 @@ def archive_paths_to(obj, paths, mtime): for path in paths: path = pathlib.Path(path) - files = itertools.chain([path], path.rglob("*")) + if path.is_symlink(): + files = [path] + else: + files = itertools.chain([path], path.rglob("*")) + for filename in sorted(files): ti = append_root(tar.gettarinfo(filename)) diff --git a/pkgs/build-support/emacs/wrapper.nix b/pkgs/build-support/emacs/wrapper.nix index a3136839122d..f34835eaf096 100644 --- a/pkgs/build-support/emacs/wrapper.nix +++ b/pkgs/build-support/emacs/wrapper.nix @@ -2,11 +2,11 @@ # Usage -`emacsWithPackages` takes a single argument: a function from a package +`emacs.pkgs.withPackages` takes a single argument: a function from a package set to a list of packages (the packages that will be available in Emacs). For example, ``` -emacsWithPackages (epkgs: [ epkgs.evil epkgs.magit ]) +emacs.pkgs.withPackages (epkgs: [ epkgs.evil epkgs.magit ]) ``` All the packages in the list should come from the provided package set. It is possible to add any package to the list, but the provided @@ -15,19 +15,19 @@ the correct version of Emacs. # Overriding -`emacsWithPackages` inherits the package set which contains it, so the +`emacs.pkgs.withPackages` inherits the package set which contains it, so the correct way to override the provided package set is to override the -set which contains `emacsWithPackages`. For example, to override -`emacsPackages.emacsWithPackages`, +set which contains `emacs.pkgs.withPackages`. For example, to override +`emacs.pkgs.emacs.pkgs.withPackages`, ``` let customEmacsPackages = - emacsPackages.overrideScope' (self: super: { + emacs.pkgs.overrideScope' (self: super: { # use a custom version of emacs emacs = ...; # use the unstable MELPA version of magit magit = self.melpaPackages.magit; }); -in customEmacsPackages.emacsWithPackages (epkgs: [ epkgs.evil epkgs.magit ]) +in customEmacsPackages.emacs.pkgs.withPackages (epkgs: [ epkgs.evil epkgs.magit ]) ``` */ @@ -203,10 +203,6 @@ runCommand --subst-var-by wrapperSiteLisp "$deps/share/emacs/site-lisp" \ --subst-var-by prog "$emacs/Applications/Emacs.app/Contents/MacOS/Emacs" chmod +x $out/Applications/Emacs.app/Contents/MacOS/Emacs - - makeWrapper $emacs/Applications/Emacs.app/Contents/MacOS/Emacs $out/Applications/Emacs.app/Contents/MacOS/Emacs \ - --suffix EMACSLOADPATH ":" "$deps/share/emacs/site-lisp:" \ - --suffix EMACSNATIVELOADPATH ":" "$deps/share/emacs/native-lisp:" fi mkdir -p $out/share diff --git a/pkgs/build-support/fetchgit/builder.sh b/pkgs/build-support/fetchgit/builder.sh index 6ae46469738a..0047a335c76c 100644 --- a/pkgs/build-support/fetchgit/builder.sh +++ b/pkgs/build-support/fetchgit/builder.sh @@ -8,6 +8,7 @@ header "exporting $url (rev $rev) into $out" $SHELL $fetcher --builder --url "$url" --out "$out" --rev "$rev" \ ${leaveDotGit:+--leave-dotGit} \ + ${fetchLFS:+--fetch-lfs} \ ${deepClone:+--deepClone} \ ${fetchSubmodules:+--fetch-submodules} \ ${branchName:+--branch-name "$branchName"} diff --git a/pkgs/build-support/fetchgit/default.nix b/pkgs/build-support/fetchgit/default.nix index 0405951a9e40..5f5ded128de5 100644 --- a/pkgs/build-support/fetchgit/default.nix +++ b/pkgs/build-support/fetchgit/default.nix @@ -1,4 +1,4 @@ -{stdenvNoCC, git, cacert}: let +{stdenvNoCC, git, git-lfs, cacert}: let urlToName = url: rev: let inherit (stdenvNoCC.lib) removeSuffix splitString last; base = last (splitString ":" (baseNameOf (removeSuffix "/" url))); @@ -20,6 +20,7 @@ in # successfully. This can do things like check or transform the file. postFetch ? "" , preferLocalBuild ? true +, fetchLFS ? false }: /* NOTE: @@ -53,13 +54,15 @@ stdenvNoCC.mkDerivation { inherit name; builder = ./builder.sh; fetcher = ./nix-prefetch-git; # This must be a string to ensure it's called with bash. - nativeBuildInputs = [git]; + + nativeBuildInputs = [ git ] + ++ stdenvNoCC.lib.optionals fetchLFS [ git-lfs ]; outputHashAlgo = "sha256"; outputHashMode = "recursive"; outputHash = sha256; - inherit url rev leaveDotGit fetchSubmodules deepClone branchName postFetch; + inherit url rev leaveDotGit fetchLFS fetchSubmodules deepClone branchName postFetch; GIT_SSL_CAINFO = "${cacert}/etc/ssl/certs/ca-bundle.crt"; diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git index 43f7c5acd5ad..3cb115c5e6e6 100755 --- a/pkgs/build-support/fetchgit/nix-prefetch-git +++ b/pkgs/build-support/fetchgit/nix-prefetch-git @@ -9,6 +9,7 @@ hashType=$NIX_HASH_ALGO deepClone=$NIX_PREFETCH_GIT_DEEP_CLONE leaveDotGit=$NIX_PREFETCH_GIT_LEAVE_DOT_GIT fetchSubmodules= +fetchLFS= builder= branchName=$NIX_PREFETCH_GIT_BRANCH_NAME @@ -72,6 +73,7 @@ for arg; do --quiet) QUIET=true;; --no-deepClone) deepClone=;; --leave-dotGit) leaveDotGit=true;; + --fetch-lfs) fetchLFS=true;; --fetch-submodules) fetchSubmodules=true;; --builder) builder=true;; -h|--help) usage; exit;; @@ -283,6 +285,11 @@ clone_user_rev() { local url="$2" local rev="${3:-HEAD}" + if [ -n "$fetchLFS" ]; then + HOME=$TMPDIR + git lfs install + fi + # Perform the checkout. case "$rev" in HEAD|refs/*) diff --git a/pkgs/build-support/kernel/modules-closure.sh b/pkgs/build-support/kernel/modules-closure.sh index 3f895d9cfed9..3b3a38ea1d33 100644 --- a/pkgs/build-support/kernel/modules-closure.sh +++ b/pkgs/build-support/kernel/modules-closure.sh @@ -81,7 +81,8 @@ for module in $(cat closure); do 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 + cp "$firmware/lib/firmware/$i" "$out/lib/firmware/$i" 2>/dev/null \ + || echo "WARNING: missing firmware $i for module $module" done done diff --git a/pkgs/build-support/nix-gitignore/default.nix b/pkgs/build-support/nix-gitignore/default.nix index abfe67ea4304..5d7b945bf1b1 100644 --- a/pkgs/build-support/nix-gitignore/default.nix +++ b/pkgs/build-support/nix-gitignore/default.nix @@ -20,13 +20,14 @@ let in rec { # [["good/relative/source/file" true] ["bad.tmpfile" false]] -> root -> path filterPattern = patterns: root: - let - filters = map (pair: relPath: if match (head pair) relPath == null then true else last pair) patterns; - in - name: _type: - let - relPath = lib.removePrefix ((toString root) + "/") name; - in foldl' (acc: f: if acc == true then f relPath else acc) true filters; + (name: _type: + let + relPath = lib.removePrefix ((toString root) + "/") name; + matches = pair: (match (head pair) relPath) != null; + matched = map (pair: [(matches pair) (last pair)]) patterns; + in + last (last ([[true true]] ++ (filter head matched))) + ); # string -> [[regex bool]] gitignoreToPatterns = gitignore: @@ -90,9 +91,7 @@ in rec { (filter (l: !isList l && !isComment l) (split "\n" gitignore)); - gitignoreFilter = ign: let - patterns = gitignoreToPatterns ign; - in root: filterPattern patterns root; + gitignoreFilter = ign: root: filterPattern (gitignoreToPatterns ign) root; # string|[string|file] (→ [string|file] → [string]) -> string gitignoreCompileIgnore = file_str_patterns: root: @@ -101,10 +100,9 @@ in rec { str_patterns = map (onPath readFile) (lib.toList file_str_patterns); in concatStringsSep "\n" str_patterns; - gitignoreFilterPure = filter: patterns: root: let - compiledFilter = gitignoreCompileIgnore patterns root; - filterFn = gitignoreFilter compiledFilter; - in name: type: filterFn root name type && filter name type; + gitignoreFilterPure = filter: patterns: root: name: type: + gitignoreFilter (gitignoreCompileIgnore patterns root) root name type + && filter name type; # This is a very hacky way of programming this! # A better way would be to reuse existing filtering by making multiple gitignore functions per each root. diff --git a/pkgs/build-support/rust/default-crate-overrides.nix b/pkgs/build-support/rust/default-crate-overrides.nix index d0e69ad698a8..4ff8640c2ff5 100644 --- a/pkgs/build-support/rust/default-crate-overrides.nix +++ b/pkgs/build-support/rust/default-crate-overrides.nix @@ -1,6 +1,7 @@ -{ stdenv, pkgconfig, curl, darwin, libiconv, libgit2, libssh2, +{ stdenv, pkg-config, curl, darwin, libiconv, libgit2, libssh2, openssl, sqlite, zlib, dbus, dbus-glib, gdk-pixbuf, cairo, python3, - libsodium, postgresql, gmp, foundationdb, ... }: + libsodium, postgresql, gmp, foundationdb, capnproto, nettle, clang, + llvmPackages, ... }: let inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; @@ -10,26 +11,30 @@ in buildInputs = [ cairo ]; }; + capnp-rpc = attrs: { + nativeBuildInputs = [ capnproto ]; + }; + cargo = attrs: { buildInputs = [ openssl zlib curl ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation Security libiconv ]; }; libz-sys = attrs: { - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ zlib ]; extraLinkFlags = ["-L${zlib.out}/lib"]; }; curl-sys = attrs: { - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ zlib curl ]; propagatedBuildInputs = [ curl zlib ]; extraLinkFlags = ["-L${zlib.out}/lib"]; }; dbus = attrs: { - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ dbus ]; }; @@ -65,36 +70,42 @@ in libgit2-sys = attrs: { LIBGIT2_SYS_USE_PKG_CONFIG = true; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl zlib libgit2 ]; }; libsqlite3-sys = attrs: { - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ sqlite ]; }; libssh2-sys = attrs: { - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl zlib libssh2 ]; }; libdbus-sys = attrs: { - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ dbus ]; }; + nettle-sys = attrs: { + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ nettle clang ]; + LIBCLANG_PATH = "${llvmPackages.libclang}/lib"; + }; + openssl = attrs: { buildInputs = [ openssl ]; }; openssl-sys = attrs: { - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]; }; pq-sys = attr: { - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ postgresql ]; }; @@ -107,12 +118,42 @@ in propagatedBuildInputs = [ Security ]; }; + sequoia-openpgp = attrs: { + buildInputs = [ gmp ]; + }; + + sequoia-openpgp-ffi = attrs: { + buildInputs = [ gmp ]; + }; + + sequoia-ipc = attrs: { + buildInputs = [ gmp ]; + }; + + sequoia-guide = attrs: { + buildInputs = [ gmp ]; + }; + + sequoia-store = attrs: { + nativeBuildInputs = [ capnproto ]; + buildInputs = [ sqlite gmp ]; + }; + + sequoia-sq = attrs: { + buildInputs = [ sqlite gmp ]; + }; + + sequoia-tool = attrs: { + nativeBuildInputs = [ capnproto ]; + buildInputs = [ sqlite gmp ]; + }; + serde_derive = attrs: { buildInputs = stdenv.lib.optional stdenv.isDarwin Security; }; thrussh-libsodium = attrs: { - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libsodium ]; }; diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix index 8e47a2b0bf25..9e8e32035d0d 100644 --- a/pkgs/build-support/rust/default.nix +++ b/pkgs/build-support/rust/default.nix @@ -15,7 +15,13 @@ }: { name ? "${args.pname}-${args.version}" -, cargoSha256 ? "unset" + + # SRI hash +, cargoHash ? "" + + # Legacy hash +, cargoSha256 ? "" + , src ? null , srcs ? null , unpackPhase ? null @@ -46,7 +52,7 @@ , buildAndTestSubdir ? null , ... } @ args: -assert cargoVendorDir == null -> cargoSha256 != "unset"; +assert cargoVendorDir == null -> !(cargoSha256 == "" && cargoHash == ""); assert buildType == "release" || buildType == "debug"; let @@ -54,6 +60,7 @@ let cargoDeps = if cargoVendorDir == null then fetchCargoTarball ({ inherit name src srcs sourceRoot unpackPhase cargoUpdateHook; + hash = cargoHash; patches = cargoPatches; sha256 = cargoSha256; } // depsExtraArgs) @@ -61,7 +68,7 @@ let # If we have a cargoSha256 fixed-output derivation, validate it at build time # against the src fixed-output derivation to check consistency. - validateCargoDeps = cargoSha256 != "unset"; + validateCargoDeps = !(cargoHash == "" && cargoSha256 == ""); # Some cargo builds include build hooks that modify their own vendor # dependencies. This copies the vendor directory into the build tree and makes diff --git a/pkgs/build-support/rust/fetchCargoTarball.nix b/pkgs/build-support/rust/fetchCargoTarball.nix index dff5d99da9eb..0726e5cfa5a1 100644 --- a/pkgs/build-support/rust/fetchCargoTarball.nix +++ b/pkgs/build-support/rust/fetchCargoTarball.nix @@ -22,11 +22,17 @@ in , srcs ? [] , patches ? [] , sourceRoot -, sha256 +, hash ? "" +, sha256 ? "" , cargoUpdateHook ? "" , ... } @ args: -stdenv.mkDerivation ({ + +let hash_ = + if hash != "" then { outputHashAlgo = null; outputHash = hash; } + else if sha256 != "" then { outputHashAlgo = "sha256"; outputHash = sha256; } + else throw "fetchCargoTarball requires a hash for ${name}"; +in stdenv.mkDerivation ({ name = "${name}-vendor.tar.gz"; nativeBuildInputs = [ cacert git cargo-vendor-normalise cargo ]; @@ -40,7 +46,7 @@ stdenv.mkDerivation ({ echo echo "ERROR: The Cargo.lock file doesn't exist" echo - echo "Cargo.lock is needed to make sure that cargoSha256 doesn't change" + echo "Cargo.lock is needed to make sure that cargoHash/cargoSha256 doesn't change" echo "when the registry is updated." echo @@ -72,8 +78,7 @@ stdenv.mkDerivation ({ -czf $out $name ''; - outputHashAlgo = "sha256"; - outputHash = sha256; + inherit (hash_) outputHashAlgo outputHash; impureEnvVars = stdenv.lib.fetchers.proxyImpureEnvVars; } // (builtins.removeAttrs args [ diff --git a/pkgs/build-support/setup-hooks/reproducible-builds.sh b/pkgs/build-support/setup-hooks/reproducible-builds.sh index 2d8db6ff7d3c..5b01c213fe4a 100644 --- a/pkgs/build-support/setup-hooks/reproducible-builds.sh +++ b/pkgs/build-support/setup-hooks/reproducible-builds.sh @@ -1,4 +1,9 @@ # Use the last part of the out path as hash input for the build. # This should ensure that it is deterministic across rebuilds of the same # derivation and not easily collide with other builds. -export NIX_CFLAGS_COMPILE+=" -frandom-seed=${out##*/}" +# We also truncate the hash so that it cannot cause reference cycles. +export NIX_CFLAGS_COMPILE+=" -frandom-seed=$( + outbase="${out##*/}" + randomseed="${outbase:0:10}" + echo $randomseed +)" diff --git a/pkgs/build-support/templaterpm/default.nix b/pkgs/build-support/templaterpm/default.nix index 30465c740e53..0f7acc13277b 100644 --- a/pkgs/build-support/templaterpm/default.nix +++ b/pkgs/build-support/templaterpm/default.nix @@ -1,4 +1,4 @@ -{stdenv, makeWrapper, python, toposort, rpm}: +{lib, stdenv, makeWrapper, python, toposort, rpm}: stdenv.mkDerivation { pname = "nix-template-rpm"; @@ -15,7 +15,7 @@ stdenv.mkDerivation { --set PYTHONPATH "${rpm}/lib/${python.libPrefix}/site-packages":"${toposort}/lib/${python.libPrefix}/site-packages" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Create templates of nix expressions from RPM .spec files"; maintainers = with maintainers; [ tstrobel ]; platforms = with stdenv.lib.platforms; unix; diff --git a/pkgs/build-support/vm/deb/deb-closure.pl b/pkgs/build-support/vm/deb/deb-closure.pl index bed397d6f07e..fe23025df1d8 100644 --- a/pkgs/build-support/vm/deb/deb-closure.pl +++ b/pkgs/build-support/vm/deb/deb-closure.pl @@ -50,7 +50,7 @@ sub getDeps { # virtual dependencies. my %provides; -foreach my $cdata (values %packages) { +foreach my $cdata (sort {$a->{Package} cmp $b->{Package}} (values %packages)) { if (defined $cdata->{Provides}) { my @provides = getDeps(Dpkg::Deps::deps_parse($cdata->{Provides})); foreach my $name (@provides) { diff --git a/pkgs/build-support/writers/default.nix b/pkgs/build-support/writers/default.nix index 9c709921d210..89edbd513d50 100644 --- a/pkgs/build-support/writers/default.nix +++ b/pkgs/build-support/writers/default.nix @@ -63,7 +63,7 @@ rec { # # Examples: # writeSimpleC = makeBinWriter { compileScript = name: "gcc -o $out $contentPath"; } - makeBinWriter = { compileScript }: nameOrPath: content: + makeBinWriter = { compileScript, strip ? true }: nameOrPath: content: assert lib.or (types.path.check nameOrPath) (builtins.match "([0-9A-Za-z._])[0-9A-Za-z._-]*" nameOrPath != null); assert lib.or (types.path.check content) (types.str.check content); let @@ -76,6 +76,8 @@ rec { contentPath = content; }) '' ${compileScript} + ${lib.optionalString strip + "${pkgs.binutils-unwrapped}/bin/strip --strip-unneeded $out"} ${optionalString (types.path.check nameOrPath) '' mv $out tmp mkdir -p $out/$(dirname "${nameOrPath}") @@ -109,7 +111,10 @@ rec { # return 0; # } # '' - writeC = name: { libraries ? [] }: + writeC = name: { + libraries ? [], + strip ? true + }: makeBinWriter { compileScript = '' PATH=${makeBinPath [ @@ -131,8 +136,8 @@ rec { -Wall \ -x c \ "$contentPath" - strip --strip-unneeded "$out" ''; + inherit strip; } name; # writeCBin takes the same arguments as writeC but outputs a directory (like writeScriptBin) @@ -165,21 +170,38 @@ rec { writeHaskell = name: { libraries ? [], ghc ? pkgs.ghc, - ghcArgs ? [] + ghcArgs ? [], + strip ? true }: makeBinWriter { compileScript = '' cp $contentPath tmp.hs ${ghc.withPackages (_: libraries )}/bin/ghc ${lib.escapeShellArgs ghcArgs} tmp.hs mv tmp $out - ${pkgs.binutils-unwrapped}/bin/strip --strip-unneeded "$out" ''; + inherit strip; } name; # writeHaskellBin takes the same arguments as writeHaskell but outputs a directory (like writeScriptBin) writeHaskellBin = name: writeHaskell "/bin/${name}"; + writeRust = name: { + rustc ? pkgs.rustc, + rustcArgs ? [], + strip ? true + }: + makeBinWriter { + compileScript = '' + cp "$contentPath" tmp.rs + PATH=${makeBinPath [pkgs.gcc]} ${lib.getBin rustc}/bin/rustc ${lib.escapeShellArgs rustcArgs} -o "$out" tmp.rs + ''; + inherit strip; + } name; + + writeRustBin = name: + writeRust "/bin/${name}"; + # writeJS takes a name an attributeset with libraries and some JavaScript sourcecode and # returns an executable # diff --git a/pkgs/build-support/writers/test.nix b/pkgs/build-support/writers/test.nix index d284bda43d05..0febad2929a0 100644 --- a/pkgs/build-support/writers/test.nix +++ b/pkgs/build-support/writers/test.nix @@ -31,6 +31,12 @@ let test '~' = '~' && echo 'success' ''; + rust = writeRustBin "test_writers" {} '' + fn main(){ + println!("success") + } + ''; + haskell = writeHaskellBin "test_writers" { libraries = [ haskellPackages.acme-default ]; } '' import Data.Default diff --git a/pkgs/common-updater/scripts/update-source-version b/pkgs/common-updater/scripts/update-source-version index 181561242fc3..90543a9cfc6a 100755 --- a/pkgs/common-updater/scripts/update-source-version +++ b/pkgs/common-updater/scripts/update-source-version @@ -1,7 +1,7 @@ #!/usr/bin/env bash set -e -scriptName=update-source-versions # do not use the .wrapped name +scriptName=update-source-version # do not use the .wrapped name die() { echo "$scriptName: error: $1" >&2 diff --git a/pkgs/data/documentation/anarchism/default.nix b/pkgs/data/documentation/anarchism/default.nix index 3acb215db14a..8f95a371ae22 100644 --- a/pkgs/data/documentation/anarchism/default.nix +++ b/pkgs/data/documentation/anarchism/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, xdg_utils }: +{ lib, stdenv, fetchFromGitLab, xdg_utils }: stdenv.mkDerivation rec { pname = "anarchism"; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { cp debian/anarchism.desktop $out/share/applications ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.anarchistfaq.org/"; changelog = "http://anarchism.pageabode.com/afaq/new.html"; description = "Exhaustive exploration of Anarchist theory and practice"; diff --git a/pkgs/data/documentation/gnome-user-docs/default.nix b/pkgs/data/documentation/gnome-user-docs/default.nix index a344dbca2f38..30f8d736d32e 100644 --- a/pkgs/data/documentation/gnome-user-docs/default.nix +++ b/pkgs/data/documentation/gnome-user-docs/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , gettext , gnome3 @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "User and system administration help for the GNOME desktop"; homepage = "https://help.gnome.org/users/gnome-help/"; license = licenses.cc-by-30; diff --git a/pkgs/data/documentation/man-pages/default.nix b/pkgs/data/documentation/man-pages/default.nix index d4fc2eb98eb4..a8f38b1a6c6a 100644 --- a/pkgs/data/documentation/man-pages/default.nix +++ b/pkgs/data/documentation/man-pages/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "man-pages"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ''; outputDocdev = "out"; - meta = with stdenv.lib; { + meta = with lib; { description = "Linux development manual pages"; homepage = "https://www.kernel.org/doc/man-pages/"; repositories.git = "http://git.kernel.org/pub/scm/docs/man-pages/man-pages"; diff --git a/pkgs/data/documentation/scheme-manpages/default.nix b/pkgs/data/documentation/scheme-manpages/default.nix index 345fb99b7bb4..2915430d9f24 100644 --- a/pkgs/data/documentation/scheme-manpages/default.nix +++ b/pkgs/data/documentation/scheme-manpages/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "scheme-manpages-unstable"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { cp -r man3/ man7/ $out/share/man/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Unix manual pages for R6RS and R7RS"; homepage = "https://github.com/schemedoc/manpages"; license = licenses.mit; diff --git a/pkgs/data/documentation/stdman/default.nix b/pkgs/data/documentation/stdman/default.nix index de50f6128616..9308c538d355 100644 --- a/pkgs/data/documentation/stdman/default.nix +++ b/pkgs/data/documentation/stdman/default.nix @@ -1,4 +1,4 @@ -{ stdenv, curl, fetchFromGitHub }: +{ lib, stdenv, curl, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "stdman"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { buildInputs = [ curl ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Formatted C++17 stdlib man pages (cppreference)"; longDescription = "stdman is a tool that parses archived HTML files from cppreference and generates groff-formatted manual diff --git a/pkgs/data/documentation/zeal/default.nix b/pkgs/data/documentation/zeal/default.nix index 4551dc211792..7543672f7d0d 100644 --- a/pkgs/data/documentation/zeal/default.nix +++ b/pkgs/data/documentation/zeal/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, extra-cmake-modules, pkgconfig +{ lib, stdenv, fetchFromGitHub, cmake, extra-cmake-modules, pkgconfig , qtbase, qtimageformats, qtwebengine, qtx11extras, mkDerivation , libarchive, libXdmcp, libpthreadstubs, xcbutilkeysyms }: @@ -30,7 +30,7 @@ mkDerivation rec { libXdmcp libpthreadstubs xcbutilkeysyms ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A simple offline API documentation browser"; longDescription = '' Zeal is a simple offline API documentation browser inspired by Dash (macOS diff --git a/pkgs/data/fonts/alegreya-sans/default.nix b/pkgs/data/fonts/alegreya-sans/default.nix index 479843341654..cc0cd6cac9b9 100644 --- a/pkgs/data/fonts/alegreya-sans/default.nix +++ b/pkgs/data/fonts/alegreya-sans/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "alegreya-sans"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { install -D -m 444 fonts/webfonts/*.woff2 -t $out/share/fonts/woff2 ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Humanist sans serif family with a calligraphic feeling"; longDescription = '' Alegreya Sans is a humanist sans serif family with a calligraphic feeling that conveys a dynamic and varied rhythm. This gives a pleasant feeling to readers of long texts. diff --git a/pkgs/data/fonts/alegreya/default.nix b/pkgs/data/fonts/alegreya/default.nix index 99a7131dc11a..b2ec1de0cc89 100644 --- a/pkgs/data/fonts/alegreya/default.nix +++ b/pkgs/data/fonts/alegreya/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "alegreya"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { install -D -m 444 fonts/webfonts/*.woff2 -t $out/share/fonts/woff2 ''; - meta = with stdenv.lib; { + meta = with lib; { description = "An elegant and versatile font family for comfortable reading"; longDescription = '' Alegreya is a typeface originally intended for literature. Among its crowning characteristics, it conveys a dynamic and varied rhythm which facilitates the reading of long texts. Also, it provides freshness to the page while referring to the calligraphic letter, not as a literal interpretation, but rather in a contemporary typographic language. diff --git a/pkgs/data/fonts/cherry/default.nix b/pkgs/data/fonts/cherry/default.nix index a69aa3684ab4..53d9149091e8 100644 --- a/pkgs/data/fonts/cherry/default.nix +++ b/pkgs/data/fonts/cherry/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fonttosfnt, mkfontdir }: +{ lib, stdenv, fetchFromGitHub, fonttosfnt, mkfontdir }: stdenv.mkDerivation rec { pname = "cherry"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { mkfontdir $out/share/fonts/misc ''; - meta = with stdenv.lib; { + meta = with lib; { description = "cherry font"; homepage = "https://github.com/turquoise-hexagon/cherry"; license = licenses.mit; diff --git a/pkgs/data/fonts/clearlyU/default.nix b/pkgs/data/fonts/clearlyU/default.nix index 84cf3ebc538d..5c97d3b71344 100644 --- a/pkgs/data/fonts/clearlyU/default.nix +++ b/pkgs/data/fonts/clearlyU/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fonttosfnt, mkfontscale, libfaketime }: +{ lib, stdenv, fetchurl, fonttosfnt, mkfontscale, libfaketime }: stdenv.mkDerivation rec { pname = "clearlyU"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { mkfontdir "$fontDir" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A Unicode font"; license = licenses.mit; maintainers = [ maintainers.raskin ]; diff --git a/pkgs/data/fonts/comic-neue/default.nix b/pkgs/data/fonts/comic-neue/default.nix index 13a40b8c0a06..df618aea8110 100644 --- a/pkgs/data/fonts/comic-neue/default.nix +++ b/pkgs/data/fonts/comic-neue/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip }: +{ lib, stdenv, fetchzip }: stdenv.mkDerivation rec { pname = "comic-neue"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { cp -v ${pname}-${version}/WebFonts/*.woff2 $out/share/fonts/WOFF2 ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://comicneue.com/"; description = "A casual type face: Make your lemonade stand look like a fortune 500 company"; longDescription = '' diff --git a/pkgs/data/fonts/corefonts/default.nix b/pkgs/data/fonts/corefonts/default.nix index ed28f6b5e6ce..c37d3251a9dc 100644 --- a/pkgs/data/fonts/corefonts/default.nix +++ b/pkgs/data/fonts/corefonts/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cabextract }: +{ lib, stdenv, fetchurl, cabextract }: let @@ -61,7 +61,7 @@ stdenv.mkDerivation { outputHashMode = "recursive"; outputHash = "089d2m9bvaacj36qdq77pcazji0sbbr796shic3k52cpxkjnzbwh"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://corefonts.sourceforge.net/"; description = "Microsoft's TrueType core fonts for the Web"; platforms = platforms.all; diff --git a/pkgs/data/fonts/creep/default.nix b/pkgs/data/fonts/creep/default.nix index 7c7ad4d5aa91..d4748544af55 100644 --- a/pkgs/data/fonts/creep/default.nix +++ b/pkgs/data/fonts/creep/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libfaketime +{ lib, stdenv, fetchFromGitHub, libfaketime , fonttosfnt, mkfontscale }: @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { mkfontdir "$out/share/fonts/misc" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A pretty sweet 4px wide pixel font"; homepage = "https://github.com/romeovs/creep"; license = licenses.mit; diff --git a/pkgs/data/fonts/dina/default.nix b/pkgs/data/fonts/dina/default.nix index 1a8ac344a531..2a770222ed10 100644 --- a/pkgs/data/fonts/dina/default.nix +++ b/pkgs/data/fonts/dina/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip +{ lib, stdenv, fetchurl, unzip , bdftopcf, mkfontscale, fontforge }: @@ -49,7 +49,7 @@ stdenv.mkDerivation { outputs = [ "out" "bdf" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A monospace bitmap font aimed at programmers"; longDescription = '' Dina is a monospace bitmap font, primarily aimed at programmers. It is diff --git a/pkgs/data/fonts/emojione/default.nix b/pkgs/data/fonts/emojione/default.nix index d5b9b29dd85d..629e46fe7971 100644 --- a/pkgs/data/fonts/emojione/default.nix +++ b/pkgs/data/fonts/emojione/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, inkscape, imagemagick, potrace, svgo, scfbuild }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, inkscape, imagemagick, potrace, svgo, scfbuild }: stdenv.mkDerivation rec { pname = "emojione"; @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { install -Dm755 build/EmojiOneColor-SVGinOT.ttf $out/share/fonts/truetype/EmojiOneColor-SVGinOT.ttf ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Open source emoji set"; homepage = "http://emojione.com/"; license = licenses.cc-by-40; diff --git a/pkgs/data/fonts/envypn-font/default.nix b/pkgs/data/fonts/envypn-font/default.nix index 0d69b812c4cd..dbfb85f881fc 100644 --- a/pkgs/data/fonts/envypn-font/default.nix +++ b/pkgs/data/fonts/envypn-font/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libfaketime +{ lib, stdenv, fetchurl, libfaketime , fonttosfnt, mkfontscale }: @@ -29,7 +29,7 @@ stdenv.mkDerivation { mkfontdir "$out/share/fonts/misc" ''; - meta = with stdenv.lib; { + meta = with lib; { description = '' Readable bitmap font inspired by Envy Code R ''; diff --git a/pkgs/data/fonts/et-book/default.nix b/pkgs/data/fonts/et-book/default.nix index 58586ba7db65..e7d97b777076 100644 --- a/pkgs/data/fonts/et-book/default.nix +++ b/pkgs/data/fonts/et-book/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: fetchFromGitHub rec { rev = "7e8f02dadcc23ba42b491b39e5bdf16e7b383031"; @@ -13,7 +13,7 @@ fetchFromGitHub rec { cp -t $out/share/fonts/truetype et-book-${rev}/source/4-ttf/*.ttf ''; - meta = with stdenv.lib; { + meta = with lib; { description = "The typeface used in Edward Tufte’s books."; license = licenses.mit; platforms = platforms.all; diff --git a/pkgs/data/fonts/fira-code/default.nix b/pkgs/data/fonts/fira-code/default.nix index 4f0fb1e81c16..546c7d905a7b 100644 --- a/pkgs/data/fonts/fira-code/default.nix +++ b/pkgs/data/fonts/fira-code/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip }: +{ lib, stdenv, fetchzip }: let version = "5.2"; @@ -7,14 +7,15 @@ in fetchzip { url = "https://github.com/tonsky/FiraCode/releases/download/${version}/Fira_Code_v${version}.zip"; + # only extract the variable font because everything else is a duplicate postFetch = '' mkdir -p $out/share/fonts - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype + unzip -j $downloadedFile '*-VF.ttf' -d $out/share/fonts/truetype ''; - sha256 = "16v62wj872ba4w7qxn4l6zjgqh7lrpwh1xax1bp1x9dpz08mnq06"; + sha256 = "1wbfjgvr9m5azl5w49y0hpqzgcraw6spd1wnxgxlzfx57x6gcw0k"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/tonsky/FiraCode"; description = "Monospace font with programming ligatures"; longDescription = '' diff --git a/pkgs/data/fonts/fira-code/symbols.nix b/pkgs/data/fonts/fira-code/symbols.nix index 624616bdd580..2e4cfc8f05b6 100644 --- a/pkgs/data/fonts/fira-code/symbols.nix +++ b/pkgs/data/fonts/fira-code/symbols.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip }: +{ lib, stdenv, fetchzip }: fetchzip { name = "fira-code-symbols-20160811"; @@ -12,7 +12,7 @@ fetchzip { sha256 = "19krsp22rin74ix0i19v4bh1c965g18xkmz1n55h6n6qimisnbkm"; - meta = with stdenv.lib; { + meta = with lib; { description = "FiraCode unicode ligature glyphs in private use area"; longDescription = '' FiraCode uses ligatures, which some editors don’t support. diff --git a/pkgs/data/fonts/fira-mono/default.nix b/pkgs/data/fonts/fira-mono/default.nix index d29d6304cee1..37f285b55527 100644 --- a/pkgs/data/fonts/fira-mono/default.nix +++ b/pkgs/data/fonts/fira-mono/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip }: +{ lib, stdenv, fetchzip }: fetchzip { name = "fira-mono-3.206"; @@ -12,7 +12,7 @@ fetchzip { sha256 = "1ci3fxhdwabvfj4nl16pwcgqnh7s2slp8vblribk8zkpx8cbp1dj"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://mozilla.github.io/Fira/"; description = "Monospace font for Firefox OS"; longDescription = '' diff --git a/pkgs/data/fonts/go-font/default.nix b/pkgs/data/fonts/go-font/default.nix index e887f0ffef12..b2225f5b49bf 100644 --- a/pkgs/data/fonts/go-font/default.nix +++ b/pkgs/data/fonts/go-font/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit }: +{ lib, stdenv, fetchgit }: let version = "2017-03-30"; @@ -17,7 +17,7 @@ in (fetchgit { sha256 = "1488426ya2nzmwjas947fx9h5wzxrp9wasn8nkjqf0y0mpd4f1xz"; }) // { - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://blog.golang.org/go-fonts"; description = "The Go font family"; license = licenses.bsd3; diff --git a/pkgs/data/fonts/gohufont/default.nix b/pkgs/data/fonts/gohufont/default.nix index ac82c82ae3df..f28e3d5ba619 100644 --- a/pkgs/data/fonts/gohufont/default.nix +++ b/pkgs/data/fonts/gohufont/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub +{ lib, stdenv, fetchurl, fetchFromGitHub , mkfontscale, bdf2psf, bdftopcf , fonttosfnt, libfaketime }: @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { mkfontdir "$fontDir" ''; - meta = with stdenv.lib; { + meta = with lib; { description = '' A monospace bitmap font well suited for programming and terminal use ''; diff --git a/pkgs/data/fonts/google-fonts/default.nix b/pkgs/data/fonts/google-fonts/default.nix index 153f37c88e0a..0fac2a67bb8a 100644 --- a/pkgs/data/fonts/google-fonts/default.nix +++ b/pkgs/data/fonts/google-fonts/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation { pname = "google-fonts"; @@ -48,7 +48,7 @@ stdenv.mkDerivation { find . -name '*.ttf' -exec install -m 444 -Dt $dest '{}' + ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://fonts.google.com"; description = "Font files available from Google Fonts"; license = with licenses; [ asl20 ofl ufl ]; diff --git a/pkgs/data/fonts/gubbi/default.nix b/pkgs/data/fonts/gubbi/default.nix index 2d1c520e6103..9ae46d089925 100644 --- a/pkgs/data/fonts/gubbi/default.nix +++ b/pkgs/data/fonts/gubbi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fontforge }: +{ lib, stdenv, fetchFromGitHub, fontforge }: stdenv.mkDerivation rec { pname = "gubbi-font"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { installPhase = "install -Dm444 -t $out/share/fonts/truetype/ Gubbi.ttf"; - meta = with stdenv.lib; { + meta = with lib; { inherit (src.meta) homepage; description = "A Kannada font"; license = licenses.gpl3Plus; diff --git a/pkgs/data/fonts/inconsolata/default.nix b/pkgs/data/fonts/inconsolata/default.nix index 10568073e4b2..f064b4f61923 100644 --- a/pkgs/data/fonts/inconsolata/default.nix +++ b/pkgs/data/fonts/inconsolata/default.nix @@ -1,4 +1,4 @@ -{ stdenv, google-fonts }: +{ lib, stdenv, google-fonts }: stdenv.mkDerivation { pname = "inconsolata"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { install -m644 --target $out/share/fonts/truetype/inconsolata -D $src/ofl/inconsolata/*.ttf ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.levien.com/type/myfonts/inconsolata.html"; description = "A monospace font for both screen and print"; maintainers = with maintainers; [ mikoim raskin rycee ]; diff --git a/pkgs/data/fonts/inconsolata/lgc.nix b/pkgs/data/fonts/inconsolata/lgc.nix index e69e6e02a22f..945fafcfcc52 100644 --- a/pkgs/data/fonts/inconsolata/lgc.nix +++ b/pkgs/data/fonts/inconsolata/lgc.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, fontforge}: +{lib, stdenv, fetchFromGitHub, fontforge}: stdenv.mkDerivation rec { pname = "inconsolata-lgc"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { install -m444 -Dt $out/share/doc/${pname}-${version} LICENSE README ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Fork of Inconsolata font, with proper support of Cyrillic and Greek"; longDescription = '' Inconsolata is one of the most suitable font for programmers created by Raph diff --git a/pkgs/data/fonts/input-fonts/default.nix b/pkgs/data/fonts/input-fonts/default.nix index 2db7e259a352..9956325e15bc 100644 --- a/pkgs/data/fonts/input-fonts/default.nix +++ b/pkgs/data/fonts/input-fonts/default.nix @@ -1,4 +1,4 @@ -{ stdenv, requireFile, unzip }: +{ lib, stdenv, requireFile, unzip }: stdenv.mkDerivation { pname = "input-fonts"; @@ -27,7 +27,7 @@ stdenv.mkDerivation { outputHashMode = "recursive"; outputHash = "15sdhqqqd4jgk80fw7ncx49avi9cxbdgyrvnrfya0066x4q4r6lv"; - meta = with stdenv.lib; { + meta = with lib; { description = "Fonts for Code, from Font Bureau"; longDescription = '' Input is a font family designed for computer programming, data, diff --git a/pkgs/data/fonts/iosevka/bin.nix b/pkgs/data/fonts/iosevka/bin.nix index fbae89bcf013..b86460a50fd0 100644 --- a/pkgs/data/fonts/iosevka/bin.nix +++ b/pkgs/data/fonts/iosevka/bin.nix @@ -10,7 +10,7 @@ let (builtins.attrNames (builtins.removeAttrs variantHashes [ "iosevka" ])); in stdenv.mkDerivation rec { pname = "${name}-bin"; - version = "4.2.0"; + version = "4.3.0"; src = fetchurl { url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/ttc-${name}-${version}.zip"; diff --git a/pkgs/data/fonts/iosevka/default.nix b/pkgs/data/fonts/iosevka/default.nix index 989c2d39c19e..0d998a4863ab 100644 --- a/pkgs/data/fonts/iosevka/default.nix +++ b/pkgs/data/fonts/iosevka/default.nix @@ -92,7 +92,7 @@ stdenv.mkDerivation rec { updateScript = ./update-default.sh; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://be5invis.github.io/Iosevka"; downloadPage = "https://github.com/be5invis/Iosevka/releases"; description = '' diff --git a/pkgs/data/fonts/iosevka/variants.nix b/pkgs/data/fonts/iosevka/variants.nix index 5cb0b53114d1..d86f1ea3cfdc 100644 --- a/pkgs/data/fonts/iosevka/variants.nix +++ b/pkgs/data/fonts/iosevka/variants.nix @@ -1,24 +1,24 @@ # This file was autogenerated. DO NOT EDIT! { - iosevka = "1s9nyq8gjmmah5rpflffl0wi0klnlsvzmy7b39vnpp2sp6ng9mv3"; - iosevka-aile = "0x2ccjnmi9hqms5jkfnkn30y9gd3adiwjvn9gzq8d6a563h61fik"; - iosevka-curly = "03n0f9nzjywb5q3w59ck5sq500ks5xxlgf9dpncr3c7i2dawss41"; - iosevka-curly-slab = "09qnd2vzl4v59c0d534mj06zxwa3rdwrhkwy191v6p79lfxp482x"; - iosevka-etoile = "0j3ah72dmk7fzcln9755y3xnzn7343lfrg95kb3xmqm2zyg0mbrw"; - iosevka-slab = "0prnm3nh8rgn6jivfj2fw7x12m8qqam8xnl45ip5ck4348piypx3"; - iosevka-sparkle = "1y180rwrxrvwd98hk1d07y0vs8h5rj7ipkhsqlv60h82pigxhl4a"; - iosevka-ss01 = "04q9vby5q9ylvv2myl3h2xfyq3s594wnwj0b956pivwwamhp0g3v"; - iosevka-ss02 = "14d5i88ls8zfbis5s7z95dcrpxqyqr2wzx90c5a4xpcdjd4n7fgg"; - iosevka-ss03 = "1zqqq11rcjmifc4qf5p2xcqhqp5ca2pgvzv8xirr6mq4knrvxrpq"; - iosevka-ss04 = "1xnnqyvyrz820dzfyjj84v3j1q8krykmwxw5xml4v7kk79agc7vk"; - iosevka-ss05 = "07w78jw23hxwzx65ampwzv691p12n0pvk8vnw2mnnspflirpm62r"; - iosevka-ss06 = "11brqklhk3sfhqyavyi5rggsn3286n404gphmh0frz65wj3k8lc6"; - iosevka-ss07 = "037vaxpgdpa6p9nmqcsa1mi7pn94300cd71kbr9lw8mql9wc2y9n"; - iosevka-ss08 = "0ga1bwb2d1rizr0910bcqabcj819dcd0bxp7cwbxnzq6i7ca4hj1"; - iosevka-ss09 = "1khjhn0lfpk8g1yx3558w6kkj0pd5b7kxbf0z97w1nvah3d5v50m"; - iosevka-ss10 = "0zp5173799vacssj0lsj3ck82b03qyk9cyfwa3j7xa2dhplrjfp2"; - iosevka-ss11 = "124a3i7iy9z7adxcb8yw3795gk52cw7ngsim8qjhrhcd2bjr0jvg"; - iosevka-ss12 = "1rd61ry3ihw311c926wjl9sc71bz0ligya07m7km1905dhlhirsv"; - iosevka-ss13 = "0jm3djc4rlzk22jn3syv4mwd0fz82z4lnyk3dkq815yyw6vmqkz0"; - iosevka-ss14 = "1a9a1bvzsbprmxfh19m78s82rfmxng4sambz6m4gd9mm14kjjp5r"; + iosevka = "1m4qkn1abj6a9famy5cvnl9xk7690mglpj358xg01fnkmrm8ayzf"; + iosevka-aile = "0ry949kdnxlahg9a2qn758klb9yvv2wniwadb4hj2xz65zzfyv7i"; + iosevka-curly = "08ac8xprk3sq8lvgxlxp1z19bx0ndr7ga17kzxlqd4r96qjgab0p"; + iosevka-curly-slab = "1zmihfk32clp4ajywg9w6pbq3dh068s9d4bxzpgvicsfvbl04irk"; + iosevka-etoile = "09bk4myxg51m9xfyrljxm4r7gq1361x2yzlik99qp5anpxflf2jf"; + iosevka-slab = "10x6wwcicwy7rawrg563l5qfbp6vsaim82q3ifd6zqxxc71m33yd"; + iosevka-sparkle = "1f59j1cs11gabrk3m78bay96jpwz7lfc8z34ns9kx4bd43w0xnkx"; + iosevka-ss01 = "1kvsgghqc04mdqmbn2c98yqr062lav6aqawbdk1nsqyzihb09wq3"; + iosevka-ss02 = "06ri8ihinz6bd6swrxf500j1hfl8y9dfm7hjgm3hpdch4fcrhrnz"; + iosevka-ss03 = "110bwfikcxyr8s6p5l29wiyyfhnfv5p2bjlqrzs46pzpyj9g4730"; + iosevka-ss04 = "064nq0zphsik097ynv71p7007w0ysld1a0phfxmc0199s8qdahid"; + iosevka-ss05 = "0c99yp2fxsmx6pwqdlr217rh5khk79fnl8i35a19wf0z3sm4kcna"; + iosevka-ss06 = "0wfxcryhfwcqb2gd227qyiv1a3vzxig79bkp20cpb215w1hn6hkw"; + iosevka-ss07 = "141qpwbjy34v088a29fmj7nipvdxwh4l99wwyaq5ycbgj8743k93"; + iosevka-ss08 = "08yihjqp1fc6l1in9jk8dnlf9fwqahqv76di4xy9vk1dhgi1bd09"; + iosevka-ss09 = "01ad5dif3hwd2yf3y3sa58acqbps5kyivbxmsdqwpl5cvl2f9i83"; + iosevka-ss10 = "0aljyqqxw4mijkwzbq8hcpmpxm34ylp9pfcvisca2k7dspg17n2l"; + iosevka-ss11 = "1cz8ri184mdj6q67rdasbg7fjbhla2vj85lrkhy2avk515av2c2g"; + iosevka-ss12 = "0hif6sgk7r2d235sghaf9nqn7qr58rgj43ipc0pr5lykaraqi7md"; + iosevka-ss13 = "1wrzn9m2vvnc2sfh3wqgmr5ci3mpi0fmbzlvkf0j2hspkfy4d8iw"; + iosevka-ss14 = "1d71qbbd2b6nqdaxns70m3qm9qr03l5ld84fqlfcsmxdsnlhhx3k"; } diff --git a/pkgs/data/fonts/jost/default.nix b/pkgs/data/fonts/jost/default.nix index fc06a7e98438..a8df441d9990 100644 --- a/pkgs/data/fonts/jost/default.nix +++ b/pkgs/data/fonts/jost/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchzip}: +{lib, stdenv, fetchzip}: let version = "3.5"; @@ -13,7 +13,7 @@ in fetchzip { sha256="0l78vhmbsyfmrva5wc76pskhxqryyg8q5xddpj9g5wqsddy525dq"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/indestructible-type/Jost"; description = "A sans serif font by Indestructible Type"; license = licenses.ofl; diff --git a/pkgs/data/fonts/joypixels/default.nix b/pkgs/data/fonts/joypixels/default.nix index c19a55400fcb..d7442b345217 100644 --- a/pkgs/data/fonts/joypixels/default.nix +++ b/pkgs/data/fonts/joypixels/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , config , acceptLicense ? config.joypixels.acceptLicense or false @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "The finest emoji you can use legally (formerly EmojiOne)"; longDescription = '' New for 2020! JoyPixels 6.0 includes 3,342 originally crafted icon diff --git a/pkgs/data/fonts/kanji-stroke-order-font/default.nix b/pkgs/data/fonts/kanji-stroke-order-font/default.nix index 7b8444c3cde7..80c97024ac36 100644 --- a/pkgs/data/fonts/kanji-stroke-order-font/default.nix +++ b/pkgs/data/fonts/kanji-stroke-order-font/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: let version = "4.003"; @@ -17,7 +17,7 @@ in stdenv.mkDerivation { cp *.txt $out/share/doc/kanji-stroke-order ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Font containing stroke order diagrams for over 6500 kanji, 180 kana and other characters"; homepage = "https://sites.google.com/site/nihilistorguk/"; diff --git a/pkgs/data/fonts/liberation-fonts/default.nix b/pkgs/data/fonts/liberation-fonts/default.nix index edc39ff0a40e..04ee3781b6bb 100644 --- a/pkgs/data/fonts/liberation-fonts/default.nix +++ b/pkgs/data/fonts/liberation-fonts/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fontforge, python3 }: +{ lib, stdenv, fetchFromGitHub, fontforge, python3 }: let inherit (python3.pkgs) fonttools; @@ -27,7 +27,7 @@ let install -m444 -Dt $out/share/doc/${pname}-${version} README || true ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Liberation Fonts, replacements for Times New Roman, Arial, and Courier New"; longDescription = '' The Liberation Fonts are intended to be replacements for the three most diff --git a/pkgs/data/fonts/liberation-sans-narrow/default.nix b/pkgs/data/fonts/liberation-sans-narrow/default.nix index 373704f25f53..281bfa4c42b0 100644 --- a/pkgs/data/fonts/liberation-sans-narrow/default.nix +++ b/pkgs/data/fonts/liberation-sans-narrow/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fontforge, python3Packages, python3 }: +{ lib, stdenv, fetchFromGitHub, fontforge, python3Packages, python3 }: stdenv.mkDerivation rec { pname = "liberation-sans-narrow"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { install -m444 -Dt $out/doc/${pname}-${version} AUTHORS ChangeLog COPYING License.txt README.rst ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Liberation Sans Narrow Font Family is a replacement for Arial Narrow"; longDescription = '' Liberation Sans Narrow is a font originally created by Ascender diff --git a/pkgs/data/fonts/libertine/default.nix b/pkgs/data/fonts/libertine/default.nix index bd47998b924f..2120c5965e2f 100644 --- a/pkgs/data/fonts/libertine/default.nix +++ b/pkgs/data/fonts/libertine/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fontforge }: +{ lib, stdenv, fetchurl, fontforge }: stdenv.mkDerivation { name = "linux-libertine-5.3.0"; @@ -38,7 +38,7 @@ stdenv.mkDerivation { install -m444 -Dt $out/share/texmf/fonts/map *.map ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Linux Libertine Fonts"; homepage = "http://linuxlibertine.sf.net"; maintainers = [ maintainers.volth ]; diff --git a/pkgs/data/fonts/libre-caslon/default.nix b/pkgs/data/fonts/libre-caslon/default.nix index 1b5e5b1be690..d89d4c41c0f3 100644 --- a/pkgs/data/fonts/libre-caslon/default.nix +++ b/pkgs/data/fonts/libre-caslon/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "libre-caslon"; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { outputHashMode = "recursive"; outputHash = "05aajwny99yqzn1nnq1blx6h7rl54x056y12hyawfbigkzxhscns"; - meta = with stdenv.lib; { + meta = with lib; { description = "Caslon fonts based on hand-lettered American Caslons of 1960s"; homepage = "http://www.impallari.com/librecaslon"; license = licenses.ofl; diff --git a/pkgs/data/fonts/lobster-two/default.nix b/pkgs/data/fonts/lobster-two/default.nix index d5a46b43fb49..fb1595fe2fc7 100644 --- a/pkgs/data/fonts/lobster-two/default.nix +++ b/pkgs/data/fonts/lobster-two/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: let @@ -69,7 +69,7 @@ in outputHashMode = "recursive"; outputHash = "0if9l8pzwgfnbdjg5yblcy08dwn9yj3wzz29l0fycia46xlzd4ym"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/librefonts/lobstertwo"; description = "Script font with many ligatures"; license = licenses.ofl; diff --git a/pkgs/data/fonts/meslo-lgs-nf/default.nix b/pkgs/data/fonts/meslo-lgs-nf/default.nix index 36ce33cd7d2d..305bd69f2dae 100644 --- a/pkgs/data/fonts/meslo-lgs-nf/default.nix +++ b/pkgs/data/fonts/meslo-lgs-nf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "meslo-lgs-nf"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { cp $src/*.ttf $out/share/fonts/truetype ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Meslo Nerd Font patched for Powerlevel10k"; homepage = "https://github.com/romkatv/powerlevel10k-media"; license = licenses.asl20; diff --git a/pkgs/data/fonts/migmix/default.nix b/pkgs/data/fonts/migmix/default.nix index 1b3313d4e026..bcc0666f035d 100644 --- a/pkgs/data/fonts/migmix/default.nix +++ b/pkgs/data/fonts/migmix/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip }: +{ lib, stdenv, fetchzip }: stdenv.mkDerivation rec { pname = "migmix"; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { outputHashMode = "recursive"; outputHash = "1fhh8wg6lxwrnsg9rl4ihffl0bsp1wqa5gps9fx60kr6j9wpvmbg"; - meta = with stdenv.lib; { + meta = with lib; { description = "A high-quality Japanese font based on M+ fonts and IPA fonts"; homepage = "http://mix-mplus-ipa.osdn.jp/migmix"; license = licenses.ipa; diff --git a/pkgs/data/fonts/migu/default.nix b/pkgs/data/fonts/migu/default.nix index 530fd4f543f2..09992ef5ec8c 100644 --- a/pkgs/data/fonts/migu/default.nix +++ b/pkgs/data/fonts/migu/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip }: +{ lib, stdenv, fetchzip }: stdenv.mkDerivation rec { pname = "migu"; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { outputHashMode = "recursive"; outputHash = "0nbpn21cxdd6gsgr3fadzjsnz84f2swpf81wmscmjgvd56ngndzh"; - meta = with stdenv.lib; { + meta = with lib; { description = "A high-quality Japanese font based on modified M+ fonts and IPA fonts"; homepage = "http://mix-mplus-ipa.osdn.jp/migu/"; license = licenses.ipa; diff --git a/pkgs/data/fonts/monoid/default.nix b/pkgs/data/fonts/monoid/default.nix index 48dc121af459..77ef87152acf 100644 --- a/pkgs/data/fonts/monoid/default.nix +++ b/pkgs/data/fonts/monoid/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, python3 }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, python3 }: stdenv.mkDerivation { pname = "monoid"; @@ -39,7 +39,7 @@ stdenv.mkDerivation { install -m444 -Dt $out/share/doc Readme.md ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://larsenwork.com/monoid"; description = "Customisable coding font with alternates, ligatures and contextual positioning"; license = [ licenses.ofl licenses.mit ]; diff --git a/pkgs/data/fonts/nerdfonts/default.nix b/pkgs/data/fonts/nerdfonts/default.nix index bf98effb1508..ceb0cb8b03af 100644 --- a/pkgs/data/fonts/nerdfonts/default.nix +++ b/pkgs/data/fonts/nerdfonts/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { ''} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Iconic font aggregator, collection, & patcher. 3,600+ icons, 50+ patched fonts"; longDescription = '' Nerd Fonts is a project that attempts to patch as many developer targeted diff --git a/pkgs/data/fonts/noto-fonts/default.nix b/pkgs/data/fonts/noto-fonts/default.nix index 1c1d773038e7..59d1ed353f3a 100644 --- a/pkgs/data/fonts/noto-fonts/default.nix +++ b/pkgs/data/fonts/noto-fonts/default.nix @@ -179,7 +179,7 @@ in install -D $src $out/share/fonts/blobmoji/Blobmoji.ttf ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Noto Emoji with extended Blob support"; homepage = "https://github.com/C1710/blobmoji"; license = with licenses; [ ofl asl20 ]; diff --git a/pkgs/data/fonts/paratype-pt/mono.nix b/pkgs/data/fonts/paratype-pt/mono.nix index 54dbe3abf4ea..eecab47c0879 100644 --- a/pkgs/data/fonts/paratype-pt/mono.nix +++ b/pkgs/data/fonts/paratype-pt/mono.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip }: +{ lib, stdenv, fetchzip }: fetchzip { name = "paratype-pt-mono"; @@ -16,7 +16,7 @@ fetchzip { sha256 = "07kl82ngby55khvzsvn831ddpc0q8djgz2y6gsjixkyjfdk2xjjm"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.paratype.ru/public/"; description = "An open Paratype font"; diff --git a/pkgs/data/fonts/paratype-pt/sans.nix b/pkgs/data/fonts/paratype-pt/sans.nix index afaba6804f8b..826b8887365e 100644 --- a/pkgs/data/fonts/paratype-pt/sans.nix +++ b/pkgs/data/fonts/paratype-pt/sans.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip }: +{ lib, stdenv, fetchzip }: fetchzip { name = "paratype-pt-sans"; @@ -16,7 +16,7 @@ fetchzip { sha256 = "01fkd417gv98jf3a6zyfi9w2dkqsbddy1vacga2672yf0kh1z1r0"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.paratype.ru/public/"; description = "An open Paratype font"; diff --git a/pkgs/data/fonts/paratype-pt/serif.nix b/pkgs/data/fonts/paratype-pt/serif.nix index a6f21e425f8d..bbff974e1071 100644 --- a/pkgs/data/fonts/paratype-pt/serif.nix +++ b/pkgs/data/fonts/paratype-pt/serif.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip }: +{ lib, stdenv, fetchzip }: fetchzip { name = "paratype-pt-serif"; @@ -16,7 +16,7 @@ fetchzip { sha256 = "1iw5qi4ag3yp1lwmi91lb18gr768bqwl46xskaqnkhr9i9qp0v6d"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.paratype.ru/public/"; description = "An open Paratype font"; diff --git a/pkgs/data/fonts/profont/default.nix b/pkgs/data/fonts/profont/default.nix index 6297a8fbb204..3570bf7bf91a 100644 --- a/pkgs/data/fonts/profont/default.nix +++ b/pkgs/data/fonts/profont/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, mkfontscale }: +{ lib, stdenv, fetchzip, mkfontscale }: stdenv.mkDerivation { pname = "profont"; @@ -32,7 +32,7 @@ stdenv.mkDerivation { mkfontdir "$out/share/fonts/misc" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://tobiasjung.name/profont/"; description = "A monospaced font created to be a most readable font for programming"; maintainers = with maintainers; [ myrl ]; diff --git a/pkgs/data/fonts/proggyfonts/default.nix b/pkgs/data/fonts/proggyfonts/default.nix index 7ddfd69aeeb4..81ecb7354095 100644 --- a/pkgs/data/fonts/proggyfonts/default.nix +++ b/pkgs/data/fonts/proggyfonts/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, mkfontscale }: +{ lib, stdenv, fetchurl, mkfontscale }: stdenv.mkDerivation { name = "proggyfonts-0.1"; @@ -31,7 +31,7 @@ stdenv.mkDerivation { outputHashMode = "recursive"; outputHash = "1x196rp3wqjd7m57bgp5kfy5jmj97qncxi1vwibs925ji7dqzfgf"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://upperbounds.net"; description = "A set of fixed-width screen fonts that are designed for code listings"; license = licenses.mit; diff --git a/pkgs/data/fonts/ricty/default.nix b/pkgs/data/fonts/ricty/default.nix index 13cb056dc454..435cdb7d163b 100644 --- a/pkgs/data/fonts/ricty/default.nix +++ b/pkgs/data/fonts/ricty/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, google-fonts, migu, fontforge, which }: +{ lib, stdenv, fetchurl, google-fonts, migu, fontforge, which }: stdenv.mkDerivation rec { pname = "ricty"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { install -m644 --target $out/share/fonts/truetype/ricty -D Ricty-*.ttf ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A high-quality Japanese font based on Inconsolata and Migu 1M"; homepage = "http://www.yusa.lab.uec.ac.jp/~yusa/ricty.html"; license = licenses.unfree; diff --git a/pkgs/data/fonts/rictydiminished-with-firacode/default.nix b/pkgs/data/fonts/rictydiminished-with-firacode/default.nix index 0f90c13d11eb..ceed83070040 100644 --- a/pkgs/data/fonts/rictydiminished-with-firacode/default.nix +++ b/pkgs/data/fonts/rictydiminished-with-firacode/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, fontforge, python3 }: +{ lib, stdenv, fetchgit, fontforge, python3 }: stdenv.mkDerivation rec { pname = "rictydiminished-with-firacode"; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { ])) ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/hakatashi/RictyDiminished-with-FiraCode"; description = "The best Japanese programming font meets the awesome ligatures of Firacode"; license = licenses.ofl; diff --git a/pkgs/data/fonts/roboto-mono/default.nix b/pkgs/data/fonts/roboto-mono/default.nix index 9bb655268014..fd3372123c60 100644 --- a/pkgs/data/fonts/roboto-mono/default.nix +++ b/pkgs/data/fonts/roboto-mono/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: let # Latest commit touching the robotomono tree @@ -67,7 +67,7 @@ stdenv.mkDerivation { outputHashMode = "recursive"; outputHash = "0fkx2z97k29n1392bf76iwdyz44yp86hmqah7ai6bikzlia38qa0"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.google.com/fonts/specimen/Roboto+Mono"; description = "Google Roboto Mono fonts"; longDescription = '' diff --git a/pkgs/data/fonts/roboto-slab/default.nix b/pkgs/data/fonts/roboto-slab/default.nix index 1fec03b46fe4..dc37c8258564 100644 --- a/pkgs/data/fonts/roboto-slab/default.nix +++ b/pkgs/data/fonts/roboto-slab/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation { pname = "roboto-slab"; @@ -20,7 +20,7 @@ stdenv.mkDerivation { outputHashMode = "recursive"; outputHash = "0g663npi5lkvwcqafd4cjrm90ph0nv1lig7d19xzfymnj47qpj8x"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.google.com/fonts/specimen/Roboto+Slab"; description = "Roboto Slab Typeface by Google"; longDescription = '' diff --git a/pkgs/data/fonts/siji/default.nix b/pkgs/data/fonts/siji/default.nix index fb13f82263dd..ea2d2b687d53 100644 --- a/pkgs/data/fonts/siji/default.nix +++ b/pkgs/data/fonts/siji/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, libfaketime, fonttosfnt, mkfontscale }: +{ lib, stdenv, fetchzip, libfaketime, fonttosfnt, mkfontscale }: stdenv.mkDerivation rec { name = "siji-${version}"; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "bdf" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/stark/siji"; description = "An iconic bitmap font based on Stlarch with additional glyphs"; license = licenses.gpl2; diff --git a/pkgs/data/fonts/tamsyn/default.nix b/pkgs/data/fonts/tamsyn/default.nix index 4d1e58a6bb34..6f0886e1d971 100644 --- a/pkgs/data/fonts/tamsyn/default.nix +++ b/pkgs/data/fonts/tamsyn/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fontforge, mkfontscale }: +{ lib, stdenv, fetchurl, fontforge, mkfontscale }: let version = "1.11"; @@ -34,7 +34,7 @@ in stdenv.mkDerivation { mkfontdir "$out/share/fonts/misc" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A monospace bitmap font aimed at programmers"; longDescription = ''Tamsyn is a monospace bitmap font, primarily aimed at programmers. It was derived from Gilles Boccon-Gibod's MonteCarlo. Tamsyn diff --git a/pkgs/data/fonts/tamzen/default.nix b/pkgs/data/fonts/tamzen/default.nix index 026ec63d670e..80212a14aebf 100644 --- a/pkgs/data/fonts/tamzen/default.nix +++ b/pkgs/data/fonts/tamzen/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, mkfontscale, stdenv }: +{ fetchFromGitHub, mkfontscale, lib, stdenv }: stdenv.mkDerivation rec { pname = "tamzen-font"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { mkfontdir "$out/share/fonts/misc" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Bitmapped programming font based on Tamsyn"; longDescription = '' Tamzen is a monospace bitmap font. It is programatically forked diff --git a/pkgs/data/fonts/terminus-font/default.nix b/pkgs/data/fonts/terminus-font/default.nix index bbde1dd252c3..fca357706a60 100644 --- a/pkgs/data/fonts/terminus-font/default.nix +++ b/pkgs/data/fonts/terminus-font/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python3 +{ lib, stdenv, fetchurl, python3 , libfaketime, fonttosfnt , bdftopcf, mkfontscale }: @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { installTargets = [ "install" "fontdir" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A clean fixed width font"; longDescription = '' Terminus Font is designed for long (8 and more hours per day) work diff --git a/pkgs/data/fonts/tewi/default.nix b/pkgs/data/fonts/tewi/default.nix index 7821cc660412..1cf31b5affe7 100644 --- a/pkgs/data/fonts/tewi/default.nix +++ b/pkgs/data/fonts/tewi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python3 +{ lib, stdenv, fetchFromGitHub, python3 , bdftopcf, mkfontscale , libfaketime, fonttosfnt }: @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { mkfontdir "$fontDir" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A nice bitmap font, readable even at small sizes"; longDescription = '' Tewi is a bitmap font, readable even at very small font sizes. This is diff --git a/pkgs/data/fonts/tex-gyre-math/default.nix b/pkgs/data/fonts/tex-gyre-math/default.nix index cd3c3ab00b18..92898be0f3ff 100644 --- a/pkgs/data/fonts/tex-gyre-math/default.nix +++ b/pkgs/data/fonts/tex-gyre-math/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip }: +{ lib, stdenv, fetchzip }: let variants = { @@ -48,7 +48,7 @@ let outputHashMode = "recursive"; inherit outputHash; - meta = with stdenv.lib; { + meta = with lib; { longDescription = '' TeX Gyre ${displayName} Math is a math companion for the TeX Gyre ${displayName} family of fonts (see diff --git a/pkgs/data/fonts/tex-gyre/default.nix b/pkgs/data/fonts/tex-gyre/default.nix index 197d14c3f03e..333da24e95f3 100644 --- a/pkgs/data/fonts/tex-gyre/default.nix +++ b/pkgs/data/fonts/tex-gyre/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip }: +{ lib, stdenv, fetchzip }: let mkVariant = variant: { version, abbreviation, sha256, outputHash }: stdenv.mkDerivation { @@ -22,7 +22,7 @@ let outputHashMode = "recursive"; inherit outputHash; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.gust.org.pl/projects/e-foundry/tex-gyre"; # "The TeX Gyre fonts are licensed under the GUST Font License (GFL), # which is a free license, legally equivalent to the LaTeX Project Public diff --git a/pkgs/data/fonts/tlwg/default.nix b/pkgs/data/fonts/tlwg/default.nix index 2e3a0a95c055..9c03bbb162f5 100644 --- a/pkgs/data/fonts/tlwg/default.nix +++ b/pkgs/data/fonts/tlwg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, fontforge }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, fontforge }: stdenv.mkDerivation rec { pname = "tlwg"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { preAutoreconf = "echo ${version} > VERSION"; - meta = with stdenv.lib; { + meta = with lib; { description = "A collection of Thai scalable fonts available under free licenses"; homepage = "https://linux.thai.net/projects/fonts-tlwg"; license = with licenses; [ gpl2 publicDomain lppl13c free ]; diff --git a/pkgs/data/fonts/ttf-tw-moe/default.nix b/pkgs/data/fonts/ttf-tw-moe/default.nix index 1115b48b7095..695792894426 100644 --- a/pkgs/data/fonts/ttf-tw-moe/default.nix +++ b/pkgs/data/fonts/ttf-tw-moe/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip }: +{ lib, stdenv, fetchzip }: let version = "2020-11-14"; in @@ -14,7 +14,7 @@ fetchzip { sha256 = "1jd3gjjfa4vadp6d499n0irz5b22z611kd7q5qgqf6s2fwbxfhiz"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.moe.gov.tw/"; description = "Set of KAI and SONG fonts from the Ministry of Education of Taiwan"; version = version; diff --git a/pkgs/data/fonts/twemoji-color-font/default.nix b/pkgs/data/fonts/twemoji-color-font/default.nix index 23ae8e76b1d5..5e690e7fd6f2 100644 --- a/pkgs/data/fonts/twemoji-color-font/default.nix +++ b/pkgs/data/fonts/twemoji-color-font/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, inkscape, imagemagick, potrace, svgo, scfbuild }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, inkscape, imagemagick, potrace, svgo, scfbuild }: stdenv.mkDerivation rec { pname = "twemoji-color-font"; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { install -Dm644 linux/fontconfig/56-twemoji-color.conf $out/etc/fonts/conf.d/56-twemoji-color.conf ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Color emoji SVGinOT font using Twitter Unicode 10 emoji with diversity and country flags"; longDescription = '' A color and B&W emoji SVGinOT font built from the Twitter Emoji for diff --git a/pkgs/data/fonts/twitter-color-emoji/default.nix b/pkgs/data/fonts/twitter-color-emoji/default.nix index 8435957fe201..de70a0b6c6a0 100644 --- a/pkgs/data/fonts/twitter-color-emoji/default.nix +++ b/pkgs/data/fonts/twitter-color-emoji/default.nix @@ -1,7 +1,7 @@ # Based upon https://src.fedoraproject.org/rpms/twitter-twemoji-fonts # The main difference is that we use “Twitter Color Emoji” name (which is recognized by upstream fontconfig) -{ stdenv +{ lib, stdenv , fetchFromGitHub , cairo , imagemagick @@ -91,7 +91,7 @@ stdenv.mkDerivation rec { install -Dm644 TwitterColorEmoji.ttf $out/share/fonts/truetype/TwitterColorEmoji.ttf ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Color emoji font with a flat visual style, designed and used by Twitter"; longDescription = '' A bitmap color emoji font built from the Twitter Emoji for diff --git a/pkgs/data/fonts/ucs-fonts/default.nix b/pkgs/data/fonts/ucs-fonts/default.nix index 71c42c46b5d4..7bb9930ccfca 100644 --- a/pkgs/data/fonts/ucs-fonts/default.nix +++ b/pkgs/data/fonts/ucs-fonts/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bdftopcf +{ lib, stdenv, fetchurl, bdftopcf , libfaketime, fonttosfnt, mkfontscale }: @@ -51,7 +51,7 @@ stdenv.mkDerivation { outputs = [ "out" "bdf" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.cl.cam.ac.uk/~mgk25/ucs-fonts.html"; description = "Unicode bitmap fonts"; license = licenses.publicDomain; diff --git a/pkgs/data/fonts/unifont/default.nix b/pkgs/data/fonts/unifont/default.nix index ce2a92ce48ae..507faae53e35 100644 --- a/pkgs/data/fonts/unifont/default.nix +++ b/pkgs/data/fonts/unifont/default.nix @@ -1,19 +1,19 @@ -{ stdenv, fetchurl, mkfontscale +{ lib, stdenv, fetchurl, mkfontscale , libfaketime, fonttosfnt }: stdenv.mkDerivation rec { pname = "unifont"; - version = "13.0.04"; + version = "13.0.05"; ttf = fetchurl { url = "mirror://gnu/unifont/${pname}-${version}/${pname}-${version}.ttf"; - sha256 = "sha256-p0wSTyXCXuWIw+hDZ4HZPxgdBJ6oOOqOuX6FzZJmwrE="; + sha256 = "0ff7zbyqi45q0171rl9ckj6lpfhcj8a9850d8j89m7wbwky32isf"; }; pcf = fetchurl { url = "mirror://gnu/unifont/${pname}-${version}/${pname}-${version}.pcf.gz"; - sha256 = "sha256-sKY2qshNV3zXfD2BSbfs0qom1gPt7vD5QmVEkACmx18="; + sha256 = "16n666p6rs6l4r8grh67gy4ls33qfnbb5xk7cksywzjwdh42js0r"; }; nativeBuildInputs = [ libfaketime fonttosfnt mkfontscale ]; @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { mkfontscale ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Unicode font for Base Multilingual Plane"; homepage = "http://unifoundry.com/unifont.html"; diff --git a/pkgs/data/fonts/unifont_upper/default.nix b/pkgs/data/fonts/unifont_upper/default.nix index 2daf66e75109..04480aaeec72 100644 --- a/pkgs/data/fonts/unifont_upper/default.nix +++ b/pkgs/data/fonts/unifont_upper/default.nix @@ -1,7 +1,7 @@ { lib, fetchzip }: let - version = "13.0.04"; + version = "13.0.05"; in fetchzip rec { name = "unifont_upper-${version}"; @@ -9,7 +9,7 @@ in fetchzip rec { postFetch = "install -Dm644 $downloadedFile $out/share/fonts/truetype/unifont_upper.ttf"; - sha256 = "0bji0crx84nbjf1m1lzql7icrb02zbs3l66dn21pvr9czsry870f"; + sha256 = "1cpi44fzsiq3yqg38763awgri1ma46421c3v8167bsxzsx7vzlkp"; meta = with lib; { description = "Unicode font for glyphs above the Unicode Basic Multilingual Plane"; diff --git a/pkgs/data/fonts/uw-ttyp0/default.nix b/pkgs/data/fonts/uw-ttyp0/default.nix index b0e58faed602..a3c3f7b68aa7 100644 --- a/pkgs/data/fonts/uw-ttyp0/default.nix +++ b/pkgs/data/fonts/uw-ttyp0/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl +{ lib, stdenv, fetchurl, perl , bdftopcf, bdf2psf, mkfontdir , fonttosfnt , targetsDat ? null @@ -80,7 +80,7 @@ stdenv.mkDerivation rec { runHook postConfigure ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Monospace bitmap screen fonts for X11"; homepage = "https://people.mpi-inf.mpg.de/~uwe/misc/uw-ttyp0/"; license = with licenses; [ free mit ]; diff --git a/pkgs/data/fonts/xits-math/default.nix b/pkgs/data/fonts/xits-math/default.nix index dfb38973edd9..9e3c013f44de 100644 --- a/pkgs/data/fonts/xits-math/default.nix +++ b/pkgs/data/fonts/xits-math/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python3Packages}: +{ lib, stdenv, fetchFromGitHub, python3Packages}: stdenv.mkDerivation rec { pname = "xits-math"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { install -m444 -Dt $out/share/fonts/opentype *.otf ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/alif-type/xits"; description = "OpenType implementation of STIX fonts with math support"; license = licenses.ofl; diff --git a/pkgs/data/icons/arc-icon-theme/default.nix b/pkgs/data/icons/arc-icon-theme/default.nix index ab80305d5285..6b7de57a4ff1 100644 --- a/pkgs/data/icons/arc-icon-theme/default.nix +++ b/pkgs/data/icons/arc-icon-theme/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, gtk3, gnome3, moka-icon-theme, gnome-icon-theme, hicolor-icon-theme }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, gtk3, gnome3, moka-icon-theme, gnome-icon-theme, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "arc-icon-theme"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { postFixup = "gtk-update-icon-cache $out/share/icons/Arc"; - meta = with stdenv.lib; { + meta = with lib; { description = "Arc icon theme"; homepage = "https://github.com/horst3180/arc-icon-theme"; license = licenses.gpl3; diff --git a/pkgs/data/icons/capitaine-cursors/default.nix b/pkgs/data/icons/capitaine-cursors/default.nix index e57482b191b7..075dbc922bd4 100644 --- a/pkgs/data/icons/capitaine-cursors/default.nix +++ b/pkgs/data/icons/capitaine-cursors/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, makeFontsConf +{ lib, stdenv, fetchFromGitHub, fetchpatch, makeFontsConf , inkscape, xcursorgen, bc }: stdenv.mkDerivation rec { @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { cp -pr dist/light $out/share/icons/capitaine-cursors-white ''; - meta = with stdenv.lib; { + meta = with lib; { description = "An x-cursor theme inspired by macOS and based on KDE Breeze"; homepage = "https://github.com/keeferrourke/capitaine-cursors"; license = licenses.lgpl3; diff --git a/pkgs/data/icons/elementary-xfce-icon-theme/default.nix b/pkgs/data/icons/elementary-xfce-icon-theme/default.nix index 52f9c8c821fe..adf2139d0cef 100644 --- a/pkgs/data/icons/elementary-xfce-icon-theme/default.nix +++ b/pkgs/data/icons/elementary-xfce-icon-theme/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, gdk-pixbuf, optipng, librsvg, gtk3, pantheon, gnome3, gnome-icon-theme, hicolor-icon-theme }: +{ lib, stdenv, fetchFromGitHub, pkgconfig, gdk-pixbuf, optipng, librsvg, gtk3, pantheon, gnome3, gnome-icon-theme, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "elementary-xfce-icon-theme"; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { make icon-caches ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Elementary icons for Xfce and other GTK desktops like GNOME"; homepage = "https://github.com/shimmerproject/elementary-xfce"; license = licenses.gpl2; diff --git a/pkgs/data/icons/faba-icon-theme/default.nix b/pkgs/data/icons/faba-icon-theme/default.nix index 9df47f8faa7c..6ccd4c4622fa 100644 --- a/pkgs/data/icons/faba-icon-theme/default.nix +++ b/pkgs/data/icons/faba-icon-theme/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, meson, ninja, python3, gtk3, pantheon, gnome-icon-theme, hicolor-icon-theme }: +{ lib, stdenv, fetchFromGitHub, meson, ninja, python3, gtk3, pantheon, gnome-icon-theme, hicolor-icon-theme }: stdenv.mkDerivation rec { name = "${package-name}-${version}"; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { patchShebangs meson/post_install.py ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A sexy and modern icon theme with Tango influences"; homepage = "https://snwh.org/moka"; license = with licenses; [ cc-by-sa-40 gpl3 ]; diff --git a/pkgs/data/icons/faba-mono-icons/default.nix b/pkgs/data/icons/faba-mono-icons/default.nix index e403ba753ecc..0627c87bfc5e 100644 --- a/pkgs/data/icons/faba-mono-icons/default.nix +++ b/pkgs/data/icons/faba-mono-icons/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, gtk3, moka-icon-theme, faba-icon-theme, gnome-icon-theme, hicolor-icon-theme }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, gtk3, moka-icon-theme, faba-icon-theme, gnome-icon-theme, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "faba-mono-icons"; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "The full set of Faba monochrome panel icons"; homepage = "https://snwh.org/moka"; license = licenses.gpl3; diff --git a/pkgs/data/icons/flat-remix-icon-theme/default.nix b/pkgs/data/icons/flat-remix-icon-theme/default.nix index aea76738d82f..743bcba54de2 100644 --- a/pkgs/data/icons/flat-remix-icon-theme/default.nix +++ b/pkgs/data/icons/flat-remix-icon-theme/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub , gtk3, breeze-icons, pantheon, gnome-icon-theme, hicolor-icon-theme }: +{ lib, stdenv, fetchFromGitHub , gtk3, breeze-icons, pantheon, gnome-icon-theme, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "flat-remix-icon-theme"; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Flat remix is a pretty simple icon theme inspired on material design"; homepage = "https://drasite.com/flat-remix"; license = with licenses; [ gpl3 ]; diff --git a/pkgs/data/icons/gnome-icon-theme/default.nix b/pkgs/data/icons/gnome-icon-theme/default.nix index 30dacbae740d..9879f8da342d 100644 --- a/pkgs/data/icons/gnome-icon-theme/default.nix +++ b/pkgs/data/icons/gnome-icon-theme/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, iconnamingutils, gtk2 }: +{ lib, stdenv, fetchurl, pkgconfig, intltool, iconnamingutils, gtk2 }: stdenv.mkDerivation rec { pname = "gnome-icon-theme"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { rm -r "$out/share/locale" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Collection of icons for the GNOME 2 desktop"; homepage = "https://download.gnome.org/sources/gnome-icon-theme/"; license = licenses.gpl3Plus; diff --git a/pkgs/data/icons/hicolor-icon-theme/default.nix b/pkgs/data/icons/hicolor-icon-theme/default.nix index 5eefce81a129..3a8839844f11 100644 --- a/pkgs/data/icons/hicolor-icon-theme/default.nix +++ b/pkgs/data/icons/hicolor-icon-theme/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "hicolor-icon-theme-0.17"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { setupHook = ./setup-hook.sh; - meta = with stdenv.lib; { + meta = with lib; { description = "Default fallback theme used by implementations of the icon theme specification"; homepage = "https://icon-theme.freedesktop.org/releases/"; platforms = platforms.unix; diff --git a/pkgs/data/icons/humanity-icon-theme/default.nix b/pkgs/data/icons/humanity-icon-theme/default.nix index 62085110f513..13ee96d04998 100644 --- a/pkgs/data/icons/humanity-icon-theme/default.nix +++ b/pkgs/data/icons/humanity-icon-theme/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gtk3, gnome3, hicolor-icon-theme }: +{ lib, stdenv, fetchurl, gtk3, gnome3, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "humanity-icon-theme"; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Humanity icons from Ubuntu"; homepage = "https://launchpad.net/humanity/"; license = licenses.gpl2; diff --git a/pkgs/data/icons/iconpack-jade/default.nix b/pkgs/data/icons/iconpack-jade/default.nix index 4c6b84479a7a..7d13476d73ec 100644 --- a/pkgs/data/icons/iconpack-jade/default.nix +++ b/pkgs/data/icons/iconpack-jade/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gtk3, gnome-icon-theme, hicolor-icon-theme }: +{ lib, stdenv, fetchFromGitHub, gtk3, gnome-icon-theme, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "iconpack-jade"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Icon pack based upon Faenza and Mint-X"; homepage = "https://github.com/madmaxms/iconpack-jade"; license = licenses.lgpl3; diff --git a/pkgs/data/icons/iconpack-obsidian/default.nix b/pkgs/data/icons/iconpack-obsidian/default.nix index 165801f52eb8..ae3bf79d79aa 100644 --- a/pkgs/data/icons/iconpack-obsidian/default.nix +++ b/pkgs/data/icons/iconpack-obsidian/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gtk3, gnome-icon-theme, mint-x-icons, hicolor-icon-theme }: +{ lib, stdenv, fetchFromGitHub, gtk3, gnome-icon-theme, mint-x-icons, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "iconpack-obsidian"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Gnome icon pack based upon Faenza"; homepage = "https://github.com/madmaxms/iconpack-obsidian"; license = licenses.lgpl3; diff --git a/pkgs/data/icons/iso-flags/default.nix b/pkgs/data/icons/iso-flags/default.nix index b329a151c728..4252853b898c 100644 --- a/pkgs/data/icons/iso-flags/default.nix +++ b/pkgs/data/icons/iso-flags/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , perl , perlPackages @@ -37,7 +37,7 @@ stdenv.mkDerivation { mv build $out/share/iso-flags ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/joielechong/iso-country-flags-svg-collection"; description = "248 country flag SVG & PNG icons with different icon styles"; license = [ licenses.publicDomain ]; diff --git a/pkgs/data/icons/kora-icon-theme/default.nix b/pkgs/data/icons/kora-icon-theme/default.nix new file mode 100644 index 000000000000..9c64ed4b4972 --- /dev/null +++ b/pkgs/data/icons/kora-icon-theme/default.nix @@ -0,0 +1,42 @@ +{ lib, stdenv, fetchFromGitHub , gtk3, breeze-icons, gnome-icon-theme, hicolor-icon-theme }: + +stdenv.mkDerivation rec { + pname = "kora-icon-theme"; + version = "1.3.4"; + + src = fetchFromGitHub { + owner = "bikass"; + repo = "kora"; + rev = "v${version}"; + sha256 = "01s7zhwwbdqgksjvfvn7kqijxzzc7734f707yk8y7anshq0518x3"; + }; + + nativeBuildInputs = [ + gtk3 + ]; + + propagatedBuildInputs = [ + breeze-icons + gnome-icon-theme + hicolor-icon-theme + ]; + + dontDropIconThemeCache = true; + + installPhase = '' + mkdir -p $out/share/icons + mv kora* $out/share/icons/ + + for theme in $out/share/icons/*; do + gtk-update-icon-cache $theme + done + ''; + + meta = with lib; { + description = "An SVG icon theme in four variants"; + homepage = "https://github.com/bikass/kora"; + license = with licenses; [ gpl3Only ]; + platforms = platforms.linux; + maintainers = with maintainers; [ bloomvdomino ]; + }; +} diff --git a/pkgs/data/icons/luna-icons/default.nix b/pkgs/data/icons/luna-icons/default.nix index b0de2ac3b132..702d4293f2a0 100644 --- a/pkgs/data/icons/luna-icons/default.nix +++ b/pkgs/data/icons/luna-icons/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , gtk3 , breeze-icons @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Icon pack based on marwaita and papirus icons"; homepage = "https://github.com/darkomarko42/Luna-Icons"; license = [ licenses.gpl3Only ]; diff --git a/pkgs/data/icons/maia-icon-theme/default.nix b/pkgs/data/icons/maia-icon-theme/default.nix index 2a6dbc512acc..75c7cd58007a 100644 --- a/pkgs/data/icons/maia-icon-theme/default.nix +++ b/pkgs/data/icons/maia-icon-theme/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitLab , cmake , extra-cmake-modules @@ -41,7 +41,7 @@ stdenv.mkDerivation { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Icons based on Breeze and Super Flat Remix"; homepage = "https://gitlab.manjaro.org/artwork/themes/maia"; license = licenses.lgpl3; diff --git a/pkgs/data/icons/moka-icon-theme/default.nix b/pkgs/data/icons/moka-icon-theme/default.nix index d481f2df8d6e..5e67fdc9cc93 100644 --- a/pkgs/data/icons/moka-icon-theme/default.nix +++ b/pkgs/data/icons/moka-icon-theme/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, meson, ninja, gtk3, python3, faba-icon-theme, hicolor-icon-theme }: +{ lib, stdenv, fetchFromGitHub, meson, ninja, gtk3, python3, faba-icon-theme, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "moka-icon-theme"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { patchShebangs meson/post_install.py ''; - meta = with stdenv.lib; { + meta = with lib; { description = "An icon theme designed with a minimal flat style using simple geometry and bright colours"; homepage = "https://snwh.org/moka"; license = with licenses; [ cc-by-sa-40 gpl3 ]; diff --git a/pkgs/data/icons/numix-cursor-theme/default.nix b/pkgs/data/icons/numix-cursor-theme/default.nix index 7ff3c4ca23c4..377cf05ac179 100644 --- a/pkgs/data/icons/numix-cursor-theme/default.nix +++ b/pkgs/data/icons/numix-cursor-theme/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, inkscape, xcursorgen }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, inkscape, xcursorgen }: stdenv.mkDerivation rec { version = "1.1"; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { cp -dr --no-preserve='ownership' Numix-Cursor{,-Light} $out/share/icons/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Numix cursor theme"; homepage = "https://numixproject.github.io"; license = licenses.gpl3; diff --git a/pkgs/data/icons/numix-icon-theme-circle/default.nix b/pkgs/data/icons/numix-icon-theme-circle/default.nix index ef06c2e2532a..e46c7a4289bb 100644 --- a/pkgs/data/icons/numix-icon-theme-circle/default.nix +++ b/pkgs/data/icons/numix-icon-theme-circle/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gtk3, numix-icon-theme, hicolor-icon-theme }: +{ lib, stdenv, fetchFromGitHub, gtk3, numix-icon-theme, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "numix-icon-theme-circle"; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Numix icon theme (circle version)"; homepage = "https://numixproject.github.io"; license = licenses.gpl3; diff --git a/pkgs/data/icons/numix-icon-theme-square/default.nix b/pkgs/data/icons/numix-icon-theme-square/default.nix index b0b4e20073a4..bc243b95afc8 100644 --- a/pkgs/data/icons/numix-icon-theme-square/default.nix +++ b/pkgs/data/icons/numix-icon-theme-square/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gtk3, numix-icon-theme, hicolor-icon-theme }: +{ lib, stdenv, fetchFromGitHub, gtk3, numix-icon-theme, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "numix-icon-theme-square"; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Numix icon theme (square version)"; homepage = "https://numixproject.github.io"; license = licenses.gpl3; diff --git a/pkgs/data/icons/numix-icon-theme/default.nix b/pkgs/data/icons/numix-icon-theme/default.nix index 30e212629e86..d8e583b4bbb8 100644 --- a/pkgs/data/icons/numix-icon-theme/default.nix +++ b/pkgs/data/icons/numix-icon-theme/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gtk3, gnome-icon-theme, hicolor-icon-theme }: +{ lib, stdenv, fetchFromGitHub, gtk3, gnome-icon-theme, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "numix-icon-theme"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Numix icon theme"; homepage = "https://numixproject.github.io"; license = licenses.gpl3; diff --git a/pkgs/data/icons/paper-icon-theme/default.nix b/pkgs/data/icons/paper-icon-theme/default.nix index 585190a7b382..c84369a8a4a9 100644 --- a/pkgs/data/icons/paper-icon-theme/default.nix +++ b/pkgs/data/icons/paper-icon-theme/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, meson, ninja, gtk3, python3, gnome3, gnome-icon-theme, hicolor-icon-theme }: +{ lib, stdenv, fetchFromGitHub, meson, ninja, gtk3, python3, gnome3, gnome-icon-theme, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "paper-icon-theme"; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { gtk-update-icon-cache "$out"/share/icons/Paper-Mono-Dark; ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Modern icon theme designed around bold colours and simple geometric shapes"; homepage = "https://snwh.org/paper"; license = with licenses; [ cc-by-sa-40 lgpl3 ]; diff --git a/pkgs/data/icons/papirus-icon-theme/default.nix b/pkgs/data/icons/papirus-icon-theme/default.nix index 0f4d0d1d90c7..b79013461821 100644 --- a/pkgs/data/icons/papirus-icon-theme/default.nix +++ b/pkgs/data/icons/papirus-icon-theme/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gtk3, pantheon, breeze-icons, gnome-icon-theme, hicolor-icon-theme }: +{ lib, stdenv, fetchFromGitHub, gtk3, pantheon, breeze-icons, gnome-icon-theme, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "papirus-icon-theme"; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Papirus icon theme"; homepage = "https://github.com/PapirusDevelopmentTeam/papirus-icon-theme"; license = licenses.lgpl3; diff --git a/pkgs/data/icons/papirus-maia-icon-theme/default.nix b/pkgs/data/icons/papirus-maia-icon-theme/default.nix index 4cfe50d7836b..814d9ced017b 100644 --- a/pkgs/data/icons/papirus-maia-icon-theme/default.nix +++ b/pkgs/data/icons/papirus-maia-icon-theme/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, gtk3, breeze-icons, gnome-icon-theme, papirus-icon-theme, hicolor-icon-theme }: +{ lib, stdenv, fetchFromGitHub, cmake, gtk3, breeze-icons, gnome-icon-theme, papirus-icon-theme, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "papirus-maia-icon-theme"; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Manjaro variation of Papirus icon theme"; homepage = "https://github.com/Ste74/papirus-maia-icon-theme"; license = licenses.lgpl3; diff --git a/pkgs/data/icons/pop-icon-theme/default.nix b/pkgs/data/icons/pop-icon-theme/default.nix index 76b393dcf791..cb7db20d67ca 100644 --- a/pkgs/data/icons/pop-icon-theme/default.nix +++ b/pkgs/data/icons/pop-icon-theme/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , meson , ninja @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { dontDropIconThemeCache = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Icon theme for Pop!_OS with a semi-flat design and raised 3D motifs"; homepage = "https://github.com/pop-os/icon-theme"; license = with licenses; [ cc-by-sa-40 gpl3 ]; diff --git a/pkgs/data/icons/qogir-icon-theme/default.nix b/pkgs/data/icons/qogir-icon-theme/default.nix index 1d677f1457df..e647b02f0109 100644 --- a/pkgs/data/icons/qogir-icon-theme/default.nix +++ b/pkgs/data/icons/qogir-icon-theme/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gtk3, hicolor-icon-theme }: +{ lib, stdenv, fetchFromGitHub, gtk3, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "qogir-icon-theme"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { name= ./install.sh -d $out/share/icons ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Flat colorful design icon theme"; homepage = "https://github.com/vinceliuice/Qogir-icon-theme"; license = with licenses; [ gpl3 ]; diff --git a/pkgs/data/icons/zafiro-icons/default.nix b/pkgs/data/icons/zafiro-icons/default.nix index d406ae50e1c3..f6c56aa3c0fc 100644 --- a/pkgs/data/icons/zafiro-icons/default.nix +++ b/pkgs/data/icons/zafiro-icons/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gtk3, breeze-icons, gnome-icon-theme, numix-icon-theme, numix-icon-theme-circle, hicolor-icon-theme }: +{ lib, stdenv, fetchFromGitHub, gtk3, breeze-icons, gnome-icon-theme, numix-icon-theme, numix-icon-theme-circle, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "zafiro-icons"; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { gtk-update-icon-cache "$out"/share/icons/Zafiro-icons ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Icon pack flat with light colors"; homepage = "https://github.com/zayronxio/Zafiro-icons"; license = with licenses; [ gpl3 ]; diff --git a/pkgs/data/misc/adapta-backgrounds/default.nix b/pkgs/data/misc/adapta-backgrounds/default.nix index 1c35d3deef91..029961f6c52b 100644 --- a/pkgs/data/misc/adapta-backgrounds/default.nix +++ b/pkgs/data/misc/adapta-backgrounds/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, glib }: +{ lib, stdenv, fetchFromGitHub, meson, ninja, pkgconfig, glib }: stdenv.mkDerivation rec { pname = "adapta-backgrounds"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkgconfig glib ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Wallpaper collection for adapta-project"; homepage = "https://github.com/adapta-project/adapta-backgrounds"; license = with licenses; [ gpl2 cc-by-sa-40 ]; diff --git a/pkgs/data/misc/brise/default.nix b/pkgs/data/misc/brise/default.nix index 4f5b2e972e13..f4e1a6d2905f 100644 --- a/pkgs/data/misc/brise/default.nix +++ b/pkgs/data/misc/brise/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, librime }: +{ lib, stdenv, fetchFromGitHub, librime }: stdenv.mkDerivation { name = "brise-unstable-2017-09-16"; @@ -24,7 +24,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Rime Schema Repository"; longDescription = '' This software is a collection of data packages used by Rime diff --git a/pkgs/data/misc/cldr-emoji-annotation/default.nix b/pkgs/data/misc/cldr-emoji-annotation/default.nix index 8164012b69ae..e51f5639cbc6 100644 --- a/pkgs/data/misc/cldr-emoji-annotation/default.nix +++ b/pkgs/data/misc/cldr-emoji-annotation/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , autoreconfHook }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { autoreconfHook ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Emoji annotation files in CLDR"; homepage = "https://www.unicode.org/"; license = licenses.unicode-dfs-2016; diff --git a/pkgs/data/misc/combinatorial_designs/default.nix b/pkgs/data/misc/combinatorial_designs/default.nix index a14e13749589..5457b4e54d4b 100644 --- a/pkgs/data/misc/combinatorial_designs/default.nix +++ b/pkgs/data/misc/combinatorial_designs/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { mv * "$out/share/combinatorial_designs" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Data for Combinatorial Designs"; longDescription = '' Current content: diff --git a/pkgs/data/misc/conway_polynomials/default.nix b/pkgs/data/misc/conway_polynomials/default.nix index d6413439dede..f7da9381e610 100644 --- a/pkgs/data/misc/conway_polynomials/default.nix +++ b/pkgs/data/misc/conway_polynomials/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , python }: @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { ${pythonEnv.interpreter} ${spkg-install} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Contains a small database of Conway polynomials"; license = licenses.gpl2; platforms = platforms.all; diff --git a/pkgs/data/misc/ddccontrol-db/default.nix b/pkgs/data/misc/ddccontrol-db/default.nix index d0d18d473358..6cb0c46e5f55 100644 --- a/pkgs/data/misc/ddccontrol-db/default.nix +++ b/pkgs/data/misc/ddccontrol-db/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , autoconf , automake , libtool @@ -27,7 +27,7 @@ stdenv.mkDerivation { intltool ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Monitor database for DDCcontrol"; homepage = "https://github.com/ddccontrol/ddccontrol-db"; license = licenses.gpl2; diff --git a/pkgs/data/misc/elliptic_curves/default.nix b/pkgs/data/misc/elliptic_curves/default.nix index 9b296487670d..988716f5429e 100644 --- a/pkgs/data/misc/elliptic_curves/default.nix +++ b/pkgs/data/misc/elliptic_curves/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , python }: @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ${python.interpreter} ${spkg-install} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Databases of elliptic curves"; longDescription = '' Includes two databases: diff --git a/pkgs/data/misc/freepats/default.nix b/pkgs/data/misc/freepats/default.nix index a1fa49bae27d..3ba5e1b61de1 100644 --- a/pkgs/data/misc/freepats/default.nix +++ b/pkgs/data/misc/freepats/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "freepats-20060219"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { installPhase = ''mkdir "$out"; cp -r . "$out"''; - meta = with stdenv.lib; { + meta = with lib; { description = "Instrument patches, for MIDI synthesizers"; longDescription = '' Freepats is a project to create a free and open set of instrument diff --git a/pkgs/data/misc/geolite-legacy/default.nix b/pkgs/data/misc/geolite-legacy/default.nix index 4fcbe8d02832..735a66089492 100644 --- a/pkgs/data/misc/geolite-legacy/default.nix +++ b/pkgs/data/misc/geolite-legacy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: let fetchDB = src: sha256: fetchurl { @@ -29,7 +29,7 @@ stdenv.mkDerivation { "asnum/GeoIPASNumv6.dat.gz" "1qyq4h8cja62giv6q1qqc502vsq53wzz1kx80mgvwngmycrxa21k"; - meta = with stdenv.lib; { + meta = with lib; { description = "GeoLite Legacy IP geolocation databases"; homepage = "https://geolite.maxmind.com/download/geoip"; license = licenses.cc-by-sa-30; diff --git a/pkgs/data/misc/graphs/default.nix b/pkgs/data/misc/graphs/default.nix index bf7f8d4fd0e8..54b6c16613e8 100644 --- a/pkgs/data/misc/graphs/default.nix +++ b/pkgs/data/misc/graphs/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { cp * "$out/share/graphs/" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A database of graphs"; license = licenses.gpl2; platforms = platforms.all; diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix index 351ca123df20..2fcc47149faa 100644 --- a/pkgs/data/misc/hackage/default.nix +++ b/pkgs/data/misc/hackage/default.nix @@ -1,6 +1,6 @@ { fetchurl }: fetchurl { - url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/f20dd1d767313d653d6f0c6dd9a82f92d36ecb4c.tar.gz"; - sha256 = "1prawfbp6390dlgfvd3hxvgdab7rfkr88j35m5cbk3a4hxghkyj3"; + url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/545d5cafa765c97ad6026ac96f42a246fea7675b.tar.gz"; + sha256 = "0v35kbbhmyc5yn1k4v9j32d2bj7zwlwfrwf1cppifdvwdhfs25vv"; } diff --git a/pkgs/data/misc/iana-etc/default.nix b/pkgs/data/misc/iana-etc/default.nix index 4f9a98dccffb..1936bd6627a7 100644 --- a/pkgs/data/misc/iana-etc/default.nix +++ b/pkgs/data/misc/iana-etc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip }: +{ lib, stdenv, fetchzip }: let version = "20200729"; @@ -12,7 +12,7 @@ in fetchzip { install -D -m0644 -t $out/etc services protocols ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/Mic92/iana-etc"; description = "IANA protocol and port number assignments (/etc/protocols and /etc/services)"; platforms = platforms.unix; diff --git a/pkgs/data/misc/libkkc-data/default.nix b/pkgs/data/misc/libkkc-data/default.nix index aeb15057abf3..96130b2de5e1 100644 --- a/pkgs/data/misc/libkkc-data/default.nix +++ b/pkgs/data/misc/libkkc-data/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, marisa, libkkc }: +{ lib, stdenv, fetchurl, marisa, libkkc }: stdenv.mkDerivation rec { pname = "libkkc-data"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ marisa ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Language model data package for libkkc"; homepage = "https://github.com/ueno/libkkc"; license = licenses.gpl3Plus; diff --git a/pkgs/data/misc/media-player-info/default.nix b/pkgs/data/misc/media-player-info/default.nix index 0307bf8d0ed2..867822af39e6 100644 --- a/pkgs/data/misc/media-player-info/default.nix +++ b/pkgs/data/misc/media-player-info/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, python3, udev, systemd }: +{ lib, stdenv, fetchurl, pkgconfig, python3, udev, systemd }: let name = "media-player-info-24"; @@ -21,7 +21,7 @@ in configureFlags = [ "--with-udevdir=${placeholder "out"}/lib/udev" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A repository of data files describing media player capabilities"; homepage = "https://www.freedesktop.org/wiki/Software/media-player-info/"; license = licenses.bsd3; diff --git a/pkgs/data/misc/mime-types/default.nix b/pkgs/data/misc/mime-types/default.nix index b18b66a227e6..dc942868250d 100644 --- a/pkgs/data/misc/mime-types/default.nix +++ b/pkgs/data/misc/mime-types/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip }: +{ lib, stdenv, fetchzip }: let version = "9"; @@ -11,7 +11,7 @@ in fetchzip rec { ''; sha256 = "0gyla4wfiaccs0qh0hw7n08kdpnkkssglcg0z2jblb2lsdr4qna0"; - meta = with stdenv.lib; { + meta = with lib; { description = "A database of common mappings of file extensions to MIME types"; homepage = "https://packages.gentoo.org/packages/app-misc/mime-types"; license = licenses.gpl2; diff --git a/pkgs/data/misc/miscfiles/default.nix b/pkgs/data/misc/miscfiles/default.nix index 3d1caf9ae517..783dc29ecb2d 100644 --- a/pkgs/data/misc/miscfiles/default.nix +++ b/pkgs/data/misc/miscfiles/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation rec { name = "miscfiles-1.5"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "005588vfrwx8ghsdv9p7zczj9lbc9a3r4m5aphcaqv8gif4siaka"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.gnu.org/software/miscfiles/"; license = licenses.gpl2Plus; description = "Collection of files not of crucial importance for sysadmins"; diff --git a/pkgs/data/misc/mobile-broadband-provider-info/default.nix b/pkgs/data/misc/mobile-broadband-provider-info/default.nix index c9f24c9e85ef..f487edba9815 100644 --- a/pkgs/data/misc/mobile-broadband-provider-info/default.nix +++ b/pkgs/data/misc/mobile-broadband-provider-info/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gnome3 }: +{ lib, stdenv, fetchurl, gnome3 }: stdenv.mkDerivation rec { pname = "mobile-broadband-provider-info"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Mobile broadband service provider database"; homepage = "https://wiki.gnome.org/Projects/NetworkManager/MobileBroadband/ServiceProviders"; license = licenses.publicDomain; diff --git a/pkgs/data/misc/nixos-artwork/wallpapers.nix b/pkgs/data/misc/nixos-artwork/wallpapers.nix index 36242db4621f..f8d22637cf3d 100644 --- a/pkgs/data/misc/nixos-artwork/wallpapers.nix +++ b/pkgs/data/misc/nixos-artwork/wallpapers.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: let mkNixBackground = { name, src, description }: @@ -33,7 +33,7 @@ _EOF kdeFilePath = "${pkg}/share/wallpapers/${name}/contents/images/${src.name}"; }; - meta = with stdenv.lib; { + meta = with lib; { inherit description; homepage = "https://github.com/NixOS/nixos-artwork"; license = licenses.free; diff --git a/pkgs/data/misc/osinfo-db/default.nix b/pkgs/data/misc/osinfo-db/default.nix index 9721d0834758..36fc664a83bb 100644 --- a/pkgs/data/misc/osinfo-db/default.nix +++ b/pkgs/data/misc/osinfo-db/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, osinfo-db-tools, gettext, libxml2 }: +{ lib, stdenv, fetchurl, osinfo-db-tools, gettext, libxml2 }: stdenv.mkDerivation rec { pname = "osinfo-db"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { osinfo-db-import --dir "$out/share/osinfo" "${src}" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Osinfo database of information about operating systems for virtualization provisioning tools"; homepage = "https://gitlab.com/libosinfo/osinfo-db/"; license = licenses.gpl2Plus; diff --git a/pkgs/data/misc/pari-galdata/default.nix b/pkgs/data/misc/pari-galdata/default.nix index 644a50a8ddeb..c76734628050 100644 --- a/pkgs/data/misc/pari-galdata/default.nix +++ b/pkgs/data/misc/pari-galdata/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl }: @@ -16,7 +16,7 @@ stdenv.mkDerivation { cp -R * "$out/share/pari/" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "PARI database needed to compute Galois group in degrees 8 through 11"; homepage = "http://pari.math.u-bordeaux.fr/"; license = licenses.gpl2Plus; diff --git a/pkgs/data/misc/pari-seadata-small/default.nix b/pkgs/data/misc/pari-seadata-small/default.nix index a9c9a62839ce..86516fe1ddba 100644 --- a/pkgs/data/misc/pari-seadata-small/default.nix +++ b/pkgs/data/misc/pari-seadata-small/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl }: @@ -16,7 +16,7 @@ stdenv.mkDerivation { cp -R * "$out/share/pari/" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "PARI database needed by ellap for large primes"; homepage = "http://pari.math.u-bordeaux.fr/"; license = licenses.gpl2Plus; diff --git a/pkgs/data/misc/polytopes_db/default.nix b/pkgs/data/misc/polytopes_db/default.nix index 95ca8af82a7b..8e9e7b44a4aa 100644 --- a/pkgs/data/misc/polytopes_db/default.nix +++ b/pkgs/data/misc/polytopes_db/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { cp -R * "$out/share/reflexive_polytopes/" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Reflexive polytopes database"; license = licenses.gpl2; platforms = platforms.all; diff --git a/pkgs/data/misc/poppler-data/default.nix b/pkgs/data/misc/poppler-data/default.nix index 717c948f7437..5d6e7b8e80dc 100644 --- a/pkgs/data/misc/poppler-data/default.nix +++ b/pkgs/data/misc/poppler-data/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, cmake, ninja }: +{ fetchurl, lib, stdenv, cmake, ninja }: stdenv.mkDerivation rec { name = "poppler-data-0.4.10"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ninja ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://poppler.freedesktop.org/"; description = "Encoding files for Poppler, a PDF rendering library"; platforms = platforms.all; diff --git a/pkgs/data/misc/prjxray-db/default.nix b/pkgs/data/misc/prjxray-db/default.nix new file mode 100644 index 000000000000..d498fdb1cc8b --- /dev/null +++ b/pkgs/data/misc/prjxray-db/default.nix @@ -0,0 +1,43 @@ +{ stdenv +, fetchFromGitHub +}: + +stdenv.mkDerivation rec { + pname = "prjxray-db"; + version = "0.0-0232-g303a61d"; + + src = fetchFromGitHub { + owner = "SymbiFlow"; + repo = "prjxray-db"; + rev = "303a61d8bc552f7a533b91b17448c59e908aa391"; + sha256 = "0r75xig16dbgh3nfygggir0a160x52y766h7hd9xcib9m88jixb2"; + }; + + enableParallelBuilding = true; + + installPhase = '' + runHook preInstall + + DBDIR="$out/share/symbiflow/prjxray-db/" + DB_CONFIG="$out/bin/prjxray-config" + + mkdir -p $DBDIR $out/bin + + for device in artix7 kintex7 zynq7; do + cp -r $src/$device $DBDIR + done + + echo -e "#!/bin/sh\n\necho $DBDIR" > $DB_CONFIG + chmod +x $DB_CONFIG + + runHook postInstall + ''; + + meta = with stdenv.lib; { + description = "Project X-Ray - Xilinx Series 7 Bitstream Documentation"; + homepage = "https://github.com/SymbiFlow/prjxray-db"; + license = licenses.cc0; + maintainers = with maintainers; [ mcaju ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/data/misc/shared-desktop-ontologies/default.nix b/pkgs/data/misc/shared-desktop-ontologies/default.nix index 7e628567b6ea..88f9eec8fcad 100644 --- a/pkgs/data/misc/shared-desktop-ontologies/default.nix +++ b/pkgs/data/misc/shared-desktop-ontologies/default.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchurl, cmake }: +{ lib, stdenv, fetchurl, cmake }: stdenv.mkDerivation rec { name = "shared-desktop-ontologies-0.11.0"; - + src = fetchurl { url = "mirror://sourceforge/oscaf/${name}.tar.bz2"; sha256 = "1m5vnijg7rnwg41vig2ckg632dlczzdab1gsq51g4x7m9k1fdbw2"; }; - - buildInputs = [ cmake ]; - - meta = with stdenv.lib; { + + nativeBuildInputs = [ cmake ]; + + meta = with lib; { homepage = "http://oscaf.sourceforge.net/"; description = "Ontologies necessary for the Nepomuk semantic desktop"; longDescription = '' @@ -23,4 +23,3 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.sander ]; }; } - diff --git a/pkgs/data/misc/shared-mime-info/default.nix b/pkgs/data/misc/shared-mime-info/default.nix index 4d286ad0f0a8..69e1e697a473 100644 --- a/pkgs/data/misc/shared-mime-info/default.nix +++ b/pkgs/data/misc/shared-mime-info/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , pkgconfig , gettext @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { glib ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A database of common MIME types"; homepage = "http://freedesktop.org/wiki/Software/shared-mime-info"; license = licenses.gpl2Plus; diff --git a/pkgs/data/misc/sound-theme-freedesktop/default.nix b/pkgs/data/misc/sound-theme-freedesktop/default.nix index 908290061948..2b750a7e9e10 100644 --- a/pkgs/data/misc/sound-theme-freedesktop/default.nix +++ b/pkgs/data/misc/sound-theme-freedesktop/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, intltool }: +{ lib, stdenv, fetchurl, intltool }: stdenv.mkDerivation rec { pname = "sound-theme-freedesktop"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ intltool ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Freedesktop reference sound theme"; homepage = "http://freedesktop.org/wiki/Specifications/sound-theme-spec"; # See http://cgit.freedesktop.org/sound-theme-freedesktop/tree/CREDITS: diff --git a/pkgs/data/misc/symbiflow-arch-defs/default.nix b/pkgs/data/misc/symbiflow-arch-defs/default.nix new file mode 100644 index 000000000000..89549da85dcb --- /dev/null +++ b/pkgs/data/misc/symbiflow-arch-defs/default.nix @@ -0,0 +1,47 @@ +{ stdenv +, fetchurl +, autoPatchelfHook +, python3Packages +, archs ? [ "xc7a100t" "xc7a50t" "xc7z010" "xc7z020" ] +}: + +stdenv.mkDerivation rec { + pname = "symbiflow-arch-defs"; + version = "20200914-111752-g05d68df0"; + + src = fetchurl { + url = "https://storage.googleapis.com/symbiflow-arch-defs/artifacts/prod/foss-fpga-tools/symbiflow-arch-defs/continuous/install/66/20200914-111752/symbiflow-arch-defs-install-05d68df0.tar.xz"; + sha256 = "1gmynybh8n33ag521w17c2kd16n834hqc6d8hi2pfs5kg1jl1a74"; + }; + + sourceRoot = "."; + + propagatedBuildInputs = [ + python3Packages.lxml + python3Packages.python-constraint + ]; + + installPhase = '' + mkdir -p $out/bin + cp -r bin/{symbiflow_*,vpr_common,python} $out/bin + for script in $out/bin/symbiflow_*; do + substituteInPlace $script --replace '/env' '/symbiflow_env' + done + cp bin/env $out/bin/symbiflow_env + + mkdir -p $out/share/symbiflow/arch + cp -r share/symbiflow/{scripts,techmaps} $out/share/symbiflow/ + + for arch in ${builtins.concatStringsSep " " archs}; do + cp -r share/symbiflow/arch/"$arch"_test* $out/share/symbiflow/arch/ + done + ''; + + meta = with stdenv.lib; { + description = "Project X-Ray - Xilinx Series 7 Bitstream Documentation"; + homepage = "https://github.com/SymbiFlow/symbiflow-arch-defs"; + hydraPlatforms = []; + license = licenses.isc; + platforms = platforms.all; + }; +} diff --git a/pkgs/data/misc/tzdata/default.nix b/pkgs/data/misc/tzdata/default.nix index 5065e3718cb2..98a6b9877d15 100644 --- a/pkgs/data/misc/tzdata/default.nix +++ b/pkgs/data/misc/tzdata/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchurl, buildPackages }: +{ lib, stdenv, fetchurl, buildPackages }: stdenv.mkDerivation rec { pname = "tzdata"; - version = "2020c"; + version = "2020f"; srcs = [ (fetchurl { url = "https://data.iana.org/time-zones/releases/tzdata${version}.tar.gz"; - sha256 = "1nab36g5ibs88wg2mzpzygi1wh5gh2al1qjvbk8sb90sbw8ar43q"; + sha256 = "10b8cr55x6ji14n3kqkn3avj1s9b79b8gszh81fxrrisij8k248j"; }) (fetchurl { url = "https://data.iana.org/time-zones/releases/tzcode${version}.tar.gz"; - sha256 = "1r5zrk1k3jhhilkhrx82fd19rvysji8jk05gq5v0rndmyx07zacs"; + sha256 = "1i998crd9fxdfhv4jd241j1arx0ng7j7cvczpmj4y5j5fwmfmvng"; }) ]; @@ -64,9 +64,10 @@ stdenv.mkDerivation rec { setupHook = ./tzdata-setup-hook.sh; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.iana.org/time-zones"; description = "Database of current and historical time zones"; + changelog = "https://github.com/eggert/tz/blob/${version}/NEWS"; platforms = platforms.all; maintainers = with maintainers; [ fpletz ]; }; diff --git a/pkgs/data/misc/unicode-character-database/default.nix b/pkgs/data/misc/unicode-character-database/default.nix index e52f21713ed8..0f0a4d5fa15c 100644 --- a/pkgs/data/misc/unicode-character-database/default.nix +++ b/pkgs/data/misc/unicode-character-database/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , unzip }: @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Unicode Character Database"; homepage = "https://www.unicode.org/"; license = licenses.unicode-dfs-2016; diff --git a/pkgs/data/misc/unicode-emoji/default.nix b/pkgs/data/misc/unicode-emoji/default.nix index b7705d7ee5b4..60ff492330dc 100644 --- a/pkgs/data/misc/unicode-emoji/default.nix +++ b/pkgs/data/misc/unicode-emoji/default.nix @@ -50,7 +50,7 @@ symlinkJoin rec { passthru = srcs; - meta = with stdenv.lib; { + meta = with lib; { description = "Unicode Emoji Data Files"; homepage = "https://home.unicode.org/emoji/"; license = licenses.unicode-dfs-2016; diff --git a/pkgs/data/misc/unihan-database/default.nix b/pkgs/data/misc/unihan-database/default.nix index d5d62403cc3d..02632b926448 100644 --- a/pkgs/data/misc/unihan-database/default.nix +++ b/pkgs/data/misc/unihan-database/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , unzip }: @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Unicode Han Database"; homepage = "https://www.unicode.org/"; license = licenses.unicode-dfs-2016; diff --git a/pkgs/data/misc/wireless-regdb/default.nix b/pkgs/data/misc/wireless-regdb/default.nix index cc22606c0d69..fc238fbe149b 100644 --- a/pkgs/data/misc/wireless-regdb/default.nix +++ b/pkgs/data/misc/wireless-regdb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "wireless-regdb"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { "PREFIX=" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Wireless regulatory database for CRDA"; homepage = "http://wireless.kernel.org/en/developers/Regulatory/"; license = licenses.isc; diff --git a/pkgs/data/soundfonts/fluid/default.nix b/pkgs/data/soundfonts/fluid/default.nix index c1c318383a09..1f84a6fd1eef 100644 --- a/pkgs/data/soundfonts/fluid/default.nix +++ b/pkgs/data/soundfonts/fluid/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation { name = "Fluid-3"; @@ -14,7 +14,7 @@ stdenv.mkDerivation { install -Dm644 "FluidR3 GM2-2.SF2" $out/share/soundfonts/FluidR3_GM2-2.sf2 ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Frank Wen's pro-quality GM/GS soundfont"; homepage = "http://www.hammersound.net/"; license = licenses.mit; diff --git a/pkgs/data/themes/adapta/default.nix b/pkgs/data/themes/adapta/default.nix index ca8e908009f9..7bbb8b6acc9e 100644 --- a/pkgs/data/themes/adapta/default.nix +++ b/pkgs/data/themes/adapta/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, parallel, sassc, inkscape, libxml2, glib, gdk-pixbuf, librsvg, gtk-engine-murrine, gnome3 }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, parallel, sassc, inkscape, libxml2, glib, gdk-pixbuf, librsvg, gtk-engine-murrine, gnome3 }: stdenv.mkDerivation rec { pname = "adapta-gtk-theme"; @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { "--disable-unity" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "An adaptive GTK theme based on Material Design Guidelines"; homepage = "https://github.com/adapta-project/adapta-gtk-theme"; license = with licenses; [ gpl2 cc-by-sa-30 ]; diff --git a/pkgs/data/themes/adementary/default.nix b/pkgs/data/themes/adementary/default.nix index 4c8362b346b3..8b03132bfcb7 100644 --- a/pkgs/data/themes/adementary/default.nix +++ b/pkgs/data/themes/adementary/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gtk3, sassc }: +{ lib, stdenv, fetchFromGitHub, gtk3, sassc }: stdenv.mkDerivation rec { pname = "adementary-theme"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ./install.sh -d $out/share/themes ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Adwaita-based GTK theme with design influence from elementary OS and Vertex GTK theme"; homepage = "https://github.com/hrdwrrsk/adementary-theme"; license = licenses.gpl3; diff --git a/pkgs/data/themes/amber/default.nix b/pkgs/data/themes/amber/default.nix index 84eaee90fdbc..258dcff32665 100644 --- a/pkgs/data/themes/amber/default.nix +++ b/pkgs/data/themes/amber/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, meson, ninja, sassc, gdk-pixbuf, librsvg, gtk_engines, gtk-engine-murrine }: +{ lib, stdenv, fetchFromGitHub, meson, ninja, sassc, gdk-pixbuf, librsvg, gtk_engines, gtk-engine-murrine }: stdenv.mkDerivation rec { pname = "amber-theme"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ gtk-engine-murrine ]; - meta = with stdenv.lib; { + meta = with lib; { description = "GTK, gnome-shell and Xfce theme based on Ubuntu Ambiance"; homepage = "https://github.com/lassekongo83/amber-theme"; license = licenses.gpl3Only; diff --git a/pkgs/data/themes/ant-theme/ant-bloody.nix b/pkgs/data/themes/ant-theme/ant-bloody.nix index 3c540889c13a..66cd3e247a72 100644 --- a/pkgs/data/themes/ant-theme/ant-bloody.nix +++ b/pkgs/data/themes/ant-theme/ant-bloody.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gtk-engine-murrine }: +{ lib, stdenv, fetchurl, gtk-engine-murrine }: let themeName = "Ant-Bloody"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Bloody variant of the Ant theme"; homepage = "https://github.com/EliverLara/${themeName}"; license = licenses.gpl3; diff --git a/pkgs/data/themes/ant-theme/ant-nebula.nix b/pkgs/data/themes/ant-theme/ant-nebula.nix index 03ee3b5d2d42..a62791572352 100644 --- a/pkgs/data/themes/ant-theme/ant-nebula.nix +++ b/pkgs/data/themes/ant-theme/ant-nebula.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gtk-engine-murrine }: +{ lib, stdenv, fetchurl, gtk-engine-murrine }: let themeName = "Ant-Nebula"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Nebula variant of the Ant theme"; homepage = "https://github.com/EliverLara/${themeName}"; license = licenses.gpl3; diff --git a/pkgs/data/themes/ant-theme/ant.nix b/pkgs/data/themes/ant-theme/ant.nix index 736c8a1aa6ac..250b77a66e8f 100644 --- a/pkgs/data/themes/ant-theme/ant.nix +++ b/pkgs/data/themes/ant-theme/ant.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gtk-engine-murrine }: +{ lib, stdenv, fetchurl, gtk-engine-murrine }: let themeName = "Ant"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A flat and light theme with a modern look"; homepage = "https://github.com/EliverLara/${themeName}"; license = licenses.gpl3; diff --git a/pkgs/data/themes/arc/default.nix b/pkgs/data/themes/arc/default.nix index bbbfbe7fe5c6..919c04913f03 100644 --- a/pkgs/data/themes/arc/default.nix +++ b/pkgs/data/themes/arc/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , sassc , autoreconfHook @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { install -Dm644 -t $out/share/doc/${pname} AUTHORS *.md ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Flat theme with transparent elements for GTK 3, GTK 2 and Gnome Shell"; homepage = "https://github.com/jnsh/arc-theme"; license = licenses.gpl3Only; diff --git a/pkgs/data/themes/canta/default.nix b/pkgs/data/themes/canta/default.nix index c6a6678b98c7..cf1223152088 100644 --- a/pkgs/data/themes/canta/default.nix +++ b/pkgs/data/themes/canta/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , gdk-pixbuf , librsvg @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { gtk-update-icon-cache $out/share/icons/Canta ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Flat Design theme for GTK based desktop environments"; homepage = "https://github.com/vinceliuice/Canta-theme"; license = licenses.gpl2; diff --git a/pkgs/data/themes/cdetheme/default.nix b/pkgs/data/themes/cdetheme/default.nix index ae7386047517..466f7d0daf1e 100644 --- a/pkgs/data/themes/cdetheme/default.nix +++ b/pkgs/data/themes/cdetheme/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python2Packages }: +{ lib, stdenv, fetchFromGitHub, python2Packages }: stdenv.mkDerivation rec { pname = "cdetheme"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { wrapPythonProgramsIn "$out/share/themes/cdetheme/scripts" "$out $pythonPath" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Gtk2 / Gtk3 theme mimicking CDE / Motif"; homepage = "https://www.gnome-look.org/p/1231025"; license = licenses.gpl3; diff --git a/pkgs/data/themes/clearlooks-phenix/default.nix b/pkgs/data/themes/clearlooks-phenix/default.nix index 4de923da9cf4..0157914d8fcc 100644 --- a/pkgs/data/themes/clearlooks-phenix/default.nix +++ b/pkgs/data/themes/clearlooks-phenix/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip }: +{ lib, stdenv, fetchzip }: stdenv.mkDerivation rec { version = "7.0.1"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { preferLocalBuild = true; - meta = with stdenv.lib; { + meta = with lib; { description = "GTK3 port of the Clearlooks theme"; longDescription = '' The Clearlooks-Phénix project aims at creating a GTK3 port of Clearlooks, diff --git a/pkgs/data/themes/dracula-theme/default.nix b/pkgs/data/themes/dracula-theme/default.nix index 87afbedf8fb6..e36f567b5f80 100644 --- a/pkgs/data/themes/dracula-theme/default.nix +++ b/pkgs/data/themes/dracula-theme/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gtk-engine-murrine }: +{ lib, stdenv, fetchFromGitHub, gtk-engine-murrine }: let themeName = "Dracula"; @@ -26,7 +26,7 @@ stdenv.mkDerivation { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Dracula variant of the Ant theme"; homepage = "https://github.com/dracula/gtk"; license = licenses.gpl3; diff --git a/pkgs/data/themes/equilux-theme/default.nix b/pkgs/data/themes/equilux-theme/default.nix index f24524eb6b97..ddc57c552a12 100644 --- a/pkgs/data/themes/equilux-theme/default.nix +++ b/pkgs/data/themes/equilux-theme/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gnome3, glib, libxml2, gtk-engine-murrine, gdk-pixbuf, librsvg, bc }: +{ lib, stdenv, fetchFromGitHub, gnome3, glib, libxml2, gtk-engine-murrine, gdk-pixbuf, librsvg, bc }: stdenv.mkDerivation rec { pname = "equilux-theme"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { rm $out/share/themes/*/COPYING ''; - meta = with stdenv.lib; { + meta = with lib; { inherit (src.meta) homepage; description = "A Material Design theme for GNOME/GTK based desktop environments"; license = licenses.gpl2; diff --git a/pkgs/data/themes/greybird/default.nix b/pkgs/data/themes/greybird/default.nix index 2f14988e1b25..987df8deaf49 100644 --- a/pkgs/data/themes/greybird/default.nix +++ b/pkgs/data/themes/greybird/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, sassc, gdk-pixbuf, librsvg, gtk-engine-murrine }: +{ lib, stdenv, fetchFromGitHub, meson, ninja, pkgconfig, sassc, gdk-pixbuf, librsvg, gtk-engine-murrine }: stdenv.mkDerivation rec { pname = "greybird"; - version = "3.22.13"; + version = "3.22.14"; src = fetchFromGitHub { owner = "shimmerproject"; repo = pname; rev = "v${version}"; - sha256 = "154qawiga792iimkpk3a6q8f4gm4r158wmsagkbqqbhj33kxgxhg"; + sha256 = "0b0axzrvdsv7aa029idz4rs1jm6df4ff3v4j4d5wf4yiypb48js9"; }; nativeBuildInputs = [ @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { gtk-engine-murrine ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Grey and blue theme from the Shimmer Project for GTK-based environments"; homepage = "https://github.com/shimmerproject/Greybird"; license = [ licenses.gpl2Plus ]; # or alternatively: cc-by-nc-sa-30 or later diff --git a/pkgs/data/themes/jade1/default.nix b/pkgs/data/themes/jade1/default.nix index 03dd7a49cda8..7b850c9049e2 100644 --- a/pkgs/data/themes/jade1/default.nix +++ b/pkgs/data/themes/jade1/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gtk-engine-murrine }: +{ lib, stdenv, fetchurl, gtk-engine-murrine }: stdenv.mkDerivation rec { pname = "theme-jade1"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Based on Linux Mint theme with dark menus and more intensive green"; homepage = "https://github.com/madmaxms/theme-jade-1"; license = with licenses; [ gpl3Only ]; diff --git a/pkgs/data/themes/kde2/default.nix b/pkgs/data/themes/kde2/default.nix index 7e33d371ebeb..04986b7dcc5b 100644 --- a/pkgs/data/themes/kde2/default.nix +++ b/pkgs/data/themes/kde2/default.nix @@ -15,7 +15,6 @@ mkDerivation rec { }; outputs = [ "out" "dev" ]; - enableParallelBuilding = true; nativeBuildInputs = [ cmake extra-cmake-modules ]; diff --git a/pkgs/data/themes/lounge/default.nix b/pkgs/data/themes/lounge/default.nix index a62ff72db6f6..af355c168e42 100644 --- a/pkgs/data/themes/lounge/default.nix +++ b/pkgs/data/themes/lounge/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, meson, ninja, sassc, gtk3, gnome3, gdk-pixbuf, librsvg, gtk-engine-murrine }: +{ lib, stdenv, fetchFromGitHub, meson, ninja, sassc, gtk3, gnome3, gdk-pixbuf, librsvg, gtk-engine-murrine }: stdenv.mkDerivation rec { pname = "lounge-gtk-theme"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { gtk-update-icon-cache "$out"/share/icons/Lounge-aux; ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Simple and clean GTK theme with vintage scrollbars, inspired by Absolute, based on Adwaita"; homepage = "https://github.com/monday15/lounge-gtk-theme"; license = licenses.gpl3Plus; diff --git a/pkgs/data/themes/marwaita-manjaro/default.nix b/pkgs/data/themes/marwaita-manjaro/default.nix index 6750c0119968..4189f0ed48d6 100644 --- a/pkgs/data/themes/marwaita-manjaro/default.nix +++ b/pkgs/data/themes/marwaita-manjaro/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , gdk-pixbuf , gtk-engine-murrine @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "marwaita-manjaro"; - version = "1.6"; + version = "1.8"; src = fetchFromGitHub { owner = "darkomarko42"; repo = pname; rev = version; - sha256 = "133b9ri1yhvwrm9fm648mq0xnbr9mccy6yar7d390n4659j09v3s"; + sha256 = "0zxj20inwdfxhsc7cq6b3ijkxmrhnrwvbmyb1lw4vfjs4p4wrws0"; }; buildInputs = [ @@ -36,10 +36,10 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Manjaro Style (green version) of Marwaita GTK theme"; homepage = "https://www.pling.com/p/1351213/"; - license = licenses.gpl3; + license = licenses.gpl3Only; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; }; diff --git a/pkgs/data/themes/marwaita-peppermint/default.nix b/pkgs/data/themes/marwaita-peppermint/default.nix index c7c4efa777bb..70e7bdef2d4e 100644 --- a/pkgs/data/themes/marwaita-peppermint/default.nix +++ b/pkgs/data/themes/marwaita-peppermint/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , gdk-pixbuf , gtk-engine-murrine @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "marwaita-peppermint"; - version = "0.5"; + version = "0.6"; src = fetchFromGitHub { owner = "darkomarko42"; repo = pname; rev = version; - sha256 = "04j210nw9w4m8n49cd8y3l0qp60rn00i8wdr6kvc7lhkvqwhpnlg"; + sha256 = "0mhkkx2qa66z4b2h5iynhy63flwdf6b2phd21r1j8kp4m08dynms"; }; buildInputs = [ @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Marwaita GTK theme with Peppermint Os Linux style"; homepage = "https://www.pling.com/p/1399569/"; license = licenses.gpl3; diff --git a/pkgs/data/themes/marwaita-pop_os/default.nix b/pkgs/data/themes/marwaita-pop_os/default.nix index 487b54a53e71..f71997674671 100644 --- a/pkgs/data/themes/marwaita-pop_os/default.nix +++ b/pkgs/data/themes/marwaita-pop_os/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , gdk-pixbuf , gtk-engine-murrine @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "marwaita-pop_os"; - version = "0.9"; + version = "1.1"; src = fetchFromGitHub { owner = "darkomarko42"; repo = pname; rev = version; - sha256 = "1fpzsch9rpq7dmg01ny7jc2vd6dks0fqxxp2rb9jcs0vx5d2fdc6"; + sha256 = "1nwfyy3jnfsdlqgj7ig9gbawazdm76g02b0hrfsll17j5498d59y"; }; buildInputs = [ @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Marwaita GTK theme with Pop_os Linux style"; homepage = "https://www.pling.com/p/1377894/"; license = licenses.gpl3Only; diff --git a/pkgs/data/themes/marwaita-ubuntu/default.nix b/pkgs/data/themes/marwaita-ubuntu/default.nix index 0241748bc432..f98e112678ce 100644 --- a/pkgs/data/themes/marwaita-ubuntu/default.nix +++ b/pkgs/data/themes/marwaita-ubuntu/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , gdk-pixbuf , gtk-engine-murrine @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "marwaita-ubuntu"; - version = "1.5"; + version = "1.7"; src = fetchFromGitHub { owner = "darkomarko42"; repo = pname; rev = version; - sha256 = "0mld78s6gl5kfsdaqa7xs5mvfng9600pd2d9sp2b2q5axx7wjay5"; + sha256 = "024b0817jilvi5ilq9sbwg19ql5i2x3jfgc1awk7zzv6sqii639x"; }; buildInputs = [ @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Ubuntu Style of Marwaita GTK theme"; homepage = "https://www.pling.com/p/1352833/"; license = licenses.gpl3Only; diff --git a/pkgs/data/themes/marwaita/default.nix b/pkgs/data/themes/marwaita/default.nix index b50eb855a969..bcf6d69a65c4 100644 --- a/pkgs/data/themes/marwaita/default.nix +++ b/pkgs/data/themes/marwaita/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , gdk-pixbuf , gtk-engine-murrine @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "marwaita"; - version = "7.7"; + version = "8.0"; src = fetchFromGitHub { owner = "darkomarko42"; repo = pname; rev = version; - sha256 = "09r9ggngskazddhcm9c2n0cjc4qs9215vyri4i02cbp1jl82kwvg"; + sha256 = "0ljigm5z13r0idfkjgy5ysq9pzdj66ql269p5phhp47aagmjcv3s"; }; buildInputs = [ @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "GTK theme supporting Budgie, Pantheon, Mate, Xfce4 and GNOME desktops"; homepage = "https://www.pling.com/p/1239855/"; license = licenses.cc0; diff --git a/pkgs/data/themes/matcha/default.nix b/pkgs/data/themes/matcha/default.nix index 75b9d0f65ed8..f7f139a9ea97 100644 --- a/pkgs/data/themes/matcha/default.nix +++ b/pkgs/data/themes/matcha/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchFromGitHub, gdk-pixbuf, librsvg, gtk-engine-murrine }: +{ lib, stdenv, fetchFromGitHub, gdk-pixbuf, librsvg, gtk-engine-murrine }: stdenv.mkDerivation rec { pname = "matcha-gtk-theme"; - version = "2020-12-07"; + version = "2021-01-12"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "0ch05nz1hipi9fz4sx1pah61jkbjw2gz3binsqayhp76jmp344a1"; + sha256 = "1h6y89aajygbp1rc3d5dw2vgb64a3hiajlifb4xnzhycc77vjskr"; }; buildInputs = [ gdk-pixbuf librsvg ]; @@ -24,10 +24,10 @@ stdenv.mkDerivation rec { cp -a src/extra/firefox $out/share/doc/${pname} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A stylish flat Design theme for GTK based desktop environments"; homepage = "https://vinceliuice.github.io/theme-matcha"; - license = licenses.gpl3; + license = licenses.gpl3Only; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; }; diff --git a/pkgs/data/themes/materia-theme/default.nix b/pkgs/data/themes/materia-theme/default.nix index b5c13960be27..a7351a30ba82 100644 --- a/pkgs/data/themes/materia-theme/default.nix +++ b/pkgs/data/themes/materia-theme/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , meson , ninja @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { rm $out/share/themes/*/COPYING ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Material Design theme for GNOME/GTK based desktop environments"; homepage = "https://github.com/nana-4/materia-theme"; license = licenses.gpl2Only; diff --git a/pkgs/data/themes/mojave/default.nix b/pkgs/data/themes/mojave/default.nix index 3d14f782c694..7959753f05e0 100644 --- a/pkgs/data/themes/mojave/default.nix +++ b/pkgs/data/themes/mojave/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchurl, glib, gtk-engine-murrine, gtk_engines, inkscape, optipng, sassc, which }: +{ lib, stdenv, fetchFromGitHub, fetchurl, glib, gtk-engine-murrine, gtk_engines, inkscape, optipng, sassc, which }: stdenv.mkDerivation rec { pname = "mojave-gtk-theme"; @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { install -D -t $out/share/wallpapers ../"macOS Mojave Wallpapers"/* ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Mac OSX Mojave like theme for GTK based desktop environments"; homepage = "https://github.com/vinceliuice/Mojave-gtk-theme"; license = licenses.gpl3; diff --git a/pkgs/data/themes/nordic-polar/default.nix b/pkgs/data/themes/nordic-polar/default.nix index 9d74ae222500..8af17dd98afe 100644 --- a/pkgs/data/themes/nordic-polar/default.nix +++ b/pkgs/data/themes/nordic-polar/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gtk-engine-murrine }: +{ lib, stdenv, fetchurl, gtk-engine-murrine }: stdenv.mkDerivation rec { pname = "nordic-polar"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { rm $out/share/themes/*/{LICENSE,README.md} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Gtk theme created using the awesome Nord color pallete"; homepage = "https://github.com/EliverLara/Nordic-Polar"; license = licenses.gpl3; diff --git a/pkgs/data/themes/nordic/default.nix b/pkgs/data/themes/nordic/default.nix index aca72c2fb489..1d8ceec3d1ba 100644 --- a/pkgs/data/themes/nordic/default.nix +++ b/pkgs/data/themes/nordic/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gtk-engine-murrine }: +{ lib, stdenv, fetchurl, gtk-engine-murrine }: stdenv.mkDerivation rec { pname = "nordic"; @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { rm $out/share/themes/*/{LICENSE,README.md} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Dark Gtk theme created using the awesome Nord color pallete"; homepage = "https://github.com/EliverLara/Nordic"; license = licenses.gpl3; diff --git a/pkgs/data/themes/numix-solarized/default.nix b/pkgs/data/themes/numix-solarized/default.nix index 356f7d33b260..0d965e8030a6 100644 --- a/pkgs/data/themes/numix-solarized/default.nix +++ b/pkgs/data/themes/numix-solarized/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python3, sassc, glib, gdk-pixbuf, inkscape, gtk-engine-murrine }: +{ lib, stdenv, fetchFromGitHub, python3, sassc, glib, gdk-pixbuf, inkscape, gtk-engine-murrine }: stdenv.mkDerivation rec { version = "20200910"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Solarized versions of Numix GTK2 and GTK3 theme"; longDescription = '' This is a fork of the Numix GTK theme that replaces the colors of the theme diff --git a/pkgs/data/themes/obsidian2/default.nix b/pkgs/data/themes/obsidian2/default.nix index 79c8e221894b..3eb056e183e6 100644 --- a/pkgs/data/themes/obsidian2/default.nix +++ b/pkgs/data/themes/obsidian2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gtk-engine-murrine }: +{ lib, stdenv, fetchurl, gtk-engine-murrine }: stdenv.mkDerivation rec { pname = "theme-obsidian2"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Gnome theme, based upon Adwaita-Maia dark skin"; homepage = "https://github.com/madmaxms/theme-obsidian-2"; license = with licenses; [ gpl3Only ]; diff --git a/pkgs/data/themes/onestepback/default.nix b/pkgs/data/themes/onestepback/default.nix index 0385ca90f61e..9547e3543890 100644 --- a/pkgs/data/themes/onestepback/default.nix +++ b/pkgs/data/themes/onestepback/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip }: +{ lib, stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { pname = "onestepback"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { rm $out/share/themes/*/{LICENSE,README*} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Gtk theme inspired by the NextStep look"; homepage = "http://www.vide.memoire.free.fr/perso/OneStepBack"; license = licenses.gpl3; diff --git a/pkgs/data/themes/openzone/default.nix b/pkgs/data/themes/openzone/default.nix new file mode 100644 index 000000000000..cce23bd76ea0 --- /dev/null +++ b/pkgs/data/themes/openzone/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchFromGitHub, icon-slicer, xcursorgen }: +stdenv.mkDerivation rec { + pname = "openzone-cursors"; + version = "1.2.9"; + + src = fetchFromGitHub { + owner = "ducakar"; + repo = pname; + rev = "v${version}"; + sha256 = "02c536mc17ccsrzgma366k3wlm02ivklvr30fafxl981zgghlii4"; + }; + + nativeBuildInputs = [ icon-slicer xcursorgen ]; + + makeFlags = [ "DESTDIR=$(out)" ]; + + meta = with stdenv.lib; { + description = "Clean and sharp X11/Wayland cursor theme"; + homepage = "https://www.gnome-look.org/p/999999/"; + license = licenses.mit; + maintainers = with maintainers; [ zaninime ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/data/themes/paper-gtk/default.nix b/pkgs/data/themes/paper-gtk/default.nix index 6f6c8b7851fb..e7c9179678f0 100644 --- a/pkgs/data/themes/paper-gtk/default.nix +++ b/pkgs/data/themes/paper-gtk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, gtk_engines }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, gtk_engines }: stdenv.mkDerivation { version = "2016-08-16"; @@ -21,7 +21,7 @@ stdenv.mkDerivation { preferLocalBuild = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A modern desktop theme suite featuring a mostly flat with a minimal use of shadows for depth"; homepage = "https://snwh.org/paper"; license = licenses.gpl3; diff --git a/pkgs/data/themes/plano/default.nix b/pkgs/data/themes/plano/default.nix index 534831e007ee..5728dff6f9a5 100644 --- a/pkgs/data/themes/plano/default.nix +++ b/pkgs/data/themes/plano/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , meson , ninja @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { gtk-engine-murrine ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Flat theme for GNOME and Xfce"; homepage = "https://github.com/lassekongo83/plano-theme"; license = licenses.gpl3Only; diff --git a/pkgs/data/themes/plata/default.nix b/pkgs/data/themes/plata/default.nix index 6437bb1543d3..6153c3607c92 100644 --- a/pkgs/data/themes/plata/default.nix +++ b/pkgs/data/themes/plata/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, autoreconfHook, pkgconfig, parallel +{ lib, stdenv, fetchFromGitLab, autoreconfHook, pkgconfig, parallel , sassc, inkscape, libxml2, glib, gdk-pixbuf, librsvg, gtk-engine-murrine , cinnamonSupport ? true , gnomeFlashbackSupport ? true @@ -81,7 +81,7 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A GTK theme based on Material Design Refresh"; homepage = "https://gitlab.com/tista500/plata-theme"; license = with licenses; [ gpl2 cc-by-sa-40 ]; diff --git a/pkgs/data/themes/pop-gtk/default.nix b/pkgs/data/themes/pop-gtk/default.nix index 317d0ba86019..ec17be3261d8 100644 --- a/pkgs/data/themes/pop-gtk/default.nix +++ b/pkgs/data/themes/pop-gtk/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , meson , ninja @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "System76 Pop GTK+ Theme"; homepage = "https://github.com/pop-os/gtk-theme"; license = with licenses; [ gpl3 lgpl21 cc-by-sa-40 ]; diff --git a/pkgs/data/themes/qogir/default.nix b/pkgs/data/themes/qogir/default.nix index 44bb220d404d..d4ffdca3ae33 100644 --- a/pkgs/data/themes/qogir/default.nix +++ b/pkgs/data/themes/qogir/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gdk-pixbuf, librsvg, gtk-engine-murrine }: +{ lib, stdenv, fetchFromGitHub, gdk-pixbuf, librsvg, gtk-engine-murrine }: stdenv.mkDerivation rec { pname = "qogir-theme"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { rm $out/share/themes/*/{AUTHORS,COPYING} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Flat Design theme for GTK based desktop environments"; homepage = "https://vinceliuice.github.io/Qogir-theme"; license = licenses.gpl3; diff --git a/pkgs/data/themes/qtcurve/default.nix b/pkgs/data/themes/qtcurve/default.nix index cd5cb4170b8c..a65a24dc0b67 100644 --- a/pkgs/data/themes/qtcurve/default.nix +++ b/pkgs/data/themes/qtcurve/default.nix @@ -17,8 +17,6 @@ mkDerivation rec { sha256 = "XP9VTeiVIiMm5mkXapCKWxfcvaYCkhY3S5RXZNR3oWo="; }; - enableParallelBuilding = true; - patches = [ # Remove unnecessary constexpr, this is not allowed in C++14 (fetchpatch { diff --git a/pkgs/data/themes/shades-of-gray/default.nix b/pkgs/data/themes/shades-of-gray/default.nix index 718fb2b5d4ca..e4c4cfb3ba51 100644 --- a/pkgs/data/themes/shades-of-gray/default.nix +++ b/pkgs/data/themes/shades-of-gray/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gtk_engines, gtk-engine-murrine }: +{ lib, stdenv, fetchFromGitHub, gtk_engines, gtk-engine-murrine }: stdenv.mkDerivation rec { pname = "shades-of-gray-theme"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { cp -a Shades-of-gray* $out/share/themes/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Flat dark GTK theme with ergonomic contrasts"; homepage = "https://github.com/WernerFP/Shades-of-gray-theme"; license = licenses.gpl3Plus; diff --git a/pkgs/data/themes/sierra/default.nix b/pkgs/data/themes/sierra/default.nix index 470010eb54a2..d3fbb5fe7885 100644 --- a/pkgs/data/themes/sierra/default.nix +++ b/pkgs/data/themes/sierra/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libxml2, gdk-pixbuf, librsvg, gtk-engine-murrine }: +{ lib, stdenv, fetchFromGitHub, libxml2, gdk-pixbuf, librsvg, gtk-engine-murrine }: stdenv.mkDerivation rec { pname = "sierra-gtk-theme"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { name= ./install.sh --dest $out/share/themes ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A Mac OSX like theme for GTK based desktop environments"; homepage = "https://github.com/vinceliuice/Sierra-gtk-theme"; license = licenses.gpl3; diff --git a/pkgs/data/themes/skeu/default.nix b/pkgs/data/themes/skeu/default.nix index 1f2f869364ec..d8b0c1896572 100644 --- a/pkgs/data/themes/skeu/default.nix +++ b/pkgs/data/themes/skeu/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , gdk-pixbuf , gtk-engine-murrine @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "GTK theme with skeuomorphism design"; homepage = "https://www.pling.com/p/1363834/"; license = licenses.gpl3Only; diff --git a/pkgs/data/themes/snowblind/default.nix b/pkgs/data/themes/snowblind/default.nix index 3517f4de2638..d36fe2324421 100644 --- a/pkgs/data/themes/snowblind/default.nix +++ b/pkgs/data/themes/snowblind/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, gtk-engine-murrine }: +{ lib, stdenv, fetchFromGitLab, gtk-engine-murrine }: stdenv.mkDerivation rec { pname = "snowblind"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { rm $out/share/themes/*/{COPYING,CREDITS} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Smooth blue theme based on Materia Design"; homepage = "https://www.opencode.net/ju1464/Snowblind"; license = licenses.gpl3; diff --git a/pkgs/data/themes/solarc/default.nix b/pkgs/data/themes/solarc/default.nix index b8e937564a55..62a9b1076cf0 100644 --- a/pkgs/data/themes/solarc/default.nix +++ b/pkgs/data/themes/solarc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, pkgconfig, +{ lib, stdenv, fetchFromGitHub, autoconf, automake, pkgconfig, gtk-engine-murrine, gtk3 }: @@ -21,7 +21,7 @@ stdenv.mkDerivation { ./autogen.sh --prefix=$out ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Solarized version of the Arc theme"; homepage = "https://github.com/schemar/solarc-theme"; license = licenses.gpl3; diff --git a/pkgs/data/themes/stilo/default.nix b/pkgs/data/themes/stilo/default.nix index 066d122d4414..54d6f2a6e3c8 100644 --- a/pkgs/data/themes/stilo/default.nix +++ b/pkgs/data/themes/stilo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, meson, ninja, sassc, gdk-pixbuf, librsvg, gtk_engines, gtk-engine-murrine }: +{ lib, stdenv, fetchFromGitHub, meson, ninja, sassc, gdk-pixbuf, librsvg, gtk_engines, gtk-engine-murrine }: stdenv.mkDerivation rec { pname = "stilo-themes"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ gtk-engine-murrine ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Minimalistic GTK, gnome shell and Xfce themes"; homepage = "https://github.com/lassekongo83/stilo-themes"; license = licenses.gpl3Only; diff --git a/pkgs/data/themes/sweet/default.nix b/pkgs/data/themes/sweet/default.nix index 6ba7ae40c682..8a62735d2e52 100644 --- a/pkgs/data/themes/sweet/default.nix +++ b/pkgs/data/themes/sweet/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "sweet"; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Light and dark colorful Gtk3.20+ theme"; homepage = "https://github.com/EliverLara/Sweet"; license = licenses.gpl3Only; diff --git a/pkgs/data/themes/ubuntu-themes/default.nix b/pkgs/data/themes/ubuntu-themes/default.nix index 14779e8d7a38..732c9a74573b 100644 --- a/pkgs/data/themes/ubuntu-themes/default.nix +++ b/pkgs/data/themes/ubuntu-themes/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , fetchpatch , gnome-icon-theme @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Ubuntu monochrome and Suru icon themes, Ambiance and Radiance themes, and Ubuntu artwork"; homepage = "https://launchpad.net/ubuntu-themes"; license = with licenses; [ cc-by-sa-40 gpl3 ]; diff --git a/pkgs/data/themes/venta/default.nix b/pkgs/data/themes/venta/default.nix index 1086aaeb7095..cd6791521609 100644 --- a/pkgs/data/themes/venta/default.nix +++ b/pkgs/data/themes/venta/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , gdk-pixbuf , gtk-engine-murrine @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Gtk theme based on windows 10 style"; homepage = "https://www.pling.com/p/1386774/"; license = licenses.gpl3Only; diff --git a/pkgs/data/themes/vertex/default.nix b/pkgs/data/themes/vertex/default.nix index 81c681f53715..7e0b5d7e9cb2 100644 --- a/pkgs/data/themes/vertex/default.nix +++ b/pkgs/data/themes/vertex/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gtk-engine-murrine }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gtk-engine-murrine }: stdenv.mkDerivation rec { pname = "theme-vertex"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { cp AUTHORS README.md $out/share/doc/$pname/ ''; - meta = with stdenv.lib; { + meta = with lib; { inherit (src.meta) homepage; description = "Theme for GTK 3, GTK 2, Gnome-Shell, and Cinnamon"; license = licenses.gpl3; diff --git a/pkgs/data/themes/vimix/default.nix b/pkgs/data/themes/vimix/default.nix index 43636b584d3c..5a5612893708 100644 --- a/pkgs/data/themes/vimix/default.nix +++ b/pkgs/data/themes/vimix/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gtk_engines, gtk-engine-murrine }: +{ lib, stdenv, fetchFromGitHub, gtk_engines, gtk-engine-murrine }: stdenv.mkDerivation rec { pname = "vimix-gtk-themes"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { rm $out/share/themes/*/{AUTHORS,LICENSE} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Flat Material Design theme for GTK based desktop environments"; homepage = "https://github.com/vinceliuice/vimix-gtk-themes"; license = licenses.gpl3; diff --git a/pkgs/data/themes/yaru/default.nix b/pkgs/data/themes/yaru/default.nix index 8e8a56d09da4..7121aed9b1e4 100644 --- a/pkgs/data/themes/yaru/default.nix +++ b/pkgs/data/themes/yaru/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, meson, sassc, pkg-config, glib, ninja, +{ lib, stdenv, fetchFromGitHub, meson, sassc, pkg-config, glib, ninja, python3, gtk3, gnome3, gtk-engine-murrine, humanity-icon-theme, hicolor-icon-theme }: stdenv.mkDerivation rec { @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { postPatch = "patchShebangs ."; - meta = with stdenv.lib; { + meta = with lib; { description = "Ubuntu community theme 'yaru' - default Ubuntu theme since 18.10"; homepage = "https://github.com/ubuntu/yaru"; license = with licenses; [ cc-by-sa-40 gpl3 ]; diff --git a/pkgs/data/themes/zuki/default.nix b/pkgs/data/themes/zuki/default.nix index 40046c6c5b30..217ca6c59cb6 100644 --- a/pkgs/data/themes/zuki/default.nix +++ b/pkgs/data/themes/zuki/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, meson, ninja, sassc, gdk-pixbuf, librsvg, gtk_engines, gtk-engine-murrine }: +{ lib, stdenv, fetchFromGitHub, meson, ninja, sassc, gdk-pixbuf, librsvg, gtk_engines, gtk-engine-murrine }: stdenv.mkDerivation rec { pname = "zuki-themes"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ gtk-engine-murrine ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Themes for GTK, gnome-shell and Xfce"; homepage = "https://github.com/lassekongo83/zuki-themes"; license = licenses.gpl3Only; diff --git a/pkgs/desktops/cdesktopenv/default.nix b/pkgs/desktops/cdesktopenv/default.nix index 7454603e7acd..2a0769c92e99 100644 --- a/pkgs/desktops/cdesktopenv/default.nix +++ b/pkgs/desktops/cdesktopenv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, xorgproto, libX11, bison, ksh, perl, gnum4 +{ lib, stdenv, fetchurl, xorgproto, libX11, bison, ksh, perl, gnum4 , libXinerama, libXt, libXext, libtirpc, motif, libXft, xbitmaps , libjpeg, libXmu, libXdmcp, libXScrnSaver, symlinkJoin, bdftopcf , ncompress, mkfontdir, tcl, libXaw, gcc, glibcLocales, gawk @@ -71,7 +71,7 @@ EOF mv $out/opt/dt/bin/dtmail $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Common Desktop Environment"; homepage = "https://sourceforge.net/projects/cdesktopenv/"; license = licenses.lgpl2; diff --git a/pkgs/desktops/cinnamon/cinnamon-common/default.nix b/pkgs/desktops/cinnamon/cinnamon-common/default.nix index 496f0bb3d3f6..5886804392b9 100644 --- a/pkgs/desktops/cinnamon/cinnamon-common/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-common/default.nix @@ -24,7 +24,7 @@ , networkmanager , pkgconfig , polkit -, stdenv +, lib, stdenv , wrapGAppsHook , libxml2 , gtk-doc @@ -160,7 +160,7 @@ stdenv.mkDerivation rec { providedSessions = ["cinnamon" "cinnamon2d"]; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/linuxmint/cinnamon"; description = "The Cinnamon desktop environment"; license = [ licenses.gpl2 ]; diff --git a/pkgs/desktops/cinnamon/cinnamon-common/libcroco.nix b/pkgs/desktops/cinnamon/cinnamon-common/libcroco.nix index c6f6e350c9f6..10f5e61a175c 100644 --- a/pkgs/desktops/cinnamon/cinnamon-common/libcroco.nix +++ b/pkgs/desktops/cinnamon/cinnamon-common/libcroco.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libxml2, glib, gnome3 }: +{ lib, stdenv, fetchurl, pkgconfig, libxml2, glib, gnome3 }: stdenv.mkDerivation rec { pname = "libcroco"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "GNOME CSS2 parsing and manipulation toolkit"; homepage = https://gitlab.gnome.org/GNOME/libcroco; license = licenses.lgpl2; diff --git a/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix b/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix index 50eeb23b6819..6a495ccc516b 100644 --- a/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , pkgconfig , autoreconfHook @@ -110,7 +110,7 @@ stdenv.mkDerivation rec { libtool ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/linuxmint/cinnamon-control-center"; description = "A collection of configuration plugins used in cinnamon-settings"; license = licenses.gpl2; diff --git a/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix b/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix index 00ea002f746b..f9b204d61143 100644 --- a/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix @@ -8,7 +8,7 @@ , pkgconfig , pulseaudio , python3 -, stdenv +, lib, stdenv , xkeyboard_config , xorg , wrapGAppsHook @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "cinnamon-desktop"; - version = "4.8.0"; + version = "4.6.4"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "1369iig7w0x45sr9yd4a5xxqrwsfwq90hlnknarhz62h5hpykjwi"; + sha256 = "08z5hgc6dwdp9fczm75axwh8q9665iz4y2lxp92xp62r3k0v9fvd"; }; outputs = [ "out" "dev" ]; @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { sed "s|/usr/share|/run/current-system/sw/share|g" -i ./schemas/* # NOTE: unless this causes a circular dependency, we could link it to cinnamon-common/share/cinnamon ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/linuxmint/cinnamon-desktop"; description = "Library and data for various Cinnamon modules"; diff --git a/pkgs/desktops/cinnamon/cinnamon-menus/default.nix b/pkgs/desktops/cinnamon/cinnamon-menus/default.nix index 0e84302f6c6c..cdcbe6ec8054 100644 --- a/pkgs/desktops/cinnamon/cinnamon-menus/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-menus/default.nix @@ -4,19 +4,19 @@ , meson , ninja , pkgconfig -, stdenv +, lib, stdenv , wrapGAppsHook }: stdenv.mkDerivation rec { pname = "cinnamon-menus"; - version = "4.8.1"; + version = "4.6.1"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "1fsiq8q8b65skxbg1bsishygnw2zg8kr0d09rassqjdimd4yfi1y"; + sha256 = "1qdaql4mknhzvl2qi1pyw4c820lqb7lg07gblh0wzfk4f7h8hddx"; }; buildInputs = [ @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { pkgconfig ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/linuxmint/cinnamon-menus"; description = "A menu system for the Cinnamon project"; license = [ licenses.gpl2 licenses.lgpl2 ]; diff --git a/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix b/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix index 7074e6c329a4..029dea37de12 100644 --- a/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , pkgconfig , meson @@ -106,7 +106,7 @@ stdenv.mkDerivation rec { sed "s|/usr/share/locale|/run/current-system/sw/share/locale|g" -i ./src/cinnamon-screensaver-main.py ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/linuxmint/cinnamon-screensaver"; description = "The Cinnamon screen locker and screensaver program"; license = [ licenses.gpl2 licenses.lgpl2 ]; diff --git a/pkgs/desktops/cinnamon/cinnamon-session/default.nix b/pkgs/desktops/cinnamon/cinnamon-session/default.nix index 02082f64ed3c..303523420c7f 100644 --- a/pkgs/desktops/cinnamon/cinnamon-session/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-session/default.nix @@ -14,7 +14,7 @@ , ninja , pkgconfig , python3 -, stdenv +, lib, stdenv , systemd , wrapGAppsHook , xapps @@ -27,13 +27,13 @@ stdenv.mkDerivation rec { pname = "cinnamon-session"; - version = "4.8.0"; + version = "4.6.2"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "0sbfd1d4kjiccaq9s36r2cvdcmvd1x2087nkfgl32gwxakqi3g4n"; + sha256 = "133vpgs0dqr16pvx5wyxhfcargn9wl14z0q99m2pn93hf6zycmsv"; }; patches = [ @@ -95,7 +95,7 @@ stdenv.mkDerivation rec { ) ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/linuxmint/cinnamon-session"; description = "The Cinnamon session manager"; license = licenses.gpl2; diff --git a/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix b/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix index 4788af897312..4e930741b992 100644 --- a/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix @@ -15,7 +15,7 @@ , wrapGAppsHook , pkgconfig , pulseaudio -, stdenv +, lib, stdenv , systemd , upower , dconf @@ -107,7 +107,7 @@ stdenv.mkDerivation rec { ln -s $out/libexec/csd-backlight-helper $out/bin/cinnamon-settings-daemon/csd-backlight-helper ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/linuxmint/cinnamon-settings-daemon"; description = "The settings daemon for the Cinnamon desktop"; license = licenses.gpl2; diff --git a/pkgs/desktops/cinnamon/cinnamon-translations/default.nix b/pkgs/desktops/cinnamon/cinnamon-translations/default.nix index 8e29aa9fcc72..24bb38228688 100644 --- a/pkgs/desktops/cinnamon/cinnamon-translations/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-translations/default.nix @@ -1,17 +1,17 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , gettext }: stdenv.mkDerivation rec { pname = "cinnamon-translations"; - version = "4.8.0"; + version = "4.6.2"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "1j3azjwin89z5v6nphx0wsa35p224h2gps50kcq9gwankkfcf3q1"; + sha256 = "0zaghha62ibhg3rir6mrfy1z3v7p7v83b6glhmj9s51nxd86fyv6"; }; nativeBuildInputs = [ @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { mv usr $out # files get installed like so: msgfmt -o usr/share/locale/$lang/LC_MESSAGES/$dir.mo $file ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/linuxmint/cinnamon-translations"; description = "Translations files for the Cinnamon desktop"; license = licenses.gpl2; diff --git a/pkgs/desktops/cinnamon/cjs/default.nix b/pkgs/desktops/cinnamon/cjs/default.nix index 6471d06cd517..90989d45e426 100644 --- a/pkgs/desktops/cinnamon/cjs/default.nix +++ b/pkgs/desktops/cinnamon/cjs/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , gobject-introspection , pkgconfig -, stdenv +, lib, stdenv , wrapGAppsHook , python3 , cairo @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { "-Dprofiler=disabled" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/linuxmint/cjs"; description = "JavaScript bindings for Cinnamon"; diff --git a/pkgs/desktops/cinnamon/mint-themes/default.nix b/pkgs/desktops/cinnamon/mint-themes/default.nix index a4bc81ec8ec9..67020ce0b36a 100644 --- a/pkgs/desktops/cinnamon/mint-themes/default.nix +++ b/pkgs/desktops/cinnamon/mint-themes/default.nix @@ -1,5 +1,5 @@ { fetchFromGitHub -, stdenv +, lib, stdenv , python3 , sassc , sass @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { mv usr/share $out ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/linuxmint/mint-themes"; description = "Mint-X and Mint-Y themes for the cinnamon desktop"; license = licenses.gpl3; # from debian/copyright diff --git a/pkgs/desktops/cinnamon/mint-x-icons/default.nix b/pkgs/desktops/cinnamon/mint-x-icons/default.nix index 2fbb3cc67bc3..f52b0556d564 100644 --- a/pkgs/desktops/cinnamon/mint-x-icons/default.nix +++ b/pkgs/desktops/cinnamon/mint-x-icons/default.nix @@ -1,5 +1,5 @@ { fetchFromGitHub -, stdenv +, lib, stdenv , gnome3 , gnome-icon-theme , hicolor-icon-theme @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/linuxmint/mint-x-icons"; description = "Mint/metal theme based on mintified versions of Clearlooks Revamp, Elementary and Faenza"; license = licenses.gpl3Plus; # from debian/copyright diff --git a/pkgs/desktops/cinnamon/mint-y-icons/default.nix b/pkgs/desktops/cinnamon/mint-y-icons/default.nix index d5f2271625c8..8d55e81c58c2 100644 --- a/pkgs/desktops/cinnamon/mint-y-icons/default.nix +++ b/pkgs/desktops/cinnamon/mint-y-icons/default.nix @@ -1,5 +1,5 @@ { fetchFromGitHub -, stdenv +, lib, stdenv , gnome3 , gnome-icon-theme , hicolor-icon-theme @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/linuxmint/mint-y-icons"; description = "The Mint-Y icon theme"; license = licenses.gpl3; # from debian/copyright diff --git a/pkgs/desktops/cinnamon/muffin/default.nix b/pkgs/desktops/cinnamon/muffin/default.nix index e16ab1eb6769..be6f69359cca 100644 --- a/pkgs/desktops/cinnamon/muffin/default.nix +++ b/pkgs/desktops/cinnamon/muffin/default.nix @@ -14,7 +14,7 @@ , libXtst , libxkbcommon , pkgconfig -, stdenv +, lib, stdenv , udev , xorg , wrapGAppsHook @@ -90,7 +90,7 @@ stdenv.mkDerivation rec { NOCONFIGURE=1 ./autogen.sh ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/linuxmint/muffin"; description = "The window management library for the Cinnamon desktop (libmuffin) and its sample WM binary (muffin)"; license = licenses.gpl2; diff --git a/pkgs/desktops/cinnamon/nemo/default.nix b/pkgs/desktops/cinnamon/nemo/default.nix index 5037f2351208..aa876a305c64 100644 --- a/pkgs/desktops/cinnamon/nemo/default.nix +++ b/pkgs/desktops/cinnamon/nemo/default.nix @@ -5,7 +5,7 @@ , meson , ninja , pkgconfig -, stdenv +, lib, stdenv , wrapGAppsHook , libxml2 , gtk3 @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { "-Dc_args=-I${glib.dev}/include/gio-unix-2.0" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/linuxmint/nemo"; description = "File browser for Cinnamon"; license = [ licenses.gpl2 licenses.lgpl2 ]; diff --git a/pkgs/desktops/cinnamon/warpinator/default.nix b/pkgs/desktops/cinnamon/warpinator/default.nix index 5e37cff3d0a8..2338c834d1f8 100644 --- a/pkgs/desktops/cinnamon/warpinator/default.nix +++ b/pkgs/desktops/cinnamon/warpinator/default.nix @@ -1,5 +1,5 @@ { fetchFromGitHub -, stdenv +, lib, stdenv , gobject-introspection , meson , ninja @@ -69,7 +69,7 @@ python3.pkgs.buildPythonApplication rec { chmod -x+X $out/libexec/warpinator/*.py ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/linuxmint/warpinator"; description = "Share files across the LAN"; license = licenses.gpl3Plus; diff --git a/pkgs/desktops/cinnamon/xapps/default.nix b/pkgs/desktops/cinnamon/xapps/default.nix index d82cb0514237..0e8c7defa72a 100644 --- a/pkgs/desktops/cinnamon/xapps/default.nix +++ b/pkgs/desktops/cinnamon/xapps/default.nix @@ -11,7 +11,7 @@ , ninja , pkgconfig , python3 -, stdenv +, lib, stdenv , vala , wrapGAppsHook , inxi @@ -93,7 +93,7 @@ stdenv.mkDerivation rec { sed "s|'inxi'|'${inxi}/bin/inxi'|" -i scripts/upload-system-info ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/linuxmint/xapps"; description = "Cross-desktop libraries and common resources"; license = licenses.lgpl3; diff --git a/pkgs/desktops/enlightenment/efl/default.nix b/pkgs/desktops/enlightenment/efl/default.nix index 00ea83cb85c3..a68886d414bc 100644 --- a/pkgs/desktops/enlightenment/efl/default.nix +++ b/pkgs/desktops/enlightenment/efl/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , meson , ninja @@ -203,7 +203,7 @@ stdenv.mkDerivation rec { patchelf --add-needed ${libsndfile.out}/lib/libsndfile.so $out/lib/libecore_audio.so ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Enlightenment foundation libraries"; homepage = "https://enlightenment.org/"; license = with licenses; [ bsd2 lgpl2Only licenses.zlib ]; diff --git a/pkgs/desktops/enlightenment/enlightenment/default.nix b/pkgs/desktops/enlightenment/enlightenment/default.nix index 90a15a1d5235..0c6ae68529d4 100644 --- a/pkgs/desktops/enlightenment/enlightenment/default.nix +++ b/pkgs/desktops/enlightenment/enlightenment/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , meson , ninja @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { passthru.providedSessions = [ "enlightenment" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "The Compositing Window Manager and Desktop Shell"; homepage = "https://www.enlightenment.org"; license = licenses.bsd2; diff --git a/pkgs/desktops/enlightenment/evisum/default.nix b/pkgs/desktops/enlightenment/evisum/default.nix index f89ff2cee305..e4b2a7ac205a 100644 --- a/pkgs/desktops/enlightenment/evisum/default.nix +++ b/pkgs/desktops/enlightenment/evisum/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, meson, ninja, pkg-config, efl }: +{ lib, stdenv, fetchurl, meson, ninja, pkg-config, efl }: stdenv.mkDerivation rec { pname = "evisum"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { efl ]; - meta = with stdenv.lib; { + meta = with lib; { description = "System and process monitor written with EFL"; homepage = "https://www.enlightenment.org"; license = with licenses; [ isc ]; diff --git a/pkgs/desktops/gnome-2/bindings/gnome-python-desktop/default.nix b/pkgs/desktops/gnome-2/bindings/gnome-python-desktop/default.nix index bf811961226d..ef4c2ba0d91a 100644 --- a/pkgs/desktops/gnome-2/bindings/gnome-python-desktop/default.nix +++ b/pkgs/desktops/gnome-2/bindings/gnome-python-desktop/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gnome_python, librsvg, libwnck, libgtop, pkgconfig, python2, gtk2 }: +{ lib, stdenv, fetchurl, gnome_python, librsvg, libwnck, libgtop, pkgconfig, python2, gtk2 }: let inherit (python2.pkgs) python pygtk; @@ -23,7 +23,7 @@ in stdenv.mkDerivation rec { echo "gtk-2.0" > $out/${python2.sitePackages}/${pname}-${version}.pth ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.pygtk.org"; description = "Python bindings for GNOME desktop packages"; license = licenses.lgpl21; diff --git a/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix b/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix index 455e3fe26732..bdcd9d661c36 100644 --- a/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix +++ b/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python2, pkgconfig, libgnome, GConf, glib, gtk2, gnome_vfs }: +{ lib, stdenv, fetchurl, python2, pkgconfig, libgnome, GConf, glib, gtk2, gnome_vfs }: with stdenv.lib; @@ -23,7 +23,7 @@ in stdenv.mkDerivation rec { echo "gtk-2.0" > $out/${python2.sitePackages}/${name}.pth ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://pygtk.org/"; description = "Python wrapper for GNOME libraries"; platforms = platforms.linux; diff --git a/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix b/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix index 99175e25120c..6cfc2891ee4b 100644 --- a/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix +++ b/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, glib, gnome2, dbus-glib, gmime, gnome-icon-theme, libnotify, libgnome-keyring, openssl, cyrus_sasl, sylpheed, gob2, gettext, intltool, libxml2, hicolor-icon-theme, tango-icon-theme }: +{ lib, stdenv, fetchFromGitHub, pkgconfig, glib, gnome2, dbus-glib, gmime, gnome-icon-theme, libnotify, libgnome-keyring, openssl, cyrus_sasl, sylpheed, gob2, gettext, intltool, libxml2, hicolor-icon-theme, tango-icon-theme }: stdenv.mkDerivation rec { rev = "9ae8768"; @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Tray status icon, which notifies us when new email arrives"; homepage = "https://www.nongnu.org/mailnotify/"; license = with licenses; [ gpl3 ]; diff --git a/pkgs/desktops/gnome-2/platform/GConf/default.nix b/pkgs/desktops/gnome-2/platform/GConf/default.nix index 9d3e3a9be209..0e622a38e525 100644 --- a/pkgs/desktops/gnome-2/platform/GConf/default.nix +++ b/pkgs/desktops/gnome-2/platform/GConf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, dbus-glib, glib, ORBit2, libxml2, polkit, python3, intltool }: +{ lib, stdenv, fetchurl, pkgconfig, dbus-glib, glib, ORBit2, libxml2, polkit, python3, intltool }: stdenv.mkDerivation rec { pname = "gconf"; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { 2to3 --write --nobackup gsettings/gsettings-schema-convert ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://projects.gnome.org/gconf/"; description = "Deprecated system for storing application preferences"; platforms = platforms.unix; diff --git a/pkgs/desktops/gnome-2/platform/ORBit2/default.nix b/pkgs/desktops/gnome-2/platform/ORBit2/default.nix index f30c48b08e96..48198bbdc9d8 100644 --- a/pkgs/desktops/gnome-2/platform/ORBit2/default.nix +++ b/pkgs/desktops/gnome-2/platform/ORBit2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, libIDL, libintl }: +{ lib, stdenv, fetchurl, pkgconfig, glib, libIDL, libintl }: stdenv.mkDerivation rec { name = "ORBit2-${minVer}.19"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { moveToOutput "bin/orbit2-config" "$dev" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://projects.gnome.org/ORBit2/"; description = "A CORBA 2.4-compliant Object Request Broker"; platforms = platforms.unix; diff --git a/pkgs/desktops/gnome-2/platform/gnome-mime-data/default.nix b/pkgs/desktops/gnome-2/platform/gnome-mime-data/default.nix index e50ddeb94112..d5af0e362b43 100644 --- a/pkgs/desktops/gnome-2/platform/gnome-mime-data/default.nix +++ b/pkgs/desktops/gnome-2/platform/gnome-mime-data/default.nix @@ -6,5 +6,5 @@ stdenv.mkDerivation { url = "mirror://gnome/sources/gnome-mime-data/2.18/gnome-mime-data-2.18.0.tar.bz2"; sha256 = "1mvg8glb2a40yilmyabmb7fkbzlqd3i3d31kbkabqnq86xdnn69p"; }; - buildInputs = [ intltool ]; + nativeBuildInputs = [ intltool ]; } diff --git a/pkgs/desktops/gnome-2/platform/gtkglext/default.nix b/pkgs/desktops/gnome-2/platform/gtkglext/default.nix index 193ae1f3c226..780acebbb37d 100644 --- a/pkgs/desktops/gnome-2/platform/gtkglext/default.nix +++ b/pkgs/desktops/gnome-2/platform/gtkglext/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitLab , pkgconfig , gtk-doc @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { NOCONFIGURE=1 ./autogen.sh ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://projects.gnome.org/gtkglext/"; description = "GtkGLExt, an OpenGL extension to GTK"; longDescription = '' diff --git a/pkgs/desktops/gnome-2/platform/libgnomeprint/default.nix b/pkgs/desktops/gnome-2/platform/libgnomeprint/default.nix index 44c4469c5656..dd1975ac20f9 100644 --- a/pkgs/desktops/gnome-2/platform/libgnomeprint/default.nix +++ b/pkgs/desktops/gnome-2/platform/libgnomeprint/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, gtk2, gettext, libxml2, intltool, libart_lgpl +{ lib, stdenv, fetchurl, fetchpatch, pkgconfig, gtk2, gettext, libxml2, intltool, libart_lgpl , libgnomecups, bison, flex }: stdenv.mkDerivation rec { @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ libxml2 ]; - meta = with stdenv.lib; { + meta = with lib; { platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/apps/accerciser/default.nix b/pkgs/desktops/gnome-3/apps/accerciser/default.nix index f05eb41d35e2..c482a3a45eea 100644 --- a/pkgs/desktops/gnome-3/apps/accerciser/default.nix +++ b/pkgs/desktops/gnome-3/apps/accerciser/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , pkgconfig , gnome3 @@ -63,7 +63,7 @@ python3.pkgs.buildPythonApplication rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://wiki.gnome.org/Apps/Accerciser"; description = "Interactive Python accessibility explorer"; maintainers = teams.gnome.members; diff --git a/pkgs/desktops/gnome-3/apps/cheese/default.nix b/pkgs/desktops/gnome-3/apps/cheese/default.nix index c4998cc451fe..d6d181df9644 100644 --- a/pkgs/desktops/gnome-3/apps/cheese/default.nix +++ b/pkgs/desktops/gnome-3/apps/cheese/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , gettext , fetchurl , wrapGAppsHook @@ -107,7 +107,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://wiki.gnome.org/Apps/Cheese"; description = "Take photos and videos with your webcam, with fun graphical effects"; maintainers = teams.gnome.members; diff --git a/pkgs/desktops/gnome-3/apps/evolution/default.nix b/pkgs/desktops/gnome-3/apps/evolution/default.nix index 6bb2e139cba0..9bf156761153 100644 --- a/pkgs/desktops/gnome-3/apps/evolution/default.nix +++ b/pkgs/desktops/gnome-3/apps/evolution/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , cmake , ninja , intltool @@ -124,7 +124,7 @@ stdenv.mkDerivation rec { PKG_CONFIG_LIBEDATASERVERUI_1_2_UIMODULEDIR = "${placeholder "out"}/lib/evolution-data-server/ui-modules"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://wiki.gnome.org/Apps/Evolution"; description = "Personal information management application that provides integrated mail, calendaring and address book functionality"; maintainers = teams.gnome.members; diff --git a/pkgs/desktops/gnome-3/apps/file-roller/default.nix b/pkgs/desktops/gnome-3/apps/file-roller/default.nix index 29e482135a2b..aa0e2c3b1f37 100644 --- a/pkgs/desktops/gnome-3/apps/file-roller/default.nix +++ b/pkgs/desktops/gnome-3/apps/file-roller/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, glib, gtk3, meson, ninja, pkgconfig, gnome3, gettext, itstool, libxml2, libarchive +{ lib, stdenv, fetchurl, glib, gtk3, meson, ninja, pkgconfig, gnome3, gettext, itstool, libxml2, libarchive , file, json-glib, python3, wrapGAppsHook, desktop-file-utils, libnotify, nautilus, glibcLocales }: stdenv.mkDerivation rec { @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://wiki.gnome.org/Apps/FileRoller"; description = "Archive manager for the GNOME desktop environment"; license = licenses.gpl2Plus; diff --git a/pkgs/desktops/gnome-3/apps/gedit/default.nix b/pkgs/desktops/gnome-3/apps/gedit/default.nix index f3219e74bcae..c59ff77d29d4 100644 --- a/pkgs/desktops/gnome-3/apps/gedit/default.nix +++ b/pkgs/desktops/gnome-3/apps/gedit/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , meson , fetchurl , python3 @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://wiki.gnome.org/Apps/Gedit"; description = "Official text editor of the GNOME desktop environment"; maintainers = teams.gnome.members; diff --git a/pkgs/desktops/gnome-3/apps/ghex/default.nix b/pkgs/desktops/gnome-3/apps/ghex/default.nix index 7de5ffc1add0..44e714382a37 100644 --- a/pkgs/desktops/gnome-3/apps/ghex/default.nix +++ b/pkgs/desktops/gnome-3/apps/ghex/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , fetchpatch , pkgconfig @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://wiki.gnome.org/Apps/Ghex"; description = "Hex editor for GNOME desktop environment"; platforms = platforms.unix; diff --git a/pkgs/desktops/gnome-3/apps/gnome-books/default.nix b/pkgs/desktops/gnome-3/apps/gnome-books/default.nix index e7ea02a27495..a3456a0ed48e 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-books/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-books/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , meson , ninja , gettext @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { broken = true; # Tracker 3 not supported and it cannot start Tracker 2. homepage = "https://wiki.gnome.org/Apps/Books"; description = "An e-book manager application for GNOME"; diff --git a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix index 7f0c7c4f621d..8020813c4fe0 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , meson , ninja @@ -44,7 +44,6 @@ , libsecret , libcap_ng , numactl -, xen , libapparmor , json-glib , webkitgtk @@ -117,7 +116,6 @@ stdenv.mkDerivation rec { tracker-miners vte webkitgtk - xen yajl ]; @@ -137,7 +135,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Simple GNOME 3 application to access remote or virtual systems"; homepage = "https://wiki.gnome.org/Apps/Boxes"; license = licenses.gpl3; diff --git a/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix b/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix index 8f2ec6f85dd4..6c539c9a970d 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , fetchpatch , meson @@ -38,6 +38,12 @@ stdenv.mkDerivation rec { url = "https://gitlab.gnome.org/GNOME/gnome-calendar/-/commit/8be361b6ce8f0f8053e1609decbdbdc164ec8448.patch"; sha256 = "Ue0pWwcbYyCZPHPPoR0dXW5n948/AZ3wVDMTIZDOnyE="; }) + + # https://gitlab.gnome.org/GNOME/gnome-calendar/-/merge_requests/84 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-calendar/-/merge_requests/84.patch"; + sha256 = "czG3uIHl3tBnjDUvCOPm8IRp2o7yZYCb0/jWtv3uzIY="; + }) ]; passthru = { @@ -77,7 +83,7 @@ stdenv.mkDerivation rec { patchShebangs build-aux/meson/meson_post_install.py ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://wiki.gnome.org/Apps/Calendar"; description = "Simple and beautiful calendar application for GNOME"; maintainers = teams.gnome.members; diff --git a/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix b/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix index 987fa594ae52..9e4d8d8005ff 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , meson , ninja @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://wiki.gnome.org/Design/Apps/CharacterMap"; description = "Simple utility application to find and insert unusual characters"; maintainers = teams.gnome.members; diff --git a/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix b/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix index 1ffd15cfc14f..39071542a972 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , meson , ninja @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://wiki.gnome.org/Apps/Clocks"; description = "Clock application designed for GNOME 3"; maintainers = teams.gnome.members; diff --git a/pkgs/desktops/gnome-3/apps/gnome-connections/default.nix b/pkgs/desktops/gnome-3/apps/gnome-connections/default.nix index 02c2a4f3da84..f672a7c4f997 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-connections/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-connections/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , gnome3 , meson @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://gitlab.gnome.org/GNOME/connections"; description = "A remote desktop client for the GNOME desktop environment"; maintainers = teams.gnome.members; diff --git a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix index ec1268f07701..6ab8fa841459 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , meson , ninja , gettext @@ -116,7 +116,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { broken = true; # Tracker 3 not supported and it cannot start Tracker 2. homepage = "https://wiki.gnome.org/Apps/Documents"; description = "Document manager application designed to work with GNOME 3"; diff --git a/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix b/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix index 79b3be3ae3db..0ec65b51c684 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gnome3, intltool, itstool, libxml2 }: +{ lib, stdenv, fetchurl, gnome3, intltool, itstool, libxml2 }: stdenv.mkDerivation rec { pname = "gnome-getting-started-docs"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ intltool itstool libxml2 ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://live.gnome.org/DocumentationProject"; description = "Help a new user get started in GNOME"; maintainers = teams.gnome.members; diff --git a/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix b/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix index 45675b791cd8..ee023b3d4349 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , fetchpatch , meson @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://wiki.gnome.org/Apps/Logs"; description = "A log viewer for the systemd journal"; maintainers = teams.gnome.members; diff --git a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix index 47e03c0b0707..8ea538eb30bb 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , meson , ninja @@ -89,7 +89,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://wiki.gnome.org/Apps/Maps"; description = "A map application for GNOME 3"; maintainers = teams.gnome.members; diff --git a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix index a682e3b4935a..241120db7a98 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , meson , ninja , gettext @@ -103,7 +103,7 @@ python3.pkgs.buildPythonApplication rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://wiki.gnome.org/Apps/Music"; description = "Music player and management application for the GNOME desktop environment"; maintainers = teams.gnome.members; diff --git a/pkgs/desktops/gnome-3/apps/gnome-nettool/default.nix b/pkgs/desktops/gnome-3/apps/gnome-nettool/default.nix index 88072912b663..60b039c0df67 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-nettool/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-nettool/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook +{ lib, stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook , libgtop, intltool, itstool, libxml2, nmap, inetutils }: stdenv.mkDerivation rec { @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://gitlab.gnome.org/GNOME/gnome-nettool"; description = "A collection of networking tools"; maintainers = teams.gnome.members; diff --git a/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix b/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix index fab4c491a6b5..38505f9a83df 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , meson , ninja , gettext @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Note editor designed to remain simple to use"; homepage = "https://wiki.gnome.org/Apps/Notes"; license = licenses.gpl3; diff --git a/pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix b/pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix index 4a92052763ef..9bccff4a8a7a 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , gettext , fetchurl , pkgconfig @@ -50,7 +50,7 @@ in stdenv.mkDerivation rec { gnome3.adwaita-icon-theme ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://projects-old.gnome.org/gnome-power-manager/"; description = "View battery and power statistics provided by UPower"; maintainers = teams.gnome.members; diff --git a/pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix b/pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix index 6875b2ec814a..79fef5bdab14 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , pkgconfig , gettext @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A simple and modern sound recorder"; homepage = "https://wiki.gnome.org/Apps/SoundRecorder"; license = licenses.gpl2Plus; diff --git a/pkgs/desktops/gnome-3/apps/gnome-todo/default.nix b/pkgs/desktops/gnome-3/apps/gnome-todo/default.nix index d837ce3968e4..d1e43e0a13ee 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-todo/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-todo/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , fetchpatch , meson @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Personal task manager for GNOME"; homepage = "https://wiki.gnome.org/Apps/Todo"; license = licenses.gpl3Plus; diff --git a/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix b/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix index 84be3f527434..3080db3f100f 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook, gjs, gobject-introspection +{ lib, stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook, gjs, gobject-introspection , libgweather, meson, ninja, geoclue2, gnome-desktop, python3, gsettings-desktop-schemas }: stdenv.mkDerivation rec { @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://wiki.gnome.org/Apps/Weather"; description = "Access current weather conditions and forecasts"; maintainers = teams.gnome.members; diff --git a/pkgs/desktops/gnome-3/apps/polari/default.nix b/pkgs/desktops/gnome-3/apps/polari/default.nix index c16b1f2ab124..6551d653e296 100644 --- a/pkgs/desktops/gnome-3/apps/polari/default.nix +++ b/pkgs/desktops/gnome-3/apps/polari/default.nix @@ -1,4 +1,4 @@ -{ stdenv, itstool, fetchurl, gdk-pixbuf, adwaita-icon-theme +{ lib, stdenv, itstool, fetchurl, gdk-pixbuf, adwaita-icon-theme , telepathy-glib, gjs, meson, ninja, gettext, telepathy-idle, libxml2, desktop-file-utils , pkgconfig, gtk3, glib, libsecret, libsoup, webkitgtk, gobject-introspection, appstream-glib , gnome3, wrapGAppsHook, telepathy-logger, gspell, gsettings-desktop-schemas }: @@ -44,7 +44,7 @@ in stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://wiki.gnome.org/Apps/Polari"; description = "IRC chat client designed to integrate with the GNOME desktop"; maintainers = teams.gnome.members; diff --git a/pkgs/desktops/gnome-3/apps/seahorse/default.nix b/pkgs/desktops/gnome-3/apps/seahorse/default.nix index 3cbd7a509fe4..355fd645b30b 100644 --- a/pkgs/desktops/gnome-3/apps/seahorse/default.nix +++ b/pkgs/desktops/gnome-3/apps/seahorse/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , fetchpatch , vala @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://wiki.gnome.org/Apps/Seahorse"; description = "Application for managing encryption keys and passwords in the GnomeKeyring"; maintainers = teams.gnome.members; diff --git a/pkgs/desktops/gnome-3/apps/vinagre/default.nix b/pkgs/desktops/gnome-3/apps/vinagre/default.nix index e04238b4b16f..7c02715df5e0 100644 --- a/pkgs/desktops/gnome-3/apps/vinagre/default.nix +++ b/pkgs/desktops/gnome-3/apps/vinagre/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, vte, libxml2, gtk-vnc, intltool +{ lib, stdenv, fetchurl, pkgconfig, gtk3, gnome3, vte, libxml2, gtk-vnc, intltool , libsecret, itstool, wrapGAppsHook, librsvg }: stdenv.mkDerivation rec { @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Remote desktop viewer for GNOME"; homepage = "https://wiki.gnome.org/Apps/Vinagre"; license = licenses.gpl2Plus; diff --git a/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix b/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix index fa489e7695c1..d7d1bad54c10 100644 --- a/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix +++ b/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gnome3 +{ lib, stdenv, fetchurl, pkgconfig, intltool, gnome3 , iconnamingutils, gtk3, gdk-pixbuf, librsvg, hicolor-icon-theme }: stdenv.mkDerivation rec { @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { platforms = with platforms; linux ++ darwin; maintainers = teams.gnome.members; }; diff --git a/pkgs/desktops/gnome-3/core/baobab/default.nix b/pkgs/desktops/gnome-3/core/baobab/default.nix index 274989bf3b86..68c96209623d 100644 --- a/pkgs/desktops/gnome-3/core/baobab/default.nix +++ b/pkgs/desktops/gnome-3/core/baobab/default.nix @@ -1,4 +1,4 @@ -{ stdenv, gettext, fetchurl, vala, desktop-file-utils +{ lib, stdenv, gettext, fetchurl, vala, desktop-file-utils , meson, ninja, pkgconfig, python3, gtk3, glib, libxml2 , wrapGAppsHook, itstool, gnome3 }: @@ -24,7 +24,7 @@ in stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Graphical application to analyse disk usage in any GNOME environment"; homepage = "https://wiki.gnome.org/Apps/DiskUsageAnalyzer"; license = licenses.gpl2; diff --git a/pkgs/desktops/gnome-3/core/caribou/default.nix b/pkgs/desktops/gnome-3/core/caribou/default.nix index b9da1ab1c163..f61490da1e0e 100644 --- a/pkgs/desktops/gnome-3/core/caribou/default.nix +++ b/pkgs/desktops/gnome-3/core/caribou/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, gnome3, glib, gtk3, clutter, dbus, python3, libxml2 +{ fetchurl, lib, stdenv, pkgconfig, gnome3, glib, gtk3, clutter, dbus, python3, libxml2 , libxklavier, libXtst, gtk2, intltool, libxslt, at-spi2-core, autoreconfHook , wrapGAppsHook, libgee }: @@ -44,7 +44,7 @@ in stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "An input assistive technology intended for switch and pointer users"; homepage = "https://wiki.gnome.org/Projects/Caribou"; license = licenses.lgpl21; diff --git a/pkgs/desktops/gnome-3/core/dconf-editor/default.nix b/pkgs/desktops/gnome-3/core/dconf-editor/default.nix index 00c9d3a4c905..3f128e7378bd 100644 --- a/pkgs/desktops/gnome-3/core/dconf-editor/default.nix +++ b/pkgs/desktops/gnome-3/core/dconf-editor/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, meson, ninja, vala, libxslt, pkgconfig, glib, gtk3, gnome3, python3, dconf +{ lib, stdenv, fetchurl, meson, ninja, vala, libxslt, pkgconfig, glib, gtk3, gnome3, python3, dconf , libxml2, gettext, docbook_xsl, wrapGAppsHook, gobject-introspection }: let @@ -31,7 +31,7 @@ in stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { platforms = platforms.linux; maintainers = teams.gnome.members; }; diff --git a/pkgs/desktops/gnome-3/core/empathy/default.nix b/pkgs/desktops/gnome-3/core/empathy/default.nix index ce5ca16eb745..bc4d67f3a73b 100644 --- a/pkgs/desktops/gnome-3/core/empathy/default.nix +++ b/pkgs/desktops/gnome-3/core/empathy/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , intltool , fetchurl , webkitgtk @@ -137,7 +137,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://wiki.gnome.org/Apps/Empathy"; description = "Messaging program which supports text, voice, video chat, and file transfers over many different protocols"; maintainers = teams.gnome.members; diff --git a/pkgs/desktops/gnome-3/core/eog/default.nix b/pkgs/desktops/gnome-3/core/eog/default.nix index fb1b5f50c0e7..20c126a6284c 100644 --- a/pkgs/desktops/gnome-3/core/eog/default.nix +++ b/pkgs/desktops/gnome-3/core/eog/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , meson , ninja @@ -85,7 +85,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "GNOME image viewer"; homepage = "https://wiki.gnome.org/Apps/EyeOfGnome"; license = licenses.gpl2Plus; diff --git a/pkgs/desktops/gnome-3/core/epiphany/default.nix b/pkgs/desktops/gnome-3/core/epiphany/default.nix index 4bbed000e433..7e47ec24af71 100644 --- a/pkgs/desktops/gnome-3/core/epiphany/default.nix +++ b/pkgs/desktops/gnome-3/core/epiphany/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , meson , ninja , gettext @@ -103,7 +103,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://wiki.gnome.org/Apps/Epiphany"; description = "WebKit based web browser for GNOME"; maintainers = teams.gnome.members; diff --git a/pkgs/desktops/gnome-3/core/evince/default.nix b/pkgs/desktops/gnome-3/core/evince/default.nix index a2c7c52a1ccd..51778f5e8a97 100644 --- a/pkgs/desktops/gnome-3/core/evince/default.nix +++ b/pkgs/desktops/gnome-3/core/evince/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , meson , ninja @@ -115,7 +115,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://wiki.gnome.org/Apps/Evince"; description = "GNOME's document viewer"; diff --git a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix index e52d466b0e4b..3415203dccc8 100644 --- a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix +++ b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, substituteAll, pkgconfig, gnome3, python3, gobject-introspection +{ fetchurl, lib, stdenv, substituteAll, pkgconfig, gnome3, python3, gobject-introspection , intltool, libsoup, libxml2, libsecret, icu, sqlite, tzdata, libcanberra-gtk3, gcr , p11-kit, db, nspr, nss, libical, gperf, wrapGAppsHook, glib-networking, pcre , vala, cmake, ninja, kerberos, openldap, webkitgtk, libaccounts-glib, json-glib @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Unified backend for programs that work with contacts, tasks, and calendar information"; homepage = "https://wiki.gnome.org/Apps/Evolution"; license = licenses.lgpl2; diff --git a/pkgs/desktops/gnome-3/core/gdm/default.nix b/pkgs/desktops/gnome-3/core/gdm/default.nix index 10130be57da0..cda062378f72 100644 --- a/pkgs/desktops/gnome-3/core/gdm/default.nix +++ b/pkgs/desktops/gnome-3/core/gdm/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , fetchpatch , substituteAll @@ -172,7 +172,7 @@ stdenv.mkDerivation rec { initialVT = "7"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A program that manages graphical display servers and handles graphical user logins"; homepage = "https://wiki.gnome.org/Projects/GDM"; license = licenses.gpl2Plus; diff --git a/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix b/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix index 8df32a1486eb..ed8e513f8d3e 100644 --- a/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig, gnome3, gettext }: +{ lib, stdenv, fetchurl, meson, ninja, pkgconfig, gnome3, gettext }: stdenv.mkDerivation rec { pname = "gnome-backgrounds"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkgconfig gettext ]; - meta = with stdenv.lib; { + meta = with lib; { platforms = platforms.unix; maintainers = teams.gnome.members; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix b/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix index fa5b5abf0ffd..9a1c7289810a 100644 --- a/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gnome3, meson, ninja, pkgconfig, gtk3, intltool, glib +{ lib, stdenv, fetchurl, gnome3, meson, ninja, pkgconfig, gtk3, intltool, glib , udev, itstool, libxml2, wrapGAppsHook, libnotify, libcanberra-gtk3, gobject-introspection , gtk-doc, docbook_xsl, docbook_xml_dtd_43, python3, gsettings-desktop-schemas }: @@ -42,7 +42,7 @@ in stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://help.gnome.org/users/gnome-bluetooth/stable/index.html.en"; description = "Application that let you manage Bluetooth in the GNOME destkop"; maintainers = teams.gnome.members; diff --git a/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix b/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix index 2f22fd86a6f6..8af32c9208a4 100644 --- a/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix @@ -1,4 +1,4 @@ -{ stdenv, meson, ninja, vala, gettext, itstool, fetchurl, pkgconfig, libxml2 +{ lib, stdenv, meson, ninja, vala, gettext, itstool, fetchurl, pkgconfig, libxml2 , gtk3, glib, gtksourceview4, wrapGAppsHook, gobject-introspection, python3 , gnome3, mpfr, gmp, libsoup, libmpc, gsettings-desktop-schemas, libgee }: @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://wiki.gnome.org/Apps/Calculator"; description = "Application that solves mathematical equations and is suitable as a default application in a Desktop environment"; maintainers = teams.gnome.members; diff --git a/pkgs/desktops/gnome-3/core/gnome-color-manager/default.nix b/pkgs/desktops/gnome-3/core/gnome-color-manager/default.nix index 69655e2364d3..305163179aae 100644 --- a/pkgs/desktops/gnome-3/core/gnome-color-manager/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-color-manager/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , meson , ninja @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A set of graphical utilities for color management to be used in the GNOME desktop"; license = licenses.gpl2Plus; maintainers = teams.gnome.members; diff --git a/pkgs/desktops/gnome-3/core/gnome-common/default.nix b/pkgs/desktops/gnome-3/core/gnome-common/default.nix index fb0b0f875440..ba2fcb39979b 100644 --- a/pkgs/desktops/gnome-3/core/gnome-common/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-common/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, which, gnome3, autoconf, automake }: +{ lib, stdenv, fetchurl, which, gnome3, autoconf, automake }: stdenv.mkDerivation rec { pname = "gnome-common"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ which autoconf automake ]; # autogen.sh which is using gnome-common tends to require which - meta = with stdenv.lib; { + meta = with lib; { maintainers = teams.gnome.members; }; } diff --git a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix index 7e7730d9f6b2..a6cb63de23c4 100644 --- a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , gettext , fetchurl , evolution-data-server @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://wiki.gnome.org/Apps/Contacts"; description = "GNOME’s integrated address book"; maintainers = teams.gnome.members; diff --git a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix index 1300f7a75035..18bcc8e2e891 100644 --- a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix @@ -1,7 +1,7 @@ { fetchurl , fetchFromGitLab , fetchpatch -, stdenv +, lib, stdenv , substituteAll , accountsservice , adwaita-icon-theme @@ -188,7 +188,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Utilities to configure the GNOME desktop"; license = licenses.gpl2Plus; maintainers = teams.gnome.members; diff --git a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix index d7ce6c370c38..a818f23d086a 100644 --- a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, substituteAll, pkgconfig, libxslt, ninja, gnome3, gtk3, glib +{ lib, stdenv, fetchurl, substituteAll, pkgconfig, libxslt, ninja, gnome3, gtk3, glib , gettext, libxml2, xkeyboard_config, isocodes, meson, wayland , libseccomp, systemd, bubblewrap, gobject-introspection, gtk-doc, docbook_xsl, gsettings-desktop-schemas }: @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Library with common API for various GNOME modules"; license = with licenses; [ gpl2 lgpl2 ]; platforms = platforms.linux; diff --git a/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix b/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix index 02941743f556..51382ad4caea 100644 --- a/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, meson, ninja, pkgconfig, desktop-file-utils, appstream-glib, libxslt +{ lib, stdenv, fetchurl, fetchpatch, meson, ninja, pkgconfig, desktop-file-utils, appstream-glib, libxslt , libxml2, gettext, itstool, wrapGAppsHook, docbook_xsl, docbook_xml_dtd_43 , gnome3, gtk3, glib, gsettings-desktop-schemas }: @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://wiki.gnome.org/Apps/Dictionary"; description = "Dictionary is the GNOME application to look up definitions"; maintainers = teams.gnome.members; diff --git a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix b/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix index d4972fb0a291..db7e60bbafb5 100644 --- a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix @@ -1,4 +1,4 @@ -{ stdenv, gettext, fetchurl, pkgconfig, udisks2, libsecret, libdvdread +{ lib, stdenv, gettext, fetchurl, pkgconfig, udisks2, libsecret, libdvdread , meson, ninja, gtk3, glib, wrapGAppsHook, python3, libnotify , itstool, gnome3, libxml2, gsettings-desktop-schemas , libcanberra-gtk3, libxslt, docbook_xsl, libpwquality, systemd }: @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://en.wikipedia.org/wiki/GNOME_Disks"; description = "A udisks graphical front-end"; maintainers = teams.gnome.members; diff --git a/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix b/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix index d0ceef61c25a..2bae66d7d45a 100644 --- a/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, meson, ninja, gettext, fetchurl +{ lib, stdenv, meson, ninja, gettext, fetchurl , pkgconfig, gtk3, glib, libxml2, gnome-desktop, adwaita-icon-theme , wrapGAppsHook, gnome3, harfbuzz }: @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Program that can preview fonts and create thumbnails for fonts"; maintainers = teams.gnome.members; license = licenses.gpl2; diff --git a/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix b/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix index eba9ed1334f1..4f20910e20d3 100644 --- a/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , substituteAll , gettext @@ -101,7 +101,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Simple, easy, and safe way to prepare a new system"; homepage = "https://gitlab.gnome.org/GNOME/gnome-initial-setup"; license = licenses.gpl2Plus; diff --git a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix b/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix index 9ffd32e85f70..eeb03125a26f 100644 --- a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, dbus, libgcrypt, pam, python2, glib, libxslt +{ lib, stdenv, fetchurl, pkgconfig, dbus, libgcrypt, pam, python2, glib, libxslt , gettext, gcr, libcap_ng, libselinux, p11-kit, openssh, wrapGAppsHook , docbook_xsl, docbook_xml_dtd_43, gnome3 }: @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Collection of components in GNOME that store secrets, passwords, keys, certificates and make them available to applications"; homepage = "https://wiki.gnome.org/Projects/GnomeKeyring"; license = licenses.gpl2; diff --git a/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix b/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix index 9a940458679f..abc791acb090 100644 --- a/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , fetchpatch , autoconf-archive @@ -106,7 +106,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://wiki.gnome.org/Projects/GnomeOnlineMiners"; description = "A set of crawlers that go through your online content and index them locally in Tracker"; maintainers = teams.gnome.members; diff --git a/pkgs/desktops/gnome-3/core/gnome-remote-desktop/default.nix b/pkgs/desktops/gnome-3/core/gnome-remote-desktop/default.nix index 87c0d1efc84c..7e428688b925 100644 --- a/pkgs/desktops/gnome-3/core/gnome-remote-desktop/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-remote-desktop/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , cairo , meson @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { "-Dsystemd_user_unit_dir=${placeholder "out"}/lib/systemd/user" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://wiki.gnome.org/Projects/Mutter/RemoteDesktop"; description = "GNOME Remote Desktop server"; maintainers = teams.gnome.members; diff --git a/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix b/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix index 05bb189c0e29..f6aac0faf4a9 100644 --- a/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, gettext, libxml2, libhandy, fetchurl, pkgconfig, libcanberra-gtk3 +{ lib, stdenv, gettext, libxml2, libhandy, fetchurl, pkgconfig, libcanberra-gtk3 , gtk3, glib, meson, ninja, python3, wrapGAppsHook, appstream-glib, desktop-file-utils , gnome3, gsettings-desktop-schemas }: @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://en.wikipedia.org/wiki/GNOME_Screenshot"; description = "Utility used in the GNOME desktop environment for taking screenshots"; maintainers = teams.gnome.members; diff --git a/pkgs/desktops/gnome-3/core/gnome-session/ctl.nix b/pkgs/desktops/gnome-3/core/gnome-session/ctl.nix index 6bc18d5379f4..05d28de768a8 100644 --- a/pkgs/desktops/gnome-3/core/gnome-session/ctl.nix +++ b/pkgs/desktops/gnome-3/core/gnome-session/ctl.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , meson , ninja @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { systemd ]; - meta = with stdenv.lib; { + meta = with lib; { description = "gnome-session-ctl extracted from gnome-session for nixpkgs"; homepage = "https://github.com/nix-community/gnome-session-ctl"; license = licenses.gpl2Plus; diff --git a/pkgs/desktops/gnome-3/core/gnome-session/default.nix b/pkgs/desktops/gnome-3/core/gnome-session/default.nix index 4684f3ebee0b..ade6ef2bb349 100644 --- a/pkgs/desktops/gnome-3/core/gnome-session/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-session/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, substituteAll, meson, ninja, pkgconfig, gnome3, glib, gtk3, gsettings-desktop-schemas +{ fetchurl, lib, stdenv, substituteAll, meson, ninja, pkgconfig, gnome3, glib, gtk3, gsettings-desktop-schemas , gnome-desktop, dbus, json-glib, libICE, xmlto, docbook_xsl, docbook_xml_dtd_412, python3 , libxslt, gettext, makeWrapper, systemd, xorg, epoxy, gnugrep, bash, gnome-session-ctl }: @@ -80,7 +80,7 @@ stdenv.mkDerivation rec { providedSessions = [ "gnome" "gnome-xorg" ]; }; - meta = with stdenv.lib; { + meta = with lib; { description = "GNOME session manager"; homepage = "https://wiki.gnome.org/Projects/SessionManagement"; license = licenses.gpl2Plus; diff --git a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix index 3c039bc63108..45250086f1d0 100644 --- a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchpatch , substituteAll , fetchurl @@ -125,7 +125,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { license = licenses.gpl2Plus; maintainers = teams.gnome.members; platforms = platforms.linux; diff --git a/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix index 2d07f90a16c8..b5d230090451 100644 --- a/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, meson, ninja, gettext, pkgconfig, spidermonkey_68, glib +{ lib, stdenv, fetchurl, meson, ninja, gettext, pkgconfig, spidermonkey_68, glib , gnome3, gnome-menus, substituteAll }: stdenv.mkDerivation rec { @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://wiki.gnome.org/Projects/GnomeShell/Extensions"; description = "Modify and extend GNOME Shell functionality and behavior"; maintainers = teams.gnome.members; diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix index 53b9bc5d7382..b7dfb90841f9 100644 --- a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix @@ -1,7 +1,7 @@ { fetchurl , fetchpatch , substituteAll -, stdenv +, lib, stdenv , meson , ninja , pkg-config @@ -200,7 +200,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Core user interface for the GNOME 3 desktop"; homepage = "https://wiki.gnome.org/Projects/GnomeShell"; license = licenses.gpl2Plus; diff --git a/pkgs/desktops/gnome-3/core/gnome-software/default.nix b/pkgs/desktops/gnome-3/core/gnome-software/default.nix index 71744ab84a3c..b3a8b2c7d3a7 100644 --- a/pkgs/desktops/gnome-3/core/gnome-software/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-software/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, substituteAll, pkgconfig, meson, ninja, gettext, gnome3, wrapGAppsHook, packagekit, ostree +{ lib, stdenv, fetchurl, substituteAll, pkgconfig, meson, ninja, gettext, gnome3, wrapGAppsHook, packagekit, ostree , glib, appstream-glib, libsoup, polkit, isocodes, gspell, libxslt, gobject-introspection, flatpak, fwupd , gtk3, gsettings-desktop-schemas, gnome-desktop, libxmlb, gnome-online-accounts , json-glib, libsecret, valgrind-light, docbook_xsl, docbook_xml_dtd_42, docbook_xml_dtd_43, gtk-doc, desktop-file-utils @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Software store that lets you install and update applications and system extensions"; homepage = "https://wiki.gnome.org/Apps/Software"; license = licenses.gpl2; diff --git a/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix b/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix index d9e652de5f6d..7675e1be864d 100644 --- a/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix @@ -1,4 +1,4 @@ -{ stdenv, gettext, fetchurl, pkgconfig, gtkmm3, libxml2 +{ lib, stdenv, gettext, fetchurl, pkgconfig, gtkmm3, libxml2 , bash, gtk3, glib, wrapGAppsHook, meson, ninja, python3 , gsettings-desktop-schemas, itstool, gnome3, librsvg, gdk-pixbuf, libgtop, systemd }: @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://wiki.gnome.org/Apps/SystemMonitor"; description = "System Monitor shows you what programs are running and how much processor time, memory, and disk space are being used"; maintainers = teams.gnome.members; diff --git a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix index 8c8cc88301d8..e88d6f8fa40d 100644 --- a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libxml2, gnome3, dconf, nautilus +{ lib, stdenv, fetchurl, pkgconfig, libxml2, gnome3, dconf, nautilus , gtk3, gsettings-desktop-schemas, vte, gettext, which, libuuid, vala , desktop-file-utils, itstool, wrapGAppsHook, glib, pcre2 , libxslt, docbook-xsl-nons }: @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "The GNOME Terminal Emulator"; homepage = "https://wiki.gnome.org/Apps/Terminal"; platforms = platforms.linux; diff --git a/pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix b/pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix index fa2f4921fd91..8207c8322ff4 100644 --- a/pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, intltool, gtk3, gnome3, librsvg, pkgconfig, pango, atk, gtk2 +{ lib, stdenv, fetchurl, intltool, gtk3, gnome3, librsvg, pkgconfig, pango, atk, gtk2 , gdk-pixbuf, hicolor-icon-theme }: let @@ -28,7 +28,7 @@ in stdenv.mkDerivation rec { gtk-update-icon-cache "$out"/share/icons/HighContrast ''; - meta = with stdenv.lib; { + meta = with lib; { platforms = platforms.linux; maintainers = teams.gnome.members; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-tour/default.nix b/pkgs/desktops/gnome-3/core/gnome-tour/default.nix index ec2007e0ee4a..606dda723bb3 100644 --- a/pkgs/desktops/gnome-3/core/gnome-tour/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-tour/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , rustPlatform , gettext , meson @@ -65,7 +65,7 @@ rustPlatform.buildRustPackage rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://gitlab.gnome.org/GNOME/gnome-tour"; description = "GNOME Greeter & Tour"; maintainers = teams.gnome.members; diff --git a/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix b/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix index 90acee076a34..d2f2a6242bfb 100644 --- a/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , gettext , meson , ninja @@ -86,7 +86,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://help.gnome.org/users/gnome-user-share/3.8"; description = "Service that exports the contents of the Public folder in your home directory on the local network"; maintainers = teams.gnome.members; diff --git a/pkgs/desktops/gnome-3/core/gucharmap/default.nix b/pkgs/desktops/gnome-3/core/gucharmap/default.nix index fe24ac8708a0..bbb271004ac4 100644 --- a/pkgs/desktops/gnome-3/core/gucharmap/default.nix +++ b/pkgs/desktops/gnome-3/core/gucharmap/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , intltool , fetchFromGitLab , meson @@ -98,7 +98,7 @@ in stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "GNOME Character Map, based on the Unicode Character Database"; homepage = "https://wiki.gnome.org/Apps/Gucharmap"; license = licenses.gpl3; diff --git a/pkgs/desktops/gnome-3/core/mutter/3.34/default.nix b/pkgs/desktops/gnome-3/core/mutter/3.34/default.nix index 6afded766716..4e81ae03f85d 100644 --- a/pkgs/desktops/gnome-3/core/mutter/3.34/default.nix +++ b/pkgs/desktops/gnome-3/core/mutter/3.34/default.nix @@ -1,7 +1,7 @@ { fetchurl , fetchpatch , substituteAll -, stdenv +, lib, stdenv , pkgconfig , gnome3 , pantheon @@ -124,7 +124,7 @@ stdenv.mkDerivation rec { ${glib.dev}/bin/glib-compile-schemas "$out/share/glib-2.0/schemas" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A window manager for GNOME"; homepage = "https://gitlab.gnome.org/GNOME/mutter"; license = licenses.gpl2; diff --git a/pkgs/desktops/gnome-3/core/mutter/default.nix b/pkgs/desktops/gnome-3/core/mutter/default.nix index 7f26e615a1cf..673966e720dc 100644 --- a/pkgs/desktops/gnome-3/core/mutter/default.nix +++ b/pkgs/desktops/gnome-3/core/mutter/default.nix @@ -2,7 +2,7 @@ , fetchpatch , substituteAll , runCommand -, stdenv +, lib, stdenv , pkgconfig , gnome3 , gettext @@ -146,7 +146,7 @@ let self = stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A window manager for GNOME"; homepage = "https://gitlab.gnome.org/GNOME/mutter"; license = licenses.gpl2; diff --git a/pkgs/desktops/gnome-3/core/nautilus/default.nix b/pkgs/desktops/gnome-3/core/nautilus/default.nix index 79334e5b1949..682740b22bc0 100644 --- a/pkgs/desktops/gnome-3/core/nautilus/default.nix +++ b/pkgs/desktops/gnome-3/core/nautilus/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , meson , ninja @@ -104,7 +104,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "The file manager for GNOME"; homepage = "https://wiki.gnome.org/Apps/Files"; license = licenses.gpl3Plus; diff --git a/pkgs/desktops/gnome-3/core/rygel/default.nix b/pkgs/desktops/gnome-3/core/rygel/default.nix index f7ce3387fc07..bf821f31f903 100644 --- a/pkgs/desktops/gnome-3/core/rygel/default.nix +++ b/pkgs/desktops/gnome-3/core/rygel/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , meson , ninja @@ -99,7 +99,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A home media solution (UPnP AV MediaServer) that allows you to easily share audio, video and pictures to other devices"; homepage = "https://wiki.gnome.org/Projects/Rygel"; license = licenses.lgpl21Plus; diff --git a/pkgs/desktops/gnome-3/core/simple-scan/default.nix b/pkgs/desktops/gnome-3/core/simple-scan/default.nix index 66846876faef..d2d31ada0f8f 100644 --- a/pkgs/desktops/gnome-3/core/simple-scan/default.nix +++ b/pkgs/desktops/gnome-3/core/simple-scan/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , meson , ninja @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Simple scanning utility"; longDescription = '' A really easy way to scan both documents and photos. You can crop out the diff --git a/pkgs/desktops/gnome-3/core/sushi/default.nix b/pkgs/desktops/gnome-3/core/sushi/default.nix index f0ddaef081b3..2363b921cd7f 100644 --- a/pkgs/desktops/gnome-3/core/sushi/default.nix +++ b/pkgs/desktops/gnome-3/core/sushi/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , pkgconfig , meson @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://en.wikipedia.org/wiki/Sushi_(software)"; description = "A quick previewer for Nautilus"; maintainers = teams.gnome.members; diff --git a/pkgs/desktops/gnome-3/core/totem/default.nix b/pkgs/desktops/gnome-3/core/totem/default.nix index 58ee706b1cfc..03da54a1353c 100644 --- a/pkgs/desktops/gnome-3/core/totem/default.nix +++ b/pkgs/desktops/gnome-3/core/totem/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , meson , ninja @@ -113,7 +113,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://wiki.gnome.org/Apps/Videos"; description = "Movie player for the GNOME desktop based on GStreamer"; maintainers = teams.gnome.members; diff --git a/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix b/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix index a29a292b3d74..912914488830 100644 --- a/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix +++ b/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , gettext , fetchurl , pkgconfig @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://wiki.gnome.org/Apps/Yelp"; description = "Yelp's universal stylesheets for Mallard and DocBook"; maintainers = teams.gnome.members; diff --git a/pkgs/desktops/gnome-3/core/yelp/default.nix b/pkgs/desktops/gnome-3/core/yelp/default.nix index 147809de9ef6..3b382a714247 100644 --- a/pkgs/desktops/gnome-3/core/yelp/default.nix +++ b/pkgs/desktops/gnome-3/core/yelp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, gettext, fetchurl, webkitgtk, pkgconfig, gtk3, glib +{ lib, stdenv, gettext, fetchurl, webkitgtk, pkgconfig, gtk3, glib , gnome3, sqlite , itstool, libxml2, libxslt, gst_all_1 , wrapGAppsHook }: @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://wiki.gnome.org/Apps/Yelp"; description = "The help viewer in Gnome"; maintainers = teams.gnome.members; diff --git a/pkgs/desktops/gnome-3/core/zenity/default.nix b/pkgs/desktops/gnome-3/core/zenity/default.nix index 5750fa0d001c..6c6493a42e82 100644 --- a/pkgs/desktops/gnome-3/core/zenity/default.nix +++ b/pkgs/desktops/gnome-3/core/zenity/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , pkgconfig , libxml2 @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Tool to display dialogs from the commandline and shell scripts"; homepage = "https://wiki.gnome.org/Projects/Zenity"; platforms = platforms.linux; diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index 302ad2c21aa9..2bc825d81490 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -264,7 +264,9 @@ lib.makeScope pkgs.newScope (self: with self; { gnome-flashback = callPackage ./misc/gnome-flashback { }; - gnome-panel = callPackage ./misc/gnome-panel { }; + gnome-panel = callPackage ./misc/gnome-panel { + autoreconfHook = pkgs.autoreconfHook269; + }; gnome-tweaks = callPackage ./misc/gnome-tweaks { }; diff --git a/pkgs/desktops/gnome-3/devtools/anjuta/default.nix b/pkgs/desktops/gnome-3/devtools/anjuta/default.nix index efd36d4d4aff..0a7975c03ca2 100644 --- a/pkgs/desktops/gnome-3/devtools/anjuta/default.nix +++ b/pkgs/desktops/gnome-3/devtools/anjuta/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, gjs, flex, bison, libxml2, intltool, +{ lib, stdenv, fetchurl, pkgconfig, gnome3, gtk3, gjs, flex, bison, libxml2, intltool, gdl, libgda, gtksourceview, gsettings-desktop-schemas, itstool, python3, ncurses, makeWrapper }: @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { "$GSETTINGS_SCHEMAS_PATH" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Software development studio"; homepage = "http://anjuta.org/"; license = licenses.gpl2; diff --git a/pkgs/desktops/gnome-3/devtools/devhelp/default.nix b/pkgs/desktops/gnome-3/devtools/devhelp/default.nix index 7de22f693d6c..5f714827e0b1 100644 --- a/pkgs/desktops/gnome-3/devtools/devhelp/default.nix +++ b/pkgs/desktops/gnome-3/devtools/devhelp/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , meson , ninja @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "API documentation browser for GNOME"; homepage = "https://wiki.gnome.org/Apps/Devhelp"; license = licenses.gpl3Plus; diff --git a/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix b/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix index a3a69eb4e349..115d9f289cfa 100644 --- a/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix +++ b/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gnome3, intltool, itstool, libxml2 }: +{ lib, stdenv, fetchurl, gnome3, intltool, itstool, libxml2 }: stdenv.mkDerivation rec { pname = "gnome-devel-docs"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ intltool itstool libxml2 ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/GNOME/gnome-devel-docs"; description = "Developer documentation for GNOME"; maintainers = teams.gnome.members; diff --git a/pkgs/desktops/gnome-3/extensions/EasyScreenCast/default.nix b/pkgs/desktops/gnome-3/extensions/EasyScreenCast/default.nix index 523dbc622f08..fa1d89173fdd 100644 --- a/pkgs/desktops/gnome-3/extensions/EasyScreenCast/default.nix +++ b/pkgs/desktops/gnome-3/extensions/EasyScreenCast/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, substituteAll, glib, gnome3, gettext }: +{ lib, stdenv, fetchFromGitHub, substituteAll, glib, gnome3, gettext }: stdenv.mkDerivation rec { pname = "gnome-shell-extension-EasyScreenCast"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { uuid = "EasyScreenCast@iacopodeenosee.gmail.com"; - meta = with stdenv.lib; { + meta = with lib; { description = "Simplifies the use of the video recording function integrated in gnome shell"; homepage = "https://github.com/EasyScreenCast/EasyScreenCast"; license = licenses.gpl3Plus; diff --git a/pkgs/desktops/gnome-3/extensions/appindicator/default.nix b/pkgs/desktops/gnome-3/extensions/appindicator/default.nix index 0638241df53b..f5dae739ea47 100644 --- a/pkgs/desktops/gnome-3/extensions/appindicator/default.nix +++ b/pkgs/desktops/gnome-3/extensions/appindicator/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gnome3 }: +{ lib, stdenv, fetchFromGitHub, gnome3 }: stdenv.mkDerivation rec { pname = "gnome-shell-extension-appindicator"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "AppIndicator/KStatusNotifierItem support for GNOME Shell"; license = licenses.gpl2Plus; maintainers = with maintainers; [ jonafato ]; diff --git a/pkgs/desktops/gnome-3/extensions/arc-menu/default.nix b/pkgs/desktops/gnome-3/extensions/arc-menu/default.nix index 336820b7938e..58f1836a132a 100644 --- a/pkgs/desktops/gnome-3/extensions/arc-menu/default.nix +++ b/pkgs/desktops/gnome-3/extensions/arc-menu/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, glib, gettext, substituteAll, gnome-menus }: +{ lib, stdenv, fetchFromGitLab, glib, gettext, substituteAll, gnome-menus }: stdenv.mkDerivation rec { pname = "gnome-shell-arc-menu"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { uuid = "arc-menu@linxgem33.com"; - meta = with stdenv.lib; { + meta = with lib; { description = "Gnome shell extension designed to replace the standard menu found in Gnome 3"; license = licenses.gpl2Plus; maintainers = with maintainers; [ dkabot ]; diff --git a/pkgs/desktops/gnome-3/extensions/caffeine/default.nix b/pkgs/desktops/gnome-3/extensions/caffeine/default.nix index 1dbb52e856a8..41155391f89c 100644 --- a/pkgs/desktops/gnome-3/extensions/caffeine/default.nix +++ b/pkgs/desktops/gnome-3/extensions/caffeine/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, glib, gettext, bash, gnome3 }: +{ lib, stdenv, fetchFromGitHub, glib, gettext, bash, gnome3 }: stdenv.mkDerivation rec { pname = "gnome-shell-extension-caffeine"; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Fill the cup to inhibit auto suspend and screensaver"; license = licenses.gpl2; maintainers = with maintainers; [ eperuffo ]; diff --git a/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix b/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix index 5308d4bee5ac..f6adf85de4d0 100644 --- a/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix +++ b/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , cmake , ninja @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "GNOME Shell integration for Chrome"; homepage = "https://wiki.gnome.org/Projects/GnomeShellIntegrationForChrome"; longDescription = '' diff --git a/pkgs/desktops/gnome-3/extensions/clipboard-indicator/default.nix b/pkgs/desktops/gnome-3/extensions/clipboard-indicator/default.nix index dbeb08af224e..ee64fc5113d0 100644 --- a/pkgs/desktops/gnome-3/extensions/clipboard-indicator/default.nix +++ b/pkgs/desktops/gnome-3/extensions/clipboard-indicator/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "gnome-shell-extension-clipboard-indicator"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Adds a clipboard indicator to the top panel and saves clipboard history"; license = licenses.mit; maintainers = with maintainers; [ jonafato ]; diff --git a/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix b/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix index 59d9319eb54a..45233e52f893 100644 --- a/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix +++ b/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , glib , gettext @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { uuid = "dash-to-dock@micxgx.gmail.com"; - meta = with stdenv.lib; { + meta = with lib; { description = "A dock for the Gnome Shell"; homepage = "https://micheleg.github.io/dash-to-dock/"; license = licenses.gpl2; diff --git a/pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix b/pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix index 923faa00a149..7a9dc066cc77 100644 --- a/pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix +++ b/pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, glib, gettext }: +{ lib, stdenv, fetchFromGitHub, glib, gettext }: stdenv.mkDerivation rec { pname = "gnome-shell-dash-to-panel"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { uuid = "dash-to-panel@jderose9.github.com"; - meta = with stdenv.lib; { + meta = with lib; { description = "An icon taskbar for Gnome Shell"; license = licenses.gpl2; maintainers = with maintainers; [ mounium ]; diff --git a/pkgs/desktops/gnome-3/extensions/draw-on-your-screen/default.nix b/pkgs/desktops/gnome-3/extensions/draw-on-your-screen/default.nix index 5e6f7b89e1d9..0e0dab64be16 100644 --- a/pkgs/desktops/gnome-3/extensions/draw-on-your-screen/default.nix +++ b/pkgs/desktops/gnome-3/extensions/draw-on-your-screen/default.nix @@ -1,13 +1,13 @@ -{ stdenv, fetchgit, gettext, gnome3 }: +{ lib, stdenv, fetchgit, gettext, gnome3 }: stdenv.mkDerivation rec { pname = "gnome-shell-extension-draw-on-your-screen"; - version = "6"; + version = "10"; src = fetchgit { url = "https://framagit.org/abakkk/DrawOnYourScreen/"; rev = "v${version}"; - sha256 = "05i20ii8lv6mg56rz8lng80dx35l6g45j8wr7jgbp591hg0spj1w"; + sha256 = "07adzg3mf6k0pmd9lc358w0w3l4pr3p6374day1qhmci2p4zxq6p"; }; uuid = "drawOnYourScreen@abakkk.framagit.org"; @@ -19,10 +19,10 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A drawing extension for GNOME Shell"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ ericdallo ]; + maintainers = with maintainers; [ ericdallo ahuzik ]; platforms = gnome3.gnome-shell.meta.platforms; homepage = "https://framagit.org/abakkk/DrawOnYourScreen"; }; diff --git a/pkgs/desktops/gnome-3/extensions/drop-down-terminal/default.nix b/pkgs/desktops/gnome-3/extensions/drop-down-terminal/default.nix index 3c6d181178b4..8cd567a590db 100644 --- a/pkgs/desktops/gnome-3/extensions/drop-down-terminal/default.nix +++ b/pkgs/desktops/gnome-3/extensions/drop-down-terminal/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, substituteAll, gjs, vte, gnome3 }: +{ lib, stdenv, fetchFromGitHub, substituteAll, gjs, vte, gnome3 }: stdenv.mkDerivation rec { pname = "gnome-shell-extension-drop-down-terminal"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Configurable drop down terminal shell"; license = licenses.gpl3; maintainers = with maintainers; [ ericdallo ]; diff --git a/pkgs/desktops/gnome-3/extensions/emoji-selector/default.nix b/pkgs/desktops/gnome-3/extensions/emoji-selector/default.nix index c4db4702193a..5470dc996be0 100644 --- a/pkgs/desktops/gnome-3/extensions/emoji-selector/default.nix +++ b/pkgs/desktops/gnome-3/extensions/emoji-selector/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, glib, gettext }: +{ lib, stdenv, fetchFromGitHub, glib, gettext }: stdenv.mkDerivation rec { pname = "gnome-shell-emoji-selector"; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "GNOME Shell extension providing a searchable popup menu displaying most emojis"; license = licenses.gpl3Plus; diff --git a/pkgs/desktops/gnome-3/extensions/freon/default.nix b/pkgs/desktops/gnome-3/extensions/freon/default.nix index 5224e4863ae2..f30e2f6f8a25 100644 --- a/pkgs/desktops/gnome-3/extensions/freon/default.nix +++ b/pkgs/desktops/gnome-3/extensions/freon/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, glib }: +{ lib, stdenv, fetchFromGitHub, glib }: stdenv.mkDerivation rec { pname = "gnome-shell-freon"; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "GNOME Shell extension for displaying CPU, GPU, disk temperatures, voltage and fan RPM in the top panel"; license = licenses.gpl2; maintainers = with maintainers; [ justinas ]; diff --git a/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix b/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix index d85efd0a4da4..abb9d9d1bb3b 100644 --- a/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix +++ b/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , substituteAll , openssl @@ -107,7 +107,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "KDE Connect implementation for Gnome Shell"; homepage = "https://github.com/andyholmes/gnome-shell-extension-gsconnect/wiki"; license = licenses.gpl2Plus; diff --git a/pkgs/desktops/gnome-3/extensions/icon-hider/default.nix b/pkgs/desktops/gnome-3/extensions/icon-hider/default.nix index 844c8ad84d79..00c67421e54a 100644 --- a/pkgs/desktops/gnome-3/extensions/icon-hider/default.nix +++ b/pkgs/desktops/gnome-3/extensions/icon-hider/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gnome3 }: +{ lib, stdenv, fetchFromGitHub, gnome3 }: stdenv.mkDerivation rec { pname = "gnome-shell-extension-icon-hider"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Icon Hider is a GNOME Shell extension for managing status area items"; license = licenses.bsd3; maintainers = with maintainers; [ jonafato ]; diff --git a/pkgs/desktops/gnome-3/extensions/impatience/default.nix b/pkgs/desktops/gnome-3/extensions/impatience/default.nix index 073a4301cc5e..82551efef3c7 100644 --- a/pkgs/desktops/gnome-3/extensions/impatience/default.nix +++ b/pkgs/desktops/gnome-3/extensions/impatience/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, glib }: +{ lib, stdenv, fetchFromGitHub, glib }: stdenv.mkDerivation rec { pname = "gnome-shell-impatience"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { uuid = "impatience@gfxmonk.net"; - meta = with stdenv.lib; { + meta = with lib; { description = "Speed up builtin gnome-shell animations"; license = licenses.gpl3Plus; maintainers = with maintainers; [ timbertson tiramiseb ]; diff --git a/pkgs/desktops/gnome-3/extensions/material-shell/default.nix b/pkgs/desktops/gnome-3/extensions/material-shell/default.nix index 1b8341a281f8..87b9a3c1507c 100644 --- a/pkgs/desktops/gnome-3/extensions/material-shell/default.nix +++ b/pkgs/desktops/gnome-3/extensions/material-shell/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gnome-shell-extension-material-shell"; - version = "10"; + version = "12"; src = fetchFromGitHub { owner = "material-shell"; repo = "material-shell"; rev = version; - sha256 = "18d813n8s7ns8xp75zmlna7a8mi23rn9yqps51xvdd0sdgn72a1c"; + sha256 = "0ikrh70drwr0pqjcdz7l1ky8xllpnk7myprjd4s61nqkx9j2iz44"; }; # This package has a Makefile, but it's used for building a zip for @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { uuid = "material-shell@papyelgringo"; - meta = with stdenv.lib; { + meta = with lib; { description = "A modern desktop interface for Linux"; license = licenses.mit; maintainers = with maintainers; [ benley ]; diff --git a/pkgs/desktops/gnome-3/extensions/mpris-indicator-button/default.nix b/pkgs/desktops/gnome-3/extensions/mpris-indicator-button/default.nix index 4bf4b7508176..9ab2168d2dca 100644 --- a/pkgs/desktops/gnome-3/extensions/mpris-indicator-button/default.nix +++ b/pkgs/desktops/gnome-3/extensions/mpris-indicator-button/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , nix-update-script , gnome3 @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { }; - meta = with stdenv.lib; { + meta = with lib; { description = "A simple MPRIS indicator button for GNOME Shell"; license = licenses.gpl3; maintainers = with maintainers; [ worldofpeace ]; 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 f170a2fb1907..6c1d6512adc6 100644 --- a/pkgs/desktops/gnome-3/extensions/night-theme-switcher/default.nix +++ b/pkgs/desktops/gnome-3/extensions/night-theme-switcher/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, glib, gnome3, unzip }: +{ lib, stdenv, fetchFromGitLab, glib, gnome3, unzip }: stdenv.mkDerivation rec { pname = "gnome-shell-extension-night-theme-switcher"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Automatically change the GTK theme to dark variant when Night Light activates"; license = licenses.gpl3; maintainers = with maintainers; [ jonafato ]; diff --git a/pkgs/desktops/gnome-3/extensions/no-title-bar/default.nix b/pkgs/desktops/gnome-3/extensions/no-title-bar/default.nix index 25ef7ddf8279..7d143a061f68 100644 --- a/pkgs/desktops/gnome-3/extensions/no-title-bar/default.nix +++ b/pkgs/desktops/gnome-3/extensions/no-title-bar/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, substituteAll, glib, gettext, xorg }: +{ lib, stdenv, fetchFromGitHub, substituteAll, glib, gettext, xorg }: stdenv.mkDerivation rec { pname = "gnome-shell-extension-no-title-bar"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { uuid = "no-title-bar@franglais125.gmail.com"; - meta = with stdenv.lib; { + meta = with lib; { description = "Integrates maximized windows with the top panel"; homepage = "https://github.com/franglais125/no-title-bar"; license = licenses.gpl2; diff --git a/pkgs/desktops/gnome-3/extensions/paperwm/default.nix b/pkgs/desktops/gnome-3/extensions/paperwm/default.nix index 382f8aa732b9..201628b4b424 100644 --- a/pkgs/desktops/gnome-3/extensions/paperwm/default.nix +++ b/pkgs/desktops/gnome-3/extensions/paperwm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "gnome-shell-extension-paperwm"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Tiled scrollable window management for Gnome Shell"; homepage = "https://github.com/paperwm/PaperWM"; license = licenses.gpl3; diff --git a/pkgs/desktops/gnome-3/extensions/pidgin-im-integration/default.nix b/pkgs/desktops/gnome-3/extensions/pidgin-im-integration/default.nix index dfcfd63b59db..d16477403474 100644 --- a/pkgs/desktops/gnome-3/extensions/pidgin-im-integration/default.nix +++ b/pkgs/desktops/gnome-3/extensions/pidgin-im-integration/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, glib, gnome3 }: +{ lib, stdenv, fetchFromGitHub, glib, gnome3 }: stdenv.mkDerivation rec { pname = "gnome-shell-extension-pidgin-im-integration"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { uuid = "pidgin@muffinmad"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/muffinmad/pidgin-im-gnome-shell-extension"; description = "Make Pidgin IM conversations appear in the Gnome Shell message tray"; license = licenses.gpl2; diff --git a/pkgs/desktops/gnome-3/extensions/remove-dropdown-arrows/default.nix b/pkgs/desktops/gnome-3/extensions/remove-dropdown-arrows/default.nix index 6d6a04a386cc..e310f5dcf10c 100644 --- a/pkgs/desktops/gnome-3/extensions/remove-dropdown-arrows/default.nix +++ b/pkgs/desktops/gnome-3/extensions/remove-dropdown-arrows/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "gnome-shell-extension-remove-dropdown-arrows"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Remove dropdown arrows from GNOME Shell Menus"; license = licenses.gpl3; maintainers = with maintainers; [ jonafato ]; diff --git a/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/default.nix b/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/default.nix index 9f80fbe28cd7..a6444025ebbc 100644 --- a/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/default.nix +++ b/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , substituteAll , fetchFromGitHub , libpulseaudio @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "GNOME Shell extension adding audio device chooser to panel"; license = licenses.gpl3; maintainers = with maintainers; [ jtojnar ]; diff --git a/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix b/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix index 1b1da50b7fa7..77e3f48850d2 100644 --- a/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix +++ b/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix @@ -1,4 +1,4 @@ -{ stdenv, substituteAll, fetchpatch, fetchFromGitHub, glib, glib-networking, libgtop, gnome3 }: +{ lib, stdenv, substituteAll, fetchpatch, fetchFromGitHub, glib, glib-networking, libgtop, gnome3 }: stdenv.mkDerivation rec { pname = "gnome-shell-system-monitor"; @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { uuid = "system-monitor@paradoxxx.zero.gmail.com"; - meta = with stdenv.lib; { + meta = with lib; { description = "Display system informations in gnome shell status bar"; license = licenses.gpl3Plus; maintainers = with maintainers; [ tiramiseb ]; diff --git a/pkgs/desktops/gnome-3/extensions/taskwhisperer/default.nix b/pkgs/desktops/gnome-3/extensions/taskwhisperer/default.nix index a6f45e3b574c..0935bf521a4a 100644 --- a/pkgs/desktops/gnome-3/extensions/taskwhisperer/default.nix +++ b/pkgs/desktops/gnome-3/extensions/taskwhisperer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, substituteAll, fetchFromGitHub, taskwarrior, gettext, runtimeShell, gnome3 }: +{ lib, stdenv, substituteAll, fetchFromGitHub, taskwarrior, gettext, runtimeShell, gnome3 }: stdenv.mkDerivation rec { pname = "gnome-shell-extension-taskwhisperer"; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { }) ]; - meta = with stdenv.lib; { + meta = with lib; { description = "GNOME Shell TaskWarrior GUI"; license = licenses.gpl3Plus; maintainers = with maintainers; [ jonafato ]; diff --git a/pkgs/desktops/gnome-3/extensions/tilingnome/default.nix b/pkgs/desktops/gnome-3/extensions/tilingnome/default.nix index 57f5a9377baa..dcea4c69ff82 100644 --- a/pkgs/desktops/gnome-3/extensions/tilingnome/default.nix +++ b/pkgs/desktops/gnome-3/extensions/tilingnome/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { uuid = "tilingnome@rliang.github.com"; - meta = with stdenv.lib; { + meta = with lib; { description = "Tiling window management for GNOME Shell"; license = licenses.gpl2; maintainers = with maintainers; [ benley ]; diff --git a/pkgs/desktops/gnome-3/extensions/timepp/default.nix b/pkgs/desktops/gnome-3/extensions/timepp/default.nix index f1c53eda6bdf..94b8540c1bf3 100644 --- a/pkgs/desktops/gnome-3/extensions/timepp/default.nix +++ b/pkgs/desktops/gnome-3/extensions/timepp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gnome3 }: +{ lib, stdenv, fetchFromGitHub, gnome3 }: stdenv.mkDerivation rec { pname = "gnome-shell-extension-timepp"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A todo.txt manager, time tracker, timer, stopwatch, pomodoro, and alarms gnome-shell extension."; homepage = "https://github.com/zagortenay333/timepp__gnome"; license = licenses.gpl3; diff --git a/pkgs/desktops/gnome-3/extensions/topicons-plus/default.nix b/pkgs/desktops/gnome-3/extensions/topicons-plus/default.nix index 860a77d2856b..7b98e20ed29b 100644 --- a/pkgs/desktops/gnome-3/extensions/topicons-plus/default.nix +++ b/pkgs/desktops/gnome-3/extensions/topicons-plus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, glib, gnome3, gettext }: +{ lib, stdenv, fetchFromGitHub, glib, gnome3, gettext }: stdenv.mkDerivation rec { pname = "gnome-shell-extension-topicons-plus"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { uuid = "TopIcons@phocean.net"; - meta = with stdenv.lib; { + meta = with lib; { description = "Brings all icons back to the top panel, so that it's easier to keep track of apps running in the backround"; license = licenses.gpl2; maintainers = with maintainers; [ eperuffo ]; diff --git a/pkgs/desktops/gnome-3/extensions/unite-shell/default.nix b/pkgs/desktops/gnome-3/extensions/unite-shell/default.nix new file mode 100644 index 000000000000..add87c10f1ae --- /dev/null +++ b/pkgs/desktops/gnome-3/extensions/unite-shell/default.nix @@ -0,0 +1,39 @@ +{ stdenv, gnome3, fetchFromGitHub, xprop, glib, coreutils }: +stdenv.mkDerivation rec { + pname = "gnome-shell-extension-unite-shell"; + version = "44"; + + src = fetchFromGitHub { + owner = "hardpixel"; + repo = "unite-shell"; + rev = "v${version}"; + sha256 = "0nqc1q2yz4xa3fdfx45w6da1wijmdwzhdrch0mqwblgbpjr4fs9g"; + }; + + uuid = "unite@hardpixel.eu"; + + nativeBuildInputs = [ glib ]; + + buildInputs = [ xprop ]; + + buildPhase = '' + runHook preBuild + glib-compile-schemas --strict --targetdir=${uuid}/schemas/ ${uuid}/schemas + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/gnome-shell/extensions + cp -r ${uuid} $out/share/gnome-shell/extensions + runHook postInstall + ''; + + meta = with stdenv.lib; { + description = "Unite is a GNOME Shell extension which makes a few layout tweaks to the top panel and removes window decorations to make it look like Ubuntu Unity Shell"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ rhoriguchi ]; + homepage = "https://github.com/hardpixel/unite-shell"; + broken = versionOlder gnome3.gnome-shell.version "3.32"; + }; +} diff --git a/pkgs/desktops/gnome-3/extensions/window-corner-preview/default.nix b/pkgs/desktops/gnome-3/extensions/window-corner-preview/default.nix index 9c5d5266ce27..e7659b6b3149 100644 --- a/pkgs/desktops/gnome-3/extensions/window-corner-preview/default.nix +++ b/pkgs/desktops/gnome-3/extensions/window-corner-preview/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gnome3 }: +{ lib, stdenv, fetchFromGitHub, gnome3 }: stdenv.mkDerivation rec { pname = "gnome-shell-extension-window-corner-preview"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "GNOME Shell extension showing a video preview on the corner of the screen"; license = licenses.mit; maintainers = with maintainers; [ jtojnar ]; diff --git a/pkgs/desktops/gnome-3/extensions/window-is-ready-remover/default.nix b/pkgs/desktops/gnome-3/extensions/window-is-ready-remover/default.nix index 45ac75baf8bf..3f0e9e71b571 100644 --- a/pkgs/desktops/gnome-3/extensions/window-is-ready-remover/default.nix +++ b/pkgs/desktops/gnome-3/extensions/window-is-ready-remover/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "gnome-shell-extension-window-is-ready-remover"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "GNOME Shell extension removing window is ready notification"; homepage = "https://github.com/nunofarruca/WindowIsReady_Remover"; license = licenses.asl20; diff --git a/pkgs/desktops/gnome-3/extensions/workspace-matrix/default.nix b/pkgs/desktops/gnome-3/extensions/workspace-matrix/default.nix index 6c466a8eca4b..eb1d6e7e319c 100644 --- a/pkgs/desktops/gnome-3/extensions/workspace-matrix/default.nix +++ b/pkgs/desktops/gnome-3/extensions/workspace-matrix/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, findutils, glib }: +{ lib, stdenv, fetchFromGitHub, findutils, glib }: stdenv.mkDerivation rec { pname = "gnome-shell-extension-workspace-matrix"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Arrange workspaces in a two dimensional grid with workspace thumbnails"; license = licenses.gpl3Plus; maintainers = with maintainers; [ chkno ]; diff --git a/pkgs/desktops/gnome-3/games/aisleriot/default.nix b/pkgs/desktops/gnome-3/games/aisleriot/default.nix index e441462921b5..bb513df4c7a9 100644 --- a/pkgs/desktops/gnome-3/games/aisleriot/default.nix +++ b/pkgs/desktops/gnome-3/games/aisleriot/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitLab , pkg-config , gnome3 @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://wiki.gnome.org/Apps/Aisleriot"; description = "A collection of patience games written in guile scheme"; maintainers = teams.gnome.members; diff --git a/pkgs/desktops/gnome-3/games/atomix/default.nix b/pkgs/desktops/gnome-3/games/atomix/default.nix index 28cc020b2d80..6f8b9ad9bde3 100644 --- a/pkgs/desktops/gnome-3/games/atomix/default.nix +++ b/pkgs/desktops/gnome-3/games/atomix/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig, wrapGAppsHook, python3 +{ lib, stdenv, fetchurl, meson, ninja, pkgconfig, wrapGAppsHook, python3 , gettext, gnome3, glib, gtk3, libgnome-games-support, gdk-pixbuf }: let @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Puzzle game where you move atoms to build a molecule"; homepage = "https://wiki.gnome.org/Apps/Atomix"; license = licenses.gpl2Plus; diff --git a/pkgs/desktops/gnome-3/games/five-or-more/default.nix b/pkgs/desktops/gnome-3/games/five-or-more/default.nix index ca69395eb235..291581661f77 100644 --- a/pkgs/desktops/gnome-3/games/five-or-more/default.nix +++ b/pkgs/desktops/gnome-3/games/five-or-more/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig, gnome3, gtk3, wrapGAppsHook +{ lib, stdenv, fetchurl, meson, ninja, pkgconfig, gnome3, gtk3, wrapGAppsHook , librsvg, libgnome-games-support, gettext, itstool, libxml2, python3, vala }: stdenv.mkDerivation rec { @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://wiki.gnome.org/Apps/Five_or_more"; description = "Remove colored balls from the board by forming lines"; maintainers = teams.gnome.members; diff --git a/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix b/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix index 7ed3a0d478ca..edd6a2ecd81e 100644 --- a/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix +++ b/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook +{ lib, stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook , gettext, meson, gsound, librsvg, itstool, vala , python3, ninja, desktop-file-utils }: @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://wiki.gnome.org/Apps/Four-in-a-row"; description = "Make lines of the same color to win"; maintainers = teams.gnome.members; diff --git a/pkgs/desktops/gnome-3/games/gnome-chess/default.nix b/pkgs/desktops/gnome-3/games/gnome-chess/default.nix index 17ac13ebbce1..f1f7cbcaeb81 100644 --- a/pkgs/desktops/gnome-3/games/gnome-chess/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-chess/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, meson, ninja, vala, pkgconfig, wrapGAppsHook, gobject-introspection +{ lib, stdenv, fetchurl, meson, ninja, vala, pkgconfig, wrapGAppsHook, gobject-introspection , gettext, itstool, libxml2, python3, gnome3, glib, gtk3, librsvg }: stdenv.mkDerivation rec { @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://wiki.gnome.org/Apps/Chess"; description = "Play the classic two-player boardgame of chess"; maintainers = teams.gnome.members; diff --git a/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix b/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix index a51b79e0f883..c6a3a24a50b7 100644 --- a/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, vala, gnome3, gtk3, wrapGAppsHook, appstream-glib, desktop-file-utils +{ lib, stdenv, fetchurl, pkgconfig, vala, gnome3, gtk3, wrapGAppsHook, appstream-glib, desktop-file-utils , glib, librsvg, libxml2, gettext, itstool, libgee, libgnome-games-support , meson, ninja, python3 }: @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://wiki.gnome.org/Apps/Klotski"; description = "Slide blocks to solve the puzzle"; maintainers = teams.gnome.members; diff --git a/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix b/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix index 9bb0db10da58..51908d3236c2 100644 --- a/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook +{ lib, stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook , librsvg, gettext, itstool, libxml2 , meson, ninja, glib, vala, desktop-file-utils }: @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://wiki.gnome.org/Apps/Mahjongg"; description = "Disassemble a pile of tiles by removing matching pairs"; maintainers = teams.gnome.members; diff --git a/pkgs/desktops/gnome-3/games/gnome-mines/default.nix b/pkgs/desktops/gnome-3/games/gnome-mines/default.nix index 011b9569fd84..93529b0b3f88 100644 --- a/pkgs/desktops/gnome-3/games/gnome-mines/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-mines/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, meson, ninja, vala, gobject-introspection, pkgconfig, gnome3, gtk3, wrapGAppsHook +{ lib, stdenv, fetchurl, meson, ninja, vala, gobject-introspection, pkgconfig, gnome3, gtk3, wrapGAppsHook , librsvg, gettext, itstool, python3, libxml2, libgnome-games-support, libgee, desktop-file-utils }: stdenv.mkDerivation rec { @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://wiki.gnome.org/Apps/Mines"; description = "Clear hidden mines from a minefield"; maintainers = teams.gnome.members; diff --git a/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix b/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix index b4f778c3ff1e..410d397bb588 100644 --- a/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook +{ lib, stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook , librsvg, gsound, clutter-gtk, gettext, itstool, vala, python3 , libxml2, libgee, libgnome-games-support, meson, ninja , desktop-file-utils, hicolor-icon-theme}: @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Guide a worm around a maze"; homepage = "https://wiki.gnome.org/Apps/Nibbles"; license = licenses.gpl2; diff --git a/pkgs/desktops/gnome-3/games/gnome-robots/default.nix b/pkgs/desktops/gnome-3/games/gnome-robots/default.nix index 1d9beca36670..39eb27228be0 100644 --- a/pkgs/desktops/gnome-3/games/gnome-robots/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-robots/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook +{ lib, stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook , librsvg, gsound, gettext, itstool, libxml2, libgnome-games-support , libgee, meson, ninja, python3, desktop-file-utils, adwaita-icon-theme }: @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { patchShebangs build-aux/meson_post_install.py ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://wiki.gnome.org/Apps/Robots"; description = "Avoid the robots and make them crash into each other"; maintainers = teams.gnome.members; diff --git a/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix b/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix index a46cfeee5060..49bafcf9603a 100644 --- a/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, meson, ninja, vala, pkgconfig, gobject-introspection, gettext, gtk3, gnome3, wrapGAppsHook +{ lib, stdenv, fetchurl, meson, ninja, vala, pkgconfig, gobject-introspection, gettext, gtk3, gnome3, wrapGAppsHook , libgee, json-glib, qqwing, itstool, libxml2, python3, desktop-file-utils }: stdenv.mkDerivation rec { @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://wiki.gnome.org/Apps/Sudoku"; description = "Test your logic skills in this number grid puzzle"; maintainers = teams.gnome.members; diff --git a/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix b/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix index fc73ef1397ef..9c8b06a7dd4f 100644 --- a/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook +{ lib, stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook , librsvg, gsound, gettext, itstool, libxml2 , meson, ninja, vala, python3, desktop-file-utils }: @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { gnome3.adwaita-icon-theme ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://wiki.gnome.org/Apps/Taquin"; description = "Move tiles so that they reach their places"; maintainers = teams.gnome.members; diff --git a/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix b/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix index 420943580c0d..42137e9caa53 100644 --- a/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook +{ lib, stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook , libxml2, gettext, itstool, meson, ninja, python3 , vala, desktop-file-utils }: @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { patchShebangs build-aux/meson_post_install.py ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://wiki.gnome.org/Apps/Tetravex"; description = "Complete the puzzle by matching numbered tiles"; maintainers = teams.gnome.members; diff --git a/pkgs/desktops/gnome-3/games/hitori/default.nix b/pkgs/desktops/gnome-3/games/hitori/default.nix index 7dac364dcb29..3e5d0e009799 100644 --- a/pkgs/desktops/gnome-3/games/hitori/default.nix +++ b/pkgs/desktops/gnome-3/games/hitori/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , meson , ninja @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://wiki.gnome.org/Apps/Hitori"; description = "GTK application to generate and let you play games of Hitori"; maintainers = teams.gnome.members; diff --git a/pkgs/desktops/gnome-3/games/iagno/default.nix b/pkgs/desktops/gnome-3/games/iagno/default.nix index 9443fc2bb8ca..15be308e4e9e 100644 --- a/pkgs/desktops/gnome-3/games/iagno/default.nix +++ b/pkgs/desktops/gnome-3/games/iagno/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , fetchpatch , pkg-config @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://wiki.gnome.org/Apps/Iagno"; description = "Computer version of the game Reversi, more popularly called Othello"; maintainers = teams.gnome.members; diff --git a/pkgs/desktops/gnome-3/games/lightsoff/default.nix b/pkgs/desktops/gnome-3/games/lightsoff/default.nix index f5425205db60..828a9ac24fb5 100644 --- a/pkgs/desktops/gnome-3/games/lightsoff/default.nix +++ b/pkgs/desktops/gnome-3/games/lightsoff/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, vala, pkgconfig, gtk3, gnome3, gdk-pixbuf, librsvg, wrapGAppsHook +{ lib, stdenv, fetchurl, vala, pkgconfig, gtk3, gnome3, gdk-pixbuf, librsvg, wrapGAppsHook , gettext, itstool, clutter, clutter-gtk, libxml2, appstream-glib , meson, ninja, python3 }: @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://wiki.gnome.org/Apps/Lightsoff"; description = "Puzzle game, where the objective is to turn off all of the tiles on the board"; maintainers = teams.gnome.members; diff --git a/pkgs/desktops/gnome-3/games/quadrapassel/default.nix b/pkgs/desktops/gnome-3/games/quadrapassel/default.nix index 9bc1c5ee73ab..c47b2776563e 100644 --- a/pkgs/desktops/gnome-3/games/quadrapassel/default.nix +++ b/pkgs/desktops/gnome-3/games/quadrapassel/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk-pixbuf +{ lib, stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk-pixbuf , librsvg, gsound, libmanette , gettext, itstool, libxml2, clutter, clutter-gtk, wrapGAppsHook , meson, ninja, python3, vala, desktop-file-utils @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Classic falling-block game, Tetris"; homepage = "https://wiki.gnome.org/Apps/Quadrapassel"; license = licenses.gpl2; diff --git a/pkgs/desktops/gnome-3/games/swell-foop/default.nix b/pkgs/desktops/gnome-3/games/swell-foop/default.nix index 4b12609d3f3d..a96ccd5c9b6c 100644 --- a/pkgs/desktops/gnome-3/games/swell-foop/default.nix +++ b/pkgs/desktops/gnome-3/games/swell-foop/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig, vala, glib, gtk3, gnome3, desktop-file-utils +{ lib, stdenv, fetchurl, meson, ninja, pkgconfig, vala, glib, gtk3, gnome3, desktop-file-utils , clutter, clutter-gtk, gettext, itstool, libxml2, wrapGAppsHook, python3 }: let @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { patchShebangs meson_post_install.py ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://wiki.gnome.org/Apps/Swell%20Foop"; description = "Puzzle game, previously known as Same GNOME"; maintainers = teams.gnome.members; diff --git a/pkgs/desktops/gnome-3/games/tali/default.nix b/pkgs/desktops/gnome-3/games/tali/default.nix index fea6ce571e0b..c6d28cd3bc16 100644 --- a/pkgs/desktops/gnome-3/games/tali/default.nix +++ b/pkgs/desktops/gnome-3/games/tali/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk-pixbuf +{ lib, stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk-pixbuf , librsvg, libgnome-games-support, gettext, itstool, libxml2, wrapGAppsHook , meson, ninja, python3, desktop-file-utils }: @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { patchShebangs build-aux/meson_post_install.py ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://wiki.gnome.org/Apps/Tali"; description = "Sort of poker with dice and less money"; maintainers = teams.gnome.members; diff --git a/pkgs/desktops/gnome-3/misc/geary/default.nix b/pkgs/desktops/gnome-3/misc/geary/default.nix index 6390b03efa31..db9fb395d7d8 100644 --- a/pkgs/desktops/gnome-3/misc/geary/default.nix +++ b/pkgs/desktops/gnome-3/misc/geary/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , fetchpatch , pkgconfig @@ -144,7 +144,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://wiki.gnome.org/Apps/Geary"; description = "Mail client for GNOME 3"; maintainers = teams.gnome.members; diff --git a/pkgs/desktops/gnome-3/misc/gitg/default.nix b/pkgs/desktops/gnome-3/misc/gitg/default.nix index c4849f00d3b9..0ba1d1130bd5 100644 --- a/pkgs/desktops/gnome-3/misc/gitg/default.nix +++ b/pkgs/desktops/gnome-3/misc/gitg/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , fetchpatch , vala @@ -87,7 +87,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://wiki.gnome.org/Apps/Gitg"; description = "GNOME GUI client to view git repositories"; maintainers = with maintainers; [ domenkozar ]; diff --git a/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix b/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix index cc9e0a29d8fd..601dded48953 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , gettext , itstool @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Applets for use with the GNOME panel"; homepage = "https://wiki.gnome.org/Projects/GnomeApplets"; license = licenses.gpl2Plus; diff --git a/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix b/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix index baa43bdedb3e..5495bdb4c3da 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , pkgconfig , gnome3 @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { glib ]; - meta = with stdenv.lib; { + meta = with lib; { platforms = platforms.linux; maintainers = teams.gnome.members; license = licenses.lgpl21; diff --git a/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix b/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix index 93b8fc2251b3..84666a833086 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , autoreconfHook , fetchurl , gettext @@ -188,7 +188,7 @@ let ''; }; - meta = with stdenv.lib; { + meta = with lib; { description = "GNOME 2.x-like session for GNOME 3"; homepage = "https://wiki.gnome.org/Projects/GnomeFlashback"; license = licenses.gpl2; diff --git a/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix b/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix index 63a651258823..c69966406e05 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, meson, ninja, gettext, gnome3, packagekit, polkit +{ lib, stdenv, fetchurl, pkgconfig, meson, ninja, gettext, gnome3, packagekit, polkit , gtk3, systemd, wrapGAppsHook, desktop-file-utils }: stdenv.mkDerivation rec { @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.freedesktop.org/software/PackageKit/"; platforms = platforms.linux; maintainers = teams.gnome.members; diff --git a/pkgs/desktops/gnome-3/misc/gnome-panel/default.nix b/pkgs/desktops/gnome-3/misc/gnome-panel/default.nix index 518d8e198343..d4ea880d1afc 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-panel/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-panel/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , autoreconfHook , dconf @@ -88,7 +88,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Component of Gnome Flashback that provides panels and default applets for the desktop"; homepage = "https://wiki.gnome.org/Projects/GnomePanel"; license = licenses.gpl2Plus; diff --git a/pkgs/desktops/gnome-3/misc/gpaste/default.nix b/pkgs/desktops/gnome-3/misc/gpaste/default.nix index 0071d2415c14..504846e8d4b3 100644 --- a/pkgs/desktops/gnome-3/misc/gpaste/default.nix +++ b/pkgs/desktops/gnome-3/misc/gpaste/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , fetchpatch , appstream-glib @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { ${glib.dev}/bin/glib-compile-schemas "$out/share/glib-2.0/schemas" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/Keruspe/GPaste"; description = "Clipboard management system with GNOME 3 integration"; license = licenses.gpl3; diff --git a/pkgs/desktops/gnome-3/misc/gtkhtml/default.nix b/pkgs/desktops/gnome-3/misc/gtkhtml/default.nix index 9550de32fbea..0f9959274371 100644 --- a/pkgs/desktops/gnome-3/misc/gtkhtml/default.nix +++ b/pkgs/desktops/gnome-3/misc/gtkhtml/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtk3, intltool +{ lib, stdenv, fetchurl, pkgconfig, gtk3, intltool , gnome3, enchant, isocodes, gsettings-desktop-schemas }: stdenv.mkDerivation rec { @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ enchant isocodes ]; - meta = with stdenv.lib; { + meta = with lib; { platforms = platforms.linux; maintainers = teams.gnome.members; }; diff --git a/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix b/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix index fb472ffff1db..f5dd04cdb91e 100644 --- a/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix +++ b/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , pkgconfig , glib @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Small library intended for internal use by GNOME Games, but it may be used by others"; homepage = "https://wiki.gnome.org/Apps/Games"; license = licenses.lgpl3; diff --git a/pkgs/desktops/gnome-3/misc/metacity/default.nix b/pkgs/desktops/gnome-3/misc/metacity/default.nix index 04008f4c84bb..ef16cf49a156 100644 --- a/pkgs/desktops/gnome-3/misc/metacity/default.nix +++ b/pkgs/desktops/gnome-3/misc/metacity/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , gettext , glib @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Window manager used in Gnome Flashback"; homepage = "https://wiki.gnome.org/Projects/Metacity"; license = licenses.gpl2; diff --git a/pkgs/desktops/gnome-3/misc/nautilus-python/default.nix b/pkgs/desktops/gnome-3/misc/nautilus-python/default.nix index e8c523277e18..a942fded0877 100644 --- a/pkgs/desktops/gnome-3/misc/nautilus-python/default.nix +++ b/pkgs/desktops/gnome-3/misc/nautilus-python/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , pkgconfig , which @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Python bindings for the Nautilus Extension API"; homepage = "https://wiki.gnome.org/Projects/NautilusPython"; license = licenses.gpl2Plus; diff --git a/pkgs/desktops/gnome-3/misc/pomodoro/default.nix b/pkgs/desktops/gnome-3/misc/pomodoro/default.nix index 4676155c3c1c..dfaa7f844aa7 100644 --- a/pkgs/desktops/gnome-3/misc/pomodoro/default.nix +++ b/pkgs/desktops/gnome-3/misc/pomodoro/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , autoconf-archive , appstream-glib @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { sqlite ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://gnomepomodoro.org/"; description = "Time management utility for GNOME based on the pomodoro technique"; longDescription = '' diff --git a/pkgs/desktops/lumina/lumina-calculator/default.nix b/pkgs/desktops/lumina/lumina-calculator/default.nix index 7451fa3facf5..0b5690d94429 100644 --- a/pkgs/desktops/lumina/lumina-calculator/default.nix +++ b/pkgs/desktops/lumina/lumina-calculator/default.nix @@ -1,4 +1,4 @@ -{ stdenv, mkDerivation, fetchFromGitHub, qmake, qtbase, qttools }: +{ lib, stdenv, mkDerivation, fetchFromGitHub, qmake, qtbase, qttools }: mkDerivation rec { pname = "lumina-calculator"; @@ -22,7 +22,7 @@ mkDerivation rec { "LRELEASE=${stdenv.lib.getDev qttools}/bin/lrelease" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Scientific calculator for the Lumina Desktop"; homepage = "https://github.com/lumina-desktop/lumina-calculator"; license = licenses.bsd3; diff --git a/pkgs/desktops/lumina/lumina-pdf/default.nix b/pkgs/desktops/lumina/lumina-pdf/default.nix index b4e5039af1fe..1e1691316045 100644 --- a/pkgs/desktops/lumina/lumina-pdf/default.nix +++ b/pkgs/desktops/lumina/lumina-pdf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, mkDerivation, fetchFromGitHub, qmake, qtbase, qttools, poppler }: +{ lib, stdenv, mkDerivation, fetchFromGitHub, qmake, qtbase, qttools, poppler }: mkDerivation rec { pname = "lumina-pdf"; @@ -28,7 +28,7 @@ mkDerivation rec { enableParallelBuilding = false; - meta = with stdenv.lib; { + meta = with lib; { description = "PDF viewer for the Lumina Desktop"; homepage = "https://github.com/lumina-desktop/lumina-pdf"; license = licenses.bsd3; diff --git a/pkgs/desktops/lumina/lumina/default.nix b/pkgs/desktops/lumina/lumina/default.nix index ff1810db6e6e..ec2cbc3b2971 100644 --- a/pkgs/desktops/lumina/lumina/default.nix +++ b/pkgs/desktops/lumina/lumina/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , mkDerivation , fetchFromGitHub , fluxbox @@ -86,7 +86,7 @@ mkDerivation rec { passthru.providedSessions = [ "Lumina-DE" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A lightweight, portable desktop environment"; longDescription = '' The Lumina Desktop Environment is a lightweight system interface diff --git a/pkgs/desktops/lxde/core/lxappearance/default.nix b/pkgs/desktops/lxde/core/lxappearance/default.nix index b838c19afc8e..4119f4c41341 100644 --- a/pkgs/desktops/lxde/core/lxappearance/default.nix +++ b/pkgs/desktops/lxde/core/lxappearance/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , intltool , pkg-config @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { configureFlags = stdenv.lib.optional withGtk3 "--enable-gtk3"; - meta = with stdenv.lib; { + meta = with lib; { description = "Lightweight program for configuring the theme and fonts of gtk applications"; homepage = "https://lxde.org/"; license = licenses.gpl2; diff --git a/pkgs/desktops/lxde/core/lxrandr/default.nix b/pkgs/desktops/lxde/core/lxrandr/default.nix index ab109f3c6d45..6ac021397de3 100644 --- a/pkgs/desktops/lxde/core/lxrandr/default.nix +++ b/pkgs/desktops/lxde/core/lxrandr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk2, libX11, xrandr, withGtk3 ? false, gtk3 }: +{ lib, stdenv, fetchurl, pkgconfig, intltool, gtk2, libX11, xrandr, withGtk3 ? false, gtk3 }: stdenv.mkDerivation rec { name = "lxrandr-0.3.2"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig intltool ]; buildInputs = [ libX11 (if withGtk3 then gtk3 else gtk2) xrandr ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Standard screen manager of LXDE"; homepage = "https://lxde.org/"; license = stdenv.lib.licenses.gpl2; diff --git a/pkgs/desktops/mate/atril/default.nix b/pkgs/desktops/mate/atril/default.nix index 12c89ee1b111..50254fbd29cf 100644 --- a/pkgs/desktops/mate/atril/default.nix +++ b/pkgs/desktops/mate/atril/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , pkgconfig , gettext @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A simple multi-page document viewer for the MATE desktop"; homepage = "https://mate-desktop.org"; license = licenses.gpl2; diff --git a/pkgs/desktops/mate/caja-dropbox/default.nix b/pkgs/desktops/mate/caja-dropbox/default.nix index 7b2387721dca..85179214b08f 100644 --- a/pkgs/desktops/mate/caja-dropbox/default.nix +++ b/pkgs/desktops/mate/caja-dropbox/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, substituteAll +{ lib, stdenv, fetchurl, substituteAll , pkgconfig, gobject-introspection, gdk-pixbuf , gtk3, mate, python3, dropbox }: @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Dropbox extension for Caja file manager"; homepage = "https://github.com/mate-desktop/caja-dropbox"; license = with licenses; [ gpl3 cc-by-nd-30 ]; diff --git a/pkgs/desktops/mate/caja-extensions/default.nix b/pkgs/desktops/mate/caja-extensions/default.nix index d71d72ce1886..a9cd7abf8574 100644 --- a/pkgs/desktops/mate/caja-extensions/default.nix +++ b/pkgs/desktops/mate/caja-extensions/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gettext, gtk3, gupnp, mate, imagemagick, wrapGAppsHook }: +{ lib, stdenv, fetchurl, pkgconfig, gettext, gtk3, gupnp, mate, imagemagick, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "caja-extensions"; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Set of extensions for Caja file manager"; homepage = "https://mate-desktop.org"; license = licenses.gpl2; diff --git a/pkgs/desktops/mate/libmatekbd/default.nix b/pkgs/desktops/mate/libmatekbd/default.nix index f0e178ea9e8e..4b652d06d29e 100644 --- a/pkgs/desktops/mate/libmatekbd/default.nix +++ b/pkgs/desktops/mate/libmatekbd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gettext, gtk3, libxklavier }: +{ lib, stdenv, fetchurl, pkgconfig, gettext, gtk3, libxklavier }: stdenv.mkDerivation rec { pname = "libmatekbd"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Keyboard management library for MATE"; homepage = "https://github.com/mate-desktop/libmatekbd"; license = licenses.gpl2; diff --git a/pkgs/desktops/mate/libmatemixer/default.nix b/pkgs/desktops/mate/libmatemixer/default.nix index 8b1e68e8b35c..97a55b5e45eb 100644 --- a/pkgs/desktops/mate/libmatemixer/default.nix +++ b/pkgs/desktops/mate/libmatemixer/default.nix @@ -1,4 +1,4 @@ -{ config, stdenv, fetchurl, pkgconfig, gettext, glib +{ config, lib, stdenv, fetchurl, pkgconfig, gettext, glib , alsaSupport ? stdenv.isLinux, alsaLib , pulseaudioSupport ? config.pulseaudio or true, libpulseaudio , ossSupport ? false @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Mixer library for MATE"; homepage = "https://github.com/mate-desktop/libmatemixer"; license = with licenses; [ gpl2 lgpl2 ]; diff --git a/pkgs/desktops/mate/libmateweather/default.nix b/pkgs/desktops/mate/libmateweather/default.nix index 3bfdfea06f17..4ecdfcdf157f 100644 --- a/pkgs/desktops/mate/libmateweather/default.nix +++ b/pkgs/desktops/mate/libmateweather/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gettext, gtk3, libsoup, tzdata }: +{ lib, stdenv, fetchurl, pkgconfig, gettext, gtk3, libsoup, tzdata }: stdenv.mkDerivation rec { pname = "libmateweather"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Library to access weather information from online services for MATE"; homepage = "https://github.com/mate-desktop/libmateweather"; license = licenses.gpl2; diff --git a/pkgs/desktops/mate/marco/default.nix b/pkgs/desktops/mate/marco/default.nix index 69beaa3cee7a..fc098428fcb5 100644 --- a/pkgs/desktops/mate/marco/default.nix +++ b/pkgs/desktops/mate/marco/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gettext, itstool, libxml2, libcanberra-gtk3, libgtop, libstartup_notification, gnome3, gtk3, mate-settings-daemon, wrapGAppsHook }: +{ lib, stdenv, fetchurl, pkgconfig, gettext, itstool, libxml2, libcanberra-gtk3, libgtop, libstartup_notification, gnome3, gtk3, mate-settings-daemon, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "marco"; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "MATE default window manager"; homepage = "https://github.com/mate-desktop/marco"; license = [ licenses.gpl2 ]; diff --git a/pkgs/desktops/mate/mate-applets/default.nix b/pkgs/desktops/mate/mate-applets/default.nix index 2a97bc851da0..533070c2698a 100644 --- a/pkgs/desktops/mate/mate-applets/default.nix +++ b/pkgs/desktops/mate/mate-applets/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gettext, itstool, gnome3, glib, gtk3, gtksourceview3, libwnck3, libgtop, libxml2, libnotify, polkit, upower, wirelesstools, mate, hicolor-icon-theme, wrapGAppsHook }: +{ lib, stdenv, fetchurl, pkgconfig, gettext, itstool, gnome3, glib, gtk3, gtksourceview3, libwnck3, libgtop, libxml2, libnotify, polkit, upower, wirelesstools, mate, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "mate-applets"; @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Applets for use with the MATE panel"; homepage = "https://mate-desktop.org"; license = with licenses; [ gpl2Plus lgpl2Plus ]; diff --git a/pkgs/desktops/mate/mate-backgrounds/default.nix b/pkgs/desktops/mate/mate-backgrounds/default.nix index 8e2aa6933ffe..f49529c4a663 100644 --- a/pkgs/desktops/mate/mate-backgrounds/default.nix +++ b/pkgs/desktops/mate/mate-backgrounds/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, meson, ninja, gettext }: +{ lib, stdenv, fetchurl, meson, ninja, gettext }: stdenv.mkDerivation rec { pname = "mate-backgrounds"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { ninja ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Background images and data for MATE"; homepage = "https://mate-desktop.org"; license = licenses.gpl2; diff --git a/pkgs/desktops/mate/mate-calc/default.nix b/pkgs/desktops/mate/mate-calc/default.nix index 48c9f37c03af..a9ed85e650b5 100644 --- a/pkgs/desktops/mate/mate-calc/default.nix +++ b/pkgs/desktops/mate/mate-calc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gettext, itstool, gtk3, libxml2, wrapGAppsHook }: +{ lib, stdenv, fetchurl, pkgconfig, gettext, itstool, gtk3, libxml2, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "mate-calc"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Calculator for the MATE desktop"; homepage = "https://mate-desktop.org"; license = [ licenses.gpl2Plus ]; diff --git a/pkgs/desktops/mate/mate-control-center/default.nix b/pkgs/desktops/mate/mate-control-center/default.nix index 4c26961ba156..397f4969b6ec 100644 --- a/pkgs/desktops/mate/mate-control-center/default.nix +++ b/pkgs/desktops/mate/mate-control-center/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gettext, itstool, libxml2, dbus-glib, +{ lib, stdenv, fetchurl, pkgconfig, gettext, itstool, libxml2, dbus-glib, libxklavier, libcanberra-gtk3, librsvg, libappindicator-gtk3, desktop-file-utils, dconf, gtk3, polkit, mate, hicolor-icon-theme, wrapGAppsHook }: @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Utilities to configure the MATE desktop"; homepage = "https://github.com/mate-desktop/mate-control-center"; license = licenses.gpl2; diff --git a/pkgs/desktops/mate/mate-desktop/default.nix b/pkgs/desktops/mate/mate-desktop/default.nix index 2e298d14168e..1f9db9a95202 100644 --- a/pkgs/desktops/mate/mate-desktop/default.nix +++ b/pkgs/desktops/mate/mate-desktop/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gettext, isocodes, gnome3, gtk3, dconf, wrapGAppsHook }: +{ lib, stdenv, fetchurl, pkgconfig, gettext, isocodes, gnome3, gtk3, dconf, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "mate-desktop"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Library with common API for various MATE modules"; homepage = "https://mate-desktop.org"; license = licenses.gpl2; diff --git a/pkgs/desktops/mate/mate-indicator-applet/default.nix b/pkgs/desktops/mate/mate-indicator-applet/default.nix index 235929dce0c7..981a5a04f02c 100644 --- a/pkgs/desktops/mate/mate-indicator-applet/default.nix +++ b/pkgs/desktops/mate/mate-indicator-applet/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gettext, gtk3, libindicator-gtk3, mate, hicolor-icon-theme, wrapGAppsHook }: +{ lib, stdenv, fetchurl, pkgconfig, gettext, gtk3, libindicator-gtk3, mate, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "mate-indicator-applet"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/mate-desktop/mate-indicator-applet"; description = "MATE panel indicator applet"; longDescription = '' diff --git a/pkgs/desktops/mate/mate-media/default.nix b/pkgs/desktops/mate/mate-media/default.nix index 458e4638ada8..77e98495b099 100644 --- a/pkgs/desktops/mate/mate-media/default.nix +++ b/pkgs/desktops/mate/mate-media/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gettext, libtool, libxml2, libcanberra-gtk3, gtk3, mate, wrapGAppsHook }: +{ lib, stdenv, fetchurl, pkgconfig, gettext, libtool, libxml2, libcanberra-gtk3, gtk3, mate, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "mate-media"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Media tools for MATE"; homepage = "https://mate-desktop.org"; license = licenses.gpl3; diff --git a/pkgs/desktops/mate/mate-menus/default.nix b/pkgs/desktops/mate/mate-menus/default.nix index 73f8be24cc38..ae145061e1fb 100644 --- a/pkgs/desktops/mate/mate-menus/default.nix +++ b/pkgs/desktops/mate/mate-menus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gettext, glib, gobject-introspection, python3 }: +{ lib, stdenv, fetchurl, pkgconfig, gettext, glib, gobject-introspection, python3 }: stdenv.mkDerivation rec { pname = "mate-menus"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Menu system for MATE"; homepage = "https://github.com/mate-desktop/mate-menus"; license = with licenses; [ gpl2 lgpl2 ]; diff --git a/pkgs/desktops/mate/mate-netbook/default.nix b/pkgs/desktops/mate/mate-netbook/default.nix index 4c3338ef907d..7103464f23ac 100644 --- a/pkgs/desktops/mate/mate-netbook/default.nix +++ b/pkgs/desktops/mate/mate-netbook/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gettext, gtk3, libwnck3, libfakekey, libXtst, mate, wrapGAppsHook }: +{ lib, stdenv, fetchurl, pkgconfig, gettext, gtk3, libwnck3, libfakekey, libXtst, mate, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "mate-netbook"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "MATE utilities for netbooks"; longDescription = '' MATE utilities for netbooks are an applet and a daemon to maximize diff --git a/pkgs/desktops/mate/mate-notification-daemon/default.nix b/pkgs/desktops/mate/mate-notification-daemon/default.nix index 0a797f4defa0..6c95f445ace7 100644 --- a/pkgs/desktops/mate/mate-notification-daemon/default.nix +++ b/pkgs/desktops/mate/mate-notification-daemon/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gettext, glib, libcanberra-gtk3, +{ lib, stdenv, fetchurl, pkgconfig, gettext, glib, libcanberra-gtk3, libnotify, libwnck3, gtk3, libxml2, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Notification daemon for MATE Desktop"; homepage = "https://github.com/mate-desktop/mate-notification-daemon"; license = licenses.gpl2; diff --git a/pkgs/desktops/mate/mate-panel/default.nix b/pkgs/desktops/mate/mate-panel/default.nix index 4b021bcc0991..9a09b5e949f4 100644 --- a/pkgs/desktops/mate/mate-panel/default.nix +++ b/pkgs/desktops/mate/mate-panel/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gettext, itstool, glib, libwnck3, librsvg, libxml2, dconf, gtk3, mate, hicolor-icon-theme, gobject-introspection, wrapGAppsHook }: +{ lib, stdenv, fetchurl, pkgconfig, gettext, itstool, glib, libwnck3, librsvg, libxml2, dconf, gtk3, mate, hicolor-icon-theme, gobject-introspection, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "mate-panel"; @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "The MATE panel"; homepage = "https://github.com/mate-desktop/mate-panel"; license = with licenses; [ gpl2 lgpl2 ]; diff --git a/pkgs/desktops/mate/mate-polkit/default.nix b/pkgs/desktops/mate/mate-polkit/default.nix index 2ab526240418..556bfa02d3d3 100644 --- a/pkgs/desktops/mate/mate-polkit/default.nix +++ b/pkgs/desktops/mate/mate-polkit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gettext, gtk3, gobject-introspection, libappindicator-gtk3, libindicator-gtk3, polkit }: +{ lib, stdenv, fetchurl, pkgconfig, gettext, gtk3, gobject-introspection, libappindicator-gtk3, libindicator-gtk3, polkit }: stdenv.mkDerivation rec { pname = "mate-polkit"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Integrates polkit authentication for MATE desktop"; homepage = "https://mate-desktop.org"; license = [ licenses.gpl2Plus ]; diff --git a/pkgs/desktops/mate/mate-power-manager/default.nix b/pkgs/desktops/mate/mate-power-manager/default.nix index c6872cc5beb9..995041be6bd4 100644 --- a/pkgs/desktops/mate/mate-power-manager/default.nix +++ b/pkgs/desktops/mate/mate-power-manager/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gettext, glib, itstool, libxml2, mate-panel, libnotify, libcanberra-gtk3, dbus-glib, upower, gnome3, gtk3, libtool, polkit, wrapGAppsHook }: +{ lib, stdenv, fetchurl, pkgconfig, gettext, glib, itstool, libxml2, mate-panel, libnotify, libcanberra-gtk3, dbus-glib, upower, gnome3, gtk3, libtool, polkit, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "mate-power-manager"; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "The MATE Power Manager"; homepage = "https://mate-desktop.org"; license = licenses.gpl3; diff --git a/pkgs/desktops/mate/mate-screensaver/default.nix b/pkgs/desktops/mate/mate-screensaver/default.nix index f05d8a736d5d..18f8f5713320 100644 --- a/pkgs/desktops/mate/mate-screensaver/default.nix +++ b/pkgs/desktops/mate/mate-screensaver/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gettext, gtk3, dbus-glib, libXScrnSaver, libnotify, libxml2, pam, systemd, mate, wrapGAppsHook }: +{ lib, stdenv, fetchurl, pkgconfig, gettext, gtk3, dbus-glib, libXScrnSaver, libnotify, libxml2, pam, systemd, mate, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "mate-screensaver"; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Screen saver and locker for the MATE desktop"; homepage = "https://mate-desktop.org"; license = with licenses; [ gpl2Plus lgpl2Plus ]; diff --git a/pkgs/desktops/mate/mate-sensors-applet/default.nix b/pkgs/desktops/mate/mate-sensors-applet/default.nix index babdbcb4da0e..21b5a58a1439 100644 --- a/pkgs/desktops/mate/mate-sensors-applet/default.nix +++ b/pkgs/desktops/mate/mate-sensors-applet/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gettext, itstool, gtk3, libxml2, libxslt, libatasmart, libnotify, lm_sensors, mate, hicolor-icon-theme, wrapGAppsHook }: +{ lib, stdenv, fetchurl, pkgconfig, gettext, itstool, gtk3, libxml2, libxslt, libatasmart, libnotify, lm_sensors, mate, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "mate-sensors-applet"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/mate-desktop/mate-sensors-applet"; description = "MATE panel applet for hardware sensors"; license = with licenses; [ gpl2Plus ]; diff --git a/pkgs/desktops/mate/mate-session-manager/default.nix b/pkgs/desktops/mate/mate-session-manager/default.nix index b8b61324574b..64dfd65b20d8 100644 --- a/pkgs/desktops/mate/mate-session-manager/default.nix +++ b/pkgs/desktops/mate/mate-session-manager/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gettext, xtrans, dbus-glib, systemd, +{ lib, stdenv, fetchurl, pkgconfig, gettext, xtrans, dbus-glib, systemd, libSM, libXtst, gtk3, epoxy, polkit, hicolor-icon-theme, mate, wrapGAppsHook, fetchpatch }: @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { passthru.providedSessions = [ "mate" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "MATE Desktop session manager"; homepage = "https://github.com/mate-desktop/mate-session-manager"; license = with licenses; [ gpl2 lgpl2 ]; diff --git a/pkgs/desktops/mate/mate-settings-daemon/default.nix b/pkgs/desktops/mate/mate-settings-daemon/default.nix index e02323858625..467b8c7c9b0f 100644 --- a/pkgs/desktops/mate/mate-settings-daemon/default.nix +++ b/pkgs/desktops/mate/mate-settings-daemon/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gettext, glib, dbus-glib, libxklavier, +{ lib, stdenv, fetchurl, pkgconfig, gettext, glib, dbus-glib, libxklavier, libcanberra-gtk3, libnotify, nss, polkit, dconf, gtk3, mate, pulseaudioSupport ? stdenv.config.pulseaudio or true, libpulseaudio, wrapGAppsHook }: @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "MATE settings daemon"; homepage = "https://github.com/mate-desktop/mate-settings-daemon"; license = with licenses; [ gpl2 lgpl21 ]; diff --git a/pkgs/desktops/mate/mate-system-monitor/default.nix b/pkgs/desktops/mate/mate-system-monitor/default.nix index 38c6a041e433..f6e767e94abc 100644 --- a/pkgs/desktops/mate/mate-system-monitor/default.nix +++ b/pkgs/desktops/mate/mate-system-monitor/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gettext, itstool, gtkmm3, libxml2, libgtop, libwnck3, librsvg, polkit, systemd, wrapGAppsHook }: +{ lib, stdenv, fetchurl, pkgconfig, gettext, itstool, gtkmm3, libxml2, libgtop, libwnck3, librsvg, polkit, systemd, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "mate-system-monitor"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "System monitor for the MATE desktop"; homepage = "https://mate-desktop.org"; license = [ licenses.gpl2Plus ]; diff --git a/pkgs/desktops/mate/mate-terminal/default.nix b/pkgs/desktops/mate/mate-terminal/default.nix index c187aba89775..1772eacbd04c 100644 --- a/pkgs/desktops/mate/mate-terminal/default.nix +++ b/pkgs/desktops/mate/mate-terminal/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gettext, glib, itstool, libxml2, mate, dconf, gtk3, vte, pcre2, wrapGAppsHook }: +{ lib, stdenv, fetchurl, pkgconfig, gettext, glib, itstool, libxml2, mate, dconf, gtk3, vte, pcre2, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "mate-terminal"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "The MATE Terminal Emulator"; homepage = "https://mate-desktop.org"; license = licenses.gpl3; diff --git a/pkgs/desktops/mate/mate-tweak/default.nix b/pkgs/desktops/mate/mate-tweak/default.nix index 9609d832f6b1..316a72a09c7f 100644 --- a/pkgs/desktops/mate/mate-tweak/default.nix +++ b/pkgs/desktops/mate/mate-tweak/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , python3Packages , intltool @@ -72,7 +72,7 @@ python3Packages.buildPythonApplication rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Tweak tool for the MATE Desktop"; homepage = "https://github.com/ubuntu-mate/mate-tweak"; changelog = "https://github.com/ubuntu-mate/mate-tweak/releases/tag/${version}"; diff --git a/pkgs/desktops/mate/mate-user-guide/default.nix b/pkgs/desktops/mate/mate-user-guide/default.nix index 20ab8a9a361f..7a95620f31e6 100644 --- a/pkgs/desktops/mate/mate-user-guide/default.nix +++ b/pkgs/desktops/mate/mate-user-guide/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gettext, itstool, libxml2, yelp }: +{ lib, stdenv, fetchurl, gettext, itstool, libxml2, yelp }: stdenv.mkDerivation rec { pname = "mate-user-guide"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "MATE User Guide"; homepage = "https://mate-desktop.org"; license = with licenses; [ gpl2Plus fdl12 ]; diff --git a/pkgs/desktops/mate/mate-user-share/default.nix b/pkgs/desktops/mate/mate-user-share/default.nix index ba27ae6ce102..29f169f447d7 100644 --- a/pkgs/desktops/mate/mate-user-share/default.nix +++ b/pkgs/desktops/mate/mate-user-share/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gettext, itstool, gtk3, dbus-glib, libnotify, libxml2, libcanberra-gtk3, mod_dnssd, apacheHttpd, hicolor-icon-theme, mate, wrapGAppsHook }: +{ lib, stdenv, fetchurl, pkgconfig, gettext, itstool, gtk3, dbus-glib, libnotify, libxml2, libcanberra-gtk3, mod_dnssd, apacheHttpd, hicolor-icon-theme, mate, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "mate-user-share"; @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "User level public file sharing for the MATE desktop"; homepage = "https://github.com/mate-desktop/mate-user-share"; license = with licenses; [ gpl2Plus ]; diff --git a/pkgs/desktops/mate/mate-utils/default.nix b/pkgs/desktops/mate/mate-utils/default.nix index e36ff69a6fa7..2faa99f9a8b6 100644 --- a/pkgs/desktops/mate/mate-utils/default.nix +++ b/pkgs/desktops/mate/mate-utils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gettext, itstool, glib, gtk3, libxml2, libgtop, libcanberra-gtk3, inkscape, udisks2, mate, hicolor-icon-theme, wrapGAppsHook }: +{ lib, stdenv, fetchurl, pkgconfig, gettext, itstool, glib, gtk3, libxml2, libgtop, libcanberra-gtk3, inkscape, udisks2, mate, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "mate-utils"; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Utilities for the MATE desktop"; homepage = "https://mate-desktop.org"; license = with licenses; [ gpl2Plus lgpl2Plus ]; diff --git a/pkgs/desktops/mate/mozo/default.nix b/pkgs/desktops/mate/mozo/default.nix index 7bad399623a7..669d5400881e 100644 --- a/pkgs/desktops/mate/mozo/default.nix +++ b/pkgs/desktops/mate/mozo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python3, fetchurl, pkgconfig, gettext, mate, gtk3, glib, wrapGAppsHook, gobject-introspection }: +{ lib, stdenv, python3, fetchurl, pkgconfig, gettext, mate, gtk3, glib, wrapGAppsHook, gobject-introspection }: python3.pkgs.buildPythonApplication rec { pname = "mozo"; @@ -20,7 +20,7 @@ python3.pkgs.buildPythonApplication rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "MATE Desktop menu editor"; homepage = "https://github.com/mate-desktop/mozo"; license = with licenses; [ lgpl2Plus ]; diff --git a/pkgs/desktops/mate/python-caja/default.nix b/pkgs/desktops/mate/python-caja/default.nix index 570eaefb5990..fef39d11f9d3 100644 --- a/pkgs/desktops/mate/python-caja/default.nix +++ b/pkgs/desktops/mate/python-caja/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gettext, gtk3, mate, python3Packages }: +{ lib, stdenv, fetchurl, pkgconfig, gettext, gtk3, mate, python3Packages }: stdenv.mkDerivation rec { pname = "python-caja"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Python binding for Caja components"; homepage = "https://github.com/mate-desktop/python-caja"; license = [ licenses.gpl2Plus ]; diff --git a/pkgs/desktops/pantheon/apps/appcenter/default.nix b/pkgs/desktops/pantheon/apps/appcenter/default.nix index ca7ace8e79df..11ba1182f252 100644 --- a/pkgs/desktops/pantheon/apps/appcenter/default.nix +++ b/pkgs/desktops/pantheon/apps/appcenter/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , nix-update-script , appstream , appstream-glib @@ -87,7 +87,7 @@ stdenv.mkDerivation rec { patchShebangs meson/post_install.py ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/elementary/appcenter"; description = "An open, pay-what-you-want app store for indie developers, designed for elementary OS"; license = licenses.gpl3Plus; diff --git a/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix b/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix index 0695b6e4006e..c75ffa8acf3d 100644 --- a/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , nix-update-script , pantheon @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { patchShebangs meson/post_install.py ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/elementary/calculator"; description = "Calculator app designed for elementary OS"; license = licenses.gpl3Plus; diff --git a/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix b/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix index 66bba6dfe793..48c660aeccb7 100644 --- a/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , nix-update-script , pantheon @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { patchShebangs meson/post_install.py ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Desktop calendar app designed for elementary OS"; homepage = "https://github.com/elementary/calendar"; license = licenses.gpl3Plus; diff --git a/pkgs/desktops/pantheon/apps/elementary-camera/default.nix b/pkgs/desktops/pantheon/apps/elementary-camera/default.nix index e7bb60a062d8..0640265e6db7 100644 --- a/pkgs/desktops/pantheon/apps/elementary-camera/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-camera/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , nix-update-script , pantheon @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { patchShebangs meson/post_install.py ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Camera app designed for elementary OS"; homepage = "https://github.com/elementary/camera"; license = licenses.gpl2Plus; diff --git a/pkgs/desktops/pantheon/apps/elementary-code/default.nix b/pkgs/desktops/pantheon/apps/elementary-code/default.nix index 3454ff086c9a..538194edd458 100644 --- a/pkgs/desktops/pantheon/apps/elementary-code/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-code/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , nix-update-script , pantheon @@ -88,7 +88,7 @@ stdenv.mkDerivation rec { patchShebangs meson/post_install.py ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Code editor designed for elementary OS"; homepage = "https://github.com/elementary/code"; license = licenses.gpl3Plus; diff --git a/pkgs/desktops/pantheon/apps/elementary-dock/default.nix b/pkgs/desktops/pantheon/apps/elementary-dock/default.nix index 7cc34f8c82c9..c28ee297e335 100644 --- a/pkgs/desktops/pantheon/apps/elementary-dock/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-dock/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , fetchpatch , vala @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { pango ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Elegant, simple, clean dock"; homepage = "https://github.com/elementary/dock"; license = licenses.gpl3Plus; diff --git a/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix b/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix index 29b897012e7d..abad7f42eb8d 100644 --- a/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , nix-update-script , pantheon @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { patchShebangs meson/post_install.py ''; - meta = with stdenv.lib; { + meta = with lib; { description = "GitHub Issue Reporter designed for elementary OS"; homepage = "https://github.com/elementary/feedback"; license = licenses.gpl3Plus; diff --git a/pkgs/desktops/pantheon/apps/elementary-files/default.nix b/pkgs/desktops/pantheon/apps/elementary-files/default.nix index 9433edc9ce5f..635f77e09ed8 100644 --- a/pkgs/desktops/pantheon/apps/elementary-files/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-files/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , nix-update-script , pantheon @@ -92,7 +92,7 @@ stdenv.mkDerivation rec { --subst-var-by ELEMENTARY_FILES_GSETTINGS_PATH ${glib.makeSchemaPath "$out" "${pname}-${version}"} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "File browser designed for elementary OS"; homepage = "https://github.com/elementary/files"; license = licenses.lgpl3; diff --git a/pkgs/desktops/pantheon/apps/elementary-music/default.nix b/pkgs/desktops/pantheon/apps/elementary-music/default.nix index 0e34b29f1de0..b8306394f107 100644 --- a/pkgs/desktops/pantheon/apps/elementary-music/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-music/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , nix-update-script , pantheon @@ -90,7 +90,7 @@ stdenv.mkDerivation rec { patchShebangs meson/post_install.py ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Music player and library designed for elementary OS"; homepage = "https://github.com/elementary/music"; license = licenses.lgpl2Plus; diff --git a/pkgs/desktops/pantheon/apps/elementary-screenshot-tool/default.nix b/pkgs/desktops/pantheon/apps/elementary-screenshot-tool/default.nix index da67ac0aed84..1224b9b31202 100644 --- a/pkgs/desktops/pantheon/apps/elementary-screenshot-tool/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-screenshot-tool/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , nix-update-script , pantheon @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { patchShebangs meson/post_install.py ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Screenshot tool designed for elementary OS"; homepage = "https://github.com/elementary/screenshot"; license = licenses.lgpl3; diff --git a/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix b/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix index ddd5c0a0eac3..456fee4472b3 100644 --- a/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , nix-update-script , fetchpatch @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { patchShebangs meson/post_install.py ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Terminal emulator designed for elementary OS"; longDescription = '' A super lightweight, beautiful, and simple terminal. Comes with sane defaults, browser-class tabs, sudo paste protection, diff --git a/pkgs/desktops/pantheon/apps/elementary-videos/default.nix b/pkgs/desktops/pantheon/apps/elementary-videos/default.nix index f51c6c0090d3..95a61a5649d8 100644 --- a/pkgs/desktops/pantheon/apps/elementary-videos/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-videos/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , nix-update-script , pantheon @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { patchShebangs meson/post_install.py ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Video player and library app designed for elementary OS"; homepage = "https://github.com/elementary/videos"; license = licenses.gpl3Plus; diff --git a/pkgs/desktops/pantheon/apps/sideload/default.nix b/pkgs/desktops/pantheon/apps/sideload/default.nix index 2fc5d560da0f..df483b9a7960 100644 --- a/pkgs/desktops/pantheon/apps/sideload/default.nix +++ b/pkgs/desktops/pantheon/apps/sideload/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , desktop-file-utils , nix-update-script , elementary-gtk-theme @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { patchShebangs meson/post_install.py ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/elementary/sideload"; description = "Flatpak installer, designed for elementary OS"; license = licenses.gpl3Plus; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix index 9937edc22b5b..699aa56f4a7a 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , substituteAll , fetchFromGitHub , nix-update-script @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { switchboard ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Switchboard Universal Access Plug"; homepage = "https://github.com/elementary/switchboard-plug-a11y"; license = licenses.lgpl3Plus; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix index f174c41abc7b..fad80f131961 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , fetchpatch , nix-update-script @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { }) ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Switchboard About Plug"; homepage = "https://github.com/elementary/switchboard-plug-about"; license = licenses.gpl3Plus; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix index b5a8cc766516..3c76dc9053ca 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , nix-update-script , pantheon @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { switchboard ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Switchboard Applications Plug"; homepage = "https://github.com/elementary/switchboard-plug-applications"; license = licenses.gpl2Plus; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix index ab1e0b5280a8..3f35c6a46b92 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , nix-update-script , pantheon @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { switchboard ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Switchboard Bluetooth Plug"; homepage = "https://github.com/elementary/switchboard-plug-bluetooth"; license = licenses.gpl3Plus; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix index 95a454b36f43..036b21a08fcb 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , nix-update-script , pantheon @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { switchboard ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Switchboard Date & Time Plug"; homepage = "https://github.com/elementary/switchboard-plug-datetime"; license = licenses.gpl3Plus; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix index 490c8c57a67c..4471ebaef23f 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , nix-update-script , pantheon @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { switchboard ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Switchboard Displays Plug"; homepage = "https://github.com/elementary/switchboard-plug-display"; license = licenses.lgpl2Plus; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix index d1180f37ed06..8cb401e48de9 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , nix-update-script , pantheon @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { switchboard ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Switchboard Keyboard Plug"; homepage = "https://github.com/elementary/switchboard-plug-keyboard"; license = licenses.gpl2Plus; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix index 78a74c59e9ed..c1177c54b24c 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , nix-update-script , pantheon @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { switchboard ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Switchboard Mouse & Touchpad Plug"; homepage = "https://github.com/elementary/switchboard-plug-mouse-touchpad"; license = licenses.gpl2Plus; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix index 2ce9aad5666e..5672c442269c 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , nix-update-script , pantheon @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Switchboard Networking Plug"; homepage = "https://github.com/elementary/switchboard-plug-network"; license = licenses.lgpl21Plus; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix index 37f69a3cc141..a1ed6b1085c9 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , nix-update-script , fetchpatch @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { switchboard ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Switchboard Notifications Plug"; homepage = "https://github.com/elementary/switchboard-plug-notifications"; license = licenses.gpl2Plus; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix index 913fa58e2871..43a411a4d252 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , nix-update-script , fetchpatch @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder "out"}/lib/switchboard"; - meta = with stdenv.lib; { + meta = with lib; { description = "Switchboard Online Accounts Plug"; homepage = "https://github.com/elementary/switchboard-plug-onlineaccounts"; license = licenses.lgpl2Plus; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix index d877d43d1378..6a9b1f6494d5 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, nix-update-script, pantheon, meson, ninja, pkgconfig, vala, glib +{ lib, stdenv, fetchFromGitHub, nix-update-script, pantheon, meson, ninja, pkgconfig, vala, glib , libgee, granite, gexiv2, elementary-settings-daemon, gtk3, gnome-desktop , gala, wingpanel, elementary-dock, switchboard, gettext, bamf, fetchpatch }: @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { wingpanel ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Switchboard Desktop Plug"; homepage = "https://github.com/elementary/switchboard-plug-pantheon-shell"; license = licenses.gpl3Plus; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix index 0549a797dbcb..71ce891043ba 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , nix-update-script , pantheon @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { }) ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Switchboard Power Plug"; homepage = "https://github.com/elementary/switchboard-plug-power"; license = licenses.gpl2Plus; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix index 2e8f05d8416d..6a9ade11736e 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , nix-update-script , fetchpatch @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { switchboard ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Switchboard Printers Plug"; homepage = "https://github.com/elementary/switchboard-plug-printers"; license = licenses.lgpl3Plus; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix index fd2a24db3e8a..c90d88161a9a 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , nix-update-script , pantheon @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { patchShebangs meson/post_install.py ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Switchboard Security & Privacy Plug"; homepage = "https://github.com/elementary/switchboard-plug-security-privacy"; license = licenses.lgpl3Plus; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix index 47c4928c08b5..ff8fd5909bae 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , nix-update-script , fetchpatch @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { switchboard ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Switchboard Sharing Plug"; homepage = "https://github.com/elementary/switchboard-plug-sharing"; license = licenses.gpl2Plus; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix index cab47c94cb99..ead5305651b9 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , nix-update-script , pantheon @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { switchboard ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Switchboard Sound Plug"; homepage = "https://github.com/elementary/switchboard-plug-sound"; license = licenses.lgpl2Plus; diff --git a/pkgs/desktops/pantheon/apps/switchboard/default.nix b/pkgs/desktops/pantheon/apps/switchboard/default.nix index 1327c4739eb7..d842b4f361bc 100644 --- a/pkgs/desktops/pantheon/apps/switchboard/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , nix-update-script , pantheon @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { patchShebangs meson/post_install.py ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Extensible System Settings app for Pantheon"; homepage = "https://github.com/elementary/switchboard"; license = licenses.lgpl21Plus; diff --git a/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix b/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix index 05f1f10a5a7e..437f37941220 100644 --- a/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix +++ b/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , nix-update-script , pantheon @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ninja ]; - meta = with stdenv.lib; { + meta = with lib; { description = "GTK theme designed to be smooth, attractive, fast, and usable"; homepage = "https://github.com/elementary/stylesheet"; license = licenses.gpl3; diff --git a/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix b/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix index a12101c04d00..55935b2ee0e0 100644 --- a/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix +++ b/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , nix-update-script , pantheon @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { postFixup = "gtk-update-icon-cache $out/share/icons/elementary"; - meta = with stdenv.lib; { + meta = with lib; { description = "Named, vector icons for elementary OS"; longDescription = '' An original set of vector icons designed specifically for elementary OS and its desktop environment: Pantheon. diff --git a/pkgs/desktops/pantheon/artwork/elementary-redacted-script/default.nix b/pkgs/desktops/pantheon/artwork/elementary-redacted-script/default.nix index 50a455885162..6a9d1b0aca36 100644 --- a/pkgs/desktops/pantheon/artwork/elementary-redacted-script/default.nix +++ b/pkgs/desktops/pantheon/artwork/elementary-redacted-script/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , pantheon }: @@ -21,7 +21,7 @@ stdenv.mkDerivation { cp -a truetype/*.ttf $out/share/fonts/truetype/redacted-elementary ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Font for concealing text"; homepage = "https://github.com/png2378/redacted-elementary"; license = licenses.ofl; diff --git a/pkgs/desktops/pantheon/artwork/elementary-sound-theme/default.nix b/pkgs/desktops/pantheon/artwork/elementary-sound-theme/default.nix index e18cac7d4ab6..b4d7ce5b247d 100644 --- a/pkgs/desktops/pantheon/artwork/elementary-sound-theme/default.nix +++ b/pkgs/desktops/pantheon/artwork/elementary-sound-theme/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , nix-update-script , pantheon @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A set of system sounds for elementary"; homepage = "https://github.com/elementary/sound-theme"; license = licenses.unlicense; diff --git a/pkgs/desktops/pantheon/artwork/elementary-wallpapers/default.nix b/pkgs/desktops/pantheon/artwork/elementary-wallpapers/default.nix index 975497cb9e4b..3e4e64d73012 100644 --- a/pkgs/desktops/pantheon/artwork/elementary-wallpapers/default.nix +++ b/pkgs/desktops/pantheon/artwork/elementary-wallpapers/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , nix-update-script , pantheon @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Collection of wallpapers for elementary"; homepage = "https://github.com/elementary/wallpapers"; license = licenses.publicDomain; diff --git a/pkgs/desktops/pantheon/default.nix b/pkgs/desktops/pantheon/default.nix index 8bae6f8fefe5..e5182807b3f7 100644 --- a/pkgs/desktops/pantheon/default.nix +++ b/pkgs/desktops/pantheon/default.nix @@ -23,7 +23,7 @@ lib.makeScope pkgs.newScope (self: with self; { wingpanel-indicator-session wingpanel-indicator-sound ]; - maintainers = with pkgs.stdenv.lib.maintainers; [ worldofpeace ]; + maintainers = with pkgs.lib.maintainers; [ worldofpeace ]; mutter = pkgs.gnome3.mutter334; diff --git a/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix b/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix index a8cf30e9732e..278880657155 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , nix-update-script , pantheon @@ -98,7 +98,7 @@ stdenv.mkDerivation rec { rm -rf $out/share/applications ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Default settings and configuration files for elementary"; homepage = "https://github.com/elementary/default-settings"; license = licenses.gpl2Plus; diff --git a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix index de93b0d36834..27d82c345a9f 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , nix-update-script , linkFarm @@ -120,7 +120,7 @@ stdenv.mkDerivation rec { --replace "Exec=io.elementary.greeter" "Exec=$out/bin/io.elementary.greeter" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "LightDM Greeter for Pantheon"; homepage = "https://github.com/elementary/greeter"; license = licenses.gpl3Plus; diff --git a/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix b/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix index 73de43594bdd..6d900b2e03f4 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , nix-update-script , pantheon @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { patchShebangs meson/post_install.py ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Onboarding app for new users designed for elementary OS"; homepage = "https://github.com/elementary/onboarding"; license = licenses.gpl3Plus; diff --git a/pkgs/desktops/pantheon/desktop/elementary-print-shim/default.nix b/pkgs/desktops/pantheon/desktop/elementary-print-shim/default.nix index 7610551fb9c1..e80dc3644fba 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-print-shim/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-print-shim/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , nix-update-script , pantheon @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Simple shim for printing support via Contractor"; homepage = "https://github.com/elementary/print"; license = licenses.gpl3Plus; diff --git a/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix b/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix index 63e9fe3f6fa8..27a379f4738d 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , nix-update-script , substituteAll @@ -153,7 +153,7 @@ stdenv.mkDerivation rec { ]; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Session settings for elementary"; homepage = "https://github.com/elementary/session-settings"; license = licenses.lgpl3; diff --git a/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix b/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix index 4e6afb9ff89d..d3f3725ad832 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , nix-update-script , pantheon @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { libgee ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A native OS-wide shortcut overlay to be launched by Gala"; homepage = "https://github.com/elementary/shortcut-overlay"; license = licenses.gpl3Plus; diff --git a/pkgs/desktops/pantheon/desktop/extra-elementary-contracts/default.nix b/pkgs/desktops/pantheon/desktop/extra-elementary-contracts/default.nix index bfeda383ea4e..2db483cb5c7e 100644 --- a/pkgs/desktops/pantheon/desktop/extra-elementary-contracts/default.nix +++ b/pkgs/desktops/pantheon/desktop/extra-elementary-contracts/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , substituteAll , fetchFromGitHub , file-roller @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { cp *.contract $out/share/contractor/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Extra contractor files for elementary"; homepage = "https://github.com/worldofpeace/extra-elementary-contracts"; license = licenses.gpl2; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix index 27e6215b7873..19c565ac9f92 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , fetchpatch , nix-update-script @@ -100,7 +100,7 @@ stdenv.mkDerivation rec { patchShebangs meson/post_install.py ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Lightweight and stylish app launcher for Pantheon"; homepage = "https://github.com/elementary/applications-menu"; license = licenses.gpl3Plus; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix index 995577b80d06..4e6fd0e4f6cb 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , nix-update-script , pantheon @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { patchShebangs meson/post_install.py ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Bluetooth Indicator for Wingpanel"; homepage = "https://github.com/elementary/wingpanel-indicator-bluetooth"; license = licenses.lgpl21Plus; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix index 09583877fb13..2b5898db932d 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , nix-update-script , pantheon @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { patchShebangs meson/post_install.py ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Date & Time Indicator for Wingpanel"; homepage = "https://github.com/elementary/wingpanel-indicator-datetime"; license = licenses.gpl2Plus; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix index 712b25d22f45..01c3ee9e275b 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , nix-update-script , pantheon @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { }) ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Keyboard Indicator for Wingpanel"; homepage = "https://github.com/elementary/wingpanel-indicator-keyboard"; license = licenses.lgpl21Plus; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix index 7f1ee7fbfbac..eb69d6410eb0 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , nix-update-script , pantheon @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { wingpanel ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Network Indicator for Wingpanel"; homepage = "https://github.com/elementary/wingpanel-indicator-network"; license = licenses.lgpl21Plus; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix index 05d0b0a0beb1..04047180f305 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , nix-update-script , pantheon @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "${placeholder "out"}/lib/wingpanel"; - meta = with stdenv.lib; { + meta = with lib; { description = "Night Light Indicator for Wingpanel"; homepage = "https://github.com/elementary/wingpanel-indicator-nightlight"; license = licenses.gpl2Plus; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix index 99ba52212a29..3028fa21da3d 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , nix-update-script , pantheon @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { wingpanel ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Notifications Indicator for Wingpanel"; homepage = "https://github.com/elementary/wingpanel-indicator-notifications"; license = licenses.lgpl21Plus; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix index 3ad4ab4d662d..e1156f693e47 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , nix-update-script , pantheon @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { patchShebangs meson/post_install.py ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Power Indicator for Wingpanel"; homepage = "https://github.com/elementary/wingpanel-indicator-power"; license = licenses.gpl2Plus; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix index 914db6cc8a94..84b204a17f71 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , nix-update-script , fetchpatch @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { wingpanel ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Session Indicator for Wingpanel"; homepage = "https://github.com/elementary/wingpanel-indicator-session"; license = licenses.gpl2Plus; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix index 02f7984eee98..ab51071bd754 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , nix-update-script , pantheon @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { patchShebangs meson/post_install.py ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Sound Indicator for Wingpanel"; homepage = "https://github.com/elementary/wingpanel-indicator-sound"; license = licenses.gpl2Plus; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel/default.nix index 08eda9aa3685..752b7daac20f 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , nix-update-script , pantheon @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { ) ''; - meta = with stdenv.lib; { + meta = with lib; { description = "The extensible top panel for Pantheon"; longDescription = '' Wingpanel is an empty container that accepts indicators as extensions, diff --git a/pkgs/desktops/pantheon/granite/default.nix b/pkgs/desktops/pantheon/granite/default.nix index 8b5ad8d5e6b5..8d06464ef1ce 100644 --- a/pkgs/desktops/pantheon/granite/default.nix +++ b/pkgs/desktops/pantheon/granite/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , nix-update-script , python3 @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { patchShebangs meson/post_install.py ''; - meta = with stdenv.lib; { + meta = with lib; { description = "An extension to GTK used by elementary OS"; longDescription = '' Granite is a companion library for GTK and GLib. Among other things, it provides complex widgets and convenience functions diff --git a/pkgs/desktops/pantheon/services/contractor/default.nix b/pkgs/desktops/pantheon/services/contractor/default.nix index 76874878ff7d..650c7a9fe878 100644 --- a/pkgs/desktops/pantheon/services/contractor/default.nix +++ b/pkgs/desktops/pantheon/services/contractor/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , nix-update-script , pantheon @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { PKG_CONFIG_DBUS_1_SESSION_BUS_SERVICES_DIR = "${placeholder "out"}/share/dbus-1/services"; - meta = with stdenv.lib; { + meta = with lib; { description = "A desktop-wide extension service used by elementary OS"; homepage = "https://github.com/elementary/contractor"; license = licenses.gpl3Plus; diff --git a/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix b/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix index 2213bcb4e377..97320ce0496b 100644 --- a/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix +++ b/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , nix-update-script , pantheon @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { patchShebangs meson/post_install.py ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A small WebKit app that assists a user with login when a captive portal is detected"; homepage = "https://github.com/elementary/capnet-assist"; license = licenses.gpl2Plus; diff --git a/pkgs/desktops/pantheon/services/elementary-dpms-helper/default.nix b/pkgs/desktops/pantheon/services/elementary-dpms-helper/default.nix index 3bb68475096f..0251e857a180 100644 --- a/pkgs/desktops/pantheon/services/elementary-dpms-helper/default.nix +++ b/pkgs/desktops/pantheon/services/elementary-dpms-helper/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , nix-update-script , pantheon @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { ${glib.dev}/bin/glib-compile-schemas $out/share/glib-2.0/schemas ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Sets DPMS settings found in org.pantheon.dpms"; homepage = "https://github.com/elementary/dpms-helper"; license = licenses.gpl2; diff --git a/pkgs/desktops/pantheon/services/elementary-notifications/default.nix b/pkgs/desktops/pantheon/services/elementary-notifications/default.nix index b90f8c86bf1a..73cace23cca9 100644 --- a/pkgs/desktops/pantheon/services/elementary-notifications/default.nix +++ b/pkgs/desktops/pantheon/services/elementary-notifications/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , meson , ninja @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { patchShebangs meson/post_install.py ''; - meta = with stdenv.lib; { + meta = with lib; { description = "GTK notification server for Pantheon"; homepage = "https://github.com/elementary/notifications"; license = licenses.gpl3Plus; diff --git a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix index 724a07d25bfe..268f6c4aaef0 100644 --- a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix +++ b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , substituteAll , fetchurl , fetchgit @@ -143,7 +143,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { license = licenses.gpl2Plus; maintainers = pantheon.maintainers; platforms = platforms.linux; diff --git a/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix b/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix index 11e0aaee3ad9..29b24981c473 100644 --- a/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix +++ b/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , nix-update-script , pantheon @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { ${glib.dev}/bin/glib-compile-schemas $out/share/glib-2.0/schemas ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Pantheon Geoclue2 Agent"; homepage = "https://github.com/elementary/pantheon-agent-geoclue2"; license = licenses.gpl3Plus; diff --git a/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix b/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix index ad8cf7e82e93..f3a496549381 100644 --- a/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix +++ b/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , nix-update-script , pantheon @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { polkit ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Polkit Agent for the Pantheon Desktop"; homepage = "https://github.com/elementary/pantheon-agent-polkit"; license = licenses.lgpl21Plus; diff --git a/pkgs/desktops/plasma-5/fetch.sh b/pkgs/desktops/plasma-5/fetch.sh index dbc4eef057b9..43ea2d692818 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.20.4/ ) +WGET_ARGS=( https://download.kde.org/stable/plasma/5.20.5/ -A '*.tar.xz' ) diff --git a/pkgs/desktops/plasma-5/srcs.nix b/pkgs/desktops/plasma-5/srcs.nix index ecca8c5bfdde..cfd7e5733993 100644 --- a/pkgs/desktops/plasma-5/srcs.nix +++ b/pkgs/desktops/plasma-5/srcs.nix @@ -4,395 +4,395 @@ { bluedevil = { - version = "5.20.4"; + version = "5.20.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.4/bluedevil-5.20.4.tar.xz"; - sha256 = "522ad4ff3f3fc4e213328f821041d40b5126d0d3ca49ecc9aea35c59e2c64129"; - name = "bluedevil-5.20.4.tar.xz"; + url = "${mirror}/stable/plasma/5.20.5/bluedevil-5.20.5.tar.xz"; + sha256 = "0bpbvfd6m3ddax484p33a1chvf9mf2mi61cli0vacsan7j84xpmk"; + name = "bluedevil-5.20.5.tar.xz"; }; }; breeze = { - version = "5.20.4"; + version = "5.20.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.4/breeze-5.20.4.tar.xz"; - sha256 = "b61b3f9961c196bbcfb33519bbec06d19e6267182f7215e21071a5619681b30f"; - name = "breeze-5.20.4.tar.xz"; + url = "${mirror}/stable/plasma/5.20.5/breeze-5.20.5.tar.xz"; + sha256 = "01zm5hcal6flihd89wn70zi363cmcglfvnc2q6x97lq89silaf6l"; + name = "breeze-5.20.5.tar.xz"; }; }; breeze-grub = { - version = "5.20.4"; + version = "5.20.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.4/breeze-grub-5.20.4.tar.xz"; - sha256 = "8692b6800e89b97973b50d6915f9ca028cdcb0354c34b54719af54441e3f3feb"; - name = "breeze-grub-5.20.4.tar.xz"; + url = "${mirror}/stable/plasma/5.20.5/breeze-grub-5.20.5.tar.xz"; + sha256 = "17g2jac96sj6pfacmyi6vvn74lfi9yhmigprcm2pwqg9z093n1m2"; + name = "breeze-grub-5.20.5.tar.xz"; }; }; breeze-gtk = { - version = "5.20.4"; + version = "5.20.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.4/breeze-gtk-5.20.4.tar.xz"; - sha256 = "8905b3a0ff40a48ed2f00f69b7e30c4658deb9fbd1afc61700a28d078693b61d"; - name = "breeze-gtk-5.20.4.tar.xz"; + url = "${mirror}/stable/plasma/5.20.5/breeze-gtk-5.20.5.tar.xz"; + sha256 = "1jknfswjcd4abbf249i3gclip4m4v8bp9b5x050zafyjkdcwxd5l"; + name = "breeze-gtk-5.20.5.tar.xz"; }; }; breeze-plymouth = { - version = "5.20.4"; + version = "5.20.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.4/breeze-plymouth-5.20.4.tar.xz"; - sha256 = "879d4bd8d0c42a5c1f51497a4ee4ebb3e69f7904170bafa392b95e1c0ce05ada"; - name = "breeze-plymouth-5.20.4.tar.xz"; + url = "${mirror}/stable/plasma/5.20.5/breeze-plymouth-5.20.5.tar.xz"; + sha256 = "0yiqqwms0qrnbxqb8nwmgssrp1f92jwjg8rfzapaq5jxdycl1d9m"; + name = "breeze-plymouth-5.20.5.tar.xz"; }; }; discover = { - version = "5.20.4"; + version = "5.20.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.4/discover-5.20.4.tar.xz"; - sha256 = "3669648fa39e14a8da059373c9a01caacfd5b126d61daed65d5d7aae7ab30012"; - name = "discover-5.20.4.tar.xz"; + url = "${mirror}/stable/plasma/5.20.5/discover-5.20.5.tar.xz"; + sha256 = "08dmc8rvbfi1zyk9if588h6948xqcqm9jxdp26q84mzq517x9fn5"; + name = "discover-5.20.5.tar.xz"; }; }; drkonqi = { - version = "5.20.4"; + version = "5.20.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.4/drkonqi-5.20.4.tar.xz"; - sha256 = "55d4a166ee74c4a935c69cec64ecd8eb3fdd79aae8dcd996f6432a873be3fac8"; - name = "drkonqi-5.20.4.tar.xz"; + url = "${mirror}/stable/plasma/5.20.5/drkonqi-5.20.5.tar.xz"; + sha256 = "1rl212qmmikbnkyryibpp6gxh4jpklynhgr45ym5gcn3903i3vh9"; + name = "drkonqi-5.20.5.tar.xz"; }; }; kactivitymanagerd = { - version = "5.20.4"; + version = "5.20.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.4/kactivitymanagerd-5.20.4.tar.xz"; - sha256 = "210215dd9a49fda98febb60f73f4cc95eda3eb9ec96c0db2f2881f6be13afb34"; - name = "kactivitymanagerd-5.20.4.tar.xz"; + url = "${mirror}/stable/plasma/5.20.5/kactivitymanagerd-5.20.5.tar.xz"; + sha256 = "1jzss3waq8jjzbs3rrxxk9dmr974pj5ryw4rdj8bpkc451wc4068"; + name = "kactivitymanagerd-5.20.5.tar.xz"; }; }; kde-cli-tools = { - version = "5.20.4"; + version = "5.20.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.4/kde-cli-tools-5.20.4.tar.xz"; - sha256 = "55f35158715bafdd51e448a2760327ed4f91c54fcd3da807dec2736d077b16a3"; - name = "kde-cli-tools-5.20.4.tar.xz"; + url = "${mirror}/stable/plasma/5.20.5/kde-cli-tools-5.20.5.tar.xz"; + sha256 = "0z32fwc9l8c3xfy1l7v0i26ay8icnxqwrnxz6h8qgjlv6p8b4h04"; + name = "kde-cli-tools-5.20.5.tar.xz"; }; }; kdecoration = { - version = "5.20.4"; + version = "5.20.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.4/kdecoration-5.20.4.tar.xz"; - sha256 = "8d1224a50a2e8c0ec24faab4453432eb8083b35a63e479523de95dce644226e8"; - name = "kdecoration-5.20.4.tar.xz"; + url = "${mirror}/stable/plasma/5.20.5/kdecoration-5.20.5.tar.xz"; + sha256 = "1kc166f2gqgspsnvxyk8k3k3mmd1ndhgr1dyjzknqdys32dkm5vf"; + name = "kdecoration-5.20.5.tar.xz"; }; }; kde-gtk-config = { - version = "5.20.4"; + version = "5.20.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.4/kde-gtk-config-5.20.4.tar.xz"; - sha256 = "db3510cb08788c915be5e034106145597de5a412236b60c57b8db4b64dbbd7b1"; - name = "kde-gtk-config-5.20.4.tar.xz"; + url = "${mirror}/stable/plasma/5.20.5/kde-gtk-config-5.20.5.tar.xz"; + sha256 = "1f3fvr201wr7jdh1hg8ff7yis7hnv7653hvx0531hx1x2hfdva1r"; + name = "kde-gtk-config-5.20.5.tar.xz"; }; }; kdeplasma-addons = { - version = "5.20.4"; + version = "5.20.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.4/kdeplasma-addons-5.20.4.tar.xz"; - sha256 = "44768c7fb00386bc4f005c773bca59d8acc354f8a3f43efa6565cefc74d490d7"; - name = "kdeplasma-addons-5.20.4.tar.xz"; + url = "${mirror}/stable/plasma/5.20.5/kdeplasma-addons-5.20.5.tar.xz"; + sha256 = "1sypmn72fp6l57px3pq9ivzj2r2l3k9vy5006idnfgblzahvpi2n"; + name = "kdeplasma-addons-5.20.5.tar.xz"; }; }; kgamma5 = { - version = "5.20.4"; + version = "5.20.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.4/kgamma5-5.20.4.tar.xz"; - sha256 = "59b1247dfc3c45247cff62e3706b52c9a1be2cf9cfe6e92c9c7299fc5cb51b41"; - name = "kgamma5-5.20.4.tar.xz"; + url = "${mirror}/stable/plasma/5.20.5/kgamma5-5.20.5.tar.xz"; + sha256 = "1gy0pgsk3xi129y8h78lcif60ajs3y5fxzj1pl7mn6g72f7mwxld"; + name = "kgamma5-5.20.5.tar.xz"; }; }; khotkeys = { - version = "5.20.4"; + version = "5.20.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.4/khotkeys-5.20.4.tar.xz"; - sha256 = "13c7e5a38f095056c6411b8dc91fc0640256c0a6f0a5166ba716e2454388d648"; - name = "khotkeys-5.20.4.tar.xz"; + url = "${mirror}/stable/plasma/5.20.5/khotkeys-5.20.5.tar.xz"; + sha256 = "1iw8rxdl9q45jqsnmqdm1lkymzkyxkrfgch51kxfj34vd4mi66h8"; + name = "khotkeys-5.20.5.tar.xz"; }; }; kinfocenter = { - version = "5.20.4"; + version = "5.20.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.4/kinfocenter-5.20.4.tar.xz"; - sha256 = "09af2cafde33d0c8a824451ca532a443b6f571e20037fe6b31245c9984e9a6b3"; - name = "kinfocenter-5.20.4.tar.xz"; + url = "${mirror}/stable/plasma/5.20.5/kinfocenter-5.20.5.tar.xz"; + sha256 = "0k3vvfwrfwmmicw8p81fpqljvmj3n8342avavc49ajmnygls7ssm"; + name = "kinfocenter-5.20.5.tar.xz"; }; }; kmenuedit = { - version = "5.20.4"; + version = "5.20.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.4/kmenuedit-5.20.4.tar.xz"; - sha256 = "32c2d2eb979e43e4cc0892aa9460eb8ebaf603b77385b9f058a48ca4347dde4b"; - name = "kmenuedit-5.20.4.tar.xz"; + url = "${mirror}/stable/plasma/5.20.5/kmenuedit-5.20.5.tar.xz"; + sha256 = "0apmhglw74ppps52fhspjdsiy19b219lf68aj8jlpiiqcn80mggf"; + name = "kmenuedit-5.20.5.tar.xz"; }; }; kscreen = { - version = "5.20.4"; + version = "5.20.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.4/kscreen-5.20.4.tar.xz"; - sha256 = "4063fae5cb40a22a98fd0cc217e9b0ea4aef6518203c4bbe2664d5d01dfb9d9c"; - name = "kscreen-5.20.4.tar.xz"; + url = "${mirror}/stable/plasma/5.20.5/kscreen-5.20.5.tar.xz"; + sha256 = "1njjkrdgdd6g8avf7ik9fd7j9g4zdbjghli7svcfz2z8h6na626y"; + name = "kscreen-5.20.5.tar.xz"; }; }; kscreenlocker = { - version = "5.20.4"; + version = "5.20.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.4/kscreenlocker-5.20.4.tar.xz"; - sha256 = "d80d4625a0a48a7a63c5ff8255e8639eb2fb57ebc436c46979949b39fc530126"; - name = "kscreenlocker-5.20.4.tar.xz"; + url = "${mirror}/stable/plasma/5.20.5/kscreenlocker-5.20.5.tar.xz"; + sha256 = "07y0lhwh4pc5rsdfr5yqb645v37ya97vh3dmy2riw9908hiyybw0"; + name = "kscreenlocker-5.20.5.tar.xz"; }; }; ksshaskpass = { - version = "5.20.4"; + version = "5.20.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.4/ksshaskpass-5.20.4.tar.xz"; - sha256 = "a391ba0490ca41a33207adb6aff2233165d4aeed119fd056489d6eccfc81f218"; - name = "ksshaskpass-5.20.4.tar.xz"; + url = "${mirror}/stable/plasma/5.20.5/ksshaskpass-5.20.5.tar.xz"; + sha256 = "1xk55ampbrz56pl739m6r150qcsjq0nw2sxxkpqykgwjh275y4ry"; + name = "ksshaskpass-5.20.5.tar.xz"; }; }; ksysguard = { - version = "5.20.4"; + version = "5.20.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.4/ksysguard-5.20.4.tar.xz"; - sha256 = "a5f247b24ce75a28f301446fbeb25abf968e77e0c32cd4be9b574a21d3bbfaf4"; - name = "ksysguard-5.20.4.tar.xz"; + url = "${mirror}/stable/plasma/5.20.5/ksysguard-5.20.5.tar.xz"; + sha256 = "0ddb3m6rygjisv31bc722vxzyb2q14940szfzijcv48z5ixj5x9j"; + name = "ksysguard-5.20.5.tar.xz"; }; }; kwallet-pam = { - version = "5.20.4"; + version = "5.20.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.4/kwallet-pam-5.20.4.tar.xz"; - sha256 = "0749056e9acbbc194b20be5b0921383013ed6c268c22cf905aeeda32514d3ac9"; - name = "kwallet-pam-5.20.4.tar.xz"; + url = "${mirror}/stable/plasma/5.20.5/kwallet-pam-5.20.5.tar.xz"; + sha256 = "1wn1zm8bfxxsjvx4rbds60v9ckizj55znpq477vnzrh2xfx13rjk"; + name = "kwallet-pam-5.20.5.tar.xz"; }; }; kwayland-integration = { - version = "5.20.4"; + version = "5.20.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.4/kwayland-integration-5.20.4.tar.xz"; - sha256 = "2dd985dd8d21cdc7743b9f297d0d582f960339b4714953564f2f047d28cee53d"; - name = "kwayland-integration-5.20.4.tar.xz"; + url = "${mirror}/stable/plasma/5.20.5/kwayland-integration-5.20.5.tar.xz"; + sha256 = "0rqzq851apw1p4c7salk7rcygjdw7ra0x95xw57vh68w19kn9wrk"; + name = "kwayland-integration-5.20.5.tar.xz"; }; }; kwayland-server = { - version = "5.20.4"; + version = "5.20.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.4/kwayland-server-5.20.4.tar.xz"; - sha256 = "3edc7b73baa6fa8b0bec51272e8786bab41998b0f675262d5086fdf6c1e9bb44"; - name = "kwayland-server-5.20.4.tar.xz"; + url = "${mirror}/stable/plasma/5.20.5/kwayland-server-5.20.5.tar.xz"; + sha256 = "0ajxjj2cbrg6rpry3r48q3zhxxkr09498j5in0v1jwijp83n9wz0"; + name = "kwayland-server-5.20.5.tar.xz"; }; }; kwin = { - version = "5.20.4"; + version = "5.20.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.4/kwin-5.20.4.tar.xz"; - sha256 = "c59861e9d456974bffaff2cb371cd8d31bdb789f89a60af632089c556111662a"; - name = "kwin-5.20.4.tar.xz"; + url = "${mirror}/stable/plasma/5.20.5/kwin-5.20.5.tar.xz"; + sha256 = "0kiq46gdvfv2811125kw1ncnk1pmpnqkvrz7p3lry72sjd1ja57c"; + name = "kwin-5.20.5.tar.xz"; }; }; kwrited = { - version = "5.20.4"; + version = "5.20.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.4/kwrited-5.20.4.tar.xz"; - sha256 = "f02b900538246f4df2707585052b732552d2ea115a16f8fbda618fa02e5a1bb2"; - name = "kwrited-5.20.4.tar.xz"; + url = "${mirror}/stable/plasma/5.20.5/kwrited-5.20.5.tar.xz"; + sha256 = "1h0vbb0bz4r26g4yf88jfzkbi8xbyf44c2y9nmlrmr5lws4bpcmz"; + name = "kwrited-5.20.5.tar.xz"; }; }; libkscreen = { - version = "5.20.4"; + version = "5.20.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.4/libkscreen-5.20.4.tar.xz"; - sha256 = "ce1bd03a25b101793fa1472ac3fc696079e607a6f45330ea724845bda288d28d"; - name = "libkscreen-5.20.4.tar.xz"; + url = "${mirror}/stable/plasma/5.20.5/libkscreen-5.20.5.tar.xz"; + sha256 = "0641kk7s4xy5y94rn6xzjnrp4sbl7yn9w9qzlw4925858pgrr9qv"; + name = "libkscreen-5.20.5.tar.xz"; }; }; libksysguard = { - version = "5.20.4"; + version = "5.20.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.4/libksysguard-5.20.4.tar.xz"; - sha256 = "a89968476cb8a888550e1a5138ab8e86eeb49788187192cba71f79abd4aad422"; - name = "libksysguard-5.20.4.tar.xz"; + url = "${mirror}/stable/plasma/5.20.5/libksysguard-5.20.5.tar.xz"; + sha256 = "0v2x7sl5gg8a9i1cwx8prv03pcls4q3wfxxs5qs6g5ami1f679d8"; + name = "libksysguard-5.20.5.tar.xz"; }; }; milou = { - version = "5.20.4"; + version = "5.20.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.4/milou-5.20.4.tar.xz"; - sha256 = "123ac9470a94f2eb6e4212979d2df4160fa15962b1fc18551bfcdfe5aa18a201"; - name = "milou-5.20.4.tar.xz"; + url = "${mirror}/stable/plasma/5.20.5/milou-5.20.5.tar.xz"; + sha256 = "1hmpdj2zi6nidm6058a6kjgzij8qy9xihv20hi2dhk0f8ys42k3h"; + name = "milou-5.20.5.tar.xz"; }; }; oxygen = { - version = "5.20.4"; + version = "5.20.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.4/oxygen-5.20.4.tar.xz"; - sha256 = "e58cb6a2e1976a973e24d974556e6306a076ce1295f33a9a1bc56a8715857f67"; - name = "oxygen-5.20.4.tar.xz"; + url = "${mirror}/stable/plasma/5.20.5/oxygen-5.20.5.tar.xz"; + sha256 = "166jk8ix0dnv92svymaxjwbc08k6q8nag9xr2dc033x5lr2l59qr"; + name = "oxygen-5.20.5.tar.xz"; }; }; plasma-browser-integration = { - version = "5.20.4"; + version = "5.20.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.4/plasma-browser-integration-5.20.4.tar.xz"; - sha256 = "55057e4f15a1e8b2d2f0489d32f95bb89f610ae99184b587ba90f7db0e8292b4"; - name = "plasma-browser-integration-5.20.4.tar.xz"; + url = "${mirror}/stable/plasma/5.20.5/plasma-browser-integration-5.20.5.tar.xz"; + sha256 = "03zzmzdlc5a3nrx6izb66s7l3cmangkfjda2mf17g2097rrnb9n2"; + name = "plasma-browser-integration-5.20.5.tar.xz"; }; }; plasma-desktop = { - version = "5.20.4"; + version = "5.20.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.4/plasma-desktop-5.20.4.tar.xz"; - sha256 = "3864e80bb9b8da596188162b14cd9bb77e7a8abedfb0fa41c8c72d47139d1355"; - name = "plasma-desktop-5.20.4.tar.xz"; + url = "${mirror}/stable/plasma/5.20.5/plasma-desktop-5.20.5.tar.xz"; + sha256 = "1fc74zgxkp65pj8p58prd5rq7nqspjfcgr70say2imagyj9nwrdx"; + name = "plasma-desktop-5.20.5.tar.xz"; }; }; plasma-disks = { - version = "5.20.4"; + version = "5.20.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.4/plasma-disks-5.20.4.tar.xz"; - sha256 = "f0110588b2603905962beedd596cfa6eb6371b7bac2186aa845d22237199d845"; - name = "plasma-disks-5.20.4.tar.xz"; + url = "${mirror}/stable/plasma/5.20.5/plasma-disks-5.20.5.tar.xz"; + sha256 = "0bcwf3g2vy2gf0igg0dyl9x5qc0xx0d5z05n4mi7asg5acl596r1"; + name = "plasma-disks-5.20.5.tar.xz"; }; }; plasma-integration = { - version = "5.20.4"; + version = "5.20.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.4/plasma-integration-5.20.4.tar.xz"; - sha256 = "4dbaf6a05d69df02e73c88970be3d7a1efb62a3931edf06c9760cd3bb87e1299"; - name = "plasma-integration-5.20.4.tar.xz"; + url = "${mirror}/stable/plasma/5.20.5/plasma-integration-5.20.5.tar.xz"; + sha256 = "1wydjnmryf2kvfgg6m9kafa5waimccqr531qrq3nisdjc5p1w9x8"; + name = "plasma-integration-5.20.5.tar.xz"; }; }; plasma-nano = { - version = "5.20.4"; + version = "5.20.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.4/plasma-nano-5.20.4.tar.xz"; - sha256 = "8e23e0ce53654daf4ab688edd6a7852b5d859bfd86b4e1795a60f570dda409bd"; - name = "plasma-nano-5.20.4.tar.xz"; + url = "${mirror}/stable/plasma/5.20.5/plasma-nano-5.20.5.tar.xz"; + sha256 = "0h276i1dxbiziw258wf6az9mnysp3xxfh7nlxv0g2w1vfnhm23v5"; + name = "plasma-nano-5.20.5.tar.xz"; }; }; plasma-nm = { - version = "5.20.4"; + version = "5.20.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.4/plasma-nm-5.20.4.tar.xz"; - sha256 = "7b4d1026f2caa709a9ae284cd18342d1c573276f9b4c356ef47779dadb8b57cf"; - name = "plasma-nm-5.20.4.tar.xz"; + url = "${mirror}/stable/plasma/5.20.5/plasma-nm-5.20.5.tar.xz"; + sha256 = "060f32adr0wlv2bs9swjyxcil7n74cnk48j8b8984wwhk6zz53a6"; + name = "plasma-nm-5.20.5.tar.xz"; }; }; plasma-pa = { - version = "5.20.4"; + version = "5.20.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.4/plasma-pa-5.20.4.tar.xz"; - sha256 = "56fb4809966aa33290c46fed968f2c7186c415663f032c75b3279c57134674f3"; - name = "plasma-pa-5.20.4.tar.xz"; + url = "${mirror}/stable/plasma/5.20.5/plasma-pa-5.20.5.tar.xz"; + sha256 = "0xvkbrz3290xxfvv1rqqv7w57j3gdng8m2jyjj1j6dmaackl512d"; + name = "plasma-pa-5.20.5.tar.xz"; }; }; plasma-phone-components = { - version = "5.20.4"; + version = "5.20.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.4/plasma-phone-components-5.20.4.tar.xz"; - sha256 = "80053324bfb6431946df67e712638f797c2bcd9cb78766629a0372de7f6f727e"; - name = "plasma-phone-components-5.20.4.tar.xz"; + url = "${mirror}/stable/plasma/5.20.5/plasma-phone-components-5.20.5.tar.xz"; + sha256 = "14h790b2jfs2j2lvv3dwqm20v3nlvah2909g4mhm9kwfdsmgnjms"; + name = "plasma-phone-components-5.20.5.tar.xz"; }; }; plasma-sdk = { - version = "5.20.4"; + version = "5.20.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.4/plasma-sdk-5.20.4.tar.xz"; - sha256 = "49d29c1c95832c585ea3c0b26f8fb46f5fa0fac726f9f7e9cbf0ab83415a00ea"; - name = "plasma-sdk-5.20.4.tar.xz"; + url = "${mirror}/stable/plasma/5.20.5/plasma-sdk-5.20.5.tar.xz"; + sha256 = "13cqn700nadqgmn54sy8qbf7waqkgvhzndh73jvmhb0z699z4s6y"; + name = "plasma-sdk-5.20.5.tar.xz"; }; }; plasma-tests = { - version = "5.20.4"; + version = "5.20.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.4/plasma-tests-5.20.4.tar.xz"; - sha256 = "35234da922aad986db73ca4d2ca1c0440dbff24e200b98584246b060cc7a2735"; - name = "plasma-tests-5.20.4.tar.xz"; + url = "${mirror}/stable/plasma/5.20.5/plasma-tests-5.20.5.tar.xz"; + sha256 = "0h6wccqp46s3i8dqc6rrh68l8fk662yvz0fdscqv295g1zwhb45j"; + name = "plasma-tests-5.20.5.tar.xz"; }; }; plasma-thunderbolt = { - version = "5.20.4"; + version = "5.20.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.4/plasma-thunderbolt-5.20.4.tar.xz"; - sha256 = "7c37c66815242b5d1e208df3b4dbf4fe0d8542ac9aa352d06c548fc172348429"; - name = "plasma-thunderbolt-5.20.4.tar.xz"; + url = "${mirror}/stable/plasma/5.20.5/plasma-thunderbolt-5.20.5.tar.xz"; + sha256 = "06l5zpgn5zmid0rkp8lx228nw72nd991s2cg29yg2h51zyvff4v0"; + name = "plasma-thunderbolt-5.20.5.tar.xz"; }; }; plasma-vault = { - version = "5.20.4"; + version = "5.20.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.4/plasma-vault-5.20.4.tar.xz"; - sha256 = "525226a143e6bb173e8106ed2f2313a529ed380a0a1488b096a60af6d08d881c"; - name = "plasma-vault-5.20.4.tar.xz"; + url = "${mirror}/stable/plasma/5.20.5/plasma-vault-5.20.5.tar.xz"; + sha256 = "0b9jnzx5040sgzqsnzjz61sxnlsmbqfsk8mvqclgqphgiqsbcnm2"; + name = "plasma-vault-5.20.5.tar.xz"; }; }; plasma-workspace = { - version = "5.20.4"; + version = "5.20.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.4/plasma-workspace-5.20.4.tar.xz"; - sha256 = "12bfe6c3f62e4d1d2f7bc02ccb2e2ed5aee2ffe21c310987e42a2205374c30c9"; - name = "plasma-workspace-5.20.4.tar.xz"; + url = "${mirror}/stable/plasma/5.20.5/plasma-workspace-5.20.5.tar.xz"; + sha256 = "0966nqyqs7hb7fp3a3jxhm64iqwbafd29sbagigx9d7gj8qg8zim"; + name = "plasma-workspace-5.20.5.tar.xz"; }; }; plasma-workspace-wallpapers = { - version = "5.20.4"; + version = "5.20.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.4/plasma-workspace-wallpapers-5.20.4.tar.xz"; - sha256 = "4740d67e85910ed398c048916963f31c6632698d6a4494bc09cc1b0cd14e2808"; - name = "plasma-workspace-wallpapers-5.20.4.tar.xz"; + url = "${mirror}/stable/plasma/5.20.5/plasma-workspace-wallpapers-5.20.5.tar.xz"; + sha256 = "03z7pcba8kkmb70dn7gsqldxgb8lky6qw040p5ik1j07516xm6z3"; + name = "plasma-workspace-wallpapers-5.20.5.tar.xz"; }; }; plymouth-kcm = { - version = "5.20.4"; + version = "5.20.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.4/plymouth-kcm-5.20.4.tar.xz"; - sha256 = "0cde268064c92b89c5b2a5f8c033983d372406656d446f52b77611effd67ad77"; - name = "plymouth-kcm-5.20.4.tar.xz"; + url = "${mirror}/stable/plasma/5.20.5/plymouth-kcm-5.20.5.tar.xz"; + sha256 = "0lwir088h3mjdxc6zzbd74g7alfnsrhf7m0p7ma6prncdj25pcyz"; + name = "plymouth-kcm-5.20.5.tar.xz"; }; }; polkit-kde-agent = { - version = "1-5.20.4"; + version = "1-5.20.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.4/polkit-kde-agent-1-5.20.4.tar.xz"; - sha256 = "f01a7b3443553810b0c9e6f25d2ca51eeac7c5e9fd624505852e77183e294b61"; - name = "polkit-kde-agent-1-5.20.4.tar.xz"; + url = "${mirror}/stable/plasma/5.20.5/polkit-kde-agent-1-5.20.5.tar.xz"; + sha256 = "1rkvnci93xvxga6cvw99aaivkn8897kyqdw7p9hmk09qvg2qb92v"; + name = "polkit-kde-agent-1-5.20.5.tar.xz"; }; }; powerdevil = { - version = "5.20.4"; + version = "5.20.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.4/powerdevil-5.20.4.tar.xz"; - sha256 = "864128ea9178701bc322f728402cf9277b3c6feaa15fe425aa2adf92464bd28d"; - name = "powerdevil-5.20.4.tar.xz"; + url = "${mirror}/stable/plasma/5.20.5/powerdevil-5.20.5.tar.xz"; + sha256 = "1w3figagjxmrbc7hs81bllfkpq6f9mn4mwj7zjzxjf7d5fkmryrj"; + name = "powerdevil-5.20.5.tar.xz"; }; }; sddm-kcm = { - version = "5.20.4"; + version = "5.20.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.4/sddm-kcm-5.20.4.tar.xz"; - sha256 = "c61e136c10b98a91e1bd48ca5bbdd2a15b197a38b83d7ad5ccd289200524935e"; - name = "sddm-kcm-5.20.4.tar.xz"; + url = "${mirror}/stable/plasma/5.20.5/sddm-kcm-5.20.5.tar.xz"; + sha256 = "1zw9y6knrx848f529m45iszr0xplr9lnck242ddmzj3x7qz0x1az"; + name = "sddm-kcm-5.20.5.tar.xz"; }; }; systemsettings = { - version = "5.20.4"; + version = "5.20.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.4/systemsettings-5.20.4.tar.xz"; - sha256 = "e87eedfb40a0255348cf2a775ca0ea15bbce37687eedd521f2200670315953b9"; - name = "systemsettings-5.20.4.tar.xz"; + url = "${mirror}/stable/plasma/5.20.5/systemsettings-5.20.5.tar.xz"; + sha256 = "1b1j9hl9nzd4qqs255yd3svsb492w8i6l6ccihllwzqwkb1kpq5j"; + name = "systemsettings-5.20.5.tar.xz"; }; }; xdg-desktop-portal-kde = { - version = "5.20.4"; + version = "5.20.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.4/xdg-desktop-portal-kde-5.20.4.tar.xz"; - sha256 = "cb3d856f7caeae7bd02a3e9e43f12ee3d432aa399df9d40db0636199b7ed4df8"; - name = "xdg-desktop-portal-kde-5.20.4.tar.xz"; + url = "${mirror}/stable/plasma/5.20.5/xdg-desktop-portal-kde-5.20.5.tar.xz"; + sha256 = "07g70517p89araa305if2xgwpfd7sdbknl880hqn2mqaqd9m83gl"; + name = "xdg-desktop-portal-kde-5.20.5.tar.xz"; }; }; } diff --git a/pkgs/desktops/rox/rox-filer/default.nix b/pkgs/desktops/rox/rox-filer/default.nix index cc7de2168e48..e8ffe0f9d92b 100644 --- a/pkgs/desktops/rox/rox-filer/default.nix +++ b/pkgs/desktops/rox/rox-filer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libxml2, gtk, libSM, shared-mime-info }: +{ lib, stdenv, fetchurl, pkgconfig, libxml2, gtk, libSM, shared-mime-info }: let version = "2.11"; @@ -69,7 +69,7 @@ in stdenv.mkDerivation { ln -sv application-{msword,rtf}.png ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Fast, lightweight, gtk2 file manager"; homepage = "http://rox.sourceforge.net/desktop"; license = with licenses; [ gpl2 lgpl2 ]; diff --git a/pkgs/desktops/surf-display/default.nix b/pkgs/desktops/surf-display/default.nix index dd0644866478..6746229a6bd2 100644 --- a/pkgs/desktops/surf-display/default.nix +++ b/pkgs/desktops/surf-display/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, makeWrapper +{ lib, stdenv, fetchgit, makeWrapper , surf, wmctrl, matchbox, xdotool, unclutter , xorg, pulseaudio, xprintidle-ng }: @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { providedSessions = [ "surf-display" ]; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Kiosk browser session manager based on the surf browser"; homepage = "https://code.it-zukunft-schule.de/cgit/surf-display/"; maintainers = with maintainers; [ etu ]; diff --git a/pkgs/desktops/xfce/applications/catfish/default.nix b/pkgs/desktops/xfce/applications/catfish/default.nix index 7b9587b988b9..6eff57f46ed4 100644 --- a/pkgs/desktops/xfce/applications/catfish/default.nix +++ b/pkgs/desktops/xfce/applications/catfish/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, file, which, intltool, gobject-introspection, +{ lib, stdenv, fetchurl, file, which, intltool, gobject-introspection, findutils, xdg_utils, dconf, gtk3, python3Packages, wrapGAppsHook }: @@ -50,7 +50,7 @@ python3Packages.buildPythonApplication rec { # Disable check because there is no test in the source distribution doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://docs.xfce.org/apps/catfish/start"; description = "Handy file search tool"; longDescription = '' diff --git a/pkgs/desktops/xfce/applications/orage/default.nix b/pkgs/desktops/xfce/applications/orage/default.nix index 3af6c0a6bbab..a18002928dc4 100644 --- a/pkgs/desktops/xfce/applications/orage/default.nix +++ b/pkgs/desktops/xfce/applications/orage/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pkg-config, intltool, dbus-glib, gtk2, libical, libnotify, tzdata +{ lib, stdenv, fetchurl, fetchpatch, pkg-config, intltool, dbus-glib, gtk2, libical, libnotify, tzdata , popt, libxfce4ui, xfce4-panel, withPanelPlugin ? true, wrapGAppsHook, xfce }: assert withPanelPlugin -> libxfce4ui != null && xfce4-panel != null; @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { versionLister = xfce.archiveLister "apps" pname; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Simple calendar application with reminders"; homepage = "https://git.xfce.org/archive/orage/"; license = licenses.gpl2Plus; diff --git a/pkgs/desktops/xfce/art/xfce4-icon-theme.nix b/pkgs/desktops/xfce/art/xfce4-icon-theme.nix index 526b70305917..ea4a4e0c7ee8 100644 --- a/pkgs/desktops/xfce/art/xfce4-icon-theme.nix +++ b/pkgs/desktops/xfce/art/xfce4-icon-theme.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk3, gnome-icon-theme, tango-icon-theme, hicolor-icon-theme, xfce }: +{ lib, stdenv, fetchurl, pkgconfig, intltool, gtk3, gnome-icon-theme, tango-icon-theme, hicolor-icon-theme, xfce }: let category = "art"; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { versionLister = xfce.archiveLister category pname; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.xfce.org/"; description = "Icons for Xfce"; license = licenses.gpl2Plus; diff --git a/pkgs/desktops/xfce/art/xfwm4-themes.nix b/pkgs/desktops/xfce/art/xfwm4-themes.nix index db0a1779a41b..b93fa776ca4e 100644 --- a/pkgs/desktops/xfce/art/xfwm4-themes.nix +++ b/pkgs/desktops/xfce/art/xfwm4-themes.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, xfce }: +{ lib, stdenv, fetchurl, xfce }: let category = "art"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { versionLister = xfce.archiveLister category pname; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.xfce.org/"; description = "Themes for Xfce"; license = licenses.gpl3; diff --git a/pkgs/desktops/xfce/mkXfceDerivation.nix b/pkgs/desktops/xfce/mkXfceDerivation.nix index 8709b84820c4..ddfc55305708 100644 --- a/pkgs/desktops/xfce/mkXfceDerivation.nix +++ b/pkgs/desktops/xfce/mkXfceDerivation.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, pkgconfig, xfce4-dev-tools, hicolor-icon-theme, xfce, wrapGAppsHook }: +{ lib, stdenv, fetchFromGitLab, pkgconfig, xfce4-dev-tools, hicolor-icon-theme, xfce, wrapGAppsHook }: { category , pname @@ -46,7 +46,7 @@ let versionLister = xfce.gitLister src.meta.homepage; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://gitlab.xfce.org/${category}/${pname}/about"; license = licenses.gpl2; # some libraries are under LGPLv2+ platforms = platforms.linux; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin.nix index 38ad759e700c..e8945b3e55b2 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, glib, exo, libXtst, xorgproto, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk3, hicolor-icon-theme, xfce }: +{ lib, stdenv, fetchurl, pkgconfig, intltool, glib, exo, libXtst, xorgproto, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk3, hicolor-icon-theme, xfce }: let category = "panel-plugins"; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { versionLister = xfce.archiveLister category pname; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://docs.xfce.org/panel-plugins/xfce4-cpugraph-plugin"; description = "CPU graph show for Xfce panel"; license = licenses.gpl2Plus; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-datetime-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-datetime-plugin/default.nix index 15f528fd5fc7..aa14c878b12a 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-datetime-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-datetime-plugin/default.nix @@ -1,5 +1,5 @@ { mkXfceDerivation -, stdenv +, lib, stdenv , intltool , libxfce4ui , xfce4-panel @@ -26,7 +26,7 @@ mkXfceDerivation { xfce4-panel ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Shows the date and time in the panel, and a calendar appears when you left-click on it"; maintainers = [ maintainers.AndersonTorres ]; }; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin.nix index 673b0a24fb61..6c75b44d77ac 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgconfig, fetchFromGitHub, python2, bash, vala_0_46 +{ lib, stdenv, pkgconfig, fetchFromGitHub, python2, bash, vala_0_46 , dockbarx, gtk2, xfce, pythonPackages, wafHook }: stdenv.mkDerivation rec { @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { wrapPythonProgramsIn "$out/share/xfce4/panel/plugins" "$out $pythonPath" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/TiZ-EX1/xfce4-dockbarx-plugin"; description = "A plugins to embed DockbarX into xfce4-panel"; license = licenses.mit; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin.nix index d8f612d1a81b..edd317918d88 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk3, xfce }: +{ lib, stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk3, xfce }: let category = "panel-plugins"; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { versionLister = xfce.archiveLister category pname; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://docs.xfce.org/panel-plugins/xfce4-eyes-plugin"; description = "Rolling eyes (following mouse pointer) plugin for the Xfce panel"; license = licenses.gpl2Plus; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin.nix index b67e63f5c644..31bb89198f65 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk3, xfce }: +{ lib, stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk3, xfce }: let category = "panel-plugins"; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { versionLister = xfce.archiveLister category pname; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://docs.xfce.org/panel-plugins/xfce4-fsguard-plugin"; description = "Filesystem usage monitor plugin for the Xfce panel"; license = licenses.bsd2; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin.nix index 417001fed53b..4566a140dd36 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, gtk3, xfce }: +{ lib, stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, gtk3, xfce }: let category = "panel-plugins"; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { versionLister = xfce.archiveLister category pname; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://docs.xfce.org/panel-plugins/xfce4-genmon-plugin"; description = "Generic monitor plugin for the Xfce panel"; license = licenses.gpl2Plus; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin.nix index d8775c4b7045..bc8d9ff32768 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, autoreconfHook, gnome2, gtkmm2, +{ lib, stdenv, fetchurl, pkgconfig, intltool, autoreconfHook, gnome2, gtkmm2, libgtop, libxfce4ui, libxfce4util, xfce4-panel, lm_sensors, xfce }: @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://goodies.xfce.org/projects/panel-plugins/xfce4-hardware-monitor-plugin"; description = "Hardware monitor plugin for the XFCE4 panel"; license = licenses.gpl3; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix index 3d60d8b18f9a..b3d1f6e71591 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, +{ lib, stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, gtk2, exo, gnutls, libgcrypt, xfce }: let @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { versionLister = xfce.archiveLister category pname; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://docs.xfce.org/panel-plugins/xfce4-mailwatch-plugin"; description = "Mail watcher plugin for Xfce panel"; license = licenses.gpl2; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin.nix index bb56e875c865..dddbf79522e7 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, +{ lib, stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, gtk3, exo, xfce }: let @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { versionLister = xfce.archiveLister category pname; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://docs.xfce.org/panel-plugins/xfce4-mpc-plugin"; description = "MPD plugin for Xfce panel"; platforms = platforms.linux; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin.nix index fcd40462f6d6..92d39fc8fbbc 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgconfig, fetchFromGitHub, python2, vala_0_46 +{ lib, stdenv, pkgconfig, fetchFromGitHub, python3, vala_0_46 , gtk3, libwnck3, libxfce4util, xfce4-panel, wafHook, xfce }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0l70f6mzkscsj4wr43wp5c0l2qnf85vj24cv02bjrh3bzz6wkak8"; }; - nativeBuildInputs = [ pkgconfig vala_0_46 wafHook ]; + nativeBuildInputs = [ pkgconfig vala_0_46 wafHook python3 ]; buildInputs = [ gtk3 libwnck3 libxfce4util xfce4-panel ]; postPatch = '' @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { rev-prefix = "v"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/HugLifeTiZ/xfce4-namebar-plugin"; description = "Plugin which integrates titlebar and window controls into the xfce4-panel"; license = licenses.mit; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin.nix index d6910d367a63..70586d1bc345 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk2, libunique, xfce }: +{ lib, stdenv, fetchurl, fetchpatch, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk2, libunique, xfce }: let category = "panel-plugins"; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { versionLister = xfce.archiveLister category pname; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://docs.xfce.org/panel-plugins/xfce4-notes-plugin"; description = "Sticky notes plugin for Xfce panel"; license = licenses.gpl2Plus; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin.nix index 8b8dbf3e022c..61237856d5d3 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libxfce4ui, +{ lib, stdenv, fetchurl, pkgconfig, intltool, gtk3, libxfce4ui, libxfce4util, xfce4-panel, libnotify, lm_sensors, hddtemp, netcat-gnu, xfce }: @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { versionLister = xfce.archiveLister category pname; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://docs.xfce.org/panel-plugins/xfce4-sensors-plugin"; description = "A panel plug-in for different sensors using acpi, lm_sensors and hddtemp"; license = licenses.gpl2; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin.nix index 52da6a29ea42..c1a5dfecbba6 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, gtk3, xfce }: +{ lib, stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, gtk3, xfce }: let category = "panel-plugins"; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { versionLister = xfce.archiveLister category pname; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://docs.xfce.org/panel-plugins/xfce4-systemload-plugin"; description = "System load plugin for Xfce panel"; license = licenses.bsd2; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin.nix index e9cfbd50f912..27e9c098974c 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, gtk3, hicolor-icon-theme, xfce }: +{ lib, stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, gtk3, hicolor-icon-theme, xfce }: let category = "panel-plugins"; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { versionLister = xfce.archiveLister category pname; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://docs.xfce.org/panel-plugins/xfce4-timer-plugin"; description = "Simple countdown and alarm plugin for the Xfce panel"; platforms = platforms.linux; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/appmenu-gtk-module.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/appmenu-gtk-module.nix index 39393dd39e9f..e35dc5922d93 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/appmenu-gtk-module.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/appmenu-gtk-module.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, vala, glib, gtk2, gtk3 }: +{ lib, stdenv, fetchFromGitHub, cmake, vala, glib, gtk2, gtk3 }: stdenv.mkDerivation rec { pname = "vala-panel-appmenu-xfce"; version = "0.6.94"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { cp -r output/var/empty/* "$out" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Port of the Unity GTK Module"; license = licenses.lgpl3; maintainers = with maintainers; [ jD91mZM2 ]; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix index 525bd6e5fd7d..ce90dd6809df 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, substituteAll, callPackage, pkgconfig, cmake, vala, libxml2, +{ lib, stdenv, fetchFromGitHub, substituteAll, callPackage, pkgconfig, cmake, vala, libxml2, glib, pcre, gtk2, gtk3, xorg, libxkbcommon, epoxy, at-spi2-core, dbus-glib, bamf, xfce, libwnck3, libdbusmenu, gobject-introspection }: @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { versionLister = xfce.gitLister src.meta.homepage; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Global Menu applet for XFCE4"; license = licenses.lgpl3; maintainers = with maintainers; [ jD91mZM2 ]; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin.nix index cff2ef251ad4..fae85cb64697 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libxml2, libsoup, upower, +{ lib, stdenv, fetchurl, pkgconfig, intltool, gtk3, libxml2, libsoup, upower, libxfce4ui, libxfce4util, xfce4-panel, hicolor-icon-theme, xfce }: let @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { versionLister = xfce.archiveLister category pname; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://docs.xfce.org/panel-plugins/xfce4-weather-plugin"; description = "Weather plugin for the Xfce desktop environment"; license = licenses.gpl2Plus; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin.nix index e629a08c5537..f5cf3899b023 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, intltool, python3, imagemagick, libwnck, gtk2 +{ lib, stdenv, fetchFromGitHub, pkgconfig, intltool, python3, imagemagick, libwnck, gtk2 , exo, libxfce4ui, libxfce4util, xfce4-panel, xfconf, xfce4-dev-tools, xfce }: stdenv.mkDerivation rec { @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { rev-prefix = "v"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://goodies.xfce.org/projects/panel-plugins/xfce4-windowck-plugin"; description = "Xfce plugins which allows to put the maximized window title and buttons on the panel"; license = licenses.gpl2Plus; diff --git a/pkgs/desktops/xfce/thunar-plugins/archive/default.nix b/pkgs/desktops/xfce/thunar-plugins/archive/default.nix index 6b255dc72012..985b067a02fb 100644 --- a/pkgs/desktops/xfce/thunar-plugins/archive/default.nix +++ b/pkgs/desktops/xfce/thunar-plugins/archive/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , mkXfceDerivation , gtk3 , thunar @@ -31,7 +31,7 @@ mkXfceDerivation { ./autogen.sh ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Thunar plugin providing file context menus for archives"; }; } diff --git a/pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix b/pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix index 61e9d94acc5d..85a8b95dc002 100644 --- a/pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix +++ b/pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , pkgconfig , gtk3 @@ -30,15 +30,13 @@ stdenv.mkDerivation rec { gtk3 ]; - enableParallelBuilding = true; - passthru.updateScript = xfce.updateScript { inherit pname version; attrPath = "xfce.thunar-dropbox-plugin"; versionLister = xfce.gitLister src.meta.homepage; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/Jeinzi/thunar-dropbox"; description = "A plugin that adds context-menu items for Dropbox to Thunar"; license = licenses.gpl3; diff --git a/pkgs/development/arduino/arduino-ci/default.nix b/pkgs/development/arduino/arduino-ci/default.nix index b6b1fc9c89d1..2f5d4bedc7fe 100644 --- a/pkgs/development/arduino/arduino-ci/default.nix +++ b/pkgs/development/arduino/arduino-ci/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, makeWrapper, arduino-cli, ruby, python3 }: +{ lib, stdenv, fetchFromGitHub, makeWrapper, arduino-cli, ruby, python3 }: let @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/arduino-ci --prefix PATH ":" "${runtimePath}" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "CI for Arduino Libraries"; homepage = src.meta.homepage; license = licenses.mit; diff --git a/pkgs/development/arduino/arduino-cli/default.nix b/pkgs/development/arduino/arduino-cli/default.nix index 1b1116a74b5d..f3cc83417776 100644 --- a/pkgs/development/arduino/arduino-cli/default.nix +++ b/pkgs/development/arduino/arduino-cli/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, buildFHSUserEnv }: +{ lib, stdenv, buildGoModule, fetchFromGitHub, buildFHSUserEnv }: let @@ -23,7 +23,7 @@ let "-ldflags=-s -w -X github.com/arduino/arduino-cli/version.versionString=${version} -X github.com/arduino/arduino-cli/version.commit=unknown" ] ++ stdenv.lib.optionals stdenv.isLinux [ "-extldflags '-static'" ]; - meta = with stdenv.lib; { + meta = with lib; { inherit (src.meta) homepage; description = "Arduino from the command line"; license = licenses.gpl3Only; diff --git a/pkgs/development/arduino/arduino-core/default.nix b/pkgs/development/arduino/arduino-core/default.nix index 07e9c7bdb028..081c7c7c6385 100644 --- a/pkgs/development/arduino/arduino-core/default.nix +++ b/pkgs/development/arduino/arduino-core/default.nix @@ -112,7 +112,10 @@ stdenv.mkDerivation rec { }; - nativeBuildInputs = [ wrapGAppsHook ]; + # the glib setup hook will populate GSETTINGS_SCHEMAS_PATH, + # wrapGAppHooks (among other things) adds it to XDG_DATA_DIRS + # so 'save as...' works: + nativeBuildInputs = [ glib wrapGAppsHook ]; buildInputs = [ jdk ant @@ -241,7 +244,7 @@ stdenv.mkDerivation rec { ''} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Open-source electronics prototyping platform"; homepage = "http://arduino.cc/"; license = if withTeensyduino then licenses.unfreeRedistributable else licenses.gpl2; diff --git a/pkgs/development/arduino/platformio/core.nix b/pkgs/development/arduino/platformio/core.nix index a039314d753d..733e7e0b1462 100644 --- a/pkgs/development/arduino/platformio/core.nix +++ b/pkgs/development/arduino/platformio/core.nix @@ -107,7 +107,7 @@ in buildPythonApplication rec { --subst-var-by SPDX_LICENSE_LIST_DATA '${spdx-license-list-data}' ''; - meta = with stdenv.lib; { + meta = with lib; { broken = stdenv.isAarch64; description = "An open source ecosystem for IoT development"; homepage = "http://platformio.org"; diff --git a/pkgs/development/arduino/platformio/default.nix b/pkgs/development/arduino/platformio/default.nix index 248d07adf6e1..194385e79529 100644 --- a/pkgs/development/arduino/platformio/default.nix +++ b/pkgs/development/arduino/platformio/default.nix @@ -4,14 +4,14 @@ let callPackage = newScope self; - version = "5.0.3"; + version = "5.0.4"; # pypi tarballs don't contain tests - https://github.com/platformio/platformio-core/issues/1964 src = fetchFromGitHub { owner = "platformio"; repo = "platformio-core"; rev = "v${version}"; - sha256 = "0sf5dy0cmhy66rmk0hq1by7nrmf7qz0a99hrk55dpbp6r6vnk3hw"; + sha256 = "15jnhlhkk9z6cyzxw065r3080dqan951klwf65p152vfzg79wf84"; }; self = { diff --git a/pkgs/development/compilers/cakelisp/default.nix b/pkgs/development/compilers/cakelisp/default.nix new file mode 100644 index 000000000000..500c15a2aaa2 --- /dev/null +++ b/pkgs/development/compilers/cakelisp/default.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchFromGitHub, gcc }: + +stdenv.mkDerivation rec { + pname = "cakelisp"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "makuto"; + repo = "cakelisp"; + rev = "v${version}"; + sha256 = "126va59jy7rvy6c2wrf8j44m307f2d8jixqkc49s9wllxprj1dmg"; + }; + + buildInputs = [ gcc ]; + + postPatch = '' + substituteInPlace runtime/HotReloading.cake \ + --replace '"/usr/bin/g++"' '"${gcc}/bin/g++"' + substituteInPlace src/ModuleManager.cpp \ + --replace '"/usr/bin/g++"' '"${gcc}/bin/g++"' + '' + stdenv.lib.optionalString stdenv.isDarwin '' + substituteInPlace Build.sh --replace '--export-dynamic' '-export_dynamic' + substituteInPlace runtime/HotReloading.cake --replace '--export-dynamic' '-export_dynamic' + substituteInPlace Bootstrap.cake --replace '--export-dynamic' '-export_dynamic' + ''; + + buildPhase = '' + ./Build.sh + ''; + + installPhase = '' + install -Dm755 bin/cakelisp -t $out/bin + ''; + + meta = with stdenv.lib; { + description = "A performance-oriented Lisp-like language"; + homepage = "https://github.com/makuto/cakelisp"; + license = licenses.gpl3Plus; + platforms = platforms.darwin ++ platforms.linux; + maintainers = [ maintainers.sbond75 ]; + }; +} diff --git a/pkgs/development/compilers/computecpp/default.nix b/pkgs/development/compilers/computecpp/default.nix index 7cfc60f050e4..acdcc2014f89 100644 --- a/pkgs/development/compilers/computecpp/default.nix +++ b/pkgs/development/compilers/computecpp/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "computecpp"; - version = "2.2.1"; + version = "2.3.0"; src = fetchzip { url = "https://computecpp.codeplay.com/downloads/computecpp-ce/${version}/x86_64-linux-gnu.tar.gz"; - hash = "sha256-niXNWbkXjd35col6dS66HdxFurXfJw/Xb2c5njukxcg="; + hash = "sha256-AUHSls4BOX20PVKzDAp3RqpeRDwgbgYzz6CRvRN+kdk="; stripRoot = true; }; diff --git a/pkgs/development/compilers/cudatoolkit/default.nix b/pkgs/development/compilers/cudatoolkit/default.nix index cd4af47a21e3..b3b7b305fba6 100644 --- a/pkgs/development/compilers/cudatoolkit/default.nix +++ b/pkgs/development/compilers/cudatoolkit/default.nix @@ -146,5 +146,12 @@ in rec { gcc = gcc9; }; - cudatoolkit_11 = cudatoolkit_11_0; + cudatoolkit_11_1 = common { + version = "11.1.1"; + url = "https://developer.download.nvidia.com/compute/cuda/11.1.1/local_installers/cuda_11.1.1_455.32.00_linux.run"; + sha256 = "13yxv2fgvdnqqbwh1zb80x4xhyfkbajfkwyfpdg9493010kngbiy"; + gcc = gcc9; + }; + + cudatoolkit_11 = cudatoolkit_11_1; } diff --git a/pkgs/development/compilers/dale/default.nix b/pkgs/development/compilers/dale/default.nix index cbe4e7ec9260..ef32b37ef99c 100644 --- a/pkgs/development/compilers/dale/default.nix +++ b/pkgs/development/compilers/dale/default.nix @@ -1,18 +1,16 @@ { stdenv , fetchFromGitHub , cmake -, pkgconfig +, pkg-config , libffi , llvm_6 , doCheck ? false , perl }: -let version = "20181024"; - -in stdenv.mkDerivation { +stdenv.mkDerivation { pname = "dale"; - inherit version; + version = "20181024"; src = fetchFromGitHub { owner = "tomhrr"; @@ -21,16 +19,14 @@ in stdenv.mkDerivation { sha256 = "0v4ajrzrqvf279kd7wsd9flrpsav57lzxlwwimk9vnfwh7xpzf9v"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake libffi llvm_6 ] - ++ stdenv.lib.optional doCheck perl; + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ libffi llvm_6 ]; inherit doCheck; + checkInputs = [ perl ]; checkTarget = "tests"; - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "Lisp-flavoured C"; longDescription = '' diff --git a/pkgs/development/compilers/flutter/default.nix b/pkgs/development/compilers/flutter/default.nix index baab0583fb0c..3eea7f596b6b 100644 --- a/pkgs/development/compilers/flutter/default.nix +++ b/pkgs/development/compilers/flutter/default.nix @@ -1,5 +1,4 @@ { callPackage, dart }: - let dart_stable = dart.override { version = "2.10.0"; }; dart_beta = dart.override { version = "2.10.0"; }; @@ -8,7 +7,8 @@ let getPatches = dir: let files = builtins.attrNames (builtins.readDir dir); in map (f: dir + ("/" + f)) files; -in { +in +{ mkFlutter = mkFlutter; stable = mkFlutter rec { pname = "flutter"; diff --git a/pkgs/development/compilers/flutter/flutter.nix b/pkgs/development/compilers/flutter/flutter.nix index 7fda2d616f3e..b7769e88af39 100644 --- a/pkgs/development/compilers/flutter/flutter.nix +++ b/pkgs/development/compilers/flutter/flutter.nix @@ -1,10 +1,36 @@ -{ channel, pname, version, sha256Hash, patches, dart -, filename ? "flutter_linux_${version}-${channel}.tar.xz"}: - -{ bash, buildFHSUserEnv, cacert, coreutils, git, makeWrapper, runCommand, stdenv -, fetchurl, alsaLib, dbus, expat, libpulseaudio, libuuid, libX11, libxcb -, libXcomposite, libXcursor, libXdamage, libXfixes, libGL, nspr, nss, systemd }: +{ channel +, pname +, version +, sha256Hash +, patches +, dart +, filename ? "flutter_linux_${version}-${channel}.tar.xz" +}: +{ bash +, buildFHSUserEnv +, cacert +, coreutils +, git +, runCommand +, stdenv +, fetchurl +, alsaLib +, dbus +, expat +, libpulseaudio +, libuuid +, libX11 +, libxcb +, libXcomposite +, libXcursor +, libXdamage +, libXfixes +, libGL +, nspr +, nss +, systemd +}: let drvName = "flutter-${channel}-${version}"; flutter = stdenv.mkDerivation { @@ -16,7 +42,7 @@ let sha256 = sha256Hash; }; - buildInputs = [ makeWrapper git ]; + buildInputs = [ git ]; inherit patches; @@ -31,28 +57,27 @@ let SNAPSHOT_PATH="$FLUTTER_ROOT/bin/cache/flutter_tools.snapshot" STAMP_PATH="$FLUTTER_ROOT/bin/cache/flutter_tools.stamp" SCRIPT_PATH="$FLUTTER_TOOLS_DIR/bin/flutter_tools.dart" - DART_SDK_PATH="$FLUTTER_ROOT/bin/cache/dart-sdk" - - DART="$DART_SDK_PATH/bin/dart" - PUB="$DART_SDK_PATH/bin/pub" + DART_SDK_PATH="${dart}" HOME=../.. # required for pub upgrade --offline, ~/.pub-cache # path is relative otherwise it's replaced by /build/flutter - (cd "$FLUTTER_TOOLS_DIR" && "$PUB" upgrade --offline) + (cd "$FLUTTER_TOOLS_DIR" && ${dart}/bin/pub upgrade --offline) local revision="$(cd "$FLUTTER_ROOT"; git rev-parse HEAD)" - "$DART" --snapshot="$SNAPSHOT_PATH" --packages="$FLUTTER_TOOLS_DIR/.packages" "$SCRIPT_PATH" + ${dart}/bin/dart --snapshot="$SNAPSHOT_PATH" --packages="$FLUTTER_TOOLS_DIR/.packages" "$SCRIPT_PATH" echo "$revision" > "$STAMP_PATH" echo -n "${version}" > version - rm -rf bin/cache/{artifacts,downloads} + rm -rf bin/cache/{artifacts,dart-sdk,downloads} rm -f bin/cache/*.stamp ''; installPhase = '' mkdir -p $out cp -r . $out + mkdir -p $out/bin/cache/ + ln -sf ${dart} $out/bin/cache/dart-sdk ''; }; @@ -100,7 +125,9 @@ let ]; }; -in runCommand drvName { +in +runCommand drvName +{ startScript = '' #!${bash}/bin/bash export PUB_CACHE=''${PUB_CACHE:-"$HOME/.pub-cache"} @@ -126,8 +153,4 @@ in runCommand drvName { echo -n "$startScript" > $out/bin/${pname} chmod +x $out/bin/${pname} - - mkdir -p $out/bin/cache/dart-sdk/ - cp -r ${dart}/* $out/bin/cache/dart-sdk/ - ln $out/bin/cache/dart-sdk/bin/dart $out/bin/dart '' diff --git a/pkgs/development/compilers/gcc/10/Added-mcf-thread-model-support-from-mcfgthread.patch b/pkgs/development/compilers/gcc/10/Added-mcf-thread-model-support-from-mcfgthread.patch new file mode 100644 index 000000000000..d9809e828f10 --- /dev/null +++ b/pkgs/development/compilers/gcc/10/Added-mcf-thread-model-support-from-mcfgthread.patch @@ -0,0 +1,306 @@ +From 86f2f767ddffd9f7c6f1470b987ae7b0d251b988 Mon Sep 17 00:00:00 2001 +From: Liu Hao +Date: Wed, 25 Apr 2018 21:54:19 +0800 +Subject: [PATCH] Added 'mcf' thread model support from mcfgthread. + +Signed-off-by: Liu Hao +--- + config/gthr.m4 | 1 + + gcc/config.gcc | 3 +++ + gcc/config/i386/mingw-mcfgthread.h | 1 + + gcc/config/i386/mingw-w64.h | 2 +- + gcc/config/i386/mingw32.h | 11 ++++++++++- + gcc/configure | 2 +- + gcc/configure.ac | 2 +- + libatomic/configure.tgt | 2 +- + libgcc/config.host | 6 ++++++ + libgcc/config/i386/gthr-mcf.h | 1 + + libgcc/config/i386/t-mingw-mcfgthread | 2 ++ + libgcc/configure | 1 + + libstdc++-v3/configure | 1 + + libstdc++-v3/libsupc++/atexit_thread.cc | 18 ++++++++++++++++++ + libstdc++-v3/libsupc++/guard.cc | 23 +++++++++++++++++++++++ + libstdc++-v3/src/c++11/thread.cc | 9 +++++++++ + 16 files changed, 80 insertions(+), 5 deletions(-) + create mode 100644 gcc/config/i386/mingw-mcfgthread.h + create mode 100644 libgcc/config/i386/gthr-mcf.h + create mode 100644 libgcc/config/i386/t-mingw-mcfgthread + +diff --git a/config/gthr.m4 b/config/gthr.m4 +index 7b29f1f3327..82e21fe1709 100644 +--- a/config/gthr.m4 ++++ b/config/gthr.m4 +@@ -21,6 +21,7 @@ case $1 in + tpf) thread_header=config/s390/gthr-tpf.h ;; + vxworks) thread_header=config/gthr-vxworks.h ;; + win32) thread_header=config/i386/gthr-win32.h ;; ++ mcf) thread_header=config/i386/gthr-mcf.h ;; + esac + AC_SUBST(thread_header) + ]) +diff --git a/gcc/config.gcc b/gcc/config.gcc +index 46a9029acec..112c24e95a3 100644 +--- a/gcc/config.gcc ++++ b/gcc/config.gcc +@@ -1758,6 +1758,9 @@ i[34567]86-*-mingw* | x86_64-*-mingw*) + if test x$enable_threads = xposix ; then + tm_file="${tm_file} i386/mingw-pthread.h" + fi ++ if test x$enable_threads = xmcf ; then ++ tm_file="${tm_file} i386/mingw-mcfgthread.h" ++ fi + tm_file="${tm_file} i386/mingw32.h" + # This makes the logic if mingw's or the w64 feature set has to be used + case ${target} in +diff --git a/gcc/config/i386/mingw-mcfgthread.h b/gcc/config/i386/mingw-mcfgthread.h +new file mode 100644 +index 00000000000..ec381a7798f +--- /dev/null ++++ b/gcc/config/i386/mingw-mcfgthread.h +@@ -0,0 +1 @@ ++#define TARGET_USE_MCFGTHREAD 1 +diff --git a/gcc/config/i386/mingw-w64.h b/gcc/config/i386/mingw-w64.h +index 484dc7a9e9f..a15bbeea500 100644 +--- a/gcc/config/i386/mingw-w64.h ++++ b/gcc/config/i386/mingw-w64.h +@@ -48,7 +48,7 @@ along with GCC; see the file COPYING3. If not see + "%{mwindows:-lgdi32 -lcomdlg32} " \ + "%{fvtable-verify=preinit:-lvtv -lpsapi; \ + fvtable-verify=std:-lvtv -lpsapi} " \ +- "-ladvapi32 -lshell32 -luser32 -lkernel32" ++ LIB_MCFGTHREAD "-ladvapi32 -lshell32 -luser32 -lkernel32" + + #undef SPEC_32 + #undef SPEC_64 +diff --git a/gcc/config/i386/mingw32.h b/gcc/config/i386/mingw32.h +index 0612b87199a..76cea94f3b7 100644 +--- a/gcc/config/i386/mingw32.h ++++ b/gcc/config/i386/mingw32.h +@@ -32,6 +32,14 @@ along with GCC; see the file COPYING3. If not see + | MASK_STACK_PROBE | MASK_ALIGN_DOUBLE \ + | MASK_MS_BITFIELD_LAYOUT) + ++#ifndef TARGET_USE_MCFGTHREAD ++#define CPP_MCFGTHREAD() ((void)0) ++#define LIB_MCFGTHREAD "" ++#else ++#define CPP_MCFGTHREAD() (builtin_define("__USING_MCFGTHREAD__")) ++#define LIB_MCFGTHREAD " -lmcfgthread " ++#endif ++ + /* See i386/crtdll.h for an alternative definition. _INTEGRAL_MAX_BITS + is for compatibility with native compiler. */ + #define EXTRA_OS_CPP_BUILTINS() \ +@@ -50,6 +58,7 @@ along with GCC; see the file COPYING3. If not see + builtin_define_std ("WIN64"); \ + builtin_define ("_WIN64"); \ + } \ ++ CPP_MCFGTHREAD(); \ + } \ + while (0) + +@@ -93,7 +102,7 @@ along with GCC; see the file COPYING3. If not see + "%{mwindows:-lgdi32 -lcomdlg32} " \ + "%{fvtable-verify=preinit:-lvtv -lpsapi; \ + fvtable-verify=std:-lvtv -lpsapi} " \ +- "-ladvapi32 -lshell32 -luser32 -lkernel32" ++ LIB_MCFGTHREAD "-ladvapi32 -lshell32 -luser32 -lkernel32" + + /* Weak symbols do not get resolved if using a Windows dll import lib. + Make the unwind registration references strong undefs. */ +diff --git a/gcc/configure b/gcc/configure +index 6121e163259..52f0e00efe6 100755 +--- a/gcc/configure ++++ b/gcc/configure +@@ -11693,7 +11693,7 @@ case ${enable_threads} in + target_thread_file='single' + ;; + aix | dce | lynx | mipssde | posix | rtems | \ +- single | tpf | vxworks | win32) ++ single | tpf | vxworks | win32 | mcf) + target_thread_file=${enable_threads} + ;; + *) +diff --git a/gcc/configure.ac b/gcc/configure.ac +index b066cc609e1..4ecdba88de7 100644 +--- a/gcc/configure.ac ++++ b/gcc/configure.ac +@@ -1612,7 +1612,7 @@ case ${enable_threads} in + target_thread_file='single' + ;; + aix | dce | lynx | mipssde | posix | rtems | \ +- single | tpf | vxworks | win32) ++ single | tpf | vxworks | win32 | mcf) + target_thread_file=${enable_threads} + ;; + *) +diff --git a/libatomic/configure.tgt b/libatomic/configure.tgt +index ea8c34f8c71..23134ad7363 100644 +--- a/libatomic/configure.tgt ++++ b/libatomic/configure.tgt +@@ -145,7 +145,7 @@ case "${target}" in + *-*-mingw*) + # OS support for atomic primitives. + case ${target_thread_file} in +- win32) ++ win32 | mcf) + config_path="${config_path} mingw" + ;; + posix) +diff --git a/libgcc/config.host b/libgcc/config.host +index 11b4acaff55..9fbd38650bd 100644 +--- a/libgcc/config.host ++++ b/libgcc/config.host +@@ -737,6 +737,9 @@ i[34567]86-*-mingw*) + posix) + tmake_file="i386/t-mingw-pthread $tmake_file" + ;; ++ mcf) ++ tmake_file="i386/t-mingw-mcfgthread $tmake_file" ++ ;; + esac + # This has to match the logic for DWARF2_UNWIND_INFO in gcc/config/i386/cygming.h + if test x$ac_cv_sjlj_exceptions = xyes; then +@@ -761,6 +764,9 @@ x86_64-*-mingw*) + posix) + tmake_file="i386/t-mingw-pthread $tmake_file" + ;; ++ mcf) ++ tmake_file="i386/t-mingw-mcfgthread $tmake_file" ++ ;; + esac + # This has to match the logic for DWARF2_UNWIND_INFO in gcc/config/i386/cygming.h + if test x$ac_cv_sjlj_exceptions = xyes; then +diff --git a/libgcc/config/i386/gthr-mcf.h b/libgcc/config/i386/gthr-mcf.h +new file mode 100644 +index 00000000000..5ea2908361f +--- /dev/null ++++ b/libgcc/config/i386/gthr-mcf.h +@@ -0,0 +1 @@ ++#include +diff --git a/libgcc/config/i386/t-mingw-mcfgthread b/libgcc/config/i386/t-mingw-mcfgthread +new file mode 100644 +index 00000000000..4b9b10e32d6 +--- /dev/null ++++ b/libgcc/config/i386/t-mingw-mcfgthread +@@ -0,0 +1,2 @@ ++SHLIB_PTHREAD_CFLAG = ++SHLIB_PTHREAD_LDFLAG = -lmcfgthread +diff --git a/libgcc/configure b/libgcc/configure +index b2f3f870844..eff889dc3b3 100644 +--- a/libgcc/configure ++++ b/libgcc/configure +@@ -5451,6 +5451,7 @@ case $target_thread_file in + tpf) thread_header=config/s390/gthr-tpf.h ;; + vxworks) thread_header=config/gthr-vxworks.h ;; + win32) thread_header=config/i386/gthr-win32.h ;; ++ mcf) thread_header=config/i386/gthr-mcf.h ;; + esac + + +diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure +index ba094be6f15..979a5ab9ace 100755 +--- a/libstdc++-v3/configure ++++ b/libstdc++-v3/configure +@@ -15187,6 +15187,7 @@ case $target_thread_file in + tpf) thread_header=config/s390/gthr-tpf.h ;; + vxworks) thread_header=config/gthr-vxworks.h ;; + win32) thread_header=config/i386/gthr-win32.h ;; ++ mcf) thread_header=config/i386/gthr-mcf.h ;; + esac + + +diff --git a/libstdc++-v3/libsupc++/atexit_thread.cc b/libstdc++-v3/libsupc++/atexit_thread.cc +index de920d714c6..665fb74bd6b 100644 +--- a/libstdc++-v3/libsupc++/atexit_thread.cc ++++ b/libstdc++-v3/libsupc++/atexit_thread.cc +@@ -25,6 +25,22 @@ + #include + #include + #include "bits/gthr.h" ++ ++#ifdef __USING_MCFGTHREAD__ ++ ++#include ++ ++extern "C" int ++__cxxabiv1::__cxa_thread_atexit (void (*dtor)(void *), ++ void *obj, void *dso_handle) ++ _GLIBCXX_NOTHROW ++{ ++ return ::_MCFCRT_AtThreadExit((void (*)(_MCFCRT_STD intptr_t))dtor, (_MCFCRT_STD intptr_t)obj) ? 0 : -1; ++ (void)dso_handle; ++} ++ ++#else // __USING_MCFGTHREAD__ ++ + #ifdef _GLIBCXX_THREAD_ATEXIT_WIN32 + #define WIN32_LEAN_AND_MEAN + #include +@@ -167,3 +183,5 @@ __cxxabiv1::__cxa_thread_atexit (void (*dtor)(void *), void *obj, void */*dso_ha + } + + #endif /* _GLIBCXX_HAVE___CXA_THREAD_ATEXIT_IMPL */ ++ ++#endif // __USING_MCFGTHREAD__ +diff --git a/libstdc++-v3/libsupc++/guard.cc b/libstdc++-v3/libsupc++/guard.cc +index 3a2ec3ad0d6..8b4cc96199b 100644 +--- a/libstdc++-v3/libsupc++/guard.cc ++++ b/libstdc++-v3/libsupc++/guard.cc +@@ -28,6 +28,27 @@ + #include + #include + #include ++ ++#ifdef __USING_MCFGTHREAD__ ++ ++#include ++ ++namespace __cxxabiv1 { ++ ++extern "C" int __cxa_guard_acquire(__guard *g){ ++ return ::_MCFCRT_WaitForOnceFlagForever((::_MCFCRT_OnceFlag *)g) == ::_MCFCRT_kOnceResultInitial; ++} ++extern "C" void __cxa_guard_abort(__guard *g) throw() { ++ ::_MCFCRT_SignalOnceFlagAsAborted((::_MCFCRT_OnceFlag *)g); ++} ++extern "C" void __cxa_guard_release(__guard *g) throw() { ++ ::_MCFCRT_SignalOnceFlagAsFinished((::_MCFCRT_OnceFlag *)g); ++} ++ ++} ++ ++#else // __USING_MCFGTHREAD__ ++ + #include + #include + #include +@@ -425,3 +446,5 @@ namespace __cxxabiv1 + #endif + } + } ++ ++#endif +diff --git a/libstdc++-v3/src/c++11/thread.cc b/libstdc++-v3/src/c++11/thread.cc +index 8238817c2e9..0c6a1f85f6f 100644 +--- a/libstdc++-v3/src/c++11/thread.cc ++++ b/libstdc++-v3/src/c++11/thread.cc +@@ -55,6 +55,15 @@ static inline int get_nprocs() + #elif defined(_GLIBCXX_USE_SC_NPROC_ONLN) + # include + # define _GLIBCXX_NPROCS sysconf(_SC_NPROC_ONLN) ++#elif defined(_WIN32) ++# include ++static inline int get_nprocs() ++{ ++ SYSTEM_INFO sysinfo; ++ GetSystemInfo(&sysinfo); ++ return (int)sysinfo.dwNumberOfProcessors; ++} ++# define _GLIBCXX_NPROCS get_nprocs() + #else + # define _GLIBCXX_NPROCS 0 + #endif +-- +2.17.0 + diff --git a/pkgs/development/compilers/gcc/10/default.nix b/pkgs/development/compilers/gcc/10/default.nix index 4f05cd3144cd..c31e7c426e02 100644 --- a/pkgs/development/compilers/gcc/10/default.nix +++ b/pkgs/development/compilers/gcc/10/default.nix @@ -7,7 +7,12 @@ , profiledCompiler ? false , langJit ? false , staticCompiler ? false -, enableShared ? true +, # N.B. the defult is intentionally not from an `isStatic`. See + # https://gcc.gnu.org/install/configure.html - this is about target + # platform libraries not host platform ones unlike normal. But since + # we can't rebuild those without also rebuilding the compiler itself, + # we opt to always build everything unlike our usual policy. + enableShared ? true , enableLTO ? true , texinfo ? null , perl ? null # optional, for texi2pod (then pod2man) @@ -61,10 +66,9 @@ let majorVersion = "10"; ++ optional langAda ../gnat-cflags.patch ++ optional langFortran ../gfortran-driving.patch ++ optional (targetPlatform.libc == "musl" && targetPlatform.isPower) ../ppc-musl.patch - ++ optional (!crossStageStatic && targetPlatform.isMinGW) (fetchpatch { - url = "https://raw.githubusercontent.com/lhmouse/MINGW-packages/${import ../common/mfcgthreads-patches-repo.nix}/mingw-w64-gcc-git/9000-gcc-${majorVersion}-branch-Added-mcf-thread-model-support-from-mcfgthread.patch"; - sha256 = "1in5kvcknlpi9z1vvjw6jfmwy8k12zvbqlqfnq84qpm99r0rh00a"; - }); + + # Obtain latest patch with ../update-mcfgthread-patches.sh + ++ optional (!crossStageStatic && targetPlatform.isMinGW) ./Added-mcf-thread-model-support-from-mcfgthread.patch; /* Cross-gcc settings (build == host != target) */ crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt"; @@ -137,10 +141,10 @@ stdenv.mkDerivation ({ ) else "") + stdenv.lib.optionalString targetPlatform.isAvr '' - makeFlagsArray+=( - 'LIMITS_H_TEST=false' - ) - ''; + makeFlagsArray+=( + 'LIMITS_H_TEST=false' + ) + ''; inherit noSysDirs staticCompiler crossStageStatic libcCross crossMingw; diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index 213d0c91ff34..617a19e238ba 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -7,7 +7,12 @@ , profiledCompiler ? false , langJit ? false , staticCompiler ? false -, enableShared ? true +, # N.B. the defult is intentionally not from an `isStatic`. See + # https://gcc.gnu.org/install/configure.html - this is about target + # platform libraries not host platform ones unlike normal. But since + # we can't rebuild those without also rebuilding the compiler itself, + # we opt to always build everything unlike our usual policy. + enableShared ? true , enableLTO ? true , texinfo ? null , perl ? null # optional, for texi2pod (then pod2man); required for Java diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index 98d4b61648e3..7ea80ffbeb3f 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -7,7 +7,12 @@ , profiledCompiler ? false , langJit ? false , staticCompiler ? false -, enableShared ? true +, # N.B. the defult is intentionally not from an `isStatic`. See + # https://gcc.gnu.org/install/configure.html - this is about target + # platform libraries not host platform ones unlike normal. But since + # we can't rebuild those without also rebuilding the compiler itself, + # we opt to always build everything unlike our usual policy. + enableShared ? true , enableLTO ? true , texinfo ? null , perl ? null # optional, for texi2pod (then pod2man); required for Java diff --git a/pkgs/development/compilers/gcc/6/Added-mcf-thread-model-support-from-mcfgthread.patch b/pkgs/development/compilers/gcc/6/Added-mcf-thread-model-support-from-mcfgthread.patch new file mode 100644 index 000000000000..25e3a902cbf2 --- /dev/null +++ b/pkgs/development/compilers/gcc/6/Added-mcf-thread-model-support-from-mcfgthread.patch @@ -0,0 +1,285 @@ +From 30534f48c6ede142dad0008d1641392d82b8a137 Mon Sep 17 00:00:00 2001 +From: Liu Hao +Date: Mon, 18 Apr 2016 11:50:55 +0800 +Subject: [PATCH] Added 'mcf' thread model support from mcfgthread. + +Signed-off-by: Liu Hao +--- + config/gthr.m4 | 1 + + gcc/config.gcc | 3 +++ + gcc/config/i386/mingw-mcfgthread.h | 1 + + gcc/config/i386/mingw-w64.h | 2 +- + gcc/config/i386/mingw32.h | 11 ++++++++++- + gcc/configure | 2 +- + gcc/configure.ac | 2 +- + libatomic/configure.tgt | 2 +- + libgcc/config.host | 6 ++++++ + libgcc/config/i386/gthr-mcf.h | 1 + + libgcc/config/i386/t-mingw-mcfgthread | 2 ++ + libgcc/configure | 1 + + libstdc++-v3/configure | 1 + + libstdc++-v3/libsupc++/atexit_thread.cc | 18 ++++++++++++++++++ + libstdc++-v3/libsupc++/guard.cc | 23 +++++++++++++++++++++++ + 15 files changed, 71 insertions(+), 5 deletions(-) + create mode 100644 gcc/config/i386/mingw-mcfgthread.h + create mode 100644 libgcc/config/i386/gthr-mcf.h + create mode 100644 libgcc/config/i386/t-mingw-mcfgthread + +diff --git a/config/gthr.m4 b/config/gthr.m4 +index 7b29f1f3327..82e21fe1709 100644 +--- a/config/gthr.m4 ++++ b/config/gthr.m4 +@@ -21,6 +21,7 @@ case $1 in + tpf) thread_header=config/s390/gthr-tpf.h ;; + vxworks) thread_header=config/gthr-vxworks.h ;; + win32) thread_header=config/i386/gthr-win32.h ;; ++ mcf) thread_header=config/i386/gthr-mcf.h ;; + esac + AC_SUBST(thread_header) + ]) +diff --git a/gcc/config.gcc b/gcc/config.gcc +index 858b878d4b3..6f745790d64 100644 +--- a/gcc/config.gcc ++++ b/gcc/config.gcc +@@ -1722,6 +1722,9 @@ i[34567]86-*-mingw* | x86_64-*-mingw*) + if test x$enable_threads = xposix ; then + tm_file="${tm_file} i386/mingw-pthread.h" + fi ++ if test x$enable_threads = xmcf ; then ++ tm_file="${tm_file} i386/mingw-mcfgthread.h" ++ fi + tm_file="${tm_file} i386/mingw32.h" + # This makes the logic if mingw's or the w64 feature set has to be used + case ${target} in +diff --git a/gcc/config/i386/mingw-mcfgthread.h b/gcc/config/i386/mingw-mcfgthread.h +new file mode 100644 +index 00000000000..ec381a7798f +--- /dev/null ++++ b/gcc/config/i386/mingw-mcfgthread.h +@@ -0,0 +1 @@ ++#define TARGET_USE_MCFGTHREAD 1 +diff --git a/gcc/config/i386/mingw-w64.h b/gcc/config/i386/mingw-w64.h +index fe11333a2d1..cac85802f38 100644 +--- a/gcc/config/i386/mingw-w64.h ++++ b/gcc/config/i386/mingw-w64.h +@@ -48,7 +48,7 @@ along with GCC; see the file COPYING3. If not see + "%{mwindows:-lgdi32 -lcomdlg32} " \ + "%{fvtable-verify=preinit:-lvtv -lpsapi; \ + fvtable-verify=std:-lvtv -lpsapi} " \ +- "-ladvapi32 -lshell32 -luser32 -lkernel32" ++ LIB_MCFGTHREAD "-ladvapi32 -lshell32 -luser32 -lkernel32" + + #undef SPEC_32 + #undef SPEC_64 +diff --git a/gcc/config/i386/mingw32.h b/gcc/config/i386/mingw32.h +index e04818966fa..7b75a372506 100644 +--- a/gcc/config/i386/mingw32.h ++++ b/gcc/config/i386/mingw32.h +@@ -32,6 +32,14 @@ along with GCC; see the file COPYING3. If not see + | MASK_STACK_PROBE | MASK_ALIGN_DOUBLE \ + | MASK_MS_BITFIELD_LAYOUT) + ++#ifndef TARGET_USE_MCFGTHREAD ++#define CPP_MCFGTHREAD() ((void)0) ++#define LIB_MCFGTHREAD "" ++#else ++#define CPP_MCFGTHREAD() (builtin_define("__USING_MCFGTHREAD__")) ++#define LIB_MCFGTHREAD " -lmcfgthread " ++#endif ++ + /* See i386/crtdll.h for an alternative definition. _INTEGRAL_MAX_BITS + is for compatibility with native compiler. */ + #define EXTRA_OS_CPP_BUILTINS() \ +@@ -50,6 +58,7 @@ along with GCC; see the file COPYING3. If not see + builtin_define_std ("WIN64"); \ + builtin_define ("_WIN64"); \ + } \ ++ CPP_MCFGTHREAD(); \ + } \ + while (0) + +@@ -93,7 +102,7 @@ along with GCC; see the file COPYING3. If not see + "%{mwindows:-lgdi32 -lcomdlg32} " \ + "%{fvtable-verify=preinit:-lvtv -lpsapi; \ + fvtable-verify=std:-lvtv -lpsapi} " \ +- "-ladvapi32 -lshell32 -luser32 -lkernel32" ++ LIB_MCFGTHREAD "-ladvapi32 -lshell32 -luser32 -lkernel32" + + /* Weak symbols do not get resolved if using a Windows dll import lib. + Make the unwind registration references strong undefs. */ +diff --git a/gcc/configure b/gcc/configure +index 954673c1c43..6b5667f1c70 100755 +--- a/gcc/configure ++++ b/gcc/configure +@@ -11702,7 +11702,7 @@ case ${enable_threads} in + target_thread_file='single' + ;; + aix | dce | lynx | mipssde | posix | rtems | \ +- single | tpf | vxworks | win32) ++ single | tpf | vxworks | win32 | mcf) + target_thread_file=${enable_threads} + ;; + *) +diff --git a/gcc/configure.ac b/gcc/configure.ac +index 4c65d441e72..e6fa04ada4f 100644 +--- a/gcc/configure.ac ++++ b/gcc/configure.ac +@@ -1593,7 +1593,7 @@ case ${enable_threads} in + target_thread_file='single' + ;; + aix | dce | lynx | mipssde | posix | rtems | \ +- single | tpf | vxworks | win32) ++ single | tpf | vxworks | win32 | mcf) + target_thread_file=${enable_threads} + ;; + *) +diff --git a/libatomic/configure.tgt b/libatomic/configure.tgt +index eab2765d7fd..f4058b6f4a2 100644 +--- a/libatomic/configure.tgt ++++ b/libatomic/configure.tgt +@@ -124,7 +124,7 @@ case "${target}" in + *-*-mingw*) + # OS support for atomic primitives. + case ${target_thread_file} in +- win32) ++ win32 | mcf) + config_path="${config_path} mingw" + ;; + posix) +diff --git a/libgcc/config.host b/libgcc/config.host +index 2b139b8befc..fb18d2a042e 100644 +--- a/libgcc/config.host ++++ b/libgcc/config.host +@@ -712,6 +712,9 @@ i[34567]86-*-mingw*) + posix) + tmake_file="i386/t-mingw-pthread $tmake_file" + ;; ++ mcf) ++ tmake_file="i386/t-mingw-mcfgthread $tmake_file" ++ ;; + esac + # This has to match the logic for DWARF2_UNWIND_INFO in gcc/config/i386/cygming.h + if test x$ac_cv_sjlj_exceptions = xyes; then +@@ -736,6 +739,9 @@ x86_64-*-mingw*) + posix) + tmake_file="i386/t-mingw-pthread $tmake_file" + ;; ++ mcf) ++ tmake_file="i386/t-mingw-mcfgthread $tmake_file" ++ ;; + esac + # This has to match the logic for DWARF2_UNWIND_INFO in gcc/config/i386/cygming.h + if test x$ac_cv_sjlj_exceptions = xyes; then +diff --git a/libgcc/config/i386/gthr-mcf.h b/libgcc/config/i386/gthr-mcf.h +new file mode 100644 +index 00000000000..5ea2908361f +--- /dev/null ++++ b/libgcc/config/i386/gthr-mcf.h +@@ -0,0 +1 @@ ++#include +diff --git a/libgcc/config/i386/t-mingw-mcfgthread b/libgcc/config/i386/t-mingw-mcfgthread +new file mode 100644 +index 00000000000..4b9b10e32d6 +--- /dev/null ++++ b/libgcc/config/i386/t-mingw-mcfgthread +@@ -0,0 +1,2 @@ ++SHLIB_PTHREAD_CFLAG = ++SHLIB_PTHREAD_LDFLAG = -lmcfgthread +diff --git a/libgcc/configure b/libgcc/configure +index e7d6c75a6f7..664d0f852c4 100644 +--- a/libgcc/configure ++++ b/libgcc/configure +@@ -5077,6 +5077,7 @@ case $target_thread_file in + tpf) thread_header=config/s390/gthr-tpf.h ;; + vxworks) thread_header=config/gthr-vxworks.h ;; + win32) thread_header=config/i386/gthr-win32.h ;; ++ mcf) thread_header=config/i386/gthr-mcf.h ;; + esac + + +diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure +index b5ae4213f94..c484d3aee5f 100755 +--- a/libstdc++-v3/configure ++++ b/libstdc++-v3/configure +@@ -15177,6 +15177,7 @@ case $target_thread_file in + tpf) thread_header=config/s390/gthr-tpf.h ;; + vxworks) thread_header=config/gthr-vxworks.h ;; + win32) thread_header=config/i386/gthr-win32.h ;; ++ mcf) thread_header=config/i386/gthr-mcf.h ;; + esac + + +diff --git a/libstdc++-v3/libsupc++/atexit_thread.cc b/libstdc++-v3/libsupc++/atexit_thread.cc +index e6520c1094f..3d6907796dd 100644 +--- a/libstdc++-v3/libsupc++/atexit_thread.cc ++++ b/libstdc++-v3/libsupc++/atexit_thread.cc +@@ -25,6 +25,22 @@ + #include + #include + #include "bits/gthr.h" ++ ++#ifdef __USING_MCFGTHREAD__ ++ ++#include ++ ++extern "C" int ++__cxxabiv1::__cxa_thread_atexit (void (*dtor)(void *), ++ void *obj, void *dso_handle) ++ _GLIBCXX_NOTHROW ++{ ++ return ::_MCFCRT_AtThreadExit((void (*)(_MCFCRT_STD intptr_t))dtor, (_MCFCRT_STD intptr_t)obj) ? 0 : -1; ++ (void)dso_handle; ++} ++ ++#else // __USING_MCFGTHREAD__ ++ + #ifdef _GLIBCXX_THREAD_ATEXIT_WIN32 + #define WIN32_LEAN_AND_MEAN + #include +@@ -163,3 +179,5 @@ __cxxabiv1::__cxa_thread_atexit (void (*dtor)(void *), void *obj, void */*dso_ha + } + + #endif /* _GLIBCXX_HAVE___CXA_THREAD_ATEXIT_IMPL */ ++ ++#endif // __USING_MCFGTHREAD__ +diff --git a/libstdc++-v3/libsupc++/guard.cc b/libstdc++-v3/libsupc++/guard.cc +index 9b617998ffe..a441fdbb616 100644 +--- a/libstdc++-v3/libsupc++/guard.cc ++++ b/libstdc++-v3/libsupc++/guard.cc +@@ -28,6 +28,27 @@ + #include + #include + #include ++ ++#ifdef __USING_MCFGTHREAD__ ++ ++#include ++ ++namespace __cxxabiv1 { ++ ++extern "C" int __cxa_guard_acquire(__guard *g){ ++ return ::_MCFCRT_WaitForOnceFlagForever((::_MCFCRT_OnceFlag *)g) == ::_MCFCRT_kOnceResultInitial; ++} ++extern "C" void __cxa_guard_abort(__guard *g) throw() { ++ ::_MCFCRT_SignalOnceFlagAsAborted((::_MCFCRT_OnceFlag *)g); ++} ++extern "C" void __cxa_guard_release(__guard *g) throw() { ++ ::_MCFCRT_SignalOnceFlagAsFinished((::_MCFCRT_OnceFlag *)g); ++} ++ ++} ++ ++#else // __USING_MCFGTHREAD__ ++ + #include + #include + #if defined(__GTHREADS) && defined(__GTHREAD_HAS_COND) \ +@@ -424,3 +445,5 @@ namespace __cxxabiv1 + #endif + } + } ++ ++#endif +-- +2.12.1 + diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix index a2f034a4827f..029777430ffa 100644 --- a/pkgs/development/compilers/gcc/6/default.nix +++ b/pkgs/development/compilers/gcc/6/default.nix @@ -8,7 +8,12 @@ , profiledCompiler ? false , langJit ? false , staticCompiler ? false -, enableShared ? true +, # N.B. the defult is intentionally not from an `isStatic`. See + # https://gcc.gnu.org/install/configure.html - this is about target + # platform libraries not host platform ones unlike normal. But since + # we can't rebuild those without also rebuilding the compiler itself, + # we opt to always build everything unlike our usual policy. + enableShared ? true , enableLTO ? true , texinfo ? null , flex @@ -71,10 +76,9 @@ let majorVersion = "6"; ++ optional langAda ../gnat-cflags.patch ++ optional langFortran ../gfortran-driving.patch ++ optional (targetPlatform.libc == "musl") ../libgomp-dont-force-initial-exec.patch - ++ optional (!crossStageStatic && targetPlatform.isMinGW) (fetchpatch { - url = "https://raw.githubusercontent.com/lhmouse/MINGW-packages/${import ../common/mfcgthreads-patches-repo.nix}/mingw-w64-gcc-git/9000-gcc-${majorVersion}-branch-Added-mcf-thread-model-support-from-mcfgthread.patch"; - sha256 = "1c449jgm1vx9g4kv82bxmvlgrwb8f6kwkl0gqmjlmhf7f4hjy2nr"; - }); + + # Obtain latest patch with ../update-mcfgthread-patches.sh + ++ optional (!crossStageStatic && targetPlatform.isMinGW) ./Added-mcf-thread-model-support-from-mcfgthread.patch; javaEcj = fetchurl { # The `$(top_srcdir)/ecj.jar' file is automatically picked up at diff --git a/pkgs/development/compilers/gcc/7/Added-mcf-thread-model-support-from-mcfgthread.patch b/pkgs/development/compilers/gcc/7/Added-mcf-thread-model-support-from-mcfgthread.patch new file mode 100644 index 000000000000..0c5d0ee9e460 --- /dev/null +++ b/pkgs/development/compilers/gcc/7/Added-mcf-thread-model-support-from-mcfgthread.patch @@ -0,0 +1,285 @@ +From d3cb66e4751fcbd581b81a14a973de2d78fc02ad Mon Sep 17 00:00:00 2001 +From: Liu Hao +Date: Mon, 18 Apr 2016 11:50:55 +0800 +Subject: [PATCH] Added 'mcf' thread model support from mcfgthread. + +Signed-off-by: Liu Hao +--- + config/gthr.m4 | 1 + + gcc/config.gcc | 3 +++ + gcc/config/i386/mingw-mcfgthread.h | 1 + + gcc/config/i386/mingw-w64.h | 2 +- + gcc/config/i386/mingw32.h | 11 ++++++++++- + gcc/configure | 2 +- + gcc/configure.ac | 2 +- + libatomic/configure.tgt | 2 +- + libgcc/config.host | 6 ++++++ + libgcc/config/i386/gthr-mcf.h | 1 + + libgcc/config/i386/t-mingw-mcfgthread | 2 ++ + libgcc/configure | 1 + + libstdc++-v3/configure | 1 + + libstdc++-v3/libsupc++/atexit_thread.cc | 18 ++++++++++++++++++ + libstdc++-v3/libsupc++/guard.cc | 23 +++++++++++++++++++++++ + 15 files changed, 71 insertions(+), 5 deletions(-) + create mode 100644 gcc/config/i386/mingw-mcfgthread.h + create mode 100644 libgcc/config/i386/gthr-mcf.h + create mode 100644 libgcc/config/i386/t-mingw-mcfgthread + +diff --git a/config/gthr.m4 b/config/gthr.m4 +index 7b29f1f3327..82e21fe1709 100644 +--- a/config/gthr.m4 ++++ b/config/gthr.m4 +@@ -21,6 +21,7 @@ case $1 in + tpf) thread_header=config/s390/gthr-tpf.h ;; + vxworks) thread_header=config/gthr-vxworks.h ;; + win32) thread_header=config/i386/gthr-win32.h ;; ++ mcf) thread_header=config/i386/gthr-mcf.h ;; + esac + AC_SUBST(thread_header) + ]) +diff --git a/gcc/config.gcc b/gcc/config.gcc +index 8f91197f34e..59db37cac04 100644 +--- a/gcc/config.gcc ++++ b/gcc/config.gcc +@@ -1719,6 +1719,9 @@ i[34567]86-*-mingw* | x86_64-*-mingw*) + if test x$enable_threads = xposix ; then + tm_file="${tm_file} i386/mingw-pthread.h" + fi ++ if test x$enable_threads = xmcf ; then ++ tm_file="${tm_file} i386/mingw-mcfgthread.h" ++ fi + tm_file="${tm_file} i386/mingw32.h" + # This makes the logic if mingw's or the w64 feature set has to be used + case ${target} in +diff --git a/gcc/config/i386/mingw-mcfgthread.h b/gcc/config/i386/mingw-mcfgthread.h +new file mode 100644 +index 00000000000..ec381a7798f +--- /dev/null ++++ b/gcc/config/i386/mingw-mcfgthread.h +@@ -0,0 +1 @@ ++#define TARGET_USE_MCFGTHREAD 1 +diff --git a/gcc/config/i386/mingw-w64.h b/gcc/config/i386/mingw-w64.h +index 270ec0dd037..88966f79695 100644 +--- a/gcc/config/i386/mingw-w64.h ++++ b/gcc/config/i386/mingw-w64.h +@@ -48,7 +48,7 @@ along with GCC; see the file COPYING3. If not see + "%{mwindows:-lgdi32 -lcomdlg32} " \ + "%{fvtable-verify=preinit:-lvtv -lpsapi; \ + fvtable-verify=std:-lvtv -lpsapi} " \ +- "-ladvapi32 -lshell32 -luser32 -lkernel32" ++ LIB_MCFGTHREAD "-ladvapi32 -lshell32 -luser32 -lkernel32" + + #undef SPEC_32 + #undef SPEC_64 +diff --git a/gcc/config/i386/mingw32.h b/gcc/config/i386/mingw32.h +index e5f014cb473..989cfbe894e 100644 +--- a/gcc/config/i386/mingw32.h ++++ b/gcc/config/i386/mingw32.h +@@ -32,6 +32,14 @@ along with GCC; see the file COPYING3. If not see + | MASK_STACK_PROBE | MASK_ALIGN_DOUBLE \ + | MASK_MS_BITFIELD_LAYOUT) + ++#ifndef TARGET_USE_MCFGTHREAD ++#define CPP_MCFGTHREAD() ((void)0) ++#define LIB_MCFGTHREAD "" ++#else ++#define CPP_MCFGTHREAD() (builtin_define("__USING_MCFGTHREAD__")) ++#define LIB_MCFGTHREAD " -lmcfgthread " ++#endif ++ + /* See i386/crtdll.h for an alternative definition. _INTEGRAL_MAX_BITS + is for compatibility with native compiler. */ + #define EXTRA_OS_CPP_BUILTINS() \ +@@ -50,6 +58,7 @@ along with GCC; see the file COPYING3. If not see + builtin_define_std ("WIN64"); \ + builtin_define ("_WIN64"); \ + } \ ++ CPP_MCFGTHREAD(); \ + } \ + while (0) + +@@ -93,7 +102,7 @@ along with GCC; see the file COPYING3. If not see + "%{mwindows:-lgdi32 -lcomdlg32} " \ + "%{fvtable-verify=preinit:-lvtv -lpsapi; \ + fvtable-verify=std:-lvtv -lpsapi} " \ +- "-ladvapi32 -lshell32 -luser32 -lkernel32" ++ LIB_MCFGTHREAD "-ladvapi32 -lshell32 -luser32 -lkernel32" + + /* Weak symbols do not get resolved if using a Windows dll import lib. + Make the unwind registration references strong undefs. */ +diff --git a/gcc/configure b/gcc/configure +index ea73b151a4e..317200e5620 100755 +--- a/gcc/configure ++++ b/gcc/configure +@@ -11681,7 +11681,7 @@ case ${enable_threads} in + target_thread_file='single' + ;; + aix | dce | lynx | mipssde | posix | rtems | \ +- single | tpf | vxworks | win32) ++ single | tpf | vxworks | win32 | mcf) + target_thread_file=${enable_threads} + ;; + *) +diff --git a/gcc/configure.ac b/gcc/configure.ac +index 9d4c792a33f..d51899a5676 100644 +--- a/gcc/configure.ac ++++ b/gcc/configure.ac +@@ -1612,7 +1612,7 @@ case ${enable_threads} in + target_thread_file='single' + ;; + aix | dce | lynx | mipssde | posix | rtems | \ +- single | tpf | vxworks | win32) ++ single | tpf | vxworks | win32 | mcf) + target_thread_file=${enable_threads} + ;; + *) +diff --git a/libatomic/configure.tgt b/libatomic/configure.tgt +index b8af3ab2546..73248438a8c 100644 +--- a/libatomic/configure.tgt ++++ b/libatomic/configure.tgt +@@ -125,7 +125,7 @@ case "${target}" in + *-*-mingw*) + # OS support for atomic primitives. + case ${target_thread_file} in +- win32) ++ win32 | mcf) + config_path="${config_path} mingw" + ;; + posix) +diff --git a/libgcc/config.host b/libgcc/config.host +index b279a6458f9..20d22f585da 100644 +--- a/libgcc/config.host ++++ b/libgcc/config.host +@@ -710,6 +710,9 @@ i[34567]86-*-mingw*) + posix) + tmake_file="i386/t-mingw-pthread $tmake_file" + ;; ++ mcf) ++ tmake_file="i386/t-mingw-mcfgthread $tmake_file" ++ ;; + esac + # This has to match the logic for DWARF2_UNWIND_INFO in gcc/config/i386/cygming.h + if test x$ac_cv_sjlj_exceptions = xyes; then +@@ -734,6 +737,9 @@ x86_64-*-mingw*) + posix) + tmake_file="i386/t-mingw-pthread $tmake_file" + ;; ++ mcf) ++ tmake_file="i386/t-mingw-mcfgthread $tmake_file" ++ ;; + esac + # This has to match the logic for DWARF2_UNWIND_INFO in gcc/config/i386/cygming.h + if test x$ac_cv_sjlj_exceptions = xyes; then +diff --git a/libgcc/config/i386/gthr-mcf.h b/libgcc/config/i386/gthr-mcf.h +new file mode 100644 +index 00000000000..5ea2908361f +--- /dev/null ++++ b/libgcc/config/i386/gthr-mcf.h +@@ -0,0 +1 @@ ++#include +diff --git a/libgcc/config/i386/t-mingw-mcfgthread b/libgcc/config/i386/t-mingw-mcfgthread +new file mode 100644 +index 00000000000..4b9b10e32d6 +--- /dev/null ++++ b/libgcc/config/i386/t-mingw-mcfgthread +@@ -0,0 +1,2 @@ ++SHLIB_PTHREAD_CFLAG = ++SHLIB_PTHREAD_LDFLAG = -lmcfgthread +diff --git a/libgcc/configure b/libgcc/configure +index 45c459788c3..8fc569ef16e 100644 +--- a/libgcc/configure ++++ b/libgcc/configure +@@ -5086,6 +5086,7 @@ case $target_thread_file in + tpf) thread_header=config/s390/gthr-tpf.h ;; + vxworks) thread_header=config/gthr-vxworks.h ;; + win32) thread_header=config/i386/gthr-win32.h ;; ++ mcf) thread_header=config/i386/gthr-mcf.h ;; + esac + + +diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure +index 2406cb9d946..50e7e4ced89 100755 +--- a/libstdc++-v3/configure ++++ b/libstdc++-v3/configure +@@ -15182,6 +15182,7 @@ case $target_thread_file in + tpf) thread_header=config/s390/gthr-tpf.h ;; + vxworks) thread_header=config/gthr-vxworks.h ;; + win32) thread_header=config/i386/gthr-win32.h ;; ++ mcf) thread_header=config/i386/gthr-mcf.h ;; + esac + + +diff --git a/libstdc++-v3/libsupc++/atexit_thread.cc b/libstdc++-v3/libsupc++/atexit_thread.cc +index 923a0707556..a55d85aad2d 100644 +--- a/libstdc++-v3/libsupc++/atexit_thread.cc ++++ b/libstdc++-v3/libsupc++/atexit_thread.cc +@@ -25,6 +25,22 @@ + #include + #include + #include "bits/gthr.h" ++ ++#ifdef __USING_MCFGTHREAD__ ++ ++#include ++ ++extern "C" int ++__cxxabiv1::__cxa_thread_atexit (void (*dtor)(void *), ++ void *obj, void *dso_handle) ++ _GLIBCXX_NOTHROW ++{ ++ return ::_MCFCRT_AtThreadExit((void (*)(_MCFCRT_STD intptr_t))dtor, (_MCFCRT_STD intptr_t)obj) ? 0 : -1; ++ (void)dso_handle; ++} ++ ++#else // __USING_MCFGTHREAD__ ++ + #ifdef _GLIBCXX_THREAD_ATEXIT_WIN32 + #define WIN32_LEAN_AND_MEAN + #include +@@ -167,3 +183,5 @@ __cxxabiv1::__cxa_thread_atexit (void (*dtor)(void *), void *obj, void */*dso_ha + } + + #endif /* _GLIBCXX_HAVE___CXA_THREAD_ATEXIT_IMPL */ ++ ++#endif // __USING_MCFGTHREAD__ +diff --git a/libstdc++-v3/libsupc++/guard.cc b/libstdc++-v3/libsupc++/guard.cc +index 19953bc52f0..72fd5f26d5b 100644 +--- a/libstdc++-v3/libsupc++/guard.cc ++++ b/libstdc++-v3/libsupc++/guard.cc +@@ -28,6 +28,27 @@ + #include + #include + #include ++ ++#ifdef __USING_MCFGTHREAD__ ++ ++#include ++ ++namespace __cxxabiv1 { ++ ++extern "C" int __cxa_guard_acquire(__guard *g){ ++ return ::_MCFCRT_WaitForOnceFlagForever((::_MCFCRT_OnceFlag *)g) == ::_MCFCRT_kOnceResultInitial; ++} ++extern "C" void __cxa_guard_abort(__guard *g) throw() { ++ ::_MCFCRT_SignalOnceFlagAsAborted((::_MCFCRT_OnceFlag *)g); ++} ++extern "C" void __cxa_guard_release(__guard *g) throw() { ++ ::_MCFCRT_SignalOnceFlagAsFinished((::_MCFCRT_OnceFlag *)g); ++} ++ ++} ++ ++#else // __USING_MCFGTHREAD__ ++ + #include + #include + #include +@@ -425,3 +446,5 @@ namespace __cxxabiv1 + #endif + } + } ++ ++#endif +-- +2.12.1 + diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix index 6d066044ec1e..d950d6ac35bb 100644 --- a/pkgs/development/compilers/gcc/7/default.nix +++ b/pkgs/development/compilers/gcc/7/default.nix @@ -6,7 +6,12 @@ , profiledCompiler ? false , langJit ? false , staticCompiler ? false -, enableShared ? true +, # N.B. the defult is intentionally not from an `isStatic`. See + # https://gcc.gnu.org/install/configure.html - this is about target + # platform libraries not host platform ones unlike normal. But since + # we can't rebuild those without also rebuilding the compiler itself, + # we opt to always build everything unlike our usual policy. + enableShared ? true , enableLTO ? true , texinfo ? null , perl ? null # optional, for texi2pod (then pod2man) @@ -68,10 +73,9 @@ let majorVersion = "7"; ++ optional langFortran ../gfortran-driving.patch ++ optional (targetPlatform.libc == "musl" && targetPlatform.isPower) ../ppc-musl.patch ++ optional (targetPlatform.libc == "musl") ../libgomp-dont-force-initial-exec.patch - ++ optional (!crossStageStatic && targetPlatform.isMinGW) (fetchpatch { - url = "https://raw.githubusercontent.com/lhmouse/MINGW-packages/${import ../common/mfcgthreads-patches-repo.nix}/mingw-w64-gcc-git/9000-gcc-${majorVersion}-branch-Added-mcf-thread-model-support-from-mcfgthread.patch"; - sha256 = "1nyjnshpq5gbcbbpfv27hy4ajvycmgkpiabkjlxnnrnq1d99k1ay"; - }); + + # Obtain latest patch with ../update-mcfgthread-patches.sh + ++ optional (!crossStageStatic && targetPlatform.isMinGW) ./Added-mcf-thread-model-support-from-mcfgthread.patch; /* Cross-gcc settings (build == host != target) */ crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt"; diff --git a/pkgs/development/compilers/gcc/8/Added-mcf-thread-model-support-from-mcfgthread.patch b/pkgs/development/compilers/gcc/8/Added-mcf-thread-model-support-from-mcfgthread.patch new file mode 100644 index 000000000000..d9809e828f10 --- /dev/null +++ b/pkgs/development/compilers/gcc/8/Added-mcf-thread-model-support-from-mcfgthread.patch @@ -0,0 +1,306 @@ +From 86f2f767ddffd9f7c6f1470b987ae7b0d251b988 Mon Sep 17 00:00:00 2001 +From: Liu Hao +Date: Wed, 25 Apr 2018 21:54:19 +0800 +Subject: [PATCH] Added 'mcf' thread model support from mcfgthread. + +Signed-off-by: Liu Hao +--- + config/gthr.m4 | 1 + + gcc/config.gcc | 3 +++ + gcc/config/i386/mingw-mcfgthread.h | 1 + + gcc/config/i386/mingw-w64.h | 2 +- + gcc/config/i386/mingw32.h | 11 ++++++++++- + gcc/configure | 2 +- + gcc/configure.ac | 2 +- + libatomic/configure.tgt | 2 +- + libgcc/config.host | 6 ++++++ + libgcc/config/i386/gthr-mcf.h | 1 + + libgcc/config/i386/t-mingw-mcfgthread | 2 ++ + libgcc/configure | 1 + + libstdc++-v3/configure | 1 + + libstdc++-v3/libsupc++/atexit_thread.cc | 18 ++++++++++++++++++ + libstdc++-v3/libsupc++/guard.cc | 23 +++++++++++++++++++++++ + libstdc++-v3/src/c++11/thread.cc | 9 +++++++++ + 16 files changed, 80 insertions(+), 5 deletions(-) + create mode 100644 gcc/config/i386/mingw-mcfgthread.h + create mode 100644 libgcc/config/i386/gthr-mcf.h + create mode 100644 libgcc/config/i386/t-mingw-mcfgthread + +diff --git a/config/gthr.m4 b/config/gthr.m4 +index 7b29f1f3327..82e21fe1709 100644 +--- a/config/gthr.m4 ++++ b/config/gthr.m4 +@@ -21,6 +21,7 @@ case $1 in + tpf) thread_header=config/s390/gthr-tpf.h ;; + vxworks) thread_header=config/gthr-vxworks.h ;; + win32) thread_header=config/i386/gthr-win32.h ;; ++ mcf) thread_header=config/i386/gthr-mcf.h ;; + esac + AC_SUBST(thread_header) + ]) +diff --git a/gcc/config.gcc b/gcc/config.gcc +index 46a9029acec..112c24e95a3 100644 +--- a/gcc/config.gcc ++++ b/gcc/config.gcc +@@ -1758,6 +1758,9 @@ i[34567]86-*-mingw* | x86_64-*-mingw*) + if test x$enable_threads = xposix ; then + tm_file="${tm_file} i386/mingw-pthread.h" + fi ++ if test x$enable_threads = xmcf ; then ++ tm_file="${tm_file} i386/mingw-mcfgthread.h" ++ fi + tm_file="${tm_file} i386/mingw32.h" + # This makes the logic if mingw's or the w64 feature set has to be used + case ${target} in +diff --git a/gcc/config/i386/mingw-mcfgthread.h b/gcc/config/i386/mingw-mcfgthread.h +new file mode 100644 +index 00000000000..ec381a7798f +--- /dev/null ++++ b/gcc/config/i386/mingw-mcfgthread.h +@@ -0,0 +1 @@ ++#define TARGET_USE_MCFGTHREAD 1 +diff --git a/gcc/config/i386/mingw-w64.h b/gcc/config/i386/mingw-w64.h +index 484dc7a9e9f..a15bbeea500 100644 +--- a/gcc/config/i386/mingw-w64.h ++++ b/gcc/config/i386/mingw-w64.h +@@ -48,7 +48,7 @@ along with GCC; see the file COPYING3. If not see + "%{mwindows:-lgdi32 -lcomdlg32} " \ + "%{fvtable-verify=preinit:-lvtv -lpsapi; \ + fvtable-verify=std:-lvtv -lpsapi} " \ +- "-ladvapi32 -lshell32 -luser32 -lkernel32" ++ LIB_MCFGTHREAD "-ladvapi32 -lshell32 -luser32 -lkernel32" + + #undef SPEC_32 + #undef SPEC_64 +diff --git a/gcc/config/i386/mingw32.h b/gcc/config/i386/mingw32.h +index 0612b87199a..76cea94f3b7 100644 +--- a/gcc/config/i386/mingw32.h ++++ b/gcc/config/i386/mingw32.h +@@ -32,6 +32,14 @@ along with GCC; see the file COPYING3. If not see + | MASK_STACK_PROBE | MASK_ALIGN_DOUBLE \ + | MASK_MS_BITFIELD_LAYOUT) + ++#ifndef TARGET_USE_MCFGTHREAD ++#define CPP_MCFGTHREAD() ((void)0) ++#define LIB_MCFGTHREAD "" ++#else ++#define CPP_MCFGTHREAD() (builtin_define("__USING_MCFGTHREAD__")) ++#define LIB_MCFGTHREAD " -lmcfgthread " ++#endif ++ + /* See i386/crtdll.h for an alternative definition. _INTEGRAL_MAX_BITS + is for compatibility with native compiler. */ + #define EXTRA_OS_CPP_BUILTINS() \ +@@ -50,6 +58,7 @@ along with GCC; see the file COPYING3. If not see + builtin_define_std ("WIN64"); \ + builtin_define ("_WIN64"); \ + } \ ++ CPP_MCFGTHREAD(); \ + } \ + while (0) + +@@ -93,7 +102,7 @@ along with GCC; see the file COPYING3. If not see + "%{mwindows:-lgdi32 -lcomdlg32} " \ + "%{fvtable-verify=preinit:-lvtv -lpsapi; \ + fvtable-verify=std:-lvtv -lpsapi} " \ +- "-ladvapi32 -lshell32 -luser32 -lkernel32" ++ LIB_MCFGTHREAD "-ladvapi32 -lshell32 -luser32 -lkernel32" + + /* Weak symbols do not get resolved if using a Windows dll import lib. + Make the unwind registration references strong undefs. */ +diff --git a/gcc/configure b/gcc/configure +index 6121e163259..52f0e00efe6 100755 +--- a/gcc/configure ++++ b/gcc/configure +@@ -11693,7 +11693,7 @@ case ${enable_threads} in + target_thread_file='single' + ;; + aix | dce | lynx | mipssde | posix | rtems | \ +- single | tpf | vxworks | win32) ++ single | tpf | vxworks | win32 | mcf) + target_thread_file=${enable_threads} + ;; + *) +diff --git a/gcc/configure.ac b/gcc/configure.ac +index b066cc609e1..4ecdba88de7 100644 +--- a/gcc/configure.ac ++++ b/gcc/configure.ac +@@ -1612,7 +1612,7 @@ case ${enable_threads} in + target_thread_file='single' + ;; + aix | dce | lynx | mipssde | posix | rtems | \ +- single | tpf | vxworks | win32) ++ single | tpf | vxworks | win32 | mcf) + target_thread_file=${enable_threads} + ;; + *) +diff --git a/libatomic/configure.tgt b/libatomic/configure.tgt +index ea8c34f8c71..23134ad7363 100644 +--- a/libatomic/configure.tgt ++++ b/libatomic/configure.tgt +@@ -145,7 +145,7 @@ case "${target}" in + *-*-mingw*) + # OS support for atomic primitives. + case ${target_thread_file} in +- win32) ++ win32 | mcf) + config_path="${config_path} mingw" + ;; + posix) +diff --git a/libgcc/config.host b/libgcc/config.host +index 11b4acaff55..9fbd38650bd 100644 +--- a/libgcc/config.host ++++ b/libgcc/config.host +@@ -737,6 +737,9 @@ i[34567]86-*-mingw*) + posix) + tmake_file="i386/t-mingw-pthread $tmake_file" + ;; ++ mcf) ++ tmake_file="i386/t-mingw-mcfgthread $tmake_file" ++ ;; + esac + # This has to match the logic for DWARF2_UNWIND_INFO in gcc/config/i386/cygming.h + if test x$ac_cv_sjlj_exceptions = xyes; then +@@ -761,6 +764,9 @@ x86_64-*-mingw*) + posix) + tmake_file="i386/t-mingw-pthread $tmake_file" + ;; ++ mcf) ++ tmake_file="i386/t-mingw-mcfgthread $tmake_file" ++ ;; + esac + # This has to match the logic for DWARF2_UNWIND_INFO in gcc/config/i386/cygming.h + if test x$ac_cv_sjlj_exceptions = xyes; then +diff --git a/libgcc/config/i386/gthr-mcf.h b/libgcc/config/i386/gthr-mcf.h +new file mode 100644 +index 00000000000..5ea2908361f +--- /dev/null ++++ b/libgcc/config/i386/gthr-mcf.h +@@ -0,0 +1 @@ ++#include +diff --git a/libgcc/config/i386/t-mingw-mcfgthread b/libgcc/config/i386/t-mingw-mcfgthread +new file mode 100644 +index 00000000000..4b9b10e32d6 +--- /dev/null ++++ b/libgcc/config/i386/t-mingw-mcfgthread +@@ -0,0 +1,2 @@ ++SHLIB_PTHREAD_CFLAG = ++SHLIB_PTHREAD_LDFLAG = -lmcfgthread +diff --git a/libgcc/configure b/libgcc/configure +index b2f3f870844..eff889dc3b3 100644 +--- a/libgcc/configure ++++ b/libgcc/configure +@@ -5451,6 +5451,7 @@ case $target_thread_file in + tpf) thread_header=config/s390/gthr-tpf.h ;; + vxworks) thread_header=config/gthr-vxworks.h ;; + win32) thread_header=config/i386/gthr-win32.h ;; ++ mcf) thread_header=config/i386/gthr-mcf.h ;; + esac + + +diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure +index ba094be6f15..979a5ab9ace 100755 +--- a/libstdc++-v3/configure ++++ b/libstdc++-v3/configure +@@ -15187,6 +15187,7 @@ case $target_thread_file in + tpf) thread_header=config/s390/gthr-tpf.h ;; + vxworks) thread_header=config/gthr-vxworks.h ;; + win32) thread_header=config/i386/gthr-win32.h ;; ++ mcf) thread_header=config/i386/gthr-mcf.h ;; + esac + + +diff --git a/libstdc++-v3/libsupc++/atexit_thread.cc b/libstdc++-v3/libsupc++/atexit_thread.cc +index de920d714c6..665fb74bd6b 100644 +--- a/libstdc++-v3/libsupc++/atexit_thread.cc ++++ b/libstdc++-v3/libsupc++/atexit_thread.cc +@@ -25,6 +25,22 @@ + #include + #include + #include "bits/gthr.h" ++ ++#ifdef __USING_MCFGTHREAD__ ++ ++#include ++ ++extern "C" int ++__cxxabiv1::__cxa_thread_atexit (void (*dtor)(void *), ++ void *obj, void *dso_handle) ++ _GLIBCXX_NOTHROW ++{ ++ return ::_MCFCRT_AtThreadExit((void (*)(_MCFCRT_STD intptr_t))dtor, (_MCFCRT_STD intptr_t)obj) ? 0 : -1; ++ (void)dso_handle; ++} ++ ++#else // __USING_MCFGTHREAD__ ++ + #ifdef _GLIBCXX_THREAD_ATEXIT_WIN32 + #define WIN32_LEAN_AND_MEAN + #include +@@ -167,3 +183,5 @@ __cxxabiv1::__cxa_thread_atexit (void (*dtor)(void *), void *obj, void */*dso_ha + } + + #endif /* _GLIBCXX_HAVE___CXA_THREAD_ATEXIT_IMPL */ ++ ++#endif // __USING_MCFGTHREAD__ +diff --git a/libstdc++-v3/libsupc++/guard.cc b/libstdc++-v3/libsupc++/guard.cc +index 3a2ec3ad0d6..8b4cc96199b 100644 +--- a/libstdc++-v3/libsupc++/guard.cc ++++ b/libstdc++-v3/libsupc++/guard.cc +@@ -28,6 +28,27 @@ + #include + #include + #include ++ ++#ifdef __USING_MCFGTHREAD__ ++ ++#include ++ ++namespace __cxxabiv1 { ++ ++extern "C" int __cxa_guard_acquire(__guard *g){ ++ return ::_MCFCRT_WaitForOnceFlagForever((::_MCFCRT_OnceFlag *)g) == ::_MCFCRT_kOnceResultInitial; ++} ++extern "C" void __cxa_guard_abort(__guard *g) throw() { ++ ::_MCFCRT_SignalOnceFlagAsAborted((::_MCFCRT_OnceFlag *)g); ++} ++extern "C" void __cxa_guard_release(__guard *g) throw() { ++ ::_MCFCRT_SignalOnceFlagAsFinished((::_MCFCRT_OnceFlag *)g); ++} ++ ++} ++ ++#else // __USING_MCFGTHREAD__ ++ + #include + #include + #include +@@ -425,3 +446,5 @@ namespace __cxxabiv1 + #endif + } + } ++ ++#endif +diff --git a/libstdc++-v3/src/c++11/thread.cc b/libstdc++-v3/src/c++11/thread.cc +index 8238817c2e9..0c6a1f85f6f 100644 +--- a/libstdc++-v3/src/c++11/thread.cc ++++ b/libstdc++-v3/src/c++11/thread.cc +@@ -55,6 +55,15 @@ static inline int get_nprocs() + #elif defined(_GLIBCXX_USE_SC_NPROC_ONLN) + # include + # define _GLIBCXX_NPROCS sysconf(_SC_NPROC_ONLN) ++#elif defined(_WIN32) ++# include ++static inline int get_nprocs() ++{ ++ SYSTEM_INFO sysinfo; ++ GetSystemInfo(&sysinfo); ++ return (int)sysinfo.dwNumberOfProcessors; ++} ++# define _GLIBCXX_NPROCS get_nprocs() + #else + # define _GLIBCXX_NPROCS 0 + #endif +-- +2.17.0 + diff --git a/pkgs/development/compilers/gcc/8/default.nix b/pkgs/development/compilers/gcc/8/default.nix index 9e6a24d12948..683a9edfe09d 100644 --- a/pkgs/development/compilers/gcc/8/default.nix +++ b/pkgs/development/compilers/gcc/8/default.nix @@ -6,7 +6,12 @@ , profiledCompiler ? false , langJit ? false , staticCompiler ? false -, enableShared ? true +, # N.B. the defult is intentionally not from an `isStatic`. See + # https://gcc.gnu.org/install/configure.html - this is about target + # platform libraries not host platform ones unlike normal. But since + # we can't rebuild those without also rebuilding the compiler itself, + # we opt to always build everything unlike our usual policy. + enableShared ? true , enableLTO ? true , texinfo ? null , perl ? null # optional, for texi2pod (then pod2man) @@ -58,10 +63,9 @@ let majorVersion = "8"; ++ optional langFortran ../gfortran-driving.patch ++ optional (targetPlatform.libc == "musl" && targetPlatform.isPower) ../ppc-musl.patch ++ optional (targetPlatform.libc == "musl") ../libgomp-dont-force-initial-exec.patch - ++ optional (!crossStageStatic && targetPlatform.isMinGW) (fetchpatch { - url = "https://raw.githubusercontent.com/lhmouse/MINGW-packages/${import ../common/mfcgthreads-patches-repo.nix}/mingw-w64-gcc-git/9000-gcc-${majorVersion}-branch-Added-mcf-thread-model-support-from-mcfgthread.patch"; - sha256 = "1in5kvcknlpi9z1vvjw6jfmwy8k12zvbqlqfnq84qpm99r0rh00a"; - }); + + # Obtain latest patch with ../update-mcfgthread-patches.sh + ++ optional (!crossStageStatic && targetPlatform.isMinGW) ./Added-mcf-thread-model-support-from-mcfgthread.patch; /* Cross-gcc settings (build == host != target) */ crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt"; @@ -134,10 +138,10 @@ stdenv.mkDerivation ({ ) else "") + stdenv.lib.optionalString targetPlatform.isAvr '' - makeFlagsArray+=( - 'LIMITS_H_TEST=false' - ) - ''; + makeFlagsArray+=( + 'LIMITS_H_TEST=false' + ) + ''; inherit noSysDirs staticCompiler crossStageStatic libcCross crossMingw; diff --git a/pkgs/development/compilers/gcc/9/Added-mcf-thread-model-support-from-mcfgthread.patch b/pkgs/development/compilers/gcc/9/Added-mcf-thread-model-support-from-mcfgthread.patch new file mode 100644 index 000000000000..d9809e828f10 --- /dev/null +++ b/pkgs/development/compilers/gcc/9/Added-mcf-thread-model-support-from-mcfgthread.patch @@ -0,0 +1,306 @@ +From 86f2f767ddffd9f7c6f1470b987ae7b0d251b988 Mon Sep 17 00:00:00 2001 +From: Liu Hao +Date: Wed, 25 Apr 2018 21:54:19 +0800 +Subject: [PATCH] Added 'mcf' thread model support from mcfgthread. + +Signed-off-by: Liu Hao +--- + config/gthr.m4 | 1 + + gcc/config.gcc | 3 +++ + gcc/config/i386/mingw-mcfgthread.h | 1 + + gcc/config/i386/mingw-w64.h | 2 +- + gcc/config/i386/mingw32.h | 11 ++++++++++- + gcc/configure | 2 +- + gcc/configure.ac | 2 +- + libatomic/configure.tgt | 2 +- + libgcc/config.host | 6 ++++++ + libgcc/config/i386/gthr-mcf.h | 1 + + libgcc/config/i386/t-mingw-mcfgthread | 2 ++ + libgcc/configure | 1 + + libstdc++-v3/configure | 1 + + libstdc++-v3/libsupc++/atexit_thread.cc | 18 ++++++++++++++++++ + libstdc++-v3/libsupc++/guard.cc | 23 +++++++++++++++++++++++ + libstdc++-v3/src/c++11/thread.cc | 9 +++++++++ + 16 files changed, 80 insertions(+), 5 deletions(-) + create mode 100644 gcc/config/i386/mingw-mcfgthread.h + create mode 100644 libgcc/config/i386/gthr-mcf.h + create mode 100644 libgcc/config/i386/t-mingw-mcfgthread + +diff --git a/config/gthr.m4 b/config/gthr.m4 +index 7b29f1f3327..82e21fe1709 100644 +--- a/config/gthr.m4 ++++ b/config/gthr.m4 +@@ -21,6 +21,7 @@ case $1 in + tpf) thread_header=config/s390/gthr-tpf.h ;; + vxworks) thread_header=config/gthr-vxworks.h ;; + win32) thread_header=config/i386/gthr-win32.h ;; ++ mcf) thread_header=config/i386/gthr-mcf.h ;; + esac + AC_SUBST(thread_header) + ]) +diff --git a/gcc/config.gcc b/gcc/config.gcc +index 46a9029acec..112c24e95a3 100644 +--- a/gcc/config.gcc ++++ b/gcc/config.gcc +@@ -1758,6 +1758,9 @@ i[34567]86-*-mingw* | x86_64-*-mingw*) + if test x$enable_threads = xposix ; then + tm_file="${tm_file} i386/mingw-pthread.h" + fi ++ if test x$enable_threads = xmcf ; then ++ tm_file="${tm_file} i386/mingw-mcfgthread.h" ++ fi + tm_file="${tm_file} i386/mingw32.h" + # This makes the logic if mingw's or the w64 feature set has to be used + case ${target} in +diff --git a/gcc/config/i386/mingw-mcfgthread.h b/gcc/config/i386/mingw-mcfgthread.h +new file mode 100644 +index 00000000000..ec381a7798f +--- /dev/null ++++ b/gcc/config/i386/mingw-mcfgthread.h +@@ -0,0 +1 @@ ++#define TARGET_USE_MCFGTHREAD 1 +diff --git a/gcc/config/i386/mingw-w64.h b/gcc/config/i386/mingw-w64.h +index 484dc7a9e9f..a15bbeea500 100644 +--- a/gcc/config/i386/mingw-w64.h ++++ b/gcc/config/i386/mingw-w64.h +@@ -48,7 +48,7 @@ along with GCC; see the file COPYING3. If not see + "%{mwindows:-lgdi32 -lcomdlg32} " \ + "%{fvtable-verify=preinit:-lvtv -lpsapi; \ + fvtable-verify=std:-lvtv -lpsapi} " \ +- "-ladvapi32 -lshell32 -luser32 -lkernel32" ++ LIB_MCFGTHREAD "-ladvapi32 -lshell32 -luser32 -lkernel32" + + #undef SPEC_32 + #undef SPEC_64 +diff --git a/gcc/config/i386/mingw32.h b/gcc/config/i386/mingw32.h +index 0612b87199a..76cea94f3b7 100644 +--- a/gcc/config/i386/mingw32.h ++++ b/gcc/config/i386/mingw32.h +@@ -32,6 +32,14 @@ along with GCC; see the file COPYING3. If not see + | MASK_STACK_PROBE | MASK_ALIGN_DOUBLE \ + | MASK_MS_BITFIELD_LAYOUT) + ++#ifndef TARGET_USE_MCFGTHREAD ++#define CPP_MCFGTHREAD() ((void)0) ++#define LIB_MCFGTHREAD "" ++#else ++#define CPP_MCFGTHREAD() (builtin_define("__USING_MCFGTHREAD__")) ++#define LIB_MCFGTHREAD " -lmcfgthread " ++#endif ++ + /* See i386/crtdll.h for an alternative definition. _INTEGRAL_MAX_BITS + is for compatibility with native compiler. */ + #define EXTRA_OS_CPP_BUILTINS() \ +@@ -50,6 +58,7 @@ along with GCC; see the file COPYING3. If not see + builtin_define_std ("WIN64"); \ + builtin_define ("_WIN64"); \ + } \ ++ CPP_MCFGTHREAD(); \ + } \ + while (0) + +@@ -93,7 +102,7 @@ along with GCC; see the file COPYING3. If not see + "%{mwindows:-lgdi32 -lcomdlg32} " \ + "%{fvtable-verify=preinit:-lvtv -lpsapi; \ + fvtable-verify=std:-lvtv -lpsapi} " \ +- "-ladvapi32 -lshell32 -luser32 -lkernel32" ++ LIB_MCFGTHREAD "-ladvapi32 -lshell32 -luser32 -lkernel32" + + /* Weak symbols do not get resolved if using a Windows dll import lib. + Make the unwind registration references strong undefs. */ +diff --git a/gcc/configure b/gcc/configure +index 6121e163259..52f0e00efe6 100755 +--- a/gcc/configure ++++ b/gcc/configure +@@ -11693,7 +11693,7 @@ case ${enable_threads} in + target_thread_file='single' + ;; + aix | dce | lynx | mipssde | posix | rtems | \ +- single | tpf | vxworks | win32) ++ single | tpf | vxworks | win32 | mcf) + target_thread_file=${enable_threads} + ;; + *) +diff --git a/gcc/configure.ac b/gcc/configure.ac +index b066cc609e1..4ecdba88de7 100644 +--- a/gcc/configure.ac ++++ b/gcc/configure.ac +@@ -1612,7 +1612,7 @@ case ${enable_threads} in + target_thread_file='single' + ;; + aix | dce | lynx | mipssde | posix | rtems | \ +- single | tpf | vxworks | win32) ++ single | tpf | vxworks | win32 | mcf) + target_thread_file=${enable_threads} + ;; + *) +diff --git a/libatomic/configure.tgt b/libatomic/configure.tgt +index ea8c34f8c71..23134ad7363 100644 +--- a/libatomic/configure.tgt ++++ b/libatomic/configure.tgt +@@ -145,7 +145,7 @@ case "${target}" in + *-*-mingw*) + # OS support for atomic primitives. + case ${target_thread_file} in +- win32) ++ win32 | mcf) + config_path="${config_path} mingw" + ;; + posix) +diff --git a/libgcc/config.host b/libgcc/config.host +index 11b4acaff55..9fbd38650bd 100644 +--- a/libgcc/config.host ++++ b/libgcc/config.host +@@ -737,6 +737,9 @@ i[34567]86-*-mingw*) + posix) + tmake_file="i386/t-mingw-pthread $tmake_file" + ;; ++ mcf) ++ tmake_file="i386/t-mingw-mcfgthread $tmake_file" ++ ;; + esac + # This has to match the logic for DWARF2_UNWIND_INFO in gcc/config/i386/cygming.h + if test x$ac_cv_sjlj_exceptions = xyes; then +@@ -761,6 +764,9 @@ x86_64-*-mingw*) + posix) + tmake_file="i386/t-mingw-pthread $tmake_file" + ;; ++ mcf) ++ tmake_file="i386/t-mingw-mcfgthread $tmake_file" ++ ;; + esac + # This has to match the logic for DWARF2_UNWIND_INFO in gcc/config/i386/cygming.h + if test x$ac_cv_sjlj_exceptions = xyes; then +diff --git a/libgcc/config/i386/gthr-mcf.h b/libgcc/config/i386/gthr-mcf.h +new file mode 100644 +index 00000000000..5ea2908361f +--- /dev/null ++++ b/libgcc/config/i386/gthr-mcf.h +@@ -0,0 +1 @@ ++#include +diff --git a/libgcc/config/i386/t-mingw-mcfgthread b/libgcc/config/i386/t-mingw-mcfgthread +new file mode 100644 +index 00000000000..4b9b10e32d6 +--- /dev/null ++++ b/libgcc/config/i386/t-mingw-mcfgthread +@@ -0,0 +1,2 @@ ++SHLIB_PTHREAD_CFLAG = ++SHLIB_PTHREAD_LDFLAG = -lmcfgthread +diff --git a/libgcc/configure b/libgcc/configure +index b2f3f870844..eff889dc3b3 100644 +--- a/libgcc/configure ++++ b/libgcc/configure +@@ -5451,6 +5451,7 @@ case $target_thread_file in + tpf) thread_header=config/s390/gthr-tpf.h ;; + vxworks) thread_header=config/gthr-vxworks.h ;; + win32) thread_header=config/i386/gthr-win32.h ;; ++ mcf) thread_header=config/i386/gthr-mcf.h ;; + esac + + +diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure +index ba094be6f15..979a5ab9ace 100755 +--- a/libstdc++-v3/configure ++++ b/libstdc++-v3/configure +@@ -15187,6 +15187,7 @@ case $target_thread_file in + tpf) thread_header=config/s390/gthr-tpf.h ;; + vxworks) thread_header=config/gthr-vxworks.h ;; + win32) thread_header=config/i386/gthr-win32.h ;; ++ mcf) thread_header=config/i386/gthr-mcf.h ;; + esac + + +diff --git a/libstdc++-v3/libsupc++/atexit_thread.cc b/libstdc++-v3/libsupc++/atexit_thread.cc +index de920d714c6..665fb74bd6b 100644 +--- a/libstdc++-v3/libsupc++/atexit_thread.cc ++++ b/libstdc++-v3/libsupc++/atexit_thread.cc +@@ -25,6 +25,22 @@ + #include + #include + #include "bits/gthr.h" ++ ++#ifdef __USING_MCFGTHREAD__ ++ ++#include ++ ++extern "C" int ++__cxxabiv1::__cxa_thread_atexit (void (*dtor)(void *), ++ void *obj, void *dso_handle) ++ _GLIBCXX_NOTHROW ++{ ++ return ::_MCFCRT_AtThreadExit((void (*)(_MCFCRT_STD intptr_t))dtor, (_MCFCRT_STD intptr_t)obj) ? 0 : -1; ++ (void)dso_handle; ++} ++ ++#else // __USING_MCFGTHREAD__ ++ + #ifdef _GLIBCXX_THREAD_ATEXIT_WIN32 + #define WIN32_LEAN_AND_MEAN + #include +@@ -167,3 +183,5 @@ __cxxabiv1::__cxa_thread_atexit (void (*dtor)(void *), void *obj, void */*dso_ha + } + + #endif /* _GLIBCXX_HAVE___CXA_THREAD_ATEXIT_IMPL */ ++ ++#endif // __USING_MCFGTHREAD__ +diff --git a/libstdc++-v3/libsupc++/guard.cc b/libstdc++-v3/libsupc++/guard.cc +index 3a2ec3ad0d6..8b4cc96199b 100644 +--- a/libstdc++-v3/libsupc++/guard.cc ++++ b/libstdc++-v3/libsupc++/guard.cc +@@ -28,6 +28,27 @@ + #include + #include + #include ++ ++#ifdef __USING_MCFGTHREAD__ ++ ++#include ++ ++namespace __cxxabiv1 { ++ ++extern "C" int __cxa_guard_acquire(__guard *g){ ++ return ::_MCFCRT_WaitForOnceFlagForever((::_MCFCRT_OnceFlag *)g) == ::_MCFCRT_kOnceResultInitial; ++} ++extern "C" void __cxa_guard_abort(__guard *g) throw() { ++ ::_MCFCRT_SignalOnceFlagAsAborted((::_MCFCRT_OnceFlag *)g); ++} ++extern "C" void __cxa_guard_release(__guard *g) throw() { ++ ::_MCFCRT_SignalOnceFlagAsFinished((::_MCFCRT_OnceFlag *)g); ++} ++ ++} ++ ++#else // __USING_MCFGTHREAD__ ++ + #include + #include + #include +@@ -425,3 +446,5 @@ namespace __cxxabiv1 + #endif + } + } ++ ++#endif +diff --git a/libstdc++-v3/src/c++11/thread.cc b/libstdc++-v3/src/c++11/thread.cc +index 8238817c2e9..0c6a1f85f6f 100644 +--- a/libstdc++-v3/src/c++11/thread.cc ++++ b/libstdc++-v3/src/c++11/thread.cc +@@ -55,6 +55,15 @@ static inline int get_nprocs() + #elif defined(_GLIBCXX_USE_SC_NPROC_ONLN) + # include + # define _GLIBCXX_NPROCS sysconf(_SC_NPROC_ONLN) ++#elif defined(_WIN32) ++# include ++static inline int get_nprocs() ++{ ++ SYSTEM_INFO sysinfo; ++ GetSystemInfo(&sysinfo); ++ return (int)sysinfo.dwNumberOfProcessors; ++} ++# define _GLIBCXX_NPROCS get_nprocs() + #else + # define _GLIBCXX_NPROCS 0 + #endif +-- +2.17.0 + diff --git a/pkgs/development/compilers/gcc/9/default.nix b/pkgs/development/compilers/gcc/9/default.nix index c64a9dcc3f57..7827cb985053 100644 --- a/pkgs/development/compilers/gcc/9/default.nix +++ b/pkgs/development/compilers/gcc/9/default.nix @@ -8,7 +8,12 @@ , profiledCompiler ? false , langJit ? false , staticCompiler ? false -, enableShared ? true +, # N.B. the defult is intentionally not from an `isStatic`. See + # https://gcc.gnu.org/install/configure.html - this is about target + # platform libraries not host platform ones unlike normal. But since + # we can't rebuild those without also rebuilding the compiler itself, + # we opt to always build everything unlike our usual policy. + enableShared ? true , enableLTO ? true , texinfo ? null , perl ? null # optional, for texi2pod (then pod2man) @@ -74,10 +79,9 @@ let majorVersion = "9"; ++ optional langD ../libphobos.patch ++ optional langFortran ../gfortran-driving.patch ++ optional (targetPlatform.libc == "musl" && targetPlatform.isPower) ../ppc-musl.patch - ++ optional (!crossStageStatic && targetPlatform.isMinGW) (fetchpatch { - url = "https://raw.githubusercontent.com/lhmouse/MINGW-packages/${import ../common/mfcgthreads-patches-repo.nix}/mingw-w64-gcc-git/9000-gcc-${majorVersion}-branch-Added-mcf-thread-model-support-from-mcfgthread.patch"; - sha256 = "1in5kvcknlpi9z1vvjw6jfmwy8k12zvbqlqfnq84qpm99r0rh00a"; - }); + + # Obtain latest patch with ../update-mcfgthread-patches.sh + ++ optional (!crossStageStatic && targetPlatform.isMinGW) ./Added-mcf-thread-model-support-from-mcfgthread.patch; /* Cross-gcc settings (build == host != target) */ crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt"; diff --git a/pkgs/development/compilers/gcc/builder.sh b/pkgs/development/compilers/gcc/builder.sh index e1c4768413f4..7d104b96624e 100644 --- a/pkgs/development/compilers/gcc/builder.sh +++ b/pkgs/development/compilers/gcc/builder.sh @@ -37,6 +37,9 @@ if test "$noSysDirs" = "1"; then # Figure out what extra flags when linking to pass to the gcc # compilers being generated to make sure that they use our libc. extraLDFlags=($(< "${!curBintools}/nix-support/libc-ldflags") $(< "${!curBintools}/nix-support/libc-ldflags-before" || true)) + if [ -e ${!curBintools}/nix-support/ld-set-dynamic-linker ]; then + extraLDFlags=-dynamic-linker=$(< ${!curBintools}/nix-support/dynamic-linker) + fi # The path to the Libc binaries such as `crti.o'. libc_libdir="$(< "${!curBintools}/nix-support/orig-libc")/lib" @@ -252,7 +255,7 @@ postInstall() { if [[ targetConfig == *"linux"* ]]; then # For some reason, when building for linux on darwin, the libs retain - # RPATH to $out. + # 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"` diff --git a/pkgs/development/compilers/gcc/common/configure-flags.nix b/pkgs/development/compilers/gcc/common/configure-flags.nix index 7e0d691412b3..12d3f5d8987e 100644 --- a/pkgs/development/compilers/gcc/common/configure-flags.nix +++ b/pkgs/development/compilers/gcc/common/configure-flags.nix @@ -73,7 +73,7 @@ let "--enable-libssp" "--disable-nls" # To keep ABI compatibility with upstream mingw-w64 - "--enable-fully-dynamic-string" + "--enable-fully-dynamic-string" ] ++ lib.optionals (crossMingw && targetPlatform.isx86_32) [ # See Note [Windows Exception Handling] "--enable-sjlj-exceptions" @@ -187,13 +187,16 @@ let "--disable-symvers" "libat_cv_have_ifunc=no" "--disable-gnu-indirect-function" - ] + ] ++ lib.optionals langJit [ "--enable-host-shared" - ] + ] ++ lib.optionals (langD) [ "--with-target-system-zlib=yes" ] + # Make -fcommon default on gcc10 + # TODO: fix all packages (probably 100+) and remove that + ++ lib.optional (version >= "10.1.0") "--with-specs=%{!fno-common:%{!fcommon:-fcommon}}" ; in configureFlags diff --git a/pkgs/development/compilers/gcc/common/mfcgthreads-patches-repo.nix b/pkgs/development/compilers/gcc/common/mfcgthreads-patches-repo.nix deleted file mode 100644 index f8822c6dba0e..000000000000 --- a/pkgs/development/compilers/gcc/common/mfcgthreads-patches-repo.nix +++ /dev/null @@ -1 +0,0 @@ -"740f233da00c4fb5bcc225b2e29768824bcecc58" diff --git a/pkgs/development/compilers/gcc/update-mcfgthread-patches.sh b/pkgs/development/compilers/gcc/update-mcfgthread-patches.sh new file mode 100755 index 000000000000..c4fd79b26c34 --- /dev/null +++ b/pkgs/development/compilers/gcc/update-mcfgthread-patches.sh @@ -0,0 +1,15 @@ +#!/usr/bin/env nix-shell +#! nix-shell -i bash -p curl + +# We use this script to download local copies instead of using +# fetchpatch because lmhouse/MINGW-packages-dev is constantly rebased +# against msys2/MINGW-packages-dev and won't have stable commit hashes. + +name=Added-mcf-thread-model-support-from-mcfgthread.patch +source=https://raw.githubusercontent.com/lhmouse/MINGW-packages-dev/master/mingw-w64-gcc-git +dest=$(dirname "$0") + +for majorVersion in 6 7 8 9 10; do + curl "$source/9000-gcc-$majorVersion-branch-$name" \ + > "$dest/$majorVersion/$name" +done diff --git a/pkgs/development/compilers/ghc/9.0.1.nix b/pkgs/development/compilers/ghc/9.0.1.nix index bdb1a7555c21..d86cce9849ca 100644 --- a/pkgs/development/compilers/ghc/9.0.1.nix +++ b/pkgs/development/compilers/ghc/9.0.1.nix @@ -6,6 +6,7 @@ , bash , libiconv ? null, ncurses +, glibcLocales ? null , # GHC can be built with system libffi or a bundled one. libffi ? null @@ -95,12 +96,12 @@ let in stdenv.mkDerivation (rec { - version = "9.0.0.20200925"; + version = "9.0.0.20201227"; name = "${targetPrefix}ghc-${version}"; src = fetchurl { - url = "https://downloads.haskell.org/ghc/9.0.1-alpha1/ghc-${version}-src.tar.xz"; - sha256 = "1c6vgic0bx0c4c6gszq7znvc5gxf0lgh630283mivbs1lyiqj88l"; + url = "https://downloads.haskell.org/ghc/9.0.1-rc1/ghc-${version}-src.tar.xz"; + sha256 = "1kg227fzg9qq2p7r8xqr99vvnx7ind4clxkydikyzf3vqvaacjfy"; }; enableParallelBuilding = true; @@ -109,6 +110,9 @@ stdenv.mkDerivation (rec { postPatch = "patchShebangs ."; + # GHC needs the locale configured during the Haddock phase. + LANG = "en_US.UTF-8"; + # GHC is a bit confused on its cross terminology. preConfigure = '' for env in $(env | grep '^TARGET_' | sed -E 's|\+?=.*||'); do @@ -129,6 +133,8 @@ stdenv.mkDerivation (rec { echo -n "${buildMK}" > mk/build.mk sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure + '' + stdenv.lib.optionalString (stdenv.isLinux) '' + export LOCALE_ARCHIVE="${glibcLocales}/lib/locale/locale-archive" '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}" '' + stdenv.lib.optionalString stdenv.isDarwin '' @@ -185,7 +191,7 @@ stdenv.mkDerivation (rec { strictDeps = true; # Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself. - dontAddExtraLibs = true; + dontAddExtraLibs = true; nativeBuildInputs = [ perl autoconf automake m4 python3 sphinx diff --git a/pkgs/development/compilers/glslang/default.nix b/pkgs/development/compilers/glslang/default.nix index b3364b185da9..3fb9e107356a 100644 --- a/pkgs/development/compilers/glslang/default.nix +++ b/pkgs/development/compilers/glslang/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchFromGitHub +{ stdenv +, fetchFromGitHub , bison , cmake , jq @@ -10,7 +11,7 @@ }: # glslang requires custom versions of spirv-tools and spirb-headers. # The exact versions are taken from: -# https://github.com/KhronosGroup/glslang/blob/master/known_good.json +# https://github.com/KhronosGroup/glslang/blob/${version}/known_good.json let localSpirv-tools = if argSpirv-tools == null @@ -18,8 +19,8 @@ let src = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Tools"; - rev = "fd8e130510a6b002b28eee5885a9505040a9bdc9"; - sha256 = "00b7xgyrcb2qq63pp3cnw5q1xqx2d9rfn65lai6n6r89s1vh3vg6"; + rev = "b27b1afd12d05bf238ac7368bb49de73cd620a8e"; + sha256 = "0v26ws6qx23jn4dcpsq6rqmdxgyxpl5pcvfm90wb3nz6iqbqx294"; }; }) else argSpirv-tools; @@ -29,8 +30,8 @@ let src = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Headers"; - rev = "f8bf11a0253a32375c32cad92c841237b96696c0"; - sha256 = "1znwjy02dl9rshqzl87rqsv9mfczw7gvwfhcirbl81idahgp4p6l"; + rev = "f027d53ded7e230e008d37c8b47ede7cd308e19d"; + sha256 = "12gp2mqcar6jj57jw9isfr62yn72kmvdcl0zga4gvrlyfhnf582q"; }; }) else argSpirv-headers; @@ -38,13 +39,13 @@ in stdenv.mkDerivation rec { pname = "glslang"; - version = "8.13.3743"; + version = "11.1.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "glslang"; rev = version; - sha256 = "0d20wfpp2fmbnz1hnsjr9xc62lxpj86ik2qyviqbni0pqj212cry"; + sha256 = "1j81pghy7whyr8ygk7lx6g6qph61rky7fkkc8xp87c7n695a48rw"; }; # These get set at all-packages, keep onto them for child drvs @@ -54,7 +55,6 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake python3 bison jq ]; - enableParallelBuilding = true; postPatch = '' cp --no-preserve=mode -r "${localSpirv-tools.src}" External/spirv-tools @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { inherit (src.meta) homepage; description = "Khronos reference front-end for GLSL and ESSL"; license = licenses.asl20; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = [ maintainers.ralith ]; }; } diff --git a/pkgs/development/compilers/go/1.14.nix b/pkgs/development/compilers/go/1.14.nix index 34b37926ea6f..a37d5c3d2cf6 100644 --- a/pkgs/development/compilers/go/1.14.nix +++ b/pkgs/development/compilers/go/1.14.nix @@ -247,7 +247,6 @@ stdenv.mkDerivation rec { disallowedReferences = [ goBootstrap ]; meta = with stdenv.lib; { - branch = "1.14"; homepage = "http://golang.org/"; description = "The Go Programming language"; license = licenses.bsd3; diff --git a/pkgs/development/compilers/go/1.15.nix b/pkgs/development/compilers/go/1.15.nix index b0803b6c7a7d..47bf9cebd4c7 100644 --- a/pkgs/development/compilers/go/1.15.nix +++ b/pkgs/development/compilers/go/1.15.nix @@ -250,7 +250,6 @@ stdenv.mkDerivation rec { disallowedReferences = [ goBootstrap ]; meta = with stdenv.lib; { - branch = "1.15"; homepage = "http://golang.org/"; description = "The Go Programming language"; license = licenses.bsd3; diff --git a/pkgs/development/compilers/go/1.4.nix b/pkgs/development/compilers/go/1.4.nix index 75667a6cb2b5..6bc32b07c3d2 100644 --- a/pkgs/development/compilers/go/1.4.nix +++ b/pkgs/development/compilers/go/1.4.nix @@ -84,7 +84,6 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - branch = "1.4"; homepage = "http://golang.org/"; description = "The Go Programming language"; license = licenses.bsd3; diff --git a/pkgs/development/compilers/go/2-dev.nix b/pkgs/development/compilers/go/2-dev.nix new file mode 100644 index 000000000000..35d3365768a3 --- /dev/null +++ b/pkgs/development/compilers/go/2-dev.nix @@ -0,0 +1,261 @@ +{ pkgs, stdenv, fetchurl, fetchgit, tzdata, iana-etc, runCommand +, perl, which, pkgconfig, patch, procps, pcre, cacert, Security, Foundation +, mailcap, runtimeShell +, buildPackages +, pkgsBuildTarget +, fetchpatch +}: + +let + + inherit (stdenv.lib) optionals optionalString; + + goBootstrap = runCommand "go-bootstrap" {} '' + mkdir $out + cp -rf ${buildPackages.go_bootstrap}/* $out/ + chmod -R u+w $out + find $out -name "*.c" -delete + cp -rf $out/bin/* $out/share/go/bin/ + ''; + + goarch = platform: { + "i686" = "386"; + "x86_64" = "amd64"; + "aarch64" = "arm64"; + "arm" = "arm"; + "armv5tel" = "arm"; + "armv6l" = "arm"; + "armv7l" = "arm"; + "powerpc64le" = "ppc64le"; + }.${platform.parsed.cpu.name} or (throw "Unsupported system"); + + # We need a target compiler which is still runnable at build time, + # to handle the cross-building case where build != host == target + targetCC = pkgsBuildTarget.targetPackages.stdenv.cc; +in + +stdenv.mkDerivation rec { + pname = "go2-unstable"; + version = "2020-12-08"; + + src = fetchgit { + url = https://go.googlesource.com/go; + rev = "abe4d3dce12252ed09216eaa67b7dab8c8922537"; + sha256 = "sha256:1d46w8426148q81fvrifx9glgn402jvf29n44i8j8g1pvzkfckh6"; + }; + + # perl is used for testing go vet + nativeBuildInputs = [ perl which pkgconfig patch procps ]; + buildInputs = [ cacert pcre ] + ++ optionals stdenv.isLinux [ stdenv.cc.libc.out ] + ++ optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ]; + + depsTargetTargetPropagated = optionals stdenv.isDarwin [ Security Foundation ]; + + hardeningDisable = [ "all" ]; + + prePatch = '' + echo '${version}' > VERSION + patchShebangs ./ # replace /bin/bash + + # This source produces shell script at run time, + # and thus it is not corrected by patchShebangs. + substituteInPlace misc/cgo/testcarchive/carchive_test.go \ + --replace '#!/usr/bin/env bash' '#!${runtimeShell}' + + # Patch the mimetype database location which is missing on NixOS. + # but also allow static binaries built with NixOS to run outside nix + sed -i 's,\"/etc/mime.types,"${mailcap}/etc/mime.types\"\,\n\t&,' src/mime/type_unix.go + + # Disabling the 'os/http/net' tests (they want files not available in + # chroot builds) + rm src/net/{listen,parse}_test.go + rm src/syscall/exec_linux_test.go + + # !!! substituteInPlace does not seems to be effective. + # The os test wants to read files in an existing path. Just don't let it be /usr/bin. + sed -i 's,/usr/bin,'"`pwd`", src/os/os_test.go + sed -i 's,/bin/pwd,'"`type -P pwd`", src/os/os_test.go + # Fails on aarch64 + sed -i '/TestFallocate/aif true \{ return\; \}' src/cmd/link/internal/ld/fallocate_test.go + # Skip this test since ssl patches mess it up. + sed -i '/TestLoadSystemCertsLoadColonSeparatedDirs/aif true \{ return\; \}' src/crypto/x509/root_unix_test.go + # Disable another PIE test which breaks. + sed -i '/TestTrivialPIE/aif true \{ return\; \}' misc/cgo/testshared/shared_test.go + # Disable the BuildModePie test + sed -i '/TestBuildmodePIE/aif true \{ return\; \}' src/cmd/go/go_test.go + # Disable the unix socket test + sed -i '/TestShutdownUnix/aif true \{ return\; \}' src/net/net_test.go + # Disable the hostname test + sed -i '/TestHostname/aif true \{ return\; \}' src/os/os_test.go + # ParseInLocation fails the test + sed -i '/TestParseInSydney/aif true \{ return\; \}' src/time/format_test.go + # Remove the api check as it never worked + sed -i '/src\/cmd\/api\/run.go/ireturn nil' src/cmd/dist/test.go + # Remove the coverage test as we have removed this utility + sed -i '/TestCoverageWithCgo/aif true \{ return\; \}' src/cmd/go/go_test.go + # Remove the timezone naming test + sed -i '/TestLoadFixed/aif true \{ return\; \}' src/time/time_test.go + # Remove disable setgid test + sed -i '/TestRespectSetgidDir/aif true \{ return\; \}' src/cmd/go/internal/work/build_test.go + # Remove cert tests that conflict with NixOS's cert resolution + sed -i '/TestEnvVars/aif true \{ return\; \}' src/crypto/x509/root_unix_test.go + # TestWritevError hangs sometimes + sed -i '/TestWritevError/aif true \{ return\; \}' src/net/writev_test.go + # TestVariousDeadlines fails sometimes + sed -i '/TestVariousDeadlines/aif true \{ return\; \}' src/net/timeout_test.go + + sed -i 's,/etc/protocols,${iana-etc}/etc/protocols,' src/net/lookup_unix.go + sed -i 's,/etc/services,${iana-etc}/etc/services,' src/net/port_unix.go + + # Disable cgo lookup tests not works, they depend on resolver + rm src/net/cgo_unix_test.go + + '' + optionalString stdenv.isLinux '' + # prepend the nix path to the zoneinfo files but also leave the original value for static binaries + # that run outside a nix server + sed -i 's,\"/usr/share/zoneinfo/,"${tzdata}/share/zoneinfo/\"\,\n\t&,' src/time/zoneinfo_unix.go + + '' + optionalString stdenv.isAarch32 '' + echo '#!${runtimeShell}' > misc/cgo/testplugin/test.bash + '' + optionalString stdenv.isDarwin '' + substituteInPlace src/race.bash --replace \ + "sysctl machdep.cpu.extfeatures | grep -qv EM64T" true + sed -i 's,strings.Contains(.*sysctl.*,true {,' src/cmd/dist/util.go + sed -i 's,"/etc","'"$TMPDIR"'",' src/os/os_test.go + sed -i 's,/_go_os_test,'"$TMPDIR"'/_go_os_test,' src/os/path_test.go + + sed -i '/TestChdirAndGetwd/aif true \{ return\; \}' src/os/os_test.go + sed -i '/TestCredentialNoSetGroups/aif true \{ return\; \}' src/os/exec/exec_posix_test.go + sed -i '/TestRead0/aif true \{ return\; \}' src/os/os_test.go + sed -i '/TestSystemRoots/aif true \{ return\; \}' src/crypto/x509/root_darwin_test.go + + sed -i '/TestGoInstallRebuildsStalePackagesInOtherGOPATH/aif true \{ return\; \}' src/cmd/go/go_test.go + sed -i '/TestBuildDashIInstallsDependencies/aif true \{ return\; \}' src/cmd/go/go_test.go + + sed -i '/TestDisasmExtld/aif true \{ return\; \}' src/cmd/objdump/objdump_test.go + + sed -i 's/unrecognized/unknown/' src/cmd/link/internal/ld/lib.go + + # TestCurrent fails because Current is not implemented on Darwin + sed -i 's/TestCurrent/testCurrent/g' src/os/user/user_test.go + sed -i 's/TestLookup/testLookup/g' src/os/user/user_test.go + + touch $TMPDIR/group $TMPDIR/hosts $TMPDIR/passwd + ''; + + patches = [ + ./remove-tools-1.11.patch + ./ssl-cert-file-2-dev.patch + ./remove-test-pie-1.15.patch + ./creds-test.patch + ./go-1.9-skip-flaky-19608.patch + ./go-1.9-skip-flaky-20072.patch + ./skip-external-network-tests-1.15.patch + ./skip-nohup-tests.patch + ./skip-cgo-tests-1.15.patch + ] ++ [ + # breaks under load: https://github.com/golang/go/issues/25628 + (if stdenv.isAarch32 + then ./skip-test-extra-files-on-aarch32-1.14.patch + else ./skip-test-extra-files-on-386-1.14.patch) + ]; + + postPatch = '' + find . -name '*.orig' -exec rm {} ';' + ''; + + GOOS = stdenv.targetPlatform.parsed.kernel.name; + GOARCH = goarch stdenv.targetPlatform; + # GOHOSTOS/GOHOSTARCH must match the building system, not the host system. + # Go will nevertheless build a for host system that we will copy over in + # the install phase. + GOHOSTOS = stdenv.buildPlatform.parsed.kernel.name; + GOHOSTARCH = goarch stdenv.buildPlatform; + + # {CC,CXX}_FOR_TARGET must be only set for cross compilation case as go expect those + # to be different from CC/CXX + CC_FOR_TARGET = if (stdenv.buildPlatform != stdenv.targetPlatform) then + "${targetCC}/bin/${targetCC.targetPrefix}cc" + else + null; + CXX_FOR_TARGET = if (stdenv.buildPlatform != stdenv.targetPlatform) then + "${targetCC}/bin/${targetCC.targetPrefix}c++" + else + null; + + GOARM = toString (stdenv.lib.intersectLists [(stdenv.hostPlatform.parsed.cpu.version or "")] ["5" "6" "7"]); + GO386 = 387; # from Arch: don't assume sse2 on i686 + CGO_ENABLED = 1; + # Hopefully avoids test timeouts on Hydra + GO_TEST_TIMEOUT_SCALE = 3; + + # Indicate that we are running on build infrastructure + # Some tests assume things like home directories and users exists + GO_BUILDER_NAME = "nix"; + + GOROOT_BOOTSTRAP="${goBootstrap}/share/go"; + + postConfigure = '' + export GOCACHE=$TMPDIR/go-cache + # this is compiled into the binary + export GOROOT_FINAL=$out/share/go + + export PATH=$(pwd)/bin:$PATH + + ${optionalString (stdenv.buildPlatform != stdenv.targetPlatform) '' + # Independent from host/target, CC should produce code for the building system. + # We only set it when cross-compiling. + export CC=${buildPackages.stdenv.cc}/bin/cc + ''} + ulimit -a + ''; + + postBuild = '' + (cd src && ./make.bash) + ''; + + doCheck = stdenv.hostPlatform == stdenv.targetPlatform && !stdenv.isDarwin; + + checkPhase = '' + runHook preCheck + (cd src && HOME=$TMPDIR GOCACHE=$TMPDIR/go-cache ./run.bash --no-rebuild) + runHook postCheck + ''; + + preInstall = '' + rm -r pkg/obj + # Contains the wrong perl shebang when cross compiling, + # since it is not used for anything we can deleted as well. + rm src/regexp/syntax/make_perl_groups.pl + '' + (if (stdenv.buildPlatform != stdenv.hostPlatform) then '' + mv bin/*_*/* bin + rmdir bin/*_* + ${optionalString (!(GOHOSTARCH == GOARCH && GOOS == GOHOSTOS)) '' + rm -rf pkg/${GOHOSTOS}_${GOHOSTARCH} pkg/tool/${GOHOSTOS}_${GOHOSTARCH} + ''} + '' else if (stdenv.hostPlatform != stdenv.targetPlatform) then '' + rm -rf bin/*_* + ${optionalString (!(GOHOSTARCH == GOARCH && GOOS == GOHOSTOS)) '' + rm -rf pkg/${GOOS}_${GOARCH} pkg/tool/${GOOS}_${GOARCH} + ''} + '' else ""); + + installPhase = '' + runHook preInstall + mkdir -p $GOROOT_FINAL + cp -a bin pkg src lib misc api doc $GOROOT_FINAL + ln -s $GOROOT_FINAL/bin $out/bin + runHook postInstall + ''; + + disallowedReferences = [ goBootstrap ]; + + meta = with stdenv.lib; { + homepage = "http://golang.org/"; + description = "The Go Programming language"; + license = licenses.bsd3; + maintainers = teams.golang.members ++ [ maintainers._3noch ]; + platforms = platforms.linux ++ platforms.darwin; + }; +} diff --git a/pkgs/development/compilers/go/ssl-cert-file-2-dev.patch b/pkgs/development/compilers/go/ssl-cert-file-2-dev.patch new file mode 100644 index 000000000000..6146880f7a03 --- /dev/null +++ b/pkgs/development/compilers/go/ssl-cert-file-2-dev.patch @@ -0,0 +1,45 @@ +diff --git a/src/crypto/x509/root_darwin_amd64.go b/src/crypto/x509/root_darwin_amd64.go +index ce88de025e..258ecc45d1 100644 +--- a/src/crypto/x509/root_darwin_amd64.go ++++ b/src/crypto/x509/root_darwin_amd64.go +@@ -10,6 +10,7 @@ import ( + "bytes" + macOS "crypto/x509/internal/macos" + "fmt" ++ "io/ioutil" + "os" + "strings" + ) +@@ -25,6 +26,14 @@ func (c *Certificate) systemVerify(opts *VerifyOptions) (chains [][]*Certificate + var loadSystemRootsWithCgo func() (*CertPool, error) + + func loadSystemRoots() (*CertPool, error) { ++ if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" { ++ data, err := ioutil.ReadFile(file) ++ if err == nil { ++ roots := NewCertPool() ++ roots.AppendCertsFromPEM(data) ++ return roots, nil ++ } ++ } + var trustedRoots []*Certificate + untrustedRoots := make(map[string]bool) + +diff --git a/src/crypto/x509/root_unix.go b/src/crypto/x509/root_unix.go +index b48e618a65..195c1ff25a 100644 +--- a/src/crypto/x509/root_unix.go ++++ b/src/crypto/x509/root_unix.go +@@ -42,6 +42,13 @@ func (c *Certificate) systemVerify(opts *VerifyOptions) (chains [][]*Certificate + + func loadSystemRoots() (*CertPool, error) { + roots := NewCertPool() ++ if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" { ++ data, err := ioutil.ReadFile(file) ++ if err == nil { ++ roots.AppendCertsFromPEM(data) ++ return roots, nil ++ } ++ } + + files := certFiles + if f := os.Getenv(certFileEnv); f != "" { diff --git a/pkgs/development/compilers/hhvm/default.nix b/pkgs/development/compilers/hhvm/default.nix index 08ba9e468147..c06e94a038fc 100644 --- a/pkgs/development/compilers/hhvm/default.nix +++ b/pkgs/development/compilers/hhvm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, cmake, pkgconfig, boost, libunwind, libmemcached +{ stdenv, fetchgit, cmake, pkg-config, boost, libunwind, libmemcached , pcre, libevent, gd, curl, libxml2, icu, flex, bison, openssl, zlib, php , expat, libcap, oniguruma, libdwarf, libmcrypt, tbb, gperftools, glog, libkrb5 , bzip2, openldap, readline, libelf, uwimap, binutils, cyrus_sasl, pam, libpng @@ -18,9 +18,10 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; + nativeBuildInputs = [ cmake pkg-config flex bison ]; buildInputs = - [ cmake pkgconfig boost libunwind libmysqlclient libmemcached pcre gdb git perl - libevent gd curl libxml2 icu flex bison openssl zlib php expat libcap + [ boost libunwind libmysqlclient libmemcached pcre gdb git perl + libevent gd curl libxml2 icu openssl zlib php expat libcap oniguruma libdwarf libmcrypt tbb gperftools bzip2 openldap readline libelf uwimap binutils cyrus_sasl pam glog libpng libxslt libkrb5 gmp libyaml libedit libvpx imagemagick fribidi gperf which @@ -31,7 +32,6 @@ stdenv.mkDerivation rec { ./flexible-array-members-gcc6.patch ]; - enableParallelBuilding = true; dontUseCmakeBuildDir = true; NIX_LDFLAGS = "-lpam -L${pam}/lib"; diff --git a/pkgs/development/compilers/idris2/default.nix b/pkgs/development/compilers/idris2/default.nix index 5bde4bbb720f..275c29444621 100644 --- a/pkgs/development/compilers/idris2/default.nix +++ b/pkgs/development/compilers/idris2/default.nix @@ -5,13 +5,13 @@ # Uses scheme to bootstrap the build of idris2 stdenv.mkDerivation rec { pname = "idris2"; - version = "0.2.1"; + version = "0.2.2"; src = fetchFromGitHub { owner = "idris-lang"; repo = "Idris2"; rev = "v${version}"; - sha256 = "044slgl2pwvj939kz3z92n6l182plc5fzng1n4z4k6bg11msqq14"; + sha256 = "18m483vccijfh9z6x4zgi37fql3q765x3ypkwixv3rwq9nxnd6hm"; }; strictDeps = true; diff --git a/pkgs/development/compilers/julia/1.0.nix b/pkgs/development/compilers/julia/1.0.nix index a98b69f50e9f..0325632ad0ab 100644 --- a/pkgs/development/compilers/julia/1.0.nix +++ b/pkgs/development/compilers/julia/1.0.nix @@ -171,8 +171,6 @@ stdenv.mkDerivation rec { openspecfun pcre2 ]); - enableParallelBuilding = true; - doCheck = !stdenv.isDarwin; checkTarget = "testall"; # Julia's tests require read/write access to $HOME diff --git a/pkgs/development/compilers/julia/1.3.nix b/pkgs/development/compilers/julia/1.3.nix index 406ea73f2aed..8096af0b320c 100644 --- a/pkgs/development/compilers/julia/1.3.nix +++ b/pkgs/development/compilers/julia/1.3.nix @@ -119,8 +119,6 @@ stdenv.mkDerivation rec { openspecfun pcre2 lapack ]; - enableParallelBuilding = true; - # Other versions of Julia pass the tests, but we are not sure why these fail. doCheck = false; checkTarget = "testall"; diff --git a/pkgs/development/compilers/julia/1.5.nix b/pkgs/development/compilers/julia/1.5.nix index 151cf83cecef..be3cfc39635c 100644 --- a/pkgs/development/compilers/julia/1.5.nix +++ b/pkgs/development/compilers/julia/1.5.nix @@ -119,8 +119,6 @@ stdenv.mkDerivation rec { openspecfun pcre2 lapack ]; - enableParallelBuilding = true; - # Julia's tests require read/write access to $HOME preCheck = '' export HOME="$NIX_BUILD_TOP" diff --git a/pkgs/development/compilers/ldc/generic.nix b/pkgs/development/compilers/ldc/generic.nix index 214d64cfa76b..19dc140a7e17 100644 --- a/pkgs/development/compilers/ldc/generic.nix +++ b/pkgs/development/compilers/ldc/generic.nix @@ -18,8 +18,6 @@ stdenv.mkDerivation rec { pname = "ldc"; inherit version; - enableParallelBuilding = true; - src = fetchurl { url = "https://github.com/ldc-developers/ldc/releases/download/v${version}/ldc-${version}-src.tar.gz"; sha256 = ldcSha256; diff --git a/pkgs/development/compilers/llvm/10/clang/default.nix b/pkgs/development/compilers/llvm/10/clang/default.nix index fef7720d726d..d01d1a2a53d1 100644 --- a/pkgs/development/compilers/llvm/10/clang/default.nix +++ b/pkgs/development/compilers/llvm/10/clang/default.nix @@ -82,8 +82,6 @@ let rm $out/bin/c-index-test ''; - enableParallelBuilding = true; - passthru = { isClang = true; inherit llvm; diff --git a/pkgs/development/compilers/llvm/10/compiler-rt.nix b/pkgs/development/compilers/llvm/10/compiler-rt.nix index e6882cbabb8b..568bdff67c0e 100644 --- a/pkgs/development/compilers/llvm/10/compiler-rt.nix +++ b/pkgs/development/compilers/llvm/10/compiler-rt.nix @@ -87,5 +87,4 @@ stdenv.mkDerivation rec { ln -s $out/lib/*/clang_rt.crtend_shared-*.o $out/lib/crtendS.o ''; - enableParallelBuilding = true; } diff --git a/pkgs/development/compilers/llvm/10/libc++/default.nix b/pkgs/development/compilers/llvm/10/libc++/default.nix index 95711903932e..9b501aff1ab7 100644 --- a/pkgs/development/compilers/llvm/10/libc++/default.nix +++ b/pkgs/development/compilers/llvm/10/libc++/default.nix @@ -1,5 +1,6 @@ { lib, stdenv, fetch, cmake, python3, libcxxabi, fixDarwinDylibNames, version -, enableShared ? true }: +, enableShared ? !stdenv.hostPlatform.isStatic +}: stdenv.mkDerivation { pname = "libc++"; @@ -38,8 +39,6 @@ stdenv.mkDerivation { "-DLIBCXX_ENABLE_EXCEPTIONS=OFF" ] ++ stdenv.lib.optional (!enableShared) "-DLIBCXX_ENABLE_SHARED=OFF"; - enableParallelBuilding = true; - passthru = { isLLVM = true; }; diff --git a/pkgs/development/compilers/llvm/10/libc++abi.nix b/pkgs/development/compilers/llvm/10/libc++abi.nix index 00371b862adb..7335d06e4fe3 100644 --- a/pkgs/development/compilers/llvm/10/libc++abi.nix +++ b/pkgs/development/compilers/llvm/10/libc++abi.nix @@ -1,5 +1,6 @@ { stdenv, cmake, fetch, libcxx, libunwind, llvm, version -, enableShared ? true }: +, enableShared ? !stdenv.hostPlatform.isStatic +}: stdenv.mkDerivation { pname = "libc++abi"; diff --git a/pkgs/development/compilers/llvm/10/libunwind.nix b/pkgs/development/compilers/llvm/10/libunwind.nix index b13bacb36380..8088ae973037 100644 --- a/pkgs/development/compilers/llvm/10/libunwind.nix +++ b/pkgs/development/compilers/llvm/10/libunwind.nix @@ -1,4 +1,6 @@ -{ stdenv, version, fetch, cmake, fetchpatch, enableShared ? true }: +{ stdenv, version, fetch, cmake, fetchpatch +, enableShared ? !stdenv.hostPlatform.isStatic +}: stdenv.mkDerivation rec { pname = "libunwind"; @@ -8,7 +10,5 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - enableParallelBuilding = true; - cmakeFlags = stdenv.lib.optional (!enableShared) "-DLIBUNWIND_ENABLE_SHARED=OFF"; } diff --git a/pkgs/development/compilers/llvm/10/lld.nix b/pkgs/development/compilers/llvm/10/lld.nix index 5d513462820e..a0cb9c117a8d 100644 --- a/pkgs/development/compilers/llvm/10/lld.nix +++ b/pkgs/development/compilers/llvm/10/lld.nix @@ -17,8 +17,6 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - enableParallelBuilding = true; - postInstall = '' moveToOutput include "$dev" moveToOutput lib "$dev" diff --git a/pkgs/development/compilers/llvm/10/lldb.nix b/pkgs/development/compilers/llvm/10/lldb.nix index c728efeb2a9b..fc5edadd0a40 100644 --- a/pkgs/development/compilers/llvm/10/lldb.nix +++ b/pkgs/development/compilers/llvm/10/lldb.nix @@ -59,8 +59,6 @@ stdenv.mkDerivation (rec { "-DSPHINX_OUTPUT_HTML=OFF" ]; - enableParallelBuilding = true; - postInstall = '' # Editor support # vscode: diff --git a/pkgs/development/compilers/llvm/10/llvm.nix b/pkgs/development/compilers/llvm/10/llvm.nix index 7394d4033d21..7e6c7c025267 100644 --- a/pkgs/development/compilers/llvm/10/llvm.nix +++ b/pkgs/development/compilers/llvm/10/llvm.nix @@ -154,8 +154,6 @@ in stdenv.mkDerivation (rec { checkTarget = "check-all"; - enableParallelBuilding = true; - requiredSystemFeatures = [ "big-parallel" ]; meta = { description = "Collection of modular and reusable compiler and toolchain technologies"; diff --git a/pkgs/development/compilers/llvm/10/openmp.nix b/pkgs/development/compilers/llvm/10/openmp.nix index 0927448d2b49..e3c1e66376a5 100644 --- a/pkgs/development/compilers/llvm/10/openmp.nix +++ b/pkgs/development/compilers/llvm/10/openmp.nix @@ -15,8 +15,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake perl ]; buildInputs = [ llvm ]; - enableParallelBuilding = true; - meta = { description = "Components required to build an executable OpenMP program"; homepage = "https://openmp.llvm.org/"; diff --git a/pkgs/development/compilers/llvm/11/clang/default.nix b/pkgs/development/compilers/llvm/11/clang/default.nix index 2de5f65b4a13..aed5b66368f6 100644 --- a/pkgs/development/compilers/llvm/11/clang/default.nix +++ b/pkgs/development/compilers/llvm/11/clang/default.nix @@ -81,8 +81,6 @@ let rm $out/bin/c-index-test ''; - enableParallelBuilding = true; - passthru = { isClang = true; inherit llvm; diff --git a/pkgs/development/compilers/llvm/11/compiler-rt.nix b/pkgs/development/compilers/llvm/11/compiler-rt.nix index b8a5fcd5661c..9a596e00e1b4 100644 --- a/pkgs/development/compilers/llvm/11/compiler-rt.nix +++ b/pkgs/development/compilers/llvm/11/compiler-rt.nix @@ -86,5 +86,4 @@ stdenv.mkDerivation rec { ln -s $out/lib/*/clang_rt.crtend_shared-*.o $out/lib/crtendS.o ''; - enableParallelBuilding = true; } diff --git a/pkgs/development/compilers/llvm/11/libc++/default.nix b/pkgs/development/compilers/llvm/11/libc++/default.nix index 1ce879cccb67..a74510c717be 100644 --- a/pkgs/development/compilers/llvm/11/libc++/default.nix +++ b/pkgs/development/compilers/llvm/11/libc++/default.nix @@ -1,5 +1,6 @@ { lib, stdenv, fetch, cmake, python3, libcxxabi, llvm, fixDarwinDylibNames, version -, enableShared ? true }: +, enableShared ? !stdenv.hostPlatform.isStatic +}: stdenv.mkDerivation { pname = "libc++"; @@ -35,8 +36,6 @@ stdenv.mkDerivation { "-DLIBCXX_ENABLE_EXCEPTIONS=OFF" ] ++ stdenv.lib.optional (!enableShared) "-DLIBCXX_ENABLE_SHARED=OFF"; - enableParallelBuilding = true; - passthru = { isLLVM = true; }; diff --git a/pkgs/development/compilers/llvm/11/libc++abi.nix b/pkgs/development/compilers/llvm/11/libc++abi.nix index edf83197d2ca..d173b1735cbe 100644 --- a/pkgs/development/compilers/llvm/11/libc++abi.nix +++ b/pkgs/development/compilers/llvm/11/libc++abi.nix @@ -1,5 +1,6 @@ { stdenv, cmake, fetch, libcxx, libunwind, llvm, version -, enableShared ? true }: +, enableShared ? !stdenv.hostPlatform.isStatic +}: stdenv.mkDerivation { pname = "libc++abi"; diff --git a/pkgs/development/compilers/llvm/11/libunwind.nix b/pkgs/development/compilers/llvm/11/libunwind.nix index 5a4492e803f6..e17b35ed6243 100644 --- a/pkgs/development/compilers/llvm/11/libunwind.nix +++ b/pkgs/development/compilers/llvm/11/libunwind.nix @@ -1,4 +1,6 @@ -{ stdenv, version, fetch, cmake, fetchpatch, enableShared ? true }: +{ stdenv, version, fetch, cmake, fetchpatch +, enableShared ? !stdenv.hostPlatform.isStatic +}: stdenv.mkDerivation rec { pname = "libunwind"; @@ -8,7 +10,5 @@ stdenv.mkDerivation rec { 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 index 20eb87c548f6..81b829a2898a 100644 --- a/pkgs/development/compilers/llvm/11/lld.nix +++ b/pkgs/development/compilers/llvm/11/lld.nix @@ -17,8 +17,6 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - enableParallelBuilding = true; - postInstall = '' moveToOutput include "$dev" moveToOutput lib "$dev" diff --git a/pkgs/development/compilers/llvm/11/lldb.nix b/pkgs/development/compilers/llvm/11/lldb.nix index 0ae55d45349a..0282037c092d 100644 --- a/pkgs/development/compilers/llvm/11/lldb.nix +++ b/pkgs/development/compilers/llvm/11/lldb.nix @@ -59,8 +59,6 @@ stdenv.mkDerivation (rec { "-DSPHINX_OUTPUT_HTML=OFF" ]; - enableParallelBuilding = true; - postInstall = '' # Editor support # vscode: diff --git a/pkgs/development/compilers/llvm/11/llvm.nix b/pkgs/development/compilers/llvm/11/llvm.nix index c2b70a149bf5..4ec4104b6fa8 100644 --- a/pkgs/development/compilers/llvm/11/llvm.nix +++ b/pkgs/development/compilers/llvm/11/llvm.nix @@ -156,8 +156,6 @@ in stdenv.mkDerivation (rec { checkTarget = "check-all"; - enableParallelBuilding = true; - requiredSystemFeatures = [ "big-parallel" ]; meta = { description = "Collection of modular and reusable compiler and toolchain technologies"; diff --git a/pkgs/development/compilers/llvm/11/openmp.nix b/pkgs/development/compilers/llvm/11/openmp.nix index 5fd6c62840db..ae0ddcb17675 100644 --- a/pkgs/development/compilers/llvm/11/openmp.nix +++ b/pkgs/development/compilers/llvm/11/openmp.nix @@ -15,8 +15,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake perl ]; buildInputs = [ llvm ]; - enableParallelBuilding = true; - meta = { description = "Components required to build an executable OpenMP program"; homepage = "https://openmp.llvm.org/"; diff --git a/pkgs/development/compilers/llvm/5/clang/default.nix b/pkgs/development/compilers/llvm/5/clang/default.nix index b5e7b54fa5be..a097e9167cde 100644 --- a/pkgs/development/compilers/llvm/5/clang/default.nix +++ b/pkgs/development/compilers/llvm/5/clang/default.nix @@ -72,8 +72,6 @@ let rm $out/bin/c-index-test ''; - enableParallelBuilding = true; - passthru = { isClang = true; inherit llvm; diff --git a/pkgs/development/compilers/llvm/5/compiler-rt.nix b/pkgs/development/compilers/llvm/5/compiler-rt.nix index 41f2b24b057e..e973be0a087a 100644 --- a/pkgs/development/compilers/llvm/5/compiler-rt.nix +++ b/pkgs/development/compilers/llvm/5/compiler-rt.nix @@ -84,5 +84,4 @@ stdenv.mkDerivation { ln -s $out/lib/*/clang_rt.crtend_shared-*.o $out/lib/linux/crtendS.o ''; - enableParallelBuilding = true; } diff --git a/pkgs/development/compilers/llvm/5/libc++/default.nix b/pkgs/development/compilers/llvm/5/libc++/default.nix index 9bebedbc0442..687a613e0748 100644 --- a/pkgs/development/compilers/llvm/5/libc++/default.nix +++ b/pkgs/development/compilers/llvm/5/libc++/default.nix @@ -37,8 +37,6 @@ stdenv.mkDerivation { "-DLIBCXX_CXX_ABI=libcxxabi" ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl "-DLIBCXX_HAS_MUSL_LIBC=1"; - enableParallelBuilding = true; - passthru = { isLLVM = true; }; diff --git a/pkgs/development/compilers/llvm/5/lld.nix b/pkgs/development/compilers/llvm/5/lld.nix index 3d9ed6ee6635..5f43f8235e10 100644 --- a/pkgs/development/compilers/llvm/5/lld.nix +++ b/pkgs/development/compilers/llvm/5/lld.nix @@ -16,8 +16,6 @@ stdenv.mkDerivation { outputs = [ "out" "dev" ]; - enableParallelBuilding = true; - postInstall = '' moveToOutput include "$dev" moveToOutput lib "$dev" diff --git a/pkgs/development/compilers/llvm/5/lldb.nix b/pkgs/development/compilers/llvm/5/lldb.nix index e827f76231f1..258535a75669 100644 --- a/pkgs/development/compilers/llvm/5/lldb.nix +++ b/pkgs/development/compilers/llvm/5/lldb.nix @@ -51,8 +51,6 @@ stdenv.mkDerivation { "-DLLDB_CODESIGN_IDENTITY=" # codesigning makes nondeterministic ]; - enableParallelBuilding = true; - postInstall = '' mkdir -p $out/share/man/man1 cp ../docs/lldb.1 $out/share/man/man1/ diff --git a/pkgs/development/compilers/llvm/5/llvm.nix b/pkgs/development/compilers/llvm/5/llvm.nix index 987e6258527a..2c2867c99373 100644 --- a/pkgs/development/compilers/llvm/5/llvm.nix +++ b/pkgs/development/compilers/llvm/5/llvm.nix @@ -146,8 +146,6 @@ stdenv.mkDerivation ({ checkTarget = "check-all"; - enableParallelBuilding = true; - requiredSystemFeatures = [ "big-parallel" ]; meta = { description = "Collection of modular and reusable compiler and toolchain technologies"; diff --git a/pkgs/development/compilers/llvm/5/openmp.nix b/pkgs/development/compilers/llvm/5/openmp.nix index da328de24d13..452f5a3cfe5b 100644 --- a/pkgs/development/compilers/llvm/5/openmp.nix +++ b/pkgs/development/compilers/llvm/5/openmp.nix @@ -15,8 +15,6 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake perl ]; buildInputs = [ llvm ]; - enableParallelBuilding = true; - meta = { description = "Components required to build an executable OpenMP program"; homepage = "https://openmp.llvm.org/"; diff --git a/pkgs/development/compilers/llvm/6/clang/default.nix b/pkgs/development/compilers/llvm/6/clang/default.nix index ec3effebfd77..63a79ffba8ab 100644 --- a/pkgs/development/compilers/llvm/6/clang/default.nix +++ b/pkgs/development/compilers/llvm/6/clang/default.nix @@ -72,8 +72,6 @@ let rm $out/bin/c-index-test ''; - enableParallelBuilding = true; - passthru = { isClang = true; inherit llvm; diff --git a/pkgs/development/compilers/llvm/6/compiler-rt.nix b/pkgs/development/compilers/llvm/6/compiler-rt.nix index 8bd61f5d7f70..df61824e908d 100644 --- a/pkgs/development/compilers/llvm/6/compiler-rt.nix +++ b/pkgs/development/compilers/llvm/6/compiler-rt.nix @@ -86,5 +86,4 @@ stdenv.mkDerivation { ln -s $out/lib/*/clang_rt.crtend_shared-*.o $out/lib/linux/crtendS.o ''; - enableParallelBuilding = true; } diff --git a/pkgs/development/compilers/llvm/6/libc++/default.nix b/pkgs/development/compilers/llvm/6/libc++/default.nix index 727a32260872..129d06fe515c 100644 --- a/pkgs/development/compilers/llvm/6/libc++/default.nix +++ b/pkgs/development/compilers/llvm/6/libc++/default.nix @@ -37,8 +37,6 @@ stdenv.mkDerivation { "-DLIBCXX_CXX_ABI=libcxxabi" ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl "-DLIBCXX_HAS_MUSL_LIBC=1"; - enableParallelBuilding = true; - passthru = { isLLVM = true; }; diff --git a/pkgs/development/compilers/llvm/6/lld.nix b/pkgs/development/compilers/llvm/6/lld.nix index 81b94df31194..da1acf3f5f3b 100644 --- a/pkgs/development/compilers/llvm/6/lld.nix +++ b/pkgs/development/compilers/llvm/6/lld.nix @@ -17,8 +17,6 @@ stdenv.mkDerivation { outputs = [ "out" "dev" ]; - enableParallelBuilding = true; - postInstall = '' moveToOutput include "$dev" moveToOutput lib "$dev" diff --git a/pkgs/development/compilers/llvm/6/lldb.nix b/pkgs/development/compilers/llvm/6/lldb.nix index 629749e10f3c..0a1386185740 100644 --- a/pkgs/development/compilers/llvm/6/lldb.nix +++ b/pkgs/development/compilers/llvm/6/lldb.nix @@ -51,8 +51,6 @@ stdenv.mkDerivation { "-DLLDB_CODESIGN_IDENTITY=" # codesigning makes nondeterministic ]; - enableParallelBuilding = true; - postInstall = '' mkdir -p $out/share/man/man1 cp ../docs/lldb.1 $out/share/man/man1/ diff --git a/pkgs/development/compilers/llvm/6/llvm.nix b/pkgs/development/compilers/llvm/6/llvm.nix index 22dbb75d2d50..07aaf1e92180 100644 --- a/pkgs/development/compilers/llvm/6/llvm.nix +++ b/pkgs/development/compilers/llvm/6/llvm.nix @@ -145,8 +145,6 @@ stdenv.mkDerivation ({ checkTarget = "check-all"; - enableParallelBuilding = true; - requiredSystemFeatures = [ "big-parallel" ]; meta = { description = "Collection of modular and reusable compiler and toolchain technologies"; diff --git a/pkgs/development/compilers/llvm/6/openmp.nix b/pkgs/development/compilers/llvm/6/openmp.nix index c1a4480a5524..d6b00bb01ae0 100644 --- a/pkgs/development/compilers/llvm/6/openmp.nix +++ b/pkgs/development/compilers/llvm/6/openmp.nix @@ -15,8 +15,6 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake perl ]; buildInputs = [ llvm ]; - enableParallelBuilding = true; - meta = { description = "Components required to build an executable OpenMP program"; homepage = "https://openmp.llvm.org/"; diff --git a/pkgs/development/compilers/llvm/7/clang/default.nix b/pkgs/development/compilers/llvm/7/clang/default.nix index 969938681fe9..0b1fdd53de9a 100644 --- a/pkgs/development/compilers/llvm/7/clang/default.nix +++ b/pkgs/development/compilers/llvm/7/clang/default.nix @@ -83,8 +83,6 @@ let rm $out/bin/c-index-test ''; - enableParallelBuilding = true; - passthru = { isClang = true; inherit llvm; diff --git a/pkgs/development/compilers/llvm/7/compiler-rt.nix b/pkgs/development/compilers/llvm/7/compiler-rt.nix index ec9b7e6e6ad4..bae9cf5fa0ed 100644 --- a/pkgs/development/compilers/llvm/7/compiler-rt.nix +++ b/pkgs/development/compilers/llvm/7/compiler-rt.nix @@ -89,5 +89,4 @@ stdenv.mkDerivation { ln -s $out/lib/*/clang_rt.crtend_shared-*.o $out/lib/linux/crtendS.o ''; - enableParallelBuilding = true; } diff --git a/pkgs/development/compilers/llvm/7/libc++/default.nix b/pkgs/development/compilers/llvm/7/libc++/default.nix index 76baadf1c6e9..273156726070 100644 --- a/pkgs/development/compilers/llvm/7/libc++/default.nix +++ b/pkgs/development/compilers/llvm/7/libc++/default.nix @@ -1,5 +1,6 @@ { lib, stdenv, fetch, cmake, python3, libcxxabi, fixDarwinDylibNames, version -, enableShared ? ! stdenv.hostPlatform.isMusl }: +, enableShared ? !stdenv.hostPlatform.isStatic +}: stdenv.mkDerivation { pname = "libc++"; @@ -38,8 +39,6 @@ stdenv.mkDerivation { ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl "-DLIBCXX_HAS_MUSL_LIBC=1" ++ stdenv.lib.optional (!enableShared) "-DLIBCXX_ENABLE_SHARED=OFF" ; - enableParallelBuilding = true; - passthru = { isLLVM = true; }; diff --git a/pkgs/development/compilers/llvm/7/libc++abi.nix b/pkgs/development/compilers/llvm/7/libc++abi.nix index 7f2ec528f3c1..4c46aeaa1910 100644 --- a/pkgs/development/compilers/llvm/7/libc++abi.nix +++ b/pkgs/development/compilers/llvm/7/libc++abi.nix @@ -1,7 +1,8 @@ { stdenv, cmake, fetch, libcxx, llvm, version , standalone ? false # on musl the shared objects don't build -, enableShared ? ! stdenv.hostPlatform.isMusl }: +, enableShared ? !stdenv.hostPlatform.isStatic +}: stdenv.mkDerivation { pname = "libc++abi"; diff --git a/pkgs/development/compilers/llvm/7/lld.nix b/pkgs/development/compilers/llvm/7/lld.nix index bee9202ed6c1..5e0568b6a093 100644 --- a/pkgs/development/compilers/llvm/7/lld.nix +++ b/pkgs/development/compilers/llvm/7/lld.nix @@ -17,8 +17,6 @@ stdenv.mkDerivation { outputs = [ "out" "dev" ]; - enableParallelBuilding = true; - postInstall = '' moveToOutput include "$dev" moveToOutput lib "$dev" diff --git a/pkgs/development/compilers/llvm/7/lldb.nix b/pkgs/development/compilers/llvm/7/lldb.nix index 8fadd3cf7849..d1508c46d0c2 100644 --- a/pkgs/development/compilers/llvm/7/lldb.nix +++ b/pkgs/development/compilers/llvm/7/lldb.nix @@ -52,8 +52,6 @@ stdenv.mkDerivation { NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-I${libxml2.dev}/include/libxml2"; - enableParallelBuilding = true; - postInstall = '' mkdir -p $out/share/man/man1 cp ../docs/lldb.1 $out/share/man/man1/ diff --git a/pkgs/development/compilers/llvm/7/llvm.nix b/pkgs/development/compilers/llvm/7/llvm.nix index dc57d0d6bd5c..69114c7ca23f 100644 --- a/pkgs/development/compilers/llvm/7/llvm.nix +++ b/pkgs/development/compilers/llvm/7/llvm.nix @@ -167,8 +167,6 @@ in stdenv.mkDerivation ({ checkTarget = "check-all"; - enableParallelBuilding = true; - requiredSystemFeatures = [ "big-parallel" ]; meta = { description = "Collection of modular and reusable compiler and toolchain technologies"; diff --git a/pkgs/development/compilers/llvm/7/openmp.nix b/pkgs/development/compilers/llvm/7/openmp.nix index 898d49dce834..e36b236fd021 100644 --- a/pkgs/development/compilers/llvm/7/openmp.nix +++ b/pkgs/development/compilers/llvm/7/openmp.nix @@ -15,8 +15,6 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake perl ]; buildInputs = [ llvm ]; - enableParallelBuilding = true; - meta = { description = "Components required to build an executable OpenMP program"; homepage = "https://openmp.llvm.org/"; diff --git a/pkgs/development/compilers/llvm/8/clang/default.nix b/pkgs/development/compilers/llvm/8/clang/default.nix index 5c1dca5e33b1..0c00ce627153 100644 --- a/pkgs/development/compilers/llvm/8/clang/default.nix +++ b/pkgs/development/compilers/llvm/8/clang/default.nix @@ -93,8 +93,6 @@ let rm $out/bin/c-index-test ''; - enableParallelBuilding = true; - passthru = { isClang = true; inherit llvm; diff --git a/pkgs/development/compilers/llvm/8/compiler-rt.nix b/pkgs/development/compilers/llvm/8/compiler-rt.nix index 3c6265c4fca0..280204c6e353 100644 --- a/pkgs/development/compilers/llvm/8/compiler-rt.nix +++ b/pkgs/development/compilers/llvm/8/compiler-rt.nix @@ -87,5 +87,4 @@ stdenv.mkDerivation { ln -s $out/lib/*/clang_rt.crtend_shared-*.o $out/lib/crtendS.o ''; - enableParallelBuilding = true; } diff --git a/pkgs/development/compilers/llvm/8/libc++/default.nix b/pkgs/development/compilers/llvm/8/libc++/default.nix index 01e0d8e008cb..7a3a33bfd7d4 100644 --- a/pkgs/development/compilers/llvm/8/libc++/default.nix +++ b/pkgs/development/compilers/llvm/8/libc++/default.nix @@ -1,5 +1,6 @@ { lib, stdenv, fetch, cmake, python3, libcxxabi, fixDarwinDylibNames, version -, enableShared ? true }: +, enableShared ? !stdenv.hostPlatform.isStatic +}: stdenv.mkDerivation { pname = "libc++"; @@ -42,8 +43,6 @@ stdenv.mkDerivation { "-DLIBCXX_ENABLE_EXCEPTIONS=OFF" ] ++ stdenv.lib.optional (!enableShared) "-DLIBCXX_ENABLE_SHARED=OFF"; - enableParallelBuilding = true; - passthru = { isLLVM = true; }; diff --git a/pkgs/development/compilers/llvm/8/libc++abi.nix b/pkgs/development/compilers/llvm/8/libc++abi.nix index 590872aaab64..50a38dfa967b 100644 --- a/pkgs/development/compilers/llvm/8/libc++abi.nix +++ b/pkgs/development/compilers/llvm/8/libc++abi.nix @@ -1,5 +1,6 @@ { stdenv, cmake, fetch, libcxx, libunwind, llvm, version -, enableShared ? true }: +, enableShared ? !stdenv.hostPlatform.isStatic +}: stdenv.mkDerivation { pname = "libc++abi"; diff --git a/pkgs/development/compilers/llvm/8/libunwind.nix b/pkgs/development/compilers/llvm/8/libunwind.nix index 646cd3c3ca4a..6e7658652825 100644 --- a/pkgs/development/compilers/llvm/8/libunwind.nix +++ b/pkgs/development/compilers/llvm/8/libunwind.nix @@ -1,4 +1,6 @@ -{ stdenv, version, fetch, cmake, fetchpatch, enableShared ? true }: +{ stdenv, version, fetch, cmake, fetchpatch +, enableShared ? !stdenv.hostPlatform.isStatic +}: stdenv.mkDerivation { pname = "libunwind"; @@ -19,7 +21,5 @@ stdenv.mkDerivation { }) ]; - enableParallelBuilding = true; - cmakeFlags = stdenv.lib.optional (!enableShared) "-DLIBUNWIND_ENABLE_SHARED=OFF"; } diff --git a/pkgs/development/compilers/llvm/8/lld.nix b/pkgs/development/compilers/llvm/8/lld.nix index ba9cf3c57d77..f890591b3775 100644 --- a/pkgs/development/compilers/llvm/8/lld.nix +++ b/pkgs/development/compilers/llvm/8/lld.nix @@ -17,8 +17,6 @@ stdenv.mkDerivation { outputs = [ "out" "dev" ]; - enableParallelBuilding = true; - postInstall = '' moveToOutput include "$dev" moveToOutput lib "$dev" diff --git a/pkgs/development/compilers/llvm/8/lldb.nix b/pkgs/development/compilers/llvm/8/lldb.nix index 298ce737fc73..a22d27f9b297 100644 --- a/pkgs/development/compilers/llvm/8/lldb.nix +++ b/pkgs/development/compilers/llvm/8/lldb.nix @@ -41,8 +41,6 @@ stdenv.mkDerivation { "-DLLDB_CODESIGN_IDENTITY=" # codesigning makes nondeterministic ]; - enableParallelBuilding = true; - postInstall = '' mkdir -p $out/share/man/man1 cp ../docs/lldb.1 $out/share/man/man1/ diff --git a/pkgs/development/compilers/llvm/8/llvm.nix b/pkgs/development/compilers/llvm/8/llvm.nix index 0f6179c2d310..e3ca31313ce4 100644 --- a/pkgs/development/compilers/llvm/8/llvm.nix +++ b/pkgs/development/compilers/llvm/8/llvm.nix @@ -1,5 +1,6 @@ { stdenv , fetch +, fetchpatch , cmake , python3 , libffi @@ -55,6 +56,14 @@ in stdenv.mkDerivation ({ propagatedBuildInputs = [ ncurses zlib ]; + patches = [ + # Fix missing includes for GCC 10 + (fetchpatch { + url = "https://bugs.gentoo.org/attachment.cgi?id=612792"; + sha256 = "0rwx6jpqq4xnf4mvfm8v2d4r34y1yi05am0mx5k2d5bha9j64lqg"; + }) + ]; + postPatch = optionalString stdenv.isDarwin '' substituteInPlace cmake/modules/AddLLVM.cmake \ --replace 'set(_install_name_dir INSTALL_NAME_DIR "@rpath")' "set(_install_name_dir)" \ @@ -142,8 +151,6 @@ in stdenv.mkDerivation ({ checkTarget = "check-all"; - enableParallelBuilding = true; - requiredSystemFeatures = [ "big-parallel" ]; meta = { description = "Collection of modular and reusable compiler and toolchain technologies"; diff --git a/pkgs/development/compilers/llvm/8/openmp.nix b/pkgs/development/compilers/llvm/8/openmp.nix index 42cc7adf4f00..4eb43600dd69 100644 --- a/pkgs/development/compilers/llvm/8/openmp.nix +++ b/pkgs/development/compilers/llvm/8/openmp.nix @@ -15,8 +15,6 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake perl ]; buildInputs = [ llvm ]; - enableParallelBuilding = true; - meta = { description = "Components required to build an executable OpenMP program"; homepage = "https://openmp.llvm.org/"; diff --git a/pkgs/development/compilers/llvm/9/clang/default.nix b/pkgs/development/compilers/llvm/9/clang/default.nix index cfaee05944ca..b880d843d598 100644 --- a/pkgs/development/compilers/llvm/9/clang/default.nix +++ b/pkgs/development/compilers/llvm/9/clang/default.nix @@ -88,8 +88,6 @@ let rm $out/bin/c-index-test ''; - enableParallelBuilding = true; - passthru = { isClang = true; inherit llvm; diff --git a/pkgs/development/compilers/llvm/9/compiler-rt.nix b/pkgs/development/compilers/llvm/9/compiler-rt.nix index 13b0b522771f..709d0c134776 100644 --- a/pkgs/development/compilers/llvm/9/compiler-rt.nix +++ b/pkgs/development/compilers/llvm/9/compiler-rt.nix @@ -85,6 +85,4 @@ stdenv.mkDerivation rec { 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/9/libc++/default.nix b/pkgs/development/compilers/llvm/9/libc++/default.nix index c9f0e6254ab4..c70130d36a49 100644 --- a/pkgs/development/compilers/llvm/9/libc++/default.nix +++ b/pkgs/development/compilers/llvm/9/libc++/default.nix @@ -1,5 +1,6 @@ { lib, stdenv, fetch, cmake, python3, libcxxabi, fixDarwinDylibNames, version -, enableShared ? true }: +, enableShared ? !stdenv.hostPlatform.isStatic +}: stdenv.mkDerivation { pname = "libc++"; @@ -38,8 +39,6 @@ stdenv.mkDerivation { "-DLIBCXX_ENABLE_EXCEPTIONS=OFF" ] ++ stdenv.lib.optional (!enableShared) "-DLIBCXX_ENABLE_SHARED=OFF"; - enableParallelBuilding = true; - passthru = { isLLVM = true; }; diff --git a/pkgs/development/compilers/llvm/9/libc++abi.nix b/pkgs/development/compilers/llvm/9/libc++abi.nix index 5b63560282c0..13f033091be2 100644 --- a/pkgs/development/compilers/llvm/9/libc++abi.nix +++ b/pkgs/development/compilers/llvm/9/libc++abi.nix @@ -1,5 +1,6 @@ { stdenv, cmake, fetch, libcxx, libunwind, llvm, version -, enableShared ? true }: +, enableShared ? !stdenv.hostPlatform.isStatic +}: stdenv.mkDerivation { pname = "libc++abi"; diff --git a/pkgs/development/compilers/llvm/9/libunwind.nix b/pkgs/development/compilers/llvm/9/libunwind.nix index 883c36baf062..86756c53829b 100644 --- a/pkgs/development/compilers/llvm/9/libunwind.nix +++ b/pkgs/development/compilers/llvm/9/libunwind.nix @@ -1,4 +1,6 @@ -{ stdenv, version, fetch, cmake, fetchpatch, enableShared ? true }: +{ stdenv, version, fetch, cmake, fetchpatch +, enableShared ? !stdenv.hostPlatform.isStatic +}: stdenv.mkDerivation rec { pname = "libunwind"; @@ -8,7 +10,5 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - enableParallelBuilding = true; - cmakeFlags = stdenv.lib.optional (!enableShared) "-DLIBUNWIND_ENABLE_SHARED=OFF"; } diff --git a/pkgs/development/compilers/llvm/9/lld.nix b/pkgs/development/compilers/llvm/9/lld.nix index 488870e729a5..a2b17a97cdc7 100644 --- a/pkgs/development/compilers/llvm/9/lld.nix +++ b/pkgs/development/compilers/llvm/9/lld.nix @@ -17,8 +17,6 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - enableParallelBuilding = true; - postInstall = '' moveToOutput include "$dev" moveToOutput lib "$dev" diff --git a/pkgs/development/compilers/llvm/9/lldb.nix b/pkgs/development/compilers/llvm/9/lldb.nix index a8e193c27b17..9c43287b166c 100644 --- a/pkgs/development/compilers/llvm/9/lldb.nix +++ b/pkgs/development/compilers/llvm/9/lldb.nix @@ -49,8 +49,6 @@ stdenv.mkDerivation rec { "-DLLVM_EXTERNAL_LIT=${lit}/bin/lit" ]; - enableParallelBuilding = true; - postInstall = '' # man page mkdir -p $out/share/man/man1 diff --git a/pkgs/development/compilers/llvm/9/llvm.nix b/pkgs/development/compilers/llvm/9/llvm.nix index 013e5bb36b94..c46e54debe91 100644 --- a/pkgs/development/compilers/llvm/9/llvm.nix +++ b/pkgs/development/compilers/llvm/9/llvm.nix @@ -159,8 +159,6 @@ in stdenv.mkDerivation (rec { checkTarget = "check-all"; - enableParallelBuilding = true; - requiredSystemFeatures = [ "big-parallel" ]; meta = { description = "Collection of modular and reusable compiler and toolchain technologies"; diff --git a/pkgs/development/compilers/llvm/9/openmp.nix b/pkgs/development/compilers/llvm/9/openmp.nix index 84f898ec06a1..9fdcf9e6cff7 100644 --- a/pkgs/development/compilers/llvm/9/openmp.nix +++ b/pkgs/development/compilers/llvm/9/openmp.nix @@ -15,8 +15,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake perl ]; buildInputs = [ llvm ]; - enableParallelBuilding = true; - meta = { description = "Components required to build an executable OpenMP program"; homepage = "https://openmp.llvm.org/"; diff --git a/pkgs/development/compilers/lobster/default.nix b/pkgs/development/compilers/lobster/default.nix index b87bec7ea2d9..728049448e66 100644 --- a/pkgs/development/compilers/lobster/default.nix +++ b/pkgs/development/compilers/lobster/default.nix @@ -45,7 +45,6 @@ stdenv.mkDerivation rec { ]; preConfigure = "cd dev"; - enableParallelBuilding = true; passthru = { tests.can-run-hello-world = callPackage ./test-can-run-hello-world.nix {}; diff --git a/pkgs/development/compilers/mono/generic.nix b/pkgs/development/compilers/mono/generic.nix index ca3b31478070..40d85be5a246 100644 --- a/pkgs/development/compilers/mono/generic.nix +++ b/pkgs/development/compilers/mono/generic.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bison, pkgconfig, glib, gettext, perl, libgdiplus, libX11, callPackage, ncurses, zlib, withLLVM ? false, cacert, Foundation, libobjc, python3, version, sha256, autoconf, libtool, automake, cmake, which +{ stdenv, fetchurl, bison, pkg-config, glib, gettext, perl, libgdiplus, libX11, callPackage, ncurses, zlib, withLLVM ? false, cacert, Foundation, libobjc, python3, version, sha256, autoconf, libtool, automake, cmake, which , gnumake42 , enableParallelBuilding ? true , srcArchiveSuffix ? "tar.bz2" @@ -17,9 +17,9 @@ stdenv.mkDerivation rec { url = "https://download.mono-project.com/sources/mono/${pname}-${version}.${srcArchiveSuffix}"; }; - nativeBuildInputs = [ gnumake42 ]; + nativeBuildInputs = [ automake bison cmake pkg-config which gnumake42 ]; buildInputs = - [ bison pkgconfig glib gettext perl libgdiplus libX11 ncurses zlib python3 autoconf libtool automake cmake which + [ glib gettext perl libgdiplus libX11 ncurses zlib python3 autoconf libtool ] ++ (stdenv.lib.optionals stdenv.isDarwin [ Foundation libobjc ]); diff --git a/pkgs/development/compilers/mono/llvm.nix b/pkgs/development/compilers/mono/llvm.nix index d08a4ebef24d..0a0f232227d8 100644 --- a/pkgs/development/compilers/mono/llvm.nix +++ b/pkgs/development/compilers/mono/llvm.nix @@ -24,7 +24,8 @@ stdenv.mkDerivation { sha256 = "07wd1cs3fdvzb1lv41b655z5zk34f47j8fgd9ljjimi5j9pj71f7"; }; - buildInputs = [ perl groff cmake libxml2 python2 libffi ] ++ lib.optional stdenv.isLinux valgrind; + nativeBuildInputs = [ cmake ]; + buildInputs = [ perl groff libxml2 python2 libffi ] ++ lib.optional stdenv.isLinux valgrind; propagatedBuildInputs = [ ncurses zlib ]; @@ -40,8 +41,6 @@ stdenv.mkDerivation { "-DLLVM_BINUTILS_INCDIR=${libbfd.dev}/include" ] ++ stdenv.lib.optional (!isDarwin) "-DBUILD_SHARED_LIBS=ON"; - enableParallelBuilding = true; - meta = { description = "Collection of modular and reusable compiler and toolchain technologies - Mono build"; homepage = "http://llvm.org/"; diff --git a/pkgs/development/compilers/nextpnr/default.nix b/pkgs/development/compilers/nextpnr/default.nix index 664ceb79636f..ebb6db31d5d1 100644 --- a/pkgs/development/compilers/nextpnr/default.nix +++ b/pkgs/development/compilers/nextpnr/default.nix @@ -3,9 +3,9 @@ , icestorm, trellis , llvmPackages -, enableGui ? true -, wrapQtAppsHook -, qtbase +, enableGui ? false +, wrapQtAppsHook ? null +, qtbase ? null , OpenGL ? null }: @@ -14,14 +14,14 @@ let in with stdenv; mkDerivation rec { pname = "nextpnr"; - version = "2020.12.01"; + version = "2021.01.02"; srcs = [ (fetchFromGitHub { owner = "YosysHQ"; repo = "nextpnr"; - rev = "868902fbdf0b476bdccf4d25cbb80ba602d2cc11"; - sha256 = "1kb5lhixb7f4q800gjyw9xm9ff1yaq3pgna17f5f0bw6b4ds56zc"; + rev = "9b9628047c01a970cfe20f83f2b7129ed109440d"; + sha256 = "0pcv96d0n40h2ipywi909hpzlys5b6r4pamc320qk1xxhppmgkmm"; name = "nextpnr"; }) (fetchFromGitHub { @@ -43,19 +43,18 @@ with stdenv; mkDerivation rec { ++ (lib.optional enableGui qtbase) ++ (lib.optional stdenv.cc.isClang llvmPackages.openmp); - enableParallelBuilding = true; cmakeFlags = [ "-DCURRENT_GIT_VERSION=${lib.substring 0 7 (lib.elemAt srcs 0).rev}" "-DARCH=generic;ice40;ecp5" "-DBUILD_TESTS=ON" - "-DICEBOX_ROOT=${icestorm}/share/icebox" + "-DICESTORM_INSTALL_PREFIX=${icestorm}" "-DTRELLIS_INSTALL_PREFIX=${trellis}" "-DTRELLIS_LIBDIR=${trellis}/lib/trellis" "-DUSE_OPENMP=ON" # warning: high RAM usage - "-DSERIALIZE_CHIPDB=OFF" + "-DSERIALIZE_CHIPDBS=OFF" ] - ++ (lib.optional (!enableGui) "-DBUILD_GUI=OFF") + ++ (lib.optional enableGui "-DBUILD_GUI=ON") ++ (lib.optional (enableGui && stdenv.isDarwin) "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks"); diff --git a/pkgs/development/compilers/openjdk/14.nix b/pkgs/development/compilers/openjdk/14.nix new file mode 100644 index 000000000000..e851a5bf4b90 --- /dev/null +++ b/pkgs/development/compilers/openjdk/14.nix @@ -0,0 +1,157 @@ +{ stdenv, lib, fetchurl, bash, pkg-config, autoconf, cpio, file, which, unzip +, zip, perl, cups, freetype, alsaLib, libjpeg, giflib, libpng, zlib, lcms2 +, libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama +, libXcursor, libXrandr, fontconfig, openjdk14-bootstrap +, setJavaClassPath +, headless ? false +, enableJavaFX ? openjfx.meta.available, openjfx +, enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf +}: + +let + major = "14"; + update = ".0.2"; + build = "-ga"; + + openjdk = stdenv.mkDerivation rec { + pname = "openjdk" + lib.optionalString headless "-headless"; + version = "${major}${update}${build}"; + + src = fetchurl { + url = "https://hg.openjdk.java.net/jdk-updates/jdk${major}u/archive/jdk-${version}.tar.gz"; + sha256 = "1s1pc6ihzf0awp4hbaqfxmbica0hnrg8nr7s0yd2hfn7nan8xmf3"; + }; + + nativeBuildInputs = [ pkg-config autoconf ]; + buildInputs = [ + cpio file which unzip zip perl zlib cups freetype alsaLib libjpeg giflib + libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst + libXi libXinerama libXcursor libXrandr fontconfig openjdk14-bootstrap + ] ++ lib.optionals (!headless && enableGnome2) [ + gtk3 gnome_vfs GConf glib + ]; + + patches = [ + ./fix-java-home-jdk10.patch + ./read-truststore-from-env-jdk10.patch + ./currency-date-range-jdk10.patch + ./increase-javadoc-heap-jdk13.patch + # -Wformat etc. are stricter in newer gccs, per + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=79677 + # so grab the work-around from + # https://src.fedoraproject.org/rpms/java-openjdk/pull-request/24 + (fetchurl { + url = "https://src.fedoraproject.org/rpms/java-openjdk/raw/06c001c7d87f2e9fe4fedeef2d993bcd5d7afa2a/f/rh1673833-remove_removal_of_wformat_during_test_compilation.patch"; + sha256 = "082lmc30x64x583vqq00c8y0wqih3y4r0mp1c4bqq36l22qv6b6r"; + }) + ] ++ lib.optionals (!headless && enableGnome2) [ + ./swing-use-gtk-jdk13.patch + ]; + + prePatch = '' + chmod +x configure + patchShebangs --build configure + ''; + + configureFlags = [ + "--with-boot-jdk=${openjdk14-bootstrap.home}" + "--enable-unlimited-crypto" + "--with-native-debug-symbols=internal" + "--with-libjpeg=system" + "--with-giflib=system" + "--with-libpng=system" + "--with-zlib=system" + "--with-lcms=system" + "--with-stdc++lib=dynamic" + ] ++ lib.optional stdenv.isx86_64 "--with-jvm-features=zgc" + ++ lib.optional headless "--enable-headless-only" + ++ lib.optional (!headless && enableJavaFX) "--with-import-modules=${openjfx}"; + + separateDebugInfo = true; + + NIX_CFLAGS_COMPILE = "-Wno-error"; + + NIX_LDFLAGS = toString (lib.optionals (!headless) [ + "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic" + ] ++ lib.optionals (!headless && enableGnome2) [ + "-lgtk-3" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2" + ]); + + buildFlags = [ "all" ]; + + installPhase = '' + mkdir -p $out/lib + + mv build/*/images/jdk $out/lib/openjdk + + # Remove some broken manpages. + rm -rf $out/lib/openjdk/man/ja* + + # Mirror some stuff in top-level. + mkdir -p $out/share + ln -s $out/lib/openjdk/include $out/include + ln -s $out/lib/openjdk/man $out/share/man + ln -s $out/lib/openjdk/lib/src.zip $out/lib/src.zip + + # jni.h expects jni_md.h to be in the header search path. + ln -s $out/include/linux/*_md.h $out/include/ + + # Remove crap from the installation. + rm -rf $out/lib/openjdk/demo + ${lib.optionalString headless '' + rm $out/lib/openjdk/lib/{libjsound,libfontmanager}.so + ''} + + ln -s $out/lib/openjdk/bin $out/bin + ''; + + preFixup = '' + # Propagate the setJavaClassPath setup hook so that any package + # that depends on the JDK has $CLASSPATH set up properly. + mkdir -p $out/nix-support + #TODO or printWords? cf https://github.com/NixOS/nixpkgs/pull/27427#issuecomment-317293040 + echo -n "${setJavaClassPath}" > $out/nix-support/propagated-build-inputs + + # Set JAVA_HOME automatically. + mkdir -p $out/nix-support + cat < $out/nix-support/setup-hook + if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out/lib/openjdk; fi + EOF + ''; + + postFixup = '' + # Build the set of output library directories to rpath against + LIBDIRS="" + for output in $outputs; do + if [ "$output" = debug ]; then continue; fi + LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \+ | sort | uniq | tr '\n' ':'):$LIBDIRS" + done + # Add the local library paths to remove dependencies on the bootstrap + for output in $outputs; do + if [ "$output" = debug ]; then continue; fi + OUTPUTDIR=$(eval echo \$$output) + BINLIBS=$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name \*.so\*) + echo "$BINLIBS" | while read i; do + patchelf --set-rpath "$LIBDIRS:$(patchelf --print-rpath "$i")" "$i" || true + patchelf --shrink-rpath "$i" || true + done + done + ''; + + disallowedReferences = [ openjdk14-bootstrap ]; + + meta = with stdenv.lib; { + homepage = "https://openjdk.java.net/"; + license = licenses.gpl2; + description = "The open-source Java Development Kit"; + maintainers = with maintainers; [ edwtjo ]; + platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "armv7l-linux" "armv6l-linux" ]; + }; + + passthru = { + architecture = ""; + home = "${openjdk}/lib/openjdk"; + inherit gtk3; + }; + }; +in openjdk diff --git a/pkgs/development/compilers/openjdk/darwin/default.nix b/pkgs/development/compilers/openjdk/darwin/default.nix index c6498cb45302..f10ede2506ae 100644 --- a/pkgs/development/compilers/openjdk/darwin/default.nix +++ b/pkgs/development/compilers/openjdk/darwin/default.nix @@ -7,11 +7,11 @@ let }; jdk = stdenv.mkDerivation rec { - name = "zulu14.28.21-ca-jdk14.0.1"; + name = "zulu15.28.51-ca-jdk15.0.1"; src = fetchurl { url = "https://cdn.azul.com/zulu/bin/${name}-macosx_x64.tar.gz"; - sha256 = "1pc0y3fxhlf42a51qbdha1fabci61yzq70kk5c1rzk0ai78d92q8"; + sha256 = "0h738pbnwcn7pjp0qyryzazqj5nw5sy2f8l0ycl39crm9ia6akvh"; curlOpts = "-H Referer:https://www.azul.com/downloads/zulu/"; }; diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix index 1dcd3e23e6fa..ec0042809c66 100644 --- a/pkgs/development/compilers/openjdk/default.nix +++ b/pkgs/development/compilers/openjdk/default.nix @@ -1,7 +1,7 @@ -{ stdenv, lib, fetchurl, bash, pkgconfig, autoconf, cpio, file, which, unzip +{ stdenv, lib, fetchurl, bash, pkg-config, autoconf, cpio, file, which, unzip , zip, perl, cups, freetype, alsaLib, libjpeg, giflib, libpng, zlib, lcms2 , libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama -, libXcursor, libXrandr, fontconfig, openjdk14-bootstrap +, libXcursor, libXrandr, fontconfig, openjdk15-bootstrap , setJavaClassPath , headless ? false , enableJavaFX ? openjfx.meta.available, openjfx @@ -9,8 +9,8 @@ }: let - major = "14"; - update = ".0.2"; + major = "15"; + update = ".0.1"; build = "-ga"; openjdk = stdenv.mkDerivation rec { @@ -18,15 +18,15 @@ let version = "${major}${update}${build}"; src = fetchurl { - url = "http://hg.openjdk.java.net/jdk-updates/jdk${major}u/archive/jdk-${version}.tar.gz"; - sha256 = "1s1pc6ihzf0awp4hbaqfxmbica0hnrg8nr7s0yd2hfn7nan8xmf3"; + url = "https://hg.openjdk.java.net/jdk-updates/jdk${major}u/archive/jdk-${version}.tar.gz"; + sha256 = "1h8n5figc9q0k9p8b0qggyhvqagvxanfih1lj5j492c74cd1mx1l"; }; - nativeBuildInputs = [ pkgconfig autoconf ]; + nativeBuildInputs = [ pkg-config autoconf ]; buildInputs = [ cpio file which unzip zip perl zlib cups freetype alsaLib libjpeg giflib libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst - libXi libXinerama libXcursor libXrandr fontconfig openjdk14-bootstrap + libXi libXinerama libXcursor libXrandr fontconfig openjdk15-bootstrap ] ++ lib.optionals (!headless && enableGnome2) [ gtk3 gnome_vfs GConf glib ]; @@ -54,7 +54,7 @@ let ''; configureFlags = [ - "--with-boot-jdk=${openjdk14-bootstrap.home}" + "--with-boot-jdk=${openjdk15-bootstrap.home}" "--enable-unlimited-crypto" "--with-native-debug-symbols=internal" "--with-libjpeg=system" @@ -138,10 +138,10 @@ let done ''; - disallowedReferences = [ openjdk14-bootstrap ]; + disallowedReferences = [ openjdk15-bootstrap ]; meta = with stdenv.lib; { - homepage = "http://openjdk.java.net/"; + homepage = "https://openjdk.java.net/"; license = licenses.gpl2; description = "The open-source Java Development Kit"; maintainers = with maintainers; [ edwtjo ]; diff --git a/pkgs/development/compilers/openjdk/openjfx/14.nix b/pkgs/development/compilers/openjdk/openjfx/15.nix similarity index 89% rename from pkgs/development/compilers/openjdk/openjfx/14.nix rename to pkgs/development/compilers/openjdk/openjfx/15.nix index 51512c5afcaf..f406a3959fd1 100644 --- a/pkgs/development/compilers/openjdk/openjfx/14.nix +++ b/pkgs/development/compilers/openjdk/openjfx/15.nix @@ -3,9 +3,9 @@ , ffmpeg_3, python, ruby }: let - major = "14"; - update = ""; - build = "-ga"; + major = "15"; + update = ".0.1"; + build = "+1"; repover = "${major}${update}${build}"; gradle_ = (gradleGen.override { java = openjdk11_headless; @@ -18,7 +18,7 @@ let owner = "openjdk"; repo = "jfx"; rev = repover; - sha256 = "16aj15xksc266gv3y42m0g277pfvp71901lrngndcnpr7i2zshnr"; + sha256 = "019glq8rhn6amy3n5jc17vi2wpf1pxpmmywvyz1ga8n09w7xscq1"; }; buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsaLib ffmpeg_3 ]; @@ -64,8 +64,10 @@ let outputHashMode = "recursive"; # Downloaded AWT jars differ by platform. outputHash = { - x86_64-linux = "077zss95iq6iskx7ghz1c57ymydpzj0wm7r1pkznw99l9xwvdmqi"; - i686-linux = "03gglr2sh77cyg16qw9g45ji33dg7i93s5s30hz3mh420g112qa0"; + x86_64-linux = "0hmyr5nnjgwyw3fcwqf0crqg9lny27jfirycg3xmkzbcrwqd6qkw"; + # The build-time dependencies don't currently build for i686, so no + # reason to fetch this one correctly either... + i686-linux = "0000000000000000000000000000000000000000000000000000"; }.${stdenv.system} or (throw "Unsupported platform"); }; diff --git a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix index 78fff4a59fba..17030cf5bf1e 100644 --- a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix +++ b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix @@ -76,7 +76,7 @@ let result = stdenv.mkDerivation rec { i686-linux = "linux-i586"; x86_64-linux = "linux-x64"; armv7l-linux = "linux-arm32-vfp-hflt"; - aarch64-linux = "linux-arm64-vfp-hflt"; + aarch64-linux = "linux-aarch64"; }.${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}"); in requireFile { name = "jdk-${productVersion}u${patchVersion}-${platformName}.tar.gz"; diff --git a/pkgs/development/compilers/oraclejdk/jdk8-linux.nix b/pkgs/development/compilers/oraclejdk/jdk8-linux.nix index fdea10dcd7e4..01d1ee8e980c 100644 --- a/pkgs/development/compilers/oraclejdk/jdk8-linux.nix +++ b/pkgs/development/compilers/oraclejdk/jdk8-linux.nix @@ -1,10 +1,10 @@ import ./jdk-linux-base.nix { productVersion = "8"; - patchVersion = "261"; - sha256.i686-linux = "1bl12hd5i53m8d4j8rwkk3bavmzw0ndr88ch5lf5syi7vs5pfjpm"; - sha256.x86_64-linux = "0d7a92csz8ws5h0pzqmrxq3sz286s57vw0dqq3ciwsqz14df012s"; - sha256.armv7l-linux = "13dih7zyfgj90bkhnfxhpm88d9kqqrj6w5rzpidmxrjwrsnlndp9"; - sha256.aarch64-linux = "0zzhs4pcnjss2561b8zrrnacpkb8p49ca0lpdw7hzgsjjj1y146n"; + patchVersion = "271"; + sha256.i686-linux = "nC1bRTDj0BPWqClLCfNIqdUn9HywUF8Z/pIV9Kq3LG0="; + sha256.x86_64-linux = "66eSamg7tlxvThxQLOYkNGxCsA+1Ux3ropbyVgtFLHg="; + sha256.armv7l-linux = "YZKX0iUf7yqUBUhlpHtVdYw6DBEu7E/pbfcVfK7HMxM="; + sha256.aarch64-linux = "bFRGnfmYIdXz5b/I8wlA/YiGXhCm/cVoOAU+Hlu4F0I="; jceName = "jce_policy-8.zip"; sha256JCE = "19n5wadargg3v8x76r7ayag6p2xz1bwhrgdzjs9f4i6fvxz9jr4w"; } diff --git a/pkgs/development/compilers/osl/default.nix b/pkgs/development/compilers/osl/default.nix index 2c00420c3626..b1f9dae4fcd0 100644 --- a/pkgs/development/compilers/osl/default.nix +++ b/pkgs/development/compilers/osl/default.nix @@ -18,13 +18,13 @@ in clangStdenv.mkDerivation rec { }; cmakeFlags = [ "-DUSE_BOOST_WAVE=ON" "-DENABLERTTI=ON" ]; - enableParallelBuilding = true; preConfigure = '' patchShebangs src/liboslexec/serialize-bc.bash ''; - + + nativeBuildInputs = [ cmake boost_static flex bison]; buildInputs = [ - cmake zlib openexr openimageio llvm - boost_static flex bison partio pugixml + zlib openexr openimageio llvm + partio pugixml util-linux # needed just for hexdump python # CMake doesn't check this? ]; diff --git a/pkgs/development/compilers/ponyc/default.nix b/pkgs/development/compilers/ponyc/default.nix index 0bfaba914a7b..df80fe2fdb64 100644 --- a/pkgs/development/compilers/ponyc/default.nix +++ b/pkgs/development/compilers/ponyc/default.nix @@ -29,7 +29,8 @@ stdenv.mkDerivation (rec { name = "v1.5.0.tar.gz"; }; - buildInputs = [ makeWrapper which libxml2 cmake z3 ]; + nativeBuildInputs = [ cmake makeWrapper which ]; + buildInputs = [ libxml2 z3 ]; propagatedBuildInputs = [ cc ]; # Sandbox disallows network access, so disabling problematic networking tests @@ -82,8 +83,6 @@ stdenv.mkDerivation (rec { ++ stdenv.lib.optionals stdenv.isDarwin [ "bits=64" ] ++ stdenv.lib.optionals (stdenv.isDarwin && (!lto)) [ "lto=no" ]; - enableParallelBuilding = true; - doCheck = true; NIX_CFLAGS_COMPILE = [ "-Wno-error=redundant-move" "-Wno-error=implicit-fallthrough" ]; diff --git a/pkgs/development/compilers/prjxray-tools/default.nix b/pkgs/development/compilers/prjxray-tools/default.nix new file mode 100644 index 000000000000..652b5458a75e --- /dev/null +++ b/pkgs/development/compilers/prjxray-tools/default.nix @@ -0,0 +1,29 @@ +{ stdenv +, fetchFromGitHub +, cmake +}: + +stdenv.mkDerivation rec { + pname = "prjxray-tools"; + version = "0.1-2676-gac8d30e3"; + + src = fetchFromGitHub { + owner = "SymbiFlow"; + repo = "prjxray"; + fetchSubmodules = true; + rev = "ac8d30e3fe2029122408888d2313844b3e0c265b"; + sha256 = "1ag7dk12hdhip821crwinncp8vgyzs0r85l1h2vbgn61lnxc7f4h"; + }; + + nativeBuildInputs = [ cmake ]; + + doCheck = true; + + meta = with stdenv.lib; { + description = "Documenting the Xilinx 7-series bit-stream format"; + homepage = "https://github.com/SymbiFlow/prjxray"; + license = licenses.isc; + platforms = platforms.all; + maintainers = with maintainers; [ mcaju ]; + }; +} diff --git a/pkgs/development/compilers/reason/default.nix b/pkgs/development/compilers/reason/default.nix index 4c0e9c298519..435813ee5e7a 100644 --- a/pkgs/development/compilers/reason/default.nix +++ b/pkgs/development/compilers/reason/default.nix @@ -1,4 +1,4 @@ -{ stdenv, makeWrapper, fetchFromGitHub, ocaml, findlib, dune +{ stdenv, makeWrapper, fetchFromGitHub, ocaml, findlib, dune_2 , fix, menhir, merlin-extend, ppx_tools_versioned, utop, cppo }: @@ -17,13 +17,12 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ menhir merlin-extend ppx_tools_versioned ]; - buildInputs = [ ocaml findlib dune cppo fix utop menhir ]; + buildInputs = [ ocaml findlib dune_2 cppo fix utop menhir ]; buildFlags = [ "build" ]; # do not "make tests" before reason lib is installed - inherit (dune) installPhase; - - postInstall = '' + installPhase = '' + dune install --prefix=$out --libdir=$OCAMLFIND_DESTDIR wrapProgram $out/bin/rtop \ --prefix PATH : "${utop}/bin" \ --prefix CAML_LD_LIBRARY_PATH : "$CAML_LD_LIBRARY_PATH" \ diff --git a/pkgs/development/compilers/rust/1_45.nix b/pkgs/development/compilers/rust/1_45.nix index b4d887f2e964..25ecb1dc0010 100644 --- a/pkgs/development/compilers/rust/1_45.nix +++ b/pkgs/development/compilers/rust/1_45.nix @@ -33,7 +33,7 @@ import ./default.nix { # building bootstrapVersion = "1.44.1"; - # fetch hashes by running `print-hashes.sh 1.45.0` + # fetch hashes by running `print-hashes.sh ${bootstrapVersion}` bootstrapHashes = { i686-unknown-linux-gnu = "e69689b0a1b66599cf83e7dd54f839419007e44376195e93e301a3175da3d854"; x86_64-unknown-linux-gnu = "a41df89a461a580536aeb42755e43037556fba2e527dd13a1e1bb0749de28202"; diff --git a/pkgs/development/compilers/rust/1_48.nix b/pkgs/development/compilers/rust/1_48.nix index 6b4b10f12d3e..fff02b9bf800 100644 --- a/pkgs/development/compilers/rust/1_48.nix +++ b/pkgs/development/compilers/rust/1_48.nix @@ -35,7 +35,7 @@ import ./default.nix { # building bootstrapVersion = "1.47.0"; - # fetch hashes by running `print-hashes.sh 1.45.2` + # fetch hashes by running `print-hashes.sh ${bootstrapVersion}` bootstrapHashes = { i686-unknown-linux-gnu = "84bf092130ea5216fc701871e633563fc1c01b6528f60cb0767e96cd8eec30bf"; x86_64-unknown-linux-gnu = "d0e11e1756a072e8e246b05d54593402813d047d12e44df281fbabda91035d96"; diff --git a/pkgs/development/compilers/rust/rls/default.nix b/pkgs/development/compilers/rust/rls/default.nix index 06b1b9b1e648..7534a52fe0f0 100644 --- a/pkgs/development/compilers/rust/rls/default.nix +++ b/pkgs/development/compilers/rust/rls/default.nix @@ -39,9 +39,9 @@ rustPlatform.buildRustPackage { $out/bin/rls --version ''; - RUST_SRC_PATH = rustPlatform.rustcSrc; + RUST_SRC_PATH = rustPlatform.rustLibSrc; postInstall = '' - wrapProgram $out/bin/rls --set-default RUST_SRC_PATH ${rustPlatform.rustcSrc} + wrapProgram $out/bin/rls --set-default RUST_SRC_PATH ${rustPlatform.rustLibSrc} ''; meta = with stdenv.lib; { diff --git a/pkgs/development/compilers/seexpr/default.nix b/pkgs/development/compilers/seexpr/default.nix index 580fc3b761db..4bf89973d7ef 100644 --- a/pkgs/development/compilers/seexpr/default.nix +++ b/pkgs/development/compilers/seexpr/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation { sha256 = "0a44k56jf6dl36fwgg4zpc252wq5lf9cblg74mp73k82hxw439l4"; }; - buildInputs = [ cmake libGLU libpng zlib qt4 pythonPackages.pyqt4 bison flex ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ libGLU libpng zlib qt4 pythonPackages.pyqt4 bison flex ]; meta = with stdenv.lib; { description = "Embeddable expression evaluation engine from Disney Animation"; homepage = "https://www.disneyanimation.com/technology/seexpr.html"; diff --git a/pkgs/development/compilers/squeak/default.nix b/pkgs/development/compilers/squeak/default.nix index 4687ce86a90a..e94ebab50e65 100644 --- a/pkgs/development/compilers/squeak/default.nix +++ b/pkgs/development/compilers/squeak/default.nix @@ -25,8 +25,6 @@ stdenv.mkDerivation rec { unix/cmake/configure --prefix=$out --enable-mpg-{mmx,pthreads} ''; - enableParallelBuilding = true; - hardeningDisable = [ "format" ]; meta = with stdenv.lib; { diff --git a/pkgs/development/compilers/symbiflow-vtr/default.nix b/pkgs/development/compilers/symbiflow-vtr/default.nix new file mode 100644 index 000000000000..8735b12678c3 --- /dev/null +++ b/pkgs/development/compilers/symbiflow-vtr/default.nix @@ -0,0 +1,40 @@ +{ stdenv +, fetchFromGitHub +, bison +, cmake +, flex +, pkg-config +}: + +stdenv.mkDerivation rec { + pname = "symbiflow-vtr"; + version = "8.0.0.rc2-4003-g8980e4621"; + + src = fetchFromGitHub { + owner = "SymbiFlow"; + repo = "vtr-verilog-to-routing"; + rev = "8980e46218542888fac879961b13aa7b0fba8432"; + sha256 = "1sq7f1f3dzfm48a9vq5nvp0zllby0nasm3pvqab70f4jaq0m1aaa"; + }; + + nativeBuildInputs = [ + bison + cmake + flex + pkg-config + ]; + + cmakeFlags = [ + "-DWITH_ODIN=OFF" + "-DWITH_ABC=OFF" + ]; + + doCheck = true; + + meta = with stdenv.lib; { + description = "SymbiFlow WIP changes for Verilog to Routing (VTR)"; + homepage = "https://github.com/SymbiFlow/vtr-verilog-to-routing"; + platforms = platforms.all; + maintainers = with maintainers; [ mcaju ]; + }; +} diff --git a/pkgs/development/compilers/symbiflow-yosys-plugins/default.nix b/pkgs/development/compilers/symbiflow-yosys-plugins/default.nix new file mode 100644 index 000000000000..b655f9d48733 --- /dev/null +++ b/pkgs/development/compilers/symbiflow-yosys-plugins/default.nix @@ -0,0 +1,37 @@ +{ stdenv +, fetchFromGitHub +, symbiflow-yosys +, zlib +, readline +}: + +stdenv.mkDerivation rec { + pname = "symbiflow-yosys-plugins"; + version = "1.0.0.7-0060-g7454cd6b"; + + src = fetchFromGitHub { + owner = "SymbiFlow"; + repo = "yosys-symbiflow-plugins"; + rev = "7454cd6b5e4fd22854e2ada219a5e3c3a06e0717"; + sha256 = "0r9r31p7fy4ylfrwvwlbivq5a03xrph34blxbxzx2c8bc02mbv0s"; + }; + + enableParallelBuilding = true; + + nativeBuildInputs = [ symbiflow-yosys ]; + + buildInputs = [ + readline + zlib + ]; + + makeFlags = [ "PLUGINS_DIR=${placeholder "out"}/share/yosys/plugins" ]; + + meta = with stdenv.lib; { + description = "Yosys SymbiFlow Plugins"; + homepage = "https://github.com/SymbiFlow/yosys-symbiflow-plugins"; + license = licenses.isc; + platforms = platforms.all; + maintainers = with maintainers; [ mcaju ]; + }; +} diff --git a/pkgs/development/compilers/symbiflow-yosys/default.nix b/pkgs/development/compilers/symbiflow-yosys/default.nix new file mode 100644 index 000000000000..b33003f312e4 --- /dev/null +++ b/pkgs/development/compilers/symbiflow-yosys/default.nix @@ -0,0 +1,37 @@ +{ stdenv +, abc-verifier +, fetchFromGitHub +, yosys +, plugins ? [] +}: + +let + localAbc-verifier = abc-verifier.overrideAttrs (_: rec { + pname = "abc-verifier"; + version = "2020.06.22"; + + src = fetchFromGitHub { + owner = "YosysHQ"; + repo = "abc"; + rev = "341db25668f3054c87aa3372c794e180f629af5d"; + sha256 = "14cgv34vz5ljkcms6nrv19vqws2hs8bgjgffk5q03cbxnm2jxv5s"; + }; + + passthru.rev = src.rev; + }); +in + +(yosys.overrideAttrs (oldAttrs: rec { + pname = "symbiflow-yosys"; + version = "0.9+2406"; + + src = fetchFromGitHub { + owner = "SymbiFlow"; + repo = "yosys"; + rev = "d8b2d1a2b1a93057678cf49bb8f0329f191faba1"; + sha256 = "1w8jnqzabvzixjllhb6ak2n2gmjvsn6qd996i7z70bsq5rgdkq9g"; + }; +})).override { + abc-verifier = localAbc-verifier; + plugins = plugins; +} diff --git a/pkgs/development/compilers/vyper/default.nix b/pkgs/development/compilers/vyper/default.nix new file mode 100644 index 000000000000..3a584ab20181 --- /dev/null +++ b/pkgs/development/compilers/vyper/default.nix @@ -0,0 +1,54 @@ +{ stdenv, lib, buildPythonPackage, fetchPypi, writeText, asttokens +, pycryptodome, pytest_xdist, pytestcov, recommonmark, semantic-version, sphinx +, sphinx_rtd_theme, pytestrunner }: + +let + sample-contract = writeText "example.vy" '' + count: int128 + + @external + def __init__(foo: address): + self.count = 1 + ''; +in + +buildPythonPackage rec { + pname = "vyper"; + version = "0.2.8"; + + src = fetchPypi { + inherit pname version; + sha256 = "0d9fv630ayd1989qnklldh08vksa2lf0r06lm914qy5r5cvbl1v2"; + }; + + nativeBuildInputs = [ pytestrunner ]; + + postPatch = '' + substituteInPlace setup.py \ + --replace 'asttokens==' 'asttokens>=' \ + --replace 'subprocess.check_output("git rev-parse HEAD".split())' "' '" \ + --replace 'commithash.decode("utf-8").strip()' "'069936fa3fee8646ff362145593128d7ef07da38'" + ''; + + propagatedBuildInputs = [ + asttokens + pycryptodome + semantic-version + + # docs + recommonmark + sphinx + sphinx_rtd_theme + ]; + + checkPhase = '' + $out/bin/vyper "${sample-contract}" + ''; + + meta = with stdenv.lib; { + description = "Pythonic Smart Contract Language for the EVM"; + homepage = "https://github.com/vyperlang/vyper"; + license = licenses.asl20; + maintainers = with maintainers; [ siraben ]; + }; +} diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix index b16d76304e47..a83100911d13 100644 --- a/pkgs/development/compilers/yosys/default.nix +++ b/pkgs/development/compilers/yosys/default.nix @@ -5,13 +5,14 @@ , fetchFromGitHub , flex , libffi -, pkgconfig +, pkg-config , protobuf , python3 , readline , tcl , verilog , zlib +, plugins ? [] }: # NOTE: as of late 2020, yosys has switched to an automation robot that @@ -32,32 +33,29 @@ # ultimately less confusing than using dates. stdenv.mkDerivation rec { + inherit plugins; + pname = "yosys"; - version = "0.9+3715"; + version = "0.9+3830"; src = fetchFromGitHub { owner = "YosysHQ"; repo = "yosys"; - rev = "d021f4b4003bb7a374038134c65edd3f67473a92"; - sha256 = "0dgdpigqg8mwkry4233p6z6myjnrb1rq32873yhdfwvwqq230x51"; + rev = "b72c29465392c8d260ddf55def169438f7fb64b2"; + sha256 = "12h3pgj8bjb254q2qaafc3qxwhqdqrx0sxjhgjrfy8cmkdm92dvy"; }; enableParallelBuilding = true; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ tcl readline libffi python3 bison flex protobuf zlib ]; + nativeBuildInputs = [ pkg-config protobuf flex bison python3 ]; + buildInputs = [ tcl readline libffi python3 protobuf zlib ]; makeFlags = [ "ENABLE_PROTOBUF=1" "PREFIX=${placeholder "out"}"]; patchPhase = '' substituteInPlace ./Makefile \ - --replace 'CXX = clang' "" \ - --replace 'LD = clang++' 'LD = $(CXX)' \ - --replace 'CXX = gcc' "" \ - --replace 'LD = gcc' 'LD = $(CXX)' \ - --replace 'ABCMKARGS = CC="$(CXX)" CXX="$(CXX)"' 'ABCMKARGS =' \ --replace 'echo UNKNOWN' 'echo ${builtins.substring 0 10 src.rev}' - substituteInPlace ./misc/yosys-config.in \ - --replace '/bin/bash' '${bash}/bin/bash' + chmod +x ./misc/yosys-config.in + patchShebangs ./misc/yosys-config.in patchShebangs tests ''; @@ -76,8 +74,8 @@ stdenv.mkDerivation rec { exit 1 fi - if ! grep -q "YOSYS_VER := ${version}" Makefile; then - echo "ERROR: yosys version in Makefile isn't equivalent to version of the nix package (${version}), failing." + if ! grep -q "YOSYS_VER := $version" Makefile; then + echo "ERROR: yosys version in Makefile isn't equivalent to version of the nix package ($version), failing." exit 1 fi ''; @@ -94,7 +92,14 @@ stdenv.mkDerivation rec { # add a symlink to fake things so that both variants work the same way. this # is also needed at build time for the test suite. postBuild = "ln -sfv ${abc-verifier}/bin/abc ./yosys-abc"; - postInstall = "ln -sfv ${abc-verifier}/bin/abc $out/bin/yosys-abc"; + postInstall = '' + ln -sfv ${abc-verifier}/bin/abc $out/bin/yosys-abc + + mkdir -p $out/share/yosys/plugins + for plugin in $plugins; do + ln -sfv $plugin/share/yosys/plugins/* $out/share/yosys/plugins/ + done + ''; meta = with stdenv.lib; { description = "Open RTL synthesis framework and tools"; diff --git a/pkgs/development/compilers/z88dk/default.nix b/pkgs/development/compilers/z88dk/default.nix index 890924dddc12..0fb73d42b7e2 100644 --- a/pkgs/development/compilers/z88dk/default.nix +++ b/pkgs/development/compilers/z88dk/default.nix @@ -1,14 +1,14 @@ { fetchFromGitHub, stdenv, makeWrapper, unzip, libxml2, m4, uthash, which }: stdenv.mkDerivation rec { - pname = "z88dk-unstable"; - version = "2020-01-27"; + pname = "z88dk"; + version = "2.0"; src = fetchFromGitHub { owner = "z88dk"; - repo = "z88dk"; - rev = "efdd07c2e2229cac7cfef97ec01f478004846e39"; - sha256 = "0jcks5ygp256lmzmllffp4yb38cxjgdyqnnimkj4s65095cfasyb"; + repo = "z88dk"; + rev = "v${version}"; + sha256 = "14r9bjw6lgz85a59a4ajspvg12swiqxi17zicl8r7p29pi9lsibp"; fetchSubmodules = true; }; @@ -50,10 +50,10 @@ stdenv.mkDerivation rec { installTargets = [ "libs" "install" ]; meta = with stdenv.lib; { - homepage = "https://www.z88dk.org"; + homepage = "https://www.z88dk.org"; description = "z80 Development Kit"; - license = licenses.clArtistic; - maintainers = [ ]; - platforms = platforms.linux; + license = licenses.clArtistic; + maintainers = [ maintainers.siraben ]; + platforms = platforms.unix; }; } diff --git a/pkgs/development/coq-modules/Cheerios/default.nix b/pkgs/development/coq-modules/Cheerios/default.nix index 3f9f3b1ac9cd..6c5216f0d018 100644 --- a/pkgs/development/coq-modules/Cheerios/default.nix +++ b/pkgs/development/coq-modules/Cheerios/default.nix @@ -1,32 +1,13 @@ -{ stdenv, fetchFromGitHub, coq, StructTact }: +{ lib, mkCoqDerivation, coq, StructTact, version ? null }: -let param = - { - version = "20200201"; - rev = "9c7f66e57b91f706d70afa8ed99d64ed98ab367d"; - sha256 = "1h55s6lk47bk0lv5ralh81z55h799jbl9mhizmqwqzy57y8wqgs1"; - }; -in - -stdenv.mkDerivation { - name = "coq${coq.coq-version}-Cheerios-${param.version}"; - - src = fetchFromGitHub { - owner = "uwplse"; - repo = "cheerios"; - inherit (param) rev sha256; - }; - - buildInputs = [ coq ]; +with lib; mkCoqDerivation { + pname = "cheerios"; + owner = "uwplse"; + inherit version; + defaultVersion = if versions.isGe "8.6" coq.coq-version then "20200201" else null; + release."20200201".rev = "9c7f66e57b91f706d70afa8ed99d64ed98ab367d"; + release."20200201".sha256 = "1h55s6lk47bk0lv5ralh81z55h799jbl9mhizmqwqzy57y8wqgs1"; propagatedBuildInputs = [ StructTact ]; - enableParallelBuilding = true; - preConfigure = "patchShebangs ./configure"; - - installFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ]; - - passthru = { - compatibleCoqVersions = v: builtins.elem v [ "8.6" "8.7" "8.8" "8.9" "8.10" "8.11" "8.12" ]; - }; } diff --git a/pkgs/development/coq-modules/CoLoR/default.nix b/pkgs/development/coq-modules/CoLoR/default.nix index 1d3e5a07b03d..4c5b6a4f6a9a 100644 --- a/pkgs/development/coq-modules/CoLoR/default.nix +++ b/pkgs/development/coq-modules/CoLoR/default.nix @@ -1,58 +1,28 @@ -{ stdenv, fetchFromGitHub, coq, bignums }: +{ lib, mkCoqDerivation, coq, bignums, version ? null }: -let - coqVersions = { - "8.6" = "1.4.0"; - "8.7" = "1.4.0"; - "8.8" = "1.6.0"; - "8.9" = "1.6.0"; - "8.10" = "1.7.0"; - "8.11" = "1.7.0"; - }; - params = { - "1.4.0" = { - version = "1.4.0"; - rev = "168c6b86c7d3f87ee51791f795a8828b1521589a"; - sha256 = "1d2whsgs3kcg5wgampd6yaqagcpmzhgb6a0hp6qn4lbimck5dfmm"; - }; - "1.6.0" = { - version = "1.6.0"; - rev = "328aa06270584b578edc0d2925e773cced4f14c8"; - sha256 = "07sy9kw1qlynsqy251adgi8b3hghrc9xxl2rid6c82mxfsp329sd"; - }; - "1.7.0" = { - version = "1.7.0"; - rev = "08b5481ed6ea1a5d2c4c068b62156f5be6d82b40"; - sha256 = "1w7fmcpf0691gcwq00lm788k4ijlwz3667zj40j5jjc8j8hj7cq3"; - }; - }; - param = params.${coqVersions.${coq.coq-version}}; -in +with lib; mkCoqDerivation { + pname = "color"; + owner = "fblanqui"; + inherit version; + defaultVersion = with versions; switch coq.coq-version [ + {case = range "8.10" "8.11"; out = "1.7.0"; } + {case = range "8.8" "8.9"; out = "1.6.0"; } + {case = range "8.6" "8.7"; out = "1.4.0"; } + ] null; -stdenv.mkDerivation { - name = "coq${coq.coq-version}-CoLoR-${param.version}"; + release."1.7.0".rev = "08b5481ed6ea1a5d2c4c068b62156f5be6d82b40"; + release."1.7.0".sha256 = "1w7fmcpf0691gcwq00lm788k4ijlwz3667zj40j5jjc8j8hj7cq3"; + release."1.6.0".rev = "328aa06270584b578edc0d2925e773cced4f14c8"; + release."1.6.0".sha256 = "07sy9kw1qlynsqy251adgi8b3hghrc9xxl2rid6c82mxfsp329sd"; + release."1.4.0".rev = "168c6b86c7d3f87ee51791f795a8828b1521589a"; + release."1.4.0".sha256 = "1d2whsgs3kcg5wgampd6yaqagcpmzhgb6a0hp6qn4lbimck5dfmm"; - src = fetchFromGitHub { - owner = "fblanqui"; - repo = "color"; - inherit (param) rev sha256; - }; - - buildInputs = [ coq bignums ]; + extraBuildInputs = [ bignums ]; enableParallelBuilding = false; - installPhase = '' - make -f Makefile.coq COQLIB=$out/lib/coq/${coq.coq-version}/ install - ''; - - meta = with stdenv.lib; { + meta = { homepage = "http://color.inria.fr/"; description = "CoLoR is a library of formal mathematical definitions and proofs of theorems on rewriting theory and termination whose correctness has been mechanically checked by the Coq proof assistant."; maintainers = with maintainers; [ jpas jwiegley ]; - platforms = coq.meta.platforms; - }; - - passthru = { - compatibleCoqVersions = v: builtins.hasAttr v coqVersions; }; } diff --git a/pkgs/development/coq-modules/HoTT/default.nix b/pkgs/development/coq-modules/HoTT/default.nix index 7b52838505e2..706943cf8d02 100644 --- a/pkgs/development/coq-modules/HoTT/default.nix +++ b/pkgs/development/coq-modules/HoTT/default.nix @@ -1,18 +1,14 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, coq }: +{ lib, mkCoqDerivation, autoconf, automake, coq, version ? null }: -stdenv.mkDerivation rec { - name = "coq${coq.coq-version}-HoTT-${version}"; - version = "20170921"; +with lib; mkCoqDerivation { + pname = "HoTT"; + owner = "HoTT"; + inherit version; + defaultVersion = if coq.coq-version == "8.6" then "20170921" else null; + release."20170921".rev = "e3557740a699167e6adb1a65855509d55a392fa1"; + release."20170921".sha256 = "0zwfp8g62b50vmmbb2kmskj3v6w7qx1pbf43yw0hr7asdz2zbx5v"; - src = fetchFromGitHub { - owner = "HoTT"; - repo = "HoTT"; - rev = "e3557740a699167e6adb1a65855509d55a392fa1"; - sha256 = "0zwfp8g62b50vmmbb2kmskj3v6w7qx1pbf43yw0hr7asdz2zbx5v"; - }; - - buildInputs = [ autoconf automake coq ]; - enableParallelBuilding = true; + extraBuildInputs = [ autoconf automake ]; preConfigure = '' patchShebangs ./autogen.sh @@ -44,18 +40,9 @@ stdenv.mkDerivation rec { rmdir $out/share ''; - installFlags = [ - "COQBIN=${coq}/bin" - ]; - - meta = with stdenv.lib; { + meta = { homepage = "http://homotopytypetheory.org/"; description = "Homotopy type theory"; maintainers = with maintainers; [ siddharthist ]; - platforms = coq.meta.platforms; - }; - - passthru = { - compatibleCoqVersions = v: v == "8.6"; }; } diff --git a/pkgs/development/coq-modules/InfSeqExt/default.nix b/pkgs/development/coq-modules/InfSeqExt/default.nix index 387e41859039..8236705b58f2 100644 --- a/pkgs/development/coq-modules/InfSeqExt/default.nix +++ b/pkgs/development/coq-modules/InfSeqExt/default.nix @@ -1,31 +1,11 @@ -{ stdenv, fetchFromGitHub, coq }: - -let param = - { - version = "20200131"; - rev = "203d4c20211d6b17741f1fdca46dbc091f5e961a"; - sha256 = "0xylkdmb2dqnnqinf3pigz4mf4zmczcbpjnn59g5g76m7f2cqxl0"; - }; -in - -stdenv.mkDerivation { - name = "coq${coq.coq-version}-InfSeqExt-${param.version}"; - - src = fetchFromGitHub { - owner = "DistributedComponents"; - repo = "InfSeqExt"; - inherit (param) rev sha256; - }; - - buildInputs = [ coq ]; - - enableParallelBuilding = true; +{ lib, mkCoqDerivation, coq, version ? null }: +mkCoqDerivation { + pname = "InfSeqExt"; + owner = "DistributedComponents"; + inherit version; + defaultVersion = if lib.versions.isGe "8.5" coq.coq-version then "20200131" else null; + release."20200131".rev = "203d4c20211d6b17741f1fdca46dbc091f5e961a"; + release."20200131".sha256 = "0xylkdmb2dqnnqinf3pigz4mf4zmczcbpjnn59g5g76m7f2cqxl0"; preConfigure = "patchShebangs ./configure"; - - installFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ]; - - passthru = { - compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" "8.8" "8.9" "8.10" "8.11" "8.12" ]; - }; } diff --git a/pkgs/development/coq-modules/QuickChick/default.nix b/pkgs/development/coq-modules/QuickChick/default.nix index a167b7988dcd..32ef1ad633cf 100644 --- a/pkgs/development/coq-modules/QuickChick/default.nix +++ b/pkgs/development/coq-modules/QuickChick/default.nix @@ -1,96 +1,46 @@ -{ stdenv, fetchFromGitHub, coq, ssreflect, coq-ext-lib, simple-io }: +{ lib, mkCoqDerivation, coq, ssreflect, coq-ext-lib, simple-io }: +with lib; +let recent = versions.isGe "8.7" coq.coq-version; in +mkCoqDerivation { + pname = "QuickChick"; + owner = "QuickChick"; + defaultVersion = with versions; switch [ coq.coq-version ssreflect.version ] [ + { cases = [ "8.12" pred.true ]; out = "1.4.0"; } + { cases = [ "8.11" pred.true ]; out = "1.3.2"; } + { cases = [ "8.10" pred.true ]; out = "1.2.1"; } + { cases = [ "8.9" pred.true ]; out = "1.1.0"; } + { cases = [ "8.8" pred.true ]; out = "20190311"; } + { cases = [ "8.7" isLe "1.8" ]; out = "1.0.0"; } + { cases = [ "8.6" pred.true ]; out = "20171102"; } + { cases = [ "8.5" pred.true ]; out = "20170512"; } + ] null; + release."1.4.0".sha256 = "068p48pm5yxjc3yv8qwzp25bp9kddvxj81l31mjkyx3sdrsw3kyc"; + release."1.3.2".sha256 = "0lciwaqv288dh2f13xk2x0lrn6zyrkqy6g4yy927wwzag2gklfrs"; + release."1.2.1".sha256 = "17vz88xjzxh3q7hs6hnndw61r3hdfawxp5awqpgfaxx4w6ni8z46"; + release."1.1.0".sha256 = "1c34v1k37rk7v0xk2czv5n79mbjxjrm6nh3llg2mpfmdsqi68wf3"; + release."1.0.0".sha256 = "1gqy9a4yavd0sa7kgysf9gf2lq4p8dmn4h89y8081f2j8zli0w5y"; + release."20190311".rev = "22af9e9a223d0038f05638654422e637e863b355"; + release."20190311".sha256 = "00rnr19lg6lg0haq1sy4ld38p7imzand6fc52fvfq27gblxkp2aq"; + release."20171102".rev = "0fdb769e1dc87a278383b44a9f5102cc7ccbafcf"; + release."20171102".sha256 = "0fri4nih40vfb0fbr82dsi631ydkw48xszinq43lyinpknf54y17"; + release."20170512".rev = "31eb050ae5ce57ab402db9726fb7cd945a0b4d03"; + release."20170512".sha256 = "033ch10i5wmqyw8j6wnr0dlbnibgfpr1vr0c07q3yj6h23xkmqpg"; + releaseRev = v: "v${v}"; -let params = - { - "8.5" = { - version = "20170512"; - rev = "31eb050ae5ce57ab402db9726fb7cd945a0b4d03"; - sha256 = "033ch10i5wmqyw8j6wnr0dlbnibgfpr1vr0c07q3yj6h23xkmqpg"; - }; - - "8.6" = { - version = "20171102"; - rev = "0fdb769e1dc87a278383b44a9f5102cc7ccbafcf"; - sha256 = "0fri4nih40vfb0fbr82dsi631ydkw48xszinq43lyinpknf54y17"; - }; - - "8.8" = { - version = "20190311"; - rev = "22af9e9a223d0038f05638654422e637e863b355"; - sha256 = "00rnr19lg6lg0haq1sy4ld38p7imzand6fc52fvfq27gblxkp2aq"; - }; - - "8.9" = rec { - version = "1.1.0"; - rev = "v${version}"; - sha256 = "1c34v1k37rk7v0xk2czv5n79mbjxjrm6nh3llg2mpfmdsqi68wf3"; - }; - - "8.10" = rec { - version = "1.2.1"; - rev = "v${version}"; - sha256 = "17vz88xjzxh3q7hs6hnndw61r3hdfawxp5awqpgfaxx4w6ni8z46"; - }; - - "8.11" = rec { - version = "1.3.2"; - rev = "v${version}"; - sha256 = "0lciwaqv288dh2f13xk2x0lrn6zyrkqy6g4yy927wwzag2gklfrs"; - }; - - "8.12" = rec { - version = "1.4.0"; - rev = "v${version}"; - sha256 = "068p48pm5yxjc3yv8qwzp25bp9kddvxj81l31mjkyx3sdrsw3kyc"; - }; - }; - param = params.${coq.coq-version}; -in - -let inherit (stdenv.lib) maintainers optional optionals versionAtLeast; in - -let recent = versionAtLeast coq.coq-version "8.8"; in - -stdenv.mkDerivation { - - name = "coq${coq.coq-version}-QuickChick-${param.version}"; - - src = fetchFromGitHub { - owner = "QuickChick"; - repo = "QuickChick"; - inherit (param) rev sha256; - }; - - preConfigure = stdenv.lib.optionalString recent + preConfigure = optionalString recent "substituteInPlace Makefile --replace quickChickTool.byte quickChickTool.native"; - buildInputs = [ coq ] - ++ (with coq.ocamlPackages; [ ocaml findlib ]) - ++ optionals (recent && !versionAtLeast coq.coq-version "8.10") - (with coq.ocamlPackages; [ camlp5 ocamlbuild ]) - ++ optional recent coq.ocamlPackages.num - ; + mlPlugin = true; + extraBuildInputs = optional recent coq.ocamlPackages.num; propagatedBuildInputs = [ ssreflect ] - ++ optionals recent [ coq-ext-lib simple-io ] - ++ optional (versionAtLeast coq.coq-version "8.10") - coq.ocamlPackages.ocamlbuild - ; + ++ optionals recent [ coq-ext-lib simple-io ] + ++ optional recent coq.ocamlPackages.ocamlbuild; + extraInstallFlags = [ "-f Makefile.coq" ]; enableParallelBuilding = false; - installPhase = '' - make -f Makefile.coq COQLIB=$out/lib/coq/${coq.coq-version}/ install - ''; - meta = { - homepage = "https://github.com/QuickChick/QuickChick"; description = "Randomized property-based testing plugin for Coq; a clone of Haskell QuickCheck"; maintainers = with maintainers; [ jwiegley ]; - platforms = coq.meta.platforms; }; - - passthru = { - compatibleCoqVersions = v: builtins.hasAttr v params; - }; - } diff --git a/pkgs/development/coq-modules/StructTact/default.nix b/pkgs/development/coq-modules/StructTact/default.nix index 798aaabe6773..9770b9fb9c45 100644 --- a/pkgs/development/coq-modules/StructTact/default.nix +++ b/pkgs/development/coq-modules/StructTact/default.nix @@ -1,31 +1,11 @@ -{ stdenv, fetchFromGitHub, coq }: - -let param = - { - version = "20181102"; - rev = "82a85b7ec07e71fa6b30cfc05f6a7bfb09ef2510"; - sha256 = "08zry20flgj7qq37xk32kzmg4fg6d4wi9m7pf9aph8fd3j2a0b5v"; - }; -in - -stdenv.mkDerivation { - name = "coq${coq.coq-version}-StructTact-${param.version}"; - - src = fetchFromGitHub { - owner = "uwplse"; - repo = "StructTact"; - inherit (param) rev sha256; - }; - - buildInputs = [ coq ]; - - enableParallelBuilding = true; +{ lib, mkCoqDerivation, coq, version ? null }: +with lib; mkCoqDerivation { + pname = "StructTact"; + owner = "uwplse"; + inherit version; + defaultVersion = if versions.isGe "8.5" coq.coq-version then "20181102" else null; + release."20181102".rev = "82a85b7ec07e71fa6b30cfc05f6a7bfb09ef2510"; + release."20181102".sha256 = "08zry20flgj7qq37xk32kzmg4fg6d4wi9m7pf9aph8fd3j2a0b5v"; preConfigure = "patchShebangs ./configure"; - - installFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ]; - - passthru = { - compatibleCoqVersions = v: stdenv.lib.versionAtLeast v "8.5"; - }; } diff --git a/pkgs/development/coq-modules/VST/default.nix b/pkgs/development/coq-modules/VST/default.nix index a625aa54c148..af560ec49a0b 100644 --- a/pkgs/development/coq-modules/VST/default.nix +++ b/pkgs/development/coq-modules/VST/default.nix @@ -1,17 +1,15 @@ -{ stdenv, fetchFromGitHub, coq, compcert }: +{ lib, mkCoqDerivation, coq, compcert, version ? null }: -stdenv.mkDerivation rec { +with lib; mkCoqDerivation { pname = "coq${coq.coq-version}-VST"; - version = "2.6"; - - src = fetchFromGitHub { - owner = "PrincetonUniversity"; - repo = "VST"; - rev = "v${version}"; - sha256 = "00bf9hl4pvmsqa08lzjs1mrxyfgfxq4k6778pnldmc8ichm90jgk"; - }; - - buildInputs = [ coq ]; + namePrefix = []; + displayVersion = { coq = false; }; + owner = "PrincetonUniversity"; + repo = "VST"; + inherit version; + defaultVersion = if coq.coq-version == "8.11" then "2.6" else null; + release."2.6".sha256 = "00bf9hl4pvmsqa08lzjs1mrxyfgfxq4k6778pnldmc8ichm90jgk"; + releaseRev = v: "v${v}"; propagatedBuildInputs = [ compcert ]; preConfigure = "patchShebangs util"; @@ -30,14 +28,9 @@ stdenv.mkDerivation rec { done ''; - enableParallelBuilding = true; - - passthru.compatibleCoqVersions = stdenv.lib.flip builtins.elem [ "8.11" ]; - meta = { description = "Verified Software Toolchain"; homepage = "https://vst.cs.princeton.edu/"; inherit (compcert.meta) platforms; }; - } diff --git a/pkgs/development/coq-modules/Velisarios/default.nix b/pkgs/development/coq-modules/Velisarios/default.nix index 92c9b2569ca4..08322fb7fc40 100644 --- a/pkgs/development/coq-modules/Velisarios/default.nix +++ b/pkgs/development/coq-modules/Velisarios/default.nix @@ -1,41 +1,14 @@ -{ stdenv, fetchFromGitHub, coq }: +{ lib, mkCoqDerivation, coq, version ? null }: -let params = - { - "8.6" = { - version = "20180221"; - rev = "e1eee1f10d5d46331a560bd8565ac101229d0d6b"; - sha256 = "0l9885nxy0n955fj1gnijlxl55lyxiv9yjfmz8hmfrn9hl8vv1m2"; - }; +with lib; mkCoqDerivation { + pname = "Velisarios"; + owner = "vrahli"; + inherit version; + defaultVersion = if versions.range "8.6" "8.8" coq.coq-version then "20180221" else null; - "8.7" = { - version = "20180221"; - rev = "e1eee1f10d5d46331a560bd8565ac101229d0d6b"; - sha256 = "0l9885nxy0n955fj1gnijlxl55lyxiv9yjfmz8hmfrn9hl8vv1m2"; - }; - - "8.8" = { - version = "20180221"; - rev = "e1eee1f10d5d46331a560bd8565ac101229d0d6b"; - sha256 = "0l9885nxy0n955fj1gnijlxl55lyxiv9yjfmz8hmfrn9hl8vv1m2"; - }; - }; - param = params.${coq.coq-version}; -in - -stdenv.mkDerivation { - name = "coq${coq.coq-version}-Velisarios-${param.version}"; - - src = fetchFromGitHub { - owner = "vrahli"; - repo = "Velisarios"; - inherit (param) rev sha256; - }; - - buildInputs = [ - coq coq.ocaml coq.camlp5 coq.findlib - ]; - enableParallelBuilding = true; + release."20180221".rev = "e1eee1f10d5d46331a560bd8565ac101229d0d6b"; + release."20180221".sha256 = "0l9885nxy0n955fj1gnijlxl55lyxiv9yjfmz8hmfrn9hl8vv1m2"; + mlPlugin = true; buildPhase = "make -j$NIX_BUILD_CORES"; preBuild = "./create-makefile.sh"; @@ -43,8 +16,4 @@ stdenv.mkDerivation { mkdir -p $out/lib/coq/${coq.coq-version}/Velisarios cp -pR model/*.vo $out/lib/coq/${coq.coq-version}/Velisarios ''; - - passthru = { - compatibleCoqVersions = v: builtins.elem v [ "8.6" "8.7" "8.8" ]; - }; } diff --git a/pkgs/development/coq-modules/Verdi/default.nix b/pkgs/development/coq-modules/Verdi/default.nix index 927cd832452b..d3769eb2c4db 100644 --- a/pkgs/development/coq-modules/Verdi/default.nix +++ b/pkgs/development/coq-modules/Verdi/default.nix @@ -1,37 +1,19 @@ -{ stdenv, fetchFromGitHub, coq, Cheerios, InfSeqExt, ssreflect }: +{ lib, mkCoqDerivation, coq, Cheerios, InfSeqExt, ssreflect, version ? null }: -let param = - if stdenv.lib.versionAtLeast coq.coq-version "8.7" then - { - version = "20200131"; - rev = "fdb4ede19d2150c254f0ebcfbed4fb9547a734b0"; - sha256 = "1a2k19f9q5k5djbxplqmmpwck49kw3lrm3aax920h4yb40czkd8m"; - } else { - version = "20181102"; - rev = "25b79cf1be5527ab8dc1b8314fcee93e76a2e564"; - sha256 = "1vw47c37k5vaa8vbr6ryqy8riagngwcrfmb3rai37yi9xhdqg55z"; - }; -in -stdenv.mkDerivation { - name = "coq${coq.coq-version}-verdi-${param.version}"; +with lib; mkCoqDerivation { + pname = "verdi"; + owner = "uwplse"; + inherit version; + defaultVersion = with versions; switch coq.coq-version [ + { case = isGe "8.7"; out = "20200131"; } + { case = isEq "8.6"; out = "20181102"; } + ] null; + release."20200131".rev = "fdb4ede19d2150c254f0ebcfbed4fb9547a734b0"; + release."20200131".sha256 = "1a2k19f9q5k5djbxplqmmpwck49kw3lrm3aax920h4yb40czkd8m"; + release."20181102".rev = "25b79cf1be5527ab8dc1b8314fcee93e76a2e564"; + release."20181102".sha256 = "1vw47c37k5vaa8vbr6ryqy8riagngwcrfmb3rai37yi9xhdqg55z"; - src = fetchFromGitHub { - owner = "uwplse"; - repo = "verdi"; - inherit (param) rev sha256; - }; - - buildInputs = [ coq ]; propagatedBuildInputs = [ Cheerios InfSeqExt ssreflect ]; - - enableParallelBuilding = true; - preConfigure = "patchShebangs ./configure"; - - installFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ]; - - passthru = { - compatibleCoqVersions = v: builtins.elem v [ "8.6" "8.7" "8.8" "8.9" "8.10" "8.11" "8.12" ]; - }; } diff --git a/pkgs/development/coq-modules/autosubst/default.nix b/pkgs/development/coq-modules/autosubst/default.nix index 9507dc6751ae..b2609d5dfc32 100644 --- a/pkgs/development/coq-modules/autosubst/default.nix +++ b/pkgs/development/coq-modules/autosubst/default.nix @@ -1,33 +1,22 @@ -{ stdenv, fetchgit, coq, mathcomp }: +{ lib, mkCoqDerivation, coq, mathcomp, version ? null }: -stdenv.mkDerivation rec { +with lib; mkCoqDerivation { + pname = "autosubst"; + owner = "uds-psl"; + inherit version; + defaultVersion = with versions; + if range "8.5" "8.7" coq.coq-version then "5b40a32e" else null; - name = "coq-autosubst-${coq.coq-version}-${version}"; - version = "5b40a32e"; + release."5b40a32e".rev = "1c3bb3bbf5477e3b33533a0fc090399f45fe3034"; + release."5b40a32e".sha256 = "1wqfzc9az85fvx71xxfii502jgc3mp0r3xwfb8vnb03vkk625ln0"; - src = fetchgit { - url = "git://github.com/uds-psl/autosubst.git"; - rev = "1c3bb3bbf5477e3b33533a0fc090399f45fe3034"; - sha256 = "06pcjbngzwqyncvfwzz88j33wvdj9kizxyg5adp7y6186h8an341"; - }; - - buildInputs = [ coq ]; - propagatedBuildInputs = [ mathcomp ]; + propagatedBuildInputs = [ mathcomp.ssreflect ]; patches = [./0001-changes-to-work-with-Coq-8.6.patch]; - installFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ]; - - meta = with stdenv.lib; { + meta = { homepage = "https://www.ps.uni-saarland.de/autosubst/"; description = "Automation for de Bruijn syntax and substitution in Coq"; maintainers = with maintainers; [ jwiegley ]; - platforms = coq.meta.platforms; }; - - passthru = { - compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" ]; - }; - - } diff --git a/pkgs/development/coq-modules/bignums/default.nix b/pkgs/development/coq-modules/bignums/default.nix index f0434c4ae471..84dc92a3cd5f 100644 --- a/pkgs/development/coq-modules/bignums/default.nix +++ b/pkgs/development/coq-modules/bignums/default.nix @@ -1,64 +1,25 @@ -{ stdenv, fetchFromGitHub, coq }: +{ lib, mkCoqDerivation, coq, version ? null }: -let params = { - "8.6" = { - rev = "v8.6.0"; - sha256 = "0553pcsy21cyhmns6k9qggzb67az8kl31d0lwlnz08bsqswigzrj"; - }; - "8.7" = { - rev = "V8.7.0"; - sha256 = "11c4sdmpd3l6jjl4v6k213z9fhrmmm1xnly3zmzam1wrrdif4ghl"; - }; - "8.8" = { - rev = "V8.8.0"; - sha256 = "1ymxyrvjygscxkfj3qkq66skl3vdjhb670rzvsvgmwrjkrakjnfg"; - }; - "8.9" = { - rev = "V8.9.0"; - sha256 = "03qz1w2xb2j5p06liz5yyafl0fl9vprcqm6j0iwi7rxwghl00p01"; - }; - "8.10" = { - rev = "V8.10.0"; - sha256 = "0bpb4flckn4nqxbs3wjiznyx1k7r8k93qdigp3qwmikp2lxvcbw5"; - }; - "8.11" = { - rev = "V8.11.0"; - sha256 = "1xcd7c7qlvs0narfba6px34zq0mz8rffnhxw0kzhhg6i4iw115dp"; - }; - "8.12" = { - rev = "V8.12.0"; - sha256 = "14ijb3qy2hin3g4djx437jmnswxxq7lkfh3dwh9qvrds9a015yg8"; - }; - "8.13" = { - rev = "V8.13.0"; - sha256 = "1n66i7hd9222b2ks606mak7m4f0dgy02xgygjskmmav6h7g2sx7y"; - }; - }; - param = params.${coq.coq-version}; -in +with lib; mkCoqDerivation { + pname = "bignums"; + owner = "coq"; + displayVersion = { bignums = ""; }; + inherit version; + defaultVersion = if versions.isGe "8.5" coq.coq-version + then "${coq.coq-version}.0" else null; -stdenv.mkDerivation { + release."8.13.0".sha256 = "1n66i7hd9222b2ks606mak7m4f0dgy02xgygjskmmav6h7g2sx7y"; + release."8.12.0".sha256 = "14ijb3qy2hin3g4djx437jmnswxxq7lkfh3dwh9qvrds9a015yg8"; + release."8.11.0".sha256 = "1xcd7c7qlvs0narfba6px34zq0mz8rffnhxw0kzhhg6i4iw115dp"; + release."8.10.0".sha256 = "0bpb4flckn4nqxbs3wjiznyx1k7r8k93qdigp3qwmikp2lxvcbw5"; + release."8.9.0".sha256 = "03qz1w2xb2j5p06liz5yyafl0fl9vprcqm6j0iwi7rxwghl00p01"; + release."8.8.0".sha256 = "1ymxyrvjygscxkfj3qkq66skl3vdjhb670rzvsvgmwrjkrakjnfg"; + release."8.7.0".sha256 = "11c4sdmpd3l6jjl4v6k213z9fhrmmm1xnly3zmzam1wrrdif4ghl"; + release."8.6.0".rev = "v8.6.0"; + release."8.6.0".sha256 = "0553pcsy21cyhmns6k9qggzb67az8kl31d0lwlnz08bsqswigzrj"; + releaseRev = v: "V${v}"; - name = "coq${coq.coq-version}-bignums"; + mlPlugin = true; - src = fetchFromGitHub { - owner = "coq"; - repo = "bignums"; - inherit (param) rev sha256; - }; - - buildInputs = with coq.ocamlPackages; [ ocaml findlib coq ] - ++ stdenv.lib.optional (!stdenv.lib.versionAtLeast coq.coq-version "8.10") camlp5 - ; - - installFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ]; - - meta = with stdenv.lib; { - license = licenses.lgpl2; - platforms = coq.meta.platforms; - }; - - passthru = { - compatibleCoqVersions = v: builtins.hasAttr v params; - }; + meta = { license = licenses.lgpl2; }; } diff --git a/pkgs/development/coq-modules/category-theory/default.nix b/pkgs/development/coq-modules/category-theory/default.nix index 1178b1558ff7..339bcb9d6b09 100644 --- a/pkgs/development/coq-modules/category-theory/default.nix +++ b/pkgs/development/coq-modules/category-theory/default.nix @@ -1,54 +1,26 @@ -{ stdenv, fetchgit, coq, ssreflect, equations }: +{ lib, mkCoqDerivation, coq, ssreflect, equations, version ? null }: -let - params = - let - v20180709 = { - version = "20180709"; - rev = "3b9ba7b26a64d49a55e8b6ccea570a7f32c11ead"; - sha256 = "0f2nr8dgn1ab7hr7jrdmr1zla9g9h8216q4yf4wnff9qkln8sbbs"; - }; - v20190414 = { - version = "20190414"; - rev = "706fdb4065cc2302d92ac2bce62cb59713253119"; - sha256 = "16lg4xs2wzbdbsn148xiacgl4wq4xwfqjnjkdhfr3w0qh1s81hay"; - }; - in { - "8.6" = v20180709; - "8.7" = v20180709; - "8.8" = v20190414; - "8.9" = v20190414; - }; - param = params.${coq.coq-version}; -in +with lib; mkCoqDerivation { -stdenv.mkDerivation { + pname = "category-theory"; + owner = "jwiegley"; - name = "coq${coq.coq-version}-category-theory-${param.version}"; + release."20190414".rev = "706fdb4065cc2302d92ac2bce62cb59713253119"; + release."20190414".sha256 = "16lg4xs2wzbdbsn148xiacgl4wq4xwfqjnjkdhfr3w0qh1s81hay"; + release."20180709".rev = "3b9ba7b26a64d49a55e8b6ccea570a7f32c11ead"; + release."20180709".sha256 = "0f2nr8dgn1ab7hr7jrdmr1zla9g9h8216q4yf4wnff9qkln8sbbs"; - src = fetchgit { - url = "git://github.com/jwiegley/category-theory.git"; - inherit (param) rev sha256; - }; + inherit version; + defaultVersion = with versions; switch coq.coq-version [ + { case = range "8.8" "8.9"; out = "20190414"; } + { case = range "8.6" "8.7"; out = "20180709"; } + ] null; - buildInputs = [ coq ] ++ (with coq.ocamlPackages; [ ocaml camlp5 findlib ]); + mlPlugin = true; propagatedBuildInputs = [ ssreflect equations ]; - buildFlags = [ "JOBS=$(NIX_BUILD_CORES)" ]; - - installPhase = '' - make -f Makefile.coq COQLIB=$out/lib/coq/${coq.coq-version}/ install - ''; - - meta = with stdenv.lib; { - homepage = "https://github.com/jwiegley/category-theory"; + meta = { description = "A formalization of category theory in Coq for personal study and practical work"; maintainers = with maintainers; [ jwiegley ]; - platforms = coq.meta.platforms; }; - - passthru = { - compatibleCoqVersions = v: builtins.hasAttr v params; - }; - } diff --git a/pkgs/development/coq-modules/contribs/default.nix b/pkgs/development/coq-modules/contribs/default.nix index d2787f0948e0..cb6dedca3551 100644 --- a/pkgs/development/coq-modules/contribs/default.nix +++ b/pkgs/development/coq-modules/contribs/default.nix @@ -1,27 +1,16 @@ -{ stdenv, fetchFromGitHub, coq }: +{ lib, mkCoqDerivation, coq, callPackage }: -let mkContrib = repo: revs: param: - stdenv.mkDerivation rec { - name = "coq${coq.coq-version}-${repo}-${version}"; - version = param.version; - - src = fetchFromGitHub { +with lib; let mkContrib = pname: coqs: param: + let contribVersion = {version ? null}: mkCoqDerivation ({ + inherit pname version; owner = "coq-contribs"; - repo = repo; - rev = param.rev; - sha256 = param.sha256; - }; - - buildInputs = with coq.ocamlPackages; [ ocaml camlp5 findlib coq ]; - - installFlags = - stdenv.lib.optional (stdenv.lib.versionAtLeast coq.coq-version "8.9") "-f Makefile.coq" - ++ [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ]; - - passthru = { - compatibleCoqVersions = v: builtins.elem v revs; - }; - }; in + mlPlugin = true; + } // optionalAttrs (builtins.elem coq.coq-version coqs) ({ + defaultVersion = param.version; + release = { "${param.version}" = { inherit (param) rev sha256; }; }; + } // (removeAttrs param [ "version" "rev" "sha256" ])) + ); in + makeOverridable contribVersion {} ; in { aac-tactics = mkContrib "aac-tactics" [ "8.7" "8.8" ] { "8.7" = { @@ -353,10 +342,10 @@ let mkContrib = repo: revs: param: sha256 = "02jcp74i5icv92xkq3mcx91786d56622ghgnjiz3b51wfqs6ldic"; }; - firing-squad = mkContrib "firing-squad" [ "8.6" "8.7" ] { - version = "v8.5.0-9-gbe728cd"; - rev = "be728cddbee58088809b51c25425d2a4bdf9b823"; - sha256 = "0i0v5x6lncjasxk22pras3644ff026q8jai45dbimf2fz73312c9"; + firing-squad = mkContrib "firing-squad" [ "8.6" ] { + version = "v8.5.0-9-gbe728cd"; + rev = "be728cddbee58088809b51c25425d2a4bdf9b823"; + sha256 = "0i0v5x6lncjasxk22pras3644ff026q8jai45dbimf2fz73312c9"; }; float = mkContrib "float" [ "8.7" ] { @@ -525,6 +514,7 @@ let mkContrib = repo: revs: param: version = "v8.6.0"; rev = "6279ed83244dc4aec2e23ffb4c87e3f10a50326d"; sha256 = "1yvlnqwa7ka4a0yg0j7zrzvayhsm1shvsjjawjv552sxc9519aag"; + installFlags = [ "COQBIN=$(out)/lib/coq/${coq.coq-version}/bin/" ]; # hack }; ipc = mkContrib "ipc" [ "8.6" "8.7" ] { @@ -635,12 +625,6 @@ let mkContrib = repo: revs: param: sha256 = "19csz50846gvfwmhhc37nmlvf70g53cpb1kpmcnjlj82y8r63ajz"; }; - math-classes = mkContrib "math-classes" [ "8.6" ] { - version = "v8.6.0-19-ge2c6453"; - rev = "e2c6453e2f6cc1b7f0e1371675f4a76b19fab2c7"; - sha256 = "0das56i8wi7v0s30lbadjlfqas1jlq0mm13yxq6s7zqqbdl5r0bk"; - }; - maths = mkContrib "maths" [ "8.5" "8.6" "8.7" ] { version = "v8.6.0"; rev = "75a2f84990c1dc83a18ee7decc1445c122664222"; diff --git a/pkgs/development/coq-modules/coq-bits/default.nix b/pkgs/development/coq-modules/coq-bits/default.nix index 9665c5400d85..410280925dcc 100644 --- a/pkgs/development/coq-modules/coq-bits/default.nix +++ b/pkgs/development/coq-modules/coq-bits/default.nix @@ -1,38 +1,24 @@ -{ stdenv, fetchFromGitHub, coq, mathcomp-algebra }: +{ lib, mkCoqDerivation, coq, mathcomp, version ? null }: -let - version = "20190812"; -in +with lib; mkCoqDerivation { + pname = "coq-bits"; + repo = "bits"; + inherit version; + defaultVersion = if versions.isGe "8.7" coq.version then "20190812" else null; -stdenv.mkDerivation { - name = "coq${coq.coq-version}-coq-bits-${version}"; + release."20190812".rev = "1.0.0"; + release."20190812".sha256 = "0nv5mdgrd075dpd8bc7h0xc5i95v0pkm0bfyq5rj6ii1s54dwcjl"; - src = fetchFromGitHub { - owner = "coq-community"; - repo = "bits"; - rev = "1.0.0"; - sha256 = "0nv5mdgrd075dpd8bc7h0xc5i95v0pkm0bfyq5rj6ii1s54dwcjl"; - }; - - buildInputs = [ coq ]; - propagatedBuildInputs = [ mathcomp-algebra ]; - - enableParallelBuilding = true; + propagatedBuildInputs = [ mathcomp.algebra ]; installPhase = '' make -f Makefile CoqMakefile make -f CoqMakefile COQLIB=$out/lib/coq/${coq.coq-version}/ install ''; - meta = with stdenv.lib; { - homepage = "https://github.com/coq-community/bits"; + meta = { description = "A formalization of bitset operations in Coq"; license = licenses.asl20; maintainers = with maintainers; [ ptival ]; - platforms = coq.meta.platforms; - }; - - passthru = { - compatibleCoqVersions = v: builtins.elem v [ "8.7" "8.8" "8.9" "8.10" "8.11" "8.12" ]; }; } diff --git a/pkgs/development/coq-modules/coq-elpi/default.nix b/pkgs/development/coq-modules/coq-elpi/default.nix index 230320671a7f..18dbeaea201d 100644 --- a/pkgs/development/coq-modules/coq-elpi/default.nix +++ b/pkgs/development/coq-modules/coq-elpi/default.nix @@ -1,43 +1,33 @@ -{ stdenv, fetchFromGitHub, which, coq }: +{ lib, mkCoqDerivation, which, coq, version ? null }: -let params = { - "8.11" = rec { - version = "1.6.0_8.11"; - rev = "v${version}"; - sha256 = "0ahxjnzmd7kl3gl38kyjqzkfgllncr2ybnw8bvgrc6iddgga7bpq"; - }; - "8.12" = rec { - version = "1.6.0"; - rev = "v${version}"; - sha256 = "0kf99i43mlf750fr7fric764mm495a53mg5kahnbp6zcjcxxrm0b"; - }; -}; - param = params.${coq.coq-version}; -in - -stdenv.mkDerivation rec { - name = "coq${coq.coq-version}-elpi-${param.version}"; - - src = fetchFromGitHub { - owner = "LPCIC"; - repo = "coq-elpi"; - inherit (param) rev sha256; - }; +with builtins; with lib; let + elpi = coq.ocamlPackages.elpi.override ( + optionalAttrs (coq.coq-version == "8.11") { version = "1.11.4"; } + ); +in mkCoqDerivation { + pname = "elpi"; + repo = "coq-elpi"; + owner = "LPCIC"; + inherit version; + defaultVersion = lib.switch coq.coq-version [ + { case = "8.13"; out = "1.8.1"; } + { case = "8.12"; out = "1.8.0"; } + { case = "8.11"; out = "1.6.0_8.11"; } + ] null; + release."1.8.1".sha256 = "1fbbdccdmr8g4wwpihzp4r2xacynjznf817lhijw6kqfav75zd0r"; + release."1.8.0".sha256 = "13ywjg94zkbki22hx7s4gfm9rr87r4ghsgan23xyl3l9z8q0idd1"; + release."1.7.0".sha256 = "1ws5cqr0xawv69prgygbl3q6dgglbaw0vc397h9flh90kxaqgyh8"; + release."1.6.0_8.11".sha256 = "0ahxjnzmd7kl3gl38kyjqzkfgllncr2ybnw8bvgrc6iddgga7bpq"; + release."1.6.0".sha256 = "0kf99i43mlf750fr7fric764mm495a53mg5kahnbp6zcjcxxrm0b"; + releaseRev = v: "v${v}"; nativeBuildInputs = [ which ]; - buildInputs = [ coq coq.ocaml ] ++ (with coq.ocamlPackages; [ findlib elpi ]); - - installFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ]; + mlPlugin = true; + extraBuildInputs = [ elpi ]; meta = { description = "Coq plugin embedding ELPI."; - maintainers = [ stdenv.lib.maintainers.cohencyril ]; - license = stdenv.lib.licenses.lgpl21; - inherit (coq.meta) platforms; - inherit (src.meta) homepage; - }; - - passthru = { - compatibleCoqVersions = stdenv.lib.flip builtins.hasAttr params; + maintainers = [ maintainers.cohencyril ]; + license = licenses.lgpl21; }; } diff --git a/pkgs/development/coq-modules/coq-ext-lib/default.nix b/pkgs/development/coq-modules/coq-ext-lib/default.nix index e0ca52086206..8acb0643781d 100644 --- a/pkgs/development/coq-modules/coq-ext-lib/default.nix +++ b/pkgs/development/coq-modules/coq-ext-lib/default.nix @@ -1,63 +1,29 @@ -{ stdenv, fetchFromGitHub, coq, ...}@args: +{ lib, mkCoqDerivation, coq, version ? null }: -let - hashes = { - "0.9.4" = "1y66pamgsdxlq2w1338lj626ln70cwj7k53hxcp933g8fdsa4hp0"; - "0.9.5" = "1b4cvz3llxin130g13calw5n1zmvi6wdd5yb8a41q7yyn2hd3msg"; - "0.9.7" = "00v4bm4glv1hy08c8xsm467az6d1ashrznn8p2bmbmmp52lfg7ag"; - "0.10.0" = "1kxi5bmjwi5zqlqgkyzhhxwgcih7wf60cyw9398k2qjkmi186r4a"; - "0.10.1" = "0r1vspad8fb8bry3zliiz4hfj4w1iib1l2gm115a94m6zbiksd95"; - "0.10.2" = "1b150rc5bmz9l518r4m3vwcrcnnkkn9q5lrwygkh0a7mckgg2k9f"; - "0.10.3" = "0795gs2dlr663z826mp63c8h2zfadn541dr8q0fvnvi2z7kfyslb"; - "0.11.1" = "0dmf1p9j8lm0hwaq0af18jxdwg869xi2jm8447zng7krrq3kvkg5"; - "0.11.2" = "0iyka81g26x5n99xic7kqn8vxqjw8rz7vw9rs27iw04lf137vzv6"; - "0.11.3" = "1w99nzpk72lffxis97k235axss5lmzhy5z3lga2i0si95mbpil42"; - }; +with lib; mkCoqDerivation rec { + pname = "coq-ext-lib"; + owner = "coq-ext-lib"; + inherit version; + defaultVersion = with versions; switch coq.coq-version [ + { case = range "8.8" "8.12"; out = "0.11.3"; } + { case = "8.7"; out = "0.9.7"; } + { case = "8.6"; out = "0.9.5"; } + { case = "8.5"; out = "0.9.4"; } + ] null; + release."0.11.3".sha256 = "1w99nzpk72lffxis97k235axss5lmzhy5z3lga2i0si95mbpil42"; + release."0.11.2".sha256 = "0iyka81g26x5n99xic7kqn8vxqjw8rz7vw9rs27iw04lf137vzv6"; + release."0.10.3".sha256 = "0795gs2dlr663z826mp63c8h2zfadn541dr8q0fvnvi2z7kfyslb"; + release."0.11.1".sha256 = "0dmf1p9j8lm0hwaq0af18jxdwg869xi2jm8447zng7krrq3kvkg5"; + release."0.10.2".sha256 = "1b150rc5bmz9l518r4m3vwcrcnnkkn9q5lrwygkh0a7mckgg2k9f"; + release."0.10.1".sha256 = "0r1vspad8fb8bry3zliiz4hfj4w1iib1l2gm115a94m6zbiksd95"; + release."0.10.0".sha256 = "1kxi5bmjwi5zqlqgkyzhhxwgcih7wf60cyw9398k2qjkmi186r4a"; + release."0.9.7".sha256 = "00v4bm4glv1hy08c8xsm467az6d1ashrznn8p2bmbmmp52lfg7ag"; + release."0.9.5".sha256 = "1b4cvz3llxin130g13calw5n1zmvi6wdd5yb8a41q7yyn2hd3msg"; + release."0.9.4".sha256 = "1y66pamgsdxlq2w1338lj626ln70cwj7k53hxcp933g8fdsa4hp0"; + releaseRev = v: "v${v}"; - default-versions = { - "8.5" = "0.9.4"; - "8.6" = "0.9.5"; - "8.7" = "0.9.7"; - "8.8" = "0.11.3"; - "8.9" = "0.11.3"; - "8.10" = "0.11.3"; - "8.11" = "0.11.3"; - "8.12" = "0.11.3"; - }; - - param = rec { - version = args.version or default-versions.${coq.coq-version}; - sha256 = hashes.${version}; - }; - -in - -stdenv.mkDerivation rec { - - name = "coq${coq.coq-version}-coq-ext-lib-${version}"; - inherit (param) version; - - src = fetchFromGitHub { - owner = "coq-community"; - repo = "coq-ext-lib"; - rev = "v${version}"; - inherit (param) sha256; - }; - - buildInputs = [ coq ]; - - enableParallelBuilding = true; - - installFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ]; - - meta = with stdenv.lib; { - homepage = "https://github.com/coq-ext-lib/coq-ext-lib"; + meta = { description = "A collection of theories and plugins that may be useful in other Coq developments"; maintainers = with maintainers; [ jwiegley ptival ]; - platforms = coq.meta.platforms; - }; - - passthru = { - compatibleCoqVersions = v: builtins.hasAttr v default-versions; }; } diff --git a/pkgs/development/coq-modules/coq-haskell/default.nix b/pkgs/development/coq-modules/coq-haskell/default.nix index 7c86a7d55f34..7caf754ae50a 100644 --- a/pkgs/development/coq-modules/coq-haskell/default.nix +++ b/pkgs/development/coq-modules/coq-haskell/default.nix @@ -1,60 +1,21 @@ -{ stdenv, fetchgit, coq, ssreflect }: +{ lib, mkCoqDerivation, coq, ssreflect, version ? null }: -let params = - { - "8.5" = { - version = "20171215"; - rev = "e2cf8b270c2efa3b56fab1ef6acc376c2c3de968"; - sha256 = "09dq1vvshhlhgjccrhqgbhnq2hrys15xryfszqq11rzpgvl2zgdv"; - }; +with lib; mkCoqDerivation { - "8.6" = { - version = "20171215"; - rev = "e2cf8b270c2efa3b56fab1ef6acc376c2c3de968"; - sha256 = "09dq1vvshhlhgjccrhqgbhnq2hrys15xryfszqq11rzpgvl2zgdv"; - }; + pname = "coq-haskell"; + owner = "jwiegley"; + inherit version; + defaultVersion = if versions.range "8.5" "8.8" coq.coq-version then "20171215" else null; + release."20171215".rev = "e2cf8b270c2efa3b56fab1ef6acc376c2c3de968"; + release."20171215".sha256 = "09dq1vvshhlhgjccrhqgbhnq2hrys15xryfszqq11rzpgvl2zgdv"; - "8.7" = { - version = "20171215"; - rev = "e2cf8b270c2efa3b56fab1ef6acc376c2c3de968"; - sha256 = "09dq1vvshhlhgjccrhqgbhnq2hrys15xryfszqq11rzpgvl2zgdv"; - }; - - "8.8" = { - version = "20171215"; - rev = "e2cf8b270c2efa3b56fab1ef6acc376c2c3de968"; - sha256 = "09dq1vvshhlhgjccrhqgbhnq2hrys15xryfszqq11rzpgvl2zgdv"; - }; - }; - param = params.${coq.coq-version}; -in - -stdenv.mkDerivation { - - name = "coq${coq.coq-version}-coq-haskell-${param.version}"; - - src = fetchgit { - url = "git://github.com/jwiegley/coq-haskell.git"; - inherit (param) rev sha256; - }; - - buildInputs = with coq.ocamlPackages; [ ocaml camlp5 findlib ]; + mlPlugin = true; + extraInstallFlags = [ "-f Makefile.coq" ]; propagatedBuildInputs = [ coq ssreflect ]; - enableParallelBuilding = false; - installPhase = '' - make -f Makefile.coq COQLIB=$out/lib/coq/${coq.coq-version}/ install - ''; - - meta = with stdenv.lib; { - homepage = "https://github.com/jwiegley/coq-haskell"; + meta = { description = "A library for formalizing Haskell types and functions in Coq"; maintainers = with maintainers; [ jwiegley ]; - platforms = coq.meta.platforms; - }; - - passthru = { - compatibleCoqVersions = v: builtins.hasAttr v params; }; } diff --git a/pkgs/development/coq-modules/coqeal/default.nix b/pkgs/development/coq-modules/coqeal/default.nix new file mode 100644 index 000000000000..4c978a791db8 --- /dev/null +++ b/pkgs/development/coq-modules/coqeal/default.nix @@ -0,0 +1,24 @@ +{ coq, mkCoqDerivation, mathcomp, bignums, paramcoq, multinomials, + lib, which, version ? null }: + +with lib; mkCoqDerivation { + + pname = "CoqEAL"; + owner = "CoqEAL"; + inherit version; + defaultVersion = with versions; switch [ coq.version mathcomp.version ] [ + { cases = [ (isGe "8.7") "1.11.0" ]; out = "1.0.4"; } + { cases = [ (isGe "8.7") "1.10.0" ]; out = "1.0.3"; } + ] null; + + release."1.0.4".sha256 = "1g5m26lr2lwxh6ld2gykailhay4d0ayql4bfh0aiwqpmmczmxipk"; + release."1.0.3".sha256 = "0hc63ny7phzbihy8l7wxjvn3haxx8jfnhi91iw8hkq8n29i23v24"; + + extraBuildInputs = [ which ]; + propagatedBuildInputs = [ mathcomp.algebra bignums paramcoq multinomials ]; + + meta = { + description = "CoqEAL - The Coq Effective Algebra Library"; + license = licenses.mit; + }; +} diff --git a/pkgs/development/coq-modules/coqhammer/default.nix b/pkgs/development/coq-modules/coqhammer/default.nix index 56fce9ac526f..89aa8d74e85c 100644 --- a/pkgs/development/coq-modules/coqhammer/default.nix +++ b/pkgs/development/coq-modules/coqhammer/default.nix @@ -1,43 +1,28 @@ -{ stdenv, fetchFromGitHub, coq }: +{ lib, mkCoqDerivation, coq, version ? null }: -let - params = { - "8.8" = { - version = "1.1"; - sha256 = "0ms086wp4jmrzyglb8wymchzyflflk01nsfsk4r6qv8rrx81nx9h"; - buildInputs = [ coq.ocamlPackages.camlp5 ]; - }; - "8.9" = { - version = "1.1.1"; - sha256 = "1knjmz4hr8vlp103j8n4fyb2lfxysnm512gh3m2kp85n6as6fvb9"; - buildInputs = [ coq.ocamlPackages.camlp5 ]; - }; - "8.10" = { - version = "1.3"; - sha256 = "1fj8497ir4m79hyrmmmmrag01001wrby0h24wv6525vz0w5py3cd"; - }; - "8.11" = { - version = "1.3"; - sha256 = "08zf8qfna7b9p2myfaz4g7bas3a1q1156x78n5isqivlnqfrjc1b"; - }; - "8.12" = { - version = "1.3"; - sha256 = "1q1y3cwhd98pkm98g71fsdjz85bfwgcz2xn7s7wwmiraifv5l6z8"; - }; - }; - param = params.${coq.coq-version}; -in +with lib; mkCoqDerivation { + inherit version; + pname = "coqhammer"; + owner = "lukaszcz"; + defaultVersion = with versions; switch coq.coq-version [ + { case = "8.12"; out = "1.3-coq8.12"; } + { case = "8.11"; out = "1.3-coq8.11"; } + { case = "8.10"; out = "1.3-coq8.10"; } + { case = "8.9"; out = "1.1.1-coq8.9"; } + { case = "8.8"; out = "1.1-coq8.8"; } + ] null; + release."1.3-coq8.12".sha256 = "1q1y3cwhd98pkm98g71fsdjz85bfwgcz2xn7s7wwmiraifv5l6z8"; + release."1.3-coq8.11".sha256 = "08zf8qfna7b9p2myfaz4g7bas3a1q1156x78n5isqivlnqfrjc1b"; + release."1.3-coq8.10".sha256 = "1fj8497ir4m79hyrmmmmrag01001wrby0h24wv6525vz0w5py3cd"; + release."1.1.1-coq8.9".sha256 = "1knjmz4hr8vlp103j8n4fyb2lfxysnm512gh3m2kp85n6as6fvb9"; + release."1.1-coq8.8".sha256 = "0ms086wp4jmrzyglb8wymchzyflflk01nsfsk4r6qv8rrx81nx9h"; -stdenv.mkDerivation rec { - inherit (param) version; - name = "coq${coq.coq-version}-coqhammer-${version}"; - - src = fetchFromGitHub { - owner = "lukaszcz"; - repo = "coqhammer"; - rev = "v${version}-coq${coq.coq-version}"; - inherit (param) sha256; - }; + release."1.3-coq8.12".version = "1.3"; + release."1.3-coq8.11".version = "1.3"; + release."1.3-coq8.10".version = "1.3"; + release."1.1.1-coq8.9".version = "1.1.1"; + release."1.1-coq8.9".version = "1.1"; + releaseRev = v: "v${v}"; postPatch = '' substituteInPlace Makefile.coq.local --replace \ @@ -46,26 +31,16 @@ stdenv.mkDerivation rec { substituteInPlace Makefile.coq.local --replace 'g++' 'c++' --replace 'gcc' 'cc' ''; - buildInputs = [ coq ] ++ (with coq.ocamlPackages; [ - ocaml findlib - ]) ++ (param.buildInputs or []); - preInstall = '' mkdir -p $out/bin ''; - installFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ]; + mlPlugin = true; meta = { homepage = "http://cl-informatik.uibk.ac.at/cek/coqhammer/"; description = "Automation for Dependent Type Theory"; - license = stdenv.lib.licenses.lgpl21; - inherit (coq.meta) platforms; - maintainers = [ stdenv.lib.maintainers.vbgl ]; + license = licenses.lgpl21; + maintainers = [ maintainers.vbgl ]; }; - - passthru = { - compatibleCoqVersions = v: builtins.hasAttr v params; - }; - } diff --git a/pkgs/development/coq-modules/coqprime/default.nix b/pkgs/development/coq-modules/coqprime/default.nix index f16341ddbd1b..79db14610758 100644 --- a/pkgs/development/coq-modules/coqprime/default.nix +++ b/pkgs/development/coq-modules/coqprime/default.nix @@ -1,60 +1,29 @@ -{ stdenv, which, fetchFromGitHub, coq, bignums }: +{ which, lib, mkCoqDerivation, coq, bignums, version ? null }: -let - params = - let v_8_8 = { - version = "8.8"; - sha256 = "075yjczk79pf1hd3lgdjiz84ilkzfxjh18lgzrhhqp7d3kz5lxp5"; - }; - v_8_10 = { - version = "8.10"; - sha256 = "0r9gnh5a5ykiiz5h1i8xnzgiydpwc4z9qhndxyya85xq0f910qaz"; - }; - in - { - "8.7" = { - version = "8.7.2"; - sha256 = "15zlcrx06qqxjy3nhh22wzy0rb4npc8l4nx2bbsfsvrisbq1qb7k"; - }; - "8.8" = v_8_8; - "8.9" = v_8_8; - "8.10" = v_8_10; - "8.11" = v_8_10; - "8.12" = { - version = "8.12"; - sha256 = "1slka4w0pya15js4drx9frj7lxyp3k2lzib8v23givzpnxs8ijdj"; - }; - }; - param = params.${coq.coq-version}; -in +with lib; mkCoqDerivation { -stdenv.mkDerivation rec { + pname = "coqprime"; + owner = "thery"; + inherit version; + defaultVersion = with versions; switch coq.coq-version [ + { case = "8.12"; out = "8.12"; } + { case = range "8.10" "8.11"; out = "8.10"; } + { case = range "8.8" "8.9"; out = "8.8"; } + { case = "8.7"; out = "8.7.2"; } + ] null; - inherit (param) version; - name = "coq${coq.coq-version}-coqprime-${version}"; - - src = fetchFromGitHub { - owner = "thery"; - repo = "coqprime"; - rev = "v${version}"; - inherit (param) sha256; - }; - - buildInputs = [ which coq ]; + release."8.12".sha256 = "1slka4w0pya15js4drx9frj7lxyp3k2lzib8v23givzpnxs8ijdj"; + release."8.10".sha256 = "0r9gnh5a5ykiiz5h1i8xnzgiydpwc4z9qhndxyya85xq0f910qaz"; + release."8.8".sha256 = "075yjczk79pf1hd3lgdjiz84ilkzfxjh18lgzrhhqp7d3kz5lxp5"; + release."8.7.2".sha256 = "15zlcrx06qqxjy3nhh22wzy0rb4npc8l4nx2bbsfsvrisbq1qb7k"; + releaseRev = v: "v${v}"; + extraBuildInputs = [ which ]; propagatedBuildInputs = [ bignums ]; - installFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ]; - - meta = with stdenv.lib; { + meta = with lib; { description = "Library to certify primality using Pocklington certificate and Elliptic Curve Certificate"; license = licenses.lgpl21; - maintainers = [ stdenv.lib.maintainers.vbgl ]; - inherit (coq.meta) platforms; - inherit (src.meta) homepage; - }; - - passthru = { - compatibleCoqVersions = v: builtins.hasAttr v params; + maintainers = [ maintainers.vbgl ]; }; } diff --git a/pkgs/development/coq-modules/coquelicot/default.nix b/pkgs/development/coq-modules/coquelicot/default.nix index e45077f89fdd..b7f5802b9d40 100644 --- a/pkgs/development/coq-modules/coquelicot/default.nix +++ b/pkgs/development/coq-modules/coquelicot/default.nix @@ -1,43 +1,29 @@ -{ stdenv, fetchurl, which, coq, ssreflect }: +{ lib, mkCoqDerivation, which, autoconf, + coq, ssreflect, version ? null }: -let param = - if stdenv.lib.versionAtLeast coq.coq-version "8.8" - then { - version = "3.1.0"; - uid = "38287"; - sha256 = "07436wkvnq9jyf7wyhp77bpl157s3qhba1ay5xrkxdi26qdf3h14"; - } else { - version = "3.0.2"; - uid = "37523"; - sha256 = "1biia7nfqf7vaqq5gmykl4rwjyvrcwss6r2jdf0in5pvp2rnrj2w"; - } -; in +with lib; mkCoqDerivation { + pname = "coquelicot"; + owner = "coquelicot"; + domain = "gitlab.inria.fr"; + inherit version; + defaultVersion = with versions; switch coq.coq-version [ + { case = isGe "8.8" ; out = "3.2.0"; } + { case = range "8.8" "8.13"; out = "3.1.0"; } + { case = range "8.5" "8.9"; out = "3.0.2"; } + ] null; + release."3.2.0".sha256 = "07w7dbl8x7xxnbr2q39wrdh054gvi3daqjpdn1jm53crsl1fjxm4"; + release."3.1.0".sha256 = "02i0djar13yk01hzaqprcldhhscn9843x9nf6x3jkv4wv1jwnx9f"; + release."3.0.2".sha256 = "1rqfbbskgz7b1bcpva8wh3v3456sq2364y804f94sc8y5sij23nl"; + releaseRev = v: "coquelicot-${v}"; -stdenv.mkDerivation { - name = "coq${coq.coq-version}-coquelicot-${param.version}"; - src = fetchurl { - url = "https://gforge.inria.fr/frs/download.php/file/${param.uid}/coquelicot-${param.version}.tar.gz"; - inherit (param) sha256; - }; - - nativeBuildInputs = [ which ]; - buildInputs = [ coq ]; + nativeBuildInputs = [ which autoconf ]; propagatedBuildInputs = [ ssreflect ]; - - configureFlags = [ "--libdir=$out/lib/coq/${coq.coq-version}/user-contrib/Coquelicot" ]; - buildPhase = "./remake"; - installPhase = "./remake install"; + useMelquiondRemake.logpath = "Coquelicot"; meta = { homepage = "http://coquelicot.saclay.inria.fr/"; description = "A Coq library for Reals"; - license = stdenv.lib.licenses.lgpl3; - maintainers = [ stdenv.lib.maintainers.vbgl ]; - inherit (coq.meta) platforms; + license = licenses.lgpl3; + maintainers = [ maintainers.vbgl ]; }; - - passthru = { - compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" "8.8" "8.9" "8.10" "8.11" "8.12" ]; - }; - } diff --git a/pkgs/development/coq-modules/corn/default.nix b/pkgs/development/coq-modules/corn/default.nix index 14ff74506f37..9f2316f3177d 100644 --- a/pkgs/development/coq-modules/corn/default.nix +++ b/pkgs/development/coq-modules/corn/default.nix @@ -1,17 +1,10 @@ -{ stdenv, fetchFromGitHub, coq, bignums, math-classes }: +{ lib, mkCoqDerivation, coq, bignums, math-classes, version ? null }: -stdenv.mkDerivation rec { +with lib; mkCoqDerivation rec { pname = "corn"; - version = "8.8.1"; - name = "coq${coq.coq-version}-${pname}-${version}"; - src = fetchFromGitHub { - owner = "coq-community"; - repo = pname; - rev = version; - sha256 = "0gh32j0f18vv5lmf6nb87nr5450w6ai06rhrnvlx2wwi79gv10wp"; - }; - - buildInputs = [ coq ]; + inherit version; + defaultVersion = if versions.range "8.6" "8.9" coq.coq-version then "8.8.1" else null; + release."8.8.1".sha256 = "0gh32j0f18vv5lmf6nb87nr5450w6ai06rhrnvlx2wwi79gv10wp"; preConfigure = "patchShebangs ./configure.sh"; configureScript = "./configure.sh"; @@ -19,20 +12,10 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ bignums math-classes ]; - enableParallelBuilding = true; - - installFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ]; - meta = { homepage = "http://c-corn.github.io/"; - license = stdenv.lib.licenses.gpl2; + license = licenses.gpl2; description = "A Coq library for constructive analysis"; - maintainers = [ stdenv.lib.maintainers.vbgl ]; - inherit (coq.meta) platforms; + maintainers = [ maintainers.vbgl ]; }; - - passthru = { - compatibleCoqVersions = v: builtins.elem v [ "8.6" "8.7" "8.8" "8.9" ]; - }; - } diff --git a/pkgs/development/coq-modules/dpdgraph/default.nix b/pkgs/development/coq-modules/dpdgraph/default.nix index 195a1c4eada5..c6cc0d34ed1c 100644 --- a/pkgs/development/coq-modules/dpdgraph/default.nix +++ b/pkgs/development/coq-modules/dpdgraph/default.nix @@ -1,88 +1,58 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, coq }: +{ lib, mkCoqDerivation, autoreconfHook, coq, version ? null }: -let params = { - "8.12" = { - version = "0.6.8"; - sha256 = "1mj6sknsd53xfb387sp3kdwvl4wn80ck24bfzf3s6mgw1a12vyps"; - }; - "8.11" = { - version = "0.6.7"; - sha256 = "01vpi7scvkl4ls1z2k2x9zd65wflzb667idj759859hlz3ps9z09"; - }; - "8.10" = { - version = "0.6.6"; - sha256 = "1gjrm5zjzw4cisiwdr5b3iqa7s4cssa220xr0k96rwgk61rcjd8w"; - }; - "8.9" = { - version = "0.6.5"; - sha256 = "1f34z24yg05b1096gqv36jr3vffkcjkf9qncii3pzhhvagxd0w2f"; - }; - "8.8" = { - version = "0.6.3"; - rev = "0acbd0a594c7e927574d5f212cc73a486b5305d2"; - sha256 = "0c95b0bz2kjm6swr5na4gs06lxxywradszxbr5ldh2zx02r3f3rx"; - }; - "8.7" = { - version = "0.6.2"; - rev = "d76ddde37d918569945774733b7997e8b24daf51"; - sha256 = "04lnf4b25yarysj848cfl8pd3i3pr3818acyp9hgwdgd1rqmhjwm"; - }; - "8.6" = { - version = "0.6.1"; - rev = "c3b87af6bfa338e18b83f014ebd0e56e1f611663"; - sha256 = "1jaafkwsb5450378nprjsds1illgdaq60gryi8kspw0i25ykz2c9"; - }; - "8.5" = { - version = "0.6"; - sha256 = "0qvar8gfbrcs9fmvkph5asqz4l5fi63caykx3bsn8zf0xllkwv0n"; - }; -}; -param = params.${coq.coq-version}; -in +with lib; +let hasWarning = versionAtLeast coq.ocamlPackages.ocaml.version "4.08"; in -let hasWarning = stdenv.lib.versionAtLeast coq.ocamlPackages.ocaml.version "4.08"; in +mkCoqDerivation { + pname = "dpdgraph"; + owner = "Karmaki"; + repo = "coq-dpdgraph"; + inherit version; + defaultVersion = switch coq.coq-version [ + { case = "8.12"; out = "0.6.8"; } + { case = "8.11"; out = "0.6.7"; } + { case = "8.10"; out = "0.6.6"; } + { case = "8.9"; out = "0.6.5"; } + { case = "8.8"; out = "0.6.3"; } + { case = "8.7"; out = "0.6.2"; } + { case = "8.6"; out = "0.6.1"; } + { case = "8.5"; out = "0.6"; } + ] null; -stdenv.mkDerivation { - name = "coq${coq.coq-version}-dpdgraph-${param.version}"; - src = fetchFromGitHub { - owner = "Karmaki"; - repo = "coq-dpdgraph"; - rev = param.rev or "v${param.version}"; - inherit (param) sha256; - }; + release."0.6.8".sha256 = "1mj6sknsd53xfb387sp3kdwvl4wn80ck24bfzf3s6mgw1a12vyps"; + release."0.6.7".sha256 = "01vpi7scvkl4ls1z2k2x9zd65wflzb667idj759859hlz3ps9z09"; + release."0.6.6".sha256 = "1gjrm5zjzw4cisiwdr5b3iqa7s4cssa220xr0k96rwgk61rcjd8w"; + release."0.6.5".sha256 = "1f34z24yg05b1096gqv36jr3vffkcjkf9qncii3pzhhvagxd0w2f"; + release."0.6.3".rev = "0acbd0a594c7e927574d5f212cc73a486b5305d2"; + release."0.6.3".sha256 = "0c95b0bz2kjm6swr5na4gs06lxxywradszxbr5ldh2zx02r3f3rx"; + release."0.6.2".rev = "d76ddde37d918569945774733b7997e8b24daf51"; + release."0.6.2".sha256 = "04lnf4b25yarysj848cfl8pd3i3pr3818acyp9hgwdgd1rqmhjwm"; + release."0.6.1".rev = "c3b87af6bfa338e18b83f014ebd0e56e1f611663"; + release."0.6.1".sha256 = "1jaafkwsb5450378nprjsds1illgdaq60gryi8kspw0i25ykz2c9"; + release."0.6".sha256 = "0qvar8gfbrcs9fmvkph5asqz4l5fi63caykx3bsn8zf0xllkwv0n"; + releaseRev = v: "v${v}"; nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ coq ] - ++ (with coq.ocamlPackages; [ ocaml findlib ocamlgraph ] - ++ stdenv.lib.optional (!stdenv.lib.versionAtLeast coq.coq-version "8.10") camlp5); + mlPlugin = true; + extraBuildInputs = [ coq.ocamlPackages.ocamlgraph ]; # dpd_compute.ml uses deprecated Pervasives.compare # Versions prior to 0.6.5 do not have the WARN_ERR build flag - preConfigure = stdenv.lib.optionalString hasWarning '' + preConfigure = optionalString hasWarning '' substituteInPlace Makefile.in --replace "-warn-error +a " "" ''; - buildFlags = stdenv.lib.optional hasWarning "WARN_ERR="; + buildFlags = optional hasWarning "WARN_ERR="; preInstall = '' mkdir -p $out/bin ''; - installFlags = [ - "COQLIB=$(out)/lib/coq/${coq.coq-version}/" - "BINDIR=$(out)/bin" - ]; + extraInstallFlags = [ "BINDIR=$(out)/bin" ]; meta = { description = "Build dependency graphs between Coq objects"; - license = stdenv.lib.licenses.lgpl21; - homepage = "https://github.com/Karmaki/coq-dpdgraph/"; - maintainers = with stdenv.lib.maintainers; [ vbgl ]; - platforms = coq.meta.platforms; + license = licenses.lgpl21; + maintainers = with maintainers; [ vbgl ]; }; - - passthru = { - compatibleCoqVersions = v: builtins.hasAttr v params; - }; - } diff --git a/pkgs/development/coq-modules/equations/default.nix b/pkgs/development/coq-modules/equations/default.nix index 5a07d537536c..352222e8aa62 100644 --- a/pkgs/development/coq-modules/equations/default.nix +++ b/pkgs/development/coq-modules/equations/default.nix @@ -1,79 +1,48 @@ -{ stdenv, fetchFromGitHub, coq }: +{ lib, mkCoqDerivation, coq, version ? null }: -let - params = { - "8.6" = { - version = "1.0"; - rev = "v1.0"; - sha256 = "19ylw9v9g35607w4hm86j7mmkghh07hmkc1ls5bqlz3dizh5q4pj"; - }; +with lib; mkCoqDerivation { + pname = "equations"; + owner = "mattam82"; + repo = "Coq-Equations"; + inherit version; + defaultVersion = switch coq.coq-version [ + { case = "8.12"; out = "1.2.3+coq8.12"; } + { case = "8.11"; out = "1.2.3+coq8.11"; } + { case = "8.10"; out = "1.2.1+coq8.10-2"; } + { case = "8.9"; out = "1.2.1+coq8.9"; } + { case = "8.8"; out = "1.2+coq8.8"; } + { case = "8.7"; out = "1.0+coq8.7"; } + { case = "8.6"; out = "1.0+coq8.6"; } + ] null; - "8.7" = { - version = "1.0"; - rev = "v1.0-8.7"; - sha256 = "1bavg4zl1xn0jqrdq8iw7xqzdvdf39ligj9saz5m9c507zri952h"; - }; - - "8.8" = { - version = "1.2"; - rev = "v1.2-8.8"; - sha256 = "06452fyzalz7zcjjp73qb7d6xvmqb6skljkivf8pfm55fsc8s7kx"; - }; - - "8.9" = { - version = "1.2.1"; - rev = "v1.2.1-8.9"; - sha256 = "0d8ddj6nc6p0k25cd8fs17cq427zhzbc3v9pk2wd2fnvk70nlfij"; - }; - - "8.10" = { - version = "1.2.1"; - rev = "v1.2.1-8.10-2"; - sha256 = "0j3z4l5nrbyi9zbbyqkc6kassjanwld2188mwmrbqspaypm2ys68"; - }; - - "8.11" = { - version = "1.2.3"; - rev = "v1.2.3-8.11"; - sha256 = "1srxz1rws8jsh7402g2x2vcqgjbbsr64dxxj5d2zs48pmhb20csf"; - }; - - "8.12" = { - version = "1.2.3"; - rev = "v1.2.3-8.12"; - sha256 = "1y0jkvzyz5ssv5vby41p1i8zs7nsdc8g3pzyq73ih9jz8h252643"; - }; - }; - param = params.${coq.coq-version}; -in - -stdenv.mkDerivation rec { - - name = "coq${coq.coq-version}-equations-${version}"; - version = param.version; - - src = fetchFromGitHub { - owner = "mattam82"; - repo = "Coq-Equations"; - rev = param.rev; - sha256 = param.sha256; - }; - - buildInputs = with coq.ocamlPackages; [ ocaml camlp5 findlib coq ]; + release."1.0+coq8.6".version = "1.0"; + release."1.0+coq8.6".rev = "v1.0"; + release."1.0+coq8.6".sha256 = "19ylw9v9g35607w4hm86j7mmkghh07hmkc1ls5bqlz3dizh5q4pj"; + release."1.0+coq8.7".version = "1.0"; + release."1.0+coq8.7".rev = "v1.0-8.7"; + release."1.0+coq8.7".sha256 = "1bavg4zl1xn0jqrdq8iw7xqzdvdf39ligj9saz5m9c507zri952h"; + release."1.2+coq8.8".version = "1.2"; + release."1.2+coq8.8".rev = "v1.2-8.8"; + release."1.2+coq8.8".sha256 = "06452fyzalz7zcjjp73qb7d6xvmqb6skljkivf8pfm55fsc8s7kx"; + release."1.2.1+coq8.9".version = "1.2.1"; + release."1.2.1+coq8.9".rev = "v1.2.1-8.9"; + release."1.2.1+coq8.9".sha256 = "0d8ddj6nc6p0k25cd8fs17cq427zhzbc3v9pk2wd2fnvk70nlfij"; + release."1.2.1+coq8.10-2".version = "1.2.1"; + release."1.2.1+coq8.10-2".rev = "v1.2.1-8.10-2"; + release."1.2.1+coq8.10-2".sha256 = "0j3z4l5nrbyi9zbbyqkc6kassjanwld2188mwmrbqspaypm2ys68"; + release."1.2.3+coq8.11".version = "1.2.3"; + release."1.2.3+coq8.11".rev = "v1.2.3-8.11"; + release."1.2.3+coq8.11".sha256 = "1srxz1rws8jsh7402g2x2vcqgjbbsr64dxxj5d2zs48pmhb20csf"; + release."1.2.3+coq8.12".version = "1.2.3"; + release."1.2.3+coq8.12".rev = "v1.2.3-8.12"; + release."1.2.3+coq8.12".sha256 = "1y0jkvzyz5ssv5vby41p1i8zs7nsdc8g3pzyq73ih9jz8h252643"; + mlPlugin = true; preBuild = "coq_makefile -f _CoqProject -o Makefile"; - installFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ]; - - meta = with stdenv.lib; { + meta = { homepage = "https://mattam82.github.io/Coq-Equations/"; description = "A plugin for Coq to add dependent pattern-matching"; maintainers = with maintainers; [ jwiegley ]; - platforms = coq.meta.platforms; }; - - passthru = { - compatibleCoqVersions = v: builtins.hasAttr v params; - }; - } diff --git a/pkgs/development/coq-modules/fiat/HEAD.nix b/pkgs/development/coq-modules/fiat/HEAD.nix index fd3ade0c64b5..47f097a34b2e 100644 --- a/pkgs/development/coq-modules/fiat/HEAD.nix +++ b/pkgs/development/coq-modules/fiat/HEAD.nix @@ -1,17 +1,17 @@ -{stdenv, fetchgit, coq, python27}: +{lib, mkCoqDerivation, coq, python27, version ? null }: -stdenv.mkDerivation rec { +with lib; mkCoqDerivation rec { + pname = "fiat"; + owner = "mit-plv"; + repo = "fiat"; + displayVersion = { fiat = v: "unstable-${v}"; }; + inherit version; + defaultVersion = if coq.coq-version == "8.5" then "2016-10-24" else null; + release."2016-10-24".rev = "7feb6c64be9ebcc05924ec58fe1463e73ec8206a"; + release."2016-10-24".sha256 = "0griqc675yylf9rvadlfsabz41qy5f5idya30p5rv6ysiakxya64"; - name = "coq-fiat-${coq.coq-version}-unstable-${version}"; - version = "2016-10-24"; - - src = fetchgit { - url = "https://github.com/mit-plv/fiat.git"; - rev = "7feb6c64be9ebcc05924ec58fe1463e73ec8206a"; - sha256 = "0griqc675yylf9rvadlfsabz41qy5f5idya30p5rv6ysiakxya64"; - }; - - buildInputs = [ coq python27 ] ++ (with coq.ocamlPackages; [ ocaml camlp5 ]); + mlPlugin = true; + extraBuildInputs = [ python27 ]; prePatch = "patchShebangs etc/coq-scripts"; @@ -26,14 +26,9 @@ stdenv.mkDerivation rec { cp -pR src/* $COQLIB/user-contrib/Fiat ''; - meta = with stdenv.lib; { + meta = { homepage = "http://plv.csail.mit.edu/fiat/"; description = "A library for the Coq proof assistant for synthesizing efficient correct-by-construction programs from declarative specifications"; maintainers = with maintainers; [ jwiegley ]; - platforms = coq.meta.platforms; - }; - - passthru = { - compatibleCoqVersions = v: v == "8.5"; }; } diff --git a/pkgs/development/coq-modules/flocq/default.nix b/pkgs/development/coq-modules/flocq/default.nix index c5d3a295f2bc..2598d4e233eb 100644 --- a/pkgs/development/coq-modules/flocq/default.nix +++ b/pkgs/development/coq-modules/flocq/default.nix @@ -1,49 +1,26 @@ -{ stdenv, bash, which, autoconf, automake, fetchzip, coq }: +{ lib, bash, which, autoconf, automake, + mkCoqDerivation, coq, version ? null }: -let params = - if stdenv.lib.versionAtLeast coq.coq-version "8.7" then { - version = "3.3.1"; - sha256 = "0k1nfgiszmai5dihhpfa5mgq9rwigl0n38dw10jn79x89xbdpyh5"; - } else { - version = "2.6.1"; - sha256 = "0q5a038ww5dn72yvwn5298d3ridkcngb1dik8hdyr3xh7gr5qibj"; - } -; in +with lib; mkCoqDerivation { + pname = "flocq"; + owner = "flocq"; + domain = "gitlab.inria.fr"; + inherit version; + defaultVersion = with versions; switch coq.coq-version [ + { case = isGe "8.7"; out = "3.3.1"; } + { case = range "8.5" "8.8"; out = "2.6.1"; } + ] null; + release."3.3.1".sha256 = "1mk8adhi5hrllsr0hamzk91vf2405sjr4lh5brg9201mcw11abkz"; + release."2.6.1".sha256 = "0q5a038ww5dn72yvwn5298d3ridkcngb1dik8hdyr3xh7gr5qibj"; + releaseRev = v: "flocq-${v}"; -stdenv.mkDerivation rec { + nativeBuildInputs = [ bash which autoconf ]; + mlPlugin = true; + useMelquiondRemake.logpath = "Flocq"; - name = "coq${coq.coq-version}-flocq-${version}"; - inherit (params) version; - - src = fetchzip { - url = "https://gitlab.inria.fr/flocq/flocq/-/archive/flocq-${version}.tar.gz"; - inherit (params) sha256; - }; - - nativeBuildInputs = [ bash which autoconf automake ]; - buildInputs = [ coq ] ++ (with coq.ocamlPackages; [ - ocaml camlp5 - ]); - - buildPhase = '' - ${bash}/bin/bash autogen.sh || autoconf - ${bash}/bin/bash configure --libdir=$out/lib/coq/${coq.coq-version}/user-contrib/Flocq - ./remake - ''; - - installPhase = '' - ./remake install - ''; - - meta = with stdenv.lib; { - homepage = "http://flocq.gforge.inria.fr/"; + meta = { description = "A floating-point formalization for the Coq system"; license = licenses.lgpl3; maintainers = with maintainers; [ jwiegley ]; - platforms = coq.meta.platforms; - }; - - passthru = { - compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" "8.8" "8.9" "8.10" "8.11" "8.12" ]; }; } diff --git a/pkgs/development/coq-modules/gappalib/default.nix b/pkgs/development/coq-modules/gappalib/default.nix index f6109398da8e..a835d53fdedb 100644 --- a/pkgs/development/coq-modules/gappalib/default.nix +++ b/pkgs/development/coq-modules/gappalib/default.nix @@ -1,30 +1,24 @@ -{ stdenv, fetchurl, which, coq, flocq }: +{ which, lib, mkCoqDerivation, autoconf, coq, flocq, version ? null }: -stdenv.mkDerivation { - name = "coq${coq.coq-version}-gappalib-1.4.4"; - src = fetchurl { - url = "https://gforge.inria.fr/frs/download.php/file/38338/gappalib-coq-1.4.4.tar.gz"; - sha256 = "1ds9qp3ml07w5ali0rsczlwgdx4xcgasgbcnpi2lssgj1xpxgfpn"; - }; +with lib; mkCoqDerivation { + pname = "gappalib"; + repo = "coq"; + owner = "gappa"; + domain = "gitlab.inria.fr"; + inherit version; + defaultVersion = if versions.isGe "8.8" coq.coq-version then "1.4.5" else null; + release."1.4.5".sha256 = "081hib1d9wfm29kis390qsqch8v6fs3q71g2rgbbzx5y5cf48n9k"; + release."1.4.4".sha256 = "114q2hgw64j6kqa9mg3qcp1nlf0ia46z2xadq81fnkxqm856ml7l"; + releaseRev = v: "gappalib-coq-${v}"; - nativeBuildInputs = [ which ]; - buildInputs = [ coq coq.ocamlPackages.ocaml ]; + nativeBuildInputs = [ which autoconf ]; + mlPlugin = true; propagatedBuildInputs = [ flocq ]; - - configurePhase = "./configure --libdir=$out/lib/coq/${coq.coq-version}/user-contrib/Gappa"; - buildPhase = "./remake"; - installPhase = "./remake install"; + useMelquiondRemake.logpath = "Gappa"; meta = { description = "Coq support library for Gappa"; - license = stdenv.lib.licenses.lgpl21; - homepage = "http://gappa.gforge.inria.fr/"; - maintainers = [ stdenv.lib.maintainers.vbgl ]; - inherit (coq.meta) platforms; + license = licenses.lgpl21; + maintainers = [ maintainers.vbgl ]; }; - - passthru = { - compatibleCoqVersions = stdenv.lib.flip builtins.elem [ "8.8" "8.9" "8.10" "8.11" "8.12" ]; - }; - } diff --git a/pkgs/development/coq-modules/heq/default.nix b/pkgs/development/coq-modules/heq/default.nix index d0445c83ca59..4bf9139b4947 100644 --- a/pkgs/development/coq-modules/heq/default.nix +++ b/pkgs/development/coq-modules/heq/default.nix @@ -1,30 +1,23 @@ -{stdenv, fetchurl, coq, unzip}: +{lib, fetchzip, mkCoqDerivation, coq, version ? null }: -stdenv.mkDerivation rec { +with lib; mkCoqDerivation { + pname = "heq"; + repo = "Heq"; + owner = "gil"; + domain = "mpi-sws.org"; + inherit version fetcher; + defaultVersion = if versions.isLt "8.8" coq.coq-version then "0.92" else null; + release."0.92".sha256 = "0cf8y6728n81wwlbpq3vi7l2dbzi7759klypld4gpsjjp1y1fj74"; - name = "coq-heq-${coq.coq-version}-${version}"; - version = "0.92"; - - src = fetchurl { - url = "https://www.mpi-sws.org/~gil/Heq/download/Heq-${version}.zip"; - sha256 = "03y71c4qs6cmy3s2hjs05g7pcgk9sqma6flj15394yyxbvr9is1p"; - }; - - buildInputs = with coq.ocamlPackages; [ ocaml camlp5 unzip ]; + mlPlugin = true; propagatedBuildInputs = [ coq ]; + extraInstallFlags = [ "COQLIB=$out/lib/coq/${coq.coq-version}" ]; preBuild = "cd src"; - installFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}" ]; - - meta = with stdenv.lib; { + meta = { homepage = "https://www.mpi-sws.org/~gil/Heq/"; description = "Heq : a Coq library for Heterogeneous Equality"; maintainers = with maintainers; [ jwiegley ]; - platforms = coq.meta.platforms; - }; - - passthru = { - compatibleCoqVersions = v: !stdenv.lib.versionAtLeast v "8.8"; }; } diff --git a/pkgs/development/coq-modules/hierarchy-builder/default.nix b/pkgs/development/coq-modules/hierarchy-builder/default.nix index 9be8459ee9f0..530763c9439d 100644 --- a/pkgs/development/coq-modules/hierarchy-builder/default.nix +++ b/pkgs/development/coq-modules/hierarchy-builder/default.nix @@ -1,43 +1,24 @@ -{ stdenv, fetchFromGitHub, which, coq, coq-elpi }: +{ lib, mkCoqDerivation, which, coq, coq-elpi, version ? null }: -let - versions = { - "0.10.0" = { - rev = "v0.10.0"; - sha256 = "1a3vry9nzavrlrdlq3cys3f8kpq3bz447q8c4c7lh2qal61wb32h"; - }; - }; - version = x: versions.${x} // {version = x;}; - params = { - "8.11" = version "0.10.0"; - "8.12" = version "0.10.0"; - }; - param = params.${coq.coq-version}; -in - -stdenv.mkDerivation rec { - name = "coq${coq.coq-version}-hierarchy-builder-${param.version}"; - - src = fetchFromGitHub { - owner = "math-comp"; - repo = "hierarchy-builder"; - inherit (param) rev sha256; - }; +with lib; mkCoqDerivation { + pname = "hierarchy-builder"; + owner = "math-comp"; + inherit version; + defaultVersion = with versions; switch coq.coq-version [ + { case = isGe "8.12"; out = "1.0.0"; } + { case = range "8.11" "8.12"; out = "0.10.0"; } + ] null; + release."1.0.0".sha256 = "0yykygs0z6fby6vkiaiv3azy1i9yx4rqg8xdlgkwnf2284hffzpp"; + release."0.10.0".sha256 = "1a3vry9nzavrlrdlq3cys3f8kpq3bz447q8c4c7lh2qal61wb32h"; + releaseRev = v: "v${v}"; propagatedBuildInputs = [ coq-elpi ]; - buildInputs = [ coq coq.ocaml coq.ocamlPackages.elpi ]; - installPhase = ''make -f Makefile.coq VFILES=structures.v COQLIB=$out/lib/coq/${coq.coq-version}/ install''; + extraInstallFlags = [ "VFILES=structures.v" ]; meta = { description = "Coq plugin embedding ELPI."; - maintainers = [ stdenv.lib.maintainers.cohencyril ]; - license = stdenv.lib.licenses.lgpl21; - inherit (coq.meta) platforms; - inherit (src.meta) homepage; - }; - - passthru = { - compatibleCoqVersions = stdenv.lib.flip builtins.hasAttr params; + maintainers = [ maintainers.cohencyril ]; + license = licenses.lgpl21; }; } diff --git a/pkgs/development/coq-modules/interval/default.nix b/pkgs/development/coq-modules/interval/default.nix index e72fe7845c84..8671eba67241 100644 --- a/pkgs/development/coq-modules/interval/default.nix +++ b/pkgs/development/coq-modules/interval/default.nix @@ -1,62 +1,31 @@ -{ stdenv, fetchurl, which, coq, coquelicot, flocq, mathcomp -, bignums ? null }: +{ lib, mkCoqDerivation, which, autoconf +, coq, coquelicot, flocq, mathcomp +, bignums ? null, version ? null }: -let params = - let - v3_3 = { - version = "3.3.0"; - uid = "37077"; - sha256 = "08fdcf3hbwqphglvwprvqzgkg0qbimpyhnqsgv3gac4y1ap0f903"; - }; - v3_4 = { - version = "3.4.2"; - uid = "38288"; - sha256 = "00bgzbji0gkazwxhs4q8gz4ccqsa1y1r0m0ravr18ps2h8a8qva5"; - }; - v4_0 = { - version = "4.0.0"; - uid = "38339"; - sha256 = "19sbrv7jnzyxji7irfslhr9ralc0q3gx20nymig5vqbn3vssmgpz"; - }; - in { - "8.5" = v3_3; - "8.6" = v3_3; - "8.7" = v3_4; - "8.8" = v4_0; - "8.9" = v4_0; - "8.10" = v4_0; - "8.11" = v4_0; - "8.12" = v4_0; - }; - param = params."${coq.coq-version}"; -in +with lib; mkCoqDerivation { + pname = "interval"; + owner = "coqinterval"; + domain = "gitlab.inria.fr"; + inherit version; + defaultVersion = with versions; switch coq.coq-version [ + { case = isGe "8.8" ; out = "4.1.0"; } + { case = range "8.8" "8.12"; out = "4.0.0"; } + { case = range "8.7" "8.11"; out = "3.4.2"; } + { case = range "8.5" "8.6"; out = "3.3.0"; } + ] null; + release."4.1.0".sha256 = "1jv27n5c4f3a9d8sizraa920iqi35x8cik8lm7pjp1dkiifz47nb"; + release."4.0.0".sha256 = "1hhih6zmid610l6c8z3x4yzdzw9jniyjiknd1vpkyb2rxvqm3gzp"; + release."3.4.2".sha256 = "07ngix32qarl3pjnm9d0vqc9fdrgm08gy7zp306hwxjyq7h1v7z0"; + release."3.3.0".sha256 = "0lz2hgggzn4cvklvm8rpaxvwaryf37i8mzqajqgdxdbd8f12acsz"; + releaseRev = v: "interval-${v}"; -stdenv.mkDerivation { - name = "coq${coq.coq-version}-interval-${param.version}"; - - src = fetchurl { - url = "https://gforge.inria.fr/frs/download.php/file/${param.uid}/interval-${param.version}.tar.gz"; - inherit (param) sha256; - }; - - nativeBuildInputs = [ which ]; - buildInputs = [ coq ]; + nativeBuildInputs = [ which autoconf ]; propagatedBuildInputs = [ bignums coquelicot flocq ]; + useMelquiondRemake.logpath = "Interval"; - configurePhase = "./configure --libdir=$out/lib/coq/${coq.coq-version}/user-contrib/Interval"; - buildPhase = "./remake"; - installPhase = "./remake install"; - - meta = with stdenv.lib; { - homepage = "http://coq-interval.gforge.inria.fr/"; + meta = with lib; { description = "Tactics for simplifying the proofs of inequalities on expressions of real numbers for the Coq proof assistant"; license = licenses.cecill-c; maintainers = with maintainers; [ vbgl ]; - platforms = coq.meta.platforms; }; - - passthru = { - compatibleCoqVersions = stdenv.lib.flip builtins.hasAttr params; - }; - } diff --git a/pkgs/development/coq-modules/iris/default.nix b/pkgs/development/coq-modules/iris/default.nix index 6826e07d613e..b46383fa1679 100644 --- a/pkgs/development/coq-modules/iris/default.nix +++ b/pkgs/development/coq-modules/iris/default.nix @@ -1,33 +1,19 @@ -{ stdenv, fetchFromGitLab, coq, stdpp }: +{ lib, mkCoqDerivation, coq, stdpp, version ? null }: -stdenv.mkDerivation rec { - version = "3.3.0"; - name = "coq${coq.coq-version}-iris-${version}"; - src = fetchFromGitLab { - domain = "gitlab.mpi-sws.org"; - owner = "iris"; - repo = "iris"; - rev = "iris-${version}"; - sha256 = "0az4gkp5m8sq0p73dlh0r7ckkzhk7zkg5bndw01bdsy5ywj0vilp"; - }; +with lib; mkCoqDerivation rec { + pname = "iris"; + domain = "gitlab.mpi-sws.org"; + owner = "iris"; + inherit version; + defaultVersion = if versions.range "8.9" "8.12" coq.coq-version then "3.3.0" else null; + release."3.3.0".sha256 = "0az4gkp5m8sq0p73dlh0r7ckkzhk7zkg5bndw01bdsy5ywj0vilp"; + releaseRev = v: "iris-${v}"; - buildInputs = [ coq ]; propagatedBuildInputs = [ stdpp ]; - enableParallelBuilding = true; - - installFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ]; - meta = { - homepage = "https://gitlab.mpi-sws.org/FP/iris-coq"; description = "The Coq development of the Iris Project"; - inherit (coq.meta) platforms; - license = stdenv.lib.licenses.bsd3; - maintainers = [ stdenv.lib.maintainers.vbgl ]; + license = licenses.bsd3; + maintainers = [ maintainers.vbgl ]; }; - - passthru = { - compatibleCoqVersions = v: builtins.elem v [ "8.9" "8.10" "8.11" "8.12" ]; - }; - } diff --git a/pkgs/development/coq-modules/ltac2/default.nix b/pkgs/development/coq-modules/ltac2/default.nix index 92484f169c15..1d0d03fb7f7c 100644 --- a/pkgs/development/coq-modules/ltac2/default.nix +++ b/pkgs/development/coq-modules/ltac2/default.nix @@ -1,57 +1,28 @@ -{ stdenv, fetchFromGitHub, which, coq }: +{ lib, mkCoqDerivation, which, coq, version ? null }: -let params = { - "8.7" = { - version = "0.1"; - rev = "v0.1-8.7"; - sha256 = "0l6wiwi4cvd0i324fb29i9mdh0ijlxzggw4mrjjy695l2qdnlgg0"; - }; - "8.8" = { - version = "0.1"; - rev = "0.1"; - sha256 = "1zz26cyv99whj7rrpgnhhm9dfqnpmrx5pqizn8ihf8jkq8d4drz7"; - }; - "8.9" = rec { - version = "0.2"; - rev = version; - sha256 = "0xby1kb26r9gcvk5511wqj05fqm9paynwfxlfqkmwkgnfmzk0x73"; - }; - "8.10" = rec { - version = "0.3"; - rev = version; - sha256 = "0pzs5nsakh4l8ffwgn4ryxbnxdv2x0r1i7bc598ij621haxdirrr"; - }; -}; - param = params.${coq.coq-version}; -in - -stdenv.mkDerivation rec { - inherit (param) version; - name = "coq${coq.coq-version}-ltac2-${version}"; - - src = fetchFromGitHub { - owner = "coq"; - repo = "ltac2"; - inherit (param) rev sha256; - }; +with lib; mkCoqDerivation { + pname = "ltac2"; + owner = "coq"; + inherit version; + defaultVersion = with versions; switch coq.coq-version [ + { case = "8.10"; out = "0.3"; } + { case = "8.9"; out = "0.2"; } + { case = "8.8"; out = "0.1"; } + { case = "8.7"; out = "0.1-8.7"; } + ] null; + release."0.3".sha256 = "0pzs5nsakh4l8ffwgn4ryxbnxdv2x0r1i7bc598ij621haxdirrr"; + release."0.2".sha256 = "0xby1kb26r9gcvk5511wqj05fqm9paynwfxlfqkmwkgnfmzk0x73"; + release."0.1".sha256 = "1zz26cyv99whj7rrpgnhhm9dfqnpmrx5pqizn8ihf8jkq8d4drz7"; + release."0.1-8.7".version = "0.1"; + release."0.1-8.7".rev = "v0.1-8.7"; + release."0.1-8.7".sha256 = "0l6wiwi4cvd0i324fb29i9mdh0ijlxzggw4mrjjy695l2qdnlgg0"; nativeBuildInputs = [ which ]; - buildInputs = [ coq ] ++ (with coq.ocamlPackages; [ ocaml findlib ]) - ++ stdenv.lib.optional (!stdenv.lib.versionAtLeast coq.coq-version "8.10") - coq.ocamlPackages.camlp5 - ; - - installFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ]; + mlPlugin = true; meta = { description = "A robust and expressive tactic language for Coq"; - maintainers = [ stdenv.lib.maintainers.vbgl ]; - license = stdenv.lib.licenses.lgpl21; - inherit (coq.meta) platforms; - inherit (src.meta) homepage; - }; - - passthru = { - compatibleCoqVersions = stdenv.lib.flip builtins.hasAttr params; + maintainers = [ maintainers.vbgl ]; + license = licenses.lgpl21; }; } diff --git a/pkgs/development/coq-modules/math-classes/default.nix b/pkgs/development/coq-modules/math-classes/default.nix index 73e420b326d9..c6b0dab0e0a7 100644 --- a/pkgs/development/coq-modules/math-classes/default.nix +++ b/pkgs/development/coq-modules/math-classes/default.nix @@ -1,30 +1,17 @@ -{ stdenv, fetchFromGitHub, coq, bignums }: +{ lib, mkCoqDerivation, coq, bignums, version ? null }: -stdenv.mkDerivation rec { +with lib; mkCoqDerivation { - name = "coq${coq.coq-version}-math-classes-${version}"; - version = "8.11.0"; + pname = "math-classes"; + inherit version; + defaultVersion = if versions.range "8.6" "8.11" coq.coq-version then "8.11.0" else null; + release."8.11.0".sha256 = "1hjgncvm1m46lw6264w4dqsy8dbh74vhmzq52x0fba2yqlvy94sf"; - src = fetchFromGitHub { - owner = "coq-community"; - repo = "math-classes"; - rev = version; - sha256 = "1hjgncvm1m46lw6264w4dqsy8dbh74vhmzq52x0fba2yqlvy94sf"; - }; + extraBuildInputs = [ bignums ]; - buildInputs = [ coq bignums ]; - enableParallelBuilding = true; - installFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ]; - - meta = with stdenv.lib; { + meta = { homepage = "https://math-classes.github.io"; description = "A library of abstract interfaces for mathematical structures in Coq."; maintainers = with maintainers; [ siddharthist jwiegley ]; - platforms = coq.meta.platforms; }; - - passthru = { - compatibleCoqVersions = v: builtins.elem v [ "8.6" "8.7" "8.8" "8.9" "8.10" "8.11" ]; - }; - } diff --git a/pkgs/development/coq-modules/mathcomp-analysis/default.nix b/pkgs/development/coq-modules/mathcomp-analysis/default.nix new file mode 100644 index 000000000000..9304335260a9 --- /dev/null +++ b/pkgs/development/coq-modules/mathcomp-analysis/default.nix @@ -0,0 +1,27 @@ +{ coq, mkCoqDerivation, mathcomp, mathcomp-finmap, mathcomp-bigenough, mathcomp-real-closed, + lib, version ? null }: + +with lib; mkCoqDerivation { + + namePrefix = [ "coq" "mathcomp" ]; + pname = "analysis"; + owner = "math-comp"; + + release."0.3.1".sha256 = "1iad288yvrjv8ahl9v18vfblgqb1l5z6ax644w49w9hwxs93f2k8"; + release."0.2.3".sha256 = "0p9mr8g1qma6h10qf7014dv98ln90dfkwn76ynagpww7qap8s966"; + + inherit version; + defaultVersion = with versions; switch [ coq.version mathcomp.version ] [ + { cases = [ (range "8.10" "8.11") "1.11.0" ]; out = "0.3.1"; } + { cases = [ (range "8.8" "8.11") (range "1.8" "1.10") ]; out = "0.2.3"; } + ] null; + + propagatedBuildInputs = + [ mathcomp.ssreflect mathcomp.field + mathcomp-finmap mathcomp-bigenough mathcomp-real-closed ]; + + meta = { + description = "Analysis library compatible with Mathematical Components"; + license = licenses.cecill-c; + }; +} diff --git a/pkgs/development/coq-modules/mathcomp-bigenough/default.nix b/pkgs/development/coq-modules/mathcomp-bigenough/default.nix new file mode 100644 index 000000000000..296bd738928f --- /dev/null +++ b/pkgs/development/coq-modules/mathcomp-bigenough/default.nix @@ -0,0 +1,19 @@ +{ coq, mkCoqDerivation, mathcomp, lib, version ? null }: + +with lib; mkCoqDerivation { + + namePrefix = [ "coq" "mathcomp" ]; + pname = "bigenough"; + owner = "math-comp"; + + release = { "1.0.0".sha256 = "10g0gp3hk7wri7lijkrqna263346wwf6a3hbd4qr9gn8hmsx70wg"; }; + inherit version; + defaultVersion = "1.0.0"; + + propagatedBuildInputs = [ mathcomp.ssreflect ]; + + meta = { + description = "A small library to do epsilon - N reasonning"; + license = licenses.cecill-b; + }; +} diff --git a/pkgs/development/coq-modules/mathcomp-finmap/default.nix b/pkgs/development/coq-modules/mathcomp-finmap/default.nix new file mode 100644 index 000000000000..c506d07e4574 --- /dev/null +++ b/pkgs/development/coq-modules/mathcomp-finmap/default.nix @@ -0,0 +1,36 @@ +{ coq, mkCoqDerivation, mathcomp, lib, version ? null }: + +with lib; mkCoqDerivation { + + namePrefix = [ "coq" "mathcomp" ]; + pname = "finmap"; + owner = "math-comp"; + inherit version; + defaultVersion = with versions; switch [ coq.version mathcomp.version ] [ + { cases = [ (isGe "8.10") (range "1.11" "1.12") ]; out = "1.5.1"; } + { cases = [ (range "8.7" "8.11") "1.11.0" ]; out = "1.5.0"; } + { cases = [ (isEq "8.11") (range "1.8" "1.10") ]; out = "1.4.0+coq-8.11"; } + { cases = [ (range "8.7" "8.11.0") (range "1.8" "1.10") ]; out = "1.4.0"; } + { cases = [ (range "8.7" "8.11.0") (range "1.8" "1.10") ]; out = "1.3.4"; } + { cases = [ (range "8.7" "8.9") "1.7.0" ]; out = "1.1.0"; } + { cases = [ (range "8.6" "8.7") (range "1.6.1" "1.7") ]; out = "1.0.0"; } + ] null; + release = { + "1.5.1".sha256 = "0ryfml4pf1dfya16d8ma80favasmrygvspvb923n06kfw9v986j7"; + "1.5.0".sha256 = "0vx9n1fi23592b3hv5p5ycy7mxc8qh1y5q05aksfwbzkk5zjkwnq"; + "1.4.1".sha256 = "0kx4nx24dml1igk0w0qijmw221r5bgxhwhl5qicnxp7ab3c35s8p"; + "1.4.0+coq-8.11".sha256 = "1fd00ihyx0kzq5fblh9vr8s5mr1kg7p6pk11c4gr8svl1n69ppmb"; + "1.4.0".sha256 = "0mp82mcmrs424ff1vj3cvd8353r9vcap027h3p0iprr1vkkwjbzd"; + "1.3.4".sha256 = "0f5a62ljhixy5d7gsnwd66gf054l26k3m79fb8nz40i2mgp6l9ii"; + "1.2.1".sha256 = "0jryb5dq8js3imbmwrxignlk5zh8gwfb1wr4b1s7jbwz410vp7zf"; + "1.1.0".sha256 = "05df59v3na8jhpsfp7hq3niam6asgcaipg2wngnzxzqnl86srp2a"; + "1.0.0".sha256 = "0sah7k9qm8sw17cgd02f0x84hki8vj8kdz7h15i7rmz08rj0whpa"; + }; + + propagatedBuildInputs = [ mathcomp.ssreflect ]; + + meta = { + description = "A finset and finmap library"; + license = licenses.cecill-b; + }; +} diff --git a/pkgs/development/coq-modules/mathcomp-real-closed/default.nix b/pkgs/development/coq-modules/mathcomp-real-closed/default.nix new file mode 100644 index 000000000000..dbd1550c6a7a --- /dev/null +++ b/pkgs/development/coq-modules/mathcomp-real-closed/default.nix @@ -0,0 +1,33 @@ +{ coq, mkCoqDerivation, mathcomp, mathcomp-bigenough, + lib, version ? null }: + +with lib; mkCoqDerivation { + + namePrefix = [ "coq" "mathcomp" ]; + pname = "real-closed"; + owner = "math-comp"; + inherit version; + release = { + "1.1.2".sha256 = "0907x4nf7nnvn764q3x9lx41g74rilvq5cki5ziwgpsdgb98pppn"; + "1.1.1".sha256 = "0ksjscrgq1i79vys4zrmgvzy2y4ylxa8wdsf4kih63apw6v5ws6b"; + "1.0.5".sha256 = "0q8nkxr9fba4naylr5xk7hfxsqzq2pvwlg1j0xxlhlgr3fmlavg2"; + "1.0.4".sha256 = "058v9dj973h9kfhqmvcy9a6xhhxzljr90cf99hdfcdx68fi2ha1b"; + "1.0.3".sha256 = "1xbzkzqgw5p42dx1liy6wy8lzdk39zwd6j14fwvv5735k660z7yb"; + "1.0.1".sha256 = "0j81gkjbza5vg89v4n9z598mfdbql416963rj4b8fzm7dp2r4rxg"; + }; + + defaultVersion = with versions; switch [ coq.version mathcomp.version ] [ + { cases = [ (isGe "8.10") "1.12.0" ]; out = "1.1.2"; } + { cases = [ (isGe "8.7") "1.11.0" ]; out = "1.1.1"; } + { cases = [ (isGe "8.7") (range "1.9.0" "1.10.0") ]; out = "1.0.4"; } + { cases = [ (isGe "8.7") "1.8.0" ]; out = "1.0.3"; } + { cases = [ (isGe "8.7") "1.7.0" ]; out = "1.0.1"; } + ] null; + + propagatedBuildInputs = [ mathcomp.ssreflect mathcomp.field mathcomp-bigenough ]; + + meta = { + description = "Mathematical Components Library on real closed fields"; + license = licenses.cecill-c; + }; +} diff --git a/pkgs/development/coq-modules/mathcomp/default.nix b/pkgs/development/coq-modules/mathcomp/default.nix index 542fac861c58..5b3501516e15 100644 --- a/pkgs/development/coq-modules/mathcomp/default.nix +++ b/pkgs/development/coq-modules/mathcomp/default.nix @@ -1,265 +1,93 @@ -############################# -# Main derivation: mathcomp # -######################################################################## -# This file mainly provides the `mathcomp` derivation, which is # -# essentially a meta-package containing all core mathcomp libraries # -# (ssreflect fingroup algebra solvable field character). They can be # -# accessed individually through the paththrough attributes of mathcomp # -# bearing the same names (mathcomp.ssreflect, etc). # -# # -# Do not use overrideAttrs, but overrideMathcomp instead, which # -# regenerate a full mathcomp derivation with sub-derivations, and # -# behave the same as `mathcomp_`, described below. # -######################################################################## +############################################################################ +# This file mainly provides the `mathcomp` derivation, which is # +# essentially a meta-package containing all core mathcomp libraries # +# (ssreflect fingroup algebra solvable field character). They can be # +# accessed individually through the passthrough attributes of mathcomp # +# bearing the same names (mathcomp.ssreflect, etc). # +############################################################################ +# Compiling a custom version of mathcomp using `mathcomp.override`. # +# This is the replacement for the former `mathcomp_ config` function. # +# See the documentation at doc/languages-frameworks/coq.section.md. # +############################################################################ -############################################################ -# Compiling a custom version of mathcomp using `mathcomp_` # -############################################################################## -# The prefered way to compile a custom version of mathcomp (other than a # -# released version which should be added to `mathcomp-config-initial` # -# and pushed to nixpkgs), is to apply the function `coqPackages.mathcomp_` # -# to either: # -# - a string without slash, which is interpreted as a github revision, # -# i.e. either a tag, a branch or a commit hash # -# - a string with slashes "owner/p_1/.../p_n", which is interpreted as # -# github owner "owner" and revision "p_1/.../p_n". # -# - a path which is interpreted as a local source for the repository, # -# the name of the version is taken to be the basename of the path # -# i.e. if the path is /home/you/git/package/branch/, # -# then "branch" is the name of the version # -# - an attribute set which overrides some attributes (e.g. the src) # -# if the version is updated, the name is automatically regenerated using # -# the conventional schema "coq${coq.coq-version}-${pkgname}-${version}" # -# - a "standard" override function (old: new_attrs) to override the default # -# attribute set, so that you can use old.${field} to patch the derivation. # -############################################################################## - -######################################################################### -# Example of use: https://github.com/math-comp/math-comp/wiki/Using-nix # -######################################################################### - -################################# -# Adding a new mathcomp version # -############################################################################# -# When adding a new version of mathcomp, add an attribute to `sha256` (use # -# ```sh # -# nix-prefetch-url --unpack # -# https://github.com/math-comp/math-comp/archive/version.tar.gz # -# ``` # -# to get the corresponding `sha256`) and to `coq-version` (read the release # -# notes to check which versions of coq it is compatible with). Then add # -# it in `preference version`, if not all mathcomp-extra packages are # -# ready, you might want to give new release secondary priority. # -############################################################################# - - -{ stdenv, fetchFromGitHub, ncurses, which, graphviz, - recurseIntoAttrs, withDoc ? false, - coqPackages, - mathcomp_, mathcomp, mathcomp-config, -}: -with builtins // stdenv.lib; +{ lib, ncurses, which, graphviz, lua, + mkCoqDerivation, recurseIntoAttrs, withDoc ? false, single ? false, + coqPackages, coq, ocamlPackages, version ? null }@args: +with builtins // lib; let - mathcomp-config-initial = rec { - ####################################################################### - # CONFIGURATION (please edit this), it is exported as mathcomp-config # - ####################################################################### - # sha256 of released mathcomp versions - sha256 = { - "1.12.0" = "1ccfny1vwgmdl91kz5xlmhq4wz078xm4z5wpd0jy5rn890dx03wp"; - "1.11.0" = "06a71d196wd5k4wg7khwqb7j7ifr7garhwkd54s86i0j7d6nhl3c"; - "1.11+beta1" = "12i3zznwajlihzpqsiqniv20rklj8d8401lhd241xy4s21fxkkjm"; - "1.10.0" = "1b9m6pwxxyivw7rgx82gn5kmgv2mfv3h3y0mmjcjfypi8ydkrlbv"; - "1.9.0" = "0lid9zaazdi3d38l8042lczb02pw5m9wq0yysiilx891hgq2p81r"; - "1.8.0" = "07l40is389ih8bi525gpqs3qp4yb2kl11r9c8ynk1ifpjzpnabwp"; - "1.7.0" = "0wnhj9nqpx2bw6n1l4i8jgrw3pjajvckvj3lr4vzjb3my2lbxdd1"; - "1.6.1" = "1ilw6vm4dlsdv9cd7kmf0vfrh2kkzr45wrqr8m37miy0byzr4p9i"; - }; - # versions of coq compatible with released mathcomp versions - coq-versions = { - "1.12.0" = flip elem [ "8.13" ]; - "1.11.0" = flip elem [ "8.7" "8.8" "8.9" "8.10" "8.11" "8.12" ]; - "1.11+beta1" = flip elem [ "8.7" "8.8" "8.9" "8.10" "8.11" "8.12" ]; - "1.10.0" = flip elem [ "8.7" "8.8" "8.9" "8.10" "8.11" ]; - "1.9.0" = flip elem [ "8.7" "8.8" "8.9" "8.10" ]; - "1.8.0" = flip elem [ "8.7" "8.8" "8.9" ]; - "1.7.0" = flip elem [ "8.6" "8.7" "8.8" "8.9" ]; - "1.6.1" = flip elem [ "8.5"]; - }; - - # sets the default version of mathcomp given a version of Coq - # this is currently computed using version-perference below - # but it can be set to a fixed version number - preferred-version = let v = head ( - filter (mc: mathcomp-config.coq-versions.${mc} coq.coq-version) - mathcomp-config.version-preferences ++ ["0.0.0"]); - in if v == "0.0.0" then head mathcomp-config.version-preferences else v; - - # mathcomp preferred versions by decreasing order - # (the first version in the list will be tried first) - version-preferences = - [ "1.12.0" "1.10.0" "1.11.0" "1.9.0" "1.8.0" "1.7.0" "1.6.1" ]; - - # list of core mathcomp packages sorted by dependency order - packages = _version: # unused in current versions of mathcomp - # because the following list of packages is fixed for - # all versions of mathcomp up to 1.11.0 - [ "ssreflect" "fingroup" "algebra" "solvable" "field" "character" "all" ]; - - # compute the dependencies of the core package pkg - # (assuming the total ordering above, change if necessary) - deps = version: pkg: if pkg == "single" then [] else - (pred-split-list (x: x == pkg) (mathcomp-config.packages version)).left; + repo = "math-comp"; + owner = "math-comp"; + withDoc = single && (args.withDoc or false); + defaultVersion = with versions; switch coq.coq-version [ + { case = isGe "8.13"; out = "1.12.0"; } # lower version of coq to 8.10 when all mathcomp packages are ported + { case = range "8.7" "8.12"; out = "1.11.0"; } + { case = range "8.7" "8.11"; out = "1.10.0"; } + { case = range "8.7" "8.11"; out = "1.9.0"; } + { case = range "8.7" "8.9"; out = "1.8.0"; } + { case = range "8.6" "8.9"; out = "1.7.0"; } + { case = range "8.5" "8.7"; out = "1.6.4"; } + ] null; + release = { + "1.12.0".sha256 = "1ccfny1vwgmdl91kz5xlmhq4wz078xm4z5wpd0jy5rn890dx03wp"; + "1.11.0".sha256 = "06a71d196wd5k4wg7khwqb7j7ifr7garhwkd54s86i0j7d6nhl3c"; + "1.10.0".sha256 = "1b9m6pwxxyivw7rgx82gn5kmgv2mfv3h3y0mmjcjfypi8ydkrlbv"; + "1.9.0".sha256 = "0lid9zaazdi3d38l8042lczb02pw5m9wq0yysiilx891hgq2p81r"; + "1.8.0".sha256 = "07l40is389ih8bi525gpqs3qp4yb2kl11r9c8ynk1ifpjzpnabwp"; + "1.7.0".sha256 = "0wnhj9nqpx2bw6n1l4i8jgrw3pjajvckvj3lr4vzjb3my2lbxdd1"; + "1.6.4".sha256 = "09ww48qbjsvpjmy1g9yhm0rrkq800ffq21p6fjkbwd34qvd82raz"; + "1.6.1".sha256 = "1ilw6vm4dlsdv9cd7kmf0vfrh2kkzr45wrqr8m37miy0byzr4p9i"; }; + releaseRev = v: "mathcomp-${v}"; - ############################################################## - # COMPUTED using the configuration above (edit with caution) # - ############################################################## + # list of core mathcomp packages sorted by dependency order + packages = [ "ssreflect" "fingroup" "algebra" "solvable" "field" "character" "all" ]; - # generic split function (TODO: move to lib?) - pred-split-list = pred: l: - let loop = v: l: if l == [] then {left = v; right = [];} - else let hd = builtins.head l; tl = builtins.tail l; in - if pred hd then {left = v; right = tl;} else loop (v ++ [hd]) tl; - in loop [] l; - - pkgUp = l: r: l // r // { - meta = (l.meta or {}) // (r.meta or {}); - passthru = (l.passthru or {}) // (r.passthru or {}); - }; - - coq = coqPackages.coq; - mathcomp-deps = mathcomp-config.deps mathcomp.config.preferred-version; - - # default set of attributes given a 'package' name. - # this attribute set will be extended using toOverrideFun - default-attrs = package: - let + mathcomp_ = package: let + mathcomp-deps = if package == "single" then [] + else map mathcomp_ (head (splitList (pred.equal package) packages)); pkgpath = if package == "single" then "mathcomp" else "mathcomp/${package}"; - pkgname = if package == "single" then "mathcomp" else "mathcomp-${package}"; + pname = if package == "single" then "mathcomp" else "mathcomp-${package}"; pkgallMake = '' echo "all.v" > Make echo "-I ." >> Make echo "-R . mathcomp.all" >> Make ''; - in - rec { - version = "master"; - name = "coq${coq.coq-version}-${pkgname}-${version}"; + derivation = mkCoqDerivation ({ + inherit version pname defaultVersion release releaseRev repo owner; - nativeBuildInputs = optionals withDoc [ graphviz ]; - buildInputs = [ ncurses which ] ++ (with coq.ocamlPackages; [ ocaml findlib camlp5 ]); - propagatedBuildInputs = [ coq ]; - enableParallelBuilding = true; + nativeBuildInputs = optional withDoc graphviz; + mlPlugin = versions.isLe "8.6" coq.coq-version; + extraBuildInputs = [ ncurses which ] ++ optional withDoc lua; + propagatedBuildInputs = mathcomp-deps; buildFlags = optional withDoc "doc"; - COQBIN = "${coq}/bin/"; - preBuild = '' patchShebangs etc/utils/ssrcoqdep || true + '' + '' cd ${pkgpath} '' + optionalString (package == "all") pkgallMake; - installPhase = '' - make -f Makefile.coq COQLIB=$out/lib/coq/${coq.coq-version}/ install - '' + optionalString withDoc '' - make -f Makefile.coq install-doc DOCDIR=$out/share/coq/${coq.coq-version}/ - ''; + installTargets = "install" + optionalString withDoc " doc"; - meta = with stdenv.lib; { + meta = { homepage = "https://math-comp.github.io/"; license = licenses.cecill-b; - maintainers = [ maintainers.vbgl maintainers.jwiegley maintainers.cohencyril ]; - platforms = coq.meta.platforms; + maintainers = with maintainers; [ vbgl jwiegley cohencyril ]; }; - - passthru = { - mathcompDeps = mathcomp-deps package; - inherit package mathcomp-config; - compatibleCoqVersions = _: true; - }; - }; - - # converts a string, path or attribute set into an override function - toOverrideFun = overrides: - if isFunction overrides then overrides else old: - let - pkgname = if old.passthru.package == "single" then "mathcomp" - else "mathcomp-${old.passthru.package}"; - - string-attrs = if hasAttr overrides mathcomp-config.sha256 then - let version = overrides; - in { - inherit version; - src = fetchFromGitHub { - owner = "math-comp"; - repo = "math-comp"; - rev = "mathcomp-${version}"; - sha256 = mathcomp-config.sha256.${version}; - }; - passthru = old.passthru // { - compatibleCoqVersions = mathcomp-config.coq-versions.${version}; - mathcompDeps = mathcomp-config.deps version old.passthru.package; - }; - } - else - let splitted = filter isString (split "/" overrides); - owner = head splitted; - ref = concatStringsSep "/" (tail splitted); - version = head (reverseList splitted); - in if length splitted == 1 then { - inherit version; - src = fetchTarball "https://github.com/math-comp/math-comp/archive/${version}.tar.gz"; - } else { - inherit version; - src = fetchTarball "https://github.com/${owner}/math-comp/archive/${ref}.tar.gz"; - }; - - attrs = - if overrides == null || overrides == "" then _: {} - else if isString overrides then string-attrs - else if isPath overrides then { version = baseNameOf overrides; src = overrides; } - else if isAttrs overrides then pkgUp old overrides - else let overridesStr = toString overrides; in - abort "${overridesStr} not a legitimate overrides"; - in - attrs // (if attrs?version && ! (attrs?name) - then { name = "coq${coq.coq-version}-${pkgname}-${attrs.version}"; } else {}); - - # generates {ssreflect = «derivation ...» ; ... ; character = «derivation ...», ...} - mkMathcompGenSet = pkgs: o: - fold (pkg: pkgs: pkgs // {${pkg} = mkMathcompGen pkg o;}) {} pkgs; - # generates the derivation of one mathcomp package. - mkMathcompGen = package: overrides: - let - up = x: o: x // (toOverrideFun o x); - fixdeps = attrs: - let version = attrs.version or "master"; - mcdeps = if package == "single" then {} - else mkMathcompGenSet (filter isString attrs.passthru.mathcompDeps) overrides; - allmc = mkMathcompGenSet (mathcomp-config.packages version ++ [ "single" ]) overrides; - in { - propagatedBuildInputs = [ coq ] - ++ filter isDerivation attrs.passthru.mathcompDeps - ++ attrValues mcdeps - ; - passthru = allmc // - { overrideMathcomp = o: mathcomp_ (old: up (up old overrides) o); }; - }; - in - stdenv.mkDerivation (up (up (default-attrs package) overrides) fixdeps); + } // optionalAttrs (package != "single") { passthru = genAttrs packages mathcomp_; }); + patched-derivation1 = derivation.overrideAttrs (o: + optionalAttrs (o.pname != null && o.pname == "mathcomp-all" && + o.version != null && o.version != "dev" && versions.isLt "1.7" o.version) + { preBuild = ""; buildPhase = ""; installPhase = "echo doing nothing"; } + ); + patched-derivation = patched-derivation1.overrideAttrs (o: + optionalAttrs (versions.isLe "8.7" coq.coq-version || + (o.version != "dev" && versions.isLe "1.7" o.version)) + { + installFlags = o.installFlags ++ [ "-f Makefile.coq" ]; + } + ); + in patched-derivation; in -{ - mathcomp-config = mathcomp-config-initial; - mathcomp_ = mkMathcompGen "all"; - mathcomp = mathcomp_ mathcomp-config.preferred-version; - # mathcomp-single = mathcomp.single; - ssreflect = mathcomp.ssreflect; - mathcomp-ssreflect = mathcomp.ssreflect; - mathcomp-fingroup = mathcomp.fingroup; - mathcomp-algebra = mathcomp.algebra; - mathcomp-solvable = mathcomp.solvable; - mathcomp-field = mathcomp.field; - mathcomp-character = mathcomp.character; -} +mathcomp_ (if single then "single" else "all") diff --git a/pkgs/development/coq-modules/mathcomp/extra.nix b/pkgs/development/coq-modules/mathcomp/extra.nix deleted file mode 100644 index 6a2dfcda3456..000000000000 --- a/pkgs/development/coq-modules/mathcomp/extra.nix +++ /dev/null @@ -1,391 +0,0 @@ -########################################################## -# Main derivation: # -# mathcomp-finmap mathcomp-analysis mathcomp-bigenough # -# mathcomp-multinomials mathcomp-real-closed coqeal # -# Additionally: # -# mathcomp-extra-all contains all the extra packages # -# mathcomp-extra-fast contains the one not marked slow # -######################################################################## -# This file mainly provides the above derivations, which are packages # -# extra mathcomp libraries based on mathcomp. # -######################################################################## - -##################################################### -# Compiling customs versions using `mathcomp-extra` # -############################################################################## -# The prefered way to compile a custom version of mathcomp extra packages # -# (other than released versions which should be added to # -# `rec-mathcomp-extra-config` and pushed to nixpkgs, see below), # -# is to use `coqPackages.mathcomp-extra name version` where # -# 1. `name` is a string representing the name of a declared package # -# OR undeclared package. # -# 2. `version` is either: # -# - a string without slash, which is interpreted as a github revision, # -# i.e. either a tag, a branch or a commit hash # -# - a string with slashes "owner/p_1/.../p_n", which is interpreted as # -# github owner "owner" and revision "p_1/.../p_n". # -# - a path which is interpreted as a local source for the repository, # -# the name of the version is taken to be the basename of the path # -# i.e. if the path is /home/you/git/package/branch/, # -# then "branch" is the name of the version # -# - an attribute set which overrides some attributes (e.g. the src) # -# if the version is updated, the name is automatically regenerated using # -# the conventional schema "coq${coq.coq-version}-${pkgname}-${version}" # -# - a "standard" override function (old: new_attrs) to override the default # -# attribute set, so that you can use old.${field} to patch the derivation. # -# # -# Should you choose to use `pkg.overrideAttrs` instead, we provide the # -# function mathcomp-extra-override which takes a name and a version exactly # -# as above and returns an override function. # -############################################################################## - -######################################################################### -# Example of use: https://github.com/math-comp/math-comp/wiki/Using-nix # -######################################################################### - -########################################### -# Adding a new package or package version # -################################################################################ -# 1. Update or add a `package` entry to `initial`, it must be a function # -# taking the version as argument and returning an attribute set. Everything # -# is optional and the default for the sources of the repository and the # -# homepage will be https://github.com/math-comp/${package}. # -# # -# 2. Update or add a `package` entry to `sha256` for each release. # -# You may use # -# ```sh # -# nix-prefetch-url --unpack # -# https://github.com/math-comp/math-comp/archive/version.tar.gz # -# ``` # -# # -# 3. Update or create a new consistent set of extra packages. # -# /!\ They must all be co-compatible. /!\ # -# Do not use versions that may disappear: it must either be # -# - a tag from the main repository (e.g. version or tag), or # -# - a revision hash that has been *merged in master* # -################################################################################ - -{ stdenv, fetchFromGitHub, recurseIntoAttrs, - which, mathcomp, coqPackages, - mathcomp-extra-config, mathcomp-extra-override, - mathcomp-extra, current-mathcomp-extra, -}: -with builtins // stdenv.lib; -let - ############################## - # CONFIGURATION, please edit # - ############################## - ############################ - # Packages base delaration # - ############################ - rec-mathcomp-extra-config = { - initial = { - mathcomp-finmap = {version, coqPackages}: { - meta = { - description = "A finset and finmap library"; - repo = "finmap"; - homepage = "https://github.com/math-comp/finmap"; - }; - passthru.compatibleCoqVersions = flip elem [ "8.8" "8.9" "8.10" "8.11" ]; - }; - - mathcomp-bigenough = {version, coqPackages}: { - meta = { - description = "A small library to do epsilon - N reasonning"; - repo = "bigenough"; - homepage = "https://github.com/math-comp/bigenough"; - }; - passthru.compatibleCoqVersions = flip elem [ "8.7" "8.8" "8.9" "8.10" "8.11" ]; - }; - - multinomials = {version, coqPackages}: { - buildInputs = [ which ]; - propagatedBuildInputs = with coqPackages; - [ mathcomp.algebra mathcomp-finmap mathcomp-bigenough ]; - meta = { - description = "A Coq/SSReflect Library for Monoidal Rings and Multinomials"; - repo = "multinomials"; - homepage = "https://github.com/math-comp/multinomials"; - }; - passthru.compatibleCoqVersions = flip elem [ "8.9" "8.10" "8.11" ]; - }; - - mathcomp-analysis = {version, coqPackages}: { - propagatedBuildInputs = with coqPackages; - [ mathcomp.field mathcomp-finmap mathcomp-bigenough mathcomp-real-closed ]; - meta = { - description = "Analysis library compatible with Mathematical Components"; - homepage = "https://github.com/math-comp/analysis"; - repo = "analysis"; - license = stdenv.lib.licenses.cecill-c; - }; - passthru.compatibleCoqVersions = flip elem ["8.8" "8.9" "8.10" "8.11" ]; - }; - - mathcomp-real-closed = {version, coqPackages}: { - propagatedBuildInputs = with coqPackages; - [ mathcomp.field mathcomp-bigenough ]; - meta = { - description = "Mathematical Components Library on real closed fields"; - repo = "real-closed"; - homepage = "https://github.com/math-comp/real-closed"; - }; - passthru.compatibleCoqVersions = flip elem ["8.8" "8.9" "8.10" "8.11" ]; - }; - - coqeal = {version, coqPackages}: { - buildInputs = [ which ]; - propagatedBuildInputs = with coqPackages; - [ mathcomp-algebra bignums paramcoq multinomials ]; - meta = { - description = "CoqEAL - The Coq Effective Algebra Library"; - homepage = "https://github.com/coqeal/coqeal"; - license = stdenv.lib.licenses.mit; - owner = "CoqEAL"; - }; - passthru.compatibleCoqVersions = flip elem [ "8.9" "8.10" "8.11" ]; - }; - }; - - ############################### - # sha256 of released versions # - ############################### - sha256 = { - mathcomp-finmap = { - "1.5.0" = "0vx9n1fi23592b3hv5p5ycy7mxc8qh1y5q05aksfwbzkk5zjkwnq"; - "1.4.1" = "0kx4nx24dml1igk0w0qijmw221r5bgxhwhl5qicnxp7ab3c35s8p"; - "1.4.0+coq-8.11" = "1fd00ihyx0kzq5fblh9vr8s5mr1kg7p6pk11c4gr8svl1n69ppmb"; - "1.4.0" = "0mp82mcmrs424ff1vj3cvd8353r9vcap027h3p0iprr1vkkwjbzd"; - "1.3.4" = "0f5a62ljhixy5d7gsnwd66gf054l26k3m79fb8nz40i2mgp6l9ii"; - "1.3.3" = "1n844zjhv354kp4g4pfbajix0plqh7yxv6471sgyb46885298am5"; - "1.3.1" = "14rvm0rm5hd3pd0srgak3jqmddzfv6n7gdpjwhady5xcgrc7gsx7"; - "1.2.1" = "0jryb5dq8js3imbmwrxignlk5zh8gwfb1wr4b1s7jbwz410vp7zf"; - "1.2.0" = "0b6wrdr0d7rcnv86s37zm80540jl2wmiyf39ih7mw3dlwli2cyj4"; - "1.1.0" = "05df59v3na8jhpsfp7hq3niam6asgcaipg2wngnzxzqnl86srp2a"; - "1.0.0" = "0sah7k9qm8sw17cgd02f0x84hki8vj8kdz7h15i7rmz08rj0whpa"; - }; - mathcomp-bigenough = { - "1.0.0" = "10g0gp3hk7wri7lijkrqna263346wwf6a3hbd4qr9gn8hmsx70wg"; - }; - mathcomp-analysis = { - "0.3.1" = "1iad288yvrjv8ahl9v18vfblgqb1l5z6ax644w49w9hwxs93f2k8"; - "0.3.0" = "03klwi4fja0cqb4myp3kgycfbmdv00bznmxf8yg3zzzzw997hjqc"; - "0.2.3" = "0p9mr8g1qma6h10qf7014dv98ln90dfkwn76ynagpww7qap8s966"; - "0.2.2" = "1d5dwg9di2ppdzfg21zr0a691zigb5kz0lcw263jpyli1nrq7cvk"; - "0.2.0" = "1186xjxgns4ns1szyi931964bjm0mp126qzlv10mkqqgfw07nhrd"; - "0.1.0" = "0hwkr2wzy710pcyh274fcarzdx8sv8myp16pv0vq5978nmih46al"; - }; - multinomials = { - "1.5.2" = "15aspf3jfykp1xgsxf8knqkxv8aav2p39c2fyirw7pwsfbsv2c4s"; - "1.5.1" = "13nlfm2wqripaq671gakz5mn4r0xwm0646araxv0nh455p9ndjs3"; - "1.5" = "064rvc0x5g7y1a0nip6ic91vzmq52alf6in2bc2dmss6dmzv90hw"; - "1.4" = "0vnkirs8iqsv8s59yx1fvg1nkwnzydl42z3scya1xp1b48qkgn0p"; - "1.3" = "0l3vi5n094nx3qmy66hsv867fnqm196r8v605kpk24gl0aa57wh4"; - "1.2" = "1mh1w339dslgv4f810xr1b8v2w7rpx6fgk9pz96q0fyq49fw2xcq"; - "1.1" = "1q8alsm89wkc0lhcvxlyn0pd8rbl2nnxg81zyrabpz610qqjqc3s"; - "1.0" = "1qmbxp1h81cy3imh627pznmng0kvv37k4hrwi2faa101s6bcx55m"; - }; - mathcomp-real-closed = { - "1.1.1" = "0ksjscrgq1i79vys4zrmgvzy2y4ylxa8wdsf4kih63apw6v5ws6b"; - "1.1.0" = "0zgfmrlximw77bw5w6w0xg2nampp02pmrwnrzx8m1n5pqljnv8fh"; - "1.0.5" = "0q8nkxr9fba4naylr5xk7hfxsqzq2pvwlg1j0xxlhlgr3fmlavg2"; - "1.0.4" = "058v9dj973h9kfhqmvcy9a6xhhxzljr90cf99hdfcdx68fi2ha1b"; - "1.0.3" = "1xbzkzqgw5p42dx1liy6wy8lzdk39zwd6j14fwvv5735k660z7yb"; - "1.0.2" = "0097pafwlmzd0gyfs31bxpi1ih04i72nxhn99r93aj20mn7mcsgl"; - "1.0.1" = "0j81gkjbza5vg89v4n9z598mfdbql416963rj4b8fzm7dp2r4rxg"; - }; - coqeal = { - "1.0.4" = "1g5m26lr2lwxh6ld2gykailhay4d0ayql4bfh0aiwqpmmczmxipk"; - "1.0.3" = "0hc63ny7phzbihy8l7wxjvn3haxx8jfnhi91iw8hkq8n29i23v24"; - "1.0.2" = "1brmf3gj03iky1bcl3g9vx8vknny7xfvs0y2rfr85am0296sxsfj"; - "1.0.1" = "19jhdrv2yp9ww0h8q73ihb2w1z3glz4waf2d2n45klafxckxi7bm"; - "1.0.0" = "1had6f1n85lmh9x31avbmgl3m0rsiw9f8ma95qzk5b57fjg5k1ii"; - }; - }; - - ################################ - # CONSISTENT sets of packages. # - ################################ - for-coq-and-mc = let - v6 = { - mathcomp-finmap = "1.5.0"; - mathcomp-bigenough = "1.0.0"; - mathcomp-analysis = "0.3.1"; - multinomials = "1.5.2"; - mathcomp-real-closed = "1.1.1"; - coqeal = "1.0.4"; - }; - v5 = { - mathcomp-finmap = "1.5.0"; - mathcomp-bigenough = "1.0.0"; - mathcomp-analysis = "0.3.0"; - multinomials = "1.5.1"; - mathcomp-real-closed = "1.0.5"; - coqeal = "1.0.4"; - }; - v4 = v3 // { coqeal = "1.0.3"; }; - v3 = { - mathcomp-finmap = "1.4.0"; - mathcomp-bigenough = "1.0.0"; - mathcomp-analysis = "0.2.3"; - multinomials = "1.5"; - mathcomp-real-closed = "1.0.4"; - coqeal = "1.0.0"; - }; - v2 = { - mathcomp-finmap = "1.3.4"; - mathcomp-bigenough = "1.0.0"; - mathcomp-analysis = "0.2.3"; - multinomials = "1.4"; - mathcomp-real-closed = "1.0.3"; - coqeal = "1.0.0"; - }; - v1 = { - mathcomp-finmap = "1.1.0"; - mathcomp-bigenough = "1.0.0"; - multinomials = "1.1"; - mathcomp-real-closed = "1.0.1"; - coqeal = "1.0.0"; - }; - in - { - "8.11" = { - "1.11.0" = v6; - "1.11+beta1" = v5; - "1.10.0" = v4 // {mathcomp-finmap = "1.4.0+coq-8.11";}; - }; - "8.10" = { - "1.11.0" = removeAttrs v6 ["coqeal"]; - "1.11+beta1" = removeAttrs v5 ["coqeal"]; - "1.10.0" = v4; - "1.9.0" = removeAttrs v3 ["coqeal"]; - }; - "8.9" = { - "1.11.0" = removeAttrs v6 ["mathcomp-analysis"]; - "1.11+beta1" = removeAttrs v5 ["mathcomp-analysis"]; - "1.10.0" = v4; - "1.9.0" = removeAttrs v3 ["coqeal"]; - "1.8.0" = removeAttrs v2 ["coqeal"]; - }; - "8.8" = { - "1.11.0" = removeAttrs v6 ["mathcomp-analysis"]; - "1.11+beta1" = removeAttrs v5 ["mathcomp-analysis"]; - "1.10.0" = removeAttrs v4 ["mathcomp-analysis"]; - "1.9.0" = removeAttrs v3 ["coqeal"]; - "1.8.0" = removeAttrs v2 ["coqeal"]; - "1.7.0" = removeAttrs v1 ["coqeal" "multinomials"]; - }; - "8.7" = { - "1.11.0" = removeAttrs v6 ["mathcomp-analysis"]; - "1.11+beta1" = removeAttrs v5 ["mathcomp-analysis"]; - "1.10.0" = removeAttrs v4 ["mathcomp-analysis"]; - "1.9.0" = removeAttrs v3 ["coqeal" "mathcomp-analysis"]; - "1.8.0" = removeAttrs v2 ["coqeal" "mathcomp-analysis"]; - "1.7.0" = removeAttrs v1 ["coqeal" "multinomials"]; - }; - }; - }; - - ############################## - # GENERATION, EDIT WITH CARE # - ############################## - coq = coqPackages.coq; - - default-attrs = { - version = "master"; - buildInputs = []; - propagatedBuildInputs = (with coqPackages; [ ssreflect ]); - installFlags = [ "-f" "Makefile.coq" "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ]; - meta = { - inherit (mathcomp.meta) platforms license; - owner = "math-comp"; - maintainers = [ maintainers.vbgl maintainers.cohencyril ]; - }; - passthru.compatibleCoqVersions = (_: true); - }; - - pkgUp = recursiveUpdateUntil (path: l: r: !(isAttrs l && isAttrs r) || path == ["src"]); - - # Fixes a partial attribute set using the configuration - # in the style of the above mathcomp-extra-config.initial, - # and generates a name according to the conventional naming scheme below - fix-attrs = pkgcfg: - let attrs = pkgUp default-attrs pkgcfg; in - pkgUp attrs (rec { - name = "coq${coq.coq-version}mathcomp${mathcomp.version}-${attrs.meta.repo or attrs.meta.package or "anonymous"}-${attrs.version}"; - src = attrs.src or (fetchTarball "${meta.homepage}/archive/${attrs.version}.tar.gz"); - meta = rec { - homepage = attrs.meta.homepage or attrs.src.meta.homepage or "https://github.com/${owner}/${repo}"; - owner = attrs.meta.owner or "math-comp"; - repo = attrs.meta.repo or attrs.meta.package or "math-comp-nix"; - }; - }); - - # Gets a version out of a string, path or attribute set. - getVersion = arg: - if isFunction arg then (arg {}).version - else if arg == "" then "master" - else if isDerivation arg then arg.drvAttrs.version or "master" - else if isAttrs arg then arg.version or "master" - else if isString arg then head (reverseList (split "/" arg)) - else if isPath arg then (baseNameOf arg) - else "master"; - - # Converts a string, path or attribute set into an override function - # It tries to fill the `old` argument of the override function using - # `mathcomp-extra-config.initial` first and finishes with `fix-attrs` - rec-mathcomp-extra-override = generic: old: let - version = getVersion generic; - package = old.meta.package or "math-comp-nix"; - cfg = pkgUp ((mathcomp-extra-config.initial.${package} or (_: {})) - { inherit version coqPackages; }) old - // { inherit version; }; - fix = attrs: fix-attrs (pkgUp cfg attrs); - in - if isFunction generic then fix (generic cfg) - else if generic == null || generic == "" then fix {} - else if isDerivation generic then generic.drvAttrs - else if isAttrs generic then fix generic - else if generic == "broken" then fix { meta.broken = true; passthru.compatibleCoqVersions = _: false; } - else let fixedcfg = fix cfg; in fixedcfg // ( - if isString generic then - if (mathcomp-extra-config.sha256.${package} or {})?${generic} then { - src = fetchFromGitHub { - inherit (fixedcfg.meta) owner repo; - rev = version; - sha256 = mathcomp-extra-config.sha256.${package}.${version}; - }; - } - else let splitted = filter isString (split "/" generic); in { - src = fetchTarball - ("https://github.com/" + - (if length splitted == 1 then "${fixedcfg.meta.owner}/${fixedcfg.meta.repo}/archive/${version}.tar.gz" - else "${head splitted}/${fixedcfg.meta.repo}/archive/${concatStringsSep "/" (tail splitted)}.tar.gz")); - } - else if isPath generic then { src = generic; } - else abort "${toString generic} not a legitimate generic version/override"); - - # applies mathcomp-extra-config.for-coq-and-mc to the current mathcomp version - for-this = mathcomp-extra-config.for-coq-and-mc.${coq.coq-version}.${mathcomp.version} or {}; - - # specializes mathcomp-extra to the current mathcomp version. - rec-current-mathcomp-extra = package: mathcomp-extra package (for-this.${package} or {}); -in - { - mathcomp-extra-override = rec-mathcomp-extra-override; - mathcomp-extra-config = rec-mathcomp-extra-config; - current-mathcomp-extra = rec-current-mathcomp-extra; - mathcomp-extra = package: version: - stdenv.mkDerivation (mathcomp-extra-override version {meta = {inherit package;};}); - - mathcomp-finmap = current-mathcomp-extra "mathcomp-finmap"; - mathcomp-analysis = current-mathcomp-extra "mathcomp-analysis"; - mathcomp-bigenough = current-mathcomp-extra "mathcomp-bigenough"; - multinomials = current-mathcomp-extra "multinomials"; - mathcomp-real-closed = current-mathcomp-extra "mathcomp-real-closed"; - coqeal = current-mathcomp-extra "coqeal"; - - mathcomp-extra-fast = map current-mathcomp-extra - (attrNames (filterAttrs (pkg: config: !(config?slow && config.slow)) for-this)); - mathcomp-extra-all = map current-mathcomp-extra (attrNames for-this); - } diff --git a/pkgs/development/coq-modules/metalib/default.nix b/pkgs/development/coq-modules/metalib/default.nix index 862184c1460c..3ce3c625d268 100644 --- a/pkgs/development/coq-modules/metalib/default.nix +++ b/pkgs/development/coq-modules/metalib/default.nix @@ -1,33 +1,18 @@ -{ stdenv, fetchFromGitHub, coq }: +{ lib, mkCoqDerivation, coq, version ? null }: -stdenv.mkDerivation rec { - name = "coq${coq.coq-version}-metalib-${version}"; - version = "20200527"; - - src = fetchFromGitHub { - owner = "plclub"; - repo = "metalib"; - rev = "597fd7d0c93eb159274e84a39d554f10f1efccf8"; - sha256 = "0wbypc05d2lqfm9qaw98ynr5yc1p0ipsvyc3bh1rk9nz7zwirmjs"; - }; +with lib; mkCoqDerivation { + pname = "metalib"; + owner = "plclub"; + inherit version; + defaultVersion = if versions.range "8.10" "8.12" coq.coq-version then "20200527" else null; + release."20200527".rev = "597fd7d0c93eb159274e84a39d554f10f1efccf8"; + release."20200527".sha256 = "0wbypc05d2lqfm9qaw98ynr5yc1p0ipsvyc3bh1rk9nz7zwirmjs"; sourceRoot = "source/Metalib"; - - buildInputs = [ coq ]; - - enableParallelBuilding = true; - installFlags = "COQMF_COQLIB=$(out)/lib/coq/${coq.coq-version}"; - meta = with stdenv.lib; { - homepage = "https://github.com/plclub/metalib"; + meta = { license = licenses.mit; maintainers = [ maintainers.jwiegley ]; - platforms = coq.meta.platforms; }; - - passthru = { - compatibleCoqVersions = v: builtins.elem v [ "8.10" "8.11" "8.12" ]; - }; - } diff --git a/pkgs/development/coq-modules/multinomials/default.nix b/pkgs/development/coq-modules/multinomials/default.nix new file mode 100644 index 000000000000..4958ad893e92 --- /dev/null +++ b/pkgs/development/coq-modules/multinomials/default.nix @@ -0,0 +1,34 @@ +{ coq, mkCoqDerivation, mathcomp, mathcomp-finmap, mathcomp-bigenough, + lib, version ? null }: +with lib; mkCoqDerivation { + + namePrefix = [ "coq" "mathcomp" ]; + pname = "multinomials"; + owner = "math-comp"; + inherit version; + defaultVersion = with versions; switch [ coq.version mathcomp.version ] [ + { cases = [ (range "8.7" "8.12") "1.11.0" ]; out = "1.5.2"; } + { cases = [ (range "8.7" "8.11") (range "1.8" "1.10") ]; out = "1.5.0"; } + { cases = [ (range "8.7" "8.10") (range "1.8" "1.10") ]; out = "1.4"; } + { cases = [ "8.6" (range "1.6" "1.7") ]; out = "1.1"; } + ] null; + release = { + "1.5.2".sha256 = "15aspf3jfykp1xgsxf8knqkxv8aav2p39c2fyirw7pwsfbsv2c4s"; + "1.5.1".sha256 = "13nlfm2wqripaq671gakz5mn4r0xwm0646araxv0nh455p9ndjs3"; + "1.5.0".sha256 = "064rvc0x5g7y1a0nip6ic91vzmq52alf6in2bc2dmss6dmzv90hw"; + "1.5.0".rev = "1.5"; + "1.4".sha256 = "0vnkirs8iqsv8s59yx1fvg1nkwnzydl42z3scya1xp1b48qkgn0p"; + "1.3".sha256 = "0l3vi5n094nx3qmy66hsv867fnqm196r8v605kpk24gl0aa57wh4"; + "1.2".sha256 = "1mh1w339dslgv4f810xr1b8v2w7rpx6fgk9pz96q0fyq49fw2xcq"; + "1.1".sha256 = "1q8alsm89wkc0lhcvxlyn0pd8rbl2nnxg81zyrabpz610qqjqc3s"; + "1.0".sha256 = "1qmbxp1h81cy3imh627pznmng0kvv37k4hrwi2faa101s6bcx55m"; + }; + + propagatedBuildInputs = + [ mathcomp.ssreflect mathcomp.algebra mathcomp-finmap mathcomp-bigenough ]; + + meta = { + description = "A Coq/SSReflect Library for Monoidal Rings and Multinomials"; + license = licenses.cecill-c; + }; +} diff --git a/pkgs/development/coq-modules/paco/default.nix b/pkgs/development/coq-modules/paco/default.nix index ac6eef2f3bd0..900e52f1682b 100644 --- a/pkgs/development/coq-modules/paco/default.nix +++ b/pkgs/development/coq-modules/paco/default.nix @@ -1,42 +1,16 @@ -{stdenv, fetchFromGitHub, coq, unzip}: +{ lib, mkCoqDerivation, coq, version ? null }: -let - versions = { - pre_8_6 = rec { - rev = "v${version}"; - version = "1.2.8"; - sha256 = "05fskx5x1qgaf9qv626m38y5izichzzqc7g2rglzrkygbskrrwsb"; - }; - post_8_6 = rec { - rev = "v${version}"; - version = "4.0.2"; - sha256 = "1q96bsxclqx84xn5vkid501jkwlc1p6fhb8szrlrp82zglj58b0b"; - }; - }; - params = { - "8.5" = versions.pre_8_6; - "8.6" = versions.post_8_6; - "8.7" = versions.post_8_6; - "8.8" = versions.post_8_6; - "8.9" = versions.post_8_6; - "8.10" = versions.post_8_6; - "8.11" = versions.post_8_6; - "8.12" = versions.post_8_6; - }; - param = params.${coq.coq-version}; -in - -stdenv.mkDerivation rec { - inherit (param) version; - name = "coq${coq.coq-version}-paco-${version}"; - - src = fetchFromGitHub { - inherit (param) rev sha256; - owner = "snu-sf"; - repo = "paco"; - }; - - buildInputs = [ coq ]; +with lib; mkCoqDerivation { + pname = "paco"; + owner = "snu-sf"; + inherit version; + defaultVersion = with versions; switch coq.coq-version [ + { case = isGe "8.6"; out = "4.0.2"; } + { case = range "8.5" "8.8"; out = "1.2.8"; } + ] null; + release."4.0.2".sha256 = "1q96bsxclqx84xn5vkid501jkwlc1p6fhb8szrlrp82zglj58b0b"; + release."1.2.8".sha256 = "05fskx5x1qgaf9qv626m38y5izichzzqc7g2rglzrkygbskrrwsb"; + releaseRev = v: "v${v}"; preBuild = "cd src"; @@ -46,15 +20,9 @@ stdenv.mkDerivation rec { cp -pR *.vo $COQLIB/user-contrib/Paco ''; - meta = with stdenv.lib; { + meta = { homepage = "http://plv.mpi-sws.org/paco/"; description = "A Coq library implementing parameterized coinduction"; maintainers = with maintainers; [ jwiegley ptival ]; - platforms = coq.meta.platforms; }; - - passthru = { - compatibleCoqVersions = stdenv.lib.flip builtins.hasAttr params; - }; - } diff --git a/pkgs/development/coq-modules/paramcoq/default.nix b/pkgs/development/coq-modules/paramcoq/default.nix index 12d65bdb3d7b..342e4225a3c2 100644 --- a/pkgs/development/coq-modules/paramcoq/default.nix +++ b/pkgs/development/coq-modules/paramcoq/default.nix @@ -1,58 +1,22 @@ -{ stdenv, fetchFromGitHub, coq }: - -let params = - { - "8.7" = { - sha256 = "09n0ky7ldb24by7yf5j3hv410h85x50ksilf7qacl7xglj4gy5hj"; - buildInputs = [ coq.ocamlPackages.camlp5 ]; - }; - "8.8" = { - sha256 = "0rc4lshqvnfdsph98gnscvpmlirs9wx91qcvffggg73xw0p1g9s0"; - buildInputs = [ coq.ocamlPackages.camlp5 ]; - }; - "8.9" = { - sha256 = "1jjzgpff09xjn9kgp7w69r096jkj0x2ksng3pawrmhmn7clwivbk"; - buildInputs = [ coq.ocamlPackages.camlp5 ]; - }; - "8.10" = { - sha256 = "1lq1mw15w4yky79qg3rm0mpzqi2ir51b6ak04ismrdr7ixky49y8"; - }; - "8.11" = { - sha256 = "09c6813988nvq4fpa45s33k70plnhxsblhm7cxxkg0i37mhvigsa"; - }; - "8.12" = { - sha256 = "0qd72r45if4h7c256qdfiimv75zyrs0w0xqij3m866jxaq591v4i"; - }; - }; - param = params.${coq.coq-version}; -in - -stdenv.mkDerivation rec { - version = "1.1.2"; - name = "coq${coq.coq-version}-paramcoq-${version}"; - src = fetchFromGitHub { - owner = "coq-community"; - repo = "paramcoq"; - rev = "v${version}+coq${coq.coq-version}"; - inherit (param) sha256; - }; - - buildInputs = [ coq ] - ++ (with coq.ocamlPackages; [ ocaml findlib ]) - ++ (param.buildInputs or []) - ; - - installFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ]; - - passthru = { - compatibleCoqVersions = v: builtins.hasAttr v params; - }; +{ lib, mkCoqDerivation, coq, version ? null }: +with lib; mkCoqDerivation { + pname = "paramcoq"; + inherit version; + defaultVersion = if versions.range "8.7" "8.12" coq.coq-version + then "1.1.2+coq${coq.coq-version}" else null; + displayVersion = { paramcoq = "1.1.2"; }; + release."1.1.2+coq8.12".sha256 = "0qd72r45if4h7c256qdfiimv75zyrs0w0xqij3m866jxaq591v4i"; + release."1.1.2+coq8.11".sha256 = "09c6813988nvq4fpa45s33k70plnhxsblhm7cxxkg0i37mhvigsa"; + release."1.1.2+coq8.10".sha256 = "1lq1mw15w4yky79qg3rm0mpzqi2ir51b6ak04ismrdr7ixky49y8"; + release."1.1.2+coq8.9".sha256 = "1jjzgpff09xjn9kgp7w69r096jkj0x2ksng3pawrmhmn7clwivbk"; + release."1.1.2+coq8.8".sha256 = "0rc4lshqvnfdsph98gnscvpmlirs9wx91qcvffggg73xw0p1g9s0"; + release."1.1.2+coq8.7".sha256 = "09n0ky7ldb24by7yf5j3hv410h85x50ksilf7qacl7xglj4gy5hj"; + releaseRev = v: "v${v}"; + mlPlugin = true; meta = { description = "Coq plugin for parametricity"; - inherit (src.meta) homepage; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.vbgl ]; - inherit (coq.meta) platforms; + license = licenses.mit; + maintainers = [ maintainers.vbgl ]; }; } diff --git a/pkgs/development/coq-modules/simple-io/default.nix b/pkgs/development/coq-modules/simple-io/default.nix index 82fa215ee9ca..42d4f782f1cf 100644 --- a/pkgs/development/coq-modules/simple-io/default.nix +++ b/pkgs/development/coq-modules/simple-io/default.nix @@ -1,34 +1,21 @@ -{ stdenv, fetchFromGitHub, coq, coq-ext-lib }: - -stdenv.mkDerivation rec { - version = "1.3.0"; - name = "coq${coq.coq-version}-simple-io-${version}"; - src = fetchFromGitHub { - owner = "Lysxia"; - repo = "coq-simple-io"; - rev = version; - sha256 = "1yp7ca36jyl9kz35ghxig45x6cd0bny2bpmy058359p94wc617ax"; - }; - - buildInputs = [ coq ] ++ (with coq.ocamlPackages; [ ocaml ocamlbuild ]); +{ lib, mkCoqDerivation, coq, coq-ext-lib, version ? null }: +with lib; mkCoqDerivation { + pname = "simple-io"; + owner = "Lysxia"; + repo = "coq-simple-io"; + inherit version; + defaultVersion = if versions.range "8.7" "8.12" coq.coq-version then "1.3.0" else null; + release."1.3.0".sha256 = "1yp7ca36jyl9kz35ghxig45x6cd0bny2bpmy058359p94wc617ax"; + extraBuildInputs = (with coq.ocamlPackages; [ ocaml ocamlbuild ]); propagatedBuildInputs = [ coq-ext-lib ]; doCheck = true; checkTarget = "test"; - installFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ]; - meta = { description = "Purely functional IO for Coq"; - inherit (src.meta) homepage; - inherit (coq.meta) platforms; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.vbgl ]; + license = licenses.mit; + maintainers = [ maintainers.vbgl ]; }; - - passthru = { - compatibleCoqVersions = v: builtins.elem v [ "8.7" "8.8" "8.9" "8.10" "8.11" "8.12" ]; - }; - } diff --git a/pkgs/development/coq-modules/stdpp/default.nix b/pkgs/development/coq-modules/stdpp/default.nix index 28917e73f29f..2caafa9cc555 100644 --- a/pkgs/development/coq-modules/stdpp/default.nix +++ b/pkgs/development/coq-modules/stdpp/default.nix @@ -1,32 +1,17 @@ -{ stdenv, fetchFromGitLab, coq }: +{ lib, mkCoqDerivation, coq, version ? null }: -stdenv.mkDerivation rec { - name = "coq${coq.coq-version}-stdpp-${version}"; - version = "1.4.0"; - src = fetchFromGitLab { - domain = "gitlab.mpi-sws.org"; - owner = "iris"; - repo = "stdpp"; - rev = "coq-stdpp-${version}"; - sha256 = "1m6c7ibwc99jd4cv14v3r327spnfvdf3x2mnq51f9rz99rffk68r"; - }; - - buildInputs = [ coq ]; - - enableParallelBuilding = true; - - installFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ]; +with lib; mkCoqDerivation rec { + pname = "stdpp"; + inherit version; + domain = "gitlab.mpi-sws.org"; + owner = "iris"; + defaultVersion = if versions.range "8.8" "8.12" coq.coq-version then "1.4.0" else null; + release."1.4.0".sha256 = "1m6c7ibwc99jd4cv14v3r327spnfvdf3x2mnq51f9rz99rffk68r"; + releaseRev = v: "coq-stdpp-${v}"; meta = { - inherit (src.meta) homepage; description = "An extended “Standard Library” for Coq"; - inherit (coq.meta) platforms; - license = stdenv.lib.licenses.bsd3; - maintainers = [ stdenv.lib.maintainers.vbgl ]; + license = licenses.bsd3; + maintainers = [ maintainers.vbgl ]; }; - - passthru = { - compatibleCoqVersions = v: builtins.elem v [ "8.8" "8.9" "8.10" "8.11" "8.12" ]; - }; - } diff --git a/pkgs/development/coq-modules/tlc/default.nix b/pkgs/development/coq-modules/tlc/default.nix index 816b22050244..6bbad1c6c2b1 100644 --- a/pkgs/development/coq-modules/tlc/default.nix +++ b/pkgs/development/coq-modules/tlc/default.nix @@ -1,41 +1,23 @@ -{ stdenv, fetchurl, fetchFromGitHub, coq }: +{ lib, mkCoqDerivation, coq, version ? null }: -let params = - if stdenv.lib.versionAtLeast coq.coq-version "8.10" - then rec { - version = "20200328"; - src = fetchFromGitHub { - owner = "charguer"; - repo = "tlc"; - rev = version; - sha256 = "16vzild9gni8zhgb3qhmka47f8zagdh03k6nssif7drpim8233lx"; - }; - } else rec { - version = "20181116"; - src = fetchurl { - url = "http://tlc.gforge.inria.fr/releases/tlc-${version}.tar.gz"; - sha256 = "0iv6f6zmrv2lhq3xq57ipmw856ahsql754776ymv5wjm88ld63nm"; - }; - } -; in - -stdenv.mkDerivation { - inherit (params) version src; - pname = "coq${coq.coq-version}-tlc"; - - buildInputs = [ coq ]; +with lib; mkCoqDerivation { + pname = "tlc"; + owner = "charguer"; + inherit version; + displayVersion = { tlc = false; }; + defaultVersion = with versions; switch coq.coq-version [ + { case = range "8.10" "8.12"; out = "20200328"; } + { case = range "8.6" "8.12"; out = "20181116"; } + ] null; + release."20200328".sha256 = "16vzild9gni8zhgb3qhmka47f8zagdh03k6nssif7drpim8233lx"; + release."20181116".sha256 = "032lrbkxqm9d3fhf6nv1kq2z0mqd3czv3ijlbsjwnfh12xck4vpl"; installFlags = [ "CONTRIB=$(out)/lib/coq/${coq.coq-version}/user-contrib" ]; meta = { homepage = "http://www.chargueraud.org/softs/tlc/"; description = "A non-constructive library for Coq"; - license = stdenv.lib.licenses.free; - maintainers = [ stdenv.lib.maintainers.vbgl ]; - inherit (coq.meta) platforms; - }; - - passthru = { - compatibleCoqVersions = stdenv.lib.flip builtins.elem [ "8.6" "8.7" "8.8" "8.9" "8.10" "8.11" "8.12" ]; + license = licenses.free; + maintainers = [ maintainers.vbgl ]; }; } diff --git a/pkgs/development/dotnet-modules/python-language-server/default.nix b/pkgs/development/dotnet-modules/python-language-server/default.nix index 286037b2cce2..526e93f84c42 100644 --- a/pkgs/development/dotnet-modules/python-language-server/default.nix +++ b/pkgs/development/dotnet-modules/python-language-server/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , fetchurl , makeWrapper @@ -94,7 +94,7 @@ stdenv.mkDerivation { # to find some of the packaged DLLs. dontStrip = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Microsoft Language Server for Python"; homepage = "https://github.com/microsoft/python-language-server"; license = licenses.asl20; diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix index 130387a97b0e..c0f10ab5d8f0 100644 --- a/pkgs/development/go-modules/generic/default.nix +++ b/pkgs/development/go-modules/generic/default.nix @@ -27,9 +27,6 @@ # We want parallel builds by default , enableParallelBuilding ? true -# Disabled flag -, disabled ? false - # Do not enable this without good reason # IE: programs coupled with the compiler , allowGoReference ? false @@ -243,9 +240,7 @@ let [ lib.maintainers.kalbasit ]; }; }); -in if disabled then - throw "${package.name} not supported for go ${go.meta.branch}" -else if (goPackagePath != null) then +in if (goPackagePath != null) then throw "`goPackagePath` not needed with `buildGoModule`" else package diff --git a/pkgs/development/go-packages/generic/default.nix b/pkgs/development/go-packages/generic/default.nix index ab8ee9166f98..3f85b6e0268f 100644 --- a/pkgs/development/go-packages/generic/default.nix +++ b/pkgs/development/go-packages/generic/default.nix @@ -10,9 +10,6 @@ # We want parallel builds by default , enableParallelBuilding ? true -# Disabled flag -, disabled ? false - # Go import path of the package , goPackagePath @@ -249,7 +246,5 @@ let platforms = go.meta.platforms or lib.platforms.all; } // meta; }); -in if disabled then - throw "${package.name} not supported for go ${go.meta.branch}" -else +in package diff --git a/pkgs/development/guile-modules/guile-cairo/default.nix b/pkgs/development/guile-modules/guile-cairo/default.nix index 8864e014c6de..31867d16b4cf 100644 --- a/pkgs/development/guile-modules/guile-cairo/default.nix +++ b/pkgs/development/guile-modules/guile-cairo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, guile, guile-lib, cairo, expat }: +{ lib, stdenv, fetchurl, pkgconfig, guile, guile-lib, cairo, expat }: stdenv.mkDerivation rec { pname = "guile-cairo"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { doCheck = false; # Cannot find unit-test module from guile-lib checkInputs = [ guile-lib ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Cairo bindings for GNU Guile"; longDescription = '' Guile-Cairo wraps the Cairo graphics library for Guile Scheme. diff --git a/pkgs/development/guile-modules/guile-fibers/default.nix b/pkgs/development/guile-modules/guile-fibers/default.nix index 88ba443b6b8a..db16c91c4ef6 100644 --- a/pkgs/development/guile-modules/guile-fibers/default.nix +++ b/pkgs/development/guile-modules/guile-fibers/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, guile, texinfo }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, guile, texinfo }: let version = "1.0.0"; @@ -18,7 +18,7 @@ in stdenv.mkDerivation { autoreconfPhase = "./autogen.sh"; - meta = with stdenv.lib; { + meta = with lib; { description = "Concurrent ML-like concurrency for Guile"; homepage = "https://github.com/wingo/fibers"; license = licenses.lgpl3Plus; diff --git a/pkgs/development/guile-modules/guile-gnome/default.nix b/pkgs/development/guile-modules/guile-gnome/default.nix index 17f03f67cef5..a02da829c7f6 100644 --- a/pkgs/development/guile-modules/guile-gnome/default.nix +++ b/pkgs/development/guile-modules/guile-gnome/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, guile, guile-lib, gwrap +{ fetchurl, lib, stdenv, guile, guile-lib, gwrap , pkgconfig, gconf, glib, gnome_vfs, gtk2 , libglade, libgnome, libgnomecanvas, libgnomeui , pango, guile-cairo, texinfo @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { GUILE_AUTO_COMPILE = 0; - meta = with stdenv.lib; { + meta = with lib; { description = "GNOME bindings for GNU Guile"; longDescription = '' GNU guile-gnome brings the power of Scheme to your graphical application. diff --git a/pkgs/development/guile-modules/guile-lib/default.nix b/pkgs/development/guile-modules/guile-lib/default.nix index 97f501f41db7..6b860bd28da5 100644 --- a/pkgs/development/guile-modules/guile-lib/default.nix +++ b/pkgs/development/guile-modules/guile-lib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, guile, texinfo, pkgconfig }: +{ lib, stdenv, fetchurl, guile, texinfo, pkgconfig }: assert stdenv ? cc && stdenv.cc.isGNU; @@ -24,7 +24,7 @@ in stdenv.mkDerivation { "$(dirname $(echo ${stdenv.cc.cc.lib}/lib*/libgcc_s.so))''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A collection of useful Guile Scheme modules"; longDescription = '' guile-lib is intended as an accumulation place for pure-scheme Guile diff --git a/pkgs/development/guile-modules/guile-ncurses/default.nix b/pkgs/development/guile-modules/guile-ncurses/default.nix index 8f6018582670..eb10c0f1e591 100644 --- a/pkgs/development/guile-modules/guile-ncurses/default.nix +++ b/pkgs/development/guile-modules/guile-ncurses/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, guile, ncurses, libffi }: +{ lib, stdenv, fetchurl, pkgconfig, guile, ncurses, libffi }: let name = "guile-ncurses-${version}"; @@ -28,7 +28,7 @@ in stdenv.mkDerivation { # XXX: 1 of 65 tests failed. doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Scheme interface to the NCurses libraries"; longDescription = '' GNU Guile-Ncurses is a library for the Guile Scheme interpreter that diff --git a/pkgs/development/guile-modules/guile-opengl/default.nix b/pkgs/development/guile-modules/guile-opengl/default.nix index e1e04ecfe699..f05804776533 100644 --- a/pkgs/development/guile-modules/guile-opengl/default.nix +++ b/pkgs/development/guile-modules/guile-opengl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, guile }: +{ lib, stdenv, fetchurl, pkgconfig, guile }: let name = "guile-opengl-${version}"; @@ -13,7 +13,7 @@ in stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig guile ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Guile bindings for the OpenGL graphics API"; homepage = "https://www.gnu.org/software/guile-opengl/"; license = licenses.gpl3Plus; diff --git a/pkgs/development/guile-modules/guile-reader/default.nix b/pkgs/development/guile-modules/guile-reader/default.nix index 392babc096a4..47ef15ef4e20 100644 --- a/pkgs/development/guile-modules/guile-reader/default.nix +++ b/pkgs/development/guile-modules/guile-reader/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig +{ lib, stdenv, fetchurl, fetchpatch, pkgconfig , gperf, guile, guile-lib, libffi }: with stdenv.lib; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-guilemoduledir=$(out)/share/guile/site" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A simple framework for building readers for GNU Guile"; longDescription = '' Guile-Reader is a simple framework for building readers for GNU diff --git a/pkgs/development/guile-modules/guile-sdl/default.nix b/pkgs/development/guile-modules/guile-sdl/default.nix index eff4c699625a..a676f65215d2 100644 --- a/pkgs/development/guile-modules/guile-sdl/default.nix +++ b/pkgs/development/guile-modules/guile-sdl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, guile, buildEnv +{ lib, stdenv, fetchurl, pkgconfig, guile, buildEnv , SDL, SDL_image, SDL_ttf, SDL_mixer }: @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { }; in [ "SDLMINUSI=-I${sdl}/include/SDL" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Guile bindings for SDL"; homepage = "https://www.gnu.org/software/guile-sdl/"; license = licenses.gpl3Plus; diff --git a/pkgs/development/guile-modules/guile-sdl2/default.nix b/pkgs/development/guile-modules/guile-sdl2/default.nix index 061d3c4a1dba..fe1567272cea 100644 --- a/pkgs/development/guile-modules/guile-sdl2/default.nix +++ b/pkgs/development/guile-modules/guile-sdl2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, guile, libtool, pkgconfig +{ lib, stdenv, fetchurl, guile, libtool, pkgconfig , SDL2, SDL2_image, SDL2_ttf, SDL2_mixer }: @@ -28,7 +28,7 @@ in stdenv.mkDerivation { makeFlags = [ "GUILE_AUTO_COMPILE=0" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Bindings to SDL2 for GNU Guile"; homepage = "https://dthompson.us/projects/guile-sdl2.html"; license = licenses.lgpl3Plus; diff --git a/pkgs/development/guile-modules/guile-xcb/default.nix b/pkgs/development/guile-modules/guile-xcb/default.nix index b08d8313930b..d0cc719b6257 100644 --- a/pkgs/development/guile-modules/guile-xcb/default.nix +++ b/pkgs/development/guile-modules/guile-xcb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, guile, texinfo }: +{ lib, stdenv, fetchurl, pkgconfig, guile, texinfo }: let name = "guile-xcb-${version}"; @@ -21,7 +21,7 @@ in stdenv.mkDerivation { "; ''; - meta = with stdenv.lib; { + meta = with lib; { description = "XCB bindings for Guile"; homepage = "http://www.markwitmer.com/guile-xcb/guile-xcb.html"; license = licenses.gpl3Plus; diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index aa3a7386fc9b..8fc6aee0aa1e 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -64,7 +64,7 @@ self: super: { name = "git-annex-${super.git-annex.version}-src"; url = "git://git-annex.branchable.com/"; rev = "refs/tags/" + super.git-annex.version; - sha256 = "1l2syrslba4mrxjzj0iblflz72siw3ibqri6p5hf59fk7rmm30a8"; + sha256 = "0w71kbz127fcli24sxsvd48l5xamwamjwhr18x9alam5cldqkkz1"; }; }).override { dbus = if pkgs.stdenv.isLinux then self.dbus else null; @@ -130,7 +130,8 @@ self: super: { ABList = dontCheck super.ABList; # sse2 flag due to https://github.com/haskell/vector/issues/47. - vector = if pkgs.stdenv.isi686 then appendConfigureFlag super.vector "--ghc-options=-msse2" else super.vector; + # Jailbreak is necessary for QuickCheck dependency. + vector = doJailbreak (if pkgs.stdenv.isi686 then appendConfigureFlag super.vector "--ghc-options=-msse2" else super.vector); conduit-extra = if pkgs.stdenv.isDarwin then super.conduit-extra.overrideAttrs (drv: { __darwinAllowLocalNetworking = true; }) @@ -217,11 +218,24 @@ self: super: { # Generating the completions should be activated again, once we default to # ghc 8.10. hnix = dontCheck (super.hnix.override { - # 2020-09-18: Those packages are all needed by hnix at versions newer than on stackage - prettyprinter = self.prettyprinter_1_7_0; # at least 1.7 + + # 2021-01-07: NOTE: hnix-store-core pinned at ==0.2 in Stackage Nightly. + # https://github.com/haskell-nix/hnix-store/issues/104 + # Until unpin, which may hold off in time due to Stackage maintenence bottleneck + # the 0_4_0_0 is used + hnix-store-core = self.hnix-store-core_0_4_0_0; # at least 1.7 }); + # 2021-01-07: NOTE: hnix-store-core pinned at ==0.2 in Stackage Nightly. + # https://github.com/haskell-nix/hnix-store/issues/104 + # Until unpin, which may hold off in time due to Stackage maintenence bottleneck + # the 0_4_0_0 is used + hnix-store-remote = (super.hnix-store-remote.override { + hnix-store-core = self.hnix-store-core_0_4_0_0; # at least 1.7 + }); + + # Fails for non-obvious reasons while attempting to use doctest. search = dontCheck super.search; @@ -363,9 +377,6 @@ self: super: { punycode = dontCheck super.punycode; pwstore-cli = dontCheck super.pwstore-cli; quantities = dontCheck super.quantities; - QuickCheck_2_14_2 = super.QuickCheck_2_14_2.override( { - splitmix = self.splitmix_0_1_0_3; - }); redis-io = dontCheck super.redis-io; rethinkdb = dontCheck super.rethinkdb; Rlang-QQ = dontCheck super.Rlang-QQ; @@ -399,7 +410,6 @@ self: super: { xsd = dontCheck super.xsd; zip-archive = dontCheck super.zip-archive; # https://github.com/jgm/zip-archive/issues/57 - random_1_2_0 = super.random_1_2_0.override ({ splitmix = self.splitmix_0_1_0_3; }); # These test suites run for ages, even on a fast machine. This is nuts. Random123 = dontCheck super.Random123; systemd = dontCheck super.systemd; @@ -812,11 +822,20 @@ self: super: { # Needs QuickCheck <2.10, HUnit <1.6 and base <4.10 pointfree = doJailbreak super.pointfree; - # Depends on base <4.12 - # See https://github.com/haskell-hvr/cryptohash-sha512/pull/3 - # , https://github.com/haskell-hvr/cryptohash-sha512/issues/4 - # and https://github.com/haskell-hvr/cryptohash-sha512/pull/5 - cryptohash-sha512 = doJailbreak super.cryptohash-sha512; + # The project is stale + # + # Archiving request: https://github.com/haskell-hvr/cryptohash-sha512/issues/6 + # + # doJailbreak since base <4.12 && bytestring <0.11 + # Request to support: + # https://github.com/haskell-hvr/cryptohash-sha512/issues/4 + # PRs to support base <4.12: + # https://github.com/haskell-hvr/cryptohash-sha512/pull/3 + # https://github.com/haskell-hvr/cryptohash-sha512/pull/5 + # + # dontCheck since test suite does not support new `base16-bytestring` >= 1 format + # https://github.com/haskell-hvr/cryptohash-sha512/pull/5#issuecomment-752796913 + cryptohash-sha512 = dontCheck (doJailbreak super.cryptohash-sha512); # Depends on tasty < 1.x, which we don't have. cryptohash-sha256 = doJailbreak super.cryptohash-sha256; @@ -863,8 +882,7 @@ self: super: { swagger2 = if (pkgs.stdenv.hostPlatform.isAarch32 || pkgs.stdenv.hostPlatform.isAarch64) then dontHaddock (dontCheck super.swagger2) else super.swagger2; # hledger-lib requires the latest version of pretty-simple - hledger-lib = super.hledger-lib.override { pretty-simple = self.pretty-simple_4_0_0_0; }; - pretty-simple_4_0_0_0 = super.pretty-simple_4_0_0_0.overrideScope (self: super: { prettyprinter = self.prettyprinter_1_7_0; }); + hledger-lib = super.hledger-lib.override { pretty-simple = self.pretty-simple; }; # Copy hledger man pages from data directory into the proper place. This code # should be moved into the cabal2nix generator. @@ -1317,7 +1335,7 @@ self: super: { commonmark-extensions = dontCheck super.commonmark-extensions; # Testsuite trying to run `which haskeline-examples-Test` - haskeline_0_8_1_0 = dontCheck super.haskeline_0_8_1_0; + haskeline_0_8_1_1 = dontCheck super.haskeline_0_8_1_1; # Tests for list-t, superbuffer, and stm-containers # depend on HTF and it is broken, 2020-08-23 @@ -1485,28 +1503,18 @@ self: super: { sha256 = "0g2m0y46zr3xs9fswkm4h9adhsg6gzl5zwgidshsjh3k3rq4h7b1"; }); + # https://github.com/ekmett/half/issues/35 + half = if pkgs.stdenv.isAarch64 + then dontCheck super.half + else super.half; + # 2020-11-19: Jailbreaking until: https://github.com/snapframework/heist/pull/124 heist = doJailbreak super.heist; # 2020-11-19: Jailbreaking until: https://github.com/snapframework/snap/pull/219 snap = doJailbreak super.snap; - # 2020-11-21: cachix + chachix-api needs a patch for ghc 8.10 compat. Can be removed once released - # https://github.com/cachix/cachix/pull/331 - cachix-api = appendPatch super.cachix-api (pkgs.fetchpatch { - url = https://github.com/cachix/cachix/commit/bfeec151a03afad72401815fe8bbb1b0d5d63b0d.patch; - sha256 = "0rglyd77g4j72l5g0sj9zpq2hy3v992bm6nhj58pmj4j2aj67y74"; - stripLen = 2; - extraPrefix = ""; - includes = [ "src/Cachix/Types/Session.hs" "src/Cachix/API/Signing.hs" ]; - }); - cachix = generateOptparseApplicativeCompletion "cachix" (appendPatch super.cachix (pkgs.fetchpatch { - url = https://github.com/cachix/cachix/commit/bfeec151a03afad72401815fe8bbb1b0d5d63b0d.patch; - sha256 = "06jmpz8l5vh9cch5aqdbrln7bm3fghxsicwy1m93avli320kp8pp"; - stripLen = 2; - extraPrefix = ""; - excludes = [ "stack.yaml" "sources.json" "src/Cachix/Types/Session.hs" "src/Cachix/API/Signing.hs" "cachix-api.cabal" "workflows/test.yml" ]; - })); + cachix = generateOptparseApplicativeCompletion "cachix" super.cachix; # 2020-11-23: Jailbreaking until: https://github.com/michaelt/text-pipes/pull/29 pipes-text = doJailbreak super.pipes-text; @@ -1532,20 +1540,36 @@ self: super: { # 2020-12-06: Restrictive upper bounds w.r.t. pandoc-types (https://github.com/owickstrom/pandoc-include-code/issues/27) pandoc-include-code = doJailbreak super.pandoc-include-code; - # https://github.com/jgm/pandoc/issues/6961 - pandoc = dontCheck super.pandoc; - - # Update pandoc dependencies to fix the build. - doctemplates = self.doctemplates_0_9; - skylighting = self.skylighting_0_10_2; - skylighting-core = self.skylighting-core_0_10_2; - # https://github.com/yesodweb/yesod/issues/1714 yesod-core = dontCheck super.yesod-core; # Add ApplicationServices on darwin - # use 0.4.5 instead of 0.4.4 to fix build with glibc >= 2.32 - apecs-physics = addPkgconfigDepends super.apecs-physics_0_4_5 + apecs-physics = addPkgconfigDepends super.apecs-physics (pkgs.lib.optional pkgs.stdenv.isDarwin pkgs.darwin.apple_sdk.frameworks.ApplicationServices); + # Break out of overspecified constraint on QuickCheck. + algebraic-graphs = dontCheck super.algebraic-graphs; + attoparsec = doJailbreak super.attoparsec; # https://github.com/haskell/attoparsec/pull/168 + cassava = doJailbreak super.cassava; + filepath-bytestring = doJailbreak super.filepath-bytestring; + ghc-source-gen = doJailbreak super.ghc-source-gen; + haddock-library = doJailbreak super.haddock-library; + HsYAML = doJailbreak super.HsYAML; + http-api-data = doJailbreak super.http-api-data; + lzma = doJailbreak super.lzma; + psqueues = doJailbreak super.psqueues; + + # Break out of overspecified constraint on QuickCheck. + # https://github.com/Gabriel439/Haskell-Nix-Derivation-Library/pull/10 + nix-derivation = doJailbreak super.nix-derivation; + + # Break out of overspecified constraint on QuickCheck. + # Fixed by https://github.com/haskell-servant/servant/commit/08579ca0039410e04d6c36c975ddc20165819db6 + servant-client = doJailbreak super.servant-client; + servant-client-core = doJailbreak super.servant-client-core; + + # overly strict dependency on aeson + # https://github.com/jaspervdj/profiteur/issues/33 + profiteur = doJailbreak super.profiteur; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super 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 8e53303e9feb..c162740b8d78 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -83,12 +83,6 @@ self: super: { sha256 = "0rgzrq0513nlc1vw7nw4km4bcwn4ivxcgi33jly4a7n3c1r32v1f"; }); - # Version 4.7.2 is broken by the bytestring library shipped by ghc-8.10.3. - ListLike = appendPatch super.ListLike (pkgs.fetchpatch { - url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/master/patches/ListLike-4.7.2.patch"; - sha256 = "1v392a74w0sxyn6x0bqixpmjbgla0i2b5hxzkcn1vaa3gaya7ag4"; - }); - # hnix 0.9.0 does not provide an executable for ghc < 8.10, so define completions here for now. hnix = generateOptparseApplicativeCompletion "hnix" (overrideCabal super.hnix (drv: { @@ -98,4 +92,11 @@ self: super: { # Break out of "Cabal < 3.2" constraint. stylish-haskell = doJailbreak super.stylish-haskell; + + # Agda 2.6.1.2 only declares a transformers dependency for ghc < 8.10.3. + # https://github.com/agda/agda/issues/5109 + Agda = appendPatch super.Agda (pkgs.fetchpatch { + url = "https://github.com/agda/agda/commit/76278c23d447b49f59fac581ca4ac605792aabbc.patch"; + sha256 = "1g34g8a09j73h89pk4cdmri0nb0qg664hkff45amcr9kyz14a9f3"; + }); } diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix index 0471ca1b7601..d9efb1ab9c32 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix @@ -59,6 +59,7 @@ self: super: { # Jailbreaks & Version Updates async = doJailbreak super.async; ChasingBottoms = markBrokenVersion "1.3.1.9" super.ChasingBottoms; + data-fix = doJailbreak super.data-fix; dec = doJailbreak super.dec; ed25519 = doJailbreak super.ed25519; hashable = overrideCabal (doJailbreak (dontCheck super.hashable)) (drv: { postPatch = "sed -i -e 's,integer-gmp .*<1.1,integer-gmp < 2,' hashable.cabal"; }); @@ -66,14 +67,16 @@ self: super: { integer-logarithms = overrideCabal (doJailbreak super.integer-logarithms) (drv: { postPatch = "sed -i -e 's,integer-gmp <1.1,integer-gmp < 2,' integer-logarithms.cabal"; }); lukko = doJailbreak super.lukko; parallel = doJailbreak super.parallel; + primitive = doJailbreak (dontCheck super.primitive); regex-posix = doJailbreak super.regex-posix; resolv = doJailbreak super.resolv; singleton-bool = doJailbreak super.singleton-bool; split = doJailbreak super.split; - splitmix = self.splitmix_0_1_0_3; tar = doJailbreak super.tar; time-compat = doJailbreak super.time-compat; vector = doJailbreak (dontCheck super.vector); + vector-binary-instances = doJailbreak super.vector-binary-instances; + vector-th-unbox = doJailbreak super.vector-th-unbox; zlib = doJailbreak super.zlib; # Apply patches from head.hackage. @@ -93,7 +96,6 @@ self: super: { url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/master/patches/language-haskell-extract-0.2.4.patch"; sha256 = "0rgzrq0513nlc1vw7nw4km4bcwn4ivxcgi33jly4a7n3c1r32v1f"; }); - QuickCheck = super.QuickCheck_2_14_2; regex-base = appendPatch (doJailbreak super.regex-base) (pkgs.fetchpatch { url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/master/patches/regex-base-0.94.0.0.patch"; sha256 = "0k5fglbl7nnhn8400c4cpnflxcbj9p3xi5prl9jfmszr31jwdy5d"; diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix index 862b45299a63..00a8c8d520bb 100644 --- a/pkgs/development/haskell-modules/configuration-ghcjs.nix +++ b/pkgs/development/haskell-modules/configuration-ghcjs.nix @@ -92,7 +92,7 @@ self: super: base template-haskell ghcjs-base split containers text ghc-prim ]; description = "FFI QuasiQuoter for GHCJS"; - license = pkgs.stdenv.lib.licenses.mit; + license = pkgs.lib.licenses.mit; }) {}; # experimental ghcjs-vdom = self.callPackage @@ -112,7 +112,7 @@ self: super: base ghc-prim ghcjs-ffiqq ghcjs-base ghcjs-prim containers split template-haskell ]; - license = pkgs.stdenv.lib.licenses.mit; + license = pkgs.lib.licenses.mit; description = "bindings for https://github.com/Matt-Esch/virtual-dom"; }) {}; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 95dce67b4beb..ab8f1f7e5f27 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -76,7 +76,7 @@ default-package-overrides: # haskell-language-server 0.5.0.0 doesn't accept newer versions - fourmolu ==0.2.* - refinery ==0.2.* - # Stackage Nightly 2020-12-14 + # Stackage Nightly 2021-01-05 - abstract-deque ==0.3 - abstract-par ==0.3.3 - AC-Angle ==1.0 @@ -86,7 +86,7 @@ default-package-overrides: - ad ==4.4.1 - adjunctions ==4.4 - adler32 ==0.1.2.0 - - aeson ==1.5.4.1 + - aeson ==1.5.5.1 - aeson-attoparsec ==0.0.0 - aeson-better-errors ==0.9.1.0 - aeson-casing ==0.2.0.0 @@ -109,7 +109,7 @@ default-package-overrides: - al ==0.1.4.2 - alarmclock ==0.7.0.5 - alerts ==0.1.2.0 - - alex ==3.2.5 + - alex ==3.2.6 - alg ==0.2.13.1 - algebraic-graphs ==0.5 - Allure ==0.9.5.0 @@ -215,18 +215,19 @@ default-package-overrides: - ansi-terminal ==0.10.3 - ansi-wl-pprint ==0.6.9 - ANum ==0.2.0.2 + - ap-normalize ==0.1.0.0 - apecs ==0.9.2 - apecs-gloss ==0.2.4 - - apecs-physics ==0.4.4 + - apecs-physics ==0.4.5 - api-field-json-th ==0.1.0.2 - - ap-normalize ==0.1.0.0 + - api-maker ==0.1.0.0 + - app-settings ==0.2.0.12 - appar ==0.1.8 - appendmap ==0.1.5 - apply-refact ==0.8.2.1 - apportionment ==0.0.0.3 - approximate ==0.3.2 - approximate-equality ==1.1.0.2 - - app-settings ==0.2.0.12 - arbor-lru-cache ==0.1.1.1 - arbor-postgres ==0.0.5 - arithmoi ==0.11.0.1 @@ -235,12 +236,12 @@ default-package-overrides: - ascii ==1.0.0.2 - ascii-case ==1.0.0.2 - ascii-char ==1.0.0.2 - - asciidiagram ==1.3.3.3 - ascii-group ==1.0.0.2 - ascii-predicates ==1.0.0.2 - ascii-progress ==0.3.3.0 - ascii-superset ==1.0.0.2 - ascii-th ==1.0.0.2 + - asciidiagram ==1.3.3.3 - asif ==6.0.4 - asn1-encoding ==0.9.6 - asn1-parse ==0.9.5 @@ -260,7 +261,7 @@ default-package-overrides: - attoparsec-base64 ==0.0.0 - attoparsec-binary ==0.2 - attoparsec-expr ==0.1.1.2 - - attoparsec-iso8601 ==1.0.1.0 + - attoparsec-iso8601 ==1.0.2.0 - attoparsec-path ==0.0.0.1 - audacity ==0.0.2 - aur ==7.0.5 @@ -268,14 +269,20 @@ default-package-overrides: - authenticate ==1.3.5 - authenticate-oauth ==1.6.0.1 - auto ==0.4.3.1 - - autoexporter ==1.1.19 - auto-update ==0.1.6 + - autoexporter ==1.1.19 - avers ==0.0.17.1 - avro ==0.5.2.0 - aws-cloudfront-signed-cookies ==0.2.0.6 + - backprop ==0.2.6.4 - backtracking ==0.1.0 - bank-holidays-england ==0.2.0.6 - barbies ==2.0.2.0 + - base-compat ==0.11.2 + - base-compat-batteries ==0.11.2 + - base-orphans ==0.8.4 + - base-prelude ==1.4 + - base-unicode-symbols ==0.2.4.2 - base16 ==0.3.0.1 - base16-bytestring ==0.1.1.7 - base16-lens ==0.1.3.0 @@ -289,12 +296,7 @@ default-package-overrides: - base64-bytestring-type ==1.0.1 - base64-lens ==0.3.0 - base64-string ==0.2 - - base-compat ==0.11.2 - - base-compat-batteries ==0.11.2 - basement ==0.0.11 - - base-orphans ==0.8.4 - - base-prelude ==1.4 - - base-unicode-symbols ==0.2.4.2 - basic-prelude ==0.7.0 - bazel-runfiles ==0.12 - bbdb ==0.8 @@ -305,16 +307,15 @@ default-package-overrides: - benchpress ==0.2.2.15 - between ==0.11.0.0 - bibtex ==0.1.0.6 - - bifunctors ==5.5.8 + - bifunctors ==5.5.9 - bimap ==0.4.0 - - bimaps ==0.1.0.2 - bimap-server ==0.1.0.1 + - bimaps ==0.1.0.2 - bin ==0.1 - binary-conduit ==1.3.1 - - binaryen ==0.0.5.0 - binary-ext ==2.0.4 - binary-ieee754 ==0.1.0.0 - - binary-instances ==1.0.0.1 + - binary-instances ==1.0.1 - binary-list ==1.1.1.2 - binary-orphans ==1.0.1 - binary-parser ==0.5.6 @@ -322,6 +323,7 @@ default-package-overrides: - binary-search ==1.0.0.3 - binary-shared ==0.8.3 - binary-tagged ==0.3 + - binaryen ==0.0.5.0 - bindings-DSL ==1.0.25 - bindings-GLFW ==3.3.2.0 - bindings-libzip ==1.0.1 @@ -329,10 +331,9 @@ default-package-overrides: - bins ==0.1.2.0 - bitarray ==0.0.1.1 - bits ==0.5.2 - - bitset-word8 ==0.1.1.2 - bits-extra ==0.0.2.0 + - bitset-word8 ==0.1.1.2 - bitvec ==1.0.3.0 - - bitwise-enum ==1.0.0.2 - blake2 ==0.3.0 - blanks ==0.5.0 - blas-carray ==0.1.0.1 @@ -345,7 +346,7 @@ default-package-overrides: - blaze-svg ==0.3.6.1 - blaze-textual ==0.2.1.0 - bmp ==1.2.6.3 - - BNFC ==2.8.4 + - BNFC ==2.9.0 - board-games ==0.3 - boltzmann-samplers ==0.1.1.0 - Boolean ==0.2.4 @@ -356,12 +357,12 @@ default-package-overrides: - boring ==0.1.3 - both ==0.1.1.1 - bound ==2.0.2 - - BoundedChan ==1.0.3.0 - bounded-queue ==1.0.0 + - BoundedChan ==1.0.3.0 - boundingboxes ==0.2.3 - bower-json ==1.0.0.1 - boxes ==0.1.5 - - brick ==0.57.1 + - brick ==0.58.1 - broadcast-chan ==0.2.1.1 - bsb-http-chunked ==0.0.0.4 - bson ==0.4.0.1 @@ -375,10 +376,10 @@ default-package-overrides: - butcher ==1.3.3.2 - bv ==0.5 - bv-little ==1.1.1 - - byteable ==0.1.1 - byte-count-reader ==0.10.1.2 - - bytedump ==1.0 - byte-order ==0.1.2.0 + - byteable ==0.1.1 + - bytedump ==1.0 - byteorder ==1.0.4 - bytes ==0.17 - byteset ==0.1.1.0 @@ -394,7 +395,7 @@ default-package-overrides: - bzlib-conduit ==0.3.0.2 - c14n ==0.1.0.1 - c2hs ==0.28.7 - - cabal-debian ==5.1 + - ca-province-codes ==1.0.0.0 - cabal-doctest ==1.0.8 - cabal-file ==0.1.1 - cabal-flatpak ==0.1.0.2 @@ -405,13 +406,12 @@ default-package-overrides: - calendar-recycling ==0.0.0.1 - call-stack ==0.2.0 - can-i-haz ==0.3.1.0 - - ca-province-codes ==1.0.0.0 - cardano-coin-selection ==1.0.1 - carray ==0.1.6.8 - casa-client ==0.0.1 - casa-types ==0.0.1 - - cased ==0.1.0.0 - case-insensitive ==1.2.1.0 + - cased ==0.1.0.0 - cases ==0.1.4 - casing ==0.1.4.1 - cassava ==0.5.2.0 @@ -453,6 +453,7 @@ default-package-overrides: - cipher-des ==0.0.6 - cipher-rc4 ==0.1.4 - circle-packing ==0.1.0.6 + - circular ==0.3.1.1 - clash-ghc ==1.2.5 - clash-lib ==1.2.5 - clash-prelude ==1.2.5 @@ -471,12 +472,12 @@ default-package-overrides: - cmark-gfm ==0.2.2 - cmark-lucid ==0.1.0.0 - cmdargs ==0.10.20 - - codec-beam ==0.2.0 - - codec-rpm ==0.2.2 - - code-page ==0.2 - co-log ==0.4.0.1 - co-log-concurrent ==0.5.0.0 - co-log-core ==0.2.1.1 + - code-page ==0.2 + - codec-beam ==0.2.0 + - codec-rpm ==0.2.2 - Color ==0.3.0 - colorful-monoids ==0.2.1.3 - colorize-haskell ==1.0.1 @@ -486,7 +487,7 @@ default-package-overrides: - comfort-array ==0.4 - comfort-graph ==0.0.3.1 - commutative ==0.0.2 - - comonad ==5.0.6 + - comonad ==5.0.8 - comonad-extras ==4.0.1 - compactmap ==0.1.4.2.1 - compensated ==0.8.1 @@ -518,12 +519,12 @@ default-package-overrides: - conduit-extra ==1.3.5 - conduit-parse ==0.2.1.0 - conduit-zstd ==0.0.2.0 - - conferer ==0.4.1.1 - - conferer-hspec ==0.4.0.1 - - conferer-source-json ==0.4.0.1 - - conferer-warp ==0.4.0.1 - - ConfigFile ==1.1.4 + - conferer ==1.0.0.0 + - conferer-aeson ==1.0.0.0 + - conferer-hspec ==1.0.0.0 + - conferer-warp ==1.0.0.0 - config-ini ==0.2.4.0 + - ConfigFile ==1.1.4 - configurator ==0.3.0.0 - configurator-export ==0.1.0.1 - configurator-pg ==0.2.5 @@ -531,10 +532,10 @@ default-package-overrides: - connection-pool ==0.2.2 - console-style ==0.0.2.1 - constraint ==0.1.4.0 - - constraints ==0.12 - constraint-tuples ==0.1.2 + - constraints ==0.12 - construct ==0.3 - - contravariant ==1.5.2 + - contravariant ==1.5.3 - contravariant-extras ==0.3.5.2 - control-bool ==0.2.1 - control-monad-free ==0.6.2 @@ -559,8 +560,13 @@ default-package-overrides: - cron ==0.7.0 - crypto-api ==0.13.3 - crypto-cipher-types ==0.0.9 - - cryptocompare ==0.1.2 - crypto-enigma ==0.1.1.6 + - crypto-numbers ==0.2.7 + - crypto-pubkey ==0.2.8 + - crypto-pubkey-types ==0.4.3 + - crypto-random ==0.0.9 + - crypto-random-api ==0.2.0 + - cryptocompare ==0.1.2 - cryptohash ==0.11.9 - cryptohash-cryptoapi ==0.1.4 - cryptohash-md5 ==0.11.100.1 @@ -569,11 +575,6 @@ default-package-overrides: - cryptonite ==0.27 - cryptonite-conduit ==0.2.2 - cryptonite-openssl ==0.7 - - crypto-numbers ==0.2.7 - - crypto-pubkey ==0.2.8 - - crypto-pubkey-types ==0.4.3 - - crypto-random ==0.0.9 - - crypto-random-api ==0.2.0 - csp ==1.4.0 - css-syntax ==0.1.0.0 - css-text ==0.1.3.0 @@ -610,7 +611,6 @@ default-package-overrides: - data-default-instances-dlist ==0.0.1 - data-default-instances-old-locale ==0.0.1 - data-diverse ==4.7.0.0 - - datadog ==0.2.5.0 - data-dword ==0.3.2 - data-endian ==0.1.1 - data-fix ==0.3.0 @@ -629,12 +629,12 @@ default-package-overrides: - data-reify ==0.6.3 - data-serializer ==0.3.4.1 - data-textual ==0.3.0.3 + - datadog ==0.2.5.0 - dataurl ==0.1.0.0 - DAV ==1.3.4 - DBFunctor ==0.1.1.1 - - dbus ==1.2.16 + - dbus ==1.2.17 - dbus-hslogger ==0.1.0.1 - - debian ==4.0.2 - debian-build ==0.10.2.0 - debug-trace-var ==0.2.0 - dec ==0.0.3 @@ -643,52 +643,53 @@ default-package-overrides: - deepseq-generics ==0.2.0.0 - deepseq-instances ==0.1.0.1 - deferred-folds ==0.9.15 - - dejafu ==2.4.0.0 + - dejafu ==2.4.0.1 - dense-linear-algebra ==0.1.0.0 - depq ==0.4.1.0 - deque ==0.4.3 - - deriveJsonNoPrefix ==0.1.0.1 - derive-topdown ==0.0.2.2 + - deriveJsonNoPrefix ==0.1.0.1 - deriving-aeson ==0.2.6 - deriving-compat ==0.5.10 - derulo ==1.0.9 - - dhall ==1.37.0 + - dhall ==1.37.1 - dhall-bash ==1.0.35 - dhall-json ==1.7.4 - dhall-lsp-server ==1.0.12 - dhall-yaml ==1.2.4 + - di-core ==1.0.4 + - di-monad ==1.3.1 - diagrams-solve ==0.1.2 - dialogflow-fulfillment ==0.1.1.3 - - di-core ==1.0.4 - dictionary-sharing ==0.1.0.0 - Diff ==0.4.0 - digest ==0.0.1.2 - digits ==0.3.1 - dimensional ==1.3 - - di-monad ==1.3.1 - - directory-tree ==0.12.1 - direct-sqlite ==2.3.26 - - dirichlet ==0.1.0.0 + - directory-tree ==0.12.1 + - dirichlet ==0.1.0.2 - discount ==0.1.1 - disk-free-space ==0.1.0.1 - distributed-closure ==0.4.2.0 - distribution-opensuse ==1.1.1 - - distributive ==0.6.2 + - distributive ==0.6.2.1 - dl-fedora ==0.7.5 - dlist ==0.8.0.8 - dlist-instances ==0.1.1.1 - dlist-nonempty ==0.1.1 - dns ==4.0.1 + - do-list ==1.0.1 + - do-notation ==0.1.0.2 - dockerfile ==0.2.0 - doclayout ==0.3 - - doctemplates ==0.8.3 + - doctemplates ==0.9 - doctest ==0.16.3 - doctest-discover ==0.2.0.0 - doctest-exitcode-stdio ==0.0 - doctest-lib ==0.1 - doldol ==0.4.1.2 - - do-list ==1.0.1 - - do-notation ==0.1.0.2 + - dot ==0.3 - dotenv ==0.8.0.7 - dotgen ==0.4.3 - dotnet-timespan ==0.0.1.0 @@ -705,7 +706,6 @@ default-package-overrides: - dyre ==0.8.12 - eap ==0.9.0.2 - earcut ==0.1.0.4 - - Earley ==0.13.0.1 - easy-file ==0.2.2 - Ebnf2ps ==1.0.15 - echo ==0.1.3 @@ -727,24 +727,24 @@ default-package-overrides: - elerea ==2.9.0 - elf ==0.30 - eliminators ==0.7 - - elm2nix ==0.2.1 - elm-bridge ==0.6.1 - elm-core-sources ==1.0.0 - elm-export ==0.6.0.1 - - elynx ==0.5.0 - - elynx-markov ==0.5.0 - - elynx-nexus ==0.5.0 - - elynx-seq ==0.5.0 - - elynx-tools ==0.5.0 - - elynx-tree ==0.5.0 + - elm2nix ==0.2.1 + - elynx ==0.5.0.1 + - elynx-markov ==0.5.0.1 + - elynx-nexus ==0.5.0.1 + - elynx-seq ==0.5.0.1 + - elynx-tools ==0.5.0.1 + - elynx-tree ==0.5.0.1 - email-validate ==2.3.2.13 - emojis ==0.1 - enclosed-exceptions ==1.0.3 - ENIG ==0.0.1.0 - entropy ==0.4.1.6 + - enum-subset-generate ==0.1.0.0 - enummapset ==0.6.0.3 - enumset ==0.0.5 - - enum-subset-generate ==0.1.0.0 - envelope ==0.2.2.0 - envparse ==0.4.1 - envy ==2.1.0.0 @@ -754,7 +754,7 @@ default-package-overrides: - equational-reasoning ==0.6.0.3 - equivalence ==0.3.5 - erf ==2.0.0.0 - - error-or ==0.1.1.0 + - error-or ==0.1.2.0 - error-or-utils ==0.1.1 - errors ==2.3.0 - errors-ext ==0.4.2 @@ -766,29 +766,30 @@ default-package-overrides: - essence-of-live-coding-quickcheck ==0.2.4 - etc ==0.4.1.0 - eve ==0.1.9.0 + - event-list ==0.1.2 - eventful-core ==0.2.0 - eventful-test-helpers ==0.2.0 - - event-list ==0.1.2 - eventstore ==1.4.1 - every ==0.0.1 - exact-combinatorics ==0.2.0.9 - exact-pi ==0.5.0.1 - exception-hierarchy ==0.1.0.4 - exception-mtl ==0.4.0.1 - - exceptions ==0.10.4 - exception-transformers ==0.4.0.9 - exception-via ==0.1.0.0 + - exceptions ==0.10.4 - executable-path ==0.0.3.1 - exit-codes ==1.0.0 - exomizer ==1.0.0 + - exp-pairs ==0.2.1.0 + - experimenter ==0.1.0.4 - expiring-cache-map ==0.0.6.1 - explicit-exception ==0.1.10 - - exp-pairs ==0.2.1.0 - express ==0.1.3 - extended-reals ==0.2.4.0 - extensible-effects ==5.0.0.1 - extensible-exceptions ==0.1.1.4 - - extra ==1.7.8 + - extra ==1.7.9 - extractable-singleton ==0.0.1 - extrapolate ==0.4.2 - fail ==4.9.0.0 @@ -810,10 +811,10 @@ default-package-overrides: - fgl ==5.7.0.3 - file-embed ==0.0.13.0 - file-embed-lzma ==0 - - filelock ==0.1.1.5 - - filemanip ==0.3.6.3 - file-modules ==0.1.2.4 - file-path-th ==0.1.0.0 + - filelock ==0.1.1.5 + - filemanip ==0.3.6.3 - filepattern ==0.1.2 - fileplow ==0.1.0.0 - filtrable ==0.1.4.0 @@ -843,8 +844,9 @@ default-package-overrides: - fn ==0.3.0.2 - focus ==1.0.2 - focuslist ==0.1.0.2 - - foldable1 ==0.1.0.0 - fold-debounce ==0.2.0.9 + - fold-debounce-conduit ==0.2.0.5 + - foldable1 ==0.1.0.0 - foldl ==1.4.10 - folds ==0.7.5 - follow-file ==0.0.3 @@ -856,12 +858,12 @@ default-package-overrides: - format-numbers ==0.1.0.1 - formatting ==6.3.7 - foundation ==0.0.25 - - free ==5.1.4 + - free ==5.1.5 - free-categories ==0.2.0.2 + - free-vl ==0.1.4 - freenect ==1.2.1 - freer-simple ==1.2.1.1 - freetype2 ==0.2.0 - - free-vl ==0.1.4 - friendly-time ==0.4.1 - from-sum ==0.2.3.0 - frontmatter ==0.1.0.2 @@ -877,8 +879,8 @@ default-package-overrides: - fuzzcheck ==0.1.1 - fuzzy ==0.1.0.0 - fuzzy-dates ==0.1.1.2 - - fuzzyset ==0.2.0 - fuzzy-time ==0.1.0.0 + - fuzzyset ==0.2.0 - gauge ==0.2.5 - gd ==3000.7.3 - gdp ==0.0.3.0 @@ -893,8 +895,8 @@ default-package-overrides: - generic-lens-core ==2.0.0.0 - generic-monoid ==0.1.0.1 - generic-optics ==2.0.0.0 - - GenericPretty ==1.2.2 - generic-random ==1.3.0.1 + - GenericPretty ==1.2.2 - generics-sop ==0.5.1.0 - generics-sop-lens ==0.2.0.1 - geniplate-mirror ==0.7.7 @@ -926,25 +928,25 @@ default-package-overrides: - ghc-byteorder ==4.11.0.0.10 - ghc-check ==0.5.0.3 - ghc-core ==0.5.6 - - ghc-events ==0.14.0 + - ghc-events ==0.15.1 - ghc-exactprint ==0.6.3.3 - - ghcid ==0.8.7 - - ghci-hexcalc ==0.1.1.0 - - ghcjs-codemirror ==0.0.0.2 - - ghc-lib ==8.10.2.20200916 - - ghc-lib-parser ==8.10.2.20200916 - - ghc-lib-parser-ex ==8.10.0.16 + - ghc-lib ==8.10.3.20201220 + - ghc-lib-parser ==8.10.3.20201220 + - ghc-lib-parser-ex ==8.10.0.17 - ghc-parser ==0.2.2.0 - ghc-paths ==0.1.0.12 - ghc-prof ==1.4.1.7 - ghc-source-gen ==0.4.0.0 - ghc-syntax-highlighter ==0.0.6.0 - - ghc-tcplugins-extra ==0.4 + - ghc-tcplugins-extra ==0.4.1 - ghc-trace-events ==0.1.2.1 - - ghc-typelits-extra ==0.4.1 - - ghc-typelits-knownnat ==0.7.3 - - ghc-typelits-natnormalise ==0.7.2 + - ghc-typelits-extra ==0.4.2 + - ghc-typelits-knownnat ==0.7.4 + - ghc-typelits-natnormalise ==0.7.3 - ghc-typelits-presburger ==0.3.0.1 + - ghci-hexcalc ==0.1.1.0 + - ghcid ==0.8.7 + - ghcjs-codemirror ==0.0.0.2 - ghost-buster ==0.1.1.0 - gi-atk ==2.0.22 - gi-cairo ==1.0.24 @@ -962,18 +964,18 @@ default-package-overrides: - gi-gtk ==3.0.36 - gi-gtk-hs ==0.3.9 - gi-harfbuzz ==0.0.3 + - gi-pango ==1.0.23 + - gi-xlib ==2.0.9 - ginger ==0.10.1.0 - gingersnap ==0.3.1.0 - - gi-pango ==1.0.23 - githash ==0.1.5.0 - github ==0.26 - github-release ==1.3.5 - github-rest ==1.0.3 - github-types ==0.2.1 - github-webhooks ==0.15.0 - - gitlab-haskell ==0.2.3 + - gitlab-haskell ==0.2.4 - gitrev ==1.3.1 - - gi-xlib ==2.0.9 - gl ==0.9 - glabrous ==2.0.2 - GLFW-b ==3.3.0.0 @@ -988,24 +990,29 @@ default-package-overrides: - gothic ==0.1.5 - gpolyline ==0.1.0.1 - graph-core ==0.3.0.0 + - graph-wrapper ==0.2.6.0 - graphite ==0.10.0.1 - graphql-client ==1.1.0 - graphs ==0.7.1 - graphviz ==2999.20.1.0 - - graph-wrapper ==0.2.6.0 - gravatar ==0.8.0 + - greskell ==1.2.0.0 + - greskell-core ==0.1.3.5 + - greskell-websocket ==0.1.2.5 - groom ==0.1.2.1 - group-by-date ==0.1.0.3 - groups ==0.5.2 - gtk-sni-tray ==0.1.6.0 - gtk-strut ==0.1.3.0 - guarded-allocation ==0.0.1 + - H ==0.9.0.1 - hackage-db ==2.1.0 - hackage-security ==0.6.0.1 - haddock-library ==1.9.0 + - hadolint ==1.19.0 - hadoop-streaming ==0.2.0.3 - hakyll-convert ==0.3.0.3 - - half ==0.3 + - half ==0.3.1 - hall-symbols ==0.1.0.6 - hamtsolo ==1.0.3 - HandsomeSoup ==0.4.2 @@ -1019,7 +1026,7 @@ default-package-overrides: - hashing ==0.1.0.1 - hashmap ==1.3.3 - hashtables ==1.2.4.1 - - haskeline ==0.8.1.0 + - haskeline ==0.8.1.1 - haskell-gi ==0.24.7 - haskell-gi-base ==0.24.5 - haskell-gi-overloading ==1.0 @@ -1050,13 +1057,13 @@ default-package-overrides: - heap ==1.0.4 - heaps ==0.3.6.1 - hebrew-time ==0.1.2 - - hedgehog ==1.0.3 + - hedgehog ==1.0.4 - hedgehog-classes ==0.2.5.1 - hedgehog-corpus ==0.2.0 - hedgehog-fakedata ==0.0.1.3 - hedgehog-fn ==1.0 - hedgehog-quickcheck ==0.1.1 - - hedis ==0.13.1 + - hedis ==0.14.0 - hedn ==0.3.0.2 - here ==1.2.13 - heredoc ==0.2.0.0 @@ -1070,9 +1077,9 @@ default-package-overrides: - hgeometry ==0.11.0.0 - hgeometry-combinatorial ==0.11.0.0 - hgrev ==0.2.6 - - hidapi ==0.1.5 - - hie-bios ==0.7.1 - hi-file-parser ==0.1.0.0 + - hidapi ==0.1.5 + - hie-bios ==0.7.2 - higher-leveldb ==0.6.0.0 - highlighting-kate ==0.6.4 - hinfo ==0.0.3.0 @@ -1085,6 +1092,7 @@ default-package-overrides: - hlibgit2 ==0.18.0.16 - hlibsass ==0.1.10.1 - hmatrix ==0.20.1 + - hmatrix-backprop ==0.1.3.0 - hmatrix-gsl ==0.19.0.1 - hmatrix-gsl-stats ==0.4.1.8 - hmatrix-morpheus ==0.1.1.2 @@ -1096,7 +1104,7 @@ default-package-overrides: - hoauth2 ==1.16.0 - hocon ==0.1.0.4 - hOpenPGP ==2.9.5 - - hopenpgp-tools ==0.23.3 + - hopenpgp-tools ==0.23.6 - hopfli ==0.2.2.1 - hosc ==0.18.1 - hostname ==1.0 @@ -1110,15 +1118,16 @@ default-package-overrides: - hpc-lcov ==1.0.1 - hprotoc ==2.4.17 - hruby ==0.3.8 - - hsass ==0.8.0 - hs-bibutils ==6.10.0.0 + - hs-functors ==0.1.7.1 + - hs-GeoIP ==0.3 + - hs-php-session ==0.0.9.3 + - hsass ==0.8.0 - hsc2hs ==0.68.7 - hscolour ==1.24.4 - hsdns ==1.8 - hsebaysdk ==0.4.1.0 - hsemail ==2.2.1 - - hs-functors ==0.1.7.1 - - hs-GeoIP ==0.3 - hsini ==0.5.1.2 - hsinstall ==2.6 - HSlippyMap ==3.0.1 @@ -1131,12 +1140,12 @@ default-package-overrides: - HsOpenSSL ==0.11.5.1 - HsOpenSSL-x509-system ==0.1.0.4 - hsp ==0.10.0 - - hspec ==2.7.4 + - hspec ==2.7.5 - hspec-attoparsec ==0.1.0.2 - hspec-checkers ==0.1.0.2 - hspec-contrib ==0.5.1 - - hspec-core ==2.7.4 - - hspec-discover ==2.7.4 + - hspec-core ==2.7.5 + - hspec-discover ==2.7.5 - hspec-expectations ==0.8.2 - hspec-expectations-lifted ==0.10.0 - hspec-expectations-pretty-diff ==0.7.2.5 @@ -1146,12 +1155,12 @@ default-package-overrides: - hspec-leancheck ==0.0.4 - hspec-megaparsec ==2.2.0 - hspec-meta ==2.6.0 + - hspec-need-env ==0.1.0.5 - hspec-parsec ==0 - hspec-smallcheck ==0.5.2 - hspec-tables ==0.0.1 - hspec-wai ==0.10.1 - hspec-wai-json ==0.10.1 - - hs-php-session ==0.0.9.3 - hsshellscript ==3.4.5 - HStringTemplate ==0.8.7 - HSvm ==0.1.1.3.22 @@ -1164,7 +1173,6 @@ default-package-overrides: - html-entities ==1.1.4.3 - html-entity-map ==0.1.0.0 - htoml ==1.0.0.3 - - http2 ==2.0.5 - HTTP ==4000.3.15 - http-api-data ==0.4.1.1 - http-client ==0.6.4.1 @@ -1176,13 +1184,14 @@ default-package-overrides: - http-date ==0.0.10 - http-directory ==0.1.8 - http-download ==0.2.0.0 - - httpd-shed ==0.4.1.1 - http-link-header ==1.0.3.1 - http-media ==0.8.0.0 - http-query ==0.1.0 - http-reverse-proxy ==0.6.0 - http-streams ==0.8.7.2 - http-types ==0.12.3 + - http2 ==2.0.5 + - httpd-shed ==0.4.1.1 - human-readable-duration ==0.2.1.4 - HUnit ==1.6.1.0 - HUnit-approx ==1.1.1.1 @@ -1195,7 +1204,6 @@ default-package-overrides: - hw-conduit-merges ==0.2.1.0 - hw-diagnostics ==0.0.1.0 - hw-dsv ==0.4.1.0 - - hweblib ==0.6.3 - hw-eliasfano ==0.1.2.0 - hw-excess ==0.2.3.0 - hw-fingertree ==0.1.2.0 @@ -1208,7 +1216,7 @@ default-package-overrides: - hw-json-simd ==0.1.1.0 - hw-json-simple-cursor ==0.1.1.0 - hw-json-standard-cursor ==0.2.3.1 - - hw-kafka-client ==4.0.0 + - hw-kafka-client ==4.0.1 - hw-mquery ==0.2.1.0 - hw-packed-vector ==0.2.1.0 - hw-parser ==0.1.1.0 @@ -1220,6 +1228,7 @@ default-package-overrides: - hw-string-parse ==0.0.0.4 - hw-succinct ==0.1.0.1 - hw-xml ==0.5.1.0 + - hweblib ==0.6.3 - hxt ==9.3.1.18 - hxt-charproperties ==9.4.0.0 - hxt-css ==0.1.0.3 @@ -1247,19 +1256,21 @@ default-package-overrides: - immortal-queue ==0.1.0.1 - inbox ==0.1.0 - include-file ==0.1.0.4 - - incremental-parser ==0.5 + - incremental-parser ==0.5.0.1 - indents ==0.5.0.1 - indexed ==0.1.3 - indexed-containers ==0.1.0.2 - indexed-list-literals ==0.2.1.3 - indexed-profunctors ==0.1 + - indexed-traversable ==0.1.1 - infer-license ==0.2.0 - inflections ==0.4.0.6 - influxdb ==1.9.0 - ini ==0.4.1 - inj ==1.0 - - inline-c ==0.9.1.3 + - inline-c ==0.9.1.4 - inline-c-cpp ==0.4.0.2 + - inline-r ==0.10.4 - inliterate ==0.1.0 - input-parsers ==0.1.0.1 - insert-ordered-containers ==0.2.3.1 @@ -1301,13 +1312,13 @@ default-package-overrides: - iso3166-country-codes ==0.20140203.8 - iso639 ==0.1.0.3 - iso8601-time ==0.1.5 - - iterable ==3.0 - it-has ==0.2.0.0 + - iterable ==3.0 + - ix-shapable ==0.1.0 - ixset-typed ==0.5 - ixset-typed-binary-instance ==0.1.0.2 - ixset-typed-conversions ==0.1.2.0 - ixset-typed-hashable-instance ==0.1.0.2 - - ix-shapable ==0.1.0 - jack ==0.7.1.4 - jalaali ==1.0.0.0 - jira-wiki-markup ==1.3.2 @@ -1318,9 +1329,9 @@ default-package-overrides: - js-flot ==0.8.3 - js-jquery ==3.3.1 - json-feed ==1.0.11 - - jsonpath ==0.2.0.0 - json-rpc ==1.0.3 - json-rpc-generic ==0.2.1.5 + - jsonpath ==0.2.0.0 - JuicyPixels ==3.3.5 - JuicyPixels-blurhash ==0.1.0.3 - JuicyPixels-extra ==0.4.1 @@ -1331,11 +1342,13 @@ default-package-overrides: - kan-extensions ==5.2.1 - kanji ==3.4.1 - katip ==0.8.5.0 + - katip-logstash ==0.1.0.0 - kawhi ==0.3.0 - kazura-queue ==0.1.0.4 - kdt ==0.2.4 - keycode ==0.2.2 - keys ==3.12.3 + - ki ==0.2.0.1 - kind-apply ==0.3.2.0 - kind-generics ==0.4.1.0 - kind-generics-th ==0.2.2.1 @@ -1391,14 +1404,14 @@ default-package-overrides: - libgit ==0.3.1 - libgraph ==1.14 - libjwt-typed ==0.2 - - libmpd ==0.9.2.0 + - libmpd ==0.9.3.0 - liboath-hs ==0.0.1.2 - libyaml ==0.1.2 - LibZip ==1.0.1 - life-sync ==1.1.1.0 + - lift-generics ==0.2 - lifted-async ==0.10.1.2 - lifted-base ==0.2.3.12 - - lift-generics ==0.2 - line ==4.0.1 - linear ==1.21.3 - linear-circuit ==0.1.0.2 @@ -1407,11 +1420,10 @@ default-package-overrides: - linux-namespaces ==0.1.3.0 - liquid-fixpoint ==0.8.10.2 - List ==0.6.2 - - ListLike ==4.7.2 - list-predicate ==0.1.0.1 - - listsafe ==0.1.0.1 - list-singleton ==1.0.0.4 - list-t ==1.0.4 + - listsafe ==0.1.0.1 - ListTree ==0.2.3 - little-logger ==0.3.1 - little-rio ==0.2.2 @@ -1429,6 +1441,7 @@ default-package-overrides: - logging-facade ==0.3.0 - logging-facade-syslog ==1 - logict ==0.7.0.3 + - logstash ==0.1.0.1 - loop ==0.3.0 - lrucache ==1.2.0.1 - lrucaching ==0.3.3 @@ -1443,20 +1456,22 @@ default-package-overrides: - machines ==0.7.1 - magic ==1.1 - magico ==0.0.2.1 - - mainland-pretty ==0.7.0.1 - main-tester ==0.2.0.1 + - mainland-pretty ==0.7.0.1 - makefile ==1.1.0.0 - managed ==1.0.8 - MapWith ==0.2.0.0 - markdown ==0.1.17.4 - - markdown-unlit ==0.5.0 + - markdown-unlit ==0.5.1 - markov-chain ==0.0.3.4 - - massiv ==0.5.8.0 + - massiv ==0.5.9.0 - massiv-io ==0.4.0.0 - - massiv-test ==0.1.5 - - mathexpr ==0.3.0.0 + - massiv-persist ==0.1.0.0 + - massiv-serialise ==0.1.0.0 + - massiv-test ==0.1.6 - math-extras ==0.1.1.0 - math-functions ==0.3.4.1 + - mathexpr ==0.3.0.0 - matplotlib ==0.7.5 - matrices ==0.5.0 - matrix ==0.3.6.1 @@ -1466,11 +1481,11 @@ default-package-overrides: - maximal-cliques ==0.1.1 - mbox ==0.3.4 - mbox-utility ==0.0.3.1 - - mcmc ==0.3.0 + - mcmc ==0.4.0.0 - mcmc-types ==1.0.3 + - med-module ==0.1.2.1 - medea ==1.2.0 - median-stream ==0.7.0.0 - - med-module ==0.1.2.1 - megaparsec ==9.0.1 - megaparsec-tests ==9.0.1 - membrain ==0.0.0.2 @@ -1492,19 +1507,19 @@ default-package-overrides: - microlens-process ==0.2.0.2 - microlens-th ==0.4.3.8 - microspec ==0.2.1.3 - - microstache ==1.0.1.1 + - microstache ==1.0.1.2 - midair ==0.2.0.1 - midi ==0.2.2.2 - mighty-metropolis ==2.0.0 - mime-mail ==0.5.0 - mime-mail-ses ==0.4.3 - mime-types ==0.1.0.9 + - min-max-pqueue ==0.1.0.2 - mini-egison ==1.0.0 - minimal-configuration ==0.1.4 - minimorph ==0.3.0.0 - minio-hs ==1.5.3 - miniutter ==0.5.1.1 - - min-max-pqueue ==0.1.0.2 - mintty ==0.1.2 - missing-foreign ==0.1.1 - MissingH ==1.4.3.0 @@ -1516,9 +1531,9 @@ default-package-overrides: - mmark-ext ==0.2.1.2 - mmorph ==1.1.3 - mnist-idx ==0.1.2.8 - - mockery ==0.3.5 - mock-time ==0.1.0 - - mod ==0.1.2.0 + - mockery ==0.3.5 + - mod ==0.1.2.1 - model ==0.5 - modern-uri ==0.3.3.0 - modular ==0.1.0.8 @@ -1527,36 +1542,37 @@ default-package-overrides: - monad-control-aligned ==0.0.1.1 - monad-coroutine ==0.9.0.4 - monad-extras ==0.6.0 - - monadic-arrays ==0.2.2 - monad-journal ==0.8.1 - - monadlist ==0.0.2 - monad-logger ==0.3.36 - monad-logger-json ==0.1.0.0 + - monad-logger-logstash ==0.1.0.0 - monad-logger-prefix ==0.1.12 - monad-loops ==0.4.3 - monad-memo ==0.5.3 - monad-metrics ==0.2.2.0 - monad-par ==0.3.5 - - monad-parallel ==0.7.2.3 - monad-par-extras ==0.3.3 + - monad-parallel ==0.7.2.3 - monad-peel ==0.2.1.2 - monad-primitive ==0.1 - monad-products ==4.0.1 - - MonadPrompt ==1.0.0.5 - - MonadRandom ==0.5.2 - monad-resumption ==0.1.4.0 - monad-skeleton ==0.1.5 - monad-st ==0.2.4.1 - - monads-tf ==0.1.0.3 - monad-time ==0.3.1.0 - monad-unlift ==0.2.0 - monad-unlift-ref ==0.2.1 + - monadic-arrays ==0.2.2 + - monadlist ==0.0.2 + - MonadPrompt ==1.0.0.5 + - MonadRandom ==0.5.2 + - monads-tf ==0.1.0.3 - mongoDB ==2.7.0.0 - - monoid-subclasses ==1.0.1 - - monoid-transformer ==0.0.4 - mono-traversable ==1.0.15.1 - mono-traversable-instances ==0.1.1.0 - mono-traversable-keys ==0.1.0 + - monoid-subclasses ==1.0.1 + - monoid-transformer ==0.0.4 - more-containers ==0.2.2.0 - morpheus-graphql ==0.16.0 - morpheus-graphql-client ==0.16.0 @@ -1569,14 +1585,14 @@ default-package-overrides: - mpi-hs-cereal ==0.1.0.0 - mtl-compat ==0.2.2 - mtl-prelude ==2.0.3.1 - - multiarg ==0.30.0.10 - multi-containers ==0.1.1 + - multiarg ==0.30.0.10 - multimap ==1.2.1 - multipart ==0.2.1 - multiset ==0.3.4.3 - multistate ==0.8.0.3 - - murmur3 ==1.0.4 - murmur-hash ==0.1.0.9 + - murmur3 ==1.0.4 - MusicBrainz ==0.4.1 - mustache ==2.3.1 - mutable-containers ==0.3.4 @@ -1624,20 +1640,20 @@ default-package-overrides: - nicify-lib ==1.0.1 - NineP ==0.0.2.1 - nix-paths ==1.0.1 + - no-value ==1.0.0.0 + - non-empty ==0.3.2 + - non-empty-sequence ==0.2.0.4 + - non-negative ==0.1.2 - nonce ==1.0.7 - nondeterminism ==1.4 - - non-empty ==0.3.2 - nonempty-containers ==0.3.4.1 - - nonemptymap ==0.0.6.0 - - non-empty-sequence ==0.2.0.4 - nonempty-vector ==0.2.1.0 - - non-negative ==0.1.2 + - nonemptymap ==0.0.6.0 - not-gloss ==0.7.7.0 - - no-value ==1.0.0.0 - nowdoc ==0.1.1.0 - nqe ==0.6.3 - - nri-env-parser ==0.1.0.2 - - nri-prelude ==0.2.0.0 + - nri-env-parser ==0.1.0.3 + - nri-prelude ==0.3.0.0 - nsis ==0.3.3 - numbers ==3000.2.0.2 - numeric-extras ==0.1 @@ -1649,9 +1665,9 @@ default-package-overrides: - nvim-hs ==2.1.0.4 - nvim-hs-contrib ==2.0.0.0 - nvim-hs-ghcid ==2.0.0.0 + - o-clock ==1.2.0 - oauthenticated ==0.2.1.0 - ObjectName ==1.1.0.1 - - o-clock ==1.2.0 - odbc ==0.2.2 - oeis2 ==1.0.4 - ofx ==0.4.4.0 @@ -1664,9 +1680,9 @@ default-package-overrides: - Only ==0.1 - oo-prototypes ==0.1.0.0 - opaleye ==0.7.1.0 + - open-browser ==0.2.1.0 - OpenAL ==1.7.0.5 - openapi3 ==3.0.1.0 - - open-browser ==0.2.1.0 - openexr-write ==0.1.0.2 - OpenGL ==3.0.3.0 - OpenGLRaw ==3.3.4.0 @@ -1728,12 +1744,12 @@ default-package-overrides: - pathtype ==0.8.1.1 - pathwalk ==0.3.1.2 - pattern-arrows ==0.0.2 - - pava ==0.1.0.0 + - pava ==0.1.1.0 - pcg-random ==0.1.3.7 - pcre-heavy ==1.0.0.2 - pcre-light ==0.4.1.0 - pcre-utils ==0.1.8.1.1 - - pdfinfo ==1.5.4 + - pcre2 ==1.1.3.1 - peano ==0.1.0.1 - pem ==0.2.4 - percent-format ==0.0.1 @@ -1742,19 +1758,20 @@ default-package-overrides: - persist ==0.1.1.5 - persistable-record ==0.6.0.5 - persistable-types-HDBC-pg ==0.0.3.5 - - persistent ==2.10.5.3 + - persistent ==2.11.0.2 - persistent-documentation ==0.1.0.2 - persistent-mtl ==0.2.0.0 - - persistent-mysql ==2.10.2.3 + - persistent-mysql ==2.10.3.1 - persistent-pagination ==0.1.1.2 - - persistent-postgresql ==2.10.1.2 + - persistent-postgresql ==2.11.0.1 - persistent-qq ==2.9.2.1 - - persistent-sqlite ==2.10.6.2 - - persistent-template ==2.8.2.3 - - persistent-typed-db ==0.1.0.1 + - persistent-sqlite ==2.11.0.0 + - persistent-template ==2.9.1.0 + - persistent-test ==2.0.3.5 + - persistent-typed-db ==0.1.0.2 - pg-harness-client ==0.6.0 - - pgp-wordlist ==0.1.0.3 - pg-transact ==0.3.1.1 + - pgp-wordlist ==0.1.0.3 - phantom-state ==0.2.1.2 - pid1 ==0.1.2.0 - pinboard ==0.10.2.0 @@ -1793,6 +1810,7 @@ default-package-overrides: - port-utils ==0.2.1.0 - posix-paths ==0.2.1.6 - possibly ==1.0.0.0 + - post-mess-age ==0.2.1.0 - postgres-options ==0.2.0.0 - postgresql-binary ==0.12.3.3 - postgresql-libpq ==0.9.4.3 @@ -1801,28 +1819,27 @@ default-package-overrides: - postgresql-simple ==0.6.3 - postgresql-typed ==0.6.1.2 - postgrest ==7.0.1 - - post-mess-age ==0.2.1.0 - pptable ==0.3.0.0 - pqueue ==1.4.1.3 - prairie ==0.0.1.0 - prefix-units ==0.2.0 - prelude-compat ==0.0.0.2 - prelude-safeenum ==0.1.1.2 - - prettyclass ==1.0.0.0 - pretty-class ==1.0.1.1 - pretty-diff ==0.2.0.3 - pretty-hex ==1.1 - - prettyprinter ==1.6.2 + - pretty-relative-time ==0.2.0.0 + - pretty-show ==1.10 + - pretty-simple ==4.0.0.0 + - pretty-sop ==0.2.0.3 + - pretty-terminal ==0.1.0.0 + - prettyclass ==1.0.0.0 + - prettyprinter ==1.7.0 - prettyprinter-ansi-terminal ==1.1.2 - - prettyprinter-compat-annotated-wl-pprint ==1 + - prettyprinter-compat-annotated-wl-pprint ==1.1 - prettyprinter-compat-ansi-wl-pprint ==1.0.1 - prettyprinter-compat-wl-pprint ==1.0.0.1 - prettyprinter-convert-ansi-wl-pprint ==1.1.1 - - pretty-relative-time ==0.2.0.0 - - pretty-show ==1.10 - - pretty-simple ==3.3.0.0 - - pretty-sop ==0.2.0.3 - - pretty-terminal ==0.1.0.0 - primes ==0.2.1.0 - primitive ==0.7.1.0 - primitive-addr ==0.1.0.2 @@ -1831,19 +1848,24 @@ default-package-overrides: - primitive-unlifted ==0.1.3.0 - print-console-colors ==0.1.0.0 - probability ==0.2.7 - - process-extras ==0.7.4 - product-isomorphic ==0.0.3.3 - product-profunctors ==0.11.0.1 - profiterole ==0.1 - profunctors ==5.5.2 - - projectroot ==0.2.0.1 - project-template ==0.2.1.0 + - projectroot ==0.2.0.1 - prometheus ==2.2.2 - prometheus-client ==1.0.1 - prometheus-wai-middleware ==1.0.1.0 - promises ==0.3 - prompt ==0.1.1.2 - prospect ==0.1.0.0 + - proto-lens ==0.7.0.0 + - proto-lens-optparse ==0.1.1.7 + - proto-lens-protobuf-types ==0.7.0.0 + - proto-lens-protoc ==0.7.0.0 + - proto-lens-runtime ==0.7.0.0 + - proto-lens-setup ==0.4.0.4 - proto3-wire ==1.1.0 - protobuf ==0.2.1.3 - protobuf-simple ==0.1.1.0 @@ -1851,13 +1873,6 @@ default-package-overrides: - protocol-buffers-descriptor ==2.4.17 - protocol-radius ==0.0.1.1 - protocol-radius-test ==0.1.0.1 - - proto-lens ==0.7.0.0 - - proto-lens-arbitrary ==0.1.2.9 - - proto-lens-optparse ==0.1.1.7 - - proto-lens-protobuf-types ==0.7.0.0 - - proto-lens-protoc ==0.7.0.0 - - proto-lens-runtime ==0.7.0.0 - - proto-lens-setup ==0.4.0.4 - protolude ==0.3.0 - proxied ==0.3.1 - psqueues ==0.2.7.2 @@ -1875,13 +1890,13 @@ default-package-overrides: - qrcode-juicypixels ==0.8.2 - quadratic-irrational ==0.1.1 - QuasiText ==0.1.2.6 - - QuickCheck ==2.13.2 + - QuickCheck ==2.14.2 - quickcheck-arbitrary-adt ==0.3.1.0 - quickcheck-assertions ==0.3.0 - quickcheck-classes ==0.6.4.0 - quickcheck-classes-base ==0.6.1.0 - quickcheck-higherorder ==0.1.0.0 - - quickcheck-instances ==0.3.23 + - quickcheck-instances ==0.3.25.2 - quickcheck-io ==0.2.0 - quickcheck-simple ==0.1.1.1 - quickcheck-special ==0.1.0.6 @@ -1889,6 +1904,7 @@ default-package-overrides: - quickcheck-transformer ==0.3.1.1 - quickcheck-unicode ==1.0.1.0 - quiet ==0.2 + - quote-quot ==0.1.0.0 - radius ==0.7.1.0 - rainbow ==0.34.2.2 - rainbox ==0.26.0.0 @@ -1903,37 +1919,38 @@ default-package-overrides: - random-source ==0.3.0.8 - random-tree ==0.6.0.5 - range ==0.3.0.2 - - Ranged-sets ==0.4.0 - range-set-list ==0.1.3.1 + - Ranged-sets ==0.4.0 - rank1dynamic ==0.4.1 - rank2classes ==1.4.1 - Rasterific ==0.7.5.3 - rasterific-svg ==0.3.3.2 - - ratel ==1.0.12 - rate-limit ==1.4.2 + - ratel ==1.0.12 - ratel-wai ==1.1.3 - rattle ==0.2 + - raw-strings-qq ==1.1 - rawfilepath ==0.2.4 - rawstring-qm ==0.2.3.0 - - raw-strings-qq ==1.1 - rcu ==0.2.4 - rdf ==0.1.0.4 - rdtsc ==1.3.0.1 - re2 ==0.3 - - readable ==0.3.1 - read-editor ==0.1.0.2 - read-env-var ==1.0.0.0 - - reanimate ==1.1.2.1 + - readable ==0.3.1 + - reanimate ==1.1.3.1 - reanimate-svg ==0.13.0.0 - rebase ==1.6.1 - record-dot-preprocessor ==0.2.7 - record-hasfield ==1.0 - - records-sop ==0.1.0.3 - record-wrangler ==0.1.1.0 + - records-sop ==0.1.0.3 - recursion-schemes ==5.2.1 - reducers ==3.12.3 - - refact ==0.3.0.2 - ref-fd ==0.4.0.2 + - ref-tf ==0.4.0.2 + - refact ==0.3.0.2 - refined ==0.6.1 - reflection ==2.1.6 - reform ==0.2.7.4 @@ -1941,7 +1958,6 @@ default-package-overrides: - reform-hamlet ==0.0.5.3 - reform-happstack ==0.2.5.4 - RefSerialize ==0.4.0 - - ref-tf ==0.4.0.2 - regex ==1.1.0.0 - regex-applicative ==0.3.4 - regex-applicative-text ==0.1.0.1 @@ -1999,15 +2015,15 @@ default-package-overrides: - runmemo ==1.0.0.1 - rvar ==0.2.0.6 - safe ==0.3.19 - - safecopy ==0.10.3 - safe-decimal ==0.2.0.0 - safe-exceptions ==0.1.7.1 - safe-foldable ==0.1.0.0 - - safeio ==0.0.5.0 - - safe-json ==1.1.1 + - safe-json ==1.1.1.1 - safe-money ==0.9 - - SafeSemaphore ==0.10.1 - safe-tensor ==0.2.1.0 + - safecopy ==0.10.3 + - safeio ==0.0.5.0 + - SafeSemaphore ==0.10.1 - salak ==0.3.6 - salak-yaml ==0.3.5.3 - saltine ==0.1.1.0 @@ -2043,10 +2059,10 @@ default-package-overrides: - semialign-indexed ==1.1 - semialign-optics ==1.1 - semigroupoid-extras ==5 - - semigroupoids ==5.3.4 + - semigroupoids ==5.3.5 - semigroups ==0.19.1 - - semirings ==0.5.4 - semiring-simple ==1.0.0.1 + - semirings ==0.5.4 - semver ==0.4.0.1 - sendfile ==0.7.11.1 - seqalign ==0.2.0.4 @@ -2092,9 +2108,9 @@ default-package-overrides: - shared-memory ==0.2.0.0 - shell-conduit ==5.0.0 - shell-escape ==0.2.0 + - shell-utility ==0.1 - shellmet ==0.0.3.1 - shelltestrunner ==1.9 - - shell-utility ==0.1 - shelly ==1.9.0 - shikensu ==0.3.11 - should-not-typecheck ==2.1.0 @@ -2104,7 +2120,7 @@ default-package-overrides: - silently ==1.2.5.1 - simple-affine-space ==0.1.1 - simple-cabal ==0.1.3 - - simple-cmd ==0.2.2 + - simple-cmd ==0.2.3 - simple-cmd-args ==0.1.6 - simple-log ==0.9.12 - simple-reflect ==0.3.3 @@ -2123,12 +2139,12 @@ default-package-overrides: - skein ==1.0.9.4 - skews ==0.1.0.3 - skip-var ==0.1.1.0 - - skylighting ==0.10.1 - - skylighting-core ==0.10.1 + - skylighting ==0.10.2 + - skylighting-core ==0.10.2 - slack-api ==0.12 - slack-progressbar ==0.1.0.1 - slist ==0.1.1.0 - - slynx ==0.5.0 + - slynx ==0.5.0.1 - smallcheck ==1.2.0 - smash ==0.1.1.0 - smash-aeson ==0.1.0.0 @@ -2161,21 +2177,21 @@ default-package-overrides: - splice ==0.6.1.1 - splint ==1.0.1.2 - split ==0.2.3.4 - - splitmix ==0.0.5 + - splitmix ==0.1.0.3 - spoon ==0.3.1 - spreadsheet ==0.1.3.8 + - sql-words ==0.1.6.4 - sqlcli ==0.2.2.0 - sqlcli-odbc ==0.2.0.1 - sqlite-simple ==0.4.18.0 - - sql-words ==0.1.6.4 - squeal-postgresql ==0.7.0.1 - - squeather ==0.4.0.0 + - squeather ==0.6.0.0 - srcloc ==0.5.1.2 - stache ==2.2.0 - - stackcollapse-ghc ==0.0.1.3 - stack-templatizer ==0.1.0.2 + - stackcollapse-ghc ==0.0.1.3 - stateref ==0.3 - - StateVar ==1.2 + - StateVar ==1.2.1 - static-text ==0.2.0.6 - statistics ==0.15.2.0 - status-notifier-item ==0.3.0.5 @@ -2188,15 +2204,15 @@ default-package-overrides: - stm-extras ==0.1.0.3 - stm-hamt ==1.2.0.4 - stm-lifted ==2.5.0.0 - - STMonadTrans ==0.4.4 - stm-split ==0.0.2.1 + - STMonadTrans ==0.4.5 - stopwatch ==0.1.0.6 - storable-complex ==0.2.3.0 - storable-endian ==0.2.6 - storable-record ==0.0.5 - storable-tuple ==0.0.3.3 - storablevector ==0.2.13.1 - - store ==0.7.8 + - store ==0.7.9 - store-core ==0.4.4.4 - store-streaming ==0.2.0.3 - stratosphere ==0.59.1 @@ -2210,7 +2226,6 @@ default-package-overrides: - strict-list ==0.1.5 - strict-tuple ==0.1.4 - strict-tuple-lens ==0.1.0.1 - - stringbuilder ==0.5.1 - string-class ==0.1.7.0 - string-combinators ==0.6.0.5 - string-conv ==0.1.2 @@ -2218,8 +2233,9 @@ default-package-overrides: - string-interpolate ==0.3.0.2 - string-qq ==0.0.4 - string-random ==0.1.3.0 - - stringsearch ==0.3.6.6 - string-transform ==1.1.1 + - stringbuilder ==0.5.1 + - stringsearch ==0.3.6.6 - stripe-concepts ==1.0.2.4 - stripe-core ==2.6.2 - stripe-haskell ==2.6.2 @@ -2244,14 +2260,14 @@ default-package-overrides: - symmetry-operations-symbols ==0.0.2.1 - sysinfo ==0.1.1 - system-argv0 ==0.1.1 - - systemd ==2.3.0 - system-fileio ==0.3.16.4 - system-filepath ==0.4.14 - system-info ==0.5.1 + - systemd ==2.3.0 - tabular ==0.2.2.8 - taffybar ==3.2.3 - tagchup ==0.4.1.1 - - tagged ==0.8.6 + - tagged ==0.8.6.1 - tagged-binary ==0.2.0.1 - tagged-identity ==0.1.3 - tagged-transformer ==0.8.1 @@ -2264,29 +2280,29 @@ default-package-overrides: - tardis ==0.4.1.0 - tasty ==1.2.3 - tasty-ant-xml ==1.1.7 - - tasty-dejafu ==2.0.0.6 + - tasty-dejafu ==2.0.0.7 - tasty-discover ==4.2.2 - tasty-expected-failure ==0.11.1.2 + - tasty-focus ==1.0.1 - tasty-golden ==2.3.3.2 - tasty-hedgehog ==1.0.0.2 - tasty-hspec ==1.1.6 - - tasty-hunit ==0.10.0.2 - - tasty-hunit-compat ==0.2 + - tasty-hunit ==0.10.0.3 + - tasty-hunit-compat ==0.2.0.1 - tasty-kat ==0.0.3 - tasty-leancheck ==0.0.1 - tasty-lua ==0.2.3.1 - tasty-program ==1.0.5 - - tasty-quickcheck ==0.10.1.1 + - tasty-quickcheck ==0.10.1.2 - tasty-rerun ==1.1.18 - - tasty-silver ==3.1.15 - - tasty-smallcheck ==0.8.1 + - tasty-smallcheck ==0.8.2 - tasty-test-reporter ==0.1.1.4 - tasty-th ==0.1.7 - tasty-wai ==0.1.1.1 - Taxonomy ==2.1.0 - TCache ==0.12.1 - tce-conf ==1.3 - - tdigest ==0.2.1 + - tdigest ==0.2.1.1 - template-haskell-compat-v0208 ==0.1.5 - temporary ==1.3 - temporary-rc ==1.2.0.3 @@ -2303,8 +2319,8 @@ default-package-overrides: - test-framework-smallcheck ==0.2 - test-fun ==0.1.0.0 - testing-type-modifiers ==0.1.0.1 - - texmath ==0.12.0.3 - - text-ansi ==0.1.0.1 + - texmath ==0.12.1 + - text-ansi ==0.1.0.2 - text-binary ==0.2.1.1 - text-builder ==0.6.6.1 - text-conversions ==0.3.1 @@ -2312,7 +2328,6 @@ default-package-overrides: - text-icu ==0.7.0.1 - text-latin1 ==0.3.1 - text-ldap ==0.1.1.13 - - textlocal ==0.1.0.5 - text-manipulate ==0.2.0.1 - text-metrics ==0.3.0 - text-postgresql ==0.0.3.1 @@ -2322,20 +2337,17 @@ default-package-overrides: - text-short ==0.1.3 - text-show ==3.9 - text-show-instances ==3.8.4 - - text-zipper ==0.10.1 - - tfp ==1.0.1.1 + - text-zipper ==0.11 + - textlocal ==0.1.0.5 - tf-random ==0.5 - - th-abstraction ==0.4.1.0 + - tfp ==1.0.1.1 + - th-abstraction ==0.4.2.0 - th-bang-compat ==0.0.1.0 - th-compat ==0.1 - th-constraint-compat ==0.0.1.0 - th-data-compat ==0.1.0.0 - th-desugar ==1.11 - th-env ==0.1.0.2 - - these ==1.1.1.1 - - these-lens ==1.0.1.1 - - these-optics ==1.0.1.1 - - these-skinny ==0.7.4 - th-expand-syns ==0.4.6.0 - th-extras ==0.0.0.4 - th-lift ==0.8.2 @@ -2343,33 +2355,37 @@ default-package-overrides: - th-nowq ==0.1.0.5 - th-orphans ==0.13.11 - th-printf ==0.7 - - thread-hierarchy ==0.3.0.2 - - thread-local-storage ==0.2 - - threads ==0.5.1.6 - - thread-supervisor ==0.2.0.0 - - threepenny-gui ==0.9.0.0 - th-reify-compat ==0.0.1.5 - th-reify-many ==0.1.9 - - throttle-io-stream ==0.2.0.1 - - through-text ==0.1.0.0 - - throwable-exceptions ==0.1.0.9 - th-strict-compat ==0.1.0.1 - th-test-utils ==1.1.0 - th-utilities ==0.2.4.1 + - these ==1.1.1.1 + - these-lens ==1.0.1.1 + - these-optics ==1.0.1.1 + - these-skinny ==0.7.4 + - thread-hierarchy ==0.3.0.2 + - thread-local-storage ==0.2 + - thread-supervisor ==0.2.0.0 + - threads ==0.5.1.6 + - threepenny-gui ==0.9.0.0 + - throttle-io-stream ==0.2.0.1 + - through-text ==0.1.0.0 + - throwable-exceptions ==0.1.0.9 - thyme ==0.3.5.5 - tidal ==1.6.1 - tile ==0.3.0.0 - time-compat ==1.9.5 - - timeit ==2.0 - - timelens ==0.2.0.2 - time-lens ==0.4.0.2 - time-locale-compat ==0.1.1.5 - time-locale-vietnamese ==1.0.0.0 - time-manager ==0.0.0 - time-parsers ==0.1.2.1 - - timerep ==2.0.1.0 - - timer-wheel ==0.3.0 - time-units ==1.0.0 + - timeit ==2.0 + - timelens ==0.2.0.2 + - timer-wheel ==0.3.0 + - timerep ==2.0.1.0 - timezone-olson ==0.2.0 - timezone-series ==0.1.9 - tinylog ==0.15.0 @@ -2378,7 +2394,7 @@ default-package-overrides: - tls ==1.5.4 - tls-debug ==0.4.8 - tls-session-manager ==0.0.4 - - tlynx ==0.5.0 + - tlynx ==0.5.0.1 - tmapchan ==0.0.3 - tmapmvar ==0.0.4 - tmp-postgres ==1.34.1.0 @@ -2404,13 +2420,10 @@ default-package-overrides: - ttl-hashtables ==1.4.1.0 - ttrie ==0.1.2.1 - tuple ==0.3.0.2 - - tuples-homogenous-h98 ==0.1.1.0 - tuple-sop ==0.3.1.0 - tuple-th ==0.2.5 + - tuples-homogenous-h98 ==0.1.1.0 - turtle ==1.5.20 - - TypeCompose ==0.9.14 - - typed-process ==0.2.6.0 - - typed-uuid ==0.0.0.2 - type-equality ==1 - type-errors ==0.2.0.0 - type-errors-pretty ==0.0.1.1 @@ -2424,8 +2437,11 @@ default-package-overrides: - type-of-html ==1.6.1.2 - type-of-html-static ==0.1.0.2 - type-operators ==0.2.0.0 - - typerep-map ==0.3.3.0 - type-spec ==0.4.0.0 + - TypeCompose ==0.9.14 + - typed-process ==0.2.6.0 + - typed-uuid ==0.0.0.2 + - typerep-map ==0.3.3.0 - tzdata ==0.2.20201021.0 - ua-parser ==0.7.5.1 - uglymemo ==0.1.0.1 @@ -2448,7 +2464,7 @@ default-package-overrides: - uniplate ==1.6.13 - uniprot-kb ==0.1.2.0 - uniq-deep ==1.2.0 - - unique ==0 + - unique ==0.0.1 - unique-logic ==0.4 - unique-logic-tf ==0.5.1 - unit-constraint ==0.0.0 @@ -2459,7 +2475,7 @@ default-package-overrides: - universe-instances-trans ==1.1 - universe-reverse-instances ==1.1 - universe-some ==1.2 - - universum ==1.7.1 + - universum ==1.5.0 - unix-bytestring ==0.3.7.3 - unix-compat ==0.5.2 - unix-time ==0.4.7 @@ -2477,7 +2493,7 @@ default-package-overrides: - users ==0.5.0.0 - utf8-conversions ==0.1.0.4 - utf8-light ==0.4.2 - - utf8-string ==1.0.1.1 + - utf8-string ==1.0.2 - util ==0.1.17.1 - utility-ht ==0.0.15 - uuid ==1.3.13 @@ -2508,7 +2524,7 @@ default-package-overrides: - vector-instances ==3.4 - vector-mmap ==0.0.3 - vector-rotcev ==0.1.0.0 - - vector-sized ==1.4.3 + - vector-sized ==1.4.3.1 - vector-space ==0.16 - vector-split ==1.0.0.2 - vector-th-unbox ==0.2.1.7 @@ -2527,7 +2543,7 @@ default-package-overrides: - wai-cors ==0.2.7 - wai-enforce-https ==0.0.2.1 - wai-eventsource ==3.0.0 - - wai-extra ==3.1.4.1 + - wai-extra ==3.1.5 - wai-feature-flags ==0.1.0.1 - wai-handler-launch ==3.0.3.1 - wai-logger ==2.3.6 @@ -2557,24 +2573,26 @@ default-package-overrides: - websockets ==0.12.7.2 - websockets-snap ==0.10.3.1 - weigh ==0.0.16 - - wide-word ==0.1.1.1 + - wide-word ==0.1.1.2 - wikicfp-scraper ==0.1.0.11 + - wild-bind ==0.1.2.6 + - wild-bind-x11 ==0.2.0.11 - Win32 ==2.6.1.0 - Win32-notify ==0.3.0.3 - windns ==0.1.0.1 - witch ==0.0.0.4 - - witherable-class ==0 - - within ==0.2.0.1 - with-location ==0.1.0 - with-utf8 ==1.0.2.1 + - witherable-class ==0 + - within ==0.2.0.1 - wizards ==1.0.3 - wl-pprint-annotated ==0.1.0.1 - wl-pprint-console ==0.1.0.2 - wl-pprint-text ==1.2.0.1 - - word24 ==2.0.1 - - word8 ==0.1.3 - word-trie ==0.3.0 - word-wrap ==0.4.1 + - word24 ==2.0.1 + - word8 ==0.1.3 - world-peace ==1.0.2.0 - wrap ==0.0.0 - wreq ==0.5.3.2 @@ -2595,22 +2613,22 @@ default-package-overrides: - xdg-desktop-entry ==0.1.1.1 - xdg-userdirs ==0.1.0.2 - xeno ==0.4.2 - - xls ==0.1.3 - xlsx ==0.8.2 - xlsx-tabular ==0.2.2.1 - xml ==1.3.14 - xml-basic ==0.1.3.1 - xml-conduit ==1.9.0.0 - xml-conduit-writer ==0.1.1.2 - - xmlgen ==0.6.2.2 - xml-hamlet ==0.5.0.1 - xml-helpers ==1.0.0 + - xml-html-qq ==0.1.0.1 - xml-indexed-cursor ==0.1.1.0 - xml-lens ==0.2 - xml-picklers ==0.3.6 - xml-to-json ==2.0.1 - xml-to-json-fast ==2.0.0 - xml-types ==0.3.8 + - xmlgen ==0.6.2.2 - xmonad ==0.15 - xmonad-contrib ==0.16 - xmonad-extras ==0.15.2 @@ -2618,23 +2636,24 @@ default-package-overrides: - xxhash-ffi ==0.2.0.0 - yaml ==0.11.5.0 - yamlparse-applicative ==0.1.0.2 + - yes-precure5-command ==5.5.3 - yesod ==1.6.1.0 - yesod-auth ==1.6.10.1 - yesod-auth-hashdb ==1.7.1.5 + - yesod-auth-oauth2 ==0.6.1.7 - yesod-bin ==1.6.0.6 - - yesod-core ==1.6.18.7 + - yesod-core ==1.6.18.8 - yesod-fb ==0.6.1 - yesod-form ==1.6.7 - yesod-gitrev ==0.2.1 - yesod-newsfeed ==1.7.0.0 - - yesod-page-cursor ==2.0.0.0 + - yesod-page-cursor ==2.0.0.1 - yesod-paginator ==1.1.1.0 - yesod-persistent ==1.6.0.5 - yesod-sitemap ==1.6.0 - yesod-static ==1.6.1.0 - - yesod-test ==1.6.11 + - yesod-test ==1.6.12 - yesod-websockets ==0.3.0.2 - - yes-precure5-command ==5.5.3 - yi-rope ==0.11 - yjsvg ==0.2.0.1 - yjtools ==0.9.18 @@ -2649,9 +2668,9 @@ default-package-overrides: - zio ==0.1.0.2 - zip ==1.6.0 - zip-archive ==0.4.1 + - zip-stream ==0.2.0.1 - zipper-extra ==0.1.3.2 - zippers ==0.3 - - zip-stream ==0.2.0.1 - zlib ==0.6.2.2 - zlib-bindings ==0.1.1.5 - zlib-lens ==0.1.2.1 @@ -3124,6 +3143,7 @@ broken-packages: - Annotations - anonymous-sums - anonymous-sums-tests + - ansi-terminal-game - ansigraph - antagonist - antfarm @@ -3183,6 +3203,7 @@ broken-packages: - applicative-quoters - applicative-splice - approveapi + - approx - ApproxFun-hs - arb-fft - arbb-vm @@ -3190,7 +3211,6 @@ broken-packages: - arbor-monad-counter - arbor-monad-metric - arbor-monad-metric-datadog - - arbtt - arch-hs - archive-libarchive - archiver @@ -3389,6 +3409,7 @@ broken-packages: - basex-client - BASIC - basic + - basic-sop - baskell - batchd - battlenet @@ -3487,6 +3508,7 @@ broken-packages: - bindings-K8055 - bindings-libftdi - bindings-libg15 + - bindings-libpci - bindings-librrd - bindings-libstemmer - bindings-libusb @@ -3653,7 +3675,9 @@ broken-packages: - broker-haskell - bronyradiogermany-common - bronyradiogermany-streaming + - brotli - brotli-conduit + - brotli-streams - browscap - bsd-sysctl - bson @@ -3773,6 +3797,7 @@ broken-packages: - cache-polysemy - cached - caching + - caching-vault - cacophony - cafeteria-prelude - caffegraph @@ -3939,6 +3964,7 @@ broken-packages: - chunky - church - church-maybe + - churros - cielo - cil - cinvoke @@ -3946,6 +3972,7 @@ broken-packages: - cipher-blowfish - ciphersaber2 - circlehs + - circular - citation-resolve - citeproc-hs - citeproc-hs-pandoc-filter @@ -4162,9 +4189,13 @@ broken-packages: - conduit-vfs-zip - conf - confcrypt + - conferer-dhall - conferer-provider-dhall - conferer-provider-json - conferer-provider-yaml + - conferer-source-dhall + - conferer-source-json + - conferer-source-yaml - conffmt - confide - config-parser @@ -4182,6 +4213,7 @@ broken-packages: - conkin - conlogger - connection-string + - connections - Conscript - consistent - console-program @@ -4338,6 +4370,7 @@ broken-packages: - cspmchecker - cspretty - css + - css-easings - css-selectors - csv-enumerator - csv-nptools @@ -4352,6 +4385,7 @@ broken-packages: - currency-convert - curry-frontend - CurryDB + - curryer-rpc - cursedcsv - cursor-fuzzy-time-gen - curves @@ -4405,6 +4439,7 @@ broken-packages: - data-fin - data-fin-simple - data-flagset + - data-interval - data-ivar - data-kiln - data-layer @@ -4419,6 +4454,7 @@ broken-packages: - data-object-yaml - data-pprint - data-quotientref + - data-r-tree - data-reify-cse - data-repr - data-result @@ -4562,11 +4598,15 @@ broken-packages: - dgim - dgs - dhall-check + - dhall-docs - dhall-fly + - dhall-json + - dhall-lsp-server - dhall-nix - dhall-nixpkgs - dhall-text - dhall-to-cabal + - dhall-yaml - dhcp-lease-parser - dhrun - dia-base @@ -4631,6 +4671,7 @@ broken-packages: - direct-plugins - direct-rocksdb - directed-cubical + - directory-contents - direm - dirfiles - discogs-haskell @@ -4799,6 +4840,7 @@ broken-packages: - dzen-utils - each - earclipper + - early - easy-api - easy-bitcoin - easyjson @@ -4861,6 +4903,8 @@ broken-packages: - elm-street - elm-websocket - elsa + - elynx + - elynx-tree - emacs-keys - emacs-module - email @@ -4931,6 +4975,7 @@ broken-packages: - ersatz - ersatz-toysat - ert + - escape-artist - escoger - esotericbot - EsounD @@ -4982,6 +5027,7 @@ broken-packages: - exference - exherbo-cabal - exif + - exigo-schema - exinst-deepseq - exinst-hashable - exists @@ -5032,6 +5078,8 @@ broken-packages: - FailureT - fake - fake-type + - fakedata + - fakedata-quickcheck - faktory - falling-turnip - fallingblocks @@ -5133,6 +5181,7 @@ broken-packages: - filesystem-enumerator - filesystem-trees - fillit + - Fin - final-pretty-printer - Finance-Quote-Yahoo - Finance-Treasury @@ -5250,6 +5299,7 @@ broken-packages: - foscam-filename - foscam-sort - Foster + - fp-ieee - fpco-api - fplll - fpnla-examples @@ -5408,6 +5458,7 @@ broken-packages: - generic-binary - generic-church - generic-enum + - generic-enumeration - generic-lens-labels - generic-lucid-scaffold - generic-maybe @@ -5779,6 +5830,7 @@ broken-packages: - hack2-handler-mongrel2-http - hack2-handler-snap-server - hack2-handler-warp + - hackage-api - hackage-diff - hackage-mirror - hackage-processing @@ -5974,6 +6026,7 @@ broken-packages: - haskell-igraph - haskell-in-space - haskell-kubernetes + - haskell-language-server - haskell-lsp-client - haskell-ml - haskell-mpfr @@ -6111,6 +6164,7 @@ broken-packages: - hasql-queue - hasql-simple - hasql-th + - hasql-url - hastache - hastache-aeson - haste @@ -6163,6 +6217,7 @@ broken-packages: - hCM - hcoap - hcom + - hcount - hcron - hCsound - hcube @@ -6208,6 +6263,7 @@ broken-packages: - heckle - hedgehog-checkers - hedgehog-checkers-lens + - hedgehog-fakedata - hedgehog-gen-json - hedgehog-generic - hedgehog-golden @@ -6272,6 +6328,7 @@ broken-packages: - hexpress - hexquote - hext + - hextream - heyefi - heyting-algebras - hF2 @@ -6315,6 +6372,7 @@ broken-packages: - hid-examples - hidden-char - hie-core + - hiedb - hieraclus - hierarchical-clustering-diagrams - hierarchical-exceptions @@ -6337,6 +6395,7 @@ broken-packages: - hinduce-classifier - hinduce-classifier-decisiontree - hinduce-examples + - hinit - hinquire - hinstaller - hint-server @@ -6397,6 +6456,9 @@ broken-packages: - hlrdb - hlrdb-core - hls + - hls-explicit-imports-plugin + - hls-hlint-plugin + - hls-retrie-plugin - hlwm - hly - hmark @@ -6426,7 +6488,6 @@ broken-packages: - hmt-diagrams - hmumps - hnetcdf - - hnix-store-remote - HNM - hnormalise - ho-rewriting @@ -6435,6 +6496,7 @@ broken-packages: - hobbes - hobbits - hocilib + - hocker - hodatime - HODE - hoe @@ -6449,7 +6511,6 @@ broken-packages: - hol - hold-em - hole - - holmes - Holumbus-Searchengine - holy-project - homeomorphic @@ -6498,6 +6559,7 @@ broken-packages: - hp2any-graph - hp2any-manager - hpack-convert + - hpack-dhall - hpaco - hpaco-lib - hpage @@ -6584,6 +6646,7 @@ broken-packages: - Hs2lib - hs2ps - hsaml2 + - hsautogui - hsay - hsbackup - hsbc @@ -6781,6 +6844,7 @@ broken-packages: - hugs2yc - hulk - HulkImport + - hum - human-parse - human-text - humble-prelude @@ -6794,6 +6858,7 @@ broken-packages: - hunt-server - hup - hurdle + - hurl - hurriyet - husk-scheme - husk-scheme-libs @@ -6810,6 +6875,7 @@ broken-packages: - hw-json-simd - hw-json-simple-cursor - hw-json-standard-cursor + - hw-kafka-avro - hw-prim-bits - hw-simd - hw-uri @@ -7206,6 +7272,7 @@ broken-packages: - karps - katip-elasticsearch - katip-kafka + - katip-raven - katip-rollbar - katip-scalyr-scribe - katip-syslog @@ -7249,6 +7316,7 @@ broken-packages: - kickchan - kif-parser - kit + - kleene - kmeans-par - kmeans-vector - kmonad @@ -7385,6 +7453,7 @@ broken-packages: - latex-svg-image - latex-svg-pandoc - LATS + - lattices - launchdarkly-server-sdk - launchpad-control - lawless-concurrent-machines @@ -7417,6 +7486,7 @@ broken-packages: - learn - learn-physics-examples - Learning + - leb128 - leetify - legion - legion-discovery @@ -7497,6 +7567,7 @@ broken-packages: - linda - linden - line-bot-sdk + - line-drawing - linear-algebra-cblas - linear-circuit - linear-code @@ -7760,6 +7831,8 @@ broken-packages: - marvin-interpolate - masakazu-bot - MASMGen + - massiv-persist + - massiv-serialise - master-plan - matchers - math-grads @@ -7791,6 +7864,7 @@ broken-packages: - mcl - mcm - mcmaster-gloss-examples + - mcmc - mcmc-samplers - mcmc-synthesis - mcpi @@ -7895,6 +7969,7 @@ broken-packages: - minst-idx - mios - MIP + - MIP-glpk - mirror-tweet - miso - miso-action-logger @@ -8191,6 +8266,7 @@ broken-packages: - neko-lib - Neks - nemesis-titan + - neptune-backend - nerf - nero - nero-wai @@ -8200,6 +8276,11 @@ broken-packages: - nested-sequence - NestedFunctor - nestedmap + - net-mqtt + - net-mqtt-lens + - net-mqtt-rpc + - net-spider + - net-spider-cli - net-spider-pangraph - net-spider-rpl - net-spider-rpl-cli @@ -8414,6 +8495,7 @@ broken-packages: - open-union - OpenAFP - OpenAFP-Utils + - openai-hs - openapi-petstore - openapi-typed - openapi3 @@ -8460,6 +8542,7 @@ broken-packages: - orchid-demo - order-maintenance - order-statistics + - ordinal - Ordinary - ordrea - oref @@ -8561,6 +8644,7 @@ broken-packages: - parcom-lib - parconc-examples - pareto + - parochial - parquet-hs - Parry - parse-help @@ -8666,6 +8750,7 @@ broken-packages: - persistent-migration - persistent-mongoDB - persistent-mysql-haskell + - persistent-odbc - persistent-protobuf - persistent-ratelimit - persistent-relational-record @@ -8793,6 +8878,7 @@ broken-packages: - pocket-dns - point-octree - pointedalternative + - pointfree-fancy - pointful - pointless-haskell - pointless-lenses @@ -8823,6 +8909,7 @@ broken-packages: - polyseq - polytypeable - polytypeable-utils + - pomaps - pomodoro - pomohoro - ponder @@ -8832,6 +8919,7 @@ broken-packages: - pool-conduit - pop3-client - popenhs + - popkey - poppler - porcupine-core - porcupine-http @@ -8962,7 +9050,6 @@ broken-packages: - prof-flamegraph - prof2dot - prof2pretty - - profiteur - profunctor-monad - progress - progress-meter @@ -8990,7 +9077,9 @@ broken-packages: - prosidyc - prosper - proteaaudio + - proteaaudio-sdl - proteome + - proto-lens-arbitrary - proto-lens-combinators - proto-lens-descriptors - proto3-suite @@ -8999,6 +9088,7 @@ broken-packages: - protocol-buffers-descriptor-fork - protocol-buffers-fork - protolude-lifted + - proton - proton-haskell - prototype - prove-everywhere-server @@ -9030,6 +9120,7 @@ broken-packages: - pure-io - pure-priority-queue - pure-priority-queue-tests + - pure-zlib - purescheme-wai-routing-core - purescript - purescript-iso @@ -9099,6 +9190,7 @@ broken-packages: - quickcheck-report - quickcheck-state-machine - quickcheck-state-machine-distributed + - quickcheck-string-random - quickcheck-webdriver - QuickCheckVariant - QuickPlot @@ -9191,6 +9283,7 @@ broken-packages: - raz - razom-text-util - rbr + - rbst - rc - rclient - rdioh @@ -9264,6 +9357,7 @@ broken-packages: - reflex-fsnotify - reflex-gadt-api - reflex-ghci + - reflex-gi-gtk - reflex-gloss - reflex-gloss-scene - reflex-libtelnet @@ -9450,6 +9544,7 @@ broken-packages: - roc-cluster-demo - rock - rocksdb-haskell + - rocksdb-query - roku-api - rollbar - rollbar-cli @@ -9465,12 +9560,14 @@ broken-packages: - rope - rose-trees - rose-trie + - rosebud - roshask - rosmsg - rosmsg-bin - rosso - rotating-log - rounded + - rounded-hw - rounding - roundtrip-aeson - roundtrip-xml @@ -9506,6 +9603,7 @@ broken-packages: - runhs - runmany - runtime-arbitrary + - rv - rws - RxHaskell - s-expression @@ -9613,6 +9711,7 @@ broken-packages: - scp-streams - scrabble-bot - scrapbook + - scrapbook-core - scrape-changes - ScratchFs - script-monad @@ -9680,6 +9779,7 @@ broken-packages: - serv-wai - servant-aeson-specs - servant-auth-cookie + - servant-auth-docs - servant-auth-hmac - servant-auth-token - servant-auth-token-acid @@ -9690,6 +9790,8 @@ broken-packages: - servant-auth-wordpress - servant-avro - servant-cassava + - servant-checked-exceptions + - servant-checked-exceptions-core - servant-cli - servant-client-js - servant-client-namedargs @@ -9697,6 +9799,7 @@ broken-packages: - servant-db - servant-db-postgresql - servant-dhall + - servant-docs - servant-docs-simple - servant-ede - servant-ekg @@ -9708,6 +9811,7 @@ broken-packages: - servant-github - servant-haxl-client - servant-hmac-auth + - servant-http-streams - servant-http2-client - servant-iCalendar - servant-jquery @@ -9716,6 +9820,7 @@ broken-packages: - servant-kotlin - servant-matrix-param - servant-mock + - servant-multipart - servant-namedargs - servant-nix - servant-openapi3 @@ -9730,6 +9835,7 @@ broken-packages: - servant-py - servant-quickcheck - servant-rawm-client + - servant-rawm-docs - servant-reason - servant-reflex - servant-router @@ -9765,6 +9871,7 @@ broken-packages: - Set - set-of - set-with + - setdown - setgame - setoid - setters @@ -9825,7 +9932,10 @@ broken-packages: - show-prettyprint - showdown - Shpadoinkle-backend-pardiff + - Shpadoinkle-backend-snabbdom - Shpadoinkle-backend-static + - Shpadoinkle-developer-tools + - Shpadoinkle-disembodied - Shpadoinkle-examples - Shpadoinkle-html - Shpadoinkle-router @@ -9838,6 +9948,7 @@ broken-packages: - sifflet - sifflet-lib - sigma-ij + - sign - signable - signals - signed-multiset @@ -9901,6 +10012,7 @@ broken-packages: - sized-vector - sizes - sjsp + - SJW - skeletal-set - skeleton - skeletons @@ -9924,6 +10036,7 @@ broken-packages: - slot-lambda - sloth - slug + - slynx - small-bytearray-builder - smallarray - smallcheck-kind-generics @@ -9990,6 +10103,7 @@ broken-packages: - snaplet-mongodb-minimalistic - snaplet-mysql-simple - snaplet-oauth + - snaplet-persistent - snaplet-postgresql-simple - snaplet-postmark - snaplet-purescript @@ -10111,6 +10225,7 @@ broken-packages: - sql-simple-sqlite - sqlcipher - sqlite + - sqlite-simple-errors - sqlite-simple-typed - sqlvalue-list - sqsd-local @@ -10142,6 +10257,7 @@ broken-packages: - stack-run-auto - stack-type - stack-wrapper + - stack2cabal - stack2nix - stackage - stackage-build-plan @@ -10242,6 +10358,7 @@ broken-packages: - streaming-utils - streaming-with - streamly-archive + - streamly-lmdb - streamproc - strelka - strict-base-types @@ -10253,10 +10370,12 @@ broken-packages: - strictly - string-isos - string-quote + - string-random - string-typelits - stringlike - stringtable-atom - stripe + - stripe-hs - stripe-http-streams - stripe-scotty - stripe-wreq @@ -10315,6 +10434,7 @@ broken-packages: - svg2q - svgcairo - SVGFonts + - svgone - svgutils - svm-light-utils - svm-simple @@ -10345,6 +10465,7 @@ broken-packages: - symantic-http-server - symantic-http-test - symantic-lib + - symantic-parser - symantic-xml - symbiote - symbolic-link @@ -10383,6 +10504,7 @@ broken-packages: - t3-server - ta - table + - table-layout - table-tennis - tableaux - Tables @@ -10431,6 +10553,7 @@ broken-packages: - tasty-laws - tasty-lens - tasty-mgolden + - tasty-silver - tasty-stats - tateti-tateti - Taxonomy @@ -10479,6 +10602,7 @@ broken-packages: - tensorflow-logging - tensorflow-opgen - tensorflow-ops + - term-rewriting - termbox-banana - termbox-bindings - terminal-text @@ -10568,9 +10692,9 @@ broken-packages: - thih - thimk - Thingie + - thock - thorn - threadmanager - - threadscope - threepenny-editors - threepenny-gui-contextmenu - threepenny-gui-flexbox @@ -10632,6 +10756,7 @@ broken-packages: - tkhs - tkyprof - tls-extra + - tlynx - tmp-postgres - tn - to-haskell @@ -10653,6 +10778,8 @@ broken-packages: - tomato-rubato-openal - toml - tonatona-google-server-api + - tonatona-persistent-postgresql + - tonatona-persistent-sqlite - tonatona-servant - too-many-cells - toodles @@ -10746,6 +10873,7 @@ broken-packages: - tsvsql - tsweb - ttask + - ttn-client - tttool - tubes - tuntap @@ -10874,15 +11002,25 @@ broken-packages: - unicode-prelude - unicode-show - unicode-symbols + - unicode-tricks - uniform-io - union - union-map + - uniprot-kb - uniqueid - uniquely-represented-sets - units-attoparsec - unittyped - unitym-yesod - universal-binary + - universe + - universe-base + - universe-dependent-sum + - universe-instances-base + - universe-instances-extended + - universe-instances-trans + - universe-reverse-instances + - universe-some - universe-th - unix-fcntl - unix-handle @@ -11196,6 +11334,7 @@ broken-packages: - whitespace - whois - why3 + - wide-word - WikimediaParser - wikipedia4epub - wild-bind-indicator @@ -11223,6 +11362,7 @@ broken-packages: - woffex - wol - wolf + - word - word2vec-model - WordAlignment - wordchoice @@ -11443,6 +11583,7 @@ broken-packages: - yesod-mangopay - yesod-markdown - yesod-media-simple + - yesod-page-cursor - yesod-paginate - yesod-pagination - yesod-paypal-rest @@ -11509,6 +11650,7 @@ broken-packages: - yu-tool - yu-utils - yuuko + - yx - yxdb-utils - Z-Data - Z-IO diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index edf463d360e3..30476a1a6ce5 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -94,16 +94,6 @@ self: super: builtins.intersectAttrs super { # Won't find it's header files without help. sfml-audio = appendConfigureFlag super.sfml-audio "--extra-include-dirs=${pkgs.openal}/include/AL"; - # profiling is disabled to allow C++/C mess to work, which is fixed in GHC 8.8 - cachix = overrideSrc (disableLibraryProfiling super.cachix) { - src = (pkgs.fetchFromGitHub { - owner = "cachix"; - repo = "cachix"; - rev = "1471050f5906ecb7cd0d72115503d07d2e3beb17"; - sha256 = "1lkrmhv5x9dpy53w33kxnhv4x4qm711ha8hsgccrjmxaqcsdm59g"; - }) + "/cachix"; - version = "0.5.1"; - }; hercules-ci-agent = disableLibraryProfiling super.hercules-ci-agent; # avoid compiling twice by providing executable as a separate output (with small closure size) @@ -550,7 +540,6 @@ self: super: builtins.intersectAttrs super { # Break infinite recursion cycle between QuickCheck and splitmix. splitmix = dontCheck super.splitmix; - splitmix_0_1_0_3 = dontCheck super.splitmix_0_1_0_3; # Break infinite recursion cycle between tasty and clock. clock = dontCheck super.clock; @@ -722,7 +711,7 @@ self: super: builtins.intersectAttrs super { # mplayer-spot uses mplayer at runtime. mplayer-spot = - let path = pkgs.stdenv.lib.makeBinPath [ pkgs.mplayer ]; + let path = pkgs.lib.makeBinPath [ pkgs.mplayer ]; in overrideCabal (addBuildTool super.mplayer-spot pkgs.makeWrapper) (oldAttrs: { postInstall = '' wrapProgram $out/bin/mplayer-spot --prefix PATH : "${path}" @@ -734,7 +723,7 @@ self: super: builtins.intersectAttrs super { primitive_0_7_1_0 = dontCheck super.primitive_0_7_1_0; cut-the-crap = - let path = pkgs.stdenv.lib.makeBinPath [ pkgs.ffmpeg_3 pkgs.youtube-dl ]; + let path = pkgs.lib.makeBinPath [ pkgs.ffmpeg_3 pkgs.youtube-dl ]; in overrideCabal (addBuildTool super.cut-the-crap pkgs.makeWrapper) (_drv: { postInstall = '' wrapProgram $out/bin/cut-the-crap \ @@ -809,4 +798,7 @@ self: super: builtins.intersectAttrs super { # tests depend on a specific version of solc hevm = dontCheck (doJailbreak super.hevm); + + # waiting for https://github.com/haskell/ThreadScope/pull/115 + threadscope = doJailbreak super.threadscope; } diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index a221ce38c8a2..e135374511fb 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -33,7 +33,7 @@ in , profilingDetail ? "exported-functions" # TODO enable shared libs for cross-compiling , enableSharedExecutables ? false -, enableSharedLibraries ? (ghc.enableShared or false) +, enableSharedLibraries ? !stdenv.hostPlatform.isStatic && (ghc.enableShared or false) , enableDeadCodeElimination ? (!stdenv.isDarwin) # TODO: use -dead_strip for darwin , enableStaticLibraries ? !(stdenv.hostPlatform.isWindows or stdenv.hostPlatform.isWasm) , enableHsc2hsViaAsm ? stdenv.hostPlatform.isWindows && stdenv.lib.versionAtLeast ghc.version "8.4" diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 01ecb362709c..ef86756d4826 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -1278,28 +1278,31 @@ self: { }) {}; "BNFC" = callPackage - ({ mkDerivation, alex, array, base, containers, deepseq, directory - , doctest, filepath, happy, hspec, HUnit, mtl, pretty, process - , QuickCheck, semigroups, temporary, time + ({ mkDerivation, alex, array, base, Cabal, cabal-doctest + , containers, deepseq, directory, doctest, filepath, happy, hspec + , hspec-discover, HUnit, mtl, pretty, process, QuickCheck + , string-qq, temporary, time }: mkDerivation { pname = "BNFC"; - version = "2.8.4"; - sha256 = "0z84qfpfm402fl0fpxcggr4jz2sn8cqgjy50r6xfx310g7xwdgnd"; + version = "2.9.0"; + sha256 = "1h5365978q43r4sik1kmbrxnxa6lxnb54lhp7bi9599rnav8nw0z"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ array base ]; - executableHaskellDepends = [ + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ array base containers deepseq directory filepath mtl pretty process - semigroups time + string-qq time ]; - executableToolDepends = [ alex happy ]; + libraryToolDepends = [ alex happy ]; + executableHaskellDepends = [ base ]; testHaskellDepends = [ array base containers deepseq directory doctest filepath hspec - HUnit mtl pretty process QuickCheck semigroups temporary time + HUnit mtl pretty process QuickCheck string-qq temporary time ]; + testToolDepends = [ alex happy hspec-discover ]; description = "A compiler front-end generator"; - license = stdenv.lib.licenses.gpl2; + license = stdenv.lib.licenses.bsd3; }) {}; "BNFC-meta" = callPackage @@ -6023,6 +6026,8 @@ self: { ]; description = "Finite totally-ordered sets"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Finance-Quote-Yahoo" = callPackage @@ -7896,10 +7901,8 @@ self: { }: mkDerivation { pname = "HCL"; - version = "1.7.1"; - sha256 = "1rwg7sqm16rszv7grw2d7cnhllnrifnd9jjxn0p8n5qznv8m8vkp"; - revision = "1"; - editedCabalFile = "1gl61kqccd909dif3644qi1whrcbkrfif6d52hrlf2vc3kwpjs0z"; + version = "1.8"; + sha256 = "1h5mrrpr6kma8k0mqzzjcyg3nd94f7lv6a2k5pfxcqs01qy3khgk"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -10083,17 +10086,16 @@ self: { }) {}; "HaskellNet" = callPackage - ({ mkDerivation, array, base, base64-string, bytestring - , cryptohash-md5, mime-mail, mtl, network, network-bsd, old-time - , pretty, text + ({ mkDerivation, array, base, base64, bytestring, cryptohash-md5 + , mime-mail, mtl, network, network-bsd, old-time, pretty, text }: mkDerivation { pname = "HaskellNet"; - version = "0.5.3"; - sha256 = "0x3radqf6bbqijic8wsnwjlnrkij335rgg41f8jvxif11bn3rlns"; + version = "0.6"; + sha256 = "0jsnq5sqflw9qjbhcvgxsb0mlac6yl1427xp7nm6fbaa2mmv8jd2"; libraryHaskellDepends = [ - array base base64-string bytestring cryptohash-md5 mime-mail mtl - network network-bsd old-time pretty text + array base base64 bytestring cryptohash-md5 mime-mail mtl network + network-bsd old-time pretty text ]; description = "Client support for POP3, SMTP, and IMAP"; license = stdenv.lib.licenses.bsd3; @@ -11711,8 +11713,8 @@ self: { pname = "JuicyPixels-blurhash"; version = "0.1.0.3"; sha256 = "0kgl2j7990p8q5yrkn0wgaszc9fzva1pc3277j11k1lbjsymz360"; - revision = "2"; - editedCabalFile = "0phffs6r83sny6zr4zsrppzqy1lgybm6lqgfmbfgwhyvmd544qx6"; + revision = "3"; + editedCabalFile = "1mspqkmvn5j6xs3cb882szbnrzaxf0p2nyyxkfqfnbma204cs2fi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -12695,8 +12697,8 @@ self: { }: mkDerivation { pname = "ListLike"; - version = "4.7.2"; - sha256 = "15c1q4rl4kwpgpsdf4x7k17m2fgzimm9915k71cpjiv0sq9b2rn2"; + version = "4.7.4"; + sha256 = "170yrz008ya4haj0i8z1c7ydjg8hcw3i9cqs6abainh8zxvc1lqi"; libraryHaskellDepends = [ array base bytestring containers deepseq dlist fmlist text utf8-string vector @@ -13082,10 +13084,10 @@ self: { }: mkDerivation { pname = "MIP"; - version = "0.1.0.0"; - sha256 = "0790jcwqjd33i8sqhzxarda8ihhv5iapj0apjmlqjppbipwa6awa"; + version = "0.1.1.0"; + sha256 = "03gzwg0hzgij9hpxxfsrdxx2cknfy9fr9h1w1na04bmzpai1sl40"; revision = "1"; - editedCabalFile = "16nxbkmkyb9n0jbyrmpazg40gf6aadnm1rk4sqwxkcx7qa99wrnd"; + editedCabalFile = "0jm2g7g4js366i6i21d13f2gng7py4gkb3m64f76rdxbpqfcgfq1"; libraryHaskellDepends = [ base bytestring bytestring-encoding case-insensitive containers data-default-class extended-reals filepath intern lattices @@ -13102,6 +13104,32 @@ self: { broken = true; }) {}; + "MIP-glpk" = callPackage + ({ mkDerivation, async, base, bytestring, bytestring-encoding + , containers, extended-reals, glpk, glpk-headers, intern, MIP + , scientific, tasty, tasty-hunit, tasty-quickcheck, tasty-th, text + }: + mkDerivation { + pname = "MIP-glpk"; + version = "0.1.1.0"; + sha256 = "19wd6i8jsszhpl6fh9cm32284byz4rfjv0rkh3v4xacypfg5g1aj"; + revision = "1"; + editedCabalFile = "0ijc4875vvmiv1a14rm45yrcv7n7gvdw1v131si77qhl2qnyj3dr"; + libraryHaskellDepends = [ + base bytestring bytestring-encoding containers extended-reals + glpk-headers intern MIP scientific text + ]; + librarySystemDepends = [ glpk ]; + testHaskellDepends = [ + async base containers extended-reals glpk-headers MIP scientific + tasty tasty-hunit tasty-quickcheck tasty-th + ]; + description = "A GLPK backend to the MIP library"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {inherit (pkgs) glpk;}; + "MSQueue" = callPackage ({ mkDerivation, base, ghc-prim, monad-loops, ref-mtl, stm }: mkDerivation { @@ -16385,25 +16413,6 @@ self: { }) {}; "QuickCheck" = callPackage - ({ mkDerivation, base, containers, deepseq, process, random - , splitmix, template-haskell, transformers - }: - mkDerivation { - pname = "QuickCheck"; - version = "2.13.2"; - sha256 = "0426j43af8v3qmdjjqxivazsvr3a2brac8yw09vpgpjkb2m0nmkv"; - revision = "1"; - editedCabalFile = "0ynhx1n135b0zg539c9m7gp75dykm93pqqlp5xz2w4kmpxjp4vk3"; - libraryHaskellDepends = [ - base containers deepseq random splitmix template-haskell - transformers - ]; - testHaskellDepends = [ base deepseq process ]; - description = "Automatic testing of Haskell programs"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "QuickCheck_2_14_2" = callPackage ({ mkDerivation, base, containers, deepseq, process, random , splitmix, template-haskell, transformers }: @@ -16418,7 +16427,6 @@ self: { testHaskellDepends = [ base deepseq process ]; description = "Automatic testing of Haskell programs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "QuickCheck-GenT" = callPackage @@ -16987,15 +16995,16 @@ self: { }) {}; "Rattus" = callPackage - ({ mkDerivation, base, Cabal, containers, ghc, simple-affine-space + ({ mkDerivation, base, Cabal, containers, ghc, ghc-prim + , simple-affine-space }: mkDerivation { pname = "Rattus"; - version = "0.3.1"; - sha256 = "1sfjnfd3jsr095gkzxldb65ivxpyzsaphw2bv2f6svczhjc5b414"; + version = "0.4"; + sha256 = "1sgr33yq5l43k3b8nwx7m6wrygv5k8d8yigzms3p6pq5pk3g5sq1"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ - base containers ghc simple-affine-space + base containers ghc ghc-prim simple-affine-space ]; testHaskellDepends = [ base containers ]; description = "A modal FRP language"; @@ -17600,6 +17609,8 @@ self: { benchmarkHaskellDepends = [ base directory filepath random time ]; description = "The Simple Javascript Wrench"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "SMTPClient" = callPackage @@ -17735,11 +17746,11 @@ self: { }: mkDerivation { pname = "STMonadTrans"; - version = "0.4.4"; - sha256 = "00vih8xi5jf4jc4h6i9jwxb29w40gx8lakcg3fc1900b0r02ms0s"; + version = "0.4.5"; + sha256 = "0kly2zjizk8m84jzmkd93h6qpqgb03i4cjhm9q7rzr284qn5x09m"; libraryHaskellDepends = [ array base mtl ]; testHaskellDepends = [ - base tasty tasty-hunit tasty-quickcheck transformers + array base tasty tasty-hunit tasty-quickcheck transformers ]; description = "A monad transformer version of the ST monad"; license = stdenv.lib.licenses.bsd3; @@ -18295,35 +18306,35 @@ self: { }) {}; "Shpadoinkle" = callPackage - ({ mkDerivation, base, category, ghcjs-dom, jsaddle, jsaddle-warp - , text, transformers, unliftio + ({ mkDerivation, base, category, containers, ghcjs-dom, jsaddle + , jsaddle-warp, text, transformers, unliftio, wai, wai-app-static + , warp }: mkDerivation { pname = "Shpadoinkle"; - version = "0.2.0.0"; - sha256 = "10dgd5723mc7nbwvvzvl5jy09wdcjwhi0miyvgkr7jgppkg402dl"; + version = "0.3.0.0"; + sha256 = "083ly6xpdcf7wgrb3shcw26zk0d8rm8issyvki1rwvd29rwj0k41"; libraryHaskellDepends = [ - base category ghcjs-dom jsaddle jsaddle-warp text transformers - unliftio + base category containers ghcjs-dom jsaddle jsaddle-warp text + transformers unliftio wai wai-app-static warp ]; description = "A programming model for declarative, high performance user interface"; license = stdenv.lib.licenses.bsd3; }) {}; "Shpadoinkle-backend-pardiff" = callPackage - ({ mkDerivation, base, compactable, containers, file-embed - , ghcjs-dom, jsaddle, lens, monad-control, mtl, neat-interpolation - , random, semialign, Shpadoinkle, text, these, transformers-base - , unliftio, uuid + ({ mkDerivation, base, compactable, containers, exceptions + , file-embed, ghcjs-dom, jsaddle, lens, monad-control, mtl, random + , semialign, Shpadoinkle, text, these, transformers-base, unliftio }: mkDerivation { pname = "Shpadoinkle-backend-pardiff"; - version = "0.2.0.0"; - sha256 = "1dkj035k1kwhgd9z7p9jhbnahd9d8mb16ydgd1l7xnrfxg215zsq"; + version = "0.3.0.0"; + sha256 = "1m12m4qbivh0srdzwzcqr8s6s1hi1blk3x15ljv5c9viriznfy6z"; libraryHaskellDepends = [ - base compactable containers file-embed ghcjs-dom jsaddle lens - monad-control mtl neat-interpolation random semialign Shpadoinkle - text these transformers-base unliftio uuid + base compactable containers exceptions file-embed ghcjs-dom jsaddle + lens monad-control mtl random semialign Shpadoinkle text these + transformers-base unliftio ]; description = "A Virtual Dom in pure Haskell, based on Html as an Alignable Functor"; license = stdenv.lib.licenses.bsd3; @@ -18332,26 +18343,30 @@ self: { }) {}; "Shpadoinkle-backend-snabbdom" = callPackage - ({ mkDerivation, base, file-embed, ghcjs-dom, jsaddle, mtl - , Shpadoinkle, text, unliftio + ({ mkDerivation, base, exceptions, file-embed, ghcjs-dom, jsaddle + , monad-control, mtl, Shpadoinkle, text, transformers-base + , unliftio }: mkDerivation { pname = "Shpadoinkle-backend-snabbdom"; - version = "0.2.0.0"; - sha256 = "1zhxj26i711218ixfclmakjv943gkkmvjvvvi5ya4p26bjaw7p3x"; + version = "0.3.0.0"; + sha256 = "0ff87nxa7ff3j400k5a65in8jj00m6bk46pmana0a8k1d7ln7fsk"; libraryHaskellDepends = [ - base file-embed ghcjs-dom jsaddle mtl Shpadoinkle text unliftio + base exceptions file-embed ghcjs-dom jsaddle monad-control mtl + Shpadoinkle text transformers-base unliftio ]; description = "Use the high-performance Snabbdom virtual dom library written in JavaScript"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Shpadoinkle-backend-static" = callPackage ({ mkDerivation, base, compactable, Shpadoinkle, text }: mkDerivation { pname = "Shpadoinkle-backend-static"; - version = "0.1.0.2"; - sha256 = "0sfj092lhmkzrjvklpvbcldpc3wfp8d1n5jw7gpdzqs8fcpffz8q"; + version = "0.2.0.0"; + sha256 = "0kxfsm4g6mwwcrpq8bm83v32jpp97bsvl6ay0ynnmss0yf70ymmi"; libraryHaskellDepends = [ base compactable Shpadoinkle text ]; description = "A backend for rendering Shpadoinkle as Text"; license = stdenv.lib.licenses.bsd3; @@ -18363,8 +18378,8 @@ self: { ({ mkDerivation, aeson, base, jsaddle, lens, text, unliftio }: mkDerivation { pname = "Shpadoinkle-console"; - version = "0.0.1.1"; - sha256 = "0gs21vkmxxnk3ybzasjgcrhraiyjbab3xkpzp4266h54wz1r5grj"; + version = "0.0.1.3"; + sha256 = "0zkiv0h37a3x3569xfvfzdy0dywxhcfx12jddqf9bpfyqsxmf42a"; libraryHaskellDepends = [ aeson base jsaddle lens text unliftio ]; description = "Support for the native browser console"; license = stdenv.lib.licenses.bsd3; @@ -18381,30 +18396,77 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "Shpadoinkle-developer-tools" = callPackage + ({ mkDerivation, base, containers, jsaddle, lens, pretty-show + , Shpadoinkle, Shpadoinkle-backend-pardiff, Shpadoinkle-html, stm + , text, time, unliftio + }: + mkDerivation { + pname = "Shpadoinkle-developer-tools"; + version = "0.0.0.1"; + sha256 = "14lcmxkaxsa42dcyn13cb83lfw48n7139gvppsngzrbn1w9lwrl0"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers jsaddle lens pretty-show Shpadoinkle + Shpadoinkle-backend-pardiff Shpadoinkle-html stm text time unliftio + ]; + executableHaskellDepends = [ + base containers jsaddle lens pretty-show Shpadoinkle + Shpadoinkle-backend-pardiff Shpadoinkle-html stm text time unliftio + ]; + description = "Chrome extension to aide in development"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "Shpadoinkle-disembodied" = callPackage + ({ mkDerivation, base, directory, filepath, servant, Shpadoinkle + , Shpadoinkle-backend-static, Shpadoinkle-html, Shpadoinkle-router + , text, unliftio + }: + mkDerivation { + pname = "Shpadoinkle-disembodied"; + version = "0.0.0.1"; + sha256 = "0hiwiv4l1k1al0d9fjk48fay6c33shf213yc9blwm15mfj5kh77c"; + libraryHaskellDepends = [ + base directory filepath servant Shpadoinkle + Shpadoinkle-backend-static Shpadoinkle-html Shpadoinkle-router text + unliftio + ]; + description = "Shpadoinkle as a static site"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "Shpadoinkle-examples" = callPackage ({ mkDerivation, aeson, base, beam-core, beam-sqlite, bytestring - , containers, ease, exceptions, file-embed, generic-lens, ghcjs-dom - , jsaddle, lens, mtl, optparse-applicative, safe, servant - , servant-client, servant-server, Shpadoinkle - , Shpadoinkle-backend-pardiff, Shpadoinkle-backend-static + , containers, ease, exceptions, file-embed, generic-lens + , generic-monoid, ghcjs-dom, jsaddle, lens, mtl + , optparse-applicative, pretty-show, safe, servant, servant-client + , servant-server, Shpadoinkle, Shpadoinkle-backend-pardiff + , Shpadoinkle-backend-snabbdom, Shpadoinkle-backend-static , Shpadoinkle-console, Shpadoinkle-html, Shpadoinkle-lens , Shpadoinkle-router, Shpadoinkle-widgets, split, sqlite-simple , stm, text, unliftio, wai, wai-app-static, warp }: mkDerivation { pname = "Shpadoinkle-examples"; - version = "0.0.0.2"; - sha256 = "1nj5wl8liw9q89hrry6dpvsw32sc27nplxfcwkyfkwjyqaxp5sfh"; + version = "0.0.0.3"; + sha256 = "1ym3wnqqj07v0w07af6z9yiccx95bbljna36z37pz8gp35dxamlh"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ aeson base beam-core beam-sqlite bytestring containers ease - exceptions file-embed generic-lens ghcjs-dom jsaddle lens mtl - optparse-applicative safe servant servant-client servant-server - Shpadoinkle Shpadoinkle-backend-pardiff Shpadoinkle-backend-static - Shpadoinkle-console Shpadoinkle-html Shpadoinkle-lens - Shpadoinkle-router Shpadoinkle-widgets split sqlite-simple stm text - unliftio wai wai-app-static warp + exceptions file-embed generic-lens generic-monoid ghcjs-dom jsaddle + lens mtl optparse-applicative pretty-show safe servant + servant-client servant-server Shpadoinkle + Shpadoinkle-backend-pardiff Shpadoinkle-backend-snabbdom + Shpadoinkle-backend-static Shpadoinkle-console Shpadoinkle-html + Shpadoinkle-lens Shpadoinkle-router Shpadoinkle-widgets split + sqlite-simple stm text unliftio wai wai-app-static warp ]; description = "Example usages of Shpadoinkle"; license = stdenv.lib.licenses.bsd3; @@ -18414,16 +18476,17 @@ self: { "Shpadoinkle-html" = callPackage ({ mkDerivation, base, bytestring, compactable, containers - , ghcjs-dom, jsaddle, regex-pcre, Shpadoinkle, stm - , template-haskell, text, time, transformers, unliftio + , ghcjs-dom, jsaddle, lens, raw-strings-qq, regex-pcre, Shpadoinkle + , stm, template-haskell, text, time, transformers, unliftio }: mkDerivation { pname = "Shpadoinkle-html"; - version = "0.2.0.1"; - sha256 = "1dk17v1c6nv2p3zzg09gmv4qvpjmlx782a6gx7whx9p28037v34f"; + version = "0.3.0.0"; + sha256 = "17n675m9gqfhi2rd8c60bcbljd4nknfrwb02zlw9jwgj1kv7l06k"; libraryHaskellDepends = [ - base bytestring compactable containers ghcjs-dom jsaddle regex-pcre - Shpadoinkle stm template-haskell text time transformers unliftio + base bytestring compactable containers ghcjs-dom jsaddle lens + raw-strings-qq regex-pcre Shpadoinkle stm template-haskell text + time transformers unliftio ]; description = "A typed, template generated Html DSL, and helpers"; license = stdenv.lib.licenses.bsd3; @@ -18435,8 +18498,8 @@ self: { ({ mkDerivation, base, lens, Shpadoinkle, text }: mkDerivation { pname = "Shpadoinkle-lens"; - version = "0.0.0.2"; - sha256 = "00zd6m9lvskbf7w4bnqhhy59gz9169rzmd1x8y4lxckjda172sqr"; + version = "0.0.0.3"; + sha256 = "1310ipmw2z8gdnvaqx1bydvc4p1iyhc7xv31vwbx2aszhmi873kq"; libraryHaskellDepends = [ base lens Shpadoinkle text ]; description = "Lens combinators for Shpadoinkle applications"; license = stdenv.lib.licenses.bsd3; @@ -18444,19 +18507,19 @@ self: { "Shpadoinkle-router" = callPackage ({ mkDerivation, aeson, base, bytestring, compactable, exceptions - , ghcjs-dom, http-api-data, http-media, jsaddle, lens, network-uri - , servant, servant-client, servant-client-js, servant-server - , Shpadoinkle, Shpadoinkle-backend-static, text, unliftio, wai - , wai-app-static, warp + , ghcjs-dom, http-api-data, http-media, jsaddle, jsaddle-warp, lens + , network-uri, servant, servant-client, servant-client-js + , servant-server, Shpadoinkle, Shpadoinkle-backend-static, text + , unliftio, wai, wai-app-static, warp }: mkDerivation { pname = "Shpadoinkle-router"; - version = "0.2.0.0"; - sha256 = "024g9s01kjzvxq6yfhi640v1zly6wvk3v8m3xzxi4flgff2syf8b"; + version = "0.2.0.1"; + sha256 = "0qbjczrfvcihm595rsp1k6svgr05vcrcmc9376wy5vrdwnimvn58"; libraryHaskellDepends = [ aeson base bytestring compactable exceptions ghcjs-dom - http-api-data http-media jsaddle lens network-uri servant - servant-client servant-client-js servant-server Shpadoinkle + http-api-data http-media jsaddle jsaddle-warp lens network-uri + servant servant-client servant-client-js servant-server Shpadoinkle Shpadoinkle-backend-static text unliftio wai wai-app-static warp ]; description = "A single page application rounter for Shpadoinkle based on Servant"; @@ -18468,19 +18531,22 @@ self: { "Shpadoinkle-widgets" = callPackage ({ mkDerivation, aeson, base, compactable, containers , edit-distance, email-validate, hspec, jsaddle, mtl, QuickCheck - , Shpadoinkle, Shpadoinkle-html, stm, template-haskell, text - , unliftio + , quickcheck-classes, quickcheck-classes-base, Shpadoinkle + , Shpadoinkle-html, stm, template-haskell, text, unliftio }: mkDerivation { pname = "Shpadoinkle-widgets"; - version = "0.1.0.0"; - sha256 = "1w1ibm75288rh001bxkdp04hidx8lkz4p4id91bjadsax8chy718"; + version = "0.2.0.0"; + sha256 = "0q82m3gffcw89xyl0h9ayp2v4k9l1zwpnlpq7kvirl1ahhp2iypy"; libraryHaskellDepends = [ aeson base compactable containers edit-distance email-validate jsaddle mtl Shpadoinkle Shpadoinkle-html stm template-haskell text unliftio ]; - testHaskellDepends = [ base containers hspec QuickCheck ]; + testHaskellDepends = [ + base containers hspec QuickCheck quickcheck-classes + quickcheck-classes-base + ]; description = "A collection of common reusable types and components"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -19117,8 +19183,8 @@ self: { ({ mkDerivation, base, stm, transformers }: mkDerivation { pname = "StateVar"; - version = "1.2"; - sha256 = "12sz6zkc9j5z3lwrjvljrkfxa5vhwnir5wsarigz2f6d3w13dh5g"; + version = "1.2.1"; + sha256 = "12qg01aksbnc7cdh01y4z4jwrrhhwcakc9gh6ywxhq1bj591a9pf"; libraryHaskellDepends = [ base stm transformers ]; description = "State variables"; license = stdenv.lib.licenses.bsd3; @@ -21832,21 +21898,21 @@ self: { ({ mkDerivation, base, Cabal, case-insensitive, deepseq, ghc-prim , hashable, hspec, hspec-discover, HUnit, integer-gmp, primitive , QuickCheck, quickcheck-instances, scientific, tagged - , template-haskell, unordered-containers, word8 + , template-haskell, time, unordered-containers }: mkDerivation { pname = "Z-Data"; - version = "0.2.0.0"; - sha256 = "1bxnbbcm3vwsklhhyf10z6i91mpymxh9rw2r64hmfy6yay2b2p0d"; + version = "0.3.0.0"; + sha256 = "09pai7qhw6pjzrs05ac51f3v1ms0gdhkyp01jqkxzr9sllsbrgaq"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base case-insensitive deepseq ghc-prim hashable integer-gmp - primitive QuickCheck scientific tagged template-haskell + primitive QuickCheck scientific tagged template-haskell time unordered-containers ]; testHaskellDepends = [ base hashable hspec HUnit integer-gmp primitive QuickCheck - quickcheck-instances scientific word8 + quickcheck-instances scientific time ]; testToolDepends = [ hspec-discover ]; description = "Array, vector and text"; @@ -21863,8 +21929,8 @@ self: { }: mkDerivation { pname = "Z-IO"; - version = "0.2.0.0"; - sha256 = "1d3z9869xawzp1wxkz0vm5fkc3071cv5sz6bmr8fdwyw8cd0r7dy"; + version = "0.3.0.0"; + sha256 = "0nsjqs9xyj8rw2wqml48la5mv7haf5117r4cqi02g35b57f7dq40"; libraryHaskellDepends = [ base containers exceptions primitive stm time unix-time unordered-containers Z-Data @@ -21887,8 +21953,8 @@ self: { }: mkDerivation { pname = "Z-YAML"; - version = "0.1.0.0"; - sha256 = "0jw8mzw1xnyzagx5d6i532r4isr63g1mq00bhfp3mvhc75hf9ghr"; + version = "0.2.0.0"; + sha256 = "0q0hyqvkirmlfbs6j1b892p1m3nf7n44nj7mbv0c9b5y2cjr44zi"; libraryHaskellDepends = [ base primitive scientific transformers unordered-containers Z-Data Z-IO @@ -22671,6 +22737,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "accelerate-io-serialise" = callPackage + ({ mkDerivation, accelerate, accelerate-io-bytestring, base + , serialise + }: + mkDerivation { + pname = "accelerate-io-serialise"; + version = "0.1.0.0"; + sha256 = "1i85x6dqz7ihvi8b9rnlgjqnliq98cbv5fd1pf03n18kdbflzvm8"; + libraryHaskellDepends = [ + accelerate accelerate-io-bytestring base serialise + ]; + description = "Binary serialisation of Accelerate arrays using serialise"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "accelerate-io-vector" = callPackage ({ mkDerivation, accelerate, base, hedgehog, primitive, tasty , tasty-hedgehog, vector @@ -24205,8 +24286,8 @@ self: { }: mkDerivation { pname = "aeson"; - version = "1.5.4.1"; - sha256 = "1zgycrai15vlf6drphcb2ff8fs7s6g6hjyxi20h98qkzij5drb0d"; + version = "1.5.5.1"; + sha256 = "0iqnzh9xh2vx9viqvs528i24zm9sdpvh8kjbpfxgrca38v6ds5m2"; libraryHaskellDepends = [ attoparsec base base-compat-batteries bytestring containers data-fix deepseq dlist ghc-prim hashable primitive scientific @@ -25894,23 +25975,6 @@ self: { }) {}; "alex" = callPackage - ({ mkDerivation, array, base, containers, directory, happy, process - }: - mkDerivation { - pname = "alex"; - version = "3.2.5"; - sha256 = "1qz0ar9dl0zx42y1gbpd2yx09nbwxs8nw6mjmpi68z3nf098lz5p"; - isLibrary = false; - isExecutable = true; - enableSeparateDataOutput = true; - executableHaskellDepends = [ array base containers directory ]; - executableToolDepends = [ happy ]; - testHaskellDepends = [ base process ]; - description = "Alex is a tool for generating lexical analysers in Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "alex_3_2_6" = callPackage ({ mkDerivation, array, base, containers, directory, happy, process }: mkDerivation { @@ -25925,7 +25989,6 @@ self: { testHaskellDepends = [ base process ]; description = "Alex is a tool for generating lexical analysers in Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "alex-meta" = callPackage @@ -25962,10 +26025,8 @@ self: { }: mkDerivation { pname = "alex-tools"; - version = "0.5"; - sha256 = "06ghkigqabz9h17wjpc3jwv1f4k6fajpzblzvysqzg71pfncx88m"; - revision = "1"; - editedCabalFile = "0br92hrl0pxw2a5k9wgzk3zwyz2dimcwwjxijgzrd2yg0s1vnm9p"; + version = "0.5.0.1"; + sha256 = "0rc56hvmlnym620pc8i7539wig50glms537kcwlmhd89c9cib8iy"; libraryHaskellDepends = [ base bytestring deepseq template-haskell text ]; @@ -26211,19 +26272,23 @@ self: { "algebraic-graphs-io" = callPackage ({ mkDerivation, algebraic-graphs, attoparsec, base, binary , binary-conduit, bytestring, conduit, conduit-extra, containers - , csv-conduit, dot, exceptions, filepath, hspec, http-conduit - , matrix-market-attoparsec, megaparsec, parser-combinators - , primitive, QuickCheck, tar-conduit, text, vector + , csv-conduit, directory, dot, exceptions, filepath, hspec + , http-conduit, matrix-market-attoparsec, megaparsec, mtl + , parser-combinators, primitive, QuickCheck, tar-conduit, text + , transformers, vector }: mkDerivation { pname = "algebraic-graphs-io"; - version = "0.1.5.1"; - sha256 = "03hiwyqfkd1s4r7w3cbw64333clpbpxpbppskjvk5knkv8r2mx78"; + version = "0.4"; + sha256 = "03a31y4kxswn9h32vs7nh83cvwjmx714rckj8pvqxl4l7i01y6wf"; + revision = "1"; + editedCabalFile = "060m82d4qirv7anyp3n6wh5rsycipr5cimhl1y8p9mcm5573r2pl"; libraryHaskellDepends = [ algebraic-graphs attoparsec base binary binary-conduit bytestring - conduit conduit-extra containers csv-conduit dot exceptions - filepath http-conduit matrix-market-attoparsec megaparsec - parser-combinators primitive tar-conduit text vector + conduit conduit-extra containers csv-conduit directory dot + exceptions filepath http-conduit matrix-market-attoparsec + megaparsec mtl parser-combinators primitive tar-conduit text + transformers vector ]; testHaskellDepends = [ base hspec QuickCheck ]; description = "I/O utilities and datasets for algebraic-graphs"; @@ -30070,6 +30135,8 @@ self: { ]; description = "sdl-like functions for terminal applications, based on ansi-terminal"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ansi-wl-pprint" = callPackage @@ -30778,22 +30845,6 @@ self: { }) {}; "apecs-physics" = callPackage - ({ mkDerivation, apecs, base, Cabal, containers, inline-c, linear - , template-haskell, vector - }: - mkDerivation { - pname = "apecs-physics"; - version = "0.4.4"; - sha256 = "01kdp31zyz95i912qk57avmzr4596xjj8m8lw7r2yszg0il0mndf"; - setupHaskellDepends = [ base Cabal ]; - libraryHaskellDepends = [ - apecs base containers inline-c linear template-haskell vector - ]; - description = "2D physics for apecs"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "apecs-physics_0_4_5" = callPackage ({ mkDerivation, apecs, base, Cabal, containers, inline-c, linear , template-haskell, vector }: @@ -30807,7 +30858,6 @@ self: { ]; description = "2D physics for apecs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "apecs-physics-gloss" = callPackage @@ -31716,6 +31766,8 @@ self: { ]; description = "Easy-to-use reasonable way of emulating approximate in Haskell"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "approx-rand-test" = callPackage @@ -32008,10 +32060,8 @@ self: { }: mkDerivation { pname = "arbtt"; - version = "0.10.2"; - sha256 = "02izfga7nv2saq4d1xwigq41hhbc02830sjppqsqw6vcb8082vs1"; - revision = "1"; - editedCabalFile = "10b6ax854a4ig33iwcg21vad4gpgibfpb6xqkxd80hvkrj4gqd62"; + version = "0.10.4"; + sha256 = "18lpwhkhw0nxzif9dyc29b9s8i0v26y9vdgh0laj3z9yyp805syc"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -32027,8 +32077,6 @@ self: { ]; description = "Automatic Rule-Based Time Tracker"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "arcgrid" = callPackage @@ -32070,8 +32118,8 @@ self: { }: mkDerivation { pname = "arch-hs"; - version = "0.6.1.0"; - sha256 = "0ps8mxgy5cgrpcr0dy55biqj5a3j2bj44x6cfxx63fyv2j06lgdv"; + version = "0.6.2.0"; + sha256 = "10v2n1m5608g2lqgn16bwwhlafbj2hhnsnvm22pfff4ahnvj7880"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -32515,6 +32563,8 @@ self: { pname = "arith-encode"; version = "1.0.2"; sha256 = "0nfrjfm6c37bsvqcqsgnxk6pal8hc7p85nhmab9pc2ha5jrcwhj0"; + revision = "1"; + editedCabalFile = "0gsfmn6afzcpvhbwi30fksl34wcbamkc2lgdjl3z58jhpm8824wi"; libraryHaskellDepends = [ array base binary containers hashable integer-logarithms integer-roots unordered-containers @@ -34826,14 +34876,16 @@ self: { }) {}; "attoparsec-iso8601" = callPackage - ({ mkDerivation, attoparsec, base, base-compat, text, time }: + ({ mkDerivation, attoparsec, base, base-compat-batteries, text + , time, time-compat + }: mkDerivation { pname = "attoparsec-iso8601"; - version = "1.0.1.0"; - sha256 = "0hj10w15qp2z5bz2v4xahhmbgzclpyfi5l2sv97wqycysg9gp7s9"; - revision = "1"; - editedCabalFile = "1rjhscmczgs1bwyqx7lvkm8py3ylxjd2797mrzgnq60fvm292750"; - libraryHaskellDepends = [ attoparsec base base-compat text time ]; + version = "1.0.2.0"; + sha256 = "162gc101mwhmjbfhhv1wm3yvk2h4ra34wpw5x87735cfqxvjv582"; + libraryHaskellDepends = [ + attoparsec base base-compat-batteries text time time-compat + ]; description = "Parsing of ISO 8601 dates, originally from aeson"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -35105,6 +35157,8 @@ self: { pname = "aur"; version = "7.0.5"; sha256 = "16c4q0w6qpn4gg6xlggkcs92fcvm58a3qmykfm1dgcfsjhwwhxkx"; + revision = "1"; + editedCabalFile = "10p4qyfv2ha3s8dli6v9yzzx4pj5r1cfxcy0gcf0rgbxsszi2315"; libraryHaskellDepends = [ aeson base bytestring hashable http-client http-types text ]; @@ -35147,8 +35201,8 @@ self: { pname = "aura"; version = "3.2.2"; sha256 = "07ska8w2k3sl084aadjclw8v0ykrp8hiwhim5zd6wd7q95njyk2f"; - revision = "1"; - editedCabalFile = "033ycqm18zqq69yam189whpcbnajanj2yp8na8ad344ghcn1gs5l"; + revision = "2"; + editedCabalFile = "1m138p8rllm42gpqj10z3jvdlcz9f0v4is4ygdxi7yxn9xmy15x9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -38263,6 +38317,8 @@ self: { ]; description = "Basic examples and functions for generics-sop"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "baskell" = callPackage @@ -39722,8 +39778,8 @@ self: { }: mkDerivation { pname = "bifunctors"; - version = "5.5.8"; - sha256 = "0gffvmxmpxljivg4j7p5l46kxiv29ml0h23361dh23gsy5m4jz41"; + version = "5.5.9"; + sha256 = "0c0zm9n085a6zna91yq9c14xwpwi72wn9xlsgzpza9r9bmy5jv05"; libraryHaskellDepends = [ base base-orphans comonad containers tagged template-haskell th-abstraction transformers @@ -40133,33 +40189,6 @@ self: { }) {}; "binary-instances" = callPackage - ({ mkDerivation, aeson, base, binary, binary-orphans - , case-insensitive, hashable, QuickCheck, quickcheck-instances - , scientific, tagged, tasty, tasty-quickcheck, text, text-binary - , time-compat, unordered-containers, vector - , vector-binary-instances - }: - mkDerivation { - pname = "binary-instances"; - version = "1.0.0.1"; - sha256 = "0f8ilzpwj7gbyvlswlkd48dzpj9m13ipinw55lvjag0ir52idk9a"; - revision = "1"; - editedCabalFile = "19xmaj5vlabsifkdk1kpxp4nadfml7a51w316sd4fxd69ncvwd72"; - libraryHaskellDepends = [ - aeson base binary binary-orphans case-insensitive hashable - scientific tagged text text-binary time-compat unordered-containers - vector vector-binary-instances - ]; - testHaskellDepends = [ - aeson base binary case-insensitive hashable QuickCheck - quickcheck-instances scientific tagged tasty tasty-quickcheck text - time-compat unordered-containers vector - ]; - description = "Orphan instances for binary"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "binary-instances_1_0_1" = callPackage ({ mkDerivation, aeson, base, binary, binary-orphans , case-insensitive, hashable, QuickCheck, quickcheck-instances , scientific, tagged, tasty, tasty-quickcheck, text, text-binary @@ -40182,7 +40211,6 @@ self: { ]; description = "Orphan instances for binary"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "binary-io" = callPackage @@ -40191,8 +40219,8 @@ self: { }: mkDerivation { pname = "binary-io"; - version = "0.4.0"; - sha256 = "0yqxrzkria4bycc23ywc6cz12n15cr3lmmcphamwr0ngdgn1lf9i"; + version = "0.5.0"; + sha256 = "15v5iqrxdlynllwb2p6v161cwvadri5jdpgknlcw1vpsgf1dnhy7"; libraryHaskellDepends = [ base binary bytestring concurrency deque exceptions process transformers @@ -41040,6 +41068,8 @@ self: { libraryHaskellDepends = [ base bindings-DSL ]; description = "Low level bindings to libpci"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bindings-librrd" = callPackage @@ -41629,17 +41659,17 @@ self: { "bioinformatics-toolkit" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring , bytestring-lexing, case-insensitive, clustering, conduit - , conduit-combinators, conduit-extra, containers, criterion - , data-default-class, data-ordlist, double-conversion, hexpat - , HsHTSLib, http-conduit, IntervalMap, math-functions, matrices - , microlens, microlens-th, mtl, parallel, primitive, random, split - , statistics, tasty, tasty-golden, tasty-hunit, text, transformers + , conduit-extra, containers, criterion, data-default-class + , data-ordlist, double-conversion, hexpat, HsHTSLib, http-conduit + , IntervalMap, math-functions, matrices, microlens, microlens-th + , mtl, parallel, primitive, random, split, statistics, tasty + , tasty-golden, tasty-hunit, text, transformers , unordered-containers, vector, vector-algorithms, word8 }: mkDerivation { pname = "bioinformatics-toolkit"; - version = "0.9.3.1"; - sha256 = "106aiq3147zrd6dh689zamqi8q03cfvsmsvjlivwcdgybg7zrdr4"; + version = "0.9.5"; + sha256 = "03nra5ngirlkfm9xhndiwsl51ixcgp5rf7xfwgvw0bfvzddrc6i9"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson aeson-pretty attoparsec base bytestring bytestring-lexing @@ -41650,8 +41680,8 @@ self: { transformers unordered-containers vector vector-algorithms word8 ]; testHaskellDepends = [ - base bytestring conduit conduit-combinators data-default-class - matrices microlens mtl random tasty tasty-golden tasty-hunit + base bytestring conduit conduit-extra data-default-class matrices + microlens mtl random tasty tasty-golden tasty-hunit unordered-containers vector ]; benchmarkHaskellDepends = [ @@ -41880,8 +41910,8 @@ self: { }: mkDerivation { pname = "bishbosh"; - version = "0.0.0.7"; - sha256 = "1ihnq7smjk0d18gmkgl70qzqwljmb5nr9hhzwfmkakh3p2x24g3i"; + version = "0.0.0.8"; + sha256 = "0mk0mki02m8nvk667wbrk954qnb6qxdfzyz10bfcyvfbz1afg702"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -42760,8 +42790,8 @@ self: { }: mkDerivation { pname = "bitwise-enum"; - version = "1.0.0.2"; - sha256 = "1y63qpxkh8k019vj2b1qz1jnssld5lik5cjhf6dzj2bal4013lii"; + version = "1.0.0.3"; + sha256 = "0ykrr8x1hc1lsj8cn19jcypvww4598g1v0vrn3z3b7n6hp6wfyis"; libraryHaskellDepends = [ aeson array base deepseq mono-traversable vector ]; @@ -45024,6 +45054,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "bpath" = callPackage + ({ mkDerivation, base, bytestring, containers, megaparsec + , template-haskell, th-lift-instances + }: + mkDerivation { + pname = "bpath"; + version = "0.1.0"; + sha256 = "1xm188plwa6wxnvv4g1qmli9qiifagvpzn3mhjprk72k0q9jlci9"; + libraryHaskellDepends = [ + base bytestring containers megaparsec template-haskell + th-lift-instances + ]; + testHaskellDepends = [ base ]; + description = "A minimal typed unix path library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "braid" = callPackage ({ mkDerivation, base, containers, diagrams-contrib, diagrams-core , diagrams-lib, diagrams-svg, split @@ -45196,10 +45243,8 @@ self: { }: mkDerivation { pname = "brick"; - version = "0.57.1"; - sha256 = "0amqh0xjgylndz0wp23r5m7w8m7j280dyf1j1mybmmb93s8yz269"; - revision = "1"; - editedCabalFile = "00jg403q7aaah9hr37n8wa11lljf2909hpmxz7qf4c9ck79pcaj0"; + version = "0.58.1"; + sha256 = "0qsmj4469avxmbh7210msjwvz7fa98axxvf7198x0hb2y7vdpcz5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -45215,33 +45260,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "brick_0_58" = callPackage - ({ mkDerivation, base, bytestring, config-ini, containers - , contravariant, data-clist, deepseq, directory, dlist, exceptions - , filepath, microlens, microlens-mtl, microlens-th, QuickCheck, stm - , template-haskell, text, text-zipper, transformers, unix, vector - , vty, word-wrap - }: - mkDerivation { - pname = "brick"; - version = "0.58"; - sha256 = "1rrx8pmffpsgajwmvm8w0kriwhncfih2j2vkla3nqq1vr0kn8518"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring config-ini containers contravariant data-clist - deepseq directory dlist exceptions filepath microlens microlens-mtl - microlens-th stm template-haskell text text-zipper transformers - unix vector vty word-wrap - ]; - testHaskellDepends = [ - base containers microlens QuickCheck vector - ]; - description = "A declarative terminal user interface library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "brick-dropdownmenu" = callPackage ({ mkDerivation, base, brick, containers, microlens, microlens-ghc , microlens-th, pointedlist, vector, vty @@ -45674,6 +45692,8 @@ self: { ]; description = "Brotli (RFC7932) compression and decompression"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) brotli;}; "brotli-conduit" = callPackage @@ -45716,6 +45736,8 @@ self: { ]; description = "IO-Streams interface for Brotli (RFC7932) compression"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "browscap" = callPackage @@ -48994,8 +49016,8 @@ self: { }: mkDerivation { pname = "cabal2nix"; - version = "2.15.5"; - sha256 = "1afqk9svs3zy69w3xa1gvsacn25vpxf2rffw2rvhs3wvsasxpb6c"; + version = "2.15.6"; + sha256 = "0jkdy36qpi7b7a14dg0iqgn4k3cia8wj1yi8pg82v430rspnkfdb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -49305,33 +49327,51 @@ self: { broken = true; }) {}; + "caching-vault" = callPackage + ({ mkDerivation, base, hspec, stm, stm-containers, text, time + , timespan + }: + mkDerivation { + pname = "caching-vault"; + version = "0.1.0.0"; + sha256 = "1wqk7gfkpsry21d0qn6qjjrr7n6cj3raddx76nmhgy5xn8q36vbr"; + libraryHaskellDepends = [ base stm stm-containers text time ]; + testHaskellDepends = [ + base hspec stm stm-containers text time timespan + ]; + description = "A vault-style cache implementation"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "cachix" = callPackage ({ mkDerivation, async, base, base64-bytestring, boost, bytestring - , cachix-api, conduit, conduit-extra, containers, cookie - , cryptonite, dhall, directory, ed25519, filepath, fsnotify, here - , hspec, hspec-discover, http-client, http-client-tls, http-conduit - , http-types, inline-c, inline-c-cpp, lzma-conduit, megaparsec - , memory, mmorph, netrc, nix, optparse-applicative, process - , protolude, resourcet, retry, safe-exceptions, servant + , cachix-api, concurrent-extra, conduit, conduit-extra, containers + , cookie, cryptonite, dhall, directory, ed25519, filepath, fsnotify + , here, hspec, hspec-discover, http-client, http-client-tls + , http-conduit, http-types, inline-c, inline-c-cpp, lzma-conduit + , megaparsec, memory, mmorph, netrc, nix, optparse-applicative + , process, protolude, resourcet, retry, safe-exceptions, servant , servant-auth, servant-auth-client, servant-client - , servant-client-core, servant-conduit, temporary, text, unix + , servant-client-core, servant-conduit, stm, temporary, text, unix , uri-bytestring, vector, versions }: mkDerivation { pname = "cachix"; - version = "0.5.1"; - sha256 = "13xl87jgpa1swgppr86dylp8ndisasdr8zcmk1l2jjb7vgyly8mb"; + version = "0.6.0"; + sha256 = "1ay3k2npnplvgc44vn3zcyd5rgyfigvij4zil3nwrpdi0psd76nl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - async base base64-bytestring bytestring cachix-api conduit - conduit-extra containers cookie cryptonite dhall directory ed25519 - filepath fsnotify here http-client http-client-tls http-conduit - http-types inline-c inline-c-cpp lzma-conduit megaparsec memory - mmorph netrc optparse-applicative process protolude resourcet retry - safe-exceptions servant servant-auth servant-auth-client - servant-client servant-client-core servant-conduit text unix - uri-bytestring vector versions + async base base64-bytestring bytestring cachix-api concurrent-extra + conduit conduit-extra containers cookie cryptonite dhall directory + ed25519 filepath fsnotify here http-client http-client-tls + http-conduit http-types inline-c inline-c-cpp lzma-conduit + megaparsec memory mmorph netrc optparse-applicative process + protolude resourcet retry safe-exceptions servant servant-auth + servant-auth-client servant-client servant-client-core + servant-conduit stm text unix uri-bytestring vector versions ]; librarySystemDepends = [ boost ]; libraryPkgconfigDepends = [ nix ]; @@ -49350,27 +49390,26 @@ self: { , conduit, cookie, cryptonite, deepseq, exceptions, hspec , hspec-discover, http-api-data, http-media, jose, lens, memory , nix-narinfo, protolude, resourcet, servant, servant-auth - , servant-auth-server, servant-auth-swagger, servant-client - , servant-swagger, servant-swagger-ui-core, string-conv, swagger2 - , text, time, transformers + , servant-auth-swagger, servant-client, servant-swagger + , servant-swagger-ui-core, string-conv, swagger2, text, time + , transformers }: mkDerivation { pname = "cachix-api"; - version = "0.5.0"; - sha256 = "14b4vg6wv7kzxkfbh64ml2wvm9w8fyv2k2sm7ncaa0pp0f26pswy"; + version = "0.6.0"; + sha256 = "0q6kl5lb05c1m62yqj0d8vimlghhrc3avl3bz5wjp70azs28jcd3"; libraryHaskellDepends = [ aeson base base16-bytestring bytestring conduit cookie cryptonite deepseq exceptions http-api-data http-media jose lens memory nix-narinfo protolude resourcet servant servant-auth - servant-auth-server servant-client string-conv swagger2 text time + servant-auth-swagger servant-client string-conv swagger2 text time transformers ]; testHaskellDepends = [ aeson base base16-bytestring bytestring conduit cookie cryptonite hspec http-api-data http-media lens memory protolude servant - servant-auth servant-auth-server servant-auth-swagger - servant-swagger servant-swagger-ui-core string-conv swagger2 text - transformers + servant-auth servant-auth-swagger servant-swagger + servant-swagger-ui-core string-conv swagger2 text transformers ]; testToolDepends = [ hspec-discover ]; description = "Servant HTTP API specification for https://cachix.org"; @@ -50295,8 +50334,8 @@ self: { }: mkDerivation { pname = "capnp"; - version = "0.9.0.0"; - sha256 = "0sgbl9rfvw73bb29kxp6q4ba0fxzx3a0kgpkiqhyvvvbr3ycdbqb"; + version = "0.10.0.0"; + sha256 = "054cy2rr2hg0brrbxff4my3q2fzr1qk7ik2xyip65dq54958ibqk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -52994,15 +53033,13 @@ self: { }: mkDerivation { pname = "chatty"; - version = "0.7.0.1"; - sha256 = "0d7cfp3vvrmn7b6lc83j5pi7a90sk1rc1y48zb78f8plipp7ngb6"; - revision = "1"; - editedCabalFile = "1vh058qw0wphwn0l1lchhxms96p9bhsjna4j7lyvczmc9ba2mgdp"; + version = "0.8.0.0"; + sha256 = "1sq8d1irxrrhrfk874snfvwskh4ng6cm3nain99wcx5d3w4ch3rn"; libraryHaskellDepends = [ ansi-terminal base chatty-utils directory mtl process random setenv template-haskell text time transformers unix ]; - description = "Some monad transformers and typeclasses for abstraction of global dependencies"; + description = "Some monad transformers and typeclasses for text in- and output abstraction"; license = stdenv.lib.licenses.agpl3; }) {}; @@ -53025,10 +53062,8 @@ self: { ({ mkDerivation, base, mtl, text, transformers }: mkDerivation { pname = "chatty-utils"; - version = "0.7.3.4"; - sha256 = "1dp1k641sryzp7zh5l3f8v4dajc71ly8l9fyv1c45cf0s81cxhys"; - revision = "1"; - editedCabalFile = "0b1bvxkp1yhw3ws12mkdys5dnml03phzj03sqkrk1289jm5nlfn9"; + version = "0.7.3.5"; + sha256 = "1pzg0bf73shwl91x4011khw62wgv33y5862gq110q8g913w4jrjw"; libraryHaskellDepends = [ base mtl text transformers ]; description = "Some utilities every serious chatty-based application may need"; license = stdenv.lib.licenses.agpl3; @@ -53299,8 +53334,8 @@ self: { }: mkDerivation { pname = "cherry-core-alpha"; - version = "0.2.0.0"; - sha256 = "1bbf47n263bx9szfxxl0sg158nj4rm04742p0parbh2i4ia2gwmn"; + version = "0.3.0.0"; + sha256 = "03plsrwzji653psjwsxmafsl24cyx6260x15cfpmb7fka5rdfs5i"; libraryHaskellDepends = [ async base base64-bytestring binary bytestring case-insensitive containers directory ghc-prim http-client http-client-tls @@ -54015,6 +54050,8 @@ self: { ]; description = "Channel/Arrow based streaming computation library"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cielo" = callPackage @@ -54364,6 +54401,8 @@ self: { benchmarkHaskellDepends = [ base criterion vector ]; description = "Circular fixed-sized mutable vectors"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cirru-parser" = callPackage @@ -54439,8 +54478,8 @@ self: { }: mkDerivation { pname = "citeproc"; - version = "0.3.0.1"; - sha256 = "1jw8277z1qzq9dxb3z9yz18fd1rc4wrwc6hbqigyfr4a17h8psgs"; + version = "0.3.0.3"; + sha256 = "0ck7hw1md1bwfl0qzkj0vg8ippmymcmvw84srr15rhaqgiqx9v4n"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -58645,43 +58684,19 @@ self: { }) {}; "comonad" = callPackage - ({ mkDerivation, base, Cabal, cabal-doctest, containers - , distributive, doctest, tagged, transformers, transformers-compat + ({ mkDerivation, base, containers, distributive + , indexed-traversable, tagged, transformers, transformers-compat }: mkDerivation { pname = "comonad"; - version = "5.0.6"; - sha256 = "1blgp2nm9cvnsdi2bmkmly5m0gz91npjvf1i5j4pnx6imhbb1kvp"; - revision = "1"; - editedCabalFile = "19744zfb5nd90a3xnhl7fx9aik39nwwx9sf7k9aahrcplwlvbwgx"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - base containers distributive tagged transformers - transformers-compat - ]; - testHaskellDepends = [ base doctest ]; - description = "Comonads"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "comonad_5_0_7" = callPackage - ({ mkDerivation, base, Cabal, cabal-doctest, containers - , distributive, doctest, indexed-traversable, tagged, transformers - , transformers-compat - }: - mkDerivation { - pname = "comonad"; - version = "5.0.7"; - sha256 = "178d0g7f5rx69dniij0ihjv3makgg9zybqnrbwwf3jfknykypgam"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; + version = "5.0.8"; + sha256 = "04rxycp2pbkrvhjgpgx08jmsipjz4cdmhv59dbp47k4jq8ndyv7g"; libraryHaskellDepends = [ base containers distributive indexed-traversable tagged transformers transformers-compat ]; - testHaskellDepends = [ base doctest ]; description = "Comonads"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "comonad-extras" = callPackage @@ -60955,28 +60970,71 @@ self: { "conferer" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, directory - , hspec, text + , filepath, hspec, QuickCheck, text }: mkDerivation { pname = "conferer"; - version = "0.4.1.1"; - sha256 = "1fi3sflfkzgxzjv5s0w6ja9dqrlc72lli382j6phqdw3h4qja10d"; + version = "1.0.0.0"; + sha256 = "0hxlr45yfzv1lxw9lz7mk5risshdhmznxz0xqx5bsdyl7nbd79pv"; libraryHaskellDepends = [ - base bytestring containers directory text + base bytestring containers directory filepath text ]; testHaskellDepends = [ - base bytestring containers deepseq directory hspec text + base bytestring containers deepseq directory filepath hspec + QuickCheck text ]; description = "Configuration management library"; license = stdenv.lib.licenses.mpl20; }) {}; + "conferer-aeson" = callPackage + ({ mkDerivation, aeson, aeson-qq, base, bytestring, conferer + , directory, hspec, text, unordered-containers, vector + }: + mkDerivation { + pname = "conferer-aeson"; + version = "1.0.0.0"; + sha256 = "0adqblmpbyqfqybgmjnnwsnaxw8qiqvw5c2bj4avsikz7fhcp0nl"; + libraryHaskellDepends = [ + aeson base bytestring conferer directory text unordered-containers + vector + ]; + testHaskellDepends = [ + aeson aeson-qq base bytestring conferer directory hspec text + unordered-containers vector + ]; + description = "conferer's source for reading json files"; + license = stdenv.lib.licenses.mpl20; + }) {}; + + "conferer-dhall" = callPackage + ({ mkDerivation, base, bytestring, conferer, conferer-aeson, dhall + , dhall-json, directory, hspec, text + }: + mkDerivation { + pname = "conferer-dhall"; + version = "1.0.0.0"; + sha256 = "0xw2c1cmjw93x4ala85bxs0lfwlqwdl26lj1n7yc9lk67ln54912"; + libraryHaskellDepends = [ + base bytestring conferer conferer-aeson dhall dhall-json directory + text + ]; + testHaskellDepends = [ + base bytestring conferer conferer-aeson dhall dhall-json directory + hspec text + ]; + description = "Configuration for reading dhall files"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "conferer-hedis" = callPackage ({ mkDerivation, base, conferer, hedis, hspec, text }: mkDerivation { pname = "conferer-hedis"; - version = "0.4.0.1"; - sha256 = "0drsyagkdzlkrrq0x43j72804x1i3p4b9pjyqff5jdrr8h9jrv37"; + version = "1.0.0.0"; + sha256 = "0x150z08x1grzr80fdpkbxprldn08908fgz2mpg3qg219nx4r5n2"; libraryHaskellDepends = [ base conferer hedis text ]; testHaskellDepends = [ base conferer hedis hspec text ]; description = "conferer's FromConfig instances for hedis settings"; @@ -60987,8 +61045,8 @@ self: { ({ mkDerivation, base, conferer, hspec, hspec-core, text }: mkDerivation { pname = "conferer-hspec"; - version = "0.4.0.1"; - sha256 = "1g2dglsvj7caqrvbg1yc08j98ljf71l885kxmmk469ab07j1c5sz"; + version = "1.0.0.0"; + sha256 = "02c4z2999pa04r78n8xzx7idvgg028wlb2fgyk0878wb1gahzsxp"; libraryHaskellDepends = [ base conferer hspec-core text ]; testHaskellDepends = [ base conferer hspec hspec-core text ]; description = "conferer's FromConfig instances for hspec Config"; @@ -61065,8 +61123,8 @@ self: { }: mkDerivation { pname = "conferer-snap"; - version = "0.4.0.1"; - sha256 = "1z5p8zchykp8fc7lag3mi32z4wzb0bxcw5p4j3ya57bqs2xhhsdd"; + version = "1.0.0.0"; + sha256 = "15gz77b5jf35hmcnd6kza1wgzpbgk3pcvhi7mp7yk64ybksld98r"; libraryHaskellDepends = [ base conferer snap-core snap-server text ]; @@ -61095,6 +61153,8 @@ self: { ]; description = "Configuration for reading dhall files"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "conferer-source-json" = callPackage @@ -61115,6 +61175,8 @@ self: { ]; description = "conferer's source for reading json files"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "conferer-source-yaml" = callPackage @@ -61132,6 +61194,8 @@ self: { ]; description = "Configuration for reading yaml files"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "conferer-warp" = callPackage @@ -61139,8 +61203,8 @@ self: { }: mkDerivation { pname = "conferer-warp"; - version = "0.4.0.1"; - sha256 = "1swvrkfqvpnpw2nihqzgn8rxv0pfbc9cl8wlyfshrqirjm0lhbj3"; + version = "1.0.0.0"; + sha256 = "14wrd50dfgc2m6lyfvsx4w605r8krf6ha96j3685vgy6fylff1bd"; libraryHaskellDepends = [ base conferer http-types text wai warp ]; testHaskellDepends = [ base conferer hspec http-types text wai warp @@ -61149,6 +61213,18 @@ self: { license = stdenv.lib.licenses.mpl20; }) {}; + "conferer-yaml" = callPackage + ({ mkDerivation, base, conferer, conferer-aeson, hspec, yaml }: + mkDerivation { + pname = "conferer-yaml"; + version = "1.0.0.0"; + sha256 = "091pkbkjpppkc2ygm8jq22xslr4afbp3kk5377gpx3vh4a0lvswg"; + libraryHaskellDepends = [ base conferer conferer-aeson yaml ]; + testHaskellDepends = [ base conferer conferer-aeson hspec yaml ]; + description = "Configuration for reading yaml files"; + license = stdenv.lib.licenses.mpl20; + }) {}; + "confetti" = callPackage ({ mkDerivation, base, cmdargs, directory, filepath, MissingH , tasty, tasty-hunit, tasty-smallcheck, text, time, unix, yaml @@ -61652,6 +61728,8 @@ self: { testHaskellDepends = [ base hedgehog ]; description = "Orders, Galois connections, and lattices"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "consistent" = callPackage @@ -62528,6 +62606,17 @@ self: { broken = true; }) {}; + "contra-tracer" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "contra-tracer"; + version = "0.1.0.0"; + sha256 = "146g43sqa23n1qg100jvz5m1jcjfxx4rxzmc8559b6apys9ys4br"; + libraryHaskellDepends = [ base ]; + description = "Arrow and contravariant tracers"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "contracheck-applicative" = callPackage ({ mkDerivation, base, containers, contravariant, generics-sop , microlens, mmorph @@ -62547,8 +62636,8 @@ self: { ({ mkDerivation, base, StateVar, transformers }: mkDerivation { pname = "contravariant"; - version = "1.5.2"; - sha256 = "0366gl62wwwdbl9i6kqy60asf60876k55v91la6bmhnwwcj2q9n4"; + version = "1.5.3"; + sha256 = "1haxsq7jl95gzmbjdr2pgza9b7j0j3f26wwkf494gphz6c76yls4"; libraryHaskellDepends = [ base StateVar transformers ]; description = "Contravariant functors"; license = stdenv.lib.licenses.bsd3; @@ -63259,6 +63348,32 @@ self: { broken = true; }) {}; + "coquina" = callPackage + ({ mkDerivation, async, base, bytestring, containers, deepseq + , directory, exceptions, filepath, hspec, lens, markdown-unlit + , monad-logger, mtl, process, stm, temporary, text, transformers + , which + }: + mkDerivation { + pname = "coquina"; + version = "0.1.0.0"; + sha256 = "1ag3r4p9v5vbkwh808swsz1f6ii6jk0rri8m9li7qdiixlnhykj1"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + async base bytestring containers deepseq directory exceptions + filepath monad-logger mtl process stm temporary text transformers + ]; + executableHaskellDepends = [ base process text ]; + executableToolDepends = [ markdown-unlit ]; + testHaskellDepends = [ + async base exceptions hspec lens mtl process stm temporary text + which + ]; + description = "Yet another shell monad"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "core" = callPackage ({ mkDerivation, base, bytestring, parsec, pretty }: mkDerivation { @@ -64009,19 +64124,21 @@ self: { }) {}; "cpython" = callPackage - ({ mkDerivation, base, bytestring, c2hs, python34, text }: + ({ mkDerivation, base, bytestring, c2hs, python3, text }: mkDerivation { pname = "cpython"; - version = "3.4.0"; - sha256 = "1j67w1zpbdcqpdb51msp96bhvi3fxscc49gbjlnilr6ah9nllhkm"; + version = "3.5.1"; + sha256 = "13vb65vgd9jncys1phgm3d9jmn3nq5k4ln2my34gc8vqpp7qxyh1"; libraryHaskellDepends = [ base bytestring text ]; - libraryPkgconfigDepends = [ python34 ]; + libraryPkgconfigDepends = [ python3 ]; libraryToolDepends = [ c2hs ]; + testHaskellDepends = [ base text ]; + testPkgconfigDepends = [ python3 ]; description = "Bindings for libpython"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; - }) {python34 = null;}; + }) {inherit (pkgs) python3;}; "cql" = callPackage ({ mkDerivation, base, bytestring, cereal, containers, Decimal @@ -64504,8 +64621,8 @@ self: { }: mkDerivation { pname = "crdt"; - version = "10.5"; - sha256 = "06ndalfz2j722ifblzz3pamb0fdyhs9pa0286kmx2dcrvw7kq1vy"; + version = "10.6"; + sha256 = "0c86gf70iv59dwmm0yv8isyyd6zy497vqgf6ml9s6rz4hhg1rwl0"; libraryHaskellDepends = [ base binary bytestring containers Diff hashable mtl network-info safe stm time vector @@ -64523,8 +64640,8 @@ self: { }: mkDerivation { pname = "crdt-event-fold"; - version = "1.3.0.0"; - sha256 = "0zpbn7rx9zywrfhpaj7lji0is0sb61al7q8fddrxy8vvirvhbb85"; + version = "1.4.0.0"; + sha256 = "0hagrbsgw58kchiifhq69s4hii7pv8zsvfzl3ijgxkb8iqp515gc"; libraryHaskellDepends = [ aeson base binary containers data-default-class data-dword monad-logger mtl transformers @@ -66116,6 +66233,8 @@ self: { ]; description = "Defining and manipulating css easing strings"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "css-selectors" = callPackage @@ -66542,8 +66661,8 @@ self: { pname = "cue-sheet"; version = "2.0.1"; sha256 = "0papll3xcq2ipmya61jr71gf3zx2swmys829x5sbz7lv6abj9r3i"; - revision = "2"; - editedCabalFile = "0kblqr8mjmps56a7pbjwnby5ik8grmj15l1qir7q9kbn44x4s8l3"; + revision = "3"; + editedCabalFile = "1v8yvvb9sdpkg7m6z5a4sf0hcss7swb318700ap0qc79qn4ifdqb"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring containers exceptions megaparsec mtl QuickCheck @@ -66814,6 +66933,38 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "curryer-rpc" = callPackage + ({ mkDerivation, async, base, binary, bytestring, containers + , criterion, exceptions, fast-builder, hashable, network + , network-byte-order, optparse-generic, stm, stm-containers + , streamly, tasty, tasty-hunit, time, uuid, winery + }: + mkDerivation { + pname = "curryer-rpc"; + version = "0.1"; + sha256 = "13xgmhdgnn3nw2knlr60ah51hbf34fiiiz7z6230976n78aa6vkh"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + async base binary bytestring containers exceptions fast-builder + hashable network network-byte-order stm stm-containers streamly + time uuid winery + ]; + executableHaskellDepends = [ + base optparse-generic stm stm-containers winery + ]; + testHaskellDepends = [ + async base network stm tasty tasty-hunit winery + ]; + benchmarkHaskellDepends = [ + async base bytestring criterion network winery + ]; + description = "Fast, Haskell RPC"; + license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "curryrs" = callPackage ({ mkDerivation, base, mtl, tasty, tasty-hunit }: mkDerivation { @@ -68774,6 +68925,8 @@ self: { ]; description = "Interval datatype, interval arithmetic and interval-based containers"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "data-inttrie" = callPackage @@ -69167,6 +69320,8 @@ self: { ]; description = "R-Tree is a spatial data structure similar to Quadtrees or B-Trees"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "data-ref" = callPackage @@ -70242,8 +70397,8 @@ self: { }: mkDerivation { pname = "dbus"; - version = "1.2.16"; - sha256 = "103zxllh7nwbbckjblidr45xa13lrpqh9bwhvirrx24g7hsj1y9c"; + version = "1.2.17"; + sha256 = "0iyfnkxcnm1vl379ry88fqxgn2y8q6ilsvpic6ciassnyv5pcbrv"; libraryHaskellDepends = [ base bytestring cereal conduit containers deepseq exceptions filepath lens network parsec random split template-haskell text @@ -71527,8 +71682,8 @@ self: { }: mkDerivation { pname = "dejafu"; - version = "2.4.0.0"; - sha256 = "1kj4ygdbbkr54bqknxk3jqif74jxgpid7cz9vzcm2m15h8q2z9k2"; + version = "2.4.0.1"; + sha256 = "0zysf0hjfdd5iypllbiyih312kl2hsfwiqf6030i7q432yc3f8vd"; libraryHaskellDepends = [ base concurrency containers contravariant deepseq exceptions leancheck profunctors random transformers @@ -72857,60 +73012,6 @@ self: { }) {}; "dhall" = callPackage - ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, atomic-write - , base, bytestring, case-insensitive, cborg, cborg-json, containers - , contravariant, cryptonite, data-fix, deepseq, Diff, directory - , doctest, dotgen, either, exceptions, filepath, foldl, gauge - , generic-random, half, hashable, haskeline, http-client - , http-client-tls, http-types, lens-family-core, megaparsec, memory - , mmorph, mockery, mtl, network-uri, optparse-applicative - , parser-combinators, parsers, pretty-simple, prettyprinter - , prettyprinter-ansi-terminal, profunctors, QuickCheck - , quickcheck-instances, repline, scientific, serialise - , special-values, spoon, tasty, tasty-expected-failure, tasty-hunit - , tasty-quickcheck, tasty-silver, template-haskell, text - , text-manipulate, th-lift-instances, transformers - , transformers-compat, turtle, unordered-containers, uri-encode - , vector - }: - mkDerivation { - pname = "dhall"; - version = "1.37.0"; - sha256 = "126092s8m5kf1bmihwg73kfjcll9y0icqj4aa48m9hg7qm92nq0x"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - aeson aeson-pretty ansi-terminal atomic-write base bytestring - case-insensitive cborg cborg-json containers contravariant - cryptonite data-fix deepseq Diff directory dotgen either exceptions - filepath half hashable haskeline http-client http-client-tls - http-types lens-family-core megaparsec memory mmorph mtl - network-uri optparse-applicative parser-combinators parsers - pretty-simple prettyprinter prettyprinter-ansi-terminal profunctors - repline scientific serialise template-haskell text text-manipulate - th-lift-instances transformers transformers-compat - unordered-containers uri-encode vector - ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ - base bytestring cborg containers data-fix deepseq directory doctest - either filepath foldl generic-random http-client http-client-tls - lens-family-core megaparsec mockery prettyprinter QuickCheck - quickcheck-instances scientific serialise special-values spoon - tasty tasty-expected-failure tasty-hunit tasty-quickcheck - tasty-silver template-haskell text transformers turtle - unordered-containers vector - ]; - benchmarkHaskellDepends = [ - base bytestring containers directory gauge text - ]; - doCheck = false; - description = "A configuration language guaranteed to terminate"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "dhall_1_37_1" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, atomic-write , base, bytestring, case-insensitive, cborg, cborg-json, containers , contravariant, cryptonite, data-fix, deepseq, Diff, directory @@ -72931,6 +73032,8 @@ self: { pname = "dhall"; version = "1.37.1"; sha256 = "16qpasw41wcgbi9ljrs43dn2ajw25yipm8kxri6v5fwj3gyzj24d"; + revision = "1"; + editedCabalFile = "11sjra0k7sdy0xcbhlxvjjpd4h7ki9dcrndcpaq71qlgdql32w24"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -72962,7 +73065,6 @@ self: { doCheck = false; description = "A configuration language guaranteed to terminate"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dhall-bash" = callPackage @@ -73016,6 +73118,8 @@ self: { pname = "dhall-docs"; version = "1.0.3"; sha256 = "0cinkgcihn15zws18nff42lcpmzv4cg7k8wxmcwa93k7qvw01i2p"; + revision = "1"; + editedCabalFile = "1wzwfgv6bpgjq0day372gyxg9vrcmkf5sbzvm0lv4p39z0qcgpna"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -73032,6 +73136,8 @@ self: { ]; description = "Generate HTML docs from a dhall package"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dhall-fly" = callPackage @@ -73079,6 +73185,8 @@ self: { pname = "dhall-json"; version = "1.7.4"; sha256 = "1qzlv7wvap1ivgv7fi9ikqa9nm9z9kbbca5zvddh3njcdk6i73n9"; + revision = "1"; + editedCabalFile = "0njh1c7c4dcm5ya4w79mf11m5v9gnacyd7lrz7j4ipk4wdgwinvi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -73095,6 +73203,8 @@ self: { ]; description = "Convert between Dhall and JSON or YAML"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dhall-lex" = callPackage @@ -73128,6 +73238,8 @@ self: { pname = "dhall-lsp-server"; version = "1.0.12"; sha256 = "0gp9pa3pdm49ya6awdi1qjbycxdihz2z11mzmfnr5m2gf0vrjzpp"; + revision = "1"; + editedCabalFile = "1yiazwsvbz2yzc8jdvr6nq7p882pkcr2hfyxsn73j288cwdyl02r"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -73143,6 +73255,8 @@ self: { ]; description = "Language Server Protocol (LSP) server for Dhall"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dhall-nix" = callPackage @@ -73250,6 +73364,8 @@ self: { pname = "dhall-yaml"; version = "1.2.4"; sha256 = "0xm1dsim5x83k6kp5g9yv08ixf6l4p2mm666m4vsylx98y5nwmag"; + revision = "1"; + editedCabalFile = "1mmsymbj57r49kj520f9hrw9bk80y29p3av68b1hmrcaiixqs87a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -73266,6 +73382,8 @@ self: { ]; description = "Convert between Dhall and YAML"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dhcp-lease-parser" = callPackage @@ -74350,8 +74468,8 @@ self: { }: mkDerivation { pname = "differential"; - version = "0.1.2.1"; - sha256 = "164s372c7pfqnzhvrhxmic0csx3lgwqi06zz5w8zfvkw76md8qh3"; + version = "0.2.0.0"; + sha256 = "1dzxqva176dw22bb4hlv8dfizkzqsj5z9qdv7piwdh171nd9bwqd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -75166,6 +75284,8 @@ self: { testHaskellDepends = [ base filepath ]; description = "Recursively build, navigate, and operate on a tree of directory contents"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "directory-layout" = callPackage @@ -75251,25 +75371,6 @@ self: { }) {}; "dirichlet" = callPackage - ({ mkDerivation, base, hspec, hspec-discover, log-domain - , math-functions, mwc-random, primitive, vector - }: - mkDerivation { - pname = "dirichlet"; - version = "0.1.0.0"; - sha256 = "173mw8706fjrqdjwrjfcb8g140hp4xdjbpvhvq71f8lj8527b9ia"; - libraryHaskellDepends = [ - base log-domain math-functions mwc-random primitive vector - ]; - testHaskellDepends = [ - base hspec hspec-discover log-domain mwc-random vector - ]; - testToolDepends = [ hspec-discover ]; - description = "Multivariate dirichlet distribution"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "dirichlet_0_1_0_2" = callPackage ({ mkDerivation, base, hspec, log-domain, math-functions , mwc-random, primitive, vector }: @@ -75283,7 +75384,6 @@ self: { testHaskellDepends = [ base hspec log-domain mwc-random vector ]; description = "Multivariate Dirichlet distribution"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dirstream" = callPackage @@ -76455,18 +76555,15 @@ self: { }) {}; "distributive" = callPackage - ({ mkDerivation, base, base-orphans, Cabal, cabal-doctest, doctest - , generic-deriving, hspec, hspec-discover, tagged, transformers + ({ mkDerivation, base, base-orphans, generic-deriving, hspec + , hspec-discover, tagged, transformers }: mkDerivation { pname = "distributive"; - version = "0.6.2"; - sha256 = "1j93zkfffm6s16kgr0j0z87y5ds28rw0r2gyc5ncwcylvrqy4kl2"; - revision = "2"; - editedCabalFile = "11y4qanr09880d7sxkhrzrh3cpmqbx001hiqhsr2s75xrnmrpkia"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; + version = "0.6.2.1"; + sha256 = "14bb66qyfn43bj688igfvnfjw7iycjf4n2k38sm8rxbqw2916dfp"; libraryHaskellDepends = [ base base-orphans tagged transformers ]; - testHaskellDepends = [ base doctest generic-deriving hspec ]; + testHaskellDepends = [ base generic-deriving hspec ]; testToolDepends = [ hspec-discover ]; description = "Distributive functors -- Dual to Traversable"; license = stdenv.lib.licenses.bsd3; @@ -77363,32 +77460,6 @@ self: { }) {}; "doctemplates" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, criterion - , doclayout, filepath, Glob, HsYAML, mtl, parsec, safe, scientific - , tasty, tasty-golden, tasty-hunit, temporary, text - , text-conversions, unordered-containers, vector - }: - mkDerivation { - pname = "doctemplates"; - version = "0.8.3"; - sha256 = "0pzzcy2f1ysnqzkv14h7x9dp9ywf5rn5k8cvwwwvlg6sjizgvfpd"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - aeson base containers doclayout filepath HsYAML mtl parsec safe - scientific text text-conversions unordered-containers vector - ]; - testHaskellDepends = [ - aeson base bytestring containers doclayout filepath Glob tasty - tasty-golden tasty-hunit temporary text - ]; - benchmarkHaskellDepends = [ - aeson base containers criterion doclayout filepath mtl text - ]; - description = "Pandoc-style document templates"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "doctemplates_0_9" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, criterion , doclayout, filepath, Glob, HsYAML, mtl, parsec, safe, scientific , tasty, tasty-golden, tasty-hunit, temporary, text @@ -77412,7 +77483,6 @@ self: { ]; description = "Pandoc-style document templates"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "doctest" = callPackage @@ -78141,8 +78211,8 @@ self: { }: mkDerivation { pname = "dovin"; - version = "0.2"; - sha256 = "0iy2hfmf3riwmj880if7ar30vrwnfpmyv8dhkx42hlzjb8mg538q"; + version = "3.0.1"; + sha256 = "1qdqzy3h4zwg1b36h5q5qnrpyki9fjhda6jk3izcj829805ya1i9"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal directory filepath ]; @@ -80070,6 +80140,29 @@ self: { license = stdenv.lib.licenses.isc; }) {}; + "early" = callPackage + ({ mkDerivation, base, containers, ghc, ghc-lib-parser, syb, text + , transformers, unordered-containers + }: + mkDerivation { + pname = "early"; + version = "0.0.0"; + sha256 = "0nx12376py2jc7yd94lfjbjxw3824fm3v2iviv406a2svkayw7pm"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers ghc syb text transformers + ]; + executableHaskellDepends = [ + base ghc-lib-parser text unordered-containers + ]; + testHaskellDepends = [ base ]; + description = "Early return syntax in do-notation (GHC plugin)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "ease" = callPackage ({ mkDerivation, base, data-default }: mkDerivation { @@ -82225,23 +82318,6 @@ self: { }) {}; "elynx" = callPackage - ({ mkDerivation, aeson, base, bytestring, elynx-tools - , optparse-applicative, slynx, tlynx - }: - mkDerivation { - pname = "elynx"; - version = "0.5.0"; - sha256 = "0paxrh39ags55jg7pxb29dwb6cn7sakxdpkdf1fffrqsr3inpr9n"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - aeson base bytestring elynx-tools optparse-applicative slynx tlynx - ]; - description = "Validate and (optionally) redo ELynx analyses"; - license = stdenv.lib.licenses.gpl3Plus; - }) {}; - - "elynx_0_5_0_1" = callPackage ({ mkDerivation, aeson, base, bytestring, elynx-tools , optparse-applicative, slynx, tlynx }: @@ -82257,31 +82333,10 @@ self: { description = "Validate and (optionally) redo ELynx analyses"; license = stdenv.lib.licenses.gpl3Plus; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "elynx-markov" = callPackage - ({ mkDerivation, async, attoparsec, base, bytestring, containers - , elynx-seq, elynx-tools, hmatrix, hspec, integration - , math-functions, mwc-random, parallel, primitive, statistics - , vector - }: - mkDerivation { - pname = "elynx-markov"; - version = "0.5.0"; - sha256 = "0l66zaf4mj117pz16apdr4fi47xv9slay459lzjpdawmm6ppwlgc"; - libraryHaskellDepends = [ - async attoparsec base bytestring containers elynx-seq hmatrix - integration math-functions mwc-random parallel primitive statistics - vector - ]; - testHaskellDepends = [ - base containers elynx-tools hmatrix hspec mwc-random vector - ]; - description = "Simulate molecular sequences along trees"; - license = stdenv.lib.licenses.gpl3Plus; - }) {}; - - "elynx-markov_0_5_0_1" = callPackage ({ mkDerivation, async, attoparsec, base, bytestring, containers , elynx-seq, elynx-tools, hmatrix, hspec, integration , math-functions, mwc-random, parallel, primitive, statistics @@ -82301,22 +82356,9 @@ self: { ]; description = "Simulate molecular sequences along trees"; license = stdenv.lib.licenses.gpl3Plus; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "elynx-nexus" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, hspec }: - mkDerivation { - pname = "elynx-nexus"; - version = "0.5.0"; - sha256 = "03rhhbyhd1z95kl0ds204z4zywgy9anvhashpw2p311dq1g4axrs"; - libraryHaskellDepends = [ attoparsec base bytestring ]; - testHaskellDepends = [ base hspec ]; - description = "Import and export Nexus files"; - license = stdenv.lib.licenses.gpl3Plus; - }) {}; - - "elynx-nexus_0_5_0_1" = callPackage ({ mkDerivation, attoparsec, base, bytestring, hspec }: mkDerivation { pname = "elynx-nexus"; @@ -82326,30 +82368,9 @@ self: { testHaskellDepends = [ base hspec ]; description = "Import and export Nexus files"; license = stdenv.lib.licenses.gpl3Plus; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "elynx-seq" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, containers - , elynx-tools, hspec, matrices, mwc-random, parallel, primitive - , vector, vector-th-unbox, word8 - }: - mkDerivation { - pname = "elynx-seq"; - version = "0.5.0"; - sha256 = "0bqlv3i7qhnkal8yiwvkp7175jdb9bcg7szkx0b352zfr4qhhmpa"; - libraryHaskellDepends = [ - aeson attoparsec base bytestring containers matrices mwc-random - parallel primitive vector vector-th-unbox word8 - ]; - testHaskellDepends = [ - base bytestring elynx-tools hspec matrices vector - ]; - description = "Handle molecular sequences"; - license = stdenv.lib.licenses.gpl3Plus; - }) {}; - - "elynx-seq_0_5_0_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, containers , elynx-tools, hspec, matrices, mwc-random, parallel, primitive , vector, vector-th-unbox, word8 @@ -82367,32 +82388,9 @@ self: { ]; description = "Handle molecular sequences"; license = stdenv.lib.licenses.gpl3Plus; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "elynx-tools" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base16-bytestring - , bytestring, cryptohash-sha256, deepseq, directory, fast-logger - , hmatrix, monad-control, monad-logger, mwc-random - , optparse-applicative, primitive, template-haskell, text, time - , transformers, transformers-base, vector, zlib - }: - mkDerivation { - pname = "elynx-tools"; - version = "0.5.0"; - sha256 = "0lhkgi6wa90wniszkhmnnzmxa3cx1bvzbsy7cwrslmg8iqcxyin0"; - libraryHaskellDepends = [ - aeson attoparsec base base16-bytestring bytestring - cryptohash-sha256 deepseq directory fast-logger hmatrix - monad-control monad-logger mwc-random optparse-applicative - primitive template-haskell text time transformers transformers-base - vector zlib - ]; - description = "Tools for ELynx"; - license = stdenv.lib.licenses.gpl3Plus; - }) {}; - - "elynx-tools_0_5_0_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, base16-bytestring , bytestring, cryptohash-sha256, deepseq, directory, fast-logger , hmatrix, monad-control, monad-logger, mwc-random @@ -82412,36 +82410,9 @@ self: { ]; description = "Tools for ELynx"; license = stdenv.lib.licenses.gpl3Plus; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "elynx-tree" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, comonad - , containers, criterion, deepseq, double-conversion, elynx-nexus - , elynx-tools, hspec, math-functions, microlens, mwc-random - , parallel, primitive, QuickCheck, statistics - }: - mkDerivation { - pname = "elynx-tree"; - version = "0.5.0"; - sha256 = "0b3dmz6hlbawwpnn84qx0w1g5jymgs7b05jxvx83q365vw8pw6aj"; - libraryHaskellDepends = [ - aeson attoparsec base bytestring comonad containers deepseq - double-conversion elynx-nexus math-functions mwc-random parallel - primitive statistics - ]; - testHaskellDepends = [ - attoparsec base bytestring containers elynx-tools hspec QuickCheck - ]; - benchmarkHaskellDepends = [ - base bytestring criterion deepseq elynx-tools microlens mwc-random - parallel - ]; - description = "Handle phylogenetic trees"; - license = stdenv.lib.licenses.gpl3Plus; - }) {}; - - "elynx-tree_0_5_0_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, comonad , containers, criterion, deepseq, double-conversion, elynx-nexus , elynx-tools, hspec, math-functions, microlens, mwc-random @@ -82465,6 +82436,7 @@ self: { description = "Handle phylogenetic trees"; license = stdenv.lib.licenses.gpl3Plus; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "emacs-keys" = callPackage @@ -84114,17 +84086,6 @@ self: { }) {}; "error-or" = callPackage - ({ mkDerivation, base, containers, text }: - mkDerivation { - pname = "error-or"; - version = "0.1.1.0"; - sha256 = "0xh47kyzdyycvi6dxlw736zsa4pxplh9ariw7p2mcr64rx2r77cl"; - libraryHaskellDepends = [ base containers text ]; - description = "Composable, hierarchical errors"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "error-or_0_1_2_0" = callPackage ({ mkDerivation, base, containers, text }: mkDerivation { pname = "error-or"; @@ -84133,7 +84094,6 @@ self: { libraryHaskellDepends = [ base containers text ]; description = "Composable, hierarchical errors"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "error-or-utils" = callPackage @@ -84318,6 +84278,8 @@ self: { ]; description = "ANSI Escape Sequence Text Decoration Made Easy"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "escaped" = callPackage @@ -85411,22 +85373,21 @@ self: { "eventlog2html" = callPackage ({ mkDerivation, aeson, array, attoparsec, base, blaze-html - , bytestring, containers, cpu, directory, file-embed, filepath - , ghc-events, ghc-heap, hashable, hashtables, hvega, mtl - , optparse-applicative, semigroups, statistics-linreg, strict, text - , time, trie-simple, vector + , bytestring, containers, file-embed, filepath, ghc-events + , ghc-heap, hashable, hashtables, hvega, mtl, optparse-applicative + , semigroups, statistics-linreg, text, time, trie-simple, vector }: mkDerivation { pname = "eventlog2html"; - version = "0.8.2"; - sha256 = "01qfggrnfsldv5sp62q14k8d04fm7qx6kwg6z4nipirbpnya8s89"; + version = "0.8.3"; + sha256 = "0xk9s8f20xx1xpbc2kbyfv3hhnrj8arim99lrr6wbv8y33qz0pkr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson array attoparsec base blaze-html bytestring containers cpu - directory file-embed filepath ghc-events ghc-heap hashable - hashtables hvega mtl optparse-applicative semigroups - statistics-linreg strict text time trie-simple vector + aeson array attoparsec base blaze-html bytestring containers + file-embed filepath ghc-events ghc-heap hashable hashtables hvega + mtl optparse-applicative semigroups statistics-linreg text time + trie-simple vector ]; executableHaskellDepends = [ aeson base filepath text ]; description = "Visualise an eventlog"; @@ -86170,6 +86131,8 @@ self: { ]; description = "database schema for exigo marking/assessment tools"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "exinst" = callPackage @@ -86521,8 +86484,8 @@ self: { }: mkDerivation { pname = "experimenter"; - version = "0.1.0.2"; - sha256 = "1qk0ss8z476q4p6agi55yzs72vc01lgl19jqdyjind119vv62840"; + version = "0.1.0.4"; + sha256 = "0pzlmq2rb485x0df4ivw5i9sv8n14svy1vhgjqc69vm1p0md57ms"; libraryHaskellDepends = [ aeson base bytestring cereal cereal-vector conduit containers deepseq directory esqueleto filepath HaTeX hostname lens matrix @@ -87134,24 +87097,6 @@ self: { }) {}; "extra" = callPackage - ({ mkDerivation, base, clock, directory, filepath, process - , QuickCheck, quickcheck-instances, time, unix - }: - mkDerivation { - pname = "extra"; - version = "1.7.8"; - sha256 = "1sgd08h9p7ywmv08yd1h6z1bpf6pqpj1qn4v7vv7w4la86jmh2yg"; - 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; - }) {}; - - "extra_1_7_9" = callPackage ({ mkDerivation, base, clock, directory, filepath, process , QuickCheck, quickcheck-instances, time, unix }: @@ -87167,7 +87112,6 @@ self: { ]; description = "Extra functions I use"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "extract-dependencies" = callPackage @@ -87340,17 +87284,25 @@ self: { }) {}; "factor" = callPackage - ({ mkDerivation, arithmetic, base, opentheory-primitive, random }: + ({ mkDerivation, base, containers, parsec, pretty, QuickCheck + , random, time + }: mkDerivation { pname = "factor"; - version = "1.0"; - sha256 = "02fy4lnajdj0dqkz3bfpj6qzk34kjmjz6c0vidwc7kqqivhxldvh"; - isLibrary = false; + version = "1.5"; + sha256 = "0fn7dlyaxa2pwf3xakszs75j0fvc7lsdzp4x2cm4hsnyyn1x5v9z"; + isLibrary = true; isExecutable = true; - executableHaskellDepends = [ - arithmetic base opentheory-primitive random + libraryHaskellDepends = [ + base containers parsec pretty random time ]; - description = "Factoring integers"; + executableHaskellDepends = [ + base containers parsec pretty random time + ]; + testHaskellDepends = [ + base containers parsec pretty QuickCheck random time + ]; + description = "Factoring integers and polynomials"; license = stdenv.lib.licenses.mit; }) {}; @@ -87427,22 +87379,20 @@ self: { }) {}; "fadno" = callPackage - ({ mkDerivation, base, comonad, containers, data-default, Decimal - , deepseq, event-list, fadno-braids, fadno-xml, hspec - , hspec-contrib, HUnit, lens, midi, mtl, process, safe, split, text - , unordered-containers, vector, xml + ({ mkDerivation, base, containers, data-default, Decimal + , event-list, fadno-xml, hspec, hspec-contrib, HUnit, lens, midi + , mtl, process, safe, text, unordered-containers, vector, xml }: mkDerivation { pname = "fadno"; - version = "1.1.3"; - sha256 = "0yd4dc6imcp9lf7m0q4ah5z6c47m83302wagps821n8285qvr6zc"; + version = "1.1.8"; + sha256 = "0f8lx1lg43665s56fwb3mawxjz8g1mrr33hz3rm47jcbb45k25jj"; libraryHaskellDepends = [ - base comonad containers data-default Decimal deepseq event-list - fadno-braids fadno-xml HUnit lens midi mtl process safe split text - unordered-containers vector xml + base containers data-default Decimal event-list fadno-xml HUnit + lens midi mtl process safe text unordered-containers vector xml ]; testHaskellDepends = [ - base containers hspec hspec-contrib HUnit lens + base containers fadno-xml hspec hspec-contrib HUnit lens ]; description = "Minimal library for music generation and notation"; license = stdenv.lib.licenses.bsd3; @@ -87456,8 +87406,8 @@ self: { }: mkDerivation { pname = "fadno-braids"; - version = "0.1.3"; - sha256 = "021rm7kdpcgdch57pm9jr6hc220zn9d644wlsbv54z9ll5jj3mlg"; + version = "0.1.5"; + sha256 = "1lyxxnzc2y4iz1ydyqzm69rd1yjh3grcq8ji1rn9wqbwjbjimf9p"; libraryHaskellDepends = [ base containers data-default diagrams diagrams-lib diagrams-rasterific lens random @@ -87473,8 +87423,8 @@ self: { }: mkDerivation { pname = "fadno-xml"; - version = "1.1.3"; - sha256 = "1kydl4nj4j0q4s3sq6r0l42f4ikxq7cdmzkcsavla0fcm0jvj359"; + version = "1.2"; + sha256 = "0s7d7ida5xj2118j0zwbrd19pxn8aqqqaxz62kyvybckmhz05h1g"; libraryHaskellDepends = [ base containers Decimal lens mtl parsec xml ]; @@ -87639,6 +87589,8 @@ self: { ]; description = "Library for producing fake data"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fakedata-parser" = callPackage @@ -87666,6 +87618,8 @@ self: { ]; description = "Fake a -> Gen a"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fakefs" = callPackage @@ -87715,8 +87669,8 @@ self: { }: mkDerivation { pname = "faktory"; - version = "1.0.1.3"; - sha256 = "1mxgkf54hxlj753dva21gxdqamq4mgfslcq5gqhp154gi0xmm79w"; + version = "1.0.1.4"; + sha256 = "151jlcrp80f8riyf8rxzvggyxq3k2mg2fi81r7wnc4in6gzsc0qj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -87827,16 +87781,18 @@ self: { }) {}; "fast-arithmetic" = callPackage - ({ mkDerivation, arithmoi, base, combinat, criterion, hgmp, hspec - , QuickCheck + ({ mkDerivation, arithmoi, base, combinat, criterion + , exact-combinatorics, hgmp, hspec, QuickCheck }: mkDerivation { pname = "fast-arithmetic"; - version = "0.6.5.0"; - sha256 = "02ccvk09fqp235bl3r8k234xnl6fmis7hkl34v4wmrwpb3f96hmh"; - libraryHaskellDepends = [ base combinat hgmp ]; + version = "0.6.5.1"; + sha256 = "0yijbcp5918hnl32xvvpks652byad9zph901ab5bml3iy3a0n2pp"; + libraryHaskellDepends = [ arithmoi base combinat hgmp ]; testHaskellDepends = [ arithmoi base combinat hspec QuickCheck ]; - benchmarkHaskellDepends = [ arithmoi base combinat criterion ]; + benchmarkHaskellDepends = [ + arithmoi base combinat criterion exact-combinatorics + ]; doHaddock = false; description = "Fast functions on integers"; license = stdenv.lib.licenses.bsd3; @@ -90226,6 +90182,17 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "filters-basic" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "filters-basic"; + version = "0.1.1.0"; + sha256 = "09q6fb8cv7di67wb8zhky8qpbwivzax59xik1zbcjf3sp465a337"; + libraryHaskellDepends = [ base ]; + description = "Allows to change the structure of the function output"; + license = stdenv.lib.licenses.mit; + }) {}; + "filtrable" = callPackage ({ mkDerivation, base, transformers }: mkDerivation { @@ -90509,10 +90476,8 @@ self: { }: mkDerivation { pname = "finite-field"; - version = "0.9.0"; - sha256 = "026l5qrc7vsm2s19z10xx30lrsfkwwcymyznyy5hrcrwqj9wf643"; - revision = "2"; - editedCabalFile = "11zivn1cjwxc7xy8q50raz1wpfgl0b459ai0f4j304rv7yiwrhdp"; + version = "0.10.0"; + sha256 = "1cw2d04dgbx8sk081xpnzla3im7ybvyd7v04wp53knj72h0aqydj"; libraryHaskellDepends = [ base deepseq hashable singletons template-haskell ]; @@ -91280,8 +91245,8 @@ self: { pname = "flac"; version = "0.2.0"; sha256 = "03zmsnnpkk26ss8ka2l7x9gsfcmiqfyc73v7fna6sk5cwzxsb33c"; - revision = "1"; - editedCabalFile = "1phwdnya8bgw24a80vbw0m4pm7r67grnc6si8683jz620snnsm48"; + revision = "2"; + editedCabalFile = "1b3cbhvvhbv1d0gkfwgn9j9jx9cjn3w606vbpfhak2cyjmw26q36"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring containers directory exceptions filepath mtl text @@ -91307,6 +91272,8 @@ self: { pname = "flac-picture"; version = "0.1.2"; sha256 = "02h36z65xmy0mvg7j2863h35dcf24l08ma0dxjbqcn42sca9ss0m"; + revision = "1"; + editedCabalFile = "1ib9ypz06i81bgkj08aw6fdyxi6fbl2029vwlcqybbhz9cnya1pm"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring flac JuicyPixels ]; testHaskellDepends = [ @@ -92584,6 +92551,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "foldable-ix" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "foldable-ix"; + version = "0.1.0.0"; + sha256 = "1lvf1n8mnv3imlry4nqdv8c2c930yic0raqs2awnbmyyy1c6fc79"; + libraryHaskellDepends = [ base ]; + description = "Functions to find out the indices of the elements in the Foldable structures"; + license = stdenv.lib.licenses.mit; + }) {}; + "foldable1" = callPackage ({ mkDerivation, base, transformers, util }: mkDerivation { @@ -92605,6 +92583,8 @@ self: { pname = "foldl"; version = "1.4.10"; sha256 = "1fl1vahga6dv21nkgjd265nlhmgqzr8sa0fb5dfqzk34fb01vvvq"; + revision = "1"; + editedCabalFile = "0rd3w7m8a8pxb8jpmi9nky4hf1jl35cm8vp1qq8mfzgpx5bbqd2w"; libraryHaskellDepends = [ base bytestring comonad containers contravariant hashable mwc-random primitive profunctors semigroupoids text transformers @@ -92874,7 +92854,7 @@ self: { license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; broken = true; - }) {foma = null;}; + }) {inherit (pkgs) foma;}; "font-awesome-type" = callPackage ({ mkDerivation, base }: @@ -93656,6 +93636,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "fp-ieee" = callPackage + ({ mkDerivation, base, decimal-arithmetic, doctest, gauge, hspec + , hspec-core, integer-gmp, integer-logarithms, QuickCheck, random + }: + mkDerivation { + pname = "fp-ieee"; + version = "0.1.0.1"; + sha256 = "11hj4ldpxcvpnyqhs02s0ryfjiql9pmn1h1caly3cfd1r9aairl9"; + libraryHaskellDepends = [ base integer-gmp integer-logarithms ]; + testHaskellDepends = [ + base decimal-arithmetic doctest hspec hspec-core integer-logarithms + QuickCheck random + ]; + benchmarkHaskellDepends = [ base gauge ]; + description = "IEEE 754-2019 compliant operations"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "fpco-api" = callPackage ({ mkDerivation, aeson, attoparsec, base, base64-bytestring , blaze-html, bytestring, cereal, containers, data-default, deepseq @@ -93997,24 +93997,6 @@ self: { }) {}; "free" = callPackage - ({ mkDerivation, base, comonad, containers, distributive - , exceptions, mtl, profunctors, semigroupoids, template-haskell - , th-abstraction, transformers, transformers-base - }: - mkDerivation { - pname = "free"; - version = "5.1.4"; - sha256 = "0nid1vpf4c4pwxa5x7wyb2h378q0jf57zh14gkkhrj7bzc5qnprc"; - libraryHaskellDepends = [ - base comonad containers distributive exceptions mtl profunctors - semigroupoids template-haskell th-abstraction transformers - transformers-base - ]; - description = "Monads for free"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "free_5_1_5" = callPackage ({ mkDerivation, base, comonad, containers, distributive , exceptions, indexed-traversable, mtl, profunctors, semigroupoids , template-haskell, th-abstraction, transformers, transformers-base @@ -94023,6 +94005,26 @@ self: { pname = "free"; version = "5.1.5"; sha256 = "0rpnimi3iyr6n9q2ny365mp1l5rjjys15aggcikgnrfn0d656nw6"; + revision = "1"; + editedCabalFile = "1ac4f5n3spmxy9ajlikn9ffswg9l59s7kzwpgcpz8vkc2qf959g1"; + libraryHaskellDepends = [ + base comonad containers distributive exceptions indexed-traversable + mtl profunctors semigroupoids template-haskell th-abstraction + transformers transformers-base + ]; + description = "Monads for free"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "free_5_1_6" = callPackage + ({ mkDerivation, base, comonad, containers, distributive + , exceptions, indexed-traversable, mtl, profunctors, semigroupoids + , template-haskell, th-abstraction, transformers, transformers-base + }: + mkDerivation { + pname = "free"; + version = "5.1.6"; + sha256 = "017cyz0d89560m3a2g2gpf8imzdzzlrd1rv0m6s2lvj41i2dhzfc"; libraryHaskellDepends = [ base comonad containers distributive exceptions indexed-traversable mtl profunctors semigroupoids template-haskell th-abstraction @@ -96245,8 +96247,8 @@ self: { }: mkDerivation { pname = "futhark"; - version = "0.18.4"; - sha256 = "1qpl16r6q0bhb99502nv5skmycr825rjgnpna1y0flpdhkprmmqr"; + version = "0.18.5"; + sha256 = "1v81b2snf5famnm8fx3kbqcsrqb80kb29yk98lvljiflnq5bkmb4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -97922,6 +97924,19 @@ self: { broken = true; }) {}; + "generic-enumeration" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "generic-enumeration"; + version = "0.1.0.0"; + sha256 = "1wwhbn3hpanr5ya1dc8spaf1r38sc1hglpz3d6mqizlna0p9a68l"; + libraryHaskellDepends = [ base ]; + description = "Generically derived enumerations"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "generic-env" = callPackage ({ mkDerivation, base, containers, text }: mkDerivation { @@ -99254,7 +99269,7 @@ self: { }) {}; "geos" = callPackage - ({ mkDerivation, base, bytestring, cassava, geos_c, hspec, mtl + ({ mkDerivation, base, bytestring, cassava, geos, hspec, mtl , transformers, vector }: mkDerivation { @@ -99264,16 +99279,16 @@ self: { libraryHaskellDepends = [ base bytestring mtl transformers vector ]; - librarySystemDepends = [ geos_c ]; + librarySystemDepends = [ geos ]; testHaskellDepends = [ base bytestring cassava hspec mtl transformers vector ]; - testSystemDepends = [ geos_c ]; + testSystemDepends = [ geos ]; description = "Bindings for GEOS"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; broken = true; - }) {geos_c = null;}; + }) {inherit (pkgs) geos;}; "getemx" = callPackage ({ mkDerivation, base, curl, directory, filepath, haskell98, hxt @@ -99712,8 +99727,8 @@ self: { }: mkDerivation { pname = "ghc-events"; - version = "0.14.0"; - sha256 = "1k7ky564x8s596axh0x006y4avr4dcb1h6nsvh8pbzj1ffi68sk1"; + version = "0.15.1"; + sha256 = "16kh64z60353m6bj9lmv9yzlvydgmi66hm8gc4b22bs69xyh2pxz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -99725,26 +99740,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "ghc-events_0_15_0" = callPackage - ({ mkDerivation, array, base, binary, bytestring, containers, text - , vector - }: - mkDerivation { - pname = "ghc-events"; - version = "0.15.0"; - sha256 = "058ha55661qcxwd5zgmh6vwkdaj7l50h7xri9l1zg26gx69w3bhw"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - array base binary bytestring containers text vector - ]; - executableHaskellDepends = [ base containers ]; - testHaskellDepends = [ base ]; - description = "Library and tool for parsing .eventlog files from GHC"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "ghc-events-analyze" = callPackage ({ mkDerivation, base, blaze-svg, bytestring, containers , diagrams-lib, diagrams-svg, filepath, ghc-events, hashable, lens @@ -99951,25 +99946,6 @@ self: { }) {}; "ghc-lib" = callPackage - ({ mkDerivation, alex, array, base, binary, bytestring, containers - , deepseq, directory, filepath, ghc-lib-parser, ghc-prim, happy - , hpc, pretty, process, time, transformers, unix - }: - mkDerivation { - pname = "ghc-lib"; - version = "8.10.2.20200916"; - sha256 = "0yarxqbl7njqhfycrdz4lr6m04wqhrlsgb9vcq6gbmlizswwxr6g"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - array base binary bytestring containers deepseq directory filepath - ghc-lib-parser ghc-prim hpc pretty process time transformers unix - ]; - libraryToolDepends = [ alex happy ]; - description = "The GHC API, decoupled from GHC versions"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "ghc-lib_8_10_3_20201220" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers , deepseq, directory, filepath, ghc-lib-parser, ghc-prim, happy , hpc, pretty, process, time, transformers, unix @@ -99986,29 +99962,9 @@ self: { libraryToolDepends = [ alex happy ]; description = "The GHC API, decoupled from GHC versions"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghc-lib-parser" = callPackage - ({ mkDerivation, alex, array, base, binary, bytestring, containers - , deepseq, directory, filepath, ghc-prim, happy, hpc, pretty - , process, time, transformers, unix - }: - mkDerivation { - pname = "ghc-lib-parser"; - version = "8.10.2.20200916"; - sha256 = "0azfy14w268by4ydaarjdw7awbd44pgqg03zykzfg7iabyzr2dfk"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - array base binary bytestring containers deepseq directory filepath - ghc-prim hpc pretty process time transformers unix - ]; - libraryToolDepends = [ alex happy ]; - description = "The GHC API, decoupled from GHC versions"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "ghc-lib-parser_8_10_3_20201220" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers , deepseq, directory, filepath, ghc-prim, happy, hpc, pretty , process, time, transformers, unix @@ -100025,30 +99981,9 @@ self: { libraryToolDepends = [ alex happy ]; description = "The GHC API, decoupled from GHC versions"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghc-lib-parser-ex" = callPackage - ({ mkDerivation, base, bytestring, containers, directory, extra - , filepath, ghc, ghc-boot, ghc-boot-th, tasty, tasty-hunit - , uniplate - }: - mkDerivation { - pname = "ghc-lib-parser-ex"; - version = "8.10.0.16"; - sha256 = "1kqff62ml38hxwfnfq7ni0z65b3d3l7xqa5c5lxf3kzm9h7bdwb8"; - libraryHaskellDepends = [ - base bytestring containers ghc ghc-boot ghc-boot-th uniplate - ]; - testHaskellDepends = [ - base directory extra filepath ghc ghc-boot ghc-boot-th tasty - tasty-hunit - ]; - description = "Algorithms on GHC parse trees"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "ghc-lib-parser-ex_8_10_0_17" = callPackage ({ mkDerivation, base, bytestring, containers, directory, extra , filepath, ghc, ghc-boot, ghc-boot-th, tasty, tasty-hunit , uniplate @@ -100066,7 +100001,6 @@ self: { ]; description = "Algorithms on GHC parse trees"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghc-make" = callPackage @@ -100572,8 +100506,8 @@ self: { ({ mkDerivation, base, ghc }: mkDerivation { pname = "ghc-tcplugins-extra"; - version = "0.4"; - sha256 = "0z85ma3r7k4g669br3sdsmnxnk8srh1xi0wggi1gzqrrwpylyv8w"; + version = "0.4.1"; + sha256 = "0v9y444gydfyk56y7adpabd633yv1d8jmddvgg272n8jpdpagw67"; libraryHaskellDepends = [ base ghc ]; description = "Utilities for writing GHC type-checker plugins"; license = stdenv.lib.licenses.bsd2; @@ -100631,8 +100565,8 @@ self: { }: mkDerivation { pname = "ghc-typelits-extra"; - version = "0.4.1"; - sha256 = "0wfv0cympdrz999qml8j1cqrqppb22xm4gcn4k8i2hd31j748zb6"; + version = "0.4.2"; + sha256 = "0xpy52rib25iz5h89nqlj27isjk57pjbhlvlfam5q0g3x92572h4"; libraryHaskellDepends = [ base containers ghc ghc-prim ghc-tcplugins-extra ghc-typelits-knownnat ghc-typelits-natnormalise integer-gmp @@ -100653,8 +100587,8 @@ self: { }: mkDerivation { pname = "ghc-typelits-knownnat"; - version = "0.7.3"; - sha256 = "1vz2qjgdv5hv7zrq0hm9f4ly0q3bl1cz2spcqrdpdzhivfff651g"; + version = "0.7.4"; + sha256 = "1i3kwq8i3p4i2jmmq8irycs0z3g69qy4i5smh14kbcz3pl35x71l"; libraryHaskellDepends = [ base ghc ghc-prim ghc-tcplugins-extra ghc-typelits-natnormalise template-haskell transformers @@ -100668,16 +100602,14 @@ self: { "ghc-typelits-natnormalise" = callPackage ({ mkDerivation, base, containers, ghc, ghc-tcplugins-extra - , integer-gmp, syb, tasty, tasty-hunit, template-haskell - , transformers + , integer-gmp, tasty, tasty-hunit, template-haskell, transformers }: mkDerivation { pname = "ghc-typelits-natnormalise"; - version = "0.7.2"; - sha256 = "1hk2f2vqkpia7kv7pqwf942y1w9m7mvmikzabkrjp8f8gijcsk52"; + version = "0.7.3"; + sha256 = "14lynjsmiml19wma9fk2bbhfz43wzbbyvrxp8xpch2lkh5zkfkny"; libraryHaskellDepends = [ - base containers ghc ghc-tcplugins-extra integer-gmp syb - transformers + base containers ghc ghc-tcplugins-extra integer-gmp transformers ]; testHaskellDepends = [ base tasty tasty-hunit template-haskell ]; description = "GHC typechecker plugin for types of kind GHC.TypeLits.Nat"; @@ -100946,14 +100878,14 @@ self: { "ghcide" = callPackage ({ mkDerivation, aeson, array, async, base, base16-bytestring - , binary, bytestring, containers, cryptohash-sha1, data-default - , deepseq, directory, extra, filepath, fingertree, fuzzy, ghc - , ghc-boot, ghc-boot-th, ghc-check, ghc-paths + , binary, bytestring, case-insensitive, containers, cryptohash-sha1 + , data-default, deepseq, directory, extra, filepath, fingertree + , fuzzy, ghc, ghc-boot, ghc-boot-th, ghc-check, ghc-paths , ghc-typelits-knownnat, gitrev, Glob, haddock-library, hashable , haskell-lsp, haskell-lsp-types, heapsize, hie-bios, hie-compat - , hslogger, implicit-hie-cradle, lens, lsp-test, mtl, network-uri - , opentelemetry, optparse-applicative, parallel, prettyprinter - , prettyprinter-ansi-terminal, process, QuickCheck + , hls-plugin-api, hslogger, implicit-hie-cradle, lens, lsp-test + , mtl, network-uri, opentelemetry, optparse-applicative, parallel + , prettyprinter, prettyprinter-ansi-terminal, process, QuickCheck , quickcheck-instances, record-dot-preprocessor, record-hasfield , regex-tdfa, rope-utf16-splay, safe, safe-exceptions, shake , shake-bench, sorted-list, stm, syb, tasty, tasty-expected-failure @@ -100962,33 +100894,34 @@ self: { }: mkDerivation { pname = "ghcide"; - version = "0.6.0.1"; - sha256 = "06025p7ggqvirdhm4z9pydcc4av0bk2jkqlmdwlabf4f973vcsgq"; + version = "0.7.0.0"; + sha256 = "165dbwbcpl2r7jqsjk859c42yas8h877mx37d0jnx8vm47fdy484"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson array async base base16-bytestring binary bytestring - containers cryptohash-sha1 data-default deepseq directory extra - filepath fingertree fuzzy ghc ghc-boot ghc-boot-th ghc-check - ghc-paths Glob haddock-library hashable haskell-lsp - haskell-lsp-types heapsize hie-bios hie-compat hslogger - implicit-hie-cradle mtl network-uri opentelemetry parallel - prettyprinter prettyprinter-ansi-terminal regex-tdfa + case-insensitive containers cryptohash-sha1 data-default deepseq + directory extra filepath fingertree fuzzy ghc ghc-boot ghc-boot-th + ghc-check ghc-paths Glob haddock-library hashable haskell-lsp + haskell-lsp-types heapsize hie-bios hie-compat hls-plugin-api + hslogger implicit-hie-cradle lens mtl network-uri opentelemetry + parallel prettyprinter prettyprinter-ansi-terminal regex-tdfa rope-utf16-splay safe safe-exceptions shake sorted-list stm syb text time transformers unix unordered-containers utf8-string ]; executableHaskellDepends = [ aeson base bytestring containers data-default directory extra filepath gitrev hashable haskell-lsp haskell-lsp-types heapsize - hie-bios lens lsp-test optparse-applicative process safe-exceptions - shake text unordered-containers + hie-bios hls-plugin-api lens lsp-test optparse-applicative process + safe-exceptions shake text unordered-containers ]; testHaskellDepends = [ - aeson base binary bytestring containers directory extra filepath - ghc ghc-typelits-knownnat haddock-library haskell-lsp - haskell-lsp-types lens lsp-test network-uri optparse-applicative - process QuickCheck quickcheck-instances record-dot-preprocessor - record-hasfield rope-utf16-splay safe safe-exceptions shake tasty + aeson base binary bytestring containers data-default directory + extra filepath ghc ghc-typelits-knownnat haddock-library + haskell-lsp haskell-lsp-types hls-plugin-api lens lsp-test + network-uri optparse-applicative process QuickCheck + quickcheck-instances record-dot-preprocessor record-hasfield + rope-utf16-splay safe safe-exceptions shake tasty tasty-expected-failure tasty-hunit tasty-quickcheck tasty-rerun text ]; @@ -102249,7 +102182,7 @@ self: { "gi-poppler" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo , gi-gio, gi-glib, gi-gobject, haskell-gi, haskell-gi-base - , haskell-gi-overloading, poppler, text, transformers + , haskell-gi-overloading, poppler_gi, text, transformers }: mkDerivation { pname = "gi-poppler"; @@ -102262,12 +102195,12 @@ self: { base bytestring containers gi-cairo gi-gio gi-glib gi-gobject haskell-gi haskell-gi-base haskell-gi-overloading text transformers ]; - libraryPkgconfigDepends = [ poppler ]; + libraryPkgconfigDepends = [ poppler_gi ]; description = "Poppler bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; broken = true; - }) {inherit (pkgs) poppler;}; + }) {inherit (pkgs) poppler_gi;}; "gi-secret" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio @@ -102720,8 +102653,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "8.20201127"; - sha256 = "0n9m5ffgbzms0nh9dskrc7vjgwwwi9f9gxyh498wnspf96729zz7"; + version = "8.20201129"; + sha256 = "10fxl5215x0hqhmwd387xpzgvz4w190lylwr0rihxhy5mwdvf943"; configureFlags = [ "-fassistant" "-f-benchmark" "-fdbus" "-f-debuglocks" "-fmagicmime" "-fnetworkbsd" "-fpairing" "-fproduction" "-fs3" "-ftorrentparser" @@ -103601,25 +103534,6 @@ self: { }) {}; "gitlab-haskell" = callPackage - ({ mkDerivation, aeson, base, bytestring, connection, http-conduit - , http-types, tasty, tasty-hunit, text, time, transformers - , unliftio, unliftio-core - }: - mkDerivation { - pname = "gitlab-haskell"; - version = "0.2.3"; - sha256 = "0nsb7rkqflss6bhdvbjbgg2akwavz777icfkpfy97ix9ahq0i1r8"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - aeson base bytestring connection http-conduit http-types text time - transformers unliftio unliftio-core - ]; - testHaskellDepends = [ aeson base bytestring tasty tasty-hunit ]; - description = "A Haskell library for the GitLab web API"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "gitlab-haskell_0_2_4" = callPackage ({ mkDerivation, aeson, base, bytestring, connection, http-conduit , http-types, tasty, tasty-hunit, temporary, text, time , transformers, unix, unliftio, unliftio-core @@ -103636,7 +103550,6 @@ self: { testHaskellDepends = [ aeson base bytestring tasty tasty-hunit ]; description = "A Haskell library for the GitLab web API"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gitlib" = callPackage @@ -109544,8 +109457,8 @@ self: { }: mkDerivation { pname = "greskell"; - version = "1.1.0.3"; - sha256 = "1q3m4m994vmfk80szphfd74vzfq6zp678bdla6v4siwqjskagyn3"; + version = "1.2.0.0"; + sha256 = "0rljpnq690jxqlkbp7ksx5i91r2hrmqvppp5s6sgp373sw9kzkwb"; libraryHaskellDepends = [ aeson base exceptions greskell-core hashable semigroups text transformers unordered-containers vector @@ -109586,8 +109499,8 @@ self: { }: mkDerivation { pname = "greskell-websocket"; - version = "0.1.2.4"; - sha256 = "1w5867pdb07jlms3gddx8n3ds94qp4yq1yxcy880vcww2gyb4jda"; + version = "0.1.2.5"; + sha256 = "0ybrfr4jj2bm8bdi1yr1j1nvfws64yi54gji4mrw46vrpqnsbbn0"; libraryHaskellDepends = [ aeson async base base64-bytestring bytestring greskell-core hashtables safe-exceptions stm text unordered-containers uuid @@ -112217,6 +112130,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hackage-api" = callPackage + ({ mkDerivation, aeson, base, bytestring, Cabal, http-client + , http-client-tls, http-media, servant, servant-client + , servant-client-core, text, time + }: + mkDerivation { + pname = "hackage-api"; + version = "0.1.0"; + sha256 = "1hqla8h5jq5b149gz6kql0mdnv4hw0535wwsh7cj4sx9j6yyri9y"; + libraryHaskellDepends = [ + aeson base bytestring Cabal http-client http-client-tls http-media + servant servant-client servant-client-core text time + ]; + testHaskellDepends = [ base http-client-tls servant-client ]; + description = "An API binding to Hackage API"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "hackage-db" = callPackage ({ mkDerivation, aeson, base, bytestring, Cabal, containers , directory, exceptions, filepath, tar, time, utf8-string @@ -113880,8 +113813,10 @@ self: { }: mkDerivation { pname = "hal"; - version = "0.4.4"; - sha256 = "0nqxlvbk8lb9c6hh15gn8nd9h2p0rcrllkqjli0ixqil3qpynl76"; + version = "0.4.5"; + sha256 = "01qs6bw9fg86vs122nyamfq29g9l3hr8m1bmrmsn0iinrhzisasp"; + revision = "1"; + editedCabalFile = "1i2fqq0bwmsibfyk7v5nd2myb0sxlkv3xy93ypsfdx6nrsnbb4vq"; libraryHaskellDepends = [ aeson base bytestring conduit conduit-extra containers envy exceptions http-client http-conduit http-types mtl text time @@ -113923,14 +113858,18 @@ self: { }) {}; "half" = callPackage - ({ mkDerivation, base, deepseq, hspec, QuickCheck, template-haskell + ({ mkDerivation, base, binary, bytestring, deepseq, QuickCheck + , template-haskell, test-framework, test-framework-quickcheck2 }: mkDerivation { pname = "half"; - version = "0.3"; - sha256 = "14r0nx8hm5fic9gz0ybjjw4kyc758zfgvhhwvzsshpx5caq6zch6"; - libraryHaskellDepends = [ base deepseq template-haskell ]; - testHaskellDepends = [ base hspec QuickCheck ]; + version = "0.3.1"; + sha256 = "1l8m2spqg0ac50qys2jk5b32v6wxklbbk5ypjp3ga6z14hkw7bz2"; + libraryHaskellDepends = [ base binary deepseq template-haskell ]; + testHaskellDepends = [ + base binary bytestring QuickCheck test-framework + test-framework-quickcheck2 + ]; description = "Half-precision floating-point"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -115835,8 +115774,8 @@ self: { }: mkDerivation { pname = "hasbolt-extras"; - version = "0.0.1.5"; - sha256 = "0cd686g2v0fvyfhvvsjh0fdz8m5wks7bqncfn008vnccykdq3dfx"; + version = "0.0.1.6"; + sha256 = "0il6752lvq0li29aipc66syc7kd9h57439akshlpqpd25b536zd9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -116620,15 +116559,15 @@ self: { broken = true; }) {}; - "haskeline_0_8_1_0" = callPackage + "haskeline_0_8_1_1" = callPackage ({ mkDerivation, base, bytestring, containers, directory , exceptions, filepath, HUnit, process, stm, terminfo, text , transformers, unix }: mkDerivation { pname = "haskeline"; - version = "0.8.1.0"; - sha256 = "0r6skxr45k0qq5vlh9dyl5g5ham994b8z0k3z3v56bi3npvyi6xw"; + version = "0.8.1.1"; + sha256 = "1cg51rbhpa7ism0rg39dw7njz4r3q5h5pnysnbc37dh6gcdiyg2p"; configureFlags = [ "-fterminfo" ]; isLibrary = true; isExecutable = true; @@ -119436,6 +119375,8 @@ self: { pname = "haskoin"; version = "0.1.0.2"; sha256 = "0l3h2wvi56k0dcfjambqyjrd45hb7bj0brp8nzrrcfn7fbpyjg8c"; + revision = "1"; + editedCabalFile = "0m1yd6l1amjrwdddrp5ddnazfzgjb6rndmw32pbpn5zim0r9i4rq"; libraryHaskellDepends = [ aeson base binary byteable bytestring containers cryptohash deepseq either json-rpc mtl pbkdf split text @@ -119569,6 +119510,8 @@ self: { pname = "haskoin-protocol"; version = "0.0.1.1"; sha256 = "0r15csyylg5vd95z0spl5wkv6r8w7lpi983alsvlnkhv4dqnrg2v"; + revision = "1"; + editedCabalFile = "1smwy6g0fdwn04a9w5r7x0vhkylfmgrghlrnz93xxknv015a9f1z"; libraryHaskellDepends = [ base binary bytestring haskoin-crypto haskoin-util QuickCheck ]; @@ -119591,6 +119534,8 @@ self: { pname = "haskoin-script"; version = "0.0.1"; sha256 = "18lw5hxwvj4ichw1k4a35hjih7h0hd24khvl4m0yf2cq12m2gl11"; + revision = "1"; + editedCabalFile = "1438w0wijmifgcdzs5xg146f1vcm23iab9r07f19w3n21gcbvf94"; libraryHaskellDepends = [ base binary bytestring haskoin-crypto haskoin-protocol haskoin-util mtl QuickCheck @@ -119689,6 +119634,8 @@ self: { pname = "haskoin-util"; version = "0.0.1.1"; sha256 = "0hh3vavqsp8pafw4nrv9py1kqcc1yx52zr80xsqzqjlsxq04fgfw"; + revision = "1"; + editedCabalFile = "1vfs64gbrbzi513sqalvpp4s0aff40d6gall301ipwpqfjz4jzzj"; libraryHaskellDepends = [ base binary bytestring either mtl QuickCheck ]; @@ -120920,6 +120867,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hasql-url" = callPackage + ({ mkDerivation, base, bytestring, hasql, network-uri, split, tasty + , tasty-quickcheck + }: + mkDerivation { + pname = "hasql-url"; + version = "0.1.0.0"; + sha256 = "12zsw4jag27g0bgxm9sp45bs2i7p5h42zs5avj01zlddpyhla0wx"; + libraryHaskellDepends = [ + base bytestring hasql network-uri split + ]; + testHaskellDepends = [ base hasql tasty tasty-quickcheck ]; + description = "Parse PostgreSQL connection URI into Hasql.Connection Settings"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "hasqly-mysql" = callPackage ({ mkDerivation, base, binary, bytestring, dlist, mtl , mysql-haskell, scientific, text, time @@ -122141,6 +122106,8 @@ self: { ]; description = "Haskell name counts"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hcron" = callPackage @@ -123090,34 +123057,6 @@ self: { }) {}; "hedgehog" = callPackage - ({ mkDerivation, ansi-terminal, async, base, bytestring - , concurrent-output, containers, deepseq, directory, erf - , exceptions, fail, lifted-async, mmorph, monad-control, mtl - , pretty-show, primitive, random, resourcet, semigroups, stm - , template-haskell, text, time, transformers, transformers-base - , wl-pprint-annotated - }: - mkDerivation { - pname = "hedgehog"; - version = "1.0.3"; - sha256 = "10lv574491zldqzin433z0vqkq43f0v3shjf78j395y0g1jyky9m"; - revision = "1"; - editedCabalFile = "0v0wgij1sz7smmh7j74g8jdi6gvjdv90f20jci7qskx38mhn5n0j"; - libraryHaskellDepends = [ - ansi-terminal async base bytestring concurrent-output containers - deepseq directory erf exceptions fail lifted-async mmorph - monad-control mtl pretty-show primitive random resourcet semigroups - stm template-haskell text time transformers transformers-base - wl-pprint-annotated - ]; - testHaskellDepends = [ - base containers mmorph mtl pretty-show semigroups text transformers - ]; - description = "Release with confidence"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hedgehog_1_0_4" = callPackage ({ mkDerivation, ansi-terminal, async, base, bytestring , concurrent-output, containers, deepseq, directory, erf , exceptions, lifted-async, mmorph, monad-control, mtl, pretty-show @@ -123139,7 +123078,6 @@ self: { ]; description = "Release with confidence"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hedgehog-checkers" = callPackage @@ -123213,6 +123151,8 @@ self: { testHaskellDepends = [ base containers fakedata hedgehog ]; description = "Use 'fakedata' with 'hedgehog'"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hedgehog-fn" = callPackage @@ -123341,19 +123281,19 @@ self: { "hedis" = callPackage ({ mkDerivation, async, base, bytestring, bytestring-lexing - , deepseq, doctest, errors, exceptions, HTTP, HUnit, mtl, network - , network-uri, resource-pool, scanner, stm, test-framework - , test-framework-hunit, text, time, tls, unordered-containers - , vector + , containers, deepseq, doctest, errors, exceptions, HTTP, HUnit + , mtl, network, network-uri, resource-pool, scanner, stm + , test-framework, test-framework-hunit, text, time, tls + , unordered-containers, vector }: mkDerivation { pname = "hedis"; - version = "0.13.1"; - sha256 = "1x1hm0cw0ccx3zcwirs5m3fkbvqc2mcyn5pvsx5fczzpnwzj4d2g"; + version = "0.14.0"; + sha256 = "114k87mi7manyqa90vjjjlfbdwpg3g3dxiwc16v2zyrw56n28mfv"; libraryHaskellDepends = [ - async base bytestring bytestring-lexing deepseq errors exceptions - HTTP mtl network network-uri resource-pool scanner stm text time - tls unordered-containers vector + async base bytestring bytestring-lexing containers deepseq errors + exceptions HTTP mtl network network-uri resource-pool scanner stm + text time tls unordered-containers vector ]; testHaskellDepends = [ async base bytestring doctest HUnit mtl stm test-framework @@ -123537,15 +123477,15 @@ self: { }) {}; "heidi" = callPackage - ({ mkDerivation, base, boxes, containers, criterion, doctest - , exceptions, generic-trie, generics-sop, hashable, microlens - , microlens-th, scientific, tasty, tasty-hspec, text - , unordered-containers, vector, weigh + ({ mkDerivation, base, boxes, containers, criterion, exceptions + , generic-trie, generics-sop, hashable, microlens, microlens-th + , scientific, tasty, tasty-hspec, text, unordered-containers + , vector, weigh }: mkDerivation { pname = "heidi"; - version = "0.0.0"; - sha256 = "1cli324lyn107037mc9yg161arqkd7jbqvhgfihimpyik150az0g"; + version = "0.1.0"; + sha256 = "1l4am8pqk3xrmjmjv48jia60d2vydpj2wy0iyxqiidnc7b8p5j8m"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -123555,7 +123495,7 @@ self: { executableHaskellDepends = [ base exceptions hashable text unordered-containers ]; - testHaskellDepends = [ base doctest tasty tasty-hspec ]; + testHaskellDepends = [ base tasty tasty-hspec ]; benchmarkHaskellDepends = [ base criterion weigh ]; description = "Tidy data in Haskell"; license = stdenv.lib.licenses.mit; @@ -125026,6 +124966,8 @@ self: { ]; description = "Streaming-friendly XML parsers"; license = stdenv.lib.licenses.cc0; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "heyefi" = callPackage @@ -125509,20 +125451,20 @@ self: { }) {}; "hgeos" = callPackage - ({ mkDerivation, base, geos_c, MissingH }: + ({ mkDerivation, base, geos, MissingH }: mkDerivation { pname = "hgeos"; version = "0.1.8.0"; sha256 = "14fqqabxnfky6x17508xr92dvd3jk6b53zqmy8h7f1dd4r7pm4z7"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base ]; - librarySystemDepends = [ geos_c ]; + librarySystemDepends = [ geos ]; testHaskellDepends = [ base MissingH ]; description = "Simple Haskell bindings to GEOS C API"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; broken = true; - }) {geos_c = null;}; + }) {inherit (pkgs) geos;}; "hgettext" = callPackage ({ mkDerivation, base, Cabal, containers, deepseq, directory @@ -125961,38 +125903,6 @@ self: { }) {}; "hie-bios" = callPackage - ({ mkDerivation, aeson, base, base16-bytestring, bytestring - , conduit, conduit-extra, containers, cryptohash-sha1, deepseq - , directory, extra, file-embed, filepath, ghc, hslogger - , hspec-expectations, process, tasty, tasty-expected-failure - , tasty-hunit, temporary, text, time, transformers, unix-compat - , unordered-containers, vector, yaml - }: - mkDerivation { - pname = "hie-bios"; - version = "0.7.1"; - sha256 = "00gkr4dbbs70vnd6y90iirss88j8ax714l9jmwdfkmslwd4m2ml8"; - revision = "3"; - editedCabalFile = "104cp386qbk6k72s2ld1cl0fny3f53x98zy3w10mlhqyaipqrf17"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base base16-bytestring bytestring conduit conduit-extra - containers cryptohash-sha1 deepseq directory extra file-embed - filepath ghc hslogger process temporary text time transformers - unix-compat unordered-containers vector yaml - ]; - executableHaskellDepends = [ base directory filepath ghc ]; - testHaskellDepends = [ - base directory extra filepath ghc hspec-expectations tasty - tasty-expected-failure tasty-hunit temporary text - unordered-containers yaml - ]; - description = "Set up a GHC API session"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hie-bios_0_7_2" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, bytestring , conduit, conduit-extra, containers, cryptohash-sha1, deepseq , directory, extra, file-embed, filepath, ghc, hslogger @@ -126020,7 +125930,6 @@ self: { ]; description = "Set up a GHC API session"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hie-compat" = callPackage @@ -126077,6 +125986,33 @@ self: { broken = true; }) {}; + "hiedb" = callPackage + ({ mkDerivation, algebraic-graphs, array, base, bytestring + , containers, directory, filepath, ghc, ghc-paths, hie-compat + , hspec, lucid, mtl, optparse-applicative, process, sqlite-simple + , terminal-size, text, time + }: + mkDerivation { + pname = "hiedb"; + version = "0.1.0.0"; + sha256 = "0bzhg7dambm97qk3r9p2k0kd4qbllghfxiannjiqnwmar7c4zaxw"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + algebraic-graphs array base bytestring containers directory + filepath ghc hie-compat lucid mtl optparse-applicative + sqlite-simple terminal-size text time + ]; + executableHaskellDepends = [ base ghc-paths ]; + testHaskellDepends = [ + base directory filepath ghc ghc-paths hspec process + ]; + description = "Generates a references DB from .hie files"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "hieraclus" = callPackage ({ mkDerivation, base, containers, HUnit, mtl, multiset }: mkDerivation { @@ -126735,6 +126671,8 @@ self: { ]; description = "Generic project initialization tool"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hinotify_0_3_9" = callPackage @@ -127749,29 +127687,29 @@ self: { ({ mkDerivation, aeson, ansi-terminal, base, base-compat-batteries , bytestring, cmdargs, containers, data-default, Decimal, Diff , directory, extra, filepath, hashable, haskeline, hledger-lib - , lucid, math-functions, megaparsec, mtl, old-time, parsec, process + , lucid, math-functions, megaparsec, mtl, old-time, process , regex-tdfa, safe, shakespeare, split, tabular, tasty, temporary , terminfo, text, time, timeit, transformers, unordered-containers , utf8-string, utility-ht, wizards }: mkDerivation { pname = "hledger"; - version = "1.20.1"; - sha256 = "19f1p5fify3vy1aaknvfhykfl1cl4ibgilyvj3nf2127rwirb7kr"; + version = "1.20.2"; + sha256 = "1mk7d6ajwh5i9c8klgzk9j06yc8l24gi2nf6blyan14d9s7l85br"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson ansi-terminal base base-compat-batteries bytestring cmdargs containers data-default Decimal Diff directory extra filepath hashable haskeline hledger-lib lucid math-functions megaparsec mtl - old-time parsec process regex-tdfa safe shakespeare split tabular - tasty temporary terminfo text time timeit transformers + old-time process regex-tdfa safe shakespeare split tabular tasty + temporary terminfo text time timeit transformers unordered-containers utf8-string utility-ht wizards ]; executableHaskellDepends = [ aeson ansi-terminal base base-compat-batteries bytestring cmdargs containers data-default Decimal directory extra filepath haskeline - hledger-lib math-functions megaparsec mtl old-time parsec process + hledger-lib math-functions megaparsec mtl old-time process regex-tdfa safe shakespeare split tabular tasty temporary terminfo text time timeit transformers unordered-containers utf8-string utility-ht wizards @@ -127779,7 +127717,7 @@ self: { testHaskellDepends = [ aeson ansi-terminal base base-compat-batteries bytestring cmdargs containers data-default Decimal directory extra filepath haskeline - hledger-lib math-functions megaparsec mtl old-time parsec process + hledger-lib math-functions megaparsec mtl old-time process regex-tdfa safe shakespeare split tabular tasty temporary terminfo text time timeit transformers unordered-containers utf8-string utility-ht wizards @@ -127950,29 +127888,29 @@ self: { , base-compat-batteries, blaze-markup, bytestring, call-stack , cassava, cassava-megaparsec, cmdargs, containers, data-default , Decimal, directory, doctest, extra, file-embed, filepath, Glob - , hashtables, megaparsec, mtl, old-time, parsec, parser-combinators + , hashtables, megaparsec, mtl, old-time, parser-combinators , pretty-simple, regex-tdfa, safe, split, tabular, tasty , tasty-hunit, template-haskell, text, time, timeit, transformers , uglymemo, unordered-containers, utf8-string }: mkDerivation { pname = "hledger-lib"; - version = "1.20.1"; - sha256 = "1kh65sci79aa6yc4vqb6mq4i1gj41hrnc5blwzn5gxh4nzhw6jy1"; + version = "1.20.2"; + sha256 = "10iz6jjkighsj00shw8hj22p14zp4dd9r7l4hmpbwql1hfz53g1b"; libraryHaskellDepends = [ aeson aeson-pretty ansi-terminal array base base-compat-batteries blaze-markup bytestring call-stack cassava cassava-megaparsec cmdargs containers data-default Decimal directory extra file-embed - filepath Glob hashtables megaparsec mtl old-time parsec - parser-combinators pretty-simple regex-tdfa safe split tabular - tasty tasty-hunit template-haskell text time timeit transformers - uglymemo unordered-containers utf8-string + filepath Glob hashtables megaparsec mtl old-time parser-combinators + pretty-simple regex-tdfa safe split tabular tasty tasty-hunit + template-haskell text time timeit transformers uglymemo + unordered-containers utf8-string ]; testHaskellDepends = [ aeson aeson-pretty ansi-terminal array base base-compat-batteries blaze-markup bytestring call-stack cassava cassava-megaparsec cmdargs containers data-default Decimal directory doctest extra - file-embed filepath Glob hashtables megaparsec mtl old-time parsec + file-embed filepath Glob hashtables megaparsec mtl old-time parser-combinators pretty-simple regex-tdfa safe split tabular tasty tasty-hunit template-haskell text time timeit transformers uglymemo unordered-containers utf8-string @@ -128034,8 +127972,8 @@ self: { }: mkDerivation { pname = "hledger-ui"; - version = "1.20.1"; - sha256 = "0dx71yzzvizjmvikb4pbd4zg272k7xrhfp1s76v2bmc9gqq0n6yc"; + version = "1.20.2"; + sha256 = "1ns1zjmpbxn3rg5ldplh57h0yfmas6bqa9z6nmk52bw9qf0b05zw"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -128081,8 +128019,8 @@ self: { }: mkDerivation { pname = "hledger-web"; - version = "1.20.1"; - sha256 = "0s4vg3vfcvp4krm5n5hjys0sa5gvf2pvdcmp5l967z18iqi3zj8l"; + version = "1.20.2"; + sha256 = "0898nsd4y4fzk8ri4wxykcyvrb9165mkak392ir1b5nz19nys1xf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -128201,8 +128139,8 @@ self: { }: mkDerivation { pname = "hlint"; - version = "3.2.3"; - sha256 = "1y6drmvcz90cpih446k1kjbyhin652wi9b9x7xjylxxp8jksd8x0"; + version = "3.2.6"; + sha256 = "1i1qqqi6qdfa3py48cns6c41xn6qr8rsfg7rn4i22qr86zp8ikp5"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -128351,17 +128289,17 @@ self: { }) {}; "hls-plugin-api" = callPackage - ({ mkDerivation, aeson, base, containers, data-default, Diff, ghc - , ghc-boot-th, ghcide, hashable, haskell-lsp, hslogger, lens - , process, regex-tdfa, shake, text, unordered-containers + ({ mkDerivation, aeson, base, containers, data-default, Diff + , hashable, haskell-lsp, hslogger, lens, process, regex-tdfa, shake + , text, unix, unordered-containers }: mkDerivation { pname = "hls-plugin-api"; - version = "0.5.0.1"; - sha256 = "0sv892m18ic9m8d5b8wm7385v80rc02fjy0wxvq9mzhgazz20cp2"; + version = "0.6.0.0"; + sha256 = "0dnd20mb0id0l2dz6j3ckfrjyfm3mjys0kf11z3a684i4bc0w1pi"; libraryHaskellDepends = [ - aeson base containers data-default Diff ghc ghc-boot-th ghcide - hashable haskell-lsp hslogger lens process regex-tdfa shake text + aeson base containers data-default Diff hashable haskell-lsp + hslogger lens process regex-tdfa shake text unix unordered-containers ]; description = "Haskell Language Server API for plugin communication"; @@ -128864,8 +128802,8 @@ self: { ({ mkDerivation, base, stm }: mkDerivation { pname = "hmidi"; - version = "0.2.2.1"; - sha256 = "15sf5jxr8nzbmn78bx971jic0ia51s8mrzdik2iqbgznairr30ay"; + version = "0.2.3.1"; + sha256 = "0q2b2hk6s0fnyw67yfrbmiv7m2cwdcz1q86zzcna4ci5gyv0j07d"; libraryHaskellDepends = [ base stm ]; description = "Binding to the OS level MIDI services"; license = stdenv.lib.licenses.bsd3; @@ -129103,9 +129041,9 @@ self: { , bytestring, comonad, containers, criterion, data-fix, deepseq , deriving-compat, Diff, directory, exceptions, filepath, free , gitrev, Glob, hashable, hashing, haskeline, hedgehog - , hnix-store-core, http-client, http-client-tls, http-types - , lens-family, lens-family-core, lens-family-th, logict, megaparsec - , monad-control, monadlist, mtl, neat-interpolation + , hnix-store-core, hnix-store-remote, http-client, http-client-tls + , http-types, lens-family, lens-family-core, lens-family-th, logict + , megaparsec, monad-control, monadlist, mtl, neat-interpolation , optparse-applicative, parser-combinators, pretty-show , prettyprinter, process, ref-tf, regex-tdfa, repline, scientific , semialign, semialign-indexed, serialise, some, split, syb, tasty @@ -129115,21 +129053,22 @@ self: { }: mkDerivation { pname = "hnix"; - version = "0.11.1"; - sha256 = "0rdl1ky8l2zm5arkdq77qrg0xnqfavba0bnr9bd0zhjj3k2gb4v7"; + version = "0.12.0.1"; + sha256 = "013jlmzzr5fcvl0w9rrvhsg8jikg0hbc8z57yzxgz109x7hrnjzc"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson array base base16-bytestring binary bytestring comonad containers data-fix deepseq deriving-compat directory exceptions - filepath free gitrev hashable hashing hnix-store-core http-client - http-client-tls http-types lens-family lens-family-core - lens-family-th logict megaparsec monad-control monadlist mtl - neat-interpolation optparse-applicative parser-combinators - pretty-show prettyprinter process ref-tf regex-tdfa scientific - semialign semialign-indexed serialise some split syb - template-haskell text these time transformers transformers-base - unix unordered-containers vector xml + filepath free gitrev hashable hashing hnix-store-core + hnix-store-remote http-client http-client-tls http-types + lens-family lens-family-core lens-family-th logict megaparsec + monad-control monadlist mtl neat-interpolation optparse-applicative + parser-combinators pretty-show prettyprinter process ref-tf + regex-tdfa scientific semialign semialign-indexed serialise some + split syb template-haskell text these time transformers + transformers-base unix unordered-containers vector xml ]; executableHaskellDepends = [ aeson base base16-bytestring bytestring comonad containers data-fix @@ -129181,7 +129120,7 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; - "hnix-store-core_0_3_0_1" = callPackage + "hnix-store-core_0_4_0_0" = callPackage ({ mkDerivation, algebraic-graphs, attoparsec, base , base16-bytestring, base64-bytestring, binary, bytestring, cereal , containers, cryptohash-md5, cryptohash-sha1, cryptohash-sha256 @@ -129193,8 +129132,8 @@ self: { }: mkDerivation { pname = "hnix-store-core"; - version = "0.3.0.1"; - sha256 = "186r0z8csvj7ly9ag9lpvc6nm4x3hzx18rdc1jxzavaavcpdpn00"; + version = "0.4.0.0"; + sha256 = "05fwh5y82qy4qzi32xgk8dmndd8r074rvfl2nxyg3f3ydqpcmmr2"; libraryHaskellDepends = [ algebraic-graphs attoparsec base base16-bytestring base64-bytestring binary bytestring cereal containers @@ -129221,8 +129160,8 @@ self: { }: mkDerivation { pname = "hnix-store-remote"; - version = "0.3.0.0"; - sha256 = "0spvbix7m70v95fvkcs0vxas8nmwpjh4lfaglyvw1ijkf71xn9gl"; + version = "0.4.0.0"; + sha256 = "0l9gb5b415im1bjrbx6k0ah92763hgm1ns6kxfl5mxwij52kzc32"; libraryHaskellDepends = [ attoparsec base binary bytestring containers filepath hnix-store-core mtl network nix-derivation text time unix @@ -129230,8 +129169,6 @@ self: { ]; description = "Remote hnix store"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "hnn" = callPackage @@ -129507,6 +129444,8 @@ self: { ]; description = "Interact with the docker registry and generate nix build instructions"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hocon" = callPackage @@ -129784,8 +129723,8 @@ self: { }: mkDerivation { pname = "holmes"; - version = "0.3.0.1"; - sha256 = "0b7ifnmg2n3jfb1zgdzy3fylifqq0mxp00r2iwp9wrnf29rdzxp3"; + version = "0.3.2.0"; + sha256 = "1hrgdnlyqz8wjnqihp8gn3rhl1zfyd6p9yv4cjwsv876bgy17ql8"; libraryHaskellDepends = [ base containers hashable hedgehog logict mtl primitive transformers unordered-containers @@ -129798,8 +129737,6 @@ self: { testToolDepends = [ markdown-unlit tasty-discover ]; description = "Tools and combinators for solving constraint problems"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "holy-project" = callPackage @@ -130258,8 +130195,8 @@ self: { }: mkDerivation { pname = "hoogle"; - version = "5.0.18"; - sha256 = "16vbjivwwjn687cidg0v9bkdyk9mkv4gn6fmaxcfj8m94vrqdbdx"; + version = "5.0.18.1"; + sha256 = "15ia0l96yjdnam5vljcsslcavsjwfq0kxldwdcr3zq9c0w6q6i3w"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -130449,8 +130386,8 @@ self: { }: mkDerivation { pname = "hopenpgp-tools"; - version = "0.23.3"; - sha256 = "1h6hg05i7vm0cnhn3sifmmv01hjxy0w030j4m3fig3ic57658q2p"; + version = "0.23.6"; + sha256 = "0hjh6avcd24czd5dv0kr78hkv8k48i3lgcxiahnfjaqwirmg5wix"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -131159,6 +131096,8 @@ self: { ]; description = "hpack's dhalling"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hpaco" = callPackage @@ -132659,6 +132598,20 @@ self: { broken = true; }) {}; + "hs-openmoji-data" = callPackage + ({ mkDerivation, base, containers, emojis, text }: + mkDerivation { + pname = "hs-openmoji-data"; + version = "13.0.0"; + sha256 = "1jgs4iv0zv2dr5izd6d95mflyk4fnagmrdxw70m17jvknl5x1fa5"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base text ]; + executableHaskellDepends = [ base containers emojis text ]; + description = "The OpenMoji emoji dataset"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hs-pattrans" = callPackage ({ mkDerivation, async, base, bytestring, cassava, Chart , Chart-cairo, colour, containers, contravariant, directory @@ -133252,6 +133205,28 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hsautogui" = callPackage + ({ mkDerivation, base, containers, cpython, mtl, python + , template-haskell, text + }: + mkDerivation { + pname = "hsautogui"; + version = "0.2.0"; + sha256 = "0xcacp9r8iw9rqd5yawj5haznkjv6agigg5y4j1s0rhykc1s440n"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers cpython mtl template-haskell text + ]; + librarySystemDepends = [ python ]; + executableHaskellDepends = [ base ]; + executableSystemDepends = [ python ]; + description = "Haskell bindings for PyAutoGUI, a library for automating user interaction"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {inherit (pkgs) python;}; + "hsay" = callPackage ({ mkDerivation, base, Hclip, HTTP, process, unix }: mkDerivation { @@ -135234,8 +135209,8 @@ self: { }: mkDerivation { pname = "hspec"; - version = "2.7.4"; - sha256 = "0zql8cl025ai3yx2dhp1sgvmw8n4ngqbrlmb42hcgv26q8qnvhmi"; + version = "2.7.5"; + sha256 = "0dyd0rb5sh5b72v14qmgwnv2fq76wiz9h8k0027bl8lsl0a77gmv"; libraryHaskellDepends = [ base hspec-core hspec-discover hspec-expectations QuickCheck ]; @@ -135243,6 +135218,22 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hspec_2_7_6" = callPackage + ({ mkDerivation, base, hspec-core, hspec-discover + , hspec-expectations, QuickCheck + }: + mkDerivation { + pname = "hspec"; + version = "2.7.6"; + sha256 = "0ynd111mwm5ykl74nb7ac7mz1b9xvs1hqjdksfm83dy2sj4axwpx"; + libraryHaskellDepends = [ + base hspec-core hspec-discover hspec-expectations QuickCheck + ]; + description = "A Testing Framework for Haskell"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hspec-attoparsec" = callPackage ({ mkDerivation, attoparsec, base, bytestring, hspec , hspec-expectations, text @@ -135306,8 +135297,8 @@ self: { }: mkDerivation { pname = "hspec-core"; - version = "2.7.4"; - sha256 = "1k0rs9399m6bzmndc9ybs26mxrzkl9pifrijvknysbaqfcifmq35"; + version = "2.7.5"; + sha256 = "0pgmy4r47pdya1h5g1mk4idjs7c2b5dqa5xkqgqn2v60bg32n17p"; libraryHaskellDepends = [ ansi-terminal array base call-stack clock deepseq directory filepath hspec-expectations HUnit QuickCheck quickcheck-io random @@ -135325,6 +135316,34 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hspec-core_2_7_6" = callPackage + ({ mkDerivation, ansi-terminal, array, base, call-stack, clock + , deepseq, directory, filepath, hspec-expectations, hspec-meta + , HUnit, process, QuickCheck, quickcheck-io, random, setenv + , silently, stm, temporary, tf-random, transformers + }: + mkDerivation { + pname = "hspec-core"; + version = "2.7.6"; + sha256 = "1j9kpvjf1yz3bl32cklxz8dnykc48ya67lin4r2hvbzcd3kg63rf"; + libraryHaskellDepends = [ + ansi-terminal array base call-stack clock deepseq directory + filepath hspec-expectations HUnit QuickCheck quickcheck-io random + setenv stm tf-random transformers + ]; + testHaskellDepends = [ + ansi-terminal array base call-stack clock deepseq directory + filepath hspec-expectations hspec-meta HUnit process QuickCheck + quickcheck-io random setenv silently stm temporary tf-random + transformers + ]; + testToolDepends = [ hspec-meta ]; + testTarget = "--test-option=--skip --test-option='Test.Hspec.Core.Runner.hspecResult runs specs in parallel'"; + description = "A Testing Framework for Haskell"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hspec-dirstream" = callPackage ({ mkDerivation, base, dirstream, filepath, hspec, hspec-core , pipes, pipes-safe, system-filepath, text @@ -135348,8 +135367,8 @@ self: { }: mkDerivation { pname = "hspec-discover"; - version = "2.7.4"; - sha256 = "02laain23bcnzsl65347qr5knvrmrlhd0kzc0d88kx59lpzm27a0"; + version = "2.7.5"; + sha256 = "1d049y6g15s2rvng8gzbnv0fybfhyxjs3hp200fg8kwzq7vzkvmf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base directory filepath ]; @@ -135362,6 +135381,26 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hspec-discover_2_7_6" = callPackage + ({ mkDerivation, base, directory, filepath, hspec-meta, QuickCheck + }: + mkDerivation { + pname = "hspec-discover"; + version = "2.7.6"; + sha256 = "12n26rxdrpk54fqrgrdj7r8kyq3fla3na10j4pnsjkir72bvhd17"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base directory filepath ]; + executableHaskellDepends = [ base directory filepath ]; + testHaskellDepends = [ + base directory filepath hspec-meta QuickCheck + ]; + testToolDepends = [ hspec-meta ]; + description = "Automatically discover and run Hspec tests"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hspec-expectations" = callPackage ({ mkDerivation, base, call-stack, HUnit, nanospec }: mkDerivation { @@ -136966,6 +137005,8 @@ self: { pname = "htaglib"; version = "1.2.0"; sha256 = "0ph04j1ysjzzrcyllgibzrzfv5g5mgpa6s0ksxww15aryipw65sa"; + revision = "1"; + editedCabalFile = "09vsz2z5sb5ai3qpksqdckb43vndqs66x4abx3lln2xr40dlkljv"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring text transformers ]; librarySystemDepends = [ taglib ]; @@ -137623,23 +137664,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "http-api-data_0_4_2" = callPackage + "http-api-data_0_4_3" = 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 + , http-types, HUnit, QuickCheck, quickcheck-instances, tagged, text + , time-compat, transformers, unordered-containers, uuid-types }: mkDerivation { pname = "http-api-data"; - version = "0.4.2"; - sha256 = "0xzfvxxh33ivlnrnzmm19cni3jgb5ph18n9hykkw3d6l3rhwzcnl"; + version = "0.4.3"; + sha256 = "171bw2a44pg50d3y77gw2y9vmx72laky7hnn5hw6r93pnjmlf9yz"; 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 + base base-compat bytestring cookie hspec HUnit QuickCheck quickcheck-instances text time-compat unordered-containers uuid-types ]; @@ -137954,19 +137995,18 @@ self: { }) {}; "http-client-websockets" = callPackage - ({ mkDerivation, base, bytestring, doctest, hspec, http-client + ({ mkDerivation, base, bytestring, hspec, http-client , http-client-tls, network-uri, utf8-string, websockets }: mkDerivation { pname = "http-client-websockets"; - version = "0.1.1.0"; - sha256 = "1kmvwhfsp1l672km2a06pww0a3wmwbxcwwg1k78xcnc767wj0g1m"; + version = "0.1.1.1"; + sha256 = "0b5kvyrfhhj7c5ys8ccxwv6prhb6sj0ycinzbk1yrwnd3wrmzk78"; libraryHaskellDepends = [ base bytestring http-client network-uri utf8-string websockets ]; testHaskellDepends = [ - base bytestring doctest hspec http-client-tls network-uri - websockets + base bytestring hspec http-client-tls network-uri websockets ]; description = "Glue code for http-client and websockets"; license = stdenv.lib.licenses.cc0; @@ -139202,6 +139242,8 @@ self: { ]; description = "A TUI MPD client, inspired by ncmpcpp"; license = stdenv.lib.licenses.gpl2Plus; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "human-parse" = callPackage @@ -139534,8 +139576,8 @@ self: { }: mkDerivation { pname = "hurl"; - version = "1.5.0.0"; - sha256 = "1fzy2zzwn5x420xz91fj64h6g0vzlam4058pymb2pdmg4x801j42"; + version = "2.0.0.0"; + sha256 = "0rr4v8dbbkasg68zkv6z2p4ib12kazqjrad4s0z7h6l7hy6rqwbz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -139547,6 +139589,8 @@ self: { executableHaskellDepends = [ base directory network-uri ]; description = "Haskell URL resolver"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hurriyet" = callPackage @@ -140377,6 +140421,8 @@ self: { ]; description = "Avro support for Kafka infrastructure"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hw-kafka-client" = callPackage @@ -140386,8 +140432,8 @@ self: { }: mkDerivation { pname = "hw-kafka-client"; - version = "4.0.0"; - sha256 = "0cwiaxri121lh713sisy9mka0h6z2ip82hzqbyzqj1dnljkqry9c"; + version = "4.0.1"; + sha256 = "05ahw4cdp5kk5j4rbjf1bdvivg3nhiaaf68p902mp8jcbh7fz9sf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -142016,6 +142062,8 @@ self: { pname = "hyraxAbif"; version = "0.2.3.27"; sha256 = "1ww4lgf280sjj9bhj8s6pxadqwk91jkx6lngb2cqcf81gr38drhm"; + revision = "1"; + editedCabalFile = "0l8dl3mw4vw8xhq59hin72rc5qh2swbzv41z61bqj2i1088xw0dg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -144320,29 +144368,6 @@ self: { }) {}; "incremental-parser" = callPackage - ({ mkDerivation, base, bytestring, checkers, criterion, deepseq - , input-parsers, monoid-subclasses, parsers, QuickCheck - , rank2classes, tasty, tasty-quickcheck, text, transformers - }: - mkDerivation { - pname = "incremental-parser"; - version = "0.5"; - sha256 = "1r3lmk8y0rg7fb7633ngp68izd2939yv2123vrcmwrvdha99w0g6"; - libraryHaskellDepends = [ - base input-parsers monoid-subclasses parsers rank2classes - transformers - ]; - testHaskellDepends = [ - base checkers monoid-subclasses QuickCheck tasty tasty-quickcheck - ]; - benchmarkHaskellDepends = [ - base bytestring criterion deepseq monoid-subclasses text - ]; - description = "Generic parser library capable of providing partial results from partial input"; - license = stdenv.lib.licenses.gpl3; - }) {}; - - "incremental-parser_0_5_0_1" = callPackage ({ mkDerivation, base, bytestring, checkers, criterion, deepseq , input-parsers, monoid-subclasses, parsers, QuickCheck , rank2classes, tasty, tasty-quickcheck, text, transformers @@ -144363,7 +144388,6 @@ self: { ]; description = "Generic parser library capable of providing partial results from partial input"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "incremental-sat-solver" = callPackage @@ -144627,8 +144651,8 @@ self: { ({ mkDerivation, array, base, containers, transformers }: mkDerivation { pname = "indexed-traversable"; - version = "0.1"; - sha256 = "1pn0i2zn3qrzmj58aa32vr9fjdr7sh8h50v7yab76q8zxwpxnhlz"; + version = "0.1.1"; + sha256 = "0fc18vdm1894yjbjkj9wjm27bf37ac3gvkzak677mgiw2pinmhvs"; libraryHaskellDepends = [ array base containers transformers ]; description = "FunctorWithIndex, FoldableWithIndex, TraversableWithIndex"; license = stdenv.lib.licenses.bsd2; @@ -144729,8 +144753,8 @@ self: { "indigo" = callPackage ({ mkDerivation, base, casing, cleveland, constraints, containers - , directory, fmt, hedgehog, hspec-expectations, HUnit, lorentz - , megaparsec, microlens-th, morley, morley-prelude + , directory, file-embed, fmt, hedgehog, hspec-expectations, HUnit + , lorentz, megaparsec, microlens-th, morley, morley-prelude , optparse-applicative, process, reflection, shelly, singletons , string-interpolate, summoner, tasty, tasty-discover , tasty-hedgehog, tasty-hunit-compat, template-haskell, text, vinyl @@ -144738,8 +144762,8 @@ self: { }: mkDerivation { pname = "indigo"; - version = "0.4"; - sha256 = "1qa6xbzyfl1f1c6kw71b0zi538zxql07kidkmsjz91sy9nrc93ml"; + version = "0.5.0"; + sha256 = "121y842b8ik37lp01k9gqh8g63wcpn32w7br7nw9valjjxmc3dkg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -144748,7 +144772,7 @@ self: { with-utf8 ]; executableHaskellDepends = [ - base directory megaparsec morley morley-prelude + base directory file-embed megaparsec morley morley-prelude optparse-applicative process shelly string-interpolate summoner text with-utf8 ]; @@ -145147,8 +145171,8 @@ self: { }: mkDerivation { pname = "inline-c"; - version = "0.9.1.3"; - sha256 = "1b2dcyg6b15q5n7k9k391y78wblqlvkrwxr8hbnp0y6x8h8l8ma8"; + version = "0.9.1.4"; + sha256 = "021r3ghn3cv1nykkkgyd50gq5cmczam8j37xqfi7vmyx5iwdv0a2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -145713,6 +145737,8 @@ self: { pname = "integer-roots"; version = "1.0"; sha256 = "12570cr39jj5lk30ls5nnc0w6881l0kflzhmwpk35qc7m39pjgy1"; + revision = "1"; + editedCabalFile = "0h130qddg27234mhi5spkwcgcxpnmq07bppwig5vq8z70fh5f1qx"; libraryHaskellDepends = [ base integer-gmp ]; testHaskellDepends = [ base smallcheck tasty tasty-hunit tasty-quickcheck tasty-smallcheck @@ -149562,8 +149588,8 @@ self: { }: mkDerivation { pname = "joint"; - version = "0.1.8"; - sha256 = "174i51nlck81h9pc9jgmd0yj3d6xpvza0i4a8y4f1fpnz1zrqxg5"; + version = "0.1.9"; + sha256 = "053yynpajazfr1f6ff8zw8ygyv01ahmrkcb7110g5a0mz7vwllsd"; libraryHaskellDepends = [ adjunctions base comonad distributive transformers ]; @@ -152141,6 +152167,8 @@ self: { ]; description = "Katip scribe for raven (https://sentry.io)"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "katip-rollbar" = callPackage @@ -153498,6 +153526,8 @@ self: { ]; description = "Kleene algebra"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "kleene-list" = callPackage @@ -155221,6 +155251,8 @@ self: { pname = "lame"; version = "0.2.0"; sha256 = "1bqq3aanfffdsl3v0am7jdfslcr6y372cq7jx36z7g09zy5mp2sp"; + revision = "1"; + editedCabalFile = "1czjga37b56xs6jrylsf5gip5srmlfg2982k96l5w4300sj8ricz"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring directory exceptions filepath text transformers @@ -156567,15 +156599,15 @@ self: { }: mkDerivation { pname = "language-thrift"; - version = "0.11.0.0"; - sha256 = "0gxhpaspb8iyfhl8gxxn9an17blrh5vnkn3y9ywzslxkvj31nds5"; + version = "0.12.0.0"; + sha256 = "1a7v0337zvfc3x6665grzngs9m9ya3jk27h3blcz9p33m8rladhl"; libraryHaskellDepends = [ ansi-wl-pprint base containers megaparsec scientific semigroups text transformers ]; testHaskellDepends = [ - ansi-wl-pprint base containers hspec hspec-discover megaparsec - QuickCheck scientific semigroups text transformers + ansi-wl-pprint base containers hspec megaparsec QuickCheck + scientific semigroups text transformers ]; testToolDepends = [ hspec-discover ]; description = "Parser and pretty printer for the Thrift IDL format"; @@ -157060,6 +157092,8 @@ self: { ]; description = "Fine-grained library for constructing and manipulating lattices"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "launchdarkly-server-sdk" = callPackage @@ -157896,6 +157930,8 @@ self: { benchmarkHaskellDepends = [ base bytestring criterion deepseq ]; description = "LEB128 encoding logic for and in Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "leb128-cereal" = callPackage @@ -159113,8 +159149,8 @@ self: { }: mkDerivation { pname = "libarchive"; - version = "3.0.2.0"; - sha256 = "1v6mx8li7dp1pzp6qzsql3hcapj7l7ia3b3nala0xzw2r7jvmc4l"; + version = "3.0.2.1"; + sha256 = "16h5pw49g9nc4aq7g8hwj1bq1raf1jas09xcsk99sylssvf2yf43"; setupHaskellDepends = [ base Cabal chs-cabal ]; libraryHaskellDepends = [ base bytestring composition-prelude deepseq dlist filepath mtl @@ -159541,21 +159577,21 @@ self: { "libmpd" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers - , data-default-class, filepath, hspec, mtl, network, old-locale - , QuickCheck, safe-exceptions, text, time, unix, utf8-string + , data-default-class, filepath, hspec, mtl, network, QuickCheck + , safe-exceptions, text, time, unix, utf8-string }: mkDerivation { pname = "libmpd"; - version = "0.9.2.0"; - sha256 = "0vjzwdxlldn07v9mkkx5vbh4pmz7s71qjh4c126f968a807zmqrn"; + version = "0.9.3.0"; + sha256 = "08bi0m7kxh2ppkabq5vsx1cwz3i1y4y7w4j0g1hi9q9raml6y0y9"; libraryHaskellDepends = [ attoparsec base bytestring containers data-default-class filepath - mtl network old-locale safe-exceptions text time utf8-string + mtl network safe-exceptions text time utf8-string ]; testHaskellDepends = [ attoparsec base bytestring containers data-default-class filepath - hspec mtl network old-locale QuickCheck safe-exceptions text time - unix utf8-string + hspec mtl network QuickCheck safe-exceptions text time unix + utf8-string ]; description = "An MPD client library"; license = stdenv.lib.licenses.mit; @@ -160640,8 +160676,8 @@ self: { }: mkDerivation { pname = "line-bot-sdk"; - version = "0.5.2"; - sha256 = "1vrfq9v8lv5nwdmy7n99p7dnm10b35ng5n24ncjq54i0ci2ldi75"; + version = "0.6.0"; + sha256 = "13flx2vkm2112agygb4f1924mq79a8i1739mm8lp8v2v32cjngp5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -160656,8 +160692,8 @@ self: { testHaskellDepends = [ aeson aeson-qq base base64-bytestring bytestring cryptohash-sha256 deepseq free hspec hspec-expectations hspec-wai http-client - http-types servant servant-client servant-client-core - servant-server text time transformers wai warp + http-client-tls http-types servant servant-client + servant-client-core servant-server text time transformers wai warp ]; description = "Haskell SDK for LINE Messaging API"; license = stdenv.lib.licenses.bsd3; @@ -160688,6 +160724,8 @@ self: { testHaskellDepends = [ base hspec QuickCheck ]; description = "raster line drawing"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "line-size" = callPackage @@ -162106,8 +162144,8 @@ self: { ({ mkDerivation, base, doctest, mtl }: mkDerivation { pname = "list-transformer"; - version = "1.0.6"; - sha256 = "0gc36nhx3a8rks943fyrnqzp47cp8gg58yijpfqxig086gblmwpl"; + version = "1.0.7"; + sha256 = "1i8zmds67fyglbw1ygcyffly5ykq62p2hcm23vxrxvj3ryq9iih8"; libraryHaskellDepends = [ base mtl ]; testHaskellDepends = [ base doctest ]; description = "List monad transformer"; @@ -163848,6 +163886,8 @@ self: { pname = "logic-TPTP"; version = "0.5.0.0"; sha256 = "0sqzf332c7zdwkdi1346dxljrdammiz1vc332j85487nb0ypnxwi"; + revision = "1"; + editedCabalFile = "108fql6laqwvxvnk7h4jjl9652bhz7ja2z2296svjhhjz5pvar8g"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -164511,8 +164551,8 @@ self: { }: mkDerivation { pname = "lorentz"; - version = "0.8.0"; - sha256 = "1mzpi5vx18vi06bd5jkpixws01in69jqvg6hkzc7mxn75cw8gb34"; + version = "0.9.0"; + sha256 = "195z7kx7jv0118pbashbc441sf69xag5q43jwkdyf53cmvnxqcwq"; libraryHaskellDepends = [ aeson-pretty base bimap bytestring constraints containers data-default first-class-families fmt interpolate lens morley @@ -165289,6 +165329,24 @@ self: { license = "GPL-2.0-or-later AND BSD-3-Clause"; }) {}; + "lukko_0_1_1_3" = callPackage + ({ mkDerivation, async, base, bytestring, filepath, singleton-bool + , tasty, tasty-expected-failure, tasty-hunit, temporary + }: + mkDerivation { + pname = "lukko"; + version = "0.1.1.3"; + sha256 = "07xb926kixqv5scqdl8w34z42zjzdpbq06f0ha3f3nm3rxhgn3m8"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ + async base bytestring filepath singleton-bool tasty + tasty-expected-failure tasty-hunit temporary + ]; + description = "File locking"; + license = "GPL-2.0-or-later AND BSD-3-Clause"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "lumberjack" = callPackage ({ mkDerivation, base, contravariant, exceptions, mtl , prettyprinter, prettyprinter-ansi-terminal, text, time @@ -165652,8 +165710,8 @@ self: { }: mkDerivation { pname = "lzlib"; - version = "1.0.7.0"; - sha256 = "0dwwnpfzy5sg4cylpcz3d1aq26grdq0jvidw97x2fkcq2j4d9bak"; + version = "1.0.7.1"; + sha256 = "18y6diahfvqvv3qp6ch1jbi9jwz6li4xm1y1c5pi2895h4c51ljf"; libraryHaskellDepends = [ base bytestring ]; libraryToolDepends = [ c2hs ]; testHaskellDepends = [ @@ -166498,17 +166556,15 @@ self: { }) {}; "mail-reports" = callPackage - ({ mkDerivation, aeson, base, bytestring, mtl, resourcet, streaming - , streaming-bytestring, streaming-utils, text, time, xml - , zip-archive + ({ mkDerivation, aeson, base, bytestring, mtl, text, time, xml + , zip-archive, zlib }: mkDerivation { pname = "mail-reports"; - version = "0.2.0.0"; - sha256 = "1g3jazpcyhsmiz9i9vx0n784n2n9nqzrbbnjhjlzji2si9gnkg9z"; + version = "0.3.0.0"; + sha256 = "10n3q21d3ihqj1v2zsi4674jbvwbfjh0bkan6nml30k3ahw86xxa"; libraryHaskellDepends = [ - aeson base bytestring mtl resourcet streaming streaming-bytestring - streaming-utils text time xml zip-archive + aeson base bytestring mtl text time xml zip-archive zlib ]; description = "A parser library for DMARC and SMTP TLS reports"; license = stdenv.lib.licenses.agpl3; @@ -167591,13 +167647,13 @@ self: { }) {}; "markdown-unlit" = callPackage - ({ mkDerivation, base, base-compat, directory, hspec, QuickCheck - , silently, stringbuilder, temporary + ({ mkDerivation, base, base-compat, directory, hspec + , hspec-discover, QuickCheck, silently, stringbuilder, temporary }: mkDerivation { pname = "markdown-unlit"; - version = "0.5.0"; - sha256 = "1gy79vr85vcp13rdjh0hz7zv6daqqffww4j0cqn2lpjjh9xhsbg7"; + version = "0.5.1"; + sha256 = "0njzn56m8z6lm70xyixbylbnpjz1gk7x8vdsdvi3qld9m66gc3n7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base base-compat ]; @@ -167606,6 +167662,7 @@ self: { base base-compat directory hspec QuickCheck silently stringbuilder temporary ]; + testToolDepends = [ hspec-discover ]; description = "Literate Haskell support for Markdown"; license = stdenv.lib.licenses.mit; }) {}; @@ -167970,28 +168027,6 @@ self: { }) {}; "massiv" = callPackage - ({ mkDerivation, base, bytestring, data-default-class, deepseq - , doctest, exceptions, mersenne-random-pure64, primitive - , QuickCheck, random, scheduler, splitmix, template-haskell - , unliftio-core, vector - }: - mkDerivation { - pname = "massiv"; - version = "0.5.8.0"; - sha256 = "0p469736yydr7lbfr4vd51al4mvx6fb4s9zxc420fvb9f7v00jsb"; - libraryHaskellDepends = [ - base bytestring data-default-class deepseq exceptions primitive - scheduler unliftio-core vector - ]; - testHaskellDepends = [ - base doctest mersenne-random-pure64 QuickCheck random splitmix - template-haskell - ]; - description = "Massiv (Массив) is an Array Library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "massiv_0_5_9_0" = callPackage ({ mkDerivation, base, bytestring, data-default-class, deepseq , doctest, exceptions, mersenne-random-pure64, primitive , QuickCheck, random, scheduler, splitmix, template-haskell @@ -168011,7 +168046,6 @@ self: { ]; description = "Massiv (Массив) is an Array Library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "massiv-io" = callPackage @@ -168036,6 +168070,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "massiv-persist" = callPackage + ({ mkDerivation, base, bytestring, deepseq, doctest, hspec + , hspec-discover, massiv, massiv-test, persist, primitive + , QuickCheck + }: + mkDerivation { + pname = "massiv-persist"; + version = "0.1.0.0"; + sha256 = "0w3hm8mzk2vsd0myk7sl1cckl2yhr7b1y9qb9nzph5gw99hsc761"; + libraryHaskellDepends = [ + base bytestring deepseq massiv persist primitive + ]; + testHaskellDepends = [ + base doctest hspec massiv massiv-test persist QuickCheck + ]; + testToolDepends = [ hspec-discover ]; + description = "Compatibility of 'massiv' with 'persist'"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "massiv-scheduler" = callPackage ({ mkDerivation, atomic-primops, base, Cabal, cabal-doctest , deepseq, doctest, exceptions, hspec, QuickCheck, template-haskell @@ -168056,31 +168112,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "massiv-test" = callPackage - ({ mkDerivation, base, bytestring, containers, data-default - , data-default-class, deepseq, exceptions, genvalidity-hspec, hspec - , massiv, mwc-random, primitive, QuickCheck, scheduler, unliftio - , vector + "massiv-serialise" = callPackage + ({ mkDerivation, base, deepseq, doctest, hspec, hspec-discover + , massiv, massiv-test, QuickCheck, serialise, vector }: mkDerivation { - pname = "massiv-test"; - version = "0.1.5"; - sha256 = "0n9fcdz9v7j1r2iln9h0wkjr7jkghi3r3a3lm0713p6hwy6cpgff"; - revision = "1"; - editedCabalFile = "0v6vnjsqklb8yaf63zhx9ni0ak83zyjq2l3mb8zazp54inyyfjr0"; - libraryHaskellDepends = [ - base bytestring data-default-class deepseq exceptions hspec massiv - primitive QuickCheck scheduler unliftio vector - ]; + pname = "massiv-serialise"; + version = "0.1.0.0"; + sha256 = "0780lggn343k64ph3c27zhkkx0gmk9zfvv5pxz6zl1817xfqzc83"; + libraryHaskellDepends = [ base deepseq massiv serialise vector ]; testHaskellDepends = [ - base bytestring containers data-default deepseq genvalidity-hspec - hspec massiv mwc-random primitive QuickCheck scheduler vector + base doctest hspec massiv massiv-test QuickCheck serialise ]; - description = "Library that contains generators, properties and tests for Massiv Array Library"; + testToolDepends = [ hspec-discover ]; + description = "Compatibility of 'massiv' with 'serialise'"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; - "massiv-test_0_1_6" = callPackage + "massiv-test" = callPackage ({ mkDerivation, base, bytestring, containers, data-default , data-default-class, deepseq, exceptions, genvalidity-hspec, hspec , massiv, mwc-random, primitive, QuickCheck, scheduler, unliftio @@ -168100,7 +168151,6 @@ self: { ]; description = "Library that contains generators, properties and tests for Massiv Array Library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "master-plan" = callPackage @@ -168667,6 +168717,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "matroid" = callPackage + ({ mkDerivation, base, containers, hspec, QuickCheck }: + mkDerivation { + pname = "matroid"; + version = "0.0.0"; + sha256 = "0k7x9m8zn45s9r9frpqagrjkwbmfd9hfx2v1kwx7h5gfdkmkpb5z"; + libraryHaskellDepends = [ base containers hspec QuickCheck ]; + testHaskellDepends = [ base containers hspec QuickCheck ]; + description = "matroid (combinatorial pre-geometries) library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "matsuri" = callPackage ({ mkDerivation, base, ConfigFile, containers, directory, MissingH , mtl, network, old-locale, split, time, vty, vty-ui, XMPP @@ -169087,34 +169149,6 @@ self: { }) {}; "mcmc" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, criterion - , data-default, directory, dirichlet, double-conversion, hspec - , hspec-discover, log-domain, math-functions, microlens, mwc-random - , primitive, QuickCheck, statistics, time, transformers, vector - , zlib - }: - mkDerivation { - pname = "mcmc"; - version = "0.3.0"; - sha256 = "1xkg16gmhqh60z69gz6d51c9yb7q9j2w8aylhpxgh18yz35mw4j1"; - libraryHaskellDepends = [ - aeson base bytestring containers data-default directory dirichlet - double-conversion log-domain math-functions microlens mwc-random - primitive statistics time transformers vector zlib - ]; - testHaskellDepends = [ - base directory hspec hspec-discover log-domain mwc-random - QuickCheck statistics vector - ]; - testToolDepends = [ hspec-discover ]; - benchmarkHaskellDepends = [ - base criterion log-domain microlens mwc-random statistics vector - ]; - description = "Sample from a posterior using Markov chain Monte Carlo"; - license = stdenv.lib.licenses.gpl3Plus; - }) {}; - - "mcmc_0_4_0_0" = callPackage ({ mkDerivation, aeson, base, bytestring, circular, containers , criterion, data-default, deepseq, directory, dirichlet , double-conversion, hspec, log-domain, microlens, monad-parallel @@ -169140,6 +169174,7 @@ self: { description = "Sample from a posterior using Markov chain Monte Carlo"; license = stdenv.lib.licenses.gpl3Plus; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mcmc-samplers" = callPackage @@ -170635,6 +170670,19 @@ self: { broken = true; }) {}; + "method" = callPackage + ({ mkDerivation, base, hspec, hspec-discover, rio, transformers }: + mkDerivation { + pname = "method"; + version = "0.1.0.0"; + sha256 = "0j8jvjc663gkmx7bpzj30q1sfqpxjg16166xklvvgk0i01zh4rw7"; + libraryHaskellDepends = [ base rio transformers ]; + testHaskellDepends = [ base hspec rio transformers ]; + testToolDepends = [ hspec-discover ]; + description = "rebindable methods for improving testability"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "metric" = callPackage ({ mkDerivation, base, data-default, edit-distance, hmatrix , QuickCheck, test-framework, test-framework-quickcheck2, vector @@ -171250,6 +171298,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "microlens-th_0_4_3_9" = callPackage + ({ mkDerivation, base, containers, microlens, tagged + , template-haskell, th-abstraction, transformers + }: + mkDerivation { + pname = "microlens-th"; + version = "0.4.3.9"; + sha256 = "08gfqf24r95dcnw4jlnhh8ijmfwiyr9zaiiz4lbzp72hrkarlbiw"; + libraryHaskellDepends = [ + base containers microlens template-haskell th-abstraction + transformers + ]; + testHaskellDepends = [ base microlens tagged ]; + description = "Automatic generation of record lenses for microlens"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "micrologger" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, hspec, lens , text, text-format, time, transformers @@ -171300,28 +171366,6 @@ self: { }) {}; "microstache" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, deepseq - , directory, filepath, hspec, parsec, text, transformers - , unordered-containers, vector - }: - mkDerivation { - pname = "microstache"; - version = "1.0.1.1"; - sha256 = "0851sqr1ppdj6m822635pa3j6qzdf25gyrhkjs25zdry6518bsax"; - revision = "7"; - editedCabalFile = "05ia18kywpmk01sqnywflfq0ck3yivh8rc178f575py1zrdpn3l7"; - libraryHaskellDepends = [ - aeson base bytestring containers deepseq directory filepath parsec - text transformers unordered-containers vector - ]; - testHaskellDepends = [ - aeson base bytestring containers hspec parsec text - ]; - description = "Mustache templates for Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "microstache_1_0_1_2" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, deepseq , directory, filepath, hspec, parsec, text, transformers , unordered-containers, vector @@ -171339,7 +171383,6 @@ self: { ]; description = "Mustache templates for Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "microtimer" = callPackage @@ -172958,8 +173001,8 @@ self: { pname = "mmark-cli"; version = "0.0.5.0"; sha256 = "15qrp2q1flx9csqvj8zx9w1jqg8pwfi0v7wpia7n7vg09jgydhby"; - revision = "5"; - editedCabalFile = "1ncyh564gk6fhirx97jnr6v2nw3k69kngxd3gbn9wbi6hm6zz238"; + revision = "6"; + editedCabalFile = "1qki0f2iwr9phma4wby3alnsxigzl5qc1ims8cvhszkill9yfi4z"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -173355,8 +173398,8 @@ self: { }: mkDerivation { pname = "mod"; - version = "0.1.2.0"; - sha256 = "116dm3cid2hh4gii4k806670xz7syxajxmbxka61d43f3719z65y"; + version = "0.1.2.1"; + sha256 = "0fjcjk9jxwc2d1fm3kzamh9gi3lwnl2g6kz3z2hd43dszkay1mn1"; libraryHaskellDepends = [ base deepseq integer-gmp primitive semirings vector ]; @@ -176035,8 +176078,8 @@ self: { }: mkDerivation { pname = "morley"; - version = "1.10.0"; - sha256 = "08mj8jzrbqqzn3vr5hlpbzhgik3i3544xn5inm28j40vhlahvmzk"; + version = "1.11.0"; + sha256 = "06l83vida9kyyh9xc4rhjp7q36iq2knn4p2mrl9j7nvsinrqprcn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -181121,13 +181164,14 @@ self: { , exceptions, hspec, http-api-data, http-client, http-client-tls , http-media, http-types, iso8601-time, jwt, katip, lens , lens-aeson, microlens, modern-uri, mtl, network, QuickCheck - , random, req, rio, safe-exceptions, semigroups, text, time - , transformers, unordered-containers, uuid, vector + , random, req, retry, rio, safe-exceptions, semigroups, text, time + , transformers, unix, unordered-containers, uuid, vector + , websockets, wuss }: mkDerivation { pname = "neptune-backend"; - version = "0.1.2"; - sha256 = "0a7x9z584ckm20v2crpif56fyd0y3lr17b617wyd7ig1al51z3ri"; + version = "0.3.0"; + sha256 = "0lsimmpy5wpgsq5pn6zp386wnzqi04mql3vj03d8iadckyjizgvl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -181135,8 +181179,8 @@ self: { concurrent-extra containers deepseq envy exceptions http-api-data http-client http-client-tls http-media http-types iso8601-time jwt katip lens lens-aeson microlens modern-uri mtl network random req - rio safe-exceptions text time transformers unordered-containers - uuid vector + retry rio safe-exceptions text time transformers unix + unordered-containers uuid vector websockets wuss ]; executableHaskellDepends = [ base mtl rio ]; testHaskellDepends = [ @@ -181145,6 +181189,8 @@ self: { ]; description = "Neptune Client"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "nerf" = callPackage @@ -181369,6 +181415,8 @@ self: { ]; description = "An MQTT Protocol Implementation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "net-mqtt-lens" = callPackage @@ -181385,6 +181433,8 @@ self: { ]; description = "Optics for net-mqtt"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "net-mqtt-rpc" = callPackage @@ -181406,6 +181456,8 @@ self: { ]; description = "Make RPC calls via an MQTT broker"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "net-spider" = callPackage @@ -181417,8 +181469,8 @@ self: { }: mkDerivation { pname = "net-spider"; - version = "0.4.3.4"; - sha256 = "1whn8hkwbqx76vn1550j9fjkjhj7fxp295dcsv5jl25cvxpj5rml"; + version = "0.4.3.5"; + sha256 = "0y5jkkixrbm25z1vyhk5qmql1962jhhl6ifz8ba7fiwdv8qi1ndk"; libraryHaskellDepends = [ aeson base containers data-interval extended-reals greskell greskell-websocket hashable monad-logger regex-applicative @@ -181430,6 +181482,8 @@ self: { ]; description = "A graph database middleware to maintain a time-varying graph"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "net-spider-cli" = callPackage @@ -181439,8 +181493,8 @@ self: { }: mkDerivation { pname = "net-spider-cli"; - version = "0.2.0.4"; - sha256 = "0g9p1l3pyd8c43fj1h4c29n44257n4awlsqb4g821a62s4mjypwf"; + version = "0.2.0.5"; + sha256 = "011s533mv5flvmq58vsr2fnydk954lkyfif6d9fs87555dwiskyd"; libraryHaskellDepends = [ aeson base greskell-core hashable net-spider optparse-applicative text @@ -181450,6 +181504,8 @@ self: { ]; description = "CLI option parsers for NetSpider objects"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "net-spider-pangraph" = callPackage @@ -181458,8 +181514,8 @@ self: { }: mkDerivation { pname = "net-spider-pangraph"; - version = "0.2.0.2"; - sha256 = "1i7prpj85mbmwqdhfi8q2lxk89a2vv3n4r886sq2nygka0pw0azc"; + version = "0.2.0.3"; + sha256 = "0mjp5mvfp4hq8kna5f0pwmyc7s43ghhw91hc94n6xf6y4dnx0c2c"; libraryHaskellDepends = [ base bytestring greskell net-spider pangraph text time ]; @@ -181479,8 +181535,8 @@ self: { }: mkDerivation { pname = "net-spider-rpl"; - version = "0.4.1.3"; - sha256 = "0sflq9sg4xnfgfbx2iikvkzrs44kb11s6v23h3q3zwy1kdxakhr8"; + version = "0.4.1.4"; + sha256 = "0pmmxvfg8y8xymkkxka2c7jk83as5b6d5wmi0x9cml8hsnvlcifx"; libraryHaskellDepends = [ aeson base conduit conduit-parse greskell hashable ip monad-logger mtl net-spider regex-applicative safe-exceptions text time @@ -181503,8 +181559,8 @@ self: { }: mkDerivation { pname = "net-spider-rpl-cli"; - version = "0.1.3.2"; - sha256 = "1nqhrfbii58rhh19nxhr9zaqm3pd0yvlshwdwl50xrw7hr0jjxfc"; + version = "0.1.3.3"; + sha256 = "1cxp61nkl0vbks9ny7gpyjjiqg3cvzbz934iia66g2iwkbnfx250"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -183648,8 +183704,8 @@ self: { }: mkDerivation { pname = "ngx-export-tools"; - version = "0.4.9.0"; - sha256 = "0z1b3vzq11ifx3n8pmwary138ccqsfafzpl1nf27094rvr1ijjyn"; + version = "0.4.9.1"; + sha256 = "0ib0xzs815q29a2v1m550g7cm5cr7l6lkslmi0lpcxpfgpi08ccv"; libraryHaskellDepends = [ aeson base binary bytestring ngx-export safe template-haskell ]; @@ -183902,8 +183958,8 @@ self: { }: mkDerivation { pname = "niv"; - version = "0.2.18"; - sha256 = "1jgljmj7msix2vn9nxip9q4754hx4739w4r7sa05l6q4ba5ilwqd"; + version = "0.2.19"; + sha256 = "15smcgr81ryxb3a57b88azz2xsvcq92n0cmjam8v1x8r6j0w0p39"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -183978,6 +184034,8 @@ self: { pname = "nix-derivation"; version = "1.1.1"; sha256 = "1jcgq7c0x6q33ddq3ns4w69z23r31cvb2qxj04v2pyd5v8rwls9d"; + revision = "1"; + editedCabalFile = "1ink37s91kbrq8p0sqyi1i90xp2jimyg1cnzy9ydjh3iv21f7pi5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -184155,19 +184213,20 @@ self: { }) {}; "nix-tree" = callPackage - ({ mkDerivation, aeson, async, base, brick, containers, deepseq - , directory, filepath, hashable, hrfsize, lens, parallel, protolude - , text, transformers, typed-process, unordered-containers, vty + ({ mkDerivation, aeson, async, base, brick, bytestring, containers + , deepseq, directory, filepath, hashable, hrfsize, lens, parallel + , protolude, text, transformers, typed-process + , unordered-containers, vty }: mkDerivation { pname = "nix-tree"; - version = "0.1.3.0"; - sha256 = "03ih8gz26rpkipd46zbrkpr9lp23q0nnq8ks6j80d32096n7q59i"; + version = "0.1.3.1"; + sha256 = "1rihvfvfsrkgvq87bli9gzpbv1ny93n21cf31bid1b3g3cwadffp"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - aeson async base brick containers deepseq directory filepath - hashable hrfsize lens parallel protolude text transformers + aeson async base brick bytestring containers deepseq directory + filepath hashable hrfsize lens parallel protolude text transformers typed-process unordered-containers vty ]; description = "Interactively browse a Nix store paths dependencies"; @@ -185384,8 +185443,8 @@ self: { }: mkDerivation { pname = "nri-env-parser"; - version = "0.1.0.2"; - sha256 = "0cl9f6p83k0r7ha6hzgmrv0abi9rw5p0wr838jyhazk179g37rrn"; + version = "0.1.0.3"; + sha256 = "0335bpjqvkazfjx2k0dm460hzdwcwz1rn82x0nvf441njjqz6846"; libraryHaskellDepends = [ base modern-uri network-uri nri-prelude text ]; @@ -185395,26 +185454,23 @@ self: { "nri-prelude" = callPackage ({ mkDerivation, aeson, ansi-terminal, async, auto-update, base - , bytestring, concurrent-output, containers, directory, exceptions - , filepath, hedgehog, junit-xml, pretty-diff, pretty-show - , resourcet, safe-exceptions, tasty, tasty-test-reporter + , bytestring, containers, directory, exceptions, filepath, hedgehog + , junit-xml, pretty-diff, pretty-show, safe-exceptions , terminal-size, text, time, vector }: mkDerivation { pname = "nri-prelude"; - version = "0.2.0.0"; - sha256 = "061klliw29a8kkbwgqkhqbil7jq85pxgmqn21xwszi0g16jb8ayx"; + version = "0.3.0.0"; + sha256 = "1dijid038rvviz063ncviq1mw20hsk02gidcf68vzy99d16kn5c9"; libraryHaskellDepends = [ - aeson ansi-terminal async auto-update base bytestring - concurrent-output containers directory exceptions filepath hedgehog - junit-xml pretty-diff pretty-show resourcet safe-exceptions tasty - tasty-test-reporter terminal-size text time vector + aeson ansi-terminal async auto-update base bytestring containers + directory exceptions filepath hedgehog junit-xml pretty-diff + pretty-show safe-exceptions terminal-size text time vector ]; testHaskellDepends = [ - aeson ansi-terminal async auto-update base bytestring - concurrent-output containers directory exceptions filepath hedgehog - junit-xml pretty-diff pretty-show resourcet safe-exceptions tasty - tasty-test-reporter terminal-size text time vector + aeson ansi-terminal async auto-update base bytestring containers + directory exceptions filepath hedgehog junit-xml pretty-diff + pretty-show safe-exceptions terminal-size text time vector ]; description = "A Prelude inspired by the Elm programming language"; license = stdenv.lib.licenses.bsd3; @@ -187913,6 +187969,44 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "openai-hs" = callPackage + ({ mkDerivation, aeson, base, bytestring, casing, containers, cpphs + , hspec, http-client, http-client-tls, http-types, openai-servant + , servant, servant-client, servant-client-core, text, vector + }: + mkDerivation { + pname = "openai-hs"; + version = "0.1.1.0"; + sha256 = "0cfcw1jlsvzzyvxi2wmqn3klh0fr8rpi8ai6sg315ml7ignyfxz5"; + libraryHaskellDepends = [ + aeson base casing cpphs http-client http-types openai-servant + servant servant-client text + ]; + testHaskellDepends = [ + aeson base bytestring casing containers cpphs hspec http-client + http-client-tls http-types openai-servant servant servant-client + servant-client-core text vector + ]; + description = "Unofficial OpenAI client"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "openai-servant" = callPackage + ({ mkDerivation, aeson, base, casing, servant, text, time, vector + }: + mkDerivation { + pname = "openai-servant"; + version = "0.1.0.0"; + sha256 = "0fn8ram1rnf9qgs7iwl579gdz8z1qfjy6hhgk0n2z1dh28lhgq6d"; + libraryHaskellDepends = [ + aeson base casing servant text time vector + ]; + description = "Unofficial OpenAI servant types"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "openapi-petstore" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring , case-insensitive, containers, deepseq, exceptions, hspec @@ -189699,6 +189793,8 @@ self: { testToolDepends = [ hspec-discover ]; description = "Convert numbers to words in different languages"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ordrea" = callPackage @@ -189946,6 +190042,8 @@ self: { pname = "ormolu"; version = "0.1.4.1"; sha256 = "1aamgzimjn9h7kwby9ajfgbj5dx08nmxyalwvpg9rs4xd8pbpd9s"; + revision = "1"; + editedCabalFile = "1fi8fxyhw9jdwhsbmrikjqd461wrz7h4kdszrahlvdjfdsn4wh7d"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -190945,8 +191043,8 @@ self: { }: mkDerivation { pname = "pandoc"; - version = "2.11.3.1"; - sha256 = "1qh81rninlhdynkjphbvfl78hp3kk9kjwr3bh3yvwkaip57gjmz9"; + version = "2.11.3.2"; + sha256 = "1p4l6h9wpsfqxvziwx4vvsq02jdwwwqq92gvrdxi4ad2q7nlgivr"; configureFlags = [ "-fhttps" "-f-trypandoc" ]; isLibrary = true; isExecutable = true; @@ -191368,8 +191466,8 @@ self: { }: mkDerivation { pname = "pandoc-plot"; - version = "1.0.1.0"; - sha256 = "0p7sfsi70vbwkxwknl5k31qsvnkwvhdjr8c2q7y0pjz3xz9zdrjq"; + version = "1.0.2.0"; + sha256 = "10iwhwr3161mx438bi3q9m15wj60fs5hr6q90g3jqiv6w18n6zdm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -191547,8 +191645,8 @@ self: { ({ mkDerivation }: mkDerivation { pname = "pandora"; - version = "0.3.3"; - sha256 = "16jaq5q0b2q230iwhfhs2p1fmmqb38zssr7zbgjmry2045ya2dhh"; + version = "0.3.4"; + sha256 = "0xmf75v6b5cj083fjxz3hl6cj9ix2v68h8ix5zrh94qik5is4rl7"; description = "A box of patterns and paradigms"; license = stdenv.lib.licenses.mit; }) {}; @@ -192582,6 +192680,31 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "parochial" = callPackage + ({ mkDerivation, base, blaze-html, blaze-markup, Cabal, directory + , filepath, filepattern, hackage-db, hoogle, optparse-generic + , posix-paths, protolude, text, unix-compat + }: + mkDerivation { + pname = "parochial"; + version = "0.2.0.0"; + sha256 = "0sb42rln3svcfs78ab2fs6kq3k975xin6gqnm83rg3kryaawnra7"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base blaze-html blaze-markup Cabal directory filepath filepattern + hackage-db hoogle optparse-generic posix-paths protolude text + unix-compat + ]; + executableHaskellDepends = [ + base Cabal optparse-generic protolude + ]; + description = "Help Manage project specific documentation"; + license = stdenv.lib.licenses.agpl3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "parport" = callPackage ({ mkDerivation, array, base }: mkDerivation { @@ -193328,25 +193451,26 @@ self: { "passman" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, base64-bytestring - , bytestring, containers, easy-file, HCL, HUnit, lens, random, SHA - , text, transformers + , bytestring, containers, easy-file, HCL, HUnit, microlens + , microlens-th, random, SHA, text, transformers }: mkDerivation { pname = "passman"; - version = "0.2.1"; - sha256 = "0xa7cc38x012nznp5cwma44gf11v24w7h7cja869i282v7g5693b"; + version = "0.3.0"; + sha256 = "1m3g4ah1wvga3kq9krvg13niisq4rqkb7i6f6lil39v6lplq5drq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base base16-bytestring base64-bytestring bytestring - containers lens random SHA text + containers microlens microlens-th random SHA text ]; executableHaskellDepends = [ - aeson base bytestring containers easy-file HCL lens random - transformers + aeson base bytestring containers easy-file HCL microlens + microlens-th random transformers ]; testHaskellDepends = [ - aeson base bytestring containers HUnit lens random + aeson base bytestring containers HUnit microlens microlens-th + random ]; description = "a simple password manager"; license = stdenv.lib.licenses.lgpl3; @@ -193964,22 +194088,6 @@ self: { }) {}; "pava" = callPackage - ({ mkDerivation, base, criterion, hspec, hspec-discover, mwc-random - , vector - }: - mkDerivation { - pname = "pava"; - version = "0.1.0.0"; - sha256 = "0pi8pgfha113064fxl9vmd72drxxlj6zld4fqrf3y2qwhyikka5v"; - libraryHaskellDepends = [ base vector ]; - testHaskellDepends = [ base hspec hspec-discover vector ]; - testToolDepends = [ hspec-discover ]; - benchmarkHaskellDepends = [ base criterion mwc-random vector ]; - description = "Greatest convex majorants and least concave minorants"; - license = stdenv.lib.licenses.gpl3Plus; - }) {}; - - "pava_0_1_1_0" = callPackage ({ mkDerivation, base, criterion, hspec, mwc-random, vector }: mkDerivation { pname = "pava"; @@ -193990,7 +194098,6 @@ self: { benchmarkHaskellDepends = [ base criterion mwc-random vector ]; description = "Greatest convex majorants and least concave minorants"; license = stdenv.lib.licenses.gpl3Plus; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "paymill" = callPackage @@ -194392,22 +194499,21 @@ self: { "pcre2" = callPackage ({ mkDerivation, base, containers, criterion, hspec , microlens-platform, mtl, pcre-light, regex-pcre-builtin - , streaming, template-haskell, text + , template-haskell, text }: mkDerivation { pname = "pcre2"; - version = "1.1.2"; - sha256 = "1wpf87sm4r3q1aizxjb2ahvhw6kfy9x4ynlibqcfyjl1h5w3fffy"; + version = "1.1.3.1"; + sha256 = "1gm9dd2b2vsx24i3am66ml5xx951994h06p20b7fi22g8xh66hh2"; libraryHaskellDepends = [ - base containers mtl streaming template-haskell text + base containers mtl template-haskell text ]; testHaskellDepends = [ - base containers hspec microlens-platform mtl streaming - template-haskell text + base containers hspec microlens-platform mtl template-haskell text ]; benchmarkHaskellDepends = [ base containers criterion microlens-platform mtl pcre-light - regex-pcre-builtin streaming template-haskell text + regex-pcre-builtin template-haskell text ]; description = "Regular expressions via the PCRE2 C library (included)"; license = stdenv.lib.licenses.asl20; @@ -195622,35 +195728,6 @@ self: { }) {}; "persistent" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base64-bytestring - , blaze-html, bytestring, conduit, containers, fast-logger, hspec - , http-api-data, monad-logger, mtl, path-pieces, resource-pool - , resourcet, scientific, silently, template-haskell, text, time - , transformers, unliftio, unliftio-core, unordered-containers - , vector - }: - mkDerivation { - pname = "persistent"; - version = "2.10.5.3"; - sha256 = "18d9x12v4zldyzjm35gxzlcljqrmgpr1501zwdayy1h6iy7lbfb8"; - libraryHaskellDepends = [ - aeson attoparsec base base64-bytestring blaze-html bytestring - conduit containers fast-logger http-api-data monad-logger mtl - path-pieces resource-pool resourcet scientific silently - template-haskell text time transformers unliftio unliftio-core - unordered-containers vector - ]; - testHaskellDepends = [ - aeson attoparsec base base64-bytestring blaze-html bytestring - containers hspec http-api-data path-pieces scientific text time - transformers unordered-containers vector - ]; - description = "Type-safe, multi-backend data serialization"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ psibi ]; - }) {}; - - "persistent_2_11_0_2" = callPackage ({ mkDerivation, aeson, attoparsec, base, base64-bytestring , blaze-html, bytestring, conduit, containers, fast-logger, hspec , http-api-data, monad-logger, mtl, path-pieces, resource-pool @@ -195675,7 +195752,6 @@ self: { ]; description = "Type-safe, multi-backend data serialization"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; @@ -195932,32 +196008,6 @@ self: { }) {}; "persistent-mysql" = callPackage - ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit - , containers, fast-logger, hspec, HUnit, monad-logger, mysql - , mysql-simple, persistent, persistent-qq, persistent-template - , persistent-test, QuickCheck, quickcheck-instances, resource-pool - , resourcet, text, time, transformers, unliftio-core - }: - mkDerivation { - pname = "persistent-mysql"; - version = "2.10.2.3"; - sha256 = "0ymh1gmcslwd8fp2wq71fswjgbmjdxl2mx4xf30j71h0744r2jbf"; - libraryHaskellDepends = [ - aeson base blaze-builder bytestring conduit containers monad-logger - mysql mysql-simple persistent resource-pool resourcet text - transformers unliftio-core - ]; - testHaskellDepends = [ - base bytestring containers fast-logger hspec HUnit monad-logger - mysql persistent persistent-qq persistent-template persistent-test - QuickCheck quickcheck-instances resourcet text time transformers - unliftio-core - ]; - description = "Backend for the persistent library using MySQL database server"; - license = stdenv.lib.licenses.mit; - }) {}; - - "persistent-mysql_2_10_3_1" = callPackage ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit , containers, fast-logger, hspec, HUnit, monad-logger, mysql , mysql-simple, persistent, persistent-qq, persistent-template @@ -195981,7 +196031,6 @@ self: { ]; description = "Backend for the persistent library using MySQL database server"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "persistent-mysql-haskell" = callPackage @@ -196036,6 +196085,8 @@ self: { ]; description = "Backend for the persistent library using ODBC"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "persistent-pagination" = callPackage @@ -196072,36 +196123,6 @@ self: { }) {}; "persistent-postgresql" = callPackage - ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit - , containers, fast-logger, hspec, hspec-expectations, HUnit - , monad-logger, persistent, persistent-qq, persistent-template - , persistent-test, postgresql-libpq, postgresql-simple, QuickCheck - , quickcheck-instances, resource-pool, resourcet, text, time - , transformers, unliftio-core, unordered-containers, vector - }: - mkDerivation { - pname = "persistent-postgresql"; - version = "2.10.1.2"; - sha256 = "1q7n0h16argvpw2y3f8mxzmvy24q6if46ab9nvybviki283zbvlb"; - revision = "1"; - editedCabalFile = "0vzm2d9smg9zvskaz3dv7c90d14pb0as7qpnsnvswhh8vn0862g3"; - libraryHaskellDepends = [ - aeson base blaze-builder bytestring conduit containers monad-logger - persistent postgresql-libpq postgresql-simple resource-pool - resourcet text time transformers unliftio-core - ]; - testHaskellDepends = [ - aeson base bytestring containers fast-logger hspec - hspec-expectations HUnit monad-logger persistent persistent-qq - persistent-template persistent-test QuickCheck quickcheck-instances - resourcet text time transformers unliftio-core unordered-containers - vector - ]; - description = "Backend for the persistent library using postgresql"; - license = stdenv.lib.licenses.mit; - }) {}; - - "persistent-postgresql_2_11_0_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, blaze-builder, bytestring , conduit, containers, fast-logger, hspec, hspec-expectations , HUnit, monad-logger, mtl, persistent, persistent-qq @@ -196129,7 +196150,6 @@ self: { ]; description = "Backend for the persistent library using postgresql"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "persistent-protobuf" = callPackage @@ -196267,40 +196287,6 @@ self: { }) {}; "persistent-sqlite" = callPackage - ({ mkDerivation, aeson, base, bytestring, conduit, containers - , exceptions, fast-logger, hspec, HUnit, microlens-th, monad-logger - , persistent, persistent-template, persistent-test, QuickCheck - , resource-pool, resourcet, sqlite, system-fileio, system-filepath - , temporary, text, time, transformers, unliftio-core - , unordered-containers - }: - mkDerivation { - pname = "persistent-sqlite"; - version = "2.10.6.2"; - sha256 = "0l6287ni2ksi8l8kv6gbsyjxhjpcqn6a1gw577ii7fixbyvbpbnf"; - revision = "1"; - editedCabalFile = "1kg5cikbw7mpdzwc1f1kfxwjq7q2raqdxsdq5rb65rk87wl3fih5"; - configureFlags = [ "-fsystemlib" ]; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base bytestring conduit containers microlens-th monad-logger - persistent resource-pool resourcet text time transformers - unliftio-core unordered-containers - ]; - librarySystemDepends = [ sqlite ]; - testHaskellDepends = [ - base bytestring containers exceptions fast-logger hspec HUnit - monad-logger persistent persistent-template persistent-test - QuickCheck resourcet system-fileio system-filepath temporary text - time transformers unliftio-core - ]; - description = "Backend for the persistent library using sqlite3"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ psibi ]; - }) {inherit (pkgs) sqlite;}; - - "persistent-sqlite_2_11_0_0" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, containers , exceptions, fast-logger, hspec, HUnit, microlens-th, monad-logger , persistent, persistent-template, persistent-test, QuickCheck @@ -196329,41 +196315,10 @@ self: { ]; description = "Backend for the persistent library using sqlite3"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {inherit (pkgs) sqlite;}; "persistent-template" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, criterion - , deepseq, deepseq-generics, file-embed, hspec, http-api-data - , monad-control, monad-logger, path-pieces, persistent, QuickCheck - , template-haskell, text, th-lift-instances, transformers - , unordered-containers - }: - mkDerivation { - pname = "persistent-template"; - version = "2.8.2.3"; - sha256 = "1y96aj5i3c1j2ls6980l8lfjj9b3vfmp3766xk5af1870vj1s1lf"; - revision = "2"; - editedCabalFile = "0n0zr4fxzrgdbgl26mikfl9hyn0269isblrr9rj3i045p96a0y5s"; - libraryHaskellDepends = [ - aeson base bytestring containers http-api-data monad-control - monad-logger path-pieces persistent template-haskell text - th-lift-instances transformers unordered-containers - ]; - testHaskellDepends = [ - aeson base bytestring hspec persistent QuickCheck text - ]; - benchmarkHaskellDepends = [ - base criterion deepseq deepseq-generics file-embed persistent - template-haskell text - ]; - description = "Type-safe, non-relational, multi-backend persistence"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ psibi ]; - }) {}; - - "persistent-template_2_9_1_0" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, criterion , deepseq, deepseq-generics, file-embed, hspec, http-api-data , monad-control, monad-logger, path-pieces, persistent, QuickCheck @@ -196388,7 +196343,6 @@ self: { ]; description = "Type-safe, non-relational, multi-backend persistence"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; @@ -196440,32 +196394,6 @@ self: { }) {}; "persistent-typed-db" = callPackage - ({ mkDerivation, aeson, base, bytestring, conduit, esqueleto, hspec - , http-api-data, monad-logger, path-pieces, persistent - , persistent-template, resource-pool, resourcet, template-haskell - , text, transformers - }: - mkDerivation { - pname = "persistent-typed-db"; - version = "0.1.0.1"; - sha256 = "07yjzxg5yfxv1zbp5pkrvj8nrsxyhy4n11zgmd0q9g186q6283qn"; - revision = "1"; - editedCabalFile = "15qqrxjg00xvn9ffdj0yk3zxw5snn91379zzhzzv3kd9w1b25zg0"; - libraryHaskellDepends = [ - aeson base bytestring conduit http-api-data monad-logger - path-pieces persistent persistent-template resource-pool resourcet - template-haskell text transformers - ]; - testHaskellDepends = [ - aeson base bytestring conduit esqueleto hspec http-api-data - monad-logger path-pieces persistent persistent-template - resource-pool resourcet template-haskell text transformers - ]; - description = "Type safe access to multiple database schemata"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "persistent-typed-db_0_1_0_2" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, esqueleto, hspec , http-api-data, monad-logger, path-pieces, persistent , persistent-template, resource-pool, resourcet, template-haskell @@ -196487,7 +196415,6 @@ self: { ]; description = "Type safe access to multiple database schemata"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "persistent-vector" = callPackage @@ -197142,6 +197069,17 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "phonetic-languages-constraints-array" = callPackage + ({ mkDerivation, base, subG }: + mkDerivation { + pname = "phonetic-languages-constraints-array"; + version = "0.1.0.0"; + sha256 = "0mxn7xvggiii4cmpqmxx5mkk660z9q8s3n09kaqbmwszf5l86ynd"; + libraryHaskellDepends = [ base subG ]; + description = "Constraints to filter the needed permutations"; + license = stdenv.lib.licenses.mit; + }) {}; + "phonetic-languages-examples" = callPackage ({ mkDerivation, base, mmsyn2, parallel, phonetic-languages-common , phonetic-languages-constraints, phonetic-languages-general @@ -197175,6 +197113,17 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "phonetic-languages-filters-array" = callPackage + ({ mkDerivation, base, filters-basic, mmsyn2-array }: + mkDerivation { + pname = "phonetic-languages-filters-array"; + version = "0.1.0.0"; + sha256 = "0gi2hbdzb62s0hvx9j8w936bwiypv6xvh5xndmx4w1kf8r2lkagy"; + libraryHaskellDepends = [ base filters-basic mmsyn2-array ]; + description = "Allows to change the structure of the function output"; + license = stdenv.lib.licenses.mit; + }) {}; + "phonetic-languages-general" = callPackage ({ mkDerivation, base, phonetic-languages-common , phonetic-languages-plus, print-info, subG, vector @@ -197202,6 +197151,17 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "phonetic-languages-permutations-array" = callPackage + ({ mkDerivation, base, subG }: + mkDerivation { + pname = "phonetic-languages-permutations-array"; + version = "0.1.0.0"; + sha256 = "1r8fwdphn3h9zpbrdbbgmqjwv6gwcl205ahr3kqwz6sfg78bflj4"; + libraryHaskellDepends = [ base subG ]; + description = "Permutations and universal set related functions for the phonetic-languages series"; + license = stdenv.lib.licenses.mit; + }) {}; + "phonetic-languages-plus" = callPackage ({ mkDerivation, base, bytestring, lists-flines, parallel , uniqueness-periods-vector-stats @@ -197249,6 +197209,20 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "phonetic-languages-simplified-base" = callPackage + ({ mkDerivation, base, phonetic-languages-permutations-array, subG + }: + mkDerivation { + pname = "phonetic-languages-simplified-base"; + version = "0.1.0.0"; + sha256 = "0fd2pslmgm5bvv0yiza87vp61601pl1c69xa5snbgrnb2mlp6f98"; + libraryHaskellDepends = [ + base phonetic-languages-permutations-array subG + ]; + description = "A simplified version of the phonetic-languages functionality common for some different realizations"; + license = stdenv.lib.licenses.mit; + }) {}; + "phonetic-languages-simplified-common" = callPackage ({ mkDerivation, base, phonetic-languages-permutations, subG , subG-instances, vector @@ -197264,6 +197238,73 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "phonetic-languages-simplified-examples-array" = callPackage + ({ mkDerivation, base, heaps, mmsyn2-array, parallel + , phonetic-languages-constraints-array + , phonetic-languages-filters-array + , phonetic-languages-permutations-array, phonetic-languages-plus + , phonetic-languages-rhythmicity + , phonetic-languages-simplified-base + , phonetic-languages-simplified-examples-common + , phonetic-languages-simplified-properties-array + , phonetic-languages-ukrainian-array, print-info, subG + , ukrainian-phonetics-basic-array, uniqueness-periods-vector-stats + }: + mkDerivation { + pname = "phonetic-languages-simplified-examples-array"; + version = "0.2.1.0"; + sha256 = "12ri0dv6ifswnp983asa0yyd7xl58ic22payxpri6653f58lkc4h"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base heaps mmsyn2-array parallel + phonetic-languages-constraints-array + phonetic-languages-filters-array + phonetic-languages-permutations-array phonetic-languages-plus + phonetic-languages-rhythmicity phonetic-languages-simplified-base + phonetic-languages-simplified-examples-common + phonetic-languages-simplified-properties-array + phonetic-languages-ukrainian-array subG + ukrainian-phonetics-basic-array uniqueness-periods-vector-stats + ]; + executableHaskellDepends = [ + base heaps mmsyn2-array parallel + phonetic-languages-constraints-array + phonetic-languages-filters-array + phonetic-languages-permutations-array phonetic-languages-plus + phonetic-languages-rhythmicity phonetic-languages-simplified-base + phonetic-languages-simplified-examples-common + phonetic-languages-simplified-properties-array + phonetic-languages-ukrainian-array print-info subG + ukrainian-phonetics-basic-array uniqueness-periods-vector-stats + ]; + description = "Helps to create Ukrainian texts with the given phonetic properties"; + license = stdenv.lib.licenses.mit; + }) {}; + + "phonetic-languages-simplified-examples-common" = callPackage + ({ mkDerivation, base, heaps, mmsyn2-array + , phonetic-languages-constraints-array + , phonetic-languages-simplified-common + , phonetic-languages-simplified-properties-lists-double + , phonetic-languages-ukrainian-array, subG + , ukrainian-phonetics-basic-array + }: + mkDerivation { + pname = "phonetic-languages-simplified-examples-common"; + version = "0.1.0.0"; + sha256 = "0khgv7gycsr1qvc0d158ics2zmxvpybrr5k105ifq93y2qgcjqpa"; + libraryHaskellDepends = [ + base heaps mmsyn2-array phonetic-languages-constraints-array + phonetic-languages-simplified-common + phonetic-languages-simplified-properties-lists-double + phonetic-languages-ukrainian-array subG + ukrainian-phonetics-basic-array + ]; + description = "Some commonly used by phonetic-languages-simplified* series functions"; + license = stdenv.lib.licenses.mit; + }) {}; + "phonetic-languages-simplified-lists-examples" = callPackage ({ mkDerivation, base, heaps, mmsyn2, parallel , phonetic-languages-constraints, phonetic-languages-permutations @@ -197298,6 +197339,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "phonetic-languages-simplified-properties-array" = callPackage + ({ mkDerivation, base, phonetic-languages-rhythmicity + , phonetic-languages-simplified-base + , ukrainian-phonetics-basic-array + }: + mkDerivation { + pname = "phonetic-languages-simplified-properties-array"; + version = "0.1.1.0"; + sha256 = "0ildphgb5dd2s5hc4nr7ii9q9dzm0qa7vc2j4yjcis72jjzjx6nd"; + libraryHaskellDepends = [ + base phonetic-languages-rhythmicity + phonetic-languages-simplified-base ukrainian-phonetics-basic-array + ]; + description = "A generalization of the uniqueness-periods-vector-properties package"; + license = stdenv.lib.licenses.mit; + }) {}; + "phonetic-languages-simplified-properties-lists" = callPackage ({ mkDerivation, base, phonetic-languages-rhythmicity , phonetic-languages-simplified-common, ukrainian-phonetics-basic @@ -197345,6 +197403,17 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "phonetic-languages-ukrainian-array" = callPackage + ({ mkDerivation, base, mmsyn2-array, mmsyn5 }: + mkDerivation { + pname = "phonetic-languages-ukrainian-array"; + version = "0.1.0.0"; + sha256 = "0h88qcdkckgn5cjyjiwvdxci8p04h12xr6jj5pjp4wzqyp6a5wcf"; + libraryHaskellDepends = [ base mmsyn2-array mmsyn5 ]; + description = "Prepares Ukrainian text to be used as a phonetic language text"; + license = stdenv.lib.licenses.mit; + }) {}; + "phonetic-languages-vector" = callPackage ({ mkDerivation, base, vector }: mkDerivation { @@ -200463,6 +200532,8 @@ self: { doHaddock = false; description = "Tool for refactoring expressions into pointfree form"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pointful" = callPackage @@ -201433,6 +201504,8 @@ self: { ]; description = "Maps and sets of partial orders"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pomodoro" = callPackage @@ -201715,12 +201788,14 @@ self: { testToolDepends = [ hspec-discover ]; description = "Static key-value storage backed by poppy"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "poppler" = callPackage ({ mkDerivation, array, base, bytestring, Cabal, cairo, containers , gdk-pixbuf, glib, gtk, gtk2, gtk2hs-buildtools, mtl, pango - , poppler + , poppler_gi }: mkDerivation { pname = "poppler"; @@ -201731,14 +201806,14 @@ self: { libraryHaskellDepends = [ array base bytestring cairo containers glib gtk mtl ]; - libraryPkgconfigDepends = [ gdk-pixbuf gtk2 pango poppler ]; + libraryPkgconfigDepends = [ gdk-pixbuf gtk2 pango poppler_gi ]; libraryToolDepends = [ gtk2hs-buildtools ]; description = "Binding to the Poppler"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {inherit (pkgs) gdk-pixbuf; inherit (pkgs) gtk2; - inherit (pkgs) pango; inherit (pkgs) poppler;}; + inherit (pkgs) pango; inherit (pkgs) poppler_gi;}; "populate-setup-exe-cache" = callPackage ({ mkDerivation, base }: @@ -202684,8 +202759,8 @@ self: { }: mkDerivation { pname = "postgresql-query"; - version = "3.7.0"; - sha256 = "0raxd0vd6hf772g11x8p0c6h86sipwk74z5kfxb38mbi26yj0p24"; + version = "3.8.0"; + sha256 = "1bk355kqsiyxn269bp5icf5s80p2bzxy08r8g8llainppjxnq8n8"; libraryHaskellDepends = [ aeson attoparsec base blaze-builder bytestring containers data-default exceptions file-embed haskell-src-meta hreader hset @@ -202754,6 +202829,35 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "postgresql-simple_0_6_4" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base16-bytestring + , bytestring, bytestring-builder, case-insensitive, containers + , cryptohash-md5, filepath, hashable, HUnit, inspection-testing + , Only, postgresql-libpq, scientific, tasty, tasty-golden + , tasty-hunit, template-haskell, text, time-compat, transformers + , uuid-types, vector + }: + mkDerivation { + pname = "postgresql-simple"; + version = "0.6.4"; + sha256 = "0rz2bklxp4pvbxb2w49h5p6pbwabn6d5d4j4mrya4fpa0d13k43d"; + libraryHaskellDepends = [ + aeson attoparsec base bytestring bytestring-builder + case-insensitive containers hashable Only postgresql-libpq + scientific template-haskell text time-compat transformers + uuid-types vector + ]; + testHaskellDepends = [ + aeson base base16-bytestring bytestring case-insensitive containers + cryptohash-md5 filepath HUnit inspection-testing postgresql-libpq + tasty tasty-golden tasty-hunit text time-compat vector + ]; + benchmarkHaskellDepends = [ base vector ]; + description = "Mid-Level PostgreSQL client library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "postgresql-simple-bind" = callPackage ({ mkDerivation, attoparsec, base, bytestring, data-default , exceptions, heredoc, hspec, postgresql-simple, template-haskell @@ -204215,27 +204319,29 @@ self: { "preql" = callPackage ({ mkDerivation, aeson, alex, array, base, binary-parser - , bytestring, bytestring-strict-builder, contravariant, free, happy - , mtl, postgresql-binary, postgresql-libpq, scientific, tasty + , bytestring, bytestring-strict-builder, containers, contravariant + , generic-random, happy, hedgehog, mtl, postgresql-binary + , postgresql-libpq, scientific, syb, tasty, tasty-hedgehog , tasty-hunit, template-haskell, text, th-lift-instances, time - , transformers, uuid, vector + , transformers, uuid, vector, vector-sized }: mkDerivation { pname = "preql"; - version = "0.3"; - sha256 = "03zdkxlkvqyccvi682w0inxl70fvzi4l56kicp9qrb661jaqvy9q"; + version = "0.4"; + sha256 = "142vq05flg052016npvh1xrk3w1dkks5gn58ivning6w1d0z1v1a"; libraryHaskellDepends = [ aeson array base binary-parser bytestring bytestring-strict-builder - contravariant free mtl postgresql-binary postgresql-libpq - scientific template-haskell text th-lift-instances time - transformers uuid vector + contravariant mtl postgresql-binary postgresql-libpq scientific syb + template-haskell text th-lift-instances time transformers uuid + vector vector-sized ]; libraryToolDepends = [ alex happy ]; testHaskellDepends = [ aeson array base binary-parser bytestring bytestring-strict-builder - contravariant free mtl postgresql-binary postgresql-libpq - scientific tasty tasty-hunit template-haskell text - th-lift-instances time transformers uuid vector + containers contravariant generic-random hedgehog mtl + postgresql-binary postgresql-libpq scientific syb tasty + tasty-hedgehog tasty-hunit template-haskell text th-lift-instances + time transformers uuid vector vector-sized ]; testToolDepends = [ alex happy ]; description = "safe PostgreSQL queries using Quasiquoters"; @@ -204521,30 +204627,6 @@ self: { }) {}; "pretty-simple" = callPackage - ({ mkDerivation, ansi-terminal, base, Cabal, cabal-doctest - , containers, criterion, doctest, Glob, mtl, QuickCheck - , template-haskell, text, transformers - }: - mkDerivation { - pname = "pretty-simple"; - version = "3.3.0.0"; - sha256 = "0g83958npqscqqz2lh5m0m666qp8ldwps4l5gvfip4b1zgy3f5nh"; - isLibrary = true; - isExecutable = true; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - ansi-terminal base containers mtl text transformers - ]; - testHaskellDepends = [ - base doctest Glob QuickCheck template-haskell - ]; - benchmarkHaskellDepends = [ base criterion text ]; - description = "pretty printer for data types with a 'Show' instance"; - license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ cdepillabout ]; - }) {}; - - "pretty-simple_4_0_0_0" = callPackage ({ mkDerivation, base, Cabal, cabal-doctest, containers, criterion , doctest, Glob, mtl, prettyprinter, prettyprinter-ansi-terminal , QuickCheck, template-haskell, text, transformers @@ -204566,7 +204648,6 @@ self: { benchmarkHaskellDepends = [ base criterion text ]; description = "pretty printer for data types with a 'Show' instance"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; maintainers = with stdenv.lib.maintainers; [ cdepillabout ]; }) {}; @@ -204649,31 +204730,6 @@ self: { }) {}; "prettyprinter" = callPackage - ({ mkDerivation, ansi-wl-pprint, base, base-compat, bytestring - , containers, deepseq, doctest, gauge, mtl, pgp-wordlist - , QuickCheck, quickcheck-instances, random, tasty, tasty-hunit - , tasty-quickcheck, text, transformers - }: - mkDerivation { - pname = "prettyprinter"; - version = "1.6.2"; - sha256 = "023hfz75xgvyymbipyph7xmaaki2d5qa6fh4lx9adl1h4s8g34yi"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base text ]; - testHaskellDepends = [ - base bytestring doctest pgp-wordlist QuickCheck - quickcheck-instances tasty tasty-hunit tasty-quickcheck text - ]; - benchmarkHaskellDepends = [ - ansi-wl-pprint base base-compat containers deepseq gauge mtl - QuickCheck random text transformers - ]; - description = "A modern, easy to use, well-documented, extensible pretty-printer"; - license = stdenv.lib.licenses.bsd2; - }) {}; - - "prettyprinter_1_7_0" = callPackage ({ mkDerivation, ansi-wl-pprint, base, base-compat, bytestring , containers, deepseq, doctest, gauge, mtl, pgp-wordlist , QuickCheck, quickcheck-instances, random, tasty, tasty-hunit @@ -204696,7 +204752,6 @@ self: { ]; description = "A modern, easy to use, well-documented, extensible pretty-printer"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "prettyprinter-ansi-terminal" = callPackage @@ -204721,12 +204776,10 @@ self: { ({ mkDerivation, base, prettyprinter, text }: mkDerivation { pname = "prettyprinter-compat-annotated-wl-pprint"; - version = "1"; - sha256 = "0zpmpbpnyxqswfb7gdj0kwz7hw606fj1iwkpl1qv0xcxk6n9n99c"; - revision = "3"; - editedCabalFile = "0vzi7id60pfj35xp61akzvfx9x6py45r5b8343i48ljpir91rvgw"; + version = "1.1"; + sha256 = "0plkzvwbqilmh711fbbki9r37i01n00kmzr6cxjgjw0ak1m2djbn"; libraryHaskellDepends = [ base prettyprinter text ]; - description = "Prettyprinter compatibility module for previous users of the annotated-wl-pprint package"; + description = "Drop-in compatibility package to migrate from »annotated-wl-pprint« to »prettyprinter«"; license = stdenv.lib.licenses.bsd2; }) {}; @@ -206037,8 +206090,6 @@ self: { ]; description = "Treemap visualiser for GHC prof files"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "profunctor-arrows" = callPackage @@ -206134,14 +206185,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "profunctors_5_6" = callPackage + "profunctors_5_6_1" = callPackage ({ mkDerivation, base, base-orphans, bifunctors, comonad , contravariant, distributive, tagged, transformers }: mkDerivation { pname = "profunctors"; - version = "5.6"; - sha256 = "1qwc56d7rjawg472j1kq7lsqzr55cqgmsbkvxy7x65vwyr4aa1nb"; + version = "5.6.1"; + sha256 = "1b2fgnhl3j790rra615q6y9xx97lip0smfg1c13ad1brvyjygps6"; libraryHaskellDepends = [ base base-orphans bifunctors comonad contravariant distributive tagged transformers @@ -206260,74 +206311,73 @@ self: { }) {inherit (pkgs) proj;}; "project-m36" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base64-bytestring, binary - , blaze-html, bytestring, Cabal, cassava, conduit, containers - , criterion, cryptohash-sha256, data-interval, deepseq - , deepseq-generics, deferred-folds, directory, distributed-process - , distributed-process-async, distributed-process-client-server - , distributed-process-extras, either, exceptions, extended-reals - , filepath, foldl, ghc, ghc-boot, ghc-paths, ghci, Glob, gnuplot - , hashable, hashable-time, haskeline, http-api-data, http-types - , HUnit, list-t, megaparsec, monad-parallel, MonadRandom, mtl - , network, network-transport, network-transport-tcp, old-locale - , optparse-applicative, parallel, parser-combinators, path-pieces - , QuickCheck, quickcheck-instances, random, random-shuffle - , resourcet, rset, scotty, semigroups, stm, stm-containers - , template-haskell, temporary, text, text-manipulate, time - , transformers, unix, unordered-containers, uuid, vector - , vector-binary-instances, websockets, zlib + ({ mkDerivation, aeson, async, attoparsec, base, base64-bytestring + , binary, blaze-html, bytestring, Cabal, cassava, conduit + , containers, criterion, cryptohash-sha256, curryer-rpc + , data-interval, deepseq, deepseq-generics, deferred-folds + , directory, either, exceptions, extended-reals, filepath, foldl + , ghc, ghc-boot, ghc-paths, ghci, Glob, gnuplot, hashable + , hashable-time, haskeline, http-api-data, http-types, HUnit + , list-t, megaparsec, monad-parallel, MonadRandom, mtl, network + , old-locale, optparse-applicative, parallel, parser-combinators + , path-pieces, prettyprinter, QuickCheck, quickcheck-instances + , random, random-shuffle, resourcet, rset, scotty, semigroups, stm + , stm-containers, template-haskell, temporary, text + , text-manipulate, time, transformers, unix, unordered-containers + , uuid, vector, vector-binary-instances, vector-instances + , websockets, winery, zlib }: mkDerivation { pname = "project-m36"; - version = "0.8.1"; - sha256 = "10by97f23pbl7hdwgc0609qxfyl7fak28n0nvvzb51q282w7f22h"; + version = "0.9.0"; + sha256 = "0ijh0ywz32ywryqrpdadry50lf2cfdglahkiqwwi1f6vvd55rb6p"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson attoparsec base base64-bytestring binary bytestring cassava - conduit containers cryptohash-sha256 data-interval deepseq - deepseq-generics deferred-folds directory distributed-process - distributed-process-async distributed-process-client-server - distributed-process-extras either exceptions extended-reals - filepath foldl ghc ghc-boot ghc-paths ghci Glob gnuplot hashable - hashable-time haskeline http-api-data list-t monad-parallel - MonadRandom mtl network-transport network-transport-tcp old-locale + aeson async attoparsec base base64-bytestring bytestring cassava + conduit containers cryptohash-sha256 curryer-rpc data-interval + deepseq deepseq-generics deferred-folds directory either exceptions + extended-reals filepath foldl ghc ghc-boot ghc-paths ghci Glob + gnuplot hashable hashable-time haskeline http-api-data list-t + monad-parallel MonadRandom mtl network old-locale optparse-applicative parallel path-pieces QuickCheck quickcheck-instances random-shuffle resourcet rset semigroups stm stm-containers temporary text text-manipulate time transformers - unix unordered-containers uuid vector vector-binary-instances zlib + unix unordered-containers uuid vector vector-instances winery zlib ]; executableHaskellDepends = [ - aeson attoparsec base base64-bytestring binary blaze-html - bytestring Cabal cassava conduit containers data-interval deepseq + aeson attoparsec base base64-bytestring blaze-html bytestring Cabal + cassava conduit containers curryer-rpc data-interval deepseq deepseq-generics directory either filepath ghc ghc-paths gnuplot hashable hashable-time haskeline http-api-data http-types HUnit - list-t megaparsec MonadRandom mtl network-transport-tcp - optparse-applicative parallel parser-combinators path-pieces random - scotty semigroups stm stm-containers template-haskell temporary - text time transformers unordered-containers uuid vector - vector-binary-instances websockets + list-t megaparsec MonadRandom mtl network optparse-applicative + parallel parser-combinators path-pieces prettyprinter random scotty + semigroups stm stm-containers template-haskell temporary text time + transformers unordered-containers uuid vector + vector-binary-instances websockets winery ]; testHaskellDepends = [ aeson attoparsec base base64-bytestring binary bytestring Cabal - cassava conduit containers data-interval deepseq deepseq-generics - directory either filepath gnuplot hashable hashable-time haskeline - http-api-data HUnit list-t megaparsec MonadRandom mtl network - network-transport network-transport-tcp optparse-applicative - parallel parser-combinators path-pieces random semigroups stm - stm-containers template-haskell temporary text time transformers - unordered-containers uuid vector vector-binary-instances websockets + cassava containers curryer-rpc data-interval deepseq + deepseq-generics directory filepath gnuplot hashable hashable-time + haskeline HUnit list-t megaparsec MonadRandom mtl network + optparse-applicative parallel parser-combinators prettyprinter + random semigroups stm stm-containers temporary text time + transformers unordered-containers uuid vector + vector-binary-instances websockets winery ]; benchmarkHaskellDepends = [ - attoparsec base base64-bytestring binary bytestring Cabal cassava - containers criterion data-interval deepseq deepseq-generics - directory filepath gnuplot hashable hashable-time haskeline HUnit - megaparsec mtl parallel stm stm-containers temporary text time + aeson attoparsec base base64-bytestring bytestring Cabal cassava + containers criterion curryer-rpc data-interval deepseq + deepseq-generics directory filepath gnuplot hashable hashable-time + haskeline HUnit list-t megaparsec MonadRandom mtl network + optparse-applicative parallel parser-combinators prettyprinter + random semigroups stm stm-containers temporary text time transformers unordered-containers uuid vector - vector-binary-instances + vector-binary-instances websockets winery ]; description = "Relational Algebra Engine"; - license = stdenv.lib.licenses.publicDomain; + license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {}; @@ -206492,19 +206542,20 @@ self: { "prolude" = callPackage ({ mkDerivation, aeson, base, bytestring, cassava, containers - , generic-random, lens, mongoDB, mtl, persistent + , generic-random, lens, mongoDB, mtl, network-uri, persistent , persistent-mongoDB, QuickCheck, quickcheck-instances - , safe-exceptions, scientific, swagger2, text, time, uuid, vector + , safe-exceptions, scientific, servant, swagger2, text, time, uuid + , vector }: mkDerivation { pname = "prolude"; - version = "0.0.0.13"; - sha256 = "1j4rq0libwrqs5f2ryfgpl5ayis7xlhl3ay2zbzqpwia39d38kcb"; + version = "0.0.0.15"; + sha256 = "1hm24qz13yrhvg8a0xx781pv29lbxzdzazk7byfjqv4dsy8c7mkp"; libraryHaskellDepends = [ aeson base bytestring cassava containers generic-random lens - mongoDB mtl persistent persistent-mongoDB QuickCheck - quickcheck-instances safe-exceptions scientific swagger2 text time - uuid vector + mongoDB mtl network-uri persistent persistent-mongoDB QuickCheck + quickcheck-instances safe-exceptions scientific servant swagger2 + text time uuid vector ]; description = "ITProTV's custom prelude"; license = stdenv.lib.licenses.mit; @@ -206945,6 +206996,8 @@ self: { libraryToolDepends = [ c2hs ]; description = "Simple audio library for SDL"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) SDL2;}; "proteome" = callPackage @@ -207022,6 +207075,8 @@ self: { ]; description = "Arbitrary instances for proto-lens"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "proto-lens-combinators" = callPackage @@ -207475,6 +207530,24 @@ self: { broken = true; }) {}; + "proton" = callPackage + ({ mkDerivation, adjunctions, base, bifunctors, comonad + , compactable, containers, contravariant, distributive, linear, mtl + , profunctors, tagged + }: + mkDerivation { + pname = "proton"; + version = "0.0.1"; + sha256 = "0l3176d1vjvknns2dx7qnwi7n45mc6v4qx9iv3z4488msjfqx6gf"; + libraryHaskellDepends = [ + adjunctions base bifunctors comonad compactable containers + contravariant distributive linear mtl profunctors tagged + ]; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "proton-haskell" = callPackage ({ mkDerivation, base, containers, directory, filepath, HUnit , test-framework, test-framework-hunit @@ -207798,8 +207871,8 @@ self: { }: mkDerivation { pname = "ptr-poker"; - version = "0.1.1.2"; - sha256 = "06h267z01cvk2sck7ycbi8vssg4985nh7cxx2mw92hiqj1kqp0gp"; + version = "0.1.1.3"; + sha256 = "1qrcsci4jccx4l1zlpqr202jl2dhpmcbbq94gfgdax80q8js3yrq"; libraryHaskellDepends = [ base bytestring scientific text ]; testHaskellDepends = [ hedgehog numeric-limits rerebase ]; benchmarkHaskellDepends = [ gauge rerebase ]; @@ -208294,6 +208367,8 @@ self: { benchmarkHaskellDepends = [ base base-compat bytestring time ]; description = "A Haskell-only implementation of zlib / DEFLATE"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pureMD5" = callPackage @@ -210074,33 +210149,6 @@ self: { }) {}; "quickcheck-instances" = callPackage - ({ mkDerivation, array, base, base-compat, bytestring - , case-insensitive, containers, hashable, old-time, QuickCheck - , scientific, splitmix, tagged, text, these, time, time-compat - , transformers, transformers-compat, unordered-containers - , uuid-types, vector - }: - mkDerivation { - pname = "quickcheck-instances"; - version = "0.3.23"; - sha256 = "1gig5dwgsahpgdz0cm06wf9lbjnh0qmr5qrlk9bc3v72pa8knc0i"; - revision = "2"; - editedCabalFile = "195l3a41gw34kviqbsa4pg8h92y3gmhvq4x7znrm1h7zlqw2jbb0"; - libraryHaskellDepends = [ - array base base-compat bytestring case-insensitive containers - hashable old-time QuickCheck scientific splitmix tagged text these - time time-compat transformers transformers-compat - unordered-containers uuid-types vector - ]; - testHaskellDepends = [ - base containers QuickCheck tagged uuid-types - ]; - benchmarkHaskellDepends = [ base bytestring QuickCheck ]; - description = "Common quickcheck instances"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "quickcheck-instances_0_3_25_1" = callPackage ({ mkDerivation, array, base, bytestring, case-insensitive , containers, data-fix, hashable, integer-logarithms, old-time , QuickCheck, scientific, splitmix, strict, tagged, text, these @@ -210109,8 +210157,8 @@ self: { }: mkDerivation { pname = "quickcheck-instances"; - version = "0.3.25.1"; - sha256 = "06gg3y56ws1bc9yz00fmm0i5vrmqd2mqlxnbxp676yksfyr80qxd"; + version = "0.3.25.2"; + sha256 = "0ihqbarl2ddrfgq3mq09lswwn8213qpw13g49qxs5mjkcm6gbk3h"; libraryHaskellDepends = [ array base bytestring case-insensitive containers data-fix hashable integer-logarithms old-time QuickCheck scientific splitmix strict @@ -210123,7 +210171,6 @@ self: { benchmarkHaskellDepends = [ base bytestring QuickCheck ]; description = "Common quickcheck instances"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "quickcheck-io" = callPackage @@ -210364,14 +210411,16 @@ self: { }: mkDerivation { pname = "quickcheck-string-random"; - version = "0.1.3.0"; - sha256 = "0pyh2xa68d6jhca1lr5ymmxqs19m17hjxdlrplyl0pww65mfrj8d"; + version = "0.1.4.0"; + sha256 = "08ikiqgzhizg4acv9kba6glwa47xzpdzrpzcz95kcw7b90q9qqp9"; libraryHaskellDepends = [ base QuickCheck string-random text ]; testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck text ]; description = "Helper to build generators with Text.StringRandom"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "quickcheck-text" = callPackage @@ -210440,8 +210489,8 @@ self: { }: mkDerivation { pname = "quickjs-hs"; - version = "0.1.2.3"; - sha256 = "1azd2173hwij0z2qxn4k6fi7bkiyaar0q751z15byhbdzil7pf1d"; + version = "0.1.2.4"; + sha256 = "18b9yp87v94bcjy68jip2n31f5hajn0509p9z7yhgv8647pdvnx7"; libraryHaskellDepends = [ aeson base bytestring containers exceptions inline-c mtl scientific string-conv text time transformers unliftio-core @@ -211051,6 +211100,21 @@ self: { broken = true; }) {}; + "quote-quot" = callPackage + ({ mkDerivation, base, tasty, tasty-quickcheck, template-haskell }: + mkDerivation { + pname = "quote-quot"; + version = "0.1.0.0"; + sha256 = "124rgim8bb4x9rqsvc05dcbz739anj2xg8q9v9s0fpjkv6qwl79b"; + libraryHaskellDepends = [ base template-haskell ]; + testHaskellDepends = [ + base tasty tasty-quickcheck template-haskell + ]; + benchmarkHaskellDepends = [ base template-haskell ]; + description = "Divide without division"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "qux" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath , language-qux, llvm-general, mtl, optparse-applicative, pretty @@ -211072,20 +211136,22 @@ self: { }) {}; "r-glpk-phonetic-languages-ukrainian-durations" = callPackage - ({ mkDerivation, base, lists-flines, mmsyn2 - , ukrainian-phonetics-basic, vector + ({ mkDerivation, base, foldable-ix, lists-flines, mmsyn2-array + , ukrainian-phonetics-basic-array }: mkDerivation { pname = "r-glpk-phonetic-languages-ukrainian-durations"; - version = "0.2.2.0"; - sha256 = "1svwml88hfnpdgbnny8nzga9gxnmgjggnkks8gz9dplcf8w1w39d"; + version = "0.3.0.0"; + sha256 = "0x4i2qj1zq9r2641bwrx2x18c61ziddf8p10hfgz6hr449h6w5v3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base lists-flines mmsyn2 ukrainian-phonetics-basic vector + base foldable-ix lists-flines mmsyn2-array + ukrainian-phonetics-basic-array ]; executableHaskellDepends = [ - base lists-flines mmsyn2 ukrainian-phonetics-basic vector + base foldable-ix lists-flines mmsyn2-array + ukrainian-phonetics-basic-array ]; description = "Can be used to calculate the durations of the approximations of the Ukrainian phonemes"; license = stdenv.lib.licenses.mit; @@ -211727,8 +211793,8 @@ self: { pname = "random"; version = "1.2.0"; sha256 = "1pmr7zbbqg58kihhhwj8figf5jdchhi7ik2apsyxbgsqq3vrqlg4"; - revision = "3"; - editedCabalFile = "04hrdpc4h35dqbwyc4vfp2hw7wsr6b121f3rm8l94j11kli4108y"; + revision = "4"; + editedCabalFile = "08mq836ganl3sq6mfn3hrj6xm0h30klp21y7gbd9md2882agndrk"; libraryHaskellDepends = [ base bytestring deepseq mtl splitmix ]; testHaskellDepends = [ base bytestring containers doctest mwc-random primitive smallcheck @@ -212946,6 +213012,8 @@ self: { benchmarkHaskellDepends = [ base gauge mwc-random ]; description = "Randomized Binary Search Trees"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "rc" = callPackage @@ -213818,29 +213886,28 @@ self: { ({ mkDerivation, aeson, ansi-terminal, array, attoparsec, base , base64-bytestring, bytestring, cassava, cereal, colour , containers, cryptohash-sha256, cubicbezier, directory, filelock - , filepath, fingertree, 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-expected-failure, tasty-golden, tasty-hunit - , tasty-quickcheck, tasty-rerun, temporary, text, time - , unordered-containers, vector, vector-space, websockets, xml + , filepath, fingertree, fsnotify, geojson, hashable, hgeometry + , hgeometry-combinatorial, JuicyPixels, lens, linear, matrix, mtl + , neat-interpolation, network, open-browser, optparse-applicative + , parallel, process, QuickCheck, random, random-shuffle + , reanimate-svg, split, tasty, tasty-expected-failure, tasty-golden + , tasty-hunit, tasty-quickcheck, tasty-rerun, temporary, text, time + , unix, unordered-containers, vector, vector-space, websockets, xml }: mkDerivation { pname = "reanimate"; - version = "1.1.2.1"; - sha256 = "043jpim33pliymnks47i39hz36wp61rvwjyk9f0k89whsi74bkd6"; + version = "1.1.3.1"; + sha256 = "0x2pfbf712lixpj1mv1gvv26xi80shiq3798mkd0kqmvzkz57aqz"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson ansi-terminal array attoparsec base base64-bytestring bytestring cassava cereal colour containers cryptohash-sha256 cubicbezier directory filelock filepath fingertree fsnotify geojson - ghcid hashable hgeometry hgeometry-combinatorial JuicyPixels lens - linear matrix mtl neat-interpolation open-browser + hashable hgeometry hgeometry-combinatorial JuicyPixels lens linear + matrix mtl neat-interpolation network open-browser optparse-applicative parallel process random random-shuffle - reanimate-svg split temporary text time unordered-containers vector - vector-space websockets xml + reanimate-svg split temporary text time unix unordered-containers + vector vector-space websockets xml ]; testHaskellDepends = [ base bytestring directory filepath linear process QuickCheck tasty @@ -215312,6 +215379,33 @@ self: { broken = true; }) {}; + "reflex-gi-gtk" = callPackage + ({ mkDerivation, async, base, containers, dependent-sum + , exception-transformers, gi-gdk, gi-glib, gi-gtk, haskell-gi-base + , mtl, patch, primitive, ref-tf, reflex, semialign, stm, text + , these, witherable + }: + mkDerivation { + pname = "reflex-gi-gtk"; + version = "0.2.0.0"; + sha256 = "0dx9g5v5i0fhxn1kn6fsj8hpwnax8wq89drsv8q2fwk9pxd8i384"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + async base containers dependent-sum exception-transformers gi-gdk + gi-glib gi-gtk haskell-gi-base mtl primitive ref-tf reflex + semialign stm text these witherable + ]; + executableHaskellDepends = [ + base containers dependent-sum gi-gtk haskell-gi-base mtl patch + reflex text + ]; + description = "Helper functions to use reflex with gi-gtk"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "reflex-gloss" = callPackage ({ mkDerivation, base, dependent-sum, gloss, mtl, reflex , transformers @@ -217414,8 +217508,8 @@ self: { pname = "repa"; version = "3.4.1.4"; sha256 = "17m3wl4hvf04fxwm4fflhnv41yl9bm263hnbpxc8x6xqwifplq23"; - revision = "6"; - editedCabalFile = "09b2b98pqbjxp4xign29b67yn6za8lfxxqlv1j52sbvh5bbmbd7s"; + revision = "7"; + editedCabalFile = "0j0nqp6xvwis83h1hwm9910xjfxh13nddy61dlli0wdzzddpb8ah"; libraryHaskellDepends = [ base bytestring ghc-prim QuickCheck template-haskell vector ]; @@ -217757,6 +217851,22 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "replace-attoparsec_1_4_4_0" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, Cabal, parsers, text + }: + mkDerivation { + pname = "replace-attoparsec"; + version = "1.4.4.0"; + sha256 = "06js4adbzvm2qn18vlaaxhav2dq1hqp825lmsvpg69cylp72fzif"; + libraryHaskellDepends = [ attoparsec base bytestring text ]; + testHaskellDepends = [ + attoparsec base bytestring Cabal parsers text + ]; + description = "Find, replace, and split string patterns with Attoparsec parsers (instead of regex)"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "replace-megaparsec" = callPackage ({ mkDerivation, base, bytestring, Cabal, megaparsec , parser-combinators, text @@ -217992,6 +218102,8 @@ self: { pname = "req"; version = "3.8.0"; sha256 = "1qd0bawdxig6sldlhqgj8cpkzfy7da9yy0wkvzs6mps6yk14kbap"; + revision = "1"; + editedCabalFile = "1gkd25bg87r0dr8rb04r3scjfm66v88905490fiy4x1826gj9cv0"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson authenticate-oauth base blaze-builder bytestring @@ -218019,8 +218131,8 @@ self: { pname = "req-conduit"; version = "1.0.0"; sha256 = "193bv4jp7rrbpb1i9as9s2l978wz5kbz5kvr7ppllif5ppj699qx"; - revision = "7"; - editedCabalFile = "08ynq0760hd2v1pmbfmc2n71vjr33qmv1cgnklbqn2ibzbg3mmx2"; + revision = "8"; + editedCabalFile = "1md7zajmw87qrx6rvs35yrkbjs3s9nm0akg35jmf7a34xccrr7a7"; libraryHaskellDepends = [ base bytestring conduit http-client req resourcet transformers ]; @@ -219447,8 +219559,8 @@ self: { }: mkDerivation { pname = "rhbzquery"; - version = "0.4.1"; - sha256 = "0zfn9bzgm3wb2apnnnakh0lmys0nf9a2ch797m1sfsrbx2mjqvmh"; + version = "0.4.2"; + sha256 = "1j9nxizi1wsgz5gamdn9izy4aq6ci41gbkvsw7bbpc8fnvv5gpd2"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -220593,6 +220705,8 @@ self: { ]; description = "RocksDB database querying library for Haskell"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "roguestar" = callPackage @@ -221029,6 +221143,20 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "rose" = callPackage + ({ mkDerivation, base, comonad, free, indexed-traversable + , QuickCheck, quickcheck-classes + }: + mkDerivation { + pname = "rose"; + version = "0.1"; + sha256 = "1nmprllcihxif0m7p484afrmcabxhc2v5z5g3j3j658z6mbn1b2g"; + libraryHaskellDepends = [ base comonad free indexed-traversable ]; + testHaskellDepends = [ base QuickCheck quickcheck-classes ]; + description = "rose trees"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "rose-trees" = callPackage ({ mkDerivation, base, containers, criterion, deepseq, hashable , mtl, QuickCheck, quickcheck-instances, semigroupoids, semigroups @@ -221089,6 +221217,8 @@ self: { testToolDepends = [ hspec-discover ]; description = "Common rose tree/forest functions"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "rosezipper" = callPackage @@ -221277,28 +221407,29 @@ self: { }) {inherit (pkgs) gmp; inherit (pkgs) mpfr;}; "rounded-hw" = callPackage - ({ mkDerivation, array, base, Cabal, deepseq, doctest, gauge, hspec - , integer-logarithms, long-double, primitive, QuickCheck, random - , tagged, vector + ({ mkDerivation, array, base, Cabal, deepseq, doctest, fp-ieee + , gauge, hspec, long-double, primitive, QuickCheck, random, tagged + , vector }: mkDerivation { pname = "rounded-hw"; - version = "0.1.0.0"; - sha256 = "0kmbp7x7avadsn09zfcjd54x5b6vvc527ybmmmnaklvfdzf8r88x"; + version = "0.2.0"; + sha256 = "01393ps7i83ncxlj9yi6jhngr26py6sdafq67mbhigrclyax6ysi"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ - array base deepseq integer-logarithms long-double primitive tagged - vector + array base deepseq fp-ieee long-double primitive tagged vector ]; testHaskellDepends = [ - array base deepseq doctest hspec integer-logarithms long-double - primitive QuickCheck random vector + array base deepseq doctest fp-ieee hspec long-double primitive + QuickCheck random vector ]; benchmarkHaskellDepends = [ - array base deepseq gauge integer-logarithms primitive vector + array base deepseq fp-ieee gauge primitive vector ]; description = "Directed rounding for built-in floating types"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "rounding" = callPackage @@ -222180,6 +222311,8 @@ self: { benchmarkHaskellDepends = [ base criterion ]; description = "RISC-V"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "rvar" = callPackage @@ -222460,30 +222593,6 @@ self: { }) {}; "safe-json" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, dlist - , generic-arbitrary, hashable, quickcheck-instances, scientific - , tasty, tasty-hunit, tasty-quickcheck, temporary, text, time - , unordered-containers, uuid, uuid-types, vector - }: - mkDerivation { - pname = "safe-json"; - version = "1.1.1"; - sha256 = "1307fm7kmls0sd2gb5zcl75rcxxy550ksaf145s54c06qjcihhjg"; - libraryHaskellDepends = [ - aeson base bytestring containers dlist hashable scientific tasty - tasty-hunit tasty-quickcheck text time unordered-containers - uuid-types vector - ]; - testHaskellDepends = [ - aeson base bytestring containers dlist generic-arbitrary hashable - quickcheck-instances scientific tasty tasty-hunit tasty-quickcheck - temporary text time unordered-containers uuid uuid-types vector - ]; - description = "Automatic JSON format versioning"; - license = stdenv.lib.licenses.mit; - }) {}; - - "safe-json_1_1_1_1" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, dlist , generic-arbitrary, hashable, quickcheck-instances, scientific , tasty, tasty-hunit, tasty-quickcheck, temporary, text, time @@ -222505,7 +222614,6 @@ self: { ]; description = "Automatic JSON format versioning"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "safe-lazy-io" = callPackage @@ -225139,6 +225247,8 @@ self: { ]; description = "Core Package for scrapbook"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "scrape-changes" = callPackage @@ -226429,24 +226539,20 @@ self: { }) {}; "semigroupoids" = callPackage - ({ mkDerivation, base, base-orphans, bifunctors, Cabal - , cabal-doctest, comonad, containers, contravariant, distributive - , doctest, hashable, tagged, template-haskell, transformers - , transformers-compat, unordered-containers + ({ mkDerivation, base, base-orphans, bifunctors, comonad + , containers, contravariant, distributive, hashable, tagged + , template-haskell, transformers, transformers-compat + , unordered-containers }: mkDerivation { pname = "semigroupoids"; - version = "5.3.4"; - sha256 = "0r49qpbi803jk3v4i09jr1a98l6hcgnjhrv1a9fhmay3ff4y9lh0"; - revision = "2"; - editedCabalFile = "1fij6yynvwssklr5bklrmd3w6j6nj1p36rn78lkwjkh8m3gp620j"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; + version = "5.3.5"; + sha256 = "1c66sc9w9724xhlly9wfjhghmnnw99z9al69264i2izk7vhihbsm"; libraryHaskellDepends = [ base base-orphans bifunctors comonad containers contravariant distributive hashable tagged template-haskell transformers transformers-compat unordered-containers ]; - testHaskellDepends = [ base doctest ]; description = "Semigroupoids: Category sans id"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -226584,6 +226690,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "semirings_0_6" = callPackage + ({ mkDerivation, base, base-compat-batteries, containers, hashable + , unordered-containers + }: + mkDerivation { + pname = "semirings"; + version = "0.6"; + sha256 = "16q535bvjl7395sqkx6zlw48y4fzr7irp44pcp7w9irpn4cncdcr"; + libraryHaskellDepends = [ + base base-compat-batteries containers hashable unordered-containers + ]; + description = "two monoids as one, in holy haskimony"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "semver" = callPackage ({ mkDerivation, attoparsec, base, criterion, deepseq, hashable , tasty, tasty-hunit, text @@ -226650,15 +226772,19 @@ self: { }) {}; "sendgrid-v3" = callPackage - ({ mkDerivation, aeson, base, lens, semigroups, tasty, tasty-hunit - , text, wreq + ({ mkDerivation, aeson, base, bytestring, http-client, lens + , semigroups, tasty, tasty-hunit, text, wreq }: mkDerivation { pname = "sendgrid-v3"; - version = "0.1.2.0"; - sha256 = "06j07c86560f4w4vpx6gbnmrbyhs9i69jksliifsd9a9flg93vx3"; - libraryHaskellDepends = [ aeson base lens semigroups text wreq ]; - testHaskellDepends = [ base semigroups tasty tasty-hunit text ]; + version = "0.3.0.0"; + sha256 = "0b1m2r0zq3f3ggy9nds42rf0w25p08mkcs9crvckmvqjhmwik1cm"; + libraryHaskellDepends = [ + aeson base bytestring http-client lens semigroups text wreq + ]; + testHaskellDepends = [ + base lens semigroups tasty tasty-hunit text wreq + ]; description = "Sendgrid v3 API library"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -227483,6 +227609,8 @@ self: { testToolDepends = [ hspec-discover ]; description = "servant-docs/servant-auth compatibility"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-auth-hmac" = callPackage @@ -227795,6 +227923,8 @@ self: { ]; description = "Checked exceptions for Servant APIs"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-checked-exceptions-core" = callPackage @@ -227816,6 +227946,8 @@ self: { testHaskellDepends = [ base doctest Glob ]; description = "Checked exceptions for Servant APIs"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-cli" = callPackage @@ -228074,6 +228206,8 @@ self: { ]; description = "generate API docs for your servant webservice"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-docs-simple" = callPackage @@ -228465,6 +228599,8 @@ self: { testToolDepends = [ hspec-discover markdown-unlit ]; description = "Automatic derivation of querying functions for servant"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-http2-client" = callPackage @@ -228754,6 +228890,8 @@ self: { ]; description = "multipart/form-data (e.g file upload) support for servant"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-named" = callPackage @@ -229136,6 +229274,8 @@ self: { ]; description = "Documentation generator for 'RawM' endpoints"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-rawm-server" = callPackage @@ -230397,6 +230537,8 @@ self: { executableToolDepends = [ alex happy ]; description = "Treating files as sets to perform rapid set manipulation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "setenv" = callPackage @@ -232665,6 +232807,8 @@ self: { ]; description = "Arithmetic over signs and sets of signs"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "signable" = callPackage @@ -232985,19 +233129,6 @@ self: { }) {}; "simple-cmd" = callPackage - ({ mkDerivation, base, directory, extra, filepath, process, unix }: - mkDerivation { - pname = "simple-cmd"; - version = "0.2.2"; - sha256 = "0pf9nfh8xcz0y9l9w7hj305r8gqdaz6hmrjkd7h3yb7ql7j6538w"; - libraryHaskellDepends = [ - base directory extra filepath process unix - ]; - description = "Simple String-based process commands"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "simple-cmd_0_2_3" = callPackage ({ mkDerivation, base, directory, extra, filepath, process, unix }: mkDerivation { pname = "simple-cmd"; @@ -233008,7 +233139,6 @@ self: { ]; description = "Simple String-based process commands"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "simple-cmd-args" = callPackage @@ -234724,28 +234854,6 @@ self: { }) {}; "skylighting" = callPackage - ({ mkDerivation, base, binary, blaze-html, bytestring, containers - , directory, filepath, pretty-show, skylighting-core, text - }: - mkDerivation { - pname = "skylighting"; - version = "0.10.1"; - sha256 = "0zpf6p3c0byp3pv9bgg77ndq89n3fhcazyln44pq8lxnmjy0x15v"; - configureFlags = [ "-fexecutable" ]; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base binary bytestring containers skylighting-core - ]; - executableHaskellDepends = [ - base blaze-html bytestring containers directory filepath - pretty-show text - ]; - description = "syntax highlighting library"; - license = stdenv.lib.licenses.gpl2; - }) {}; - - "skylighting_0_10_2" = callPackage ({ mkDerivation, base, binary, blaze-html, bytestring, containers , directory, filepath, pretty-show, skylighting-core, text }: @@ -234765,41 +234873,9 @@ self: { ]; description = "syntax highlighting library"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "skylighting-core" = callPackage - ({ mkDerivation, aeson, ansi-terminal, attoparsec, base - , base64-bytestring, binary, blaze-html, bytestring - , case-insensitive, colour, containers, criterion, Diff, directory - , filepath, HUnit, hxt, mtl, pretty-show, QuickCheck, random, safe - , tasty, tasty-golden, tasty-hunit, tasty-quickcheck, text - , transformers, utf8-string - }: - mkDerivation { - pname = "skylighting-core"; - version = "0.10.1"; - sha256 = "10da31x6zj1b3kydr63g36zmmqpqmgcbwdalhxvbmxliw1m5kfvx"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson ansi-terminal attoparsec base base64-bytestring binary - blaze-html bytestring case-insensitive colour containers directory - filepath hxt mtl safe text transformers utf8-string - ]; - testHaskellDepends = [ - aeson base bytestring containers Diff directory filepath HUnit - pretty-show QuickCheck random tasty tasty-golden tasty-hunit - tasty-quickcheck text utf8-string - ]; - benchmarkHaskellDepends = [ - base containers criterion directory filepath text - ]; - description = "syntax highlighting library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "skylighting-core_0_10_2" = callPackage ({ mkDerivation, aeson, ansi-terminal, attoparsec, base , base64-bytestring, binary, blaze-html, bytestring , case-insensitive, colour, containers, criterion, Diff, directory @@ -234828,7 +234904,6 @@ self: { ]; description = "syntax highlighting library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "skylighting-extensions" = callPackage @@ -235344,28 +235419,6 @@ self: { }) {}; "slynx" = callPackage - ({ mkDerivation, async, attoparsec, base, bytestring, containers - , elynx-markov, elynx-seq, elynx-tools, elynx-tree, hmatrix - , monad-logger, mwc-random, optparse-applicative, statistics, text - , transformers, vector - }: - mkDerivation { - pname = "slynx"; - version = "0.5.0"; - sha256 = "0n1d90bmqbiw3w5abncqlk39vca59hd5zkk02q5ickf97zfqik00"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - async attoparsec base bytestring containers elynx-markov elynx-seq - elynx-tools elynx-tree hmatrix monad-logger mwc-random - optparse-applicative statistics text transformers vector - ]; - executableHaskellDepends = [ base ]; - description = "Handle molecular sequences"; - license = stdenv.lib.licenses.gpl3Plus; - }) {}; - - "slynx_0_5_0_1" = callPackage ({ mkDerivation, async, attoparsec, base, bytestring, containers , elynx-markov, elynx-seq, elynx-tools, elynx-tree, hmatrix , monad-logger, mwc-random, optparse-applicative, statistics, text @@ -235386,6 +235439,7 @@ self: { description = "Handle molecular sequences"; license = stdenv.lib.licenses.gpl3Plus; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "small-bytearray-builder" = callPackage @@ -237136,6 +237190,8 @@ self: { ]; description = "persistent snaplet for the Snap Framework"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "snaplet-postgresql-simple" = callPackage @@ -238450,26 +238506,19 @@ self: { }) {}; "souffle-haskell" = callPackage - ({ mkDerivation, array, base, containers, deepseq, directory, extra - , filepath, hedgehog, hspec, hspec-hedgehog, megaparsec, mtl + ({ mkDerivation, array, base, containers, deepseq, directory + , filepath, hedgehog, hspec, hspec-hedgehog, mtl , neat-interpolation, process, template-haskell, temporary, text , type-errors-pretty, vector }: mkDerivation { pname = "souffle-haskell"; - version = "2.0.1"; - sha256 = "1imnmgx2wpxx2g51ajcsvnrpwvw97wmind9wzfirfx4l7zr3cp7d"; - isLibrary = true; - isExecutable = true; + version = "2.1.0"; + sha256 = "1szkv27my46xgwqanhb6wkgncll08yznpl0p2m1wq5cifxir2m7h"; libraryHaskellDepends = [ 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 - mtl process template-haskell temporary text type-errors-pretty - vector - ]; testHaskellDepends = [ array base containers deepseq directory filepath hedgehog hspec hspec-hedgehog mtl neat-interpolation process template-haskell @@ -239713,29 +239762,6 @@ self: { }) {}; "splitmix" = callPackage - ({ mkDerivation, async, base, base-compat, base-compat-batteries - , bytestring, clock, containers, criterion, deepseq, HUnit - , math-functions, process, random, test-framework - , test-framework-hunit, tf-random, time, vector - }: - mkDerivation { - pname = "splitmix"; - version = "0.0.5"; - sha256 = "0lndnirkxc87c7hwlrjbnk5m4clcb0wncxvicdjkbj87lxxriwhr"; - libraryHaskellDepends = [ base deepseq random time ]; - testHaskellDepends = [ - async base base-compat base-compat-batteries bytestring containers - deepseq HUnit math-functions process random test-framework - test-framework-hunit tf-random vector - ]; - benchmarkHaskellDepends = [ - base clock containers criterion random tf-random - ]; - description = "Fast Splittable PRNG"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "splitmix_0_1_0_3" = callPackage ({ mkDerivation, async, base, base-compat, base-compat-batteries , bytestring, clock, containers, criterion, deepseq, HUnit , math-functions, process, random, test-framework @@ -239756,7 +239782,6 @@ self: { ]; description = "Fast Splittable PRNG"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "splitter" = callPackage @@ -240257,6 +240282,8 @@ self: { testHaskellDepends = [ base mtl sqlite-simple text ]; description = "Wrapper around errors from sqlite-simple"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "sqlite-simple-typed" = callPackage @@ -240371,12 +240398,18 @@ self: { }) {}; "squeather" = callPackage - ({ mkDerivation, base, bytestring, text }: + ({ mkDerivation, base, bytestring, directory, filepath, hedgehog + , lifted-base, temporary, text + }: mkDerivation { pname = "squeather"; - version = "0.4.0.0"; - sha256 = "1i7qjvayi71b5rqrcxhl2c5idpf1gdbcxx7h082l0rwpf0qlg4f4"; + version = "0.6.0.0"; + sha256 = "05cs67xcvfq0497kddmvzrccf7ihav87mv4hmi8kgl2jp8hqmk7p"; libraryHaskellDepends = [ base bytestring text ]; + testHaskellDepends = [ + base bytestring directory filepath hedgehog lifted-base temporary + text + ]; description = "Use databases with the version 3 series of the SQLite C library"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -240815,8 +240848,8 @@ self: { pname = "stache"; version = "2.2.0"; sha256 = "09cfj8hs2249gqf0nrlv9b8vg8gmxabs7ndxasphxdd0rb1y3z3g"; - revision = "2"; - editedCabalFile = "1p435wl5c50wjz5s07p102dlyg3pby7n918gp4za0crgb8fi99xh"; + revision = "3"; + editedCabalFile = "1wjdn7qsrfnz2cqwx2pggi8ak3pj01zsmax14gvb8xsq4w9crdvx"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -240983,8 +241016,8 @@ self: { }: mkDerivation { pname = "stack-clean-old"; - version = "0.2.1"; - sha256 = "0wal5jhm78di54gwwmbmbpp76n7fkna82kg2p3ldzi0r2q53m44h"; + version = "0.3"; + sha256 = "1nszwagwsc6n02smqg70c79a21q9bwamlk4nqqbgzp009jfv0b7c"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -241272,6 +241305,8 @@ self: { ]; description = "Convert stack projects to cabal.project + cabal.project.freeze"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "stack2nix" = callPackage @@ -243233,8 +243268,8 @@ self: { }: mkDerivation { pname = "stomp-conduit"; - version = "0.1.0"; - sha256 = "1qzr5fkffs96clxkvm7lf7kfafijv8fsri6k0j85wrarx3qdgapa"; + version = "0.5.0"; + sha256 = "1mxfidkqqxswnbj2i4hjcbwppfpvl4a3x3jaki1swmw1qxhcqsk9"; libraryHaskellDepends = [ base conduit mime mtl resourcet stomp-queue stompl ]; @@ -243248,8 +243283,8 @@ self: { }: mkDerivation { pname = "stomp-patterns"; - version = "0.1.0"; - sha256 = "0rdk9h7blj7j5kiwy7zq2kb4wxxs19xk3lg73c0srrvbclb0qgbw"; + version = "0.5.0"; + sha256 = "118r2v66nl3l5rh4sgb1kp886l63a266yiq4dr3m1c0wy4c2si97"; libraryHaskellDepends = [ base bytestring containers mime mtl split stomp-queue stompl time ]; @@ -243259,16 +243294,16 @@ self: { "stomp-queue" = callPackage ({ mkDerivation, attoparsec, base, bytestring, conduit - , conduit-extra, mime, mtl, network-conduit-tls, split, stompl - , time, utf8-string + , conduit-extra, mime, mtl, network-conduit-tls, resourcet, split + , stompl, time, utf8-string }: mkDerivation { pname = "stomp-queue"; - version = "0.3.1"; - sha256 = "1fr01drv00fyxvgc3kh1hj5cjrnnkj4gydzscvpali155wrpzpa7"; + version = "0.5.1"; + sha256 = "1hg9y90zw6blr54dq78cb111lxga6pfsy4llsn6hqqyyzsd5358l"; libraryHaskellDepends = [ attoparsec base bytestring conduit conduit-extra mime mtl - network-conduit-tls split stompl time utf8-string + network-conduit-tls resourcet split stompl time utf8-string ]; description = "Stompl Client Library"; license = "LGPL"; @@ -243280,8 +243315,8 @@ self: { }: mkDerivation { pname = "stompl"; - version = "0.5.0"; - sha256 = "0n2ikasyj91099wmcszq0wadvria3ib1h9dah4yzd89z1hcqqlxh"; + version = "0.6.0"; + sha256 = "07h5y6gw5zrypmm6s1p7yy3k309hph8jy3yf7mr4zb9dwzgcrl71"; libraryHaskellDepends = [ attoparsec base bytestring mime split text utf8-string word8 ]; @@ -243442,54 +243477,6 @@ self: { }) {}; "store" = callPackage - ({ mkDerivation, array, async, base, base-orphans - , base64-bytestring, bifunctors, bytestring, cereal, cereal-vector - , clock, containers, contravariant, criterion, cryptohash, deepseq - , directory, filepath, free, ghc-prim, hashable, hspec - , hspec-smallcheck, integer-gmp, lifted-base, monad-control - , mono-traversable, network, primitive, resourcet, safe, smallcheck - , store-core, syb, template-haskell, text, th-lift - , th-lift-instances, th-orphans, th-reify-many, th-utilities, time - , transformers, unordered-containers, vector - , vector-binary-instances, void, weigh - }: - mkDerivation { - pname = "store"; - version = "0.7.8"; - sha256 = "0z312r0gwz0mzkpqal5vbcz5drdfwrnjnxfwfc594q2x7s8idiz3"; - libraryHaskellDepends = [ - array async base base-orphans base64-bytestring bifunctors - bytestring containers contravariant cryptohash deepseq directory - filepath free ghc-prim hashable hspec hspec-smallcheck integer-gmp - lifted-base monad-control mono-traversable network primitive - resourcet safe smallcheck store-core syb template-haskell text - th-lift th-lift-instances th-orphans th-reify-many th-utilities - time transformers unordered-containers vector void - ]; - testHaskellDepends = [ - array async base base-orphans base64-bytestring bifunctors - bytestring clock containers contravariant cryptohash deepseq - directory filepath free ghc-prim hashable hspec hspec-smallcheck - integer-gmp lifted-base monad-control mono-traversable network - primitive resourcet safe smallcheck store-core syb template-haskell - text th-lift th-lift-instances th-orphans th-reify-many - th-utilities time transformers unordered-containers vector void - ]; - benchmarkHaskellDepends = [ - array async base base-orphans base64-bytestring bifunctors - bytestring cereal cereal-vector containers contravariant criterion - cryptohash deepseq directory filepath free ghc-prim hashable hspec - hspec-smallcheck integer-gmp lifted-base monad-control - mono-traversable network primitive resourcet safe smallcheck - store-core syb template-haskell text th-lift th-lift-instances - th-orphans th-reify-many th-utilities time transformers - unordered-containers vector vector-binary-instances void weigh - ]; - description = "Fast binary serialization"; - license = stdenv.lib.licenses.mit; - }) {}; - - "store_0_7_9" = callPackage ({ mkDerivation, array, async, base, base-orphans , base64-bytestring, bifunctors, bytestring, cereal, cereal-vector , clock, containers, contravariant, criterion, cryptohash, deepseq @@ -243535,7 +243522,6 @@ self: { ]; description = "Fast binary serialization"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "store-core" = callPackage @@ -244515,6 +244501,8 @@ self: { testSystemDepends = [ lmdb ]; description = "Stream data to or from LMDB databases using the streamly library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) lmdb;}; "streamly-posix" = callPackage @@ -245058,6 +245046,33 @@ self: { ]; description = "A library for generating random string from a regular experession"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "string-random_0_1_4_0" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, containers + , optparse-applicative, pcre-heavy, QuickCheck, random, tasty + , tasty-hunit, tasty-quickcheck, text, transformers + }: + mkDerivation { + pname = "string-random"; + version = "0.1.4.0"; + sha256 = "09xv1jbhsz8hfxc6y54fj4pkhyxfbfh53i6kxy408zm3raa2nmii"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + attoparsec base containers random text transformers + ]; + executableHaskellDepends = [ base optparse-applicative text ]; + testHaskellDepends = [ + base bytestring pcre-heavy QuickCheck tasty tasty-hunit + tasty-quickcheck text + ]; + description = "A library for generating random string from a regular experession"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "string-similarity" = callPackage @@ -245290,25 +245305,30 @@ self: { }) {}; "stripe-hs" = callPackage - ({ mkDerivation, aeson, base, bytestring, casing, cpphs, cryptonite - , hspec, http-client, http-client-tls, memory, safe, servant - , servant-client, stripe-servant, text, time, vector + ({ mkDerivation, aeson, base, bytestring, casing, containers, cpphs + , cryptonite, hspec, http-client, http-client-tls, http-types + , memory, safe, servant, servant-client, servant-client-core + , stripe-servant, text, time, timespan, vector }: mkDerivation { pname = "stripe-hs"; - version = "0.1.0.0"; - sha256 = "1zfs0cwcylzv8ski3chprn5f85cfgjsdclngzmabwqww0ijrl806"; + version = "0.2.1.0"; + sha256 = "1f8snldj183yz20f50kkwg6kqcr5zigp3n9k32hxa6dah8xvvnh1"; libraryHaskellDepends = [ - aeson base bytestring casing cpphs cryptonite http-client memory - safe servant servant-client stripe-servant text time + aeson base bytestring casing cpphs cryptonite http-client + http-types memory safe servant servant-client stripe-servant text + time ]; testHaskellDepends = [ - aeson base bytestring casing cpphs cryptonite hspec http-client - http-client-tls memory safe servant servant-client stripe-servant - text time vector + aeson base bytestring casing containers cpphs cryptonite hspec + http-client http-client-tls http-types memory safe servant + servant-client servant-client-core stripe-servant text time + timespan vector ]; description = "Unofficial Stripe client"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "stripe-http-client" = callPackage @@ -245376,8 +245396,8 @@ self: { }: mkDerivation { pname = "stripe-servant"; - version = "0.1.0.0"; - sha256 = "05l07x8k0dd81yxq1m0j7h7kvpplr3f69yxl1f9sx9z9cdqjxspa"; + version = "0.2.1.0"; + sha256 = "0vvzf4wh2d9bv5af2al2hdgvy5ds7v7p8w14l018cn3f3iynwh3f"; libraryHaskellDepends = [ aeson base casing http-api-data servant text time unordered-containers vector @@ -245877,19 +245897,20 @@ self: { "stylist" = callPackage ({ mkDerivation, async, base, css-syntax, hashable, hspec - , network-uri, QuickCheck, scientific, text, unordered-containers + , network-uri, QuickCheck, regex-tdfa, scientific, text + , unordered-containers }: mkDerivation { pname = "stylist"; - version = "2.3.0.0"; - sha256 = "04nxhsv4v6qlr19fw29jf925b7qhp5777mn0q55sm0jhn7r4v6lv"; + version = "2.4.0.0"; + sha256 = "0nkz6jnfx7si473lz0b907lq6zjpw2apbcph61s2aw44j5zgdg96"; libraryHaskellDepends = [ - async base css-syntax hashable network-uri text + async base css-syntax hashable network-uri regex-tdfa text unordered-containers ]; testHaskellDepends = [ async base css-syntax hashable hspec network-uri QuickCheck - scientific text unordered-containers + regex-tdfa scientific text unordered-containers ]; description = "Apply CSS styles to a document tree"; license = stdenv.lib.licenses.mit; @@ -247024,6 +247045,31 @@ self: { broken = true; }) {inherit (pkgs) librsvg;}; + "svgone" = callPackage + ({ mkDerivation, base, bytestring, containers, directory, extra + , filepath, generic-lens, lens, linear, mtl, pretty-simple, process + , reanimate-svg, safe, text + }: + mkDerivation { + pname = "svgone"; + version = "0.2.0.0"; + sha256 = "1r176z555amzfj1jxpgc6n495rp60v829d5raab8nddj5rhr5p35"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring containers directory extra filepath generic-lens + lens linear mtl pretty-simple process reanimate-svg safe text + ]; + executableHaskellDepends = [ + base bytestring containers directory extra filepath generic-lens + lens linear mtl pretty-simple process reanimate-svg safe text + ]; + description = "Optimise SVGs"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "svgutils" = callPackage ({ mkDerivation, base, filepath, xml }: mkDerivation { @@ -247444,6 +247490,32 @@ self: { broken = true; }) {}; + "sydtest" = callPackage + ({ mkDerivation, async, base, bytestring, containers, Diff, dlist + , envparse, MonadRandom, mtl, optparse-applicative, path, path-io + , pretty-show, QuickCheck, quickcheck-io, rainbow, random-shuffle + , safe, split, stm, sydtest-discover, text, yaml + , yamlparse-applicative + }: + mkDerivation { + pname = "sydtest"; + version = "0.0.0.0"; + sha256 = "0ii5fmhksfhl7a6a8bkqih4y20q8964879x3fb5nzv6dah5qq7x5"; + libraryHaskellDepends = [ + async base bytestring containers Diff dlist envparse MonadRandom + mtl optparse-applicative path path-io pretty-show QuickCheck + quickcheck-io rainbow random-shuffle safe split text yaml + yamlparse-applicative + ]; + testHaskellDepends = [ + base bytestring path path-io QuickCheck rainbow stm text + ]; + testToolDepends = [ sydtest-discover ]; + description = "An advanced modern testing framework for Haskell with good defaults and advanced testing features"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {sydtest-discover = null;}; + "syfco" = callPackage ({ mkDerivation, array, base, containers, convertible, directory , mtl, parsec, transformers @@ -247784,6 +247856,31 @@ self: { broken = true; }) {}; + "symantic-parser" = callPackage + ({ mkDerivation, array, base, bytestring, containers, deepseq + , directory, filepath, ghc-prim, hashable, process, strict, tasty + , tasty-golden, template-haskell, text, transformers, unix + , unordered-containers + }: + mkDerivation { + pname = "symantic-parser"; + version = "0.0.0.20210102"; + sha256 = "00gmcbn1amdr9nx54wia898gc7437563g9gpvlkhsg9r7197acid"; + libraryHaskellDepends = [ + array base bytestring containers ghc-prim hashable template-haskell + text transformers unordered-containers + ]; + testHaskellDepends = [ + base bytestring containers deepseq directory filepath hashable + process strict tasty tasty-golden template-haskell text + transformers unix unordered-containers + ]; + description = "Parser combinators statically optimized and staged via typed meta-programming"; + license = stdenv.lib.licenses.gpl3Plus; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "symantic-xml" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, hashable , hxt-charproperties, megaparsec, symantic-base, tasty @@ -249020,6 +249117,8 @@ self: { ]; description = "Format tabular data as grid or table"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "table-tennis" = callPackage @@ -249269,10 +249368,8 @@ self: { ({ mkDerivation, base, deepseq, template-haskell, transformers }: mkDerivation { pname = "tagged"; - version = "0.8.6"; - sha256 = "1pciqzxf9ncv954v4r527xkxkn7r5hcr13mfw5dg1xjci3qdw5md"; - revision = "3"; - editedCabalFile = "1wv9ngbj3pvs6v52dj0bli9h5vanyw3akpsmfmwsvnnian9hpkkw"; + version = "0.8.6.1"; + sha256 = "00kcc6lmj7v3xm2r3wzw5jja27m4alcw1wi8yiismd0bbzwzrq7m"; libraryHaskellDepends = [ base deepseq template-haskell transformers ]; @@ -250253,15 +250350,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "tasty_1_4_0_1" = callPackage + "tasty_1_4_0_2" = callPackage ({ mkDerivation, ansi-terminal, base, clock, containers, mtl , optparse-applicative, stm, tagged, unbounded-delays, unix , wcwidth }: mkDerivation { pname = "tasty"; - version = "1.4.0.1"; - sha256 = "1ffq2gpasdqm2drhd2aglcq33yrpb1h3grfyqyc34amz65bfczqq"; + version = "1.4.0.2"; + sha256 = "143ybyjgqin1jzd597wxgr66rambhnk93gk7knjs2f8j23vrr7n0"; libraryHaskellDepends = [ ansi-terminal base clock containers mtl optparse-applicative stm tagged unbounded-delays unix wcwidth @@ -250341,8 +250438,8 @@ self: { ({ mkDerivation, base, dejafu, random, tagged, tasty }: mkDerivation { pname = "tasty-dejafu"; - version = "2.0.0.6"; - sha256 = "0iw7yqb52cxw3fgp9did73wk41c1jxvdxx4vg0rna32bc0d7rwyh"; + version = "2.0.0.7"; + sha256 = "0jzaqra7gsrvy33j1g6bnrwg7x5pyg5p50l5mgvpz71kd946725l"; libraryHaskellDepends = [ base dejafu random tagged tasty ]; description = "Deja Fu support for the Tasty test framework"; license = stdenv.lib.licenses.mit; @@ -250387,14 +250484,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "tasty-expected-failure_0_12_1" = callPackage + "tasty-expected-failure_0_12_2" = callPackage ({ mkDerivation, base, hedgehog, tagged, tasty, tasty-golden , tasty-hedgehog, tasty-hunit, unbounded-delays }: mkDerivation { pname = "tasty-expected-failure"; - version = "0.12.1"; - sha256 = "1r4xljml8w55q6qpjj94ig2yic398624fld3dwjfcbaldgbacpmm"; + version = "0.12.2"; + sha256 = "0i97y723vi2f5z94ripli8jfzqk540w80cfab3prylbm9j3s7rb7"; libraryHaskellDepends = [ base tagged tasty unbounded-delays ]; testHaskellDepends = [ base hedgehog tasty tasty-golden tasty-hedgehog tasty-hunit @@ -250422,6 +250519,22 @@ self: { broken = true; }) {}; + "tasty-focus" = callPackage + ({ mkDerivation, base, tagged, tasty, tasty-expected-failure + , tasty-hunit + }: + mkDerivation { + pname = "tasty-focus"; + version = "1.0.1"; + sha256 = "0i6syd1mb1mrf2ys0f4nx3j9xvkb73rwv627b8hr5xkipwp4pjm2"; + libraryHaskellDepends = [ base tagged tasty ]; + testHaskellDepends = [ + base tasty tasty-expected-failure tasty-hunit + ]; + description = "Simple focus mechanism for tasty"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "tasty-golden" = callPackage ({ mkDerivation, async, base, bytestring, containers, deepseq , directory, filepath, mtl, optparse-applicative, process, tagged @@ -250565,17 +250678,6 @@ self: { }) {}; "tasty-hunit" = callPackage - ({ mkDerivation, base, call-stack, tasty }: - mkDerivation { - pname = "tasty-hunit"; - version = "0.10.0.2"; - sha256 = "1xvf5xs0r8xqkcg354klz4wyzwyzvinalyl6f4fnxwqmzrgch8s8"; - libraryHaskellDepends = [ base call-stack tasty ]; - description = "HUnit support for the Tasty test framework"; - license = stdenv.lib.licenses.mit; - }) {}; - - "tasty-hunit_0_10_0_3" = callPackage ({ mkDerivation, base, call-stack, tasty }: mkDerivation { pname = "tasty-hunit"; @@ -250584,7 +250686,6 @@ self: { libraryHaskellDepends = [ base call-stack tasty ]; description = "HUnit support for the Tasty test framework"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tasty-hunit-adapter" = callPackage @@ -250599,17 +250700,6 @@ self: { }) {}; "tasty-hunit-compat" = callPackage - ({ mkDerivation, base, HUnit, tasty, tasty-hunit }: - mkDerivation { - pname = "tasty-hunit-compat"; - version = "0.2"; - sha256 = "0ds1j1qra45n7d6frrf5zw5ps3haa1610d99ha09nhc9l8wm4ivp"; - libraryHaskellDepends = [ base HUnit tasty tasty-hunit ]; - description = "Tasty integration with the existing HUnit package"; - license = stdenv.lib.licenses.mpl20; - }) {}; - - "tasty-hunit-compat_0_2_0_1" = callPackage ({ mkDerivation, base, HUnit, tasty, tasty-hunit }: mkDerivation { pname = "tasty-hunit-compat"; @@ -250618,7 +250708,6 @@ self: { libraryHaskellDepends = [ base HUnit tasty tasty-hunit ]; description = "Integration of `HUnit` with `tasty`"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tasty-integrate" = callPackage @@ -250814,22 +250903,6 @@ self: { }) {}; "tasty-quickcheck" = callPackage - ({ mkDerivation, base, optparse-applicative, pcre-light, QuickCheck - , random, tagged, tasty, tasty-hunit - }: - mkDerivation { - pname = "tasty-quickcheck"; - version = "0.10.1.1"; - sha256 = "098zyfl5958zikaqfyam75hv5l46pks5bnp3r7533bbmr4a60cpq"; - libraryHaskellDepends = [ - base optparse-applicative QuickCheck random tagged tasty - ]; - testHaskellDepends = [ base pcre-light tasty tasty-hunit ]; - description = "QuickCheck support for the Tasty test framework"; - license = stdenv.lib.licenses.mit; - }) {}; - - "tasty-quickcheck_0_10_1_2" = callPackage ({ mkDerivation, base, optparse-applicative, pcre-light, QuickCheck , random, tagged, tasty, tasty-hunit }: @@ -250843,7 +250916,6 @@ self: { testHaskellDepends = [ base pcre-light tasty tasty-hunit ]; description = "QuickCheck support for the Tasty test framework"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tasty-quickcheck-laws" = callPackage @@ -250869,6 +250941,8 @@ self: { pname = "tasty-rerun"; version = "1.1.18"; sha256 = "0sccp5zx9v2rx741nbmgd8mzjhy5m4v74hk26d23xz93ph8aqx7s"; + revision = "1"; + editedCabalFile = "17w6kxdd9zw87lh1bmh24c7dp59df8dshygx88j2i5nhbn7lfn50"; libraryHaskellDepends = [ base containers mtl optparse-applicative split stm tagged tasty transformers @@ -250878,31 +250952,6 @@ self: { }) {}; "tasty-silver" = callPackage - ({ mkDerivation, ansi-terminal, async, base, bytestring, containers - , deepseq, directory, filepath, mtl, optparse-applicative, process - , process-extras, regex-tdfa, semigroups, stm, tagged, tasty - , tasty-hunit, temporary, text, transformers - }: - mkDerivation { - pname = "tasty-silver"; - version = "3.1.15"; - sha256 = "07iiaw5q5jb6bxm5ys1s6bliw0qxsqp100awzxwkwfia03i1iz8z"; - revision = "1"; - editedCabalFile = "1pxwixy274w0z99zsx0aywcxcajnpgan3qri81mr1wb6afxrq8d6"; - libraryHaskellDepends = [ - ansi-terminal async base bytestring containers deepseq directory - filepath mtl optparse-applicative process process-extras regex-tdfa - semigroups stm tagged tasty temporary text - ]; - testHaskellDepends = [ - base directory filepath process tasty tasty-hunit temporary - transformers - ]; - description = "A fancy test runner, including support for golden tests"; - license = stdenv.lib.licenses.mit; - }) {}; - - "tasty-silver_3_2_1" = callPackage ({ mkDerivation, ansi-terminal, async, base, bytestring, containers , deepseq, directory, filepath, mtl, optparse-applicative, process , process-extras, regex-tdfa, stm, tagged, tasty, tasty-hunit @@ -250924,20 +250973,10 @@ self: { description = "A fancy test runner, including support for golden tests"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tasty-smallcheck" = callPackage - ({ mkDerivation, async, base, smallcheck, tagged, tasty }: - mkDerivation { - pname = "tasty-smallcheck"; - version = "0.8.1"; - sha256 = "1n66ngzllf3xrlqykwszlkwsi96n5nkm7xbpfq7774vpvfnafjri"; - libraryHaskellDepends = [ async base smallcheck tagged tasty ]; - description = "SmallCheck support for the Tasty test framework"; - license = stdenv.lib.licenses.mit; - }) {}; - - "tasty-smallcheck_0_8_2" = callPackage ({ mkDerivation, base, optparse-applicative, smallcheck, tagged , tasty }: @@ -250950,7 +250989,6 @@ self: { ]; description = "SmallCheck support for the Tasty test framework"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tasty-stats" = callPackage @@ -251309,24 +251347,21 @@ self: { }) {}; "tdigest" = callPackage - ({ mkDerivation, base, base-compat, binary, Cabal, cabal-doctest - , deepseq, doctest, reducers, semigroupoids, semigroups, tasty - , tasty-quickcheck, transformers, vector, vector-algorithms + ({ mkDerivation, base, base-compat, binary, deepseq, reducers + , semigroupoids, semigroups, tasty, tasty-quickcheck, transformers + , vector, vector-algorithms }: mkDerivation { pname = "tdigest"; - version = "0.2.1"; - sha256 = "0kmqmzjcs406hv2fv9bkfayxpsd41dbry8bpkhy4y1jdgh33hvnl"; - revision = "5"; - editedCabalFile = "1crjfhxhs8ihbl2xn1dqr5w19g7w74mcf2w889my6zb935l7lyjs"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; + version = "0.2.1.1"; + sha256 = "1dvkf7cs8dcr13wza5iyq2qgvz75r33mzgfmhdihw62xzxsqb6d3"; libraryHaskellDepends = [ base base-compat binary deepseq reducers semigroupoids transformers vector vector-algorithms ]; testHaskellDepends = [ - base base-compat binary deepseq doctest semigroups tasty - tasty-quickcheck vector vector-algorithms + base base-compat binary deepseq semigroups tasty tasty-quickcheck + vector vector-algorithms ]; description = "On-line accumulation of rank-based statistics"; license = stdenv.lib.licenses.bsd3; @@ -251740,6 +251775,29 @@ self: { broken = true; }) {}; + "telegraph" = callPackage + ({ mkDerivation, aeson, base, bytestring, conduit, deriving-aeson + , exceptions, generic-data-surgery, http-client, http-client-tls + , http-conduit, monad-control, mtl, text, transformers-base + }: + mkDerivation { + pname = "telegraph"; + version = "0.1.0"; + sha256 = "0rl3di034ln127pp8gzdjxlgbas93jjzxikacvhpyzgcpskd78y9"; + libraryHaskellDepends = [ + aeson base bytestring conduit deriving-aeson exceptions + generic-data-surgery http-client http-conduit monad-control mtl + text transformers-base + ]; + testHaskellDepends = [ + aeson base bytestring conduit deriving-aeson exceptions + generic-data-surgery http-client http-client-tls http-conduit + monad-control mtl text transformers-base + ]; + description = "Binding to the telegraph API"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "teleport" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, bytestring , configurator, optparse-applicative, system-filepath, text, turtle @@ -252517,6 +252575,8 @@ self: { testHaskellDepends = [ base containers HUnit QuickCheck ]; description = "Term Rewriting Library"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "termbox" = callPackage @@ -252706,17 +252766,17 @@ self: { "termonad" = callPackage ({ mkDerivation, adjunctions, base, Cabal, cabal-doctest , classy-prelude, colour, constraints, containers, data-default - , directory, distributive, doctest, dyre, file-embed, filepath - , focuslist, genvalidity-containers, genvalidity-hspec, gi-gdk - , gi-gio, gi-glib, gi-gtk, gi-pango, gi-vte, gtk3, haskell-gi-base + , directory, distributive, dyre, file-embed, filepath, focuslist + , genvalidity-containers, genvalidity-hspec, gi-gdk, gi-gio + , gi-glib, gi-gtk, gi-pango, gi-vte, gtk3, haskell-gi-base , hedgehog, inline-c, lens, mono-traversable, pcre2, pretty-simple - , QuickCheck, tasty, tasty-hedgehog, tasty-hspec, template-haskell - , text, transformers, vte_291, xml-conduit, xml-html-qq, yaml + , QuickCheck, tasty, tasty-hedgehog, tasty-hspec, text + , transformers, vte_291, xml-conduit, xml-html-qq, yaml }: mkDerivation { pname = "termonad"; - version = "4.0.1.1"; - sha256 = "1vjxq903jws85n6aihmgif1s168afg2v9ixdxri98mzjkww10sgl"; + version = "4.1.0.0"; + sha256 = "17b9fxs9dc2pb8v2fxnly968v3bcy8g756r60nibd04fisrd1pmk"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -252731,8 +252791,8 @@ self: { libraryPkgconfigDepends = [ gtk3 pcre2 vte_291 ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ - base doctest genvalidity-containers genvalidity-hspec hedgehog lens - QuickCheck tasty tasty-hedgehog tasty-hspec template-haskell + base genvalidity-containers genvalidity-hspec hedgehog lens + QuickCheck tasty tasty-hedgehog tasty-hspec ]; description = "Terminal emulator configurable in Haskell"; license = stdenv.lib.licenses.bsd3; @@ -253586,8 +253646,8 @@ self: { }: mkDerivation { pname = "texmath"; - version = "0.12.0.3"; - sha256 = "06293ng7s9mn05vf5wlw2691gjzh6nmg717rxmbzr96zjv3731ri"; + version = "0.12.1"; + sha256 = "1pp52g4jwyf0w0xpja7gamd39g3acfclc3q29ldpzpfbhnl23n27"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -253688,13 +253748,25 @@ self: { ({ mkDerivation, base, text }: mkDerivation { pname = "text-ansi"; - version = "0.1.0.1"; - sha256 = "1qy5qqwm41xcxc5bs0aicdm40vnz1rm8mgmxzfxvjnwc9p28pyb3"; + version = "0.1.0.2"; + sha256 = "139whkn4yr72bxd4jq3zp0cccylynb8p2lgk5dkhrhddhcj5605g"; libraryHaskellDepends = [ base text ]; description = "Text styling for ANSI terminals"; license = stdenv.lib.licenses.bsd3; }) {}; + "text-ansi_0_1_1" = callPackage + ({ mkDerivation, base, text }: + mkDerivation { + pname = "text-ansi"; + version = "0.1.1"; + sha256 = "1vcrsg7v8n6znh1pd9kbm20bc6dg3zijd3xjdjljadf15vfkd5f6"; + libraryHaskellDepends = [ base text ]; + description = "Text styling for ANSI terminals"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "text-binary" = callPackage ({ mkDerivation, base, binary, text }: mkDerivation { @@ -254502,8 +254574,8 @@ self: { ({ mkDerivation, base, deepseq, hspec, QuickCheck, text, vector }: mkDerivation { pname = "text-zipper"; - version = "0.10.1"; - sha256 = "0jxicjp0ak1fyl1n3yspxq6hv9l90zzy75glsv8bc2svsn9ypyls"; + version = "0.11"; + sha256 = "07l1pyx93gv95cn1wh1di129axhm9sqsn4znykliacv60ld854ys"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base deepseq text vector ]; testHaskellDepends = [ base hspec QuickCheck text ]; @@ -254710,8 +254782,8 @@ self: { ({ mkDerivation, base, containers, ghc-prim, template-haskell }: mkDerivation { pname = "th-abstraction"; - version = "0.4.1.0"; - sha256 = "1klza7zxcr8bgyflndwv0wgziy0snjh1w2c5z3mv17yra0yrs84f"; + version = "0.4.2.0"; + sha256 = "0h0wl442a82llpjsxv45i7grgyanlzjj7k28mhnvbi2zlb6v41pa"; libraryHaskellDepends = [ base containers ghc-prim template-haskell ]; @@ -255570,6 +255642,35 @@ self: { broken = true; }) {}; + "thock" = callPackage + ({ mkDerivation, aeson, base, brick, containers, file-embed, lens + , mtl, network, random, text, text-zipper, time, vector, vty + , websockets + }: + mkDerivation { + pname = "thock"; + version = "0.2.0.0"; + sha256 = "1wj3zldfqpa8xvk62qv13frhxmrjhrjismcb9iyblkrwlcxzfyns"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base brick containers file-embed lens mtl network random text + text-zipper time vector vty websockets + ]; + executableHaskellDepends = [ + aeson base brick containers file-embed lens mtl network random text + text-zipper time vector vty websockets + ]; + testHaskellDepends = [ + aeson base brick containers file-embed lens mtl network random text + text-zipper time vector vty websockets + ]; + description = "A modern TUI typing game featuring online racing against friends"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "thorn" = callPackage ({ mkDerivation, base, bifunctors, containers, contravariant, mtl , profunctors, random, template-haskell @@ -255763,8 +255864,6 @@ self: { ]; description = "A graphical tool for profiling parallel Haskell programs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "threefish" = callPackage @@ -257651,6 +257750,108 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "tlex" = callPackage + ({ mkDerivation, base, Cabal, cabal-doctest, containers, doctest + , hspec, hspec-discover, QuickCheck, tlex-core + }: + mkDerivation { + pname = "tlex"; + version = "0.1.0.0"; + sha256 = "1qcn9m3zj33scvydshaqlnag5cw49vr2p7dh6z1fssbn061ik4iv"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ base containers tlex-core ]; + testHaskellDepends = [ + base containers doctest hspec QuickCheck tlex-core + ]; + testToolDepends = [ hspec-discover ]; + description = "A lexer generator"; + license = "(Apache-2.0 OR MPL-2.0)"; + }) {}; + + "tlex-core" = callPackage + ({ mkDerivation, array, base, Cabal, cabal-doctest, containers + , doctest, hashable, hspec, hspec-discover, QuickCheck + , transformers, unordered-containers + }: + mkDerivation { + pname = "tlex-core"; + version = "0.1.0.0"; + sha256 = "009xld55rrch7r1ld9s8l3syahqnfphazl211gsaahck9f9ii3bh"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + array base containers hashable transformers unordered-containers + ]; + testHaskellDepends = [ + array base containers doctest hashable hspec QuickCheck + transformers unordered-containers + ]; + testToolDepends = [ hspec-discover ]; + description = "A lexer generator"; + license = "(Apache-2.0 OR MPL-2.0)"; + }) {}; + + "tlex-debug" = callPackage + ({ mkDerivation, base, Cabal, cabal-doctest, containers, doctest + , hspec, hspec-discover, QuickCheck, tlex, tlex-core + , unordered-containers + }: + mkDerivation { + pname = "tlex-debug"; + version = "0.1.0.0"; + sha256 = "1jxflcmgkqh24ybhpbzhxvmqywh6197xzi24ma074zzfyzf07jgx"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + base containers tlex tlex-core unordered-containers + ]; + testHaskellDepends = [ + base containers doctest hspec QuickCheck tlex tlex-core + unordered-containers + ]; + testToolDepends = [ hspec-discover ]; + description = "Debug utilities for Tlex"; + license = "(Apache-2.0 OR MPL-2.0)"; + }) {}; + + "tlex-encoding" = callPackage + ({ mkDerivation, base, Cabal, cabal-doctest, charset, containers + , doctest, hspec, hspec-discover, QuickCheck, tlex, tlex-core + }: + mkDerivation { + pname = "tlex-encoding"; + version = "0.1.0.0"; + sha256 = "1m5sp3paklybg94r2g5wyzgnqdzxs3a4gn7lknj1a3wdwhz9cc17"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ base charset containers tlex tlex-core ]; + testHaskellDepends = [ + base charset containers doctest hspec QuickCheck tlex tlex-core + ]; + testToolDepends = [ hspec-discover ]; + description = "Encoding plugin for Tlex"; + license = "(Apache-2.0 OR MPL-2.0)"; + }) {}; + + "tlex-th" = callPackage + ({ mkDerivation, array, base, Cabal, cabal-doctest, containers + , doctest, ghc-prim, hspec, hspec-discover, QuickCheck + , template-haskell, tlex, tlex-core + }: + mkDerivation { + pname = "tlex-th"; + version = "0.1.0.0"; + sha256 = "0iy6xnp9nm17jcjkgnlyc3pdiwlkgxzqhi4pgv4a29kmvvy5izcz"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + array base containers ghc-prim template-haskell tlex tlex-core + ]; + testHaskellDepends = [ + array base containers doctest ghc-prim hspec QuickCheck + template-haskell tlex tlex-core + ]; + testToolDepends = [ hspec-discover ]; + description = "TemplateHaskell plugin for Tlex"; + license = "(Apache-2.0 OR MPL-2.0)"; + }) {}; + "tls" = callPackage ({ mkDerivation, asn1-encoding, asn1-types, async, base, bytestring , cereal, cryptonite, data-default-class, gauge, hourglass, memory @@ -257734,28 +257935,6 @@ self: { }) {}; "tlynx" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, comonad - , containers, elynx-tools, elynx-tree, gnuplot, lifted-async - , monad-logger, mwc-random, optparse-applicative, parallel - , statistics, text, transformers, vector - }: - mkDerivation { - pname = "tlynx"; - version = "0.5.0"; - sha256 = "1q7mca9gg9fshj5d2yhbvv3ll33z7h7ga3lbli3fax6dk2ncw6pm"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson attoparsec base bytestring comonad containers elynx-tools - elynx-tree gnuplot lifted-async monad-logger mwc-random - optparse-applicative parallel statistics text transformers vector - ]; - executableHaskellDepends = [ base ]; - description = "Handle phylogenetic trees"; - license = stdenv.lib.licenses.gpl3Plus; - }) {}; - - "tlynx_0_5_0_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, comonad , containers, elynx-tools, elynx-tree, gnuplot, lifted-async , monad-logger, mwc-random, optparse-applicative, parallel @@ -257776,6 +257955,7 @@ self: { description = "Handle phylogenetic trees"; license = stdenv.lib.licenses.gpl3Plus; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tmapchan" = callPackage @@ -258235,6 +258415,8 @@ self: { pname = "tokyocabinet-haskell"; version = "0.0.6"; sha256 = "1cav27hnl49ghl6f7mhyaqmvfdqib6s76z251vai4vih9psis8rk"; + revision = "1"; + editedCabalFile = "1mk2nwi51zm0b2081db26xipwa0yd53ikhxa5vd8fp8x2w52wliw"; libraryHaskellDepends = [ base bytestring mtl ]; librarySystemDepends = [ tokyocabinet ]; testHaskellDepends = [ base bytestring directory HUnit mtl ]; @@ -258446,6 +258628,8 @@ self: { ]; description = "tonatona plugin for accessing PostgreSQL database"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tonatona-persistent-sqlite" = callPackage @@ -258466,6 +258650,8 @@ self: { ]; description = "tonatona plugin for accessing Sqlite database"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tonatona-servant" = callPackage @@ -258885,8 +259071,8 @@ self: { pname = "toysolver"; version = "0.6.0"; sha256 = "0hd3rwbv8k62qnw9spwx6gl0j4syivvrigjcdgc53llbqzdjr0v1"; - revision = "1"; - editedCabalFile = "0grqs68qr3jpy2hibl5vlnz981hk0hnd5wacglnxxswqikdbpn06"; + revision = "3"; + editedCabalFile = "02dmyy2agp6x59dcagqmbwk46bn8q1y4ragk5yggajsw4gbm5gvn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -261238,6 +261424,8 @@ self: { executableHaskellDepends = [ base text time ttn ]; description = "TheThingsNetwork client"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ttrie" = callPackage @@ -264993,6 +265181,8 @@ self: { testToolDepends = [ hspec-discover ]; description = "Functions to work with unicode blocks more convenient"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "unicoder" = callPackage @@ -265153,6 +265343,8 @@ self: { pname = "uniplate"; version = "1.6.13"; sha256 = "1lis5qcb5j7yzd1cqjaqpb6bmkyjfb7l4nhk3ykmcma4513cjxz7"; + revision = "1"; + editedCabalFile = "1rvvzmi43gbrww0f17dzchm3g61zvm97arrfa5raljqb1mbibdy8"; libraryHaskellDepends = [ base containers ghc-prim hashable syb unordered-containers ]; @@ -265176,6 +265368,8 @@ self: { ]; description = "UniProt-KB format parser"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "uniq-deep" = callPackage @@ -265194,14 +265388,12 @@ self: { }) {}; "unique" = callPackage - ({ mkDerivation, base, ghc-prim, hashable }: + ({ mkDerivation, base, hashable }: mkDerivation { pname = "unique"; - version = "0"; - sha256 = "140a9avcxs1fkj1v2awplq6prd1g13yg0kckccw6i1qpgcdigyz3"; - revision = "2"; - editedCabalFile = "0ydjjd6j7gr4mibky6j5rqwhy9frvfii0sr4g8shaxnph3y0kb6b"; - libraryHaskellDepends = [ base ghc-prim hashable ]; + version = "0.0.1"; + sha256 = "1dgln2dr64ma1isqskj1qnjslg9smmr7jssg8hmk68wp36i3rwkd"; + libraryHaskellDepends = [ base hashable ]; description = "Fully concurrent unique identifiers"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -265616,6 +265808,8 @@ self: { ]; description = "A class for finite and recursively enumerable types"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "universe-base" = callPackage @@ -265631,6 +265825,8 @@ self: { testHaskellDepends = [ base containers QuickCheck ]; description = "A class for finite and recursively enumerable types"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "universe-dependent-sum" = callPackage @@ -265646,6 +265842,8 @@ self: { ]; description = "Universe instances for types from dependent-sum"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "universe-instances-base" = callPackage @@ -265659,6 +265857,8 @@ self: { libraryHaskellDepends = [ base universe-base ]; description = "Universe instances for types from the base package"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "universe-instances-extended" = callPackage @@ -265676,6 +265876,8 @@ self: { ]; description = "Universe instances for types from selected extra packages"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "universe-instances-trans" = callPackage @@ -265689,6 +265891,8 @@ self: { libraryHaskellDepends = [ base universe-base ]; description = "Universe instances for types from the transformers and mtl packages"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "universe-reverse-instances" = callPackage @@ -265702,6 +265906,8 @@ self: { libraryHaskellDepends = [ base containers universe-base ]; description = "Instances of standard classes that are made possible by enumerations"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "universe-some" = callPackage @@ -265721,6 +265927,8 @@ self: { testHaskellDepends = [ base some template-haskell universe-base ]; description = "Universe instances for Some from some"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "universe-th" = callPackage @@ -265748,6 +265956,32 @@ self: { }) {}; "universum" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, doctest + , gauge, ghc-prim, Glob, hashable, hedgehog, microlens + , microlens-mtl, mtl, safe-exceptions, stm, tasty, tasty-hedgehog + , text, transformers, unordered-containers, utf8-string, vector + }: + mkDerivation { + pname = "universum"; + version = "1.5.0"; + sha256 = "17rzi17k2wj3p6dzd0dggzgyhh0c2mma4znkci1hqcihwr6rrljk"; + libraryHaskellDepends = [ + base bytestring containers deepseq ghc-prim hashable microlens + microlens-mtl mtl safe-exceptions stm text transformers + unordered-containers utf8-string vector + ]; + testHaskellDepends = [ + base bytestring doctest Glob hedgehog tasty tasty-hedgehog text + utf8-string + ]; + benchmarkHaskellDepends = [ + base containers gauge unordered-containers + ]; + description = "Custom prelude used in Serokell"; + license = stdenv.lib.licenses.mit; + }) {}; + + "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 @@ -265770,6 +266004,7 @@ self: { ]; description = "Custom prelude used in Serokell"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "unix_2_7_2_2" = callPackage @@ -267474,14 +267709,13 @@ self: { }) {}; "utf8-string" = callPackage - ({ mkDerivation, base, bytestring }: + ({ mkDerivation, base, bytestring, HUnit }: mkDerivation { pname = "utf8-string"; - version = "1.0.1.1"; - sha256 = "0h7imvxkahiy8pzr8cpsimifdfvv18lizrb33k6mnq70rcx9w2zv"; - revision = "3"; - editedCabalFile = "02vhj5gykkqa2dyn7s6gn8is1b5fdn9xcqqvlls268g7cpv6rk38"; + version = "1.0.2"; + sha256 = "16mh36ffva9rh6k37bi1046pgpj14h0cnmj1iir700v0lynxwj7f"; libraryHaskellDepends = [ base bytestring ]; + testHaskellDepends = [ base HUnit ]; description = "Support for reading and writing UTF8 Strings"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -269319,6 +269553,17 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "vector-fft" = callPackage + ({ mkDerivation, base, primitive, vector }: + mkDerivation { + pname = "vector-fft"; + version = "0.1.0.2"; + sha256 = "1aygafvsx3wybbp6hqg5ddkawl8m5m6s6dg5hbrlyibz2whrp1fs"; + libraryHaskellDepends = [ base primitive vector ]; + description = "Native FFT and IFFT for vector"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "vector-fftw" = callPackage ({ mkDerivation, base, fftw, primitive, QuickCheck , storable-complex, test-framework, test-framework-quickcheck2 @@ -269462,23 +269707,6 @@ self: { }) {}; "vector-sized" = callPackage - ({ mkDerivation, adjunctions, base, binary, comonad, deepseq - , distributive, finite-typelits, hashable, indexed-list-literals - , primitive, vector - }: - mkDerivation { - pname = "vector-sized"; - version = "1.4.3"; - sha256 = "0k1rvy6znp2kig5v7w7zpq9i3sz65prp1wcpmjqgzkz3qb0s5l00"; - 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_3_1" = callPackage ({ mkDerivation, adjunctions, base, binary, comonad, deepseq , distributive, finite-typelits, hashable, indexed-list-literals , primitive, vector @@ -269493,7 +269721,6 @@ self: { ]; description = "Size tagged vectors"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vector-space" = callPackage @@ -270965,8 +271192,8 @@ self: { ({ mkDerivation, base, bytestring, transformers, vector, vulkan }: mkDerivation { pname = "vulkan"; - version = "3.8.2"; - sha256 = "1wq3hd99zqzasfj4w86yypcd0yrdp8q3xrzx3g2v6vyi99qwzdrr"; + version = "3.8.3"; + sha256 = "0ml3zccwk86ryjgxhdc0qdvmjq1fmw4wrhblss4rdml9kww8y2ar"; libraryHaskellDepends = [ base bytestring transformers vector ]; librarySystemDepends = [ vulkan ]; description = "Bindings to the Vulkan graphics API"; @@ -271397,8 +271624,8 @@ self: { }: mkDerivation { pname = "wai-extra"; - version = "3.1.4.1"; - sha256 = "0q95vz3x0avznpv0mcb71vlmamyws8sm50asrhcph5qwfwh9x13a"; + version = "3.1.5"; + sha256 = "1xq4w3i3mazdcpb7d60sag6bqqp33sgx0hf808bbjjk6bf03qraw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -271410,7 +271637,8 @@ self: { ]; testHaskellDepends = [ aeson base bytestring case-insensitive cookie fast-logger hspec - http-types http2 HUnit resourcet text time transformers wai zlib + http-types http2 HUnit iproute resourcet text time transformers wai + zlib ]; description = "Provides some basic WAI handlers and middleware"; license = stdenv.lib.licenses.mit; @@ -273381,6 +273609,8 @@ self: { pname = "wave"; version = "0.2.0"; sha256 = "149kgwngq3qxc7gxpkqb16j669j0wpv2f3gnvfwp58yg6m4259ki"; + revision = "1"; + editedCabalFile = "19rxhnqhhv1qs35y723c15c8nifj8pakcrd09jlvg5271zg4qb0b"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring cereal containers transformers @@ -274479,6 +274709,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) webkitgtk24x-gtk3;}; + "webp" = callPackage + ({ mkDerivation, base, bytestring, c2hs, JuicyPixels, libwebp + , tasty, tasty-hunit, vector + }: + mkDerivation { + pname = "webp"; + version = "0.1.0.0"; + sha256 = "153icv3911drnjkii2b0csdq3ksavmxpz26zm9xcp24kfbsr6gvk"; + libraryHaskellDepends = [ base bytestring JuicyPixels vector ]; + libraryPkgconfigDepends = [ libwebp ]; + libraryToolDepends = [ c2hs ]; + testHaskellDepends = [ + base bytestring JuicyPixels tasty tasty-hunit + ]; + description = "JuicyPixels support for WebP format"; + license = stdenv.lib.licenses.gpl3; + }) {inherit (pkgs) libwebp;}; + "webpage" = callPackage ({ mkDerivation, base, blaze-html, data-default, lucid, text }: mkDerivation { @@ -275126,10 +275374,8 @@ self: { }: mkDerivation { pname = "wide-word"; - version = "0.1.1.1"; - sha256 = "19mxi6mfri4q96lqh3zllmacaln2wdp0ipzmhk7v9xqbphpfjrfj"; - revision = "1"; - editedCabalFile = "0dyq104qxbsvab6x5jxg0ssqbjzgkmd4z5366byf7fvc0c4m2ink"; + version = "0.1.1.2"; + sha256 = "10sj7nca2sba74bkiicnp95xrfq2j1al93ggw3z24982nm9x3j8r"; libraryHaskellDepends = [ base deepseq primitive ]; testHaskellDepends = [ base bytestring ghc-prim hedgehog primitive QuickCheck @@ -275137,6 +275383,8 @@ self: { ]; description = "Data types for large but fixed width signed and unsigned integers"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "wigner-symbols" = callPackage @@ -275226,16 +275474,17 @@ self: { }) {}; "wild-bind-indicator" = callPackage - ({ mkDerivation, base, containers, gtk, text, transformers - , wild-bind + ({ mkDerivation, async, base, containers, gi-gdk, gi-glib, gi-gtk + , text, transformers, wild-bind }: mkDerivation { pname = "wild-bind-indicator"; - version = "0.2.0.0"; - sha256 = "09p7x77ksh9qp4ir5cy470y978m4ln0sp44pffm0mld1apdam27x"; + version = "1.0.0.0"; + sha256 = "1irb8njd076vwz2676v0fa56agsszcs9ra5pbzlyxbb69kg2fgq3"; enableSeparateDataOutput = true; libraryHaskellDepends = [ - base containers gtk text transformers wild-bind + async base containers gi-gdk gi-glib gi-gtk text transformers + wild-bind ]; description = "Graphical indicator for WildBind"; license = stdenv.lib.licenses.bsd3; @@ -275249,8 +275498,8 @@ self: { }: mkDerivation { pname = "wild-bind-task-x11"; - version = "0.2.0.1"; - sha256 = "0n8sg0qg0ambh0744c19zwxxky2b0vwpmn464i3mp587dkfpm0p2"; + version = "0.2.0.2"; + sha256 = "1hxsykbzw3z3vhzpi2z4b6gxvbr91s0jkxq9jc47xzx6ar0x7jq0"; libraryHaskellDepends = [ base text transformers wild-bind wild-bind-indicator wild-bind-x11 ]; @@ -275267,8 +275516,8 @@ self: { }: mkDerivation { pname = "wild-bind-x11"; - version = "0.2.0.10"; - sha256 = "0wq6jhaq2mh476mwjqc6ianqvvrywlvrkcwh7acdxznz2djkgjm5"; + version = "0.2.0.11"; + sha256 = "05i0jrvap7vwzx3m97wfihplank8mjlap4q1bwvr9fb97farll0b"; libraryHaskellDepends = [ base containers fold-debounce mtl semigroups stm text transformers wild-bind X11 @@ -275983,6 +276232,8 @@ self: { testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ]; description = "Words of arbitrary size"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "word-trie" = callPackage @@ -278368,10 +278619,8 @@ self: { }: mkDerivation { pname = "xml-conduit-stylist"; - version = "2.2.0.0"; - sha256 = "0zd7irwy8fl9zkpzj85lg9xv4m01cr4dzvlxyz8nh6l1rwvhqang"; - revision = "2"; - editedCabalFile = "0h20v462sfq4cli5b9d574qjhxs1vgzh5yb2spgj6w9pmf7ydf61"; + version = "2.3.0.0"; + sha256 = "15iznb6xpas8044p03w3vll4vv7zwpcbbrh59ywwjr8m45659p4w"; libraryHaskellDepends = [ base containers css-syntax network-uri stylist text unordered-containers xml-conduit @@ -278587,6 +278836,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "xml-lens_0_3" = callPackage + ({ mkDerivation, base, case-insensitive, containers, lens, text + , xml-conduit + }: + mkDerivation { + pname = "xml-lens"; + version = "0.3"; + sha256 = "1i3b22sz7fkh9vjlfpwzz6fg57br8xq6q7zz76f66h6hymc284dz"; + libraryHaskellDepends = [ + base case-insensitive containers lens text xml-conduit + ]; + description = "Lenses, traversals, and prisms for xml-conduit"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "xml-monad" = callPackage ({ mkDerivation, base, mtl, transformers, transformers-compose, xml }: @@ -281762,43 +282027,6 @@ self: { }) {}; "yesod-core" = callPackage - ({ mkDerivation, aeson, async, auto-update, base, blaze-html - , blaze-markup, bytestring, case-insensitive, cereal, clientsession - , conduit, conduit-extra, containers, cookie, deepseq, fast-logger - , gauge, hspec, hspec-expectations, http-types, HUnit, memory - , monad-logger, mtl, network, parsec, path-pieces, primitive - , random, resourcet, shakespeare, streaming-commons - , template-haskell, text, time, transformers, unix-compat, unliftio - , unordered-containers, vector, wai, wai-extra, wai-logger, warp - , word8 - }: - mkDerivation { - pname = "yesod-core"; - version = "1.6.18.7"; - sha256 = "0rf30h5akdjyja0xld2cg0zldvbzcqcrmg2kp4gajh1qjzzcf69g"; - libraryHaskellDepends = [ - aeson auto-update base blaze-html blaze-markup bytestring - case-insensitive cereal clientsession conduit conduit-extra - containers cookie deepseq fast-logger http-types memory - monad-logger mtl parsec path-pieces primitive random resourcet - shakespeare template-haskell text time transformers unix-compat - unliftio unordered-containers vector wai wai-extra wai-logger warp - word8 - ]; - testHaskellDepends = [ - async base bytestring clientsession conduit conduit-extra - containers cookie hspec hspec-expectations http-types HUnit network - path-pieces random resourcet shakespeare streaming-commons - template-haskell text transformers unliftio wai wai-extra warp - ]; - benchmarkHaskellDepends = [ - base blaze-html bytestring gauge shakespeare text - ]; - description = "Creation of type-safe, RESTful web applications"; - license = stdenv.lib.licenses.mit; - }) {}; - - "yesod-core_1_6_18_8" = callPackage ({ mkDerivation, aeson, async, auto-update, base, blaze-html , blaze-markup, bytestring, case-insensitive, cereal, clientsession , conduit, conduit-extra, containers, cookie, deepseq, fast-logger @@ -281833,7 +282061,6 @@ self: { ]; description = "Creation of type-safe, RESTful web applications"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-crud" = callPackage @@ -282181,8 +282408,8 @@ self: { }: mkDerivation { pname = "yesod-form-multi"; - version = "1.7.0"; - sha256 = "02xba6x59sx8c72vazbl5jhjkxgni6h3bkvidr4hvqrx2bscmk45"; + version = "1.7.0.1"; + sha256 = "0dpcyq6l28zbm12rzjp18bhjaghf38jhjzj6qp40qyvb5f8yx9dp"; libraryHaskellDepends = [ base containers network-uri shakespeare text transformers yesod-core yesod-form @@ -282314,6 +282541,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-katip" = callPackage + ({ mkDerivation, aeson, base, case-insensitive, data-default + , http-types, iproute, katip, monad-logger, network, text, wai + , wai-extra, yesod-core, ytl + }: + mkDerivation { + pname = "yesod-katip"; + version = "0.1.0.0"; + sha256 = "0cga4agqv5vc56cavvrbddwqg5bvamy49y82d6f4xqmicfnpdlxm"; + libraryHaskellDepends = [ + aeson base case-insensitive data-default http-types iproute katip + monad-logger network text wai wai-extra yesod-core ytl + ]; + description = "Logging bridge between Yesod and Katip"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "yesod-links" = callPackage ({ mkDerivation, base, text, yesod-core }: mkDerivation { @@ -282424,8 +282668,8 @@ self: { }: mkDerivation { pname = "yesod-page-cursor"; - version = "2.0.0.0"; - sha256 = "0dlr16jkv104siq7r7ff02x60dy6bvhrgq43s5g8iydc9khafai8"; + version = "2.0.0.1"; + sha256 = "1fsq2shnn1izhw28f8dfyc8ssfxfjhzip0hh1cw80hpcg7q0pr73"; libraryHaskellDepends = [ aeson base bytestring containers http-link-header network-uri text unliftio yesod-core @@ -282437,6 +282681,34 @@ self: { time unliftio unliftio-core wai-extra yesod yesod-core yesod-test ]; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "yesod-page-cursor_2_0_0_2" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, hspec + , hspec-expectations-lifted, http-link-header, http-types, lens + , lens-aeson, monad-logger, mtl, network-uri, persistent + , persistent-sqlite, persistent-template, scientific, text, time + , unliftio, unliftio-core, wai-extra, yesod, yesod-core, yesod-test + }: + mkDerivation { + pname = "yesod-page-cursor"; + version = "2.0.0.2"; + sha256 = "1wlwzxc2amnq1ma2lvclrc3dzhh8s6d8ffz6yk9rq88aijgvw35m"; + libraryHaskellDepends = [ + aeson base bytestring containers http-link-header network-uri text + unliftio yesod-core + ]; + testHaskellDepends = [ + aeson base bytestring hspec hspec-expectations-lifted + http-link-header http-types lens lens-aeson monad-logger mtl + persistent persistent-sqlite persistent-template scientific text + time unliftio unliftio-core wai-extra yesod yesod-core yesod-test + ]; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yesod-paginate" = callPackage @@ -283038,32 +283310,6 @@ self: { }) {}; "yesod-test" = callPackage - ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html - , bytestring, case-insensitive, conduit, containers, cookie, hspec - , hspec-core, html-conduit, http-types, HUnit, memory, network - , pretty-show, text, time, transformers, unliftio, unliftio-core - , wai, wai-extra, xml-conduit, xml-types, yesod-core, yesod-form - }: - mkDerivation { - pname = "yesod-test"; - version = "1.6.11"; - sha256 = "1h3bggs5z5ixriy8agj9f2ms5vfcbp7a3bwr3rpfkfrckwypj6hp"; - libraryHaskellDepends = [ - aeson attoparsec base blaze-builder blaze-html bytestring - case-insensitive conduit containers cookie hspec-core html-conduit - http-types HUnit memory network pretty-show text time transformers - wai wai-extra xml-conduit xml-types yesod-core - ]; - testHaskellDepends = [ - base bytestring containers cookie hspec html-conduit http-types - HUnit text unliftio unliftio-core wai wai-extra xml-conduit - yesod-core yesod-form - ]; - description = "integration testing for WAI/Yesod Applications"; - license = stdenv.lib.licenses.mit; - }) {}; - - "yesod-test_1_6_12" = callPackage ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html , bytestring, case-insensitive, conduit, containers, cookie, hspec , hspec-core, html-conduit, http-types, HUnit, memory, mtl, network @@ -283087,7 +283333,6 @@ self: { ]; description = "integration testing for WAI/Yesod Applications"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-test-json" = callPackage @@ -284039,6 +284284,20 @@ self: { broken = true; }) {}; + "ytl" = callPackage + ({ mkDerivation, base, mtl, pointed, template-haskell, yesod-core + }: + mkDerivation { + pname = "ytl"; + version = "0.1.0.0"; + sha256 = "0dbvhq5cqlql5waym40hjvz0807wqhys60m72r36fh1mndwzpsqk"; + libraryHaskellDepends = [ + base mtl pointed template-haskell yesod-core + ]; + description = "mtl-style transformations for Yesod sites"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "yu-auth" = callPackage ({ mkDerivation, base, cryptonite, memory, MonadRandom, random , yu-utils @@ -284177,6 +284436,8 @@ self: { testHaskellDepends = [ array base bytestring hspec mtl ]; description = "Row-major coordinates"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yxdb-utils" = callPackage @@ -285010,6 +285271,8 @@ self: { pname = "zip"; version = "1.6.0"; sha256 = "1k00g2952yf3iyq1p6pjn307zsxsc9j3iq6lih3rr8vysiijivcx"; + revision = "1"; + editedCabalFile = "1x8f4l08cfi3sawmhmd7q8krmh3nylgd32q0qx4i2zh2kpvj4ww9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ diff --git a/pkgs/development/haskell-modules/non-hackage-packages.nix b/pkgs/development/haskell-modules/non-hackage-packages.nix index fe7fad15ce37..af317c92a5ab 100644 --- a/pkgs/development/haskell-modules/non-hackage-packages.nix +++ b/pkgs/development/haskell-modules/non-hackage-packages.nix @@ -9,6 +9,8 @@ self: super: { dconf2nix = self.callPackage ../tools/haskell/dconf2nix/dconf2nix.nix { }; + ldgallery-compiler = self.callPackage ../../tools/graphics/ldgallery/compiler { }; + # https://github.com/channable/vaultenv/issues/1 vaultenv = self.callPackage ../tools/haskell/vaultenv { }; @@ -23,6 +25,8 @@ self: super: { hls-tactics-plugin = self.callPackage ../tools/haskell/haskell-language-server/hls-tactics-plugin.nix { }; hls-explicit-imports-plugin = self.callPackage ../tools/haskell/haskell-language-server/hls-explicit-imports-plugin.nix { }; hls-retrie-plugin = self.callPackage ../tools/haskell/haskell-language-server/hls-retrie-plugin.nix { }; + hls-class-plugin = self.callPackage ../tools/haskell/haskell-language-server/hls-class-plugin.nix { }; + hls-eval-plugin = self.callPackage ../tools/haskell/haskell-language-server/hls-eval-plugin.nix { }; nix-output-monitor = self.callPackage ../../tools/nix/nix-output-monitor { }; diff --git a/pkgs/development/interpreters/clojure/default.nix b/pkgs/development/interpreters/clojure/default.nix index f12645ec2b62..06e18c96ac38 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.727"; + version = "1.10.1.763"; src = fetchurl { url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz"; - sha256 = "1mnxvy4n7g72vcwhvrgr0xqri3p9d9w76c8a78kphhmd8lq0m92q"; + sha256 = "042d5bk59wv145fvjrk72g4hvaq7j2p4a2d1pg13b433qfkchgia"; }; nativeBuildInputs = [ @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { offers a software transactional memory system and reactive Agent system that ensure clean, correct, multithreaded designs. ''; - maintainers = with maintainers; [ jlesquembre ]; + maintainers = with maintainers; [ jlesquembre thiagokokada ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/interpreters/dhall/build-dhall-package.nix b/pkgs/development/interpreters/dhall/build-dhall-package.nix index 039c50f06937..9fc9a4412156 100644 --- a/pkgs/development/interpreters/dhall/build-dhall-package.nix +++ b/pkgs/development/interpreters/dhall/build-dhall-package.nix @@ -85,6 +85,6 @@ in ${lib.optionalString (documentationRoot != null) '' mkdir -p $out/${dataDhall} - XDG_DATA_HOME=$out/${data} ${dhall-docs}/bin/dhall-docs --input '${documentationRoot}' --output-link $out/docs + XDG_DATA_HOME=$out/${data} ${dhall-docs}/bin/dhall-docs --input '${documentationRoot}' --package-name '${name}' --output-link $out/docs ''} '' diff --git a/pkgs/development/interpreters/erlang/R16B02-basho.nix b/pkgs/development/interpreters/erlang/R16B02-basho.nix index c94528e674f4..69d0ac6b7a5f 100644 --- a/pkgs/development/interpreters/erlang/R16B02-basho.nix +++ b/pkgs/development/interpreters/erlang/R16B02-basho.nix @@ -59,7 +59,7 @@ mkDerivation { knownVulnerabilities = [ "CVE-2017-1000385" ]; platforms = ["x86_64-linux" "x86_64-darwin"]; - license = pkgs.stdenv.lib.licenses.asl20; - maintainers = with pkgs.stdenv.lib.maintainers; [ mdaiter ]; + license = pkgs.lib.licenses.asl20; + maintainers = with pkgs.lib.maintainers; [ mdaiter ]; }; } diff --git a/pkgs/development/interpreters/erlang/generic-builder.nix b/pkgs/development/interpreters/erlang/generic-builder.nix index 18b658ae37ce..91ea2fe57ab9 100644 --- a/pkgs/development/interpreters/erlang/generic-builder.nix +++ b/pkgs/development/interpreters/erlang/generic-builder.nix @@ -5,7 +5,7 @@ , unixODBC ? null # odbcSupport , libGL ? null, libGLU ? null, wxGTK ? null, wxmac ? null, xorg ? null # wxSupport , parallelBuild ? false -, withSystemd ? stdenv.isLinux, systemd # systemd support in epmd +, systemd }: { baseName ? "erlang" @@ -20,6 +20,7 @@ , enableKernelPoll ? true , javacSupport ? false, javacPackages ? [ openjdk8 ] , odbcSupport ? false, odbcPackages ? [ unixODBC ] +, withSystemd ? stdenv.isLinux # systemd support in epmd , wxSupport ? true, wxPackages ? [ libGL libGLU wxGTK xorg.libX11 ] , preUnpack ? "", postUnpack ? "" , patches ? [], patchPhase ? "", prePatch ? "", postPatch ? "" diff --git a/pkgs/development/interpreters/evcxr/default.nix b/pkgs/development/interpreters/evcxr/default.nix index a97f132b3b2f..59abf36f7ac0 100644 --- a/pkgs/development/interpreters/evcxr/default.nix +++ b/pkgs/development/interpreters/evcxr/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "evcxr"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "google"; repo = "evcxr"; rev = "v${version}"; - sha256 = "sha256-QpUhUE65/IuT/VenziPX6z+CbJswbPPIv/ZnTthZpEU="; + sha256 = "sha256-33XeepqwYmTMcObroPTuxykYuM9qYI1+LV5lZIFSomg="; }; - cargoSha256 = "sha256-iUzVd4XtD+41yTV/BmqWLenzAUNPfS7vIHm1KfuPe9A="; + cargoSha256 = "sha256-tjCID3YeGkxcq/LqJDMHGNpv1MCXKtcLlDnNkFwx1zU="; RUST_SRC_PATH = "${rustPlatform.rustLibSrc}"; diff --git a/pkgs/development/interpreters/gauche/boot.nix b/pkgs/development/interpreters/gauche/boot.nix new file mode 100644 index 000000000000..7fbc66406e67 --- /dev/null +++ b/pkgs/development/interpreters/gauche/boot.nix @@ -0,0 +1,43 @@ +{ stdenv, lib, fetchurl, pkg-config, texinfo, libiconv, gdbm, openssl, zlib +, mbedtls, cacert }: + +stdenv.mkDerivation rec { + pname = "gauche-bootstrap"; + version = "0.9.9"; + + src = fetchurl { + url = "mirror://sourceforge/gauche/Gauche-${version}.tgz"; + sha256 = "1yzpszhw52vkpr65r5d4khf3489mnnvnw58dd2wsvvx7499k5aac"; + }; + + nativeBuildInputs = [ pkg-config texinfo ]; + + buildInputs = [ libiconv gdbm openssl zlib mbedtls cacert ]; + + postPatch = '' + patchShebangs . + ''; + + configureFlags = [ + "--with-iconv=${libiconv}" + "--with-dbm=gdbm" + "--with-zlib=${zlib}" + "--with-ca-bundle=${cacert}/etc/ssl/certs/ca-bundle.crt" + # TODO: Enable slib + # Current slib in nixpkgs is specialized to Guile + # "--with-slib=${slibGuile}/lib/slib" + ]; + + enableParallelBuilding = true; + + # TODO: Fix tests that fail in sandbox build + doCheck = false; + + meta = with lib; { + description = "R7RS Scheme scripting engine"; + homepage = "https://practical-scheme.net/gauche/"; + maintainers = with maintainers; [ mnacamura ]; + license = licenses.bsd3; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/interpreters/gauche/default.nix b/pkgs/development/interpreters/gauche/default.nix index 58653fae8908..75a931c55629 100644 --- a/pkgs/development/interpreters/gauche/default.nix +++ b/pkgs/development/interpreters/gauche/default.nix @@ -1,20 +1,25 @@ -{ stdenv, fetchurl, pkgconfig, texinfo, libiconv, gdbm, openssl, zlib -, mbedtls, cacert -}: +{ stdenv, lib, fetchFromGitHub, autoreconfHook, gaucheBootstrap, pkg-config, texinfo +, libiconv, gdbm, openssl, zlib, mbedtls, cacert }: stdenv.mkDerivation rec { pname = "gauche"; - version = "0.9.9"; + version = "0.9.10"; - src = fetchurl { - url = "mirror://sourceforge/gauche/Gauche-${version}.tgz"; - sha256 = "1yzpszhw52vkpr65r5d4khf3489mnnvnw58dd2wsvvx7499k5aac"; + src = fetchFromGitHub { + owner = "shirok"; + repo = pname; + rev = "release${lib.replaceChars [ "." ] [ "_" ] version}"; + sha256 = "0ki1w7sa10ivmg51sqjskby0gsznb0d3738nz80x589033km5hmb"; }; - nativeBuildInputs = [ pkgconfig texinfo ]; + nativeBuildInputs = [ gaucheBootstrap pkg-config texinfo autoreconfHook ]; buildInputs = [ libiconv gdbm openssl zlib mbedtls cacert ]; + autoreconfPhase = '' + ./DIST gen + ''; + postPatch = '' patchShebangs . ''; @@ -34,7 +39,7 @@ stdenv.mkDerivation rec { # TODO: Fix tests that fail in sandbox build doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "R7RS Scheme scripting engine"; homepage = "https://practical-scheme.net/gauche/"; maintainers = with maintainers; [ mnacamura ]; diff --git a/pkgs/development/interpreters/luajit/2.0.nix b/pkgs/development/interpreters/luajit/2.0.nix index 22ad9aa05f42..ffc406a2a7a3 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-09-27"; - rev = "e8ec6fe"; + version = "2.0.5-2020-12-28"; + rev = "56c04accf975bff2519c34721dccbbdb7b8e6963"; isStable = true; - sha256 = "0v7g216j0zrjp32nfjqqxzgxgvgbdx89h3x0djbqg3avsgxjwnbk"; + sha256 = "0mmx7dy843iqdpyxxdfks860np0311gg58gi4zczx10h62y6jacm"; 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 18b4d32574ab..7335ecd656ac 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-09-30"; - rev = "e9af1ab"; + version = "2.1.0-2020-12-28"; + rev = "65378759f38bb946e40f31799992434effd01bba"; isStable = false; - sha256 = "081vrr4snr1c38cscbq1a8barv7abc9czqqlm4qlbdksa8g32bbj"; + sha256 = "1h78gydlrmvkdrql4ra5a3xr78iiq12bfmny6kiq65v1jbk8f19g"; } diff --git a/pkgs/development/interpreters/php/7.3.nix b/pkgs/development/interpreters/php/7.3.nix index 30e26bf87a1b..13b64e8cb6e2 100644 --- a/pkgs/development/interpreters/php/7.3.nix +++ b/pkgs/development/interpreters/php/7.3.nix @@ -4,8 +4,8 @@ let generic = (import ./generic.nix) _args; base = callPackage generic (_args // { - version = "7.3.25"; - sha256 = "1yq2fwpg9jgcafcrq4ffqm52r0f80pi6zy7fj1yb1qwim96mlcb9"; + version = "7.3.26"; + sha256 = "0klxnf6nhsib9b2mdls1x2wbpi04gmgwxajbn593rzalh5y5l7ip"; # https://bugs.php.net/bug.php?id=76826 extraPatches = lib.optional stdenv.isDarwin ./php73-darwin-isfinite.patch; diff --git a/pkgs/development/interpreters/php/7.4.nix b/pkgs/development/interpreters/php/7.4.nix index b45da1fb86cb..9ee0c9c9e7cc 100644 --- a/pkgs/development/interpreters/php/7.4.nix +++ b/pkgs/development/interpreters/php/7.4.nix @@ -4,8 +4,8 @@ let generic = (import ./generic.nix) _args; base = callPackage generic (_args // { - version = "7.4.13"; - sha256 = "1nhzldjp8jfd1hivfyn5wydim5daibz0vkfxgys2xj8igs2kk8qm"; + version = "7.4.14"; + sha256 = "1xm1s2w9fsd8q7kjbpqw8s4bs7ggziwws23m0ykkmvmd0l3cm2b8"; }); in base.withExtensions ({ all, ... }: with all; ([ diff --git a/pkgs/development/interpreters/php/8.0.nix b/pkgs/development/interpreters/php/8.0.nix index ded661e55853..5779c836dd4f 100644 --- a/pkgs/development/interpreters/php/8.0.nix +++ b/pkgs/development/interpreters/php/8.0.nix @@ -4,8 +4,8 @@ let generic = (import ./generic.nix) _args; base = callPackage generic (_args // { - version = "8.0.0"; - sha256 = "02cx3gvxqvkllp54jfvs83kl8bmpcqyzp9jf1d0l9x5bgv1jv0sy"; + version = "8.0.1"; + sha256 = "1vmx9rhks8v2198f9d6cq62bway5mrfsz72garjdwcyi82ppckn4"; }); in base.withExtensions ({ all, ... }: with all; ([ diff --git a/pkgs/development/interpreters/php/fix-opcache-configure.patch b/pkgs/development/interpreters/php/fix-opcache-configure.patch deleted file mode 100644 index e67d2cc7bc79..000000000000 --- a/pkgs/development/interpreters/php/fix-opcache-configure.patch +++ /dev/null @@ -1,81 +0,0 @@ -diff --git a/Zend/Zend.m4 b/Zend/Zend.m4 -index 726188597496..781e51d3e44c 100644 ---- a/Zend/Zend.m4 -+++ b/Zend/Zend.m4 -@@ -190,12 +190,6 @@ dnl LIBZEND_OTHER_CHECKS - dnl - AC_DEFUN([LIBZEND_OTHER_CHECKS],[ - --AC_ARG_ENABLE([zts], -- [AS_HELP_STRING([--enable-zts], -- [Enable thread safety])], -- [ZEND_ZTS=$enableval], -- [ZEND_ZTS=no]) -- - AC_MSG_CHECKING(whether to enable thread-safety) - AC_MSG_RESULT($ZEND_ZTS) - -diff --git a/configure.ac b/configure.ac -index 8d6e922fa9bf..e07a75d19ac7 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -797,6 +797,19 @@ if test "$PHP_DEBUG_ASSERTIONS" = "yes"; then - ZEND_DEBUG=yes - fi - -+AC_ARG_ENABLE([zts], -+ [AS_HELP_STRING([--enable-zts], -+ [Enable thread safety])], -+ [ZEND_ZTS=$enableval], -+ [ZEND_ZTS=no]) -+ -+if test "$ZEND_ZTS" = "yes"; then -+ AC_DEFINE(ZTS, 1,[ ]) -+ PHP_THREAD_SAFETY=yes -+else -+ PHP_THREAD_SAFETY=no -+fi -+ - PHP_ARG_ENABLE([rtld-now], - [whether to dlopen extensions with RTLD_NOW instead of RTLD_LAZY], - [AS_HELP_STRING([--enable-rtld-now], -@@ -1136,13 +1149,6 @@ LIBZEND_BASIC_CHECKS - LIBZEND_DLSYM_CHECK - LIBZEND_OTHER_CHECKS - --if test "$ZEND_ZTS" = "yes"; then -- AC_DEFINE(ZTS,1,[ ]) -- PHP_THREAD_SAFETY=yes --else -- PHP_THREAD_SAFETY=no --fi -- - INCLUDES="$INCLUDES -I\$(top_builddir)/TSRM" - INCLUDES="$INCLUDES -I\$(top_builddir)/Zend" - -diff --git a/ext/opcache/config.m4 b/ext/opcache/config.m4 -index 054cd28c0247..93d72fb73d19 100644 ---- a/ext/opcache/config.m4 -+++ b/ext/opcache/config.m4 -@@ -66,7 +66,7 @@ if test "$PHP_OPCACHE" != "no"; then - esac - fi - -- if test "$enable_zts" = "yes"; then -+ if test "$PHP_THREAD_SAFETY" = "yes"; then - DASM_FLAGS="$DASM_FLAGS -D ZTS=1" - fi - -diff --git a/ext/session/config.m4 b/ext/session/config.m4 -index 7abc8813b72a..da31bbde86cc 100644 ---- a/ext/session/config.m4 -+++ b/ext/session/config.m4 -@@ -31,7 +31,7 @@ if test "$PHP_MM" != "no"; then - AC_MSG_ERROR(cannot find mm library) - fi - -- if test "$enable_zts" = "yes"; then -+ if test "$PHP_THREAD_SAFETY" = "yes"; then - dnl The mm library is not thread-safe, and mod_mm.c refuses to compile. - AC_MSG_ERROR(--with-mm cannot be combined with --enable-zts) - fi \ No newline at end of file diff --git a/pkgs/development/interpreters/proglodyte-wasm/default.nix b/pkgs/development/interpreters/proglodyte-wasm/default.nix index 8ebbf6cf5012..3569f66aed0a 100644 --- a/pkgs/development/interpreters/proglodyte-wasm/default.nix +++ b/pkgs/development/interpreters/proglodyte-wasm/default.nix @@ -14,7 +14,8 @@ let # set this to nonempty string to disable default cmake configure ''; - buildInputs = [ cmake clang python ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ clang python ]; buildPhase = "make clang-debug-no-tests"; diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix index e6ab1f218795..4c0501aebcd2 100644 --- a/pkgs/development/interpreters/python/cpython/2.7/default.nix +++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix @@ -114,6 +114,9 @@ let # libuuid, slowing down program startup a lot). ./no-ldconfig.patch + # Fix ctypes.util.find_library with gcc10. + ./find_library-gcc10.patch + ] ++ optionals stdenv.hostPlatform.isCygwin [ ./2.5.2-ctypes-util-find_library.patch ./2.5.2-tkinter-x11.patch diff --git a/pkgs/development/interpreters/python/cpython/2.7/find_library-gcc10.patch b/pkgs/development/interpreters/python/cpython/2.7/find_library-gcc10.patch new file mode 100644 index 000000000000..4627baf119c1 --- /dev/null +++ b/pkgs/development/interpreters/python/cpython/2.7/find_library-gcc10.patch @@ -0,0 +1,79 @@ +Backport https://github.com/python/cpython/commit/82df3b3071bb003247c33eac4670775e9883c994 +and https://github.com/python/cpython/commit/27ac19cca2c639caaf6fedf3632fe6beb265f24f + +Fixes the check phase of python2Packages.cffi. + +--- a/Lib/ctypes/util.py ++++ b/Lib/ctypes/util.py +@@ -87,6 +87,12 @@ elif os.name == "posix": + # Andreas Degert's find functions, using gcc, /sbin/ldconfig, objdump + import re, tempfile, errno + ++ def _is_elf(filename): ++ "Return True if the given file is an ELF file" ++ elf_header = b'\x7fELF' ++ with open(filename, 'rb') as thefile: ++ return thefile.read(4) == elf_header ++ + def _findLib_gcc(name): + # Run GCC's linker with the -t (aka --trace) option and examine the + # library name it prints out. The GCC command will fail because we +@@ -110,10 +116,17 @@ elif os.name == "posix": + # the normal behaviour of GCC if linking fails + if e.errno != errno.ENOENT: + raise +- res = re.search(expr, trace) ++ res = re.findall(expr, trace) + if not res: + return None +- return res.group(0) ++ ++ for file in res: ++ # Check if the given file is an elf file: gcc can report ++ # some files that are linker scripts and not actual ++ # shared objects. See bpo-41976 for more details ++ if not _is_elf(file): ++ continue ++ return file + + + if sys.platform == "sunos5": +@@ -237,8 +250,37 @@ elif os.name == "posix": + def _findSoname_ldconfig(name): + return None + ++ def _findLib_ld(name): ++ # See issue #9998 for why this is needed ++ expr = r'[^\(\)\s]*lib%s\.[^\(\)\s]*' % re.escape(name) ++ cmd = ['ld', '-t'] ++ libpath = os.environ.get('LD_LIBRARY_PATH') ++ if libpath: ++ for d in libpath.split(':'): ++ cmd.extend(['-L', d]) ++ cmd.extend(['-o', os.devnull, '-l%s' % name]) ++ result = None ++ try: ++ p = subprocess.Popen(cmd, stdout=subprocess.PIPE, ++ stderr=subprocess.PIPE, ++ universal_newlines=True) ++ out, _ = p.communicate() ++ res = re.findall(expr, out) ++ for file in res: ++ # Check if the given file is an elf file: gcc can report ++ # some files that are linker scripts and not actual ++ # shared objects. See bpo-41976 for more details ++ if not _is_elf(file): ++ continue ++ return file ++ except Exception: ++ pass # result will be None ++ return result ++ + def find_library(name): +- return _findSoname_ldconfig(name) or _get_soname(_findLib_gcc(name)) ++ # See issue #9998 ++ return _findSoname_ldconfig(name) or \ ++ _get_soname(_findLib_gcc(name)) or _get_soname(_findLib_ld(name)) + + ################################################################ + # test code diff --git a/pkgs/development/interpreters/python/cpython/3.6/fix-finding-headers-when-cross-compiling.patch b/pkgs/development/interpreters/python/cpython/3.6/fix-finding-headers-when-cross-compiling.patch new file mode 100644 index 000000000000..d324d10b39fc --- /dev/null +++ b/pkgs/development/interpreters/python/cpython/3.6/fix-finding-headers-when-cross-compiling.patch @@ -0,0 +1,54 @@ +From 45dfbbb4f5b67ab83e4365564ea569334e979f8e Mon Sep 17 00:00:00 2001 +From: Ben Wolsieffer +Date: Fri, 25 Sep 2020 16:49:16 -0400 +Subject: [PATCH] Fix finding headers when cross compiling + +When cross-compiling third-party extensions, get_python_inc() may be called to +return the path to Python's headers. However, it uses the sys.prefix or +sys.exec_prefix of the build Python, which returns incorrect paths when +cross-compiling (paths pointing to build system headers). + +To fix this, we use the INCLUDEPY and CONFINCLUDEPY conf variables, which can +be configured to point at host Python by setting _PYTHON_SYSCONFIGDATA_NAME. +The existing behavior is maintained on non-POSIX platforms or if a prefix is +manually specified. +--- + Lib/distutils/sysconfig.py | 14 ++++++++++---- + 1 file changed, 10 insertions(+), 4 deletions(-) + +diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py +index 2bcd1dd288..567375e488 100644 +--- a/Lib/distutils/sysconfig.py ++++ b/Lib/distutils/sysconfig.py +@@ -84,8 +84,6 @@ def get_python_inc(plat_specific=0, prefix=None): + If 'prefix' is supplied, use it instead of sys.base_prefix or + sys.base_exec_prefix -- i.e., ignore 'plat_specific'. + """ +- if prefix is None: +- prefix = plat_specific and BASE_EXEC_PREFIX or BASE_PREFIX + if os.name == "posix": + if python_build: + # Assume the executable is in the build directory. The +@@ -98,9 +96,17 @@ def get_python_inc(plat_specific=0, prefix=None): + else: + incdir = os.path.join(get_config_var('srcdir'), 'Include') + return os.path.normpath(incdir) +- python_dir = 'python' + get_python_version() + build_flags +- return os.path.join(prefix, "include", python_dir) ++ if prefix is None: ++ if plat_specific: ++ return get_config_var('CONFINCLUDEPY') ++ else: ++ return get_config_var('INCLUDEPY') ++ else: ++ python_dir = 'python' + get_python_version() + build_flags ++ return os.path.join(prefix, "include", python_dir) + elif os.name == "nt": ++ if prefix is None: ++ prefix = plat_specific and BASE_EXEC_PREFIX or BASE_PREFIX + return os.path.join(prefix, "include") + else: + raise DistutilsPlatformError( +-- +2.28.0 + diff --git a/pkgs/development/interpreters/python/cpython/3.7/find_library.patch b/pkgs/development/interpreters/python/cpython/3.7/find_library.patch new file mode 100644 index 000000000000..97fb66662d03 --- /dev/null +++ b/pkgs/development/interpreters/python/cpython/3.7/find_library.patch @@ -0,0 +1,105 @@ +From 9b5a023a5dc3127da15253f7acad71019395ebe1 Mon Sep 17 00:00:00 2001 +From: Pablo Galindo +Date: Thu, 8 Oct 2020 19:50:37 +0100 +Subject: [PATCH] [3.7] bpo-41976: Fix the fallback to gcc of + ctypes.util.find_library when using gcc>9 (GH-22598). (GH-22601) + +(cherry picked from commit 27ac19cca2c639caaf6fedf3632fe6beb265f24f) + +Co-authored-by: Pablo Galindo +--- + Lib/ctypes/test/test_find.py | 12 ++++++- + Lib/ctypes/util.py | 32 +++++++++++++++---- + .../2020-10-08-18-22-28.bpo-41976.Svm0wb.rst | 3 ++ + 3 files changed, 39 insertions(+), 8 deletions(-) + create mode 100644 Misc/NEWS.d/next/Library/2020-10-08-18-22-28.bpo-41976.Svm0wb.rst + +diff --git a/Lib/ctypes/test/test_find.py b/Lib/ctypes/test/test_find.py +index b99fdcba7b28f..92ac1840ad7d4 100644 +--- a/Lib/ctypes/test/test_find.py ++++ b/Lib/ctypes/test/test_find.py +@@ -1,4 +1,5 @@ + import unittest ++import unittest.mock + import os.path + import sys + import test.support +@@ -72,7 +73,7 @@ def test_shell_injection(self): + + @unittest.skipUnless(sys.platform.startswith('linux'), + 'Test only valid for Linux') +-class LibPathFindTest(unittest.TestCase): ++class FindLibraryLinux(unittest.TestCase): + def test_find_on_libpath(self): + import subprocess + import tempfile +@@ -111,6 +112,15 @@ def test_find_on_libpath(self): + # LD_LIBRARY_PATH) + self.assertEqual(find_library(libname), 'lib%s.so' % libname) + ++ def test_find_library_with_gcc(self): ++ with unittest.mock.patch("ctypes.util._findSoname_ldconfig", lambda *args: None): ++ self.assertNotEqual(find_library('c'), None) ++ ++ def test_find_library_with_ld(self): ++ with unittest.mock.patch("ctypes.util._findSoname_ldconfig", lambda *args: None), \ ++ unittest.mock.patch("ctypes.util._findLib_gcc", lambda *args: None): ++ self.assertNotEqual(find_library('c'), None) ++ + + if __name__ == "__main__": + unittest.main() +diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py +index 97973bce001d9..0c2510e1619c8 100644 +--- a/Lib/ctypes/util.py ++++ b/Lib/ctypes/util.py +@@ -93,6 +93,12 @@ def find_library(name): + # Andreas Degert's find functions, using gcc, /sbin/ldconfig, objdump + import re, tempfile + ++ def _is_elf(filename): ++ "Return True if the given file is an ELF file" ++ elf_header = b'\x7fELF' ++ with open(filename, 'br') as thefile: ++ return thefile.read(4) == elf_header ++ + def _findLib_gcc(name): + # Run GCC's linker with the -t (aka --trace) option and examine the + # library name it prints out. The GCC command will fail because we +@@ -299,17 +312,22 @@ def _findLib_ld(name): + stderr=subprocess.PIPE, + universal_newlines=True) + out, _ = p.communicate() +- res = re.search(expr, os.fsdecode(out)) +- if res: +- result = res.group(0) +- except Exception as e: ++ res = re.findall(expr, os.fsdecode(out)) ++ for file in res: ++ # Check if the given file is an elf file: gcc can report ++ # some files that are linker scripts and not actual ++ # shared objects. See bpo-41976 for more details ++ if not _is_elf(file): ++ continue ++ return os.fsdecode(file) ++ except Exception: + pass # result will be None + return result + + def find_library(name): + # See issue #9998 + return _findSoname_ldconfig(name) or \ +- _get_soname(_findLib_gcc(name) or _findLib_ld(name)) ++ _get_soname(_findLib_gcc(name)) or _get_soname(_findLib_ld(name)) + + ################################################################ + # test code +diff --git a/Misc/NEWS.d/next/Library/2020-10-08-18-22-28.bpo-41976.Svm0wb.rst b/Misc/NEWS.d/next/Library/2020-10-08-18-22-28.bpo-41976.Svm0wb.rst +new file mode 100644 +index 0000000000000..c8b3fc771845e +--- /dev/null ++++ b/Misc/NEWS.d/next/Library/2020-10-08-18-22-28.bpo-41976.Svm0wb.rst +@@ -0,0 +1,3 @@ ++Fixed a bug that was causing :func:`ctypes.util.find_library` to return ++``None`` when triying to locate a library in an environment when gcc>=9 is ++available and ``ldconfig`` is not. Patch by Pablo Galindo diff --git a/pkgs/development/interpreters/python/cpython/3.7/fix-finding-headers-when-cross-compiling.patch b/pkgs/development/interpreters/python/cpython/3.7/fix-finding-headers-when-cross-compiling.patch new file mode 100644 index 000000000000..543e267e94bf --- /dev/null +++ b/pkgs/development/interpreters/python/cpython/3.7/fix-finding-headers-when-cross-compiling.patch @@ -0,0 +1,54 @@ +From debccd4be0a8d619770f63622d9de1b451dd02ac Mon Sep 17 00:00:00 2001 +From: Ben Wolsieffer +Date: Fri, 25 Sep 2020 16:49:16 -0400 +Subject: [PATCH] Fix finding headers when cross compiling + +When cross-compiling third-party extensions, get_python_inc() may be called to +return the path to Python's headers. However, it uses the sys.prefix or +sys.exec_prefix of the build Python, which returns incorrect paths when +cross-compiling (paths pointing to build system headers). + +To fix this, we use the INCLUDEPY and CONFINCLUDEPY conf variables, which can +be configured to point at host Python by setting _PYTHON_SYSCONFIGDATA_NAME. +The existing behavior is maintained on non-POSIX platforms or if a prefix is +manually specified. +--- + Lib/distutils/sysconfig.py | 14 ++++++++++---- + 1 file changed, 10 insertions(+), 4 deletions(-) + +diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py +index 37feae5df7..6d4ad06696 100644 +--- a/Lib/distutils/sysconfig.py ++++ b/Lib/distutils/sysconfig.py +@@ -95,8 +95,6 @@ def get_python_inc(plat_specific=0, prefix=None): + If 'prefix' is supplied, use it instead of sys.base_prefix or + sys.base_exec_prefix -- i.e., ignore 'plat_specific'. + """ +- if prefix is None: +- prefix = plat_specific and BASE_EXEC_PREFIX or BASE_PREFIX + if os.name == "posix": + if python_build: + # Assume the executable is in the build directory. The +@@ -109,9 +107,17 @@ def get_python_inc(plat_specific=0, prefix=None): + else: + incdir = os.path.join(get_config_var('srcdir'), 'Include') + return os.path.normpath(incdir) +- python_dir = 'python' + get_python_version() + build_flags +- return os.path.join(prefix, "include", python_dir) ++ if prefix is None: ++ if plat_specific: ++ return get_config_var('CONFINCLUDEPY') ++ else: ++ return get_config_var('INCLUDEPY') ++ else: ++ python_dir = 'python' + get_python_version() + build_flags ++ return os.path.join(prefix, "include", python_dir) + elif os.name == "nt": ++ if prefix is None: ++ prefix = plat_specific and BASE_EXEC_PREFIX or BASE_PREFIX + if python_build: + # Include both the include and PC dir to ensure we can find + # pyconfig.h +-- +2.28.0 + diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index cd06c2b63670..d49de17ebce4 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -35,7 +35,7 @@ , rebuildBytecode ? true , stripBytecode ? false , includeSiteCustomize ? true -, static ? false +, static ? stdenv.hostPlatform.isStatic # Not using optimizations on Darwin # configure: error: llvm-profdata is required for a --enable-optimizations build but could not be found. , enableOptimizations ? (!stdenv.isDarwin) @@ -100,6 +100,50 @@ let "$out/bin/python" else pythonForBuild.interpreter; + # The CPython interpreter contains a _sysconfigdata_ + # module that is imported by the sysconfig and distutils.sysconfig modules. + # The sysconfigdata module is generated at build time and contains settings + # required for building Python extension modules, such as include paths and + # other compiler flags. By default, the sysconfigdata module is loaded from + # the currently running interpreter (ie. the build platform interpreter), but + # when cross-compiling we want to load it from the host platform interpreter. + # This can be done using the _PYTHON_SYSCONFIGDATA_NAME environment variable. + # The _PYTHON_HOST_PLATFORM variable also needs to be set to get the correct + # platform suffix on extension modules. The correct values for these variables + # are not documented, and must be derived from the configure script (see links + # below). + sysconfigdataHook = with stdenv.hostPlatform; with passthru; let + # https://github.com/python/cpython/blob/e488e300f5c01289c10906c2e53a8e43d6de32d8/configure.ac#L428 + # The configure script uses "arm" as the CPU name for all 32-bit ARM + # variants when cross-compiling, but native builds include the version + # suffix, so we do the same. + pythonHostPlatform = "${parsed.kernel.name}-${parsed.cpu.name}"; + + # https://github.com/python/cpython/blob/e488e300f5c01289c10906c2e53a8e43d6de32d8/configure.ac#L724 + multiarchCpu = + if isAarch32 then + if parsed.cpu.significantByte.name == "littleEndian" then "arm" else "armeb" + else if isx86_32 then "i386" + else parsed.cpu.name; + multiarch = + if isDarwin then "darwin" + else "${multiarchCpu}-${parsed.kernel.name}-${parsed.abi.name}"; + + abiFlags = optionalString (isPy36 || isPy37) "m"; + + # https://github.com/python/cpython/blob/e488e300f5c01289c10906c2e53a8e43d6de32d8/configure.ac#L78 + pythonSysconfigdataName = "_sysconfigdata_${abiFlags}_${parsed.kernel.name}_${multiarch}"; + in '' + sysconfigdataHook() { + if [ "$1" = '${placeholder "out"}' ]; then + export _PYTHON_HOST_PLATFORM='${pythonHostPlatform}' + export _PYTHON_SYSCONFIGDATA_NAME='${pythonSysconfigdataName}' + fi + } + + addEnvHooks "$hostOffset" sysconfigdataHook + ''; + in with passthru; stdenv.mkDerivation { pname = "python3"; inherit version; @@ -165,6 +209,16 @@ in with passthru; stdenv.mkDerivation { ] ++ [ # LDSHARED now uses $CC instead of gcc. Fixes cross-compilation of extension modules. ./3.8/0001-On-all-posix-systems-not-just-Darwin-set-LDSHARED-if.patch + # Use sysconfigdata to find headers. Fixes cross-compilation of extension modules. + ( + if isPy36 then + ./3.6/fix-finding-headers-when-cross-compiling.patch + else + ./3.7/fix-finding-headers-when-cross-compiling.patch + ) + ] ++ optionals (isPy36 || isPy37 || isPy38) [ + # Backport a fix for ctypes.util.find_library. + ./3.7/find_library.patch ]; postPatch = '' @@ -278,6 +332,10 @@ in with passthru; stdenv.mkDerivation { find $out/lib/python*/config-* -type f -print -exec nuke-refs -e $out '{}' + find $out/lib -name '_sysconfigdata*.py*' -print -exec nuke-refs -e $out '{}' + + # Make the sysconfigdata module accessible on PYTHONPATH + # This allows build Python to import host Python's sysconfigdata + mkdir -p "$out/${sitePackages}" + ln -s "$out/lib/${libPrefix}/"_sysconfigdata*.py "$out/${sitePackages}/" '' + optionalString stripConfig '' rm -R $out/bin/python*-config $out/lib/python*/config-* '' + optionalString stripIdlelib '' @@ -310,6 +368,14 @@ in with passthru; stdenv.mkDerivation { export PATH=${stdenv.lib.makeBinPath [ "$out" bash ]}:$PATH ''; + # Add CPython specific setup-hook that configures distutils.sysconfig to + # always load sysconfigdata from host Python. + postFixup = stdenv.lib.optionalString (!stdenv.hostPlatform.isDarwin) '' + cat << "EOF" >> "$out/nix-support/setup-hook" + ${sysconfigdataHook} + EOF + ''; + # Enforce that we don't have references to the OpenSSL -dev package, which we # explicitly specify in our configure flags above. disallowedReferences = diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index a217f62986db..c1a61fb6a8b7 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -24,7 +24,7 @@ with pkgs; pythonPackages = callPackage ({ pkgs, stdenv, python, overrides }: let pythonPackagesFun = import ../../../top-level/python-packages.nix { - inherit stdenv pkgs; + inherit stdenv pkgs lib; python = self; }; otherSplices = { diff --git a/pkgs/development/interpreters/self/default.nix b/pkgs/development/interpreters/self/default.nix index cf62399adc64..0d5cc061f591 100644 --- a/pkgs/development/interpreters/self/default.nix +++ b/pkgs/development/interpreters/self/default.nix @@ -1,6 +1,6 @@ -{ fetchgit, stdenv, xorg, makeWrapper, ncurses, cmake }: +{ stdenv, fetchFromGitHub, libX11, libXext, makeWrapper, ncurses, cmake }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { # The Self wrapper stores source in $XDG_DATA_HOME/self or ~/.local/share/self # so that it can be written to when using the Self transposer. Running 'Self' # after installation runs without an image. You can then build a Self image with: @@ -11,16 +11,18 @@ stdenv.mkDerivation { # This image can later be started with: # $ Self -s myimage.snap # - version = "4.5.0"; pname = "self"; + version = "2017.1"; - src = fetchgit { - url = "https://github.com/russellallen/self"; - rev = "d16bcaad3c5092dae81ad0b16d503f2a53b8ef86"; - sha256 = "1dhs6209407j0ll9w9id31vbawdrm9nz1cjak8g8hixrw1nid4i5"; + src = fetchFromGitHub { + owner = "russellallen"; + repo = pname; + rev = version; + sha256 = "C/1Q6yFmoXx2F97xuvkm8DxFmmvuBS7uYZOxq/CRNog="; }; - buildInputs = [ ncurses xorg.libX11 xorg.libXext makeWrapper cmake ]; + nativeBuildInputs = [ cmake makeWrapper ]; + buildInputs = [ ncurses libX11 libXext ]; selfWrapper = ./self; @@ -33,12 +35,11 @@ stdenv.mkDerivation { --set SELF_ROOT "$out" ''; - meta = { + meta = with stdenv.lib; { description = "A prototype-based dynamic object-oriented programming language, environment, and virtual machine"; homepage = "https://selflanguage.org/"; - license = stdenv.lib.licenses.bsd3; - maintainers = [ stdenv.lib.maintainers.doublec ]; - platforms = with stdenv.lib.platforms; linux; - broken = true; # segfaults on gcc > 4.4 + license = licenses.bsd3; + maintainers = [ maintainers.doublec ]; + platforms = platforms.linux; }; } diff --git a/pkgs/development/interpreters/supercollider/default.nix b/pkgs/development/interpreters/supercollider/default.nix index acdffba8d72b..113eb54a00ba 100644 --- a/pkgs/development/interpreters/supercollider/default.nix +++ b/pkgs/development/interpreters/supercollider/default.nix @@ -1,4 +1,4 @@ -{ stdenv, mkDerivation, fetchurl, cmake, pkgconfig, alsaLib +{ stdenv, fetchurl, cmake, pkgconfig, alsaLib , libjack2, libsndfile, fftw, curl, gcc , libXt, qtbase, qttools, qtwebengine , readline, qtwebsockets, useSCEL ? false, emacs @@ -7,7 +7,7 @@ let optional = stdenv.lib.optional; in -mkDerivation rec { +stdenv.mkDerivation rec { pname = "supercollider"; version = "3.11.2"; @@ -26,8 +26,6 @@ mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig qttools ]; - enableParallelBuilding = true; - buildInputs = [ gcc libjack2 libsndfile fftw curl libXt qtbase qtwebengine qtwebsockets readline ] ++ optional (!stdenv.isDarwin) alsaLib diff --git a/pkgs/development/java-modules/jogl/default.nix b/pkgs/development/java-modules/jogl/default.nix index d4e5f1b62bf7..5f20adada23e 100644 --- a/pkgs/development/java-modules/jogl/default.nix +++ b/pkgs/development/java-modules/jogl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, ant, jdk8, git, xorg, udev, libGL, libGLU }: +{ lib, stdenv, fetchgit, ant, jdk8, git, xorg, udev, libGL, libGLU }: { jogl_2_3_2 = @@ -55,7 +55,7 @@ cp $NIX_BUILD_TOP/jogl/build/jar/jogl-all{,-natives-linux-amd64}.jar $out/share/java/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Java libraries for 3D Graphics, Multimedia and Processing"; homepage = "https://jogamp.org/"; license = licenses.bsd3; diff --git a/pkgs/development/java-modules/postgresql_jdbc/default.nix b/pkgs/development/java-modules/postgresql_jdbc/default.nix index 01041d775398..e7968cf80c0a 100644 --- a/pkgs/development/java-modules/postgresql_jdbc/default.nix +++ b/pkgs/development/java-modules/postgresql_jdbc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchMavenArtifact }: +{ lib, stdenv, fetchMavenArtifact }: stdenv.mkDerivation rec { pname = "postgresql-jdbc"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { install -m444 -D $src/share/java/*postgresql-${version}.jar $out/share/java/postgresql-jdbc.jar ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://jdbc.postgresql.org/"; description = "JDBC driver for PostgreSQL allowing Java programs to connect to a PostgreSQL database"; license = licenses.bsd2; diff --git a/pkgs/development/libraries/NSPlist/default.nix b/pkgs/development/libraries/NSPlist/default.nix index bfee99619840..9cf5e9195480 100644 --- a/pkgs/development/libraries/NSPlist/default.nix +++ b/pkgs/development/libraries/NSPlist/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "0v4yfiwfd08hmh2ydgy6pnmlzjbd96k78dsla9pfd56ka89aw74r"; }; - buildInputs = [ cmake ]; + nativeBuildInputs = [ cmake ]; meta = with stdenv.lib; { maintainers = with maintainers; [ matthewbauer ]; diff --git a/pkgs/development/libraries/PlistCpp/default.nix b/pkgs/development/libraries/PlistCpp/default.nix index f7703b731b99..3501fa8b4358 100644 --- a/pkgs/development/libraries/PlistCpp/default.nix +++ b/pkgs/development/libraries/PlistCpp/default.nix @@ -10,8 +10,8 @@ stdenv.mkDerivation { sha256 = "10jn6bvm9vn6492zix2pd724v5h4lccmkqg3lxfw8r0qg3av0yzv"; }; - buildInputs = [ cmake boost NSPlist pugixml ]; - + nativeBuildInputs = [ cmake ]; + buildInputs = [ boost NSPlist pugixml ]; meta = with stdenv.lib; { maintainers = with maintainers; [ matthewbauer ]; diff --git a/pkgs/development/libraries/accounts-qt/default.nix b/pkgs/development/libraries/accounts-qt/default.nix index b60d8d07385c..4e2e33b852e8 100644 --- a/pkgs/development/libraries/accounts-qt/default.nix +++ b/pkgs/development/libraries/accounts-qt/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitLab, doxygen, glib, libaccounts-glib, pkgconfig, qtbase, qmake }: +{ mkDerivation, lib, fetchFromGitLab, doxygen, glib, libaccounts-glib, pkgconfig, qmake }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "accounts-qt"; version = "1.16"; @@ -11,17 +11,13 @@ stdenv.mkDerivation rec { owner = "accounts-sso"; }; - buildInputs = [ glib libaccounts-glib qtbase ]; + propagatedBuildInputs = [ glib libaccounts-glib ]; nativeBuildInputs = [ doxygen pkgconfig qmake ]; - preConfigure = '' - qmakeFlags="$qmakeFlags LIBDIR=$out/lib CMAKE_CONFIG_PATH=$out/lib/cmake" - ''; - # Hack to avoid TMPDIR in RPATHs. preFixup = ''rm -rf "$(pwd)" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Qt library for accessing the online accounts database"; homepage = "https://gitlab.com/accounts-sso"; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/alembic/default.nix b/pkgs/development/libraries/alembic/default.nix index 126300aa1945..db22f463df00 100644 --- a/pkgs/development/libraries/alembic/default.nix +++ b/pkgs/development/libraries/alembic/default.nix @@ -17,8 +17,6 @@ stdenv.mkDerivation rec nativeBuildInputs = [ unzip cmake ]; buildInputs = [ openexr hdf5-threadsafe ]; - enableParallelBuilding = true; - buildPhase = '' cmake -DUSE_HDF5=ON -DCMAKE_INSTALL_PREFIX=$out/ -DUSE_TESTS=OFF . diff --git a/pkgs/development/libraries/alure/default.nix b/pkgs/development/libraries/alure/default.nix index 59926f52b078..1f4dafeb3628 100644 --- a/pkgs/development/libraries/alure/default.nix +++ b/pkgs/development/libraries/alure/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0w8gsyqki21s1qb2s5ac1kj08i6nc937c0rr08xbw9w9wvd6lpj6"; }; - buildInputs = [ cmake openal ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ openal ]; meta = with stdenv.lib; { description = "A utility library to help manage common tasks with OpenAL applications"; diff --git a/pkgs/development/libraries/aml/default.nix b/pkgs/development/libraries/aml/default.nix index 37d8859ba50d..8b4eccb9ffff 100644 --- a/pkgs/development/libraries/aml/default.nix +++ b/pkgs/development/libraries/aml/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "aml"; - version = "0.1.0"; + version = "0.2.0"; src = fetchFromGitHub { owner = "any1"; repo = pname; rev = "v${version}"; - sha256 = "1pmiflkd9idnf6p0rnmccqqlj87k8crz9ixpx6rix671vnpk0xzi"; + sha256 = "0mxmzlhiv88hm4sf8kyawyrml8qy1xis019hdyb5skl9g95z9yyf"; }; nativeBuildInputs = [ meson pkg-config ninja ]; diff --git a/pkgs/development/libraries/argtable/default.nix b/pkgs/development/libraries/argtable/default.nix new file mode 100644 index 000000000000..bf953d87fe2a --- /dev/null +++ b/pkgs/development/libraries/argtable/default.nix @@ -0,0 +1,40 @@ +{ stdenv +, fetchFromGitHub +, cmake +}: + +stdenv.mkDerivation rec { + pname = "argtable"; + version = "3.1.5"; + srcVersion = "v${version}.1c1bb23"; + + src = fetchFromGitHub { + owner = "argtable"; + repo = "argtable3"; + rev = srcVersion; + sha256 = "sha256-sL6mnxsuL1K0DY26jLF/2Czo0RxHYJ3xU3VyavISiMM="; + }; + + nativeBuildInputs = [ cmake ]; + + postPatch = '' + patchShebangs tools/build + ''; + + meta = with stdenv.lib; { + homepage = "https://argtable.org"; + description = "A single-file, ANSI C command-line parsing library"; + longDescription = '' + Argtable is an open source ANSI C library that parses GNU-style + command-line options. It simplifies command-line parsing by defining a + declarative-style API that you can use to specify what your command-line + syntax looks like. Argtable will automatically generate consistent error + handling logic and textual descriptions of the command line syntax, which + are essential but tedious to implement for a robust CLI program. + ''; + license = with licenses; bsd3; + maintainers = with maintainers; [ AndersonTorres artuuge ]; + platforms = with platforms; all; + }; +} +# TODO [ AndersonTorres ]: a NixOS test suite diff --git a/pkgs/development/libraries/arrayfire/default.nix b/pkgs/development/libraries/arrayfire/default.nix index 9dd4b1b93a9d..3e678c8544e0 100644 --- a/pkgs/development/libraries/arrayfire/default.nix +++ b/pkgs/development/libraries/arrayfire/default.nix @@ -36,8 +36,6 @@ stdenv.mkDerivation rec { export CUDA_PATH="${cudatoolkit}" ''; - enableParallelBuilding = true; - nativeBuildInputs = [ cmake pkgconfig diff --git a/pkgs/development/libraries/arrow-cpp/default.nix b/pkgs/development/libraries/arrow-cpp/default.nix index 1d9a528b4c6a..a9e738f7e9a1 100644 --- a/pkgs/development/libraries/arrow-cpp/default.nix +++ b/pkgs/development/libraries/arrow-cpp/default.nix @@ -1,7 +1,8 @@ { stdenv, lib, fetchurl, fetchFromGitHub, fetchpatch, fixDarwinDylibNames , autoconf, boost, brotli, cmake, flatbuffers, gflags, glog, gtest, lz4 , perl, python3, rapidjson, snappy, thrift, utf8proc, which, zlib, zstd -, enableShared ? true }: +, enableShared ? !stdenv.hostPlatform.isStatic +}: let arrow-testing = fetchFromGitHub { diff --git a/pkgs/development/libraries/assimp/default.nix b/pkgs/development/libraries/assimp/default.nix index c1972aa1ca81..9c5b75999f16 100644 --- a/pkgs/development/libraries/assimp/default.nix +++ b/pkgs/development/libraries/assimp/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "00vxzfcrs856qnyk806wqr67nmpjk06mjby0fqmyhm6i1jj2hg1w"; }; - buildInputs = [ cmake boost zlib ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ boost zlib ]; meta = with stdenv.lib; { description = "A library to import various 3D model formats"; diff --git a/pkgs/development/libraries/audio/jamomacore/default.nix b/pkgs/development/libraries/audio/jamomacore/default.nix index 7c9b3ef67c9b..c08b25fea37a 100644 --- a/pkgs/development/libraries/audio/jamomacore/default.nix +++ b/pkgs/development/libraries/audio/jamomacore/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, alsaLib, portaudio, portmidi, libsndfile, cmake, libxml2 }: +{ stdenv, fetchFromGitHub, pkg-config, alsaLib, portaudio, portmidi, libsndfile, cmake, libxml2 }: stdenv.mkDerivation rec { version = "1.0-beta.1"; @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1hb9b6qc18rsvzvixgllknn756m6zwcn22c79rdibbyz1bhrcnln"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ alsaLib portaudio portmidi libsndfile cmake libxml2 ]; + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ alsaLib portaudio portmidi libsndfile libxml2 ]; meta = { description = "A C++ platform for building dynamic and reflexive systems with an emphasis on audio and media"; diff --git a/pkgs/development/libraries/audio/libgme/default.nix b/pkgs/development/libraries/audio/libgme/default.nix index 3ac8293986d8..d70b6cfbde8e 100644 --- a/pkgs/development/libraries/audio/libgme/default.nix +++ b/pkgs/development/libraries/audio/libgme/default.nix @@ -20,9 +20,7 @@ in stdenv.mkDerivation { sha256 = "100ahb4n4pvgcry9xzlf2fr4j57n5h9x7pvyhhxys4dcy8axqqsy"; }; - buildInputs = [ cmake ]; - - nativeBuildInputs = [ removeReferencesTo ]; + nativeBuildInputs = [ cmake removeReferencesTo ]; # It used to reference it, in the past, but thanks to the postFixup hook, now # it doesn't. diff --git a/pkgs/development/libraries/audio/mbelib/default.nix b/pkgs/development/libraries/audio/mbelib/default.nix index 1fda3a919264..993bbcd09c15 100644 --- a/pkgs/development/libraries/audio/mbelib/default.nix +++ b/pkgs/development/libraries/audio/mbelib/default.nix @@ -13,8 +13,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - enableParallelBuilding = true; - doCheck = true; preCheck = '' export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD diff --git a/pkgs/development/libraries/audiofile/default.nix b/pkgs/development/libraries/audiofile/default.nix index 9f945b15dec2..86531a6ad25d 100644 --- a/pkgs/development/libraries/audiofile/default.nix +++ b/pkgs/development/libraries/audiofile/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { # # There might be a more sensible way to do this with autotools, but I am not # smart enough to discover it. - preBuild = lib.optionalString stdenv.targetPlatform.isStatic '' + preBuild = lib.optionalString stdenv.hostPlatform.isStatic '' make -C libaudiofile $makeFlags sed -i "s/dependency_libs=.*/dependency_libs=' -lstdc++'/" libaudiofile/libaudiofile.la ''; diff --git a/pkgs/development/libraries/avro-c++/default.nix b/pkgs/development/libraries/avro-c++/default.nix index 3e7bc67d25b3..9ac609f1679c 100644 --- a/pkgs/development/libraries/avro-c++/default.nix +++ b/pkgs/development/libraries/avro-c++/default.nix @@ -11,19 +11,14 @@ stdenv.mkDerivation { sha256 = "1ars58bfw83s8f1iqbhnqp4n9wc9cxsph0gs2a8k7r9fi09vja2k"; }; - buildInputs = [ - cmake - python2 - boost - ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ python2 boost ]; preConfigure = '' substituteInPlace test/SchemaTests.cc --replace "BOOST_CHECKPOINT" "BOOST_TEST_CHECKPOINT" substituteInPlace test/buffertest.cc --replace "BOOST_MESSAGE" "BOOST_TEST_MESSAGE" ''; - enableParallelBuilding = true; - meta = { description = "A C++ library which implements parts of the Avro Specification"; homepage = "https://avro.apache.org/"; diff --git a/pkgs/development/libraries/avro-c/default.nix b/pkgs/development/libraries/avro-c/default.nix index d96930f37f24..99f8d7f8497a 100644 --- a/pkgs/development/libraries/avro-c/default.nix +++ b/pkgs/development/libraries/avro-c/default.nix @@ -19,8 +19,6 @@ in stdenv.mkDerivation { buildInputs = [ jansson zlib ]; - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "A C library which implements parts of the Avro Specification"; homepage = "https://avro.apache.org/"; diff --git a/pkgs/development/libraries/aws-c-cal/default.nix b/pkgs/development/libraries/aws-c-cal/default.nix new file mode 100644 index 000000000000..057aad447d5e --- /dev/null +++ b/pkgs/development/libraries/aws-c-cal/default.nix @@ -0,0 +1,30 @@ +{ lib, stdenv, fetchFromGitHub, cmake, aws-c-common, openssl, Security }: + +stdenv.mkDerivation rec { + pname = "aws-c-cal"; + version = "0.4.5"; + + src = fetchFromGitHub { + owner = "awslabs"; + repo = pname; + rev = "v${version}"; + sha256 = "04acra1mnzw9q7jycs5966akfbgnx96hkrq90nq0dhw8pvarlyv6"; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ aws-c-common openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; + + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=ON" + "-DCMAKE_MODULE_PATH=${aws-c-common}/lib/cmake" + ]; + + meta = with lib; { + description = "AWS Crypto Abstraction Layer "; + homepage = "https://github.com/awslabs/aws-c-cal"; + license = licenses.asl20; + platforms = platforms.unix; + maintainers = with maintainers; [ orivej ]; + }; +} diff --git a/pkgs/development/libraries/aws-c-common/default.nix b/pkgs/development/libraries/aws-c-common/default.nix index b028813558f5..5473867a6ad0 100644 --- a/pkgs/development/libraries/aws-c-common/default.nix +++ b/pkgs/development/libraries/aws-c-common/default.nix @@ -2,17 +2,21 @@ stdenv.mkDerivation rec { pname = "aws-c-common"; - version = "0.3.11"; + version = "0.4.63"; src = fetchFromGitHub { owner = "awslabs"; repo = pname; rev = "v${version}"; - sha256 = "0a7hi4crnc3j1j39qcnd44zqdfwzw1xghcf80marx5vdf1qdzy6p"; + sha256 = "16bc6fn1gq3nqcrzgpi2kjphq7xkkr73aljakrg89ysm6hyzyim9"; }; nativeBuildInputs = [ cmake ]; + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=ON" + ]; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-nullability-extension -Wno-typedef-redefinition"; diff --git a/pkgs/development/libraries/aws-c-event-stream/default.nix b/pkgs/development/libraries/aws-c-event-stream/default.nix index ca3203e3a6ab..4cfabc77bb2c 100644 --- a/pkgs/development/libraries/aws-c-event-stream/default.nix +++ b/pkgs/development/libraries/aws-c-event-stream/default.nix @@ -1,19 +1,20 @@ -{ lib, stdenv, fetchFromGitHub, cmake, aws-c-common, aws-checksums, libexecinfo }: +{ lib, stdenv, fetchFromGitHub, cmake, aws-c-cal, aws-c-common, aws-c-io, aws-checksums, s2n, libexecinfo }: stdenv.mkDerivation rec { pname = "aws-c-event-stream"; - version = "0.1.1"; + version = "0.2.6"; src = fetchFromGitHub { owner = "awslabs"; repo = pname; rev = "v${version}"; - sha256 = "0anjynfghk3inysy21wqvhxha33xsswh3lm8pr7nx7cpj6cmr37m"; + sha256 = "1hbri4dv924ph3cxkmwkl4kdca4dvhc9qda60rdzs6355l76k23n"; }; nativeBuildInputs = [ cmake ]; - buildInputs = [ aws-c-common aws-checksums ] ++ lib.optional stdenv.hostPlatform.isMusl libexecinfo; + buildInputs = [ aws-c-cal aws-c-common aws-c-io aws-checksums s2n ] + ++ lib.optional stdenv.hostPlatform.isMusl libexecinfo; cmakeFlags = [ "-DBUILD_SHARED_LIBS:BOOL=ON" diff --git a/pkgs/development/libraries/aws-c-io/default.nix b/pkgs/development/libraries/aws-c-io/default.nix new file mode 100644 index 000000000000..eda87ba2c534 --- /dev/null +++ b/pkgs/development/libraries/aws-c-io/default.nix @@ -0,0 +1,32 @@ +{ lib, stdenv, fetchFromGitHub, cmake, aws-c-cal, aws-c-common, s2n }: + +stdenv.mkDerivation rec { + pname = "aws-c-io"; + version = "0.7.0"; + + src = fetchFromGitHub { + owner = "awslabs"; + repo = pname; + rev = "v${version}"; + sha256 = "0wagc1205r57llqd39wqjasq3bgc8h1mfdqk4r5lcrnn4jbpcill"; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ aws-c-cal aws-c-common s2n ]; + + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=ON" + "-DCMAKE_MODULE_PATH=${aws-c-common}/lib/cmake" + ]; + + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-error"; + + meta = with lib; { + description = "AWS SDK for C module for IO and TLS"; + homepage = "https://github.com/awslabs/aws-c-io"; + license = licenses.asl20; + platforms = platforms.unix; + maintainers = with maintainers; [ orivej ]; + }; +} diff --git a/pkgs/development/libraries/aws-checksums/default.nix b/pkgs/development/libraries/aws-checksums/default.nix index d4ba15e52db4..bf50401a213e 100644 --- a/pkgs/development/libraries/aws-checksums/default.nix +++ b/pkgs/development/libraries/aws-checksums/default.nix @@ -1,19 +1,24 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake, aws-c-common }: stdenv.mkDerivation rec { pname = "aws-checksums"; - version = "0.1.7"; + version = "0.1.10"; src = fetchFromGitHub { owner = "awslabs"; repo = pname; rev = "v${version}"; - sha256 = "0am1hfzqir44zcx6y6c7jw74qvbsav8ppr9dahpdh3ac95cjf38a"; + sha256 = "1f9scl5734pgjlsixspwljrrlndzhllwlfygdcr1gx5p0za08zjb"; }; nativeBuildInputs = [ cmake ]; - cmakeFlags = [ "-DBUILD_SHARED_LIBS:BOOL=ON" ]; + buildInputs = [ aws-c-common ]; + + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=ON" + "-DCMAKE_MODULE_PATH=${aws-c-common}/lib/cmake" + ]; meta = with lib; { description = "HW accelerated CRC32c and CRC32"; diff --git a/pkgs/development/libraries/aws-sdk-cpp/cmake-dirs.patch b/pkgs/development/libraries/aws-sdk-cpp/cmake-dirs.patch index 6e4cad9e73cf..b2f12e77025c 100644 --- a/pkgs/development/libraries/aws-sdk-cpp/cmake-dirs.patch +++ b/pkgs/development/libraries/aws-sdk-cpp/cmake-dirs.patch @@ -1,15 +1,5 @@ -diff --git a/cmake/AWSSDKConfig.cmake b/cmake/AWSSDKConfig.cmake -index e87252123e..5457bd5910 100644 --- a/cmake/AWSSDKConfig.cmake +++ b/cmake/AWSSDKConfig.cmake -@@ -82,6 +82,7 @@ if (AWSSDK_ROOT_DIR) - ) - else() - find_file(AWSSDK_CORE_HEADER_FILE Aws.h -+ "/${AWSSDK_INSTALL_INCLUDEDIR}/aws/core" - "/usr/${AWSSDK_INSTALL_INCLUDEDIR}/aws/core" - "/usr/local/${AWSSDK_INSTALL_INCLUDEDIR}/aws/core" - "C:/Progra~1/AWSSDK/${AWSSDK_INSTALL_INCLUDEDIR}/aws/core" @@ -97,14 +98,18 @@ if (NOT AWSSDK_CORE_HEADER_FILE) message(FATAL_ERROR "AWS SDK for C++ is missing, please install it first") endif() diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix index 94827743bf3d..fc3f7896dbee 100644 --- a/pkgs/development/libraries/aws-sdk-cpp/default.nix +++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix @@ -1,5 +1,5 @@ -{ lib, stdenv, fetchFromGitHub, cmake, curl, openssl, zlib, fetchpatch -, aws-c-common, aws-c-event-stream, aws-checksums +{ lib, stdenv, fetchFromGitHub, cmake, curl, openssl, s2n, zlib +, aws-c-cal, aws-c-common, aws-c-event-stream, aws-c-io, aws-checksums , CoreAudio, AudioToolbox , # Allow building a limited set of APIs, e.g. ["s3" "ec2"]. apis ? ["*"] @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "aws-sdk-cpp"; - version = "1.7.90"; + version = "1.8.113"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-sdk-cpp"; rev = version; - sha256 = "0zpqi612qmm0n53crxiisv0vdif43ymg13kafy6vv43j2wmh66ga"; + sha256 = "0y784cjrxgrin3ck5f2lk0riyy9kv928kcb9y0gzka65imgma48c"; }; # FIXME: might be nice to put different APIs in different outputs @@ -25,8 +25,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake curl ]; buildInputs = [ - curl openssl zlib - aws-c-common aws-c-event-stream aws-checksums + curl openssl s2n zlib + aws-c-cal aws-c-common aws-c-event-stream aws-c-io aws-checksums ] ++ lib.optionals (stdenv.isDarwin && ((builtins.elem "text-to-speech" apis) || (builtins.elem "*" apis))) @@ -59,10 +59,6 @@ stdenv.mkDerivation rec { __darwinAllowLocalNetworking = true; patches = [ - (fetchpatch { - url = "https://github.com/aws/aws-sdk-cpp/commit/42991ab549087c81cb630e5d3d2413e8a9cf8a97.patch"; - sha256 = "0myq5cm3lvl5r56hg0sc0zyn1clbkd9ys0wr95ghw6bhwpvfv8gr"; - }) ./cmake-dirs.patch ]; diff --git a/pkgs/development/libraries/beignet/default.nix b/pkgs/development/libraries/beignet/default.nix index 89ef702f4e50..5273ef0c5684 100644 --- a/pkgs/development/libraries/beignet/default.nix +++ b/pkgs/development/libraries/beignet/default.nix @@ -30,8 +30,6 @@ stdenv.mkDerivation rec { patches = [ ./clang_llvm.patch ]; - enableParallelBuilding = true; - postPatch = '' substituteInPlace CMakeLists.txt --replace /etc/OpenCL/vendors "\''${CMAKE_INSTALL_PREFIX}/etc/OpenCL/vendors" patchShebangs src/git_sha1.sh @@ -66,8 +64,6 @@ stdenv.mkDerivation rec { cd utests ''; - enableParallelBuilding = true; - nativeBuildInputs = [ cmake python3 diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index b3950cb0d301..ec3a28e2b1a3 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -8,7 +8,7 @@ , enableDebug ? false , enableSingleThreaded ? false , enableMultiThreaded ? true -, enableShared ? !(stdenv.hostPlatform.libc == "msvcrt") # problems for now +, enableShared ? !(with stdenv.hostPlatform; isStatic || libc == "msvcrt") # problems for now , enableStatic ? !enableShared , enablePython ? false , enableNumpy ? false diff --git a/pkgs/development/libraries/boringssl/default.nix b/pkgs/development/libraries/boringssl/default.nix index 20524cf179cf..eb13321523dd 100644 --- a/pkgs/development/libraries/boringssl/default.nix +++ b/pkgs/development/libraries/boringssl/default.nix @@ -12,7 +12,6 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ cmake perl go ]; - enableParallelBuilding = true; makeFlags = [ "GOCACHE=$(TMPDIR)/go-cache" ]; diff --git a/pkgs/development/libraries/botan/generic.nix b/pkgs/development/libraries/botan/generic.nix index 4d2cf7515c03..f7d94f424695 100644 --- a/pkgs/development/libraries/botan/generic.nix +++ b/pkgs/development/libraries/botan/generic.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { inherit version; description = "Cryptographic algorithms library"; maintainers = with maintainers; [ raskin ]; - platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin"]; + platforms = platforms.unix; license = licenses.bsd2; }; passthru.updateInfo.downloadPage = "http://files.randombit.net/botan/"; diff --git a/pkgs/development/libraries/box2d/default.nix b/pkgs/development/libraries/box2d/default.nix index 1672970d5051..e93d4b549a23 100644 --- a/pkgs/development/libraries/box2d/default.nix +++ b/pkgs/development/libraries/box2d/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, unzip, cmake, libGLU, libGL, freeglut, libX11, xorgproto -, libXi, pkgconfig }: +, libXi, pkg-config }: stdenv.mkDerivation rec { pname = "box2d"; @@ -12,10 +12,8 @@ stdenv.mkDerivation rec { sourceRoot = "Box2D-${version}/Box2D"; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ - unzip cmake libGLU libGL freeglut libX11 xorgproto libXi - ]; + nativeBuildInputs = [ cmake unzip pkg-config ]; + buildInputs = [ libGLU libGL freeglut libX11 xorgproto libXi ]; cmakeFlags = [ "-DBOX2D_INSTALL=ON" diff --git a/pkgs/development/libraries/bullet/default.nix b/pkgs/development/libraries/bullet/default.nix index 1c9a10356a44..07222f469d11 100644 --- a/pkgs/development/libraries/bullet/default.nix +++ b/pkgs/development/libraries/bullet/default.nix @@ -38,8 +38,6 @@ stdenv.mkDerivation rec { "-DBUILD_UNIT_TESTS=OFF" ]; - enableParallelBuilding = true; - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=argument-outside-range -Wno-error=c++11-narrowing"; diff --git a/pkgs/development/libraries/bullet/roboschool-fork.nix b/pkgs/development/libraries/bullet/roboschool-fork.nix index abb9d3e2ce3d..1387048070f3 100644 --- a/pkgs/development/libraries/bullet/roboschool-fork.nix +++ b/pkgs/development/libraries/bullet/roboschool-fork.nix @@ -42,8 +42,6 @@ stdenv.mkDerivation { "-DBUILD_UNIT_TESTS=OFF" ]; - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "A professional free 3D Game Multiphysics Library"; longDescription = '' diff --git a/pkgs/development/libraries/c-blosc/default.nix b/pkgs/development/libraries/c-blosc/default.nix index 20b82df6169f..7dfcce8e9d8c 100644 --- a/pkgs/development/libraries/c-blosc/default.nix +++ b/pkgs/development/libraries/c-blosc/default.nix @@ -13,8 +13,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "A blocking, shuffling and loss-less compression library"; homepage = "https://www.blosc.org"; diff --git a/pkgs/development/libraries/cdo/default.nix b/pkgs/development/libraries/cdo/default.nix index f582be81e86e..10e145b34ea2 100644 --- a/pkgs/development/libraries/cdo/default.nix +++ b/pkgs/development/libraries/cdo/default.nix @@ -1,7 +1,10 @@ { stdenv, fetchurl, curl, hdf5, netcdf -, enable_cdi_lib ? false # build, install and link to a CDI library [default=no] -, enable_all_static ? false # build a completely statically linked CDO binary [default=no] -, enable_cxx ? false # Use CXX as default compiler [default=no] +, # build, install and link to a CDI library [default=no] + enable_cdi_lib ? false +, # build a completely statically linked CDO binary + enable_all_static ? stdenv.hostPlatform.isStatic +, # Use CXX as default compiler [default=no] + enable_cxx ? false }: stdenv.mkDerivation rec { diff --git a/pkgs/development/libraries/cegui/default.nix b/pkgs/development/libraries/cegui/default.nix index aaa93f19131a..7397bdceb769 100644 --- a/pkgs/development/libraries/cegui/default.nix +++ b/pkgs/development/libraries/cegui/default.nix @@ -9,8 +9,8 @@ stdenv.mkDerivation rec { sha256 = "067562s71kfsnbp2zb2bmq8zj3jk96g5a4rcc5qc3n8nfyayhldk"; }; - - buildInputs = [ cmake ogre freetype boost expat ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ ogre freetype boost expat ]; meta = with stdenv.lib; { homepage = "http://cegui.org.uk/"; diff --git a/pkgs/development/libraries/codec2/default.nix b/pkgs/development/libraries/codec2/default.nix index 1f387f711e72..4a648b1f32a8 100644 --- a/pkgs/development/libraries/codec2/default.nix +++ b/pkgs/development/libraries/codec2/default.nix @@ -1,11 +1,8 @@ -{ stdenv, fetchFromGitHub, cmake } : +{ stdenv, fetchFromGitHub, cmake }: -let - version = "0.9.2"; - -in stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "codec2"; - inherit version; + version = "0.9.2"; src = fetchFromGitHub { owner = "drowe67"; @@ -14,15 +11,13 @@ in stdenv.mkDerivation { sha256 = "1jpvr7bra8srz8jvnlbmhf8andbaavq5v01qjnp2f61za93rzwba"; }; - enableParallelBuilding = true; - nativeBuildInputs = [ cmake ]; meta = with stdenv.lib; { description = "Speech codec designed for communications quality speech at low data rates"; homepage = "http://www.rowetel.com/blog/?page_id=452"; license = licenses.lgpl21; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ markuskowa ]; }; } diff --git a/pkgs/development/libraries/cpp-hocon/default.nix b/pkgs/development/libraries/cpp-hocon/default.nix index 47ec7a1a6eb4..e084343a94cb 100644 --- a/pkgs/development/libraries/cpp-hocon/default.nix +++ b/pkgs/development/libraries/cpp-hocon/default.nix @@ -17,8 +17,6 @@ stdenv.mkDerivation rec { buildInputs = [ boost curl leatherman ]; - enableParallelBuilding = true; - meta = with stdenv.lib; { inherit (src.meta) homepage; description = "A C++ port of the Typesafe Config library"; diff --git a/pkgs/development/libraries/cpp-ipfs-api/default.nix b/pkgs/development/libraries/cpp-ipfs-api/default.nix index 3c5921541a76..623ab59d3ee6 100644 --- a/pkgs/development/libraries/cpp-ipfs-api/default.nix +++ b/pkgs/development/libraries/cpp-ipfs-api/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation { sha256 = "1z6gbd7npg4pd9wmdyzcp9h12sg84d7a43c69pp4lzqkyqg8pz1g"; }; - buildInputs = [ cmake curl ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ curl ]; propagatedBuildInputs = [ nlohmann_json ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/cpp-netlib/default.nix b/pkgs/development/libraries/cpp-netlib/default.nix index 50c4e05dfa1d..e7079ac0386f 100644 --- a/pkgs/development/libraries/cpp-netlib/default.nix +++ b/pkgs/development/libraries/cpp-netlib/default.nix @@ -12,14 +12,13 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - buildInputs = [ cmake boost openssl ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ boost openssl ]; cmakeFlags = [ "-DCPP-NETLIB_BUILD_SHARED_LIBS=ON" ]; - enableParallelBuilding = true; - # The test driver binary lacks an RPath to the library's libs preCheck = '' export LD_LIBRARY_PATH=$PWD/libs/network/src diff --git a/pkgs/development/libraries/cppcms/default.nix b/pkgs/development/libraries/cppcms/default.nix index 0063db95770c..7673d257a3ea 100644 --- a/pkgs/development/libraries/cppcms/default.nix +++ b/pkgs/development/libraries/cppcms/default.nix @@ -9,9 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0lmcdjzicmzhnr8pa0q3f5lgapz2cnh9w0dr56i4kj890iqwgzhh"; }; - enableParallelBuilding = true; - - buildInputs = [ cmake pcre zlib python openssl ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ pcre zlib python openssl ]; cmakeFlags = [ "--no-warn-unused-cli" diff --git a/pkgs/development/libraries/cppdb/default.nix b/pkgs/development/libraries/cppdb/default.nix index fc65dd739209..6ad27152b384 100644 --- a/pkgs/development/libraries/cppdb/default.nix +++ b/pkgs/development/libraries/cppdb/default.nix @@ -9,9 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0blr1casmxickic84dxzfmn3lm7wrsl4aa2abvpq93rdfddfy3nn"; }; - enableParallelBuilding = true; - - buildInputs = [ cmake sqlite libmysqlclient postgresql unixODBC ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ sqlite libmysqlclient postgresql unixODBC ]; cmakeFlags = [ "--no-warn-unused-cli" ]; NIX_CFLAGS_COMPILE = "-I${libmysqlclient}/include/mysql -L${libmysqlclient}/lib/mysql"; diff --git a/pkgs/development/libraries/crc32c/default.nix b/pkgs/development/libraries/crc32c/default.nix index b9c12b1889c2..c10d218ea42c 100644 --- a/pkgs/development/libraries/crc32c/default.nix +++ b/pkgs/development/libraries/crc32c/default.nix @@ -1,5 +1,6 @@ { stdenv, lib, fetchFromGitHub, cmake, gflags -, staticOnly ? false }: +, staticOnly ? stdenv.hostPlatform.isStatic +}: stdenv.mkDerivation rec { pname = "crc32c"; diff --git a/pkgs/development/libraries/criterion/default.nix b/pkgs/development/libraries/criterion/default.nix index 3dc4b4624048..bd42a9c866e5 100644 --- a/pkgs/development/libraries/criterion/default.nix +++ b/pkgs/development/libraries/criterion/default.nix @@ -13,8 +13,6 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - enableParallelBuilding = true; - nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ diff --git a/pkgs/development/libraries/csfml/default.nix b/pkgs/development/libraries/csfml/default.nix index ab63b7a21f25..61d1d53da63c 100644 --- a/pkgs/development/libraries/csfml/default.nix +++ b/pkgs/development/libraries/csfml/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation { rev = version; sha256 = "071magxif5nrdddzk2z34czqmz1dfws4d7dqynb2zpn7cwhwxcpm"; }; - buildInputs = [ cmake sfml ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ sfml ]; cmakeFlags = [ "-DCMAKE_MODULE_PATH=${sfml}/share/SFML/cmake/Modules/" ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/ctpp2/default.nix b/pkgs/development/libraries/ctpp2/default.nix index 82bbdfc2fc19..2e3f6a86d499 100644 --- a/pkgs/development/libraries/ctpp2/default.nix +++ b/pkgs/development/libraries/ctpp2/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1z22zfw9lb86z4hcan9hlvji49c9b7vznh7gjm95gnvsh43zsgx8"; }; - buildInputs = [ cmake ]; + nativeBuildInputs = [ cmake ]; patchPhase = '' # include to fix undefined getcwd diff --git a/pkgs/development/libraries/curlcpp/default.nix b/pkgs/development/libraries/curlcpp/default.nix index ead4d1b76bd6..6efc28b4c05a 100644 --- a/pkgs/development/libraries/curlcpp/default.nix +++ b/pkgs/development/libraries/curlcpp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, curl }: +{ stdenv, fetchFromGitHub, cmake, curl }: stdenv.mkDerivation rec { pname = "curlcpp"; @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1zx76jcddqk4zkcdb6p7rsmkjbbjm2cj6drj0c8hdd61ms1d0f3n"; }; - buildInputs = [ cmake curl ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ curl ]; meta = with stdenv.lib; { homepage = "https://josephp91.github.io/curlcpp/"; @@ -21,4 +22,3 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ rszibele ]; }; } - diff --git a/pkgs/development/libraries/curlpp/default.nix b/pkgs/development/libraries/curlpp/default.nix index 810bd3f15dab..46f1eb33f75a 100644 --- a/pkgs/development/libraries/curlpp/default.nix +++ b/pkgs/development/libraries/curlpp/default.nix @@ -12,7 +12,6 @@ stdenv.mkDerivation rec { buildInputs = [ curl ]; nativeBuildInputs = [ cmake ]; - enableParallelBuilding = true; meta = with stdenv.lib; { homepage = "https://www.curlpp.org/"; diff --git a/pkgs/development/libraries/dav1d/default.nix b/pkgs/development/libraries/dav1d/default.nix index a56184e9a179..4be942d8b69f 100644 --- a/pkgs/development/libraries/dav1d/default.nix +++ b/pkgs/development/libraries/dav1d/default.nix @@ -9,14 +9,14 @@ assert useVulkan -> withExamples; stdenv.mkDerivation rec { pname = "dav1d"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitLab { domain = "code.videolan.org"; owner = "videolan"; repo = pname; rev = version; - sha256 = "0mjn87xjdqv0q1gj4s4f6fdmsj504mhk4qmqiyrhq2rs7yqj4csv"; + sha256 = "1820fpmmq1vxjzjmza6ydk4fgxipb8gmcc5skybki64qn7410v7x"; }; nativeBuildInputs = [ meson ninja nasm pkgconfig ]; diff --git a/pkgs/development/libraries/dconf/default.nix b/pkgs/development/libraries/dconf/default.nix index c9c1b9be9228..4b574a17f789 100644 --- a/pkgs/development/libraries/dconf/default.nix +++ b/pkgs/development/libraries/dconf/default.nix @@ -10,17 +10,19 @@ , bash-completion , dbus , gnome3 -, libxml2 , gtk-doc , docbook-xsl-nons , docbook_xml_dtd_42 }: - +let + isCross = (stdenv.hostPlatform != stdenv.buildPlatform); +in stdenv.mkDerivation rec { pname = "dconf"; version = "0.38.0"; - outputs = [ "out" "lib" "dev" "devdoc" ]; + outputs = [ "out" "lib" "dev" ] + ++ stdenv.lib.optional (!isCross) "devdoc"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; @@ -30,27 +32,25 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - vala pkg-config python3 libxslt - libxml2 glib - gtk-doc docbook-xsl-nons docbook_xml_dtd_42 - ]; + ] ++ stdenv.lib.optional (!isCross) gtk-doc; buildInputs = [ glib bash-completion dbus - ]; + ] ++ stdenv.lib.optional (!isCross) vala; + # Vala cross compilation is broken. For now, build dconf without vapi when cross-compiling. mesonFlags = [ "--sysconfdir=/etc" - "-Dgtk_doc=true" - ]; + "-Dgtk_doc=${stdenv.lib.boolToString (!isCross)}" # gtk-doc does do some gobject introspection, which doesn't yet cross-compile. + ] ++ stdenv.lib.optional isCross "-Dvapi=false"; doCheck = !stdenv.isAarch32 && !stdenv.isAarch64 && !stdenv.isDarwin; diff --git a/pkgs/development/libraries/dlib/default.nix b/pkgs/development/libraries/dlib/default.nix index 43ac2530cc13..c4d441df5a9a 100644 --- a/pkgs/development/libraries/dlib/default.nix +++ b/pkgs/development/libraries/dlib/default.nix @@ -25,7 +25,6 @@ stdenv.mkDerivation rec { "-DUSE_DLIB_USE_CUDA=${if cudaSupport then "1" else "0"}" "-DUSE_AVX_INSTRUCTIONS=${if avxSupport then "yes" else "no"}" ]; - enableParallelBuilding = true; nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ libpng libjpeg ] ++ lib.optional guiSupport libX11; diff --git a/pkgs/development/libraries/doctest/default.nix b/pkgs/development/libraries/doctest/default.nix index d647d5f38880..55f97a425eb3 100644 --- a/pkgs/development/libraries/doctest/default.nix +++ b/pkgs/development/libraries/doctest/default.nix @@ -2,19 +2,17 @@ stdenv.mkDerivation rec { pname = "doctest"; - version = "2.4.1"; + version = "2.4.4"; src = fetchFromGitHub { owner = "onqtam"; repo = "doctest"; rev = version; - sha256 = "17g7n6rjs90i0b231x5s934qnr8m80ga2yg1z344bnsdiqcjd63w"; + hash = "sha256-NqXC5948prTCi4gsaR8bJPBTrmH+rJbHsGvwkJlpjXY="; }; nativeBuildInputs = [ cmake ]; - enableParallelBuilding = true; - meta = with stdenv.lib; { homepage = "https://github.com/onqtam/doctest"; description = "The fastest feature-rich C++11/14/17/20 single-header testing framework"; diff --git a/pkgs/development/libraries/double-conversion/default.nix b/pkgs/development/libraries/double-conversion/default.nix index ecd5ee67cf64..fd7a4e3f5f6f 100644 --- a/pkgs/development/libraries/double-conversion/default.nix +++ b/pkgs/development/libraries/double-conversion/default.nix @@ -20,8 +20,6 @@ stdenv.mkDerivation rec { rm BUILD ''; - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "Binary-decimal and decimal-binary routines for IEEE doubles"; homepage = "https://github.com/google/double-conversion"; diff --git a/pkgs/development/libraries/draco/default.nix b/pkgs/development/libraries/draco/default.nix index 317742f07b3d..8479f3c2f8e1 100644 --- a/pkgs/development/libraries/draco/default.nix +++ b/pkgs/development/libraries/draco/default.nix @@ -12,8 +12,6 @@ stdenv.mkDerivation rec { sha256 = "14ln4la52x38pf8syr7i5v4vd65ya4zij8zj5kgihah03cih0qcd"; }; - enableParallelBuilding = true; - nativeBuildInputs = [ cmake ]; cmakeFlags = [ diff --git a/pkgs/development/libraries/drumstick/default.nix b/pkgs/development/libraries/drumstick/default.nix index 5cef17f11196..25ecbf03dc11 100644 --- a/pkgs/development/libraries/drumstick/default.nix +++ b/pkgs/development/libraries/drumstick/default.nix @@ -23,8 +23,6 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "man" ]; - enableParallelBuilding = true; - nativeBuildInputs = [ cmake docbook_xml_dtd_45 docbook_xml_dtd_45 docbook_xsl doxygen pkg-config wrapQtAppsHook ]; diff --git a/pkgs/development/libraries/eccodes/default.nix b/pkgs/development/libraries/eccodes/default.nix index e3bed6186302..867f0e59393c 100644 --- a/pkgs/development/libraries/eccodes/default.nix +++ b/pkgs/development/libraries/eccodes/default.nix @@ -35,8 +35,6 @@ stdenv.mkDerivation rec { "-DENABLE_ECCODES_OMP_THREADS=${if enableOpenMPThreads then "ON" else "OFF"}" ]; - enableParallelBuilding = true; - doCheck = true; # Only do tests that don't require downloading 120MB of testdata diff --git a/pkgs/development/libraries/embree/2.x.nix b/pkgs/development/libraries/embree/2.x.nix index d8e102a0d40b..083dbbc74500 100644 --- a/pkgs/development/libraries/embree/2.x.nix +++ b/pkgs/development/libraries/embree/2.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, ispc, tbb, glfw, +{ stdenv, fetchFromGitHub, cmake, pkg-config, ispc, tbb, glfw, openimageio, libjpeg, libpng, libpthreadstubs, libX11 }: @@ -14,11 +14,11 @@ stdenv.mkDerivation { }; cmakeFlags = [ "-DEMBREE_TUTORIALS=OFF" ]; - enableParallelBuilding = true; - - buildInputs = [ pkgconfig cmake ispc tbb glfw openimageio libjpeg libpng libX11 libpthreadstubs ]; + + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ ispc tbb glfw openimageio libjpeg libpng libX11 libpthreadstubs ]; meta = with stdenv.lib; { - description = "High performance ray tracing kernels from Intel"; + description = "High performance ray tracing kernels from Intel"; homepage = "https://embree.github.io/"; maintainers = with maintainers; [ hodapp ]; license = licenses.asl20; diff --git a/pkgs/development/libraries/fcppt/default.nix b/pkgs/development/libraries/fcppt/default.nix index 22d3bd889e11..d76772500fb2 100644 --- a/pkgs/development/libraries/fcppt/default.nix +++ b/pkgs/development/libraries/fcppt/default.nix @@ -15,8 +15,6 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DCMAKE_SKIP_BUILD_RPATH=false" "-DENABLE_BOOST=true" "-DENABLE_EXAMPLES=true" "-DENABLE_CATCH=true" "-DENABLE_TEST=true" ]; - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "Freundlich's C++ toolkit"; longDescription = '' diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index a2f5e366e008..f428290e8039 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -111,6 +111,7 @@ , opensslExtlib ? false, openssl ? null , libpulseaudio ? null # Pulseaudio input support , rav1e ? null # AV1 encoder (focused on speed and safety) +, svt-av1 ? null # AV1 encoder/decoder (focused on speed and correctness) , rtmpdump ? null # RTMP[E] support #, libquvi ? null # Quvi input support , samba ? null # Samba protocol @@ -250,6 +251,11 @@ stdenv.mkDerivation rec { sha256 = "sha256-dqpmpDFETTuWHWolMoLaubU4BeDEuQaBNA0wmzL1f8o="; name = "fix_libsrt.patch"; }) + # Patch ffmpeg for svt-av1 until version 4.4 + (fetchpatch { + url = "https://raw.githubusercontent.com/AOMediaCodec/SVT-AV1/v0.8.4/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-av1.patch"; + sha256 = "1p4g8skr5gjw5h1648j7qrks81zx49lrnx9g0p81qgnrvxc2wwx0"; + }) ]; prePatch = '' @@ -393,6 +399,7 @@ stdenv.mkDerivation rec { (enableFeature (libpulseaudio != null) "libpulse") #(enableFeature quvi "libquvi") (enableFeature (rav1e != null) "librav1e") + (enableFeature (svt-av1 != null) "libsvtav1") (enableFeature (rtmpdump != null) "librtmp") #(enableFeature (schroedinger != null) "libschroedinger") (enableFeature (SDL2 != null) "sdl2") @@ -429,7 +436,7 @@ stdenv.mkDerivation rec { bzip2 celt dav1d fontconfig freetype frei0r fribidi game-music-emu gnutls gsm libjack2 ladspaH lame libaom libass libbluray libbs2b libcaca libdc1394 libmodplug libmysofa libogg libopus librsvg libssh libtheora libvdpau libvorbis libvpx libwebp libX11 - libxcb libXv libXext lzma openal openjpeg libpulseaudio rav1e rtmpdump opencore-amr + libxcb libXv libXext lzma openal openjpeg libpulseaudio rav1e svt-av1 rtmpdump opencore-amr samba SDL2 soxr speex srt vid-stab vo-amrwbenc wavpack x264 x265 xavs xvidcore zeromq4 zlib ] ++ optionals openglExtlib [ libGL libGLU ] diff --git a/pkgs/development/libraries/ffmpegthumbnailer/default.nix b/pkgs/development/libraries/ffmpegthumbnailer/default.nix index 4e3c10e8829d..6c8e689840e8 100644 --- a/pkgs/development/libraries/ffmpegthumbnailer/default.nix +++ b/pkgs/development/libraries/ffmpegthumbnailer/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, stdenv, ffmpeg_3, cmake, libpng, pkgconfig, libjpeg +{ fetchFromGitHub, stdenv, ffmpeg_3, cmake, libpng, pkg-config, libjpeg }: stdenv.mkDerivation rec { @@ -12,13 +12,14 @@ stdenv.mkDerivation rec { sha256 = "1bakbr714j7yxdal1f5iq0gcl4cxggbbgj227ihdh5kvygqlwich"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ ffmpeg_3 libpng libjpeg ]; + cmakeFlags = [ "-DENABLE_THUMBNAILER=ON" ]; meta = with stdenv.lib; { homepage = "https://github.com/dirkvdb/ffmpegthumbnailer"; description = "A lightweight video thumbnailer"; - longDescription = "FFmpegthumbnailer is a lightweight video + longDescription = "FFmpegthumbnailer is a lightweight video thumbnailer that can be used by file managers to create thumbnails for your video files. The thumbnailer uses ffmpeg o decode frames from the video files, so supported videoformats depend on the @@ -27,7 +28,7 @@ stdenv.mkDerivation rec { The only dependencies are ffmpeg and libpng. "; platforms = platforms.linux; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = [ maintainers.jagajaga ]; }; diff --git a/pkgs/development/libraries/flann/default.nix b/pkgs/development/libraries/flann/default.nix index f65d283fd1d2..a61d11c25780 100644 --- a/pkgs/development/libraries/flann/default.nix +++ b/pkgs/development/libraries/flann/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { }) ]; - buildInputs = [ unzip cmake python ]; + nativeBuildInputs = [ unzip cmake python ]; meta = { homepage = "http://people.cs.ubc.ca/~mariusm/flann/"; diff --git a/pkgs/development/libraries/flatbuffers/default.nix b/pkgs/development/libraries/flatbuffers/default.nix index 424aeb8637d4..0b96a91e45fa 100644 --- a/pkgs/development/libraries/flatbuffers/default.nix +++ b/pkgs/development/libraries/flatbuffers/default.nix @@ -10,20 +10,36 @@ stdenv.mkDerivation rec { rev = "v${version}"; sha256 = "0f7xd66vc1lzjbn7jzd5kyqrgxpsfxi4zc7iymhb5xrwyxipjl1g"; }; + patches = [ + (fetchpatch { + # Fixed a compilation error with GCC 10.0 to 11.0. June 1, 2020. + # Should be included in the next release after 1.12.0 + url = "https://github.com/google/flatbuffers/commit/988164f6e1675bbea9c852e2d6001baf4d1fcf59.patch"; + sha256 = "0d8c2bywqmkhdi0a41cry85wy4j58pl0vd6h5xpfqm3fr8w0mi9s"; + excludes = [ "src/idl_gen_cpp.cpp" ]; + }) + (fetchpatch { + # Fixed a compilation error with GCC 10.0 to 11.0. July 6, 2020. + # Should be included in the next release after 1.12.0 + url = "https://github.com/google/flatbuffers/pull/6020/commits/44c7a4cf439b0a298720b5a448bcc243a882b0c9.patch"; + sha256 = "126xwkvnlc4ignjhxv9jygfd9j6kr1jx39hyk0ddpcmvzfqsccf4"; + }) + ]; preConfigure = stdenv.lib.optional stdenv.buildPlatform.isDarwin '' rm BUILD ''; nativeBuildInputs = [ cmake ]; - enableParallelBuilding = true; cmakeFlags = [ "-DFLATBUFFERS_BUILD_TESTS=${if doCheck then "ON" else "OFF"}" ]; - doCheck = stdenv.hostPlatform == stdenv.buildPlatform; + # tests fail to compile + doCheck = false; + # doCheck = stdenv.hostPlatform == stdenv.buildPlatform; checkTarget = "test"; - meta = { + meta = with stdenv.lib; { description = "Memory Efficient Serialization Library"; longDescription = '' FlatBuffers is an efficient cross platform serialization library for @@ -31,9 +47,9 @@ stdenv.mkDerivation rec { access serialized data without unpacking/parsing it first, while still having great forwards/backwards compatibility. ''; - maintainers = [ stdenv.lib.maintainers.teh ]; - license = stdenv.lib.licenses.asl20; - platforms = stdenv.lib.platforms.unix; + maintainers = [ maintainers.teh ]; + license = licenses.asl20; + platforms = platforms.unix; homepage = "https://google.github.io/flatbuffers/"; }; } diff --git a/pkgs/development/libraries/fmt/default.nix b/pkgs/development/libraries/fmt/default.nix index 8eac88df796c..2f490891433b 100644 --- a/pkgs/development/libraries/fmt/default.nix +++ b/pkgs/development/libraries/fmt/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchFromGitHub, fetchpatch, cmake, enableShared ? true }: +{ stdenv, fetchFromGitHub, fetchpatch, cmake +, enableShared ? !stdenv.hostPlatform.isStatic +}: let generic = { version, sha256, patches ? [ ] }: diff --git a/pkgs/development/libraries/freeglut/default.nix b/pkgs/development/libraries/freeglut/default.nix index d23147095fcf..bb61231d445b 100644 --- a/pkgs/development/libraries/freeglut/default.nix +++ b/pkgs/development/libraries/freeglut/default.nix @@ -12,7 +12,8 @@ in stdenv.mkDerivation { outputs = [ "out" "dev" ]; - buildInputs = [ libXi libXrandr libXxf86vm libGL libGLU xlibsWrapper cmake ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ libXi libXrandr libXxf86vm libGL libGLU xlibsWrapper ]; cmakeFlags = stdenv.lib.optionals stdenv.isDarwin [ "-DOPENGL_INCLUDE_DIR=${libGL}/include" @@ -22,8 +23,6 @@ in stdenv.mkDerivation { "-DFREEGLUT_BUILD_STATIC:BOOL=OFF" ]; - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "Create and manage windows containing OpenGL contexts"; longDescription = '' diff --git a/pkgs/development/libraries/freetds/default.nix b/pkgs/development/libraries/freetds/default.nix index c1b9318130c1..1dc9633d1a73 100644 --- a/pkgs/development/libraries/freetds/default.nix +++ b/pkgs/development/libraries/freetds/default.nix @@ -21,8 +21,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig ]; - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "Libraries to natively talk to Microsoft SQL Server and Sybase databases"; homepage = "https://www.freetds.org"; diff --git a/pkgs/development/libraries/gaia/default.nix b/pkgs/development/libraries/gaia/default.nix index b154f80c1dd2..46ed3626d2af 100644 --- a/pkgs/development/libraries/gaia/default.nix +++ b/pkgs/development/libraries/gaia/default.nix @@ -5,6 +5,7 @@ , swig , eigen , pkgconfig +, python2 , wafHook , makeWrapper , qt4 @@ -38,9 +39,10 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ - wafHook pkgconfig + python2 # For wafHook swig + wafHook ] # The gaiafusion binary inside $out/bin needs a shebangs patch, and # wrapping with the appropriate $PYTHONPATH diff --git a/pkgs/development/libraries/gamenetworkingsockets/default.nix b/pkgs/development/libraries/gamenetworkingsockets/default.nix new file mode 100644 index 000000000000..5f2fdb8f749a --- /dev/null +++ b/pkgs/development/libraries/gamenetworkingsockets/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub, cmake, ninja, go, protobuf, openssl }: + +stdenv.mkDerivation rec { + pname = "GameNetworkingSockets"; + version = "1.2.0"; + + src = fetchFromGitHub { + owner = "ValveSoftware"; + repo = pname; + rev = "v${version}"; + sha256 = "1zghyc4liml8gzxflyh5gp6zi11ny6ng5hv9wyqvp32rfx221gc6"; + }; + + nativeBuildInputs = [ cmake ninja go ]; + + cmakeFlags = [ "-G Ninja" ]; + + # tmp home for go + preBuild = "export HOME=\"$TMPDIR\""; + + buildInputs = [ protobuf openssl ]; + + meta = with stdenv.lib; { + # build failure is resolved on master, remove at next release + broken = stdenv.isDarwin; + description = "GameNetworkingSockets is a basic transport layer for games"; + license = licenses.bsd3; + platforms = platforms.unix; + inherit (src.meta) homepage; + maintainers = [ maintainers.sternenseemann ]; + }; +} diff --git a/pkgs/development/libraries/gbenchmark/default.nix b/pkgs/development/libraries/gbenchmark/default.nix index 0eff8eafacfc..ab6a379116d5 100644 --- a/pkgs/development/libraries/gbenchmark/default.nix +++ b/pkgs/development/libraries/gbenchmark/default.nix @@ -18,7 +18,6 @@ stdenv.mkDerivation rec { chmod -R u+w googletest ''; - enableParallelBuilding = true; doCheck = true; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/gdbm/0001-Remove-duplicate-assignments.patch b/pkgs/development/libraries/gdbm/0001-Remove-duplicate-assignments.patch deleted file mode 100644 index 7583deb81098..000000000000 --- a/pkgs/development/libraries/gdbm/0001-Remove-duplicate-assignments.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 2c31a95d9e57a4308c5159c50e69b5c9178dee72 Mon Sep 17 00:00:00 2001 -From: Christian Kampka -Date: Fri, 13 Nov 2020 16:52:12 +0100 -Subject: [PATCH] Remove duplicate assignments - ---- - src/parseopt.c | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/src/parseopt.c b/src/parseopt.c -index 268e080..a4c8576 100644 ---- a/src/parseopt.c -+++ b/src/parseopt.c -@@ -255,8 +255,6 @@ print_option_descr (const char *descr, size_t lmargin, size_t rmargin) - } - - char *parseopt_program_name; --char *parseopt_program_doc; --char *parseopt_program_args; - const char *program_bug_address = "<" PACKAGE_BUGREPORT ">"; - void (*parseopt_help_hook) (FILE *stream); - --- -2.25.4 - diff --git a/pkgs/development/libraries/gdbm/default.nix b/pkgs/development/libraries/gdbm/default.nix index 3d333e503b2e..16c045cd68ef 100644 --- a/pkgs/development/libraries/gdbm/default.nix +++ b/pkgs/development/libraries/gdbm/default.nix @@ -2,17 +2,15 @@ stdenv.mkDerivation rec { pname = "gdbm"; - version = "1.18.1"; + version = "1.19"; src = fetchurl { url = "mirror://gnu/gdbm/${pname}-${version}.tar.gz"; - sha256 = "1p4ibds6z3ccy65lkmd6lm7js0kwifvl53r0fd759fjxgr917rl6"; + sha256 = "sha256-N+0SIUEiuXLhig2UmVA55XdIGRk573QRWx1B2IETZLw="; }; doCheck = true; # not cross; - patches = [ ./0001-Remove-duplicate-assignments.patch ]; - # Linking static stubs on cygwin requires correct ordering. # Consider upstreaming this. diff --git a/pkgs/development/libraries/gdcm/default.nix b/pkgs/development/libraries/gdcm/default.nix index d05e44eae3e5..b04828c92dde 100644 --- a/pkgs/development/libraries/gdcm/default.nix +++ b/pkgs/development/libraries/gdcm/default.nix @@ -28,8 +28,8 @@ stdenv.mkDerivation rec { cd ../build ''; - enableParallelBuilding = true; - buildInputs = [ cmake vtk_7 ] + nativeBuildInputs = [ cmake ]; + buildInputs = [ vtk_7 ] ++ stdenv.lib.optional stdenv.isDarwin [ darwin.apple_sdk.frameworks.ApplicationServices darwin.apple_sdk.frameworks.Cocoa diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix index f95818b399c9..ad92bf13c4ce 100644 --- a/pkgs/development/libraries/gdk-pixbuf/default.nix +++ b/pkgs/development/libraries/gdk-pixbuf/default.nix @@ -109,6 +109,8 @@ stdenv.mkDerivation rec { setupHook = ./setup-hook.sh; + separateDebugInfo = stdenv.isLinux; + passthru = { updateScript = gnome3.updateScript { packageName = pname; diff --git a/pkgs/development/libraries/gensio/default.nix b/pkgs/development/libraries/gensio/default.nix index b3bf33f0e881..a568078f9911 100644 --- a/pkgs/development/libraries/gensio/default.nix +++ b/pkgs/development/libraries/gensio/default.nix @@ -1,21 +1,42 @@ -{ stdenv, lib, fetchFromGitHub, autoreconfHook }: +{ autoreconfHook +, fetchFromGitHub +, fetchpatch +, lib +, nix-update-script +, pkg-config +, stdenv +}: stdenv.mkDerivation rec { pname = "gensio"; - version = "2.1.7"; + version = "2.2.1"; src = fetchFromGitHub { owner = "cminyard"; repo = pname; rev = "v${version}"; - sha256 = "07m8rbdk05biarc9xskwcx9lghj0dff1msxasfc6hi3jywc3xaih"; + sha256 = "083khzvyvcgi9j99hbaswglivm9s6dly6spjvisvyacavaybgwgb"; + }; + + patches = [ + # Fix compilation without openipmi, can be dropped for the next release. + (fetchpatch { + url = "https://github.com/cminyard/gensio/commit/12f6203e6f7aa42172177d7b0870777b605af8d9.patch"; + sha256 = "19dr4iacccc4il3asdxkag6cj2yc4bxd8p451syfxdm6289rwxic"; + }) + ]; + + passthru = { + updateScript = nix-update-script { + attrPath = pname; + }; }; configureFlags = [ "--with-python=no" ]; - buildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; meta = with lib; { description = "General Stream I/O"; diff --git a/pkgs/development/libraries/gflags/default.nix b/pkgs/development/libraries/gflags/default.nix index 733a572ac61b..51c13f974336 100644 --- a/pkgs/development/libraries/gflags/default.nix +++ b/pkgs/development/libraries/gflags/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchFromGitHub, cmake, enableShared ? true}: +{ stdenv, fetchFromGitHub, cmake +, enableShared ? !stdenv.hostPlatform.isStatic +}: stdenv.mkDerivation rec { pname = "gflags"; diff --git a/pkgs/development/libraries/git2/default.nix b/pkgs/development/libraries/git2/default.nix index 96b67c7ccca8..edbb3d82241a 100644 --- a/pkgs/development/libraries/git2/default.nix +++ b/pkgs/development/libraries/git2/default.nix @@ -27,8 +27,6 @@ stdenv.mkDerivation rec { propagatedBuildInputs = stdenv.lib.optional (!stdenv.isLinux) libiconv; - enableParallelBuilding = true; - doCheck = false; # hangs. or very expensive? meta = { diff --git a/pkgs/development/libraries/glbinding/default.nix b/pkgs/development/libraries/glbinding/default.nix index 9ce5a23f9705..9b67b9695cc0 100644 --- a/pkgs/development/libraries/glbinding/default.nix +++ b/pkgs/development/libraries/glbinding/default.nix @@ -1,4 +1,5 @@ { stdenv, fetchFromGitHub, cmake, libGLU, xlibsWrapper }: + stdenv.mkDerivation rec { pname = "glbinding"; version = "3.1.0"; @@ -10,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1avd7ssms11xx7h0cm8h4pfpk55f07f1j1ybykxfgsym2chb2z08"; }; - buildInputs = [ cmake libGLU xlibsWrapper ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ libGLU xlibsWrapper ]; meta = with stdenv.lib; { homepage = "https://github.com/cginternals/glbinding/"; diff --git a/pkgs/development/libraries/glew/1.10.nix b/pkgs/development/libraries/glew/1.10.nix index 02737143e0db..139b93c039ec 100644 --- a/pkgs/development/libraries/glew/1.10.nix +++ b/pkgs/development/libraries/glew/1.10.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, libGLU, xlibsWrapper, libXmu, libXi -, AGL ? null +, AGL, OpenGL }: with stdenv.lib; @@ -12,9 +12,8 @@ stdenv.mkDerivation rec { sha256 = "01zki46dr5khzlyywr3cg615bcal32dazfazkf360s1znqh17i4r"; }; - buildInputs = [ xlibsWrapper libXmu libXi ] - ++ optionals stdenv.isDarwin [ AGL ]; - propagatedBuildInputs = [ libGLU ]; # GL/glew.h includes GL/glu.h + buildInputs = if stdenv.isDarwin then [ AGL ] else [ xlibsWrapper libXmu libXi ]; + propagatedBuildInputs = if stdenv.isDarwin then [ OpenGL ] else [ libGLU ]; # GL/glew.h includes GL/glu.h patchPhase = '' sed -i 's|lib64|lib|' config/Makefile.linux diff --git a/pkgs/development/libraries/glew/default.nix b/pkgs/development/libraries/glew/default.nix index 80a7759c5749..3b067e6d0f30 100644 --- a/pkgs/development/libraries/glew/default.nix +++ b/pkgs/development/libraries/glew/default.nix @@ -1,4 +1,5 @@ { stdenv, fetchurl, libGLU, xlibsWrapper, libXmu, libXi +, OpenGL }: with stdenv.lib; @@ -13,8 +14,8 @@ stdenv.mkDerivation rec { outputs = [ "bin" "out" "dev" "doc" ]; - buildInputs = [ xlibsWrapper libXmu libXi ]; - propagatedBuildInputs = [ libGLU ]; # GL/glew.h includes GL/glu.h + buildInputs = optionals (!stdenv.isDarwin) [ xlibsWrapper libXmu libXi ]; + propagatedBuildInputs = if stdenv.isDarwin then [ OpenGL ] else [ libGLU ]; # GL/glew.h includes GL/glu.h patchPhase = '' sed -i 's|lib64|lib|' config/Makefile.linux diff --git a/pkgs/development/libraries/glfw/3.x.nix b/pkgs/development/libraries/glfw/3.x.nix index fbc1cb818ca8..62c1c596d2c3 100644 --- a/pkgs/development/libraries/glfw/3.x.nix +++ b/pkgs/development/libraries/glfw/3.x.nix @@ -14,8 +14,6 @@ stdenv.mkDerivation rec { sha256 = "0b5lsxz1xkzip7fvbicjkxvg5ig8gbhx1zrlhandqc0rpk56bvyw"; }; - enableParallelBuilding = true; - propagatedBuildInputs = [ libGL ]; nativeBuildInputs = [ cmake ] diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 3382af17c35d..57f05d410fbf 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -45,11 +45,11 @@ in stdenv.mkDerivation rec { pname = "glib"; - version = "2.66.3"; + version = "2.66.4"; src = fetchurl { url = "mirror://gnome/sources/glib/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1cdmyyycw2mf5s0f5sfd59q91223s4smcqi8n2fwrccwm5ji7wvr"; + sha256 = "l9+GcOMvn9T3OSsJgOZh3WJQEgFdWDUNoeWOND9K+YQ="; }; patches = optionals stdenv.isDarwin [ diff --git a/pkgs/development/libraries/glibc/2.32-10.patch.gz b/pkgs/development/libraries/glibc/2.32-24.patch.gz similarity index 52% rename from pkgs/development/libraries/glibc/2.32-10.patch.gz rename to pkgs/development/libraries/glibc/2.32-24.patch.gz index 6141f08efadb..e63bd42ed980 100644 Binary files a/pkgs/development/libraries/glibc/2.32-10.patch.gz and b/pkgs/development/libraries/glibc/2.32-24.patch.gz differ diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index dd76745e1fe4..41ec4f05cf32 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -42,7 +42,7 @@ let version = "2.32"; - patchSuffix = "-10"; + patchSuffix = "-24"; sha256 = "0di848ibffrnwq7g2dvgqrnn4xqhj3h96csn69q4da51ymafl9qn"; in @@ -59,14 +59,14 @@ stdenv.mkDerivation ({ patches = [ - /* No tarballs for stable upstream branch, only https://sourceware.org/git/?p=glibc.git + /* No tarballs for stable upstream branch, only https://sourceware.org/git/glibc.git and using git or something would complicate bootstrapping. - Fortunately it's not too big with 2.32-10. + Fortunately it's not too big. $ git checkout release/2.32/master; git describe - glibc-2.32-10-g0b9460d22e - $ git show --reverse glibc-2.32.. | gzip -n -9 --rsyncable - > 2.32-10.patch.gz + glibc-2.32-24-g1d49bede4d + $ git show --reverse glibc-2.32.. | gzip -n -9 --rsyncable - > 2.32-24.patch.gz */ - ./2.32-10.patch.gz + ./2.32-24.patch.gz /* Allow NixOS and Nix to handle the locale-archive. */ ./nix-locale-archive.patch @@ -214,7 +214,7 @@ stdenv.mkDerivation ({ configureScript="`pwd`/../$sourceRoot/configure" ${lib.optionalString (stdenv.cc.libc != null) - ''makeFlags="$makeFlags BUILD_LDFLAGS=-Wl,-rpath,${stdenv.cc.libc}/lib"'' + ''makeFlags="$makeFlags BUILD_LDFLAGS=-Wl,-rpath,${stdenv.cc.libc}/lib OBJDUMP=${stdenv.cc.bintools.bintools}/bin/objdump"'' } diff --git a/pkgs/development/libraries/gmp/5.1.x.nix b/pkgs/development/libraries/gmp/5.1.x.nix index a027d58de396..a514934e9645 100644 --- a/pkgs/development/libraries/gmp/5.1.x.nix +++ b/pkgs/development/libraries/gmp/5.1.x.nix @@ -1,4 +1,7 @@ -{ stdenv, fetchurl, m4, cxx ? true, withStatic ? true }: +{ stdenv, fetchurl, m4 +, cxx ? true +, withStatic ? stdenv.hostPlatform.isStatic +}: let inherit (stdenv.lib) optional; in diff --git a/pkgs/development/libraries/gmp/6.x.nix b/pkgs/development/libraries/gmp/6.x.nix index 10e63f733a2d..522976d3ab2c 100644 --- a/pkgs/development/libraries/gmp/6.x.nix +++ b/pkgs/development/libraries/gmp/6.x.nix @@ -1,7 +1,8 @@ { stdenv, fetchurl, m4 , cxx ? !stdenv.hostPlatform.useAndroidPrebuilt && !stdenv.hostPlatform.isWasm , buildPackages -, withStatic ? false }: +, withStatic ? stdenv.hostPlatform.isStatic +}: # Note: this package is used for bootstrapping fetchurl, and thus # cannot use fetchpatch! All mutable patches (generated by GitHub or diff --git a/pkgs/development/libraries/google-cloud-cpp/default.nix b/pkgs/development/libraries/google-cloud-cpp/default.nix index 7528925088e5..a3a549a63240 100644 --- a/pkgs/development/libraries/google-cloud-cpp/default.nix +++ b/pkgs/development/libraries/google-cloud-cpp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, clang-tools, grpc, curl, cmake, pkgconfig, fetchFromGitHub, doxygen, protobuf, crc32c, c-ares, fetchurl, openssl, zlib }: +{ stdenv, clang-tools, grpc, curl, cmake, pkg-config, fetchFromGitHub, doxygen, protobuf, crc32c, c-ares, fetchurl, openssl, zlib }: let googleapis = fetchFromGitHub { owner = "googleapis"; @@ -16,7 +16,7 @@ let sha256 = "02zkcq2wl831ayd9qy009xvfx7q80pgycx7mzz9vknwd0nn6dd0n"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ c-ares c-ares.cmake-config grpc openssl protobuf zlib ]; postPatch = '' @@ -40,7 +40,7 @@ in stdenv.mkDerivation rec { }; buildInputs = [ curl crc32c c-ares c-ares.cmake-config googleapis-cpp-cmakefiles grpc protobuf ]; - nativeBuildInputs = [ clang-tools cmake pkgconfig doxygen ]; + nativeBuildInputs = [ clang-tools cmake pkg-config doxygen ]; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix index 067d62a11a27..6f1626a0abe5 100644 --- a/pkgs/development/libraries/gpgme/default.nix +++ b/pkgs/development/libraries/gpgme/default.nix @@ -34,7 +34,9 @@ stdenv.mkDerivation rec { sha256 = "00d4sxq63601lzdp2ha1i8fvybh7dzih4531jh8bx07fab3sw65g"; }) # Disable python tests on Darwin as they use gpg (see configureFlags below) - ] ++ lib.optional stdenv.isDarwin ./disable-python-tests.patch; + ] ++ lib.optional stdenv.isDarwin ./disable-python-tests.patch + # Fix _AC_UNDECLARED_WARNING for autoconf≥2.70. See https://lists.gnupg.org/pipermail/gnupg-devel/2020-November/034643.html + ++ lib.optional stdenv.cc.isClang ./fix-clang-autoconf-undeclared-warning.patch; outputs = [ "out" "dev" "info" ]; outputBin = "dev"; # gpgme-config; not so sure about gpgme-tool diff --git a/pkgs/development/libraries/gpgme/fix-clang-autoconf-undeclared-warning.patch b/pkgs/development/libraries/gpgme/fix-clang-autoconf-undeclared-warning.patch new file mode 100644 index 000000000000..2d08f982ce6f --- /dev/null +++ b/pkgs/development/libraries/gpgme/fix-clang-autoconf-undeclared-warning.patch @@ -0,0 +1,36 @@ +diff -Naur gpgme.old/configure.ac gpgme.new/configure.ac +--- gpgme.old/configure.ac 2020-11-12 04:19:50.000000000 -0500 ++++ gpgme.new/configure.ac 2021-01-08 03:04:38.000000000 -0500 +@@ -166,6 +166,16 @@ + mym4_minor mym4_micro) + AC_SUBST(VERSION_NUMBER) + ++# Try to find a thread-safe version of ttyname(). ++gnupg_REPLACE_TTYNAME_R ++if test "$ac_cv_func_ttyname_r" != yes; then ++ AC_MSG_WARN([ ++*** ++*** ttyname() is not thread-safe and ttyname_r() does not exist ++***]) ++fi ++ ++ + # We need to compile and run a program on the build machine. A + # comment in libgpg-error says that the AC_PROG_CC_FOR_BUILD macro in + # the AC archive is broken for autoconf 2.57. Given that there is no +@@ -658,15 +668,6 @@ + + AC_FUNC_FSEEKO + +-# Try to find a thread-safe version of ttyname(). +-gnupg_REPLACE_TTYNAME_R +-if test "$ac_cv_func_ttyname_r" != yes; then +- AC_MSG_WARN([ +-*** +-*** ttyname() is not thread-safe and ttyname_r() does not exist +-***]) +-fi +- + # Try to find a thread-safe version of getenv(). + have_thread_safe_getenv=no + jm_GLIBC21 diff --git a/pkgs/development/libraries/grantlee/default.nix b/pkgs/development/libraries/grantlee/default.nix index a8e692bdd51d..627a345efade 100644 --- a/pkgs/development/libraries/grantlee/default.nix +++ b/pkgs/development/libraries/grantlee/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { sha256 = "1b501xbimizmbmysl1j5zgnp48qw0r2r7lhgmxvzhzlv9jzhj60r"; }; - buildInputs = [ cmake qt4 ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ qt4 ]; meta = { description = "Qt4 port of Django template system"; diff --git a/pkgs/development/libraries/grib-api/default.nix b/pkgs/development/libraries/grib-api/default.nix index db884957d1e0..0a057ba4aa15 100644 --- a/pkgs/development/libraries/grib-api/default.nix +++ b/pkgs/development/libraries/grib-api/default.nix @@ -23,9 +23,8 @@ stdenv.mkDerivation rec { substituteInPlace "src/grib_jasper_encoding.c" --replace "image.inmem_ = 1;" "" ''; - buildInputs = [ cmake - netcdf - gfortran + nativeBuildInputs = [ cmake gfortran ]; + buildInputs = [ netcdf libpng openjpeg ] ++ stdenv.lib.optionals enablePython [ @@ -42,8 +41,6 @@ stdenv.mkDerivation rec { "-DOPENJPEG_INCLUDE_DIR=${openjpeg.dev}/include/${openjpeg.incDir}" ]; - enableParallelBuilding = true; - doCheck = true; # Only do tests that don't require downloading 120MB of testdata diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix index c41bd5ff5aa3..346d04390c37 100644 --- a/pkgs/development/libraries/grpc/default.nix +++ b/pkgs/development/libraries/grpc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, cmake, zlib, c-ares, pkgconfig, openssl, protobuf +{ stdenv, fetchFromGitHub, fetchpatch, cmake, zlib, c-ares, pkg-config, openssl, protobuf , gflags, abseil-cpp, libnsl }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ zlib c-ares c-ares.cmake-config openssl protobuf gflags abseil-cpp ] ++ stdenv.lib.optionals stdenv.isLinux [ libnsl ]; diff --git a/pkgs/development/libraries/gsm/default.nix b/pkgs/development/libraries/gsm/default.nix index 30cffa89938d..7214aa6f6b9c 100644 --- a/pkgs/development/libraries/gsm/default.nix +++ b/pkgs/development/libraries/gsm/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl -, staticSupport ? false # Compile statically (support for packages that look for the static object) +, # Compile statically (support for packages that look for the static object) + staticSupport ? stdenv.hostPlatform.isStatic }: let diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix index c2a639dff243..0d33d28196ca 100644 --- a/pkgs/development/libraries/gstreamer/core/default.nix +++ b/pkgs/development/libraries/gstreamer/core/default.nix @@ -94,7 +94,7 @@ stdenv.mkDerivation rec { postInstall = '' for prog in "$dev/bin/"*; do # We can't use --suffix here due to quoting so we craft the export command by hand - wrapProgram "$prog" --run 'export GST_PLUGIN_SYSTEM_PATH=$GST_PLUGIN_SYSTEM_PATH''${GST_PLUGIN_SYSTEM_PATH:+:}$(unset _tmp; for profile in $NIX_PROFILES; do _tmp="$profile/lib/gstreamer-1.0''${_tmp:+:}$_tmp"; done; printf '%s' "$_tmp")' + wrapProgram "$prog" --run 'export GST_PLUGIN_SYSTEM_PATH_1_0=$GST_PLUGIN_SYSTEM_PATH_1_0''${GST_PLUGIN_SYSTEM_PATH_1_0:+:}$(unset _tmp; for profile in $NIX_PROFILES; do _tmp="$profile/lib/gstreamer-1.0''${_tmp:+:}$_tmp"; done; printf '%s' "$_tmp")' done ''; diff --git a/pkgs/development/libraries/gtk/3.x.nix b/pkgs/development/libraries/gtk/3.x.nix index 654ad3116a44..59685ca07ccb 100644 --- a/pkgs/development/libraries/gtk/3.x.nix +++ b/pkgs/development/libraries/gtk/3.x.nix @@ -43,6 +43,7 @@ , cups ? null , AppKit , Cocoa +, broadwaySupport ? true }: assert cupsSupport -> cups != null; @@ -87,6 +88,7 @@ stdenv.mkDerivation rec { "-Dgtk_doc=${boolToString withGtkDoc}" "-Dtests=false" "-Dtracker3=${boolToString trackerSupport}" + "-Dbroadway_backend=${boolToString broadwaySupport}" ]; # These are the defines that'd you'd get with --enable-debug=minimum (default). diff --git a/pkgs/development/libraries/hotpatch/default.nix b/pkgs/development/libraries/hotpatch/default.nix index df3581cc8095..f8211b89d77a 100644 --- a/pkgs/development/libraries/hotpatch/default.nix +++ b/pkgs/development/libraries/hotpatch/default.nix @@ -10,7 +10,6 @@ stdenv.mkDerivation rec { sha256 = "169vdh55wsbn6fl58lpzqx64v6ifzh7krykav33x1d9hsk98qjqh"; }; - enableParallelBuilding = true; doCheck = true; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/hpx/default.nix b/pkgs/development/libraries/hpx/default.nix index ba7da8f5b774..f83d0aff32ed 100644 --- a/pkgs/development/libraries/hpx/default.nix +++ b/pkgs/development/libraries/hpx/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, boost, cmake, hwloc, gperftools, pkgconfig, python }: +{ stdenv, fetchFromGitHub, boost, cmake, hwloc, gperftools, pkg-config, python }: stdenv.mkDerivation rec { pname = "hpx"; @@ -12,9 +12,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ boost hwloc gperftools ]; - nativeBuildInputs = [ cmake pkgconfig python ]; - - enableParallelBuilding = true; + nativeBuildInputs = [ cmake pkg-config python ]; meta = { description = "C++ standard library for concurrency and parallelism"; diff --git a/pkgs/development/libraries/intel-media-driver/default.nix b/pkgs/development/libraries/intel-media-driver/default.nix index 153e41a777cc..6f2f543af06d 100644 --- a/pkgs/development/libraries/intel-media-driver/default.nix +++ b/pkgs/development/libraries/intel-media-driver/default.nix @@ -1,6 +1,7 @@ { stdenv, fetchFromGitHub , cmake, pkg-config -, libva, libpciaccess, intel-gmmlib, libX11 +, libva, libpciaccess, intel-gmmlib +, enableX11 ? true, libX11 }: stdenv.mkDerivation rec { @@ -23,7 +24,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ libva libpciaccess intel-gmmlib libX11 ]; + buildInputs = [ libva libpciaccess intel-gmmlib ] + ++ stdenv.lib.optional enableX11 libX11; meta = with stdenv.lib; { description = "Intel Media Driver for VAAPI — Broadwell+ iGPUs"; @@ -38,4 +40,9 @@ stdenv.mkDerivation rec { platforms = platforms.linux; maintainers = with maintainers; [ primeos jfrankenau ]; }; + + postFixup = stdenv.lib.optionalString enableX11 '' + patchelf --set-rpath "$(patchelf --print-rpath $out/lib/dri/iHD_drv_video.so):${stdenv.lib.makeLibraryPath [ libX11 ]}" \ + $out/lib/dri/iHD_drv_video.so + ''; } diff --git a/pkgs/development/libraries/itk/4.x.nix b/pkgs/development/libraries/itk/4.x.nix index 112b77650d29..7a7176c88c1e 100644 --- a/pkgs/development/libraries/itk/4.x.nix +++ b/pkgs/development/libraries/itk/4.x.nix @@ -22,8 +22,6 @@ stdenv.mkDerivation rec { "-DModule_ITKReview=ON" ]; - enableParallelBuilding = true; - nativeBuildInputs = [ cmake xz ]; buildInputs = [ libX11 libuuid vtk_7 ] ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa ]; diff --git a/pkgs/development/libraries/itk/default.nix b/pkgs/development/libraries/itk/default.nix index 65e41a58a47c..598ad52de049 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.1"; + version = "5.1.2"; src = fetchFromGitHub { owner = "InsightSoftwareConsortium"; repo = "ITK"; rev = "v${version}"; - sha256 = "1z7rmqrhgl7hfb3d0077kvp8vpi05r2zk3qyqzmv7bzbal5sqqhv"; + sha256 = "0db91pm1zy40h4qr5zsdfl94znk16w9ysddz5cxbl198iyyqii8f"; }; postPatch = '' @@ -28,8 +28,6 @@ stdenv.mkDerivation rec { "-DModule_ITKReview=ON" ]; - enableParallelBuilding = true; - nativeBuildInputs = [ cmake xz makeWrapper ]; buildInputs = [ libX11 libuuid vtk_7 ] ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa ]; diff --git a/pkgs/development/libraries/java/lombok/default.nix b/pkgs/development/libraries/java/lombok/default.nix index 5a1210036056..6d09bead53e4 100644 --- a/pkgs/development/libraries/java/lombok/default.nix +++ b/pkgs/development/libraries/java/lombok/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, makeWrapper, jdk }: stdenv.mkDerivation rec { name = "lombok-1.18.16"; @@ -8,9 +8,17 @@ stdenv.mkDerivation rec { sha256 = "1msys7xkaj0d7fi112fmb2z50mk46db58agzrrdyimggsszwn1kj"; }; + buildInputs = [ makeWrapper ]; + + outputs = [ "out" "bin" ]; + buildCommand = '' mkdir -p $out/share/java cp $src $out/share/java/lombok.jar + + makeWrapper ${jdk}/bin/java $bin/bin/lombok \ + --add-flags "-cp ${jdk}/lib/openjdk/lib/tools.jar:$out/share/java/lombok.jar" \ + --add-flags lombok.launch.Main ''; meta = { diff --git a/pkgs/development/libraries/kde-frameworks/fetch.sh b/pkgs/development/libraries/kde-frameworks/fetch.sh index ea38934b000e..5c6ea732b690 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.76/) +WGET_ARGS=( https://download.kde.org/stable/frameworks/5.76/ -A '*.tar.xz' ) diff --git a/pkgs/development/libraries/kde-frameworks/kinit/0004-start_kdeinit-environ-hard-limit.patch b/pkgs/development/libraries/kde-frameworks/kinit/0004-start_kdeinit-environ-hard-limit.patch index 34d4726150c0..2996342deadb 100644 --- a/pkgs/development/libraries/kde-frameworks/kinit/0004-start_kdeinit-environ-hard-limit.patch +++ b/pkgs/development/libraries/kde-frameworks/kinit/0004-start_kdeinit-environ-hard-limit.patch @@ -17,7 +17,7 @@ index f2db3e9..4ff2602 100644 if (read(0, &len, sizeof(unsigned)) == sizeof(unsigned) - && len && len < (1 << 12)) { + && len) { -+ if (len >= (1 << 14)) { ++ if (len >= (1 << 20)) { + fprintf(stderr, "%s: exceeded environment length limit", argv[0]); + return 1; + } diff --git a/pkgs/development/libraries/kde-frameworks/kirigami2.nix b/pkgs/development/libraries/kde-frameworks/kirigami2.nix index f4fc40f6d31d..751e3d7b73f1 100644 --- a/pkgs/development/libraries/kde-frameworks/kirigami2.nix +++ b/pkgs/development/libraries/kde-frameworks/kirigami2.nix @@ -1,4 +1,4 @@ -{ mkDerivation, extra-cmake-modules, qtbase, qtquickcontrols2, qttranslations }: +{ mkDerivation, extra-cmake-modules, qtbase, qtquickcontrols2, qttranslations, qtgraphicaleffects }: mkDerivation { name = "kirigami2"; @@ -6,6 +6,6 @@ mkDerivation { broken = builtins.compareVersions qtbase.version "5.7.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ qtbase qtquickcontrols2 qttranslations ]; + buildInputs = [ qtbase qtquickcontrols2 qttranslations qtgraphicaleffects ]; outputs = [ "out" "dev" ]; } diff --git a/pkgs/development/libraries/kde-frameworks/sonnet.nix b/pkgs/development/libraries/kde-frameworks/sonnet.nix index cccd92513583..5659aaf69607 100644 --- a/pkgs/development/libraries/kde-frameworks/sonnet.nix +++ b/pkgs/development/libraries/kde-frameworks/sonnet.nix @@ -1,6 +1,6 @@ { mkDerivation, lib , extra-cmake-modules -, hunspell, qtbase, qttools +, aspell, qtbase, qttools }: mkDerivation { @@ -10,6 +10,6 @@ mkDerivation { broken = builtins.compareVersions qtbase.version "5.7.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ hunspell qttools ]; + buildInputs = [ aspell qttools ]; propagatedBuildInputs = [ qtbase ]; } diff --git a/pkgs/development/libraries/kmsxx/default.nix b/pkgs/development/libraries/kmsxx/default.nix index 5bd311af2d85..f00d7e59b743 100644 --- a/pkgs/development/libraries/kmsxx/default.nix +++ b/pkgs/development/libraries/kmsxx/default.nix @@ -13,8 +13,6 @@ stdenv.mkDerivation { sha256 = "0xz4m9bk0naawxwpx5cy1j3cm6c8c9m5y551csk88y88x1g0z0xh"; }; - enableParallelBuilding = true; - cmakeFlags = stdenv.lib.optional (!withPython) "-DKMSXX_ENABLE_PYTHON=OFF"; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/pkgs/development/libraries/kpmcore/default.nix b/pkgs/development/libraries/kpmcore/default.nix index 1c00b6be2f20..d2677f69f9fc 100644 --- a/pkgs/development/libraries/kpmcore/default.nix +++ b/pkgs/development/libraries/kpmcore/default.nix @@ -24,8 +24,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ extra-cmake-modules ]; - enableParallelBuilding = true; - meta = with stdenv.lib; { maintainers = with lib.maintainers; [ peterhoeg ]; # The build requires at least Qt 5.14: diff --git a/pkgs/development/libraries/lcms/default.nix b/pkgs/development/libraries/lcms/default.nix index 01ec659a95b6..8fe2484facaf 100644 --- a/pkgs/development/libraries/lcms/default.nix +++ b/pkgs/development/libraries/lcms/default.nix @@ -1,10 +1,11 @@ {stdenv, fetchurl}: -stdenv.mkDerivation { - name = "lcms-1.19"; +stdenv.mkDerivation rec { + pname = "lcms"; + version = "1.19"; src = fetchurl { - url = "http://www.littlecms.com/lcms-1.19.tar.gz"; + url = "mirror://sourceforge/lcms/${pname}-${version}.tar.gz"; sha256 = "1abkf8iphwyfs3z305z3qczm3z1i9idc1lz4gvfg92jnkz5k5bl0"; }; diff --git a/pkgs/development/libraries/leatherman/default.nix b/pkgs/development/libraries/leatherman/default.nix index a1de88ef1ca4..7f1c292c5f13 100644 --- a/pkgs/development/libraries/leatherman/default.nix +++ b/pkgs/development/libraries/leatherman/default.nix @@ -16,8 +16,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ boost curl ruby ]; - enableParallelBuilding = true; - meta = with stdenv.lib; { homepage = "https://github.com/puppetlabs/leatherman/"; description = "A collection of C++ and CMake utility libraries"; diff --git a/pkgs/development/libraries/lensfun/default.nix b/pkgs/development/libraries/lensfun/default.nix index 830facc56720..e9e8d3447b9c 100644 --- a/pkgs/development/libraries/lensfun/default.nix +++ b/pkgs/development/libraries/lensfun/default.nix @@ -1,24 +1,45 @@ -{ stdenv, fetchurl, pkgconfig, glib, zlib, libpng, cmake }: +{ stdenv, fetchFromGitHub, pkg-config, glib, zlib, libpng, cmake }: -stdenv.mkDerivation rec { +let version = "0.3.95"; pname = "lensfun"; - src = fetchurl { - url = "mirror://sourceforge/lensfun/${version}/${pname}-${version}.tar.gz"; - sha256 = "0218f3xrlln0jmh4gcf1zbpvi2bidgl3b2mblf6c810n7j1rrhl2"; + # Fetch a more recent version of the repo containing a more recent lens + # database + lensfunDatabase = fetchFromGitHub { + owner = "lensfun"; + repo = "lensfun"; + rev = "4672d765a17bfef7bc994ca7008cb717c61045d5"; + sha256 = "00x35xhpn55j7f8qzakb6wl1ccbljg1gqjb93jl9w3mha2bzsr41"; }; - nativeBuildInputs = [ cmake pkgconfig ]; +in +stdenv.mkDerivation { + inherit pname version; + + src = fetchFromGitHub { + owner = "lensfun"; + repo = "lensfun"; + rev = "v${version}"; + sha256 = "0isli0arns8bmxqpbr1jnbnqh5wvspixdi51adm671f9ngng7x5r"; + }; + + # replace database with a more recent snapshot + postUnpack = '' + rm -R source/data/db + cp -R ${lensfunDatabase}/data/db source/data + ''; + + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ glib zlib libpng ]; - configureFlags = [ "-v" ]; + cmakeFlags = [ "-DINSTALL_HELPER_SCRIPTS=OFF" ]; meta = with stdenv.lib; { platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ enzime ]; + maintainers = with maintainers; [ flokli ]; license = stdenv.lib.licenses.lgpl3; description = "An opensource database of photographic lenses and their characteristics"; - homepage = "http://lensfun.sourceforge.net/"; + homepage = "https://lensfun.github.io"; }; } diff --git a/pkgs/development/libraries/libAfterImage/default.nix b/pkgs/development/libraries/libAfterImage/default.nix new file mode 100644 index 000000000000..8936603d18b0 --- /dev/null +++ b/pkgs/development/libraries/libAfterImage/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, zlib }: + +stdenv.mkDerivation { + pname = "libAfterImage"; + version = "1.20"; + + src = fetchurl { + name = "libAfterImage-1.20.tar.bz2"; + urls = [ + "https://sourceforge.net/projects/afterstep/files/libAfterImage/1.20/libAfterImage-1.20.tar.bz2/download" + "ftp://ftp.afterstep.org/stable/libAfterImage/libAfterImage-1.20.tar.bz2" + ]; + sha256 = "0n74rxidwig3yhr6fzxsk7y19n1nq1f296lzrvgj5pfiyi9k48vf"; + }; + + buildInputs = [ zlib ]; + + meta = with stdenv.lib; { + homepage = "http://www.afterstep.org/afterimage/"; + description = "A generic image manipulation library"; + platforms = platforms.unix; + maintainers = [ maintainers.veprbl ]; + license = licenses.lgpl21; + }; +} diff --git a/pkgs/development/libraries/libLAS/default.nix b/pkgs/development/libraries/libLAS/default.nix index 27db14e71660..714708a6e0df 100644 --- a/pkgs/development/libraries/libLAS/default.nix +++ b/pkgs/development/libraries/libLAS/default.nix @@ -4,13 +4,12 @@ stdenv.mkDerivation rec { name = "libLAS-1.8.1"; src = fetchurl { - url = "https://download.osgeo.org/liblas/${name}.tar.bz2"; sha256 = "0xjfxb3ydvr2258ji3spzyf81g9caap19ql2pk91wiivqsc4mnws"; }; - nativeBuildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; - buildInputs = [ boost cmake gdal libgeotiff libtiff LASzip2 ]; + nativeBuildInputs = [ cmake ] ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; + buildInputs = [ boost gdal libgeotiff libtiff LASzip2 ]; cmakeFlags = [ "-DGDAL_CONFIG=${gdal}/bin/gdal-config" diff --git a/pkgs/development/libraries/libbacktrace/default.nix b/pkgs/development/libraries/libbacktrace/default.nix index 0032941f870e..ea7f4eb9fa8a 100644 --- a/pkgs/development/libraries/libbacktrace/default.nix +++ b/pkgs/development/libraries/libbacktrace/default.nix @@ -1,4 +1,7 @@ -{ stdenv, callPackage, fetchFromGitHub, enableStatic ? false, enableShared ? true }: +{ stdenv, callPackage, fetchFromGitHub +, enableStatic ? stdenv.hostPlatform.isStatic +, enableShared ? !stdenv.hostPlatform.isStatic +}: let yesno = b: if b then "yes" else "no"; in stdenv.mkDerivation rec { diff --git a/pkgs/development/libraries/libbfd/default.nix b/pkgs/development/libraries/libbfd/default.nix index e622cc6be687..75db780b7bb6 100644 --- a/pkgs/development/libraries/libbfd/default.nix +++ b/pkgs/development/libraries/libbfd/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { outputs = [ "out" "dev" ]; patches = binutils-unwrapped.patches ++ [ - (binutils-unwrapped.patchesDir + "/build-components-separately.patch") + ../../tools/misc/binutils/build-components-separately.patch (fetchpatch { url = "https://raw.githubusercontent.com/mxe/mxe/e1d4c144ee1994f70f86cf7fd8168fe69bd629c6/src/bfd-1-disable-subdir-doc.patch"; sha256 = "0pzb3i74d1r7lhjan376h59a7kirw15j7swwm8pz3zy9lkdqkj6q"; diff --git a/pkgs/development/libraries/libbladeRF/default.nix b/pkgs/development/libraries/libbladeRF/default.nix index b2853011b140..f9bac3835d45 100644 --- a/pkgs/development/libraries/libbladeRF/default.nix +++ b/pkgs/development/libraries/libbladeRF/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, pkgconfig, cmake, git, doxygen, help2man, ncurses, tecla +{ stdenv, lib, fetchFromGitHub, fetchpatch, pkg-config, cmake, git, doxygen, help2man, ncurses, tecla , libusb1, udev }: let @@ -23,9 +23,18 @@ in stdenv.mkDerivation { sha256 = "0g89al4kwfbx1l3zjddgb9ay4mhr7zk0ndchca3sm1vq2j47nf4l"; }; - nativeBuildInputs = [ pkgconfig ]; + # This patch is required for version 2.2.1. As the patch is already part of + # upstream master, it will be incorporated into the next release. The patch + # fixes a (well-justified) compiler warning which breaks the build because + # we compile with -Werror. + patches = [ (fetchpatch { + url = "https://github.com/Nuand/bladeRF/commit/163425d48a3b7d8c100d7295220d3648c050d0dd.patch"; + sha256 = "1swsymlyxm3yk2k8l71z1fv0a5k2rmab02f0c7xkrvk683mq6yxw"; + }) ]; + + nativeBuildInputs = [ cmake pkg-config git doxygen help2man ]; # ncurses used due to https://github.com/Nuand/bladeRF/blob/ab4fc672c8bab4f8be34e8917d3f241b1d52d0b8/host/utilities/bladeRF-cli/CMakeLists.txt#L208 - buildInputs = [ cmake git doxygen help2man tecla libusb1 ] + buildInputs = [ tecla libusb1 ] ++ lib.optionals stdenv.isLinux [ udev ] ++ lib.optionals stdenv.isDarwin [ ncurses ]; diff --git a/pkgs/development/libraries/libbluedevil/default.nix b/pkgs/development/libraries/libbluedevil/default.nix index d9639cf5c145..bf72720019ce 100644 --- a/pkgs/development/libraries/libbluedevil/default.nix +++ b/pkgs/development/libraries/libbluedevil/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "0p4f0brhcz9gfxfd6114fa5x6swfdmgzv350xwncdr0s1qnamk8c"; }; - buildInputs = [ cmake qt4 ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ qt4 ]; meta = { platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/libdatrie/default.nix b/pkgs/development/libraries/libdatrie/default.nix index 0d3faf69e3b7..168773662f6a 100644 --- a/pkgs/development/libraries/libdatrie/default.nix +++ b/pkgs/development/libraries/libdatrie/default.nix @@ -1,23 +1,40 @@ -{ stdenv, fetchurl, makeWrapper, installShellFiles, pkg-config, libiconv }: +{ stdenv, fetchFromGitHub, makeWrapper +, autoreconfHook, autoconf-archive +, installShellFiles, libiconv }: stdenv.mkDerivation rec { - pname = "libdatrie"; - version = "0.2.12"; - src = fetchurl { - url = "https://github.com/tlwg/libdatrie/releases/download/v${version}/libdatrie-${version}.tar.xz"; - sha256 = "0jdi01pcxv0b24zbjy7zahawsqqqw4mv94f2yy01zh4n796wqba5"; + pname = "libdatrie"; + version = "2019-12-20"; + + src = fetchFromGitHub { + owner = "tlwg"; + repo = "libdatrie"; + rev = "d1db08ac1c76f54ba23d63665437473788c999f3"; + sha256 = "03dc363259iyiidrgadzc7i03mmfdj8h78j82vk6z53w6fxq5zxc"; }; - nativeBuildInputs = [ installShellFiles pkg-config ]; + nativeBuildInputs = [ + autoreconfHook + autoconf-archive + installShellFiles + ]; buildInputs = stdenv.lib.optional stdenv.isDarwin libiconv; + preAutoreconf = let + reports = "https://github.com/tlwg/libdatrie/issues"; + in + '' + sed -i -e "/AC_INIT/,+3d" configure.ac + sed -i "5iAC_INIT(${pname},${version},[${reports}])" configure.ac + ''; + postInstall = '' installManPage man/trietool.1 ''; - meta = with stdenv.lib;{ + meta = with stdenv.lib; { homepage = "https://linux.thai.net/~thep/datrie/datrie.html"; description = "This is an implementation of double-array structure for representing trie"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/libdynd/default.nix b/pkgs/development/libraries/libdynd/default.nix index cc9018421feb..2450ac6a9ea0 100644 --- a/pkgs/development/libraries/libdynd/default.nix +++ b/pkgs/development/libraries/libdynd/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { "-Wno-error=deprecated-copy" ]; - buildInputs = [ cmake ]; + nativeBuildInputs = [ cmake ]; outputs = [ "out" "dev" ]; outputDoc = "dev"; diff --git a/pkgs/development/libraries/libebur128/default.nix b/pkgs/development/libraries/libebur128/default.nix index cb5291922989..e349af41bcb5 100644 --- a/pkgs/development/libraries/libebur128/default.nix +++ b/pkgs/development/libraries/libebur128/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, speexdsp, pkgconfig }: +{ stdenv, fetchFromGitHub, cmake, speexdsp, pkg-config }: stdenv.mkDerivation rec { version = "1.2.4"; @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { sha256 = "0n81rnm8dm1zmibkr2v3q79rsd609y0dbbsrbay18njcjva88p0g"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake speexdsp ]; + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ speexdsp ]; meta = with stdenv.lib; { description = "Implementation of the EBU R128 loudness standard"; diff --git a/pkgs/development/libraries/libechonest/default.nix b/pkgs/development/libraries/libechonest/default.nix index cde046bf1327..957daf7dc412 100644 --- a/pkgs/development/libraries/libechonest/default.nix +++ b/pkgs/development/libraries/libechonest/default.nix @@ -25,7 +25,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake doxygen ]; buildInputs = [ qt4 qjson ]; - enableParallelBuilding = true; doCheck = false; # requires network access meta = { diff --git a/pkgs/development/libraries/libev/default.nix b/pkgs/development/libraries/libev/default.nix index 1ea0615dc234..9f950ebb09c0 100644 --- a/pkgs/development/libraries/libev/default.nix +++ b/pkgs/development/libraries/libev/default.nix @@ -1,4 +1,7 @@ -{ stdenv, fetchurl, static ? false }: +{ stdenv, fetchurl +, # Note: -static hasn’t work on darwin + static ? with stdenv.hostPlatform; isStatic && !isDarwin +}: # Note: this package is used for bootstrapping fetchurl, and thus # cannot use fetchpatch! All mutable patches (generated by GitHub or diff --git a/pkgs/development/libraries/libexecinfo/default.nix b/pkgs/development/libraries/libexecinfo/default.nix index 9c649c223c12..feee754590b6 100644 --- a/pkgs/development/libraries/libexecinfo/default.nix +++ b/pkgs/development/libraries/libexecinfo/default.nix @@ -1,4 +1,7 @@ -{ stdenv, fetchurl, fetchpatch, enableStatic ? true, enableShared ? true }: +{ stdenv, fetchurl, fetchpatch +, enableStatic ? true +, enableShared ? !stdenv.hostPlatform.isStatic +}: stdenv.mkDerivation rec { pname = "libexecinfo"; diff --git a/pkgs/development/libraries/libfprint/default.nix b/pkgs/development/libraries/libfprint/default.nix index 4984d95ffa4e..11051f70e448 100644 --- a/pkgs/development/libraries/libfprint/default.nix +++ b/pkgs/development/libraries/libfprint/default.nix @@ -44,6 +44,8 @@ stdenv.mkDerivation rec { nss ]; + NIX_CFLAGS_COMPILE = "-Wno-error=array-bounds"; + mesonFlags = [ "-Dudev_rules_dir=${placeholder "out"}/lib/udev/rules.d" ]; diff --git a/pkgs/development/libraries/libgaminggear/default.nix b/pkgs/development/libraries/libgaminggear/default.nix index c0aa67238bff..b3d58c446cff 100644 --- a/pkgs/development/libraries/libgaminggear/default.nix +++ b/pkgs/development/libraries/libgaminggear/default.nix @@ -20,8 +20,6 @@ stdenv.mkDerivation rec { gtk2 libcanberra libnotify pcre sqlite xorg.libXdmcp xorg.libpthreadstubs ]; - enableParallelBuilding = true; - cmakeFlags = [ "-DINSTALL_CMAKE_MODULESDIR=lib/cmake" "-DINSTALL_PKGCONFIGDIR=lib/pkgconfig" diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix index 2290d2fa07dc..cd529cb06ee6 100644 --- a/pkgs/development/libraries/libgcrypt/default.nix +++ b/pkgs/development/libraries/libgcrypt/default.nix @@ -34,6 +34,11 @@ stdenv.mkDerivation rec { # aarch64 configurePlatforms = [ "host" "build" ]; + postConfigure = '' + sed -i configure \ + -e 's/NOEXECSTACK_FLAGS=$/NOEXECSTACK_FLAGS="-Wa,--noexecstack"/' + ''; + # Make sure libraries are correct for .pc and .la files # Also make sure includes are fixed for callers who don't use libgpgcrypt-config postFixup = '' diff --git a/pkgs/development/libraries/libgda/default.nix b/pkgs/development/libraries/libgda/default.nix index f0b430c91d81..3f8e6f01b34b 100644 --- a/pkgs/development/libraries/libgda/default.nix +++ b/pkgs/development/libraries/libgda/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, gtk3, openssl, gnome3, gobject-introspection, vala, libgee -, overrideCC, gcc6 +{ stdenv, fetchurl, pkg-config, intltool, itstool, libxml2, gtk3, openssl, gnome3, gobject-introspection, vala, libgee +, overrideCC, gcc6, fetchpatch, autoreconfHook, gtk-doc, autoconf-archive, yelp-tools , mysqlSupport ? false, libmysqlclient ? null , postgresSupport ? false, postgresql ? null }: @@ -15,8 +15,16 @@ assert postgresSupport -> postgresql != null; url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1j1l4dwjgw6w4d1v4bl5a4kwyj7bcih8mj700ywm7xakh1xxyv3g"; }; + + patches = [ + # fix compile error with mysql + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/libgda/-/commit/9859479884fad5f39e6c37e8995e57c28b11b1b9.diff"; + sha256 = "158sncc5bg9lkri1wb0i1ri1nhx4c34rzi47gbfkwphlp7qd4qqv"; + }) + ]; + configureFlags = with stdenv.lib; [ - "--enable-gi-system-install=no" "--with-mysql=${if mysqlSupport then "yes" else "no"}" "--with-postgres=${if postgresSupport then "yes" else "no"}" @@ -32,7 +40,7 @@ assert postgresSupport -> postgresql != null; hardeningDisable = [ "format" ]; - nativeBuildInputs = [ pkgconfig intltool itstool libxml2 gobject-introspection vala ]; + nativeBuildInputs = [ pkg-config intltool itstool libxml2 gobject-introspection vala autoreconfHook gtk-doc autoconf-archive yelp-tools ]; buildInputs = with stdenv.lib; [ gtk3 openssl libgee ] ++ optional (mysqlSupport) libmysqlclient ++ optional (postgresSupport) postgresql; diff --git a/pkgs/development/libraries/libgroove/default.nix b/pkgs/development/libraries/libgroove/default.nix index 3fea527c450e..52cdf5e90270 100644 --- a/pkgs/development/libraries/libgroove/default.nix +++ b/pkgs/development/libraries/libgroove/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { patches = [ ./no-warnings-as-errors.patch ]; - buildInputs = [ cmake libav SDL2 chromaprint libebur128 ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ libav SDL2 chromaprint libebur128 ]; meta = with stdenv.lib; { description = "Streaming audio processing library"; diff --git a/pkgs/development/libraries/libguestfs/default.nix b/pkgs/development/libraries/libguestfs/default.nix index b875b3579037..d6e45deadcf8 100644 --- a/pkgs/development/libraries/libguestfs/default.nix +++ b/pkgs/development/libraries/libguestfs/default.nix @@ -1,7 +1,7 @@ { 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, db -, gmp, readline, file, numactl, xen, libapparmor, jansson +, gmp, readline, file, numactl, libapparmor, jansson , getopt, perlPackages, ocamlPackages , libtirpc , appliance ? null @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ncurses cpio gperf jansson cdrkit flex bison qemu pcre augeas libxml2 acl libcap libcap_ng libconfig systemd fuse yajl libvirt gmp readline file hivex db - numactl xen libapparmor getopt perlPackages.ModuleBuild + numactl libapparmor getopt perlPackages.ModuleBuild libtirpc ] ++ (with perlPackages; [ perl libintl_perl GetoptLong SysVirt ]) ++ (with ocamlPackages; [ ocaml findlib ocamlbuild ocaml_libvirt gettext-stub ounit ]) diff --git a/pkgs/development/libraries/libharu/default.nix b/pkgs/development/libraries/libharu/default.nix index 68dba64618f5..634a991f49b8 100644 --- a/pkgs/development/libraries/libharu/default.nix +++ b/pkgs/development/libraries/libharu/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation { sha256 = "15s9hswnl3qqi7yh29jyrg0hma2n99haxznvcywmsp8kjqlyg75q"; }; - buildInputs = [ zlib libpng cmake ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ zlib libpng ]; meta = { description = "Cross platform, open source library for generating PDF files"; diff --git a/pkgs/development/libraries/libiberty/default.nix b/pkgs/development/libraries/libiberty/default.nix index ff26c1029ef5..c7babb3038d3 100644 --- a/pkgs/development/libraries/libiberty/default.nix +++ b/pkgs/development/libraries/libiberty/default.nix @@ -1,4 +1,6 @@ -{ stdenv, buildPackages, staticBuild ? false }: +{ stdenv, buildPackages +, staticBuild ? stdenv.hostPlatform.isStatic +}: let inherit (buildPackages.buildPackages) gcc; in diff --git a/pkgs/development/libraries/libiconv/default.nix b/pkgs/development/libraries/libiconv/default.nix index 87969d6b2c7b..35d01cd3e820 100644 --- a/pkgs/development/libraries/libiconv/default.nix +++ b/pkgs/development/libraries/libiconv/default.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, lib -, enableStatic ? stdenv.hostPlatform.useAndroidPrebuilt -, enableShared ? !stdenv.hostPlatform.useAndroidPrebuilt +, enableStatic ? stdenv.hostPlatform.isStatic +, enableShared ? !stdenv.hostPlatform.isStatic }: # assert !stdenv.hostPlatform.isLinux || stdenv.hostPlatform != stdenv.buildPlatform; # TODO: improve on cross diff --git a/pkgs/development/libraries/libime/default.nix b/pkgs/development/libraries/libime/default.nix new file mode 100644 index 000000000000..476d2419ef31 --- /dev/null +++ b/pkgs/development/libraries/libime/default.nix @@ -0,0 +1,63 @@ +{ stdenv +, fetchurl +, fetchFromGitHub +, cmake +, extra-cmake-modules +, boost +, python3 +, fcitx5 +}: + +let + table = fetchurl { + url = "https://download.fcitx-im.org/data/table.tar.gz"; + sha256 = "1dw7mgbaidv3vqy0sh8dbfv8631d2zwv5mlb7npf69a1f8y0b5k1"; + }; + arpaVer = "20140820"; + arpa = fetchurl { + url = "https://download.fcitx-im.org/data/lm_sc.3gm.arpa-${arpaVer}.tar.bz2"; + sha256 = "0bqy3l7mif0yygjrcm65qallszgn17mvgyxhvz7a54zaamyan6vm"; + }; + dictVer = "20200715"; + dict = fetchurl { + url = "https://download.fcitx-im.org/data/dict.utf8-${dictVer}.tar.xz"; + sha256 = "1ln7r64j8mc7wz4j0q4v8wd68wy7qqz4bz1dpxk7zqbdvza6rhr3"; + }; +in +stdenv.mkDerivation rec { + pname = "libime"; + version = "1.0.2"; + + src = fetchFromGitHub { + owner = "fcitx"; + repo = "libime"; + rev = version; + sha256 = "hDfxuDIj9qx5d+UFwxDdP2PCboPnUV1n+VVoEIGsucM="; + fetchSubmodules = true; + }; + + prePatch = '' + ln -s ${table} data/$(stripHash ${table}) + ln -s ${arpa} data/$(stripHash ${arpa}) + ln -s ${dict} data/$(stripHash ${dict}) + ''; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + python3 + ]; + + buildInputs = [ + boost + fcitx5 + ]; + + meta = with stdenv.lib; { + description = "A library to support generic input method implementation"; + homepage = "https://github.com/fcitx/libime"; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ poscat ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/libinsane/default.nix b/pkgs/development/libraries/libinsane/default.nix index 075d5761036c..51ce6808f5dd 100644 --- a/pkgs/development/libraries/libinsane/default.nix +++ b/pkgs/development/libraries/libinsane/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { pname = "libinsane"; - version = "1.0.8"; + version = "1.0.9"; outputs = [ "out" "dev" "devdoc" ]; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { group = "World"; owner = "OpenPaperwork"; rev = version; - sha256 = "0mcvqpixilzs4d4afkbxa1nqm6ddmhpaz5j56pfvc5wpv6s99h44"; + sha256 = "1a1lszhq3j11i1jybc5kmn7hhhji44xhjqsxsldsy9l3344rkzv4"; }; nativeBuildInputs = [ meson pkg-config ninja doxygen gtk-doc docbook_xsl gobject-introspection vala ]; diff --git a/pkgs/development/libraries/libjpeg-turbo/default.nix b/pkgs/development/libraries/libjpeg-turbo/default.nix index 6aa4e049e4c3..c4e81d034fc9 100644 --- a/pkgs/development/libraries/libjpeg-turbo/default.nix +++ b/pkgs/development/libraries/libjpeg-turbo/default.nix @@ -1,4 +1,7 @@ -{ stdenv, fetchFromGitHub, cmake, nasm, enableStatic ? false, enableShared ? true }: +{ stdenv, fetchFromGitHub, cmake, nasm +, enableStatic ? stdenv.hostPlatform.isStatic +, enableShared ? !stdenv.hostPlatform.isStatic +}: stdenv.mkDerivation rec { diff --git a/pkgs/development/libraries/libjreen/default.nix b/pkgs/development/libraries/libjreen/default.nix index 141598839b06..2c14d270f262 100644 --- a/pkgs/development/libraries/libjreen/default.nix +++ b/pkgs/development/libraries/libjreen/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, qt4, pkgconfig, gsasl }: +{ stdenv, fetchurl, cmake, qt4, pkg-config, gsasl }: stdenv.mkDerivation rec { pname = "libjreen"; @@ -9,9 +9,8 @@ stdenv.mkDerivation rec { sha256 = "14nwwk40xx8w6x7yaysgcr0lgzhs7l064f7ikp32s5y9a8mmp582"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake qt4 gsasl ]; - enableParallelBuilding = true; + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ qt4 gsasl ]; meta = { description = "C++ Jabber library using Qt framework"; diff --git a/pkgs/development/libraries/libjson-rpc-cpp/default.nix b/pkgs/development/libraries/libjson-rpc-cpp/default.nix index 03d77c11bec3..aa23b3f8eafa 100644 --- a/pkgs/development/libraries/libjson-rpc-cpp/default.nix +++ b/pkgs/development/libraries/libjson-rpc-cpp/default.nix @@ -1,19 +1,47 @@ -{ stdenv, fetchFromGitHub, cmake, jsoncpp, argtable, curl, libmicrohttpd -, doxygen, catch, pkgconfig +{ stdenv +, fetchFromGitHub +, fetchpatch +, pkg-config +, cmake +, argtable +, catch2 +, curl +, doxygen +, hiredis +, jsoncpp +, libmicrohttpd }: stdenv.mkDerivation rec { pname = "libjson-rpc-cpp"; - version = "0.7.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "cinemast"; repo = "libjson-rpc-cpp"; - sha256 = "07bg4nyvx0yyhy8c4x9i22kwqpx5jlv36dvpabgbb46ayyndhr7a"; + sha256 = "sha256-EAakiqlfMprwLjloDekOssaB/EnAmn5njcwHGZtYs9w="; rev = "v${version}"; }; - NIX_CFLAGS_COMPILE = "-I${catch}/include/catch"; + NIX_CFLAGS_COMPILE = "-I${catch2}/include/catch2"; + + patches = [ + (fetchpatch { + name = "int-to-MHD_Result.patch"; + url = "https://patch-diff.githubusercontent.com/raw/cinemast/libjson-rpc-cpp/pull/299.patch"; + sha256 = "sha256-hiey6etzbOxhMElTMX7offKbey7c2OO/UWeN03k0AaM="; + }) + ]; + + nativeBuildInputs = [ pkg-config cmake doxygen ]; + buildInputs = [ + argtable + catch2 + curl + hiredis + jsoncpp + libmicrohttpd + ]; postPatch = '' for f in cmake/FindArgtable.cmake \ @@ -26,37 +54,43 @@ stdenv.mkDerivation rec { sed -i -re 's#MATCHES "jsoncpp"#MATCHES ".*/jsoncpp/json$"#g' cmake/FindJsoncpp.cmake ''; - configurePhase = '' + preConfigure = '' mkdir -p Build/Install pushd Build - - cmake .. -DCMAKE_INSTALL_PREFIX=$(pwd)/Install \ - -DCMAKE_BUILD_TYPE=Release ''; - installPhase = '' - mkdir -p $out + # this hack is needed because the cmake scripts + # require write permission to absolute paths + configurePhase = '' + runHook preConfigure + cmake .. -DCMAKE_INSTALL_PREFIX=$(pwd)/Install \ + -DCMAKE_BUILD_TYPE=Release + runHook postConfigure + ''; + preInstall = '' function fixRunPath { p=$(patchelf --print-rpath $1) q="$p:${stdenv.lib.makeLibraryPath [ jsoncpp argtable libmicrohttpd curl ]}:$out/lib" patchelf --set-rpath $q $1 } - make install + mkdir -p $out + ''; - sed -i -re "s#-([LI]).*/Build/Install(.*)#-\1$out\2#g" Install/lib/pkgconfig/*.pc - for f in Install/lib/*.so* $(find Install/bin -executable -type f); do + postInstall = '' + sed -i -re "s#-([LI]).*/Build/Install(.*)#-\1$out\2#g" Install/lib64/pkgconfig/*.pc + for f in Install/lib64/*.so* $(find Install/bin -executable -type f); do fixRunPath $f done - cp -r Install/* $out ''; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake jsoncpp argtable curl libmicrohttpd doxygen catch ]; - - enableParallelBuilding = true; + installPhase = '' + runHook preInstall + make install + runHook postInstall + ''; meta = with stdenv.lib; { description = "C++ framework for json-rpc (json remote procedure call)"; diff --git a/pkgs/development/libraries/libktorrent/default.nix b/pkgs/development/libraries/libktorrent/default.nix index 19c24ec37549..9aea99f6a403 100644 --- a/pkgs/development/libraries/libktorrent/default.nix +++ b/pkgs/development/libraries/libktorrent/default.nix @@ -23,8 +23,6 @@ in stdenv.mkDerivation rec { propagatedBuildInputs = [ gmp boost ]; - enableParallelBuilding = true; - passthru = { inherit mainVersion; }; diff --git a/pkgs/development/libraries/liblangtag/default.nix b/pkgs/development/libraries/liblangtag/default.nix index 1c5c39ac8989..b724789188cd 100644 --- a/pkgs/development/libraries/liblangtag/default.nix +++ b/pkgs/development/libraries/liblangtag/default.nix @@ -1,22 +1,22 @@ -{stdenv, fetchurl, fetchFromBitbucket, autoreconfHook, gtk-doc, gettext +{ stdenv, fetchurl, fetchFromBitbucket, autoreconfHook, gtk-doc, gettext , pkgconfig, glib, libxml2, gobject-introspection, gnome-common, unzip }: stdenv.mkDerivation rec { pname = "liblangtag"; - version = "0.6.1"; + version = "0.6.3"; src = fetchFromBitbucket { owner = "tagoh"; repo = pname; rev = version; - sha256 = "19dk2qsg7f3ig9xz8d73jvikmf5kvrwi008wrz2psxinbdml442g"; + sha256 = "10rycs8xrxzf9frzalv3qx8cs1jcildhrr4imzxdmr9f4l585z96"; }; core_zip = fetchurl { # please update if an update is available - url = "http://www.unicode.org/Public/cldr/33.1/core.zip"; - sha256 = "0f195aald02ng3ch2q1wf59b5lwp2bi1cd8ia7572pbyy2w8w8cp"; + url = "http://www.unicode.org/Public/cldr/37/core.zip"; + sha256 = "0myswkvvaxvrz9zwq4zh65sygfd9n72cd5rk4pwacqba4nxgb4xs"; }; language_subtag_registry = fetchurl { diff --git a/pkgs/development/libraries/liblaxjson/default.nix b/pkgs/development/libraries/liblaxjson/default.nix index b932f9e928b3..ef50c106eae1 100644 --- a/pkgs/development/libraries/liblaxjson/default.nix +++ b/pkgs/development/libraries/liblaxjson/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "01iqbpbhnqfifhv82m6hi8190w5sdim4qyrkss7z1zyv3gpchc5s"; }; - buildInputs = [ cmake ]; + nativeBuildInputs = [ cmake ]; meta = with stdenv.lib; { description = "Library for parsing JSON config files"; diff --git a/pkgs/development/libraries/libmd/default.nix b/pkgs/development/libraries/libmd/default.nix index a38e71bb540e..e3dd0b206f10 100644 --- a/pkgs/development/libraries/libmd/default.nix +++ b/pkgs/development/libraries/libmd/default.nix @@ -2,23 +2,19 @@ stdenv.mkDerivation rec { pname = "libmd"; - version = "1.0.1"; + version = "1.0.3"; src = fetchurl { url = "https://archive.hadrons.org/software/${pname}/${pname}-${version}.tar.xz"; - sha256 = "0waclg2d5qin3r26gy5jvy4584ik60njc8pqbzwk0lzq3j9ynkp1"; + sha256 = "0jmga8y94h857ilra3qjaiax3wd5pd6mx1h120zhl9fcjmzhj0js"; }; nativeBuildInputs = [ autoreconfHook ]; - # Writing the version to a .dist-version file is required for the get-version - # shell script because fetchgit removes the .git directory. - prePatch = '' - echo '${version}' > .dist-version; - ''; - meta = with stdenv.lib; { homepage = "https://www.hadrons.org/software/${pname}/"; + changelog = "https://archive.hadrons.org/software/libmd/libmd-${version}.announce"; + # Git: https://git.hadrons.org/cgit/libmd.git description = "Message Digest functions from BSD systems"; license = with licenses; [ bsd3 bsd2 isc beerware publicDomain ]; maintainers = with maintainers; [ primeos ]; diff --git a/pkgs/development/libraries/libmicrohttpd/0.9.72.nix b/pkgs/development/libraries/libmicrohttpd/0.9.72.nix new file mode 100644 index 000000000000..8eeb94cdc295 --- /dev/null +++ b/pkgs/development/libraries/libmicrohttpd/0.9.72.nix @@ -0,0 +1,10 @@ +{ stdenv, callPackage, fetchurl }: + +callPackage ./generic.nix ( rec { + version = "0.9.72"; + + src = fetchurl { + url = "mirror://gnu/libmicrohttpd/libmicrohttpd-${version}.tar.gz"; + sha256 = "sha256-Cugl+ODX9BIB/USg3xz0VMHLC8UP6dWcJlUiYCZML/g="; + }; +}) diff --git a/pkgs/development/libraries/libmusicbrainz/5.x.nix b/pkgs/development/libraries/libmusicbrainz/5.x.nix index 2fdcdc7d86d6..7c8cdd1df1ad 100644 --- a/pkgs/development/libraries/libmusicbrainz/5.x.nix +++ b/pkgs/development/libraries/libmusicbrainz/5.x.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchFromGitHub, cmake, neon, libdiscid, libxml2, pkgconfig }: +{ stdenv, fetchFromGitHub, cmake, neon, libdiscid, libxml2, pkg-config }: stdenv.mkDerivation rec { version = "5.1.0"; pname = "libmusicbrainz"; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake neon libdiscid libxml2 ]; + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ neon libdiscid libxml2 ]; src = fetchFromGitHub { owner = "metabrainz"; diff --git a/pkgs/development/libraries/libmusicbrainz/default.nix b/pkgs/development/libraries/libmusicbrainz/default.nix index 0db539a23afe..d5568cdb3d68 100644 --- a/pkgs/development/libraries/libmusicbrainz/default.nix +++ b/pkgs/development/libraries/libmusicbrainz/default.nix @@ -3,7 +3,8 @@ stdenv.mkDerivation rec { name = "libmusicbrainz-3.0.3"; - buildInputs = [ cmake neon libdiscid ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ neon libdiscid ]; src = fetchurl { url = "ftp://ftp.musicbrainz.org/pub/musicbrainz/${name}.tar.gz"; diff --git a/pkgs/development/libraries/libnabo/default.nix b/pkgs/development/libraries/libnabo/default.nix index 4c3ceee1e561..91843163176b 100644 --- a/pkgs/development/libraries/libnabo/default.nix +++ b/pkgs/development/libraries/libnabo/default.nix @@ -11,9 +11,8 @@ stdenv.mkDerivation rec { sha256 = "17vxlmszzpm95vvfdxnm98d5p297i10fyblblj6kf0ynq8r2mpsh"; }; - buildInputs = [cmake eigen boost]; - - enableParallelBuilding = true; + nativeBuildInputs = [ cmake ]; + buildInputs = [ eigen boost ]; cmakeFlags = [ "-DEIGEN_INCLUDE_DIR=${eigen}/include/eigen3" diff --git a/pkgs/development/libraries/libnats-c/default.nix b/pkgs/development/libraries/libnats-c/default.nix index 3916ff35f696..12f1038f8e1c 100644 --- a/pkgs/development/libraries/libnats-c/default.nix +++ b/pkgs/development/libraries/libnats-c/default.nix @@ -18,7 +18,6 @@ stdenv.mkDerivation rec { buildInputs = [ libsodium openssl protobuf protobufc ]; separateDebugInfo = true; - enableParallelBuilding = true; outputs = [ "out" "dev" ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libomxil-bellagio/default.nix b/pkgs/development/libraries/libomxil-bellagio/default.nix index 5f583d53abfe..854c2732c12c 100644 --- a/pkgs/development/libraries/libomxil-bellagio/default.nix +++ b/pkgs/development/libraries/libomxil-bellagio/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { # Fix for #40213, probably permanent, because upstream doesn't seem to be # developed anymore. Alternatively, gcc7Stdenv could be used. - NIX_CFLAGS_COMPILE = "-Wno-error=array-bounds"; + NIX_CFLAGS_COMPILE = "-Wno-error=array-bounds -Wno-error=stringop-overflow=8"; meta = with stdenv.lib; { homepage = "https://sourceforge.net/projects/omxil/"; diff --git a/pkgs/development/libraries/libopcodes/default.nix b/pkgs/development/libraries/libopcodes/default.nix index f596ddfafc44..8db034683dc7 100644 --- a/pkgs/development/libraries/libopcodes/default.nix +++ b/pkgs/development/libraries/libopcodes/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { outputs = [ "out" "dev" ]; patches = binutils-unwrapped.patches ++ [ - (binutils-unwrapped.patchesDir + "/build-components-separately.patch") + ../../tools/misc/binutils/build-components-separately.patch ]; # We just want to build libopcodes diff --git a/pkgs/development/libraries/libopus/default.nix b/pkgs/development/libraries/libopus/default.nix index 9f4d6275ad66..e8d3682b8b31 100644 --- a/pkgs/development/libraries/libopus/default.nix +++ b/pkgs/development/libraries/libopus/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { configureFlags = stdenv.lib.optional fixedPoint "--enable-fixed-point" ++ stdenv.lib.optional withCustomModes "--enable-custom-modes"; - doCheck = true; + doCheck = !stdenv.isi686; # test_unit_LPC_inv_pred_gain fails meta = with stdenv.lib; { description = "Open, royalty-free, highly versatile audio codec"; diff --git a/pkgs/development/libraries/libosmium/default.nix b/pkgs/development/libraries/libosmium/default.nix index 830465fb113c..10e6d61d1565 100644 --- a/pkgs/development/libraries/libosmium/default.nix +++ b/pkgs/development/libraries/libosmium/default.nix @@ -2,19 +2,21 @@ stdenv.mkDerivation rec { pname = "libosmium"; - version = "2.15.6"; + version = "2.16.0"; src = fetchFromGitHub { owner = "osmcode"; repo = "libosmium"; rev = "v${version}"; - sha256 = "0rqy18bbakp41f44y5id9ixh0ar2dby46z17p4115z8k1vv9znq2"; + sha256 = "1na51g6xfm1bx0d0izbg99cwmqn0grp0g41znn93xnhs202qnb2h"; }; nativeBuildInputs = [ cmake ]; buildInputs = [ protozero zlib bzip2 expat boost ]; + cmakeFlags = [ "-DINSTALL_GDALCPP:BOOL=ON" ]; + doCheck = true; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libpfm/default.nix b/pkgs/development/libraries/libpfm/default.nix index b29aeb2930a7..63b826258ae6 100644 --- a/pkgs/development/libraries/libpfm/default.nix +++ b/pkgs/development/libraries/libpfm/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, enableShared ? true }: +{ stdenv, fetchurl +, enableShared ? !stdenv.hostPlatform.isStatic +}: stdenv.mkDerivation (rec { version = "4.11.0"; diff --git a/pkgs/development/libraries/libplacebo/default.nix b/pkgs/development/libraries/libplacebo/default.nix index ac8552fa9ef4..956b34fd93dd 100644 --- a/pkgs/development/libraries/libplacebo/default.nix +++ b/pkgs/development/libraries/libplacebo/default.nix @@ -11,18 +11,28 @@ , glslang , lcms2 , epoxy +, libGL +, xorg }: stdenv.mkDerivation rec { pname = "libplacebo"; - version = "2.72.2"; + version = "3.104.0"; + + patches = [ + (fetchpatch { + # support glslang>=11.0.0; Upstream MR: https://code.videolan.org/videolan/libplacebo/-/merge_requests/131 + url = "https://code.videolan.org/videolan/libplacebo/-/commit/affd15a2faa1340d40dcf277a8acffe2987f517c.patch"; + sha256 = "1nm27mdm9rn3wsbjdif46pici6mbzmfb6521ijl8ah4mxn9p1ikc"; + }) + ]; src = fetchFromGitLab { domain = "code.videolan.org"; owner = "videolan"; repo = pname; rev = "v${version}"; - sha256 = "1ijqpx1pagc6qg63ynqrinvckwc8aaw1i0lx48gg5szwk8afib4i"; + sha256 = "0p5mx8ch7cp7b54yrkl4fs8bcvqma1h461gx6ps4kagn4dsx8asb"; }; nativeBuildInputs = [ @@ -39,6 +49,8 @@ stdenv.mkDerivation rec { glslang lcms2 epoxy + libGL + xorg.libX11 ]; mesonFlags = [ diff --git a/pkgs/development/libraries/libpointmatcher/default.nix b/pkgs/development/libraries/libpointmatcher/default.nix index 20b2988417cc..3a90f28e7578 100644 --- a/pkgs/development/libraries/libpointmatcher/default.nix +++ b/pkgs/development/libraries/libpointmatcher/default.nix @@ -14,8 +14,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ eigen boost libnabo ]; - enableParallelBuilding = true; - cmakeFlags = [ "-DEIGEN_INCLUDE_DIR=${eigen}/include/eigen3" ]; diff --git a/pkgs/development/libraries/libqalculate/default.nix b/pkgs/development/libraries/libqalculate/default.nix index bc142b0a57c2..b61bcd030270 100644 --- a/pkgs/development/libraries/libqalculate/default.nix +++ b/pkgs/development/libraries/libqalculate/default.nix @@ -3,19 +3,20 @@ stdenv.mkDerivation rec { pname = "libqalculate"; - version = "3.14.0"; + version = "3.16.0"; src = fetchFromGitHub { owner = "qalculate"; repo = "libqalculate"; rev = "v${version}"; - sha256 = "1j4sr9s7152xmci677pnz64spv8s3ia26fbp5cqx8ydv7swlivh2"; + sha256 = "0nrf03q3qrsvxf6kjpv69l49yfal79834a3jv75mzi6y674ach9g"; }; outputs = [ "out" "dev" "doc" ]; nativeBuildInputs = [ intltool pkgconfig autoreconfHook doxygen ]; buildInputs = [ curl gettext libiconv readline ]; + configureFlags = ["--with-readline=${readline.dev}"]; propagatedBuildInputs = [ libxml2 mpfr icu ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/librealsense/default.nix b/pkgs/development/libraries/librealsense/default.nix index 2ceb2125dbc9..9a2ea6d033e4 100644 --- a/pkgs/development/libraries/librealsense/default.nix +++ b/pkgs/development/libraries/librealsense/default.nix @@ -1,4 +1,4 @@ -{ stdenv, config, lib, fetchFromGitHub, cmake, libusb1, ninja, pkgconfig, gcc +{ stdenv, config, lib, fetchFromGitHub, cmake, libusb1, ninja, pkg-config, gcc , cudaSupport ? config.cudaSupport or false, cudatoolkit , enablePython ? false, pythonPackages ? null }: @@ -7,7 +7,7 @@ assert enablePython -> pythonPackages != null; stdenv.mkDerivation rec { pname = "librealsense"; - version = "2.40.0"; + version = "2.41.0"; outputs = [ "out" "dev" ]; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { owner = "IntelRealSense"; repo = pname; rev = "v${version}"; - sha256 = "KZNriNDxRKR14KFJrAbzZLfSQ3iiZ8PKC80fVh0AQls="; + sha256 = "0ngv9fgja72vg7hq1aiwpa7x4dhniawhpd8mqm85pqkjxiph8s1k"; }; buildInputs = [ @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ninja - pkgconfig + pkg-config ]; cmakeFlags = [ diff --git a/pkgs/development/libraries/libresample/default.nix b/pkgs/development/libraries/libresample/default.nix index 85d8d5c586b5..80dd4e05b211 100644 --- a/pkgs/development/libraries/libresample/default.nix +++ b/pkgs/development/libraries/libresample/default.nix @@ -16,8 +16,8 @@ stdenv.mkDerivation { preConfigure = '' cat debian/patches/1001_shlib-cmake.patch | patch -p1 ''; - buildInputs = [ cmake ]; - + nativeBuildInputs = [ cmake ]; + meta = { description = "A real-time library for sampling rate conversion library"; license = stdenv.lib.licenses.lgpl2Plus; diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix index 1f6313d8caab..d67342eebc11 100644 --- a/pkgs/development/libraries/libressl/default.nix +++ b/pkgs/development/libraries/libressl/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, lib, cmake, cacert, fetchpatch, buildShared ? true }: +{ stdenv, fetchurl, lib, cmake, cacert, fetchpatch +, buildShared ? !stdenv.hostPlatform.isStatic +}: let @@ -40,8 +42,6 @@ let substituteInPlace ./tls/tls_config.c --replace '"/etc/ssl/cert.pem"' '"${cacert}/etc/ssl/certs/ca-bundle.crt"' ''; - enableParallelBuilding = true; - outputs = [ "bin" "dev" "out" "man" "nc" ]; postFixup = '' diff --git a/pkgs/development/libraries/librime/default.nix b/pkgs/development/libraries/librime/default.nix index a9a17eca786a..4de2f1f8d3f6 100644 --- a/pkgs/development/libraries/librime/default.nix +++ b/pkgs/development/libraries/librime/default.nix @@ -16,8 +16,6 @@ stdenv.mkDerivation rec { buildInputs = [ boost glog leveldb marisa opencc libyamlcpp gmock ]; - enableParallelBuilding = true; - meta = with stdenv.lib; { homepage = "https://rime.im/"; description = "Rime Input Method Engine, the core library"; diff --git a/pkgs/development/libraries/libschrift/default.nix b/pkgs/development/libraries/libschrift/default.nix new file mode 100644 index 000000000000..a06f6c50d667 --- /dev/null +++ b/pkgs/development/libraries/libschrift/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "libschrift"; + version = "0.9.1"; + + src = fetchFromGitHub { + owner = "tomolt"; + repo = pname; + rev = "c6d20460d6e602e8829d3a227fd7be4c4c3cda86"; + hash = "sha256-BuTmWaWFZ0DXujlbhbmK3Woit8fR9F4DWmKszHX6gOI="; + }; + + postPatch = '' + substituteInPlace config.mk \ + --replace "PREFIX = /usr/local" "PREFIX = $out" + ''; + + makeFlags = [ "libschrift.a" ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/tomolt/libschrift"; + description = "A lightweight TrueType font rendering library"; + license = licenses.isc; + platforms = platforms.all; + maintainers = [ maintainers.sternenseemann ]; + }; +} diff --git a/pkgs/development/libraries/libsnark/default.nix b/pkgs/development/libraries/libsnark/default.nix index 227353e0a9f8..6de498f6d29e 100644 --- a/pkgs/development/libraries/libsnark/default.nix +++ b/pkgs/development/libraries/libsnark/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, openssl, boost, gmp, procps }: +{ stdenv, fetchFromGitHub, cmake, pkg-config, openssl, boost, gmp, procps }: let rev = "9e6b19ff15bc19fba5da1707ba18e7f160e5ed07"; @@ -7,7 +7,8 @@ in stdenv.mkDerivation rec { name = "libsnark-pre${version}"; version = stdenv.lib.substring 0 8 rev; - buildInputs = [ cmake pkgconfig openssl boost gmp ] ++ lib.optional stdenv.hostPlatform.isLinux procps; + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ openssl boost gmp ] ++ lib.optional stdenv.hostPlatform.isLinux procps; cmakeFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "-DWITH_PROCPS=OFF" "-DWITH_SUPERCOP=OFF" ]; @@ -19,8 +20,6 @@ in stdenv.mkDerivation rec { fetchSubmodules = true; }; - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "C++ library for zkSNARKs"; homepage = "https://github.com/scipr-lab/libsnark"; diff --git a/pkgs/development/libraries/libstrophe/default.nix b/pkgs/development/libraries/libstrophe/default.nix index 428e23f33f51..0c7828c954f2 100644 --- a/pkgs/development/libraries/libstrophe/default.nix +++ b/pkgs/development/libraries/libstrophe/default.nix @@ -1,17 +1,26 @@ -{ stdenv, fetchFromGitHub, automake, autoconf, libtool, openssl, expat, pkgconfig, check }: +{ stdenv +, fetchFromGitHub +, pkg-config +, automake +, autoconf +, libtool +, openssl +, expat +, check +}: stdenv.mkDerivation rec { pname = "libstrophe"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "strophe"; repo = pname; rev = version; - sha256 = "1hizw695fw0cy88h1dpl9pvniapml2zw9yvxck8xvxbqfz54jwja"; + sha256 = "sha256-6byg7hE0DN/cbf9NHpK/2DhXZyuelYAp+SA7vVUgo4U="; }; - nativeBuildInputs = [ automake autoconf pkgconfig libtool check ]; + nativeBuildInputs = [ automake autoconf pkg-config libtool check ]; buildInputs = [ openssl expat ]; dontDisableStatic = true; @@ -20,7 +29,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = { + meta = with stdenv.lib; { description = "A simple, lightweight C library for writing XMPP clients"; longDescription = '' libstrophe is a lightweight XMPP client library written in C. It has @@ -28,8 +37,8 @@ stdenv.mkDerivation rec { runs well on both Linux, Unix, and Windows based platforms. ''; homepage = "https://strophe.im/libstrophe/"; - license = with stdenv.lib.licenses; [ gpl3 mit ]; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ devhell flosse ]; + license = with licenses; [ gpl3 mit ]; + platforms = platforms.unix; + maintainers = with maintainers; [ devhell flosse ]; }; } diff --git a/pkgs/development/libraries/libsurvive/default.nix b/pkgs/development/libraries/libsurvive/default.nix new file mode 100644 index 000000000000..11a5cdcf4e93 --- /dev/null +++ b/pkgs/development/libraries/libsurvive/default.nix @@ -0,0 +1,40 @@ +{ stdenv +, fetchFromGitHub +, cmake +, pkg-config +, freeglut +, liblapack +, libusb1 +, openblas +, zlib +}: + +stdenv.mkDerivation rec { + pname = "libsurvive"; + version = "0.3"; + + src = fetchFromGitHub { + owner = "cntools"; + repo = pname; + rev = "v${version}"; + sha256 = "0m21fnq8pfw2pcvqfgjws531zmalda423q9i65v4qzm8sdb54hl4"; + }; + + nativeBuildInputs = [ cmake pkg-config ]; + + buildInputs = [ + freeglut + liblapack + libusb1 + openblas + zlib + ]; + + meta = with stdenv.lib; { + description = "Open Source Lighthouse Tracking System"; + homepage = "https://github.com/cntools/libsurvive"; + license = licenses.mit; + maintainers = with maintainers; [ expipiplus1 prusnak ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/libtcod/default.nix b/pkgs/development/libraries/libtcod/default.nix index c8c59b15f3ae..420a4c6ad206 100644 --- a/pkgs/development/libraries/libtcod/default.nix +++ b/pkgs/development/libraries/libtcod/default.nix @@ -21,7 +21,8 @@ stdenv.mkDerivation { cmakeFlags = [ "-DLIBTCOD_SAMPLES=OFF" ]; - buildInputs = [ cmake SDL libGLU libGL upx zlib ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ SDL libGLU libGL upx zlib ]; meta = { description = "API for roguelike games"; diff --git a/pkgs/development/libraries/libtins/default.nix b/pkgs/development/libraries/libtins/default.nix index bde1cbf44e1f..d70921e3354d 100644 --- a/pkgs/development/libraries/libtins/default.nix +++ b/pkgs/development/libraries/libtins/default.nix @@ -29,7 +29,6 @@ stdenv.mkDerivation rec { "--with-boost=${boost.dev}" ]; - enableParallelBuilding = true; doCheck = true; preCheck = '' export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD${placeholder "out"}/lib diff --git a/pkgs/development/libraries/libtoxcore/default.nix b/pkgs/development/libraries/libtoxcore/default.nix index 6d170c798d0a..42c35e68edd9 100644 --- a/pkgs/development/libraries/libtoxcore/default.nix +++ b/pkgs/development/libraries/libtoxcore/default.nix @@ -28,8 +28,6 @@ let nativeBuildInputs = [ cmake pkgconfig ]; - enableParallelBuilding = true; - doCheck = false; # hangs, tries to access the net? checkInputs = [ check ]; diff --git a/pkgs/development/libraries/libuecc/default.nix b/pkgs/development/libraries/libuecc/default.nix index ff6801ef18f4..e5d21e2d8f7e 100644 --- a/pkgs/development/libraries/libuecc/default.nix +++ b/pkgs/development/libraries/libuecc/default.nix @@ -10,9 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1sm05aql75sh13ykgsv3ns4x4zzw9lvzid6misd22gfgf6r9n5fs"; }; - buildInputs = [ cmake ]; - - enableParallelBuilding = true; + nativeBuildInputs = [ cmake ]; meta = with stdenv.lib; { description = "Very small Elliptic Curve Cryptography library"; diff --git a/pkgs/development/libraries/libunarr/default.nix b/pkgs/development/libraries/libunarr/default.nix index 3bc5f1370918..6515a51f137d 100644 --- a/pkgs/development/libraries/libunarr/default.nix +++ b/pkgs/development/libraries/libunarr/default.nix @@ -11,8 +11,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - enableParallelBuilding = true; - meta = with stdenv.lib; { homepage = "https://github.com/selmf/unarr"; description = "A lightweight decompression library with support for rar, tar and zip archives"; diff --git a/pkgs/development/libraries/libunwind/default.nix b/pkgs/development/libraries/libunwind/default.nix index 3816788f9299..7e481034f433 100644 --- a/pkgs/development/libraries/libunwind/default.nix +++ b/pkgs/development/libraries/libunwind/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { # Without latex2man, no man pages are installed despite being # prebuilt in the source tarball. - configureFlags = "LATEX2MAN=${coreutils}/bin/true"; + configureFlags = [ "LATEX2MAN=${coreutils}/bin/true" ]; propagatedBuildInputs = [ xz ]; diff --git a/pkgs/development/libraries/libuvc/default.nix b/pkgs/development/libraries/libuvc/default.nix new file mode 100644 index 000000000000..e2956a99432d --- /dev/null +++ b/pkgs/development/libraries/libuvc/default.nix @@ -0,0 +1,30 @@ +{ stdenv +, fetchFromGitHub +, cmake +, pkg-config +, libusb1 +}: + +stdenv.mkDerivation rec { + pname = "libuvc"; + version = "unstable-2020-11-29"; + + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "5cddef71b17d41f7e98875a840c50d9704c3d2b2"; + sha256 = "0kranb0x1k5qad8rwxnn1w9963sbfj2cfzdgpfmlivb04544m2j7"; + }; + + nativeBuildInputs = [ cmake pkg-config ]; + + buildInputs = [ libusb1 ]; + + meta = with stdenv.lib; { + homepage = "https://ken.tossell.net/libuvc/"; + description = "Cross-platform library for USB video devices"; + platforms = platforms.linux; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ prusnak ]; + }; +} diff --git a/pkgs/development/libraries/libvmaf/default.nix b/pkgs/development/libraries/libvmaf/default.nix index 9f7e84558f7d..293cb21bb5d6 100644 --- a/pkgs/development/libraries/libvmaf/default.nix +++ b/pkgs/development/libraries/libvmaf/default.nix @@ -2,24 +2,28 @@ stdenv.mkDerivation rec { pname = "libvmaf"; - version = "1.5.3"; + version = "2.1.0"; src = fetchFromGitHub { owner = "netflix"; repo = "vmaf"; rev = "v${version}"; - sha256 = "0x3l3g0hgrrjh3ygmxr1pd3rd5589s07c7id35nvj76ch5b7gy63"; + sha256 = "0gh4zwz975x9kvqdmzs45f96rk99apay57jc68rc8c2xm7gfis58"; }; sourceRoot = "source/libvmaf"; nativeBuildInputs = [ meson ninja nasm ]; + + mesonFlags = [ "-Denable_avx512=true" ]; + outputs = [ "out" "dev" ]; - doCheck = true; + doCheck = false; meta = with stdenv.lib; { homepage = "https://github.com/Netflix/vmaf"; description = "Perceptual video quality assessment based on multi-method fusion (VMAF)"; + changelog = "https://github.com/Netflix/vmaf/blob/v${version}/CHANGELOG.md"; platforms = platforms.unix; license = licenses.bsd2Patent; maintainers = [ maintainers.cfsmp3 maintainers.marsam ]; diff --git a/pkgs/development/libraries/libwhereami/default.nix b/pkgs/development/libraries/libwhereami/default.nix index 59e349b4e6a1..7dac33152856 100644 --- a/pkgs/development/libraries/libwhereami/default.nix +++ b/pkgs/development/libraries/libwhereami/default.nix @@ -17,8 +17,6 @@ stdenv.mkDerivation rec { buildInputs = [ boost curl leatherman ]; - enableParallelBuilding = true; - meta = with stdenv.lib; { inherit (src.meta) homepage; description = "Library to report hypervisor information from inside a VM"; diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix index 594928876888..10ad110d24e5 100644 --- a/pkgs/development/libraries/libxml2/default.nix +++ b/pkgs/development/libraries/libxml2/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchurl, fetchpatch , zlib, xz, libintl, python, gettext, ncurses, findXMLCatalogs -, pythonSupport ? stdenv.buildPlatform == stdenv.hostPlatform +, pythonSupport ? enableShared && stdenv.buildPlatform == stdenv.hostPlatform , icuSupport ? false, icu ? null , enableShared ? stdenv.hostPlatform.libc != "msvcrt" , enableStatic ? !enableShared, diff --git a/pkgs/development/libraries/libxsmm/default.nix b/pkgs/development/libraries/libxsmm/default.nix index 30f060405f08..5e4a56a6d4de 100644 --- a/pkgs/development/libraries/libxsmm/default.nix +++ b/pkgs/development/libraries/libxsmm/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, coreutils, gfortran, gnused , python3, util-linux, which -, enableStatic ? false +, enableStatic ? stdenv.hostPlatform.isStatic }: let diff --git a/pkgs/development/libraries/libzra/default.nix b/pkgs/development/libraries/libzra/default.nix index b5fe6e593566..6accf24ac28d 100644 --- a/pkgs/development/libraries/libzra/default.nix +++ b/pkgs/development/libraries/libzra/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "libzra"; - version = "unstable-2020-08-10"; + version = "unstable-2020-09-11"; src = fetchFromGitHub { owner = "zraorg"; repo = "zra"; - rev = "e678980ae7e79efd716b4a6610fe9f148425fd6b"; - sha256 = "132xyzhadahm01nas8gycjza5hs839fnpsh73im2a7wwfdw76z4h"; + rev = "57abf2774dfc4624f14a0bc5bba71f044ce54a38"; + sha256 = "10rlqj6ma02005gdcp57wp48d6cg0vkbv4vl9ai0zlgxyx1g6kc4"; fetchSubmodules = true; }; diff --git a/pkgs/development/libraries/liquidfun/default.nix b/pkgs/development/libraries/liquidfun/default.nix index 1beae81ad16f..21d3bc476635 100644 --- a/pkgs/development/libraries/liquidfun/default.nix +++ b/pkgs/development/libraries/liquidfun/default.nix @@ -1,6 +1,6 @@ { stdenv, requireFile, cmake, libGLU, libGL, libX11, libXi }: -let +let sourceInfo = rec { version="1.1.0"; name="liquidfun-${version}"; @@ -16,7 +16,8 @@ stdenv.mkDerivation { }; inherit (sourceInfo) name version; - buildInputs = [ cmake libGLU libGL libX11 libXi ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ libGLU libGL libX11 libXi ]; sourceRoot = "liquidfun/Box2D/"; @@ -26,10 +27,10 @@ stdenv.mkDerivation { sed -i Box2D/Common/b2Settings.h -e 's@b2_maxPolygonVertices .*@b2_maxPolygonVertices 15@' substituteInPlace Box2D/CMakeLists.txt --replace "Common/b2GrowableStack.h" "Common/b2GrowableStack.h Common/b2GrowableBuffer.h" ''; - + configurePhase = '' mkdir Build - cd Build; + cd Build; cmake -DBOX2D_INSTALL=ON -DBOX2D_BUILD_SHARED=ON -DCMAKE_INSTALL_PREFIX=$out .. ''; @@ -45,4 +46,3 @@ stdenv.mkDerivation { homepage = "https://google.github.io/liquidfun/"; }; } - diff --git a/pkgs/development/libraries/lucene++/default.nix b/pkgs/development/libraries/lucene++/default.nix index 3d54cf5e7c13..0dcd53a0772b 100644 --- a/pkgs/development/libraries/lucene++/default.nix +++ b/pkgs/development/libraries/lucene++/default.nix @@ -17,9 +17,9 @@ stdenv.mkDerivation rec { ''; cmakeFlags = [ "-DGTEST_INCLUDE_DIR=${gtest}/include" ]; - buildInputs = [ cmake boost gtest ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ boost gtest ]; - enableParallelBuilding = true; doCheck = true; checkTarget = "test"; diff --git a/pkgs/development/libraries/mailcore2/default.nix b/pkgs/development/libraries/mailcore2/default.nix index d5f20f6761c2..4e5a5fdbcdbc 100644 --- a/pkgs/development/libraries/mailcore2/default.nix +++ b/pkgs/development/libraries/mailcore2/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, cmake, libetpan, icu, cyrus_sasl, libctemplate -, libuchardet, pkgconfig, glib, html-tidy, libxml2, libuuid, openssl +, libuchardet, pkg-config, glib, html-tidy, libxml2, libuuid, openssl }: stdenv.mkDerivation rec { @@ -14,9 +14,9 @@ stdenv.mkDerivation rec { sha256 = "0a69q11z194fdfwyazjyyylx57sqs9j4lz7jwh5qcws8syqgb23z"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ - libetpan cmake icu cyrus_sasl libctemplate libuchardet glib + libetpan icu cyrus_sasl libctemplate libuchardet glib html-tidy libxml2 libuuid openssl ]; diff --git a/pkgs/development/libraries/medfile/default.nix b/pkgs/development/libraries/medfile/default.nix index 246bdb1480c0..4821b9865b20 100644 --- a/pkgs/development/libraries/medfile/default.nix +++ b/pkgs/development/libraries/medfile/default.nix @@ -9,8 +9,6 @@ stdenv.mkDerivation rec { sha256 = "1khzclkrd1yn9mz3g14ndgpsbj8j50v8dsjarcj6kkn9zgbbazc4"; }; - enableParallelBuilding = true; - nativeBuildInputs = [ cmake ]; buildInputs = [ hdf5 ]; diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 578763478f5f..55264888e2a4 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -31,7 +31,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.2.4"; + version = "20.3.2"; branch = versions.major version; in @@ -46,7 +46,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 = "14m09bk7akj0k02lg8fhvvzbdsashlbdsgl2cw7wbqfj2mhdqwh5"; + sha256 = "0gakhsj5qgm4wran7nlnz7kzgg3aj0a8f4q4dfbznfnjhnv03q6c"; }; prePatch = "patchShebangs ."; @@ -58,34 +58,20 @@ stdenv.mkDerivation { ./missing-includes.patch # dev_t needs sys/stat.h, time_t needs time.h, etc.-- fixes build w/musl ./opencl-install-dir.patch ./disk_cache-include-dri-driver-path-in-cache-key.patch - ] - ++ lib.optionals stdenv.hostPlatform.isMusl [ - # Fix `-Werror=int-conversion` pthread warnings on musl. - # TODO: Remove when https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6121 is merged and available - (fetchpatch { - name = "nine_debug-Make-tid-more-type-correct"; - url = "https://gitlab.freedesktop.org/mesa/mesa/commit/aebbf819df6d1e.patch"; - sha256 = "17248hyzg43d73c86p077m4lv1pkncaycr3l27hwv9k4ija9zl8q"; - }) - ] - # do not prefix user provided dri-drivers-path - ++ lib.optional (lib.versionOlder version "19.0.0") (fetchpatch { - url = "https://gitlab.freedesktop.org/mesa/mesa/commit/f6556ec7d126b31da37c08d7cb657250505e01a0.patch"; - sha256 = "0z6phi8hbrbb32kkp1js7ggzviq7faz1ria36wi4jbc4in2392d9"; + # Fix `-Werror=int-conversion` pthread warnings on musl. + # TODO: Remove when https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6121 is merged and available + (fetchpatch { + name = "nine_debug-Make-tid-more-type-correct"; + url = "https://gitlab.freedesktop.org/mesa/mesa/commit/aebbf819df6d1e.patch"; + sha256 = "17248hyzg43d73c86p077m4lv1pkncaycr3l27hwv9k4ija9zl8q"; }) - ++ lib.optionals (lib.versionOlder version "19.1.0") [ - # do not prefix user provided d3d-drivers-path - (fetchpatch { - url = "https://gitlab.freedesktop.org/mesa/mesa/commit/dcc48664197c7e44684ccfb970a4ae083974d145.patch"; - sha256 = "1nhs0xpx3hiy8zfb5gx1zd7j7xha6h0hr7yingm93130a5902lkb"; - }) - - # don't build libGLES*.so with GLVND - (fetchpatch { - url = "https://gitlab.freedesktop.org/mesa/mesa/commit/b01524fff05eef66e8cd24f1c5aacefed4209f03.patch"; - sha256 = "1pszr6acx2xw469zq89n156p3bf3xf84qpbjw5fr1sj642lbyh7c"; - }) - ]; + # Fix for pre macOS SDK 10.13: + (fetchpatch { # util: Disable memstream for Apple builds + # MR: https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8269 + url = "https://gitlab.freedesktop.org/mesa/mesa/-/commit/f4403f70fe5bf2ec41af5546122f0d78caffa984.patch"; + sha256 = "03j2aj255m7ms848nkb41vj3s3yb72zb5rz3w3fzp5l9wzzargw5"; + }) + ]; postPatch = '' substituteInPlace meson.build --replace \ diff --git a/pkgs/development/libraries/metal/default.nix b/pkgs/development/libraries/metal/default.nix index 7e047c28d0a6..090fd46640e6 100644 --- a/pkgs/development/libraries/metal/default.nix +++ b/pkgs/development/libraries/metal/default.nix @@ -12,8 +12,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "Single-header C++11 library designed to make you love template metaprogramming"; homepage = "https://github.com/brunocodutra/metal"; diff --git a/pkgs/development/libraries/mimalloc/default.nix b/pkgs/development/libraries/mimalloc/default.nix index 7382ed57c640..fcc44062b517 100644 --- a/pkgs/development/libraries/mimalloc/default.nix +++ b/pkgs/development/libraries/mimalloc/default.nix @@ -17,7 +17,6 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake ninja ]; - enableParallelBuilding = true; cmakeFlags = stdenv.lib.optional secureBuild [ "-DMI_SECURE=ON" ]; postInstall = let diff --git a/pkgs/development/libraries/mlt/qt-5.nix b/pkgs/development/libraries/mlt/qt-5.nix index 7bcbff78767f..f8ec278ea78b 100644 --- a/pkgs/development/libraries/mlt/qt-5.nix +++ b/pkgs/development/libraries/mlt/qt-5.nix @@ -75,8 +75,6 @@ mkDerivation rec { CXXFLAGS = "-std=c++11"; - enableParallelBuilding = true; - qtWrapperArgs = [ "--prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1" "--prefix LADSPA_PATH : ${ladspaPlugins}/lib/ladspa" diff --git a/pkgs/development/libraries/mp4v2/default.nix b/pkgs/development/libraries/mp4v2/default.nix index 9601ae1eea30..3b8efadcfd19 100644 --- a/pkgs/development/libraries/mp4v2/default.nix +++ b/pkgs/development/libraries/mp4v2/default.nix @@ -19,8 +19,13 @@ stdenv.mkDerivation rec { url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/libmp4v2-c++11.patch?id=203f5a72bc97ffe089b424c47b07dd9eaea35713"; sha256 = "0sbn0il7lmk77yrjyb4f0a3z3h8gsmdkscvz5n9hmrrrhrwf672w"; }) + ] ++ stdenv.lib.optionals stdenv.cc.isClang [ + # unbreak build with Clang≥6 (C++14 by default). Based on https://reviews.freebsd.org/rP458678 + ./fix-build-clang.patch ]; + NIX_CFLAGS_COMPILE = [ "-Wno-error=narrowing" ]; + # `faac' expects `mp4.h'. postInstall = "ln -s mp4v2/mp4v2.h $out/include/mp4.h"; diff --git a/pkgs/development/libraries/mp4v2/fix-build-clang.patch b/pkgs/development/libraries/mp4v2/fix-build-clang.patch new file mode 100644 index 000000000000..5d99f1951f7a --- /dev/null +++ b/pkgs/development/libraries/mp4v2/fix-build-clang.patch @@ -0,0 +1,13 @@ +diff --git a/src/mp4.cpp b/src/mp4.cpp +index c2a7238..9bb3e38 100644 +--- a/src/mp4.cpp ++++ b/src/mp4.cpp +@@ -870,7 +870,7 @@ MP4FileHandle MP4ReadProvider( const char* fileName, const MP4FileProvider* file + } + + catch (...) { +- return MP4_INVALID_TRACK_ID; ++ return NULL; + } + } + diff --git a/pkgs/development/libraries/msgpack/generic.nix b/pkgs/development/libraries/msgpack/generic.nix index 4cb743a38f8f..d7d79de8b2b6 100644 --- a/pkgs/development/libraries/msgpack/generic.nix +++ b/pkgs/development/libraries/msgpack/generic.nix @@ -11,12 +11,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake ]; - enableParallelBuilding = true; - - cmakeFlags = [] - ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) - "-DMSGPACK_BUILD_EXAMPLES=OFF" - ; + cmakeFlags = stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "-DMSGPACK_BUILD_EXAMPLES=OFF"; meta = with stdenv.lib; { description = "MessagePack implementation for C and C++"; diff --git a/pkgs/development/libraries/mygui/default.nix b/pkgs/development/libraries/mygui/default.nix index 894d35eb3d8a..4b86868d2aa2 100644 --- a/pkgs/development/libraries/mygui/default.nix +++ b/pkgs/development/libraries/mygui/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, libX11, unzip, cmake, ois, freetype, libuuid, - boost, pkgconfig, withOgre ? false, ogre ? null, libGL, libGLU ? null } : + boost, pkg-config, withOgre ? false, ogre ? null, libGL, libGLU ? null } : let renderSystem = if withOgre then "3" else "4"; @@ -14,11 +14,9 @@ in stdenv.mkDerivation rec { sha256 = "0a4zi8w18pjj813n7kmxldl1d9r1jp0iyhkw7pbqgl8f7qaq994w"; }; - enableParallelBuilding = true; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libX11 unzip cmake ois freetype libuuid boost ] - ++ (if withOgre then [ ogre ] else [libGL libGLU]); + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ libX11 unzip ois freetype libuuid boost ] + ++ (if withOgre then [ ogre ] else [ libGL libGLU ]); # Tools are disabled due to compilation failures. cmakeFlags = [ "-DMYGUI_BUILD_TOOLS=OFF" "-DMYGUI_BUILD_DEMOS=OFF" "-DMYGUI_RENDERSYSTEM=${renderSystem}" ]; diff --git a/pkgs/development/libraries/nanoflann/default.nix b/pkgs/development/libraries/nanoflann/default.nix index 3bd6bb02a054..649ce91cbd81 100644 --- a/pkgs/development/libraries/nanoflann/default.nix +++ b/pkgs/development/libraries/nanoflann/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0lq1zqwjvk8wv15hd7aw57jsqbvv45cwb8ngdh1d2iyw5rvnbhsn"; }; - buildInputs = [ cmake ]; + nativeBuildInputs = [ cmake ]; cmakeFlags = [ "-DBUILD_EXAMPLES=OFF" diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix index 0e75bfbd5b51..17a924e6e74c 100644 --- a/pkgs/development/libraries/ncurses/default.nix +++ b/pkgs/development/libraries/ncurses/default.nix @@ -3,7 +3,7 @@ , abiVersion ? "6" , mouseSupport ? false , unicode ? true -, enableStatic ? stdenv.hostPlatform.useAndroidPrebuilt +, enableStatic ? stdenv.hostPlatform.isStatic , enableShared ? !enableStatic , withCxx ? !stdenv.hostPlatform.useAndroidPrebuilt diff --git a/pkgs/development/libraries/neon/default.nix b/pkgs/development/libraries/neon/default.nix index c9a2621f4400..e9ce6ee18b4f 100644 --- a/pkgs/development/libraries/neon/default.nix +++ b/pkgs/development/libraries/neon/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, libxml2, pkgconfig, perl , compressionSupport ? true, zlib ? null , sslSupport ? true, openssl ? null -, static ? false -, shared ? true +, static ? stdenv.hostPlatform.isStatic +, shared ? !stdenv.hostPlatform.isStatic }: assert compressionSupport -> zlib != null; diff --git a/pkgs/development/libraries/nghttp2/default.nix b/pkgs/development/libraries/nghttp2/default.nix index c9ccf63f8895..7bcdf8feb302 100644 --- a/pkgs/development/libraries/nghttp2/default.nix +++ b/pkgs/development/libraries/nghttp2/default.nix @@ -8,7 +8,7 @@ , enableAsioLib ? false, boost ? null , enableGetAssets ? false, libxml2 ? null , enableJemalloc ? false, jemalloc ? null -, enableApp ? !stdenv.hostPlatform.isWindows +, enableApp ? with stdenv.hostPlatform; !isWindows && !isStatic , enablePython ? false, python ? null, cython ? null, ncurses ? null, setuptools ? null }: diff --git a/pkgs/development/libraries/ngt/default.nix b/pkgs/development/libraries/ngt/default.nix index 977bdf9afe37..7d766eb5d879 100644 --- a/pkgs/development/libraries/ngt/default.nix +++ b/pkgs/development/libraries/ngt/default.nix @@ -1,8 +1,13 @@ -{ stdenv, fetchFromGitHub, cmake, llvmPackages, enableAVX ? false }: +{ stdenv +, fetchFromGitHub +, cmake +, llvmPackages +, enableAVX ? stdenv.hostPlatform.avxSupport +}: + stdenv.mkDerivation rec { pname = "NGT"; version = "v1.12.3-alpha"; - nativeBuildInputs = [ cmake ]; src = fetchFromGitHub { owner = "yahoojapan"; @@ -11,11 +16,11 @@ stdenv.mkDerivation rec { sha256 = "sha256-nu0MJNpaenOB4+evoSVLKmPIuZXVj1Rm9x53+TfhezY="; }; + nativeBuildInputs = [ cmake ]; buildInputs = [ llvmPackages.openmp ]; - NIX_ENFORCE_NO_NATIVE=! enableAVX; - __AVX2__ = if enableAVX then 1 else 0; - enableParallelBuilding = true; + NIX_ENFORCE_NO_NATIVE = ! enableAVX; + __AVX2__ = if enableAVX then 1 else 0; meta = with stdenv.lib; { homepage = "https://github.com/yahoojapan/NGT"; diff --git a/pkgs/development/libraries/nlohmann_json/default.nix b/pkgs/development/libraries/nlohmann_json/default.nix index 84b86b47157d..34c0f6294af5 100644 --- a/pkgs/development/libraries/nlohmann_json/default.nix +++ b/pkgs/development/libraries/nlohmann_json/default.nix @@ -14,8 +14,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - enableParallelBuilding = true; - cmakeFlags = [ "-DBuildTests=${if doCheck then "ON" else "OFF"}" "-DJSON_MultipleHeaders=ON" diff --git a/pkgs/development/libraries/nss_wrapper/default.nix b/pkgs/development/libraries/nss_wrapper/default.nix index c03b09447789..2b9321c7a907 100644 --- a/pkgs/development/libraries/nss_wrapper/default.nix +++ b/pkgs/development/libraries/nss_wrapper/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, pkgconfig }: +{ stdenv, fetchurl, cmake, pkg-config }: stdenv.mkDerivation rec { name = "nss_wrapper-1.1.11"; @@ -8,8 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1q5l6w69yc71ly8gcbnkrcbnq6b64cbiiv99m0z5vn5lgwp36igv"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake ]; + nativeBuildInputs = [ cmake pkg-config ]; meta = with stdenv.lib; { description = "A wrapper for the user, group and hosts NSS API"; diff --git a/pkgs/development/libraries/ntdb/default.nix b/pkgs/development/libraries/ntdb/default.nix index de0db887d4bf..d0a9a2e5b49a 100644 --- a/pkgs/development/libraries/ntdb/default.nix +++ b/pkgs/development/libraries/ntdb/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchurl +, python2 , python3 , pkg-config , readline @@ -26,6 +27,7 @@ stdenv.mkDerivation rec { docbook-xsl-nons docbook_xml_dtd_42 wafHook + python2 # For wafHook ]; buildInputs = [ diff --git a/pkgs/development/libraries/nuspell/default.nix b/pkgs/development/libraries/nuspell/default.nix index b0a9227b8c93..bc6ceff83789 100644 --- a/pkgs/development/libraries/nuspell/default.nix +++ b/pkgs/development/libraries/nuspell/default.nix @@ -16,8 +16,6 @@ stdenv.mkDerivation rec { outputs = [ "out" "lib" "dev" "man" ]; - enableParallelBuilding = true; - postPatch = '' rm -rf external/Catch2 ln -sf ${catch2.src} external/Catch2 diff --git a/pkgs/development/libraries/nvidia-texture-tools/default.nix b/pkgs/development/libraries/nvidia-texture-tools/default.nix index a2bdbc798eb0..577f56e8c275 100644 --- a/pkgs/development/libraries/nvidia-texture-tools/default.nix +++ b/pkgs/development/libraries/nvidia-texture-tools/default.nix @@ -37,8 +37,6 @@ stdenv.mkDerivation rec { moveToOutput lib "$lib" ''; - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "A set of cuda-enabled texture tools and compressors"; homepage = "https://github.com/castano/nvidia-texture-tools"; diff --git a/pkgs/development/libraries/ogre/1.10.x.nix b/pkgs/development/libraries/ogre/1.10.x.nix index fe23181cfc67..6bf239d061e5 100644 --- a/pkgs/development/libraries/ogre/1.10.x.nix +++ b/pkgs/development/libraries/ogre/1.10.x.nix @@ -2,7 +2,7 @@ , cmake, libGLU, libGL , freetype, freeimage, zziplib, xorgproto, libXrandr , libXaw, freeglut, libXt, libpng, boost, ois -, libX11, libXmu, libSM, pkgconfig +, libX11, libXmu, libSM, pkg-config , libXxf86vm, libICE , libXrender , withNvidiaCg ? false, nvidia_cg_toolkit @@ -21,13 +21,12 @@ stdenv.mkDerivation { ([ "BSP" "OCTREE" "PCZ" "PFX" ] ++ lib.optional withNvidiaCg "CG") ++ map (x: "-DOGRE_BUILD_RENDERSYSTEM_${x}=on") [ "GL" ]; - enableParallelBuilding = true; - + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = - [ cmake libGLU libGL + [ libGLU libGL freetype freeimage zziplib xorgproto libXrandr libXaw freeglut libXt libpng boost ois - libX11 libXmu libSM pkgconfig + libX11 libXmu libSM libXxf86vm libICE libXrender ] ++ lib.optional withNvidiaCg nvidia_cg_toolkit; diff --git a/pkgs/development/libraries/ogre/1.9.x.nix b/pkgs/development/libraries/ogre/1.9.x.nix index 29c83a2962ee..8e0156d84528 100644 --- a/pkgs/development/libraries/ogre/1.9.x.nix +++ b/pkgs/development/libraries/ogre/1.9.x.nix @@ -2,7 +2,7 @@ , cmake, libGLU, libGL , freetype, freeimage, zziplib, xorgproto, libXrandr , libXaw, freeglut, libXt, libpng, boost, ois -, libX11, libXmu, libSM, pkgconfig +, libX11, libXmu, libSM, pkg-config , libXxf86vm, libICE , libXrender , withNvidiaCg ? false, nvidia_cg_toolkit @@ -24,13 +24,13 @@ stdenv.mkDerivation rec { ([ "BSP" "OCTREE" "PCZ" "PFX" ] ++ lib.optional withNvidiaCg "CG") ++ map (x: "-DOGRE_BUILD_RENDERSYSTEM_${x}=on") [ "GL" ]; - enableParallelBuilding = true; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = - [ cmake libGLU libGL + [ libGLU libGL freetype freeimage zziplib xorgproto libXrandr libXaw freeglut libXt libpng boost ois - libX11 libXmu libSM pkgconfig + libX11 libXmu libSM libXxf86vm libICE libXrender ] ++ lib.optional withNvidiaCg nvidia_cg_toolkit; diff --git a/pkgs/development/libraries/ogre/default.nix b/pkgs/development/libraries/ogre/default.nix index 491ff4edddc6..8eb6db729ed6 100644 --- a/pkgs/development/libraries/ogre/default.nix +++ b/pkgs/development/libraries/ogre/default.nix @@ -2,7 +2,7 @@ , cmake, libGLU, libGL , freetype, freeimage, zziplib, xorgproto, libXrandr , libXaw, freeglut, libXt, libpng, boost, ois -, libX11, libXmu, libSM, pkgconfig +, libX11, libXmu, libSM, pkg-config , libXxf86vm, libICE , unzip , libXrender @@ -23,19 +23,17 @@ stdenv.mkDerivation rec { ([ "BSP" "OCTREE" "PCZ" "PFX" ] ++ lib.optional withNvidiaCg "CG") ++ map (x: "-DOGRE_BUILD_RENDERSYSTEM_${x}=on") [ "GL" ]; - enableParallelBuilding = true; + nativeBuildInputs = [ cmake unzip pkg-config ]; buildInputs = [ cmake libGLU libGL freetype freeimage zziplib xorgproto libXrandr libXaw freeglut libXt libpng boost ois - libX11 libXmu libSM pkgconfig + libX11 libXmu libSM libXxf86vm libICE libXrender ] ++ lib.optional withNvidiaCg nvidia_cg_toolkit; - nativeBuildInputs = [ unzip ]; - meta = { description = "A 3D engine"; homepage = "https://www.ogre3d.org/"; diff --git a/pkgs/development/libraries/ogrepaged/default.nix b/pkgs/development/libraries/ogrepaged/default.nix index e4dc186f389c..9a8c092406cc 100644 --- a/pkgs/development/libraries/ogrepaged/default.nix +++ b/pkgs/development/libraries/ogrepaged/default.nix @@ -31,8 +31,6 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DPAGEDGEOMETRY_BUILD_SAMPLES=OFF" ]; - enableParallelBuilding = true; - meta = { description = "Paged Geometry for Ogre3D"; homepage = "https://github.com/RigsOfRods/ogre-paged"; diff --git a/pkgs/development/libraries/opae/default.nix b/pkgs/development/libraries/opae/default.nix index 683f2c43bdc8..e9d501f79281 100644 --- a/pkgs/development/libraries/opae/default.nix +++ b/pkgs/development/libraries/opae/default.nix @@ -37,7 +37,6 @@ stdenv.mkDerivation rec { ''; cmakeFlags = [ "-DBUILD_ASE=1" ]; - enableParallelBuilding = true; meta = with stdenv.lib; { description = "Open Programmable Acceleration Engine SDK"; diff --git a/pkgs/development/libraries/openbr/default.nix b/pkgs/development/libraries/openbr/default.nix index 1516e675d739..3e2d0f6b6e8b 100644 --- a/pkgs/development/libraries/openbr/default.nix +++ b/pkgs/development/libraries/openbr/default.nix @@ -16,8 +16,6 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake ]; - enableParallelBuilding = true; - meta = { description = "Open Source Biometric Recognition"; homepage = "http://openbiometrics.org/"; diff --git a/pkgs/development/libraries/opencollada/default.nix b/pkgs/development/libraries/opencollada/default.nix index 388c473125b8..a9c26d00e3ac 100644 --- a/pkgs/development/libraries/opencollada/default.nix +++ b/pkgs/development/libraries/opencollada/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, libxml2, pcre +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, libxml2, pcre , darwin}: stdenv.mkDerivation rec { @@ -13,14 +13,11 @@ stdenv.mkDerivation rec { sha256 = "1ym16fxx9qhf952vva71sdzgbm7ifis0h1n5fj1bfdj8zvvkbw5w"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake ] - ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ AGL ]); + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ AGL ]); propagatedBuildInputs = [ libxml2 pcre ]; - enableParallelBuilding = true; - patchPhase = '' patch -p1 < ${./pcre.patch} '' + lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index 2ad2d016c9fd..a861591f85f4 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -245,8 +245,6 @@ stdenv.mkDerivation { "-DEIGEN_INCLUDE_PATH=${eigen}/include/eigen3" ]; - enableParallelBuilding = true; - postBuild = lib.optionalString enableDocs '' make doxygen ''; diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix index c6547f118d06..0d225127dd80 100644 --- a/pkgs/development/libraries/opencv/4.x.nix +++ b/pkgs/development/libraries/opencv/4.x.nix @@ -253,8 +253,6 @@ stdenv.mkDerivation { "-DOPENCV_SKIP_PYTHON_LOADER=ON" ]; - enableParallelBuilding = true; - postBuild = lib.optionalString enableDocs '' make doxygen ''; diff --git a/pkgs/development/libraries/opencv/default.nix b/pkgs/development/libraries/opencv/default.nix index 56414cfa3979..055377b09f56 100644 --- a/pkgs/development/libraries/opencv/default.nix +++ b/pkgs/development/libraries/opencv/default.nix @@ -69,8 +69,6 @@ stdenv.mkDerivation rec { (opencvFlag "GSTREAMER" enableGStreamer) ]; - enableParallelBuilding = true; - hardeningDisable = [ "bindnow" "relro" ]; # Fix pkgconfig file that gets broken with multiple outputs diff --git a/pkgs/development/libraries/openhmd/default.nix b/pkgs/development/libraries/openhmd/default.nix index 66656a142342..ab1b9b7b1ddc 100644 --- a/pkgs/development/libraries/openhmd/default.nix +++ b/pkgs/development/libraries/openhmd/default.nix @@ -1,45 +1,52 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, cmake, hidapi -, withExamples ? true, SDL2 ? null, libGL ? null, glew ? null +{ stdenv +, fetchFromGitHub +, cmake +, pkg-config +, hidapi +, SDL2 +, libGL +, glew +, withExamples ? true }: -with lib; +let examplesOnOff = if withExamples then "ON" else "OFF"; in -let onoff = if withExamples then "ON" else "OFF"; in - -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "openhmd"; - version = "0.3.0-rc1-20181218"; + version = "0.3.0"; src = fetchFromGitHub { owner = "OpenHMD"; repo = "OpenHMD"; - rev = "80d51bea575a5bf71bb3a0b9683b80ac3146596a"; - sha256 = "09011vnlsn238r5vbb1ab57x888ljaa34xibrnfbm5bl9417ii4z"; + rev = version; + sha256 = "1hkpdl4zgycag5k8njvqpx01apxmm8m8pvhlsxgxpqiqy9a38ccg"; }; - nativeBuildInputs = [ pkgconfig cmake ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ hidapi - ] ++ optionals withExamples [ - SDL2 libGL glew + ] ++ stdenv.lib.optionals withExamples [ + SDL2 + glew + libGL ]; cmakeFlags = [ "-DBUILD_BOTH_STATIC_SHARED_LIBS=ON" - "-DOPENHMD_EXAMPLE_SIMPLE=${onoff}" - "-DOPENHMD_EXAMPLE_SDL=${onoff}" + "-DOPENHMD_EXAMPLE_SIMPLE=${examplesOnOff}" + "-DOPENHMD_EXAMPLE_SDL=${examplesOnOff}" "-DOpenGL_GL_PREFERENCE=GLVND" ]; - postInstall = optionalString withExamples '' + postInstall = stdenv.lib.optionalString withExamples '' mkdir -p $out/bin install -D examples/simple/simple $out/bin/openhmd-example-simple install -D examples/opengl/openglexample $out/bin/openhmd-example-opengl ''; - meta = { - homepage = "http://www.openhmd.net"; + meta = with stdenv.lib; { + homepage = "http://www.openhmd.net"; # https does not work description = "Library API and drivers immersive technology"; longDescription = '' OpenHMD is a very simple FLOSS C library and a set of drivers @@ -48,7 +55,7 @@ stdenv.mkDerivation { Oculus Rift, HTC Vive, Windows Mixed Reality, and etc. ''; license = licenses.boost; - maintainers = [ maintainers.oxij ]; + maintainers = with maintainers; [ oxij ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index fcd12ba587d0..2570c7cdb25a 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -2,7 +2,7 @@ , withCryptodev ? false, cryptodev , enableSSL2 ? false , enableSSL3 ? false -, static ? false +, static ? stdenv.hostPlatform.isStatic }: # Note: this package is used for bootstrapping fetchurl, and thus diff --git a/pkgs/development/libraries/opensubdiv/default.nix b/pkgs/development/libraries/opensubdiv/default.nix index 35a8358b5148..9228424797e2 100644 --- a/pkgs/development/libraries/opensubdiv/default.nix +++ b/pkgs/development/libraries/opensubdiv/default.nix @@ -1,4 +1,4 @@ -{ config, lib, stdenv, fetchFromGitHub, cmake, pkgconfig, xorg, libGLU +{ config, lib, stdenv, fetchFromGitHub, cmake, pkg-config, xorg, libGLU , libGL, glew, ocl-icd, python3 , cudaSupport ? config.cudaSupport or false, cudatoolkit , darwin @@ -17,8 +17,9 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = - [ cmake pkgconfig libGLU libGL python3 + [ libGLU libGL python3 # FIXME: these are not actually needed, but the configure script wants them. glew xorg.libX11 xorg.libXrandr xorg.libXxf86vm xorg.libXcursor xorg.libXinerama xorg.libXi @@ -40,8 +41,6 @@ stdenv.mkDerivation rec { "-DCUDA_HOST_COMPILER=${cudatoolkit.cc}/bin/cc" ]; - enableParallelBuilding = true; - postInstall = "rm $out/lib/*.a"; meta = { diff --git a/pkgs/development/libraries/opentracing-cpp/default.nix b/pkgs/development/libraries/opentracing-cpp/default.nix index a31350a5f962..76342abaa2d1 100644 --- a/pkgs/development/libraries/opentracing-cpp/default.nix +++ b/pkgs/development/libraries/opentracing-cpp/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { rev = "v${version}"; sha256 = "04kw19g8qrv3kd40va3sqbfish7kfczkdpxdwraifk9950wfs3gx"; }; - buildInputs = [ cmake ]; + + nativeBuildInputs = [ cmake ]; meta = { description = "C++ implementation of the OpenTracing API"; diff --git a/pkgs/development/libraries/openxr-loader/default.nix b/pkgs/development/libraries/openxr-loader/default.nix index f0c4c47db03b..415846dd2fab 100644 --- a/pkgs/development/libraries/openxr-loader/default.nix +++ b/pkgs/development/libraries/openxr-loader/default.nix @@ -13,7 +13,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake python3 ]; buildInputs = [ libX11 libXxf86vm libXrandr vulkan-headers libGL ]; - enableParallelBuilding = true; cmakeFlags = [ "-DBUILD_TESTS=OFF" ]; diff --git a/pkgs/development/libraries/pangolin/default.nix b/pkgs/development/libraries/pangolin/default.nix index 2b0e15468b12..5fbd9595766a 100644 --- a/pkgs/development/libraries/pangolin/default.nix +++ b/pkgs/development/libraries/pangolin/default.nix @@ -30,8 +30,6 @@ stdenv.mkDerivation { ] ++ lib.optionals stdenv.isDarwin [ Carbon Cocoa ]; - enableParallelBuilding = true; - # The tests use cmake's findPackage to find the installed version of # pangolin, which isn't what we want (or available). doCheck = false; diff --git a/pkgs/development/libraries/partio/default.nix b/pkgs/development/libraries/partio/default.nix index ba042562320b..2f7574d36372 100644 --- a/pkgs/development/libraries/partio/default.nix +++ b/pkgs/development/libraries/partio/default.nix @@ -16,8 +16,6 @@ stdenv.mkDerivation { nativeBuildInputs = [ unzip cmake doxygen ]; buildInputs = [ freeglut libGLU libGL zlib swig python xorg.libXi xorg.libXmu ]; - enableParallelBuilding = true; - buildPhase = '' make partio diff --git a/pkgs/development/libraries/pcl/default.nix b/pkgs/development/libraries/pcl/default.nix index 753f5ae39110..06f5499b901b 100644 --- a/pkgs/development/libraries/pcl/default.nix +++ b/pkgs/development/libraries/pcl/default.nix @@ -13,8 +13,6 @@ stdenv.mkDerivation rec { sha256 = "1cli2rxqsk6nxp36p5mgvvahjz8hm4fb68yi8cf9nw4ygbcvcwb1"; }; - enableParallelBuilding = true; - nativeBuildInputs = [ pkgconfig cmake ]; buildInputs = [ qhull flann boost eigen libusb1 libpcap libpng vtk qtbase libXt ] diff --git a/pkgs/development/libraries/pe-parse/default.nix b/pkgs/development/libraries/pe-parse/default.nix new file mode 100644 index 000000000000..445188bd0d9b --- /dev/null +++ b/pkgs/development/libraries/pe-parse/default.nix @@ -0,0 +1,28 @@ +{ stdenv, lib, fetchFromGitHub, cmake }: + +stdenv.mkDerivation rec { + pname = "pe-parse"; + version = "1.2.0"; + + src = fetchFromGitHub { + owner = "trailofbits"; + repo = "pe-parse"; + rev = "v${version}"; + sha256 = "1jvfjaiwddczjlx4xdhpbgwvvpycab7ix35lwp3wfy44hs6qpjqv"; + }; + + nativeBuildInputs = [ cmake ]; + + doInstallCheck = true; + installCheckPhase = '' + $out/bin/dump-pe ../test/assets/example.exe + ''; + + meta = with lib; { + description = "A principled, lightweight parser for Windows portable executable files"; + homepage = "https://github.com/trailofbits/pe-parse"; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ arturcygan ]; + }; +} diff --git a/pkgs/development/libraries/physfs/default.nix b/pkgs/development/libraries/physfs/default.nix index 160f2f64cf40..93c0702e3eff 100644 --- a/pkgs/development/libraries/physfs/default.nix +++ b/pkgs/development/libraries/physfs/default.nix @@ -17,8 +17,6 @@ let buildInputs = [ zlib ] ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Foundation ]; - enableParallelBuilding = true; - patchPhase = '' sed s,-Werror,, -i CMakeLists.txt ''; diff --git a/pkgs/development/libraries/physics/geant4/default.nix b/pkgs/development/libraries/physics/geant4/default.nix index 7caae2c52d33..0b48b291555f 100644 --- a/pkgs/development/libraries/physics/geant4/default.nix +++ b/pkgs/development/libraries/physics/geant4/default.nix @@ -87,7 +87,6 @@ stdenv.mkDerivation rec { "-DINVENTOR_LIBRARY_RELEASE=${coin3d}/lib/libCoin.so" ]; - enableParallelBuilding = true; nativeBuildInputs = [ cmake ]; buildInputs = [ libGLU xlibsWrapper libXmu ] diff --git a/pkgs/development/libraries/physics/yoda/default.nix b/pkgs/development/libraries/physics/yoda/default.nix index 3a8fbbbdd529..39bffb65237e 100644 --- a/pkgs/development/libraries/physics/yoda/default.nix +++ b/pkgs/development/libraries/physics/yoda/default.nix @@ -39,5 +39,7 @@ stdenv.mkDerivation rec { homepage = "https://yoda.hepforge.org"; platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ veprbl ]; + # https://gitlab.com/hepcedar/yoda/-/issues/24 + broken = withRootSupport; }; } diff --git a/pkgs/development/libraries/poco/default.nix b/pkgs/development/libraries/poco/default.nix index b2a4fb1b0c32..c0f74630757a 100644 --- a/pkgs/development/libraries/poco/default.nix +++ b/pkgs/development/libraries/poco/default.nix @@ -21,8 +21,6 @@ stdenv.mkDerivation rec { "-DPOCO_UNBUNDLED=ON" ]; - enableParallelBuilding = true; - meta = with stdenv.lib; { homepage = "https://pocoproject.org/"; description = "Cross-platform C++ libraries with a network/internet focus"; diff --git a/pkgs/development/libraries/polkit/default.nix b/pkgs/development/libraries/polkit/default.nix index 6aea70530143..2ec49a2d3c08 100644 --- a/pkgs/development/libraries/polkit/default.nix +++ b/pkgs/development/libraries/polkit/default.nix @@ -2,7 +2,8 @@ , intltool, spidermonkey_78, gobject-introspection, libxslt, docbook_xsl, dbus , docbook_xml_dtd_412, gtk-doc, coreutils , useSystemd ? (stdenv.isLinux && !stdenv.hostPlatform.isMusl), systemd, elogind -, withIntrospection ? true +# needed until gobject-introspection does cross-compile (https://github.com/NixOS/nixpkgs/pull/88222) +, withIntrospection ? (stdenv.buildPlatform == stdenv.hostPlatform) # A few tests currently fail on musl (polkitunixusertest, polkitunixgrouptest, polkitidentitytest segfault). # Not yet investigated; it may be due to the "Make netgroup support optional" # patch not updating the tests correctly yet, or doing something wrong, diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index 074868251d0a..e7b9a26f19fd 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 = "20.08.0"; # beware: updates often break cups-filters build, check texlive and scribusUnstable too! + version = "20.12.1"; # beware: updates often break cups-filters build, check texlive and scribusUnstable too! src = fetchurl { url = "${meta.homepage}/poppler-${version}.tar.xz"; - sha256 = "19gchq6fpa00ic5rn1zmjzxx85cif4hbdrsjcfd2aqxz9gqgwrdf"; + sha256 = "0dbv1y9i5ahg6namz6gw2d0njnmrigr4a80dbxvnqad4q232banh"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/portmidi/default.nix b/pkgs/development/libraries/portmidi/default.nix index a0001691302e..d96e15edd81e 100644 --- a/pkgs/development/libraries/portmidi/default.nix +++ b/pkgs/development/libraries/portmidi/default.nix @@ -44,7 +44,8 @@ stdenv.mkDerivation rec { ln -s libportmidi.so "$out/lib/libporttime.so" ''; - buildInputs = [ unzip cmake /*jdk*/ alsaLib ]; + nativeBuildInputs = [ unzip cmake ]; + buildInputs = [ alsaLib ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/development/libraries/precice/default.nix b/pkgs/development/libraries/precice/default.nix index e8ae15ed31f4..e9e67737d328 100644 --- a/pkgs/development/libraries/precice/default.nix +++ b/pkgs/development/libraries/precice/default.nix @@ -22,7 +22,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake gcc ]; buildInputs = [ boost eigen libxml2 openmpi python3 python3.pkgs.numpy ]; - enableParallelBuilding = true; meta = { description = "preCICE stands for Precise Code Interaction Coupling Environment"; diff --git a/pkgs/development/libraries/properties-cpp/default.nix b/pkgs/development/libraries/properties-cpp/default.nix index fb998169595d..54fea18fd17e 100644 --- a/pkgs/development/libraries/properties-cpp/default.nix +++ b/pkgs/development/libraries/properties-cpp/default.nix @@ -1,27 +1,35 @@ -{ stdenv, fetchurl, cmake, pkgconfig, gtest, doxygen -, graphviz, lcov }: +{ stdenv +, fetchurl +, cmake +, pkg-config +, gtest +, doxygen +, graphviz +, lcov +}: stdenv.mkDerivation rec { pname = "properties-cpp"; version = "0.0.1"; - src = let srcver = version+"+14.10.20140730"; in - fetchurl { - url = "https://launchpad.net/ubuntu/+archive/primary/+files/${pname}_${srcver}.orig.tar.gz"; - sha256 = "08vjyv7ibn6jh2ikj5v48kjpr3n6hlkp9qlvdn8r0vpiwzah0m2w"; - }; + src = let srcver = "${version}+14.10.20140730"; in + fetchurl { + url = "https://launchpad.net/ubuntu/+archive/primary/+files/${pname}_${srcver}.orig.tar.gz"; + sha256 = "08vjyv7ibn6jh2ikj5v48kjpr3n6hlkp9qlvdn8r0vpiwzah0m2w"; + }; - buildInputs = [ cmake gtest doxygen pkgconfig graphviz lcov ]; - - patchPhase = '' + postPatch = '' sed -i "/add_subdirectory(tests)/d" CMakeLists.txt ''; + nativeBuildInputs = [ cmake pkg-config ]; + + buildInputs = [ gtest doxygen graphviz lcov ]; + meta = with stdenv.lib; { homepage = "https://launchpad.net/properties-cpp"; description = "A very simple convenience library for handling properties and signals in C++11"; - license = licenses.lgpl3; + license = licenses.lgpl3Only; maintainers = with maintainers; [ edwtjo ]; }; - } diff --git a/pkgs/development/libraries/pslib/default.nix b/pkgs/development/libraries/pslib/default.nix new file mode 100644 index 000000000000..08accd5d7df1 --- /dev/null +++ b/pkgs/development/libraries/pslib/default.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchurl, cmake, pkgconfig, zlib, libpng, libjpeg, libungif, libtiff +}: + +stdenv.mkDerivation rec { + pname = "pslib"; + version = "0.4.6"; + + src = fetchurl { + name = "${pname}-snixource-${version}.tar.gz"; + url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; + sha256 = "0m191ckqj1kj2yvxiilqw26x4vrn7pnlc2vy636yphjxr02q8bk4"; + }; + + nativeBuildInputs = [ cmake pkgconfig ]; + buildInputs = [ zlib libpng libjpeg libungif libtiff ]; + + doCheck = true; + + outputs = [ "out" "dev" "doc" ]; + + installPhase = '' + mkdir -p $out/lib + for path in *.so *.so.* *.o *.o.*; do + mv $path $out/lib/ + done + mkdir -p $dev/include + mv ../include/libps $dev/include + if test -d nix-support; then + mv nix-support $dev + fi + mkdir -p $doc/share/doc/${pname} + cp -r ../doc/. $doc/share/doc/${pname} + ''; + + meta = with stdenv.lib; { + description = "A C-library for generating multi page PostScript documents"; + homepage = "http://pslib.sourceforge.net/"; + changelog = + "https://sourceforge.net/p/pslib/git/ci/master/tree/pslib/ChangeLog"; + license = licenses.gpl2; + maintainers = with maintainers; [ ShamrockLee ]; + }; +} diff --git a/pkgs/development/libraries/ptex/default.nix b/pkgs/development/libraries/ptex/default.nix index b4571d07fbf3..09b3ce23e080 100644 --- a/pkgs/development/libraries/ptex/default.nix +++ b/pkgs/development/libraries/ptex/default.nix @@ -14,9 +14,8 @@ stdenv.mkDerivation rec outputs = [ "bin" "dev" "out" "lib" ]; - buildInputs = [ zlib python cmake pkg-config ]; - - enableParallelBuilding = true; + nativeBuildInputs = [ cmake ]; + buildInputs = [ zlib python pkg-config ]; # Can be removed in the next release # https://github.com/wdas/ptex/pull/42 diff --git a/pkgs/development/libraries/qca2/default.nix b/pkgs/development/libraries/qca2/default.nix index bb89d6926815..6520d4a64a35 100644 --- a/pkgs/development/libraries/qca2/default.nix +++ b/pkgs/development/libraries/qca2/default.nix @@ -13,8 +13,6 @@ stdenv.mkDerivation rec { buildInputs = [ openssl qt ] ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; - enableParallelBuilding = true; - # tells CMake to use this CA bundle file if it is accessible preConfigure = '' export QC_CERTSTORE_PATH=/etc/ssl/certs/ca-certificates.crt diff --git a/pkgs/development/libraries/qimageblitz/default.nix b/pkgs/development/libraries/qimageblitz/default.nix index 51253676341f..899f1d1f00be 100644 --- a/pkgs/development/libraries/qimageblitz/default.nix +++ b/pkgs/development/libraries/qimageblitz/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation { sha256 = "0pnaf3qi7rgkxzs2mssmslb3f9ya4cyx09wzwlis3ppyvf72j0p9"; }; - buildInputs = [ cmake qt4 ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ qt4 ]; patches = [ ./qimageblitz-9999-exec-stack.patch ]; diff --git a/pkgs/development/libraries/qjson/default.nix b/pkgs/development/libraries/qjson/default.nix index ab4a96e65ea6..ee1c36c3244a 100644 --- a/pkgs/development/libraries/qjson/default.nix +++ b/pkgs/development/libraries/qjson/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1f4wnxzx0qdmxzc7hqk28m0sva7z9p9xmxm6aifvjlp0ha6pmfxs"; }; - buildInputs = [ cmake qt4 ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ qt4 ]; meta = with stdenv.lib; { description = "Lightweight data-interchange format"; diff --git a/pkgs/development/libraries/qmltermwidget/default.nix b/pkgs/development/libraries/qmltermwidget/default.nix index ac2584573114..53e83182c2b0 100644 --- a/pkgs/development/libraries/qmltermwidget/default.nix +++ b/pkgs/development/libraries/qmltermwidget/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, qtbase, qtquick1, qmake, qtmultimedia, utmp }: +{ stdenv, fetchFromGitHub, qtbase, qtquick1, qmake, qtmultimedia, utmp, fetchpatch }: stdenv.mkDerivation { version = "2018-11-24"; @@ -15,7 +15,15 @@ stdenv.mkDerivation { ++ stdenv.lib.optional stdenv.isDarwin utmp; nativeBuildInputs = [ qmake ]; - patchPhase = '' + patches = [ + (fetchpatch { + name = "fix-missing-includes.patch"; + url = "https://github.com/Swordfish90/qmltermwidget/pull/27/commits/485f8d6d841b607ba49e55a791f7f587e4e193bc.diff"; + sha256 = "186s8pv3642vr4lxsds919h0y2vrkl61r7wqq9mc4a5zk5vprinj"; + }) + ]; + + postPatch = '' substituteInPlace qmltermwidget.pro \ --replace '$$[QT_INSTALL_QML]' "/$qtQmlPrefix/" ''; diff --git a/pkgs/development/libraries/qrcodegen/default.nix b/pkgs/development/libraries/qrcodegen/default.nix new file mode 100644 index 000000000000..b5faaf90ef7a --- /dev/null +++ b/pkgs/development/libraries/qrcodegen/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchFromGitHub }: +stdenv.mkDerivation rec { + pname = "qrcodegen"; + version = "1.6.0"; + + src = fetchFromGitHub { + owner = "nayuki"; + repo = "QR-Code-generator"; + rev = "v${version}"; + sha256 = "0iq9sv9na0vg996aqrxrjn9rrbiyy7sc9vslw945p3ky22pw3lql"; + }; + + preBuild = "cd c"; + installPhase = '' + mkdir -p $out/lib $out/include/qrcodegen + cp libqrcodegen.a $out/lib + cp qrcodegen.h $out/include/qrcodegen/ + ''; + + meta = with stdenv.lib; + { + description = "qrcode generator library in multiple languages"; + + longDescription = '' + This project aims to be the best, clearest library for generating QR Codes. My primary goals are flexible options and absolute correctness. Secondary goals are compact implementation size and good documentation comments. + ''; + + homepage = "https://github.com/nayuki/QR-Code-generator"; + + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ mcbeth ]; + }; +} diff --git a/pkgs/development/libraries/qt-5/5.12/default.nix b/pkgs/development/libraries/qt-5/5.12/default.nix index 124a0459f139..87a88ddf9b0d 100644 --- a/pkgs/development/libraries/qt-5/5.12/default.nix +++ b/pkgs/development/libraries/qt-5/5.12/default.nix @@ -51,7 +51,7 @@ let patches = { qtbase = - optionals stdenv.isDarwin [ + [ ./qtbase.patch.d/0001-qtbase-mkspecs-mac.patch ./qtbase.patch.d/0002-qtbase-mac.patch ./qtbase.patch.d/0013-define-kiosurfacesuccess.patch @@ -59,8 +59,7 @@ let # Patch framework detection to support X.framework/X.tbd, # extending the current support for X.framework/X. ./qtbase.patch.d/0015-qtbase-tbd-frameworks.patch - ] - ++ [ + ./qtbase.patch.d/0003-qtbase-mkspecs.patch ./qtbase.patch.d/0004-qtbase-replace-libdir.patch ./qtbase.patch.d/0005-qtbase-cmake.patch @@ -77,6 +76,7 @@ let ./qtbase.patch.d/0014-qtbase-pkg-config.patch ]; qtdeclarative = [ ./qtdeclarative.patch ]; + qtlocation = [ ./qtlocation-gcc-9.patch ]; qtscript = [ ./qtscript.patch ]; qtserialport = [ ./qtserialport.patch ]; qtwebengine = [ @@ -97,7 +97,7 @@ let stripLen = 1; extraPrefix = "src/3rdparty/"; }) - ] ++ optionals stdenv.isDarwin [ + ./qtwebengine-darwin-no-platform-check.patch ./qtwebengine-darwin-fix-failed-static-assertion.patch ]; @@ -108,7 +108,7 @@ let sha256 = "0h8ymfnwgkjkwaankr3iifiscsvngqpwb91yygndx344qdiw9y0n"; }) ./qtwebkit.patch - ] ++ optionals stdenv.isDarwin [ + ./qtwebkit-darwin-no-readline.patch ./qtwebkit-darwin-no-qos-classes.patch ]; diff --git a/pkgs/development/libraries/qt-5/5.12/fetch.sh b/pkgs/development/libraries/qt-5/5.12/fetch.sh index 9b024378b3b6..e93c9acd3f05 100644 --- a/pkgs/development/libraries/qt-5/5.12/fetch.sh +++ b/pkgs/development/libraries/qt-5/5.12/fetch.sh @@ -1 +1,2 @@ -WGET_ARGS=( http://download.qt.io/official_releases/qt/5.12/5.12.9/submodules/ ) +WGET_ARGS=( http://download.qt.io/official_releases/qt/5.12/5.12.9/submodules/ \ + -A '*.tar.xz' ) diff --git a/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0001-qtbase-mkspecs-mac.patch b/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0001-qtbase-mkspecs-mac.patch index bb535b8a0c0e..6646e1e0b2be 100644 --- a/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0001-qtbase-mkspecs-mac.patch +++ b/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0001-qtbase-mkspecs-mac.patch @@ -1,18 +1,5 @@ -From 361a9395704ca1ee170a8bb3823ba860293eecee Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Tue, 17 Sep 2019 05:34:00 -0500 -Subject: [PATCH 01/12] qtbase-mkspecs-mac - ---- - mkspecs/common/mac.conf | 2 +- - mkspecs/features/mac/default_post.prf | 202 ---------------------------------- - mkspecs/features/mac/default_pre.prf | 58 ---------- - mkspecs/features/mac/sdk.mk | 25 ----- - mkspecs/features/mac/sdk.prf | 61 ---------- - 5 files changed, 1 insertion(+), 347 deletions(-) - diff --git a/mkspecs/common/mac.conf b/mkspecs/common/mac.conf -index b77494ec9b..470c38e772 100644 +index b77494ec..470c38e7 100644 --- a/mkspecs/common/mac.conf +++ b/mkspecs/common/mac.conf @@ -24,7 +24,7 @@ QMAKE_INCDIR_OPENGL = \ @@ -25,7 +12,7 @@ index b77494ec9b..470c38e772 100644 QMAKE_LFLAGS_REL_RPATH = diff --git a/mkspecs/features/mac/default_post.prf b/mkspecs/features/mac/default_post.prf -index 993f4d56a9..b80ec1e801 100644 +index d052808c..b80ec1e8 100644 --- a/mkspecs/features/mac/default_post.prf +++ b/mkspecs/features/mac/default_post.prf @@ -68,208 +68,6 @@ qt { @@ -161,7 +148,7 @@ index 993f4d56a9..b80ec1e801 100644 - -isysroot$$xcodeSDKInfo(Path, $$sdk) - QMAKE_XARCH_LFLAGS_$${arch} = $$version_min_flags \ - -Xarch_$${arch} \ -- -Wl,-syslibroot,$$xcodeSDKInfo(Path, $$sdk) +- -isysroot$$xcodeSDKInfo(Path, $$sdk) - - QMAKE_XARCH_CFLAGS += $(EXPORT_QMAKE_XARCH_CFLAGS_$${arch}) - QMAKE_XARCH_LFLAGS += $(EXPORT_QMAKE_XARCH_LFLAGS_$${arch}) @@ -182,7 +169,7 @@ index 993f4d56a9..b80ec1e801 100644 - version_min_flag = -m$${version_identifier}-version-min=$$deployment_target - QMAKE_CFLAGS += -isysroot $$QMAKE_MAC_SDK_PATH $$version_min_flag - QMAKE_CXXFLAGS += -isysroot $$QMAKE_MAC_SDK_PATH $$version_min_flag -- QMAKE_LFLAGS += -Wl,-syslibroot,$$QMAKE_MAC_SDK_PATH $$version_min_flag +- QMAKE_LFLAGS += -isysroot $$QMAKE_MAC_SDK_PATH $$version_min_flag - } - - # Enable precompiled headers for multiple architectures @@ -238,7 +225,7 @@ index 993f4d56a9..b80ec1e801 100644 generate_xcode_project.commands = @$(QMAKE) -spec macx-xcode \"$(EXPORT__PRO_FILE_)\" $$QMAKE_ARGS generate_xcode_project.target = xcodeproj diff --git a/mkspecs/features/mac/default_pre.prf b/mkspecs/features/mac/default_pre.prf -index e3534561a5..3b01424e67 100644 +index e3534561..3b01424e 100644 --- a/mkspecs/features/mac/default_pre.prf +++ b/mkspecs/features/mac/default_pre.prf @@ -1,60 +1,2 @@ @@ -303,7 +290,7 @@ index e3534561a5..3b01424e67 100644 -xcode_copy_phase_strip_setting.value = NO -QMAKE_MAC_XCODE_SETTINGS += xcode_copy_phase_strip_setting diff --git a/mkspecs/features/mac/sdk.mk b/mkspecs/features/mac/sdk.mk -index c40f58c987..e69de29bb2 100644 +index c40f58c9..e69de29b 100644 --- a/mkspecs/features/mac/sdk.mk +++ b/mkspecs/features/mac/sdk.mk @@ -1,25 +0,0 @@ @@ -333,7 +320,7 @@ index c40f58c987..e69de29bb2 100644 - endif -endif diff --git a/mkspecs/features/mac/sdk.prf b/mkspecs/features/mac/sdk.prf -index 3a9c2778bb..e69de29bb2 100644 +index 3a9c2778..e69de29b 100644 --- a/mkspecs/features/mac/sdk.prf +++ b/mkspecs/features/mac/sdk.prf @@ -1,61 +0,0 @@ @@ -398,6 +385,3 @@ index 3a9c2778bb..e69de29bb2 100644 - $$tool = $$sysrooted $$member(value, 1, -1) - cache($$tool_variable, set stash, $$tool) -} --- -2.23.GIT - diff --git a/pkgs/development/libraries/qt-5/5.12/qtlocation-gcc-9.patch b/pkgs/development/libraries/qt-5/5.12/qtlocation-gcc-9.patch new file mode 100644 index 000000000000..1791313e5603 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.12/qtlocation-gcc-9.patch @@ -0,0 +1,21 @@ +diff --git a/src/3rdparty/mapbox-gl-native/platform/default/bidi.cpp b/src/3rdparty/mapbox-gl-native/platform/default/bidi.cpp +index d475c38..c1710a6 100644 +--- a/src/3rdparty/mapbox-gl-native/platform/default/bidi.cpp ++++ b/src/3rdparty/mapbox-gl-native/platform/default/bidi.cpp +@@ -5,6 +5,7 @@ + #include + + #include ++#include + + namespace mbgl { + +diff --git a/src/3rdparty/mapbox-gl-native/src/mbgl/util/convert.cpp b/src/3rdparty/mapbox-gl-native/src/mbgl/util/convert.cpp +index 97bfe91..56d3e17 100644 +--- a/src/3rdparty/mapbox-gl-native/src/mbgl/util/convert.cpp ++++ b/src/3rdparty/mapbox-gl-native/src/mbgl/util/convert.cpp +@@ -1,3 +1,4 @@ ++#include + #include + + namespace mbgl { diff --git a/pkgs/development/libraries/qt-5/5.12/qtwebengine-darwin-no-platform-check.patch b/pkgs/development/libraries/qt-5/5.12/qtwebengine-darwin-no-platform-check.patch index 8ed3fe59a5a2..cd2343e42ca3 100644 --- a/pkgs/development/libraries/qt-5/5.12/qtwebengine-darwin-no-platform-check.patch +++ b/pkgs/development/libraries/qt-5/5.12/qtwebengine-darwin-no-platform-check.patch @@ -1,5 +1,5 @@ diff --git a/configure.pri b/configure.pri -index 897bea54..6f834c20 100644 +index 897bea540..6f834c202 100644 --- a/configure.pri +++ b/configure.pri @@ -269,7 +269,7 @@ defineReplace(webEngineGetMacOSVersion) { @@ -12,7 +12,7 @@ index 897bea54..6f834c20 100644 } diff --git a/mkspecs/features/platform.prf b/mkspecs/features/platform.prf -index 35eb6b89..7eed640a 100644 +index 35eb6b89c..7eed640a5 100644 --- a/mkspecs/features/platform.prf +++ b/mkspecs/features/platform.prf @@ -40,8 +40,6 @@ defineTest(isPlatformSupported) { @@ -43,10 +43,10 @@ index 35eb6b89..7eed640a 100644 isEmpty(WEBENGINE_OSX_SDK_PRODUCT_VERSION) { skipBuild("Could not resolve SDK product version for \'$$QMAKE_MAC_SDK\'.") diff --git a/src/core/config/mac_osx.pri b/src/core/config/mac_osx.pri -index 4426901c..3aa6057e 100644 +index 7b77a8bf7..0e1284ee4 100644 --- a/src/core/config/mac_osx.pri +++ b/src/core/config/mac_osx.pri -@@ -5,16 +5,16 @@ load(functions) +@@ -5,7 +5,7 @@ load(functions) # otherwise query for it. QMAKE_MAC_SDK_VERSION = $$eval(QMAKE_MAC_SDK.$${QMAKE_MAC_SDK}.SDKVersion) isEmpty(QMAKE_MAC_SDK_VERSION) { @@ -55,17 +55,15 @@ index 4426901c..3aa6057e 100644 isEmpty(QMAKE_MAC_SDK_VERSION): error("Could not resolve SDK version for \'$${QMAKE_MAC_SDK}\'") } +@@ -14,11 +14,6 @@ isEmpty(QMAKE_MAC_SDK_VERSION) { + QMAKE_MAC_SDK_VERSION_MAJOR_MINOR = $$section(QMAKE_MAC_SDK_VERSION, ".", 0, 1) + QMAKE_CLANG_DIR = "/usr" -QMAKE_CLANG_PATH = $$eval(QMAKE_MAC_SDK.macx-clang.$${QMAKE_MAC_SDK}.QMAKE_CXX) -!isEmpty(QMAKE_CLANG_PATH) { - clang_dir = $$clean_path("$$dirname(QMAKE_CLANG_PATH)/../") - exists($$clang_dir): QMAKE_CLANG_DIR = $$clang_dir -} -+# QMAKE_CLANG_PATH = $$eval(QMAKE_MAC_SDK.macx-clang.$${QMAKE_MAC_SDK}.QMAKE_CXX) -+# !isEmpty(QMAKE_CLANG_PATH) { -+# clang_dir = $$clean_path("$$dirname(QMAKE_CLANG_PATH)/../") -+# exists($$clang_dir): QMAKE_CLANG_DIR = $$clang_dir -+# } QMAKE_CLANG_PATH = "$${QMAKE_CLANG_DIR}/bin/clang++" message("Using clang++ from $${QMAKE_CLANG_PATH}") diff --git a/pkgs/development/libraries/qt-5/5.14/default.nix b/pkgs/development/libraries/qt-5/5.14/default.nix index dff04b24f608..926510293b5d 100644 --- a/pkgs/development/libraries/qt-5/5.14/default.nix +++ b/pkgs/development/libraries/qt-5/5.14/default.nix @@ -75,6 +75,7 @@ let ./qtbase.patch.d/0011-fix-header_module.patch ]; qtdeclarative = [ ./qtdeclarative.patch ]; + qtlocation = [ ./qtlocation-gcc-9.patch ]; qtscript = [ ./qtscript.patch ]; qtserialport = [ ./qtserialport.patch ]; qtwebengine = [ @@ -86,6 +87,22 @@ let stripLen = 1; extraPrefix = "src/3rdparty/"; }) + # Fix build with GCC 10 (part 1): https://code.qt.io/cgit/qt/qtwebengine-chromium.git/commit/?id=fad3e27b + (fetchpatch { + name = "qtwebengine-gcc10-part1.patch"; + url = "https://code.qt.io/cgit/qt/qtwebengine-chromium.git/patch/?id=fad3e27bfb50d1e23a07577f087a826b5e00bb1d"; + sha256 = "0c55j9zww8jyif6wl7jy1qqidgw9fdhiyfjgzhzi85r716m4pwwd"; + stripLen = 1; + extraPrefix = "src/3rdparty/"; + }) + # Fix build with GCC 10 (part 2): https://code.qt.io/cgit/qt/qtwebengine-chromium.git/commit/?id=193c5bed + (fetchpatch { + name = "qtwebengine-gcc10-part2.patch"; + url = "https://code.qt.io/cgit/qt/qtwebengine-chromium.git/patch/?id=193c5bed1cff123e21b7e6d12f464d6709ace2e3"; + sha256 = "1jb6s32ara6l4rbn4h3gg95mzv8sd8dl1zpjaqwywf1w7p8ymk86"; + stripLen = 1; + extraPrefix = "src/3rdparty/"; + }) ] ++ optional stdenv.isDarwin ./qtwebengine-darwin-no-platform-check.patch; qtwebkit = [ diff --git a/pkgs/development/libraries/qt-5/5.14/fetch.sh b/pkgs/development/libraries/qt-5/5.14/fetch.sh index 2d266b529776..e4e02bd82ed3 100644 --- a/pkgs/development/libraries/qt-5/5.14/fetch.sh +++ b/pkgs/development/libraries/qt-5/5.14/fetch.sh @@ -1 +1,2 @@ -WGET_ARGS=( http://download.qt.io/official_releases/qt/5.14/5.14.2/submodules/ ) +WGET_ARGS=( http://download.qt.io/official_releases/qt/5.14/5.14.2/submodules/ \ + -A '*.tar.xz' ) diff --git a/pkgs/development/libraries/qt-5/5.14/qtlocation-gcc-9.patch b/pkgs/development/libraries/qt-5/5.14/qtlocation-gcc-9.patch new file mode 100644 index 000000000000..1791313e5603 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.14/qtlocation-gcc-9.patch @@ -0,0 +1,21 @@ +diff --git a/src/3rdparty/mapbox-gl-native/platform/default/bidi.cpp b/src/3rdparty/mapbox-gl-native/platform/default/bidi.cpp +index d475c38..c1710a6 100644 +--- a/src/3rdparty/mapbox-gl-native/platform/default/bidi.cpp ++++ b/src/3rdparty/mapbox-gl-native/platform/default/bidi.cpp +@@ -5,6 +5,7 @@ + #include + + #include ++#include + + namespace mbgl { + +diff --git a/src/3rdparty/mapbox-gl-native/src/mbgl/util/convert.cpp b/src/3rdparty/mapbox-gl-native/src/mbgl/util/convert.cpp +index 97bfe91..56d3e17 100644 +--- a/src/3rdparty/mapbox-gl-native/src/mbgl/util/convert.cpp ++++ b/src/3rdparty/mapbox-gl-native/src/mbgl/util/convert.cpp +@@ -1,3 +1,4 @@ ++#include + #include + + namespace mbgl { diff --git a/pkgs/development/libraries/qt-5/5.14/qtwebkit-darwin-no-readline.patch b/pkgs/development/libraries/qt-5/5.14/qtwebkit-darwin-no-readline.patch index 26d189d86019..4871032f6f2c 100644 --- a/pkgs/development/libraries/qt-5/5.14/qtwebkit-darwin-no-readline.patch +++ b/pkgs/development/libraries/qt-5/5.14/qtwebkit-darwin-no-readline.patch @@ -28,18 +28,3 @@ diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h #define HAVE_SYS_TIMEB_H 1 #if !PLATFORM(GTK) && !PLATFORM(QT) -diff --git a/Source/WTF/wtf/PlatformMac.cmake b/Source/WTF/wtf/PlatformMac.cmake ---- a/Source/WTF/wtf/PlatformMac.cmake -+++ b/Source/WTF/wtf/PlatformMac.cmake -@@ -2,11 +2,9 @@ set(WTF_LIBRARY_TYPE SHARED) - - find_library(COCOA_LIBRARY Cocoa) - find_library(COREFOUNDATION_LIBRARY CoreFoundation) --find_library(READLINE_LIBRARY Readline) - list(APPEND WTF_LIBRARIES - ${COREFOUNDATION_LIBRARY} - ${COCOA_LIBRARY} -- ${READLINE_LIBRARY} - libicucore.dylib - ) - diff --git a/pkgs/development/libraries/qt-5/5.15/fetch.sh b/pkgs/development/libraries/qt-5/5.15/fetch.sh index 70e6dbe82a3b..81ceb3ef77ea 100644 --- a/pkgs/development/libraries/qt-5/5.15/fetch.sh +++ b/pkgs/development/libraries/qt-5/5.15/fetch.sh @@ -1 +1,2 @@ -WGET_ARGS=( http://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/ ) +WGET_ARGS=( http://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/ \ + -A '*.tar.xz' ) diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix index cc6e45e3ebde..5d6f91a79113 100644 --- a/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -356,8 +356,6 @@ stdenv.mkDerivation { ] ); - enableParallelBuilding = true; - postInstall = # Move selected outputs. '' diff --git a/pkgs/development/libraries/qt-5/modules/qtlocation.nix b/pkgs/development/libraries/qt-5/modules/qtlocation.nix index 0eee684a53fd..a80785d8099a 100644 --- a/pkgs/development/libraries/qt-5/modules/qtlocation.nix +++ b/pkgs/development/libraries/qt-5/modules/qtlocation.nix @@ -10,5 +10,4 @@ qtModule { # https://libcxx.llvm.org/docs/UsingLibcxx.html#c-17-specific-configuration-macros "QMAKE_CXXFLAGS+=-D_LIBCPP_ENABLE_CXX17_REMOVED_AUTO_PTR" ]; - } diff --git a/pkgs/development/libraries/qtpbfimageplugin/default.nix b/pkgs/development/libraries/qtpbfimageplugin/default.nix index 48c0158531a5..ecff7f7f8215 100644 --- a/pkgs/development/libraries/qtpbfimageplugin/default.nix +++ b/pkgs/development/libraries/qtpbfimageplugin/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qtpbfimageplugin"; - version = "2.2"; + version = "2.3"; src = fetchFromGitHub { owner = "tumic0"; repo = "QtPBFImagePlugin"; rev = version; - sha256 = "1w2d33g13vkjasabmcgvhsmfqv3jmwbxhqxm1jnyc7d4nlk4jwmb"; + sha256 = "063agzcrcihasqqk2yqxqxg9xknjs99y6vx3n1v7md7dqnfv4iva"; }; nativeBuildInputs = [ qmake ]; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { # Fix plugin dir substituteInPlace pbfplugin.pro \ --replace "\$\$[QT_INSTALL_PLUGINS]" "$out/$qtPluginPrefix" - + '' + stdenv.lib.optionalString stdenv.isDarwin '' # Fix darwin build substituteInPlace pbfplugin.pro \ --replace '$$PROTOBUF/lib/libprotobuf-lite.a' '${protobuf}/lib/libprotobuf-lite.dylib' @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { vector tiles without (almost) any application modifications. ''; homepage = "https://github.com/tumic0/QtPBFImagePlugin"; - license = licenses.lgpl3; + license = licenses.lgpl3Only; maintainers = with maintainers; [ sikmir ]; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/rabbitmq-c/default.nix b/pkgs/development/libraries/rabbitmq-c/default.nix index d24bce96997d..7cb29357c49f 100644 --- a/pkgs/development/libraries/rabbitmq-c/default.nix +++ b/pkgs/development/libraries/rabbitmq-c/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1iv7aww4pam8497s524xjxbbxypyqd01qgrb0b429y3q9x06m4sw"; }; - buildInputs = [ cmake openssl popt xmlto ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ openssl popt xmlto ]; meta = with stdenv.lib; { description = "RabbitMQ C AMQP client library"; diff --git a/pkgs/development/libraries/range-v3/default.nix b/pkgs/development/libraries/range-v3/default.nix index a583239b52e0..47c56aaa1e8e 100644 --- a/pkgs/development/libraries/range-v3/default.nix +++ b/pkgs/development/libraries/range-v3/default.nix @@ -11,6 +11,10 @@ stdenv.mkDerivation rec { sha256 = "18230bg4rq9pmm5f8f65j444jpq56rld4fhmpham8q3vr1c1bdjh"; }; + patches = [ + ./gcc10.patch + ]; + nativeBuildInputs = [ cmake ]; # Building the tests currently fails on AArch64 due to internal compiler @@ -20,8 +24,6 @@ stdenv.mkDerivation rec { doCheck = !stdenv.isAarch64; checkTarget = "test"; - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "Experimental range library for C++11/14/17"; homepage = "https://github.com/ericniebler/range-v3"; diff --git a/pkgs/development/libraries/range-v3/gcc10.patch b/pkgs/development/libraries/range-v3/gcc10.patch new file mode 100644 index 000000000000..caebf0a63162 --- /dev/null +++ b/pkgs/development/libraries/range-v3/gcc10.patch @@ -0,0 +1,133 @@ +From a91f0e1be27a31c446452a753001d4518ef83a6b Mon Sep 17 00:00:00 2001 +From: Eric Niebler +Date: Mon, 17 Aug 2020 17:48:09 -0700 +Subject: [PATCH] work around premature instantiation problem on gcc; fixes + #1545 + +--- + include/range/v3/view/chunk.hpp | 6 +++--- + include/range/v3/view/split.hpp | 26 +++++++++++++------------- + 2 files changed, 16 insertions(+), 16 deletions(-) + +diff --git a/include/range/v3/view/chunk.hpp b/include/range/v3/view/chunk.hpp +index 0c03cf1eb..b8df13303 100644 +--- a/include/range/v3/view/chunk.hpp ++++ b/include/range/v3/view/chunk.hpp +@@ -313,8 +313,8 @@ namespace ranges + + public: + inner_view() = default; +- constexpr explicit inner_view(chunk_view_ & view) noexcept +- : rng_{&view} ++ constexpr explicit inner_view(chunk_view_ * view) noexcept ++ : rng_{view} + {} + CPP_auto_member + constexpr auto CPP_fun(size)()( +@@ -338,7 +338,7 @@ namespace ranges + constexpr inner_view read() const + { + RANGES_EXPECT(!done()); +- return inner_view{*rng_}; ++ return inner_view{rng_}; + } + constexpr bool done() const + { +diff --git a/include/range/v3/view/split.hpp b/include/range/v3/view/split.hpp +index facf1b37f..496220e4a 100644 +--- a/include/range/v3/view/split.hpp ++++ b/include/range/v3/view/split.hpp +@@ -389,19 +389,19 @@ namespace ranges + split_outer_iterator() = default; + + CPP_member +- constexpr explicit CPP_ctor(split_outer_iterator)(Parent & parent)( ++ constexpr explicit CPP_ctor(split_outer_iterator)(Parent * parent)( + /// \pre + requires (!forward_range)) +- : parent_(&parent) ++ : parent_(parent) + {} + + CPP_member +- constexpr CPP_ctor(split_outer_iterator)(Parent & parent, ++ constexpr CPP_ctor(split_outer_iterator)(Parent * parent, + iterator_t current)( + /// \pre + requires forward_range) + : Current{std::move(current)} +- , parent_(&parent) ++ , parent_(parent) + {} + + template(bool Other)( +@@ -519,7 +519,7 @@ namespace ranges + ranges::equal_to> && + (forward_range || detail::tiny_range) + #endif +- struct RANGES_EMPTY_BASES split_view ++ struct RANGES_EMPTY_BASES split_view + : view_interface, is_finite::value ? finite : unknown> + , private detail::split_view_base> + { +@@ -537,17 +537,17 @@ namespace ranges + #if RANGES_CXX_IF_CONSTEXPR < RANGES_CXX_IF_CONSTEXPR_17 + outer_iterator()> begin_(std::true_type) + { +- return outer_iterator()>{*this, ranges::begin(base_)}; ++ return outer_iterator()>{this, ranges::begin(base_)}; + } + outer_iterator begin_(std::false_type) + { + this->curr_ = ranges::begin(base_); +- return outer_iterator{*this}; ++ return outer_iterator{this}; + } + + outer_iterator()> end_(std::true_type) const + { +- return outer_iterator{*this, ranges::end(base_)}; ++ return outer_iterator{this, ranges::end(base_)}; + } + default_sentinel_t end_(std::false_type) const + { +@@ -580,11 +580,11 @@ namespace ranges + { + #if RANGES_CXX_IF_CONSTEXPR >= RANGES_CXX_IF_CONSTEXPR_17 + if constexpr(forward_range) +- return outer_iterator()>{*this, ranges::begin(base_)}; ++ return outer_iterator()>{this, ranges::begin(base_)}; + else + { + this->curr_ = ranges::begin(base_); +- return outer_iterator{*this}; ++ return outer_iterator{this}; + } + #else + return begin_(meta::bool_>{}); +@@ -596,7 +596,7 @@ namespace ranges + /// \pre + requires forward_range && forward_range) + { +- return {*this, ranges::begin(base_)}; ++ return {this, ranges::begin(base_)}; + } + CPP_member + constexpr auto end() // +@@ -604,14 +604,14 @@ namespace ranges + /// \pre + requires forward_range && common_range) + { +- return outer_iterator()>{*this, ranges::end(base_)}; ++ return outer_iterator()>{this, ranges::end(base_)}; + } + constexpr auto end() const + { + #if RANGES_CXX_IF_CONSTEXPR >= RANGES_CXX_IF_CONSTEXPR_17 + if constexpr(forward_range && forward_range && + common_range) +- return outer_iterator{*this, ranges::end(base_)}; ++ return outer_iterator{this, ranges::end(base_)}; + else + return default_sentinel; + #else diff --git a/pkgs/development/libraries/redkite/default.nix b/pkgs/development/libraries/redkite/default.nix index af8a1a914e4b..ce3ac37895e0 100644 --- a/pkgs/development/libraries/redkite/default.nix +++ b/pkgs/development/libraries/redkite/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchFromGitLab, cmake, cairo }: +{ stdenv, fetchFromGitHub, cmake, cairo }: stdenv.mkDerivation rec { pname = "redkite"; - version = "1.2.0"; + version = "1.3.0"; - src = fetchFromGitLab { + src = fetchFromGitHub { owner = "iurie-sw"; repo = pname; rev = "v${version}"; - sha256 = "0c5k0a6ydb8szdgniqsva8l9j2sishlhsww13b3a9grvr7hb2bpq"; + sha256 = "16j9zp5i7svq3g38rfb6h257qfgnd2brrxi7cjd2pdax9xxwj40y"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/rnnoise-plugin/default.nix b/pkgs/development/libraries/rnnoise-plugin/default.nix index 9ec9eabebebb..c359c753388a 100644 --- a/pkgs/development/libraries/rnnoise-plugin/default.nix +++ b/pkgs/development/libraries/rnnoise-plugin/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "11pwisbcks7g0mdgcrrv49v3ci1l6m26bbb7f67xz4pr1hai5dwc"; }; - buildInputs = [ cmake ]; + nativeBuildInputs = [ cmake ]; cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ]; diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix index f17a114216bd..12a731385ffe 100644 --- a/pkgs/development/libraries/rocksdb/default.nix +++ b/pkgs/development/libraries/rocksdb/default.nix @@ -10,7 +10,7 @@ , zstd , enableJemalloc ? false, jemalloc , enableLite ? false -, enableShared ? true +, enableShared ? !stdenv.hostPlatform.isStatic }: stdenv.mkDerivation rec { diff --git a/pkgs/development/libraries/rubberband/default.nix b/pkgs/development/libraries/rubberband/default.nix index 54bb57e2e662..ee9bcea5e52b 100644 --- a/pkgs/development/libraries/rubberband/default.nix +++ b/pkgs/development/libraries/rubberband/default.nix @@ -1,27 +1,18 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, libsamplerate, libsndfile, fftw +{ stdenv, fetchurl, pkgconfig, libsamplerate, libsndfile, fftw , vamp-plugin-sdk, ladspaH }: stdenv.mkDerivation rec { pname = "rubberband"; - version = "1.8.2"; + version = "1.9.0"; src = fetchurl { url = "https://breakfastquay.com/files/releases/${pname}-${version}.tar.bz2"; - sha256 = "1jn3ys16g4rz8j3yyj5np589lly0zhs3dr9asd0l9dhmf5mx1gl6"; + sha256 = "4f5b9509364ea876b4052fc390c079a3ad4ab63a2683aad09662fb905c2dc026"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libsamplerate libsndfile fftw vamp-plugin-sdk ladspaH ]; - # https://github.com/breakfastquay/rubberband/issues/17 - # In master, but there hasn't been an official release - patches = [ - (fetchpatch { - url = "https://github.com/breakfastquay/rubberband/commit/419a9bcf7066473b0d31e9a8a81fe0b2a8e41fed.patch"; - sha256 = "0drkfb2ahi31g4w1cawgsjjz26wszgg52yn3ih5l2ql1g25dqqn9"; - }) - ]; - meta = with stdenv.lib; { description = "High quality software library for audio time-stretching and pitch-shifting"; homepage = "https://breakfastquay.com/rubberband/"; diff --git a/pkgs/development/libraries/s2n/default.nix b/pkgs/development/libraries/s2n/default.nix new file mode 100644 index 000000000000..3ec66ebf52d1 --- /dev/null +++ b/pkgs/development/libraries/s2n/default.nix @@ -0,0 +1,29 @@ +{ lib, stdenv, fetchFromGitHub, cmake, openssl }: + +stdenv.mkDerivation rec { + pname = "s2n"; + version = "0.10.23"; + + src = fetchFromGitHub { + owner = "awslabs"; + repo = pname; + rev = "v${version}"; + sha256 = "063wqpszhfcbxm7a7s6d6kinqd6b6dxij85lk9jjkrslg5fgqbki"; + }; + + nativeBuildInputs = [ cmake ]; + + propagatedBuildInputs = [ openssl ]; # s2n-config has find_dependency(LibCrypto). + + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=ON" + ]; + + meta = with lib; { + description = "C99 implementation of the TLS/SSL protocols"; + homepage = "https://github.com/awslabs/s2n"; + license = licenses.asl20; + platforms = platforms.unix; + maintainers = with maintainers; [ orivej ]; + }; +} diff --git a/pkgs/development/libraries/science/biology/mirtk/default.nix b/pkgs/development/libraries/science/biology/mirtk/default.nix index 4291e11ed33f..d010e84f712b 100644 --- a/pkgs/development/libraries/science/biology/mirtk/default.nix +++ b/pkgs/development/libraries/science/biology/mirtk/default.nix @@ -31,8 +31,6 @@ stdenv.mkDerivation rec { install -Dm644 -t "$out/share/bash-completion/completions/mirtk" share/completion/bash/mirtk ''; - enableParallelBuilding = true; - nativeBuildInputs = [ cmake gtest ]; buildInputs = [ boost eigen python vtk zlib tbb ]; diff --git a/pkgs/development/libraries/science/electronics/qcsxcad/default.nix b/pkgs/development/libraries/science/electronics/qcsxcad/default.nix index 7e73354363ea..a20f6973384a 100644 --- a/pkgs/development/libraries/science/electronics/qcsxcad/default.nix +++ b/pkgs/development/libraries/science/electronics/qcsxcad/default.nix @@ -37,8 +37,6 @@ mkDerivation { qtbase ]; - enableParallelBuilding = true; - meta = with lib; { description = "Qt library for CSXCAD"; homepage = "https://github.com/thliebig/QCSXCAD"; diff --git a/pkgs/development/libraries/science/math/caffe2/default.nix b/pkgs/development/libraries/science/math/caffe2/default.nix index 7755efb30658..6b37abf9c696 100644 --- a/pkgs/development/libraries/science/math/caffe2/default.nix +++ b/pkgs/development/libraries/science/math/caffe2/default.nix @@ -126,7 +126,6 @@ stdenv.mkDerivation rec { ''; doCheck = false; - enableParallelBuilding = true; meta = { homepage = "https://caffe2.ai/"; diff --git a/pkgs/development/libraries/science/math/clblas/default.nix b/pkgs/development/libraries/science/math/clblas/default.nix index 8a474e06e556..a22cf914cf69 100644 --- a/pkgs/development/libraries/science/math/clblas/default.nix +++ b/pkgs/development/libraries/science/math/clblas/default.nix @@ -35,8 +35,8 @@ stdenv.mkDerivation rec { "-DBUILD_TEST=OFF" ]; + nativeBuildInputs = [ cmake ]; buildInputs = [ - cmake gfortran blas python @@ -53,8 +53,6 @@ stdenv.mkDerivation rec { OpenCL ]; - enableParallelBuilding = true; - meta = with stdenv.lib; { homepage = "https://github.com/clMathLibraries/clBLAS"; description = "A software library containing BLAS functions written in OpenCL"; diff --git a/pkgs/development/libraries/science/math/itpp/default.nix b/pkgs/development/libraries/science/math/itpp/default.nix index c74a7408e98e..90e0a84e1e26 100644 --- a/pkgs/development/libraries/science/math/itpp/default.nix +++ b/pkgs/development/libraries/science/math/itpp/default.nix @@ -35,8 +35,6 @@ stdenv.mkDerivation rec { "-DGTEST_DIR:PATH=${gtest.src}/googletest" ]; - enableParallelBuilding = true; - doCheck = true; checkPhase = '' diff --git a/pkgs/development/libraries/science/math/liblapack/default.nix b/pkgs/development/libraries/science/math/liblapack/default.nix index 045cccbd2ebf..c44e995bfbbc 100644 --- a/pkgs/development/libraries/science/math/liblapack/default.nix +++ b/pkgs/development/libraries/science/math/liblapack/default.nix @@ -33,8 +33,6 @@ stdenv.mkDerivation { doCheck = true; - enableParallelBuilding = true; - meta = with stdenv.lib; { inherit version; description = "Linear Algebra PACKage"; diff --git a/pkgs/development/libraries/science/math/metis/default.nix b/pkgs/development/libraries/science/math/metis/default.nix index 8d6381c8d48d..d5861d9db333 100644 --- a/pkgs/development/libraries/science/math/metis/default.nix +++ b/pkgs/development/libraries/science/math/metis/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { }; cmakeFlags = [ "-DGKLIB_PATH=../GKlib" ]; - buildInputs = [ unzip cmake ]; + nativeBuildInputs = [ unzip cmake ]; meta = { description = "Serial graph partitioning and fill-reducing matrix ordering"; diff --git a/pkgs/development/libraries/science/math/mkl/default.nix b/pkgs/development/libraries/science/math/mkl/default.nix index 1887d53e3066..b631def3bb2e 100644 --- a/pkgs/development/libraries/science/math/mkl/default.nix +++ b/pkgs/development/libraries/science/math/mkl/default.nix @@ -1,11 +1,12 @@ -{ callPackage +{ stdenv +, callPackage , stdenvNoCC , fetchurl , rpmextract , undmg , darwin , validatePkgConfig -, enableStatic ? false +, enableStatic ? stdenv.hostPlatform.isStatic }: /* diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix index d670a40f321d..0d83c5c36501 100644 --- a/pkgs/development/libraries/science/math/openblas/default.nix +++ b/pkgs/development/libraries/science/math/openblas/default.nix @@ -15,8 +15,8 @@ # Select a specific optimization target (other than the default) # See https://github.com/xianyi/OpenBLAS/blob/develop/TargetList.txt , target ? null -, enableStatic ? false -, enableShared ? true +, enableStatic ? stdenv.hostPlatform.isStatic +, enableShared ? !stdenv.hostPlatform.isStatic }: with stdenv.lib; @@ -68,7 +68,6 @@ let BINARY = 64; TARGET = setTarget "ATHLON"; DYNAMIC_ARCH = true; - NO_AVX512 = true; USE_OPENMP = !stdenv.hostPlatform.isMusl; }; @@ -106,7 +105,7 @@ let in stdenv.mkDerivation rec { pname = "openblas"; - version = "0.3.12"; + version = "0.3.13"; outputs = [ "out" "dev" ]; @@ -114,7 +113,7 @@ stdenv.mkDerivation rec { owner = "xianyi"; repo = "OpenBLAS"; rev = "v${version}"; - sha256 = "0mk1kjkr96bvvcq2zigzjrs0cnhwsf6gfi0855mp9yifn8lvp20y"; + sha256 = "14jxh0v3jfbw4mfjx4mcz4dd51lyq7pqvh9k8dg94539ypzjr2lj"; }; inherit blas64; diff --git a/pkgs/development/libraries/science/math/or-tools/default.nix b/pkgs/development/libraries/science/math/or-tools/default.nix index 926f7ba4789c..0dc77c10c5e7 100644 --- a/pkgs/development/libraries/science/math/or-tools/default.nix +++ b/pkgs/development/libraries/science/math/or-tools/default.nix @@ -53,8 +53,6 @@ stdenv.mkDerivation rec { python.pkgs.protobuf python.pkgs.six ]; - enableParallelBuilding = true; - outputs = [ "out" "python" ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/science/math/parmetis/default.nix b/pkgs/development/libraries/science/math/parmetis/default.nix index 8f24356c7336..050e8f1b2856 100644 --- a/pkgs/development/libraries/science/math/parmetis/default.nix +++ b/pkgs/development/libraries/science/math/parmetis/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { sha256 = "0pvfpvb36djvqlcc3lq7si0c5xpb2cqndjg8wvzg35ygnwqs5ngj"; }; - buildInputs = [ cmake mpi ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ mpi ]; # metis and GKlib are packaged with distribution # AUR https://aur.archlinux.org/packages/parmetis/ has reported that diff --git a/pkgs/development/libraries/science/math/scalapack/default.nix b/pkgs/development/libraries/science/math/scalapack/default.nix index 1cf9c2ed8d53..b4d339f62269 100644 --- a/pkgs/development/libraries/science/math/scalapack/default.nix +++ b/pkgs/development/libraries/science/math/scalapack/default.nix @@ -18,8 +18,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake openssh ]; buildInputs = [ mpi gfortran blas lapack ]; - enableParallelBuilding = true; - doCheck = true; preConfigure = '' diff --git a/pkgs/development/libraries/science/math/superlu/default.nix b/pkgs/development/libraries/science/math/superlu/default.nix index ff59297bd839..892ccb4da11e 100644 --- a/pkgs/development/libraries/science/math/superlu/default.nix +++ b/pkgs/development/libraries/science/math/superlu/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0qzlb7cd608q62kyppd0a8c65l03vrwqql6gsm465rky23b6dyr8"; }; - buildInputs = [ cmake gfortran ]; + nativeBuildInputs = [ cmake gfortran ]; propagatedBuildInputs = [ blas ]; diff --git a/pkgs/development/libraries/science/math/tensorflow/bin.nix b/pkgs/development/libraries/science/math/tensorflow/bin.nix index dc0ca5da4cfa..ad10a4333de3 100644 --- a/pkgs/development/libraries/science/math/tensorflow/bin.nix +++ b/pkgs/development/libraries/science/math/tensorflow/bin.nix @@ -6,25 +6,20 @@ with stdenv.lib; let - unavailable = throw "libtensorflow is not available for this platform!"; + broken = !stdenv.isLinux && !stdenv.isDarwin; tfType = if cudaSupport then "gpu" else "cpu"; - system = - if stdenv.isLinux then "linux" - else if stdenv.isDarwin then "darwin" - else unavailable; + system = + if stdenv.isLinux then "linux" + else "darwin"; - platform = - if stdenv.isx86_64 then "x86_64" - else unavailable; + platform = "x86_64"; - rpath = makeLibraryPath ([stdenv.cc.libc stdenv.cc.cc.lib] ++ - optionals cudaSupport [ cudatoolkit.out cudatoolkit.lib cudnn nvidia_x11 ]); + rpath = makeLibraryPath ([stdenv.cc.libc stdenv.cc.cc.lib] + ++ optionals cudaSupport [ cudatoolkit.out cudatoolkit.lib cudnn nvidia_x11 ]); packages = import ./binary-hashes.nix; - packageName = "${tfType}-${system}-${platform}"; - url = packages.${packageName} or unavailable; patchLibs = if stdenv.isDarwin @@ -44,7 +39,7 @@ in stdenv.mkDerivation rec { pname = "libtensorflow"; inherit (packages) version; - src = fetchurl url; + src = fetchurl packages."${tfType}-${system}-${platform}"; nativeBuildInputs = optional cudaSupport addOpenGLRunpath; @@ -72,6 +67,5 @@ in stdenv.mkDerivation rec { homepage = "https://www.tensorflow.org/install/lang_c"; license = licenses.asl20; platforms = [ "x86_64-linux" "x86_64-darwin" ]; - maintainers = with maintainers; [ basvandijk ]; }; } diff --git a/pkgs/development/libraries/science/math/tensorflow/binary-hashes.nix b/pkgs/development/libraries/science/math/tensorflow/binary-hashes.nix index 76f0c5eea7fa..b606e45477a9 100644 --- a/pkgs/development/libraries/science/math/tensorflow/binary-hashes.nix +++ b/pkgs/development/libraries/science/math/tensorflow/binary-hashes.nix @@ -1,15 +1,15 @@ { -version = "1.14.0"; -cpu-linux-x86_64 = { - url = "https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-cpu-linux-x86_64-1.14.0.tar.gz"; - sha256 = "04bi3ijq4sbb8c5vk964zlv0j9mrjnzzxd9q9knq3h273nc1a36k"; +version = "2.4.0"; +"cpu-linux-x86_64" = { + url = "https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-cpu-linux-x86_64-2.4.0.tar.gz"; + sha256 = "022p5jjwmb8rhyyis3cpk2lw45apl2vz49m2rgxmd75h783x1gjk"; }; -gpu-linux-x86_64 = { - url = "https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-gpu-linux-x86_64-1.14.0.tar.gz"; - sha256 = "1ffnpyj9jjgwxpjfiyjvq4dm3n6nwiksim5jld9zw7fdswh215x6"; +"gpu-linux-x86_64" = { + url = "https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-gpu-linux-x86_64-2.4.0.tar.gz"; + sha256 = "1fclvbrn3fs8qmhmh3lzni7s7wl1w30a071b4gzh9ifnxdhip6lq"; }; -cpu-darwin-x86_64 = { - url = "https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-cpu-darwin-x86_64-1.14.0.tar.gz"; - sha256 = "0zsd5ils1a17j6jzh0c7q1z56fw46gkzybbnms7h2rgg8al0rh92"; +"cpu-darwin-x86_64" = { + url = "https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-cpu-darwin-x86_64-2.4.0.tar.gz"; + sha256 = "09x096nslg04c8sr7bd5v68a5gfinc0f1h36lbzn8bahs8b1agi3"; }; } diff --git a/pkgs/development/libraries/science/math/tensorflow/prefetcher.sh b/pkgs/development/libraries/science/math/tensorflow/prefetcher.sh index 515f25df4c1f..d571d38f7719 100755 --- a/pkgs/development/libraries/science/math/tensorflow/prefetcher.sh +++ b/pkgs/development/libraries/science/math/tensorflow/prefetcher.sh @@ -1,7 +1,9 @@ #!/usr/bin/env bash -version=1.14.0 -hashfile=binary-hashes.nix +# ./prefetcher.sh 2.4.0 binary-hashes.nix + +version="$1" +hashfile="$2" rm -f $hashfile echo "{" >> $hashfile echo "version = \"$version\";" >> $hashfile diff --git a/pkgs/development/libraries/science/robotics/ispike/default.nix b/pkgs/development/libraries/science/robotics/ispike/default.nix index 39f412e8dd56..70488426b011 100644 --- a/pkgs/development/libraries/science/robotics/ispike/default.nix +++ b/pkgs/development/libraries/science/robotics/ispike/default.nix @@ -1,5 +1,4 @@ -{ stdenv, fetchurl, cmake, boost -}: +{ stdenv, fetchurl, cmake, boost }: stdenv.mkDerivation rec { pname = "ispike"; @@ -10,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0khrxp43bi5kisr8j4lp9fl4r5marzf7b4inys62ac108sfb28lp"; }; - buildInputs = [ cmake boost ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ boost ]; meta = { description = "Spiking neural interface between iCub and a spiking neural simulator"; @@ -19,6 +19,4 @@ stdenv.mkDerivation rec { platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.nico202 ]; }; - - } diff --git a/pkgs/development/libraries/sentencepiece/default.nix b/pkgs/development/libraries/sentencepiece/default.nix index e918a3b3d1d2..bc463aa4010a 100644 --- a/pkgs/development/libraries/sentencepiece/default.nix +++ b/pkgs/development/libraries/sentencepiece/default.nix @@ -18,7 +18,9 @@ stdenv.mkDerivation rec { sha256 = "sha256:11cqw4hx33gw2jmrg11jyp7fj9pwzwjwzqcn24jfsbgh6n8gks5x"; }; - nativeBuildInputs = [ cmake ] ++ lib.optional withGPerfTools gperftools; + nativeBuildInputs = [ cmake ]; + + buildInputs = lib.optionals withGPerfTools [ gperftools ]; outputs = [ "bin" "dev" "out" ]; diff --git a/pkgs/development/libraries/signond/default.nix b/pkgs/development/libraries/signond/default.nix new file mode 100644 index 000000000000..7e986ed2635e --- /dev/null +++ b/pkgs/development/libraries/signond/default.nix @@ -0,0 +1,30 @@ +{ mkDerivation, lib, fetchFromGitLab, qmake, doxygen }: + +mkDerivation rec { + pname = "signond"; + version = "8.60"; + + src = fetchFromGitLab { + owner = "accounts-sso"; + repo = pname; + rev = "VERSION_${version}"; + sha256 = "pFpeJ13ut5EoP37W33WrYL2LzkX/k7ZKJcRpPO5l8i4="; + }; + + nativeBuildInputs = [ + qmake + doxygen + ]; + + preConfigure = '' + substituteInPlace src/signond/signond.pro \ + --replace "/etc" "@out@/etc" + ''; + + meta = with lib; { + homepage = "https://gitlab.com/accounts-sso/signond"; + description = "Signon Daemon for Qt"; + maintainers = with maintainers; [ freezeboy ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/simgear/default.nix b/pkgs/development/libraries/simgear/default.nix index e6fb1d7caf75..da25305fc421 100644 --- a/pkgs/development/libraries/simgear/default.nix +++ b/pkgs/development/libraries/simgear/default.nix @@ -21,8 +21,6 @@ stdenv.mkDerivation rec { libICE libSM libXt libXmu libGLU libGL boost zlib libjpeg freealut openscenegraph openal expat apr curl ]; - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "Simulation construction toolkit"; homepage = "https://gitorious.org/fg/simgear"; diff --git a/pkgs/development/libraries/slang/default.nix b/pkgs/development/libraries/slang/default.nix index 9b7905c180a9..010590b0fcd9 100644 --- a/pkgs/development/libraries/slang/default.nix +++ b/pkgs/development/libraries/slang/default.nix @@ -1,10 +1,19 @@ -{ stdenv, fetchurl, ncurses, pcre, libpng, zlib, readline, libiconv }: +{ stdenv, fetchurl +, libiconv +, libpng +, ncurses +, pcre +, readline +, zlib +}: stdenv.mkDerivation rec { - name = "slang-2.3.2"; + pname = "slang"; + version = "2.3.2"; + src = fetchurl { - url = "https://www.jedsoft.org/releases/slang/${name}.tar.bz2"; - sha256 = "06p379fqn6w38rdpqi98irxi2bf4llb0rja3dlgkqz7nqh7kp7pw"; + url = "https://www.jedsoft.org/releases/slang/${pname}-${version}.tar.bz2"; + sha256 = "sha256-/J47D8T2fDwfbUPJDBalxC0Re44oRXxbRoMbi1064xo="; }; outputs = [ "out" "dev" "man" "doc" ]; @@ -13,21 +22,24 @@ stdenv.mkDerivation rec { # Fix some wrong hardcoded paths preConfigure = '' - sed -i -e "s|/usr/lib/terminfo|${ncurses.out}/lib/terminfo|" configure - sed -i -e "s|/usr/lib/terminfo|${ncurses.out}/lib/terminfo|" src/sltermin.c - sed -i -e "s|/bin/ln|ln|" src/Makefile.in - sed -i -e "s|-ltermcap|-lncurses|" ./configure + sed -ie "s|/usr/lib/terminfo|${ncurses.out}/lib/terminfo|" configure + sed -ie "s|/usr/lib/terminfo|${ncurses.out}/lib/terminfo|" src/sltermin.c + sed -ie "s|/bin/ln|ln|" src/Makefile.in + sed -ie "s|-ltermcap|-lncurses|" ./configure ''; configureFlags = [ - "--with-png=${libpng.dev}" - "--with-z=${zlib.dev}" "--with-pcre=${pcre.dev}" + "--with-png=${libpng.dev}" "--with-readline=${readline.dev}" + "--with-z=${zlib.dev}" ]; buildInputs = [ - pcre libpng zlib readline + libpng + pcre + readline + zlib ] ++ stdenv.lib.optionals (stdenv.isDarwin) [ libiconv ]; propagatedBuildInputs = [ ncurses ]; @@ -41,10 +53,30 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "A multi-platform programmer's library designed to allow a developer to create robust software"; + description = "A small, embeddable multi-platform programming library"; + longDescription = '' + S-Lang is an interpreted language that was designed from the start to be + easily embedded into a program to provide it with a powerful extension + language. Examples of programs that use S-Lang as an extension language + include the jed text editor and the slrn newsreader. Although S-Lang does + not exist as a separate application, it is distributed with a quite + capable program called slsh ("slang-shell") that embeds the interpreter + and allows one to execute S-Lang scripts, or simply experiment with S-Lang + at an interactive prompt. Many of the the examples in this document are + presented in the context of one of the above applications. + + S-Lang is also a programmer's library that permits a programmer to develop + sophisticated platform-independent software. In addition to providing the + S-Lang interpreter, the library provides facilities for screen management, + keymaps, low-level terminal I/O, etc. However, this document is concerned + only with the extension language and does not address these other features + of the S-Lang library. For information about the other components of the + library, the reader is referred to the S-Lang Library C Programmer's + Guide. + ''; homepage = "http://www.jedsoft.org/slang/"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/snappy/default.nix b/pkgs/development/libraries/snappy/default.nix index e626db8efb78..0880df7ef2f0 100644 --- a/pkgs/development/libraries/snappy/default.nix +++ b/pkgs/development/libraries/snappy/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchFromGitHub, cmake, static ? false }: +{ stdenv, fetchFromGitHub, cmake +, static ? stdenv.hostPlatform.isStatic +}: stdenv.mkDerivation rec { pname = "snappy"; diff --git a/pkgs/development/libraries/sundials/default.nix b/pkgs/development/libraries/sundials/default.nix index 2e1fd527e9a7..a17b300d6be5 100644 --- a/pkgs/development/libraries/sundials/default.nix +++ b/pkgs/development/libraries/sundials/default.nix @@ -1,6 +1,7 @@ { stdenv , cmake , fetchurl +, fetchpatch , python , blas , lapack @@ -12,7 +13,25 @@ stdenv.mkDerivation rec { pname = "sundials"; - version = "5.3.0"; + version = "5.6.1"; + + outputs = [ "out" "examples" ]; + + src = fetchurl { + url = "https://computation.llnl.gov/projects/${pname}/download/${pname}-${version}.tar.gz"; + sha256 = "Frd5mex+fyFXqh0Eyh3kojccqBUOBW0klR0MWJZvKoM="; + }; + + patches = [ + # Fixing an upstream regression in treating cmake prefix directories: + # https://github.com/LLNL/sundials/pull/58 + (fetchpatch { + url = "https://github.com/LLNL/sundials/commit/dd32ff9baa05618f36e44aadb420bbae4236ea1e.patch"; + sha256 = "kToAuma+2iHFyL1v/l29F3+nug4AdK5cPG6IcXv2afc="; + }) + ]; + + nativeBuildInputs = [ cmake ]; buildInputs = [ python @@ -31,36 +50,24 @@ stdenv.mkDerivation rec { suitesparse ]; - nativeBuildInputs = [ cmake ]; - - src = fetchurl { - url = "https://computation.llnl.gov/projects/${pname}/download/${pname}-${version}.tar.gz"; - sha256 = "19xwi7pz35s2nqgldm6r0jl2k0bs36zhbpnmmzc56s1n3bhzgpw8"; - }; - - patches = [ - (fetchurl { - # https://github.com/LLNL/sundials/pull/19 - url = "https://github.com/LLNL/sundials/commit/1350421eab6c5ab479de5eccf6af2dcad1eddf30.patch"; - sha256 = "0g67lixp9m85fqpb9rzz1hl1z8ibdg0ldwq5z6flj5zl8a7cw52l"; - }) - ]; - cmakeFlags = [ - "-DEXAMPLES_INSTALL_PATH=${placeholder "out"}/share/examples" + "-DEXAMPLES_INSTALL_PATH=${placeholder "examples"}/share/examples" ] ++ stdenv.lib.optionals (lapackSupport) [ - "-DLAPACK_ENABLE=ON" + "-DENABLE_LAPACK=ON" "-DLAPACK_LIBRARIES=${lapack}/lib/liblapack${stdenv.hostPlatform.extensions.sharedLibrary}" ] ++ stdenv.lib.optionals (kluSupport) [ - "-DKLU_ENABLE=ON" + "-DENABLE_KLU=ON" "-DKLU_INCLUDE_DIR=${suitesparse.dev}/include" "-DKLU_LIBRARY_DIR=${suitesparse}/lib" - ] ++ stdenv.lib.optionals (lapackSupport && !lapack.isILP64) [ - # Use the correct index type according to lapack which is supposed to be - # the same index type compatible with blas, thanks to the assertion of - # buildInputs - "-DSUNDIALS_INDEX_TYPE=int32_t" - ] + ] ++ [( + # Use the correct index type according to lapack and blas used. They are + # already supposed to be compatible but we check both for extra safety. 64 + # should be the default but we prefer to be explicit, for extra safety. + if blas.isILP64 then + "-DSUNDIALS_INDEX_SIZE=64" + else + "-DSUNDIALS_INDEX_SIZE=32" + )] ; doCheck = true; diff --git a/pkgs/development/libraries/tbb/default.nix b/pkgs/development/libraries/tbb/default.nix index 8f045802d3af..264b34125a87 100644 --- a/pkgs/development/libraries/tbb/default.nix +++ b/pkgs/development/libraries/tbb/default.nix @@ -19,10 +19,14 @@ with stdenv.lib; stdenv.mkDerivation rec { patches = stdenv.lib.optional stdenv.hostPlatform.isMusl ./glibc-struct-mallinfo.patch; installPhase = '' + runHook preInstall + mkdir -p $out/lib cp "build/"*release*"/"*${stdenv.hostPlatform.extensions.sharedLibrary}* $out/lib/ mv include $out/ rm $out/include/index.html + + runHook postInstall ''; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/telepathy/qt/default.nix b/pkgs/development/libraries/telepathy/qt/default.nix index 2addb86246dd..ff8ff83fb9ae 100644 --- a/pkgs/development/libraries/telepathy/qt/default.nix +++ b/pkgs/development/libraries/telepathy/qt/default.nix @@ -20,7 +20,6 @@ in stdenv.mkDerivation rec { # On 0.9.7, they do not even build with QT4 cmakeFlags = stdenv.lib.optional (!doCheck) "-DENABLE_TESTS=OFF"; - enableParallelBuilding = true; doCheck = false; # giving up for now meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/thrift/default.nix b/pkgs/development/libraries/thrift/default.nix index 1879cac96c18..f5c8f64633bb 100644 --- a/pkgs/development/libraries/thrift/default.nix +++ b/pkgs/development/libraries/thrift/default.nix @@ -1,5 +1,7 @@ { stdenv, fetchurl, fetchpatch, boost, zlib, libevent, openssl, python, cmake, pkgconfig -, bison, flex, twisted, static ? false }: +, bison, flex, twisted +, static ? stdenv.hostPlatform.isStatic +}: stdenv.mkDerivation rec { pname = "thrift"; diff --git a/pkgs/development/libraries/tiledb/default.nix b/pkgs/development/libraries/tiledb/default.nix index eb65d07b2837..560a991c44af 100644 --- a/pkgs/development/libraries/tiledb/default.nix +++ b/pkgs/development/libraries/tiledb/default.nix @@ -47,8 +47,6 @@ stdenv.mkDerivation rec { gtest ]; - enableParallelBuilding = true; - buildInputs = [ catch2 zlib diff --git a/pkgs/development/libraries/umockdev/default.nix b/pkgs/development/libraries/umockdev/default.nix index cd8c90f319d7..5050650635f4 100644 --- a/pkgs/development/libraries/umockdev/default.nix +++ b/pkgs/development/libraries/umockdev/default.nix @@ -17,23 +17,19 @@ stdenv.mkDerivation rec { pname = "umockdev"; - version = "0.15.2"; + version = "0.15.4"; outputs = [ "bin" "out" "dev" "doc" ]; src = fetchurl { url = "https://github.com/martinpitt/umockdev/releases/download/${version}/${pname}-${version}.tar.xz"; - sha256 = "19f21qb9ckwvlm7yzpnc0vcp092qbkms2yrafc26b9a63v4imj52"; + sha256 = "09k8jwvsphd97hcagf0zaf0hwzlzq2r8jfgbmvj55k7ylrg8hjxg"; }; mesonFlags = [ "-Dgtk_doc=true" ]; - preCheck = '' - patchShebangs tests/test-static-code - ''; - buildInputs = [ glib systemd libgudev ]; nativeBuildInputs = [ @@ -50,10 +46,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - # Test fail with libusb 1.0.24 - # https://github.com/NixOS/nixpkgs/issues/107420 - # https://github.com/martinpitt/umockdev/issues/115 - doCheck = false; + doCheck = true; postInstall = '' mkdir -p $doc/share/doc/umockdev/ diff --git a/pkgs/development/libraries/umockdev/disable-failed-test.patch b/pkgs/development/libraries/umockdev/disable-failed-test.patch deleted file mode 100644 index 69e74dd38b8d..000000000000 --- a/pkgs/development/libraries/umockdev/disable-failed-test.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/tests/test-umockdev-vala.vala b/tests/test-umockdev-vala.vala -index 8b104b2..d9889b8 100644 ---- a/tests/test-umockdev-vala.vala -+++ b/tests/test-umockdev-vala.vala -@@ -668,7 +668,7 @@ main (string[] args) - - /* tests for mocking ioctls */ - Test.add_func ("/umockdev-testbed-vala/usbfs_ioctl_static", t_usbfs_ioctl_static); -- Test.add_func ("/umockdev-testbed-vala/usbfs_ioctl_tree", t_usbfs_ioctl_tree); -+ /* Test.add_func ("/umockdev-testbed-vala/usbfs_ioctl_tree", t_usbfs_ioctl_tree); */ - Test.add_func ("/umockdev-testbed-vala/usbfs_ioctl_tree_with_default_device", t_usbfs_ioctl_tree_with_default_device); - Test.add_func ("/umockdev-testbed-vala/usbfs_ioctl_tree_override_default_device", t_usbfs_ioctl_tree_override_default_device); - Test.add_func ("/umockdev-testbed-vala/usbfs_ioctl_tree_xz", t_usbfs_ioctl_tree_xz); diff --git a/pkgs/development/libraries/umockdev/fix-test-paths.patch b/pkgs/development/libraries/umockdev/fix-test-paths.patch deleted file mode 100644 index 53015d662684..000000000000 --- a/pkgs/development/libraries/umockdev/fix-test-paths.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ru3 umockdev-0.13.1/tests/test-umockdev.c umockdev-0.13.1-new/tests/test-umockdev.c ---- umockdev-0.13.1/tests/test-umockdev.c 2019-08-18 20:39:39.708262517 +0300 -+++ umockdev-0.13.1-new/tests/test-umockdev.c 2019-08-18 21:04:27.688761503 +0300 -@@ -1084,7 +1084,7 @@ - - /* sys/ in other dir should not be trapped */ - errno = 0; -- dirfd = open("/run", O_RDONLY | O_DIRECTORY); -+ dirfd = open("/tmp", O_RDONLY | O_DIRECTORY); - g_assert_cmpint(openat(dirfd, "sys", O_RDONLY), <, 0); - g_assert_cmpint(errno, ==, ENOENT); - g_assert_cmpint(openat64(dirfd, "sys", O_RDONLY), <, 0); diff --git a/pkgs/development/libraries/unittest-cpp/default.nix b/pkgs/development/libraries/unittest-cpp/default.nix index 7dd8e071567a..17b64d99971b 100644 --- a/pkgs/development/libraries/unittest-cpp/default.nix +++ b/pkgs/development/libraries/unittest-cpp/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "0sxb3835nly1jxn071f59fwbdzmqi74j040r81fanxyw3s1azw0i"; }; - buildInputs = [cmake]; + nativeBuildInputs = [ cmake ]; doCheck = false; diff --git a/pkgs/development/libraries/vc/0.7.nix b/pkgs/development/libraries/vc/0.7.nix index 46a3a3e52f0f..119254107e9c 100644 --- a/pkgs/development/libraries/vc/0.7.nix +++ b/pkgs/development/libraries/vc/0.7.nix @@ -13,8 +13,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - enableParallelBuilding = true; - postPatch = '' sed -i '/OptimizeForArchitecture()/d' cmake/VcMacros.cmake sed -i '/AutodetectHostArchitecture()/d' print_target_architecture.cmake diff --git a/pkgs/development/libraries/vc/default.nix b/pkgs/development/libraries/vc/default.nix index 49d3f9af7193..d3673e783cd1 100644 --- a/pkgs/development/libraries/vc/default.nix +++ b/pkgs/development/libraries/vc/default.nix @@ -13,8 +13,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - enableParallelBuilding = true; - postPatch = '' sed -i '/OptimizeForArchitecture()/d' cmake/VcMacros.cmake sed -i '/AutodetectHostArchitecture()/d' print_target_architecture.cmake diff --git a/pkgs/development/libraries/vigra/default.nix b/pkgs/development/libraries/vigra/default.nix index 8720a39f301a..7bff0981e768 100644 --- a/pkgs/development/libraries/vigra/default.nix +++ b/pkgs/development/libraries/vigra/default.nix @@ -21,7 +21,8 @@ in stdenv.mkDerivation rec { sha256 = "1i1w6smijgb5z8bg9jaq84ccy00k2sxm87s37lgjpyix901gjlgi"; }; in [ clangPatch ]; - buildInputs = [ boost cmake fftw fftwSinglePrec hdf5 ilmbase libjpeg libpng + nativeBuildInputs = [ cmake ]; + buildInputs = [ boost fftw fftwSinglePrec hdf5 ilmbase libjpeg libpng libtiff numpy openexr python ]; preConfigure = "cmakeFlags+=\" -DVIGRANUMPY_INSTALL_DIR=$out/lib/${python.libPrefix}/site-packages\""; @@ -30,8 +31,6 @@ in stdenv.mkDerivation rec { ++ stdenv.lib.optionals (stdenv.hostPlatform.system == "x86_64-linux") [ "-DCMAKE_CXX_FLAGS=-fPIC" "-DCMAKE_C_FLAGS=-fPIC" ]; - enableParallelBuilding = true; - # fails with "./test_watersheds3d: error while loading shared libraries: libvigraimpex.so.11: cannot open shared object file: No such file or directory" doCheck = false; diff --git a/pkgs/development/libraries/vmmlib/default.nix b/pkgs/development/libraries/vmmlib/default.nix index f191a9764378..6d1dc7d4786d 100644 --- a/pkgs/development/libraries/vmmlib/default.nix +++ b/pkgs/development/libraries/vmmlib/default.nix @@ -21,8 +21,6 @@ stdenv.mkDerivation rec { buildInputs = [ boost lapack ] ++ stdenv.lib.optionals stdenv.isDarwin [ Accelerate CoreGraphics CoreVideo ]; - enableParallelBuilding = true; - doCheck = !stdenv.isDarwin; checkTarget = "test"; diff --git a/pkgs/development/libraries/vrpn/default.nix b/pkgs/development/libraries/vrpn/default.nix index b45c83ab1ae8..85d6fba459d6 100644 --- a/pkgs/development/libraries/vrpn/default.nix +++ b/pkgs/development/libraries/vrpn/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { sha256 = "032q295d68w34rk5q8nfqdd29s55n00bfik84y7xzkjrpspaprlh"; }; - buildInputs = [ unzip cmake libGLU libGL ]; + nativeBuildInputs = [ cmake unzip ]; + buildInputs = [ libGLU libGL ]; doCheck = false; # FIXME: test failure checkTarget = "test"; diff --git a/pkgs/development/libraries/vtk/generic.nix b/pkgs/development/libraries/vtk/generic.nix index 7bfd8d9fcfff..273bff8852ee 100644 --- a/pkgs/development/libraries/vtk/generic.nix +++ b/pkgs/development/libraries/vtk/generic.nix @@ -1,5 +1,5 @@ { majorVersion, minorVersion, sourceSha256, patchesToFetch ? [] }: -{ stdenv, lib, fetchurl, cmake, libGLU, libGL, libX11, xorgproto, libXt, libtiff +{ stdenv, lib, fetchurl, cmake, libGLU, libGL, libX11, xorgproto, libXt, libpng, libtiff , fetchpatch , enableQt ? false, wrapQtAppsHook, qtbase, qtx11extras, qttools , enablePython ? false, pythonInterpreter ? throw "vtk: Python support requested, but no python interpreter was given." @@ -24,7 +24,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - buildInputs = [ libtiff ] + buildInputs = [ libpng libtiff ] ++ optionals enableQt [ qtbase qtx11extras qttools ] ++ optionals stdenv.isLinux [ libGLU @@ -65,6 +65,7 @@ in stdenv.mkDerivation rec { cmakeFlags = [ "-DCMAKE_C_FLAGS=-fPIC" "-DCMAKE_CXX_FLAGS=-fPIC" + "-DVTK_USE_SYSTEM_PNG=ON" "-DVTK_USE_SYSTEM_TIFF=1" "-DOPENGL_INCLUDE_DIR=${libGL}/include" "-DCMAKE_INSTALL_LIBDIR=lib" @@ -84,8 +85,6 @@ in stdenv.mkDerivation rec { sed -i 's/fprintf(output, shift)/fprintf(output, "%s", shift)/g' ./ThirdParty/libxml2/vtklibxml2/xpath.c ''; - enableParallelBuilding = true; - meta = with lib; { description = "Open source libraries for 3D computer graphics, image processing and visualization"; homepage = "https://www.vtk.org/"; diff --git a/pkgs/development/libraries/vulkan-headers/default.nix b/pkgs/development/libraries/vulkan-headers/default.nix index 317a5059aec3..154ed9deb490 100644 --- a/pkgs/development/libraries/vulkan-headers/default.nix +++ b/pkgs/development/libraries/vulkan-headers/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "vulkan-headers"; - version = "1.2.141.0"; + version = "1.2.162.0"; nativeBuildInputs = [ cmake ]; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { owner = "KhronosGroup"; repo = "Vulkan-Headers"; rev = "sdk-${version}"; - sha256 = "10nmx6y4llllfcczyfz76amd0vkqv09dj952d19zkzmmgcval7zq"; + sha256 = "057c49w1138l02v9gqsk1z8wdz0iilp96jblnldycwm9jc1a1ipq"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix index 8f974307cda5..67ff1be075de 100644 --- a/pkgs/development/libraries/vulkan-loader/default.nix +++ b/pkgs/development/libraries/vulkan-loader/default.nix @@ -3,18 +3,17 @@ stdenv.mkDerivation rec { pname = "vulkan-loader"; - version = "1.2.141.0"; + version = "1.2.162.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-Loader"; rev = "sdk-${version}"; - sha256 = "10fyg71dza6qakz5zdchccfn0zcr8b1zpfi2rqir6jpzcbi28kcj"; + sha256 = "0w9i2pliw4ccmjyfzff4i2f3hxwsfd54jg7ahv2v634qmx59bsbi"; }; nativeBuildInputs = [ pkgconfig cmake ]; buildInputs = [ python3 xlibsWrapper libxcb libXrandr libXext wayland ]; - enableParallelBuilding = true; preConfigure = '' substituteInPlace loader/vulkan.pc.in \ diff --git a/pkgs/development/libraries/vxl/default.nix b/pkgs/development/libraries/vxl/default.nix index 58622cb98cb7..b6543b2e6cf9 100644 --- a/pkgs/development/libraries/vxl/default.nix +++ b/pkgs/development/libraries/vxl/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation { sha256 = "0xpkwwb93ka6c3da8zjhfg9jk5ssmh9ifdh1by54sz6c7mbp55m8"; }; - buildInputs = [ cmake unzip libtiff expat zlib libpng libjpeg ]; + nativeBuildInputs = [ cmake unzip ]; + buildInputs = [ libtiff expat zlib libpng libjpeg ]; cmakeFlags = [ # BUILD_OUL wants old linux headers for videodev.h, not available @@ -23,8 +24,6 @@ stdenv.mkDerivation { "-DCMAKE_C_FLAGS=-fPIC" ]; - enableParallelBuilding = true; - meta = { description = "C++ Libraries for Computer Vision Research and Implementation"; homepage = "http://vxl.sourceforge.net/"; diff --git a/pkgs/development/libraries/wt/default.nix b/pkgs/development/libraries/wt/default.nix index 7c819487a334..de98a11d68e5 100644 --- a/pkgs/development/libraries/wt/default.nix +++ b/pkgs/development/libraries/wt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, boost, pkgconfig, doxygen, qt48Full, libharu +{ stdenv, fetchFromGitHub, cmake, boost, pkg-config, doxygen, qt48Full, libharu , pango, fcgi, firebird, libmysqlclient, postgresql, graphicsmagick, glew, openssl , pcre, harfbuzz }: @@ -17,11 +17,9 @@ let inherit sha256; }; - enableParallelBuilding = true; - - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ - cmake boost doxygen qt48Full libharu + boost doxygen qt48Full libharu pango fcgi firebird libmysqlclient postgresql graphicsmagick glew openssl pcre ]; diff --git a/pkgs/development/libraries/x265/default.nix b/pkgs/development/libraries/x265/default.nix index 3ad200cfc637..8c5cf32545c3 100644 --- a/pkgs/development/libraries/x265/default.nix +++ b/pkgs/development/libraries/x265/default.nix @@ -37,7 +37,6 @@ let buildLib = has12Bit: stdenv.mkDerivation rec { name = "libx265-${if has12Bit then "12" else "10"}-${version}"; inherit src; - enableParallelBuilding = true; postPatch = '' sed -i 's/unknown/${version}/g' source/cmake/version.cmake @@ -68,8 +67,6 @@ stdenv.mkDerivation rec { pname = "x265"; inherit version src; - enableParallelBuilding = true; - postPatch = '' sed -i 's/unknown/${version}/g' source/cmake/version.cmake sed -i 's/0.0/${version}/g' source/cmake/version.cmake diff --git a/pkgs/development/libraries/xcb-imdkit/default.nix b/pkgs/development/libraries/xcb-imdkit/default.nix new file mode 100644 index 000000000000..72ce94d98f12 --- /dev/null +++ b/pkgs/development/libraries/xcb-imdkit/default.nix @@ -0,0 +1,41 @@ +{ stdenv +, fetchFromGitHub +, cmake +, extra-cmake-modules +, uthash +, xcbutil +, xcbutilkeysyms +, xorgproto +}: + +stdenv.mkDerivation rec { + pname = "xcb-imdkit"; + version = "1.0.1"; + + src = fetchFromGitHub { + owner = "fcitx"; + repo = "xcb-imdkit"; + rev = version; + sha256 = "dvax+Wj8+tHdiL6txcuugrOlRnxdIW25DYO4iNAYK8M="; + }; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + xorgproto + uthash + ]; + + buildInputs = [ + xcbutil + xcbutilkeysyms + ]; + + meta = with stdenv.lib; { + description = "input method development support for xcb"; + homepage = "https://github.com/fcitx/xcb-imdkit"; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ poscat ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/xgboost/default.nix b/pkgs/development/libraries/xgboost/default.nix index d9d660062a25..b9a2820a9285 100644 --- a/pkgs/development/libraries/xgboost/default.nix +++ b/pkgs/development/libraries/xgboost/default.nix @@ -17,8 +17,6 @@ stdenv.mkDerivation rec { sha256 = "1zs15k9crkiq7bnr4gqq53mkn3w8z9dq4nwlavmfcr5xr5gw2pw4"; }; - enableParallelBuilding = true; - nativeBuildInputs = [ cmake ] ++ lib.optional stdenv.isDarwin llvmPackages.openmp; buildInputs = lib.optional cudaSupport cudatoolkit diff --git a/pkgs/development/libraries/xsd/default.nix b/pkgs/development/libraries/xsd/default.nix index 7541ee427045..3388666f46b3 100644 --- a/pkgs/development/libraries/xsd/default.nix +++ b/pkgs/development/libraries/xsd/default.nix @@ -1,9 +1,8 @@ { stdenv, fetchurl, xercesc }: let - fixed_paths = ''LDFLAGS="-L${xercesc}/lib" CPPFLAGS="-I${xercesc}/include"''; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "xsd"; version = "4.0.0"; @@ -14,20 +13,22 @@ stdenv.mkDerivation { patches = [ ./xsdcxx.patch ]; - configurePhase = '' + postPatch = '' patchShebangs . ''; - buildPhase = '' - make ${fixed_paths} - ''; + enableParallelBuilding = true; + + buildFlags = [ + "LDFLAGS=-L${xercesc}/lib" + "CPPFLAGS=-I${xercesc}/include" + ]; + installFlags = buildFlags ++ [ + "install_prefix=${placeholder "out"}" + ]; buildInputs = [ xercesc ]; - installPhase = '' - make ${fixed_paths} install_prefix="$out" install - ''; - meta = { homepage = "http://www.codesynthesis.com/products/xsd"; description = "An open-source, cross-platform W3C XML Schema to C++ data binding compiler"; diff --git a/pkgs/development/libraries/xxHash/default.nix b/pkgs/development/libraries/xxHash/default.nix index e572e8bb31ff..a5e6bfb11a68 100644 --- a/pkgs/development/libraries/xxHash/default.nix +++ b/pkgs/development/libraries/xxHash/default.nix @@ -11,6 +11,13 @@ stdenv.mkDerivation rec { sha256 = "0hpbzdd6kfki5f61g103vp7pfczqkdj0js63avl0ss552jfb8h96"; }; + # Upstream Makefile does not anticipate that user may not want to + # build .so library. + postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isStatic '' + sed -i 's/lib: libxxhash.a libxxhash/lib: libxxhash.a/' Makefile + sed -i '/LIBXXH) $(DESTDIR/ d' Makefile + ''; + outputs = [ "out" "dev" ]; makeFlags = [ "PREFIX=$(dev)" "EXEC_PREFIX=$(out)" ]; diff --git a/pkgs/development/libraries/zeromq/4.x.nix b/pkgs/development/libraries/zeromq/4.x.nix index d5819ff7ee9a..7be5a74c3a48 100644 --- a/pkgs/development/libraries/zeromq/4.x.nix +++ b/pkgs/development/libraries/zeromq/4.x.nix @@ -15,8 +15,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake asciidoc pkg-config ]; buildInputs = [ libsodium ]; - enableParallelBuilding = true; - doCheck = false; # fails all the tests (ctest) cmakeFlags = stdenv.lib.optional enableDrafts "-DENABLE_DRAFTS=ON"; diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix index 98746968146d..b780fcda3930 100644 --- a/pkgs/development/libraries/zlib/default.nix +++ b/pkgs/development/libraries/zlib/default.nix @@ -1,17 +1,19 @@ { stdenv , fetchurl -# Note: If `{ static = false; shared = false; }`, upstream's default is used -# (which is building both static and shared as of zlib 1.2.11). -, shared ? true +, shared ? !stdenv.hostPlatform.isStatic , static ? true # If true, a separate .static ouput is created and the .a is moved there. # In this case `pkg-config` auto detection does not currently work if the # .static output is given as `buildInputs` to another package (#66461), because # the `.pc` file lists only the main output's lib dir. # If false, and if `{ static = true; }`, the .a stays in the main output. -, splitStaticOutput ? static +, splitStaticOutput ? shared && static }: +# Without either the build will actually still succeed because the build +# system makes an arbitrary choice, but we shouldn't be so indecisive. +assert shared || static; + # Note: this package is used for bootstrapping fetchurl, and thus # cannot use fetchpatch! All mutable patches (generated by GitHub or # cgit) that are needed here should be included directly in Nixpkgs as diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clfswm.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clfswm.nix new file mode 100644 index 000000000000..81b335520b04 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clfswm.nix @@ -0,0 +1,25 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''clfswm''; + version = ''20161204-git''; + + description = ''CLFSWM: Fullscreen Window Manager''; + + deps = [ args."clx" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/clfswm/2016-12-04/clfswm-20161204-git.tgz''; + sha256 = ''1jgz127721dgcv3qm1knc335gy04vzh9gl0hshp256rxi82cpp73''; + }; + + packageName = "clfswm"; + + asdFilesToKeep = ["clfswm.asd"]; + overrides = x: x; +} +/* (SYSTEM clfswm DESCRIPTION CLFSWM: Fullscreen Window Manager SHA256 + 1jgz127721dgcv3qm1knc335gy04vzh9gl0hshp256rxi82cpp73 URL + http://beta.quicklisp.org/archive/clfswm/2016-12-04/clfswm-20161204-git.tgz + MD5 dc976785ef899837ab0fc50a4ed6b740 NAME clfswm FILENAME clfswm DEPS + ((NAME clx FILENAME clx)) DEPENDENCIES (clx) VERSION 20161204-git SIBLINGS + NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix index 96d5867a3b30..412fd4b8dee5 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix @@ -81,7 +81,7 @@ in postInstall = ((x.overrides y).postInstall or "") + '' export NIX_LISP_ASDF_PATHS="$NIX_LISP_ASDF_PATHS $out/lib/common-lisp/query-fs" - export HOME=$PWD + export HOME=$PWD export NIX_LISP_PRELAUNCH_HOOK="nix_lisp_build_system query-fs \ '(function query-fs:run-fs-with-cmdline-args)' '$linkedSystems'" "$out/bin/query-fs-lisp-launcher.sh" @@ -231,4 +231,14 @@ $out/lib/common-lisp/query-fs" cl-cffi-gtk-gdk = addNativeLibs [pkgs.gtk3]; cl-cffi-gtk-gtk3 = addNativeLibs [pkgs.gtk3]; cl-webkit2 = addNativeLibs [pkgs.webkitgtk]; + clfswm = x: { + overrides = y: (x.overrides y) // { + postInstall = '' + export NIX_LISP_PRELAUNCH_HOOK="nix_lisp_build_system clfswm '(function clfswm:main)'" + "$out/bin/clfswm-lisp-launcher.sh" + + cp "$out/lib/common-lisp/clfswm/clfswm" "$out/bin" + ''; + }; + }; } diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt b/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt index 52d626888a3a..383510df777e 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt @@ -82,6 +82,7 @@ cl-utilities cl-vectors cl-webkit2 cl-who +clfswm clx collectors command-line-arguments diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix.nix b/pkgs/development/lisp-modules/quicklisp-to-nix.nix index 11244ec84a6d..cbaa13af9624 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix.nix @@ -2848,6 +2848,13 @@ let quicklisp-to-nix-packages = rec { "fiasco" = quicklisp-to-nix-packages."fiasco"; })); + "clfswm" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."clfswm" or (x: {})) + (import ./quicklisp-to-nix-output/clfswm.nix { + inherit fetchurl; + "clx" = quicklisp-to-nix-packages."clx"; + })); "cl-who" = buildLispPackage ((f: x: (x // (f x))) diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index 500766585632..fddb028b80ae 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -5,7 +5,7 @@ nixpkgs$ maintainers/scripts/update-luarocks-packages pkgs/development/lua-modul These packages are manually refined in lua-overrides.nix */ -{ self, stdenv, fetchurl, fetchgit, pkgs, ... } @ args: +{ self, lib, stdenv, fetchurl, fetchgit, pkgs, ... } @ args: self: super: with self; { @@ -21,7 +21,7 @@ alt-getopt = buildLuarocksPackage { disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); propagatedBuildInputs = [ lua ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/cheusov/lua-alt-getopt"; description = "Process application arguments the same way as getopt_long"; maintainers = with maintainers; [ arobyn ]; @@ -39,7 +39,7 @@ ansicolors = buildLuarocksPackage { disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/kikito/ansicolors.lua"; description = "Library for color Manipulation."; license.fullName = "MIT "; @@ -56,7 +56,7 @@ argparse = buildLuarocksPackage { disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); propagatedBuildInputs = [ lua ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/luarocks/argparse"; description = "A feature-rich command-line argument parser"; license.fullName = "MIT"; @@ -79,7 +79,7 @@ basexx = buildLuarocksPackage { disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/aiq/basexx"; description = "A base2, base16, base32, base64 and base85 library for Lua"; license.fullName = "MIT"; @@ -96,7 +96,7 @@ binaryheap = buildLuarocksPackage { disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/Tieske/binaryheap.lua"; description = "Binary heap implementation in pure Lua"; maintainers = with maintainers; [ vcunat ]; @@ -114,7 +114,7 @@ bit32 = buildLuarocksPackage { disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.lua.org/manual/5.2/manual.html#6.7"; description = "Lua 5.2 bit manipulation library"; maintainers = with maintainers; [ lblasc ]; @@ -138,7 +138,7 @@ busted = buildLuarocksPackage { disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua lua_cliargs luafilesystem luasystem dkjson say luassert lua-term penlight mediator_lua ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://olivinelabs.com/busted/"; description = "Elegant Lua unit testing."; license.fullName = "MIT "; @@ -154,7 +154,7 @@ cassowary = buildLuarocksPackage { }; propagatedBuildInputs = [ lua penlight ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/sile-typesetter/cassowary.lua"; description = "The cassowary constraint solver"; maintainers = with maintainers; [ marsam alerque ]; @@ -172,7 +172,7 @@ cjson = buildLuarocksPackage { disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.kyne.com.au/~mark/software/lua-cjson.php"; description = "A fast JSON encoding/parsing module"; license.fullName = "MIT"; @@ -189,7 +189,7 @@ compat53 = buildLuarocksPackage { disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); propagatedBuildInputs = [ lua ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/keplerproject/lua-compat-5.3"; description = "Compatibility module providing Lua-5.3-style APIs for Lua 5.2 and 5.1"; maintainers = with maintainers; [ vcunat ]; @@ -206,7 +206,7 @@ cosmo = buildLuarocksPackage { }; propagatedBuildInputs = [ lpeg ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://cosmo.luaforge.net"; description = "Safe templates for Lua"; maintainers = with maintainers; [ marsam ]; @@ -222,7 +222,7 @@ coxpcall = buildLuarocksPackage { sha256 = "0n1jmda4g7x06458596bamhzhcsly6x0p31yp6q3jz4j11zv1zhi"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://keplerproject.github.io/coxpcall"; description = "Coroutine safe xpcall and pcall"; license.fullName = "MIT/X11"; @@ -239,7 +239,7 @@ cqueues = buildLuarocksPackage { disabled = (lua.luaversion != "5.2"); propagatedBuildInputs = [ lua ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://25thandclement.com/~william/projects/cqueues.html"; description = "Continuation Queues: Embeddable asynchronous networking, threading, and notification framework for Lua on Unix."; maintainers = with maintainers; [ vcunat ]; @@ -267,7 +267,7 @@ cyrussasl = buildLuarocksPackage { disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/JorjBauer/lua-cyrussasl"; description = "Cyrus SASL library for Lua 5.1+"; maintainers = with maintainers; [ vcunat ]; @@ -285,7 +285,7 @@ digestif = buildLuarocksPackage { disabled = (luaOlder "5.3"); propagatedBuildInputs = [ lua lpeg dkjson ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/astoff/digestif/"; description = "A code analyzer for TeX"; license.fullName = "MIT"; @@ -302,7 +302,7 @@ dkjson = buildLuarocksPackage { disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); propagatedBuildInputs = [ lua ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://dkolf.de/src/dkjson-lua.fsl/"; description = "David Kolf's JSON module for Lua"; license.fullName = "MIT/X11"; @@ -318,7 +318,7 @@ fifo = buildLuarocksPackage { }; propagatedBuildInputs = [ lua ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/daurnimator/fifo.lua"; description = "A lua library/'class' that implements a FIFO"; license.fullName = "MIT/X11"; @@ -335,7 +335,7 @@ http = buildLuarocksPackage { disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua compat53 bit32 cqueues luaossl basexx lpeg lpeg_patterns binaryheap fifo ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/daurnimator/lua-http"; description = "HTTP library for Lua"; maintainers = with maintainers; [ vcunat ]; @@ -353,7 +353,7 @@ inspect = buildLuarocksPackage { disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/kikito/inspect.lua"; description = "Lua table visualizer, ideal for debugging"; license.fullName = "MIT "; @@ -380,7 +380,7 @@ ldbus = buildLuarocksPackage { disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); propagatedBuildInputs = [ lua ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/daurnimator/ldbus"; description = "A Lua library to access dbus."; license.fullName = "MIT/X11"; @@ -402,7 +402,7 @@ ldoc = buildLuarocksPackage { propagatedBuildInputs = [ penlight markdown ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://stevedonovan.github.com/ldoc"; description = "A Lua Documentation Tool"; license.fullName = "MIT/X11"; @@ -419,7 +419,7 @@ lgi = buildLuarocksPackage { disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/pavouk/lgi"; description = "Lua bindings to GObject libraries"; license.fullName = "MIT/X11"; @@ -442,7 +442,7 @@ linenoise = buildLuarocksPackage { disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/hoelzro/lua-linenoise"; description = "A binding for the linenoise command line library"; license.fullName = "MIT/X11"; @@ -459,7 +459,7 @@ ljsyscall = buildLuarocksPackage { disabled = (lua.luaversion != "5.1"); propagatedBuildInputs = [ lua ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.myriabit.com/ljsyscall/"; description = "LuaJIT Linux syscall FFI"; maintainers = with maintainers; [ lblasc ]; @@ -477,7 +477,7 @@ lpeg = buildLuarocksPackage { disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.inf.puc-rio.br/~roberto/lpeg.html"; description = "Parsing Expression Grammars For Lua"; maintainers = with maintainers; [ vyp ]; @@ -494,7 +494,7 @@ lpeg_patterns = buildLuarocksPackage { }; propagatedBuildInputs = [ lua lpeg ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/daurnimator/lpeg_patterns/archive/v0.5.zip"; description = "a collection of LPEG patterns"; license.fullName = "MIT"; @@ -511,7 +511,7 @@ lpeglabel = buildLuarocksPackage { disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/sqmedeiros/lpeglabel/"; description = "Parsing Expression Grammars For Lua with Labeled Failures"; license.fullName = "MIT/X11"; @@ -528,7 +528,7 @@ lpty = buildLuarocksPackage { disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.tset.de/lpty/"; description = "A simple facility for lua to control other programs via PTYs."; license.fullName = "MIT"; @@ -545,7 +545,7 @@ lrexlib-gnu = buildLuarocksPackage { disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/rrthomas/lrexlib"; description = "Regular expression library binding (GNU flavour)."; license.fullName = "MIT/X11"; @@ -562,7 +562,7 @@ lrexlib-pcre = buildLuarocksPackage { disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/rrthomas/lrexlib"; description = "Regular expression library binding (PCRE flavour)."; maintainers = with maintainers; [ vyp ]; @@ -580,7 +580,7 @@ lrexlib-posix = buildLuarocksPackage { disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/rrthomas/lrexlib"; description = "Regular expression library binding (POSIX flavour)."; license.fullName = "MIT/X11"; @@ -597,7 +597,7 @@ ltermbox = buildLuarocksPackage { disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://code.google.com/p/termbox"; description = "A termbox library package"; license.fullName = "New BSD License"; @@ -624,7 +624,7 @@ lua-cmsgpack = buildLuarocksPackage { disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/antirez/lua-cmsgpack"; description = "MessagePack C implementation and bindings for Lua 5.1/5.2/5.3"; license.fullName = "Two-clause BSD"; @@ -641,7 +641,7 @@ lua-iconv = buildLuarocksPackage { disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://ittner.github.com/lua-iconv/"; description = "Lua binding to the iconv"; license.fullName = "MIT/X11"; @@ -668,7 +668,7 @@ lua-lsp = buildLuarocksPackage { disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); propagatedBuildInputs = [ lua dkjson lpeglabel inspect ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/Alloyed/lua-lsp"; description = "No summary"; license.fullName = "MIT"; @@ -685,7 +685,7 @@ lua-messagepack = buildLuarocksPackage { disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://fperrad.frama.io/lua-MessagePack/"; description = "a pure Lua implementation of the MessagePack serialization format"; license.fullName = "MIT/X11"; @@ -702,7 +702,7 @@ lua-resty-http = buildLuarocksPackage { disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/ledgetech/lua-resty-http"; description = "Lua HTTP client cosocket driver for OpenResty / ngx_lua."; license.fullName = "2-clause BSD"; @@ -719,7 +719,7 @@ lua-resty-jwt = buildLuarocksPackage { disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/cdbattags/lua-resty-jwt"; description = "JWT for ngx_lua and LuaJIT."; license.fullName = "Apache License Version 2"; @@ -736,7 +736,7 @@ lua-resty-openidc = buildLuarocksPackage { disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua lua-resty-http lua-resty-session lua-resty-jwt ]; - meta = with stdenv.lib; { + meta = with 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"; @@ -753,7 +753,7 @@ lua-resty-session = buildLuarocksPackage { disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/bungle/lua-resty-session"; description = "Session Library for OpenResty – Flexible and Secure"; license.fullName = "BSD"; @@ -774,7 +774,7 @@ lua-term = buildLuarocksPackage { }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/hoelzro/lua-term"; description = "Terminal functions for Lua"; license.fullName = "MIT/X11"; @@ -791,7 +791,7 @@ lua-toml = buildLuarocksPackage { disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/jonstoler/lua-toml"; description = "toml decoder/encoder for Lua"; license.fullName = "MIT"; @@ -808,7 +808,7 @@ lua-zlib = buildLuarocksPackage { disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/brimworks/lua-zlib"; description = "Simple streaming interface to zlib for Lua."; maintainers = with maintainers; [ koral ]; @@ -826,7 +826,7 @@ lua_cliargs = buildLuarocksPackage { disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/amireh/lua_cliargs"; description = "A command-line argument parser."; license.fullName = "MIT "; @@ -853,7 +853,7 @@ luabitop = buildLuarocksPackage { disabled = (luaOlder "5.1") || (luaAtLeast "5.3"); propagatedBuildInputs = [ lua ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://bitop.luajit.org/"; description = "Lua Bit Operations Module"; license.fullName = "MIT/X license"; @@ -870,7 +870,7 @@ luacheck = buildLuarocksPackage { disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); propagatedBuildInputs = [ lua argparse luafilesystem ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/mpeterv/luacheck"; description = "A static analyzer and a linter for Lua"; license.fullName = "MIT"; @@ -887,7 +887,7 @@ luacov = buildLuarocksPackage { disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); propagatedBuildInputs = [ lua ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://keplerproject.github.io/luacov/"; description = "Coverage analysis tool for Lua scripts"; license.fullName = "MIT"; @@ -904,7 +904,7 @@ luadbi = buildLuarocksPackage { disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); propagatedBuildInputs = [ lua ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/mwild1/luadbi"; description = "Database abstraction layer"; license.fullName = "MIT/X11"; @@ -921,7 +921,7 @@ luadbi-mysql = buildLuarocksPackage { disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); propagatedBuildInputs = [ lua luadbi ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/mwild1/luadbi"; description = "Database abstraction layer"; license.fullName = "MIT/X11"; @@ -938,7 +938,7 @@ luadbi-postgresql = buildLuarocksPackage { disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); propagatedBuildInputs = [ lua luadbi ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/mwild1/luadbi"; description = "Database abstraction layer"; license.fullName = "MIT/X11"; @@ -955,7 +955,7 @@ luadbi-sqlite3 = buildLuarocksPackage { disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); propagatedBuildInputs = [ lua luadbi ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/mwild1/luadbi"; description = "Database abstraction layer"; license.fullName = "MIT/X11"; @@ -971,7 +971,7 @@ luadoc = buildLuarocksPackage { }; propagatedBuildInputs = [ lualogging luafilesystem ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://luadoc.luaforge.net/"; description = "LuaDoc is a documentation tool for Lua source code"; license.fullName = "MIT/X11"; @@ -988,7 +988,7 @@ luaepnf = buildLuarocksPackage { disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); propagatedBuildInputs = [ lua lpeg ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://siffiejoe.github.io/lua-luaepnf/"; description = "Extended PEG Notation Format (easy grammars for LPeg)"; license.fullName = "MIT"; @@ -1005,7 +1005,7 @@ luaevent = buildLuarocksPackage { disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/harningt/luaevent"; description = "libevent binding for Lua"; license.fullName = "MIT"; @@ -1022,7 +1022,7 @@ luaexpat = buildLuarocksPackage { disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.keplerproject.org/luaexpat/"; description = "XML Expat parsing"; maintainers = with maintainers; [ arobyn flosse ]; @@ -1040,7 +1040,7 @@ luaffi = buildLuarocksPackage { disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/facebook/luaffifb"; description = "FFI library for calling C functions from lua"; license.fullName = "BSD"; @@ -1057,7 +1057,7 @@ luafilesystem = buildLuarocksPackage { disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "git://github.com/keplerproject/luafilesystem"; description = "File System Library for the Lua Programming Language"; maintainers = with maintainers; [ flosse vcunat ]; @@ -1074,7 +1074,7 @@ lualogging = buildLuarocksPackage { }; propagatedBuildInputs = [ luasocket ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/Neopallium/lualogging"; description = "A simple API to use logging features"; license.fullName = "MIT/X11"; @@ -1090,7 +1090,7 @@ luaossl = buildLuarocksPackage { }; propagatedBuildInputs = [ lua ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://25thandclement.com/~william/projects/luaossl.html"; description = "Most comprehensive OpenSSL module in the Lua universe."; maintainers = with maintainers; [ vcunat ]; @@ -1108,7 +1108,7 @@ luaposix = buildLuarocksPackage { disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); propagatedBuildInputs = [ bit32 lua ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/luaposix/luaposix/"; description = "Lua bindings for POSIX"; maintainers = with maintainers; [ vyp lblasc ]; @@ -1132,7 +1132,7 @@ luarepl = buildLuarocksPackage { disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/hoelzro/lua-repl"; description = "A reusable REPL component for Lua, written in Lua"; license.fullName = "MIT/X11"; @@ -1149,7 +1149,7 @@ luasec = buildLuarocksPackage { disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua luasocket ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/brunoos/luasec/wiki"; description = "A binding for OpenSSL library to provide TLS/SSL communication over LuaSocket."; maintainers = with maintainers; [ flosse ]; @@ -1167,7 +1167,7 @@ luasocket = buildLuarocksPackage { disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://luaforge.net/projects/luasocket/"; description = "Network support for the Lua language"; license.fullName = "MIT"; @@ -1194,7 +1194,7 @@ luasql-sqlite3 = buildLuarocksPackage { disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.keplerproject.org/luasql/"; description = "Database connectivity for Lua (SQLite3 driver)"; maintainers = with maintainers; [ vyp ]; @@ -1218,7 +1218,7 @@ luassert = buildLuarocksPackage { disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua say ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://olivinelabs.com/busted/"; description = "Lua Assertions Extension"; license.fullName = "MIT "; @@ -1235,7 +1235,7 @@ luasystem = buildLuarocksPackage { disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://olivinelabs.com/luasystem/"; description = "Platform independent system calls for Lua."; license.fullName = "MIT "; @@ -1252,7 +1252,7 @@ luautf8 = buildLuarocksPackage { disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/starwing/luautf8"; description = "A UTF-8 support module for Lua"; maintainers = with maintainers; [ pstn ]; @@ -1270,7 +1270,7 @@ luazip = buildLuarocksPackage { disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); propagatedBuildInputs = [ lua ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/mpeterv/luazip"; description = "Library for reading files inside zip files"; license.fullName = "MIT"; @@ -1287,7 +1287,7 @@ lua-yajl = buildLuarocksPackage { disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/brimworks/lua-yajl"; description = "Integrate the yajl JSON library with Lua."; maintainers = with maintainers; [ pstn ]; @@ -1305,7 +1305,7 @@ luuid = buildLuarocksPackage { disabled = (luaOlder "5.2") || (luaAtLeast "5.4"); propagatedBuildInputs = [ lua ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.tecgraf.puc-rio.br/~lhf/ftp/lua/#luuid"; description = "A library for UUID generation"; license.fullName = "Public domain"; @@ -1322,7 +1322,7 @@ luv = buildLuarocksPackage { disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/luvit/luv"; description = "Bare libuv bindings for lua"; license.fullName = "Apache 2.0"; @@ -1339,7 +1339,7 @@ lyaml = buildLuarocksPackage { disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); propagatedBuildInputs = [ lua ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/gvvaughan/lyaml"; description = "libYAML binding for Lua"; maintainers = with maintainers; [ lblasc ]; @@ -1357,7 +1357,7 @@ markdown = buildLuarocksPackage { disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); propagatedBuildInputs = [ lua ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/mpeterv/markdown"; description = "Markdown text-to-html markup system."; license.fullName = "MIT/X11"; @@ -1380,7 +1380,7 @@ mediator_lua = buildLuarocksPackage { disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://olivinelabs.com/mediator_lua/"; description = "Event handling through channels"; license.fullName = "MIT "; @@ -1401,7 +1401,7 @@ mpack = buildLuarocksPackage { }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/libmpack/libmpack-lua/releases/download/1.0.8/libmpack-lua-1.0.8.tar.gz"; description = "Lua binding to libmpack"; license.fullName = "MIT"; @@ -1418,7 +1418,7 @@ moonscript = buildLuarocksPackage { disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua lpeg alt-getopt luafilesystem ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://moonscript.org"; description = "A programmer friendly language that compiles to Lua"; maintainers = with maintainers; [ arobyn ]; @@ -1436,7 +1436,7 @@ nvim-client = buildLuarocksPackage { disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua mpack luv coxpcall ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/neovim/lua-client"; description = "Lua client to Nvim"; license.fullName = "Apache"; @@ -1452,7 +1452,7 @@ penlight = buildLuarocksPackage { }; propagatedBuildInputs = [ luafilesystem ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://tieske.github.io/Penlight"; description = "Lua utility libraries loosely based on the Python standard libraries"; maintainers = with maintainers; [ alerque ]; @@ -1470,7 +1470,7 @@ rapidjson = buildLuarocksPackage { disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/xpol/lua-rapidjson"; description = "Json module based on the very fast RapidJSON."; license.fullName = "MIT"; @@ -1487,7 +1487,7 @@ readline = buildLuarocksPackage { disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); propagatedBuildInputs = [ lua luaposix ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.pjb.com.au/comp/lua/readline.html"; description = "Interface to the readline library"; license.fullName = "MIT/X11"; @@ -1510,7 +1510,7 @@ say = buildLuarocksPackage { disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://olivinelabs.com/busted/"; description = "Lua String Hashing/Indexing Library"; license.fullName = "MIT "; @@ -1527,7 +1527,7 @@ std__debug = buildLuarocksPackage { disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); propagatedBuildInputs = [ lua ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://lua-stdlib.github.io/_debug"; description = "Debug Hints Library"; license.fullName = "MIT/X11"; @@ -1544,7 +1544,7 @@ std_normalize = buildLuarocksPackage { disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); propagatedBuildInputs = [ lua std__debug ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://lua-stdlib.github.io/normalize"; description = "Normalized Lua Functions"; license.fullName = "MIT/X11"; @@ -1561,7 +1561,7 @@ stdlib = buildLuarocksPackage { disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); propagatedBuildInputs = [ lua ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://lua-stdlib.github.io/lua-stdlib"; description = "General Lua Libraries"; maintainers = with maintainers; [ vyp ]; @@ -1579,7 +1579,7 @@ vstruct = buildLuarocksPackage { disabled = (luaOlder "5.1") || (luaAtLeast "5.3"); propagatedBuildInputs = [ lua ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/ToxicFrog/vstruct"; description = "Lua library to manipulate binary data"; }; diff --git a/pkgs/development/lua-modules/generic/default.nix b/pkgs/development/lua-modules/generic/default.nix index 71e1f7c05e6e..de21d3d6a3e6 100644 --- a/pkgs/development/lua-modules/generic/default.nix +++ b/pkgs/development/lua-modules/generic/default.nix @@ -1,11 +1,14 @@ { lua, writeText, toLuaModule }: -{ disabled ? false, ... } @ attrs: +{ disabled ? false +, propagatedBuildInputs ? [ ] +, ... +} @ attrs: if disabled then throw "${attrs.name} not supported by interpreter lua-${lua.luaversion}" else - toLuaModule( lua.stdenv.mkDerivation ( + toLuaModule (lua.stdenv.mkDerivation ( { makeFlags = [ "PREFIX=$(out)" @@ -18,8 +21,8 @@ else // { name = "lua${lua.luaversion}-" + attrs.name; - propagatedBuildInputs = [ + propagatedBuildInputs = propagatedBuildInputs ++ [ lua # propagate it for its setup-hook ]; } - ) ) + )) diff --git a/pkgs/development/misc/avr/libc/default.nix b/pkgs/development/misc/avr/libc/default.nix index 6682f72c62de..83054b46a94c 100644 --- a/pkgs/development/misc/avr/libc/default.nix +++ b/pkgs/development/misc/avr/libc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, automake, autoconf }: +{ lib, stdenv, fetchurl, automake, autoconf }: let version = "2.0.0"; @@ -22,7 +22,7 @@ stdenv.mkDerivation { incdir = "/avr/include"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "a C runtime library for AVR microcontrollers"; homepage = "https://savannah.nongnu.org/projects/avr-libc/"; license = licenses.bsd3; diff --git a/pkgs/development/misc/avr8-burn-omat/default.nix b/pkgs/development/misc/avr8-burn-omat/default.nix index 1a92f8fdd9da..1f504ac280e8 100644 --- a/pkgs/development/misc/avr8-burn-omat/default.nix +++ b/pkgs/development/misc/avr8-burn-omat/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, runtimeShell }: +{ lib, stdenv, fetchurl, unzip, runtimeShell }: stdenv.mkDerivation { name = "avr8-burn-omat-2.1.2"; @@ -24,7 +24,7 @@ stdenv.mkDerivation { chmod +x $out/bin/avr8-burn-omat ''; - meta = with stdenv.lib; { + meta = with lib; { description = "GUI tool for avrdude"; homepage = "http://avr8-burn-o-mat.aaabbb.de/avr8_burn_o_mat_avrdude_gui_en.html"; license = stdenv.lib.licenses.gpl3; diff --git a/pkgs/development/misc/h3/default.nix b/pkgs/development/misc/h3/default.nix index 8b8515261a1c..1d12e0f2b01f 100644 --- a/pkgs/development/misc/h3/default.nix +++ b/pkgs/development/misc/h3/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , cmake , fetchFromGitHub }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { "-DENABLE_LINTING=OFF" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/uber/h3"; description = "Hexagonal hierarchical geospatial indexing system"; license = licenses.asl20; diff --git a/pkgs/development/misc/loc/default.nix b/pkgs/development/misc/loc/default.nix index d8b65a7c1473..33de722baa24 100644 --- a/pkgs/development/misc/loc/default.nix +++ b/pkgs/development/misc/loc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform }: +{ lib, stdenv, fetchFromGitHub, rustPlatform }: with rustPlatform; @@ -15,7 +15,7 @@ buildRustPackage rec { cargoSha256 = "1fgv1kxiif48q9mm60ygn88r5nkxfyiacmvbgwp0jxiacv8r7779"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/cgag/loc"; description = "Count lines of code quickly"; license = stdenv.lib.licenses.mit; diff --git a/pkgs/development/misc/msp430/mspdebug.nix b/pkgs/development/misc/msp430/mspdebug.nix index 471dd5b31229..f8616ff0bc4f 100644 --- a/pkgs/development/misc/msp430/mspdebug.nix +++ b/pkgs/development/misc/msp430/mspdebug.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , autoPatchelfHook , libusb-compat-0_1 @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { stdenv.lib.optional (!enableReadline) "WITHOUT_READLINE=1"; unameS = stdenv.lib.optionalString stdenv.isDarwin "Darwin"; - meta = with stdenv.lib; { + meta = with lib; { description = "A free programmer, debugger, and gdb proxy for MSP430 MCUs"; homepage = "https://dlbeer.co.nz/mspdebug/"; license = licenses.gpl2; diff --git a/pkgs/development/misc/rappel/default.nix b/pkgs/development/misc/rappel/default.nix index 761d2ea98ba0..67e202a005fc 100644 --- a/pkgs/development/misc/rappel/default.nix +++ b/pkgs/development/misc/rappel/default.nix @@ -2,7 +2,7 @@ , libedit , makeWrapper , nasm -, stdenv +, lib, stdenv }: stdenv.mkDerivation rec { @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/yrp604/rappel"; description = "A pretty janky assembly REPL"; license = licenses.bsdOriginal; diff --git a/pkgs/development/misc/resholve/README.md b/pkgs/development/misc/resholve/README.md new file mode 100644 index 000000000000..ddba7fc14934 --- /dev/null +++ b/pkgs/development/misc/resholve/README.md @@ -0,0 +1,138 @@ +# Using resholve's Nix API + +resholve converts bare executable references in shell scripts to absolute +paths. This will hopefully make its way into the Nixpkgs manual soon, but +until then I'll outline how to use the `resholvePackage` function. + +> Fair warning: resholve does *not* aspire to resolving all valid Shell +> scripts. It depends on the OSH/Oil parser, which aims to support most (but +> not all) Bash, and aims to be a ~90% sort of solution. + +Let's start with a simple example from one of my own projects: + +```nix +{ stdenv, lib, resholvePackage, fetchFromGitHub, bashup-events44, bashInteractive_5, doCheck ? true, shellcheck }: + +resholvePackage rec { + pname = "shellswain"; + version = "unreleased"; + + src = fetchFromGitHub { + # ... + }; + + solutions = { + profile = { + # the only *required* arguments + scripts = [ "bin/shellswain.bash" ]; + interpreter = "none"; + inputs = [ bashup-events44 ]; + }; + }; + + makeFlags = [ "prefix=${placeholder "out"}" ]; + + inherit doCheck; + checkInputs = [ shellcheck ]; + + # ... +} +``` + +I'll focus on the `solutions` attribute, since this is the only part +that differs from other derivations. + +Each "solution" (k=v pair) +describes one resholve invocation. For most shell packages, one +invocation will probably be enough. resholve will make you be very +explicit about your script's dependencies, and it may also need your +help sorting out some references or problems that it can't safely +handle on its own. + +If you have more than one script, and your scripts need conflicting +directives, you can specify more than one solution to resolve the +scripts separately, but still produce a single package. + +Let's take a closer look: + +```nix + solutions = { + # each solution has a short name; this is what you'd use to + # override the settings of this solution, and it may also show up + # in (some) error messages. + profile = { + # specify one or more $out-relative script paths (unlike many + # builders, resholve will modify the output files during fixup + # to correctly resolve scripts that source within the package) + scripts = [ "bin/shellswain.bash" ]; + # "none" for no shebang, "${bash}/bin/bash" for bash, etc. + interpreter = "none"; + # packages resholve should resolve executables from + inputs = [ bashup-events44 ]; + }; + }; +``` + +resholve has a (growing) number of options for handling more complex +scripts. I won't cover these in excruciating detail here. You can find +more information about these in `man resholve` via `nixpkgs.resholve`. + +Instead, we'll look at the general form of the solutions attrset: + +```nix +solutions = { + shortname = { + # required + # $out-relative paths to try resolving + scripts = [ "bin/shunit2" ]; + # packages to resolve executables from + inputs = [ coreutils gnused gnugrep findutils ]; + # path for shebang, or 'none' to omit shebang + interpreter = "${bash}/bin/bash"; + + # optional + fake = { fake directives }; + fix = { fix directives }; + keep = { keep directives }; + # file to inject before first code-line of script + prologue = file; + # file to inject after last code-line of script + epilogue = file; + # extra command-line flags passed to resholve; generally this API + # should align with what resholve supports, but flags may help if + # you need to override the version of resholve. + flags = [ ]; + }; +}; +``` + +The main way you'll adjust how resholve handles your scripts are the +fake, fix, and keep directives. The manpage covers their purpose and +how to format them on the command-line, so I'll focus on how you'll +need to translate them into Nix types. + +```nix +# --fake 'f:setUp;tearDown builtin:setopt source:/etc/bashrc' +fake = { + function = [ "setUp" "tearDown" ]; + builtin = [ "setopt" ]; + source = [ "/etc/bashrc" ]; +}; + +# --fix 'aliases xargs:ls $GIT:gix' +fix = { + # all single-word directives use `true` as value + aliases = true; + xargs = [ "ls" ]; + "$GIT" = [ "gix" ]; +}; + +# --keep 'which:git;ls .:$HOME $LS:exa /etc/bashrc ~/.bashrc' +keep = { + which = [ "git" "ls" ]; + "." = [ "$HOME" ]; + "$LS" = [ "exa" ]; + "/etc/bashrc" = true; + "~/.bashrc" = true; +}; +``` diff --git a/pkgs/development/misc/resholve/default.nix b/pkgs/development/misc/resholve/default.nix new file mode 100644 index 000000000000..7b5a79dd221a --- /dev/null +++ b/pkgs/development/misc/resholve/default.nix @@ -0,0 +1,9 @@ +{ callPackage +, doCheck ? true +}: + +rec { + resholve = callPackage ./resholve.nix { inherit doCheck; }; + resholvePackage = + callPackage ./resholve-package.nix { inherit resholve; }; +} diff --git a/pkgs/development/misc/resholve/deps.nix b/pkgs/development/misc/resholve/deps.nix new file mode 100644 index 000000000000..9be283e49335 --- /dev/null +++ b/pkgs/development/misc/resholve/deps.nix @@ -0,0 +1,120 @@ +{ stdenv +, python27Packages +, fetchFromGitHub +, makeWrapper +, # re2c deps + autoreconfHook +, # py-yajl deps + git +, # oil deps + readline +, cmark +, file +, glibcLocales +, oilPatches ? [ ] +}: + +/* +Notes on specific dependencies: +- if/when python2.7 is removed from nixpkgs, this may need to figure + out how to build oil's vendored python2 +- I'm not sure if glibcLocales is worth the addition here. It's to fix + a libc test oil runs. My oil fork just disabled the libc tests, but + I haven't quite decided if that's the right long-term call, so I + didn't add a patch for it here yet. +*/ + +rec { + # had to add this as well; 1.3 causes a break here; sticking + # to oil's official 1.0.3 dep for now. + re2c = stdenv.mkDerivation rec { + pname = "re2c"; + version = "1.0.3"; + sourceRoot = "${src.name}/re2c"; + src = fetchFromGitHub { + owner = "skvadrik"; + repo = "re2c"; + rev = version; + sha256 = "0grx7nl9fwcn880v5ssjljhcb9c5p2a6xpwil7zxpmv0rwnr3yqi"; + }; + nativeBuildInputs = [ autoreconfHook ]; + preCheck = '' + patchShebangs run_tests.sh + ''; + }; + + py-yajl = python27Packages.buildPythonPackage rec { + pname = "oil-pyyajl-unstable"; + version = "2019-12-05"; + src = fetchFromGitHub { + owner = "oilshell"; + repo = "py-yajl"; + rev = "eb561e9aea6e88095d66abcc3990f2ee1f5339df"; + sha256 = "17hcgb7r7cy8r1pwbdh8di0nvykdswlqj73c85k6z8m0filj3hbh"; + fetchSubmodules = true; + }; + # just for submodule IIRC + nativeBuildInputs = [ git ]; + }; + + # resholve's primary dependency is this developer build of the oil shell. + oildev = python27Packages.buildPythonPackage rec { + pname = "oildev-unstable"; + version = "2020-03-31"; + + src = fetchFromGitHub { + owner = "oilshell"; + repo = "oil"; + rev = "ea80cdad7ae1152a25bd2a30b87fe3c2ad32394a"; + sha256 = "0pxn0f8qbdman4gppx93zwml7s5byqfw560n079v68qjgzh2brq2"; + + /* + It's not critical to drop most of these; the primary target is + the vendored fork of Python-2.7.13, which is ~ 55M and over 3200 + files, dozens of which get interpreter script patches in fixup. + */ + extraPostFetch = '' + rm -rf Python-2.7.13 benchmarks metrics py-yajl rfc gold web testdata services demo devtools cpp + ''; + }; + + # TODO: not sure why I'm having to set this for nix-build... + # can anyone tell if I'm doing something wrong? + SOURCE_DATE_EPOCH = 315532800; + + # These aren't, strictly speaking, nix/nixpkgs specific, but I've + # had hell upstreaming them. Pulling from resholve source and + # passing in from resholve.nix + patches = oilPatches; + + buildInputs = [ readline cmark py-yajl ]; + + nativeBuildInputs = [ re2c file makeWrapper ]; + + propagatedBuildInputs = with python27Packages; [ six typing ]; + + doCheck = true; + + preBuild = '' + build/dev.sh all + ''; + + postPatch = '' + patchShebangs asdl build core doctools frontend native oil_lang + ''; + + _NIX_SHELL_LIBCMARK = "${cmark}/lib/libcmark${stdenv.hostPlatform.extensions.sharedLibrary}"; + + # See earlier note on glibcLocales + LOCALE_ARCHIVE = stdenv.lib.optionalString (stdenv.buildPlatform.libc == "glibc") "${glibcLocales}/lib/locale/locale-archive"; + + meta = { + description = "A new unix shell"; + homepage = "https://www.oilshell.org/"; + license = with stdenv.lib.licenses; [ + psfl # Includes a portion of the python interpreter and standard library + asl20 # Licence for Oil itself + ]; + }; + }; +} diff --git a/pkgs/development/misc/resholve/resholve-package.nix b/pkgs/development/misc/resholve/resholve-package.nix new file mode 100644 index 000000000000..cc971196a4f8 --- /dev/null +++ b/pkgs/development/misc/resholve/resholve-package.nix @@ -0,0 +1,97 @@ +{ stdenv, lib, resholve }: + +{ pname +, src +, version +, passthru ? { } +, solutions +, ... +}@attrs: +let + inherit stdenv; + /* These functions break up the work of partially validating the + * 'solutions' attrset and massaging it into env/cli args. + * + * Note: some of the left-most args do not *have* to be passed as + * deep as they are, but I've done so to provide more error context + */ + + # for brevity / line length + spaces = l: builtins.concatStringsSep " " l; + semicolons = l: builtins.concatStringsSep ";" l; + + /* Throw a fit with dotted attr path context */ + nope = path: msg: + throw "${builtins.concatStringsSep "." path}: ${msg}"; + + /* Special-case directive value representations by type */ + makeDirective = solution: env: name: val: + if builtins.isInt val then builtins.toString val + else if builtins.isString val then name + else if true == val then name + else if false == val then "" # omit! + else if null == val then "" # omit! + else if builtins.isList val then "${name}:${semicolons val}" + else nope [ solution env name ] "unexpected type: ${builtins.typeOf val}"; + + /* Build fake/fix/keep directives from Nix types */ + makeDirectives = solution: env: val: + lib.mapAttrsToList (makeDirective solution env) val; + + /* Special-case value representation by type/name */ + makeEnvVal = solution: env: val: + if env == "inputs" then lib.makeBinPath val + else if builtins.isString val then val + else if builtins.isList val then spaces val + else if builtins.isAttrs val then spaces (makeDirectives solution env val) + else nope [ solution env ] "unexpected type: ${builtins.typeOf val}"; + + /* Shell-format each env value */ + shellEnv = solution: env: value: + lib.escapeShellArg (makeEnvVal solution env value); + + /* Build a single ENV=val pair */ + makeEnv = solution: env: value: + "RESHOLVE_${lib.toUpper env}=${shellEnv solution env value}"; + + /* Discard attrs claimed by makeArgs */ + removeCliArgs = value: + removeAttrs value [ "scripts" "flags" ]; + + /* Verify required arguments are present */ + validateSolution = { scripts, inputs, interpreter, ... }: true; + + /* Pull out specific solution keys to build ENV=val pairs */ + makeEnvs = solution: value: + spaces (lib.mapAttrsToList (makeEnv solution) (removeCliArgs value)); + + /* Pull out specific solution keys to build CLI argstring */ + makeArgs = { flags ? [ ], scripts, ... }: + spaces (flags ++ scripts); + + /* Build a single resholve invocation */ + makeInvocation = solution: value: + if validateSolution value then + "${makeEnvs solution value} resholve --overwrite ${makeArgs value}" + else throw "invalid solution"; # shouldn't trigger for now + + /* Build resholve invocation for each solution. */ + makeCommands = solutions: + lib.mapAttrsToList makeInvocation solutions; + + self = (stdenv.mkDerivation ((removeAttrs attrs [ "solutions" ]) + // { + inherit pname version src; + buildInputs = [ resholve ]; + + # enable below for verbose debug info if needed + # supports default python.logging levels + # LOGLEVEL="INFO"; + preFixup = '' + pushd "$out" + ${builtins.concatStringsSep "\n" (makeCommands solutions)} + popd + ''; + })); +in +lib.extendDerivation true passthru self diff --git a/pkgs/development/misc/resholve/resholve.nix b/pkgs/development/misc/resholve/resholve.nix new file mode 100644 index 000000000000..06561e05dd90 --- /dev/null +++ b/pkgs/development/misc/resholve/resholve.nix @@ -0,0 +1,74 @@ +{ lib, stdenv +, callPackage +, python27Packages +, installShellFiles +, fetchFromGitHub +, file +, findutils +, gettext +, bats +, bash +, doCheck ? true +}: +let + version = "0.4.0"; + rSrc = fetchFromGitHub { + owner = "abathur"; + repo = "resholve"; + rev = "v${version}"; + hash = "sha256-wfxcX3wMZqoi5bWjXYRa21UDDJmTDfE+21p4mL2IJog="; + }; + deps = callPackage ./deps.nix { + /* + resholve needs to patch Oil, but trying to avoid adding + them all *to* nixpkgs, since they aren't specific to + nix/nixpkgs. + */ + oilPatches = [ + "${rSrc}/0001-add_setup_py.patch" + "${rSrc}/0002-add_MANIFEST_in.patch" + "${rSrc}/0003-fix_codegen_shebang.patch" + "${rSrc}/0004-disable-internal-py-yajl-for-nix-built.patch" + ]; + }; +in +python27Packages.buildPythonApplication { + pname = "resholve"; + inherit version; + src = rSrc; + format = "other"; + + nativeBuildInputs = [ installShellFiles ]; + + propagatedBuildInputs = [ deps.oildev python27Packages.ConfigArgParse ]; + + patchPhase = '' + for file in resholve; do + substituteInPlace $file --subst-var-by version ${version} + done + ''; + + installPhase = '' + install -Dm755 resholve $out/bin/resholve + installManPage resholve.1 + ''; + + inherit doCheck; + checkInputs = [ bats ]; + RESHOLVE_PATH = "${stdenv.lib.makeBinPath [ file findutils gettext ]}"; + + checkPhase = '' + # explicit interpreter for test suite + export INTERP="${bash}/bin/bash" PATH="$out/bin:$PATH" + patchShebangs . + ./test.sh + ''; + + meta = with lib; { + description = "Resolve external shell-script dependencies"; + homepage = "https://github.com/abathur/resholve"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ abathur ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/misc/rpiboot/unstable.nix b/pkgs/development/misc/rpiboot/unstable.nix index f12f5a845f17..d0cb663fb74b 100644 --- a/pkgs/development/misc/rpiboot/unstable.nix +++ b/pkgs/development/misc/rpiboot/unstable.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libusb1 }: +{ lib, stdenv, fetchFromGitHub, libusb1 }: stdenv.mkDerivation { pname = "rpiboot"; @@ -24,7 +24,7 @@ stdenv.mkDerivation { cp -r msd $out/share/rpiboot ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/raspberrypi/usbboot"; description = "Utility to boot a Raspberry Pi CM/CM3/Zero over USB"; license = licenses.asl20; diff --git a/pkgs/development/misc/stm32/betaflight/default.nix b/pkgs/development/misc/stm32/betaflight/default.nix index dee5f51b290d..486ca04d36a5 100644 --- a/pkgs/development/misc/stm32/betaflight/default.nix +++ b/pkgs/development/misc/stm32/betaflight/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , gcc-arm-embedded, binutils-arm-embedded, python2 , skipTargets ? [ # These targets do not build, for the reasons listed, along with the last version checked. @@ -57,7 +57,7 @@ in stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Flight controller software (firmware) used to fly multi-rotor craft and fixed wing craft"; homepage = "https://github.com/betaflight/betaflight"; license = licenses.gpl3; diff --git a/pkgs/development/misc/stm32/inav/default.nix b/pkgs/development/misc/stm32/inav/default.nix index 8ff8b45f06d4..c7e59a5d27ea 100644 --- a/pkgs/development/misc/stm32/inav/default.nix +++ b/pkgs/development/misc/stm32/inav/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , gcc-arm-embedded, binutils-arm-embedded, ruby }: @@ -49,7 +49,7 @@ in stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Navigation-enabled flight control software"; homepage = "https://inavflight.github.io"; license = licenses.gpl3; diff --git a/pkgs/development/misc/yelp-tools/default.nix b/pkgs/development/misc/yelp-tools/default.nix index 19e345b3c2fd..9e2d406303c8 100644 --- a/pkgs/development/misc/yelp-tools/default.nix +++ b/pkgs/development/misc/yelp-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libxml2, libxslt, itstool, gnome3, pkgconfig }: +{ lib, stdenv, fetchurl, libxml2, libxslt, itstool, gnome3, pkgconfig }: stdenv.mkDerivation rec { pname = "yelp-tools"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://wiki.gnome.org/Apps/Yelp/Tools"; description = "Small programs that help you create, edit, manage, and publish your Mallard or DocBook documentation"; maintainers = with maintainers; [ domenkozar ]; diff --git a/pkgs/development/mobile/abootimg/default.nix b/pkgs/development/mobile/abootimg/default.nix index 21d24004645c..d2e43d106081 100644 --- a/pkgs/development/mobile/abootimg/default.nix +++ b/pkgs/development/mobile/abootimg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, coreutils, cpio, findutils, gzip, makeWrapper, util-linux }: +{ lib, stdenv, fetchFromGitHub, coreutils, cpio, findutils, gzip, makeWrapper, util-linux }: let version = "0.6"; @@ -34,7 +34,7 @@ stdenv.mkDerivation { wrapProgram $out/bin/abootimg-unpack-initrd --prefix PATH : ${stdenv.lib.makeBinPath [ cpio gzip ]} ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/ggrandou/abootimg"; description = "Manipulate Android Boot Images"; license = licenses.gpl2; diff --git a/pkgs/development/mobile/adb-sync/default.nix b/pkgs/development/mobile/adb-sync/default.nix index 98f69ed88b16..fc37eefc2121 100644 --- a/pkgs/development/mobile/adb-sync/default.nix +++ b/pkgs/development/mobile/adb-sync/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python3, platform-tools, makeWrapper +{ lib, stdenv, fetchFromGitHub, python3, platform-tools, makeWrapper , socat, go-mtpfs, adbfs-rootless }: @@ -32,7 +32,7 @@ stdenv.mkDerivation { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A tool to synchronise files between a PC and an Android devices using ADB (Android Debug Bridge)"; homepage = "https://github.com/google/adb-sync"; license = licenses.asl20; diff --git a/pkgs/development/mobile/adbfs-rootless/default.nix b/pkgs/development/mobile/adbfs-rootless/default.nix index 2033fa78ae58..f562adb1dd05 100644 --- a/pkgs/development/mobile/adbfs-rootless/default.nix +++ b/pkgs/development/mobile/adbfs-rootless/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, fuse, adb }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, pkgconfig, fuse, adb }: stdenv.mkDerivation rec { pname = "adbfs-rootless"; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { install -D adbfs $out/bin/adbfs ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Mount Android phones on Linux with adb, no root required"; inherit (src.meta) homepage; license = licenses.bsd3; diff --git a/pkgs/development/mobile/androidenv/.gitignore b/pkgs/development/mobile/androidenv/.gitignore new file mode 100644 index 000000000000..c15750760a44 --- /dev/null +++ b/pkgs/development/mobile/androidenv/.gitignore @@ -0,0 +1,2 @@ +/xml +local.properties diff --git a/pkgs/development/mobile/androidenv/cmake.nix b/pkgs/development/mobile/androidenv/cmake.nix index 1aeef467642c..ade111cf3f9e 100644 --- a/pkgs/development/mobile/androidenv/cmake.nix +++ b/pkgs/development/mobile/androidenv/cmake.nix @@ -2,8 +2,8 @@ deployAndroidPackage { inherit package os; - buildInputs = [ autoPatchelfHook ] - ++ lib.optional (os == "linux") [ pkgs.stdenv.glibc pkgs.stdenv.cc.cc ]; + nativeBuildInputs = [ autoPatchelfHook ]; + buildInputs = lib.optional (os == "linux") [ pkgs.stdenv.glibc pkgs.stdenv.cc.cc pkgs.ncurses5 ]; patchInstructions = lib.optionalString (os == "linux") '' autoPatchelf $packageBaseDir/bin ''; diff --git a/pkgs/development/mobile/androidenv/compose-android-packages.nix b/pkgs/development/mobile/androidenv/compose-android-packages.nix index 794de2276645..fd78fa9ac0f8 100644 --- a/pkgs/development/mobile/androidenv/compose-android-packages.nix +++ b/pkgs/development/mobile/androidenv/compose-android-packages.nix @@ -1,23 +1,26 @@ -{requireFile, autoPatchelfHook, pkgs, pkgsHostHost, pkgs_i686, licenseAccepted ? false}: +{ requireFile, autoPatchelfHook, pkgs, pkgsHostHost, pkgs_i686 +, licenseAccepted ? false +}: -{ toolsVersion ? "25.2.5" -, platformToolsVersion ? "29.0.6" -, buildToolsVersions ? [ "28.0.3" ] +{ toolsVersion ? "26.1.1" +, platformToolsVersion ? "30.0.5" +, buildToolsVersions ? [ "30.0.3" ] , includeEmulator ? false -, emulatorVersion ? "30.0.3" +, emulatorVersion ? "30.3.4" , platformVersions ? [] , includeSources ? false -, includeDocs ? false , includeSystemImages ? false -, systemImageTypes ? [ "default" ] +, systemImageTypes ? [ "google_apis_playstore" ] , abiVersions ? [ "armeabi-v7a" ] -, lldbVersions ? [ ] , cmakeVersions ? [ ] , includeNDK ? false -, ndkVersion ? "21.0.6113669" +, ndkVersion ? "22.0.7026061" , useGoogleAPIs ? false , useGoogleTVAddOns ? false , includeExtras ? [] +, repoJson ? ./repo.json +, repoXmls ? null +, extraLicenses ? [] }: let @@ -28,48 +31,86 @@ let else if stdenv.system == "x86_64-darwin" then "macosx" else throw "No Android SDK tarballs are available for system architecture: ${stdenv.system}"; - # Generated Nix packages - packages = import ./generated/packages.nix { - inherit fetchurl; + # Uses mkrepo.rb to create a repo spec. + mkRepoJson = { packages ? [], images ? [], addons ? [] }: let + mkRepoRuby = (pkgs.ruby.withPackages (pkgs: with pkgs; [ slop nokogiri ])); + mkRepoRubyArguments = lib.lists.flatten [ + (builtins.map (package: ["--packages" "${package}"]) packages) + (builtins.map (image: ["--images" "${image}"]) images) + (builtins.map (addon: ["--addons" "${addon}"]) addons) + ]; + in + stdenv.mkDerivation { + name = "androidenv-repo-json"; + buildInputs = [ mkRepoRuby ]; + preferLocalBuild = true; + unpackPhase = "true"; + buildPhase = '' + ruby ${./mkrepo.rb} ${lib.escapeShellArgs mkRepoRubyArguments} > repo.json + ''; + installPhase = '' + mv repo.json $out + ''; }; - # Generated system images - system-images-packages-android = import ./generated/system-images-android.nix { - inherit fetchurl; + # Reads the repo JSON. If repoXmls is provided, will build a repo JSON into the Nix store. + repo = if repoXmls != null then + let + repoXmlSpec = { + packages = repoXmls.packages or []; + images = repoXmls.images or []; + addons = repoXmls.addons or []; + }; + in + builtins.fromJSON (builtins.readFile "${mkRepoJson repoXmlSpec}") + else + builtins.fromJSON (builtins.readFile repoJson); + + # Converts all 'archives' keys in a repo spec to fetchurl calls. + fetchArchives = attrSet: + lib.attrsets.mapAttrsRecursive + (path: value: + if (builtins.elemAt path ((builtins.length path) - 1)) == "archives" then + (builtins.listToAttrs + (builtins.map + (archive: lib.attrsets.nameValuePair archive.os (fetchurl { inherit (archive) url sha1; })) value)) + else value + ) + attrSet; + + # Converts the repo attrset into fetch calls + packages = fetchArchives repo.packages; + system-images-packages = fetchArchives repo.images; + addons = { + addons = fetchArchives repo.addons; + extras = fetchArchives repo.extras; }; - system-images-packages-android-tv = import ./generated/system-images-android-tv.nix { - inherit fetchurl; - }; + # Converts a license name to a list of license texts. + mkLicenses = licenseName: repo.licenses.${licenseName}; - system-images-packages-android-wear = import ./generated/system-images-android-wear.nix { - inherit fetchurl; - }; + # Converts a list of license names to a flattened list of license texts. + # Just used for displaying licenses. + mkLicenseTexts = licenseNames: + lib.lists.flatten + (builtins.map + (licenseName: + builtins.map + (licenseText: "--- ${licenseName} ---\n${licenseText}") + (mkLicenses licenseName)) + licenseNames); - system-images-packages-android-wear-cn = import ./generated/system-images-android-wear-cn.nix { - inherit fetchurl; - }; + # Converts a license name to a list of license hashes. + mkLicenseHashes = licenseName: + builtins.map + (licenseText: builtins.hashString "sha1" licenseText) + (mkLicenses licenseName); - system-images-packages-google_apis = import ./generated/system-images-google_apis.nix { - inherit fetchurl; - }; - - system-images-packages-google_apis_playstore = import ./generated/system-images-google_apis_playstore.nix { - inherit fetchurl; - }; - - system-images-packages = - lib.recursiveUpdate - system-images-packages-android - (lib.recursiveUpdate system-images-packages-android-tv - (lib.recursiveUpdate system-images-packages-android-wear - (lib.recursiveUpdate system-images-packages-android-wear-cn - (lib.recursiveUpdate system-images-packages-google_apis system-images-packages-google_apis_playstore)))); - - # Generated addons - addons = import ./generated/addons.nix { - inherit fetchurl; - }; + # The list of all license names we're accepting. Put android-sdk-license there + # by default. + licenseNames = lib.lists.unique ([ + "android-sdk-license" + ] ++ extraLicenses); in rec { deployAndroidPackage = import ./deploy-androidpackage.nix { @@ -88,14 +129,9 @@ rec { } ) buildToolsVersions; - docs = deployAndroidPackage { - inherit os; - package = packages.docs."1"; - }; - emulator = import ./emulator.nix { inherit deployAndroidPackage os autoPatchelfHook makeWrapper pkgs pkgs_i686 lib; - package = packages.emulator.${emulatorVersion}.${os}; + package = packages.emulator.${emulatorVersion}; }; platforms = map (version: @@ -115,27 +151,22 @@ rec { system-images = lib.flatten (map (apiVersion: map (type: map (abiVersion: - deployAndroidPackage { - inherit os; - package = system-images-packages.${apiVersion}.${type}.${abiVersion}; - # Patch 'google_apis' system images so they're recognized by the sdk. - # Without this, `android list targets` shows 'Tag/ABIs : no ABIs' instead - # of 'Tag/ABIs : google_apis*/*' and the emulator fails with an ABI-related error. - patchInstructions = lib.optionalString (lib.hasPrefix "google_apis" type) '' - sed -i '/^Addon.Vendor/d' source.properties - ''; - } + if lib.hasAttrByPath [apiVersion type abiVersion] system-images-packages then + deployAndroidPackage { + inherit os; + package = system-images-packages.${apiVersion}.${type}.${abiVersion}; + # Patch 'google_apis' system images so they're recognized by the sdk. + # Without this, `android list targets` shows 'Tag/ABIs : no ABIs' instead + # of 'Tag/ABIs : google_apis*/*' and the emulator fails with an ABI-related error. + patchInstructions = lib.optionalString (lib.hasPrefix "google_apis" type) '' + sed -i '/^Addon.Vendor/d' source.properties + ''; + } + else [] ) abiVersions ) systemImageTypes ) platformVersions); - lldb = map (version: - import ./lldb.nix { - inherit deployAndroidPackage os autoPatchelfHook pkgs lib; - package = packages.lldb.${version}; - } - ) lldbVersions; - cmake = map (version: import ./cmake.nix { inherit deployAndroidPackage os autoPatchelfHook pkgs lib; @@ -187,12 +218,15 @@ rec { ''; # */ # This derivation deploys the tools package and symlinks all the desired - # plugins that we want to use. - + # plugins that we want to use. If the license isn't accepted, prints all the licenses + # requested and throws. androidsdk = if !licenseAccepted then throw '' - You must accept the Android Software Development Kit License Agreement at - https://developer.android.com/studio/terms - by setting nixpkgs config option 'android_sdk.accept_license = true;' + ${builtins.concatStringsSep "\n\n" (mkLicenseTexts licenseNames)} + + You must accept the following licenses: + ${lib.concatMapStringsSep "\n" (str: " - ${str}") licenseNames} + + by setting nixpkgs config option 'android_sdk.accept_license = true;'. '' else import ./tools.nix { inherit deployAndroidPackage requireFile packages toolsVersion autoPatchelfHook makeWrapper os pkgs pkgs_i686 lib; @@ -202,10 +236,8 @@ rec { ${linkPlugin { name = "platform-tools"; plugin = platform-tools; }} ${linkPlugins { name = "build-tools"; plugins = build-tools; }} ${linkPlugin { name = "emulator"; plugin = emulator; check = includeEmulator; }} - ${linkPlugin { name = "docs"; plugin = docs; check = includeDocs; }} ${linkPlugins { name = "platforms"; plugins = platforms; }} ${linkPlatformPlugins { name = "sources"; plugins = sources; check = includeSources; }} - ${linkPlugins { name = "lldb"; plugins = lldb; }} ${linkPlugins { name = "cmake"; plugins = cmake; }} ${linkPlugin { name = "ndk-bundle"; plugin = ndk-bundle; check = includeNDK; }} @@ -253,6 +285,17 @@ rec { do ln -s $i $out/bin done + + # Write licenses + mkdir -p licenses + ${lib.concatMapStrings (licenseName: + let + licenseHashes = builtins.concatStringsSep "\n" (mkLicenseHashes licenseName); + licenseHashFile = pkgs.writeText "androidenv-${licenseName}" licenseHashes; + in + '' + ln -s ${licenseHashFile} licenses/${licenseName} + '') licenseNames} ''; }; } diff --git a/pkgs/development/mobile/androidenv/convertaddons.xsl b/pkgs/development/mobile/androidenv/convertaddons.xsl deleted file mode 100644 index 20f007eca048..000000000000 --- a/pkgs/development/mobile/androidenv/convertaddons.xsl +++ /dev/null @@ -1,128 +0,0 @@ - - - - - - - - - - - - - - - https://dl.google.com/android/repository/ - - - - - - -{fetchurl}: - -{ - addons = { - - - ""."" = { - name = ""; - path = ""; - revision = ""; - displayName = ""; - archives = { - - all = fetchurl { - url = ""; - sha1 = ""; - }; - - - = fetchurl { - url = ""; - sha1 = ""; - }; - - }; - }; - - - - - ""."" = { - name = ""; - path = "add-ons/addon-google_apis-google-25"; - revision = ""; - displayName = ""; - archives = { - - all = fetchurl { - url = ""; - sha1 = ""; - }; - - - = fetchurl { - url = ""; - sha1 = ""; - }; - - }; - }; - - }; - - extras = { - - - - - - - - - - - - . - - - - . - - - - -rc - - - - - "" = { - name = ""; - path = ""; - revision = ""; - displayName = ""; - archives = { - - all = fetchurl { - url = ""; - sha1 = ""; - }; - - - = fetchurl { - url = ""; - sha1 = ""; - }; - - }; - }; - - }; -} - - - diff --git a/pkgs/development/mobile/androidenv/convertpackages.xsl b/pkgs/development/mobile/androidenv/convertpackages.xsl deleted file mode 100644 index edc9074a8984..000000000000 --- a/pkgs/development/mobile/androidenv/convertpackages.xsl +++ /dev/null @@ -1,116 +0,0 @@ - - - - - - - - - - - - - - - https://dl.google.com/android/repository/ - - - - - - -{fetchurl}: - -{ - - - - - - - - - - - - - - - - - - - - - - - - - - - . - - - - . - - - - -rc - - - - - - - - - - - - - - - - - - - - - - - - ""."". = { - - - ""."" = { - - - name = ""; - path = ""; - revision = ""; - displayName = ""; - archives = { - - all = fetchurl { - url = !"; - sha1 = ""; - }; - - - = fetchurl { - url = ""; - sha1 = ""; - }; - - }; - }; - -} - - diff --git a/pkgs/development/mobile/androidenv/convertsystemimages.xsl b/pkgs/development/mobile/androidenv/convertsystemimages.xsl deleted file mode 100644 index 947950badb4b..000000000000 --- a/pkgs/development/mobile/androidenv/convertsystemimages.xsl +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - - - - - - - - - - - https://dl.google.com/android/repository/sys-img// - - - - - - -- - - - - -- - - - - " - - ". - - ." - - " - - - - " - - ". - - ." - - " - - - -{fetchurl}: - -{ - - - - - - = { - name = "system-image-"; - path = ""; - revision = ""; - displayName = ""; - archives.all = fetchurl { - - url = ""; - sha1 = ""; - - }; - }; - - -} - - diff --git a/pkgs/development/mobile/androidenv/examples/shell.nix b/pkgs/development/mobile/androidenv/examples/shell.nix new file mode 100644 index 000000000000..aa5337c92988 --- /dev/null +++ b/pkgs/development/mobile/androidenv/examples/shell.nix @@ -0,0 +1,145 @@ +{ + # If you copy this example out of nixpkgs, use these lines instead of the next. + # This example pins nixpkgs: https://nix.dev/tutorials/towards-reproducibility-pinning-nixpkgs.html + /*nixpkgsSource ? (builtins.fetchTarball { + name = "nixpkgs-20.09"; + url = https://github.com/NixOS/nixpkgs/archive/20.09.tar.gz; + sha256 = "1wg61h4gndm3vcprdcg7rc4s1v3jkm5xd7lw8r2f67w502y94gcy"; + }), + pkgs ? import nixpkgsSource {}, + pkgs_i686 ? import nixpkgsSource { system = "i686-linux"; },*/ + + # If you want to use the in-tree version of nixpkgs: + pkgs ? import ../../../../.. {}, + pkgs_i686 ? import ../../../../.. { system = "i686-linux"; }, + + config ? pkgs.config +}: + +# Copy this file to your Android project. +let + # Declaration of versions for everything. This is useful since these + # versions may be used in multiple places in this Nix expression. + android = { + versions = { + tools = "26.1.1"; + platformTools = "30.0.5"; + buildTools = "30.0.3"; + ndk = "22.0.7026061"; + + # or the LTS NDK: + # ndk = "21.3.6528147"; + cmake = "3.10.2"; + emulator = "30.3.4"; + }; + + platforms = ["23" "24" "25" "26" "27" "28" "29" "30"]; + abis = ["armeabi-v7a" "arm64-v8a"]; + extras = ["extras;google;gcm"]; + }; + + # If you copy this example out of nixpkgs, something like this will work: + /*androidEnvNixpkgs = fetchTarball { + name = "androidenv"; + url = https://github.com/NixOS/nixpkgs/archive/.tar.gz; + sha256 = ""; + }; + + androidEnv = pkgs.callPackage "${androidEnvNixpkgs}/pkgs/development/mobile/androidenv" { + inherit config pkgs pkgs_i686; + licenseAccepted = true; + };*/ + + # Otherwise, just use the in-tree androidenv: + androidEnv = pkgs.callPackage ./.. { + inherit config pkgs pkgs_i686; + licenseAccepted = true; + }; + + androidComposition = androidEnv.composeAndroidPackages { + toolsVersion = android.versions.tools; + platformToolsVersion = android.versions.platformTools; + buildToolsVersions = [android.versions.buildTools]; + platformVersions = android.platforms; + abiVersions = android.abis; + + includeSources = true; + includeSystemImages = true; + includeEmulator = true; + emulatorVersion = android.versions.emulator; + + includeNDK = true; + ndkVersion = android.versions.ndk; + cmakeVersions = [android.versions.cmake]; + + useGoogleAPIs = true; + includeExtras = android.extras; + + # If you want to use a custom repo JSON: + # repoJson = ../repo.json; + + # If you want to use custom repo XMLs: + /*repoXmls = { + packages = [ ../xml/repository2-1.xml ]; + images = [ + ../xml/android-sys-img2-1.xml + ../xml/android-tv-sys-img2-1.xml + ../xml/android-wear-sys-img2-1.xml + ../xml/android-wear-cn-sys-img2-1.xml + ../xml/google_apis-sys-img2-1.xml + ../xml/google_apis_playstore-sys-img2-1.xml + ]; + addons = [ ../xml/addon2-1.xml ]; + };*/ + + # Accepting more licenses declaratively: + extraLicenses = [ + # Already accepted for you with the global accept_license = true or + # licenseAccepted = true on androidenv. + # "android-sdk-license" + + # These aren't, but are useful for more uncommon setups. + "android-sdk-preview-license" + "android-googletv-license" + "android-sdk-arm-dbt-license" + "google-gdk-license" + "intel-android-extra-license" + "intel-android-sysimage-license" + "mips-android-sysimage-license" + ]; + }; + + androidSdk = androidComposition.androidsdk; + platformTools = androidComposition.platform-tools; + jdk = pkgs.jdk; +in +pkgs.mkShell rec { + name = "androidenv-demo"; + buildInputs = [ androidSdk platformTools jdk pkgs.android-studio ]; + + LANG = "C.UTF-8"; + LC_ALL = "C.UTF-8"; + JAVA_HOME = jdk.home; + + # Note: ANDROID_HOME is deprecated. Use ANDROID_SDK_ROOT. + ANDROID_SDK_ROOT = "${androidSdk}/libexec/android-sdk"; + ANDROID_NDK_ROOT = "${ANDROID_SDK_ROOT}/ndk-bundle"; + + # Ensures that we don't have to use a FHS env by using the nix store's aapt2. + GRADLE_OPTS = "-Dorg.gradle.project.android.aapt2FromMavenOverride=${ANDROID_SDK_ROOT}/build-tools/${android.versions.buildTools}/aapt2"; + + shellHook = '' + # Add cmake to the path. + cmake_root="$(echo "$ANDROID_SDK_ROOT/cmake/${android.versions.cmake}".*/)" + export PATH="$cmake_root/bin:$PATH" + + # Write out local.properties for Android Studio. + cat < local.properties +# This file was automatically generated by nix-shell. +sdk.dir=$ANDROID_SDK_ROOT +ndk.dir=$ANDROID_NDK_ROOT +cmake.dir=$cmake_root +EOF + ''; +} + diff --git a/pkgs/development/mobile/androidenv/fetchrepo.sh b/pkgs/development/mobile/androidenv/fetchrepo.sh new file mode 100755 index 000000000000..ab5bf419c31a --- /dev/null +++ b/pkgs/development/mobile/androidenv/fetchrepo.sh @@ -0,0 +1,26 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl + +die() { + echo "$1" >&2 + exit 1 +} + +fetch() { + local url="https://dl.google.com/android/repository/$1" + echo "$url -> $2" + curl -s "$url" -o "$2" || die "Failed to fetch $url" +} + +pushd "$(dirname "$0")" &>/dev/null || exit 1 + +mkdir -p xml + +fetch repository2-1.xml xml/repository2-1.xml +for img in android android-tv android-wear android-wear-cn android-automotive google_apis google_apis_playstore +do + fetch sys-img/$img/sys-img2-1.xml xml/$img-sys-img2-1.xml +done +fetch addon2-1.xml xml/addon2-1.xml + +popd &>/dev/null diff --git a/pkgs/development/mobile/androidenv/generate.sh b/pkgs/development/mobile/androidenv/generate.sh index 895a741adffe..2c9a0a9f591b 100755 --- a/pkgs/development/mobile/androidenv/generate.sh +++ b/pkgs/development/mobile/androidenv/generate.sh @@ -1,36 +1,3 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl libxslt +#!/bin/sh -set -e - -die() { - echo "$1" >&2 - exit 1 -} - -fetch() { - local url="https://dl.google.com/android/repository/$1" - echo "$url -> $2" - curl -s "$url" -o "$2" || die "Failed to fetch $url" -} - -pushd "$(dirname "$0")" &>/dev/null || exit 1 - -mkdir -p xml - -# Convert base packages -fetch repository2-1.xml xml/repository2-1.xml -xsltproc convertpackages.xsl xml/repository2-1.xml > generated/packages.nix - -# Convert system images -for img in android android-tv android-wear android-wear-cn google_apis google_apis_playstore -do - fetch sys-img/$img/sys-img2-1.xml xml/$img-sys-img2-1.xml - xsltproc --stringparam imageType $img convertsystemimages.xsl xml/$img-sys-img2-1.xml > generated/system-images-$img.nix -done - -# Convert system addons -fetch addon2-1.xml xml/addon2-1.xml -xsltproc convertaddons.xsl xml/addon2-1.xml > generated/addons.nix - -popd &>/dev/null +./fetchrepo.sh && ./mkrepo.sh diff --git a/pkgs/development/mobile/androidenv/generated/addons.nix b/pkgs/development/mobile/androidenv/generated/addons.nix deleted file mode 100644 index 231e5b8ea22f..000000000000 --- a/pkgs/development/mobile/androidenv/generated/addons.nix +++ /dev/null @@ -1,964 +0,0 @@ - -{fetchurl}: - -{ - addons = { - - "10"."google_apis" = { - name = "google_apis"; - path = "add-ons/addon-google_apis-google-10"; - revision = "10"; - displayName = "Google APIs"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/google_apis-10_r02.zip"; - sha1 = "cc0711857c881fa7534f90cf8cc09b8fe985484d"; - }; - - }; - }; - - "11"."google_apis" = { - name = "google_apis"; - path = "add-ons/addon-google_apis-google-11"; - revision = "11"; - displayName = "Google APIs"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/google_apis-11_r01.zip"; - sha1 = "5eab5e81addee9f3576d456d205208314b5146a5"; - }; - - }; - }; - - "12"."google_apis" = { - name = "google_apis"; - path = "add-ons/addon-google_apis-google-12"; - revision = "12"; - displayName = "Google APIs"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/google_apis-12_r01.zip"; - sha1 = "e9999f4fa978812174dfeceec0721c793a636e5d"; - }; - - }; - }; - - "13"."google_apis" = { - name = "google_apis"; - path = "add-ons/addon-google_apis-google-13"; - revision = "13"; - displayName = "Google APIs"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/google_apis-13_r01.zip"; - sha1 = "3b153edd211c27dc736c893c658418a4f9041417"; - }; - - }; - }; - - "14"."google_apis" = { - name = "google_apis"; - path = "add-ons/addon-google_apis-google-14"; - revision = "14"; - displayName = "Google APIs"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/google_apis-14_r02.zip"; - sha1 = "f8eb4d96ad0492b4c0db2d7e4f1a1a3836664d39"; - }; - - }; - }; - - "15"."google_apis" = { - name = "google_apis"; - path = "add-ons/addon-google_apis-google-15"; - revision = "15"; - displayName = "Google APIs"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/google_apis-15_r03.zip"; - sha1 = "d0d2bf26805eb271693570a1aaec33e7dc3f45e9"; - }; - - }; - }; - - "16"."google_apis" = { - name = "google_apis"; - path = "add-ons/addon-google_apis-google-16"; - revision = "16"; - displayName = "Google APIs"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/google_apis-16_r04.zip"; - sha1 = "ee6acf1b01020bfa8a8e24725dbc4478bee5e792"; - }; - - }; - }; - - "17"."google_apis" = { - name = "google_apis"; - path = "add-ons/addon-google_apis-google-17"; - revision = "17"; - displayName = "Google APIs"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/google_apis-17_r04.zip"; - sha1 = "a076be0677f38df8ca5536b44dfb411a0c808c4f"; - }; - - }; - }; - - "18"."google_apis" = { - name = "google_apis"; - path = "add-ons/addon-google_apis-google-18"; - revision = "18"; - displayName = "Google APIs"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/google_apis-18_r04.zip"; - sha1 = "6109603409debdd40854d4d4a92eaf8481462c8b"; - }; - - }; - }; - - "19"."google_apis" = { - name = "google_apis"; - path = "add-ons/addon-google_apis-google-19"; - revision = "19"; - displayName = "Google APIs"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/google_apis-19_r20.zip"; - sha1 = "5b933abe830b2f25b4c0f171d45e9e0651e56311"; - }; - - }; - }; - - "21"."google_apis" = { - name = "google_apis"; - path = "add-ons/addon-google_apis-google-21"; - revision = "21"; - displayName = "Google APIs"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/google_apis-21_r01.zip"; - sha1 = "66a754efb24e9bb07cc51648426443c7586c9d4a"; - }; - - }; - }; - - "22"."google_apis" = { - name = "google_apis"; - path = "add-ons/addon-google_apis-google-22"; - revision = "22"; - displayName = "Google APIs"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/google_apis-22_r01.zip"; - sha1 = "5def0f42160cba8acff51b9c0c7e8be313de84f5"; - }; - - }; - }; - - "23"."google_apis" = { - name = "google_apis"; - path = "add-ons/addon-google_apis-google-23"; - revision = "23"; - displayName = "Google APIs"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/google_apis-23_r01.zip"; - sha1 = "04c5cc1a7c88967250ebba9561d81e24104167db"; - }; - - }; - }; - - "24"."google_apis" = { - name = "google_apis"; - path = "add-ons/addon-google_apis-google-24"; - revision = "24"; - displayName = "Google APIs"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/google_apis-24_r1.zip"; - sha1 = "31361c2868f27343ee917fbd259c1463821b6145"; - }; - - }; - }; - - "3"."google_apis" = { - name = "google_apis"; - path = "add-ons/addon-google_apis-google-3"; - revision = "3"; - displayName = "Google APIs"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/google_apis-3-r03.zip"; - sha1 = "1f92abf3a76be66ae8032257fc7620acbd2b2e3a"; - }; - - }; - }; - - "4"."google_apis" = { - name = "google_apis"; - path = "add-ons/addon-google_apis-google-4"; - revision = "4"; - displayName = "Google APIs"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/google_apis-4_r02.zip"; - sha1 = "9b6e86d8568558de4d606a7debc4f6049608dbd0"; - }; - - }; - }; - - "5"."google_apis" = { - name = "google_apis"; - path = "add-ons/addon-google_apis-google-5"; - revision = "5"; - displayName = "Google APIs"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/google_apis-5_r01.zip"; - sha1 = "46eaeb56b645ee7ffa24ede8fa17f3df70db0503"; - }; - - }; - }; - - "6"."google_apis" = { - name = "google_apis"; - path = "add-ons/addon-google_apis-google-6"; - revision = "6"; - displayName = "Google APIs"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/google_apis-6_r01.zip"; - sha1 = "5ff545d96e031e09580a6cf55713015c7d4936b2"; - }; - - }; - }; - - "7"."google_apis" = { - name = "google_apis"; - path = "add-ons/addon-google_apis-google-7"; - revision = "7"; - displayName = "Google APIs"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/google_apis-7_r01.zip"; - sha1 = "2e7f91e0fe34fef7f58aeced973c6ae52361b5ac"; - }; - - }; - }; - - "8"."google_apis" = { - name = "google_apis"; - path = "add-ons/addon-google_apis-google-8"; - revision = "8"; - displayName = "Google APIs"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/google_apis-8_r02.zip"; - sha1 = "3079958e7ec87222cac1e6b27bc471b27bf2c352"; - }; - - }; - }; - - "9"."google_apis" = { - name = "google_apis"; - path = "add-ons/addon-google_apis-google-9"; - revision = "9"; - displayName = "Google APIs"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/google_apis-9_r02.zip"; - sha1 = "78664645a1e9accea4430814f8694291a7f1ea5d"; - }; - - }; - }; - - "12"."google_tv_addon" = { - name = "google_tv_addon"; - path = "add-ons/addon-google_tv_addon-google-12"; - revision = "12"; - displayName = "Google TV Addon"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/google_tv-12_r02.zip"; - sha1 = "92128a12e7e8b0fb5bac59153d7779b717e7b840"; - }; - - }; - }; - - "13"."google_tv_addon" = { - name = "google_tv_addon"; - path = "add-ons/addon-google_tv_addon-google-13"; - revision = "13"; - displayName = "Google TV Addon"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/google_tv-13_r01.zip"; - sha1 = "b73f7c66011ac8180b44aa4e83b8d78c66ea9a09"; - }; - - }; - }; - - "25"."google_apis" = { - name = "google_apis"; - path = "add-ons/addon-google_apis-google-25"; - revision = "25"; - displayName = "Google APIs"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/google_apis-25_r1.zip"; - sha1 = "550e83eea9513ab11c44919ac6da54b36084a9f3"; - }; - - }; - }; - - }; - - extras = { - - - "extras;android;gapid;1" = { - name = "extras-android-gapid-1"; - path = "extras/android/gapid/1"; - revision = "1.0.3"; - displayName = "GPU Debugging tools"; - archives = { - linux = fetchurl { - url = "https://dl.google.com/android/repository/gapid_r01_linux.zip"; - sha1 = "7c9ef7544cf0aea030bcc29bd8e12c04fd53e653"; - }; - macosx = fetchurl { - url = "https://dl.google.com/android/repository/gapid_r01_osx.zip"; - sha1 = "597eb271349d890566274861eba2770a84ee4c69"; - }; - - }; - }; - - - "extras;android;gapid;3" = { - name = "extras-android-gapid-3"; - path = "extras/android/gapid/3"; - revision = "3.1.0"; - displayName = "GPU Debugging tools"; - archives = { - linux = fetchurl { - url = "https://dl.google.com/android/repository/gapid_2994895_linux.zip"; - sha1 = "e40371ba191f617e4e79bc760d0ab2948ba8cf46"; - }; - macosx = fetchurl { - url = "https://dl.google.com/android/repository/gapid_2994895_osx.zip"; - sha1 = "ad86a2350b7b9908300277bf03d41649659de384"; - }; - - }; - }; - - - "extras;android;m2repository" = { - name = "extras-android-m2repository"; - path = "extras/android/m2repository"; - revision = "47.0.0"; - displayName = "Android Support Repository"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/android_m2repository_r47.zip"; - sha1 = "a0d22beacc106a6977321f2b07d692ce4979e96a"; - }; - - }; - }; - - - "extras;google;Android_Emulator_Hypervisor_Driver" = { - name = "extras-google-Android_Emulator_Hypervisor_Driver"; - path = "extras/google/Android_Emulator_Hypervisor_Driver"; - revision = "1.4.0"; - displayName = "Android Emulator Hypervisor Driver for AMD Processors (installer)"; - archives = { - - }; - }; - - - "extras;google;admob_ads_sdk" = { - name = "extras-google-admob_ads_sdk"; - path = "extras/google/admob_ads_sdk"; - revision = "11"; - displayName = "Google AdMob Ads SDK"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/GoogleAdMobAdsSdkAndroid-6.4.1.zip"; - sha1 = "0102859d9575baa0bf4fd5eb422af2ad0fe6cb82"; - }; - - }; - }; - - - "extras;google;analytics_sdk_v2" = { - name = "extras-google-analytics_sdk_v2"; - path = "extras/google/analytics_sdk_v2"; - revision = "3"; - displayName = "Google Analytics App Tracking SDK"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/GoogleAnalyticsAndroid_2.0beta5.zip"; - sha1 = "dc14026bf0ce78315cb5dd00552607de0894de83"; - }; - - }; - }; - - - "extras;google;auto" = { - name = "extras-google-auto"; - path = "extras/google/auto"; - revision = "1.1"; - displayName = "Android Auto Desktop Head Unit emulator"; - archives = { - linux = fetchurl { - url = "https://dl.google.com/android/repository/desktop-head-unit-linux_r01.1.zip"; - sha1 = "202a6e1b3009a0eb815f8c672d2d5b3717de6169"; - }; - macosx = fetchurl { - url = "https://dl.google.com/android/repository/desktop-head-unit-macosx_r01.1.zip"; - sha1 = "8179cbb3914493ebc5eb65b731cba061582f2e84"; - }; - - }; - }; - - - "extras;google;gcm" = { - name = "extras-google-gcm"; - path = "extras/google/gcm"; - revision = "3"; - displayName = "Google Cloud Messaging for Android Library"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/gcm_r03.zip"; - sha1 = "ad066fd0dc7fc99d8aadac09c65a3c2519fbc7bf"; - }; - - }; - }; - - - "extras;google;google_play_services" = { - name = "extras-google-google_play_services"; - path = "extras/google/google_play_services"; - revision = "49"; - displayName = "Google Play services"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/google_play_services_v16_1_rc09.zip"; - sha1 = "f95bf19634e2ab0430923247fe2c50246432d2e9"; - }; - - }; - }; - - - "extras;google;google_play_services_froyo" = { - name = "extras-google-google_play_services_froyo"; - path = "extras/google/google_play_services_froyo"; - revision = "12"; - displayName = "Google Play services for Froyo"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/google_play_services_3265130_r12.zip"; - sha1 = "92558dbc380bba3d55d0ec181167fb05ce7c79d9"; - }; - - }; - }; - - - "extras;google;instantapps" = { - name = "extras-google-instantapps"; - path = "extras/google/instantapps"; - revision = "1.9.0"; - displayName = "Google Play Instant Development SDK"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/iasdk-1.9.0-1566514721.zip"; - sha1 = "c498367dcd7db30154b3e70c4ddbb1b0ea4b8d20"; - }; - - }; - }; - - - "extras;google;m2repository" = { - name = "extras-google-m2repository"; - path = "extras/google/m2repository"; - revision = "58"; - displayName = "Google Repository"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/google_m2repository_gms_v11_3_rc05_wear_2_0_5.zip"; - sha1 = "05086add9e3a0eb1b67111108d7757a4337c3f10"; - }; - - }; - }; - - - "extras;google;market_apk_expansion" = { - name = "extras-google-market_apk_expansion"; - path = "extras/google/market_apk_expansion"; - revision = "1"; - displayName = "Google Play APK Expansion library"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/market_apk_expansion-r03.zip"; - sha1 = "5305399dc1a56814e86b8459ce24871916f78b8c"; - }; - - }; - }; - - - "extras;google;market_licensing" = { - name = "extras-google-market_licensing"; - path = "extras/google/market_licensing"; - revision = "1"; - displayName = "Google Play Licensing Library"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/market_licensing-r02.zip"; - sha1 = "355e8dc304a92a5616db235af8ee7bd554356254"; - }; - - }; - }; - - - "extras;google;simulators" = { - name = "extras-google-simulators"; - path = "extras/google/simulators"; - revision = "1"; - displayName = "Android Auto API Simulators"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/simulator_r01.zip"; - sha1 = "4fb5344e34e8faab4db18af07dace44c50db26a7"; - }; - - }; - }; - - - "extras;google;usb_driver" = { - name = "extras-google-usb_driver"; - path = "extras/google/usb_driver"; - revision = "12"; - displayName = "Google USB Driver"; - archives = { - - }; - }; - - - "extras;google;webdriver" = { - name = "extras-google-webdriver"; - path = "extras/google/webdriver"; - revision = "2"; - displayName = "Google Web Driver"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/webdriver_r02.zip"; - sha1 = "13f3a3b2670a5fc04a7342861644be9a01b07e38"; - }; - - }; - }; - - - "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0" = { - name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0"; - path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0"; - revision = "1"; - displayName = "Solver for ConstraintLayout 1.0.0"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0.zip"; - sha1 = "b621b9d5adf273bb0725948589863e60e96eeaf1"; - }; - - }; - }; - - - "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-beta1" = { - name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-beta1"; - path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-beta1"; - revision = "1"; - displayName = "Solver for ConstraintLayout 1.0.0-beta1"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-beta1.zip"; - sha1 = "042c25575e7650e96f0f5f5d1d3c54ed38eb821a"; - }; - - }; - }; - - - "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-beta2" = { - name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-beta2"; - path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-beta2"; - revision = "1"; - displayName = "Solver for ConstraintLayout 1.0.0-beta2"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-beta2.zip"; - sha1 = "28492fd42b20ae1586591ff906556d459cfdaae8"; - }; - - }; - }; - - - "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-beta3" = { - name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-beta3"; - path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-beta3"; - revision = "1"; - displayName = "Solver for ConstraintLayout 1.0.0-beta3"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-beta3.zip"; - sha1 = "268e763fa64bd217d8d830e59ce76be19aaba631"; - }; - - }; - }; - - - "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-beta4" = { - name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-beta4"; - path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-beta4"; - revision = "1"; - displayName = "Solver for ConstraintLayout 1.0.0-beta4"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-beta4.zip"; - sha1 = "2213bf37e7a2869db2635895b8e90ca6841e79d2"; - }; - - }; - }; - - - "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-beta5" = { - name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-beta5"; - path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-beta5"; - revision = "1"; - displayName = "Solver for ConstraintLayout 1.0.0-beta5"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-beta5.zip"; - sha1 = "3918cfef73e64048d0b3e048068e208b414e7e91"; - }; - - }; - }; - - - "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.1" = { - name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.1"; - path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.1"; - revision = "1"; - displayName = "Solver for ConstraintLayout 1.0.1"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.1.zip"; - sha1 = "76f8823def9a6da8954a54737762a6820bc1d043"; - }; - - }; - }; - - - "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.2" = { - name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.2"; - path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.2"; - revision = "1"; - displayName = "Solver for ConstraintLayout 1.0.2"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.2.zip"; - sha1 = "96d7ff669f0e808e9833b2c2e320702826ccc8be"; - }; - - }; - }; - - - "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0" = { - name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0"; - path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0"; - revision = "1"; - displayName = "ConstraintLayout for Android 1.0.0"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0.zip"; - sha1 = "70acf99689b933bc6735645d5c3d92b91954b6cb"; - }; - - }; - }; - - - "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-beta1" = { - name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-beta1"; - path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-beta1"; - revision = "1"; - displayName = "ConstraintLayout for Android 1.0.0-beta1"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-beta1.zip"; - sha1 = "11f2f5cec4ff02986bad75435e5be77b704b4c64"; - }; - - }; - }; - - - "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-beta2" = { - name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-beta2"; - path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-beta2"; - revision = "1"; - displayName = "ConstraintLayout for Android 1.0.0-beta2"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-beta2.zip"; - sha1 = "623939865ede2e5c2c975dc55963e0d182bcce95"; - }; - - }; - }; - - - "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-beta3" = { - name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-beta3"; - path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-beta3"; - revision = "1"; - displayName = "ConstraintLayout for Android 1.0.0-beta3"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-beta3.zip"; - sha1 = "d78bb6a8ce92005fb1e4ed55d892a65b4258c60b"; - }; - - }; - }; - - - "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-beta4" = { - name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-beta4"; - path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-beta4"; - revision = "1"; - displayName = "ConstraintLayout for Android 1.0.0-beta4"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-beta4.zip"; - sha1 = "dc60844aab93a09a54a3c107685a77b18d7c1c39"; - }; - - }; - }; - - - "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-beta5" = { - name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-beta5"; - path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-beta5"; - revision = "1"; - displayName = "ConstraintLayout for Android 1.0.0-beta5"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-beta5.zip"; - sha1 = "4660f6c7a576ea1364f0c3225db71c29ca660d9a"; - }; - - }; - }; - - - "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.1" = { - name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.1"; - path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.1"; - revision = "1"; - displayName = "ConstraintLayout for Android 1.0.1"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.1.zip"; - sha1 = "342b0894b8651fff37586f80f383733e97aba9f9"; - }; - - }; - }; - - - "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.2" = { - name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.2"; - path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.2"; - revision = "1"; - displayName = "ConstraintLayout for Android 1.0.2"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.2.zip"; - sha1 = "3d9688a50fe0ed7348275f85d1b02278f616d8a4"; - }; - - }; - }; - - }; -} - diff --git a/pkgs/development/mobile/androidenv/generated/packages.nix b/pkgs/development/mobile/androidenv/generated/packages.nix deleted file mode 100644 index 4ac14c419edd..000000000000 --- a/pkgs/development/mobile/androidenv/generated/packages.nix +++ /dev/null @@ -1,2563 +0,0 @@ - -{fetchurl}: - -{ - - "build-tools"."17.0.0" = { - - name = "build-tools"; - path = "build-tools/17.0.0"; - revision = "17.0.0"; - displayName = "Android SDK Build-Tools 17"; - archives = { - linux = fetchurl { - url = "https://dl.google.com/android/repository/build-tools_r17-linux.zip"; - sha1 = "2c2872bc3806aabf16a12e3959c2183ddc866e6d"; - }; - macosx = fetchurl { - url = "https://dl.google.com/android/repository/build-tools_r17-macosx.zip"; - sha1 = "602ee709be9dbb8f179b1e4075148a57f9419930"; - }; - - }; - }; - - "build-tools"."18.0.1" = { - - name = "build-tools"; - path = "build-tools/18.0.1"; - revision = "18.0.1"; - displayName = "Android SDK Build-Tools 18.0.1"; - archives = { - linux = fetchurl { - url = "https://dl.google.com/android/repository/build-tools_r18.0.1-linux.zip"; - sha1 = "f11618492b0d2270c332325d45d752d3656a9640"; - }; - macosx = fetchurl { - url = "https://dl.google.com/android/repository/build-tools_r18.0.1-macosx.zip"; - sha1 = "d84f5692fb44d60fc53e5b2507cebf9f24626902"; - }; - - }; - }; - - "build-tools"."18.1.0" = { - - name = "build-tools"; - path = "build-tools/18.1.0"; - revision = "18.1.0"; - displayName = "Android SDK Build-Tools 18.1"; - archives = { - linux = fetchurl { - url = "https://dl.google.com/android/repository/build-tools_r18.1-linux.zip"; - sha1 = "f314a0599e51397f0886fe888b50dd98f2f050d8"; - }; - macosx = fetchurl { - url = "https://dl.google.com/android/repository/build-tools_r18.1-macosx.zip"; - sha1 = "16ddb299b8b43063e5bb3387ec17147c5053dfd8"; - }; - - }; - }; - - "build-tools"."18.1.1" = { - - name = "build-tools"; - path = "build-tools/18.1.1"; - revision = "18.1.1"; - displayName = "Android SDK Build-Tools 18.1.1"; - archives = { - linux = fetchurl { - url = "https://dl.google.com/android/repository/build-tools_r18.1.1-linux.zip"; - sha1 = "68c9acbfc0cec2d51b19efaed39831a17055d998"; - }; - macosx = fetchurl { - url = "https://dl.google.com/android/repository/build-tools_r18.1.1-macosx.zip"; - sha1 = "a9d9d37f6ddf859e57abc78802a77aaa166e48d4"; - }; - - }; - }; - - "build-tools"."19.0.0" = { - - name = "build-tools"; - path = "build-tools/19.0.0"; - revision = "19.0.0"; - displayName = "Android SDK Build-Tools 19"; - archives = { - linux = fetchurl { - url = "https://dl.google.com/android/repository/build-tools_r19-linux.zip"; - sha1 = "55c1a6cf632e7d346f0002b275ec41fd3137fd83"; - }; - macosx = fetchurl { - url = "https://dl.google.com/android/repository/build-tools_r19-macosx.zip"; - sha1 = "86ec1c12db1bc446b7bcaefc5cc14eb361044e90"; - }; - - }; - }; - - "build-tools"."19.0.1" = { - - name = "build-tools"; - path = "build-tools/19.0.1"; - revision = "19.0.1"; - displayName = "Android SDK Build-Tools 19.0.1"; - archives = { - linux = fetchurl { - url = "https://dl.google.com/android/repository/build-tools_r19.0.1-linux.zip"; - sha1 = "18d2312dc4368858914213087f4e61445aca4517"; - }; - macosx = fetchurl { - url = "https://dl.google.com/android/repository/build-tools_r19.0.1-macosx.zip"; - sha1 = "efaf50fb19a3edb8d03efbff76f89a249ad2920b"; - }; - - }; - }; - - "build-tools"."19.0.2" = { - - name = "build-tools"; - path = "build-tools/19.0.2"; - revision = "19.0.2"; - displayName = "Android SDK Build-Tools 19.0.2"; - archives = { - linux = fetchurl { - url = "https://dl.google.com/android/repository/build-tools_r19.0.2-linux.zip"; - sha1 = "a03a6bdea0091aea32e1b35b90a7294c9f04e3dd"; - }; - macosx = fetchurl { - url = "https://dl.google.com/android/repository/build-tools_r19.0.2-macosx.zip"; - sha1 = "145bc43065d45f756d99d87329d899052b9a9288"; - }; - - }; - }; - - "build-tools"."19.0.3" = { - - name = "build-tools"; - path = "build-tools/19.0.3"; - revision = "19.0.3"; - displayName = "Android SDK Build-Tools 19.0.3"; - archives = { - linux = fetchurl { - url = "https://dl.google.com/android/repository/build-tools_r19.0.3-linux.zip"; - sha1 = "c2d6055478e9d2d4fba476ee85f99181ddd1160c"; - }; - macosx = fetchurl { - url = "https://dl.google.com/android/repository/build-tools_r19.0.3-macosx.zip"; - sha1 = "651cf8754373b2d52e7f6aab2c52eabffe4e9ea4"; - }; - - }; - }; - - "build-tools"."19.1.0" = { - - name = "build-tools"; - path = "build-tools/19.1.0"; - revision = "19.1.0"; - displayName = "Android SDK Build-Tools 19.1"; - archives = { - linux = fetchurl { - url = "https://dl.google.com/android/repository/build-tools_r19.1-linux.zip"; - sha1 = "1ff20ac15fa47a75d00346ec12f180d531b3ca89"; - }; - macosx = fetchurl { - url = "https://dl.google.com/android/repository/build-tools_r19.1-macosx.zip"; - sha1 = "0d11aae3417de1efb4b9a0e0a7855904a61bcec1"; - }; - - }; - }; - - "build-tools"."20.0.0" = { - - name = "build-tools"; - path = "build-tools/20.0.0"; - revision = "20.0.0"; - displayName = "Android SDK Build-Tools 20"; - archives = { - linux = fetchurl { - url = "https://dl.google.com/android/repository/build-tools_r20-linux.zip"; - sha1 = "b688905526a5584d1327a662d871a635ff502758"; - }; - macosx = fetchurl { - url = "https://dl.google.com/android/repository/build-tools_r20-macosx.zip"; - sha1 = "1240f629411c108a714c4ddd756937c7fab93f83"; - }; - - }; - }; - - "build-tools"."21.0.0" = { - - name = "build-tools"; - path = "build-tools/21.0.0"; - revision = "21.0.0"; - displayName = "Android SDK Build-Tools 21"; - archives = { - linux = fetchurl { - url = "https://dl.google.com/android/repository/build-tools_r21-linux.zip"; - sha1 = "4933328fdeecbd554a29528f254f4993468e1cf4"; - }; - macosx = fetchurl { - url = "https://dl.google.com/android/repository/build-tools_r21-macosx.zip"; - sha1 = "9bef7989b51436bd4e5114d8a0330359f077cbfa"; - }; - - }; - }; - - "build-tools"."21.0.1" = { - - name = "build-tools"; - path = "build-tools/21.0.1"; - revision = "21.0.1"; - displayName = "Android SDK Build-Tools 21.0.1"; - archives = { - linux = fetchurl { - url = "https://dl.google.com/android/repository/build-tools_r21.0.1-linux.zip"; - sha1 = "e573069eea3e5255e7a65bedeb767f4fd0a5f49a"; - }; - macosx = fetchurl { - url = "https://dl.google.com/android/repository/build-tools_r21.0.1-macosx.zip"; - sha1 = "b60c8f9b810c980abafa04896706f3911be1ade7"; - }; - - }; - }; - - "build-tools"."21.0.2" = { - - name = "build-tools"; - path = "build-tools/21.0.2"; - revision = "21.0.2"; - displayName = "Android SDK Build-Tools 21.0.2"; - archives = { - linux = fetchurl { - url = "https://dl.google.com/android/repository/build-tools_r21.0.2-linux.zip"; - sha1 = "e1236ab8897b62b57414adcf04c132567b2612a5"; - }; - macosx = fetchurl { - url = "https://dl.google.com/android/repository/build-tools_r21.0.2-macosx.zip"; - sha1 = "f17471c154058f3734729ef3cc363399b1cd3de1"; - }; - - }; - }; - - "build-tools"."21.1.0" = { - - name = "build-tools"; - path = "build-tools/21.1.0"; - revision = "21.1.0"; - displayName = "Android SDK Build-Tools 21.1"; - archives = { - linux = fetchurl { - url = "https://dl.google.com/android/repository/build-tools_r21.1-linux.zip"; - sha1 = "b7455e543784d52a8925f960bc880493ed1478cb"; - }; - macosx = fetchurl { - url = "https://dl.google.com/android/repository/build-tools_r21.1-macosx.zip"; - sha1 = "df619356c2359aa5eacdd48699d15b335d9bd246"; - }; - - }; - }; - - "build-tools"."21.1.1" = { - - name = "build-tools"; - path = "build-tools/21.1.1"; - revision = "21.1.1"; - displayName = "Android SDK Build-Tools 21.1.1"; - archives = { - linux = fetchurl { - url = "https://dl.google.com/android/repository/build-tools_r21.1.1-linux.zip"; - sha1 = "1c712ee3a1ba5a8b0548f9c32f17d4a0ddfd727d"; - }; - macosx = fetchurl { - url = "https://dl.google.com/android/repository/build-tools_r21.1.1-macosx.zip"; - sha1 = "836a146eab0504aa9387a5132e986fe7c7381571"; - }; - - }; - }; - - "build-tools"."21.1.2" = { - - name = "build-tools"; - path = "build-tools/21.1.2"; - revision = "21.1.2"; - displayName = "Android SDK Build-Tools 21.1.2"; - archives = { - linux = fetchurl { - url = "https://dl.google.com/android/repository/build-tools_r21.1.2-linux.zip"; - sha1 = "5e35259843bf2926113a38368b08458735479658"; - }; - macosx = fetchurl { - url = "https://dl.google.com/android/repository/build-tools_r21.1.2-macosx.zip"; - sha1 = "e7c906b4ba0eea93b32ba36c610dbd6b204bff48"; - }; - - }; - }; - - "build-tools"."22.0.0" = { - - name = "build-tools"; - path = "build-tools/22.0.0"; - revision = "22.0.0"; - displayName = "Android SDK Build-Tools 22"; - archives = { - linux = fetchurl { - url = "https://dl.google.com/android/repository/build-tools_r22-linux.zip"; - sha1 = "a8a1619dd090e44fac957bce6842e62abf87965b"; - }; - macosx = fetchurl { - url = "https://dl.google.com/android/repository/build-tools_r22-macosx.zip"; - sha1 = "af95429b24088d704bc5db9bd606e34ac1b82c0d"; - }; - - }; - }; - - "build-tools"."22.0.1" = { - - name = "build-tools"; - path = "build-tools/22.0.1"; - revision = "22.0.1"; - displayName = "Android SDK Build-Tools 22.0.1"; - archives = { - linux = fetchurl { - url = "https://dl.google.com/android/repository/build-tools_r22.0.1-linux.zip"; - sha1 = "da8b9c5c3ede39298e6cf0283c000c2ee9029646"; - }; - macosx = fetchurl { - url = "https://dl.google.com/android/repository/build-tools_r22.0.1-macosx.zip"; - sha1 = "53dad7f608e01d53b17176ba11165acbfccc5bbf"; - }; - - }; - }; - - "build-tools"."23.0.0" = { - - name = "build-tools"; - path = "build-tools/23.0.0"; - revision = "23.0.0"; - displayName = "Android SDK Build-Tools 23"; - archives = { - linux = fetchurl { - url = "https://dl.google.com/android/repository/build-tools_r23-linux.zip"; - sha1 = "c1d6209212b01469f80fa804e0c1d39a06bc9060"; - }; - macosx = fetchurl { - url = "https://dl.google.com/android/repository/build-tools_r23-macosx.zip"; - sha1 = "90ba6e716f7703a236cd44b2e71c5ff430855a03"; - }; - - }; - }; - - "build-tools"."23.0.1" = { - - name = "build-tools"; - path = "build-tools/23.0.1"; - revision = "23.0.1"; - displayName = "Android SDK Build-Tools 23.0.1"; - archives = { - linux = fetchurl { - url = "https://dl.google.com/android/repository/build-tools_r23.0.1-linux.zip"; - sha1 = "b6ba7c399d5fa487d95289d8832e4ad943aed556"; - }; - macosx = fetchurl { - url = "https://dl.google.com/android/repository/build-tools_r23.0.1-macosx.zip"; - sha1 = "d96ec1522721e9a179ae2c591c99f75d31d39718"; - }; - - }; - }; - - "build-tools"."23.0.2" = { - - name = "build-tools"; - path = "build-tools/23.0.2"; - revision = "23.0.2"; - displayName = "Android SDK Build-Tools 23.0.2"; - archives = { - linux = fetchurl { - url = "https://dl.google.com/android/repository/build-tools_r23.0.2-linux.zip"; - sha1 = "8a9f2b37f6fcf7a9fa784dc21aeaeb41bbb9f2c3"; - }; - macosx = fetchurl { - url = "https://dl.google.com/android/repository/build-tools_r23.0.2-macosx.zip"; - sha1 = "482c4cbceef8ff58aefd92d8155a38610158fdaf"; - }; - - }; - }; - - "build-tools"."23.0.3" = { - - name = "build-tools"; - path = "build-tools/23.0.3"; - revision = "23.0.3"; - displayName = "Android SDK Build-Tools 23.0.3"; - archives = { - linux = fetchurl { - url = "https://dl.google.com/android/repository/build-tools_r23.0.3-linux.zip"; - sha1 = "368f2600feac7e9b511b82f53d1f2240ae4a91a3"; - }; - macosx = fetchurl { - url = "https://dl.google.com/android/repository/build-tools_r23.0.3-macosx.zip"; - sha1 = "fbc98cd303fd15a31d472de6c03bd707829f00b0"; - }; - - }; - }; - - "build-tools"."24.0.0" = { - - name = "build-tools"; - path = "build-tools/24.0.0"; - revision = "24.0.0"; - displayName = "Android SDK Build-Tools 24"; - archives = { - linux = fetchurl { - url = "https://dl.google.com/android/repository/build-tools_r24-linux.zip"; - sha1 = "c6271c4d78a5612ea6c7150688bcd5b7313de8d1"; - }; - macosx = fetchurl { - url = "https://dl.google.com/android/repository/build-tools_r24-macosx.zip"; - sha1 = "97fc4ed442f23989cc488d02c1d1de9bdde241de"; - }; - - }; - }; - - "build-tools"."24.0.1" = { - - name = "build-tools"; - path = "build-tools/24.0.1"; - revision = "24.0.1"; - displayName = "Android SDK Build-Tools 24.0.1"; - archives = { - linux = fetchurl { - url = "https://dl.google.com/android/repository/build-tools_r24.0.1-linux.zip"; - sha1 = "84f18c392919a074fcbb9b1d967984e6b2fef8b4"; - }; - macosx = fetchurl { - url = "https://dl.google.com/android/repository/build-tools_r24.0.1-macosx.zip"; - sha1 = "5c6457fcdfa07724fb086d8ff4e8316fc0742848"; - }; - - }; - }; - - "build-tools"."24.0.2" = { - - name = "build-tools"; - path = "build-tools/24.0.2"; - revision = "24.0.2"; - displayName = "Android SDK Build-Tools 24.0.2"; - archives = { - linux = fetchurl { - url = "https://dl.google.com/android/repository/build-tools_r24.0.2-linux.zip"; - sha1 = "f199a7a788c3fefbed102eea34d6007737b803cf"; - }; - macosx = fetchurl { - url = "https://dl.google.com/android/repository/build-tools_r24.0.2-macosx.zip"; - sha1 = "8bb8fc575477491d5957de743089df412de55cda"; - }; - - }; - }; - - "build-tools"."24.0.3" = { - - name = "build-tools"; - path = "build-tools/24.0.3"; - revision = "24.0.3"; - displayName = "Android SDK Build-Tools 24.0.3"; - archives = { - linux = fetchurl { - url = "https://dl.google.com/android/repository/build-tools_r24.0.3-linux.zip"; - sha1 = "9e8cc49d66e03fa1a8ecc1ac3e58f1324f5da304"; - }; - macosx = fetchurl { - url = "https://dl.google.com/android/repository/build-tools_r24.0.3-macosx.zip"; - sha1 = "a01c15f1b105c34595681075e1895d58b3fff48c"; - }; - - }; - }; - - "build-tools"."25.0.0" = { - - name = "build-tools"; - path = "build-tools/25.0.0"; - revision = "25.0.0"; - displayName = "Android SDK Build-Tools 25"; - archives = { - linux = fetchurl { - url = "https://dl.google.com/android/repository/build-tools_r25-linux.zip"; - sha1 = "f2bbda60403e75cabd0f238598c3b4dfca56ea44"; - }; - macosx = fetchurl { - url = "https://dl.google.com/android/repository/build-tools_r25-macosx.zip"; - sha1 = "273c5c29a65cbed00e44f3aa470bbd7dce556606"; - }; - - }; - }; - - "build-tools"."25.0.1" = { - - name = "build-tools"; - path = "build-tools/25.0.1"; - revision = "25.0.1"; - displayName = "Android SDK Build-Tools 25.0.1"; - archives = { - linux = fetchurl { - url = "https://dl.google.com/android/repository/build-tools_r25.0.1-linux.zip"; - sha1 = "ff063d252ab750d339f5947d06ff782836f22bac"; - }; - macosx = fetchurl { - url = "https://dl.google.com/android/repository/build-tools_r25.0.1-macosx.zip"; - sha1 = "7bf7f22d7d48ef20b6ab0e3d7a2912e5c088340f"; - }; - - }; - }; - - "build-tools"."25.0.2" = { - - name = "build-tools"; - path = "build-tools/25.0.2"; - revision = "25.0.2"; - displayName = "Android SDK Build-Tools 25.0.2"; - archives = { - linux = fetchurl { - url = "https://dl.google.com/android/repository/build-tools_r25.0.2-linux.zip"; - sha1 = "ff953c0177e317618fda40516f3e9d95fd43c7ae"; - }; - macosx = fetchurl { - url = "https://dl.google.com/android/repository/build-tools_r25.0.2-macosx.zip"; - sha1 = "12a5204bb3b6e39437535469fde7ddf42da46b16"; - }; - - }; - }; - - "build-tools"."25.0.3" = { - - name = "build-tools"; - path = "build-tools/25.0.3"; - revision = "25.0.3"; - displayName = "Android SDK Build-Tools 25.0.3"; - archives = { - linux = fetchurl { - url = "https://dl.google.com/android/repository/build-tools_r25.0.3-linux.zip"; - sha1 = "db95f3a0ae376534d4d69f4cdb6fad20649f3509"; - }; - macosx = fetchurl { - url = "https://dl.google.com/android/repository/build-tools_r25.0.3-macosx.zip"; - sha1 = "160d2fefb5ce68e443427fc30a793a703b63e26e"; - }; - - }; - }; - - "build-tools"."26.0.0" = { - - name = "build-tools"; - path = "build-tools/26.0.0"; - revision = "26.0.0"; - displayName = "Android SDK Build-Tools 26"; - archives = { - linux = fetchurl { - url = "https://dl.google.com/android/repository/build-tools_r26-linux.zip"; - sha1 = "1cbe72929876f8a872ab1f1b1040a9f720261f59"; - }; - macosx = fetchurl { - url = "https://dl.google.com/android/repository/build-tools_r26-macosx.zip"; - sha1 = "d01a1aeca03747245f1f5936b3cb01759c66d086"; - }; - - }; - }; - - "build-tools"."26.0.0-rc1" = { - - name = "build-tools"; - path = "build-tools/26.0.0-rc1"; - revision = "26.0.0-rc1"; - displayName = "Android SDK Build-Tools 26-rc1"; - archives = { - linux = fetchurl { - url = "https://dl.google.com/android/repository/build-tools_r26-rc1-linux.zip"; - sha1 = "8cd6388dc96db2d7a49d06159cf990d3bbc78d04"; - }; - macosx = fetchurl { - url = "https://dl.google.com/android/repository/build-tools_r26-rc1-macosx.zip"; - sha1 = "5c5a1de7d5f4f000d36ae349229fe0be846d6137"; - }; - - }; - }; - - "build-tools"."26.0.0-rc2" = { - - name = "build-tools"; - path = "build-tools/26.0.0-rc2"; - revision = "26.0.0-rc2"; - displayName = "Android SDK Build-Tools 26-rc2"; - archives = { - linux = fetchurl { - url = "https://dl.google.com/android/repository/build-tools_r26-rc2-linux.zip"; - sha1 = "629bbd8d2e415bf64871fb0b4c0540fd6d0347a0"; - }; - macosx = fetchurl { - url = "https://dl.google.com/android/repository/build-tools_r26-rc2-macosx.zip"; - sha1 = "cb1eb738a1f7003025af267a9b8cc2d259533c70"; - }; - - }; - }; - - "build-tools"."26.0.1" = { - - name = "build-tools"; - path = "build-tools/26.0.1"; - revision = "26.0.1"; - displayName = "Android SDK Build-Tools 26.0.1"; - archives = { - linux = fetchurl { - url = "https://dl.google.com/android/repository/build-tools_r26.0.1-linux.zip"; - sha1 = "5378c2c78091b414d0eac40a6bd37f2faa31a365"; - }; - macosx = fetchurl { - url = "https://dl.google.com/android/repository/build-tools_r26.0.1-macosx.zip"; - sha1 = "cbde59de198916b390777dd0227921bfa2120832"; - }; - - }; - }; - - "build-tools"."26.0.2" = { - - name = "build-tools"; - path = "build-tools/26.0.2"; - revision = "26.0.2"; - displayName = "Android SDK Build-Tools 26.0.2"; - archives = { - linux = fetchurl { - url = "https://dl.google.com/android/repository/build-tools_r26.0.2-linux.zip"; - sha1 = "5b2b7b66c7bf2151f2af183b5b50a17808850592"; - }; - macosx = fetchurl { - url = "https://dl.google.com/android/repository/build-tools_r26.0.2-macosx.zip"; - sha1 = "d9ed7c7f149ce38be5dc08979aea8acec1459ca0"; - }; - - }; - }; - - "build-tools"."26.0.3" = { - - name = "build-tools"; - path = "build-tools/26.0.3"; - revision = "26.0.3"; - displayName = "Android SDK Build-Tools 26.0.3"; - archives = { - linux = fetchurl { - url = "https://dl.google.com/android/repository/build-tools_r26.0.3-linux.zip"; - sha1 = "8a2e6c1bcd845844523a68aa17e5442f0dce328c"; - }; - macosx = fetchurl { - url = "https://dl.google.com/android/repository/build-tools_r26.0.3-macosx.zip"; - sha1 = "5bb90ed935d99e5bc90686f43b852e68c5ad40df"; - }; - - }; - }; - - "build-tools"."27.0.0" = { - - name = "build-tools"; - path = "build-tools/27.0.0"; - revision = "27.0.0"; - displayName = "Android SDK Build-Tools 27"; - archives = { - linux = fetchurl { - url = "https://dl.google.com/android/repository/build-tools_r27-linux.zip"; - sha1 = "28542332ba97cf4a08c3eddfcf5edd70e3cf1260"; - }; - macosx = fetchurl { - url = "https://dl.google.com/android/repository/build-tools_r27-macosx.zip"; - sha1 = "fb4e8d7e6b8d29a77090e34024077a80458d5ae1"; - }; - - }; - }; - - "build-tools"."27.0.1" = { - - name = "build-tools"; - path = "build-tools/27.0.1"; - revision = "27.0.1"; - displayName = "Android SDK Build-Tools 27.0.1"; - archives = { - linux = fetchurl { - url = "https://dl.google.com/android/repository/build-tools_r27.0.1-linux.zip"; - sha1 = "7f4eedb1077ef948b848040dcd15de9e8a759f4a"; - }; - macosx = fetchurl { - url = "https://dl.google.com/android/repository/build-tools_r27.0.1-macosx.zip"; - sha1 = "1edd07bfdbadd95652d093040e16d858f7489594"; - }; - - }; - }; - - "build-tools"."27.0.2" = { - - name = "build-tools"; - path = "build-tools/27.0.2"; - revision = "27.0.2"; - displayName = "Android SDK Build-Tools 27.0.2"; - archives = { - linux = fetchurl { - url = "https://dl.google.com/android/repository/build-tools_r27.0.2-linux.zip"; - sha1 = "b687ddf6be84f11607871138aad32cf857d0b837"; - }; - macosx = fetchurl { - url = "https://dl.google.com/android/repository/build-tools_r27.0.2-macosx.zip"; - sha1 = "6d5d9cf2a47877f273f4b742b19e712a051a31be"; - }; - - }; - }; - - "build-tools"."27.0.3" = { - - name = "build-tools"; - path = "build-tools/27.0.3"; - revision = "27.0.3"; - displayName = "Android SDK Build-Tools 27.0.3"; - archives = { - linux = fetchurl { - url = "https://dl.google.com/android/repository/build-tools_r27.0.3-linux.zip"; - sha1 = "d85e7a6320eddffe7eeace3437605079dac938ca"; - }; - macosx = fetchurl { - url = "https://dl.google.com/android/repository/build-tools_r27.0.3-macosx.zip"; - sha1 = "61d9fb18790c68d66ff73bf1e7ad56bc1f1eef2d"; - }; - - }; - }; - - "build-tools"."28.0.0" = { - - name = "build-tools"; - path = "build-tools/28.0.0"; - revision = "28.0.0"; - displayName = "Android SDK Build-Tools 28"; - archives = { - linux = fetchurl { - url = "https://dl.google.com/android/repository/build-tools_r28-linux.zip"; - sha1 = "d9f8a754d833ccd334f56fcc6089c5925cd82abb"; - }; - macosx = fetchurl { - url = "https://dl.google.com/android/repository/build-tools_r28-macosx.zip"; - sha1 = "72088d32d1d82cc3c2cf7cf6618b6130c0c84ade"; - }; - - }; - }; - - "build-tools"."28.0.0-rc1" = { - - name = "build-tools"; - path = "build-tools/28.0.0-rc1"; - revision = "28.0.0-rc1"; - displayName = "Android SDK Build-Tools 28-rc1"; - archives = { - linux = fetchurl { - url = "https://dl.google.com/android/repository/build-tools_r28-rc1-linux.zip"; - sha1 = "1601977fae25fd478bcfaa0481ca5ea3c609d840"; - }; - macosx = fetchurl { - url = "https://dl.google.com/android/repository/build-tools_r28-rc1-macosx.zip"; - sha1 = "2c77821967a2330b7b227072d0b1c02ef19fe2fc"; - }; - - }; - }; - - "build-tools"."28.0.0-rc2" = { - - name = "build-tools"; - path = "build-tools/28.0.0-rc2"; - revision = "28.0.0-rc2"; - displayName = "Android SDK Build-Tools 28-rc2"; - archives = { - linux = fetchurl { - url = "https://dl.google.com/android/repository/build-tools_r28-rc2-linux.zip"; - sha1 = "efe9c0dde0646a07544c864276390ca6e96b24dc"; - }; - macosx = fetchurl { - url = "https://dl.google.com/android/repository/build-tools_r28-rc2-macosx.zip"; - sha1 = "0d0314b353589feb10e528b44c5a685b6658d797"; - }; - - }; - }; - - "build-tools"."28.0.1" = { - - name = "build-tools"; - path = "build-tools/28.0.1"; - revision = "28.0.1"; - displayName = "Android SDK Build-Tools 28.0.1"; - archives = { - linux = fetchurl { - url = "https://dl.google.com/android/repository/build-tools_r28.0.1-linux.zip"; - sha1 = "ee70dfa1fccb58b37cebc9544830511f36a137a0"; - }; - macosx = fetchurl { - url = "https://dl.google.com/android/repository/build-tools_r28.0.1-macosx.zip"; - sha1 = "aeef42ad953f1630dd6f5d71eefdc0b825211462"; - }; - - }; - }; - - "build-tools"."28.0.2" = { - - name = "build-tools"; - path = "build-tools/28.0.2"; - revision = "28.0.2"; - displayName = "Android SDK Build-Tools 28.0.2"; - archives = { - linux = fetchurl { - url = "https://dl.google.com/android/repository/build-tools_r28.0.2-linux.zip"; - sha1 = "b4492209810a3fd48deaa982f9852fef12433d55"; - }; - macosx = fetchurl { - url = "https://dl.google.com/android/repository/build-tools_r28.0.2-macosx.zip"; - sha1 = "c10dd5a7825578622fb362a8a34f76eb3ba0c0a9"; - }; - - }; - }; - - "build-tools"."28.0.3" = { - - name = "build-tools"; - path = "build-tools/28.0.3"; - revision = "28.0.3"; - displayName = "Android SDK Build-Tools 28.0.3"; - archives = { - linux = fetchurl { - url = "https://dl.google.com/android/repository/build-tools_r28.0.3-linux.zip"; - sha1 = "ea6f2f7103cd9da9ff0bdf6e37fbbba548fa4165"; - }; - macosx = fetchurl { - url = "https://dl.google.com/android/repository/build-tools_r28.0.3-macosx.zip"; - sha1 = "f8c333a2991b1ab05a671bc6248b78e00edcd83a"; - }; - - }; - }; - - "build-tools"."29.0.0" = { - - name = "build-tools"; - path = "build-tools/29.0.0"; - revision = "29.0.0"; - displayName = "Android SDK Build-Tools 29"; - archives = { - linux = fetchurl { - url = "https://dl.google.com/android/repository/build-tools_r29-linux.zip"; - sha1 = "ad314caf1802209c4b00a5f3517af5ceb0d48eae"; - }; - macosx = fetchurl { - url = "https://dl.google.com/android/repository/build-tools_r29-macosx.zip"; - sha1 = "35dc6bc7a53bd9d206847e72f02cab21cfdaa869"; - }; - - }; - }; - - "build-tools"."29.0.0-rc1" = { - - name = "build-tools"; - path = "build-tools/29.0.0-rc1"; - revision = "29.0.0-rc1"; - displayName = "Android SDK Build-Tools 29-rc1"; - archives = { - linux = fetchurl { - url = "https://dl.google.com/android/repository/build-tools_r29-rc1-linux.zip"; - sha1 = "1c897f5885ac5468613e40e1ea598c21c05d345d"; - }; - macosx = fetchurl { - url = "https://dl.google.com/android/repository/build-tools_r29-rc1-macosx.zip"; - sha1 = "f066c0d9ea2f0d8a0a9cc7b2ca0a467a570ab034"; - }; - - }; - }; - - "build-tools"."29.0.0-rc2" = { - - name = "build-tools"; - path = "build-tools/29.0.0-rc2"; - revision = "29.0.0-rc2"; - displayName = "Android SDK Build-Tools 29-rc2"; - archives = { - linux = fetchurl { - url = "https://dl.google.com/android/repository/build-tools_r29-rc2-linux.zip"; - sha1 = "b4b41d429c35b42db07b6c65d4aa998ba8c4093c"; - }; - macosx = fetchurl { - url = "https://dl.google.com/android/repository/build-tools_r29-rc2-macosx.zip"; - sha1 = "7a960367999169ccac5dbc60817e5f1725c4c738"; - }; - - }; - }; - - "build-tools"."29.0.0-rc3" = { - - name = "build-tools"; - path = "build-tools/29.0.0-rc3"; - revision = "29.0.0-rc3"; - displayName = "Android SDK Build-Tools 29-rc3"; - archives = { - linux = fetchurl { - url = "https://dl.google.com/android/repository/build-tools_r29-rc3-linux.zip"; - sha1 = "8b7177f198e8b92da8f9537aaf859f6edf222b01"; - }; - macosx = fetchurl { - url = "https://dl.google.com/android/repository/build-tools_r29-rc3-macosx.zip"; - sha1 = "643e8d76625f6e2cfcd5494e50bae5e14725ec0c"; - }; - - }; - }; - - "build-tools"."29.0.1" = { - - name = "build-tools"; - path = "build-tools/29.0.1"; - revision = "29.0.1"; - displayName = "Android SDK Build-Tools 29.0.1"; - archives = { - linux = fetchurl { - url = "https://dl.google.com/android/repository/build-tools_r29.0.1-linux.zip"; - sha1 = "fc209e5d91ab2daeac24345a5cb17261940547e4"; - }; - macosx = fetchurl { - url = "https://dl.google.com/android/repository/build-tools_r29.0.1-macosx.zip"; - sha1 = "46ae9b1d1e2a67241d7da9c2cd8eae42f24cc6cd"; - }; - - }; - }; - - "build-tools"."29.0.2" = { - - name = "build-tools"; - path = "build-tools/29.0.2"; - revision = "29.0.2"; - displayName = "Android SDK Build-Tools 29.0.2"; - archives = { - linux = fetchurl { - url = "https://dl.google.com/android/repository/build-tools_r29.0.2-linux.zip"; - sha1 = "c0fc7e5c37ac96bfd0c611802e8ab36d0e71b398"; - }; - macosx = fetchurl { - url = "https://dl.google.com/android/repository/build-tools_r29.0.2-macosx.zip"; - sha1 = "f781d9e03d5c2debcf51fed3792ee7a9d066723f"; - }; - - }; - }; - - "build-tools"."29.0.3" = { - - name = "build-tools"; - path = "build-tools/29.0.3"; - revision = "29.0.3"; - displayName = "Android SDK Build-Tools 29.0.3"; - archives = { - linux = fetchurl { - url = "https://dl.google.com/android/repository/build-tools_r29.0.3-linux.zip"; - sha1 = "64efff52165cda5e31848acafa46a05e3f3b4651"; - }; - macosx = fetchurl { - url = "https://dl.google.com/android/repository/build-tools_r29.0.3-macosx.zip"; - sha1 = "76520eb7712fb0bb4c023b55c6f65588ee268289"; - }; - - }; - }; - - "build-tools"."30.0.0-rc1" = { - - name = "build-tools"; - path = "build-tools/30.0.0-rc1"; - revision = "30.0.0-rc1"; - displayName = "Android SDK Build-Tools 30-rc1"; - archives = { - linux = fetchurl { - url = "https://dl.google.com/android/repository/build-tools_r30-rc1-linux.zip"; - sha1 = "afcb370bb6956bbf9e90557230088a3e1417e8a8"; - }; - macosx = fetchurl { - url = "https://dl.google.com/android/repository/build-tools_r30-rc1-macosx.zip"; - sha1 = "2761a0ea9466685aaaf93e85bf8bd47575bc91b8"; - }; - - }; - }; - - "cmake"."3.10.2" = { - - name = "cmake"; - path = "cmake/3.10.2.4988404"; - revision = "3.10.2"; - displayName = "CMake 3.10.2.4988404"; - archives = { - macosx = fetchurl { - url = "https://dl.google.com/android/repository/cmake-3.10.2-darwin-x86_64.zip"; - sha1 = "f227a85cb53dcb927ac52a5a717f647c4a29bf3b"; - }; - linux = fetchurl { - url = "https://dl.google.com/android/repository/cmake-3.10.2-linux-x86_64.zip"; - sha1 = "439e8799bf59f724f104bf62784b2985f1bfe561"; - }; - - }; - }; - - "cmake"."3.6.4111459" = { - - name = "cmake"; - path = "cmake/3.6.4111459"; - revision = "3.6.4111459"; - displayName = "CMake 3.6.4111459"; - archives = { - macosx = fetchurl { - url = "https://dl.google.com/android/repository/cmake-3.6.4111459-darwin-x86_64.zip"; - sha1 = "c9b02d630079783c6d67cb91488b622cfcd9765c"; - }; - linux = fetchurl { - url = "https://dl.google.com/android/repository/cmake-3.6.4111459-linux-x86_64.zip"; - sha1 = "71c539b9c33f0943e9ad6251fea0b161c0b70782"; - }; - - }; - }; - - "cmdline-tools"."1.0" = { - - name = "cmdline-tools"; - path = "cmdline-tools/1.0"; - revision = "1.0"; - displayName = "Android SDK Command-line Tools"; - archives = { - linux = fetchurl { - url = "https://dl.google.com/android/repository/commandlinetools-linux-6200805_latest.zip"; - sha1 = "6ffc5bd72db2c755f9b374ed829202262a6d8aaf"; - }; - macosx = fetchurl { - url = "https://dl.google.com/android/repository/commandlinetools-mac-6200805_latest.zip"; - sha1 = "23f803c07e392bb769507c88b23c2c7868cc7a6f"; - }; - - }; - }; - - "docs"."1" = { - - name = "docs"; - path = "docs"; - revision = "1"; - displayName = "Documentation for Android SDK"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/docs-24_r01.zip"; - sha1 = "eef58238949ee9544876cb3e002f2d58e4ee7b5d"; - }; - - }; - }; - - "emulator"."30.0.0".macosx = { - - name = "emulator"; - path = "emulator"; - revision = "30.0.0"; - displayName = "Android Emulator"; - archives = { - macosx = fetchurl { - url = "https://dl.google.com/android/repository/emulator-darwin-6203977.zip"; - sha1 = "3bb965869577be4e62dec053de34c279f5024a12"; - }; - linux = fetchurl { - url = "https://dl.google.com/android/repository/emulator-linux-6203977.zip"; - sha1 = "356cac370c03460ca82166464de7ecd7da1f4a49"; - }; - - }; - }; - - "emulator"."28.0.25".windows = { - - name = "emulator"; - path = "emulator"; - revision = "28.0.25"; - displayName = "Android Emulator"; - archives = { - - }; - }; - - "emulator"."30.0.3".linux = { - - name = "emulator"; - path = "emulator"; - revision = "30.0.3"; - displayName = "Android Emulator"; - archives = { - linux = fetchurl { - url = "https://dl.google.com/android/repository/emulator-linux-6258612.zip"; - sha1 = "a891e1532443a55c3ce9986b484effdabd842f8e"; - }; - - }; - }; - - "emulator"."30.0.2".macosx = { - - name = "emulator"; - path = "emulator"; - revision = "30.0.2"; - displayName = "Android Emulator"; - archives = { - macosx = fetchurl { - url = "https://dl.google.com/android/repository/emulator-darwin-6237347.zip"; - sha1 = "702b6a050a230b3b45f667867f6fc99b3f973d9a"; - }; - - }; - }; - - "lldb"."2.0.2558144" = { - - name = "lldb"; - path = "lldb/2.0"; - revision = "2.0.2558144"; - displayName = "LLDB 2.0"; - archives = { - macosx = fetchurl { - url = "https://dl.google.com/android/repository/lldb-2.0.2558144-darwin-x86_64.zip"; - sha1 = "d92e2f4c8284413eed4f27986e62b167d947033c"; - }; - linux = fetchurl { - url = "https://dl.google.com/android/repository/lldb-2.0.2558144-linux-x86_64.zip"; - sha1 = "e7060d9b2ba58b28fd7b1a0ea85a151c8371a326"; - }; - - }; - }; - - "lldb"."2.1.2852477" = { - - name = "lldb"; - path = "lldb/2.1"; - revision = "2.1.2852477"; - displayName = "LLDB 2.1"; - archives = { - macosx = fetchurl { - url = "https://dl.google.com/android/repository/lldb-2.1.2852477-darwin-x86_64.zip"; - sha1 = "d1e33880a53f1aa8c7e73534adef83a06f091185"; - }; - linux = fetchurl { - url = "https://dl.google.com/android/repository/lldb-2.1.2852477-linux-x86_64.zip"; - sha1 = "eb9b96d320210fdfe82495b0597ad43e77f1c240"; - }; - - }; - }; - - "lldb"."2.2.3271982" = { - - name = "lldb"; - path = "lldb/2.2"; - revision = "2.2.3271982"; - displayName = "LLDB 2.2"; - archives = { - macosx = fetchurl { - url = "https://dl.google.com/android/repository/lldb-2.2.3271982-darwin-x86_64.zip"; - sha1 = "62089f4e35775e6cedb82d1fa377fdc1de898005"; - }; - linux = fetchurl { - url = "https://dl.google.com/android/repository/lldb-2.2.3271982-linux-x86_64.zip"; - sha1 = "413649617d97dd9ef163528f64c0500e1b7c4113"; - }; - - }; - }; - - "lldb"."2.3.3614996" = { - - name = "lldb"; - path = "lldb/2.3"; - revision = "2.3.3614996"; - displayName = "LLDB 2.3"; - archives = { - macosx = fetchurl { - url = "https://dl.google.com/android/repository/lldb-2.3.3614996-darwin-x86_64.zip"; - sha1 = "6b0df112c7b9fa41654497fde2fcce990c831e52"; - }; - linux = fetchurl { - url = "https://dl.google.com/android/repository/lldb-2.3.3614996-linux-x86_64.zip"; - sha1 = "d7abe655650efe9f6989df31835fa3b3f95c2d13"; - }; - - }; - }; - - "lldb"."3.0.4213617" = { - - name = "lldb"; - path = "lldb/3.0"; - revision = "3.0.4213617"; - displayName = "LLDB 3.0"; - archives = { - macosx = fetchurl { - url = "https://dl.google.com/android/repository/lldb-3.0.4213617-darwin-x86_64.zip"; - sha1 = "2492651690a215317b86c755cd4d584ec9838677"; - }; - linux = fetchurl { - url = "https://dl.google.com/android/repository/lldb-3.0.4213617-linux-x86_64.zip"; - sha1 = "61d49b6a58953faa61546d631409af5f60d8d9db"; - }; - - }; - }; - - "lldb"."3.1.4508709" = { - - name = "lldb"; - path = "lldb/3.1"; - revision = "3.1.4508709"; - displayName = "LLDB 3.1"; - archives = { - macosx = fetchurl { - url = "https://dl.google.com/android/repository/lldb-3.1.4508709-darwin-x86_64.zip"; - sha1 = "2b37aa55b81a7e5b8a369febf1ac0bad6c7c5d58"; - }; - linux = fetchurl { - url = "https://dl.google.com/android/repository/lldb-3.1.4508709-linux-x86_64.zip"; - sha1 = "462711c9ee94fec9ff8be5fa8180afec04d1af6f"; - }; - - }; - }; - - "ndk-bundle"."21.1.6210238-rc1" = { - - name = "ndk-bundle"; - path = "ndk-bundle"; - revision = "21.1.6210238-rc1"; - displayName = "NDK"; - archives = { - macosx = fetchurl { - url = "https://dl.google.com/android/repository/android-ndk-r21b-beta1-darwin-x86_64.zip"; - sha1 = "971609f9a579ebbcb8d121a5d5aa0cba716b2d1f"; - }; - linux = fetchurl { - url = "https://dl.google.com/android/repository/android-ndk-r21b-beta1-linux-x86_64.zip"; - sha1 = "cf06ed408663c11c8f4824f9370c7a900ec074dd"; - }; - - }; - }; - - "ndk-bundle"."21.0.6113669" = { - - name = "ndk-bundle"; - path = "ndk-bundle"; - revision = "21.0.6113669"; - displayName = "NDK"; - archives = { - macosx = fetchurl { - url = "https://dl.google.com/android/repository/android-ndk-r21-darwin-x86_64.zip"; - sha1 = "0d50636cc0e34ed3ba540d6d5818ea0cf10f16aa"; - }; - linux = fetchurl { - url = "https://dl.google.com/android/repository/android-ndk-r21-linux-x86_64.zip"; - sha1 = "afc9c0b9faad222898ac8168c78ad4ccac8a1b5c"; - }; - - }; - }; - - "ndk-bundle"."21.0.6011959-rc2" = { - - name = "ndk-bundle"; - path = "ndk-bundle"; - revision = "21.0.6011959-rc2"; - displayName = "NDK"; - archives = { - macosx = fetchurl { - url = "https://dl.google.com/android/repository/android-ndk-r21-beta2-darwin-x86_64.zip"; - sha1 = "34a46c3867c9d87a80895c0b8a098256052536d2"; - }; - linux = fetchurl { - url = "https://dl.google.com/android/repository/android-ndk-r21-beta2-linux-x86_64.zip"; - sha1 = "335f30302bee700a9a5fdfe3ae533a4963499c44"; - }; - - }; - }; - - "ndk-bundle"."20.1.5948944" = { - - name = "ndk-bundle"; - path = "ndk-bundle"; - revision = "20.1.5948944"; - displayName = "NDK"; - archives = { - macosx = fetchurl { - url = "https://dl.google.com/android/repository/android-ndk-r20b-darwin-x86_64.zip"; - sha1 = "b51290ab69cb89de1f0ba108702277bc333b38be"; - }; - linux = fetchurl { - url = "https://dl.google.com/android/repository/android-ndk-r20b-linux-x86_64.zip"; - sha1 = "d903fdf077039ad9331fb6c3bee78aa46d45527b"; - }; - - }; - }; - - "ndk-bundle"."20.0.5594570" = { - - name = "ndk-bundle"; - path = "ndk-bundle"; - revision = "20.0.5594570"; - displayName = "NDK"; - archives = { - macosx = fetchurl { - url = "https://dl.google.com/android/repository/android-ndk-r20-darwin-x86_64.zip"; - sha1 = "96d5f1c50452596912d1982439c514194b5751e6"; - }; - linux = fetchurl { - url = "https://dl.google.com/android/repository/android-ndk-r20-linux-x86_64.zip"; - sha1 = "8665fc84a1b1f0d6ab3b5fdd1e30200cc7b9adff"; - }; - - }; - }; - - "ndk-bundle"."20.0.5471264-rc3" = { - - name = "ndk-bundle"; - path = "ndk-bundle"; - revision = "20.0.5471264-rc3"; - displayName = "NDK"; - archives = { - macosx = fetchurl { - url = "https://dl.google.com/android/repository/android-ndk-r20-beta3-darwin-x86_64.zip"; - sha1 = "665a035cadb0dd03e6502ba25c18643f6e4ede24"; - }; - linux = fetchurl { - url = "https://dl.google.com/android/repository/android-ndk-r20-beta3-linux-x86_64.zip"; - sha1 = "674d8fb0e0df8e8be1c31fa321eb176548a19ba3"; - }; - - }; - }; - - "ndk-bundle"."20.0.5392854-rc2" = { - - name = "ndk-bundle"; - path = "ndk-bundle"; - revision = "20.0.5392854-rc2"; - displayName = "NDK"; - archives = { - macosx = fetchurl { - url = "https://dl.google.com/android/repository/android-ndk-r20-beta2-darwin-x86_64.zip"; - sha1 = "cd94191ace6b31ec9af1cc370173e16934e1cb8b"; - }; - linux = fetchurl { - url = "https://dl.google.com/android/repository/android-ndk-r20-beta2-linux-x86_64.zip"; - sha1 = "8285ae2e24a7232fd0cbfb55e955c8586ef2ee02"; - }; - - }; - }; - - "ndk-bundle"."19.2.5345600" = { - - name = "ndk-bundle"; - path = "ndk-bundle"; - revision = "19.2.5345600"; - displayName = "NDK"; - archives = { - macosx = fetchurl { - url = "https://dl.google.com/android/repository/android-ndk-r19c-darwin-x86_64.zip"; - sha1 = "f46b8193109bba8a58e0461c1a48f4534051fb25"; - }; - linux = fetchurl { - url = "https://dl.google.com/android/repository/android-ndk-r19c-linux-x86_64.zip"; - sha1 = "fd94d0be6017c6acbd193eb95e09cf4b6f61b834"; - }; - - }; - }; - - "ndk-bundle"."19.0.5232133" = { - - name = "ndk-bundle"; - path = "ndk-bundle"; - revision = "19.0.5232133"; - displayName = "NDK"; - archives = { - macosx = fetchurl { - url = "https://dl.google.com/android/repository/android-ndk-r19-darwin-x86_64.zip"; - sha1 = "86c1a962601b23b8a6d3d535c93b4b0bc4f29249"; - }; - linux = fetchurl { - url = "https://dl.google.com/android/repository/android-ndk-r19-linux-x86_64.zip"; - sha1 = "f02ad84cb5b6e1ff3eea9e6168037c823408c8ac"; - }; - - }; - }; - - "ndk-bundle"."18.1.5063045" = { - - name = "ndk-bundle"; - path = "ndk-bundle"; - revision = "18.1.5063045"; - displayName = "NDK"; - archives = { - macosx = fetchurl { - url = "https://dl.google.com/android/repository/android-ndk-r18b-darwin-x86_64.zip"; - sha1 = "98cb9909aa8c2dab32db188bbdc3ac6207e09440"; - }; - linux = fetchurl { - url = "https://dl.google.com/android/repository/android-ndk-r18b-linux-x86_64.zip"; - sha1 = "500679655da3a86aecf67007e8ab230ea9b4dd7b"; - }; - - }; - }; - - "ndk-bundle"."17.2.4988734" = { - - name = "ndk-bundle"; - path = "ndk-bundle"; - revision = "17.2.4988734"; - displayName = "NDK"; - archives = { - macosx = fetchurl { - url = "https://dl.google.com/android/repository/android-ndk-r17c-darwin-x86_64.zip"; - sha1 = "f97e3d7711497e3b4faf9e7b3fa0f0da90bb649c"; - }; - linux = fetchurl { - url = "https://dl.google.com/android/repository/android-ndk-r17c-linux-x86_64.zip"; - sha1 = "12cacc70c3fd2f40574015631c00f41fb8a39048"; - }; - - }; - }; - - "ndk-bundle"."16.1.4479499" = { - - name = "ndk-bundle"; - path = "ndk-bundle"; - revision = "16.1.4479499"; - displayName = "NDK"; - archives = { - macosx = fetchurl { - url = "https://dl.google.com/android/repository/android-ndk-r16b-darwin-x86_64.zip"; - sha1 = "e51e615449b98c716cf912057e2682e75d55e2de"; - }; - linux = fetchurl { - url = "https://dl.google.com/android/repository/android-ndk-r16b-linux-x86_64.zip"; - sha1 = "42aa43aae89a50d1c66c3f9fdecd676936da6128"; - }; - - }; - }; - - "ndk"."16.1.4479499" = { - - name = "ndk"; - path = "ndk/16.1.4479499"; - revision = "16.1.4479499"; - displayName = "NDK (Side by side) 16.1.4479499"; - archives = { - macosx = fetchurl { - url = "https://dl.google.com/android/repository/android-ndk-r16b-darwin-x86_64.zip"; - sha1 = "e51e615449b98c716cf912057e2682e75d55e2de"; - }; - linux = fetchurl { - url = "https://dl.google.com/android/repository/android-ndk-r16b-linux-x86_64.zip"; - sha1 = "42aa43aae89a50d1c66c3f9fdecd676936da6128"; - }; - - }; - }; - - "ndk"."17.2.4988734" = { - - name = "ndk"; - path = "ndk/17.2.4988734"; - revision = "17.2.4988734"; - displayName = "NDK (Side by side) 17.2.4988734"; - archives = { - macosx = fetchurl { - url = "https://dl.google.com/android/repository/android-ndk-r17c-darwin-x86_64.zip"; - sha1 = "f97e3d7711497e3b4faf9e7b3fa0f0da90bb649c"; - }; - linux = fetchurl { - url = "https://dl.google.com/android/repository/android-ndk-r17c-linux-x86_64.zip"; - sha1 = "12cacc70c3fd2f40574015631c00f41fb8a39048"; - }; - - }; - }; - - "ndk"."18.1.5063045" = { - - name = "ndk"; - path = "ndk/18.1.5063045"; - revision = "18.1.5063045"; - displayName = "NDK (Side by side) 18.1.5063045"; - archives = { - macosx = fetchurl { - url = "https://dl.google.com/android/repository/android-ndk-r18b-darwin-x86_64.zip"; - sha1 = "98cb9909aa8c2dab32db188bbdc3ac6207e09440"; - }; - linux = fetchurl { - url = "https://dl.google.com/android/repository/android-ndk-r18b-linux-x86_64.zip"; - sha1 = "500679655da3a86aecf67007e8ab230ea9b4dd7b"; - }; - - }; - }; - - "ndk"."19.0.5232133" = { - - name = "ndk"; - path = "ndk/19.0.5232133"; - revision = "19.0.5232133"; - displayName = "NDK (Side by side) 19.0.5232133"; - archives = { - macosx = fetchurl { - url = "https://dl.google.com/android/repository/android-ndk-r19-darwin-x86_64.zip"; - sha1 = "86c1a962601b23b8a6d3d535c93b4b0bc4f29249"; - }; - linux = fetchurl { - url = "https://dl.google.com/android/repository/android-ndk-r19-linux-x86_64.zip"; - sha1 = "f02ad84cb5b6e1ff3eea9e6168037c823408c8ac"; - }; - - }; - }; - - "ndk"."19.2.5345600" = { - - name = "ndk"; - path = "ndk/19.2.5345600"; - revision = "19.2.5345600"; - displayName = "NDK (Side by side) 19.2.5345600"; - archives = { - macosx = fetchurl { - url = "https://dl.google.com/android/repository/android-ndk-r19c-darwin-x86_64.zip"; - sha1 = "f46b8193109bba8a58e0461c1a48f4534051fb25"; - }; - linux = fetchurl { - url = "https://dl.google.com/android/repository/android-ndk-r19c-linux-x86_64.zip"; - sha1 = "fd94d0be6017c6acbd193eb95e09cf4b6f61b834"; - }; - - }; - }; - - "ndk"."20.0.5392854-rc2" = { - - name = "ndk"; - path = "ndk/20.0.5392854"; - revision = "20.0.5392854-rc2"; - displayName = "NDK (Side by side) 20.0.5392854"; - archives = { - macosx = fetchurl { - url = "https://dl.google.com/android/repository/android-ndk-r20-beta2-darwin-x86_64.zip"; - sha1 = "cd94191ace6b31ec9af1cc370173e16934e1cb8b"; - }; - linux = fetchurl { - url = "https://dl.google.com/android/repository/android-ndk-r20-beta2-linux-x86_64.zip"; - sha1 = "8285ae2e24a7232fd0cbfb55e955c8586ef2ee02"; - }; - - }; - }; - - "ndk"."20.0.5471264-rc3" = { - - name = "ndk"; - path = "ndk/20.0.5471264"; - revision = "20.0.5471264-rc3"; - displayName = "NDK (Side by side) 20.0.5471264"; - archives = { - macosx = fetchurl { - url = "https://dl.google.com/android/repository/android-ndk-r20-beta3-darwin-x86_64.zip"; - sha1 = "665a035cadb0dd03e6502ba25c18643f6e4ede24"; - }; - linux = fetchurl { - url = "https://dl.google.com/android/repository/android-ndk-r20-beta3-linux-x86_64.zip"; - sha1 = "674d8fb0e0df8e8be1c31fa321eb176548a19ba3"; - }; - - }; - }; - - "ndk"."20.0.5594570" = { - - name = "ndk"; - path = "ndk/20.0.5594570"; - revision = "20.0.5594570"; - displayName = "NDK (Side by side) 20.0.5594570"; - archives = { - macosx = fetchurl { - url = "https://dl.google.com/android/repository/android-ndk-r20-darwin-x86_64.zip"; - sha1 = "96d5f1c50452596912d1982439c514194b5751e6"; - }; - linux = fetchurl { - url = "https://dl.google.com/android/repository/android-ndk-r20-linux-x86_64.zip"; - sha1 = "8665fc84a1b1f0d6ab3b5fdd1e30200cc7b9adff"; - }; - - }; - }; - - "ndk"."20.1.5948944" = { - - name = "ndk"; - path = "ndk/20.1.5948944"; - revision = "20.1.5948944"; - displayName = "NDK (Side by side) 20.1.5948944"; - archives = { - macosx = fetchurl { - url = "https://dl.google.com/android/repository/android-ndk-r20b-darwin-x86_64.zip"; - sha1 = "b51290ab69cb89de1f0ba108702277bc333b38be"; - }; - linux = fetchurl { - url = "https://dl.google.com/android/repository/android-ndk-r20b-linux-x86_64.zip"; - sha1 = "d903fdf077039ad9331fb6c3bee78aa46d45527b"; - }; - - }; - }; - - "ndk"."21.0.6011959-rc2" = { - - name = "ndk"; - path = "ndk/21.0.6011959"; - revision = "21.0.6011959-rc2"; - displayName = "NDK (Side by side) 21.0.6011959"; - archives = { - macosx = fetchurl { - url = "https://dl.google.com/android/repository/android-ndk-r21-beta2-darwin-x86_64.zip"; - sha1 = "34a46c3867c9d87a80895c0b8a098256052536d2"; - }; - linux = fetchurl { - url = "https://dl.google.com/android/repository/android-ndk-r21-beta2-linux-x86_64.zip"; - sha1 = "335f30302bee700a9a5fdfe3ae533a4963499c44"; - }; - - }; - }; - - "ndk"."21.0.6113669" = { - - name = "ndk"; - path = "ndk/21.0.6113669"; - revision = "21.0.6113669"; - displayName = "NDK (Side by side) 21.0.6113669"; - archives = { - macosx = fetchurl { - url = "https://dl.google.com/android/repository/android-ndk-r21-darwin-x86_64.zip"; - sha1 = "0d50636cc0e34ed3ba540d6d5818ea0cf10f16aa"; - }; - linux = fetchurl { - url = "https://dl.google.com/android/repository/android-ndk-r21-linux-x86_64.zip"; - sha1 = "afc9c0b9faad222898ac8168c78ad4ccac8a1b5c"; - }; - - }; - }; - - "ndk"."21.1.6210238-rc1" = { - - name = "ndk"; - path = "ndk/21.1.6210238"; - revision = "21.1.6210238-rc1"; - displayName = "NDK (Side by side) 21.1.6210238"; - archives = { - macosx = fetchurl { - url = "https://dl.google.com/android/repository/android-ndk-r21b-beta1-darwin-x86_64.zip"; - sha1 = "971609f9a579ebbcb8d121a5d5aa0cba716b2d1f"; - }; - linux = fetchurl { - url = "https://dl.google.com/android/repository/android-ndk-r21b-beta1-linux-x86_64.zip"; - sha1 = "cf06ed408663c11c8f4824f9370c7a900ec074dd"; - }; - - }; - }; - - "patcher"."1" = { - - name = "patcher"; - path = "patcher/v4"; - revision = "1"; - displayName = "SDK Patch Applier v4"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/3534162-studio.sdk-patcher.zip"; - sha1 = "046699c5e2716ae11d77e0bad814f7f33fab261e"; - }; - - }; - }; - - "platform-tools"."29.0.6" = { - - name = "platform-tools"; - path = "platform-tools"; - revision = "29.0.6"; - displayName = "Android SDK Platform-Tools"; - archives = { - macosx = fetchurl { - url = "https://dl.google.com/android/repository/platform-tools_r29.0.6-darwin.zip"; - sha1 = "3232179dce22d8a6332018729026ed39f5d5cd0b"; - }; - linux = fetchurl { - url = "https://dl.google.com/android/repository/platform-tools_r29.0.6-linux.zip"; - sha1 = "e95ed28330406705d47fe96bafb589be6c1f2f23"; - }; - - }; - }; - - "platforms"."10" = { - - name = "platforms"; - path = "platforms/android-10"; - revision = "10"; - displayName = "Android SDK Platform 10"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/android-2.3.3_r02.zip"; - sha1 = "887e37783ec32f541ea33c2c649dda648e8e6fb3"; - }; - - }; - }; - - "platforms"."11" = { - - name = "platforms"; - path = "platforms/android-11"; - revision = "11"; - displayName = "Android SDK Platform 11"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/android-3.0_r02.zip"; - sha1 = "2c7d4bd13f276e76f6bbd87315fe27aba351dd37"; - }; - - }; - }; - - "platforms"."12" = { - - name = "platforms"; - path = "platforms/android-12"; - revision = "12"; - displayName = "Android SDK Platform 12"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/android-3.1_r03.zip"; - sha1 = "4a50a6679cd95bb68bb5fc032e754cd7c5e2b1bf"; - }; - - }; - }; - - "platforms"."13" = { - - name = "platforms"; - path = "platforms/android-13"; - revision = "13"; - displayName = "Android SDK Platform 13"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/android-3.2_r01.zip"; - sha1 = "6189a500a8c44ae73a439604363de93591163cd9"; - }; - - }; - }; - - "platforms"."14" = { - - name = "platforms"; - path = "platforms/android-14"; - revision = "14"; - displayName = "Android SDK Platform 14"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/android-14_r04.zip"; - sha1 = "d4f1d8fbca25225b5f0e7a0adf0d39c3d6e60b3c"; - }; - - }; - }; - - "platforms"."15" = { - - name = "platforms"; - path = "platforms/android-15"; - revision = "15"; - displayName = "Android SDK Platform 15"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/android-15_r05.zip"; - sha1 = "69ab4c443b37184b2883af1fd38cc20cbeffd0f3"; - }; - - }; - }; - - "platforms"."16" = { - - name = "platforms"; - path = "platforms/android-16"; - revision = "16"; - displayName = "Android SDK Platform 16"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/android-16_r05.zip"; - sha1 = "12a5ce6235a76bc30f62c26bda1b680e336abd07"; - }; - - }; - }; - - "platforms"."17" = { - - name = "platforms"; - path = "platforms/android-17"; - revision = "17"; - displayName = "Android SDK Platform 17"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/android-17_r03.zip"; - sha1 = "dbe14101c06e6cdb34e300393e64e64f8c92168a"; - }; - - }; - }; - - "platforms"."18" = { - - name = "platforms"; - path = "platforms/android-18"; - revision = "18"; - displayName = "Android SDK Platform 18"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/android-18_r03.zip"; - sha1 = "e6b09b3505754cbbeb4a5622008b907262ee91cb"; - }; - - }; - }; - - "platforms"."19" = { - - name = "platforms"; - path = "platforms/android-19"; - revision = "19"; - displayName = "Android SDK Platform 19"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/android-19_r04.zip"; - sha1 = "2ff20d89e68f2f5390981342e009db5a2d456aaa"; - }; - - }; - }; - - "platforms"."2" = { - - name = "platforms"; - path = "platforms/android-2"; - revision = "2"; - displayName = "Android SDK Platform 2"; - archives = { - linux = fetchurl { - url = "https://dl.google.com/android/repository/android-1.1_r1-linux.zip"; - sha1 = "c054d25c9b4c6251fa49c2f9c54336998679d3fe"; - }; - macosx = fetchurl { - url = "https://dl.google.com/android/repository/android-1.1_r1-macosx.zip"; - sha1 = "e21dbcff45b7356657449ebb3c7e941be2bb5ebe"; - }; - - }; - }; - - "platforms"."20" = { - - name = "platforms"; - path = "platforms/android-20"; - revision = "20"; - displayName = "Android SDK Platform 20"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/android-20_r02.zip"; - sha1 = "a9251f8a3f313ab05834a07a963000927637e01d"; - }; - - }; - }; - - "platforms"."21" = { - - name = "platforms"; - path = "platforms/android-21"; - revision = "21"; - displayName = "Android SDK Platform 21"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/android-21_r02.zip"; - sha1 = "53536556059bb29ae82f414fd2e14bc335a4eb4c"; - }; - - }; - }; - - "platforms"."22" = { - - name = "platforms"; - path = "platforms/android-22"; - revision = "22"; - displayName = "Android SDK Platform 22"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/android-22_r02.zip"; - sha1 = "5d1bd10fea962b216a0dece1247070164760a9fc"; - }; - - }; - }; - - "platforms"."23" = { - - name = "platforms"; - path = "platforms/android-23"; - revision = "23"; - displayName = "Android SDK Platform 23"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/platform-23_r03.zip"; - sha1 = "027fede3de6aa1649115bbd0bffff30ccd51c9a0"; - }; - - }; - }; - - "platforms"."24" = { - - name = "platforms"; - path = "platforms/android-24"; - revision = "24"; - displayName = "Android SDK Platform 24"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/platform-24_r02.zip"; - sha1 = "8912da3d4bfe7a9f28f0e5ce92d3a8dc96342aee"; - }; - - }; - }; - - "platforms"."25" = { - - name = "platforms"; - path = "platforms/android-25"; - revision = "25"; - displayName = "Android SDK Platform 25"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/platform-25_r03.zip"; - sha1 = "00c2c5765e8988504be10a1eb66ed71fcdbd7fe8"; - }; - - }; - }; - - "platforms"."26" = { - - name = "platforms"; - path = "platforms/android-26"; - revision = "26"; - displayName = "Android SDK Platform 26"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/platform-26_r02.zip"; - sha1 = "e4ae5d7aa557a3c827135838ee400da8443ac4ef"; - }; - - }; - }; - - "platforms"."27" = { - - name = "platforms"; - path = "platforms/android-27"; - revision = "27"; - displayName = "Android SDK Platform 27"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/platform-27_r03.zip"; - sha1 = "35f747e7e70b2d16e0e4246876be28d15ea1c353"; - }; - - }; - }; - - "platforms"."28" = { - - name = "platforms"; - path = "platforms/android-28"; - revision = "28"; - displayName = "Android SDK Platform 28"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/platform-28_r06.zip"; - sha1 = "9a4e52b1d55bd2e24216b150aafae2503d3efba6"; - }; - - }; - }; - - "platforms"."29" = { - - name = "platforms"; - path = "platforms/android-29"; - revision = "29"; - displayName = "Android SDK Platform 29"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/platform-29_r04.zip"; - sha1 = "8d644c39902038e0bd529165d5ba4f5a8607daea"; - }; - - }; - }; - - "platforms"."3" = { - - name = "platforms"; - path = "platforms/android-3"; - revision = "3"; - displayName = "Android SDK Platform 3"; - archives = { - linux = fetchurl { - url = "https://dl.google.com/android/repository/android-1.5_r04-linux.zip"; - sha1 = "5c134b7df5f4b8bd5b61ba93bdaebada8fa3468c"; - }; - macosx = fetchurl { - url = "https://dl.google.com/android/repository/android-1.5_r04-macosx.zip"; - sha1 = "d3a67c2369afa48b6c3c7624de5031c262018d1e"; - }; - - }; - }; - - "platforms"."4" = { - - name = "platforms"; - path = "platforms/android-4"; - revision = "4"; - displayName = "Android SDK Platform 4"; - archives = { - linux = fetchurl { - url = "https://dl.google.com/android/repository/android-1.6_r03-linux.zip"; - sha1 = "483ed088e45bbdf3444baaf9250c8b02e5383cb0"; - }; - macosx = fetchurl { - url = "https://dl.google.com/android/repository/android-1.6_r03-macosx.zip"; - sha1 = "bdafad44f5df9f127979bdb21a1fdd87ee3cd625"; - }; - - }; - }; - - "platforms"."5" = { - - name = "platforms"; - path = "platforms/android-5"; - revision = "5"; - displayName = "Android SDK Platform 5"; - archives = { - linux = fetchurl { - url = "https://dl.google.com/android/repository/android-2.0_r01-linux.zip"; - sha1 = "be9be6a99ca32875c96ec7f91160ca9fce7e3c7d"; - }; - macosx = fetchurl { - url = "https://dl.google.com/android/repository/android-2.0_r01-macosx.zip"; - sha1 = "2a866d0870dbba18e0503cd41e5fae988a21b314"; - }; - - }; - }; - - "platforms"."6" = { - - name = "platforms"; - path = "platforms/android-6"; - revision = "6"; - displayName = "Android SDK Platform 6"; - archives = { - linux = fetchurl { - url = "https://dl.google.com/android/repository/android-2.0.1_r01-linux.zip"; - sha1 = "ce2c971dce352aa28af06bda92a070116aa5ae1a"; - }; - macosx = fetchurl { - url = "https://dl.google.com/android/repository/android-2.0.1_r01-macosx.zip"; - sha1 = "c3096f80d75a6fc8cb38ef8a18aec920e53d42c0"; - }; - - }; - }; - - "platforms"."7" = { - - name = "platforms"; - path = "platforms/android-7"; - revision = "7"; - displayName = "Android SDK Platform 7"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/android-2.1_r03.zip"; - sha1 = "5ce51b023ac19f8738500b1007a1da5de2349a1e"; - }; - - }; - }; - - "platforms"."8" = { - - name = "platforms"; - path = "platforms/android-8"; - revision = "8"; - displayName = "Android SDK Platform 8"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/android-2.2_r03.zip"; - sha1 = "231262c63eefdff8fd0386e9ccfefeb27a8f9202"; - }; - - }; - }; - - "platforms"."9" = { - - name = "platforms"; - path = "platforms/android-9"; - revision = "9"; - displayName = "Android SDK Platform 9"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/android-2.3.1_r02.zip"; - sha1 = "209f8a7a8b2cb093fce858b8b55fed3ba5206773"; - }; - - }; - }; - - "platforms"."R" = { - - name = "platforms"; - path = "platforms/android-R"; - revision = "R"; - displayName = "Android SDK Platform R"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/platform-R_r01.zip"; - sha1 = "f6ce3ef0ec8526550fc3b517bdb29051275bcd1a"; - }; - - }; - }; - - "skiaparser"."1-rc02" = { - - name = "skiaparser"; - path = "skiaparser/1"; - revision = "1-rc02"; - displayName = "Skia Parser Server"; - archives = { - linux = fetchurl { - url = "https://dl.google.com/android/repository/skiaparser-6172737-linux.zip"; - sha1 = "d2eac6deff2c257d47853251bda5528c96a41720"; - }; - macosx = fetchurl { - url = "https://dl.google.com/android/repository/skiaparser-6172737-mac.zip"; - sha1 = "1e3b8da7a4f5e9887479b4e4186db3cb22422c82"; - }; - - }; - }; - - "sources"."14" = { - - name = "sources"; - path = "sources/android-14"; - revision = "14"; - displayName = "Sources for Android 14"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/sources-14_r01.zip"; - sha1 = "eaf4ed7dcac46e68516a1b4aa5b0d9e5a39a7555"; - }; - - }; - }; - - "sources"."15" = { - - name = "sources"; - path = "sources/android-15"; - revision = "15"; - displayName = "Sources for Android 15"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/sources-15_r02.zip"; - sha1 = "e5992a5747c9590783fbbdd700337bf0c9f6b1fa"; - }; - - }; - }; - - "sources"."16" = { - - name = "sources"; - path = "sources/android-16"; - revision = "16"; - displayName = "Sources for Android 16"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/sources-16_r02.zip"; - sha1 = "0f83c14ed333c45d962279ab5d6bc98a0269ef84"; - }; - - }; - }; - - "sources"."17" = { - - name = "sources"; - path = "sources/android-17"; - revision = "17"; - displayName = "Sources for Android 17"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/sources-17_r01.zip"; - sha1 = "6f1f18cd2d2b1852d7f6892df9cee3823349d43a"; - }; - - }; - }; - - "sources"."18" = { - - name = "sources"; - path = "sources/android-18"; - revision = "18"; - displayName = "Sources for Android 18"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/sources-18_r01.zip"; - sha1 = "8b49fdf7433f4881a2bfb559b5dd05d8ec65fb78"; - }; - - }; - }; - - "sources"."19" = { - - name = "sources"; - path = "sources/android-19"; - revision = "19"; - displayName = "Sources for Android 19"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/sources-19_r02.zip"; - sha1 = "433a1d043ef77561571250e94cb7a0ef24a202e7"; - }; - - }; - }; - - "sources"."20" = { - - name = "sources"; - path = "sources/android-20"; - revision = "20"; - displayName = "Sources for Android 20"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/sources-20_r01.zip"; - sha1 = "8da3e40f2625f9f7ef38b7e403f49f67226c0d76"; - }; - - }; - }; - - "sources"."21" = { - - name = "sources"; - path = "sources/android-21"; - revision = "21"; - displayName = "Sources for Android 21"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/sources-21_r01.zip"; - sha1 = "137a5044915d32bea297a8c1552684802bbc2e25"; - }; - - }; - }; - - "sources"."22" = { - - name = "sources"; - path = "sources/android-22"; - revision = "22"; - displayName = "Sources for Android 22"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/sources-22_r01.zip"; - sha1 = "98320e13976d11597a4a730a8d203ac9a03ed5a6"; - }; - - }; - }; - - "sources"."23" = { - - name = "sources"; - path = "sources/android-23"; - revision = "23"; - displayName = "Sources for Android 23"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/sources-23_r01.zip"; - sha1 = "b0f15da2762b42f543c5e364c2b15b198cc99cc2"; - }; - - }; - }; - - "sources"."24" = { - - name = "sources"; - path = "sources/android-24"; - revision = "24"; - displayName = "Sources for Android 24"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/sources-24_r01.zip"; - sha1 = "6b96115830a83d654479f32ce4b724ca9011148b"; - }; - - }; - }; - - "sources"."25" = { - - name = "sources"; - path = "sources/android-25"; - revision = "25"; - displayName = "Sources for Android 25"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/sources-25_r01.zip"; - sha1 = "bbc72efd1a9bad87cc507e308f0d29aad438c52c"; - }; - - }; - }; - - "sources"."26" = { - - name = "sources"; - path = "sources/android-26"; - revision = "26"; - displayName = "Sources for Android 26"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/sources-26_r01.zip"; - sha1 = "2af701ee3223d580409288540b1d06932fd8f9b9"; - }; - - }; - }; - - "sources"."27" = { - - name = "sources"; - path = "sources/android-27"; - revision = "27"; - displayName = "Sources for Android 27"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/sources-27_r01.zip"; - sha1 = "7b714670561d08f54751af42aca929867b806596"; - }; - - }; - }; - - "sources"."28" = { - - name = "sources"; - path = "sources/android-28"; - revision = "28"; - displayName = "Sources for Android 28"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/sources-28_r01.zip"; - sha1 = "5610e0c24235ee3fa343c899ddd551be30315255"; - }; - - }; - }; - - "sources"."29" = { - - name = "sources"; - path = "sources/android-29"; - revision = "29"; - displayName = "Sources for Android 29"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/sources-29_r01.zip"; - sha1 = "d0ad249e152b3a8fe3cb7c4a329453a048be29e4"; - }; - - }; - }; - - "tools"."25.2.5" = { - - name = "tools"; - path = "tools"; - revision = "25.2.5"; - displayName = "Android SDK Tools 25.2.5"; - archives = { - linux = fetchurl { - url = "https://dl.google.com/android/repository/tools_r25.2.5-linux.zip"; - sha1 = "72df3aa1988c0a9003ccdfd7a13a7b8bd0f47fc1"; - }; - macosx = fetchurl { - url = "https://dl.google.com/android/repository/tools_r25.2.5-macosx.zip"; - sha1 = "d2168d963ac5b616e3d3ddaf21511d084baf3659"; - }; - - }; - }; - - "tools"."26.1.1" = { - - name = "tools"; - path = "tools"; - revision = "26.1.1"; - displayName = "Android SDK Tools"; - archives = { - macosx = fetchurl { - url = "https://dl.google.com/android/repository/sdk-tools-darwin-4333796.zip"; - sha1 = "ed85ea7b59bc3483ce0af4c198523ba044e083ad"; - }; - linux = fetchurl { - url = "https://dl.google.com/android/repository/sdk-tools-linux-4333796.zip"; - sha1 = "8c7c28554a32318461802c1291d76fccfafde054"; - }; - - }; - }; - -} - diff --git a/pkgs/development/mobile/androidenv/generated/system-images-android-tv.nix b/pkgs/development/mobile/androidenv/generated/system-images-android-tv.nix deleted file mode 100644 index 22da6ee9800c..000000000000 --- a/pkgs/development/mobile/androidenv/generated/system-images-android-tv.nix +++ /dev/null @@ -1,114 +0,0 @@ -{fetchurl}: - -{ - "21".android-tv."x86" = { - name = "system-image-21-android-tv-x86"; - path = "system-images/android-21/android-tv/x86"; - revision = "21-android-tv-x86"; - displayName = "Android TV Intel x86 Atom System Image"; - archives.all = fetchurl { - url = "https://dl.google.com/android/repository/sys-img/android-tv/x86-21_r03.zip"; - sha1 = "2f8a1988188d6abfd6c6395baeb4471a034dc1e8"; - }; - }; - "21".android-tv."armeabi-v7a" = { - name = "system-image-21-android-tv-armeabi-v7a"; - path = "system-images/android-21/android-tv/armeabi-v7a"; - revision = "21-android-tv-armeabi-v7a"; - displayName = "Android TV ARM EABI v7a System Image"; - archives.all = fetchurl { - url = "https://dl.google.com/android/repository/sys-img/android-tv/armeabi-v7a-21_r03.zip"; - sha1 = "b63e28a47f11b639dd94981a458b7abfa89ac331"; - }; - }; - "22".android-tv."x86" = { - name = "system-image-22-android-tv-x86"; - path = "system-images/android-22/android-tv/x86"; - revision = "22-android-tv-x86"; - displayName = "Android TV Intel x86 Atom System Image"; - archives.all = fetchurl { - url = "https://dl.google.com/android/repository/sys-img/android-tv/x86-22_r03.zip"; - sha1 = "c78efd5a155622eb490be9d326f5783993375c35"; - }; - }; - "23".android-tv."x86" = { - name = "system-image-23-android-tv-x86"; - path = "system-images/android-23/android-tv/x86"; - revision = "23-android-tv-x86"; - displayName = "Android TV Intel x86 Atom System Image"; - archives.all = fetchurl { - url = "https://dl.google.com/android/repository/sys-img/android-tv/x86-23_r19.zip"; - sha1 = "47e8d6b08a337a0672f0f105bf907d39ed9457ec"; - }; - }; - "23".android-tv."armeabi-v7a" = { - name = "system-image-23-android-tv-armeabi-v7a"; - path = "system-images/android-23/android-tv/armeabi-v7a"; - revision = "23-android-tv-armeabi-v7a"; - displayName = "Android TV ARM EABI v7a System Image"; - archives.all = fetchurl { - url = "https://dl.google.com/android/repository/sys-img/android-tv/armeabi-v7a-23_r12.zip"; - sha1 = "bd84678ae8caf71d584f5210e866b2807e7b4b52"; - }; - }; - "24".android-tv."x86" = { - name = "system-image-24-android-tv-x86"; - path = "system-images/android-24/android-tv/x86"; - revision = "24-android-tv-x86"; - displayName = "Android TV Intel x86 Atom System Image"; - archives.all = fetchurl { - url = "https://dl.google.com/android/repository/sys-img/android-tv/x86-24_r20.zip"; - sha1 = "0b8cd98dec9ebd04376ce4f6e270193ceae8acea"; - }; - }; - "25".android-tv."x86" = { - name = "system-image-25-android-tv-x86"; - path = "system-images/android-25/android-tv/x86"; - revision = "25-android-tv-x86"; - displayName = "Android TV Intel x86 Atom System Image"; - archives.all = fetchurl { - url = "https://dl.google.com/android/repository/sys-img/android-tv/x86-25_r14.zip"; - sha1 = "1c88f11683375c059803c3a7be8e880cc23a6f9a"; - }; - }; - "26".android-tv."x86" = { - name = "system-image-26-android-tv-x86"; - path = "system-images/android-26/android-tv/x86"; - revision = "26-android-tv-x86"; - displayName = "Android TV Intel x86 Atom System Image"; - archives.all = fetchurl { - url = "https://dl.google.com/android/repository/sys-img/android-tv/x86-26_r12.zip"; - sha1 = "d8b12e543925a0454403d2a854996a76410ec374"; - }; - }; - "27".android-tv."x86" = { - name = "system-image-27-android-tv-x86"; - path = "system-images/android-27/android-tv/x86"; - revision = "27-android-tv-x86"; - displayName = "Android TV Intel x86 Atom System Image"; - archives.all = fetchurl { - url = "https://dl.google.com/android/repository/sys-img/android-tv/x86-27_r07.zip"; - sha1 = "5ed40e568c0d8d023c5b6c76634b22a477ed54aa"; - }; - }; - "28".android-tv."x86" = { - name = "system-image-28-android-tv-x86"; - path = "system-images/android-28/android-tv/x86"; - revision = "28-android-tv-x86"; - displayName = "Android TV Intel x86 Atom System Image"; - archives.all = fetchurl { - url = "https://dl.google.com/android/repository/sys-img/android-tv/x86-28_r08.zip"; - sha1 = "f5f8f296dfaca7945434992761c8d47d50257c21"; - }; - }; - "Q".android-tv."x86" = { - name = "system-image-Q-android-tv-x86"; - path = "system-images/android-Q/android-tv/x86"; - revision = "Q-android-tv-x86"; - displayName = "Android TV Intel x86 Atom System Image"; - archives.all = fetchurl { - url = "https://dl.google.com/android/repository/sys-img/android-tv/x86-Q_r01.zip"; - sha1 = "80c66ddce0dbe53fe6fedcade230d518112fffb1"; - }; - }; -} diff --git a/pkgs/development/mobile/androidenv/generated/system-images-android-wear-cn.nix b/pkgs/development/mobile/androidenv/generated/system-images-android-wear-cn.nix deleted file mode 100644 index 36ff0b01cd6d..000000000000 --- a/pkgs/development/mobile/androidenv/generated/system-images-android-wear-cn.nix +++ /dev/null @@ -1,44 +0,0 @@ -{fetchurl}: - -{ - "25".android-wear."armeabi-v7a" = { - name = "system-image-25-android-wear-armeabi-v7a"; - path = "system-images/android-25/android-wear-cn/armeabi-v7a"; - revision = "25-android-wear-armeabi-v7a"; - displayName = "China version of Android Wear ARM EABI v7a System Image"; - archives.all = fetchurl { - url = "https://dl.google.com/android/repository/sys-img/android-wear-cn/armeabi-v7a-25_r04.zip"; - sha1 = "02d7bc86df054d1e89fe5856b3af1d2c142cab41"; - }; - }; - "25".android-wear."x86" = { - name = "system-image-25-android-wear-x86"; - path = "system-images/android-25/android-wear-cn/x86"; - revision = "25-android-wear-x86"; - displayName = "China version of Android Wear Intel x86 Atom System Image"; - archives.all = fetchurl { - url = "https://dl.google.com/android/repository/sys-img/android-wear-cn/x86-25_r04.zip"; - sha1 = "73eab14c7cf2f6941e1fee61e0038ead7a2c7f4d"; - }; - }; - "26".android-wear."x86" = { - name = "system-image-26-android-wear-x86"; - path = "system-images/android-26/android-wear-cn/x86"; - revision = "26-android-wear-x86"; - displayName = "China version of Android Wear Intel x86 Atom System Image"; - archives.all = fetchurl { - url = "https://dl.google.com/android/repository/sys-img/android-wear-cn/x86-26_r04.zip"; - sha1 = "fdc8a313f889a2d6522de1fbc00ee9e13547d096"; - }; - }; - "28".android-wear."x86" = { - name = "system-image-28-android-wear-x86"; - path = "system-images/android-28/android-wear-cn/x86"; - revision = "28-android-wear-x86"; - displayName = "China version of Wear OS Intel x86 Atom System Image"; - archives.all = fetchurl { - url = "https://dl.google.com/android/repository/sys-img/android-wear-cn/x86-28_r03.zip"; - sha1 = "2099d87709c5e064273925dbf2cf1fd081bf0262"; - }; - }; -} diff --git a/pkgs/development/mobile/androidenv/generated/system-images-android-wear.nix b/pkgs/development/mobile/androidenv/generated/system-images-android-wear.nix deleted file mode 100644 index e672c75031ff..000000000000 --- a/pkgs/development/mobile/androidenv/generated/system-images-android-wear.nix +++ /dev/null @@ -1,64 +0,0 @@ -{fetchurl}: - -{ - "23".android-wear."armeabi-v7a" = { - name = "system-image-23-android-wear-armeabi-v7a"; - path = "system-images/android-23/android-wear/armeabi-v7a"; - revision = "23-android-wear-armeabi-v7a"; - displayName = "Android Wear ARM EABI v7a System Image"; - archives.all = fetchurl { - url = "https://dl.google.com/android/repository/sys-img/android-wear/armeabi-v7a-23_r06.zip"; - sha1 = "0df5d34b1cdaaaa3805a2f06bb889901eabe2e71"; - }; - }; - "23".android-wear."x86" = { - name = "system-image-23-android-wear-x86"; - path = "system-images/android-23/android-wear/x86"; - revision = "23-android-wear-x86"; - displayName = "Android Wear Intel x86 Atom System Image"; - archives.all = fetchurl { - url = "https://dl.google.com/android/repository/sys-img/android-wear/x86-23_r06.zip"; - sha1 = "3b15c123f3f71459d5b60c1714d49c5d90a5525e"; - }; - }; - "25".android-wear."armeabi-v7a" = { - name = "system-image-25-android-wear-armeabi-v7a"; - path = "system-images/android-25/android-wear/armeabi-v7a"; - revision = "25-android-wear-armeabi-v7a"; - displayName = "Android Wear ARM EABI v7a System Image"; - archives.all = fetchurl { - url = "https://dl.google.com/android/repository/sys-img/android-wear/armeabi-v7a-25_r03.zip"; - sha1 = "76d3568a4e08023047af7d13025a35c9bf1d7e5c"; - }; - }; - "25".android-wear."x86" = { - name = "system-image-25-android-wear-x86"; - path = "system-images/android-25/android-wear/x86"; - revision = "25-android-wear-x86"; - displayName = "Android Wear Intel x86 Atom System Image"; - archives.all = fetchurl { - url = "https://dl.google.com/android/repository/sys-img/android-wear/x86-25_r03.zip"; - sha1 = "693fce7b487a65491a4e88e9f740959688c9dbe6"; - }; - }; - "26".android-wear."x86" = { - name = "system-image-26-android-wear-x86"; - path = "system-images/android-26/android-wear/x86"; - revision = "26-android-wear-x86"; - displayName = "Android Wear Intel x86 Atom System Image"; - archives.all = fetchurl { - url = "https://dl.google.com/android/repository/sys-img/android-wear/x86-26_r04.zip"; - sha1 = "fbffa91b936ca18fcc1e0bab2b52a8b0835cbb1c"; - }; - }; - "28".android-wear."x86" = { - name = "system-image-28-android-wear-x86"; - path = "system-images/android-28/android-wear/x86"; - revision = "28-android-wear-x86"; - displayName = "Wear OS Intel x86 Atom System Image"; - archives.all = fetchurl { - url = "https://dl.google.com/android/repository/sys-img/android-wear/x86-28_r03.zip"; - sha1 = "b80bd53ab69f19441714bff2e4d55931e6d3f7be"; - }; - }; -} diff --git a/pkgs/development/mobile/androidenv/generated/system-images-android.nix b/pkgs/development/mobile/androidenv/generated/system-images-android.nix deleted file mode 100644 index f5863cb0d4e8..000000000000 --- a/pkgs/development/mobile/androidenv/generated/system-images-android.nix +++ /dev/null @@ -1,364 +0,0 @@ -{fetchurl}: - -{ - "10".default."armeabi-v7a" = { - name = "system-image-10-default-armeabi-v7a"; - path = "system-images/android-10/default/armeabi-v7a"; - revision = "10-default-armeabi-v7a"; - displayName = "ARM EABI v7a System Image"; - archives.all = fetchurl { - url = "https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-10_r05.zip"; - sha1 = "8537616a7add47cce24c60f18bc2429e3dc90ae3"; - }; - }; - "14".default."armeabi-v7a" = { - name = "system-image-14-default-armeabi-v7a"; - path = "system-images/android-14/default/armeabi-v7a"; - revision = "14-default-armeabi-v7a"; - displayName = "ARM EABI v7a System Image"; - archives.all = fetchurl { - url = "https://dl.google.com/android/repository/sys-img/android/sysimg_armv7a-14_r02.zip"; - sha1 = "d8991b0c06b18d7d6ed4169d67460ee1add6661b"; - }; - }; - "15".default."armeabi-v7a" = { - name = "system-image-15-default-armeabi-v7a"; - path = "system-images/android-15/default/armeabi-v7a"; - revision = "15-default-armeabi-v7a"; - displayName = "ARM EABI v7a System Image"; - archives.all = fetchurl { - url = "https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-15_r05.zip"; - sha1 = "03d7ed95a9d3b107e3f2e5b166d017ea12529e70"; - }; - }; - "16".default."armeabi-v7a" = { - name = "system-image-16-default-armeabi-v7a"; - path = "system-images/android-16/default/armeabi-v7a"; - revision = "16-default-armeabi-v7a"; - displayName = "ARM EABI v7a System Image"; - archives.all = fetchurl { - url = "https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-16_r06.zip"; - sha1 = "69b944b0d5a18c8563fa80d7d229af64890f724e"; - }; - }; - "17".default."armeabi-v7a" = { - name = "system-image-17-default-armeabi-v7a"; - path = "system-images/android-17/default/armeabi-v7a"; - revision = "17-default-armeabi-v7a"; - displayName = "ARM EABI v7a System Image"; - archives.all = fetchurl { - url = "https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-17_r06.zip"; - sha1 = "a18a3fd0958ec4ef52507f58e414fc5c7dfd59d6"; - }; - }; - "18".default."armeabi-v7a" = { - name = "system-image-18-default-armeabi-v7a"; - path = "system-images/android-18/default/armeabi-v7a"; - revision = "18-default-armeabi-v7a"; - displayName = "ARM EABI v7a System Image"; - archives.all = fetchurl { - url = "https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-18_r05.zip"; - sha1 = "580b583720f7de671040d5917c8c9db0c7aa03fd"; - }; - }; - "19".default."armeabi-v7a" = { - name = "system-image-19-default-armeabi-v7a"; - path = "system-images/android-19/default/armeabi-v7a"; - revision = "19-default-armeabi-v7a"; - displayName = "ARM EABI v7a System Image"; - archives.all = fetchurl { - url = "https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-19_r05.zip"; - sha1 = "d1a5fd4f2e1c013c3d3d9bfe7e9db908c3ed56fa"; - }; - }; - "21".default."armeabi-v7a" = { - name = "system-image-21-default-armeabi-v7a"; - path = "system-images/android-21/default/armeabi-v7a"; - revision = "21-default-armeabi-v7a"; - displayName = "ARM EABI v7a System Image"; - archives.all = fetchurl { - url = "https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-21_r04.zip"; - sha1 = "8c606f81306564b65e41303d2603e4c42ded0d10"; - }; - }; - "22".default."armeabi-v7a" = { - name = "system-image-22-default-armeabi-v7a"; - path = "system-images/android-22/default/armeabi-v7a"; - revision = "22-default-armeabi-v7a"; - displayName = "ARM EABI v7a System Image"; - archives.all = fetchurl { - url = "https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-22_r02.zip"; - sha1 = "2114ec015dbf3a16cbcb4f63e8a84a1b206a07a1"; - }; - }; - "23".default."armeabi-v7a" = { - name = "system-image-23-default-armeabi-v7a"; - path = "system-images/android-23/default/armeabi-v7a"; - revision = "23-default-armeabi-v7a"; - displayName = "ARM EABI v7a System Image"; - archives.all = fetchurl { - url = "https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-23_r06.zip"; - sha1 = "7cf2ad756e54a3acfd81064b63cb0cb9dff2798d"; - }; - }; - "24".default."armeabi-v7a" = { - name = "system-image-24-default-armeabi-v7a"; - path = "system-images/android-24/default/armeabi-v7a"; - revision = "24-default-armeabi-v7a"; - displayName = "ARM EABI v7a System Image"; - archives.all = fetchurl { - url = "https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-24_r07.zip"; - sha1 = "3454546b4eed2d6c3dd06d47757d6da9f4176033"; - }; - }; - "24".default."arm64-v8a" = { - name = "system-image-24-default-arm64-v8a"; - path = "system-images/android-24/default/arm64-v8a"; - revision = "24-default-arm64-v8a"; - displayName = "ARM 64 v8a System Image"; - archives.all = fetchurl { - url = "https://dl.google.com/android/repository/sys-img/android/arm64-v8a-24_r07.zip"; - sha1 = "e8ab2e49e4efe4b064232b33b5eeaded61437d7f"; - }; - }; - "16".default."mips" = { - name = "system-image-16-default-mips"; - path = "system-images/android-16/default/mips"; - revision = "16-default-mips"; - displayName = "MIPS System Image"; - archives.all = fetchurl { - url = "https://dl.google.com/android/repository/sys-img/android/sysimg_mips-16_r04.zip"; - sha1 = "67943c54fb3943943ffeb05fdd39c0b753681f6e"; - }; - }; - "17".default."mips" = { - name = "system-image-17-default-mips"; - path = "system-images/android-17/default/mips"; - revision = "17-default-mips"; - displayName = "MIPS System Image"; - archives.all = fetchurl { - url = "https://dl.google.com/android/repository/sys-img/android/sysimg_mips-17_r01.zip"; - sha1 = "f0c6e153bd584c29e51b5c9723cfbf30f996a05d"; - }; - }; - "10".default."x86" = { - name = "system-image-10-default-x86"; - path = "system-images/android-10/default/x86"; - revision = "10-default-x86"; - displayName = "Intel x86 Atom System Image"; - archives.all = fetchurl { - url = "https://dl.google.com/android/repository/sys-img/android/x86-10_r05.zip"; - sha1 = "a166d5ccbb165e1dd5464fbfeec30a61f77790d8"; - }; - }; - "15".default."x86" = { - name = "system-image-15-default-x86"; - path = "system-images/android-15/default/x86"; - revision = "15-default-x86"; - displayName = "Intel x86 Atom System Image"; - archives.all = fetchurl { - url = "https://dl.google.com/android/repository/sys-img/android/x86-15_r05.zip"; - sha1 = "c387e0efed2cdc610e5944eea67b7b692d03760c"; - }; - }; - "16".default."x86" = { - name = "system-image-16-default-x86"; - path = "system-images/android-16/default/x86"; - revision = "16-default-x86"; - displayName = "Intel x86 Atom System Image"; - archives.all = fetchurl { - url = "https://dl.google.com/android/repository/sys-img/android/x86-16_r06.zip"; - sha1 = "bf1bf8c5591346118d2235da1ad20e7be8a3e9cd"; - }; - }; - "17".default."x86" = { - name = "system-image-17-default-x86"; - path = "system-images/android-17/default/x86"; - revision = "17-default-x86"; - displayName = "Intel x86 Atom System Image"; - archives.all = fetchurl { - url = "https://dl.google.com/android/repository/sys-img/android/x86-17_r04.zip"; - sha1 = "03c6d022ab2dcbbcf655d78ba5ccb0431cadcaec"; - }; - }; - "18".default."x86" = { - name = "system-image-18-default-x86"; - path = "system-images/android-18/default/x86"; - revision = "18-default-x86"; - displayName = "Intel x86 Atom System Image"; - archives.all = fetchurl { - url = "https://dl.google.com/android/repository/sys-img/android/x86-18_r04.zip"; - sha1 = "7a4ced4d9b0ab48047825491b4072dc2eb9b610e"; - }; - }; - "19".default."x86" = { - name = "system-image-19-default-x86"; - path = "system-images/android-19/default/x86"; - revision = "19-default-x86"; - displayName = "Intel x86 Atom System Image"; - archives.all = fetchurl { - url = "https://dl.google.com/android/repository/sys-img/android/x86-19_r06.zip"; - sha1 = "2ac82153aae97f7eae4c5a0761224fe04321d03d"; - }; - }; - "21".default."x86" = { - name = "system-image-21-default-x86"; - path = "system-images/android-21/default/x86"; - revision = "21-default-x86"; - displayName = "Intel x86 Atom System Image"; - archives.all = fetchurl { - url = "https://dl.google.com/android/repository/sys-img/android/x86-21_r05.zip"; - sha1 = "00f0eb0a1003efe3316347f762e20a85d8749cff"; - }; - }; - "22".default."x86" = { - name = "system-image-22-default-x86"; - path = "system-images/android-22/default/x86"; - revision = "22-default-x86"; - displayName = "Intel x86 Atom System Image"; - archives.all = fetchurl { - url = "https://dl.google.com/android/repository/sys-img/android/x86-22_r06.zip"; - sha1 = "e33e2a6cc3f1cc56b2019dbef3917d2eeb26f54e"; - }; - }; - "23".default."x86" = { - name = "system-image-23-default-x86"; - path = "system-images/android-23/default/x86"; - revision = "23-default-x86"; - displayName = "Intel x86 Atom System Image"; - archives.all = fetchurl { - url = "https://dl.google.com/android/repository/sys-img/android/x86-23_r10.zip"; - sha1 = "f6c3e3dd7bd951454795aa75c3a145fd05ac25bb"; - }; - }; - "24".default."x86" = { - name = "system-image-24-default-x86"; - path = "system-images/android-24/default/x86"; - revision = "24-default-x86"; - displayName = "Intel x86 Atom System Image"; - archives.all = fetchurl { - url = "https://dl.google.com/android/repository/sys-img/android/x86-24_r08.zip"; - sha1 = "c1cae7634b0216c0b5990f2c144eb8ca948e3511"; - }; - }; - "25".default."x86" = { - name = "system-image-25-default-x86"; - path = "system-images/android-25/default/x86"; - revision = "25-default-x86"; - displayName = "Intel x86 Atom System Image"; - archives.all = fetchurl { - url = "https://dl.google.com/android/repository/sys-img/android/x86-25_r01.zip"; - sha1 = "78ce7eb1387d598685633b9f7cbb300c3d3aeb5f"; - }; - }; - "26".default."x86" = { - name = "system-image-26-default-x86"; - path = "system-images/android-26/default/x86"; - revision = "26-default-x86"; - displayName = "Intel x86 Atom System Image"; - archives.all = fetchurl { - url = "https://dl.google.com/android/repository/sys-img/android/x86-26_r01.zip"; - sha1 = "e613d6e0da668e30daf547f3c6627a6352846f90"; - }; - }; - "27".default."x86" = { - name = "system-image-27-default-x86"; - path = "system-images/android-27/default/x86"; - revision = "27-default-x86"; - displayName = "Intel x86 Atom System Image"; - archives.all = fetchurl { - url = "https://dl.google.com/android/repository/sys-img/android/x86-27_r01.zip"; - sha1 = "4ec990fac7b62958decd12e18a4cd389dfe7c582"; - }; - }; - "28".default."x86" = { - name = "system-image-28-default-x86"; - path = "system-images/android-28/default/x86"; - revision = "28-default-x86"; - displayName = "Intel x86 Atom System Image"; - archives.all = fetchurl { - url = "https://dl.google.com/android/repository/sys-img/android/x86-28_r04.zip"; - sha1 = "ce03c42d80c0fc6dc47f6455dbee7aa275d02780"; - }; - }; - "21".default."x86_64" = { - name = "system-image-21-default-x86_64"; - path = "system-images/android-21/default/x86_64"; - revision = "21-default-x86_64"; - displayName = "Intel x86 Atom_64 System Image"; - archives.all = fetchurl { - url = "https://dl.google.com/android/repository/sys-img/android/x86_64-21_r05.zip"; - sha1 = "9078a095825a69e5e215713f0866c83cef65a342"; - }; - }; - "22".default."x86_64" = { - name = "system-image-22-default-x86_64"; - path = "system-images/android-22/default/x86_64"; - revision = "22-default-x86_64"; - displayName = "Intel x86 Atom_64 System Image"; - archives.all = fetchurl { - url = "https://dl.google.com/android/repository/sys-img/android/x86_64-22_r06.zip"; - sha1 = "5db3b27f78cd9c4c5092b1cad5a5dd479fb5b2e4"; - }; - }; - "23".default."x86_64" = { - name = "system-image-23-default-x86_64"; - path = "system-images/android-23/default/x86_64"; - revision = "23-default-x86_64"; - displayName = "Intel x86 Atom_64 System Image"; - archives.all = fetchurl { - url = "https://dl.google.com/android/repository/sys-img/android/x86_64-23_r10.zip"; - sha1 = "7cbc291483ca07dc67b71268c5f08a5755f50f51"; - }; - }; - "24".default."x86_64" = { - name = "system-image-24-default-x86_64"; - path = "system-images/android-24/default/x86_64"; - revision = "24-default-x86_64"; - displayName = "Intel x86 Atom_64 System Image"; - archives.all = fetchurl { - url = "https://dl.google.com/android/repository/sys-img/android/x86_64-24_r08.zip"; - sha1 = "f6559e1949a5879f31a9662f4f0e50ad60181684"; - }; - }; - "25".default."x86_64" = { - name = "system-image-25-default-x86_64"; - path = "system-images/android-25/default/x86_64"; - revision = "25-default-x86_64"; - displayName = "Intel x86 Atom_64 System Image"; - archives.all = fetchurl { - url = "https://dl.google.com/android/repository/sys-img/android/x86_64-25_r01.zip"; - sha1 = "7093d7b39216020226ff430a3b7b81c94d31ad37"; - }; - }; - "26".default."x86_64" = { - name = "system-image-26-default-x86_64"; - path = "system-images/android-26/default/x86_64"; - revision = "26-default-x86_64"; - displayName = "Intel x86 Atom_64 System Image"; - archives.all = fetchurl { - url = "https://dl.google.com/android/repository/sys-img/android/x86_64-26_r01.zip"; - sha1 = "432f149c048bffce7f9de526ec65b336daf7a0a3"; - }; - }; - "27".default."x86_64" = { - name = "system-image-27-default-x86_64"; - path = "system-images/android-27/default/x86_64"; - revision = "27-default-x86_64"; - displayName = "Intel x86 Atom_64 System Image"; - archives.all = fetchurl { - url = "https://dl.google.com/android/repository/sys-img/android/x86_64-27_r01.zip"; - sha1 = "2878261011a59ca3de29dc5b457a495fdb268d60"; - }; - }; - "28".default."x86_64" = { - name = "system-image-28-default-x86_64"; - path = "system-images/android-28/default/x86_64"; - revision = "28-default-x86_64"; - displayName = "Intel x86 Atom_64 System Image"; - archives.all = fetchurl { - url = "https://dl.google.com/android/repository/sys-img/android/x86_64-28_r04.zip"; - sha1 = "d47a85c8f4e9fd57df97814ad8884eeb0f3a0ef0"; - }; - }; -} diff --git a/pkgs/development/mobile/androidenv/generated/system-images-google_apis.nix b/pkgs/development/mobile/androidenv/generated/system-images-google_apis.nix deleted file mode 100644 index a67ce9cfea40..000000000000 --- a/pkgs/development/mobile/androidenv/generated/system-images-google_apis.nix +++ /dev/null @@ -1,384 +0,0 @@ -{fetchurl}: - -{ - "10".google_apis."armeabi-v7a" = { - name = "system-image-10-google_apis-armeabi-v7a"; - path = "system-images/android-10/google_apis/armeabi-v7a"; - revision = "10-google_apis-armeabi-v7a"; - displayName = "Google APIs ARM EABI v7a System Image"; - archives.all = fetchurl { - url = "https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-10_r06.zip"; - sha1 = "970abf3a2a9937a43576afd9bb56e4a8191947f8"; - }; - }; - "10".google_apis."x86" = { - name = "system-image-10-google_apis-x86"; - path = "system-images/android-10/google_apis/x86"; - revision = "10-google_apis-x86"; - displayName = "Google APIs Intel x86 Atom System Image"; - archives.all = fetchurl { - url = "https://dl.google.com/android/repository/sys-img/google_apis/x86-10_r06.zip"; - sha1 = "070a9552e3d358d8e72e8b2042e539e2b7a1b035"; - }; - }; - "15".google_apis."x86" = { - name = "system-image-15-google_apis-x86"; - path = "system-images/android-15/google_apis/x86"; - revision = "15-google_apis-x86"; - displayName = "Google APIs Intel x86 Atom System Image"; - archives.all = fetchurl { - url = "https://dl.google.com/android/repository/sys-img/google_apis/x86-15_r06.zip"; - sha1 = "a7deb32c12396b6c4fd60ad14a62e19f8bdcae20"; - }; - }; - "15".google_apis."armeabi-v7a" = { - name = "system-image-15-google_apis-armeabi-v7a"; - path = "system-images/android-15/google_apis/armeabi-v7a"; - revision = "15-google_apis-armeabi-v7a"; - displayName = "Google APIs ARM EABI v7a System Image"; - archives.all = fetchurl { - url = "https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-15_r06.zip"; - sha1 = "6deb76cf34760a6037cb18d89772c9e986d07497"; - }; - }; - "16".google_apis."armeabi-v7a" = { - name = "system-image-16-google_apis-armeabi-v7a"; - path = "system-images/android-16/google_apis/armeabi-v7a"; - revision = "16-google_apis-armeabi-v7a"; - displayName = "Google APIs ARM EABI v7a System Image"; - archives.all = fetchurl { - url = "https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-16_r06.zip"; - sha1 = "5a5ff097680c6dae473c8719296ce6d7b70edb2d"; - }; - }; - "16".google_apis."x86" = { - name = "system-image-16-google_apis-x86"; - path = "system-images/android-16/google_apis/x86"; - revision = "16-google_apis-x86"; - displayName = "Google APIs Intel x86 Atom System Image"; - archives.all = fetchurl { - url = "https://dl.google.com/android/repository/sys-img/google_apis/x86-16_r06.zip"; - sha1 = "b57adef2f43dd176b8c02c980c16a796021b2071"; - }; - }; - "17".google_apis."armeabi-v7a" = { - name = "system-image-17-google_apis-armeabi-v7a"; - path = "system-images/android-17/google_apis/armeabi-v7a"; - revision = "17-google_apis-armeabi-v7a"; - displayName = "Google APIs ARM EABI v7a System Image"; - archives.all = fetchurl { - url = "https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-17_r06.zip"; - sha1 = "a59f26cb5707da97e869a27d87b83477204ac594"; - }; - }; - "17".google_apis."x86" = { - name = "system-image-17-google_apis-x86"; - path = "system-images/android-17/google_apis/x86"; - revision = "17-google_apis-x86"; - displayName = "Google APIs Intel x86 Atom System Image"; - archives.all = fetchurl { - url = "https://dl.google.com/android/repository/sys-img/google_apis/x86-17_r06.zip"; - sha1 = "7864c34faf0402b8923d8c6e609a5339f74cc8d6"; - }; - }; - "18".google_apis."armeabi-v7a" = { - name = "system-image-18-google_apis-armeabi-v7a"; - path = "system-images/android-18/google_apis/armeabi-v7a"; - revision = "18-google_apis-armeabi-v7a"; - displayName = "Google APIs ARM EABI v7a System Image"; - archives.all = fetchurl { - url = "https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-18_r06.zip"; - sha1 = "7faaccabbcc5f08e410436d3f63eea42521ea974"; - }; - }; - "18".google_apis."x86" = { - name = "system-image-18-google_apis-x86"; - path = "system-images/android-18/google_apis/x86"; - revision = "18-google_apis-x86"; - displayName = "Google APIs Intel x86 Atom System Image"; - archives.all = fetchurl { - url = "https://dl.google.com/android/repository/sys-img/google_apis/x86-18_r06.zip"; - sha1 = "dd674d719cad61602702be4b3d98edccfbfea53e"; - }; - }; - "19".google_apis."x86" = { - name = "system-image-19-google_apis-x86"; - path = "system-images/android-19/google_apis/x86"; - revision = "19-google_apis-x86"; - displayName = "Google APIs Intel x86 Atom System Image"; - archives.all = fetchurl { - url = "https://dl.google.com/android/repository/sys-img/google_apis/x86-19_r38.zip"; - sha1 = "928e4ec82876c61ef53451425d10ccb840cdd0f2"; - }; - }; - "19".google_apis."armeabi-v7a" = { - name = "system-image-19-google_apis-armeabi-v7a"; - path = "system-images/android-19/google_apis/armeabi-v7a"; - revision = "19-google_apis-armeabi-v7a"; - displayName = "Google APIs ARM EABI v7a System Image"; - archives.all = fetchurl { - url = "https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-19_r38.zip"; - sha1 = "434edd2ddc39d1ca083a5fa9721c0db8ab804737"; - }; - }; - "21".google_apis."x86" = { - name = "system-image-21-google_apis-x86"; - path = "system-images/android-21/google_apis/x86"; - revision = "21-google_apis-x86"; - displayName = "Google APIs Intel x86 Atom System Image"; - archives.all = fetchurl { - url = "https://dl.google.com/android/repository/sys-img/google_apis/x86-21_r30.zip"; - sha1 = "37548caae9e2897fb1d2b15f7fcf624c714cb610"; - }; - }; - "21".google_apis."x86_64" = { - name = "system-image-21-google_apis-x86_64"; - path = "system-images/android-21/google_apis/x86_64"; - revision = "21-google_apis-x86_64"; - displayName = "Google APIs Intel x86 Atom_64 System Image"; - archives.all = fetchurl { - url = "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-21_r30.zip"; - sha1 = "82d34fdaae2916bd4d48a4f144db51e4e5719aa4"; - }; - }; - "21".google_apis."armeabi-v7a" = { - name = "system-image-21-google_apis-armeabi-v7a"; - path = "system-images/android-21/google_apis/armeabi-v7a"; - revision = "21-google_apis-armeabi-v7a"; - displayName = "Google APIs ARM EABI v7a System Image"; - archives.all = fetchurl { - url = "https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-21_r30.zip"; - sha1 = "bbdbbb3c4387752a8f28718a3190d901c0378058"; - }; - }; - "22".google_apis."x86" = { - name = "system-image-22-google_apis-x86"; - path = "system-images/android-22/google_apis/x86"; - revision = "22-google_apis-x86"; - displayName = "Google APIs Intel x86 Atom System Image"; - archives.all = fetchurl { - url = "https://dl.google.com/android/repository/sys-img/google_apis/x86-22_r24.zip"; - sha1 = "e4cd95b1c0837fc12d6544742e82d8ef344c8758"; - }; - }; - "22".google_apis."armeabi-v7a" = { - name = "system-image-22-google_apis-armeabi-v7a"; - path = "system-images/android-22/google_apis/armeabi-v7a"; - revision = "22-google_apis-armeabi-v7a"; - displayName = "Google APIs ARM EABI v7a System Image"; - archives.all = fetchurl { - url = "https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-22_r24.zip"; - sha1 = "d2b7ca5f8259c6e4b3cfa5a0d77e4a088899cfb0"; - }; - }; - "22".google_apis."x86_64" = { - name = "system-image-22-google_apis-x86_64"; - path = "system-images/android-22/google_apis/x86_64"; - revision = "22-google_apis-x86_64"; - displayName = "Google APIs Intel x86 Atom_64 System Image"; - archives.all = fetchurl { - url = "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-22_r24.zip"; - sha1 = "cde738f9353606af69ad7b4e625c957a4d603f27"; - }; - }; - "23".google_apis."x86" = { - name = "system-image-23-google_apis-x86"; - path = "system-images/android-23/google_apis/x86"; - revision = "23-google_apis-x86"; - displayName = "Google APIs Intel x86 Atom System Image"; - archives.all = fetchurl { - url = "https://dl.google.com/android/repository/sys-img/google_apis/x86-23_r31.zip"; - sha1 = "877cf79f5198fa53351eab08ba9ce162dc84f7ba"; - }; - }; - "23".google_apis."x86_64" = { - name = "system-image-23-google_apis-x86_64"; - path = "system-images/android-23/google_apis/x86_64"; - revision = "23-google_apis-x86_64"; - displayName = "Google APIs Intel x86 Atom_64 System Image"; - archives.all = fetchurl { - url = "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-23_r31.zip"; - sha1 = "342c39df061804ee0d5bc671147e90dead3d6665"; - }; - }; - "23".google_apis."armeabi-v7a" = { - name = "system-image-23-google_apis-armeabi-v7a"; - path = "system-images/android-23/google_apis/armeabi-v7a"; - revision = "23-google_apis-armeabi-v7a"; - displayName = "Google APIs ARM EABI v7a System Image"; - archives.all = fetchurl { - url = "https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-23_r31.zip"; - sha1 = "da0a07800b4eec53fcdb2e5c3b69a9a5d7a6b8a6"; - }; - }; - "24".google_apis."x86" = { - name = "system-image-24-google_apis-x86"; - path = "system-images/android-24/google_apis/x86"; - revision = "24-google_apis-x86"; - displayName = "Google APIs Intel x86 Atom System Image"; - archives.all = fetchurl { - url = "https://dl.google.com/android/repository/sys-img/google_apis/x86-24_r25.zip"; - sha1 = "53dba25eed8359aba394a1be1c7ccb741a459ec0"; - }; - }; - "24".google_apis."x86_64" = { - name = "system-image-24-google_apis-x86_64"; - path = "system-images/android-24/google_apis/x86_64"; - revision = "24-google_apis-x86_64"; - displayName = "Google APIs Intel x86 Atom_64 System Image"; - archives.all = fetchurl { - url = "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-24_r25.zip"; - sha1 = "d757dd13ad9b0ba4dd872660e31b6506f60dcf32"; - }; - }; - "24".google_apis."armeabi-v7a" = { - name = "system-image-24-google_apis-armeabi-v7a"; - path = "system-images/android-24/google_apis/armeabi-v7a"; - revision = "24-google_apis-armeabi-v7a"; - displayName = "Google APIs ARM EABI v7a System Image"; - archives.all = fetchurl { - url = "https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-24_r25.zip"; - sha1 = "9a0ec5e9a239a7a6889364e44e9fa4fcd0052c6b"; - }; - }; - "24".google_apis."arm64-v8a" = { - name = "system-image-24-google_apis-arm64-v8a"; - path = "system-images/android-24/google_apis/arm64-v8a"; - revision = "24-google_apis-arm64-v8a"; - displayName = "Google APIs ARM 64 v8a System Image"; - archives.all = fetchurl { - url = "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-24_r25.zip"; - sha1 = "5ff407d439e3c595ce9221f445a31dcc35df5a86"; - }; - }; - "25".google_apis."x86" = { - name = "system-image-25-google_apis-x86"; - path = "system-images/android-25/google_apis/x86"; - revision = "25-google_apis-x86"; - displayName = "Google APIs Intel x86 Atom System Image"; - archives.all = fetchurl { - url = "https://dl.google.com/android/repository/sys-img/google_apis/x86-25_r16.zip"; - sha1 = "562e3335c6334b8d1947bb9efb90f8d82f2d3e4d"; - }; - }; - "25".google_apis."x86_64" = { - name = "system-image-25-google_apis-x86_64"; - path = "system-images/android-25/google_apis/x86_64"; - revision = "25-google_apis-x86_64"; - displayName = "Google APIs Intel x86 Atom_64 System Image"; - archives.all = fetchurl { - url = "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-25_r16.zip"; - sha1 = "e08b94903631d58964467b0b310c93642d85df6c"; - }; - }; - "25".google_apis."armeabi-v7a" = { - name = "system-image-25-google_apis-armeabi-v7a"; - path = "system-images/android-25/google_apis/armeabi-v7a"; - revision = "25-google_apis-armeabi-v7a"; - displayName = "Google APIs ARM EABI v7a System Image"; - archives.all = fetchurl { - url = "https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-25_r16.zip"; - sha1 = "4c49e0edb845b0bf1f231cb0e8598b1a9f9aa9c8"; - }; - }; - "25".google_apis."arm64-v8a" = { - name = "system-image-25-google_apis-arm64-v8a"; - path = "system-images/android-25/google_apis/arm64-v8a"; - revision = "25-google_apis-arm64-v8a"; - displayName = "Google APIs ARM 64 v8a System Image"; - archives.all = fetchurl { - url = "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-25_r16.zip"; - sha1 = "33ffbd335d9a6dc8d9843469d0963091566b3167"; - }; - }; - "26".google_apis."x86" = { - name = "system-image-26-google_apis-x86"; - path = "system-images/android-26/google_apis/x86"; - revision = "26-google_apis-x86"; - displayName = "Google APIs Intel x86 Atom System Image"; - archives.all = fetchurl { - url = "https://dl.google.com/android/repository/sys-img/google_apis/x86-26_r14.zip"; - sha1 = "935da6794d5f64f7ae20a1f352929cb7e3b20cba"; - }; - }; - "26".google_apis."x86_64" = { - name = "system-image-26-google_apis-x86_64"; - path = "system-images/android-26/google_apis/x86_64"; - revision = "26-google_apis-x86_64"; - displayName = "Google APIs Intel x86 Atom_64 System Image"; - archives.all = fetchurl { - url = "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-26_r14.zip"; - sha1 = "965631f0554ca9027ac465ba147baa6a6a22fcce"; - }; - }; - "27".google_apis."x86" = { - name = "system-image-27-google_apis-x86"; - path = "system-images/android-27/google_apis/x86"; - revision = "27-google_apis-x86"; - displayName = "Google APIs Intel x86 Atom System Image"; - archives.all = fetchurl { - url = "https://dl.google.com/android/repository/sys-img/google_apis/x86-27_r09.zip"; - sha1 = "ab009fc1308ded01539af4f8233b252d411145bc"; - }; - }; - "28".google_apis."x86" = { - name = "system-image-28-google_apis-x86"; - path = "system-images/android-28/google_apis/x86"; - revision = "28-google_apis-x86"; - displayName = "Google APIs Intel x86 Atom System Image"; - archives.all = fetchurl { - url = "https://dl.google.com/android/repository/sys-img/google_apis/x86-28_r09.zip"; - sha1 = "7c84ba5cbc009132ce38df52830c17b9bffc54bb"; - }; - }; - "28".google_apis."x86_64" = { - name = "system-image-28-google_apis-x86_64"; - path = "system-images/android-28/google_apis/x86_64"; - revision = "28-google_apis-x86_64"; - displayName = "Google APIs Intel x86 Atom_64 System Image"; - archives.all = fetchurl { - url = "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-28_r09.zip"; - sha1 = "eeb066346d29194e5b9387a0c0dd0f9e2a570b70"; - }; - }; - "29".google_apis."x86" = { - name = "system-image-29-google_apis-x86"; - path = "system-images/android-29/google_apis/x86"; - revision = "29-google_apis-x86"; - displayName = "Google APIs Intel x86 Atom System Image"; - archives.all = fetchurl { - url = "https://dl.google.com/android/repository/sys-img/google_apis/x86-29_r09.zip"; - sha1 = "33d71d17138ea322dec2dea6d8198aebf4767ab3"; - }; - }; - "29".google_apis."x86_64" = { - name = "system-image-29-google_apis-x86_64"; - path = "system-images/android-29/google_apis/x86_64"; - revision = "29-google_apis-x86_64"; - displayName = "Google APIs Intel x86 Atom_64 System Image"; - archives.all = fetchurl { - url = "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-29_r09.zip"; - sha1 = "0aa76b20a7ad30f2e41bc21b897b848d82533d26"; - }; - }; - "R".google_apis."x86" = { - name = "system-image-R-google_apis-x86"; - path = "system-images/android-R/google_apis/x86"; - revision = "R-google_apis-x86"; - displayName = "Google APIs Intel x86 Atom System Image"; - archives.all = fetchurl { - url = "https://dl.google.com/android/repository/sys-img/google_apis/x86-R_r01.zip"; - sha1 = "4e260bef94760eecba3224b68c1a4fed0fb89485"; - }; - }; - "R".google_apis."x86_64" = { - name = "system-image-R-google_apis-x86_64"; - path = "system-images/android-R/google_apis/x86_64"; - revision = "R-google_apis-x86_64"; - displayName = "Google APIs Intel x86 Atom_64 System Image"; - archives.all = fetchurl { - url = "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-R_r01.zip"; - sha1 = "ae12e1c3e1b36043a299359850e9315f47262f81"; - }; - }; -} diff --git a/pkgs/development/mobile/androidenv/generated/system-images-google_apis_playstore.nix b/pkgs/development/mobile/androidenv/generated/system-images-google_apis_playstore.nix deleted file mode 100644 index 554f4b2df99e..000000000000 --- a/pkgs/development/mobile/androidenv/generated/system-images-google_apis_playstore.nix +++ /dev/null @@ -1,64 +0,0 @@ -{fetchurl}: - -{ - "24".google_apis_playstore."x86" = { - name = "system-image-24-google_apis_playstore-x86"; - path = "system-images/android-24/google_apis_playstore/x86"; - revision = "24-google_apis_playstore-x86"; - displayName = "Google Play Intel x86 Atom System Image"; - archives.all = fetchurl { - url = "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86-24_r19.zip"; - sha1 = "b52e9593ffdde65c1a0970256a32e8967c89cc22"; - }; - }; - "25".google_apis_playstore."x86" = { - name = "system-image-25-google_apis_playstore-x86"; - path = "system-images/android-25/google_apis_playstore/x86"; - revision = "25-google_apis_playstore-x86"; - displayName = "Google Play Intel x86 Atom System Image"; - archives.all = fetchurl { - url = "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86-25_r09.zip"; - sha1 = "6f6668954f7fd52f896fe7528aa122028c9b026c"; - }; - }; - "26".google_apis_playstore."x86" = { - name = "system-image-26-google_apis_playstore-x86"; - path = "system-images/android-26/google_apis_playstore/x86"; - revision = "26-google_apis_playstore-x86"; - displayName = "Google Play Intel x86 Atom System Image"; - archives.all = fetchurl { - url = "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86-26_r07.zip"; - sha1 = "2c8bee7b97a309f099941532e63c42a7d4a06e19"; - }; - }; - "27".google_apis_playstore."x86" = { - name = "system-image-27-google_apis_playstore-x86"; - path = "system-images/android-27/google_apis_playstore/x86"; - revision = "27-google_apis_playstore-x86"; - displayName = "Google Play Intel x86 Atom System Image"; - archives.all = fetchurl { - url = "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86-27_r03.zip"; - sha1 = "eb5a944ceb691ca0648d0a6f0d93893a47223b5d"; - }; - }; - "28".google_apis_playstore."x86" = { - name = "system-image-28-google_apis_playstore-x86"; - path = "system-images/android-28/google_apis_playstore/x86"; - revision = "28-google_apis_playstore-x86"; - displayName = "Google Play Intel x86 Atom System Image"; - archives.all = fetchurl { - url = "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86-28_r08.zip"; - sha1 = "5381f9d52a3bf1967c9c92a25b20012cd68764c8"; - }; - }; - "28".google_apis_playstore."x86_64" = { - name = "system-image-28-google_apis_playstore-x86_64"; - path = "system-images/android-28/google_apis_playstore/x86_64"; - revision = "28-google_apis_playstore-x86_64"; - displayName = "Google Play Intel x86 Atom_64 System Image"; - archives.all = fetchurl { - url = "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-28_r08.zip"; - sha1 = "a767da996fdea7a1f5632a9206fa5c009d6e580c"; - }; - }; -} diff --git a/pkgs/development/mobile/androidenv/lldb.nix b/pkgs/development/mobile/androidenv/lldb.nix deleted file mode 100644 index e8a158c01ec7..000000000000 --- a/pkgs/development/mobile/androidenv/lldb.nix +++ /dev/null @@ -1,12 +0,0 @@ -{deployAndroidPackage, lib, package, os, autoPatchelfHook, pkgs}: - -deployAndroidPackage { - inherit package os; - buildInputs = [ autoPatchelfHook ] - ++ lib.optional (os == "linux") [ pkgs.glibc pkgs.stdenv.cc.cc pkgs.zlib pkgs.openssl_1_0_2.out pkgs.ncurses5 ]; - patchInstructions = lib.optionalString (os == "linux") '' - addAutoPatchelfSearchPath $packageBaseDir/lib - autoPatchelf $packageBaseDir/lib - autoPatchelf $packageBaseDir/bin - ''; -} diff --git a/pkgs/development/mobile/androidenv/mkrepo.rb b/pkgs/development/mobile/androidenv/mkrepo.rb new file mode 100644 index 000000000000..208a544c90f6 --- /dev/null +++ b/pkgs/development/mobile/androidenv/mkrepo.rb @@ -0,0 +1,321 @@ +#!/usr/bin/env ruby + +require 'json' +require 'nokogiri' +require 'slop' + +# Returns a repo URL for a given package name. +def repo_url value + if value && value.start_with?('http') + value + elsif value + "https://dl.google.com/android/repository/#{value}" + else + nil + end +end + +# Returns a system image URL for a given system image name. +def image_url value, dir + if value && value.start_with?('http') + value + elsif value + "https://dl.google.com/android/repository/sys-img/#{dir}/#{value}" + else + nil + end +end + +# Returns a tuple of [type, revision, revision components] for a package node. +def package_revision package + type_details = package.at_css('> type-details') + type = type_details.attributes['type'] + type &&= type.value + + revision = nil + components = nil + + case type + when 'generic:genericDetailsType', 'addon:extraDetailsType', 'addon:mavenType' + major = text package.at_css('> revision > major') + minor = text package.at_css('> revision > minor') + micro = text package.at_css('> revision > micro') + preview = text package.at_css('> revision > preview') + + revision = '' + components = [] + unless empty?(major) + revision << major + components << major + end + + unless empty?(minor) + revision << ".#{minor}" + components << minor + end + + unless empty?(micro) + revision << ".#{micro}" + components << micro + end + + unless empty?(preview) + revision << "-rc#{preview}" + components << preview + end + when 'sdk:platformDetailsType' + codename = text type_details.at_css('> codename') + api_level = text type_details.at_css('> api-level') + revision = empty?(codename) ? api_level : codename + components = [revision] + when 'sdk:sourceDetailsType' + api_level = text type_details.at_css('> api-level') + revision, components = api_level, [api_level] + when 'sys-img:sysImgDetailsType' + codename = text type_details.at_css('> codename') + api_level = text type_details.at_css('> api-level') + id = text type_details.at_css('> tag > id') + abi = text type_details.at_css('> abi') + + revision = '' + components = [] + if empty?(codename) + revision << api_level + components << api_level + else + revision << codename + components << codename + end + + unless empty?(id) + revision << "-#{id}" + components << id + end + + unless empty?(abi) + revision << "-#{abi}" + components << abi + end + when 'addon:addonDetailsType' then + api_level = text type_details.at_css('> api-level') + id = text type_details.at_css('> tag > id') + revision = api_level + components = [api_level, id] + end + + [type, revision, components] +end + +# Returns a hash of archives for the specified package node. +def package_archives package + archives = {} + package.css('> archives > archive').each do |archive| + host_os = text archive.at_css('> host-os') + host_os = 'all' if empty?(host_os) + archives[host_os] = { + 'size' => Integer(text(archive.at_css('> complete > size'))), + 'sha1' => text(archive.at_css('> complete > checksum')), + 'url' => yield(text(archive.at_css('> complete > url'))) + } + end + archives +end + +# Returns the text from a node, or nil. +def text node + node ? node.text : nil +end + +# Nil or empty helper. +def empty? value + !value || value.empty? +end + +# Fixes up returned hashes by sorting keys. +# Will also convert archives (e.g. {'linux' => {'sha1' => ...}, 'macosx' => ...} to +# [{'os' => 'linux', 'sha1' => ...}, {'os' => 'macosx', ...}, ...]. +def fixup value + Hash[value.map do |k, v| + if k == 'archives' && v.is_a?(Hash) + [k, v.map do |os, archive| + fixup({'os' => os}.merge(archive)) + end] + elsif v.is_a?(Hash) + [k, fixup(v)] + else + [k, v] + end + end.sort {|(k1, v1), (k2, v2)| k1 <=> k2}] +end + +# Normalize the specified license text. +# See: https://brash-snapper.glitch.me/ for how the munging works. +def normalize_license license + license = license.dup + license.gsub!(/([^\n])\n([^\n])/m, '\1 \2') + license.gsub!(/ +/, ' ') + license +end + +# Gets all license texts, deduplicating them. +def get_licenses doc + licenses = {} + doc.css('license[type="text"]').each do |license_node| + license_id = license_node['id'] + if license_id + licenses[license_id] ||= [] + licenses[license_id] |= [normalize_license(text(license_node))] + end + end + licenses +end + +def parse_package_xml doc + licenses = get_licenses doc + packages = {} + + doc.css('remotePackage').each do |package| + name, _, version = package['path'].partition(';') + next if version == 'latest' + + type, revision, _ = package_revision(package) + next unless revision + + path = package['path'].tr(';', '/') + display_name = text package.at_css('> display-name') + uses_license = package.at_css('> uses-license') + uses_license &&= uses_license['ref'] + archives = package_archives(package) {|url| repo_url url} + + target = (packages[name] ||= {}) + target = (target[revision] ||= {}) + + target['name'] ||= name + target['path'] ||= path + target['revision'] ||= revision + target['displayName'] ||= display_name + target['license'] ||= uses_license if uses_license + target['archives'] ||= {} + merge target['archives'], archives + end + + [licenses, packages] +end + +def parse_image_xml doc + licenses = get_licenses doc + images = {} + + doc.css('remotePackage[path^="system-images;"]').each do |package| + type, revision, components = package_revision(package) + next unless revision + + path = package['path'].tr(';', '/') + display_name = text package.at_css('> display-name') + uses_license = package.at_css('> uses-license') + uses_license &&= uses_license['ref'] + archives = package_archives(package) {|url| image_url url, components[-2]} + + target = images + components.each do |component| + target = (target[component] ||= {}) + end + + target['name'] ||= "system-image-#{revision}" + target['path'] ||= path + target['revision'] ||= revision + target['displayName'] ||= display_name + target['license'] ||= uses_license if uses_license + target['archives'] ||= {} + merge target['archives'], archives + end + + [licenses, images] +end + +def parse_addon_xml doc + licenses = get_licenses doc + addons, extras = {}, {} + + doc.css('remotePackage').each do |package| + type, revision, components = package_revision(package) + next unless revision + + path = package['path'].tr(';', '/') + display_name = text package.at_css('> display-name') + uses_license = package.at_css('> uses-license') + uses_license &&= uses_license['ref'] + archives = package_archives(package) {|url| repo_url url} + + case type + when 'addon:addonDetailsType' + name = components.last + target = addons + + # Hack for Google APIs 25 r1, which displays as 23 for some reason + archive_name = text package.at_css('> archives > archive > complete > url') + if archive_name == 'google_apis-25_r1.zip' + path = 'add-ons/addon-google_apis-google-25' + revision = '25' + components = [revision, components.last] + end + when 'addon:extraDetailsType', 'addon:mavenType' + name = package['path'].tr(';', '-') + components = [package['path']] + target = extras + end + + components.each do |component| + target = (target[component] ||= {}) + end + + target['name'] ||= name + target['path'] ||= path + target['revision'] ||= revision + target['displayName'] ||= display_name + target['license'] ||= uses_license if uses_license + target['archives'] ||= {} + merge target['archives'], archives + end + + [licenses, addons, extras] +end + +def merge dest, src + dest.merge! src +end + +opts = Slop.parse do |o| + o.array '-p', '--packages', 'packages repo XMLs to parse' + o.array '-i', '--images', 'system image repo XMLs to parse' + o.array '-a', '--addons', 'addon repo XMLs to parse' +end + +result = { + licenses: {}, + packages: {}, + images: {}, + addons: {}, + extras: {} +} + +opts[:packages].each do |filename| + licenses, packages = parse_package_xml(Nokogiri::XML(File.open(filename))) + merge result[:licenses], licenses + merge result[:packages], packages +end + +opts[:images].each do |filename| + licenses, images = parse_image_xml(Nokogiri::XML(File.open(filename))) + merge result[:licenses], licenses + merge result[:images], images +end + +opts[:addons].each do |filename| + licenses, addons, extras = parse_addon_xml(Nokogiri::XML(File.open(filename))) + merge result[:licenses], licenses + merge result[:addons], addons + merge result[:extras], extras +end + +puts JSON.pretty_generate(fixup(result)) diff --git a/pkgs/development/mobile/androidenv/mkrepo.sh b/pkgs/development/mobile/androidenv/mkrepo.sh new file mode 100755 index 000000000000..fd7e22457f02 --- /dev/null +++ b/pkgs/development/mobile/androidenv/mkrepo.sh @@ -0,0 +1,19 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p "ruby.withPackages (pkgs: with pkgs; [ slop nokogiri ])" + +set -e + +pushd "$(dirname "$0")" &>/dev/null || exit 1 + +echo "Writing repo.json" >&2 +ruby mkrepo.rb \ + --packages ./xml/repository2-1.xml \ + --images ./xml/android-sys-img2-1.xml \ + --images ./xml/android-tv-sys-img2-1.xml \ + --images ./xml/android-wear-cn-sys-img2-1.xml \ + --images ./xml/android-wear-sys-img2-1.xml \ + --images ./xml/google_apis-sys-img2-1.xml \ + --images ./xml/google_apis_playstore-sys-img2-1.xml \ + --addons ./xml/addon2-1.xml > repo.json + +popd &>/dev/null diff --git a/pkgs/development/mobile/androidenv/ndk-bundle/default.nix b/pkgs/development/mobile/androidenv/ndk-bundle/default.nix index ca305e0398d5..f74b949a7b3c 100644 --- a/pkgs/development/mobile/androidenv/ndk-bundle/default.nix +++ b/pkgs/development/mobile/androidenv/ndk-bundle/default.nix @@ -9,14 +9,14 @@ let in 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 ]; + nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; + buildInputs = lib.optional (os == "linux") [ pkgs.glibc pkgs.stdenv.cc.cc pkgs.python2 pkgs.ncurses5 pkgs.zlib pkgs.libcxx.out pkgs.libxml2 ]; 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} + --no-backup-if-mismatch < ${./make_standalone_toolchain.py_18.patch} || true wrapProgram $(pwd)/build/tools/make_standalone_toolchain.py --prefix PATH : "${runtime_paths}" '' + '' @@ -24,33 +24,35 @@ deployAndroidPackage { rm -rf docs tests # Patch the executables of the toolchains, but not the libraries -- they are needed for crosscompiling + if [ -d $out/libexec/android-sdk/ndk-bundle/toolchains/renderscript/prebuilt/linux-x86_64/lib64 ]; then + addAutoPatchelfSearchPath $out/libexec/android-sdk/ndk-bundle/toolchains/renderscript/prebuilt/linux-x86_64/lib64 + fi - addAutoPatchelfSearchPath $out/libexec/android-sdk/ndk-bundle/toolchains/renderscript/prebuilt/linux-x86_64/lib64 - find toolchains -type d -name bin | while read dir - do + if [ -d $out/libexec/android-sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64/lib64 ]; then + addAutoPatchelfSearchPath $out/libexec/android-sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64/lib64 + fi + + find toolchains -type d -name bin -or -name lib64 | while read dir; do autoPatchelf "$dir" done # fix ineffective PROGDIR / MYNDKDIR determination - for i in ndk-build - do - sed -i -e 's|^PROGDIR=`dirname $0`|PROGDIR=`dirname $(readlink -f $(which $0))`|' $i + for progname in ndk-build; do + sed -i -e 's|^PROGDIR=`dirname $0`|PROGDIR=`dirname $(readlink -f $(which $0))`|' $progname done # Patch executables autoPatchelf prebuilt/linux-x86_64 # wrap - for i in ndk-build - do - wrapProgram "$(pwd)/$i" --prefix PATH : "${runtime_paths}" + for progname in ndk-build; do + wrapProgram "$(pwd)/$progname" --prefix PATH : "${runtime_paths}" done # make some executables available in PATH mkdir -p $out/bin - for i in ndk-build - do - ln -sf ../libexec/android-sdk/ndk-bundle/$i $out/bin/$i + for progname in ndk-build; do + ln -sf ../libexec/android-sdk/ndk-bundle/$progname $out/bin/$progname done ''); noAuditTmpdir = true; # Audit script gets invoked by the build/ component in the path for the make standalone script diff --git a/pkgs/development/mobile/androidenv/querypackages.sh b/pkgs/development/mobile/androidenv/querypackages.sh old mode 100644 new mode 100755 index 0f31396b8766..4abf4f936405 --- a/pkgs/development/mobile/androidenv/querypackages.sh +++ b/pkgs/development/mobile/androidenv/querypackages.sh @@ -1,27 +1,23 @@ -#!/bin/sh -e +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p jq -if [ "$1" = "" ] -then - echo "Please select a package set: 'packages', 'addons', 'system-images'" >&2 +set -e + +pushd "$(dirname "$0")" &>/dev/null || exit 1 + +if [ "$1" == '' ]; then + echo "Please select a group: 'packages', 'images', 'addons', 'extras', or 'licenses'" >&2 exit 1 fi -if [ "$2" = "" ] -then - echo "Please select a package group:" >&2 - ( cat </dev/null diff --git a/pkgs/development/mobile/androidenv/repo.json b/pkgs/development/mobile/androidenv/repo.json new file mode 100644 index 000000000000..f3606279c5a9 --- /dev/null +++ b/pkgs/development/mobile/androidenv/repo.json @@ -0,0 +1,5343 @@ +{ + "addons": { + "10": { + "google_apis": { + "archives": [ + { + "os": "all", + "sha1": "cc0711857c881fa7534f90cf8cc09b8fe985484d", + "size": 65781578, + "url": "https://dl.google.com/android/repository/google_apis-10_r02.zip" + } + ], + "displayName": "Google APIs", + "license": "android-sdk-license", + "name": "google_apis", + "path": "add-ons/addon-google_apis-google-10", + "revision": "10" + } + }, + "11": { + "google_apis": { + "archives": [ + { + "os": "all", + "sha1": "5eab5e81addee9f3576d456d205208314b5146a5", + "size": 83477179, + "url": "https://dl.google.com/android/repository/google_apis-11_r01.zip" + } + ], + "displayName": "Google APIs", + "license": "android-sdk-license", + "name": "google_apis", + "path": "add-ons/addon-google_apis-google-11", + "revision": "11" + } + }, + "12": { + "google_apis": { + "archives": [ + { + "os": "all", + "sha1": "e9999f4fa978812174dfeceec0721c793a636e5d", + "size": 86099835, + "url": "https://dl.google.com/android/repository/google_apis-12_r01.zip" + } + ], + "displayName": "Google APIs", + "license": "android-sdk-license", + "name": "google_apis", + "path": "add-ons/addon-google_apis-google-12", + "revision": "12" + }, + "google_tv_addon": { + "archives": [ + { + "os": "all", + "sha1": "92128a12e7e8b0fb5bac59153d7779b717e7b840", + "size": 78266751, + "url": "https://dl.google.com/android/repository/google_tv-12_r02.zip" + } + ], + "displayName": "Google TV Addon", + "license": "android-googletv-license", + "name": "google_tv_addon", + "path": "add-ons/addon-google_tv_addon-google-12", + "revision": "12" + } + }, + "13": { + "google_apis": { + "archives": [ + { + "os": "all", + "sha1": "3b153edd211c27dc736c893c658418a4f9041417", + "size": 88615525, + "url": "https://dl.google.com/android/repository/google_apis-13_r01.zip" + } + ], + "displayName": "Google APIs", + "license": "android-sdk-license", + "name": "google_apis", + "path": "add-ons/addon-google_apis-google-13", + "revision": "13" + }, + "google_tv_addon": { + "archives": [ + { + "os": "all", + "sha1": "b73f7c66011ac8180b44aa4e83b8d78c66ea9a09", + "size": 87721879, + "url": "https://dl.google.com/android/repository/google_tv-13_r01.zip" + } + ], + "displayName": "Google TV Addon", + "license": "android-googletv-license", + "name": "google_tv_addon", + "path": "add-ons/addon-google_tv_addon-google-13", + "revision": "13" + } + }, + "14": { + "google_apis": { + "archives": [ + { + "os": "all", + "sha1": "f8eb4d96ad0492b4c0db2d7e4f1a1a3836664d39", + "size": 106533714, + "url": "https://dl.google.com/android/repository/google_apis-14_r02.zip" + } + ], + "displayName": "Google APIs", + "license": "android-sdk-license", + "name": "google_apis", + "path": "add-ons/addon-google_apis-google-14", + "revision": "14" + } + }, + "15": { + "google_apis": { + "archives": [ + { + "os": "all", + "sha1": "d0d2bf26805eb271693570a1aaec33e7dc3f45e9", + "size": 106624396, + "url": "https://dl.google.com/android/repository/google_apis-15_r03.zip" + } + ], + "displayName": "Google APIs", + "license": "android-sdk-license", + "name": "google_apis", + "path": "add-ons/addon-google_apis-google-15", + "revision": "15" + } + }, + "16": { + "google_apis": { + "archives": [ + { + "os": "all", + "sha1": "ee6acf1b01020bfa8a8e24725dbc4478bee5e792", + "size": 127341982, + "url": "https://dl.google.com/android/repository/google_apis-16_r04.zip" + } + ], + "displayName": "Google APIs", + "license": "android-sdk-license", + "name": "google_apis", + "path": "add-ons/addon-google_apis-google-16", + "revision": "16" + } + }, + "17": { + "google_apis": { + "archives": [ + { + "os": "all", + "sha1": "a076be0677f38df8ca5536b44dfb411a0c808c4f", + "size": 137231243, + "url": "https://dl.google.com/android/repository/google_apis-17_r04.zip" + } + ], + "displayName": "Google APIs", + "license": "android-sdk-license", + "name": "google_apis", + "path": "add-ons/addon-google_apis-google-17", + "revision": "17" + } + }, + "18": { + "google_apis": { + "archives": [ + { + "os": "all", + "sha1": "6109603409debdd40854d4d4a92eaf8481462c8b", + "size": 143195183, + "url": "https://dl.google.com/android/repository/google_apis-18_r04.zip" + } + ], + "displayName": "Google APIs", + "license": "android-sdk-license", + "name": "google_apis", + "path": "add-ons/addon-google_apis-google-18", + "revision": "18" + } + }, + "19": { + "google_apis": { + "archives": [ + { + "os": "all", + "sha1": "5b933abe830b2f25b4c0f171d45e9e0651e56311", + "size": 147081, + "url": "https://dl.google.com/android/repository/google_apis-19_r20.zip" + } + ], + "displayName": "Google APIs", + "license": "android-sdk-license", + "name": "google_apis", + "path": "add-ons/addon-google_apis-google-19", + "revision": "19" + } + }, + "21": { + "google_apis": { + "archives": [ + { + "os": "all", + "sha1": "66a754efb24e9bb07cc51648426443c7586c9d4a", + "size": 179499, + "url": "https://dl.google.com/android/repository/google_apis-21_r01.zip" + } + ], + "displayName": "Google APIs", + "license": "android-sdk-license", + "name": "google_apis", + "path": "add-ons/addon-google_apis-google-21", + "revision": "21" + } + }, + "22": { + "google_apis": { + "archives": [ + { + "os": "all", + "sha1": "5def0f42160cba8acff51b9c0c7e8be313de84f5", + "size": 179259, + "url": "https://dl.google.com/android/repository/google_apis-22_r01.zip" + } + ], + "displayName": "Google APIs", + "license": "android-sdk-license", + "name": "google_apis", + "path": "add-ons/addon-google_apis-google-22", + "revision": "22" + } + }, + "23": { + "google_apis": { + "archives": [ + { + "os": "all", + "sha1": "04c5cc1a7c88967250ebba9561d81e24104167db", + "size": 179900, + "url": "https://dl.google.com/android/repository/google_apis-23_r01.zip" + } + ], + "displayName": "Google APIs", + "license": "android-sdk-license", + "name": "google_apis", + "path": "add-ons/addon-google_apis-google-23", + "revision": "23" + } + }, + "24": { + "google_apis": { + "archives": [ + { + "os": "all", + "sha1": "31361c2868f27343ee917fbd259c1463821b6145", + "size": 154865, + "url": "https://dl.google.com/android/repository/google_apis-24_r1.zip" + } + ], + "displayName": "Google APIs", + "license": "android-sdk-license", + "name": "google_apis", + "path": "add-ons/addon-google_apis-google-24", + "revision": "24" + } + }, + "25": { + "google_apis": { + "archives": [ + { + "os": "all", + "sha1": "550e83eea9513ab11c44919ac6da54b36084a9f3", + "size": 154871, + "url": "https://dl.google.com/android/repository/google_apis-25_r1.zip" + } + ], + "displayName": "Google APIs", + "license": "android-sdk-license", + "name": "google_apis", + "path": "add-ons/addon-google_apis-google-25", + "revision": "25" + } + }, + "3": { + "google_apis": { + "archives": [ + { + "os": "all", + "sha1": "1f92abf3a76be66ae8032257fc7620acbd2b2e3a", + "size": 34908058, + "url": "https://dl.google.com/android/repository/google_apis-3-r03.zip" + } + ], + "displayName": "Google APIs", + "license": "android-sdk-license", + "name": "google_apis", + "path": "add-ons/addon-google_apis-google-3", + "revision": "3" + } + }, + "4": { + "google_apis": { + "archives": [ + { + "os": "all", + "sha1": "9b6e86d8568558de4d606a7debc4f6049608dbd0", + "size": 42435735, + "url": "https://dl.google.com/android/repository/google_apis-4_r02.zip" + } + ], + "displayName": "Google APIs", + "license": "android-sdk-license", + "name": "google_apis", + "path": "add-ons/addon-google_apis-google-4", + "revision": "4" + } + }, + "5": { + "google_apis": { + "archives": [ + { + "os": "all", + "sha1": "46eaeb56b645ee7ffa24ede8fa17f3df70db0503", + "size": 49123776, + "url": "https://dl.google.com/android/repository/google_apis-5_r01.zip" + } + ], + "displayName": "Google APIs", + "license": "android-sdk-license", + "name": "google_apis", + "path": "add-ons/addon-google_apis-google-5", + "revision": "5" + } + }, + "6": { + "google_apis": { + "archives": [ + { + "os": "all", + "sha1": "5ff545d96e031e09580a6cf55713015c7d4936b2", + "size": 53382941, + "url": "https://dl.google.com/android/repository/google_apis-6_r01.zip" + } + ], + "displayName": "Google APIs", + "license": "android-sdk-license", + "name": "google_apis", + "path": "add-ons/addon-google_apis-google-6", + "revision": "6" + } + }, + "7": { + "google_apis": { + "archives": [ + { + "os": "all", + "sha1": "2e7f91e0fe34fef7f58aeced973c6ae52361b5ac", + "size": 53691339, + "url": "https://dl.google.com/android/repository/google_apis-7_r01.zip" + } + ], + "displayName": "Google APIs", + "license": "android-sdk-license", + "name": "google_apis", + "path": "add-ons/addon-google_apis-google-7", + "revision": "7" + } + }, + "8": { + "google_apis": { + "archives": [ + { + "os": "all", + "sha1": "3079958e7ec87222cac1e6b27bc471b27bf2c352", + "size": 59505020, + "url": "https://dl.google.com/android/repository/google_apis-8_r02.zip" + } + ], + "displayName": "Google APIs", + "license": "android-sdk-license", + "name": "google_apis", + "path": "add-ons/addon-google_apis-google-8", + "revision": "8" + } + }, + "9": { + "google_apis": { + "archives": [ + { + "os": "all", + "sha1": "78664645a1e9accea4430814f8694291a7f1ea5d", + "size": 63401546, + "url": "https://dl.google.com/android/repository/google_apis-9_r02.zip" + } + ], + "displayName": "Google APIs", + "license": "android-sdk-license", + "name": "google_apis", + "path": "add-ons/addon-google_apis-google-9", + "revision": "9" + } + } + }, + "extras": { + "extras;android;m2repository": { + "archives": [ + { + "os": "all", + "sha1": "a0d22beacc106a6977321f2b07d692ce4979e96a", + "size": 355529608, + "url": "https://dl.google.com/android/repository/android_m2repository_r47.zip" + } + ], + "displayName": "Android Support Repository", + "license": "android-sdk-license", + "name": "extras-android-m2repository", + "path": "extras/android/m2repository", + "revision": "47.0.0" + }, + "extras;google;Android_Emulator_Hypervisor_Driver": { + "archives": [ + { + "os": "windows", + "sha1": "9b3479ce8f42fdcbd487aa843a2453d5950f5fc9", + "size": 164505, + "url": "https://dl.google.com/android/repository/gvm-windows_v1_6_0.zip" + } + ], + "displayName": "Android Emulator Hypervisor Driver for AMD Processors (installer)", + "license": "android-sdk-license", + "name": "extras-google-Android_Emulator_Hypervisor_Driver", + "path": "extras/google/Android_Emulator_Hypervisor_Driver", + "revision": "1.6.0" + }, + "extras;google;admob_ads_sdk": { + "archives": [ + { + "os": "all", + "sha1": "0102859d9575baa0bf4fd5eb422af2ad0fe6cb82", + "size": 704512, + "url": "https://dl.google.com/android/repository/GoogleAdMobAdsSdkAndroid-6.4.1.zip" + } + ], + "displayName": "Google AdMob Ads SDK", + "license": "android-sdk-license", + "name": "extras-google-admob_ads_sdk", + "path": "extras/google/admob_ads_sdk", + "revision": "11" + }, + "extras;google;analytics_sdk_v2": { + "archives": [ + { + "os": "all", + "sha1": "dc14026bf0ce78315cb5dd00552607de0894de83", + "size": 211432, + "url": "https://dl.google.com/android/repository/GoogleAnalyticsAndroid_2.0beta5.zip" + } + ], + "displayName": "Google Analytics App Tracking SDK", + "license": "android-sdk-license", + "name": "extras-google-analytics_sdk_v2", + "path": "extras/google/analytics_sdk_v2", + "revision": "3" + }, + "extras;google;auto": { + "archives": [ + { + "os": "linux", + "sha1": "202a6e1b3009a0eb815f8c672d2d5b3717de6169", + "size": 1346009, + "url": "https://dl.google.com/android/repository/desktop-head-unit-linux_r01.1.zip" + }, + { + "os": "macosx", + "sha1": "8179cbb3914493ebc5eb65b731cba061582f2e84", + "size": 2375533, + "url": "https://dl.google.com/android/repository/desktop-head-unit-macosx_r01.1.zip" + }, + { + "os": "windows", + "sha1": "99c4a7172d73673552119347bc24c58b47da177b", + "size": 2691901, + "url": "https://dl.google.com/android/repository/desktop-head-unit-windows_r01.1.zip" + } + ], + "displayName": "Android Auto Desktop Head Unit emulator", + "license": "android-sdk-license", + "name": "extras-google-auto", + "path": "extras/google/auto", + "revision": "1.1" + }, + "extras;google;gcm": { + "archives": [ + { + "os": "all", + "sha1": "ad066fd0dc7fc99d8aadac09c65a3c2519fbc7bf", + "size": 5901400, + "url": "https://dl.google.com/android/repository/gcm_r03.zip" + } + ], + "displayName": "Google Cloud Messaging for Android Library", + "license": "android-sdk-license", + "name": "extras-google-gcm", + "path": "extras/google/gcm", + "revision": "3" + }, + "extras;google;google_play_services": { + "archives": [ + { + "os": "all", + "sha1": "f95bf19634e2ab0430923247fe2c50246432d2e9", + "size": 15456884, + "url": "https://dl.google.com/android/repository/google_play_services_v16_1_rc09.zip" + } + ], + "displayName": "Google Play services", + "license": "android-sdk-license", + "name": "extras-google-google_play_services", + "path": "extras/google/google_play_services", + "revision": "49" + }, + "extras;google;google_play_services_froyo": { + "archives": [ + { + "os": "all", + "sha1": "92558dbc380bba3d55d0ec181167fb05ce7c79d9", + "size": 5265389, + "url": "https://dl.google.com/android/repository/google_play_services_3265130_r12.zip" + } + ], + "displayName": "Google Play services for Froyo", + "license": "android-sdk-license", + "name": "extras-google-google_play_services_froyo", + "path": "extras/google/google_play_services_froyo", + "revision": "12" + }, + "extras;google;instantapps": { + "archives": [ + { + "os": "all", + "sha1": "c498367dcd7db30154b3e70c4ddbb1b0ea4b8d20", + "size": 39524850, + "url": "https://dl.google.com/android/repository/iasdk-1.9.0-1566514721.zip" + } + ], + "displayName": "Google Play Instant Development SDK", + "license": "android-sdk-license", + "name": "extras-google-instantapps", + "path": "extras/google/instantapps", + "revision": "1.9.0" + }, + "extras;google;m2repository": { + "archives": [ + { + "os": "all", + "sha1": "05086add9e3a0eb1b67111108d7757a4337c3f10", + "size": 215426029, + "url": "https://dl.google.com/android/repository/google_m2repository_gms_v11_3_rc05_wear_2_0_5.zip" + } + ], + "displayName": "Google Repository", + "license": "android-sdk-license", + "name": "extras-google-m2repository", + "path": "extras/google/m2repository", + "revision": "58" + }, + "extras;google;market_apk_expansion": { + "archives": [ + { + "os": "all", + "sha1": "5305399dc1a56814e86b8459ce24871916f78b8c", + "size": 110201, + "url": "https://dl.google.com/android/repository/market_apk_expansion-r03.zip" + } + ], + "displayName": "Google Play APK Expansion library", + "license": "android-sdk-license", + "name": "extras-google-market_apk_expansion", + "path": "extras/google/market_apk_expansion", + "revision": "1" + }, + "extras;google;market_licensing": { + "archives": [ + { + "os": "all", + "sha1": "355e8dc304a92a5616db235af8ee7bd554356254", + "size": 75109, + "url": "https://dl.google.com/android/repository/market_licensing-r02.zip" + } + ], + "displayName": "Google Play Licensing Library", + "license": "android-sdk-license", + "name": "extras-google-market_licensing", + "path": "extras/google/market_licensing", + "revision": "1" + }, + "extras;google;simulators": { + "archives": [ + { + "os": "all", + "sha1": "4fb5344e34e8faab4db18af07dace44c50db26a7", + "size": 2167286, + "url": "https://dl.google.com/android/repository/simulator_r01.zip" + } + ], + "displayName": "Android Auto API Simulators", + "license": "android-sdk-license", + "name": "extras-google-simulators", + "path": "extras/google/simulators", + "revision": "1" + }, + "extras;google;usb_driver": { + "archives": [ + { + "os": "windows", + "sha1": "08a48c39084e9443f6146c239cbd3be6f91e681b", + "size": 8682039, + "url": "https://dl.google.com/android/repository/usb_driver_r13-windows.zip" + } + ], + "displayName": "Google USB Driver", + "license": "android-sdk-license", + "name": "extras-google-usb_driver", + "path": "extras/google/usb_driver", + "revision": "13" + }, + "extras;google;webdriver": { + "archives": [ + { + "os": "all", + "sha1": "13f3a3b2670a5fc04a7342861644be9a01b07e38", + "size": 4055193, + "url": "https://dl.google.com/android/repository/webdriver_r02.zip" + } + ], + "displayName": "Google Web Driver", + "license": "android-sdk-license", + "name": "extras-google-webdriver", + "path": "extras/google/webdriver", + "revision": "2" + }, + "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0": { + "archives": [ + { + "os": "all", + "sha1": "b621b9d5adf273bb0725948589863e60e96eeaf1", + "size": 91207, + "url": "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0.zip" + } + ], + "displayName": "Solver for ConstraintLayout 1.0.0", + "license": "android-sdk-license", + "name": "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0", + "path": "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0", + "revision": "1" + }, + "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-alpha4": { + "archives": [ + { + "os": "all", + "sha1": "2aa2aceecc6ba172742d0af0b43f11d03924eeb8", + "size": 95406, + "url": "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-alpha4.zip" + } + ], + "displayName": "com.android.support.constraint:constraint-layout-solver:1.0.0-alpha4", + "license": "android-sdk-license", + "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" + }, + "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-alpha8": { + "archives": [ + { + "os": "all", + "sha1": "cd13d16a8f0198c1d6040ec8b1d0d4e5bb7feb6a", + "size": 97549, + "url": "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-alpha8.zip" + } + ], + "displayName": "Solver for ConstraintLayout 1.0.0-alpha8", + "license": "android-sdk-license", + "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" + }, + "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-beta1": { + "archives": [ + { + "os": "all", + "sha1": "042c25575e7650e96f0f5f5d1d3c54ed38eb821a", + "size": 104706, + "url": "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-beta1.zip" + } + ], + "displayName": "Solver for ConstraintLayout 1.0.0-beta1", + "license": "android-sdk-license", + "name": "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-beta1", + "path": "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-beta1", + "revision": "1" + }, + "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-beta2": { + "archives": [ + { + "os": "all", + "sha1": "28492fd42b20ae1586591ff906556d459cfdaae8", + "size": 107335, + "url": "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-beta2.zip" + } + ], + "displayName": "Solver for ConstraintLayout 1.0.0-beta2", + "license": "android-sdk-license", + "name": "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-beta2", + "path": "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-beta2", + "revision": "1" + }, + "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-beta3": { + "archives": [ + { + "os": "all", + "sha1": "268e763fa64bd217d8d830e59ce76be19aaba631", + "size": 107593, + "url": "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-beta3.zip" + } + ], + "displayName": "Solver for ConstraintLayout 1.0.0-beta3", + "license": "android-sdk-license", + "name": "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-beta3", + "path": "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-beta3", + "revision": "1" + }, + "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-beta4": { + "archives": [ + { + "os": "all", + "sha1": "2213bf37e7a2869db2635895b8e90ca6841e79d2", + "size": 109361, + "url": "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-beta4.zip" + } + ], + "displayName": "Solver for ConstraintLayout 1.0.0-beta4", + "license": "android-sdk-license", + "name": "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-beta4", + "path": "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-beta4", + "revision": "1" + }, + "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-beta5": { + "archives": [ + { + "os": "all", + "sha1": "3918cfef73e64048d0b3e048068e208b414e7e91", + "size": 92284, + "url": "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-beta5.zip" + } + ], + "displayName": "Solver for ConstraintLayout 1.0.0-beta5", + "license": "android-sdk-license", + "name": "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-beta5", + "path": "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-beta5", + "revision": "1" + }, + "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.1": { + "archives": [ + { + "os": "all", + "sha1": "76f8823def9a6da8954a54737762a6820bc1d043", + "size": 91823, + "url": "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.1.zip" + } + ], + "displayName": "Solver for ConstraintLayout 1.0.1", + "license": "android-sdk-license", + "name": "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.1", + "path": "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.1", + "revision": "1" + }, + "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.2": { + "archives": [ + { + "os": "all", + "sha1": "96d7ff669f0e808e9833b2c2e320702826ccc8be", + "size": 91961, + "url": "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.2.zip" + } + ], + "displayName": "Solver for ConstraintLayout 1.0.2", + "license": "android-sdk-license", + "name": "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.2", + "path": "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.2", + "revision": "1" + }, + "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0": { + "archives": [ + { + "os": "all", + "sha1": "70acf99689b933bc6735645d5c3d92b91954b6cb", + "size": 39153, + "url": "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0.zip" + } + ], + "displayName": "ConstraintLayout for Android 1.0.0", + "license": "android-sdk-license", + "name": "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0", + "path": "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0", + "revision": "1" + }, + "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-alpha4": { + "archives": [ + { + "os": "all", + "sha1": "645a9be1f0c1177301e71cd0ddccf1dd67c554fe", + "size": 15554, + "url": "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-alpha4.zip" + } + ], + "displayName": "com.android.support.constraint:constraint-layout:1.0.0-alpha4", + "license": "android-sdk-license", + "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" + }, + "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-alpha8": { + "archives": [ + { + "os": "all", + "sha1": "7912ba03b04831f918f523648f118c4ee4da7604", + "size": 24797, + "url": "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-alpha8.zip" + } + ], + "displayName": "ConstraintLayout for Android 1.0.0-alpha8", + "license": "android-sdk-license", + "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" + }, + "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-beta1": { + "archives": [ + { + "os": "all", + "sha1": "11f2f5cec4ff02986bad75435e5be77b704b4c64", + "size": 31750, + "url": "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-beta1.zip" + } + ], + "displayName": "ConstraintLayout for Android 1.0.0-beta1", + "license": "android-sdk-license", + "name": "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-beta1", + "path": "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-beta1", + "revision": "1" + }, + "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-beta2": { + "archives": [ + { + "os": "all", + "sha1": "623939865ede2e5c2c975dc55963e0d182bcce95", + "size": 31812, + "url": "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-beta2.zip" + } + ], + "displayName": "ConstraintLayout for Android 1.0.0-beta2", + "license": "android-sdk-license", + "name": "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-beta2", + "path": "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-beta2", + "revision": "1" + }, + "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-beta3": { + "archives": [ + { + "os": "all", + "sha1": "d78bb6a8ce92005fb1e4ed55d892a65b4258c60b", + "size": 32622, + "url": "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-beta3.zip" + } + ], + "displayName": "ConstraintLayout for Android 1.0.0-beta3", + "license": "android-sdk-license", + "name": "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-beta3", + "path": "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-beta3", + "revision": "1" + }, + "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-beta4": { + "archives": [ + { + "os": "all", + "sha1": "dc60844aab93a09a54a3c107685a77b18d7c1c39", + "size": 32687, + "url": "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-beta4.zip" + } + ], + "displayName": "ConstraintLayout for Android 1.0.0-beta4", + "license": "android-sdk-license", + "name": "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-beta4", + "path": "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-beta4", + "revision": "1" + }, + "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-beta5": { + "archives": [ + { + "os": "all", + "sha1": "4660f6c7a576ea1364f0c3225db71c29ca660d9a", + "size": 39266, + "url": "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-beta5.zip" + } + ], + "displayName": "ConstraintLayout for Android 1.0.0-beta5", + "license": "android-sdk-license", + "name": "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-beta5", + "path": "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-beta5", + "revision": "1" + }, + "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.1": { + "archives": [ + { + "os": "all", + "sha1": "342b0894b8651fff37586f80f383733e97aba9f9", + "size": 39547, + "url": "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.1.zip" + } + ], + "displayName": "ConstraintLayout for Android 1.0.1", + "license": "android-sdk-license", + "name": "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.1", + "path": "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.1", + "revision": "1" + }, + "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.2": { + "archives": [ + { + "os": "all", + "sha1": "3d9688a50fe0ed7348275f85d1b02278f616d8a4", + "size": 39625, + "url": "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.2.zip" + } + ], + "displayName": "ConstraintLayout for Android 1.0.2", + "license": "android-sdk-license", + "name": "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.2", + "path": "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.2", + "revision": "1" + } + }, + "images": { + "10": { + "google_apis": { + "armeabi-v7a": { + "archives": [ + { + "os": "all", + "sha1": "970abf3a2a9937a43576afd9bb56e4a8191947f8", + "size": 110706432, + "url": "https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-10_r06.zip" + } + ], + "displayName": "Google APIs ARM EABI v7a System Image", + "license": "android-sdk-license", + "name": "system-image-10-google_apis-armeabi-v7a", + "path": "system-images/android-10/google_apis/armeabi-v7a", + "revision": "10-google_apis-armeabi-v7a" + }, + "x86": { + "archives": [ + { + "os": "all", + "sha1": "070a9552e3d358d8e72e8b2042e539e2b7a1b035", + "size": 118634346, + "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86-10_r06.zip" + } + ], + "displayName": "Google APIs Intel x86 Atom System Image", + "license": "android-sdk-license", + "name": "system-image-10-google_apis-x86", + "path": "system-images/android-10/google_apis/x86", + "revision": "10-google_apis-x86" + } + } + }, + "14": { + "default": { + "armeabi-v7a": { + "archives": [ + { + "os": "all", + "sha1": "d8991b0c06b18d7d6ed4169d67460ee1add6661b", + "size": 99621822, + "url": "https://dl.google.com/android/repository/sys-img/default/sysimg_armv7a-14_r02.zip" + } + ], + "displayName": "ARM EABI v7a System Image", + "license": "android-sdk-license", + "name": "system-image-14-default-armeabi-v7a", + "path": "system-images/android-14/default/armeabi-v7a", + "revision": "14-default-armeabi-v7a" + } + } + }, + "15": { + "google_apis": { + "armeabi-v7a": { + "archives": [ + { + "os": "all", + "sha1": "6deb76cf34760a6037cb18d89772c9e986d07497", + "size": 148773442, + "url": "https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-15_r06.zip" + } + ], + "displayName": "Google APIs ARM EABI v7a System Image", + "license": "android-sdk-license", + "name": "system-image-15-google_apis-armeabi-v7a", + "path": "system-images/android-15/google_apis/armeabi-v7a", + "revision": "15-google_apis-armeabi-v7a" + }, + "x86": { + "archives": [ + { + "os": "all", + "sha1": "5ef2c5481f5bb8789c0b5224d46fb2e13602a450", + "size": 163325511, + "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86-15_r07.zip" + } + ], + "displayName": "Google APIs Intel x86 Atom System Image", + "license": "android-sdk-license", + "name": "system-image-15-google_apis-x86", + "path": "system-images/android-15/google_apis/x86", + "revision": "15-google_apis-x86" + } + } + }, + "16": { + "google_apis": { + "armeabi-v7a": { + "archives": [ + { + "os": "all", + "sha1": "5a5ff097680c6dae473c8719296ce6d7b70edb2d", + "size": 168845378, + "url": "https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-16_r06.zip" + } + ], + "displayName": "Google APIs ARM EABI v7a System Image", + "license": "android-sdk-license", + "name": "system-image-16-google_apis-armeabi-v7a", + "path": "system-images/android-16/google_apis/armeabi-v7a", + "revision": "16-google_apis-armeabi-v7a" + }, + "x86": { + "archives": [ + { + "os": "all", + "sha1": "246903c75f5aa3db7fb58cac877f2201fbbfd94a", + "size": 186372521, + "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86-16_r07.zip" + } + ], + "displayName": "Google APIs Intel x86 Atom System Image", + "license": "android-sdk-license", + "name": "system-image-16-google_apis-x86", + "path": "system-images/android-16/google_apis/x86", + "revision": "16-google_apis-x86" + } + } + }, + "17": { + "google_apis": { + "armeabi-v7a": { + "archives": [ + { + "os": "all", + "sha1": "a59f26cb5707da97e869a27d87b83477204ac594", + "size": 174631794, + "url": "https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-17_r06.zip" + } + ], + "displayName": "Google APIs ARM EABI v7a System Image", + "license": "android-sdk-license", + "name": "system-image-17-google_apis-armeabi-v7a", + "path": "system-images/android-17/google_apis/armeabi-v7a", + "revision": "17-google_apis-armeabi-v7a" + }, + "x86": { + "archives": [ + { + "os": "all", + "sha1": "1ad5ffb51e31f5fe9fa47411fed2c2ade9a33865", + "size": 194811128, + "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86-17_r07.zip" + } + ], + "displayName": "Google APIs Intel x86 Atom System Image", + "license": "android-sdk-license", + "name": "system-image-17-google_apis-x86", + "path": "system-images/android-17/google_apis/x86", + "revision": "17-google_apis-x86" + } + } + }, + "18": { + "google_apis": { + "armeabi-v7a": { + "archives": [ + { + "os": "all", + "sha1": "7faaccabbcc5f08e410436d3f63eea42521ea974", + "size": 179015960, + "url": "https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-18_r06.zip" + } + ], + "displayName": "Google APIs ARM EABI v7a System Image", + "license": "android-sdk-license", + "name": "system-image-18-google_apis-armeabi-v7a", + "path": "system-images/android-18/google_apis/armeabi-v7a", + "revision": "18-google_apis-armeabi-v7a" + }, + "x86": { + "archives": [ + { + "os": "all", + "sha1": "dd674d719cad61602702be4b3d98edccfbfea53e", + "size": 199963568, + "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86-18_r06.zip" + } + ], + "displayName": "Google APIs Intel x86 Atom System Image", + "license": "android-sdk-license", + "name": "system-image-18-google_apis-x86", + "path": "system-images/android-18/google_apis/x86", + "revision": "18-google_apis-x86" + } + } + }, + "19": { + "google_apis": { + "armeabi-v7a": { + "archives": [ + { + "os": "all", + "sha1": "053741c7ef72c7d41394b8a09a1b86238c59c741", + "size": 245902018, + "url": "https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-19_r40.zip" + } + ], + "displayName": "Google APIs ARM EABI v7a System Image", + "license": "android-sdk-license", + "name": "system-image-19-google_apis-armeabi-v7a", + "path": "system-images/android-19/google_apis/armeabi-v7a", + "revision": "19-google_apis-armeabi-v7a" + }, + "x86": { + "archives": [ + { + "os": "all", + "sha1": "67528907f6f4479112f63097f4657dad10783f5a", + "size": 297020632, + "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86-19_r40.zip" + } + ], + "displayName": "Google APIs Intel x86 Atom System Image", + "license": "android-sdk-license", + "name": "system-image-19-google_apis-x86", + "path": "system-images/android-19/google_apis/x86", + "revision": "19-google_apis-x86" + } + } + }, + "21": { + "google_apis": { + "armeabi-v7a": { + "archives": [ + { + "os": "all", + "sha1": "7aa0a1971365de1dc7989720c643121087026564", + "size": 290282953, + "url": "https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-21_r32.zip" + } + ], + "displayName": "Google APIs ARM EABI v7a System Image", + "license": "android-sdk-license", + "name": "system-image-21-google_apis-armeabi-v7a", + "path": "system-images/android-21/google_apis/armeabi-v7a", + "revision": "21-google_apis-armeabi-v7a" + }, + "x86": { + "archives": [ + { + "os": "all", + "sha1": "c6c1d774cec79e6e71c2a24c96d0c45c043d752c", + "size": 319430034, + "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86-21_r32.zip" + } + ], + "displayName": "Google APIs Intel x86 Atom System Image", + "license": "android-sdk-license", + "name": "system-image-21-google_apis-x86", + "path": "system-images/android-21/google_apis/x86", + "revision": "21-google_apis-x86" + }, + "x86_64": { + "archives": [ + { + "os": "all", + "sha1": "e98ba60a0fc88d9a81a768e62db5850b6610baa4", + "size": 415495987, + "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-21_r32.zip" + } + ], + "displayName": "Google APIs Intel x86 Atom_64 System Image", + "license": "android-sdk-license", + "name": "system-image-21-google_apis-x86_64", + "path": "system-images/android-21/google_apis/x86_64", + "revision": "21-google_apis-x86_64" + } + } + }, + "22": { + "google_apis": { + "armeabi-v7a": { + "archives": [ + { + "os": "all", + "sha1": "6a61dd66ec8ac8e678cc19c1331047dade07509f", + "size": 394864140, + "url": "https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-22_r26.zip" + } + ], + "displayName": "Google APIs ARM EABI v7a System Image", + "license": "android-sdk-license", + "name": "system-image-22-google_apis-armeabi-v7a", + "path": "system-images/android-22/google_apis/armeabi-v7a", + "revision": "22-google_apis-armeabi-v7a" + }, + "x86": { + "archives": [ + { + "os": "all", + "sha1": "859ca1d8dcdaaf931effda3f06af95a3740b60d9", + "size": 421293384, + "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86-22_r26.zip" + } + ], + "displayName": "Google APIs Intel x86 Atom System Image", + "license": "android-sdk-license", + "name": "system-image-22-google_apis-x86", + "path": "system-images/android-22/google_apis/x86", + "revision": "22-google_apis-x86" + }, + "x86_64": { + "archives": [ + { + "os": "all", + "sha1": "f99714383c5459d747ac7cdd8043419c6adafe60", + "size": 579197399, + "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-22_r26.zip" + } + ], + "displayName": "Google APIs Intel x86 Atom_64 System Image", + "license": "android-sdk-license", + "name": "system-image-22-google_apis-x86_64", + "path": "system-images/android-22/google_apis/x86_64", + "revision": "22-google_apis-x86_64" + } + } + }, + "23": { + "google_apis": { + "armeabi-v7a": { + "archives": [ + { + "os": "all", + "sha1": "d03ac51742e9d7eea559cbef4f44d18d1fc9c92d", + "size": 468621931, + "url": "https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-23_r33.zip" + } + ], + "displayName": "Google APIs ARM EABI v7a System Image", + "license": "android-sdk-license", + "name": "system-image-23-google_apis-armeabi-v7a", + "path": "system-images/android-23/google_apis/armeabi-v7a", + "revision": "23-google_apis-armeabi-v7a" + }, + "x86": { + "archives": [ + { + "os": "all", + "sha1": "c1d91dfcbaa9f1a6b9698893ce995b2771cd6a16", + "size": 499428151, + "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86-23_r33.zip" + } + ], + "displayName": "Google APIs Intel x86 Atom System Image", + "license": "android-sdk-license", + "name": "system-image-23-google_apis-x86", + "path": "system-images/android-23/google_apis/x86", + "revision": "23-google_apis-x86" + }, + "x86_64": { + "archives": [ + { + "os": "all", + "sha1": "4d80dd38edb565641b3b34e713fe0ec6d1d77698", + "size": 667471680, + "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-23_r33.zip" + } + ], + "displayName": "Google APIs Intel x86 Atom_64 System Image", + "license": "android-sdk-license", + "name": "system-image-23-google_apis-x86_64", + "path": "system-images/android-23/google_apis/x86_64", + "revision": "23-google_apis-x86_64" + } + } + }, + "24": { + "google_apis_playstore": { + "x86": { + "archives": [ + { + "os": "all", + "sha1": "b52e9593ffdde65c1a0970256a32e8967c89cc22", + "size": 812724041, + "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86-24_r19.zip" + } + ], + "displayName": "Google Play Intel x86 Atom System Image", + "license": "android-sdk-license", + "name": "system-image-24-google_apis_playstore-x86", + "path": "system-images/android-24/google_apis_playstore/x86", + "revision": "24-google_apis_playstore-x86" + } + } + }, + "25": { + "google_apis_playstore": { + "x86": { + "archives": [ + { + "os": "all", + "sha1": "6f6668954f7fd52f896fe7528aa122028c9b026c", + "size": 972461719, + "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86-25_r09.zip" + } + ], + "displayName": "Google Play Intel x86 Atom System Image", + "license": "android-sdk-license", + "name": "system-image-25-google_apis_playstore-x86", + "path": "system-images/android-25/google_apis_playstore/x86", + "revision": "25-google_apis_playstore-x86" + } + } + }, + "26": { + "google_apis_playstore": { + "x86": { + "archives": [ + { + "os": "all", + "sha1": "2c8bee7b97a309f099941532e63c42a7d4a06e19", + "size": 769390078, + "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86-26_r07.zip" + } + ], + "displayName": "Google Play Intel x86 Atom System Image", + "license": "android-sdk-preview-license", + "name": "system-image-26-google_apis_playstore-x86", + "path": "system-images/android-26/google_apis_playstore/x86", + "revision": "26-google_apis_playstore-x86" + } + } + }, + "27": { + "google_apis_playstore": { + "x86": { + "archives": [ + { + "os": "all", + "sha1": "eb5a944ceb691ca0648d0a6f0d93893a47223b5d", + "size": 758636016, + "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86-27_r03.zip" + } + ], + "displayName": "Google Play Intel x86 Atom System Image", + "license": "android-sdk-license", + "name": "system-image-27-google_apis_playstore-x86", + "path": "system-images/android-27/google_apis_playstore/x86", + "revision": "27-google_apis_playstore-x86" + } + } + }, + "28": { + "google_apis_playstore": { + "x86": { + "archives": [ + { + "os": "all", + "sha1": "97d9d4f4a2afa8b0f5d52e90748e19c10406ca93", + "size": 918028186, + "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86-28_r09.zip" + } + ], + "displayName": "Google Play Intel x86 Atom System Image", + "license": "android-sdk-license", + "name": "system-image-28-google_apis_playstore-x86", + "path": "system-images/android-28/google_apis_playstore/x86", + "revision": "28-google_apis_playstore-x86" + }, + "x86_64": { + "archives": [ + { + "os": "all", + "sha1": "a767da996fdea7a1f5632a9206fa5c009d6e580c", + "size": 1037659724, + "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-28_r08.zip" + } + ], + "displayName": "Google Play Intel x86 Atom_64 System Image", + "license": "android-sdk-license", + "name": "system-image-28-google_apis_playstore-x86_64", + "path": "system-images/android-28/google_apis_playstore/x86_64", + "revision": "28-google_apis_playstore-x86_64" + } + } + }, + "29": { + "google_apis_playstore": { + "x86": { + "archives": [ + { + "os": "windows", + "sha1": "1c45e690e9ee6a44f40549e9fb68d3fd52ba4970", + "size": 1153916727, + "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86-29_r08-windows.zip" + }, + { + "os": "macosx", + "sha1": "1c45e690e9ee6a44f40549e9fb68d3fd52ba4970", + "size": 1153916727, + "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86-29_r08-darwin.zip" + }, + { + "os": "linux", + "sha1": "1c45e690e9ee6a44f40549e9fb68d3fd52ba4970", + "size": 1153916727, + "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86-29_r08-linux.zip" + } + ], + "displayName": "Google Play Intel x86 Atom System Image", + "license": "android-sdk-license", + "name": "system-image-29-google_apis_playstore-x86", + "path": "system-images/android-29/google_apis_playstore/x86", + "revision": "29-google_apis_playstore-x86" + }, + "x86_64": { + "archives": [ + { + "os": "windows", + "sha1": "94835980b4a6eaeeb41936d7fb1381698e48433a", + "size": 1322004798, + "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-29_r08-windows.zip" + }, + { + "os": "macosx", + "sha1": "94835980b4a6eaeeb41936d7fb1381698e48433a", + "size": 1322004798, + "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-29_r08-darwin.zip" + }, + { + "os": "linux", + "sha1": "94835980b4a6eaeeb41936d7fb1381698e48433a", + "size": 1322004798, + "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-29_r08-linux.zip" + } + ], + "displayName": "Google Play Intel x86 Atom_64 System Image", + "license": "android-sdk-license", + "name": "system-image-29-google_apis_playstore-x86_64", + "path": "system-images/android-29/google_apis_playstore/x86_64", + "revision": "29-google_apis_playstore-x86_64" + } + } + }, + "30": { + "google_apis_playstore": { + "arm64-v8a": { + "archives": [ + { + "os": "macosx", + "sha1": "38dc28908c1784a15fbaf64dd8f8d58279d9ce75", + "size": 1207055010, + "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-30_r09-darwin.zip" + }, + { + "os": "linux", + "sha1": "38dc28908c1784a15fbaf64dd8f8d58279d9ce75", + "size": 1207055010, + "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-30_r09-linux.zip" + } + ], + "displayName": "Google Play ARM 64 v8a System Image", + "license": "android-sdk-arm-dbt-license", + "name": "system-image-30-google_apis_playstore-arm64-v8a", + "path": "system-images/android-30/google_apis_playstore/arm64-v8a", + "revision": "30-google_apis_playstore-arm64-v8a" + }, + "x86": { + "archives": [ + { + "os": "windows", + "sha1": "13c100b62983d64db53cef3d70fea789d89f3232", + "size": 1229340756, + "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86-30_r09-windows.zip" + }, + { + "os": "macosx", + "sha1": "13c100b62983d64db53cef3d70fea789d89f3232", + "size": 1229340756, + "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86-30_r09-darwin.zip" + }, + { + "os": "linux", + "sha1": "13c100b62983d64db53cef3d70fea789d89f3232", + "size": 1229340756, + "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86-30_r09-linux.zip" + } + ], + "displayName": "Google Play Intel x86 Atom System Image", + "license": "android-sdk-license", + "name": "system-image-30-google_apis_playstore-x86", + "path": "system-images/android-30/google_apis_playstore/x86", + "revision": "30-google_apis_playstore-x86" + }, + "x86_64": { + "archives": [ + { + "os": "windows", + "sha1": "ef4661e49abeb64c173636012526e41ff6f39dc1", + "size": 1404149582, + "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-30_r09-windows.zip" + }, + { + "os": "macosx", + "sha1": "ef4661e49abeb64c173636012526e41ff6f39dc1", + "size": 1404149582, + "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-30_r09-darwin.zip" + }, + { + "os": "linux", + "sha1": "ef4661e49abeb64c173636012526e41ff6f39dc1", + "size": 1404149582, + "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-30_r09-linux.zip" + } + ], + "displayName": "Google Play Intel x86 Atom_64 System Image", + "license": "android-sdk-arm-dbt-license", + "name": "system-image-30-google_apis_playstore-x86_64", + "path": "system-images/android-30/google_apis_playstore/x86_64", + "revision": "30-google_apis_playstore-x86_64" + } + } + } + }, + "licenses": { + "android-googletv-license": [ + "Terms and Conditions\n\nThis is the Google TV Add-on for the Android Software Development Kit License Agreement.\n\n1. Introduction\n\n1.1 The Google TV Add-on for the Android Software Development Kit (referred to in this License Agreement as the \"Google TV Add-on\" and specifically including the Android system files, packaged APIs, and Google APIs add-ons) is licensed to you subject to the terms of this License Agreement. This License Agreement forms a legally binding contract between you and Google in relation to your use of the Google TV Add-on.\n\n1.2 \"Google\" means Google Inc., a Delaware corporation with principal place of business at 1600 Amphitheatre Parkway, Mountain View, CA 94043, United States.\n\n2. Accepting this License Agreement\n\n2.1 In order to use the Google TV Add-on, you must first agree to this License Agreement. You may not use the Google TV Add-on if you do not accept this License Agreement.\n\n2.2 You can accept this License Agreement by:\n\n(A) clicking to accept or agree to this License Agreement, where this option is made available to you; or\n\n(B) by actually using the Google TV Add-on. In this case, you agree that use of the Google TV Add-on constitutes acceptance of the License Agreement from that point onwards.\n\n2.3 You may not use the Google TV Add-on and may not accept the Licensing Agreement if you are a person barred from receiving the Google TV Add-on under the laws of the United States or other countries including the country in which you are resident or from which you use the Google TV Add-on.\n\n2.4 If you are agreeing to be bound by this License Agreement on behalf of your employer or other entity, you represent and warrant that you have full legal authority to bind your employer or such entity to this License Agreement. If you do not have the requisite authority, you may not accept the Licensing Agreement or use the Google TV Add-on on behalf of your employer or other entity.\n\n3. Google TV Add-on License from Google\n\n3.1 Subject to the terms of this License Agreement, Google grants you a limited, worldwide, royalty-free, non- assignable and non-exclusive license to use the Google TV Add-on solely to develop applications to run on the Google TV platform.\n\n3.2 You agree that Google or third parties own all legal right, title and interest in and to the Google TV Add-on, including any Intellectual Property Rights that subsist in the Google TV Add-on. \"Intellectual Property Rights\" means any and all rights under patent law, copyright law, trade secret law, trademark law, and any and all other proprietary rights. Google reserves all rights not expressly granted to you.\n\n3.3 Except to the extent required by applicable third party licenses, you may not copy (except for backup purposes), modify, adapt, redistribute, decompile, reverse engineer, disassemble, or create derivative works of the Google TV Add-on or any part of the Google TV Add-on. Except to the extent required by applicable third party licenses, you may not load any part of the Google TV Add-on onto a mobile handset, television, or any other hardware device except a personal computer, combine any part of the Google TV Add-on with other software, or distribute any software or device incorporating a part of the Google TV Add-on.\n\n3.4 Use, reproduction and distribution of components of the Google TV Add-on licensed under an open source software license are governed solely by the terms of that open source software license and not this License Agreement.\n\n3.5 You agree that the form and nature of the Google TV Add-on that Google provides may change without prior notice to you and that future versions of the Google TV Add-on may be incompatible with applications developed on previous versions of the Google TV Add-on. You agree that Google may stop (permanently or temporarily) providing the Google TV Add-on (or any features within the Google TV Add-on) to you or to users generally at Google's sole discretion, without prior notice to you.\n\n3.6 Nothing in this License Agreement gives you a right to use any of Google's or it’s licensors’ trade names, trademarks, service marks, logos, domain names, or other distinctive brand features.\n\n3.7 You agree that you will not remove, obscure, or alter any proprietary rights notices (including copyright and trademark notices) that may be affixed to or contained within the Google TV Add-on.\n\n4. Use of the Google TV Add-on by You\n\n4.1 Google agrees that it obtains no right, title or interest from you (or your licensors) under this License Agreement in or to any software applications that you develop using the Google TV Add-on, including any intellectual property rights that subsist in those applications.\n\n4.2 You agree to use the Google TV Add-on and write applications only for purposes that are permitted by (a) this License Agreement and (b) any applicable law, regulation or generally accepted practices or guidelines in the relevant jurisdictions (including any laws regarding the export of data or software to and from the United States or other relevant countries).\n\n4.3 You agree that if you use the Google TV Add-on to develop applications for general public users, you will protect the privacy and legal rights of those users. If the users provide you with user names, passwords, or other login information or personal information, your must make the users aware that the information will be available to your application, and you must provide legally adequate privacy notice and protection for those users. If your application stores personal or sensitive information provided by users, it must do so securely. If the user provides your application with Google Account information, your application may only use that information to access the user's Google Account when, and for the limited purposes for which, the user has given you explicit permission to do so.\n\n4.4 You agree that you will not engage in any activity with the Google TV Add-on, including the development or distribution of an application, that interferes with, disrupts, damages, or accesses in an unauthorized manner the servers, networks, or other properties or services of any third party including, but not limited to, Google, Multichannel Video Program Distributors or any mobile communications carrier.\n\n4.5 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any data, content, or resources that you create, transmit or display through the Google TV platform and/or applications for the Google TV platform, and for the consequences of your actions (including any loss or damage which Google may suffer) by doing so.\n\n4.6 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any breach of your obligations under this License Agreement, any applicable third party contract or Terms of Service, or any applicable law or regulation, and for the consequences (including any loss or damage which Google or any third party may suffer) of any such breach.\n\n5. Your Developer Credentials\n\n5.1 You agree that you are responsible for maintaining the confidentiality of any developer credentials that may be issued to you by Google or which you may choose yourself and that you will be solely responsible for all applications that are developed under your developer credentials.\n\n6. Privacy and Information\n\n6.1 In order to continually innovate and improve the Google TV Add-on, Google may collect certain usage statistics from the software including but not limited to a unique identifier, associated IP address, version number of the software, and information on which tools and/or services in the Google TV Add-on are being used and how they are being used. Before any of this information is collected, the Google TV Add-on will notify you and seek your consent. If you withhold consent, the information will not be collected.\n\n6.2 The data collected is examined in the aggregate to improve the Google TV Add-on and is maintained in accordance with Google's Privacy Policy.\n\n7. Third Party Applications for the Google TV Platform\n\n7.1 If you use the Google TV Add-on to run applications developed by a third party or that access data, content or resources provided by a third party, you agree that Google is not responsible for those applications, data, content, or resources. You understand that all data, content or resources which you may access through such third party applications are the sole responsibility of the person from which they originated and that Google is not liable for any loss or damage that you may experience as a result of the use or access of any of those third party applications, data, content, or resources.\n\n7.2 You should be aware the data, content, and resources presented to you through such a third party application may be protected by intellectual property rights which are owned by the providers (or by other persons or companies on their behalf). You may not modify, rent, lease, loan, sell, distribute or create derivative works based on these data, content, or resources (either in whole or in part) unless you have been specifically given permission to do so by the relevant owners.\n\n7.3 You acknowledge that your use of such third party applications, data, content, or resources may be subject to separate terms between you and the relevant third party. In that case, this License Agreement does not affect your legal relationship with these third parties.\n\n8. Using Google TV APIs\n\n8.1 If you use any Google TV API to retrieve data from Google, you acknowledge that the data (“Google TV API Content”) may be protected by intellectual property rights which are owned by Google or those parties that provide the data (or by other persons or companies on their behalf). Your use of any such API may be subject to additional Terms of Service. You may not modify, rent, lease, loan, sell, distribute or create derivative works based on this data (either in whole or in part) unless allowed by the relevant Terms of Service. Some portions of the Google TV API Content are licensed to Google by third parties, including but not limited to Tribune Media Services\n\n8.2 If you use any API to retrieve a user's data from Google, you acknowledge and agree that you shall retrieve data only with the user's explicit consent and only when, and for the limited purposes for which, the user has given you permission to do so.\n\n8.3 Except as explicitly permitted in Section 3 (Google TV Add-on License from Google), you must:\n\n(a) not modify nor format the Google TV API Content except to the extent reasonably and technically necessary to optimize the display such Google TV API Content in your application;\n\n(b) not edit the Google TV API Content in a manner that renders the Google TV API Content inaccurate of alters its inherent meaning (provided that displaying excerpts will not violate the foregoing); or\n\n(c) not create any commercial audience measurement tool or service using the Google TV API Content\n\n9. Terminating this License Agreement\n\n9.1 This License Agreement will continue to apply until terminated by either you or Google as set out below.\n\n9.2 If you want to terminate this License Agreement, you may do so by ceasing your use of the Google TV Add-on and any relevant developer credentials.\n\n9.3 Google may at any time, terminate this License Agreement with you if:\n\n(A) you have breached any provision of this License Agreement; or\n\n(B) Google is required to do so by law; or\n\n(C) the partner with whom Google offered certain parts of Google TV Add-on (such as APIs) to you has terminated its relationship with Google or ceased to offer certain parts of the Google TV Add-on to you; or\n\n(D) Google decides to no longer providing the Google TV Add-on or certain parts of the Google TV Add-on to users in the country in which you are resident or from which you use the service, or the provision of the Google TV Add-on or certain Google TV Add-on services to you by Google is, in Google's sole discretion, no longer commercially viable.\n\n9.4 When this License Agreement comes to an end, all of the legal rights, obligations and liabilities that you and Google have benefited from, been subject to (or which have accrued over time whilst this License Agreement has been in force) or which are expressed to continue indefinitely, shall be unaffected by this cessation, and the provisions of paragraph 14.7 shall continue to apply to such rights, obligations and liabilities indefinitely.\n\n10. DISCLAIMER OF WARRANTIES\n\n10.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT YOUR USE OF THE GOOGLE TV ADD-ON IS AT YOUR SOLE RISK AND THAT THE GOOGLE TV ADD-ON IS PROVIDED \"AS IS\" AND \"AS AVAILABLE\" WITHOUT WARRANTY OF ANY KIND FROM GOOGLE.\n\n10.2 YOUR USE OF THE GOOGLE TV ADD-ON AND ANY MATERIAL DOWNLOADED OR OTHERWISE OBTAINED THROUGH THE USE OF THE GOOGLE TV ADD-ON IS AT YOUR OWN DISCRETION AND RISK AND YOU ARE SOLELY RESPONSIBLE FOR ANY DAMAGE TO YOUR COMPUTER SYSTEM OR OTHER DEVICE OR LOSS OF DATA THAT RESULTS FROM SUCH USE.\n\n10.3 GOOGLE FURTHER EXPRESSLY DISCLAIMS ALL WARRANTIES AND CONDITIONS OF ANY KIND, WHETHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO THE IMPLIED WARRANTIES AND CONDITIONS OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.\n\n11. LIMITATION OF LIABILITY\n\n11.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT GOOGLE, ITS SUBSIDIARIES AND AFFILIATES, AND ITS LICENSORS SHALL NOT BE LIABLE TO YOU UNDER ANY THEORY OF LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL CONSEQUENTIAL OR EXEMPLARY DAMAGES THAT MAY BE INCURRED BY YOU, INCLUDING ANY LOSS OF DATA, WHETHER OR NOT GOOGLE OR ITS REPRESENTATIVES HAVE BEEN ADVISED OF OR SHOULD HAVE BEEN AWARE OF THE POSSIBILITY OF ANY SUCH LOSSES ARISING.\n\n12. Indemnification\n\n12.1 To the maximum extent permitted by law, you agree to defend, indemnify and hold harmless Google, its affiliates and their respective directors, officers, employees and agents from and against any and all claims, actions, suits or proceedings, as well as any and all losses, liabilities, damages, costs and expenses (including reasonable attorneys fees) arising out of or accruing from (a) your use of the Google TV Add-on, (b) any application you develop on the Google TV Add-on that infringes any copyright, trademark, trade secret, trade dress, patent or other intellectual property right of any person or defames any person or violates their rights of publicity or privacy, and (c) any non-compliance by you with this License Agreement.\n\n13. Changes to the License Agreement\n\n13.1 Google may make changes to the License Agreement as it distributes new versions of the Google TV Add-on.\n\n14. General Legal Terms\n\n14.1 This License Agreement constitute the whole legal agreement between you and Google and govern your use of the Google TV Add-on (excluding any services which Google may provide to you under a separate written agreement), and completely replace any prior agreements between you and Google in relation to the Google TV Add-on.\n\n14.2 You agree that if Google does not exercise or enforce any legal right or remedy which is contained in this License Agreement (or which Google has the benefit of under any applicable law), this will not be taken to be a formal waiver of Google's rights and that those rights or remedies will still be available to Google.\n\n14.3 If any court of law, having the jurisdiction to decide on this matter, rules that any provision of this License Agreement is invalid, then that provision will be removed from this License Agreement without affecting the rest of this License Agreement. The remaining provisions of this License Agreement will continue to be valid and enforceable.\n\n14.4 You acknowledge and agree that Google’s API data licensors and each member of the group of companies of which Google is the parent shall be third party beneficiaries to this License Agreement and that such other companies shall be entitled to directly enforce, and rely upon, any provision of this License Agreement that confers a benefit on (or rights in favor of) them. Other than this, no other person or company shall be third party beneficiaries to this License Agreement.\n\n14.5 EXPORT RESTRICTIONS. THE GOOGLE TV ADD-ON IS SUBJECT TO UNITED STATES EXPORT LAWS AND REGULATIONS. YOU MUST COMPLY WITH ALL DOMESTIC AND INTERNATIONAL EXPORT LAWS AND REGULATIONS THAT APPLY TO THE GOOGLE TV ADD-ON. THESE LAWS INCLUDE RESTRICTIONS ON DESTINATIONS, END USERS AND END USE.\n\n14.6 The rights granted in this License Agreement may not be assigned or transferred by either you or Google without the prior written approval of the other party. Neither you nor Google shall be permitted to delegate their responsibilities or obligations under this License Agreement without the prior written approval of the other party.\n\n14.7 This License Agreement, and your relationship with Google under this License Agreement, shall be governed by the laws of the State of California without regard to its conflict of laws provisions. You and Google agree to submit to the exclusive jurisdiction of the courts located within the county of Santa Clara, California to resolve any legal matter arising from this License Agreement. Notwithstanding this, you agree that Google shall still be allowed to apply for injunctive remedies (or an equivalent type of urgent legal relief) in any jurisdiction.\n\n\nAugust 15, 2011" + ], + "android-sdk-arm-dbt-license": [ + "Terms and Conditions\n\nThis is the Android Software Development Kit License Agreement\n\n1. Introduction\n\n1.1 The Android Software Development Kit (referred to in the License Agreement as the \"SDK\" and specifically including the Android system files, packaged APIs, and Google APIs add-ons) is licensed to you subject to the terms of the License Agreement. The License Agreement forms a legally binding contract between you and Google in relation to your use of the SDK.\n\n1.2 \"Android\" means the Android software stack for devices, as made available under the Android Open Source Project, which is located at the following URL: http://source.android.com/, as updated from time to time.\n\n1.3 A \"compatible implementation\" means any Android device that (i) complies with the Android Compatibility Definition document, which can be found at the Android compatibility website (http://source.android.com/compatibility) and which may be updated from time to time; and (ii) successfully passes the Android Compatibility Test Suite (CTS).\n\n1.4 \"Google\" means Google Inc., a Delaware corporation with principal place of business at 1600 Amphitheatre Parkway, Mountain View, CA 94043, United States.\n\n\n2. Accepting the License Agreement\n\n2.1 In order to use the SDK, you must first agree to the License Agreement. You may not use the SDK if you do not accept the License Agreement.\n\n2.2 By clicking to accept, you hereby agree to the terms of the License Agreement.\n\n2.3 You may not use the SDK and may not accept the License Agreement if you are a person barred from receiving the SDK under the laws of the United States or other countries, including the country in which you are resident or from which you use the SDK.\n\n2.4 If you are agreeing to be bound by the License Agreement on behalf of your employer or other entity, you represent and warrant that you have full legal authority to bind your employer or such entity to the License Agreement. If you do not have the requisite authority, you may not accept the License Agreement or use the SDK on behalf of your employer or other entity.\n\n\n3. SDK License from Google\n\n3.1 Subject to the terms of the License Agreement, Google grants you a limited, worldwide, royalty-free, non-assignable, non-exclusive, and non-sublicensable license to use the SDK solely to develop applications for compatible implementations of Android.\n\n3.2 You may not use this SDK to develop applications for other platforms (including non-compatible implementations of Android) or to develop another SDK. You are of course free to develop applications for other platforms, including non-compatible implementations of Android, provided that this SDK is not used for that purpose.\n\n3.3 You agree that Google or third parties own all legal right, title and interest in and to the SDK, including any Intellectual Property Rights that subsist in the SDK. \"Intellectual Property Rights\" means any and all rights under patent law, copyright law, trade secret law, trademark law, and any and all other proprietary rights. Google reserves all rights not expressly granted to you.\n\n3.4 You may not use the SDK for any purpose not expressly permitted by the License Agreement. Except to the extent required by applicable third party licenses, you may not copy (except for backup purposes), modify, adapt, redistribute, decompile, reverse engineer, disassemble, or create derivative works of the SDK or any part of the SDK.\n\n3.5 Use, reproduction and distribution of components of the SDK licensed under an open source software license are governed solely by the terms of that open source software license and not the License Agreement.\n\n3.6 You agree that the form and nature of the SDK that Google provides may change without prior notice to you and that future versions of the SDK may be incompatible with applications developed on previous versions of the SDK. You agree that Google may stop (permanently or temporarily) providing the SDK (or any features within the SDK) to you or to users generally at Google's sole discretion, without prior notice to you.\n\n3.7 Nothing in the License Agreement gives you a right to use any of Google's trade names, trademarks, service marks, logos, domain names, or other distinctive brand features.\n\n3.8 You agree that you will not remove, obscure, or alter any proprietary rights notices (including copyright and trademark notices) that may be affixed to or contained within the SDK.\n\n\n4. Use of the SDK by You\n\n4.1 Google agrees that it obtains no right, title or interest from you (or your licensors) under the License Agreement in or to any software applications that you develop using the SDK, including any intellectual property rights that subsist in those applications.\n\n4.2 You agree to use the SDK and write applications only for purposes that are permitted by (a) the License Agreement and (b) any applicable law, regulation or generally accepted practices or guidelines in the relevant jurisdictions (including any laws regarding the export of data or software to and from the United States or other relevant countries).\n\n4.3 You agree that if you use the SDK to develop applications for general public users, you will protect the privacy and legal rights of those users. If the users provide you with user names, passwords, or other login information or personal information, you must make the users aware that the information will be available to your application, and you must provide legally adequate privacy notice and protection for those users. If your application stores personal or sensitive information provided by users, it must do so securely. If the user provides your application with Google Account information, your application may only use that information to access the user's Google Account when, and for the limited purposes for which, the user has given you permission to do so.\n\n4.4 You agree that you will not engage in any activity with the SDK, including the development or distribution of an application, that interferes with, disrupts, damages, or accesses in an unauthorized manner the servers, networks, or other properties or services of any third party including, but not limited to, Google or any mobile communications carrier.\n\n4.5 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any data, content, or resources that you create, transmit or display through Android and/or applications for Android, and for the consequences of your actions (including any loss or damage which Google may suffer) by doing so.\n\n4.6 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any breach of your obligations under the License Agreement, any applicable third party contract or Terms of Service, or any applicable law or regulation, and for the consequences (including any loss or damage which Google or any third party may suffer) of any such breach.\n\n4.7 This software enables the execution of intellectual property owned by Arm Limited. You agree that your use of the software, that allows execution of ARM Instruction Set Architecture (“ISA”) compliant executables for application development and debug only on x86 desktop, laptop, customer on-premise servers, and customer-procured cloud-based environments.\n\n5. Your Developer Credentials\n\n5.1 You agree that you are responsible for maintaining the confidentiality of any developer credentials that may be issued to you by Google or which you may choose yourself and that you will be solely responsible for all applications that are developed under your developer credentials.\n\n6. Privacy and Information\n\n6.1 In order to continually innovate and improve the SDK, Google may collect certain usage statistics from the software including but not limited to a unique identifier, associated IP address, version number of the software, and information on which tools and/or services in the SDK are being used and how they are being used. Before any of this information is collected, the SDK will notify you and seek your consent. If you withhold consent, the information will not be collected.\n\n6.2 The data collected is examined in the aggregate to improve the SDK and is maintained in accordance with Google's Privacy Policy.\n\n\n7. Third Party Applications\n\n7.1 If you use the SDK to run applications developed by a third party or that access data, content or resources provided by a third party, you agree that Google is not responsible for those applications, data, content, or resources. You understand that all data, content or resources which you may access through such third party applications are the sole responsibility of the person from which they originated and that Google is not liable for any loss or damage that you may experience as a result of the use or access of any of those third party applications, data, content, or resources.\n\n7.2 You should be aware the data, content, and resources presented to you through such a third party application may be protected by intellectual property rights which are owned by the providers (or by other persons or companies on their behalf). You may not modify, rent, lease, loan, sell, distribute or create derivative works based on these data, content, or resources (either in whole or in part) unless you have been specifically given permission to do so by the relevant owners.\n\n7.3 You acknowledge that your use of such third party applications, data, content, or resources may be subject to separate terms between you and the relevant third party. In that case, the License Agreement does not affect your legal relationship with these third parties.\n\n\n8. Using Android APIs\n\n8.1 Google Data APIs\n\n8.1.1 If you use any API to retrieve data from Google, you acknowledge that the data may be protected by intellectual property rights which are owned by Google or those parties that provide the data (or by other persons or companies on their behalf). Your use of any such API may be subject to additional Terms of Service. You may not modify, rent, lease, loan, sell, distribute or create derivative works based on this data (either in whole or in part) unless allowed by the relevant Terms of Service.\n\n8.1.2 If you use any API to retrieve a user's data from Google, you acknowledge and agree that you shall retrieve data only with the user's explicit consent and only when, and for the limited purposes for which, the user has given you permission to do so. If you use the Android Recognition Service API, documented at the following URL: https://developer.android.com/reference/android/speech/RecognitionService, as updated from time to time, you acknowledge that the use of the API is subject to the Data Processing Addendum for Products where Google is a Data Processor, which is located at the following URL: https://privacy.google.com/businesses/gdprprocessorterms/, as updated from time to time. By clicking to accept, you hereby agree to the terms of the Data Processing Addendum for Products where Google is a Data Processor.\n\n\n9. Terminating the License Agreement\n\n9.1 The License Agreement will continue to apply until terminated by either you or Google as set out below.\n\n9.2 If you want to terminate the License Agreement, you may do so by ceasing your use of the SDK and any relevant developer credentials.\n\n9.3 Google may at any time, terminate the License Agreement with you if: (A) you have breached any provision of the License Agreement; or (B) Google is required to do so by law; or (C) the partner with whom Google offered certain parts of SDK (such as APIs) to you has terminated its relationship with Google or ceased to offer certain parts of the SDK to you; or (D) Google decides to no longer provide the SDK or certain parts of the SDK to users in the country in which you are resident or from which you use the service, or the provision of the SDK or certain SDK services to you by Google is, in Google's sole discretion, no longer commercially viable.\n\n9.4 When the License Agreement comes to an end, all of the legal rights, obligations and liabilities that you and Google have benefited from, been subject to (or which have accrued over time whilst the License Agreement has been in force) or which are expressed to continue indefinitely, shall be unaffected by this cessation, and the provisions of paragraph 14.7 shall continue to apply to such rights, obligations and liabilities indefinitely.\n\n\n10. DISCLAIMER OF WARRANTIES\n\n10.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT YOUR USE OF THE SDK IS AT YOUR SOLE RISK AND THAT THE SDK IS PROVIDED \"AS IS\" AND \"AS AVAILABLE\" WITHOUT WARRANTY OF ANY KIND FROM GOOGLE.\n\n10.2 YOUR USE OF THE SDK AND ANY MATERIAL DOWNLOADED OR OTHERWISE OBTAINED THROUGH THE USE OF THE SDK IS AT YOUR OWN DISCRETION AND RISK AND YOU ARE SOLELY RESPONSIBLE FOR ANY DAMAGE TO YOUR COMPUTER SYSTEM OR OTHER DEVICE OR LOSS OF DATA THAT RESULTS FROM SUCH USE.\n\n10.3 GOOGLE FURTHER EXPRESSLY DISCLAIMS ALL WARRANTIES AND CONDITIONS OF ANY KIND, WHETHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO THE IMPLIED WARRANTIES AND CONDITIONS OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.\n\n\n11. LIMITATION OF LIABILITY\n\n11.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT GOOGLE, ITS SUBSIDIARIES AND AFFILIATES, AND ITS LICENSORS SHALL NOT BE LIABLE TO YOU UNDER ANY THEORY OF LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, CONSEQUENTIAL OR EXEMPLARY DAMAGES THAT MAY BE INCURRED BY YOU, INCLUDING ANY LOSS OF DATA, WHETHER OR NOT GOOGLE OR ITS REPRESENTATIVES HAVE BEEN ADVISED OF OR SHOULD HAVE BEEN AWARE OF THE POSSIBILITY OF ANY SUCH LOSSES ARISING.\n\n\n12. Indemnification\n\n12.1 To the maximum extent permitted by law, you agree to defend, indemnify and hold harmless Google, its affiliates and their respective directors, officers, employees and agents from and against any and all claims, actions, suits or proceedings, as well as any and all losses, liabilities, damages, costs and expenses (including reasonable attorneys fees) arising out of or accruing from (a) your use of the SDK, (b) any application you develop on the SDK that infringes any copyright, trademark, trade secret, trade dress, patent or other intellectual property right of any person or defames any person or violates their rights of publicity or privacy, and (c) any non-compliance by you with the License Agreement.\n\n\n13. Changes to the License Agreement\n\n13.1 Google may make changes to the License Agreement as it distributes new versions of the SDK. When these changes are made, Google will make a new version of the License Agreement available on the website where the SDK is made available.\n\n\n14. General Legal Terms\n\n14.1 The License Agreement constitutes the whole legal agreement between you and Google and governs your use of the SDK (excluding any services which Google may provide to you under a separate written agreement), and completely replaces any prior agreements between you and Google in relation to the SDK.\n\n14.2 You agree that if Google does not exercise or enforce any legal right or remedy which is contained in the License Agreement (or which Google has the benefit of under any applicable law), this will not be taken to be a formal waiver of Google's rights and that those rights or remedies will still be available to Google.\n\n14.3 If any court of law, having the jurisdiction to decide on this matter, rules that any provision of the License Agreement is invalid, then that provision will be removed from the License Agreement without affecting the rest of the License Agreement. The remaining provisions of the License Agreement will continue to be valid and enforceable.\n\n14.4 You acknowledge and agree that each member of the group of companies of which Google is the parent shall be third party beneficiaries to the License Agreement and that such other companies shall be entitled to directly enforce, and rely upon, any provision of the License Agreement that confers a benefit on (or rights in favor of) them. Other than this, no other person or company shall be third party beneficiaries to the License Agreement.\n\n14.5 EXPORT RESTRICTIONS. THE SDK IS SUBJECT TO UNITED STATES EXPORT LAWS AND REGULATIONS. YOU MUST COMPLY WITH ALL DOMESTIC AND INTERNATIONAL EXPORT LAWS AND REGULATIONS THAT APPLY TO THE SDK. THESE LAWS INCLUDE RESTRICTIONS ON DESTINATIONS, END USERS AND END USE.\n\n14.6 The rights granted in the License Agreement may not be assigned or transferred by either you or Google without the prior written approval of the other party. Neither you nor Google shall be permitted to delegate their responsibilities or obligations under the License Agreement without the prior written approval of the other party.\n\n14.7 The License Agreement, and your relationship with Google under the License Agreement, shall be governed by the laws of the State of California without regard to its conflict of laws provisions. You and Google agree to submit to the exclusive jurisdiction of the courts located within the county of Santa Clara, California to resolve any legal matter arising from the License Agreement. Notwithstanding this, you agree that Google shall still be allowed to apply for injunctive remedies (or an equivalent type of urgent legal relief) in any jurisdiction.\n\n\nJanuary 16, 2019" + ], + "android-sdk-license": [ + "Terms and Conditions\n\nThis is the Android Software Development Kit License Agreement\n\n1. Introduction\n\n1.1 The Android Software Development Kit (referred to in the License Agreement as the \"SDK\" and specifically including the Android system files, packaged APIs, and Google APIs add-ons) is licensed to you subject to the terms of the License Agreement. The License Agreement forms a legally binding contract between you and Google in relation to your use of the SDK.\n\n1.2 \"Android\" means the Android software stack for devices, as made available under the Android Open Source Project, which is located at the following URL: http://source.android.com/, as updated from time to time.\n\n1.3 A \"compatible implementation\" means any Android device that (i) complies with the Android Compatibility Definition document, which can be found at the Android compatibility website (http://source.android.com/compatibility) and which may be updated from time to time; and (ii) successfully passes the Android Compatibility Test Suite (CTS).\n\n1.4 \"Google\" means Google Inc., a Delaware corporation with principal place of business at 1600 Amphitheatre Parkway, Mountain View, CA 94043, United States.\n\n\n2. Accepting the License Agreement\n\n2.1 In order to use the SDK, you must first agree to the License Agreement. You may not use the SDK if you do not accept the License Agreement.\n\n2.2 By clicking to accept, you hereby agree to the terms of the License Agreement.\n\n2.3 You may not use the SDK and may not accept the License Agreement if you are a person barred from receiving the SDK under the laws of the United States or other countries, including the country in which you are resident or from which you use the SDK.\n\n2.4 If you are agreeing to be bound by the License Agreement on behalf of your employer or other entity, you represent and warrant that you have full legal authority to bind your employer or such entity to the License Agreement. If you do not have the requisite authority, you may not accept the License Agreement or use the SDK on behalf of your employer or other entity.\n\n\n3. SDK License from Google\n\n3.1 Subject to the terms of the License Agreement, Google grants you a limited, worldwide, royalty-free, non-assignable, non-exclusive, and non-sublicensable license to use the SDK solely to develop applications for compatible implementations of Android.\n\n3.2 You may not use this SDK to develop applications for other platforms (including non-compatible implementations of Android) or to develop another SDK. You are of course free to develop applications for other platforms, including non-compatible implementations of Android, provided that this SDK is not used for that purpose.\n\n3.3 You agree that Google or third parties own all legal right, title and interest in and to the SDK, including any Intellectual Property Rights that subsist in the SDK. \"Intellectual Property Rights\" means any and all rights under patent law, copyright law, trade secret law, trademark law, and any and all other proprietary rights. Google reserves all rights not expressly granted to you.\n\n3.4 You may not use the SDK for any purpose not expressly permitted by the License Agreement. Except to the extent required by applicable third party licenses, you may not copy (except for backup purposes), modify, adapt, redistribute, decompile, reverse engineer, disassemble, or create derivative works of the SDK or any part of the SDK.\n\n3.5 Use, reproduction and distribution of components of the SDK licensed under an open source software license are governed solely by the terms of that open source software license and not the License Agreement.\n\n3.6 You agree that the form and nature of the SDK that Google provides may change without prior notice to you and that future versions of the SDK may be incompatible with applications developed on previous versions of the SDK. You agree that Google may stop (permanently or temporarily) providing the SDK (or any features within the SDK) to you or to users generally at Google's sole discretion, without prior notice to you.\n\n3.7 Nothing in the License Agreement gives you a right to use any of Google's trade names, trademarks, service marks, logos, domain names, or other distinctive brand features.\n\n3.8 You agree that you will not remove, obscure, or alter any proprietary rights notices (including copyright and trademark notices) that may be affixed to or contained within the SDK.\n\n\n4. Use of the SDK by You\n\n4.1 Google agrees that it obtains no right, title or interest from you (or your licensors) under the License Agreement in or to any software applications that you develop using the SDK, including any intellectual property rights that subsist in those applications.\n\n4.2 You agree to use the SDK and write applications only for purposes that are permitted by (a) the License Agreement and (b) any applicable law, regulation or generally accepted practices or guidelines in the relevant jurisdictions (including any laws regarding the export of data or software to and from the United States or other relevant countries).\n\n4.3 You agree that if you use the SDK to develop applications for general public users, you will protect the privacy and legal rights of those users. If the users provide you with user names, passwords, or other login information or personal information, you must make the users aware that the information will be available to your application, and you must provide legally adequate privacy notice and protection for those users. If your application stores personal or sensitive information provided by users, it must do so securely. If the user provides your application with Google Account information, your application may only use that information to access the user's Google Account when, and for the limited purposes for which, the user has given you permission to do so.\n\n4.4 You agree that you will not engage in any activity with the SDK, including the development or distribution of an application, that interferes with, disrupts, damages, or accesses in an unauthorized manner the servers, networks, or other properties or services of any third party including, but not limited to, Google or any mobile communications carrier.\n\n4.5 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any data, content, or resources that you create, transmit or display through Android and/or applications for Android, and for the consequences of your actions (including any loss or damage which Google may suffer) by doing so.\n\n4.6 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any breach of your obligations under the License Agreement, any applicable third party contract or Terms of Service, or any applicable law or regulation, and for the consequences (including any loss or damage which Google or any third party may suffer) of any such breach.\n\n5. Your Developer Credentials\n\n5.1 You agree that you are responsible for maintaining the confidentiality of any developer credentials that may be issued to you by Google or which you may choose yourself and that you will be solely responsible for all applications that are developed under your developer credentials.\n\n6. Privacy and Information\n\n6.1 In order to continually innovate and improve the SDK, Google may collect certain usage statistics from the software including but not limited to a unique identifier, associated IP address, version number of the software, and information on which tools and/or services in the SDK are being used and how they are being used. Before any of this information is collected, the SDK will notify you and seek your consent. If you withhold consent, the information will not be collected.\n\n6.2 The data collected is examined in the aggregate to improve the SDK and is maintained in accordance with Google's Privacy Policy.\n\n\n7. Third Party Applications\n\n7.1 If you use the SDK to run applications developed by a third party or that access data, content or resources provided by a third party, you agree that Google is not responsible for those applications, data, content, or resources. You understand that all data, content or resources which you may access through such third party applications are the sole responsibility of the person from which they originated and that Google is not liable for any loss or damage that you may experience as a result of the use or access of any of those third party applications, data, content, or resources.\n\n7.2 You should be aware the data, content, and resources presented to you through such a third party application may be protected by intellectual property rights which are owned by the providers (or by other persons or companies on their behalf). You may not modify, rent, lease, loan, sell, distribute or create derivative works based on these data, content, or resources (either in whole or in part) unless you have been specifically given permission to do so by the relevant owners.\n\n7.3 You acknowledge that your use of such third party applications, data, content, or resources may be subject to separate terms between you and the relevant third party. In that case, the License Agreement does not affect your legal relationship with these third parties.\n\n\n8. Using Android APIs\n\n8.1 Google Data APIs\n\n8.1.1 If you use any API to retrieve data from Google, you acknowledge that the data may be protected by intellectual property rights which are owned by Google or those parties that provide the data (or by other persons or companies on their behalf). Your use of any such API may be subject to additional Terms of Service. You may not modify, rent, lease, loan, sell, distribute or create derivative works based on this data (either in whole or in part) unless allowed by the relevant Terms of Service.\n\n8.1.2 If you use any API to retrieve a user's data from Google, you acknowledge and agree that you shall retrieve data only with the user's explicit consent and only when, and for the limited purposes for which, the user has given you permission to do so. If you use the Android Recognition Service API, documented at the following URL: https://developer.android.com/reference/android/speech/RecognitionService, as updated from time to time, you acknowledge that the use of the API is subject to the Data Processing Addendum for Products where Google is a Data Processor, which is located at the following URL: https://privacy.google.com/businesses/gdprprocessorterms/, as updated from time to time. By clicking to accept, you hereby agree to the terms of the Data Processing Addendum for Products where Google is a Data Processor.\n\n\n9. Terminating the License Agreement\n\n9.1 The License Agreement will continue to apply until terminated by either you or Google as set out below.\n\n9.2 If you want to terminate the License Agreement, you may do so by ceasing your use of the SDK and any relevant developer credentials.\n\n9.3 Google may at any time, terminate the License Agreement with you if: (A) you have breached any provision of the License Agreement; or (B) Google is required to do so by law; or (C) the partner with whom Google offered certain parts of SDK (such as APIs) to you has terminated its relationship with Google or ceased to offer certain parts of the SDK to you; or (D) Google decides to no longer provide the SDK or certain parts of the SDK to users in the country in which you are resident or from which you use the service, or the provision of the SDK or certain SDK services to you by Google is, in Google's sole discretion, no longer commercially viable.\n\n9.4 When the License Agreement comes to an end, all of the legal rights, obligations and liabilities that you and Google have benefited from, been subject to (or which have accrued over time whilst the License Agreement has been in force) or which are expressed to continue indefinitely, shall be unaffected by this cessation, and the provisions of paragraph 14.7 shall continue to apply to such rights, obligations and liabilities indefinitely.\n\n\n10. DISCLAIMER OF WARRANTIES\n\n10.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT YOUR USE OF THE SDK IS AT YOUR SOLE RISK AND THAT THE SDK IS PROVIDED \"AS IS\" AND \"AS AVAILABLE\" WITHOUT WARRANTY OF ANY KIND FROM GOOGLE.\n\n10.2 YOUR USE OF THE SDK AND ANY MATERIAL DOWNLOADED OR OTHERWISE OBTAINED THROUGH THE USE OF THE SDK IS AT YOUR OWN DISCRETION AND RISK AND YOU ARE SOLELY RESPONSIBLE FOR ANY DAMAGE TO YOUR COMPUTER SYSTEM OR OTHER DEVICE OR LOSS OF DATA THAT RESULTS FROM SUCH USE.\n\n10.3 GOOGLE FURTHER EXPRESSLY DISCLAIMS ALL WARRANTIES AND CONDITIONS OF ANY KIND, WHETHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO THE IMPLIED WARRANTIES AND CONDITIONS OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.\n\n\n11. LIMITATION OF LIABILITY\n\n11.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT GOOGLE, ITS SUBSIDIARIES AND AFFILIATES, AND ITS LICENSORS SHALL NOT BE LIABLE TO YOU UNDER ANY THEORY OF LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, CONSEQUENTIAL OR EXEMPLARY DAMAGES THAT MAY BE INCURRED BY YOU, INCLUDING ANY LOSS OF DATA, WHETHER OR NOT GOOGLE OR ITS REPRESENTATIVES HAVE BEEN ADVISED OF OR SHOULD HAVE BEEN AWARE OF THE POSSIBILITY OF ANY SUCH LOSSES ARISING.\n\n\n12. Indemnification\n\n12.1 To the maximum extent permitted by law, you agree to defend, indemnify and hold harmless Google, its affiliates and their respective directors, officers, employees and agents from and against any and all claims, actions, suits or proceedings, as well as any and all losses, liabilities, damages, costs and expenses (including reasonable attorneys fees) arising out of or accruing from (a) your use of the SDK, (b) any application you develop on the SDK that infringes any copyright, trademark, trade secret, trade dress, patent or other intellectual property right of any person or defames any person or violates their rights of publicity or privacy, and (c) any non-compliance by you with the License Agreement.\n\n\n13. Changes to the License Agreement\n\n13.1 Google may make changes to the License Agreement as it distributes new versions of the SDK. When these changes are made, Google will make a new version of the License Agreement available on the website where the SDK is made available.\n\n\n14. General Legal Terms\n\n14.1 The License Agreement constitutes the whole legal agreement between you and Google and governs your use of the SDK (excluding any services which Google may provide to you under a separate written agreement), and completely replaces any prior agreements between you and Google in relation to the SDK.\n\n14.2 You agree that if Google does not exercise or enforce any legal right or remedy which is contained in the License Agreement (or which Google has the benefit of under any applicable law), this will not be taken to be a formal waiver of Google's rights and that those rights or remedies will still be available to Google.\n\n14.3 If any court of law, having the jurisdiction to decide on this matter, rules that any provision of the License Agreement is invalid, then that provision will be removed from the License Agreement without affecting the rest of the License Agreement. The remaining provisions of the License Agreement will continue to be valid and enforceable.\n\n14.4 You acknowledge and agree that each member of the group of companies of which Google is the parent shall be third party beneficiaries to the License Agreement and that such other companies shall be entitled to directly enforce, and rely upon, any provision of the License Agreement that confers a benefit on (or rights in favor of) them. Other than this, no other person or company shall be third party beneficiaries to the License Agreement.\n\n14.5 EXPORT RESTRICTIONS. THE SDK IS SUBJECT TO UNITED STATES EXPORT LAWS AND REGULATIONS. YOU MUST COMPLY WITH ALL DOMESTIC AND INTERNATIONAL EXPORT LAWS AND REGULATIONS THAT APPLY TO THE SDK. THESE LAWS INCLUDE RESTRICTIONS ON DESTINATIONS, END USERS AND END USE.\n\n14.6 The rights granted in the License Agreement may not be assigned or transferred by either you or Google without the prior written approval of the other party. Neither you nor Google shall be permitted to delegate their responsibilities or obligations under the License Agreement without the prior written approval of the other party.\n\n14.7 The License Agreement, and your relationship with Google under the License Agreement, shall be governed by the laws of the State of California without regard to its conflict of laws provisions. You and Google agree to submit to the exclusive jurisdiction of the courts located within the county of Santa Clara, California to resolve any legal matter arising from the License Agreement. Notwithstanding this, you agree that Google shall still be allowed to apply for injunctive remedies (or an equivalent type of urgent legal relief) in any jurisdiction.\n\n\nJanuary 16, 2019" + ], + "android-sdk-preview-license": [ + "To get started with the Android SDK Preview, you must agree to the following terms and conditions. As described below, please note that this is a preview version of the Android SDK, subject to change, that you use at your own risk. The Android SDK Preview is not a stable release, and may contain errors and defects that can result in serious damage to your computer systems, devices and data.\n\nThis is the Android SDK Preview License Agreement (the \"License Agreement\").\n\n1. Introduction\n\n1.1 The Android SDK Preview (referred to in the License Agreement as the “Preview” and specifically including the Android system files, packaged APIs, and Preview library files, if and when they are made available) is licensed to you subject to the terms of the License Agreement. The License Agreement forms a legally binding contract between you and Google in relation to your use of the Preview.\n\n1.2 \"Android\" means the Android software stack for devices, as made available under the Android Open Source Project, which is located at the following URL: http://source.android.com/, as updated from time to time.\n\n1.3 \"Google\" means Google Inc., a Delaware corporation with principal place of business at 1600 Amphitheatre Parkway, Mountain View, CA 94043, United States.\n\n2. Accepting the License Agreement\n\n2.1 In order to use the Preview, you must first agree to the License Agreement. You may not use the Preview if you do not accept the License Agreement.\n\n2.2 By clicking to accept and/or using the Preview, you hereby agree to the terms of the License Agreement.\n\n2.3 You may not use the Preview and may not accept the License Agreement if you are a person barred from receiving the Preview under the laws of the United States or other countries including the country in which you are resident or from which you use the Preview.\n\n2.4 If you will use the Preview internally within your company or organization you agree to be bound by the License Agreement on behalf of your employer or other entity, and you represent and warrant that you have full legal authority to bind your employer or such entity to the License Agreement. If you do not have the requisite authority, you may not accept the License Agreement or use the Preview on behalf of your employer or other entity.\n\n3. Preview License from Google\n\n3.1 Subject to the terms of the License Agreement, Google grants you a royalty-free, non-assignable, non-exclusive, non-sublicensable, limited, revocable license to use the Preview, personally or internally within your company or organization, solely to develop applications to run on the Android platform.\n\n3.2 You agree that Google or third parties owns all legal right, title and interest in and to the Preview, including any Intellectual Property Rights that subsist in the Preview. \"Intellectual Property Rights\" means any and all rights under patent law, copyright law, trade secret law, trademark law, and any and all other proprietary rights. Google reserves all rights not expressly granted to you.\n\n3.3 You may not use the Preview for any purpose not expressly permitted by the License Agreement. Except to the extent required by applicable third party licenses, you may not: (a) copy (except for backup purposes), modify, adapt, redistribute, decompile, reverse engineer, disassemble, or create derivative works of the Preview or any part of the Preview; or (b) load any part of the Preview onto a mobile handset or any other hardware device except a personal computer, combine any part of the Preview with other software, or distribute any software or device incorporating a part of the Preview.\n\n3.4 You agree that you will not take any actions that may cause or result in the fragmentation of Android, including but not limited to distributing, participating in the creation of, or promoting in any way a software development kit derived from the Preview.\n\n3.5 Use, reproduction and distribution of components of the Preview licensed under an open source software license are governed solely by the terms of that open source software license and not the License Agreement. You agree to remain a licensee in good standing in regard to such open source software licenses under all the rights granted and to refrain from any actions that may terminate, suspend, or breach such rights.\n\n3.6 You agree that the form and nature of the Preview that Google provides may change without prior notice to you and that future versions of the Preview may be incompatible with applications developed on previous versions of the Preview. You agree that Google may stop (permanently or temporarily) providing the Preview (or any features within the Preview) to you or to users generally at Google's sole discretion, without prior notice to you.\n\n3.7 Nothing in the License Agreement gives you a right to use any of Google's trade names, trademarks, service marks, logos, domain names, or other distinctive brand features.\n\n3.8 You agree that you will not remove, obscure, or alter any proprietary rights notices (including copyright and trademark notices) that may be affixed to or contained within the Preview.\n\n4. Use of the Preview by You\n\n4.1 Google agrees that nothing in the License Agreement gives Google any right, title or interest from you (or your licensors) under the License Agreement in or to any software applications that you develop using the Preview, including any intellectual property rights that subsist in those applications.\n\n4.2 You agree to use the Preview and write applications only for purposes that are permitted by (a) the License Agreement, and (b) any applicable law, regulation or generally accepted practices or guidelines in the relevant jurisdictions (including any laws regarding the export of data or software to and from the United States or other relevant countries).\n\n4.3 You agree that if you use the Preview to develop applications, you will protect the privacy and legal rights of users. If users provide you with user names, passwords, or other login information or personal information, you must make the users aware that the information will be available to your application, and you must provide legally adequate privacy notice and protection for those users. If your application stores personal or sensitive information provided by users, it must do so securely. If users provide you with Google Account information, your application may only use that information to access the user's Google Account when, and for the limited purposes for which, each user has given you permission to do so.\n\n4.4 You agree that you will not engage in any activity with the Preview, including the development or distribution of an application, that interferes with, disrupts, damages, or accesses in an unauthorized manner the servers, networks, or other properties or services of Google or any third party.\n\n4.5 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any data, content, or resources that you create, transmit or display through Android and/or applications for Android, and for the consequences of your actions (including any loss or damage which Google may suffer) by doing so.\n\n4.6 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any breach of your obligations under the License Agreement, any applicable third party contract or Terms of Service, or any applicable law or regulation, and for the consequences (including any loss or damage which Google or any third party may suffer) of any such breach.\n\n4.7 The Preview is in development, and your testing and feedback are an important part of the development process. By using the Preview, you acknowledge that implementation of some features are still under development and that you should not rely on the Preview having the full functionality of a stable release. You agree not to publicly distribute or ship any application using this Preview as this Preview will no longer be supported after the official Android SDK is released.\n\n5. Your Developer Credentials\n\n5.1 You agree that you are responsible for maintaining the confidentiality of any developer credentials that may be issued to you by Google or which you may choose yourself and that you will be solely responsible for all applications that are developed under your developer credentials.\n\n6. Privacy and Information\n\n6.1 In order to continually innovate and improve the Preview, Google may collect certain usage statistics from the software including but not limited to a unique identifier, associated IP address, version number of the software, and information on which tools and/or services in the Preview are being used and how they are being used. Before any of this information is collected, the Preview will notify you and seek your consent. If you withhold consent, the information will not be collected.\n\n6.2 The data collected is examined in the aggregate to improve the Preview and is maintained in accordance with Google's Privacy Policy located at http://www.google.com/policies/privacy/.\n\n7. Third Party Applications\n\n7.1 If you use the Preview to run applications developed by a third party or that access data, content or resources provided by a third party, you agree that Google is not responsible for those applications, data, content, or resources. You understand that all data, content or resources which you may access through such third party applications are the sole responsibility of the person from which they originated and that Google is not liable for any loss or damage that you may experience as a result of the use or access of any of those third party applications, data, content, or resources.\n\n7.2 You should be aware the data, content, and resources presented to you through such a third party application may be protected by intellectual property rights which are owned by the providers (or by other persons or companies on their behalf). You may not modify, rent, lease, loan, sell, distribute or create derivative works based on these data, content, or resources (either in whole or in part) unless you have been specifically given permission to do so by the relevant owners.\n\n7.3 You acknowledge that your use of such third party applications, data, content, or resources may be subject to separate terms between you and the relevant third party.\n\n8. Using Google APIs\n\n8.1 Google APIs\n\n8.1.1 If you use any API to retrieve data from Google, you acknowledge that the data may be protected by intellectual property rights which are owned by Google or those parties that provide the data (or by other persons or companies on their behalf). Your use of any such API may be subject to additional Terms of Service. You may not modify, rent, lease, loan, sell, distribute or create derivative works based on this data (either in whole or in part) unless allowed by the relevant Terms of Service.\n\n8.1.2 If you use any API to retrieve a user's data from Google, you acknowledge and agree that you shall retrieve data only with the user's explicit consent and only when, and for the limited purposes for which, the user has given you permission to do so.\n\n9. Terminating the License Agreement\n\n9.1 the License Agreement will continue to apply until terminated by either you or Google as set out below.\n\n9.2 If you want to terminate the License Agreement, you may do so by ceasing your use of the Preview and any relevant developer credentials.\n\n9.3 Google may at any time, terminate the License Agreement, with or without cause, upon notice to you.\n\n9.4 The License Agreement will automatically terminate without notice or other action upon the earlier of: (A) when Google ceases to provide the Preview or certain parts of the Preview to users in the country in which you are resident or from which you use the service; and (B) Google issues a final release version of the Android SDK.\n\n9.5 When the License Agreement is terminated, the license granted to you in the License Agreement will terminate, you will immediately cease all use of the Preview, and the provisions of paragraphs 10, 11, 12 and 14 shall survive indefinitely.\n\n10. DISCLAIMERS\n\n10.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT YOUR USE OF THE PREVIEW IS AT YOUR SOLE RISK AND THAT THE PREVIEW IS PROVIDED \"AS IS\" AND \"AS AVAILABLE\" WITHOUT WARRANTY OF ANY KIND FROM GOOGLE.\n\n10.2 YOUR USE OF THE PREVIEW AND ANY MATERIAL DOWNLOADED OR OTHERWISE OBTAINED THROUGH THE USE OF THE PREVIEW IS AT YOUR OWN DISCRETION AND RISK AND YOU ARE SOLELY RESPONSIBLE FOR ANY DAMAGE TO YOUR COMPUTER SYSTEM OR OTHER DEVICE OR LOSS OF DATA THAT RESULTS FROM SUCH USE. WITHOUT LIMITING THE FOREGOING, YOU UNDERSTAND THAT THE PREVIEW IS NOT A STABLE RELEASE AND MAY CONTAIN ERRORS, DEFECTS AND SECURITY VULNERABILITIES THAT CAN RESULT IN SIGNIFICANT DAMAGE, INCLUDING THE COMPLETE, IRRECOVERABLE LOSS OF USE OF YOUR COMPUTER SYSTEM OR OTHER DEVICE.\n\n10.3 GOOGLE FURTHER EXPRESSLY DISCLAIMS ALL WARRANTIES AND CONDITIONS OF ANY KIND, WHETHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO THE IMPLIED WARRANTIES AND CONDITIONS OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.\n\n11. LIMITATION OF LIABILITY\n\n11.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT GOOGLE, ITS SUBSIDIARIES AND AFFILIATES, AND ITS LICENSORS SHALL NOT BE LIABLE TO YOU UNDER ANY THEORY OF LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, CONSEQUENTIAL OR EXEMPLARY DAMAGES THAT MAY BE INCURRED BY YOU, INCLUDING ANY LOSS OF DATA, WHETHER OR NOT GOOGLE OR ITS REPRESENTATIVES HAVE BEEN ADVISED OF OR SHOULD HAVE BEEN AWARE OF THE POSSIBILITY OF ANY SUCH LOSSES ARISING.\n\n12. Indemnification\n\n12.1 To the maximum extent permitted by law, you agree to defend, indemnify and hold harmless Google, its affiliates and their respective directors, officers, employees and agents from and against any and all claims, actions, suits or proceedings, as well as any and all losses, liabilities, damages, costs and expenses (including reasonable attorneys’ fees) arising out of or accruing from (a) your use of the Preview, (b) any application you develop on the Preview that infringes any Intellectual Property Rights of any person or defames any person or violates their rights of publicity or privacy, and (c) any non-compliance by you of the License Agreement.\n\n13. Changes to the License Agreement\n\n13.1 Google may make changes to the License Agreement as it distributes new versions of the Preview. When these changes are made, Google will make a new version of the License Agreement available on the website where the Preview is made available.\n\n14. General Legal Terms\n\n14.1 the License Agreement constitutes the whole legal agreement between you and Google and governs your use of the Preview (excluding any services which Google may provide to you under a separate written agreement), and completely replaces any prior agreements between you and Google in relation to the Preview.\n\n14.2 You agree that if Google does not exercise or enforce any legal right or remedy which is contained in the License Agreement (or which Google has the benefit of under any applicable law), this will not be taken to be a formal waiver of Google's rights and that those rights or remedies will still be available to Google.\n\n14.3 If any court of law, having the jurisdiction to decide on this matter, rules that any provision of the License Agreement is invalid, then that provision will be removed from the License Agreement without affecting the rest of the License Agreement. The remaining provisions of the License Agreement will continue to be valid and enforceable.\n\n14.4 You acknowledge and agree that each member of the group of companies of which Google is the parent shall be third party beneficiaries to the License Agreement and that such other companies shall be entitled to directly enforce, and rely upon, any provision of the License Agreement that confers a benefit on (or rights in favor of) them. Other than this, no other person or company shall be third party beneficiaries to the License Agreement.\n\n14.5 EXPORT RESTRICTIONS. THE PREVIEW IS SUBJECT TO UNITED STATES EXPORT LAWS AND REGULATIONS. YOU MUST COMPLY WITH ALL DOMESTIC AND INTERNATIONAL EXPORT LAWS AND REGULATIONS THAT APPLY TO THE PREVIEW. THESE LAWS INCLUDE RESTRICTIONS ON DESTINATIONS, END USERS AND END USE.\n\n14.6 The License Agreement may not be assigned or transferred by you without the prior written approval of Google, and any attempted assignment without such approval will be void. You shall not delegate your responsibilities or obligations under the License Agreement without the prior written approval of Google.\n\n14.7 The License Agreement, and your relationship with Google under the License Agreement, shall be governed by the laws of the State of California without regard to its conflict of laws provisions. You and Google agree to submit to the exclusive jurisdiction of the courts located within the county of Santa Clara, California to resolve any legal matter arising from the License Agreement. Notwithstanding this, you agree that Google shall still be allowed to apply for injunctive remedies (or an equivalent type of urgent legal relief) in any jurisdiction.\n\nJune 2014." + ], + "google-gdk-license": [ + "This is a Developer Preview of the GDK that is subject to change.\n\nTerms and Conditions\n\nThis is the Glass Development Kit License Agreement.\n\n1. Introduction\n\n1.1 The Glass Development Kit (referred to in this License Agreement as the \"GDK\" and specifically including the Android system files, packaged APIs, and GDK library files, if and when they are made available) is licensed to you subject to the terms of this License Agreement. This License Agreement forms a legally binding contract between you and Google in relation to your use of the GDK.\n\n1.2 \"Glass\" means Glass devices and the Glass software stack for use on Glass devices.\n\n\n1.3 \"Android\" means the Android software stack for devices, as made available under the Android Open Source Project, which is located at the following URL: http://source.android.com/, as updated from time to time.\n\n1.4 \"Google\" means Google Inc., a Delaware corporation with principal place of business at 1600 Amphitheatre Parkway, Mountain View, CA 94043, United States.\n\n2. Accepting this License Agreement\n\n2.1 In order to use the GDK, you must first agree to this License Agreement. You may not use the GDK if you do not accept this License Agreement.\n\n2.2 By clicking to accept, you hereby agree to the terms of this License Agreement.\n\n2.3 You may not use the GDK and may not accept the License Agreement if you are a person barred from receiving the GDK under the laws of the United States or other countries including the country in which you are resident or from which you use the GDK.\n\n2.4 If you are agreeing to be bound by this License Agreement on behalf of your employer or other entity, you represent and warrant that you have full legal authority to bind your employer or such entity to this License Agreement. If you do not have the requisite authority, you may not accept the License Agreement or use the GDK on behalf of your employer or other entity.\n\n3. GDK License from Google\n\n3.1 Subject to the terms of this License Agreement, Google grants you a limited, worldwide, royalty-free, non-assignable and non-exclusive license to use the GDK solely to develop applications to run on the Glass platform for Glass devices.\n\n3.2 You agree that Google or third parties own all legal right, title and interest in and to the GDK, including any Intellectual Property Rights that subsist in the GDK. \"Intellectual Property Rights\" means any and all rights under patent law, copyright law, trade secret law, trademark law, and any and all other proprietary rights. Google reserves all rights not expressly granted to you.\n\n3.3 You may not use the GDK for any purpose not expressly permitted by this License Agreement. Except to the extent required by applicable third party licenses, you may not: (a) copy (except for backup purposes), modify, adapt, redistribute, decompile, reverse engineer, disassemble, or create derivative works of the GDK or any part of the GDK; or (b) load any part of the GDK onto a mobile handset or wearable computing device or any other hardware device except a Glass device personal computer, combine any part of the GDK with other software, or distribute any software or device incorporating a part of the GDK.\n\n3.4 You agree that you will not take any actions that may cause or result in the fragmentation of Glass, including but not limited to distributing, participating in the creation of, or promoting in any way a software development kit derived from the GDK.\n\n3.5 Use, reproduction and distribution of components of the GDK licensed under an open source software license are governed solely by the terms of that open source software license and not this License Agreement.\n\n3.6 You agree that the form and nature of the GDK that Google provides may change without prior notice to you and that future versions of the GDK may be incompatible with applications developed on previous versions of the GDK. You agree that Google may stop (permanently or temporarily) providing the GDK (or any features within the GDK) to you or to users generally at Google's sole discretion, without prior notice to you.\n\n3.7 Nothing in this License Agreement gives you a right to use any of Google's trade names, trademarks, service marks, logos, domain names, or other distinctive brand features.\n\n3.8 You agree that you will not remove, obscure, or alter any proprietary rights notices (including copyright and trademark notices) that may be affixed to or contained within the GDK.\n\n\n3.9 Your use of any Android system files, packaged APIs, or other components of the GDK which are part of the Android Software Development Kit is subject to the terms of the Android Software Development Kit License Agreement located at http://developer.android.com/sdk/terms.html. These terms are hereby incorporated by reference into this License Agreement.\n\n4. Use of the GDK by You\n\n4.1 Google agrees that it obtains no right, title or interest from you (or your licensors) under this License Agreement in or to any software applications that you develop using the GDK, including any intellectual property rights that subsist in those applications.\n\n4.2 You agree to use the GDK and write applications only for purposes that are permitted by (a) this License Agreement, (b) the Glass Platform Developer Policies (located at https://developers.google.com/glass/policies, and hereby incorporated into this License Agreement by reference), and (c) any applicable law, regulation or generally accepted practices or guidelines in the relevant jurisdictions (including any laws regarding the export of data or software to and from the United States or other relevant countries).\n\n4.3 You agree that if you use the GDK to develop applications for general public users, you will protect the privacy and legal rights of those users. If the users provide you with user names, passwords, or other login information or personal information, you must make the users aware that the information will be available to your application, and you must provide legally adequate privacy notice and protection for those users. If your application stores personal or sensitive information provided by users, it must do so securely. If the user provides your application with Google Account information, your application may only use that information to access the user's Google Account when, and for the limited purposes for which, the user has given you permission to do so.\n\n4.4 You agree that you will not engage in any activity with the GDK, including the development or distribution of an application, that interferes with, disrupts, damages, or accesses in an unauthorized manner the servers, networks, or other properties or services of any third party including, but not limited to, Google.\n\n4.5 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any data, content, or resources that you create, transmit or display through Glass and/or applications for Glass, and for the consequences of your actions (including any loss or damage which Google may suffer) by doing so.\n\n4.6 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any breach of your obligations under this License Agreement, any applicable third party contract or Terms of Service, or any applicable law or regulation, and for the consequences (including any loss or damage which Google or any third party may suffer) of any such breach.\n\n\n4.7 The GDK is in development, and your testing and feedback are an important part of the development process. By using the GDK, you acknowledge that implementation of some features are still under development and that you should not rely on the GDK, Glass devices, Glass system software, Google Mirror API, or Glass services having the full functionality of a stable release.\n\n5. Your Developer Credentials\n\n5.1 You agree that you are responsible for maintaining the confidentiality of any developer credentials that may be issued to you by Google or which you may choose yourself and that you will be solely responsible for all applications that are developed under your developer credentials.\n\n6. Privacy and Information\n\n\n6.1 In order to continually innovate and improve the GDK, Google may collect certain usage statistics from the software including but not limited to a unique identifier, associated IP address, version number of the software, and information on which tools and/or services in the GDK are being used and how they are being used. Before any of this information is collected, the GDK will notify you and seek your consent. If you withhold consent, the information will not be collected.\n\n6.2 The data collected is examined in the aggregate to improve the GDK and is maintained in accordance with Google's Privacy Policy.\n\n7. Third Party Applications\n\n7.1 If you use the GDK to run applications developed by a third party or that access data, content or resources provided by a third party, you agree that Google is not responsible for those applications, data, content, or resources. You understand that all data, content or resources which you may access through such third party applications are the sole responsibility of the person from which they originated and that Google is not liable for any loss or damage that you may experience as a result of the use or access of any of those third party applications, data, content, or resources.\n\n7.2 You should be aware the data, content, and resources presented to you through such a third party application may be protected by intellectual property rights which are owned by the providers (or by other persons or companies on their behalf). You may not modify, rent, lease, loan, sell, distribute or create derivative works based on these data, content, or resources (either in whole or in part) unless you have been specifically given permission to do so by the relevant owners.\n\n7.3 You acknowledge that your use of such third party applications, data, content, or resources may be subject to separate terms between you and the relevant third party. In that case, this License Agreement does not affect your legal relationship with these third parties.\n\n8. Using Google APIs\n\n8.1 Google APIs\n\n8.1.1 If you use any API to retrieve data from Google, you acknowledge that the data may be protected by intellectual property rights which are owned by Google or those parties that provide the data (or by other persons or companies on their behalf). Your use of any such API may be subject to additional Terms of Service. You may not modify, rent, lease, loan, sell, distribute or create derivative works based on this data (either in whole or in part) unless allowed by the relevant Terms of Service.\n\n8.1.2 If you use any API to retrieve a user's data from Google, you acknowledge and agree that you shall retrieve data only with the user's explicit consent and only when, and for the limited purposes for which, the user has given you permission to do so.\n\n9. Terminating this License Agreement\n\n9.1 This License Agreement will continue to apply until terminated by either you or Google as set out below.\n\n9.2 If you want to terminate this License Agreement, you may do so by ceasing your use of the GDK and any relevant developer credentials.\n\n9.3 Google may at any time, terminate this License Agreement with you if: (A) you have breached any provision of this License Agreement; or (B) Google is required to do so by law; or (C) the partner with whom Google offered certain parts of GDK (such as APIs) to you has terminated its relationship with Google or ceased to offer certain parts of the GDK to you; or (D) Google decides to no longer provide the GDK or certain parts of the GDK to users in the country in which you are resident or from which you use the service, or the provision of the GDK or certain GDK services to you by Google is, in Google's sole discretion, no longer commercially viable.\n\n9.4 When this License Agreement comes to an end, all of the legal rights, obligations and liabilities that you and Google have benefited from, been subject to (or which have accrued over time whilst this License Agreement has been in force) or which are expressed to continue indefinitely, shall be unaffected by this cessation, and the provisions of paragraph 14.7 shall continue to apply to such rights, obligations and liabilities indefinitely.\n\n10. DISCLAIMER OF WARRANTIES\n\n10.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT YOUR USE OF THE GDK IS AT YOUR SOLE RISK AND THAT THE GDK IS PROVIDED \"AS IS\" AND \"AS AVAILABLE\" WITHOUT WARRANTY OF ANY KIND FROM GOOGLE.\n\n10.2 YOUR USE OF THE GDK AND ANY MATERIAL DOWNLOADED OR OTHERWISE OBTAINED THROUGH THE USE OF THE GDK IS AT YOUR OWN DISCRETION AND RISK AND YOU ARE SOLELY RESPONSIBLE FOR ANY DAMAGE TO YOUR COMPUTER SYSTEM OR OTHER DEVICE OR LOSS OF DATA THAT RESULTS FROM SUCH USE.\n\n10.3 GOOGLE FURTHER EXPRESSLY DISCLAIMS ALL WARRANTIES AND CONDITIONS OF ANY KIND, WHETHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO THE IMPLIED WARRANTIES AND CONDITIONS OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.\n\n11. LIMITATION OF LIABILITY\n\n11.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT GOOGLE, ITS SUBSIDIARIES AND AFFILIATES, AND ITS LICENSORS SHALL NOT BE LIABLE TO YOU UNDER ANY THEORY OF LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, CONSEQUENTIAL OR EXEMPLARY DAMAGES THAT MAY BE INCURRED BY YOU, INCLUDING ANY LOSS OF DATA, WHETHER OR NOT GOOGLE OR ITS REPRESENTATIVES HAVE BEEN ADVISED OF OR SHOULD HAVE BEEN AWARE OF THE POSSIBILITY OF ANY SUCH LOSSES ARISING.\n\n12. Indemnification\n\n12.1 To the maximum extent permitted by law, you agree to defend, indemnify and hold harmless Google, its affiliates and their respective directors, officers, employees and agents from and against any and all claims, actions, suits or proceedings, as well as any and all losses, liabilities, damages, costs and expenses (including reasonable attorneys fees) arising out of or accruing from (a) your use of the GDK, (b) any application you develop on the GDK that infringes any copyright, trademark, trade secret, trade dress, patent or other intellectual property right of any person or defames any person or violates their rights of publicity or privacy, and (c) any non-compliance by you with this License Agreement.\n\n13. Changes to the License Agreement\n\n13.1 Google may make changes to the License Agreement as it distributes new versions of the GDK. When these changes are made, Google will make a new version of the License Agreement available on the website where the GDK is made available.\n\n14. General Legal Terms\n\n14.1 This License Agreement constitutes the whole legal agreement between you and Google and governs your use of the GDK (excluding any services which Google may provide to you under a separate written agreement), and completely replaces any prior agreements between you and Google in relation to the GDK.\n\n14.2 You agree that if Google does not exercise or enforce any legal right or remedy which is contained in this License Agreement (or which Google has the benefit of under any applicable law), this will not be taken to be a formal waiver of Google's rights and that those rights or remedies will still be available to Google.\n\n14.3 If any court of law, having the jurisdiction to decide on this matter, rules that any provision of this License Agreement is invalid, then that provision will be removed from this License Agreement without affecting the rest of this License Agreement. The remaining provisions of this License Agreement will continue to be valid and enforceable.\n\n14.4 You acknowledge and agree that each member of the group of companies of which Google is the parent shall be third party beneficiaries to this License Agreement and that such other companies shall be entitled to directly enforce, and rely upon, any provision of this License Agreement that confers a benefit on (or rights in favor of) them. Other than this, no other person or company shall be third party beneficiaries to this License Agreement.\n\n14.5 EXPORT RESTRICTIONS. THE GDK IS SUBJECT TO UNITED STATES EXPORT LAWS AND REGULATIONS. YOU MUST COMPLY WITH ALL DOMESTIC AND INTERNATIONAL EXPORT LAWS AND REGULATIONS THAT APPLY TO THE GDK. THESE LAWS INCLUDE RESTRICTIONS ON DESTINATIONS, END USERS AND END USE.\n\n14.6 The rights granted in this License Agreement may not be assigned or transferred by either you or Google without the prior written approval of the other party. Neither you nor Google shall be permitted to delegate their responsibilities or obligations under this License Agreement without the prior written approval of the other party.\n\n14.7 This License Agreement, and your relationship with Google under this License Agreement, shall be governed by the laws of the State of California without regard to its conflict of laws provisions. You and Google agree to submit to the exclusive jurisdiction of the courts located within the county of Santa Clara, California to resolve any legal matter arising from this License Agreement. Notwithstanding this, you agree that Google shall still be allowed to apply for injunctive remedies (or an equivalent type of urgent legal relief) in any jurisdiction.\n\nNovember 19, 2013" + ], + "intel-android-extra-license": [ + "Intel (R) Hardware Accelerated Execution Manager End-User License Agreement\n\nCopyright (c) 2012 Intel Corporation. All rights reserved.\n\nRedistribution. Redistribution and use in binary form, without modification, are permitted provided that the following conditions are met:\n\n1.Redistributions must reproduce the above copyright notice and the following disclaimer in the documentation and/or other materials provided with the distribution.\n\n2.Neither the name of Intel Corporation nor the names of its suppliers may be used to endorse or promote products derived from this software without specific prior written permission.\n\n3.No reverse engineering, de-compilation, or disassembly of this software is permitted. Limited patent license. Intel Corporation grants a world-wide, royalty-free, non-exclusive license under patents it now or hereafter owns or controls to make, have made, use, import, offer to sell and sell (\"Utilize\") this software, but solely to the extent that any such patent is necessary to Utilize the software alone. The patent license shall not apply to any combinations which include this software. No hardware per se is licensed hereunder.\n\nDISCLAIMER. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." + ], + "intel-android-sysimage-license": [ + "Intel Corporation Internal Evaluation License Agreement for x86 Android* System Images for Android Software Development Kit (SDK) This Internal Evaluation License Agreement (this \"Agreement\") is entered into by and between Intel and you (as an individual developer or a legal entity -- identified below as Recipient). Intel shall provide the Evaluation Software to Recipient as described in accordance with the Internal Evaluation License Terms and Conditions.\n\nDefinitions. These terms shall have the following meanings:\n\n\"Intel\" or \"INTEL\" Intel Corporation With an Address of: 2200 Mission College Blvd. Santa Clara, CA 95052 Office of the General Counsel Mail Stop: RNB-4-51 Attn: Software and Services Group Legal\n\n\"Evaluation Software\" The x86 Android* emulator system images for Android Software Development Kit (SDK), as provided by Intel.\n\nINTERNAL EVALUATION LICENSE TERMS AND CONDITIONS\n\n1. DEFINITIONS.\n\n1.1 Additional Defined Terms. \"Agreement\", \"Evaluation Software\", \"Intel\", \"Non-disclosure Agreement\", \"Recipient\", and \"Effective Date\" shall have the meanings ascribed to them on the signature page(s) of this Agreement.\n\n1.2 Evaluation Materials means, collectively, the Evaluation Software (in source and/or object code form) and documentation (including, without limitation, any design documents, specifications and other related materials) related to the Evaluation Software.\n\n1.3 \"Open Source Software\" means any software that requires as a condition of use, modification and/or distribution of such software that such software or other software incorporated into, derived from or distributed with such software (a) be disclosed or distributed in source code form; or (b) be licensed by the user to third parties for the purpose of making and/or distributing derivative works; or (c) be redistributable at no charge. Open Source Software includes, without limitation, software licensed or distributed under any of the following licenses or distribution models, or licenses or distribution models substantially similar to any of the following: (a) GNU’s General Public License (GPL) or Lesser/Library GPL (LGPL), (b) the Artistic License (e.g., PERL), (c) the Mozilla Public License, (d) the Netscape Public License, (e) the Sun Community Source License (SCSL), (f) the Sun Industry Source License (SISL), (g) the Apache Software license and (h) the Common Public License (CPL).\n\n1.4 \"Pre-Release Materials\" means \"alpha\" or \"beta\" designated pre-release features, which may not be fully functional, which Intel may substantially modify in producing any production version of the Evaluation Materials and/or is still under development by Intel and/or Intel’s suppliers.\n\n2. PURPOSE. Intel desires to provide the Evaluation Materials to Recipient solely for Recipient's internal evaluation of the Evaluation Software and other Intel products, to evaluate the desirability of cooperating with Intel in developing products based on the Evaluation Software and/or to advise Intel as to possible modifications to the Evaluation Software. Recipient may not disclose, distribute or make commercial use of the Evaluation Materials or any modifications to the Evaluation Materials. THE EVALUATION MATERIALS ARE PROVIDED FOR EVALUATION PURPOSES ONLY AND MAY NOT BE DISTRIBUTED BY RECIPIENT OR INCORPORATED INTO RECIPIENT’S PRODUCTS OR SOFTWARE. PLEASE CONTACT AN INTEL SALES REPRESENTATIVE TO LEARN ABOUT THE AVAILABILITY AND COST OF A COMMERICAL VERSION OF THE EVALUATION SOFTWARE.\n\n3. TITLE. Title to the Evaluation Materials remains with Intel or its suppliers. Recipient shall not mortgage, pledge or encumber the Evaluation Materials in any way. Recipient shall return all Evaluation Materials, keeping no copies, upon termination or expiration of this Agreement.\n\n4. LICENSE. Intel grants Recipient a royalty-free, personal, nontransferable, nonexclusive license under its copyrights to use the Evaluation Software only for the purposes described in paragraph 2 above. Unless otherwise communicated in writing by Intel to Recipient, to the extent the Evaluation Software is provided in more than one delivery or release (each, a \"Release\") the license grant in this Section 4 and the Evaluation Period shall apply to each Release. Recipient may not make modifications to the Evaluation Software. Recipient shall not disassemble, reverse-engineer, or decompile any software not provided to Recipient in source code form. EXCEPT AS PROVIDED HEREIN, NO OTHER LICENSE, EXPRESS OR IMPLIED, BY ESTOPPEL OR OTHERWISE, TO ANY OTHER INTELLECTUAL PROPERTY RIGHTS IS GRANTED TO THE RECIPIENT.\n\n5. NO OBLIGATION. Recipient shall have no duty to purchase or license any product from Intel. Intel and its suppliers shall have no obligation to provide support for, or develop a non-evaluation version of, the Evaluation Software or to license any version of it.\n\n6. MODIFICATIONS. This Agreement does NOT obligate Recipient to provide Intel with comments or suggestions regarding Evaluation Materials. However, should Recipient provide Intel with comments or suggestions for the modification, correction, improvement or enhancement of (a) the Evaluation Materials or (b) Intel products or processes which may embody the Evaluation Materials, Recipient grants to Intel a non-exclusive, irrevocable, worldwide, royalty-free license, with the right to sublicense Intel’s licensees and customers, under Recipient intellectual property rights, the rights to use and disclose such comments and suggestions in any manner Intel chooses and to display, perform, copy, make, have made, use, sell, offer to sell, import, and otherwise dispose of Intel’s and its sublicensee’s products embodying such comments and suggestions in any manner and via any media Intel chooses, without reference to the source.\n\n7. WARRANTY DISCLAIMER. INTEL AND ITS SUPPLIERS MAKE NO WARRANTIES WITH RESPECT TO EVALUATION MATERIALS, EITHER EXPRESS OR IMPLIED, INCLUDING ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, OR ANY IMPLIED WARRANTY OF NONINFRINGEMENT. THE EVALUATION MATERIALS ARE PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND.\n\n8. LIMITATION OF LIABILITY. INTEL AND ITS SUPPLIERS SHALL NOT BE LIABLE FOR ANY PROPERTY DAMAGE, PERSONAL INJURY, LOSS OF PROFITS, INTERRUPTION OF BUSINESS OR ANY SPECIAL, CONSEQUENTIAL OR INCIDENTAL DAMAGES, HOWEVER CAUSED, WHETHER FOR BREACH OF WARRANTY, CONTRACT, STRICT LIABILITY OR OTHERWISE. INTEL AND ITS SUPPLIERS DISCLAIM ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY INTELLECTUAL PROPERTY RIGHTS RELATING TO THE EVALUATION MATERIALS.\n\n9. EXPIRATION. Intel may terminate this Agreement immediately after a breach by Recipient.\n\n10. GENERAL.\n\n10.1 Controlling Law. Any claims arising under or relating to this Agreement shall be governed by the internal substantive laws of the State of Delaware or federal courts located in Delaware, without regard to principles of conflict of laws. Each party hereby agrees to jurisdiction and venue in the courts of the State of Delaware for all disputes and litigation arising under or relating to this Agreement. The parties agree that the United Nations Convention on Contracts for the International Sale of Goods is specifically excluded from application to this Agreement. The parties consent to the personal jurisdiction of the above courts.\n\n10.2 Remedies. Recipient acknowledges that any disclosure, commercialization, or public use of the Evaluation Materials would cause irreparable injury to Intel and consents to the grant of an injunction by any court of competent jurisdiction in the event of a threatened breach.\n\n10.3 Assignment. Recipient may not delegate, assign or transfer this Agreement, the license granted or any of Recipient’s rights or duties hereunder, expressly, by implication, by operation of law, by way of merger (regardless of whether Recipient is the surviving entity) or acquisition, or otherwise and any attempt to do so, without Intel’s express prior written consent, shall be null and void. Intel may assign this Agreement, and its rights and obligations hereunder, in its sole discretion.\n\n10.4 Entire Agreement. This Agreement constitutes the entire agreement between Recipient and Intel and supersedes in their entirety any and all oral or written agreements previously existing between Recipient and Intel with respect to the subject matter hereof. This Agreement supersedes any and all \"click-to-accept\" or shrink-wrapped licenses, in hard-copy or electronic form, embedded in or included with the Evaluation Materials. This Agreement may only be amended or supplemented by a writing that refers explicitly to this Agreement and that is signed by duly authorized representatives of Recipient and Intel. Without limiting the foregoing, terms and conditions on any purchase orders or similar materials submitted by Recipient to Intel, and any terms contained in Intel’s standard acknowledgment form that are in conflict with these terms, shall be of no force or effect.\n\n10.5 Severability. In the event that any provision of this Agreement shall be unenforceable or invalid under any applicable law or be so held by applicable court decision, such unenforceability or invalidity shall not render this Agreement unenforceable or invalid as a whole, and, in such event, such provision shall be changed and interpreted so as to best accomplish the objectives of such unenforceable or invalid provision within the limits of applicable law or applicable court decisions.\n\n10.6 Export Regulations / Export Control. Recipient shall not export, either directly or indirectly, any product, service or technical data or system incorporating the Evaluation Materials without first obtaining any required license or other approval from the U.S. Department of Commerce or any other agency or department of the United States Government. In the event any product is exported from the United States or re-exported from a foreign destination by Recipient, Recipient shall ensure that the distribution and export/re-export or import of the product is in compliance with all laws, regulations, orders, or other restrictions of the U.S. Export Administration Regulations and the appropriate foreign government. Recipient agrees that neither it nor any of its subsidiaries will export/re-export any technical data, process, product, or service, directly or indirectly, to any country for which the United States government or any agency thereof or the foreign government from where it is shipping requires an export license, or other governmental approval, without first obtaining such license or approval. Recipient also agrees to implement measures to ensure that foreign national employees are authorized to receive any information controlled by U.S. export control laws. An export is \"deemed\" to take place when information is released to a foreign national wherever located.\n\n10.7 Special Terms for Pre-Release Materials. If so indicated in the description of the Evaluation Software, the Evaluation Software may contain Pre-Release Materials. Recipient hereby understands, acknowledges and agrees that: (i) Pre-Release Materials may not be fully tested and may contain bugs or errors; (ii) Pre-Release materials are not suitable for commercial release in their current state; (iii) regulatory approvals for Pre-Release Materials (such as UL or FCC) have not been obtained, and Pre-Release Materials may therefore not be certified for use in certain countries or environments and (iv) Intel can provide no assurance that it will ever produce or make generally available a production version of the Pre-Release Materials . Intel is not under any obligation to develop and/or release or offer for sale or license a final product based upon the Pre-Release Materials and may unilaterally elect to abandon the Pre-Release Materials or any such development platform at any time and without any obligation or liability whatsoever to Recipient or any other person.\n\n10.8 Open Source Software. In the event Open Source software is included with Evaluation Software, such Open Source software is licensed pursuant to the applicable Open Source software license agreement identified in the Open Source software comments in the applicable source code file(s) and/or file header provided with Evaluation Software. Additional detail may be provided (where applicable) in the accompanying on-line documentation. With respect to the Open Source software, nothing in this Agreement limits any rights under, or grants rights that supersede, the terms of any applicable Open Source software license agreement. ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED POSSIBLY WITH FAULTS" + ], + "mips-android-sysimage-license": [ + "MIPS Technologies, Inc. (“MIPS”) Internal Evaluation License Agreement for MIPS Android™ System Images for Android Software Development Kit (SDK): This Internal Evaluation License Agreement (this \"Agreement\") is entered into by and between MIPS and you (as an individual developer or a legal entity -- identified below as “Recipient”). MIPS shall make the Evaluation Software available to Recipient as described in accordance with the terms and conditions set forth below.\n\nBy clicking on the “Accept” button, downloading, installing, or otherwise using the Evaluation Materials (defined below), you agree to be bound by the terms of this Agreement effective as of the date you click “Accept” (the “Effective Date”), and if doing so on behalf of an entity, you represent that you are authorized to bind the entity to the terms and conditions of this Agreement. If you do not agree to be bound by the terms and conditions of this Agreement, do not download, install, or use the Evaluation Materials.\n\n1. DEFINITIONS. These terms shall have the following meanings:\n\n1.1 “MIPS” shall mean MIPS Technologies, Inc., a Delaware corporation having a principal place of business at: 955 East Arques Ave., Sunnyvale, CA 94085\n\n1.2 “Evaluation Software” shall mean MIPS Android™ emulator system images for Android Software Development Kit (SDK), as made available to Recipient.\n\n1.3 “Evaluation Materials\" means, collectively, the Evaluation Software (in source and/or object code form) and documentation (including, without limitation, any design documents, specifications, reference manuals, and other related materials) related to the Evaluation Software as made available to Recipient.\n\n1.4 “Open Source Software” means any software that requires (as a condition of use, modification and/or distribution of such software) that such software or other software incorporated into, derived from or distributed with such software (a) be disclosed or distributed in source code form; or (b) be licensed by the user to third parties for the purpose of making and/or distributing derivative works; or (c) be redistributable at no charge. Open Source Software includes, without limitation, software licensed or distributed under any of the following licenses or distribution models, or licenses or distribution models substantially similar to any of the following: (a) GNU’s General Public License (GPL) or Lesser/Library GPL (LGPL), (b) the Artistic License (e.g., PERL), (c) the Mozilla Public License, (d) the Netscape Public License, (e) the Sun Community Source License (SCSL), (f) the Sun Industry Source License (SISL), (g) the Apache Software license and (h) the Common Public License (CPL).\n\n1.5 “Pre-Release Materials” means “alpha” or “beta” designated pre-release features, which may not be fully functional, which MIPS may substantially modify in producing any production version of the Evaluation Materials, and/or which is still under development by MIPS and/or MIPS’ suppliers.\n\n2. PURPOSE. MIPS desires to make the Evaluation Materials available to Recipient solely for Recipient's internal evaluation of the Evaluation Software to evaluate the desirability of cooperating with MIPS in developing products that are compatible with the Evaluation Software and/or to advise MIPS as to possible modifications to the Evaluation Software. Recipient may not disclose, distribute, modify (except to facilitate the above-mentioned internal evaluation), or make commercial use of the Evaluation Materials or any modifications of the Evaluation Materials.\n\nTHE EVALUATION MATERIALS ARE PROVIDED FOR EVALUATION PURPOSES ONLY AND MAY NOT BE MODIFIED (EXCEPT TO FACILITATE THE INTERNAL EVALUATION) OR DISTRIBUTED BY RECIPIENT OR INCORPORATED INTO RECIPIENT’S PRODUCTS OR SOFTWARE. PLEASE CONTACT A MIPS SALES REPRESENTATIVE TO LEARN ABOUT THE AVAILABILITY AND COST OF A COMMERCIAL VERSION OF THE EVALUATION SOFTWARE.\n\n3. TITLE. Title to the Evaluation Materials remains with MIPS or its suppliers. Recipient shall not mortgage, pledge or encumber the Evaluation Materials in any way. Recipient shall return all Evaluation Materials, keeping no copies, upon termination or expiration of this Agreement.\n\n4. LICENSE. MIPS grants Recipient a royalty-free, personal, nontransferable, nonexclusive license under its copyrights to use the Evaluation Software only for the purposes described in paragraph 2 above and only for a period beginning on the Effective Date and extending to the first anniversary of the Effective Date (the “Evaluation Period”). Unless otherwise communicated in writing by MIPS to Recipient, to the extent the Evaluation Software is provided in more than one delivery or release (each, a “Release”) the license grant in this Section 4 and the Evaluation Period shall apply to each Release, in which case the Evaluation Period shall begin on the date that the Release is made generally available and continue to the first anniversary of such date. Recipient may not make modifications to the Evaluation Software. Recipient shall not disassemble, reverse-engineer, or decompile any software that is not provided to Recipient in source code form.\n\n\nEXCEPT AS PROVIDED HEREIN, NO OTHER LICENSE, EXPRESS OR IMPLIED, BY ESTOPPEL OR OTHERWISE, TO ANY OTHER MIPS INTELLECTUAL PROPERTY RIGHTS IS GRANTED TO THE RECIPIENT. OTHER THAN AS EXPLICITLY SET FORTH IN PARAGRAPH 2 ABOVE, NO RIGHT TO COPY, TO REPRODUCE, TO MODIFY, OR TO CREATE DERIVATIVE WORKS OF, THE EVALUATION MATERIALS IS GRANTED HEREIN.\n\n5. NO OBLIGATION. Recipient shall have no duty to purchase or license any product from MIPS. MIPS and its suppliers shall have no obligation to provide support for, or develop a non-evaluation version of, the Evaluation Software or to license any version of it.\n\n6. MODIFICATIONS. This Agreement does not obligate Recipient to provide MIPS with comments or suggestions regarding Evaluation Materials. However, should Recipient provide MIPS with comments or suggestions for the modification, correction, improvement or enhancement of (a) the Evaluation Materials or (b) MIPS products or processes which may embody the Evaluation Materials, then Recipient agrees to grant and hereby grants to MIPS a non-exclusive, irrevocable, worldwide, fully paid-up, royalty-free license, with the right to sublicense MIPS’ licensees and customers, under Recipient’s Intellectual property rights, to use and disclose such comments and suggestions in any manner MIPS chooses and to display, perform, copy, make, have made, use, sell, offer to sell, import, and otherwise dispose of MIPS’ and its sublicensee’s products embodying such comments and suggestions in any manner and via any media MIPS chooses, without reference to the source.\n\n7. WARRANTY DISCLAIMER. MIPS AND ITS SUPPLIERS MAKE NO WARRANTIES WITH RESPECT TO EVALUATION MATERIALS, EITHER EXPRESS OR IMPLIED, INCLUDING ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, OR ANY IMPLIED WARRANTY OF NONINFRINGEMENT WITH RESPECT TO THIRD PARTY INTELLECTUAL PROPERTY. RECIPIENT ACKNOWLEDGES AND AGREES THAT THE EVALUATION MATERIALS ARE PROVIDED “AS IS,” WITHOUT WARRANTY OF ANY KIND.\n\n8. LIMITATION OF LIABILITY. MIPS AND ITS SUPPLIERS SHALL NOT BE LIABLE FOR ANY PROPERTY DAMAGE, PERSONAL INJURY, LOSS OF PROFITS, INTERRUPTION OF BUSINESS OR FOR ANY DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL OR INCIDENTAL DAMAGES, HOWEVER CAUSED OR ALLEGED, WHETHER FOR BREACH OF WARRANTY, CONTRACT, STRICT LIABILITY OR OTHERWISE, INCLUDING WITHOUT LIMITATION, UNDER TORT OR OTHER LEGAL THEORY. MIPS AND ITS SUPPLIERS DISCLAIM ANY AND ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY INTELLECTUAL PROPERTY RIGHTS OF ANY KIND RELATING TO THE EVALUATION MATERIALS.\n\n9. EXPIRATION. MIPS may terminate this Agreement immediately after a breach by Recipient or otherwise at MIPS’ reasonable discretion and upon five (5) business days’ notice to Recipient.\n\n10. GENERAL.\n\n10.1 Controlling Law. This Agreement shall be governed by California law excluding its choice of law rules. With the exception of MIPS’ rights to enforce its intellectual property rights and any confidentiality obligations under this Agreement or any licenses distributed with the Evaluation Materials, all disputes and any claims arising under or relating to this Agreement shall be subject to the exclusive jurisdiction and venue of the state and federal courts located in Santa Clara County, California. Each party hereby agrees to jurisdiction and venue in the courts set forth in the preceding sentence. The parties agree that the United Nations Convention on Contracts for the International Sale of Goods is specifically excluded from application to this Agreement. The parties consent to the personal jurisdiction of the above courts.\n\n10.2 Remedies. Recipient acknowledges and agrees that any breach of confidentiality obligations under this Agreement or any licenses distributed with the Evaluation Materials, as well as any disclosure, commercialization, or public use of the Evaluation Materials, would cause irreparable injury to MIPS, and therefore Recipient agrees to consent to, and hereby consents to, the grant of an injunction by any court of competent jurisdiction in the event of an actual or threatened breach.\n\n10.3 Assignment. Recipient may not delegate, assign or transfer this Agreement, the license granted or any of Recipient’s rights, obligations, or duties hereunder, expressly, by implication, by operation of law, by way of merger (regardless of whether Recipient is the surviving entity) or acquisition, or otherwise and any attempt to do so, without MIPS’ express prior written consent, shall be ineffective, null and void. MIPS may freely assign this Agreement, and its rights and obligations hereunder, in its sole discretion.\n\n10.4 Entire Agreement. This Agreement constitutes the entire agreement between Recipient and MIPS and supersedes in their entirety any and all oral or written agreements previously existing between Recipient and MIPS with respect to the subject matter hereof. This Agreement may only be amended or supplemented by a writing that refers explicitly to this Agreement and that is signed or otherwise accepted by duly authorized representatives of Recipient and MIPS.\n\n10.5 Severability. In the event that any provision of this Agreement is finally adjudicated to be unenforceable or invalid under any applicable law, such unenforceability or invalidity shall not render this Agreement unenforceable or invalid as a whole, and, in such event, such unenforceable or invalid provision shall be interpreted so as to best accomplish the objectives of such provision within the limits of applicable law or applicable court decisions.\n\n10.6 Export Regulations / Export Control. Recipient shall not export, either directly or indirectly, any product, service or technical data or system incorporating the Evaluation Materials without first obtaining any required license or other necessary approval from the U.S. Department of Commerce or any other governing agency or department of the United States Government. In the event any product is exported from the United States or re-exported from a foreign destination by Recipient, Recipient shall ensure that the distribution and export/re-export or import of the product is in compliance with all applicable laws, regulations, orders, or other restrictions of the U.S. Export Administration Regulations and the appropriate foreign government. Recipient agrees that neither it nor any of its subsidiaries will export/re-export any technical data, process, product, or service, directly or indirectly, to any country for which the United States government or any agency thereof or the foreign government from where it is shipping requires an export license, or other governmental approval, without first obtaining such license or approval. Recipient also agrees to implement measures to ensure that foreign national employees are authorized to receive any information controlled by U.S. export control laws. An export is \"deemed\" to take place when information is released to a foreign national wherever located.\n\n10.7 Special Terms for Pre-Release Materials. If so indicated in the description of the Evaluation Software, the Evaluation Software may contain Pre-Release Materials. Recipient hereby understands, acknowledges and agrees that: (i) Pre-Release Materials may not be fully tested and may contain bugs or errors; (ii) Pre-Release materials are not suitable for commercial release in their current state; (iii) regulatory approvals for Pre-Release Materials (such as UL or FCC) have not been obtained, and Pre-Release Materials may therefore not be certified for use in certain countries or environments or may not be suitable for certain applications and (iv) MIPS can provide no assurance that it will ever produce or make generally available a production version of the Pre-Release Materials . MIPS is not under any obligation to develop and/or release or offer for sale or license a final product based upon the Pre-Release Materials and may unilaterally elect to abandon the Pre-Release Materials or any such development platform at any time and without any obligation or liability whatsoever to Recipient or any other person.\n\nANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS” AND “AS AVAILABLE”, POSSIBLY WITH FAULTS, AND WITHOUT REPRESENTATION OR WARRANTY OF ANY KIND.\n\n10.8 Open Source Software. In the event Open Source software is included with Evaluation Software, such Open Source software is licensed pursuant to the applicable Open Source software license agreement identified in the Open Source software comments in the applicable source code file(s) and/or file header as indicated in the Evaluation Software. Additional detail may be available (where applicable) in the accompanying on-line documentation. With respect to the Open Source software, nothing in this Agreement limits any rights under, or grants rights that supersede, the terms of any applicable Open Source software license agreement.\n" + ] + }, + "packages": { + "build-tools": { + "17.0.0": { + "archives": [ + { + "os": "linux", + "sha1": "2c2872bc3806aabf16a12e3959c2183ddc866e6d", + "size": 11696007, + "url": "https://dl.google.com/android/repository/build-tools_r17-linux.zip" + }, + { + "os": "macosx", + "sha1": "602ee709be9dbb8f179b1e4075148a57f9419930", + "size": 12208114, + "url": "https://dl.google.com/android/repository/build-tools_r17-macosx.zip" + }, + { + "os": "windows", + "sha1": "899897d327b0bad492d3a40d3db4d96119c15bc0", + "size": 11004914, + "url": "https://dl.google.com/android/repository/build-tools_r17-windows.zip" + } + ], + "displayName": "Android SDK Build-Tools 17", + "license": "android-sdk-license", + "name": "build-tools", + "path": "build-tools/17.0.0", + "revision": "17.0.0" + }, + "18.0.1": { + "archives": [ + { + "os": "linux", + "sha1": "f11618492b0d2270c332325d45d752d3656a9640", + "size": 16627330, + "url": "https://dl.google.com/android/repository/build-tools_r18.0.1-linux.zip" + }, + { + "os": "macosx", + "sha1": "d84f5692fb44d60fc53e5b2507cebf9f24626902", + "size": 16633121, + "url": "https://dl.google.com/android/repository/build-tools_r18.0.1-macosx.zip" + }, + { + "os": "windows", + "sha1": "a6c2afd0b6289d589351956d2f5212b37014ca7d", + "size": 15413527, + "url": "https://dl.google.com/android/repository/build-tools_r18.0.1-windows.zip" + } + ], + "displayName": "Android SDK Build-Tools 18.0.1", + "license": "android-sdk-license", + "name": "build-tools", + "path": "build-tools/18.0.1", + "revision": "18.0.1" + }, + "18.1.0": { + "archives": [ + { + "os": "linux", + "sha1": "f314a0599e51397f0886fe888b50dd98f2f050d8", + "size": 20229298, + "url": "https://dl.google.com/android/repository/build-tools_r18.1-linux.zip" + }, + { + "os": "macosx", + "sha1": "16ddb299b8b43063e5bb3387ec17147c5053dfd8", + "size": 20451524, + "url": "https://dl.google.com/android/repository/build-tools_r18.1-macosx.zip" + }, + { + "os": "windows", + "sha1": "3a9810fc8559ab03c09378f07531e8cae2f1db30", + "size": 19659547, + "url": "https://dl.google.com/android/repository/build-tools_r18.1-windows.zip" + } + ], + "displayName": "Android SDK Build-Tools 18.1", + "license": "android-sdk-license", + "name": "build-tools", + "path": "build-tools/18.1.0", + "revision": "18.1.0" + }, + "18.1.1": { + "archives": [ + { + "os": "linux", + "sha1": "68c9acbfc0cec2d51b19efaed39831a17055d998", + "size": 20229760, + "url": "https://dl.google.com/android/repository/build-tools_r18.1.1-linux.zip" + }, + { + "os": "macosx", + "sha1": "a9d9d37f6ddf859e57abc78802a77aaa166e48d4", + "size": 20452157, + "url": "https://dl.google.com/android/repository/build-tools_r18.1.1-macosx.zip" + }, + { + "os": "windows", + "sha1": "c4605066e2f851387ea70bc1442b1968bd7b4a15", + "size": 19660000, + "url": "https://dl.google.com/android/repository/build-tools_r18.1.1-windows.zip" + } + ], + "displayName": "Android SDK Build-Tools 18.1.1", + "license": "android-sdk-license", + "name": "build-tools", + "path": "build-tools/18.1.1", + "revision": "18.1.1" + }, + "19.0.0": { + "archives": [ + { + "os": "linux", + "sha1": "55c1a6cf632e7d346f0002b275ec41fd3137fd83", + "size": 21339943, + "url": "https://dl.google.com/android/repository/build-tools_r19-linux.zip" + }, + { + "os": "macosx", + "sha1": "86ec1c12db1bc446b7bcaefc5cc14eb361044e90", + "size": 21441270, + "url": "https://dl.google.com/android/repository/build-tools_r19-macosx.zip" + }, + { + "os": "windows", + "sha1": "6edf505c20f5ece9c48fa0aff9a90488f9654d52", + "size": 20611447, + "url": "https://dl.google.com/android/repository/build-tools_r19-windows.zip" + } + ], + "displayName": "Android SDK Build-Tools 19", + "license": "android-sdk-license", + "name": "build-tools", + "path": "build-tools/19.0.0", + "revision": "19.0.0" + }, + "19.0.1": { + "archives": [ + { + "os": "linux", + "sha1": "18d2312dc4368858914213087f4e61445aca4517", + "size": 21229048, + "url": "https://dl.google.com/android/repository/build-tools_r19.0.1-linux.zip" + }, + { + "os": "macosx", + "sha1": "efaf50fb19a3edb8d03efbff76f89a249ad2920b", + "size": 21450597, + "url": "https://dl.google.com/android/repository/build-tools_r19.0.1-macosx.zip" + }, + { + "os": "windows", + "sha1": "5ef422bac5b28f4ced108319ed4a6bc7050a6234", + "size": 20500648, + "url": "https://dl.google.com/android/repository/build-tools_r19.0.1-windows.zip" + } + ], + "displayName": "Android SDK Build-Tools 19.0.1", + "license": "android-sdk-license", + "name": "build-tools", + "path": "build-tools/19.0.1", + "revision": "19.0.1" + }, + "19.0.2": { + "archives": [ + { + "os": "linux", + "sha1": "a03a6bdea0091aea32e1b35b90a7294c9f04e3dd", + "size": 21352552, + "url": "https://dl.google.com/android/repository/build-tools_r19.0.2-linux.zip" + }, + { + "os": "macosx", + "sha1": "145bc43065d45f756d99d87329d899052b9a9288", + "size": 21453726, + "url": "https://dl.google.com/android/repository/build-tools_r19.0.2-macosx.zip" + }, + { + "os": "windows", + "sha1": "af664672d0d709c9ae30937b1062317d3ade7f95", + "size": 20621117, + "url": "https://dl.google.com/android/repository/build-tools_r19.0.2-windows.zip" + } + ], + "displayName": "Android SDK Build-Tools 19.0.2", + "license": "android-sdk-license", + "name": "build-tools", + "path": "build-tools/19.0.2", + "revision": "19.0.2" + }, + "19.0.3": { + "archives": [ + { + "os": "linux", + "sha1": "c2d6055478e9d2d4fba476ee85f99181ddd1160c", + "size": 21462150, + "url": "https://dl.google.com/android/repository/build-tools_r19.0.3-linux.zip" + }, + { + "os": "macosx", + "sha1": "651cf8754373b2d52e7f6aab2c52eabffe4e9ea4", + "size": 21563992, + "url": "https://dl.google.com/android/repository/build-tools_r19.0.3-macosx.zip" + }, + { + "os": "windows", + "sha1": "cb46b433b67a0a6910ff00db84be8b527ea3102f", + "size": 20730715, + "url": "https://dl.google.com/android/repository/build-tools_r19.0.3-windows.zip" + } + ], + "displayName": "Android SDK Build-Tools 19.0.3", + "license": "android-sdk-license", + "name": "build-tools", + "path": "build-tools/19.0.3", + "revision": "19.0.3" + }, + "19.1.0": { + "archives": [ + { + "os": "linux", + "sha1": "1ff20ac15fa47a75d00346ec12f180d531b3ca89", + "size": 21490972, + "url": "https://dl.google.com/android/repository/build-tools_r19.1-linux.zip" + }, + { + "os": "macosx", + "sha1": "0d11aae3417de1efb4b9a0e0a7855904a61bcec1", + "size": 21590160, + "url": "https://dl.google.com/android/repository/build-tools_r19.1-macosx.zip" + }, + { + "os": "windows", + "sha1": "13b367fbdbff8132cb4356f716e8dc8a8df745c5", + "size": 20812533, + "url": "https://dl.google.com/android/repository/build-tools_r19.1-windows.zip" + } + ], + "displayName": "Android SDK Build-Tools 19.1", + "license": "android-sdk-license", + "name": "build-tools", + "path": "build-tools/19.1.0", + "revision": "19.1.0" + }, + "20.0.0": { + "archives": [ + { + "os": "linux", + "sha1": "b688905526a5584d1327a662d871a635ff502758", + "size": 21445463, + "url": "https://dl.google.com/android/repository/build-tools_r20-linux.zip" + }, + { + "os": "macosx", + "sha1": "1240f629411c108a714c4ddd756937c7fab93f83", + "size": 21650508, + "url": "https://dl.google.com/android/repository/build-tools_r20-macosx.zip" + }, + { + "os": "windows", + "sha1": "cf20720e452b642d5eb59dabe05c0c729b36ec75", + "size": 20828006, + "url": "https://dl.google.com/android/repository/build-tools_r20-windows.zip" + } + ], + "displayName": "Android SDK Build-Tools 20", + "license": "android-sdk-license", + "name": "build-tools", + "path": "build-tools/20.0.0", + "revision": "20.0.0" + }, + "21.0.0": { + "archives": [ + { + "os": "linux", + "sha1": "4933328fdeecbd554a29528f254f4993468e1cf4", + "size": 22153145, + "url": "https://dl.google.com/android/repository/build-tools_r21-linux.zip" + }, + { + "os": "macosx", + "sha1": "9bef7989b51436bd4e5114d8a0330359f077cbfa", + "size": 22668456, + "url": "https://dl.google.com/android/repository/build-tools_r21-macosx.zip" + }, + { + "os": "windows", + "sha1": "5bc8fd399bc0135a9bc91eec78ddc5af4f54bf32", + "size": 22306371, + "url": "https://dl.google.com/android/repository/build-tools_r21-windows.zip" + } + ], + "displayName": "Android SDK Build-Tools 21", + "license": "android-sdk-license", + "name": "build-tools", + "path": "build-tools/21.0.0", + "revision": "21.0.0" + }, + "21.0.1": { + "archives": [ + { + "os": "linux", + "sha1": "e573069eea3e5255e7a65bedeb767f4fd0a5f49a", + "size": 22153013, + "url": "https://dl.google.com/android/repository/build-tools_r21.0.1-linux.zip" + }, + { + "os": "macosx", + "sha1": "b60c8f9b810c980abafa04896706f3911be1ade7", + "size": 22668616, + "url": "https://dl.google.com/android/repository/build-tools_r21.0.1-macosx.zip" + }, + { + "os": "windows", + "sha1": "d68e7e6fd7a48c8759aa41d713c9d4f0e4c1c1df", + "size": 22306243, + "url": "https://dl.google.com/android/repository/build-tools_r21.0.1-windows.zip" + } + ], + "displayName": "Android SDK Build-Tools 21.0.1", + "license": "android-sdk-license", + "name": "build-tools", + "path": "build-tools/21.0.1", + "revision": "21.0.1" + }, + "21.0.2": { + "archives": [ + { + "os": "linux", + "sha1": "e1236ab8897b62b57414adcf04c132567b2612a5", + "size": 22153122, + "url": "https://dl.google.com/android/repository/build-tools_r21.0.2-linux.zip" + }, + { + "os": "macosx", + "sha1": "f17471c154058f3734729ef3cc363399b1cd3de1", + "size": 22668597, + "url": "https://dl.google.com/android/repository/build-tools_r21.0.2-macosx.zip" + }, + { + "os": "windows", + "sha1": "37496141b23cbe633167927b7abe6e22d9f1a1c1", + "size": 22306371, + "url": "https://dl.google.com/android/repository/build-tools_r21.0.2-windows.zip" + } + ], + "displayName": "Android SDK Build-Tools 21.0.2", + "license": "android-sdk-license", + "name": "build-tools", + "path": "build-tools/21.0.2", + "revision": "21.0.2" + }, + "21.1.0": { + "archives": [ + { + "os": "linux", + "sha1": "b7455e543784d52a8925f960bc880493ed1478cb", + "size": 32642820, + "url": "https://dl.google.com/android/repository/build-tools_r21.1-linux.zip" + }, + { + "os": "macosx", + "sha1": "df619356c2359aa5eacdd48699d15b335d9bd246", + "size": 33158159, + "url": "https://dl.google.com/android/repository/build-tools_r21.1-macosx.zip" + }, + { + "os": "windows", + "sha1": "c79d63ac6b713a1e326ad4dae43f2ee76708a2f4", + "size": 32797810, + "url": "https://dl.google.com/android/repository/build-tools_r21.1-windows.zip" + } + ], + "displayName": "Android SDK Build-Tools 21.1", + "license": "android-sdk-license", + "name": "build-tools", + "path": "build-tools/21.1.0", + "revision": "21.1.0" + }, + "21.1.1": { + "archives": [ + { + "os": "linux", + "sha1": "1c712ee3a1ba5a8b0548f9c32f17d4a0ddfd727d", + "size": 32642454, + "url": "https://dl.google.com/android/repository/build-tools_r21.1.1-linux.zip" + }, + { + "os": "macosx", + "sha1": "836a146eab0504aa9387a5132e986fe7c7381571", + "size": 33157676, + "url": "https://dl.google.com/android/repository/build-tools_r21.1.1-macosx.zip" + }, + { + "os": "windows", + "sha1": "53fc4201237f899d5cd92f0b76ad41fb89da188b", + "size": 32797356, + "url": "https://dl.google.com/android/repository/build-tools_r21.1.1-windows.zip" + } + ], + "displayName": "Android SDK Build-Tools 21.1.1", + "license": "android-sdk-license", + "name": "build-tools", + "path": "build-tools/21.1.1", + "revision": "21.1.1" + }, + "21.1.2": { + "archives": [ + { + "os": "linux", + "sha1": "5e35259843bf2926113a38368b08458735479658", + "size": 32637678, + "url": "https://dl.google.com/android/repository/build-tools_r21.1.2-linux.zip" + }, + { + "os": "macosx", + "sha1": "e7c906b4ba0eea93b32ba36c610dbd6b204bff48", + "size": 33152878, + "url": "https://dl.google.com/android/repository/build-tools_r21.1.2-macosx.zip" + }, + { + "os": "windows", + "sha1": "1d944759c47f60e634d2b8a1f3a4259be2f8d652", + "size": 32792587, + "url": "https://dl.google.com/android/repository/build-tools_r21.1.2-windows.zip" + } + ], + "displayName": "Android SDK Build-Tools 21.1.2", + "license": "android-sdk-license", + "name": "build-tools", + "path": "build-tools/21.1.2", + "revision": "21.1.2" + }, + "22.0.0": { + "archives": [ + { + "os": "linux", + "sha1": "a8a1619dd090e44fac957bce6842e62abf87965b", + "size": 33104280, + "url": "https://dl.google.com/android/repository/build-tools_r22-linux.zip" + }, + { + "os": "macosx", + "sha1": "af95429b24088d704bc5db9bd606e34ac1b82c0d", + "size": 33646090, + "url": "https://dl.google.com/android/repository/build-tools_r22-macosx.zip" + }, + { + "os": "windows", + "sha1": "08fcca41e81b172bd9f570963b90d3a84929e043", + "size": 33254114, + "url": "https://dl.google.com/android/repository/build-tools_r22-windows.zip" + } + ], + "displayName": "Android SDK Build-Tools 22", + "license": "android-sdk-license", + "name": "build-tools", + "path": "build-tools/22.0.0", + "revision": "22.0.0" + }, + "22.0.1": { + "archives": [ + { + "os": "linux", + "sha1": "da8b9c5c3ede39298e6cf0283c000c2ee9029646", + "size": 33104577, + "url": "https://dl.google.com/android/repository/build-tools_r22.0.1-linux.zip" + }, + { + "os": "macosx", + "sha1": "53dad7f608e01d53b17176ba11165acbfccc5bbf", + "size": 33646102, + "url": "https://dl.google.com/android/repository/build-tools_r22.0.1-macosx.zip" + }, + { + "os": "windows", + "sha1": "61d8cbe069d9e0a57872a83e5e5abe164b7d52cf", + "size": 33254137, + "url": "https://dl.google.com/android/repository/build-tools_r22.0.1-windows.zip" + } + ], + "displayName": "Android SDK Build-Tools 22.0.1", + "license": "android-sdk-license", + "name": "build-tools", + "path": "build-tools/22.0.1", + "revision": "22.0.1" + }, + "23.0.0": { + "archives": [ + { + "os": "linux", + "sha1": "c1d6209212b01469f80fa804e0c1d39a06bc9060", + "size": 39080519, + "url": "https://dl.google.com/android/repository/build-tools_r23-linux.zip" + }, + { + "os": "macosx", + "sha1": "90ba6e716f7703a236cd44b2e71c5ff430855a03", + "size": 38070540, + "url": "https://dl.google.com/android/repository/build-tools_r23-macosx.zip" + }, + { + "os": "windows", + "sha1": "3874948f35f2f8946597679cc6e9151449f23b5d", + "size": 38570715, + "url": "https://dl.google.com/android/repository/build-tools_r23-windows.zip" + } + ], + "displayName": "Android SDK Build-Tools 23", + "license": "android-sdk-license", + "name": "build-tools", + "path": "build-tools/23.0.0", + "revision": "23.0.0" + }, + "23.0.1": { + "archives": [ + { + "os": "linux", + "sha1": "b6ba7c399d5fa487d95289d8832e4ad943aed556", + "size": 39069295, + "url": "https://dl.google.com/android/repository/build-tools_r23.0.1-linux.zip" + }, + { + "os": "macosx", + "sha1": "d96ec1522721e9a179ae2c591c99f75d31d39718", + "size": 38059328, + "url": "https://dl.google.com/android/repository/build-tools_r23.0.1-macosx.zip" + }, + { + "os": "windows", + "sha1": "cc1d37231d228f7a6f130e1f8d8c940052f0f8ab", + "size": 38558889, + "url": "https://dl.google.com/android/repository/build-tools_r23.0.1-windows.zip" + } + ], + "displayName": "Android SDK Build-Tools 23.0.1", + "license": "android-sdk-license", + "name": "build-tools", + "path": "build-tools/23.0.1", + "revision": "23.0.1" + }, + "23.0.2": { + "archives": [ + { + "os": "linux", + "sha1": "8a9f2b37f6fcf7a9fa784dc21aeaeb41bbb9f2c3", + "size": 39071201, + "url": "https://dl.google.com/android/repository/build-tools_r23.0.2-linux.zip" + }, + { + "os": "macosx", + "sha1": "482c4cbceef8ff58aefd92d8155a38610158fdaf", + "size": 38060914, + "url": "https://dl.google.com/android/repository/build-tools_r23.0.2-macosx.zip" + }, + { + "os": "windows", + "sha1": "fc3a92c744d3ba0a16ccb5d2b41eea5974ce0a96", + "size": 38217626, + "url": "https://dl.google.com/android/repository/build-tools_r23.0.2-windows.zip" + } + ], + "displayName": "Android SDK Build-Tools 23.0.2", + "license": "android-sdk-license", + "name": "build-tools", + "path": "build-tools/23.0.2", + "revision": "23.0.2" + }, + "23.0.3": { + "archives": [ + { + "os": "linux", + "sha1": "368f2600feac7e9b511b82f53d1f2240ae4a91a3", + "size": 40733174, + "url": "https://dl.google.com/android/repository/build-tools_r23.0.3-linux.zip" + }, + { + "os": "macosx", + "sha1": "fbc98cd303fd15a31d472de6c03bd707829f00b0", + "size": 39679533, + "url": "https://dl.google.com/android/repository/build-tools_r23.0.3-macosx.zip" + }, + { + "os": "windows", + "sha1": "c6d8266c6a3243c8f1e41b786c0e3cee4c781263", + "size": 39869945, + "url": "https://dl.google.com/android/repository/build-tools_r23.0.3-windows.zip" + } + ], + "displayName": "Android SDK Build-Tools 23.0.3", + "license": "android-sdk-license", + "name": "build-tools", + "path": "build-tools/23.0.3", + "revision": "23.0.3" + }, + "24.0.0": { + "archives": [ + { + "os": "linux", + "sha1": "c6271c4d78a5612ea6c7150688bcd5b7313de8d1", + "size": 48960919, + "url": "https://dl.google.com/android/repository/build-tools_r24-linux.zip" + }, + { + "os": "macosx", + "sha1": "97fc4ed442f23989cc488d02c1d1de9bdde241de", + "size": 48747930, + "url": "https://dl.google.com/android/repository/build-tools_r24-macosx.zip" + }, + { + "os": "windows", + "sha1": "dc61b9e5b451a0c3ec42ae2b1ce27c4d3c8da9f7", + "size": 49535326, + "url": "https://dl.google.com/android/repository/build-tools_r24-windows.zip" + } + ], + "displayName": "Android SDK Build-Tools 24", + "license": "android-sdk-license", + "name": "build-tools", + "path": "build-tools/24.0.0", + "revision": "24.0.0" + }, + "24.0.1": { + "archives": [ + { + "os": "linux", + "sha1": "84f18c392919a074fcbb9b1d967984e6b2fef8b4", + "size": 48936286, + "url": "https://dl.google.com/android/repository/build-tools_r24.0.1-linux.zip" + }, + { + "os": "macosx", + "sha1": "5c6457fcdfa07724fb086d8ff4e8316fc0742848", + "size": 48726085, + "url": "https://dl.google.com/android/repository/build-tools_r24.0.1-macosx.zip" + }, + { + "os": "windows", + "sha1": "ac4a7cea42c3ef74d7fbf1b992fad311c550034e", + "size": 49511883, + "url": "https://dl.google.com/android/repository/build-tools_r24.0.1-windows.zip" + } + ], + "displayName": "Android SDK Build-Tools 24.0.1", + "license": "android-sdk-license", + "name": "build-tools", + "path": "build-tools/24.0.1", + "revision": "24.0.1" + }, + "24.0.2": { + "archives": [ + { + "os": "linux", + "sha1": "f199a7a788c3fefbed102eea34d6007737b803cf", + "size": 48936295, + "url": "https://dl.google.com/android/repository/build-tools_r24.0.2-linux.zip" + }, + { + "os": "macosx", + "sha1": "8bb8fc575477491d5957de743089df412de55cda", + "size": 48726190, + "url": "https://dl.google.com/android/repository/build-tools_r24.0.2-macosx.zip" + }, + { + "os": "windows", + "sha1": "09586a1f1c39bcfa7db5205c9a07837247deb67e", + "size": 49512513, + "url": "https://dl.google.com/android/repository/build-tools_r24.0.2-windows.zip" + } + ], + "displayName": "Android SDK Build-Tools 24.0.2", + "license": "android-sdk-license", + "name": "build-tools", + "path": "build-tools/24.0.2", + "revision": "24.0.2" + }, + "24.0.3": { + "archives": [ + { + "os": "linux", + "sha1": "9e8cc49d66e03fa1a8ecc1ac3e58f1324f5da304", + "size": 49779151, + "url": "https://dl.google.com/android/repository/build-tools_r24.0.3-linux.zip" + }, + { + "os": "macosx", + "sha1": "a01c15f1b105c34595681075e1895d58b3fff48c", + "size": 49568967, + "url": "https://dl.google.com/android/repository/build-tools_r24.0.3-macosx.zip" + }, + { + "os": "windows", + "sha1": "8b960d693fd4163caeb8dc5f5f5f80b10987089c", + "size": 50354788, + "url": "https://dl.google.com/android/repository/build-tools_r24.0.3-windows.zip" + } + ], + "displayName": "Android SDK Build-Tools 24.0.3", + "license": "android-sdk-license", + "name": "build-tools", + "path": "build-tools/24.0.3", + "revision": "24.0.3" + }, + "25.0.0": { + "archives": [ + { + "os": "linux", + "sha1": "f2bbda60403e75cabd0f238598c3b4dfca56ea44", + "size": 49872921, + "url": "https://dl.google.com/android/repository/build-tools_r25-linux.zip" + }, + { + "os": "macosx", + "sha1": "273c5c29a65cbed00e44f3aa470bbd7dce556606", + "size": 49659466, + "url": "https://dl.google.com/android/repository/build-tools_r25-macosx.zip" + }, + { + "os": "windows", + "sha1": "f9258f2308ff8b62cfc4513d40cb961612d07b6a", + "size": 50451378, + "url": "https://dl.google.com/android/repository/build-tools_r25-windows.zip" + } + ], + "displayName": "Android SDK Build-Tools 25", + "license": "android-sdk-license", + "name": "build-tools", + "path": "build-tools/25.0.0", + "revision": "25.0.0" + }, + "25.0.1": { + "archives": [ + { + "os": "linux", + "sha1": "ff063d252ab750d339f5947d06ff782836f22bac", + "size": 49880178, + "url": "https://dl.google.com/android/repository/build-tools_r25.0.1-linux.zip" + }, + { + "os": "macosx", + "sha1": "7bf7f22d7d48ef20b6ab0e3d7a2912e5c088340f", + "size": 49667353, + "url": "https://dl.google.com/android/repository/build-tools_r25.0.1-macosx.zip" + }, + { + "os": "windows", + "sha1": "c6c61393565ccf46349e7f44511e5db7c1c6169d", + "size": 50458759, + "url": "https://dl.google.com/android/repository/build-tools_r25.0.1-windows.zip" + } + ], + "displayName": "Android SDK Build-Tools 25.0.1", + "license": "android-sdk-license", + "name": "build-tools", + "path": "build-tools/25.0.1", + "revision": "25.0.1" + }, + "25.0.2": { + "archives": [ + { + "os": "linux", + "sha1": "ff953c0177e317618fda40516f3e9d95fd43c7ae", + "size": 49880329, + "url": "https://dl.google.com/android/repository/build-tools_r25.0.2-linux.zip" + }, + { + "os": "macosx", + "sha1": "12a5204bb3b6e39437535469fde7ddf42da46b16", + "size": 49667185, + "url": "https://dl.google.com/android/repository/build-tools_r25.0.2-macosx.zip" + }, + { + "os": "windows", + "sha1": "2fee3c0704d6ecc480570450d8b8069b2c4a2dd4", + "size": 50458908, + "url": "https://dl.google.com/android/repository/build-tools_r25.0.2-windows.zip" + } + ], + "displayName": "Android SDK Build-Tools 25.0.2", + "license": "android-sdk-license", + "name": "build-tools", + "path": "build-tools/25.0.2", + "revision": "25.0.2" + }, + "25.0.3": { + "archives": [ + { + "os": "linux", + "sha1": "db95f3a0ae376534d4d69f4cdb6fad20649f3509", + "size": 50757258, + "url": "https://dl.google.com/android/repository/build-tools_r25.0.3-linux.zip" + }, + { + "os": "macosx", + "sha1": "160d2fefb5ce68e443427fc30a793a703b63e26e", + "size": 50545085, + "url": "https://dl.google.com/android/repository/build-tools_r25.0.3-macosx.zip" + }, + { + "os": "windows", + "sha1": "1edcb109ae5133aebfed573cf0bc84e0c353c28d", + "size": 51337442, + "url": "https://dl.google.com/android/repository/build-tools_r25.0.3-windows.zip" + } + ], + "displayName": "Android SDK Build-Tools 25.0.3", + "license": "android-sdk-license", + "name": "build-tools", + "path": "build-tools/25.0.3", + "revision": "25.0.3" + }, + "26.0.0": { + "archives": [ + { + "os": "linux", + "sha1": "1cbe72929876f8a872ab1f1b1040a9f720261f59", + "size": 53854197, + "url": "https://dl.google.com/android/repository/build-tools_r26-linux.zip" + }, + { + "os": "macosx", + "sha1": "d01a1aeca03747245f1f5936b3cb01759c66d086", + "size": 53010814, + "url": "https://dl.google.com/android/repository/build-tools_r26-macosx.zip" + }, + { + "os": "windows", + "sha1": "896ebd31117c09db220f7a3116cc0e5121c78b9d", + "size": 54681641, + "url": "https://dl.google.com/android/repository/build-tools_r26-windows.zip" + } + ], + "displayName": "Android SDK Build-Tools 26", + "license": "android-sdk-license", + "name": "build-tools", + "path": "build-tools/26.0.0", + "revision": "26.0.0" + }, + "26.0.1": { + "archives": [ + { + "os": "linux", + "sha1": "5378c2c78091b414d0eac40a6bd37f2faa31a365", + "size": 54113329, + "url": "https://dl.google.com/android/repository/build-tools_r26.0.1-linux.zip" + }, + { + "os": "macosx", + "sha1": "cbde59de198916b390777dd0227921bfa2120832", + "size": 53266653, + "url": "https://dl.google.com/android/repository/build-tools_r26.0.1-macosx.zip" + }, + { + "os": "windows", + "sha1": "02494c80ffbe65bfff0aaa7463c9692693327b7d", + "size": 54936185, + "url": "https://dl.google.com/android/repository/build-tools_r26.0.1-windows.zip" + } + ], + "displayName": "Android SDK Build-Tools 26.0.1", + "license": "android-sdk-license", + "name": "build-tools", + "path": "build-tools/26.0.1", + "revision": "26.0.1" + }, + "26.0.2": { + "archives": [ + { + "os": "linux", + "sha1": "5b2b7b66c7bf2151f2af183b5b50a17808850592", + "size": 54440678, + "url": "https://dl.google.com/android/repository/build-tools_r26.0.2-linux.zip" + }, + { + "os": "macosx", + "sha1": "d9ed7c7f149ce38be5dc08979aea8acec1459ca0", + "size": 53830573, + "url": "https://dl.google.com/android/repository/build-tools_r26.0.2-macosx.zip" + }, + { + "os": "windows", + "sha1": "39ca02d3faa49859cd9d1bc0adc2f331017b699b", + "size": 55161474, + "url": "https://dl.google.com/android/repository/build-tools_r26.0.2-windows.zip" + } + ], + "displayName": "Android SDK Build-Tools 26.0.2", + "license": "android-sdk-license", + "name": "build-tools", + "path": "build-tools/26.0.2", + "revision": "26.0.2" + }, + "26.0.3": { + "archives": [ + { + "os": "linux", + "sha1": "8a2e6c1bcd845844523a68aa17e5442f0dce328c", + "size": 54449983, + "url": "https://dl.google.com/android/repository/build-tools_r26.0.3-linux.zip" + }, + { + "os": "macosx", + "sha1": "5bb90ed935d99e5bc90686f43b852e68c5ad40df", + "size": 53839758, + "url": "https://dl.google.com/android/repository/build-tools_r26.0.3-macosx.zip" + }, + { + "os": "windows", + "sha1": "460e511a9616b4661cc8dba0102d9d990ae60160", + "size": 55170919, + "url": "https://dl.google.com/android/repository/build-tools_r26.0.3-windows.zip" + } + ], + "displayName": "Android SDK Build-Tools 26.0.3", + "license": "android-sdk-license", + "name": "build-tools", + "path": "build-tools/26.0.3", + "revision": "26.0.3" + }, + "27.0.0": { + "archives": [ + { + "os": "linux", + "sha1": "28542332ba97cf4a08c3eddfcf5edd70e3cf1260", + "size": 54441725, + "url": "https://dl.google.com/android/repository/build-tools_r27-linux.zip" + }, + { + "os": "macosx", + "sha1": "fb4e8d7e6b8d29a77090e34024077a80458d5ae1", + "size": 53831513, + "url": "https://dl.google.com/android/repository/build-tools_r27-macosx.zip" + }, + { + "os": "windows", + "sha1": "4f1df22a6d99261d2160d624b81445da0a027dbe", + "size": 55163097, + "url": "https://dl.google.com/android/repository/build-tools_r27-windows.zip" + } + ], + "displayName": "Android SDK Build-Tools 27", + "license": "android-sdk-license", + "name": "build-tools", + "path": "build-tools/27.0.0", + "revision": "27.0.0" + }, + "27.0.1": { + "archives": [ + { + "os": "linux", + "sha1": "7f4eedb1077ef948b848040dcd15de9e8a759f4a", + "size": 54450260, + "url": "https://dl.google.com/android/repository/build-tools_r27.0.1-linux.zip" + }, + { + "os": "macosx", + "sha1": "1edd07bfdbadd95652d093040e16d858f7489594", + "size": 53838762, + "url": "https://dl.google.com/android/repository/build-tools_r27.0.1-macosx.zip" + }, + { + "os": "windows", + "sha1": "18109db020c6d088d0157d1df201d31bc6970875", + "size": 55171114, + "url": "https://dl.google.com/android/repository/build-tools_r27.0.1-windows.zip" + } + ], + "displayName": "Android SDK Build-Tools 27.0.1", + "license": "android-sdk-license", + "name": "build-tools", + "path": "build-tools/27.0.1", + "revision": "27.0.1" + }, + "27.0.2": { + "archives": [ + { + "os": "linux", + "sha1": "b687ddf6be84f11607871138aad32cf857d0b837", + "size": 54458153, + "url": "https://dl.google.com/android/repository/build-tools_r27.0.2-linux.zip" + }, + { + "os": "macosx", + "sha1": "6d5d9cf2a47877f273f4b742b19e712a051a31be", + "size": 53846615, + "url": "https://dl.google.com/android/repository/build-tools_r27.0.2-macosx.zip" + }, + { + "os": "windows", + "sha1": "b80466c13b75e3ebf3c546964f40775db5898b2a", + "size": 55173070, + "url": "https://dl.google.com/android/repository/build-tools_r27.0.2-windows.zip" + } + ], + "displayName": "Android SDK Build-Tools 27.0.2", + "license": "android-sdk-license", + "name": "build-tools", + "path": "build-tools/27.0.2", + "revision": "27.0.2" + }, + "27.0.3": { + "archives": [ + { + "os": "linux", + "sha1": "d85e7a6320eddffe7eeace3437605079dac938ca", + "size": 54478554, + "url": "https://dl.google.com/android/repository/build-tools_r27.0.3-linux.zip" + }, + { + "os": "macosx", + "sha1": "61d9fb18790c68d66ff73bf1e7ad56bc1f1eef2d", + "size": 53867966, + "url": "https://dl.google.com/android/repository/build-tools_r27.0.3-macosx.zip" + }, + { + "os": "windows", + "sha1": "0df61e11713a2838d2cc9a911219dddf5e6a2749", + "size": 55194255, + "url": "https://dl.google.com/android/repository/build-tools_r27.0.3-windows.zip" + } + ], + "displayName": "Android SDK Build-Tools 27.0.3", + "license": "android-sdk-license", + "name": "build-tools", + "path": "build-tools/27.0.3", + "revision": "27.0.3" + }, + "28.0.0": { + "archives": [ + { + "os": "linux", + "sha1": "d9f8a754d833ccd334f56fcc6089c5925cd82abb", + "size": 37157769, + "url": "https://dl.google.com/android/repository/build-tools_r28-linux.zip" + }, + { + "os": "macosx", + "sha1": "72088d32d1d82cc3c2cf7cf6618b6130c0c84ade", + "size": 36458977, + "url": "https://dl.google.com/android/repository/build-tools_r28-macosx.zip" + }, + { + "os": "windows", + "sha1": "d4b0638a877ed570e07876264e69fdbd86409610", + "size": 37718995, + "url": "https://dl.google.com/android/repository/build-tools_r28-windows.zip" + } + ], + "displayName": "Android SDK Build-Tools 28", + "license": "android-sdk-license", + "name": "build-tools", + "path": "build-tools/28.0.0", + "revision": "28.0.0" + }, + "28.0.0-rc1": { + "archives": [ + { + "os": "linux", + "sha1": "1601977fae25fd478bcfaa0481ca5ea3c609d840", + "size": 38703535, + "url": "https://dl.google.com/android/repository/build-tools_r28-rc1-linux.zip" + }, + { + "os": "macosx", + "sha1": "2c77821967a2330b7b227072d0b1c02ef19fe2fc", + "size": 38004795, + "url": "https://dl.google.com/android/repository/build-tools_r28-rc1-macosx.zip" + }, + { + "os": "windows", + "sha1": "fbf46c33d1268f6532911707b2a05033fd5c5b41", + "size": 39273232, + "url": "https://dl.google.com/android/repository/build-tools_r28-rc1-windows.zip" + } + ], + "displayName": "Android SDK Build-Tools 28-rc1", + "license": "android-sdk-preview-license", + "name": "build-tools", + "path": "build-tools/28.0.0-rc1", + "revision": "28.0.0-rc1" + }, + "28.0.0-rc2": { + "archives": [ + { + "os": "linux", + "sha1": "efe9c0dde0646a07544c864276390ca6e96b24dc", + "size": 37151124, + "url": "https://dl.google.com/android/repository/build-tools_r28-rc2-linux.zip" + }, + { + "os": "macosx", + "sha1": "0d0314b353589feb10e528b44c5a685b6658d797", + "size": 36449480, + "url": "https://dl.google.com/android/repository/build-tools_r28-rc2-macosx.zip" + }, + { + "os": "windows", + "sha1": "a94bfb52b4ec74b95c116236c3e382e923cad6c4", + "size": 37716459, + "url": "https://dl.google.com/android/repository/build-tools_r28-rc2-windows.zip" + } + ], + "displayName": "Android SDK Build-Tools 28-rc2", + "license": "android-sdk-preview-license", + "name": "build-tools", + "path": "build-tools/28.0.0-rc2", + "revision": "28.0.0-rc2" + }, + "28.0.1": { + "archives": [ + { + "os": "linux", + "sha1": "ee70dfa1fccb58b37cebc9544830511f36a137a0", + "size": 57610954, + "url": "https://dl.google.com/android/repository/build-tools_r28.0.1-linux.zip" + }, + { + "os": "macosx", + "sha1": "aeef42ad953f1630dd6f5d71eefdc0b825211462", + "size": 56913869, + "url": "https://dl.google.com/android/repository/build-tools_r28.0.1-macosx.zip" + }, + { + "os": "windows", + "sha1": "29c6342835734be25b9e458ab3fad5750ad6a355", + "size": 58173989, + "url": "https://dl.google.com/android/repository/build-tools_r28.0.1-windows.zip" + } + ], + "displayName": "Android SDK Build-Tools 28.0.1", + "license": "android-sdk-license", + "name": "build-tools", + "path": "build-tools/28.0.1", + "revision": "28.0.1" + }, + "28.0.2": { + "archives": [ + { + "os": "linux", + "sha1": "b4492209810a3fd48deaa982f9852fef12433d55", + "size": 57754663, + "url": "https://dl.google.com/android/repository/build-tools_r28.0.2-linux.zip" + }, + { + "os": "macosx", + "sha1": "c10dd5a7825578622fb362a8a34f76eb3ba0c0a9", + "size": 57057554, + "url": "https://dl.google.com/android/repository/build-tools_r28.0.2-macosx.zip" + }, + { + "os": "windows", + "sha1": "e9c570c568a0c2a32e88ee3204279019ebefd949", + "size": 58317692, + "url": "https://dl.google.com/android/repository/build-tools_r28.0.2-windows.zip" + } + ], + "displayName": "Android SDK Build-Tools 28.0.2", + "license": "android-sdk-license", + "name": "build-tools", + "path": "build-tools/28.0.2", + "revision": "28.0.2" + }, + "28.0.3": { + "archives": [ + { + "os": "linux", + "sha1": "ea6f2f7103cd9da9ff0bdf6e37fbbba548fa4165", + "size": 57830695, + "url": "https://dl.google.com/android/repository/build-tools_r28.0.3-linux.zip" + }, + { + "os": "macosx", + "sha1": "f8c333a2991b1ab05a671bc6248b78e00edcd83a", + "size": 57133581, + "url": "https://dl.google.com/android/repository/build-tools_r28.0.3-macosx.zip" + }, + { + "os": "windows", + "sha1": "05bd35bb48d11c848da2b393c6f864eb609aacba", + "size": 58393729, + "url": "https://dl.google.com/android/repository/build-tools_r28.0.3-windows.zip" + } + ], + "displayName": "Android SDK Build-Tools 28.0.3", + "license": "android-sdk-license", + "name": "build-tools", + "path": "build-tools/28.0.3", + "revision": "28.0.3" + }, + "29.0.0": { + "archives": [ + { + "os": "linux", + "sha1": "ad314caf1802209c4b00a5f3517af5ceb0d48eae", + "size": 58650449, + "url": "https://dl.google.com/android/repository/build-tools_r29-linux.zip" + }, + { + "os": "macosx", + "sha1": "35dc6bc7a53bd9d206847e72f02cab21cfdaa869", + "size": 57820193, + "url": "https://dl.google.com/android/repository/build-tools_r29-macosx.zip" + }, + { + "os": "windows", + "sha1": "1799f7f975416098e5a5bf280eb97c8f77cf7f79", + "size": 57098799, + "url": "https://dl.google.com/android/repository/build-tools_r29-windows.zip" + } + ], + "displayName": "Android SDK Build-Tools 29", + "license": "android-sdk-license", + "name": "build-tools", + "path": "build-tools/29.0.0", + "revision": "29.0.0" + }, + "29.0.0-rc1": { + "archives": [ + { + "os": "linux", + "sha1": "1c897f5885ac5468613e40e1ea598c21c05d345d", + "size": 58516671, + "url": "https://dl.google.com/android/repository/build-tools_r29-rc1-linux.zip" + }, + { + "os": "macosx", + "sha1": "f066c0d9ea2f0d8a0a9cc7b2ca0a467a570ab034", + "size": 57704927, + "url": "https://dl.google.com/android/repository/build-tools_r29-rc1-macosx.zip" + }, + { + "os": "windows", + "sha1": "8887ee791a143f92694a0908130354142a903b17", + "size": 56933956, + "url": "https://dl.google.com/android/repository/build-tools_r29-rc1-windows.zip" + } + ], + "displayName": "Android SDK Build-Tools 29-rc1", + "license": "android-sdk-preview-license", + "name": "build-tools", + "path": "build-tools/29.0.0-rc1", + "revision": "29.0.0-rc1" + }, + "29.0.0-rc2": { + "archives": [ + { + "os": "linux", + "sha1": "b4b41d429c35b42db07b6c65d4aa998ba8c4093c", + "size": 58602830, + "url": "https://dl.google.com/android/repository/build-tools_r29-rc2-linux.zip" + }, + { + "os": "macosx", + "sha1": "7a960367999169ccac5dbc60817e5f1725c4c738", + "size": 57785717, + "url": "https://dl.google.com/android/repository/build-tools_r29-rc2-macosx.zip" + }, + { + "os": "windows", + "sha1": "2de2a3e290cae4ce35e82c8a5abed49b1cdd24e3", + "size": 57000706, + "url": "https://dl.google.com/android/repository/build-tools_r29-rc2-windows.zip" + } + ], + "displayName": "Android SDK Build-Tools 29-rc2", + "license": "android-sdk-preview-license", + "name": "build-tools", + "path": "build-tools/29.0.0-rc2", + "revision": "29.0.0-rc2" + }, + "29.0.0-rc3": { + "archives": [ + { + "os": "linux", + "sha1": "8b7177f198e8b92da8f9537aaf859f6edf222b01", + "size": 58639871, + "url": "https://dl.google.com/android/repository/build-tools_r29-rc3-linux.zip" + }, + { + "os": "macosx", + "sha1": "643e8d76625f6e2cfcd5494e50bae5e14725ec0c", + "size": 57810162, + "url": "https://dl.google.com/android/repository/build-tools_r29-rc3-macosx.zip" + }, + { + "os": "windows", + "sha1": "6abce2ebfecf3580afd3129520999f95691a03df", + "size": 57092256, + "url": "https://dl.google.com/android/repository/build-tools_r29-rc3-windows.zip" + } + ], + "displayName": "Android SDK Build-Tools 29-rc3", + "license": "android-sdk-preview-license", + "name": "build-tools", + "path": "build-tools/29.0.0-rc3", + "revision": "29.0.0-rc3" + }, + "29.0.1": { + "archives": [ + { + "os": "linux", + "sha1": "fc209e5d91ab2daeac24345a5cb17261940547e4", + "size": 41682816, + "url": "https://dl.google.com/android/repository/build-tools_r29.0.1-linux.zip" + }, + { + "os": "macosx", + "sha1": "46ae9b1d1e2a67241d7da9c2cd8eae42f24cc6cd", + "size": 40852521, + "url": "https://dl.google.com/android/repository/build-tools_r29.0.1-macosx.zip" + }, + { + "os": "windows", + "sha1": "1c44e10d5f74e58c3e05bfc6f1631a59616059bc", + "size": 40163897, + "url": "https://dl.google.com/android/repository/build-tools_r29.0.1-windows.zip" + } + ], + "displayName": "Android SDK Build-Tools 29.0.1", + "license": "android-sdk-license", + "name": "build-tools", + "path": "build-tools/29.0.1", + "revision": "29.0.1" + }, + "29.0.2": { + "archives": [ + { + "os": "linux", + "sha1": "c0fc7e5c37ac96bfd0c611802e8ab36d0e71b398", + "size": 41678888, + "url": "https://dl.google.com/android/repository/build-tools_r29.0.2-linux.zip" + }, + { + "os": "macosx", + "sha1": "f781d9e03d5c2debcf51fed3792ee7a9d066723f", + "size": 40848529, + "url": "https://dl.google.com/android/repository/build-tools_r29.0.2-macosx.zip" + }, + { + "os": "windows", + "sha1": "595dc1730c844d892516d5f0e7894e992d19f63d", + "size": 40159970, + "url": "https://dl.google.com/android/repository/build-tools_r29.0.2-windows.zip" + } + ], + "displayName": "Android SDK Build-Tools 29.0.2", + "license": "android-sdk-license", + "name": "build-tools", + "path": "build-tools/29.0.2", + "revision": "29.0.2" + }, + "29.0.3": { + "archives": [ + { + "os": "linux", + "sha1": "64efff52165cda5e31848acafa46a05e3f3b4651", + "size": 53797376, + "url": "https://dl.google.com/android/repository/build-tools_r29.0.3-linux.zip" + }, + { + "os": "macosx", + "sha1": "76520eb7712fb0bb4c023b55c6f65588ee268289", + "size": 52432183, + "url": "https://dl.google.com/android/repository/build-tools_r29.0.3-macosx.zip" + }, + { + "os": "windows", + "sha1": "813f8c35f016cef83e5b2b742229a3634d4658d3", + "size": 55201638, + "url": "https://dl.google.com/android/repository/build-tools_r29.0.3-windows.zip" + } + ], + "displayName": "Android SDK Build-Tools 29.0.3", + "license": "android-sdk-license", + "name": "build-tools", + "path": "build-tools/29.0.3", + "revision": "29.0.3" + }, + "30.0.0": { + "archives": [ + { + "os": "linux", + "sha1": "5bdda303b7aba4073dd2aeb8003b6b0b57098021", + "size": 68819159, + "url": "https://dl.google.com/android/repository/build-tools_r30-linux.zip" + }, + { + "os": "macosx", + "sha1": "80b06ce5fa4af2ed14db343a8131af658dda79a8", + "size": 67373109, + "url": "https://dl.google.com/android/repository/build-tools_r30-macosx.zip" + }, + { + "os": "windows", + "sha1": "5276f337e4eb4d8e5fb82f846045610f8b8e3650", + "size": 70027538, + "url": "https://dl.google.com/android/repository/build-tools_r30-windows.zip" + } + ], + "displayName": "Android SDK Build-Tools 30", + "license": "android-sdk-license", + "name": "build-tools", + "path": "build-tools/30.0.0", + "revision": "30.0.0" + }, + "30.0.1": { + "archives": [ + { + "os": "linux", + "sha1": "dae27b63a53f3c71a23a2e9517d435f79ce7975b", + "size": 52664463, + "url": "https://dl.google.com/android/repository/build-tools_r30.0.1-linux.zip" + }, + { + "os": "macosx", + "sha1": "b62ccd6d6468a374b7c8e641c3751bc929a89397", + "size": 51227882, + "url": "https://dl.google.com/android/repository/build-tools_r30.0.1-macosx.zip" + }, + { + "os": "windows", + "sha1": "76197fec228ca9b69086d6dd8a16e4589982bdc6", + "size": 53783332, + "url": "https://dl.google.com/android/repository/build-tools_r30.0.1-windows.zip" + } + ], + "displayName": "Android SDK Build-Tools 30.0.1", + "license": "android-sdk-license", + "name": "build-tools", + "path": "build-tools/30.0.1", + "revision": "30.0.1" + }, + "30.0.2": { + "archives": [ + { + "os": "macosx", + "sha1": "6b0166d1f4b0b3d496c0dde660145dfa7898095f", + "size": 51227855, + "url": "https://dl.google.com/android/repository/5a6ceea22103d8dec989aefcef309949c0c42f1d.build-tools_r30.0.2-macosx.zip" + }, + { + "os": "linux", + "sha1": "363632ff8f7a198bf9fa94e3b9e0db6927bf373d", + "size": 52664453, + "url": "https://dl.google.com/android/repository/build-tools_r30.0.2-linux.zip" + }, + { + "os": "windows", + "sha1": "b42b77e02b82f242432cd7ffff5cbb92f6888ca7", + "size": 53783318, + "url": "https://dl.google.com/android/repository/efbaa277338195608aa4e3dbd43927e97f60218c.build-tools_r30.0.2-windows.zip" + } + ], + "displayName": "Android SDK Build-Tools 30.0.2", + "license": "android-sdk-license", + "name": "build-tools", + "path": "build-tools/30.0.2", + "revision": "30.0.2" + }, + "30.0.3": { + "archives": [ + { + "os": "windows", + "sha1": "fc165c721b8d2da55e6fede467526c81f562be7b", + "size": 54254759, + "url": "https://dl.google.com/android/repository/91936d4ee3ccc839f0addd53c9ebf087b1e39251.build-tools_r30.0.3-windows.zip" + }, + { + "os": "linux", + "sha1": "2076ea81b5a2fc298ef7bf85d666f496b928c7f1", + "size": 53134793, + "url": "https://dl.google.com/android/repository/build-tools_r30.0.3-linux.zip" + }, + { + "os": "macosx", + "sha1": "0807cd3f0dbc33c8be7f3d6faa263f6b14b502b7", + "size": 51698282, + "url": "https://dl.google.com/android/repository/f6d24b187cc6bd534c6c37604205171784ac5621.build-tools_r30.0.3-macosx.zip" + } + ], + "displayName": "Android SDK Build-Tools 30.0.3", + "license": "android-sdk-license", + "name": "build-tools", + "path": "build-tools/30.0.3", + "revision": "30.0.3" + } + }, + "cmake": { + "3.10.2": { + "archives": [ + { + "os": "macosx", + "sha1": "f227a85cb53dcb927ac52a5a717f647c4a29bf3b", + "size": 13447295, + "url": "https://dl.google.com/android/repository/cmake-3.10.2-darwin-x86_64.zip" + }, + { + "os": "linux", + "sha1": "439e8799bf59f724f104bf62784b2985f1bfe561", + "size": 14275684, + "url": "https://dl.google.com/android/repository/cmake-3.10.2-linux-x86_64.zip" + }, + { + "os": "windows", + "sha1": "0a75b9c5bf558dc31caad7241a44515064656486", + "size": 11899659, + "url": "https://dl.google.com/android/repository/cmake-3.10.2-windows-x86_64.zip" + } + ], + "displayName": "CMake 3.10.2.4988404", + "license": "android-sdk-license", + "name": "cmake", + "path": "cmake/3.10.2.4988404", + "revision": "3.10.2" + }, + "3.18.1": { + "archives": [ + { + "os": "windows", + "sha1": "80916762df6955f431743066e3568ae65b1b2b2f", + "size": 14677038, + "url": "https://dl.google.com/android/repository/7c386a739f915f5bd60051f2572c24782388e807.cmake-3.18.1-windows.zip" + }, + { + "os": "macosx", + "sha1": "1580deb8fb5d705aefb028413dad1a3a129891fe", + "size": 18505815, + "url": "https://dl.google.com/android/repository/ba34c321f92f6e6fd696c8354c262c122f56abf8.cmake-3.18.1-darwin.zip" + }, + { + "os": "linux", + "sha1": "9435bbe2120763871c75c37a365451b48c007fed", + "size": 21005945, + "url": "https://dl.google.com/android/repository/cmake-3.18.1-linux.zip" + } + ], + "displayName": "CMake 3.18.1", + "license": "android-sdk-preview-license", + "name": "cmake", + "path": "cmake/3.18.1", + "revision": "3.18.1" + }, + "3.6.4111459": { + "archives": [ + { + "os": "macosx", + "sha1": "c9b02d630079783c6d67cb91488b622cfcd9765c", + "size": 12295830, + "url": "https://dl.google.com/android/repository/cmake-3.6.4111459-darwin-x86_64.zip" + }, + { + "os": "linux", + "sha1": "71c539b9c33f0943e9ad6251fea0b161c0b70782", + "size": 13980243, + "url": "https://dl.google.com/android/repository/cmake-3.6.4111459-linux-x86_64.zip" + }, + { + "os": "windows", + "sha1": "4c4730dc3f399b2fa9ab701112d2c439368a59a5", + "size": 10428915, + "url": "https://dl.google.com/android/repository/cmake-3.6.4111459-windows-x86_64.zip" + } + ], + "displayName": "CMake 3.6.4111459", + "license": "android-sdk-license", + "name": "cmake", + "path": "cmake/3.6.4111459", + "revision": "3.6.4111459" + } + }, + "cmdline-tools": { + "1.0": { + "archives": [ + { + "os": "linux", + "sha1": "6ffc5bd72db2c755f9b374ed829202262a6d8aaf", + "size": 81680508, + "url": "https://dl.google.com/android/repository/commandlinetools-linux-6200805_latest.zip" + }, + { + "os": "macosx", + "sha1": "23f803c07e392bb769507c88b23c2c7868cc7a6f", + "size": 81680498, + "url": "https://dl.google.com/android/repository/commandlinetools-mac-6200805_latest.zip" + }, + { + "os": "windows", + "sha1": "a863da8763de2febeb7429e7894fb65a092609db", + "size": 81665410, + "url": "https://dl.google.com/android/repository/commandlinetools-win-6200805_latest.zip" + } + ], + "displayName": "Android SDK Command-line Tools", + "license": "android-sdk-license", + "name": "cmdline-tools", + "path": "cmdline-tools/1.0", + "revision": "1.0" + }, + "2.0": { + "archives": [ + { + "os": "linux", + "sha1": "14b2114c6eae9e10686a18138d2bb468c46f8e0c", + "size": 86521858, + "url": "https://dl.google.com/android/repository/commandlinetools-linux-6514223_latest.zip" + }, + { + "os": "macosx", + "sha1": "a69c4493c4c919698989484bf0ea684550ec5217", + "size": 86522172, + "url": "https://dl.google.com/android/repository/commandlinetools-mac-6514223_latest.zip" + }, + { + "os": "windows", + "sha1": "e11b418c1d2d28589e9194915be2561f1e1e7a95", + "size": 86506760, + "url": "https://dl.google.com/android/repository/commandlinetools-win-6514223_latest.zip" + } + ], + "displayName": "Android SDK Command-line Tools", + "license": "android-sdk-license", + "name": "cmdline-tools", + "path": "cmdline-tools/2.0", + "revision": "2.0" + }, + "2.1": { + "archives": [ + { + "os": "linux", + "sha1": "9172381ff070ee2a416723c1989770cf4b0d1076", + "size": 86532348, + "url": "https://dl.google.com/android/repository/commandlinetools-linux-6609375_latest.zip" + }, + { + "os": "macosx", + "sha1": "c0c6bb9f1970bfadeaac623dfabf22c3e56baaec", + "size": 86532338, + "url": "https://dl.google.com/android/repository/commandlinetools-mac-6609375_latest.zip" + }, + { + "os": "windows", + "sha1": "e2e19c2ff584efa87ef0cfdd1987f92881323208", + "size": 86517250, + "url": "https://dl.google.com/android/repository/commandlinetools-win-6609375_latest.zip" + } + ], + "displayName": "Android SDK Command-line Tools", + "license": "android-sdk-license", + "name": "cmdline-tools", + "path": "cmdline-tools/2.1", + "revision": "2.1" + }, + "3.0": { + "archives": [ + { + "os": "linux", + "sha1": "4f4417d53923c34891f1c05f302be2ed197d6844", + "size": 87259900, + "url": "https://dl.google.com/android/repository/commandlinetools-linux-6858069_latest.zip" + }, + { + "os": "macosx", + "sha1": "4846d2aede9db06361a5f0885d03997a6199229a", + "size": 87259890, + "url": "https://dl.google.com/android/repository/commandlinetools-mac-6858069_latest.zip" + }, + { + "os": "windows", + "sha1": "f0bf21e0a13dfcc48e7b0166f44dcff49912d2ee", + "size": 87244802, + "url": "https://dl.google.com/android/repository/commandlinetools-win-6858069_latest.zip" + } + ], + "displayName": "Android SDK Command-line Tools", + "license": "android-sdk-license", + "name": "cmdline-tools", + "path": "cmdline-tools/3.0", + "revision": "3.0" + }, + "4.0-rc01": { + "archives": [ + { + "os": "linux", + "sha1": "98d3f2715f6bfbacef063d1376d7765fe5b93309", + "size": 99514756, + "url": "https://dl.google.com/android/repository/commandlinetools-linux-6987402_latest.zip" + }, + { + "os": "macosx", + "sha1": "573d312a3fdc7700d9c395d647292d90b193d4ee", + "size": 99514744, + "url": "https://dl.google.com/android/repository/commandlinetools-mac-6987402_latest.zip" + }, + { + "os": "windows", + "sha1": "72fae22d41fb8aa4f22e408e18c9d00f06050f7b", + "size": 99496635, + "url": "https://dl.google.com/android/repository/commandlinetools-win-6987402_latest.zip" + } + ], + "displayName": "Android SDK Command-line Tools", + "license": "android-sdk-preview-license", + "name": "cmdline-tools", + "path": "cmdline-tools/4.0-beta01", + "revision": "4.0-rc01" + }, + "5.0-rc01": { + "archives": [ + { + "os": "linux", + "sha1": "f06b1642396ef1e431b990dbe386d5f1e3deabcc", + "size": 102189958, + "url": "https://dl.google.com/android/repository/commandlinetools-linux-7006259_latest.zip" + }, + { + "os": "macosx", + "sha1": "0752424530724f76cb5a28de84d663e63739e6ee", + "size": 102189946, + "url": "https://dl.google.com/android/repository/commandlinetools-mac-7006259_latest.zip" + }, + { + "os": "windows", + "sha1": "6f8e359dba91af39c046a791ea32e3ca5149a078", + "size": 102171837, + "url": "https://dl.google.com/android/repository/commandlinetools-win-7006259_latest.zip" + } + ], + "displayName": "Android SDK Command-line Tools", + "license": "android-sdk-preview-license", + "name": "cmdline-tools", + "path": "cmdline-tools/5.0-alpha01", + "revision": "5.0-rc01" + } + }, + "emulator": { + "28.0.25": { + "archives": [ + { + "os": "windows", + "sha1": "6004fd05db29f8088ec89ba85c273c0bf86ef0be", + "size": 372563893, + "url": "https://dl.google.com/android/repository/emulator-windows-5395263.zip" + } + ], + "displayName": "Android Emulator", + "license": "android-sdk-license", + "name": "emulator", + "path": "emulator", + "revision": "28.0.25" + }, + "30.2.6": { + "archives": [ + { + "os": "macosx", + "sha1": "60cc4cfe372b3189679e1e08c929ff2fb793f3f6", + "size": 292634405, + "url": "https://dl.google.com/android/repository/emulator-darwin-6962233.zip" + }, + { + "os": "linux", + "sha1": "751044f953541b70a656d77343f6b0aac1153e24", + "size": 262303903, + "url": "https://dl.google.com/android/repository/emulator-linux-6962233.zip" + }, + { + "os": "windows", + "sha1": "daa448bc56199b6beeaecf5f796d26c65e5a5fb8", + "size": 258566662, + "url": "https://dl.google.com/android/repository/emulator-windows-6962233.zip" + } + ], + "displayName": "Android Emulator", + "license": "android-sdk-license", + "name": "emulator", + "path": "emulator", + "revision": "30.2.6" + }, + "30.3.4": { + "archives": [ + { + "os": "macosx", + "sha1": "7c456b3946a89d8543a070d9f643f3fe87283d68", + "size": 295125219, + "url": "https://dl.google.com/android/repository/emulator-darwin-7020230.zip" + }, + { + "os": "linux", + "sha1": "5285e71825453c83ad951b55a7a7d917a667221a", + "size": 265877671, + "url": "https://dl.google.com/android/repository/emulator-linux-7020230.zip" + }, + { + "os": "windows", + "sha1": "918b6236a57d425b7a95495cd76a2cf1aaa98560", + "size": 320221036, + "url": "https://dl.google.com/android/repository/emulator-windows-7020230.zip" + } + ], + "displayName": "Android Emulator", + "license": "android-sdk-preview-license", + "name": "emulator", + "path": "emulator", + "revision": "30.3.4" + } + }, + "extras": { + "1.1": { + "archives": [ + { + "os": "linux", + "sha1": "18632007ecb843b4fc69babd521a9b061868534b", + "size": 1307393, + "url": "https://dl.google.com/android/repository/desktop-head-unit-linux_r01.1.zip" + }, + { + "os": "macosx", + "sha1": "ccb64105888ba61ab06f20ad1ba97c71d440a421", + "size": 2299061, + "url": "https://dl.google.com/android/repository/desktop-head-unit-macosx_r01.1.zip" + }, + { + "os": "windows", + "sha1": "f26d80a84020b40e24f8a99873dea6a9c7978f10", + "size": 2615480, + "url": "https://dl.google.com/android/repository/desktop-head-unit-windows_r01.1.zip" + } + ], + "displayName": "Android Auto Desktop Head Unit Emulator", + "license": "android-sdk-license", + "name": "extras", + "path": "extras/google/auto", + "revision": "1.1" + }, + "2.0-rc1": { + "archives": [ + { + "os": "linux", + "sha1": "b480489e604371301da10731a793b234b01b8f42", + "size": 4527281, + "url": "https://dl.google.com/android/repository/desktop-head-unit-linux_r02.0.rc1.zip" + }, + { + "os": "macosx", + "sha1": "3adaf99d06eaeeb31f7bdbb62ae841e740bfc156", + "size": 5592023, + "url": "https://dl.google.com/android/repository/desktop-head-unit-macosx_r02.0.rc1.zip" + }, + { + "os": "windows", + "sha1": "e07788ed91d8e6dd3374f77da1cf78afb2664cc0", + "size": 5703857, + "url": "https://dl.google.com/android/repository/desktop-head-unit-windows_r02.0.rc1.zip" + } + ], + "displayName": "Android Auto Desktop Head Unit Emulator", + "license": "android-sdk-preview-license", + "name": "extras", + "path": "extras/google/auto", + "revision": "2.0-rc1" + } + }, + "ndk": { + "16.1.4479499": { + "archives": [ + { + "os": "macosx", + "sha1": "e51e615449b98c716cf912057e2682e75d55e2de", + "size": 839630771, + "url": "https://dl.google.com/android/repository/android-ndk-r16b-darwin-x86_64.zip" + }, + { + "os": "linux", + "sha1": "42aa43aae89a50d1c66c3f9fdecd676936da6128", + "size": 852525873, + "url": "https://dl.google.com/android/repository/android-ndk-r16b-linux-x86_64.zip" + }, + { + "os": "windows", + "sha1": "f3f1909ed1052e98dda2c79d11c22f3da28daf25", + "size": 723301086, + "url": "https://dl.google.com/android/repository/android-ndk-r16b-windows-x86_64.zip" + } + ], + "displayName": "NDK (Side by side) 16.1.4479499", + "license": "android-sdk-license", + "name": "ndk", + "path": "ndk/16.1.4479499", + "revision": "16.1.4479499" + }, + "17.2.4988734": { + "archives": [ + { + "os": "macosx", + "sha1": "f97e3d7711497e3b4faf9e7b3fa0f0da90bb649c", + "size": 675091485, + "url": "https://dl.google.com/android/repository/android-ndk-r17c-darwin-x86_64.zip" + }, + { + "os": "linux", + "sha1": "12cacc70c3fd2f40574015631c00f41fb8a39048", + "size": 709387703, + "url": "https://dl.google.com/android/repository/android-ndk-r17c-linux-x86_64.zip" + }, + { + "os": "windows", + "sha1": "3e3b8d1650f9d297d130be2b342db956003f5992", + "size": 650626501, + "url": "https://dl.google.com/android/repository/android-ndk-r17c-windows-x86_64.zip" + } + ], + "displayName": "NDK (Side by side) 17.2.4988734", + "license": "android-sdk-license", + "name": "ndk", + "path": "ndk/17.2.4988734", + "revision": "17.2.4988734" + }, + "18.1.5063045": { + "archives": [ + { + "os": "macosx", + "sha1": "98cb9909aa8c2dab32db188bbdc3ac6207e09440", + "size": 542911996, + "url": "https://dl.google.com/android/repository/android-ndk-r18b-darwin-x86_64.zip" + }, + { + "os": "linux", + "sha1": "500679655da3a86aecf67007e8ab230ea9b4dd7b", + "size": 557038702, + "url": "https://dl.google.com/android/repository/android-ndk-r18b-linux-x86_64.zip" + }, + { + "os": "windows", + "sha1": "6b6d4138aaaad7166679fdfa4780e177f95cee6f", + "size": 522489470, + "url": "https://dl.google.com/android/repository/android-ndk-r18b-windows-x86_64.zip" + } + ], + "displayName": "NDK (Side by side) 18.1.5063045", + "license": "android-sdk-license", + "name": "ndk", + "path": "ndk/18.1.5063045", + "revision": "18.1.5063045" + }, + "19.0.5232133": { + "archives": [ + { + "os": "macosx", + "sha1": "86c1a962601b23b8a6d3d535c93b4b0bc4f29249", + "size": 807592927, + "url": "https://dl.google.com/android/repository/android-ndk-r19-darwin-x86_64.zip" + }, + { + "os": "linux", + "sha1": "f02ad84cb5b6e1ff3eea9e6168037c823408c8ac", + "size": 823337344, + "url": "https://dl.google.com/android/repository/android-ndk-r19-linux-x86_64.zip" + }, + { + "os": "windows", + "sha1": "37906e8e79a9dddf6805325f706a072055e4136c", + "size": 795986424, + "url": "https://dl.google.com/android/repository/android-ndk-r19-windows-x86_64.zip" + } + ], + "displayName": "NDK (Side by side) 19.0.5232133", + "license": "android-sdk-license", + "name": "ndk", + "path": "ndk/19.0.5232133", + "revision": "19.0.5232133" + }, + "19.2.5345600": { + "archives": [ + { + "os": "macosx", + "sha1": "f46b8193109bba8a58e0461c1a48f4534051fb25", + "size": 807630656, + "url": "https://dl.google.com/android/repository/android-ndk-r19c-darwin-x86_64.zip" + }, + { + "os": "linux", + "sha1": "fd94d0be6017c6acbd193eb95e09cf4b6f61b834", + "size": 823376982, + "url": "https://dl.google.com/android/repository/android-ndk-r19c-linux-x86_64.zip" + }, + { + "os": "windows", + "sha1": "c4cd8c0b6e7618ca0a871a5f24102e40c239f6a3", + "size": 796051997, + "url": "https://dl.google.com/android/repository/android-ndk-r19c-windows-x86_64.zip" + } + ], + "displayName": "NDK (Side by side) 19.2.5345600", + "license": "android-sdk-license", + "name": "ndk", + "path": "ndk/19.2.5345600", + "revision": "19.2.5345600" + }, + "20.0.5392854-rc2": { + "archives": [ + { + "os": "macosx", + "sha1": "cd94191ace6b31ec9af1cc370173e16934e1cb8b", + "size": 840834121, + "url": "https://dl.google.com/android/repository/android-ndk-r20-beta2-darwin-x86_64.zip" + }, + { + "os": "linux", + "sha1": "8285ae2e24a7232fd0cbfb55e955c8586ef2ee02", + "size": 857406412, + "url": "https://dl.google.com/android/repository/android-ndk-r20-beta2-linux-x86_64.zip" + }, + { + "os": "windows", + "sha1": "c89022bd9a2c32b42a1b94e98bbd88ab4c4e350e", + "size": 830099430, + "url": "https://dl.google.com/android/repository/android-ndk-r20-beta2-windows-x86_64.zip" + } + ], + "displayName": "NDK (Side by side) 20.0.5392854", + "license": "android-sdk-preview-license", + "name": "ndk", + "path": "ndk/20.0.5392854", + "revision": "20.0.5392854-rc2" + }, + "20.0.5471264-rc3": { + "archives": [ + { + "os": "macosx", + "sha1": "665a035cadb0dd03e6502ba25c18643f6e4ede24", + "size": 843617071, + "url": "https://dl.google.com/android/repository/android-ndk-r20-beta3-darwin-x86_64.zip" + }, + { + "os": "linux", + "sha1": "674d8fb0e0df8e8be1c31fa321eb176548a19ba3", + "size": 860198768, + "url": "https://dl.google.com/android/repository/android-ndk-r20-beta3-linux-x86_64.zip" + }, + { + "os": "windows", + "sha1": "9375dc82cf576f4a255bf908dfc628d8ddee0d89", + "size": 832889871, + "url": "https://dl.google.com/android/repository/android-ndk-r20-beta3-windows-x86_64.zip" + } + ], + "displayName": "NDK (Side by side) 20.0.5471264", + "license": "android-sdk-preview-license", + "name": "ndk", + "path": "ndk/20.0.5471264", + "revision": "20.0.5471264-rc3" + }, + "20.0.5594570": { + "archives": [ + { + "os": "macosx", + "sha1": "96d5f1c50452596912d1982439c514194b5751e6", + "size": 843152912, + "url": "https://dl.google.com/android/repository/android-ndk-r20-darwin-x86_64.zip" + }, + { + "os": "linux", + "sha1": "8665fc84a1b1f0d6ab3b5fdd1e30200cc7b9adff", + "size": 859737910, + "url": "https://dl.google.com/android/repository/android-ndk-r20-linux-x86_64.zip" + }, + { + "os": "windows", + "sha1": "36e1dc77fad08ad2498fb94b13ad8caf26bbd9df", + "size": 832429986, + "url": "https://dl.google.com/android/repository/android-ndk-r20-windows-x86_64.zip" + } + ], + "displayName": "NDK (Side by side) 20.0.5594570", + "license": "android-sdk-license", + "name": "ndk", + "path": "ndk/20.0.5594570", + "revision": "20.0.5594570" + }, + "20.1.5948944": { + "archives": [ + { + "os": "macosx", + "sha1": "b51290ab69cb89de1f0ba108702277bc333b38be", + "size": 843201217, + "url": "https://dl.google.com/android/repository/android-ndk-r20b-darwin-x86_64.zip" + }, + { + "os": "linux", + "sha1": "d903fdf077039ad9331fb6c3bee78aa46d45527b", + "size": 859780564, + "url": "https://dl.google.com/android/repository/android-ndk-r20b-linux-x86_64.zip" + }, + { + "os": "windows", + "sha1": "ead0846608040b8344ad2bc9bc721b88cf13fb8d", + "size": 832473103, + "url": "https://dl.google.com/android/repository/android-ndk-r20b-windows-x86_64.zip" + } + ], + "displayName": "NDK (Side by side) 20.1.5948944", + "license": "android-sdk-license", + "name": "ndk", + "path": "ndk/20.1.5948944", + "revision": "20.1.5948944" + }, + "21.0.6011959-rc2": { + "archives": [ + { + "os": "macosx", + "sha1": "34a46c3867c9d87a80895c0b8a098256052536d2", + "size": 958791657, + "url": "https://dl.google.com/android/repository/android-ndk-r21-beta2-darwin-x86_64.zip" + }, + { + "os": "linux", + "sha1": "335f30302bee700a9a5fdfe3ae533a4963499c44", + "size": 1043467643, + "url": "https://dl.google.com/android/repository/android-ndk-r21-beta2-linux-x86_64.zip" + }, + { + "os": "windows", + "sha1": "e5902e4f6c5b6f0354a2572a85f42f19c1a7b9d8", + "size": 1057424857, + "url": "https://dl.google.com/android/repository/android-ndk-r21-beta2-windows-x86_64.zip" + } + ], + "displayName": "NDK (Side by side) 21.0.6011959", + "license": "android-sdk-preview-license", + "name": "ndk", + "path": "ndk/21.0.6011959", + "revision": "21.0.6011959-rc2" + }, + "21.0.6113669": { + "archives": [ + { + "os": "macosx", + "sha1": "0d50636cc0e34ed3ba540d6d5818ea0cf10f16aa", + "size": 958656601, + "url": "https://dl.google.com/android/repository/android-ndk-r21-darwin-x86_64.zip" + }, + { + "os": "linux", + "sha1": "afc9c0b9faad222898ac8168c78ad4ccac8a1b5c", + "size": 1043332542, + "url": "https://dl.google.com/android/repository/android-ndk-r21-linux-x86_64.zip" + }, + { + "os": "windows", + "sha1": "c61631eacbd40c30273b716a4e589c6877b85419", + "size": 1057294207, + "url": "https://dl.google.com/android/repository/android-ndk-r21-windows-x86_64.zip" + } + ], + "displayName": "NDK (Side by side) 21.0.6113669", + "license": "android-sdk-license", + "name": "ndk", + "path": "ndk/21.0.6113669", + "revision": "21.0.6113669" + }, + "21.1.6210238-rc1": { + "archives": [ + { + "os": "macosx", + "sha1": "971609f9a579ebbcb8d121a5d5aa0cba716b2d1f", + "size": 987084422, + "url": "https://dl.google.com/android/repository/android-ndk-r21b-beta1-darwin-x86_64.zip" + }, + { + "os": "linux", + "sha1": "cf06ed408663c11c8f4824f9370c7a900ec074dd", + "size": 1071756532, + "url": "https://dl.google.com/android/repository/android-ndk-r21b-beta1-linux-x86_64.zip" + }, + { + "os": "windows", + "sha1": "a920ca1ab75733b510180cef23f3797ded40dbb7", + "size": 1087478202, + "url": "https://dl.google.com/android/repository/android-ndk-r21b-beta1-windows-x86_64.zip" + } + ], + "displayName": "NDK (Side by side) 21.1.6210238", + "license": "android-sdk-preview-license", + "name": "ndk", + "path": "ndk/21.1.6210238", + "revision": "21.1.6210238-rc1" + }, + "21.1.6273396-rc2": { + "archives": [ + { + "os": "macosx", + "sha1": "41110daad93e6a9a3662d7dd2fb233b21be3d27e", + "size": 987112894, + "url": "https://dl.google.com/android/repository/android-ndk-r21b-beta2-darwin-x86_64.zip" + }, + { + "os": "linux", + "sha1": "b9a6463ab72ad183c89e5316f0c5493f64b54966", + "size": 1071784976, + "url": "https://dl.google.com/android/repository/android-ndk-r21b-beta2-linux-x86_64.zip" + }, + { + "os": "windows", + "sha1": "dc6dc614cbd94b345b66f85d3f867638593fb199", + "size": 1087508597, + "url": "https://dl.google.com/android/repository/android-ndk-r21b-beta2-windows-x86_64.zip" + } + ], + "displayName": "NDK (Side by side) 21.1.6273396", + "license": "android-sdk-preview-license", + "name": "ndk", + "path": "ndk/21.1.6273396", + "revision": "21.1.6273396-rc2" + }, + "21.1.6352462": { + "archives": [ + { + "os": "macosx", + "sha1": "e1de2f749c5c32ae991c3ccaabfcdf7688ee221f", + "size": 1014473187, + "url": "https://dl.google.com/android/repository/android-ndk-r21b-darwin-x86_64.zip" + }, + { + "os": "linux", + "sha1": "50250fcba479de477b45801e2699cca47f7e1267", + "size": 1162377080, + "url": "https://dl.google.com/android/repository/android-ndk-r21b-linux-x86_64.zip" + }, + { + "os": "windows", + "sha1": "6809fac4a6e829f4bac64628fa9835d57bbd61a8", + "size": 1079474640, + "url": "https://dl.google.com/android/repository/android-ndk-r21b-windows-x86_64.zip" + } + ], + "displayName": "NDK (Side by side) 21.1.6352462", + "license": "android-sdk-license", + "name": "ndk", + "path": "ndk/21.1.6352462", + "revision": "21.1.6352462" + }, + "21.1.6363665-rc3": { + "archives": [ + { + "os": "macosx", + "sha1": "767f722c14dd27a22b17903e09b768407131129e", + "size": 1042902819, + "url": "https://dl.google.com/android/repository/android-ndk-r21b-beta3-darwin-x86_64.zip" + }, + { + "os": "linux", + "sha1": "29139085aa402d6b27d4394c30e797f814876d1e", + "size": 1190809917, + "url": "https://dl.google.com/android/repository/android-ndk-r21b-beta3-linux-x86_64.zip" + }, + { + "os": "windows", + "sha1": "8ecb03c728b8dc814db30c8152c4436cb1536c8d", + "size": 1109667800, + "url": "https://dl.google.com/android/repository/android-ndk-r21b-beta3-windows-x86_64.zip" + } + ], + "displayName": "NDK (Side by side) 21.1.6363665", + "license": "android-sdk-preview-license", + "name": "ndk", + "path": "ndk/21.1.6363665", + "revision": "21.1.6363665-rc3" + }, + "21.2.6472646": { + "archives": [ + { + "os": "macosx", + "sha1": "c42a836f6697a4ef8b927813d5f7dd12e974cfba", + "size": 1014322452, + "url": "https://dl.google.com/android/repository/android-ndk-r21c-darwin-x86_64.zip" + }, + { + "os": "linux", + "sha1": "c81a5bcb4672a18d3647bf6898cd4dbcb978d0e8", + "size": 1162375023, + "url": "https://dl.google.com/android/repository/android-ndk-r21c-linux-x86_64.zip" + }, + { + "os": "windows", + "sha1": "93563a1297a60b5da49a48f62340dbf0c878a5f3", + "size": 1079490351, + "url": "https://dl.google.com/android/repository/android-ndk-r21c-windows-x86_64.zip" + } + ], + "displayName": "NDK (Side by side) 21.2.6472646", + "license": "android-sdk-license", + "name": "ndk", + "path": "ndk/21.2.6472646", + "revision": "21.2.6472646" + }, + "21.3.6528147": { + "archives": [ + { + "os": "macosx", + "sha1": "ef06c9f9d7efd6f243eb3c05ac440562ae29ae12", + "size": 1042615469, + "url": "https://dl.google.com/android/repository/android-ndk-r21d-darwin-x86_64.zip" + }, + { + "os": "linux", + "sha1": "bcf4023eb8cb6976a4c7cff0a8a8f145f162bf4d", + "size": 1190667841, + "url": "https://dl.google.com/android/repository/android-ndk-r21d-linux-x86_64.zip" + }, + { + "os": "windows", + "sha1": "99175ce1210258f2280568cd340e0666c69955c7", + "size": 1109536102, + "url": "https://dl.google.com/android/repository/android-ndk-r21d-windows-x86_64.zip" + } + ], + "displayName": "NDK (Side by side) 21.3.6528147", + "license": "android-sdk-license", + "name": "ndk", + "path": "ndk/21.3.6528147", + "revision": "21.3.6528147" + }, + "22.0.6917172-rc1": { + "archives": [ + { + "os": "macosx", + "sha1": "0ff242f820663fe45773bca7a2df036004fc7c69", + "size": 1047697781, + "url": "https://dl.google.com/android/repository/android-ndk-r22-beta1-darwin-x86_64.zip" + }, + { + "os": "linux", + "sha1": "687f696f43b23e2623e7f7073bbd575d254f66f6", + "size": 1146575022, + "url": "https://dl.google.com/android/repository/android-ndk-r22-beta1-linux-x86_64.zip" + }, + { + "os": "windows", + "sha1": "ef38999c0e3c96124acffab6971ad2054a433b91", + "size": 1080588810, + "url": "https://dl.google.com/android/repository/android-ndk-r22-beta1-windows-x86_64.zip" + } + ], + "displayName": "NDK (Side by side) 22.0.6917172", + "license": "android-sdk-preview-license", + "name": "ndk", + "path": "ndk/22.0.6917172", + "revision": "22.0.6917172-rc1" + }, + "22.0.7026061": { + "archives": [ + { + "os": "macosx", + "sha1": "9cf3816ed3e4308ff03bd5f69100b373bad12f13", + "size": 1047577432, + "url": "https://dl.google.com/android/repository/android-ndk-r22-darwin-x86_64.zip" + }, + { + "os": "linux", + "sha1": "82274313aba10da6177fd41868f56a0f9651dd81", + "size": 1146450986, + "url": "https://dl.google.com/android/repository/android-ndk-r22-linux-x86_64.zip" + }, + { + "os": "windows", + "sha1": "c03f761caf1c6f5efbeb5ccfa573ea922cb955b3", + "size": 1080471370, + "url": "https://dl.google.com/android/repository/android-ndk-r22-windows-x86_64.zip" + } + ], + "displayName": "NDK (Side by side) 22.0.7026061", + "license": "android-sdk-license", + "name": "ndk", + "path": "ndk/22.0.7026061", + "revision": "22.0.7026061" + } + }, + "ndk-bundle": { + "16.1.4479499": { + "archives": [ + { + "os": "macosx", + "sha1": "e51e615449b98c716cf912057e2682e75d55e2de", + "size": 839630771, + "url": "https://dl.google.com/android/repository/android-ndk-r16b-darwin-x86_64.zip" + }, + { + "os": "linux", + "sha1": "42aa43aae89a50d1c66c3f9fdecd676936da6128", + "size": 852525873, + "url": "https://dl.google.com/android/repository/android-ndk-r16b-linux-x86_64.zip" + }, + { + "os": "windows", + "sha1": "f3f1909ed1052e98dda2c79d11c22f3da28daf25", + "size": 723301086, + "url": "https://dl.google.com/android/repository/android-ndk-r16b-windows-x86_64.zip" + } + ], + "displayName": "NDK", + "license": "android-sdk-license", + "name": "ndk-bundle", + "path": "ndk-bundle", + "revision": "16.1.4479499" + }, + "17.2.4988734": { + "archives": [ + { + "os": "macosx", + "sha1": "f97e3d7711497e3b4faf9e7b3fa0f0da90bb649c", + "size": 675091485, + "url": "https://dl.google.com/android/repository/android-ndk-r17c-darwin-x86_64.zip" + }, + { + "os": "linux", + "sha1": "12cacc70c3fd2f40574015631c00f41fb8a39048", + "size": 709387703, + "url": "https://dl.google.com/android/repository/android-ndk-r17c-linux-x86_64.zip" + }, + { + "os": "windows", + "sha1": "3e3b8d1650f9d297d130be2b342db956003f5992", + "size": 650626501, + "url": "https://dl.google.com/android/repository/android-ndk-r17c-windows-x86_64.zip" + } + ], + "displayName": "NDK", + "license": "android-sdk-license", + "name": "ndk-bundle", + "path": "ndk-bundle", + "revision": "17.2.4988734" + }, + "18.1.5063045": { + "archives": [ + { + "os": "macosx", + "sha1": "98cb9909aa8c2dab32db188bbdc3ac6207e09440", + "size": 542911996, + "url": "https://dl.google.com/android/repository/android-ndk-r18b-darwin-x86_64.zip" + }, + { + "os": "linux", + "sha1": "500679655da3a86aecf67007e8ab230ea9b4dd7b", + "size": 557038702, + "url": "https://dl.google.com/android/repository/android-ndk-r18b-linux-x86_64.zip" + }, + { + "os": "windows", + "sha1": "6b6d4138aaaad7166679fdfa4780e177f95cee6f", + "size": 522489470, + "url": "https://dl.google.com/android/repository/android-ndk-r18b-windows-x86_64.zip" + } + ], + "displayName": "NDK", + "license": "android-sdk-license", + "name": "ndk-bundle", + "path": "ndk-bundle", + "revision": "18.1.5063045" + }, + "19.0.5232133": { + "archives": [ + { + "os": "macosx", + "sha1": "86c1a962601b23b8a6d3d535c93b4b0bc4f29249", + "size": 807592927, + "url": "https://dl.google.com/android/repository/android-ndk-r19-darwin-x86_64.zip" + }, + { + "os": "linux", + "sha1": "f02ad84cb5b6e1ff3eea9e6168037c823408c8ac", + "size": 823337344, + "url": "https://dl.google.com/android/repository/android-ndk-r19-linux-x86_64.zip" + }, + { + "os": "windows", + "sha1": "37906e8e79a9dddf6805325f706a072055e4136c", + "size": 795986424, + "url": "https://dl.google.com/android/repository/android-ndk-r19-windows-x86_64.zip" + } + ], + "displayName": "NDK", + "license": "android-sdk-license", + "name": "ndk-bundle", + "path": "ndk-bundle", + "revision": "19.0.5232133" + }, + "19.2.5345600": { + "archives": [ + { + "os": "macosx", + "sha1": "f46b8193109bba8a58e0461c1a48f4534051fb25", + "size": 807630656, + "url": "https://dl.google.com/android/repository/android-ndk-r19c-darwin-x86_64.zip" + }, + { + "os": "linux", + "sha1": "fd94d0be6017c6acbd193eb95e09cf4b6f61b834", + "size": 823376982, + "url": "https://dl.google.com/android/repository/android-ndk-r19c-linux-x86_64.zip" + }, + { + "os": "windows", + "sha1": "c4cd8c0b6e7618ca0a871a5f24102e40c239f6a3", + "size": 796051997, + "url": "https://dl.google.com/android/repository/android-ndk-r19c-windows-x86_64.zip" + } + ], + "displayName": "NDK", + "license": "android-sdk-license", + "name": "ndk-bundle", + "path": "ndk-bundle", + "revision": "19.2.5345600" + }, + "20.0.5392854-rc2": { + "archives": [ + { + "os": "macosx", + "sha1": "cd94191ace6b31ec9af1cc370173e16934e1cb8b", + "size": 840834121, + "url": "https://dl.google.com/android/repository/android-ndk-r20-beta2-darwin-x86_64.zip" + }, + { + "os": "linux", + "sha1": "8285ae2e24a7232fd0cbfb55e955c8586ef2ee02", + "size": 857406412, + "url": "https://dl.google.com/android/repository/android-ndk-r20-beta2-linux-x86_64.zip" + }, + { + "os": "windows", + "sha1": "c89022bd9a2c32b42a1b94e98bbd88ab4c4e350e", + "size": 830099430, + "url": "https://dl.google.com/android/repository/android-ndk-r20-beta2-windows-x86_64.zip" + } + ], + "displayName": "NDK", + "license": "android-sdk-preview-license", + "name": "ndk-bundle", + "path": "ndk-bundle", + "revision": "20.0.5392854-rc2" + }, + "20.0.5471264-rc3": { + "archives": [ + { + "os": "macosx", + "sha1": "665a035cadb0dd03e6502ba25c18643f6e4ede24", + "size": 843617071, + "url": "https://dl.google.com/android/repository/android-ndk-r20-beta3-darwin-x86_64.zip" + }, + { + "os": "linux", + "sha1": "674d8fb0e0df8e8be1c31fa321eb176548a19ba3", + "size": 860198768, + "url": "https://dl.google.com/android/repository/android-ndk-r20-beta3-linux-x86_64.zip" + }, + { + "os": "windows", + "sha1": "9375dc82cf576f4a255bf908dfc628d8ddee0d89", + "size": 832889871, + "url": "https://dl.google.com/android/repository/android-ndk-r20-beta3-windows-x86_64.zip" + } + ], + "displayName": "NDK", + "license": "android-sdk-preview-license", + "name": "ndk-bundle", + "path": "ndk-bundle", + "revision": "20.0.5471264-rc3" + }, + "20.0.5594570": { + "archives": [ + { + "os": "macosx", + "sha1": "96d5f1c50452596912d1982439c514194b5751e6", + "size": 843152912, + "url": "https://dl.google.com/android/repository/android-ndk-r20-darwin-x86_64.zip" + }, + { + "os": "linux", + "sha1": "8665fc84a1b1f0d6ab3b5fdd1e30200cc7b9adff", + "size": 859737910, + "url": "https://dl.google.com/android/repository/android-ndk-r20-linux-x86_64.zip" + }, + { + "os": "windows", + "sha1": "36e1dc77fad08ad2498fb94b13ad8caf26bbd9df", + "size": 832429986, + "url": "https://dl.google.com/android/repository/android-ndk-r20-windows-x86_64.zip" + } + ], + "displayName": "NDK", + "license": "android-sdk-license", + "name": "ndk-bundle", + "path": "ndk-bundle", + "revision": "20.0.5594570" + }, + "20.1.5948944": { + "archives": [ + { + "os": "macosx", + "sha1": "b51290ab69cb89de1f0ba108702277bc333b38be", + "size": 843201217, + "url": "https://dl.google.com/android/repository/android-ndk-r20b-darwin-x86_64.zip" + }, + { + "os": "linux", + "sha1": "d903fdf077039ad9331fb6c3bee78aa46d45527b", + "size": 859780564, + "url": "https://dl.google.com/android/repository/android-ndk-r20b-linux-x86_64.zip" + }, + { + "os": "windows", + "sha1": "ead0846608040b8344ad2bc9bc721b88cf13fb8d", + "size": 832473103, + "url": "https://dl.google.com/android/repository/android-ndk-r20b-windows-x86_64.zip" + } + ], + "displayName": "NDK", + "license": "android-sdk-license", + "name": "ndk-bundle", + "path": "ndk-bundle", + "revision": "20.1.5948944" + }, + "21.0.6011959-rc2": { + "archives": [ + { + "os": "macosx", + "sha1": "34a46c3867c9d87a80895c0b8a098256052536d2", + "size": 958791657, + "url": "https://dl.google.com/android/repository/android-ndk-r21-beta2-darwin-x86_64.zip" + }, + { + "os": "linux", + "sha1": "335f30302bee700a9a5fdfe3ae533a4963499c44", + "size": 1043467643, + "url": "https://dl.google.com/android/repository/android-ndk-r21-beta2-linux-x86_64.zip" + }, + { + "os": "windows", + "sha1": "e5902e4f6c5b6f0354a2572a85f42f19c1a7b9d8", + "size": 1057424857, + "url": "https://dl.google.com/android/repository/android-ndk-r21-beta2-windows-x86_64.zip" + } + ], + "displayName": "NDK", + "license": "android-sdk-preview-license", + "name": "ndk-bundle", + "path": "ndk-bundle", + "revision": "21.0.6011959-rc2" + }, + "21.0.6113669": { + "archives": [ + { + "os": "macosx", + "sha1": "0d50636cc0e34ed3ba540d6d5818ea0cf10f16aa", + "size": 958656601, + "url": "https://dl.google.com/android/repository/android-ndk-r21-darwin-x86_64.zip" + }, + { + "os": "linux", + "sha1": "afc9c0b9faad222898ac8168c78ad4ccac8a1b5c", + "size": 1043332542, + "url": "https://dl.google.com/android/repository/android-ndk-r21-linux-x86_64.zip" + }, + { + "os": "windows", + "sha1": "c61631eacbd40c30273b716a4e589c6877b85419", + "size": 1057294207, + "url": "https://dl.google.com/android/repository/android-ndk-r21-windows-x86_64.zip" + } + ], + "displayName": "NDK", + "license": "android-sdk-license", + "name": "ndk-bundle", + "path": "ndk-bundle", + "revision": "21.0.6113669" + }, + "21.1.6210238-rc1": { + "archives": [ + { + "os": "macosx", + "sha1": "971609f9a579ebbcb8d121a5d5aa0cba716b2d1f", + "size": 987084422, + "url": "https://dl.google.com/android/repository/android-ndk-r21b-beta1-darwin-x86_64.zip" + }, + { + "os": "linux", + "sha1": "cf06ed408663c11c8f4824f9370c7a900ec074dd", + "size": 1071756532, + "url": "https://dl.google.com/android/repository/android-ndk-r21b-beta1-linux-x86_64.zip" + }, + { + "os": "windows", + "sha1": "a920ca1ab75733b510180cef23f3797ded40dbb7", + "size": 1087478202, + "url": "https://dl.google.com/android/repository/android-ndk-r21b-beta1-windows-x86_64.zip" + } + ], + "displayName": "NDK", + "license": "android-sdk-preview-license", + "name": "ndk-bundle", + "path": "ndk-bundle", + "revision": "21.1.6210238-rc1" + }, + "21.1.6273396-rc2": { + "archives": [ + { + "os": "macosx", + "sha1": "41110daad93e6a9a3662d7dd2fb233b21be3d27e", + "size": 987112894, + "url": "https://dl.google.com/android/repository/android-ndk-r21b-beta2-darwin-x86_64.zip" + }, + { + "os": "linux", + "sha1": "b9a6463ab72ad183c89e5316f0c5493f64b54966", + "size": 1071784976, + "url": "https://dl.google.com/android/repository/android-ndk-r21b-beta2-linux-x86_64.zip" + }, + { + "os": "windows", + "sha1": "dc6dc614cbd94b345b66f85d3f867638593fb199", + "size": 1087508597, + "url": "https://dl.google.com/android/repository/android-ndk-r21b-beta2-windows-x86_64.zip" + } + ], + "displayName": "NDK", + "license": "android-sdk-preview-license", + "name": "ndk-bundle", + "path": "ndk-bundle", + "revision": "21.1.6273396-rc2" + }, + "21.1.6352462": { + "archives": [ + { + "os": "macosx", + "sha1": "e1de2f749c5c32ae991c3ccaabfcdf7688ee221f", + "size": 1014473187, + "url": "https://dl.google.com/android/repository/android-ndk-r21b-darwin-x86_64.zip" + }, + { + "os": "linux", + "sha1": "50250fcba479de477b45801e2699cca47f7e1267", + "size": 1162377080, + "url": "https://dl.google.com/android/repository/android-ndk-r21b-linux-x86_64.zip" + }, + { + "os": "windows", + "sha1": "6809fac4a6e829f4bac64628fa9835d57bbd61a8", + "size": 1079474640, + "url": "https://dl.google.com/android/repository/android-ndk-r21b-windows-x86_64.zip" + } + ], + "displayName": "NDK", + "license": "android-sdk-license", + "name": "ndk-bundle", + "path": "ndk-bundle", + "revision": "21.1.6352462" + }, + "21.1.6363665-rc3": { + "archives": [ + { + "os": "macosx", + "sha1": "767f722c14dd27a22b17903e09b768407131129e", + "size": 1042902819, + "url": "https://dl.google.com/android/repository/android-ndk-r21b-beta3-darwin-x86_64.zip" + }, + { + "os": "linux", + "sha1": "29139085aa402d6b27d4394c30e797f814876d1e", + "size": 1190809917, + "url": "https://dl.google.com/android/repository/android-ndk-r21b-beta3-linux-x86_64.zip" + }, + { + "os": "windows", + "sha1": "8ecb03c728b8dc814db30c8152c4436cb1536c8d", + "size": 1109667800, + "url": "https://dl.google.com/android/repository/android-ndk-r21b-beta3-windows-x86_64.zip" + } + ], + "displayName": "NDK", + "license": "android-sdk-preview-license", + "name": "ndk-bundle", + "path": "ndk-bundle", + "revision": "21.1.6363665-rc3" + }, + "21.2.6472646": { + "archives": [ + { + "os": "macosx", + "sha1": "c42a836f6697a4ef8b927813d5f7dd12e974cfba", + "size": 1014322452, + "url": "https://dl.google.com/android/repository/android-ndk-r21c-darwin-x86_64.zip" + }, + { + "os": "linux", + "sha1": "c81a5bcb4672a18d3647bf6898cd4dbcb978d0e8", + "size": 1162375023, + "url": "https://dl.google.com/android/repository/android-ndk-r21c-linux-x86_64.zip" + }, + { + "os": "windows", + "sha1": "93563a1297a60b5da49a48f62340dbf0c878a5f3", + "size": 1079490351, + "url": "https://dl.google.com/android/repository/android-ndk-r21c-windows-x86_64.zip" + } + ], + "displayName": "NDK", + "license": "android-sdk-license", + "name": "ndk-bundle", + "path": "ndk-bundle", + "revision": "21.2.6472646" + }, + "21.3.6528147": { + "archives": [ + { + "os": "macosx", + "sha1": "ef06c9f9d7efd6f243eb3c05ac440562ae29ae12", + "size": 1042615469, + "url": "https://dl.google.com/android/repository/android-ndk-r21d-darwin-x86_64.zip" + }, + { + "os": "linux", + "sha1": "bcf4023eb8cb6976a4c7cff0a8a8f145f162bf4d", + "size": 1190667841, + "url": "https://dl.google.com/android/repository/android-ndk-r21d-linux-x86_64.zip" + }, + { + "os": "windows", + "sha1": "99175ce1210258f2280568cd340e0666c69955c7", + "size": 1109536102, + "url": "https://dl.google.com/android/repository/android-ndk-r21d-windows-x86_64.zip" + } + ], + "displayName": "NDK", + "license": "android-sdk-license", + "name": "ndk-bundle", + "path": "ndk-bundle", + "revision": "21.3.6528147" + }, + "22.0.6917172-rc1": { + "archives": [ + { + "os": "macosx", + "sha1": "0ff242f820663fe45773bca7a2df036004fc7c69", + "size": 1047697781, + "url": "https://dl.google.com/android/repository/android-ndk-r22-beta1-darwin-x86_64.zip" + }, + { + "os": "linux", + "sha1": "687f696f43b23e2623e7f7073bbd575d254f66f6", + "size": 1146575022, + "url": "https://dl.google.com/android/repository/android-ndk-r22-beta1-linux-x86_64.zip" + }, + { + "os": "windows", + "sha1": "ef38999c0e3c96124acffab6971ad2054a433b91", + "size": 1080588810, + "url": "https://dl.google.com/android/repository/android-ndk-r22-beta1-windows-x86_64.zip" + } + ], + "displayName": "NDK", + "license": "android-sdk-preview-license", + "name": "ndk-bundle", + "path": "ndk-bundle", + "revision": "22.0.6917172-rc1" + }, + "22.0.7026061": { + "archives": [ + { + "os": "macosx", + "sha1": "9cf3816ed3e4308ff03bd5f69100b373bad12f13", + "size": 1047577432, + "url": "https://dl.google.com/android/repository/android-ndk-r22-darwin-x86_64.zip" + }, + { + "os": "linux", + "sha1": "82274313aba10da6177fd41868f56a0f9651dd81", + "size": 1146450986, + "url": "https://dl.google.com/android/repository/android-ndk-r22-linux-x86_64.zip" + }, + { + "os": "windows", + "sha1": "c03f761caf1c6f5efbeb5ccfa573ea922cb955b3", + "size": 1080471370, + "url": "https://dl.google.com/android/repository/android-ndk-r22-windows-x86_64.zip" + } + ], + "displayName": "NDK", + "license": "android-sdk-license", + "name": "ndk-bundle", + "path": "ndk-bundle", + "revision": "22.0.7026061" + } + }, + "patcher": { + "1": { + "archives": [ + { + "os": "all", + "sha1": "046699c5e2716ae11d77e0bad814f7f33fab261e", + "size": 1827327, + "url": "https://dl.google.com/android/repository/3534162-studio.sdk-patcher.zip" + } + ], + "displayName": "SDK Patch Applier v4", + "license": "android-sdk-license", + "name": "patcher", + "path": "patcher/v4", + "revision": "1" + } + }, + "platform-tools": { + "30.0.5": { + "archives": [ + { + "os": "macosx", + "sha1": "6f77800c35f27dc8e014a214e656aae17c7ea2d0", + "size": 13311295, + "url": "https://dl.google.com/android/repository/eabcd8b4b7ab518c6af9c941af8494072f17ec4b.platform-tools_r30.0.5-darwin.zip" + }, + { + "os": "linux", + "sha1": "ba07433b8e34c2a51c250033abcd1442a28d0863", + "size": 13338136, + "url": "https://dl.google.com/android/repository/platform-tools_r30.0.5-linux.zip" + }, + { + "os": "windows", + "sha1": "e66c951841f78f225e36cfae74e81712a704a37a", + "size": 12328924, + "url": "https://dl.google.com/android/repository/platform-tools_r30.0.5-windows.zip" + } + ], + "displayName": "Android SDK Platform-Tools", + "license": "android-sdk-license", + "name": "platform-tools", + "path": "platform-tools", + "revision": "30.0.5" + } + }, + "platforms": { + "10": { + "archives": [ + { + "os": "all", + "sha1": "887e37783ec32f541ea33c2c649dda648e8e6fb3", + "size": 85470907, + "url": "https://dl.google.com/android/repository/android-2.3.3_r02.zip" + } + ], + "displayName": "Android SDK Platform 10", + "license": "android-sdk-license", + "name": "platforms", + "path": "platforms/android-10", + "revision": "10" + }, + "11": { + "archives": [ + { + "os": "all", + "sha1": "2c7d4bd13f276e76f6bbd87315fe27aba351dd37", + "size": 104513908, + "url": "https://dl.google.com/android/repository/android-3.0_r02.zip" + } + ], + "displayName": "Android SDK Platform 11", + "license": "android-sdk-license", + "name": "platforms", + "path": "platforms/android-11", + "revision": "11" + }, + "12": { + "archives": [ + { + "os": "all", + "sha1": "4a50a6679cd95bb68bb5fc032e754cd7c5e2b1bf", + "size": 106472351, + "url": "https://dl.google.com/android/repository/android-3.1_r03.zip" + } + ], + "displayName": "Android SDK Platform 12", + "license": "android-sdk-license", + "name": "platforms", + "path": "platforms/android-12", + "revision": "12" + }, + "13": { + "archives": [ + { + "os": "all", + "sha1": "6189a500a8c44ae73a439604363de93591163cd9", + "size": 108426536, + "url": "https://dl.google.com/android/repository/android-3.2_r01.zip" + } + ], + "displayName": "Android SDK Platform 13", + "license": "android-sdk-license", + "name": "platforms", + "path": "platforms/android-13", + "revision": "13" + }, + "14": { + "archives": [ + { + "os": "all", + "sha1": "d4f1d8fbca25225b5f0e7a0adf0d39c3d6e60b3c", + "size": 46038082, + "url": "https://dl.google.com/android/repository/android-14_r04.zip" + } + ], + "displayName": "Android SDK Platform 14", + "license": "android-sdk-license", + "name": "platforms", + "path": "platforms/android-14", + "revision": "14" + }, + "15": { + "archives": [ + { + "os": "all", + "sha1": "69ab4c443b37184b2883af1fd38cc20cbeffd0f3", + "size": 44533475, + "url": "https://dl.google.com/android/repository/android-15_r05.zip" + } + ], + "displayName": "Android SDK Platform 15", + "license": "android-sdk-license", + "name": "platforms", + "path": "platforms/android-15", + "revision": "15" + }, + "16": { + "archives": [ + { + "os": "all", + "sha1": "12a5ce6235a76bc30f62c26bda1b680e336abd07", + "size": 48128695, + "url": "https://dl.google.com/android/repository/android-16_r05.zip" + } + ], + "displayName": "Android SDK Platform 16", + "license": "android-sdk-license", + "name": "platforms", + "path": "platforms/android-16", + "revision": "16" + }, + "17": { + "archives": [ + { + "os": "all", + "sha1": "dbe14101c06e6cdb34e300393e64e64f8c92168a", + "size": 57030216, + "url": "https://dl.google.com/android/repository/android-17_r03.zip" + } + ], + "displayName": "Android SDK Platform 17", + "license": "android-sdk-license", + "name": "platforms", + "path": "platforms/android-17", + "revision": "17" + }, + "18": { + "archives": [ + { + "os": "all", + "sha1": "e6b09b3505754cbbeb4a5622008b907262ee91cb", + "size": 57771739, + "url": "https://dl.google.com/android/repository/android-18_r03.zip" + } + ], + "displayName": "Android SDK Platform 18", + "license": "android-sdk-license", + "name": "platforms", + "path": "platforms/android-18", + "revision": "18" + }, + "19": { + "archives": [ + { + "os": "all", + "sha1": "2ff20d89e68f2f5390981342e009db5a2d456aaa", + "size": 63871092, + "url": "https://dl.google.com/android/repository/android-19_r04.zip" + } + ], + "displayName": "Android SDK Platform 19", + "license": "android-sdk-license", + "name": "platforms", + "path": "platforms/android-19", + "revision": "19" + }, + "2": { + "archives": [ + { + "os": "linux", + "sha1": "c054d25c9b4c6251fa49c2f9c54336998679d3fe", + "size": 45476658, + "url": "https://dl.google.com/android/repository/android-1.1_r1-linux.zip" + }, + { + "os": "macosx", + "sha1": "e21dbcff45b7356657449ebb3c7e941be2bb5ebe", + "size": 45584305, + "url": "https://dl.google.com/android/repository/android-1.1_r1-macosx.zip" + }, + { + "os": "windows", + "sha1": "a4060f29ed39fc929c302836d488998c53c3002e", + "size": 46828615, + "url": "https://dl.google.com/android/repository/android-1.1_r1-windows.zip" + } + ], + "displayName": "Android SDK Platform 2", + "license": "android-sdk-license", + "name": "platforms", + "path": "platforms/android-2", + "revision": "2" + }, + "20": { + "archives": [ + { + "os": "all", + "sha1": "a9251f8a3f313ab05834a07a963000927637e01d", + "size": 63567784, + "url": "https://dl.google.com/android/repository/android-20_r02.zip" + } + ], + "displayName": "Android SDK Platform 20", + "license": "android-sdk-license", + "name": "platforms", + "path": "platforms/android-20", + "revision": "20" + }, + "21": { + "archives": [ + { + "os": "all", + "sha1": "53536556059bb29ae82f414fd2e14bc335a4eb4c", + "size": 65897960, + "url": "https://dl.google.com/android/repository/android-21_r02.zip" + } + ], + "displayName": "Android SDK Platform 21", + "license": "android-sdk-license", + "name": "platforms", + "path": "platforms/android-21", + "revision": "21" + }, + "22": { + "archives": [ + { + "os": "all", + "sha1": "5d1bd10fea962b216a0dece1247070164760a9fc", + "size": 66852371, + "url": "https://dl.google.com/android/repository/android-22_r02.zip" + } + ], + "displayName": "Android SDK Platform 22", + "license": "android-sdk-license", + "name": "platforms", + "path": "platforms/android-22", + "revision": "22" + }, + "23": { + "archives": [ + { + "os": "all", + "sha1": "027fede3de6aa1649115bbd0bffff30ccd51c9a0", + "size": 70433421, + "url": "https://dl.google.com/android/repository/platform-23_r03.zip" + } + ], + "displayName": "Android SDK Platform 23", + "license": "android-sdk-license", + "name": "platforms", + "path": "platforms/android-23", + "revision": "23" + }, + "24": { + "archives": [ + { + "os": "all", + "sha1": "8912da3d4bfe7a9f28f0e5ce92d3a8dc96342aee", + "size": 82648154, + "url": "https://dl.google.com/android/repository/platform-24_r02.zip" + } + ], + "displayName": "Android SDK Platform 24", + "license": "android-sdk-license", + "name": "platforms", + "path": "platforms/android-24", + "revision": "24" + }, + "25": { + "archives": [ + { + "os": "all", + "sha1": "00c2c5765e8988504be10a1eb66ed71fcdbd7fe8", + "size": 85424763, + "url": "https://dl.google.com/android/repository/platform-25_r03.zip" + } + ], + "displayName": "Android SDK Platform 25", + "license": "android-sdk-license", + "name": "platforms", + "path": "platforms/android-25", + "revision": "25" + }, + "26": { + "archives": [ + { + "os": "all", + "sha1": "e4ae5d7aa557a3c827135838ee400da8443ac4ef", + "size": 63623734, + "url": "https://dl.google.com/android/repository/platform-26_r02.zip" + } + ], + "displayName": "Android SDK Platform 26", + "license": "android-sdk-license", + "name": "platforms", + "path": "platforms/android-26", + "revision": "26" + }, + "27": { + "archives": [ + { + "os": "all", + "sha1": "35f747e7e70b2d16e0e4246876be28d15ea1c353", + "size": 65635348, + "url": "https://dl.google.com/android/repository/platform-27_r03.zip" + } + ], + "displayName": "Android SDK Platform 27", + "license": "android-sdk-license", + "name": "platforms", + "path": "platforms/android-27", + "revision": "27" + }, + "28": { + "archives": [ + { + "os": "all", + "sha1": "9a4e52b1d55bd2e24216b150aafae2503d3efba6", + "size": 75565084, + "url": "https://dl.google.com/android/repository/platform-28_r06.zip" + } + ], + "displayName": "Android SDK Platform 28", + "license": "android-sdk-license", + "name": "platforms", + "path": "platforms/android-28", + "revision": "28" + }, + "29": { + "archives": [ + { + "os": "all", + "sha1": "9d8a7e0ffa5168dbca6c60355b9129c6c7572aff", + "size": 78293913, + "url": "https://dl.google.com/android/repository/platform-29_r05.zip" + } + ], + "displayName": "Android SDK Platform 29", + "license": "android-sdk-license", + "name": "platforms", + "path": "platforms/android-29", + "revision": "29" + }, + "3": { + "archives": [ + { + "os": "linux", + "sha1": "5c134b7df5f4b8bd5b61ba93bdaebada8fa3468c", + "size": 53348669, + "url": "https://dl.google.com/android/repository/android-1.5_r04-linux.zip" + }, + { + "os": "macosx", + "sha1": "d3a67c2369afa48b6c3c7624de5031c262018d1e", + "size": 52440607, + "url": "https://dl.google.com/android/repository/android-1.5_r04-macosx.zip" + }, + { + "os": "windows", + "sha1": "5bb106d2e40d481edd337b0833093843e15fe49a", + "size": 54624370, + "url": "https://dl.google.com/android/repository/android-1.5_r04-windows.zip" + } + ], + "displayName": "Android SDK Platform 3", + "license": "android-sdk-license", + "name": "platforms", + "path": "platforms/android-3", + "revision": "3" + }, + "30": { + "archives": [ + { + "os": "all", + "sha1": "e7c6280901dcfa511af098d67dd88c4dfcbc6ea2", + "size": 52328361, + "url": "https://dl.google.com/android/repository/platform-30_r03.zip" + } + ], + "displayName": "Android SDK Platform 30", + "license": "android-sdk-license", + "name": "platforms", + "path": "platforms/android-30", + "revision": "30" + }, + "4": { + "archives": [ + { + "os": "linux", + "sha1": "483ed088e45bbdf3444baaf9250c8b02e5383cb0", + "size": 63454485, + "url": "https://dl.google.com/android/repository/android-1.6_r03-linux.zip" + }, + { + "os": "macosx", + "sha1": "bdafad44f5df9f127979bdb21a1fdd87ee3cd625", + "size": 62418496, + "url": "https://dl.google.com/android/repository/android-1.6_r03-macosx.zip" + }, + { + "os": "windows", + "sha1": "ce0b5e4ffaf12ca4fd07c2da71a8a1ab4a03dc22", + "size": 64654625, + "url": "https://dl.google.com/android/repository/android-1.6_r03-windows.zip" + } + ], + "displayName": "Android SDK Platform 4", + "license": "android-sdk-license", + "name": "platforms", + "path": "platforms/android-4", + "revision": "4" + }, + "5": { + "archives": [ + { + "os": "linux", + "sha1": "be9be6a99ca32875c96ec7f91160ca9fce7e3c7d", + "size": 75095268, + "url": "https://dl.google.com/android/repository/android-2.0_r01-linux.zip" + }, + { + "os": "macosx", + "sha1": "2a866d0870dbba18e0503cd41e5fae988a21b314", + "size": 74956356, + "url": "https://dl.google.com/android/repository/android-2.0_r01-macosx.zip" + }, + { + "os": "windows", + "sha1": "aeb623217ff88b87216d6eb7dbc846ed53f68f57", + "size": 76288040, + "url": "https://dl.google.com/android/repository/android-2.0_r01-windows.zip" + } + ], + "displayName": "Android SDK Platform 5", + "license": "android-sdk-license", + "name": "platforms", + "path": "platforms/android-5", + "revision": "5" + }, + "6": { + "archives": [ + { + "os": "linux", + "sha1": "ce2c971dce352aa28af06bda92a070116aa5ae1a", + "size": 79192618, + "url": "https://dl.google.com/android/repository/android-2.0.1_r01-linux.zip" + }, + { + "os": "macosx", + "sha1": "c3096f80d75a6fc8cb38ef8a18aec920e53d42c0", + "size": 79035527, + "url": "https://dl.google.com/android/repository/android-2.0.1_r01-macosx.zip" + }, + { + "os": "windows", + "sha1": "255781ebe4509d9707d0e77edda2815e2bc216e6", + "size": 80385601, + "url": "https://dl.google.com/android/repository/android-2.0.1_r01-windows.zip" + } + ], + "displayName": "Android SDK Platform 6", + "license": "android-sdk-license", + "name": "platforms", + "path": "platforms/android-6", + "revision": "6" + }, + "7": { + "archives": [ + { + "os": "all", + "sha1": "5ce51b023ac19f8738500b1007a1da5de2349a1e", + "size": 70142829, + "url": "https://dl.google.com/android/repository/android-2.1_r03.zip" + } + ], + "displayName": "Android SDK Platform 7", + "license": "android-sdk-license", + "name": "platforms", + "path": "platforms/android-7", + "revision": "7" + }, + "8": { + "archives": [ + { + "os": "all", + "sha1": "231262c63eefdff8fd0386e9ccfefeb27a8f9202", + "size": 74652366, + "url": "https://dl.google.com/android/repository/android-2.2_r03.zip" + } + ], + "displayName": "Android SDK Platform 8", + "license": "android-sdk-license", + "name": "platforms", + "path": "platforms/android-8", + "revision": "8" + }, + "9": { + "archives": [ + { + "os": "all", + "sha1": "209f8a7a8b2cb093fce858b8b55fed3ba5206773", + "size": 78732563, + "url": "https://dl.google.com/android/repository/android-2.3.1_r02.zip" + } + ], + "displayName": "Android SDK Platform 9", + "license": "android-sdk-license", + "name": "platforms", + "path": "platforms/android-9", + "revision": "9" + } + }, + "skiaparser": { + "5": { + "archives": [ + { + "os": "linux", + "sha1": "b4ac0f553c2b582fd4e1896f46e2021b9da9d19b", + "size": 6234850, + "url": "https://dl.google.com/android/repository/skiaparser-6923996-linux.zip" + }, + { + "os": "macosx", + "sha1": "6d4bafe363b8536c9c3da51fac6f4b16c5685359", + "size": 6297430, + "url": "https://dl.google.com/android/repository/skiaparser-6923996-mac.zip" + }, + { + "os": "windows", + "sha1": "2aafef23d600d05467e645cd1420e8c7e5a5dad3", + "size": 6008442, + "url": "https://dl.google.com/android/repository/skiaparser-6923996-win.zip" + } + ], + "displayName": "Layout Inspector image server for API 29-30", + "license": "android-sdk-license", + "name": "skiaparser", + "path": "skiaparser/1", + "revision": "5" + } + }, + "sources": { + "14": { + "archives": [ + { + "os": "all", + "sha1": "eaf4ed7dcac46e68516a1b4aa5b0d9e5a39a7555", + "size": 16152383, + "url": "https://dl.google.com/android/repository/sources-14_r01.zip" + } + ], + "displayName": "Sources for Android 14", + "license": "android-sdk-license", + "name": "sources", + "path": "sources/android-14", + "revision": "14" + }, + "15": { + "archives": [ + { + "os": "all", + "sha1": "e5992a5747c9590783fbbdd700337bf0c9f6b1fa", + "size": 16468746, + "url": "https://dl.google.com/android/repository/sources-15_r02.zip" + } + ], + "displayName": "Sources for Android 15", + "license": "android-sdk-license", + "name": "sources", + "path": "sources/android-15", + "revision": "15" + }, + "16": { + "archives": [ + { + "os": "all", + "sha1": "0f83c14ed333c45d962279ab5d6bc98a0269ef84", + "size": 17876720, + "url": "https://dl.google.com/android/repository/sources-16_r02.zip" + } + ], + "displayName": "Sources for Android 16", + "license": "android-sdk-license", + "name": "sources", + "path": "sources/android-16", + "revision": "16" + }, + "17": { + "archives": [ + { + "os": "all", + "sha1": "6f1f18cd2d2b1852d7f6892df9cee3823349d43a", + "size": 18976816, + "url": "https://dl.google.com/android/repository/sources-17_r01.zip" + } + ], + "displayName": "Sources for Android 17", + "license": "android-sdk-license", + "name": "sources", + "path": "sources/android-17", + "revision": "17" + }, + "18": { + "archives": [ + { + "os": "all", + "sha1": "8b49fdf7433f4881a2bfb559b5dd05d8ec65fb78", + "size": 20226735, + "url": "https://dl.google.com/android/repository/sources-18_r01.zip" + } + ], + "displayName": "Sources for Android 18", + "license": "android-sdk-license", + "name": "sources", + "path": "sources/android-18", + "revision": "18" + }, + "19": { + "archives": [ + { + "os": "all", + "sha1": "433a1d043ef77561571250e94cb7a0ef24a202e7", + "size": 21819439, + "url": "https://dl.google.com/android/repository/sources-19_r02.zip" + } + ], + "displayName": "Sources for Android 19", + "license": "android-sdk-license", + "name": "sources", + "path": "sources/android-19", + "revision": "19" + }, + "20": { + "archives": [ + { + "os": "all", + "sha1": "8da3e40f2625f9f7ef38b7e403f49f67226c0d76", + "size": 23367603, + "url": "https://dl.google.com/android/repository/sources-20_r01.zip" + } + ], + "displayName": "Sources for Android 20", + "license": "android-sdk-license", + "name": "sources", + "path": "sources/android-20", + "revision": "20" + }, + "21": { + "archives": [ + { + "os": "all", + "sha1": "137a5044915d32bea297a8c1552684802bbc2e25", + "size": 28274751, + "url": "https://dl.google.com/android/repository/sources-21_r01.zip" + } + ], + "displayName": "Sources for Android 21", + "license": "android-sdk-license", + "name": "sources", + "path": "sources/android-21", + "revision": "21" + }, + "22": { + "archives": [ + { + "os": "all", + "sha1": "98320e13976d11597a4a730a8d203ac9a03ed5a6", + "size": 28861236, + "url": "https://dl.google.com/android/repository/sources-22_r01.zip" + } + ], + "displayName": "Sources for Android 22", + "license": "android-sdk-license", + "name": "sources", + "path": "sources/android-22", + "revision": "22" + }, + "23": { + "archives": [ + { + "os": "all", + "sha1": "b0f15da2762b42f543c5e364c2b15b198cc99cc2", + "size": 31771965, + "url": "https://dl.google.com/android/repository/sources-23_r01.zip" + } + ], + "displayName": "Sources for Android 23", + "license": "android-sdk-license", + "name": "sources", + "path": "sources/android-23", + "revision": "23" + }, + "24": { + "archives": [ + { + "os": "all", + "sha1": "6b96115830a83d654479f32ce4b724ca9011148b", + "size": 30270410, + "url": "https://dl.google.com/android/repository/sources-24_r01.zip" + } + ], + "displayName": "Sources for Android 24", + "license": "android-sdk-license", + "name": "sources", + "path": "sources/android-24", + "revision": "24" + }, + "25": { + "archives": [ + { + "os": "all", + "sha1": "bbc72efd1a9bad87cc507e308f0d29aad438c52c", + "size": 30822685, + "url": "https://dl.google.com/android/repository/sources-25_r01.zip" + } + ], + "displayName": "Sources for Android 25", + "license": "android-sdk-license", + "name": "sources", + "path": "sources/android-25", + "revision": "25" + }, + "26": { + "archives": [ + { + "os": "all", + "sha1": "2af701ee3223d580409288540b1d06932fd8f9b9", + "size": 35138547, + "url": "https://dl.google.com/android/repository/sources-26_r01.zip" + } + ], + "displayName": "Sources for Android 26", + "license": "android-sdk-license", + "name": "sources", + "path": "sources/android-26", + "revision": "26" + }, + "27": { + "archives": [ + { + "os": "all", + "sha1": "7b714670561d08f54751af42aca929867b806596", + "size": 36997618, + "url": "https://dl.google.com/android/repository/sources-27_r01.zip" + } + ], + "displayName": "Sources for Android 27", + "license": "android-sdk-license", + "name": "sources", + "path": "sources/android-27", + "revision": "27" + }, + "28": { + "archives": [ + { + "os": "all", + "sha1": "5610e0c24235ee3fa343c899ddd551be30315255", + "size": 42552241, + "url": "https://dl.google.com/android/repository/sources-28_r01.zip" + } + ], + "displayName": "Sources for Android 28", + "license": "android-sdk-license", + "name": "sources", + "path": "sources/android-28", + "revision": "28" + }, + "29": { + "archives": [ + { + "os": "all", + "sha1": "d0ad249e152b3a8fe3cb7c4a329453a048be29e4", + "size": 39477018, + "url": "https://dl.google.com/android/repository/sources-29_r01.zip" + } + ], + "displayName": "Sources for Android 29", + "license": "android-sdk-license", + "name": "sources", + "path": "sources/android-29", + "revision": "29" + }, + "30": { + "archives": [ + { + "os": "all", + "sha1": "e4c000fb3afb32380609ddcad91f5d6495eeccb1", + "size": 43263073, + "url": "https://dl.google.com/android/repository/sources-30_r01.zip" + } + ], + "displayName": "Sources for Android 30", + "license": "android-sdk-license", + "name": "sources", + "path": "sources/android-30", + "revision": "30" + } + }, + "tools": { + "26.1.1": { + "archives": [ + { + "os": "macosx", + "sha1": "ed85ea7b59bc3483ce0af4c198523ba044e083ad", + "size": 103022432, + "url": "https://dl.google.com/android/repository/sdk-tools-darwin-4333796.zip" + }, + { + "os": "linux", + "sha1": "8c7c28554a32318461802c1291d76fccfafde054", + "size": 154582459, + "url": "https://dl.google.com/android/repository/sdk-tools-linux-4333796.zip" + }, + { + "os": "windows", + "sha1": "aa298b5346ee0d63940d13609fe6bec621384510", + "size": 156136858, + "url": "https://dl.google.com/android/repository/sdk-tools-windows-4333796.zip" + } + ], + "displayName": "Android SDK Tools", + "license": "android-sdk-license", + "name": "tools", + "path": "tools", + "revision": "26.1.1" + } + } + } +} diff --git a/pkgs/development/mobile/imgpatchtools/default.nix b/pkgs/development/mobile/imgpatchtools/default.nix index fd14a73e2ce7..c45e4973f564 100644 --- a/pkgs/development/mobile/imgpatchtools/default.nix +++ b/pkgs/development/mobile/imgpatchtools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, bzip2, openssl, zlib }: +{ lib, stdenv, fetchzip, bzip2, openssl, zlib }: stdenv.mkDerivation rec { pname = "imgpatchtools"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { installPhase = "install -Dt $out/bin bin/*"; - meta = with stdenv.lib; { + meta = with lib; { description = "Tools to manipulate Android OTA archives"; longDescription = '' This package is useful for Android development. In particular, it can be diff --git a/pkgs/development/mobile/webos/cmake-modules.nix b/pkgs/development/mobile/webos/cmake-modules.nix index cd58ea4e20cf..0f73646c7691 100644 --- a/pkgs/development/mobile/webos/cmake-modules.nix +++ b/pkgs/development/mobile/webos/cmake-modules.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "cmake-modules-webos"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { setupHook = ./cmake-setup-hook.sh; - meta = with stdenv.lib; { + meta = with lib; { description = "CMake modules needed to build Open WebOS components"; license = licenses.asl20; maintainers = with maintainers; [ dtzWill ]; diff --git a/pkgs/development/mobile/webos/novacom.nix b/pkgs/development/mobile/webos/novacom.nix index e7afdb32137b..08f25a53bf68 100644 --- a/pkgs/development/mobile/webos/novacom.nix +++ b/pkgs/development/mobile/webos/novacom.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, webos, cmake, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, webos, cmake, pkgconfig }: stdenv.mkDerivation rec { pname = "novacom"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { substituteInPlace $out/bin/novaterm --replace "exec novacom" "exec $out/bin/novacom" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Utility for communicating with WebOS devices"; license = licenses.asl20; maintainers = with maintainers; [ dtzWill ]; diff --git a/pkgs/development/mobile/webos/novacomd.nix b/pkgs/development/mobile/webos/novacomd.nix index 932ec0e59d64..c39f36b93f68 100644 --- a/pkgs/development/mobile/webos/novacomd.nix +++ b/pkgs/development/mobile/webos/novacomd.nix @@ -1,4 +1,4 @@ -{ stdenv, +{ lib, stdenv, fetchFromGitHub, fetchpatch, webos, cmake, pkgconfig, libusb-compat-0_1 }: @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DWEBOS_TARGET_MACHINE_IMPL=host" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Daemon for communicating with WebOS devices"; license = licenses.asl20; maintainers = with maintainers; [ dtzWill ]; diff --git a/pkgs/development/mobile/xpwn/default.nix b/pkgs/development/mobile/xpwn/default.nix index 0c49a29b3222..075a247f12c9 100644 --- a/pkgs/development/mobile/xpwn/default.nix +++ b/pkgs/development/mobile/xpwn/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, zlib, libpng, bzip2, libusb-compat-0_1, openssl }: +{ lib, stdenv, fetchFromGitHub, cmake, zlib, libpng, bzip2, libusb-compat-0_1, openssl }: stdenv.mkDerivation rec { pname = "xpwn"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ zlib libpng bzip2 libusb-compat-0_1 openssl ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://planetbeing.lighthouseapp.com/projects/15246-xpwn"; description = "Custom NOR firmware loader/IPSW generator for the iPhone"; license = licenses.gpl3Plus; diff --git a/pkgs/development/node-packages/default.nix b/pkgs/development/node-packages/default.nix index c8694a46bd14..36ba75df33f8 100644 --- a/pkgs/development/node-packages/default.nix +++ b/pkgs/development/node-packages/default.nix @@ -77,6 +77,13 @@ let buildInputs = [ self.node-gyp-build pkgs.unbound ]; }; + ijavascript = super.ijavascript.override (oldAttrs: { + preRebuild = '' + export NPM_CONFIG_ZMQ_EXTERNAL=true + ''; + buildInputs = oldAttrs.buildInputs ++ [ self.node-gyp-build pkgs.zeromq ]; + }); + insect = super.insect.override (drv: { nativeBuildInputs = drv.nativeBuildInputs or [] ++ [ pkgs.psc-package self.pulp ]; }); @@ -189,6 +196,10 @@ let meta.broken = since "10"; }; + stf = super.stf.override { + meta.broken = since "10"; + }; + tedicross = super."tedicross-git+https://github.com/TediCross/TediCross.git#v0.8.7".override { nativeBuildInputs = [ pkgs.makeWrapper ]; postInstall = '' @@ -205,8 +216,12 @@ let ''; }); - stf = super.stf.override { - meta.broken = since "10"; + typescript-language-server = super.typescript-language-server.override { + nativeBuildInputs = [ pkgs.makeWrapper ]; + postInstall = '' + wrapProgram "$out/bin/typescript-language-server" \ + --prefix PATH : ${stdenv.lib.makeBinPath [ self.typescript ]} + ''; }; vega-cli = super.vega-cli.override { diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 2982b6446846..96165097316c 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -18,6 +18,8 @@ , "browserify" , "btc-rpc-explorer" , "castnow" +, "cdk8s-cli" +, "cdktf-cli" , "clean-css-cli" , "clubhouse-cli" , "coc-css" @@ -76,9 +78,11 @@ , "escape-string-regexp" , "eslint" , "eslint_d" +, "esy" , "expo-cli" , {"fast-cli": "1.x"} , "fauna-shell" +, "firebase-tools" , "fixjson" , "fkill-cli" , "flood" @@ -104,6 +108,7 @@ , "hs-airdrop" , "hs-client" , "hueadm" +, "ijavascript" , "inliner" , "imapnotify" , "indium" @@ -150,6 +155,7 @@ , "node-red" , "node2nix" , "nodemon" +, "np" , "npm" , "npm-check-updates" , {"npm2nix": "git://github.com/NixOS/npm2nix.git#5.12.0"} @@ -170,6 +176,7 @@ , "purescript-psa" , "purty" , "pyright" +, "quicktype" , "react-native-cli" , "react-tools" , "readability-cli" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index fa696958acfa..38fc84d55230 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -22,31 +22,13 @@ let sha512 = "t4WmWoGV9gyzypwG3y3JlcK2t8fKLtvzBA7xEoFTj9SMPvOuLsf13uh4ikK0RRaaa9RPPWLgFUdOyIRaQvCpwQ=="; }; }; - "@angular-devkit/architect-0.1100.3" = { + "@angular-devkit/architect-0.1100.5" = { name = "_at_angular-devkit_slash_architect"; packageName = "@angular-devkit/architect"; - version = "0.1100.3"; + version = "0.1100.5"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1100.3.tgz"; - sha512 = "PF4PlGOIVW8eYAObP7B/vfk8TaHBEWzr2NOb+kHsIJJmx11iivkHRWzzQmTUlhwnRslCcg5ngwx0IBPDzNVeTg=="; - }; - }; - "@angular-devkit/core-11.0.0" = { - name = "_at_angular-devkit_slash_core"; - packageName = "@angular-devkit/core"; - version = "11.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/core/-/core-11.0.0.tgz"; - sha512 = "fXZtSs3J4S12hboi3om1FA+QS0e8nuQMyzl2nkmtuhcELUFMmSrEl36dtCni5e7Svs46BUAZ5w8EazIkgGQDJg=="; - }; - }; - "@angular-devkit/core-11.0.1" = { - name = "_at_angular-devkit_slash_core"; - packageName = "@angular-devkit/core"; - version = "11.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/core/-/core-11.0.1.tgz"; - sha512 = "ui3g7w/0SpU9oq8uwN9upR8Y1eOXZ+P2p3NyDydBrR7ZEfEkRLS1mhozN/ib8farrwK5N3kIIJxMb5t3187Hng=="; + url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1100.5.tgz"; + sha512 = "yOYfucNouc1doTbcGbCNMXGMSc36+j97XpdNoeGyzFQ7GwezLAro0a9gxc5PdOxndfelkND7J1JuOjxdW5O17A=="; }; }; "@angular-devkit/core-11.0.3" = { @@ -58,22 +40,13 @@ let sha512 = "gJRiBj0gWDR2VtIvLvwwc/GM2MZvg1xw69ZbBJ1VuUgDqPBHdC8q3UMW3B82wdhxK+RBYa7ZOJxtIVggaHkm9g=="; }; }; - "@angular-devkit/schematics-11.0.0" = { - name = "_at_angular-devkit_slash_schematics"; - packageName = "@angular-devkit/schematics"; - version = "11.0.0"; + "@angular-devkit/core-11.0.5" = { + name = "_at_angular-devkit_slash_core"; + packageName = "@angular-devkit/core"; + version = "11.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-11.0.0.tgz"; - sha512 = "oCz9E0thA5WdGDuv6biu3X5kw5/vNE4ZZOKT2sHBQMpAuuDYrDpfTYQJjXQtjfXWvmlr8L8aqDD9N4HXsE4Esw=="; - }; - }; - "@angular-devkit/schematics-11.0.1" = { - name = "_at_angular-devkit_slash_schematics"; - packageName = "@angular-devkit/schematics"; - version = "11.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-11.0.1.tgz"; - sha512 = "rAOnAndcybEH398xf5wzmcUPCoCi0dKiOo/+1dkKU5aTxynw1OUnANt5K6A+ZZTGnJmfjtP0ovkZGYun9IUDxQ=="; + url = "https://registry.npmjs.org/@angular-devkit/core/-/core-11.0.5.tgz"; + sha512 = "hwV8fjF8JNPJkiVWw8MNzeIfDo01aD/OAOlC4L5rQnVHn+i2EiU3brSDmFqyeHPPV3h/QjuBkS3tkN7gSnVWaQ=="; }; }; "@angular-devkit/schematics-11.0.3" = { @@ -85,13 +58,22 @@ let sha512 = "VZnqgnnfyzyMluIDvGp+ZlDU2P9BnjrhacBOdqBS/jNQ7oxyE0AWrUApGXcejOJ13Z7pEf31E64P3bImcjwP+A=="; }; }; - "@angular-devkit/schematics-cli-0.1100.1" = { + "@angular-devkit/schematics-11.0.5" = { + name = "_at_angular-devkit_slash_schematics"; + packageName = "@angular-devkit/schematics"; + version = "11.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-11.0.5.tgz"; + sha512 = "0NKGC8Nf/4vvDpWKB7bwxIazvNnNHnZBX6XlyBXNl+fW8tpTef3PNMJMSErTz9LFnuv61vsKbc36u/Ek2YChWg=="; + }; + }; + "@angular-devkit/schematics-cli-0.1100.3" = { name = "_at_angular-devkit_slash_schematics-cli"; packageName = "@angular-devkit/schematics-cli"; - version = "0.1100.1"; + version = "0.1100.3"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/schematics-cli/-/schematics-cli-0.1100.1.tgz"; - sha512 = "6iGauhYKSkgsqA8HK7sul7lrVzrkxXAghGd3FcTHtXsmjh/leBezi7R82MphzcoYAOQ36COLMcOJnYurVG1Y6g=="; + url = "https://registry.npmjs.org/@angular-devkit/schematics-cli/-/schematics-cli-0.1100.3.tgz"; + sha512 = "dECFHCDTgWfSHosfKTeQoyTgUUqgJaftxg4DxA23sMsQtDb1U8ZsIIPpH+L4QhCDT2zlhv51ynd5RUgu28h2DQ=="; }; }; "@antora/asciidoc-loader-2.3.4" = { @@ -202,13 +184,22 @@ let sha512 = "eorTmZW7zc6ZHgGLt3Vrq7mzPuobPeJnyfli50/m/DIQ91slkqjPKUYGcq4paPEz6IWoa7LT2ZwtwA5KzMyTPg=="; }; }; - "@apollo/federation-0.20.4" = { + "@apidevtools/json-schema-ref-parser-9.0.6" = { + name = "_at_apidevtools_slash_json-schema-ref-parser"; + packageName = "@apidevtools/json-schema-ref-parser"; + version = "9.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@apidevtools/json-schema-ref-parser/-/json-schema-ref-parser-9.0.6.tgz"; + sha512 = "M3YgsLjI0lZxvrpeGVk9Ap032W6TPQkH6pRAZz81Ac3WUNF79VQooAFnp8umjvVzUmD93NkogxEwbSce7qMsUg=="; + }; + }; + "@apollo/federation-0.20.7" = { name = "_at_apollo_slash_federation"; packageName = "@apollo/federation"; - version = "0.20.4"; + version = "0.20.7"; src = fetchurl { - url = "https://registry.npmjs.org/@apollo/federation/-/federation-0.20.4.tgz"; - sha512 = "A/2BtgSytrrA2nSuCrKIlXYemfMEzCosIOD4vUjK7Y1LvNuPCBxt6mdZ+hjKrfpY4IXhZdgbtHjI5/Q2Pkqsmg=="; + url = "https://registry.npmjs.org/@apollo/federation/-/federation-0.20.7.tgz"; + sha512 = "URIayksqBaJ+xlcJmyGCf+OqHP60lX2CYGv9fDWQ1KM48sEN1ABHGXkEa0vwgWMH0XUVo94lYDVY11BAJUsuCw=="; }; }; "@apollo/protobufjs-1.0.5" = { @@ -310,6 +301,15 @@ let sha512 = "vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg=="; }; }; + "@babel/code-frame-7.12.11" = { + name = "_at_babel_slash_code-frame"; + packageName = "@babel/code-frame"; + version = "7.12.11"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz"; + sha512 = "Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw=="; + }; + }; "@babel/compat-data-7.12.7" = { name = "_at_babel_slash_compat-data"; packageName = "@babel/compat-data"; @@ -319,13 +319,13 @@ let sha512 = "YaxPMGs/XIWtYqrdEOZOCPsVWfEoriXopnsz3/i7apYPXQ3698UFhS6dVT1KN5qOsWmVgw/FOrmQgpRaZayGsw=="; }; }; - "@babel/core-7.12.9" = { + "@babel/core-7.12.10" = { name = "_at_babel_slash_core"; packageName = "@babel/core"; - version = "7.12.9"; + version = "7.12.10"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/core/-/core-7.12.9.tgz"; - sha512 = "gTXYh3M5wb7FRXQy+FErKFAv90BnlOuNn1QkCK2lREoPAjrQCO49+HVSrFoe5uakFAF5eenS75KbO2vQiLrTMQ=="; + url = "https://registry.npmjs.org/@babel/core/-/core-7.12.10.tgz"; + sha512 = "eTAlQKq65zHfkHZV0sIVODCPGVgoo1HdBlbSLi9CqOzuZanMv2ihzY+4paiKr1mH+XmYESMAmJ/dpZ68eN6d8w=="; }; }; "@babel/core-7.9.0" = { @@ -337,22 +337,31 @@ let sha512 = "kWc7L0fw1xwvI0zi8OKVBuxRVefwGOrKSQMvrQ3dW+bIIavBY3/NpXmpjMy7bQnLgwgzWQZ8TlM57YHpHNHz4w=="; }; }; - "@babel/generator-7.12.5" = { + "@babel/generator-7.12.10" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; - version = "7.12.5"; + version = "7.12.10"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.12.5.tgz"; - sha512 = "m16TQQJ8hPt7E+OS/XVQg/7U184MLXtvuGbCdA7na61vha+ImkyyNM/9DDA0unYCVZn3ZOhng+qz48/KBOT96A=="; + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.12.10.tgz"; + sha512 = "6mCdfhWgmqLdtTkhXjnIz0LcdVCd26wS2JXRtj2XY0u5klDsXBREA/pG5NVOuVnF2LUrBGNFtQkIqqTbblg0ww=="; }; }; - "@babel/helper-annotate-as-pure-7.10.4" = { + "@babel/generator-7.12.11" = { + name = "_at_babel_slash_generator"; + packageName = "@babel/generator"; + version = "7.12.11"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.12.11.tgz"; + sha512 = "Ggg6WPOJtSi8yYQvLVjG8F/TlpWDlKx0OpS4Kt+xMQPs5OaGYWy+v1A+1TvxI6sAMGZpKWWoAQ1DaeQbImlItA=="; + }; + }; + "@babel/helper-annotate-as-pure-7.12.10" = { name = "_at_babel_slash_helper-annotate-as-pure"; packageName = "@babel/helper-annotate-as-pure"; - version = "7.10.4"; + version = "7.12.10"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.10.4.tgz"; - sha512 = "XQlqKQP4vXFB7BN8fEEerrmYvHp3fK/rBkRFz9jaJbzK0B1DSfej9Kc7ZzE8Z/OnId1jpJdNAZ3BFQjWG68rcA=="; + url = "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.12.10.tgz"; + sha512 = "XplmVbC1n+KY6jL8/fgLVXXUauDIB+lD5+GsQEh6F6GBF1dq1qy4DP4yXWzDKcoqXB3X58t61e85Fitoww4JVQ=="; }; }; "@babel/helper-builder-binary-assignment-operator-visitor-7.10.4" = { @@ -364,24 +373,6 @@ let sha512 = "L0zGlFrGWZK4PbT8AszSfLTM5sDU1+Az/En9VrdT8/LmEiJt4zXt+Jve9DCAnQcbqDhCI+29y/L93mrDzddCcg=="; }; }; - "@babel/helper-builder-react-jsx-7.10.4" = { - name = "_at_babel_slash_helper-builder-react-jsx"; - packageName = "@babel/helper-builder-react-jsx"; - version = "7.10.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.10.4.tgz"; - sha512 = "5nPcIZ7+KKDxT1427oBivl9V9YTal7qk0diccnh7RrcgrT/pGFOjgGw1dgryyx1GvHEpXVfoDF6Ak3rTiWh8Rg=="; - }; - }; - "@babel/helper-builder-react-jsx-experimental-7.12.4" = { - name = "_at_babel_slash_helper-builder-react-jsx-experimental"; - packageName = "@babel/helper-builder-react-jsx-experimental"; - version = "7.12.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-builder-react-jsx-experimental/-/helper-builder-react-jsx-experimental-7.12.4.tgz"; - sha512 = "AjEa0jrQqNk7eDQOo0pTfUOwQBMF+xVqrausQwT9/rTKy0g04ggFNaJpaE09IQMn9yExluigWMJcj0WC7bq+Og=="; - }; - }; "@babel/helper-compilation-targets-7.12.5" = { name = "_at_babel_slash_helper-compilation-targets"; packageName = "@babel/helper-compilation-targets"; @@ -427,22 +418,22 @@ let sha512 = "dmUwH8XmlrUpVqgtZ737tK88v07l840z9j3OEhCLwKTkjlvKpfqXVIZ0wpK3aeOxspwGrf/5AP5qLx4rO3w5rA=="; }; }; - "@babel/helper-function-name-7.10.4" = { + "@babel/helper-function-name-7.12.11" = { name = "_at_babel_slash_helper-function-name"; packageName = "@babel/helper-function-name"; - version = "7.10.4"; + version = "7.12.11"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz"; - sha512 = "YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ=="; + url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.12.11.tgz"; + sha512 = "AtQKjtYNolKNi6nNNVLQ27CP6D9oFR6bq/HPYSizlzbp7uC1M59XJe8L+0uXjbIaZaUJF99ruHqVGiKXU/7ybA=="; }; }; - "@babel/helper-get-function-arity-7.10.4" = { + "@babel/helper-get-function-arity-7.12.10" = { name = "_at_babel_slash_helper-get-function-arity"; packageName = "@babel/helper-get-function-arity"; - version = "7.10.4"; + version = "7.12.10"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz"; - sha512 = "EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A=="; + url = "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.10.tgz"; + sha512 = "mm0n5BPjR06wh9mPQaDdXWDoll/j5UpCAPl1x8fS71GHm7HA6Ua2V4ylG1Ju8lvcTOietbPNNPaSilKj+pj+Ag=="; }; }; "@babel/helper-hoist-variables-7.10.4" = { @@ -481,13 +472,13 @@ let sha512 = "QQzehgFAZ2bbISiCpmVGfiGux8YVFXQ0abBic2Envhej22DVXV9nCFaS5hIQbkyo1AdGb+gNME2TSh3hYJVV/w=="; }; }; - "@babel/helper-optimise-call-expression-7.12.7" = { + "@babel/helper-optimise-call-expression-7.12.10" = { name = "_at_babel_slash_helper-optimise-call-expression"; packageName = "@babel/helper-optimise-call-expression"; - version = "7.12.7"; + version = "7.12.10"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.7.tgz"; - sha512 = "I5xc9oSJ2h59OwyUqjv95HRyzxj53DAubUERgQMrpcCEYQyToeHA+NEcUEsVWB4j53RDeskeBJ0SgRAYHDBckw=="; + url = "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.10.tgz"; + sha512 = "4tpbU0SrSTjjt65UMWSrUOPZTsgvPgGG4S8QSTNHacKzpS51IVWGDj0yCwyeZND/i+LSN2g/O63jEXEWm49sYQ=="; }; }; "@babel/helper-plugin-utils-7.10.4" = { @@ -508,13 +499,13 @@ let sha512 = "9d0KQCRM8clMPcDwo8SevNs+/9a8yWVVmaE80FGJcEP8N1qToREmWEGnBn8BUlJhYRFz6fqxeRL1sl5Ogsed7A=="; }; }; - "@babel/helper-replace-supers-7.12.5" = { + "@babel/helper-replace-supers-7.12.11" = { name = "_at_babel_slash_helper-replace-supers"; packageName = "@babel/helper-replace-supers"; - version = "7.12.5"; + version = "7.12.11"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.12.5.tgz"; - sha512 = "5YILoed0ZyIpF4gKcpZitEnXEJ9UoDRki1Ey6xz46rxOzfNMAhVIJMoune1hmPVxh40LRv1+oafz7UsWX+vyWA=="; + url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.12.11.tgz"; + sha512 = "q+w1cqmhL7R0FNzth/PLLp2N+scXEK/L2AHbXUyydxp828F4FEa5WcVoqui9vFRiHDQErj9Zof8azP32uGVTRA=="; }; }; "@babel/helper-simple-access-7.12.1" = { @@ -535,31 +526,31 @@ let sha512 = "Mf5AUuhG1/OCChOJ/HcADmvcHM42WJockombn8ATJG3OnyiSxBK/Mm5x78BQWvmtXZKHgbjdGL2kin/HOLlZGA=="; }; }; - "@babel/helper-split-export-declaration-7.11.0" = { + "@babel/helper-split-export-declaration-7.12.11" = { name = "_at_babel_slash_helper-split-export-declaration"; packageName = "@babel/helper-split-export-declaration"; - version = "7.11.0"; + version = "7.12.11"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz"; - sha512 = "74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg=="; + url = "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.11.tgz"; + sha512 = "LsIVN8j48gHgwzfocYUSkO/hjYAOJqlpJEc7tGXcIm4cubjVUf8LGW6eWRyxEu7gA25q02p0rQUWoCI33HNS5g=="; }; }; - "@babel/helper-validator-identifier-7.10.4" = { + "@babel/helper-validator-identifier-7.12.11" = { name = "_at_babel_slash_helper-validator-identifier"; packageName = "@babel/helper-validator-identifier"; - version = "7.10.4"; + version = "7.12.11"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz"; - sha512 = "3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw=="; + url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz"; + sha512 = "np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw=="; }; }; - "@babel/helper-validator-option-7.12.1" = { + "@babel/helper-validator-option-7.12.11" = { name = "_at_babel_slash_helper-validator-option"; packageName = "@babel/helper-validator-option"; - version = "7.12.1"; + version = "7.12.11"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.12.1.tgz"; - sha512 = "YpJabsXlJVWP0USHjnC/AQDTLlZERbON577YUVO/wLpqyj6HAtVYnWaQaN0iUN+1/tWn3c+uKKXjRut5115Y2A=="; + url = "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.12.11.tgz"; + sha512 = "TBFCyj939mFSdeX7U7DDj32WtzYY7fDcalgq8v3fBZMNOJQNn7nOYzMaUCiPxPYfCup69mtIpqlKgMZLvQ8Xhw=="; }; }; "@babel/helper-wrap-function-7.12.3" = { @@ -589,13 +580,13 @@ let sha512 = "i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA=="; }; }; - "@babel/parser-7.12.7" = { + "@babel/parser-7.12.11" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.12.7"; + version = "7.12.11"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.12.7.tgz"; - sha512 = "oWR02Ubp4xTLCAqPRiNIuMVgNO5Aif/xpXtabhzW2HWUD47XJsAB4Zd/Rg30+XeQA3juXigV7hlquOTmwqLiwg=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.12.11.tgz"; + sha512 = "N3UxG+uuF4CMYoNj8AhnbAcJF0PiuJ9KHuy1lQmkYsxTer/MAH9UBNHsBoAX/4s6NvlDD047No8mYVGGzLL4hg=="; }; }; "@babel/plugin-external-helpers-7.8.3" = { @@ -607,13 +598,13 @@ let sha512 = "mx0WXDDiIl5DwzMtzWGRSPugXi9BxROS05GQrhLNbEamhBiicgn994ibwkyiBH+6png7bm/yA7AUsvHyCXi4Vw=="; }; }; - "@babel/plugin-proposal-async-generator-functions-7.12.1" = { + "@babel/plugin-proposal-async-generator-functions-7.12.12" = { name = "_at_babel_slash_plugin-proposal-async-generator-functions"; packageName = "@babel/plugin-proposal-async-generator-functions"; - version = "7.12.1"; + version = "7.12.12"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.12.1.tgz"; - sha512 = "d+/o30tJxFxrA1lhzJqiUcEJdI6jKlNregCv5bASeGf2Q4MXmnwH7viDo7nhx1/ohf09oaH8j1GVYG/e3Yqk6A=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.12.12.tgz"; + sha512 = "nrz9y0a4xmUrRq51bYkWJIO5SBZyG2ys2qinHsN0zHDHVsUaModrkpyWWWXfGqYQmOL3x9sQIcTNN/pBGpo09A=="; }; }; "@babel/plugin-proposal-class-properties-7.12.1" = { @@ -922,13 +913,13 @@ let sha512 = "5OpxfuYnSgPalRpo8EWGPzIYf0lHBWORCkj5M0oLBwHdlux9Ri36QqGW3/LR13RSVOAoUUMzoPI/jpE4ABcHoA=="; }; }; - "@babel/plugin-transform-block-scoping-7.12.1" = { + "@babel/plugin-transform-block-scoping-7.12.12" = { name = "_at_babel_slash_plugin-transform-block-scoping"; packageName = "@babel/plugin-transform-block-scoping"; - version = "7.12.1"; + version = "7.12.12"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.12.1.tgz"; - sha512 = "zJyAC9sZdE60r1nVQHblcfCj29Dh2Y0DOvlMkcqSo0ckqjiCwNiUezUKw+RjOCwGfpLRwnAeQ2XlLpsnGkvv9w=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.12.12.tgz"; + sha512 = "VOEPQ/ExOVqbukuP7BYJtI5ZxxsmegTwzZ04j1aF0dkSypGo9XpDHuOrABsJu+ie+penpSJheDJ11x1BEZNiyQ=="; }; }; "@babel/plugin-transform-classes-7.12.1" = { @@ -985,13 +976,13 @@ let sha512 = "7tqwy2bv48q+c1EHbXK0Zx3KXd2RVQp6OC7PbwFNt/dPTAV3Lu5sWtWuAj8owr5wqtWnqHfl2/mJlUmqkChKug=="; }; }; - "@babel/plugin-transform-flow-strip-types-7.12.1" = { + "@babel/plugin-transform-flow-strip-types-7.12.10" = { name = "_at_babel_slash_plugin-transform-flow-strip-types"; packageName = "@babel/plugin-transform-flow-strip-types"; - version = "7.12.1"; + version = "7.12.10"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.12.1.tgz"; - sha512 = "8hAtkmsQb36yMmEtk2JZ9JnVyDSnDOdlB+0nEGzIDLuK4yR3JcEjfuFPYkdEPSh8Id+rAMeBEn+X0iVEyho6Hg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.12.10.tgz"; + sha512 = "0ti12wLTLeUIzu9U7kjqIn4MyOL7+Wibc7avsHhj4o1l5C0ATs8p2IMHrVYjm9t9wzhfEO6S3kxax0Rpdo8LTg=="; }; }; "@babel/plugin-transform-for-of-7.12.1" = { @@ -1129,13 +1120,13 @@ let sha512 = "cAzB+UzBIrekfYxyLlFqf/OagTvHLcVBb5vpouzkYkBclRPraiygVnafvAoipErZLI8ANv8Ecn6E/m5qPXD26w=="; }; }; - "@babel/plugin-transform-react-jsx-7.12.7" = { + "@babel/plugin-transform-react-jsx-7.12.12" = { name = "_at_babel_slash_plugin-transform-react-jsx"; packageName = "@babel/plugin-transform-react-jsx"; - version = "7.12.7"; + version = "7.12.12"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.12.7.tgz"; - sha512 = "YFlTi6MEsclFAPIDNZYiCRbneg1MFGao9pPG9uD5htwE0vDbPaMUMeYd6itWjw7K4kro4UbdQf3ljmFl9y48dQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.12.12.tgz"; + sha512 = "JDWGuzGNWscYcq8oJVCtSE61a5+XAOos+V0HrxnDieUus4UMnBEosDnY1VJqU5iZ4pA04QY7l0+JvHL1hZEfsw=="; }; }; "@babel/plugin-transform-react-jsx-source-7.12.1" = { @@ -1165,13 +1156,13 @@ let sha512 = "pOnUfhyPKvZpVyBHhSBoX8vfA09b7r00Pmm1sH+29ae2hMTKVmSp4Ztsr8KBKjLjx17H0eJqaRC3bR2iThM54A=="; }; }; - "@babel/plugin-transform-runtime-7.12.1" = { + "@babel/plugin-transform-runtime-7.12.10" = { name = "_at_babel_slash_plugin-transform-runtime"; packageName = "@babel/plugin-transform-runtime"; - version = "7.12.1"; + version = "7.12.10"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.12.1.tgz"; - sha512 = "Ac/H6G9FEIkS2tXsZjL4RAdS3L3WHxci0usAnz7laPWUmFiGtj7tIASChqKZMHTSQTQY6xDbOq+V1/vIq3QrWg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.12.10.tgz"; + sha512 = "xOrUfzPxw7+WDm9igMgQCbO3cJKymX7dFdsgRr1eu9n3KjjyU4pptIXbXPseQDquw+W+RuJEJMHKHNsPNNm3CA=="; }; }; "@babel/plugin-transform-shorthand-properties-7.12.1" = { @@ -1210,13 +1201,13 @@ let sha512 = "b4Zx3KHi+taXB1dVRBhVJtEPi9h1THCeKmae2qP0YdUHIFhVjtpqqNfxeVAa1xeHVhAy4SbHxEwx5cltAu5apw=="; }; }; - "@babel/plugin-transform-typeof-symbol-7.12.1" = { + "@babel/plugin-transform-typeof-symbol-7.12.10" = { name = "_at_babel_slash_plugin-transform-typeof-symbol"; packageName = "@babel/plugin-transform-typeof-symbol"; - version = "7.12.1"; + version = "7.12.10"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.1.tgz"; - sha512 = "EPGgpGy+O5Kg5pJFNDKuxt9RdmTgj5sgrus2XVeMp/ZIbOESadgILUbm50SNpghOh3/6yrbsH+NB5+WJTmsA7Q=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.10.tgz"; + sha512 = "JQ6H8Rnsogh//ijxspCjc21YPd3VLVoYtAwv3zQmqAt8YGYUtdo5usNhdl4b9/Vir2kPFZl6n1h0PfUz4hJhaA=="; }; }; "@babel/plugin-transform-typescript-7.12.1" = { @@ -1255,13 +1246,13 @@ let sha512 = "X0pi0V6gxLi6lFZpGmeNa4zxtwEmCs42isWLNjZZDE0Y8yVfgu0T2OAHlzBbdYlqbW/YXVvoBHpATEM+goCj8g=="; }; }; - "@babel/preset-env-7.12.7" = { + "@babel/preset-env-7.12.11" = { name = "_at_babel_slash_preset-env"; packageName = "@babel/preset-env"; - version = "7.12.7"; + version = "7.12.11"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.12.7.tgz"; - sha512 = "OnNdfAr1FUQg7ksb7bmbKoby4qFOHw6DKWWUNB9KqnnCldxhxJlP+21dpyaWFmf2h0rTbOkXJtAGevY3XW1eew=="; + url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.12.11.tgz"; + sha512 = "j8Tb+KKIXKYlDBQyIOy4BLxzv1NUOwlHfZ74rvW+Z0Gp4/cI2IMDPBWAgWceGcE7aep9oL/0K9mlzlMGxA8yNw=="; }; }; "@babel/preset-flow-7.12.1" = { @@ -1300,13 +1291,13 @@ let sha512 = "nOoIqIqBmHBSEgBXWR4Dv/XBehtIFcw9PqZw6rFYuKrzsZmOQm3PR5siLBnKZFEsDb03IegG8nSjU/iXXXYRmw=="; }; }; - "@babel/register-7.12.1" = { + "@babel/register-7.12.10" = { name = "_at_babel_slash_register"; packageName = "@babel/register"; - version = "7.12.1"; + version = "7.12.10"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/register/-/register-7.12.1.tgz"; - sha512 = "XWcmseMIncOjoydKZnWvWi0/5CUCD+ZYKhRwgYlWOrA8fGZ/FjuLRpqtIhLOVD/fvR1b9DQHtZPn68VvhpYf+Q=="; + url = "https://registry.npmjs.org/@babel/register/-/register-7.12.10.tgz"; + sha512 = "EvX/BvMMJRAA3jZgILWgbsrHwBQvllC5T8B29McyME8DvkdOxk4ujESfrMvME8IHSDvWXrmMXxPvA/lx2gqPLQ=="; }; }; "@babel/runtime-7.12.5" = { @@ -1336,13 +1327,13 @@ let sha512 = "GkDzmHS6GV7ZeXfJZ0tLRBhZcMcY0/Lnb+eEbXDBfCAcZCjrZKe6p3J4we/D24O9Y8enxWAg1cWwof59yLh2ow=="; }; }; - "@babel/traverse-7.12.9" = { + "@babel/traverse-7.12.12" = { name = "_at_babel_slash_traverse"; packageName = "@babel/traverse"; - version = "7.12.9"; + version = "7.12.12"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.9.tgz"; - sha512 = "iX9ajqnLdoU1s1nHt36JDI9KG4k+vmI8WgjK5d+aDTwQbL2fUnzedNedssA645Ede3PM2ma1n8Q4h2ohwXgMXw=="; + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.12.tgz"; + sha512 = "s88i0X0lPy45RrLM8b9mz8RPH5FqO9G9p7ti59cToE44xFm1Q+Pjh5Gq4SXBbtb88X7Uy7pexeqRIQDDMNkL0w=="; }; }; "@babel/types-7.10.4" = { @@ -1354,13 +1345,13 @@ let sha512 = "UTCFOxC3FsFHb7lkRMVvgLzaRVamXuAs2Tz4wajva4WxtVY82eZeaUBtC2Zt95FU9TiznuC0Zk35tsim8jeVpg=="; }; }; - "@babel/types-7.12.7" = { + "@babel/types-7.12.12" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; - version = "7.12.7"; + version = "7.12.12"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.12.7.tgz"; - sha512 = "MNyI92qZq6jrQkXvtIiykvl4WtoRrVV9MPn+ZfsoEENjiWcBQ3ZSHrkxnJWgWtLX3XXqX5hrSQ+X69wkmesXuQ=="; + url = "https://registry.npmjs.org/@babel/types/-/types-7.12.12.tgz"; + sha512 = "lnIX7piTxOH22xE7fDXDbSHg9MM1/6ORnafpJmov5rs0kX5g4BZxeXNJLXsMRiO0U5Rb8/FvMS6xlTnTHvxonQ=="; }; }; "@braintree/sanitize-url-3.1.0" = { @@ -1372,22 +1363,22 @@ let sha512 = "GcIY79elgB+azP74j8vqkiXz8xLFfIzbQJdlwOPisgbKT00tviJQuEghOXSMVxJ00HoYJbGswr4kcllUc4xCcg=="; }; }; - "@bugsnag/browser-7.5.3" = { + "@bugsnag/browser-7.5.4" = { name = "_at_bugsnag_slash_browser"; packageName = "@bugsnag/browser"; - version = "7.5.3"; + version = "7.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/@bugsnag/browser/-/browser-7.5.3.tgz"; - sha512 = "iGmKFtHz91hNovWW8rb/qLD9X5TMVEc7OUEfwE5s1M8ElReEmUAVbgTfQjkahG8aHvjGQ+M+zyM0gHfk+tTczg=="; + url = "https://registry.npmjs.org/@bugsnag/browser/-/browser-7.5.4.tgz"; + sha512 = "WyhDWeE2MXQTo9uJjpCOxqTWDlVgX/yKE/VZ0nVm4em2AxUmjAPM8jk9YOTYCKQfQFnIpgf62DjVlsszikUIBw=="; }; }; - "@bugsnag/core-7.5.3" = { + "@bugsnag/core-7.5.4" = { name = "_at_bugsnag_slash_core"; packageName = "@bugsnag/core"; - version = "7.5.3"; + version = "7.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/@bugsnag/core/-/core-7.5.3.tgz"; - sha512 = "HaAPWN+z3ZlEjwF2JeuAx83eKoVd6osgx2Hyn8dlmGsRfUvpi+7rG9DI483PGexEM0O6i/ORvD6Qx92/E9zW7w=="; + url = "https://registry.npmjs.org/@bugsnag/core/-/core-7.5.4.tgz"; + sha512 = "QOvtWzM0XJTk5QCpiDFTva6FJXCKuKQHJu7sjrZwYA/7fblypl+ClP7inz9At5ijkKGm2pLyvZ9vvT2rq9TXuw=="; }; }; "@bugsnag/cuid-3.0.0" = { @@ -1399,22 +1390,22 @@ let sha512 = "LOt8aaBI+KvOQGneBtpuCz3YqzyEAehd1f3nC5yr9TIYW1+IzYKa2xWS4EiMz5pPOnRPHkyyS5t/wmSmN51Gjg=="; }; }; - "@bugsnag/js-7.5.3" = { + "@bugsnag/js-7.5.4" = { name = "_at_bugsnag_slash_js"; packageName = "@bugsnag/js"; - version = "7.5.3"; + version = "7.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/@bugsnag/js/-/js-7.5.3.tgz"; - sha512 = "xdwfq+bQPWZFwc02IIFk7rVsxoEsAMOLiZLJpjnRK/HtzwWPUciMTRIIlUzb/uZaAmd05UieVQ/TxuwQYdMgEA=="; + url = "https://registry.npmjs.org/@bugsnag/js/-/js-7.5.4.tgz"; + sha512 = "V1+482YPndAD0c0ju7Ik1dXunyKAssZWUIqOMs7Ff3PtZb1107sJ4Hw1E7ZusQvvI/IjA6FO3ZJkmzjIJjQ+UA=="; }; }; - "@bugsnag/node-7.5.3" = { + "@bugsnag/node-7.5.4" = { name = "_at_bugsnag_slash_node"; packageName = "@bugsnag/node"; - version = "7.5.3"; + version = "7.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/@bugsnag/node/-/node-7.5.3.tgz"; - sha512 = "irNGOTcxi7u8lUziLfv7rKzWGg2Yd+ZXZnwD0r6ZDhdlOwA3UnGq6Fud3SOTJNKPcUk/16Sv0mcuKkcLdHTodg=="; + url = "https://registry.npmjs.org/@bugsnag/node/-/node-7.5.4.tgz"; + sha512 = "lfHEU2wsBO/hhHjsY6kqD/Ga6A3bzROeZEuE7/cT0xzDUvBnUsrw75/xZ5EyY3Xpyfe/Gw9t336semIqz46+cw=="; }; }; "@bugsnag/safe-json-stringify-6.0.0" = { @@ -1426,13 +1417,13 @@ let sha512 = "htzFO1Zc57S8kgdRK9mLcPVTW1BY2ijfH7Dk2CeZmspTWKdKqSo1iwmqrq2WtRjFlo8aRZYgLX0wFrDXF/9DLA=="; }; }; - "@chemzqm/neovim-5.2.10" = { + "@chemzqm/neovim-5.2.13" = { name = "_at_chemzqm_slash_neovim"; packageName = "@chemzqm/neovim"; - version = "5.2.10"; + version = "5.2.13"; src = fetchurl { - url = "https://registry.npmjs.org/@chemzqm/neovim/-/neovim-5.2.10.tgz"; - sha512 = "IeXAS7yFgsz0EyZrQguX1/Rbbe5EYMZOm2OxosY1oht+LjxQj2vv0u91tvX/Qu67SIWCFoaudJZuDcgK88anyg=="; + url = "https://registry.npmjs.org/@chemzqm/neovim/-/neovim-5.2.13.tgz"; + sha512 = "Eo1NBUj0e2vtOdNA7fpHra6xviDtwDWbYZiPzH5BWGwPtbRa0XjNGPMggcDCCKKKFRJgp9AaAfmT0LaqIyQvyg=="; }; }; "@cliqz-oss/firefox-client-0.3.1" = { @@ -1570,6 +1561,15 @@ let sha512 = "HilPrVrCosYWqSyjfpDtaaN1kJwdlBpS+IAflP3z+e7nsEgk3JGJf1Vg0NgHJooTf5HDfXSyZqMVg+5jvXCK0g=="; }; }; + "@discoveryjs/json-ext-0.5.2" = { + name = "_at_discoveryjs_slash_json-ext"; + packageName = "@discoveryjs/json-ext"; + version = "0.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.2.tgz"; + sha512 = "HyYEUDeIj5rRQU2Hk5HTB2uHsbRQpF70nvMhVzi+VJR0X+xNEhjPui4/kBf3VeH/wqD28PT4sVOm8qqLjBrSZg=="; + }; + }; "@emmetio/extract-abbreviation-0.1.6" = { name = "_at_emmetio_slash_extract-abbreviation"; packageName = "@emmetio/extract-abbreviation"; @@ -1696,58 +1696,58 @@ let sha512 = "Ydf4LidRB/EBI+YrB+cVLqIseiRfjUI/AeHBgjGMtq3GroraDu81OV7zqophRgupngoL3iS3JUMDMnxO7g39qA=="; }; }; - "@expo/config-3.3.18" = { + "@expo/config-3.3.22" = { name = "_at_expo_slash_config"; packageName = "@expo/config"; - version = "3.3.18"; + version = "3.3.22"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/config/-/config-3.3.18.tgz"; - sha512 = "R78HOWnLcxdip3FBrfbxti+85jdoRNpXV0Eihb6dl+sBRNo4+uzBNEQQ1P7ICoTzrehdkhdXkQYflvQFuQXyAA=="; + url = "https://registry.npmjs.org/@expo/config/-/config-3.3.22.tgz"; + sha512 = "BzahndK+Uxsvzui1+9QiJXptjVPgbSCQ3saNVF4N3Wrxjyr0WXHNp3Gz3VAGkoHhoBlxZheslmiNoMwjG25xjw=="; }; }; - "@expo/config-plugins-1.0.7" = { + "@expo/config-plugins-1.0.13" = { name = "_at_expo_slash_config-plugins"; packageName = "@expo/config-plugins"; - version = "1.0.7"; + version = "1.0.13"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/config-plugins/-/config-plugins-1.0.7.tgz"; - sha512 = "Do7xH8kCnsFa4Rl/Z8Ja2i71N+OpQARUoJHCQTHzyttL9j1eYeLDBOB6Hrl1vf8jcFfBtuqf8QWvMQkwJ17uqA=="; + url = "https://registry.npmjs.org/@expo/config-plugins/-/config-plugins-1.0.13.tgz"; + sha512 = "/Wt1uZJlwMSi20GlKX4FOijX8wYMj7zVVp091M9hXeIc7btq84nkhhtdwa60qnM0RACHWqv25uVTQochjNQrfw=="; }; }; - "@expo/config-types-40.0.0-beta.1" = { + "@expo/config-types-40.0.0-beta.2" = { name = "_at_expo_slash_config-types"; packageName = "@expo/config-types"; - version = "40.0.0-beta.1"; + version = "40.0.0-beta.2"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/config-types/-/config-types-40.0.0-beta.1.tgz"; - sha512 = "hTp+6ZIKK57O8qhVoO+GBCkx0UCdOhwcWxaXfjpsELIR8LfXDGz8OmCxTzGvb7nnadcrGCccHBX5dO1NmPBbmg=="; + url = "https://registry.npmjs.org/@expo/config-types/-/config-types-40.0.0-beta.2.tgz"; + sha512 = "t9pHCQMXOP4nwd7LGXuHkLlFy0JdfknRSCAeVF4Kw2/y+5OBbR9hW9ZVnetpBf0kORrekgiI7K/qDaa3hh5+Qg=="; }; }; - "@expo/configure-splash-screen-0.2.1" = { + "@expo/configure-splash-screen-0.3.2" = { name = "_at_expo_slash_configure-splash-screen"; packageName = "@expo/configure-splash-screen"; - version = "0.2.1"; + version = "0.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/configure-splash-screen/-/configure-splash-screen-0.2.1.tgz"; - sha512 = "6n7ji1WKDCdLe2Mto4u4W72kTLhAbhXhC7ydVk1HxDYCcbewNLfgiwhchPtPGyUMnSDizVWph5aDoiKxqVHqNQ=="; + url = "https://registry.npmjs.org/@expo/configure-splash-screen/-/configure-splash-screen-0.3.2.tgz"; + sha512 = "+KvcPWv/EpAi9ng7KWsRCHUgN8qYcbpvrY8Pc3AtfPVHBhWuy7FhTdT0HUqjhOvqvwPF2Ygr//DHl8WBVg2ICA=="; }; }; - "@expo/dev-server-0.1.43" = { + "@expo/dev-server-0.1.48" = { name = "_at_expo_slash_dev-server"; packageName = "@expo/dev-server"; - version = "0.1.43"; + version = "0.1.48"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/dev-server/-/dev-server-0.1.43.tgz"; - sha512 = "FYLMoI7c1Myw5vCyx7nMEW6Oos40wx28TuHcticKPU+zZiYrzyIa4aJzEv4bWnw1if6417lKXjncYvQEZRyxFw=="; + url = "https://registry.npmjs.org/@expo/dev-server/-/dev-server-0.1.48.tgz"; + sha512 = "aiuoVLfF+NzFBU6WvLRbVjYDhoLky22q0hiTQ5by3996drF0XUj752lUI8ckN5+8qX4Aaij++wkPMaLiHQ1vNw=="; }; }; - "@expo/dev-tools-0.13.66" = { + "@expo/dev-tools-0.13.74" = { name = "_at_expo_slash_dev-tools"; packageName = "@expo/dev-tools"; - version = "0.13.66"; + version = "0.13.74"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/dev-tools/-/dev-tools-0.13.66.tgz"; - sha512 = "eg1KoEUXWLFF0a+whWDj1hdu/XGdAbUtx3pqI053/0cCI0g3GHAQvNA8gJ3NEeSHYQaLb7irK2rNE6lJTcUo8Q=="; + url = "https://registry.npmjs.org/@expo/dev-tools/-/dev-tools-0.13.74.tgz"; + sha512 = "at58TNplT3FT1UWEYzpCMwtP4mzBDT81ApIlyudsd4k+uX74wSf+4v5WPUbgu1UCZBUuo/40ddhS3rgUozu4eQ=="; }; }; "@expo/eas-build-job-0.1.2" = { @@ -1777,13 +1777,13 @@ let sha512 = "KFX6grWVzttaDskq/NK8ByqFPgpDZGFnyeZVeecGoKx5kU61zuR7/xQM04OvN6BNXq3jTUst1TyS8fXEfJuscA=="; }; }; - "@expo/metro-config-0.1.43" = { + "@expo/metro-config-0.1.48" = { name = "_at_expo_slash_metro-config"; packageName = "@expo/metro-config"; - version = "0.1.43"; + version = "0.1.48"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/metro-config/-/metro-config-0.1.43.tgz"; - sha512 = "ZkZXu2dVjZ88tiH51gqM3DUAmey18tM9MlDh91r1iLF6hHT6UeZD0lBDN7IJTQv/SJuAPQHoylXmAx6cuIGU9A=="; + url = "https://registry.npmjs.org/@expo/metro-config/-/metro-config-0.1.48.tgz"; + sha512 = "U2VkpNoecfCgju5Cfk9RyulrCwqWiGPCV1RSZPhP/yb6pSUyuQfYaxH5ULmrsYztp8hSfV0mqaVq5LPyhzczkw=="; }; }; "@expo/ngrok-2.4.3" = { @@ -1921,13 +1921,13 @@ let sha512 = "/zxESSNAjeBI7BlrFlmmLbEDNblJhR0fd9rZGPOwNlRoeojCJ0yh+nTUWXQtBgolffQMYq0LkTTjTDszqs4M+g=="; }; }; - "@expo/plist-0.0.10" = { + "@expo/plist-0.0.11" = { name = "_at_expo_slash_plist"; packageName = "@expo/plist"; - version = "0.0.10"; + version = "0.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/plist/-/plist-0.0.10.tgz"; - sha512 = "uKbi7ANPCNJqeAvxLa+ZcS/Qf0fTPOySMqw5T2L4TrycSAdiAxV1VUZ69IzIbUsWb7GdriUVR2i38M/xa6+BvA=="; + url = "https://registry.npmjs.org/@expo/plist/-/plist-0.0.11.tgz"; + sha512 = "yza93QHDkbdkdwu/PXef0eJSCMkMNdrHujK5G1viZLaZt0Rxw2s+geTyjgJsYpwqQEAoOYVpKlVymOenK+bFQg=="; }; }; "@expo/results-1.0.0" = { @@ -1939,13 +1939,13 @@ let sha512 = "qECzzXX5oJot3m2Gu9pfRDz50USdBieQVwYAzeAtQRUTD3PVeTK1tlRUoDcrK8PSruDLuVYdKkLebX4w/o55VA=="; }; }; - "@expo/schemer-1.3.22" = { + "@expo/schemer-1.3.23" = { name = "_at_expo_slash_schemer"; packageName = "@expo/schemer"; - version = "1.3.22"; + version = "1.3.23"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/schemer/-/schemer-1.3.22.tgz"; - sha512 = "ALB9FB0DwypyNT0sL4zlM6ncQxado8eT46MOTclGoWNkVWNeeZC8O0GYHoEXLOjvfNUP5j02ATtnXCqyXAz5Hg=="; + url = "https://registry.npmjs.org/@expo/schemer/-/schemer-1.3.23.tgz"; + sha512 = "ORDxT7mCTtiJZj1R44L5R8HvSMfTJk31qBAb57yx7WXY2crUrwZGwmZryUjGs0Z3BlrbwbsWTvF7CvVa6zy+Sg=="; }; }; "@expo/simple-spinner-1.0.2" = { @@ -1984,22 +1984,22 @@ let sha512 = "YaFAYYOOxImYNx9s6X3tY6fC1y6rka0KXstrs2zrS+vHyyBD8IOhNtIUvybHScM3jUL+qukgKElAb+7gzlF6Eg=="; }; }; - "@expo/webpack-config-0.12.48" = { + "@expo/webpack-config-0.12.52" = { name = "_at_expo_slash_webpack-config"; packageName = "@expo/webpack-config"; - version = "0.12.48"; + version = "0.12.52"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/webpack-config/-/webpack-config-0.12.48.tgz"; - sha512 = "uUmr+z9gpMNw6yUGinQkkN/GDPypLvySs/0pwUBF9w7xfaGeRKoEGYhNS8JaIXgmR3621eKi3F2pBlSoSFfiew=="; + url = "https://registry.npmjs.org/@expo/webpack-config/-/webpack-config-0.12.52.tgz"; + sha512 = "OOxIMaKa2O4JPDZpNMc+G40Z5MoOoRwvfU+331+ydqGzPDAev8/PtalnQbJTuqjVaU99QzVlrn1BfLWwJ/3fig=="; }; }; - "@expo/xdl-59.0.6" = { + "@expo/xdl-59.0.14" = { name = "_at_expo_slash_xdl"; packageName = "@expo/xdl"; - version = "59.0.6"; + version = "59.0.14"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/xdl/-/xdl-59.0.6.tgz"; - sha512 = "6YHUcVDF62L7IxdCzOasIv9mG/KiXnMofvAuCkAYUQZYNF6vAIQJxj+/JjWAYRfTj1JHdY0OFkVpICun0qJ2FA=="; + url = "https://registry.npmjs.org/@expo/xdl/-/xdl-59.0.14.tgz"; + sha512 = "h2czzd9nBhiafVp1JFPcP/VYqefKpNb8Om7oY6twm7GCFkX+tlZ8zYtkVfgE9WlOhtAOu8b56eKfjAOdUsqlGQ=="; }; }; "@fast-csv/format-4.3.5" = { @@ -2011,13 +2011,13 @@ let sha512 = "8iRn6QF3I8Ak78lNAa+Gdl5MJJBM5vRHivFtMRUWINdevNo00K7OXxS2PshawLKTejVwieIlPmK5YlLu6w4u8A=="; }; }; - "@fast-csv/parse-4.3.3" = { + "@fast-csv/parse-4.3.6" = { name = "_at_fast-csv_slash_parse"; packageName = "@fast-csv/parse"; - version = "4.3.3"; + version = "4.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/@fast-csv/parse/-/parse-4.3.3.tgz"; - sha512 = "mXrCmyyZxbcdW/kZ8tVMrb1DJrJMNGWxHmB4OSuEL96so/X14E1O0w5QFiyodfs+oXoNGwbku8bx2Lq2tiODAA=="; + url = "https://registry.npmjs.org/@fast-csv/parse/-/parse-4.3.6.tgz"; + sha512 = "uRsLYksqpbDmWaSmzvJcuApSEe38+6NQZBUsuAyMZKqHxH0g1wcJgsKUvN3WC8tewaqFjBMMGrkHmC+T7k8LvA=="; }; }; "@fluentui/date-time-utilities-7.9.0" = { @@ -2047,49 +2047,22 @@ let sha512 = "t3yIbbPKJubb22vQ/FIWwS9vFAzaPYzFxKWPHVWLtxs/P+5yL+LD3B16DRtYreWAdl9CZvEbos58ChLZ0KHwSQ=="; }; }; - "@fluentui/react-7.153.4" = { + "@fluentui/react-7.155.3" = { name = "_at_fluentui_slash_react"; packageName = "@fluentui/react"; - version = "7.153.4"; + version = "7.155.3"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react/-/react-7.153.4.tgz"; - sha512 = "ksglyptT/nkjChmIZ2OiushPJMMBfYgJHclMYqfp8Z4TGeXWPaYT6l5HfKeEZJTsMz3WtJpy+6MB48Yh4PYOLA=="; + url = "https://registry.npmjs.org/@fluentui/react/-/react-7.155.3.tgz"; + sha512 = "bVK9qMUqjWQ68UPkQGHCMnCKeH8uSlCLF2QgR9ESMV/g0sHUvRqCO1Yuj9JyO4NDanqfX62NDgJzimHKj1/MQg=="; }; }; - "@fluentui/react-compose-0.19.12" = { - name = "_at_fluentui_slash_react-compose"; - packageName = "@fluentui/react-compose"; - version = "0.19.12"; - src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react-compose/-/react-compose-0.19.12.tgz"; - sha512 = "GTcZ3kd2rTk3Q7xXJB8cTPfv0Q0vOdeIrLcJ02lXfjE9h3GPTE62rV4iFzBIZyXIKL8IdR6Jh8WNIBkVMWhhxw=="; - }; - }; - "@fluentui/react-focus-7.16.19" = { + "@fluentui/react-focus-7.17.0" = { name = "_at_fluentui_slash_react-focus"; packageName = "@fluentui/react-focus"; - version = "7.16.19"; + version = "7.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react-focus/-/react-focus-7.16.19.tgz"; - sha512 = "BUnSJ7CRs0gfaEXVr5w9YQsZXB18J35k7H7eyB5wLLLgwdK/ogt6uYcu3p0q5ZEjju8C/wmJ2zgwFCMKiAyTUA=="; - }; - }; - "@fluentui/react-stylesheets-0.2.4" = { - name = "_at_fluentui_slash_react-stylesheets"; - packageName = "@fluentui/react-stylesheets"; - version = "0.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react-stylesheets/-/react-stylesheets-0.2.4.tgz"; - sha512 = "zTyDxBsQsm5iz59SXn83+BrC3tUnwQdJc/xcPYWWVISIyPby/75URbWK5uYJ5p5Qy0GrpgKDGYAbpXZlN89SRQ=="; - }; - }; - "@fluentui/react-theme-provider-0.18.0" = { - name = "_at_fluentui_slash_react-theme-provider"; - packageName = "@fluentui/react-theme-provider"; - version = "0.18.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react-theme-provider/-/react-theme-provider-0.18.0.tgz"; - sha512 = "dKSOZ1Sl2uVrDzjvfRtwHUluedU0MhEASukyeqGTpKTmg3ucPMYEZn+dgzFqRNpjs9trbb++N8R6Z19CWokXOw=="; + url = "https://registry.npmjs.org/@fluentui/react-focus/-/react-focus-7.17.0.tgz"; + sha512 = "xr5LExRnLW9CNyWDkcMmvOAgOXru/GBTIKcVqNahgRf7CIyHraY0m/0gFblwNtPYQOS9ltM3c+fbyYvCXBZvEw=="; }; }; "@fluentui/react-window-provider-1.0.1" = { @@ -2110,6 +2083,51 @@ let sha512 = "pzqDZC2bVD6/S45Bnve4wmrXi4cN7XiCr+OhzvgmoQfDkm5vyXsa82/cVtif/zy1OFU96S9zOTtt3e+QQuGUUg=="; }; }; + "@google-cloud/paginator-3.0.5" = { + name = "_at_google-cloud_slash_paginator"; + packageName = "@google-cloud/paginator"; + version = "3.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@google-cloud/paginator/-/paginator-3.0.5.tgz"; + sha512 = "N4Uk4BT1YuskfRhKXBs0n9Lg2YTROZc6IMpkO/8DIHODtm5s3xY8K5vVBo23v/2XulY3azwITQlYWgT4GdLsUw=="; + }; + }; + "@google-cloud/precise-date-2.0.3" = { + name = "_at_google-cloud_slash_precise-date"; + packageName = "@google-cloud/precise-date"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@google-cloud/precise-date/-/precise-date-2.0.3.tgz"; + sha512 = "+SDJ3ZvGkF7hzo6BGa8ZqeK3F6Z4+S+KviC9oOK+XCs3tfMyJCh/4j93XIWINgMMDIh9BgEvlw4306VxlXIlYA=="; + }; + }; + "@google-cloud/projectify-2.0.1" = { + name = "_at_google-cloud_slash_projectify"; + packageName = "@google-cloud/projectify"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@google-cloud/projectify/-/projectify-2.0.1.tgz"; + sha512 = "ZDG38U/Yy6Zr21LaR3BTiiLtpJl6RkPS/JwoRT453G+6Q1DhlV0waNf8Lfu+YVYGIIxgKnLayJRfYlFJfiI8iQ=="; + }; + }; + "@google-cloud/promisify-2.0.3" = { + name = "_at_google-cloud_slash_promisify"; + packageName = "@google-cloud/promisify"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@google-cloud/promisify/-/promisify-2.0.3.tgz"; + sha512 = "d4VSA86eL/AFTe5xtyZX+ePUjE8dIFu2T8zmdeNBSa5/kNgXPCx/o/wbFNHAGLJdGnk1vddRuMESD9HbOC8irw=="; + }; + }; + "@google-cloud/pubsub-2.7.0" = { + name = "_at_google-cloud_slash_pubsub"; + packageName = "@google-cloud/pubsub"; + version = "2.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@google-cloud/pubsub/-/pubsub-2.7.0.tgz"; + sha512 = "wc/XOo5Ibo3GWmuaLu80EBIhXSdu2vf99HUqBbdsSSkmRNIka2HqoIhLlOFnnncQn0lZnGL7wtKGIDLoH9LiBg=="; + }; + }; "@graphql-cli/common-4.1.0" = { name = "_at_graphql-cli_slash_common"; packageName = "@graphql-cli/common"; @@ -2137,13 +2155,13 @@ let sha512 = "+ywPfK6N2Ddna6oOa5Qb1Mv7EA8LOwRNOAPP9dL37FEhksJM9pYqPSceUcqMqg7S9b0+Cgr78s408rgvurV3/Q=="; }; }; - "@graphql-tools/delegate-7.0.7" = { + "@graphql-tools/delegate-7.0.8" = { name = "_at_graphql-tools_slash_delegate"; packageName = "@graphql-tools/delegate"; - version = "7.0.7"; + version = "7.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/delegate/-/delegate-7.0.7.tgz"; - sha512 = "2sze+CJxu37b4jcQ4fyj6ap9TMnx8+NBtApSs1nWIVENzPE2510aNTsBHgSdTwSeV/tVIFkAtZZAlMEGYGXzQA=="; + url = "https://registry.npmjs.org/@graphql-tools/delegate/-/delegate-7.0.8.tgz"; + sha512 = "pS1wci7ZxzdCITRrMI66UA+6/E0Z1Yczd3QxJBDb4Kp0nTGy1xy7enGa0+i55EmCvKvuwyx+tzXzwA1fNGRJzg=="; }; }; "@graphql-tools/graphql-file-loader-6.2.6" = { @@ -2200,13 +2218,13 @@ let sha512 = "GabNT51ErVHE2riDH4EQdRusUsI+nMElT8LdFHyuP53v8gwtleAj+LePQ9jif4NYUe/JQVqO8V28vPcHrA7gfQ=="; }; }; - "@graphql-tools/url-loader-6.5.0" = { + "@graphql-tools/url-loader-6.7.1" = { name = "_at_graphql-tools_slash_url-loader"; packageName = "@graphql-tools/url-loader"; - version = "6.5.0"; + version = "6.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/url-loader/-/url-loader-6.5.0.tgz"; - sha512 = "lwjg5vhZ2VvuWAXuzPwvLJfLmVN+cXoFmV0UeBethgP0Zvy8nkm1V+3aFGoyGkhxnlQUfBg/PMidw/t+7vhfAg=="; + url = "https://registry.npmjs.org/@graphql-tools/url-loader/-/url-loader-6.7.1.tgz"; + sha512 = "7NJ1G5diJAuWYZszQf0mNwPipVMOjIIMteNkutdExBq4CgN0V1xa3/iC25CUrI7sZiq+D367zZNONmKf+3bA2Q=="; }; }; "@graphql-tools/utils-6.2.4" = { @@ -2218,22 +2236,49 @@ let sha512 = "ybgZ9EIJE3JMOtTrTd2VcIpTXtDrn2q6eiYkeYMKRVh3K41+LZa6YnR2zKERTXqTWqhobROwLt4BZbw2O3Aeeg=="; }; }; - "@graphql-tools/utils-7.1.4" = { + "@graphql-tools/utils-7.2.3" = { name = "_at_graphql-tools_slash_utils"; packageName = "@graphql-tools/utils"; - version = "7.1.4"; + version = "7.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/utils/-/utils-7.1.4.tgz"; - sha512 = "4lxmstMpgHSM1ULD+1X5AcPFaizkdBubB7H9Rqr7Wh6L9bxUHBHFB3bhaFXT7FI0xE01Pt0IMsZadOIlhVTXrg=="; + url = "https://registry.npmjs.org/@graphql-tools/utils/-/utils-7.2.3.tgz"; + sha512 = "9MvSKeo+8DM72706FvrUP8figQjRzSwBswWrXviyWyt3wSkk6MU2cURQKfMpc0I6nswZvkDSqYoQQ/6mazoXxA=="; }; }; - "@graphql-tools/wrap-7.0.4" = { + "@graphql-tools/wrap-7.0.5" = { name = "_at_graphql-tools_slash_wrap"; packageName = "@graphql-tools/wrap"; - version = "7.0.4"; + version = "7.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/wrap/-/wrap-7.0.4.tgz"; - sha512 = "txBs0W4k3WR86aEzBYXtKdGeeUXCNdRNxjQA/95T6ywNYoM8pw2mvpoXrWOvzbeaH3zwhbHY7kwii4atrC9irg=="; + url = "https://registry.npmjs.org/@graphql-tools/wrap/-/wrap-7.0.5.tgz"; + sha512 = "KCWBXsDfvG46GNUawRltJL4j9BMGoOG7oo3WEyCQP+SByWXiTe5cBF45SLDVQgdjljGNZhZ4Lq/7avIkF7/zDQ=="; + }; + }; + "@grpc/grpc-js-1.1.8" = { + name = "_at_grpc_slash_grpc-js"; + packageName = "@grpc/grpc-js"; + version = "1.1.8"; + src = fetchurl { + url = "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.1.8.tgz"; + sha512 = "64hg5rmEm6F/NvlWERhHmmgxbWU8nD2TMWE+9TvG7/WcOrFT3fzg/Uu631pXRFwmJ4aWO/kp9vVSlr8FUjBDLA=="; + }; + }; + "@grpc/proto-loader-0.5.5" = { + name = "_at_grpc_slash_proto-loader"; + packageName = "@grpc/proto-loader"; + version = "0.5.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.5.5.tgz"; + sha512 = "WwN9jVNdHRQoOBo9FDH7qU+mgfjPc8GygPYms3M+y3fbQLfnCe/Kv/E01t7JRgnrsOHH8euvSbed3mIalXhwqQ=="; + }; + }; + "@grpc/proto-loader-0.6.0-pre9" = { + name = "_at_grpc_slash_proto-loader"; + packageName = "@grpc/proto-loader"; + version = "0.6.0-pre9"; + src = fetchurl { + url = "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.6.0-pre9.tgz"; + sha512 = "oM+LjpEjNzW5pNJjt4/hq1HYayNeQT+eGrOPABJnYHv7TyNPDNzkQ76rDYZF86X5swJOa4EujEMzQ9iiTdPgww=="; }; }; "@gulp-sourcemaps/identity-map-1.0.2" = { @@ -2299,13 +2344,13 @@ let sha512 = "yN7kbciD87WzLGc5539Tn0sApjyiGHAJgKvG9W8C7O+6c7qmoQMfVs0W4bX17eqz6C78QJqqFrtgdK5EWf6Qow=="; }; }; - "@hapi/hoek-9.1.0" = { + "@hapi/hoek-9.1.1" = { name = "_at_hapi_slash_hoek"; packageName = "@hapi/hoek"; - version = "9.1.0"; + version = "9.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@hapi/hoek/-/hoek-9.1.0.tgz"; - sha512 = "i9YbZPN3QgfighY/1X1Pu118VUz2Fmmhd6b2n0/O8YVgGGfw0FbUYoA97k7FkpGJ+pLCFEDLUmAPPV4D1kpeFw=="; + url = "https://registry.npmjs.org/@hapi/hoek/-/hoek-9.1.1.tgz"; + sha512 = "CAEbWH7OIur6jEOzaai83jq3FmKmv4PmX1JYfs9IrYcGEVI/lyL1EXJGCj7eFVJ0bg5QR8LMxBlEtA+xKiLpFw=="; }; }; "@hapi/joi-15.1.1" = { @@ -2794,40 +2839,76 @@ let sha512 = "EjPkDQOzV/oZfbolEUgFT6SE++PtCccVBvjuACkttyCfl0P2jnpR49SwstyVLc2u8AwBAZEHHAw9lPYaMjtbXQ=="; }; }; - "@joplinapp/fork-htmlparser2-4.1.8" = { - name = "_at_joplinapp_slash_fork-htmlparser2"; - packageName = "@joplinapp/fork-htmlparser2"; - version = "4.1.8"; + "@joplin/fork-htmlparser2-4.1.14" = { + name = "_at_joplin_slash_fork-htmlparser2"; + packageName = "@joplin/fork-htmlparser2"; + version = "4.1.14"; src = fetchurl { - url = "https://registry.npmjs.org/@joplinapp/fork-htmlparser2/-/fork-htmlparser2-4.1.8.tgz"; - sha512 = "EZUzKlV6K8KV8DMm9PJW8fToBStA6GvoNKzn/zso8xmwFtMFsyAj/N8++0q7ZyzxJ+7N15GJNgELhxE5f9JY/g=="; + url = "https://registry.npmjs.org/@joplin/fork-htmlparser2/-/fork-htmlparser2-4.1.14.tgz"; + sha512 = "uE5StVO3A6XcQLd5CxRU+XU7ecAKX8lmTFnHlnhBkgn8V8CHsHIUfZy1uw+fZ4gnC0kenq6uiZavhDPBAkibKA=="; }; }; - "@joplinapp/fork-sax-1.2.12" = { - name = "_at_joplinapp_slash_fork-sax"; - packageName = "@joplinapp/fork-sax"; - version = "1.2.12"; + "@joplin/fork-sax-1.2.18" = { + name = "_at_joplin_slash_fork-sax"; + packageName = "@joplin/fork-sax"; + version = "1.2.18"; src = fetchurl { - url = "https://registry.npmjs.org/@joplinapp/fork-sax/-/fork-sax-1.2.12.tgz"; - sha512 = "TDdIKTv/THRusbN6cRIIGDrVWAp1JC7lS7faaaQtrJlKLFYAM2oeBIGHmDmxkC0MBFN/XPMiZl5bWBdSuy+C9g=="; + url = "https://registry.npmjs.org/@joplin/fork-sax/-/fork-sax-1.2.18.tgz"; + sha512 = "tlsBwoayPjEVjAsylCosflTtF4EgGrSP4b/2r5Ci640846YDPdg0nqKuOUs82Xmptc3QQcnjzRKW8+7Up9+lfQ=="; }; }; - "@joplinapp/lib-1.0.9" = { - name = "_at_joplinapp_slash_lib"; - packageName = "@joplinapp/lib"; - version = "1.0.9"; + "@joplin/lib-1.0.15" = { + name = "_at_joplin_slash_lib"; + packageName = "@joplin/lib"; + version = "1.0.15"; src = fetchurl { - url = "https://registry.npmjs.org/@joplinapp/lib/-/lib-1.0.9.tgz"; - sha512 = "fXRs/nKJNL36kZX/rfm4F3zaNse12cpXXZQNg+8txUcGTSFx7DBBu2r3x3QV33y6DxsjK9dW/CUM4NJUcXKMFQ=="; + url = "https://registry.npmjs.org/@joplin/lib/-/lib-1.0.15.tgz"; + sha512 = "wOA+fxi93b9qfuRV7Ynhc+uUmW2XDVMugHWzqDdiOPd394mYQSX21/Eqvxhd049SsHiqmsMo2scz7rNtFLMnuA=="; }; }; - "@joplinapp/renderer-1.0.17" = { - name = "_at_joplinapp_slash_renderer"; - packageName = "@joplinapp/renderer"; - version = "1.0.17"; + "@joplin/renderer-1.0.23" = { + name = "_at_joplin_slash_renderer"; + packageName = "@joplin/renderer"; + version = "1.0.23"; src = fetchurl { - url = "https://registry.npmjs.org/@joplinapp/renderer/-/renderer-1.0.17.tgz"; - sha512 = "uX7V8peMH+OHwmceEw6u0bgVuKNhNhnFaZWqyhnH0aCoemOCnjZ45VQSJfTM/2ljL8xFo1VTA9MoWUmLdU/QCg=="; + url = "https://registry.npmjs.org/@joplin/renderer/-/renderer-1.0.23.tgz"; + sha512 = "1gddYqDLxeyR96m1/9WQ7Ri2tbaIOEW+JmbZKst9HDsgj8LiNwtBha+y35KqRAS6pWimbcXh0RZDkA4DmQ2VOw=="; + }; + }; + "@joplin/turndown-4.0.36" = { + name = "_at_joplin_slash_turndown"; + packageName = "@joplin/turndown"; + version = "4.0.36"; + src = fetchurl { + url = "https://registry.npmjs.org/@joplin/turndown/-/turndown-4.0.36.tgz"; + sha512 = "lks0n5HTAsg0O71L9kLoTaASAU4NILG3SyDcX/10K1g2wpoUadmXQmznaa3WqY4RgN0gzRKaZV51d7JtO9ZwXQ=="; + }; + }; + "@joplin/turndown-plugin-gfm-1.0.18" = { + name = "_at_joplin_slash_turndown-plugin-gfm"; + packageName = "@joplin/turndown-plugin-gfm"; + version = "1.0.18"; + src = fetchurl { + url = "https://registry.npmjs.org/@joplin/turndown-plugin-gfm/-/turndown-plugin-gfm-1.0.18.tgz"; + sha512 = "6uUXRU5PILzKAUP50t9FOyMrpGgfpw2ugrZ8hAfV+PhNZsjSgsc+cSBBdjn/HIEgNCr9m7TlHSzscxrHg496Iw=="; + }; + }; + "@jsdevtools/ono-7.1.3" = { + name = "_at_jsdevtools_slash_ono"; + packageName = "@jsdevtools/ono"; + version = "7.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@jsdevtools/ono/-/ono-7.1.3.tgz"; + sha512 = "4JQNk+3mVzK3xh2rqd6RB4J46qUR19azEHBneZyTZM+c456qOrbbM/5xcR8huNCCcbVt7+UmizG6GuUvPvKUYg=="; + }; + }; + "@jsii/spec-1.16.0" = { + name = "_at_jsii_slash_spec"; + packageName = "@jsii/spec"; + version = "1.16.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@jsii/spec/-/spec-1.16.0.tgz"; + sha512 = "DH3rDGa781UmRtg/ykFyxrfhjaz1SRz2BblNXDxwArhl0aUiN5HOdzi9icX8CFwdB9+ZxTtXuxap3BwvLa5xnA=="; }; }; "@kwsites/file-exists-1.1.1" = { @@ -3379,13 +3460,31 @@ let sha512 = "RibeMnDPvlL8bFYW5C8cs4mbI3AHfQef73tnJCQ/SgrXZHehmHnsyWUiE7qDQCAo+B1RfTapvSyFF69iPj326A=="; }; }; - "@mdn/browser-compat-data-2.0.5" = { + "@mark.probst/typescript-json-schema-0.32.0" = { + name = "_at_mark.probst_slash_typescript-json-schema"; + packageName = "@mark.probst/typescript-json-schema"; + version = "0.32.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@mark.probst/typescript-json-schema/-/typescript-json-schema-0.32.0.tgz"; + sha512 = "OoD+5D7Mka80FIcmvPyuAKV7g5Of5S04R74S4DTAG8pr9REDWySUh9pOloro7SNFwWt/+2f90wyP+DtGHykVfg=="; + }; + }; + "@mark.probst/unicode-properties-1.1.0" = { + name = "_at_mark.probst_slash_unicode-properties"; + packageName = "@mark.probst/unicode-properties"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@mark.probst/unicode-properties/-/unicode-properties-1.1.0.tgz"; + sha512 = "7AQsO0hMmpqDledV7AhBuSYqYPFsKP9PaltMecX9nlnsyFxqtsqUg9/pvB2L/jxvskrDrNkdKYz2KTbQznCtng=="; + }; + }; + "@mdn/browser-compat-data-2.0.7" = { name = "_at_mdn_slash_browser-compat-data"; packageName = "@mdn/browser-compat-data"; - version = "2.0.5"; + version = "2.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/@mdn/browser-compat-data/-/browser-compat-data-2.0.5.tgz"; - sha512 = "JTosoRJrq5E8QYLwPfqB22zZxyBzUEx+1ooOPMcrFYgWplOeS8K8B6VD3WHD+9XV+R1X5vimruSL9ALYuxfD+A=="; + url = "https://registry.npmjs.org/@mdn/browser-compat-data/-/browser-compat-data-2.0.7.tgz"; + sha512 = "GeeM827DlzFFidn1eKkMBiqXFD2oLsnZbaiGhByPl0vcapsRzUL+t9hDoov1swc9rB2jw64R+ihtzC8qOE9wXw=="; }; }; "@medv/blessed-2.0.1" = { @@ -3397,13 +3496,13 @@ let sha512 = "/NdX1Ql8hKNM0vHFJnEr/bcw6BG0ULHD3HhInpniZw5ixpl+n/QIRfMEEmLCn7acedbM1zGdZvU5ZMbn9kcF5Q=="; }; }; - "@microsoft/load-themed-styles-1.10.139" = { + "@microsoft/load-themed-styles-1.10.141" = { name = "_at_microsoft_slash_load-themed-styles"; packageName = "@microsoft/load-themed-styles"; - version = "1.10.139"; + version = "1.10.141"; src = fetchurl { - url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.139.tgz"; - sha512 = "nqKpS5lfFaJGDATrwT+T2hM4WSMlBDwfh9W7+xgqfOQkV6h8y7uZq8Exro9C276Y3qd7M6jZ3pavSmsWgLk79w=="; + url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.141.tgz"; + sha512 = "IWqbTWhxpp10X2nZI14oqbPtzrRLvXtyX7sV/QDfVBtQQivLilZFynr/X69SAZtbSp/wi7WI8gKl2/6TuTNN1A=="; }; }; "@mozilla/readability-0.3.0" = { @@ -3433,13 +3532,13 @@ let sha512 = "Vwhc3ObxmDZmA5hY8mfsau2rJ4vGPvzbj20QSZ2/E1GDPF61QVyjLfNHak9xmel6pW4heRt3v1fHa6np9Ehfeg=="; }; }; - "@nestjs/schematics-7.2.2" = { + "@nestjs/schematics-7.2.6" = { name = "_at_nestjs_slash_schematics"; packageName = "@nestjs/schematics"; - version = "7.2.2"; + version = "7.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/@nestjs/schematics/-/schematics-7.2.2.tgz"; - sha512 = "3y0LE1z50CEzXr5rFlOpaJ+0ctkyQWtREkMuvQd/SUILF75+6cNTqmfjjnUJw12vdkdkc+zsksgXFWEPkns4Pg=="; + url = "https://registry.npmjs.org/@nestjs/schematics/-/schematics-7.2.6.tgz"; + sha512 = "4geGO9pjYG4Sc4Qi+pkUVIbaxPEeySHi/z17po8nP9uaPPo8AUKP9rXjNL+mhMrXqFlB/hhN6xBBYtMyL5pB2Q=="; }; }; "@netflix/nerror-1.1.3" = { @@ -3451,13 +3550,13 @@ let sha512 = "b+MGNyP9/LXkapreJzNUzcvuzZslj/RGgdVVJ16P2wSlYatfLycPObImqVJSmNAdyeShvNeM/pl3sVZsObFueg=="; }; }; - "@netlify/build-5.5.5" = { + "@netlify/build-8.0.1" = { name = "_at_netlify_slash_build"; packageName = "@netlify/build"; - version = "5.5.5"; + version = "8.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/build/-/build-5.5.5.tgz"; - sha512 = "uzQH5y8mzipgrIWpVDJSdHRY6pav9KOXfx4OVj64SdQbA6DZB834LjXjJBI3TNf2qSz/wRoP5iY1NVLXZ8zivA=="; + url = "https://registry.npmjs.org/@netlify/build/-/build-8.0.1.tgz"; + sha512 = "DOBUR4x0GEmi4hD8LagJfPCtxnaAtjRTJgZdTx9lFngC2OHY+xIwGZ3Ilct1b3vbAcl0SzHA+HZ4xrG2V/EWdw=="; }; }; "@netlify/cache-utils-1.0.6" = { @@ -3478,22 +3577,22 @@ let sha512 = "Z7yzbx5qCX2I5RLlNyo0MMQ6GKJc8o5Nej9yspCavjqgYlUS7VJfbeE67WNxC26FXwDUqq00zJ0MrCS0Un1YOw=="; }; }; - "@netlify/config-2.4.1" = { + "@netlify/config-2.4.3" = { name = "_at_netlify_slash_config"; packageName = "@netlify/config"; - version = "2.4.1"; + version = "2.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/config/-/config-2.4.1.tgz"; - sha512 = "fSRSN3+c5kcyaCEd7XVlPRz820y/CRS8ryuE2fZAT/sgXiGBPGGKHwSKMNlso7s0qtJOmFyjeehU6nEzvfNKrg=="; + url = "https://registry.npmjs.org/@netlify/config/-/config-2.4.3.tgz"; + sha512 = "Uz7Oo3tJP2VTgNgsJtRlwAhO5jTozkpNMCKALb814ssJKx7nE/4QvNxJPCQNBDXY9BSeXVIPfy0vMfshxatL+g=="; }; }; - "@netlify/functions-utils-1.3.2" = { + "@netlify/functions-utils-1.3.4" = { name = "_at_netlify_slash_functions-utils"; packageName = "@netlify/functions-utils"; - version = "1.3.2"; + version = "1.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/functions-utils/-/functions-utils-1.3.2.tgz"; - sha512 = "1/Jw1p4zxORIC8Nkglzf7bQEIjuALHFfi2e8tEqQfQUZ6pbBNy8bP3pcXZKpYc+fkrYKQaaqpKrfr+GjPHnT2Q=="; + url = "https://registry.npmjs.org/@netlify/functions-utils/-/functions-utils-1.3.4.tgz"; + sha512 = "AkVd03D6K7Uwli+t5xTMm5c1jn1HRFY3YgslLV91huHI++3CjOsGpsnDfhoN2kj1aN8OLqliTOvs4PQHC2dKpw=="; }; }; "@netlify/git-utils-1.0.6" = { @@ -3514,6 +3613,15 @@ let sha512 = "kkRCzA71HugJxmPOcWv2B4ArHhSMKjs2ArGBr10ndocVLdAHwCYoJm0X4Xt8IYaOcGD9Lm4fbLjpXDLDRGDzPw=="; }; }; + "@netlify/open-api-1.0.0" = { + name = "_at_netlify_slash_open-api"; + packageName = "@netlify/open-api"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@netlify/open-api/-/open-api-1.0.0.tgz"; + sha512 = "LAicAlsAZXybGtKzaOTmIYelSe82vgZlc17IeNUQxab2IlUCH7VhTKCx9EyJEgiXhLvmYoOjuYE1Ee9ZsnrybA=="; + }; + }; "@netlify/plugin-edge-handlers-1.10.0" = { name = "_at_netlify_slash_plugin-edge-handlers"; packageName = "@netlify/plugin-edge-handlers"; @@ -3523,13 +3631,13 @@ let sha512 = "ZgabL4Q+DfB5lqq36QYvGIhLifoiVz5oDfqLp1w7hRsJYwUhUPqeJx/0zph17ZaJB4CvHRadFOeyJeDSkzrERg=="; }; }; - "@netlify/plugins-list-2.0.1" = { + "@netlify/plugins-list-2.2.0" = { name = "_at_netlify_slash_plugins-list"; packageName = "@netlify/plugins-list"; - version = "2.0.1"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/plugins-list/-/plugins-list-2.0.1.tgz"; - sha512 = "QSEtEfitpoFBcn+PKp+FnbhF6buEIAbTMzgUNgwCJCqEg0am6NZ0CLvqUDEw6mDzy4WyoX/3jPqHw4TMihg8aw=="; + url = "https://registry.npmjs.org/@netlify/plugins-list/-/plugins-list-2.2.0.tgz"; + sha512 = "8OCwatZIPsyze2KZ8fj21/+luzdTA78fxQ6p7UFLE9IRJlZqCRVXtgiIVd/HtEr6B9OacywX3fV1hVRBVlbmDA=="; }; }; "@netlify/run-utils-1.0.5" = { @@ -3577,13 +3685,22 @@ let sha512 = "u6Beazs0KWRcEx9q2n417Sj7+WGrDTtDGmmKPTE6WexFt6uY1oiq3AR+ohCtu1lIIsmAfAYd8O5dSOnyAT8dFg=="; }; }; - "@netlify/zip-it-and-ship-it-1.5.0" = { + "@netlify/zip-it-and-ship-it-1.7.0" = { name = "_at_netlify_slash_zip-it-and-ship-it"; packageName = "@netlify/zip-it-and-ship-it"; - version = "1.5.0"; + version = "1.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/zip-it-and-ship-it/-/zip-it-and-ship-it-1.5.0.tgz"; - sha512 = "hTUVtCdjrWso28Lwi+A9GO+WZhVJcJWvXO0YuYlBcGY67Lv61TQQl7nNvzgGYG7UNnzvsnTafe1pL2v+4u4vmg=="; + url = "https://registry.npmjs.org/@netlify/zip-it-and-ship-it/-/zip-it-and-ship-it-1.7.0.tgz"; + sha512 = "7Fatc5OoRZ7V2tusx1CBWIdk9hXrr0JWoW547wsmopCkCl5O4TaLxw12CgfW6EQsjaufSnuQddzvnx5y1b5gGQ=="; + }; + }; + "@netlify/zip-it-and-ship-it-2.0.0" = { + name = "_at_netlify_slash_zip-it-and-ship-it"; + packageName = "@netlify/zip-it-and-ship-it"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@netlify/zip-it-and-ship-it/-/zip-it-and-ship-it-2.0.0.tgz"; + sha512 = "DQQldFTRmEPHpvvKxAKLNk/RqVIfzZGsBcbmruy3zupPG2W+pGHnQUSMNXrUZmMkqekDh0nCHf8MfG0EakRqGg=="; }; }; "@node-red/editor-api-1.2.6" = { @@ -3640,13 +3757,13 @@ let sha512 = "CYUCS8iqcaZFBf0vwtVPqqNXX0XY0ajFW69smtDItbxslyZL3A0qRMiTTv0qMPA1uvOCEw4wQRSIQV7j/nd0yw=="; }; }; - "@nodelib/fs.scandir-2.1.3" = { + "@nodelib/fs.scandir-2.1.4" = { name = "_at_nodelib_slash_fs.scandir"; packageName = "@nodelib/fs.scandir"; - version = "2.1.3"; + version = "2.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz"; - sha512 = "eGmwYQn3gxo4r7jdQnkrrN6bY478C3P+a/y72IJukF8LjB6ZHeB3c+Ehacj3sYeSmUXGlnA67/PmbM9CVwL7Dw=="; + url = "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz"; + sha512 = "33g3pMJk3bg5nXbL/+CY6I2eJDzZAni49PfJnL5fghPTggPvBd/pFNSgJsdAgWptuFu7qq/ERvOYFlhvsLTCKA=="; }; }; "@nodelib/fs.stat-1.1.3" = { @@ -3658,22 +3775,22 @@ let sha512 = "shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw=="; }; }; - "@nodelib/fs.stat-2.0.3" = { + "@nodelib/fs.stat-2.0.4" = { name = "_at_nodelib_slash_fs.stat"; packageName = "@nodelib/fs.stat"; - version = "2.0.3"; + version = "2.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.3.tgz"; - sha512 = "bQBFruR2TAwoevBEd/NWMoAAtNGzTRgdrqnYCc7dhzfoNvqPzLyqlEQnzZ3kVnNrSp25iyxE00/3h2fqGAGArA=="; + url = "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.4.tgz"; + sha512 = "IYlHJA0clt2+Vg7bccq+TzRdJvv19c2INqBSsoOLp1je7xjtr7J26+WXR72MCdvU9q1qTzIWDfhMf+DRvQJK4Q=="; }; }; - "@nodelib/fs.walk-1.2.4" = { + "@nodelib/fs.walk-1.2.6" = { name = "_at_nodelib_slash_fs.walk"; packageName = "@nodelib/fs.walk"; - version = "1.2.4"; + version = "1.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.4.tgz"; - sha512 = "1V9XOY4rDW0rehzbrcqAmHnz8e7SKvX27gh8Gt2WgB0+pdzdiLV83p72kZPU+jvMbS1qU5mauP2iOvO8rhmurQ=="; + url = "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.6.tgz"; + sha512 = "8Broas6vTtW4GIXTAHDoE32hnN2M5ykgCpWGbuXHQ15vEMqr23pB76e/GZcYsZCHALv50ktd24qhEyKr6wBtow=="; }; }; "@npmcli/ci-detect-1.3.0" = { @@ -3802,13 +3919,13 @@ let sha512 = "Afchpdd8FNfx9GaU/1D9IzyfiXvjfGybgzQ6G4GTFvPO0/hLdkXX3YyYq+SnxE6/bCrhg4pleiB+GuJACmmkEA=="; }; }; - "@oclif/plugin-autocomplete-0.2.0" = { + "@oclif/plugin-autocomplete-0.2.1" = { name = "_at_oclif_slash_plugin-autocomplete"; packageName = "@oclif/plugin-autocomplete"; - version = "0.2.0"; + version = "0.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@oclif/plugin-autocomplete/-/plugin-autocomplete-0.2.0.tgz"; - sha512 = "pHbaE2PH7d9lHjCgFrrQ+ZIwvY+7OAQaGoaANqDbicBNDK/Rszt4N4oGj22dJT7sCQ8a/3Eh942rjxYIq9Mi9Q=="; + url = "https://registry.npmjs.org/@oclif/plugin-autocomplete/-/plugin-autocomplete-0.2.1.tgz"; + sha512 = "EOcoh1x3auFg1a7NNVTT+hJ1PPih7Kg1it7WtG8oBgYKe+YD/bvHnX2QlXqi9S7H0XsQQMUb8hxbLP+XwQY/8Q=="; }; }; "@oclif/plugin-help-1.2.11" = { @@ -3829,13 +3946,13 @@ let sha512 = "bGHUdo5e7DjPJ0vTeRBMIrfqTRDBfyR5w0MP41u0n3r7YG5p14lvMmiCXxi6WDaP2Hw5nqx3PnkAIntCKZZN7g=="; }; }; - "@oclif/plugin-help-3.2.0" = { + "@oclif/plugin-help-3.2.1" = { name = "_at_oclif_slash_plugin-help"; packageName = "@oclif/plugin-help"; - version = "3.2.0"; + version = "3.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@oclif/plugin-help/-/plugin-help-3.2.0.tgz"; - sha512 = "7jxtpwVWAVbp1r46ZnTK/uF+FeZc6y4p1XcGaIUuPAp7wx6NJhIRN/iMT9UfNFX/Cz7mq+OyJz+E+i0zrik86g=="; + url = "https://registry.npmjs.org/@oclif/plugin-help/-/plugin-help-3.2.1.tgz"; + sha512 = "vq7rn16TrQmjX3Al/k1Z5iBZWZ3HE8fDXs52OmDJmmTqryPSNvURH9WCAsqr0PODYCSR17Hy1VTzS0x7vVVLEQ=="; }; }; "@oclif/plugin-not-found-1.2.4" = { @@ -3847,15 +3964,6 @@ let sha512 = "G440PCuMi/OT8b71aWkR+kCWikngGtyRjOR24sPMDbpUFV4+B3r51fz1fcqeUiiEOYqUpr0Uy/sneUe1O/NfBg=="; }; }; - "@oclif/plugin-plugins-1.9.3" = { - name = "_at_oclif_slash_plugin-plugins"; - packageName = "@oclif/plugin-plugins"; - version = "1.9.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@oclif/plugin-plugins/-/plugin-plugins-1.9.3.tgz"; - sha512 = "DyrSP3sRPWOiQI0ae4OuUpjdYpCr5YS1cSzXNGL9uDVwKM4YVXvk9v0tzNzd1008oaNNXO/XDedPkAaoX110Mg=="; - }; - }; "@oclif/plugin-plugins-1.9.4" = { name = "_at_oclif_slash_plugin-plugins"; packageName = "@oclif/plugin-plugins"; @@ -3865,6 +3973,15 @@ let sha512 = "C5hEbX4zzTjzbym2RJUE4wxz2aL2ocb826HDs3suscsjMPA3mRHyu8/rWJW1Cgc2MeoIybNdrfyPU/zmpWkaWw=="; }; }; + "@oclif/plugin-plugins-1.9.5" = { + name = "_at_oclif_slash_plugin-plugins"; + packageName = "@oclif/plugin-plugins"; + version = "1.9.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@oclif/plugin-plugins/-/plugin-plugins-1.9.5.tgz"; + sha512 = "8U1MKPTaitCBj4HPZpwFo7F5Krw9zEaNqKiX+QkvPz2wfftLqnSqariYvP38S/uo8CDwiR3zHPEYFSxu9CDQQA=="; + }; + }; "@oclif/plugin-warn-if-update-available-1.7.0" = { name = "_at_oclif_slash_plugin-warn-if-update-available"; packageName = "@oclif/plugin-warn-if-update-available"; @@ -3901,13 +4018,13 @@ let sha512 = "9+Xef8nT7OKZglfkOMm7IL6VwxXUQyR7DUSU0LH/F7VNqs8vyd7es5pTfz9E7DwUIx7R3pGscxu1EBhYljyu7Q=="; }; }; - "@octokit/openapi-types-2.0.0" = { + "@octokit/openapi-types-2.0.1" = { name = "_at_octokit_slash_openapi-types"; packageName = "@octokit/openapi-types"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-2.0.0.tgz"; - sha512 = "J4bfM7lf8oZvEAdpS71oTvC1ofKxfEZgU5vKVwzZKi4QPiL82udjpseJwxPid9Pu2FNmyRQOX4iEj6W1iOSnPw=="; + url = "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-2.0.1.tgz"; + sha512 = "9AuC04PUnZrjoLiw3uPtwGh9FE4Q3rTqs51oNlQ0rkwgE8ftYsOC+lsrQyvCvWm85smBbSc0FNRKKumvGyb44Q=="; }; }; "@octokit/plugin-enterprise-rest-6.0.1" = { @@ -3991,13 +4108,13 @@ let sha512 = "O75k56TYvJ8WpAakWwYRN8Bgu60KrmX0z1KqFp1kNiFNkgW+JW+9EBKZ+S33PU6SLvbihqd+3drvPxKK68Ee8Q=="; }; }; - "@octokit/types-6.1.1" = { + "@octokit/types-6.1.2" = { name = "_at_octokit_slash_types"; packageName = "@octokit/types"; - version = "6.1.1"; + version = "6.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/types/-/types-6.1.1.tgz"; - sha512 = "btm3D6S7VkRrgyYF31etUtVY/eQ1KzrNRqhFt25KSe2mKlXuLXJilglRC6eDA2P6ou94BUnk/Kz5MPEolXgoiw=="; + url = "https://registry.npmjs.org/@octokit/types/-/types-6.1.2.tgz"; + sha512 = "LPCpcLbcky7fWfHCTuc7tMiSHFpFlrThJqVdaHgowBTMS0ijlZFfonQC/C1PrZOjD4xRCYgBqH9yttEATGE/nw=="; }; }; "@opencensus/core-0.0.8" = { @@ -4027,310 +4144,364 @@ let sha512 = "PffXX2AL8Sh0VHQ52jJC4u3T0H6wDK6N/4bg7xh4ngMYOIi13aR1kzVvX1sVDBgfGwDOkMbl4c54Xm3tlPx/+A=="; }; }; - "@ot-builder/bin-composite-types-0.10.34" = { + "@opentelemetry/api-0.11.0" = { + name = "_at_opentelemetry_slash_api"; + packageName = "@opentelemetry/api"; + version = "0.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@opentelemetry/api/-/api-0.11.0.tgz"; + sha512 = "K+1ADLMxduhsXoZ0GRfi9Pw162FvzBQLDQlHru1lg86rpIU+4XqdJkSGo6y3Kg+GmOWq1HNHOA/ydw/rzHQkRg=="; + }; + }; + "@opentelemetry/context-base-0.11.0" = { + name = "_at_opentelemetry_slash_context-base"; + packageName = "@opentelemetry/context-base"; + version = "0.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@opentelemetry/context-base/-/context-base-0.11.0.tgz"; + sha512 = "ESRk+572bftles7CVlugAj5Azrz61VO0MO0TS2pE9MLVL/zGmWuUBQryART6/nsrFqo+v9HPt37GPNcECTZR1w=="; + }; + }; + "@opentelemetry/core-0.11.0" = { + name = "_at_opentelemetry_slash_core"; + packageName = "@opentelemetry/core"; + version = "0.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@opentelemetry/core/-/core-0.11.0.tgz"; + sha512 = "ZEKjBXeDGBqzouz0uJmrbEKNExEsQOhsZ3tJDCLcz5dUNoVw642oIn2LYWdQK2YdIfZbEmltiF65/csGsaBtFA=="; + }; + }; + "@opentelemetry/resources-0.11.0" = { + name = "_at_opentelemetry_slash_resources"; + packageName = "@opentelemetry/resources"; + version = "0.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@opentelemetry/resources/-/resources-0.11.0.tgz"; + sha512 = "o7DwV1TcezqBtS5YW2AWBcn01nVpPptIbTr966PLlVBcS//w8LkjeOShiSZxQ0lmV4b2en0FiSouSDoXk/5qIQ=="; + }; + }; + "@opentelemetry/semantic-conventions-0.11.0" = { + name = "_at_opentelemetry_slash_semantic-conventions"; + packageName = "@opentelemetry/semantic-conventions"; + version = "0.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-0.11.0.tgz"; + sha512 = "xsthnI/J+Cx0YVDGgUzvrH0ZTtfNtl866M454NarYwDrc0JvC24sYw+XS5PJyk2KDzAHtb0vlrumUc1OAut/Fw=="; + }; + }; + "@opentelemetry/tracing-0.11.0" = { + name = "_at_opentelemetry_slash_tracing"; + packageName = "@opentelemetry/tracing"; + version = "0.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@opentelemetry/tracing/-/tracing-0.11.0.tgz"; + sha512 = "QweFmxzl32BcyzwdWCNjVXZT1WeENNS/RWETq/ohqu+fAsTcMyGcr6cOq/yDdFmtBy+bm5WVVdeByEjNS+c4/w=="; + }; + }; + "@ot-builder/bin-composite-types-0.10.37" = { name = "_at_ot-builder_slash_bin-composite-types"; packageName = "@ot-builder/bin-composite-types"; - version = "0.10.34"; + version = "0.10.37"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/bin-composite-types/-/bin-composite-types-0.10.34.tgz"; - sha512 = "Tapb8mSXEZcmZNwB9KKo0CFLu8ZajAEAqxH07Py/lvS+2Rpe6LZWoPbLcHRwAP47cHbbO3IxZLWhvlWfOmaxHA=="; + url = "https://registry.npmjs.org/@ot-builder/bin-composite-types/-/bin-composite-types-0.10.37.tgz"; + sha512 = "TJ4mDLP0sHES4HjUry9fJTEHGb8bC51nF0OqBDR+lNCt3OHi5VVtE1Ph8QqxoglfTypLfTyXRcP8kXC+vV0Q/g=="; }; }; - "@ot-builder/bin-util-0.10.34" = { + "@ot-builder/bin-util-0.10.37" = { name = "_at_ot-builder_slash_bin-util"; packageName = "@ot-builder/bin-util"; - version = "0.10.34"; + version = "0.10.37"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/bin-util/-/bin-util-0.10.34.tgz"; - sha512 = "hyu0SLfWzMG9VKy54Nmxa723owd6o3miF1NR5FN/ff+ZkWbRqzSCm7haw40801ESC2DqMWjeZDyJBU4A+aHMFQ=="; + url = "https://registry.npmjs.org/@ot-builder/bin-util/-/bin-util-0.10.37.tgz"; + sha512 = "RR93ek6moT25cNC3eCc9QsGWxj3vOlTfryNybDTUVFEwhXi2EWXJ+cOvjKPOxplNY17YxzxffhqXX0qdX/Y6JQ=="; }; }; - "@ot-builder/cli-help-shower-0.10.34" = { + "@ot-builder/cli-help-shower-0.10.37" = { name = "_at_ot-builder_slash_cli-help-shower"; packageName = "@ot-builder/cli-help-shower"; - version = "0.10.34"; + version = "0.10.37"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/cli-help-shower/-/cli-help-shower-0.10.34.tgz"; - sha512 = "bCo9xNGvXSkEN7e8mK7sFHYLoCEsGIzPoZeyeWbEe4rWC6FQAAPWwlzCWldaNcbK/nGJsHYiHxLGO3LjeFl00A=="; + url = "https://registry.npmjs.org/@ot-builder/cli-help-shower/-/cli-help-shower-0.10.37.tgz"; + sha512 = "nkSDmkUROYEVAkZqd60p0WYvWAIDyv2EVN0Bon7X8fxk4Kg92ApD6yzvRUY6WrZKIV+AAM37UUodURgLG3c/Vg=="; }; }; - "@ot-builder/cli-proc-0.10.34" = { + "@ot-builder/cli-proc-0.10.37" = { name = "_at_ot-builder_slash_cli-proc"; packageName = "@ot-builder/cli-proc"; - version = "0.10.34"; + version = "0.10.37"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/cli-proc/-/cli-proc-0.10.34.tgz"; - sha512 = "nckPcf5wm1nGm2Aw+JXllYGp5MGdJzGqYoS7wAbkA2i371rhD8LM6j+hQNorZ07rb6rFc2v09MMtuNmO8CpoaA=="; + url = "https://registry.npmjs.org/@ot-builder/cli-proc/-/cli-proc-0.10.37.tgz"; + sha512 = "5X+DBnVQrByPwGz8UlVnsldpxIKgwbZG3RndI75y2HZc/rZ5fgaAuTyjVhqxrIpLeNBv3InnTybu3QBbAouiuQ=="; }; }; - "@ot-builder/cli-shared-0.10.34" = { + "@ot-builder/cli-shared-0.10.37" = { name = "_at_ot-builder_slash_cli-shared"; packageName = "@ot-builder/cli-shared"; - version = "0.10.34"; + version = "0.10.37"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/cli-shared/-/cli-shared-0.10.34.tgz"; - sha512 = "tCH4OJnc+9trMBffqZDW/tHmRj72+sqwE9JNCBRA4iabiL8rQQEKWLm3iYEygS7/X7oZSLU+idQK+gI/9rLy0Q=="; + url = "https://registry.npmjs.org/@ot-builder/cli-shared/-/cli-shared-0.10.37.tgz"; + sha512 = "tiRMqvsiQ+TlP+00kMC93AW1ti9ip6kTGstjzXkDhYD9nulyyGUO6Kwx27M0DS4hFcMQXeUDd65JAOaDN5XVcQ=="; }; }; - "@ot-builder/common-impl-0.10.34" = { + "@ot-builder/common-impl-0.10.37" = { name = "_at_ot-builder_slash_common-impl"; packageName = "@ot-builder/common-impl"; - version = "0.10.34"; + version = "0.10.37"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/common-impl/-/common-impl-0.10.34.tgz"; - sha512 = "igfcrSnhHEJZdziq1XKFnb2ZV82t/+3Ez+1lE9N0V542CzhRsGKHDcd1X3msfhRqc88ykl+zW/sKWLWvsnseKA=="; + url = "https://registry.npmjs.org/@ot-builder/common-impl/-/common-impl-0.10.37.tgz"; + sha512 = "oEl8l7313MfTRoouKGaPw5oDO8W8vq7EbS6Zg7GIh7yX5cjdXfvjS8pb9Nn2MUPcBJZ7nCGWO4mCYMSNT9Llug=="; }; }; - "@ot-builder/errors-0.10.34" = { + "@ot-builder/errors-0.10.37" = { name = "_at_ot-builder_slash_errors"; packageName = "@ot-builder/errors"; - version = "0.10.34"; + version = "0.10.37"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/errors/-/errors-0.10.34.tgz"; - sha512 = "p/vBXtzbFt34KC4fgAHxpbxTVI12rVcbyPvTu6dmwAkwaQG6gF22STwdc5rK9Qllr475Ppkojfp165udUo250g=="; + url = "https://registry.npmjs.org/@ot-builder/errors/-/errors-0.10.37.tgz"; + sha512 = "1dQK50SBwEP2QWV5NBZAYTIqvIOXGQTFS4LVAUYBhhXYgBkbh58g8Cyhd7MDqf/VlCohuhZ/VxHZDjFsZse0Kg=="; }; }; - "@ot-builder/io-bin-cff-0.10.34" = { + "@ot-builder/io-bin-cff-0.10.37" = { name = "_at_ot-builder_slash_io-bin-cff"; packageName = "@ot-builder/io-bin-cff"; - version = "0.10.34"; + version = "0.10.37"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-cff/-/io-bin-cff-0.10.34.tgz"; - sha512 = "GvL+LGXXgJtHoSr00Qkm/LI9dpMJXXkXzZFjpfIyjx5o74ao7zod85SjxfBqzVdRUFcNvVbOSIiM7xrW1IgiTA=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-cff/-/io-bin-cff-0.10.37.tgz"; + sha512 = "Cyhw7PddXzzRwflhBNX2ta+kRmfCGhS8v+XtTOmS/WX/bPwJRJInf4DGYB+NmhCfK51dmNxA9SJEf/lHsVoSrw=="; }; }; - "@ot-builder/io-bin-encoding-0.10.34" = { + "@ot-builder/io-bin-encoding-0.10.37" = { name = "_at_ot-builder_slash_io-bin-encoding"; packageName = "@ot-builder/io-bin-encoding"; - version = "0.10.34"; + version = "0.10.37"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-encoding/-/io-bin-encoding-0.10.34.tgz"; - sha512 = "euzzwHXtjVTiFa5RPonkYOOP/rX0vqeUfupW6SiGIPrp0YszrjHGbWk+pLxxkbTteA30o+Xc7IQ8sppXd+AGGw=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-encoding/-/io-bin-encoding-0.10.37.tgz"; + sha512 = "N2N0aJMz/pyt/TEgo0d9mlJQuOEcYf63p6ZPxCgnaiweb8QRFQa71WoWqlHLrZYKQRg8TU1xdRrrLzn6MpV/KA=="; }; }; - "@ot-builder/io-bin-ext-private-0.10.34" = { + "@ot-builder/io-bin-ext-private-0.10.37" = { name = "_at_ot-builder_slash_io-bin-ext-private"; packageName = "@ot-builder/io-bin-ext-private"; - version = "0.10.34"; + version = "0.10.37"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-ext-private/-/io-bin-ext-private-0.10.34.tgz"; - sha512 = "5TjCMXPLR6mfpG0E3h/EvKWuaLzoLOJQZxlnAeHh2zg5w0uzoMFArxhY08cE7iKlITQLlLwV5EgagcgjmD+xrw=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-ext-private/-/io-bin-ext-private-0.10.37.tgz"; + sha512 = "WO/omCDnkA+4M6OTSATzSfDRCpHQPkbm2l8HjVEvCj9lENEGDlB10qVUfHhS9OJRGyQ1zC2Sgz1uCP7fUPmpPQ=="; }; }; - "@ot-builder/io-bin-font-0.10.34" = { + "@ot-builder/io-bin-font-0.10.37" = { name = "_at_ot-builder_slash_io-bin-font"; packageName = "@ot-builder/io-bin-font"; - version = "0.10.34"; + version = "0.10.37"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-font/-/io-bin-font-0.10.34.tgz"; - sha512 = "wfPhUDtg8f4WL/tAS031qVXR33HCa8zC4K+TfMWgLeVhApPGtT8qhPsUN7VMZwvu6L92YYVlG1BYLo/bQZtcdA=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-font/-/io-bin-font-0.10.37.tgz"; + sha512 = "fN5UpZ1YnAiU9qLTH/bhzNnL7dTPdDNoDKbcfoEYcBF0HxvbGM7nOqgOe95HP20uUGO9z6p6A7jdkcCIgM/+JA=="; }; }; - "@ot-builder/io-bin-glyph-store-0.10.34" = { + "@ot-builder/io-bin-glyph-store-0.10.37" = { name = "_at_ot-builder_slash_io-bin-glyph-store"; packageName = "@ot-builder/io-bin-glyph-store"; - version = "0.10.34"; + version = "0.10.37"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-glyph-store/-/io-bin-glyph-store-0.10.34.tgz"; - sha512 = "0izykazfWE77KEN9N17fyrftUEiTMFiYZAV06mGDpOmHyRLM0oFAnGheWE7n5rRj5ft/9tuH/Yi3z1RPkM2LzQ=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-glyph-store/-/io-bin-glyph-store-0.10.37.tgz"; + sha512 = "g2GvPbzcNSSUcs/TmjpaLfCgDUDOkeO5/BwZsUyF8vesHdZXzCLIuZ34Hla18kDFNEujNY5lTYOblin9MLsuCw=="; }; }; - "@ot-builder/io-bin-layout-0.10.34" = { + "@ot-builder/io-bin-layout-0.10.37" = { name = "_at_ot-builder_slash_io-bin-layout"; packageName = "@ot-builder/io-bin-layout"; - version = "0.10.34"; + version = "0.10.37"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-layout/-/io-bin-layout-0.10.34.tgz"; - sha512 = "35689IuO84kKg25ltvzJemF49zoEYv/uT1CEEvPbI8vfsss32CVBDxVsyHoIMeCVz872i3q0LEMquZ4v7bQP1A=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-layout/-/io-bin-layout-0.10.37.tgz"; + sha512 = "8uEvHSC5X1bxBBNEKVz+/5yedVStOSFndAHI86pCcEim8538Ib/jZTTcwSlBs4cg4r4QDJ8EekkOt0TFjvY0qA=="; }; }; - "@ot-builder/io-bin-metadata-0.10.34" = { + "@ot-builder/io-bin-metadata-0.10.37" = { name = "_at_ot-builder_slash_io-bin-metadata"; packageName = "@ot-builder/io-bin-metadata"; - version = "0.10.34"; + version = "0.10.37"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-metadata/-/io-bin-metadata-0.10.34.tgz"; - sha512 = "hHvHgbW9q/rY7RLKUZ6bd15mjWuInyek1N+t81XeF58/W6AC50Ya65wxhG381wui1NGgUJrcwUcO6K36RQCyFA=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-metadata/-/io-bin-metadata-0.10.37.tgz"; + sha512 = "hvb+b11sYjHhRQBBCEo0Ijwk62v9S+HMCydL4EHzWxWBtEXL6ELyqG3JeWDWbwFnQ1R/gHVjHOHacaW/8NsPYw=="; }; }; - "@ot-builder/io-bin-metric-0.10.34" = { + "@ot-builder/io-bin-metric-0.10.37" = { name = "_at_ot-builder_slash_io-bin-metric"; packageName = "@ot-builder/io-bin-metric"; - version = "0.10.34"; + version = "0.10.37"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-metric/-/io-bin-metric-0.10.34.tgz"; - sha512 = "9MgzLr/GVWEF2aKDBu0UZ+9X6a84IxQw3Yhnw9MigMdK345We/rtuL1Q1Io5XW9XDcj89EqP/31cUSAr/bD0YQ=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-metric/-/io-bin-metric-0.10.37.tgz"; + sha512 = "AL38lT4RPUTJ8I/gDu0zuW6F5drcIzhoDN1hPsmMwsQLApx+1Ea/7gJipWfU4ppE+R9dpULrHOyH3EdCH59owA=="; }; }; - "@ot-builder/io-bin-name-0.10.34" = { + "@ot-builder/io-bin-name-0.10.37" = { name = "_at_ot-builder_slash_io-bin-name"; packageName = "@ot-builder/io-bin-name"; - version = "0.10.34"; + version = "0.10.37"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-name/-/io-bin-name-0.10.34.tgz"; - sha512 = "s/PGAiUV/Qvz7b3dejSXrvk7g8H75yTKfa4HbmZDUPL9PB0+0+BEYbCeHeTTGD3EjZCA5tH1oi19IfuXzFWMsw=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-name/-/io-bin-name-0.10.37.tgz"; + sha512 = "KBgTi4FdMdo/CJoPEL3HU1910GS42Lfw03BEwn/AXmv8mZy4q4DkhSI5jFH9xf2g9d67Rm9Ms4IR01OtZIdasg=="; }; }; - "@ot-builder/io-bin-sfnt-0.10.34" = { + "@ot-builder/io-bin-sfnt-0.10.37" = { name = "_at_ot-builder_slash_io-bin-sfnt"; packageName = "@ot-builder/io-bin-sfnt"; - version = "0.10.34"; + version = "0.10.37"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-sfnt/-/io-bin-sfnt-0.10.34.tgz"; - sha512 = "/GcMw5E1fvZ5B67jUfLbDWzHzMxQRnAMx0OAXq3FseY4dr28OOppieKbHK6f7K+cuscyOxcY/sycpDPLgI21wA=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-sfnt/-/io-bin-sfnt-0.10.37.tgz"; + sha512 = "HzYvTaydmgxTRr7o5sichmc0j4TJcFbZfhf3kU8fE2KUdagi+Ia9jms3YWz+AVFaxkd6vp7xAKSgoaYggXWtcQ=="; }; }; - "@ot-builder/io-bin-ttf-0.10.34" = { + "@ot-builder/io-bin-ttf-0.10.37" = { name = "_at_ot-builder_slash_io-bin-ttf"; packageName = "@ot-builder/io-bin-ttf"; - version = "0.10.34"; + version = "0.10.37"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-ttf/-/io-bin-ttf-0.10.34.tgz"; - sha512 = "X8xX76EP24H4DxQJO1kvIwmXfCuTyoCbvYB+6oXuITt4LbIjvbDoCn/PDKdxxUdDxDkcdN+5yZZAxc64Cinzew=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-ttf/-/io-bin-ttf-0.10.37.tgz"; + sha512 = "nLILmjrsN3J9HqVQP8AqfTSNdaIJaB7V/k5Csu+lFS6Qeozkpm5C43WFb+pjTo9rO+3ZUyQKtN0dBez6Mu5zfA=="; }; }; - "@ot-builder/ot-0.10.34" = { + "@ot-builder/ot-0.10.37" = { name = "_at_ot-builder_slash_ot"; packageName = "@ot-builder/ot"; - version = "0.10.34"; + version = "0.10.37"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot/-/ot-0.10.34.tgz"; - sha512 = "TFEhsVLr7zqDVDCupvw0+OIDzeUry+g/csgmn+fUIx5NBlyDLF78CJytYUha/HhzIyh3NeTgIDDVTU0K04jo2Q=="; + url = "https://registry.npmjs.org/@ot-builder/ot/-/ot-0.10.37.tgz"; + sha512 = "H2OhGBya1uhb3LNbDn1uYhD7VH+RxVIc//DjPB9TTjRAxepzJhtDQA+xHr44Pfh+/gMhzOg6IZaE6w2hKCOi+A=="; }; }; - "@ot-builder/ot-encoding-0.10.34" = { + "@ot-builder/ot-encoding-0.10.37" = { name = "_at_ot-builder_slash_ot-encoding"; packageName = "@ot-builder/ot-encoding"; - version = "0.10.34"; + version = "0.10.37"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-encoding/-/ot-encoding-0.10.34.tgz"; - sha512 = "InJjxEU008C4tfOvw+dZ3R+g5xIjOkwawPMYnSnWLJFII5uWLQKTcq7pzYiM4/vsVLvgUFBfpKvMxbf7Ul9l7g=="; + url = "https://registry.npmjs.org/@ot-builder/ot-encoding/-/ot-encoding-0.10.37.tgz"; + sha512 = "xuSnN3LD3v6ovkHLeZebM8z4PYZkpW6tVrl2HqRaujIjuR0LpBSWQcLwqI1B8xUwfvpdPrmRABXGTDQEfH7XbA=="; }; }; - "@ot-builder/ot-ext-private-0.10.34" = { + "@ot-builder/ot-ext-private-0.10.37" = { name = "_at_ot-builder_slash_ot-ext-private"; packageName = "@ot-builder/ot-ext-private"; - version = "0.10.34"; + version = "0.10.37"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-ext-private/-/ot-ext-private-0.10.34.tgz"; - sha512 = "+q1U1PhBIjc83SZhMgqIi9O9p85vW338MvWEwehxnIijT84XJJeiQ2kWektiz62rxGjL23YnPqLljFojMbG7/Q=="; + url = "https://registry.npmjs.org/@ot-builder/ot-ext-private/-/ot-ext-private-0.10.37.tgz"; + sha512 = "dZk0SedGSAvmmHuY+kwqICz0ptrX0rvWVitp5nF/0kXS1sUr5x2xXrGIFm6/ZatyYek5tdGIMy6OjUyfv2lEew=="; }; }; - "@ot-builder/ot-glyphs-0.10.34" = { + "@ot-builder/ot-glyphs-0.10.37" = { name = "_at_ot-builder_slash_ot-glyphs"; packageName = "@ot-builder/ot-glyphs"; - version = "0.10.34"; + version = "0.10.37"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-glyphs/-/ot-glyphs-0.10.34.tgz"; - sha512 = "YzXak7LFJVekz/nyi8hPVipY3PTTM+tmPit875TX56+/OuhwuQWbT5HeM++kmlGc/VYxbFzndJybR87YsuNvjQ=="; + url = "https://registry.npmjs.org/@ot-builder/ot-glyphs/-/ot-glyphs-0.10.37.tgz"; + sha512 = "EGO3Ok6xOZLrpViokybKkCD5fyV/TOOdzD2WD5hNC9OUT3uSWUCVp8O5CN1xbJUC47Xsbx8L3WTKPLMDVfyurQ=="; }; }; - "@ot-builder/ot-layout-0.10.34" = { + "@ot-builder/ot-layout-0.10.37" = { name = "_at_ot-builder_slash_ot-layout"; packageName = "@ot-builder/ot-layout"; - version = "0.10.34"; + version = "0.10.37"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-layout/-/ot-layout-0.10.34.tgz"; - sha512 = "ftGx58faieUlzWefhRrcR/m4gmAVvIge4SkBDVanIaFgPst8CsH01THkhtbIanzHoZARn+FcU5SXruRC0VhVdA=="; + url = "https://registry.npmjs.org/@ot-builder/ot-layout/-/ot-layout-0.10.37.tgz"; + sha512 = "sK0ERPlrujMfd/1yqxX5In5AZRbV/vqR0gCyZavd2iOWA5IrPS0jeUcF6TmpnWqSt8IvKL/syPHm2VEmEBEGtQ=="; }; }; - "@ot-builder/ot-metadata-0.10.34" = { + "@ot-builder/ot-metadata-0.10.37" = { name = "_at_ot-builder_slash_ot-metadata"; packageName = "@ot-builder/ot-metadata"; - version = "0.10.34"; + version = "0.10.37"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-metadata/-/ot-metadata-0.10.34.tgz"; - sha512 = "w1uqzSQWfmIr1zP7s4tCfVzyc55s18D//QgkHHZAEEcO28pfslMSIRm70DiggXo1uYVARlUUT/BAcnK/U+qQBA=="; + url = "https://registry.npmjs.org/@ot-builder/ot-metadata/-/ot-metadata-0.10.37.tgz"; + sha512 = "KO+MhJXSHCVMRE0sVoqI/W91/SYC5JUM1yc09OvlHdb5RlCYk8RWDr/1G2VKIQifrbMMXpzeVVwAVOjKxOlH2w=="; }; }; - "@ot-builder/ot-name-0.10.34" = { + "@ot-builder/ot-name-0.10.37" = { name = "_at_ot-builder_slash_ot-name"; packageName = "@ot-builder/ot-name"; - version = "0.10.34"; + version = "0.10.37"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-name/-/ot-name-0.10.34.tgz"; - sha512 = "1aw41J3vyAKaSyEBzRNlpRcBiSZkajp5MCy0hRaa68ZwEY/mPcQkSh4KjZEMyx+ndFmHKRdL3396ksVKftOgVg=="; + url = "https://registry.npmjs.org/@ot-builder/ot-name/-/ot-name-0.10.37.tgz"; + sha512 = "LIXAd02w3PIUaepM5Esct+Z1iUu/Lq/kxd3WNUL0OTmauZF2oh0qdK3dQHLtFBHOMHoWIXUKjOPDLw/YP1dUwA=="; }; }; - "@ot-builder/ot-sfnt-0.10.34" = { + "@ot-builder/ot-sfnt-0.10.37" = { name = "_at_ot-builder_slash_ot-sfnt"; packageName = "@ot-builder/ot-sfnt"; - version = "0.10.34"; + version = "0.10.37"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-sfnt/-/ot-sfnt-0.10.34.tgz"; - sha512 = "I88VMnJY0HxXLf2P+xnTIRheSsyCphnh8Vjj/zfroNHB98vdPIbE7d44cCv4C2u1zNRGwbhogMLBKghfhbqjuA=="; + url = "https://registry.npmjs.org/@ot-builder/ot-sfnt/-/ot-sfnt-0.10.37.tgz"; + sha512 = "VICXFcp8yzi6zkd4nwLrYh7p3Yx86KMqDRV39ODtM1g/2r887beIfBOONE1ll4Dy6FMXbtvWY1+OEcMPEjD+LA=="; }; }; - "@ot-builder/ot-standard-glyph-namer-0.10.34" = { + "@ot-builder/ot-standard-glyph-namer-0.10.37" = { name = "_at_ot-builder_slash_ot-standard-glyph-namer"; packageName = "@ot-builder/ot-standard-glyph-namer"; - version = "0.10.34"; + version = "0.10.37"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-standard-glyph-namer/-/ot-standard-glyph-namer-0.10.34.tgz"; - sha512 = "AjdOIfQxyN2dIlA8RAzFeu9ysGS9yMiZN1nVjHaTdHjl6nZx16Xjhtf1xEa5GbMORDaWkFeaXnYWM1kp/IYAhw=="; + url = "https://registry.npmjs.org/@ot-builder/ot-standard-glyph-namer/-/ot-standard-glyph-namer-0.10.37.tgz"; + sha512 = "I1FsVaBOHMSPA6lPFo6SWwAYLmp+q1QNKYQtcRJmgW5G5lljIjCTptvpDzyXqgujgFvGUDz7UWPNzlRq/HwLNw=="; }; }; - "@ot-builder/prelude-0.10.34" = { + "@ot-builder/prelude-0.10.37" = { name = "_at_ot-builder_slash_prelude"; packageName = "@ot-builder/prelude"; - version = "0.10.34"; + version = "0.10.37"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/prelude/-/prelude-0.10.34.tgz"; - sha512 = "z7OuMrGgr6sYn+UWOctyWDpCra2+nRPPpmUkbbP7RhTh3ANjJFePeMaOQiYogz7u7IKlDzlg5D4qY/F/gJNuPA=="; + url = "https://registry.npmjs.org/@ot-builder/prelude/-/prelude-0.10.37.tgz"; + sha512 = "rUMCp2j3or0dSYr2hDkmNRexg9A24zzRRQWNHh5KF+6x4Crj5Sg41gx+sx+MohQqs8mu8CM3CZOV1b66P7ixPA=="; }; }; - "@ot-builder/primitive-0.10.34" = { + "@ot-builder/primitive-0.10.37" = { name = "_at_ot-builder_slash_primitive"; packageName = "@ot-builder/primitive"; - version = "0.10.34"; + version = "0.10.37"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/primitive/-/primitive-0.10.34.tgz"; - sha512 = "67yTVBkLzfQy0F3xfHA+NYAWy+A2Z6udWznK7nW0McK9PtOvCjCNl68UrW+vmohR8T4t0PGTC3lHX7dBkxyQTQ=="; + url = "https://registry.npmjs.org/@ot-builder/primitive/-/primitive-0.10.37.tgz"; + sha512 = "GdYr1DUgWRUASpK9C85jklb/iHpdzgPmHs1fxud61QktqXJ21Wo1jvr5W0TaHsK3tGyeDjfSbEohMQhFKgZZOA=="; }; }; - "@ot-builder/rectify-0.10.34" = { + "@ot-builder/rectify-0.10.37" = { name = "_at_ot-builder_slash_rectify"; packageName = "@ot-builder/rectify"; - version = "0.10.34"; + version = "0.10.37"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/rectify/-/rectify-0.10.34.tgz"; - sha512 = "rT9t9eYjRlx/EioSWwkrNHMSNlXr1UufB2+Tni6DRCWoTV0XjgFsAt1fjj+vTcxtvy7ZZuZKOdwkyxITiMPK4A=="; + url = "https://registry.npmjs.org/@ot-builder/rectify/-/rectify-0.10.37.tgz"; + sha512 = "0gv45ARwPgBSWnpl7mmk+lTtIlTO0XBtoCBT8BbkXzXH4YxkB70fEsAX47GEhSpWzWWg9QgTrVUCBFXVj4i67A=="; }; }; - "@ot-builder/stat-glyphs-0.10.34" = { + "@ot-builder/stat-glyphs-0.10.37" = { name = "_at_ot-builder_slash_stat-glyphs"; packageName = "@ot-builder/stat-glyphs"; - version = "0.10.34"; + version = "0.10.37"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/stat-glyphs/-/stat-glyphs-0.10.34.tgz"; - sha512 = "cqWuTCGgelc6Dqg0nW3kkylFkP0dc7vvSlnSQr1eZaq6YD36o/ckWzXLc/caGY6GefFYVfGx+kpzx45f5MdCIQ=="; + url = "https://registry.npmjs.org/@ot-builder/stat-glyphs/-/stat-glyphs-0.10.37.tgz"; + sha512 = "JTQQtR8CWclhAdJyKAvWH3O99wuaJFJKyAr+BRcXL5wJ6D68V9AQ8zY+weaIL7m1FZIOp5kf4nc4RmRodtCcNw=="; }; }; - "@ot-builder/trace-0.10.34" = { + "@ot-builder/trace-0.10.37" = { name = "_at_ot-builder_slash_trace"; packageName = "@ot-builder/trace"; - version = "0.10.34"; + version = "0.10.37"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/trace/-/trace-0.10.34.tgz"; - sha512 = "EW9xYkpocQV0M+sdVlOhSAucs/tRoZogQ+NVZ+yLJTcPAEE+PFyvU81Rd0+R9Lp1LOpLmYDQFJpzh3n/z+i9aA=="; + url = "https://registry.npmjs.org/@ot-builder/trace/-/trace-0.10.37.tgz"; + sha512 = "phedlApvTXseNHId9T0Ab+6luHoATwkwk0l/JFEhVFIbMdvAcHwgAB/oxumsySlTscYuV/7dgGqCyYeeYicfjw=="; }; }; - "@ot-builder/var-store-0.10.34" = { + "@ot-builder/var-store-0.10.37" = { name = "_at_ot-builder_slash_var-store"; packageName = "@ot-builder/var-store"; - version = "0.10.34"; + version = "0.10.37"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/var-store/-/var-store-0.10.34.tgz"; - sha512 = "ldEosnnwcx/NDz+mb9Z2Ta9hlhhviK2QIrXY5PIdvhtlcj6U/dMPgmvHhZwF15+0f1r03V7EIq/v5Y3T78+Phw=="; + url = "https://registry.npmjs.org/@ot-builder/var-store/-/var-store-0.10.37.tgz"; + sha512 = "yAEZBdo+X0m3WnFNLXFW2pkmhDx8EEvqxqR0A95KxZC1M6gtLdYesQGz5x1qnTn6cAvxOOhyclWsk3XcSJpvKw=="; }; }; - "@ot-builder/variance-0.10.34" = { + "@ot-builder/variance-0.10.37" = { name = "_at_ot-builder_slash_variance"; packageName = "@ot-builder/variance"; - version = "0.10.34"; + version = "0.10.37"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/variance/-/variance-0.10.34.tgz"; - sha512 = "McAXf0TPT+GjAZS2iT5ULZq0FR9oOQK3Vbc0g5KXxxd9/wWsINT+nSuO/YFR1O9TT1lBf7cT3OUXrAM2tKlU5Q=="; + url = "https://registry.npmjs.org/@ot-builder/variance/-/variance-0.10.37.tgz"; + sha512 = "I+ZvuTZ82Itr1/KwTkDyMrhx30rgmimMxYX6dOIvjrrheTJSPR3iKR7tFKszCuJSgx6GTITeikeyi6tH4/krGQ=="; }; }; "@parcel/fs-1.11.0" = { @@ -4432,13 +4603,13 @@ let sha512 = "uc6FmPEegAZawSHjUMFQwU7EjaDn7zy1iD/KD/wBROL9F4378OES8MKMYHoRAKT61Fk7LxVKZSDR5VespMQiqw=="; }; }; - "@primer/octicons-11.1.0" = { + "@primer/octicons-11.2.0" = { name = "_at_primer_slash_octicons"; packageName = "@primer/octicons"; - version = "11.1.0"; + version = "11.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@primer/octicons/-/octicons-11.1.0.tgz"; - sha512 = "qeW4Hu82V0eTKza54nIqud572lrZicy2R6PBX2SVfWlrfRUotpsRi6m/Dvxz/YKL/8xdwBSWgJl8hJXM4V5woA=="; + url = "https://registry.npmjs.org/@primer/octicons/-/octicons-11.2.0.tgz"; + sha512 = "a9ORJaeu7Kt0LCaawQy8S+ZVPDe1qXJvKZraX0b6R0KXkXjL519rpGUDRiGUlskuxEpVf2kmbVYfqGDDlMGLMg=="; }; }; "@protobufjs/aspromise-1.1.2" = { @@ -4594,15 +4765,6 @@ let sha512 = "MjmH7GvFT4TW8xFdIeFS3wqIX646y5tACdxkTO+khbHvS3ZcVJL6vkAHLw2wqPmkhwCfWHoNsp15VYNwW6JEJA=="; }; }; - "@rollup/plugin-commonjs-13.0.2" = { - name = "_at_rollup_slash_plugin-commonjs"; - packageName = "@rollup/plugin-commonjs"; - version = "13.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-13.0.2.tgz"; - sha512 = "9JXf2k8xqvMYfqmhgtB6eCgMN9fbxwF1XDF3mGKJc6pkAmt0jnsqurxQ0tC1akQKNSXCm7c3unQxa3zuxtZ7mQ=="; - }; - }; "@rollup/plugin-commonjs-15.1.0" = { name = "_at_rollup_slash_plugin-commonjs"; packageName = "@rollup/plugin-commonjs"; @@ -4612,6 +4774,15 @@ let sha512 = "xCQqz4z/o0h2syQ7d9LskIMvBSH4PX5PjYdpSSvgS+pQik3WahkQVNWg3D8XJeYjZoVWnIUQYDghuEMRGrmQYQ=="; }; }; + "@rollup/plugin-commonjs-17.0.0" = { + name = "_at_rollup_slash_plugin-commonjs"; + packageName = "@rollup/plugin-commonjs"; + version = "17.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-17.0.0.tgz"; + sha512 = "/omBIJG1nHQc+bgkYDuLpb/V08QyutP9amOrJRUSlYJZP+b/68gM//D8sxJe3Yry2QnYIr3QjR3x4AlxJEN3GA=="; + }; + }; "@rollup/plugin-inject-4.0.2" = { name = "_at_rollup_slash_plugin-inject"; packageName = "@rollup/plugin-inject"; @@ -4630,13 +4801,13 @@ let sha512 = "yfLbTdNS6amI/2OpmbiBoW12vngr5NW2jCJVZSBEz+H5KfUJZ2M7sDjk0U6GOOdCWFVScShte29o9NezJ53TPw=="; }; }; - "@rollup/plugin-node-resolve-8.4.0" = { + "@rollup/plugin-node-resolve-11.0.1" = { name = "_at_rollup_slash_plugin-node-resolve"; packageName = "@rollup/plugin-node-resolve"; - version = "8.4.0"; + version = "11.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-8.4.0.tgz"; - sha512 = "LFqKdRLn0ShtQyf6SBYO69bGE1upV6wUhBX0vFOUnLAyzx5cwp8svA0eHUnu8+YU57XOkrMtfG63QOpQx25pHQ=="; + url = "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-11.0.1.tgz"; + sha512 = "ltlsj/4Bhwwhb+Nb5xCz/6vieuEj2/BAkkqVIKmZwC7pIdl8srmgmglE4S0jFlZa32K4qvdQ6NHdmpRKD/LwoQ=="; }; }; "@rollup/plugin-node-resolve-9.0.0" = { @@ -4675,31 +4846,31 @@ let sha512 = "c/qwwcHyafOQuVQJj0IlBjf5yYgBI7YPJ77k4fOJYesb41jio65eaJODRUmfYKhTOFBrIZ66kgvGPlNbjuoRdQ=="; }; }; - "@schematics/angular-11.0.3" = { + "@schematics/angular-11.0.5" = { name = "_at_schematics_slash_angular"; packageName = "@schematics/angular"; - version = "11.0.3"; + version = "11.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/angular/-/angular-11.0.3.tgz"; - sha512 = "H+rWJOafl8OXrC/GMJihWYTFsR2K49tWM6AyJLBxja6qyZwwL184SLPvvkPsz3+LDs+fxfOzQ1K+sIpuZLqizw=="; + url = "https://registry.npmjs.org/@schematics/angular/-/angular-11.0.5.tgz"; + sha512 = "7p2wweoJYhim8YUy3ih1SrPGqRsa6+aEFbYgo9v4zt7b3tOva8SvkbC2alayK74fclzQ7umqa6xAwvWhy8ORvg=="; }; }; - "@schematics/schematics-0.1100.1" = { + "@schematics/schematics-0.1100.3" = { name = "_at_schematics_slash_schematics"; packageName = "@schematics/schematics"; - version = "0.1100.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@schematics/schematics/-/schematics-0.1100.1.tgz"; - sha512 = "Y5J/qafyZtsu6spEFywGLjYMqEgONSDx9m8c8KL4c45+KqqerQeh2QQHims3G0brKUFIK3nCw95zqw+RMsGcsA=="; - }; - }; - "@schematics/update-0.1100.3" = { - name = "_at_schematics_slash_update"; - packageName = "@schematics/update"; version = "0.1100.3"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/update/-/update-0.1100.3.tgz"; - sha512 = "Hp+RVuVLYkJhGYzLY3kwSqk8nh9zC9F9AAR4QuwSXQv+pQxRbv48fdU3iVuKu/mVhz17RZJhTNoA/2uNMeGH2g=="; + url = "https://registry.npmjs.org/@schematics/schematics/-/schematics-0.1100.3.tgz"; + sha512 = "tzjKnjD90FQ4LgRN9ALT2qCqgJYZrAKoy1embFJRuGKA8vv1hTG4JonVDqQEUoNwTc9r/Ok2Z1eenAI9TSUd1A=="; + }; + }; + "@schematics/update-0.1100.5" = { + name = "_at_schematics_slash_update"; + packageName = "@schematics/update"; + version = "0.1100.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@schematics/update/-/update-0.1100.5.tgz"; + sha512 = "BYtKKuiWsrlc4FMW3bRyl4tm6lWNMTi8oql/mtkSgH7V5eMmaLDJtM+zDl+qyC/KHPxbHTfoHDapfv1tITSWjA=="; }; }; "@segment/loosely-validate-event-2.0.0" = { @@ -4747,13 +4918,13 @@ let sha512 = "PY7gH+7aQ+MltcUD7SRDuQODJ9Sav9HhFJsgOiyf8IVo7XVD6FxZIsSnpMI6paSkptOB7n+0Jz03gNlEkKetQQ=="; }; }; - "@serverless/enterprise-plugin-4.2.0" = { + "@serverless/enterprise-plugin-4.4.1" = { name = "_at_serverless_slash_enterprise-plugin"; packageName = "@serverless/enterprise-plugin"; - version = "4.2.0"; + version = "4.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/enterprise-plugin/-/enterprise-plugin-4.2.0.tgz"; - sha512 = "b7kVdcE+nLi9kWOu4lqvbYBeK0ChIPX9gbqMecs3fEAdPVMleZyC0CywdWnpOrV9xXij9tj4LxFv6NRRcFCXZg=="; + url = "https://registry.npmjs.org/@serverless/enterprise-plugin/-/enterprise-plugin-4.4.1.tgz"; + sha512 = "MTjpIwpCA1gmldGuEozHNKIlce8BXMilvH2K0nm5vJ45PAUwK1bL9moaLwDadaTEw9B1jKbboa5/wpzJwwFdxA=="; }; }; "@serverless/event-mocks-1.1.1" = { @@ -4810,22 +4981,22 @@ let sha512 = "aI/cpGVUhWbJUR8QDMtPue28EU4ViG/L4/XKuZDfAN2uNQv3NRjwEFIBi/cxyfQnMTYVtMLe9wDjuwzOT4ENzA=="; }; }; - "@serverless/utils-2.0.0" = { + "@serverless/utils-2.2.0" = { name = "_at_serverless_slash_utils"; packageName = "@serverless/utils"; - version = "2.0.0"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/utils/-/utils-2.0.0.tgz"; - sha512 = "yZQT2f8LIZZlH2ibAIvK4C/Ks72Y8CIWmGz04XGCLPHa/ANA6KqlXTKV6zWg/n1PDy2yj2zgX+m509VpIZuDeQ=="; + url = "https://registry.npmjs.org/@serverless/utils/-/utils-2.2.0.tgz"; + sha512 = "0TqmLwH9r2GAewvz9mhZ+TSyQBoE9ANuB4nNhn6lJvVUgzlzji3aqeFbAuDt+Z60ZkaIDNipU/J5Vf2Lo/QTQQ=="; }; }; - "@serverless/utils-china-1.0.11" = { + "@serverless/utils-china-1.0.12" = { name = "_at_serverless_slash_utils-china"; packageName = "@serverless/utils-china"; - version = "1.0.11"; + version = "1.0.12"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/utils-china/-/utils-china-1.0.11.tgz"; - sha512 = "raOPIoPSTrkWKBDuozkYWvLXP2W65K9Uk4ud+lPcbhhBSamO3uVW40nuAkC19MdIoAsFi5oTGYpcc9UDx8b+lg=="; + url = "https://registry.npmjs.org/@serverless/utils-china/-/utils-china-1.0.12.tgz"; + sha512 = "PuVap97QTf3Fi5+ez3ZUewGPFHTpf3dwZ+c6YWEoaf+1u7cgXzYFuWx8Ypi+4ghbL93/bf+blqdm+7CQi+CMRg=="; }; }; "@sindresorhus/is-0.14.0" = { @@ -4972,15 +5143,6 @@ let sha512 = "nI7ELxukf7pT4/VraL4iabtNNMz8mUo7EXlqCFld8O5z6mIMLX9llps24iPpaIZOwArkY3FWA+4t+ixyvtTSIA=="; }; }; - "@snyk/java-call-graph-builder-1.16.2" = { - name = "_at_snyk_slash_java-call-graph-builder"; - packageName = "@snyk/java-call-graph-builder"; - version = "1.16.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@snyk/java-call-graph-builder/-/java-call-graph-builder-1.16.2.tgz"; - sha512 = "tJF+dY/wTfexwYuCgFB3RpWl4RGcf2H9RT9yurkTVi5wwKfvcNwZMUMwSlTDEFOqwmAsJ7e0uNVRlkPQHekCcQ=="; - }; - }; "@snyk/java-call-graph-builder-1.17.0" = { name = "_at_snyk_slash_java-call-graph-builder"; packageName = "@snyk/java-call-graph-builder"; @@ -4990,6 +5152,15 @@ let sha512 = "uO1b6UtT6QGz7F5ZgNdOSyMXBvykUhOcuHBRc//xUnBWsyJwdlAFp/d646zIeaBCe87Fcn5hXuWUGjj+N8rBzA=="; }; }; + "@snyk/java-call-graph-builder-1.18.0" = { + name = "_at_snyk_slash_java-call-graph-builder"; + packageName = "@snyk/java-call-graph-builder"; + version = "1.18.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@snyk/java-call-graph-builder/-/java-call-graph-builder-1.18.0.tgz"; + sha512 = "6Mt+Rs2N4HdHICCjxWRwtGXUrSktCsSGnn7HlL6wi+4JXjPWa+rDCzaF6furqRR3aphZAclgved0haFwwmqBxQ=="; + }; + }; "@snyk/rpm-parser-2.2.1" = { name = "_at_snyk_slash_rpm-parser"; packageName = "@snyk/rpm-parser"; @@ -5152,130 +5323,130 @@ let sha512 = "AmyMQndtxMsM59eDeA0gGiw8T2LzNvDhx/xl+ygFXXrsw+yb/mit73ndHkiHKcRA1EpNHTyD1PN9ATxghzplfg=="; }; }; - "@textlint/ast-node-types-4.3.4" = { + "@textlint/ast-node-types-4.3.5" = { name = "_at_textlint_slash_ast-node-types"; packageName = "@textlint/ast-node-types"; - version = "4.3.4"; + version = "4.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/ast-node-types/-/ast-node-types-4.3.4.tgz"; - sha512 = "Grq+vJuNH7HCa278eFeiqJvowrD+onMCoG2ctLyoN+fXYIQGIr1/8fo8AcIg+VM16Kga+N6Y1UWNOWPd8j1nFg=="; + url = "https://registry.npmjs.org/@textlint/ast-node-types/-/ast-node-types-4.3.5.tgz"; + sha512 = "syl8VE34DQDTV7+IADP1jYtGsxTC9MmCKLmpJX90G6nNv9CzgAZIukd7WMiJFZpFgcDAlibEaCKlJRxjfEmmPA=="; }; }; - "@textlint/ast-tester-2.2.4" = { + "@textlint/ast-tester-2.2.5" = { name = "_at_textlint_slash_ast-tester"; packageName = "@textlint/ast-tester"; - version = "2.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@textlint/ast-tester/-/ast-tester-2.2.4.tgz"; - sha512 = "676xpY3/+Xa+tPaiUPaD4sl//+p3xsnSPYLrQjSmHWXX78F3MwAWd/Lek+SCn4wwvf1tCIx0SPtjfOCa6ru8qw=="; - }; - }; - "@textlint/ast-traverse-2.2.5" = { - name = "_at_textlint_slash_ast-traverse"; - packageName = "@textlint/ast-traverse"; version = "2.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/ast-traverse/-/ast-traverse-2.2.5.tgz"; - sha512 = "YduGVn7iaUYOfo7TwHO4b0K/qQpj61Ol/M884ck3vetNd0zBxpHO3GpQKW87SZGGtlsBa9v5Suz/yypnlPo3Og=="; + url = "https://registry.npmjs.org/@textlint/ast-tester/-/ast-tester-2.2.5.tgz"; + sha512 = "kKolF3xDI0G1sjM2HJE1EZAf407026b/wHC0FAdo9/FAipUTtAATKDnvjYeN++W1b5TxtIWRF5SbHppK7eRXGQ=="; }; }; - "@textlint/feature-flag-3.2.4" = { + "@textlint/ast-traverse-2.2.6" = { + name = "_at_textlint_slash_ast-traverse"; + packageName = "@textlint/ast-traverse"; + version = "2.2.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@textlint/ast-traverse/-/ast-traverse-2.2.6.tgz"; + sha512 = "cpBF4UsbQ95oFU8gaGrkYar1H75ORvfRWN78dXneyinJFG1KBajXN9lLYhXhg+Z1Rn/9Ifw+SCjLZKnFmnwM0g=="; + }; + }; + "@textlint/feature-flag-3.2.5" = { name = "_at_textlint_slash_feature-flag"; packageName = "@textlint/feature-flag"; - version = "3.2.4"; + version = "3.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/feature-flag/-/feature-flag-3.2.4.tgz"; - sha512 = "ABhbZ5rfkwa/kTBFxVmeMzE1flcnUjLJ5LTZvOaxH/pElfLLN1J4FEmAZTRCvXGAB498II6nkM2CqcikbKzh6A=="; + url = "https://registry.npmjs.org/@textlint/feature-flag/-/feature-flag-3.2.5.tgz"; + sha512 = "OePponYtxPGjNf6GBqioRaOr1m8LJZQLCj49LgoGZnolm9hmKq3QP1jEKGbzxsHCADL7YHoKZ6zxKGkicmsxPA=="; }; }; - "@textlint/fixer-formatter-3.2.5" = { + "@textlint/fixer-formatter-3.2.6" = { name = "_at_textlint_slash_fixer-formatter"; packageName = "@textlint/fixer-formatter"; - version = "3.2.5"; + version = "3.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/fixer-formatter/-/fixer-formatter-3.2.5.tgz"; - sha512 = "fh6XiLbX9WF8+79g20qb1I85k/Yc9+h7LRccmaLzTBjVQDNYxX5BtfvGsY0Vf5tBZKT2xFZH4eSLH/EWoL3weg=="; + url = "https://registry.npmjs.org/@textlint/fixer-formatter/-/fixer-formatter-3.2.6.tgz"; + sha512 = "xVVEHcpUeBBFI7Ug4y/tGTRLf6XX9lsg/iLvk6cjWJhxnFsVOkSFJRrZFetIJnAKnhQmCAv/i+ybgnTHhas7pw=="; }; }; - "@textlint/kernel-3.3.6" = { + "@textlint/kernel-3.3.7" = { name = "_at_textlint_slash_kernel"; packageName = "@textlint/kernel"; - version = "3.3.6"; + version = "3.3.7"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/kernel/-/kernel-3.3.6.tgz"; - sha512 = "M2ciQDAo5W6rpRADzGnMXyxhvJ+lnqYG9iHrqmfDQ2MA0VcolWuA37H67/UstqTs3NYaGC7RZkq9FAV//pl30w=="; + url = "https://registry.npmjs.org/@textlint/kernel/-/kernel-3.3.7.tgz"; + sha512 = "zLk78gCwiQIl0ElkzT8DVMOLJ5PCDWZnuRaYk7YkwmGpjJSoJcGSCqiRGhmmc4d7CCZ+AcoM0DQUSyrFzJjyMA=="; }; }; - "@textlint/linter-formatter-3.2.5" = { + "@textlint/linter-formatter-3.2.6" = { name = "_at_textlint_slash_linter-formatter"; packageName = "@textlint/linter-formatter"; - version = "3.2.5"; + version = "3.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/linter-formatter/-/linter-formatter-3.2.5.tgz"; - sha512 = "oy5RcBWrC2d7r0Mjw/FBH8cvQuOaCB5PeOPG0Pp44Yr5JbIGLXfh84umHQOTCmxfRxw3ccnUfA9wjbxuL8rWOQ=="; + url = "https://registry.npmjs.org/@textlint/linter-formatter/-/linter-formatter-3.2.6.tgz"; + sha512 = "39R2PAKRDqq8p6jQj3u9ERUzrrhK33BnHK622oegaXzPeaBLjN2brBXsxnBpNJFPUW2L9BDmJcBd92E/ajLTGg=="; }; }; - "@textlint/markdown-to-ast-6.2.5" = { + "@textlint/markdown-to-ast-6.2.6" = { name = "_at_textlint_slash_markdown-to-ast"; packageName = "@textlint/markdown-to-ast"; - version = "6.2.5"; + version = "6.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/markdown-to-ast/-/markdown-to-ast-6.2.5.tgz"; - sha512 = "9vlQbylGjnnRGev3yt9ntNy6I9FQH3p+MkbijybKnwobK/msoAX9sThDHOMbGM24PsUHxcDjktDlj2vHN/pwDA=="; + url = "https://registry.npmjs.org/@textlint/markdown-to-ast/-/markdown-to-ast-6.2.6.tgz"; + sha512 = "TjZTMGYla9Nznegy0r23EEzNMfWva0oksj+48aqMlbQ+UvBA5vdEC0VzCO3l0Z137RgEJ+glInbvEilo2zcjZg=="; }; }; - "@textlint/module-interop-1.1.4" = { + "@textlint/module-interop-1.1.5" = { name = "_at_textlint_slash_module-interop"; packageName = "@textlint/module-interop"; - version = "1.1.4"; + version = "1.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/module-interop/-/module-interop-1.1.4.tgz"; - sha512 = "9M3kYG5nBoD2lhp05sqi6fieNU6rBcf+A8Trp+4d8o5uJ4RRsWeRtAQMWM7Tv15onqIITRq7fm3la7xovVB9KA=="; + url = "https://registry.npmjs.org/@textlint/module-interop/-/module-interop-1.1.5.tgz"; + sha512 = "YXz4qV6thEuwNfamHFhRsebZM7FWe1x3fD7XAqPxE8J+HLQea3Y0i52hU/rTQvt85omYq+37g3YtqjX60mYjog=="; }; }; - "@textlint/text-to-ast-3.2.4" = { + "@textlint/text-to-ast-3.2.5" = { name = "_at_textlint_slash_text-to-ast"; packageName = "@textlint/text-to-ast"; - version = "3.2.4"; + version = "3.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/text-to-ast/-/text-to-ast-3.2.4.tgz"; - sha512 = "uIiNg52OdQ3Fn8aOYaV7BLW2QakNsmf4doypIwrW4q+gHYQ3jxdPHHkq6RxuYoO112vO40M3zmAoEZmM1qmPhw=="; + url = "https://registry.npmjs.org/@textlint/text-to-ast/-/text-to-ast-3.2.5.tgz"; + sha512 = "1B43L9tVr2b6Qm37KsdI8dbutL8b5AN95PFGzPpxaJbShz8TjVUFQ5bxPrnKGc7wV5MFpazf+/UVjZx6JtUbMA=="; }; }; - "@textlint/textlint-plugin-markdown-5.2.6" = { + "@textlint/textlint-plugin-markdown-5.2.7" = { name = "_at_textlint_slash_textlint-plugin-markdown"; packageName = "@textlint/textlint-plugin-markdown"; - version = "5.2.6"; + version = "5.2.7"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/textlint-plugin-markdown/-/textlint-plugin-markdown-5.2.6.tgz"; - sha512 = "S65wy2npaBLT7pwPPlrN9Pw40hOJsxiW+T6peMJOFEMLRem5qlCIlT+02Wlf0Rrtr6/gKDckpphTUiZT1+xRnQ=="; + url = "https://registry.npmjs.org/@textlint/textlint-plugin-markdown/-/textlint-plugin-markdown-5.2.7.tgz"; + sha512 = "GKx79nbsLwvDdyv98wnX2BSF83MKTM5j09OFJp2+wi2qrWO3U0+7YMILfdHDqyPfUk+osuy65BAFeq5jlXPomQ=="; }; }; - "@textlint/textlint-plugin-text-4.2.6" = { + "@textlint/textlint-plugin-text-4.2.7" = { name = "_at_textlint_slash_textlint-plugin-text"; packageName = "@textlint/textlint-plugin-text"; - version = "4.2.6"; + version = "4.2.7"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/textlint-plugin-text/-/textlint-plugin-text-4.2.6.tgz"; - sha512 = "KCgb5GVjoEDIi37UpQN6kFciiouyATNYrj/JufCeLNJEcVcxSm12EoFRKjpXpXmTOVqZUyGnIDU797z1usAZDw=="; + url = "https://registry.npmjs.org/@textlint/textlint-plugin-text/-/textlint-plugin-text-4.2.7.tgz"; + sha512 = "uMoASP8kIJrMqMJCXePvKSh0tOEuiQS9vFjH+kq2kS8/+Po6Wwgma9IdJsLWuSI8H4ufcvbozREuY+DceQAp/w=="; }; }; - "@textlint/types-1.4.5" = { + "@textlint/types-1.4.6" = { name = "_at_textlint_slash_types"; packageName = "@textlint/types"; - version = "1.4.5"; + version = "1.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/types/-/types-1.4.5.tgz"; - sha512 = "7pA1rdiw1jsDNGwxupMC6fPlRNAHY6fKZ3s+jAY53o6RroOSR+5qO0sAjJ26lsSOhveH8imZzyyD08dk58IVJQ=="; + url = "https://registry.npmjs.org/@textlint/types/-/types-1.4.6.tgz"; + sha512 = "hoKPvIzNf+vI0goRk90HfsVUbXkAp4BfpvRxh51TGqVG27dlYrQJZkYheuUNUAwyj0Id09qzVwXno/xQPMYPcg=="; }; }; - "@textlint/utils-1.1.4" = { + "@textlint/utils-1.1.5" = { name = "_at_textlint_slash_utils"; packageName = "@textlint/utils"; - version = "1.1.4"; + version = "1.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/utils/-/utils-1.1.4.tgz"; - sha512 = "KmU+kGi7vG5toUhNdLHHPxyVN1mNGcjMVe1tNDEXT1wU/3oqA96bunElrROWHYw5iNt1QVRaIAtNeMVyzyAdVA=="; + url = "https://registry.npmjs.org/@textlint/utils/-/utils-1.1.5.tgz"; + sha512 = "wv1m6yyaQpt1QrGKIUYwMoL5LLhDhXk05+pXg3i0+8PC8X95jNin10fSkxRMyXOsEqB6481GR3XgQ8Ia7DO1tg=="; }; }; "@tokenizer/token-0.1.1" = { @@ -5350,13 +5521,13 @@ let sha512 = "NTPErx4/FiPCGScH7foPyr+/1Dkzkni+rHiYHHoTjvwou7AQzJkNeD60A9CXRy+ZEN2B1bggmkTMCDb+Mv5k+A=="; }; }; - "@types/babel__traverse-7.0.16" = { + "@types/babel__traverse-7.11.0" = { name = "_at_types_slash_babel__traverse"; packageName = "@types/babel__traverse"; - version = "7.0.16"; + version = "7.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.0.16.tgz"; - sha512 = "S63Dt4CZOkuTmpLGGWtT/mQdVORJOpx6SZWGVaP56dda/0Nx5nEe82K7/LAm8zYr6SfMq+1N2OreIOrHAx656w=="; + url = "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.11.0.tgz"; + sha512 = "kSjgDMZONiIfSH1Nxcr5JIRMwUetDki63FSQfpTCz8ogF3Ulqm8+mr5f78dUYs6vMiB6gBusQqfQmBvHZj/lwg=="; }; }; "@types/babylon-6.16.5" = { @@ -5413,15 +5584,6 @@ let sha512 = "AQI7X+ow3SaONl44JrHoL/5B+lCsJyG31UHZ5RP98Uh15hI/zjEkDsAb4EIm4P9TGfNhZLXw/nMc5w0u10+/fQ=="; }; }; - "@types/classnames-2.2.11" = { - name = "_at_types_slash_classnames"; - packageName = "@types/classnames"; - version = "2.2.11"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/classnames/-/classnames-2.2.11.tgz"; - sha512 = "2koNhpWm3DgWRp5tpkiJ8JGc1xTn2q0l+jUNUE7oMKXUf5NpI9AIdC4kbjGNFBdHtcxBD18LAksoudAVhFKCjw=="; - }; - }; "@types/clone-2.1.0" = { name = "_at_types_slash_clone"; packageName = "@types/clone"; @@ -5449,13 +5611,13 @@ let sha1 = "cd1e8553633ad3185c3f2f239ecff5d2643e92b6"; }; }; - "@types/connect-3.4.33" = { + "@types/connect-3.4.34" = { name = "_at_types_slash_connect"; packageName = "@types/connect"; - version = "3.4.33"; + version = "3.4.34"; src = fetchurl { - url = "https://registry.npmjs.org/@types/connect/-/connect-3.4.33.tgz"; - sha512 = "2+FrkXY4zllzTNfJth7jOqEHC+enpLeGslEhpnTAkg21GkRrWV4SsAtqchtT4YS9/nODBU2/ZfsBY2X4J/dX7A=="; + url = "https://registry.npmjs.org/@types/connect/-/connect-3.4.34.tgz"; + sha512 = "ePPA/JuI+X0vb+gSWlPKOY0NdNAie/rPUqX2GUPpbZwiKTkSPhjXWuee47E4MtE54QVzGCQMQkAL6JhV2E1+cQ=="; }; }; "@types/content-disposition-0.5.3" = { @@ -5485,13 +5647,13 @@ let sha512 = "t73xJJrvdTjXrn4jLS9VSGRbz0nUY3cl2DMGDU48lKl+HR9dbbjW2A9r3g40VA++mQpy6uuHg33gy7du2BKpog=="; }; }; - "@types/cookies-0.7.5" = { + "@types/cookies-0.7.6" = { name = "_at_types_slash_cookies"; packageName = "@types/cookies"; - version = "0.7.5"; + version = "0.7.6"; src = fetchurl { - url = "https://registry.npmjs.org/@types/cookies/-/cookies-0.7.5.tgz"; - sha512 = "3+TAFSm78O7/bAeYdB8FoYGntuT87vVP9JKuQRL8sRhv9313LP2SpHHL50VeFtnyjIcb3UELddMk5Yt0eOSOkg=="; + url = "https://registry.npmjs.org/@types/cookies/-/cookies-0.7.6.tgz"; + sha512 = "FK4U5Qyn7/Sc5ih233OuHO0qAkOpEcD/eG6584yEiLKizTFRny86qHLe/rej3HFQrkBuUjF4whFliAdODbVN/w=="; }; }; "@types/cors-2.8.8" = { @@ -5503,6 +5665,15 @@ let sha512 = "fO3gf3DxU2Trcbr75O7obVndW/X5k8rJNZkLXlQWStTHhP71PkRqjwPIEI0yMnJdg9R9OasjU+Bsr+Hr1xy/0w=="; }; }; + "@types/cors-2.8.9" = { + name = "_at_types_slash_cors"; + packageName = "@types/cors"; + version = "2.8.9"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/cors/-/cors-2.8.9.tgz"; + sha512 = "zurD1ibz21BRlAOIKP8yhrxlqKx6L9VCwkB5kMiP6nZAhoF5MvC7qS1qPA7nRcr1GJolfkQC7/EAL4hdYejLtg=="; + }; + }; "@types/debug-0.0.30" = { name = "_at_types_slash_debug"; packageName = "@types/debug"; @@ -5539,6 +5710,15 @@ let sha512 = "Lo5dy3ai6LNnbL663sgdzqL1eib11u1yKH6w3v3IXEOO4kRfQpMn1qWUTaumcHLACjFp1RcBx9tUXEvJoR3vcA=="; }; }; + "@types/duplexify-3.6.0" = { + name = "_at_types_slash_duplexify"; + packageName = "@types/duplexify"; + version = "3.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/duplexify/-/duplexify-3.6.0.tgz"; + sha512 = "5zOA53RUlzN74bvrSGwjudssD9F3a797sDZQkiYpUOxW+WHaXTCPz4/d5Dgi6FKnOqZ2CpaTo0DhgIfsXAOE/A=="; + }; + }; "@types/ejs-2.7.0" = { name = "_at_types_slash_ejs"; packageName = "@types/ejs"; @@ -5629,31 +5809,13 @@ let sha512 = "wLhcKh3PMlyA2cNAB9sjM1BntnhPMiM0JOBwPBqttjHev2428MLEB4AYVN+d8s2iyCVZac+o41Pflm/ZH5vLXQ=="; }; }; - "@types/express-4.17.9" = { - name = "_at_types_slash_express"; - packageName = "@types/express"; - version = "4.17.9"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/express/-/express-4.17.9.tgz"; - sha512 = "SDzEIZInC4sivGIFY4Sz1GG6J9UObPwCInYJjko2jzOf/Imx/dlpume6Xxwj1ORL82tBbmN4cPDIDkLbWHk9hw=="; - }; - }; - "@types/express-serve-static-core-4.17.13" = { + "@types/express-serve-static-core-4.17.17" = { name = "_at_types_slash_express-serve-static-core"; packageName = "@types/express-serve-static-core"; - version = "4.17.13"; + version = "4.17.17"; src = fetchurl { - url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.13.tgz"; - sha512 = "RgDi5a4nuzam073lRGKTUIaL3eF2+H7LJvJ8eUnCI0wA6SNjXc44DCmWNiTLs/AZ7QlsFWZiw/gTG3nSQGL0fA=="; - }; - }; - "@types/express-serve-static-core-4.17.14" = { - name = "_at_types_slash_express-serve-static-core"; - packageName = "@types/express-serve-static-core"; - version = "4.17.14"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.14.tgz"; - sha512 = "uFTLwu94TfUFMToXNgRZikwPuZdOtDgs3syBtAIr/OXorL1kJqUJT9qCLnRZ5KBOWfZQikQ2xKgR2tnDj1OgDA=="; + url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.17.tgz"; + sha512 = "YYlVaCni5dnHc+bLZfY908IG1+x5xuibKZMGv8srKkvtul3wUuanYvpIj9GXXoWkQbaAdR+kgX46IETKUALWNQ=="; }; }; "@types/fancy-log-1.3.0" = { @@ -5854,13 +6016,13 @@ let sha512 = "P/W9yOX/3oPZSpaYOCQzGqgCQRXn0FFO/V8bWrCQs+wLmvVVxk6CRBXALEvNs9OHIatlnlFokfhuDo2ug01ciw=="; }; }; - "@types/jquery-3.5.4" = { + "@types/jquery-3.5.5" = { name = "_at_types_slash_jquery"; packageName = "@types/jquery"; - version = "3.5.4"; + version = "3.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.4.tgz"; - sha512 = "//9CHhaUt/rurMJTxGI+I6DmsNHgYU6d8aSLFfO5dB7+10lwLnaWT0z5GY/yY82Q/M+B+0Qh3TixlJ8vmBeqIw=="; + url = "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.5.tgz"; + sha512 = "6RXU9Xzpc6vxNrS6FPPapN1SxSHgQ336WC6Jj/N8q30OiaBZ00l1GBgeP7usjVZPivSkGUfL1z/WW6TX989M+w=="; }; }; "@types/js-yaml-3.12.5" = { @@ -5953,13 +6115,13 @@ let sha512 = "EP6O3Jkr7bXvZZSZYlsgt5DIjiGr0dXP1/jVEwVLTFgg0d+3lWVQkRavYVQszV7dYUwvg0B8R0MBDpcmXg7XIA=="; }; }; - "@types/lodash-4.14.165" = { + "@types/lodash-4.14.167" = { name = "_at_types_slash_lodash"; packageName = "@types/lodash"; - version = "4.14.165"; + version = "4.14.167"; src = fetchurl { - url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.165.tgz"; - sha512 = "tjSSOTHhI5mCHTy/OOXYIhi2Wt1qcbHmuXD1Ha7q70CgI/I71afO4XtLb/cVexki1oVYchpul/TOuu3Arcdxrg=="; + url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.167.tgz"; + sha512 = "w7tQPjARrvdeBkX/Rwg95S592JwxqOjmms3zWQ0XZgSyxSLdzWaYH3vErBhdVS/lRBX7F8aBYcYJYTr5TMGOzw=="; }; }; "@types/long-4.0.1" = { @@ -6061,6 +6223,15 @@ let sha512 = "ZvO2tAcjmMi8V/5Z3JsyofMe3hasRcaw88cto5etSVMwVQfeivGAlEYmaQgceUSVYFofVjT+ioHsATjdWcFt1w=="; }; }; + "@types/mocha-8.2.0" = { + name = "_at_types_slash_mocha"; + packageName = "@types/mocha"; + version = "8.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/mocha/-/mocha-8.2.0.tgz"; + sha512 = "/Sge3BymXo4lKc31C8OINJgXLaw+7vL1/L1pGiBNpGrBiT8FQiaFpSYV0uhTaG4y78vcMBTMFsWaHDvuD+xGzQ=="; + }; + }; "@types/multer-1.4.4" = { name = "_at_types_slash_multer"; packageName = "@types/multer"; @@ -6088,31 +6259,40 @@ let sha512 = "fh+pAqt4xRzPfqA6eh3Z2y6fyZavRIumvjhaCL753+TVkGKGhpPeyrJG2JftD0T9q4GF00KjefsQ+PQNDdWQaQ=="; }; }; - "@types/node-10.17.48" = { + "@types/node-10.17.50" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "10.17.48"; + version = "10.17.50"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-10.17.48.tgz"; - sha512 = "Agl6xbYP6FOMDeAsr3QVZ+g7Yzg0uhPHWx0j5g4LFdUBHVtqtU+gH660k/lCEe506jJLOGbEzsnqPDTZGJQLag=="; + url = "https://registry.npmjs.org/@types/node/-/node-10.17.50.tgz"; + sha512 = "vwX+/ija9xKc/z9VqMCdbf4WYcMTGsI0I/L/6shIF3qXURxZOhPQlPRHtjTpiNhAwn0paMJzlOQqw6mAGEQnTA=="; }; }; - "@types/node-12.7.12" = { + "@types/node-12.12.70" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "12.7.12"; + version = "12.12.70"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-12.7.12.tgz"; - sha512 = "KPYGmfD0/b1eXurQ59fXD1GBzhSQfz6/lKBxkaHX9dKTzjXbK68Zt7yGUxUsCS1jeTy/8aL+d9JEr+S54mpkWQ=="; + url = "https://registry.npmjs.org/@types/node/-/node-12.12.70.tgz"; + sha512 = "i5y7HTbvhonZQE+GnUM2rz1Bi8QkzxdQmEv1LKOv4nWyaQk/gdeiTApuQR3PDJHX7WomAbpx2wlWSEpxXGZ/UQ=="; }; }; - "@types/node-13.13.34" = { + "@types/node-12.19.12" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "13.13.34"; + version = "12.19.12"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-13.13.34.tgz"; - sha512 = "g8D1HF2dMDKYSDl5+79izRwRgNPsSynmWMbj50mj7GZ0b7Lv4p8EmZjbo3h0h+6iLr6YmVz9VnF6XVZ3O6V1Ug=="; + url = "https://registry.npmjs.org/@types/node/-/node-12.19.12.tgz"; + sha512 = "UwfL2uIU9arX/+/PRcIkT08/iBadGN2z6ExOROA2Dh5mAuWTBj6iJbQX4nekiV5H8cTrEG569LeX+HRco9Cbxw=="; + }; + }; + "@types/node-13.13.39" = { + name = "_at_types_slash_node"; + packageName = "@types/node"; + version = "13.13.39"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/node/-/node-13.13.39.tgz"; + sha512 = "wct+WgRTTkBm2R3vbrFOqyZM5w0g+D8KnhstG9463CJBVC3UVZHMToge7iMBR1vDl/I+NWFHUeK9X+JcF0rWKw=="; }; }; "@types/node-14.11.1" = { @@ -6124,13 +6304,13 @@ let sha512 = "oTQgnd0hblfLsJ6BvJzzSL+Inogp3lq9fGgqRkMB/ziKMgEUaFl801OncOzUmalfzt14N0oPHMK47ipl+wbTIw=="; }; }; - "@types/node-14.14.10" = { + "@types/node-14.14.20" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "14.14.10"; + version = "14.14.20"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-14.14.10.tgz"; - sha512 = "J32dgx2hw8vXrSbu4ZlVhn1Nm3GbeCFNw2FWL8S5QKucHGY0cyNwjdQdO+KMBZ4wpmC7KhLCiNsdk1RFRIYUQQ=="; + url = "https://registry.npmjs.org/@types/node/-/node-14.14.20.tgz"; + sha512 = "Y93R97Ouif9JEOWPIUyU+eyIdyRqQR0I8Ez1dzku4hDx34NWh4HbtIc3WNzwB1Y9ULvNGeu5B8h8bVL5cAk4/A=="; }; }; "@types/node-6.14.13" = { @@ -6241,6 +6421,15 @@ let sha512 = "ewFXqrQHlFsgc09MK5jP5iR7vumV/BYayNC6PgJO2LPe8vrnNFyjQjSppfEngITi0qvfKtzFvgKymGheFM9UOA=="; }; }; + "@types/readline-sync-1.4.3" = { + name = "_at_types_slash_readline-sync"; + packageName = "@types/readline-sync"; + version = "1.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/readline-sync/-/readline-sync-1.4.3.tgz"; + sha512 = "YP9NVli96E+qQLAF2db+VjnAUEeZcFVg4YnMgr8kpDUFwQBnj31rPLOVHmazbKQhaIkJ9cMHsZhpKdzUeL0KTg=="; + }; + }; "@types/request-2.48.5" = { name = "_at_types_slash_request"; packageName = "@types/request"; @@ -6448,6 +6637,15 @@ let sha512 = "awrJu8yML4E/xTwr2EMatC+HBnHGoDxc2+ImA9QyeUELI1S7dOCIZcyjki1rkwoA8P2D2NVgLAJLjnclkdLtAw=="; }; }; + "@types/uuid-8.3.0" = { + name = "_at_types_slash_uuid"; + packageName = "@types/uuid"; + version = "8.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/uuid/-/uuid-8.3.0.tgz"; + sha512 = "eQ9qFW/fhfGJF8WKHGEHZEyVWfZxrT+6CLIJGBcZPfxUh/+BnEj+UCGYMlr9qZuX/2AltsvwrGqp0LhEW8D0zQ=="; + }; + }; "@types/vfile-3.0.2" = { name = "_at_types_slash_vfile"; packageName = "@types/vfile"; @@ -6466,13 +6664,13 @@ let sha512 = "GpTIuDpb9u4zIO165fUy9+fXcULdD8HFRNli04GehoMVbeNq7D6OBnqSmg3lxZnC+UvgUhEWKxdKiwYUkGltIw=="; }; }; - "@types/vscode-1.51.0" = { + "@types/vscode-1.52.0" = { name = "_at_types_slash_vscode"; packageName = "@types/vscode"; - version = "1.51.0"; + version = "1.52.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/vscode/-/vscode-1.51.0.tgz"; - sha512 = "C/jZ35OT5k/rsJyAK8mS1kM++vMcm89oSWegkzxRCvHllIq0cToZAkIDs6eCY4SKrvik3nrhELizyLcM0onbQA=="; + url = "https://registry.npmjs.org/@types/vscode/-/vscode-1.52.0.tgz"; + sha512 = "Kt3bvWzAvvF/WH9YEcrCICDp0Z7aHhJGhLJ1BxeyNP6yRjonWqWnAIh35/pXAjswAnWOABrYlF7SwXR9+1nnLA=="; }; }; "@types/webpack-4.41.25" = { @@ -6520,22 +6718,22 @@ let sha512 = "NRqD6T4gktUrDi1o1wLH3EKC1o2caCr7/wR87ODcbVITQF106OM3sFN92ysZ++wqelOd1CTzatnOBRDYYG6wGQ=="; }; }; - "@types/yargs-15.0.11" = { + "@types/yargs-15.0.12" = { name = "_at_types_slash_yargs"; packageName = "@types/yargs"; - version = "15.0.11"; + version = "15.0.12"; src = fetchurl { - url = "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.11.tgz"; - sha512 = "jfcNBxHFYJ4nPIacsi3woz1+kvUO6s1CyeEhtnDHBjHUMNj5UlW2GynmnSgiJJEdNg9yW5C8lfoNRZrHGv5EqA=="; + url = "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.12.tgz"; + sha512 = "f+fD/fQAo3BCbCDlrUpznF1A5Zp9rB0noS5vnoormHSIPFKL0Z2DcUJ3Gxp5ytH4uLRNxy7AwYUC9exZzqGMAw=="; }; }; - "@types/yargs-parser-15.0.0" = { + "@types/yargs-parser-20.2.0" = { name = "_at_types_slash_yargs-parser"; packageName = "@types/yargs-parser"; - version = "15.0.0"; + version = "20.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-15.0.0.tgz"; - sha512 = "FA/BWv8t8ZWJ+gEOnLLd8ygxH/2UFbAvgEonyfN6yWGLKc7zVjbpl2Y4CTjid9h2RfgPP6SEt6uHwEOply00yw=="; + url = "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-20.2.0.tgz"; + sha512 = "37RSHht+gzzgYeobbG+KWryeAW8J33Nhr69cjTqSYymXVZEN9NbRYWoYlRtDhHKPVT1FyNKwaTPC1NynKZpzRA=="; }; }; "@types/yauzl-2.9.1" = { @@ -6556,22 +6754,22 @@ let sha512 = "S9q47ByT2pPvD65IvrWp7qppVMpk9WGMbVq9wbWZOHg6tnXSD4vyhao6nOSBwwfDdV2p3Kx9evA9vI+XWTfDvw=="; }; }; - "@types/zen-observable-0.8.1" = { + "@types/zen-observable-0.8.2" = { name = "_at_types_slash_zen-observable"; packageName = "@types/zen-observable"; - version = "0.8.1"; + version = "0.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/zen-observable/-/zen-observable-0.8.1.tgz"; - sha512 = "wmk0xQI6Yy7Fs/il4EpOcflG4uonUpYGqvZARESLc2oy4u69fkatFLbJOeW4Q6awO15P4rduAe6xkwHevpXcUQ=="; + url = "https://registry.npmjs.org/@types/zen-observable/-/zen-observable-0.8.2.tgz"; + sha512 = "HrCIVMLjE1MOozVoD86622S7aunluLb2PJdPfb3nYiEtohm8mIB/vyv0Fd37AdeMFrTUQXEunw78YloMA3Qilg=="; }; }; - "@typescript-eslint/eslint-plugin-3.10.1" = { + "@typescript-eslint/eslint-plugin-4.12.0" = { name = "_at_typescript-eslint_slash_eslint-plugin"; packageName = "@typescript-eslint/eslint-plugin"; - version = "3.10.1"; + version = "4.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-3.10.1.tgz"; - sha512 = "PQg0emRtzZFWq6PxBcdxRH3QIQiyFO3WCVpRL3fgj5oQS3CDs3AeAKfv4DxNhzn8ITdNJGJ4D3Qw8eAJf3lXeQ=="; + url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.12.0.tgz"; + sha512 = "wHKj6q8s70sO5i39H2g1gtpCXCvjVszzj6FFygneNFyIAxRvNSVz9GML7XpqrB9t7hNutXw+MHnLN/Ih6uyB8Q=="; }; }; "@typescript-eslint/experimental-utils-3.10.1" = { @@ -6583,6 +6781,15 @@ let sha512 = "DewqIgscDzmAfd5nOGe4zm6Bl7PKtMG2Ad0KG8CUZAHlXfAKTF9Ol5PXhiMh39yRL2ChRH1cuuUGOcVyyrhQIw=="; }; }; + "@typescript-eslint/experimental-utils-4.12.0" = { + name = "_at_typescript-eslint_slash_experimental-utils"; + packageName = "@typescript-eslint/experimental-utils"; + version = "4.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.12.0.tgz"; + sha512 = "MpXZXUAvHt99c9ScXijx7i061o5HEjXltO+sbYfZAAHxv3XankQkPaNi5myy0Yh0Tyea3Hdq1pi7Vsh0GJb0fA=="; + }; + }; "@typescript-eslint/parser-3.10.1" = { name = "_at_typescript-eslint_slash_parser"; packageName = "@typescript-eslint/parser"; @@ -6592,6 +6799,24 @@ let sha512 = "Ug1RcWcrJP02hmtaXVS3axPPTTPnZjupqhgj+NnZ6BCkwSImWk/283347+x9wN+lqOdK9Eo3vsyiyDHgsmiEJw=="; }; }; + "@typescript-eslint/parser-4.12.0" = { + name = "_at_typescript-eslint_slash_parser"; + packageName = "@typescript-eslint/parser"; + version = "4.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.12.0.tgz"; + sha512 = "9XxVADAo9vlfjfoxnjboBTxYOiNY93/QuvcPgsiKvHxW6tOZx1W4TvkIQ2jB3k5M0pbFP5FlXihLK49TjZXhuQ=="; + }; + }; + "@typescript-eslint/scope-manager-4.12.0" = { + name = "_at_typescript-eslint_slash_scope-manager"; + packageName = "@typescript-eslint/scope-manager"; + version = "4.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.12.0.tgz"; + sha512 = "QVf9oCSVLte/8jvOsxmgBdOaoe2J0wtEmBr13Yz0rkBNkl5D8bfnf6G4Vhox9qqMIoG7QQoVwd2eG9DM/ge4Qg=="; + }; + }; "@typescript-eslint/types-3.10.1" = { name = "_at_typescript-eslint_slash_types"; packageName = "@typescript-eslint/types"; @@ -6601,6 +6826,15 @@ let sha512 = "+3+FCUJIahE9q0lDi1WleYzjCwJs5hIsbugIgnbB+dSCYUxl8L6PwmsyOPFZde2hc1DlTo/xnkOgiTLSyAbHiQ=="; }; }; + "@typescript-eslint/types-4.12.0" = { + name = "_at_typescript-eslint_slash_types"; + packageName = "@typescript-eslint/types"; + version = "4.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.12.0.tgz"; + sha512 = "N2RhGeheVLGtyy+CxRmxdsniB7sMSCfsnbh8K/+RUIXYYq3Ub5+sukRCjVE80QerrUBvuEvs4fDhz5AW/pcL6g=="; + }; + }; "@typescript-eslint/typescript-estree-2.34.0" = { name = "_at_typescript-eslint_slash_typescript-estree"; packageName = "@typescript-eslint/typescript-estree"; @@ -6619,6 +6853,15 @@ let sha512 = "QbcXOuq6WYvnB3XPsZpIwztBoquEYLXh2MtwVU+kO8jgYCiv4G5xrSP/1wg4tkvrEE+esZVquIPX/dxPlePk1w=="; }; }; + "@typescript-eslint/typescript-estree-4.12.0" = { + name = "_at_typescript-eslint_slash_typescript-estree"; + packageName = "@typescript-eslint/typescript-estree"; + version = "4.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.12.0.tgz"; + sha512 = "gZkFcmmp/CnzqD2RKMich2/FjBTsYopjiwJCroxqHZIY11IIoN0l5lKqcgoAPKHt33H2mAkSfvzj8i44Jm7F4w=="; + }; + }; "@typescript-eslint/visitor-keys-3.10.1" = { name = "_at_typescript-eslint_slash_visitor-keys"; packageName = "@typescript-eslint/visitor-keys"; @@ -6628,6 +6871,15 @@ let sha512 = "9JgC82AaQeglebjZMgYR5wgmfUdUc+EitGUUMW8u2nDckaeimzW+VsoLV6FoimPv2id3VQzfjwBxEMVz08ameQ=="; }; }; + "@typescript-eslint/visitor-keys-4.12.0" = { + name = "_at_typescript-eslint_slash_visitor-keys"; + packageName = "@typescript-eslint/visitor-keys"; + version = "4.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.12.0.tgz"; + sha512 = "hVpsLARbDh4B9TKYz5cLbcdMIOAoBYgFPCSP9FFS/liSF+b33gVNq8JHY3QGhHNVz85hObvL7BEYLlgx553WCw=="; + }; + }; "@uifabric/foundation-7.9.20" = { name = "_at_uifabric_slash_foundation"; packageName = "@uifabric/foundation"; @@ -6763,76 +7015,76 @@ let sha512 = "mFdUlfDGxoyreCQWO/SX4DvM/6epn37AimVGzLJLpSPJdWUerCnvxwzB6zL83SiYC6O6++cWEdzgz7EtKViFlA=="; }; }; - "@vue/compiler-core-3.0.4" = { + "@vue/compiler-core-3.0.5" = { name = "_at_vue_slash_compiler-core"; packageName = "@vue/compiler-core"; - version = "3.0.4"; + version = "3.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.0.4.tgz"; - sha512 = "snpMICsbWTZqBFnPB03qr4DtiSxVYfDF3DvbDSkN9Z9NTM8Chl8E/lYhKBSsvauq91DAWAh8PU3lr9vrLyQsug=="; + url = "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.0.5.tgz"; + sha512 = "iFXwk2gmU/GGwN4hpBwDWWMLvpkIejf/AybcFtlQ5V1ur+5jwfBaV0Y1RXoR6ePfBPJixtKZ3PmN+M+HgMAtfQ=="; }; }; - "@vue/compiler-dom-3.0.4" = { + "@vue/compiler-dom-3.0.5" = { name = "_at_vue_slash_compiler-dom"; packageName = "@vue/compiler-dom"; - version = "3.0.4"; + version = "3.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.0.4.tgz"; - sha512 = "FOxbHBIkkGjYQeTz1DlXQjS1Ms8EPXQWsdTdTPeohoS0KzCz6RiOjiAG+jLtMi6Nr5GX2h0TlCvcnI8mcsicFQ=="; + url = "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.0.5.tgz"; + sha512 = "HSOSe2XSPuCkp20h4+HXSiPH9qkhz6YbW9z9ZtL5vef2T2PMugH7/osIFVSrRZP/Ul5twFZ7MIRlp8tPX6e4/g=="; }; }; - "@vue/compiler-sfc-3.0.4" = { + "@vue/compiler-sfc-3.0.5" = { name = "_at_vue_slash_compiler-sfc"; packageName = "@vue/compiler-sfc"; - version = "3.0.4"; + version = "3.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.0.4.tgz"; - sha512 = "brDn6HTuK6R3oBCjtMPPsIpyJEZFinlnxjtBXww/goFJOJBAU9CrsdegwyZItNnixCFUIg4CLv4Nj1Eg/eKlfg=="; + url = "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.0.5.tgz"; + sha512 = "uOAC4X0Gx3SQ9YvDC7YMpbDvoCmPvP0afVhJoxRotDdJ+r8VO3q4hFf/2f7U62k4Vkdftp6DVni8QixrfYzs+w=="; }; }; - "@vue/compiler-ssr-3.0.4" = { + "@vue/compiler-ssr-3.0.5" = { name = "_at_vue_slash_compiler-ssr"; packageName = "@vue/compiler-ssr"; - version = "3.0.4"; + version = "3.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.0.4.tgz"; - sha512 = "4aYWQEL4+LS4+D44K9Z7xMOWMEjBsz4Li9nMcj2rxRQ35ewK6uFPodvs6ORP60iBDSkwUFZoldFlNemQlu1BFw=="; + url = "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.0.5.tgz"; + sha512 = "Wm//Kuxa1DpgjE4P9W0coZr8wklOfJ35Jtq61CbU+t601CpPTK4+FL2QDBItaG7aoUUDCWL5nnxMkuaOgzTBKg=="; }; }; - "@vue/reactivity-3.0.4" = { + "@vue/reactivity-3.0.5" = { name = "_at_vue_slash_reactivity"; packageName = "@vue/reactivity"; - version = "3.0.4"; + version = "3.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.0.4.tgz"; - sha512 = "AFTABrLhUYZY2on3ea9FxeXal7w3f6qIp9gT+/oG93H7dFTL5LvVnxygCopv7tvkIl/GSGQb/yK1D1gmXx1Pww=="; + url = "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.0.5.tgz"; + sha512 = "3xodUE3sEIJgS7ntwUbopIpzzvi7vDAOjVamfb2l+v1FUg0jpd3gf62N2wggJw3fxBMr+QvyxpD+dBoxLsmAjw=="; }; }; - "@vue/runtime-core-3.0.4" = { + "@vue/runtime-core-3.0.5" = { name = "_at_vue_slash_runtime-core"; packageName = "@vue/runtime-core"; - version = "3.0.4"; + version = "3.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.0.4.tgz"; - sha512 = "qH9e4kqU7b3u1JewvLmGmoAGY+mnuBqz7aEKb2mhpEgwa1yFv496BRuUfMXXMCix3+TndUVMJ8jt41FSdNppwg=="; + url = "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.0.5.tgz"; + sha512 = "Cnyi2NqREwOLcTEsIi1DQX1hHtkVj4eGm4hBG7HhokS05DqpK4/80jG6PCCnCH9rIJDB2FqtaODX397210plXg=="; }; }; - "@vue/runtime-dom-3.0.4" = { + "@vue/runtime-dom-3.0.5" = { name = "_at_vue_slash_runtime-dom"; packageName = "@vue/runtime-dom"; - version = "3.0.4"; + version = "3.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.0.4.tgz"; - sha512 = "BGIoiTSESzWUhN0Ofi2X/q+HN8f6IUFmUEyyBGKbmx7DTAJNZhFfjqsepfXQrM5IGeTfJLB1ZEVyroDQJNXq3g=="; + url = "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.0.5.tgz"; + sha512 = "iilX1KySeIzHHtErT6Y44db1rhWK5tAI0CiJIPr+SJoZ2jbjoOSE6ff/jfIQakchbm1d6jq6VtRVnp5xYdOXKA=="; }; }; - "@vue/shared-3.0.4" = { + "@vue/shared-3.0.5" = { name = "_at_vue_slash_shared"; packageName = "@vue/shared"; - version = "3.0.4"; + version = "3.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/shared/-/shared-3.0.4.tgz"; - sha512 = "Swfbz31AaMX48CpFl+YmIrqOH9MgJMTrltG9e26A4ZxYx9LjGuMV+41WnxFzS3Bc9nbrc6sDPM37G6nIT8NJSg=="; + url = "https://registry.npmjs.org/@vue/shared/-/shared-3.0.5.tgz"; + sha512 = "gYsNoGkWejBxNO6SNRjOh/xKeZ0H0V+TFzaPzODfBjkAIb0aQgBuixC1brandC/CDJy1wYPwSoYrXpvul7m6yw=="; }; }; "@webassemblyjs/ast-1.8.1" = { @@ -6934,6 +7186,15 @@ let sha512 = "qZol43oqhq6yBPx7YM3m9Bv7WMV9Eevj6kMi6InKOuZxhw+q9hOkvq5e/PpKSiLfyetpaBnogSbNCfBwyB00CA=="; }; }; + "@webassemblyjs/helper-buffer-1.9.1" = { + name = "_at_webassemblyjs_slash_helper-buffer"; + packageName = "@webassemblyjs/helper-buffer"; + version = "1.9.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.9.1.tgz"; + sha512 = "uS6VSgieHbk/m4GSkMU5cqe/5TekdCzQso4revCIEQ3vpGZgqSSExi4jWpTWwDpAHOIAb1Jfrs0gUB9AA4n71w=="; + }; + }; "@webassemblyjs/helper-code-frame-1.8.1" = { name = "_at_webassemblyjs_slash_helper-code-frame"; packageName = "@webassemblyjs/helper-code-frame"; @@ -7078,6 +7339,15 @@ let sha512 = "XnMB8l3ek4tvrKUUku+IVaXNHz2YsJyOOmz+MMkZvh8h1uSJpSen6vYnw3IoQ7WwEuAhL8Efjms1ZWjqh2agvw=="; }; }; + "@webassemblyjs/helper-wasm-section-1.9.1" = { + name = "_at_webassemblyjs_slash_helper-wasm-section"; + packageName = "@webassemblyjs/helper-wasm-section"; + version = "1.9.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.9.1.tgz"; + sha512 = "FetqzjtXZr2d57IECK+aId3D0IcGweeM0CbAnJHkYJkcRTHP+YcMb7Wmc0j21h5UWBpwYGb9dSkK/93SRCTrGg=="; + }; + }; "@webassemblyjs/ieee754-1.8.1" = { name = "_at_webassemblyjs_slash_ieee754"; packageName = "@webassemblyjs/ieee754"; @@ -7177,6 +7447,15 @@ let sha512 = "FgHzBm80uwz5M8WKnMTn6j/sVbqilPdQXTWraSjBwFXSYGirpkSWE2R9Qvz9tNiTKQvoKILpCuTjBKzOIm0nxw=="; }; }; + "@webassemblyjs/wasm-edit-1.9.1" = { + name = "_at_webassemblyjs_slash_wasm-edit"; + packageName = "@webassemblyjs/wasm-edit"; + version = "1.9.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.9.1.tgz"; + sha512 = "S2IaD6+x9B2Xi8BCT0eGsrXXd8UxAh2LVJpg1ZMtHXnrDcsTtIX2bDjHi40Hio6Lc62dWHmKdvksI+MClCYbbw=="; + }; + }; "@webassemblyjs/wasm-gen-1.8.1" = { name = "_at_webassemblyjs_slash_wasm-gen"; packageName = "@webassemblyjs/wasm-gen"; @@ -7195,6 +7474,15 @@ let sha512 = "cPE3o44YzOOHvlsb4+E9qSqjc9Qf9Na1OO/BHFy4OI91XDE14MjFN4lTMezzaIWdPqHnsTodGGNP+iRSYfGkjA=="; }; }; + "@webassemblyjs/wasm-gen-1.9.1" = { + name = "_at_webassemblyjs_slash_wasm-gen"; + packageName = "@webassemblyjs/wasm-gen"; + version = "1.9.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.9.1.tgz"; + sha512 = "bqWI0S4lBQsEN5FTZ35vYzfKUJvtjNnBobB1agCALH30xNk1LToZ7Z8eiaR/Z5iVECTlBndoRQV3F6mbEqE/fg=="; + }; + }; "@webassemblyjs/wasm-opt-1.9.0" = { name = "_at_webassemblyjs_slash_wasm-opt"; packageName = "@webassemblyjs/wasm-opt"; @@ -7204,6 +7492,15 @@ let sha512 = "Qkjgm6Anhm+OMbIL0iokO7meajkzQD71ioelnfPEj6r4eOFuqm4YC3VBPqXjFyyNwowzbMD+hizmprP/Fwkl2A=="; }; }; + "@webassemblyjs/wasm-opt-1.9.1" = { + name = "_at_webassemblyjs_slash_wasm-opt"; + packageName = "@webassemblyjs/wasm-opt"; + version = "1.9.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.9.1.tgz"; + sha512 = "gSf7I7YWVXZ5c6XqTEqkZjVs8K1kc1k57vsB6KBQscSagDNbAdxt6MwuJoMjsE1yWY1tsuL+pga268A6u+Fdkg=="; + }; + }; "@webassemblyjs/wasm-parser-1.8.1" = { name = "_at_webassemblyjs_slash_wasm-parser"; packageName = "@webassemblyjs/wasm-parser"; @@ -7285,22 +7582,22 @@ let sha512 = "tDV8V15wm7mmbAH6XvQRU1X+oPGmeOzYsd6h7hlRLz6QpV4Ec/KKxM8OpLtFmQPLCreGxTp+HuxtH4pRIZyL9w=="; }; }; - "@webpack-cli/info-1.1.0" = { + "@webpack-cli/info-1.2.1" = { name = "_at_webpack-cli_slash_info"; packageName = "@webpack-cli/info"; - version = "1.1.0"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@webpack-cli/info/-/info-1.1.0.tgz"; - sha512 = "uNWSdaYHc+f3LdIZNwhdhkjjLDDl3jP2+XBqAq9H8DjrJUvlOKdP8TNruy1yEaDfgpAIgbSAN7pye4FEHg9tYQ=="; + url = "https://registry.npmjs.org/@webpack-cli/info/-/info-1.2.1.tgz"; + sha512 = "fLnDML5HZ5AEKzHul8xLAksoKN2cibu6MgonkUj8R9V7bbeVRkd1XbGEGWrAUNYHbX1jcqCsDEpBviE5StPMzQ=="; }; }; - "@webpack-cli/serve-1.1.0" = { + "@webpack-cli/serve-1.2.1" = { name = "_at_webpack-cli_slash_serve"; packageName = "@webpack-cli/serve"; - version = "1.1.0"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.1.0.tgz"; - sha512 = "7RfnMXCpJ/NThrhq4gYQYILB18xWyoQcBey81oIyVbmgbc6m5ZHHyFK+DyH7pLHJf0p14MxL4mTsoPAgBSTpIg=="; + url = "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.2.1.tgz"; + sha512 = "Zj1z6AyS+vqV6Hfi7ngCjFGdHV5EwZNIHo6QfFTNe9PyW+zBU1zJ9BiOW1pmUEq950RC4+Dym6flyA/61/vhyw=="; }; }; "@wry/context-0.4.4" = { @@ -7744,22 +8041,22 @@ let sha1 = "f291be701a2efc567a63fc7aa6afcded31430be1"; }; }; - "addons-linter-2.12.0" = { + "addons-linter-2.13.1" = { name = "addons-linter"; packageName = "addons-linter"; - version = "2.12.0"; + version = "2.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/addons-linter/-/addons-linter-2.12.0.tgz"; - sha512 = "Kv2Joa81UfxCWHYK13G9ZNKb/z5cJP1TlshCh9vA2dBH55szabIN+yIxujgNCIg2/k/wDya3OihBmyFNkFmFkw=="; + url = "https://registry.npmjs.org/addons-linter/-/addons-linter-2.13.1.tgz"; + sha512 = "OWMuABpZRNeru38oOjn7QYOF0JOXJQXG9c3r4ILTRwTBeSu3LtfgCh9/7zLVgTYPbTs7Qy6h23u4Sel65uSnUQ=="; }; }; - "addons-scanner-utils-3.0.0" = { + "addons-scanner-utils-4.0.0" = { name = "addons-scanner-utils"; packageName = "addons-scanner-utils"; - version = "3.0.0"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/addons-scanner-utils/-/addons-scanner-utils-3.0.0.tgz"; - sha512 = "bX8Sx5iwvG9bHZrfP4xv+3xFU93Mk6WnBmIHm+ep4DEiqUunRRpbrs7uEgAnlWnqC46VnrFsOJdCB/MY+pHG1g=="; + url = "https://registry.npmjs.org/addons-scanner-utils/-/addons-scanner-utils-4.0.0.tgz"; + sha512 = "+BfePzqoo/7Nhum9LONGsga2xhNJYb+6k6j819pzcd2tqaaqDUJu+3lz4CQQYFcD8QoolB3ksfZcCPymleFq0A=="; }; }; "addr-to-ip-port-1.5.1" = { @@ -7969,6 +8266,15 @@ let sha512 = "LqZ9wY+fx3UMiiPd741yB2pj3hhil+hQc8taf4o2QGRFpWgZ2V5C8HA165DY9sS3fJwsk7uT7ZlFEyC3Ig3lLg=="; }; }; + "ajv-7.0.3" = { + name = "ajv"; + packageName = "ajv"; + version = "7.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/ajv/-/ajv-7.0.3.tgz"; + sha512 = "R50QRlXSxqXcQP5SvKUrw8VZeypvo12i2IX0EeR5PiZ7bEKeHWgzgo264LDadUsCU42lTJVhFikTqJwNeH34gQ=="; + }; + }; "ajv-errors-1.0.1" = { name = "ajv-errors"; packageName = "ajv-errors"; @@ -8356,6 +8662,15 @@ let sha512 = "zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg=="; }; }; + "ansi-styles-5.0.0" = { + name = "ansi-styles"; + packageName = "ansi-styles"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.0.0.tgz"; + sha512 = "6564t0m0fuQMnockqBv7wJxo9T5C2V9JpYXyNScfRDPVLusOQQhkpMGrFC17QbiolraQ1sMXX+Y5nJpjqozL4g=="; + }; + }; "ansi-term-0.0.2" = { name = "ansi-term"; packageName = "ansi-term"; @@ -8410,6 +8725,15 @@ let sha512 = "/FQM1EDkTsf63Ub2C6O7GuYFDsSXUwsaZDurV0np41ocwq0jthUAYCmhBX9f+KwlaCgIuWyr/4WlUQUBfKfZog=="; }; }; + "any-observable-0.5.1" = { + name = "any-observable"; + packageName = "any-observable"; + version = "0.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/any-observable/-/any-observable-0.5.1.tgz"; + sha512 = "8zv01bgDOp9PTmRTNCAHTw64TFP2rvlX4LvtNJLachaXY+AjmIvLT47fABNPCiIe89hKiSCo2n5zmPqI9CElPA=="; + }; + }; "any-promise-1.3.0" = { name = "any-promise"; packageName = "any-promise"; @@ -8473,13 +8797,13 @@ let sha512 = "sbLEIMQrkV7RkIruqTPXxeCMkAAycv4yzTkBzRgOR1BrR5UB7qZtupqxkersTJSf0HZ3sbaNRrNV80TnnM7cUw=="; }; }; - "apollo-2.31.2" = { + "apollo-2.32.0" = { name = "apollo"; packageName = "apollo"; - version = "2.31.2"; + version = "2.32.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo/-/apollo-2.31.2.tgz"; - sha512 = "LzN1DplRDBZf+5+UIEnINU62iEZx9kX16MbFNOZWj4LeGRRNHacv+QzdcNLRdWvtySCrFdS0MA4NyDQ48kRELw=="; + url = "https://registry.npmjs.org/apollo/-/apollo-2.32.0.tgz"; + sha512 = "6Wmt9OUYUET3JSQvAS6qgNP+vomf3P5zANARXDhqJ59c0/hAsXhdAvGaFFba+JhRRvyIVBOmaOpB880aNZeadg=="; }; }; "apollo-cache-1.3.5" = { @@ -8491,13 +8815,13 @@ let sha512 = "1XoDy8kJnyWY/i/+gLTEbYLnoiVtS8y7ikBr/IfmML4Qb+CM7dEEbIUOjnY716WqmZ/UpXIxTfJsY7rMcqiCXA=="; }; }; - "apollo-cache-control-0.11.4" = { + "apollo-cache-control-0.11.5" = { name = "apollo-cache-control"; packageName = "apollo-cache-control"; - version = "0.11.4"; + version = "0.11.5"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-cache-control/-/apollo-cache-control-0.11.4.tgz"; - sha512 = "FUKE8ASr8GxVq5rmky/tY8bsf++cleGT591lfLiqnPsP1fo3kAfgRfWA2QRHTCKFNlQxzUhVOEDv+PaysqiOjw=="; + url = "https://registry.npmjs.org/apollo-cache-control/-/apollo-cache-control-0.11.5.tgz"; + sha512 = "jvarfQhwDRazpOsmkt5Pd7qGFrtbL70zMbUZGqDhJSYpfqI672f7bXXc7O3vtpbD3qnS3XTBvK2kspX/Bdo0IA=="; }; }; "apollo-cache-inmemory-1.6.6" = { @@ -8518,49 +8842,49 @@ let sha512 = "jiPlMTN6/5CjZpJOkGeUV0mb4zxx33uXWdj/xQCfAMkuNAC3HN7CvYDyMHHEzmcQ5GV12LszWoQ/VlxET24CtA=="; }; }; - "apollo-codegen-core-0.38.2" = { + "apollo-codegen-core-0.39.0" = { name = "apollo-codegen-core"; packageName = "apollo-codegen-core"; - version = "0.38.2"; + version = "0.39.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-codegen-core/-/apollo-codegen-core-0.38.2.tgz"; - sha512 = "tg9HUW9q2b4B+u6Ea6HMjHQsarSLlXRc/AVOoB0X2hRd21OZPqwf7CQYcuur6YQEOAM95JO7E3ExtNwReEkhJw=="; + url = "https://registry.npmjs.org/apollo-codegen-core/-/apollo-codegen-core-0.39.0.tgz"; + sha512 = "b+RD8jerDMih2vf73hodOQAx4UODy1l053/Mdr4uIBlDbaF6OA4Q8TbTbH4k7tDzyAoL2pjH5v8AtlU8viIKwg=="; }; }; - "apollo-codegen-flow-0.36.2" = { + "apollo-codegen-flow-0.37.0" = { name = "apollo-codegen-flow"; packageName = "apollo-codegen-flow"; - version = "0.36.2"; + version = "0.37.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-codegen-flow/-/apollo-codegen-flow-0.36.2.tgz"; - sha512 = "7/vlCOZl3mS+A59W4Lcgb5jHv0SwyhDekQeFr5Gf1MEHf/+n5xCdV7dlXmKtGmBhuynQz/pnZk/kKqIbHhGpAw=="; + url = "https://registry.npmjs.org/apollo-codegen-flow/-/apollo-codegen-flow-0.37.0.tgz"; + sha512 = "VWB++9ObUQx+Y1JPdgrkdkjPichsgXhYfz5w5HSKvare7SlkxEZFOzSXi9/bUAC3gry3B/38do1srDHtXZ366g=="; }; }; - "apollo-codegen-scala-0.37.2" = { + "apollo-codegen-scala-0.38.0" = { name = "apollo-codegen-scala"; packageName = "apollo-codegen-scala"; - version = "0.37.2"; + version = "0.38.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-codegen-scala/-/apollo-codegen-scala-0.37.2.tgz"; - sha512 = "iE1W07GLFMR23qqmCG/+iawwcV1dprX9S/xGKn3ylruPhMBVdkImv3jFuLgvsm69tUc7KGKW+42CiEMZOmsK6g=="; + url = "https://registry.npmjs.org/apollo-codegen-scala/-/apollo-codegen-scala-0.38.0.tgz"; + sha512 = "oQAV65ZGaFGeNpxVVnZLh2kyBKfA6QzSeyosDp0HKxeXOGQ84dHJg1zGiN0oWXELBM2MqPtwWSGFYgnk3CNeHg=="; }; }; - "apollo-codegen-swift-0.38.2" = { + "apollo-codegen-swift-0.39.0" = { name = "apollo-codegen-swift"; packageName = "apollo-codegen-swift"; - version = "0.38.2"; + version = "0.39.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-codegen-swift/-/apollo-codegen-swift-0.38.2.tgz"; - sha512 = "rc6bBvBSOmV5NEk3T3/QDG7ThEbkKJ8/yILOWu1/YolOCgJgngZdzBOQ8EQOYbBX5gwEMRFV1HekAVQ8PLWpJg=="; + url = "https://registry.npmjs.org/apollo-codegen-swift/-/apollo-codegen-swift-0.39.0.tgz"; + sha512 = "fFaR8g62jjYS6QFW354ONcMHJNesy5EtCvYKsR9Sb1eBoLTx/6NkeMiGO28PIIk7bEw7FKMrzQE2UVNSeZbMxQ=="; }; }; - "apollo-codegen-typescript-0.38.2" = { + "apollo-codegen-typescript-0.39.0" = { name = "apollo-codegen-typescript"; packageName = "apollo-codegen-typescript"; - version = "0.38.2"; + version = "0.39.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-codegen-typescript/-/apollo-codegen-typescript-0.38.2.tgz"; - sha512 = "cK2PAoI7tZV9jsaP8gxVzv9fQiJAeNcRq62mDA12uD9yO0/wUHgetdISILPfPAgVCIwHGmBpke+ApJRBrK5i4w=="; + url = "https://registry.npmjs.org/apollo-codegen-typescript/-/apollo-codegen-typescript-0.39.0.tgz"; + sha512 = "/clemyhTd+s+b4HoMa72zjWir4QrDqjcN4tnSpQYXSsOFO4e4kWlxSj0zrtyYkcx/Gqod9UrPSSsx2CZHyB37A=="; }; }; "apollo-datasource-0.7.2" = { @@ -8590,13 +8914,13 @@ let sha512 = "BxTf5LOQe649e9BNTPdyCGItVv4Ll8wZ2BKnmiYpRAocYEXAVrQPWuSr3dO4iipqAU8X0gvle/Xu9mSqg5b7Qg=="; }; }; - "apollo-language-server-1.24.1" = { + "apollo-language-server-1.25.0" = { name = "apollo-language-server"; packageName = "apollo-language-server"; - version = "1.24.1"; + version = "1.25.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-language-server/-/apollo-language-server-1.24.1.tgz"; - sha512 = "2LYW/pWWBkG0/BggMedZ3EEHAQIKFc9PxHroxKhXh2Y5SXha4yQmmFILloQFrA6z7fU39IF6Tudgt5yNw2Cw/w=="; + url = "https://registry.npmjs.org/apollo-language-server/-/apollo-language-server-1.25.0.tgz"; + sha512 = "k6weI4Jd64LzMO9aGHqPWUmifBy0TDxW15BkU4GLmVTi7pBSYPhwOVP8Haa+81FG2ZO2CCEv8J0VQHTv5Z8itA=="; }; }; "apollo-link-1.2.1" = { @@ -8680,13 +9004,13 @@ let sha512 = "mjSFPlQxmoLArpHBeUb2Xj+2HDYeTaJqFGOqQ+I8NVJxgL9lJe84PDWcPah/yMLv3rB7QgBDSuZ0xoRFBPlySw=="; }; }; - "apollo-reporting-protobuf-0.6.1" = { + "apollo-reporting-protobuf-0.6.2" = { name = "apollo-reporting-protobuf"; packageName = "apollo-reporting-protobuf"; - version = "0.6.1"; + version = "0.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-reporting-protobuf/-/apollo-reporting-protobuf-0.6.1.tgz"; - sha512 = "qr4DheFP154PGZsd93SSIS9RkqHnR5b6vT+eCloWjy3UIpY+yZ3cVLlttlIjYvOG4xTJ25XEwcHiAExatQo/7g=="; + url = "https://registry.npmjs.org/apollo-reporting-protobuf/-/apollo-reporting-protobuf-0.6.2.tgz"; + sha512 = "WJTJxLM+MRHNUxt1RTl4zD0HrLdH44F2mDzMweBj1yHL0kSt8I1WwoiF/wiGVSpnG48LZrBegCaOJeuVbJTbtw=="; }; }; "apollo-server-caching-0.5.2" = { @@ -8698,13 +9022,13 @@ let sha512 = "HUcP3TlgRsuGgeTOn8QMbkdx0hLPXyEJehZIPrcof0ATz7j7aTPA4at7gaiFHCo8gk07DaWYGB3PFgjboXRcWQ=="; }; }; - "apollo-server-core-2.19.0" = { + "apollo-server-core-2.19.1" = { name = "apollo-server-core"; packageName = "apollo-server-core"; - version = "2.19.0"; + version = "2.19.1"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.19.0.tgz"; - sha512 = "2aMKUVPyNbomJQaG2tkpfqvp1Tfgxgkdr7nX5zHudYNSzsPrHw+CcYlCbIVFFI/mTZsjoK9czNq1qerFRxZbJw=="; + url = "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.19.1.tgz"; + sha512 = "5EVmcY8Ij7Ywwu+Ze4VaUhZBcxl8t5ztcSatJrKMd4HYlEHyaNGBV2itfpyqAthxfdMbGKqlpeCHmTGSqDcNpA=="; }; }; "apollo-server-env-2.4.5" = { @@ -8725,40 +9049,40 @@ let sha512 = "FeGxW3Batn6sUtX3OVVUm7o56EgjxDlmgpTLNyWcLb0j6P8mw9oLNyAm3B+deHA4KNdNHO5BmHS2g1SJYjqPCQ=="; }; }; - "apollo-server-express-2.19.0" = { + "apollo-server-express-2.19.1" = { name = "apollo-server-express"; packageName = "apollo-server-express"; - version = "2.19.0"; + version = "2.19.1"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-2.19.0.tgz"; - sha512 = "3rgSrTme1SlLoecAYtSa8ThH6vYvz29QecgZCigq5Vdc6bFP2SZrCk0ls6BAdD8OZbVKUtizzRxd0yd/uREPAw=="; + url = "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-2.19.1.tgz"; + sha512 = "PJQmPtV3JD7RiV6cP7JcqAwVdUq6hWUtvDIoCOxPoeUWYf79nEF4WiYsPXVF0+meLLWKlL1fuSwEEt1CEHEG5w=="; }; }; - "apollo-server-plugin-base-0.10.2" = { + "apollo-server-plugin-base-0.10.3" = { name = "apollo-server-plugin-base"; packageName = "apollo-server-plugin-base"; - version = "0.10.2"; + version = "0.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-plugin-base/-/apollo-server-plugin-base-0.10.2.tgz"; - sha512 = "uM5uL1lOxbXdgvt/aEIbgs40fV9xA45Y3Mmh0VtQ/ddqq0MXR5aG92nnf8rM+URarBCUfxKJKaYzJJ/CXAnEdA=="; + url = "https://registry.npmjs.org/apollo-server-plugin-base/-/apollo-server-plugin-base-0.10.3.tgz"; + sha512 = "NCLOsk9Jsd8oLvefkQvROdMDQvnHnzbzz3MPCqEYjCOEv0YBM8T77D0wCwbcViDS2M5p0W6un2ub9s/vU71f7Q=="; }; }; - "apollo-server-types-0.6.1" = { + "apollo-server-types-0.6.2" = { name = "apollo-server-types"; packageName = "apollo-server-types"; - version = "0.6.1"; + version = "0.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-types/-/apollo-server-types-0.6.1.tgz"; - sha512 = "IEQ37aYvMLiTUzsySVLOSuvvhxuyYdhI05f3cnH6u2aN1HgGp7vX6bg+U3Ue8wbHfdcifcGIk5UEU+Q+QO6InA=="; + url = "https://registry.npmjs.org/apollo-server-types/-/apollo-server-types-0.6.2.tgz"; + sha512 = "LgSKgAStiDzpUSLYwJoAmy0W8nkxx/ExMmgEPgEYVi6dKPkUmtu561J970PhGdYH+D79ke3g87D+plkUkgfnlQ=="; }; }; - "apollo-tracing-0.12.0" = { + "apollo-tracing-0.12.1" = { name = "apollo-tracing"; packageName = "apollo-tracing"; - version = "0.12.0"; + version = "0.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-tracing/-/apollo-tracing-0.12.0.tgz"; - sha512 = "cMUYGE6mOEwb9HDqhf4fiPEo2JMhjPIqEprAQEC57El76avRpRig5NM0bnqMZcYJZR5QmLlNcttNccOwf9WrNg=="; + url = "https://registry.npmjs.org/apollo-tracing/-/apollo-tracing-0.12.1.tgz"; + sha512 = "qdkUjW+pOaidGOSITypeYE288y28HkPmGNpUtyQSOeTxgqXHtQX3TDWiOJ2SmrLH08xdSwfvz9o5KrTq4PdISg=="; }; }; "apollo-upload-client-11.0.0" = { @@ -8986,6 +9310,15 @@ let sha1 = "2b12247b933001971addcbfe4e67d20fd395bbf4"; }; }; + "argparse-2.0.1" = { + name = "argparse"; + packageName = "argparse"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz"; + sha512 = "8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="; + }; + }; "aribts-1.3.5" = { name = "aribts"; packageName = "aribts"; @@ -9076,6 +9409,15 @@ let sha1 = "e39b09aea9def866a8f206e288af63919bae39c4"; }; }; + "array-back-1.0.4" = { + name = "array-back"; + packageName = "array-back"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/array-back/-/array-back-1.0.4.tgz"; + sha1 = "644ba7f095f7ffcf7c43b5f0dc39d3c1f03c063b"; + }; + }; "array-back-2.0.0" = { name = "array-back"; packageName = "array-back"; @@ -9094,15 +9436,6 @@ let sha512 = "TkuxA4UCOvxuDK6NZYXCalszEzj+TLszyASooky+i742l9TqsOdYCMJJupxRic61hwquNtppB3hgcuq9SVSH1Q=="; }; }; - "array-back-4.0.1" = { - name = "array-back"; - packageName = "array-back"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/array-back/-/array-back-4.0.1.tgz"; - sha512 = "Z/JnaVEXv+A9xabHzN43FiiiWEE7gPCRXMrVmRm00tWbjZRul1iHm7ECzlyNq1p4a4ATXz+G9FJ3GqGOkOV3fg=="; - }; - }; "array-differ-1.0.0" = { name = "array-differ"; packageName = "array-differ"; @@ -9409,6 +9742,15 @@ let sha512 = "mi+MYNJYLTx2eNYy+Yh6raoQacCsNeeMUaspFPh9Y141lFSsWxxB8V9mM2ye+eqiRs917J6/pJ4M9ZPzenWckA=="; }; }; + "array.prototype.flatmap-1.2.4" = { + name = "array.prototype.flatmap"; + packageName = "array.prototype.flatmap"; + version = "1.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.2.4.tgz"; + sha512 = "r9Z0zYoxqHz60vvQbWEdXIEtCwHF0yxaWfno9qzXeNHvfyl3BZqygmGzb84dsubyaXLH4husF+NFgMSdpZhk2Q=="; + }; + }; "arraybuffer.slice-0.0.6" = { name = "arraybuffer.slice"; packageName = "arraybuffer.slice"; @@ -9445,6 +9787,24 @@ let sha512 = "3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug=="; }; }; + "as-array-1.0.0" = { + name = "as-array"; + packageName = "as-array"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/as-array/-/as-array-1.0.0.tgz"; + sha1 = "28a6eeeaa5729f1f4eca2047df5e9de1abda0ed1"; + }; + }; + "as-array-2.0.0" = { + name = "as-array"; + packageName = "as-array"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/as-array/-/as-array-2.0.0.tgz"; + sha1 = "4f04805d87f8fce8e511bc2108f8e5e3a287d547"; + }; + }; "asap-2.0.6" = { name = "asap"; packageName = "asap"; @@ -9769,6 +10129,15 @@ let sha512 = "z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ=="; }; }; + "async-exit-hook-2.0.1" = { + name = "async-exit-hook"; + packageName = "async-exit-hook"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/async-exit-hook/-/async-exit-hook-2.0.1.tgz"; + sha512 = "NW2cX8m1Q7KPA7a5M2ULQeZ2wR5qI5PAbw5L0UOMxdioVk9PMZ0h1TmyZEkPYrCvYjDlFICusOu1dlEKAAeXBw=="; + }; + }; "async-limiter-1.0.1" = { name = "async-limiter"; packageName = "async-limiter"; @@ -9787,13 +10156,13 @@ let sha512 = "gpuo6xOyF4D5DE5WvyqZdPA3NGhiT6Qf07l7DCB0wwDEsLvDIbCr6j9S5aj5Ch96dLace5tXVzWBZkxU/c5ohw=="; }; }; - "async-lock-1.2.4" = { + "async-lock-1.2.8" = { name = "async-lock"; packageName = "async-lock"; - version = "1.2.4"; + version = "1.2.8"; src = fetchurl { - url = "https://registry.npmjs.org/async-lock/-/async-lock-1.2.4.tgz"; - sha512 = "UBQJC2pbeyGutIfYmErGc9RaJYnpZ1FHaxuKwb0ahvGiiCkPUf3p67Io+YLPmmv3RHY+mF6JEtNW8FlHsraAaA=="; + url = "https://registry.npmjs.org/async-lock/-/async-lock-1.2.8.tgz"; + sha512 = "G+26B2jc0Gw0EG/WN2M6IczuGepBsfR1+DtqLnyFSH4p2C668qkOCtEkGNVEaaNAVlYwEMazy1+/jnLxltBkIQ=="; }; }; "async-mutex-0.1.4" = { @@ -10030,13 +10399,13 @@ let sha512 = "+KBkqH7t/XE91Fqn8eyJeNIWsnhSWL8bSUqFD7TfE3FN07MTlC0nprGYp+2WfcYNz5i8Bus1vY2DHNVhtTImnw=="; }; }; - "aws-sdk-2.804.0" = { + "aws-sdk-2.821.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.804.0"; + version = "2.821.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.804.0.tgz"; - sha512 = "a02pZdjL06MunElAZPPEjpghOp/ZA+16f+t4imh1k9FCDpsNVQrT23HRq/PMvRADA5uZZRkYwX8r9o6oH/1RlA=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.821.0.tgz"; + sha512 = "UtUlURMzmns1Wq8uAdJcyKsm/nW7iRYgTQEONQIpud0xwtjpPPR1pBFB0RSNZuYnZxcWboo807+jxq+LjaBEKA=="; }; }; "aws-sign2-0.6.0" = { @@ -10876,6 +11245,15 @@ let sha512 = "NF+epuEdnUYVlGuhaxbbq+dvJttwLnGY+YixlXlME5KpQ5W3CnXA5cVTneY3SPbPDRkcjMbifrwmFYcClgOZeg=="; }; }; + "basic-auth-connect-1.0.0" = { + name = "basic-auth-connect"; + packageName = "basic-auth-connect"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/basic-auth-connect/-/basic-auth-connect-1.0.0.tgz"; + sha1 = "fdb0b43962ca7b40456a7c2bb48fe173da2d2122"; + }; + }; "batch-0.6.1" = { name = "batch"; packageName = "batch"; @@ -11155,6 +11533,15 @@ let sha512 = "t/OYhhJ2SD+YGBQcjY8GzzDHEk9f3nerxjtfa6tlMXfe7frs/WozhvCNoGvpM0P3bNf3Gq5ZRMlGr5f3r4/N8A=="; }; }; + "bignumber.js-9.0.1" = { + name = "bignumber.js"; + packageName = "bignumber.js"; + version = "9.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.0.1.tgz"; + sha512 = "IdZR9mh6ahOBv/hYGiXyVuyCetmGJhtYkqLBpTStdhEGjegpPlUawydyaF3pbIOFynJTpllEs+NP+CS9jKFLjA=="; + }; + }; "bigspinner-3.1.0" = { name = "bigspinner"; packageName = "bigspinner"; @@ -11479,6 +11866,15 @@ let sha1 = "825a8fc536a5dc43193467f3124f7e9b78b21cef"; }; }; + "blakejs-1.1.0" = { + name = "blakejs"; + packageName = "blakejs"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/blakejs/-/blakejs-1.1.0.tgz"; + sha1 = "69df92ef953aa88ca51a32df6ab1c54a155fc7a5"; + }; + }; "blessed-0.1.81" = { name = "blessed"; packageName = "blessed"; @@ -11992,6 +12388,15 @@ let sha1 = "51598408a13f4c9c5b20eba44554b2c0b0ae4074"; }; }; + "browser-or-node-1.3.0" = { + name = "browser-or-node"; + packageName = "browser-or-node"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/browser-or-node/-/browser-or-node-1.3.0.tgz"; + sha512 = "0F2z/VSnLbmEeBcUrSuDH5l0HxTXdQQzLjkmBR4cYfvg1zJrKSlmIZFqyFR8oX0NrwPhy3c3HQ6i3OxMbew4Tg=="; + }; + }; "browser-pack-6.1.0" = { name = "browser-pack"; packageName = "browser-pack"; @@ -12154,13 +12559,13 @@ let sha512 = "HI4lPveGKUR0x2StIz+2FXfDk9SfVMrxn6PLh1JeGUwcuoDkdKZebWiyLRJ68iIPDpMI4JLVDf7S7XzslgWOhw=="; }; }; - "browserslist-4.15.0" = { + "browserslist-4.16.0" = { name = "browserslist"; packageName = "browserslist"; - version = "4.15.0"; + version = "4.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/browserslist/-/browserslist-4.15.0.tgz"; - sha512 = "IJ1iysdMkGmjjYeRlDU8PQejVwxvVO5QOfXH7ylW31GO6LwNRSmm/SgRXtNsEXqMLl2e+2H5eEJ7sfynF8TCaQ=="; + url = "https://registry.npmjs.org/browserslist/-/browserslist-4.16.0.tgz"; + sha512 = "/j6k8R0p3nxOC6kx5JGAxsnhc9ixaWJfYc+TNTzxg6+ARaESAvQGV7h0uNOB4t+pLQJZWzcrMxXOxjgsCj3dqQ=="; }; }; "brq-0.1.8" = { @@ -12532,13 +12937,13 @@ let sha1 = "69fdf13ad9d91222baee109945faadc431534f86"; }; }; - "bufferutil-4.0.2" = { + "bufferutil-4.0.3" = { name = "bufferutil"; packageName = "bufferutil"; - version = "4.0.2"; + version = "4.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/bufferutil/-/bufferutil-4.0.2.tgz"; - sha512 = "AtnG3W6M8B2n4xDQ5R+70EXvOpnXsFYg/AK2yTZd+HQ/oxAdz+GI+DvjmhBw3L0ole+LJ0ngqY4JMbDzkfNzhA=="; + url = "https://registry.npmjs.org/bufferutil/-/bufferutil-4.0.3.tgz"; + sha512 = "yEYTwGndELGvfXsImMBLop58eaGW+YdONi1fNjTINSY98tmMmFijBG6WXgdkfuLNt4imzQNtIE+eBp1PVpMCSw=="; }; }; "bufferview-1.0.1" = { @@ -12577,13 +12982,13 @@ let sha1 = "270f076c5a72c02f5b65a47df94c5fe3a278892f"; }; }; - "builtin-modules-3.1.0" = { + "builtin-modules-3.2.0" = { name = "builtin-modules"; packageName = "builtin-modules"; - version = "3.1.0"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.1.0.tgz"; - sha512 = "k0KL0aWZuBt2lrxrcASWDfwOLMnodeQjodT/1SxEQAXsHANgo6ZC/VEaSEHCXt7aSTZ4/4H5LKa+tBXmW7Vtvw=="; + url = "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.2.0.tgz"; + sha512 = "lGzLKcioL90C7wMczpkY0n/oART3MbBa8R9OFGE1rJxoVI86u4WAGfEk8Wjv10eKSyTHVGkSo3bvBylCEtk7LA=="; }; }; "builtin-status-codes-3.0.0" = { @@ -12811,13 +13216,22 @@ let sha512 = "7YKEapH+2Uikde8hySyfobXBqPKULDyHNl/lhKm7cKf/GJFdG/tU/WpLrOg2y9aUrQrWUilYqawFIiGJPS6gDA=="; }; }; - "cacheable-lookup-5.0.3" = { + "cacheable-lookup-2.0.1" = { name = "cacheable-lookup"; packageName = "cacheable-lookup"; - version = "5.0.3"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-5.0.3.tgz"; - sha512 = "W+JBqF9SWe18A72XFzN/V/CULFzPm7sBXzzR6ekkE+3tLG72wFZrBiBZhrZuDoYexop4PHJVdFAKb/Nj9+tm9w=="; + url = "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-2.0.1.tgz"; + sha512 = "EMMbsiOTcdngM/K6gV/OxF2x0t07+vMOWxZNSCRQMjO2MY2nhZQ6OYhOOpyQrbhqsgtvKGI7hcq6xjnA92USjg=="; + }; + }; + "cacheable-lookup-5.0.4" = { + name = "cacheable-lookup"; + packageName = "cacheable-lookup"; + version = "5.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz"; + sha512 = "2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA=="; }; }; "cacheable-request-2.1.4" = { @@ -13099,13 +13513,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001165" = { + "caniuse-lite-1.0.30001173" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001165"; + version = "1.0.30001173"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001165.tgz"; - sha512 = "8cEsSMwXfx7lWSUMA2s08z9dIgsnR5NAqjXP23stdsU3AUWkCr/rr4s4OFtHXn5XXr6+7kam3QFVoYyXNPdJPA=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001173.tgz"; + sha512 = "R3aqmjrICdGCTAnSXtNyvWYMK3YtV5jwudbq0T7nN9k4kmE4CBuwPqyJ+KBzepSTh0huivV2gLbSMEzTTmfeYw=="; }; }; "canvas-2.6.1" = { @@ -13153,6 +13567,15 @@ let sha1 = "7cc1055d822d212954d07b085dea251cc7bc5505"; }; }; + "case-1.6.3" = { + name = "case"; + packageName = "case"; + version = "1.6.3"; + src = fetchurl { + url = "https://registry.npmjs.org/case/-/case-1.6.3.tgz"; + sha512 = "mzDSXIPaFwVDvZAHqZ9VlbyF4yyXRuX6IvB06WvPYkqJVO24kX1PPhv9bfpKNFZyxYFmmgo03HUiD8iklmJYRQ=="; + }; + }; "caseless-0.11.0" = { name = "caseless"; packageName = "caseless"; @@ -13216,6 +13639,24 @@ let sha512 = "vlNK021QdI7PNeiUh/lKkC/mNHHfV0m/Ad5JoI0TYtlBnJAslM/JIkm/tGC88bkLIwO6OQ5uV6ztS6kVAtCDlg=="; }; }; + "cdk8s-1.0.0-beta.5" = { + name = "cdk8s"; + packageName = "cdk8s"; + version = "1.0.0-beta.5"; + src = fetchurl { + url = "https://registry.npmjs.org/cdk8s/-/cdk8s-1.0.0-beta.5.tgz"; + sha512 = "E4l89rGnMI+OCdVojw0vV9xjkNgk9qMswkWc10hZLwwozhnx3ITMVgyjlRiZnCBIKMnKYY8ZhyMgEGgSVpR5fw=="; + }; + }; + "cdktf-0.0.19" = { + name = "cdktf"; + packageName = "cdktf"; + version = "0.0.19"; + src = fetchurl { + url = "https://registry.npmjs.org/cdktf/-/cdktf-0.0.19.tgz"; + sha512 = "fBOl+yqMdMNRGNvLwAxOpE38PxHJG5Tdi/3J/Ag+KJwaDEXa/v5+ogwPxNtZ0dUdvZq2ovti9zbhdIPr59BvYQ=="; + }; + }; "center-align-0.1.3" = { name = "center-align"; packageName = "center-align"; @@ -13540,6 +13981,24 @@ let sha512 = "0td5ijfUPuubwLUu0OBoe98gZj8C/AA+RW3v67GPlGOrvxWjZmBXiBCRU+I8VEiNyJzjth40POfHiz2RB3gImA=="; }; }; + "cheerio-1.0.0-rc.5" = { + name = "cheerio"; + packageName = "cheerio"; + version = "1.0.0-rc.5"; + src = fetchurl { + url = "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.5.tgz"; + sha512 = "yoqps/VCaZgN4pfXtenwHROTp8NG6/Hlt4Jpz2FEP0ZJQ+ZUkVDd0hAPDNKhj3nakpfPt/CNs57yEtxD1bXQiw=="; + }; + }; + "cheerio-select-tmp-0.1.1" = { + name = "cheerio-select-tmp"; + packageName = "cheerio-select-tmp"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cheerio-select-tmp/-/cheerio-select-tmp-0.1.1.tgz"; + sha512 = "YYs5JvbpU19VYJyj+F7oYrIE2BOll1/hRU7rEy/5+v9BzkSo3bK81iAeeQEMI92vRIxz677m72UmJUiVwwgjfQ=="; + }; + }; "child-process-1.0.2" = { name = "child-process"; packageName = "child-process"; @@ -13558,13 +14017,13 @@ let sha512 = "0UQ55f51JBkOFa+fvR76ywRzxiPwQS3Xe8oe5bZRphpv+dIMeerW5Zn5e4cUy4COJwVtJyU0R79RMnw+aCqmGA=="; }; }; - "chloride-2.3.0" = { + "chloride-2.4.0" = { name = "chloride"; packageName = "chloride"; - version = "2.3.0"; + version = "2.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/chloride/-/chloride-2.3.0.tgz"; - sha512 = "9jcavUx9ZNW9hxkG24rS9QddHpOqLAZqcb5SRbABRa8NKcplBKKcZfNM5LMa3DQ/VfXBQzcLDjgSo3uHA1ibZg=="; + url = "https://registry.npmjs.org/chloride/-/chloride-2.4.0.tgz"; + sha512 = "Fgz7EaWswRjRBeft6pCkg8STSQTQT/5GrRZlbtlx5hkhFi/X1RSIhSustfe2GsbySVZF2DuxsWri8GDFJ/SkvQ=="; }; }; "chloride-test-1.2.4" = { @@ -13810,6 +14269,15 @@ let sha512 = "UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A=="; }; }; + "cjson-0.3.3" = { + name = "cjson"; + packageName = "cjson"; + version = "0.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/cjson/-/cjson-0.3.3.tgz"; + sha1 = "a92d9c786e5bf9b930806329ee05d5d3261b4afa"; + }; + }; "clap-1.2.3" = { name = "clap"; packageName = "clap"; @@ -13846,13 +14314,13 @@ let sha512 = "JR/iSQOSt+LQIWwrwEzJ9uk0xfN3mTVYMwt1Ir5mUcSN6pU+V4zQFFaJsclJbPuAUQH+yfWef6tm7l1quW3C8Q=="; }; }; - "cldr-5.7.0" = { + "cldr-5.8.0" = { name = "cldr"; packageName = "cldr"; - version = "5.7.0"; + version = "5.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/cldr/-/cldr-5.7.0.tgz"; - sha512 = "Pyoh0kwXJIUvbAvQoQqKIr0pKWwWfkcYCIDKWmVIxJ9HftSsg57AqyfW1EzWRcP4nJj40WX4vB/lXQ+Uw4NbNA=="; + url = "https://registry.npmjs.org/cldr/-/cldr-5.8.0.tgz"; + sha512 = "w0L5FX4X3txDX5G/YSbDAQuneVSFPSKjOXB2ehWh/J6BN7RJ+IUEVNG9hIGjuJoyYJcVGE2AoL0W0VSjirQPIg=="; }; }; "clean-css-3.4.28" = { @@ -13963,6 +14431,15 @@ let sha1 = "adc3200fa471cc211b0da7f566b71e98b9d67347"; }; }; + "cli-color-1.4.0" = { + name = "cli-color"; + packageName = "cli-color"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-color/-/cli-color-1.4.0.tgz"; + sha512 = "xu6RvQqqrWEo6MPR1eixqGPywhYBHRs653F9jfXB2Hx4jdM/3WxiNE1vppRmxtMIfl16SFYTpYlrnqH/HsK/2w=="; + }; + }; "cli-color-2.0.0" = { name = "cli-color"; packageName = "cli-color"; @@ -14044,13 +14521,13 @@ let sha512 = "PC+AmIuK04E6aeSs/pUccSujsTzBhu4HzC2dL+CfJB/Jcc2qTRbEwZQDfIUpt2Xl8BodYBEq8w4fc0kU2I9DjQ=="; }; }; - "cli-table-0.3.1" = { + "cli-table-0.3.4" = { name = "cli-table"; packageName = "cli-table"; - version = "0.3.1"; + version = "0.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/cli-table/-/cli-table-0.3.1.tgz"; - sha1 = "f53b05266a8b1a0b934b3d0821e6e2dc5914ae23"; + url = "https://registry.npmjs.org/cli-table/-/cli-table-0.3.4.tgz"; + sha512 = "1vinpnX/ZERcmE443i3SZTmU5DF0rPO9DrL4I2iVAllhxzCM9SzPlHnz19fsZB78htkKZvYBvj6SZ6vXnaxmTA=="; }; }; "cli-table3-0.5.1" = { @@ -14116,15 +14593,6 @@ let sha512 = "/1owvF0SZ5Gn54cgrikJ0QskgTzeg30HGjkmjFoaHDJzAqFpuX1DBpFR8aLvsE1J5s9MgeYRENQK4BFwOag5VA=="; }; }; - "cli-ux-5.5.0" = { - name = "cli-ux"; - packageName = "cli-ux"; - version = "5.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cli-ux/-/cli-ux-5.5.0.tgz"; - sha512 = "aXoHgEOtkem8sJmQrU/jXsojCq8uOp8++9lybCbt9mFDyPouSNawSdoPjuM00PPaSPCJThvY0VNYOQNd6gGQCA=="; - }; - }; "cli-ux-5.5.1" = { name = "cli-ux"; packageName = "cli-ux"; @@ -14593,6 +15061,24 @@ let sha512 = "+xi2ENsvchtUNa8oBUU58gHgmyN6BEEeZ8NIEgeQ0XnC+AoyihivgZYe+OOiNi+fLy/NUowugwV5gP8XWYDm0Q=="; }; }; + "codemaker-0.22.0" = { + name = "codemaker"; + packageName = "codemaker"; + version = "0.22.0"; + src = fetchurl { + url = "https://registry.npmjs.org/codemaker/-/codemaker-0.22.0.tgz"; + sha512 = "3WQV/Fpa77nvzjUlc+0u53uIroJyyMB2Qwl++aXpAiDIsrsiAQq4uCURwdRBRX+eLkOTIAmT0L4qna3T7+2pUg=="; + }; + }; + "codemaker-1.16.0" = { + name = "codemaker"; + packageName = "codemaker"; + version = "1.16.0"; + src = fetchurl { + url = "https://registry.npmjs.org/codemaker/-/codemaker-1.16.0.tgz"; + sha512 = "kC53r6ACRGYcSAKeOcbcUhWZYWynIuBIQ50oLOYUygShjrqF0NO303eSvOzT0Qxaz2TQWI2deUwJBMm3s8HoZg=="; + }; + }; "codepage-1.4.0" = { name = "codepage"; packageName = "codepage"; @@ -14638,6 +15124,15 @@ let sha1 = "aea0f06f8d26c780c2b75494385544b2255af18c"; }; }; + "collection-utils-1.0.1" = { + name = "collection-utils"; + packageName = "collection-utils"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/collection-utils/-/collection-utils-1.0.1.tgz"; + sha512 = "LA2YTIlR7biSpXkKYwwuzGjwL5rjWEZVOSnvdUc7gObvWe4WkjxOpfrdhoP7Hs09YWDVfg0Mal9BpAqLfVEzQg=="; + }; + }; "collection-visit-1.0.0" = { name = "collection-visit"; packageName = "collection-visit"; @@ -14890,6 +15385,15 @@ let sha512 = "LTQ/SGc+s0Xc0Fu5WaKnR0YiygZkm9eKFvyS+fRsU7/ZWFF8ykFM6Pc9aCVf1+xasOOZpO3BAVgVrKvsqKHV7w=="; }; }; + "command-line-args-4.0.7" = { + name = "command-line-args"; + packageName = "command-line-args"; + version = "4.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/command-line-args/-/command-line-args-4.0.7.tgz"; + sha512 = "aUdPvQRAyBvQd2n7jXcsMDz68ckBJELXNzBybCHOibUWEg0mWTnaYCSRU8h9R+aNRSvDihJtssSRCiDRpLaezA=="; + }; + }; "command-line-usage-4.1.0" = { name = "command-line-usage"; packageName = "command-line-usage"; @@ -14899,13 +15403,13 @@ let sha512 = "MxS8Ad995KpdAC0Jopo/ovGIroV/m0KHwzKfXxKag6FHOkGsH8/lv5yjgablcRxCJJC0oJeUMuO/gmaq+Wq46g=="; }; }; - "command-line-usage-6.1.1" = { + "command-line-usage-5.0.5" = { name = "command-line-usage"; packageName = "command-line-usage"; - version = "6.1.1"; + version = "5.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/command-line-usage/-/command-line-usage-6.1.1.tgz"; - sha512 = "F59pEuAR9o1SF/bD0dQBDluhpT4jJQNWUHEuVBqpDmCUo6gPjCi+m9fCWnWZVR/oG6cMTUms4h+3NPl74wGXvA=="; + url = "https://registry.npmjs.org/command-line-usage/-/command-line-usage-5.0.5.tgz"; + sha512 = "d8NrGylA5oCXSbGoKz05FkehDAzSmIm4K03S5VDh4d5lZAtTWfc3D1RuETtuQCn8129nYfJfDdF7P/lwcz1BlA=="; }; }; "commander-0.6.1" = { @@ -15079,13 +15583,13 @@ let sha512 = "wl7PNrYWd2y5mp1OK/LhTlv8Ff4kQJQRXXAvF+uU/TPNiVJUxZLRYGj/B0y/lPGAVcSbJqH2Za/cvHmrPMC8mA=="; }; }; - "commander-6.2.0" = { + "commander-6.2.1" = { name = "commander"; packageName = "commander"; - version = "6.2.0"; + version = "6.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-6.2.0.tgz"; - sha512 = "zP4jEKbe8SHzKJYQmq8Y9gYjtO/POJLgIdKgV7B9qNmABVFVc+ctqSX6iXh4mCpJfRBOabiZ2YKPg8ciDw6C+Q=="; + url = "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz"; + sha512 = "U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA=="; }; }; "commandpost-1.4.0" = { @@ -15142,6 +15646,15 @@ let sha1 = "34fc3672cd24393e8bb47e70caa0293811f4f2c5"; }; }; + "commonmark-0.29.3" = { + name = "commonmark"; + packageName = "commonmark"; + version = "0.29.3"; + src = fetchurl { + url = "https://registry.npmjs.org/commonmark/-/commonmark-0.29.3.tgz"; + sha512 = "fvt/NdOFKaL2gyhltSy6BC4LxbbxbnPxBMl923ittqO/JBM0wQHaoYZliE4tp26cRxX/ZZtRsJlZzQrVdUkXAA=="; + }; + }; "compact2string-1.4.1" = { name = "compact2string"; packageName = "compact2string"; @@ -15169,6 +15682,15 @@ let sha512 = "zHig5N+tPWARooBnb0Zx1MFcdfpyJrfTJ3Y5L+IFvUm8rM74hHz66z0gw0x4tijh5CorKkKUCnW82R2vmpeCRA=="; }; }; + "compare-semver-1.1.0" = { + name = "compare-semver"; + packageName = "compare-semver"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/compare-semver/-/compare-semver-1.1.0.tgz"; + sha1 = "7c0a79a27bb80b6c6994445f82958259d3d02153"; + }; + }; "compare-version-0.1.2" = { name = "compare-version"; packageName = "compare-version"; @@ -15178,6 +15700,15 @@ let sha1 = "0162ec2d9351f5ddd59a9202cba935366a725080"; }; }; + "compare-versions-3.6.0" = { + name = "compare-versions"; + packageName = "compare-versions"; + version = "3.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/compare-versions/-/compare-versions-3.6.0.tgz"; + sha512 = "W6Af2Iw1z4CB7q4uU4hv646dW9GQuBM+YpC0UvUCWSD8w90SJjp+ujJuXaEMtAXBtSqGfMPuFOVn4/+FlaqfBA=="; + }; + }; "component-bind-1.0.0" = { name = "component-bind"; packageName = "component-bind"; @@ -15565,6 +16096,15 @@ let sha1 = "c20b96d8c617748aaf1c16021760cd27fcb8cb75"; }; }; + "constructs-3.2.94" = { + name = "constructs"; + packageName = "constructs"; + version = "3.2.94"; + src = fetchurl { + url = "https://registry.npmjs.org/constructs/-/constructs-3.2.94.tgz"; + sha512 = "yK4FKT+hONiC0ebCM0Ln3xuLPF4WPyZSQ8Sl/ZOTTFUI+/csBBxGy7TkY2ZVTbOi7MCHUatZgW2ANsYRaaxoOQ=="; + }; + }; "consume-http-header-1.0.0" = { name = "consume-http-header"; packageName = "consume-http-header"; @@ -15728,13 +16268,13 @@ let sha512 = "GEKRWkrSAZeTq5+YjUZOYxdHq+ci4dNwHvpaBC3+ENalzFWuCWa9EZXSuZBpkr72sMdKB+1fyDV4takK1Lf58g=="; }; }; - "conventional-changelog-writer-4.0.18" = { + "conventional-changelog-writer-4.1.0" = { name = "conventional-changelog-writer"; packageName = "conventional-changelog-writer"; - version = "4.0.18"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-writer/-/conventional-changelog-writer-4.0.18.tgz"; - sha512 = "mAQDCKyB9HsE8Ko5cCM1Jn1AWxXPYV0v8dFPabZRkvsiWUul2YyAqbIaoMKF88Zf2ffnOPSvKhboLf3fnjo5/A=="; + url = "https://registry.npmjs.org/conventional-changelog-writer/-/conventional-changelog-writer-4.1.0.tgz"; + sha512 = "WwKcUp7WyXYGQmkLsX4QmU42AZ1lqlvRW9mqoyiQzdD+rJWbTepdWoKJuwXTS+yq79XKnQNa93/roViPQrAQgw=="; }; }; "conventional-commits-filter-2.0.7" = { @@ -15917,6 +16457,15 @@ let sha512 = "8aPsApQfebXnuI+537McwYsDtjVxGm8gTIzQI3FDW6t5t/DAhERxtnbEPN/8RX+uZthoz4eCOgloXaE5cYyNow=="; }; }; + "copy-anything-2.0.1" = { + name = "copy-anything"; + packageName = "copy-anything"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/copy-anything/-/copy-anything-2.0.1.tgz"; + sha512 = "lA57e7viQHOdPQcrytv5jFeudZZOXuyk47lZym279FiDQ8jeZomXiGuVf6ffMKkJ+3TIai3J1J3yi6M+/4U35g=="; + }; + }; "copy-concurrently-1.0.5" = { name = "copy-concurrently"; packageName = "copy-concurrently"; @@ -16034,22 +16583,22 @@ let sha512 = "vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA=="; }; }; - "core-js-3.8.0" = { + "core-js-3.8.2" = { name = "core-js"; packageName = "core-js"; - version = "3.8.0"; + version = "3.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-3.8.0.tgz"; - sha512 = "W2VYNB0nwQQE7tKS7HzXd7r2y/y2SVJl4ga6oH/dnaLFzM0o2lB2P3zCkWj5Wc/zyMYjtgd5Hmhk0ObkQFZOIA=="; + url = "https://registry.npmjs.org/core-js/-/core-js-3.8.2.tgz"; + sha512 = "FfApuSRgrR6G5s58casCBd9M2k+4ikuu4wbW6pJyYU7bd9zvFc9qf7vr5xmrZOhT9nn+8uwlH1oRR9jTnFoA3A=="; }; }; - "core-js-compat-3.8.0" = { + "core-js-compat-3.8.2" = { name = "core-js-compat"; packageName = "core-js-compat"; - version = "3.8.0"; + version = "3.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.8.0.tgz"; - sha512 = "o9QKelQSxQMYWHXc/Gc4L8bx/4F7TTraE5rhuN8I7mKBt5dBIUpXpIR3omv70ebr8ST5R3PqbDQr+ZI3+Tt1FQ=="; + url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.8.2.tgz"; + sha512 = "LO8uL9lOIyRRrQmZxHZFl1RV+ZbcsAkFWTktn5SmH40WgLtSNYN4m4W2v9ONT147PxBY/XrRhrWq8TlvObyUjQ=="; }; }; "core-util-is-1.0.2" = { @@ -16295,6 +16844,15 @@ let sha512 = "Gk2c4y6xKEO8FSAUTklqtfSr7oTq0CiPQeLBG5Fl0qoXpZyMcj1SG59YL+hqq04bu6/IuEA7lMkYDAplQNKkyg=="; }; }; + "cross-env-5.2.1" = { + name = "cross-env"; + packageName = "cross-env"; + version = "5.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cross-env/-/cross-env-5.2.1.tgz"; + sha512 = "1yHhtcfAd1r4nwQgknowuUNfIT9E8dOMMspC36g45dN+iD1blloi7xp8X/xAIDnjHWyt1uQ8PHk2fkNaym7soQ=="; + }; + }; "cross-env-6.0.3" = { name = "cross-env"; packageName = "cross-env"; @@ -16565,6 +17123,15 @@ let sha512 = "Dqk7LQKpwLoH3VovzZnkzegqNSuAziQyNZUcrdDM401iY+R5NkGBXGmtO05/yaXQziALuPogeG0b7UAgjnTJTQ=="; }; }; + "css-select-3.1.2" = { + name = "css-select"; + packageName = "css-select"; + version = "3.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/css-select/-/css-select-3.1.2.tgz"; + sha512 = "qmss1EihSuBNWNNhHjxzxSfJoFBM/lERB/Q4EnsJQQC62R2evJDW481091oAdOr9uh46/0n4nrg0It5cAnj1RA=="; + }; + }; "css-select-base-adapter-0.1.1" = { name = "css-select-base-adapter"; packageName = "css-select-base-adapter"; @@ -16637,6 +17204,15 @@ let sha512 = "ACUm3L0/jiZTqfzRM3Hi9Q8eZqd6IK37mMWPLz9PJxkLWllYeRf+EHUSHYEtFop2Eqytaq1FizFVh7XfBnXCDQ=="; }; }; + "css-what-4.0.0" = { + name = "css-what"; + packageName = "css-what"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/css-what/-/css-what-4.0.0.tgz"; + sha512 = "teijzG7kwYfNVsUh2H/YN62xW3KK9YhXEgSlbxMlcyjPNvdKJqFx5lrwlJgoFP1ZHlB89iGDlo/JyshKeRhv5A=="; + }; + }; "cssauron-1.4.0" = { name = "cssauron"; packageName = "cssauron"; @@ -16835,6 +17411,15 @@ let sha512 = "r45M92nLnGP246ot0Yo5RvbiiMF5Bw/OTIdWJ3OQ4Vbv4hpOeoXVIPxdSmUw+fPJlQOseY+iigJyLSfPMIrddQ=="; }; }; + "csv-streamify-3.0.4" = { + name = "csv-streamify"; + packageName = "csv-streamify"; + version = "3.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/csv-streamify/-/csv-streamify-3.0.4.tgz"; + sha1 = "4cb614c57e3f299cca17b63fdcb4ad167777f47a"; + }; + }; "csv-stringify-0.0.8" = { name = "csv-stringify"; packageName = "csv-stringify"; @@ -16961,13 +17546,13 @@ let sha512 = "KHW6M86R+FUPYGb3R5XiYjXPq7VzwxZ22buHhAEVG5ztoEcZZMLov530mmccaqA1GghZArjQV46fuc8kUqhhHw=="; }; }; - "d3-array-2.9.0" = { + "d3-array-2.9.1" = { name = "d3-array"; packageName = "d3-array"; - version = "2.9.0"; + version = "2.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/d3-array/-/d3-array-2.9.0.tgz"; - sha512 = "yOokB8GozB6GAubW9n7phLdRugC8TgEjF6V1cX/q78L80d2tLirUnc0jvDSSF622JJJTmtnJOe9+WKs+yS5GFQ=="; + url = "https://registry.npmjs.org/d3-array/-/d3-array-2.9.1.tgz"; + sha512 = "Ob7RdOtkqsjx1NWyQHMFLtCSk6/aKTxDdC4ZIolX+O+mDD2RzrsYgAyc0WGAlfYFVELLSilS7w8BtE3PKM8bHg=="; }; }; "d3-axis-1.0.12" = { @@ -17690,6 +18275,15 @@ let sha512 = "jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q=="; }; }; + "dayjs-1.10.1" = { + name = "dayjs"; + packageName = "dayjs"; + version = "1.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/dayjs/-/dayjs-1.10.1.tgz"; + sha512 = "2xg7JrHQeLBQFkvTumLoy62x1siyeocc98QwjtURgvRqOPYmAkMUdmSjrOA+MlmL6QMQn5MUhDf6rNZNuPc1LQ=="; + }; + }; "dayjs-1.8.36" = { name = "dayjs"; packageName = "dayjs"; @@ -17699,15 +18293,6 @@ let sha512 = "3VmRXEtw7RZKAf+4Tv1Ym9AGeo8r8+CjDi26x+7SYQil1UqtqdaokhzoEJohqlzt0m5kacJSDhJQkG/LWhpRBw=="; }; }; - "dayjs-1.9.7" = { - name = "dayjs"; - packageName = "dayjs"; - version = "1.9.7"; - src = fetchurl { - url = "https://registry.npmjs.org/dayjs/-/dayjs-1.9.7.tgz"; - sha512 = "IC877KBdMhBrCfBfJXHQlo0G8keZ0Opy7YIIq5QKtUbCuHMzim8S4PyiVK4YmihI3iOF9lhfUBW4AQWHTR5WHA=="; - }; - }; "deasync-0.1.20" = { name = "deasync"; packageName = "deasync"; @@ -17861,6 +18446,15 @@ let sha512 = "doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ=="; }; }; + "debug-4.3.2" = { + name = "debug"; + packageName = "debug"; + version = "4.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz"; + sha512 = "mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw=="; + }; + }; "debug-fabulous-1.1.0" = { name = "debug-fabulous"; packageName = "debug-fabulous"; @@ -17987,6 +18581,15 @@ 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"; @@ -18482,6 +19085,15 @@ let sha512 = "OfzPuSZKGcgr96rf1oODnfjqBFmr1DVoc/TrItj3Ohe0Ah1C5WX5Baquw/9U9KovnQ88EqmJbD66rKYUQYN1tQ=="; }; }; + "denque-1.5.0" = { + name = "denque"; + packageName = "denque"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/denque/-/denque-1.5.0.tgz"; + sha512 = "CYiCSgIF1p6EUByQPlGkKnP1M9g0ZV3qMIrqMqZqdwazygIA/YP2vrbcyl1h/WppKJTdl1F85cXIle+394iDAQ=="; + }; + }; "dep-graph-1.1.0" = { name = "dep-graph"; packageName = "dep-graph"; @@ -18797,15 +19409,6 @@ let sha1 = "806649326ceaa7caa3306d75d985ea2748ba913c"; }; }; - "diacritics-1.3.0" = { - name = "diacritics"; - packageName = "diacritics"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/diacritics/-/diacritics-1.3.0.tgz"; - sha1 = "3efa87323ebb863e6696cebb0082d48ff3d6f7a1"; - }; - }; "diagnostics-1.1.1" = { name = "diagnostics"; packageName = "diagnostics"; @@ -18878,13 +19481,13 @@ let sha512 = "IayShXAgj/QMXgB0IWmKx+rOPuGMhqm5w6jvFxmVenXKIzRqTAAsbBPT3kWQeGANj3jGgvcvv4yK6SxqYmikgw=="; }; }; - "diff2html-3.1.15" = { + "diff2html-3.1.18" = { name = "diff2html"; packageName = "diff2html"; - version = "3.1.15"; + version = "3.1.18"; src = fetchurl { - url = "https://registry.npmjs.org/diff2html/-/diff2html-3.1.15.tgz"; - sha512 = "juAPno3aLDhLV6e2rPl1uQ3ZHpFT4o5Hpx5il4EH+nbdphwGgK1a7dQ/BnSXWlNPvEZ5l8lE5CTHijx5QPLzOQ=="; + url = "https://registry.npmjs.org/diff2html/-/diff2html-3.1.18.tgz"; + sha512 = "1S3ubwa8+frMFsQ6rQLiXAkUtPoqzXdx6I/Q4I/a0pPXJQd1LfuqJY4s2ZUj2ahzODr/7nc6Bn1pWJrU1i9MEQ=="; }; }; "diff3-0.0.3" = { @@ -19157,24 +19760,6 @@ let sha512 = "cwaRptBmYZwu/FyhGcqBm2MzXA77W2/E6eVkpOZVDk6PkI9Bjj84xPrXiHMA+OWjzNy+DFjgKh8Q+1hMR7/OHg=="; }; }; - "dockerfile-ast-0.0.27" = { - name = "dockerfile-ast"; - packageName = "dockerfile-ast"; - version = "0.0.27"; - src = fetchurl { - url = "https://registry.npmjs.org/dockerfile-ast/-/dockerfile-ast-0.0.27.tgz"; - sha512 = "U+1B6aA7qJw9hswL6rCg4/dHnXy+zmt1bwU6ONi+f+0w0AOSmrz4IcrZQu62g1RD+NoTO4dvJce3FjoXUHd9Dw=="; - }; - }; - "dockerfile-ast-0.0.28" = { - name = "dockerfile-ast"; - packageName = "dockerfile-ast"; - version = "0.0.28"; - src = fetchurl { - url = "https://registry.npmjs.org/dockerfile-ast/-/dockerfile-ast-0.0.28.tgz"; - sha512 = "221P0R4+tx5C1ra99alQxmdRvtfKMbBE7MkESN4VEBN5CX90wijrcIg+EiRaGTCCT5OPk5KBeKy+EIOnmEu4xA=="; - }; - }; "dockerfile-ast-0.0.30" = { name = "dockerfile-ast"; packageName = "dockerfile-ast"; @@ -19184,22 +19769,31 @@ let sha512 = "QOeP5NjbjoSLtnMz6jzBLsrKtywLEVPoCOAwA54cQpulyKb1gBnZ63tr6Amq8oVDvu5PXa3aifBVw+wcoCGHKg=="; }; }; - "dockerfile-language-service-0.1.0" = { - name = "dockerfile-language-service"; - packageName = "dockerfile-language-service"; + "dockerfile-ast-0.1.0" = { + name = "dockerfile-ast"; + packageName = "dockerfile-ast"; version = "0.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/dockerfile-language-service/-/dockerfile-language-service-0.1.0.tgz"; - sha512 = "vvFBLvQ/4RE5JyPzI1EynvT5h6Mg/jJ8HUcMs53uyfjy3RbaGeUL5c0eN6mk39WVF2Y8fsH1FKo4L29Z/W4N6g=="; + url = "https://registry.npmjs.org/dockerfile-ast/-/dockerfile-ast-0.1.0.tgz"; + sha512 = "qKftHMVoMliYBaYLkgttm+NXhRISVNkIMfAL4ecmXjiWRElfdfY+xNgITiehG0LpUEDbFUa/UDCByYq/2UZIpQ=="; }; }; - "dockerfile-utils-0.1.0" = { + "dockerfile-language-service-0.1.1" = { + name = "dockerfile-language-service"; + packageName = "dockerfile-language-service"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/dockerfile-language-service/-/dockerfile-language-service-0.1.1.tgz"; + sha512 = "Lw4QlxJoy9F1559wxX+0xe5iSNK95Fbzx/YhdmAzfwgbPvdPzvFouIuuMyMPj/Q5JyFH1QAr7VeagOe24w0cqg=="; + }; + }; + "dockerfile-utils-0.1.1" = { name = "dockerfile-utils"; packageName = "dockerfile-utils"; - version = "0.1.0"; + version = "0.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/dockerfile-utils/-/dockerfile-utils-0.1.0.tgz"; - sha512 = "eHDiSOSXzXaFTwp7UX+bMVKUDQd2E2x8IF/3xdSvNkGhBliRhjwLIL+ALLDmi8GqSlm+7xwc4mGLcvtCI668PQ=="; + url = "https://registry.npmjs.org/dockerfile-utils/-/dockerfile-utils-0.1.1.tgz"; + sha512 = "ddAA8PCAcT4pBQ1AFRnPjetJ31/7BqNKLHQkZebNE0hBAiOr8SzrnIWvJUcBDHrVbASCVl1Ye37hbaTsUmYHsw=="; }; }; "doctrine-2.1.0" = { @@ -19274,13 +19868,13 @@ let sha512 = "2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g=="; }; }; - "dom-serializer-1.1.0" = { + "dom-serializer-1.2.0" = { name = "dom-serializer"; packageName = "dom-serializer"; - version = "1.1.0"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.1.0.tgz"; - sha512 = "ox7bvGXt2n+uLWtCRLybYx60IrOlWL/aCebWJk1T0d4m3y2tzf4U3ij9wBMUb6YJZpz06HCCYuyCDveE2xXmzQ=="; + url = "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.2.0.tgz"; + sha512 = "n6kZFH/KlCrqs/1GHMOd5i2fd/beQHuehKdWvNNffbGHTr/almdhuVvTVFb3V7fglz+nC50fFusu3lY33h12pA=="; }; }; "dom-storage-2.1.0" = { @@ -19409,13 +20003,13 @@ let sha512 = "3VdM/SXBZX2omc9JF9nOPCtDaYQ67BGp5CoLpIQlO2KCAPETs8TcDHacF26jXadGbvUteZzRTeos2fhID5+ucQ=="; }; }; - "dompurify-2.2.2" = { + "dompurify-2.2.6" = { name = "dompurify"; packageName = "dompurify"; - version = "2.2.2"; + version = "2.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/dompurify/-/dompurify-2.2.2.tgz"; - sha512 = "BsGR4nDLaC5CNBnyT5I+d5pOeaoWvgVeg6Gq/aqmKYWMPR07131u60I80BvExLAJ0FQEIBQ1BTicw+C5+jOyrg=="; + url = "https://registry.npmjs.org/dompurify/-/dompurify-2.2.6.tgz"; + sha512 = "7b7ZArhhH0SP6W2R9cqK6RjaU82FZ2UPM7RO8qN1b1wyvC/NY1FNWcX1Pu00fFOAnzEORtwXe4bPaClg6pUybQ=="; }; }; "domutils-1.4.3" = { @@ -19445,13 +20039,13 @@ let sha512 = "Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg=="; }; }; - "domutils-2.4.3" = { + "domutils-2.4.4" = { name = "domutils"; packageName = "domutils"; - version = "2.4.3"; + version = "2.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/domutils/-/domutils-2.4.3.tgz"; - sha512 = "MDMfEjgtzHvRX7i21XQfkk/vfZbLOe0VJk8dDETkTTo3BTeH3NXz3Xvs94UQ+GzTw/GjRYKsfVKIIOheYX63fw=="; + url = "https://registry.npmjs.org/domutils/-/domutils-2.4.4.tgz"; + sha512 = "jBC0vOsECI4OMdD0GC9mGn7NXPLb+Qt6KW1YDQzeQYRUFKmNG8lh7mO5HiELfr+lLQE7loDVI4QcAxV80HS+RA=="; }; }; "dot-case-3.0.4" = { @@ -19481,6 +20075,15 @@ let sha512 = "QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q=="; }; }; + "dot-prop-6.0.1" = { + name = "dot-prop"; + packageName = "dot-prop"; + version = "6.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/dot-prop/-/dot-prop-6.0.1.tgz"; + sha512 = "tE7ztYzXHIeyvc7N+hR3oi7FIbf/NIjVP9hmAt3yMXzrQ072/fpjGLx2GxNxGxUl5V73MEqYzioOMoVhGMJ5cA=="; + }; + }; "dot-qs-0.2.0" = { name = "dot-qs"; packageName = "dot-qs"; @@ -19499,6 +20102,15 @@ let sha512 = "4As8uPrjfwb7VXC+WnLCbXK7y+Ueb2B3zgNCePYfhxS1PYeaO1YTeplffTEcbfLhvFNGLAz90VvJs9yomG7bow=="; }; }; + "dotenv-6.2.0" = { + name = "dotenv"; + packageName = "dotenv"; + version = "6.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dotenv/-/dotenv-6.2.0.tgz"; + sha512 = "HygQCKUBSFl8wKQZBSemMywRWcEDNidvNbjGVyZu3nbZ8qq9ubiPoGLMdRDpfSrpkkm9BXYFkpKxxFX38o/76w=="; + }; + }; "dotenv-8.2.0" = { name = "dotenv"; packageName = "dotenv"; @@ -19886,13 +20498,13 @@ let sha512 = "dldq3ZfFtgVTJMLjOe+/3sROTzALlL9E34V4/sDtUd/KlBSS0s6U1/+WPE1B4sj9CXHJpL1M6rhNJnc9Wbal9w=="; }; }; - "electron-to-chromium-1.3.616" = { + "electron-to-chromium-1.3.634" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.616"; + version = "1.3.634"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.616.tgz"; - sha512 = "CI8L38UN2BEnqXw3/oRIQTmde0LiSeqWSRlPA42ZTYgJQ8fYenzAM2Z3ni+jtILTcrs5aiXZCGJ96Pm+3/yGyQ=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.634.tgz"; + sha512 = "QPrWNYeE/A0xRvl/QP3E0nkaEvYUvH3gM04ZWYtIa6QlSpEetRlRI1xvQ7hiMIySHHEV+mwDSX8Kj4YZY6ZQAw=="; }; }; "electrum-client-git://github.com/janoside/electrum-client" = { @@ -20212,13 +20824,22 @@ let sha512 = "b4Q85dFkGw+TqgytGPrGgACRUhsdKc9S9ErRAXpPGy/CXKs4tYoHDkvIRdsseAF7NjfVwjRFIn6KTnbw7LwJZg=="; }; }; - "engine.io-4.0.4" = { + "engine.io-3.5.0" = { name = "engine.io"; packageName = "engine.io"; - version = "4.0.4"; + version = "3.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/engine.io/-/engine.io-4.0.4.tgz"; - sha512 = "4ggUX5pICZU17OTZNFv5+uFE/ZyoK+TIXv2SvxWWX8lwStllQ6Lvvs4lDBqvKpV9EYXNcvlNOcjKChd/mo+8Tw=="; + url = "https://registry.npmjs.org/engine.io/-/engine.io-3.5.0.tgz"; + sha512 = "21HlvPUKaitDGE4GXNtQ7PLP0Sz4aWLddMPw2VTyFz1FVZqu/kZsJUO8WNpKuE/OCL7nkfRaOui2ZCJloGznGA=="; + }; + }; + "engine.io-4.0.6" = { + name = "engine.io"; + packageName = "engine.io"; + version = "4.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/engine.io/-/engine.io-4.0.6.tgz"; + sha512 = "rf7HAVZpcRrcKEKddgIzYUnwg0g5HE1RvJaTLwkcfJmce4g+po8aMuE6vxzp6JwlK8FEq/vi0KWN6tA585DjaA=="; }; }; "engine.io-client-1.3.1" = { @@ -20239,6 +20860,15 @@ let sha512 = "iU4CRr38Fecj8HoZEnFtm2EiKGbYZcPn3cHxqNGl/tmdWRf60KhK+9vE0JeSjgnlS/0oynEfLgKbT9ALpim0sQ=="; }; }; + "engine.io-client-3.5.0" = { + name = "engine.io-client"; + packageName = "engine.io-client"; + version = "3.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.5.0.tgz"; + sha512 = "12wPRfMrugVw/DNyJk34GQ5vIVArEcVMXWugQGGuw2XxUSztFNmJggZmv8IZlLyEdnpO1QB9LkcjeWewO2vxtA=="; + }; + }; "engine.io-parser-1.0.6" = { name = "engine.io-parser"; packageName = "engine.io-parser"; @@ -20257,13 +20887,13 @@ let sha512 = "x+dN/fBH8Ro8TFwJ+rkB2AmuVw9Yu2mockR/p3W8f8YtExwFgDvBDi0GWyb4ZLkpahtDGZgtr3zLovanJghPqg=="; }; }; - "engine.io-parser-4.0.1" = { + "engine.io-parser-4.0.2" = { name = "engine.io-parser"; packageName = "engine.io-parser"; - version = "4.0.1"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-4.0.1.tgz"; - sha512 = "v5aZK1hlckcJDGmHz3W8xvI3NUHYc9t8QtTbqdR5OaH3S9iJZilPubauOm+vLWOMMWzpE3hiq92l9lTAHamRCg=="; + url = "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-4.0.2.tgz"; + sha512 = "sHfEQv6nmtJrq6TKuIz5kyEKH/qSdK56H/A+7DnAuUPWosnIZAS2NHNcPLmyjtY3cGS/MqJdZbUjW97JU72iYg=="; }; }; "enhanced-resolve-2.3.0" = { @@ -20284,13 +20914,13 @@ let sha512 = "3e87LvavsdxyoCfGusJnrZ5G8SLPOFeHSNpZI/ATL9a5leXo2k0w6MKnbqhdBad9qTobSfB20Ld7UmgoNbAZkQ=="; }; }; - "enhanced-resolve-5.4.0" = { + "enhanced-resolve-5.4.1" = { name = "enhanced-resolve"; packageName = "enhanced-resolve"; - version = "5.4.0"; + version = "5.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.4.0.tgz"; - sha512 = "ZmqfWURB2lConOBM1JdCVfPyMRv5RdKWktLXO6123p97ovVm2CLBgw9t5MBj3jJWA6eHyOeIws9iJQoGFR4euQ=="; + url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.4.1.tgz"; + sha512 = "4GbyIMzYktTFoRSmkbgZ1LU+RXwf4AQ8Z+rSuuh1dC8plp0PPeaWvx6+G4hh4KnUJ48VoxKbNyA1QQQIUpXjYA=="; }; }; "enquirer-2.3.6" = { @@ -20473,13 +21103,13 @@ let sha512 = "e64Qj9+4aZzjzzFpZC7p5kmm/ccCrbLhAJplhsDXQFs87XTsXwOpH4s1Io2s90Tau/8r2j9f4l/thhDevRjzxw=="; }; }; - "errno-0.1.7" = { + "errno-0.1.8" = { name = "errno"; packageName = "errno"; - version = "0.1.7"; + version = "0.1.8"; src = fetchurl { - url = "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz"; - sha512 = "MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg=="; + url = "https://registry.npmjs.org/errno/-/errno-0.1.8.tgz"; + sha512 = "dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A=="; }; }; "error-7.0.2" = { @@ -20725,6 +21355,15 @@ let sha512 = "8/uIhbG12Csjy2JEW7D9pHbreaVaS/OpN3ycnyvElTdwM5n6GY6W6e2IPemfvGZeUMqZ9A/3GqIZMgKnBhAw/Q=="; }; }; + "escape-goat-3.0.0" = { + name = "escape-goat"; + packageName = "escape-goat"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/escape-goat/-/escape-goat-3.0.0.tgz"; + sha512 = "w3PwNZJwRxlp47QGzhuEBldEqVHHhh8/tIPcl6ecf2Bou99cdAt0knihBV0Ecc7CGxYduXVBDheH1K2oADRlvw=="; + }; + }; "escape-html-1.0.3" = { name = "escape-html"; packageName = "escape-html"; @@ -20815,6 +21454,15 @@ let sha512 = "6hTjO1NAWkHnDk3OqQ4YrCuwwmGHL9S3nPlzBOUG/R44rda3wLNrfvQ5fkSGjyhHFKM7ALPKcKGrwvCLe0lC7Q=="; }; }; + "escodegen-2.0.0" = { + name = "escodegen"; + packageName = "escodegen"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/escodegen/-/escodegen-2.0.0.tgz"; + sha512 = "mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw=="; + }; + }; "escope-1.0.3" = { name = "escope"; packageName = "escope"; @@ -20869,22 +21517,22 @@ let sha512 = "K+Iayyo2LtyYhDSYwz5D5QdWw0hCacNzyq1Y821Xna2xSJj7cijoLLYmLxTQgcgZ9mC61nryMy9S7GRbYpI5Ig=="; }; }; - "eslint-7.13.0" = { + "eslint-7.14.0" = { name = "eslint"; packageName = "eslint"; - version = "7.13.0"; + version = "7.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-7.13.0.tgz"; - sha512 = "uCORMuOO8tUzJmsdRtrvcGq5qposf7Rw0LwkTJkoDbOycVQtQjmnhZSuLQnozLE4TmAzlMVV45eCHmQ1OpDKUQ=="; + url = "https://registry.npmjs.org/eslint/-/eslint-7.14.0.tgz"; + sha512 = "5YubdnPXrlrYAFCKybPuHIAH++PINe1pmKNc5wQRB9HSbqIK1ywAnntE3Wwua4giKu0bjligf1gLF6qxMGOYRA=="; }; }; - "eslint-7.15.0" = { + "eslint-7.17.0" = { name = "eslint"; packageName = "eslint"; - version = "7.15.0"; + version = "7.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-7.15.0.tgz"; - sha512 = "Vr64xFDT8w30wFll643e7cGrIkPEU50yIiI36OdSIDoSGguIeaLzBo0vpGvzo9RECUqq7htURfwEtKqwytkqzA=="; + url = "https://registry.npmjs.org/eslint/-/eslint-7.17.0.tgz"; + sha512 = "zJk08MiBgwuGoxes5sSQhOtibZ75pz0J35XTRlZOk9xMffhpA9BTbQZxoXZzOl5zMbleShbGwtw+1kGferfFwQ=="; }; }; "eslint-plugin-no-unsanitized-3.1.4" = { @@ -20896,6 +21544,15 @@ let sha512 = "WF1+eZo2Sh+bQNjZuVNwT0dA61zuJORsLh+1Sww7+O6GOPw+WPWIIRfTWNqrmaXaDMhM4SXAqYPcNlhRMiH13g=="; }; }; + "eslint-plugin-react-7.22.0" = { + name = "eslint-plugin-react"; + packageName = "eslint-plugin-react"; + version = "7.22.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.22.0.tgz"; + sha512 = "p30tuX3VS+NWv9nQot9xIGAHBXR0+xJVaZriEsHoJrASGCJZDJ8JLNM0YqKqI0AKm6Uxaa1VUHoNEibxRCMQHA=="; + }; + }; "eslint-plugin-vue-6.2.2" = { name = "eslint-plugin-vue"; packageName = "eslint-plugin-vue"; @@ -20905,13 +21562,13 @@ let sha512 = "Nhc+oVAHm0uz/PkJAWscwIT4ijTrK5fqNqz9QB1D35SbbuMG1uB6Yr5AJpvPSWg+WOw7nYNswerYh0kOk64gqQ=="; }; }; - "eslint-plugin-vue-7.2.0" = { + "eslint-plugin-vue-7.4.1" = { name = "eslint-plugin-vue"; packageName = "eslint-plugin-vue"; - version = "7.2.0"; + version = "7.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-7.2.0.tgz"; - sha512 = "4mt0yIv6rBDNtvis/g22a0ozJ12GfcdEzX77u0ICYjKlxOVtGrKGEvo0cbOObHaKDg9a9kJcoaNodqE4TPfS2A=="; + url = "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-7.4.1.tgz"; + sha512 = "W/xPNHYIkGJphLUM2UIYYGKbRw3BcDoMIPY9lu1TTa2YLiZoxurddfnmOP+UOVywxb5vi438ejzwvKdZqydtIw=="; }; }; "eslint-scope-3.7.3" = { @@ -21202,13 +21859,13 @@ let sha512 = "1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg=="; }; }; - "estree-walker-2.0.1" = { + "estree-walker-2.0.2" = { name = "estree-walker"; packageName = "estree-walker"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.1.tgz"; - sha512 = "tF0hv+Yi2Ot1cwj9eYHtxC0jB9bmjacjQs6ZBTj82H8JwUywFuc+7E83NWfNMwHXZc11mjfFcVXPe9gEP4B8dg=="; + url = "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz"; + sha512 = "Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w=="; }; }; "esutils-1.0.0" = { @@ -21229,6 +21886,15 @@ let sha512 = "kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g=="; }; }; + "esy-solve-cudf-0.1.10" = { + name = "esy-solve-cudf"; + packageName = "esy-solve-cudf"; + version = "0.1.10"; + src = fetchurl { + url = "https://registry.npmjs.org/esy-solve-cudf/-/esy-solve-cudf-0.1.10.tgz"; + sha512 = "/MrZOBH0wuJndvZN8pl+S3Mg3zJaK70PH9ZZwqDeJHulghEWROEZxpmenNiS9pqAaxyUVhTZJBt2/vL9jKCJbg=="; + }; + }; "etag-1.8.1" = { name = "etag"; packageName = "etag"; @@ -21436,6 +22102,15 @@ let sha512 = "/46HWwbfCX2xTawVfkKLGxMifJYQBWMwY1mjywRtb4c9x8l5NP3KoJtnIOiL1hfdRkIuYhETxQlo62IF8tcnlg=="; }; }; + "events-listener-1.1.0" = { + name = "events-listener"; + packageName = "events-listener"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/events-listener/-/events-listener-1.1.0.tgz"; + sha512 = "Kd3EgYfODHueq6GzVfs/VUolh2EgJsS8hkO3KpnDrxVjU3eq63eXM2ujXkhPP+OkeUOhL8CxdfZbQXzryb5C4g=="; + }; + }; "events.node-0.4.9" = { name = "events.node"; packageName = "events.node"; @@ -21571,6 +22246,15 @@ let sha512 = "j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA=="; }; }; + "execa-5.0.0" = { + name = "execa"; + packageName = "execa"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/execa/-/execa-5.0.0.tgz"; + sha512 = "ov6w/2LCiuyO4RLYGdpFGjkcs0wMTgGE8PrkTHikeUy5iJekXyPIKUjifk5CsE0pt7sMCrMZ3YNqoCj6idQOnQ=="; + }; + }; "execall-1.0.0" = { name = "execall"; packageName = "execall"; @@ -21598,6 +22282,24 @@ let sha512 = "8iA79xD3uAch729dUG8xaaBBFGaEa0wdD2VkYLFHwlqosEj/jT66AzcreRDSgV7ehnNLBW2WR5jIXwGKjVdTLg=="; }; }; + "exegesis-2.5.6" = { + name = "exegesis"; + packageName = "exegesis"; + version = "2.5.6"; + src = fetchurl { + url = "https://registry.npmjs.org/exegesis/-/exegesis-2.5.6.tgz"; + sha512 = "e+YkH/zZTN2njiwrV8tY6tHGDsFu3LyR/YbrqdWvDZaAJ5YGWaBYyd3oX/Y26iGqQc+7jLEKLDTv2UPzjAYL8w=="; + }; + }; + "exegesis-express-2.0.0" = { + name = "exegesis-express"; + packageName = "exegesis-express"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/exegesis-express/-/exegesis-express-2.0.0.tgz"; + sha512 = "NKvKBsBa2OvU+1BFpWbz3PzoRMhA9q7/wU2oMmQ9X8lPy/FRatADvhlkGO1zYOMgeo35k1ZLO9ZV0uIs9pPnXg=="; + }; + }; "exif-parser-0.1.12" = { name = "exif-parser"; packageName = "exif-parser"; @@ -21616,6 +22318,15 @@ let sha1 = "0632638f8d877cc82107d30a0fff1a17cba1cd0c"; }; }; + "exit-code-1.0.2" = { + name = "exit-code"; + packageName = "exit-code"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/exit-code/-/exit-code-1.0.2.tgz"; + sha1 = "ce165811c9f117af6a5f882940b96ae7f9aecc34"; + }; + }; "exit-hook-1.1.1" = { name = "exit-hook"; packageName = "exit-hook"; @@ -21688,13 +22399,13 @@ let sha1 = "a793d3ac0cad4c6ab571e9968fbbab6cb2532929"; }; }; - "expo-pwa-0.0.54" = { + "expo-pwa-0.0.58" = { name = "expo-pwa"; packageName = "expo-pwa"; - version = "0.0.54"; + version = "0.0.58"; src = fetchurl { - url = "https://registry.npmjs.org/expo-pwa/-/expo-pwa-0.0.54.tgz"; - sha512 = "UQtnB/CrjkUfQrRyHmUi3jg/1++fkM2KHTy5DBrexTC0XoXzbJCLMrUTgH2VBtjIVQO9KyApInE53BRcz3ei+Q=="; + url = "https://registry.npmjs.org/expo-pwa/-/expo-pwa-0.0.58.tgz"; + sha512 = "dbPKRQyr5vtpa8/fmBoRzNs1SYkTWosXvcJJhIfGVGvb8ZMPduruydczM+lavBjZmufdlOL4e8CWNXcr4NRz9g=="; }; }; "express-2.5.11" = { @@ -21787,6 +22498,15 @@ let sha512 = "64YwTWpxgVGnwoLi4zvKaQ5RWIV0dkxVE4GGkBF7D89RI0/I6gTRUDL25Il4AK3cUqyLtxnX2X5BZ2YRvRx5uQ=="; }; }; + "express-openapi-7.2.0" = { + name = "express-openapi"; + packageName = "express-openapi"; + version = "7.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/express-openapi/-/express-openapi-7.2.0.tgz"; + sha512 = "Zlz1qA5DA5vRj8UrWFNH5cA1js5g0VB5yRIR1cuxPGAclsU8q7Y6Dvx/BhQ10/OGYd8qwFk4mFvDYahSEQe7gw=="; + }; + }; "express-session-1.17.1" = { name = "express-session"; packageName = "express-session"; @@ -21796,13 +22516,13 @@ let sha512 = "UbHwgqjxQZJiWRTMyhvWGvjBQduGCSBDhhZXYenziMFjxst5rMV+aJZ6hKPHZnPyHGsrqRICxtX8jtEbm/z36Q=="; }; }; - "express-urlrewrite-1.3.0" = { + "express-urlrewrite-1.4.0" = { name = "express-urlrewrite"; packageName = "express-urlrewrite"; - version = "1.3.0"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/express-urlrewrite/-/express-urlrewrite-1.3.0.tgz"; - sha512 = "xy3WZqA9EIfb51FkL1R0EqW91Z8lMi9ohp/WrNxKukvQulybqvh7+OsGiw9JOD51NrGsSuWi2hqOv7GW+DGz1w=="; + url = "https://registry.npmjs.org/express-urlrewrite/-/express-urlrewrite-1.4.0.tgz"; + sha512 = "PI5h8JuzoweS26vFizwQl6UTF25CAHSggNv0J25Dn/IKZscJHWZzPrI5z2Y2jgOzIaw2qh8l6+/jUcig23Z2SA=="; }; }; "express-validator-2.21.0" = { @@ -21904,6 +22624,15 @@ let sha1 = "0f9c7a81a1f208b703eb0c3131fe5716ac6ecd15"; }; }; + "extends-classes-1.0.5" = { + name = "extends-classes"; + packageName = "extends-classes"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/extends-classes/-/extends-classes-1.0.5.tgz"; + sha1 = "ff46dc863fd914f215eb9de5a958c9001c746361"; + }; + }; "external-editor-1.1.1" = { name = "external-editor"; packageName = "external-editor"; @@ -22093,13 +22822,13 @@ let sha512 = "t8HYqkuE3YEqNcyWlAfh55479aTxO+GpYwvQvJppYqyBfSmRdNIhzY2m09FKN/MENTzq4wH6heHOIvsPyMAwvQ=="; }; }; - "fast-csv-4.3.5" = { + "fast-csv-4.3.6" = { name = "fast-csv"; packageName = "fast-csv"; - version = "4.3.5"; + version = "4.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/fast-csv/-/fast-csv-4.3.5.tgz"; - sha512 = "7csO4GADMDhVcf8UI5/TPdZbNkeToUx2HaRC1KPxYNWjAZ/SAFBBRJGhzlDWg0vgKm92toH6gR7+tsMcc0Fx8Q=="; + url = "https://registry.npmjs.org/fast-csv/-/fast-csv-4.3.6.tgz"; + sha512 = "2RNSpuwwsJGP0frGsOmTb9oUF+VkFSM4SyLTDgwf2ciHWTarN0lQTC+F2f/t5J9QjW+c65VFIAAu85GsvMIusw=="; }; }; "fast-deep-equal-1.1.0" = { @@ -22291,13 +23020,13 @@ let sha512 = "483XLLxTVIwWK3QTrMGRqUfUpoOs/0hbQrl2oz4J0pAcm3A3bu84wxTFqGqkJzewCLdME38xJLJAxBABfQT8sQ=="; }; }; - "fastq-1.9.0" = { + "fastq-1.10.0" = { name = "fastq"; packageName = "fastq"; - version = "1.9.0"; + version = "1.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/fastq/-/fastq-1.9.0.tgz"; - sha512 = "i7FVWL8HhVY+CTkwFxkN2mk3h+787ixS5S63eb78diVRc1MCssarHq3W5cj0av7YDSwmaV928RNag+U1etRQ7w=="; + url = "https://registry.npmjs.org/fastq/-/fastq-1.10.0.tgz"; + sha512 = "NL2Qc5L3iQEsyYzweq7qfgy5OtXCmGzGvhElGEd/SoFWEMOEczNh5s5ocaF01HDetxz+p8ecjNPA6cZxxIHmzA=="; }; }; "fault-1.0.4" = { @@ -22769,6 +23498,15 @@ let sha512 = "t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ=="; }; }; + "find-replace-1.0.3" = { + name = "find-replace"; + packageName = "find-replace"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/find-replace/-/find-replace-1.0.3.tgz"; + sha1 = "b88e7364d2d9c959559f388c66670d6130441fa0"; + }; + }; "find-requires-1.0.0" = { name = "find-requires"; packageName = "find-requires"; @@ -22931,13 +23669,13 @@ let sha512 = "VoPpKScAzvZ07jtciOY0bJieJwyd/VVCuo4fn3nBLh4iBagzYED7GLQeFBpMpy7HP5edEKTDo8yxaIrYrwb7hg=="; }; }; - "fkill-7.0.1" = { + "fkill-7.1.0" = { name = "fkill"; packageName = "fkill"; - version = "7.0.1"; + version = "7.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/fkill/-/fkill-7.0.1.tgz"; - sha512 = "rziuWzpWErC2aGQUuvGo9dcVBDeHowK9g75u4fnkTCAqPgvUVRMtlDW6KWsWonxY1tjF+p1mIys33yNvLRlAtw=="; + url = "https://registry.npmjs.org/fkill/-/fkill-7.1.0.tgz"; + sha512 = "l8zya4nRaXya4DJbSIkCCpJfE9+M0z8vbWDN+CynvNFIAWNZhBBS/G5c7t2l1NvtTpVcmCvnTm94bUICkRcqRQ=="; }; }; "flagged-respawn-1.0.1" = { @@ -22967,6 +23705,15 @@ let sha512 = "b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ=="; }; }; + "flat-arguments-1.0.2" = { + name = "flat-arguments"; + packageName = "flat-arguments"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/flat-arguments/-/flat-arguments-1.0.2.tgz"; + sha1 = "9baa780adf0501f282d726c9c6a038dba44ea76f"; + }; + }; "flat-cache-1.3.4" = { name = "flat-cache"; packageName = "flat-cache"; @@ -23075,13 +23822,13 @@ let sha512 = "jlbUu0XkbpXeXhan5xyTqVK1jmEKNxE8hpzznI3TThHTr76GiFwK0iRzhDo4KNy+S9h/KxHaqVhTP86vA6wHCg=="; }; }; - "flow-parser-0.138.0" = { + "flow-parser-0.141.0" = { name = "flow-parser"; packageName = "flow-parser"; - version = "0.138.0"; + version = "0.141.0"; src = fetchurl { - url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.138.0.tgz"; - sha512 = "LFnTyjrv39UvCWl8NOcpByr/amj8a5k5z7isO2wv4T43nNrUnHQwX3rarTz9zcpHXkDAQv6X4MfQ4ZzJUptpbw=="; + url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.141.0.tgz"; + sha512 = "WKdBiR9sDfkgEyPGhIgldUrVM08D57CgHLgd0FOXbhcVYXNfw+eHSApQ8SdcdQQoqrOvhlcVRB8lsn9bD5GQOw=="; }; }; "fluent-ffmpeg-2.1.2" = { @@ -23246,13 +23993,13 @@ let sha512 = "VjAQdSLsl6AkpZNyrQJfO7BXLo4chnStqb055bumZMbRUPpVuPN3a4ktsnRCmrFZjtMlYLkyXiR5rAs4WOpC4Q=="; }; }; - "follow-redirects-1.13.0" = { + "follow-redirects-1.13.1" = { name = "follow-redirects"; packageName = "follow-redirects"; - version = "1.13.0"; + version = "1.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.0.tgz"; - sha512 = "aq6gF1BEKje4a9i9+5jimNFIpq4Q1WiwBToeRK5NvZBd/TRsmW8BsJfOEGkr76TbOyPVD3OVDN910EcUNtRYEA=="; + url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.1.tgz"; + sha512 = "SSG5xmZh1mkPGyKzjZP8zLjltIfpW32Y5QpdNJyjcfGxK3qo3NDDkZOZSFiGn1A6SclQxY9GzEwAHQ3dmYRWpg=="; }; }; "follow-redirects-1.5.10" = { @@ -23372,13 +24119,13 @@ let sha512 = "DUxuQaKoqfNne8iikd14SAkh5uw4+8vNifp6gmA73yYNS6ywLIWSLD/n/mBzHQRpW3J7rbATEakmiA8JvkTyZw=="; }; }; - "fork-ts-checker-webpack-plugin-6.0.2" = { + "fork-ts-checker-webpack-plugin-6.0.5" = { name = "fork-ts-checker-webpack-plugin"; packageName = "fork-ts-checker-webpack-plugin"; - version = "6.0.2"; + version = "6.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-6.0.2.tgz"; - sha512 = "3WrR/gNMcOAJ+macFpYTXxbt/xZDF9MLCYsPU3j9IUmS8LAvi8WoTiI001z1A8qkgmDtkoh6MTytTQqf8/7aOA=="; + url = "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-6.0.5.tgz"; + sha512 = "2jIHv2RhXzSxWtvRQX/ZtOxd5joo+FQYzn+sJ/hyLqApKGgvjMEMF951GnvuSNPheGsqiVzIDjvSZo1qRtry1Q=="; }; }; "form-data-1.0.0-rc3" = { @@ -23507,13 +24254,13 @@ let sha512 = "wJaE62fLaB3jCYvY2ZHjZvmKK2iiLiiehX38rz5QZxtdN8fVPJDeZUiVvJrHStdTc+23LHlyZuSEKgFc0pxi2g=="; }; }; - "fp-ts-2.9.1" = { + "fp-ts-2.9.3" = { name = "fp-ts"; packageName = "fp-ts"; - version = "2.9.1"; + version = "2.9.3"; src = fetchurl { - url = "https://registry.npmjs.org/fp-ts/-/fp-ts-2.9.1.tgz"; - sha512 = "9++IpEtF2blK7tfSV+iHxO3KXdAGO/bPPQtUYqzC6XKzGOWNctqvlf13SpXxcu2mYaibOvneh/m9vAPLAHdoRQ=="; + url = "https://registry.npmjs.org/fp-ts/-/fp-ts-2.9.3.tgz"; + sha512 = "NjzcHYgigcbPQ6yJ52zwgsVDwKz3vwy9sjbxyzcvfXQm+j1BGeOPRuzLKEwsLyE4Xut6gG1FXJtsU9/gUB7tXg=="; }; }; "fragment-cache-0.2.1" = { @@ -23651,6 +24398,15 @@ let sha1 = "982d6893af918e72d08dec9e8673ff2b5a8d6add"; }; }; + "fs-extra-0.23.1" = { + name = "fs-extra"; + packageName = "fs-extra"; + version = "0.23.1"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-extra/-/fs-extra-0.23.1.tgz"; + sha1 = "6611dba6adf2ab8dc9c69fab37cddf8818157e3d"; + }; + }; "fs-extra-0.24.0" = { name = "fs-extra"; packageName = "fs-extra"; @@ -23876,6 +24632,15 @@ let sha512 = "bTLYHSeC0UH/EFXS9KqWnXuOl/wHK5Z/d+ghd5AsFMYN7wIGkUCOJyzy88+wJKkZPGON8u4Z9f6U4FdgURE9qA=="; }; }; + "fsevents-2.3.1" = { + name = "fsevents"; + packageName = "fsevents"; + version = "2.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/fsevents/-/fsevents-2.3.1.tgz"; + sha512 = "YR47Eg4hChJGAB1O3yEAOkGO+rlzutoICGqGo9EZ4lKWokzZRSyIW1QmTzqjtw8MJdj9srP869CuWw/hyzSiBw=="; + }; + }; "fstream-0.1.31" = { name = "fstream"; packageName = "fstream"; @@ -23948,13 +24713,13 @@ let sha1 = "1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"; }; }; - "fuse.js-6.4.3" = { + "fuse.js-6.4.5" = { name = "fuse.js"; packageName = "fuse.js"; - version = "6.4.3"; + version = "6.4.5"; src = fetchurl { - url = "https://registry.npmjs.org/fuse.js/-/fuse.js-6.4.3.tgz"; - sha512 = "JNgngolukIrqwayWnvy6NLH63hmwKPhm63o0uyBg51jPD0j09IvAzlV1rTXfAsgxpghI7khAo6Mv+EmvjDWXig=="; + url = "https://registry.npmjs.org/fuse.js/-/fuse.js-6.4.5.tgz"; + sha512 = "AIHjOhexWVqs/jWqun6jTUfdXB3Bm1uShoirHvTZImD2kHEQZ1zOmoDEqIPs8N1LnnwXJeG0T+r9ilEeJzlaoA=="; }; }; "fuzzy-0.1.3" = { @@ -24020,6 +24785,15 @@ let sha1 = "2c03405c7538c39d7eb37b317022e325fb018bf7"; }; }; + "gaxios-4.1.0" = { + name = "gaxios"; + packageName = "gaxios"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/gaxios/-/gaxios-4.1.0.tgz"; + sha512 = "vb0to8xzGnA2qcgywAjtshOKKVDf2eQhJoiL6fHhgW5tVN7wNk7egnYIO9zotfn3lQ3De1VPdf7V5/BWfCtCmg=="; + }; + }; "gaze-1.1.3" = { name = "gaze"; packageName = "gaze"; @@ -24038,6 +24812,15 @@ let sha512 = "4FcCj9e8j8rCjvLkqRpGZBLgTC/xr9XEf5By3x77cDucWWB3pJK6FEwXZCTCbb4z8xdaOoi4owBNrvn3ciDdxA=="; }; }; + "gcp-metadata-4.2.1" = { + name = "gcp-metadata"; + packageName = "gcp-metadata"; + version = "4.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-4.2.1.tgz"; + sha512 = "tSk+REe5iq/N+K+SK1XjZJUrFPuDqGZVzCy2vocIHIGmPlTGsa8owXMJwGkrXr73NO0AzhPW4MF2DEHz7P2AVw=="; + }; + }; "gelf-stream-1.1.1" = { name = "gelf-stream"; packageName = "gelf-stream"; @@ -24110,13 +24893,13 @@ let sha512 = "3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg=="; }; }; - "geoip-country-4.0.45" = { + "geoip-country-4.0.49" = { name = "geoip-country"; packageName = "geoip-country"; - version = "4.0.45"; + version = "4.0.49"; src = fetchurl { - url = "https://registry.npmjs.org/geoip-country/-/geoip-country-4.0.45.tgz"; - sha512 = "K9wWTy1NAW08vnWB/SKLTeknlI3DTigtu404ItlwdUR/IC2DnACvD/kj1ZzfyC5Zc+iIoJdilErSQcFd/W63FA=="; + url = "https://registry.npmjs.org/geoip-country/-/geoip-country-4.0.49.tgz"; + sha512 = "oeiRP6aiDBplorW2tl0Rm2k6iNlqrLI9Smn9lk4yBUSsMOqeUHqI7gXBKP59iMZqWq2emclX1IfJL665FX7btQ=="; }; }; "get-amd-module-type-3.0.0" = { @@ -24173,13 +24956,13 @@ let sha1 = "ead774abee72e20409433a066366023dd6887a41"; }; }; - "get-intrinsic-1.0.1" = { + "get-intrinsic-1.0.2" = { name = "get-intrinsic"; packageName = "get-intrinsic"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.0.1.tgz"; - sha512 = "ZnWP+AmS1VUaLgTRy47+zKtjTxz+0xMpx3I52i+aalBK1QP19ggLF3Db89KJX7kjfOfP2eoa01qc++GwPgufPg=="; + url = "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.0.2.tgz"; + sha512 = "aeX0vrFm21ILl3+JpFFRNe9aUvp6VFZb2/CTbgLb8j75kOhvoNYjt9d8KA/tJG4gSo8nzEDedRl0h7vDmBYRVg=="; }; }; "get-own-enumerable-property-symbols-3.0.2" = { @@ -24335,6 +25118,15 @@ let sha512 = "nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA=="; }; }; + "get-stream-6.0.0" = { + name = "get-stream"; + packageName = "get-stream"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/get-stream/-/get-stream-6.0.0.tgz"; + sha512 = "A1B3Bh1UmL0bidM/YX2NsCOTnGJePL9rO/M+Mw3m9f2gUpfokS0hi5Eah0WSUEWZdZhIZtMjkIYS7mDfOqNHbg=="; + }; + }; "get-uri-2.0.4" = { name = "get-uri"; packageName = "get-uri"; @@ -24560,6 +25352,15 @@ let sha512 = "KlIa5jvMYLjXMQXkqpFzobsyD/V2K5DRHl5OAf+6oDFPlPLxrGDVQlIdI63c4/Kt6kai4kALENSALlzTGST3GQ=="; }; }; + "git-url-parse-11.4.3" = { + name = "git-url-parse"; + packageName = "git-url-parse"; + version = "11.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/git-url-parse/-/git-url-parse-11.4.3.tgz"; + sha512 = "LZTTk0nqJnKN48YRtOpR8H5SEfp1oM2tls90NuZmBxN95PnCvmuXGzqQ4QmVirBgKx2KPYfPGteX3/raWjKenQ=="; + }; + }; "gitconfiglocal-1.0.0" = { name = "gitconfiglocal"; packageName = "gitconfiglocal"; @@ -24596,6 +25397,15 @@ let sha512 = "gwJScWVNhFYSRDvURk/8yhcFBee6aFjye2a7Lhb2bUyRulpIoek9p0I9Kt7PT67d/nUlZbFu8L9RLiA0woQN8Q=="; }; }; + "github-url-from-git-1.5.0" = { + name = "github-url-from-git"; + packageName = "github-url-from-git"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/github-url-from-git/-/github-url-from-git-1.5.0.tgz"; + sha1 = "f985fedcc0a9aa579dc88d7aff068d55cc6251a0"; + }; + }; "github-username-3.0.0" = { name = "github-username"; packageName = "github-username"; @@ -24722,6 +25532,24 @@ let sha512 = "FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ=="; }; }; + "glob-slash-1.0.0" = { + name = "glob-slash"; + packageName = "glob-slash"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/glob-slash/-/glob-slash-1.0.0.tgz"; + sha1 = "fe52efa433233f74a2fe64c7abb9bc848202ab95"; + }; + }; + "glob-slasher-1.0.1" = { + name = "glob-slasher"; + packageName = "glob-slasher"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/glob-slasher/-/glob-slasher-1.0.1.tgz"; + sha1 = "747a0e5bb222642ee10d3e05443e109493cb0f8e"; + }; + }; "glob-stream-6.1.0" = { name = "glob-stream"; packageName = "glob-stream"; @@ -24794,13 +25622,13 @@ let sha1 = "b319c0dd4607f353f3be9cca4c72fc148c49f445"; }; }; - "global-dirs-2.0.1" = { + "global-dirs-2.1.0" = { name = "global-dirs"; packageName = "global-dirs"; - version = "2.0.1"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/global-dirs/-/global-dirs-2.0.1.tgz"; - sha512 = "5HqUqdhkEovj2Of/ms3IeS/EekcO54ytHRLV4PEY2rhRwrHXLQjeVEES0Lhka0xwNDtGYn58wyC4s5+MHsOO6A=="; + url = "https://registry.npmjs.org/global-dirs/-/global-dirs-2.1.0.tgz"; + sha512 = "MG6kdOUh/xBnyo9cJFeIKkLEc1AyFq42QTU4XiX51i2NEdxLxLWXIjEjmqKeSuKR7pAZjTqUVoT2b2huxVLgYQ=="; }; }; "global-https://github.com/component/global/archive/v2.0.1.tar.gz" = { @@ -25056,6 +25884,15 @@ let sha1 = "d53b30cdf9313dffb7dc9a0d477096aa6d145c50"; }; }; + "google-auth-library-6.1.3" = { + name = "google-auth-library"; + packageName = "google-auth-library"; + version = "6.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/google-auth-library/-/google-auth-library-6.1.3.tgz"; + sha512 = "m9mwvY3GWbr7ZYEbl61isWmk+fvTmOt0YNUfPOUY2VH8K5pZlAIWJjxEi0PqR3OjMretyiQLI6GURMrPSwHQ2g=="; + }; + }; "google-closure-compiler-js-20170910.0.1" = { name = "google-closure-compiler-js"; packageName = "google-closure-compiler-js"; @@ -25065,6 +25902,24 @@ let sha512 = "Vric7QFWxzHFxITZ10bmlG1H/5rhODb7hJuWyKWMD8GflpQzRmbMVqkFp3fKvN+U9tPwZItGVhkiOR+84PX3ew=="; }; }; + "google-gax-2.9.2" = { + name = "google-gax"; + packageName = "google-gax"; + version = "2.9.2"; + src = fetchurl { + url = "https://registry.npmjs.org/google-gax/-/google-gax-2.9.2.tgz"; + sha512 = "Pve4osEzNKpBZqFXMfGKBbKCtgnHpUe5IQMh5Ou+Xtg8nLcba94L3gF0xgM5phMdGRRqJn0SMjcuEVmOYu7EBg=="; + }; + }; + "google-p12-pem-3.0.3" = { + name = "google-p12-pem"; + packageName = "google-p12-pem"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/google-p12-pem/-/google-p12-pem-3.0.3.tgz"; + sha512 = "wS0ek4ZtFx/ACKYF3JhyGe5kzH7pgiQ7J5otlumqR9psmWMYc+U9cErKlCYVYHoUaidXHdZ2xbo34kB+S+24hA=="; + }; + }; "goosig-0.9.0" = { name = "goosig"; packageName = "goosig"; @@ -25092,6 +25947,15 @@ let sha1 = "d9430ba32f6a30218243884418767340aafc0400"; }; }; + "got-10.7.0" = { + name = "got"; + packageName = "got"; + version = "10.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/got/-/got-10.7.0.tgz"; + sha512 = "aWTDeNw9g+XqEZNcTjMMZSy7B7yE9toWOFYip7ofFTLleJhvZwUxxTxkTpKvF+p1SAA4VHmuEy7PiHTHyq8tJg=="; + }; + }; "got-11.4.0" = { name = "got"; packageName = "got"; @@ -25110,13 +25974,13 @@ let sha512 = "yUhpEDLeuGiGJjRSzEq3kvt4zJtAcjKmhIiwNp/eUs75tRlXfWcHo5tcBaMQtnjHWC7nQYT5HkY/l0QOQTkVww=="; }; }; - "got-11.8.0" = { + "got-11.8.1" = { name = "got"; packageName = "got"; - version = "11.8.0"; + version = "11.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/got/-/got-11.8.0.tgz"; - sha512 = "k9noyoIIY9EejuhaBNLyZ31D5328LeqnyPNXJQb2XlJZcKakLqN5m6O/ikhq/0lw56kUYS54fVm+D1x57YC9oQ=="; + url = "https://registry.npmjs.org/got/-/got-11.8.1.tgz"; + sha512 = "9aYdZL+6nHmvJwHALLwKSUZ0hMwGaJGYv3hoPLPgnT8BoBXm1SjnZeky+91tfwJaDzun2s4RsBRy48IEYv2q2Q=="; }; }; "got-3.3.1" = { @@ -25245,6 +26109,15 @@ let sha512 = "jcLLfkpoVGmH7/InMC/1hIvOPSUh38oJtGhvrOFGzioE1DZ+0YW16RgmOJhHiuWTvGiJQ9Z1Ik43JvkRPRvE+A=="; }; }; + "graphql-0.11.7" = { + name = "graphql"; + packageName = "graphql"; + version = "0.11.7"; + src = fetchurl { + url = "https://registry.npmjs.org/graphql/-/graphql-0.11.7.tgz"; + sha512 = "x7uDjyz8Jx+QPbpCFCMQ8lltnQa4p4vSYHx6ADe8rVYRTdsyhCJbvSty5DAsLVmU6cGakl+r8HQYolKHxk/tiw=="; + }; + }; "graphql-0.13.2" = { name = "graphql"; packageName = "graphql"; @@ -25299,13 +26172,13 @@ let sha512 = "MBY0wEjvcgJtZUyoqpPvOE1e5qPI0hJaa1gKTqjonSFiCsNHX2lykNjpOPcodmAgH1V06ELxhGnm9kcVzqvi/g=="; }; }; - "graphql-extensions-0.12.6" = { + "graphql-extensions-0.12.7" = { name = "graphql-extensions"; packageName = "graphql-extensions"; - version = "0.12.6"; + version = "0.12.7"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-extensions/-/graphql-extensions-0.12.6.tgz"; - sha512 = "EUNw+OIRXYTPxToSoJjhJvS5aGa94KkdkZnL1I9DCZT64/+rzQNeLeGj+goj2RYuYvoQe1Bmcx0CNZ1GqwBhng=="; + url = "https://registry.npmjs.org/graphql-extensions/-/graphql-extensions-0.12.7.tgz"; + sha512 = "yc9qOmEmWVZNkux9m0eCiHdtYSwNZRHkFhgfKfDn4u/gpsJolft1iyMUADnG/eytiRW0CGZFBpZjHkJhpginuQ=="; }; }; "graphql-subscriptions-1.1.0" = { @@ -25371,13 +26244,13 @@ let sha512 = "U2OiDI5VxYmzRKw0Z2dmfk0zkqMRaecH9Smh1U277gVgVe9Qn+18xqf4skwr4YJszGIh7iQDZ57+5ygOK9sM/Q=="; }; }; - "graphql-ws-2.0.0" = { + "graphql-ws-3.1.0" = { name = "graphql-ws"; packageName = "graphql-ws"; - version = "2.0.0"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-ws/-/graphql-ws-2.0.0.tgz"; - sha512 = "8mueXeT7PswGeh/LObzKSYij+uD0FMGrvanHNaHuuUaiCfzqzc1ReflhEhzpS6bo4rxzK8L4aZtJ9Ci3hFQnIw=="; + url = "https://registry.npmjs.org/graphql-ws/-/graphql-ws-3.1.0.tgz"; + sha512 = "zbex3FSiFz0iRgfkzDNWpOY/sYWoX+iZ5XUhakaDwOh99HSuk8rPt5suuxdXUVzEg5TGQ9rwzNaz/+mTPtS0yg=="; }; }; "gray-matter-2.1.1" = { @@ -25443,6 +26316,15 @@ let sha512 = "cHwsLqoighpu7TuYj5RonnEuxGVFnztcUqTqp5rXFGYL4OuPFofwC4Ycg7n9fYwvK6F5WbYgeVOwph9Crs2fsQ=="; }; }; + "gtoken-5.1.0" = { + name = "gtoken"; + packageName = "gtoken"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/gtoken/-/gtoken-5.1.0.tgz"; + sha512 = "4d8N6Lk8TEAHl9vVoRVMh9BNOKWVgl2DdNtr3428O75r3QFrF/a5MMu851VmK0AA8+iSvbwRv69k5XnMLURGhg=="; + }; + }; "gulp-4.0.2" = { name = "gulp"; packageName = "gulp"; @@ -26217,13 +27099,13 @@ let sha1 = "b86ce808598e8a9d1892c571f3cedd86fc9f0653"; }; }; - "highlight.js-10.4.1" = { + "highlight.js-10.5.0" = { name = "highlight.js"; packageName = "highlight.js"; - version = "10.4.1"; + version = "10.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/highlight.js/-/highlight.js-10.4.1.tgz"; - sha512 = "yR5lWvNz7c85OhVAEAeFhVCc/GV4C30Fjzc/rCP0aCWzc1UUOPUk55dK/qdwTZHBvMZo+eZ2jpk62ndX/xMFlg=="; + url = "https://registry.npmjs.org/highlight.js/-/highlight.js-10.5.0.tgz"; + sha512 = "xTmvd9HiIHR6L53TMC7TKolEj65zG1XU+Onr8oi86mYa+nLcIbxTTWkpW7CsEwv/vK7u1zb8alZIMLDqqN6KTw=="; }; }; "highlight.js-8.2.0" = { @@ -26325,6 +27207,15 @@ let sha512 = "/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw=="; }; }; + "home-dir-1.0.0" = { + name = "home-dir"; + packageName = "home-dir"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/home-dir/-/home-dir-1.0.0.tgz"; + sha1 = "2917eb44bdc9072ceda942579543847e3017fe4e"; + }; + }; "homedir-polyfill-1.0.3" = { name = "homedir-polyfill"; packageName = "homedir-polyfill"; @@ -26433,13 +27324,13 @@ let sha512 = "D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ=="; }; }; - "html-entities-1.3.1" = { + "html-entities-1.4.0" = { name = "html-entities"; packageName = "html-entities"; - version = "1.3.1"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/html-entities/-/html-entities-1.3.1.tgz"; - sha512 = "rhE/4Z3hIhzHAUKbW8jVcCyuT5oJCXXqhN/6mXXVCpzTmvJnoH2HL/bt3EZ6p55jbFJBeAe1ZNpL5BugLujxNA=="; + url = "https://registry.npmjs.org/html-entities/-/html-entities-1.4.0.tgz"; + sha512 = "8nxjcBcd8wovbeKx7h3wTji4e6+rhaVuPNpMqwWgnHh+N9ToqsCs6XztWRBPQ+UtzsoMAdKZtUENoVzU/EMtZA=="; }; }; "html-loader-1.1.0" = { @@ -26586,6 +27477,15 @@ let sha512 = "4zDq1a1zhE4gQso/c5LP1OtrhYTncXNSpvJYtWJBtXAETPlMfi3IFNjGuQbYLuVY4ZR0QMqRVvo4Pdy9KLyP8Q=="; }; }; + "htmlparser2-6.0.0" = { + name = "htmlparser2"; + packageName = "htmlparser2"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.0.0.tgz"; + sha512 = "numTQtDZMoh78zJpaNdJ9MXb2cv5G3jwUoe3dMQODubZvLoGvTE/Ofp6sHvH8OGKcN/8A47pGLi/k58xHP/Tfw=="; + }; + }; "http-auth-2.0.7" = { name = "http-auth"; packageName = "http-auth"; @@ -26713,13 +27613,13 @@ let sha1 = "3bd6d6fde6e3172c9334c3b33b6c193d80fe1137"; }; }; - "http-parser-js-0.5.2" = { + "http-parser-js-0.5.3" = { name = "http-parser-js"; packageName = "http-parser-js"; - version = "0.5.2"; + version = "0.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.2.tgz"; - sha512 = "opCO9ASqg5Wy2FNo7A0sxy71yGbbkJJXLdgMK04Tcypw9jr2MgWbyubb0+WdmDmGnFflO7fRbqbaihh/ENDlRQ=="; + url = "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.3.tgz"; + sha512 = "t7hjvef/5HEK7RWTdUzVUhl8zkEu+LlaE0IYzdMuvbSDipxBRpOn4Uhw8ZyECEa808iVT8XCjzo6xmYt4CiLZg=="; }; }; "http-proxy-1.18.1" = { @@ -26911,6 +27811,15 @@ let sha512 = "SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw=="; }; }; + "human-signals-2.1.0" = { + name = "human-signals"; + packageName = "human-signals"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz"; + sha512 = "B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw=="; + }; + }; "humanize-0.0.9" = { name = "humanize"; packageName = "humanize"; @@ -27307,13 +28216,13 @@ let sha512 = "6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ=="; }; }; - "import-fresh-3.2.2" = { + "import-fresh-3.3.0" = { name = "import-fresh"; packageName = "import-fresh"; - version = "3.2.2"; + version = "3.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/import-fresh/-/import-fresh-3.2.2.tgz"; - sha512 = "cTPNrlvJT6twpYy+YmKUKrTSjWFs3bjYjAhCwm+z4EOCubZxAuO+hHpRN64TqjEaYSHs7tJAE0w1CKMGmsG/lw=="; + url = "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz"; + sha512 = "veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw=="; }; }; "import-from-3.0.0" = { @@ -27541,13 +28450,40 @@ let sha1 = "4e808c2ce144c6c1788918e034d6797bc6cf6281"; }; }; - "ini-1.3.5" = { + "ini-1.3.6" = { name = "ini"; packageName = "ini"; - version = "1.3.5"; + version = "1.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz"; - sha512 = "RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw=="; + url = "https://registry.npmjs.org/ini/-/ini-1.3.6.tgz"; + sha512 = "IZUoxEjNjubzrmvzZU4lKP7OnYmX72XRl3sqkfJhBKweKi5rnGi5+IUdlj/H1M+Ip5JQ1WzaDMOBRY90Ajc5jg=="; + }; + }; + "ini-1.3.7" = { + name = "ini"; + packageName = "ini"; + version = "1.3.7"; + src = fetchurl { + url = "https://registry.npmjs.org/ini/-/ini-1.3.7.tgz"; + sha512 = "iKpRpXP+CrP2jyrxvg1kMUpXDyRUFDWurxbnVT1vQPx+Wz9uCYsMIqYuSBLV+PAaZG/d7kRLKRFc9oDMsH+mFQ=="; + }; + }; + "ini-1.3.8" = { + name = "ini"; + packageName = "ini"; + version = "1.3.8"; + src = fetchurl { + url = "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz"; + sha512 = "JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew=="; + }; + }; + "ini-2.0.0" = { + name = "ini"; + packageName = "ini"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ini/-/ini-2.0.0.tgz"; + sha512 = "7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA=="; }; }; "init-package-json-1.10.3" = { @@ -27559,6 +28495,15 @@ let sha512 = "zKSiXKhQveNteyhcj1CoOP8tqp1QuxPIPBl8Bid99DGLFqA1p87M6lNgfjJHSBoWJJlidGOv5rWjyYKEB3g2Jw=="; }; }; + "ink-2.7.1" = { + name = "ink"; + packageName = "ink"; + version = "2.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ink/-/ink-2.7.1.tgz"; + sha512 = "s7lJuQDJEdjqtaIWhp3KYHl6WV3J04U9zoQ6wVc+Xoa06XM27SXUY57qC5DO46xkF0CfgXMKkKNcgvSu/SAEpA=="; + }; + }; "ink-3.0.8" = { name = "ink"; packageName = "ink"; @@ -27568,6 +28513,33 @@ let sha512 = "ubMFylXYaG4IkXQVhPautbhV/p6Lo0GlvAMI/jh8cGJQ39yeznJbaTTJP2CqZXezA4GOHzalpwCWqux/NEY38w=="; }; }; + "ink-confirm-input-2.0.0" = { + name = "ink-confirm-input"; + packageName = "ink-confirm-input"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ink-confirm-input/-/ink-confirm-input-2.0.0.tgz"; + sha512 = "YCd7a9XW0DIIbOhF3XiLo3WF86mOart9qI1qN56wT5IDJxU+j8BanEZh5/QXoazyIPSv1iXlHPIlRB5cbZIMIA=="; + }; + }; + "ink-spinner-3.1.0" = { + name = "ink-spinner"; + packageName = "ink-spinner"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ink-spinner/-/ink-spinner-3.1.0.tgz"; + sha512 = "sPqmE4qeJ43vJFk9DGLd0wIqhMBAr3129ZqHPt7b847fVl+YTZ3g96khI82Db+FYE7v/Fc5B3lp4ZNtJfqpRUg=="; + }; + }; + "ink-text-input-3.3.0" = { + name = "ink-text-input"; + packageName = "ink-text-input"; + version = "3.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ink-text-input/-/ink-text-input-3.3.0.tgz"; + sha512 = "gO4wrOf2ie3YuEARTIwGlw37lMjFn3Gk6CKIDrMlHb46WFMagZU7DplohjM24zynlqfnXA5UDEIfC2NBcvD8kg=="; + }; + }; "ink-text-input-4.0.1" = { name = "ink-text-input"; packageName = "ink-text-input"; @@ -27667,6 +28639,15 @@ let sha512 = "QIEQG4YyQ2UYZGDC4srMZ7BjHOmNk1lR2JQj5UknBapklm6WHA+VVH7N+sUdX3A7NeCfGF8o4X1S3Ao7nAcIeg=="; }; }; + "inquirer-6.3.1" = { + name = "inquirer"; + packageName = "inquirer"; + version = "6.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/inquirer/-/inquirer-6.3.1.tgz"; + sha512 = "MmL624rfkFt4TG9y/Jvmt8vdmOo836U7Y0Hxr2aFk3RelZEGX4Igk0KabWrcaaZaTv9uzglOqWh1Vly+FAWAXA=="; + }; + }; "inquirer-6.5.2" = { name = "inquirer"; packageName = "inquirer"; @@ -27694,6 +28675,15 @@ let sha512 = "zvAc+A6SZdcN+earG5SsBu1RnQdtBS4o8wZ/OqJiCfL34cfOx+twVRq7wumYix6Rkdjn1N2nVCcO3wHqKqgdGg=="; }; }; + "inquirer-autosubmit-prompt-0.2.0" = { + name = "inquirer-autosubmit-prompt"; + packageName = "inquirer-autosubmit-prompt"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/inquirer-autosubmit-prompt/-/inquirer-autosubmit-prompt-0.2.0.tgz"; + sha512 = "mzNrusCk5L6kSzlN0Ioddn8yzrhYNLli+Sn2ZxMuLechMYAzakiFCIULxsxlQb5YKzthLGfrFACcWoAvM7p04Q=="; + }; + }; "insert-module-globals-7.2.1" = { name = "insert-module-globals"; packageName = "insert-module-globals"; @@ -27784,6 +28774,15 @@ let sha512 = "MAQUJuIo7Xqk8EVNP+6d3CKq9c80hi4tjIbIAT6lmGW9W6WzlHiu9PS8uSuUYU+Do+j1baiFp3H25XEVxDIG2g=="; }; }; + "install-artifact-from-github-1.2.0" = { + name = "install-artifact-from-github"; + packageName = "install-artifact-from-github"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/install-artifact-from-github/-/install-artifact-from-github-1.2.0.tgz"; + sha512 = "3OxCPcY55XlVM3kkfIpeCgmoSKnMsz2A3Dbhsq0RXpIknKQmrX1YiznCeW9cD2ItFmDxziA3w6Eg8d80AoL3oA=="; + }; + }; "int53-1.0.0" = { name = "int53"; packageName = "int53"; @@ -27820,6 +28819,15 @@ let sha512 = "S1zBo1D6zcsyuC6PMmY5+55YMILQ9av8lotMx447Bq6SAgo/sDK6y6uUKmuYhW7eacnIhFfsPmCNYdDzsnnDCg=="; }; }; + "internal-slot-1.0.2" = { + name = "internal-slot"; + packageName = "internal-slot"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.2.tgz"; + sha512 = "2cQNfwhAfJIkU4KZPkDI+Gj5yNNnbqi40W9Gge6dfnk4TocEVm00B3bdiL+JINrbGJil2TeHvM4rETGzk/f/0g=="; + }; + }; "interpret-1.1.0" = { name = "interpret"; packageName = "interpret"; @@ -27955,6 +28963,15 @@ let sha1 = "fa78bf5d2e6913c911ce9f819ee5146bb6d844e9"; }; }; + "ip-regex-4.2.0" = { + name = "ip-regex"; + packageName = "ip-regex"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ip-regex/-/ip-regex-4.2.0.tgz"; + sha512 = "n5cDDeTWWRwK1EBoWwRti+8nP4NbytBBY0pldmnIkq6Z55KNFmWofh4rl9dPZpj+U/nVq7gweR3ylrvMt4YZ5A=="; + }; + }; "ip-set-1.0.2" = { name = "ip-set"; packageName = "ip-set"; @@ -28207,13 +29224,13 @@ let sha512 = "ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw=="; }; }; - "is-boolean-object-1.0.1" = { + "is-boolean-object-1.1.0" = { name = "is-boolean-object"; packageName = "is-boolean-object"; - version = "1.0.1"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.0.1.tgz"; - sha512 = "TqZuVwa/sppcrhUCAYkGBk7w0yxfQQnxq28fjkO53tnK9FQXmdwz2JS5+GjsWQ6RByES1K40nI+yDic5c9/aAQ=="; + url = "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.0.tgz"; + sha512 = "a7Uprx8UtD+HWdyYwnD1+ExtTgqQtD2k/1yJgtXP6wnMm8byhkoTZRl+95LLThpzNZJ5aEvi46cdH+ayMFRwmA=="; }; }; "is-buffer-1.1.6" = { @@ -28405,15 +29422,6 @@ let sha1 = "a6a2f32ffd2dfb04f5ca25ecd0f6b83cf798a1e1"; }; }; - "is-electron-2.2.0" = { - name = "is-electron"; - packageName = "is-electron"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-electron/-/is-electron-2.2.0.tgz"; - sha512 = "SpMppC2XR3YdxSzczXReBjqs2zGscWQpBIKqwXYBFic0ERaxNVgwLCHwOLZeESfdJQjX0RDvrJ1lBXX2ij+G1Q=="; - }; - }; "is-empty-1.2.0" = { name = "is-empty"; packageName = "is-empty"; @@ -28648,13 +29656,13 @@ let sha1 = "3d9877899e6a53efc0160504cde15f82e6f061d5"; }; }; - "is-map-2.0.1" = { + "is-map-2.0.2" = { name = "is-map"; packageName = "is-map"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/is-map/-/is-map-2.0.1.tgz"; - sha512 = "T/S49scO8plUiAOA2DBTBG3JHpn1yiw0kRp6dgiZ0v2/6twi5eiB0rHtHFH9ZIrvlWc6+4O+m4zg5+Z833aXgw=="; + url = "https://registry.npmjs.org/is-map/-/is-map-2.0.2.tgz"; + sha512 = "cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg=="; }; }; "is-mergeable-object-1.1.1" = { @@ -29143,13 +30151,22 @@ let sha1 = "449ca98299e713038256289ecb2b540dc437cb30"; }; }; - "is-set-2.0.1" = { + "is-scoped-2.1.0" = { + name = "is-scoped"; + packageName = "is-scoped"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-scoped/-/is-scoped-2.1.0.tgz"; + sha512 = "Cv4OpPTHAK9kHYzkzCrof3VJh7H/PrG2MBUMvvJebaaUMbqhm0YAtXnvh0I3Hnj2tMZWwrRROWLSgfJrKqWmlQ=="; + }; + }; + "is-set-2.0.2" = { name = "is-set"; packageName = "is-set"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/is-set/-/is-set-2.0.1.tgz"; - sha512 = "eJEzOtVyenDs1TMzSQ3kU3K+E0GUS9sno+F0OBT97xsgcJsF9nXMBtkT9/kut5JEpM7oL7X/0qxR17K3mcwIAA=="; + url = "https://registry.npmjs.org/is-set/-/is-set-2.0.2.tgz"; + sha512 = "+2cnTEZeY5z/iXGbLhPrOAaK/Mau5k5eXq9j14CpRTftq0pAJu2MwVRSZhyZWBzx3o6X795Lz6Bpb6R0GKf37g=="; }; }; "is-ssh-1.3.2" = { @@ -29179,6 +30196,15 @@ let sha512 = "XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw=="; }; }; + "is-stream-ended-0.1.4" = { + name = "is-stream-ended"; + packageName = "is-stream-ended"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/is-stream-ended/-/is-stream-ended-0.1.4.tgz"; + sha512 = "xj0XPvmr7bQFTvirqnFr50o0hQIh6ZItDqloxt5aJrR4NQsYeSsyFQERYGCAzfindAcnKjINnwEEgLx4IqVzQw=="; + }; + }; "is-string-1.0.5" = { name = "is-string"; packageName = "is-string"; @@ -29224,13 +30250,13 @@ let sha1 = "4e1aa0fb51bfbcb3e92688001397202c1775b66e"; }; }; - "is-typed-array-1.1.3" = { + "is-typed-array-1.1.4" = { name = "is-typed-array"; packageName = "is-typed-array"; - version = "1.1.3"; + version = "1.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.3.tgz"; - sha512 = "BSYUBOK/HJibQ30wWkWold5txYwMUXQct9YHAQJr8fSwvZoiglcqB0pd7vEN23+Tsi9IUEjztdOSzl4qLVYGTQ=="; + url = "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.4.tgz"; + sha512 = "ILaRgn4zaSrVNXNGtON6iFNotXW3hAPF3+0fB1usg2jFlWqo5fEDdmJkz0zBfoi7Dgskr8Khi2xZ8cXqZEfXNA=="; }; }; "is-typedarray-1.0.0" = { @@ -29269,6 +30295,15 @@ let sha512 = "ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww=="; }; }; + "is-url-superb-4.0.0" = { + name = "is-url-superb"; + packageName = "is-url-superb"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-url-superb/-/is-url-superb-4.0.0.tgz"; + sha512 = "GI+WjezhPPcbM+tqE9LnmsY5qqjwHzTvjJ36wxYX5ujNXefSUJ/T17r5bqDV8yLhcgB59KTPNOc9O9cmHTPWsA=="; + }; + }; "is-utf8-0.2.1" = { name = "is-utf8"; packageName = "is-utf8"; @@ -29323,6 +30358,15 @@ let sha512 = "pi4vhbhVHGLxohUw7PhGsueT4vRGFoXhP7+RGN0jKIv9+8PWYCQTqtADngrxOm2g46hoH0+g8uZZBzMrvVGDmw=="; }; }; + "is-what-3.12.0" = { + name = "is-what"; + packageName = "is-what"; + version = "3.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-what/-/is-what-3.12.0.tgz"; + sha512 = "2ilQz5/f/o9V7WRWJQmpFYNmQFZ9iM+OXRonZKcYgTkCzjb949Vi4h282PD1UfmgHk666rcWonbRJ++KI41VGw=="; + }; + }; "is-whitespace-character-1.0.4" = { name = "is-whitespace-character"; packageName = "is-whitespace-character"; @@ -29395,6 +30439,15 @@ let sha1 = "119556d1d1651a41ba105af803267c80b299f629"; }; }; + "is2-2.0.6" = { + name = "is2"; + packageName = "is2"; + version = "2.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/is2/-/is2-2.0.6.tgz"; + sha512 = "+Z62OHOjA6k2sUDOKXoZI3EXv7Fb1K52jpTBLbkfx62bcUeSsrTBLhEquCRDKTx0XE5XbHcG/S2vrtE3lnEDsQ=="; + }; + }; "isarray-0.0.1" = { name = "isarray"; packageName = "isarray"; @@ -29512,6 +30565,15 @@ let sha512 = "S/2fF5wH8SJA/kmwr6HYhK/RI/OkhD84k8ntalo0iJjZikgq1XFvR5M8NPT1x5F7fBwCG3qHfnzeP/Vh/ZxCUA=="; }; }; + "isomorphic-fetch-2.2.1" = { + name = "isomorphic-fetch"; + packageName = "isomorphic-fetch"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz"; + sha1 = "611ae1acf14f5e81f729507472819fe9733558a9"; + }; + }; "isomorphic-form-data-2.0.0" = { name = "isomorphic-form-data"; packageName = "isomorphic-form-data"; @@ -29557,6 +30619,15 @@ let sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a"; }; }; + "issue-regex-3.1.0" = { + name = "issue-regex"; + packageName = "issue-regex"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/issue-regex/-/issue-regex-3.1.0.tgz"; + sha512 = "0RHjbtw9QXeSYnIEY5Yrp2QZrdtz21xBDV9C/GIlY2POmgoS6a7qjkYS5siRKXScnuAj5/SPv1C3YForNCHTJA=="; + }; + }; "istanbul-lib-coverage-3.0.0" = { name = "istanbul-lib-coverage"; packageName = "istanbul-lib-coverage"; @@ -29602,6 +30673,15 @@ let sha512 = "1P/yWsxPlDtn7QeRD+ULKQPaIaN6yF368GZ2vDfv0AL0NwpStafjWCDDdn0k8wgFMWpVAqG7oJhxHnlud42i9w=="; }; }; + "iterall-1.1.3" = { + name = "iterall"; + packageName = "iterall"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/iterall/-/iterall-1.1.3.tgz"; + sha512 = "Cu/kb+4HiNSejAPhSaN1VukdNTTi/r4/e+yykqjlG/IW+1gZH5b4+Bq3whDX4tvbYugta3r8KTMUiqT3fIGxuQ=="; + }; + }; "iterall-1.2.2" = { name = "iterall"; packageName = "iterall"; @@ -29818,6 +30898,15 @@ let sha1 = "a3f222a9aae9f966f5d27c796510e28091764217"; }; }; + "jmp-2.0.0" = { + name = "jmp"; + packageName = "jmp"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jmp/-/jmp-2.0.0.tgz"; + sha512 = "VATfWVHErQJA2XMtmQjJQHHyQ/hxjHMmsy+egmwRk/RzFchQB4xjrR1iX496VZr+Hyhcr4zvL+IkkSlIYKx6Yw=="; + }; + }; "jodid25519-1.0.2" = { name = "jodid25519"; packageName = "jodid25519"; @@ -29845,22 +30934,22 @@ let sha1 = "b8417b750661a392bee2c2537c68b2a9d4977cd5"; }; }; - "joplin-turndown-4.0.30" = { - name = "joplin-turndown"; - packageName = "joplin-turndown"; - version = "4.0.30"; + "join-path-1.1.1" = { + name = "join-path"; + packageName = "join-path"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/joplin-turndown/-/joplin-turndown-4.0.30.tgz"; - sha512 = "OrGdNTsjI6/cbx/es9Hl0YI3YTql4SopduFcYCnWTZgqT0SJqILnF2JQxSNnbPnkSDIIRdNOG4+iNzlY6bS1nw=="; + url = "https://registry.npmjs.org/join-path/-/join-path-1.1.1.tgz"; + sha1 = "10535a126d24cbd65f7ffcdf15ef2e631076b505"; }; }; - "joplin-turndown-plugin-gfm-1.0.12" = { - name = "joplin-turndown-plugin-gfm"; - packageName = "joplin-turndown-plugin-gfm"; - version = "1.0.12"; + "jp-kernel-2.0.0" = { + name = "jp-kernel"; + packageName = "jp-kernel"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/joplin-turndown-plugin-gfm/-/joplin-turndown-plugin-gfm-1.0.12.tgz"; - sha512 = "qL4+1iycQjZ1fs8zk3jSRk7cg3ROBUHk7GKtiLAQLFzLPKErnILUvz5DLszSQvz3s1sTjPbywLDISVUtBY6HaA=="; + url = "https://registry.npmjs.org/jp-kernel/-/jp-kernel-2.0.0.tgz"; + sha512 = "Apz3AqpJhToFlo70mwnlbVyqhJRagzhNKKp84ZMeTqe/Ay9oIno8unm7eFepdlR8m8wz/9JXJQxUjK/3Ku/cpg=="; }; }; "jpeg-js-0.4.2" = { @@ -30007,6 +31096,15 @@ let sha512 = "/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A=="; }; }; + "js-yaml-3.14.1" = { + name = "js-yaml"; + packageName = "js-yaml"; + version = "3.14.1"; + src = fetchurl { + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz"; + sha512 = "okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g=="; + }; + }; "js-yaml-3.2.7" = { name = "js-yaml"; packageName = "js-yaml"; @@ -30025,6 +31123,15 @@ let sha1 = "6e5fe67d8b205ce4d22fad05b7781e8dadcc4b30"; }; }; + "js-yaml-4.0.0" = { + name = "js-yaml"; + packageName = "js-yaml"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-4.0.0.tgz"; + sha512 = "pqon0s+4ScYUvX30wxQi3PogGFAlUyH0awepWvwkj4jD4v+ova3RiYw8bmA6x2rDrEaj8i/oWKoRxpVNW+Re8Q=="; + }; + }; "js2xmlparser-4.0.1" = { name = "js2xmlparser"; packageName = "js2xmlparser"; @@ -30142,6 +31249,51 @@ let sha512 = "OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA=="; }; }; + "jsii-1.16.0" = { + name = "jsii"; + packageName = "jsii"; + version = "1.16.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jsii/-/jsii-1.16.0.tgz"; + sha512 = "8cgroyD6LOlFUlXUMAmjtUhzgyF3oQpVVpIdDzqcn2dNgs7iDnZN/Wo27MfZj8usbIBLLK3DYv7DSf+0/H0yWA=="; + }; + }; + "jsii-pacmak-1.16.0" = { + name = "jsii-pacmak"; + packageName = "jsii-pacmak"; + version = "1.16.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jsii-pacmak/-/jsii-pacmak-1.16.0.tgz"; + sha512 = "fjNiW8CliOO/GTzbhdA3kJGBvG1PDh2suQKfsUdh2sD0HSRmQPSpVydSmK0pfav7PD6OOfXsWvWI6WlKzNY0pg=="; + }; + }; + "jsii-reflect-1.16.0" = { + name = "jsii-reflect"; + packageName = "jsii-reflect"; + version = "1.16.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jsii-reflect/-/jsii-reflect-1.16.0.tgz"; + sha512 = "1zxZwni5S9WUQrNJJA+fVVkd1s54u6fdxjuiHpkZUvxkcPUnsuurL8KWImMEvbdz5ykGHEmnjMOOiyRh/XEc2Q=="; + }; + }; + "jsii-rosetta-1.16.0" = { + name = "jsii-rosetta"; + packageName = "jsii-rosetta"; + version = "1.16.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jsii-rosetta/-/jsii-rosetta-1.16.0.tgz"; + sha512 = "1FFGV+JmwyljCNjc9bkW40MIQXvPgNxq+V3zx8/0+FM51S/0O5EvTa/413LX8fzB8sWH0G42NqFa+8k3k9s2hw=="; + }; + }; + "jsii-srcmak-0.1.180" = { + name = "jsii-srcmak"; + packageName = "jsii-srcmak"; + version = "0.1.180"; + src = fetchurl { + url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.180.tgz"; + sha512 = "U9CmoEM6A7ZhIT66N8r9flPKUsNnkCu5iWkzH9k6sdNwbiEC5KT4MdJUfJ42L1AbX1BXwhmQtFyj7QvKdGI44g=="; + }; + }; "json-bigint-0.2.3" = { name = "json-bigint"; packageName = "json-bigint"; @@ -30151,6 +31303,15 @@ let sha1 = "118d7f6ff1d38659f19f94cf73e64a75a3f988a8"; }; }; + "json-bigint-1.0.0" = { + name = "json-bigint"; + packageName = "json-bigint"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/json-bigint/-/json-bigint-1.0.0.tgz"; + sha512 = "SiPv/8VpZuWbvLSMtTDU8hEfrZWg/mH/nV/b4o0CYbSxu1UIQPLdwKOCIyLQX+VIPO5vrLX3i8qtqFyhdPSUSQ=="; + }; + }; "json-buffer-2.0.11" = { name = "json-buffer"; packageName = "json-buffer"; @@ -30277,6 +31438,15 @@ let sha1 = "b480c892e59a2f05954ce727bd3f2a4e882f9e13"; }; }; + "json-schema-0.2.5" = { + name = "json-schema"; + packageName = "json-schema"; + version = "0.2.5"; + src = fetchurl { + url = "https://registry.npmjs.org/json-schema/-/json-schema-0.2.5.tgz"; + sha512 = "gWJOWYFrhQ8j7pVm0EM8Slr+EPVq1Phf6lvzvD/WCeqkrx/f2xBI0xOsRRS9xCn3I4vKtP519dvs3TP09r24wQ=="; + }; + }; "json-schema-deref-sync-0.13.0" = { name = "json-schema-deref-sync"; packageName = "json-schema-deref-sync"; @@ -30331,6 +31501,15 @@ let sha512 = "xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="; }; }; + "json-schema-traverse-1.0.0" = { + name = "json-schema-traverse"; + packageName = "json-schema-traverse"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz"; + sha512 = "NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="; + }; + }; "json-schema-typed-7.0.3" = { name = "json-schema-typed"; packageName = "json-schema-typed"; @@ -30394,6 +31573,15 @@ let sha512 = "W9Lq347r8tA1DfMvAGn9QNcgYm4Wm7Yc+k8e6vezpMnRT+NHbtlxgNBXRVjXe9YM6eTn6+p/MKOlV/aABJcSnQ=="; }; }; + "json2jsii-0.1.172" = { + name = "json2jsii"; + packageName = "json2jsii"; + version = "0.1.172"; + src = fetchurl { + url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.1.172.tgz"; + sha512 = "X78nchCnnN0M3x6byBMhR9X5fz5BETDxFmAE149WUpMn0Dh6Dg3c7H9FbQkRV1MVaqC0sLJHGIeO++hfgYpa7w=="; + }; + }; "json3-3.2.6" = { name = "json3"; packageName = "json3"; @@ -30574,6 +31762,15 @@ let sha512 = "CXcRvMyTlnR53xMcKnuMzfCA5i/nfblTnnr74CZb6C4vG39eu6w51t7nKmU5MfLfbTgGItliNyjO/ciNPDqClg=="; }; }; + "jsonschema-1.4.0" = { + name = "jsonschema"; + packageName = "jsonschema"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jsonschema/-/jsonschema-1.4.0.tgz"; + sha512 = "/YgW6pRMr6M7C+4o8kS+B/2myEpHCrxO4PEWnqJNBFMjn7EWXqlQ4tGwL6xTHeRplwuZmcAncdvfOad1nT2yMw=="; + }; + }; "jsonwebtoken-8.5.1" = { name = "jsonwebtoken"; packageName = "jsonwebtoken"; @@ -30646,6 +31843,15 @@ let sha1 = "69ec30ce4518bed5997b38f027648e8c285e92f7"; }; }; + "jsx-ast-utils-3.2.0" = { + name = "jsx-ast-utils"; + packageName = "jsx-ast-utils"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.2.0.tgz"; + sha512 = "EIsmt3O3ljsU6sot/J4E1zDRxfBNrhjyf/OKjlydwgEimQuznlM4Wv7U+ueONJMyEn1WRE0K8dhi3dVAXYT24Q=="; + }; + }; "jszip-2.6.1" = { name = "jszip"; packageName = "jszip"; @@ -30962,13 +32168,13 @@ let sha1 = "1e80454250018dbad4c3fe94497d6e67b6269c77"; }; }; - "keytar-7.2.0" = { + "keytar-7.3.0" = { name = "keytar"; packageName = "keytar"; - version = "7.2.0"; + version = "7.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/keytar/-/keytar-7.2.0.tgz"; - sha512 = "ECSaWvoLKI5SI0pGpZQeUV1/lpBYfkaxvoSp3zkiPOz05VavwSfLi8DdEaa9N2ekQZv3Chy+o7aP6n9mairBgw=="; + url = "https://registry.npmjs.org/keytar/-/keytar-7.3.0.tgz"; + sha512 = "t8YD0ETO5AeRxCaaN4N/hzj3JusIH0ugjVooE724+ozaVG9+l16Mau62T+U8tEhCv7SozY/g69BWF1U+o47qJg=="; }; }; "keyv-3.0.0" = { @@ -30998,13 +32204,13 @@ let sha512 = "zdGa2TOpSZPq5mU6iowDARnMBZgtCqJ11dJROFi6tg6kTn4nuUdU09lFyLFSaHrWqpIJ+EBq4E8/Dc0Vx5vLdA=="; }; }; - "khroma-1.1.0" = { + "khroma-1.1.1" = { name = "khroma"; packageName = "khroma"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/khroma/-/khroma-1.1.0.tgz"; - sha512 = "aTO+YX22tYOLEQJYFiatAj1lc5QZ+H5sHWFRBWNCiKwc5NWNUJZyeSeiHEPeURJ2a1GEVYcmyMUwGjjLe5ec5A=="; + url = "https://registry.npmjs.org/khroma/-/khroma-1.1.1.tgz"; + sha512 = "p7SYAiFisFFmLHHCqYBNwmfTrVIlWjUq+Pw81lDvnpaXOj2sR/xszTG4873AeaEO1kYQ50Z1c9CIrtQa6bdNdA=="; }; }; "killable-1.0.1" = { @@ -31754,15 +32960,6 @@ let sha512 = "5lMmsPc9ZtMjBk8rJ8ADKIj6AOgYvRtAuNfboO2TVPZsmcn6gSRyijUsA8KG6DUcJ89/hyQ3cnVRyzO1hbDavw=="; }; }; - "line-column-1.0.2" = { - name = "line-column"; - packageName = "line-column"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/line-column/-/line-column-1.0.2.tgz"; - sha1 = "d25af2936b6f4849172b312e4792d1d987bc34a2"; - }; - }; "line-reader-0.4.0" = { name = "line-reader"; packageName = "line-reader"; @@ -31790,13 +32987,13 @@ let sha1 = "bf967ba0dd31faaf09ab5bdb3676ad7f2aa18493"; }; }; - "link-check-4.5.3" = { + "link-check-4.5.4" = { name = "link-check"; packageName = "link-check"; - version = "4.5.3"; + version = "4.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/link-check/-/link-check-4.5.3.tgz"; - sha512 = "fEUmR+DVqNq0HZAurR5+8v5ulrsRKN/nfNYA02GHvreceEI0S5LiE19Ggf8XHCDRfVbc/4BYZaldBUG7lwNmIQ=="; + url = "https://registry.npmjs.org/link-check/-/link-check-4.5.4.tgz"; + sha512 = "VdjiYrIBNHtqH7NEvIlF/4i0V9xQWkoBry+65DtmmyKyD5qBZ2U9fCJYx75SI5Ms4ILJzGlNNojPKbPMpg5Spg=="; }; }; "linkify-it-2.2.0" = { @@ -31835,6 +33032,15 @@ let sha512 = "RmAl7su35BFd/xoMamRjpIE4j3v+L28o8CT5YhAXQJm1fD+1l9ngXY8JAQRJ+tFK2i5njvi0iRUKV09vPwA0iA=="; }; }; + "listr-input-0.2.1" = { + name = "listr-input"; + packageName = "listr-input"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/listr-input/-/listr-input-0.2.1.tgz"; + sha512 = "oa8iVG870qJq+OuuMK3DjGqFcwsK1SDu+kULp9kEq09TY231aideIZenr3lFOQdASpAr6asuyJBbX62/a3IIhg=="; + }; + }; "listr-silent-renderer-1.1.1" = { name = "listr-silent-renderer"; packageName = "listr-silent-renderer"; @@ -32123,13 +33329,13 @@ let sha1 = "c6940128a9d30f8e902cd2cf99fd0cba4ecfc183"; }; }; - "lodash-es-4.17.15" = { + "lodash-es-4.17.20" = { name = "lodash-es"; packageName = "lodash-es"; - version = "4.17.15"; + version = "4.17.20"; src = fetchurl { - url = "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.15.tgz"; - sha512 = "rlrc3yU3+JNOpZ9zj5pQtxnx2THmvRykwL4Xlxoa8I9lHBlVbbyPhgyPMioxVZ4NqyxaVVtaJnzsyOidQIhyyQ=="; + url = "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.20.tgz"; + sha512 = "JD1COMZsq8maT6mnuz1UMV0jvYD0E0aUsSOdrr1/nAG3dhqQXwRRgeW0cSqH1U43INKcqxaiVIQNOUDld7gRDA=="; }; }; "lodash-id-0.14.0" = { @@ -32762,6 +33968,15 @@ let sha1 = "8ffe20d4b616f56bea8f1aa0c6ebd80dcf742aee"; }; }; + "lodash.isarguments-2.4.1" = { + name = "lodash.isarguments"; + packageName = "lodash.isarguments"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-2.4.1.tgz"; + sha1 = "4931a9c08253adf091ae7ca192258a973876ecca"; + }; + }; "lodash.isarguments-3.1.0" = { name = "lodash.isarguments"; packageName = "lodash.isarguments"; @@ -33113,6 +34328,15 @@ let sha1 = "d8757b1da807dde24816b0d6a84bea1a76230b23"; }; }; + "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"; @@ -33248,6 +34472,15 @@ let sha1 = "a3a17bbf62eeb6240f491846e97c1c4e2a5e1e21"; }; }; + "lodash.values-2.4.1" = { + name = "lodash.values"; + packageName = "lodash.values"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.values/-/lodash.values-2.4.1.tgz"; + sha1 = "abf514436b3cb705001627978cbcf30b1280eea4"; + }; + }; "lodash.xorby-4.7.0" = { name = "lodash.xorby"; packageName = "lodash.xorby"; @@ -33257,6 +34490,15 @@ let sha1 = "9c19a6f9f063a6eb53dd03c1b6871799801463d7"; }; }; + "lodash.zip-4.2.0" = { + name = "lodash.zip"; + packageName = "lodash.zip"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.zip/-/lodash.zip-4.2.0.tgz"; + sha1 = "ec6662e4896408ed4ab6c542a3990b72cc080020"; + }; + }; "log-6.0.0" = { name = "log"; packageName = "log"; @@ -33905,13 +35147,13 @@ let sha512 = "07JHC0r1ykIoruKO8ifMXu+xEU8qOXDFETylktdug6vJDACnP+HKevOu3PXyNPzFyTSlz8vrBYlBO1JZRe8Cag=="; }; }; - "make-fetch-happen-8.0.10" = { + "make-fetch-happen-8.0.12" = { name = "make-fetch-happen"; packageName = "make-fetch-happen"; - version = "8.0.10"; + version = "8.0.12"; src = fetchurl { - url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-8.0.10.tgz"; - sha512 = "jPLPKQjBmDLK5r1BdyDyNKBytmkv2AsDWm2CxHJh+fqhSmC9Pmb7RQxwOq8xQig9+AWIS49+51k4f6vDQ3VnrQ=="; + url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-8.0.12.tgz"; + sha512 = "cBD7yM72ltWEV+xlLlbimnh5qHwr+thAb/cZLiaZhicVVPVN63BikBvL5OR68+8+z2fvBOgck628vGJ2ulgF6g=="; }; }; "make-iterator-1.0.1" = { @@ -34085,6 +35327,15 @@ let sha512 = "aU1TzmBKcWNNYvH9pjq6u92BML+Hz3h5S/QpfTFwiQF852pLT+9qHsrhM9JYipkOXZxGn+sGH8oyJE9FD9WezQ=="; }; }; + "markdown-it-12.0.4" = { + name = "markdown-it"; + packageName = "markdown-it"; + version = "12.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/markdown-it/-/markdown-it-12.0.4.tgz"; + sha512 = "34RwOXZT8kyuOJy25oJNJoulO8L0bTHYWXcdZBYZqFnjIy3NgjeoM3FmPXIOFQ26/lSHYMr8oc62B6adxXcb3Q=="; + }; + }; "markdown-it-8.4.2" = { name = "markdown-it"; packageName = "markdown-it"; @@ -34157,22 +35408,22 @@ let sha512 = "8haIwpAx87DQHcEtzkfsWv2hxg4jOvow6/nJKAMQ2wYRMZQTIfJm9VzrDkqw72Bb4YXBmI0u3GA/3MdXVL/x5g=="; }; }; - "markdown-it-ins-3.0.0" = { + "markdown-it-ins-3.0.1" = { name = "markdown-it-ins"; packageName = "markdown-it-ins"; - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/markdown-it-ins/-/markdown-it-ins-3.0.0.tgz"; - sha512 = "+vyAdBuMGwmT2yMlAFJSx2VR/0QZ1onQ/Mkkmr4l9tDFOh5sVoAgRbkgbuSsk+sxJ9vaMH/IQ323ydfvQrPO/Q=="; + url = "https://registry.npmjs.org/markdown-it-ins/-/markdown-it-ins-3.0.1.tgz"; + sha512 = "32SSfZqSzqyAmmQ4SHvhxbFqSzPDqsZgMHDwxqPzp+v+t8RsmqsBZRG+RfRQskJko9PfKC2/oxyOs4Yg/CfiRw=="; }; }; - "markdown-it-mark-3.0.0" = { + "markdown-it-mark-3.0.1" = { name = "markdown-it-mark"; packageName = "markdown-it-mark"; - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/markdown-it-mark/-/markdown-it-mark-3.0.0.tgz"; - sha512 = "HqMWeKfMMOu4zBO0emmxsoMWmbf2cPKZY1wP6FsTbKmicFfp5y4L3KXAsNeO1rM6NTJVOrNlLKMPjWzriBGspw=="; + url = "https://registry.npmjs.org/markdown-it-mark/-/markdown-it-mark-3.0.1.tgz"; + sha512 = "HyxjAu6BRsdt6Xcv6TKVQnkz/E70TdGXEFHRYBGLncRE9lBFwDNLVtFojKxjJWgJ+5XxUwLaHXy+2sGBbDn+4A=="; }; }; "markdown-it-multimd-table-4.0.3" = { @@ -34292,13 +35543,22 @@ let sha512 = "EGwzEeCcLniFX51DhTpmTom+dSA/MG/OBUDjnWtHbEnjAH180VzUeAw+oE4+Zv+CoYBWyRlYOTR0N8SO9R1PVw=="; }; }; - "marked-1.2.5" = { + "marked-1.2.7" = { name = "marked"; packageName = "marked"; - version = "1.2.5"; + version = "1.2.7"; src = fetchurl { - url = "https://registry.npmjs.org/marked/-/marked-1.2.5.tgz"; - sha512 = "2AlqgYnVPOc9WDyWu7S5DJaEZsfk6dNh/neatQ3IHUW4QLutM/VPSH9lG7bif+XjFWc9K9XR3QvR+fXuECmfdA=="; + url = "https://registry.npmjs.org/marked/-/marked-1.2.7.tgz"; + sha512 = "No11hFYcXr/zkBvL6qFmAp1z6BKY3zqLMHny/JN/ey+al7qwCM2+CMBL9BOgqMxZU36fz4cCWfn2poWIf7QRXA=="; + }; + }; + "marked-terminal-3.3.0" = { + name = "marked-terminal"; + packageName = "marked-terminal"; + version = "3.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/marked-terminal/-/marked-terminal-3.3.0.tgz"; + sha512 = "+IUQJ5VlZoAFsM5MHNT7g3RHSkA3eETqhRCdXv4niUMAKHQ7lb1yvAcuGPmm4soxhmtX13u4Li6ZToXtvSEH+A=="; }; }; "marked-terminal-4.1.0" = { @@ -34535,22 +35795,22 @@ let sha512 = "7GlnT24gEwDrdAwEHrU4Vv5lLWrEer4KOkAiKT9nYstsTad7Oc1TwqT2zIMKRdZF7cTuaf+GA1E4Kv7jJh8mPA=="; }; }; - "mdast-util-from-markdown-0.8.1" = { + "mdast-util-from-markdown-0.8.4" = { name = "mdast-util-from-markdown"; packageName = "mdast-util-from-markdown"; - version = "0.8.1"; + version = "0.8.4"; src = fetchurl { - url = "https://registry.npmjs.org/mdast-util-from-markdown/-/mdast-util-from-markdown-0.8.1.tgz"; - sha512 = "qJXNcFcuCSPqUF0Tb0uYcFDIq67qwB3sxo9RPdf9vG8T90ViKnksFqdB/Coq2a7sTnxL/Ify2y7aIQXDkQFH0w=="; + url = "https://registry.npmjs.org/mdast-util-from-markdown/-/mdast-util-from-markdown-0.8.4.tgz"; + sha512 = "jj891B5pV2r63n2kBTFh8cRI2uR9LQHsXG1zSDqfhXkIlDzrTcIlbB5+5aaYEkl8vOPIOPLf8VT7Ere1wWTMdw=="; }; }; - "mdast-util-to-markdown-0.5.4" = { + "mdast-util-to-markdown-0.6.2" = { name = "mdast-util-to-markdown"; packageName = "mdast-util-to-markdown"; - version = "0.5.4"; + version = "0.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/mdast-util-to-markdown/-/mdast-util-to-markdown-0.5.4.tgz"; - sha512 = "0jQTkbWYx0HdEA/h++7faebJWr5JyBoBeiRf0u3F4F3QtnyyGaWIsOwo749kRb1ttKrLLr+wRtOkfou9yB0p6A=="; + url = "https://registry.npmjs.org/mdast-util-to-markdown/-/mdast-util-to-markdown-0.6.2.tgz"; + sha512 = "iRczns6WMvu0hUw02LXsPDJshBIwtUPbvHBWo19IQeU0YqmzlA8Pd30U8V7uiI0VPkxzS7A/NXBXH6u+HS87Zg=="; }; }; "mdast-util-to-nlcst-4.0.1" = { @@ -34562,15 +35822,6 @@ let sha512 = "Y4ffygj85MTt70STKnEquw6k73jYWJBaYcb4ITAKgSNokZF7fH8rEHZ1GsRY/JaxqUevMaEnsDmkVv5Z9uVRdg=="; }; }; - "mdast-util-to-string-1.1.0" = { - name = "mdast-util-to-string"; - packageName = "mdast-util-to-string"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mdast-util-to-string/-/mdast-util-to-string-1.1.0.tgz"; - sha512 = "jVU0Nr2B9X3MU4tSK7JP1CMkSvOj7X5l/GboG1tKRw52lLF1x2Ju92Ms9tNetCcbfX3hzlM73zYo2NKkWSfF/A=="; - }; - }; "mdast-util-to-string-2.0.0" = { name = "mdast-util-to-string"; packageName = "mdast-util-to-string"; @@ -34904,13 +36155,13 @@ let sha512 = "GWHvA5QOcS412WCo8vwKDlTelGLsCGBVevQB5Kva961rmNfun0PCbv5+xta2kUMFJyR8/oWnn7ddeKdosbAPbA=="; }; }; - "meow-8.0.0" = { + "meow-8.1.0" = { name = "meow"; packageName = "meow"; - version = "8.0.0"; + version = "8.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/meow/-/meow-8.0.0.tgz"; - sha512 = "nbsTRz2fwniJBFgUkcdISq8y/q9n9VbiHYbfwklFh5V4V2uAcxtKQkDc0yCLPM/kP0d+inZBewn3zJqewHE7kg=="; + url = "https://registry.npmjs.org/meow/-/meow-8.1.0.tgz"; + sha512 = "fNWkgM1UVMey2kf24yLiccxLihc5W+6zVus3/N0b+VfnJgxV99E9u04X6NAiKdg6ED7DAQBX5sy36NM0QJZkWA=="; }; }; "merge-1.2.1" = { @@ -35003,13 +36254,13 @@ let sha1 = "401fdec7ec21cdb9e03cd3d3021398da21b27085"; }; }; - "metals-languageclient-0.3.3" = { + "metals-languageclient-0.4.0" = { name = "metals-languageclient"; packageName = "metals-languageclient"; - version = "0.3.3"; + version = "0.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/metals-languageclient/-/metals-languageclient-0.3.3.tgz"; - sha512 = "lcYMlelg5pHFxFR1oz6vqZA9M6bi2IcCcPdkc/OAOg1KTkS5fGBrW8RXGnbKx/j+w0hQ3sUJsg16x5U/ikXVVA=="; + url = "https://registry.npmjs.org/metals-languageclient/-/metals-languageclient-0.4.0.tgz"; + sha512 = "gvQ1NYkV7u0dbA59STd9Hleor23vztQY8WaIgDO1udb7tJM/NrS7ZLLxY9H6CDwoMiZhXaUvlpCjGwn/t8qTzg=="; }; }; "metalsmith-2.3.0" = { @@ -35021,6 +36272,15 @@ let sha1 = "833afbb5a2a6385e2d9ae3d935e39e33eaea5231"; }; }; + "method-missing-1.2.4" = { + name = "method-missing"; + packageName = "method-missing"; + version = "1.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/method-missing/-/method-missing-1.2.4.tgz"; + sha1 = "1fbf19c136e78b4b2c4e1f5541915fb0d589abe7"; + }; + }; "method-override-3.0.0" = { name = "method-override"; packageName = "method-override"; @@ -35147,13 +36407,13 @@ let sha512 = "jo1OfR4TaEwd5HOrt5+tAZ9mqT4jmpNAusXtyfNzqVm9uiSYFZlKM1wYL4oU7azZW/PxQW53wM0S6OR1JHNa2g=="; }; }; - "micromark-2.10.1" = { + "micromark-2.11.2" = { name = "micromark"; packageName = "micromark"; - version = "2.10.1"; + version = "2.11.2"; src = fetchurl { - url = "https://registry.npmjs.org/micromark/-/micromark-2.10.1.tgz"; - sha512 = "fUuVF8sC1X7wsCS29SYQ2ZfIZYbTymp0EYr6sab3idFjigFFjGa5UwoniPlV9tAgntjuapW1t9U+S0yDYeGKHQ=="; + url = "https://registry.npmjs.org/micromark/-/micromark-2.11.2.tgz"; + sha512 = "IXuP76p2uj8uMg4FQc1cRE7lPCLsfAXuEfdjtdO55VRiFO1asrCSQ5g43NmPqFtRwzEnEhafRVzn2jg0UiKArQ=="; }; }; "micromatch-2.3.11" = { @@ -35264,6 +36524,15 @@ let sha512 = "RZKhC3EmpBchfTGBVb8fb+RL2cWyw/32lshnsETttkBAyAUXSGHxbEJWWRXc751DrIxG1q04b8QwMbAwkRPpUA=="; }; }; + "mime-2.4.7" = { + name = "mime"; + packageName = "mime"; + version = "2.4.7"; + src = fetchurl { + url = "https://registry.npmjs.org/mime/-/mime-2.4.7.tgz"; + sha512 = "dhNd1uA2u397uQk3Nv5LM4lm93WYDUXFn3Fu291FJerns4jyTudqhIWe4W04YLy7Uk1tm1Ore04NpjRvQp/NPA=="; + }; + }; "mime-db-1.33.0" = { name = "mime-db"; packageName = "mime-db"; @@ -35309,6 +36578,15 @@ let sha512 = "JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w=="; }; }; + "mime-types-2.1.28" = { + name = "mime-types"; + packageName = "mime-types"; + version = "2.1.28"; + src = fetchurl { + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.28.tgz"; + sha512 = "0TO2yJ5YHYr7M2zzT7gDU1tbwHxEUWBCLt0lscSNpcdAfFyJOVEpRYNS7EXVcTLNj/25QO8gulHC5JtTzSE2UQ=="; + }; + }; "mimic-fn-1.2.0" = { name = "mimic-fn"; packageName = "mimic-fn"; @@ -36101,6 +37379,15 @@ let sha512 = "sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="; }; }; + "ms-2.1.3" = { + name = "ms"; + packageName = "ms"; + version = "2.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz"; + sha512 = "6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="; + }; + }; "msgpack-lite-0.1.26" = { name = "msgpack-lite"; packageName = "msgpack-lite"; @@ -36263,13 +37550,13 @@ let sha1 = "2a8f2ddf70eed564dff2d57f1e1a137d9f05078b"; }; }; - "multiserver-3.6.0" = { + "multiserver-3.7.0" = { name = "multiserver"; packageName = "multiserver"; - version = "3.6.0"; + version = "3.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/multiserver/-/multiserver-3.6.0.tgz"; - sha512 = "MeANpx7//lJTwYKLYfsucdRvDafbyxaijUm9BhmF+QfLBMGRebNoKRYLhZItbHYAcsI0HBTtpBVHNw+bmRRnFQ=="; + url = "https://registry.npmjs.org/multiserver/-/multiserver-3.7.0.tgz"; + sha512 = "70SSDMNT+e3VsDG4x7OKFW8+UqyZsBWfKD9rAvsRWCbMe9ySODheJCZ91Xyha5FrA32UtWIHGSY3m5jATfEmVQ=="; }; }; "multiserver-address-1.0.1" = { @@ -36335,6 +37622,15 @@ let sha512 = "yL5VE97+OXn4+Er3THSmTdCFCtx5hHWzrolvH+JObZnUYwuaG7XV+Ch4fR2cIrcYI0tFHxS7iyFYl14bW8y2sA=="; }; }; + "mustache-4.1.0" = { + name = "mustache"; + packageName = "mustache"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mustache/-/mustache-4.1.0.tgz"; + sha512 = "0FsgP/WVq4mKyjolIyX+Z9Bd+3WS8GOwoUTyKXT5cTYMGeauNTi2HPCwERqseC1IHAy0Z7MDZnJBfjabd4O8GQ=="; + }; + }; "mutate.js-0.2.0" = { name = "mutate.js"; packageName = "mutate.js"; @@ -36407,13 +37703,13 @@ let sha512 = "nU7mOEuaXiQIB/EgTIjYZJ7g8KqMm2D8l4qp+DqA4jxWOb/tnb1KEoqp+tlbdQIDIAiC1i7j7X/3yHDFXLxr9g=="; }; }; - "muxrpc-6.5.1" = { + "muxrpc-6.5.2" = { name = "muxrpc"; packageName = "muxrpc"; - version = "6.5.1"; + version = "6.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/muxrpc/-/muxrpc-6.5.1.tgz"; - sha512 = "QTHNncZlsEcBOOYqpCx/QeVLJYaov6Y1LCEDun0xu81zAJGKymiMd5TB/qzA+dm9o1K3axwdGOqPR3fzrDyGRw=="; + url = "https://registry.npmjs.org/muxrpc/-/muxrpc-6.5.2.tgz"; + sha512 = "fgYhBfzevyUbwsB8YBlrnmzZOGxWv6OiAUNKQYwPLqbophsZ+GT8STKrCVHCYNjUx6btxFA5+BJPUCFMecyaSA=="; }; }; "muxrpc-usage-2.1.0" = { @@ -36650,6 +37946,15 @@ let sha512 = "A0xLykHtARfueITVDernsAWdtIMbOJgKgcluwENp3AlsKN/PloyO10HtmoqnFAQAcxPkgZN7wdfPfEd0zNGxbg=="; }; }; + "nash-3.0.0" = { + name = "nash"; + packageName = "nash"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/nash/-/nash-3.0.0.tgz"; + sha512 = "M5SahEycXUmko3zOvsBkF6p94CWLhnyy9hfpQ9Qzp+rQkQ8D1OaTlfTl1OBWktq9Fak3oDXKU+ev7tiMaMu+1w=="; + }; + }; "native-promise-only-0.8.1" = { name = "native-promise-only"; packageName = "native-promise-only"; @@ -36794,13 +38099,13 @@ let sha1 = "ae603b36b134bcec347b452422b0bf98d5832ec8"; }; }; - "nearley-2.20.0" = { + "nearley-2.20.1" = { name = "nearley"; packageName = "nearley"; - version = "2.20.0"; + version = "2.20.1"; src = fetchurl { - url = "https://registry.npmjs.org/nearley/-/nearley-2.20.0.tgz"; - sha512 = "Ufhpu2Lrhbh7/InRnQmlgol/L4inT0ZCIh84xKb84zGZyw6PH/VeST3A7vRQTHuHmJHRBj4bw4ujEfJ4bprOig=="; + url = "https://registry.npmjs.org/nearley/-/nearley-2.20.1.tgz"; + sha512 = "+Mc8UaAebFzgV+KpI5n7DasuuQCHA89dmwm7JXw3TV43ukfNQ9DnBH3Mdb2g/I4Fdxc26pwimBWvjIw0UAILSQ=="; }; }; "neat-csv-2.1.0" = { @@ -36930,6 +38235,15 @@ let sha256 = "243e90fbf6616ef39f3c71bbcd027799e35cbf2ef3f25203676f65b20f7f7394"; }; }; + "nel-1.2.0" = { + name = "nel"; + packageName = "nel"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/nel/-/nel-1.2.0.tgz"; + sha512 = "yt96hdYomrZC5ZvYHMCsRF5KIaZ8Aue5Gff4sH+6GmPDMJft097x5JG1DicLnfgSYE56CLP6ztZEfb+3St91Yw=="; + }; + }; "neo-async-2.6.2" = { name = "neo-async"; packageName = "neo-async"; @@ -36966,6 +38280,15 @@ let sha512 = "x+VqJ+yop05OUpeaT4fhz/NAvJQFjtNhW1s+/i6oP/EZS6/+B0u+qCANF8uP9u3UJcmWvlJmrRoDhj62Xvtwug=="; }; }; + "netlify-6.0.9" = { + name = "netlify"; + packageName = "netlify"; + version = "6.0.9"; + src = fetchurl { + url = "https://registry.npmjs.org/netlify/-/netlify-6.0.9.tgz"; + sha512 = "izoELW+kE5ClHX85f5EExRo42H3hXESwSr69EJdCuDQlTP3JR09xQgZcWL5t7FNdkfBj7Kdhf62tk02TN4+YzA=="; + }; + }; "netlify-plugin-deploy-preview-commenting-0.0.1-alpha.16" = { name = "netlify-plugin-deploy-preview-commenting"; packageName = "netlify-plugin-deploy-preview-commenting"; @@ -37038,6 +38361,15 @@ let sha1 = "4aa7bfd43f03f0b81c9702b13d6a858ddb326f3e"; }; }; + "new-github-release-url-1.0.0" = { + name = "new-github-release-url"; + packageName = "new-github-release-url"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/new-github-release-url/-/new-github-release-url-1.0.0.tgz"; + sha512 = "dle7yf655IMjyFUqn6Nxkb18r4AOAkzRcgcZv6WZ0IqrOH4QCEZ8Sm6I7XX21zvHdBeeMeTkhR9qT2Z0EJDx6A=="; + }; + }; "next-event-1.0.0" = { name = "next-event"; packageName = "next-event"; @@ -37074,13 +38406,13 @@ let sha512 = "CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ=="; }; }; - "nextgen-events-1.3.3" = { + "nextgen-events-1.3.4" = { name = "nextgen-events"; packageName = "nextgen-events"; - version = "1.3.3"; + version = "1.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/nextgen-events/-/nextgen-events-1.3.3.tgz"; - sha512 = "5h9U7had+Q+a95Rwgu4JL6otqXs3y4474g7ruQtd8TAsoG6ycvjccnuLxhXEv32/HOKTC09K+HkbFaITIexLkg=="; + url = "https://registry.npmjs.org/nextgen-events/-/nextgen-events-1.3.4.tgz"; + sha512 = "umMRD9VOvQ7+AeCvMETA7tekqrzG0xOX2HLrpyZRuW+4NlXR5baZwY/CP7Sq3x1BkKCIa1KnI1m2+Fs+fJpOiQ=="; }; }; "nice-try-1.0.5" = { @@ -37200,13 +38532,13 @@ let sha512 = "ASCL5U13as7HhOExbT6OlWJJUV/lLzL2voOSP1UVehpRD8FbSrSDjfScK/KwAvVTI5AS6r4VwbOMlIqtvRidnA=="; }; }; - "node-addon-api-3.0.2" = { + "node-addon-api-3.1.0" = { name = "node-addon-api"; packageName = "node-addon-api"; - version = "3.0.2"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.0.2.tgz"; - sha512 = "+D4s2HCnxPd5PjjI0STKwncjXTUKKqm74MDMz9OPXavjsGmjkvwgLtA5yoxJUdmpj52+2u+RrXgPipahKczMKg=="; + url = "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.1.0.tgz"; + sha512 = "flmrDNB06LIl5lywUz7YlNGZH/5p0M7W28k8hzd9Lshtdh1wshD2Y+U4h9LD6KObOy1f+fEVdgprPrEymjM5uw=="; }; }; "node-appc-1.1.2" = { @@ -37498,6 +38830,15 @@ let sha512 = "46z7DUmcjoYdaWyXouuFNNfUo6eFa94t23c53c+lG/9Cvauk4a98rAUp9672X5dxGdQmLpPzTxzu8f/OeEPaFA=="; }; }; + "node-notifier-8.0.1" = { + name = "node-notifier"; + packageName = "node-notifier"; + version = "8.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/node-notifier/-/node-notifier-8.0.1.tgz"; + sha512 = "BvEXF+UmsnAfYfoapKM9nGxnP+Wn7P91YfXmrKnfcYCx6VBeoN5Ez5Ogck6I8Bi5k4RlpqRYaw75pAwzX9OphA=="; + }; + }; "node-persist-2.1.0" = { name = "node-persist"; packageName = "node-persist"; @@ -37597,13 +38938,13 @@ let sha512 = "j1g/VtSCI2tBrBnCD+u8iSo9tH0nvn70k1O1SxkHk3+qx7tHUyOKQc7wNc4rUs9J1PkGngUC3qEDd5cL7Z/klg=="; }; }; - "node-releases-1.1.67" = { + "node-releases-1.1.69" = { name = "node-releases"; packageName = "node-releases"; - version = "1.1.67"; + version = "1.1.69"; src = fetchurl { - url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.67.tgz"; - sha512 = "V5QF9noGFl3EymEwUYzO+3NTDpGfQB4ve6Qfnzf3UNydMhjQRVPR1DZTuvWiLzaFJYw2fmDwAfnRNEVb64hSIg=="; + url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.69.tgz"; + sha512 = "DGIjo79VDEyAnRlfSqYTsy+yoHd2IOjJiKUozD2MV2D85Vso6Bug56mb9tT/fY5Urt0iqk01H7x+llAruDR2zA=="; }; }; "node-source-walk-4.2.0" = { @@ -37966,6 +39307,15 @@ let sha512 = "lDLVkjfZmvmfvpvBzA4vzee9cn+Me4orq0QF8glbswJVEbIcSNWib7qGOffolysc3teCqbbPZZkzbr3GQZTL1g=="; }; }; + "npm-name-6.0.1" = { + name = "npm-name"; + packageName = "npm-name"; + version = "6.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-name/-/npm-name-6.0.1.tgz"; + sha512 = "fhKRvUAxaYzMEUZim4mXWyfFbVS+M1CbrCLdAo3txWzrctxKka/h+KaBW0O9Cz5uOM00Nldn2JLWhuwnyW3SUw=="; + }; + }; "npm-normalize-package-bin-1.0.1" = { name = "npm-normalize-package-bin"; packageName = "npm-normalize-package-bin"; @@ -38182,6 +39532,15 @@ let sha512 = "WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg=="; }; }; + "nth-check-2.0.0" = { + name = "nth-check"; + packageName = "nth-check"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/nth-check/-/nth-check-2.0.0.tgz"; + sha512 = "i4sc/Kj8htBrAiH1viZ0TgU8Y5XqCaV/FziYK6TBczxmeKm3AEFWqqF3195yKudrarqy7Zu80Ra5dobFjn9X/Q=="; + }; + }; "num-sort-2.1.0" = { name = "num-sort"; packageName = "num-sort"; @@ -38426,13 +39785,13 @@ let sha512 = "OSuu/pU4ENM9kmREg0BdNrUDIl1heYa4mBZacJc+vVWz4GtAwu7jO8s4AIt2aGRUTqxykpWzI3Oqnsm13tTMDA=="; }; }; - "object-hash-2.0.3" = { + "object-hash-2.1.1" = { name = "object-hash"; packageName = "object-hash"; - version = "2.0.3"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/object-hash/-/object-hash-2.0.3.tgz"; - sha512 = "JPKn0GMu+Fa3zt3Bmr66JhokJU5BaNBIh4ZeTlaCBzrBsOeXzwcKKAK1tbLiPKgvwmPXsDvvLHoWh5Bm7ofIYg=="; + url = "https://registry.npmjs.org/object-hash/-/object-hash-2.1.1.tgz"; + sha512 = "VOJmgmS+7wvXf8CjbQmimtCnEx3IAoLxI3fp2fbWehxrWBcAQFbk+vcwb6vzR0VZv/eNCJ/27j151ZTwqW/JeQ=="; }; }; "object-inspect-1.4.1" = { @@ -38516,13 +39875,13 @@ let sha512 = "BfWfuAwuhdH1bhMG5EG90WE/eckkBhBvnke8eSEkCDXoLE9Jk5JwYGTbCx1ehGwV48HvBkn62VukPBdlMUOY9w=="; }; }; - "object-treeify-1.1.30" = { + "object-treeify-1.1.31" = { name = "object-treeify"; packageName = "object-treeify"; - version = "1.1.30"; + version = "1.1.31"; src = fetchurl { - url = "https://registry.npmjs.org/object-treeify/-/object-treeify-1.1.30.tgz"; - sha512 = "BhsTZj8kbeCnyBKWuAgAakbGgrcVV/IJhUAGF25lOSwDZoHoDmnynUtXfyrrDn8A1Xy3G9k5uLP+V5onOOq3WA=="; + url = "https://registry.npmjs.org/object-treeify/-/object-treeify-1.1.31.tgz"; + sha512 = "kt2UuyHDTH+J6w0pv2c+3uuEApGuwgfjWogbqPWAvk4nOM/T3No0SzDtp6CuJ/XBUy//nFNuerb8ms7CqjD9Tw=="; }; }; "object-visit-1.0.1" = { @@ -38570,6 +39929,15 @@ let sha512 = "ym7h7OZebNS96hn5IJeyUmaWhaSM4SVtAPPfNLQEI2MYWCO2egsITb9nab2+i/Pwibx+R0mtn+ltKJXRSeTMGg=="; }; }; + "object.fromentries-2.0.3" = { + name = "object.fromentries"; + packageName = "object.fromentries"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.3.tgz"; + sha512 = "IDUSMXs6LOSJBWE++L0lzIbSqHl9KDCfff2x/JSEIDtEUavUnyMYC2ZGay/04Zq4UT8lvd4xNhU4/YHKibAOlw=="; + }; + }; "object.getownpropertydescriptors-2.1.1" = { name = "object.getownpropertydescriptors"; packageName = "object.getownpropertydescriptors"; @@ -38696,13 +40064,13 @@ let sha512 = "fZ4qZdQ2nxJvtcasX7Ghl+WlWS/d9IgnBIwFZXVNNZUmzpno91SX5bc5vuxiuKoCtK78XxGGNuSCrDC7xYB3OQ=="; }; }; - "office-ui-fabric-react-7.153.4" = { + "office-ui-fabric-react-7.155.3" = { name = "office-ui-fabric-react"; packageName = "office-ui-fabric-react"; - version = "7.153.4"; + version = "7.155.3"; src = fetchurl { - url = "https://registry.npmjs.org/office-ui-fabric-react/-/office-ui-fabric-react-7.153.4.tgz"; - sha512 = "BF4eDxilcW2I6vboXECPqcz2nPYjFZtnHR7lSSY67xRWX0B1+g5xccxqUiDNO/vFmRzvTpD4j53JN70TIzJm1Q=="; + url = "https://registry.npmjs.org/office-ui-fabric-react/-/office-ui-fabric-react-7.155.3.tgz"; + sha512 = "MOGOEviHa5P580rANl9+vS4QTDt6SeyVlfhGLqZpSgA7VZ4JDCIU/mFyNbl5KG39wfg5JiKic+Lz8rXUrExQfw=="; }; }; "omggif-1.0.10" = { @@ -38876,6 +40244,15 @@ let sha512 = "jQ31cORBFE6td25deYeD80wxKBMj+zBmHTrVxnc6CKhx8gho6ipmWM5zj/oeoqioZ99yqBls9Z/9Nss7J26G2g=="; }; }; + "oo-ascii-tree-1.16.0" = { + name = "oo-ascii-tree"; + packageName = "oo-ascii-tree"; + version = "1.16.0"; + src = fetchurl { + url = "https://registry.npmjs.org/oo-ascii-tree/-/oo-ascii-tree-1.16.0.tgz"; + sha512 = "xIuc4hP3NKOhPaPJN1zkTXiGNpNe4vOaS0CUwyCuVv1kBzBhliZ71siaGXpHIL45CBmX6qGAjEiHt7ZS1nQWaA=="; + }; + }; "opal-runtime-1.0.11" = { name = "opal-runtime"; packageName = "opal-runtime"; @@ -39119,6 +40496,15 @@ let sha512 = "6pi4/Fw+JIW1HHda2Ij7LRJ5QJ8f6YzaXnsRA6m44BJz8nLq/j5gVFzPBKJo+uOFhAeHqZC/3uzhTpYPga3Q/A=="; }; }; + "openapi3-ts-1.4.0" = { + name = "openapi3-ts"; + packageName = "openapi3-ts"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/openapi3-ts/-/openapi3-ts-1.4.0.tgz"; + sha512 = "8DmE2oKayvSkIR3XSZ4+pRliBsx19bSNeIzkTPswY8r4wvjX86bMxsORdqwAwMxE8PefOcSAT2auvi/0TZe9yA=="; + }; + }; "opencollective-1.0.3" = { name = "opencollective"; packageName = "opencollective"; @@ -39371,6 +40757,15 @@ let sha512 = "9tXIMPvjZ7hPTbk8DFq1f7Kow/HU/pQYB60JbNq+QnGwcyhWVZaQ4hM9zQDEsPxw/muLpgiHSaumUZxCAmod/w=="; }; }; + "ora-5.2.0" = { + name = "ora"; + packageName = "ora"; + version = "5.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ora/-/ora-5.2.0.tgz"; + sha512 = "+wG2v8TUU8EgzPHun1k/n45pXquQ9fHnbXVetl9rRgO6kjZszGGbraF3XPTIdgeA+s1lbRjSEftAnyT0w8ZMvQ=="; + }; + }; "ordered-read-streams-1.0.1" = { name = "ordered-read-streams"; packageName = "ordered-read-streams"; @@ -39380,6 +40775,15 @@ let sha1 = "77c0cb37c41525d64166d990ffad7ec6a0e1363e"; }; }; + "org-regex-1.0.0" = { + name = "org-regex"; + packageName = "org-regex"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/org-regex/-/org-regex-1.0.0.tgz"; + sha512 = "7bqkxkEJwzJQUAlyYniqEZ3Ilzjh0yoa62c7gL6Ijxj5bEpPL+8IE1Z0PFj0ywjjXQcdrwR51g9MIcLezR0hKQ=="; + }; + }; "original-1.0.2" = { name = "original"; packageName = "original"; @@ -39497,22 +40901,31 @@ let sha512 = "0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g=="; }; }; - "ot-builder-0.10.34" = { + "ot-builder-0.10.37" = { name = "ot-builder"; packageName = "ot-builder"; - version = "0.10.34"; + version = "0.10.37"; src = fetchurl { - url = "https://registry.npmjs.org/ot-builder/-/ot-builder-0.10.34.tgz"; - sha512 = "KYSsffceh64QcSE4fBGrSBf2twXxkGQzHcPqGTWpz1PcJ56hHpZyhmWqtltorrH5sjOjLIVGUqvGO19/vTsb8g=="; + url = "https://registry.npmjs.org/ot-builder/-/ot-builder-0.10.37.tgz"; + sha512 = "9V9v49oxGZUDosB63AlR1k6J5nAMJKUaRflYbwYy8o2/u9YMyujfAfqwDqAoWz12Q2Xdc9GllVA8TpPTw03acQ=="; }; }; - "otb-ttc-bundle-0.10.34" = { + "otb-ttc-bundle-0.10.37" = { name = "otb-ttc-bundle"; packageName = "otb-ttc-bundle"; - version = "0.10.34"; + version = "0.10.37"; src = fetchurl { - url = "https://registry.npmjs.org/otb-ttc-bundle/-/otb-ttc-bundle-0.10.34.tgz"; - sha512 = "zMUBVgo7ARvdwlh/SfmEKwRrPMzqiAZKjR+FTvImBwNYj98aoDGxPk5QP2uiLcDneJjMlCiL08N/i7B0edypmg=="; + url = "https://registry.npmjs.org/otb-ttc-bundle/-/otb-ttc-bundle-0.10.37.tgz"; + sha512 = "y3ziaqX+obzc9NMeXFvVz9+q2Hf9Nhu03lNbY/Iz1AjhfBHi7kMF9giW7ljmCTfdEg26crfOCBi2RbAUA2+3+g=="; + }; + }; + "ow-0.21.0" = { + name = "ow"; + packageName = "ow"; + version = "0.21.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ow/-/ow-0.21.0.tgz"; + sha512 = "dlsoDe39g7mhdsdrC1R/YwjT7yjVqE3svWwOlMGvN690waBkgEZBmKBdkmKvSt5/wZ6E0Jn/nIesPqMZOpPKqw=="; }; }; "p-all-2.1.0" = { @@ -39587,6 +41000,15 @@ let sha1 = "9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c"; }; }; + "p-defer-3.0.0" = { + name = "p-defer"; + packageName = "p-defer"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-defer/-/p-defer-3.0.0.tgz"; + sha512 = "ugZxsxmtTln604yeYd29EGrNhazN2lywetzpKhfmQjW/VJmhpDmWbiX+h0zL8V91R0UXkhb3KtPmyq9PZw3aYw=="; + }; + }; "p-event-2.3.1" = { name = "p-event"; packageName = "p-event"; @@ -39758,6 +41180,15 @@ let sha1 = "bf98fe575705658a9e1351befb85ae4c1f07bdca"; }; }; + "p-memoize-4.0.1" = { + name = "p-memoize"; + packageName = "p-memoize"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/p-memoize/-/p-memoize-4.0.1.tgz"; + sha512 = "km0sP12uE0dOZ5qP+s7kGVf07QngxyG0gS8sYFvFWhqlgzOsSy+m71aUejf/0akxj5W7gE//2G74qTv6b4iMog=="; + }; + }; "p-pipe-1.2.0" = { name = "p-pipe"; packageName = "p-pipe"; @@ -39866,6 +41297,15 @@ let sha512 = "rhIwUycgwwKcP9yTOOFK/AKsAopjjCakVqLHePO3CC6Mir1Z99xT+R63jZxAT5lFZLa2inS5h+ZS2GvR99/FBg=="; }; }; + "p-timeout-4.1.0" = { + name = "p-timeout"; + packageName = "p-timeout"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-timeout/-/p-timeout-4.1.0.tgz"; + sha512 = "+/wmHtzJuWii1sXn3HCuH/FTwGhrp4tmJTxSKJbfS+vkipci6osxXM5mY0jUiRzWKMTgUT8l7HFbeSwZAynqHw=="; + }; + }; "p-try-1.0.0" = { name = "p-try"; packageName = "p-try"; @@ -39884,13 +41324,13 @@ let sha512 = "R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="; }; }; - "p-wait-for-3.1.0" = { + "p-wait-for-3.2.0" = { name = "p-wait-for"; packageName = "p-wait-for"; - version = "3.1.0"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/p-wait-for/-/p-wait-for-3.1.0.tgz"; - sha512 = "0Uy19uhxbssHelu9ynDMcON6BmMk6pH8551CvxROhiz3Vx+yC4RqxjyIDk2V4ll0g9177RKT++PK4zcV58uJ7A=="; + url = "https://registry.npmjs.org/p-wait-for/-/p-wait-for-3.2.0.tgz"; + sha512 = "wpgERjNkLrBiFmkMEjuZJEWKKDrNfHCKA1OhyN1wg1FrLkULbviEy6py1AyJUgZ72YWFbZ38FIpnqvVqAlDUwA=="; }; }; "p-waterfall-1.0.0" = { @@ -40010,13 +41450,13 @@ let sha512 = "+4S+qBUdqD57ka5MDd6nAYGBPril5eyLpbga2y0kPyYhrKvjb8CYTP9r40WLbSxgT/qEGmvgWOrvQe+FYtCI7w=="; }; }; - "packet-stream-codec-1.1.2" = { + "packet-stream-codec-1.1.3" = { name = "packet-stream-codec"; packageName = "packet-stream-codec"; - version = "1.1.2"; + version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/packet-stream-codec/-/packet-stream-codec-1.1.2.tgz"; - sha1 = "79b302fc144cdfbb4ab6feba7040e6a5d99c79c7"; + url = "https://registry.npmjs.org/packet-stream-codec/-/packet-stream-codec-1.1.3.tgz"; + sha512 = "LUL4NK7sz01jdSUdCu3z1LyphCiFdQaFouaEDsAWmJpzS0lbeNfvZoX4bi1Tm1ilzheK5VAoD96QskDCZQr+jA=="; }; }; "pacote-11.1.0" = { @@ -40523,6 +41963,15 @@ let sha512 = "Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw=="; }; }; + "parse5-htmlparser2-tree-adapter-6.0.1" = { + name = "parse5-htmlparser2-tree-adapter"; + packageName = "parse5-htmlparser2-tree-adapter"; + version = "6.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-6.0.1.tgz"; + sha512 = "qPuWvbLgvDGilKc5BoicRovlT4MtYT6JfJyBOMDsKoiT+GiuP5qyrPCnR9HcPECIJJmZh5jRndyNThnhhb/vlA=="; + }; + }; "parsejson-0.0.1" = { name = "parsejson"; packageName = "parsejson"; @@ -41018,13 +42467,13 @@ let sha512 = "4Ejy1OPxi9f2tt1rRV7Go7zmfDQ+ZectEQz3VGUQhgq62HtIRPDyG/JtnwIxs6x3uNMwo2V7q1fMvKjb+Tnpqg=="; }; }; - "peek-readable-3.1.0" = { + "peek-readable-3.1.1" = { name = "peek-readable"; packageName = "peek-readable"; - version = "3.1.0"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/peek-readable/-/peek-readable-3.1.0.tgz"; - sha512 = "KGuODSTV6hcgdZvDrIDBUkN0utcAVj1LL7FfGbM0viKTtCHmtZcuEJ+lGqsp0fTFkGqesdtemV2yUSMeyy3ddA=="; + url = "https://registry.npmjs.org/peek-readable/-/peek-readable-3.1.1.tgz"; + sha512 = "QHJag0oYYPVkx6rVPEgCLEUMo6VRYbV3GUrqy00lxXJBEIw9LhPCP5MQI6mEfahJO9KYUP8W8qD8kC0V9RyZFQ=="; }; }; "peek-stream-1.1.3" = { @@ -41225,6 +42674,15 @@ let sha512 = "OlE82n3yMOE5dY9RMOwxhoWefeMlxwk5IVxoj0sSzSFIlmvhN4obzTvO3s/d/b5JhcgXikjaspsy/HuUDTqbBg=="; }; }; + "pid-port-0.1.1" = { + name = "pid-port"; + packageName = "pid-port"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pid-port/-/pid-port-0.1.1.tgz"; + sha512 = "boqPJtSgZC6KOgXKNPC+/XR3xwVtpOtaLa7JLcdf8jfVe0ZM2TwllBXxxLUO8GQbOLJ4/hEtf2+L1QCKbaoHUg=="; + }; + }; "pidusage-2.0.21" = { name = "pidusage"; packageName = "pidusage"; @@ -41775,13 +43233,13 @@ let sha512 = "3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg=="; }; }; - "postcss-8.1.7" = { + "postcss-8.1.10" = { name = "postcss"; packageName = "postcss"; - version = "8.1.7"; + version = "8.1.10"; src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-8.1.7.tgz"; - sha512 = "llCQW1Pz4MOPwbZLmOddGM9eIJ8Bh7SZ2Oj5sxZva77uVaotYDsYTch1WBTNu7fUY0fpWp0fdt7uW40D4sRiiQ=="; + url = "https://registry.npmjs.org/postcss/-/postcss-8.1.10.tgz"; + sha512 = "iBXEV5VTTYaRRdxiFYzTtuv2lGMQBExqkZKSzkJe+Fl6rvQrA/49UVGKqB+LG54hpW/TtDBMGds8j33GFNW7pg=="; }; }; "postcss-calc-7.0.5" = { @@ -42396,6 +43854,15 @@ let sha512 = "aaLVANlj4HgZweKttFNUVNRxDukytuIuxeK2boIMHjagNJCiVKWFsKF4tCE3ql3GbrD2tExPQ7/pwtEJcHNZeg=="; }; }; + "prebuild-install-5.3.6" = { + name = "prebuild-install"; + packageName = "prebuild-install"; + version = "5.3.6"; + src = fetchurl { + url = "https://registry.npmjs.org/prebuild-install/-/prebuild-install-5.3.6.tgz"; + sha512 = "s8Aai8++QQGi4sSbs/M1Qku62PFK49Jm1CbgXklGz4nmHveDq0wzJkg7Na5QbnO1uNH8K7iqx2EQ/mV0MZEmOg=="; + }; + }; "prebuild-install-6.0.0" = { name = "prebuild-install"; packageName = "prebuild-install"; @@ -42486,6 +43953,15 @@ let sha512 = "s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew=="; }; }; + "prettier-2.0.5" = { + name = "prettier"; + packageName = "prettier"; + version = "2.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/prettier/-/prettier-2.0.5.tgz"; + sha512 = "7PtVymN48hGcO4fGjybyBSIWDsLU4H4XlvOHfq91pz9kkGlonzwTfYkaIEwiRg/dAJF9YlbsduBAgtYLi+8cFg=="; + }; + }; "prettier-2.2.1" = { name = "prettier"; packageName = "prettier"; @@ -42549,13 +44025,13 @@ let sha1 = "b2bf82e7350d65c6c33aa95aaa5a4f6327f61cd9"; }; }; - "pretty-bytes-5.4.1" = { + "pretty-bytes-5.5.0" = { name = "pretty-bytes"; packageName = "pretty-bytes"; - version = "5.4.1"; + version = "5.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.4.1.tgz"; - sha512 = "s1Iam6Gwz3JI5Hweaz4GoCD1WUNUIyzePFy5+Js2hjwGVt2Z79wNN+ZKOZ2vB6C+Xs6njyB84Z1IthQg8d9LxA=="; + url = "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.5.0.tgz"; + sha512 = "p+T744ZyjjiaFlMUZZv6YPC5JrkNj8maRmPaQCWFJFplUAzpIUTRaTcS+7wmZtUoFXHtESJb23ISliaWyz3SHA=="; }; }; "pretty-error-2.1.2" = { @@ -42684,13 +44160,13 @@ let sha512 = "dG2w7WtovUa4SiYTdWn9H8Bd4JNdei2djtkP/Bk9fXq81j5Q15ZPHYSwhUVvBRbp5zMkGtu0Yk62HuMcly0pRw=="; }; }; - "prismjs-1.22.0" = { + "prismjs-1.23.0" = { name = "prismjs"; packageName = "prismjs"; - version = "1.22.0"; + version = "1.23.0"; src = fetchurl { - url = "https://registry.npmjs.org/prismjs/-/prismjs-1.22.0.tgz"; - sha512 = "lLJ/Wt9yy0AiSYBf212kK3mM5L8ycwlyTlSxHBAneXLR0nzFMlZ5y7riFPF3E33zXOF2IH95xdY5jIyZbM9z/w=="; + url = "https://registry.npmjs.org/prismjs/-/prismjs-1.23.0.tgz"; + sha512 = "c29LVsqOaLbBHuIbsTxaKENh1N2EQBOHaWv7gkHN4dgRbxSREqDnDbtFJYdpPauS4YCplMSNCABQ6Eeor69bAA=="; }; }; "private-0.1.8" = { @@ -42864,6 +44340,15 @@ let sha512 = "W04AqnILOL/sPRXziNicCjSNRruLAuIHEOVBazepu0545DDNGYHz7ar9ZgZ1fMU8/MA4mVxp5rkBWRi6OXIy3Q=="; }; }; + "promise-breaker-5.0.0" = { + name = "promise-breaker"; + packageName = "promise-breaker"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/promise-breaker/-/promise-breaker-5.0.0.tgz"; + sha512 = "mgsWQuG4kJ1dtO6e/QlNDLFtMkMzzecsC69aI5hlLEjGHFNpHrvGhFi4LiK5jg2SMQj74/diH+wZliL9LpGsyA=="; + }; + }; "promise-inflight-1.0.1" = { name = "promise-inflight"; packageName = "promise-inflight"; @@ -42954,6 +44439,15 @@ let sha1 = "8e57123c396ab988897fb327fd3aedc3e735e4fe"; }; }; + "prompt-1.1.0" = { + name = "prompt"; + packageName = "prompt"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/prompt/-/prompt-1.1.0.tgz"; + sha512 = "ec1vUPXCplDBDUVD8uPa3XGA+OzLrO40Vxv3F1uxoiZGkZhdctlK2JotcHq5X6ExjocDOGwGdCSXloGNyU5L1Q=="; + }; + }; "promptly-2.2.0" = { name = "promptly"; packageName = "promptly"; @@ -44151,13 +45645,13 @@ let sha512 = "gjWOsm2SoGlgLEdAGt7a6slVOk9mGiXmPFMqrEhLQ68rhQuBnpfs3+EmlvqKyxnCo9/PPlF+9MtY02S1aFg+Jw=="; }; }; - "query-string-6.13.7" = { + "query-string-6.13.8" = { name = "query-string"; packageName = "query-string"; - version = "6.13.7"; + version = "6.13.8"; src = fetchurl { - url = "https://registry.npmjs.org/query-string/-/query-string-6.13.7.tgz"; - sha512 = "CsGs8ZYb39zu0WLkeOhe0NMePqgYdAuCqxOYKDR5LVCytDZYMGx3Bb+xypvQvPHVPijRXB0HZNFllCzHRe4gEA=="; + url = "https://registry.npmjs.org/query-string/-/query-string-6.13.8.tgz"; + sha512 = "jxJzQI2edQPE/NPUOusNjO/ZOGqr1o2OBa/3M00fU76FsLXDVbJDv/p7ng5OdQyorKrkRz1oqfwmbe5MAMePQg=="; }; }; "querystring-0.2.0" = { @@ -44556,6 +46050,15 @@ let sha512 = "wuygyq8TXUlSdVXv2kigXxQNOgdb9m7LbIjwfTNGSpaY1riLd5e+VeQjlQMyUtrk0oiyhi1AqIVynworl3qxHA=="; }; }; + "re2-1.15.9" = { + name = "re2"; + packageName = "re2"; + version = "1.15.9"; + src = fetchurl { + url = "https://registry.npmjs.org/re2/-/re2-1.15.9.tgz"; + sha512 = "AXWEhpMTBdC+3oqbjdU07dk0pBCvxh5vbOMLERL6Y8FYBSGn4vXlLe8cYszn64Yy7H8keVMrgPzoSvOd4mePpg=="; + }; + }; "react-16.14.0" = { name = "react"; packageName = "react"; @@ -44637,13 +46140,13 @@ let sha512 = "X8jZHc7nCMjaCqoU+V2I0cOhNW+QMBwSUkeXnTi8IPe6zaRWfn60ZzvFDZqWPfmSJfjub7dDW1SP0jaHWLu/hg=="; }; }; - "react-tabs-3.1.1" = { + "react-tabs-3.1.2" = { name = "react-tabs"; packageName = "react-tabs"; - version = "3.1.1"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/react-tabs/-/react-tabs-3.1.1.tgz"; - sha512 = "HpySC29NN1BkzBAnOC+ajfzPbTaVZcSWzMSjk56uAhPC/rBGtli8lTysR4CfPAyEE/hfweIzagOIoJ7nu80yng=="; + url = "https://registry.npmjs.org/react-tabs/-/react-tabs-3.1.2.tgz"; + sha512 = "OKS1l7QzSNcn+L2uFsxyGFHdXp9YsPGf/YOURWcImp7xLN36n0Wz+/j9HwlwGtlXCZexwshScR5BrcFbw/3P9Q=="; }; }; "read-1.0.7" = { @@ -44880,6 +46383,15 @@ let sha1 = "8f90341e68a53ccc928788dacfcd11b36eb9b78e"; }; }; + "readable-stream-2.3.0" = { + name = "readable-stream"; + packageName = "readable-stream"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.0.tgz"; + sha512 = "c7KMXGd4b48nN3OJ1U9qOsn6pXNzf6kLd3kdZCkg2sxAcoiufInqF0XckwEnlrcwuaYwonlNK8GQUIOC/WC7sg=="; + }; + }; "readable-stream-2.3.7" = { name = "readable-stream"; packageName = "readable-stream"; @@ -44961,6 +46473,15 @@ let sha1 = "c580d77ef2cfc8752b132498060dc9793a7ac01c"; }; }; + "readline-sync-1.4.10" = { + name = "readline-sync"; + packageName = "readline-sync"; + version = "1.4.10"; + src = fetchurl { + url = "https://registry.npmjs.org/readline-sync/-/readline-sync-1.4.10.tgz"; + sha512 = "gNva8/6UAe8QYepIQH/jQ2qn91Qj0B9sYjMBBs3QOB8F2CXcKgLxQaJRP76sWVRQt+QU+8fAkCbCvjjMFu7Ycw=="; + }; + }; "readline2-0.1.1" = { name = "readline2"; packageName = "readline2"; @@ -45159,15 +46680,6 @@ let sha1 = "258c78efd153ddf93cb561237f61184f3696e327"; }; }; - "reduce-flatten-2.0.0" = { - name = "reduce-flatten"; - packageName = "reduce-flatten"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/reduce-flatten/-/reduce-flatten-2.0.0.tgz"; - sha512 = "EJ4UNY/U1t2P/2k6oqotuX2Cc3T6nxJwsM0N0asT7dhrtH1ltUxDn4NalSYmPE2rCkVpcf/X6R0wDwcFpzhd4w=="; - }; - }; "redux-3.7.2" = { name = "redux"; packageName = "redux"; @@ -45582,13 +47094,13 @@ let sha512 = "q4EyPZT3PcA3Eq7vPpT6bIdokXzFGp9i85igjmhRyXWmPs0Y6/d2FYwUNotKAWyLch7g0ASZJn/KHHcHZQ163A=="; }; }; - "remark-stringify-9.0.0" = { + "remark-stringify-9.0.1" = { name = "remark-stringify"; packageName = "remark-stringify"; - version = "9.0.0"; + version = "9.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/remark-stringify/-/remark-stringify-9.0.0.tgz"; - sha512 = "8x29DpTbVzEc6Dwb90qhxCtbZ6hmj3BxWWDpMhA+1WM4dOEGH5U5/GFe3Be5Hns5MvPSFAr1e2KSVtKZkK5nUw=="; + url = "https://registry.npmjs.org/remark-stringify/-/remark-stringify-9.0.1.tgz"; + sha512 = "mWmNg3ZtESvZS8fv5PTvaPckdL4iNlCHTt8/e/8oN08nArHRHjNZMKzA/YW3+p7/lYqIw4nx1XsjCBo/AxNChg=="; }; }; "remote-git-tags-3.0.0" = { @@ -45663,13 +47175,13 @@ let sha512 = "F5BMWDmgATEoyPCtKjmGNTGN1ghoZlfRQ3MJh8dS/MrvIUIxupiof/Y9uahChipXcqQ57twVbgMmyQmuO1vokw=="; }; }; - "renderkid-2.0.4" = { + "renderkid-2.0.5" = { name = "renderkid"; packageName = "renderkid"; - version = "2.0.4"; + version = "2.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/renderkid/-/renderkid-2.0.4.tgz"; - sha512 = "K2eXrSOJdq+HuKzlcjOlGoOarUu5SDguDEhE7+Ah4zuOWL40j8A/oHvLlLob9PSTNvVnBd+/q0Er1QfpEuem5g=="; + url = "https://registry.npmjs.org/renderkid/-/renderkid-2.0.5.tgz"; + sha512 = "ccqoLg+HLOHq1vdfYNm4TBeaCDIi1FLt3wGojTDSvdewUv65oTmI3cnT2E4hRjl1gzKZIPK+KZrXzlUYKnR+vQ=="; }; }; "repeat-element-1.1.3" = { @@ -45888,13 +47400,13 @@ let sha512 = "Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw=="; }; }; - "require-in-the-middle-5.0.3" = { + "require-in-the-middle-5.1.0" = { name = "require-in-the-middle"; packageName = "require-in-the-middle"; - version = "5.0.3"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/require-in-the-middle/-/require-in-the-middle-5.0.3.tgz"; - sha512 = "p/ICV8uMlqC4tjOYabLMxAWCIKa0YUQgZZ6KDM0xgXJNgdGQ1WmL2A07TwmrZw+wi6ITUFKzH5v3n+ENEyXVkA=="; + url = "https://registry.npmjs.org/require-in-the-middle/-/require-in-the-middle-5.1.0.tgz"; + sha512 = "M2rLKVupQfJ5lf9OvqFGIT+9iVLnTmjgbOmpil12hiSQNn5zJTKGPoIisETNjfK+09vP3rpm1zJajmErpr2sEQ=="; }; }; "require-main-filename-1.0.1" = { @@ -46302,6 +47814,15 @@ let sha1 = "6f697e50a0e4ddc8c8f7fb547a9b60dead43678d"; }; }; + "retry-request-4.1.3" = { + name = "retry-request"; + packageName = "retry-request"; + version = "4.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/retry-request/-/retry-request-4.1.3.tgz"; + sha512 = "QnRZUpuPNgX0+D1xVxul6DbJ9slvo4Rm6iV/dn63e048MvGbUZiKySVt6Tenp04JqmchxjiLltGerOJys7kJYQ=="; + }; + }; "reusify-1.0.4" = { name = "reusify"; packageName = "reusify"; @@ -46491,13 +48012,13 @@ let sha512 = "/2HA0Ec70TvQnXdzynFffkjA6XN+1e2pEv/uKS5Ulca40g2L7KuOE3riasHoNVHOsFD5KKZgDsMk1CP3Tw9s+A=="; }; }; - "rollup-2.34.1" = { + "rollup-2.36.0" = { name = "rollup"; packageName = "rollup"; - version = "2.34.1"; + version = "2.36.0"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.34.1.tgz"; - sha512 = "tGveB6NU5x4MS/iXaIsjfUkEv4hxzJJ4o0FRy5LO62Ndx3R2cmE1qsLYlSfRkvHUUPqWiFoxEm8pRftzh1a5HA=="; + url = "https://registry.npmjs.org/rollup/-/rollup-2.36.0.tgz"; + sha512 = "L38QyQK77bkJy9nPyeydnHFK6xMofqumh4scTV2d4RG4EFq6pGdxnn67dVHFUDJ9J0PSEQx8zn1FiVS5TydsKg=="; }; }; "rollup-plugin-babel-4.4.0" = { @@ -46599,6 +48120,15 @@ let sha1 = "6f04063a2d04eba3303a1bbc6765eef63037cf3d"; }; }; + "router-1.3.5" = { + name = "router"; + packageName = "router"; + version = "1.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/router/-/router-1.3.5.tgz"; + sha512 = "kozCJZUhuSJ5VcLhSb3F8fsmGXy+8HaDbKCAerR1G6tq3mnMZFMuSohbFvGv1c5oMFipijDjRZuuN/Sq5nMf3g=="; + }; + }; "router-ips-1.0.0" = { name = "router-ips"; packageName = "router-ips"; @@ -46608,6 +48138,15 @@ let sha1 = "44e00858ebebc0133d58e40b2cd8a1fbb04203f5"; }; }; + "rss-parser-3.10.0" = { + name = "rss-parser"; + packageName = "rss-parser"; + version = "3.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/rss-parser/-/rss-parser-3.10.0.tgz"; + sha512 = "TC6FNvEmdFeaW6r/60MSJT7cp4d95X4M9As+mvNtxRx7YXHxpV95syMnWZthZSeD1BRN7SEKdq6c3nxMLQRopw=="; + }; + }; "rss-parser-3.7.1" = { name = "rss-parser"; packageName = "rss-parser"; @@ -46617,15 +48156,6 @@ let sha512 = "1JKFzLHeteNandmlVBUWgLPmipFEllhdUQlmNvkXd6ju4VFOlGr0VmtlQaxzZoVysG2nbGb8eAtzNqQTxzQ+AQ=="; }; }; - "rss-parser-3.9.0" = { - name = "rss-parser"; - packageName = "rss-parser"; - version = "3.9.0"; - src = fetchurl { - url = "https://registry.npmjs.org/rss-parser/-/rss-parser-3.9.0.tgz"; - sha512 = "wlRSfGrotOXuWo19Dtl2KmQt7o9i5zzCExUrxpechE0O54BAx7JD+xhWyGumPPqiJj771ndflV3sE3bTHen0HQ=="; - }; - }; "rsvp-3.6.2" = { name = "rsvp"; packageName = "rsvp"; @@ -46878,15 +48408,6 @@ let sha512 = "rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="; }; }; - "safe-compare-1.1.4" = { - name = "safe-compare"; - packageName = "safe-compare"; - version = "1.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/safe-compare/-/safe-compare-1.1.4.tgz"; - sha512 = "b9wZ986HHCo/HbKrRpBJb2kqXMK9CEWIE1egeEvZsYn69ay3kdfl9nG3RyOcR+jInTDf7a86WQ1d4VJX7goSSQ=="; - }; - }; "safe-join-0.1.3" = { name = "safe-join"; packageName = "safe-join"; @@ -46959,13 +48480,13 @@ let sha512 = "y/52Mcy7aw3gRm7IrcGDFx/bCk4AhRh2eI9luHOQM86nZsqwiRkkq2GekHXBBD+SmPidc8i2PqtYZl+pWJ8Oeg=="; }; }; - "sass-1.30.0" = { + "sass-1.32.0" = { name = "sass"; packageName = "sass"; - version = "1.30.0"; + version = "1.32.0"; src = fetchurl { - url = "https://registry.npmjs.org/sass/-/sass-1.30.0.tgz"; - sha512 = "26EUhOXRLaUY7+mWuRFqGeGGNmhB1vblpTENO1Z7mAzzIZeVxZr9EZoaY1kyGLFWdSOZxRMAufiN2mkbO6dAlw=="; + url = "https://registry.npmjs.org/sass/-/sass-1.32.0.tgz"; + sha512 = "fhyqEbMIycQA4blrz/C0pYhv2o4x2y6FYYAH0CshBw3DXh5D5wyERgxw0ptdau1orc/GhNrhF7DFN2etyOCEng=="; }; }; "sax-0.5.8" = { @@ -47094,6 +48615,15 @@ let sha1 = "a346bb1acd4207ae70bd7c0c7ca9e566b6baddb8"; }; }; + "scoped-regex-2.1.0" = { + name = "scoped-regex"; + packageName = "scoped-regex"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/scoped-regex/-/scoped-regex-2.1.0.tgz"; + sha512 = "g3WxHrqSWCZHGHlSrF51VXFdjImhwvH8ZO/pryFH56Qi0cDsZfylQa/t0jCzVQFNbNvM00HfHjkDPEuarKDSWQ=="; + }; + }; "sec-1.0.0" = { name = "sec"; packageName = "sec"; @@ -47112,13 +48642,13 @@ let sha512 = "sDtmZDpibGH2ixj3FOmsC3Z/b08eaB2/KAvy2oSp4qvcGdhatBSfb1RdVpwjQl5c3J83WbBo1HSZ7DBtMu43lA=="; }; }; - "secret-stack-6.3.1" = { + "secret-stack-6.3.2" = { name = "secret-stack"; packageName = "secret-stack"; - version = "6.3.1"; + version = "6.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/secret-stack/-/secret-stack-6.3.1.tgz"; - sha512 = "SyYRGgjxq8lbQyqdIbaNfteZ77B3Bd2TH+k5WpI6gHjTCOKZZmD8aiat+bUfhjsiqf0LMQauRH3KD6vIMdDPLg=="; + url = "https://registry.npmjs.org/secret-stack/-/secret-stack-6.3.2.tgz"; + sha512 = "D46+4LWwsM1LnO4dg6FM/MfGmMk9uYsIcDElqyNeImBnyUueKi2xz10CHF9iSAtSUGReQDV4SCVUiVrPnaKnsA=="; }; }; "secure-compare-3.0.1" = { @@ -47481,13 +49011,13 @@ let sha512 = "lKX2tZ1rsA9Tu0gW8vRmMDmIEJoZ1d7cKpzcbFZdUrSpCR6gy/7OPPh7jjT/6Oc6Z79ToUmC2l8tyTEGanVmiA=="; }; }; - "separator-escape-0.0.0" = { + "separator-escape-0.0.1" = { name = "separator-escape"; packageName = "separator-escape"; - version = "0.0.0"; + version = "0.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/separator-escape/-/separator-escape-0.0.0.tgz"; - sha1 = "e433676932020454e3c14870c517ea1de56c2fa4"; + url = "https://registry.npmjs.org/separator-escape/-/separator-escape-0.0.1.tgz"; + sha512 = "daCzTzZVoowYzjW7x9xMH6zr+lt/zsGxV1rtXaoTnlues7ZDx6Qu0l5W3jCdgnXGE1ONAGL+XPWY+IRDxnJ9EQ=="; }; }; "seq-0.3.5" = { @@ -47607,13 +49137,13 @@ let sha1 = "f13bf928e42b9c3e79383e61cc3998b5d14e6cdd"; }; }; - "service-runner-2.8.0" = { + "service-runner-2.8.1" = { name = "service-runner"; packageName = "service-runner"; - version = "2.8.0"; + version = "2.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/service-runner/-/service-runner-2.8.0.tgz"; - sha512 = "U5hxzVsLFxZgd3hLecTgdhKNZfTsjcp0407ceICGdC5X2Qrz31pHsoMMSH1s+9/Fac+Y3NKpgd6vPvmJvl/bvw=="; + url = "https://registry.npmjs.org/service-runner/-/service-runner-2.8.1.tgz"; + sha512 = "YAJ9JPJ9w84iLj2VR5wUkiFvPKUp5vApOzDTEPZ97t5wmPN8LbyAKKKG4hyPuFlpCb00F0YGdfemi0A1dkpGPw=="; }; }; "set-blocking-1.0.0" = { @@ -47697,13 +49227,13 @@ let sha512 = "E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw=="; }; }; - "seventh-0.7.38" = { + "seventh-0.7.40" = { name = "seventh"; packageName = "seventh"; - version = "0.7.38"; + version = "0.7.40"; src = fetchurl { - url = "https://registry.npmjs.org/seventh/-/seventh-0.7.38.tgz"; - sha512 = "dYQGR+HQcuOtKytJ8/R4UFiPY3RIYLrniKRcqLjJCHOnccyJTpu52lBpPdyS6TpXNH13MJhtzh8GHUi/OmRUhw=="; + url = "https://registry.npmjs.org/seventh/-/seventh-0.7.40.tgz"; + sha512 = "7sxUydQx4iEh17uJUFjZDAwbffJirldZaNIJvVB/hk9mPEL3J4GpLGSL+mHFH2ydkye46DAsLGqzFJ+/Qj5foQ=="; }; }; "sha.js-2.4.11" = { @@ -47958,13 +49488,13 @@ let sha1 = "c27415a9e458f2fed39b27cf8eb37c003782b431"; }; }; - "side-channel-1.0.3" = { + "side-channel-1.0.4" = { name = "side-channel"; packageName = "side-channel"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/side-channel/-/side-channel-1.0.3.tgz"; - sha512 = "A6+ByhlLkksFoUepsGxfj5x1gTSrs+OydsRptUxeNCabQpCFUvcwIczgOigI8vhY/OJCnPnyE9rGiwgvr9cS1g=="; + url = "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz"; + sha512 = "q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw=="; }; }; "sift-7.0.1" = { @@ -48075,13 +49605,13 @@ let sha512 = "rohCHmEjD/ESXFLxF4bVeqgdb4Awc65ZyyuCKl3f7BvgMbZOBa/Ye3HN/GFnvruiUOAWWNupxhz3Rz5/3vJLTg=="; }; }; - "simple-git-2.24.0" = { + "simple-git-2.31.0" = { name = "simple-git"; packageName = "simple-git"; - version = "2.24.0"; + version = "2.31.0"; src = fetchurl { - url = "https://registry.npmjs.org/simple-git/-/simple-git-2.24.0.tgz"; - sha512 = "nF31Xai5lTYgRCiSJ1lHzK0Vk9jWOvAFW12bdBaWy2bhodio04eOWYurvyM/nTBYsPIiQl3PFvdod5TRcPvzww=="; + url = "https://registry.npmjs.org/simple-git/-/simple-git-2.31.0.tgz"; + sha512 = "/+rmE7dYZMbRAfEmn8EUIOwlM2G7UdzpkC60KF86YAfXGnmGtsPrKsym0hKvLBdFLLW019C+aZld1+6iIVy5xA=="; }; }; "simple-markdown-0.4.4" = { @@ -48489,13 +50019,13 @@ let sha512 = "NFwVLMCqKTocY66gcim0ukF6e31VRDJqDapg5sy3vCHqlD1OCNUXSK/aI4VQEEndDrsnFmQepsL5KpEU0dDRIQ=="; }; }; - "snyk-docker-plugin-4.12.0" = { + "snyk-docker-plugin-4.13.1" = { name = "snyk-docker-plugin"; packageName = "snyk-docker-plugin"; - version = "4.12.0"; + version = "4.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-4.12.0.tgz"; - sha512 = "iN5GUTpMR4dx/hmjxh1GnJ9vrMpbOUhD8gsdWgFPZ5Qg+ImPQ2WBJBal/hyfkauM0TaKQEAgIwT6xZ1ovaIvWQ=="; + url = "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-4.13.1.tgz"; + sha512 = "KS2G2cBdwKhyRta85uv3q/xUmFSC9lVCu8MUxgm7IDNn8ImjmCIkSp5SsI0qu5jYXJhZZnX6jjj5gzI0QP0WXw=="; }; }; "snyk-go-parser-1.4.1" = { @@ -48507,22 +50037,22 @@ let sha512 = "StU3uHB85VMEkcgXta63M0Fgd+9cs5sMCjQXTBoYTdE4dxarPn7U67yCuwkRRdZdny1ZXtzfY8LKns9i0+dy9w=="; }; }; - "snyk-go-plugin-1.16.2" = { + "snyk-go-plugin-1.16.4" = { name = "snyk-go-plugin"; packageName = "snyk-go-plugin"; - version = "1.16.2"; + version = "1.16.4"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-go-plugin/-/snyk-go-plugin-1.16.2.tgz"; - sha512 = "FAM56z3bl1iuxeqkCEA/jyZ2hpwkQK8xQxQbhR+QppEK5lole7w1PQyWYgZAJ9oRY/BU32zdRAJwGuZbhk7G2Q=="; + url = "https://registry.npmjs.org/snyk-go-plugin/-/snyk-go-plugin-1.16.4.tgz"; + sha512 = "7REUy5U6h2wCPIg9060V5bh24gichRHfuqWC22xrp/n+dVolQXvG5RN/PqdJiPsCj7Y9voyWLbYai+Tmk3o82Q=="; }; }; - "snyk-gradle-plugin-3.10.3" = { + "snyk-gradle-plugin-3.11.0" = { name = "snyk-gradle-plugin"; packageName = "snyk-gradle-plugin"; - version = "3.10.3"; + version = "3.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-3.10.3.tgz"; - sha512 = "aFAqQu0vvgndxQtXxNfLzL9wamOwyRceRkSb+BXVp6E+Tpz4awksyUTfV0Yc5WjR0+hYB2rtBYKHXaK+GHficg=="; + url = "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-3.11.0.tgz"; + sha512 = "OXf1A+kcif+vslm/nsel3bDYWsGwum2PsZLETM28nG4JOgqBLYLWvCHPgH9r2aa0MKTq0nBpimvFkzDm/+2qQQ=="; }; }; "snyk-module-1.9.1" = { @@ -48687,13 +50217,22 @@ let sha512 = "2A892lrj0GcgR/9Qk81EaY2gYhCBxurV0PfmmESO6p27QPrUK1J3zdns+5QPqvUYK2q657nSj0guoIil9+7eFg=="; }; }; - "socket.io-3.0.3" = { + "socket.io-2.4.0" = { name = "socket.io"; packageName = "socket.io"; - version = "3.0.3"; + version = "2.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/socket.io/-/socket.io-3.0.3.tgz"; - sha512 = "TC1GnSXhDVmd3bHji5aG7AgWB8UL7E6quACbKra8uFXBqlMwEDbrJFK+tjuIY5Pe9N0L+MAPPDv3pycnn0000A=="; + url = "https://registry.npmjs.org/socket.io/-/socket.io-2.4.0.tgz"; + sha512 = "9UPJ1UTvKayuQfVv2IQ3k7tCQC/fboDyIK62i99dAQIyHKaBsNdTpwHLgKJ6guRWxRtC9H+138UwpaGuQO9uWQ=="; + }; + }; + "socket.io-3.0.5" = { + name = "socket.io"; + packageName = "socket.io"; + version = "3.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/socket.io/-/socket.io-3.0.5.tgz"; + sha512 = "5yWQ43P/4IttmPCGKDQ3CVocBiJWGpibyhYJxgUhf69EHMzmK8XW0DkmHIoYdLmZaVZJyiEkUqpeC7rSCIqekw=="; }; }; "socket.io-adapter-0.2.0" = { @@ -48741,13 +50280,13 @@ let sha512 = "cEQQf24gET3rfhxZ2jJ5xzAOo/xhZwK+mOqtGRg5IowZsMgwvHwnf/mCRapAAkadhM26y+iydgwsXGObBB5ZdA=="; }; }; - "socket.io-client-2.3.1" = { + "socket.io-client-2.4.0" = { name = "socket.io-client"; packageName = "socket.io-client"; - version = "2.3.1"; + version = "2.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-2.3.1.tgz"; - sha512 = "YXmXn3pA8abPOY//JtYxou95Ihvzmg8U6kQyolArkIyLd0pgVhrfor/iMsox8cn07WCOOvvuJ6XKegzIucPutQ=="; + url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-2.4.0.tgz"; + sha512 = "M6xhnKQHuuZd4Ba9vltCLT9oa+YvTsP8j9NcEiLElfIg8KeYPyhWOes6x4t+LTAC8enQbE/995AdTem2uNyKKQ=="; }; }; "socket.io-parser-2.1.2" = { @@ -48786,13 +50325,13 @@ let sha512 = "11hMgzL+WCLWf1uFtHSNvliI++tcRUWdoeYuwIl+Axvwy9z2gQM+7nJyN3STj1tLj5JyIUH8/gpDGxzAlDdi0A=="; }; }; - "socket.io-parser-4.0.2" = { + "socket.io-parser-4.0.3" = { name = "socket.io-parser"; packageName = "socket.io-parser"; - version = "4.0.2"; + version = "4.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.0.2.tgz"; - sha512 = "Bs3IYHDivwf+bAAuW/8xwJgIiBNtlvnjYRc4PbXgniLmcP1BrakBoq/QhO24rgtgW7VZ7uAaswRGxutUnlAK7g=="; + url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.0.3.tgz"; + sha512 = "m4ybFiP4UYVORRt7jcdqf8UWx+ywVdAqqsJyruXxAdD3Sv6MDemijWij34mOWdMJ55bEdIb9jACBhxUgNK6sxw=="; }; }; "sockjs-0.3.20" = { @@ -48804,6 +50343,15 @@ let sha512 = "SpmVOVpdq0DJc0qArhF3E5xsxvaiqGNb73XfgBpK1y3UD5gs8DSo8aCTsuT5pX8rssdc2NDIzANwP9eCAiSdTA=="; }; }; + "sockjs-0.3.21" = { + name = "sockjs"; + packageName = "sockjs"; + version = "0.3.21"; + src = fetchurl { + url = "https://registry.npmjs.org/sockjs/-/sockjs-0.3.21.tgz"; + sha512 = "DhbPFGpxjc6Z3I+uX07Id5ZO2XwYsWOrYjaSeieES78cq+JaJvVe5q/m1uvjIQhXinhIeCFRH6JgXe+mvVMyXw=="; + }; + }; "sockjs-client-1.4.0" = { name = "sockjs-client"; packageName = "sockjs-client"; @@ -48813,6 +50361,15 @@ let sha512 = "5zaLyO8/nri5cua0VtOrFXBPK1jbL4+1cebT/mmKA1E1ZXOvJrII75bPu0l0k843G/+iAbhEqzyKr0w/eCCj7g=="; }; }; + "sockjs-client-1.5.0" = { + name = "sockjs-client"; + packageName = "sockjs-client"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.5.0.tgz"; + sha512 = "8Dt3BDi4FYNrCFGTL/HtwVzkARrENdwOUf1ZoW/9p3M8lZdFT35jVdrHza+qgxuG9H3/shR4cuX/X9umUrjP8Q=="; + }; + }; "socks-2.3.3" = { name = "socks"; packageName = "socks"; @@ -48966,6 +50523,15 @@ let sha1 = "8ae90ad7d7cb05fc59f1ab0c637845d5c15a52b7"; }; }; + "sort-json-2.0.0" = { + name = "sort-json"; + packageName = "sort-json"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/sort-json/-/sort-json-2.0.0.tgz"; + sha512 = "OgXPErPJM/rBK5OhzIJ+etib/BmLQ1JY55Nb/ElhoWUec62pXNF/X6DrecHq3NW5OAGX0KxYD7m0HtgB9dvGeA=="; + }; + }; "sort-keys-1.1.2" = { name = "sort-keys"; packageName = "sort-keys"; @@ -49254,6 +50820,15 @@ let sha512 = "U+MTEOO0AiDzxwFvoa4JVnMV6mZlJKk2sBLt90s7G0Gd0Mlknc7kxEn3nuDPNZRta7O2uy8oLcZLVT+4sqNZHQ=="; }; }; + "spdx-license-list-6.3.0" = { + name = "spdx-license-list"; + packageName = "spdx-license-list"; + version = "6.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/spdx-license-list/-/spdx-license-list-6.3.0.tgz"; + sha512 = "Qz8ru5VVK5T4cFOBrshIzggzrQ15fVBcpjpZLCVz2j9KNnpslGbw8w1r06v2vi6YP6bnUSY5CXsFCfUypLZ2GA=="; + }; + }; "spdy-1.32.5" = { name = "spdy"; packageName = "spdy"; @@ -49497,15 +51072,6 @@ let sha512 = "/0d2YTn8ZFVpIPAU230S9ZLF8WDkSSRWvh/UOLM7zzvkCchum1TtouRgyV8OfgOaYilSGU4lSSqzwBXJVlAwUw=="; }; }; - "sqlite3-4.2.0" = { - name = "sqlite3"; - packageName = "sqlite3"; - version = "4.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/sqlite3/-/sqlite3-4.2.0.tgz"; - sha512 = "roEOz41hxui2Q7uYnWsjMOTry6TcNUNmp8audCx18gF10P2NknwdpF+E+HKvz/F2NvPKGGBF4NGc+ZPQ+AABwg=="; - }; - }; "sqlite3-5.0.0" = { name = "sqlite3"; packageName = "sqlite3"; @@ -49812,13 +51378,13 @@ let sha512 = "/QX6+DJkghqq1ZTbgYpOvaI+gx2O7ee1TRUM9yiOlVjh1XAQBevcBj0zO+W3TsNllX86urqBrySd/AEfFfUpIw=="; }; }; - "ssb-ref-2.14.2" = { + "ssb-ref-2.14.3" = { name = "ssb-ref"; packageName = "ssb-ref"; - version = "2.14.2"; + version = "2.14.3"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-ref/-/ssb-ref-2.14.2.tgz"; - sha512 = "pPkwNX/Rrr0bV/8d8dC/f+T/LcKA9ZF1SGHrUuVpoqo8iE3gLMu0Zz5TRoUReXKW6+ehNzUzIjcpYTw+wWeZkA=="; + url = "https://registry.npmjs.org/ssb-ref/-/ssb-ref-2.14.3.tgz"; + sha512 = "XhzVmezsUJLlKxTfWlicxhiPRTEYHfJLskYQNRSnw4USqgo9LVx53+MJAhdZOYpZTW2jINR0TeetWs9M27gcbA=="; }; }; "ssb-replicate-1.3.2" = { @@ -49857,6 +51423,24 @@ let sha512 = "zZ/Q1M+9ZWlrchgh4QauD/MEUFa6eC6H6FYq6T8Of/y82JqsQBLwN6YlzbO09evE7Rx6x0oliXDCnQSjwGwQRA=="; }; }; + "sscaff-1.2.0" = { + name = "sscaff"; + packageName = "sscaff"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/sscaff/-/sscaff-1.2.0.tgz"; + sha512 = "Xyf2tWLnO0Z297FKag0e8IXFIpnYRWZ3FBn4dN2qlMRsOcpf0P54FPhvdcb1Es0Fm4hbhYYXa23jR+VPGPQhSg=="; + }; + }; + "sse-z-0.3.0" = { + name = "sse-z"; + packageName = "sse-z"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/sse-z/-/sse-z-0.3.0.tgz"; + sha512 = "jfcXynl9oAOS9YJ7iqS2JMUEHOlvrRAD+54CENiWnc4xsuVLQVSgmwf7cwOTcBd/uq3XkQKBGojgvEtVXcJ/8w=="; + }; + }; "ssh-config-1.1.6" = { name = "ssh-config"; packageName = "ssh-config"; @@ -50244,6 +51828,15 @@ let sha1 = "91d5f5130d1cef96dcfa7f726945188741d09ee4"; }; }; + "stream-chain-2.2.4" = { + name = "stream-chain"; + packageName = "stream-chain"; + version = "2.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-chain/-/stream-chain-2.2.4.tgz"; + sha512 = "9lsl3YM53V5N/I1C2uJtc3Kavyi3kNYN83VkKb/bMWRk7D9imiFyUPYa0PoZbLohSVOX1mYE9YsmwObZUsth6Q=="; + }; + }; "stream-collector-1.0.1" = { name = "stream-collector"; packageName = "stream-collector"; @@ -50325,6 +51918,15 @@ let sha512 = "S7OqaYu0EkFpgeGFb/NPOoPLxFko7TPqtEeFg5DXPB4v/KETHG0Ln6fRFrNezoelpaDKmycEmmZ81cC9DAwgYg=="; }; }; + "stream-json-1.1.3" = { + name = "stream-json"; + packageName = "stream-json"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-json/-/stream-json-1.1.3.tgz"; + sha512 = "y+ChhCov2A5nDqC2aZ6HKXs3OvDlvAp0Ps3BF1P/Iv8tUZJQQsMVaSzk0WryVTVoGITKv01UYahCXMpAs7I0lQ=="; + }; + }; "stream-parser-0.3.1" = { name = "stream-parser"; packageName = "stream-parser"; @@ -50640,6 +52242,24 @@ let sha512 = "zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg=="; }; }; + "string.prototype.matchall-4.0.3" = { + name = "string.prototype.matchall"; + packageName = "string.prototype.matchall"; + version = "4.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.3.tgz"; + sha512 = "OBxYDA2ifZQ2e13cP82dWFMaCV9CGF8GzmN4fljBVw5O5wep0lu4gacm1OL6MjROoUnB8VbkWRThqkV2YFLNxw=="; + }; + }; + "string.prototype.repeat-0.2.0" = { + name = "string.prototype.repeat"; + packageName = "string.prototype.repeat"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/string.prototype.repeat/-/string.prototype.repeat-0.2.0.tgz"; + sha1 = "aba36de08dcee6a5a337d49b2ea1da1b28fc0ecf"; + }; + }; "string.prototype.trim-1.2.3" = { name = "string.prototype.trim"; packageName = "string.prototype.trim"; @@ -50685,6 +52305,15 @@ let sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94"; }; }; + "string_decoder-1.0.3" = { + name = "string_decoder"; + packageName = "string_decoder"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz"; + sha512 = "4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ=="; + }; + }; "string_decoder-1.1.1" = { name = "string_decoder"; packageName = "string_decoder"; @@ -51054,13 +52683,13 @@ let sha1 = "0fdedc68e91addcfcb2e6be9c262581a6e8c28aa"; }; }; - "strtok3-6.0.4" = { + "strtok3-6.0.6" = { name = "strtok3"; packageName = "strtok3"; - version = "6.0.4"; + version = "6.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/strtok3/-/strtok3-6.0.4.tgz"; - sha512 = "rqWMKwsbN9APU47bQTMEYTPcwdpKDtmf1jVhHzNW2cL1WqAxaM9iBb9t5P2fj+RV2YsErUWgQzHD5JwV0uCTEQ=="; + url = "https://registry.npmjs.org/strtok3/-/strtok3-6.0.6.tgz"; + sha512 = "fVxvAEKDwHFfbQO1yKxKBPfkWZyBr0Zf20UQ/mblbkAQe5h0Xdd2jDb3Mh7yRZd7LSItJ9JWgQWelpEmVoBe2g=="; }; }; "structured-source-3.0.2" = { @@ -51279,6 +52908,15 @@ let sha512 = "DnarpKN6Xn8e3pYlFV4Yvsj9yxLY4q5FIsUe5JvN7vjzP+YCfzXv03dTkZSD2yzrSadsNYHf0IgOUJwKjX457A=="; }; }; + "superstatic-7.1.0" = { + name = "superstatic"; + packageName = "superstatic"; + version = "7.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/superstatic/-/superstatic-7.1.0.tgz"; + sha512 = "yBU8iw07nM3Bu4jFc8lnKwLey0cj61OaGmFJZcYC2X+kEpXVmXzERJ3OTAHZAESe1OTeNIuWadt81U5IULGGAA=="; + }; + }; "supports-color-0.2.0" = { name = "supports-color"; packageName = "supports-color"; @@ -51504,13 +53142,13 @@ let sha512 = "xk5CMbwoQVI53rTq9o/iMojAqXP5NT4/+TMeTP4uXWDIH18pB9AXgO5Olqt0RXuf3jH032DA4DS4qzem6XdXAw=="; }; }; - "swagger-ui-dist-3.37.2" = { + "swagger-ui-dist-3.38.0" = { name = "swagger-ui-dist"; packageName = "swagger-ui-dist"; - version = "3.37.2"; + version = "3.38.0"; src = fetchurl { - url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-3.37.2.tgz"; - sha512 = "XIT4asxgeL4GUNPPsqpEqLt20M/u6OhFYqTh42IoEAvAyv5e9EGw5uhP9dLAD10opcMYqdkJ5qU+MpN2HZ5xyA=="; + url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-3.38.0.tgz"; + sha512 = "sselV8VY6f1BBauY9Sdmwz0jVaWTnGuHQWei7BaTpiUrLcoEUdmmK5bKefLXiwq+dx//es2S8mOvUS+tcXDsKg=="; }; }; "swagger2openapi-6.2.3" = { @@ -51594,6 +53232,15 @@ let sha512 = "sQV7phh2WCYAn81oAkakC5qjq2Ml0g8ozqz03wOGnx9dDlG1de6yrF+0RAzSJD8fPUow3PTSMf2SAbOGxb93BA=="; }; }; + "symbol-observable-3.0.0" = { + name = "symbol-observable"; + packageName = "symbol-observable"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/symbol-observable/-/symbol-observable-3.0.0.tgz"; + sha512 = "6tDOXSHiVjuCaasQSWTmHUWn4PuG7qa3+1WT031yTc/swT7+rLiw3GOrFxaH1E3lLP09dH3bVuVDf2gK5rxG3Q=="; + }; + }; "symbol-tree-3.2.4" = { name = "symbol-tree"; packageName = "symbol-tree"; @@ -51621,22 +53268,13 @@ let sha512 = "YPPlu67mdnHGTup2A8ff7BC2Pjq0e0Yp/IyTFN03zWO0RcK07uLcbi7C2KpGR2FvWbaB0+bfE27a+sBKebSo7w=="; }; }; - "systeminformation-4.30.11" = { + "systeminformation-4.34.2" = { name = "systeminformation"; packageName = "systeminformation"; - version = "4.30.11"; + version = "4.34.2"; src = fetchurl { - url = "https://registry.npmjs.org/systeminformation/-/systeminformation-4.30.11.tgz"; - sha512 = "dR2OJMvyBeF+VZ36851O7oQEUFdNtux3xFI+xAFbWg5J/mh5lQOBiceHTkYOyvGf++mMIKgpeAmYnKy+cyWIdw=="; - }; - }; - "syswide-cas-5.3.0" = { - name = "syswide-cas"; - packageName = "syswide-cas"; - version = "5.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/syswide-cas/-/syswide-cas-5.3.0.tgz"; - sha512 = "+RLgS6VInsX8rBpL+gy5qpa7phngecbK7NABelBZpqYpBTwOIK1y7CqHlXK5Vy/rA4erD9q/FyKzMjx2uX3zYg=="; + url = "https://registry.npmjs.org/systeminformation/-/systeminformation-4.34.2.tgz"; + sha512 = "1LynQMla38gIjzyupKBnBLIo4B0TQf3vdhs2bjKPtN02EymuSWpoAM1KX/6+gtFLVmn91MfllE3wSVGQcVTHDw=="; }; }; "table-3.8.3" = { @@ -51675,13 +53313,13 @@ let sha512 = "wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug=="; }; }; - "table-6.0.4" = { + "table-6.0.7" = { name = "table"; packageName = "table"; - version = "6.0.4"; + version = "6.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/table/-/table-6.0.4.tgz"; - sha512 = "sBT4xRLdALd+NFBvwOz8bw4b15htyythha+q+DVZqy2RS08PPC8O2sZFgJYEY7bJvbCFKccs+WIZ/cd+xxTWCw=="; + url = "https://registry.npmjs.org/table/-/table-6.0.7.tgz"; + sha512 = "rxZevLGTUzWna/qBLObOe16kB2RTnnbhciwgPbMMlazz1yZGVEgnZK762xyVdVznhqxrfCeBMmMkgOOaPwjH7g=="; }; }; "table-layout-0.4.5" = { @@ -51693,15 +53331,6 @@ let sha512 = "zTvf0mcggrGeTe/2jJ6ECkJHAQPIYEwDoqsiqBjI24mvRmQbInK5jq33fyypaCBxX08hMkfmdOqj6haT33EqWw=="; }; }; - "table-layout-1.0.1" = { - name = "table-layout"; - packageName = "table-layout"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/table-layout/-/table-layout-1.0.1.tgz"; - sha512 = "dEquqYNJiGwY7iPfZ3wbXDI944iqanTSchrACLL2nOB+1r+h1Nzu2eH+DuPPvWvm5Ry7iAPeFlgEtP5bIp5U7Q=="; - }; - }; "tabtab-1.3.2" = { name = "tabtab"; packageName = "tabtab"; @@ -51748,13 +53377,13 @@ let sha1 = "7cbcb64b5a141b6a2efc2c5d2c67b4e150b2a268"; }; }; - "tail-2.0.4" = { + "tail-2.1.1" = { name = "tail"; packageName = "tail"; - version = "2.0.4"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/tail/-/tail-2.0.4.tgz"; - sha512 = "xHkZdNWIzO++g+V/rHGqVoHd2LRxz+8t8bj6FGelfb8FHBjg5yjkX7Su/8sQSBo5alIspYkRp/fU0A2SM5h+5A=="; + url = "https://registry.npmjs.org/tail/-/tail-2.1.1.tgz"; + sha512 = "TBGFzKYD5Af/ts7DBypAQNmPQlt5Uq0bqcf4eRwnfvQcLnSTqruA8h3ps7CKIEPcwX7z9YnP3B6bBHLWYN7+ag=="; }; }; "taketalk-1.0.0" = { @@ -51892,13 +53521,13 @@ let sha512 = "rzS0heiNf8Xn7/mpdSVVSMAWAoy9bfb1WOTYC78Z0UQKeKa/CWS8FOq0lKGNa8DWKAn9gxjCvMLYc5PGXYlK2A=="; }; }; - "tar-stream-2.1.4" = { + "tar-stream-2.2.0" = { name = "tar-stream"; packageName = "tar-stream"; - version = "2.1.4"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/tar-stream/-/tar-stream-2.1.4.tgz"; - sha512 = "o3pS2zlG4gxr67GmFYBLlq+dM8gyRGUOvsrHclSkvtVtQbjV0s/+ZE8OpICbaj8clrX3tjeHngYGP7rweaBnuw=="; + url = "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz"; + sha512 = "ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ=="; }; }; "taskkill-3.1.0" = { @@ -51928,6 +53557,15 @@ let sha1 = "9450e8768c83b416fd4d1a6a9449eeccbf496c29"; }; }; + "tcp-port-used-1.0.2" = { + name = "tcp-port-used"; + packageName = "tcp-port-used"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/tcp-port-used/-/tcp-port-used-1.0.2.tgz"; + sha512 = "l7ar8lLUD3XS1V2lfoJlCBaeoaWo/2xfYt81hM7VlvR4RrMVFqfmzfhLVk40hAb368uitje5gPtBRL1m/DGvLA=="; + }; + }; "tdigest-0.1.1" = { name = "tdigest"; packageName = "tdigest"; @@ -52090,13 +53728,13 @@ let sha512 = "wK0Ri4fOGjv/XPy8SBHZChl8CM7uMc5VML7SqiQ0zG7+J5Vr+RMQDoHa2CNT6KHUnTGIXH34UDMkPzAUyapBZg=="; }; }; - "terminal-kit-1.44.0" = { + "terminal-kit-1.44.3" = { name = "terminal-kit"; packageName = "terminal-kit"; - version = "1.44.0"; + version = "1.44.3"; src = fetchurl { - url = "https://registry.npmjs.org/terminal-kit/-/terminal-kit-1.44.0.tgz"; - sha512 = "f9RLSA1a1ahx/40NwQ1FoGWz/el7no9RiGX4wMUirmqxJZjwZ09pMZWFWzlHb1yIfk9SnfRD9esGfofu5fF35A=="; + url = "https://registry.npmjs.org/terminal-kit/-/terminal-kit-1.44.3.tgz"; + sha512 = "G7V7l2pqJqa5llfn/ORDgKlUMGG27n1nxuxwWmZ4/1hCURz+yldKrknirIeu/kyK5M3UdtgPJ0wGAAXw+0aVfw=="; }; }; "terminal-link-2.1.1" = { @@ -52180,6 +53818,15 @@ let sha512 = "cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w=="; }; }; + "test-value-2.1.0" = { + name = "test-value"; + packageName = "test-value"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/test-value/-/test-value-2.1.0.tgz"; + sha1 = "11da6ff670f3471a73b625ca4f3fdcf7bb748291"; + }; + }; "text-extensions-1.9.0" = { name = "text-extensions"; packageName = "text-extensions"; @@ -52369,6 +54016,15 @@ let sha1 = "f41a1c31df5e129e4314446f66eca05cd6a30480"; }; }; + "through2-2.0.1" = { + name = "through2"; + packageName = "through2"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/through2/-/through2-2.0.1.tgz"; + sha1 = "384e75314d49f32de12eebb8136b8eb6b5d59da9"; + }; + }; "through2-2.0.5" = { name = "through2"; packageName = "through2"; @@ -53125,6 +54781,15 @@ let sha512 = "6Di70O1dWm45SJ5xrGzlE805z3gYn4ZUmNKomIrI4OojzRA4zyQzJ/4lAxQbJlq0ihG/mUE2xbP4q85Q68ig2g=="; }; }; + "toxic-1.0.1" = { + name = "toxic"; + packageName = "toxic"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/toxic/-/toxic-1.0.1.tgz"; + sha512 = "WI3rIGdcaKULYg7KVoB0zcjikqvcYYvcuT6D89bFPz2rVR0Rl0PK6x8/X62rtdLtBKIE985NzVf/auTtGegIIg=="; + }; + }; "tr46-0.0.3" = { name = "tr46"; packageName = "tr46"; @@ -53521,13 +55186,13 @@ let sha512 = "g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA=="; }; }; - "tsutils-3.17.1" = { + "tsutils-3.18.0" = { name = "tsutils"; packageName = "tsutils"; - version = "3.17.1"; + version = "3.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/tsutils/-/tsutils-3.17.1.tgz"; - sha512 = "kzeQ5B8H3w60nFY2g8cJIuH7JDpsALXySGtwGJ0p2LSjLgay3NdIpqq5SoOBe46bKDW2iq25irHCr8wjomUS2g=="; + url = "https://registry.npmjs.org/tsutils/-/tsutils-3.18.0.tgz"; + sha512 = "D9Tu8nE3E7D1Bsf/V29oMHceMf+gnVO+pDguk/A5YRo1cLpkiQ48ZnbbS57pvvHeY+OIeNQx1vf4ASPlEtRpcA=="; }; }; "ttf2woff-2.0.2" = { @@ -53674,6 +55339,15 @@ let sha1 = "b75bc2df15649bb84e8b9aa3c0669c6c4bce0d25"; }; }; + "tweetsodium-0.0.5" = { + name = "tweetsodium"; + packageName = "tweetsodium"; + version = "0.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/tweetsodium/-/tweetsodium-0.0.5.tgz"; + sha512 = "T3aXZtx7KqQbutTtBfn+P5By3HdBuB1eCoGviIrRJV2sXeToxv2X2cv5RvYqgG26PSnN5m3fYixds22Gkfd11w=="; + }; + }; "twig-1.15.4" = { name = "twig"; packageName = "twig"; @@ -53746,6 +55420,15 @@ let sha512 = "0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g=="; }; }; + "type-fest-0.10.0" = { + name = "type-fest"; + packageName = "type-fest"; + version = "0.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/type-fest/-/type-fest-0.10.0.tgz"; + sha512 = "EUV9jo4sffrwlg8s0zDhP0T2WD3pru5Xi0+HTE3zTUmBaZNhfkite9PdSJwdXLwPVW0jnAHT56pZHIOYckPEiw=="; + }; + }; "type-fest-0.11.0" = { name = "type-fest"; packageName = "type-fest"; @@ -53800,6 +55483,15 @@ let sha512 = "OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw=="; }; }; + "type-fest-0.20.2" = { + name = "type-fest"; + packageName = "type-fest"; + version = "0.20.2"; + src = fetchurl { + url = "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz"; + sha512 = "Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ=="; + }; + }; "type-fest-0.3.1" = { name = "type-fest"; packageName = "type-fest"; @@ -53809,6 +55501,15 @@ let sha512 = "cUGJnCdr4STbePCgqNFbpVNCepa+kAVohJs1sLhxzdH+gnEoOd8VhbYa7pD3zZYGiURWM2xzEII3fQcRizDkYQ=="; }; }; + "type-fest-0.4.1" = { + name = "type-fest"; + packageName = "type-fest"; + version = "0.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/type-fest/-/type-fest-0.4.1.tgz"; + sha512 = "IwzA/LSfD2vC1/YDYMv/zHP4rDF1usCwllsDpbolT3D4fUepIO7f9K70jjmUewU/LmGUKJcwcVtDCpnKk4BPMw=="; + }; + }; "type-fest-0.5.2" = { name = "type-fest"; packageName = "type-fest"; @@ -53908,6 +55609,15 @@ let sha512 = "kk80vLW9iGtjMnIv11qyxLqZm20UklzuR2tL0QAnDIygIUIemcZMxlMWudl9OOt76H3ntVzcTiddQ1/pAAJMYg=="; }; }; + "typescript-3.2.4" = { + name = "typescript"; + packageName = "typescript"; + version = "3.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/typescript/-/typescript-3.2.4.tgz"; + sha512 = "0RNDbSdEokBeEAkgNbxJ+BLwSManFy9TeXz8uW+48j/xhEXv1ePME60olyzw2XzUqUBNAYFeJadIqAgNqIACwg=="; + }; + }; "typescript-3.9.7" = { name = "typescript"; packageName = "typescript"; @@ -53935,13 +55645,13 @@ let sha512 = "ywmr/VrTVCmNTJ6iV2LwIrfG1P+lv6luD8sUJs+2eI9NLGigaN+nUQc13iHqisq7bra9lnmUSYqbJvegraBOPQ=="; }; }; - "typescript-4.1.2" = { + "typescript-4.1.3" = { name = "typescript"; packageName = "typescript"; - version = "4.1.2"; + version = "4.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-4.1.2.tgz"; - sha512 = "thGloWsGH3SOxv1SoY7QojKi0tc+8FnOmiarEGMbd/lar7QOEd3hvlx3Fp5y6FlDUGl9L+pd4n2e+oToGMmhRQ=="; + url = "https://registry.npmjs.org/typescript/-/typescript-4.1.3.tgz"; + sha512 = "B3ZIOf1IKeH2ixgHhj6la6xdwR9QrLC5d1VKeCSY4tvkqhF2eqd9O7txNlS0PO3GrBAFIdr3L1ndNwteUbZLYg=="; }; }; "typescript-eslint-parser-16.0.1" = { @@ -53989,15 +55699,6 @@ let sha1 = "5c080e5d661cbbe38259d2e70a3c7253e873881d"; }; }; - "typical-5.2.0" = { - name = "typical"; - packageName = "typical"; - version = "5.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/typical/-/typical-5.2.0.tgz"; - sha512 = "dvdQgNDNJo+8B2uBQoqdb11eUCE1JQXhvjC/CZtgvZseVd5TYMXnq0+vuUemXbd/Se29cTaUuPX3YIc2xgbvIg=="; - }; - }; "typo-geom-0.11.0" = { name = "typo-geom"; packageName = "typo-geom"; @@ -54052,13 +55753,13 @@ let sha512 = "oASI1FOJ7BBFkSCNDZ446EgkSuHkOZBuqRFrwXIKWCoXw8ZXQETooTQjkAcBS03Acab7ubCKsXnwuV2svy061g=="; }; }; - "uglify-js-3.12.1" = { + "uglify-js-3.12.4" = { name = "uglify-js"; packageName = "uglify-js"; - version = "3.12.1"; + version = "3.12.4"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.12.1.tgz"; - sha512 = "o8lHP20KjIiQe5b/67Rh68xEGRrc2SRsCuuoYclXXoC74AfSRGblU1HKzJWH3HxPZ+Ort85fWHpSX7KwBUC9CQ=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.12.4.tgz"; + sha512 = "L5i5jg/SHkEqzN18gQMTWsZk3KelRsfD1wUVNqtq0kzqWQqcJjyL8yc1o8hJgRrWqrAl2mUFbhfznEIoi7zi2A=="; }; }; "uglify-js-3.4.10" = { @@ -54439,13 +56140,13 @@ let sha512 = "vx2Z0vY+a3YoTj8+pttM3tiJHCwY5UFbYdiWrwBEbHmK8pvsPj2rtAX2BFfgXen8T39CJWblWRDT4L5WGXtDdg=="; }; }; - "unified-diff-3.0.1" = { + "unified-diff-3.1.0" = { name = "unified-diff"; packageName = "unified-diff"; - version = "3.0.1"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/unified-diff/-/unified-diff-3.0.1.tgz"; - sha512 = "oDngdkrYYNRUYi19GqyvWNZmOGGsdu1GEOKYy+6iXGphvaoDDidVj3frOC7SumQ2SCWixaHELiXQe7fwcLrMAA=="; + url = "https://registry.npmjs.org/unified-diff/-/unified-diff-3.1.0.tgz"; + sha512 = "d29qhcADmrvjgSYDLDUmmE/zvVyKUW+O3gRz6Bjj7fcv8kGBlrYBmMjnuBI+wuTou/PXaVl3hPeSh9mXZ0iGSA=="; }; }; "unified-engine-6.0.1" = { @@ -54466,13 +56167,13 @@ let sha512 = "vLUezxCnjzz+ya4pYouRQVMT8k82Rk4fIj406UidRnSFJdGXFaQyQklAnalsQHJrLqAlaYPkXPUa1upfVSHGCA=="; }; }; - "unified-message-control-3.0.1" = { + "unified-message-control-3.0.2" = { name = "unified-message-control"; packageName = "unified-message-control"; - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/unified-message-control/-/unified-message-control-3.0.1.tgz"; - sha512 = "K2Kvvp1DBzeuxYLLsumZh/gDWUTl4e2z/P3VReFirC78cfHKtQifbhnfRrSBtKtd1Uc6cvYTW0/SZIUaMAEcTg=="; + url = "https://registry.npmjs.org/unified-message-control/-/unified-message-control-3.0.2.tgz"; + sha512 = "lhF8fKjDo2cIPx1re5X1QinqUonl+AN6F0XfEaab8w/hjqX7FZAhzu4P8g6pmYp09ld+HSWFwdRJj+Y8xD0q7Q=="; }; }; "union-0.5.0" = { @@ -54997,15 +56698,6 @@ let sha512 = "aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg=="; }; }; - "upath-2.0.0" = { - name = "upath"; - packageName = "upath"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/upath/-/upath-2.0.0.tgz"; - sha512 = "ghi1XxsVYPOZPDsOZrfOJIwQU5I3JVYB3Q6IbBGn1KFeOa89i0nUy5tCEkY9pVm83U83qZ1QG40RQKGknllV4w=="; - }; - }; "upath-2.0.1" = { name = "upath"; packageName = "upath"; @@ -55159,13 +56851,13 @@ let sha512 = "B0yRTzYdUCCn9n+F4+Gh4yIDtMQcaJsmYBDsTSG8g/OejKBodLQ2IHfN3bM7jUsRXndopT7OIXWdYqc1fjmV6g=="; }; }; - "urijs-1.19.2" = { + "urijs-1.19.5" = { name = "urijs"; packageName = "urijs"; - version = "1.19.2"; + version = "1.19.5"; src = fetchurl { - url = "https://registry.npmjs.org/urijs/-/urijs-1.19.2.tgz"; - sha512 = "s/UIq9ap4JPZ7H1EB5ULo/aOUbWqfDi7FKzMC2Nz+0Si8GiT1rIEaprt8hy3Vy2Ex2aJPpOQv4P4DuOZ+K1c6w=="; + url = "https://registry.npmjs.org/urijs/-/urijs-1.19.5.tgz"; + sha512 = "48z9VGWwdCV5KfizHsE05DWS5fhK6gFlx5MjO7xu0Krc5FGPWzjlXEVV0nPMrdVuP7xmMHiPZ2HoYZwKOFTZOg=="; }; }; "urix-0.1.0" = { @@ -55385,13 +57077,13 @@ let sha1 = "8bb871a4741e085c70487ca7acdbd7d6d36029eb"; }; }; - "utf-8-validate-5.0.3" = { + "utf-8-validate-5.0.4" = { name = "utf-8-validate"; packageName = "utf-8-validate"; - version = "5.0.3"; + version = "5.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/utf-8-validate/-/utf-8-validate-5.0.3.tgz"; - sha512 = "jtJM6fpGv8C1SoH4PtG22pGto6x+Y8uPprW0tw3//gGFhDDTiuksgradgFN6yRayDP4SyZZa6ZMGHLIa17+M8A=="; + url = "https://registry.npmjs.org/utf-8-validate/-/utf-8-validate-5.0.4.tgz"; + sha512 = "MEF05cPSq3AwJ2C7B7sHAA6i53vONoZbMGX8My5auEVm6W+dJ2Jd/TZPyGJ5CH42V2XtbI5FD28HeHeqlPzZ3Q=="; }; }; "utf7-1.0.2" = { @@ -55646,6 +57338,15 @@ let sha512 = "FOmRr+FmWEIG8uhZv6C2bTgEVXsHk08kE7mPlrBbEe+c3r9pjceVPgupIfNIhc4yx55H69OXANrUaSuu9eInKg=="; }; }; + "uuid-8.3.2" = { + name = "uuid"; + packageName = "uuid"; + version = "8.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz"; + sha512 = "+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg=="; + }; + }; "v8-compile-cache-2.2.0" = { name = "v8-compile-cache"; packageName = "v8-compile-cache"; @@ -55691,6 +57392,15 @@ let sha512 = "mH8etigqMfiGWdeXpaaqGfs6BndypxusHHcv2qSHyZkGEznCd/qAXCWWRzeowtL54147cktFOC4P5y+kl8d8Jg=="; }; }; + "vali-date-1.0.0" = { + name = "vali-date"; + packageName = "vali-date"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vali-date/-/vali-date-1.0.0.tgz"; + sha1 = "1b904a59609fb328ef078138420934f6b86709a6"; + }; + }; "valid-identifier-0.0.2" = { name = "valid-identifier"; packageName = "valid-identifier"; @@ -55889,13 +57599,13 @@ let sha1 = "cfde751860a15822db3b132bc59b116a4adaf01b"; }; }; - "vega-5.17.0" = { + "vega-5.17.3" = { name = "vega"; packageName = "vega"; - version = "5.17.0"; + version = "5.17.3"; src = fetchurl { - url = "https://registry.npmjs.org/vega/-/vega-5.17.0.tgz"; - sha512 = "2Rm9aS3cSMXE55YgjfkuOmvSBMtiM/85/qX/WHLc+YiJacKGiwY9yzeC+w2Ft50JUs3nKZc1KB90ePgf5mfo0Q=="; + url = "https://registry.npmjs.org/vega/-/vega-5.17.3.tgz"; + sha512 = "c8N2pNg9MMmC6shNpoxVw3aVp2XPFOgmWNX5BEOAdCaGHRnSgzNy44+gYdGRaIe6+ljTzZg99Mf+OLO50IP42A=="; }; }; "vega-canvas-1.2.6" = { @@ -55943,13 +57653,22 @@ let sha512 = "UwCu50Sqd8kNZ1X/XgiAY+QAyQUmGFAwyDu7y0T5fs6/TPQnDo/Bo346NgSgINBEhEKOAMY1Nd/rPOk4UEm/ew=="; }; }; - "vega-expression-3.0.0" = { + "vega-expression-3.0.1" = { name = "vega-expression"; packageName = "vega-expression"; - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/vega-expression/-/vega-expression-3.0.0.tgz"; - sha512 = "/ObjIOK94MB+ziTuh8HZt2eWlKUPT/piRJLal5tx5QL1sQbfRi++7lHKTaKMLXLqc4Xqp9/DewE3PqQ6tYzaUA=="; + url = "https://registry.npmjs.org/vega-expression/-/vega-expression-3.0.1.tgz"; + sha512 = "+UwOFEkBnAWo8Zud6i8O4Pd2W6QqmPUOaAhjNtj0OxRL+d+Duoy7M4edUDZ+YuoUcMnjjBFfDQu7oRAA1fIMEQ=="; + }; + }; + "vega-expression-4.0.1" = { + name = "vega-expression"; + packageName = "vega-expression"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-expression/-/vega-expression-4.0.1.tgz"; + sha512 = "ZrDj0hP8NmrCpdLFf7Rd/xMUHGoSYsAOTaYp7uXZ2dkEH5x0uPy5laECMc8TiQvL8W+8IrN2HAWCMRthTSRe2Q=="; }; }; "vega-force-4.0.7" = { @@ -55970,22 +57689,22 @@ let sha512 = "oTAeub3KWm6nKhXoYCx1q9G3K43R6/pDMXvqDlTSUtjoY7b/Gixm8iLcir5S9bPjvH40n4AcbZsPmNfL/Up77A=="; }; }; - "vega-functions-5.8.0" = { + "vega-functions-5.10.0" = { name = "vega-functions"; packageName = "vega-functions"; - version = "5.8.0"; + version = "5.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/vega-functions/-/vega-functions-5.8.0.tgz"; - sha512 = "xaUqWZHEX+EuJuKfN0Biux3rrCHDEHmMbW7LHYyyEqguR0i6+zhtOSUEWmYqDfzB/+BlIwCk5Vif6q6/mzJxbQ=="; + url = "https://registry.npmjs.org/vega-functions/-/vega-functions-5.10.0.tgz"; + sha512 = "1l28OxUwOj8FEvRU62Oz2hiTuDECrvx1DPU1qLebBKhlgaKbcCk3XyHrn1kUzhMKpXq+SFv5VPxchZP47ASSvQ=="; }; }; - "vega-geo-4.3.7" = { + "vega-geo-4.3.8" = { name = "vega-geo"; packageName = "vega-geo"; - version = "4.3.7"; + version = "4.3.8"; src = fetchurl { - url = "https://registry.npmjs.org/vega-geo/-/vega-geo-4.3.7.tgz"; - sha512 = "5HC1D9Z/WYuM1Gmlk8PxuRKgeN8snNWsfKO4E9PTmR7wo7tuU/2SGlRoE27aTsgwMMpBIrpRbSgKtgh5l/fMUQ=="; + url = "https://registry.npmjs.org/vega-geo/-/vega-geo-4.3.8.tgz"; + sha512 = "fsGxV96Q/QRgPqOPtMBZdI+DneIiROKTG3YDZvGn0EdV16OG5LzFhbNgLT5GPzI+kTwgLpAsucBHklexlB4kfg=="; }; }; "vega-hierarchy-4.0.9" = { @@ -56015,13 +57734,13 @@ let sha512 = "e5enQECdau7rJob0NFB5pGumh3RaaSWWm90+boxMy3ay2b4Ki/3XIvo+C4F1Lx04qSxvQF7tO2LJcklRm6nqRA=="; }; }; - "vega-parser-6.1.0" = { + "vega-parser-6.1.2" = { name = "vega-parser"; packageName = "vega-parser"; - version = "6.1.0"; + version = "6.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/vega-parser/-/vega-parser-6.1.0.tgz"; - sha512 = "u14bHXV8vtcuMIJkMNoDAJ4Xu3lwKIkep+YEkPumWvlwl3fClWy26EAcwTneeM3rXu2F6ZJI6W3ddu/If8u13w=="; + url = "https://registry.npmjs.org/vega-parser/-/vega-parser-6.1.2.tgz"; + sha512 = "aGyZrNzPrBruEb/WhemKDuDjQsIkMDGIgnSJci0b+9ZVxjyAzMl7UfGbiYorPiJlnIercjUJbMoFD6fCIf4gqQ=="; }; }; "vega-projection-1.4.5" = { @@ -56069,13 +57788,13 @@ let sha512 = "epm1CxcB8AucXQlSDeFnmzy0FCj+HV2k9R6ch2lfLRln5lPLEfgJWgFcFhVf5jyheY0FSeHH52Q5zQn1vYI1Ow=="; }; }; - "vega-selections-5.1.4" = { + "vega-selections-5.1.5" = { name = "vega-selections"; packageName = "vega-selections"; - version = "5.1.4"; + version = "5.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/vega-selections/-/vega-selections-5.1.4.tgz"; - sha512 = "L7CHwcIjVf90GoW2tS2x5O496O5Joaerp5A1KM6VJ1uo4z6KfqxY6M/328a/uaAs0LC5qbQgXT3htFbtUrPW/A=="; + url = "https://registry.npmjs.org/vega-selections/-/vega-selections-5.1.5.tgz"; + sha512 = "oRSsfkqYqA5xfEJqDpgnSDd+w0k6p6SGYisMD6rGXMxuPl0x0Uy6RvDr4nbEtB+dpWdoWEvgrsZVS6axyDNWvQ=="; }; }; "vega-statistics-1.7.9" = { @@ -56105,13 +57824,13 @@ let sha512 = "PdqQd5oPlRyD405M2w+Sz9Bo+i7Rwi8o03SVK7RaeQsJC2FffKGJ6acIaSEgOq+yD1Q2k/1SePmCXcmLUlIiEA=="; }; }; - "vega-typings-0.19.1" = { + "vega-typings-0.19.2" = { name = "vega-typings"; packageName = "vega-typings"; - version = "0.19.1"; + version = "0.19.2"; src = fetchurl { - url = "https://registry.npmjs.org/vega-typings/-/vega-typings-0.19.1.tgz"; - sha512 = "OSyNYwMJ8FayTTNU/gohprbt1EFQBpoiMPP9p2vqo1O9z45XVnotQ92jYHAhraI6gWiMIIfo4OjPbSe/GX7etg=="; + url = "https://registry.npmjs.org/vega-typings/-/vega-typings-0.19.2.tgz"; + sha512 = "YU/S9rDk4d+t4+4eTa9fzuw87PMNteeVtpcL51kUO8H7HvGaoW7ll8RHKLkR0NYBEGPRoFDKUxnoyMvhgjsdYw=="; }; }; "vega-util-1.16.0" = { @@ -56123,13 +57842,13 @@ let sha512 = "6mmz6mI+oU4zDMeKjgvE2Fjz0Oh6zo6WGATcvCfxH2gXBzhBHmy5d25uW5Zjnkc6QBXSWPLV9Xa6SiqMsrsKog=="; }; }; - "vega-view-5.9.0" = { + "vega-view-5.9.2" = { name = "vega-view"; packageName = "vega-view"; - version = "5.9.0"; + version = "5.9.2"; src = fetchurl { - url = "https://registry.npmjs.org/vega-view/-/vega-view-5.9.0.tgz"; - sha512 = "HqRFuqO2OwoPHHK+CVt8vB8fu2L8GjQerLpmEpglWtCPDns5+gn5B6F7M8Ah8v24WlfqW7cLrY81t9OloPZOyw=="; + url = "https://registry.npmjs.org/vega-view/-/vega-view-5.9.2.tgz"; + sha512 = "XAwKWyVjLClR3aCbTLCWdZj7aZozOULNg7078GxJIgVcBJOENCAidceI/H7JieyUZ96p3AiEHLQdWr167InBpg=="; }; }; "vega-view-transforms-4.5.8" = { @@ -56168,13 +57887,13 @@ let sha512 = "/juG65kTL4Cy2su4P8HjtkTxk6VmJDiOPBufWniqQ6wknac6jNiXS9vU+hO3wgusiyqWlzTbVHi0dyJqRONg3w=="; }; }; - "verda-1.2.0" = { + "verda-1.2.1" = { name = "verda"; packageName = "verda"; - version = "1.2.0"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/verda/-/verda-1.2.0.tgz"; - sha512 = "6xCi3IqMbT/H9PFBBmVB2foC3GBVpTm/doRCr3Is5RAdcpZHlkhfDto6WpoF0Sei1Dz60/lXGoaqOYM2op9Ftw=="; + url = "https://registry.npmjs.org/verda/-/verda-1.2.1.tgz"; + sha512 = "hEkyReHbrar3MikWeZTLWaR3Sr7KAl/M+KczKgGs80LHTPaKC06ussYuWVg9lMeOrwbOZb1o3DRNv91VzoGoYg=="; }; }; "verror-1.1.0" = { @@ -56249,13 +57968,13 @@ let sha512 = "y7Y3gH9BsUSdD4KzHsuMaCzRjglXN0W2EcMf0gpvu6+SbsGhMje7xDc8AEoeXy6mIwCKMI6BkjMsRjzQbhMEjQ=="; }; }; - "vfile-4.2.0" = { + "vfile-4.2.1" = { name = "vfile"; packageName = "vfile"; - version = "4.2.0"; + version = "4.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/vfile/-/vfile-4.2.0.tgz"; - sha512 = "a/alcwCvtuc8OX92rqqo7PflxiCgXRFjdyoGVuYV+qbgCb0GgZJRvIgCD4+U/Kl1yhaRsaTwksF88xbPyGsgpw=="; + url = "https://registry.npmjs.org/vfile/-/vfile-4.2.1.tgz"; + sha512 = "O6AE4OskCG5S1emQ/4gl8zK586RqA3srz3nfK/Viy0UPToBc5Trp9BVFb1u0CjsKrAWwnpr4ifM/KBXPWwJbCA=="; }; }; "vfile-find-down-1.0.0" = { @@ -56339,13 +58058,13 @@ let sha512 = "b15sTuss1wOPWVlyWOvu+n6wGJ/eTYngz3uqMLimQvxZ+Q5oFQGYZZP1o3dR9sk58G5+wej0UPCZSwQBX/mzrQ=="; }; }; - "vfile-reporter-6.0.1" = { + "vfile-reporter-6.0.2" = { name = "vfile-reporter"; packageName = "vfile-reporter"; - version = "6.0.1"; + version = "6.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/vfile-reporter/-/vfile-reporter-6.0.1.tgz"; - sha512 = "0OppK9mo8G2XUpv+hIKLVSDsoxJrXnOy73+vIm0jQUOUFYRduqpFHX+QqAQfvRHyX9B0UFiRuNJnBOjQCIsw1g=="; + url = "https://registry.npmjs.org/vfile-reporter/-/vfile-reporter-6.0.2.tgz"; + sha512 = "GN2bH2gs4eLnw/4jPSgfBjo+XCuvnX9elHICJZjVD4+NM0nsUrMTvdjGY5Sc/XG69XVTgLwj7hknQVc6M9FukA=="; }; }; "vfile-sort-1.0.0" = { @@ -56510,13 +58229,13 @@ let sha1 = "c066afb582bb1cb4128d60ea92392e94d5e9dbec"; }; }; - "vsce-1.81.1" = { + "vsce-1.83.0" = { name = "vsce"; packageName = "vsce"; - version = "1.81.1"; + version = "1.83.0"; src = fetchurl { - url = "https://registry.npmjs.org/vsce/-/vsce-1.81.1.tgz"; - sha512 = "1yWAYRxTx/PKSFZnuELe7GPyIo70H/XKJqf6wGikofUK3f3TCNGI6F9xkTQFvXKNe0AygUuxN7kITyPIQGMP+w=="; + url = "https://registry.npmjs.org/vsce/-/vsce-1.83.0.tgz"; + sha512 = "gyF/xtCOFcKO+EvC0FQu5jPECHz2XKMWcw62gqwJJ22lVvlj58t49sWe1IGl9S5NpxCek+QMm6V9i/cDwGWs/Q=="; }; }; "vscode-css-languageservice-3.0.13" = { @@ -56582,15 +58301,6 @@ let sha512 = "QxI+qV97uD7HHOCjh3MrM1TfbdwmTXrMckri5Tus1/FQiG3baDZb2C9Y0y8QThs7PwHYBIQXcAc59ZveCRZKPA=="; }; }; - "vscode-json-languageservice-3.8.4" = { - name = "vscode-json-languageservice"; - packageName = "vscode-json-languageservice"; - version = "3.8.4"; - src = fetchurl { - url = "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-3.8.4.tgz"; - sha512 = "njDG0+YJvYNKXH+6plQGZMxgbifATFrRpC6Qnm/SAn4IW8bMHxsYunsxrjtpqK42CVSz6Lr7bpbTEZbVuOmFLw=="; - }; - }; "vscode-jsonrpc-3.5.0" = { name = "vscode-jsonrpc"; packageName = "vscode-jsonrpc"; @@ -56636,6 +58346,15 @@ let sha512 = "mwLDojZkbmpizSJSmp690oa9FB9jig18SIDGZeBCvFc2/LYSRvMm/WwWtMBJuJ1MfFh7rZXfQige4Uje5Z9NzA=="; }; }; + "vscode-jsonrpc-6.0.0" = { + name = "vscode-jsonrpc"; + packageName = "vscode-jsonrpc"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-6.0.0.tgz"; + sha512 = "wnJA4BnEjOSyFMvjZdpiOwhSq9uDoK8e/kpRJDTaMYzwlkrhG1fwDIZI94CLsLzlCK5cIbMMtFlJlfR57Lavmg=="; + }; + }; "vscode-jsonrpc-6.0.0-next.2" = { name = "vscode-jsonrpc"; packageName = "vscode-jsonrpc"; @@ -56645,15 +58364,6 @@ let sha512 = "dKQXRYNUY6BHALQJBJlyZyv9oWlYpbJ2vVoQNNVNPLAYQ3hzNp4zy+iSo7zGx1BPXByArJQDWTKLQh8dz3dnNw=="; }; }; - "vscode-jsonrpc-6.0.0-next.7" = { - name = "vscode-jsonrpc"; - packageName = "vscode-jsonrpc"; - version = "6.0.0-next.7"; - src = fetchurl { - url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-6.0.0-next.7.tgz"; - sha512 = "1nG+6cuTtpzmXe7yYfO9GCkYlyV6Ai+jDnwidHiT2T7zhc+bJM+VTtc0T/CdTlDyTNTqIcCj0V1nD4TcVjJ7Ug=="; - }; - }; "vscode-languageclient-4.0.1" = { name = "vscode-languageclient"; packageName = "vscode-languageclient"; @@ -56663,13 +58373,13 @@ let sha512 = "0fuBZj9pMkeJ8OMyIvSGeRaRVhUaJt+yeFxi7a3sz/AbrngQdcxOovMXPgKuieoBSBKS05gXPS88BsWpJZfBkA=="; }; }; - "vscode-languageclient-7.0.0-next.12" = { + "vscode-languageclient-7.0.0" = { name = "vscode-languageclient"; packageName = "vscode-languageclient"; - version = "7.0.0-next.12"; + version = "7.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-7.0.0-next.12.tgz"; - sha512 = "OrzvOvhS5o26C0KctTJC7hkwh3avCwkVhllzy42AqwpIUZ3p2aVqkSG2uVxaeodq8ThBb3TLgtg50vxyWs6FEg=="; + url = "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-7.0.0.tgz"; + sha512 = "P9AXdAPlsCgslpP9pRxYPqkNYV7Xq8300/aZDpO35j1fJm/ncize8iGswzYlcvFw5DQUx4eVk+KvfXdL0rehNg=="; }; }; "vscode-languageserver-3.5.1" = { @@ -56735,6 +58445,15 @@ let sha512 = "UCXULa/RmT2zxcb6auNezl9ZIPwYHS15+a0XzybrpT2+xA0RbHEYQCsIQkTRYjGv8cm3yS9iPJMmxLilP+y1Xw=="; }; }; + "vscode-languageserver-7.0.0" = { + name = "vscode-languageserver"; + packageName = "vscode-languageserver"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-7.0.0.tgz"; + sha512 = "60HTx5ID+fLRcgdHfmz0LDZAXYEV68fzwG0JWwEPBode9NuMYTIxuYXPg4ngO8i8+Ou0lM7y6GzaYWbiDL0drw=="; + }; + }; "vscode-languageserver-7.0.0-next.3" = { name = "vscode-languageserver"; packageName = "vscode-languageserver"; @@ -56762,13 +58481,13 @@ let sha512 = "zrMuwHOAQRhjDSnflWdJG+O2ztMWss8GqUUB8dXLR/FPenwkiBNkMIJJYfSN6sgskvsF0rHAoBowNQfbyZnnvw=="; }; }; - "vscode-languageserver-protocol-3.16.0-next.10" = { + "vscode-languageserver-protocol-3.16.0" = { name = "vscode-languageserver-protocol"; packageName = "vscode-languageserver-protocol"; - version = "3.16.0-next.10"; + version = "3.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.16.0-next.10.tgz"; - sha512 = "YRTctHUZvts0Z1xXKNYU0ha0o+Tlgtwr+6O8OmDquM086N8exiSKBMwMC+Ra1QtIE+1mfW43Wxsme2FnMkAS9A=="; + url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.16.0.tgz"; + sha512 = "sdeUoAawceQdgIfTI+sdcwkiK2KU+2cbEYA0agzM2uqaUy2UpnnGHtWTHVEtS0ES4zHU0eMFRGN+oQgDxlD66A=="; }; }; "vscode-languageserver-protocol-3.16.0-next.2" = { @@ -56843,6 +58562,15 @@ let sha512 = "+a9MPUQrNGRrGU630OGbYVQ+11iOIovjCkqxajPa9w57Sd5ruK8WQNsslzpa0x/QJqC8kRc2DUxWjIFwoNm4ZQ=="; }; }; + "vscode-languageserver-types-3.16.0" = { + name = "vscode-languageserver-types"; + packageName = "vscode-languageserver-types"; + version = "3.16.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.16.0.tgz"; + sha512 = "k8luDIWJWyenLc5ToFQQMaSrqCHiLwyKPHKPQZ5zz21vM+vIVUSvsRpcbiECH4WR88K2XZqc4ScRcZ7nk/jbeA=="; + }; + }; "vscode-languageserver-types-3.16.0-next.1" = { name = "vscode-languageserver-types"; packageName = "vscode-languageserver-types"; @@ -56861,24 +58589,6 @@ let sha512 = "QjXB7CKIfFzKbiCJC4OWC8xUncLsxo19FzGVp/ADFvvi87PlmBSCAtZI5xwGjF5qE0xkLf0jjKUn3DzmpDP52Q=="; }; }; - "vscode-languageserver-types-3.16.0-next.4" = { - name = "vscode-languageserver-types"; - packageName = "vscode-languageserver-types"; - version = "3.16.0-next.4"; - src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.16.0-next.4.tgz"; - sha512 = "NlKJyGcET/ZBCCLBYIPaGo2c37R03bPYeWXozUtnjyye7+9dhlbMSODyoG2INcQf8zFmB4qhm2UOJjgYEgPCNA=="; - }; - }; - "vscode-languageserver-types-3.16.0-next.5" = { - name = "vscode-languageserver-types"; - packageName = "vscode-languageserver-types"; - version = "3.16.0-next.5"; - src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.16.0-next.5.tgz"; - sha512 = "lf8Y1XXMtF1r2oDDAmJe+drizNXkybSRXAQQk5dPy2rYJsY9SPXYNO074L3THu9zNYepzV5fRJZUPo/V/TLBRQ=="; - }; - }; "vscode-languageserver-types-3.5.0" = { name = "vscode-languageserver-types"; packageName = "vscode-languageserver-types"; @@ -56978,6 +58688,15 @@ let sha512 = "8TEXQxlldWAuIODdukIb+TR5s+9Ds40eSJrw+1iDDA9IFORPjMELarNQE3myz5XIkWWpdprmJjm1/SxMlWOC8A=="; }; }; + "vscode-uri-3.0.2" = { + name = "vscode-uri"; + packageName = "vscode-uri"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.0.2.tgz"; + sha512 = "jkjy6pjU1fxUvI51P+gCsxg1u2n8LSt0W6KrCNQceaziKzff74GoWmjVG46KieVzybO1sttPQmYfrwSHey7GUA=="; + }; + }; "vstream-0.1.0" = { name = "vstream"; packageName = "vstream"; @@ -56996,13 +58715,13 @@ let sha512 = "uhmLFETqPPNyuLLbsKz6ioJ4q7AZHzD8ZVFNATNyICSZouqP2Sz0rotWQC8UNBF6VGSCs5abnKJoStA6JbCbfg=="; }; }; - "vue-3.0.4" = { + "vue-3.0.5" = { name = "vue"; packageName = "vue"; - version = "3.0.4"; + version = "3.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/vue/-/vue-3.0.4.tgz"; - sha512 = "2o+AiQF8sAupyhbyl3oxVCl3WCwC/n5NI7VMM+gVQ231qvSB8eI7sCBloloqDJK6yA367EEtmRSeSCf4sxCC+A=="; + url = "https://registry.npmjs.org/vue/-/vue-3.0.5.tgz"; + sha512 = "TfaprOmtsAfhQau7WsomXZ8d9op/dkQLNIq8qPV3A0Vxs6GR5E+c1rfJS1SDkXRQj+dFyfnec7+U0Be1huiScg=="; }; }; "vue-cli-plugin-apollo-0.21.3" = { @@ -57050,13 +58769,13 @@ let sha512 = "8FdXi0gieEwh1IprIBafpiJWcApwrU+l2FEj8c1HtHFdNXMd0+2jUSjBVmcQYohf/E72irwAXEXLga6TQcB3FA=="; }; }; - "vue-eslint-parser-7.2.0" = { + "vue-eslint-parser-7.3.0" = { name = "vue-eslint-parser"; packageName = "vue-eslint-parser"; - version = "7.2.0"; + version = "7.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-7.2.0.tgz"; - sha512 = "uVcQqe8sUNzdHGcRHMd2Z/hl6qEaWrAmglTKP92Fnq9TYU9un8xsyFgEdFJaXh/1rd7h8Aic1GaiQow5nVneow=="; + url = "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-7.3.0.tgz"; + sha512 = "n5PJKZbyspD0+8LnaZgpEvNCrjQx1DyDHw8JdWwoxhhC+yRip4TAvSDpXGf9SWX6b0umeB5aR61gwUo6NVvFxw=="; }; }; "vue-onsenui-helper-json-1.0.2" = { @@ -57167,13 +58886,13 @@ let sha512 = "9P3MWk6SrKjHsGkLT2KHXdQ/9SNkyoJbabxnKOoJepsvJjJG8uYTR3yTPxPQvNDI3w4Nz1xnE0TLHK4RIVe/MQ=="; }; }; - "watchpack-2.0.1" = { + "watchpack-2.1.0" = { name = "watchpack"; packageName = "watchpack"; - version = "2.0.1"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/watchpack/-/watchpack-2.0.1.tgz"; - sha512 = "vO8AKGX22ZRo6PiOFM9dC0re8IcKh8Kd/aH2zeqUc6w4/jBGlTy2P7fTC6ekT0NjVeGjgU2dGC5rNstKkeLEQg=="; + url = "https://registry.npmjs.org/watchpack/-/watchpack-2.1.0.tgz"; + sha512 = "UjgD1mqjkG99+3lgG36at4wPnUXNvis2v1utwTgQ43C22c4LD71LsYMExdWXh4HZ+RmW+B0t1Vrg2GpXAkTOQw=="; }; }; "watchpack-chokidar2-2.0.1" = { @@ -57311,13 +59030,13 @@ let sha512 = "6KJVGlCxYdISyurpQ0IPTklv+DULv05rs2hseIXer6D7KrUicRDLFb4IUM1S6LUAKypPM/nSiVSuv8jHu1m3/Q=="; }; }; - "webpack-5.4.0" = { + "webpack-5.9.0" = { name = "webpack"; packageName = "webpack"; - version = "5.4.0"; + version = "5.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-5.4.0.tgz"; - sha512 = "udpYTyqz8toTTdaOsL2QKPLeZLt2IEm9qY7yTXuFEQhKu5bk0yQD9BtAdVQksmz4jFbbWOiWmm3NHarO0zr/ng=="; + url = "https://registry.npmjs.org/webpack/-/webpack-5.9.0.tgz"; + sha512 = "YnnqIV/uAS5ZrNpctSv378qV7HmbJ74DL+XfvMxzbX1bV9e7eeT6eEWU4wuUw33CNr/HspBh7R/xQlVjTEyAeA=="; }; }; "webpack-cli-3.3.12" = { @@ -57347,13 +59066,13 @@ let sha512 = "ZYldKNeWQtk9SoV70x7Eb2NRmvHMtNBOjscs0wUdg/pfymntiF+0W/D9v2o76ztufjND6RNFjNVnyFQww25AZg=="; }; }; - "webpack-dev-middleware-3.7.2" = { + "webpack-dev-middleware-3.7.3" = { name = "webpack-dev-middleware"; packageName = "webpack-dev-middleware"; - version = "3.7.2"; + version = "3.7.3"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.7.2.tgz"; - sha512 = "1xC42LxbYoqLNAhV6YzTYacicgMZQTqRd27Sim9wn5hJrX3I5nxYy1SxSd4+gjUFsz1dQFj+yEe6zEVmSkeJjw=="; + url = "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.7.3.tgz"; + sha512 = "djelc/zGiz9nZj/U7PTBi2ViorGJXEWo/3ltkPbDyxCXhhEXkW0ce99falaok4TPj+AsxLiXJR0EBOb0zh9fKQ=="; }; }; "webpack-dev-server-3.11.0" = { @@ -57599,13 +59318,13 @@ let sha512 = "BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA=="; }; }; - "which-boxed-primitive-1.0.1" = { + "which-boxed-primitive-1.0.2" = { name = "which-boxed-primitive"; packageName = "which-boxed-primitive"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.1.tgz"; - sha512 = "7BT4TwISdDGBgaemWU0N0OU7FeAEJ9Oo2P1PHRm/FCWoEi2VLWC9b6xvxAA3C/NMpxg3HXVgi0sMmGbNUbNepQ=="; + url = "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz"; + sha512 = "bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg=="; }; }; "which-collection-1.0.1" = { @@ -57653,13 +59372,13 @@ let sha1 = "20b721df05b35b706176ffa10b0909aba4603035"; }; }; - "which-typed-array-1.1.2" = { + "which-typed-array-1.1.4" = { name = "which-typed-array"; packageName = "which-typed-array"; - version = "1.1.2"; + version = "1.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.2.tgz"; - sha512 = "KT6okrd1tE6JdZAy3o2VhMoYPh3+J6EMZLyrxBQsZflI1QCZIxMrIYLkosd8Twf+YfknVIHmYQPgJt238p8dnQ=="; + url = "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.4.tgz"; + sha512 = "49E0SpUe90cjpoc7BOJwyPHRqSAd12c10Qm2amdEZrJPCY2NDxaW01zHITrem+rnETY3dwrbH3UUrUwagfCYDA=="; }; }; "wide-align-1.1.3" = { @@ -57941,15 +59660,6 @@ let sha512 = "mO8XtqyPvykVCsrwj5MlOVWvSnCdT+C+QVbm6blradR7JExAhbkZ7hZ9A+9NUtwzSqrlUo9a67ws0EiILrvRpw=="; }; }; - "wordwrapjs-4.0.0" = { - name = "wordwrapjs"; - packageName = "wordwrapjs"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/wordwrapjs/-/wordwrapjs-4.0.0.tgz"; - sha512 = "Svqw723a3R34KvsMgpjFBYCgNOSdcW3mQFK4wIfhGQhtaFVOJmdYoXgi63ne3dTlWgatVcUc7t4HtQ/+bUVIzQ=="; - }; - }; "workbox-background-sync-3.6.3" = { name = "workbox-background-sync"; packageName = "workbox-background-sync"; @@ -58355,15 +60065,6 @@ let sha512 = "D3RuNkynyHmEJIpD2qrgVkc9DQ23OrN/moAwZX4L8DfvszsJxpjQuUq3LMx6HoYji9fbIOBY18XWBsAux1ZZUA=="; }; }; - "ws-7.4.0" = { - name = "ws"; - packageName = "ws"; - version = "7.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-7.4.0.tgz"; - sha512 = "kyFwXuV/5ymf+IXhS6f0+eAFvydbaBW3zjpT6hUdAh/hbVjTIB5EHBGi0bPoCLSK2wcuz3BrEkB9LrYv1Nm4NQ=="; - }; - }; "ws-7.4.1" = { name = "ws"; packageName = "ws"; @@ -58373,6 +60074,15 @@ let sha512 = "pTsP8UAfhy3sk1lSk/O/s4tjD0CRwvMnzvwr4OKGX7ZvqZtUyx4KIJB5JWbkykPoc55tixMGgTNoh3k4FkNGFQ=="; }; }; + "ws-7.4.2" = { + name = "ws"; + packageName = "ws"; + version = "7.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ws/-/ws-7.4.2.tgz"; + sha512 = "T4tewALS3+qsrpGI/8dqNMLIVdq/g/85U98HPMa6F0m6xTbvhXU6RCQLqPH3+SlomNV/LdY6RXEbBpMH6EOJnA=="; + }; + }; "x-default-browser-0.3.1" = { name = "x-default-browser"; packageName = "x-default-browser"; @@ -58625,6 +60335,15 @@ let sha512 = "ts+B2rSe4fIckR6iquDjsKbQFK2NlUk6iG5nf14mDEyldgoc2nEKZ3jZWMPTxGQwVgToSjt6VGIho1H8/fNFTg=="; }; }; + "xmlbuilder-15.1.1" = { + name = "xmlbuilder"; + packageName = "xmlbuilder"; + version = "15.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-15.1.1.tgz"; + sha512 = "yMqGBqtXyeN1e3TGYvgNgDVZ3j84W4cwkOXQswghol6APgZWaff9lnbvN7MHYJOiXsvGPXtjTYJEiC9J2wv9Eg=="; + }; + }; "xmlbuilder-2.5.2" = { name = "xmlbuilder"; packageName = "xmlbuilder"; @@ -58761,13 +60480,13 @@ let sha1 = "fcd82267e9351c13f0fb9c73307f25331d29c63a"; }; }; - "xpath-0.0.27" = { + "xpath-0.0.32" = { name = "xpath"; packageName = "xpath"; - version = "0.0.27"; + version = "0.0.32"; src = fetchurl { - url = "https://registry.npmjs.org/xpath/-/xpath-0.0.27.tgz"; - sha512 = "fg03WRxtkCV6ohClePNAECYsmpKKTv5L8y/X3Dn1hQrec3POx2jHZ/0P2qQ6HvsrU1BmeqXcof3NGGueG6LxwQ=="; + url = "https://registry.npmjs.org/xpath/-/xpath-0.0.32.tgz"; + sha512 = "rxMJhSIoiO8vXcWvSifKqhvV96GjiD5wYb8/QHdoRyQvraTpp4IEv944nhGausZZ3u7dhQXteZuZbaqfpB7uYw=="; }; }; "xpath-0.0.5" = { @@ -58878,13 +60597,13 @@ let sha512 = "LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ=="; }; }; - "y18n-3.2.1" = { + "y18n-3.2.2" = { name = "y18n"; packageName = "y18n"; - version = "3.2.1"; + version = "3.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz"; - sha1 = "6d15fba884c08679c0d77e88e7759e811e07fa41"; + url = "https://registry.npmjs.org/y18n/-/y18n-3.2.2.tgz"; + sha512 = "uGZHXkHnhF0XeeAPgnKfPv1bgKAYyVvmNL1xlKsPYZPaIHxGti2hHqvOCQv71XMsLxu1QjergkqogUnms5D3YQ=="; }; }; "y18n-4.0.1" = { @@ -58968,13 +60687,13 @@ let sha1 = "87cfa5a9613f48e26005420d6a8ee0da6fe8daec"; }; }; - "yaml-language-server-0.12.0" = { + "yaml-language-server-0.13.1-dcc82a9.0" = { name = "yaml-language-server"; packageName = "yaml-language-server"; - version = "0.12.0"; + version = "0.13.1-dcc82a9.0"; src = fetchurl { - url = "https://registry.npmjs.org/yaml-language-server/-/yaml-language-server-0.12.0.tgz"; - sha512 = "EAr9fJi05wVWsFVgc4s0AI74nT6D2oN7xcy7W+7JCkvirbm0L7aPDRAjSz6z/dXVyYyFlEAgRWVThXzqguFyTw=="; + url = "https://registry.npmjs.org/yaml-language-server/-/yaml-language-server-0.13.1-dcc82a9.0.tgz"; + sha512 = "26QP9JhfcrroDTeMv2OsY4eoI+NKb6tZwy1Uz0MBWi1uGmOw0/6aR9Oa3guOsC96U27GAqT6glRFMjCGqLro7A=="; }; }; "yaml-language-server-parser-0.1.1" = { @@ -58986,6 +60705,15 @@ let sha512 = "2PememGb1SrPqXAxXTpBD39rwYZap6CJVSvkfULNv9uwV3VHp1TfkgpsylBb+mpuuivH0JZ52lChXPvNa6yVxw=="; }; }; + "yaml-language-server-parser-0.1.3-fa8245c.0" = { + name = "yaml-language-server-parser"; + packageName = "yaml-language-server-parser"; + version = "0.1.3-fa8245c.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yaml-language-server-parser/-/yaml-language-server-parser-0.1.3-fa8245c.0.tgz"; + sha512 = "0QPUSsmMXHDpqj00xUrlMyqlEAwHHIAuz3wPMyprcCVYx7jh7oo91Z0nC/jhott4XAKp3iY3vjBsMxqszoZosA=="; + }; + }; "yamljs-0.3.0" = { name = "yamljs"; packageName = "yamljs"; @@ -59067,15 +60795,6 @@ let sha512 = "6+nLw8xa9uK1BOEOykaiYAJVh6/CjxWXK/q9b5FpRgNslt8s22F2xMBqVIKgCRjNgGvGPBy8Vog7WN7yh4amtA=="; }; }; - "yargs-16.1.0" = { - name = "yargs"; - packageName = "yargs"; - version = "16.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-16.1.0.tgz"; - sha512 = "upWFJOmDdHN0syLuESuvXDmrRcWd1QafJolHskzaw79uZa7/x53gxQKiR07W59GWY1tFhhU/Th9DrtSfpS782g=="; - }; - }; "yargs-16.1.1" = { name = "yargs"; packageName = "yargs"; @@ -59085,6 +60804,15 @@ let sha512 = "hAD1RcFP/wfgfxgMVswPE+z3tlPFtxG8/yWUrG2i17sTWGCGqWnxKcLTF4cUKDUK8fzokwsmO9H0TDkRbMHy8w=="; }; }; + "yargs-16.2.0" = { + name = "yargs"; + packageName = "yargs"; + version = "16.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz"; + sha512 = "D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw=="; + }; + }; "yargs-3.10.0" = { name = "yargs"; packageName = "yargs"; @@ -59400,6 +61128,15 @@ let sha512 = "Yj3yXweRc8LdRMrCC8nIc4kkjWecPAUVh0TI0OUrWXx6aX790vLcDlWca6I4vsyCGH3LpWxq0dJRcMOFoVqmeg=="; }; }; + "zeromq-5.2.0" = { + name = "zeromq"; + packageName = "zeromq"; + version = "5.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/zeromq/-/zeromq-5.2.0.tgz"; + sha512 = "qsckhCmrg6et6zrAJytC971SSN/4iLxKgkXK1Wqn2Gij5KXMY+TA+3cy/iFwehaWdU5usg5HNOOgaBdjSqtCVw=="; + }; + }; "zerr-1.0.4" = { name = "zerr"; packageName = "zerr"; @@ -59478,17 +61215,17 @@ in "@angular/cli" = nodeEnv.buildNodePackage { name = "_at_angular_slash_cli"; packageName = "@angular/cli"; - version = "11.0.3"; + version = "11.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@angular/cli/-/cli-11.0.3.tgz"; - sha512 = "ytYVvALJ1YRDZYoqNoUcE4SLyNcMyt2V+Youaasj+C43V0h1GzHZ4J6G4X9sKaaiNAGV4GKjB9r7jzCymaiq+A=="; + url = "https://registry.npmjs.org/@angular/cli/-/cli-11.0.5.tgz"; + sha512 = "k4j/2z7qkuigJ1shH0McW1wW63clhrbrg98FK4/KWhU/sce5AgVjuHDQFycAclTwHesf7Vs6Gzt7zGlqUmeKIg=="; }; dependencies = [ - sources."@angular-devkit/architect-0.1100.3" - sources."@angular-devkit/core-11.0.3" - sources."@angular-devkit/schematics-11.0.3" - sources."@schematics/angular-11.0.3" - sources."@schematics/update-0.1100.3" + sources."@angular-devkit/architect-0.1100.5" + sources."@angular-devkit/core-11.0.5" + sources."@angular-devkit/schematics-11.0.5" + sources."@schematics/angular-11.0.5" + sources."@schematics/update-0.1100.5" sources."@yarnpkg/lockfile-1.1.0" sources."JSONStream-1.3.5" sources."agent-base-4.3.0" @@ -59600,7 +61337,7 @@ in sources."infer-owner-1.0.4" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."ini-1.3.5" + sources."ini-1.3.6" sources."inquirer-7.3.3" sources."ip-1.1.5" sources."is-core-module-2.2.0" @@ -59630,8 +61367,8 @@ in sources."yallist-3.1.1" ]; }) - sources."mime-db-1.44.0" - sources."mime-types-2.1.27" + sources."mime-db-1.45.0" + sources."mime-types-2.1.28" sources."mimic-fn-2.1.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" @@ -59822,7 +61559,7 @@ in sources."convict-6.0.0" sources."decamelize-1.2.0" sources."esprima-4.0.1" - sources."js-yaml-3.14.0" + sources."js-yaml-3.14.1" sources."json5-2.1.3" sources."lodash.clonedeep-4.5.0" sources."map-obj-4.1.0" @@ -59868,7 +61605,7 @@ in sources."append-buffer-1.0.2" sources."argparse-1.0.10" sources."asciidoctor.js-1.5.9" - sources."async-lock-1.2.4" + sources."async-lock-1.2.8" sources."balanced-match-1.0.0" sources."base64-js-0.0.2" sources."bl-4.0.3" @@ -59956,7 +61693,7 @@ in }) sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" - sources."get-intrinsic-1.0.1" + sources."get-intrinsic-1.0.2" (sources."get-stream-4.1.0" // { dependencies = [ sources."pump-3.0.0" @@ -60011,7 +61748,7 @@ in sources."is-windows-1.0.2" sources."isarray-1.0.0" sources."isomorphic-git-0.78.5" - sources."js-yaml-3.14.0" + sources."js-yaml-3.14.1" sources."json-buffer-3.0.0" sources."json-stable-stringify-without-jsonify-1.0.1" sources."json5-2.1.3" @@ -60030,8 +61767,8 @@ in sources."map-obj-4.1.0" sources."marky-1.2.1" sources."matcher-2.1.0" - sources."mime-db-1.44.0" - sources."mime-types-2.1.27" + sources."mime-db-1.45.0" + sources."mime-types-2.1.28" sources."mimic-response-2.1.0" sources."minimatch-3.0.4" sources."minimatch-all-1.1.0" @@ -60120,7 +61857,7 @@ in ]; }) sources."to-utf8-0.0.1" - sources."uglify-js-3.12.1" + sources."uglify-js-3.12.4" sources."unc-path-regex-0.1.2" sources."unique-stream-2.3.1" sources."universalify-0.1.2" @@ -60199,7 +61936,7 @@ in sources."cssstyle-1.4.0" sources."dashdash-1.14.1" sources."data-urls-1.1.0" - sources."debug-4.3.1" + sources."debug-4.3.2" sources."deep-is-0.1.3" sources."delayed-stream-1.0.0" sources."domexception-1.0.1" @@ -60245,8 +61982,8 @@ in sources."lodash.sortby-4.7.0" sources."lowdb-1.0.0" sources."lunr-2.3.3" - sources."mime-db-1.44.0" - sources."mime-types-2.1.27" + sources."mime-db-1.45.0" + sources."mime-types-2.1.28" sources."mimic-fn-1.2.0" sources."ms-2.1.2" sources."mute-stream-0.0.7" @@ -60326,17 +62063,17 @@ in "@nestjs/cli" = nodeEnv.buildNodePackage { name = "_at_nestjs_slash_cli"; packageName = "@nestjs/cli"; - version = "7.5.3"; + version = "7.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/@nestjs/cli/-/cli-7.5.3.tgz"; - sha512 = "PgpdXaNNtWMRAnDzMEXjbCXDiJWoNcmnKa6HhJ9iLJaqdXkIILiLthJx64sZxB6GiE4UYWjbX/KuPH3N2dx/6Q=="; + url = "https://registry.npmjs.org/@nestjs/cli/-/cli-7.5.4.tgz"; + sha512 = "qKdniSA7NXO/5HqSxGaalMS7roIJXeT4yXTadBQ47Qv68DHh/0jfCcTzH6hqCuyRV7DV2k0bxob+rq4peMaZBw=="; }; dependencies = [ - sources."@angular-devkit/core-11.0.1" - sources."@angular-devkit/schematics-11.0.1" - sources."@angular-devkit/schematics-cli-0.1100.1" - sources."@babel/code-frame-7.10.4" - sources."@babel/helper-validator-identifier-7.10.4" + sources."@angular-devkit/core-11.0.3" + sources."@angular-devkit/schematics-11.0.3" + sources."@angular-devkit/schematics-cli-0.1100.3" + sources."@babel/code-frame-7.12.11" + sources."@babel/helper-validator-identifier-7.12.11" (sources."@babel/highlight-7.10.4" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -60347,20 +62084,20 @@ in sources."supports-color-5.5.0" ]; }) - (sources."@nestjs/schematics-7.2.2" // { + (sources."@nestjs/schematics-7.2.6" // { dependencies = [ - sources."@angular-devkit/core-11.0.0" - sources."@angular-devkit/schematics-11.0.0" + sources."@angular-devkit/core-11.0.5" + sources."@angular-devkit/schematics-11.0.5" ]; }) - sources."@schematics/schematics-0.1100.1" + sources."@schematics/schematics-0.1100.3" sources."@types/anymatch-1.3.1" sources."@types/eslint-7.2.6" sources."@types/eslint-scope-3.7.0" sources."@types/estree-0.0.45" sources."@types/json-schema-7.0.6" sources."@types/json5-0.0.29" - sources."@types/node-14.14.10" + sources."@types/node-14.14.20" sources."@types/parse-json-4.0.0" sources."@types/source-list-map-0.1.2" sources."@types/tapable-1.0.6" @@ -60408,10 +62145,10 @@ in sources."binary-extensions-2.1.0" sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."browserslist-4.15.0" + sources."browserslist-4.16.0" sources."buffer-from-1.1.1" sources."callsites-3.1.0" - sources."caniuse-lite-1.0.30001165" + sources."caniuse-lite-1.0.30001173" sources."chalk-3.0.0" sources."chardet-0.7.0" sources."chokidar-3.4.3" @@ -60432,11 +62169,11 @@ in sources."cross-spawn-7.0.3" sources."deepmerge-4.2.2" sources."defaults-1.0.3" - sources."electron-to-chromium-1.3.616" + sources."electron-to-chromium-1.3.634" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."enhanced-resolve-4.3.0" - sources."errno-0.1.7" + sources."errno-0.1.8" sources."error-ex-1.3.2" sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" @@ -60455,7 +62192,7 @@ in sources."figures-3.2.0" sources."fill-range-7.0.1" sources."find-up-4.1.0" - (sources."fork-ts-checker-webpack-plugin-6.0.2" // { + (sources."fork-ts-checker-webpack-plugin-6.0.5" // { dependencies = [ sources."chalk-4.1.0" ]; @@ -60474,7 +62211,7 @@ in sources."has-flag-4.0.0" sources."human-signals-1.1.1" sources."iconv-lite-0.4.24" - sources."import-fresh-3.2.2" + sources."import-fresh-3.3.0" sources."inflight-1.0.6" sources."inherits-2.0.4" (sources."inquirer-7.3.3" // { @@ -60525,15 +62262,15 @@ in sources."memfs-3.2.0" sources."memory-fs-0.5.0" sources."merge-stream-2.0.0" - sources."mime-db-1.44.0" - sources."mime-types-2.1.27" + sources."mime-db-1.45.0" + sources."mime-types-2.1.28" sources."mimic-fn-2.1.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mute-stream-0.0.8" sources."neo-async-2.6.2" sources."node-emoji-1.10.0" - sources."node-releases-1.1.67" + sources."node-releases-1.1.69" sources."normalize-path-3.0.0" sources."npm-run-path-4.0.1" sources."object-assign-4.1.1" @@ -60633,11 +62370,11 @@ in sources."universalify-1.0.0" sources."uri-js-4.4.0" sources."util-deprecate-1.0.2" - sources."watchpack-2.0.1" + sources."watchpack-2.1.0" sources."wcwidth-1.0.1" - (sources."webpack-5.4.0" // { + (sources."webpack-5.9.0" // { dependencies = [ - sources."enhanced-resolve-5.4.0" + sources."enhanced-resolve-5.4.1" sources."schema-utils-3.0.0" sources."tapable-2.2.0" ]; @@ -60675,10 +62412,10 @@ in }; dependencies = [ sources."@akryum/winattr-3.0.0" - sources."@apollo/federation-0.20.4" + sources."@apollo/federation-0.20.7" (sources."@apollo/protobufjs-1.0.5" // { dependencies = [ - sources."@types/node-10.17.48" + sources."@types/node-10.17.50" ]; }) sources."@apollographql/apollo-tools-0.4.8" @@ -60687,20 +62424,24 @@ in sources."@apollographql/graphql-language-service-types-2.0.2" 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/code-frame-7.12.11" sources."@babel/compat-data-7.12.7" - (sources."@babel/core-7.12.9" // { + (sources."@babel/core-7.12.10" // { dependencies = [ - sources."@babel/types-7.12.7" + sources."@babel/types-7.12.12" sources."semver-5.7.1" ]; }) - (sources."@babel/generator-7.12.5" // { + (sources."@babel/generator-7.12.10" // { dependencies = [ - sources."@babel/types-7.12.7" + sources."@babel/types-7.12.12" + ]; + }) + (sources."@babel/helper-annotate-as-pure-7.12.10" // { + dependencies = [ + sources."@babel/types-7.12.12" ]; }) - 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.12.5" // { dependencies = [ @@ -60711,74 +62452,82 @@ in sources."@babel/helper-create-regexp-features-plugin-7.12.7" (sources."@babel/helper-define-map-7.10.5" // { dependencies = [ - sources."@babel/types-7.12.7" + sources."@babel/types-7.12.12" ]; }) (sources."@babel/helper-explode-assignable-expression-7.12.1" // { dependencies = [ - sources."@babel/types-7.12.7" + sources."@babel/types-7.12.12" + ]; + }) + (sources."@babel/helper-function-name-7.12.11" // { + dependencies = [ + sources."@babel/types-7.12.12" + ]; + }) + (sources."@babel/helper-get-function-arity-7.12.10" // { + dependencies = [ + sources."@babel/types-7.12.12" ]; }) - 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.12.7" // { dependencies = [ - sources."@babel/types-7.12.7" + sources."@babel/types-7.12.12" ]; }) (sources."@babel/helper-module-imports-7.12.5" // { dependencies = [ - sources."@babel/types-7.12.7" + sources."@babel/types-7.12.12" ]; }) (sources."@babel/helper-module-transforms-7.12.1" // { dependencies = [ - sources."@babel/types-7.12.7" + sources."@babel/types-7.12.12" ]; }) - (sources."@babel/helper-optimise-call-expression-7.12.7" // { + (sources."@babel/helper-optimise-call-expression-7.12.10" // { dependencies = [ - sources."@babel/types-7.12.7" + sources."@babel/types-7.12.12" ]; }) sources."@babel/helper-plugin-utils-7.10.4" (sources."@babel/helper-remap-async-to-generator-7.12.1" // { dependencies = [ - sources."@babel/types-7.12.7" + sources."@babel/types-7.12.12" ]; }) - (sources."@babel/helper-replace-supers-7.12.5" // { + (sources."@babel/helper-replace-supers-7.12.11" // { dependencies = [ - sources."@babel/types-7.12.7" + sources."@babel/types-7.12.12" ]; }) (sources."@babel/helper-simple-access-7.12.1" // { dependencies = [ - sources."@babel/types-7.12.7" + sources."@babel/types-7.12.12" ]; }) (sources."@babel/helper-skip-transparent-expression-wrappers-7.12.1" // { dependencies = [ - sources."@babel/types-7.12.7" + sources."@babel/types-7.12.12" ]; }) - (sources."@babel/helper-split-export-declaration-7.11.0" // { + (sources."@babel/helper-split-export-declaration-7.12.11" // { dependencies = [ - sources."@babel/types-7.12.7" + sources."@babel/types-7.12.12" ]; }) - sources."@babel/helper-validator-identifier-7.10.4" - sources."@babel/helper-validator-option-7.12.1" + sources."@babel/helper-validator-identifier-7.12.11" + sources."@babel/helper-validator-option-7.12.11" sources."@babel/helper-wrap-function-7.12.3" (sources."@babel/helpers-7.12.5" // { dependencies = [ - sources."@babel/types-7.12.7" + sources."@babel/types-7.12.12" ]; }) sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.12.7" - sources."@babel/plugin-proposal-async-generator-functions-7.12.1" + sources."@babel/parser-7.12.11" + sources."@babel/plugin-proposal-async-generator-functions-7.12.12" sources."@babel/plugin-proposal-class-properties-7.12.1" sources."@babel/plugin-proposal-dynamic-import-7.12.1" sources."@babel/plugin-proposal-export-namespace-from-7.12.1" @@ -60808,14 +62557,14 @@ in sources."@babel/plugin-transform-arrow-functions-7.12.1" sources."@babel/plugin-transform-async-to-generator-7.12.1" sources."@babel/plugin-transform-block-scoped-functions-7.12.1" - sources."@babel/plugin-transform-block-scoping-7.12.1" + sources."@babel/plugin-transform-block-scoping-7.12.12" sources."@babel/plugin-transform-classes-7.12.1" sources."@babel/plugin-transform-computed-properties-7.12.1" sources."@babel/plugin-transform-destructuring-7.12.1" sources."@babel/plugin-transform-dotall-regex-7.12.1" sources."@babel/plugin-transform-duplicate-keys-7.12.1" sources."@babel/plugin-transform-exponentiation-operator-7.12.1" - sources."@babel/plugin-transform-flow-strip-types-7.12.1" + sources."@babel/plugin-transform-flow-strip-types-7.12.10" sources."@babel/plugin-transform-for-of-7.12.1" sources."@babel/plugin-transform-function-name-7.12.1" sources."@babel/plugin-transform-literals-7.12.1" @@ -60835,20 +62584,20 @@ in sources."@babel/plugin-transform-spread-7.12.1" sources."@babel/plugin-transform-sticky-regex-7.12.7" sources."@babel/plugin-transform-template-literals-7.12.1" - sources."@babel/plugin-transform-typeof-symbol-7.12.1" + sources."@babel/plugin-transform-typeof-symbol-7.12.10" sources."@babel/plugin-transform-typescript-7.12.1" sources."@babel/plugin-transform-unicode-escapes-7.12.1" sources."@babel/plugin-transform-unicode-regex-7.12.1" - (sources."@babel/preset-env-7.12.7" // { + (sources."@babel/preset-env-7.12.11" // { dependencies = [ - sources."@babel/types-7.12.7" + sources."@babel/types-7.12.12" sources."semver-5.7.1" ]; }) sources."@babel/preset-flow-7.12.1" sources."@babel/preset-modules-0.1.4" sources."@babel/preset-typescript-7.12.7" - (sources."@babel/register-7.12.1" // { + (sources."@babel/register-7.12.10" // { dependencies = [ sources."make-dir-2.1.0" sources."pify-4.0.1" @@ -60858,12 +62607,13 @@ in sources."@babel/runtime-7.12.5" (sources."@babel/template-7.12.7" // { dependencies = [ - sources."@babel/types-7.12.7" + sources."@babel/types-7.12.12" ]; }) - (sources."@babel/traverse-7.12.9" // { + (sources."@babel/traverse-7.12.12" // { dependencies = [ - sources."@babel/types-7.12.7" + sources."@babel/generator-7.12.11" + sources."@babel/types-7.12.12" ]; }) sources."@babel/types-7.10.4" @@ -60874,9 +62624,9 @@ in sources."@hapi/joi-15.1.1" sources."@hapi/topo-3.1.6" sources."@mrmlnc/readdir-enhanced-2.2.1" - sources."@nodelib/fs.scandir-2.1.3" - sources."@nodelib/fs.stat-2.0.3" - sources."@nodelib/fs.walk-1.2.4" + sources."@nodelib/fs.scandir-2.1.4" + sources."@nodelib/fs.stat-2.0.4" + sources."@nodelib/fs.walk-1.2.6" (sources."@oclif/color-0.1.2" // { dependencies = [ (sources."chalk-3.0.0" // { @@ -60893,7 +62643,7 @@ in }) (sources."@oclif/command-1.8.0" // { dependencies = [ - sources."@oclif/plugin-help-3.2.0" + sources."@oclif/plugin-help-3.2.1" sources."lru-cache-6.0.0" sources."semver-7.3.4" sources."yallist-4.0.0" @@ -60919,7 +62669,17 @@ in }) sources."@oclif/linewrap-1.0.0" sources."@oclif/parser-3.8.5" - sources."@oclif/plugin-autocomplete-0.2.0" + (sources."@oclif/plugin-autocomplete-0.2.1" // { + dependencies = [ + sources."fs-extra-9.0.1" + (sources."jsonfile-6.1.0" // { + dependencies = [ + sources."universalify-2.0.0" + ]; + }) + sources."universalify-1.0.0" + ]; + }) (sources."@oclif/plugin-help-2.2.3" // { dependencies = [ sources."ansi-regex-3.0.0" @@ -60943,7 +62703,7 @@ in sources."strip-ansi-5.2.0" ]; }) - (sources."@oclif/plugin-plugins-1.9.3" // { + (sources."@oclif/plugin-plugins-1.9.4" // { dependencies = [ sources."fs-extra-8.1.0" sources."lru-cache-6.0.0" @@ -60974,13 +62734,13 @@ in sources."@sindresorhus/is-0.7.0" sources."@types/accepts-1.3.5" sources."@types/body-parser-1.19.0" - sources."@types/connect-3.4.33" + sources."@types/connect-3.4.34" sources."@types/content-disposition-0.5.3" - sources."@types/cookies-0.7.5" + sources."@types/cookies-0.7.6" sources."@types/cors-2.8.8" sources."@types/ejs-2.7.0" sources."@types/express-4.17.7" - sources."@types/express-serve-static-core-4.17.13" + sources."@types/express-serve-static-core-4.17.17" sources."@types/fs-capacitor-2.0.0" sources."@types/glob-7.1.3" (sources."@types/graphql-upload-8.0.4" // { @@ -61004,7 +62764,7 @@ in sources."@types/long-4.0.1" sources."@types/mime-2.0.3" sources."@types/minimatch-3.0.3" - sources."@types/node-14.14.10" + sources."@types/node-14.14.20" (sources."@types/node-fetch-2.5.7" // { dependencies = [ sources."form-data-3.0.0" @@ -61016,7 +62776,7 @@ in sources."@types/serve-static-1.13.8" sources."@types/through-0.0.30" sources."@types/ws-7.4.0" - sources."@types/zen-observable-0.8.1" + sources."@types/zen-observable-0.8.2" sources."@vue/cli-shared-utils-4.5.9" (sources."@vue/cli-ui-4.5.9" // { dependencies = [ @@ -61025,24 +62785,24 @@ in }) sources."@vue/cli-ui-addon-webpack-4.5.9" sources."@vue/cli-ui-addon-widgets-4.5.9" - (sources."@vue/compiler-core-3.0.4" // { + (sources."@vue/compiler-core-3.0.5" // { dependencies = [ - sources."@babel/types-7.12.7" + sources."@babel/types-7.12.12" sources."source-map-0.6.1" ]; }) - sources."@vue/compiler-dom-3.0.4" - (sources."@vue/compiler-sfc-3.0.4" // { + sources."@vue/compiler-dom-3.0.5" + (sources."@vue/compiler-sfc-3.0.5" // { dependencies = [ - sources."@babel/types-7.12.7" + sources."@babel/types-7.12.12" sources."source-map-0.6.1" ]; }) - sources."@vue/compiler-ssr-3.0.4" - sources."@vue/reactivity-3.0.4" - sources."@vue/runtime-core-3.0.4" - sources."@vue/runtime-dom-3.0.4" - sources."@vue/shared-3.0.4" + sources."@vue/compiler-ssr-3.0.5" + sources."@vue/reactivity-3.0.5" + sources."@vue/runtime-core-3.0.5" + sources."@vue/runtime-dom-3.0.5" + sources."@vue/shared-3.0.5" sources."@wry/context-0.4.4" sources."@wry/equality-0.1.11" sources."abbrev-1.1.1" @@ -61086,31 +62846,31 @@ in sources."to-regex-range-2.1.1" ]; }) - (sources."apollo-2.31.2" // { + (sources."apollo-2.32.0" // { dependencies = [ sources."mkdirp-1.0.4" sources."strip-ansi-5.2.0" ]; }) sources."apollo-cache-1.3.5" - sources."apollo-cache-control-0.11.4" + sources."apollo-cache-control-0.11.5" sources."apollo-cache-inmemory-1.6.6" sources."apollo-client-2.6.10" - (sources."apollo-codegen-core-0.38.2" // { + (sources."apollo-codegen-core-0.39.0" // { dependencies = [ sources."recast-0.20.4" sources."source-map-0.6.1" sources."tslib-2.0.3" ]; }) - sources."apollo-codegen-flow-0.36.2" - sources."apollo-codegen-scala-0.37.2" - sources."apollo-codegen-swift-0.38.2" - sources."apollo-codegen-typescript-0.38.2" + sources."apollo-codegen-flow-0.37.0" + sources."apollo-codegen-scala-0.38.0" + sources."apollo-codegen-swift-0.39.0" + sources."apollo-codegen-typescript-0.39.0" sources."apollo-datasource-0.7.2" sources."apollo-env-0.6.5" sources."apollo-graphql-0.6.0" - sources."apollo-language-server-1.24.1" + sources."apollo-language-server-1.25.0" sources."apollo-link-1.2.14" sources."apollo-link-context-1.0.20" sources."apollo-link-error-1.1.13" @@ -61119,19 +62879,19 @@ in sources."apollo-link-persisted-queries-0.2.2" sources."apollo-link-state-0.4.2" sources."apollo-link-ws-1.0.20" - sources."apollo-reporting-protobuf-0.6.1" + sources."apollo-reporting-protobuf-0.6.2" sources."apollo-server-caching-0.5.2" - (sources."apollo-server-core-2.19.0" // { + (sources."apollo-server-core-2.19.1" // { dependencies = [ - sources."uuid-8.3.1" + sources."uuid-8.3.2" ]; }) sources."apollo-server-env-2.4.5" sources."apollo-server-errors-2.4.2" - sources."apollo-server-express-2.19.0" - sources."apollo-server-plugin-base-0.10.2" - sources."apollo-server-types-0.6.1" - sources."apollo-tracing-0.12.0" + sources."apollo-server-express-2.19.1" + sources."apollo-server-plugin-base-0.10.3" + sources."apollo-server-types-0.6.2" + sources."apollo-tracing-0.12.1" sources."apollo-upload-client-11.0.0" sources."apollo-utilities-1.3.4" (sources."archive-type-4.0.0" // { @@ -61140,7 +62900,11 @@ in ]; }) sources."arg-4.1.3" - sources."argparse-1.0.10" + (sources."argparse-1.0.10" // { + dependencies = [ + sources."sprintf-js-1.0.3" + ]; + }) sources."arr-diff-4.0.0" sources."arr-flatten-1.1.0" sources."arr-union-3.1.0" @@ -61193,6 +62957,7 @@ in sources."setprototypeof-1.1.1" ]; }) + sources."boolean-3.0.2" (sources."boxen-4.2.0" // { dependencies = [ (sources."ansi-align-3.0.0" // { @@ -61217,7 +62982,7 @@ in }) sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."browserslist-4.15.0" + sources."browserslist-4.16.0" sources."buffer-5.7.1" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" @@ -61249,7 +63014,7 @@ in ]; }) sources."camelcase-4.1.0" - sources."caniuse-lite-1.0.30001165" + sources."caniuse-lite-1.0.30001173" (sources."capital-case-1.0.4" // { dependencies = [ sources."tslib-2.0.3" @@ -61311,7 +63076,7 @@ in sources."strip-ansi-3.0.1" ]; }) - (sources."cli-ux-5.5.0" // { + (sources."cli-ux-5.5.1" // { dependencies = [ sources."ansi-escapes-4.3.1" sources."ansi-styles-4.3.0" @@ -61321,21 +63086,15 @@ in sources."color-name-1.1.4" sources."escape-string-regexp-4.0.0" sources."extract-stack-2.0.0" - sources."fs-extra-9.0.1" + sources."fs-extra-8.1.0" sources."has-flag-4.0.0" sources."is-wsl-2.2.0" - (sources."jsonfile-6.1.0" // { - dependencies = [ - sources."universalify-2.0.0" - ]; - }) sources."lru-cache-6.0.0" sources."semver-7.3.4" sources."supports-color-7.2.0" sources."supports-hyperlinks-2.1.0" sources."tslib-2.0.3" sources."type-fest-0.11.0" - sources."universalify-1.0.0" sources."yallist-4.0.0" ]; }) @@ -61386,8 +63145,8 @@ in sources."cookie-0.4.0" sources."cookie-signature-1.0.6" sources."copy-descriptor-0.1.1" - sources."core-js-3.8.0" - (sources."core-js-compat-3.8.0" // { + sources."core-js-3.8.2" + (sources."core-js-compat-3.8.2" // { dependencies = [ sources."semver-7.0.0" ]; @@ -61412,7 +63171,7 @@ in sources."csv-parser-1.12.1" sources."dashdash-1.14.1" sources."date-fns-1.30.1" - (sources."debug-4.3.1" // { + (sources."debug-4.3.2" // { dependencies = [ sources."ms-2.1.2" ]; @@ -61457,6 +63216,7 @@ in sources."depd-1.1.2" sources."deprecated-decorator-0.1.6" sources."destroy-1.0.4" + sources."detect-node-2.0.4" sources."dicer-0.3.0" sources."diff-4.0.2" sources."dir-glob-3.0.1" @@ -61482,7 +63242,7 @@ in sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.3.616" + sources."electron-to-chromium-1.3.634" sources."elegant-spinner-1.0.1" sources."emoji-regex-8.0.0" sources."emojis-list-3.0.0" @@ -61494,12 +63254,13 @@ in sources."error-ex-1.3.2" sources."es-abstract-1.17.7" sources."es-to-primitive-1.2.1" + sources."es6-error-4.1.1" sources."escalade-3.1.1" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" sources."esm-3.2.25" sources."esprima-4.0.1" - sources."estree-walker-2.0.1" + sources."estree-walker-2.0.2" sources."esutils-2.0.3" sources."etag-1.8.1" sources."event-pubsub-4.3.0" @@ -61551,7 +63312,7 @@ in sources."fast-glob-3.2.4" sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" - sources."fastq-1.9.0" + sources."fastq-1.10.0" sources."fd-slicer-1.1.0" sources."figures-1.7.0" sources."file-type-8.1.0" @@ -61573,7 +63334,7 @@ in }) sources."find-up-3.0.0" sources."fkill-6.2.0" - sources."flow-parser-0.138.0" + sources."flow-parser-0.141.0" sources."for-in-1.0.2" sources."forever-agent-0.6.1" sources."form-data-2.3.3" @@ -61595,7 +63356,7 @@ in sources."generic-names-2.0.1" sources."gensync-1.0.0-beta.2" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.0.1" + sources."get-intrinsic-1.0.2" sources."get-proxy-2.1.0" sources."get-stream-4.1.0" sources."get-value-2.0.6" @@ -61613,8 +63374,16 @@ in sources."glob-7.1.5" sources."glob-parent-5.1.1" sources."glob-to-regexp-0.3.0" + (sources."global-agent-2.1.12" // { + dependencies = [ + sources."lru-cache-6.0.0" + sources."semver-7.3.4" + sources."yallist-4.0.0" + ]; + }) sources."global-dirs-0.1.1" sources."globals-11.12.0" + sources."globalthis-1.0.1" (sources."globby-9.2.0" // { dependencies = [ sources."@nodelib/fs.stat-1.1.3" @@ -61663,7 +63432,7 @@ in sources."ts-invariant-0.3.3" ]; }) - sources."graphql-extensions-0.12.6" + sources."graphql-extensions-0.12.7" sources."graphql-subscriptions-1.1.0" sources."graphql-tag-2.11.0" sources."graphql-tools-4.0.8" @@ -61728,7 +63497,7 @@ in sources."inflected-2.1.0" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."ini-1.3.5" + sources."ini-1.3.8" (sources."inquirer-7.3.3" // { dependencies = [ sources."ansi-escapes-4.3.1" @@ -61799,7 +63568,7 @@ in sources."js-message-1.0.7" sources."js-queue-2.0.2" sources."js-tokens-4.0.0" - sources."js-yaml-3.14.0" + sources."js-yaml-3.14.1" sources."jsbn-0.1.1" (sources."jscodeshift-0.10.0" // { dependencies = [ @@ -61910,6 +63679,11 @@ in sources."make-error-1.3.6" sources."map-cache-0.2.2" sources."map-visit-1.0.0" + (sources."matcher-3.0.0" // { + dependencies = [ + sources."escape-string-regexp-4.0.0" + ]; + }) sources."media-typer-0.3.0" sources."merge-1.2.1" sources."merge-descriptors-1.0.1" @@ -61923,8 +63697,8 @@ in sources."methods-1.1.2" sources."micromatch-4.0.2" sources."mime-1.6.0" - sources."mime-db-1.44.0" - sources."mime-types-2.1.27" + sources."mime-db-1.45.0" + sources."mime-types-2.1.28" sources."mimic-fn-1.2.0" sources."mimic-response-1.0.1" sources."minimalistic-assert-1.0.1" @@ -61971,11 +63745,11 @@ in sources."is-wsl-2.2.0" ]; }) - sources."node-releases-1.1.67" + sources."node-releases-1.1.69" (sources."nodemon-1.19.4" // { dependencies = [ sources."debug-3.2.7" - sources."ms-2.1.2" + sources."ms-2.1.3" sources."semver-5.7.1" ]; }) @@ -62008,7 +63782,7 @@ in sources."object-inspect-1.9.0" sources."object-keys-1.1.1" sources."object-path-0.11.5" - sources."object-treeify-1.1.30" + sources."object-treeify-1.1.31" sources."object-visit-1.0.1" sources."object.assign-4.1.2" (sources."object.getownpropertydescriptors-2.1.1" // { @@ -62092,7 +63866,7 @@ in (sources."portfinder-1.0.28" // { dependencies = [ sources."debug-3.2.7" - sources."ms-2.1.2" + sources."ms-2.1.3" ]; }) sources."posix-character-classes-0.1.1" @@ -62110,7 +63884,7 @@ in sources."postcss-selector-parser-6.0.4" sources."postcss-value-parser-4.1.0" sources."prepend-http-1.0.4" - sources."prismjs-1.22.0" + sources."prismjs-1.23.0" sources."private-0.1.8" sources."process-exists-3.1.0" sources."process-nextick-args-2.0.1" @@ -62202,7 +63976,8 @@ in sources."retry-0.12.0" sources."reusify-1.0.4" sources."rimraf-3.0.2" - sources."rss-parser-3.9.0" + sources."roarr-2.15.4" + sources."rss-parser-3.10.0" sources."run-async-2.4.1" sources."run-parallel-1.1.10" sources."rxjs-6.6.3" @@ -62214,6 +63989,7 @@ in sources."seek-bzip-1.0.6" sources."select-1.1.2" sources."semver-6.3.0" + sources."semver-compare-1.0.0" (sources."semver-diff-2.1.0" // { dependencies = [ sources."semver-5.7.1" @@ -62236,6 +64012,11 @@ in sources."tslib-2.0.3" ]; }) + (sources."serialize-error-7.0.1" // { + dependencies = [ + sources."type-fest-0.13.1" + ]; + }) sources."serve-static-1.14.1" sources."set-blocking-2.0.0" sources."set-value-2.0.1" @@ -62305,7 +64086,7 @@ in ]; }) sources."split2-2.2.0" - sources."sprintf-js-1.0.3" + sources."sprintf-js-1.1.2" sources."sshpk-1.16.1" (sources."static-extend-0.1.2" // { dependencies = [ @@ -62523,7 +64304,7 @@ in (sources."vue-codemod-0.0.4" // { dependencies = [ sources."globby-10.0.2" - sources."vue-3.0.4" + sources."vue-3.0.5" ]; }) sources."watch-1.0.2" @@ -62707,13 +64488,13 @@ in sha512 = "RzgRzhCQJ/DBak+Yoy2bo4W6dUdqiswX8PN7qXsIZpNLYMcOOkcaq2o5gkiT/Y2HM3Rt08GxnBBlanXTrryTKQ=="; }; dependencies = [ - sources."@babel/code-frame-7.10.4" - sources."@babel/generator-7.12.5" - sources."@babel/helper-validator-identifier-7.10.4" + sources."@babel/code-frame-7.12.11" + sources."@babel/generator-7.12.11" + sources."@babel/helper-validator-identifier-7.12.11" sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.12.7" + sources."@babel/parser-7.12.11" sources."@babel/template-7.12.7" - sources."@babel/types-7.12.7" + sources."@babel/types-7.12.12" sources."@webassemblyjs/ast-1.9.1" sources."@webassemblyjs/floating-point-hex-parser-1.9.1" sources."@webassemblyjs/helper-api-error-1.9.1" @@ -62786,39 +64567,39 @@ in alloy = nodeEnv.buildNodePackage { name = "alloy"; packageName = "alloy"; - version = "1.15.3"; + version = "1.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/alloy/-/alloy-1.15.3.tgz"; - sha512 = "RYp9vX+/ojXMCpxMOsZu9e4X5+k3Nlq3vW4gdMkIVXIlk7hfvNcBfAYMeq3ao68cyYQFLJWVkFY0DlQfn0hQhQ=="; + url = "https://registry.npmjs.org/alloy/-/alloy-1.15.4.tgz"; + sha512 = "bBFO/imgikyrGd6urHfiZDmceZzAMfWeAmt5Fd9du5B+rv6IIJsDZMrTcalKUhwL6NdM0mBwkFcLmQvjm8UMOw=="; }; dependencies = [ - sources."@babel/code-frame-7.10.4" - (sources."@babel/core-7.12.9" // { + sources."@babel/code-frame-7.12.11" + (sources."@babel/core-7.12.10" // { dependencies = [ sources."source-map-0.5.7" ]; }) - (sources."@babel/generator-7.12.5" // { + (sources."@babel/generator-7.12.11" // { dependencies = [ sources."source-map-0.5.7" ]; }) - sources."@babel/helper-function-name-7.10.4" - sources."@babel/helper-get-function-arity-7.10.4" + sources."@babel/helper-function-name-7.12.11" + sources."@babel/helper-get-function-arity-7.12.10" sources."@babel/helper-member-expression-to-functions-7.12.7" sources."@babel/helper-module-imports-7.12.5" sources."@babel/helper-module-transforms-7.12.1" - sources."@babel/helper-optimise-call-expression-7.12.7" - sources."@babel/helper-replace-supers-7.12.5" + sources."@babel/helper-optimise-call-expression-7.12.10" + sources."@babel/helper-replace-supers-7.12.11" sources."@babel/helper-simple-access-7.12.1" - sources."@babel/helper-split-export-declaration-7.11.0" - sources."@babel/helper-validator-identifier-7.10.4" + sources."@babel/helper-split-export-declaration-7.12.11" + sources."@babel/helper-validator-identifier-7.12.11" sources."@babel/helpers-7.12.5" sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.12.7" + sources."@babel/parser-7.12.11" sources."@babel/template-7.12.7" - sources."@babel/traverse-7.12.9" - sources."@babel/types-7.12.7" + sources."@babel/traverse-7.12.12" + sources."@babel/types-7.12.12" sources."JSV-4.0.2" sources."ansi-styles-3.2.1" sources."array-unique-0.3.2" @@ -62832,7 +64613,7 @@ in sources."commander-2.20.3" sources."concat-map-0.0.1" sources."convert-source-map-1.7.0" - sources."debug-4.3.1" + sources."debug-4.3.2" sources."ejs-3.1.5" sources."ensure-posix-path-1.1.1" sources."escape-string-regexp-1.0.5" @@ -62857,7 +64638,7 @@ in sources."has-color-0.1.7" sources."has-flag-3.0.0" sources."homedir-polyfill-1.0.3" - sources."ini-1.3.5" + sources."ini-1.3.8" sources."is-3.3.0" sources."is-core-module-2.2.0" sources."is-windows-1.0.2" @@ -62925,7 +64706,7 @@ in dependencies = [ sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" - sources."@types/node-14.14.10" + sources."@types/node-14.14.20" sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" sources."chromium-pickle-js-0.2.0" @@ -63029,8 +64810,8 @@ in sources."levn-0.3.0" sources."lodash-4.17.20" sources."lodash.sortby-4.7.0" - sources."mime-db-1.44.0" - sources."mime-types-2.1.27" + sources."mime-db-1.45.0" + sources."mime-types-2.1.28" sources."minimatch-3.0.4" sources."nwsapi-2.2.0" sources."oauth-sign-0.9.0" @@ -63061,14 +64842,14 @@ in sources."tweetnacl-0.14.5" sources."type-check-0.3.2" sources."uri-js-4.4.0" - sources."urijs-1.19.2" + sources."urijs-1.19.5" sources."uuid-3.4.0" sources."verror-1.10.0" - sources."vscode-jsonrpc-5.0.1" + sources."vscode-jsonrpc-6.0.0" sources."vscode-languageserver-6.1.1" - sources."vscode-languageserver-protocol-3.15.3" + sources."vscode-languageserver-protocol-3.16.0" sources."vscode-languageserver-textdocument-1.0.1" - sources."vscode-languageserver-types-3.15.1" + sources."vscode-languageserver-types-3.16.0" sources."w3c-hr-time-1.0.2" sources."web-tree-sitter-0.16.4" sources."webidl-conversions-4.0.2" @@ -63324,7 +65105,7 @@ in sources."bn.js-4.11.9" ]; }) - sources."es-abstract-1.17.7" + sources."es-abstract-1.18.0-next.1" sources."es-to-primitive-1.2.1" sources."events-3.2.0" sources."evp_bytestokey-1.0.3" @@ -63333,7 +65114,7 @@ in sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."get-assigned-identifiers-1.2.0" - sources."get-intrinsic-1.0.1" + sources."get-intrinsic-1.0.2" sources."glob-7.1.6" sources."has-1.0.3" sources."has-symbols-1.0.1" @@ -63357,9 +65138,10 @@ in sources."is-core-module-2.2.0" sources."is-date-object-1.0.2" sources."is-generator-function-1.0.8" + sources."is-negative-zero-2.0.1" sources."is-regex-1.1.1" sources."is-symbol-1.0.3" - sources."is-typed-array-1.1.3" + sources."is-typed-array-1.1.4" sources."isarray-1.0.0" sources."jsonparse-1.3.1" sources."labeled-stream-splicer-2.0.2" @@ -63450,7 +65232,7 @@ in sources."util-0.12.3" sources."util-deprecate-1.0.2" sources."vm-browserify-1.1.2" - sources."which-typed-array-1.1.2" + sources."which-typed-array-1.1.4" sources."wrappy-1.0.2" sources."xtend-4.0.2" ]; @@ -63467,10 +65249,10 @@ in btc-rpc-explorer = nodeEnv.buildNodePackage { name = "btc-rpc-explorer"; packageName = "btc-rpc-explorer"; - version = "2.0.2"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/btc-rpc-explorer/-/btc-rpc-explorer-2.0.2.tgz"; - sha512 = "TTdFGXzJ8HLn4PCNYRS4S7P3SgglZkBtJeNQP8r7tTjbugoameVvzDOLgVAy/zPQVoUXBuBPfnbm4Sky9VJOmw=="; + url = "https://registry.npmjs.org/btc-rpc-explorer/-/btc-rpc-explorer-2.1.0.tgz"; + sha512 = "dB+CI/FcZWmQPD5P1uMGnnCi6a/skTTFHWnPRYq5lfYPc9k6Cjz/nTIrZXhIHBcdxiwEiY10QX3UqYLQgF58dA=="; }; dependencies = [ sources."@types/babel-types-7.0.9" @@ -63573,7 +65355,7 @@ in sources."dashdash-1.14.1" (sources."debug-4.1.1" // { dependencies = [ - sources."ms-2.1.2" + sources."ms-2.1.3" ]; }) (sources."debugnyan-1.0.0" // { @@ -63687,7 +65469,11 @@ in sources."json-stringify-safe-5.0.1" sources."jsprim-1.4.1" sources."jstransformer-1.0.0" - sources."jstransformer-markdown-it-2.1.0" + (sources."jstransformer-markdown-it-2.1.0" // { + dependencies = [ + sources."markdown-it-8.4.2" + ]; + }) sources."kind-of-3.2.2" sources."lazy-cache-1.0.4" sources."linkify-it-2.2.0" @@ -63698,8 +65484,13 @@ in sources."loud-rejection-1.6.0" sources."lru-cache-5.1.1" sources."map-obj-2.0.0" - sources."markdown-it-8.4.2" - sources."marked-0.7.0" + (sources."markdown-it-12.0.4" // { + dependencies = [ + sources."argparse-2.0.1" + sources."entities-2.1.0" + sources."linkify-it-3.0.2" + ]; + }) sources."md5-2.3.0" sources."md5.js-1.3.5" sources."mdurl-1.0.1" @@ -63709,8 +65500,8 @@ in sources."merkle-lib-2.0.10" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.44.0" - sources."mime-types-2.1.27" + sources."mime-db-1.45.0" + sources."mime-types-2.1.28" sources."minimalistic-assert-1.0.1" sources."minimalistic-crypto-utils-1.0.1" sources."minimatch-3.0.4" @@ -63934,7 +65725,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-13.13.34" + sources."@types/node-13.13.39" sources."addr-to-ip-port-1.5.1" sources."airplay-js-0.2.16" sources."ajv-6.12.6" @@ -63981,7 +65772,7 @@ in sources."caseless-0.12.0" (sources."castv2-0.1.10" // { dependencies = [ - sources."debug-4.3.1" + sources."debug-4.3.2" ]; }) sources."castv2-client-1.2.0" @@ -63996,7 +65787,7 @@ in sources."co-3.1.0" sources."codepage-1.4.0" sources."combined-stream-1.0.8" - sources."commander-6.2.0" + sources."commander-6.2.1" sources."compact2string-1.4.1" sources."concat-map-0.0.1" (sources."concat-stream-2.0.0" // { @@ -64115,8 +65906,8 @@ in ]; }) sources."mime-1.6.0" - sources."mime-db-1.44.0" - sources."mime-types-2.1.27" + sources."mime-db-1.45.0" + sources."mime-types-2.1.28" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" @@ -64336,6 +66127,514 @@ in bypassCache = true; reconstructLock = true; }; + cdk8s-cli = nodeEnv.buildNodePackage { + name = "cdk8s-cli"; + packageName = "cdk8s-cli"; + version = "1.0.0-beta.5"; + src = fetchurl { + url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-1.0.0-beta.5.tgz"; + sha512 = "5jVubGjmRXlrXPDJIl2g2oWApFmN7V2EzonMWDd67TlaOwwS8Ypy4ej3VvwviXyZ7IO9zET4pDNFSInBQE+aJw=="; + }; + dependencies = [ + sources."@jsii/spec-1.16.0" + sources."@types/node-10.17.50" + sources."ansi-regex-5.0.0" + sources."ansi-styles-4.3.0" + sources."array-filter-1.0.0" + sources."at-least-node-1.0.0" + sources."available-typed-arrays-1.0.2" + sources."call-bind-1.0.0" + sources."camelcase-6.2.0" + sources."case-1.6.3" + sources."cdk8s-1.0.0-beta.5" + sources."cliui-7.0.4" + sources."clone-2.1.2" + (sources."codemaker-1.16.0" // { + dependencies = [ + sources."fs-extra-9.0.1" + ]; + }) + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."colors-1.4.0" + sources."commonmark-0.29.3" + sources."constructs-3.2.94" + sources."date-format-3.0.0" + sources."debug-4.3.2" + sources."decamelize-4.0.0" + sources."deep-equal-2.0.5" + sources."define-properties-1.1.3" + sources."detect-indent-5.0.0" + sources."detect-newline-2.1.0" + sources."dot-case-3.0.4" + sources."emoji-regex-8.0.0" + sources."entities-2.0.3" + sources."es-abstract-1.17.7" + sources."es-get-iterator-1.1.1" + sources."es-to-primitive-1.2.1" + sources."escalade-3.1.1" + sources."escape-string-regexp-4.0.0" + sources."find-up-4.1.0" + sources."flatted-2.0.2" + sources."foreach-2.0.5" + (sources."fs-extra-8.1.0" // { + dependencies = [ + sources."jsonfile-4.0.0" + sources."universalify-0.1.2" + ]; + }) + sources."function-bind-1.1.1" + sources."get-caller-file-2.0.5" + sources."get-intrinsic-1.0.2" + sources."graceful-fs-4.2.4" + sources."has-1.0.3" + sources."has-symbols-1.0.1" + sources."is-arguments-1.1.0" + sources."is-bigint-1.0.1" + sources."is-boolean-object-1.1.0" + sources."is-callable-1.2.2" + sources."is-date-object-1.0.2" + sources."is-fullwidth-code-point-3.0.0" + sources."is-map-2.0.2" + sources."is-negative-zero-2.0.1" + sources."is-number-object-1.0.4" + sources."is-regex-1.1.1" + sources."is-set-2.0.2" + sources."is-string-1.0.5" + sources."is-symbol-1.0.3" + (sources."is-typed-array-1.1.4" // { + dependencies = [ + sources."es-abstract-1.18.0-next.1" + ]; + }) + sources."is-weakmap-2.0.1" + sources."is-weakset-2.0.1" + sources."isarray-2.0.5" + (sources."jsii-1.16.0" // { + dependencies = [ + sources."fs-extra-9.0.1" + sources."yargs-16.2.0" + ]; + }) + (sources."jsii-pacmak-1.16.0" // { + dependencies = [ + sources."fs-extra-9.0.1" + sources."yargs-16.2.0" + ]; + }) + (sources."jsii-reflect-1.16.0" // { + dependencies = [ + sources."fs-extra-9.0.1" + sources."yargs-16.2.0" + ]; + }) + (sources."jsii-rosetta-1.16.0" // { + dependencies = [ + sources."fs-extra-9.0.1" + sources."yargs-16.2.0" + ]; + }) + (sources."jsii-srcmak-0.1.180" // { + dependencies = [ + sources."fs-extra-9.0.1" + ]; + }) + sources."json-schema-0.2.5" + sources."json2jsii-0.1.172" + (sources."jsonfile-6.1.0" // { + dependencies = [ + sources."universalify-2.0.0" + ]; + }) + sources."jsonschema-1.4.0" + sources."locate-path-5.0.0" + sources."log4js-6.3.0" + sources."lower-case-2.0.2" + sources."lru-cache-6.0.0" + sources."mdurl-1.0.1" + sources."minimist-1.2.5" + sources."ms-2.1.2" + sources."ncp-2.0.0" + sources."no-case-3.0.4" + sources."object-inspect-1.9.0" + sources."object-is-1.1.4" + sources."object-keys-1.1.1" + sources."object.assign-4.1.2" + sources."oo-ascii-tree-1.16.0" + sources."p-limit-2.3.0" + sources."p-locate-4.1.0" + sources."p-try-2.2.0" + sources."path-exists-4.0.0" + sources."regexp.prototype.flags-1.3.0" + sources."require-directory-2.1.1" + sources."require-main-filename-2.0.0" + sources."rfdc-1.1.4" + sources."semver-7.3.4" + (sources."semver-intersect-1.4.0" // { + dependencies = [ + sources."semver-5.7.1" + ]; + }) + sources."set-blocking-2.0.0" + sources."side-channel-1.0.4" + sources."snake-case-3.0.4" + sources."sort-json-2.0.0" + sources."spdx-license-list-6.3.0" + sources."sscaff-1.2.0" + (sources."streamroller-2.2.4" // { + dependencies = [ + sources."date-format-2.1.0" + ]; + }) + sources."string-width-4.2.0" + sources."string.prototype.repeat-0.2.0" + sources."string.prototype.trimend-1.0.3" + sources."string.prototype.trimstart-1.0.3" + sources."strip-ansi-6.0.0" + sources."tslib-2.0.3" + sources."typescript-3.9.7" + sources."universalify-1.0.0" + sources."which-boxed-primitive-1.0.2" + sources."which-collection-1.0.1" + sources."which-module-2.0.0" + (sources."which-typed-array-1.1.4" // { + dependencies = [ + sources."es-abstract-1.18.0-next.1" + ]; + }) + sources."wrap-ansi-7.0.0" + sources."xmlbuilder-15.1.1" + sources."xmldom-0.4.0" + sources."y18n-5.0.5" + sources."yallist-4.0.0" + sources."yaml-1.10.0" + (sources."yargs-15.4.1" // { + dependencies = [ + sources."camelcase-5.3.1" + sources."cliui-6.0.0" + sources."decamelize-1.2.0" + sources."wrap-ansi-6.2.0" + sources."y18n-4.0.1" + sources."yargs-parser-18.1.3" + ]; + }) + sources."yargs-parser-20.2.4" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "CDK for Kubernetes CLI"; + homepage = "https://github.com/awslabs/cdk8s#readme"; + license = "Apache-2.0"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; + cdktf-cli = nodeEnv.buildNodePackage { + name = "cdktf-cli"; + packageName = "cdktf-cli"; + version = "0.0.19"; + src = fetchurl { + url = "https://registry.npmjs.org/cdktf-cli/-/cdktf-cli-0.0.19.tgz"; + sha512 = "JH2DyIQyhpI8lwO4HANha/HiVV2MXVG63iK+PZbEZKJDEr3fVB0WSKvzrp66CarceLiuNy7Z5cIR+81Q6eMx+w=="; + }; + dependencies = [ + sources."@jsii/spec-1.16.0" + sources."@types/node-14.14.20" + sources."@types/readline-sync-1.4.3" + sources."@types/uuid-8.3.0" + sources."@types/yoga-layout-1.9.2" + sources."ansi-escapes-4.3.1" + sources."ansi-regex-5.0.0" + sources."ansi-styles-4.3.0" + sources."array-filter-1.0.0" + sources."array-includes-3.1.2" + sources."array.prototype.flatmap-1.2.4" + sources."arrify-2.0.1" + sources."astral-regex-2.0.0" + sources."at-least-node-1.0.0" + sources."auto-bind-4.0.0" + sources."available-typed-arrays-1.0.2" + sources."call-bind-1.0.0" + sources."camelcase-5.3.1" + sources."case-1.6.3" + sources."cdktf-0.0.19" + sources."chalk-4.1.0" + sources."ci-info-2.0.0" + sources."cli-cursor-3.1.0" + sources."cli-spinners-1.3.1" + sources."cli-truncate-2.1.0" + (sources."cliui-7.0.4" // { + dependencies = [ + sources."wrap-ansi-7.0.0" + ]; + }) + sources."clone-2.1.2" + sources."codemaker-0.22.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."colors-1.4.0" + sources."commonmark-0.29.3" + sources."constructs-3.2.94" + sources."date-format-3.0.0" + sources."debug-4.3.2" + sources."decamelize-1.2.0" + sources."deep-equal-2.0.5" + sources."define-properties-1.1.3" + sources."detect-indent-5.0.0" + sources."detect-newline-2.1.0" + sources."doctrine-2.1.0" + sources."emoji-regex-8.0.0" + sources."entities-2.0.3" + sources."es-abstract-1.18.0-next.1" + sources."es-get-iterator-1.1.1" + sources."es-to-primitive-1.2.1" + sources."escalade-3.1.1" + sources."escape-string-regexp-4.0.0" + sources."eslint-plugin-react-7.22.0" + sources."esutils-2.0.3" + sources."find-up-4.1.0" + sources."flatted-2.0.2" + sources."foreach-2.0.5" + sources."fs-extra-8.1.0" + sources."function-bind-1.1.1" + sources."get-caller-file-2.0.5" + sources."get-intrinsic-1.0.2" + sources."graceful-fs-4.2.4" + sources."has-1.0.3" + sources."has-flag-4.0.0" + sources."has-symbols-1.0.1" + (sources."ink-2.7.1" // { + dependencies = [ + sources."chalk-3.0.0" + ]; + }) + sources."ink-confirm-input-2.0.0" + sources."ink-spinner-3.1.0" + (sources."ink-text-input-3.3.0" // { + dependencies = [ + sources."chalk-3.0.0" + ]; + }) + (sources."internal-slot-1.0.2" // { + dependencies = [ + sources."es-abstract-1.17.7" + ]; + }) + sources."is-arguments-1.1.0" + sources."is-bigint-1.0.1" + sources."is-boolean-object-1.1.0" + sources."is-callable-1.2.2" + sources."is-ci-2.0.0" + sources."is-core-module-2.2.0" + sources."is-date-object-1.0.2" + sources."is-docker-2.1.1" + sources."is-fullwidth-code-point-3.0.0" + sources."is-map-2.0.2" + sources."is-negative-zero-2.0.1" + sources."is-number-object-1.0.4" + sources."is-regex-1.1.1" + sources."is-set-2.0.2" + sources."is-string-1.0.5" + sources."is-symbol-1.0.3" + sources."is-typed-array-1.1.4" + sources."is-weakmap-2.0.1" + sources."is-weakset-2.0.1" + sources."is-wsl-2.2.0" + sources."isarray-2.0.5" + sources."js-tokens-4.0.0" + (sources."jsii-1.16.0" // { + dependencies = [ + sources."fs-extra-9.0.1" + (sources."jsonfile-6.1.0" // { + dependencies = [ + sources."universalify-2.0.0" + ]; + }) + sources."universalify-1.0.0" + sources."yargs-16.2.0" + ]; + }) + (sources."jsii-pacmak-1.16.0" // { + dependencies = [ + sources."camelcase-6.2.0" + sources."codemaker-1.16.0" + sources."decamelize-4.0.0" + sources."fs-extra-9.0.1" + (sources."jsonfile-6.1.0" // { + dependencies = [ + sources."universalify-2.0.0" + ]; + }) + sources."universalify-1.0.0" + sources."yargs-16.2.0" + ]; + }) + (sources."jsii-reflect-1.16.0" // { + dependencies = [ + sources."fs-extra-9.0.1" + (sources."jsonfile-6.1.0" // { + dependencies = [ + sources."universalify-2.0.0" + ]; + }) + sources."universalify-1.0.0" + sources."yargs-16.2.0" + ]; + }) + (sources."jsii-rosetta-1.16.0" // { + dependencies = [ + sources."fs-extra-9.0.1" + (sources."jsonfile-6.1.0" // { + dependencies = [ + sources."universalify-2.0.0" + ]; + }) + sources."universalify-1.0.0" + sources."yargs-16.2.0" + ]; + }) + (sources."jsii-srcmak-0.1.180" // { + dependencies = [ + sources."fs-extra-9.0.1" + (sources."jsonfile-6.1.0" // { + dependencies = [ + sources."universalify-2.0.0" + ]; + }) + sources."universalify-1.0.0" + ]; + }) + sources."jsonfile-4.0.0" + sources."jsonschema-1.4.0" + sources."jsx-ast-utils-3.2.0" + sources."locate-path-5.0.0" + 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."ansi-styles-3.2.1" + sources."cli-cursor-2.1.0" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + 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."log4js-6.3.0" + sources."loose-envify-1.4.0" + sources."lru-cache-6.0.0" + sources."mdurl-1.0.1" + sources."mimic-fn-2.1.0" + sources."minimist-1.2.5" + sources."ms-2.1.2" + sources."ncp-2.0.0" + sources."object-assign-4.1.1" + sources."object-inspect-1.9.0" + sources."object-is-1.1.4" + sources."object-keys-1.1.1" + sources."object.assign-4.1.2" + sources."object.entries-1.1.3" + sources."object.fromentries-2.0.3" + sources."object.values-1.1.2" + sources."onetime-5.1.2" + sources."oo-ascii-tree-1.16.0" + sources."open-7.3.0" + sources."p-limit-2.3.0" + sources."p-locate-4.1.0" + sources."p-try-2.2.0" + sources."path-exists-4.0.0" + sources."path-parse-1.0.6" + sources."prop-types-15.7.2" + sources."react-16.14.0" + sources."react-is-16.13.1" + sources."react-reconciler-0.24.0" + sources."readline-sync-1.4.10" + (sources."regexp.prototype.flags-1.3.0" // { + dependencies = [ + sources."es-abstract-1.17.7" + ]; + }) + sources."require-directory-2.1.1" + sources."require-main-filename-2.0.0" + sources."resolve-1.19.0" + sources."restore-cursor-3.1.0" + sources."rfdc-1.1.4" + sources."scheduler-0.18.0" + sources."semver-7.3.4" + (sources."semver-intersect-1.4.0" // { + dependencies = [ + sources."semver-5.7.1" + ]; + }) + sources."set-blocking-2.0.0" + sources."side-channel-1.0.4" + sources."signal-exit-3.0.3" + sources."slice-ansi-3.0.0" + sources."sort-json-2.0.0" + sources."spdx-license-list-6.3.0" + sources."sscaff-1.2.0" + (sources."streamroller-2.2.4" // { + dependencies = [ + sources."date-format-2.1.0" + ]; + }) + (sources."string-length-3.1.0" // { + dependencies = [ + sources."ansi-regex-4.1.0" + sources."astral-regex-1.0.0" + sources."strip-ansi-5.2.0" + ]; + }) + sources."string-width-4.2.0" + sources."string.prototype.matchall-4.0.3" + sources."string.prototype.repeat-0.2.0" + sources."string.prototype.trimend-1.0.3" + sources."string.prototype.trimstart-1.0.3" + sources."strip-ansi-6.0.0" + sources."supports-color-7.2.0" + sources."type-fest-0.11.0" + sources."typescript-3.9.7" + sources."universalify-0.1.2" + sources."uuid-8.3.2" + sources."which-boxed-primitive-1.0.2" + sources."which-collection-1.0.1" + sources."which-module-2.0.0" + sources."which-typed-array-1.1.4" + sources."widest-line-3.1.0" + sources."wrap-ansi-6.2.0" + sources."xmlbuilder-15.1.1" + sources."xmldom-0.4.0" + sources."y18n-5.0.5" + sources."yallist-4.0.0" + (sources."yargs-15.4.1" // { + dependencies = [ + sources."cliui-6.0.0" + sources."y18n-4.0.1" + sources."yargs-parser-18.1.3" + ]; + }) + sources."yargs-parser-20.2.4" + sources."yn-3.1.1" + sources."yoga-layout-prebuilt-1.10.0" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "CDK for Terraform CLI"; + homepage = "https://github.com/hashicorp/terraform-cdk#readme"; + license = "MPL-2.0"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; clean-css-cli = nodeEnv.buildNodePackage { name = "clean-css-cli"; packageName = "clean-css-cli"; @@ -64392,7 +66691,7 @@ in sources."commander-2.20.3" sources."concat-map-0.0.1" sources."cycle-1.0.3" - sources."debug-4.3.1" + sources."debug-4.3.2" sources."decode-uri-component-0.2.0" sources."deep-equal-0.2.2" sources."encoding-0.1.13" @@ -64419,10 +66718,9 @@ in sources."node-fetch-1.7.3" sources."once-1.4.0" sources."path-is-absolute-1.0.1" - sources."pkginfo-0.4.1" - sources."prompt-1.0.0" + sources."prompt-1.1.0" sources."punycode-2.1.1" - sources."query-string-6.13.7" + sources."query-string-6.13.8" sources."read-1.0.7" sources."revalidator-0.1.8" sources."rimraf-2.7.1" @@ -64437,11 +66735,10 @@ in sources."webidl-conversions-4.0.2" sources."whatwg-fetch-3.5.0" sources."whatwg-url-7.1.0" - (sources."winston-2.1.1" // { + (sources."winston-2.4.5" // { dependencies = [ sources."async-1.0.0" sources."colors-1.0.3" - sources."pkginfo-0.3.1" ]; }) sources."wrappy-1.0.2" @@ -64503,7 +66800,7 @@ in sources."@emmetio/extract-abbreviation-0.1.6" sources."jsonc-parser-1.0.3" sources."vscode-emmet-helper-1.2.17" - sources."vscode-languageserver-types-3.15.1" + sources."vscode-languageserver-types-3.16.0" ]; buildInputs = globalBuildInputs; meta = { @@ -64517,14 +66814,15 @@ in coc-eslint = nodeEnv.buildNodePackage { name = "coc-eslint"; packageName = "coc-eslint"; - version = "1.3.2"; + version = "1.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/coc-eslint/-/coc-eslint-1.3.2.tgz"; - sha512 = "4eKNFSYkwo2elYrtxRdQbe9HuSLVBYk5uBVHt7VPvEjysAGAZZJ8sUha8gl32mWbSrbbbrbIP1SfOomVJPQeNQ=="; + url = "https://registry.npmjs.org/coc-eslint/-/coc-eslint-1.4.1.tgz"; + sha512 = "dqzn4vqmEqIlzwpFxG6AnhXUwDSTMLsg2d4RDwHDhh1yioukSFR+turQxsq9fssuWeV208y54kb/AzmOIji9jA=="; }; buildInputs = globalBuildInputs; meta = { - description = "eslint extension for coc"; + description = "Eslint extension for coc.nvim"; + homepage = "https://github.com/neoclide/coc-eslint#readme"; license = "MIT"; }; production = true; @@ -64552,16 +66850,17 @@ in coc-go = nodeEnv.buildNodePackage { name = "coc-go"; packageName = "coc-go"; - version = "0.12.1"; + version = "0.13.2"; src = fetchurl { - url = "https://registry.npmjs.org/coc-go/-/coc-go-0.12.1.tgz"; - sha512 = "DskyUQMQXxaHAAAcAzlEFAbxFQaSrRhHEVTsGGB6Q3naW7GvQFze2Otrd4FOxfzTYZlGio5yJpGB7a09K5Snrg=="; + url = "https://registry.npmjs.org/coc-go/-/coc-go-0.13.2.tgz"; + sha512 = "E//SHaQlzmh4nBUJsA6oSZWBVFkEWJ/kjL19jIBbIrY8KWCjxfCm6H8+WDNMUULHS2HQNlUEQzVHS/ftE10iGg=="; }; dependencies = [ sources."isexe-2.0.0" sources."node-fetch-2.6.1" sources."tslib-2.0.3" - sources."vscode-uri-2.1.2" + sources."vscode-languageserver-textdocument-1.0.1" + sources."vscode-uri-3.0.2" sources."which-2.0.2" ]; buildInputs = globalBuildInputs; @@ -64576,10 +66875,10 @@ in coc-highlight = nodeEnv.buildNodePackage { name = "coc-highlight"; packageName = "coc-highlight"; - version = "1.2.6"; + version = "1.2.7"; src = fetchurl { - url = "https://registry.npmjs.org/coc-highlight/-/coc-highlight-1.2.6.tgz"; - sha512 = "aKzZ86GVnZgZV2EAf62SDpTXzGYHD7PTSB+HgytTvdubgFgssQitrIUvWCPnlvagPixtM1XqTlh8AKusnrtSOg=="; + url = "https://registry.npmjs.org/coc-highlight/-/coc-highlight-1.2.7.tgz"; + sha512 = "crUMz4W5IGSoLX9Lif1Z9XT2e3Eq7oVnkaN1+F0ncGiAh8sI4vPW+hm641tVcXVC/u4wzdvvbj6ngj8Fykxn2g=="; }; buildInputs = globalBuildInputs; meta = { @@ -64593,13 +66892,13 @@ in coc-html = nodeEnv.buildNodePackage { name = "coc-html"; packageName = "coc-html"; - version = "1.3.1"; + version = "1.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/coc-html/-/coc-html-1.3.1.tgz"; - sha512 = "qC1BifVAAuI5cPT6fEQuP0RIjwDWqhLCH+AUJrQ7lW2IghWInjOarhj9AHWS+1cZLnsVrMMYXL6i8HZLnkRDQQ=="; + url = "https://registry.npmjs.org/coc-html/-/coc-html-1.3.2.tgz"; + sha512 = "8upyERwR/7zZNDkATpKy1aIyflzwfsgercRsHm1OG/ECRG2FpUWYkHywHBDbWAdHsipbd2WoO0nr3Ct22JV4oA=="; }; dependencies = [ - sources."typescript-4.1.2" + sources."typescript-4.1.3" ]; buildInputs = globalBuildInputs; meta = { @@ -64720,13 +67019,13 @@ in coc-metals = nodeEnv.buildNodePackage { name = "coc-metals"; packageName = "coc-metals"; - version = "0.9.8"; + version = "0.9.9"; src = fetchurl { - url = "https://registry.npmjs.org/coc-metals/-/coc-metals-0.9.8.tgz"; - sha512 = "3mkLfoTaPWT7u2oELILGGtS8jofBsb1MzATB8T4tNJODbrZFXQf5KIV4GBk81RVM1MLGvNtvD/VO/pmwUhrSxQ=="; + url = "https://registry.npmjs.org/coc-metals/-/coc-metals-0.9.9.tgz"; + sha512 = "VCjIm+ytVrgqzAXMpweh3D8SfQg9oF0BVXSFeUIgsm3xU9BuZd1jU+CxtNNAIihxcJ1LUX1JGn1Sydu541hwzA=="; }; dependencies = [ - sources."@chemzqm/neovim-5.2.10" + sources."@chemzqm/neovim-5.2.13" sources."@tootallnate/once-1.1.2" sources."agent-base-6.0.2" sources."arch-2.2.0" @@ -64757,7 +67056,7 @@ in }) sources."date-format-3.0.0" sources."debounce-1.2.0" - sources."debug-4.3.1" + sources."debug-4.3.2" sources."deep-extend-0.6.0" sources."define-properties-1.1.3" sources."duplexer2-0.1.4" @@ -64769,8 +67068,8 @@ in sources."fast-diff-1.2.0" sources."fb-watchman-2.0.1" sources."flatted-2.0.2" - sources."follow-redirects-1.13.0" - sources."fp-ts-2.9.1" + sources."follow-redirects-1.13.1" + sources."fp-ts-2.9.3" sources."fs-extra-8.1.0" sources."fs-minipass-2.1.0" sources."fs.realpath-1.0.0" @@ -64781,7 +67080,7 @@ in ]; }) sources."function-bind-1.1.1" - sources."get-intrinsic-1.0.1" + sources."get-intrinsic-1.0.2" sources."get-stream-4.1.0" sources."glob-7.1.6" sources."graceful-fs-4.2.4" @@ -64792,7 +67091,7 @@ in sources."ieee754-1.2.1" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."ini-1.3.5" + sources."ini-1.3.8" sources."int64-buffer-0.1.10" sources."is-callable-1.2.2" sources."is-date-object-1.0.2" @@ -64815,7 +67114,7 @@ in sources."lodash-4.17.20" sources."log4js-6.3.0" sources."lru-cache-6.0.0" - sources."metals-languageclient-0.3.3" + sources."metals-languageclient-0.4.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."minipass-3.1.3" @@ -64876,9 +67175,13 @@ in sources."util-deprecate-1.0.2" sources."uuid-7.0.3" sources."vscode-jsonrpc-5.0.1" - sources."vscode-languageserver-protocol-3.15.3" + (sources."vscode-languageserver-protocol-3.15.3" // { + dependencies = [ + sources."vscode-languageserver-types-3.15.1" + ]; + }) sources."vscode-languageserver-textdocument-1.0.1" - sources."vscode-languageserver-types-3.15.1" + sources."vscode-languageserver-types-3.16.0" sources."vscode-uri-2.1.2" sources."which-2.0.2" sources."wrappy-1.0.2" @@ -64920,8 +67223,8 @@ in sha512 = "3p4AwJnsjtLJM53wLsMtcVUzWPMnnYI6pkwQraHH6Tp7/ZuXwIVhjUvDgMcAvhmIkVePyvJF5xZHN4ghLLP02A=="; }; dependencies = [ - sources."@babel/code-frame-7.10.4" - sources."@babel/helper-validator-identifier-7.10.4" + sources."@babel/code-frame-7.12.11" + sources."@babel/helper-validator-identifier-7.12.11" sources."@babel/highlight-7.10.4" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" @@ -64994,7 +67297,7 @@ in sources."callsites-3.1.0" sources."camelcase-2.1.1" sources."camelcase-keys-2.1.0" - sources."caniuse-lite-1.0.30001165" + sources."caniuse-lite-1.0.30001173" sources."capture-stack-trace-1.0.1" sources."ccount-1.1.0" sources."chalk-2.4.2" @@ -65051,7 +67354,7 @@ in ]; }) sources."copy-descriptor-0.1.1" - sources."core-js-3.8.0" + sources."core-js-3.8.2" sources."cosmiconfig-3.1.0" sources."create-error-class-3.0.2" (sources."cross-spawn-6.0.5" // { @@ -65061,7 +67364,7 @@ in }) sources."crypto-random-string-1.0.0" sources."currently-unhandled-0.4.1" - sources."debug-4.3.1" + sources."debug-4.3.2" sources."decamelize-1.2.0" sources."decamelize-keys-1.1.0" sources."decode-uri-component-0.2.0" @@ -65091,7 +67394,7 @@ in sources."domutils-1.7.0" sources."dot-prop-5.3.0" sources."duplexer3-0.1.4" - sources."electron-to-chromium-1.3.616" + sources."electron-to-chromium-1.3.634" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."entities-1.1.2" @@ -65268,7 +67571,7 @@ in sources."htmlparser2-3.10.1" sources."iconv-lite-0.4.24" sources."ignore-4.0.6" - sources."import-fresh-3.2.2" + sources."import-fresh-3.3.0" sources."import-lazy-2.1.0" sources."import-local-0.1.1" sources."imurmurhash-0.1.4" @@ -65276,7 +67579,7 @@ in sources."indexes-of-1.0.1" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."ini-1.3.5" + sources."ini-1.3.8" (sources."inquirer-7.3.3" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -65348,7 +67651,7 @@ in sources."isobject-2.1.0" sources."js-base64-2.6.4" sources."js-tokens-4.0.0" - sources."js-yaml-3.14.0" + sources."js-yaml-3.14.1" sources."json-parse-better-errors-1.0.2" sources."json-schema-traverse-0.4.1" sources."json-stable-stringify-without-jsonify-1.0.1" @@ -65780,7 +68083,7 @@ in sources."tsutils-2.29.0" ]; }) - sources."tsutils-3.17.1" + sources."tsutils-3.18.0" sources."type-check-0.3.2" sources."type-fest-0.8.1" sources."typescript-3.9.7" @@ -65845,7 +68148,7 @@ in sources."x-is-string-0.1.0" sources."xdg-basedir-3.0.0" sources."xtend-4.0.2" - sources."y18n-3.2.1" + sources."y18n-3.2.2" sources."yallist-4.0.0" (sources."yargs-11.1.1" // { dependencies = [ @@ -65897,10 +68200,10 @@ in sha512 = "SOsCwIuQeE4eiX/Scgs2nL1WnR0JwFZ2/Edh3dx5ijmZSlEPxdc0PnMUN0hT9y96jK5/ZHAByC3qEperpWqPUA=="; }; dependencies = [ - sources."vscode-jsonrpc-5.0.1" - sources."vscode-languageserver-protocol-3.15.3" + sources."vscode-jsonrpc-6.0.0" + sources."vscode-languageserver-protocol-3.16.0" sources."vscode-languageserver-textdocument-1.0.1" - sources."vscode-languageserver-types-3.15.1" + sources."vscode-languageserver-types-3.16.0" ]; buildInputs = globalBuildInputs; meta = { @@ -65932,10 +68235,10 @@ in coc-rust-analyzer = nodeEnv.buildNodePackage { name = "coc-rust-analyzer"; packageName = "coc-rust-analyzer"; - version = "0.19.0"; + version = "0.26.0"; src = fetchurl { - url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.19.0.tgz"; - sha512 = "HeoHspOK0pg9UGUV6jYX5IlJhWIslA34Yg99QqJU2xCJxE93YAlyhJ0S/TVtkQdCYpn6D7UiHjKDazUQKkDMOQ=="; + url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.26.0.tgz"; + sha512 = "Wn0m/IImB9BryAUhH5WTSqrkWh2tamuMVyMzxUmH1EW71TJKOavfV2DAmSNYSkGCD/H9icUbMIiSwyMI9JVYOw=="; }; buildInputs = globalBuildInputs; meta = { @@ -65968,10 +68271,10 @@ in coc-snippets = nodeEnv.buildNodePackage { name = "coc-snippets"; packageName = "coc-snippets"; - version = "2.2.9"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/coc-snippets/-/coc-snippets-2.2.9.tgz"; - sha512 = "SjVr0CSmF97LS5e/qz2Lac5JYpx9F6U9MPLzbB3WfGSIBwlrbevgw47DJSIxCr1ZWNb1Um/esRWDGfkhrMjbmA=="; + url = "https://registry.npmjs.org/coc-snippets/-/coc-snippets-2.3.1.tgz"; + sha512 = "n11bVCYeDA0s1wYNAYsQdAHVv4C/k8QkvadSkzRWrNCP29fivGALp+wEYl8rtsqs0aeKY3FtPsI812581g6NPg=="; }; buildInputs = globalBuildInputs; meta = { @@ -66008,32 +68311,32 @@ in sha512 = "+GYR6KTvHQnqu0j1kXT30hRZMuCwG/G52wG/19LSPE+p9Q0i8XFH6582T0btTu39xz2TPsDOGjT1VgyRw2urug=="; }; dependencies = [ - sources."@babel/code-frame-7.10.4" - sources."@babel/core-7.12.9" - sources."@babel/generator-7.12.5" - sources."@babel/helper-function-name-7.10.4" - sources."@babel/helper-get-function-arity-7.10.4" + sources."@babel/code-frame-7.12.11" + sources."@babel/core-7.12.10" + sources."@babel/generator-7.12.11" + sources."@babel/helper-function-name-7.12.11" + sources."@babel/helper-get-function-arity-7.12.10" sources."@babel/helper-member-expression-to-functions-7.12.7" sources."@babel/helper-module-imports-7.12.5" sources."@babel/helper-module-transforms-7.12.1" - sources."@babel/helper-optimise-call-expression-7.12.7" - sources."@babel/helper-replace-supers-7.12.5" + sources."@babel/helper-optimise-call-expression-7.12.10" + sources."@babel/helper-replace-supers-7.12.11" sources."@babel/helper-simple-access-7.12.1" - sources."@babel/helper-split-export-declaration-7.11.0" - sources."@babel/helper-validator-identifier-7.10.4" + sources."@babel/helper-split-export-declaration-7.12.11" + sources."@babel/helper-validator-identifier-7.12.11" sources."@babel/helpers-7.12.5" (sources."@babel/highlight-7.10.4" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.12.7" + sources."@babel/parser-7.12.11" sources."@babel/template-7.12.7" - sources."@babel/traverse-7.12.9" - sources."@babel/types-7.12.7" - sources."@nodelib/fs.scandir-2.1.3" - sources."@nodelib/fs.stat-2.0.3" - sources."@nodelib/fs.walk-1.2.4" + sources."@babel/traverse-7.12.12" + sources."@babel/types-7.12.12" + sources."@nodelib/fs.scandir-2.1.4" + sources."@nodelib/fs.stat-2.0.4" + sources."@nodelib/fs.walk-1.2.6" sources."@stylelint/postcss-css-in-js-0.37.2" sources."@stylelint/postcss-markdown-0.36.2" sources."@types/mdast-3.0.3" @@ -66041,7 +68344,7 @@ in sources."@types/normalize-package-data-2.4.0" sources."@types/parse-json-4.0.0" sources."@types/unist-2.0.3" - sources."ajv-6.12.6" + sources."ajv-7.0.3" sources."ansi-regex-5.0.0" sources."ansi-styles-3.2.1" sources."array-union-2.1.0" @@ -66052,11 +68355,11 @@ in sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."browserslist-4.15.0" + sources."browserslist-4.16.0" sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001165" + sources."caniuse-lite-1.0.30001173" (sources."chalk-4.1.0" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -66077,7 +68380,7 @@ in sources."convert-source-map-1.7.0" sources."cosmiconfig-7.0.0" sources."cssesc-3.0.0" - sources."debug-4.3.1" + sources."debug-4.3.2" sources."decamelize-1.2.0" (sources."decamelize-keys-1.1.0" // { dependencies = [ @@ -66094,7 +68397,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.3.616" + sources."electron-to-chromium-1.3.634" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -66105,9 +68408,8 @@ in sources."fast-deep-equal-3.1.3" sources."fast-diff-1.2.0" sources."fast-glob-3.2.4" - sources."fast-json-stable-stringify-2.1.0" sources."fastest-levenshtein-1.0.12" - sources."fastq-1.9.0" + sources."fastq-1.10.0" sources."file-entry-cache-6.0.0" sources."fill-range-7.0.1" sources."find-up-4.1.0" @@ -66132,7 +68434,7 @@ in sources."html-tags-3.1.0" sources."htmlparser2-3.10.1" sources."ignore-5.1.8" - (sources."import-fresh-3.2.2" // { + (sources."import-fresh-3.3.0" // { dependencies = [ sources."resolve-from-4.0.0" ]; @@ -66143,7 +68445,7 @@ in sources."indexes-of-1.0.1" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."ini-1.3.5" + sources."ini-1.3.8" sources."is-alphabetical-1.0.4" sources."is-alphanumerical-1.0.4" sources."is-arrayish-0.2.1" @@ -66162,7 +68464,7 @@ in sources."js-tokens-4.0.0" sources."jsesc-2.5.2" sources."json-parse-even-better-errors-2.3.1" - sources."json-schema-traverse-0.4.1" + sources."json-schema-traverse-1.0.0" sources."json5-2.1.3" sources."kind-of-6.0.3" sources."known-css-properties-0.20.0" @@ -66174,16 +68476,12 @@ in sources."lru-cache-6.0.0" sources."map-obj-4.1.0" sources."mathml-tag-names-2.1.3" - sources."mdast-util-from-markdown-0.8.1" - (sources."mdast-util-to-markdown-0.5.4" // { - dependencies = [ - sources."mdast-util-to-string-2.0.0" - ]; - }) - sources."mdast-util-to-string-1.1.0" - sources."meow-8.0.0" + sources."mdast-util-from-markdown-0.8.4" + sources."mdast-util-to-markdown-0.6.2" + sources."mdast-util-to-string-2.0.0" + sources."meow-8.1.0" sources."merge2-1.4.1" - sources."micromark-2.10.1" + sources."micromark-2.11.2" sources."micromatch-4.0.2" sources."min-indent-1.0.1" sources."minimatch-3.0.4" @@ -66194,7 +68492,7 @@ in ]; }) sources."ms-2.1.2" - sources."node-releases-1.1.67" + sources."node-releases-1.1.69" (sources."normalize-package-data-3.0.0" // { dependencies = [ sources."semver-7.3.4" @@ -66255,9 +68553,9 @@ in sources."redent-3.0.0" sources."remark-13.0.0" sources."remark-parse-9.0.0" - sources."remark-stringify-9.0.0" + sources."remark-stringify-9.0.1" sources."repeat-string-1.6.1" - sources."replace-ext-1.0.0" + sources."require-from-string-2.0.2" sources."resolve-1.19.0" sources."resolve-from-5.0.0" sources."reusify-1.0.4" @@ -66293,7 +68591,7 @@ in sources."sugarss-2.0.0" sources."supports-color-5.5.0" sources."svg-tags-1.0.0" - sources."table-6.0.4" + sources."table-6.0.7" sources."to-fast-properties-2.0.0" sources."to-regex-range-5.0.1" sources."trim-newlines-3.0.0" @@ -66309,7 +68607,7 @@ in sources."util-deprecate-1.0.2" sources."v8-compile-cache-2.2.0" sources."validate-npm-package-license-3.0.4" - sources."vfile-4.2.0" + sources."vfile-4.2.1" sources."vfile-message-2.0.4" sources."vscode-jsonrpc-5.1.0-next.1" sources."vscode-languageserver-6.2.0-next.2" @@ -66319,7 +68617,7 @@ in ]; }) sources."vscode-languageserver-textdocument-1.0.1" - sources."vscode-languageserver-types-3.16.0-next.5" + sources."vscode-languageserver-types-3.16.0" sources."vscode-uri-2.1.2" sources."which-1.3.1" sources."wrappy-1.0.2" @@ -66364,8 +68662,8 @@ in sha512 = "5Zxv2Adtb6Mlpv2YdKErhf8ntxiBl1UyrbEqo7gR9nFIAfi3o0Ue6TJTpZfOhQViFQxLjJAS65IQVRaNlbhkxw=="; }; dependencies = [ - sources."@babel/code-frame-7.10.4" - sources."@babel/helper-validator-identifier-7.10.4" + sources."@babel/code-frame-7.12.11" + sources."@babel/helper-validator-identifier-7.12.11" sources."@babel/highlight-7.10.4" sources."ansi-styles-3.2.1" sources."argparse-1.0.10" @@ -66389,7 +68687,7 @@ in sources."inherits-2.0.4" sources."is-core-module-2.2.0" sources."js-tokens-4.0.0" - sources."js-yaml-3.14.0" + sources."js-yaml-3.14.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-0.5.5" @@ -66419,10 +68717,10 @@ in coc-tslint-plugin = nodeEnv.buildNodePackage { name = "coc-tslint-plugin"; packageName = "coc-tslint-plugin"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/coc-tslint-plugin/-/coc-tslint-plugin-1.1.1.tgz"; - sha512 = "eU3YvpRXEGavuzrPSBsmTnFAh/z3ty6ybSn6o762YNKxwGgF88fCpziIZxmsUDE4tsH+dNzrQCX9je9MqR6K6A=="; + url = "https://registry.npmjs.org/coc-tslint-plugin/-/coc-tslint-plugin-1.1.2.tgz"; + sha512 = "wLm2JJVkf2yUk3XzMSmAs8pnibQRTroHnF3XkIH7DJ5mrcrZe9o0Od2lYyuNxgJn2v6/Iw221o8/LfoamfywdQ=="; }; dependencies = [ sources."balanced-match-1.0.0" @@ -66452,13 +68750,13 @@ in coc-tsserver = nodeEnv.buildNodePackage { name = "coc-tsserver"; packageName = "coc-tsserver"; - version = "1.6.1"; + version = "1.6.6"; src = fetchurl { - url = "https://registry.npmjs.org/coc-tsserver/-/coc-tsserver-1.6.1.tgz"; - sha512 = "Tys5fRAdzYfi2MyRQ8X5fKLw8vhluuT/0/Uac+eOzMnWSJ0zgMpxtXTo5AA1icsLgUTHHOXgq6CJHUbKs6xGVA=="; + url = "https://registry.npmjs.org/coc-tsserver/-/coc-tsserver-1.6.6.tgz"; + sha512 = "Rij5moc30YSnhYkiSwilLYorbRkmYPn9uN5b4EMXrNo0wWGReFYRRCxq72BoDEIwbTE3MsuVb67irdMukJ95eA=="; }; dependencies = [ - sources."typescript-4.1.2" + sources."typescript-4.1.3" ]; buildInputs = globalBuildInputs; meta = { @@ -66479,8 +68777,8 @@ in sha512 = "2SHFFjxkw2kl0hADDNUYX85OR/PbjqYPxFnpNp6G83SbeZBoJN8KDUl7TrIJ7BZ4UCiIilXnKQCHpxREiVPAEg=="; }; dependencies = [ - sources."@babel/code-frame-7.10.4" - sources."@babel/helper-validator-identifier-7.10.4" + sources."@babel/code-frame-7.12.11" + sources."@babel/helper-validator-identifier-7.12.11" (sources."@babel/highlight-7.10.4" // { dependencies = [ sources."chalk-2.4.2" @@ -66494,7 +68792,7 @@ in sources."ansi-regex-5.0.0" sources."ansi-styles-3.2.1" sources."argparse-1.0.10" - sources."astral-regex-1.0.0" + sources."astral-regex-2.0.0" sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" sources."builtin-modules-1.1.1" @@ -66513,15 +68811,15 @@ in sources."commander-2.20.3" sources."concat-map-0.0.1" sources."cross-spawn-7.0.3" - sources."debug-4.3.1" + sources."debug-4.3.2" sources."deep-is-0.1.3" sources."diff-4.0.2" sources."doctrine-3.0.0" - sources."emoji-regex-7.0.3" + sources."emoji-regex-8.0.0" sources."enquirer-2.3.6" sources."escape-string-regexp-1.0.5" - sources."eslint-7.15.0" - sources."eslint-plugin-vue-7.2.0" + sources."eslint-7.17.0" + sources."eslint-plugin-vue-7.4.1" sources."eslint-scope-5.1.1" (sources."eslint-utils-2.1.0" // { dependencies = [ @@ -66562,17 +68860,17 @@ in sources."has-1.0.3" sources."has-flag-3.0.0" sources."ignore-4.0.6" - sources."import-fresh-3.2.2" + sources."import-fresh-3.3.0" sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."is-core-module-2.2.0" sources."is-extglob-2.1.1" - sources."is-fullwidth-code-point-2.0.0" + sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.1" sources."isexe-2.0.0" sources."js-tokens-4.0.0" - sources."js-yaml-3.14.0" + sources."js-yaml-3.14.1" sources."json-schema-traverse-0.4.1" sources."json-stable-stringify-without-jsonify-1.0.1" sources."levn-0.4.1" @@ -66594,24 +68892,31 @@ in sources."progress-2.0.3" sources."punycode-2.1.1" sources."regexpp-3.1.0" + sources."require-from-string-2.0.2" sources."resolve-1.19.0" sources."resolve-from-4.0.0" sources."rimraf-3.0.2" sources."semver-7.3.4" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" - sources."slice-ansi-2.1.0" - sources."sprintf-js-1.0.3" - (sources."string-width-3.1.0" // { + (sources."slice-ansi-4.0.0" // { dependencies = [ - sources."ansi-regex-4.1.0" - sources."strip-ansi-5.2.0" + sources."ansi-styles-4.3.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" ]; }) + sources."sprintf-js-1.0.3" + sources."string-width-4.2.0" sources."strip-ansi-6.0.0" sources."strip-json-comments-3.1.1" sources."supports-color-5.5.0" - sources."table-5.4.6" + (sources."table-6.0.7" // { + dependencies = [ + sources."ajv-7.0.3" + sources."json-schema-traverse-1.0.0" + ]; + }) sources."text-table-0.2.0" sources."tslib-1.14.1" (sources."tslint-6.1.3" // { @@ -66623,11 +68928,11 @@ in sources."tsutils-2.29.0" sources."type-check-0.4.0" sources."type-fest-0.8.1" - sources."typescript-4.1.2" + sources."typescript-4.1.3" sources."uri-js-4.4.0" sources."v8-compile-cache-2.2.0" sources."vls-0.5.10" - (sources."vue-eslint-parser-7.2.0" // { + (sources."vue-eslint-parser-7.3.0" // { dependencies = [ sources."eslint-visitor-keys-1.3.0" sources."espree-6.2.1" @@ -66703,10 +69008,10 @@ in coc-yaml = nodeEnv.buildNodePackage { name = "coc-yaml"; packageName = "coc-yaml"; - version = "1.1.3"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/coc-yaml/-/coc-yaml-1.1.3.tgz"; - sha512 = "BBDyx+KUBUcTOoE+E0sZ1pp0mMNWmrqHIeVykEvMN9bt/agtf4vvlJojv54sJETN9LHwbLNLl9pIQkM2HzoWmQ=="; + url = "https://registry.npmjs.org/coc-yaml/-/coc-yaml-1.3.0.tgz"; + sha512 = "i71kwyF20R+vAHhuF9uBbvs6kkvKuSifMkxTeIbBnLobHE500rSSwUD2SPIvt+I1g1rfHrM0Sj89fzrhDA60NQ=="; }; dependencies = [ sources."agent-base-4.3.0" @@ -66717,17 +69022,17 @@ in sources."esprima-4.0.1" sources."http-proxy-agent-2.1.0" sources."https-proxy-agent-2.2.4" - sources."js-yaml-3.14.0" - sources."jsonc-parser-2.3.1" + sources."js-yaml-3.14.1" + sources."jsonc-parser-3.0.0" sources."ms-2.0.0" - sources."prettier-2.2.1" + sources."prettier-2.0.5" (sources."request-light-0.2.5" // { dependencies = [ sources."vscode-nls-4.1.2" ]; }) sources."sprintf-js-1.0.3" - sources."vscode-json-languageservice-3.8.4" + sources."vscode-json-languageservice-3.11.0" sources."vscode-jsonrpc-4.0.0" (sources."vscode-languageserver-5.2.1" // { dependencies = [ @@ -66743,13 +69048,14 @@ in sources."vscode-languageserver-types-3.16.0-next.2" sources."vscode-nls-5.0.0" sources."vscode-uri-2.1.2" - (sources."yaml-language-server-0.12.0" // { + (sources."yaml-language-server-0.13.1-dcc82a9.0" // { dependencies = [ - sources."vscode-languageserver-types-3.15.1" + sources."jsonc-parser-2.3.1" + sources."vscode-languageserver-types-3.16.0" sources."vscode-nls-4.1.2" ]; }) - sources."yaml-language-server-parser-0.1.1" + sources."yaml-language-server-parser-0.1.3-fa8245c.0" ]; buildInputs = globalBuildInputs; meta = { @@ -66763,10 +69069,10 @@ in coc-yank = nodeEnv.buildNodePackage { name = "coc-yank"; packageName = "coc-yank"; - version = "1.1.11"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/coc-yank/-/coc-yank-1.1.11.tgz"; - sha512 = "pWJbOo12PmigwYTCk8ghckDlPE5K0qO4VxEZeLJ7ck4v6jhRaKi0lVlYfhBauPuCDv3Yqd0DoKyVLvrQXoRg1A=="; + url = "https://registry.npmjs.org/coc-yank/-/coc-yank-1.2.0.tgz"; + sha512 = "6Ene7ds4ZVfFLzihd3YaPussxNf0npGlPrlPpnGnCPeZ5bGDcEc3j++0Pl4yjo0sIb1QKR/WjrfA0/1Q8mi9yw=="; }; buildInputs = globalBuildInputs; meta = { @@ -66867,7 +69173,7 @@ in sources."fast-safe-stringify-2.0.7" sources."fecha-4.2.0" sources."fn.name-1.1.0" - sources."follow-redirects-1.13.0" + sources."follow-redirects-1.13.1" sources."http-proxy-1.18.1" sources."inherits-2.0.4" sources."is-arrayish-0.3.2" @@ -66877,7 +69183,7 @@ in sources."logform-2.2.0" sources."lynx-0.2.0" sources."mersenne-0.0.4" - sources."ms-2.1.2" + sources."ms-2.1.3" sources."one-time-1.0.0" sources."process-nextick-args-2.0.1" sources."readable-stream-3.6.0" @@ -66920,9 +69226,9 @@ in }; dependencies = [ sources."@netflix/nerror-1.1.3" - sources."@nodelib/fs.scandir-2.1.3" - sources."@nodelib/fs.stat-2.0.3" - sources."@nodelib/fs.walk-1.2.4" + sources."@nodelib/fs.scandir-2.1.4" + sources."@nodelib/fs.stat-2.0.4" + sources."@nodelib/fs.walk-1.2.6" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."abbrev-1.1.1" @@ -67068,7 +69374,7 @@ in sources."fast-glob-3.2.4" sources."fast-json-parse-1.0.3" sources."fast-json-stable-stringify-2.1.0" - sources."fastq-1.9.0" + sources."fastq-1.10.0" sources."figures-2.0.0" sources."fill-range-7.0.1" sources."finalhandler-1.1.2" @@ -67084,7 +69390,7 @@ in sources."getpass-0.1.7" sources."glob-7.1.6" sources."glob-parent-5.1.1" - sources."global-dirs-2.0.1" + sources."global-dirs-2.1.0" sources."globby-11.0.1" (sources."got-9.6.0" // { dependencies = [ @@ -67108,12 +69414,12 @@ in sources."human-signals-1.1.1" sources."iconv-lite-0.4.24" sources."ignore-5.1.8" - sources."import-fresh-3.2.2" + sources."import-fresh-3.3.0" sources."import-lazy-2.1.0" sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."ini-1.3.5" + sources."ini-1.3.7" (sources."init-package-json-1.10.3" // { dependencies = [ sources."hosted-git-info-2.8.8" @@ -67200,8 +69506,8 @@ in sources."methods-1.1.2" sources."micromatch-4.0.2" sources."mime-1.6.0" - sources."mime-db-1.44.0" - sources."mime-types-2.1.27" + sources."mime-db-1.45.0" + sources."mime-types-2.1.28" sources."mimic-fn-2.1.0" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" @@ -67343,7 +69649,7 @@ in sources."strip-final-newline-2.0.0" sources."strip-json-comments-2.0.1" sources."supports-color-7.2.0" - sources."systeminformation-4.30.11" + sources."systeminformation-4.34.2" sources."term-size-2.2.1" sources."through-2.3.8" sources."tmp-0.2.1" @@ -67422,15 +69728,15 @@ in sha512 = "HCpNdBkQy3rw+uARLuIf0YurqsMXYzBa9ihhSAuxYJcNIrqrSq3BstPfr0cQN38AdMrQiO9Dp4hYy7GtGJsLPg=="; }; dependencies = [ - sources."@babel/code-frame-7.10.4" - sources."@babel/helper-validator-identifier-7.10.4" + sources."@babel/code-frame-7.12.11" + sources."@babel/helper-validator-identifier-7.12.11" sources."@babel/highlight-7.10.4" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" sources."@types/minimist-1.2.1" - sources."@types/node-14.14.10" + sources."@types/node-14.14.20" sources."@types/normalize-package-data-2.4.0" sources."aggregate-error-3.1.0" sources."ansi-styles-3.2.1" @@ -67801,7 +70107,7 @@ in sources."@cycle/run-3.4.0" sources."@cycle/time-0.10.1" sources."@types/cookiejar-2.1.2" - sources."@types/node-14.14.10" + sources."@types/node-14.14.20" sources."@types/superagent-3.8.2" sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" @@ -67877,11 +70183,11 @@ in sources."lru-cache-4.1.5" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.44.0" - sources."mime-types-2.1.27" + sources."mime-db-1.45.0" + sources."mime-types-2.1.28" sources."mimic-fn-1.2.0" sources."minimist-1.2.5" - sources."ms-2.1.2" + sources."ms-2.1.3" sources."mute-stream-0.0.7" sources."next-tick-1.0.0" sources."object-assign-4.1.1" @@ -68222,7 +70528,11 @@ in sources."dat-secret-storage-4.0.1" sources."dat-storage-1.1.1" sources."dat-swarm-defaults-1.0.2" - sources."debug-4.3.1" + (sources."debug-4.3.2" // { + dependencies = [ + sources."ms-2.1.2" + ]; + }) sources."decode-uri-component-0.2.0" sources."decompress-response-4.2.1" sources."deep-equal-0.2.2" @@ -68359,7 +70669,7 @@ in sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."ini-1.3.5" + sources."ini-1.3.8" sources."inspect-custom-symbol-1.1.1" sources."ip-1.1.5" sources."is-accessor-descriptor-1.0.0" @@ -68424,9 +70734,9 @@ in sources."menu-string-1.3.0" sources."merkle-tree-stream-3.0.3" sources."micromatch-3.1.10" - sources."mime-2.4.6" - sources."mime-db-1.44.0" - sources."mime-types-2.1.27" + sources."mime-2.4.7" + sources."mime-db-1.45.0" + sources."mime-types-2.1.28" sources."mimic-response-2.1.0" sources."min-document-2.19.0" sources."minimatch-3.0.4" @@ -68439,7 +70749,7 @@ in }) sources."mkdirp-0.5.5" sources."mkdirp-classic-0.5.3" - sources."ms-2.1.2" + sources."ms-2.1.3" sources."multi-random-access-2.1.1" sources."multicast-dns-7.2.2" sources."multistream-2.1.1" @@ -68490,7 +70800,6 @@ in sources."path-key-2.0.1" sources."performance-now-2.1.0" sources."pify-3.0.0" - sources."pkginfo-0.4.1" sources."posix-character-classes-0.1.1" sources."prepend-http-1.0.4" sources."prettier-bytes-1.0.4" @@ -68498,7 +70807,7 @@ in sources."process-0.11.10" sources."process-nextick-args-2.0.1" sources."progress-string-1.2.2" - sources."prompt-1.0.0" + sources."prompt-1.1.0" (sources."protocol-buffers-encodings-1.1.1" // { dependencies = [ sources."varint-5.0.0" @@ -68710,11 +71019,10 @@ in sources."verror-1.10.0" sources."which-1.3.1" sources."widest-line-2.0.1" - (sources."winston-2.1.1" // { + (sources."winston-2.4.5" // { dependencies = [ sources."async-1.0.0" sources."colors-1.0.3" - sources."pkginfo-0.3.1" ]; }) sources."wrappy-1.0.2" @@ -68765,9 +71073,9 @@ in sha512 = "UnQGWIszi+uXkZ/pYUDLKuftSOSIvc/ZBSp/W6OF/Qyr2SsEaSD6TuaIo7TiH1MGQX1b2EW9P1WlE+16Ft4MiA=="; }; dependencies = [ - sources."@nodelib/fs.scandir-2.1.3" - sources."@nodelib/fs.stat-2.0.3" - sources."@nodelib/fs.walk-1.2.4" + sources."@nodelib/fs.scandir-2.1.4" + sources."@nodelib/fs.stat-2.0.4" + sources."@nodelib/fs.walk-1.2.6" sources."aggregate-error-3.1.0" sources."array-union-2.1.0" sources."balanced-match-1.0.0" @@ -68780,7 +71088,7 @@ in sources."del-6.0.0" sources."dir-glob-3.0.1" sources."fast-glob-3.2.4" - sources."fastq-1.9.0" + sources."fastq-1.10.0" sources."fill-range-7.0.1" sources."find-up-4.1.0" sources."fs.realpath-1.0.0" @@ -68823,11 +71131,11 @@ in sources."tslib-1.14.1" sources."type-fest-0.16.0" sources."unique-string-2.0.0" - sources."vscode-jsonrpc-5.0.1" + sources."vscode-jsonrpc-6.0.0" sources."vscode-languageserver-6.1.1" - sources."vscode-languageserver-protocol-3.15.3" + sources."vscode-languageserver-protocol-3.16.0" sources."vscode-languageserver-textdocument-1.0.1" - sources."vscode-languageserver-types-3.15.1" + sources."vscode-languageserver-types-3.16.0" sources."vscode-uri-2.1.2" sources."wrappy-1.0.2" ]; @@ -68844,23 +71152,19 @@ in dockerfile-language-server-nodejs = nodeEnv.buildNodePackage { name = "dockerfile-language-server-nodejs"; packageName = "dockerfile-language-server-nodejs"; - version = "0.1.1"; + version = "0.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/dockerfile-language-server-nodejs/-/dockerfile-language-server-nodejs-0.1.1.tgz"; - sha512 = "oGWWKH7UzTulQDqvbONC4cGw8Zw43PnBXN2r3msXacV61n9YnrnbnqIJavl5zCrKEPLcu30rogMkNmrRBNNfJQ=="; + url = "https://registry.npmjs.org/dockerfile-language-server-nodejs/-/dockerfile-language-server-nodejs-0.2.0.tgz"; + sha512 = "D6qT5w2y73pF02c+caAPYn/IG7T/231u8WD/qfyt3MBtnRe8x7ZIQK9+VAxFYvCtqbGuN7MiPVoRctkth/jcuA=="; }; dependencies = [ - sources."dockerfile-ast-0.0.27" - sources."dockerfile-language-service-0.1.0" - (sources."dockerfile-utils-0.1.0" // { - dependencies = [ - sources."dockerfile-ast-0.0.28" - ]; - }) - sources."vscode-jsonrpc-5.0.1" - sources."vscode-languageserver-6.1.1" - sources."vscode-languageserver-protocol-3.15.3" - sources."vscode-languageserver-types-3.15.1" + sources."dockerfile-ast-0.1.0" + sources."dockerfile-language-service-0.1.1" + sources."dockerfile-utils-0.1.1" + sources."vscode-jsonrpc-6.0.0" + sources."vscode-languageserver-7.0.0" + sources."vscode-languageserver-protocol-3.16.0" + sources."vscode-languageserver-types-3.16.0" ]; buildInputs = globalBuildInputs; meta = { @@ -68875,15 +71179,15 @@ in elasticdump = nodeEnv.buildNodePackage { name = "elasticdump"; packageName = "elasticdump"; - version = "6.56.0"; + version = "6.62.1"; src = fetchurl { - url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.56.0.tgz"; - sha512 = "xgJH1i6nINcRVAGW1ek+NQJOyOgsS9VDGsWW0sN51v3IUGbPgHSZXTpBtqykVjkb+KoiP1V3NkiKY76n7zd+Kw=="; + url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.62.1.tgz"; + sha512 = "LM6NwMLF0W/ZCcSEqXUufGiDzGpXpF7uPQjLo5zx0PS/tLQkrkA2sNeNcE6p7dVcX1u9hYRuJisl9PP7hQvsAg=="; }; dependencies = [ sources."@fast-csv/format-4.3.5" - sources."@fast-csv/parse-4.3.3" - sources."@types/node-14.14.10" + sources."@fast-csv/parse-4.3.6" + sources."@types/node-14.14.20" sources."JSONStream-1.3.5" sources."ajv-6.12.6" sources."asn1-0.2.4" @@ -68909,8 +71213,9 @@ in sources."eventemitter3-4.0.7" sources."events-1.1.1" sources."extend-3.0.2" + sources."extends-classes-1.0.5" sources."extsprintf-1.3.0" - sources."fast-csv-4.3.5" + sources."fast-csv-4.3.6" sources."fast-deep-equal-3.1.3" sources."fast-json-stable-stringify-2.1.0" sources."forever-agent-0.6.1" @@ -68922,7 +71227,7 @@ in sources."http-status-1.5.0" sources."ieee754-1.1.13" sources."inherits-2.0.4" - sources."ini-1.3.5" + sources."ini-2.0.0" (sources."ip-address-6.1.0" // { dependencies = [ sources."jsbn-1.1.0" @@ -68948,8 +71253,9 @@ in sources."lodash.isundefined-3.0.1" sources."lodash.uniq-4.5.0" sources."lossless-json-1.0.4" - sources."mime-db-1.44.0" - sources."mime-types-2.1.27" + sources."method-missing-1.2.4" + sources."mime-db-1.45.0" + sources."mime-types-2.1.28" sources."minimist-1.2.5" sources."oauth-sign-0.9.0" sources."p-finally-1.0.0" @@ -69043,42 +71349,40 @@ in sha512 = "ohjlUXM2v39rDqGIrlyxdcn9ql+4b+X1u90CXNWjYw5wX6C3wTHRfqFfeV8jajYD6Xc+ufn2X1QeZZWhRBXTlA=="; }; dependencies = [ - sources."@babel/code-frame-7.10.4" - sources."@babel/core-7.12.9" - sources."@babel/generator-7.12.5" - 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.12.4" - sources."@babel/helper-function-name-7.10.4" - sources."@babel/helper-get-function-arity-7.10.4" + sources."@babel/code-frame-7.12.11" + sources."@babel/core-7.12.10" + sources."@babel/generator-7.12.11" + sources."@babel/helper-annotate-as-pure-7.12.10" + sources."@babel/helper-function-name-7.12.11" + sources."@babel/helper-get-function-arity-7.12.10" sources."@babel/helper-member-expression-to-functions-7.12.7" sources."@babel/helper-module-imports-7.12.5" sources."@babel/helper-module-transforms-7.12.1" - sources."@babel/helper-optimise-call-expression-7.12.7" + sources."@babel/helper-optimise-call-expression-7.12.10" sources."@babel/helper-plugin-utils-7.10.4" - sources."@babel/helper-replace-supers-7.12.5" + sources."@babel/helper-replace-supers-7.12.11" sources."@babel/helper-simple-access-7.12.1" - sources."@babel/helper-split-export-declaration-7.11.0" - sources."@babel/helper-validator-identifier-7.10.4" + sources."@babel/helper-split-export-declaration-7.12.11" + sources."@babel/helper-validator-identifier-7.12.11" sources."@babel/helpers-7.12.5" sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.12.7" + sources."@babel/parser-7.12.11" sources."@babel/plugin-proposal-object-rest-spread-7.12.1" sources."@babel/plugin-syntax-jsx-7.12.1" sources."@babel/plugin-syntax-object-rest-spread-7.8.3" sources."@babel/plugin-transform-destructuring-7.12.1" sources."@babel/plugin-transform-parameters-7.12.1" - sources."@babel/plugin-transform-react-jsx-7.12.7" + sources."@babel/plugin-transform-react-jsx-7.12.12" sources."@babel/template-7.12.7" - sources."@babel/traverse-7.12.9" - sources."@babel/types-7.12.7" + sources."@babel/traverse-7.12.12" + sources."@babel/types-7.12.12" sources."@sindresorhus/is-4.0.0" sources."@szmarczak/http-timer-4.0.5" sources."@types/cacheable-request-6.0.1" sources."@types/http-cache-semantics-4.0.0" sources."@types/keyv-3.1.1" sources."@types/minimist-1.2.1" - sources."@types/node-14.14.10" + sources."@types/node-14.14.20" sources."@types/normalize-package-data-2.4.0" sources."@types/responselike-1.0.0" sources."@types/yoga-layout-1.9.2" @@ -69097,7 +71401,7 @@ in sources."auto-bind-4.0.0" sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" - sources."cacheable-lookup-5.0.3" + sources."cacheable-lookup-5.0.4" (sources."cacheable-request-7.0.1" // { dependencies = [ sources."get-stream-5.2.0" @@ -69133,7 +71437,7 @@ in sources."convert-to-spaces-1.0.2" sources."cross-spawn-6.0.5" sources."debounce-fn-4.0.0" - sources."debug-4.3.1" + sources."debug-4.3.2" sources."decamelize-1.2.0" (sources."decamelize-keys-1.1.0" // { dependencies = [ @@ -69164,7 +71468,7 @@ in sources."get-stream-4.1.0" sources."glob-7.1.6" sources."globals-11.12.0" - sources."got-11.8.0" + sources."got-11.8.1" sources."hard-rejection-2.1.0" sources."has-1.0.3" sources."has-flag-3.0.0" @@ -69355,7 +71659,7 @@ in ]; }) sources."wrappy-1.0.2" - sources."ws-7.4.1" + sources."ws-7.4.2" sources."yallist-4.0.0" sources."yargs-parser-18.1.3" sources."yoga-layout-prebuilt-1.10.0" @@ -69393,8 +71697,8 @@ in version = "1.7.5"; src = ../../applications/video/epgstation; dependencies = [ - sources."@babel/code-frame-7.10.4" - sources."@babel/helper-validator-identifier-7.10.4" + sources."@babel/code-frame-7.12.11" + sources."@babel/helper-validator-identifier-7.12.11" (sources."@babel/highlight-7.10.4" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -69405,11 +71709,8 @@ in sources."@fluentui/date-time-utilities-7.9.0" sources."@fluentui/dom-utilities-1.1.1" sources."@fluentui/keyboard-key-0.2.12" - sources."@fluentui/react-7.153.4" - sources."@fluentui/react-compose-0.19.12" - sources."@fluentui/react-focus-7.16.19" - sources."@fluentui/react-stylesheets-0.2.4" - sources."@fluentui/react-theme-provider-0.18.0" + sources."@fluentui/react-7.155.3" + sources."@fluentui/react-focus-7.17.0" sources."@fluentui/react-window-provider-1.0.1" sources."@fluentui/theme-1.7.0" (sources."@gulp-sourcemaps/identity-map-1.0.2" // { @@ -69422,10 +71723,10 @@ in sources."normalize-path-2.1.1" ]; }) - sources."@microsoft/load-themed-styles-1.10.139" - sources."@nodelib/fs.scandir-2.1.3" - sources."@nodelib/fs.stat-2.0.3" - sources."@nodelib/fs.walk-1.2.4" + sources."@microsoft/load-themed-styles-1.10.141" + sources."@nodelib/fs.scandir-2.1.4" + sources."@nodelib/fs.stat-2.0.4" + sources."@nodelib/fs.walk-1.2.6" sources."@npmcli/move-file-1.0.1" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" @@ -69433,11 +71734,10 @@ in sources."@types/body-parser-1.19.0" sources."@types/caseless-0.12.2" sources."@types/chart.js-2.9.24" - sources."@types/classnames-2.2.11" - sources."@types/connect-3.4.33" + sources."@types/connect-3.4.34" sources."@types/engine.io-3.1.4" sources."@types/express-4.17.8" - sources."@types/express-serve-static-core-4.17.14" + sources."@types/express-serve-static-core-4.17.17" sources."@types/fancy-log-1.3.0" sources."@types/glob-7.1.3" sources."@types/hls.js-0.13.1" @@ -69715,7 +72015,6 @@ in sources."kind-of-5.1.0" ]; }) - sources."classnames-2.2.6" sources."clean-css-4.2.3" sources."clean-stack-2.2.0" sources."cli-cursor-2.1.0" @@ -69795,7 +72094,7 @@ in (sources."debug-fabulous-1.1.0" // { dependencies = [ sources."debug-3.2.7" - sources."ms-2.1.2" + sources."ms-2.1.3" ]; }) sources."decamelize-1.2.0" @@ -69869,7 +72168,7 @@ in dependencies = [ sources."cookie-0.3.1" sources."debug-4.1.1" - sources."ms-2.1.2" + sources."ms-2.1.3" ]; }) (sources."engine.io-client-3.4.4" // { @@ -69883,7 +72182,7 @@ in }) sources."engine.io-parser-2.2.1" sources."enhanced-resolve-4.3.0" - sources."errno-0.1.7" + sources."errno-0.1.8" sources."error-ex-1.3.2" sources."es5-ext-0.10.53" sources."es6-iterator-2.0.3" @@ -69951,7 +72250,7 @@ in sources."fast-glob-3.2.4" sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-1.1.4" - sources."fastq-1.9.0" + sources."fastq-1.10.0" sources."figgy-pudding-3.5.2" sources."figures-2.0.0" sources."file-uri-to-path-1.0.0" @@ -70020,7 +72319,7 @@ in ]; }) sources."get-caller-file-1.0.3" - sources."get-intrinsic-1.0.1" + sources."get-intrinsic-1.0.2" sources."get-stream-4.1.0" sources."get-value-2.0.6" sources."getpass-0.1.7" @@ -70134,7 +72433,7 @@ in sources."infer-owner-1.0.4" sources."inflight-1.0.6" sources."inherits-2.0.3" - sources."ini-1.3.5" + sources."ini-1.3.8" sources."inquirer-3.0.6" sources."interpret-1.4.0" sources."invert-kv-1.0.0" @@ -70219,7 +72518,7 @@ in sources."lodash.some-4.6.0" (sources."log4js-6.3.0" // { dependencies = [ - sources."debug-4.3.1" + sources."debug-4.3.2" sources."ms-2.1.2" ]; }) @@ -70272,8 +72571,8 @@ in ]; }) sources."mime-1.6.0" - sources."mime-db-1.44.0" - sources."mime-types-2.1.27" + sources."mime-db-1.45.0" + sources."mime-types-2.1.28" sources."mimic-fn-1.2.0" sources."mimic-response-1.0.1" sources."minimalistic-assert-1.0.1" @@ -70366,7 +72665,7 @@ in (sources."needle-2.5.2" // { dependencies = [ sources."debug-3.2.7" - sources."ms-2.1.2" + sources."ms-2.1.3" ]; }) sources."negotiator-0.6.2" @@ -70438,7 +72737,7 @@ in sources."object.map-1.0.1" sources."object.pick-1.3.0" sources."object.reduce-1.0.1" - sources."office-ui-fabric-react-7.153.4" + sources."office-ui-fabric-react-7.155.3" sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" @@ -70632,7 +72931,7 @@ in sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" - sources."sass-1.30.0" + sources."sass-1.32.0" sources."sax-1.2.4" sources."scheduler-0.19.1" sources."schema-utils-2.7.1" @@ -70689,7 +72988,7 @@ in (sources."socket.io-2.3.0" // { dependencies = [ sources."debug-4.1.1" - sources."ms-2.1.2" + sources."ms-2.1.3" ]; }) sources."socket.io-adapter-1.1.2" @@ -70698,7 +72997,7 @@ in sources."base64-arraybuffer-0.1.5" sources."debug-4.1.1" sources."isarray-2.0.1" - sources."ms-2.1.2" + sources."ms-2.1.3" (sources."socket.io-parser-3.3.1" // { dependencies = [ sources."component-emitter-1.3.0" @@ -70712,7 +73011,7 @@ in dependencies = [ sources."debug-4.1.1" sources."isarray-2.0.1" - sources."ms-2.1.2" + sources."ms-2.1.3" ]; }) sources."source-list-map-2.0.1" @@ -70773,7 +73072,7 @@ in (sources."streamroller-2.2.4" // { dependencies = [ sources."date-format-2.1.0" - sources."debug-4.3.1" + sources."debug-4.3.2" sources."fs-extra-8.1.0" sources."jsonfile-4.0.0" sources."ms-2.1.2" @@ -70800,7 +73099,7 @@ in sources."sver-compat-1.5.0" sources."swagger-schema-official-2.0.0-bab6bed" sources."swagger-ui-dist-3.34.0" - sources."tail-2.0.4" + sources."tail-2.1.1" sources."tapable-1.1.3" (sources."tar-4.4.13" // { dependencies = [ @@ -70993,10 +73292,10 @@ in ]; }) sources."wrappy-1.0.2" - sources."ws-7.4.1" + sources."ws-7.4.2" sources."xmlhttprequest-ssl-1.5.5" sources."xtend-4.0.2" - sources."y18n-3.2.1" + sources."y18n-3.2.2" sources."yallist-4.0.0" (sources."yargs-7.1.1" // { dependencies = [ @@ -71039,14 +73338,14 @@ in eslint = nodeEnv.buildNodePackage { name = "eslint"; packageName = "eslint"; - version = "7.15.0"; + version = "7.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-7.15.0.tgz"; - sha512 = "Vr64xFDT8w30wFll643e7cGrIkPEU50yIiI36OdSIDoSGguIeaLzBo0vpGvzo9RECUqq7htURfwEtKqwytkqzA=="; + url = "https://registry.npmjs.org/eslint/-/eslint-7.17.0.tgz"; + sha512 = "zJk08MiBgwuGoxes5sSQhOtibZ75pz0J35XTRlZOk9xMffhpA9BTbQZxoXZzOl5zMbleShbGwtw+1kGferfFwQ=="; }; dependencies = [ - sources."@babel/code-frame-7.10.4" - sources."@babel/helper-validator-identifier-7.10.4" + sources."@babel/code-frame-7.12.11" + sources."@babel/helper-validator-identifier-7.12.11" (sources."@babel/highlight-7.10.4" // { dependencies = [ sources."chalk-2.4.2" @@ -71060,7 +73359,7 @@ in sources."ansi-regex-5.0.0" sources."ansi-styles-3.2.1" sources."argparse-1.0.10" - sources."astral-regex-1.0.0" + sources."astral-regex-2.0.0" sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" sources."callsites-3.1.0" @@ -71077,10 +73376,10 @@ in sources."color-name-1.1.3" sources."concat-map-0.0.1" sources."cross-spawn-7.0.3" - sources."debug-4.3.1" + sources."debug-4.3.2" sources."deep-is-0.1.3" sources."doctrine-3.0.0" - sources."emoji-regex-7.0.3" + sources."emoji-regex-8.0.0" sources."enquirer-2.3.6" sources."escape-string-regexp-1.0.5" sources."eslint-scope-5.1.1" @@ -71121,16 +73420,16 @@ in sources."globals-12.4.0" sources."has-flag-3.0.0" sources."ignore-4.0.6" - sources."import-fresh-3.2.2" + sources."import-fresh-3.3.0" sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."is-extglob-2.1.1" - sources."is-fullwidth-code-point-2.0.0" + sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.1" sources."isexe-2.0.0" sources."js-tokens-4.0.0" - sources."js-yaml-3.14.0" + sources."js-yaml-3.14.1" sources."json-schema-traverse-0.4.1" sources."json-stable-stringify-without-jsonify-1.0.1" sources."levn-0.4.1" @@ -71148,23 +73447,30 @@ in sources."progress-2.0.3" sources."punycode-2.1.1" sources."regexpp-3.1.0" + sources."require-from-string-2.0.2" sources."resolve-from-4.0.0" sources."rimraf-3.0.2" sources."semver-7.3.4" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" - sources."slice-ansi-2.1.0" - sources."sprintf-js-1.0.3" - (sources."string-width-3.1.0" // { + (sources."slice-ansi-4.0.0" // { dependencies = [ - sources."ansi-regex-4.1.0" - sources."strip-ansi-5.2.0" + sources."ansi-styles-4.3.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" ]; }) + sources."sprintf-js-1.0.3" + sources."string-width-4.2.0" sources."strip-ansi-6.0.0" sources."strip-json-comments-3.1.1" sources."supports-color-5.5.0" - sources."table-5.4.6" + (sources."table-6.0.7" // { + dependencies = [ + sources."ajv-7.0.3" + sources."json-schema-traverse-1.0.0" + ]; + }) sources."text-table-0.2.0" sources."type-check-0.4.0" sources."type-fest-0.8.1" @@ -71194,8 +73500,8 @@ in sha512 = "HJ7n92z+gSBLPP/en2pse1SLsFfwOXb8aqHn3FyXwYaE+J5wSM+raBbSmvE9Ttq20IF6Rq/dXxjhiIjuxAUjpw=="; }; dependencies = [ - sources."@babel/code-frame-7.10.4" - sources."@babel/helper-validator-identifier-7.10.4" + sources."@babel/code-frame-7.12.11" + sources."@babel/helper-validator-identifier-7.12.11" (sources."@babel/highlight-7.10.4" // { dependencies = [ sources."chalk-2.4.2" @@ -71209,7 +73515,7 @@ in sources."ansi-regex-5.0.0" sources."ansi-styles-3.2.1" sources."argparse-1.0.10" - sources."astral-regex-1.0.0" + sources."astral-regex-2.0.0" sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" sources."callsites-3.1.0" @@ -71227,13 +73533,13 @@ in sources."concat-map-0.0.1" sources."core_d-2.0.0" sources."cross-spawn-7.0.3" - sources."debug-4.3.1" + sources."debug-4.3.2" sources."deep-is-0.1.3" sources."doctrine-3.0.0" - sources."emoji-regex-7.0.3" + sources."emoji-regex-8.0.0" sources."enquirer-2.3.6" sources."escape-string-regexp-1.0.5" - sources."eslint-7.15.0" + sources."eslint-7.17.0" sources."eslint-scope-5.1.1" (sources."eslint-utils-2.1.0" // { dependencies = [ @@ -71272,16 +73578,16 @@ in sources."globals-12.4.0" sources."has-flag-3.0.0" sources."ignore-4.0.6" - sources."import-fresh-3.2.2" + sources."import-fresh-3.3.0" sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."is-extglob-2.1.1" - sources."is-fullwidth-code-point-2.0.0" + sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.1" sources."isexe-2.0.0" sources."js-tokens-4.0.0" - sources."js-yaml-3.14.0" + sources."js-yaml-3.14.1" sources."json-schema-traverse-0.4.1" sources."json-stable-stringify-without-jsonify-1.0.1" sources."levn-0.4.1" @@ -71300,23 +73606,30 @@ in sources."progress-2.0.3" sources."punycode-2.1.1" sources."regexpp-3.1.0" + sources."require-from-string-2.0.2" sources."resolve-from-4.0.0" sources."rimraf-3.0.2" sources."semver-7.3.4" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" - sources."slice-ansi-2.1.0" - sources."sprintf-js-1.0.3" - (sources."string-width-3.1.0" // { + (sources."slice-ansi-4.0.0" // { dependencies = [ - sources."ansi-regex-4.1.0" - sources."strip-ansi-5.2.0" + sources."ansi-styles-4.3.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" ]; }) + sources."sprintf-js-1.0.3" + sources."string-width-4.2.0" sources."strip-ansi-6.0.0" sources."strip-json-comments-3.1.1" sources."supports-color-5.5.0" - sources."table-5.4.6" + (sources."table-6.0.7" // { + dependencies = [ + sources."ajv-7.0.3" + sources."json-schema-traverse-1.0.0" + ]; + }) sources."text-table-0.2.0" sources."type-check-0.4.0" sources."type-fest-0.8.1" @@ -71337,23 +73650,41 @@ in bypassCache = true; reconstructLock = true; }; + esy = nodeEnv.buildNodePackage { + name = "esy"; + packageName = "esy"; + version = "0.6.7"; + src = fetchurl { + url = "https://registry.npmjs.org/esy/-/esy-0.6.7.tgz"; + sha512 = "G/C0wXDQy19eDqlFNmPg2kHmrllUez9deZd1OOIk/VTKtc75STdeE/Nl1NusVY+La/+eCtovNqk0/ZAb4Mg8gw=="; + }; + dependencies = [ + sources."esy-solve-cudf-0.1.10" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Package builder for esy."; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; expo-cli = nodeEnv.buildNodePackage { name = "expo-cli"; packageName = "expo-cli"; - version = "4.0.8"; + version = "4.0.17"; src = fetchurl { - url = "https://registry.npmjs.org/expo-cli/-/expo-cli-4.0.8.tgz"; - sha512 = "PcJqWSu2mHSEX/O/Vt5Wrui6ZIOE3mwUN4NL2xxmvVUAzIp08SzkAnWJOSThOxcTfHh9kd9fFK1GP6BZItvQOA=="; + url = "https://registry.npmjs.org/expo-cli/-/expo-cli-4.0.17.tgz"; + sha512 = "JF8HBs5dUd14zh9cI+u/OEKyRJqJZ2wOPvHlsX2Ohgxw80Wk/BGtTtZzlWY8/PQ+Lm56RWx7RMFPYestsBmpBg=="; }; dependencies = [ - sources."@babel/code-frame-7.10.4" + sources."@babel/code-frame-7.12.11" sources."@babel/compat-data-7.12.7" sources."@babel/core-7.9.0" - sources."@babel/generator-7.12.5" - sources."@babel/helper-annotate-as-pure-7.10.4" + sources."@babel/generator-7.12.11" + sources."@babel/helper-annotate-as-pure-7.12.10" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.10.4" - sources."@babel/helper-builder-react-jsx-7.10.4" - sources."@babel/helper-builder-react-jsx-experimental-7.12.4" sources."@babel/helper-compilation-targets-7.12.5" sources."@babel/helper-create-class-features-plugin-7.12.1" sources."@babel/helper-create-regexp-features-plugin-7.12.7" @@ -71363,8 +73694,8 @@ in ]; }) sources."@babel/helper-explode-assignable-expression-7.12.1" - sources."@babel/helper-function-name-7.10.4" - sources."@babel/helper-get-function-arity-7.10.4" + sources."@babel/helper-function-name-7.12.11" + sources."@babel/helper-get-function-arity-7.12.10" sources."@babel/helper-hoist-variables-7.10.4" sources."@babel/helper-member-expression-to-functions-7.12.7" sources."@babel/helper-module-imports-7.12.5" @@ -71373,15 +73704,15 @@ in sources."lodash-4.17.20" ]; }) - sources."@babel/helper-optimise-call-expression-7.12.7" + sources."@babel/helper-optimise-call-expression-7.12.10" sources."@babel/helper-plugin-utils-7.10.4" sources."@babel/helper-remap-async-to-generator-7.12.1" - sources."@babel/helper-replace-supers-7.12.5" + sources."@babel/helper-replace-supers-7.12.11" sources."@babel/helper-simple-access-7.12.1" sources."@babel/helper-skip-transparent-expression-wrappers-7.12.1" - sources."@babel/helper-split-export-declaration-7.11.0" - sources."@babel/helper-validator-identifier-7.10.4" - sources."@babel/helper-validator-option-7.12.1" + sources."@babel/helper-split-export-declaration-7.12.11" + sources."@babel/helper-validator-identifier-7.12.11" + sources."@babel/helper-validator-option-7.12.11" sources."@babel/helper-wrap-function-7.12.3" sources."@babel/helpers-7.12.5" (sources."@babel/highlight-7.10.4" // { @@ -71389,8 +73720,8 @@ in sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.12.7" - sources."@babel/plugin-proposal-async-generator-functions-7.12.1" + sources."@babel/parser-7.12.11" + sources."@babel/plugin-proposal-async-generator-functions-7.12.12" sources."@babel/plugin-proposal-class-properties-7.12.1" sources."@babel/plugin-proposal-dynamic-import-7.12.1" sources."@babel/plugin-proposal-export-default-from-7.12.1" @@ -71423,14 +73754,14 @@ in sources."@babel/plugin-transform-arrow-functions-7.12.1" sources."@babel/plugin-transform-async-to-generator-7.12.1" sources."@babel/plugin-transform-block-scoped-functions-7.12.1" - sources."@babel/plugin-transform-block-scoping-7.12.1" + sources."@babel/plugin-transform-block-scoping-7.12.12" sources."@babel/plugin-transform-classes-7.12.1" sources."@babel/plugin-transform-computed-properties-7.12.1" sources."@babel/plugin-transform-destructuring-7.12.1" sources."@babel/plugin-transform-dotall-regex-7.12.1" sources."@babel/plugin-transform-duplicate-keys-7.12.1" sources."@babel/plugin-transform-exponentiation-operator-7.12.1" - sources."@babel/plugin-transform-flow-strip-types-7.12.1" + sources."@babel/plugin-transform-flow-strip-types-7.12.10" sources."@babel/plugin-transform-for-of-7.12.1" sources."@babel/plugin-transform-function-name-7.12.1" sources."@babel/plugin-transform-literals-7.12.1" @@ -71446,11 +73777,11 @@ in sources."@babel/plugin-transform-parameters-7.12.1" sources."@babel/plugin-transform-property-literals-7.12.1" sources."@babel/plugin-transform-react-display-name-7.12.1" - sources."@babel/plugin-transform-react-jsx-7.12.7" + sources."@babel/plugin-transform-react-jsx-7.12.12" sources."@babel/plugin-transform-react-jsx-source-7.12.1" sources."@babel/plugin-transform-regenerator-7.12.1" sources."@babel/plugin-transform-reserved-words-7.12.1" - (sources."@babel/plugin-transform-runtime-7.12.1" // { + (sources."@babel/plugin-transform-runtime-7.12.10" // { dependencies = [ sources."semver-5.7.1" ]; @@ -71459,47 +73790,47 @@ in sources."@babel/plugin-transform-spread-7.12.1" sources."@babel/plugin-transform-sticky-regex-7.12.7" sources."@babel/plugin-transform-template-literals-7.12.1" - sources."@babel/plugin-transform-typeof-symbol-7.12.1" + sources."@babel/plugin-transform-typeof-symbol-7.12.10" sources."@babel/plugin-transform-typescript-7.12.1" sources."@babel/plugin-transform-unicode-escapes-7.12.1" sources."@babel/plugin-transform-unicode-regex-7.12.1" - sources."@babel/preset-env-7.12.7" + sources."@babel/preset-env-7.12.11" sources."@babel/preset-modules-0.1.4" sources."@babel/preset-typescript-7.12.7" sources."@babel/runtime-7.12.5" sources."@babel/template-7.12.7" - (sources."@babel/traverse-7.12.9" // { + (sources."@babel/traverse-7.12.12" // { dependencies = [ sources."lodash-4.17.20" ]; }) - (sources."@babel/types-7.12.7" // { + (sources."@babel/types-7.12.12" // { dependencies = [ sources."lodash-4.17.20" ]; }) sources."@expo/babel-preset-cli-0.2.18" sources."@expo/bunyan-4.0.0" - (sources."@expo/config-3.3.18" // { + (sources."@expo/config-3.3.22" // { dependencies = [ sources."semver-7.3.4" ]; }) - (sources."@expo/config-plugins-1.0.7" // { + (sources."@expo/config-plugins-1.0.13" // { dependencies = [ sources."slash-3.0.0" sources."uuid-3.4.0" sources."xcode-2.1.0" ]; }) - sources."@expo/config-types-40.0.0-beta.1" - (sources."@expo/configure-splash-screen-0.2.1" // { + sources."@expo/config-types-40.0.0-beta.2" + (sources."@expo/configure-splash-screen-0.3.2" // { dependencies = [ sources."commander-5.1.0" sources."pngjs-5.0.0" ]; }) - (sources."@expo/dev-server-0.1.43" // { + (sources."@expo/dev-server-0.1.48" // { dependencies = [ sources."body-parser-1.19.0" sources."bytes-3.1.0" @@ -71516,7 +73847,7 @@ in sources."type-fest-0.12.0" ]; }) - sources."@expo/dev-tools-0.13.66" + sources."@expo/dev-tools-0.13.74" sources."@expo/eas-build-job-0.1.2" (sources."@expo/image-utils-0.3.9" // { dependencies = [ @@ -71526,10 +73857,11 @@ in }) (sources."@expo/json-file-8.2.25" // { dependencies = [ + sources."@babel/code-frame-7.10.4" sources."json5-1.0.1" ]; }) - sources."@expo/metro-config-0.1.43" + sources."@expo/metro-config-0.1.48" (sources."@expo/ngrok-2.4.3" // { dependencies = [ sources."uuid-3.4.0" @@ -71556,13 +73888,13 @@ in sources."semver-5.7.1" ]; }) - (sources."@expo/plist-0.0.10" // { + (sources."@expo/plist-0.0.11" // { dependencies = [ sources."xmlbuilder-14.0.0" ]; }) sources."@expo/results-1.0.0" - (sources."@expo/schemer-1.3.22" // { + (sources."@expo/schemer-1.3.23" // { dependencies = [ sources."ajv-5.5.2" sources."fast-deep-equal-1.1.0" @@ -71576,14 +73908,14 @@ in sources."@expo/spawn-async-1.5.0" sources."@expo/traveling-fastlane-darwin-1.15.1" sources."@expo/traveling-fastlane-linux-1.15.1" - (sources."@expo/webpack-config-0.12.48" // { + (sources."@expo/webpack-config-0.12.52" // { dependencies = [ sources."@babel/runtime-7.9.0" sources."is-wsl-2.2.0" sources."react-refresh-0.8.3" ]; }) - (sources."@expo/xdl-59.0.6" // { + (sources."@expo/xdl-59.0.14" // { dependencies = [ sources."chownr-1.1.4" (sources."fs-minipass-1.2.7" // { @@ -71637,7 +73969,7 @@ in }) sources."@hapi/address-4.1.0" sources."@hapi/formula-2.0.0" - sources."@hapi/hoek-9.1.0" + sources."@hapi/hoek-9.1.1" sources."@hapi/joi-17.1.1" sources."@hapi/pinpoint-2.0.0" sources."@hapi/topo-5.0.0" @@ -71682,9 +74014,9 @@ in sources."@jimp/tiff-0.12.1" sources."@jimp/types-0.12.1" sources."@jimp/utils-0.12.1" - sources."@nodelib/fs.scandir-2.1.3" - sources."@nodelib/fs.stat-2.0.3" - sources."@nodelib/fs.walk-1.2.4" + sources."@nodelib/fs.scandir-2.1.4" + sources."@nodelib/fs.stat-2.0.4" + sources."@nodelib/fs.walk-1.2.6" sources."@npmcli/ci-detect-1.3.0" (sources."@npmcli/git-2.0.4" // { dependencies = [ @@ -71762,7 +74094,7 @@ in sources."@types/istanbul-reports-1.1.2" sources."@types/json-schema-7.0.6" sources."@types/keyv-3.1.1" - sources."@types/lodash-4.14.165" + sources."@types/lodash-4.14.167" sources."@types/minimatch-3.0.3" sources."@types/mkdirp-0.5.2" sources."@types/node-9.6.61" @@ -71789,8 +74121,8 @@ in sources."source-map-0.7.3" ]; }) - sources."@types/yargs-15.0.11" - sources."@types/yargs-parser-15.0.0" + sources."@types/yargs-15.0.12" + sources."@types/yargs-parser-20.2.0" sources."@webassemblyjs/ast-1.9.0" sources."@webassemblyjs/floating-point-hex-parser-1.9.0" sources."@webassemblyjs/helper-api-error-1.9.0" @@ -71976,7 +74308,7 @@ in ]; }) sources."browserify-zlib-0.2.0" - sources."browserslist-4.15.0" + sources."browserslist-4.16.0" sources."buffer-5.7.1" sources."buffer-equal-0.0.1" sources."buffer-from-1.1.1" @@ -71994,7 +74326,7 @@ in ]; }) sources."cache-base-1.0.1" - sources."cacheable-lookup-5.0.3" + sources."cacheable-lookup-5.0.4" (sources."cacheable-request-6.1.0" // { dependencies = [ sources."get-stream-5.2.0" @@ -72015,7 +74347,7 @@ in }) sources."camelcase-5.3.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001165" + sources."caniuse-lite-1.0.30001173" sources."capture-stack-trace-1.0.1" sources."caseless-0.12.0" (sources."chalk-4.1.0" // { @@ -72129,17 +74461,23 @@ in dependencies = [ sources."array-union-2.1.0" sources."find-cache-dir-3.3.1" + sources."find-up-4.1.0" sources."globby-11.0.1" sources."loader-utils-2.0.0" + sources."locate-path-5.0.0" sources."make-dir-3.1.0" - sources."p-limit-3.1.0" + (sources."p-locate-4.1.0" // { + dependencies = [ + sources."p-limit-2.3.0" + ]; + }) sources."pkg-dir-4.2.0" sources."semver-6.3.0" sources."slash-3.0.0" ]; }) - sources."core-js-3.8.0" - (sources."core-js-compat-3.8.0" // { + sources."core-js-3.8.2" + (sources."core-js-compat-3.8.2" // { dependencies = [ sources."semver-7.0.0" ]; @@ -72165,7 +74503,7 @@ in sources."semver-6.3.0" ]; }) - (sources."css-select-1.2.0" // { + (sources."css-select-2.1.0" // { dependencies = [ (sources."dom-serializer-0.2.2" // { dependencies = [ @@ -72173,7 +74511,7 @@ in ]; }) sources."domelementtype-1.3.1" - sources."domutils-1.5.1" + sources."domutils-1.7.0" ]; }) sources."css-select-base-adapter-0.1.1" @@ -72182,7 +74520,7 @@ in sources."source-map-0.6.1" ]; }) - sources."css-what-2.1.3" + sources."css-what-3.4.2" sources."cssesc-3.0.0" sources."cssnano-4.1.10" sources."cssnano-preset-default-4.0.7" @@ -72201,8 +74539,8 @@ in sources."dag-map-1.0.2" sources."dashdash-1.14.1" sources."dateformat-3.0.3" - sources."dayjs-1.9.7" - sources."debug-4.3.1" + sources."dayjs-1.10.1" + sources."debug-4.3.2" sources."debuglog-1.0.1" sources."decache-4.4.0" sources."decamelize-1.2.0" @@ -72261,12 +74599,16 @@ in sources."dns-packet-1.3.1" sources."dns-txt-2.0.2" sources."dom-converter-0.2.0" - sources."dom-serializer-1.1.0" + (sources."dom-serializer-1.2.0" // { + dependencies = [ + sources."domhandler-4.0.0" + ]; + }) sources."dom-walk-0.1.2" sources."domain-browser-1.2.0" sources."domelementtype-2.1.0" sources."domhandler-3.3.0" - (sources."domutils-2.4.3" // { + (sources."domutils-2.4.4" // { dependencies = [ sources."domhandler-4.0.0" ]; @@ -72282,7 +74624,7 @@ in sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.616" + sources."electron-to-chromium-1.3.634" (sources."elliptic-6.5.3" // { dependencies = [ sources."bn.js-4.11.9" @@ -72308,7 +74650,7 @@ in sources."envinfo-7.5.0" sources."eol-0.9.1" sources."err-code-1.1.2" - sources."errno-0.1.7" + sources."errno-0.1.8" (sources."error-ex-1.3.2" // { dependencies = [ sources."is-arrayish-0.2.1" @@ -72359,7 +74701,7 @@ in sources."ms-2.0.0" ]; }) - (sources."expo-pwa-0.0.54" // { + (sources."expo-pwa-0.0.58" // { dependencies = [ sources."commander-2.20.0" ]; @@ -72386,7 +74728,7 @@ in sources."fast-deep-equal-3.1.3" sources."fast-glob-3.2.4" sources."fast-json-stable-stringify-2.1.0" - sources."fastq-1.9.0" + sources."fastq-1.10.0" sources."faye-websocket-0.10.0" sources."figgy-pudding-3.5.2" sources."figures-3.2.0" @@ -72406,10 +74748,10 @@ in ]; }) sources."find-cache-dir-2.1.0" - sources."find-up-4.1.0" + sources."find-up-5.0.0" sources."find-yarn-workspace-root-2.0.0" sources."flush-write-stream-1.1.1" - sources."follow-redirects-1.13.0" + sources."follow-redirects-1.13.1" sources."for-in-1.0.2" sources."foreach-2.0.5" sources."forever-agent-0.6.1" @@ -72465,7 +74807,7 @@ in }) sources."gensync-1.0.0-beta.2" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.0.1" + sources."get-intrinsic-1.0.2" sources."get-own-enumerable-property-symbols-3.0.2" sources."get-port-3.2.0" sources."get-stream-4.1.0" @@ -72483,7 +74825,7 @@ in sources."pify-2.3.0" ]; }) - (sources."got-11.8.0" // { + (sources."got-11.8.1" // { dependencies = [ sources."@sindresorhus/is-4.0.0" sources."@szmarczak/http-timer-4.0.5" @@ -72548,7 +74890,7 @@ in sources."hsl-regex-1.0.0" sources."hsla-regex-1.0.0" sources."html-comment-regex-1.1.2" - sources."html-entities-1.3.1" + sources."html-entities-1.4.0" (sources."html-loader-1.1.0" // { dependencies = [ sources."loader-utils-2.0.0" @@ -72610,7 +74952,7 @@ in sources."infer-owner-1.0.4" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."ini-1.3.5" + sources."ini-1.3.8" sources."internal-ip-4.3.0" sources."invariant-2.2.4" sources."ip-1.1.5" @@ -72622,7 +74964,7 @@ in sources."is-arrayish-0.3.2" sources."is-bigint-1.0.1" sources."is-binary-path-2.1.0" - sources."is-boolean-object-1.0.1" + sources."is-boolean-object-1.1.0" sources."is-buffer-1.1.6" sources."is-callable-1.2.2" sources."is-color-stop-1.1.0" @@ -72644,7 +74986,7 @@ in ]; }) sources."is-lambda-1.0.1" - sources."is-map-2.0.1" + sources."is-map-2.0.2" sources."is-negative-zero-2.0.1" sources."is-number-7.0.0" sources."is-number-object-1.0.4" @@ -72672,12 +75014,16 @@ in sources."is-resolvable-1.1.0" sources."is-retry-allowed-1.2.0" sources."is-root-2.1.0" - sources."is-set-2.0.1" + sources."is-set-2.0.2" sources."is-stream-1.1.0" sources."is-string-1.0.5" sources."is-svg-3.0.0" sources."is-symbol-1.0.3" - sources."is-typed-array-1.1.3" + (sources."is-typed-array-1.1.4" // { + dependencies = [ + sources."es-abstract-1.18.0-next.1" + ]; + }) sources."is-typedarray-1.0.0" sources."is-valid-path-0.1.1" sources."is-weakmap-2.0.1" @@ -72702,7 +75048,7 @@ in sources."join-component-1.1.0" sources."jpeg-js-0.4.2" sources."js-tokens-4.0.0" - sources."js-yaml-3.14.0" + sources."js-yaml-3.14.1" sources."jsbn-0.1.1" sources."jsesc-2.5.2" sources."json-buffer-3.0.0" @@ -72742,7 +75088,7 @@ in sources."json5-1.0.1" ]; }) - sources."locate-path-5.0.0" + sources."locate-path-6.0.0" sources."lock-0.1.4" sources."lodash-4.17.15" sources."lodash._reinterpolate-3.0.0" @@ -72779,7 +75125,7 @@ in sources."semver-5.7.1" ]; }) - (sources."make-fetch-happen-8.0.10" // { + (sources."make-fetch-happen-8.0.12" // { dependencies = [ sources."minipass-3.1.3" ]; @@ -72810,9 +75156,9 @@ in sources."bn.js-4.11.9" ]; }) - sources."mime-2.4.6" - sources."mime-db-1.44.0" - sources."mime-types-2.1.27" + sources."mime-2.4.7" + sources."mime-db-1.45.0" + sources."mime-types-2.1.28" sources."mimic-fn-1.2.0" sources."mimic-response-1.0.1" sources."min-document-2.19.0" @@ -72912,7 +75258,7 @@ in sources."punycode-1.4.1" ]; }) - sources."node-releases-1.1.67" + sources."node-releases-1.1.69" sources."nopt-5.0.0" sources."normalize-path-3.0.0" sources."normalize-url-3.3.0" @@ -73011,8 +75357,8 @@ in }) 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-limit-3.1.0" + sources."p-locate-5.0.0" sources."p-map-3.0.0" sources."p-retry-4.1.0" (sources."p-some-4.1.0" // { @@ -73092,6 +75438,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" ]; @@ -73100,6 +75447,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" ]; @@ -73236,7 +75584,7 @@ in sources."postcss-unique-selectors-4.0.1" sources."postcss-value-parser-4.1.0" sources."prepend-http-1.0.4" - sources."pretty-bytes-5.4.1" + sources."pretty-bytes-5.5.0" (sources."pretty-error-2.1.2" // { dependencies = [ sources."lodash-4.17.20" @@ -73301,6 +75649,7 @@ in sources."rc-1.2.8" (sources."react-dev-utils-11.0.1" // { dependencies = [ + sources."@babel/code-frame-7.10.4" sources."array-union-2.1.0" sources."browserslist-4.14.2" (sources."chalk-2.4.2" // { @@ -73310,10 +75659,14 @@ in }) sources."cross-spawn-7.0.3" sources."escape-string-regexp-2.0.0" + sources."find-up-4.1.0" sources."globby-11.0.1" sources."is-wsl-2.2.0" sources."loader-utils-2.0.0" + sources."locate-path-5.0.0" sources."open-7.3.0" + sources."p-limit-2.3.0" + sources."p-locate-4.1.0" sources."path-key-3.1.1" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" @@ -73354,7 +75707,7 @@ in sources."relateurl-0.2.7" sources."remove-trailing-separator-1.1.0" sources."remove-trailing-slash-0.1.1" - (sources."renderkid-2.0.4" // { + (sources."renderkid-2.0.5" // { dependencies = [ sources."ansi-regex-2.1.1" (sources."dom-serializer-0.2.2" // { @@ -73455,11 +75808,7 @@ in sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."shell-quote-1.6.1" - (sources."side-channel-1.0.3" // { - dependencies = [ - sources."es-abstract-1.18.0-next.1" - ]; - }) + sources."side-channel-1.0.4" sources."signal-exit-3.0.3" sources."simple-plist-1.1.1" sources."simple-swizzle-0.2.2" @@ -73612,15 +75961,6 @@ in (sources."svgo-1.3.2" // { dependencies = [ sources."chalk-2.4.2" - sources."css-select-2.1.0" - sources."css-what-3.4.2" - (sources."dom-serializer-0.2.2" // { - dependencies = [ - sources."domelementtype-2.1.0" - ]; - }) - sources."domelementtype-1.3.1" - sources."domutils-1.7.0" ]; }) sources."symbol-observable-1.2.0" @@ -73660,8 +76000,14 @@ in (sources."terser-webpack-plugin-3.1.0" // { dependencies = [ sources."find-cache-dir-3.3.1" + sources."find-up-4.1.0" + sources."locate-path-5.0.0" sources."make-dir-3.1.0" - sources."p-limit-3.1.0" + (sources."p-locate-4.1.0" // { + dependencies = [ + sources."p-limit-2.3.0" + ]; + }) sources."pkg-dir-4.2.0" sources."semver-6.3.0" sources."source-map-0.6.1" @@ -73761,7 +76107,7 @@ in sources."util.promisify-1.0.0" sources."utila-0.4.0" sources."utils-merge-1.0.1" - sources."uuid-8.3.1" + sources."uuid-8.3.2" sources."valid-url-1.0.9" sources."validate-npm-package-name-3.0.0" sources."validator-10.5.0" @@ -73824,7 +76170,7 @@ in ]; }) sources."webpack-deep-scope-plugin-1.6.0" - sources."webpack-dev-middleware-3.7.2" + sources."webpack-dev-middleware-3.7.3" (sources."webpack-dev-server-3.11.0" // { dependencies = [ sources."ansi-regex-2.1.1" @@ -73875,6 +76221,7 @@ in sources."mime-1.6.0" sources."ms-2.0.0" sources."normalize-path-2.1.1" + sources."p-limit-2.3.0" sources."p-locate-3.0.0" sources."p-retry-3.0.1" sources."path-exists-3.0.0" @@ -73943,10 +76290,14 @@ in sources."websocket-driver-0.6.5" sources."websocket-extensions-0.1.4" sources."which-1.3.1" - sources."which-boxed-primitive-1.0.1" + sources."which-boxed-primitive-1.0.2" sources."which-collection-1.0.1" sources."which-module-2.0.0" - sources."which-typed-array-1.1.2" + (sources."which-typed-array-1.1.4" // { + dependencies = [ + sources."es-abstract-1.18.0-next.1" + ]; + }) (sources."wide-align-1.1.3" // { dependencies = [ sources."ansi-regex-3.0.0" @@ -74013,7 +76364,14 @@ in sources."xtend-4.0.2" sources."y18n-4.0.1" sources."yallist-4.0.0" - sources."yargs-15.4.1" + (sources."yargs-15.4.1" // { + dependencies = [ + sources."find-up-4.1.0" + sources."locate-path-5.0.0" + sources."p-limit-2.3.0" + sources."p-locate-4.1.0" + ]; + }) sources."yargs-parser-18.1.3" sources."yocto-queue-0.1.0" sources."zen-observable-0.8.15" @@ -74126,8 +76484,8 @@ in sources."loud-rejection-1.6.0" sources."map-obj-1.0.1" sources."meow-3.7.0" - sources."mime-db-1.44.0" - sources."mime-types-2.1.27" + sources."mime-db-1.45.0" + sources."mime-types-2.1.28" sources."mimic-fn-1.2.0" sources."minimist-1.2.5" sources."mkdirp-0.5.5" @@ -74233,12 +76591,12 @@ in ]; }) sources."@mrmlnc/readdir-enhanced-2.2.1" - sources."@nodelib/fs.scandir-2.1.3" - sources."@nodelib/fs.stat-2.0.3" - sources."@nodelib/fs.walk-1.2.4" + sources."@nodelib/fs.scandir-2.1.4" + sources."@nodelib/fs.stat-2.0.4" + sources."@nodelib/fs.walk-1.2.6" (sources."@oclif/command-1.8.0" // { dependencies = [ - sources."@oclif/plugin-help-3.2.0" + sources."@oclif/plugin-help-3.2.1" sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" sources."color-convert-1.9.3" @@ -74344,7 +76702,7 @@ in ]; }) sources."clean-stack-3.0.1" - sources."cli-table-0.3.1" + sources."cli-table-0.3.4" (sources."cli-ux-4.9.3" // { dependencies = [ sources."ansi-regex-4.1.0" @@ -74364,7 +76722,6 @@ in sources."collection-visit-1.0.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."colors-1.0.3" sources."combined-stream-1.0.8" sources."component-emitter-1.3.0" sources."concat-map-0.0.1" @@ -74377,7 +76734,7 @@ in ]; }) sources."dashdash-1.14.1" - sources."debug-4.3.1" + sources."debug-4.3.2" sources."decode-uri-component-0.2.0" sources."decompress-response-3.3.0" sources."deep-is-0.1.3" @@ -74433,7 +76790,7 @@ in sources."fast-glob-3.2.4" sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" - sources."fastq-1.9.0" + sources."fastq-1.10.0" sources."faunadb-git+https://github.com/fauna/faunadb-js.git#triage/bearer-to-basic" sources."fill-range-7.0.1" sources."fn-annotate-1.2.0" @@ -74515,7 +76872,7 @@ in sources."indent-string-4.0.0" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."ini-1.3.5" + sources."ini-1.3.8" sources."into-stream-3.1.0" sources."is-accessor-descriptor-1.0.0" sources."is-buffer-1.1.6" @@ -74560,8 +76917,8 @@ in sources."map-visit-1.0.0" sources."merge2-1.4.1" sources."micromatch-4.0.2" - sources."mime-db-1.44.0" - sources."mime-types-2.1.27" + sources."mime-db-1.45.0" + sources."mime-types-2.1.28" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" (sources."mixin-deep-1.3.2" // { @@ -74776,13 +77133,849 @@ in bypassCache = true; reconstructLock = true; }; + firebase-tools = nodeEnv.buildNodePackage { + name = "firebase-tools"; + packageName = "firebase-tools"; + version = "9.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/firebase-tools/-/firebase-tools-9.1.0.tgz"; + sha512 = "hTfxL2meJSl5WuwAS6bEJ5nay7tu3MNYb4ZL2KmPL7yLM3IeT+Qd2z1evHhW1VvbDXKR6RTwlBxzdWPs4l75kA=="; + }; + dependencies = [ + sources."@apidevtools/json-schema-ref-parser-9.0.6" + sources."@dabh/diagnostics-2.0.2" + sources."@google-cloud/paginator-3.0.5" + sources."@google-cloud/precise-date-2.0.3" + sources."@google-cloud/projectify-2.0.1" + sources."@google-cloud/promisify-2.0.3" + sources."@google-cloud/pubsub-2.7.0" + (sources."@grpc/grpc-js-1.1.8" // { + dependencies = [ + sources."@grpc/proto-loader-0.6.0-pre9" + sources."@types/node-12.19.12" + sources."semver-6.3.0" + ]; + }) + sources."@grpc/proto-loader-0.5.5" + sources."@jsdevtools/ono-7.1.3" + sources."@opentelemetry/api-0.11.0" + sources."@opentelemetry/context-base-0.11.0" + (sources."@opentelemetry/core-0.11.0" // { + dependencies = [ + sources."semver-7.3.4" + ]; + }) + sources."@opentelemetry/resources-0.11.0" + sources."@opentelemetry/semantic-conventions-0.11.0" + sources."@opentelemetry/tracing-0.11.0" + sources."@protobufjs/aspromise-1.1.2" + sources."@protobufjs/base64-1.1.2" + sources."@protobufjs/codegen-2.0.4" + sources."@protobufjs/eventemitter-1.1.0" + sources."@protobufjs/fetch-1.1.0" + sources."@protobufjs/float-1.0.2" + sources."@protobufjs/inquire-1.1.0" + sources."@protobufjs/path-1.1.2" + sources."@protobufjs/pool-1.1.0" + sources."@protobufjs/utf8-1.1.0" + sources."@sindresorhus/is-0.14.0" + sources."@szmarczak/http-timer-1.1.2" + sources."@types/duplexify-3.6.0" + sources."@types/long-4.0.1" + sources."@types/node-14.14.20" + sources."JSONStream-1.3.5" + sources."abbrev-1.1.1" + sources."abort-controller-3.0.0" + sources."accepts-1.3.7" + sources."agent-base-6.0.2" + sources."ajv-6.12.6" + (sources."ansi-align-3.0.0" // { + dependencies = [ + sources."ansi-regex-4.1.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."ansi-escapes-3.2.0" + sources."ansi-regex-5.0.0" + sources."ansi-styles-4.3.0" + sources."ansicolors-0.3.2" + sources."anymatch-3.1.1" + sources."aproba-1.2.0" + sources."archiver-3.1.1" + (sources."archiver-utils-2.1.0" // { + dependencies = [ + sources."readable-stream-2.3.7" + sources."safe-buffer-5.1.2" + sources."string_decoder-1.1.1" + ]; + }) + (sources."are-we-there-yet-1.1.5" // { + dependencies = [ + sources."readable-stream-2.3.7" + sources."safe-buffer-5.1.2" + sources."string_decoder-1.1.1" + ]; + }) + sources."argparse-1.0.10" + sources."array-flatten-1.1.1" + sources."arrify-2.0.1" + sources."as-array-2.0.0" + 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.11.0" + sources."balanced-match-1.0.0" + sources."base64-js-1.5.1" + (sources."basic-auth-2.0.1" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) + sources."basic-auth-connect-1.0.0" + sources."bcrypt-pbkdf-1.0.2" + sources."big-integer-1.6.48" + sources."bignumber.js-9.0.1" + sources."binary-0.3.0" + sources."binary-extensions-2.1.0" + sources."bl-4.0.3" + sources."blakejs-1.1.0" + sources."bluebird-3.4.7" + (sources."body-parser-1.19.0" // { + dependencies = [ + sources."debug-2.6.9" + sources."ms-2.0.0" + ]; + }) + (sources."boxen-4.2.0" // { + dependencies = [ + sources."chalk-3.0.0" + sources."has-flag-4.0.0" + sources."supports-color-7.2.0" + ]; + }) + sources."brace-expansion-1.1.11" + sources."braces-3.0.2" + sources."buffer-5.7.1" + sources."buffer-crc32-0.2.13" + sources."buffer-equal-constant-time-1.0.1" + sources."buffer-indexof-polyfill-1.0.2" + sources."buffers-0.1.1" + sources."bytes-3.1.0" + (sources."cacheable-request-6.1.0" // { + dependencies = [ + sources."get-stream-5.2.0" + sources."lowercase-keys-2.0.0" + ]; + }) + sources."call-me-maybe-1.0.1" + sources."camelcase-5.3.1" + sources."cardinal-2.1.1" + sources."caseless-0.12.0" + sources."chainsaw-0.1.0" + (sources."chalk-2.4.2" // { + dependencies = [ + sources."ansi-styles-3.2.1" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + ]; + }) + sources."chardet-0.7.0" + sources."chokidar-3.4.3" + sources."chownr-2.0.0" + sources."ci-info-2.0.0" + sources."cjson-0.3.3" + sources."cli-boxes-2.2.1" + (sources."cli-color-1.4.0" // { + dependencies = [ + sources."ansi-regex-2.1.1" + ]; + }) + sources."cli-cursor-2.1.0" + sources."cli-spinners-2.5.0" + sources."cli-table-0.3.4" + sources."cli-width-2.2.1" + sources."cliui-6.0.0" + sources."clone-1.0.4" + sources."clone-response-1.0.2" + sources."code-point-at-1.1.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.4" + sources."colors-1.4.0" + sources."colorspace-1.1.2" + sources."combined-stream-1.0.8" + sources."commander-4.1.1" + sources."compare-semver-1.1.0" + (sources."compress-commons-2.1.1" // { + dependencies = [ + sources."readable-stream-2.3.7" + sources."safe-buffer-5.1.2" + sources."string_decoder-1.1.1" + ]; + }) + sources."compressible-2.0.18" + (sources."compression-1.7.4" // { + dependencies = [ + sources."bytes-3.0.0" + sources."debug-2.6.9" + sources."ms-2.0.0" + sources."safe-buffer-5.1.2" + ]; + }) + sources."concat-map-0.0.1" + sources."configstore-5.0.1" + (sources."connect-3.7.0" // { + dependencies = [ + sources."debug-2.6.9" + sources."ms-2.0.0" + ]; + }) + sources."console-control-strings-1.1.0" + (sources."content-disposition-0.5.3" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) + sources."content-type-1.0.4" + sources."cookie-0.4.0" + sources."cookie-signature-1.0.6" + sources."core-util-is-1.0.2" + sources."crc-3.8.0" + sources."crc32-stream-3.0.1" + (sources."cross-env-5.2.1" // { + dependencies = [ + sources."cross-spawn-6.0.5" + ]; + }) + (sources."cross-spawn-7.0.3" // { + dependencies = [ + sources."path-key-3.1.1" + sources."shebang-command-2.0.0" + sources."shebang-regex-3.0.0" + sources."which-2.0.2" + ]; + }) + sources."crypto-random-string-2.0.0" + sources."csv-streamify-3.0.4" + sources."d-1.0.1" + sources."dashdash-1.14.1" + sources."debug-4.3.2" + sources."decamelize-1.2.0" + sources."decompress-response-3.3.0" + sources."deep-extend-0.6.0" + sources."deep-freeze-0.0.1" + sources."deep-is-0.1.3" + sources."defaults-1.0.3" + sources."defer-to-connect-1.1.3" + sources."delayed-stream-1.0.0" + sources."delegates-1.0.0" + sources."depd-1.1.2" + sources."destroy-1.0.4" + sources."dot-prop-5.3.0" + sources."dotenv-6.2.0" + (sources."duplexer2-0.1.4" // { + dependencies = [ + sources."readable-stream-2.3.7" + sources."safe-buffer-5.1.2" + sources."string_decoder-1.1.1" + ]; + }) + sources."duplexer3-0.1.4" + sources."duplexify-4.1.1" + sources."ecc-jsbn-0.1.2" + sources."ecdsa-sig-formatter-1.0.11" + sources."ee-first-1.1.1" + sources."emoji-regex-8.0.0" + sources."enabled-2.0.0" + sources."encodeurl-1.0.2" + sources."end-of-stream-1.4.4" + sources."env-paths-2.2.0" + sources."es5-ext-0.10.53" + sources."es6-iterator-2.0.3" + sources."es6-symbol-3.1.3" + sources."es6-weak-map-2.0.3" + sources."escape-goat-2.1.1" + sources."escape-html-1.0.3" + sources."escape-string-regexp-1.0.5" + sources."esprima-4.0.1" + sources."etag-1.8.1" + sources."event-emitter-0.3.5" + sources."event-target-shim-5.0.1" + sources."events-listener-1.1.0" + (sources."exegesis-2.5.6" // { + dependencies = [ + sources."semver-7.3.4" + ]; + }) + sources."exegesis-express-2.0.0" + sources."exit-code-1.0.2" + (sources."express-4.17.1" // { + dependencies = [ + sources."debug-2.6.9" + sources."ms-2.0.0" + sources."safe-buffer-5.1.2" + ]; + }) + (sources."ext-1.4.0" // { + dependencies = [ + sources."type-2.1.0" + ]; + }) + sources."extend-3.0.2" + sources."external-editor-3.1.0" + sources."extsprintf-1.3.0" + sources."fast-deep-equal-3.1.3" + sources."fast-json-stable-stringify-2.1.0" + sources."fast-safe-stringify-2.0.7" + sources."fast-text-encoding-1.0.3" + (sources."fast-url-parser-1.1.3" // { + dependencies = [ + sources."punycode-1.4.1" + ]; + }) + sources."fecha-4.2.0" + sources."figures-2.0.0" + sources."filesize-3.6.1" + sources."fill-range-7.0.1" + (sources."finalhandler-1.1.2" // { + dependencies = [ + sources."debug-2.6.9" + sources."ms-2.0.0" + ]; + }) + sources."find-up-4.1.0" + (sources."flat-arguments-1.0.2" // { + dependencies = [ + (sources."as-array-1.0.0" // { + dependencies = [ + sources."lodash.isarguments-2.4.1" + sources."lodash.isobject-2.4.1" + ]; + }) + sources."lodash.isobject-3.0.2" + ]; + }) + sources."fn.name-1.1.0" + sources."forever-agent-0.6.1" + sources."form-data-2.3.3" + sources."forwarded-0.1.2" + sources."fresh-0.5.2" + sources."fs-constants-1.0.0" + (sources."fs-extra-0.23.1" // { + dependencies = [ + sources."rimraf-2.7.1" + ]; + }) + sources."fs-minipass-2.1.0" + sources."fs.realpath-1.0.0" + sources."fsevents-2.1.3" + (sources."fstream-1.0.12" // { + dependencies = [ + sources."rimraf-2.7.1" + ]; + }) + (sources."gauge-2.7.4" // { + dependencies = [ + sources."ansi-regex-2.1.1" + sources."is-fullwidth-code-point-1.0.0" + sources."string-width-1.0.2" + sources."strip-ansi-3.0.1" + ]; + }) + sources."gaxios-4.1.0" + sources."gcp-metadata-4.2.1" + sources."get-caller-file-2.0.5" + sources."get-stream-4.1.0" + sources."getpass-0.1.7" + sources."glob-7.1.6" + sources."glob-parent-5.1.1" + sources."glob-slash-1.0.0" + sources."glob-slasher-1.0.1" + sources."global-dirs-2.1.0" + sources."google-auth-library-6.1.3" + sources."google-gax-2.9.2" + sources."google-p12-pem-3.0.3" + sources."got-9.6.0" + sources."graceful-fs-4.2.4" + (sources."gtoken-5.1.0" // { + dependencies = [ + sources."mime-2.4.7" + ]; + }) + sources."har-schema-2.0.0" + sources."har-validator-5.1.5" + (sources."has-ansi-2.0.0" // { + dependencies = [ + sources."ansi-regex-2.1.1" + ]; + }) + sources."has-flag-3.0.0" + sources."has-unicode-2.0.1" + sources."has-yarn-2.1.0" + sources."home-dir-1.0.0" + sources."http-cache-semantics-4.1.0" + (sources."http-errors-1.7.2" // { + dependencies = [ + sources."inherits-2.0.3" + ]; + }) + sources."http-signature-1.2.0" + sources."https-proxy-agent-5.0.0" + sources."iconv-lite-0.4.24" + sources."ieee754-1.2.1" + sources."import-lazy-2.1.0" + sources."imurmurhash-0.1.4" + sources."inflight-1.0.6" + sources."inherits-2.0.4" + sources."ini-1.3.7" + (sources."inquirer-6.3.1" // { + dependencies = [ + sources."ansi-regex-3.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."install-artifact-from-github-1.2.0" + sources."ip-regex-4.2.0" + sources."ipaddr.js-1.9.1" + sources."is-arrayish-0.3.2" + sources."is-binary-path-2.1.0" + sources."is-ci-2.0.0" + 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-npm-4.0.0" + sources."is-number-7.0.0" + sources."is-obj-2.0.0" + sources."is-path-inside-3.0.2" + sources."is-promise-2.2.2" + sources."is-stream-2.0.0" + sources."is-stream-ended-0.1.4" + sources."is-typedarray-1.0.0" + sources."is-url-1.2.4" + sources."is-wsl-1.1.0" + sources."is-yarn-global-0.3.0" + sources."is2-2.0.6" + sources."isarray-1.0.0" + sources."isexe-2.0.0" + sources."isstream-0.1.2" + sources."jju-1.4.0" + sources."join-path-1.1.1" + sources."js-yaml-3.14.1" + sources."jsbn-0.1.1" + sources."json-bigint-1.0.0" + sources."json-buffer-3.0.0" + sources."json-parse-helpfulerror-1.0.3" + sources."json-ptr-1.3.2" + sources."json-schema-0.2.3" + sources."json-schema-traverse-0.4.1" + sources."json-stringify-safe-5.0.1" + sources."jsonfile-2.4.0" + sources."jsonparse-1.3.1" + sources."jsonschema-1.4.0" + (sources."jsonwebtoken-8.5.1" // { + dependencies = [ + sources."jwa-1.4.1" + sources."jws-3.2.2" + ]; + }) + sources."jsprim-1.4.1" + sources."jwa-2.0.0" + sources."jws-4.0.0" + sources."keyv-3.1.0" + sources."kuler-2.0.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."string_decoder-1.1.1" + ]; + }) + sources."leven-3.1.0" + sources."listenercount-1.0.1" + sources."locate-path-5.0.0" + sources."lodash-4.17.20" + sources."lodash._isnative-2.4.1" + sources."lodash._objecttypes-2.4.1" + sources."lodash._shimkeys-2.4.1" + sources."lodash.camelcase-4.3.0" + sources."lodash.defaults-4.2.0" + sources."lodash.difference-4.5.0" + sources."lodash.flatten-4.4.0" + sources."lodash.includes-4.3.0" + sources."lodash.isarguments-3.1.0" + sources."lodash.isboolean-3.0.3" + sources."lodash.isinteger-4.0.4" + sources."lodash.isnumber-3.0.3" + sources."lodash.isobject-2.4.1" + sources."lodash.isplainobject-4.0.6" + sources."lodash.isstring-4.0.1" + sources."lodash.keys-2.4.1" + sources."lodash.once-4.1.1" + sources."lodash.snakecase-4.1.1" + sources."lodash.toarray-4.4.0" + sources."lodash.union-4.6.0" + sources."lodash.values-2.4.1" + sources."log-symbols-2.2.0" + sources."logform-2.2.0" + sources."long-4.0.0" + sources."lowercase-keys-1.0.1" + sources."lru-cache-6.0.0" + sources."lru-queue-0.1.0" + (sources."make-dir-3.1.0" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) + sources."marked-0.7.0" + sources."marked-terminal-3.3.0" + sources."media-typer-0.3.0" + sources."memoizee-0.4.14" + sources."merge-descriptors-1.0.1" + sources."methods-1.1.2" + sources."mime-1.6.0" + sources."mime-db-1.45.0" + sources."mime-types-2.1.28" + sources."mimic-fn-1.2.0" + sources."mimic-response-1.0.1" + sources."minimatch-3.0.4" + sources."minimist-1.2.5" + sources."minipass-3.1.3" + sources."minizlib-2.1.2" + sources."mkdirp-0.5.5" + (sources."morgan-1.10.0" // { + dependencies = [ + sources."debug-2.6.9" + sources."depd-2.0.0" + sources."ms-2.0.0" + ]; + }) + sources."ms-2.1.2" + sources."mute-stream-0.0.7" + sources."nan-2.14.2" + (sources."nash-3.0.0" // { + dependencies = [ + sources."async-1.5.2" + ]; + }) + sources."negotiator-0.6.2" + sources."next-tick-1.0.0" + sources."nice-try-1.0.5" + sources."node-emoji-1.10.0" + sources."node-fetch-2.6.1" + sources."node-forge-0.10.0" + (sources."node-gyp-7.1.2" // { + dependencies = [ + sources."mkdirp-1.0.4" + sources."semver-7.3.4" + sources."tar-6.0.5" + sources."which-2.0.2" + ]; + }) + sources."nopt-5.0.0" + sources."normalize-path-3.0.0" + sources."normalize-url-4.5.0" + sources."npmlog-4.1.2" + sources."number-is-nan-1.0.1" + sources."oauth-sign-0.9.0" + sources."object-assign-4.1.1" + 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-2.0.1" + sources."open-6.4.0" + sources."openapi3-ts-1.4.0" + (sources."ora-3.4.0" // { + dependencies = [ + sources."ansi-regex-4.1.0" + sources."strip-ansi-5.2.0" + ]; + }) + sources."os-tmpdir-1.0.2" + sources."p-cancelable-1.1.0" + sources."p-defer-3.0.0" + sources."p-limit-2.3.0" + sources."p-locate-4.1.0" + sources."p-try-2.2.0" + (sources."package-json-6.5.0" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) + sources."parseurl-1.3.3" + sources."path-exists-4.0.0" + sources."path-is-absolute-1.0.1" + sources."path-key-2.0.1" + sources."path-to-regexp-0.1.7" + sources."performance-now-2.1.0" + sources."picomatch-2.2.2" + sources."plist-3.0.1" + (sources."portfinder-1.0.28" // { + dependencies = [ + sources."debug-3.2.7" + ]; + }) + sources."prepend-http-2.0.0" + sources."process-nextick-args-2.0.1" + sources."progress-2.0.3" + sources."promise-breaker-5.0.0" + (sources."protobufjs-6.10.2" // { + dependencies = [ + sources."@types/node-13.13.39" + ]; + }) + sources."proxy-addr-2.0.6" + sources."psl-1.8.0" + sources."pump-3.0.0" + sources."punycode-2.1.1" + sources."pupa-2.1.1" + sources."qs-6.7.0" + sources."range-parser-1.2.1" + sources."raw-body-2.4.0" + sources."rc-1.2.8" + sources."re2-1.15.9" + sources."readable-stream-3.6.0" + sources."readdirp-3.5.0" + sources."redeyed-2.1.1" + sources."registry-auth-token-4.2.1" + sources."registry-url-5.1.0" + (sources."request-2.88.2" // { + dependencies = [ + sources."qs-6.5.2" + ]; + }) + sources."require-directory-2.1.1" + sources."require-main-filename-2.0.0" + sources."responselike-1.0.2" + sources."restore-cursor-2.0.0" + sources."retry-request-4.1.3" + sources."rimraf-3.0.2" + (sources."router-1.3.5" // { + dependencies = [ + sources."array-flatten-3.0.0" + sources."debug-2.6.9" + sources."ms-2.0.0" + sources."setprototypeof-1.2.0" + ]; + }) + sources."rsvp-4.8.5" + sources."run-async-2.4.1" + (sources."rxjs-6.6.3" // { + dependencies = [ + sources."tslib-1.14.1" + ]; + }) + sources."safe-buffer-5.2.1" + sources."safer-buffer-2.1.2" + sources."semver-5.7.1" + (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."setimmediate-1.0.5" + sources."setprototypeof-1.1.1" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" + sources."signal-exit-3.0.3" + sources."simple-swizzle-0.2.2" + sources."sprintf-js-1.0.3" + sources."sshpk-1.16.1" + sources."stack-trace-0.0.10" + sources."statuses-1.5.0" + sources."stream-shift-1.0.1" + (sources."string-length-1.0.1" // { + dependencies = [ + sources."ansi-regex-2.1.1" + sources."strip-ansi-3.0.1" + ]; + }) + sources."string-width-4.2.0" + sources."string_decoder-1.3.0" + sources."strip-ansi-6.0.0" + sources."strip-json-comments-2.0.1" + (sources."superstatic-7.1.0" // { + dependencies = [ + sources."ansi-regex-2.1.1" + sources."ansi-styles-2.2.1" + sources."chalk-1.1.3" + sources."fs-extra-8.1.0" + sources."isarray-0.0.1" + sources."jsonfile-4.0.0" + sources."path-to-regexp-1.8.0" + sources."strip-ansi-3.0.1" + sources."supports-color-2.0.0" + ]; + }) + sources."supports-color-5.5.0" + (sources."supports-hyperlinks-1.0.1" // { + dependencies = [ + sources."has-flag-2.0.0" + ]; + }) + (sources."tar-4.4.13" // { + dependencies = [ + sources."chownr-1.1.4" + sources."fs-minipass-1.2.7" + sources."minipass-2.9.0" + sources."minizlib-1.3.3" + sources."yallist-3.1.1" + ]; + }) + sources."tar-stream-2.2.0" + (sources."tcp-port-used-1.0.2" // { + dependencies = [ + sources."debug-4.3.1" + ]; + }) + sources."term-size-2.2.1" + sources."text-hex-1.0.0" + sources."through-2.3.8" + (sources."through2-2.0.1" // { + dependencies = [ + sources."process-nextick-args-1.0.7" + sources."readable-stream-2.0.6" + sources."string_decoder-0.10.31" + ]; + }) + sources."timers-ext-0.1.7" + sources."tmp-0.0.33" + sources."to-readable-stream-1.0.0" + sources."to-regex-range-5.0.1" + sources."toidentifier-1.0.0" + sources."tough-cookie-2.5.0" + sources."toxic-1.0.1" + sources."traverse-0.3.9" + sources."triple-beam-1.3.0" + sources."tslib-2.0.3" + sources."tunnel-agent-0.6.0" + sources."tweetnacl-0.14.5" + (sources."tweetsodium-0.0.5" // { + dependencies = [ + sources."tweetnacl-1.0.3" + ]; + }) + sources."type-1.2.0" + sources."type-fest-0.8.1" + sources."type-is-1.6.18" + sources."typedarray-to-buffer-3.1.5" + sources."unique-string-2.0.0" + sources."universal-analytics-0.4.23" + sources."universalify-0.1.2" + sources."unpipe-1.0.0" + (sources."unzipper-0.10.11" // { + dependencies = [ + sources."readable-stream-2.3.7" + sources."safe-buffer-5.1.2" + sources."string_decoder-1.1.1" + ]; + }) + (sources."update-notifier-4.1.3" // { + dependencies = [ + sources."chalk-3.0.0" + sources."has-flag-4.0.0" + sources."supports-color-7.2.0" + ]; + }) + sources."uri-js-4.4.0" + sources."url-join-0.0.1" + sources."url-parse-lax-3.0.0" + sources."util-deprecate-1.0.2" + sources."utils-merge-1.0.1" + sources."uuid-3.4.0" + sources."valid-url-1.0.9" + sources."vary-1.1.2" + sources."verror-1.10.0" + sources."wcwidth-1.0.1" + sources."which-1.3.1" + sources."which-module-2.0.0" + (sources."wide-align-1.1.3" // { + dependencies = [ + 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."widest-line-3.1.0" + (sources."winston-3.3.3" // { + dependencies = [ + sources."async-3.2.0" + ]; + }) + (sources."winston-transport-4.4.0" // { + dependencies = [ + sources."readable-stream-2.3.7" + sources."safe-buffer-5.1.2" + sources."string_decoder-1.1.1" + ]; + }) + sources."wrap-ansi-6.2.0" + sources."wrappy-1.0.2" + sources."write-file-atomic-3.0.3" + sources."ws-7.4.2" + sources."xdg-basedir-4.0.0" + sources."xmlbuilder-9.0.7" + sources."xmldom-0.1.31" + sources."xtend-4.0.2" + sources."y18n-4.0.1" + sources."yallist-4.0.0" + sources."yargs-15.4.1" + sources."yargs-parser-18.1.3" + sources."zip-stream-2.1.3" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Command-Line Interface for Firebase"; + homepage = https://github.com/firebase/firebase-tools; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; fixjson = nodeEnv.buildNodePackage { name = "fixjson"; packageName = "fixjson"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/fixjson/-/fixjson-1.1.1.tgz"; - sha512 = "cKclzjy4yv7Byu/v7hW4a4hwNgrINI/g2K/d3dtcMScdtY8BwBApb1gGBTLppuRaQpfdM/z0xj+5l8xcVKCm8w=="; + url = "https://registry.npmjs.org/fixjson/-/fixjson-1.1.2.tgz"; + sha512 = "NptKAXT3UrePy8JfK6ww/yiwqjVipouoEYUucKVpLNOiOWsrZ7XtcG3iUWpb3yGUoaN7OEafsd3cEGFMIjoXUQ=="; }; dependencies = [ sources."ansi-regex-5.0.0" @@ -74812,7 +78005,7 @@ in sources."wrap-ansi-7.0.0" sources."wrappy-1.0.2" sources."y18n-5.0.5" - sources."yargs-16.1.1" + sources."yargs-16.2.0" sources."yargs-parser-20.2.4" ]; buildInputs = globalBuildInputs; @@ -74828,14 +78021,14 @@ in fkill-cli = nodeEnv.buildNodePackage { name = "fkill-cli"; packageName = "fkill-cli"; - version = "6.0.1"; + version = "6.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/fkill-cli/-/fkill-cli-6.0.1.tgz"; - sha512 = "eJdNdyHofekXmSGI76E2A4GBJ7FAvuAgLV7rAgL6uZXV9+ZKwNoBjt/2hxHWmDZZ9x0EEWM3wHb2b0J7UNGbBw=="; + url = "https://registry.npmjs.org/fkill-cli/-/fkill-cli-6.1.0.tgz"; + sha512 = "untVuHgEQjwTXQGiWcwMTi0Uks6ht9R5hb1mDT4AEQitZ/z8UrhvseQsGEC3kVEjfxQ6bdmCMaA/hKTZ5aQDrA=="; }; dependencies = [ - sources."@babel/code-frame-7.10.4" - sources."@babel/helper-validator-identifier-7.10.4" + sources."@babel/code-frame-7.12.11" + sources."@babel/helper-validator-identifier-7.12.11" (sources."@babel/highlight-7.10.4" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -74856,7 +78049,7 @@ in sources."astral-regex-2.0.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."chalk-3.0.0" + sources."chalk-4.1.0" sources."chardet-0.7.0" sources."clean-stack-2.2.0" sources."cli-cursor-3.1.0" @@ -74876,34 +78069,22 @@ in sources."error-ex-1.3.2" sources."esc-exit-2.0.2" sources."escape-string-regexp-1.0.5" - sources."execa-4.1.0" + sources."execa-5.0.0" sources."external-editor-3.1.0" sources."figures-3.2.0" sources."find-up-4.1.0" - (sources."fkill-7.0.1" // { - dependencies = [ - sources."ps-list-7.2.0" - ]; - }) + sources."fkill-7.1.0" sources."function-bind-1.1.1" - sources."get-stream-5.2.0" + sources."get-stream-6.0.0" sources."hard-rejection-2.1.0" sources."has-1.0.3" sources."has-flag-4.0.0" - sources."hosted-git-info-2.8.8" - sources."human-signals-1.1.1" + sources."hosted-git-info-3.0.7" + sources."human-signals-2.1.0" sources."iconv-lite-0.4.24" sources."indent-string-4.0.0" - (sources."inquirer-7.3.3" // { - dependencies = [ - sources."chalk-4.1.0" - ]; - }) - (sources."inquirer-autocomplete-prompt-1.3.0" // { - dependencies = [ - sources."chalk-4.1.0" - ]; - }) + sources."inquirer-7.3.3" + sources."inquirer-autocomplete-prompt-1.3.0" sources."is-arrayish-0.2.1" sources."is-core-module-2.2.0" sources."is-fullwidth-code-point-3.0.0" @@ -74916,11 +78097,11 @@ in sources."lines-and-columns-1.1.6" sources."locate-path-5.0.0" sources."lodash-4.17.20" - sources."lru-cache-4.1.5" + sources."lru-cache-6.0.0" sources."map-obj-4.1.0" - (sources."meow-6.1.1" // { + (sources."meow-8.1.0" // { dependencies = [ - sources."type-fest-0.13.1" + sources."type-fest-0.18.1" ]; }) sources."merge-stream-2.0.0" @@ -74932,7 +78113,7 @@ in ]; }) sources."mute-stream-0.0.8" - sources."normalize-package-data-2.5.0" + sources."normalize-package-data-3.0.0" sources."npm-run-path-4.0.1" sources."num-sort-2.1.0" sources."once-1.4.0" @@ -74946,27 +78127,20 @@ in sources."path-exists-4.0.0" sources."path-key-3.1.1" sources."path-parse-1.0.6" - (sources."pid-from-port-1.1.3" // { + sources."pid-port-0.1.1" + (sources."process-exists-4.0.0" // { dependencies = [ - sources."cross-spawn-5.1.0" - sources."execa-0.9.0" - sources."get-stream-3.0.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."shebang-command-1.2.0" - sources."shebang-regex-1.0.0" - sources."which-1.3.1" + sources."ps-list-6.3.0" ]; }) - sources."process-exists-4.0.0" - sources."ps-list-6.3.0" - sources."pseudomap-1.0.2" + sources."ps-list-7.2.0" sources."pump-3.0.0" sources."quick-lru-4.0.1" (sources."read-pkg-5.2.0" // { dependencies = [ + sources."hosted-git-info-2.8.8" + sources."normalize-package-data-2.5.0" + sources."semver-5.7.1" sources."type-fest-0.6.0" ]; }) @@ -74981,7 +78155,7 @@ in sources."run-async-2.4.1" sources."rxjs-6.6.3" sources."safer-buffer-2.1.2" - sources."semver-5.7.1" + sources."semver-7.3.4" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."signal-exit-3.0.3" @@ -74992,13 +78166,14 @@ in sources."spdx-license-ids-3.0.7" sources."string-width-4.2.0" sources."strip-ansi-6.0.0" - sources."strip-eof-1.0.0" sources."strip-final-newline-2.0.0" sources."strip-indent-3.0.0" sources."supports-color-7.2.0" (sources."taskkill-3.1.0" // { dependencies = [ sources."execa-3.4.0" + sources."get-stream-5.2.0" + sources."human-signals-1.1.1" ]; }) sources."through-2.3.8" @@ -75009,8 +78184,8 @@ in sources."validate-npm-package-license-3.0.4" sources."which-2.0.2" sources."wrappy-1.0.2" - sources."yallist-2.1.2" - sources."yargs-parser-18.1.3" + sources."yallist-4.0.0" + sources."yargs-parser-20.2.4" ]; buildInputs = globalBuildInputs; meta = { @@ -75025,10 +78200,10 @@ in flood = nodeEnv.buildNodePackage { name = "flood"; packageName = "flood"; - version = "4.3.0"; + version = "4.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/flood/-/flood-4.3.0.tgz"; - sha512 = "+SgygDdGTnKaZA2N0VzaUKVqAV8S4KrisdL9+DtIWweJwP/mYQ7WIhIJVMiJWbyYjtPTGoUqvxYqEP/QiFgfNw=="; + url = "https://registry.npmjs.org/flood/-/flood-4.3.1.tgz"; + sha512 = "dq1ModlLpq8eJGJ3oqKLam+HvHfUvcFCcDb464rdzVHOERXeKzPvjMBynXgED9UZxutEoXQGd32Vyoehnodd4Q=="; }; dependencies = [ sources."async-2.6.3" @@ -75039,7 +78214,7 @@ in sources."concat-map-0.0.1" sources."fd-slicer-1.1.0" sources."fs.realpath-1.0.0" - sources."geoip-country-4.0.45" + sources."geoip-country-4.0.49" sources."glob-7.1.6" sources."iconv-lite-0.5.2" sources."inflight-1.0.6" @@ -75213,7 +78388,7 @@ in sources."fs.realpath-1.0.0" sources."fsevents-1.2.13" sources."function-bind-1.1.1" - sources."get-intrinsic-1.0.1" + sources."get-intrinsic-1.0.2" sources."get-value-2.0.6" sources."glob-7.1.6" (sources."glob-parent-3.1.0" // { @@ -75233,7 +78408,7 @@ in sources."i-0.3.6" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."ini-1.3.5" + sources."ini-1.3.8" sources."invert-kv-1.0.0" sources."is-accessor-descriptor-1.0.0" sources."is-arguments-1.1.0" @@ -75454,7 +78629,7 @@ in sources."wordwrap-0.0.3" sources."wrap-ansi-2.1.0" sources."wrappy-1.0.2" - sources."y18n-3.2.1" + sources."y18n-3.2.2" sources."yargs-3.32.0" ]; buildInputs = globalBuildInputs; @@ -75542,7 +78717,7 @@ in }; dependencies = [ sources."async-2.6.3" - sources."debug-4.3.1" + sources."debug-4.3.2" sources."lodash-4.17.20" sources."lodash.groupby-4.6.0" sources."microee-0.0.6" @@ -75571,10 +78746,10 @@ in }; dependencies = [ sources."asyncmemo-1.0.0" - sources."chloride-2.3.0" + sources."chloride-2.4.0" sources."chloride-test-1.2.4" sources."commander-2.20.3" - sources."debug-4.3.1" + sources."debug-4.3.2" sources."deep-extend-0.6.0" sources."diff-3.5.0" sources."discontinuous-range-1.0.0" @@ -75590,10 +78765,9 @@ in sources."highlight.js-9.18.5" sources."increment-buffer-1.0.1" sources."inherits-2.0.4" - sources."ini-1.3.5" + sources."ini-1.3.8" sources."ip-1.1.5" sources."is-canonical-base64-1.1.1" - sources."is-electron-2.2.0" sources."is-my-ip-valid-1.0.0" sources."is-my-json-valid-2.20.5" sources."is-property-1.0.2" @@ -75607,26 +78781,26 @@ in sources."lodash.get-4.4.2" sources."looper-4.0.0" sources."lrucache-1.0.3" - sources."mime-db-1.44.0" - sources."mime-types-2.1.27" + sources."mime-db-1.45.0" + sources."mime-types-2.1.28" sources."minimist-1.2.5" sources."mkdirp-0.5.5" sources."moment-2.29.1" sources."moo-0.5.1" sources."ms-2.1.2" sources."multicb-1.2.2" - sources."multiserver-3.6.0" + sources."multiserver-3.7.0" sources."multiserver-address-1.0.1" sources."multiserver-scopes-1.0.0" - sources."muxrpc-6.5.1" - sources."nearley-2.20.0" + sources."muxrpc-6.5.2" + sources."nearley-2.20.1" sources."node-gyp-build-4.2.3" sources."node-polyglot-1.0.0" sources."non-private-ip-1.4.4" sources."options-0.0.6" sources."os-homedir-1.0.2" sources."packet-stream-2.0.5" - sources."packet-stream-codec-1.1.2" + sources."packet-stream-codec-1.1.3" sources."pako-1.0.11" sources."private-box-0.3.1" sources."progress-1.1.8" @@ -75683,7 +78857,7 @@ in sources."safe-buffer-5.2.1" sources."secret-handshake-1.1.20" sources."semver-5.7.1" - sources."separator-escape-0.0.0" + sources."separator-escape-0.0.1" sources."sha.js-2.4.5" sources."smart-buffer-4.1.0" sources."socks-2.5.1" @@ -75722,7 +78896,7 @@ in }) sources."ssb-msgs-5.2.0" sources."ssb-pull-requests-1.0.0" - sources."ssb-ref-2.14.2" + sources."ssb-ref-2.14.3" (sources."stream-to-pull-stream-1.7.3" // { dependencies = [ sources."looper-3.0.0" @@ -75767,14 +78941,14 @@ in gitmoji-cli = nodeEnv.buildNodePackage { name = "gitmoji-cli"; packageName = "gitmoji-cli"; - version = "3.2.12"; + version = "3.2.18"; src = fetchurl { - url = "https://registry.npmjs.org/gitmoji-cli/-/gitmoji-cli-3.2.12.tgz"; - sha512 = "ZL27e8s3lkkrKrGCCQDlwIGnLOihrrehDI1jriWaU+UaVME1IYCtOiYbLp59iITK2s8Ak7e0LSSCyO08bRLAvQ=="; + url = "https://registry.npmjs.org/gitmoji-cli/-/gitmoji-cli-3.2.18.tgz"; + sha512 = "2H4Y6kXvYRBdh42FUz8gaLkQ5AvtYYBXRgRElXjX/st4QhG+bgHdnCFGYoTbrVc2uA2vS63HtUS8AJ7SNE6Rew=="; }; dependencies = [ - sources."@babel/code-frame-7.10.4" - sources."@babel/helper-validator-identifier-7.10.4" + sources."@babel/code-frame-7.12.11" + sources."@babel/helper-validator-identifier-7.12.11" (sources."@babel/highlight-7.10.4" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -75804,14 +78978,18 @@ in sources."ansi-styles-4.3.0" sources."arrify-1.0.1" sources."atomically-1.7.0" + sources."base64-js-1.5.1" + sources."bl-4.0.3" (sources."boxen-4.2.0" // { dependencies = [ sources."chalk-3.0.0" sources."type-fest-0.8.1" ]; }) + sources."buffer-5.7.1" (sources."cacheable-request-6.1.0" // { dependencies = [ + sources."get-stream-5.2.0" sources."lowercase-keys-2.0.0" ]; }) @@ -75851,16 +79029,16 @@ in sources."error-ex-1.3.2" sources."escape-goat-2.1.1" sources."escape-string-regexp-1.0.5" - sources."execa-4.1.0" + sources."execa-5.0.0" sources."external-editor-3.1.0" sources."fast-deep-equal-3.1.3" sources."fast-json-stable-stringify-2.1.0" sources."figures-3.2.0" sources."find-up-3.0.0" sources."function-bind-1.1.1" - sources."fuse.js-6.4.3" - sources."get-stream-5.2.0" - sources."global-dirs-2.0.1" + sources."fuse.js-6.4.5" + sources."get-stream-6.0.0" + sources."global-dirs-2.1.0" (sources."got-9.6.0" // { dependencies = [ sources."get-stream-4.1.0" @@ -75871,14 +79049,16 @@ in sources."has-1.0.3" sources."has-flag-4.0.0" sources."has-yarn-2.1.0" - sources."hosted-git-info-2.8.8" + sources."hosted-git-info-3.0.7" sources."http-cache-semantics-4.1.0" - sources."human-signals-1.1.1" + sources."human-signals-2.1.0" sources."iconv-lite-0.4.24" + sources."ieee754-1.2.1" sources."import-lazy-2.1.0" sources."imurmurhash-0.1.4" sources."indent-string-4.0.0" - sources."ini-1.3.5" + sources."inherits-2.0.4" + sources."ini-1.3.7" sources."inquirer-7.3.3" sources."inquirer-autocomplete-prompt-1.3.0" sources."is-arrayish-0.2.1" @@ -75887,7 +79067,7 @@ in sources."is-fullwidth-code-point-3.0.0" sources."is-installed-globally-0.3.2" sources."is-interactive-1.0.0" - sources."is-npm-4.0.0" + sources."is-npm-5.0.0" sources."is-obj-2.0.0" sources."is-path-inside-3.0.2" sources."is-plain-obj-1.1.0" @@ -75919,9 +79099,9 @@ in ]; }) sources."map-obj-4.1.0" - (sources."meow-7.1.1" // { + (sources."meow-8.1.0" // { dependencies = [ - sources."type-fest-0.13.1" + sources."type-fest-0.18.1" ]; }) sources."merge-stream-2.0.0" @@ -75932,11 +79112,7 @@ in sources."minimist-options-4.1.0" sources."mute-stream-0.0.8" sources."node-fetch-2.6.1" - (sources."normalize-package-data-2.5.0" // { - dependencies = [ - sources."semver-5.7.1" - ]; - }) + sources."normalize-package-data-3.0.0" sources."normalize-url-4.5.0" sources."npm-run-path-4.0.1" sources."once-1.4.0" @@ -75945,7 +79121,7 @@ in sources."mimic-fn-2.1.0" ]; }) - sources."ora-5.1.0" + sources."ora-5.2.0" sources."os-tmpdir-1.0.2" sources."p-cancelable-1.1.0" sources."p-limit-2.3.0" @@ -75969,6 +79145,9 @@ in sources."rc-1.2.8" (sources."read-pkg-5.2.0" // { dependencies = [ + sources."hosted-git-info-2.8.8" + sources."normalize-package-data-2.5.0" + sources."semver-5.7.1" sources."type-fest-0.6.0" ]; }) @@ -75980,6 +79159,7 @@ in sources."type-fest-0.8.1" ]; }) + sources."readable-stream-3.6.0" sources."redent-3.0.0" sources."registry-auth-token-4.2.1" sources."registry-url-5.1.0" @@ -75988,6 +79168,7 @@ in sources."restore-cursor-3.1.0" sources."run-async-2.4.1" sources."rxjs-6.6.3" + sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."semver-7.3.4" (sources."semver-diff-3.1.1" // { @@ -76003,6 +79184,7 @@ in sources."spdx-expression-parse-3.0.1" sources."spdx-license-ids-3.0.7" sources."string-width-4.2.0" + sources."string_decoder-1.3.0" sources."strip-ansi-6.0.0" sources."strip-final-newline-2.0.0" sources."strip-indent-3.0.0" @@ -76017,13 +79199,10 @@ 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.3" // { - dependencies = [ - sources."chalk-3.0.0" - ]; - }) + sources."update-notifier-5.0.1" sources."uri-js-4.4.0" sources."url-parse-lax-3.0.0" + sources."util-deprecate-1.0.2" sources."validate-npm-package-license-3.0.4" sources."wcwidth-1.0.1" sources."which-2.0.2" @@ -76032,7 +79211,7 @@ in sources."write-file-atomic-3.0.3" sources."xdg-basedir-4.0.0" sources."yallist-4.0.0" - sources."yargs-parser-18.1.3" + sources."yargs-parser-20.2.4" ]; buildInputs = globalBuildInputs; meta = { @@ -76054,8 +79233,8 @@ in }; dependencies = [ sources."@ardatan/aggregate-error-0.0.6" - sources."@babel/code-frame-7.10.4" - sources."@babel/helper-validator-identifier-7.10.4" + sources."@babel/code-frame-7.12.11" + sources."@babel/helper-validator-identifier-7.12.11" (sources."@babel/highlight-7.10.4" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -76071,39 +79250,39 @@ in sources."@graphql-cli/init-4.1.0" (sources."@graphql-tools/batch-execute-7.0.0" // { dependencies = [ - sources."@graphql-tools/utils-7.1.4" + sources."@graphql-tools/utils-7.2.3" ]; }) - (sources."@graphql-tools/delegate-7.0.7" // { + (sources."@graphql-tools/delegate-7.0.8" // { dependencies = [ - sources."@graphql-tools/utils-7.1.4" + sources."@graphql-tools/utils-7.2.3" ]; }) (sources."@graphql-tools/graphql-file-loader-6.2.6" // { dependencies = [ - sources."@graphql-tools/utils-7.1.4" + sources."@graphql-tools/utils-7.2.3" ]; }) sources."@graphql-tools/import-6.2.5" (sources."@graphql-tools/json-file-loader-6.2.6" // { dependencies = [ - sources."@graphql-tools/utils-7.1.4" + sources."@graphql-tools/utils-7.2.3" ]; }) sources."@graphql-tools/load-6.2.4" (sources."@graphql-tools/merge-6.2.6" // { dependencies = [ - sources."@graphql-tools/utils-7.1.4" + sources."@graphql-tools/utils-7.2.3" ]; }) (sources."@graphql-tools/schema-7.1.2" // { dependencies = [ - sources."@graphql-tools/utils-7.1.4" + sources."@graphql-tools/utils-7.2.3" ]; }) - (sources."@graphql-tools/url-loader-6.5.0" // { + (sources."@graphql-tools/url-loader-6.7.1" // { dependencies = [ - sources."@graphql-tools/utils-7.1.4" + sources."@graphql-tools/utils-7.2.3" ]; }) (sources."@graphql-tools/utils-6.2.4" // { @@ -76115,19 +79294,19 @@ in }) ]; }) - (sources."@graphql-tools/wrap-7.0.4" // { + (sources."@graphql-tools/wrap-7.0.5" // { dependencies = [ - sources."@graphql-tools/utils-7.1.4" + sources."@graphql-tools/utils-7.2.3" ]; }) sources."@kwsites/file-exists-1.1.1" sources."@kwsites/promise-deferred-1.1.1" - sources."@nodelib/fs.scandir-2.1.3" - sources."@nodelib/fs.stat-2.0.3" - sources."@nodelib/fs.walk-1.2.4" + sources."@nodelib/fs.scandir-2.1.4" + sources."@nodelib/fs.stat-2.0.4" + sources."@nodelib/fs.walk-1.2.6" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-14.14.10" + sources."@types/node-14.14.20" sources."@types/parse-json-4.0.0" sources."@types/websocket-1.0.1" sources."aggregate-error-3.1.0" @@ -76207,7 +79386,7 @@ in sources."cross-spawn-6.0.5" sources."dashdash-1.14.1" sources."dataloader-2.0.0" - sources."debug-4.3.1" + sources."debug-4.3.2" sources."decompress-response-3.3.0" sources."deep-equal-2.0.5" sources."deep-extend-0.6.0" @@ -76230,6 +79409,7 @@ in sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" sources."esprima-4.0.1" + sources."eventsource-1.0.7" sources."execa-1.0.0" sources."extend-3.0.2" (sources."external-editor-3.1.0" // { @@ -76243,7 +79423,7 @@ in sources."fast-glob-3.2.4" sources."fast-json-stable-stringify-2.1.0" sources."fast-safe-stringify-2.0.7" - sources."fastq-1.9.0" + sources."fastq-1.10.0" sources."figlet-1.5.0" sources."figures-3.2.0" sources."fill-range-7.0.1" @@ -76259,7 +79439,7 @@ in sources."fullname-4.0.1" sources."function-bind-1.1.1" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.0.1" + sources."get-intrinsic-1.0.2" sources."get-stream-4.1.0" sources."getpass-0.1.7" sources."glob-7.1.6" @@ -76280,7 +79460,7 @@ in sources."graphql-subscriptions-1.1.0" sources."graphql-type-json-0.3.2" sources."graphql-upload-11.0.0" - sources."graphql-ws-2.0.0" + sources."graphql-ws-3.1.0" sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."has-1.0.3" @@ -76293,7 +79473,7 @@ in sources."iconv-lite-0.4.24" sources."ieee754-1.2.1" sources."ignore-5.1.8" - (sources."import-fresh-3.2.2" // { + (sources."import-fresh-3.3.0" // { dependencies = [ sources."resolve-from-4.0.0" ]; @@ -76302,7 +79482,7 @@ in sources."indent-string-4.0.0" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."ini-1.3.5" + sources."ini-1.3.8" (sources."inquirer-7.3.3" // { dependencies = [ sources."ansi-regex-5.0.0" @@ -76316,7 +79496,7 @@ in sources."is-arguments-1.1.0" sources."is-arrayish-0.2.1" sources."is-bigint-1.0.1" - sources."is-boolean-object-1.0.1" + sources."is-boolean-object-1.1.0" sources."is-callable-1.2.2" sources."is-date-object-1.0.2" sources."is-docker-2.1.1" @@ -76324,17 +79504,21 @@ in sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.1" sources."is-interactive-1.0.0" - sources."is-map-2.0.1" + sources."is-map-2.0.2" sources."is-negative-zero-2.0.1" 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-set-2.0.2" sources."is-stream-1.1.0" sources."is-string-1.0.5" sources."is-symbol-1.0.3" - sources."is-typed-array-1.1.3" + (sources."is-typed-array-1.1.4" // { + dependencies = [ + sources."es-abstract-1.18.0-next.1" + ]; + }) sources."is-typedarray-1.0.0" sources."is-weakmap-2.0.1" sources."is-weakset-2.0.1" @@ -76391,8 +79575,8 @@ in }) sources."merge2-1.4.1" sources."micromatch-4.0.2" - sources."mime-db-1.44.0" - sources."mime-types-2.1.27" + sources."mime-db-1.45.0" + sources."mime-types-2.1.28" sources."mimic-fn-1.2.0" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" @@ -76419,7 +79603,7 @@ in sources."oas-linter-3.2.1" (sources."oas-resolver-2.5.3" // { dependencies = [ - sources."yargs-16.1.1" + sources."yargs-16.2.0" ]; }) sources."oas-schema-walker-1.1.5" @@ -76445,6 +79629,7 @@ in sources."strip-ansi-6.0.0" ]; }) + sources."original-1.0.2" sources."os-tmpdir-1.0.2" sources."p-any-2.1.0" sources."p-cancelable-2.0.0" @@ -76479,6 +79664,7 @@ in sources."pump-3.0.0" sources."punycode-2.1.1" sources."qs-6.5.2" + sources."querystringify-2.2.0" sources."rc-1.2.8" sources."reftools-1.1.7" sources."regexp.prototype.flags-1.3.0" @@ -76487,6 +79673,7 @@ in sources."remove-trailing-separator-1.1.0" sources."request-2.88.2" sources."require-directory-2.1.1" + sources."requires-port-1.0.0" sources."resolve-from-5.0.0" sources."responselike-1.0.2" sources."restore-cursor-2.0.0" @@ -76511,15 +79698,12 @@ 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.3" // { - dependencies = [ - sources."es-abstract-1.18.0-next.1" - ]; - }) + sources."side-channel-1.0.4" sources."signal-exit-3.0.3" sources."simple-git-2.21.0" sources."slash-3.0.0" sources."sprintf-js-1.0.3" + sources."sse-z-0.3.0" sources."sshpk-1.16.1" sources."statuses-1.5.0" sources."streamsearch-0.1.2" @@ -76538,7 +79722,7 @@ in sources."supports-color-7.2.0" (sources."swagger2openapi-7.0.4" // { dependencies = [ - sources."yargs-16.1.1" + sources."yargs-16.2.0" ]; }) sources."sync-fetch-0.3.0" @@ -76556,15 +79740,20 @@ in sources."universalify-1.0.0" sources."unixify-1.0.0" sources."uri-js-4.4.0" + sources."url-parse-1.4.7" sources."url-parse-lax-3.0.0" sources."uuid-3.4.0" sources."valid-url-1.0.9" sources."verror-1.10.0" sources."wcwidth-1.0.1" sources."which-1.3.1" - sources."which-boxed-primitive-1.0.1" + sources."which-boxed-primitive-1.0.2" sources."which-collection-1.0.1" - sources."which-typed-array-1.1.2" + (sources."which-typed-array-1.1.4" // { + dependencies = [ + sources."es-abstract-1.18.0-next.1" + ]; + }) (sources."wrap-ansi-7.0.0" // { dependencies = [ sources."ansi-regex-5.0.0" @@ -76572,7 +79761,7 @@ in ]; }) sources."wrappy-1.0.2" - sources."ws-7.4.0" + sources."ws-7.4.1" sources."y18n-5.0.5" sources."yallist-4.0.0" sources."yaml-1.10.0" @@ -76697,7 +79886,7 @@ in ]; }) sources."homedir-polyfill-1.0.3" - sources."ini-1.3.5" + sources."ini-1.3.8" sources."interpret-1.1.0" sources."is-absolute-1.0.0" sources."is-accessor-descriptor-1.0.0" @@ -76923,10 +80112,10 @@ in gtop = nodeEnv.buildNodePackage { name = "gtop"; packageName = "gtop"; - version = "1.0.2"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/gtop/-/gtop-1.0.2.tgz"; - sha512 = "Dn/8Kt57CsFLHd9vJIqWuhzXETpm+J86tD444rOz04uUu0kQBUTEBXmwu7zOVntb+TRr4EuyRxBo2tecJAPFmA=="; + url = "https://registry.npmjs.org/gtop/-/gtop-1.1.0.tgz"; + sha512 = "WA8W0HxEsU9gGwpJDBRVv3l8DLUlxun5242vJw7kzv8CeQ29QUTYDfis5wMGwTOAU+curXHLHehFRR/IZflvbQ=="; }; dependencies = [ sources."abbrev-1.1.1" @@ -76942,13 +80131,22 @@ in sources."cardinal-2.1.1" sources."chalk-1.1.3" sources."charm-0.1.2" - sources."cli-table-0.3.1" + (sources."cli-table-0.3.4" // { + 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."color-convert-2.0.1" sources."color-name-1.1.4" - sources."colors-1.0.3" sources."core-util-is-1.0.2" sources."drawille-blessed-contrib-1.0.0" sources."drawille-canvas-blessed-contrib-0.1.3" + sources."emoji-regex-8.0.0" sources."escape-string-regexp-1.0.5" sources."esprima-4.0.1" (sources."event-stream-0.9.8" // { @@ -76961,6 +80159,7 @@ in sources."has-flag-4.0.0" sources."here-0.0.2" sources."inherits-2.0.4" + sources."is-fullwidth-code-point-3.0.0" sources."isarray-0.0.1" sources."lodash-4.17.20" sources."lodash.toarray-4.4.0" @@ -76984,6 +80183,12 @@ in sources."redeyed-2.1.1" sources."sax-1.2.4" sources."sparkline-0.1.2" + (sources."string-width-4.2.0" // { + dependencies = [ + sources."ansi-regex-5.0.0" + sources."strip-ansi-6.0.0" + ]; + }) sources."string_decoder-0.10.31" sources."strip-ansi-3.0.1" sources."supports-color-2.0.0" @@ -76992,7 +80197,7 @@ in sources."supports-color-7.2.0" ]; }) - sources."systeminformation-4.30.11" + sources."systeminformation-4.34.2" sources."term-canvas-0.0.5" sources."type-fest-0.11.0" sources."wordwrap-0.0.3" @@ -77190,7 +80395,7 @@ in sources."fsevents-1.2.13" sources."function-bind-1.1.1" sources."get-caller-file-1.0.3" - sources."get-intrinsic-1.0.1" + sources."get-intrinsic-1.0.2" sources."get-value-2.0.6" sources."glob-7.1.6" (sources."glob-parent-3.1.0" // { @@ -77218,7 +80423,7 @@ in sources."hosted-git-info-2.8.8" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."ini-1.3.5" + sources."ini-1.3.8" sources."interpret-1.4.0" sources."invert-kv-1.0.0" sources."is-absolute-1.0.0" @@ -77465,7 +80670,7 @@ in sources."wrap-ansi-2.1.0" sources."wrappy-1.0.2" sources."xtend-4.0.2" - sources."y18n-3.2.1" + sources."y18n-3.2.2" sources."yargs-7.1.1" sources."yargs-parser-5.0.0-security.0" ]; @@ -77590,7 +80795,7 @@ in sources."fragment-cache-0.2.1" sources."function-bind-1.1.1" sources."get-caller-file-1.0.3" - sources."get-intrinsic-1.0.1" + sources."get-intrinsic-1.0.2" sources."get-value-2.0.6" sources."global-modules-1.0.0" sources."global-prefix-1.0.2" @@ -77608,7 +80813,7 @@ in sources."homedir-polyfill-1.0.3" sources."hosted-git-info-2.8.8" sources."inherits-2.0.4" - sources."ini-1.3.5" + sources."ini-1.3.8" sources."interpret-1.4.0" sources."invert-kv-1.0.0" sources."is-absolute-1.0.0" @@ -77819,7 +81024,7 @@ in sources."which-1.3.1" sources."which-module-1.0.0" sources."wrap-ansi-2.1.0" - sources."y18n-3.2.1" + sources."y18n-3.2.2" sources."yargs-7.1.1" sources."yargs-parser-5.0.0-security.0" ]; @@ -77869,7 +81074,7 @@ in sources."param-case-2.1.1" sources."relateurl-0.2.7" sources."source-map-0.6.1" - sources."uglify-js-3.12.1" + sources."uglify-js-3.12.4" sources."upper-case-1.1.3" ]; buildInputs = globalBuildInputs; @@ -77940,8 +81145,8 @@ in sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" sources."jsprim-1.4.1" - sources."mime-db-1.44.0" - sources."mime-types-2.1.27" + sources."mime-db-1.45.0" + sources."mime-types-2.1.28" sources."minimatch-3.0.4" sources."oauth-sign-0.9.0" sources."once-1.4.0" @@ -77992,14 +81197,14 @@ in sources."debug-3.2.7" sources."ecstatic-3.3.2" sources."eventemitter3-4.0.7" - sources."follow-redirects-1.13.0" + sources."follow-redirects-1.13.1" sources."he-1.2.0" sources."http-proxy-1.18.1" sources."lodash-4.17.20" sources."mime-1.6.0" sources."minimist-1.2.5" sources."mkdirp-0.5.5" - sources."ms-2.1.2" + sources."ms-2.1.3" sources."opener-1.5.2" sources."portfinder-1.0.28" sources."qs-6.9.4" @@ -78180,6 +81385,97 @@ in bypassCache = true; reconstructLock = true; }; + ijavascript = nodeEnv.buildNodePackage { + name = "ijavascript"; + packageName = "ijavascript"; + version = "5.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ijavascript/-/ijavascript-5.2.0.tgz"; + sha512 = "MIV3R9d2o9uucTmNH5IU5bvXcevljsOrsH7Sv3rmf/uoXjl/iXb8hx4ZnymBpdt48f7U2m0iKmpWlQzxjthtjw=="; + }; + dependencies = [ + sources."ansi-regex-2.1.1" + sources."aproba-1.2.0" + sources."are-we-there-yet-1.1.5" + sources."base64-js-1.5.1" + (sources."bl-4.0.3" // { + dependencies = [ + sources."readable-stream-3.6.0" + ]; + }) + sources."buffer-5.7.1" + sources."chownr-1.1.4" + sources."code-point-at-1.1.0" + sources."console-control-strings-1.1.0" + sources."core-util-is-1.0.2" + sources."decompress-response-4.2.1" + sources."deep-extend-0.6.0" + sources."delegates-1.0.0" + sources."detect-libc-1.0.3" + sources."end-of-stream-1.4.4" + sources."expand-template-2.0.3" + sources."fs-constants-1.0.0" + sources."gauge-2.7.4" + sources."github-from-package-0.0.0" + sources."has-unicode-2.0.1" + sources."ieee754-1.2.1" + sources."inherits-2.0.4" + sources."ini-1.3.8" + sources."is-fullwidth-code-point-1.0.0" + sources."isarray-1.0.0" + sources."jmp-2.0.0" + sources."jp-kernel-2.0.0" + sources."mimic-response-2.1.0" + sources."minimist-1.2.5" + sources."mkdirp-classic-0.5.3" + sources."nan-2.14.2" + sources."napi-build-utils-1.0.2" + sources."nel-1.2.0" + sources."node-abi-2.19.3" + sources."noop-logger-0.1.1" + sources."npmlog-4.1.2" + sources."number-is-nan-1.0.1" + sources."object-assign-4.1.1" + sources."once-1.4.0" + sources."prebuild-install-5.3.6" + sources."process-nextick-args-2.0.1" + sources."pump-3.0.0" + sources."rc-1.2.8" + sources."readable-stream-2.3.7" + sources."safe-buffer-5.1.2" + sources."semver-5.7.1" + sources."set-blocking-2.0.0" + sources."signal-exit-3.0.3" + sources."simple-concat-1.0.1" + sources."simple-get-3.1.0" + sources."string-width-1.0.2" + sources."string_decoder-1.1.1" + sources."strip-ansi-3.0.1" + sources."strip-json-comments-2.0.1" + sources."tar-fs-2.1.1" + (sources."tar-stream-2.2.0" // { + dependencies = [ + sources."readable-stream-3.6.0" + ]; + }) + sources."tunnel-agent-0.6.0" + sources."util-deprecate-1.0.2" + sources."uuid-3.4.0" + sources."which-pm-runs-1.0.0" + sources."wide-align-1.1.3" + sources."wrappy-1.0.2" + sources."zeromq-5.2.0" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "IJavascript is a Javascript kernel for the Jupyter notebook"; + homepage = https://n-riesco.github.io/ijavascript; + license = "BSD-3-Clause"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; inliner = nodeEnv.buildNodePackage { name = "inliner"; packageName = "inliner"; @@ -78273,7 +81569,7 @@ in sources."imurmurhash-0.1.4" sources."infinity-agent-2.0.3" sources."inherits-2.0.4" - sources."ini-1.3.5" + sources."ini-1.3.8" sources."is-buffer-1.1.6" sources."is-finite-1.1.0" sources."is-npm-1.0.0" @@ -78311,8 +81607,8 @@ in sources."longest-1.0.1" sources."lowercase-keys-1.0.1" sources."mime-1.6.0" - sources."mime-db-1.44.0" - sources."mime-types-2.1.27" + sources."mime-db-1.45.0" + sources."mime-types-2.1.28" sources."minimist-1.2.5" sources."mkdirp-0.5.5" sources."ms-2.0.0" @@ -78495,7 +81791,7 @@ in sha512 = "56gjTrj9SMfPkbGANfqtGYeY3G5KmCkpgEYlKkmiDNG+SpQtLT9/53gt/9CbYd5iT9GgP+IvGXwDWplgCz3NnA=="; }; dependencies = [ - sources."@types/jquery-3.5.4" + sources."@types/jquery-3.5.5" sources."@types/sizzle-2.3.2" sources."arch-2.2.0" sources."balanced-match-1.0.0" @@ -78536,7 +81832,7 @@ in sources."p-finally-1.0.0" sources."path-is-absolute-1.0.1" sources."path-key-2.0.1" - sources."prismjs-1.22.0" + sources."prismjs-1.23.0" sources."pump-3.0.0" sources."rimraf-2.7.1" sources."select-1.1.2" @@ -78616,7 +81912,7 @@ in sources."core-util-is-1.0.2" sources."cross-spawn-7.0.3" sources."data-uri-to-buffer-3.0.1" - sources."debug-4.3.1" + sources."debug-4.3.2" sources."deep-is-0.1.3" sources."degenerator-2.2.0" sources."delayed-stream-1.0.0" @@ -78726,9 +82022,9 @@ in sources."lru-cache-5.1.1" sources."macos-release-2.4.1" sources."methods-1.1.2" - sources."mime-2.4.6" - sources."mime-db-1.44.0" - sources."mime-types-2.1.27" + sources."mime-2.4.7" + sources."mime-db-1.45.0" + sources."mime-types-2.1.28" sources."mimic-fn-1.2.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" @@ -78845,7 +82141,7 @@ in }) sources."wrappy-1.0.2" sources."write-file-atomic-3.0.3" - sources."ws-7.4.1" + sources."ws-7.4.2" sources."xregexp-2.0.0" sources."yallist-3.1.1" ]; @@ -78870,9 +82166,9 @@ in }; dependencies = [ sources."@iarna/toml-2.2.5" - sources."@ot-builder/bin-composite-types-0.10.34" - sources."@ot-builder/bin-util-0.10.34" - (sources."@ot-builder/cli-help-shower-0.10.34" // { + sources."@ot-builder/bin-composite-types-0.10.37" + sources."@ot-builder/bin-util-0.10.37" + (sources."@ot-builder/cli-help-shower-0.10.37" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.0" @@ -78882,7 +82178,7 @@ in sources."supports-color-7.2.0" ]; }) - (sources."@ot-builder/cli-proc-0.10.34" // { + (sources."@ot-builder/cli-proc-0.10.37" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.0" @@ -78892,7 +82188,7 @@ in sources."supports-color-7.2.0" ]; }) - (sources."@ot-builder/cli-shared-0.10.34" // { + (sources."@ot-builder/cli-shared-0.10.37" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.0" @@ -78902,35 +82198,35 @@ in sources."supports-color-7.2.0" ]; }) - sources."@ot-builder/common-impl-0.10.34" - sources."@ot-builder/errors-0.10.34" - sources."@ot-builder/io-bin-cff-0.10.34" - sources."@ot-builder/io-bin-encoding-0.10.34" - sources."@ot-builder/io-bin-ext-private-0.10.34" - sources."@ot-builder/io-bin-font-0.10.34" - sources."@ot-builder/io-bin-glyph-store-0.10.34" - sources."@ot-builder/io-bin-layout-0.10.34" - sources."@ot-builder/io-bin-metadata-0.10.34" - sources."@ot-builder/io-bin-metric-0.10.34" - sources."@ot-builder/io-bin-name-0.10.34" - sources."@ot-builder/io-bin-sfnt-0.10.34" - sources."@ot-builder/io-bin-ttf-0.10.34" - sources."@ot-builder/ot-0.10.34" - sources."@ot-builder/ot-encoding-0.10.34" - sources."@ot-builder/ot-ext-private-0.10.34" - sources."@ot-builder/ot-glyphs-0.10.34" - sources."@ot-builder/ot-layout-0.10.34" - sources."@ot-builder/ot-metadata-0.10.34" - sources."@ot-builder/ot-name-0.10.34" - sources."@ot-builder/ot-sfnt-0.10.34" - sources."@ot-builder/ot-standard-glyph-namer-0.10.34" - sources."@ot-builder/prelude-0.10.34" - sources."@ot-builder/primitive-0.10.34" - sources."@ot-builder/rectify-0.10.34" - sources."@ot-builder/stat-glyphs-0.10.34" - sources."@ot-builder/trace-0.10.34" - sources."@ot-builder/var-store-0.10.34" - sources."@ot-builder/variance-0.10.34" + sources."@ot-builder/common-impl-0.10.37" + sources."@ot-builder/errors-0.10.37" + sources."@ot-builder/io-bin-cff-0.10.37" + sources."@ot-builder/io-bin-encoding-0.10.37" + sources."@ot-builder/io-bin-ext-private-0.10.37" + sources."@ot-builder/io-bin-font-0.10.37" + sources."@ot-builder/io-bin-glyph-store-0.10.37" + sources."@ot-builder/io-bin-layout-0.10.37" + sources."@ot-builder/io-bin-metadata-0.10.37" + sources."@ot-builder/io-bin-metric-0.10.37" + sources."@ot-builder/io-bin-name-0.10.37" + sources."@ot-builder/io-bin-sfnt-0.10.37" + sources."@ot-builder/io-bin-ttf-0.10.37" + sources."@ot-builder/ot-0.10.37" + sources."@ot-builder/ot-encoding-0.10.37" + sources."@ot-builder/ot-ext-private-0.10.37" + sources."@ot-builder/ot-glyphs-0.10.37" + sources."@ot-builder/ot-layout-0.10.37" + sources."@ot-builder/ot-metadata-0.10.37" + sources."@ot-builder/ot-name-0.10.37" + sources."@ot-builder/ot-sfnt-0.10.37" + sources."@ot-builder/ot-standard-glyph-namer-0.10.37" + sources."@ot-builder/prelude-0.10.37" + sources."@ot-builder/primitive-0.10.37" + sources."@ot-builder/rectify-0.10.37" + sources."@ot-builder/stat-glyphs-0.10.37" + sources."@ot-builder/trace-0.10.37" + sources."@ot-builder/var-store-0.10.37" + sources."@ot-builder/variance-0.10.37" sources."@unicode/unicode-13.0.0-1.0.2" sources."abbrev-1.1.1" sources."ajv-6.12.6" @@ -78959,7 +82255,7 @@ in sources."chainsaw-0.0.9" sources."chalk-2.4.2" sources."chownr-1.1.4" - sources."cldr-5.7.0" + sources."cldr-5.8.0" sources."cli-cursor-3.1.0" sources."clipper-lib-6.4.2" sources."cliui-3.2.0" @@ -78984,7 +82280,7 @@ in sources."emoji-regex-8.0.0" sources."error-ex-1.3.2" sources."escape-string-regexp-1.0.5" - sources."escodegen-1.14.3" + sources."escodegen-2.0.0" (sources."escope-1.0.3" // { dependencies = [ sources."estraverse-2.0.0" @@ -79008,7 +82304,7 @@ in sources."estraverse-4.1.1" ]; }) - sources."estraverse-4.3.0" + sources."estraverse-5.2.0" sources."esutils-2.0.3" sources."extend-3.0.2" sources."extsprintf-1.3.0" @@ -79067,8 +82363,8 @@ in sources."lru-cache-2.5.0" sources."memoizeasync-1.1.0" sources."microbuffer-1.0.0" - sources."mime-db-1.44.0" - sources."mime-types-2.1.27" + sources."mime-db-1.45.0" + sources."mime-types-2.1.28" sources."mimic-fn-2.1.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" @@ -79105,8 +82401,8 @@ in sources."os-locale-1.4.0" sources."os-tmpdir-1.0.2" sources."osenv-0.1.5" - sources."ot-builder-0.10.34" - (sources."otb-ttc-bundle-0.10.34" // { + sources."ot-builder-0.10.37" + (sources."otb-ttc-bundle-0.10.37" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.0" @@ -79214,7 +82510,7 @@ in sources."util-deprecate-1.0.2" sources."uuid-3.4.0" sources."validate-npm-package-license-3.0.4" - (sources."verda-1.2.0" // { + (sources."verda-1.2.1" // { dependencies = [ sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" @@ -79247,9 +82543,9 @@ in sources."wordwrap-0.0.3" sources."wrap-ansi-2.1.0" sources."wrappy-1.0.2" - sources."xmldom-0.3.0" - sources."xpath-0.0.27" - sources."y18n-3.2.1" + sources."xmldom-0.4.0" + sources."xpath-0.0.32" + sources."y18n-3.2.2" sources."yallist-4.0.0" sources."yargs-6.6.0" sources."yargs-parser-4.2.1" @@ -79364,7 +82660,7 @@ in sources."vscode-languageserver-types-3.14.0" ]; }) - sources."vscode-languageserver-types-3.15.1" + sources."vscode-languageserver-types-3.16.0" sources."vscode-uri-1.0.8" sources."wrappy-1.0.2" sources."xorshift-0.2.1" @@ -79383,24 +82679,26 @@ in joplin = nodeEnv.buildNodePackage { name = "joplin"; packageName = "joplin"; - version = "1.4.9"; + version = "1.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/joplin/-/joplin-1.4.9.tgz"; - sha512 = "4JjZOpv5WyJ3VbtcxrOf5FYQBYPjbBsrIGLG+DoYNFPLsOWEOJeZH24XO2UnNKb5YopcsCzR+iaTXVCPNQ2tAw=="; + url = "https://registry.npmjs.org/joplin/-/joplin-1.5.1.tgz"; + sha512 = "V90a+QTDf5SSW8Il0BcWtdqdtDZYd/YFltqRzXGBRwO2nFggeUAuXcQxs5ZxEhQF3Jzvx3yGfrYioZR7B30D2A=="; }; dependencies = [ sources."@braintree/sanitize-url-3.1.0" sources."@cronvel/get-pixels-3.4.0" - sources."@joplinapp/fork-htmlparser2-4.1.8" - sources."@joplinapp/fork-sax-1.2.12" - sources."@joplinapp/lib-1.0.9" - (sources."@joplinapp/renderer-1.0.17" // { + sources."@joplin/fork-htmlparser2-4.1.14" + sources."@joplin/fork-sax-1.2.18" + sources."@joplin/lib-1.0.15" + (sources."@joplin/renderer-1.0.23" // { dependencies = [ sources."fs-extra-8.1.0" sources."jsonfile-4.0.0" sources."uslug-git+https://github.com/laurent22/uslug.git#emoji-support" ]; }) + sources."@joplin/turndown-4.0.36" + sources."@joplin/turndown-plugin-gfm-1.0.18" sources."abab-2.0.5" sources."abbrev-1.1.1" sources."acorn-7.4.1" @@ -79440,7 +82738,7 @@ in sources."async-mutex-0.1.4" sources."asynckit-0.4.0" sources."atob-2.1.2" - (sources."aws-sdk-2.804.0" // { + (sources."aws-sdk-2.821.0" // { dependencies = [ sources."sax-1.2.1" sources."uuid-3.3.2" @@ -79462,12 +82760,13 @@ in sources."readable-stream-3.6.0" ]; }) + sources."block-stream-0.0.9" sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."browser-process-hrtime-1.0.0" sources."buffer-4.9.2" sources."buffer-from-1.1.1" - sources."builtin-modules-3.1.0" + sources."builtin-modules-3.2.0" sources."camel-case-3.0.0" sources."camelcase-4.1.0" sources."caseless-0.12.0" @@ -79488,6 +82787,7 @@ in sources."command-line-usage-4.1.0" sources."commander-2.17.1" sources."compare-version-0.1.2" + sources."compare-versions-3.6.0" sources."concat-map-0.0.1" sources."console-control-strings-1.1.0" sources."core-util-is-1.0.2" @@ -79549,13 +82849,16 @@ in sources."delegates-1.0.0" sources."depd-1.1.2" sources."detect-libc-1.0.3" - sources."diacritics-1.3.0" sources."diff-match-patch-1.0.5" - sources."dom-serializer-1.1.0" + (sources."dom-serializer-1.2.0" // { + dependencies = [ + sources."domhandler-4.0.0" + ]; + }) sources."domelementtype-2.1.0" sources."domexception-1.0.1" sources."domhandler-3.3.0" - (sources."domutils-2.4.3" // { + (sources."domutils-2.4.4" // { dependencies = [ sources."domhandler-4.0.0" ]; @@ -79596,7 +82899,7 @@ in sources."file-uri-to-path-1.0.0" sources."fill-range-7.0.1" sources."find-up-2.1.0" - sources."follow-redirects-1.13.0" + sources."follow-redirects-1.13.1" sources."font-awesome-filetypes-2.1.0" sources."for-each-property-0.0.4" sources."for-each-property-deep-0.0.3" @@ -79612,6 +82915,7 @@ in sources."fs-minipass-1.2.7" sources."fs.realpath-1.0.0" sources."fsevents-2.1.3" + sources."fstream-1.0.12" (sources."gauge-2.7.4" // { dependencies = [ sources."strip-ansi-3.0.1" @@ -79632,9 +82936,9 @@ in sources."has-flag-4.0.0" sources."has-unicode-2.0.1" sources."he-1.2.0" - sources."highlight.js-10.4.1" + sources."highlight.js-10.5.0" sources."html-encoding-sniffer-1.0.2" - sources."html-entities-1.3.1" + sources."html-entities-1.4.0" sources."html-minifier-3.5.21" (sources."htmlparser2-3.10.1" // { dependencies = [ @@ -79665,7 +82969,7 @@ in sources."immer-7.0.15" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."ini-1.3.5" + sources."ini-1.3.8" (sources."inspect-function-0.2.2" // { dependencies = [ sources."split-skip-0.0.1" @@ -79719,16 +83023,10 @@ in sources."isobject-2.1.0" sources."isstream-0.1.2" sources."jmespath-0.15.0" - sources."joplin-turndown-4.0.30" - sources."joplin-turndown-plugin-gfm-1.0.12" sources."jpeg-js-0.4.2" sources."js-tokens-4.0.0" sources."jsbn-0.1.1" - (sources."jsdom-15.2.1" // { - dependencies = [ - sources."tough-cookie-3.0.1" - ]; - }) + sources."jsdom-15.2.1" sources."json-schema-0.2.3" sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" @@ -79739,8 +83037,12 @@ in sources."commander-2.20.3" ]; }) - sources."keytar-7.2.0" - sources."khroma-1.1.0" + (sources."keytar-7.3.0" // { + dependencies = [ + sources."node-addon-api-3.1.0" + ]; + }) + sources."khroma-1.1.1" sources."klaw-1.3.1" sources."lazyness-1.2.0" sources."levenshtein-1.0.5" @@ -79748,7 +83050,7 @@ in sources."linkify-it-2.2.0" sources."locate-path-2.0.0" sources."lodash-4.17.20" - sources."lodash-es-4.17.15" + sources."lodash-es-4.17.20" sources."lodash.padend-4.6.1" sources."lodash.repeat-4.1.0" sources."lodash.sortby-4.7.0" @@ -79773,8 +83075,8 @@ in sources."markdown-it-emoji-1.4.0" sources."markdown-it-expand-tabs-1.0.13" sources."markdown-it-footnote-3.0.2" - sources."markdown-it-ins-3.0.0" - sources."markdown-it-mark-3.0.0" + sources."markdown-it-ins-3.0.1" + sources."markdown-it-mark-3.0.1" (sources."markdown-it-multimd-table-4.0.3" // { dependencies = [ sources."entities-2.0.3" @@ -79789,15 +83091,16 @@ in sources."md5-file-4.0.0" sources."mdurl-1.0.1" sources."mermaid-8.8.4" - sources."mime-db-1.44.0" - sources."mime-types-2.1.27" + sources."mime-db-1.45.0" + sources."mime-types-2.1.28" sources."mimic-response-2.1.0" (sources."minify-4.1.3" // { dependencies = [ sources."commander-2.20.3" - sources."debug-4.3.1" + sources."debug-4.3.2" sources."html-minifier-4.0.0" - sources."uglify-js-3.12.1" + sources."ms-2.1.2" + sources."uglify-js-3.12.4" ]; }) sources."minimatch-3.0.4" @@ -79812,29 +83115,36 @@ in sources."mkdirp-classic-0.5.3" sources."moment-2.29.1" sources."moment-mini-2.24.0" - sources."ms-2.1.2" + sources."ms-2.1.3" sources."multiparty-4.2.2" - sources."mustache-4.0.1" - sources."nan-2.14.2" + sources."mustache-4.1.0" sources."nanoid-3.1.20" sources."napi-build-utils-1.0.2" sources."ndarray-1.0.19" sources."ndarray-pack-1.2.1" sources."needle-2.5.2" - sources."nextgen-events-1.3.3" + sources."nextgen-events-1.3.4" sources."no-case-2.3.2" (sources."node-abi-2.19.3" // { dependencies = [ sources."semver-5.7.1" ]; }) - sources."node-addon-api-3.0.2" + sources."node-addon-api-2.0.0" sources."node-bitmap-0.0.1" sources."node-emoji-1.10.0" sources."node-fetch-1.7.3" - (sources."node-notifier-8.0.0" // { + (sources."node-gyp-3.8.0" // { dependencies = [ - sources."uuid-8.3.1" + sources."nopt-3.0.6" + sources."semver-5.3.0" + sources."tar-2.2.2" + sources."which-1.3.1" + ]; + }) + (sources."node-notifier-8.0.1" // { + dependencies = [ + sources."uuid-8.3.2" ]; }) sources."node-persist-2.1.0" @@ -79911,10 +83221,15 @@ in (sources."request-2.88.2" // { dependencies = [ sources."form-data-2.3.3" + sources."tough-cookie-2.5.0" ]; }) sources."request-promise-core-1.1.4" - sources."request-promise-native-1.0.9" + (sources."request-promise-native-1.0.9" // { + dependencies = [ + sources."tough-cookie-2.5.0" + ]; + }) sources."requires-port-1.0.0" sources."reselect-4.0.0" sources."resolve-url-0.2.1" @@ -79930,12 +83245,13 @@ in sources."set-blocking-2.0.0" sources."setimmediate-1.0.5" sources."setprototypeof-1.2.0" - sources."seventh-0.7.38" + sources."seventh-0.7.40" (sources."sharp-0.26.3" // { dependencies = [ sources."color-3.1.3" sources."decompress-response-6.0.0" sources."mimic-response-3.1.0" + sources."node-addon-api-3.1.0" sources."simple-get-4.0.0" ]; }) @@ -79957,7 +83273,7 @@ in sources."source-map-url-0.4.0" sources."split-skip-0.0.2" sources."sprintf-js-1.1.2" - sources."sqlite3-4.2.0" + sources."sqlite3-5.0.0" sources."sshpk-1.16.1" sources."statuses-1.5.0" sources."stealthy-require-1.1.1" @@ -79990,7 +83306,6 @@ in sources."supports-color-7.2.0" sources."symbol-observable-1.2.0" sources."symbol-tree-3.2.4" - sources."syswide-cas-5.3.0" sources."table-layout-0.4.5" (sources."tar-4.4.13" // { dependencies = [ @@ -79998,7 +83313,7 @@ in ]; }) sources."tar-fs-2.1.1" - (sources."tar-stream-2.1.4" // { + (sources."tar-stream-2.2.0" // { dependencies = [ sources."readable-stream-3.6.0" ]; @@ -80009,7 +83324,7 @@ in sources."q-0.9.7" ]; }) - sources."terminal-kit-1.44.0" + sources."terminal-kit-1.44.3" (sources."terser-4.8.0" // { dependencies = [ sources."commander-2.20.3" @@ -80028,7 +83343,7 @@ in }) sources."to-regex-range-5.0.1" sources."toidentifier-1.0.0" - sources."tough-cookie-2.5.0" + sources."tough-cookie-3.0.1" sources."tr46-1.0.1" sources."tree-kit-0.6.2" sources."try-catch-2.0.1" @@ -80082,7 +83397,7 @@ in ]; }) sources."wrappy-1.0.2" - sources."ws-7.4.1" + sources."ws-7.4.2" sources."xml-name-validator-3.0.0" sources."xml2js-0.4.23" sources."xmlbuilder-11.0.1" @@ -80120,7 +83435,7 @@ in sources."glob-7.1.6" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."ini-1.3.5" + sources."ini-1.3.8" sources."lru-cache-4.1.5" sources."minimatch-3.0.4" sources."mkdirp-1.0.4" @@ -80147,20 +83462,18 @@ in js-yaml = nodeEnv.buildNodePackage { name = "js-yaml"; packageName = "js-yaml"; - version = "3.14.0"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.0.tgz"; - sha512 = "/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A=="; + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-4.0.0.tgz"; + sha512 = "pqon0s+4ScYUvX30wxQi3PogGFAlUyH0awepWvwkj4jD4v+ova3RiYw8bmA6x2rDrEaj8i/oWKoRxpVNW+Re8Q=="; }; dependencies = [ - sources."argparse-1.0.10" - sources."esprima-4.0.1" - sources."sprintf-js-1.0.3" + sources."argparse-2.0.1" ]; buildInputs = globalBuildInputs; meta = { description = "YAML 1.2 parser and serializer"; - homepage = https://github.com/nodeca/js-yaml; + homepage = "https://github.com/nodeca/js-yaml#readme"; license = "MIT"; }; production = true; @@ -80176,7 +83489,7 @@ in sha512 = "znR99e1BHeyEkSvgDDpX0sTiTu+8aQyDl9DawrkOGZTTW8hv0deIFXx87114zJ7gRaDZKVQD/4tr1ifmJp9xhQ=="; }; dependencies = [ - sources."@babel/parser-7.12.7" + sources."@babel/parser-7.12.11" sources."argparse-1.0.10" sources."bluebird-3.7.2" sources."catharsis-0.8.11" @@ -80330,13 +83643,13 @@ in sources."graphlib-2.1.8" sources."inherits-2.0.4" sources."isarray-1.0.0" - sources."js-yaml-3.14.0" + sources."js-yaml-3.14.1" sources."lodash-4.17.20" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.44.0" - sources."mime-types-2.1.27" - sources."ms-2.1.2" + sources."mime-db-1.45.0" + sources."mime-types-2.1.28" + sources."ms-2.1.3" sources."native-promise-only-0.8.1" sources."path-loader-1.0.10" sources."process-nextick-args-2.0.1" @@ -80440,7 +83753,7 @@ in sources."escape-html-1.0.3" sources."etag-1.8.1" sources."express-4.17.1" - (sources."express-urlrewrite-1.3.0" // { + (sources."express-urlrewrite-1.4.0" // { dependencies = [ sources."path-to-regexp-1.8.0" ]; @@ -80450,7 +83763,7 @@ in sources."fresh-0.5.2" sources."get-caller-file-2.0.5" sources."get-stream-4.1.0" - sources."global-dirs-2.0.1" + sources."global-dirs-2.1.0" sources."got-9.6.0" sources."graceful-fs-4.2.4" sources."has-flag-4.0.0" @@ -80461,7 +83774,7 @@ in sources."import-lazy-2.1.0" sources."imurmurhash-0.1.4" sources."inherits-2.0.3" - sources."ini-1.3.5" + sources."ini-1.3.7" sources."ipaddr.js-1.9.1" sources."is-ci-2.0.0" sources."is-fullwidth-code-point-2.0.0" @@ -80497,8 +83810,8 @@ in }) sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.44.0" - sources."mime-types-2.1.27" + sources."mime-db-1.45.0" + sources."mime-types-2.1.28" sources."mimic-response-1.0.1" sources."minimist-1.2.5" (sources."morgan-1.10.0" // { @@ -80592,7 +83905,7 @@ in sources."xdg-basedir-4.0.0" sources."y18n-5.0.5" sources."yallist-4.0.0" - sources."yargs-16.1.1" + sources."yargs-16.2.0" sources."yargs-parser-20.2.4" ]; buildInputs = globalBuildInputs; @@ -80646,19 +83959,16 @@ in sources."ansi-styles-4.3.0" sources."anymatch-3.1.1" sources."arraybuffer.slice-0.0.7" - sources."async-limiter-1.0.1" sources."backo2-1.0.2" sources."balanced-match-1.0.0" sources."base64-arraybuffer-0.1.4" sources."base64id-2.0.0" - sources."better-assert-1.0.2" sources."binary-extensions-2.1.0" sources."blob-0.0.5" sources."body-parser-1.19.0" sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."bytes-3.1.0" - sources."callsite-1.0.0" sources."camelcase-5.3.1" sources."chokidar-3.4.3" sources."cliui-6.0.0" @@ -80666,12 +83976,12 @@ in sources."color-name-1.1.4" sources."colors-1.4.0" sources."component-bind-1.0.0" - sources."component-emitter-1.2.1" + sources."component-emitter-1.3.0" sources."component-inherit-0.0.3" sources."concat-map-0.0.1" sources."connect-3.7.0" sources."content-type-1.0.4" - sources."cookie-0.3.1" + sources."cookie-0.4.1" sources."custom-event-1.0.1" sources."date-format-3.0.0" sources."debug-2.6.9" @@ -80682,19 +83992,15 @@ in sources."ee-first-1.1.1" sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" - (sources."engine.io-3.4.2" // { + (sources."engine.io-3.5.0" // { dependencies = [ sources."debug-4.1.1" - sources."ms-2.1.2" + sources."ms-2.1.3" ]; }) - (sources."engine.io-client-3.4.4" // { + (sources."engine.io-client-3.5.0" // { dependencies = [ - sources."component-emitter-1.3.0" sources."debug-3.1.0" - sources."parseqs-0.0.6" - sources."parseuri-0.0.6" - sources."ws-6.1.4" ]; }) sources."engine.io-parser-2.2.1" @@ -80706,7 +84012,7 @@ in sources."finalhandler-1.1.2" sources."find-up-4.1.0" sources."flatted-2.0.2" - sources."follow-redirects-1.13.0" + sources."follow-redirects-1.13.1" sources."fs-extra-8.1.0" sources."fs.realpath-1.0.0" sources."fsevents-2.1.3" @@ -80734,26 +84040,25 @@ in sources."lodash-4.17.20" (sources."log4js-6.3.0" // { dependencies = [ - sources."debug-4.3.1" + sources."debug-4.3.2" sources."ms-2.1.2" ]; }) sources."media-typer-0.3.0" - sources."mime-2.4.6" - sources."mime-db-1.44.0" - sources."mime-types-2.1.27" + sources."mime-2.4.7" + sources."mime-db-1.45.0" + sources."mime-types-2.1.28" sources."minimatch-3.0.4" sources."ms-2.0.0" sources."negotiator-0.6.2" sources."normalize-path-3.0.0" - sources."object-component-0.0.3" sources."on-finished-2.3.0" sources."once-1.4.0" sources."p-limit-2.3.0" sources."p-locate-4.1.0" sources."p-try-2.2.0" - sources."parseqs-0.0.5" - sources."parseuri-0.0.5" + sources."parseqs-0.0.6" + sources."parseuri-0.0.6" sources."parseurl-1.3.3" sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" @@ -80771,31 +84076,24 @@ in sources."safer-buffer-2.1.2" sources."set-blocking-2.0.0" sources."setprototypeof-1.1.1" - (sources."socket.io-2.3.0" // { + (sources."socket.io-2.4.0" // { dependencies = [ sources."debug-4.1.1" - sources."ms-2.1.2" + sources."ms-2.1.3" ]; }) sources."socket.io-adapter-1.1.2" - (sources."socket.io-client-2.3.0" // { + (sources."socket.io-client-2.4.0" // { dependencies = [ - sources."base64-arraybuffer-0.1.5" - sources."debug-4.1.1" - sources."ms-2.1.2" - (sources."socket.io-parser-3.3.1" // { - dependencies = [ - sources."component-emitter-1.3.0" - sources."debug-3.1.0" - sources."ms-2.0.0" - ]; - }) + sources."debug-3.1.0" + sources."socket.io-parser-3.3.1" ]; }) (sources."socket.io-parser-3.4.1" // { dependencies = [ + sources."component-emitter-1.2.1" sources."debug-4.1.1" - sources."ms-2.1.2" + sources."ms-2.1.3" ]; }) sources."source-map-0.6.1" @@ -80803,7 +84101,7 @@ in (sources."streamroller-2.2.4" // { dependencies = [ sources."date-format-2.1.0" - sources."debug-4.3.1" + sources."debug-4.3.2" sources."ms-2.1.2" ]; }) @@ -80822,7 +84120,7 @@ in sources."which-module-2.0.0" sources."wrap-ansi-6.2.0" sources."wrappy-1.0.2" - sources."ws-7.4.1" + sources."ws-7.4.2" sources."xmlhttprequest-ssl-1.5.5" sources."y18n-4.0.1" sources."yargs-15.4.1" @@ -80868,7 +84166,7 @@ in sources."fs-mkdirp-stream-1.0.0" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" - sources."get-intrinsic-1.0.1" + sources."get-intrinsic-1.0.2" sources."glob-7.1.6" sources."glob-parent-3.1.0" sources."glob-stream-6.1.0" @@ -81028,7 +84326,7 @@ in sources."i-0.3.6" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."ini-1.3.5" + sources."ini-1.3.8" sources."invert-kv-1.0.0" sources."is-fullwidth-code-point-1.0.0" sources."is-stream-1.1.0" @@ -81053,8 +84351,8 @@ in sources."mimic-fn-2.1.0" ]; }) - sources."mime-db-1.44.0" - sources."mime-types-2.1.27" + sources."mime-db-1.45.0" + sources."mime-types-2.1.28" sources."mimic-fn-1.2.0" sources."minimatch-3.0.4" sources."minimist-0.0.8" @@ -81164,7 +84462,7 @@ in sources."wrap-ansi-2.1.0" sources."wrappy-1.0.2" sources."xml-name-validator-2.0.1" - sources."y18n-3.2.1" + sources."y18n-3.2.2" (sources."yargs-12.0.4" // { dependencies = [ sources."ansi-regex-3.0.0" @@ -81202,8 +84500,8 @@ in sha512 = "vk1lfVRFm+UuEFA7wkLKeSF7Iz13W+N/vFd48aW2yuS7Kv0RbNm2/qcDPV863056LMfkRlsEe+QYOw3palj5Lg=="; }; dependencies = [ - sources."@babel/code-frame-7.10.4" - sources."@babel/helper-validator-identifier-7.10.4" + sources."@babel/code-frame-7.12.11" + sources."@babel/helper-validator-identifier-7.12.11" sources."@babel/highlight-7.10.4" (sources."@evocateur/libnpmaccess-3.1.2" // { dependencies = [ @@ -81306,7 +84604,7 @@ in sources."universal-user-agent-6.0.0" ]; }) - sources."@octokit/openapi-types-2.0.0" + sources."@octokit/openapi-types-2.0.1" sources."@octokit/plugin-enterprise-rest-6.0.1" (sources."@octokit/plugin-paginate-rest-1.1.2" // { dependencies = [ @@ -81332,11 +84630,11 @@ in ]; }) sources."@octokit/rest-16.43.2" - sources."@octokit/types-6.1.1" + sources."@octokit/types-6.1.2" sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" sources."@types/minimist-1.2.1" - sources."@types/node-14.14.10" + sources."@types/node-14.14.20" sources."@types/normalize-package-data-2.4.0" sources."@zkochan/cmd-shim-3.1.0" sources."JSONStream-1.3.5" @@ -81456,7 +84754,7 @@ in ]; }) sources."conventional-changelog-preset-loader-2.3.4" - (sources."conventional-changelog-writer-4.0.18" // { + (sources."conventional-changelog-writer-4.1.0" // { dependencies = [ sources."readable-stream-3.6.0" sources."through2-4.0.2" @@ -81617,7 +84915,7 @@ in }) sources."genfun-5.0.0" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.0.1" + sources."get-intrinsic-1.0.2" (sources."get-pkg-repo-1.4.0" // { dependencies = [ sources."camelcase-2.1.1" @@ -81678,7 +84976,7 @@ in ]; }) sources."git-up-4.0.2" - sources."git-url-parse-11.4.0" + sources."git-url-parse-11.4.3" sources."gitconfiglocal-1.0.0" sources."glob-7.1.6" sources."glob-parent-5.1.1" @@ -81728,7 +85026,7 @@ in sources."infer-owner-1.0.4" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."ini-1.3.5" + sources."ini-1.3.8" (sources."init-package-json-1.10.3" // { dependencies = [ sources."semver-5.7.1" @@ -81778,7 +85076,7 @@ in sources."isobject-3.0.1" sources."isstream-0.1.2" sources."js-tokens-4.0.0" - sources."js-yaml-3.14.0" + sources."js-yaml-3.14.1" sources."jsbn-0.1.1" sources."json-parse-better-errors-1.0.2" sources."json-parse-even-better-errors-2.3.1" @@ -81814,7 +85112,7 @@ in sources."map-cache-0.2.2" sources."map-obj-4.1.0" sources."map-visit-1.0.0" - (sources."meow-8.0.0" // { + (sources."meow-8.1.0" // { dependencies = [ sources."find-up-4.1.0" sources."hosted-git-info-3.0.7" @@ -81845,8 +85143,8 @@ in }) sources."merge2-1.4.1" sources."micromatch-3.1.10" - sources."mime-db-1.44.0" - sources."mime-types-2.1.27" + sources."mime-db-1.45.0" + sources."mime-types-2.1.28" sources."mimic-fn-1.2.0" sources."min-indent-1.0.1" sources."minimatch-3.0.4" @@ -81864,7 +85162,7 @@ in sources."mkdirp-promise-5.0.1" sources."modify-values-1.0.1" sources."move-concurrently-1.0.1" - sources."ms-2.1.2" + sources."ms-2.1.3" sources."multimatch-3.0.0" sources."mute-stream-0.0.7" sources."mz-2.7.0" @@ -82153,7 +85451,7 @@ in sources."tweetnacl-0.14.5" sources."type-fest-0.3.1" sources."typedarray-0.0.6" - sources."uglify-js-3.12.1" + sources."uglify-js-3.12.4" sources."uid-number-0.0.6" sources."umask-1.1.0" sources."union-value-1.0.1" @@ -82235,18 +85533,21 @@ in less = nodeEnv.buildNodePackage { name = "less"; packageName = "less"; - version = "3.12.2"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/less/-/less-3.12.2.tgz"; - sha512 = "+1V2PCMFkL+OIj2/HrtrvZw0BC0sYLMICJfbQjuj/K8CEnlrFX6R5cKKgzzttsZDHyxQNL1jqMREjKN3ja/E3Q=="; + url = "https://registry.npmjs.org/less/-/less-4.0.0.tgz"; + sha512 = "av1eEa2D0xZfF7fjLJS/Dld7zAYSLU7EOEJvuOELeaNI3i6L/81AdjbK5/pytaRkBwi7ZEa0433IDvMLskKCOw=="; }; dependencies = [ - sources."errno-0.1.7" + sources."copy-anything-2.0.1" + sources."errno-0.1.8" sources."graceful-fs-4.2.4" sources."image-size-0.5.5" + sources."is-what-3.12.0" sources."make-dir-2.1.0" sources."mime-1.6.0" sources."native-request-1.0.8" + sources."parse-node-version-1.0.1" sources."pify-4.0.1" sources."prr-1.0.1" sources."semver-5.7.1" @@ -82424,7 +85725,7 @@ in sources."depd-1.1.2" ]; }) - sources."http-parser-js-0.5.2" + sources."http-parser-js-0.5.3" sources."inherits-2.0.4" sources."is-accessor-descriptor-1.0.0" sources."is-binary-path-1.0.1" @@ -82450,8 +85751,8 @@ in sources."map-visit-1.0.0" sources."micromatch-3.1.10" sources."mime-1.6.0" - sources."mime-db-1.44.0" - sources."mime-types-2.1.27" + sources."mime-db-1.45.0" + sources."mime-types-2.1.28" sources."mixin-deep-1.3.2" sources."morgan-1.10.0" sources."ms-2.0.0" @@ -82642,7 +85943,6 @@ in sources."assert-plus-1.0.0" sources."assign-symbols-1.0.0" sources."async-each-1.0.3" - sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."atob-2.1.2" sources."aws-sign2-0.7.0" @@ -82657,7 +85957,6 @@ in sources."base64-arraybuffer-0.1.4" sources."base64id-2.0.0" sources."bcrypt-pbkdf-1.0.2" - sources."better-assert-1.0.2" sources."binary-extensions-1.13.1" sources."bindings-1.5.0" sources."blob-0.0.5" @@ -82669,7 +85968,6 @@ in sources."isobject-3.0.1" ]; }) - sources."callsite-1.0.0" sources."caseless-0.12.0" sources."chokidar-1.7.0" (sources."class-utils-0.3.6" // { @@ -82716,19 +86014,16 @@ in sources."ee-first-1.1.1" sources."emoji-regex-6.1.1" sources."encodeurl-1.0.2" - (sources."engine.io-3.4.2" // { + (sources."engine.io-3.5.0" // { dependencies = [ - sources."cookie-0.3.1" + sources."cookie-0.4.1" sources."debug-4.1.1" - sources."ms-2.1.2" + sources."ms-2.1.3" ]; }) - (sources."engine.io-client-3.4.4" // { + (sources."engine.io-client-3.5.0" // { dependencies = [ sources."debug-3.1.0" - sources."parseqs-0.0.6" - sources."parseuri-0.0.6" - sources."ws-6.1.4" ]; }) sources."engine.io-parser-2.2.1" @@ -82789,7 +86084,7 @@ in sources."kind-of-4.0.0" ]; }) - sources."html-entities-1.3.1" + sources."html-entities-1.4.0" sources."http-errors-1.7.2" sources."http-signature-1.2.0" sources."iconv-lite-0.4.24" @@ -82853,8 +86148,8 @@ in sources."methods-1.1.2" sources."micromatch-2.3.11" sources."mime-1.6.0" - sources."mime-db-1.44.0" - sources."mime-types-2.1.27" + sources."mime-db-1.45.0" + sources."mime-types-2.1.28" sources."minimist-1.2.5" (sources."mixin-deep-1.3.2" // { dependencies = [ @@ -82873,7 +86168,6 @@ in sources."negotiator-0.6.2" sources."normalize-path-2.1.1" sources."oauth-sign-0.9.0" - sources."object-component-0.0.3" (sources."object-copy-0.1.0" // { dependencies = [ sources."define-property-0.2.5" @@ -82900,8 +86194,8 @@ in sources."on-finished-2.3.0" sources."opn-5.5.0" sources."parse-glob-3.0.4" - sources."parseqs-0.0.5" - sources."parseuri-0.0.5" + sources."parseqs-0.0.6" + sources."parseuri-0.0.6" sources."parseurl-1.3.3" sources."pascalcase-0.1.1" sources."path-is-absolute-1.0.1" @@ -83026,27 +86320,18 @@ in ]; }) sources."snapdragon-util-3.0.1" - (sources."socket.io-2.3.0" // { + (sources."socket.io-2.4.0" // { dependencies = [ sources."debug-4.1.1" - sources."ms-2.1.2" + sources."ms-2.1.3" ]; }) sources."socket.io-adapter-1.1.2" - (sources."socket.io-client-2.3.0" // { + (sources."socket.io-client-2.4.0" // { dependencies = [ - sources."base64-arraybuffer-0.1.5" - sources."component-emitter-1.2.1" - sources."debug-4.1.1" + sources."debug-3.1.0" sources."isarray-2.0.1" - sources."ms-2.1.2" - (sources."socket.io-parser-3.3.1" // { - dependencies = [ - sources."component-emitter-1.3.0" - sources."debug-3.1.0" - sources."ms-2.0.0" - ]; - }) + sources."socket.io-parser-3.3.1" ]; }) (sources."socket.io-parser-3.4.1" // { @@ -83054,7 +86339,7 @@ in sources."component-emitter-1.2.1" sources."debug-4.1.1" sources."isarray-2.0.1" - sources."ms-2.1.2" + sources."ms-2.1.3" ]; }) sources."source-map-0.5.7" @@ -83117,7 +86402,7 @@ in sources."uuid-3.4.0" sources."vary-1.1.2" sources."verror-1.10.0" - sources."ws-7.4.1" + sources."ws-7.4.2" sources."xmlhttprequest-ssl-1.5.5" sources."yeast-0.1.2" ]; @@ -83137,32 +86422,32 @@ in version = "1.10.1"; src = ../interpreters/clojurescript/lumo; dependencies = [ - sources."@babel/code-frame-7.10.4" + sources."@babel/code-frame-7.12.11" sources."@babel/compat-data-7.12.7" - sources."@babel/core-7.12.9" - sources."@babel/generator-7.12.5" - sources."@babel/helper-annotate-as-pure-7.10.4" + sources."@babel/core-7.12.10" + sources."@babel/generator-7.12.11" + sources."@babel/helper-annotate-as-pure-7.12.10" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.10.4" sources."@babel/helper-compilation-targets-7.12.5" sources."@babel/helper-create-class-features-plugin-7.12.1" sources."@babel/helper-create-regexp-features-plugin-7.12.7" sources."@babel/helper-define-map-7.10.5" sources."@babel/helper-explode-assignable-expression-7.12.1" - sources."@babel/helper-function-name-7.10.4" - sources."@babel/helper-get-function-arity-7.10.4" + sources."@babel/helper-function-name-7.12.11" + sources."@babel/helper-get-function-arity-7.12.10" sources."@babel/helper-hoist-variables-7.10.4" sources."@babel/helper-member-expression-to-functions-7.12.7" sources."@babel/helper-module-imports-7.12.5" sources."@babel/helper-module-transforms-7.12.1" - sources."@babel/helper-optimise-call-expression-7.12.7" + sources."@babel/helper-optimise-call-expression-7.12.10" sources."@babel/helper-plugin-utils-7.10.4" sources."@babel/helper-remap-async-to-generator-7.12.1" - sources."@babel/helper-replace-supers-7.12.5" + sources."@babel/helper-replace-supers-7.12.11" sources."@babel/helper-simple-access-7.12.1" sources."@babel/helper-skip-transparent-expression-wrappers-7.12.1" - sources."@babel/helper-split-export-declaration-7.11.0" - sources."@babel/helper-validator-identifier-7.10.4" - sources."@babel/helper-validator-option-7.12.1" + sources."@babel/helper-split-export-declaration-7.12.11" + sources."@babel/helper-validator-identifier-7.12.11" + sources."@babel/helper-validator-option-7.12.11" sources."@babel/helper-wrap-function-7.12.3" sources."@babel/helpers-7.12.5" (sources."@babel/highlight-7.10.4" // { @@ -83170,9 +86455,9 @@ in sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.12.7" + sources."@babel/parser-7.12.11" sources."@babel/plugin-external-helpers-7.8.3" - sources."@babel/plugin-proposal-async-generator-functions-7.12.1" + sources."@babel/plugin-proposal-async-generator-functions-7.12.12" sources."@babel/plugin-proposal-class-properties-7.12.1" sources."@babel/plugin-proposal-dynamic-import-7.12.1" sources."@babel/plugin-proposal-export-namespace-from-7.12.1" @@ -83202,7 +86487,7 @@ in sources."@babel/plugin-transform-arrow-functions-7.12.1" sources."@babel/plugin-transform-async-to-generator-7.12.1" sources."@babel/plugin-transform-block-scoped-functions-7.12.1" - sources."@babel/plugin-transform-block-scoping-7.12.1" + sources."@babel/plugin-transform-block-scoping-7.12.12" sources."@babel/plugin-transform-classes-7.12.1" sources."@babel/plugin-transform-computed-properties-7.12.1" sources."@babel/plugin-transform-destructuring-7.12.1" @@ -83224,21 +86509,21 @@ in sources."@babel/plugin-transform-property-literals-7.12.1" sources."@babel/plugin-transform-regenerator-7.12.1" sources."@babel/plugin-transform-reserved-words-7.12.1" - sources."@babel/plugin-transform-runtime-7.12.1" + sources."@babel/plugin-transform-runtime-7.12.10" sources."@babel/plugin-transform-shorthand-properties-7.12.1" sources."@babel/plugin-transform-spread-7.12.1" sources."@babel/plugin-transform-sticky-regex-7.12.7" sources."@babel/plugin-transform-template-literals-7.12.1" - sources."@babel/plugin-transform-typeof-symbol-7.12.1" + sources."@babel/plugin-transform-typeof-symbol-7.12.10" sources."@babel/plugin-transform-unicode-escapes-7.12.1" sources."@babel/plugin-transform-unicode-regex-7.12.1" - sources."@babel/preset-env-7.12.7" + sources."@babel/preset-env-7.12.11" sources."@babel/preset-modules-0.1.4" sources."@babel/preset-stage-2-7.8.3" sources."@babel/runtime-7.12.5" sources."@babel/template-7.12.7" - sources."@babel/traverse-7.12.9" - sources."@babel/types-7.12.7" + sources."@babel/traverse-7.12.12" + sources."@babel/types-7.12.12" sources."@cnakazawa/watch-1.0.4" sources."@comandeer/babel-plugin-banner-5.0.0" sources."@istanbuljs/load-nyc-config-1.1.0" @@ -83252,18 +86537,18 @@ in sources."@types/babel__core-7.1.12" sources."@types/babel__generator-7.6.2" sources."@types/babel__template-7.4.0" - sources."@types/babel__traverse-7.0.16" + sources."@types/babel__traverse-7.11.0" sources."@types/estree-0.0.45" sources."@types/graceful-fs-4.1.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/json-schema-7.0.6" - sources."@types/node-14.14.10" + sources."@types/node-14.14.20" sources."@types/normalize-package-data-2.4.0" sources."@types/resolve-0.0.8" - sources."@types/yargs-15.0.11" - sources."@types/yargs-parser-15.0.0" + sources."@types/yargs-15.0.12" + sources."@types/yargs-parser-20.2.0" sources."@webassemblyjs/ast-1.9.0" sources."@webassemblyjs/floating-point-hex-parser-1.9.0" sources."@webassemblyjs/helper-api-error-1.9.0" @@ -83413,12 +86698,12 @@ in ]; }) sources."browserify-zlib-0.2.0" - sources."browserslist-4.15.0" + sources."browserslist-4.16.0" sources."bser-2.1.1" sources."buffer-5.2.1" sources."buffer-from-1.1.1" sources."buffer-xor-1.0.3" - sources."builtin-modules-3.1.0" + sources."builtin-modules-3.2.0" sources."builtin-status-codes-3.0.0" (sources."cacache-12.0.4" // { dependencies = [ @@ -83429,7 +86714,7 @@ in sources."cached-path-relative-1.0.2" sources."call-bind-1.0.0" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001165" + sources."caniuse-lite-1.0.30001173" sources."capture-exit-2.0.0" sources."caseless-0.12.0" (sources."chalk-3.0.0" // { @@ -83502,7 +86787,7 @@ in }) sources."copy-descriptor-0.1.1" sources."core-js-2.6.12" - (sources."core-js-compat-3.8.0" // { + (sources."core-js-compat-3.8.2" // { dependencies = [ sources."semver-7.0.0" ]; @@ -83533,7 +86818,7 @@ in sources."dash-ast-1.0.0" sources."dashdash-1.14.1" sources."death-1.1.0" - sources."debug-4.3.1" + sources."debug-4.3.2" sources."decamelize-1.2.0" sources."decode-uri-component-0.2.0" sources."define-properties-1.1.3" @@ -83553,7 +86838,7 @@ in sources."duplexer2-0.1.4" sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.3.616" + sources."electron-to-chromium-1.3.634" (sources."elliptic-6.5.3" // { dependencies = [ sources."bn.js-4.11.9" @@ -83567,7 +86852,7 @@ in sources."memory-fs-0.5.0" ]; }) - sources."errno-0.1.7" + sources."errno-0.1.8" sources."error-ex-1.3.2" sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" @@ -83648,12 +86933,12 @@ in sources."fs-constants-1.0.0" sources."fs-write-stream-atomic-1.0.10" sources."fs.realpath-1.0.0" - sources."fsevents-2.2.1" + sources."fsevents-2.3.1" sources."function-bind-1.1.1" sources."gensync-1.0.0-beta.2" sources."get-assigned-identifiers-1.2.0" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.0.1" + sources."get-intrinsic-1.0.2" sources."get-package-type-0.1.0" sources."get-stream-4.1.0" sources."get-value-2.0.6" @@ -83719,7 +87004,7 @@ in sources."infer-owner-1.0.4" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."ini-1.3.5" + sources."ini-1.3.8" sources."inline-source-map-0.6.2" sources."insert-module-globals-7.2.1" sources."interpret-1.4.0" @@ -83770,7 +87055,7 @@ in ]; }) sources."js-tokens-4.0.0" - sources."js-yaml-3.14.0" + sources."js-yaml-3.14.1" sources."jsbn-0.1.1" sources."jsesc-2.5.2" sources."json-parse-better-errors-1.0.2" @@ -83822,8 +87107,8 @@ in sources."bn.js-4.11.9" ]; }) - sources."mime-db-1.44.0" - sources."mime-types-2.1.27" + sources."mime-db-1.45.0" + sources."mime-types-2.1.28" sources."minimalistic-assert-1.0.1" sources."minimalistic-crypto-utils-1.0.1" sources."minimatch-3.0.4" @@ -83863,7 +87148,7 @@ in ]; }) sources."node-modules-regexp-1.0.0" - sources."node-releases-1.1.67" + sources."node-releases-1.1.69" sources."normalize-package-data-2.5.0" sources."normalize-path-3.0.0" sources."npm-run-path-2.0.2" @@ -84112,7 +87397,7 @@ in sources."supports-color-5.5.0" sources."syntax-error-1.4.0" sources."tapable-1.1.3" - (sources."tar-stream-2.1.4" // { + (sources."tar-stream-2.2.0" // { dependencies = [ sources."readable-stream-3.6.0" ]; @@ -84311,10 +87596,10 @@ in markdown-link-check = nodeEnv.buildNodePackage { name = "markdown-link-check"; packageName = "markdown-link-check"; - version = "3.8.4"; + version = "3.8.5"; src = fetchurl { - url = "https://registry.npmjs.org/markdown-link-check/-/markdown-link-check-3.8.4.tgz"; - sha512 = "7uIEdppB5S8A/Wla+lUm40HJUg2qvZD7UPx2bSWgChe/my487whvNMf19M1T/j9LQXzRvIIDTYrec7+diJyKqg=="; + url = "https://registry.npmjs.org/markdown-link-check/-/markdown-link-check-3.8.5.tgz"; + sha512 = "raCr1YMrIqCUFrBTp90UHDsar/79TPgzlVHA7gSi1DnhM2/BC1lm49V+PGzBd1ZpIYwkmzQ6TYm0AfK7A82/Dw=="; }; dependencies = [ sources."ajv-6.12.6" @@ -84331,7 +87616,7 @@ in sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."combined-stream-1.0.8" - sources."commander-6.2.0" + sources."commander-6.2.1" sources."core-util-is-1.0.2" sources."dashdash-1.14.1" sources."delayed-stream-1.0.0" @@ -84357,13 +87642,13 @@ in sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" sources."jsprim-1.4.1" - sources."link-check-4.5.3" + sources."link-check-4.5.4" sources."lodash-4.17.20" sources."markdown-link-extractor-1.2.6" - sources."marked-1.2.5" - sources."mime-db-1.44.0" - sources."mime-types-2.1.27" - sources."ms-2.1.2" + sources."marked-1.2.7" + sources."mime-db-1.45.0" + sources."mime-types-2.1.28" + sources."ms-2.1.3" sources."oauth-sign-0.9.0" sources."performance-now-2.1.0" sources."progress-2.0.3" @@ -84395,10 +87680,10 @@ in mastodon-bot = nodeEnv.buildNodePackage { name = "mastodon-bot"; packageName = "mastodon-bot"; - version = "1.10.2"; + version = "1.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/mastodon-bot/-/mastodon-bot-1.10.2.tgz"; - sha512 = "0egBr67f661HiYhCi0qGPt9RlMDownALwzGxIa5rfKncgcx16cIyy9Dm+LvN7vPaSwdJCwmrqVK+qXOHEzRJYQ=="; + url = "https://registry.npmjs.org/mastodon-bot/-/mastodon-bot-1.10.3.tgz"; + sha512 = "0/oDK4jgCpcQplwWihbT8RNJ2Kz1rb87IcY5/RG8RyFDDgEyXvlfLH5J5x/kRjjnz2E35yOLNQr1jm/0irQ8bg=="; }; dependencies = [ sources."acorn-5.7.4" @@ -84552,7 +87837,7 @@ in sources."isarray-1.0.0" sources."isstream-0.1.2" sources."js-tokens-3.0.2" - sources."js-yaml-3.14.0" + sources."js-yaml-3.14.1" sources."jsbn-0.1.1" sources."json-schema-0.2.3" sources."json-schema-traverse-0.4.1" @@ -84581,8 +87866,8 @@ in sources."lodash.templatesettings-3.1.1" sources."mastodon-api-1.3.0" sources."mime-1.6.0" - sources."mime-db-1.44.0" - sources."mime-types-2.1.27" + sources."mime-db-1.45.0" + sources."mime-types-2.1.28" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-0.5.5" @@ -84745,13 +88030,14 @@ in "@mermaid-js/mermaid-cli" = nodeEnv.buildNodePackage { name = "_at_mermaid-js_slash_mermaid-cli"; packageName = "@mermaid-js/mermaid-cli"; - version = "8.8.3-2"; + version = "8.8.4-1"; src = fetchurl { - url = "https://registry.npmjs.org/@mermaid-js/mermaid-cli/-/mermaid-cli-8.8.3-2.tgz"; - sha512 = "8tXy9R4hcUKgyRS2EOOZzQYlM3jDBIrC04w8YiiTBhTUpm0UuDYpzO+VDjFjxEGBj+KyAzEI3/7oAdV6kYHUMg=="; + url = "https://registry.npmjs.org/@mermaid-js/mermaid-cli/-/mermaid-cli-8.8.4-1.tgz"; + sha512 = "4rg3vEBnNMx7cVM4y/pRa6WAbKSoFvPZc4GGUkar4it/pH3PpktOq/wr99mOOu8L/uQEJHpRxed+eRpK75Rn/w=="; }; dependencies = [ - sources."@types/node-14.14.10" + sources."@braintree/sanitize-url-3.1.0" + sources."@types/node-14.14.20" sources."@types/yauzl-2.9.1" sources."agent-base-5.1.1" sources."ansi-styles-4.3.0" @@ -84761,15 +88047,58 @@ in sources."brace-expansion-1.1.11" sources."buffer-5.7.1" sources."buffer-crc32-0.2.13" + sources."buffer-from-1.1.1" + sources."camel-case-3.0.0" sources."chalk-4.1.0" sources."chownr-1.1.4" + sources."clean-css-4.2.3" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."commander-6.2.0" + sources."commander-6.2.1" sources."concat-map-0.0.1" - sources."debug-4.3.1" + sources."css-b64-images-0.2.5" + sources."d3-5.16.0" + sources."d3-array-1.2.4" + sources."d3-axis-1.0.12" + sources."d3-brush-1.1.6" + sources."d3-chord-1.0.6" + sources."d3-collection-1.0.7" + sources."d3-color-1.4.1" + sources."d3-contour-1.3.2" + sources."d3-dispatch-1.0.6" + sources."d3-drag-1.2.5" + (sources."d3-dsv-1.2.0" // { + dependencies = [ + sources."commander-2.20.3" + ]; + }) + sources."d3-ease-1.0.7" + sources."d3-fetch-1.2.0" + sources."d3-force-1.2.1" + sources."d3-format-1.4.5" + sources."d3-geo-1.12.1" + sources."d3-hierarchy-1.1.9" + sources."d3-interpolate-1.4.0" + sources."d3-path-1.0.9" + sources."d3-polygon-1.0.6" + sources."d3-quadtree-1.0.7" + sources."d3-random-1.1.2" + sources."d3-scale-2.2.2" + sources."d3-scale-chromatic-1.5.0" + sources."d3-selection-1.4.2" + sources."d3-shape-1.3.7" + sources."d3-time-1.1.0" + sources."d3-time-format-2.3.0" + sources."d3-timer-1.0.10" + sources."d3-transition-1.3.2" + sources."d3-voronoi-1.1.4" + sources."d3-zoom-1.8.3" + sources."dagre-0.8.5" + sources."dagre-d3-0.6.4" + sources."debug-4.3.2" sources."devtools-protocol-0.0.818844" sources."end-of-stream-1.4.4" + sources."entity-decode-2.0.2" sources."extract-zip-2.0.1" sources."fd-slicer-1.1.0" sources."find-up-4.1.0" @@ -84777,20 +88106,36 @@ in sources."fs.realpath-1.0.0" sources."get-stream-5.2.0" sources."glob-7.1.6" + sources."graphlib-2.1.8" sources."has-flag-4.0.0" + sources."he-1.2.0" + (sources."html-minifier-4.0.0" // { + dependencies = [ + sources."commander-2.20.3" + ]; + }) sources."https-proxy-agent-4.0.0" + sources."iconv-lite-0.4.24" sources."ieee754-1.2.1" sources."inflight-1.0.6" sources."inherits-2.0.4" + sources."khroma-1.1.1" sources."locate-path-5.0.0" + sources."lodash-4.17.20" + sources."lower-case-1.1.4" + sources."mermaid-8.8.4" + sources."minify-4.1.3" sources."minimatch-3.0.4" sources."mkdirp-classic-0.5.3" + sources."moment-mini-2.24.0" sources."ms-2.1.2" + sources."no-case-2.3.2" sources."node-fetch-2.6.1" sources."once-1.4.0" sources."p-limit-2.3.0" sources."p-locate-4.1.0" sources."p-try-2.2.0" + sources."param-case-2.1.1" sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" sources."pend-1.2.0" @@ -84800,17 +88145,32 @@ in sources."pump-3.0.0" sources."puppeteer-5.5.0" sources."readable-stream-3.6.0" + sources."relateurl-0.2.7" sources."rimraf-3.0.2" + sources."rw-1.3.3" sources."safe-buffer-5.2.1" + sources."safer-buffer-2.1.2" + sources."source-map-0.6.1" + sources."source-map-support-0.5.19" sources."string_decoder-1.3.0" + sources."stylis-3.5.4" sources."supports-color-7.2.0" sources."tar-fs-2.1.1" - sources."tar-stream-2.1.4" + sources."tar-stream-2.2.0" + (sources."terser-4.8.0" // { + dependencies = [ + sources."commander-2.20.3" + ]; + }) sources."through-2.3.8" + sources."try-catch-2.0.1" + sources."try-to-catch-1.1.1" + sources."uglify-js-3.12.4" sources."unbzip2-stream-1.4.3" + sources."upper-case-1.1.3" sources."util-deprecate-1.0.2" sources."wrappy-1.0.2" - sources."ws-7.4.1" + sources."ws-7.4.2" sources."yauzl-2.10.0" ]; buildInputs = globalBuildInputs; @@ -84826,26 +88186,22 @@ in mirakurun = nodeEnv.buildNodePackage { name = "mirakurun"; packageName = "mirakurun"; - version = "3.3.1"; + version = "3.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/mirakurun/-/mirakurun-3.3.1.tgz"; - sha512 = "uCsn3t7bV3jmy8mcgl19wowBq69Xz/Z/WUkazOC9PXvzzb9j5wvfr+qrwB5GtHkLBFIaBVI59HIX+JJ637jVmA=="; + url = "https://registry.npmjs.org/mirakurun/-/mirakurun-3.4.1.tgz"; + sha512 = "ymTdhda+4t6njz8xY8ySZS4nDEDEb+zXhmn1JzzxlribUqELcKZ6FwC8JF8HhHg3tcKeFAwVLzL6kHcaqL+okQ=="; }; dependencies = [ sources."@fluentui/date-time-utilities-7.9.0" sources."@fluentui/dom-utilities-1.1.1" sources."@fluentui/keyboard-key-0.2.12" - sources."@fluentui/react-7.153.4" - sources."@fluentui/react-compose-0.19.12" - sources."@fluentui/react-focus-7.16.19" - sources."@fluentui/react-stylesheets-0.2.4" - sources."@fluentui/react-theme-provider-0.18.0" + sources."@fluentui/react-7.155.3" + sources."@fluentui/react-focus-7.17.0" sources."@fluentui/react-window-provider-1.0.1" sources."@fluentui/theme-1.7.0" - sources."@microsoft/load-themed-styles-1.10.139" + sources."@microsoft/load-themed-styles-1.10.141" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/classnames-2.2.11" sources."@uifabric/foundation-7.9.20" sources."@uifabric/icons-7.5.17" sources."@uifabric/merge-styles-7.19.1" @@ -84884,7 +88240,6 @@ in }) sources."chalk-1.1.3" sources."chardet-0.4.2" - sources."classnames-2.2.6" sources."cli-cursor-2.1.0" sources."cli-width-2.2.1" sources."clone-response-1.0.2" @@ -84920,7 +88275,7 @@ in sources."eventemitter3-4.0.7" sources."express-4.17.1" sources."express-normalize-query-params-middleware-0.5.1" - sources."express-openapi-6.0.0" + sources."express-openapi-7.2.0" sources."external-editor-2.2.0" sources."fast-deep-equal-3.1.3" sources."fast-json-stable-stringify-2.1.0" @@ -84928,7 +88283,7 @@ in sources."finalhandler-1.1.2" sources."forwarded-0.1.2" sources."fresh-0.5.2" - sources."fs-routes-2.0.0" + sources."fs-routes-7.0.1" sources."fs.realpath-1.0.0" sources."get-stream-4.1.0" sources."glob-7.1.6" @@ -84940,7 +88295,7 @@ in sources."ieee754-1.2.1" sources."inflight-1.0.6" sources."inherits-2.0.3" - sources."ini-1.3.5" + sources."ini-1.3.8" sources."inquirer-3.0.6" sources."ip-1.1.5" sources."ipaddr.js-1.9.1" @@ -84948,7 +88303,7 @@ in sources."is-fullwidth-code-point-2.0.0" sources."is-stream-1.1.0" sources."js-tokens-4.0.0" - sources."js-yaml-3.14.0" + sources."js-yaml-3.14.1" sources."json-buffer-3.0.0" sources."json-schema-traverse-0.4.1" sources."keyv-3.1.0" @@ -84962,8 +88317,8 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.44.0" - sources."mime-types-2.1.27" + sources."mime-db-1.45.0" + sources."mime-types-2.1.28" sources."mimic-fn-1.2.0" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" @@ -84980,28 +88335,20 @@ 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.153.4" + sources."office-ui-fabric-react-7.155.3" sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" sources."onetime-2.0.1" - sources."openapi-default-setter-2.1.0" - sources."openapi-framework-0.26.0" - sources."openapi-jsonschema-parameters-1.2.0" - sources."openapi-request-coercer-2.4.0" - sources."openapi-request-validator-4.2.0" - sources."openapi-response-validator-4.0.0" - (sources."openapi-schema-validator-3.0.3" // { - dependencies = [ - sources."openapi-types-1.3.4" - ]; - }) - (sources."openapi-security-handler-2.0.4" // { - dependencies = [ - sources."openapi-types-1.3.4" - ]; - }) - sources."openapi-types-1.3.5" + sources."openapi-default-setter-7.0.1" + sources."openapi-framework-7.2.0" + sources."openapi-jsonschema-parameters-7.0.2" + sources."openapi-request-coercer-7.1.0" + sources."openapi-request-validator-7.2.0" + sources."openapi-response-validator-7.0.1" + sources."openapi-schema-validator-7.0.1" + sources."openapi-security-handler-7.0.1" + sources."openapi-types-7.0.1" (sources."opencollective-1.0.3" // { dependencies = [ sources."minimist-1.2.0" @@ -85079,8 +88426,8 @@ 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.37.2" - sources."tail-2.0.4" + sources."swagger-ui-dist-3.38.0" + sources."tail-2.1.1" sources."through-2.3.8" sources."tmp-0.0.33" sources."to-readable-stream-1.0.0" @@ -85266,7 +88613,7 @@ in sources."graphlib-2.1.8" sources."inherits-2.0.4" sources."isarray-1.0.0" - sources."js-yaml-3.14.0" + sources."js-yaml-3.14.1" (sources."json-refs-3.0.15" // { dependencies = [ sources."commander-4.1.1" @@ -85275,9 +88622,9 @@ in sources."lodash-4.17.20" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.44.0" - sources."mime-types-2.1.27" - sources."ms-2.1.2" + sources."mime-db-1.45.0" + sources."mime-types-2.1.28" + sources."ms-2.1.3" sources."native-promise-only-0.8.1" sources."path-loader-1.0.10" sources."process-nextick-args-2.0.1" @@ -85335,7 +88682,7 @@ in sources."lodash.omit-4.5.0" sources."logform-2.2.0" sources."lru-cache-6.0.0" - sources."ms-2.1.2" + sources."ms-2.1.3" sources."one-time-0.0.4" sources."process-nextick-args-2.0.1" sources."readable-stream-3.6.0" @@ -85370,21 +88717,21 @@ in netlify-cli = nodeEnv.buildNodePackage { name = "netlify-cli"; packageName = "netlify-cli"; - version = "2.69.1"; + version = "2.70.0"; src = fetchurl { - url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-2.69.1.tgz"; - sha512 = "e6C2UT0yt9RblWuLIQKZwR2xzwVcBX5PnDrYTsBnVaBNs6ddorpWjHm/qRx7No7CH5P7ITI8b3W4fQhOsQSo7g=="; + url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-2.70.0.tgz"; + sha512 = "VET5LUeZP2TX+xBXYQdiKkVyQfeW+HkeL7pRE2fGOi14fLE3BYSjjdmnCHDX83hgYniHIxKJBH/52zkyQ+m+2Q=="; }; dependencies = [ - sources."@babel/code-frame-7.10.4" + sources."@babel/code-frame-7.12.11" sources."@babel/compat-data-7.12.7" - (sources."@babel/core-7.12.9" // { + (sources."@babel/core-7.12.10" // { dependencies = [ sources."semver-5.7.1" ]; }) - sources."@babel/generator-7.12.5" - sources."@babel/helper-annotate-as-pure-7.10.4" + sources."@babel/generator-7.12.11" + sources."@babel/helper-annotate-as-pure-7.12.10" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.10.4" (sources."@babel/helper-compilation-targets-7.12.5" // { dependencies = [ @@ -85395,26 +88742,26 @@ in sources."@babel/helper-create-regexp-features-plugin-7.12.7" sources."@babel/helper-define-map-7.10.5" sources."@babel/helper-explode-assignable-expression-7.12.1" - sources."@babel/helper-function-name-7.10.4" - sources."@babel/helper-get-function-arity-7.10.4" + sources."@babel/helper-function-name-7.12.11" + sources."@babel/helper-get-function-arity-7.12.10" sources."@babel/helper-hoist-variables-7.10.4" sources."@babel/helper-member-expression-to-functions-7.12.7" sources."@babel/helper-module-imports-7.12.5" sources."@babel/helper-module-transforms-7.12.1" - sources."@babel/helper-optimise-call-expression-7.12.7" + sources."@babel/helper-optimise-call-expression-7.12.10" sources."@babel/helper-plugin-utils-7.10.4" sources."@babel/helper-remap-async-to-generator-7.12.1" - sources."@babel/helper-replace-supers-7.12.5" + sources."@babel/helper-replace-supers-7.12.11" sources."@babel/helper-simple-access-7.12.1" sources."@babel/helper-skip-transparent-expression-wrappers-7.12.1" - sources."@babel/helper-split-export-declaration-7.11.0" - sources."@babel/helper-validator-identifier-7.10.4" - sources."@babel/helper-validator-option-7.12.1" + sources."@babel/helper-split-export-declaration-7.12.11" + sources."@babel/helper-validator-identifier-7.12.11" + sources."@babel/helper-validator-option-7.12.11" sources."@babel/helper-wrap-function-7.12.3" sources."@babel/helpers-7.12.5" sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.12.7" - sources."@babel/plugin-proposal-async-generator-functions-7.12.1" + sources."@babel/parser-7.12.11" + sources."@babel/plugin-proposal-async-generator-functions-7.12.12" sources."@babel/plugin-proposal-class-properties-7.12.1" sources."@babel/plugin-proposal-dynamic-import-7.12.1" sources."@babel/plugin-proposal-export-namespace-from-7.12.1" @@ -85442,7 +88789,7 @@ in sources."@babel/plugin-transform-arrow-functions-7.12.1" sources."@babel/plugin-transform-async-to-generator-7.12.1" sources."@babel/plugin-transform-block-scoped-functions-7.12.1" - sources."@babel/plugin-transform-block-scoping-7.12.1" + sources."@babel/plugin-transform-block-scoping-7.12.12" sources."@babel/plugin-transform-classes-7.12.1" sources."@babel/plugin-transform-computed-properties-7.12.1" sources."@babel/plugin-transform-destructuring-7.12.1" @@ -85468,10 +88815,10 @@ in sources."@babel/plugin-transform-spread-7.12.1" sources."@babel/plugin-transform-sticky-regex-7.12.7" sources."@babel/plugin-transform-template-literals-7.12.1" - sources."@babel/plugin-transform-typeof-symbol-7.12.1" + sources."@babel/plugin-transform-typeof-symbol-7.12.10" sources."@babel/plugin-transform-unicode-escapes-7.12.1" sources."@babel/plugin-transform-unicode-regex-7.12.1" - (sources."@babel/preset-env-7.12.7" // { + (sources."@babel/preset-env-7.12.11" // { dependencies = [ sources."semver-5.7.1" ]; @@ -85479,30 +88826,38 @@ in sources."@babel/preset-modules-0.1.4" sources."@babel/runtime-7.12.5" sources."@babel/template-7.12.7" - sources."@babel/traverse-7.12.9" - sources."@babel/types-7.12.7" - sources."@bugsnag/browser-7.5.3" - sources."@bugsnag/core-7.5.3" + sources."@babel/traverse-7.12.12" + sources."@babel/types-7.12.12" + sources."@bugsnag/browser-7.5.4" + sources."@bugsnag/core-7.5.4" sources."@bugsnag/cuid-3.0.0" - sources."@bugsnag/js-7.5.3" - sources."@bugsnag/node-7.5.3" + sources."@bugsnag/js-7.5.4" + sources."@bugsnag/node-7.5.4" 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-5.5.5" // { + (sources."@netlify/build-8.0.1" // { dependencies = [ + sources."@netlify/zip-it-and-ship-it-2.0.0" + sources."ansi-styles-4.3.0" sources."chalk-3.0.0" sources."resolve-2.0.0-next.2" ]; }) sources."@netlify/cache-utils-1.0.6" - (sources."@netlify/config-2.4.1" // { + (sources."@netlify/config-2.4.3" // { dependencies = [ + sources."ansi-styles-4.3.0" sources."chalk-3.0.0" ]; }) - sources."@netlify/functions-utils-1.3.2" + (sources."@netlify/functions-utils-1.3.4" // { + dependencies = [ + sources."@netlify/zip-it-and-ship-it-2.0.0" + sources."resolve-2.0.0-next.2" + ]; + }) (sources."@netlify/git-utils-1.0.6" // { dependencies = [ sources."braces-3.0.2" @@ -85512,47 +88867,55 @@ in sources."to-regex-range-5.0.1" ]; }) - sources."@netlify/open-api-0.18.1" + sources."@netlify/open-api-1.0.0" sources."@netlify/plugin-edge-handlers-1.10.0" - sources."@netlify/plugins-list-2.0.1" + sources."@netlify/plugins-list-2.2.0" sources."@netlify/run-utils-1.0.5" sources."@netlify/traffic-mesh-agent-0.27.0" sources."@netlify/traffic-mesh-agent-darwin-x64-0.27.0" sources."@netlify/traffic-mesh-agent-linux-x64-0.27.0" sources."@netlify/traffic-mesh-agent-win32-x64-0.27.0" - (sources."@netlify/zip-it-and-ship-it-1.5.0" // { + (sources."@netlify/zip-it-and-ship-it-1.7.0" // { dependencies = [ sources."resolve-2.0.0-next.2" ]; }) - (sources."@nodelib/fs.scandir-2.1.3" // { + (sources."@nodelib/fs.scandir-2.1.4" // { dependencies = [ - sources."@nodelib/fs.stat-2.0.3" + sources."@nodelib/fs.stat-2.0.4" ]; }) sources."@nodelib/fs.stat-1.1.3" - sources."@nodelib/fs.walk-1.2.4" + sources."@nodelib/fs.walk-1.2.6" (sources."@oclif/color-0.1.2" // { dependencies = [ sources."ansi-styles-3.2.1" (sources."chalk-3.0.0" // { dependencies = [ sources."ansi-styles-4.3.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" sources."supports-color-7.2.0" ]; }) - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."has-flag-3.0.0" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."has-flag-4.0.0" sources."strip-ansi-5.2.0" - sources."supports-color-5.5.0" + (sources."supports-color-5.5.0" // { + dependencies = [ + sources."has-flag-3.0.0" + ]; + }) ]; }) (sources."@oclif/command-1.8.0" // { dependencies = [ - sources."@oclif/plugin-help-3.2.0" + sources."@oclif/plugin-help-3.2.1" sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" sources."is-fullwidth-code-point-2.0.0" sources."string-width-2.1.1" sources."strip-ansi-4.0.0" @@ -85561,7 +88924,7 @@ in }) (sources."@oclif/config-1.17.0" // { dependencies = [ - sources."@nodelib/fs.stat-2.0.3" + sources."@nodelib/fs.stat-2.0.4" sources."array-union-2.1.0" sources."braces-3.0.2" sources."dir-glob-3.0.1" @@ -85579,6 +88942,7 @@ in }) (sources."@oclif/errors-1.3.4" // { dependencies = [ + sources."ansi-styles-4.3.0" sources."clean-stack-3.0.1" sources."wrap-ansi-7.0.0" ]; @@ -85589,6 +88953,8 @@ in dependencies = [ sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" sources."emoji-regex-7.0.3" sources."is-fullwidth-code-point-2.0.0" sources."string-width-3.1.0" @@ -85611,8 +88977,9 @@ in dependencies = [ sources."ansi-styles-3.2.1" sources."cli-ux-4.9.3" + sources."color-convert-1.9.3" + sources."color-name-1.1.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."semver-5.7.1" @@ -85620,11 +88987,20 @@ in sources."supports-color-5.5.0" ]; }) - (sources."@oclif/plugin-plugins-1.9.4" // { + (sources."@oclif/plugin-plugins-1.9.5" // { dependencies = [ + sources."ansi-styles-4.3.0" + sources."chalk-4.1.0" + sources."fs-extra-9.0.1" + (sources."jsonfile-6.1.0" // { + dependencies = [ + sources."universalify-2.0.0" + ]; + }) sources."npm-run-path-4.0.1" sources."path-key-3.1.1" sources."tslib-2.0.3" + sources."universalify-1.0.0" ]; }) sources."@oclif/screen-1.0.4" @@ -85635,7 +89011,7 @@ in sources."universal-user-agent-6.0.0" ]; }) - sources."@octokit/openapi-types-2.0.0" + sources."@octokit/openapi-types-2.0.1" (sources."@octokit/plugin-paginate-rest-1.1.2" // { dependencies = [ sources."@octokit/types-2.16.2" @@ -85660,11 +89036,11 @@ in ]; }) sources."@octokit/rest-16.43.2" - sources."@octokit/types-6.1.1" + sources."@octokit/types-6.1.2" sources."@rollup/plugin-babel-5.2.2" (sources."@rollup/plugin-commonjs-15.1.0" // { dependencies = [ - sources."estree-walker-2.0.1" + sources."estree-walker-2.0.2" ]; }) sources."@rollup/plugin-inject-4.0.2" @@ -85691,7 +89067,7 @@ in sources."@types/istanbul-reports-1.1.2" sources."@types/minimatch-3.0.3" sources."@types/mkdirp-0.5.2" - sources."@types/node-14.14.10" + sources."@types/node-14.14.20" sources."@types/node-fetch-2.5.7" sources."@types/normalize-package-data-2.4.0" sources."@types/parse5-5.0.3" @@ -85699,7 +89075,7 @@ in sources."@types/semver-5.5.0" sources."@types/unist-2.0.3" sources."@types/yargs-13.0.11" - sources."@types/yargs-parser-15.0.0" + sources."@types/yargs-parser-20.2.0" sources."@typescript-eslint/typescript-estree-2.34.0" sources."@ungap/from-entries-0.2.1" (sources."abstract-leveldown-0.12.4" // { @@ -85720,12 +89096,7 @@ in }) sources."ansi-escapes-3.2.0" sources."ansi-regex-4.1.0" - (sources."ansi-styles-4.3.0" // { - dependencies = [ - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - ]; - }) + sources."ansi-styles-5.0.0" sources."ansicolors-0.3.2" sources."anymatch-3.1.1" (sources."archive-type-4.0.0" // { @@ -85733,13 +89104,14 @@ in sources."file-type-4.4.0" ]; }) - (sources."archiver-4.0.2" // { + sources."archiver-4.0.2" + (sources."archiver-utils-2.1.0" // { dependencies = [ - sources."readable-stream-3.6.0" + sources."readable-stream-2.3.7" + sources."safe-buffer-5.1.2" ]; }) - sources."archiver-utils-2.1.0" - sources."argparse-1.0.10" + sources."argparse-2.0.1" sources."arr-diff-4.0.0" sources."arr-flatten-1.1.0" sources."arr-union-3.1.0" @@ -85759,9 +89131,10 @@ in sources."ast-module-types-2.7.1" 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.804.0" // { + (sources."aws-sdk-2.821.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" @@ -85780,13 +89153,7 @@ in sources."base64-js-1.5.1" sources."before-after-hook-2.1.0" sources."binary-extensions-2.1.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."bl-4.0.3" sources."bn.js-5.1.3" (sources."body-parser-1.19.0" // { dependencies = [ @@ -85796,6 +89163,7 @@ in }) (sources."boxen-4.2.0" // { dependencies = [ + sources."ansi-styles-4.3.0" sources."chalk-3.0.0" ]; }) @@ -85811,12 +89179,8 @@ in sources."browserify-des-1.0.2" sources."browserify-fs-1.0.0" sources."browserify-rsa-4.1.0" - (sources."browserify-sign-4.2.1" // { - dependencies = [ - sources."readable-stream-3.6.0" - ]; - }) - sources."browserslist-4.15.0" + sources."browserify-sign-4.2.1" + sources."browserslist-4.16.0" sources."btoa-lite-1.0.0" sources."buffer-5.7.1" sources."buffer-alloc-1.2.0" @@ -85826,7 +89190,7 @@ in sources."buffer-fill-1.0.0" sources."buffer-from-1.1.1" sources."buffer-xor-1.0.3" - sources."builtin-modules-3.1.0" + sources."builtin-modules-3.2.0" sources."builtins-1.0.3" sources."byline-5.0.0" sources."bytes-3.1.0" @@ -85840,15 +89204,16 @@ in sources."call-bind-1.0.0" sources."call-me-maybe-1.0.1" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001165" + sources."caniuse-lite-1.0.30001173" sources."cardinal-2.1.1" sources."caw-2.0.1" sources."ccount-1.1.0" (sources."chalk-2.4.2" // { dependencies = [ sources."ansi-styles-3.2.1" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" sources."escape-string-regexp-1.0.5" - sources."has-flag-3.0.0" sources."supports-color-5.5.0" ]; }) @@ -85892,9 +89257,13 @@ in (sources."cli-ux-5.5.1" // { dependencies = [ sources."ansi-escapes-4.3.1" + sources."ansi-styles-4.3.0" + sources."argparse-1.0.10" sources."chalk-4.1.0" sources."clean-stack-3.0.1" sources."extract-stack-2.0.0" + sources."has-flag-4.0.0" + sources."js-yaml-3.14.1" sources."supports-hyperlinks-2.1.0" sources."tslib-2.0.3" sources."type-fest-0.11.0" @@ -85905,9 +89274,14 @@ in sources."clone-0.1.19" sources."clone-response-1.0.2" sources."collection-visit-1.0.0" - sources."color-3.0.0" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" + (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.4" sources."colorette-1.2.1" sources."colors-1.4.0" @@ -85918,9 +89292,19 @@ in sources."common-path-prefix-2.0.0" sources."commondir-1.0.1" sources."component-emitter-1.3.0" - sources."compress-commons-3.0.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."concat-stream-1.6.2" + (sources."concat-stream-1.6.2" // { + dependencies = [ + sources."readable-stream-2.3.7" + sources."safe-buffer-5.1.2" + ]; + }) (sources."concordance-4.0.0" // { dependencies = [ sources."semver-5.7.1" @@ -85945,10 +89329,12 @@ in (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-js-compat-3.8.0" // { + (sources."core-js-compat-3.8.2" // { dependencies = [ sources."semver-7.0.0" ]; @@ -85961,11 +89347,7 @@ in ]; }) sources."crc-3.8.0" - (sources."crc32-stream-3.0.1" // { - dependencies = [ - sources."readable-stream-3.6.0" - ]; - }) + sources."crc32-stream-3.0.1" (sources."create-ecdh-4.0.4" // { dependencies = [ sources."bn.js-4.11.9" @@ -85983,7 +89365,7 @@ in sources."crypto-random-string-2.0.0" sources."cyclist-1.0.1" sources."date-time-2.1.0" - (sources."debug-4.3.1" // { + (sources."debug-4.3.2" // { dependencies = [ sources."ms-2.1.2" ]; @@ -86005,6 +89387,8 @@ in dependencies = [ sources."bl-1.2.3" sources."file-type-5.2.0" + sources."readable-stream-2.3.7" + sources."safe-buffer-5.1.2" sources."tar-stream-1.6.2" ]; }) @@ -86090,7 +89474,7 @@ in }) sources."duplexer3-0.1.4" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.616" + sources."electron-to-chromium-1.3.634" sources."elf-cam-0.1.1" (sources."elliptic-6.5.3" // { dependencies = [ @@ -86102,11 +89486,9 @@ in sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" sources."envinfo-7.7.3" - sources."errno-0.1.7" + sources."errno-0.1.8" sources."error-ex-1.3.2" sources."error-stack-parser-2.0.6" - sources."es-abstract-1.17.7" - sources."es-to-primitive-1.2.1" sources."escalade-3.1.1" sources."escape-goat-2.1.1" sources."escape-html-1.0.3" @@ -86189,7 +89571,7 @@ in sources."fast-levenshtein-2.0.6" sources."fast-safe-stringify-2.0.7" sources."fast-stringify-1.1.2" - sources."fastq-1.9.0" + sources."fastq-1.10.0" sources."fd-slicer-1.1.0" sources."fecha-4.2.0" (sources."figures-3.2.0" // { @@ -86214,21 +89596,22 @@ in }) sources."find-up-4.1.0" sources."flatten-1.0.3" - (sources."flush-write-stream-2.0.0" // { - dependencies = [ - sources."readable-stream-3.6.0" - ]; - }) + 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."follow-redirects-1.13.1" sources."for-in-1.0.2" sources."foreach-2.0.5" 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" + (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" @@ -86246,7 +89629,7 @@ in sources."gensync-1.0.0-beta.2" sources."get-amd-module-type-3.0.0" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.0.1" + sources."get-intrinsic-1.0.2" sources."get-port-5.1.1" sources."get-proxy-2.1.0" sources."get-stream-5.2.0" @@ -86266,11 +89649,15 @@ in }) sources."glob-to-regexp-0.3.0" sources."global-cache-dir-1.0.1" - sources."global-dirs-2.0.1" + (sources."global-dirs-2.1.0" // { + dependencies = [ + sources."ini-1.3.7" + ]; + }) sources."globals-11.12.0" (sources."globby-10.0.2" // { dependencies = [ - sources."@nodelib/fs.stat-2.0.3" + sources."@nodelib/fs.stat-2.0.4" sources."array-union-2.1.0" sources."braces-3.0.2" sources."dir-glob-3.0.1" @@ -86298,7 +89685,7 @@ in sources."ansi-regex-0.2.1" ]; }) - sources."has-flag-4.0.0" + sources."has-flag-3.0.0" (sources."has-glob-1.0.0" // { dependencies = [ sources."is-glob-3.1.0" @@ -86314,11 +89701,7 @@ in ]; }) sources."has-yarn-2.1.0" - (sources."hash-base-3.1.0" // { - dependencies = [ - sources."readable-stream-3.6.0" - ]; - }) + sources."hash-base-3.1.0" sources."hash.js-1.1.7" (sources."hasha-5.2.2" // { dependencies = [ @@ -86370,7 +89753,7 @@ in sources."indexof-0.0.1" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."ini-1.3.5" + sources."ini-1.3.8" (sources."inquirer-6.5.2" // { dependencies = [ sources."ansi-regex-3.0.0" @@ -86392,6 +89775,7 @@ in (sources."inquirer-autocomplete-prompt-1.3.0" // { dependencies = [ sources."ansi-escapes-4.3.1" + sources."ansi-styles-4.3.0" sources."chalk-4.1.0" sources."type-fest-0.11.0" ]; @@ -86403,11 +89787,9 @@ in sources."is-arrayish-0.2.1" sources."is-binary-path-2.1.0" sources."is-buffer-1.1.6" - sources."is-callable-1.2.2" sources."is-ci-2.0.0" sources."is-core-module-2.2.0" sources."is-data-descriptor-1.0.0" - sources."is-date-object-1.0.2" sources."is-descriptor-1.0.2" sources."is-docker-2.1.1" sources."is-extendable-0.1.1" @@ -86418,7 +89800,6 @@ in sources."is-interactive-1.0.0" sources."is-module-1.0.0" sources."is-natural-number-4.0.1" - sources."is-negative-zero-2.0.1" sources."is-npm-4.0.0" (sources."is-number-3.0.0" // { dependencies = [ @@ -86432,10 +89813,8 @@ in sources."is-plain-obj-2.1.0" sources."is-plain-object-2.0.4" sources."is-reference-1.2.1" - sources."is-regex-1.1.1" sources."is-retry-allowed-1.2.0" sources."is-stream-1.1.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" @@ -86457,7 +89836,7 @@ in 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."js-yaml-4.0.0" sources."jsesc-2.5.2" sources."json-buffer-3.0.0" sources."json-parse-better-errors-1.0.2" @@ -86472,11 +89851,16 @@ in sources."kuler-2.0.0" (sources."lambda-local-1.7.4" // { dependencies = [ - sources."commander-6.2.0" + sources."commander-6.2.1" ]; }) sources."latest-version-5.1.0" - sources."lazystream-1.0.0" + (sources."lazystream-1.0.0" // { + dependencies = [ + sources."readable-stream-2.3.7" + sources."safe-buffer-5.1.2" + ]; + }) (sources."level-blobs-0.1.7" // { dependencies = [ sources."isarray-0.0.1" @@ -86510,6 +89894,7 @@ in }) (sources."levelup-0.18.6" // { dependencies = [ + sources."bl-0.8.2" sources."isarray-0.0.1" sources."prr-0.0.0" sources."readable-stream-1.0.34" @@ -86550,13 +89935,14 @@ in sources."lodash.uniq-4.5.0" (sources."log-process-errors-5.1.2" // { dependencies = [ + sources."ansi-styles-4.3.0" sources."chalk-3.0.0" ]; }) sources."log-symbols-3.0.0" (sources."logform-2.2.0" // { dependencies = [ - sources."ms-2.1.2" + sources."ms-2.1.3" ]; }) sources."lowercase-keys-1.0.1" @@ -86596,8 +89982,8 @@ in ]; }) sources."mime-1.6.0" - sources."mime-db-1.44.0" - sources."mime-types-2.1.27" + sources."mime-db-1.45.0" + sources."mime-types-2.1.28" sources."mimic-fn-3.1.0" sources."mimic-response-1.0.1" sources."minimalistic-assert-1.0.1" @@ -86635,22 +90021,30 @@ in sources."natural-orderby-2.0.3" sources."negotiator-0.6.2" sources."nested-error-stacks-2.1.0" - (sources."netlify-4.9.0" // { + (sources."netlify-6.0.9" // { dependencies = [ + sources."@netlify/zip-it-and-ship-it-2.0.0" sources."qs-6.9.4" + sources."resolve-2.0.0-next.2" ]; }) sources."netlify-plugin-deploy-preview-commenting-0.0.1-alpha.16" (sources."netlify-redirect-parser-2.5.0" // { dependencies = [ sources."@netlify/config-0.11.11" + sources."@netlify/open-api-0.18.1" + sources."ansi-styles-4.3.0" + sources."argparse-1.0.10" sources."chalk-3.0.0" + sources."js-yaml-3.14.1" + sources."netlify-4.9.0" + sources."qs-6.9.4" ]; }) sources."netlify-redirector-0.2.1" sources."nice-try-1.0.5" sources."node-fetch-2.6.1" - sources."node-releases-1.1.67" + sources."node-releases-1.1.69" sources."node-source-walk-4.2.0" sources."noop2-2.0.0" (sources."normalize-package-data-2.5.0" // { @@ -86680,16 +90074,10 @@ in sources."kind-of-3.2.2" ]; }) - sources."object-inspect-1.9.0" sources."object-keys-1.1.1" - sources."object-treeify-1.1.30" + sources."object-treeify-1.1.31" sources."object-visit-1.0.1" sources."object.assign-4.1.2" - (sources."object.getownpropertydescriptors-2.1.1" // { - dependencies = [ - sources."es-abstract-1.18.0-next.1" - ]; - }) sources."object.pick-1.3.0" sources."octal-1.0.0" sources."octokit-pagination-methods-1.1.0" @@ -86712,6 +90100,7 @@ in sources."optionator-0.8.3" (sources."ora-4.1.1" // { dependencies = [ + sources."ansi-styles-4.3.0" sources."chalk-3.0.0" sources."cli-cursor-3.1.0" sources."mute-stream-0.0.8" @@ -86740,13 +90129,18 @@ in sources."p-reduce-2.1.0" sources."p-timeout-3.2.0" sources."p-try-2.2.0" - sources."p-wait-for-3.1.0" + sources."p-wait-for-3.2.0" (sources."package-json-6.5.0" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."parallel-transform-1.2.0" + (sources."parallel-transform-1.2.0" // { + dependencies = [ + sources."readable-stream-2.3.7" + sources."safe-buffer-5.1.2" + ]; + }) sources."parse-asn1-5.1.6" sources."parse-github-repo-url-1.4.1" sources."parse-github-url-1.0.2" @@ -86774,7 +90168,6 @@ in sources."posix-character-classes-0.1.1" (sources."postcss-7.0.35" // { dependencies = [ - sources."has-flag-3.0.0" sources."source-map-0.6.1" sources."supports-color-6.1.0" ]; @@ -86787,6 +90180,8 @@ in (sources."pretty-format-24.9.0" // { dependencies = [ sources."ansi-styles-3.2.1" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" ]; }) sources."pretty-ms-5.1.0" @@ -86826,11 +90221,7 @@ in ]; }) sources."read-pkg-up-7.0.1" - (sources."readable-stream-2.3.7" // { - dependencies = [ - sources."safe-buffer-5.1.2" - ]; - }) + sources."readable-stream-3.6.0" sources."readdirp-3.5.0" sources."redeyed-2.1.1" sources."regenerate-1.4.2" @@ -86852,7 +90243,6 @@ in sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" - sources."replace-ext-1.0.0" sources."require-directory-2.1.1" sources."require-main-filename-2.0.0" sources."require-package-name-2.0.1" @@ -86870,7 +90260,7 @@ in sources."reusify-1.0.4" sources."rimraf-3.0.2" sources."ripemd160-2.0.2" - sources."rollup-2.34.1" + sources."rollup-2.36.0" sources."rollup-plugin-node-builtins-2.1.2" sources."rollup-plugin-terser-7.0.2" sources."run-async-2.4.1" @@ -87005,8 +90395,6 @@ in sources."strict-uri-encode-1.1.0" sources."string-range-1.2.2" sources."string-width-4.2.0" - sources."string.prototype.trimend-1.0.3" - sources."string.prototype.trimstart-1.0.3" (sources."string_decoder-1.1.1" // { dependencies = [ sources."safe-buffer-5.1.2" @@ -87029,7 +90417,11 @@ in sources."escape-string-regexp-1.0.5" ]; }) - sources."supports-color-7.2.0" + (sources."supports-color-7.2.0" // { + dependencies = [ + sources."has-flag-4.0.0" + ]; + }) (sources."supports-hyperlinks-1.0.1" // { dependencies = [ sources."has-flag-2.0.0" @@ -87040,12 +90432,7 @@ in }) ]; }) - (sources."tar-stream-2.1.4" // { - dependencies = [ - sources."bl-4.0.3" - sources."readable-stream-3.6.0" - ]; - }) + sources."tar-stream-2.2.0" sources."temp-dir-1.0.0" (sources."tempy-0.3.0" // { dependencies = [ @@ -87062,7 +90449,12 @@ in }) sources."text-hex-1.0.0" sources."through-2.3.8" - sources."through2-2.0.5" + (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" @@ -87091,7 +90483,7 @@ in sources."triple-beam-1.3.0" sources."trough-1.0.5" sources."tslib-1.14.1" - sources."tsutils-3.17.1" + sources."tsutils-3.18.0" sources."tunnel-agent-0.6.0" sources."type-check-0.3.2" sources."type-fest-0.8.1" @@ -87137,6 +90529,7 @@ in }) (sources."update-notifier-4.1.3" // { dependencies = [ + sources."ansi-styles-4.3.0" sources."chalk-3.0.0" ]; }) @@ -87146,13 +90539,12 @@ in 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-8.3.1" + sources."uuid-8.3.2" sources."validate-npm-package-license-3.0.4" sources."validate-npm-package-name-3.0.0" sources."vary-1.1.2" - (sources."vfile-4.2.0" // { + (sources."vfile-4.2.1" // { dependencies = [ sources."is-buffer-2.0.5" ]; @@ -87179,12 +90571,20 @@ in (sources."winston-3.3.3" // { dependencies = [ sources."is-stream-2.0.0" - sources."readable-stream-3.6.0" ]; }) - sources."winston-transport-4.4.0" + (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" + (sources."wrap-ansi-6.2.0" // { + dependencies = [ + sources."ansi-styles-4.3.0" + ]; + }) sources."wrappy-1.0.2" (sources."write-file-atomic-3.0.3" // { dependencies = [ @@ -87201,11 +90601,7 @@ in sources."yargs-parser-18.1.3" sources."yarn-1.22.10" sources."yauzl-2.10.0" - (sources."zip-stream-3.0.1" // { - dependencies = [ - sources."readable-stream-3.6.0" - ]; - }) + sources."zip-stream-3.0.1" ]; buildInputs = globalBuildInputs; meta = { @@ -87302,8 +90698,8 @@ in sources."json-stringify-safe-5.0.1" sources."jsprim-1.4.1" sources."lru-cache-6.0.0" - sources."mime-db-1.44.0" - sources."mime-types-2.1.27" + sources."mime-db-1.45.0" + sources."mime-types-2.1.28" sources."minimatch-3.0.4" sources."minipass-3.1.3" sources."minizlib-2.1.2" @@ -87481,7 +90877,7 @@ in sources."indent-string-2.1.0" sources."inflight-1.0.6" sources."inherits-2.0.3" - sources."ini-1.3.5" + sources."ini-1.3.8" sources."invert-kv-1.0.0" sources."ipaddr.js-1.9.1" sources."is-arrayish-0.2.1" @@ -87513,8 +90909,8 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.44.0" - sources."mime-types-2.1.27" + sources."mime-db-1.45.0" + sources."mime-types-2.1.28" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-0.5.5" @@ -87659,7 +91055,7 @@ in }) sources."xmldom-0.1.31" sources."xtend-4.0.2" - sources."y18n-3.2.1" + sources."y18n-3.2.2" sources."yargs-3.32.0" ]; buildInputs = globalBuildInputs; @@ -87674,10 +91070,10 @@ in node-pre-gyp = nodeEnv.buildNodePackage { name = "node-pre-gyp"; packageName = "node-pre-gyp"; - version = "0.16.0"; + version = "0.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.16.0.tgz"; - sha512 = "4efGA+X/YXAHLi1hN8KaPrILULaUn2nWecFrn1k2I+99HpoyvcOGEbtcOxpDiUwPF2ZANMJDh32qwOUPenuR1g=="; + url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.17.0.tgz"; + sha512 = "abzZt1hmOjkZez29ppg+5gGqdPLUuJeAEwVPtHYEJgx0qzttCbcKFpxrCQn2HYbwCv2c+7JwH4BgEzFkUGpn4A=="; }; dependencies = [ sources."abbrev-1.1.1" @@ -87704,7 +91100,7 @@ in sources."ignore-walk-3.0.3" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."ini-1.3.5" + sources."ini-1.3.8" sources."is-fullwidth-code-point-1.0.0" sources."isarray-1.0.0" sources."minimatch-3.0.4" @@ -87712,7 +91108,7 @@ in sources."minipass-2.9.0" sources."minizlib-1.3.3" sources."mkdirp-0.5.5" - sources."ms-2.1.2" + sources."ms-2.1.3" sources."needle-2.5.2" sources."nopt-4.0.3" sources."npm-bundled-1.1.1" @@ -87789,12 +91185,13 @@ in sources."accepts-1.3.7" (sources."agent-base-6.0.2" // { dependencies = [ - sources."debug-4.3.1" + sources."debug-4.3.2" sources."ms-2.1.2" ]; }) sources."ajv-6.12.6" - sources."ansi-regex-2.1.1" + sources."ansi-regex-5.0.0" + sources."ansi-styles-3.2.1" sources."append-field-1.0.0" sources."aproba-1.2.0" (sources."are-we-there-yet-1.1.5" // { @@ -87855,12 +91252,14 @@ in sources."bytes-3.1.0" sources."callback-stream-1.1.0" sources."caseless-0.12.0" + sources."chalk-2.4.2" sources."cheerio-0.22.0" sources."chownr-2.0.0" - sources."cli-table-0.3.1" + sources."cli-table-0.3.4" sources."clone-2.1.2" sources."code-point-at-1.1.0" - sources."colors-1.0.3" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" sources."combined-stream-1.0.8" sources."commist-1.1.0" sources."concat-map-0.0.1" @@ -87911,10 +91310,12 @@ in }) sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" + sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" sources."entities-1.1.2" sources."escape-html-1.0.3" + sources."escape-string-regexp-1.0.5" sources."esprima-4.0.1" sources."etag-1.8.1" (sources."express-4.17.1" // { @@ -87945,7 +91346,14 @@ in sources."fs-minipass-2.1.0" sources."fs.notify-0.0.4" sources."fs.realpath-1.0.0" - sources."gauge-2.7.4" + (sources."gauge-2.7.4" // { + dependencies = [ + sources."ansi-regex-2.1.1" + sources."is-fullwidth-code-point-1.0.0" + sources."string-width-1.0.2" + sources."strip-ansi-3.0.1" + ]; + }) sources."getpass-0.1.7" sources."glob-7.1.6" sources."glob-parent-3.1.0" @@ -87960,6 +91368,7 @@ in sources."graceful-fs-4.2.4" sources."har-schema-2.0.0" sources."har-validator-5.1.5" + sources."has-flag-3.0.0" sources."has-unicode-2.0.1" sources."hash-sum-2.0.0" sources."help-me-1.1.0" @@ -87973,7 +91382,7 @@ in sources."http-signature-1.2.0" (sources."https-proxy-agent-5.0.0" // { dependencies = [ - sources."debug-4.3.1" + sources."debug-4.3.2" sources."ms-2.1.2" ]; }) @@ -87983,11 +91392,11 @@ in sources."ignore-walk-3.0.3" sources."inflight-1.0.6" sources."inherits-2.0.3" - sources."ini-1.3.5" + sources."ini-1.3.8" sources."ipaddr.js-1.9.1" sources."is-absolute-1.0.0" sources."is-extglob-2.1.1" - sources."is-fullwidth-code-point-1.0.0" + sources."is-fullwidth-code-point-3.0.0" sources."is-glob-3.1.0" sources."is-negated-glob-1.0.0" sources."is-relative-1.0.0" @@ -88024,15 +91433,15 @@ in sources."media-typer-0.3.0" (sources."memorystore-1.6.4" // { dependencies = [ - sources."debug-4.3.1" + sources."debug-4.3.2" sources."ms-2.1.2" ]; }) sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-2.4.6" - sources."mime-db-1.44.0" - sources."mime-types-2.1.27" + sources."mime-db-1.45.0" + sources."mime-types-2.1.28" sources."minimatch-3.0.4" sources."minimist-1.2.5" (sources."minipass-3.1.3" // { @@ -88051,16 +91460,16 @@ in (sources."mqtt-4.2.6" // { dependencies = [ sources."concat-stream-2.0.0" - sources."debug-4.3.1" + sources."debug-4.3.2" sources."ms-2.1.2" sources."readable-stream-3.6.0" sources."string_decoder-1.3.0" - sources."ws-7.4.1" + sources."ws-7.4.2" ]; }) (sources."mqtt-packet-6.7.0" // { dependencies = [ - sources."debug-4.3.1" + sources."debug-4.3.2" sources."ms-2.1.2" ]; }) @@ -88072,7 +91481,7 @@ in (sources."needle-2.5.2" // { dependencies = [ sources."debug-3.2.7" - sources."ms-2.1.2" + sources."ms-2.1.3" ]; }) sources."negotiator-0.6.2" @@ -88182,11 +91591,12 @@ in sources."statuses-1.5.0" sources."stream-shift-1.0.1" sources."streamsearch-0.1.2" - sources."string-width-1.0.2" + sources."string-width-4.2.0" sources."string_decoder-0.10.31" - sources."strip-ansi-3.0.1" + sources."strip-ansi-6.0.0" sources."strip-json-comments-2.0.1" - sources."tail-2.0.4" + sources."supports-color-5.5.0" + sources."tail-2.1.1" (sources."tar-6.0.5" // { dependencies = [ sources."mkdirp-1.0.4" @@ -88228,7 +91638,14 @@ in sources."vary-1.1.2" sources."verror-1.10.0" sources."when-3.7.8" - sources."wide-align-1.1.3" + (sources."wide-align-1.1.3" // { + dependencies = [ + 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."wrappy-1.0.2" sources."ws-6.2.1" sources."xml2js-0.4.23" @@ -88318,7 +91735,7 @@ in sources."http-signature-1.2.0" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."ini-1.3.5" + sources."ini-1.3.8" sources."is-core-module-2.2.0" sources."is-fullwidth-code-point-1.0.0" sources."is-typedarray-1.0.0" @@ -88330,8 +91747,8 @@ in sources."json-stringify-safe-5.0.1" sources."jsonfile-1.0.1" sources."jsprim-1.4.1" - sources."mime-db-1.44.0" - sources."mime-types-2.1.27" + sources."mime-db-1.45.0" + sources."mime-types-2.1.28" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."minipass-3.1.3" @@ -88499,7 +91916,7 @@ in sources."fsevents-2.1.3" sources."get-stream-4.1.0" sources."glob-parent-5.1.1" - sources."global-dirs-2.0.1" + sources."global-dirs-2.1.0" sources."got-9.6.0" sources."graceful-fs-4.2.4" sources."has-flag-3.0.0" @@ -88508,7 +91925,7 @@ in sources."ignore-by-default-1.0.1" sources."import-lazy-2.1.0" sources."imurmurhash-0.1.4" - sources."ini-1.3.5" + sources."ini-1.3.7" sources."is-binary-path-2.1.0" sources."is-ci-2.0.0" sources."is-extglob-2.1.1" @@ -88533,7 +91950,7 @@ in sources."mimic-response-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" - sources."ms-2.1.2" + sources."ms-2.1.3" sources."nopt-1.0.10" sources."normalize-path-3.0.0" sources."normalize-url-4.5.0" @@ -88602,13 +92019,537 @@ in bypassCache = true; reconstructLock = true; }; + np = nodeEnv.buildNodePackage { + name = "np"; + packageName = "np"; + version = "7.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/np/-/np-7.2.0.tgz"; + sha512 = "jfMFJXAJlGkCowMPGzA8Ywbmywk7I9hT96DsOcWjDsjq/zP5h6m3VZDcZ1AWYoCBPg4E/lFrJxROmiQH3OWnzA=="; + }; + dependencies = [ + sources."@babel/code-frame-7.12.11" + sources."@babel/helper-validator-identifier-7.12.11" + (sources."@babel/highlight-7.10.4" // { + 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."escape-string-regexp-1.0.5" + sources."has-flag-3.0.0" + sources."supports-color-5.5.0" + ]; + }) + sources."@nodelib/fs.scandir-2.1.4" + sources."@nodelib/fs.stat-2.0.4" + sources."@nodelib/fs.walk-1.2.6" + (sources."@samverschueren/stream-to-observable-0.3.1" // { + dependencies = [ + sources."any-observable-0.3.0" + ]; + }) + sources."@sindresorhus/is-2.1.1" + sources."@szmarczak/http-timer-4.0.5" + sources."@types/cacheable-request-6.0.1" + sources."@types/http-cache-semantics-4.0.0" + sources."@types/keyv-3.1.1" + sources."@types/minimist-1.2.1" + sources."@types/node-14.14.20" + sources."@types/normalize-package-data-2.4.0" + sources."@types/parse-json-4.0.0" + sources."@types/responselike-1.0.0" + sources."aggregate-error-3.1.0" + (sources."ansi-align-3.0.0" // { + dependencies = [ + sources."ansi-regex-4.1.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."ansi-escapes-4.3.1" + sources."ansi-regex-5.0.0" + sources."ansi-styles-4.3.0" + sources."any-observable-0.5.1" + sources."array-union-2.1.0" + sources."arrify-1.0.1" + sources."async-exit-hook-2.0.1" + sources."balanced-match-1.0.0" + (sources."boxen-4.2.0" // { + dependencies = [ + sources."chalk-3.0.0" + sources."type-fest-0.8.1" + ]; + }) + sources."brace-expansion-1.1.11" + sources."braces-3.0.2" + sources."builtins-1.0.3" + sources."cacheable-lookup-2.0.1" + (sources."cacheable-request-7.0.1" // { + dependencies = [ + sources."get-stream-5.2.0" + ]; + }) + sources."callsites-3.1.0" + sources."camelcase-5.3.1" + sources."camelcase-keys-6.2.2" + sources."chalk-4.1.0" + sources."chardet-0.7.0" + sources."ci-info-2.0.0" + sources."clean-stack-2.2.0" + sources."cli-boxes-2.2.1" + sources."cli-cursor-3.1.0" + (sources."cli-truncate-0.2.1" // { + dependencies = [ + sources."ansi-regex-2.1.1" + sources."is-fullwidth-code-point-1.0.0" + sources."string-width-1.0.2" + sources."strip-ansi-3.0.1" + ]; + }) + sources."cli-width-3.0.0" + (sources."clone-response-1.0.2" // { + dependencies = [ + sources."mimic-response-1.0.1" + ]; + }) + sources."code-point-at-1.1.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."concat-map-0.0.1" + (sources."configstore-5.0.1" // { + dependencies = [ + sources."dot-prop-5.3.0" + ]; + }) + sources."cosmiconfig-7.0.0" + sources."cross-spawn-7.0.3" + sources."crypto-random-string-2.0.0" + sources."date-fns-1.30.1" + sources."decamelize-1.2.0" + (sources."decamelize-keys-1.1.0" // { + dependencies = [ + sources."map-obj-1.0.1" + ]; + }) + sources."decompress-response-5.0.0" + sources."deep-extend-0.6.0" + sources."defer-to-connect-2.0.0" + sources."del-6.0.0" + sources."dir-glob-3.0.1" + sources."dot-prop-6.0.1" + sources."duplexer3-0.1.4" + sources."elegant-spinner-1.0.1" + sources."emoji-regex-8.0.0" + sources."end-of-stream-1.4.4" + sources."error-ex-1.3.2" + sources."escape-goat-3.0.0" + sources."escape-string-regexp-4.0.0" + sources."execa-5.0.0" + sources."external-editor-3.1.0" + sources."fast-glob-3.2.4" + sources."fastq-1.10.0" + (sources."figures-3.2.0" // { + dependencies = [ + sources."escape-string-regexp-1.0.5" + ]; + }) + sources."fill-range-7.0.1" + sources."find-up-4.1.0" + sources."fs.realpath-1.0.0" + sources."function-bind-1.1.1" + sources."get-stream-6.0.0" + sources."github-url-from-git-1.5.0" + sources."glob-7.1.6" + sources."glob-parent-5.1.1" + sources."global-dirs-2.1.0" + sources."globby-11.0.1" + (sources."got-10.7.0" // { + dependencies = [ + sources."get-stream-5.2.0" + sources."type-fest-0.10.0" + ]; + }) + sources."graceful-fs-4.2.4" + sources."hard-rejection-2.1.0" + sources."has-1.0.3" + (sources."has-ansi-2.0.0" // { + dependencies = [ + sources."ansi-regex-2.1.1" + ]; + }) + sources."has-flag-4.0.0" + sources."has-yarn-2.1.0" + sources."hosted-git-info-3.0.7" + sources."http-cache-semantics-4.1.0" + sources."human-signals-2.1.0" + sources."iconv-lite-0.4.24" + sources."ignore-5.1.8" + sources."ignore-walk-3.0.3" + sources."import-fresh-3.3.0" + sources."import-lazy-2.1.0" + (sources."import-local-3.0.2" // { + dependencies = [ + sources."pkg-dir-4.2.0" + ]; + }) + sources."imurmurhash-0.1.4" + sources."indent-string-4.0.0" + sources."inflight-1.0.6" + sources."inherits-2.0.4" + sources."ini-1.3.7" + sources."inquirer-7.3.3" + (sources."inquirer-autosubmit-prompt-0.2.0" // { + dependencies = [ + sources."ansi-escapes-3.2.0" + sources."ansi-regex-3.0.0" + sources."ansi-styles-3.2.1" + sources."chalk-2.4.2" + sources."cli-cursor-2.1.0" + sources."cli-width-2.2.1" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."escape-string-regexp-1.0.5" + sources."figures-2.0.0" + sources."has-flag-3.0.0" + sources."inquirer-6.5.2" + sources."is-fullwidth-code-point-2.0.0" + sources."mute-stream-0.0.7" + sources."onetime-2.0.1" + sources."restore-cursor-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."supports-color-5.5.0" + ]; + }) + sources."is-arrayish-0.2.1" + sources."is-ci-2.0.0" + sources."is-core-module-2.2.0" + sources."is-docker-2.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-interactive-1.0.0" + sources."is-npm-5.0.0" + sources."is-number-7.0.0" + sources."is-obj-2.0.0" + (sources."is-observable-1.1.0" // { + dependencies = [ + sources."symbol-observable-1.2.0" + ]; + }) + sources."is-path-cwd-2.2.0" + sources."is-path-inside-3.0.2" + sources."is-plain-obj-1.1.0" + sources."is-promise-2.2.2" + sources."is-scoped-2.1.0" + sources."is-stream-2.0.0" + sources."is-typedarray-1.0.0" + sources."is-url-superb-4.0.0" + sources."is-wsl-2.2.0" + sources."is-yarn-global-0.3.0" + sources."isexe-2.0.0" + sources."issue-regex-3.1.0" + sources."js-tokens-4.0.0" + sources."json-buffer-3.0.1" + sources."json-parse-even-better-errors-2.3.1" + sources."keyv-4.0.3" + sources."kind-of-6.0.3" + sources."latest-version-5.1.0" + sources."lines-and-columns-1.1.6" + (sources."listr-0.14.3" // { + dependencies = [ + sources."is-stream-1.1.0" + sources."p-map-2.1.0" + ]; + }) + sources."listr-input-0.2.1" + sources."listr-silent-renderer-1.1.1" + (sources."listr-update-renderer-0.5.0" // { + dependencies = [ + sources."ansi-regex-2.1.1" + sources."ansi-styles-2.2.1" + sources."chalk-1.1.3" + sources."escape-string-regexp-1.0.5" + sources."figures-1.7.0" + sources."indent-string-3.2.0" + sources."log-symbols-1.0.2" + sources."strip-ansi-3.0.1" + sources."supports-color-2.0.0" + ]; + }) + (sources."listr-verbose-renderer-0.5.0" // { + dependencies = [ + sources."ansi-styles-3.2.1" + sources."chalk-2.4.2" + sources."cli-cursor-2.1.0" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."escape-string-regexp-1.0.5" + sources."figures-2.0.0" + sources."has-flag-3.0.0" + sources."onetime-2.0.1" + sources."restore-cursor-2.0.0" + sources."supports-color-5.5.0" + ]; + }) + sources."locate-path-5.0.0" + sources."lodash-4.17.20" + sources."lodash.isequal-4.5.0" + sources."lodash.zip-4.2.0" + sources."log-symbols-4.0.0" + (sources."log-update-2.3.0" // { + dependencies = [ + sources."ansi-escapes-3.2.0" + sources."cli-cursor-2.1.0" + sources."onetime-2.0.1" + sources."restore-cursor-2.0.0" + ]; + }) + sources."lowercase-keys-2.0.0" + sources."lru-cache-6.0.0" + (sources."make-dir-3.1.0" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) + sources."map-age-cleaner-0.1.3" + sources."map-obj-4.1.0" + (sources."mem-6.1.1" // { + dependencies = [ + sources."mimic-fn-3.1.0" + ]; + }) + (sources."meow-8.1.0" // { + dependencies = [ + sources."type-fest-0.18.1" + ]; + }) + sources."merge-stream-2.0.0" + sources."merge2-1.4.1" + sources."micromatch-4.0.2" + sources."mimic-fn-1.2.0" + sources."mimic-response-2.1.0" + sources."min-indent-1.0.1" + sources."minimatch-3.0.4" + sources."minimist-1.2.5" + sources."minimist-options-4.1.0" + sources."mute-stream-0.0.8" + (sources."new-github-release-url-1.0.0" // { + dependencies = [ + sources."type-fest-0.4.1" + ]; + }) + sources."normalize-package-data-3.0.0" + sources."normalize-url-4.5.0" + (sources."npm-name-6.0.1" // { + dependencies = [ + sources."p-map-3.0.0" + ]; + }) + sources."npm-run-path-4.0.1" + sources."number-is-nan-1.0.1" + sources."object-assign-4.1.1" + sources."once-1.4.0" + (sources."onetime-5.1.2" // { + dependencies = [ + sources."mimic-fn-2.1.0" + ]; + }) + sources."open-7.3.0" + sources."org-regex-1.0.0" + sources."os-tmpdir-1.0.2" + (sources."ow-0.21.0" // { + dependencies = [ + sources."@sindresorhus/is-4.0.0" + sources."type-fest-0.20.2" + ]; + }) + sources."p-cancelable-2.0.0" + sources."p-defer-1.0.0" + (sources."p-event-4.2.0" // { + dependencies = [ + sources."p-timeout-3.2.0" + ]; + }) + sources."p-finally-1.0.0" + sources."p-limit-2.3.0" + sources."p-locate-4.1.0" + sources."p-map-4.0.0" + (sources."p-memoize-4.0.1" // { + dependencies = [ + sources."mimic-fn-3.1.0" + ]; + }) + sources."p-timeout-4.1.0" + sources."p-try-2.2.0" + (sources."package-json-6.5.0" // { + dependencies = [ + sources."@sindresorhus/is-0.14.0" + sources."@szmarczak/http-timer-1.1.2" + (sources."cacheable-request-6.1.0" // { + dependencies = [ + sources."get-stream-5.2.0" + sources."lowercase-keys-2.0.0" + ]; + }) + sources."decompress-response-3.3.0" + sources."defer-to-connect-1.1.3" + sources."get-stream-4.1.0" + sources."got-9.6.0" + sources."json-buffer-3.0.0" + sources."keyv-3.1.0" + sources."lowercase-keys-1.0.1" + sources."mimic-response-1.0.1" + sources."p-cancelable-1.1.0" + sources."responselike-1.0.2" + sources."semver-6.3.0" + sources."to-readable-stream-1.0.0" + ]; + }) + sources."parent-module-1.0.1" + sources."parse-json-5.1.0" + 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-type-4.0.0" + sources."picomatch-2.2.2" + (sources."pkg-dir-5.0.0" // { + dependencies = [ + sources."find-up-5.0.0" + sources."locate-path-6.0.0" + sources."p-limit-3.1.0" + sources."p-locate-5.0.0" + ]; + }) + sources."prepend-http-2.0.0" + sources."pump-3.0.0" + (sources."pupa-2.1.1" // { + dependencies = [ + sources."escape-goat-2.1.1" + ]; + }) + sources."quick-lru-4.0.1" + sources."rc-1.2.8" + (sources."read-pkg-5.2.0" // { + dependencies = [ + sources."hosted-git-info-2.8.8" + sources."normalize-package-data-2.5.0" + sources."semver-5.7.1" + sources."type-fest-0.6.0" + ]; + }) + (sources."read-pkg-up-7.0.1" // { + dependencies = [ + sources."type-fest-0.8.1" + ]; + }) + sources."redent-3.0.0" + sources."registry-auth-token-4.2.1" + sources."registry-url-5.1.0" + sources."resolve-1.19.0" + (sources."resolve-cwd-3.0.0" // { + dependencies = [ + sources."resolve-from-5.0.0" + ]; + }) + sources."resolve-from-4.0.0" + sources."responselike-2.0.0" + sources."restore-cursor-3.1.0" + sources."reusify-1.0.4" + sources."rimraf-3.0.2" + sources."run-async-2.4.1" + sources."run-parallel-1.1.10" + sources."rxjs-6.6.3" + sources."safer-buffer-2.1.2" + sources."scoped-regex-2.1.0" + sources."semver-7.3.4" + (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" + sources."slash-3.0.0" + sources."slice-ansi-0.0.4" + sources."spdx-correct-3.1.1" + sources."spdx-exceptions-2.3.0" + sources."spdx-expression-parse-3.0.1" + sources."spdx-license-ids-3.0.7" + sources."split-1.0.1" + sources."string-width-4.2.0" + sources."strip-ansi-6.0.0" + sources."strip-final-newline-2.0.0" + sources."strip-indent-3.0.0" + sources."strip-json-comments-2.0.1" + sources."supports-color-7.2.0" + sources."supports-hyperlinks-2.1.0" + sources."symbol-observable-3.0.0" + sources."term-size-2.2.1" + sources."terminal-link-2.1.1" + sources."through-2.3.8" + sources."tmp-0.0.33" + sources."to-readable-stream-2.1.0" + sources."to-regex-range-5.0.1" + sources."trim-newlines-3.0.0" + sources."tslib-1.14.1" + sources."type-fest-0.11.0" + sources."typedarray-to-buffer-3.1.5" + sources."unique-string-2.0.0" + sources."update-notifier-5.0.1" + sources."url-parse-lax-3.0.0" + sources."vali-date-1.0.0" + sources."validate-npm-package-license-3.0.4" + sources."validate-npm-package-name-3.0.0" + sources."which-2.0.2" + sources."widest-line-3.1.0" + (sources."wrap-ansi-3.0.1" // { + dependencies = [ + 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."wrappy-1.0.2" + sources."write-file-atomic-3.0.3" + sources."xdg-basedir-4.0.0" + sources."yallist-4.0.0" + sources."yaml-1.10.0" + sources."yargs-parser-20.2.4" + sources."yocto-queue-0.1.0" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "A better `npm publish`"; + homepage = "https://github.com/sindresorhus/np#readme"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; npm = nodeEnv.buildNodePackage { name = "npm"; packageName = "npm"; - version = "6.14.9"; + version = "6.14.10"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-6.14.9.tgz"; - sha512 = "yHi1+i9LyAZF1gAmgyYtVk+HdABlLy94PMIDoK1TRKWvmFQAt5z3bodqVwKvzY0s6dLqQPVsRLiwhJfNtiHeCg=="; + url = "https://registry.npmjs.org/npm/-/npm-6.14.10.tgz"; + sha512 = "FT23Qy/JMA+qxEYReMOr1MY7642fKn8Onn+72LASPi872Owvmw0svm+/DXTHOC3yO9CheEO+EslyXEpdBdRtIA=="; }; buildInputs = globalBuildInputs; meta = { @@ -88623,10 +92564,10 @@ in npm-check-updates = nodeEnv.buildNodePackage { name = "npm-check-updates"; packageName = "npm-check-updates"; - version = "10.2.2"; + version = "10.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-10.2.2.tgz"; - sha512 = "xyE1PUTu4xarVDRXCA0HYd92rT3zd87GIixczM/TCkwN12/31yVD/8dOyXtgNA8fpIuvhjrfX7n4cV0OTCa9hg=="; + url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-10.2.5.tgz"; + sha512 = "R0BN+MqE6T12k0iGivF0WKfn3tuaeQuCai0haVvmsr7GcoPXU+yrlHxl9aFlO2XZ6z4m+pCd107YnbJDcRAf8Q=="; }; dependencies = [ sources."@npmcli/ci-detect-1.3.0" @@ -88647,12 +92588,13 @@ in (sources."ansi-align-3.0.0" // { dependencies = [ sources."ansi-regex-4.1.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."ansi-regex-2.1.1" + sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" sources."aproba-1.2.0" sources."are-we-there-yet-1.1.5" @@ -88667,12 +92609,7 @@ in sources."bcrypt-pbkdf-1.0.2" (sources."boxen-4.2.0" // { dependencies = [ - sources."ansi-regex-5.0.0" sources."chalk-3.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."brace-expansion-1.1.11" @@ -88692,21 +92629,29 @@ in sources."cint-8.2.1" sources."clean-stack-2.2.0" sources."cli-boxes-2.2.1" - sources."cli-table-0.3.1" + (sources."cli-table-0.3.4" // { + 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."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."colors-1.0.3" sources."combined-stream-1.0.8" - sources."commander-6.2.0" + sources."commander-6.2.1" sources."concat-map-0.0.1" sources."configstore-5.0.1" sources."console-control-strings-1.1.0" sources."core-util-is-1.0.2" sources."crypto-random-string-2.0.0" sources."dashdash-1.14.1" - sources."debug-4.3.1" + sources."debug-4.3.2" sources."debuglog-1.0.1" sources."decompress-response-3.3.0" sources."deep-extend-0.6.0" @@ -88718,12 +92663,13 @@ in sources."dot-prop-5.3.0" sources."duplexer3-0.1.4" sources."ecc-jsbn-0.1.2" - sources."emoji-regex-7.0.3" + sources."emoji-regex-8.0.0" sources."encoding-0.1.13" sources."end-of-stream-1.4.4" sources."env-paths-2.2.0" sources."err-code-1.1.2" sources."escape-goat-2.1.1" + sources."escape-string-regexp-1.0.5" sources."esprima-4.0.1" sources."extend-3.0.2" sources."extsprintf-1.3.0" @@ -88736,12 +92682,23 @@ in sources."fp-and-or-0.1.3" sources."fs-minipass-2.1.0" sources."fs.realpath-1.0.0" - sources."gauge-2.7.4" + (sources."gauge-2.7.4" // { + dependencies = [ + sources."ansi-regex-2.1.1" + sources."is-fullwidth-code-point-1.0.0" + sources."string-width-1.0.2" + sources."strip-ansi-3.0.1" + ]; + }) sources."get-stdin-8.0.0" sources."get-stream-4.1.0" sources."getpass-0.1.7" sources."glob-7.1.6" - sources."global-dirs-2.0.1" + (sources."global-dirs-2.1.0" // { + dependencies = [ + sources."ini-1.3.7" + ]; + }) sources."got-9.6.0" sources."graceful-fs-4.2.4" sources."har-schema-2.0.0" @@ -88763,10 +92720,10 @@ in sources."infer-owner-1.0.4" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."ini-1.3.5" + sources."ini-1.3.8" sources."ip-1.1.5" sources."is-ci-2.0.0" - sources."is-fullwidth-code-point-1.0.0" + sources."is-fullwidth-code-point-3.0.0" sources."is-installed-globally-0.3.2" sources."is-lambda-1.0.1" sources."is-npm-5.0.0" @@ -88778,7 +92735,7 @@ in sources."isexe-2.0.0" sources."isstream-0.1.2" sources."jju-1.4.0" - sources."js-yaml-3.14.0" + sources."js-yaml-3.14.1" sources."jsbn-0.1.1" sources."json-buffer-3.0.0" sources."json-parse-even-better-errors-2.3.1" @@ -88811,9 +92768,9 @@ in sources."semver-6.3.0" ]; }) - sources."make-fetch-happen-8.0.10" - sources."mime-db-1.44.0" - sources."mime-types-2.1.27" + sources."make-fetch-happen-8.0.12" + sources."mime-db-1.45.0" + sources."mime-types-2.1.28" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" @@ -88901,9 +92858,9 @@ in sources."sprintf-js-1.0.3" sources."sshpk-1.16.1" sources."ssri-8.0.0" - sources."string-width-1.0.2" + sources."string-width-4.2.0" sources."string_decoder-1.1.1" - sources."strip-ansi-3.0.1" + sources."strip-ansi-6.0.0" sources."strip-json-comments-2.0.1" sources."supports-color-7.2.0" sources."tar-6.0.5" @@ -88925,16 +92882,15 @@ in sources."validate-npm-package-name-3.0.0" sources."verror-1.10.0" sources."which-2.0.2" - sources."wide-align-1.1.3" - (sources."widest-line-3.1.0" // { + (sources."wide-align-1.1.3" // { 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."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."widest-line-3.1.0" sources."wrappy-1.0.2" sources."write-file-atomic-3.0.3" sources."xdg-basedir-4.0.0" @@ -88984,7 +92940,7 @@ in sources."concat-map-0.0.1" (sources."config-chain-1.1.12" // { dependencies = [ - sources."ini-1.3.5" + sources."ini-1.3.8" ]; }) sources."console-control-strings-1.1.0" @@ -89036,8 +92992,8 @@ in sources."json-stringify-safe-5.0.1" sources."jsonfile-1.0.1" sources."jsprim-1.4.1" - sources."mime-db-1.44.0" - sources."mime-types-2.1.27" + sources."mime-db-1.45.0" + sources."mime-types-2.1.28" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-0.3.5" @@ -89152,7 +93108,7 @@ in sources."vscode-languageclient-4.0.1" sources."vscode-languageserver-4.0.0" sources."vscode-languageserver-protocol-3.6.0" - sources."vscode-languageserver-types-3.15.1" + sources."vscode-languageserver-types-3.16.0" sources."vscode-uri-1.0.3" sources."wrappy-1.0.2" ]; @@ -89175,48 +93131,46 @@ in sha512 = "G+iZGGiPEXcRzw0fiRxWYCKxdt/F7l9a0xkiU4XbcVRJCSlBnioWEwJMutOCCpoQmaQtjB4RBHDGIHN85AIhLQ=="; }; dependencies = [ - sources."@babel/code-frame-7.10.4" + sources."@babel/code-frame-7.12.11" sources."@babel/compat-data-7.12.7" - (sources."@babel/core-7.12.9" // { + (sources."@babel/core-7.12.10" // { dependencies = [ sources."json5-2.1.3" sources."source-map-0.5.7" ]; }) - (sources."@babel/generator-7.12.5" // { + (sources."@babel/generator-7.12.11" // { dependencies = [ sources."source-map-0.5.7" ]; }) - sources."@babel/helper-annotate-as-pure-7.10.4" + sources."@babel/helper-annotate-as-pure-7.12.10" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.10.4" - sources."@babel/helper-builder-react-jsx-7.10.4" - sources."@babel/helper-builder-react-jsx-experimental-7.12.4" sources."@babel/helper-compilation-targets-7.12.5" sources."@babel/helper-create-class-features-plugin-7.12.1" sources."@babel/helper-create-regexp-features-plugin-7.12.7" sources."@babel/helper-define-map-7.10.5" sources."@babel/helper-explode-assignable-expression-7.12.1" - sources."@babel/helper-function-name-7.10.4" - sources."@babel/helper-get-function-arity-7.10.4" + sources."@babel/helper-function-name-7.12.11" + sources."@babel/helper-get-function-arity-7.12.10" sources."@babel/helper-hoist-variables-7.10.4" sources."@babel/helper-member-expression-to-functions-7.12.7" sources."@babel/helper-module-imports-7.12.5" sources."@babel/helper-module-transforms-7.12.1" - sources."@babel/helper-optimise-call-expression-7.12.7" + sources."@babel/helper-optimise-call-expression-7.12.10" sources."@babel/helper-plugin-utils-7.10.4" sources."@babel/helper-remap-async-to-generator-7.12.1" - sources."@babel/helper-replace-supers-7.12.5" + sources."@babel/helper-replace-supers-7.12.11" sources."@babel/helper-simple-access-7.12.1" sources."@babel/helper-skip-transparent-expression-wrappers-7.12.1" - sources."@babel/helper-split-export-declaration-7.11.0" - sources."@babel/helper-validator-identifier-7.10.4" - sources."@babel/helper-validator-option-7.12.1" + sources."@babel/helper-split-export-declaration-7.12.11" + sources."@babel/helper-validator-identifier-7.12.11" + sources."@babel/helper-validator-option-7.12.11" sources."@babel/helper-wrap-function-7.12.3" sources."@babel/helpers-7.12.5" sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.12.7" - sources."@babel/plugin-proposal-async-generator-functions-7.12.1" + sources."@babel/parser-7.12.11" + sources."@babel/plugin-proposal-async-generator-functions-7.12.12" sources."@babel/plugin-proposal-class-properties-7.12.1" sources."@babel/plugin-proposal-dynamic-import-7.12.1" sources."@babel/plugin-proposal-export-namespace-from-7.12.1" @@ -89246,14 +93200,14 @@ in sources."@babel/plugin-transform-arrow-functions-7.12.1" sources."@babel/plugin-transform-async-to-generator-7.12.1" sources."@babel/plugin-transform-block-scoped-functions-7.12.1" - sources."@babel/plugin-transform-block-scoping-7.12.1" + sources."@babel/plugin-transform-block-scoping-7.12.12" sources."@babel/plugin-transform-classes-7.12.1" sources."@babel/plugin-transform-computed-properties-7.12.1" sources."@babel/plugin-transform-destructuring-7.12.1" sources."@babel/plugin-transform-dotall-regex-7.12.1" sources."@babel/plugin-transform-duplicate-keys-7.12.1" sources."@babel/plugin-transform-exponentiation-operator-7.12.1" - sources."@babel/plugin-transform-flow-strip-types-7.12.1" + sources."@babel/plugin-transform-flow-strip-types-7.12.10" sources."@babel/plugin-transform-for-of-7.12.1" sources."@babel/plugin-transform-function-name-7.12.1" sources."@babel/plugin-transform-literals-7.12.1" @@ -89267,22 +93221,22 @@ in sources."@babel/plugin-transform-object-super-7.12.1" sources."@babel/plugin-transform-parameters-7.12.1" sources."@babel/plugin-transform-property-literals-7.12.1" - sources."@babel/plugin-transform-react-jsx-7.12.7" + sources."@babel/plugin-transform-react-jsx-7.12.12" sources."@babel/plugin-transform-regenerator-7.12.1" sources."@babel/plugin-transform-reserved-words-7.12.1" sources."@babel/plugin-transform-shorthand-properties-7.12.1" sources."@babel/plugin-transform-spread-7.12.1" sources."@babel/plugin-transform-sticky-regex-7.12.7" sources."@babel/plugin-transform-template-literals-7.12.1" - sources."@babel/plugin-transform-typeof-symbol-7.12.1" + sources."@babel/plugin-transform-typeof-symbol-7.12.10" sources."@babel/plugin-transform-unicode-escapes-7.12.1" sources."@babel/plugin-transform-unicode-regex-7.12.1" - sources."@babel/preset-env-7.12.7" + sources."@babel/preset-env-7.12.11" sources."@babel/preset-modules-0.1.4" sources."@babel/runtime-7.12.5" sources."@babel/template-7.12.7" - sources."@babel/traverse-7.12.9" - sources."@babel/types-7.12.7" + sources."@babel/traverse-7.12.12" + sources."@babel/types-7.12.12" sources."@iarna/toml-2.2.5" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" @@ -89380,7 +93334,7 @@ in sources."pako-1.0.11" ]; }) - sources."browserslist-4.15.0" + sources."browserslist-4.16.0" (sources."buffer-4.9.2" // { dependencies = [ sources."isarray-1.0.0" @@ -89397,7 +93351,7 @@ in sources."caller-path-2.0.0" sources."callsites-2.0.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001165" + sources."caniuse-lite-1.0.30001173" sources."caseless-0.12.0" sources."chalk-2.4.2" sources."chokidar-2.1.8" @@ -89424,7 +93378,7 @@ in sources."convert-source-map-1.7.0" sources."copy-descriptor-0.1.1" sources."core-js-2.6.12" - (sources."core-js-compat-3.8.0" // { + (sources."core-js-compat-3.8.2" // { dependencies = [ sources."semver-7.0.0" ]; @@ -89481,7 +93435,7 @@ in sources."dashdash-1.14.1" sources."data-urls-1.1.0" sources."deasync-0.1.21" - sources."debug-4.3.1" + sources."debug-4.3.2" sources."decode-uri-component-0.2.0" sources."deep-is-0.1.3" (sources."defaults-1.0.3" // { @@ -89532,7 +93486,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.616" + sources."electron-to-chromium-1.3.634" (sources."elliptic-6.5.3" // { dependencies = [ sources."bn.js-4.11.9" @@ -89591,7 +93545,7 @@ in sources."fsevents-1.2.13" sources."function-bind-1.1.1" sources."gensync-1.0.0-beta.2" - sources."get-intrinsic-1.0.1" + sources."get-intrinsic-1.0.2" sources."get-port-3.2.0" sources."get-value-2.0.6" sources."getpass-0.1.7" @@ -89702,7 +93656,7 @@ in sources."isobject-3.0.1" sources."isstream-0.1.2" sources."js-tokens-4.0.0" - (sources."js-yaml-3.14.0" // { + (sources."js-yaml-3.14.1" // { dependencies = [ sources."esprima-4.0.1" ]; @@ -89756,8 +93710,8 @@ in ]; }) sources."mime-1.6.0" - sources."mime-db-1.44.0" - sources."mime-types-2.1.27" + sources."mime-db-1.45.0" + sources."mime-types-2.1.28" sources."mimic-fn-1.2.0" sources."minimalistic-assert-1.0.1" sources."minimalistic-crypto-utils-1.0.1" @@ -89787,7 +93741,7 @@ in sources."punycode-1.4.1" ]; }) - sources."node-releases-1.1.67" + sources."node-releases-1.1.69" sources."normalize-path-3.0.0" sources."normalize-url-3.3.0" sources."nth-check-1.0.2" @@ -90222,7 +94176,7 @@ in sources."emoji-regex-7.0.3" sources."encodeurl-1.0.2" sources."entities-1.1.2" - sources."errno-0.1.7" + sources."errno-0.1.8" sources."escape-html-1.0.3" sources."esprima-4.0.1" sources."etag-1.8.1" @@ -90249,7 +94203,7 @@ in sources."gelf-stream-1.1.1" sources."gelfling-0.3.1" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.0.1" + sources."get-intrinsic-1.0.2" sources."getpass-0.1.7" sources."glob-7.1.6" sources."graceful-fs-4.2.4" @@ -90272,7 +94226,7 @@ in sources."is-typedarray-1.0.0" sources."isarray-1.0.0" sources."isstream-0.1.2" - sources."js-yaml-3.14.0" + sources."js-yaml-3.14.1" sources."jsbn-0.1.1" sources."json-schema-0.2.3" sources."json-schema-traverse-0.4.1" @@ -90290,6 +94244,7 @@ in sources."locate-path-3.0.0" sources."lodash-4.17.20" sources."lodash.clone-4.5.0" + sources."lodash.clonedeep-4.5.0" sources."lru-cache-6.0.0" sources."media-typer-0.3.0" sources."mediawiki-title-0.6.5" @@ -90297,8 +94252,8 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.44.0" - sources."mime-types-2.1.27" + sources."mime-db-1.45.0" + sources."mime-types-2.1.28" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-0.5.5" @@ -90369,7 +94324,7 @@ in ]; }) sources."serve-static-1.14.1" - (sources."service-runner-2.8.0" // { + (sources."service-runner-2.8.1" // { dependencies = [ sources."semver-7.3.4" sources."yargs-14.2.3" @@ -90392,7 +94347,7 @@ in sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-is-1.6.18" - sources."uglify-js-3.12.1" + sources."uglify-js-3.12.4" sources."unix-dgram-2.0.4" sources."unpipe-1.0.0" sources."uri-js-4.4.0" @@ -90796,7 +94751,7 @@ in sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."get-browser-rtc-1.1.0" - sources."get-intrinsic-1.0.1" + sources."get-intrinsic-1.0.2" sources."get-stdin-4.0.1" sources."glob-7.1.6" sources."graceful-fs-4.2.4" @@ -90812,7 +94767,7 @@ in sources."indent-string-2.1.0" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."ini-1.3.5" + sources."ini-1.3.8" (sources."inquirer-5.2.0" // { dependencies = [ sources."ansi-regex-3.0.0" @@ -90855,7 +94810,7 @@ in sources."magnet-uri-5.4.0" sources."map-obj-1.0.1" sources."meow-3.7.0" - sources."mime-2.4.6" + sources."mime-2.4.7" sources."mimic-fn-1.2.0" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" @@ -91043,7 +94998,6 @@ in sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."async-2.6.3" - sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" sources."aws4-1.11.0" @@ -91055,7 +95009,6 @@ in sources."basic-auth-2.0.1" sources."bcrypt-pbkdf-1.0.2" sources."bencode-0.7.0" - sources."better-assert-1.0.2" sources."bitfield-0.1.0" sources."bittorrent-dht-6.4.2" (sources."bittorrent-tracker-7.7.0" // { @@ -91080,7 +95033,6 @@ in sources."buffer-fill-1.0.0" sources."buffer-from-1.1.1" sources."bytes-3.1.0" - sources."callsite-1.0.0" sources."caseless-0.12.0" sources."chrome-dgram-3.0.6" sources."chrome-dns-1.0.1" @@ -91088,7 +95040,7 @@ in sources."combined-stream-1.0.8" sources."compact2string-1.4.1" sources."component-bind-1.0.0" - sources."component-emitter-1.2.1" + sources."component-emitter-1.3.0" sources."component-inherit-0.0.3" (sources."compress-commons-2.1.1" // { dependencies = [ @@ -91119,20 +95071,16 @@ in sources."ee-first-1.1.1" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" - (sources."engine.io-3.4.2" // { + (sources."engine.io-3.5.0" // { dependencies = [ - sources."cookie-0.3.1" + sources."cookie-0.4.1" sources."debug-4.1.1" - sources."ms-2.1.2" + sources."ms-2.1.3" ]; }) - (sources."engine.io-client-3.4.4" // { + (sources."engine.io-client-3.5.0" // { dependencies = [ - sources."component-emitter-1.3.0" sources."debug-3.1.0" - sources."parseqs-0.0.6" - sources."parseuri-0.0.6" - sources."ws-6.1.4" ]; }) sources."engine.io-parser-2.2.1" @@ -91219,8 +95167,8 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.44.0" - sources."mime-types-2.1.27" + sources."mime-db-1.45.0" + sources."mime-types-2.1.28" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" @@ -91242,7 +95190,6 @@ in sources."negotiator-0.6.2" sources."normalize-path-3.0.0" sources."oauth-sign-0.9.0" - sources."object-component-0.0.3" sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" @@ -91253,8 +95200,8 @@ in ]; }) sources."parse-torrent-file-2.1.4" - sources."parseqs-0.0.5" - sources."parseuri-0.0.5" + sources."parseqs-0.0.6" + sources."parseuri-0.0.6" sources."parseurl-1.3.3" sources."path-is-absolute-1.0.1" sources."path-to-regexp-0.1.7" @@ -91317,33 +95264,26 @@ in sources."ws-2.3.1" ]; }) - (sources."socket.io-2.3.0" // { + (sources."socket.io-2.4.0" // { dependencies = [ sources."debug-4.1.1" - sources."ms-2.1.2" + sources."ms-2.1.3" ]; }) sources."socket.io-adapter-1.1.2" - (sources."socket.io-client-2.3.0" // { + (sources."socket.io-client-2.4.0" // { dependencies = [ - sources."base64-arraybuffer-0.1.5" - sources."debug-4.1.1" + sources."debug-3.1.0" sources."isarray-2.0.1" - sources."ms-2.1.2" - (sources."socket.io-parser-3.3.1" // { - dependencies = [ - sources."component-emitter-1.3.0" - sources."debug-3.1.0" - sources."ms-2.0.0" - ]; - }) + sources."socket.io-parser-3.3.1" ]; }) (sources."socket.io-parser-3.4.1" // { dependencies = [ + sources."component-emitter-1.2.1" sources."debug-4.1.1" sources."isarray-2.0.1" - sources."ms-2.1.2" + sources."ms-2.1.3" ]; }) sources."speedometer-0.1.4" @@ -91351,7 +95291,7 @@ in sources."statuses-1.5.0" sources."string2compact-1.3.0" sources."string_decoder-1.1.1" - sources."tar-stream-2.1.4" + sources."tar-stream-2.2.0" sources."thirty-two-0.0.2" sources."thunky-1.1.0" sources."to-array-0.1.4" @@ -91382,7 +95322,7 @@ in sources."verror-1.10.0" sources."which-1.3.1" sources."wrappy-1.0.2" - sources."ws-7.4.1" + sources."ws-7.4.2" sources."xmlhttprequest-ssl-1.5.5" sources."xtend-4.0.2" sources."yeast-0.1.2" @@ -91401,10 +95341,10 @@ in pm2 = nodeEnv.buildNodePackage { name = "pm2"; packageName = "pm2"; - version = "4.5.0"; + version = "4.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/pm2/-/pm2-4.5.0.tgz"; - sha512 = "sXKn0Qsrqj++qgsdGTASEsWfURhM6vSPIqFPwSwk3bK5/QPLxuRmVDW1y82M9wEnlgEjiIryaLhZUp5saLuhPA=="; + url = "https://registry.npmjs.org/pm2/-/pm2-4.5.1.tgz"; + sha512 = "gEOYugy4vEGazszDtjbZcWnZhHpBLKl0JiYhEnIJqmMj576a0D5LNCmd9grJswB1ziZim+9YInqFrG3FQTxvEg=="; }; dependencies = [ (sources."@opencensus/core-0.0.9" // { @@ -91498,7 +95438,11 @@ in sources."cron-1.8.2" sources."data-uri-to-buffer-1.2.0" sources."dayjs-1.8.36" - sources."debug-4.3.1" + (sources."debug-4.3.2" // { + dependencies = [ + sources."ms-2.1.2" + ]; + }) sources."deep-is-0.1.3" sources."degenerator-1.0.4" sources."depd-1.1.2" @@ -91578,7 +95522,7 @@ in sources."module-details-from-path-1.0.3" sources."moment-2.29.1" sources."moment-timezone-0.5.32" - sources."ms-2.1.2" + sources."ms-2.1.3" sources."mute-stream-0.0.8" (sources."needle-2.4.0" // { dependencies = [ @@ -91627,7 +95571,7 @@ in ]; }) sources."readdirp-3.5.0" - sources."require-in-the-middle-5.0.3" + sources."require-in-the-middle-5.1.0" sources."resolve-1.19.0" sources."run-series-1.1.9" sources."safe-buffer-5.1.2" @@ -91655,7 +95599,7 @@ in sources."statuses-1.5.0" sources."string_decoder-0.10.31" sources."supports-color-7.2.0" - sources."systeminformation-4.30.11" + sources."systeminformation-4.34.2" sources."thunkify-2.1.2" sources."to-regex-range-5.0.1" sources."toidentifier-1.0.0" @@ -91690,10 +95634,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "5.13.5"; + version = "5.14.3"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-5.13.5.tgz"; - sha512 = "EJO8eYZyNpOvW+JhjBnLtxD2xcC6YlrzH8jxjETj8bevLATFa9vnGq614ada6o1XOIMq31JWtj1WyPJNogAzLA=="; + url = "https://registry.npmjs.org/pnpm/-/pnpm-5.14.3.tgz"; + sha512 = "PFjHFWCsHgaNCpOwOAgN6H71PA8td8PnwSE1ArXz//OyfdfIwws1s23XLmokhHcnE3JsBSiIR3NOW8JZ5QcxlQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -91736,14 +95680,14 @@ in postcss-cli = nodeEnv.buildNodePackage { name = "postcss-cli"; packageName = "postcss-cli"; - version = "8.3.0"; + version = "8.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-cli/-/postcss-cli-8.3.0.tgz"; - sha512 = "GqWohD9VmH+LCe+xsv6VCdcgNylNBmsrbxJlyXUGteGGdcmazj2YxSiJMUmQpg8pE6LRox9idtsTB7JZq5a+rw=="; + url = "https://registry.npmjs.org/postcss-cli/-/postcss-cli-8.3.1.tgz"; + sha512 = "leHXsQRq89S3JC9zw/tKyiVV2jAhnfQe0J8VI4eQQbUjwIe0XxVqLrR+7UsahF1s9wi4GlqP6SJ8ydf44cgF2Q=="; }; dependencies = [ - sources."@babel/code-frame-7.10.4" - sources."@babel/helper-validator-identifier-7.10.4" + sources."@babel/code-frame-7.12.11" + sources."@babel/helper-validator-identifier-7.12.11" (sources."@babel/highlight-7.10.4" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -91754,9 +95698,9 @@ in sources."supports-color-5.5.0" ]; }) - sources."@nodelib/fs.scandir-2.1.3" - sources."@nodelib/fs.stat-2.0.3" - sources."@nodelib/fs.walk-1.2.4" + sources."@nodelib/fs.scandir-2.1.4" + sources."@nodelib/fs.stat-2.0.4" + sources."@nodelib/fs.walk-1.2.6" sources."@types/parse-json-4.0.0" sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" @@ -91780,7 +95724,7 @@ in sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" sources."fast-glob-3.2.4" - sources."fastq-1.9.0" + sources."fastq-1.10.0" sources."fill-range-7.0.1" sources."fs-extra-9.0.1" sources."fsevents-2.1.3" @@ -91792,7 +95736,7 @@ in sources."has-flag-4.0.0" sources."ignore-5.1.8" sources."import-cwd-3.0.0" - sources."import-fresh-3.2.2" + sources."import-fresh-3.3.0" (sources."import-from-3.0.0" // { dependencies = [ sources."resolve-from-5.0.0" @@ -91843,7 +95787,7 @@ in sources."wrap-ansi-7.0.0" sources."y18n-5.0.5" sources."yaml-1.10.0" - sources."yargs-16.1.1" + sources."yargs-16.2.0" sources."yargs-parser-20.2.4" ]; buildInputs = globalBuildInputs; @@ -92188,11 +96132,11 @@ in sources."isexe-2.0.0" sources."shell-quote-1.7.2" sources."uuid-3.4.0" - sources."vscode-jsonrpc-5.0.1" + sources."vscode-jsonrpc-6.0.0" sources."vscode-languageserver-6.1.1" - sources."vscode-languageserver-protocol-3.15.3" + sources."vscode-languageserver-protocol-3.16.0" sources."vscode-languageserver-textdocument-1.0.1" - sources."vscode-languageserver-types-3.15.1" + sources."vscode-languageserver-types-3.16.0" sources."vscode-uri-2.1.2" sources."which-2.0.2" ]; @@ -92245,10 +96189,10 @@ in pyright = nodeEnv.buildNodePackage { name = "pyright"; packageName = "pyright"; - version = "1.1.92"; + version = "1.1.99"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.92.tgz"; - sha512 = "kL6c2wafnJgbXmG2Svz9isAhAMWARnmMiUGBRytcdVsse11crLDzaWusegA4P6sTweoHMcT3+P8fmLv2Av1u/Q=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.99.tgz"; + sha512 = "DAfK8uVLGF1nuBeFvEXhvApCecuHEpe8ncjnFW/WsBBIQ5JOsjjpwlUDvTutNjkoH9QCTqvg72g6ip9PdWFL/w=="; }; buildInputs = globalBuildInputs; meta = { @@ -92260,6 +96204,227 @@ in bypassCache = true; reconstructLock = true; }; + quicktype = nodeEnv.buildNodePackage { + name = "quicktype"; + packageName = "quicktype"; + version = "15.0.258"; + src = fetchurl { + url = "https://registry.npmjs.org/quicktype/-/quicktype-15.0.258.tgz"; + sha512 = "nTDC6LmwsFNJU1qY9+t09e4k1J1PosVDhZKRizkRinQzRVITFOzKSMuFBD3UJ1yaO9Irn7QKBlm9rae+9p+Cdg=="; + }; + dependencies = [ + sources."@mark.probst/typescript-json-schema-0.32.0" + sources."@mark.probst/unicode-properties-1.1.0" + sources."acorn-7.4.1" + sources."ansi-regex-3.0.0" + sources."ansi-styles-3.2.1" + sources."array-back-2.0.0" + sources."balanced-match-1.0.0" + sources."brace-expansion-1.1.11" + sources."brfs-1.6.1" + sources."browser-or-node-1.3.0" + sources."buffer-equal-0.0.1" + sources."buffer-from-1.1.1" + sources."camelcase-5.3.1" + sources."chalk-2.4.2" + sources."cliui-4.1.0" + sources."code-point-at-1.1.0" + sources."collection-utils-1.0.1" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."command-line-args-4.0.7" + sources."command-line-usage-5.0.5" + sources."concat-map-0.0.1" + sources."concat-stream-1.6.2" + sources."convert-source-map-1.7.0" + sources."core-util-is-1.0.2" + sources."cross-spawn-6.0.5" + sources."decamelize-1.2.0" + sources."deep-extend-0.6.0" + sources."deep-is-0.1.3" + sources."duplexer2-0.1.4" + sources."encoding-0.1.13" + sources."end-of-stream-1.4.4" + sources."escape-string-regexp-1.0.5" + sources."escodegen-1.9.1" + sources."esprima-3.1.3" + sources."estraverse-4.3.0" + sources."esutils-2.0.3" + sources."execa-1.0.0" + sources."falafel-2.2.4" + sources."fast-levenshtein-2.0.6" + (sources."find-replace-1.0.3" // { + dependencies = [ + sources."array-back-1.0.4" + ]; + }) + sources."find-up-3.0.0" + sources."foreach-2.0.5" + sources."fs.realpath-1.0.0" + sources."function-bind-1.1.1" + sources."get-caller-file-1.0.3" + sources."get-stream-4.1.0" + sources."glob-7.1.6" + sources."graphql-0.11.7" + sources."has-1.0.3" + sources."has-flag-3.0.0" + sources."iconv-lite-0.6.2" + sources."inflight-1.0.6" + sources."inherits-2.0.4" + sources."invert-kv-2.0.0" + sources."is-core-module-2.2.0" + sources."is-fullwidth-code-point-1.0.0" + sources."is-stream-1.1.0" + sources."is-url-1.2.4" + sources."isarray-2.0.5" + sources."isexe-2.0.0" + sources."isomorphic-fetch-2.2.1" + sources."iterall-1.1.3" + sources."js-base64-2.6.4" + sources."json-stable-stringify-1.0.1" + sources."jsonify-0.0.0" + sources."lcid-2.0.0" + sources."levn-0.3.0" + sources."locate-path-3.0.0" + sources."lodash-4.17.20" + sources."lodash.padend-4.6.1" + sources."magic-string-0.22.5" + sources."map-age-cleaner-0.1.3" + sources."mem-4.3.0" + (sources."merge-source-map-1.0.4" // { + dependencies = [ + sources."source-map-0.5.7" + ]; + }) + sources."mimic-fn-2.1.0" + sources."minimatch-3.0.4" + sources."minimist-1.2.5" + sources."moment-2.29.1" + sources."nice-try-1.0.5" + sources."node-fetch-1.7.3" + sources."npm-run-path-2.0.2" + sources."number-is-nan-1.0.1" + sources."object-inspect-1.4.1" + sources."object-keys-1.1.1" + sources."once-1.4.0" + sources."optionator-0.8.3" + 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-3.0.0" + sources."p-try-2.2.0" + sources."pako-1.0.11" + 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."pluralize-7.0.0" + sources."prelude-ls-1.1.2" + sources."process-nextick-args-2.0.1" + sources."pump-3.0.0" + sources."quote-stream-1.0.2" + (sources."readable-stream-2.3.0" // { + dependencies = [ + sources."isarray-1.0.0" + sources."process-nextick-args-1.0.7" + sources."string_decoder-1.0.3" + ]; + }) + sources."reduce-flatten-1.0.1" + sources."require-directory-2.1.1" + sources."require-main-filename-1.0.1" + sources."resolve-1.19.0" + sources."safe-buffer-5.1.2" + sources."safer-buffer-2.1.2" + sources."semver-5.7.1" + sources."set-blocking-2.0.0" + sources."shallow-copy-0.0.1" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" + sources."signal-exit-3.0.3" + sources."source-map-0.6.1" + (sources."static-eval-2.1.0" // { + dependencies = [ + sources."escodegen-1.14.3" + sources."esprima-4.0.1" + ]; + }) + (sources."static-module-2.2.5" // { + dependencies = [ + sources."isarray-1.0.0" + sources."readable-stream-2.3.7" + ]; + }) + sources."stream-chain-2.2.4" + sources."stream-json-1.1.3" + sources."string-to-stream-1.1.1" + (sources."string-width-2.1.1" // { + dependencies = [ + sources."is-fullwidth-code-point-2.0.0" + ]; + }) + sources."string_decoder-1.1.1" + sources."strip-ansi-4.0.0" + sources."strip-eof-1.0.0" + sources."supports-color-5.5.0" + sources."table-layout-0.4.5" + (sources."test-value-2.1.0" // { + dependencies = [ + sources."array-back-1.0.4" + ]; + }) + (sources."through2-2.0.5" // { + dependencies = [ + sources."isarray-1.0.0" + sources."readable-stream-2.3.7" + ]; + }) + sources."tiny-inflate-1.0.3" + sources."type-check-0.3.2" + sources."typedarray-0.0.6" + sources."typescript-3.2.4" + sources."typical-2.6.1" + (sources."unicode-trie-0.3.1" // { + dependencies = [ + sources."pako-0.2.9" + ]; + }) + sources."urijs-1.19.5" + sources."util-deprecate-1.0.2" + sources."uuid-3.4.0" + sources."vlq-0.2.3" + sources."whatwg-fetch-3.5.0" + sources."which-1.3.1" + sources."which-module-2.0.0" + sources."word-wrap-1.2.3" + sources."wordwrap-1.0.0" + sources."wordwrapjs-3.0.0" + (sources."wrap-ansi-2.1.0" // { + dependencies = [ + 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.1" + sources."yaml-1.10.0" + sources."yargs-12.0.5" + sources."yargs-parser-11.1.1" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "![](https://raw.githubusercontent.com/quicktype/quicktype/master/quicktype-logo.svg?sanitize=true)"; + homepage = "https://github.com/quicktype/quicktype#readme"; + license = "Apache-2.0"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; react-native-cli = nodeEnv.buildNodePackage { name = "react-native-cli"; packageName = "react-native-cli"; @@ -92291,7 +96456,7 @@ in sources."foreach-2.0.5" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" - sources."get-intrinsic-1.0.1" + sources."get-intrinsic-1.0.2" sources."glob-7.1.6" sources."has-1.0.3" sources."has-ansi-2.0.0" @@ -92301,17 +96466,21 @@ in sources."inherits-2.0.4" sources."is-arguments-1.1.0" sources."is-bigint-1.0.1" - sources."is-boolean-object-1.0.1" + sources."is-boolean-object-1.1.0" sources."is-callable-1.2.2" sources."is-date-object-1.0.2" - sources."is-map-2.0.1" + sources."is-map-2.0.2" sources."is-negative-zero-2.0.1" sources."is-number-object-1.0.4" sources."is-regex-1.1.1" - sources."is-set-2.0.1" + sources."is-set-2.0.2" sources."is-string-1.0.5" sources."is-symbol-1.0.3" - sources."is-typed-array-1.1.3" + (sources."is-typed-array-1.1.4" // { + dependencies = [ + sources."es-abstract-1.18.0-next.1" + ]; + }) sources."is-weakmap-2.0.1" sources."is-weakset-2.0.1" sources."isarray-2.0.5" @@ -92334,20 +96503,20 @@ in sources."revalidator-0.1.8" sources."rimraf-2.7.1" sources."semver-5.7.1" - (sources."side-channel-1.0.3" // { - dependencies = [ - sources."es-abstract-1.18.0-next.1" - ]; - }) + sources."side-channel-1.0.4" sources."stack-trace-0.0.10" sources."string.prototype.trimend-1.0.3" sources."string.prototype.trimstart-1.0.3" sources."strip-ansi-3.0.1" sources."supports-color-2.0.0" sources."utile-0.2.1" - sources."which-boxed-primitive-1.0.1" + sources."which-boxed-primitive-1.0.2" sources."which-collection-1.0.1" - sources."which-typed-array-1.1.2" + (sources."which-typed-array-1.1.4" // { + dependencies = [ + sources."es-abstract-1.18.0-next.1" + ]; + }) (sources."winston-0.8.3" // { dependencies = [ sources."pkginfo-0.3.1" @@ -92491,8 +96660,8 @@ in sources."levn-0.3.0" sources."lodash-4.17.20" sources."lodash.sortby-4.7.0" - sources."mime-db-1.44.0" - sources."mime-types-2.1.27" + sources."mime-db-1.45.0" + sources."mime-types-2.1.28" sources."minimist-1.2.5" sources."nwsapi-2.2.0" sources."oauth-sign-0.9.0" @@ -92536,7 +96705,7 @@ in sources."whatwg-mimetype-2.3.0" sources."whatwg-url-8.4.0" sources."word-wrap-1.2.3" - sources."ws-7.4.1" + sources."ws-7.4.2" sources."xml-name-validator-3.0.0" sources."xmlchars-2.2.0" ]; @@ -92559,31 +96728,31 @@ in sha512 = "AQHx67+fJ+7PZUGf0Vl24XO02isSLHU7fh/OXu6wreFm6B1+xrVhcehV9um2nk63Zq9GFenjnv2GoXEyMSGc7Q=="; }; dependencies = [ - sources."@babel/code-frame-7.10.4" - (sources."@babel/generator-7.12.5" // { + sources."@babel/code-frame-7.12.11" + (sources."@babel/generator-7.12.11" // { dependencies = [ sources."source-map-0.5.7" ]; }) - sources."@babel/helper-annotate-as-pure-7.10.4" - sources."@babel/helper-function-name-7.10.4" - sources."@babel/helper-get-function-arity-7.10.4" + sources."@babel/helper-annotate-as-pure-7.12.10" + sources."@babel/helper-function-name-7.12.11" + sources."@babel/helper-get-function-arity-7.12.10" sources."@babel/helper-module-imports-7.12.5" - sources."@babel/helper-split-export-declaration-7.11.0" - sources."@babel/helper-validator-identifier-7.10.4" + sources."@babel/helper-split-export-declaration-7.12.11" + sources."@babel/helper-validator-identifier-7.12.11" sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.12.7" + sources."@babel/parser-7.12.11" sources."@babel/runtime-7.12.5" sources."@babel/template-7.12.7" - sources."@babel/traverse-7.12.9" - sources."@babel/types-7.12.7" + sources."@babel/traverse-7.12.12" + sources."@babel/types-7.12.12" sources."@emotion/is-prop-valid-0.8.8" sources."@emotion/memoize-0.7.4" sources."@emotion/stylis-0.8.5" sources."@emotion/unitless-0.7.5" sources."@exodus/schemasafe-1.0.0-rc.3" sources."@redocly/react-dropdown-aria-2.0.11" - sources."@types/node-13.13.34" + sources."@types/node-13.13.39" sources."ajv-5.5.2" sources."ansi-regex-5.0.0" sources."ansi-styles-3.2.1" @@ -92641,7 +96810,7 @@ in sources."color-name-1.1.3" sources."console-browserify-1.2.0" sources."constants-browserify-1.0.0" - sources."core-js-3.8.0" + sources."core-js-3.8.2" sources."core-util-is-1.0.2" (sources."create-ecdh-4.0.4" // { dependencies = [ @@ -92653,7 +96822,7 @@ in sources."crypto-browserify-3.12.0" sources."css-color-keywords-1.0.0" sources."css-to-react-native-3.0.0" - sources."debug-4.3.1" + sources."debug-4.3.2" sources."decamelize-1.2.0" sources."decko-1.2.0" sources."delegate-3.2.0" @@ -92664,7 +96833,7 @@ in ]; }) sources."domain-browser-1.2.0" - sources."dompurify-2.2.2" + sources."dompurify-2.2.6" (sources."elliptic-6.5.3" // { dependencies = [ sources."bn.js-4.11.9" @@ -92717,7 +96886,7 @@ in sources."is-number-7.0.0" sources."isarray-2.0.5" sources."js-tokens-4.0.0" - sources."js-yaml-3.14.0" + sources."js-yaml-3.14.1" sources."jsesc-2.5.2" sources."json-pointer-0.6.1" sources."json-schema-ref-parser-6.1.0" @@ -92755,7 +96924,7 @@ in sources."oas-linter-3.2.1" (sources."oas-resolver-2.5.3" // { dependencies = [ - sources."yargs-16.1.1" + sources."yargs-16.2.0" ]; }) sources."oas-schema-walker-1.1.5" @@ -92776,7 +96945,7 @@ in sources."picomatch-2.2.2" sources."polished-3.6.7" sources."postcss-value-parser-4.1.0" - sources."prismjs-1.22.0" + sources."prismjs-1.23.0" sources."process-0.11.10" sources."process-nextick-args-2.0.1" sources."prop-types-15.7.2" @@ -92793,7 +96962,7 @@ in sources."react-16.14.0" sources."react-dom-16.14.0" sources."react-is-16.13.1" - sources."react-tabs-3.1.1" + sources."react-tabs-3.1.2" (sources."readable-stream-2.3.7" // { dependencies = [ sources."inherits-2.0.4" @@ -92842,7 +97011,7 @@ in sources."to-regex-range-5.0.1" sources."tslib-2.0.3" sources."tty-browserify-0.0.0" - sources."uglify-js-3.12.1" + sources."uglify-js-3.12.4" (sources."url-0.11.0" // { dependencies = [ sources."punycode-1.3.2" @@ -92912,10 +97081,10 @@ in rollup = nodeEnv.buildNodePackage { name = "rollup"; packageName = "rollup"; - version = "2.34.1"; + version = "2.36.0"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.34.1.tgz"; - sha512 = "tGveB6NU5x4MS/iXaIsjfUkEv4hxzJJ4o0FRy5LO62Ndx3R2cmE1qsLYlSfRkvHUUPqWiFoxEm8pRftzh1a5HA=="; + url = "https://registry.npmjs.org/rollup/-/rollup-2.36.0.tgz"; + sha512 = "L38QyQK77bkJy9nPyeydnHFK6xMofqumh4scTV2d4RG4EFq6pGdxnn67dVHFUDJ9J0PSEQx8zn1FiVS5TydsKg=="; }; dependencies = [ sources."fsevents-2.1.3" @@ -92936,41 +97105,44 @@ in version = "0.4.0-dev"; src = ../../misc/vscode-extensions/rust-analyzer/build-deps; dependencies = [ - sources."@babel/code-frame-7.10.4" - sources."@babel/helper-validator-identifier-7.10.4" + sources."@babel/code-frame-7.12.11" + sources."@babel/helper-validator-identifier-7.12.11" (sources."@babel/highlight-7.10.4" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@eslint/eslintrc-0.2.2" - sources."@rollup/plugin-commonjs-13.0.2" - sources."@rollup/plugin-node-resolve-8.4.0" - sources."@rollup/pluginutils-3.1.0" - sources."@types/eslint-visitor-keys-1.0.0" + (sources."@eslint/eslintrc-0.2.2" // { + dependencies = [ + sources."ignore-4.0.6" + ]; + }) + sources."@nodelib/fs.scandir-2.1.4" + sources."@nodelib/fs.stat-2.0.4" + sources."@nodelib/fs.walk-1.2.6" + sources."@rollup/plugin-commonjs-17.0.0" + sources."@rollup/plugin-node-resolve-11.0.1" + (sources."@rollup/pluginutils-3.1.0" // { + dependencies = [ + sources."estree-walker-1.0.1" + ]; + }) sources."@types/estree-0.0.39" sources."@types/glob-7.1.3" sources."@types/json-schema-7.0.6" sources."@types/minimatch-3.0.3" - sources."@types/mocha-7.0.2" - sources."@types/node-12.7.12" + sources."@types/mocha-8.2.0" + sources."@types/node-12.12.70" sources."@types/node-fetch-2.5.7" sources."@types/resolve-1.17.1" - sources."@types/vscode-1.51.0" - (sources."@typescript-eslint/eslint-plugin-3.10.1" // { - dependencies = [ - sources."semver-7.3.4" - ]; - }) - 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.4" - ]; - }) - sources."@typescript-eslint/visitor-keys-3.10.1" + sources."@types/vscode-1.52.0" + sources."@typescript-eslint/eslint-plugin-4.12.0" + sources."@typescript-eslint/experimental-utils-4.12.0" + sources."@typescript-eslint/parser-4.12.0" + sources."@typescript-eslint/scope-manager-4.12.0" + sources."@typescript-eslint/types-4.12.0" + sources."@typescript-eslint/typescript-estree-4.12.0" + sources."@typescript-eslint/visitor-keys-4.12.0" sources."@ungap/promise-all-settled-1.1.2" sources."acorn-7.4.1" sources."acorn-jsx-5.3.1" @@ -92981,7 +97153,8 @@ in sources."ansi-styles-3.2.1" sources."anymatch-3.1.1" sources."argparse-1.0.10" - sources."astral-regex-1.0.0" + sources."array-union-2.1.0" + sources."astral-regex-2.0.0" sources."asynckit-0.4.0" sources."azure-devops-node-api-7.2.0" sources."balanced-match-1.0.0" @@ -92991,7 +97164,7 @@ in sources."braces-3.0.2" sources."browser-stdout-1.3.1" sources."buffer-crc32-0.2.13" - sources."builtin-modules-3.1.0" + sources."builtin-modules-3.2.0" sources."callsites-3.1.0" sources."camelcase-5.3.1" (sources."chalk-4.1.0" // { @@ -93003,11 +97176,15 @@ in sources."supports-color-7.2.0" ]; }) - sources."cheerio-1.0.0-rc.3" + sources."cheerio-1.0.0-rc.5" + sources."cheerio-select-tmp-0.1.1" sources."chokidar-3.4.3" (sources."cliui-5.0.0" // { dependencies = [ sources."ansi-regex-4.1.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" ]; }) @@ -93019,21 +97196,21 @@ in sources."commondir-1.0.1" sources."concat-map-0.0.1" sources."cross-spawn-7.0.3" - sources."css-select-1.2.0" - sources."css-what-2.1.3" - sources."debug-4.3.1" + sources."css-select-3.1.2" + sources."css-what-4.0.0" + sources."debug-4.3.2" sources."decamelize-1.2.0" - sources."deep-freeze-0.0.1" sources."deep-is-0.1.3" sources."deepmerge-4.2.2" sources."delayed-stream-1.0.0" sources."denodeify-1.2.1" sources."diff-4.0.2" + sources."dir-glob-3.0.1" sources."doctrine-3.0.0" - sources."dom-serializer-0.1.1" - sources."domelementtype-1.3.1" - sources."domhandler-2.4.2" - sources."domutils-1.5.1" + sources."dom-serializer-1.2.0" + sources."domelementtype-2.1.0" + sources."domhandler-4.0.0" + sources."domutils-2.4.4" (sources."editorconfig-0.15.3" // { dependencies = [ sources."lru-cache-4.1.5" @@ -93041,22 +97218,29 @@ in sources."yallist-2.1.2" ]; }) - sources."emoji-regex-7.0.3" + sources."emoji-regex-8.0.0" sources."enquirer-2.3.6" - sources."entities-1.1.2" + sources."entities-2.1.0" sources."es6-promise-4.2.8" sources."es6-promisify-5.0.0" sources."escape-string-regexp-1.0.5" - (sources."eslint-7.15.0" // { + (sources."eslint-7.17.0" // { dependencies = [ - sources."eslint-visitor-keys-2.0.0" - sources."semver-7.3.4" + sources."ignore-4.0.6" ]; }) sources."eslint-scope-5.1.1" - sources."eslint-utils-2.1.0" - sources."eslint-visitor-keys-1.3.0" - sources."espree-7.3.1" + (sources."eslint-utils-2.1.0" // { + dependencies = [ + sources."eslint-visitor-keys-1.3.0" + ]; + }) + sources."eslint-visitor-keys-2.0.0" + (sources."espree-7.3.1" // { + dependencies = [ + sources."eslint-visitor-keys-1.3.0" + ]; + }) sources."esprima-4.0.1" (sources."esquery-1.3.1" // { dependencies = [ @@ -93069,11 +97253,13 @@ in ]; }) sources."estraverse-4.3.0" - sources."estree-walker-1.0.1" + sources."estree-walker-2.0.2" sources."esutils-2.0.3" sources."fast-deep-equal-3.1.3" + sources."fast-glob-3.2.4" sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" + sources."fastq-1.10.0" sources."fd-slicer-1.1.0" sources."file-entry-cache-6.0.0" sources."fill-range-7.0.1" @@ -93090,11 +97276,12 @@ in sources."glob-7.1.6" sources."glob-parent-5.1.1" sources."globals-12.4.0" + sources."globby-11.0.1" sources."growl-1.10.5" sources."has-1.0.3" sources."has-flag-3.0.0" sources."he-1.2.0" - sources."htmlparser2-3.10.1" + sources."htmlparser2-6.0.0" (sources."http-proxy-agent-2.1.0" // { dependencies = [ sources."debug-3.1.0" @@ -93106,15 +97293,15 @@ in sources."debug-3.2.7" ]; }) - sources."ignore-4.0.6" - sources."import-fresh-3.2.2" + sources."ignore-5.1.8" + sources."import-fresh-3.3.0" sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."is-binary-path-2.1.0" sources."is-core-module-2.2.0" sources."is-extglob-2.1.1" - sources."is-fullwidth-code-point-2.0.0" + sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.1" sources."is-module-1.0.0" sources."is-number-7.0.0" @@ -93122,7 +97309,7 @@ in sources."is-reference-1.2.1" sources."isexe-2.0.0" sources."js-tokens-4.0.0" - sources."js-yaml-3.14.0" + sources."js-yaml-3.14.1" sources."json-schema-traverse-0.4.1" sources."json-stable-stringify-without-jsonify-1.0.1" sources."leven-3.1.0" @@ -93139,15 +97326,18 @@ in ]; }) sources."mdurl-1.0.1" + sources."merge2-1.4.1" + sources."micromatch-4.0.2" sources."mime-1.6.0" - sources."mime-db-1.44.0" - sources."mime-types-2.1.27" + sources."mime-db-1.45.0" + sources."mime-types-2.1.28" sources."minimatch-3.0.4" (sources."mocha-8.2.1" // { dependencies = [ sources."debug-4.2.0" sources."escape-string-regexp-4.0.0" sources."has-flag-4.0.0" + sources."js-yaml-3.14.0" sources."supports-color-7.2.0" ]; }) @@ -93157,7 +97347,7 @@ in sources."natural-compare-1.4.0" sources."node-fetch-2.6.1" sources."normalize-path-3.0.0" - sources."nth-check-1.0.2" + sources."nth-check-2.0.0" sources."once-1.4.0" sources."optionator-0.9.1" sources."os-0.1.1" @@ -93173,11 +97363,13 @@ in sources."semver-5.7.1" ]; }) - sources."parse5-3.0.3" + sources."parse5-6.0.1" + sources."parse5-htmlparser2-tree-adapter-6.0.1" 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-type-4.0.0" sources."pend-1.2.0" sources."picomatch-2.2.2" sources."prelude-ls-1.2.1" @@ -93186,41 +97378,49 @@ in sources."punycode-2.1.1" sources."randombytes-2.1.0" sources."read-1.0.7" - sources."readable-stream-3.6.0" sources."readdirp-3.5.0" sources."regexpp-3.1.0" sources."require-directory-2.1.1" + sources."require-from-string-2.0.2" sources."require-main-filename-2.0.0" sources."resolve-1.19.0" sources."resolve-from-4.0.0" + sources."reusify-1.0.4" sources."rimraf-3.0.2" - sources."rollup-2.34.1" + sources."rollup-2.36.0" + sources."run-parallel-1.1.10" sources."safe-buffer-5.2.1" - sources."semver-6.3.0" + sources."semver-7.3.4" sources."serialize-javascript-5.0.1" sources."set-blocking-2.0.0" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."sigmund-1.0.1" - sources."slice-ansi-2.1.0" - sources."sourcemap-codec-1.4.8" - sources."sprintf-js-1.0.3" - (sources."string-width-3.1.0" // { + sources."slash-3.0.0" + (sources."slice-ansi-4.0.0" // { dependencies = [ - sources."ansi-regex-4.1.0" - sources."strip-ansi-5.2.0" + sources."ansi-styles-4.3.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" ]; }) - sources."string_decoder-1.3.0" + sources."sourcemap-codec-1.4.8" + sources."sprintf-js-1.0.3" + sources."string-width-4.2.0" sources."strip-ansi-6.0.0" sources."strip-json-comments-3.1.1" sources."supports-color-5.5.0" - sources."table-5.4.6" + (sources."table-6.0.7" // { + dependencies = [ + sources."ajv-7.0.3" + sources."json-schema-traverse-1.0.0" + ]; + }) sources."text-table-0.2.0" sources."tmp-0.0.29" sources."to-regex-range-5.0.1" sources."tslib-2.0.3" - (sources."tsutils-3.17.1" // { + (sources."tsutils-3.18.0" // { dependencies = [ sources."tslib-1.14.1" ]; @@ -93229,25 +97429,24 @@ in sources."type-check-0.4.0" sources."type-fest-0.8.1" sources."typed-rest-client-1.2.0" - sources."typescript-3.9.7" + sources."typescript-4.1.3" sources."typescript-formatter-7.2.2" sources."uc.micro-1.0.6" sources."underscore-1.8.3" sources."uri-js-4.4.0" sources."url-join-1.1.0" - sources."util-deprecate-1.0.2" sources."v8-compile-cache-2.2.0" - (sources."vsce-1.81.1" // { + (sources."vsce-1.83.0" // { dependencies = [ sources."chalk-2.4.2" - sources."commander-6.2.0" + sources."commander-6.2.1" sources."semver-5.7.1" ]; }) - sources."vscode-jsonrpc-6.0.0-next.7" - sources."vscode-languageclient-7.0.0-next.12" - sources."vscode-languageserver-protocol-3.16.0-next.10" - sources."vscode-languageserver-types-3.16.0-next.4" + sources."vscode-jsonrpc-6.0.0" + sources."vscode-languageclient-7.0.0" + sources."vscode-languageserver-protocol-3.16.0" + sources."vscode-languageserver-types-3.16.0" (sources."vscode-test-1.4.1" // { dependencies = [ sources."rimraf-2.7.1" @@ -93258,6 +97457,7 @@ in (sources."wide-align-1.1.3" // { dependencies = [ 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" ]; @@ -93267,6 +97467,9 @@ in (sources."wrap-ansi-5.1.0" // { dependencies = [ sources."ansi-regex-4.1.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" ]; }) @@ -93275,11 +97478,16 @@ in sources."yallist-4.0.0" (sources."yargs-13.3.2" // { dependencies = [ + sources."ansi-regex-4.1.0" + sources."emoji-regex-7.0.3" sources."find-up-3.0.0" + sources."is-fullwidth-code-point-2.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" + sources."strip-ansi-5.2.0" ]; }) sources."yargs-parser-13.1.2" @@ -93334,7 +97542,7 @@ in sources."crc-0.2.0" sources."crypto-0.0.3" sources."dashdash-1.14.1" - sources."debug-4.3.1" + sources."debug-4.3.2" sources."delayed-stream-1.0.0" sources."ecc-jsbn-0.1.2" sources."events.node-0.4.9" @@ -93380,8 +97588,8 @@ in sources."keypress-0.1.0" sources."methods-0.1.0" sources."mime-1.2.11" - sources."mime-db-1.44.0" - sources."mime-types-2.1.27" + sources."mime-db-1.45.0" + sources."mime-types-2.1.28" sources."mkdirp-0.3.5" sources."ms-2.1.2" sources."multiparty-2.2.0" @@ -93435,10 +97643,10 @@ in sass = nodeEnv.buildNodePackage { name = "sass"; packageName = "sass"; - version = "1.30.0"; + version = "1.32.0"; src = fetchurl { - url = "https://registry.npmjs.org/sass/-/sass-1.30.0.tgz"; - sha512 = "26EUhOXRLaUY7+mWuRFqGeGGNmhB1vblpTENO1Z7mAzzIZeVxZr9EZoaY1kyGLFWdSOZxRMAufiN2mkbO6dAlw=="; + url = "https://registry.npmjs.org/sass/-/sass-1.32.0.tgz"; + sha512 = "fhyqEbMIycQA4blrz/C0pYhv2o4x2y6FYYAH0CshBw3DXh5D5wyERgxw0ptdau1orc/GhNrhF7DFN2etyOCEng=="; }; dependencies = [ sources."anymatch-3.1.1" @@ -93538,14 +97746,14 @@ in }) sources."get-stream-3.0.0" sources."has-flag-3.0.0" - sources."ini-1.3.5" + sources."ini-1.3.8" sources."is-fullwidth-code-point-2.0.0" sources."is-stream-1.1.0" sources."isexe-2.0.0" sources."json-schema-traverse-0.4.1" sources."lru-cache-4.1.5" - sources."mime-db-1.44.0" - sources."mime-types-2.1.27" + sources."mime-db-1.45.0" + sources."mime-types-2.1.28" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."ms-2.0.0" @@ -93598,23 +97806,23 @@ in serverless = nodeEnv.buildNodePackage { name = "serverless"; packageName = "serverless"; - version = "2.15.0"; + version = "2.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/serverless/-/serverless-2.15.0.tgz"; - sha512 = "lgLFdmjcTJAP3v/BlZkE3EyE1ZkIfcoBcL/J/z9dF8er71w6UJ0pixbnJ4CYSOgqS5DK7MphaP+hTTY12Aw6OQ=="; + url = "https://registry.npmjs.org/serverless/-/serverless-2.17.0.tgz"; + sha512 = "OVlrvBESW0aQB3G/SrZQ3WFmALhHRU9qUJ/LLoyFlpddAY4hr0APOixWehiHvf4aI7Vuo04lP9zffttjhviOPA=="; }; dependencies = [ sources."2-thenable-1.0.0" (sources."@kwsites/file-exists-1.1.1" // { dependencies = [ - sources."debug-4.3.1" + sources."debug-4.3.2" sources."ms-2.1.2" ]; }) sources."@kwsites/promise-deferred-1.1.1" - sources."@nodelib/fs.scandir-2.1.3" - sources."@nodelib/fs.stat-2.0.3" - sources."@nodelib/fs.walk-1.2.4" + sources."@nodelib/fs.scandir-2.1.4" + sources."@nodelib/fs.stat-2.0.4" + sources."@nodelib/fs.walk-1.2.6" sources."@protobufjs/aspromise-1.1.2" sources."@protobufjs/base64-1.1.2" sources."@protobufjs/codegen-2.0.4" @@ -93646,14 +97854,14 @@ in sources."semver-6.3.0" ]; }) - sources."@serverless/enterprise-plugin-4.2.0" + sources."@serverless/enterprise-plugin-4.4.1" sources."@serverless/event-mocks-1.1.1" sources."@serverless/platform-client-3.1.4" sources."@serverless/platform-client-china-2.0.9" (sources."@serverless/platform-sdk-2.3.2" // { dependencies = [ sources."chalk-2.4.2" - sources."debug-4.3.1" + sources."debug-4.3.2" sources."https-proxy-agent-4.0.0" sources."is-docker-1.1.0" sources."ms-2.1.2" @@ -93663,12 +97871,14 @@ in ]; }) sources."@serverless/template-1.1.4" - (sources."@serverless/utils-2.0.0" // { + (sources."@serverless/utils-2.2.0" // { dependencies = [ + sources."argparse-2.0.1" + sources."js-yaml-4.0.0" sources."write-file-atomic-3.0.3" ]; }) - sources."@serverless/utils-china-1.0.11" + sources."@serverless/utils-china-1.0.12" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@tencent-sdk/capi-1.1.8" @@ -93676,9 +97886,9 @@ in sources."@types/caseless-0.12.2" sources."@types/http-cache-semantics-4.0.0" sources."@types/keyv-3.1.1" - sources."@types/lodash-4.14.165" + sources."@types/lodash-4.14.167" sources."@types/long-4.0.1" - sources."@types/node-14.14.10" + sources."@types/node-14.14.20" sources."@types/request-2.48.5" sources."@types/request-promise-native-1.0.17" sources."@types/responselike-1.0.0" @@ -93709,7 +97919,7 @@ in dependencies = [ sources."async-3.2.0" sources."bl-4.0.3" - sources."tar-stream-2.1.4" + sources."tar-stream-2.2.0" ]; }) (sources."archiver-utils-2.1.0" // { @@ -93735,7 +97945,7 @@ in sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" - (sources."aws-sdk-2.804.0" // { + (sources."aws-sdk-2.821.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" @@ -93794,8 +98004,8 @@ in sources."buffer-from-1.1.1" sources."buffermaker-1.2.1" sources."buffers-0.1.1" - sources."builtin-modules-3.1.0" - sources."cacheable-lookup-5.0.3" + sources."builtin-modules-3.2.0" + sources."cacheable-lookup-5.0.4" (sources."cacheable-request-6.1.0" // { dependencies = [ sources."get-stream-5.2.0" @@ -93868,7 +98078,7 @@ in ]; }) sources."dashdash-1.14.1" - sources."dayjs-1.9.7" + sources."dayjs-1.10.1" sources."debug-3.1.0" sources."decode-uri-component-0.2.0" sources."decompress-4.2.1" @@ -93891,7 +98101,7 @@ in sources."deferred-0.7.11" sources."delayed-stream-1.0.0" sources."delegates-1.0.0" - sources."denque-1.4.1" + sources."denque-1.5.0" sources."detect-libc-1.0.3" sources."diagnostics-1.1.1" sources."dijkstrajs-1.0.1" @@ -93931,11 +98141,7 @@ in sources."emoji-regex-8.0.0" sources."enabled-1.0.2" sources."end-of-stream-1.4.4" - (sources."engine.io-client-3.4.4" // { - dependencies = [ - sources."ws-6.1.4" - ]; - }) + sources."engine.io-client-3.5.0" sources."engine.io-parser-2.2.1" sources."env-variable-0.0.6" sources."es5-ext-0.10.53" @@ -93967,7 +98173,7 @@ in sources."fast-json-stable-stringify-2.1.0" sources."fast-safe-stringify-2.0.7" sources."fastest-levenshtein-1.0.12" - sources."fastq-1.9.0" + sources."fastq-1.10.0" sources."fd-slicer-1.1.0" sources."fecha-4.2.0" sources."figures-3.2.0" @@ -94018,7 +98224,7 @@ in sources."glob-7.1.6" sources."glob-parent-5.1.1" sources."globby-11.0.1" - (sources."got-11.8.0" // { + (sources."got-11.8.1" // { dependencies = [ sources."@sindresorhus/is-4.0.0" sources."@szmarczak/http-timer-4.0.5" @@ -94054,7 +98260,7 @@ in (sources."https-proxy-agent-5.0.0" // { dependencies = [ sources."agent-base-6.0.2" - sources."debug-4.3.1" + sources."debug-4.3.2" sources."ms-2.1.2" ]; }) @@ -94066,7 +98272,7 @@ in sources."indexof-0.0.1" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."ini-1.3.5" + sources."ini-1.3.8" (sources."inquirer-7.3.3" // { dependencies = [ sources."ansi-regex-5.0.0" @@ -94098,7 +98304,7 @@ in sources."isstream-0.1.2" sources."isurl-1.0.0" sources."jmespath-0.15.0" - sources."js-yaml-3.14.0" + sources."js-yaml-3.14.1" sources."jsbn-0.1.1" sources."json-buffer-3.0.0" sources."json-cycle-1.3.0" @@ -94149,7 +98355,7 @@ in }) (sources."logform-2.2.0" // { dependencies = [ - sources."ms-2.1.2" + sources."ms-2.1.3" ]; }) sources."long-1.1.2" @@ -94166,8 +98372,8 @@ in sources."methods-1.1.2" sources."micromatch-4.0.2" sources."mime-1.6.0" - sources."mime-db-1.44.0" - sources."mime-types-2.1.27" + sources."mime-db-1.45.0" + sources."mime-types-2.1.28" sources."mimic-fn-2.1.0" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" @@ -94200,7 +98406,7 @@ in sources."number-is-nan-1.0.1" sources."oauth-sign-0.9.0" sources."object-assign-4.1.1" - sources."object-hash-2.0.3" + sources."object-hash-2.1.1" sources."once-1.4.0" sources."one-time-0.0.4" sources."onetime-5.1.2" @@ -94250,7 +98456,7 @@ in sources."promise-queue-2.2.5" (sources."protobufjs-6.10.2" // { dependencies = [ - sources."@types/node-13.13.34" + sources."@types/node-13.13.39" sources."long-4.0.0" ]; }) @@ -94300,16 +98506,16 @@ in sources."signal-exit-3.0.3" sources."simple-concat-1.0.1" sources."simple-get-2.8.1" - (sources."simple-git-2.24.0" // { + (sources."simple-git-2.31.0" // { dependencies = [ - sources."debug-4.3.1" + sources."debug-4.3.2" sources."ms-2.1.2" ]; }) sources."simple-swizzle-0.2.2" sources."slash-3.0.0" sources."snappy-6.3.5" - sources."socket.io-client-2.3.1" + sources."socket.io-client-2.4.0" (sources."socket.io-parser-3.3.1" // { dependencies = [ sources."isarray-2.0.1" @@ -94354,7 +98560,7 @@ in sources."chalk-2.4.2" sources."cli-cursor-2.1.0" sources."cli-width-2.2.1" - sources."debug-4.3.1" + sources."debug-4.3.2" sources."figures-2.0.0" sources."inquirer-6.5.2" sources."is-fullwidth-code-point-2.0.0" @@ -94421,7 +98627,7 @@ in sources."url-to-options-1.0.1" sources."urlencode-1.1.0" sources."util-deprecate-1.0.2" - sources."uuid-8.3.1" + sources."uuid-8.3.2" sources."verror-1.10.0" sources."which-1.3.1" sources."which-pm-runs-1.0.0" @@ -94444,7 +98650,7 @@ in }) sources."wrappy-1.0.2" sources."write-file-atomic-2.4.3" - sources."ws-7.4.1" + sources."ws-7.4.2" sources."xml2js-0.4.19" sources."xmlbuilder-9.0.7" sources."xmlhttprequest-ssl-1.5.5" @@ -94593,8 +98799,8 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.44.0" - sources."mime-types-2.1.27" + sources."mime-db-1.45.0" + sources."mime-types-2.1.28" sources."minimist-1.2.5" sources."mkdirp-0.5.5" sources."moment-2.7.0" @@ -94709,6 +98915,8 @@ in sha512 = "8XJnwCFR4DatLz1s0nGFe6IJPJ+5pjRFhoBuBKq8SLgFI40eD7ak6jOXpzeG0tmIpyOc1zCs9bjKAxMFm1451A=="; }; dependencies = [ + sources."ansi-regex-5.0.0" + sources."ansi-styles-3.2.1" sources."arr-diff-4.0.0" sources."arr-flatten-1.1.0" sources."arr-union-3.1.0" @@ -94727,6 +98935,7 @@ in ]; }) sources."cache-base-1.0.1" + sources."chalk-2.4.2" (sources."class-utils-0.3.6" // { dependencies = [ sources."define-property-0.2.5" @@ -94744,9 +98953,10 @@ in sources."kind-of-5.1.0" ]; }) - sources."cli-table-0.3.1" + sources."cli-table-0.3.4" sources."collection-visit-1.0.0" - sources."colors-1.0.3" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" sources."commander-2.9.0" sources."component-emitter-1.3.0" sources."copy-descriptor-0.1.1" @@ -94754,6 +98964,8 @@ in sources."debug-2.6.9" sources."decode-uri-component-0.2.0" sources."define-property-2.0.2" + sources."emoji-regex-8.0.0" + sources."escape-string-regexp-1.0.5" (sources."expand-brackets-2.1.4" // { dependencies = [ sources."define-property-0.2.5" @@ -94793,6 +99005,7 @@ in sources."get-value-2.0.6" sources."graceful-fs-4.2.4" sources."graceful-readlink-1.0.1" + sources."has-flag-3.0.0" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { dependencies = [ @@ -94805,6 +99018,7 @@ in sources."is-data-descriptor-1.0.0" sources."is-descriptor-1.0.2" sources."is-extendable-0.1.1" + sources."is-fullwidth-code-point-3.0.0" (sources."is-number-3.0.0" // { dependencies = [ sources."kind-of-3.2.2" @@ -94907,7 +99121,10 @@ in sources."kind-of-5.1.0" ]; }) + sources."string-width-4.2.0" sources."string_decoder-1.1.1" + sources."strip-ansi-6.0.0" + sources."supports-color-5.5.0" (sources."to-object-path-0.3.0" // { dependencies = [ sources."kind-of-3.2.2" @@ -95095,10 +99312,10 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.434.2"; + version = "1.437.3"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.434.2.tgz"; - sha512 = "DPU3c0ixrefM7Rh7klUn9fTTTaiee3J3SKVn4zU7LxDREKlxPB+A+xiGkEbkRsLqIZK1xJtP6KopwWOSYjZ+Ow=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.437.3.tgz"; + sha512 = "DFcYz8Q8LT/XNCNxaeEoGahazvkEhWS//JWJTfr6W1d5jMnORQauPxxj4RR3WGjKewSDl2eElwK1jhi5RNOP9g=="; }; dependencies = [ sources."@sindresorhus/is-2.1.1" @@ -95112,7 +99329,12 @@ in sources."@snyk/dep-graph-1.21.0" sources."@snyk/docker-registry-v2-client-1.13.9" sources."@snyk/gemfile-1.2.0" - sources."@snyk/java-call-graph-builder-1.16.2" + (sources."@snyk/java-call-graph-builder-1.18.0" // { + dependencies = [ + sources."rimraf-3.0.2" + sources."tmp-0.2.1" + ]; + }) sources."@snyk/rpm-parser-2.2.1" (sources."@snyk/snyk-cocoapods-plugin-2.5.1" // { dependencies = [ @@ -95132,7 +99354,7 @@ in sources."@types/http-cache-semantics-4.0.0" sources."@types/js-yaml-3.12.5" sources."@types/keyv-3.1.1" - sources."@types/node-14.14.10" + sources."@types/node-14.14.20" sources."@types/responselike-1.0.0" sources."@types/semver-5.5.0" sources."@yarnpkg/lockfile-1.1.0" @@ -95186,7 +99408,7 @@ in sources."buffer-5.7.1" sources."buffer-from-1.1.1" sources."bytes-3.1.0" - sources."cacheable-lookup-5.0.3" + sources."cacheable-lookup-5.0.4" (sources."cacheable-request-7.0.1" // { dependencies = [ sources."get-stream-5.2.0" @@ -95215,7 +99437,7 @@ in }) sources."crypto-random-string-2.0.0" sources."data-uri-to-buffer-1.2.0" - sources."debug-4.3.1" + sources."debug-4.3.2" (sources."decompress-response-6.0.0" // { dependencies = [ sources."mimic-response-3.1.0" @@ -95279,7 +99501,7 @@ in ]; }) sources."glob-7.1.6" - sources."global-dirs-2.0.1" + sources."global-dirs-2.1.0" sources."got-11.4.0" sources."graceful-fs-4.2.4" sources."graphlib-2.1.8" @@ -95313,7 +99535,7 @@ in sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."ini-1.3.5" + sources."ini-1.3.7" (sources."inquirer-7.3.3" // { dependencies = [ sources."ansi-escapes-4.3.1" @@ -95343,7 +99565,7 @@ in sources."is-yarn-global-0.3.0" sources."isarray-0.0.1" sources."isexe-2.0.0" - sources."js-yaml-3.14.0" + sources."js-yaml-3.14.1" sources."json-buffer-3.0.1" (sources."jszip-3.5.0" // { dependencies = [ @@ -95391,7 +99613,7 @@ in sources."nice-try-1.0.5" sources."normalize-url-4.5.0" sources."npm-run-path-2.0.2" - sources."object-hash-2.0.3" + sources."object-hash-2.1.1" sources."once-1.4.0" sources."onetime-5.1.2" sources."open-7.3.0" @@ -95484,22 +99706,21 @@ in sources."tslib-2.0.3" ]; }) - (sources."snyk-docker-plugin-4.12.0" // { + (sources."snyk-docker-plugin-4.13.1" // { dependencies = [ sources."rimraf-3.0.2" sources."tmp-0.2.1" - sources."uuid-8.3.1" + sources."uuid-8.3.2" ]; }) sources."snyk-go-parser-1.4.1" - (sources."snyk-go-plugin-1.16.2" // { + (sources."snyk-go-plugin-1.16.4" // { dependencies = [ - sources."@snyk/dep-graph-1.19.4" sources."rimraf-3.0.2" sources."tmp-0.2.1" ]; }) - (sources."snyk-gradle-plugin-3.10.3" // { + (sources."snyk-gradle-plugin-3.11.0" // { dependencies = [ (sources."@snyk/cli-interface-2.9.1" // { dependencies = [ @@ -95543,7 +99764,7 @@ in }) (sources."snyk-nodejs-lockfile-parser-1.30.1" // { dependencies = [ - sources."uuid-8.3.1" + sources."uuid-8.3.2" ]; }) (sources."snyk-nuget-plugin-1.19.4" // { @@ -95633,7 +99854,7 @@ in sources."strip-eof-1.0.0" sources."strip-json-comments-2.0.1" sources."supports-color-5.5.0" - (sources."tar-stream-2.1.4" // { + (sources."tar-stream-2.2.0" // { dependencies = [ sources."readable-stream-3.6.0" sources."safe-buffer-5.2.1" @@ -95677,7 +99898,7 @@ in sources."url-parse-lax-3.0.0" sources."util-deprecate-1.0.2" sources."uuid-3.4.0" - sources."vscode-languageserver-types-3.15.1" + sources."vscode-languageserver-types-3.16.0" sources."which-1.3.1" sources."widest-line-3.1.0" sources."windows-release-3.3.3" @@ -95713,41 +99934,34 @@ in "socket.io" = nodeEnv.buildNodePackage { name = "socket.io"; packageName = "socket.io"; - version = "3.0.3"; + version = "3.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/socket.io/-/socket.io-3.0.3.tgz"; - sha512 = "TC1GnSXhDVmd3bHji5aG7AgWB8UL7E6quACbKra8uFXBqlMwEDbrJFK+tjuIY5Pe9N0L+MAPPDv3pycnn0000A=="; + url = "https://registry.npmjs.org/socket.io/-/socket.io-3.0.5.tgz"; + sha512 = "5yWQ43P/4IttmPCGKDQ3CVocBiJWGpibyhYJxgUhf69EHMzmK8XW0DkmHIoYdLmZaVZJyiEkUqpeC7rSCIqekw=="; }; dependencies = [ - sources."@types/body-parser-1.19.0" sources."@types/component-emitter-1.2.10" - sources."@types/connect-3.4.33" sources."@types/cookie-0.4.0" - sources."@types/cors-2.8.8" - sources."@types/express-4.17.9" - sources."@types/express-serve-static-core-4.17.14" - sources."@types/mime-2.0.3" - sources."@types/node-14.14.10" - sources."@types/qs-6.9.5" - sources."@types/range-parser-1.2.3" - sources."@types/serve-static-1.13.8" + sources."@types/cors-2.8.9" + sources."@types/node-14.14.20" sources."accepts-1.3.7" + sources."base64-arraybuffer-0.1.4" sources."base64id-2.0.0" sources."component-emitter-1.3.0" sources."cookie-0.4.1" sources."cors-2.8.5" - sources."debug-4.1.1" - sources."engine.io-4.0.4" - sources."engine.io-parser-4.0.1" - sources."mime-db-1.44.0" - sources."mime-types-2.1.27" + sources."debug-4.3.2" + sources."engine.io-4.0.6" + sources."engine.io-parser-4.0.2" + sources."mime-db-1.45.0" + sources."mime-types-2.1.28" sources."ms-2.1.2" sources."negotiator-0.6.2" sources."object-assign-4.1.1" sources."socket.io-adapter-2.0.3" - sources."socket.io-parser-4.0.2" + sources."socket.io-parser-4.0.3" sources."vary-1.1.2" - sources."ws-7.4.1" + sources."ws-7.4.2" ]; buildInputs = globalBuildInputs; meta = { @@ -95823,7 +100037,7 @@ in sources."import-lazy-2.1.0" sources."imurmurhash-0.1.4" sources."indent-string-3.2.0" - sources."ini-1.3.5" + sources."ini-1.3.8" sources."is-arrayish-0.2.1" sources."is-ci-1.2.1" sources."is-core-module-2.2.0" @@ -96000,7 +100214,7 @@ in sources."character-entities-legacy-1.1.4" sources."character-reference-invalid-1.1.4" sources."charwise-3.0.1" - sources."chloride-2.3.0" + sources."chloride-2.4.0" sources."chloride-test-1.2.4" sources."chokidar-1.7.0" (sources."class-utils-0.3.6" // { @@ -96048,7 +100262,7 @@ in sources."copy-descriptor-0.1.1" sources."core-util-is-1.0.2" sources."cross-spawn-6.0.5" - sources."debug-4.3.1" + sources."debug-4.3.2" sources."decode-uri-component-0.2.0" sources."deep-equal-1.1.1" sources."deep-extend-0.6.0" @@ -96078,7 +100292,7 @@ in ]; }) sources."epidemic-broadcast-trees-7.0.0" - sources."errno-0.1.7" + sources."errno-0.1.8" sources."es-abstract-1.17.7" (sources."es-get-iterator-1.1.1" // { dependencies = [ @@ -96146,7 +100360,7 @@ in sources."fs.realpath-1.0.0" sources."fsevents-1.2.13" sources."function-bind-1.1.1" - sources."get-intrinsic-1.0.1" + sources."get-intrinsic-1.0.2" sources."get-value-2.0.6" sources."glob-6.0.4" sources."glob-base-0.3.0" @@ -96183,7 +100397,7 @@ in sources."increment-buffer-1.0.1" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."ini-1.3.5" + sources."ini-1.3.8" sources."int53-1.0.0" sources."ip-1.1.5" sources."irregular-plurals-1.4.0" @@ -96197,7 +100411,7 @@ in sources."is-arguments-1.1.0" sources."is-bigint-1.0.1" sources."is-binary-path-1.0.1" - sources."is-boolean-object-1.0.1" + sources."is-boolean-object-1.1.0" sources."is-buffer-1.1.6" sources."is-callable-1.2.2" sources."is-canonical-base64-1.1.1" @@ -96214,14 +100428,13 @@ in ]; }) sources."is-dotfile-1.0.3" - sources."is-electron-2.2.0" sources."is-equal-shallow-0.1.3" sources."is-extendable-0.1.1" sources."is-extglob-1.0.0" sources."is-fullwidth-code-point-1.0.0" sources."is-glob-2.0.1" sources."is-hexadecimal-1.0.4" - sources."is-map-2.0.1" + sources."is-map-2.0.2" sources."is-negative-zero-2.0.1" sources."is-number-2.1.0" sources."is-number-object-1.0.4" @@ -96233,10 +100446,14 @@ in sources."is-posix-bracket-0.1.1" sources."is-primitive-2.0.0" sources."is-regex-1.1.1" - sources."is-set-2.0.1" + sources."is-set-2.0.2" sources."is-string-1.0.5" sources."is-symbol-1.0.3" - sources."is-typed-array-1.1.3" + (sources."is-typed-array-1.1.4" // { + dependencies = [ + sources."es-abstract-1.18.0-next.1" + ]; + }) sources."is-typedarray-1.0.0" sources."is-valid-domain-0.0.17" sources."is-weakmap-2.0.1" @@ -96300,11 +100517,11 @@ in sources."multiblob-1.13.7" sources."multiblob-http-1.0.0" sources."multicb-1.2.2" - sources."multiserver-3.6.0" + sources."multiserver-3.7.0" sources."multiserver-address-1.0.1" sources."multiserver-scopes-1.0.0" sources."mutexify-1.3.1" - sources."muxrpc-6.5.1" + sources."muxrpc-6.5.2" sources."muxrpc-usage-2.1.0" sources."muxrpc-validation-3.0.2" sources."muxrpcli-3.1.2" @@ -96323,7 +100540,7 @@ in }) sources."napi-macros-2.0.0" sources."ncp-2.0.0" - sources."nearley-2.20.0" + sources."nearley-2.20.1" sources."nice-try-1.0.5" sources."node-gyp-build-4.2.3" sources."non-private-ip-1.4.4" @@ -96373,7 +100590,7 @@ in sources."os-tmpdir-1.0.2" sources."osenv-0.1.5" sources."packet-stream-2.0.5" - sources."packet-stream-codec-1.1.2" + sources."packet-stream-codec-1.1.3" sources."parse-entities-1.2.2" sources."parse-glob-3.0.4" sources."pascalcase-0.1.1" @@ -96539,9 +100756,9 @@ in sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."secret-handshake-1.1.20" - sources."secret-stack-6.3.1" + sources."secret-stack-6.3.2" sources."semver-5.7.1" - sources."separator-escape-0.0.0" + sources."separator-escape-0.0.1" (sources."set-value-2.0.1" // { dependencies = [ sources."extend-shallow-2.0.1" @@ -96551,11 +100768,7 @@ in sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."shellsubstitute-1.2.0" - (sources."side-channel-1.0.3" // { - dependencies = [ - sources."es-abstract-1.18.0-next.1" - ]; - }) + sources."side-channel-1.0.4" sources."smart-buffer-4.1.0" (sources."snapdragon-0.8.2" // { dependencies = [ @@ -96630,7 +100843,7 @@ in }) sources."ssb-plugins-1.0.0" sources."ssb-query-2.4.5" - sources."ssb-ref-2.14.2" + sources."ssb-ref-2.14.3" sources."ssb-replicate-1.3.2" sources."ssb-unix-socket-1.0.0" sources."ssb-validate-4.1.3" @@ -96731,9 +100944,13 @@ in sources."vfile-sort-1.0.0" sources."ware-1.3.0" sources."which-1.3.1" - sources."which-boxed-primitive-1.0.1" + sources."which-boxed-primitive-1.0.2" sources."which-collection-1.0.1" - sources."which-typed-array-1.1.2" + (sources."which-typed-array-1.1.4" // { + dependencies = [ + sources."es-abstract-1.18.0-next.1" + ]; + }) sources."word-wrap-1.2.3" sources."wrap-fn-0.1.5" sources."wrappy-1.0.2" @@ -96837,7 +101054,7 @@ in sources."async-1.5.2" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" - (sources."aws-sdk-2.804.0" // { + (sources."aws-sdk-2.821.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -96861,7 +101078,6 @@ in sources."base64url-3.0.1" sources."basic-auth-1.1.0" sources."bcrypt-pbkdf-1.0.2" - sources."better-assert-1.0.2" sources."bindings-1.2.1" sources."blob-0.0.5" sources."bluebird-2.11.0" @@ -96882,7 +101098,6 @@ in sources."busboy-0.2.14" sources."bytebuffer-3.5.5" sources."bytes-3.1.0" - sources."callsite-1.0.0" sources."camelcase-1.2.1" sources."caseless-0.11.0" sources."center-align-0.1.3" @@ -96897,7 +101112,7 @@ in sources."combined-stream-1.0.8" sources."commander-2.20.3" sources."component-bind-1.0.0" - sources."component-emitter-1.2.1" + sources."component-emitter-1.3.0" sources."component-inherit-0.0.3" sources."compressible-2.0.18" (sources."compression-1.7.4" // { @@ -96973,21 +101188,18 @@ in sources."ejs-0.8.8" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" - (sources."engine.io-3.4.2" // { + (sources."engine.io-3.5.0" // { dependencies = [ - sources."cookie-0.3.1" + sources."cookie-0.4.1" sources."debug-4.1.1" - sources."ws-7.4.1" + sources."ws-7.4.2" ]; }) - (sources."engine.io-client-3.4.4" // { + (sources."engine.io-client-3.5.0" // { dependencies = [ - sources."component-emitter-1.3.0" sources."debug-3.1.0" sources."ms-2.0.0" - sources."parseqs-0.0.6" - sources."parseuri-0.0.6" - sources."ws-6.1.4" + sources."ws-7.4.2" ]; }) sources."engine.io-parser-2.2.1" @@ -97025,7 +101237,7 @@ in sources."fd-slicer-1.1.0" sources."finalhandler-1.1.2" sources."find-up-3.0.0" - sources."follow-redirects-1.13.0" + sources."follow-redirects-1.13.1" sources."forever-agent-0.6.1" sources."form-data-2.1.4" sources."formidable-1.2.2" @@ -97119,7 +101331,7 @@ in (sources."json-refs-2.1.7" // { dependencies = [ sources."esprima-4.0.1" - sources."js-yaml-3.14.0" + sources."js-yaml-3.14.1" sources."punycode-2.1.1" sources."uri-js-3.0.2" ]; @@ -97196,8 +101408,8 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.44.0" - sources."mime-types-2.1.27" + sources."mime-db-1.45.0" + sources."mime-types-2.1.28" sources."mimic-fn-2.1.0" sources."minicap-prebuilt-2.3.0" sources."minimatch-3.0.4" @@ -97205,7 +101417,7 @@ in sources."minitouch-prebuilt-1.2.0" sources."mkdirp-0.5.5" sources."moment-2.29.1" - sources."ms-2.1.2" + sources."ms-2.1.3" sources."multer-1.4.2" sources."mustache-2.3.2" sources."mv-2.1.1" @@ -97224,7 +101436,6 @@ in sources."oauth-0.9.15" sources."oauth-sign-0.8.2" sources."object-assign-4.1.1" - sources."object-component-0.0.3" sources."object-hash-0.3.0" sources."on-finished-2.3.0" sources."on-headers-1.0.2" @@ -97240,8 +101451,8 @@ in sources."p-locate-3.0.0" sources."p-try-2.2.0" sources."parse-json-2.2.0" - sources."parseqs-0.0.5" - sources."parseuri-0.0.5" + sources."parseqs-0.0.6" + sources."parseuri-0.0.6" sources."parseurl-1.3.3" sources."passport-0.3.2" sources."passport-oauth2-1.5.0" @@ -97369,28 +101580,23 @@ in sources."signal-exit-3.0.3" sources."slash-1.0.0" sources."sntp-1.0.9" - (sources."socket.io-2.3.0" // { + (sources."socket.io-2.4.0" // { dependencies = [ sources."debug-4.1.1" ]; }) sources."socket.io-adapter-1.1.2" - (sources."socket.io-client-2.3.0" // { + (sources."socket.io-client-2.4.0" // { dependencies = [ - sources."base64-arraybuffer-0.1.5" - sources."debug-4.1.1" + sources."debug-3.1.0" sources."isarray-2.0.1" sources."ms-2.0.0" - (sources."socket.io-parser-3.3.1" // { - dependencies = [ - sources."component-emitter-1.3.0" - sources."debug-3.1.0" - ]; - }) + sources."socket.io-parser-3.3.1" ]; }) (sources."socket.io-parser-3.4.1" // { dependencies = [ + sources."component-emitter-1.2.1" sources."debug-4.1.1" sources."isarray-2.0.1" ]; @@ -97447,7 +101653,7 @@ in (sources."swagger-node-runner-0.7.3" // { dependencies = [ sources."esprima-4.0.1" - sources."js-yaml-3.14.0" + sources."js-yaml-3.14.1" sources."lodash-3.10.1" sources."qs-6.9.4" ]; @@ -97457,7 +101663,7 @@ in dependencies = [ sources."esprima-4.0.1" sources."isarray-0.0.1" - sources."js-yaml-3.14.0" + sources."js-yaml-3.14.1" sources."path-to-regexp-1.8.0" ]; }) @@ -97579,7 +101785,7 @@ in sources."os-locale-1.4.0" sources."string-width-1.0.2" sources."which-module-1.0.0" - sources."y18n-3.2.1" + sources."y18n-3.2.2" sources."yargs-parser-4.2.1" ]; }) @@ -97620,32 +101826,32 @@ in sha512 = "iHH3dv3UI23SLDrH4zMQDjLT9/dDIz/IpoFeuNxZmEx86KtfpjDOscxLTFioQyv+2vQjPlRZnK0UoJtfxLICXQ=="; }; dependencies = [ - sources."@babel/code-frame-7.10.4" - sources."@babel/core-7.12.9" - sources."@babel/generator-7.12.5" - sources."@babel/helper-function-name-7.10.4" - sources."@babel/helper-get-function-arity-7.10.4" + sources."@babel/code-frame-7.12.11" + sources."@babel/core-7.12.10" + sources."@babel/generator-7.12.11" + sources."@babel/helper-function-name-7.12.11" + sources."@babel/helper-get-function-arity-7.12.10" sources."@babel/helper-member-expression-to-functions-7.12.7" sources."@babel/helper-module-imports-7.12.5" sources."@babel/helper-module-transforms-7.12.1" - sources."@babel/helper-optimise-call-expression-7.12.7" - sources."@babel/helper-replace-supers-7.12.5" + sources."@babel/helper-optimise-call-expression-7.12.10" + sources."@babel/helper-replace-supers-7.12.11" sources."@babel/helper-simple-access-7.12.1" - sources."@babel/helper-split-export-declaration-7.11.0" - sources."@babel/helper-validator-identifier-7.10.4" + sources."@babel/helper-split-export-declaration-7.12.11" + sources."@babel/helper-validator-identifier-7.12.11" sources."@babel/helpers-7.12.5" (sources."@babel/highlight-7.10.4" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.12.7" + sources."@babel/parser-7.12.11" sources."@babel/template-7.12.7" - sources."@babel/traverse-7.12.9" - sources."@babel/types-7.12.7" - sources."@nodelib/fs.scandir-2.1.3" - sources."@nodelib/fs.stat-2.0.3" - sources."@nodelib/fs.walk-1.2.4" + sources."@babel/traverse-7.12.12" + sources."@babel/types-7.12.12" + sources."@nodelib/fs.scandir-2.1.4" + sources."@nodelib/fs.stat-2.0.4" + sources."@nodelib/fs.walk-1.2.6" sources."@stylelint/postcss-css-in-js-0.37.2" sources."@stylelint/postcss-markdown-0.36.2" sources."@types/mdast-3.0.3" @@ -97653,7 +101859,7 @@ in sources."@types/normalize-package-data-2.4.0" sources."@types/parse-json-4.0.0" sources."@types/unist-2.0.3" - sources."ajv-6.12.6" + sources."ajv-7.0.3" sources."ansi-regex-5.0.0" sources."ansi-styles-3.2.1" sources."array-union-2.1.0" @@ -97664,11 +101870,11 @@ in sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."browserslist-4.15.0" + sources."browserslist-4.16.0" sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001165" + sources."caniuse-lite-1.0.30001173" (sources."chalk-4.1.0" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -97689,7 +101895,7 @@ in sources."convert-source-map-1.7.0" sources."cosmiconfig-7.0.0" sources."cssesc-3.0.0" - sources."debug-4.3.1" + sources."debug-4.3.2" sources."decamelize-1.2.0" (sources."decamelize-keys-1.1.0" // { dependencies = [ @@ -97706,7 +101912,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.3.616" + sources."electron-to-chromium-1.3.634" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -97716,9 +101922,8 @@ in sources."extend-3.0.2" sources."fast-deep-equal-3.1.3" sources."fast-glob-3.2.4" - sources."fast-json-stable-stringify-2.1.0" sources."fastest-levenshtein-1.0.12" - sources."fastq-1.9.0" + sources."fastq-1.10.0" sources."file-entry-cache-6.0.0" sources."fill-range-7.0.1" sources."find-up-4.1.0" @@ -97743,7 +101948,7 @@ in sources."html-tags-3.1.0" sources."htmlparser2-3.10.1" sources."ignore-5.1.8" - (sources."import-fresh-3.2.2" // { + (sources."import-fresh-3.3.0" // { dependencies = [ sources."resolve-from-4.0.0" ]; @@ -97754,7 +101959,7 @@ in sources."indexes-of-1.0.1" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."ini-1.3.5" + sources."ini-1.3.8" sources."is-alphabetical-1.0.4" sources."is-alphanumerical-1.0.4" sources."is-arrayish-0.2.1" @@ -97773,7 +101978,7 @@ in sources."js-tokens-4.0.0" sources."jsesc-2.5.2" sources."json-parse-even-better-errors-2.3.1" - sources."json-schema-traverse-0.4.1" + sources."json-schema-traverse-1.0.0" sources."json5-2.1.3" sources."kind-of-6.0.3" sources."known-css-properties-0.20.0" @@ -97785,16 +101990,12 @@ in sources."lru-cache-6.0.0" sources."map-obj-4.1.0" sources."mathml-tag-names-2.1.3" - sources."mdast-util-from-markdown-0.8.1" - (sources."mdast-util-to-markdown-0.5.4" // { - dependencies = [ - sources."mdast-util-to-string-2.0.0" - ]; - }) - sources."mdast-util-to-string-1.1.0" - sources."meow-8.0.0" + sources."mdast-util-from-markdown-0.8.4" + sources."mdast-util-to-markdown-0.6.2" + sources."mdast-util-to-string-2.0.0" + sources."meow-8.1.0" sources."merge2-1.4.1" - sources."micromark-2.10.1" + sources."micromark-2.11.2" sources."micromatch-4.0.2" sources."min-indent-1.0.1" sources."minimatch-3.0.4" @@ -97805,7 +102006,7 @@ in ]; }) sources."ms-2.1.2" - sources."node-releases-1.1.67" + sources."node-releases-1.1.69" (sources."normalize-package-data-3.0.0" // { dependencies = [ sources."semver-7.3.4" @@ -97865,9 +102066,9 @@ in sources."redent-3.0.0" sources."remark-13.0.0" sources."remark-parse-9.0.0" - sources."remark-stringify-9.0.0" + sources."remark-stringify-9.0.1" sources."repeat-string-1.6.1" - sources."replace-ext-1.0.0" + sources."require-from-string-2.0.2" sources."resolve-1.19.0" sources."resolve-from-5.0.0" sources."reusify-1.0.4" @@ -97902,7 +102103,7 @@ in sources."sugarss-2.0.0" sources."supports-color-5.5.0" sources."svg-tags-1.0.0" - sources."table-6.0.4" + sources."table-6.0.7" sources."to-fast-properties-2.0.0" sources."to-regex-range-5.0.1" sources."trim-newlines-3.0.0" @@ -97918,7 +102119,7 @@ in sources."util-deprecate-1.0.2" sources."v8-compile-cache-2.2.0" sources."validate-npm-package-license-3.0.4" - sources."vfile-4.2.0" + sources."vfile-4.2.1" sources."vfile-message-2.0.4" sources."which-1.3.1" sources."wrappy-1.0.2" @@ -97980,7 +102181,7 @@ in sources."escape-string-regexp-1.0.5" sources."esprima-4.0.1" sources."function-bind-1.1.1" - sources."get-intrinsic-1.0.1" + sources."get-intrinsic-1.0.2" sources."has-1.0.3" sources."has-flag-3.0.0" sources."has-symbols-1.0.1" @@ -97989,7 +102190,7 @@ in sources."is-negative-zero-2.0.1" sources."is-regex-1.1.1" sources."is-symbol-1.0.3" - sources."js-yaml-3.14.0" + sources."js-yaml-3.14.1" sources."mdn-data-2.0.4" sources."minimist-1.2.5" sources."mkdirp-0.5.5" @@ -98257,7 +102458,7 @@ in sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."ini-1.3.5" + sources."ini-1.3.8" sources."inquirer-0.10.1" sources."is-accessor-descriptor-1.0.0" sources."is-binary-path-1.0.1" @@ -98300,7 +102501,7 @@ in ]; }) sources."js-string-escape-1.0.1" - sources."js-yaml-3.14.0" + sources."js-yaml-3.14.1" sources."json-refs-2.1.7" (sources."json-schema-deref-sync-0.6.0" // { dependencies = [ @@ -98352,8 +102553,8 @@ in sources."methods-1.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."mime-db-1.45.0" + sources."mime-types-2.1.28" sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."mixin-deep-1.3.2" @@ -98380,7 +102581,7 @@ in (sources."nodemon-1.19.4" // { dependencies = [ sources."debug-3.2.7" - sources."ms-2.1.2" + sources."ms-2.1.3" sources."supports-color-5.5.0" ]; }) @@ -98418,7 +102619,7 @@ in (sources."path-loader-1.0.10" // { dependencies = [ sources."debug-3.2.7" - sources."ms-2.1.2" + sources."ms-2.1.3" sources."qs-6.9.4" sources."superagent-3.8.3" ]; @@ -98596,7 +102797,7 @@ in sources."truncate-utf8-bytes-1.0.2" sources."type-is-1.6.18" sources."typedarray-0.0.6" - sources."uglify-js-3.12.1" + sources."uglify-js-3.12.4" sources."undefsafe-2.0.3" (sources."union-value-1.0.1" // { dependencies = [ @@ -98686,7 +102887,7 @@ in sources."combined-stream-1.0.8" sources."core-util-is-1.0.2" sources."dashdash-1.14.1" - sources."debug-4.3.1" + sources."debug-4.3.2" sources."decamelize-1.2.0" sources."delayed-stream-1.0.0" sources."discord.js-11.6.4" @@ -98708,7 +102909,7 @@ in sources."is-fullwidth-code-point-2.0.0" sources."is-typedarray-1.0.0" sources."isstream-0.1.2" - sources."js-yaml-3.14.0" + sources."js-yaml-3.14.1" sources."jsbn-0.1.1" sources."json-schema-0.2.3" sources."json-schema-traverse-0.4.1" @@ -98716,9 +102917,9 @@ in sources."jsprim-1.4.1" sources."locate-path-3.0.0" sources."long-4.0.0" - sources."mime-2.4.6" - sources."mime-db-1.44.0" - sources."mime-types-2.1.27" + sources."mime-2.4.7" + sources."mime-db-1.45.0" + sources."mime-types-2.1.28" sources."minimist-1.2.5" sources."module-alias-2.2.2" sources."moment-2.29.1" @@ -98793,7 +102994,7 @@ in sources."concat-map-0.0.1" sources."core-util-is-1.0.2" sources."enhanced-resolve-2.3.0" - sources."errno-0.1.7" + sources."errno-0.1.8" sources."fs.realpath-1.0.0" sources."glob-7.1.6" sources."graceful-fs-4.2.4" @@ -98828,28 +103029,28 @@ in textlint = nodeEnv.buildNodePackage { name = "textlint"; packageName = "textlint"; - version = "11.7.6"; + version = "11.7.7"; src = fetchurl { - url = "https://registry.npmjs.org/textlint/-/textlint-11.7.6.tgz"; - sha512 = "o9nhbylWjOErba1gq2bMoJzughp9JK2VbENR+NCiMsNNEiaJ1P8jbnrL3ES86D6e0QMxziR79w5l7VmmdmLjCw=="; + url = "https://registry.npmjs.org/textlint/-/textlint-11.7.7.tgz"; + sha512 = "YSF2xLyvX5odEb142kqU2x0oUmL6yj4+mDolKb+ul5y7/HKEUgjq2G4GwkEtIOij1B52mbvS+MApI4Fx5VhhMA=="; }; dependencies = [ sources."@azu/format-text-1.0.1" sources."@azu/style-format-1.0.0" - sources."@textlint/ast-node-types-4.3.4" - sources."@textlint/ast-tester-2.2.4" - sources."@textlint/ast-traverse-2.2.5" - sources."@textlint/feature-flag-3.2.4" - sources."@textlint/fixer-formatter-3.2.5" - sources."@textlint/kernel-3.3.6" - sources."@textlint/linter-formatter-3.2.5" - sources."@textlint/markdown-to-ast-6.2.5" - sources."@textlint/module-interop-1.1.4" - sources."@textlint/text-to-ast-3.2.4" - sources."@textlint/textlint-plugin-markdown-5.2.6" - sources."@textlint/textlint-plugin-text-4.2.6" - sources."@textlint/types-1.4.5" - sources."@textlint/utils-1.1.4" + sources."@textlint/ast-node-types-4.3.5" + sources."@textlint/ast-tester-2.2.5" + sources."@textlint/ast-traverse-2.2.6" + sources."@textlint/feature-flag-3.2.5" + sources."@textlint/fixer-formatter-3.2.6" + sources."@textlint/kernel-3.3.7" + sources."@textlint/linter-formatter-3.2.6" + sources."@textlint/markdown-to-ast-6.2.6" + sources."@textlint/module-interop-1.1.5" + sources."@textlint/text-to-ast-3.2.5" + sources."@textlint/textlint-plugin-markdown-5.2.7" + sources."@textlint/textlint-plugin-text-4.2.7" + sources."@textlint/types-1.4.6" + sources."@textlint/utils-1.1.5" sources."ajv-4.11.8" sources."ajv-keywords-1.5.1" sources."ansi-regex-2.1.1" @@ -98877,7 +103078,7 @@ in sources."concat-stream-1.6.2" sources."core-util-is-1.0.2" sources."crypt-0.0.2" - sources."debug-4.3.1" + sources."debug-4.3.2" sources."deep-equal-1.1.1" sources."deep-is-0.1.3" sources."define-properties-1.1.3" @@ -98897,7 +103098,7 @@ in sources."format-0.2.2" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" - sources."get-intrinsic-1.0.1" + sources."get-intrinsic-1.0.2" sources."get-stdin-5.0.1" sources."glob-7.1.6" sources."graceful-fs-4.2.4" @@ -98926,12 +103127,12 @@ in sources."is-whitespace-character-1.0.4" sources."is-word-character-1.0.4" sources."isarray-1.0.0" - sources."js-yaml-3.14.0" + sources."js-yaml-3.14.1" sources."json-parse-better-errors-1.0.2" sources."json-stable-stringify-1.0.1" sources."json5-2.1.3" sources."jsonify-0.0.0" - sources."levn-0.3.0" + sources."levn-0.4.1" sources."load-json-file-1.1.0" sources."locate-path-2.0.0" sources."lodash-4.17.20" @@ -98950,7 +103151,7 @@ in sources."object-keys-1.1.1" sources."object.assign-4.1.2" sources."once-1.4.0" - sources."optionator-0.8.3" + sources."optionator-0.9.1" sources."p-limit-1.3.0" sources."p-locate-2.0.0" sources."p-try-1.0.0" @@ -98965,7 +103166,7 @@ in sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" sources."pluralize-2.0.0" - sources."prelude-ls-1.1.2" + sources."prelude-ls-1.2.1" sources."process-nextick-args-2.0.1" sources."rc-config-loader-3.0.0" sources."read-pkg-1.1.0" @@ -99027,7 +103228,7 @@ in sources."trim-trailing-lines-1.1.4" sources."trough-1.0.5" sources."try-resolve-1.0.1" - sources."type-check-0.3.2" + sources."type-check-0.4.0" sources."typedarray-0.0.6" sources."unherit-1.1.3" sources."unified-6.2.0" @@ -99068,7 +103269,7 @@ in sha1 = "9139c65b8da891c983b368a50a286338cd76777a"; }; dependencies = [ - sources."@textlint/ast-node-types-4.3.4" + sources."@textlint/ast-node-types-4.3.5" sources."txt-to-ast-3.0.3" ]; buildInputs = globalBuildInputs; @@ -99095,7 +103296,7 @@ in sources."es-abstract-1.17.7" sources."es-to-primitive-1.2.1" sources."function-bind-1.1.1" - sources."get-intrinsic-1.0.1" + sources."get-intrinsic-1.0.2" sources."has-1.0.3" sources."has-symbols-1.0.1" sources."is-callable-1.2.2" @@ -99129,13 +103330,13 @@ in sha512 = "z/Xo1WHxAn7eueUbRLXoMNew+R3dzGENPG/yiCt/KT2WgAfRuQ7GeF855kLcnCCqdTnl6W7sYq8TKy+/DLpiqQ=="; }; dependencies = [ - sources."@babel/code-frame-7.10.4" - sources."@babel/helper-validator-identifier-7.10.4" + sources."@babel/code-frame-7.12.11" + sources."@babel/helper-validator-identifier-7.12.11" sources."@babel/highlight-7.10.4" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@textlint/ast-node-types-4.3.4" - sources."@textlint/types-1.4.5" + sources."@textlint/ast-node-types-4.3.5" + sources."@textlint/types-1.4.6" sources."@types/hast-2.3.1" sources."@types/minimist-1.2.1" sources."@types/normalize-package-data-2.4.0" @@ -99202,7 +103403,7 @@ in sources."core-util-is-1.0.2" sources."crypto-random-string-2.0.0" sources."cuss-1.21.0" - sources."debug-4.3.1" + sources."debug-4.3.2" sources."decamelize-1.2.0" (sources."decamelize-keys-1.1.0" // { dependencies = [ @@ -99239,7 +103440,11 @@ in 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."global-dirs-2.1.0" // { + dependencies = [ + sources."ini-1.3.7" + ]; + }) sources."got-9.6.0" sources."graceful-fs-4.2.4" sources."hard-rejection-2.1.0" @@ -99265,7 +103470,7 @@ in sources."indent-string-4.0.0" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."ini-1.3.5" + sources."ini-1.3.8" sources."is-alphabetical-1.0.4" sources."is-alphanumeric-1.0.0" sources."is-alphanumerical-1.0.4" @@ -99288,7 +103493,7 @@ in sources."is-yarn-global-0.3.0" sources."isarray-0.0.1" sources."js-tokens-4.0.0" - sources."js-yaml-3.14.0" + sources."js-yaml-3.14.1" sources."json-buffer-3.0.0" sources."json-parse-even-better-errors-2.3.1" sources."keyv-3.1.0" @@ -99388,7 +103593,6 @@ in 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.19.0" sources."resolve-from-5.0.0" sources."responselike-1.0.2" @@ -99473,13 +103677,13 @@ in sources."is-plain-obj-2.1.0" ]; }) - sources."unified-diff-3.0.1" + sources."unified-diff-3.1.0" (sources."unified-engine-8.0.0" // { dependencies = [ sources."is-plain-obj-2.1.0" ]; }) - sources."unified-message-control-3.0.1" + sources."unified-message-control-3.0.2" sources."unique-string-2.0.0" sources."unist-util-inspect-5.0.1" sources."unist-util-is-4.0.4" @@ -99503,11 +103707,11 @@ in sources."url-parse-lax-3.0.0" sources."util-deprecate-1.0.2" sources."validate-npm-package-license-3.0.4" - sources."vfile-4.2.0" + sources."vfile-4.2.1" sources."vfile-find-up-5.0.1" sources."vfile-location-3.2.0" sources."vfile-message-2.0.4" - (sources."vfile-reporter-6.0.1" // { + (sources."vfile-reporter-6.0.2" // { dependencies = [ sources."supports-color-6.1.0" ]; @@ -99662,8 +103866,8 @@ in sha512 = "HydBbkWjnMn4KrnlpnusY1BGjIG+64UySxRCvRphUAIiuJL2nbkdrIIiOjwfQhllKUa7Sf33bs6RAcbEWjZVfg=="; }; dependencies = [ - sources."@textlint/ast-node-types-4.3.4" - sources."@textlint/types-1.4.5" + sources."@textlint/ast-node-types-4.3.5" + sources."@textlint/types-1.4.6" sources."boundary-1.0.1" sources."buffer-from-1.1.1" sources."call-bind-1.0.0" @@ -99672,7 +103876,7 @@ in sources."es-abstract-1.18.0-next.1" sources."es-to-primitive-1.2.1" sources."function-bind-1.1.1" - sources."get-intrinsic-1.0.1" + sources."get-intrinsic-1.0.2" sources."has-1.0.3" sources."has-symbols-1.0.1" sources."inherits-2.0.4" @@ -99728,7 +103932,7 @@ in sources."es-abstract-1.17.7" sources."es-to-primitive-1.2.1" sources."function-bind-1.1.1" - sources."get-intrinsic-1.0.1" + sources."get-intrinsic-1.0.2" sources."has-1.0.3" sources."has-symbols-1.0.1" sources."is-callable-1.2.2" @@ -99754,14 +103958,14 @@ in textlint-rule-stop-words = nodeEnv.buildNodePackage { name = "textlint-rule-stop-words"; packageName = "textlint-rule-stop-words"; - version = "2.0.7"; + version = "2.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/textlint-rule-stop-words/-/textlint-rule-stop-words-2.0.7.tgz"; - sha512 = "wBG1K2HfmQaHEjxMddRB9canjBbX6xaztVB5d0cgOBVj9NTvPVWf4z9OuTfYUEmIt84wAvQ6XxsIA9YTJ+N5Fg=="; + url = "https://registry.npmjs.org/textlint-rule-stop-words/-/textlint-rule-stop-words-2.0.8.tgz"; + sha512 = "D945uyFkeMo6KJhMJaFTEHudP+Jkl00rLOQKRibV1zl933muR6NXqz+uXAvitPAEWH20kwQA40E0Cd1t8nJQ1w=="; }; dependencies = [ - sources."@textlint/ast-node-types-4.3.4" - sources."@textlint/types-1.4.5" + sources."@textlint/ast-node-types-4.3.5" + sources."@textlint/types-1.4.6" sources."boundary-1.0.1" sources."lodash-4.17.20" sources."split-lines-2.0.0" @@ -99790,8 +103994,8 @@ in sha512 = "kLw4qL8RwY2lCNqgKveHc5sjCDlS5Tdw2TXWOrHvSvQxqaVOwsv3+51oMIQLGfJzQrhFSMlSlw5MvfaOerBvPQ=="; }; dependencies = [ - sources."@textlint/ast-node-types-4.3.4" - sources."@textlint/types-1.4.5" + sources."@textlint/ast-node-types-4.3.5" + sources."@textlint/types-1.4.6" sources."boundary-1.0.1" sources."lodash-4.17.20" sources."strip-json-comments-3.1.1" @@ -99826,7 +104030,7 @@ in sources."es-abstract-1.18.0-next.1" sources."es-to-primitive-1.2.1" sources."function-bind-1.1.1" - sources."get-intrinsic-1.0.1" + sources."get-intrinsic-1.0.2" sources."has-1.0.3" sources."has-symbols-1.0.1" sources."is-callable-1.2.2" @@ -99861,15 +104065,15 @@ in sha1 = "3c79b04091319d4e8be5fb442c596bf500e8493e"; }; dependencies = [ - sources."@textlint/ast-node-types-4.3.4" - sources."@textlint/types-1.4.5" + sources."@textlint/ast-node-types-4.3.5" + sources."@textlint/types-1.4.6" sources."adverb-where-0.0.9" sources."boundary-1.0.1" sources."call-bind-1.0.0" sources."define-properties-1.1.3" sources."e-prime-0.10.4" sources."function-bind-1.1.1" - sources."get-intrinsic-1.0.1" + sources."get-intrinsic-1.0.2" sources."has-1.0.3" sources."has-symbols-1.0.1" sources."no-cliches-0.1.1" @@ -99911,7 +104115,7 @@ 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.14.10" + sources."@types/node-14.14.20" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-2.0.1" @@ -99919,7 +104123,7 @@ in sources."after-0.8.2" (sources."agent-base-6.0.2" // { dependencies = [ - sources."debug-4.3.1" + sources."debug-4.3.2" sources."ms-2.1.2" ]; }) @@ -99961,7 +104165,7 @@ in sources."buffer-equal-constant-time-1.0.1" sources."busboy-0.3.1" sources."bytes-3.1.0" - sources."cacheable-lookup-5.0.3" + sources."cacheable-lookup-5.0.4" sources."cacheable-request-7.0.1" sources."callsite-1.0.0" sources."caseless-0.12.0" @@ -99987,7 +104191,7 @@ in sources."content-type-1.0.4" sources."cookie-0.4.0" sources."cookie-signature-1.0.6" - sources."core-js-3.8.0" + sources."core-js-3.8.2" sources."core-util-is-1.0.2" sources."css-select-1.2.0" sources."css-what-2.1.3" @@ -100020,7 +104224,7 @@ in dependencies = [ sources."cookie-0.3.1" sources."debug-4.1.1" - sources."ms-2.1.2" + sources."ms-2.1.3" ]; }) (sources."engine.io-client-3.4.4" // { @@ -100084,7 +104288,7 @@ in sources."http_ece-1.1.0" (sources."https-proxy-agent-5.0.0" // { dependencies = [ - sources."debug-4.3.1" + sources."debug-4.3.2" sources."ms-2.1.2" ]; }) @@ -100094,7 +104298,7 @@ in sources."indexof-0.0.1" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."ini-1.3.5" + sources."ini-1.3.8" sources."ipaddr.js-1.9.1" (sources."irc-framework-4.9.0" // { dependencies = [ @@ -100145,7 +104349,7 @@ in (sources."needle-2.5.2" // { dependencies = [ sources."debug-3.2.7" - sources."ms-2.1.2" + sources."ms-2.1.3" ]; }) sources."negotiator-0.6.2" @@ -100210,7 +104414,7 @@ in sources."parseurl-1.3.3" sources."path-is-absolute-1.0.1" sources."path-to-regexp-0.1.7" - sources."peek-readable-3.1.0" + sources."peek-readable-3.1.1" sources."performance-now-2.1.0" sources."pify-4.0.1" sources."precond-0.2.3" @@ -100257,7 +104461,7 @@ in (sources."socket.io-2.3.0" // { dependencies = [ sources."debug-4.1.1" - sources."ms-2.1.2" + sources."ms-2.1.3" ]; }) sources."socket.io-adapter-1.1.2" @@ -100265,7 +104469,7 @@ in dependencies = [ sources."base64-arraybuffer-0.1.5" sources."debug-4.1.1" - sources."ms-2.1.2" + sources."ms-2.1.3" (sources."socket.io-parser-3.3.1" // { dependencies = [ sources."component-emitter-1.3.0" @@ -100278,7 +104482,7 @@ in (sources."socket.io-parser-3.4.1" // { dependencies = [ sources."debug-4.1.1" - sources."ms-2.1.2" + sources."ms-2.1.3" ]; }) (sources."socksjs-0.5.0" // { @@ -100295,7 +104499,7 @@ in sources."strip-ansi-3.0.1" sources."strip-json-comments-2.0.1" sources."strip-outer-1.0.1" - sources."strtok3-6.0.4" + sources."strtok3-6.0.6" sources."supports-color-7.2.0" sources."tar-4.4.13" sources."tlds-1.208.0" @@ -100326,7 +104530,7 @@ in sources."wide-align-1.1.3" sources."with-open-file-0.1.7" sources."wrappy-1.0.2" - sources."ws-7.4.1" + sources."ws-7.4.2" sources."xmlhttprequest-ssl-1.5.5" sources."yallist-3.1.1" sources."yarn-1.22.4" @@ -100345,10 +104549,10 @@ in three = nodeEnv.buildNodePackage { name = "three"; packageName = "three"; - version = "0.123.0"; + version = "0.124.0"; src = fetchurl { - url = "https://registry.npmjs.org/three/-/three-0.123.0.tgz"; - sha512 = "KNnx/IbilvoHRkxOtL0ouozoDoElyuvAXhFB21RK7F5IPWSmqyFelICK6x3hJerLNSlAdHxR0hkuvMMhH9pqXg=="; + url = "https://registry.npmjs.org/three/-/three-0.124.0.tgz"; + sha512 = "ROXp1Ly7YyF+jC910DQyAWj++Qlw2lQv0qwYLNQwdDbjk4bsOXAfGO92wYTMPNei1GMJUmCxSxc3MjGBTS09Rg=="; }; buildInputs = globalBuildInputs; meta = { @@ -100363,10 +104567,10 @@ in tiddlywiki = nodeEnv.buildNodePackage { name = "tiddlywiki"; packageName = "tiddlywiki"; - version = "5.1.22"; + version = "5.1.23"; src = fetchurl { - url = "https://registry.npmjs.org/tiddlywiki/-/tiddlywiki-5.1.22.tgz"; - sha512 = "Iav0iC9SnwN6HTYGRfEI7kYDoq+hlKr9fw9o8aTs0wxMp0UzqlvthGwlK1JwrdVIRL92no1lpVGhQQj16ncSQQ=="; + url = "https://registry.npmjs.org/tiddlywiki/-/tiddlywiki-5.1.23.tgz"; + sha512 = "U5P6CdVncHqfoMRAYGj8NxqbP2JJICdLre+jAlXzV8nhllRL9ZFIE0y80wASXc6xip6++TA67Pam7+FJ73A1Vw=="; }; buildInputs = globalBuildInputs; meta = { @@ -100447,8 +104651,8 @@ in sources."keypress-0.2.1" sources."lodash-4.17.20" sources."lru-cache-6.0.0" - sources."mime-db-1.44.0" - sources."mime-types-2.1.27" + sources."mime-db-1.45.0" + sources."mime-types-2.1.28" sources."minimatch-3.0.4" (sources."node-appc-1.1.2" // { dependencies = [ @@ -100481,7 +104685,7 @@ in sources."tweetnacl-0.14.5" sources."universalify-1.0.0" sources."uri-js-4.4.0" - sources."uuid-8.3.1" + sources."uuid-8.3.2" sources."verror-1.10.0" (sources."winston-2.4.5" // { dependencies = [ @@ -100507,10 +104711,10 @@ in triton = nodeEnv.buildNodePackage { name = "triton"; packageName = "triton"; - version = "7.11.0"; + version = "7.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/triton/-/triton-7.11.0.tgz"; - sha512 = "NycwGp9drvi9uJUo7PCmET470f+ZWzvzJ7d06hcI+Y0LZSLtZN+gxFz+YjLpt14Zifqs/751IcEhp7cCGThBxA=="; + url = "https://registry.npmjs.org/triton/-/triton-7.12.0.tgz"; + sha512 = "ArYQDI90SwshcxQBE8ogpY1UHMwm5aiZ4GtqzGZG+wn9F5jHUbkDwNXfbVIGQZrFcg/vDtzhscUzI7UIphjJMA=="; }; dependencies = [ sources."asn1-0.2.4" @@ -100777,10 +104981,10 @@ in typescript = nodeEnv.buildNodePackage { name = "typescript"; packageName = "typescript"; - version = "4.1.2"; + version = "4.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-4.1.2.tgz"; - sha512 = "thGloWsGH3SOxv1SoY7QojKi0tc+8FnOmiarEGMbd/lar7QOEd3hvlx3Fp5y6FlDUGl9L+pd4n2e+oToGMmhRQ=="; + url = "https://registry.npmjs.org/typescript/-/typescript-4.1.3.tgz"; + sha512 = "B3ZIOf1IKeH2ixgHhj6la6xdwR9QrLC5d1VKeCSY4tvkqhF2eqd9O7txNlS0PO3GrBAFIdr3L1ndNwteUbZLYg=="; }; buildInputs = globalBuildInputs; meta = { @@ -100812,10 +105016,10 @@ in sources."tempy-0.2.1" sources."unique-string-1.0.0" sources."universalify-0.1.2" - sources."vscode-jsonrpc-5.0.1" + sources."vscode-jsonrpc-6.0.0" sources."vscode-languageserver-5.3.0-next.10" - sources."vscode-languageserver-protocol-3.15.3" - sources."vscode-languageserver-types-3.15.1" + sources."vscode-languageserver-protocol-3.16.0" + sources."vscode-languageserver-types-3.16.0" sources."vscode-textbuffer-1.0.0" sources."vscode-uri-1.0.8" ]; @@ -100831,10 +105035,10 @@ in uglify-js = nodeEnv.buildNodePackage { name = "uglify-js"; packageName = "uglify-js"; - version = "3.12.1"; + version = "3.12.4"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.12.1.tgz"; - sha512 = "o8lHP20KjIiQe5b/67Rh68xEGRrc2SRsCuuoYclXXoC74AfSRGblU1HKzJWH3HxPZ+Ort85fWHpSX7KwBUC9CQ=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.12.4.tgz"; + sha512 = "L5i5jg/SHkEqzN18gQMTWsZk3KelRsfD1wUVNqtq0kzqWQqcJjyL8yc1o8hJgRrWqrAl2mUFbhfznEIoi7zi2A=="; }; buildInputs = globalBuildInputs; meta = { @@ -100867,28 +105071,20 @@ in ungit = nodeEnv.buildNodePackage { name = "ungit"; packageName = "ungit"; - version = "1.5.14"; + version = "1.5.15"; src = fetchurl { - url = "https://registry.npmjs.org/ungit/-/ungit-1.5.14.tgz"; - sha512 = "F8dtwD2lV3ey0zIZfZXqcBaOweZ/iEVx0RQxjDgGWEsKBnnbXLxNlTNqzrhUuFuskJNVv6Se2QzyBWVMn2mbuA=="; + url = "https://registry.npmjs.org/ungit/-/ungit-1.5.15.tgz"; + sha512 = "jisiuRjEd8HfBLQxATHzyWnvSljsKwBs+YEPl50yg91ZQiie7tQWBlw/wKxfFfVzN52HYIqKvOEWYqJYJgpP8A=="; }; dependencies = [ sources."@dabh/diagnostics-2.0.2" - sources."@primer/octicons-11.1.0" + sources."@primer/octicons-11.2.0" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/body-parser-1.19.0" sources."@types/component-emitter-1.2.10" - sources."@types/connect-3.4.33" sources."@types/cookie-0.4.0" - sources."@types/cors-2.8.8" - sources."@types/express-4.17.9" - sources."@types/express-serve-static-core-4.17.14" - sources."@types/mime-2.0.3" - sources."@types/node-14.14.10" - sources."@types/qs-6.9.5" - sources."@types/range-parser-1.2.3" - sources."@types/serve-static-1.13.8" + sources."@types/cors-2.8.9" + sources."@types/node-14.14.20" sources."abbrev-1.1.1" sources."accepts-1.3.7" sources."ansi-regex-5.0.0" @@ -100901,6 +105097,7 @@ in sources."array-flatten-1.1.1" sources."async-3.2.0" sources."balanced-match-1.0.0" + sources."base64-arraybuffer-0.1.4" sources."base64id-2.0.0" sources."blueimp-md5-2.18.0" sources."body-parser-1.19.0" @@ -100939,7 +105136,7 @@ in sources."depd-1.1.2" sources."destroy-1.0.4" sources."diff-4.0.2" - sources."diff2html-3.1.15" + sources."diff2html-3.1.18" sources."dnd-page-scroll-0.0.4" sources."duplexer3-0.1.4" sources."ee-first-1.1.1" @@ -100947,14 +105144,14 @@ in sources."enabled-2.0.0" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" - (sources."engine.io-4.0.4" // { + (sources."engine.io-4.0.6" // { dependencies = [ sources."cookie-0.4.1" - sources."debug-4.1.1" + sources."debug-4.3.2" sources."ms-2.1.2" ]; }) - sources."engine.io-parser-4.0.1" + sources."engine.io-parser-4.0.2" sources."escalade-3.1.1" sources."escape-html-1.0.3" sources."etag-1.8.1" @@ -100990,7 +105187,7 @@ in sources."ignore-5.1.8" sources."inflight-1.0.6" sources."inherits-2.0.3" - sources."ini-1.3.5" + sources."ini-1.3.8" sources."ipaddr.js-1.9.1" sources."is-arrayish-0.3.2" sources."is-docker-2.1.1" @@ -101010,7 +105207,7 @@ in sources."lodash-4.17.20" (sources."logform-2.2.0" // { dependencies = [ - sources."ms-2.1.2" + sources."ms-2.1.3" ]; }) sources."lowercase-keys-1.0.1" @@ -101018,15 +105215,15 @@ in sources."media-typer-0.3.0" (sources."memorystore-1.6.4" // { dependencies = [ - sources."debug-4.3.1" + sources."debug-4.3.2" sources."ms-2.1.2" ]; }) sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.44.0" - sources."mime-types-2.1.27" + sources."mime-db-1.45.0" + sources."mime-types-2.1.28" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" @@ -101092,16 +105289,16 @@ in sources."signals-1.0.0" sources."simple-swizzle-0.2.2" sources."snapsvg-0.5.1" - (sources."socket.io-3.0.3" // { + (sources."socket.io-3.0.5" // { dependencies = [ - sources."debug-4.1.1" + sources."debug-4.3.2" sources."ms-2.1.2" ]; }) sources."socket.io-adapter-2.0.3" - (sources."socket.io-parser-4.0.2" // { + (sources."socket.io-parser-4.0.3" // { dependencies = [ - sources."debug-4.1.1" + sources."debug-4.3.2" sources."ms-2.1.2" ]; }) @@ -101141,10 +105338,10 @@ in }) sources."wrap-ansi-7.0.0" sources."wrappy-1.0.2" - sources."ws-7.4.1" + sources."ws-7.4.2" sources."y18n-5.0.5" sources."yallist-2.1.2" - sources."yargs-16.1.1" + sources."yargs-16.2.0" sources."yargs-parser-20.2.4" ]; buildInputs = globalBuildInputs; @@ -101160,10 +105357,10 @@ in vega-cli = nodeEnv.buildNodePackage { name = "vega-cli"; packageName = "vega-cli"; - version = "5.17.0"; + version = "5.17.3"; src = fetchurl { - url = "https://registry.npmjs.org/vega-cli/-/vega-cli-5.17.0.tgz"; - sha512 = "IMsPOtAnagoKK0czFoVdeVfDsGAKb8fPyDON68kEeWp9Jql71QAninG1ZqdjR2yHQy66szfP7ou9ksIIWyKGJw=="; + url = "https://registry.npmjs.org/vega-cli/-/vega-cli-5.17.3.tgz"; + sha512 = "gxLAxIxFmq+36eB0ETCo4F29+/gWFfGftLxpCs8/fVKW9ILfJnEBd3M+7qdQKRHhVbImqsPetaKzwtIYH7/EPw=="; }; dependencies = [ sources."abbrev-1.1.1" @@ -101190,7 +105387,7 @@ in sources."concat-map-0.0.1" sources."console-control-strings-1.1.0" sources."core-util-is-1.0.2" - sources."d3-array-2.9.0" + sources."d3-array-2.9.1" sources."d3-color-2.0.0" sources."d3-delaunay-5.3.0" sources."d3-dispatch-2.0.0" @@ -101228,7 +105425,7 @@ in sources."ignore-walk-3.0.3" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."ini-1.3.5" + sources."ini-1.3.8" sources."is-core-module-2.2.0" sources."is-fullwidth-code-point-1.0.0" sources."isarray-1.0.0" @@ -101238,7 +105435,7 @@ in sources."minipass-2.9.0" sources."minizlib-1.3.3" sources."mkdirp-0.5.5" - sources."ms-2.1.2" + sources."ms-2.1.3" sources."nan-2.14.2" sources."needle-2.5.2" sources."node-fetch-2.6.1" @@ -101278,33 +105475,33 @@ in sources."tar-4.4.13" sources."topojson-client-3.1.0" sources."util-deprecate-1.0.2" - sources."vega-5.17.0" + sources."vega-5.17.3" sources."vega-canvas-1.2.6" sources."vega-crossfilter-4.0.5" sources."vega-dataflow-5.7.3" sources."vega-encode-4.8.3" sources."vega-event-selector-2.0.6" - sources."vega-expression-3.0.0" + sources."vega-expression-4.0.1" sources."vega-force-4.0.7" sources."vega-format-1.0.4" - sources."vega-functions-5.8.0" - sources."vega-geo-4.3.7" + sources."vega-functions-5.10.0" + sources."vega-geo-4.3.8" sources."vega-hierarchy-4.0.9" sources."vega-label-1.0.0" sources."vega-loader-4.4.0" - sources."vega-parser-6.1.0" + sources."vega-parser-6.1.2" sources."vega-projection-1.4.5" sources."vega-regression-1.0.9" sources."vega-runtime-6.1.3" sources."vega-scale-7.1.1" sources."vega-scenegraph-4.9.2" - sources."vega-selections-5.1.4" + sources."vega-selections-5.1.5" sources."vega-statistics-1.7.9" sources."vega-time-2.0.4" sources."vega-transforms-4.9.3" - sources."vega-typings-0.19.1" + sources."vega-typings-0.19.2" sources."vega-util-1.16.0" - sources."vega-view-5.9.0" + sources."vega-view-5.9.2" sources."vega-view-transforms-4.5.8" sources."vega-voronoi-4.1.5" sources."vega-wordcloud-4.1.3" @@ -101320,7 +105517,7 @@ in sources."wrappy-1.0.2" sources."y18n-5.0.5" sources."yallist-3.1.1" - (sources."yargs-16.1.1" // { + (sources."yargs-16.2.0" // { dependencies = [ sources."ansi-regex-5.0.0" sources."is-fullwidth-code-point-3.0.0" @@ -101370,7 +105567,7 @@ in sources."strip-ansi-6.0.0" sources."tslib-2.0.3" sources."vega-event-selector-2.0.6" - sources."vega-expression-3.0.0" + sources."vega-expression-3.0.1" sources."vega-util-1.16.0" sources."wrap-ansi-7.0.0" sources."y18n-5.0.5" @@ -101415,11 +105612,11 @@ in }; dependencies = [ sources."vscode-css-languageservice-3.0.13" - sources."vscode-jsonrpc-5.0.1" + sources."vscode-jsonrpc-6.0.0" sources."vscode-languageserver-4.4.2" - sources."vscode-languageserver-protocol-3.15.3" + sources."vscode-languageserver-protocol-3.16.0" sources."vscode-languageserver-protocol-foldingprovider-2.0.1" - sources."vscode-languageserver-types-3.15.1" + sources."vscode-languageserver-types-3.16.0" sources."vscode-nls-4.1.2" sources."vscode-uri-1.0.8" ]; @@ -101453,11 +105650,11 @@ in sources."vscode-nls-4.1.2" ]; }) - sources."vscode-jsonrpc-5.0.1" + sources."vscode-jsonrpc-6.0.0" sources."vscode-languageserver-4.4.2" - sources."vscode-languageserver-protocol-3.15.3" + sources."vscode-languageserver-protocol-3.16.0" sources."vscode-languageserver-protocol-foldingprovider-2.0.1" - sources."vscode-languageserver-types-3.15.1" + sources."vscode-languageserver-types-3.16.0" sources."vscode-nls-3.2.5" sources."vscode-uri-1.0.8" ]; @@ -101572,7 +105769,7 @@ in sources."@types/json5-0.0.30" sources."@types/mocha-7.0.2" sources."@types/node-8.10.66" - sources."@types/vscode-1.51.0" + sources."@types/vscode-1.52.0" sources."@types/yauzl-2.9.1" sources."@webassemblyjs/ast-1.9.0" sources."@webassemblyjs/floating-point-hex-parser-1.9.0" @@ -101674,7 +105871,8 @@ in sources."supports-color-5.5.0" ]; }) - sources."cheerio-1.0.0-rc.3" + sources."cheerio-1.0.0-rc.5" + sources."cheerio-select-tmp-0.1.1" sources."chokidar-3.3.0" sources."chownr-1.1.4" sources."chrome-trace-event-1.0.2" @@ -101707,7 +105905,7 @@ in sources."collection-visit-1.0.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."commander-6.2.0" + sources."commander-6.2.1" sources."commondir-1.0.1" sources."component-emitter-1.3.0" sources."concat-map-0.0.1" @@ -101732,8 +105930,8 @@ in sources."create-hmac-1.1.7" sources."cross-spawn-6.0.5" sources."crypto-browserify-3.12.0" - sources."css-select-1.2.0" - sources."css-what-2.1.3" + sources."css-select-3.1.2" + sources."css-what-4.0.0" sources."cyclist-1.0.1" sources."debug-3.2.6" sources."decamelize-1.2.0" @@ -101749,11 +105947,11 @@ in sources."bn.js-4.11.9" ]; }) - sources."dom-serializer-0.1.1" + sources."dom-serializer-1.2.0" sources."domain-browser-1.2.0" - sources."domelementtype-1.3.1" - sources."domhandler-2.4.2" - sources."domutils-1.5.1" + sources."domelementtype-2.1.0" + sources."domhandler-4.0.0" + sources."domutils-2.4.4" (sources."duplexify-3.7.1" // { dependencies = [ sources."isarray-1.0.0" @@ -101770,8 +105968,8 @@ in sources."emojis-list-3.0.0" sources."end-of-stream-1.4.4" sources."enhanced-resolve-4.3.0" - sources."entities-1.1.2" - sources."errno-0.1.7" + sources."entities-2.1.0" + sources."errno-0.1.8" (sources."es-abstract-1.18.0-next.1" // { dependencies = [ sources."object.assign-4.1.2" @@ -101864,7 +106062,7 @@ in sources."fsevents-2.1.3" sources."function-bind-1.1.1" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.0.1" + sources."get-intrinsic-1.0.2" sources."get-value-2.0.6" sources."glob-7.1.3" sources."glob-parent-5.1.1" @@ -101902,13 +106100,7 @@ in sources."he-1.2.0" sources."hmac-drbg-1.0.1" sources."homedir-polyfill-1.0.3" - (sources."htmlparser2-3.10.1" // { - dependencies = [ - sources."readable-stream-3.6.0" - sources."safe-buffer-5.2.1" - sources."string_decoder-1.3.0" - ]; - }) + sources."htmlparser2-6.0.0" sources."https-browserify-1.0.0" sources."ieee754-1.2.1" sources."iferr-0.1.5" @@ -101917,7 +106109,7 @@ in sources."infer-owner-1.0.4" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."ini-1.3.5" + sources."ini-1.3.8" sources."interpret-1.4.0" sources."is-accessor-descriptor-1.0.0" sources."is-binary-path-2.1.0" @@ -102016,7 +106208,7 @@ in ]; }) sources."normalize-path-3.0.0" - sources."nth-check-1.0.2" + sources."nth-check-2.0.0" sources."object-assign-4.1.1" (sources."object-copy-0.1.0" // { dependencies = [ @@ -102058,7 +106250,8 @@ in sources."parse-asn1-5.1.6" sources."parse-passwd-1.0.0" sources."parse-semver-1.1.1" - sources."parse5-3.0.3" + sources."parse5-6.0.1" + sources."parse5-htmlparser2-tree-adapter-6.0.1" sources."pascalcase-0.1.1" sources."path-browserify-0.0.1" sources."path-dirname-1.0.2" @@ -102281,7 +106474,7 @@ in sources."util-deprecate-1.0.2" sources."v8-compile-cache-2.2.0" sources."vm-browserify-1.1.2" - sources."vsce-1.81.1" + sources."vsce-1.83.0" sources."vscode-debugadapter-testsupport-1.43.0" sources."vscode-debugprotocol-1.43.0" (sources."watchpack-1.7.5" // { @@ -102507,7 +106700,7 @@ in sources."ieee754-1.2.1" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."ini-1.3.5" + sources."ini-1.3.8" sources."inquirer-6.5.2" sources."is-3.3.0" sources."is-extendable-0.1.1" @@ -102522,7 +106715,7 @@ in sources."isarray-1.0.0" sources."isstream-0.1.2" sources."isurl-1.0.0" - sources."js-yaml-3.14.0" + sources."js-yaml-3.14.1" sources."jsbn-0.1.1" sources."json-schema-0.2.3" sources."json-schema-traverse-0.4.1" @@ -102547,8 +106740,8 @@ in sources."supports-color-2.0.0" ]; }) - sources."mime-db-1.44.0" - sources."mime-types-2.1.27" + sources."mime-db-1.45.0" + sources."mime-types-2.1.28" sources."mimic-fn-1.2.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" @@ -102633,7 +106826,7 @@ in sources."tslib-1.14.1" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."uglify-js-3.12.1" + sources."uglify-js-3.12.4" sources."uid-0.0.2" sources."unbzip2-stream-1.4.3" sources."unyield-0.0.1" @@ -102674,8 +106867,8 @@ in sha512 = "/dd2bJLxOmX8Ie0EPTlmU+F8cxAekn/1m8K9OAFoijm4fc8SdHznFUUEKuz2RMMhsaL5+rccj8xLFAJELYNbaA=="; }; dependencies = [ - sources."@babel/code-frame-7.10.4" - sources."@babel/helper-validator-identifier-7.10.4" + sources."@babel/code-frame-7.12.11" + sources."@babel/helper-validator-identifier-7.12.11" sources."@babel/highlight-7.10.4" sources."@emmetio/extract-abbreviation-0.1.6" sources."@mrmlnc/readdir-enhanced-2.2.1" @@ -102692,7 +106885,7 @@ in sources."@starptech/rehype-webparser-0.10.0" sources."@starptech/webparser-0.10.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-14.14.10" + sources."@types/node-14.14.20" sources."@types/unist-2.0.3" sources."@types/vfile-3.0.2" sources."@types/vfile-message-2.0.0" @@ -102880,17 +107073,19 @@ in (sources."eslint-5.16.0" // { dependencies = [ sources."cross-spawn-6.0.5" - sources."debug-4.3.1" + sources."debug-4.3.2" sources."ignore-4.0.6" + sources."ms-2.1.2" ]; }) (sources."eslint-plugin-vue-6.2.2" // { dependencies = [ sources."acorn-7.4.1" - sources."debug-4.3.1" + sources."debug-4.3.2" sources."eslint-scope-5.1.1" sources."espree-6.2.1" - sources."vue-eslint-parser-7.2.0" + sources."ms-2.1.2" + sources."vue-eslint-parser-7.3.0" ]; }) sources."eslint-scope-4.0.3" @@ -102965,7 +107160,7 @@ in sources."format-0.2.2" sources."fragment-cache-0.2.1" sources."fs.realpath-1.0.0" - sources."fsevents-2.2.1" + sources."fsevents-2.3.1" sources."function-bind-1.1.1" sources."functional-red-black-tree-1.0.1" sources."get-caller-file-1.0.3" @@ -103016,7 +107211,7 @@ in sources."http-cache-semantics-4.1.0" sources."iconv-lite-0.4.24" sources."ignore-3.3.10" - (sources."import-fresh-3.2.2" // { + (sources."import-fresh-3.3.0" // { dependencies = [ sources."resolve-from-4.0.0" ]; @@ -103026,7 +107221,7 @@ in sources."indent-string-3.2.0" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."ini-1.3.5" + sources."ini-1.3.8" (sources."inquirer-6.5.2" // { dependencies = [ sources."ansi-regex-4.1.0" @@ -103079,7 +107274,7 @@ in ]; }) sources."js-tokens-4.0.0" - sources."js-yaml-3.14.0" + sources."js-yaml-3.14.1" sources."json-buffer-3.0.0" sources."json-parse-better-errors-1.0.2" sources."json-schema-traverse-0.4.1" @@ -103142,7 +107337,7 @@ in }) sources."mkdirp-0.5.5" sources."mout-0.5.0" - sources."ms-2.1.2" + sources."ms-2.1.3" sources."mute-stream-0.0.7" sources."nanomatch-1.2.13" sources."natural-compare-1.4.0" @@ -103522,9 +107717,9 @@ in sources."user-home-2.0.0" sources."util-deprecate-1.0.2" sources."validate-npm-package-license-3.0.4" - sources."vfile-4.2.0" + sources."vfile-4.2.1" sources."vfile-message-2.0.4" - (sources."vfile-reporter-6.0.1" // { + (sources."vfile-reporter-6.0.2" // { dependencies = [ sources."ansi-regex-5.0.0" sources."emoji-regex-8.0.0" @@ -103543,17 +107738,18 @@ in ]; }) sources."vscode-emmet-helper-1.2.17" - sources."vscode-jsonrpc-5.0.1" + sources."vscode-jsonrpc-6.0.0" sources."vscode-languageserver-5.3.0-next.10" - sources."vscode-languageserver-protocol-3.15.3" + sources."vscode-languageserver-protocol-3.16.0" sources."vscode-languageserver-textdocument-1.0.1" - sources."vscode-languageserver-types-3.15.1" + sources."vscode-languageserver-types-3.16.0" sources."vscode-nls-5.0.0" sources."vscode-textbuffer-1.0.0" sources."vscode-uri-1.0.8" (sources."vue-eslint-parser-6.0.5" // { dependencies = [ - sources."debug-4.3.1" + sources."debug-4.3.2" + sources."ms-2.1.2" ]; }) sources."vue-onsenui-helper-json-1.0.2" @@ -103578,7 +107774,7 @@ in sources."x-is-string-0.1.0" sources."xdg-basedir-3.0.0" sources."xtend-4.0.2" - sources."y18n-3.2.1" + sources."y18n-3.2.2" sources."yallist-2.1.2" (sources."yargs-11.1.1" // { dependencies = [ @@ -103600,14 +107796,14 @@ in web-ext = nodeEnv.buildNodePackage { name = "web-ext"; packageName = "web-ext"; - version = "5.4.0"; + version = "5.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/web-ext/-/web-ext-5.4.0.tgz"; - sha512 = "95MVrsCRtmmu7YNTA8OconwTB7Y7rS6T5ABpv9c90A5tLfDV1+6/dRn8JhAMAi/UfIq0ZT5wklHwvRzDmD6cBA=="; + url = "https://registry.npmjs.org/web-ext/-/web-ext-5.4.1.tgz"; + sha512 = "AnTjSFtvidZfmVYzvceM/XixsigiWU3l66UzcxgXxXhOoEQU5ZHlXFGVJdHEYfkI5SnEyDG+WlhsdTUHNLOXJw=="; }; dependencies = [ - sources."@babel/code-frame-7.10.4" - sources."@babel/helper-validator-identifier-7.10.4" + sources."@babel/code-frame-7.12.11" + sources."@babel/helper-validator-identifier-7.12.11" (sources."@babel/highlight-7.10.4" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -103627,33 +107823,25 @@ in sources."@devicefarmer/adbkit-monkey-1.0.1" (sources."@eslint/eslintrc-0.2.2" // { dependencies = [ - sources."debug-4.3.1" + sources."debug-4.3.2" sources."ms-2.1.2" ]; }) - sources."@mdn/browser-compat-data-2.0.5" - sources."@sindresorhus/is-0.7.0" + sources."@mdn/browser-compat-data-2.0.7" + sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/decompress-4.2.3" - sources."@types/download-6.2.4" - sources."@types/got-8.3.5" sources."@types/minimatch-3.0.3" - sources."@types/node-14.14.10" + sources."@types/node-14.14.20" sources."@types/yauzl-2.9.1" sources."JSONSelect-0.2.1" - sources."accepts-1.3.7" sources."acorn-7.4.1" sources."acorn-jsx-5.3.1" - (sources."addons-linter-2.12.0" // { + (sources."addons-linter-2.13.1" // { dependencies = [ - sources."yargs-16.1.0" - ]; - }) - (sources."addons-scanner-utils-3.0.0" // { - dependencies = [ - sources."upath-2.0.0" + sources."yargs-16.1.1" ]; }) + sources."addons-scanner-utils-4.0.0" sources."adm-zip-0.4.16" sources."ajv-6.12.6" sources."ajv-merge-patch-4.1.0" @@ -103671,28 +107859,24 @@ in sources."ansi-styles-4.3.0" sources."any-promise-1.3.0" sources."anymatch-3.1.1" - (sources."archive-type-4.0.0" // { - dependencies = [ - sources."file-type-4.4.0" - ]; - }) (sources."archiver-5.0.2" // { dependencies = [ sources."async-3.2.0" - sources."bl-4.0.3" - sources."inherits-2.0.4" - sources."readable-stream-3.6.0" - sources."tar-stream-2.1.4" ]; }) - sources."archiver-utils-2.1.0" + (sources."archiver-utils-2.1.0" // { + dependencies = [ + sources."readable-stream-2.3.7" + sources."safe-buffer-5.1.2" + sources."string_decoder-1.1.1" + ]; + }) 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-differ-3.0.0" sources."array-filter-0.0.1" - sources."array-flatten-1.1.1" sources."array-map-0.0.0" sources."array-reduce-0.0.0" sources."array-union-2.1.0" @@ -103714,16 +107898,14 @@ in (sources."base-0.11.2" // { dependencies = [ sources."define-property-1.0.0" - sources."isobject-3.0.1" ]; }) sources."base64-js-1.5.1" sources."bcrypt-pbkdf-1.0.2" sources."binary-extensions-2.1.0" sources."bindings-1.5.0" - sources."bl-1.2.3" + sources."bl-4.0.3" sources."bluebird-2.9.34" - sources."body-parser-1.19.0" sources."boolbase-1.0.0" (sources."boxen-4.2.0" // { dependencies = [ @@ -103734,23 +107916,14 @@ in sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."buffer-5.7.1" - sources."buffer-alloc-1.2.0" - sources."buffer-alloc-unsafe-1.1.0" sources."buffer-crc32-0.2.13" sources."buffer-equal-constant-time-1.0.1" - sources."buffer-fill-1.0.0" sources."buffer-from-1.1.1" sources."bunyan-1.8.14" - sources."bytes-3.1.0" - (sources."cache-base-1.0.1" // { + sources."cache-base-1.0.1" + (sources."cacheable-request-6.1.0" // { dependencies = [ - sources."isobject-3.0.1" - ]; - }) - (sources."cacheable-request-2.1.4" // { - dependencies = [ - sources."get-stream-3.0.0" - sources."lowercase-keys-1.0.0" + sources."lowercase-keys-2.0.0" ]; }) sources."call-bind-1.0.0" @@ -103785,7 +107958,6 @@ in ]; }) sources."is-descriptor-0.1.6" - sources."isobject-3.0.1" sources."kind-of-5.1.0" ]; }) @@ -103808,32 +107980,21 @@ in sources."commander-2.20.3" sources."common-tags-1.8.0" sources."component-emitter-1.3.0" - (sources."compress-commons-4.0.2" // { - dependencies = [ - sources."readable-stream-3.6.0" - ]; - }) + sources."compress-commons-4.0.2" sources."concat-map-0.0.1" - sources."concat-stream-1.6.2" - (sources."configstore-5.0.1" // { + (sources."concat-stream-1.6.2" // { dependencies = [ - sources."make-dir-3.1.0" - sources."semver-6.3.0" + sources."readable-stream-2.3.7" + sources."safe-buffer-5.1.2" + sources."string_decoder-1.1.1" ]; }) - sources."content-disposition-0.5.3" - sources."content-type-1.0.4" - sources."cookie-0.4.0" - sources."cookie-signature-1.0.6" + sources."configstore-5.0.1" sources."copy-descriptor-0.1.1" sources."core-js-2.6.12" sources."core-util-is-1.0.2" sources."crc-32-1.2.0" - (sources."crc32-stream-4.0.1" // { - dependencies = [ - sources."readable-stream-3.6.0" - ]; - }) + sources."crc32-stream-4.0.1" sources."cross-spawn-7.0.3" sources."crypto-random-string-2.0.0" sources."css-select-1.2.0" @@ -103843,39 +108004,7 @@ in sources."debug-2.6.9" sources."decamelize-4.0.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."file-type-5.2.0" - ]; - }) - (sources."decompress-tarbz2-4.1.1" // { - dependencies = [ - sources."file-type-6.2.0" - ]; - }) - (sources."decompress-targz-4.1.1" // { - dependencies = [ - sources."file-type-5.2.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-equal-1.1.1" sources."deep-extend-0.6.0" sources."deep-is-0.1.3" @@ -103884,14 +108013,8 @@ in sources."defaults-1.0.3" sources."defer-to-connect-1.1.3" sources."define-properties-1.1.3" - (sources."define-property-2.0.2" // { - dependencies = [ - sources."isobject-3.0.1" - ]; - }) + sources."define-property-2.0.2" sources."delayed-stream-1.0.0" - sources."depd-1.1.2" - sources."destroy-1.0.4" (sources."dispensary-0.59.0" // { dependencies = [ sources."async-3.2.0" @@ -103904,14 +108027,11 @@ in sources."domhandler-2.4.2" sources."domutils-1.5.1" sources."dot-prop-5.3.0" - sources."download-8.0.0" sources."dtrace-provider-0.8.8" sources."duplexer3-0.1.4" sources."ecc-jsbn-0.1.2" sources."ecdsa-sig-formatter-1.0.11" - sources."ee-first-1.1.1" sources."emoji-regex-8.0.0" - sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" sources."enquirer-2.3.6" sources."entities-1.1.2" @@ -103923,12 +108043,11 @@ in sources."es6-promisify-6.1.1" sources."escalade-3.1.1" sources."escape-goat-2.1.1" - sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" - (sources."eslint-7.13.0" // { + (sources."eslint-7.14.0" // { dependencies = [ sources."ansi-regex-5.0.0" - sources."debug-4.3.1" + sources."debug-4.3.2" sources."ms-2.1.2" sources."strip-ansi-6.0.0" ]; @@ -103959,14 +108078,8 @@ in }) sources."estraverse-4.3.0" sources."esutils-2.0.3" - sources."etag-1.8.1" sources."event-to-promise-0.8.0" - (sources."execa-4.1.0" // { - dependencies = [ - sources."get-stream-5.2.0" - sources."is-stream-2.0.0" - ]; - }) + sources."execa-4.1.0" sources."exit-on-epipe-1.0.1" (sources."expand-brackets-2.1.4" // { dependencies = [ @@ -103986,9 +108099,6 @@ in sources."kind-of-5.1.0" ]; }) - sources."express-4.17.1" - sources."ext-list-2.2.2" - sources."ext-name-5.0.0" sources."extend-3.0.2" (sources."extend-shallow-3.0.2" // { dependencies = [ @@ -104014,12 +108124,8 @@ in sources."fast-safe-stringify-2.0.7" sources."fd-slicer-1.1.0" sources."file-entry-cache-5.0.1" - sources."file-type-11.1.0" sources."file-uri-to-path-1.0.0" - sources."filename-reserved-regex-2.0.0" - sources."filenamify-3.0.0" sources."fill-range-7.0.1" - sources."finalhandler-1.1.2" sources."find-up-4.1.0" (sources."firefox-profile-4.0.0" // { dependencies = [ @@ -104035,10 +108141,7 @@ in sources."for-in-1.0.2" sources."forever-agent-0.6.1" sources."form-data-2.3.3" - sources."forwarded-0.1.2" sources."fragment-cache-0.2.1" - sources."fresh-0.5.2" - sources."from2-2.3.0" sources."fs-constants-1.0.0" (sources."fs-extra-9.0.1" // { dependencies = [ @@ -104062,18 +108165,21 @@ in ]; }) sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.0.1" - sources."get-stream-4.1.0" + sources."get-intrinsic-1.0.2" + sources."get-stream-5.2.0" sources."get-value-2.0.6" sources."getpass-0.1.7" sources."glob-7.1.6" sources."glob-parent-5.1.1" - sources."global-dirs-2.0.1" - sources."globals-12.4.0" - (sources."got-8.3.2" // { + (sources."global-dirs-2.1.0" // { dependencies = [ - sources."get-stream-3.0.0" - sources."pify-3.0.0" + sources."ini-1.3.7" + ]; + }) + sources."globals-12.4.0" + (sources."got-9.6.0" // { + dependencies = [ + sources."get-stream-4.1.0" ]; }) sources."graceful-fs-4.2.4" @@ -104083,14 +108189,8 @@ in sources."har-validator-5.1.5" sources."has-1.0.3" sources."has-flag-4.0.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" // { - dependencies = [ - sources."isobject-3.0.1" - ]; - }) + sources."has-value-1.0.0" (sources."has-values-1.0.0" // { dependencies = [ (sources."is-number-3.0.0" // { @@ -104102,27 +108202,19 @@ in ]; }) sources."has-yarn-2.1.0" - (sources."htmlparser2-3.10.1" // { - dependencies = [ - sources."readable-stream-3.6.0" - ]; - }) - sources."http-cache-semantics-3.8.1" - sources."http-errors-1.7.2" + sources."htmlparser2-3.10.1" + sources."http-cache-semantics-4.1.0" sources."http-signature-1.2.0" sources."human-signals-1.1.1" - sources."iconv-lite-0.4.24" sources."ieee754-1.2.1" sources."ignore-4.0.6" sources."import-fresh-3.2.1" sources."import-lazy-2.1.0" sources."imurmurhash-0.1.4" sources."inflight-1.0.6" - sources."inherits-2.0.3" - sources."ini-1.3.5" - sources."into-stream-3.1.0" + sources."inherits-2.0.4" + sources."ini-1.3.8" sources."invert-kv-3.0.1" - sources."ipaddr.js-1.9.1" sources."is-absolute-0.1.7" sources."is-accessor-descriptor-1.0.0" sources."is-arguments-1.1.0" @@ -104141,22 +108233,14 @@ in sources."is-glob-4.0.1" sources."is-installed-globally-0.3.2" sources."is-mergeable-object-1.1.1" - sources."is-natural-number-4.0.1" sources."is-npm-5.0.0" sources."is-number-7.0.0" sources."is-obj-2.0.0" - sources."is-object-1.0.2" sources."is-path-inside-3.0.2" - sources."is-plain-obj-1.1.0" - (sources."is-plain-object-2.0.4" // { - dependencies = [ - sources."isobject-3.0.1" - ]; - }) + sources."is-plain-object-2.0.4" sources."is-regex-1.1.1" sources."is-relative-0.1.3" - sources."is-retry-allowed-1.2.0" - sources."is-stream-1.1.0" + sources."is-stream-2.0.0" sources."is-symbol-1.0.3" sources."is-typedarray-1.0.0" sources."is-utf8-0.2.1" @@ -104165,14 +108249,13 @@ in sources."is-yarn-global-0.3.0" sources."isarray-1.0.0" sources."isexe-2.0.0" - sources."isobject-2.1.0" + sources."isobject-3.0.1" sources."isstream-0.1.2" - sources."isurl-1.0.0" sources."jed-1.1.1" sources."jetpack-id-1.0.0" sources."js-select-0.6.0" sources."js-tokens-4.0.0" - sources."js-yaml-3.14.0" + sources."js-yaml-3.14.1" sources."jsbn-0.1.1" sources."json-buffer-3.0.0" sources."json-merge-patch-0.2.3" @@ -104185,7 +108268,7 @@ in sources."jsonify-0.0.0" (sources."jsonwebtoken-8.5.1" // { dependencies = [ - sources."ms-2.1.2" + sources."ms-2.1.3" sources."semver-5.7.1" ]; }) @@ -104193,14 +108276,19 @@ in sources."jszip-2.6.1" sources."jwa-1.4.1" sources."jws-3.2.2" - sources."keyv-3.0.0" + sources."keyv-3.1.0" sources."kind-of-6.0.3" sources."latest-version-5.1.0" - sources."lazystream-1.0.0" + (sources."lazystream-1.0.0" // { + dependencies = [ + sources."readable-stream-2.3.7" + sources."safe-buffer-5.1.2" + sources."string_decoder-1.1.1" + ]; + }) sources."lcid-3.1.1" sources."levn-0.4.1" sources."lighthouse-logger-1.2.0" - sources."line-column-1.0.2" sources."lines-and-columns-1.1.6" sources."locate-path-5.0.0" sources."lodash-4.17.20" @@ -104217,24 +108305,17 @@ in sources."lodash.sortby-4.7.0" sources."lodash.union-4.6.0" sources."lowercase-keys-1.0.1" - (sources."make-dir-2.1.0" // { + (sources."make-dir-3.1.0" // { dependencies = [ - sources."semver-5.7.1" + sources."semver-6.3.0" ]; }) sources."map-age-cleaner-0.1.3" sources."map-cache-0.2.2" sources."map-visit-1.0.0" sources."marky-1.2.1" - sources."media-typer-0.3.0" - (sources."mem-5.1.1" // { - dependencies = [ - sources."p-is-promise-2.1.0" - ]; - }) - sources."merge-descriptors-1.0.1" + sources."mem-5.1.1" sources."merge-stream-2.0.0" - sources."methods-1.1.2" (sources."micromatch-3.1.10" // { dependencies = [ (sources."braces-2.3.2" // { @@ -104252,13 +108333,11 @@ in sources."kind-of-3.2.2" ]; }) - sources."isobject-3.0.1" sources."to-regex-range-2.1.1" ]; }) - sources."mime-1.6.0" - sources."mime-db-1.44.0" - sources."mime-types-2.1.27" + sources."mime-db-1.45.0" + sources."mime-types-2.1.28" sources."mimic-fn-2.1.0" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" @@ -104286,21 +108365,16 @@ in sources."natural-compare-1.4.0" sources."natural-compare-lite-1.4.0" sources."ncp-2.0.0" - sources."negotiator-0.6.2" sources."neo-async-2.6.2" sources."next-tick-1.1.0" sources."node-forge-0.10.0" (sources."node-notifier-8.0.0" // { dependencies = [ - sources."uuid-8.3.1" + sources."uuid-8.3.2" ]; }) sources."normalize-path-3.0.0" - (sources."normalize-url-2.0.1" // { - dependencies = [ - sources."sort-keys-2.0.0" - ]; - }) + sources."normalize-url-4.5.0" sources."npm-run-path-4.0.1" sources."nth-check-1.0.2" sources."oauth-sign-0.9.0" @@ -104321,43 +108395,23 @@ in sources."object-inspect-1.9.0" sources."object-is-1.1.4" sources."object-keys-1.1.1" - (sources."object-visit-1.0.1" // { - dependencies = [ - sources."isobject-3.0.1" - ]; - }) + sources."object-visit-1.0.1" sources."object.assign-4.1.2" - (sources."object.pick-1.3.0" // { - dependencies = [ - sources."isobject-3.0.1" - ]; - }) - sources."on-finished-2.3.0" + sources."object.pick-1.3.0" sources."once-1.4.0" sources."onetime-5.1.2" sources."open-7.3.0" sources."optionator-0.9.1" sources."os-locale-5.0.0" sources."os-shim-0.1.3" - sources."p-cancelable-0.4.1" + sources."p-cancelable-1.1.0" sources."p-defer-1.0.0" - sources."p-event-2.3.1" - sources."p-finally-1.0.0" - sources."p-is-promise-1.1.0" + sources."p-is-promise-2.1.0" sources."p-limit-2.3.0" sources."p-locate-4.1.0" - sources."p-timeout-2.0.1" sources."p-try-2.2.0" (sources."package-json-6.5.0" // { dependencies = [ - sources."@sindresorhus/is-0.14.0" - sources."cacheable-request-6.1.0" - sources."get-stream-5.2.0" - sources."got-9.6.0" - sources."http-cache-semantics-4.1.0" - sources."lowercase-keys-2.0.0" - sources."normalize-url-4.5.0" - sources."p-cancelable-1.1.0" sources."semver-6.3.0" ]; }) @@ -104365,45 +108419,36 @@ in sources."parent-module-1.0.1" sources."parse-json-5.0.1" sources."parse5-3.0.3" - sources."parseurl-1.3.3" sources."pascalcase-0.1.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-to-regexp-0.1.7" sources."pend-1.2.0" sources."performance-now-2.1.0" sources."picomatch-2.2.2" - sources."pify-4.0.1" - sources."pinkie-2.0.4" - sources."pinkie-promise-2.0.1" sources."pino-6.7.0" sources."pino-std-serializers-2.5.0" sources."posix-character-classes-0.1.1" - sources."postcss-8.1.7" + sources."postcss-8.1.10" sources."prelude-ls-1.2.1" sources."prepend-http-2.0.0" sources."printj-1.1.2" sources."probe-image-size-5.0.0" sources."process-nextick-args-2.0.1" sources."progress-2.0.3" - sources."proxy-addr-2.0.6" sources."psl-1.8.0" sources."pump-3.0.0" sources."punycode-2.1.1" sources."pupa-2.1.1" - sources."qs-6.7.0" - sources."query-string-5.1.1" + sources."qs-6.5.2" sources."quick-format-unescaped-4.0.1" - sources."range-parser-1.2.1" - sources."raw-body-2.4.0" (sources."rc-1.2.8" // { dependencies = [ sources."strip-json-comments-2.0.1" ]; }) - sources."readable-stream-2.3.7" + sources."readable-stream-3.6.0" sources."readdir-glob-1.1.1" sources."readdirp-3.5.0" sources."regenerator-runtime-0.13.7" @@ -104425,11 +108470,7 @@ in sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" - (sources."request-2.88.2" // { - dependencies = [ - sources."qs-6.5.2" - ]; - }) + sources."request-2.88.2" sources."require-directory-2.1.1" sources."require-main-filename-2.0.0" sources."resolve-from-4.0.0" @@ -104437,32 +108478,23 @@ in sources."responselike-1.0.2" sources."ret-0.1.15" sources."rimraf-2.6.3" - sources."safe-buffer-5.1.2" - sources."safe-compare-1.1.4" + sources."safe-buffer-5.2.1" sources."safe-json-stringify-1.2.0" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" sources."sax-1.2.4" - 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."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."sha.js-2.4.11" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" @@ -104504,7 +108536,6 @@ in (sources."snapdragon-node-2.1.1" // { dependencies = [ sources."define-property-1.0.0" - sources."isobject-3.0.1" ]; }) (sources."snapdragon-util-3.0.1" // { @@ -104513,8 +108544,6 @@ in ]; }) sources."sonic-boom-1.3.0" - sources."sort-keys-1.1.2" - sources."sort-keys-length-1.0.1" sources."source-map-0.6.1" sources."source-map-resolve-0.5.3" sources."source-map-support-0.5.19" @@ -104541,11 +108570,9 @@ in sources."kind-of-5.1.0" ]; }) - sources."statuses-1.5.0" sources."stream-parser-0.3.1" sources."stream-to-array-2.3.0" sources."stream-to-promise-3.0.0" - sources."strict-uri-encode-1.1.0" (sources."string-width-4.2.0" // { dependencies = [ sources."ansi-regex-5.0.0" @@ -104554,15 +108581,13 @@ in }) sources."string.prototype.trimend-1.0.3" sources."string.prototype.trimstart-1.0.3" - sources."string_decoder-1.1.1" + sources."string_decoder-1.3.0" sources."strip-ansi-3.0.1" sources."strip-bom-4.0.0" sources."strip-bom-buf-2.0.0" sources."strip-bom-stream-4.0.0" - sources."strip-dirs-2.1.0" sources."strip-final-newline-2.0.0" sources."strip-json-comments-3.1.1" - sources."strip-outer-1.0.1" sources."supports-color-7.2.0" (sources."table-5.4.6" // { dependencies = [ @@ -104573,19 +108598,17 @@ in sources."strip-ansi-5.2.0" ]; }) - sources."tar-stream-1.6.2" + sources."tar-stream-2.2.0" sources."term-size-2.2.1" sources."text-table-0.2.0" sources."thenify-3.3.1" sources."thenify-all-1.6.0" sources."through-2.3.8" - sources."timed-out-4.0.1" (sources."tmp-0.2.1" // { dependencies = [ sources."rimraf-3.0.2" ]; }) - sources."to-buffer-1.1.1" (sources."to-object-path-0.3.0" // { dependencies = [ sources."kind-of-3.2.2" @@ -104594,25 +108617,20 @@ in sources."to-readable-stream-1.0.0" sources."to-regex-3.0.2" sources."to-regex-range-5.0.1" - sources."toidentifier-1.0.0" sources."tosource-1.0.0" sources."tough-cookie-2.5.0" sources."tr46-2.0.2" sources."traverse-0.4.6" - sources."trim-repeated-1.0.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-check-0.4.0" sources."type-detect-4.0.8" sources."type-fest-0.8.1" - sources."type-is-1.6.18" sources."typedarray-0.0.6" sources."typedarray-to-buffer-3.1.5" - sources."unbzip2-stream-1.4.3" sources."union-value-1.0.1" sources."unique-string-2.0.0" sources."universalify-0.1.2" - sources."unpipe-1.0.0" (sources."unset-value-1.0.0" // { dependencies = [ (sources."has-value-0.3.1" // { @@ -104621,7 +108639,6 @@ in ]; }) sources."has-values-0.1.4" - sources."isobject-3.0.1" ]; }) sources."upath-2.0.1" @@ -104629,14 +108646,12 @@ in sources."uri-js-4.4.0" sources."urix-0.1.0" 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."utils-merge-1.0.1" sources."uuid-3.4.0" sources."v8-compile-cache-2.2.0" - sources."vary-1.1.2" sources."verror-1.10.0" + sources."vfile-location-3.2.0" sources."watchpack-1.7.4" (sources."watchpack-chokidar2-2.0.1" // { dependencies = [ @@ -104651,10 +108666,12 @@ in sources."is-binary-path-1.0.1" sources."is-glob-3.1.0" sources."is-number-3.0.0" - sources."isobject-3.0.1" sources."kind-of-3.2.2" sources."normalize-path-2.1.1" + sources."readable-stream-2.3.7" sources."readdirp-2.2.1" + sources."safe-buffer-5.1.2" + sources."string_decoder-1.1.1" sources."to-regex-range-2.1.1" sources."upath-1.2.0" ]; @@ -104685,7 +108702,6 @@ in sources."xdg-basedir-4.0.0" sources."xml2js-0.4.23" sources."xmlbuilder-11.0.1" - sources."xtend-4.0.2" sources."y18n-5.0.5" (sources."yargs-15.4.1" // { dependencies = [ @@ -104706,11 +108722,7 @@ in sources."async-1.5.2" ]; }) - (sources."zip-stream-4.0.4" // { - dependencies = [ - sources."readable-stream-3.6.0" - ]; - }) + sources."zip-stream-4.0.4" ]; buildInputs = globalBuildInputs; meta = { @@ -104725,48 +108737,48 @@ in webpack = nodeEnv.buildNodePackage { name = "webpack"; packageName = "webpack"; - version = "5.10.0"; + version = "5.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-5.10.0.tgz"; - sha512 = "P0bHAXmIz0zsNcHNLqFmLY1ZtrT+jtBr7FqpuDtA2o7GiHC+zBsfhgK7SmJ1HG7BAEb3G9JoMdSVi7mEDvG3Zg=="; + url = "https://registry.npmjs.org/webpack/-/webpack-5.11.1.tgz"; + sha512 = "tNUIdAmYJv+nupRs/U/gqmADm6fgrf5xE+rSlSsf2PgsGO7j2WG7ccU6AWNlOJlHFl+HnmXlBmHIkiLf+XA9mQ=="; }; dependencies = [ sources."@types/eslint-7.2.6" sources."@types/eslint-scope-3.7.0" sources."@types/estree-0.0.45" sources."@types/json-schema-7.0.6" - sources."@types/node-14.14.10" - sources."@webassemblyjs/ast-1.9.0" - sources."@webassemblyjs/floating-point-hex-parser-1.9.0" - sources."@webassemblyjs/helper-api-error-1.9.0" - sources."@webassemblyjs/helper-buffer-1.9.0" - sources."@webassemblyjs/helper-code-frame-1.9.0" - sources."@webassemblyjs/helper-fsm-1.9.0" - sources."@webassemblyjs/helper-module-context-1.9.0" - sources."@webassemblyjs/helper-wasm-bytecode-1.9.0" - sources."@webassemblyjs/helper-wasm-section-1.9.0" - sources."@webassemblyjs/ieee754-1.9.0" - sources."@webassemblyjs/leb128-1.9.0" - sources."@webassemblyjs/utf8-1.9.0" - sources."@webassemblyjs/wasm-edit-1.9.0" - sources."@webassemblyjs/wasm-gen-1.9.0" - sources."@webassemblyjs/wasm-opt-1.9.0" - sources."@webassemblyjs/wasm-parser-1.9.0" - sources."@webassemblyjs/wast-parser-1.9.0" - sources."@webassemblyjs/wast-printer-1.9.0" + sources."@types/node-14.14.20" + sources."@webassemblyjs/ast-1.9.1" + sources."@webassemblyjs/floating-point-hex-parser-1.9.1" + sources."@webassemblyjs/helper-api-error-1.9.1" + sources."@webassemblyjs/helper-buffer-1.9.1" + sources."@webassemblyjs/helper-code-frame-1.9.1" + sources."@webassemblyjs/helper-fsm-1.9.1" + sources."@webassemblyjs/helper-module-context-1.9.1" + sources."@webassemblyjs/helper-wasm-bytecode-1.9.1" + sources."@webassemblyjs/helper-wasm-section-1.9.1" + sources."@webassemblyjs/ieee754-1.9.1" + sources."@webassemblyjs/leb128-1.9.1" + sources."@webassemblyjs/utf8-1.9.1" + sources."@webassemblyjs/wasm-edit-1.9.1" + sources."@webassemblyjs/wasm-gen-1.9.1" + sources."@webassemblyjs/wasm-opt-1.9.1" + sources."@webassemblyjs/wasm-parser-1.9.1" + sources."@webassemblyjs/wast-parser-1.9.1" + sources."@webassemblyjs/wast-printer-1.9.1" sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" sources."acorn-8.0.4" sources."ajv-6.12.6" sources."ajv-keywords-3.5.2" - sources."browserslist-4.15.0" + sources."browserslist-4.16.0" sources."buffer-from-1.1.1" - sources."caniuse-lite-1.0.30001165" + sources."caniuse-lite-1.0.30001173" sources."chrome-trace-event-1.0.2" sources."colorette-1.2.1" sources."commander-2.20.3" - sources."electron-to-chromium-1.3.616" - sources."enhanced-resolve-5.4.0" + sources."electron-to-chromium-1.3.634" + sources."enhanced-resolve-5.4.1" sources."escalade-3.1.1" sources."eslint-scope-5.1.1" (sources."esrecurse-4.3.0" // { @@ -104788,10 +108800,10 @@ in sources."loader-runner-4.1.0" sources."locate-path-6.0.0" sources."merge-stream-2.0.0" - sources."mime-db-1.44.0" - sources."mime-types-2.1.27" + sources."mime-db-1.45.0" + sources."mime-types-2.1.28" sources."neo-async-2.6.2" - sources."node-releases-1.1.67" + sources."node-releases-1.1.69" sources."p-limit-3.1.0" sources."p-locate-5.0.0" sources."path-exists-4.0.0" @@ -104814,7 +108826,7 @@ in sources."terser-webpack-plugin-5.0.3" sources."tslib-1.14.1" sources."uri-js-4.4.0" - sources."watchpack-2.0.1" + sources."watchpack-2.1.0" sources."webpack-sources-2.2.0" sources."yocto-queue-0.1.0" ]; @@ -104831,48 +108843,38 @@ in webpack-cli = nodeEnv.buildNodePackage { name = "webpack-cli"; packageName = "webpack-cli"; - version = "4.2.0"; + version = "4.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.2.0.tgz"; - sha512 = "EIl3k88vaF4fSxWSgtAQR+VwicfLMTZ9amQtqS4o+TDPW9HGaEpbFBbAZ4A3ZOT5SOnMxNOzROsSTPiE8tBJPA=="; + url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.3.1.tgz"; + sha512 = "/F4+9QNZM/qKzzL9/06Am8NXIkGV+/NqQ62Dx7DSqudxxpAgBqYn6V7+zp+0Y7JuWksKUbczRY3wMTd+7Uj6OA=="; }; dependencies = [ - sources."@webpack-cli/info-1.1.0" - sources."@webpack-cli/serve-1.1.0" + sources."@discoveryjs/json-ext-0.5.2" + sources."@webpack-cli/info-1.2.1" + sources."@webpack-cli/serve-1.2.1" sources."ansi-colors-4.1.1" - sources."ansi-styles-3.2.1" - sources."array-back-4.0.1" - sources."chalk-2.4.2" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" sources."colorette-1.2.1" - sources."command-line-usage-6.1.1" - sources."commander-6.2.0" + sources."commander-6.2.1" sources."cross-spawn-7.0.3" - sources."deep-extend-0.6.0" - sources."end-of-stream-1.4.4" sources."enquirer-2.3.6" sources."envinfo-7.7.3" - sources."escape-string-regexp-1.0.5" - sources."execa-4.1.0" + sources."execa-5.0.0" + sources."fastest-levenshtein-1.0.12" sources."find-up-4.1.0" sources."function-bind-1.1.1" - sources."get-stream-5.2.0" + sources."get-stream-6.0.0" sources."has-1.0.3" - sources."has-flag-3.0.0" - sources."human-signals-1.1.1" + sources."human-signals-2.1.0" sources."import-local-3.0.2" sources."interpret-2.2.0" sources."is-core-module-2.2.0" sources."is-stream-2.0.0" sources."isexe-2.0.0" - sources."leven-3.1.0" sources."locate-path-5.0.0" sources."lodash-4.17.20" sources."merge-stream-2.0.0" sources."mimic-fn-2.1.0" sources."npm-run-path-4.0.1" - sources."once-1.4.0" sources."onetime-5.1.2" sources."p-limit-2.3.0" sources."p-locate-4.1.0" @@ -104881,9 +108883,7 @@ in sources."path-key-3.1.1" sources."path-parse-1.0.6" sources."pkg-dir-4.2.0" - sources."pump-3.0.0" sources."rechoir-0.7.0" - sources."reduce-flatten-2.0.0" sources."resolve-1.19.0" sources."resolve-cwd-3.0.0" sources."resolve-from-5.0.0" @@ -104891,14 +108891,9 @@ in sources."shebang-regex-3.0.0" sources."signal-exit-3.0.3" sources."strip-final-newline-2.0.0" - sources."supports-color-5.5.0" - sources."table-layout-1.0.1" - sources."typical-5.2.0" sources."v8-compile-cache-2.2.0" sources."webpack-merge-4.2.2" sources."which-2.0.2" - sources."wordwrapjs-4.0.0" - sources."wrappy-1.0.2" ]; buildInputs = globalBuildInputs; meta = { @@ -104913,15 +108908,15 @@ in webpack-dev-server = nodeEnv.buildNodePackage { name = "webpack-dev-server"; packageName = "webpack-dev-server"; - version = "3.11.0"; + version = "3.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.11.0.tgz"; - sha512 = "PUxZ+oSTxogFQgkTtFndEtJIPNmml7ExwufBZ9L2/Xyyd5PnOL5UreWe5ZT7IU25DSdykL9p1MLQzmLh2ljSeg=="; + url = "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.11.1.tgz"; + sha512 = "u4R3mRzZkbxQVa+MBWi2uVpB5W59H3ekZAJsQlKUTdl7Elcah2EhygTPLmeFXybQkf9i2+L0kn7ik9SnXa6ihQ=="; }; dependencies = [ sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" - sources."@types/node-14.14.10" + sources."@types/node-14.14.20" sources."accepts-1.3.7" sources."ajv-6.12.6" sources."ajv-errors-1.0.1" @@ -105027,7 +109022,7 @@ in sources."semver-5.7.1" ]; }) - (sources."debug-4.3.1" // { + (sources."debug-4.3.2" // { dependencies = [ sources."ms-2.1.2" ]; @@ -105049,7 +109044,7 @@ in sources."emoji-regex-7.0.3" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" - sources."errno-0.1.7" + sources."errno-0.1.8" sources."es-abstract-1.17.7" sources."es-to-primitive-1.2.1" sources."escape-html-1.0.3" @@ -105094,7 +109089,7 @@ in }) sources."fast-deep-equal-3.1.3" sources."fast-json-stable-stringify-2.1.0" - sources."faye-websocket-0.10.0" + sources."faye-websocket-0.11.3" sources."file-uri-to-path-1.0.0" (sources."fill-range-4.0.0" // { dependencies = [ @@ -105108,7 +109103,7 @@ in ]; }) sources."find-up-3.0.0" - sources."follow-redirects-1.13.0" + sources."follow-redirects-1.13.1" sources."for-in-1.0.2" sources."forwarded-0.1.2" sources."fragment-cache-0.2.1" @@ -105117,7 +109112,7 @@ in sources."fsevents-1.2.13" sources."function-bind-1.1.1" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.0.1" + sources."get-intrinsic-1.0.2" sources."get-stream-4.1.0" sources."get-value-2.0.6" sources."glob-7.1.6" @@ -105143,13 +109138,14 @@ in ]; }) sources."hpack.js-2.1.6" - sources."html-entities-1.3.1" + sources."html-entities-1.4.0" sources."http-deceiver-1.2.7" (sources."http-errors-1.7.2" // { dependencies = [ sources."inherits-2.0.3" ]; }) + sources."http-parser-js-0.5.3" sources."http-proxy-1.18.1" sources."http-proxy-middleware-0.19.1" sources."iconv-lite-0.4.24" @@ -105205,8 +109201,8 @@ in sources."methods-1.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."mime-db-1.45.0" + sources."mime-types-2.1.28" sources."minimalistic-assert-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" @@ -105269,7 +109265,7 @@ in (sources."portfinder-1.0.28" // { dependencies = [ sources."debug-3.2.7" - sources."ms-2.1.2" + sources."ms-2.1.3" ]; }) sources."posix-character-classes-0.1.1" @@ -105374,12 +109370,11 @@ in sources."kind-of-3.2.2" ]; }) - sources."sockjs-0.3.20" - (sources."sockjs-client-1.4.0" // { + sources."sockjs-0.3.21" + (sources."sockjs-client-1.5.0" // { dependencies = [ sources."debug-3.2.7" - sources."faye-websocket-0.11.3" - sources."ms-2.1.2" + sources."ms-2.1.3" ]; }) sources."source-map-0.5.7" @@ -105467,13 +109462,13 @@ in sources."uuid-3.4.0" sources."vary-1.1.2" sources."wbuf-1.7.3" - (sources."webpack-dev-middleware-3.7.2" // { + (sources."webpack-dev-middleware-3.7.3" // { dependencies = [ - sources."mime-2.4.6" + sources."mime-2.4.7" ]; }) sources."webpack-log-2.0.0" - sources."websocket-driver-0.6.5" + sources."websocket-driver-0.7.4" sources."websocket-extensions-0.1.4" sources."which-1.3.1" sources."which-module-2.0.0" @@ -105502,106 +109497,54 @@ in copy-webpack-plugin = nodeEnv.buildNodePackage { name = "copy-webpack-plugin"; packageName = "copy-webpack-plugin"; - version = "6.3.2"; + version = "7.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-6.3.2.tgz"; - sha512 = "MgJ1uouLIbDg4ST1GzqrGQyKoXY5iPqi6fghFqarijam7FQcBa/r6Rg0VkoIuzx75Xq8iAMghyOueMkWUQ5OaA=="; + url = "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-7.0.0.tgz"; + sha512 = "SLjQNa5iE3BoCP76ESU9qYo9ZkEWtXoZxDurHoqPchAFRblJ9g96xTeC560UXBMre1Nx6ixIIUfiY3VcjpJw3g=="; }; dependencies = [ - sources."@nodelib/fs.scandir-2.1.3" - sources."@nodelib/fs.stat-2.0.3" - sources."@nodelib/fs.walk-1.2.4" - sources."@npmcli/move-file-1.0.1" + sources."@nodelib/fs.scandir-2.1.4" + sources."@nodelib/fs.stat-2.0.4" + sources."@nodelib/fs.walk-1.2.6" sources."@types/json-schema-7.0.6" - sources."aggregate-error-3.1.0" sources."ajv-6.12.6" sources."ajv-keywords-3.5.2" sources."array-union-2.1.0" - sources."balanced-match-1.0.0" sources."big.js-5.2.2" - sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."cacache-15.0.5" - sources."chownr-2.0.0" - sources."clean-stack-2.2.0" - sources."commondir-1.0.1" - sources."concat-map-0.0.1" sources."dir-glob-3.0.1" sources."emojis-list-3.0.0" sources."fast-deep-equal-3.1.3" sources."fast-glob-3.2.4" sources."fast-json-stable-stringify-2.1.0" - sources."fastq-1.9.0" + sources."fastq-1.10.0" sources."fill-range-7.0.1" - sources."find-cache-dir-3.3.1" - sources."find-up-4.1.0" - sources."fs-minipass-2.1.0" - sources."fs.realpath-1.0.0" - sources."glob-7.1.6" sources."glob-parent-5.1.1" sources."globby-11.0.1" sources."ignore-5.1.8" - sources."imurmurhash-0.1.4" - sources."indent-string-4.0.0" - sources."infer-owner-1.0.4" - sources."inflight-1.0.6" - sources."inherits-2.0.4" sources."is-extglob-2.1.1" sources."is-glob-4.0.1" sources."is-number-7.0.0" sources."json-schema-traverse-0.4.1" sources."json5-2.1.3" sources."loader-utils-2.0.0" - sources."locate-path-5.0.0" - sources."lru-cache-6.0.0" - sources."make-dir-3.1.0" sources."merge2-1.4.1" sources."micromatch-4.0.2" - sources."minimatch-3.0.4" sources."minimist-1.2.5" - sources."minipass-3.1.3" - sources."minipass-collect-1.0.2" - sources."minipass-flush-1.0.5" - sources."minipass-pipeline-1.2.4" - sources."minizlib-2.1.2" - sources."mkdirp-1.0.4" sources."normalize-path-3.0.0" - sources."once-1.4.0" sources."p-limit-3.1.0" - (sources."p-locate-4.1.0" // { - dependencies = [ - sources."p-limit-2.3.0" - ]; - }) - sources."p-map-4.0.0" - sources."p-try-2.2.0" - sources."path-exists-4.0.0" - sources."path-is-absolute-1.0.1" sources."path-type-4.0.0" sources."picomatch-2.2.2" - sources."pkg-dir-4.2.0" - sources."promise-inflight-1.0.1" sources."punycode-2.1.1" sources."randombytes-2.1.0" sources."reusify-1.0.4" - sources."rimraf-3.0.2" sources."run-parallel-1.1.10" sources."safe-buffer-5.2.1" sources."schema-utils-3.0.0" - sources."semver-6.3.0" sources."serialize-javascript-5.0.1" sources."slash-3.0.0" - sources."source-list-map-2.0.1" - sources."source-map-0.6.1" - sources."ssri-8.0.0" - sources."tar-6.0.5" sources."to-regex-range-5.0.1" - sources."unique-filename-1.1.1" - sources."unique-slug-2.0.2" sources."uri-js-4.4.0" - sources."webpack-sources-1.4.3" - sources."wrappy-1.0.2" - sources."yallist-4.0.0" sources."yocto-queue-0.1.0" ]; buildInputs = globalBuildInputs; @@ -105634,7 +109577,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-13.13.34" + sources."@types/node-13.13.39" sources."addr-to-ip-port-1.5.1" sources."airplay-js-0.3.0" sources."balanced-match-1.0.0" @@ -105645,26 +109588,26 @@ in sources."bitfield-4.0.0" (sources."bittorrent-dht-10.0.0" // { dependencies = [ - sources."debug-4.3.1" + sources."debug-4.3.2" sources."ms-2.1.2" ]; }) (sources."bittorrent-lsd-1.1.0" // { dependencies = [ - sources."debug-4.3.1" + sources."debug-4.3.2" sources."ms-2.1.2" ]; }) sources."bittorrent-peerid-1.3.3" (sources."bittorrent-protocol-3.2.0" // { dependencies = [ - sources."debug-4.3.1" + sources."debug-4.3.2" sources."ms-2.1.2" ]; }) (sources."bittorrent-tracker-9.15.0" // { dependencies = [ - sources."debug-4.3.1" + sources."debug-4.3.2" sources."decompress-response-6.0.0" sources."mimic-response-3.1.0" sources."ms-2.1.2" @@ -105682,10 +109625,10 @@ in sources."buffer-fill-1.0.0" sources."buffer-from-1.1.1" sources."buffer-indexof-1.1.1" - sources."bufferutil-4.0.2" + sources."bufferutil-4.0.3" (sources."castv2-0.1.10" // { dependencies = [ - sources."debug-4.3.1" + sources."debug-4.3.2" sources."ms-2.1.2" ]; }) @@ -105775,7 +109718,7 @@ in sources."mdns-js-packet-0.2.0" sources."mediasource-2.4.0" sources."memory-chunk-store-1.3.0" - sources."mime-2.4.6" + sources."mime-2.4.7" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" @@ -105832,7 +109775,7 @@ in sources."record-cache-1.1.0" (sources."render-media-4.1.0" // { dependencies = [ - sources."debug-4.3.1" + sources."debug-4.3.2" sources."ms-2.1.2" ]; }) @@ -105848,14 +109791,14 @@ in sources."simple-get-2.8.1" (sources."simple-peer-9.9.3" // { dependencies = [ - sources."debug-4.3.1" + sources."debug-4.3.2" sources."ms-2.1.2" ]; }) sources."simple-sha1-3.0.1" (sources."simple-websocket-8.1.1" // { dependencies = [ - sources."debug-4.3.1" + sources."debug-4.3.2" sources."ms-2.1.2" ]; }) @@ -105877,7 +109820,7 @@ in sources."to-arraybuffer-1.0.1" (sources."torrent-discovery-9.4.0" // { dependencies = [ - sources."debug-4.3.1" + sources."debug-4.3.2" sources."ms-2.1.2" ]; }) @@ -105892,19 +109835,19 @@ in sources."url-join-4.0.1" (sources."ut_metadata-3.5.2" // { dependencies = [ - sources."debug-4.3.1" + sources."debug-4.3.2" sources."ms-2.1.2" ]; }) sources."ut_pex-2.0.1" - sources."utf-8-validate-5.0.3" + sources."utf-8-validate-5.0.4" sources."util-deprecate-1.0.2" sources."utp-native-2.2.2" sources."videostream-3.2.2" sources."vlc-command-1.2.0" (sources."webtorrent-0.112.0" // { dependencies = [ - sources."debug-4.3.1" + sources."debug-4.3.2" sources."decompress-response-6.0.0" sources."get-stdin-8.0.0" sources."magnet-uri-6.1.0" @@ -105916,7 +109859,7 @@ in }) sources."winreg-1.2.4" sources."wrappy-1.0.2" - sources."ws-7.4.1" + sources."ws-7.4.2" sources."xml2js-0.4.23" sources."xmlbuilder-11.0.1" sources."xmldom-0.1.31" @@ -105952,10 +109895,10 @@ in write-good = nodeEnv.buildNodePackage { name = "write-good"; packageName = "write-good"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/write-good/-/write-good-1.0.3.tgz"; - sha512 = "8n5k4h00o91iYlzudpO8VqmeEjJ2qfMtVA+rhYUVYmibEOEoOXN+YGxB7CY7BZbN2Pv8aDK4oiLSN0a3pAwwOQ=="; + url = "https://registry.npmjs.org/write-good/-/write-good-1.0.4.tgz"; + sha512 = "NA7P2MQ2yw4k+SYq9NQMB0GLchzoprbMRoJgMquLoWzucTozni8k/3hvXvldyDQbgPpPZObzOGvcB6UgqzggzQ=="; }; dependencies = [ sources."adverb-where-0.2.1" @@ -105993,7 +109936,7 @@ in sources."esprima-4.0.1" sources."http-proxy-agent-2.1.0" sources."https-proxy-agent-2.2.4" - sources."js-yaml-3.14.0" + sources."js-yaml-3.14.1" sources."jsonc-parser-2.3.1" sources."ms-2.0.0" sources."request-light-0.2.5" @@ -106017,7 +109960,7 @@ in ]; }) sources."vscode-languageserver-textdocument-1.0.1" - sources."vscode-languageserver-types-3.15.1" + sources."vscode-languageserver-types-3.16.0" sources."vscode-nls-4.1.2" sources."vscode-uri-2.1.2" sources."yaml-language-server-parser-0.1.1" @@ -106058,8 +110001,8 @@ in sha512 = "GFg4QC1xi3gkbHGGUFme8/8XPg3kDISu/qJfx56X207yuv1FSevGY/eKuym7kh0bniCB4n3rseWW+QZXPH8LIw=="; }; dependencies = [ - sources."@babel/code-frame-7.10.4" - sources."@babel/helper-validator-identifier-7.10.4" + sources."@babel/code-frame-7.12.11" + sources."@babel/helper-validator-identifier-7.12.11" sources."@babel/highlight-7.10.4" sources."@babel/runtime-7.12.5" sources."@mrmlnc/readdir-enhanced-2.2.1" @@ -106067,7 +110010,7 @@ in sources."@sindresorhus/is-0.7.0" sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" - sources."@types/node-14.14.10" + sources."@types/node-14.14.20" sources."@types/normalize-package-data-2.4.0" sources."JSONStream-1.3.5" sources."aggregate-error-3.1.0" @@ -106164,7 +110107,14 @@ in sources."cli-boxes-1.0.0" sources."cli-cursor-2.1.0" sources."cli-list-0.2.0" - sources."cli-table-0.3.1" + (sources."cli-table-0.3.4" // { + dependencies = [ + sources."ansi-regex-5.0.0" + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.0" + sources."strip-ansi-6.0.0" + ]; + }) sources."cli-width-2.2.1" sources."clone-2.1.2" sources."clone-buffer-1.0.0" @@ -106177,7 +110127,6 @@ in sources."collection-visit-1.0.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."colors-1.0.3" sources."combined-stream-1.0.8" sources."commondir-1.0.1" sources."component-emitter-1.3.0" @@ -106187,7 +110136,7 @@ in sources."config-chain-1.1.12" sources."configstore-3.1.5" sources."copy-descriptor-0.1.1" - sources."core-js-3.8.0" + sources."core-js-3.8.2" sources."core-util-is-1.0.2" sources."create-error-class-3.0.2" sources."cross-spawn-6.0.5" @@ -106371,7 +110320,7 @@ in sources."indent-string-4.0.0" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."ini-1.3.5" + sources."ini-1.3.8" sources."inquirer-6.5.2" sources."insight-0.10.3" sources."interpret-1.4.0" @@ -106505,8 +110454,8 @@ in sources."merge-stream-2.0.0" sources."merge2-1.4.1" sources."micromatch-3.1.10" - sources."mime-db-1.44.0" - sources."mime-types-2.1.27" + sources."mime-db-1.45.0" + sources."mime-types-2.1.28" sources."mimic-fn-2.1.0" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" @@ -106609,7 +110558,7 @@ in sources."pkg-up-2.0.0" sources."posix-character-classes-0.1.1" sources."prepend-http-2.0.0" - sources."pretty-bytes-5.4.1" + sources."pretty-bytes-5.5.0" sources."process-nextick-args-2.0.1" sources."proto-list-1.2.4" sources."pseudomap-1.0.2" @@ -106934,7 +110883,7 @@ in }) sources."is-fullwidth-code-point-3.0.0" sources."is-stream-2.0.0" - sources."ms-2.1.2" + sources."ms-2.1.3" sources."mute-stream-0.0.8" sources."npm-run-path-4.0.1" sources."onetime-5.1.2" @@ -106960,7 +110909,7 @@ in }) (sources."yeoman-generator-4.12.0" // { dependencies = [ - sources."debug-4.3.1" + sources."debug-4.3.2" sources."diff-4.0.2" sources."dir-glob-2.2.2" sources."ejs-3.1.5" diff --git a/pkgs/development/ocaml-modules/afl-persistent/default.nix b/pkgs/development/ocaml-modules/afl-persistent/default.nix index 5ac352e0762c..5625cd95764f 100644 --- a/pkgs/development/ocaml-modules/afl-persistent/default.nix +++ b/pkgs/development/ocaml-modules/afl-persistent/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib, opaline }: +{ lib, stdenv, fetchFromGitHub, ocaml, findlib, opaline }: stdenv.mkDerivation rec { pname = "afl-persistent"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { doCheck = true; checkPhase = "./_build/test && ./_build/test2"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/stedolan/ocaml-afl-persistent"; description = "persistent-mode afl-fuzz for ocaml"; license = licenses.mit; diff --git a/pkgs/development/ocaml-modules/angstrom-async/default.nix b/pkgs/development/ocaml-modules/angstrom-async/default.nix index 60e774918d5d..8c9f97f81abc 100644 --- a/pkgs/development/ocaml-modules/angstrom-async/default.nix +++ b/pkgs/development/ocaml-modules/angstrom-async/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildDunePackage, angstrom, async }: +{ lib, fetchFromGitHub, buildDunePackage, angstrom, async }: buildDunePackage rec { pname = "angstrom-async"; @@ -14,6 +14,6 @@ buildDunePackage rec { meta = { inherit (angstrom.meta) homepage license; description = "Async support for Angstrom"; - maintainers = with stdenv.lib.maintainers; [ romildo ]; + maintainers = with lib.maintainers; [ romildo ]; }; } diff --git a/pkgs/development/ocaml-modules/angstrom-lwt-unix/default.nix b/pkgs/development/ocaml-modules/angstrom-lwt-unix/default.nix index eb4de44d7a6e..1bb8833cf079 100644 --- a/pkgs/development/ocaml-modules/angstrom-lwt-unix/default.nix +++ b/pkgs/development/ocaml-modules/angstrom-lwt-unix/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildDunePackage, angstrom, ocaml_lwt }: +{ lib, fetchFromGitHub, buildDunePackage, angstrom, ocaml_lwt }: buildDunePackage rec { pname = "angstrom-lwt-unix"; @@ -14,6 +14,6 @@ buildDunePackage rec { meta = { inherit (angstrom.meta) homepage license; description = "Lwt_unix support for Angstrom"; - maintainers = with stdenv.lib.maintainers; [ romildo ]; + maintainers = with lib.maintainers; [ romildo ]; }; } diff --git a/pkgs/development/ocaml-modules/angstrom-unix/default.nix b/pkgs/development/ocaml-modules/angstrom-unix/default.nix index 134c161d266f..af72c7f8d2d9 100644 --- a/pkgs/development/ocaml-modules/angstrom-unix/default.nix +++ b/pkgs/development/ocaml-modules/angstrom-unix/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildDunePackage, angstrom }: +{ lib, fetchFromGitHub, buildDunePackage, angstrom }: buildDunePackage rec { pname = "angstrom-unix"; @@ -14,6 +14,6 @@ buildDunePackage rec { meta = { inherit (angstrom.meta) homepage license; description = "Unix support for Angstrom"; - maintainers = with stdenv.lib.maintainers; [ romildo ]; + maintainers = with lib.maintainers; [ romildo ]; }; } diff --git a/pkgs/development/ocaml-modules/ansiterminal/default.nix b/pkgs/development/ocaml-modules/ansiterminal/default.nix index 7b9f01751517..53b02a453a0e 100644 --- a/pkgs/development/ocaml-modules/ansiterminal/default.nix +++ b/pkgs/development/ocaml-modules/ansiterminal/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild }: +{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild }: stdenv.mkDerivation rec { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { createFindlibDestdir = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/Chris00/ANSITerminal"; description = "A module allowing to use the colors and cursor movements on ANSI terminals"; longDescription = '' diff --git a/pkgs/development/ocaml-modules/apron/default.nix b/pkgs/development/ocaml-modules/apron/default.nix index 79c4d8a50024..959a7203dfa9 100644 --- a/pkgs/development/ocaml-modules/apron/default.nix +++ b/pkgs/development/ocaml-modules/apron/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, perl, gmp, mpfr, ppl, ocaml, findlib, camlidl, mlgmpidl }: +{ stdenv, lib, fetchFromGitHub, perl, gmp, mpfr, ppl, ocaml, findlib, camlidl, mlgmpidl }: stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-apron-${version}"; @@ -30,9 +30,9 @@ stdenv.mkDerivation rec { ''; meta = { - license = stdenv.lib.licenses.lgpl21; + license = lib.licenses.lgpl21; homepage = "http://apron.cri.ensmp.fr/library/"; - maintainers = [ stdenv.lib.maintainers.vbgl ]; + maintainers = [ lib.maintainers.vbgl ]; description = "Numerical abstract domain library"; inherit (ocaml.meta) platforms; }; diff --git a/pkgs/development/ocaml-modules/astring/default.nix b/pkgs/development/ocaml-modules/astring/default.nix index f790a87e22c5..ba8cd98327fa 100644 --- a/pkgs/development/ocaml-modules/astring/default.nix +++ b/pkgs/development/ocaml-modules/astring/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg }: +{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, topkg }: let # Use astring 0.8.3 for OCaml < 4.05 param = - if stdenv.lib.versionAtLeast ocaml.version "4.05" + if lib.versionAtLeast ocaml.version "4.05" then { version = "0.8.5"; sha256 = "1ykhg9gd3iy7zsgyiy2p9b1wkpqg9irw5pvcqs3sphq71iir4ml6"; @@ -41,7 +41,7 @@ stdenv.mkDerivation { adds a few missing functions and fully exploits OCaml's newfound string immutability. ''; - license = stdenv.lib.licenses.isc; - maintainers = with stdenv.lib.maintainers; [ sternenseemann ]; + license = lib.licenses.isc; + maintainers = with lib.maintainers; [ sternenseemann ]; }; } diff --git a/pkgs/development/ocaml-modules/atd/default.nix b/pkgs/development/ocaml-modules/atd/default.nix index 84b137ada7c3..e4edac5fdc10 100644 --- a/pkgs/development/ocaml-modules/atd/default.nix +++ b/pkgs/development/ocaml-modules/atd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, menhir, easy-format, fetchFromGitHub, buildDunePackage, which, biniou, yojson }: +{ lib, menhir, easy-format, fetchFromGitHub, buildDunePackage, which, biniou, yojson }: buildDunePackage rec { pname = "atd"; @@ -18,7 +18,7 @@ buildDunePackage rec { buildInputs = [ which menhir ]; propagatedBuildInputs = [ easy-format biniou yojson ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/mjambon/atd"; description = "Syntax for cross-language type definitions"; license = licenses.bsd3; diff --git a/pkgs/development/ocaml-modules/bap/dont-add-curses.patch b/pkgs/development/ocaml-modules/bap/curses_is_ncurses.patch similarity index 94% rename from pkgs/development/ocaml-modules/bap/dont-add-curses.patch rename to pkgs/development/ocaml-modules/bap/curses_is_ncurses.patch index 438a1bfc6dc0..0b012848601f 100644 --- a/pkgs/development/ocaml-modules/bap/dont-add-curses.patch +++ b/pkgs/development/ocaml-modules/bap/curses_is_ncurses.patch @@ -23,7 +23,7 @@ index 966c407..fba3fb4 100644 Bap_llvm_ogre_types CCOpt: $cc_optimization - CCLib: $llvm_lib $cxxlibs $llvm_ldflags -lcurses -+ CCLib: $llvm_lib $cxxlibs $llvm_ldflags ++ CCLib: $llvm_lib $cxxlibs $llvm_ldflags -lncurses CSources: llvm_disasm.h, llvm_disasm.c, llvm_stubs.c, diff --git a/pkgs/development/ocaml-modules/bap/default.nix b/pkgs/development/ocaml-modules/bap/default.nix index 66b1dd67a9f2..9284bbaf9c62 100644 --- a/pkgs/development/ocaml-modules/bap/default.nix +++ b/pkgs/development/ocaml-modules/bap/default.nix @@ -1,17 +1,18 @@ -{ stdenv, fetchFromGitHub, fetchurl -, ocaml, findlib, ocamlbuild, ocaml_oasis, - bitstring, camlzip, cmdliner, core_kernel, ezjsonm, fileutils, ocaml_lwt, ocamlgraph, ocurl, re, uri, zarith, piqi, piqi-ocaml, uuidm, llvm, frontc, ounit, ppx_jane, parsexp, - utop, libxml2, - ppx_tools_versioned, - which, makeWrapper, writeText +{ lib, stdenv, fetchFromGitHub, fetchurl +, ocaml, findlib, ocamlbuild, ocaml_oasis +, bitstring, camlzip, cmdliner, core_kernel, ezjsonm, fileutils, ocaml_lwt, ocamlgraph, ocurl, re, uri, zarith, piqi, piqi-ocaml, uuidm, llvm, frontc, ounit, ppx_jane, parsexp +, utop, libxml2, ncurses +, ppx_bitstring +, ppx_tools_versioned +, which, makeWrapper, writeText , z3 }: -if !stdenv.lib.versionAtLeast ocaml.version "4.07" +if !lib.versionAtLeast ocaml.version "4.07" then throw "BAP is not available for OCaml ${ocaml.version}" else -if stdenv.lib.versionAtLeast core_kernel.version "0.13" +if lib.versionAtLeast core_kernel.version "0.13" then throw "BAP needs core_kernel-0.12 (hence OCaml 4.07)" else @@ -40,9 +41,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ which makeWrapper ]; buildInputs = [ ocaml findlib ocamlbuild ocaml_oasis - llvm ppx_tools_versioned + llvm ppx_bitstring ppx_tools_versioned z3 - utop libxml2 ]; + utop libxml2 ncurses ]; propagatedBuildInputs = [ bitstring camlzip cmdliner ppx_jane core_kernel ezjsonm fileutils ocaml_lwt ocamlgraph ocurl re uri zarith piqi parsexp piqi-ocaml uuidm frontc ounit ]; @@ -61,13 +62,15 @@ stdenv.mkDerivation rec { disableIda = "--disable-ida"; - patches = [ ./dont-add-curses.patch ]; + patches = [ ./curses_is_ncurses.patch ]; + + preConfigure = '' + substituteInPlace oasis/elf --replace bitstring.ppx ppx_bitstring + ''; configureFlags = [ "--enable-everything ${disableIda}" "--with-llvm-config=${llvm}/bin/llvm-config" ]; - BAPBUILDFLAGS = "-j $(NIX_BUILD_CORES)"; - - meta = with stdenv.lib; { + meta = with lib; { description = "Platform for binary analysis. It is written in OCaml, but can be used from other languages."; homepage = "https://github.com/BinaryAnalysisPlatform/bap/"; maintainers = [ maintainers.maurer ]; diff --git a/pkgs/development/ocaml-modules/batteries/default.nix b/pkgs/development/ocaml-modules/batteries/default.nix index 87622ab0fbf0..d4b7f3ff9a12 100644 --- a/pkgs/development/ocaml-modules/batteries/default.nix +++ b/pkgs/development/ocaml-modules/batteries/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, qtest, num }: +{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, qtest, num }: let version = "3.2.0"; in @@ -14,7 +14,7 @@ stdenv.mkDerivation { checkInputs = [ qtest ]; propagatedBuildInputs = [ num ]; - doCheck = stdenv.lib.versionAtLeast ocaml.version "4.04" && !stdenv.isAarch64; + doCheck = lib.versionAtLeast ocaml.version "4.04" && !stdenv.isAarch64; checkTarget = "test"; createFindlibDestdir = true; @@ -27,10 +27,10 @@ stdenv.mkDerivation { and comprehensive development platform for the OCaml programming language. ''; - license = stdenv.lib.licenses.lgpl21Plus; + license = lib.licenses.lgpl21Plus; platforms = ocaml.meta.platforms or []; maintainers = [ - stdenv.lib.maintainers.maggesi + lib.maintainers.maggesi ]; }; } diff --git a/pkgs/development/ocaml-modules/benchmark/default.nix b/pkgs/development/ocaml-modules/benchmark/default.nix index 518a8756158b..07432dd7c6e7 100644 --- a/pkgs/development/ocaml-modules/benchmark/default.nix +++ b/pkgs/development/ocaml-modules/benchmark/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, ocaml_pcre }: +{ stdenv, lib, fetchzip, ocaml, findlib, ocamlbuild, ocaml_pcre }: let version = "1.4"; in @@ -18,7 +18,7 @@ stdenv.mkDerivation { homepage = "http://ocaml-benchmark.forge.ocamlcore.org/"; platforms = ocaml.meta.platforms or []; description = "Benchmark running times of code"; - license = stdenv.lib.licenses.lgpl21; - maintainers = with stdenv.lib.maintainers; [ volth ]; + license = lib.licenses.lgpl21; + maintainers = with lib.maintainers; [ volth ]; }; } diff --git a/pkgs/development/ocaml-modules/bin_prot/default.nix b/pkgs/development/ocaml-modules/bin_prot/default.nix index 0dddb653e09e..50ef935aff6b 100644 --- a/pkgs/development/ocaml-modules/bin_prot/default.nix +++ b/pkgs/development/ocaml-modules/bin_prot/default.nix @@ -1,6 +1,6 @@ -{ stdenv, buildOcaml, fetchurl, ocaml, type_conv }: +{ lib, buildOcaml, fetchurl, ocaml, type_conv }: -if stdenv.lib.versionAtLeast ocaml.version "4.06" +if lib.versionAtLeast ocaml.version "4.06" then throw "bin_prot-112.24.00 is not available for OCaml ${ocaml.version}" else @@ -19,7 +19,7 @@ buildOcaml rec { hasSharedObjects = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/janestreet/bin_prot"; description = "Binary protocol generator "; license = licenses.asl20; diff --git a/pkgs/development/ocaml-modules/biniou/1.0.nix b/pkgs/development/ocaml-modules/biniou/1.0.nix index ed216d8236aa..795e63401290 100644 --- a/pkgs/development/ocaml-modules/biniou/1.0.nix +++ b/pkgs/development/ocaml-modules/biniou/1.0.nix @@ -1,11 +1,11 @@ -{stdenv, fetchurl, ocaml, findlib, easy-format}: +{lib, stdenv, fetchurl, ocaml, findlib, easy-format}: let pname = "biniou"; version = "1.0.9"; webpage = "http://mjambon.com/${pname}.html"; in -assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.11"; +assert lib.versionAtLeast (lib.getVersion ocaml) "3.11"; stdenv.mkDerivation rec { @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { mkdir $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A binary data format designed for speed, safety, ease of use and backward compatibility as protocols evolve"; homepage = webpage; license = licenses.bsd3; diff --git a/pkgs/development/ocaml-modules/biniou/default.nix b/pkgs/development/ocaml-modules/biniou/default.nix index b97c78a399bf..8e0780ae6c5c 100644 --- a/pkgs/development/ocaml-modules/biniou/default.nix +++ b/pkgs/development/ocaml-modules/biniou/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildDunePackage, easy-format }: +{ lib, fetchFromGitHub, buildDunePackage, easy-format }: buildDunePackage rec { pname = "biniou"; @@ -20,7 +20,7 @@ buildDunePackage rec { meta = { inherit (src.meta) homepage; description = "Binary data format designed for speed, safety, ease of use and backward compatibility as protocols evolve"; - maintainers = [ stdenv.lib.maintainers.vbgl ]; - license = stdenv.lib.licenses.bsd3; + maintainers = [ lib.maintainers.vbgl ]; + license = lib.licenses.bsd3; }; } diff --git a/pkgs/development/ocaml-modules/biocaml/default.nix b/pkgs/development/ocaml-modules/biocaml/default.nix index c85886c73de4..596ed6161d7b 100644 --- a/pkgs/development/ocaml-modules/biocaml/default.nix +++ b/pkgs/development/ocaml-modules/biocaml/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildDunePackage, fetchFromGitHub, fetchpatch +{ lib, buildDunePackage, fetchFromGitHub, fetchpatch , ounit, async, base64, camlzip, cfstream , core, ppx_jane, ppx_sexp_conv, rresult, uri, xmlm }: @@ -21,7 +21,7 @@ buildDunePackage rec { checkInputs = [ ounit ]; propagatedBuildInputs = [ async base64 camlzip cfstream core rresult uri xmlm ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Bioinformatics library for Ocaml"; homepage = "http://${pname}.org"; maintainers = [ maintainers.bcdarwin ]; diff --git a/pkgs/development/ocaml-modules/bisect_ppx-ocamlbuild/default.nix b/pkgs/development/ocaml-modules/bisect_ppx-ocamlbuild/default.nix deleted file mode 100644 index 6a98267d89a5..000000000000 --- a/pkgs/development/ocaml-modules/bisect_ppx-ocamlbuild/default.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ buildDunePackage, bisect_ppx, ocamlbuild }: - -buildDunePackage { - minimumOCamlVersion = "4.02"; - inherit (bisect_ppx) version src meta; - pname = "bisect_ppx-ocamlbuild"; - propagatedBuildInputs = [ ocamlbuild ]; -} diff --git a/pkgs/development/ocaml-modules/bisect_ppx/default.nix b/pkgs/development/ocaml-modules/bisect_ppx/default.nix index ce52c427cd07..eba010819949 100644 --- a/pkgs/development/ocaml-modules/bisect_ppx/default.nix +++ b/pkgs/development/ocaml-modules/bisect_ppx/default.nix @@ -1,24 +1,27 @@ -{ stdenv, fetchFromGitHub, buildDunePackage, ocaml-migrate-parsetree, ppx_tools_versioned }: +{ lib, fetchFromGitHub, buildDunePackage, cmdliner, ocaml-migrate-parsetree, ppx_tools_versioned }: buildDunePackage rec { pname = "bisect_ppx"; - version = "1.4.0"; + version = "2.5.0"; + + useDune2 = true; src = fetchFromGitHub { owner = "aantron"; repo = "bisect_ppx"; rev = version; - sha256 = "1plhm4pvrhpapz5zaks194ji1fgzmp13y942g10pbn9m7kgkqg4h"; + sha256 = "0w2qd1myvh333jvkf8hgrqzl8ns4xgfggk4frf1ij3jyc7qc0868"; }; buildInputs = [ + cmdliner ocaml-migrate-parsetree ppx_tools_versioned ]; meta = { description = "Code coverage for OCaml"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mit; homepage = "https://github.com/aantron/bisect_ppx"; }; } diff --git a/pkgs/development/ocaml-modules/bitstring/default.nix b/pkgs/development/ocaml-modules/bitstring/default.nix index 386503039e05..583017d9ddec 100644 --- a/pkgs/development/ocaml-modules/bitstring/default.nix +++ b/pkgs/development/ocaml-modules/bitstring/default.nix @@ -1,20 +1,21 @@ -{ stdenv, fetchFromGitHub, buildDunePackage, ppx_tools_versioned, ounit }: +{ lib, fetchFromGitHub, buildDunePackage, stdlib-shims }: buildDunePackage rec { pname = "bitstring"; - version = "3.1.1"; + version = "4.0.1"; + + useDune2 = true; src = fetchFromGitHub { owner = "xguerin"; repo = pname; rev = "v${version}"; - sha256 = "1ys8xx174jf8v5sm0lbxvzhdlcs5p0fhy1gvf58gad2g4gvgpvxc"; + sha256 = "1z7jmgljvp52lvn3ml2cp6gssxqp4sikwyjf6ym97cycbcw0fjjm"; }; - buildInputs = [ ppx_tools_versioned ounit ]; - doCheck = true; + propagatedBuildInputs = [ stdlib-shims ]; - meta = with stdenv.lib; { + meta = with lib; { description = "This library adds Erlang-style bitstrings and matching over bitstrings as a syntax extension and library for OCaml"; homepage = "https://github.com/xguerin/bitstring"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/ocaml-modules/bitstring/ppx.nix b/pkgs/development/ocaml-modules/bitstring/ppx.nix new file mode 100644 index 000000000000..ee0a8c51f732 --- /dev/null +++ b/pkgs/development/ocaml-modules/bitstring/ppx.nix @@ -0,0 +1,18 @@ +{ lib, buildDunePackage, ocaml +, bitstring, ppxlib +, ounit +}: + +buildDunePackage rec { + pname = "ppx_bitstring"; + inherit (bitstring) version useDune2 src; + + buildInputs = [ bitstring ppxlib ]; + + doCheck = lib.versionAtLeast ocaml.version "4.08"; + checkInputs = [ ounit ]; + + meta = bitstring.meta // { + description = "Bitstrings and bitstring matching for OCaml - PPX extension"; + }; +} diff --git a/pkgs/development/ocaml-modules/bitv/default.nix b/pkgs/development/ocaml-modules/bitv/default.nix index 359d83b4762a..23e8d145a308 100644 --- a/pkgs/development/ocaml-modules/bitv/default.nix +++ b/pkgs/development/ocaml-modules/bitv/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchzip, autoreconfHook, which, ocaml, findlib }: +{ stdenv, lib, fetchzip, autoreconfHook, which, ocaml, findlib }: -if !stdenv.lib.versionAtLeast ocaml.version "4.02" +if !lib.versionAtLeast ocaml.version "4.02" then throw "bitv is not available for OCaml ${ocaml.version}" else @@ -19,9 +19,9 @@ stdenv.mkDerivation rec { meta = { description = "A bit vector library for OCaml"; - license = stdenv.lib.licenses.lgpl21; + license = lib.licenses.lgpl21; homepage = "https://github.com/backtracking/bitv"; - maintainers = [ stdenv.lib.maintainers.vbgl ]; + maintainers = [ lib.maintainers.vbgl ]; inherit (ocaml.meta) platforms; }; } diff --git a/pkgs/development/ocaml-modules/bolt/default.nix b/pkgs/development/ocaml-modules/bolt/default.nix index f5dc099b1403..54bc28697ec4 100644 --- a/pkgs/development/ocaml-modules/bolt/default.nix +++ b/pkgs/development/ocaml-modules/bolt/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, fetchpatch, ocaml, findlib, ocamlbuild, which, camlp4 }: +{ lib, stdenv, fetchurl, fetchpatch, ocaml, findlib, ocamlbuild, which, camlp4 }: -let inherit (stdenv.lib) getVersion versionAtLeast; in +let inherit (lib) getVersion versionAtLeast; in assert versionAtLeast (getVersion ocaml) "4.00.0"; assert versionAtLeast (getVersion findlib) "1.3.3"; @@ -50,7 +50,7 @@ EOF doCheck = true; checkTarget = "tests"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://bolt.x9c.fr"; description = "A logging tool for the OCaml language"; longDescription = '' diff --git a/pkgs/development/ocaml-modules/bos/default.nix b/pkgs/development/ocaml-modules/bos/default.nix index ca6c362b6fa5..84cee3d97cea 100644 --- a/pkgs/development/ocaml-modules/bos/default.nix +++ b/pkgs/development/ocaml-modules/bos/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg +{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, topkg , astring, fmt, fpath, logs, rresult }: @@ -19,8 +19,8 @@ stdenv.mkDerivation rec { meta = { description = "Basic OS interaction for OCaml"; homepage = "https://erratique.ch/software/bos"; - license = stdenv.lib.licenses.isc; - maintainers = [ stdenv.lib.maintainers.vbgl ]; + license = lib.licenses.isc; + maintainers = [ lib.maintainers.vbgl ]; inherit (ocaml.meta) platforms; }; } diff --git a/pkgs/development/ocaml-modules/calendar/default.nix b/pkgs/development/ocaml-modules/calendar/default.nix index f23081a5f195..1210ed41dc2b 100644 --- a/pkgs/development/ocaml-modules/calendar/default.nix +++ b/pkgs/development/ocaml-modules/calendar/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ocaml, findlib}: +{stdenv, lib, fetchurl, ocaml, findlib}: stdenv.mkDerivation { name = "ocaml-calendar-2.5"; @@ -17,7 +17,7 @@ stdenv.mkDerivation { license = "LGPL"; platforms = ocaml.meta.platforms or []; maintainers = [ - stdenv.lib.maintainers.gal_bolle + lib.maintainers.gal_bolle ]; }; } diff --git a/pkgs/development/ocaml-modules/camlimages/4.0.nix b/pkgs/development/ocaml-modules/camlimages/4.0.nix index e62acc3cd63f..26735b1c5d7f 100644 --- a/pkgs/development/ocaml-modules/camlimages/4.0.nix +++ b/pkgs/development/ocaml-modules/camlimages/4.0.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, omake, ocaml, libtiff, libjpeg, libpng, giflib, findlib, libXpm, freetype, graphicsmagick, ghostscript }: +{ lib, stdenv, fetchurl, omake, ocaml, libtiff, libjpeg, libpng, giflib, findlib, libXpm, freetype, graphicsmagick, ghostscript }: let pname = "camlimages"; @@ -31,7 +31,7 @@ stdenv.mkDerivation { omake install ''; - meta = with stdenv.lib; { + meta = with lib; { branch = "4.0"; homepage = "https://bitbucket.org/camlspotter/camlimages"; description = "OCaml image processing library"; diff --git a/pkgs/development/ocaml-modules/camlpdf/default.nix b/pkgs/development/ocaml-modules/camlpdf/default.nix index 7e231001f24f..18683d5f1709 100644 --- a/pkgs/development/ocaml-modules/camlpdf/default.nix +++ b/pkgs/development/ocaml-modules/camlpdf/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, which, ocaml, findlib }: +{ lib, stdenv, fetchFromGitHub, which, ocaml, findlib }: -if !stdenv.lib.versionAtLeast ocaml.version "4.02" +if !lib.versionAtLeast ocaml.version "4.02" then throw "camlpdf is not available for OCaml ${ocaml.version}" else @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/stublibs ''; - meta = with stdenv.lib; { + meta = with lib; { description = "An OCaml library for reading, writing and modifying PDF files"; homepage = "https://github.com/johnwhitington/camlpdf"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/ocaml-modules/camlzip/default.nix b/pkgs/development/ocaml-modules/camlzip/default.nix index 1e6e0e8f8faa..c2c2e98b2e06 100644 --- a/pkgs/development/ocaml-modules/camlzip/default.nix +++ b/pkgs/development/ocaml-modules/camlzip/default.nix @@ -1,8 +1,8 @@ -{stdenv, fetchurl, zlib, ocaml, findlib}: +{lib, stdenv, fetchurl, zlib, ocaml, findlib}: let param = - if stdenv.lib.versionAtLeast ocaml.version "4.02" + if lib.versionAtLeast ocaml.version "4.02" then { version = "1.10"; url = "https://github.com/xavierleroy/camlzip/archive/rel110.tar.gz"; @@ -53,7 +53,7 @@ stdenv.mkDerivation { ln -s $out/lib/ocaml/${ocaml.version}/site-lib/{,caml}zip ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://cristal.inria.fr/~xleroy/software.html#camlzip"; description = "A library for handling ZIP and GZIP files in OCaml"; longDescription = '' diff --git a/pkgs/development/ocaml-modules/camomile/0.8.2.nix b/pkgs/development/ocaml-modules/camomile/0.8.2.nix index 6b18220dc8a9..79c7a46e6e99 100644 --- a/pkgs/development/ocaml-modules/camomile/0.8.2.nix +++ b/pkgs/development/ocaml-modules/camomile/0.8.2.nix @@ -1,6 +1,6 @@ -{stdenv, fetchurl, ocaml, findlib, camlp4}: +{stdenv, lib, fetchurl, ocaml, findlib, camlp4}: -if stdenv.lib.versionAtLeast ocaml.version "4.05" +if lib.versionAtLeast ocaml.version "4.05" then throw "camomile-0.8.2 is not available for OCaml ${ocaml.version}" else @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { meta = { homepage = "http://camomile.sourceforge.net/"; description = "A comprehensive Unicode library for OCaml"; - license = stdenv.lib.licenses.lgpl21; + license = lib.licenses.lgpl21; branch = "0.8.2"; platforms = ocaml.meta.platforms or []; maintainers = [ - stdenv.lib.maintainers.maggesi + lib.maintainers.maggesi ]; }; } diff --git a/pkgs/development/ocaml-modules/camomile/0.8.5.nix b/pkgs/development/ocaml-modules/camomile/0.8.5.nix index b975482ecf3e..67bd8b8c755d 100644 --- a/pkgs/development/ocaml-modules/camomile/0.8.5.nix +++ b/pkgs/development/ocaml-modules/camomile/0.8.5.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, fetchpatch, ocaml, findlib, camlp4}: +{stdenv, lib, fetchurl, fetchpatch, ocaml, findlib, camlp4}: stdenv.mkDerivation { pname = "camomile"; @@ -21,10 +21,10 @@ stdenv.mkDerivation { meta = { homepage = "https://github.com/yoriyuki/Camomile/tree/master/Camomile"; description = "A comprehensive Unicode library for OCaml"; - license = stdenv.lib.licenses.lgpl21; + license = lib.licenses.lgpl21; platforms = ocaml.meta.platforms or []; maintainers = [ - stdenv.lib.maintainers.maggesi + lib.maintainers.maggesi ]; }; } diff --git a/pkgs/development/ocaml-modules/camomile/default.nix b/pkgs/development/ocaml-modules/camomile/default.nix index ff0cb4aa3fe0..2b246d0f3eaf 100644 --- a/pkgs/development/ocaml-modules/camomile/default.nix +++ b/pkgs/development/ocaml-modules/camomile/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildDunePackage, cppo }: +{ lib, fetchFromGitHub, buildDunePackage, cppo }: buildDunePackage rec { pname = "camomile"; @@ -17,8 +17,8 @@ buildDunePackage rec { meta = { inherit (src.meta) homepage; - maintainers = [ stdenv.lib.maintainers.vbgl ]; - license = stdenv.lib.licenses.lgpl21; + maintainers = [ lib.maintainers.vbgl ]; + license = lib.licenses.lgpl21; description = "A Unicode library for OCaml"; }; } diff --git a/pkgs/development/ocaml-modules/cfstream/default.nix b/pkgs/development/ocaml-modules/cfstream/default.nix index d0fcf5be83cc..303fdc01011d 100644 --- a/pkgs/development/ocaml-modules/cfstream/default.nix +++ b/pkgs/development/ocaml-modules/cfstream/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildDunePackage, fetchFromGitHub, m4, core_kernel, ounit }: +{ lib, buildDunePackage, fetchFromGitHub, m4, core_kernel, ounit }: buildDunePackage rec { pname = "cfstream"; @@ -23,7 +23,7 @@ buildDunePackage rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { inherit (src.meta) homepage; description = "Simple Core-inspired wrapper for standard library Stream module"; maintainers = [ maintainers.bcdarwin ]; diff --git a/pkgs/development/ocaml-modules/charInfo_width/default.nix b/pkgs/development/ocaml-modules/charInfo_width/default.nix index 7a78573412fe..5b9814cea69a 100644 --- a/pkgs/development/ocaml-modules/charInfo_width/default.nix +++ b/pkgs/development/ocaml-modules/charInfo_width/default.nix @@ -3,6 +3,7 @@ buildDunePackage rec { pname = "charInfo_width"; version = "1.1.0"; + useDune2 = true; src = fetchzip { url = "https://bitbucket.org/zandoye/charinfo_width/get/${version}.tar.bz2"; sha256 = "19mnq9a1yr16srqs8n6hddahr4f9d2gbpmld62pvlw1ps7nfrp9w"; diff --git a/pkgs/development/ocaml-modules/cil/default.nix b/pkgs/development/ocaml-modules/cil/default.nix index 9903c237e632..3aefe2eb874c 100644 --- a/pkgs/development/ocaml-modules/cil/default.nix +++ b/pkgs/development/ocaml-modules/cil/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, perl, ocaml, findlib, ocamlbuild }: +{ lib, stdenv, fetchurl, perl, ocaml, findlib, ocamlbuild }: -if stdenv.lib.versionAtLeast ocaml.version "4.06" +if lib.versionAtLeast ocaml.version "4.06" then throw "cil is not available for OCaml ${ocaml.version}" else @@ -21,7 +21,7 @@ stdenv.mkDerivation { ''; prefixKey = "-prefix="; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://kerneis.github.io/cil/"; description = "A front-end for the C programming language that facilitates program analysis and transformation"; license = licenses.bsd3; diff --git a/pkgs/development/ocaml-modules/cmdliner/default.nix b/pkgs/development/ocaml-modules/cmdliner/default.nix index 7c94dcf54356..7e49679406ab 100644 --- a/pkgs/development/ocaml-modules/cmdliner/default.nix +++ b/pkgs/development/ocaml-modules/cmdliner/default.nix @@ -1,13 +1,13 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, result }: +{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, result }: let pname = "cmdliner"; in -assert stdenv.lib.versionAtLeast ocaml.version "4.01.0"; +assert lib.versionAtLeast ocaml.version "4.01.0"; let param = - if stdenv.lib.versionAtLeast ocaml.version "4.03" then { + if lib.versionAtLeast ocaml.version "4.03" then { version = "1.0.4"; sha256 = "1h04q0zkasd0mw64ggh4y58lgzkhg6yhzy60lab8k8zq9ba96ajw"; } else { @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { inherit (topkg) buildPhase installPhase; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://erratique.ch/software/cmdliner"; description = "An OCaml module for the declarative definition of command line interfaces"; license = licenses.bsd3; diff --git a/pkgs/development/ocaml-modules/cohttp/async.nix b/pkgs/development/ocaml-modules/cohttp/async.nix index 246397b60810..974c3aa2f9c3 100644 --- a/pkgs/development/ocaml-modules/cohttp/async.nix +++ b/pkgs/development/ocaml-modules/cohttp/async.nix @@ -1,9 +1,9 @@ -{ stdenv, buildDunePackage, async, cohttp, conduit-async, uri, ppx_sexp_conv +{ lib, buildDunePackage, async, cohttp, conduit-async, uri, ppx_sexp_conv , logs, magic-mime }: -if !stdenv.lib.versionAtLeast cohttp.version "0.99" then +if !lib.versionAtLeast cohttp.version "0.99" then cohttp -else if !stdenv.lib.versionAtLeast async.version "0.13" then +else if !lib.versionAtLeast async.version "0.13" then throw "cohttp-async needs async-0.13 (hence OCaml >= 4.08)" else diff --git a/pkgs/development/ocaml-modules/cohttp/lwt-unix.nix b/pkgs/development/ocaml-modules/cohttp/lwt-unix.nix index 3a99ed9536f0..455a76ce94dd 100644 --- a/pkgs/development/ocaml-modules/cohttp/lwt-unix.nix +++ b/pkgs/development/ocaml-modules/cohttp/lwt-unix.nix @@ -1,9 +1,9 @@ -{ stdenv, buildDunePackage, cohttp-lwt +{ lib, buildDunePackage, cohttp-lwt , conduit-lwt-unix, ppx_sexp_conv , cmdliner, fmt, magic-mime }: -if !stdenv.lib.versionAtLeast cohttp-lwt.version "0.99" +if !lib.versionAtLeast cohttp-lwt.version "0.99" then cohttp-lwt else diff --git a/pkgs/development/ocaml-modules/cohttp/lwt.nix b/pkgs/development/ocaml-modules/cohttp/lwt.nix index 8357d748ce8f..04f81e8e8df4 100644 --- a/pkgs/development/ocaml-modules/cohttp/lwt.nix +++ b/pkgs/development/ocaml-modules/cohttp/lwt.nix @@ -1,8 +1,8 @@ -{ stdenv, buildDunePackage, cohttp, ocaml_lwt, uri, ppx_sexp_conv, logs }: +{ lib, buildDunePackage, cohttp, ocaml_lwt, uri, ppx_sexp_conv, logs }: -if !stdenv.lib.versionAtLeast cohttp.version "0.99" +if !lib.versionAtLeast cohttp.version "0.99" then cohttp -else if !stdenv.lib.versionAtLeast ppx_sexp_conv.version "0.13" +else if !lib.versionAtLeast ppx_sexp_conv.version "0.13" then throw "cohttp-lwt is not available for ppx_sexp_conv version ${ppx_sexp_conv.version}" else diff --git a/pkgs/development/ocaml-modules/comparelib/default.nix b/pkgs/development/ocaml-modules/comparelib/default.nix index 55787e123923..addba7a4b349 100644 --- a/pkgs/development/ocaml-modules/comparelib/default.nix +++ b/pkgs/development/ocaml-modules/comparelib/default.nix @@ -1,4 +1,4 @@ -{stdenv, buildOcaml, fetchurl, type_conv}: +{lib, buildOcaml, fetchurl, type_conv}: buildOcaml rec { name = "comparelib"; @@ -13,7 +13,7 @@ buildOcaml rec { propagatedBuildInputs = [ type_conv ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/janestreet/comparelib"; description = "Syntax extension for deriving \"compare\" functions automatically"; license = licenses.asl20; diff --git a/pkgs/development/ocaml-modules/conduit/async.nix b/pkgs/development/ocaml-modules/conduit/async.nix index f16819ed8aef..e289b5d711d5 100644 --- a/pkgs/development/ocaml-modules/conduit/async.nix +++ b/pkgs/development/ocaml-modules/conduit/async.nix @@ -1,6 +1,6 @@ -{ stdenv, buildDunePackage, async, async_ssl, ppx_sexp_conv, conduit }: +{ lib, buildDunePackage, async, async_ssl, ppx_sexp_conv, conduit }: -if !stdenv.lib.versionAtLeast conduit.version "1.0" +if !lib.versionAtLeast conduit.version "1.0" then conduit else diff --git a/pkgs/development/ocaml-modules/conduit/default.nix b/pkgs/development/ocaml-modules/conduit/default.nix index b800d6b7ba4a..8c9b757f87c3 100644 --- a/pkgs/development/ocaml-modules/conduit/default.nix +++ b/pkgs/development/ocaml-modules/conduit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, buildDunePackage +{ lib, fetchurl, buildDunePackage , ppx_sexp_conv, sexplib, astring, uri, logs , ipaddr, ipaddr-sexp }: @@ -20,8 +20,8 @@ buildDunePackage rec { meta = { description = "A network connection establishment library"; - license = stdenv.lib.licenses.isc; - maintainers = with stdenv.lib.maintainers; [ alexfmpe vbgl ]; + license = lib.licenses.isc; + maintainers = with lib.maintainers; [ alexfmpe vbgl ]; homepage = "https://github.com/mirage/ocaml-conduit"; }; } diff --git a/pkgs/development/ocaml-modules/conduit/lwt-unix.nix b/pkgs/development/ocaml-modules/conduit/lwt-unix.nix index b3c7e7fa86f9..9f871a8ea9cd 100644 --- a/pkgs/development/ocaml-modules/conduit/lwt-unix.nix +++ b/pkgs/development/ocaml-modules/conduit/lwt-unix.nix @@ -1,4 +1,4 @@ -{ stdenv, buildDunePackage +{ buildDunePackage , conduit-lwt, ppx_sexp_conv, ocaml_lwt, uri, ipaddr, ipaddr-sexp , lwt_ssl, tls }: diff --git a/pkgs/development/ocaml-modules/conduit/lwt.nix b/pkgs/development/ocaml-modules/conduit/lwt.nix index 6514586f9d93..512aa60bb66d 100644 --- a/pkgs/development/ocaml-modules/conduit/lwt.nix +++ b/pkgs/development/ocaml-modules/conduit/lwt.nix @@ -1,4 +1,4 @@ -{ stdenv, buildDunePackage, ppx_sexp_conv, conduit, ocaml_lwt, sexplib }: +{ buildDunePackage, ppx_sexp_conv, conduit, ocaml_lwt, sexplib }: buildDunePackage { pname = "conduit-lwt"; diff --git a/pkgs/development/ocaml-modules/config-file/default.nix b/pkgs/development/ocaml-modules/config-file/default.nix index 724c5b1e2d6a..29c7cd61c3f5 100644 --- a/pkgs/development/ocaml-modules/config-file/default.nix +++ b/pkgs/development/ocaml-modules/config-file/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, camlp4 }: +{ stdenv, lib, fetchurl, ocaml, findlib, camlp4 }: stdenv.mkDerivation { name = "ocaml-config-file-1.2"; @@ -16,7 +16,7 @@ stdenv.mkDerivation { homepage = "http://config-file.forge.ocamlcore.org/"; platforms = ocaml.meta.platforms or []; description = "An OCaml library used to manage the configuration file(s) of an application"; - license = stdenv.lib.licenses.lgpl2Plus; - maintainers = with stdenv.lib.maintainers; [ vbgl ]; + license = lib.licenses.lgpl2Plus; + maintainers = with lib.maintainers; [ vbgl ]; }; } diff --git a/pkgs/development/ocaml-modules/cpdf/default.nix b/pkgs/development/ocaml-modules/cpdf/default.nix index e40f6531e1fd..cc2aad52d3d6 100644 --- a/pkgs/development/ocaml-modules/cpdf/default.nix +++ b/pkgs/development/ocaml-modules/cpdf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib, camlpdf, ncurses }: +{ lib, stdenv, fetchFromGitHub, ocaml, findlib, camlpdf, ncurses }: let version = "2.3.1"; in @@ -29,7 +29,7 @@ stdenv.mkDerivation { cp cpdfmanual.pdf $out/share/doc/cpdf/ ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.coherentpdf.com/"; platforms = ocaml.meta.platforms or []; description = "PDF Command Line Tools"; diff --git a/pkgs/development/ocaml-modules/cpu/default.nix b/pkgs/development/ocaml-modules/cpu/default.nix index 716e40e16e9f..083f00d5d5f1 100644 --- a/pkgs/development/ocaml-modules/cpu/default.nix +++ b/pkgs/development/ocaml-modules/cpu/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildDunePackage, fetchFromGitHub, autoconf }: +{ lib, stdenv, buildDunePackage, fetchFromGitHub, autoconf }: buildDunePackage rec { pname = "cpu"; @@ -18,9 +18,9 @@ buildDunePackage rec { buildInputs = [ autoconf ]; - hardeningDisable = stdenv.lib.optional stdenv.isDarwin "strictoverflow"; + hardeningDisable = lib.optional stdenv.isDarwin "strictoverflow"; - meta = with stdenv.lib; { + meta = with lib; { inherit (src.meta) homepage; description = "Core pinning library"; maintainers = [ maintainers.bcdarwin ]; diff --git a/pkgs/development/ocaml-modules/crowbar/default.nix b/pkgs/development/ocaml-modules/crowbar/default.nix index 0189026e346b..d05d15286bf7 100644 --- a/pkgs/development/ocaml-modules/crowbar/default.nix +++ b/pkgs/development/ocaml-modules/crowbar/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildDunePackage, fetchFromGitHub, ocplib-endian, cmdliner, afl-persistent +{ lib, stdenv, buildDunePackage, fetchFromGitHub, ocplib-endian, cmdliner, afl-persistent , calendar, fpath, pprint, uutf, uunf, uucp }: buildDunePackage rec { @@ -22,7 +22,7 @@ buildDunePackage rec { # uunf is broken on aarch64 doCheck = !stdenv.isAarch64; - meta = with stdenv.lib; { + meta = with lib; { description = "Property fuzzing for OCaml"; homepage = "https://github.com/stedolan/crowbar"; license = licenses.mit; diff --git a/pkgs/development/ocaml-modules/cryptgps/default.nix b/pkgs/development/ocaml-modules/cryptgps/default.nix index 2d9ac2a7b193..6011c6953baa 100644 --- a/pkgs/development/ocaml-modules/cryptgps/default.nix +++ b/pkgs/development/ocaml-modules/cryptgps/default.nix @@ -1,6 +1,6 @@ -{stdenv, fetchurl, ocaml, findlib}: +{stdenv, lib, fetchurl, ocaml, findlib}: -if stdenv.lib.versionAtLeast ocaml.version "4.06" +if lib.versionAtLeast ocaml.version "4.06" then throw "cryptgps is not available for OCaml ${ocaml.version}" else @@ -28,10 +28,10 @@ stdenv.mkDerivation { i.e. this is not a binding to some C library, but the implementation itself. ''; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; platforms = ocaml.meta.platforms or []; maintainers = [ - stdenv.lib.maintainers.maggesi + lib.maintainers.maggesi ]; }; } diff --git a/pkgs/development/ocaml-modules/csexp/default.nix b/pkgs/development/ocaml-modules/csexp/default.nix index 0ca094382228..26c064d6ff51 100644 --- a/pkgs/development/ocaml-modules/csexp/default.nix +++ b/pkgs/development/ocaml-modules/csexp/default.nix @@ -4,6 +4,8 @@ buildDunePackage rec { pname = "csexp"; version = "1.3.2"; + useDune2 = true; + minimumOCamlVersion = "4.02.3"; src = fetchurl { diff --git a/pkgs/development/ocaml-modules/cstruct/1.9.0.nix b/pkgs/development/ocaml-modules/cstruct/1.9.0.nix index 1cea58abee20..750a153c1c48 100644 --- a/pkgs/development/ocaml-modules/cstruct/1.9.0.nix +++ b/pkgs/development/ocaml-modules/cstruct/1.9.0.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchFromGitHub, ocaml, ocamlbuild, ocplib-endian, sexplib, findlib, ppx_tools +{ lib, stdenv, fetchFromGitHub, ocaml, ocamlbuild, ocplib-endian, sexplib, findlib, ppx_tools , async ? null, lwt ? null }: -assert stdenv.lib.versionAtLeast ocaml.version "4.01"; +assert lib.versionAtLeast ocaml.version "4.01"; let version = "1.9.0"; in @@ -26,10 +26,10 @@ stdenv.mkDerivation { createFindlibDestdir = true; dontStrip = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/mirage/ocaml-cstruct"; description = "Map OCaml arrays onto C-like structs"; - license = stdenv.lib.licenses.isc; + license = lib.licenses.isc; maintainers = [ maintainers.vbgl maintainers.ericbmerritt ]; platforms = ocaml.meta.platforms or []; }; diff --git a/pkgs/development/ocaml-modules/csv/1.5.nix b/pkgs/development/ocaml-modules/csv/1.5.nix index 9b6152692631..6fdf20308611 100644 --- a/pkgs/development/ocaml-modules/csv/1.5.nix +++ b/pkgs/development/ocaml-modules/csv/1.5.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, ocaml, findlib, ocamlbuild }: +{ lib, stdenv, fetchzip, ocaml, findlib, ocamlbuild }: stdenv.mkDerivation { @@ -22,7 +22,7 @@ stdenv.mkDerivation { installPhase = "ocaml setup.ml -install"; - meta = with stdenv.lib; { + meta = with lib; { description = "A pure OCaml library to read and write CSV files"; homepage = "https://github.com/Chris00/ocaml-csv"; license = licenses.lgpl21; diff --git a/pkgs/development/ocaml-modules/csv/default.nix b/pkgs/development/ocaml-modules/csv/default.nix index 2d017b9a916b..8cf2918989e0 100644 --- a/pkgs/development/ocaml-modules/csv/default.nix +++ b/pkgs/development/ocaml-modules/csv/default.nix @@ -1,9 +1,11 @@ -{ stdenv, fetchurl, buildDunePackage }: +{ lib, fetchurl, buildDunePackage }: buildDunePackage rec { pname = "csv"; version = "2.4"; + useDune2 = true; + src = fetchurl { url = "https://github.com/Chris00/ocaml-${pname}/releases/download/${version}/csv-${version}.tbz"; sha256 = "13m9n8mdss6jfbiw7d5bybxn4n85vmg4zw7dc968qrgjfy0w9zhk"; @@ -11,8 +13,8 @@ buildDunePackage rec { meta = { description = "A pure OCaml library to read and write CSV files"; - license = stdenv.lib.licenses.lgpl21; - maintainers = [ stdenv.lib.maintainers.vbgl ]; + license = lib.licenses.lgpl21; + maintainers = [ lib.maintainers.vbgl ]; homepage = "https://github.com/Chris00/ocaml-csv"; }; } diff --git a/pkgs/development/ocaml-modules/csv/lwt.nix b/pkgs/development/ocaml-modules/csv/lwt.nix index 2fa9296d7e44..b0f771209aa6 100644 --- a/pkgs/development/ocaml-modules/csv/lwt.nix +++ b/pkgs/development/ocaml-modules/csv/lwt.nix @@ -6,7 +6,7 @@ else buildDunePackage { pname = "csv-lwt"; - inherit (csv) src version meta; + inherit (csv) src version useDune2 meta; propagatedBuildInputs = [ csv ocaml_lwt ]; diff --git a/pkgs/development/ocaml-modules/ctypes/default.nix b/pkgs/development/ocaml-modules/ctypes/default.nix index 8a16dcec343b..92a4ff9535c9 100644 --- a/pkgs/development/ocaml-modules/ctypes/default.nix +++ b/pkgs/development/ocaml-modules/ctypes/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchzip, ocaml, findlib, libffi, pkgconfig, ncurses, integers }: +{ lib, stdenv, fetchzip, ocaml, findlib, libffi, pkgconfig, ncurses, integers }: -if !stdenv.lib.versionAtLeast ocaml.version "4.02" +if !lib.versionAtLeast ocaml.version "4.02" then throw "ctypes is not available for OCaml ${ocaml.version}" else @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { make install XEN=false ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/ocamllabs/ocaml-ctypes"; description = "Library for binding to C libraries using pure OCaml"; license = licenses.mit; diff --git a/pkgs/development/ocaml-modules/curly/default.nix b/pkgs/development/ocaml-modules/curly/default.nix index 236b9c19c928..491b2844ef1d 100644 --- a/pkgs/development/ocaml-modules/curly/default.nix +++ b/pkgs/development/ocaml-modules/curly/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildDunePackage, fetchurl, ocaml +{ stdenv, lib, buildDunePackage, fetchurl, ocaml , result, alcotest, cohttp-lwt-unix, odoc, curl }: buildDunePackage rec { @@ -17,7 +17,7 @@ buildDunePackage rec { propagatedBuildInputs = [ result ]; checkInputs = [ alcotest cohttp-lwt-unix ]; # test dependencies are only available for >= 4.08 - doCheck = stdenv.lib.versionAtLeast ocaml.version "4.08" + doCheck = lib.versionAtLeast ocaml.version "4.08" # Some test fails in macOS sandbox # > Fatal error: exception Unix.Unix_error(Unix.EPERM, "bind", "") && !stdenv.isDarwin; diff --git a/pkgs/development/ocaml-modules/curses/default.nix b/pkgs/development/ocaml-modules/curses/default.nix index 2c989caa3e8d..f1211ad9cdc6 100644 --- a/pkgs/development/ocaml-modules/curses/default.nix +++ b/pkgs/development/ocaml-modules/curses/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, ncurses }: +{ lib, stdenv, fetchurl, ocaml, findlib, ncurses }: stdenv.mkDerivation rec { pname = "ocaml-curses"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { buildPhase = "make all opt"; - meta = with stdenv.lib; { + meta = with lib; { description = "OCaml Bindings to curses/ncurses"; homepage = "https://opam.ocaml.org/packages/curses/curses.1.0.4/"; license = licenses.gpl2; diff --git a/pkgs/development/ocaml-modules/dns/default.nix b/pkgs/development/ocaml-modules/dns/default.nix index 21d9d02da4b8..4f0b95da6cb3 100644 --- a/pkgs/development/ocaml-modules/dns/default.nix +++ b/pkgs/development/ocaml-modules/dns/default.nix @@ -4,14 +4,14 @@ buildDunePackage rec { pname = "dns"; - version = "4.6.2"; + version = "4.6.3"; useDune2 = true; minimumOCamlVersion = "4.07"; src = fetchurl { url = "https://github.com/mirage/ocaml-dns/releases/download/v${version}/dns-v${version}.tbz"; - sha256 = "0prypr5c589vay4alri78g0sarh06z35did26wn3s3di17d5761q"; + sha256 = "0g7xw43jm5hv0w9lsnhhi0w3243mxl615cdsvz29yh39fcqvqsdy"; }; propagatedBuildInputs = [ rresult astring fmt logs ptime domain-name gmap cstruct ipaddr lru duration metrics ]; diff --git a/pkgs/development/ocaml-modules/dolmen/default.nix b/pkgs/development/ocaml-modules/dolmen/default.nix index 824da3030685..d4a47abcafa4 100644 --- a/pkgs/development/ocaml-modules/dolmen/default.nix +++ b/pkgs/development/ocaml-modules/dolmen/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, menhir }: +{ stdenv, lib, fetchFromGitHub, ocaml, findlib, ocamlbuild, menhir }: stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-dolmen-${version}"; @@ -19,8 +19,8 @@ stdenv.mkDerivation rec { meta = { description = "An OCaml library providing clean and flexible parsers for input languages"; - license = stdenv.lib.licenses.bsd2; - maintainers = [ stdenv.lib.maintainers.vbgl ]; + license = lib.licenses.bsd2; + maintainers = [ lib.maintainers.vbgl ]; inherit (src.meta) homepage; inherit (ocaml.meta) platforms; }; diff --git a/pkgs/development/ocaml-modules/dolog/default.nix b/pkgs/development/ocaml-modules/dolog/default.nix index f9eef4774f5f..690823c5358a 100644 --- a/pkgs/development/ocaml-modules/dolog/default.nix +++ b/pkgs/development/ocaml-modules/dolog/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, ocaml, findlib, ocamlbuild }: +{ stdenv, lib, fetchzip, ocaml, findlib, ocamlbuild }: let version = "3.0"; in @@ -21,7 +21,7 @@ stdenv.mkDerivation { homepage = "https://github.com/UnixJunkie/dolog"; description = "Minimalistic lazy logger in OCaml"; platforms = ocaml.meta.platforms or []; - license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ vbgl ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ vbgl ]; }; } diff --git a/pkgs/development/ocaml-modules/dtoa/default.nix b/pkgs/development/ocaml-modules/dtoa/default.nix index b26cbec25edb..62fa7cd08c8b 100644 --- a/pkgs/development/ocaml-modules/dtoa/default.nix +++ b/pkgs/development/ocaml-modules/dtoa/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, buildDunePackage }: +{ stdenv, lib, fetchurl, buildDunePackage }: buildDunePackage rec { pname = "dtoa"; @@ -11,9 +11,9 @@ buildDunePackage rec { sha256 = "0zkhn0rdq82g6gamsv6nkx6i44s8104nh6jg5xydazl9jl1704xn"; }; - hardeningDisable = stdenv.lib.optional stdenv.isDarwin "strictoverflow"; + hardeningDisable = lib.optional stdenv.isDarwin "strictoverflow"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/flowtype/ocaml-dtoa"; description = "Converts OCaml floats into strings (doubles to ascii, \"d to a\"), using the efficient Grisu3 algorithm."; license = licenses.mit; diff --git a/pkgs/development/ocaml-modules/dum/default.nix b/pkgs/development/ocaml-modules/dum/default.nix index 844d06e30389..d8aa1f371f3b 100644 --- a/pkgs/development/ocaml-modules/dum/default.nix +++ b/pkgs/development/ocaml-modules/dum/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib +{ lib, stdenv, fetchFromGitHub, ocaml, findlib , easy-format }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { createFindlibDestdir = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/mjambon/dum"; description = "Inspect the runtime representation of arbitrary OCaml values"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/ocaml-modules/dypgen/default.nix b/pkgs/development/ocaml-modules/dypgen/default.nix index ead672fa15ca..5b5b107b694b 100644 --- a/pkgs/development/ocaml-modules/dypgen/default.nix +++ b/pkgs/development/ocaml-modules/dypgen/default.nix @@ -1,10 +1,10 @@ -{stdenv, fetchurl, ocaml, findlib}: +{stdenv, lib, fetchurl, ocaml, findlib}: let pname = "dypgen"; in -if stdenv.lib.versionAtLeast ocaml.version "4.06" +if lib.versionAtLeast ocaml.version "4.06" then throw "${pname} is not available for OCaml ${ocaml.version}" else @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://dypgen.free.fr"; description = "Dypgen GLR self extensible parser generator"; - license = stdenv.lib.licenses.cecill-b; + license = lib.licenses.cecill-b; platforms = ocaml.meta.platforms or []; }; } diff --git a/pkgs/development/ocaml-modules/easy-format/default.nix b/pkgs/development/ocaml-modules/easy-format/default.nix index 5c1155a723bd..6a3566fda2b6 100644 --- a/pkgs/development/ocaml-modules/easy-format/default.nix +++ b/pkgs/development/ocaml-modules/easy-format/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, ocaml, findlib }: +{ lib, stdenv, fetchzip, ocaml, findlib }: let pname = "easy-format"; version = "1.2.0"; @@ -19,7 +19,7 @@ stdenv.mkDerivation { doCheck = true; checkTarget = "test"; - meta = with stdenv.lib; { + meta = with lib; { description = "A high-level and functional interface to the Format module of the OCaml standard library"; homepage = "https://github.com/ocaml-community/${pname}"; license = licenses.bsd3; diff --git a/pkgs/development/ocaml-modules/eigen/default.nix b/pkgs/development/ocaml-modules/eigen/default.nix index dacd3a758623..c86b7cba0103 100644 --- a/pkgs/development/ocaml-modules/eigen/default.nix +++ b/pkgs/development/ocaml-modules/eigen/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildDunePackage, fetchFromGitHub, ctypes, libcxx }: +{ lib, stdenv, buildDunePackage, fetchFromGitHub, ctypes, libcxx }: buildDunePackage rec { pname = "eigen"; @@ -15,11 +15,11 @@ buildDunePackage rec { minimumOCamlVersion = "4.02"; - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; propagatedBuildInputs = [ ctypes ]; - meta = with stdenv.lib; { + meta = with lib; { inherit (src.meta) homepage; description = "Minimal/incomplete Ocaml interface to Eigen3, mostly for Owl"; platforms = platforms.x86_64; diff --git a/pkgs/development/ocaml-modules/elina/default.nix b/pkgs/development/ocaml-modules/elina/default.nix index b41743f542d8..4eff6c2957de 100644 --- a/pkgs/development/ocaml-modules/elina/default.nix +++ b/pkgs/development/ocaml-modules/elina/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, gmp, mpfr, ocaml, findlib, camlidl, apron }: +{ stdenv, lib, fetchurl, perl, gmp, mpfr, ocaml, findlib, camlidl, apron }: stdenv.mkDerivation rec { version = "1.1"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { "--use-opam" "--apron-prefix" apron ] - ++ stdenv.lib.optional stdenv.isDarwin "--absolute-dylibs" + ++ lib.optional stdenv.isDarwin "--absolute-dylibs" ; createFindlibDestdir = true; @@ -26,8 +26,8 @@ stdenv.mkDerivation rec { meta = { description = "ETH LIbrary for Numerical Analysis"; homepage = "http://elina.ethz.ch/"; - license = stdenv.lib.licenses.lgpl3; - maintainers = [ stdenv.lib.maintainers.vbgl ]; + license = lib.licenses.lgpl3; + maintainers = [ lib.maintainers.vbgl ]; inherit (ocaml.meta) platforms; }; } diff --git a/pkgs/development/ocaml-modules/eliom/default.nix b/pkgs/development/ocaml-modules/eliom/default.nix index de2955e57c92..4c845273d714 100644 --- a/pkgs/development/ocaml-modules/eliom/default.nix +++ b/pkgs/development/ocaml-modules/eliom/default.nix @@ -1,13 +1,14 @@ -{ stdenv, fetchzip, which, ocsigen_server, ocaml, +{ stdenv, lib, fetchzip, which, ocsigen_server, ocaml, lwt_react, opaline, ppx_deriving, findlib +, ppx_tools_versioned , js_of_ocaml-ocamlbuild, js_of_ocaml-ppx, js_of_ocaml-ppx_deriving_json , js_of_ocaml-lwt , js_of_ocaml-tyxml , lwt_ppx }: -if !stdenv.lib.versionAtLeast ocaml.version "4.07" +if !lib.versionAtLeast ocaml.version "4.07" then throw "eliom is not available for OCaml ${ocaml.version}" else @@ -22,6 +23,7 @@ stdenv.mkDerivation rec }; buildInputs = [ ocaml which findlib js_of_ocaml-ocamlbuild js_of_ocaml-ppx_deriving_json opaline + ppx_tools_versioned ]; propagatedBuildInputs = [ @@ -52,8 +54,8 @@ stdenv.mkDerivation rec distinguish both parts and the client side is compiled to JS using Ocsigen Js_of_ocaml.''; - license = stdenv.lib.licenses.lgpl21; + license = lib.licenses.lgpl21; - maintainers = [ stdenv.lib.maintainers.gal_bolle ]; + maintainers = [ lib.maintainers.gal_bolle ]; }; } diff --git a/pkgs/development/ocaml-modules/elpi/default.nix b/pkgs/development/ocaml-modules/elpi/default.nix index 865c5448c5bd..6f0d355fed5b 100644 --- a/pkgs/development/ocaml-modules/elpi/default.nix +++ b/pkgs/development/ocaml-modules/elpi/default.nix @@ -1,15 +1,19 @@ -{ lib, fetchzip, buildDunePackage, camlp5 +{ stdenv, lib, fetchzip, buildDunePackage, camlp5 , ppxlib, ppx_deriving, re, perl, ncurses +, version ? "1.12.0" }: - +with lib; +let fetched = import ../../../build-support/coq/meta-fetch/default.nix + {inherit stdenv fetchzip; } ({ + release."1.12.0".sha256 = "1agisdnaq9wrw3r73xz14yrq3wx742i6j8i5icjagqk0ypmly2is"; + release."1.11.4".sha256 = "1m0jk9swcs3jcrw5yyw5343v8mgax238cjb03s8gc4wipw1fn9f5"; + releaseRev = v: "v${v}"; + location = { domain = "github.com"; owner = "LPCIC"; repo = "elpi"; }; + }) version; +in buildDunePackage rec { pname = "elpi"; - version = "1.11.4"; - - src = fetchzip { - url = "https://github.com/LPCIC/elpi/releases/download/v${version}/elpi-v${version}.tbz"; - sha256 = "1hmjp2z52j17vwhhdkj45n9jx11jxkdg2dwa0n04yyw0qqy4m7c1"; - }; + inherit (fetched) version src; minimumOCamlVersion = "4.04"; @@ -19,8 +23,8 @@ buildDunePackage rec { meta = { description = "Embeddable λProlog Interpreter"; - license = lib.licenses.lgpl21Plus; - maintainers = [ lib.maintainers.vbgl ]; + license = licenses.lgpl21Plus; + maintainers = [ maintainers.vbgl ]; homepage = "https://github.com/LPCIC/elpi"; }; diff --git a/pkgs/development/ocaml-modules/enumerate/default.nix b/pkgs/development/ocaml-modules/enumerate/default.nix index 22a6d12792c7..eb0495be797f 100644 --- a/pkgs/development/ocaml-modules/enumerate/default.nix +++ b/pkgs/development/ocaml-modules/enumerate/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, type_conv, camlp4 }: +{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, type_conv, camlp4 }: -assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.00"; +assert lib.versionAtLeast (lib.getVersion ocaml) "4.00"; -if stdenv.lib.versionAtLeast ocaml.version "4.06" +if lib.versionAtLeast ocaml.version "4.06" then throw "enumerate-111.08.00 is not available for OCaml ${ocaml.version}" else @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = { homepage = "https://ocaml.janestreet.com/"; description = "Quotation expanders for enumerating finite types"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; platforms = ocaml.meta.platforms or []; }; } diff --git a/pkgs/development/ocaml-modules/erm_xml/default.nix b/pkgs/development/ocaml-modules/erm_xml/default.nix index ebfcbc90a504..56b5c9295708 100644 --- a/pkgs/development/ocaml-modules/erm_xml/default.nix +++ b/pkgs/development/ocaml-modules/erm_xml/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchzip, ocaml, findlib, ocamlbuild }: +{ stdenv, lib, fetchzip, ocaml, findlib, ocamlbuild }: -if !stdenv.lib.versionAtLeast ocaml.version "4.02" +if !lib.versionAtLeast ocaml.version "4.02" then throw "erm_xml is not available for OCaml ${ocaml.version}" else @@ -22,7 +22,7 @@ stdenv.mkDerivation { homepage = "https://github.com/hannesm/xml"; description = "XML Parser for discrete data"; platforms = ocaml.meta.platforms or []; - license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ vbgl ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ vbgl ]; }; } diff --git a/pkgs/development/ocaml-modules/erm_xmpp/default.nix b/pkgs/development/ocaml-modules/erm_xmpp/default.nix index c3534d146f8a..cff155f47098 100644 --- a/pkgs/development/ocaml-modules/erm_xmpp/default.nix +++ b/pkgs/development/ocaml-modules/erm_xmpp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib, camlp4, ocamlbuild +{ stdenv, lib, fetchFromGitHub, ocaml, findlib, camlp4, ocamlbuild , erm_xml, mirage-crypto, mirage-crypto-rng, base64 }: @@ -25,8 +25,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/hannesm/xmpp"; description = "OCaml based XMPP implementation (fork)"; - license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ sternenseemann ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ sternenseemann ]; inherit (ocaml.meta) platforms; }; } diff --git a/pkgs/development/ocaml-modules/estring/default.nix b/pkgs/development/ocaml-modules/estring/default.nix index 4cd27f272b3c..7424d14220dc 100644 --- a/pkgs/development/ocaml-modules/estring/default.nix +++ b/pkgs/development/ocaml-modules/estring/default.nix @@ -1,6 +1,6 @@ -{ stdenv, buildOcaml, ocaml, fetchurl }: +{ lib, buildOcaml, ocaml, fetchurl }: -if stdenv.lib.versionAtLeast ocaml.version "4.06" +if lib.versionAtLeast ocaml.version "4.06" then throw "estring is not available for OCaml ${ocaml.version}" else @@ -13,7 +13,7 @@ buildOcaml rec { sha256 = "0b6znz5igm8pp28w4b7sgy82rpd9m5aw6ss933rfbw1mrh05gvcg"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://estring.forge.ocamlcore.org/"; description = "Extension for string literals"; license = licenses.bsd3; diff --git a/pkgs/development/ocaml-modules/expat/0.9.nix b/pkgs/development/ocaml-modules/expat/0.9.nix index 886f346012c1..219b8164e7c9 100644 --- a/pkgs/development/ocaml-modules/expat/0.9.nix +++ b/pkgs/development/ocaml-modules/expat/0.9.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ocaml, findlib, ounit, expat}: +{stdenv, lib, fetchurl, ocaml, findlib, ounit, expat}: let pname = "ocaml-expat"; @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.xs4all.nl/~mmzeeman/ocaml/"; description = "An ocaml wrapper for the Expat XML parsing library"; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.roconnor ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.roconnor ]; }; } diff --git a/pkgs/development/ocaml-modules/expat/default.nix b/pkgs/development/ocaml-modules/expat/default.nix index 6058c87e7bd5..9675fa881510 100644 --- a/pkgs/development/ocaml-modules/expat/default.nix +++ b/pkgs/development/ocaml-modules/expat/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, expat, ocaml, findlib, ounit }: +{ stdenv, lib, fetchFromGitHub, expat, ocaml, findlib, ounit }: stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-expat-${version}"; @@ -17,15 +17,15 @@ stdenv.mkDerivation rec { buildInputs = [ ocaml findlib expat ounit ]; - doCheck = !stdenv.lib.versionAtLeast ocaml.version "4.06"; + doCheck = !lib.versionAtLeast ocaml.version "4.06"; checkTarget = "testall"; createFindlibDestdir = true; meta = { description = "OCaml wrapper for the Expat XML parsing library"; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.vbgl ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.vbgl ]; inherit (src.meta) homepage; inherit (ocaml.meta) platforms; }; diff --git a/pkgs/development/ocaml-modules/extlib/default.nix b/pkgs/development/ocaml-modules/extlib/default.nix index 5e04c73c3025..a8b1810e51f1 100644 --- a/pkgs/development/ocaml-modules/extlib/default.nix +++ b/pkgs/development/ocaml-modules/extlib/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, ocaml, findlib, cppo, minimal ? true }: +{ stdenv, lib, fetchurl, ocaml, findlib, cppo, minimal ? true }: -assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.11"; +assert lib.versionAtLeast (lib.getVersion ocaml) "3.11"; stdenv.mkDerivation { name = "ocaml${ocaml.version}-extlib-1.7.7"; @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = { homepage = "https://github.com/ygrek/ocaml-extlib"; description = "Enhancements to the OCaml Standard Library modules"; - license = stdenv.lib.licenses.lgpl21; + license = lib.licenses.lgpl21; platforms = ocaml.meta.platforms or []; }; } diff --git a/pkgs/development/ocaml-modules/ezjsonm/default.nix b/pkgs/development/ocaml-modules/ezjsonm/default.nix index 269288ef3cd9..fd3187055126 100644 --- a/pkgs/development/ocaml-modules/ezjsonm/default.nix +++ b/pkgs/development/ocaml-modules/ezjsonm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, buildDunePackage, jsonm, hex, sexplib0 }: +{ lib, fetchurl, buildDunePackage, jsonm, hex, sexplib0 }: buildDunePackage rec { pname = "ezjsonm"; @@ -16,7 +16,7 @@ buildDunePackage rec { meta = { description = "An easy interface on top of the Jsonm library"; homepage = "https://github.com/mirage/ezjsonm"; - license = stdenv.lib.licenses.isc; - maintainers = with stdenv.lib.maintainers; [ vbgl ]; + license = lib.licenses.isc; + maintainers = with lib.maintainers; [ vbgl ]; }; } diff --git a/pkgs/development/ocaml-modules/ezxmlm/default.nix b/pkgs/development/ocaml-modules/ezxmlm/default.nix index 1740bd77fdb2..6d5fe28a8c02 100644 --- a/pkgs/development/ocaml-modules/ezxmlm/default.nix +++ b/pkgs/development/ocaml-modules/ezxmlm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildDunePackage, xmlm }: +{ lib, fetchFromGitHub, buildDunePackage, xmlm }: buildDunePackage rec { pname = "ezxmlm"; @@ -13,7 +13,7 @@ buildDunePackage rec { propagatedBuildInputs = [ xmlm ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Combinators to use with xmlm for parsing and selection"; longDescription = '' An "easy" interface on top of the xmlm library. This version provides diff --git a/pkgs/development/ocaml-modules/faillib/default.nix b/pkgs/development/ocaml-modules/faillib/default.nix index 2a4d03e87aea..d045bd5a37af 100644 --- a/pkgs/development/ocaml-modules/faillib/default.nix +++ b/pkgs/development/ocaml-modules/faillib/default.nix @@ -1,6 +1,6 @@ -{ stdenv, buildOcaml, fetchurl, ocaml, herelib, camlp4 }: +{ lib, buildOcaml, fetchurl, ocaml, herelib, camlp4 }: -if stdenv.lib.versionAtLeast ocaml.version "4.06" +if lib.versionAtLeast ocaml.version "4.06" then throw "faillib-111.17.00 is not available for OCaml ${ocaml.version}" else @@ -19,7 +19,7 @@ buildOcaml rec { doCheck = true; checkPhase = "make test"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://ocaml.janestreet.com/"; description = "Library for dealing with failure in OCaml"; license = licenses.asl20; diff --git a/pkgs/development/ocaml-modules/farfadet/default.nix b/pkgs/development/ocaml-modules/farfadet/default.nix index 96423a213a19..77eef7f29a98 100644 --- a/pkgs/development/ocaml-modules/farfadet/default.nix +++ b/pkgs/development/ocaml-modules/farfadet/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg +{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, topkg , faraday }: -if !stdenv.lib.versionAtLeast ocaml.version "4.3" +if !lib.versionAtLeast ocaml.version "4.3" then throw "farfadet is not available for OCaml ${ocaml.version}" else @@ -24,8 +24,8 @@ stdenv.mkDerivation rec { meta = { description = "A printf-like for Faraday library"; homepage = "https://github.com/oklm-wsh/Farfadet"; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.vbgl ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.vbgl ]; inherit (ocaml.meta) platforms; }; } diff --git a/pkgs/development/ocaml-modules/fieldslib/default.nix b/pkgs/development/ocaml-modules/fieldslib/default.nix index 90b75faa54c2..4adddbfe54d2 100644 --- a/pkgs/development/ocaml-modules/fieldslib/default.nix +++ b/pkgs/development/ocaml-modules/fieldslib/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, type_conv, camlp4 }: +{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, type_conv, camlp4 }: -assert stdenv.lib.versionOlder "4.00" (stdenv.lib.getVersion ocaml); +assert lib.versionOlder "4.00" (lib.getVersion ocaml); -if stdenv.lib.versionAtLeast ocaml.version "4.06" +if lib.versionAtLeast ocaml.version "4.06" then throw "fieldslib-109.20.03 is not available for OCaml ${ocaml.version}" else @@ -19,7 +19,7 @@ stdenv.mkDerivation { createFindlibDestdir = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://ocaml.janestreet.com/"; description = "OCaml syntax extension to define first class values representing record fields, to get and set record fields, iterate and fold over all fields of a record and create new record values"; license = licenses.asl20; diff --git a/pkgs/development/ocaml-modules/fileutils/default.nix b/pkgs/development/ocaml-modules/fileutils/default.nix index 031680b1e337..39c41e8eba04 100644 --- a/pkgs/development/ocaml-modules/fileutils/default.nix +++ b/pkgs/development/ocaml-modules/fileutils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, ounit }: +{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, ounit }: stdenv.mkDerivation { name = "ocaml${ocaml.version}-fileutils-0.5.3"; @@ -22,7 +22,7 @@ stdenv.mkDerivation { homepage = "https://forge.ocamlcore.org/projects/ocaml-fileutils/"; platforms = ocaml.meta.platforms or []; description = "Library to provide pure OCaml functions to manipulate real file (POSIX like) and filename"; - license = stdenv.lib.licenses.lgpl21Plus; - maintainers = with stdenv.lib.maintainers; [ vbgl ]; + license = lib.licenses.lgpl21Plus; + maintainers = with lib.maintainers; [ vbgl ]; }; } diff --git a/pkgs/development/ocaml-modules/fix/default.nix b/pkgs/development/ocaml-modules/fix/default.nix index d1a2b93cee16..d4ce484653b9 100644 --- a/pkgs/development/ocaml-modules/fix/default.nix +++ b/pkgs/development/ocaml-modules/fix/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild }: +{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild }: -assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.12"; +assert lib.versionAtLeast (lib.getVersion ocaml) "3.12"; stdenv.mkDerivation { @@ -15,7 +15,7 @@ stdenv.mkDerivation { createFindlibDestdir = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://gallium.inria.fr/~fpottier/fix/"; description = "A simple OCaml module for computing the least solution of a system of monotone equations"; license = licenses.cecill-c; diff --git a/pkgs/development/ocaml-modules/fmt/default.nix b/pkgs/development/ocaml-modules/fmt/default.nix index 6b457a9d6dc2..a66976b4a2b5 100644 --- a/pkgs/development/ocaml-modules/fmt/default.nix +++ b/pkgs/development/ocaml-modules/fmt/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, cmdliner, seq, stdlib-shims }: +{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, cmdliner, seq, stdlib-shims }: -if !stdenv.lib.versionAtLeast ocaml.version "4.05" +if !lib.versionAtLeast ocaml.version "4.05" then throw "fmt is not available for OCaml ${ocaml.version}" else @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { inherit (topkg) buildPhase installPhase; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://erratique.ch/software/fmt"; license = licenses.isc; description = "OCaml Format pretty-printer combinators"; diff --git a/pkgs/development/ocaml-modules/fontconfig/default.nix b/pkgs/development/ocaml-modules/fontconfig/default.nix index ce17cc60ebf8..8f804988129b 100644 --- a/pkgs/development/ocaml-modules/fontconfig/default.nix +++ b/pkgs/development/ocaml-modules/fontconfig/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, fontconfig, ocaml }: +{ stdenv, lib, fetchFromGitHub, pkgconfig, fontconfig, ocaml }: stdenv.mkDerivation { name = "ocaml-fontconfig-20131103"; @@ -12,14 +12,14 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ocaml fontconfig ]; makeFlags = [ - "OCAML_STDLIB_DIR=$(out)/lib/ocaml/${stdenv.lib.getVersion ocaml}/site-lib/" + "OCAML_STDLIB_DIR=$(out)/lib/ocaml/${lib.getVersion ocaml}/site-lib/" "OCAML_HAVE_OCAMLOPT=yes" ]; meta = { description = "Fontconfig bindings for OCaml"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; platforms = ocaml.meta.platforms or []; - maintainers = with stdenv.lib.maintainers; [ vbgl ]; + maintainers = with lib.maintainers; [ vbgl ]; }; } diff --git a/pkgs/development/ocaml-modules/fpath/default.nix b/pkgs/development/ocaml-modules/fpath/default.nix index 4694e3ac6377..785a71e13a7f 100644 --- a/pkgs/development/ocaml-modules/fpath/default.nix +++ b/pkgs/development/ocaml-modules/fpath/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, astring }: +{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, topkg, astring }: -if !stdenv.lib.versionAtLeast ocaml.version "4.03" +if !lib.versionAtLeast ocaml.version "4.03" then throw "fpath is not available for OCaml ${ocaml.version}" else @@ -20,8 +20,8 @@ stdenv.mkDerivation { meta = { description = "An OCaml module for handling file system paths with POSIX and Windows conventions"; homepage = "https://erratique.ch/software/fpath"; - license = stdenv.lib.licenses.isc; - maintainers = [ stdenv.lib.maintainers.vbgl ]; + license = lib.licenses.isc; + maintainers = [ lib.maintainers.vbgl ]; inherit (ocaml.meta) platforms; }; } diff --git a/pkgs/development/ocaml-modules/functory/default.nix b/pkgs/development/ocaml-modules/functory/default.nix index 934a88254e27..2f11001874f1 100644 --- a/pkgs/development/ocaml-modules/functory/default.nix +++ b/pkgs/development/ocaml-modules/functory/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchurl, ocaml, findlib }: +{ lib, stdenv, fetchurl, ocaml, findlib }: -assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.11"; +assert lib.versionAtLeast (lib.getVersion ocaml) "3.11"; let param = - if stdenv.lib.versionAtLeast ocaml.version "4.02" then { + if lib.versionAtLeast ocaml.version "4.02" then { version = "0.6"; sha256 = "18wpyxblz9jh5bfp0hpffnd0q8cq1b0dqp0f36vhqydfknlnpx8y"; } else { @@ -27,7 +27,7 @@ stdenv.mkDerivation { createFindlibDestdir = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.lri.fr/~filliatr/functory/"; description = "A distributed computing library for Objective Caml which facilitates distributed execution of parallelizable computations in a seamless fashion"; license = licenses.lgpl21; diff --git a/pkgs/development/ocaml-modules/gen/default.nix b/pkgs/development/ocaml-modules/gen/default.nix index 9e37d9b9a2d4..04d1a0816606 100644 --- a/pkgs/development/ocaml-modules/gen/default.nix +++ b/pkgs/development/ocaml-modules/gen/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, qtest, ounit }: +{ stdenv, lib, fetchFromGitHub, ocaml, findlib, ocamlbuild, qtest, ounit }: let version = "0.5"; in @@ -26,7 +26,7 @@ stdenv.mkDerivation { meta = { homepage = "https://github.com/c-cube/gen"; description = "Simple, efficient iterators for OCaml"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; platforms = ocaml.meta.platforms or []; }; } diff --git a/pkgs/development/ocaml-modules/gg/default.nix b/pkgs/development/ocaml-modules/gg/default.nix index d4c28be2f798..58e2b67eacc6 100644 --- a/pkgs/development/ocaml-modules/gg/default.nix +++ b/pkgs/development/ocaml-modules/gg/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opaline }: +{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, opaline }: let - inherit (stdenv.lib) getVersion versionAtLeast; + inherit (lib) getVersion versionAtLeast; pname = "gg"; version = "0.9.1"; @@ -27,7 +27,7 @@ stdenv.mkDerivation { installPhase = "opaline -libdir $OCAMLFIND_DESTDIR"; - meta = with stdenv.lib; { + meta = with lib; { description = "Basic types for computer graphics in OCaml"; longDescription = '' Gg is an OCaml module providing basic types for computer graphics. It diff --git a/pkgs/development/ocaml-modules/git/default.nix b/pkgs/development/ocaml-modules/git/default.nix index d28e8ef2e7b4..ba2372090d8c 100644 --- a/pkgs/development/ocaml-modules/git/default.nix +++ b/pkgs/development/ocaml-modules/git/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, buildDunePackage +{ stdenv, lib, fetchurl, buildDunePackage , alcotest, mtime, mirage-crypto-rng, tls, git-binary , angstrom, astring, cstruct, decompress, digestif, encore, duff, fmt, checkseum , fpath, hex, ke, logs, lru, ocaml_lwt, ocamlgraph, ocplib-endian, uri, rresult @@ -24,7 +24,7 @@ buildDunePackage rec { checkInputs = [ alcotest mtime mirage-crypto-rng tls git-binary ]; doCheck = !stdenv.isAarch64; - meta = with stdenv; { + meta = { description = "Git format and protocol in pure OCaml"; license = lib.licenses.isc; maintainers = [ lib.maintainers.vbgl ]; diff --git a/pkgs/development/ocaml-modules/gmetadom/default.nix b/pkgs/development/ocaml-modules/gmetadom/default.nix index f01f3e8cad53..145cc3845299 100644 --- a/pkgs/development/ocaml-modules/gmetadom/default.nix +++ b/pkgs/development/ocaml-modules/gmetadom/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ocaml, findlib, gdome2, libxslt, pkgconfig}: +{stdenv, lib, fetchurl, ocaml, findlib, gdome2, libxslt, pkgconfig}: let pname = "gmetadom"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://gmetadom.sourceforge.net/"; description = "A collection of librares, each library providing a DOM implementation"; - license = stdenv.lib.licenses.lgpl21Plus; - maintainers = [ stdenv.lib.maintainers.roconnor ]; + license = lib.licenses.lgpl21Plus; + maintainers = [ lib.maintainers.roconnor ]; }; } diff --git a/pkgs/development/ocaml-modules/gsl/default.nix b/pkgs/development/ocaml-modules/gsl/default.nix index aebdf4adb27f..046c92afca0a 100644 --- a/pkgs/development/ocaml-modules/gsl/default.nix +++ b/pkgs/development/ocaml-modules/gsl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, buildDunePackage, pkg-config, gsl, darwin, dune-configurator }: +{ lib, stdenv, fetchurl, buildDunePackage, pkg-config, gsl, darwin, dune-configurator }: buildDunePackage rec { pname = "gsl"; @@ -12,9 +12,9 @@ buildDunePackage rec { }; buildInputs = [ dune-configurator gsl pkg-config ]; - propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Accelerate ]; + propagatedBuildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Accelerate ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://mmottl.github.io/gsl-ocaml/"; description = "OCaml bindings to the GNU Scientific Library"; license = licenses.gpl3Plus; diff --git a/pkgs/development/ocaml-modules/gtktop/default.nix b/pkgs/development/ocaml-modules/gtktop/default.nix index b0e17a28e51e..e1afefc6a79f 100644 --- a/pkgs/development/ocaml-modules/gtktop/default.nix +++ b/pkgs/development/ocaml-modules/gtktop/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, ocaml, camlp4, findlib, lablgtk-extras }: +{ stdenv, lib, fetchurl, ocaml, camlp4, findlib, lablgtk-extras }: let pname = "gtktop-2.0"; in -if stdenv.lib.versionAtLeast ocaml.version "4.06" +if lib.versionAtLeast ocaml.version "4.06" then throw "${pname} is not available for OCaml ${ocaml.version}" else @@ -22,8 +22,8 @@ stdenv.mkDerivation { meta = { homepage = "http://zoggy.github.io/gtktop/"; description = "A small OCaml library to ease the creation of graphical toplevels"; - license = stdenv.lib.licenses.lgpl3; - maintainers = with stdenv.lib.maintainers; [ vbgl ]; + license = lib.licenses.lgpl3; + maintainers = with lib.maintainers; [ vbgl ]; platforms = ocaml.meta.platforms or []; }; } diff --git a/pkgs/development/ocaml-modules/herelib/default.nix b/pkgs/development/ocaml-modules/herelib/default.nix index a99b6cb711e4..c5223637a158 100644 --- a/pkgs/development/ocaml-modules/herelib/default.nix +++ b/pkgs/development/ocaml-modules/herelib/default.nix @@ -1,4 +1,4 @@ -{stdenv, buildOcaml, fetchurl}: +{lib, buildOcaml, fetchurl}: buildOcaml rec { version = "112.35.00"; @@ -11,10 +11,10 @@ buildOcaml rec { sha256 = "03rrlpjmnd8d1rzzmd112355m7a5bwn3vf90xkbc6gkxlad9cxbs"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/janestreet/herelib"; description = "Syntax extension for inserting the current location"; - license = stdenv.lib.licenses.asl20; + license = licenses.asl20; maintainers = [ maintainers.ericbmerritt ]; }; } diff --git a/pkgs/development/ocaml-modules/hex/default.nix b/pkgs/development/ocaml-modules/hex/default.nix index 526989734abd..4a6123ebd3a6 100644 --- a/pkgs/development/ocaml-modules/hex/default.nix +++ b/pkgs/development/ocaml-modules/hex/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, buildDunePackage, bigarray-compat, cstruct }: +{ lib, fetchurl, buildDunePackage, bigarray-compat, cstruct }: buildDunePackage rec { pname = "hex"; @@ -19,7 +19,7 @@ buildDunePackage rec { meta = { description = "Mininal OCaml library providing hexadecimal converters"; homepage = "https://github.com/mirage/ocaml-hex"; - license = stdenv.lib.licenses.isc; - maintainers = with stdenv.lib.maintainers; [ vbgl ]; + license = lib.licenses.isc; + maintainers = with lib.maintainers; [ vbgl ]; }; } diff --git a/pkgs/development/ocaml-modules/higlo/default.nix b/pkgs/development/ocaml-modules/higlo/default.nix index ecda6338beed..3c4b7a37f99e 100644 --- a/pkgs/development/ocaml-modules/higlo/default.nix +++ b/pkgs/development/ocaml-modules/higlo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib, xtmpl, ulex }: +{ lib, stdenv, fetchFromGitHub, ocaml, findlib, xtmpl, ulex }: stdenv.mkDerivation rec { pname = "higlo"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { patches = ./install.patch; - meta = with stdenv.lib; { + meta = with lib; { description = "OCaml library for syntax highlighting"; homepage = "https://zoggy.github.io/higlo/"; license = licenses.lgpl3; diff --git a/pkgs/development/ocaml-modules/http/default.nix b/pkgs/development/ocaml-modules/http/default.nix index 3936eb13c2fb..f762e9c7b238 100644 --- a/pkgs/development/ocaml-modules/http/default.nix +++ b/pkgs/development/ocaml-modules/http/default.nix @@ -1,6 +1,6 @@ -{stdenv, fetchurl, ocaml_pcre, ocamlnet, ocaml, findlib, camlp4}: +{lib, stdenv, fetchurl, ocaml_pcre, ocamlnet, ocaml, findlib, camlp4}: -if stdenv.lib.versionAtLeast ocaml.version "4.06" +if lib.versionAtLeast ocaml.version "4.06" then throw "ocaml-http is not available for OCaml ${ocaml.version}" else @@ -29,7 +29,7 @@ stdenv.mkDerivation { make all opt ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://ocaml-http.forge.ocamlcore.org/"; platforms = ocaml.meta.platforms or []; description = "Do it yourself (OCaml) HTTP daemon"; diff --git a/pkgs/development/ocaml-modules/inifiles/default.nix b/pkgs/development/ocaml-modules/inifiles/default.nix index eeeaab8092fc..c141c73506d4 100644 --- a/pkgs/development/ocaml-modules/inifiles/default.nix +++ b/pkgs/development/ocaml-modules/inifiles/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, ocaml, findlib, ocaml_pcre }: +{ stdenv, lib, fetchurl, fetchpatch, ocaml, findlib, ocaml_pcre }: stdenv.mkDerivation { name = "ocaml${ocaml.version}-inifiles-1.2"; @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = { description = "A small OCaml library to read and write .ini files"; - license = stdenv.lib.licenses.lgpl21Plus; + license = lib.licenses.lgpl21Plus; inherit (ocaml.meta) platforms; }; } diff --git a/pkgs/development/ocaml-modules/inotify/default.nix b/pkgs/development/ocaml-modules/inotify/default.nix index 44b34beb79d6..d43d5d9cf8e1 100644 --- a/pkgs/development/ocaml-modules/inotify/default.nix +++ b/pkgs/development/ocaml-modules/inotify/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, ocaml, findlib, ocamlbuild +{ stdenv, lib, fetchFromGitHub, fetchpatch, ocaml, findlib, ocamlbuild , ocaml_lwt # optional lwt support , ounit, fileutils # only for tests }: @@ -23,9 +23,9 @@ stdenv.mkDerivation rec { checkInputs = [ ounit fileutils ]; configureFlags = [ "--enable-lwt" - (stdenv.lib.optionalString doCheck "--enable-tests") ]; + (lib.optionalString doCheck "--enable-tests") ]; - postConfigure = stdenv.lib.optionalString doCheck '' + postConfigure = lib.optionalString doCheck '' echo ': pkg_threads' | tee -a _tags ''; @@ -36,9 +36,9 @@ stdenv.mkDerivation rec { meta = { description = "Bindings for Linux’s filesystem monitoring interface, inotify"; - license = stdenv.lib.licenses.lgpl21; - maintainers = [ stdenv.lib.maintainers.vbgl ]; + license = lib.licenses.lgpl21; + maintainers = [ lib.maintainers.vbgl ]; inherit (src.meta) homepage; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/ocaml-modules/io-page/default.nix b/pkgs/development/ocaml-modules/io-page/default.nix index 46908369e571..9685e27d0b8a 100644 --- a/pkgs/development/ocaml-modules/io-page/default.nix +++ b/pkgs/development/ocaml-modules/io-page/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, buildDunePackage, cstruct, bigarray-compat, ounit }: +{ lib, fetchurl, buildDunePackage, cstruct, bigarray-compat, ounit }: buildDunePackage rec { pname = "io-page"; @@ -18,8 +18,8 @@ buildDunePackage rec { meta = { homepage = "https://github.com/mirage/io-page"; - license = stdenv.lib.licenses.isc; + license = lib.licenses.isc; description = "IO memory page library for Mirage backends"; - maintainers = with stdenv.lib.maintainers; [ vbgl ]; + maintainers = with lib.maintainers; [ vbgl ]; }; } diff --git a/pkgs/development/ocaml-modules/iri/default.nix b/pkgs/development/ocaml-modules/iri/default.nix index 15f3a5613b55..0845e4c1841e 100644 --- a/pkgs/development/ocaml-modules/iri/default.nix +++ b/pkgs/development/ocaml-modules/iri/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchFromGitLab, ocaml, findlib +{ stdenv, lib, fetchFromGitLab, ocaml, findlib , sedlex, uunf, uutf }: -if !stdenv.lib.versionAtLeast ocaml.version "4.03" +if !lib.versionAtLeast ocaml.version "4.03" then throw "iri is not available for OCaml ${ocaml.version}" else @@ -26,8 +26,8 @@ stdenv.mkDerivation rec { meta = { description = "IRI (RFC3987) native OCaml implementation"; - license = stdenv.lib.licenses.lgpl3; - maintainers = [ stdenv.lib.maintainers.vbgl ]; + license = lib.licenses.lgpl3; + maintainers = [ lib.maintainers.vbgl ]; inherit (src.meta) homepage; inherit (ocaml.meta) platforms; }; diff --git a/pkgs/development/ocaml-modules/irmin/chunk.nix b/pkgs/development/ocaml-modules/irmin/chunk.nix new file mode 100644 index 000000000000..7a2ad0ec7dfd --- /dev/null +++ b/pkgs/development/ocaml-modules/irmin/chunk.nix @@ -0,0 +1,18 @@ +{ lib, buildDunePackage, irmin, irmin-mem, irmin-test }: + +buildDunePackage rec { + + pname = "irmin-chunk"; + inherit (irmin) version src useDune2; + + propagatedBuildInputs = [ irmin ]; + + doCheck = true; + checkInputs = [ irmin-mem irmin-test ]; + + meta = irmin.meta // { + description = "Irmin backend which allow to store values into chunks"; + }; + +} + diff --git a/pkgs/development/ocaml-modules/iso8601/default.nix b/pkgs/development/ocaml-modules/iso8601/default.nix index 2a2953673f93..d1b55609bc4a 100644 --- a/pkgs/development/ocaml-modules/iso8601/default.nix +++ b/pkgs/development/ocaml-modules/iso8601/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, ocaml, findlib, ocamlbuild }: +{ stdenv, lib, fetchzip, ocaml, findlib, ocamlbuild }: let version = "0.2.4"; in @@ -16,8 +16,8 @@ stdenv.mkDerivation { meta = { homepage = "https://ocaml-community.github.io/ISO8601.ml/"; description = "ISO 8601 and RFC 3999 date parsing for OCaml"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; platforms = ocaml.meta.platforms or []; - maintainers = with stdenv.lib.maintainers; [ vbgl ]; + maintainers = with lib.maintainers; [ vbgl ]; }; } diff --git a/pkgs/development/ocaml-modules/janestreet/async-rpc-kernel.nix b/pkgs/development/ocaml-modules/janestreet/async-rpc-kernel.nix index 70780ee385fa..15f391342bdb 100644 --- a/pkgs/development/ocaml-modules/janestreet/async-rpc-kernel.nix +++ b/pkgs/development/ocaml-modules/janestreet/async-rpc-kernel.nix @@ -1,4 +1,4 @@ -{stdenv, buildOcamlJane, async_kernel, bin_prot, core_kernel, +{lib, buildOcamlJane, async_kernel, bin_prot, core_kernel, fieldslib, ppx_assert, ppx_bench, ppx_driver, ppx_expect, ppx_inline_test, ppx_jane, sexplib, typerep, variantslib}: @@ -9,7 +9,7 @@ buildOcamlJane { ppx_assert ppx_bench ppx_driver ppx_expect ppx_inline_test ppx_jane sexplib typerep variantslib ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/janestreet/async_rpc_kernel"; description = "Platform-independent core of Async RPC library"; license = licenses.asl20; diff --git a/pkgs/development/ocaml-modules/janestreet/bin_prot.nix b/pkgs/development/ocaml-modules/janestreet/bin_prot.nix index 1eb6b6a95f86..5f3c2ab83ff4 100644 --- a/pkgs/development/ocaml-modules/janestreet/bin_prot.nix +++ b/pkgs/development/ocaml-modules/janestreet/bin_prot.nix @@ -1,4 +1,4 @@ -{stdenv, buildOcamlJane, type_conv}: +{lib, buildOcamlJane, type_conv}: buildOcamlJane { name = "bin_prot"; @@ -8,7 +8,7 @@ buildOcamlJane { propagatedBuildInputs = [ type_conv ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/janestreet/bin_prot"; description = "Binary protocol generator "; license = licenses.asl20; diff --git a/pkgs/development/ocaml-modules/janestreet/core_bench.nix b/pkgs/development/ocaml-modules/janestreet/core_bench.nix index 1956a7f3b705..52a9350eeeac 100644 --- a/pkgs/development/ocaml-modules/janestreet/core_bench.nix +++ b/pkgs/development/ocaml-modules/janestreet/core_bench.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib , buildOcamlJane , core , core_extended @@ -11,7 +11,7 @@ buildOcamlJane { propagatedBuildInputs = [ core core_extended textutils ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/janestreet/core_bench"; description = "Micro-benchmarking library for OCaml"; license = licenses.asl20; diff --git a/pkgs/development/ocaml-modules/janestreet/fieldslib.nix b/pkgs/development/ocaml-modules/janestreet/fieldslib.nix index 39aeb7047177..6ed34f2a28c6 100644 --- a/pkgs/development/ocaml-modules/janestreet/fieldslib.nix +++ b/pkgs/development/ocaml-modules/janestreet/fieldslib.nix @@ -1,4 +1,4 @@ -{ stdenv, type_conv, buildOcamlJane }: +{ lib, type_conv, buildOcamlJane }: buildOcamlJane { name = "fieldslib"; @@ -10,7 +10,7 @@ buildOcamlJane { propagatedBuildInputs = [ type_conv ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://ocaml.janestreet.com/"; description = "OCaml syntax extension to define first class values representing record fields, to get and set record fields, iterate and fold over all fields of a record and create new record values"; license = licenses.asl20; diff --git a/pkgs/development/ocaml-modules/janestreet/janePackage.nix b/pkgs/development/ocaml-modules/janestreet/janePackage.nix index b3ffecb38ce9..0dd0dde6ec9e 100644 --- a/pkgs/development/ocaml-modules/janestreet/janePackage.nix +++ b/pkgs/development/ocaml-modules/janestreet/janePackage.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildDunePackage, defaultVersion ? "0.11.0" }: +{ lib, fetchFromGitHub, buildDunePackage, defaultVersion ? "0.11.0" }: { pname, version ? defaultVersion, hash, ...}@args: @@ -14,6 +14,6 @@ buildDunePackage (args // { sha256 = hash; }; - meta.license = stdenv.lib.licenses.asl20; + meta.license = lib.licenses.asl20; meta.homepage = "https://github.com/janestreet/${pname}"; }) diff --git a/pkgs/development/ocaml-modules/janestreet/js-build-tools.nix b/pkgs/development/ocaml-modules/janestreet/js-build-tools.nix index f77b793bcaab..ff03c209190d 100644 --- a/pkgs/development/ocaml-modules/janestreet/js-build-tools.nix +++ b/pkgs/development/ocaml-modules/janestreet/js-build-tools.nix @@ -1,4 +1,4 @@ -{ stdenv, buildOcaml, fetchurl, ocaml_oasis, opaline }: +{ lib, buildOcaml, fetchurl, ocaml_oasis, opaline }: buildOcaml rec { name = "js-build-tools"; @@ -21,7 +21,7 @@ buildOcaml rec { patches = [ ./js-build-tools-darwin.patch ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Jane Street Build Tools"; maintainers = [ maintainers.maurer ]; license = licenses.asl20; diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-assert.nix b/pkgs/development/ocaml-modules/janestreet/ppx-assert.nix index 3ed7106e7b65..8f4eb7e41510 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-assert.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-assert.nix @@ -1,4 +1,4 @@ -{stdenv, buildOcamlJane, +{lib, buildOcamlJane, ppx_compare, ppx_core, ppx_driver, ppx_here, ppx_sexp_conv, ppx_tools, ppx_type_conv, sexplib}: buildOcamlJane { @@ -8,7 +8,7 @@ buildOcamlJane { [ ppx_compare ppx_core ppx_driver ppx_here ppx_sexp_conv ppx_tools ppx_type_conv sexplib ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Assert-like extension nodes that raise useful errors on failure"; maintainers = [ maintainers.maurer ]; license = licenses.asl20; diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-bench.nix b/pkgs/development/ocaml-modules/janestreet/ppx-bench.nix index 9e5df431e04c..2aa1b208d503 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-bench.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-bench.nix @@ -1,4 +1,4 @@ -{stdenv, buildOcamlJane, +{lib, buildOcamlJane, ppx_core, ppx_driver, ppx_inline_test, ppx_tools}: buildOcamlJane { @@ -10,7 +10,7 @@ buildOcamlJane { propagatedBuildInputs = [ ppx_core ppx_driver ppx_inline_test ppx_tools ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Syntax extension for writing in-line benchmarks in ocaml code"; maintainers = [ maintainers.maurer ]; license = licenses.asl20; diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-bin-prot.nix b/pkgs/development/ocaml-modules/janestreet/ppx-bin-prot.nix index d7f333d4cf4c..2dc64497ca23 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-bin-prot.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-bin-prot.nix @@ -1,4 +1,4 @@ -{stdenv, buildOcamlJane, +{lib, buildOcamlJane, ppx_core, ppx_tools, ppx_type_conv, bin_prot}: buildOcamlJane { @@ -6,7 +6,7 @@ buildOcamlJane { hash = "0kwmrrrybdkmphqczsr3lg3imsxcjb8iy41syvn44s3kcjfyyzbz"; propagatedBuildInputs = [ ppx_core ppx_tools ppx_type_conv bin_prot ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Generation of bin_prot readers and writers from types"; maintainers = [ maintainers.maurer ]; license = licenses.asl20; diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-compare.nix b/pkgs/development/ocaml-modules/janestreet/ppx-compare.nix index 0bfdd7bd540c..103f17c455ea 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-compare.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-compare.nix @@ -1,4 +1,4 @@ -{stdenv, buildOcamlJane, +{lib, buildOcamlJane, ppx_core, ppx_driver, ppx_tools, ppx_type_conv}: buildOcamlJane { @@ -7,7 +7,7 @@ buildOcamlJane { propagatedBuildInputs = [ppx_core ppx_driver ppx_tools ppx_type_conv ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Generation of fast comparison functions from type expressions and definitions"; maintainers = [ maintainers.maurer ]; license = licenses.asl20; diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-custom-printf.nix b/pkgs/development/ocaml-modules/janestreet/ppx-custom-printf.nix index c652afa5fbfc..785cdbc31c07 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-custom-printf.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-custom-printf.nix @@ -1,4 +1,4 @@ -{stdenv, buildOcamlJane, +{lib, buildOcamlJane, ppx_core, ppx_driver, ppx_sexp_conv, ppx_tools}: buildOcamlJane { @@ -7,7 +7,7 @@ buildOcamlJane { propagatedBuildInputs = [ ppx_core ppx_driver ppx_sexp_conv ppx_tools ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Extensions to printf-style format-strings for user-defined string conversion"; maintainers = [ maintainers.maurer ]; license = licenses.asl20; diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-enumerate.nix b/pkgs/development/ocaml-modules/janestreet/ppx-enumerate.nix index 2fdfede0f23d..edb73814704f 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-enumerate.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-enumerate.nix @@ -1,4 +1,4 @@ -{stdenv, buildOcamlJane, +{lib, buildOcamlJane, ppx_core, ppx_tools, ppx_type_conv}: buildOcamlJane { @@ -6,7 +6,7 @@ buildOcamlJane { hash = "0m11921q2pjzkwckf21fynd2qfy83n9jjsgks23yagdai8a7ym16"; propagatedBuildInputs = [ ppx_core ppx_tools ppx_type_conv ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Generate a list containing all values of a finite type"; maintainers = [ maintainers.maurer ]; license = licenses.asl20; diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-expect.nix b/pkgs/development/ocaml-modules/janestreet/ppx-expect.nix index f78f93ee1202..7506e09e30e0 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-expect.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-expect.nix @@ -1,4 +1,4 @@ -{stdenv, buildOcamlJane, +{lib, buildOcamlJane, ppx_assert, ppx_compare, ppx_core, ppx_custom_printf, ppx_driver, ppx_fields_conv, ppx_here, ppx_inline_test, ppx_sexp_conv, ppx_tools, ppx_variants_conv, re, sexplib, variantslib, fieldslib}: @@ -11,7 +11,7 @@ buildOcamlJane { ppx_fields_conv ppx_here ppx_inline_test ppx_sexp_conv ppx_tools ppx_variants_conv re sexplib variantslib fieldslib ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Cram-like framework for OCaml"; maintainers = [ maintainers.maurer ]; license = licenses.asl20; diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-fields-conv.nix b/pkgs/development/ocaml-modules/janestreet/ppx-fields-conv.nix index 551738573b36..857e85f8f03a 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-fields-conv.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-fields-conv.nix @@ -1,4 +1,4 @@ -{stdenv, buildOcamlJane, +{lib, buildOcamlJane, ppx_core, ppx_tools, ppx_type_conv}: buildOcamlJane { @@ -6,7 +6,7 @@ buildOcamlJane { hash = "11w9wfjgkv7yxv3rwlwi6m193zan6rhmi45q7n3ddi2s8ls3gra7"; propagatedBuildInputs = [ ppx_core ppx_tools ppx_type_conv ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Generation of accessor and iteration functions for ocaml records"; maintainers = [ maintainers.maurer ]; license = licenses.asl20; diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-here.nix b/pkgs/development/ocaml-modules/janestreet/ppx-here.nix index ea3ac5e8e5ae..d9c7de65347e 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-here.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-here.nix @@ -1,4 +1,4 @@ -{stdenv, buildOcamlJane, +{lib, buildOcamlJane, ppx_core, ppx_driver}: buildOcamlJane { @@ -6,7 +6,7 @@ buildOcamlJane { hash = "1mzdgn8k171zkwmbizf1a48l525ny0w3363c7gknpnifcinxniiw"; propagatedBuildInputs = [ ppx_core ppx_driver ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A ppx rewriter that defines an extension node whose value is its source position"; maintainers = [ maintainers.maurer ]; license = licenses.asl20; diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-inline-test.nix b/pkgs/development/ocaml-modules/janestreet/ppx-inline-test.nix index d0e4c84158c7..0b9bb9838947 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-inline-test.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-inline-test.nix @@ -1,4 +1,4 @@ -{stdenv, buildOcamlJane, +{lib, buildOcamlJane, ppx_core, ppx_driver, ppx_tools}: buildOcamlJane { @@ -6,7 +6,7 @@ buildOcamlJane { hash = "0ygapa54i0wwcj3jcqwiimrc6z0b7aafgjhbk37h6vvclnm5n7f6"; propagatedBuildInputs = [ ppx_core ppx_driver ppx_tools ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Syntax extension for writing in-line tests in ocaml code"; maintainers = [ maintainers.maurer ]; license = licenses.asl20; diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-jane.nix b/pkgs/development/ocaml-modules/janestreet/ppx-jane.nix index 1086059b19f3..e6c51bebd52c 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-jane.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-jane.nix @@ -1,4 +1,4 @@ -{stdenv, buildOcamlJane, +{lib, buildOcamlJane, ppx_assert, ppx_bench, ppx_bin_prot, ppx_compare, ppx_custom_printf, ppx_driver, ppx_enumerate, ppx_expect, ppx_fail, ppx_fields_conv, ppx_here, @@ -14,7 +14,7 @@ buildOcamlJane { ppx_here ppx_inline_test ppx_let ppx_pipebang ppx_sexp_conv ppx_sexp_message ppx_sexp_value ppx_typerep_conv ppx_variants_conv ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A ppx_driver including all standard ppx rewriters"; maintainers = [ maintainers.maurer ]; license = licenses.asl20; diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-let.nix b/pkgs/development/ocaml-modules/janestreet/ppx-let.nix index 8c8b87d7112e..49333fb0e865 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-let.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-let.nix @@ -1,4 +1,4 @@ -{stdenv, buildOcamlJane, +{lib, buildOcamlJane, ppx_core, ppx_driver}: buildOcamlJane { @@ -6,7 +6,7 @@ buildOcamlJane { hash = "0whnfq4rgkq4apfqnvc100wlk25pmqdyvy6s21dsn3fcm9hff467"; propagatedBuildInputs = [ ppx_core ppx_driver ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A ppx rewriter for monadic and applicative let bindings and match statements"; maintainers = [ maintainers.maurer ]; license = licenses.asl20; diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-optcomp.nix b/pkgs/development/ocaml-modules/janestreet/ppx-optcomp.nix index 61fa66b77cc5..1ee00ecfa70f 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-optcomp.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-optcomp.nix @@ -1,4 +1,4 @@ -{stdenv, buildOcamlJane, +{lib, buildOcamlJane, ppx_core, ppx_tools}: buildOcamlJane { @@ -7,7 +7,7 @@ buildOcamlJane { propagatedBuildInputs = [ ppx_core ppx_tools ]; - meta = with stdenv.lib; { + meta = with lib; { description = "ppx_optcomp stands for Optional Compilation. It is a tool used to handle optional compilations of pieces of code depending of the word size, the version of the compiler, etc."; maintainers = [ maintainers.maurer ]; license = licenses.asl20; diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-pipebang.nix b/pkgs/development/ocaml-modules/janestreet/ppx-pipebang.nix index 209638f97b74..9afc27e8a5dd 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-pipebang.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-pipebang.nix @@ -1,4 +1,4 @@ -{stdenv, buildOcamlJane, +{lib, buildOcamlJane, ppx_core, ppx_driver, ppx_tools}: buildOcamlJane { @@ -6,7 +6,7 @@ buildOcamlJane { hash = "0k25bhj9ziiw89xvs4svz7cgazbbmprba9wbic2llffg55fp7acc"; propagatedBuildInputs = [ ppx_core ppx_driver ppx_tools ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A ppx rewriter that inlines reverse application operators |> and |!"; maintainers = [ maintainers.maurer ]; license = licenses.asl20; diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-sexp-conv.nix b/pkgs/development/ocaml-modules/janestreet/ppx-sexp-conv.nix index 00361ee81ebe..537a5941a9fd 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-sexp-conv.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-sexp-conv.nix @@ -1,4 +1,4 @@ -{stdenv, buildOcamlJane, +{lib, buildOcamlJane, ppx_core, ppx_tools, ppx_type_conv, sexplib}: buildOcamlJane { @@ -6,7 +6,7 @@ buildOcamlJane { hash = "1kgbmlc11w5jhbhmy5n0f734l44zwyry48342dm5qydi9sfzcgq2"; propagatedBuildInputs = [ ppx_core ppx_tools ppx_type_conv sexplib]; - meta = with stdenv.lib; { + meta = with lib; { description = "PPX syntax extension that generates code for converting OCaml types to and from s-expressions, as defined in the sexplib library"; maintainers = [ maintainers.maurer ]; license = licenses.asl20; diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-sexp-message.nix b/pkgs/development/ocaml-modules/janestreet/ppx-sexp-message.nix index 2a8bf44bfab2..714c3356ea0c 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-sexp-message.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-sexp-message.nix @@ -1,4 +1,4 @@ -{stdenv, buildOcamlJane, +{lib, buildOcamlJane, ppx_core, ppx_driver, ppx_here, ppx_sexp_conv, ppx_tools}: buildOcamlJane { @@ -6,7 +6,7 @@ buildOcamlJane { hash = "0inbff25qii868p141jb1y8n3vjfyz66jpnsl9nma6nkkyjkp05j"; propagatedBuildInputs = [ ppx_core ppx_driver ppx_here ppx_sexp_conv ppx_tools ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Easy construction of S-Expressions"; maintainers = [ maintainers.maurer ]; license = licenses.asl20; diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-sexp-value.nix b/pkgs/development/ocaml-modules/janestreet/ppx-sexp-value.nix index 64fbe4bd9bb9..5bfbd185cee9 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-sexp-value.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-sexp-value.nix @@ -1,4 +1,4 @@ -{stdenv, buildOcamlJane, +{lib, buildOcamlJane, ppx_core, ppx_driver, ppx_here, ppx_sexp_conv, ppx_tools}: buildOcamlJane { @@ -6,7 +6,7 @@ buildOcamlJane { hash = "04602ppqfwx33ghjywam00hlqqzsz4d99r60k9q0v1mynk9pjhj0"; propagatedBuildInputs = [ ppx_core ppx_driver ppx_here ppx_sexp_conv ppx_tools ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A ppx rewriter that simplifies building S-Expression from OCaml Values"; maintainers = [ maintainers.maurer ]; license = licenses.asl20; diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-typerep-conv.nix b/pkgs/development/ocaml-modules/janestreet/ppx-typerep-conv.nix index 472ec19b5588..842e90276b73 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-typerep-conv.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-typerep-conv.nix @@ -1,4 +1,4 @@ -{stdenv, buildOcamlJane, +{lib, buildOcamlJane, ppx_core, ppx_tools, ppx_type_conv, typerep}: buildOcamlJane { @@ -6,7 +6,7 @@ buildOcamlJane { hash = "0dldlx73r07j6w0i7h4hxly0v678naa79na5rafsk2974gs5ih9g"; propagatedBuildInputs = [ ppx_core ppx_tools ppx_type_conv typerep ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Automatic generation of runtime types from type definitions"; maintainers = [ maintainers.maurer ]; license = licenses.asl20; diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-variants-conv.nix b/pkgs/development/ocaml-modules/janestreet/ppx-variants-conv.nix index 1d01b0bc321d..a2c8de8a8deb 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-variants-conv.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-variants-conv.nix @@ -1,4 +1,4 @@ -{stdenv, buildOcamlJane, +{lib, buildOcamlJane, ppx_core, ppx_tools, ppx_type_conv, sexplib, variantslib}: buildOcamlJane { @@ -6,7 +6,7 @@ buildOcamlJane { hash = "0kgal8b9yh7wrd75hllb9fyl6zbksfnr9k7pykpzdm3js98dirhn"; propagatedBuildInputs = [ ppx_core ppx_tools ppx_type_conv sexplib variantslib ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Generation of accessor and iteration functions for ocaml variant types"; maintainers = [ maintainers.maurer ]; license = licenses.asl20; diff --git a/pkgs/development/ocaml-modules/janestreet/sexplib.nix b/pkgs/development/ocaml-modules/janestreet/sexplib.nix index 1bb9d489b148..b0b2ce3a451e 100644 --- a/pkgs/development/ocaml-modules/janestreet/sexplib.nix +++ b/pkgs/development/ocaml-modules/janestreet/sexplib.nix @@ -1,4 +1,4 @@ -{stdenv, buildOcamlJane, type_conv}: +{lib, buildOcamlJane, type_conv}: buildOcamlJane { minimumSupportedOcamlVersion = "4.02"; @@ -9,7 +9,7 @@ buildOcamlJane { propagatedBuildInputs = [ type_conv ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://ocaml.janestreet.com/"; description = "Library for serializing OCaml values to and from S-expressions"; license = licenses.asl20; diff --git a/pkgs/development/ocaml-modules/janestreet/typerep.nix b/pkgs/development/ocaml-modules/janestreet/typerep.nix index 9ed037e52110..41e845b362ea 100644 --- a/pkgs/development/ocaml-modules/janestreet/typerep.nix +++ b/pkgs/development/ocaml-modules/janestreet/typerep.nix @@ -1,4 +1,4 @@ -{stdenv, buildOcamlJane, type_conv}: +{lib, buildOcamlJane, type_conv}: buildOcamlJane { name = "typerep"; @@ -10,7 +10,7 @@ buildOcamlJane { propagatedBuildInputs = [ type_conv ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/janestreet/typerep"; description = "Runtime types for OCaml (beta version)"; license = licenses.asl20; diff --git a/pkgs/development/ocaml-modules/janestreet/variantslib.nix b/pkgs/development/ocaml-modules/janestreet/variantslib.nix index 02e63291add2..3fd7877d2bb4 100644 --- a/pkgs/development/ocaml-modules/janestreet/variantslib.nix +++ b/pkgs/development/ocaml-modules/janestreet/variantslib.nix @@ -1,4 +1,4 @@ -{stdenv, buildOcamlJane, type_conv}: +{lib, stdenv, buildOcamlJane, type_conv}: buildOcamlJane { name = "variantslib"; @@ -10,7 +10,7 @@ buildOcamlJane { propagatedBuildInputs = [ type_conv ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/janestreet/variantslib"; description = "OCaml variants as first class values"; license = licenses.asl20; diff --git a/pkgs/development/ocaml-modules/javalib/default.nix b/pkgs/development/ocaml-modules/javalib/default.nix index f7978cf4805e..d158e4216ab4 100644 --- a/pkgs/development/ocaml-modules/javalib/default.nix +++ b/pkgs/development/ocaml-modules/javalib/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchzip, which, ocaml, findlib +{ lib, stdenv, fetchzip, which, ocaml, findlib , camlzip, extlib }: -if !stdenv.lib.versionAtLeast ocaml.version "4.04" +if !lib.versionAtLeast ocaml.version "4.04" then throw "javalib is not available for OCaml ${ocaml.version}" else @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ camlzip extlib ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A library that parses Java .class files into OCaml data structures"; homepage = "https://javalib-team.github.io/javalib/"; license = licenses.lgpl3; diff --git a/pkgs/development/ocaml-modules/jingoo/default.nix b/pkgs/development/ocaml-modules/jingoo/default.nix index d7bcd201c54e..ec25e8e7f418 100644 --- a/pkgs/development/ocaml-modules/jingoo/default.nix +++ b/pkgs/development/ocaml-modules/jingoo/default.nix @@ -3,7 +3,9 @@ buildDunePackage rec { pname = "jingoo"; - version = "1.4.1"; + version = "1.4.2"; + + useDune2 = true; minimumOCamlVersion = "4.04"; @@ -11,7 +13,7 @@ buildDunePackage rec { owner = "tategakibunko"; repo = "jingoo"; rev = "v${version}"; - sha256 = "16wzggwi3ri13v93mjk8w7zxwp65qmi1rnng2kpk9vffx5g1kv6f"; + sha256 = "0q947aik4i4z5wjllhwlkxh60qczwgra21yyrrzwhi9y5bnf8346"; }; buildInputs = [ menhir ]; diff --git a/pkgs/development/ocaml-modules/jsonm/default.nix b/pkgs/development/ocaml-modules/jsonm/default.nix index e1f09f5a4a24..78a081619b27 100644 --- a/pkgs/development/ocaml-modules/jsonm/default.nix +++ b/pkgs/development/ocaml-modules/jsonm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, uutf }: +{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, topkg, uutf }: let version = "1.0.1"; in @@ -19,8 +19,8 @@ stdenv.mkDerivation { meta = { description = "An OCaml non-blocking streaming codec to decode and encode the JSON data format"; homepage = "https://erratique.ch/software/jsonm"; - license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ vbgl ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ vbgl ]; platforms = ocaml.meta.platforms or []; }; } diff --git a/pkgs/development/ocaml-modules/kafka/default.nix b/pkgs/development/ocaml-modules/kafka/default.nix index 0176daeaf6c5..d1ebe95be89d 100644 --- a/pkgs/development/ocaml-modules/kafka/default.nix +++ b/pkgs/development/ocaml-modules/kafka/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildDunePackage, base, cmdliner, ocaml_lwt, +{ lib, stdenv, fetchFromGitHub, buildDunePackage, base, cmdliner, ocaml_lwt, rdkafka, zlib }: buildDunePackage rec { @@ -16,7 +16,7 @@ buildDunePackage rec { propagatedBuildInputs = [ rdkafka zlib ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/didier-wenzek/ocaml-kafka"; description = "OCaml bindings for Kafka"; license = licenses.mit; diff --git a/pkgs/development/ocaml-modules/lablgl/default.nix b/pkgs/development/ocaml-modules/lablgl/default.nix index 2172135e8d4c..a7b145c2d4ef 100644 --- a/pkgs/development/ocaml-modules/lablgl/default.nix +++ b/pkgs/development/ocaml-modules/lablgl/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ocaml, lablgtk, findlib, libGLU, libGL, freeglut, camlp4 } : +{lib, stdenv, fetchurl, ocaml, lablgtk, findlib, libGLU, libGL, freeglut, camlp4 } : let pname = "lablgl"; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { cp ./META $out/lib/ocaml/${ocaml.version}/site-lib/lablgl ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/lablgl.html"; description = "OpenGL bindings for ocaml"; license = licenses.gpl2; diff --git a/pkgs/development/ocaml-modules/lablgtk-extras/1.4.nix b/pkgs/development/ocaml-modules/lablgtk-extras/1.4.nix index 1dfc4305022c..70cc88d21166 100644 --- a/pkgs/development/ocaml-modules/lablgtk-extras/1.4.nix +++ b/pkgs/development/ocaml-modules/lablgtk-extras/1.4.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, camlp4, config-file, lablgtk, xmlm }: +{ stdenv, lib, fetchurl, ocaml, findlib, camlp4, config-file, lablgtk, xmlm }: stdenv.mkDerivation { name = "ocaml-lablgtk-extras-1.4"; @@ -14,10 +14,10 @@ stdenv.mkDerivation { meta = { platforms = ocaml.meta.platforms or []; - maintainers = with stdenv.lib.maintainers; [ vbgl ]; + maintainers = with lib.maintainers; [ vbgl ]; homepage = "http://gtk-extras.forge.ocamlcore.org/"; description = "A collection of libraries and modules useful when developing OCaml/LablGtk2 applications"; - license = stdenv.lib.licenses.lgpl2Plus; + license = lib.licenses.lgpl2Plus; branch = "1.4"; }; } diff --git a/pkgs/development/ocaml-modules/lablgtk-extras/default.nix b/pkgs/development/ocaml-modules/lablgtk-extras/default.nix index de1c1e6ea944..3cd13b2c4d6c 100644 --- a/pkgs/development/ocaml-modules/lablgtk-extras/default.nix +++ b/pkgs/development/ocaml-modules/lablgtk-extras/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib, camlp4, config-file, lablgtk, xmlm }: +{ stdenv, lib, fetchFromGitHub, ocaml, findlib, camlp4, config-file, lablgtk, xmlm }: -assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.02"; +assert lib.versionAtLeast (lib.getVersion ocaml) "4.02"; stdenv.mkDerivation rec { version = "1.6"; @@ -19,9 +19,9 @@ stdenv.mkDerivation rec { meta = { platforms = ocaml.meta.platforms or []; - maintainers = with stdenv.lib.maintainers; [ vbgl ]; + maintainers = with lib.maintainers; [ vbgl ]; homepage = "http://gtk-extras.forge.ocamlcore.org/"; description = "A collection of libraries and modules useful when developing OCaml/LablGtk2 applications"; - license = stdenv.lib.licenses.lgpl2Plus; + license = lib.licenses.lgpl2Plus; }; } diff --git a/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix b/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix index eae356462b32..02fd7004a56b 100644 --- a/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix +++ b/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, ocaml, findlib, pkgconfig, gtk2, libgnomecanvas, libglade, gtksourceview, camlp4 }: +{ stdenv, lib, fetchurl, ocaml, findlib, pkgconfig, gtk2, libgnomecanvas, libglade, gtksourceview, camlp4 }: -if stdenv.lib.versionAtLeast ocaml.version "4.04" +if lib.versionAtLeast ocaml.version "4.04" then throw "lablgtk-2.14 is not available for OCaml ${ocaml.version}" else let @@ -31,11 +31,11 @@ stdenv.mkDerivation (rec { branch = "2.14"; platforms = ocaml.meta.platforms or []; maintainers = [ - stdenv.lib.maintainers.maggesi - stdenv.lib.maintainers.roconnor + lib.maintainers.maggesi + lib.maintainers.roconnor ]; homepage = "http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/lablgtk.html"; description = "LablGTK is is an Objective Caml interface to GTK"; - license = stdenv.lib.licenses.lgpl21Plus; + license = lib.licenses.lgpl21Plus; }; }) diff --git a/pkgs/development/ocaml-modules/lablgtk/default.nix b/pkgs/development/ocaml-modules/lablgtk/default.nix index 2b6c3028fd6c..2aa031f419c8 100644 --- a/pkgs/development/ocaml-modules/lablgtk/default.nix +++ b/pkgs/development/ocaml-modules/lablgtk/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, fetchFromGitHub, ocaml, findlib, pkgconfig, gtk2, libgnomecanvas, libglade, gtksourceview }: +{ lib, stdenv, fetchurl, fetchFromGitHub, ocaml, findlib, pkgconfig, gtk2, libgnomecanvas, libglade, gtksourceview }: let param = - let check = stdenv.lib.versionAtLeast ocaml.version; in + let check = lib.versionAtLeast ocaml.version; in if check "4.06" then rec { version = "2.18.10"; src = fetchFromGitHub { @@ -36,7 +36,7 @@ stdenv.mkDerivation { dontStrip = true; - meta = with stdenv.lib; { + meta = with lib; { platforms = ocaml.meta.platforms or []; maintainers = with maintainers; [ maggesi roconnor vbgl diff --git a/pkgs/development/ocaml-modules/labltk/default.nix b/pkgs/development/ocaml-modules/labltk/default.nix index 1c8edea66fb7..65ea4d4b82ec 100644 --- a/pkgs/development/ocaml-modules/labltk/default.nix +++ b/pkgs/development/ocaml-modules/labltk/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, fetchzip, ocaml, findlib, tcl, tk }: +{ stdenv, lib, fetchurl, fetchzip, ocaml, findlib, tcl, tk }: -let OCamlVersionAtLeast = stdenv.lib.versionAtLeast ocaml.version; in +let OCamlVersionAtLeast = lib.versionAtLeast ocaml.version; in if !OCamlVersionAtLeast "4.04" then throw "labltk is not available for OCaml ${ocaml.version}" @@ -80,8 +80,8 @@ stdenv.mkDerivation rec { meta = { description = "OCaml interface to Tcl/Tk, including OCaml library explorer OCamlBrowser"; homepage = "http://labltk.forge.ocamlcore.org/"; - license = stdenv.lib.licenses.lgpl21; + license = lib.licenses.lgpl21; inherit (ocaml.meta) platforms; - maintainers = [ stdenv.lib.maintainers.vbgl ]; + maintainers = [ lib.maintainers.vbgl ]; }; } diff --git a/pkgs/development/ocaml-modules/lacaml/default.nix b/pkgs/development/ocaml-modules/lacaml/default.nix index b7f5cb44818b..fc2327b736e9 100644 --- a/pkgs/development/ocaml-modules/lacaml/default.nix +++ b/pkgs/development/ocaml-modules/lacaml/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, darwin, buildDunePackage, dune-configurator +{ lib, stdenv, fetchurl, darwin, buildDunePackage, dune-configurator , lapack, blas }: @@ -19,10 +19,10 @@ buildDunePackage rec { buildInputs = [ dune-configurator ]; propagatedBuildInputs = [ lapack blas ] ++ - stdenv.lib.optionals stdenv.isDarwin + lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Accelerate ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://mmottl.github.io/lacaml"; description = "OCaml bindings for BLAS and LAPACK"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/ocaml-modules/lambda-term/default.nix b/pkgs/development/ocaml-modules/lambda-term/default.nix index f02ff4d29962..0d5babad0428 100644 --- a/pkgs/development/ocaml-modules/lambda-term/default.nix +++ b/pkgs/development/ocaml-modules/lambda-term/default.nix @@ -1,16 +1,19 @@ -{ stdenv, fetchurl, libev, buildDunePackage, zed, lwt_log, lwt_react }: +{ lib, fetchFromGitHub, buildDunePackage, zed, lwt_log, lwt_react, mew_vi }: buildDunePackage rec { pname = "lambda-term"; - version = "2.0.3"; + version = "3.1.0"; - src = fetchurl { - url = "https://github.com/ocaml-community/lambda-term/releases/download/${version}/lambda-term-${version}.tbz"; - sha256 = "1n1b3ffj41a1lm2315hh870yj9h8gg8g9jcxha6dr3xx8r84np3v"; + useDune2 = true; + + src = fetchFromGitHub { + owner = "ocaml-community"; + repo = pname; + rev = version; + sha256 = "1k0ykiz0vhpyyj9fkss29ajas4fh1xh449j702xkvayqipzj1mkg"; }; - buildInputs = [ libev ]; - propagatedBuildInputs = [ zed lwt_log lwt_react ]; + propagatedBuildInputs = [ zed lwt_log lwt_react mew_vi ]; meta = { description = "Terminal manipulation library for OCaml"; longDescription = '' @@ -28,10 +31,10 @@ buildDunePackage rec { console applications. ''; - homepage = "https://github.com/diml/lambda-term"; - license = stdenv.lib.licenses.bsd3; + inherit (src.meta) homepage; + license = lib.licenses.bsd3; maintainers = [ - stdenv.lib.maintainers.gal_bolle + lib.maintainers.gal_bolle ]; }; } diff --git a/pkgs/development/ocaml-modules/lens/default.nix b/pkgs/development/ocaml-modules/lens/default.nix index c26b3dbe7374..73548021688b 100644 --- a/pkgs/development/ocaml-modules/lens/default.nix +++ b/pkgs/development/ocaml-modules/lens/default.nix @@ -1,21 +1,22 @@ -{ lib, ocaml, fetchzip, ppx_deriving, ppxfind, buildDunePackage }: - -if lib.versionAtLeast ocaml.version "4.10" -then throw "lens is not available for OCaml ${ocaml.version}" -else +{ lib, fetchzip, ppx_deriving, ppxfind, buildDunePackage, ounit }: buildDunePackage rec { pname = "lens"; - version = "1.2.3"; + version = "1.2.4"; + + useDune2 = true; src = fetchzip { url = "https://github.com/pdonadeo/ocaml-lens/archive/v${version}.tar.gz"; - sha256 = "09k2vhzysx91syjhgv6w1shc9mgzi0l4bhwpx1g5pi4r4ghjp07y"; + sha256 = "18mv7n5rcix3545mc2qa2f9xngks4g4kqj2g878qj7r3cy96kklv"; }; - minimumOCamlVersion = "4.04.1"; + minimumOCamlVersion = "4.10"; buildInputs = [ ppx_deriving ppxfind ]; + doCheck = true; + checkInputs = [ ounit ]; + meta = with lib; { homepage = "https://github.com/pdonadeo/ocaml-lens"; description = "Functional lenses"; diff --git a/pkgs/development/ocaml-modules/linenoise/default.nix b/pkgs/development/ocaml-modules/linenoise/default.nix index 0ad277f4a07f..dd5504dda5ca 100644 --- a/pkgs/development/ocaml-modules/linenoise/default.nix +++ b/pkgs/development/ocaml-modules/linenoise/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildDunePackage, result }: +{ lib, fetchFromGitHub, buildDunePackage, result }: buildDunePackage rec { pname = "linenoise"; @@ -17,8 +17,8 @@ buildDunePackage rec { meta = { description = "OCaml bindings to linenoise"; - license = stdenv.lib.licenses.bsd3; - maintainers = [ stdenv.lib.maintainers.vbgl ]; + license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.vbgl ]; inherit (src.meta) homepage; }; } diff --git a/pkgs/development/ocaml-modules/llvm/default.nix b/pkgs/development/ocaml-modules/llvm/default.nix index 24fde437d5c3..34fe75a2943f 100644 --- a/pkgs/development/ocaml-modules/llvm/default.nix +++ b/pkgs/development/ocaml-modules/llvm/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchpatch, python, cmake, llvm, ocaml, findlib, ctypes }: +{ stdenv, lib, fetchpatch, python, cmake, llvm, ocaml, findlib, ctypes }: -let version = stdenv.lib.getVersion llvm; in +let version = lib.getVersion llvm; in stdenv.mkDerivation { pname = "ocaml-llvm"; @@ -8,7 +8,8 @@ stdenv.mkDerivation { inherit (llvm) src; - buildInputs = [ python cmake ocaml findlib ctypes ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ python ocaml findlib ctypes ]; propagatedBuildInputs = [ llvm ]; patches = [ (fetchpatch { @@ -19,7 +20,7 @@ stdenv.mkDerivation { cmakeFlags = [ "-DLLVM_OCAML_OUT_OF_TREE=TRUE" "-DLLVM_OCAML_INSTALL_PATH=${placeholder "out"}/ocaml" - "-DLLVM_OCAML_EXTERNAL_LLVM_LIBDIR=${stdenv.lib.getLib llvm}/lib" + "-DLLVM_OCAML_EXTERNAL_LLVM_LIBDIR=${lib.getLib llvm}/lib" ]; buildFlags = [ "ocaml_all" ]; @@ -40,7 +41,7 @@ stdenv.mkDerivation { inherit (llvm.meta) license homepage; platforms = ocaml.meta.platforms or []; description = "OCaml bindings distributed with LLVM"; - maintainers = with stdenv.lib.maintainers; [ vbgl ]; + maintainers = with lib.maintainers; [ vbgl ]; }; } diff --git a/pkgs/development/ocaml-modules/logs/default.nix b/pkgs/development/ocaml-modules/logs/default.nix index 50d68520fab0..fedfb1c7637f 100644 --- a/pkgs/development/ocaml-modules/logs/default.nix +++ b/pkgs/development/ocaml-modules/logs/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild +{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild , topkg, result, lwt, cmdliner, fmt }: let pname = "logs"; webpage = "https://erratique.ch/software/${pname}"; in -if !stdenv.lib.versionAtLeast ocaml.version "4.03" +if !lib.versionAtLeast ocaml.version "4.03" then throw "logs is not available for OCaml ${ocaml.version}" else @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { inherit (topkg) installPhase; - meta = with stdenv.lib; { + meta = with lib; { description = "Logging infrastructure for OCaml"; homepage = webpage; inherit (ocaml.meta) platforms; diff --git a/pkgs/development/ocaml-modules/lua-ml/default.nix b/pkgs/development/ocaml-modules/lua-ml/default.nix index 38ccaea65eba..ae16b2856546 100644 --- a/pkgs/development/ocaml-modules/lua-ml/default.nix +++ b/pkgs/development/ocaml-modules/lua-ml/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, dune }: +{ stdenv, lib, fetchFromGitHub, ocaml, findlib, ocamlbuild, dune }: -if !stdenv.lib.versionAtLeast ocaml.version "4.07" +if !lib.versionAtLeast ocaml.version "4.07" then throw "lua-ml is not available for OCaml ${ocaml.version}" else @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { description = "An embeddable Lua 2.5 interpreter implemented in OCaml"; inherit (src.meta) homepage; inherit (ocaml.meta) platforms; - license = stdenv.lib.licenses.bsd2; - maintainers = [ stdenv.lib.maintainers.vbgl ]; + license = lib.licenses.bsd2; + maintainers = [ lib.maintainers.vbgl ]; }; } diff --git a/pkgs/development/ocaml-modules/lwt/ppx.nix b/pkgs/development/ocaml-modules/lwt/ppx.nix index f2707064f2af..2df17844d1a0 100644 --- a/pkgs/development/ocaml-modules/lwt/ppx.nix +++ b/pkgs/development/ocaml-modules/lwt/ppx.nix @@ -1,8 +1,12 @@ -{ fetchzip, buildDunePackage, lwt, ppx_tools_versioned }: +{ fetchzip, buildDunePackage, lwt, ppxlib }: buildDunePackage { pname = "lwt_ppx"; - version = "2.0.1"; + version = "2.0.2"; + + useDune2 = true; + + minimumOCamlVersion = "4.04"; src = fetchzip { # `lwt_ppx` has a different release cycle than Lwt, but it's included in @@ -12,12 +16,11 @@ buildDunePackage { # # This is particularly useful for overriding Lwt without breaking `lwt_ppx`, # as new Lwt releases may contain broken `lwt_ppx` code. - url = "https://github.com/ocsigen/lwt/archive/5.2.0.tar.gz"; - sha256 = "1znw8ckwdmqsnrcgar4g33zgr659l4l904bllrz69bbwdnfmz2x3"; + url = "https://github.com/ocsigen/lwt/archive/5.4.0.tar.gz"; + sha256 = "1ay1zgadnw19r9hl2awfjr22n37l7rzxd9v73pjbahavwm2ay65d"; }; - - propagatedBuildInputs = [ lwt ppx_tools_versioned ]; + propagatedBuildInputs = [ lwt ppxlib ]; meta = { description = "Ppx syntax extension for Lwt"; diff --git a/pkgs/development/ocaml-modules/lwt_log/default.nix b/pkgs/development/ocaml-modules/lwt_log/default.nix index 8286ee16619d..05a5a28dcd7b 100644 --- a/pkgs/development/ocaml-modules/lwt_log/default.nix +++ b/pkgs/development/ocaml-modules/lwt_log/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildDunePackage, lwt }: +{ lib, fetchFromGitHub, buildDunePackage, lwt }: buildDunePackage rec { pname = "lwt_log"; @@ -18,7 +18,7 @@ buildDunePackage rec { meta = { description = "Lwt logging library (deprecated)"; homepage = "https://github.com/aantron/lwt_log"; - license = stdenv.lib.licenses.lgpl21; - maintainers = [ stdenv.lib.maintainers.vbgl ]; + license = lib.licenses.lgpl21; + maintainers = [ lib.maintainers.vbgl ]; }; } diff --git a/pkgs/development/ocaml-modules/lwt_ssl/default.nix b/pkgs/development/ocaml-modules/lwt_ssl/default.nix index ade51b7da75f..e74a743e6b18 100644 --- a/pkgs/development/ocaml-modules/lwt_ssl/default.nix +++ b/pkgs/development/ocaml-modules/lwt_ssl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, buildDunePackage, ssl, lwt }: +{ lib, fetchzip, buildDunePackage, ssl, lwt }: buildDunePackage rec { pname = "lwt_ssl"; @@ -16,7 +16,7 @@ buildDunePackage rec { meta = { homepage = "https://github.com/aantron/lwt_ssl"; description = "OpenSSL binding with concurrent I/O"; - license = stdenv.lib.licenses.lgpl21; - maintainers = [ stdenv.lib.maintainers.vbgl ]; + license = lib.licenses.lgpl21; + maintainers = [ lib.maintainers.vbgl ]; }; } diff --git a/pkgs/development/ocaml-modules/macaque/default.nix b/pkgs/development/ocaml-modules/macaque/default.nix index 32acccd54f28..61ee7ebfe9c5 100644 --- a/pkgs/development/ocaml-modules/macaque/default.nix +++ b/pkgs/development/ocaml-modules/macaque/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, pgocaml, camlp4 }: +{ lib, stdenv, fetchzip, ocaml, findlib, ocamlbuild, pgocaml, camlp4 }: stdenv.mkDerivation { name = "ocaml-macaque-0.7.2"; @@ -12,7 +12,7 @@ stdenv.mkDerivation { createFindlibDestdir = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Macros for Caml Queries"; homepage = "https://github.com/ocsigen/macaque"; license = licenses.lgpl2; diff --git a/pkgs/development/ocaml-modules/magic-mime/default.nix b/pkgs/development/ocaml-modules/magic-mime/default.nix index 4f3d21be71ae..2a5ff08c018e 100644 --- a/pkgs/development/ocaml-modules/magic-mime/default.nix +++ b/pkgs/development/ocaml-modules/magic-mime/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, ocaml, findlib, ocamlbuild }: +{ stdenv, lib, fetchzip, ocaml, findlib, ocamlbuild }: let version = "1.0.0"; in @@ -21,7 +21,7 @@ stdenv.mkDerivation { homepage = "https://github.com/mirage/ocaml-magic-mime"; description = "Convert file extensions to MIME types"; platforms = ocaml.meta.platforms or []; - license = stdenv.lib.licenses.isc; - maintainers = with stdenv.lib.maintainers; [ vbgl ]; + license = lib.licenses.isc; + maintainers = with lib.maintainers; [ vbgl ]; }; } diff --git a/pkgs/development/ocaml-modules/magick/default.nix b/pkgs/development/ocaml-modules/magick/default.nix index 349cbea56071..4fcf267e9c0e 100644 --- a/pkgs/development/ocaml-modules/magick/default.nix +++ b/pkgs/development/ocaml-modules/magick/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, which, pkgconfig, ocaml, findlib, imagemagick }: +{ stdenv, lib, fetchurl, which, pkgconfig, ocaml, findlib, imagemagick }: -if stdenv.lib.versionAtLeast ocaml.version "4.06" +if lib.versionAtLeast ocaml.version "4.06" then throw "magick is not available for OCaml ${ocaml.version}" else @@ -23,8 +23,8 @@ stdenv.mkDerivation { meta = { homepage = "http://www.linux-nantes.org/~fmonnier/OCaml/ImageMagick/"; description = "ImageMagick Binding for OCaml"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; platforms = imagemagick.meta.platforms; - maintainers = with stdenv.lib.maintainers; [ vbgl ]; + maintainers = with lib.maintainers; [ vbgl ]; }; } diff --git a/pkgs/development/ocaml-modules/menhir/default.nix b/pkgs/development/ocaml-modules/menhir/default.nix index 23e31e75779d..cbb759205e03 100644 --- a/pkgs/development/ocaml-modules/menhir/default.nix +++ b/pkgs/development/ocaml-modules/menhir/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild -, version ? if stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.02" then "20190626" else "20140422" +{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild +, version ? if lib.versionAtLeast (lib.getVersion ocaml) "4.02" then "20190626" else "20140422" }@args: let diff --git a/pkgs/development/ocaml-modules/menhir/generic.nix b/pkgs/development/ocaml-modules/menhir/generic.nix index 71561e96cd47..a917d634a19c 100644 --- a/pkgs/development/ocaml-modules/menhir/generic.nix +++ b/pkgs/development/ocaml-modules/menhir/generic.nix @@ -1,4 +1,4 @@ -{ version, src, stdenv, ocaml, findlib, ocamlbuild, ... }: +{ version, src, lib, stdenv, ocaml, findlib, ocamlbuild, ... }: stdenv.mkDerivation { pname = "menhir"; @@ -24,7 +24,7 @@ stdenv.mkDerivation { export PREFIX=$out ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://pauillac.inria.fr/~fpottier/menhir/"; description = "A LR(1) parser generator for OCaml"; longDescription = '' diff --git a/pkgs/development/ocaml-modules/mew/default.nix b/pkgs/development/ocaml-modules/mew/default.nix new file mode 100644 index 000000000000..819bb020050c --- /dev/null +++ b/pkgs/development/ocaml-modules/mew/default.nix @@ -0,0 +1,27 @@ +{ lib, buildDunePackage, fetchFromGitHub +, result, trie +}: + +buildDunePackage rec { + pname = "mew"; + version = "0.1.0"; + + useDune2 = true; + + src = fetchFromGitHub { + owner = "kandu"; + repo = pname; + rev = version; + sha256 = "0417xsghj92v3xa5q4dk4nzf2r4mylrx2fd18i7cg3nzja65nia2"; + }; + + propagatedBuildInputs = [ result trie ]; + + meta = { + inherit (src.meta) homepage; + license = lib.licenses.mit; + description = "Modal Editing Witch"; + maintainers = [ lib.maintainers.vbgl ]; + }; + +} diff --git a/pkgs/development/ocaml-modules/mew_vi/default.nix b/pkgs/development/ocaml-modules/mew_vi/default.nix new file mode 100644 index 000000000000..39228585fe3c --- /dev/null +++ b/pkgs/development/ocaml-modules/mew_vi/default.nix @@ -0,0 +1,27 @@ +{ lib, buildDunePackage, fetchFromGitHub +, mew, react +}: + +buildDunePackage rec { + pname = "mew_vi"; + version = "0.5.0"; + + useDune2 = true; + + src = fetchFromGitHub { + owner = "kandu"; + repo = pname; + rev = version; + sha256 = "0lihbf822k5zasl60w5mhwmdkljlq49c9saayrws7g4qc1j353r8"; + }; + + propagatedBuildInputs = [ mew react ]; + + meta = { + inherit (src.meta) homepage; + license = lib.licenses.mit; + description = "Modal Editing Witch, VI interpreter"; + maintainers = [ lib.maintainers.vbgl ]; + }; + +} diff --git a/pkgs/development/ocaml-modules/mirage-block-unix/default.nix b/pkgs/development/ocaml-modules/mirage-block-unix/default.nix new file mode 100644 index 000000000000..a24c4c9e821f --- /dev/null +++ b/pkgs/development/ocaml-modules/mirage-block-unix/default.nix @@ -0,0 +1,29 @@ +{ lib, fetchurl, buildDunePackage, cstruct-lwt, diet, io-page-unix, logs +, mirage-block, ounit, rresult, uri }: + +buildDunePackage rec { + pname = "mirage-block-unix"; + version = "2.12.1"; + + useDune2 = true; + + src = fetchurl { + url = + "https://github.com/mirage/mirage-block-unix/releases/download/v${version}/mirage-block-unix-v${version}.tbz"; + sha256 = "4fc0ccea3c06c654e149c0f0e1c2a6f19be4e3fe1afd293c6a0dba1b56b3b8c4"; + }; + + minimumOCamlVersion = "4.06"; + + propagatedBuildInputs = [ cstruct-lwt logs mirage-block rresult uri ]; + + doCheck = true; + checkInputs = [ diet io-page-unix ounit ]; + + meta = with lib; { + description = "MirageOS disk block driver for Unix"; + homepage = "https://github.com/mirage/mirage-block-unix"; + license = licenses.isc; + maintainers = with maintainers; [ ehmry ]; + }; +} diff --git a/pkgs/development/ocaml-modules/mirage-crypto/default.nix b/pkgs/development/ocaml-modules/mirage-crypto/default.nix index f963e8e15d08..c2ede31dd3f1 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.7"; + version = "0.8.8"; src = fetchurl { url = "https://github.com/mirage/mirage-crypto/releases/download/v${version}/mirage-crypto-v${version}.tbz"; - sha256 = "1gx86h6kk39zq3kvl854jc2ap2755paalp1f7iv8r9js2xnbxfxy"; + sha256 = "19czylfyakckfzzcbqgv9ygl243wix7ak8zkbdcb9hcl2k2shswb"; }; useDune2 = true; diff --git a/pkgs/development/ocaml-modules/mirage-crypto/rng-async.nix b/pkgs/development/ocaml-modules/mirage-crypto/rng-async.nix new file mode 100644 index 000000000000..e8c8dd06eab5 --- /dev/null +++ b/pkgs/development/ocaml-modules/mirage-crypto/rng-async.nix @@ -0,0 +1,25 @@ +{ lib, buildDunePackage +, mirage-crypto, mirage-crypto-rng +, dune-configurator, async, logs +}: + +buildDunePackage { + pname = "mirage-crypto-rng-async"; + + inherit (mirage-crypto) useDune2 version minimumOCamlVersion src; + + nativeBuildInputs = [ + dune-configurator + ]; + + propagatedBuildInputs = [ + async + logs + mirage-crypto + mirage-crypto-rng + ]; + + meta = mirage-crypto.meta // { + description = "Feed the entropy source in an Async-friendly way"; + }; +} diff --git a/pkgs/development/ocaml-modules/mirage-crypto/rng-mirage.nix b/pkgs/development/ocaml-modules/mirage-crypto/rng-mirage.nix index 473704d7ea22..5152d3c8ecde 100644 --- a/pkgs/development/ocaml-modules/mirage-crypto/rng-mirage.nix +++ b/pkgs/development/ocaml-modules/mirage-crypto/rng-mirage.nix @@ -1,5 +1,7 @@ { buildDunePackage, mirage-crypto-rng, duration, cstruct, mirage-runtime -, mirage-time, mirage-clock, mirage-unix, mirage-time-unix, mirage-clock-unix }: +, mirage-time, mirage-clock, mirage-unix, mirage-time-unix, mirage-clock-unix +, logs, lwt +}: buildDunePackage { pname = "mirage-crypto-rng-mirage"; @@ -10,7 +12,7 @@ buildDunePackage { checkInputs = [ mirage-unix mirage-clock-unix mirage-time-unix ]; propagatedBuildInputs = [ duration cstruct mirage-crypto-rng mirage-runtime - mirage-time mirage-clock ]; + mirage-time mirage-clock logs lwt ]; meta = mirage-crypto-rng.meta // { description = "Entropy collection for a cryptographically secure PRNG"; diff --git a/pkgs/development/ocaml-modules/mirage-vnetif/default.nix b/pkgs/development/ocaml-modules/mirage-vnetif/default.nix index cafb50309ce6..876bc1a98177 100644 --- a/pkgs/development/ocaml-modules/mirage-vnetif/default.nix +++ b/pkgs/development/ocaml-modules/mirage-vnetif/default.nix @@ -35,6 +35,6 @@ buildDunePackage rec { description = "Virtual network interface and software switch for Mirage"; homepage = "https://github.com/mirage/${pname}"; license = licenses.isc; - mantainers = [ maintainers.sternenseemann ]; + maintainers = [ maintainers.sternenseemann ]; }; } diff --git a/pkgs/development/ocaml-modules/mlgmp/default.nix b/pkgs/development/ocaml-modules/mlgmp/default.nix index c37c5bd78114..d2aeb1a37b8a 100644 --- a/pkgs/development/ocaml-modules/mlgmp/default.nix +++ b/pkgs/development/ocaml-modules/mlgmp/default.nix @@ -1,6 +1,6 @@ -{stdenv, fetchurl, ocaml, findlib, gmp, mpfr, ncurses }: +{stdenv, lib, fetchurl, ocaml, findlib, gmp, mpfr, ncurses }: -if stdenv.lib.versionAtLeast ocaml.version "4.03" +if lib.versionAtLeast ocaml.version "4.03" then throw "mlgmp is not available for OCaml ${ocaml.version}" else let diff --git a/pkgs/development/ocaml-modules/mlgmpidl/default.nix b/pkgs/development/ocaml-modules/mlgmpidl/default.nix index 66672f8ea1a6..a0026e3a8ca8 100644 --- a/pkgs/development/ocaml-modules/mlgmpidl/default.nix +++ b/pkgs/development/ocaml-modules/mlgmpidl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, perl, ocaml, findlib, camlidl, gmp, mpfr }: +{ stdenv, lib, fetchFromGitHub, perl, ocaml, findlib, camlidl, gmp, mpfr }: stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-mlgmpidl-${version}"; @@ -28,8 +28,8 @@ stdenv.mkDerivation rec { meta = { description = "OCaml interface to the GMP library"; homepage = "https://www.inrialpes.fr/pop-art/people/bjeannet/mlxxxidl-forge/mlgmpidl/"; - license = stdenv.lib.licenses.lgpl21; + license = lib.licenses.lgpl21; inherit (ocaml.meta) platforms; - maintainers = [ stdenv.lib.maintainers.vbgl ]; + maintainers = [ lib.maintainers.vbgl ]; }; } diff --git a/pkgs/development/ocaml-modules/mparser/default.nix b/pkgs/development/ocaml-modules/mparser/default.nix index 786cc1e27ac8..90c24718dd15 100644 --- a/pkgs/development/ocaml-modules/mparser/default.nix +++ b/pkgs/development/ocaml-modules/mparser/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, ocaml, findlib, ocamlbuild }: +{ stdenv, lib, fetchzip, ocaml, findlib, ocamlbuild }: stdenv.mkDerivation { name = "ocaml${ocaml.version}-mparser-1.2.3"; @@ -17,9 +17,9 @@ stdenv.mkDerivation { meta = { description = "A simple monadic parser combinator OCaml library"; - license = stdenv.lib.licenses.lgpl21Plus; + license = lib.licenses.lgpl21Plus; homepage = "https://github.com/cakeplus/mparser"; - maintainers = [ stdenv.lib.maintainers.vbgl ]; + maintainers = [ lib.maintainers.vbgl ]; inherit (ocaml.meta) platforms; }; } diff --git a/pkgs/development/ocaml-modules/mtime/default.nix b/pkgs/development/ocaml-modules/mtime/default.nix index 2f8545988d8b..9fa302947e92 100644 --- a/pkgs/development/ocaml-modules/mtime/default.nix +++ b/pkgs/development/ocaml-modules/mtime/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ ocaml findlib ocamlbuild ]; buildInputs = [ findlib topkg ] - ++ stdenv.lib.optional jsooSupport js_of_ocaml; + ++ optional jsooSupport js_of_ocaml; buildPhase = "${topkg.buildPhase} --with-js_of_ocaml ${boolToString jsooSupport}"; diff --git a/pkgs/development/ocaml-modules/mysql/default.nix b/pkgs/development/ocaml-modules/mysql/default.nix index f9ebb36f40e8..29720ce1148d 100644 --- a/pkgs/development/ocaml-modules/mysql/default.nix +++ b/pkgs/development/ocaml-modules/mysql/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, ocaml, findlib, libmysqlclient }: +{ stdenv, lib, fetchurl, fetchpatch, ocaml, findlib, libmysqlclient }: # TODO: la versione stabile da' un errore di compilazione dovuto a # qualche cambiamento negli header .h @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://ocaml-mysql.forge.ocamlcore.org"; description = "Bindings for interacting with MySQL databases from ocaml"; - license = stdenv.lib.licenses.lgpl21Plus; - maintainers = [ stdenv.lib.maintainers.roconnor ]; + license = lib.licenses.lgpl21Plus; + maintainers = [ lib.maintainers.roconnor ]; }; } diff --git a/pkgs/development/ocaml-modules/nocrypto/default.nix b/pkgs/development/ocaml-modules/nocrypto/default.nix index 263fdc0bbda5..ae52ed478e06 100644 --- a/pkgs/development/ocaml-modules/nocrypto/default.nix +++ b/pkgs/development/ocaml-modules/nocrypto/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchurl, fetchpatch, ocaml, findlib, ocamlbuild, topkg +{ stdenv, lib, fetchurl, fetchpatch, ocaml, findlib, ocamlbuild, topkg , cpuid, ocb-stubblr, sexplib , cstruct, zarith, ppx_sexp_conv, ppx_deriving, writeScriptBin , cstruct-lwt ? null }: -with stdenv.lib; +with lib; let withLwt = cstruct-lwt != null; # the build system will call 'cc' with no way to override @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/mirleft/ocaml-nocrypto"; description = "Simplest possible crypto to support TLS"; - license = stdenv.lib.licenses.bsd2; - maintainers = with stdenv.lib.maintainers; [ vbgl ]; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ vbgl ]; }; } diff --git a/pkgs/development/ocaml-modules/nonstd/default.nix b/pkgs/development/ocaml-modules/nonstd/default.nix index 150edb3174c4..a584f7bc9ed1 100644 --- a/pkgs/development/ocaml-modules/nonstd/default.nix +++ b/pkgs/development/ocaml-modules/nonstd/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromBitbucket, buildDunePackage }: +{ lib, fetchzip, buildDunePackage }: buildDunePackage rec { pname = "nonstd"; @@ -6,10 +6,8 @@ buildDunePackage rec { minimumOCamlVersion = "4.02"; - src = fetchFromBitbucket { - owner = "smondet"; - repo = pname; - rev = "${pname}.${version}"; + src = fetchzip { + url = "https://bitbucket.org/smondet/${pname}/get/${pname}.${version}.tar.gz"; sha256 = "0ccjwcriwm8fv29ij1cnbc9win054kb6pfga3ygzdbjpjb778j46"; }; diff --git a/pkgs/development/ocaml-modules/notty/default.nix b/pkgs/development/ocaml-modules/notty/default.nix index 420e632b99e5..8e1c5f38cb5d 100644 --- a/pkgs/development/ocaml-modules/notty/default.nix +++ b/pkgs/development/ocaml-modules/notty/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, ocb-stubblr +{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, topkg, ocb-stubblr , result, uucp, uuseg, uutf , lwt ? null }: -with stdenv.lib; +with lib; if !versionAtLeast ocaml.version "4.05" then throw "notty is not available for OCaml ${ocaml.version}" diff --git a/pkgs/development/ocaml-modules/num/default.nix b/pkgs/development/ocaml-modules/num/default.nix index 022b7af9629d..b553677fad47 100644 --- a/pkgs/development/ocaml-modules/num/default.nix +++ b/pkgs/development/ocaml-modules/num/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { description = "Legacy Num library for arbitrary-precision integer and rational arithmetic"; - license = stdenv.lib.licenses.lgpl21; + license = lib.licenses.lgpl21; inherit (ocaml.meta) platforms; inherit (src.meta) homepage; }; diff --git a/pkgs/development/ocaml-modules/ocaml-cairo/default.nix b/pkgs/development/ocaml-modules/ocaml-cairo/default.nix index fdb225ba8e8d..1411d32d40c3 100644 --- a/pkgs/development/ocaml-modules/ocaml-cairo/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-cairo/default.nix @@ -1,10 +1,10 @@ -{stdenv, fetchurl, automake, ocaml, autoconf, gnum4, pkgconfig, freetype, lablgtk, unzip, cairo, findlib, gdk-pixbuf, gtk2, pango }: +{stdenv, lib, fetchurl, automake, ocaml, autoconf, gnum4, pkgconfig, freetype, lablgtk, unzip, cairo, findlib, gdk-pixbuf, gtk2, pango }: let pname = "ocaml-cairo"; in -if stdenv.lib.versionAtLeast ocaml.version "4.06" +if lib.versionAtLeast ocaml.version "4.06" then throw "${pname} is not available for OCaml ${ocaml.version}" else @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://cairographics.org/cairo-ocaml"; description = "ocaml bindings for cairo library"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; platforms = ocaml.meta.platforms or []; }; } diff --git a/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix b/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix index dc6cef0bbba1..63056481199f 100644 --- a/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, libvirt, autoreconfHook, pkg-config, ocaml, findlib, perl }: +{ lib, stdenv, fetchFromGitLab, libvirt, autoreconfHook, pkg-config, ocaml, findlib, perl }: stdenv.mkDerivation rec { pname = "ocaml-libvirt"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { installPhase = "make install-opt"; - meta = with stdenv.lib; { + meta = with lib; { description = "OCaml bindings for libvirt"; homepage = "https://libvirt.org/ocaml/"; license = licenses.gpl2; diff --git a/pkgs/development/ocaml-modules/ocaml-monadic/default.nix b/pkgs/development/ocaml-modules/ocaml-monadic/default.nix index 0420e95b12b9..69fa4cba8511 100644 --- a/pkgs/development/ocaml-modules/ocaml-monadic/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-monadic/default.nix @@ -6,6 +6,8 @@ buildDunePackage rec { pname = "ocaml-monadic"; version = "0.4.1"; + useDune2 = true; + src = fetchFromGitHub { owner = "zepalmer"; repo = pname; diff --git a/pkgs/development/ocaml-modules/ocaml-syntax-shims/default.nix b/pkgs/development/ocaml-modules/ocaml-syntax-shims/default.nix index 706dc913e1e6..374efd8b2b97 100644 --- a/pkgs/development/ocaml-modules/ocaml-syntax-shims/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-syntax-shims/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildDunePackage, fetchurl }: +{ lib, buildDunePackage, fetchurl }: buildDunePackage rec { minimumOCamlVersion = "4.02.3"; @@ -15,7 +15,7 @@ buildDunePackage rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/ocaml-ppx/ocaml-syntax-shims"; description = "Backport new syntax to older OCaml versions"; license = licenses.mit; diff --git a/pkgs/development/ocaml-modules/ocaml-text/default.nix b/pkgs/development/ocaml-modules/ocaml-text/default.nix index 1dc98c9fdd24..e5dc3dd54d34 100644 --- a/pkgs/development/ocaml-modules/ocaml-text/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-text/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, libiconv, ocaml, findlib, ocamlbuild, ncurses }: +{ stdenv, lib, fetchzip, libiconv, ocaml, findlib, ocamlbuild, ncurses }: stdenv.mkDerivation rec { pname = "ocaml-text"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://ocaml-text.forge.ocamlcore.org/"; description = "A library for convenient text manipulation"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; platforms = ocaml.meta.platforms or []; }; } diff --git a/pkgs/development/ocaml-modules/ocamlfuse/default.nix b/pkgs/development/ocaml-modules/ocamlfuse/default.nix index dabe7ae52a3e..c2ca6a2cc8aa 100644 --- a/pkgs/development/ocaml-modules/ocamlfuse/default.nix +++ b/pkgs/development/ocaml-modules/ocamlfuse/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildDunePackage, fetchFromGitHub, camlidl, fuse }: +{ lib, buildDunePackage, fetchFromGitHub, camlidl, fuse }: buildDunePackage { pname = "ocamlfuse"; @@ -16,8 +16,8 @@ buildDunePackage { meta = { homepage = "https://sourceforge.net/projects/ocamlfuse"; description = "OCaml bindings for FUSE"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ bennofs ]; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ bennofs ]; }; } diff --git a/pkgs/development/ocaml-modules/ocamlgraph/default.nix b/pkgs/development/ocaml-modules/ocamlgraph/default.nix index df684f166e17..5ae4f6ad3fa7 100644 --- a/pkgs/development/ocaml-modules/ocamlgraph/default.nix +++ b/pkgs/development/ocaml-modules/ocamlgraph/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib +{ stdenv, lib, fetchurl, ocaml, findlib , gtkSupport ? true , lablgtk }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ ocaml findlib ] - ++ stdenv.lib.optional gtkSupport lablgtk + ++ lib.optional gtkSupport lablgtk ; createFindlibDestdir = true; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { buildFlags = [ "all" ]; installTargets = [ "install-findlib" ]; - postInstall = stdenv.lib.optionalString gtkSupport '' + postInstall = lib.optionalString gtkSupport '' mkdir -p $out/bin cp dgraph/dgraph.opt $out/bin/graph-viewer cp editor/editor.opt $out/bin/graph-editor @@ -30,10 +30,10 @@ stdenv.mkDerivation rec { meta = { homepage = "http://ocamlgraph.lri.fr/"; description = "Graph library for Objective Caml"; - license = stdenv.lib.licenses.gpl2Oss; + license = lib.licenses.gpl2Oss; platforms = ocaml.meta.platforms or []; maintainers = [ - stdenv.lib.maintainers.kkallio + lib.maintainers.kkallio ]; }; } diff --git a/pkgs/development/ocaml-modules/ocamlmake/default.nix b/pkgs/development/ocaml-modules/ocamlmake/default.nix index b4ee828fcc42..a2071a9dfaad 100644 --- a/pkgs/development/ocaml-modules/ocamlmake/default.nix +++ b/pkgs/development/ocaml-modules/ocamlmake/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{stdenv, lib, fetchurl}: let @@ -25,6 +25,6 @@ in stdenv.mkDerivation { homepage = "http://www.ocaml.info/home/ocaml_sources.html"; description = "Generic OCaml Makefile for GNU Make"; license = "LGPL"; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/ocaml-modules/ocamlnat/default.nix b/pkgs/development/ocaml-modules/ocamlnat/default.nix index e98dc62478e0..f8d20b7124bc 100644 --- a/pkgs/development/ocaml-modules/ocamlnat/default.nix +++ b/pkgs/development/ocaml-modules/ocamlnat/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { description = "OCaml native toplevel"; homepage = "http://benediktmeurer.de/ocamlnat/"; - license = stdenv.lib.licenses.qpl; + license = lib.licenses.qpl; longDescription = '' The ocamlnat project provides a new native code OCaml toplevel ocamlnat, which is mostly compatible to the byte code toplevel ocaml, @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { ''; platforms = ocaml.meta.platforms or []; maintainers = [ - stdenv.lib.maintainers.maggesi + lib.maintainers.maggesi ]; }; } diff --git a/pkgs/development/ocaml-modules/ocamlnet/default.nix b/pkgs/development/ocaml-modules/ocamlnet/default.nix index 5b6e0dde8b75..110f51cc079b 100644 --- a/pkgs/development/ocaml-modules/ocamlnet/default.nix +++ b/pkgs/development/ocaml-modules/ocamlnet/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, pkgconfig, ncurses, ocaml, findlib, ocaml_pcre, camlzip +{ stdenv, lib, fetchurl, pkgconfig, ncurses, ocaml, findlib, ocaml_pcre, camlzip , gnutls, nettle }: -if stdenv.lib.versionOlder ocaml.version "4.02" +if lib.versionOlder ocaml.version "4.02" then throw "ocamlnet is not available for OCaml ${ocaml.version}" else @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { license = "Most Ocamlnet modules are released under the zlib/png license. The HTTP server module Nethttpd is, however, under the GPL."; platforms = ocaml.meta.platforms or []; maintainers = [ - stdenv.lib.maintainers.maggesi + lib.maintainers.maggesi ]; }; } diff --git a/pkgs/development/ocaml-modules/ocamlsdl/default.nix b/pkgs/development/ocaml-modules/ocamlsdl/default.nix index 693c4d59fef9..4103b48a979a 100644 --- a/pkgs/development/ocaml-modules/ocamlsdl/default.nix +++ b/pkgs/development/ocaml-modules/ocamlsdl/default.nix @@ -1,10 +1,10 @@ -{stdenv, fetchurl, ocaml, pkgconfig, findlib, SDL, SDL_image, SDL_mixer, SDL_ttf, SDL_gfx, lablgl }: +{stdenv, lib, fetchurl, ocaml, pkgconfig, findlib, SDL, SDL_image, SDL_mixer, SDL_ttf, SDL_gfx, lablgl }: let pname = "ocamlsdl"; in -if stdenv.lib.versionAtLeast ocaml.version "4.06" +if lib.versionAtLeast ocaml.version "4.06" then throw "${pname} is not available for OCaml ${ocaml.version}" else @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { meta = { homepage = "http://ocamlsdl.sourceforge.net/"; description = "OCaml bindings for SDL 1.2"; - license = stdenv.lib.licenses.lgpl21; + license = lib.licenses.lgpl21; }; } diff --git a/pkgs/development/ocaml-modules/ocb-stubblr/default.nix b/pkgs/development/ocaml-modules/ocb-stubblr/default.nix index 3f551903efac..d8d19f5e3651 100644 --- a/pkgs/development/ocaml-modules/ocb-stubblr/default.nix +++ b/pkgs/development/ocaml-modules/ocb-stubblr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, topkg, astring }: +{ stdenv, lib, fetchzip, ocaml, findlib, ocamlbuild, topkg, astring }: stdenv.mkDerivation { name = "ocaml${ocaml.version}-ocb-stubblr-0.1.0"; @@ -19,8 +19,8 @@ stdenv.mkDerivation { meta = { description = "OCamlbuild plugin for C stubs"; homepage = "https://github.com/pqwy/ocb-stubblr"; - license = stdenv.lib.licenses.isc; + license = lib.licenses.isc; inherit (ocaml.meta) platforms; - maintainers = [ stdenv.lib.maintainers.vbgl ]; + maintainers = [ lib.maintainers.vbgl ]; }; } diff --git a/pkgs/development/ocaml-modules/ocf/default.nix b/pkgs/development/ocaml-modules/ocf/default.nix index 7cff7b625b58..ee14a83d57ce 100644 --- a/pkgs/development/ocaml-modules/ocf/default.nix +++ b/pkgs/development/ocaml-modules/ocf/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchFromGitHub, fetchpatch, ocaml, findlib, ppx_tools, yojson }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, ocaml, findlib, ppx_tools, yojson }: -if stdenv.lib.versionOlder ocaml.version "4.03" -|| stdenv.lib.versionAtLeast ocaml.version "4.08" +if lib.versionOlder ocaml.version "4.03" +|| lib.versionAtLeast ocaml.version "4.08" then throw "ocf not supported for ocaml ${ocaml.version}" else stdenv.mkDerivation rec { @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { }) ]; - meta = with stdenv.lib; { + meta = with lib; { description = "OCaml library to read and write configuration options in JSON syntax"; homepage = "https://zoggy.github.io/ocf/"; license = licenses.lgpl3; diff --git a/pkgs/development/ocaml-modules/ocp-ocamlres/default.nix b/pkgs/development/ocaml-modules/ocp-ocamlres/default.nix index 07b6f72e38de..ae06978dacd5 100644 --- a/pkgs/development/ocaml-modules/ocp-ocamlres/default.nix +++ b/pkgs/development/ocaml-modules/ocp-ocamlres/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib, astring, pprint }: +{ stdenv, lib, fetchFromGitHub, ocaml, findlib, astring, pprint }: -if !stdenv.lib.versionAtLeast ocaml.version "4.02" +if !lib.versionAtLeast ocaml.version "4.02" then throw "ocp-ocamlres is not available for OCaml ${ocaml.version}" else @@ -22,9 +22,9 @@ stdenv.mkDerivation rec { meta = { description = "A simple tool and library to embed files and directories inside OCaml executables"; - license = stdenv.lib.licenses.lgpl3Plus; + license = lib.licenses.lgpl3Plus; homepage = "https://www.typerex.org/ocp-ocamlres.html"; - maintainers = [ stdenv.lib.maintainers.vbgl ]; + maintainers = [ lib.maintainers.vbgl ]; inherit (ocaml.meta) platforms; }; } diff --git a/pkgs/development/ocaml-modules/ocplib-endian/default.nix b/pkgs/development/ocaml-modules/ocplib-endian/default.nix index 719252dbea89..553ad9562cc8 100644 --- a/pkgs/development/ocaml-modules/ocplib-endian/default.nix +++ b/pkgs/development/ocaml-modules/ocplib-endian/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, cppo }: +{ stdenv, lib, fetchzip, ocaml, findlib, ocamlbuild, cppo }: let version = "1.0"; in @@ -17,8 +17,8 @@ stdenv.mkDerivation { meta = { description = "Optimised functions to read and write int16/32/64"; homepage = "https://github.com/OCamlPro/ocplib-endian"; - license = stdenv.lib.licenses.lgpl21; + license = lib.licenses.lgpl21; platforms = ocaml.meta.platforms or []; - maintainers = with stdenv.lib.maintainers; [ vbgl ]; + maintainers = with lib.maintainers; [ vbgl ]; }; } diff --git a/pkgs/development/ocaml-modules/ocplib-simplex/default.nix b/pkgs/development/ocaml-modules/ocplib-simplex/default.nix index 2cf4b6ddffb9..8435d1c5e516 100644 --- a/pkgs/development/ocaml-modules/ocplib-simplex/default.nix +++ b/pkgs/development/ocaml-modules/ocplib-simplex/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, ocaml, findlib }: +{ stdenv, lib, fetchFromGitHub, autoreconfHook, ocaml, findlib }: let pname = "ocplib-simplex"; @@ -26,7 +26,7 @@ stdenv.mkDerivation { description = "An OCaml library implementing a simplex algorithm, in a functional style, for solving systems of linear inequalities"; homepage = "https://github.com/OCamlPro-Iguernlala/ocplib-simplex"; inherit (ocaml.meta) platforms; - license = stdenv.lib.licenses.lgpl21; - maintainers = [ stdenv.lib.maintainers.vbgl ]; + license = lib.licenses.lgpl21; + maintainers = [ lib.maintainers.vbgl ]; }; } diff --git a/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix b/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix index 84bc3ce678b1..1feb3ecae714 100644 --- a/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix +++ b/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, oasis, ocaml_optcomp, camlp4 +{ stdenv, lib, fetchzip, ocaml, findlib, ocamlbuild, oasis, ocaml_optcomp, camlp4 , num }: let param = - if stdenv.lib.versionAtLeast ocaml.version "4.03" + if lib.versionAtLeast ocaml.version "4.03" then { version = "0.8.1"; sha256 = "03vzrybdpjydbpil97zmir71kpsn2yxkjnzysma7fvybk8ll4zh9"; @@ -32,9 +32,9 @@ stdenv.mkDerivation { meta = { homepage = "https://github.com/ocsigen/deriving"; description = "Extension to OCaml for deriving functions from type declarations"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; platforms = ocaml.meta.platforms or []; - maintainers = with stdenv.lib.maintainers; [ + maintainers = with lib.maintainers; [ gal_bolle vbgl ]; }; diff --git a/pkgs/development/ocaml-modules/ocsigen-server/default.nix b/pkgs/development/ocaml-modules/ocsigen-server/default.nix index 30ddd005b79b..b4842da12dd7 100644 --- a/pkgs/development/ocaml-modules/ocsigen-server/default.nix +++ b/pkgs/development/ocaml-modules/ocsigen-server/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchFromGitHub, which, ocaml, findlib, lwt_react, ssl, lwt_ssl +{ stdenv, lib, fetchFromGitHub, which, ocaml, findlib, lwt_react, ssl, lwt_ssl , lwt_log, ocamlnet, ocaml_pcre, cryptokit, tyxml, xml-light, ipaddr , pgocaml, camlzip, ocaml_sqlite3 , makeWrapper, fetchpatch }: -if !stdenv.lib.versionAtLeast ocaml.version "4.06.1" +if !lib.versionAtLeast ocaml.version "4.06.1" then throw "ocsigenserver is not available for OCaml ${ocaml.version}" else @@ -58,9 +58,9 @@ stdenv.mkDerivation rec { longDescription ='' A full featured Web server. It implements most features of the HTTP protocol, and has a very powerful extension mechanism that make very easy to plug your own OCaml modules for generating pages. ''; - license = stdenv.lib.licenses.lgpl21; + license = lib.licenses.lgpl21; platforms = ocaml.meta.platforms or []; - maintainers = [ stdenv.lib.maintainers.gal_bolle ]; + maintainers = [ lib.maintainers.gal_bolle ]; }; } diff --git a/pkgs/development/ocaml-modules/ocsigen-start/default.nix b/pkgs/development/ocaml-modules/ocsigen-start/default.nix index 5939e6164536..26d5d10acbbf 100644 --- a/pkgs/development/ocaml-modules/ocsigen-start/default.nix +++ b/pkgs/development/ocaml-modules/ocsigen-start/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib, ocsigen-toolkit, pgocaml_ppx, safepass, yojson +{ stdenv, lib, fetchFromGitHub, ocaml, findlib, ocsigen-toolkit, pgocaml_ppx, safepass, yojson , cohttp-lwt-unix , resource-pooling }: @@ -31,9 +31,9 @@ stdenv.mkDerivation rec { longDescription ='' An Eliom application skeleton, ready to use to build your own application with users, (pre)registration, notifications, etc. ''; - license = stdenv.lib.licenses.lgpl21; + license = lib.licenses.lgpl21; inherit (ocaml.meta) platforms; - maintainers = [ stdenv.lib.maintainers.gal_bolle ]; + maintainers = [ lib.maintainers.gal_bolle ]; }; } diff --git a/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix b/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix index a0f3136de22b..eccdcf80d7cc 100644 --- a/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix +++ b/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib, opaline +{ stdenv, lib, fetchFromGitHub, ocaml, findlib, opaline , calendar, eliom, js_of_ocaml-ppx_deriving_json }: @@ -29,8 +29,8 @@ stdenv.mkDerivation rec { meta = { homepage = "http://ocsigen.org/ocsigen-toolkit/"; description = " User interface widgets for Ocsigen applications"; - license = stdenv.lib.licenses.lgpl21; - maintainers = [ stdenv.lib.maintainers.gal_bolle ]; + license = lib.licenses.lgpl21; + maintainers = [ lib.maintainers.gal_bolle ]; inherit (ocaml.meta) platforms; }; diff --git a/pkgs/development/ocaml-modules/octavius/default.nix b/pkgs/development/ocaml-modules/octavius/default.nix index e0189c90181e..01161214a4f9 100644 --- a/pkgs/development/ocaml-modules/octavius/default.nix +++ b/pkgs/development/ocaml-modules/octavius/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg }: +{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, topkg }: -if !stdenv.lib.versionAtLeast ocaml.version "4.03" +if !lib.versionAtLeast ocaml.version "4.03" then throw "octavius is not available for OCaml ${ocaml.version}" else stdenv.mkDerivation { @@ -17,8 +17,8 @@ stdenv.mkDerivation { meta = { description = "Ocamldoc comment syntax parser"; homepage = "https://github.com/ocaml-doc/octavius"; - license = stdenv.lib.licenses.isc; - maintainers = [ stdenv.lib.maintainers.vbgl ]; + license = lib.licenses.isc; + maintainers = [ lib.maintainers.vbgl ]; inherit (ocaml.meta) platforms; }; } diff --git a/pkgs/development/ocaml-modules/ocurl/default.nix b/pkgs/development/ocaml-modules/ocurl/default.nix index 4c2e4ee6a301..d5ef39484082 100644 --- a/pkgs/development/ocaml-modules/ocurl/default.nix +++ b/pkgs/development/ocaml-modules/ocurl/default.nix @@ -1,6 +1,6 @@ -{ stdenv, pkgconfig, ocaml, findlib, fetchurl, curl, ncurses }: +{ stdenv, lib, pkgconfig, ocaml, findlib, fetchurl, curl, ncurses }: -if stdenv.lib.versionOlder ocaml.version "4.02" +if lib.versionOlder ocaml.version "4.02" then throw "ocurl is not available for OCaml ${ocaml.version}" else @@ -16,9 +16,9 @@ stdenv.mkDerivation rec { createFindlibDestdir = true; meta = { description = "OCaml bindings to libcurl"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; homepage = "http://ygrek.org.ua/p/ocurl/"; - maintainers = with stdenv.lib.maintainers; [ bennofs ]; + maintainers = with lib.maintainers; [ bennofs ]; platforms = ocaml.meta.platforms or []; }; } diff --git a/pkgs/development/ocaml-modules/odn/default.nix b/pkgs/development/ocaml-modules/odn/default.nix index c9e5308f8af4..edf7d8649551 100644 --- a/pkgs/development/ocaml-modules/odn/default.nix +++ b/pkgs/development/ocaml-modules/odn/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, type_conv, ounit, camlp4 }: +{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, type_conv, ounit, camlp4 }: -if stdenv.lib.versionAtLeast ocaml.version "4.06" +if lib.versionAtLeast ocaml.version "4.06" then throw "ocaml-data-notation is not available for OCaml ${ocaml.version}" else @@ -20,7 +20,7 @@ stdenv.mkDerivation { buildPhase = "ocaml setup.ml -build"; installPhase = "ocaml setup.ml -install"; - meta = with stdenv.lib; { + meta = with lib; { description = "Store data using OCaml notation"; homepage = "https://forge.ocamlcore.org/projects/odn/"; license = licenses.lgpl21; diff --git a/pkgs/development/ocaml-modules/omd/default.nix b/pkgs/development/ocaml-modules/omd/default.nix index cf4abeb7ea6d..8e5b4a23ce32 100644 --- a/pkgs/development/ocaml-modules/omd/default.nix +++ b/pkgs/development/ocaml-modules/omd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild }: +{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild }: stdenv.mkDerivation { name = "ocaml${ocaml.version}-omd-1.3.1"; @@ -16,8 +16,8 @@ stdenv.mkDerivation { meta = { description = "Extensible Markdown library and tool in OCaml"; homepage = "https://github.com/ocaml/omd"; - license = stdenv.lib.licenses.isc; - maintainers = [ stdenv.lib.maintainers.vbgl ]; + license = lib.licenses.isc; + maintainers = [ lib.maintainers.vbgl ]; inherit (ocaml.meta) platforms; }; } diff --git a/pkgs/development/ocaml-modules/opam-file-format/default.nix b/pkgs/development/ocaml-modules/opam-file-format/default.nix index 0ca332a2a06e..ee9961d1533e 100644 --- a/pkgs/development/ocaml-modules/opam-file-format/default.nix +++ b/pkgs/development/ocaml-modules/opam-file-format/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib }: +{ stdenv, lib, fetchFromGitHub, ocaml, findlib }: stdenv.mkDerivation rec { version = "2.0.0"; @@ -19,8 +19,8 @@ stdenv.mkDerivation rec { meta = { description = "Parser and printer for the opam file syntax"; - license = stdenv.lib.licenses.lgpl21; - maintainers = [ stdenv.lib.maintainers.vbgl ]; + license = lib.licenses.lgpl21; + maintainers = [ lib.maintainers.vbgl ]; inherit (src.meta) homepage; inherit (ocaml.meta) platforms; }; diff --git a/pkgs/development/ocaml-modules/optcomp/default.nix b/pkgs/development/ocaml-modules/optcomp/default.nix index c177ef52e151..343fb28b6ad8 100644 --- a/pkgs/development/ocaml-modules/optcomp/default.nix +++ b/pkgs/development/ocaml-modules/optcomp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, ocaml, findlib, ocamlbuild, camlp4 }: +{ stdenv, lib, fetchurl, fetchpatch, ocaml, findlib, ocamlbuild, camlp4 }: stdenv.mkDerivation { name = "ocaml-optcomp-1.6"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { }; patches = - let inherit (stdenv.lib) optional versionAtLeast; in + let inherit (lib) optional versionAtLeast; in optional (versionAtLeast ocaml.version "4.02") (fetchpatch { url = "https://github.com/diml/optcomp/commit/b7f809360c9794b383a4bc0492f6df381276b429.patch"; sha256 = "1n095lk94jq1rwi0l24g2wbgms7249wdd31n0ji895dr6755s93y"; @@ -37,10 +37,10 @@ stdenv.mkDerivation { meta = { homepage = "https://github.com/diml/optcomp"; description = "Optional compilation for OCaml with cpp-like directives"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; platforms = ocaml.meta.platforms or []; maintainers = [ - stdenv.lib.maintainers.gal_bolle + lib.maintainers.gal_bolle ]; }; diff --git a/pkgs/development/ocaml-modules/opti/default.nix b/pkgs/development/ocaml-modules/opti/default.nix index 82e2378869f6..9638e8e0d4ef 100644 --- a/pkgs/development/ocaml-modules/opti/default.nix +++ b/pkgs/development/ocaml-modules/opti/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, buildDunePackage }: +{ lib, fetchurl, buildDunePackage }: buildDunePackage rec { pname = "opti"; @@ -11,7 +11,7 @@ buildDunePackage rec { sha256 = "ed9ba56dc06e9d2b1bf097964cc65ea37db787d4f239c13d0dd74693f5b50a1e"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "DSL to generate fast incremental C code from declarative specifications"; license = licenses.bsd3; maintainers = [ maintainers.jmagnusj ]; diff --git a/pkgs/development/ocaml-modules/otfm/default.nix b/pkgs/development/ocaml-modules/otfm/default.nix index 8d5bf290c6e0..0642b30699c2 100644 --- a/pkgs/development/ocaml-modules/otfm/default.nix +++ b/pkgs/development/ocaml-modules/otfm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, uutf, result }: +{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, uutf, result }: let pname = "otfm"; @@ -6,7 +6,7 @@ let webpage = "https://erratique.ch/software/${pname}"; in -assert stdenv.lib.versionAtLeast ocaml.version "4.01.0"; +assert lib.versionAtLeast ocaml.version "4.01.0"; stdenv.mkDerivation { @@ -23,7 +23,7 @@ stdenv.mkDerivation { inherit (topkg) buildPhase installPhase; - meta = with stdenv.lib; { + meta = with lib; { description = "OpenType font decoder for OCaml"; longDescription = '' Otfm is an in-memory decoder for the OpenType font data format. It diff --git a/pkgs/development/ocaml-modules/pa_bench/default.nix b/pkgs/development/ocaml-modules/pa_bench/default.nix index 1027d0fc21ab..e5f9ac52067d 100644 --- a/pkgs/development/ocaml-modules/pa_bench/default.nix +++ b/pkgs/development/ocaml-modules/pa_bench/default.nix @@ -1,4 +1,4 @@ -{stdenv, buildOcaml, fetchurl, type_conv, pa_ounit}: +{lib, buildOcaml, fetchurl, type_conv, pa_ounit}: buildOcaml rec { name = "pa_bench"; @@ -14,10 +14,10 @@ buildOcaml rec { buildInputs = [ pa_ounit ]; propagatedBuildInputs = [ type_conv ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/janestreet/pa_bench"; description = "Syntax extension for inline benchmarks"; - license = stdenv.lib.licenses.asl20; + license = licenses.asl20; maintainers = [ maintainers.ericbmerritt ]; }; } diff --git a/pkgs/development/ocaml-modules/pa_ounit/default.nix b/pkgs/development/ocaml-modules/pa_ounit/default.nix index 3bd8baac4b76..26d000042227 100644 --- a/pkgs/development/ocaml-modules/pa_ounit/default.nix +++ b/pkgs/development/ocaml-modules/pa_ounit/default.nix @@ -1,6 +1,6 @@ -{ stdenv, buildOcaml, ocaml, fetchurl, ounit }: +{ lib, buildOcaml, ocaml, fetchurl, ounit }: -if stdenv.lib.versionAtLeast ocaml.version "4.06" +if lib.versionAtLeast ocaml.version "4.06" then throw "pa_ounit is not available for OCaml ${ocaml.version}" else @@ -15,7 +15,7 @@ buildOcaml rec { propagatedBuildInputs = [ ounit ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/janestreet/pa_ounit"; description = "OCaml inline testing"; license = licenses.asl20; diff --git a/pkgs/development/ocaml-modules/parany/default.nix b/pkgs/development/ocaml-modules/parany/default.nix index 0a4fc9ecea45..34e14959e327 100644 --- a/pkgs/development/ocaml-modules/parany/default.nix +++ b/pkgs/development/ocaml-modules/parany/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildDunePackage, fetchFromGitHub, ocamlnet, cpu }: +{ lib, stdenv, buildDunePackage, fetchFromGitHub, ocamlnet, cpu }: buildDunePackage rec { pname = "parany"; @@ -13,7 +13,7 @@ buildDunePackage rec { propagatedBuildInputs = [ ocamlnet cpu ]; - meta = with stdenv.lib; { + meta = with lib; { inherit (src.meta) homepage; description = "Generalized map/reduce for multicore computing"; maintainers = [ maintainers.bcdarwin ]; diff --git a/pkgs/development/ocaml-modules/pcre/default.nix b/pkgs/development/ocaml-modules/pcre/default.nix index 94af6fce2602..210b7d58857c 100644 --- a/pkgs/development/ocaml-modules/pcre/default.nix +++ b/pkgs/development/ocaml-modules/pcre/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pcre, ocaml, findlib, ocamlbuild }: +{ lib, stdenv, fetchurl, pcre, ocaml, findlib, ocamlbuild }: stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-pcre-${version}"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { dontConfigure = true; # Skip configure phase - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://bitbucket.org/mmottl/pcre-ocaml"; description = "An efficient C-library for pattern matching with Perl-style regular expressions in OCaml"; license = licenses.lgpl21; diff --git a/pkgs/development/ocaml-modules/phylogenetics/default.nix b/pkgs/development/ocaml-modules/phylogenetics/default.nix index 27b6ed3f986b..d3d6097b4462 100644 --- a/pkgs/development/ocaml-modules/phylogenetics/default.nix +++ b/pkgs/development/ocaml-modules/phylogenetics/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildDunePackage, fetchFromGitHub, ppx_deriving +{ lib, stdenv, buildDunePackage, fetchFromGitHub, ppx_deriving , alcotest, angstrom-unix, biocaml, gnuplot, gsl, lacaml, menhir, owl, printbox }: buildDunePackage rec { @@ -22,7 +22,7 @@ buildDunePackage rec { doCheck = false; # many tests require bppsuite - meta = with stdenv.lib; { + meta = with lib; { inherit (src.meta) homepage; description = "Bioinformatics library for Ocaml"; maintainers = [ maintainers.bcdarwin ]; diff --git a/pkgs/development/ocaml-modules/pipebang/default.nix b/pkgs/development/ocaml-modules/pipebang/default.nix index f62978c0a9cd..36eb3fe54bbe 100644 --- a/pkgs/development/ocaml-modules/pipebang/default.nix +++ b/pkgs/development/ocaml-modules/pipebang/default.nix @@ -1,4 +1,4 @@ -{stdenv, buildOcaml, fetchurl}: +{lib, buildOcaml, fetchurl}: buildOcaml rec { name = "pipebang"; @@ -11,7 +11,7 @@ buildOcaml rec { sha256 = "0acm2y8wxvnapa248lkgm0vcc44hlwhrjxqkx1awjxzcmarnxhfk"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/janestreet/pipebang"; description = "Syntax extension to transform x |! f into f x"; license = licenses.asl20; diff --git a/pkgs/development/ocaml-modules/piqi-ocaml/default.nix b/pkgs/development/ocaml-modules/piqi-ocaml/default.nix index 39201d0570b3..7203f3702850 100644 --- a/pkgs/development/ocaml-modules/piqi-ocaml/default.nix +++ b/pkgs/development/ocaml-modules/piqi-ocaml/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, ocaml, findlib, piqi, stdlib-shims }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, ocaml, findlib, piqi, stdlib-shims }: stdenv.mkDerivation rec { version = "0.7.7"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { installPhase = "DESTDIR=$out make install"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://piqi.org"; description = "Universal schema language and a collection of tools built around it. These are the ocaml bindings"; license = licenses.asl20; diff --git a/pkgs/development/ocaml-modules/piqi/default.nix b/pkgs/development/ocaml-modules/piqi/default.nix index f3c489723b2f..bbd7746d3665 100644 --- a/pkgs/development/ocaml-modules/piqi/default.nix +++ b/pkgs/development/ocaml-modules/piqi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib, which, sedlex_2, easy-format, xmlm, base64 }: +{ lib, stdenv, fetchFromGitHub, ocaml, findlib, which, sedlex_2, easy-format, xmlm, base64 }: stdenv.mkDerivation rec { version = "0.6.15"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { make ocaml-install; ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://piqi.org"; description = "Universal schema language and a collection of tools built around it"; license = licenses.asl20; diff --git a/pkgs/development/ocaml-modules/pprint/default.nix b/pkgs/development/ocaml-modules/pprint/default.nix index 0e4f9fea7d92..0cdde114709c 100644 --- a/pkgs/development/ocaml-modules/pprint/default.nix +++ b/pkgs/development/ocaml-modules/pprint/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild }: +{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild }: -assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.12"; +assert lib.versionAtLeast (lib.getVersion ocaml) "3.12"; let param = - if stdenv.lib.versionAtLeast ocaml.version "4.02" + if lib.versionAtLeast ocaml.version "4.02" then { version = "20171003"; sha256 = "06zwsskri8kaqjdszj9360nf36zvwh886xwf033aija8c9k4w6cx"; @@ -28,7 +28,7 @@ stdenv.mkDerivation { dontBuild = true; installFlags = [ "-C" "src" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://gallium.inria.fr/~fpottier/pprint/"; description = "An OCaml adaptation of Wadler’s and Leijen’s prettier printer"; license = licenses.cecill-c; diff --git a/pkgs/development/ocaml-modules/ppx_blob/default.nix b/pkgs/development/ocaml-modules/ppx_blob/default.nix index a64ff9cbef2d..ac96e56d04e6 100644 --- a/pkgs/development/ocaml-modules/ppx_blob/default.nix +++ b/pkgs/development/ocaml-modules/ppx_blob/default.nix @@ -1,18 +1,18 @@ -{ lib, fetchurl, buildDunePackage, ocaml, alcotest, ocaml-migrate-parsetree }: +{ lib, fetchurl, buildDunePackage, ocaml, alcotest, ppxlib }: buildDunePackage rec { pname = "ppx_blob"; - version = "0.7.1"; + version = "0.7.2"; useDune2 = true; src = fetchurl { url = "https://github.com/johnwhitington/${pname}/releases/download/${version}/ppx_blob-${version}.tbz"; - sha256 = "0m616ri6kmawflphiwm6j4djds27v0fjvi8xjz1fq5ydc1sq8d0l"; + sha256 = "00haz1cmplk3j9ysh6j656zrldy60585fmlndmfhpd5332mxrfdw"; }; checkInputs = [ alcotest ]; - buildInputs = [ ocaml-migrate-parsetree ]; + propagatedBuildInputs = [ ppxlib ]; doCheck = lib.versionAtLeast ocaml.version "4.05"; meta = with lib; { diff --git a/pkgs/development/ocaml-modules/ppx_derivers/default.nix b/pkgs/development/ocaml-modules/ppx_derivers/default.nix index 20b78870f93b..a10a61726055 100644 --- a/pkgs/development/ocaml-modules/ppx_derivers/default.nix +++ b/pkgs/development/ocaml-modules/ppx_derivers/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildDunePackage }: +{ lib, fetchFromGitHub, buildDunePackage }: buildDunePackage rec { pname = "ppx_derivers"; @@ -15,8 +15,8 @@ buildDunePackage rec { meta = { description = "Shared [@@deriving] plugin registry"; - license = stdenv.lib.licenses.bsd3; - maintainers = [ stdenv.lib.maintainers.vbgl ]; + license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.vbgl ]; inherit (src.meta) homepage; }; } diff --git a/pkgs/development/ocaml-modules/ppx_gen_rec/default.nix b/pkgs/development/ocaml-modules/ppx_gen_rec/default.nix index 32865bed6316..87ccd85a07df 100644 --- a/pkgs/development/ocaml-modules/ppx_gen_rec/default.nix +++ b/pkgs/development/ocaml-modules/ppx_gen_rec/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchurl, buildDunePackage, ocaml-migrate-parsetree }: +{ lib, fetchurl, buildDunePackage, ocaml-migrate-parsetree }: buildDunePackage rec { pname = "ppx_gen_rec"; version = "1.1.0"; - minimumOCamlVersion = "4.01"; + useDune2 = true; src = fetchurl { url = "https://github.com/flowtype/ocaml-${pname}/releases/download/v${version}/${pname}-v${version}.tbz"; @@ -13,7 +13,7 @@ buildDunePackage rec { buildInputs = [ ocaml-migrate-parsetree ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/flowtype/ocaml-ppx_gen_rec"; description = "ocaml preprocessor that generates a recursive module"; license = licenses.mit; diff --git a/pkgs/development/ocaml-modules/ppx_import/default.nix b/pkgs/development/ocaml-modules/ppx_import/default.nix index f4977992759d..b5651a8cec2a 100644 --- a/pkgs/development/ocaml-modules/ppx_import/default.nix +++ b/pkgs/development/ocaml-modules/ppx_import/default.nix @@ -1,24 +1,27 @@ { lib, fetchurl, buildDunePackage, ocaml , ounit, ppx_deriving, ppx_tools_versioned +, ppxlib, ocaml-migrate-parsetree }: -if !lib.versionAtLeast ocaml.version "4.04" -then throw "ppx_import is not available for OCaml ${ocaml.version}" -else - buildDunePackage rec { pname = "ppx_import"; version = "1.7.1"; + useDune2 = true; + + minimumOCamlVersion = "4.04"; + src = fetchurl { url = "https://github.com/ocaml-ppx/ppx_import/releases/download/v${version}/ppx_import-v${version}.tbz"; sha256 = "16dyxfb7syz659rqa7yq36ny5vzl7gkqd7f4m6qm2zkjc1gc8j4v"; }; - buildInputs = [ ounit ppx_deriving ]; - propagatedBuildInputs = [ ppx_tools_versioned ]; + propagatedBuildInputs = [ + ppxlib ppx_tools_versioned ocaml-migrate-parsetree + ]; doCheck = true; + checkInputs = [ ounit ppx_deriving ]; meta = { description = "A syntax extension that allows to pull in types or signatures from other compiled interface files"; diff --git a/pkgs/development/ocaml-modules/ppx_tools/default.nix b/pkgs/development/ocaml-modules/ppx_tools/default.nix index 5f3f0916178a..94d7eb714dd6 100644 --- a/pkgs/development/ocaml-modules/ppx_tools/default.nix +++ b/pkgs/development/ocaml-modules/ppx_tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildDunePackage, ocaml, findlib }: +{ lib, stdenv, fetchFromGitHub, buildDunePackage, ocaml, findlib }: let param = let v6_2 = { @@ -39,14 +39,14 @@ let src = fetchFromGitHub { inherit (param) sha256; }; pname = "ppx_tools"; - meta = with stdenv.lib; { + meta = with lib; { description = "Tools for authors of ppx rewriters"; homepage = "https://www.lexifi.com/ppx_tools"; license = licenses.mit; maintainers = with maintainers; [ vbgl ]; }; in -if stdenv.lib.versionAtLeast param.version "6.0" +if lib.versionAtLeast param.version "6.0" then buildDunePackage { inherit pname src meta; diff --git a/pkgs/development/ocaml-modules/ppx_tools_versioned/default.nix b/pkgs/development/ocaml-modules/ppx_tools_versioned/default.nix index 958c088cd6a2..5200c13d89fd 100644 --- a/pkgs/development/ocaml-modules/ppx_tools_versioned/default.nix +++ b/pkgs/development/ocaml-modules/ppx_tools_versioned/default.nix @@ -4,6 +4,8 @@ buildDunePackage rec { pname = "ppx_tools_versioned"; version = "5.4.0"; + useDune2 = true; + src = fetchFromGitHub { owner = "ocaml-ppx"; repo = pname; diff --git a/pkgs/development/ocaml-modules/process/default.nix b/pkgs/development/ocaml-modules/process/default.nix index 92fb18378037..34ca51f07392 100644 --- a/pkgs/development/ocaml-modules/process/default.nix +++ b/pkgs/development/ocaml-modules/process/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild }: +{ stdenv, lib, fetchFromGitHub, ocaml, findlib, ocamlbuild }: stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-process-${version}"; @@ -17,8 +17,8 @@ stdenv.mkDerivation rec { meta = { description = "Easy process control in OCaml"; - license = stdenv.lib.licenses.isc; - maintainers = [ stdenv.lib.maintainers.vbgl ]; + license = lib.licenses.isc; + maintainers = [ lib.maintainers.vbgl ]; inherit (src.meta) homepage; inherit (ocaml.meta) platforms; }; diff --git a/pkgs/development/ocaml-modules/psmt2-frontend/default.nix b/pkgs/development/ocaml-modules/psmt2-frontend/default.nix index 485620514e45..30fb5de7cb8e 100644 --- a/pkgs/development/ocaml-modules/psmt2-frontend/default.nix +++ b/pkgs/development/ocaml-modules/psmt2-frontend/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, ocaml, findlib, menhir }: +{ stdenv, lib, fetchFromGitHub, autoreconfHook, ocaml, findlib, menhir }: -if !stdenv.lib.versionAtLeast ocaml.version "4.03" +if !lib.versionAtLeast ocaml.version "4.03" then throw "psmt2-frontend is not available for OCaml ${ocaml.version}" else @@ -26,8 +26,8 @@ stdenv.mkDerivation rec { meta = { description = "A simple parser and type-checker for polomorphic extension of the SMT-LIB 2 language"; - license = stdenv.lib.licenses.asl20; - maintainers = [ stdenv.lib.maintainers.vbgl ]; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.vbgl ]; inherit (src.meta) homepage; inherit (ocaml.meta) platforms; }; diff --git a/pkgs/development/ocaml-modules/ptime/default.nix b/pkgs/development/ocaml-modules/ptime/default.nix index e60a8d5a86d8..50ad5ea94eb9 100644 --- a/pkgs/development/ocaml-modules/ptime/default.nix +++ b/pkgs/development/ocaml-modules/ptime/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, result, js_of_ocaml }: +{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, topkg, result, js_of_ocaml }: stdenv.mkDerivation rec { version = "0.8.5"; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { Ptime is not a calendar library. ''; - license = stdenv.lib.licenses.isc; - maintainers = with stdenv.lib.maintainers; [ sternenseemann ]; + license = lib.licenses.isc; + maintainers = with lib.maintainers; [ sternenseemann ]; }; } diff --git a/pkgs/development/ocaml-modules/react/default.nix b/pkgs/development/ocaml-modules/react/default.nix index 02bba95405d5..7ae3e8e66f33 100644 --- a/pkgs/development/ocaml-modules/react/default.nix +++ b/pkgs/development/ocaml-modules/react/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, topkg, ocamlbuild }: +{ lib, stdenv, fetchurl, ocaml, findlib, topkg, ocamlbuild }: stdenv.mkDerivation { name = "ocaml-react-1.2.1"; @@ -12,7 +12,7 @@ stdenv.mkDerivation { inherit (topkg) buildPhase installPhase; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://erratique.ch/software/react"; description = "Applicative events and signals for OCaml"; license = licenses.bsd3; diff --git a/pkgs/development/ocaml-modules/reactivedata/default.nix b/pkgs/development/ocaml-modules/reactivedata/default.nix index 667c97276045..899547a937be 100644 --- a/pkgs/development/ocaml-modules/reactivedata/default.nix +++ b/pkgs/development/ocaml-modules/reactivedata/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, react, opaline }: +{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, react, opaline }: -if !stdenv.lib.versionAtLeast ocaml.version "4.04" +if !lib.versionAtLeast ocaml.version "4.04" then throw "reactiveData is not available for OCaml ${ocaml.version}" else @@ -18,7 +18,7 @@ stdenv.mkDerivation { installPhase = "opaline -prefix $out -libdir $OCAMLFIND_DESTDIR"; - meta = with stdenv.lib; { + meta = with lib; { description = "An OCaml module for functional reactive programming (FRP) based on React"; homepage = "https://github.com/ocsigen/reactiveData"; license = licenses.lgpl21; diff --git a/pkgs/development/ocaml-modules/rope/default.nix b/pkgs/development/ocaml-modules/rope/default.nix index 41d2d258b97a..84e042bf7d26 100644 --- a/pkgs/development/ocaml-modules/rope/default.nix +++ b/pkgs/development/ocaml-modules/rope/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, dune, benchmark }: +{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, dune, benchmark }: let param = - if stdenv.lib.versionAtLeast ocaml.version "4.03" + if lib.versionAtLeast ocaml.version "4.03" then rec { version = "0.6.2"; url = "https://github.com/Chris00/ocaml-rope/releases/download/${version}/rope-${version}.tbz"; @@ -33,7 +33,7 @@ stdenv.mkDerivation ({ homepage = "http://rope.forge.ocamlcore.org/"; platforms = ocaml.meta.platforms or []; description = ''Ropes ("heavyweight strings") in OCaml''; - license = stdenv.lib.licenses.lgpl21; - maintainers = with stdenv.lib.maintainers; [ volth ]; + license = lib.licenses.lgpl21; + maintainers = with lib.maintainers; [ volth ]; }; } // param.extra) diff --git a/pkgs/development/ocaml-modules/rresult/default.nix b/pkgs/development/ocaml-modules/rresult/default.nix index cdaa7857398f..2573c95c6281 100644 --- a/pkgs/development/ocaml-modules/rresult/default.nix +++ b/pkgs/development/ocaml-modules/rresult/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, result }: +{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, topkg, result }: stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-rresult-${version}"; @@ -15,10 +15,10 @@ stdenv.mkDerivation rec { inherit (topkg) buildPhase installPhase; meta = { - license = stdenv.lib.licenses.isc; + license = lib.licenses.isc; homepage = "https://erratique.ch/software/rresult"; description = "Result value combinators for OCaml"; - maintainers = [ stdenv.lib.maintainers.vbgl ]; + maintainers = [ lib.maintainers.vbgl ]; inherit (ocaml.meta) platforms; }; } diff --git a/pkgs/development/ocaml-modules/sawja/default.nix b/pkgs/development/ocaml-modules/sawja/default.nix index c6cda7d05736..68a8731201d6 100644 --- a/pkgs/development/ocaml-modules/sawja/default.nix +++ b/pkgs/development/ocaml-modules/sawja/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, which, perl, ocaml, findlib, javalib }: +{ lib, stdenv, fetchFromGitHub, which, perl, ocaml, findlib, javalib }: let pname = "sawja"; @@ -6,7 +6,7 @@ let webpage = "http://sawja.inria.fr/"; in -if !stdenv.lib.versionAtLeast ocaml.version "4.07" +if !lib.versionAtLeast ocaml.version "4.07" then throw "${pname} is not available for OCaml ${ocaml.version}" else @@ -34,7 +34,7 @@ stdenv.mkDerivation { propagatedBuildInputs = [ javalib ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A library written in OCaml, relying on Javalib to provide a high level representation of Java bytecode programs"; homepage = webpage; license = licenses.gpl3Plus; diff --git a/pkgs/development/ocaml-modules/secp256k1/default.nix b/pkgs/development/ocaml-modules/secp256k1/default.nix index aab98a9cc6b3..7ad18fba81c6 100644 --- a/pkgs/development/ocaml-modules/secp256k1/default.nix +++ b/pkgs/development/ocaml-modules/secp256k1/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildDunePackage, base, stdio, dune-configurator, secp256k1 }: +{ lib, fetchFromGitHub, buildDunePackage, base, stdio, dune-configurator, secp256k1 }: buildDunePackage rec { pname = "secp256k1"; @@ -15,7 +15,7 @@ buildDunePackage rec { buildInputs = [ base stdio dune-configurator secp256k1 ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/dakk/secp256k1-ml"; description = "Elliptic curve library secp256k1 wrapper for Ocaml"; license = licenses.mit; diff --git a/pkgs/development/ocaml-modules/sedlex/2.nix b/pkgs/development/ocaml-modules/sedlex/2.nix index b1a892d5b804..927acc1819eb 100644 --- a/pkgs/development/ocaml-modules/sedlex/2.nix +++ b/pkgs/development/ocaml-modules/sedlex/2.nix @@ -14,28 +14,33 @@ then throw "sedlex is not available for OCaml ${ocaml.version}" else let + unicodeVersion = "12.1.0"; + baseUrl = "https://www.unicode.org/Public/${unicodeVersion}"; + DerivedCoreProperties = fetchurl { - url = "https://www.unicode.org/Public/12.1.0/ucd/DerivedCoreProperties.txt"; + url = "${baseUrl}/ucd/DerivedCoreProperties.txt"; sha256 = "0s6sn1yr9qmb2i6gf8dir2zpsbjv1frdfzy3i2yjylzvf637msx6"; }; DerivedGeneralCategory = fetchurl { - url = "https://www.unicode.org/Public/12.1.0/ucd/extracted/DerivedGeneralCategory.txt"; + url = "${baseUrl}/ucd/extracted/DerivedGeneralCategory.txt"; sha256 = "1rifzq9ba6c58dn0lrmcb5l5k4ksx3zsdkira3m5p6h4i2wriy3q"; }; PropList = fetchurl { - url = "https://www.unicode.org/Public/12.1.0/ucd/PropList.txt"; + url = "${baseUrl}/ucd/PropList.txt"; sha256 = "0gsb1jpj3mnqbjgbavi4l95gl6g4agq58j82km22fdfg63j3w3fk"; }; in buildDunePackage rec { pname = "sedlex"; - version = "2.1"; + version = "2.2"; + + useDune2 = true; src = fetchFromGitHub { owner = "ocaml-community"; repo = "sedlex"; rev = "v${version}"; - sha256 = "05f6qa8x3vhpdz1fcnpqk37fpnyyq13icqsk2gww5idjnh6kng26"; + sha256 = "18dwl2is5j26z6b1c47b81wvcpxw44fasppdadsrs9vsw63rwcm3"; }; propagatedBuildInputs = [ @@ -43,6 +48,7 @@ buildDunePackage rec { ]; preBuild = '' + rm src/generator/data/dune ln -s ${DerivedCoreProperties} src/generator/data/DerivedCoreProperties.txt ln -s ${DerivedGeneralCategory} src/generator/data/DerivedGeneralCategory.txt ln -s ${PropList} src/generator/data/PropList.txt diff --git a/pkgs/development/ocaml-modules/sedlex/default.nix b/pkgs/development/ocaml-modules/sedlex/default.nix index d34b18bf059e..3a9f87bd93ab 100644 --- a/pkgs/development/ocaml-modules/sedlex/default.nix +++ b/pkgs/development/ocaml-modules/sedlex/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchzip, ocaml, findlib, gen, ppx_tools_versioned, ocaml-migrate-parsetree }: +{ stdenv, lib, fetchzip, ocaml, findlib, gen, ppx_tools_versioned, ocaml-migrate-parsetree }: -if !stdenv.lib.versionAtLeast ocaml.version "4.02" +if !lib.versionAtLeast ocaml.version "4.02" then throw "sedlex is not available for OCaml ${ocaml.version}" else @@ -26,8 +26,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/ocaml-community/sedlex"; description = "An OCaml lexer generator for Unicode"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; inherit (ocaml.meta) platforms; - maintainers = [ stdenv.lib.maintainers.vbgl ]; + maintainers = [ lib.maintainers.vbgl ]; }; } diff --git a/pkgs/development/ocaml-modules/seq/default.nix b/pkgs/development/ocaml-modules/seq/default.nix index 7a50d1517db8..aa0546dd390b 100644 --- a/pkgs/development/ocaml-modules/seq/default.nix +++ b/pkgs/development/ocaml-modules/seq/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild }: +{ stdenv, lib, fetchFromGitHub, ocaml, findlib, ocamlbuild }: stdenv.mkDerivation ({ version = "0.1"; name = "ocaml${ocaml.version}-seq-0.1"; meta = { - license = stdenv.lib.licenses.lgpl21; - maintainers = [ stdenv.lib.maintainers.vbgl ]; + license = lib.licenses.lgpl21; + maintainers = [ lib.maintainers.vbgl ]; homepage = "https://github.com/c-cube/seq"; inherit (ocaml.meta) platforms; }; -} // (if stdenv.lib.versionOlder ocaml.version "4.07" then { +} // (if lib.versionOlder ocaml.version "4.07" then { src = fetchFromGitHub { owner = "c-cube"; diff --git a/pkgs/development/ocaml-modules/sodium/default.nix b/pkgs/development/ocaml-modules/sodium/default.nix index 5d8154565806..d0c203689e32 100644 --- a/pkgs/development/ocaml-modules/sodium/default.nix +++ b/pkgs/development/ocaml-modules/sodium/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, ctypes, libsodium }: +{ lib, stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, ctypes, libsodium }: -if stdenv.lib.versionAtLeast ocaml.version "4.10" +if lib.versionAtLeast ocaml.version "4.10" then throw "sodium is not available for OCaml ${ocaml.version}" else @@ -20,9 +20,9 @@ stdenv.mkDerivation rec { createFindlibDestdir = true; - hardeningDisable = stdenv.lib.optional stdenv.isDarwin "strictoverflow"; + hardeningDisable = lib.optional stdenv.isDarwin "strictoverflow"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/dsheets/ocaml-sodium"; description = "Binding to libsodium 1.0.9+"; platforms = ocaml.meta.platforms or []; diff --git a/pkgs/development/ocaml-modules/sqlite3EZ/default.nix b/pkgs/development/ocaml-modules/sqlite3EZ/default.nix index a3e26a31a8f9..b6a5dc5ecaad 100644 --- a/pkgs/development/ocaml-modules/sqlite3EZ/default.nix +++ b/pkgs/development/ocaml-modules/sqlite3EZ/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, twt, ocaml_sqlite3 }: +{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, twt, ocaml_sqlite3 }: -assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.12"; +assert lib.versionAtLeast (lib.getVersion ocaml) "3.12"; -if stdenv.lib.versionAtLeast ocaml.version "4.06" +if lib.versionAtLeast ocaml.version "4.06" then throw "sqlite3EZ is not available for OCaml ${ocaml.version}" else @@ -20,7 +20,7 @@ stdenv.mkDerivation { createFindlibDestdir = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/mlin/ocaml-sqlite3EZ"; description = "A thin wrapper for sqlite3-ocaml with a simplified interface"; license = licenses.mit; diff --git a/pkgs/development/ocaml-modules/stringext/default.nix b/pkgs/development/ocaml-modules/stringext/default.nix index bd0187dc5f4f..ae797815aed5 100644 --- a/pkgs/development/ocaml-modules/stringext/default.nix +++ b/pkgs/development/ocaml-modules/stringext/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, ounit, qcheck +{ stdenv, lib, fetchzip, ocaml, findlib, ocamlbuild, ounit, qcheck # Optionally enable tests; test script use OCaml-4.01+ features -, doCheck ? stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.01" +, doCheck ? lib.versionAtLeast (lib.getVersion ocaml) "4.01" }: let version = "1.4.3"; in @@ -16,7 +16,7 @@ stdenv.mkDerivation { buildInputs = [ ocaml findlib ocamlbuild ounit qcheck ]; configurePhase = "ocaml setup.ml -configure --prefix $out" - + stdenv.lib.optionalString doCheck " --enable-tests"; + + lib.optionalString doCheck " --enable-tests"; buildPhase = "ocaml setup.ml -build"; inherit doCheck; checkPhase = "ocaml setup.ml -test"; @@ -28,7 +28,7 @@ stdenv.mkDerivation { homepage = "https://github.com/rgrinberg/stringext"; platforms = ocaml.meta.platforms or []; description = "Extra string functions for OCaml"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ vbgl ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ vbgl ]; }; } diff --git a/pkgs/development/ocaml-modules/syslog/default.nix b/pkgs/development/ocaml-modules/syslog/default.nix index 2fa032225e7e..c97f1225663e 100644 --- a/pkgs/development/ocaml-modules/syslog/default.nix +++ b/pkgs/development/ocaml-modules/syslog/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib }: +{ lib, stdenv, fetchFromGitHub, ocaml, findlib }: -assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.03.0"; +assert lib.versionAtLeast (lib.getVersion ocaml) "4.03.0"; stdenv.mkDerivation rec { pname = "ocaml${ocaml.version}-syslog"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { createFindlibDestdir = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/rixed/ocaml-syslog"; description = "Simple wrapper to access the system logger from OCaml"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/ocaml-modules/topkg/default.nix b/pkgs/development/ocaml-modules/topkg/default.nix index 1bd926b1ddbf..97052115da6b 100644 --- a/pkgs/development/ocaml-modules/topkg/default.nix +++ b/pkgs/development/ocaml-modules/topkg/default.nix @@ -5,11 +5,11 @@ The `buildPhase` and `installPhase` attributes can be reused directly in many cases. When more fine-grained control on how to run the “topkg” build system is required, the attribute `run` can be used. */ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, result, opaline }: +{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, result, opaline }: let param = - if stdenv.lib.versionAtLeast ocaml.version "4.03" then { + if lib.versionAtLeast ocaml.version "4.03" then { version = "1.0.3"; sha256 = "0b77gsz9bqby8v77kfi4lans47x9p2lmzanzwins5r29maphb8y6"; } else { @@ -46,8 +46,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://erratique.ch/software/topkg"; - license = stdenv.lib.licenses.isc; - maintainers = [ stdenv.lib.maintainers.vbgl ]; + license = lib.licenses.isc; + maintainers = [ lib.maintainers.vbgl ]; description = "A packager for distributing OCaml software"; inherit (ocaml.meta) platforms; }; diff --git a/pkgs/development/ocaml-modules/trie/default.nix b/pkgs/development/ocaml-modules/trie/default.nix new file mode 100644 index 000000000000..935f71a5e224 --- /dev/null +++ b/pkgs/development/ocaml-modules/trie/default.nix @@ -0,0 +1,23 @@ +{ lib, buildDunePackage, fetchFromGitHub }: + +buildDunePackage rec { + pname = "trie"; + version = "1.0.0"; + + useDune2 = true; + + src = fetchFromGitHub { + owner = "kandu"; + repo = pname; + rev = version; + sha256 = "0s7p9swjqjsqddylmgid6cv263ggq7pmb734z4k84yfcrgb6kg4g"; + }; + + meta = { + inherit (src.meta) homepage; + license = lib.licenses.mit; + description = "Strict impure trie tree"; + maintainers = [ lib.maintainers.vbgl ]; + }; + +} diff --git a/pkgs/development/ocaml-modules/tsdl/default.nix b/pkgs/development/ocaml-modules/tsdl/default.nix index f614c476140e..81ba44647e3d 100644 --- a/pkgs/development/ocaml-modules/tsdl/default.nix +++ b/pkgs/development/ocaml-modules/tsdl/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, ctypes, result, SDL2, pkgconfig, ocb-stubblr }: +{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, ctypes, result, SDL2, pkgconfig, ocb-stubblr }: -if !stdenv.lib.versionAtLeast ocaml.version "4.03" +if !lib.versionAtLeast ocaml.version "4.03" then throw "tsdl is not available for OCaml ${ocaml.version}" else @@ -33,7 +33,7 @@ stdenv.mkDerivation { inherit (topkg) buildPhase installPhase; - meta = with stdenv.lib; { + meta = with lib; { homepage = webpage; description = "Thin bindings to the cross-platform SDL library"; license = licenses.isc; diff --git a/pkgs/development/ocaml-modules/twt/default.nix b/pkgs/development/ocaml-modules/twt/default.nix index 235d04ba99bd..77635e8848e0 100644 --- a/pkgs/development/ocaml-modules/twt/default.nix +++ b/pkgs/development/ocaml-modules/twt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, ocaml, findlib }: +{ lib, stdenv, fetchzip, ocaml, findlib }: stdenv.mkDerivation { name = "ocaml${ocaml.version}-twt-0.94.0"; @@ -22,7 +22,7 @@ stdenv.mkDerivation { dontStrip = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://people.csail.mit.edu/mikelin/ocaml+twt/"; description = "“The Whitespace Thing” for OCaml"; license = licenses.mit; diff --git a/pkgs/development/ocaml-modules/type_conv/108.08.00.nix b/pkgs/development/ocaml-modules/type_conv/108.08.00.nix index 69439c1c265f..72e4fcbb35f1 100644 --- a/pkgs/development/ocaml-modules/type_conv/108.08.00.nix +++ b/pkgs/development/ocaml-modules/type_conv/108.08.00.nix @@ -1,7 +1,7 @@ -{stdenv, fetchurl, ocaml, findlib, camlp4}: +{lib, stdenv, fetchurl, ocaml, findlib, camlp4}: -if !stdenv.lib.versionAtLeast ocaml.version "3.12" -|| stdenv.lib.versionAtLeast ocaml.version "4.03" +if !lib.versionAtLeast ocaml.version "3.12" +|| lib.versionAtLeast ocaml.version "4.03" then throw "type_conv-108.08.00 is not available for OCaml ${ocaml.version}" else stdenv.mkDerivation { @@ -16,7 +16,7 @@ stdenv.mkDerivation { createFindlibDestdir = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://ocaml.janestreet.com/"; description = "Support library for OCaml preprocessor type conversions"; license = licenses.asl20; diff --git a/pkgs/development/ocaml-modules/type_conv/109.60.01.nix b/pkgs/development/ocaml-modules/type_conv/109.60.01.nix index a970091df51d..e41e9b188fc8 100644 --- a/pkgs/development/ocaml-modules/type_conv/109.60.01.nix +++ b/pkgs/development/ocaml-modules/type_conv/109.60.01.nix @@ -1,7 +1,7 @@ -{stdenv, fetchurl, ocaml, findlib, camlp4}: +{stdenv, lib, fetchurl, ocaml, findlib, camlp4}: -if !stdenv.lib.versionAtLeast ocaml.version "4.00" -|| stdenv.lib.versionAtLeast ocaml.version "4.03" +if !lib.versionAtLeast ocaml.version "4.00" +|| lib.versionAtLeast ocaml.version "4.03" then throw "type_conv-109.60.01 is not available for OCaml ${ocaml.version}" else stdenv.mkDerivation { @@ -19,8 +19,8 @@ stdenv.mkDerivation { meta = { homepage = "http://forge.ocamlcore.org/projects/type-conv/"; description = "Support library for OCaml preprocessor type conversions"; - license = stdenv.lib.licenses.lgpl21; + license = lib.licenses.lgpl21; platforms = ocaml.meta.platforms or []; - maintainers = with stdenv.lib.maintainers; [ maggesi ]; + maintainers = with lib.maintainers; [ maggesi ]; }; } diff --git a/pkgs/development/ocaml-modules/type_conv/112.01.01.nix b/pkgs/development/ocaml-modules/type_conv/112.01.01.nix index ee0ce0ae0be1..3fa9042b0351 100644 --- a/pkgs/development/ocaml-modules/type_conv/112.01.01.nix +++ b/pkgs/development/ocaml-modules/type_conv/112.01.01.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, buildOcaml}: +{ lib, fetchurl, buildOcaml}: buildOcaml rec { minimumSupportedOcamlVersion = "4.02"; @@ -14,7 +14,7 @@ buildOcaml rec { meta = { homepage = "https://github.com/janestreet/type_conv/"; description = "Support library for preprocessor type conversions"; - license = stdenv.lib.licenses.asl20; - maintainers = with stdenv.lib.maintainers; [ maggesi ericbmerritt ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ maggesi ericbmerritt ]; }; } diff --git a/pkgs/development/ocaml-modules/typerep/default.nix b/pkgs/development/ocaml-modules/typerep/default.nix index 859bd21b0a7c..c851f22aa5b8 100644 --- a/pkgs/development/ocaml-modules/typerep/default.nix +++ b/pkgs/development/ocaml-modules/typerep/default.nix @@ -1,4 +1,4 @@ -{stdenv, buildOcaml, fetchurl, type_conv}: +{lib, buildOcaml, fetchurl, type_conv}: buildOcaml rec { name = "typerep"; @@ -13,7 +13,7 @@ buildOcaml rec { propagatedBuildInputs = [ type_conv ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/janestreet/typerep"; description = "Runtime types for OCaml (beta version)"; license = licenses.asl20; diff --git a/pkgs/development/ocaml-modules/uchar/default.nix b/pkgs/development/ocaml-modules/uchar/default.nix index fb56cca0f0a7..7eec01547150 100644 --- a/pkgs/development/ocaml-modules/uchar/default.nix +++ b/pkgs/development/ocaml-modules/uchar/default.nix @@ -17,6 +17,6 @@ stdenv.mkDerivation { meta = { description = "Compatibility library for OCaml’s Uchar module"; inherit (ocaml.meta) platforms license; - maintainers = [ stdenv.lib.maintainers.vbgl ]; + maintainers = [ lib.maintainers.vbgl ]; }; } diff --git a/pkgs/development/ocaml-modules/ulex/default.nix b/pkgs/development/ocaml-modules/ulex/default.nix index d32fcf07b6cc..f1ada5d09981 100644 --- a/pkgs/development/ocaml-modules/ulex/default.nix +++ b/pkgs/development/ocaml-modules/ulex/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, camlp4 }: +{ stdenv, lib, fetchFromGitHub, ocaml, findlib, ocamlbuild, camlp4 }: let pname = "ulex"; param = - if stdenv.lib.versionAtLeast ocaml.version "4.02" then { + if lib.versionAtLeast ocaml.version "4.02" then { version = "1.2"; sha256 = "08yf2x9a52l2y4savjqfjd2xy4pjd1rpla2ylrr9qrz1drpfw4ic"; } else { @@ -33,8 +33,8 @@ stdenv.mkDerivation rec { meta = { inherit (src.meta) homepage; description = "A lexer generator for Unicode and OCaml"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; platforms = ocaml.meta.platforms or []; - maintainers = [ stdenv.lib.maintainers.roconnor ]; + maintainers = [ lib.maintainers.roconnor ]; }; } diff --git a/pkgs/development/ocaml-modules/uucd/default.nix b/pkgs/development/ocaml-modules/uucd/default.nix index 355b177b204f..f5d932336150 100644 --- a/pkgs/development/ocaml-modules/uucd/default.nix +++ b/pkgs/development/ocaml-modules/uucd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, xmlm, topkg }: +{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, xmlm, topkg }: let pname = "uucd"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ xmlm ]; - meta = with stdenv.lib; { + meta = with lib; { description = "An OCaml module to decode the data of the Unicode character database from its XML representation"; homepage = webpage; platforms = ocaml.meta.platforms or []; diff --git a/pkgs/development/ocaml-modules/uucp/default.nix b/pkgs/development/ocaml-modules/uucp/default.nix index d657a6f02053..020b256c72f5 100644 --- a/pkgs/development/ocaml-modules/uucp/default.nix +++ b/pkgs/development/ocaml-modules/uucp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, uchar, uutf, uunf }: +{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, uchar, uutf, uunf }: let pname = "uucp"; @@ -6,7 +6,7 @@ let webpage = "https://erratique.ch/software/${pname}"; in -assert stdenv.lib.versionAtLeast ocaml.version "4.01"; +assert lib.versionAtLeast ocaml.version "4.01"; stdenv.mkDerivation { @@ -25,7 +25,7 @@ stdenv.mkDerivation { inherit (topkg) installPhase; - meta = with stdenv.lib; { + meta = with lib; { description = "An OCaml library providing efficient access to a selection of character properties of the Unicode character database"; homepage = webpage; platforms = ocaml.meta.platforms or []; diff --git a/pkgs/development/ocaml-modules/uuidm/default.nix b/pkgs/development/ocaml-modules/uuidm/default.nix index 399f147bd0d1..b260a05505bc 100644 --- a/pkgs/development/ocaml-modules/uuidm/default.nix +++ b/pkgs/development/ocaml-modules/uuidm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, cmdliner }: +{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, cmdliner }: stdenv.mkDerivation rec { version = "0.9.7"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { inherit (topkg) buildPhase installPhase; - meta = with stdenv.lib; { + meta = with lib; { description = "An OCaml module implementing 128 bits universally unique identifiers version 3, 5 (name based with MD5, SHA-1 hashing) and 4 (random based) according to RFC 4122"; homepage = "https://erratique.ch/software/uuidm"; license = licenses.bsd3; diff --git a/pkgs/development/ocaml-modules/uunf/default.nix b/pkgs/development/ocaml-modules/uunf/default.nix index 1d0e5b2bcd94..cb95839d16c0 100644 --- a/pkgs/development/ocaml-modules/uunf/default.nix +++ b/pkgs/development/ocaml-modules/uunf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, ocaml, findlib, ocamlbuild, topkg, uchar, uutf, cmdliner, uucd }: +{ lib, stdenv, fetchurl, unzip, ocaml, findlib, ocamlbuild, topkg, uchar, uutf, cmdliner, uucd }: let pname = "uunf"; webpage = "https://erratique.ch/software/${pname}"; @@ -21,7 +21,7 @@ let }; in -assert stdenv.lib.versionAtLeast ocaml.version "4.03"; +assert lib.versionAtLeast ocaml.version "4.03"; stdenv.mkDerivation { name = "ocaml-${pname}-${version}"; @@ -50,7 +50,7 @@ stdenv.mkDerivation { inherit (topkg) buildPhase installPhase; - meta = with stdenv.lib; { + meta = with lib; { description = "An OCaml module for normalizing Unicode text"; homepage = webpage; platforms = ocaml.meta.platforms or []; diff --git a/pkgs/development/ocaml-modules/uuseg/default.nix b/pkgs/development/ocaml-modules/uuseg/default.nix index 8fb9d207576d..c083f5b68f65 100644 --- a/pkgs/development/ocaml-modules/uuseg/default.nix +++ b/pkgs/development/ocaml-modules/uuseg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, uchar, uucp, uutf, cmdliner }: +{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, uchar, uucp, uutf, cmdliner }: let pname = "uuseg"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { inherit (topkg) buildPhase installPhase; - meta = with stdenv.lib; { + meta = with lib; { description = "An OCaml library for segmenting Unicode text"; homepage = webpage; platforms = ocaml.meta.platforms or []; diff --git a/pkgs/development/ocaml-modules/uutf/default.nix b/pkgs/development/ocaml-modules/uutf/default.nix index f289781b422c..e8179e369afa 100644 --- a/pkgs/development/ocaml-modules/uutf/default.nix +++ b/pkgs/development/ocaml-modules/uutf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, cmdliner , topkg, uchar }: +{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, cmdliner , topkg, uchar }: let pname = "uutf"; webpage = "https://erratique.ch/software/${pname}"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { inherit (topkg) buildPhase installPhase; - meta = with stdenv.lib; { + meta = with lib; { description = "Non-blocking streaming Unicode codec for OCaml"; homepage = webpage; platforms = ocaml.meta.platforms or []; diff --git a/pkgs/development/ocaml-modules/variantslib/default.nix b/pkgs/development/ocaml-modules/variantslib/default.nix index ebb0857e9186..f39336a84231 100644 --- a/pkgs/development/ocaml-modules/variantslib/default.nix +++ b/pkgs/development/ocaml-modules/variantslib/default.nix @@ -1,6 +1,6 @@ -{ stdenv, buildOcaml, ocaml, fetchurl, type_conv }: +{ lib, buildOcaml, ocaml, fetchurl, type_conv }: -if stdenv.lib.versionAtLeast ocaml.version "4.06" +if lib.versionAtLeast ocaml.version "4.06" then throw "variantslib-109.15.03 is not available for OCaml ${ocaml.version}" else @@ -17,7 +17,7 @@ buildOcaml rec { propagatedBuildInputs = [ type_conv ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/janestreet/variantslib"; description = "OCaml variants as first class values"; license = licenses.asl20; diff --git a/pkgs/development/ocaml-modules/vg/default.nix b/pkgs/development/ocaml-modules/vg/default.nix index d33f03a0d347..a9a4c0d3d6b4 100644 --- a/pkgs/development/ocaml-modules/vg/default.nix +++ b/pkgs/development/ocaml-modules/vg/default.nix @@ -8,7 +8,7 @@ with lib; let - inherit (stdenv.lib) optionals versionAtLeast; + inherit (lib) optionals versionAtLeast; pname = "vg"; version = "0.9.4"; diff --git a/pkgs/development/ocaml-modules/wasm/default.nix b/pkgs/development/ocaml-modules/wasm/default.nix index 06c84531482e..c89449264889 100644 --- a/pkgs/development/ocaml-modules/wasm/default.nix +++ b/pkgs/development/ocaml-modules/wasm/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild }: +{ stdenv, lib, fetchFromGitHub, ocaml, findlib, ocamlbuild }: -if !stdenv.lib.versionAtLeast ocaml.version "4.02" +if !lib.versionAtLeast ocaml.version "4.02" then throw "wasm is not available for OCaml ${ocaml.version}" else @@ -28,8 +28,8 @@ stdenv.mkDerivation rec { meta = { description = "An executable and OCaml library to run, read and write Web Assembly (wasm) files and manipulate their AST"; - license = stdenv.lib.licenses.asl20; - maintainers = [ stdenv.lib.maintainers.vbgl ]; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.vbgl ]; homepage = "https://github.com/WebAssembly/spec/tree/master/interpreter"; inherit (ocaml.meta) platforms; }; diff --git a/pkgs/development/ocaml-modules/webbrowser/default.nix b/pkgs/development/ocaml-modules/webbrowser/default.nix index 463bfbc79f9d..896b6e49ac06 100644 --- a/pkgs/development/ocaml-modules/webbrowser/default.nix +++ b/pkgs/development/ocaml-modules/webbrowser/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg +{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, topkg , astring, bos, cmdliner, rresult }: @@ -19,8 +19,8 @@ stdenv.mkDerivation rec { 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 ]; + license = lib.licenses.isc; + maintainers = [ lib.maintainers.vbgl ]; inherit (ocaml.meta) platforms; }; } diff --git a/pkgs/development/ocaml-modules/wtf8/default.nix b/pkgs/development/ocaml-modules/wtf8/default.nix index ea09b326d393..b46386b1666f 100644 --- a/pkgs/development/ocaml-modules/wtf8/default.nix +++ b/pkgs/development/ocaml-modules/wtf8/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, buildDunePackage }: +{ lib, stdenv, fetchurl, buildDunePackage }: buildDunePackage rec { pname = "wtf8"; @@ -11,7 +11,7 @@ buildDunePackage rec { sha256 = "09ygcxxd5warkdzz17rgpidrd0pg14cy2svvnvy1hna080lzg7vp"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/flowtype/ocaml-wtf8"; description = "WTF-8 is a superset of UTF-8 that allows unpaired surrogates."; license = licenses.mit; diff --git a/pkgs/development/ocaml-modules/xml-light/default.nix b/pkgs/development/ocaml-modules/xml-light/default.nix index 82f635afb684..0ca48ebee285 100644 --- a/pkgs/development/ocaml-modules/xml-light/default.nix +++ b/pkgs/development/ocaml-modules/xml-light/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ocaml, findlib}: +{stdenv, lib, fetchurl, ocaml, findlib}: let pname = "xml-light"; version = "2.4"; @@ -36,8 +36,8 @@ stdenv.mkDerivation { library. ''; homepage = "http://tech.motion-twin.com/xmllight.html"; - license = stdenv.lib.licenses.lgpl21; - maintainers = [ stdenv.lib.maintainers.romildo ]; + license = lib.licenses.lgpl21; + maintainers = [ lib.maintainers.romildo ]; platforms = ocaml.meta.platforms or []; }; } diff --git a/pkgs/development/ocaml-modules/xmlm/default.nix b/pkgs/development/ocaml-modules/xmlm/default.nix index bb05b89d7bef..43b0bf5faa7e 100644 --- a/pkgs/development/ocaml-modules/xmlm/default.nix +++ b/pkgs/development/ocaml-modules/xmlm/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg }: +{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg }: let pname = "xmlm"; webpage = "https://erratique.ch/software/${pname}"; in -if !stdenv.lib.versionAtLeast ocaml.version "4.02" +if !lib.versionAtLeast ocaml.version "4.02" then throw "xmlm is not available for OCaml ${ocaml.version}" else @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { inherit (topkg) buildPhase installPhase; - meta = with stdenv.lib; { + meta = with lib; { description = "An OCaml streaming codec to decode and encode the XML data format"; homepage = webpage; platforms = ocaml.meta.platforms or []; diff --git a/pkgs/development/ocaml-modules/xtmpl/default.nix b/pkgs/development/ocaml-modules/xtmpl/default.nix index 31c671538a58..f1c1f15dc72d 100644 --- a/pkgs/development/ocaml-modules/xtmpl/default.nix +++ b/pkgs/development/ocaml-modules/xtmpl/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchFromGitLab, ocaml, findlib, iri, ppx_tools, js_of_ocaml +{ lib, stdenv, fetchFromGitLab, ocaml, findlib, iri, ppx_tools, js_of_ocaml , js_of_ocaml-ppx, re }: -if stdenv.lib.versionOlder ocaml.version "4.03" -|| stdenv.lib.versionAtLeast ocaml.version "4.11" +if lib.versionOlder ocaml.version "4.03" +|| lib.versionAtLeast ocaml.version "4.11" then throw "xtmpl not supported for ocaml ${ocaml.version}" else stdenv.mkDerivation rec { @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { dontStrip = true; - meta = with stdenv.lib; { + meta = with lib; { description = "XML templating library for OCaml"; homepage = "https://www.good-eris.net/xtmpl/"; license = licenses.lgpl3; diff --git a/pkgs/development/ocaml-modules/yojson/default.nix b/pkgs/development/ocaml-modules/yojson/default.nix index dca97a53cbfb..61d931a66cc2 100644 --- a/pkgs/development/ocaml-modules/yojson/default.nix +++ b/pkgs/development/ocaml-modules/yojson/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchzip, ocaml, findlib, dune, cppo, easy-format, biniou }: +{ lib, stdenv, fetchzip, ocaml, findlib, dune, cppo, easy-format, biniou }: let pname = "yojson"; param = - if stdenv.lib.versionAtLeast ocaml.version "4.02" then rec { + if lib.versionAtLeast ocaml.version "4.02" then rec { version = "1.7.0"; url = "https://github.com/ocaml-community/yojson/releases/download/${version}/yojson-${version}.tbz"; sha256 = "08llz96if8bcgnaishf18si76cv11zbkni0aldb54k3cn7ipiqvd"; @@ -34,7 +34,7 @@ stdenv.mkDerivation ({ propagatedBuildInputs = [ easy-format biniou ]; configurePlatforms = []; - meta = with stdenv.lib; { + meta = with lib; { description = "An optimized parsing and printing library for the JSON format"; homepage = "https://github.com/ocaml-community/${pname}"; license = licenses.bsd3; diff --git a/pkgs/development/ocaml-modules/zarith/default.nix b/pkgs/development/ocaml-modules/zarith/default.nix index f9996eb6af62..d937c95a9729 100644 --- a/pkgs/development/ocaml-modules/zarith/default.nix +++ b/pkgs/development/ocaml-modules/zarith/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , ocaml, findlib, pkgconfig, perl , gmp }: let source = - if stdenv.lib.versionAtLeast ocaml.version "4.02" + if lib.versionAtLeast ocaml.version "4.02" then { - version = "1.10"; - url = "https://github.com/ocaml/Zarith/archive/release-1.10.tar.gz"; - sha256 = "1qxrl0v2mk9wghc1iix3n0vfz2jbg6k5wpn1z7p02m2sqskb0zhb"; + version = "1.11"; + url = "https://github.com/ocaml/Zarith/archive/release-1.11.tar.gz"; + sha256 = "111n33flg4aq5xp5jfksqm4yyz6mzxx9ps9a4yl0dz8h189az5pr"; } else { version = "1.3"; url = "http://forge.ocamlcore.org/frs/download.php/1471/zarith-1.3.tgz"; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { preInstall = "mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/stublibs"; - meta = with stdenv.lib; { + meta = with lib; { description = "Fast, arbitrary precision OCaml integers"; homepage = "http://forge.ocamlcore.org/projects/zarith"; license = licenses.lgpl2; diff --git a/pkgs/development/ocaml-modules/zed/default.nix b/pkgs/development/ocaml-modules/zed/default.nix index 847951783ee0..a7889523bcca 100644 --- a/pkgs/development/ocaml-modules/zed/default.nix +++ b/pkgs/development/ocaml-modules/zed/default.nix @@ -1,36 +1,19 @@ -{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, camomile, react, dune, charInfo_width }: +{ lib, buildDunePackage, fetchFromGitHub, camomile, react, charInfo_width }: -let param = - if stdenv.lib.versionAtLeast ocaml.version "4.02" then - { - version = "3.1.0"; +buildDunePackage rec { + pname = "zed"; + version = "3.1.0"; + + useDune2 = true; + + src = fetchFromGitHub { + owner = "ocaml-community"; + repo = pname; + rev = version; sha256 = "04vr1a94imsghm98iigc35rhifsz0rh3qz2qm0wam2wvp6vmrx0p"; - buildInputs = [ dune ]; - propagatedBuildInputs = [ charInfo_width ]; - extra = { - buildPhase = "dune build -p zed"; - inherit (dune) installPhase; }; - } else { - version = "1.4"; - sha256 = "0d8qfy0qiydrrqi8qc9rcwgjigql6vx9gl4zp62jfz1lmjgb2a3w"; - buildInputs = [ ocamlbuild ]; - propagatedBuildInputs = [ camomile ]; - extra = { createFindlibDestdir = true; }; - } -; in - -stdenv.mkDerivation (rec { - inherit (param) version; - name = "ocaml-zed-${version}"; - - src = fetchzip { - url = "https://github.com/diml/zed/archive/${version}.tar.gz"; - inherit (param) sha256; }; - buildInputs = [ ocaml findlib ] ++ param.buildInputs; - - propagatedBuildInputs = [ react ] ++ param.propagatedBuildInputs; + propagatedBuildInputs = [ charInfo_width react ]; meta = { description = "Abstract engine for text edition in OCaml"; @@ -41,11 +24,10 @@ stdenv.mkDerivation (rec { To support efficient text edition capabilities, Zed provides macro recording and cursor management facilities. ''; - homepage = "https://github.com/diml/zed"; - license = stdenv.lib.licenses.bsd3; - platforms = ocaml.meta.platforms or []; + inherit (src.meta) homepage; + license = lib.licenses.bsd3; maintainers = [ - stdenv.lib.maintainers.gal_bolle + lib.maintainers.gal_bolle ]; }; -} // param.extra) +} diff --git a/pkgs/development/perl-modules/MNI/default.nix b/pkgs/development/perl-modules/MNI/default.nix index 7057883e6373..c0fc8f281085 100644 --- a/pkgs/development/perl-modules/MNI/default.nix +++ b/pkgs/development/perl-modules/MNI/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, buildPerlPackage, stdenv }: +{ fetchFromGitHub, buildPerlPackage, lib, stdenv }: buildPerlPackage { pname = "MNI-Perllib"; @@ -15,7 +15,7 @@ buildPerlPackage { doCheck = false; # TODO: almost all tests fail ... is this a real problem? - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/BIC-MNI/mni-perllib"; license = with licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ bcdarwin ]; diff --git a/pkgs/development/perl-modules/Percona-Toolkit/default.nix b/pkgs/development/perl-modules/Percona-Toolkit/default.nix index b2c5437e3805..85a11aaed46b 100644 --- a/pkgs/development/perl-modules/Percona-Toolkit/default.nix +++ b/pkgs/development/perl-modules/Percona-Toolkit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildPerlPackage, shortenPerlShebang +{ lib, stdenv, fetchFromGitHub, buildPerlPackage, shortenPerlShebang , DBDmysql, DBI, IOSocketSSL, TermReadKey }: @@ -23,7 +23,7 @@ buildPerlPackage rec { shortenPerlShebang $(grep -l "/bin/env perl" $out/bin/*) ''; - meta = with stdenv.lib; { + meta = with lib; { description = ''Collection of advanced command-line tools to perform a variety of MySQL and system tasks.''; homepage = "https://www.percona.com/software/database-tools/percona-toolkit"; license = with licenses; [ gpl2 ]; diff --git a/pkgs/development/perl-modules/strip-nondeterminism/default.nix b/pkgs/development/perl-modules/strip-nondeterminism/default.nix index 3557ed68cec6..80e81cad74d1 100644 --- a/pkgs/development/perl-modules/strip-nondeterminism/default.nix +++ b/pkgs/development/perl-modules/strip-nondeterminism/default.nix @@ -1,4 +1,4 @@ -{ stdenv, file, fetchFromGitLab, buildPerlPackage, ArchiveZip, ArchiveCpio, shortenPerlShebang }: +{ lib, stdenv, file, fetchFromGitLab, buildPerlPackage, ArchiveZip, ArchiveCpio, shortenPerlShebang }: buildPerlPackage rec { pname = "strip-nondeterminism"; @@ -30,7 +30,7 @@ buildPerlPackage rec { shortenPerlShebang $out/bin/strip-nondeterminism ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A Perl module for stripping bits of non-deterministic information"; homepage = "https://reproducible-builds.org/"; license = licenses.gpl3; diff --git a/pkgs/development/pharo/launcher/default.nix b/pkgs/development/pharo/launcher/default.nix index 1737fb90c7ac..45531b551761 100644 --- a/pkgs/development/pharo/launcher/default.nix +++ b/pkgs/development/pharo/launcher/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bash, pharo, unzip, makeDesktopItem }: +{ lib, stdenv, fetchurl, bash, pharo, unzip, makeDesktopItem }: stdenv.mkDerivation rec { version = "2017.02.28"; @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { test "$?" == 124 && echo "ok") ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Launcher for Pharo distributions"; homepage = "https://pharo.org"; longDescription = '' diff --git a/pkgs/development/pharo/vm/build-vm-legacy.nix b/pkgs/development/pharo/vm/build-vm-legacy.nix index 13db30eae909..d85dab861e7d 100644 --- a/pkgs/development/pharo/vm/build-vm-legacy.nix +++ b/pkgs/development/pharo/vm/build-vm-legacy.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , cmake , bash @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { ln -s "${pharo-share}/lib/"*.sources $prefix/lib/$name ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Clean and innovative Smalltalk-inspired environment"; homepage = "https://pharo.org"; longDescription = '' diff --git a/pkgs/development/pharo/vm/build-vm.nix b/pkgs/development/pharo/vm/build-vm.nix index d5469233f387..28525ac475e6 100644 --- a/pkgs/development/pharo/vm/build-vm.nix +++ b/pkgs/development/pharo/vm/build-vm.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , bash , unzip @@ -150,7 +150,7 @@ stdenv.mkDerivation rec { ln -s ${libgit2}/lib/libgit2.so* "$out/" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Clean and innovative Smalltalk-inspired environment"; homepage = "https://pharo.org"; longDescription = '' diff --git a/pkgs/development/pharo/vm/vms.nix b/pkgs/development/pharo/vm/vms.nix index 7b96b5a91398..77bc5b0682fb 100644 --- a/pkgs/development/pharo/vm/vms.nix +++ b/pkgs/development/pharo/vm/vms.nix @@ -1,4 +1,5 @@ { cmake +, lib , stdenv , fetchurl , bash diff --git a/pkgs/development/php-packages/oci8/default.nix b/pkgs/development/php-packages/oci8/default.nix index ea699c2034e8..697ad6740200 100644 --- a/pkgs/development/php-packages/oci8/default.nix +++ b/pkgs/development/php-packages/oci8/default.nix @@ -1,10 +1,8 @@ -{ buildPecl, lib, pkgs }: - +{ buildPecl, lib, pkgs, version, sha256 }: buildPecl { pname = "oci8"; - version = "2.2.0"; - sha256 = "0jhivxj1nkkza4h23z33y7xhffii60d7dr51h1czjk10qywl7pyd"; + inherit version sha256; buildInputs = [ pkgs.oracle-instantclient ]; configureFlags = [ "--with-oci8=shared,instantclient,${pkgs.oracle-instantclient.lib}/lib" ]; diff --git a/pkgs/development/php-packages/pdlib/default.nix b/pkgs/development/php-packages/pdlib/default.nix new file mode 100644 index 000000000000..830519467017 --- /dev/null +++ b/pkgs/development/php-packages/pdlib/default.nix @@ -0,0 +1,24 @@ +{ buildPecl, lib, pkgs }: +let + pname = "pdlib"; + version = "1.0.2"; +in +buildPecl { + inherit pname version; + + src = pkgs.fetchFromGitHub { + owner = "goodspb"; + repo = "pdlib"; + rev = "v${version}"; + sha256 = "0qnmqwlw5vb2rvliap4iz9val6mal4qqixcw69pwskdw5jka6v5i"; + }; + + nativeBuildInputs = [ pkgs.pkg-config ]; + buildInputs = [ (pkgs.dlib.override { guiSupport = true; }) ]; + + meta = with lib; { + description = "A PHP extension for Dlib"; + license = with licenses; [ mit ]; + maintainers = lib.teams.php.members; + }; +} diff --git a/pkgs/development/python-modules/FormEncode/default.nix b/pkgs/development/python-modules/FormEncode/default.nix index d91bef07d2ae..2b06fcdce7d2 100644 --- a/pkgs/development/python-modules/FormEncode/default.nix +++ b/pkgs/development/python-modules/FormEncode/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, dnspython, pycountry, nose, setuptools_scm, six, isPy27 }: +{ lib, stdenv, buildPythonPackage, fetchPypi, dnspython, pycountry, nose, setuptools_scm, six, isPy27 }: buildPythonPackage rec { pname = "FormEncode"; @@ -26,7 +26,7 @@ buildPythonPackage rec { sed -i 's/test_unicode_ascii_subgroup/noop/' formencode/tests/test_email.py ''; - meta = with stdenv.lib; { + meta = with lib; { description = "FormEncode validates and converts nested structures"; homepage = "http://formencode.org"; license = licenses.mit; diff --git a/pkgs/development/python-modules/HTSeq/default.nix b/pkgs/development/python-modules/HTSeq/default.nix index 83263f734bd4..178b6a7b85cd 100644 --- a/pkgs/development/python-modules/HTSeq/default.nix +++ b/pkgs/development/python-modules/HTSeq/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, cython, numpy, pysam, matplotlib, python, isPy27, isPy3k }: +{ lib, stdenv, buildPythonPackage, fetchFromGitHub, cython, numpy, pysam, matplotlib, python, isPy27, isPy3k }: buildPythonPackage rec { version = "0.12.4"; pname = "HTSeq"; @@ -19,7 +19,7 @@ buildPythonPackage rec { ${python.interpreter} python3/test/test_general.py ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://htseq.readthedocs.io/"; description = "A framework to work with high-throughput sequencing data"; maintainers = with maintainers; [ unode ]; diff --git a/pkgs/development/python-modules/IPy/default.nix b/pkgs/development/python-modules/IPy/default.nix index 332ee0fc0c13..f142c2459223 100644 --- a/pkgs/development/python-modules/IPy/default.nix +++ b/pkgs/development/python-modules/IPy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, nose }: +{ lib, stdenv, buildPythonPackage, fetchPypi, nose }: buildPythonPackage rec { pname = "IPy"; @@ -15,7 +15,7 @@ buildPythonPackage rec { nosetests -e fuzz ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Class and tools for handling of IPv4 and IPv6 addresses and networks"; homepage = "https://github.com/autocracy/python-ipy"; license = licenses.bsdOriginal; diff --git a/pkgs/development/python-modules/PyLD/default.nix b/pkgs/development/python-modules/PyLD/default.nix index 1c7bc2ff93fb..247b7f0332f5 100644 --- a/pkgs/development/python-modules/PyLD/default.nix +++ b/pkgs/development/python-modules/PyLD/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, python, requests, gnugrep }: +{ lib, stdenv, buildPythonPackage, fetchFromGitHub, python, requests, gnugrep }: let @@ -48,7 +48,7 @@ buildPythonPackage rec { ${python.interpreter} tests/runtests.py -d ${normalization}/tests ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Python implementation of the JSON-LD API"; homepage = "https://github.com/digitalbazaar/pyld"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/ROPGadget/default.nix b/pkgs/development/python-modules/ROPGadget/default.nix index c3c67194ebb7..19280bf03c2b 100644 --- a/pkgs/development/python-modules/ROPGadget/default.nix +++ b/pkgs/development/python-modules/ROPGadget/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ lib, stdenv, buildPythonPackage, fetchPypi , capstone}: buildPythonPackage rec { @@ -12,7 +12,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ capstone ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Tool to search for gadgets in binaries to facilitate ROP exploitation"; homepage = "http://shell-storm.org/project/ROPgadget/"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/Rtree/default.nix b/pkgs/development/python-modules/Rtree/default.nix index 9adfbb67e62d..82c8ced9704b 100644 --- a/pkgs/development/python-modules/Rtree/default.nix +++ b/pkgs/development/python-modules/Rtree/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, libspatialindex, numpy }: +{ lib, stdenv, buildPythonPackage, fetchPypi, libspatialindex, numpy }: buildPythonPackage rec { pname = "Rtree"; @@ -20,7 +20,7 @@ buildPythonPackage rec { doCheck = false; checkInputs = [ numpy ]; - meta = with stdenv.lib; { + meta = with lib; { description = "R-Tree spatial index for Python GIS"; homepage = "https://toblerity.org/rtree/"; license = licenses.lgpl21; diff --git a/pkgs/development/python-modules/Theano/default.nix b/pkgs/development/python-modules/Theano/default.nix index ce32e42e4716..c2dd7460b133 100644 --- a/pkgs/development/python-modules/Theano/default.nix +++ b/pkgs/development/python-modules/Theano/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , runCommandCC , fetchPypi , buildPythonPackage @@ -85,7 +85,7 @@ in buildPythonPackage rec { pythonImportsCheck = [ "theano" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://deeplearning.net/software/theano/"; description = "A Python library for large-scale array computation"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/WSME/default.nix b/pkgs/development/python-modules/WSME/default.nix index c1c6395ab25b..50e90ded7622 100644 --- a/pkgs/development/python-modules/WSME/default.nix +++ b/pkgs/development/python-modules/WSME/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, pythonAtLeast , pbr , six , simplegeneric @@ -23,6 +24,8 @@ buildPythonPackage rec { pname = "WSME"; version = "0.10.0"; + disabled = pythonAtLeast "3.9"; + src = fetchPypi { inherit pname version; sha256 = "965b9ce48161e5c50d84aedcf50dca698f05bf07e9d489201bccaec3141cd304"; diff --git a/pkgs/development/python-modules/Wand/default.nix b/pkgs/development/python-modules/Wand/default.nix index c897b04e880c..d7ad28c01336 100644 --- a/pkgs/development/python-modules/Wand/default.nix +++ b/pkgs/development/python-modules/Wand/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , imagemagick7Big @@ -24,7 +24,7 @@ buildPythonPackage rec { passthru.imagemagick = imagemagick7Big; - meta = with stdenv.lib; { + meta = with lib; { description = "Ctypes-based simple MagickWand API binding for Python"; homepage = "http://wand-py.org/"; license = [ licenses.mit ]; diff --git a/pkgs/development/python-modules/WazeRouteCalculator/default.nix b/pkgs/development/python-modules/WazeRouteCalculator/default.nix index 02519e9dc66b..28515e6f6028 100644 --- a/pkgs/development/python-modules/WazeRouteCalculator/default.nix +++ b/pkgs/development/python-modules/WazeRouteCalculator/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ lib, stdenv, buildPythonPackage, fetchPypi , requests }: buildPythonPackage rec { @@ -15,7 +15,7 @@ buildPythonPackage rec { # there are no tests doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Calculate actual route time and distance with Waze API"; homepage = "https://github.com/kovacsbalu/WazeRouteCalculator"; license = licenses.gpl3; diff --git a/pkgs/development/python-modules/aadict/default.nix b/pkgs/development/python-modules/aadict/default.nix index 2587260748f0..cf6976fa6c1e 100644 --- a/pkgs/development/python-modules/aadict/default.nix +++ b/pkgs/development/python-modules/aadict/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , six @@ -18,7 +18,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six ]; checkInputs = [ nose coverage ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/metagriffin/aadict"; description = "An auto-attribute dict (and a couple of other useful dict functions)."; maintainers = with maintainers; [ glittershark ]; diff --git a/pkgs/development/python-modules/aafigure/default.nix b/pkgs/development/python-modules/aafigure/default.nix index ed07a60e0a89..5350443eeaab 100644 --- a/pkgs/development/python-modules/aafigure/default.nix +++ b/pkgs/development/python-modules/aafigure/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, pillow }: +{ lib, stdenv, buildPythonPackage, fetchPypi, pillow }: buildPythonPackage rec { pname = "aafigure"; @@ -21,7 +21,7 @@ buildPythonPackage rec { sed -i "s|/usr/share/fonts|/nonexisting-fonts-path|" aafigure/PILhelper.py ''; - meta = with stdenv.lib; { + meta = with lib; { description = "ASCII art to image converter"; homepage = "https://launchpad.net/aafigure/"; license = licenses.bsd2; diff --git a/pkgs/development/python-modules/abodepy/default.nix b/pkgs/development/python-modules/abodepy/default.nix index eb0de74e7911..e6ad75eb3896 100644 --- a/pkgs/development/python-modules/abodepy/default.nix +++ b/pkgs/development/python-modules/abodepy/default.nix @@ -3,7 +3,7 @@ buildPythonPackage rec { pname = "abodepy"; - version = "1.2.0"; + version = "1.2.1"; disabled = !isPy3k; @@ -11,7 +11,7 @@ buildPythonPackage rec { owner = "MisterWil"; repo = pname; rev = "v${version}"; - sha256 = "0m2cm90yy7fq7yrjyd999m48gqri65ifi7f6hc0s3pv2hfj89yj0"; + sha256 = "0n8gczsml6y6anin1zi8j33sjk1bv9ka02zxpksn2fi1v1h0smap"; }; propagatedBuildInputs = [ colorlog lomond requests ]; diff --git a/pkgs/development/python-modules/acebinf/default.nix b/pkgs/development/python-modules/acebinf/default.nix index 78810de1740d..f8134aaf5b31 100644 --- a/pkgs/development/python-modules/acebinf/default.nix +++ b/pkgs/development/python-modules/acebinf/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , pyvcf @@ -19,7 +19,7 @@ buildPythonPackage rec { doCheck = false; pythonImportsCheck = [ "acebinf" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/ACEnglish/acebinf"; description = "Collection of simple utilities used when building bioinformatics tools"; license = licenses.unlicense; diff --git a/pkgs/development/python-modules/acme-tiny/default.nix b/pkgs/development/python-modules/acme-tiny/default.nix index b9bc11a34c72..75408244e66a 100644 --- a/pkgs/development/python-modules/acme-tiny/default.nix +++ b/pkgs/development/python-modules/acme-tiny/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, setuptools_scm, fusepy, fuse +{ lib, stdenv, buildPythonPackage, fetchPypi, setuptools_scm, fusepy, fuse , openssl }: buildPythonPackage rec { @@ -22,7 +22,7 @@ buildPythonPackage rec { doCheck = false; # seems to hang, not sure - meta = with stdenv.lib; { + meta = with lib; { description = "A tiny script to issue and renew TLS certs from Let's Encrypt"; homepage = "https://github.com/diafygi/acme-tiny"; license = licenses.mit; diff --git a/pkgs/development/python-modules/actdiag/default.nix b/pkgs/development/python-modules/actdiag/default.nix index 84aef2dfb03d..ca47018f56f4 100644 --- a/pkgs/development/python-modules/actdiag/default.nix +++ b/pkgs/development/python-modules/actdiag/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ lib, stdenv, buildPythonPackage, fetchPypi , nose, docutils, blockdiag, reportlab }: buildPythonPackage rec { @@ -14,7 +14,7 @@ buildPythonPackage rec { checkInputs = [ nose reportlab ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Generate activity-diagram image from spec-text file (similar to Graphviz)"; homepage = "http://blockdiag.com/"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/adal/default.nix b/pkgs/development/python-modules/adal/default.nix index 0df7247986d0..f7e973c8f693 100644 --- a/pkgs/development/python-modules/adal/default.nix +++ b/pkgs/development/python-modules/adal/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ lib, stdenv, buildPythonPackage, fetchPypi , requests, pyjwt, dateutil }: buildPythonPackage rec { @@ -12,7 +12,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests pyjwt dateutil ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Library to make it easy for python application to authenticate to Azure Active Directory (AAD) in order to access AAD protected web resources"; homepage = "https://github.com/AzureAD/azure-activedirectory-library-for-python"; license = licenses.mit; diff --git a/pkgs/development/python-modules/adblock/default.nix b/pkgs/development/python-modules/adblock/default.nix new file mode 100644 index 000000000000..de6d72a61ecf --- /dev/null +++ b/pkgs/development/python-modules/adblock/default.nix @@ -0,0 +1,63 @@ +{ stdenv +, lib +, rustPlatform +, fetchFromGitHub +, pipInstallHook +, pythonImportsCheckHook +, maturin +, pkg-config +, openssl +, publicsuffix-list +, isPy27 +, CoreFoundation +, Security +}: + +rustPlatform.buildRustPackage rec { + pname = "adblock"; + version = "0.4.0"; + disabled = isPy27; + + # Pypi only has binary releases + src = fetchFromGitHub { + owner = "ArniDagur"; + repo = "python-adblock"; + rev = version; + sha256 = "10d6ks2fyzbizq3kb69q478idj0h86k6ygjb6wl3zq3mf65ma4zg"; + }; + format = "pyproject"; + + cargoSha256 = "0di05j942rrm2crpdpp9czhh65fmidyrvdp2n3pipgnagy7nchc0"; + + nativeBuildInputs = [ pipInstallHook maturin pkg-config pythonImportsCheckHook ]; + + buildInputs = [ openssl ] + ++ lib.optionals stdenv.isDarwin [ CoreFoundation Security ]; + + PSL_PATH = "${publicsuffix-list}/share/publicsuffix/public_suffix_list.dat"; + + buildPhase = '' + runHook preBuild + maturin build --release --manylinux off --strip + runHook postBuild + ''; + + # There are no rust tests + doCheck = false; + pythonImportsCheck = [ "adblock" ]; + + installPhase = '' + runHook preInstall + install -Dm644 -t dist target/wheels/*.whl + pipInstallPhase + runHook postInstall + ''; + + passthru.meta = with lib; { + description = "Python wrapper for Brave's adblocking library, which is written in Rust"; + homepage = "https://github.com/ArniDagur/python-adblock/"; + maintainers = with maintainers; [ petabyteboy ]; + license = with licenses; [ asl20 mit ]; + platforms = with platforms; [ all ]; + }; +} diff --git a/pkgs/development/python-modules/advantage-air/default.nix b/pkgs/development/python-modules/advantage-air/default.nix new file mode 100644 index 000000000000..4d6d91c5716d --- /dev/null +++ b/pkgs/development/python-modules/advantage-air/default.nix @@ -0,0 +1,26 @@ +{ aiohttp, buildPythonPackage, fetchPypi, lib, pythonOlder }: + +buildPythonPackage rec { + pname = "advantage_air"; + version = "0.2.2"; + + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit version pname; + sha256 = "04q2sjw9r50c00m4sfv98w9cwmmr970830c97m32p5j8ijb10j5x"; + }; + + propagatedBuildInputs = [ aiohttp ]; + + # No tests + doCheck = false; + pythonImportsCheck = [ "advantage_air" ]; + + meta = with lib; { + description = "API helper for Advantage Air's MyAir and e-zone API"; + homepage = "https://github.com/Bre77/advantage_air"; + license = licenses.mit; + maintainers = with maintainers; [ jamiemagee ]; + }; +} diff --git a/pkgs/development/python-modules/afdko/default.nix b/pkgs/development/python-modules/afdko/default.nix index 6371fa804bb0..4df6c5f6c493 100644 --- a/pkgs/development/python-modules/afdko/default.nix +++ b/pkgs/development/python-modules/afdko/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, fetchpatch, pythonOlder, python +{ lib, stdenv, buildPythonPackage, fetchPypi, fetchpatch, pythonOlder, python , fonttools, defcon, lxml, fs, unicodedata2, zopfli, brotlipy, fontpens , brotli, fontmath, mutatormath, booleanoperations , ufoprocessor, ufonormalizer, psautohint, tqdm @@ -65,7 +65,7 @@ buildPythonPackage rec { "test_options" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Adobe Font Development Kit for OpenType"; homepage = "https://adobe-type-tools.github.io/afdko/"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/agate-dbf/default.nix b/pkgs/development/python-modules/agate-dbf/default.nix index 09556ea891b3..099fb1701cb4 100644 --- a/pkgs/development/python-modules/agate-dbf/default.nix +++ b/pkgs/development/python-modules/agate-dbf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage, agate, dbf, dbfread }: +{ lib, stdenv, fetchPypi, buildPythonPackage, agate, dbf, dbfread }: buildPythonPackage rec { pname = "agate-dbf"; @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "589682b78c5c03f2dc8511e6e3edb659fb7336cd118e248896bb0b44c2f1917b"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Adds read support for dbf files to agate"; homepage = "https://github.com/wireservice/agate-dbf"; license = with licenses; [ mit ]; diff --git a/pkgs/development/python-modules/agate-sql/default.nix b/pkgs/development/python-modules/agate-sql/default.nix index 08516d05f002..566951ea71d1 100644 --- a/pkgs/development/python-modules/agate-sql/default.nix +++ b/pkgs/development/python-modules/agate-sql/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage, agate, sqlalchemy, crate }: +{ lib, stdenv, fetchPypi, buildPythonPackage, agate, sqlalchemy, crate }: buildPythonPackage rec { pname = "agate-sql"; @@ -11,7 +11,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ agate sqlalchemy crate ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Adds SQL read/write support to agate."; homepage = "https://github.com/wireservice/agate-sql"; license = with licenses; [ mit ]; diff --git a/pkgs/development/python-modules/aiobotocore/default.nix b/pkgs/development/python-modules/aiobotocore/default.nix new file mode 100644 index 000000000000..308219865393 --- /dev/null +++ b/pkgs/development/python-modules/aiobotocore/default.nix @@ -0,0 +1,42 @@ +{ lib +, stdenv +, buildPythonPackage +, fetchPypi +, pythonOlder +, pytestrunner +, typing-extensions +, wrapt +, aioitertools +, aiohttp +, botocore +}: + +buildPythonPackage rec { + pname = "aiobotocore"; + version = "1.1.2"; + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "1fn9hgcg3qr9f7srjxc21bzkiix4al9308531slwlm99r0x3xcjl"; + }; + + # relax version constraints: aiobotocore works with newer botocore versions + # the pinning used to match some `extras_require` we're not using. + preConfigure = '' + substituteInPlace setup.py --replace 'botocore>=1.17.44,<1.17.45' 'botocore' + ''; + + propagatedBuildInputs = [ wrapt aiohttp aioitertools botocore ]; + + # tests not distributed on pypi + doCheck = false; + pythonImportsCheck = [ "aiobotocore" ]; + + meta = with lib; { + description = "Async client for amazon services using botocore and aiohttp/asyncio."; + license = licenses.asl20; + homepage = "https://github.com/aio-libs/aiobotocore"; + maintainers = with maintainers; [ teh ]; + }; +} diff --git a/pkgs/development/python-modules/aiodns/default.nix b/pkgs/development/python-modules/aiodns/default.nix index 694f92577cbb..e1130331365c 100644 --- a/pkgs/development/python-modules/aiodns/default.nix +++ b/pkgs/development/python-modules/aiodns/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, pythonOlder +{ lib, stdenv, buildPythonPackage, fetchPypi, pythonOlder , isPy27, isPyPy, python, pycares, typing, trollius }: buildPythonPackage rec { @@ -21,7 +21,7 @@ buildPythonPackage rec { # 'Could not contact DNS servers' doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/saghul/aiodns"; license = licenses.mit; description = "Simple DNS resolver for asyncio"; diff --git a/pkgs/development/python-modules/aioeventlet/default.nix b/pkgs/development/python-modules/aioeventlet/default.nix index 0582a59eae87..4bdd2b1327cd 100644 --- a/pkgs/development/python-modules/aioeventlet/default.nix +++ b/pkgs/development/python-modules/aioeventlet/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , eventlet @@ -26,7 +26,7 @@ buildPythonPackage rec { ${python.interpreter} runtests.py ''; - meta = with stdenv.lib; { + meta = with lib; { description = "aioeventlet implements the asyncio API (PEP 3156) on top of eventlet. It makes"; homepage = "https://pypi.org/project/aioeventlet/"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/aioguardian/default.nix b/pkgs/development/python-modules/aioguardian/default.nix new file mode 100644 index 000000000000..f6822ede08cd --- /dev/null +++ b/pkgs/development/python-modules/aioguardian/default.nix @@ -0,0 +1,62 @@ +{ lib +, aiohttp +, async-timeout +, asyncio-dgram +, asynctest +, buildPythonPackage +, cryptography +, fetchFromGitHub +, poetry +, pytest-aiohttp +, pytest-asyncio +, pytestCheckHook +, pythonAtLeast +, voluptuous +}: + +buildPythonPackage rec { + pname = "aioguardian"; + version = "1.0.4"; + disabled = pythonAtLeast "3.9"; + + src = fetchFromGitHub { + owner = "bachya"; + repo = pname; + rev = version; + sha256 = "1cbxcsxh9c8r2zx3lsjdns26sm2qmlwnqgah2sfzbgp1lay23vvq"; + }; + + format = "pyproject"; + + nativeBuildInputs = [ poetry ]; + + propagatedBuildInputs = [ + aiohttp + async-timeout + asyncio-dgram + voluptuous + ]; + + checkInputs = [ + asyncio-dgram + asynctest + pytest-aiohttp + pytest-asyncio + pytestCheckHook + ]; + + # Ignore the examples as they are prefixed with test_ + pytestFlagsArray = [ "--ignore examples/" ]; + pythonImportsCheck = [ "aioguardian" ]; + + meta = with lib; { + description = " Python library to interact with Elexa Guardian devices"; + longDescription = '' + aioguardian is a Pytho3, asyncio-focused library for interacting with the + Guardian line of water valves and sensors from Elexa. + ''; + homepage = "https://github.com/bachya/aioguardian"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/aioimaplib/default.nix b/pkgs/development/python-modules/aioimaplib/default.nix index e3f046e10fc8..6345755bffc7 100644 --- a/pkgs/development/python-modules/aioimaplib/default.nix +++ b/pkgs/development/python-modules/aioimaplib/default.nix @@ -1,24 +1,45 @@ -{ lib, buildPythonPackage, fetchFromGitHub, isPy3k, pythonOlder, isPy36 -, nose, asynctest, mock, pytz, tzlocal, imaplib2, docutils, pyopenssl }: +{ lib +, asynctest +, buildPythonPackage +, docutils +, fetchFromGitHub +, imaplib2 +, mock +, nose +, pyopenssl +, pytestCheckHook +, pythonOlder +, pytz +, tzlocal +}: buildPythonPackage rec { pname = "aioimaplib"; - version = "0.7.15"; + version = "0.7.18"; - # PyPI tarball doesn't ship tests src = fetchFromGitHub { owner = "bamthomas"; repo = pname; rev = version; - sha256 = "15nny3y8pwaizq1zmkg43ym5jszk2hs010z12yn2d0j1fibymwbj"; + sha256 = "037fxwmkdfb95cqcykrhn37p138wg9pvlsgdf45vyn1mhz5crky5"; }; - disabled = !(isPy3k && pythonOlder "3.7"); + checkInputs = [ + asynctest + docutils + imaplib2 + mock + nose + pyopenssl + pytestCheckHook + pytz + tzlocal + ]; - checkInputs = [ nose asynctest mock pytz tzlocal imaplib2 docutils pyopenssl ]; - - # https://github.com/bamthomas/aioimaplib/issues/35 - doCheck = !isPy36; + # Project is using asynctest with doesn't work with Python 3.8 and above + # https://github.com/bamthomas/aioimaplib/issues/54 + doCheck = pythonOlder "3.8"; + pythonImportsCheck = [ "aioimaplib" ]; meta = with lib; { description = "Python asyncio IMAP4rev1 client library"; diff --git a/pkgs/development/python-modules/aioitertools/default.nix b/pkgs/development/python-modules/aioitertools/default.nix new file mode 100644 index 000000000000..1c5ce1e2faeb --- /dev/null +++ b/pkgs/development/python-modules/aioitertools/default.nix @@ -0,0 +1,35 @@ +{ lib +, stdenv +, buildPythonPackage +, fetchPypi +, pythonOlder +, typing-extensions +, coverage +, python +, toml +}: + +buildPythonPackage rec { + pname = "aioitertools"; + version = "0.7.1"; + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "18ql6k2j1839jf2rmmmm29v6fb7mr59l75z8nlf0sadmydy6r9al"; + }; + + propagatedBuildInputs = [ typing-extensions ]; + checkInputs = [ coverage toml ]; + + checkPhase = '' + ${python.interpreter} -m coverage run -m aioitertools.tests + ''; + + meta = with lib; { + description = "Implementation of itertools, builtins, and more for AsyncIO and mixed-type iterables."; + license = licenses.mit; + homepage = "https://pypi.org/project/aioitertools/"; + maintainers = with maintainers; [ teh ]; + }; +} diff --git a/pkgs/development/python-modules/aiokef/default.nix b/pkgs/development/python-modules/aiokef/default.nix new file mode 100644 index 000000000000..c153ff37d8c2 --- /dev/null +++ b/pkgs/development/python-modules/aiokef/default.nix @@ -0,0 +1,44 @@ +{ lib +, async-timeout +, buildPythonPackage +, fetchFromGitHub +, pytest-cov +, pytestCheckHook +, pytest-mypy +, pythonOlder +, tenacity +}: + +buildPythonPackage rec { + pname = "aiokef"; + version = "0.2.17"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "basnijholt"; + repo = pname; + rev = "v${version}"; + sha256 = "0ms0dwrpj80w55svcppbnp7vyl5ipnjfp1c436k5c7pph4q5pxk9"; + }; + + propagatedBuildInputs = [ + async-timeout + tenacity + ]; + + checkInputs = [ + pytest-cov + pytest-mypy + pytestCheckHook + ]; + + pytestFlagsArray = [ "tests" ]; + pythonImportsCheck = [ "aiokef" ]; + + meta = with lib; { + description = "Python API for KEF speakers"; + homepage = "https://github.com/basnijholt/aiokef"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/aiomultiprocess/default.nix b/pkgs/development/python-modules/aiomultiprocess/default.nix new file mode 100644 index 000000000000..9b648d595379 --- /dev/null +++ b/pkgs/development/python-modules/aiomultiprocess/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "aiomultiprocess"; + version = "0.8.0"; + + src = fetchFromGitHub { + owner = "omnilib"; + repo = pname; + rev = "v${version}"; + sha256 = "0vkj1vgvlv828pi3sn0hjzdy9f0j63gljs2ylibbsaixa7mbkpvy"; + }; + + checkInputs = [ pytestCheckHook ]; + + pytestFlagsArray = [ "aiomultiprocess/tests/*.py" ]; + pythonImportsCheck = [ "aiomultiprocess" ]; + + meta = with lib; { + description = "Python module to improve performance"; + longDescription = '' + aiomultiprocess presents a simple interface, while running a full + AsyncIO event loop on each child process, enabling levels of + concurrency never before seen in a Python application. Each child + process can execute multiple coroutines at once, limited only by + the workload and number of cores available. + ''; + homepage = "https://github.com/omnilib/aiomultiprocess"; + license = with licenses; [ mit ]; + maintainers = [ maintainers.fab ]; + }; +} diff --git a/pkgs/development/python-modules/aiopulse/default.nix b/pkgs/development/python-modules/aiopulse/default.nix new file mode 100644 index 000000000000..3df005d17907 --- /dev/null +++ b/pkgs/development/python-modules/aiopulse/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchPypi +, async-timeout +}: + +buildPythonPackage rec { + pname = "aiopulse"; + version = "0.4.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "0fnscm27l77c8cd7jhbn35axyalq61kksy3fcqzv21fz55lklsm0"; + }; + + propagatedBuildInputs = [ + async-timeout + ]; + + # tests are not present + doCheck = false; + + pythonImportsCheck = [ "aiopulse" ]; + + meta = with lib; { + description = "Python Rollease Acmeda Automate Pulse hub protocol implementation"; + longDescription = '' + The Rollease Acmeda Pulse Hub is a WiFi hub that communicates with + Rollease Acmeda Automate roller blinds via a proprietary RF protocol. + This module communicates over a local area network using a propriatery + binary protocol to issues commands to the Pulse Hub. + ''; + homepage = "https://github.com/atmurray/aiopulse"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/aioredis/default.nix b/pkgs/development/python-modules/aioredis/default.nix index a199878fc216..2e59168157be 100644 --- a/pkgs/development/python-modules/aioredis/default.nix +++ b/pkgs/development/python-modules/aioredis/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ lib, stdenv, buildPythonPackage, fetchPypi , pkgs, async-timeout, hiredis, isPyPy, isPy27 }: @@ -20,7 +20,7 @@ buildPythonPackage rec { # Wants to run redis-server, hardcoded FHS paths, too much trouble. doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Asyncio (PEP 3156) Redis client library"; homepage = "https://github.com/aio-libs/aioredis"; license = licenses.mit; diff --git a/pkgs/development/python-modules/aiosqlite/default.nix b/pkgs/development/python-modules/aiosqlite/default.nix index e616a5363477..44cae12cba52 100644 --- a/pkgs/development/python-modules/aiosqlite/default.nix +++ b/pkgs/development/python-modules/aiosqlite/default.nix @@ -1,32 +1,31 @@ { lib -, buildPythonPackage -, fetchFromGitHub -, setuptools , aiounittest +, buildPythonPackage +, fetchPypi , isPy27 -, pytest +, pytestCheckHook +, typing-extensions }: buildPythonPackage rec { pname = "aiosqlite"; - version = "0.12.0"; + version = "0.16.0"; disabled = isPy27; - src = fetchFromGitHub { - owner = "jreese"; - repo = pname; - rev = "v${version}"; - sha256 = "090vdv210zfry0bms5b3lmm06yhiyjb8ga96996cqs611l7c2a2j"; + src = fetchPypi { + inherit pname version; + sha256 = "1a0fjmlvadyzsml10g5p1qif7192k0swy5zwjp8v48y5zc3yy56h"; }; - buildInputs = [ - setuptools - ]; - checkInputs = [ aiounittest + pytestCheckHook + typing-extensions ]; + # tests are not pick-up automatically by the hook + pytestFlagsArray = [ "aiosqlite/tests/*.py" ]; + meta = with lib; { description = "Asyncio bridge to the standard sqlite3 module"; homepage = "https://github.com/jreese/aiosqlite"; diff --git a/pkgs/development/python-modules/aiostream/default.nix b/pkgs/development/python-modules/aiostream/default.nix new file mode 100644 index 000000000000..a48e2ae02401 --- /dev/null +++ b/pkgs/development/python-modules/aiostream/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, pytestCheckHook +, pytestcov +, pytest-asyncio +}: + +buildPythonPackage rec { + pname = "aiostream"; + version = "0.4.1"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "vxgmichel"; + repo = pname; + rev = "v${version}"; + sha256 = "1wwnjrzkd61k3arxzk7yhg7cc1099bcwr5kz5n91ai6ma5ln139s"; + }; + + checkInputs = [ pytestCheckHook pytestcov pytest-asyncio ]; + + meta = with lib; { + description = "Generator-based operators for asynchronous iteration"; + homepage = "https://aiostream.readthedocs.io"; + license = licenses.gpl3Only; + maintainers = [ maintainers.rmcgibbo ]; + }; +} diff --git a/pkgs/development/python-modules/aiowinreg/default.nix b/pkgs/development/python-modules/aiowinreg/default.nix new file mode 100644 index 000000000000..c6375b21efe7 --- /dev/null +++ b/pkgs/development/python-modules/aiowinreg/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +}: + +buildPythonPackage rec { + pname = "aiowinreg"; + version = "0.0.3"; + + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "0gxhx9m45yyr1rmgs7f1jchkgxk2zipk9g3s5ix90d267in8hsn9"; + }; + + # Project doesn't have tests + doCheck = false; + pythonImportsCheck = [ "aiowinreg" ]; + + meta = with lib; { + description = "Python module to parse the registry hive"; + homepage = "https://github.com/skelsec/aiowinreg"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/aiozeroconf/default.nix b/pkgs/development/python-modules/aiozeroconf/default.nix index b89ba73b0d64..d73ae2b35dfb 100644 --- a/pkgs/development/python-modules/aiozeroconf/default.nix +++ b/pkgs/development/python-modules/aiozeroconf/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , netifaces @@ -17,7 +17,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ netifaces ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A pure python implementation of multicast DNS service discovery"; homepage = "https://github.com/jstasiak/python-zeroconf"; license = licenses.lgpl21; diff --git a/pkgs/development/python-modules/airly/default.nix b/pkgs/development/python-modules/airly/default.nix new file mode 100644 index 000000000000..e75653fb684a --- /dev/null +++ b/pkgs/development/python-modules/airly/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, aiohttp +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "airly"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "ak-ambi"; + repo = "python-airly"; + rev = "v${version}"; + sha256 = "0an6nbl0i5pahxm6x4z03s9apzgqrw9zf7srjcs0r3y1ppicb4s6"; + }; + + propagatedBuildInputs = [ aiohttp ]; + + checkInputs = [ pytestCheckHook ]; + + disabledTests = [ + "InstallationsLoaderTestCase" + "MeasurementsSessionTestCase" + ]; + pythonImportsCheck = [ "airly" ]; + + meta = with lib; { + description = "Python module for getting air quality data from Airly sensors"; + homepage = "https://github.com/ak-ambi/python-airly"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/ajpy/default.nix b/pkgs/development/python-modules/ajpy/default.nix index 5f42646dd998..0dd135e139fd 100644 --- a/pkgs/development/python-modules/ajpy/default.nix +++ b/pkgs/development/python-modules/ajpy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi }: +{ lib, stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "ajpy"; @@ -12,7 +12,7 @@ buildPythonPackage rec { # ajpy doesn't have tests doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "AJP package crafting library"; homepage = "https://github.com/hypn0s/AJPy/"; license = licenses.lgpl2; diff --git a/pkgs/development/python-modules/alabaster/default.nix b/pkgs/development/python-modules/alabaster/default.nix index d54741b63ea2..b4cc69e555bc 100644 --- a/pkgs/development/python-modules/alabaster/default.nix +++ b/pkgs/development/python-modules/alabaster/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ lib, stdenv, buildPythonPackage, fetchPypi , pygments }: buildPythonPackage rec { @@ -15,7 +15,7 @@ buildPythonPackage rec { # No tests included doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/bitprophet/alabaster"; description = "A Sphinx theme"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/alarmdecoder/default.nix b/pkgs/development/python-modules/alarmdecoder/default.nix index ef8b74bb9d71..b563a80447f2 100644 --- a/pkgs/development/python-modules/alarmdecoder/default.nix +++ b/pkgs/development/python-modules/alarmdecoder/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, pyserial, pyftdi, pyusb +{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pyserial, pyftdi, pyusb , pyopenssl, nose, isPy3k, pythonOlder, mock }: buildPythonPackage rec { @@ -19,7 +19,7 @@ buildPythonPackage rec { checkInputs = [ nose mock ]; pythonImportsCheck = [ "alarmdecoder" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/nutechsoftware/alarmdecoder"; description = "Python interface for the Alarm Decoder (AD2) family of alarm devices. (AD2USB, AD2SERIAL and AD2PI)"; diff --git a/pkgs/development/python-modules/alembic/default.nix b/pkgs/development/python-modules/alembic/default.nix index 4061dca8aa28..142c6d1c416c 100644 --- a/pkgs/development/python-modules/alembic/default.nix +++ b/pkgs/development/python-modules/alembic/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ lib, stdenv, buildPythonPackage, fetchPypi , pytest, pytestcov, mock, coverage, setuptools , Mako, sqlalchemy, python-editor, dateutil }: @@ -18,7 +18,7 @@ buildPythonPackage rec { # no traditional test suite doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://bitbucket.org/zzzeek/alembic"; description = "A database migration tool for SQLAlchemy"; license = licenses.mit; diff --git a/pkgs/development/python-modules/alerta-server/default.nix b/pkgs/development/python-modules/alerta-server/default.nix index f8a3b9684805..ce1e702a7bac 100644 --- a/pkgs/development/python-modules/alerta-server/default.nix +++ b/pkgs/development/python-modules/alerta-server/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, pythonOlder +{ lib, stdenv, buildPythonPackage, fetchPypi, pythonOlder , bcrypt, blinker, flask, flask-compress, flask-cors, mohawk, psycopg2, pyjwt, pymongo, python-dateutil, pytz, pyyaml, requests, requests-hawk, sentry-sdk }: @@ -37,7 +37,7 @@ buildPythonPackage rec { disabled = pythonOlder "3.5"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://alerta.io"; description = "Alerta Monitoring System server"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/alerta/default.nix b/pkgs/development/python-modules/alerta/default.nix index c8007566328a..19dd17ee3f02 100644 --- a/pkgs/development/python-modules/alerta/default.nix +++ b/pkgs/development/python-modules/alerta/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ lib, stdenv, buildPythonPackage, fetchPypi , six, click, requests, requests-hawk, pytz, tabulate, pythonOlder }: @@ -21,7 +21,7 @@ buildPythonPackage rec { disabled = pythonOlder "3.5"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://alerta.io"; description = "Alerta Monitoring System command-line interface"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/alot/default.nix b/pkgs/development/python-modules/alot/default.nix index c3b624a7bced..21c6aaff2fbc 100644 --- a/pkgs/development/python-modules/alot/default.nix +++ b/pkgs/development/python-modules/alot/default.nix @@ -60,7 +60,7 @@ buildPythonPackage rec { sed "s,/usr/bin,$out/bin,g" extra/alot.desktop > $out/share/applications/alot.desktop ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/pazz/alot"; description = "Terminal MUA using notmuch mail"; license = licenses.gpl3; diff --git a/pkgs/development/python-modules/altair/default.nix b/pkgs/development/python-modules/altair/default.nix index f5076953bf20..018ac7ddf501 100644 --- a/pkgs/development/python-modules/altair/default.nix +++ b/pkgs/development/python-modules/altair/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy27 +{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27 , entrypoints , glibcLocales , ipython @@ -52,7 +52,7 @@ buildPythonPackage rec { pytest --doctest-modules altair ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A declarative statistical visualization library for Python."; homepage = "https://github.com/altair-viz/altair"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/amazon_kclpy/default.nix b/pkgs/development/python-modules/amazon_kclpy/default.nix index bfce45ae206c..ed266c0db788 100644 --- a/pkgs/development/python-modules/amazon_kclpy/default.nix +++ b/pkgs/development/python-modules/amazon_kclpy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, python, mock, boto, pytest }: +{ lib, stdenv, buildPythonPackage, fetchFromGitHub, python, mock, boto, pytest }: buildPythonPackage rec { pname = "amazon_kclpy"; @@ -25,7 +25,7 @@ buildPythonPackage rec { ${python.interpreter} -m pytest ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Amazon Kinesis Client Library for Python"; homepage = "https://github.com/awslabs/amazon-kinesis-client-python"; license = licenses.amazonsl; diff --git a/pkgs/development/python-modules/ambiclimate/default.nix b/pkgs/development/python-modules/ambiclimate/default.nix new file mode 100644 index 000000000000..e375d347f2aa --- /dev/null +++ b/pkgs/development/python-modules/ambiclimate/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchPypi +, aiohttp +, async-timeout +}: + +buildPythonPackage rec { + pname = "ambiclimate"; + version = "0.2.1"; + + src = fetchPypi { + pname = "Ambiclimate"; + inherit version; + sha256 = "0vhmpazc2n7qyyh7wqsz635w0f8afk2i5d592ikb84bgnfn83483"; + }; + + propagatedBuildInputs = [ + aiohttp + async-timeout + ]; + + # tests are not present + doCheck = false; + + pythonImportsCheck = [ "ambiclimate" ]; + + meta = with lib; { + description = "Python library to communicate with ambiclimate"; + homepage = "https://github.com/Danielhiversen/pyAmbiclimate"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/amply/default.nix b/pkgs/development/python-modules/amply/default.nix index 1962d004f41b..32bcbb4589ab 100644 --- a/pkgs/development/python-modules/amply/default.nix +++ b/pkgs/development/python-modules/amply/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchPypi , buildPythonPackage , setuptools_scm @@ -25,7 +25,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "amply" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/willu47/amply"; description = '' Allows you to load and manipulate AMPL/GLPK data as Python data structures diff --git a/pkgs/development/python-modules/amqp/default.nix b/pkgs/development/python-modules/amqp/default.nix index 12dc1eca2a31..75a4f8d6e120 100644 --- a/pkgs/development/python-modules/amqp/default.nix +++ b/pkgs/development/python-modules/amqp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, pytestCheckHook, case, vine }: +{ lib, stdenv, buildPythonPackage, fetchPypi, pytestCheckHook, case, vine }: buildPythonPackage rec { pname = "amqp"; @@ -16,7 +16,7 @@ buildPythonPackage rec { "test_rmq.py" # requires network access ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/celery/py-amqp"; description = "Python client for the Advanced Message Queuing Procotol (AMQP). This is a fork of amqplib which is maintained by the Celery project"; license = licenses.lgpl21; diff --git a/pkgs/development/python-modules/amqplib/default.nix b/pkgs/development/python-modules/amqplib/default.nix index a3e11271ade2..c7b4dc865bb8 100644 --- a/pkgs/development/python-modules/amqplib/default.nix +++ b/pkgs/development/python-modules/amqplib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, python }: +{ lib, stdenv, buildPythonPackage, fetchPypi, python }: buildPythonPackage rec { pname = "amqplib"; @@ -17,7 +17,7 @@ buildPythonPackage rec { ${python.interpreter} tests/client_0_8/run_all.py ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/barryp/py-amqplib"; description = "Python client for the Advanced Message Queuing Procotol (AMQP)"; license = licenses.lgpl21; diff --git a/pkgs/development/python-modules/aniso8601/default.nix b/pkgs/development/python-modules/aniso8601/default.nix index 97e79e4e8eb7..c6c05283f280 100644 --- a/pkgs/development/python-modules/aniso8601/default.nix +++ b/pkgs/development/python-modules/aniso8601/default.nix @@ -1,11 +1,11 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ lib, stdenv, buildPythonPackage, fetchPypi , dateutil, mock, isPy3k }: buildPythonPackage rec { pname = "aniso8601"; version = "8.1.0"; - meta = with stdenv.lib; { + meta = with lib; { description = "Parses ISO 8601 strings."; homepage = "https://bitbucket.org/nielsenb/aniso8601"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/annoy/default.nix b/pkgs/development/python-modules/annoy/default.nix index 138c70a38483..0bd060843809 100644 --- a/pkgs/development/python-modules/annoy/default.nix +++ b/pkgs/development/python-modules/annoy/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , h5py @@ -20,7 +20,7 @@ buildPythonPackage rec { nose ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Approximate Nearest Neighbors in C++/Python optimized for memory usage and loading/saving to disk"; homepage = "https://github.com/spotify/annoy"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/anonip/default.nix b/pkgs/development/python-modules/anonip/default.nix index de9048bde343..9c1b3abf9800 100644 --- a/pkgs/development/python-modules/anonip/default.nix +++ b/pkgs/development/python-modules/anonip/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { checkPhase = "python tests.py"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/DigitaleGesellschaft/Anonip"; description = "A tool to anonymize IP-addresses in log-files"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/ansicolor/default.nix b/pkgs/development/python-modules/ansicolor/default.nix index f9d589e43696..3d96061362e9 100644 --- a/pkgs/development/python-modules/ansicolor/default.nix +++ b/pkgs/development/python-modules/ansicolor/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi }: +{ lib, stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "ansicolor"; @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "d17e1b07b9dd7ded31699fbca53ae6cd373584f9b6dcbc124d1f321ebad31f1d"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/numerodix/ansicolor/"; description = "A library to produce ansi color output and colored highlighting and diffing"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/ansicolors/default.nix b/pkgs/development/python-modules/ansicolors/default.nix index 3ea77384c797..7d6dd2127e67 100644 --- a/pkgs/development/python-modules/ansicolors/default.nix +++ b/pkgs/development/python-modules/ansicolors/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, pytest }: +{ lib, stdenv, buildPythonPackage, fetchPypi, pytest }: buildPythonPackage rec { pname = "ansicolors"; @@ -16,7 +16,7 @@ buildPythonPackage rec { py.test ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/verigak/colors/"; description = "ANSI colors for Python"; license = licenses.isc; diff --git a/pkgs/development/python-modules/ansiconv/default.nix b/pkgs/development/python-modules/ansiconv/default.nix index d2de4837e07a..6a3571960d03 100644 --- a/pkgs/development/python-modules/ansiconv/default.nix +++ b/pkgs/development/python-modules/ansiconv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, pytest }: +{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pytest }: buildPythonPackage rec { pname = "ansiconv"; @@ -13,7 +13,7 @@ buildPythonPackage rec { checkInputs = [ pytest ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A module for converting ANSI coded text and converts it to either plain text or HTML"; homepage = "https://github.com/ansible/ansiconv"; license = licenses.mit; diff --git a/pkgs/development/python-modules/apipkg/default.nix b/pkgs/development/python-modules/apipkg/default.nix index 22bddb252c8e..88535bb7cf1e 100644 --- a/pkgs/development/python-modules/apipkg/default.nix +++ b/pkgs/development/python-modules/apipkg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ lib, stdenv, buildPythonPackage, fetchPypi , pytest, setuptools_scm, isPy3k }: buildPythonPackage rec { @@ -33,7 +33,7 @@ buildPythonPackage rec { py.test ${testExpression} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Namespace control and lazy-import mechanism"; homepage = "https://github.com/pytest-dev/apipkg"; license = licenses.mit; diff --git a/pkgs/development/python-modules/apprise/default.nix b/pkgs/development/python-modules/apprise/default.nix index 5c260692887a..c3f318503884 100644 --- a/pkgs/development/python-modules/apprise/default.nix +++ b/pkgs/development/python-modules/apprise/default.nix @@ -1,27 +1,33 @@ -{ lib, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi, installShellFiles , Babel, requests, requests_oauthlib, six, click, markdown, pyyaml -, pytestrunner, coverage, flake8, mock, pytest, pytestcov, tox, gntp, sleekxmpp +, pytestrunner, coverage, flake8, mock, pytestCheckHook, pytestcov, tox, gntp, sleekxmpp }: buildPythonPackage rec { pname = "apprise"; - version = "0.8.9"; + version = "0.9.0"; src = fetchPypi { inherit pname version; - sha256 = "024db00c6a80dbc8c9038b2de211c9fd32963046612882f3f54ad78930f3e0f7"; + sha256 = "bab3563bc1e0c64938c4c7700112797bd99f20eb5d4a3e6038338bc8f060e153"; }; - nativeBuildInputs = [ Babel ]; + nativeBuildInputs = [ Babel installShellFiles ]; propagatedBuildInputs = [ requests requests_oauthlib six click markdown pyyaml ]; checkInputs = [ - pytestrunner coverage flake8 mock pytest pytestcov tox gntp sleekxmpp + pytestrunner coverage flake8 mock pytestCheckHook pytestcov tox gntp sleekxmpp ]; + disabledTests = [ "test_apprise_cli_nux_env" ]; + + postInstall = '' + installManPage packaging/man/apprise.1 + ''; + meta = with lib; { homepage = "https://github.com/caronc/apprise"; description = "Push Notifications that work with just about every platform!"; diff --git a/pkgs/development/python-modules/approvaltests/default.nix b/pkgs/development/python-modules/approvaltests/default.nix index a7b0b51d8f1c..bc47de371288 100644 --- a/pkgs/development/python-modules/approvaltests/default.nix +++ b/pkgs/development/python-modules/approvaltests/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, isPy37, pyperclip }: +{ lib, stdenv, buildPythonPackage, fetchFromGitHub, isPy37, pyperclip }: buildPythonPackage rec { version = "0.2.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { --replace "pyperclip==1.5.27" "pyperclip>=1.5.27" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Assertion/verification library to aid testing"; homepage = "https://github.com/approvals/ApprovalTests.Python"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/apsw/default.nix b/pkgs/development/python-modules/apsw/default.nix index 1f314dc7408a..de74480765a0 100644 --- a/pkgs/development/python-modules/apsw/default.nix +++ b/pkgs/development/python-modules/apsw/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, fetchpatch +{ lib, stdenv, buildPythonPackage, fetchFromGitHub, fetchpatch , sqlite, isPyPy }: buildPythonPackage rec { @@ -16,7 +16,7 @@ buildPythonPackage rec { buildInputs = [ sqlite ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A Python wrapper for the SQLite embedded relational database engine"; homepage = "https://github.com/rogerbinns/apsw"; license = licenses.zlib; diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix new file mode 100644 index 000000000000..4506f422f928 --- /dev/null +++ b/pkgs/development/python-modules/archinfo/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, nose +}: + +buildPythonPackage rec { + pname = "archinfo"; + version = "9.0.5327"; + + src = fetchFromGitHub { + owner = "angr"; + repo = pname; + rev = "v${version}"; + sha256 = "0r7nj2hf51c954ihfxyhpbz1sd9lrc6i9zfkz11s22wpggvp06mz"; + }; + + checkInputs = [ + nose + pytestCheckHook + ]; + + pythonImportsCheck = [ "archinfo" ]; + + meta = with lib; { + description = "Classes with architecture-specific information"; + homepage = "https://github.com/angr/archinfo"; + license = with licenses; [ bsd2 ]; + maintainers = [ maintainers.fab ]; + }; +} diff --git a/pkgs/development/python-modules/argh/default.nix b/pkgs/development/python-modules/argh/default.nix index 544a66c05821..0e2beb6a31eb 100644 --- a/pkgs/development/python-modules/argh/default.nix +++ b/pkgs/development/python-modules/argh/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , pytest @@ -24,7 +24,7 @@ buildPythonPackage rec { py.test ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/neithere/argh/"; description = "An unobtrusive argparse wrapper with natural syntax"; license = licenses.lgpl2; diff --git a/pkgs/development/python-modules/args/default.nix b/pkgs/development/python-modules/args/default.nix index ae66713361c2..cb349484f276 100644 --- a/pkgs/development/python-modules/args/default.nix +++ b/pkgs/development/python-modules/args/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi }: +{ lib, stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "args"; @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "a785b8d837625e9b61c39108532d95b85274acd679693b71ebb5156848fcf814"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Command Arguments for Humans"; homepage = "https://github.com/kennethreitz/args"; }; diff --git a/pkgs/development/python-modules/aria2p/default.nix b/pkgs/development/python-modules/aria2p/default.nix index a7d8221d78ef..076fec8c56ba 100644 --- a/pkgs/development/python-modules/aria2p/default.nix +++ b/pkgs/development/python-modules/aria2p/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder +{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder , aria2, poetry, pytest, pytestcov, pytest_xdist, responses , asciimatics, loguru, requests, setuptools, websocket_client }: @@ -34,7 +34,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ asciimatics loguru requests setuptools websocket_client ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/pawamoy/aria2p"; description = "Command-line tool and library to interact with an aria2c daemon process with JSON-RPC"; license = licenses.isc; diff --git a/pkgs/development/python-modules/asana/default.nix b/pkgs/development/python-modules/asana/default.nix index 71c003ef9b0a..ed5e441df970 100644 --- a/pkgs/development/python-modules/asana/default.nix +++ b/pkgs/development/python-modules/asana/default.nix @@ -1,5 +1,5 @@ { buildPythonPackage, pythonAtLeast, pytest, requests, requests_oauthlib, six -, fetchFromGitHub, responses, stdenv +, fetchFromGitHub, responses, lib, stdenv }: buildPythonPackage rec { @@ -29,7 +29,7 @@ buildPythonPackage rec { py.test tests ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Python client library for Asana"; homepage = "https://github.com/asana/python-asana"; license = licenses.mit; diff --git a/pkgs/development/python-modules/asgi-csrf/default.nix b/pkgs/development/python-modules/asgi-csrf/default.nix index e838ec787c31..eabb3d525cae 100644 --- a/pkgs/development/python-modules/asgi-csrf/default.nix +++ b/pkgs/development/python-modules/asgi-csrf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, isPy27, fetchFromGitHub, itsdangerous, python-multipart +{ lib, stdenv, buildPythonPackage, isPy27, fetchFromGitHub, itsdangerous, python-multipart , pytestCheckHook, starlette, httpx, pytest-asyncio }: buildPythonPackage rec { @@ -33,7 +33,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "asgi_csrf" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "ASGI middleware for protecting against CSRF attacks"; license = licenses.asl20; homepage = "https://github.com/simonw/asgi-csrf"; diff --git a/pkgs/development/python-modules/asgiref/default.nix b/pkgs/development/python-modules/asgiref/default.nix index 3537736f77f6..ec630c40d034 100644 --- a/pkgs/development/python-modules/asgiref/default.nix +++ b/pkgs/development/python-modules/asgiref/default.nix @@ -1,27 +1,38 @@ -{ stdenv, buildPythonPackage, pythonOlder, fetchFromGitHub, async-timeout, pytest, pytest-asyncio }: +{ stdenv +, async-timeout +, buildPythonPackage +, fetchFromGitHub +, pytest-asyncio +, pytestCheckHook +, pythonOlder +, lib +}: + buildPythonPackage rec { - version = "3.2.10"; + version = "3.3.1"; pname = "asgiref"; disabled = pythonOlder "3.5"; - # PyPI tarball doesn't include tests directory src = fetchFromGitHub { owner = "django"; repo = pname; rev = version; - sha256 = "1sj4yy2injaskwfi5pkb542jl8s6ljijnyra81gpw0pgd3d0bgxv"; + sha256 = "00r4l9x425wkbac6b6c2ksm2yjinrvvdf0ajizrzq32h0jg82016"; }; propagatedBuildInputs = [ async-timeout ]; - checkInputs = [ pytest pytest-asyncio ]; + checkInputs = [ + pytestCheckHook + pytest-asyncio + ]; - checkPhase = '' - py.test - ''; + disabledTests = lib.optionals stdenv.isDarwin [ + "test_multiprocessing" + ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Reference ASGI adapters and channel layers"; license = licenses.bsd3; homepage = "https://github.com/django/asgiref"; diff --git a/pkgs/development/python-modules/asn1ate/default.nix b/pkgs/development/python-modules/asn1ate/default.nix index 6af5b3da8808..2735bbf2f70f 100644 --- a/pkgs/development/python-modules/asn1ate/default.nix +++ b/pkgs/development/python-modules/asn1ate/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, pyparsing }: +{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pyparsing }: buildPythonPackage rec { pname = "asn1ate"; @@ -13,7 +13,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pyparsing ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Python library for translating ASN.1 into other forms"; license = licenses.bsd3; platforms = platforms.unix; diff --git a/pkgs/development/python-modules/astral/default.nix b/pkgs/development/python-modules/astral/default.nix index 6c4afec6352e..4ea53e17eb0e 100644 --- a/pkgs/development/python-modules/astral/default.nix +++ b/pkgs/development/python-modules/astral/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy27, pytz, requests, pytest, freezegun }: +{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27, pytz, requests, pytest, freezegun }: buildPythonPackage rec { pname = "astral"; @@ -17,7 +17,7 @@ buildPythonPackage rec { py.test -m "not webtest" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Calculations for the position of the sun and the moon"; homepage = "https://github.com/sffjunkie/astral/"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/astunparse/default.nix b/pkgs/development/python-modules/astunparse/default.nix index 0947b3877b5e..c9001da5c70f 100644 --- a/pkgs/development/python-modules/astunparse/default.nix +++ b/pkgs/development/python-modules/astunparse/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchPypi , buildPythonPackage , six @@ -19,7 +19,7 @@ buildPythonPackage rec { # tests not included with pypi release doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "This is a factored out version of unparse found in the Python source distribution"; homepage = "https://github.com/simonpercivall/astunparse"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/asyncio-dgram/default.nix b/pkgs/development/python-modules/asyncio-dgram/default.nix new file mode 100644 index 000000000000..14c800f568b0 --- /dev/null +++ b/pkgs/development/python-modules/asyncio-dgram/default.nix @@ -0,0 +1,37 @@ +{ stdenv +, lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pytest-asyncio +}: + +buildPythonPackage rec { + pname = "asyncio-dgram"; + version = "1.1.1"; + + src = fetchFromGitHub { + owner = "jsbronder"; + repo = pname; + rev = "v${version}"; + sha256 = "1zkmjvq47zw2fsbnzhr5mh9rsazx0z1f8m528ash25jrxsza5crm"; + }; + + # OSError: AF_UNIX path too long + doCheck = !stdenv.isDarwin; + + checkInputs = [ + pytestCheckHook + pytest-asyncio + ]; + + disabledTests = [ "test_protocol_pause_resume" ]; + pythonImportsCheck = [ "asyncio_dgram" ]; + + meta = with lib; { + description = "Python support for higher level Datagram"; + homepage = "https://github.com/jsbronder/asyncio-dgram"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/asyncssh/default.nix b/pkgs/development/python-modules/asyncssh/default.nix index dc990325bfe6..d3684ea57200 100644 --- a/pkgs/development/python-modules/asyncssh/default.nix +++ b/pkgs/development/python-modules/asyncssh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, pythonOlder +{ lib, stdenv, buildPythonPackage, fetchPypi, pythonOlder , cryptography , bcrypt, gssapi, libnacl, libsodium, nettle, pyopenssl , openssl, openssh, pytestCheckHook }: @@ -46,7 +46,7 @@ buildPythonPackage rec { disabledTests = [ "test_expired_root" "test_confirm" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Provides an asynchronous client and server implementation of the SSHv2 protocol on top of the Python asyncio framework"; homepage = "https://asyncssh.readthedocs.io/en/latest"; license = licenses.epl20; diff --git a/pkgs/development/python-modules/asyncwhois/default.nix b/pkgs/development/python-modules/asyncwhois/default.nix new file mode 100644 index 000000000000..a6ec6049ca2d --- /dev/null +++ b/pkgs/development/python-modules/asyncwhois/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, aiodns +, tldextract +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "asyncwhois"; + version = "0.2.2"; + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "59ed35fbe646491b6c3e1dcf6db9b4870c3d44c6c023a1c3badd6226551d7b7e"; + }; + + propagatedBuildInputs = [ + aiodns + tldextract + ]; + + # tests are only present at GitHub but not the released source tarballs + # https://github.com/pogzyb/asyncwhois/issues/10 + doCheck = false; + pythonImportsCheck = [ "asyncwhois" ]; + + meta = with lib; { + description = "Python module for retrieving WHOIS information"; + homepage = "https://github.com/pogzyb/asyncwhois"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/asysocks/default.nix b/pkgs/development/python-modules/asysocks/default.nix new file mode 100644 index 000000000000..66c66535a127 --- /dev/null +++ b/pkgs/development/python-modules/asysocks/default.nix @@ -0,0 +1,25 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "asysocks"; + version = "0.0.11"; + + src = fetchPypi { + inherit pname version; + sha256 = "11ygrhkqm524i4qp2myjvpsmg1lsn32nsqxqla96sbj84qfnhv0q"; + }; + + # Upstream hasn't release the tests yet + doCheck = false; + pythonImportsCheck = [ "asysocks" ]; + + meta = with lib; { + description = "Python Socks4/5 client and server library"; + homepage = "https://github.com/skelsec/asysocks"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/atomiclong/default.nix b/pkgs/development/python-modules/atomiclong/default.nix index 670361b9a9ef..7bcb36d548d8 100644 --- a/pkgs/development/python-modules/atomiclong/default.nix +++ b/pkgs/development/python-modules/atomiclong/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, pytest, cffi }: +{ lib, stdenv, buildPythonPackage, fetchPypi, pytest, cffi }: buildPythonPackage rec { pname = "atomiclong"; @@ -12,7 +12,7 @@ buildPythonPackage rec { buildInputs = [ pytest ]; propagatedBuildInputs = [ cffi ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Long data type with atomic operations using CFFI"; homepage = "https://github.com/dreid/atomiclong"; license = licenses.mit; diff --git a/pkgs/development/python-modules/atomicwrites/default.nix b/pkgs/development/python-modules/atomicwrites/default.nix index 03401f226a2e..e958b0f16d62 100644 --- a/pkgs/development/python-modules/atomicwrites/default.nix +++ b/pkgs/development/python-modules/atomicwrites/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, pytest }: +{ lib, stdenv, buildPythonPackage, fetchPypi, pytest }: buildPythonPackage rec { pname = "atomicwrites"; @@ -13,7 +13,7 @@ buildPythonPackage rec { doCheck = false; checkInputs = [ pytest ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Atomic file writes on POSIX"; homepage = "https://pypi.python.org/pypi/atomicwrites"; maintainers = with maintainers; [ matthiasbeyer ]; diff --git a/pkgs/development/python-modules/atomman/default.nix b/pkgs/development/python-modules/atomman/default.nix index 9e5eb34da3b1..147d2e77debc 100644 --- a/pkgs/development/python-modules/atomman/default.nix +++ b/pkgs/development/python-modules/atomman/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, isPy27 +{ lib, stdenv, buildPythonPackage, fetchFromGitHub, isPy27 , cython , datamodeldict , matplotlib @@ -30,7 +30,7 @@ buildPythonPackage rec { py.test tests -k 'not test_atomic' ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/usnistgov/atomman/"; description = "Atomistic Manipulation Toolkit"; license = licenses.mit; diff --git a/pkgs/development/python-modules/atsim_potentials/default.nix b/pkgs/development/python-modules/atsim_potentials/default.nix index 8369a49b7db8..6b8b8dccef81 100644 --- a/pkgs/development/python-modules/atsim_potentials/default.nix +++ b/pkgs/development/python-modules/atsim_potentials/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , configparser @@ -39,7 +39,7 @@ buildPythonPackage rec { py.test ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/mjdrushton/atsim-potentials"; description = "Provides tools for working with pair and embedded atom method potential models including tabulation routines for DL_POLY and LAMMPS"; license = licenses.mit; diff --git a/pkgs/development/python-modules/attrdict/default.nix b/pkgs/development/python-modules/attrdict/default.nix index 1dfbf32c995b..5c7514f9da63 100644 --- a/pkgs/development/python-modules/attrdict/default.nix +++ b/pkgs/development/python-modules/attrdict/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, coverage, nose, six }: +{ lib, stdenv, buildPythonPackage, fetchPypi, coverage, nose, six }: buildPythonPackage rec { pname = "attrdict"; @@ -11,7 +11,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ coverage nose six ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A dict with attribute-style access"; homepage = "https://github.com/bcj/AttrDict"; license = licenses.mit; diff --git a/pkgs/development/python-modules/audio-metadata/default.nix b/pkgs/development/python-modules/audio-metadata/default.nix index 1adee4403b9b..fc3adf2534e7 100644 --- a/pkgs/development/python-modules/audio-metadata/default.nix +++ b/pkgs/development/python-modules/audio-metadata/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, pythonOlder +{ lib, buildPythonPackage, fetchPypi , attrs , bidict , bitstruct @@ -18,9 +18,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ - --replace "bidict>=0.17,<0.18" "bidict" \ - --replace "more-itertools>=4.0,<8.0" "more-itertools" \ - --replace "pendulum>=2.0,<=3.0,!=2.0.5,!=2.1.0" "pendulum>=2.0,<=3.0" + --replace "'attrs>=18.2,<19.4'" "'attrs'" ''; propagatedBuildInputs = [ @@ -35,8 +33,6 @@ buildPythonPackage rec { # No tests doCheck = false; - disabled = pythonOlder "3.6"; - meta = with lib; { homepage = "https://github.com/thebigmunch/audio-metadata"; description = "A library for reading and, in the future, writing metadata from audio files"; diff --git a/pkgs/development/python-modules/authlib/default.nix b/pkgs/development/python-modules/authlib/default.nix index e3d8c99e0ea1..82014b9be993 100644 --- a/pkgs/development/python-modules/authlib/default.nix +++ b/pkgs/development/python-modules/authlib/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchFromGitHub , pytest @@ -26,7 +26,7 @@ buildPythonPackage rec { PYTHONPATH=$PWD:$PYTHONPATH pytest tests/{core,files} ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/lepture/authlib"; description = "The ultimate Python library in building OAuth and OpenID Connect servers. JWS,JWE,JWK,JWA,JWT included."; maintainers = with maintainers; [ flokli ]; diff --git a/pkgs/development/python-modules/authres/default.nix b/pkgs/development/python-modules/authres/default.nix index 372fb03a9472..c3d0402d48d1 100644 --- a/pkgs/development/python-modules/authres/default.nix +++ b/pkgs/development/python-modules/authres/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage, python }: +{ lib, stdenv, fetchPypi, buildPythonPackage, python }: buildPythonPackage rec { pname = "authres"; @@ -14,7 +14,7 @@ buildPythonPackage rec { ${python.interpreter} -m authres ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Email Authentication-Results Headers generation and parsing for Python/Python3"; longDescription = '' Python module that implements various internet RFC's: 5451/7001/7601 diff --git a/pkgs/development/python-modules/autobahn/default.nix b/pkgs/development/python-modules/autobahn/default.nix index 909fb65996ba..12aa86774d88 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.7.1"; + version = "20.12.3"; src = fetchPypi { inherit pname version; - sha256 = "86bbce30cdd407137c57670993a8f9bfdfe3f8e994b889181d85e844d5aa8dfb"; + sha256 = "15b8zm7jalwisfwc08szxy3bh2bnn0hd41dbsnswi0lqwbh962j1"; }; propagatedBuildInputs = [ six txaio twisted zope_interface cffi cryptography pynacl ] ++ diff --git a/pkgs/development/python-modules/autograd/default.nix b/pkgs/development/python-modules/autograd/default.nix index 6d56775d90c3..fef97a7a6f48 100644 --- a/pkgs/development/python-modules/autograd/default.nix +++ b/pkgs/development/python-modules/autograd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, numpy, future }: +{ lib, stdenv, buildPythonPackage, fetchPypi, numpy, future }: buildPythonPackage rec { pname = "autograd"; @@ -15,7 +15,7 @@ buildPythonPackage rec { # fixed, enable testing. See: https://github.com/HIPS/autograd/issues/404 doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/HIPS/autograd"; description = "Compute derivatives of NumPy code efficiently"; license = licenses.mit; diff --git a/pkgs/development/python-modules/autologging/default.nix b/pkgs/development/python-modules/autologging/default.nix index 7a3b36c35141..7cd66dc2c3fe 100644 --- a/pkgs/development/python-modules/autologging/default.nix +++ b/pkgs/development/python-modules/autologging/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi }: +{ lib, stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "Autologging"; @@ -10,7 +10,7 @@ buildPythonPackage rec { extension = "zip"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://ninthtest.info/python-autologging/"; description = "Easier logging and tracing for Python classes"; license = licenses.mit; diff --git a/pkgs/development/python-modules/automat/default.nix b/pkgs/development/python-modules/automat/default.nix index 78a3259a2878..fa395f119ee5 100644 --- a/pkgs/development/python-modules/automat/default.nix +++ b/pkgs/development/python-modules/automat/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, +{ lib, stdenv, buildPythonPackage, fetchPypi, m2r, setuptools_scm, six, attrs }: buildPythonPackage rec { @@ -17,7 +17,7 @@ buildPythonPackage rec { # this creates a circular dependency. doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/glyph/Automat"; description = "Self-service finite-state machines for the programmer on the go"; license = licenses.mit; diff --git a/pkgs/development/python-modules/autopep8/default.nix b/pkgs/development/python-modules/autopep8/default.nix index 1b40aa9c1408..afeaef406611 100644 --- a/pkgs/development/python-modules/autopep8/default.nix +++ b/pkgs/development/python-modules/autopep8/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage, pycodestyle, glibcLocales +{ lib, stdenv, fetchPypi, buildPythonPackage, pycodestyle, glibcLocales , toml }: @@ -21,7 +21,7 @@ buildPythonPackage rec { LC_ALL = "en_US.UTF-8"; - meta = with stdenv.lib; { + meta = with lib; { description = "A tool that automatically formats Python code to conform to the PEP 8 style guide"; homepage = "https://pypi.python.org/pypi/autopep8/"; license = licenses.mit; diff --git a/pkgs/development/python-modules/avea/default.nix b/pkgs/development/python-modules/avea/default.nix new file mode 100644 index 000000000000..10674ca667df --- /dev/null +++ b/pkgs/development/python-modules/avea/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, bluepy +}: + +buildPythonPackage rec { + pname = "avea"; + version = "1.5.1"; + + src = fetchFromGitHub { + owner = "k0rventen"; + repo = pname; + rev = "v${version}"; + sha256 = "13s21dnhbh10dd60xq2cklp5jyv46rpl3nivn1imcswp02930ihz"; + }; + + propagatedBuildInputs = [ + bluepy + ]; + + # no tests are present + doCheck = false; + pythonImportsCheck = [ "avea" ]; + + meta = with lib; { + description = "Python module for interacting with Elgato's Avea bulb"; + homepage = "https://github.com/k0rventen/avea"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/avro/default.nix b/pkgs/development/python-modules/avro/default.nix index d9f57686845d..9e08cd8ae1da 100644 --- a/pkgs/development/python-modules/avro/default.nix +++ b/pkgs/development/python-modules/avro/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, isPy3k, fetchPypi, pycodestyle, isort }: +{ lib, stdenv, buildPythonPackage, isPy3k, fetchPypi, pycodestyle, isort }: buildPythonPackage rec { pname = "avro"; @@ -21,7 +21,7 @@ buildPythonPackage rec { nativeBuildInputs = [ pycodestyle ]; propagatedBuildInputs = [ isort ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A serialization and RPC framework"; homepage = "https://pypi.python.org/pypi/avro/"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/avro3k/default.nix b/pkgs/development/python-modules/avro3k/default.nix index 59d09b3f25f0..b600bc75c7a3 100644 --- a/pkgs/development/python-modules/avro3k/default.nix +++ b/pkgs/development/python-modules/avro3k/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy3k }: +{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k }: buildPythonPackage rec { pname = "avro3k"; @@ -12,7 +12,7 @@ buildPythonPackage rec { doCheck = false; # No such file or directory: './run_tests.py - meta = with stdenv.lib; { + meta = with lib; { description = "A serialization and RPC framework"; homepage = "https://pypi.python.org/pypi/avro3k/"; }; diff --git a/pkgs/development/python-modules/awesome-slugify/default.nix b/pkgs/development/python-modules/awesome-slugify/default.nix index 945c941dec4e..00882cb08279 100644 --- a/pkgs/development/python-modules/awesome-slugify/default.nix +++ b/pkgs/development/python-modules/awesome-slugify/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, unidecode, regex, python }: +{ lib, stdenv, buildPythonPackage, fetchPypi, unidecode, regex, python }: buildPythonPackage rec { pname = "awesome-slugify"; @@ -24,7 +24,7 @@ buildPythonPackage rec { ${python.interpreter} -m unittest discover ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/dimka665/awesome-slugify"; description = "Python flexible slugify function"; license = licenses.gpl3; diff --git a/pkgs/development/python-modules/awesomeversion/default.nix b/pkgs/development/python-modules/awesomeversion/default.nix new file mode 100644 index 000000000000..a49e55abe107 --- /dev/null +++ b/pkgs/development/python-modules/awesomeversion/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +, requests +}: + +buildPythonPackage rec { + pname = "awesomeversion"; + version = "20.12.5"; + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "ludeeus"; + repo = pname; + rev = version; + sha256 = "1jwlfqnrqlxjp30fj9bcqh7vgicmpdbn5kjdcmll4srnl87lalfg"; + }; + + postPatch = '' + substituteInPlace setup.py --replace "main" ${version} + ''; + + propagatedBuildInputs = [ requests ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "awesomeversion" ]; + + meta = with lib; { + description = "Python module to deal with versions"; + homepage = "https://github.com/ludeeus/awesomeversion"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/awkward/default.nix b/pkgs/development/python-modules/awkward/default.nix index 9b9ca52b947b..298074f300d9 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 = "1.0.1"; + version = "1.0.2"; src = fetchPypi { inherit pname version; - sha256 = "d856b4a166ae054363368aed2e4a44338fec069baa4242e7d567c8323ebcc1eb"; + sha256 = "3468cb80cab51252a1936e5e593c7df4588ea0e18dcb6fb31e3d2913ba883928"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/python-modules/awkward0/default.nix b/pkgs/development/python-modules/awkward0/default.nix index 4441d131e637..c248c81da751 100644 --- a/pkgs/development/python-modules/awkward0/default.nix +++ b/pkgs/development/python-modules/awkward0/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "awkward0"; - version = "0.15.1"; + version = "0.15.2"; src = fetchFromGitHub { owner = "scikit-hep"; repo = "awkward-0.x"; rev = version; - sha256 = "17zrw25h6g5m4ik1c5piqb7q2bxrshfm4hm3lzfz4s8gi0xjm5gz"; + sha256 = "sha256-C6/byIGcabGjws5QI9sh5BO2M4Lhqkooh4mSjUEKCKU="; }; nativeBuildInputs = [ pytestrunner ]; diff --git a/pkgs/development/python-modules/azure-core/default.nix b/pkgs/development/python-modules/azure-core/default.nix index 0ad45dceb2bb..e91a0fb07493 100644 --- a/pkgs/development/python-modules/azure-core/default.nix +++ b/pkgs/development/python-modules/azure-core/default.nix @@ -14,14 +14,14 @@ }: buildPythonPackage rec { - version = "1.9.0"; + version = "1.10.0"; pname = "azure-core"; disabled = isPy27; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "ef8ae93a2ce8b595f231395579be11aadc1838168cbc2582e2d0bbd8b15c461f"; + sha256 = "b9cddf3eb239e32b14cf44750b21d7bc8d78b82aa53d57628523598dcd006803"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-eventgrid/default.nix b/pkgs/development/python-modules/azure-eventgrid/default.nix index 29392699ce2b..9781fcecaaf2 100644 --- a/pkgs/development/python-modules/azure-eventgrid/default.nix +++ b/pkgs/development/python-modules/azure-eventgrid/default.nix @@ -24,6 +24,7 @@ buildPythonPackage rec { # has no tests doCheck = false; + pythonImportsCheck = [ "azure.eventgrid" ]; meta = with lib; { description = "A fully-managed intelligent event routing service that allows for uniform event consumption using a publish-subscribe model"; diff --git a/pkgs/development/python-modules/azure-mgmt-advisor/default.nix b/pkgs/development/python-modules/azure-mgmt-advisor/default.nix index a04f28f2a513..81afa6ff7ed0 100644 --- a/pkgs/development/python-modules/azure-mgmt-advisor/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-advisor/default.nix @@ -5,23 +5,25 @@ , msrestazure , azure-common , isPy3k +, azure-mgmt-core , azure-mgmt-nspkg }: buildPythonPackage rec { pname = "azure-mgmt-advisor"; - version = "4.0.0"; + version = "9.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "1ecea7a9dc48c099c06aab68aace7fdbded91a5522932882b1707c29fa055054"; + sha256 = "fc408b37315fe84781b519124f8cb1b8ac10b2f4241e439d0d3e25fd6ca18d7b"; }; propagatedBuildInputs = [ msrest msrestazure azure-common + azure-mgmt-core ] ++ lib.optionals (!isPy3k) [ azure-mgmt-nspkg ]; diff --git a/pkgs/development/python-modules/azure-mgmt-apimanagement/default.nix b/pkgs/development/python-modules/azure-mgmt-apimanagement/default.nix index 759467aa9024..4432595a12e7 100644 --- a/pkgs/development/python-modules/azure-mgmt-apimanagement/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-apimanagement/default.nix @@ -1,21 +1,27 @@ { lib, buildPythonPackage, fetchPypi, isPy27 , azure-common +, azure-mgmt-core , msrest , msrestazure }: buildPythonPackage rec { - version = "0.2.0"; + version = "1.0.0"; pname = "azure-mgmt-apimanagement"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "790f01c0b32583706b8b8c59667c0f5a51cd70444eee76474e23a598911e1d72"; + sha256 = "3ad7e2c3d20dd0141f9e2c0ae923121f7cbe7333bb314850e6f8b606636e3589"; extension = "zip"; }; - propagatedBuildInputs = [ azure-common msrest msrestazure ]; + propagatedBuildInputs = [ + azure-common + azure-mgmt-core + msrest + msrestazure + ]; # no tests included doCheck = false; diff --git a/pkgs/development/python-modules/azure-mgmt-batch/default.nix b/pkgs/development/python-modules/azure-mgmt-batch/default.nix index aa188e87efa1..033ef0cccea4 100644 --- a/pkgs/development/python-modules/azure-mgmt-batch/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-batch/default.nix @@ -4,24 +4,26 @@ , msrest , msrestazure , azure-common +, azure-mgmt-core , azure-mgmt-nspkg , isPy3k }: buildPythonPackage rec { pname = "azure-mgmt-batch"; - version = "9.0.0"; + version = "14.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "03417eecfa1fac906e674cb1cb43ed7da27a96277277b091d7c389ba39f6c3fe"; + sha256 = "1d3b2c9ebd57c8874e11d29e7dd05a1f078d2156fc9683e2f2ad41024e448bf6"; }; propagatedBuildInputs = [ msrest msrestazure azure-common + azure-mgmt-core ] ++ lib.optionals (!isPy3k) [ azure-mgmt-nspkg ]; diff --git a/pkgs/development/python-modules/azure-mgmt-cdn/default.nix b/pkgs/development/python-modules/azure-mgmt-cdn/default.nix index 41d0387da2f4..b204add2b5e9 100644 --- a/pkgs/development/python-modules/azure-mgmt-cdn/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-cdn/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-cdn"; - version = "5.2.0"; + version = "6.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "3e470ba07918a4f97dadb6f50c6f64068da423b735fad38d31d9535c56f06881"; + sha256 = "590cd35c9f1556a2d93d93a88b5c5661f716de094f22db30f4d05dc58a131c84"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix b/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix index c138dde95d01..09800f9cef36 100644 --- a/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix @@ -2,23 +2,25 @@ , buildPythonPackage , fetchPypi , azure-common +, azure-mgmt-core , azure-mgmt-nspkg , msrestazure }: buildPythonPackage rec { pname = "azure-mgmt-cognitiveservices"; - version = "6.3.0"; + version = "11.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "1d029d5140152a36cc32f340e09f2b185ede2f54e577a44f3821878efb823415"; + sha256 = "71414e3cd7445e44fc18f217f2d22df05c36877e1233328b2297d07ddf27e82a"; }; propagatedBuildInputs = [ msrestazure azure-common + azure-mgmt-core azure-mgmt-nspkg ]; diff --git a/pkgs/development/python-modules/azure-mgmt-commerce/default.nix b/pkgs/development/python-modules/azure-mgmt-commerce/default.nix index 1460cdb9ca37..32e6cebd1f59 100644 --- a/pkgs/development/python-modules/azure-mgmt-commerce/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-commerce/default.nix @@ -3,6 +3,7 @@ , fetchPypi , msrestazure , azure-common +, azure-mgmt-core , azure-mgmt-nspkg , python , isPy3k @@ -10,17 +11,18 @@ buildPythonPackage rec { pname = "azure-mgmt-commerce"; - version = "1.0.1"; + version = "6.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "1hw4crkgb72ps85m2kz9kf8p2wg9qmaagk3z5nydva9g6bnq93n4"; + sha256 = "6f5447395503b2318f451d24f8021ee08db1cac44f1c3337ea690700419626b6"; }; propagatedBuildInputs = [ msrestazure azure-common + azure-mgmt-core azure-mgmt-nspkg ]; diff --git a/pkgs/development/python-modules/azure-mgmt-consumption/default.nix b/pkgs/development/python-modules/azure-mgmt-consumption/default.nix index 175dd9de6e87..be22e14b574b 100644 --- a/pkgs/development/python-modules/azure-mgmt-consumption/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-consumption/default.nix @@ -5,22 +5,24 @@ , isPy3k , msrestazure , azure-common +, azure-mgmt-core , azure-mgmt-nspkg }: buildPythonPackage rec { pname = "azure-mgmt-consumption"; - version = "3.0.0"; + version = "8.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "0nqgywknpj2a69an5yrn0c32fk01v5gi05za7dlf4ivwr9s4np83"; + sha256 = "b4cc167648634f864394066d5621afc137c1be795ee76f7539125f9538a2bf37"; }; propagatedBuildInputs = [ msrestazure azure-common + azure-mgmt-core azure-mgmt-nspkg ]; diff --git a/pkgs/development/python-modules/azure-mgmt-databoxedge/default.nix b/pkgs/development/python-modules/azure-mgmt-databoxedge/default.nix new file mode 100644 index 000000000000..317019844cb0 --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-databoxedge/default.nix @@ -0,0 +1,32 @@ +{ lib, buildPythonPackage, fetchPypi +, msrestazure +, azure-common +}: + +buildPythonPackage rec { + pname = "azure-mgmt-databoxedge"; + version = "0.2.0"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "g8BtUpIGOse8Jrws48gQ/o7sgymlgX0XIxl1ThHS3XA="; + }; + + propagatedBuildInputs = [ + msrestazure + azure-common + ]; + + # no tests in pypi tarball + doCheck = false; + + pythonImportsCheck = [ "azure.mgmt.databoxedge" ]; + + meta = with lib; { + description = "Microsoft Azure Databoxedge Management Client Library for Python"; + homepage = "https://github.com/Azure/azure-sdk-for-python"; + license = licenses.mit; + maintainers = with maintainers; [ jonringer ]; + }; +} diff --git a/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix b/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix index a186017a4d3c..91f420f11ae8 100644 --- a/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix @@ -4,24 +4,26 @@ , msrest , msrestazure , azure-common +, azure-mgmt-core , azure-mgmt-nspkg , isPy3k }: buildPythonPackage rec { pname = "azure-mgmt-datafactory"; - version = "0.15.0"; + version = "1.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "750a891005c86977c0978cd7231449aad12106d76897075fcdc95ef2e6258b00"; + sha256 = "d4f3984eca74b1e3691467aadc09626e578ed1fc5ef410872d474f3e7653916a"; }; propagatedBuildInputs = [ msrest msrestazure azure-common + azure-mgmt-core ] ++ lib.optionals (!isPy3k) [ azure-mgmt-nspkg ]; diff --git a/pkgs/development/python-modules/azure-mgmt-datalake-store/default.nix b/pkgs/development/python-modules/azure-mgmt-datalake-store/default.nix index b149584b6a99..fc5d8ba6f018 100644 --- a/pkgs/development/python-modules/azure-mgmt-datalake-store/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-datalake-store/default.nix @@ -7,21 +7,23 @@ , msrestazure , azure-common , azure-mgmt-datalake-nspkg +, azure-mgmt-core }: buildPythonPackage rec { pname = "azure-mgmt-datalake-store"; - version = "0.5.0"; + version = "1.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "9376d35495661d19f8acc5604f67b0bc59493b1835bbc480f9a1952f90017a4c"; + sha256 = "sha256-GrmVK97M+iojevPLVTuLmfQRLxvrHtr9DRHymJvLYHE="; }; propagatedBuildInputs = [ msrestazure azure-common + azure-mgmt-core azure-mgmt-datalake-nspkg ]; diff --git a/pkgs/development/python-modules/azure-mgmt-devtestlabs/default.nix b/pkgs/development/python-modules/azure-mgmt-devtestlabs/default.nix index 7c5e6a1d7bab..820f737c5489 100644 --- a/pkgs/development/python-modules/azure-mgmt-devtestlabs/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-devtestlabs/default.nix @@ -6,23 +6,25 @@ , msrest , msrestazure , azure-common +, azure-mgmt-core , azure-mgmt-nspkg }: buildPythonPackage rec { pname = "azure-mgmt-devtestlabs"; - version = "4.0.0"; + version = "9.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "1397ksrd61jv7400mgn8sqngp6ahir55fyq9n5k69wk88169qm2r"; + sha256 = "d8160d93fd3d947e5613c6919176b0edf72c94ac69679ea3b92cf27ff7398e64"; }; propagatedBuildInputs = [ msrest msrestazure azure-common + azure-mgmt-core ] ++ lib.optionals (!isPy3k) [ azure-mgmt-nspkg ]; diff --git a/pkgs/development/python-modules/azure-mgmt-eventgrid/default.nix b/pkgs/development/python-modules/azure-mgmt-eventgrid/default.nix index df48be1281ce..1b244818f913 100644 --- a/pkgs/development/python-modules/azure-mgmt-eventgrid/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-eventgrid/default.nix @@ -4,23 +4,25 @@ , msrest , msrestazure , azure-common +, azure-mgmt-core , azure-mgmt-nspkg , isPy3k }: buildPythonPackage rec { pname = "azure-mgmt-eventgrid"; - version = "2.2.0"; + version = "8.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "1hqwcl33r98lriz3fp6h8ir36bv9danx27290idv63fj7s95h866"; + sha256 = "a8a6e1bb105a14f1d3545ecb07c190370f21a145f8ba51599ed169f1dc8d5dcc"; }; propagatedBuildInputs = [ msrest msrestazure + azure-mgmt-core azure-common ] ++ lib.optionals (!isPy3k) [ azure-mgmt-nspkg @@ -28,6 +30,7 @@ buildPythonPackage rec { # has no tests doCheck = false; + pythonImportsCheck = [ "azure.mgmt.eventgrid" ]; meta = with lib; { description = "This is the Microsoft Azure EventGrid Management Client Library"; diff --git a/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix b/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix index 08915244fc4b..5547eb032d0e 100644 --- a/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix @@ -1,21 +1,27 @@ { lib, buildPythonPackage, fetchPypi, isPy27 , azure-common +, azure-mgmt-core , msrest , msrestazure }: buildPythonPackage rec { - version = "2.1.0"; + version = "7.0.0"; pname = "azure-mgmt-hdinsight"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "ed55df52d35fc03a9c7ca060af1ec0faf7b5510381d2a5e74b73f59ac0d79028"; + sha256 = "d0070817ee2be611d45af91eabc5665dd53f024eaa7a55e490ace4f71a55c733"; extension = "zip"; }; - propagatedBuildInputs = [ azure-common msrest msrestazure ]; + propagatedBuildInputs = [ + azure-common + azure-mgmt-core + msrest + msrestazure + ]; # no tests included doCheck = false; diff --git a/pkgs/development/python-modules/azure-mgmt-iotcentral/default.nix b/pkgs/development/python-modules/azure-mgmt-iotcentral/default.nix index b514488ff4a4..2f368b826491 100644 --- a/pkgs/development/python-modules/azure-mgmt-iotcentral/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-iotcentral/default.nix @@ -4,24 +4,26 @@ , msrest , msrestazure , azure-common +, azure-mgmt-core , azure-mgmt-nspkg , isPy3k }: buildPythonPackage rec { pname = "azure-mgmt-iotcentral"; - version = "3.1.0"; + version = "4.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "c175f6642be514ad0efd3dc03d09e50d923596fd9e634381793dcc46bb8a57c7"; + sha256 = "ab793fde2b5eeb73ab37434013d4b5ba7750031220013edb3c1758c45a00a91a"; }; propagatedBuildInputs = [ + azure-common + azure-mgmt-core msrest msrestazure - azure-common ] ++ lib.optionals (!isPy3k) [ azure-mgmt-nspkg ]; diff --git a/pkgs/development/python-modules/azure-mgmt-iothub/default.nix b/pkgs/development/python-modules/azure-mgmt-iothub/default.nix index e36e30fc16e1..c51d43ec4447 100644 --- a/pkgs/development/python-modules/azure-mgmt-iothub/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-iothub/default.nix @@ -4,24 +4,26 @@ , msrest , msrestazure , azure-common +, azure-mgmt-core , azure-mgmt-nspkg , isPy3k }: buildPythonPackage rec { pname = "azure-mgmt-iothub"; - version = "0.12.0"; + version = "1.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "da20ee2b9b9a2c2f89be9037c3ee5421152e7f6d718eafbf50a91dbf0a07ffa0"; + sha256 = "7acf24088395a299974dd26406db2686d8d59a3fffbe47c24617b36d445f2de8"; }; propagatedBuildInputs = [ + azure-common + azure-mgmt-core msrest msrestazure - azure-common ] ++ lib.optionals (!isPy3k) [ azure-mgmt-nspkg ]; diff --git a/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix b/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix index 525a72a7009d..e6fd01f73478 100644 --- a/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix @@ -7,16 +7,17 @@ , msrestazure , azure-common , azure-mgmt-nspkg +, azure-mgmt-core }: buildPythonPackage rec { pname = "azure-mgmt-loganalytics"; - version = "2.0.0"; + version = "7.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "947cada6e52fea6ecae7011d7532cf8edbe90250753a58749c473b863331fcc6"; + sha256 = "e603f9fc61b8d2f93d8814bcca012a8b425cf0c0320ddf1e84462929cf34d1af"; }; propagatedBuildInputs = [ @@ -24,6 +25,7 @@ buildPythonPackage rec { msrestazure azure-common azure-mgmt-nspkg + azure-mgmt-core ]; pythonNamespaces = [ "azure.mgmt" ]; diff --git a/pkgs/development/python-modules/azure-mgmt-logic/default.nix b/pkgs/development/python-modules/azure-mgmt-logic/default.nix index 8c2b3c8fd8db..bc63084410ce 100644 --- a/pkgs/development/python-modules/azure-mgmt-logic/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-logic/default.nix @@ -4,28 +4,31 @@ , msrest , msrestazure , azure-common +, azure-mgmt-core , azure-mgmt-nspkg }: buildPythonPackage rec { pname = "azure-mgmt-logic"; - version = "3.0.0"; + version = "9.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "d163dfc32e3cfa84f3f8131a75d9e94f5c4595907332cc001e45bf7e4efd5add"; + sha256 = "d3a780d299c4db59134bd984c4c9281b9b6ae5d4ba185bcbae43f6c3af04f85a"; }; propagatedBuildInputs = [ msrest msrestazure azure-common + azure-mgmt-core azure-mgmt-nspkg ]; # has no tests doCheck = false; + pythonImportsCheck = [ "azure.mgmt.logic" ]; meta = with lib; { description = "This is the Microsoft Azure Logic Apps Management Client Library"; diff --git a/pkgs/development/python-modules/azure-mgmt-marketplaceordering/default.nix b/pkgs/development/python-modules/azure-mgmt-marketplaceordering/default.nix index a8a138d27bde..9538ed2a2345 100644 --- a/pkgs/development/python-modules/azure-mgmt-marketplaceordering/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-marketplaceordering/default.nix @@ -6,22 +6,24 @@ , azure-common , azure-mgmt-nspkg , isPy3k +, azure-mgmt-core }: buildPythonPackage rec { pname = "azure-mgmt-marketplaceordering"; - version = "0.2.1"; + version = "1.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "dc765cde7ec03efe456438c85c6207c2f77775a8ce8a7adb19b0df5c5dc513c2"; + sha256 = "85103080f9e59215036bdfb8f806d91ea182d72c46a13f55c3acc479849351e3"; }; propagatedBuildInputs = [ msrest msrestazure azure-common + azure-mgmt-core ] ++ lib.optionals (!isPy3k) [ azure-mgmt-nspkg ]; diff --git a/pkgs/development/python-modules/azure-mgmt-netapp/default.nix b/pkgs/development/python-modules/azure-mgmt-netapp/default.nix index a57bbe07f563..a89d94f3d706 100644 --- a/pkgs/development/python-modules/azure-mgmt-netapp/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-netapp/default.nix @@ -1,21 +1,27 @@ { lib, buildPythonPackage, fetchPypi, isPy27 , azure-common +, azure-mgmt-core , msrest , msrestazure }: buildPythonPackage rec { - version = "0.14.0"; + version = "0.15.0"; pname = "azure-mgmt-netapp"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "6fd915e68d314bec8b56c6ece194005d2c4fc97478fc1f797639d4a6913c1539"; + sha256 = "5e98c360609a77b443b2fe431e0337e5cb705b4f02d0204791f9985f7ce68836"; extension = "zip"; }; - propagatedBuildInputs = [ azure-common msrest msrestazure ]; + propagatedBuildInputs = [ + azure-common + azure-mgmt-core + msrest + msrestazure + ]; # no tests included doCheck = false; diff --git a/pkgs/development/python-modules/azure-mgmt-notificationhubs/default.nix b/pkgs/development/python-modules/azure-mgmt-notificationhubs/default.nix index 7b4985c53331..bf9d9bab576b 100644 --- a/pkgs/development/python-modules/azure-mgmt-notificationhubs/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-notificationhubs/default.nix @@ -4,23 +4,25 @@ , msrest , msrestazure , azure-common +, azure-mgmt-core , azure-mgmt-nspkg }: buildPythonPackage rec { pname = "azure-mgmt-notificationhubs"; - version = "2.1.0"; + version = "7.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "10w53ida2nlx73vd1pczh4mkpg0lag1h19yyklx3yvgsyvahj25h"; + sha256 = "92ffed71a2999ff5db41afd66c6ba5cfef9d467f732c7bb45b7c41db371c6e4a"; }; propagatedBuildInputs = [ msrest msrestazure azure-common + azure-mgmt-core azure-mgmt-nspkg ]; diff --git a/pkgs/development/python-modules/azure-mgmt-policyinsights/default.nix b/pkgs/development/python-modules/azure-mgmt-policyinsights/default.nix index 6522b3c8c435..30fce3885453 100644 --- a/pkgs/development/python-modules/azure-mgmt-policyinsights/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-policyinsights/default.nix @@ -4,30 +4,33 @@ , msrest , msrestazure , azure-common +, azure-mgmt-core , azure-mgmt-nspkg , isPy3k }: buildPythonPackage rec { pname = "azure-mgmt-policyinsights"; - version = "0.6.0"; + version = "1.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "2c64533f6eab08dc16450fc5d7c7651557fc0edc8ef1278dda336333d648a7c4"; + sha256 = "75103fb4541aeae30bb687dee1fedd9ca65530e6b97b2d9ea87f74816905202a"; }; propagatedBuildInputs = [ + azure-common + azure-mgmt-core msrest msrestazure - azure-common ] ++ lib.optionals (!isPy3k) [ azure-mgmt-nspkg ]; # has no tests doCheck = false; + pythonImportsCheck = [ "azure.mgmt.policyinsights" ]; meta = with lib; { description = "This is the Microsoft Azure Policy Insights Client Library"; diff --git a/pkgs/development/python-modules/azure-mgmt-rdbms/default.nix b/pkgs/development/python-modules/azure-mgmt-rdbms/default.nix index 0e96647f4925..c7cb274d68b6 100644 --- a/pkgs/development/python-modules/azure-mgmt-rdbms/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-rdbms/default.nix @@ -4,30 +4,33 @@ , msrest , msrestazure , azure-common +, azure-mgmt-core , azure-mgmt-nspkg , isPy3k }: buildPythonPackage rec { pname = "azure-mgmt-rdbms"; - version = "2.2.0"; + version = "8.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "1iz1pf28ajrzbq8nab1jbjbgfbv0g6ni036xayy6xylvga4l8czr"; + sha256 = "8b018543048fc4fddb4155d9f22246ad0c4be2fb582a29dbb21ec4022724a119"; }; propagatedBuildInputs = [ + azure-common + azure-mgmt-core msrest msrestazure - azure-common ] ++ lib.optionals (!isPy3k) [ azure-mgmt-nspkg ]; # has no tests doCheck = false; + pythonImportsCheck = [ "azure.mgmt.rdbms" ]; meta = with lib; { description = "This is the Microsoft Azure RDBMS Management Client Library"; diff --git a/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix b/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix index 7f4de1a463b7..d1f49355f8b9 100644 --- a/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix @@ -4,30 +4,33 @@ , msrest , msrestazure , azure-common +, azure-mgmt-core , azure-mgmt-nspkg , isPy3k }: buildPythonPackage rec { pname = "azure-mgmt-recoveryservices"; - version = "0.5.0"; + version = "1.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "3c90e6b2e358dbe6d5c6d7204955bdf52c3e977c6f8b727cbbb8811427d7fd52"; + sha256 = "ab87108c0d5ce27d80583b4bfad966ad07049dcbc0e9ac28c64aa6bbdae64e22"; }; propagatedBuildInputs = [ + azure-common + azure-mgmt-core msrest msrestazure - azure-common ] ++ lib.optionals (!isPy3k) [ azure-mgmt-nspkg ]; # has no tests doCheck = false; + pythonImportsCheck = [ "azure.mgmt.recoveryservices" ]; meta = with lib; { description = "This is the Microsoft Azure Recovery Services Client Library"; diff --git a/pkgs/development/python-modules/azure-mgmt-relay/default.nix b/pkgs/development/python-modules/azure-mgmt-relay/default.nix index 46db2d3528cf..9b7444a6ecb1 100644 --- a/pkgs/development/python-modules/azure-mgmt-relay/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-relay/default.nix @@ -5,22 +5,24 @@ , isPy3k , msrestazure , azure-common +, azure-mgmt-core , azure-mgmt-nspkg }: buildPythonPackage rec { pname = "azure-mgmt-relay"; - version = "0.2.0"; + version = "1.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "0s5z4cil750wn770m0hdzcrpshj4bj1bglkkvxdx9l9054dk9s57"; + sha256 = "38f6dd9d122a316efa921e72933e01ec4d76ed39d4682655b17a997079e8b20a"; }; propagatedBuildInputs = [ msrestazure azure-common + azure-mgmt-core azure-mgmt-nspkg ]; @@ -28,6 +30,7 @@ buildPythonPackage rec { # has no tests doCheck = false; + pythonImportsCheck = [ "azure.mgmt.relay" ]; meta = with lib; { description = "This is the Microsoft Azure Relay Client Library"; diff --git a/pkgs/development/python-modules/azure-mgmt-search/default.nix b/pkgs/development/python-modules/azure-mgmt-search/default.nix index c6c525176c77..e4cb5b234742 100644 --- a/pkgs/development/python-modules/azure-mgmt-search/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-search/default.nix @@ -4,28 +4,31 @@ , msrest , msrestazure , azure-common +, azure-mgmt-core , azure-mgmt-nspkg }: buildPythonPackage rec { pname = "azure-mgmt-search"; - version = "3.0.0"; + version = "8.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "d4c78b14b48edd2e27e2068c9a448acfc84a18595be77fe483afe7bb447e1eb6"; + sha256 = "a96d50c88507233a293e757202deead980c67808f432b8e897c4df1ca088da7e"; }; propagatedBuildInputs = [ + azure-common + azure-mgmt-core + azure-mgmt-nspkg msrest msrestazure - azure-common - azure-mgmt-nspkg ]; # has no tests doCheck = false; + pythonImportsCheck = [ "azure.mgmt.search" ]; meta = with lib; { description = "This is the Microsoft Azure Search Management Client Library"; diff --git a/pkgs/development/python-modules/azure-mgmt-security/default.nix b/pkgs/development/python-modules/azure-mgmt-security/default.nix index 9de17636b234..a947e84f9aef 100644 --- a/pkgs/development/python-modules/azure-mgmt-security/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-security/default.nix @@ -1,21 +1,27 @@ { lib, buildPythonPackage, fetchPypi, isPy27 , azure-common +, azure-mgmt-core , msrest , msrestazure }: buildPythonPackage rec { - version = "0.6.0"; + version = "1.0.0"; pname = "azure-mgmt-security"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "9f37d0151d730801222af111f0830905634795dbfd59ad1b89c35197421e74d3"; + sha256 = "ae1cff598dfe80e93406e524c55c3f2cbffced9f9b7a5577e3375008a4c3bcad"; extension = "zip"; }; - propagatedBuildInputs = [ azure-common msrest msrestazure ]; + propagatedBuildInputs = [ + azure-common + azure-mgmt-core + msrest + msrestazure + ]; # no tests included doCheck = false; diff --git a/pkgs/development/python-modules/azure-mgmt-subscription/default.nix b/pkgs/development/python-modules/azure-mgmt-subscription/default.nix index d0a5845d9055..d4238cc8204f 100644 --- a/pkgs/development/python-modules/azure-mgmt-subscription/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-subscription/default.nix @@ -4,30 +4,33 @@ , msrest , msrestazure , azure-common +, azure-mgmt-core , azure-mgmt-nspkg , isPy3k }: buildPythonPackage rec { pname = "azure-mgmt-subscription"; - version = "0.7.0"; + version = "1.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "37f570b8872ae65dce312da116588ab8407a5c8a10d959597e61d19b21799f77"; + sha256 = "22f606f298419f466a8149811fc762686c93da00a7dc15d3b7cdbf22b96cf5db"; }; propagatedBuildInputs = [ + azure-common + azure-mgmt-core msrest msrestazure - azure-common ] ++ lib.optionals (!isPy3k) [ azure-mgmt-nspkg ]; # has no tests doCheck = false; + pythonImportsCheck = [ "azure.mgmt.subscription" ]; meta = with lib; { description = "This is the Microsoft Azure Subscription Management Client Library"; diff --git a/pkgs/development/python-modules/azure-synapse-artifacts/default.nix b/pkgs/development/python-modules/azure-synapse-artifacts/default.nix index 85ec70f704c7..f33df1fdbe8d 100644 --- a/pkgs/development/python-modules/azure-synapse-artifacts/default.nix +++ b/pkgs/development/python-modules/azure-synapse-artifacts/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "azure-synapse-artifacts"; - version = "0.3.0"; + version = "0.4.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "0p43zmw96fh3wp75phf3fcqdfb36adqvxfc945yfda6fi555nw1a"; + sha256 = "09fd9cf8c25c901d2daf7e436062065ada866f212f371f9d66f394d39ccaa23b"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-synapse-spark/default.nix b/pkgs/development/python-modules/azure-synapse-spark/default.nix index fb724e6dbfbc..571f3f9d08da 100644 --- a/pkgs/development/python-modules/azure-synapse-spark/default.nix +++ b/pkgs/development/python-modules/azure-synapse-spark/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "azure-synapse-spark"; - version = "0.3.0"; + version = "0.4.0"; src = fetchPypi { inherit pname version; - sha256 = "fcfe559e30a2e159f07e371af28d18dc635dc55174fb3457be7210ce8e7e7559"; + sha256 = "7f5881fda4108363c8c6fdee0494fa067ba81e60f038883859d23fc197f5f286"; extension = "zip"; }; diff --git a/pkgs/development/python-modules/b2sdk/default.nix b/pkgs/development/python-modules/b2sdk/default.nix index f807c0353990..da43f6e5690e 100644 --- a/pkgs/development/python-modules/b2sdk/default.nix +++ b/pkgs/development/python-modules/b2sdk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, setuptools_scm, isPy27, pytestCheckHook +{ lib, stdenv, buildPythonPackage, fetchPypi, setuptools_scm, isPy27, pytestCheckHook , requests, arrow, logfury, tqdm }: buildPythonPackage rec { @@ -20,7 +20,7 @@ buildPythonPackage rec { # requires unpackaged dependencies like liccheck doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Client library and utilities for access to B2 Cloud Storage (backblaze)."; homepage = "https://github.com/Backblaze/b2-sdk-python"; license = licenses.mit; diff --git a/pkgs/development/python-modules/babelfish/default.nix b/pkgs/development/python-modules/babelfish/default.nix index 87769aa3ea91..5ac044292156 100644 --- a/pkgs/development/python-modules/babelfish/default.nix +++ b/pkgs/development/python-modules/babelfish/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, setuptools }: +{ lib, stdenv, buildPythonPackage, fetchPypi, setuptools }: buildPythonPackage rec { pname = "babelfish"; @@ -11,7 +11,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ setuptools ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://pypi.python.org/pypi/babelfish"; description = "A module to work with countries and languages"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/backports-datetime-fromisoformat/default.nix b/pkgs/development/python-modules/backports-datetime-fromisoformat/default.nix new file mode 100644 index 000000000000..7db161b86110 --- /dev/null +++ b/pkgs/development/python-modules/backports-datetime-fromisoformat/default.nix @@ -0,0 +1,23 @@ +{ lib, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "backports-datetime-fromisoformat"; + version = "1.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0p0gyhfqq6gssf3prsy0pcfq5w0wx2w3pcjqbwx3imvc92ls4xwm"; + }; + + # no tests in pypi package + doCheck = false; + + pythonImportsCheck = [ "backports.datetime_fromisoformat" ]; + + meta = with lib; { + description = "Backport of Python 3.7's datetime.fromisoformat"; + homepage = "https://github.com/movermeyer/backports.datetime_fromisoformat"; + license = licenses.mit; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/development/python-modules/backports-shutil-which/default.nix b/pkgs/development/python-modules/backports-shutil-which/default.nix index 656842f4434d..5fe922b90462 100644 --- a/pkgs/development/python-modules/backports-shutil-which/default.nix +++ b/pkgs/development/python-modules/backports-shutil-which/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage, pytest }: +{ lib, stdenv, fetchPypi, buildPythonPackage, pytest }: buildPythonPackage rec { pname = "backports.shutil_which"; @@ -15,7 +15,7 @@ buildPythonPackage rec { py.test test ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Backport of shutil.which from Python 3.3"; homepage = "https://github.com/minrk/backports.shutil_which"; license = licenses.psfl; diff --git a/pkgs/development/python-modules/backports_csv/default.nix b/pkgs/development/python-modules/backports_csv/default.nix index e2fae4897f62..5216149ddc2c 100644 --- a/pkgs/development/python-modules/backports_csv/default.nix +++ b/pkgs/development/python-modules/backports_csv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, future }: +{ lib, stdenv, buildPythonPackage, fetchPypi, future }: buildPythonPackage rec { @@ -12,7 +12,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ future ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Backport of Python 3 csv module"; homepage = "https://github.com/ryanhiebert"; license = licenses.psfl; diff --git a/pkgs/development/python-modules/backports_os/default.nix b/pkgs/development/python-modules/backports_os/default.nix index dc969cbb4b94..b3e231bcd05d 100644 --- a/pkgs/development/python-modules/backports_os/default.nix +++ b/pkgs/development/python-modules/backports_os/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , setuptools_scm @@ -26,7 +26,7 @@ buildPythonPackage rec { ${python.interpreter} -m unittest discover tests ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/pjdelport/backports.os"; description = "Backport of new features in Python's os module"; license = licenses.mit; diff --git a/pkgs/development/python-modules/backports_unittest-mock/default.nix b/pkgs/development/python-modules/backports_unittest-mock/default.nix index b85c642787e6..08f98de79f27 100644 --- a/pkgs/development/python-modules/backports_unittest-mock/default.nix +++ b/pkgs/development/python-modules/backports_unittest-mock/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, setuptools_scm, mock }: +{ lib, stdenv, buildPythonPackage, fetchPypi, setuptools_scm, mock }: buildPythonPackage rec { pname = "backports.unittest_mock"; @@ -17,7 +17,7 @@ buildPythonPackage rec { doCheck = false; pythonImportsCheck = [ "backports.unittest_mock" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Provides a function install() which makes the mock module"; homepage = "https://github.com/jaraco/backports.unittest_mock"; license = licenses.mit; diff --git a/pkgs/development/python-modules/backports_weakref/default.nix b/pkgs/development/python-modules/backports_weakref/default.nix index 8b818398ec9e..9770fb45981d 100644 --- a/pkgs/development/python-modules/backports_weakref/default.nix +++ b/pkgs/development/python-modules/backports_weakref/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , setuptools_scm @@ -24,7 +24,7 @@ buildPythonPackage rec { ${python.interpreter} -m unittest discover tests ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Backports of new features in Python’s weakref module"; license = licenses.psfl; maintainers = with maintainers; [ jyp ]; diff --git a/pkgs/development/python-modules/bacpypes/default.nix b/pkgs/development/python-modules/bacpypes/default.nix index 3999efd12b67..59542e61c56b 100644 --- a/pkgs/development/python-modules/bacpypes/default.nix +++ b/pkgs/development/python-modules/bacpypes/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, fetchFromGitHub +{ lib, stdenv, buildPythonPackage, fetchPypi, fetchFromGitHub , wheel, pytestCheckHook, pytestrunner }: buildPythonPackage rec { @@ -22,7 +22,7 @@ buildPythonPackage rec { "test_recurring_task_5" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/JoelBender/bacpypes"; description = "BACpypes provides a BACnet application layer and network layer written in Python for daemons, scripting, and graphical interfaces."; license = licenses.mit; diff --git a/pkgs/development/python-modules/bap/default.nix b/pkgs/development/python-modules/bap/default.nix index fd63294302c3..d2575afb77d2 100644 --- a/pkgs/development/python-modules/bap/default.nix +++ b/pkgs/development/python-modules/bap/default.nix @@ -1,4 +1,4 @@ -{stdenv, buildPythonPackage, fetchFromGitHub, bap, requests}: +{lib, stdenv, buildPythonPackage, fetchFromGitHub, bap, requests}: buildPythonPackage rec { pname = "bap"; @@ -14,7 +14,7 @@ buildPythonPackage rec { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Platform for binary analysis. It is written in OCaml, but can be used from other languages."; homepage = "https://github.com/BinaryAnalysisPlatform/bap/"; maintainers = [ maintainers.maurer ]; diff --git a/pkgs/development/python-modules/base58/default.nix b/pkgs/development/python-modules/base58/default.nix index 42f848aa846b..a36727429ca7 100644 --- a/pkgs/development/python-modules/base58/default.nix +++ b/pkgs/development/python-modules/base58/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage, isPy27, pytest, pyhamcrest }: +{ lib, stdenv, fetchPypi, buildPythonPackage, isPy27, pytest, pyhamcrest }: buildPythonPackage rec { pname = "base58"; @@ -15,7 +15,7 @@ buildPythonPackage rec { pytest ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Base58 and Base58Check implementation"; homepage = "https://github.com/keis/base58"; license = licenses.mit; diff --git a/pkgs/development/python-modules/basemap/default.nix b/pkgs/development/python-modules/basemap/default.nix index a06bcebc8e6c..c97548bdee88 100644 --- a/pkgs/development/python-modules/basemap/default.nix +++ b/pkgs/development/python-modules/basemap/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchFromGitHub , numpy @@ -34,7 +34,7 @@ buildPythonPackage rec { # TODO : do the post install checks (`cd examples && ${python.interpreter} run_all.py`) doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://matplotlib.org/basemap/"; description = "Plot data on map projections with matplotlib"; longDescription = '' diff --git a/pkgs/development/python-modules/batinfo/default.nix b/pkgs/development/python-modules/batinfo/default.nix index e8516aecdc65..0ed3486272d3 100644 --- a/pkgs/development/python-modules/batinfo/default.nix +++ b/pkgs/development/python-modules/batinfo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi }: +{ lib, stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "batinfo"; @@ -12,7 +12,7 @@ buildPythonPackage rec { # No tests included doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/nicolargo/batinfo"; description = "A simple Python lib to retrieve battery information"; license = licenses.lgpl3; diff --git a/pkgs/development/python-modules/bayespy/default.nix b/pkgs/development/python-modules/bayespy/default.nix index ef3dfa095184..b470d21b1bea 100644 --- a/pkgs/development/python-modules/bayespy/default.nix +++ b/pkgs/development/python-modules/bayespy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, pythonOlder +{ lib, stdenv, buildPythonPackage, fetchPypi, pythonOlder , pytest, nose, glibcLocales , numpy, scipy, matplotlib, h5py }: @@ -22,7 +22,7 @@ buildPythonPackage rec { LC_ALL=en_US.utf-8 pytest -k 'not test_message_to_parents' ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.bayespy.org"; description = "Variational Bayesian inference tools for Python"; license = licenses.mit; diff --git a/pkgs/development/python-modules/bcdoc/default.nix b/pkgs/development/python-modules/bcdoc/default.nix index b8cbf8537dc6..185fcb86b0b7 100644 --- a/pkgs/development/python-modules/bcdoc/default.nix +++ b/pkgs/development/python-modules/bcdoc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, docutils, six }: +{ lib, stdenv, buildPythonPackage, fetchPypi, docutils, six }: buildPythonPackage rec { pname = "bcdoc"; @@ -14,7 +14,7 @@ buildPythonPackage rec { # Tests fail due to nix file timestamp normalization. doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/boto/bcdoc"; license = licenses.asl20; description = "ReST document generation tools for botocore"; diff --git a/pkgs/development/python-modules/beautifulsoup4/default.nix b/pkgs/development/python-modules/beautifulsoup4/default.nix index a0afd0c4f4c4..555669da243e 100644 --- a/pkgs/development/python-modules/beautifulsoup4/default.nix +++ b/pkgs/development/python-modules/beautifulsoup4/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, soupsieve, pytest, python }: +{ lib, stdenv, buildPythonPackage, fetchPypi, soupsieve, pytest, python }: buildPythonPackage rec { pname = "beautifulsoup4"; @@ -16,7 +16,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ soupsieve ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://crummy.com/software/BeautifulSoup/bs4/"; description = "HTML and XML parser"; license = licenses.mit; diff --git a/pkgs/development/python-modules/bedup/default.nix b/pkgs/development/python-modules/bedup/default.nix index 6c0c3c44d2d4..0e339dca0973 100644 --- a/pkgs/development/python-modules/bedup/default.nix +++ b/pkgs/development/python-modules/bedup/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchFromGitHub , btrfs-progs @@ -27,7 +27,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ contextlib2 pyxdg pycparser alembic ] ++ stdenv.lib.optionals (!isPyPy) [ cffi ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Deduplication for Btrfs"; longDescription = '' Deduplication for Btrfs. bedup looks for new and changed files, diff --git a/pkgs/development/python-modules/behave/default.nix b/pkgs/development/python-modules/behave/default.nix index 26cd6441ba5a..56217dca617d 100644 --- a/pkgs/development/python-modules/behave/default.nix +++ b/pkgs/development/python-modules/behave/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , buildPythonApplication, python , pytestCheckHook, mock, pathpy, pyhamcrest, pytest-html , glibcLocales @@ -37,7 +37,7 @@ buildPythonApplication rec { ${python.interpreter} bin/behave -f progress3 --stop --tags='~@xfail' issue.features/ ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/behave/behave"; description = "behaviour-driven development, Python style"; license = licenses.bsd2; diff --git a/pkgs/development/python-modules/bellows/default.nix b/pkgs/development/python-modules/bellows/default.nix index ab50a1acd8ef..614a1ad98a91 100644 --- a/pkgs/development/python-modules/bellows/default.nix +++ b/pkgs/development/python-modules/bellows/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ lib, stdenv, buildPythonPackage, fetchPypi , click, click-log, pure-pcapy3 , pyserial, pyserial-asyncio, voluptuous, zigpy , asynctest, pytest, pytest-asyncio }: @@ -28,7 +28,7 @@ in buildPythonPackage rec { --replace "click-log==0.2.0" "click-log>=0.2.0" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A Python 3 project to implement EZSP for EmberZNet devices"; homepage = "https://github.com/zigpy/bellows"; license = licenses.gpl3Plus; diff --git a/pkgs/development/python-modules/bespon/default.nix b/pkgs/development/python-modules/bespon/default.nix index 51e29e55d07f..555a0a487581 100644 --- a/pkgs/development/python-modules/bespon/default.nix +++ b/pkgs/development/python-modules/bespon/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi }: @@ -17,7 +17,7 @@ buildPythonPackage rec { doCheck = false; pythonImportsCheck = [ "bespon" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Encodes and decodes data in the BespON format."; homepage = "https://github.com/gpoore/bespon_py"; license = licenses.lgpl3; diff --git a/pkgs/development/python-modules/betamax-matchers/default.nix b/pkgs/development/python-modules/betamax-matchers/default.nix index e95a34d15424..424b8ef4ef36 100644 --- a/pkgs/development/python-modules/betamax-matchers/default.nix +++ b/pkgs/development/python-modules/betamax-matchers/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ lib, stdenv, buildPythonPackage, fetchPypi , betamax, requests_toolbelt }: buildPythonPackage rec { @@ -12,7 +12,7 @@ buildPythonPackage rec { buildInputs = [ betamax requests_toolbelt ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/sigmavirus24/betamax_matchers"; description = "A group of experimental matchers for Betamax"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/betamax-serializers/default.nix b/pkgs/development/python-modules/betamax-serializers/default.nix index 60a79a51d499..3d3cad4d95b5 100644 --- a/pkgs/development/python-modules/betamax-serializers/default.nix +++ b/pkgs/development/python-modules/betamax-serializers/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ lib, stdenv, buildPythonPackage, fetchPypi , betamax, pyyaml }: buildPythonPackage rec { @@ -12,7 +12,7 @@ buildPythonPackage rec { buildInputs = [ betamax pyyaml ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://gitlab.com/betamax/serializers"; description = "A set of third-party serializers for Betamax"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/betamax/default.nix b/pkgs/development/python-modules/betamax/default.nix index 7339fcbf6485..5e1469bfc52d 100644 --- a/pkgs/development/python-modules/betamax/default.nix +++ b/pkgs/development/python-modules/betamax/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, requests }: +{ lib, stdenv, buildPythonPackage, fetchPypi, requests }: buildPythonPackage rec { pname = "betamax"; @@ -13,7 +13,7 @@ buildPythonPackage rec { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://betamax.readthedocs.org/en/latest/"; description = "A VCR imitation for requests"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/billiard/default.nix b/pkgs/development/python-modules/billiard/default.nix index 5bccf7924525..4f8aa3565da2 100644 --- a/pkgs/development/python-modules/billiard/default.nix +++ b/pkgs/development/python-modules/billiard/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPyPy, pytest, case, psutil }: +{ lib, stdenv, buildPythonPackage, fetchPypi, isPyPy, pytestCheckHook, case, psutil, fetchpatch }: buildPythonPackage rec { pname = "billiard"; @@ -9,13 +9,17 @@ buildPythonPackage rec { inherit pname version; sha256 = "0spssl3byzqsplra166d59jx8iqfxyzvcbx7vybkmwr5ck72a5yr"; }; + patches = [(fetchpatch { + # Add Python 3.9 support to spawnv_passfds() + # Should be included in next release after 3.6.3.0 + url = "https://github.com/celery/billiard/pull/310/commits/a508ebafadcfe2e25554b029593f3e66d01ede6c.patch"; + sha256 = "05zsr1bvjgi01qg7r274c0qvbn65iig3clyz14c08mpfyn38h84i"; + excludes = [ "tox.ini" ]; + })]; - checkInputs = [ pytest case psutil ]; - checkPhase = '' - pytest - ''; + checkInputs = [ pytestCheckHook case psutil ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/celery/billiard"; description = "Python multiprocessing fork with improvements and bugfixes"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/binwalk/default.nix b/pkgs/development/python-modules/binwalk/default.nix index c6fbbc13c43d..3d1b9c0a90c4 100644 --- a/pkgs/development/python-modules/binwalk/default.nix +++ b/pkgs/development/python-modules/binwalk/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchFromGitHub , zlib @@ -49,7 +49,7 @@ buildPythonPackage { checkInputs = [ nose ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/ReFirmLabs/binwalk"; description = "A tool for searching a given binary image for embedded files"; maintainers = [ maintainers.koral ]; diff --git a/pkgs/development/python-modules/bitbox02/default.nix b/pkgs/development/python-modules/bitbox02/default.nix new file mode 100644 index 000000000000..e9cf4b36a49c --- /dev/null +++ b/pkgs/development/python-modules/bitbox02/default.nix @@ -0,0 +1,24 @@ +{ lib, buildPythonPackage, fetchPypi, base58, ecdsa, hidapi, noiseprotocol, protobuf, semver, typing-extensions }: + +buildPythonPackage rec { + pname = "bitbox02"; + version = "5.1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0hnjjjarr4q22wh03zyyqfhsizzsvg46030kks3qkzbsv29vqqh5"; + }; + + propagatedBuildInputs = [ base58 ecdsa hidapi noiseprotocol protobuf semver typing-extensions ]; + + # does not contain tests + doCheck = false; + pythonImportsCheck = [ "bitbox02" ]; + + meta = with lib; { + description = "Firmware code of the BitBox02 hardware wallet"; + homepage = "https://github.com/digitalbitbox/bitbox02-firmware/"; + license = licenses.asl20; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/development/python-modules/bitbucket-api/default.nix b/pkgs/development/python-modules/bitbucket-api/default.nix index 82b49a267574..559661bbb4f3 100644 --- a/pkgs/development/python-modules/bitbucket-api/default.nix +++ b/pkgs/development/python-modules/bitbucket-api/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy3k +{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k , requests_oauthlib, nose, sh }: buildPythonPackage rec { @@ -15,7 +15,7 @@ buildPythonPackage rec { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/Sheeprider/BitBucket-api"; description = "Python library to interact with BitBucket REST API"; license = licenses.mit; diff --git a/pkgs/development/python-modules/bitbucket-cli/default.nix b/pkgs/development/python-modules/bitbucket-cli/default.nix index 5e5d5662ba32..50075fe70fce 100644 --- a/pkgs/development/python-modules/bitbucket-cli/default.nix +++ b/pkgs/development/python-modules/bitbucket-cli/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy3k, requests }: +{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k, requests }: buildPythonPackage rec { pname = "bitbucket-cli"; @@ -15,7 +15,7 @@ buildPythonPackage rec { # No tests doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Bitbucket command line interface"; homepage = "https://bitbucket.org/zhemao/bitbucket-cli"; maintainers = with maintainers; [ refnil ]; diff --git a/pkgs/development/python-modules/bitmath/default.nix b/pkgs/development/python-modules/bitmath/default.nix index 55194b02db3a..49992c561f73 100644 --- a/pkgs/development/python-modules/bitmath/default.nix +++ b/pkgs/development/python-modules/bitmath/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy3k, progressbar231, progressbar33, mock }: +{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k, progressbar231, progressbar33, mock }: buildPythonPackage rec { pname = "bitmath"; @@ -11,7 +11,7 @@ buildPythonPackage rec { checkInputs = [ (if isPy3k then progressbar33 else progressbar231) mock ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Module for representing and manipulating file sizes with different prefix"; homepage = "https://github.com/tbielawa/bitmath"; license = licenses.mit; diff --git a/pkgs/development/python-modules/bitstring/default.nix b/pkgs/development/python-modules/bitstring/default.nix index a2ba5b10268c..d6eaf31056ff 100644 --- a/pkgs/development/python-modules/bitstring/default.nix +++ b/pkgs/development/python-modules/bitstring/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi }: +{ lib, stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "bitstring"; @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "0jl6192dwrlm5ybkbh7ywmyaymrc3cmz9y07nm7qdli9n9rfpwzx"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Module for binary data manipulation"; homepage = "https://github.com/scott-griffiths/bitstring"; license = licenses.mit; diff --git a/pkgs/development/python-modules/bjoern/default.nix b/pkgs/development/python-modules/bjoern/default.nix index c2f60fce9dc5..2949ecbf6f92 100644 --- a/pkgs/development/python-modules/bjoern/default.nix +++ b/pkgs/development/python-modules/bjoern/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, libev, python }: +{ lib, stdenv, buildPythonPackage, fetchPypi, libev, python }: buildPythonPackage rec { pname = "bjoern"; @@ -16,7 +16,7 @@ buildPythonPackage rec { ${python.interpreter} tests/test_wsgi_compliance.py ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/jonashaag/bjoern"; description = "A screamingly fast Python 2/3 WSGI server written in C"; license = licenses.bsd2; diff --git a/pkgs/development/python-modules/black-macchiato/default.nix b/pkgs/development/python-modules/black-macchiato/default.nix index 130d07d61ff4..536ad1f14b66 100644 --- a/pkgs/development/python-modules/black-macchiato/default.nix +++ b/pkgs/development/python-modules/black-macchiato/default.nix @@ -1,4 +1,4 @@ -{ stdenv, +{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder, @@ -25,7 +25,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "black" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "This is a small utility built on top of the black Python code formatter to enable formatting of partial files"; homepage = "https://github.com/wbolster/black-macchiato"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/bleak/default.nix b/pkgs/development/python-modules/bleak/default.nix index 91d94fcd72d9..06dc3217dc87 100644 --- a/pkgs/development/python-modules/bleak/default.nix +++ b/pkgs/development/python-modules/bleak/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, isPy3k, fetchPypi, bluez, txdbus, pytest, pytestcov }: +{ lib, stdenv, buildPythonPackage, isPy3k, fetchPypi, bluez, txdbus, pytest, pytestcov }: buildPythonPackage rec { pname = "bleak"; @@ -24,7 +24,7 @@ buildPythonPackage rec { checkPhase = "AGENT_OS=linux py.test"; - meta = with stdenv.lib; { + meta = with lib; { description = "Bluetooth Low Energy platform Agnostic Klient for Python"; homepage = "https://github.com/hbldh/bleak"; license = licenses.mit; diff --git a/pkgs/development/python-modules/blessed/default.nix b/pkgs/development/python-modules/blessed/default.nix index 7f1a24b48508..7adacecc647a 100644 --- a/pkgs/development/python-modules/blessed/default.nix +++ b/pkgs/development/python-modules/blessed/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, fetchpatch, six +{ lib, stdenv, buildPythonPackage, fetchPypi, fetchpatch, six , wcwidth, pytest, mock, glibcLocales }: @@ -21,7 +21,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ wcwidth six ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/jquast/blessed"; description = "A thin, practical wrapper around terminal capabilities in Python."; maintainers = with maintainers; [ eqyiel ]; diff --git a/pkgs/development/python-modules/blessings/default.nix b/pkgs/development/python-modules/blessings/default.nix index c285b3a7d003..5263a92ec3d9 100644 --- a/pkgs/development/python-modules/blessings/default.nix +++ b/pkgs/development/python-modules/blessings/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , six @@ -24,7 +24,7 @@ buildPythonPackage rec { nosetests ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/erikrose/blessings"; description = "A thin, practical wrapper around terminal coloring, styling, and positioning"; license = licenses.mit; diff --git a/pkgs/development/python-modules/blinker/default.nix b/pkgs/development/python-modules/blinker/default.nix index 5c76efb029fd..e33ad1626318 100644 --- a/pkgs/development/python-modules/blinker/default.nix +++ b/pkgs/development/python-modules/blinker/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi }: +{ lib, stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "blinker"; @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "1dpq0vb01p36jjwbhhd08ylvrnyvcc82yxx3mwjx6awrycjyw6j7"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://pythonhosted.org/blinker/"; description = "Fast, simple object-to-object and broadcast signaling"; license = licenses.mit; diff --git a/pkgs/development/python-modules/blis/default.nix b/pkgs/development/python-modules/blis/default.nix index 0042bcaf9293..eeb62e8fed32 100644 --- a/pkgs/development/python-modules/blis/default.nix +++ b/pkgs/development/python-modules/blis/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , cython @@ -30,7 +30,7 @@ buildPythonPackage rec { pytest ]; - meta = with stdenv.lib; { + meta = with lib; { description = "BLAS-like linear algebra library"; homepage = "https://github.com/explosion/cython-blis"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/blist/default.nix b/pkgs/development/python-modules/blist/default.nix index 52687bf2506d..505f01af5fe4 100644 --- a/pkgs/development/python-modules/blist/default.nix +++ b/pkgs/development/python-modules/blist/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchpatch , fetchPypi @@ -24,7 +24,7 @@ buildPythonPackage rec { }) ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://stutzbachenterprises.com/blist/"; description = "A list-like type with better asymptotic performance and similar performance on small lists"; license = licenses.bsd0; diff --git a/pkgs/development/python-modules/blivet/default.nix b/pkgs/development/python-modules/blivet/default.nix index d224f2bc22e1..94abc39fd285 100644 --- a/pkgs/development/python-modules/blivet/default.nix +++ b/pkgs/development/python-modules/blivet/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildPythonPackage, pykickstart, pyparted, pyblock +{ lib, stdenv, fetchFromGitHub, buildPythonPackage, pykickstart, pyparted, pyblock , pyudev, six, libselinux, multipath-tools, lsof, util-linux }: @@ -33,7 +33,7 @@ buildPythonPackage rec { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://fedoraproject.org/wiki/Blivet"; description = "Module for management of a system's storage configuration"; license = with licenses; [ gpl2Plus lgpl21Plus ]; diff --git a/pkgs/development/python-modules/block-io/default.nix b/pkgs/development/python-modules/block-io/default.nix index 24ddd429cd93..3a9704d71bc5 100644 --- a/pkgs/development/python-modules/block-io/default.nix +++ b/pkgs/development/python-modules/block-io/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage, base58, ecdsa, pycryptodome, requests, six, setuptools }: +{ lib, stdenv, fetchPypi, buildPythonPackage, base58, ecdsa, pycryptodome, requests, six, setuptools }: buildPythonPackage rec { pname = "block-io"; @@ -30,7 +30,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "block_io" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Integrate Bitcoin, Dogecoin and Litecoin in your Python applications using block.io"; homepage = "https://github.com/BlockIo/block_io-python"; license = licenses.mit; diff --git a/pkgs/development/python-modules/blockchain/default.nix b/pkgs/development/python-modules/blockchain/default.nix new file mode 100644 index 000000000000..e6d523c3c7b8 --- /dev/null +++ b/pkgs/development/python-modules/blockchain/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchPypi +, future +}: + +buildPythonPackage rec { + pname = "blockchain"; + version = "1.4.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "1qpbmz6dk5gx1996dswpipwhj6sp5j0dlfap012l46zqnvmkxanv"; + }; + + postPatch = '' + substituteInPlace setup.py --replace "enum-compat" "" + ''; + + propagatedBuildInputs = [ + future + ]; + + # tests are interacting with the API and not mocking the calls + doCheck = false; + + pythonImportsCheck = [ "blockchain" ]; + + meta = with lib; { + description = "Python client Blockchain Bitcoin Developer API"; + homepage = "https://github.com/blockchain/api-v1-client-python"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/blockdiag/default.nix b/pkgs/development/python-modules/blockdiag/default.nix index ff53884ef376..5adc854d0263 100644 --- a/pkgs/development/python-modules/blockdiag/default.nix +++ b/pkgs/development/python-modules/blockdiag/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub +{ lib, stdenv, buildPythonPackage, fetchFromGitHub , setuptools, funcparserlib, pillow, webcolors, reportlab, docutils }: @@ -18,7 +18,7 @@ buildPythonPackage rec { # require network and fail doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Generate block-diagram image from spec-text file (similar to Graphviz)"; homepage = "http://blockdiag.com/"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/bluepy/default.nix b/pkgs/development/python-modules/bluepy/default.nix index 8d247b41d277..d833d20934d6 100644 --- a/pkgs/development/python-modules/bluepy/default.nix +++ b/pkgs/development/python-modules/bluepy/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , pkg-config @@ -25,11 +25,11 @@ buildPythonPackage rec { ''; pythonImportsCheck = [ "bluepy" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Python interface to Bluetooth LE on Linux"; homepage = "https://github.com/IanHarvey/bluepy"; maintainers = with maintainers; [ georgewhewell ]; + platforms = platforms.linux; license = licenses.gpl2; }; - } diff --git a/pkgs/development/python-modules/boltons/default.nix b/pkgs/development/python-modules/boltons/default.nix index 080165f70712..13e264340da1 100644 --- a/pkgs/development/python-modules/boltons/default.nix +++ b/pkgs/development/python-modules/boltons/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, pytest }: +{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pytest }: buildPythonPackage rec { pname = "boltons"; @@ -15,7 +15,7 @@ buildPythonPackage rec { checkInputs = [ pytest ]; checkPhase = "pytest tests"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/mahmoud/boltons"; description = "220+ constructs, recipes, and snippets extending (and relying on nothing but) the Python standard library"; longDescription = '' diff --git a/pkgs/development/python-modules/boltztrap2/default.nix b/pkgs/development/python-modules/boltztrap2/default.nix index 48fc3bf69983..48bc53bbeeda 100644 --- a/pkgs/development/python-modules/boltztrap2/default.nix +++ b/pkgs/development/python-modules/boltztrap2/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , spglib @@ -36,7 +36,7 @@ buildPythonPackage rec { py.test ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.boltztrap.org/"; description = "Band-structure interpolator and transport coefficient calculator"; license = licenses.gpl3; diff --git a/pkgs/development/python-modules/bootstrapped-pip/default.nix b/pkgs/development/python-modules/bootstrapped-pip/default.nix index 9679edd95127..690c88b83f43 100644 --- a/pkgs/development/python-modules/bootstrapped-pip/default.nix +++ b/pkgs/development/python-modules/bootstrapped-pip/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { mv wheel* wheel # Set up PYTHONPATH. The above folders need to be on PYTHONPATH # $out is where we are installing to and takes precedence - export PYTHONPATH="$out/${python.sitePackages}:$(pwd)/pip/src:$(pwd)/setuptools:$(pwd)/setuptools/pkg_resources:$(pwd)/wheel" + export PYTHONPATH="$out/${python.sitePackages}:$(pwd)/pip/src:$(pwd)/setuptools:$(pwd)/setuptools/pkg_resources:$(pwd)/wheel:$PYTHONPATH" echo "Building setuptools wheel..." pushd setuptools diff --git a/pkgs/development/python-modules/boto3/default.nix b/pkgs/development/python-modules/boto3/default.nix index f259ea6a7891..d4bcb9381e82 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.16.44"; # N.B: if you change this, change botocore too + version = "1.16.51"; # N.B: if you change this, change botocore too src = fetchPypi { inherit pname version; - sha256 = "sha256-4/EO1tnKmEFf3sFcheUKiew41iKbzj+v1eeWWxbE68U="; + sha256 = "sha256-EdxJJoLPKk+P85ewoQmDc0Dvk+d8ouZXFc4k7PBDcXw="; }; 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 69666938301b..8e4812e868e1 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.19.44"; # N.B: if you change this, change boto3 and awscli to a matching version + version = "1.19.51"; # N.B: if you change this, change boto3 and awscli to a matching version src = fetchPypi { inherit pname version; - sha256 = "sha256-dyXgjJWulsTb2VXLSuRKDAbT5B92p/6wqUHCekTGMRM="; + sha256 = "sha256-sgTFtHewQ8f2HLpdtHnGsl9oT3QJtxqOzbWms/V7XLQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/bottle/default.nix b/pkgs/development/python-modules/bottle/default.nix index 52d97582ef31..213d69dd9890 100644 --- a/pkgs/development/python-modules/bottle/default.nix +++ b/pkgs/development/python-modules/bottle/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, setuptools }: +{ lib, stdenv, buildPythonPackage, fetchPypi, setuptools }: buildPythonPackage rec { pname = "bottle"; @@ -11,7 +11,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ setuptools ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://bottlepy.org"; description = "A fast and simple micro-framework for small web-applications"; license = licenses.mit; diff --git a/pkgs/development/python-modules/box2d/default.nix b/pkgs/development/python-modules/box2d/default.nix index 1b372f90a90f..92ac90ab6d4d 100644 --- a/pkgs/development/python-modules/box2d/default.nix +++ b/pkgs/development/python-modules/box2d/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , swig2 @@ -24,7 +24,7 @@ buildPythonPackage rec { # tests not included with pypi release doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/pybox2d/pybox2d"; description = '' A 2D game physics library for Python under diff --git a/pkgs/development/python-modules/bpython/default.nix b/pkgs/development/python-modules/bpython/default.nix index 7dfe8053ca24..108d8ec0c66b 100644 --- a/pkgs/development/python-modules/bpython/default.nix +++ b/pkgs/development/python-modules/bpython/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , curtsies @@ -36,7 +36,7 @@ buildPythonPackage rec { # tests fail: https://github.com/bpython/bpython/issues/712 doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "A fancy curses interface to the Python interactive interpreter"; homepage = "https://bpython-interpreter.org/"; license = licenses.mit; diff --git a/pkgs/development/python-modules/branca/default.nix b/pkgs/development/python-modules/branca/default.nix index 7884ff65f288..4251c88058cd 100644 --- a/pkgs/development/python-modules/branca/default.nix +++ b/pkgs/development/python-modules/branca/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "branca"; - version = "0.4.1"; + version = "0.4.2"; src = fetchPypi { inherit pname version; - sha256 = "1f7drarwiw8fh17hpq8b3p4mfqgjbh3k045dvpx5z12d3a0zg7ca"; + sha256 = "c111453617b17ab2bda60a4cd71787d6f2b59c85cdf71ab160a737606ac66c31"; }; checkInputs = [ pytest selenium ]; diff --git a/pkgs/development/python-modules/browser-cookie3/default.nix b/pkgs/development/python-modules/browser-cookie3/default.nix index ad8fe1c8a077..7b579a84ba18 100644 --- a/pkgs/development/python-modules/browser-cookie3/default.nix +++ b/pkgs/development/python-modules/browser-cookie3/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "browser-cookie3"; - version = "0.11.4"; + version = "0.12.0"; src = fetchPypi { inherit pname version; - sha256 = "3d140c6b651dbd8b8555aca6472557fcfda4dd93afc26ea3a200be922a843e2c"; + sha256 = "5f26422091ad0e97375d565f8fbacfaf314d0722db35c921635eab23686e4fc4"; }; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/bsddb3/default.nix b/pkgs/development/python-modules/bsddb3/default.nix index 0989b61b6cfa..9877a03a087e 100644 --- a/pkgs/development/python-modules/bsddb3/default.nix +++ b/pkgs/development/python-modules/bsddb3/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , pkgs @@ -28,7 +28,7 @@ buildPythonPackage rec { export BERKELEYDB_DIR=${pkgs.db.dev}; ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Python bindings for Oracle Berkeley DB"; homepage = "https://www.jcea.es/programacion/pybsddb.htm"; license = with licenses; [ agpl3 ]; # License changed from bsd3 to agpl3 since 6.x diff --git a/pkgs/development/python-modules/bsdiff4/default.nix b/pkgs/development/python-modules/bsdiff4/default.nix index aabcd4de9343..f70f71c1a699 100644 --- a/pkgs/development/python-modules/bsdiff4/default.nix +++ b/pkgs/development/python-modules/bsdiff4/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , aflplusplus @@ -18,7 +18,7 @@ buildPythonPackage rec { python -c 'import bsdiff4; bsdiff4.test()' ''; - meta = with stdenv.lib; { + meta = with lib; { description = "binary diff and patch using the BSDIFF4-format"; homepage = "https://github.com/ilanschnell/bsdiff4"; license = licenses.bsdProtection; diff --git a/pkgs/development/python-modules/bt-proximity/default.nix b/pkgs/development/python-modules/bt-proximity/default.nix index 17f384062482..209565fa21b7 100644 --- a/pkgs/development/python-modules/bt-proximity/default.nix +++ b/pkgs/development/python-modules/bt-proximity/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub +{ lib, stdenv, buildPythonPackage, fetchFromGitHub , pybluez }: buildPythonPackage { @@ -18,7 +18,7 @@ buildPythonPackage { # there are no tests doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Bluetooth Proximity Detection using Python"; homepage = "https://github.com/FrederikBolding/bluetooth-proximity"; maintainers = with maintainers; [ peterhoeg ]; diff --git a/pkgs/development/python-modules/btchip/default.nix b/pkgs/development/python-modules/btchip/default.nix index c84ee0f0be7f..ebb14a77b564 100644 --- a/pkgs/development/python-modules/btchip/default.nix +++ b/pkgs/development/python-modules/btchip/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, hidapi, pyscard, ecdsa }: +{ lib, stdenv, buildPythonPackage, fetchPypi, hidapi, pyscard, ecdsa }: buildPythonPackage rec { pname = "btchip-python"; @@ -14,7 +14,7 @@ buildPythonPackage rec { # tests requires hardware doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Python communication library for Ledger Hardware Wallet products"; homepage = "https://github.com/LedgerHQ/btchip-python"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/btrees/default.nix b/pkgs/development/python-modules/btrees/default.nix index 08f2c1eeb2ff..471ba54215de 100644 --- a/pkgs/development/python-modules/btrees/default.nix +++ b/pkgs/development/python-modules/btrees/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchPypi , buildPythonPackage , persistent @@ -26,7 +26,7 @@ buildPythonPackage rec { sha256 = "7ce4a5eb5c135bcb5c06b5bd1ca6fd7fd39d8631306182307ed8bc30d3033846"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Scalable persistent components"; homepage = "http://packages.python.org/BTrees"; license = licenses.zpl21; diff --git a/pkgs/development/python-modules/btrfs/default.nix b/pkgs/development/python-modules/btrfs/default.nix index 225b26b4d650..8ea93fe005e7 100644 --- a/pkgs/development/python-modules/btrfs/default.nix +++ b/pkgs/development/python-modules/btrfs/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi }: @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "1w92sj47wy53ygz725xr613k32pk5khi0g9lrpp6img871241hrx"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Inspect btrfs filesystems"; homepage = "https://github.com/knorrie/python-btrfs"; license = licenses.lgpl3Plus; diff --git a/pkgs/development/python-modules/bugsnag/default.nix b/pkgs/development/python-modules/bugsnag/default.nix index 603e6f42e450..5e3b0b4e89f7 100644 --- a/pkgs/development/python-modules/bugsnag/default.nix +++ b/pkgs/development/python-modules/bugsnag/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , pythonOlder @@ -21,7 +21,7 @@ buildPythonPackage rec { # no tests doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Automatic error monitoring for django, flask, etc."; homepage = "https://www.bugsnag.com"; license = licenses.mit; diff --git a/pkgs/development/python-modules/bugwarrior/default.nix b/pkgs/development/python-modules/bugwarrior/default.nix index 25de097f1a96..3d27384efe18 100644 --- a/pkgs/development/python-modules/bugwarrior/default.nix +++ b/pkgs/development/python-modules/bugwarrior/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, setuptools +{ lib, stdenv, buildPythonPackage, fetchPypi, pythonOlder, setuptools , twiggy, requests, offtrac, bugzilla, taskw, dateutil, pytz, keyring, six , jinja2, pycurl, dogpile_cache, lockfile, click, pyxdg, future, jira }: @@ -21,7 +21,7 @@ buildPythonPackage rec { # for the moment oauth2client <4.0.0 and megaplan>=1.4 are missing for running the test suite. doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/ralphbean/bugwarrior"; description = "Sync github, bitbucket, bugzilla, and trac issues with taskwarrior"; license = licenses.gpl3Plus; diff --git a/pkgs/development/python-modules/bugz/default.nix b/pkgs/development/python-modules/bugz/default.nix index abfde52ef5f7..5324a43e1b0c 100644 --- a/pkgs/development/python-modules/bugz/default.nix +++ b/pkgs/development/python-modules/bugz/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchFromGitHub }: @@ -16,7 +16,7 @@ buildPythonPackage { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/williamh/pybugz"; description = "Command line interface for Bugzilla"; license = licenses.gpl2; diff --git a/pkgs/development/python-modules/bugzilla/default.nix b/pkgs/development/python-modules/bugzilla/default.nix index f40488511093..fc122ecd233c 100644 --- a/pkgs/development/python-modules/bugzilla/default.nix +++ b/pkgs/development/python-modules/bugzilla/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ lib, stdenv, buildPythonPackage, fetchPypi , pep8, coverage, logilab_common, requests }: buildPythonPackage rec { @@ -19,7 +19,7 @@ buildPythonPackage rec { export HOME=$(pwd)/check-phase ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/python-bugzilla/python-bugzilla"; description = "Bugzilla XMLRPC access module"; license = licenses.gpl2; diff --git a/pkgs/development/python-modules/buildbot/default.nix b/pkgs/development/python-modules/buildbot/default.nix index 31a342b7621a..84476a2ca361 100644 --- a/pkgs/development/python-modules/buildbot/default.nix +++ b/pkgs/development/python-modules/buildbot/default.nix @@ -25,11 +25,11 @@ let package = buildPythonPackage rec { pname = "buildbot"; - version = "2.9.2"; + version = "2.10.0"; src = fetchPypi { inherit pname version; - sha256 = "019xfxjnyfi69d5sm3alvib24g8giqlvc102p8hqg8mfm7hc9z2v"; + sha256 = "06fgp5gpacyx1sqh1f6590r792d5lhzspwmjli592ajx69ckzzwf"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/buildbot/pkg.nix b/pkgs/development/python-modules/buildbot/pkg.nix index 70073eb5c9a2..90c2f0991970 100644 --- a/pkgs/development/python-modules/buildbot/pkg.nix +++ b/pkgs/development/python-modules/buildbot/pkg.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "01s58zi72drv4lwn6jg6i5mrpf3mpq74761z6iwx5hsdnqg1hxai"; + sha256 = "1wr8fxa80c6vq55zv7k9rf61r805flrhd2v28qfl05jz1inghysb"; }; postPatch = '' diff --git a/pkgs/development/python-modules/buildbot/plugins.nix b/pkgs/development/python-modules/buildbot/plugins.nix index 43bc8717e59c..92e78f940d53 100644 --- a/pkgs/development/python-modules/buildbot/plugins.nix +++ b/pkgs/development/python-modules/buildbot/plugins.nix @@ -7,7 +7,7 @@ src = fetchPypi { inherit pname version; - sha256 = "1z5sca2ksbr1j6p0kr8i9a61c46mdmbbd6hvc6407c3z5393mp30"; + sha256 = "0bzn00qqx0xd9r4rrz01y9zmiwjlhcanrs13r1yzp2mycn9q5865"; }; # Remove unneccessary circular dependency on buildbot @@ -34,7 +34,7 @@ src = fetchPypi { inherit pname version; - sha256 = "1kz54zlc2yr9cjvw7rihcx7hfk245r6yh4mfyala38jby3hd68p0"; + sha256 = "0yh0dpg27gl3pk3nimj1yb6rw7kxvsv1bvzc6hbcfx3a9qdajicj"; }; buildInputs = [ buildbot-pkg ]; @@ -56,7 +56,7 @@ src = fetchPypi { inherit pname version; - sha256 = "0ac0dzldxl4j9cb4kpmhjwf5m1zjjvcg0hx9kghallab0sk1198p"; + sha256 = "0b9fffr53wfq328csrqgdinafbs1v5s7yn4ky8faw6sqyd8l197v"; }; buildInputs = [ buildbot-pkg ]; @@ -78,7 +78,7 @@ src = fetchPypi { inherit pname version; - sha256 = "1m41l2d6yb4mbg1ybn7q6wmkfvwssmfb4inmpwyvy55bcvgyixcm"; + sha256 = "0pz1kmq731ap79l05l13f10r81lzgif5aydpsfz3k5fa9flvxjxs"; }; buildInputs = [ buildbot-pkg ]; @@ -100,7 +100,7 @@ src = fetchPypi { inherit pname version; - sha256 = "1g58kr2zc7k94k0avly0vyyryg18gpsbick8mj5cz81s2pfmmyfq"; + sha256 = "1jf72dzmgwrkqbr2f8s2dvf0zpvl3vbdq0qsf0g8xal272l7cmca"; }; buildInputs = [ buildbot-pkg ]; diff --git a/pkgs/development/python-modules/buildbot/worker.nix b/pkgs/development/python-modules/buildbot/worker.nix index 942c82f15a06..bf5e1e6ae989 100644 --- a/pkgs/development/python-modules/buildbot/worker.nix +++ b/pkgs/development/python-modules/buildbot/worker.nix @@ -7,7 +7,7 @@ buildPythonPackage (rec { src = fetchPypi { inherit pname version; - sha256 = "1salrdirny1jpm53shb9dhzs1w7rbp5q7z2qpzrg1nmsh2kcd6ap"; + sha256 = "1s51ycgnvjbxc2y358vw6rnw8xsx9grj6pxzfxjrph784igy22r0"; }; propagatedBuildInputs = [ twisted future ]; diff --git a/pkgs/development/python-modules/buildout/default.nix b/pkgs/development/python-modules/buildout/default.nix index 20731e76c814..0751b284a786 100644 --- a/pkgs/development/python-modules/buildout/default.nix +++ b/pkgs/development/python-modules/buildout/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi }: +{ lib, stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "zc.buildout"; @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "1dyc5g3yv7wm3hf3fcsh6y1wivzjj1bspafr5qqb653z9a31lsfn"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.buildout.org"; description = "A software build and configuration system"; license = licenses.zpl21; diff --git a/pkgs/development/python-modules/bumps/default.nix b/pkgs/development/python-modules/bumps/default.nix index e2938e0f32e2..05f082c747bd 100644 --- a/pkgs/development/python-modules/bumps/default.nix +++ b/pkgs/development/python-modules/bumps/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, six}: +{ lib, stdenv, buildPythonPackage, fetchPypi, six}: buildPythonPackage rec { pname = "bumps"; @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "9f92c05effd8175763799d19ca55592e89b053318f611148a6725159aea41d67"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.reflectometry.org/danse/software.html"; description = "Data fitting with bayesian uncertainty analysis"; maintainers = with maintainers; [ rprospero ]; diff --git a/pkgs/development/python-modules/bunch/default.nix b/pkgs/development/python-modules/bunch/default.nix index 42918f023398..ce77085e4f7f 100644 --- a/pkgs/development/python-modules/bunch/default.nix +++ b/pkgs/development/python-modules/bunch/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi }: +{ lib, stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "bunch"; @@ -11,7 +11,7 @@ buildPythonPackage rec { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/bwapy/default.nix b/pkgs/development/python-modules/bwapy/default.nix index 31884074defd..c736eb577d44 100644 --- a/pkgs/development/python-modules/bwapy/default.nix +++ b/pkgs/development/python-modules/bwapy/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , pythonOlder , fetchPypi @@ -33,7 +33,7 @@ buildPythonPackage rec { doCheck = false; pythonImportsCheck = [ "bwapy" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/ACEnglish/acebinf"; description = "Python bindings to bwa mem aligner"; license = licenses.mpl20; diff --git a/pkgs/development/python-modules/cachecontrol/default.nix b/pkgs/development/python-modules/cachecontrol/default.nix index e5a7584234ca..53b13ddb5685 100644 --- a/pkgs/development/python-modules/cachecontrol/default.nix +++ b/pkgs/development/python-modules/cachecontrol/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , requests @@ -25,7 +25,7 @@ buildPythonPackage rec { pytest tests ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/ionrock/cachecontrol"; description = "Httplib2 caching for requests"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/cachelib/default.nix b/pkgs/development/python-modules/cachelib/default.nix index e73bbaa28a69..503b546116ef 100644 --- a/pkgs/development/python-modules/cachelib/default.nix +++ b/pkgs/development/python-modules/cachelib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi }: +{ lib, stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "cachelib"; @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "47e95a67d68c729cbad63285a790a06f0e0d27d71624c6e44c1ec3456bb4476f"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/pallets/cachelib"; description = "Collection of cache libraries in the same API interface"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/cachetools/default.nix b/pkgs/development/python-modules/cachetools/default.nix index 6cc6c45137f5..6fd3f637875d 100644 --- a/pkgs/development/python-modules/cachetools/default.nix +++ b/pkgs/development/python-modules/cachetools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy27 }: +{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27 }: buildPythonPackage rec { pname = "cachetools"; @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "bbaa39c3dede00175df2dc2b03d0cf18dd2d32a7de7beb68072d13043c9edb20"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Extensible memoizing collections and decorators"; homepage = "https://github.com/tkem/cachetools"; license = licenses.mit; diff --git a/pkgs/development/python-modules/cairosvg/1_x.nix b/pkgs/development/python-modules/cairosvg/1_x.nix index b98fbbf91e86..bb5629cf4e51 100644 --- a/pkgs/development/python-modules/cairosvg/1_x.nix +++ b/pkgs/development/python-modules/cairosvg/1_x.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, cairocffi, nose, fontconfig +{ lib, stdenv, buildPythonPackage, fetchFromGitHub, cairocffi, nose, fontconfig , cssselect2, defusedxml, pillow, tinycss2 }: # CairoSVG 2.x dropped support for Python 2 so offer CairoSVG 1.x as an @@ -28,7 +28,7 @@ buildPythonPackage rec { # FONTCONFIG_FILE=${fontconfig.out}/etc/fonts/fonts.conf nosetests . # ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://cairosvg.org"; license = licenses.lgpl3; description = "SVG converter based on Cairo"; diff --git a/pkgs/development/python-modules/cairosvg/default.nix b/pkgs/development/python-modules/cairosvg/default.nix index da3e84b725dd..9d1c54651c20 100644 --- a/pkgs/development/python-modules/cairosvg/default.nix +++ b/pkgs/development/python-modules/cairosvg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy3k, fetchpatch +{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k, fetchpatch , cairocffi, cssselect2, defusedxml, pillow, tinycss2 , pytest, pytestrunner, pytestcov, pytest-flake8, pytest-isort }: @@ -17,7 +17,7 @@ buildPythonPackage rec { checkInputs = [ pytest pytestrunner pytestcov pytest-flake8 pytest-isort ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://cairosvg.org"; license = licenses.lgpl3; description = "SVG converter based on Cairo"; diff --git a/pkgs/development/python-modules/canonicaljson/default.nix b/pkgs/development/python-modules/canonicaljson/default.nix index 31daad18bdc8..96af6f4bf78f 100644 --- a/pkgs/development/python-modules/canonicaljson/default.nix +++ b/pkgs/development/python-modules/canonicaljson/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ lib, stdenv, buildPythonPackage, fetchPypi , frozendict, simplejson, six, isPy27 }: @@ -16,7 +16,7 @@ buildPythonPackage rec { frozendict simplejson six ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/matrix-org/python-canonicaljson"; description = "Encodes objects and arrays as RFC 7159 JSON."; license = licenses.asl20; diff --git a/pkgs/development/python-modules/capstone/default.nix b/pkgs/development/python-modules/capstone/default.nix index 7fc0b16522ed..7d5e416a9c5d 100644 --- a/pkgs/development/python-modules/capstone/default.nix +++ b/pkgs/development/python-modules/capstone/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , fetchpatch @@ -26,7 +26,7 @@ buildPythonPackage rec { make check ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.capstone-engine.org/"; license = licenses.bsdOriginal; description = "Python bindings for Capstone disassembly engine"; diff --git a/pkgs/development/python-modules/carbon/default.nix b/pkgs/development/python-modules/carbon/default.nix index 71a7174fb23f..e0a31829b05f 100644 --- a/pkgs/development/python-modules/carbon/default.nix +++ b/pkgs/development/python-modules/carbon/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy3k +{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k , twisted, whisper, txamqp, cachetools, urllib3 }: @@ -17,7 +17,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ twisted whisper txamqp cachetools urllib3 ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://graphiteapp.org/"; description = "Backend data caching and persistence daemon for Graphite"; maintainers = with maintainers; [ offline basvandijk ]; diff --git a/pkgs/development/python-modules/carrot/default.nix b/pkgs/development/python-modules/carrot/default.nix index 9a5ffe578565..c2262decd314 100644 --- a/pkgs/development/python-modules/carrot/default.nix +++ b/pkgs/development/python-modules/carrot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ lib, stdenv, buildPythonPackage, fetchPypi , nose, amqplib, anyjson }: buildPythonPackage rec { @@ -15,7 +15,7 @@ buildPythonPackage rec { doCheck = false; # depends on the network - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://pypi.python.org/pypi/carrot"; description = "AMQP Messaging Framework for Python"; }; diff --git a/pkgs/development/python-modules/casbin/default.nix b/pkgs/development/python-modules/casbin/default.nix index 6633657d1863..d1b795a9ef43 100644 --- a/pkgs/development/python-modules/casbin/default.nix +++ b/pkgs/development/python-modules/casbin/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "casbin"; - version = "0.15.0"; + version = "0.16.0"; disabled = isPy27; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = pname; repo = "pycasbin"; rev = "v${version}"; - sha256 = "0w34xs9qpf1x4rq2ri4fhx3yi8h4inzavv9hjsx8mlkzid7gdx1b"; + sha256 = "1983p8pkbdj6yaclkdng7fn0pmlbz1yc75a4a847ppw47075ryph"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/case/default.nix b/pkgs/development/python-modules/case/default.nix index 771a349be1f7..5d1a7696516a 100644 --- a/pkgs/development/python-modules/case/default.nix +++ b/pkgs/development/python-modules/case/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ lib, stdenv, buildPythonPackage, fetchPypi , six, nose, unittest2, mock }: buildPythonPackage rec { @@ -12,7 +12,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six nose unittest2 mock ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/celery/case"; description = "unittests utilities"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/casttube/default.nix b/pkgs/development/python-modules/casttube/default.nix index ff8e5614ceb6..85b1147c13a5 100644 --- a/pkgs/development/python-modules/casttube/default.nix +++ b/pkgs/development/python-modules/casttube/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, requests }: +{ lib, stdenv, buildPythonPackage, fetchPypi, requests }: buildPythonPackage rec { pname = "casttube"; @@ -14,7 +14,7 @@ buildPythonPackage rec { # no tests doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Interact with the Youtube Chromecast api"; homepage = "https://github.com/ur1katz/casttube"; license = licenses.mit; diff --git a/pkgs/development/python-modules/catalogue/default.nix b/pkgs/development/python-modules/catalogue/default.nix index 1624cbcf36ce..c4cd89cab68a 100644 --- a/pkgs/development/python-modules/catalogue/default.nix +++ b/pkgs/development/python-modules/catalogue/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , pythonOlder @@ -21,7 +21,7 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook ]; - meta = with stdenv.lib; { + meta = with 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}"; diff --git a/pkgs/development/python-modules/cbor/default.nix b/pkgs/development/python-modules/cbor/default.nix index 3ebf5f26b821..f081511265fd 100644 --- a/pkgs/development/python-modules/cbor/default.nix +++ b/pkgs/development/python-modules/cbor/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi }: +{ lib, stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "cbor"; @@ -13,7 +13,7 @@ buildPythonPackage rec { # https://github.com/brianolson/cbor_py/issues/6 doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://bitbucket.org/bodhisnarkva/cbor"; description = "Concise Binary Object Representation (CBOR) library"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/cccolutils/default.nix b/pkgs/development/python-modules/cccolutils/default.nix index 5f5e396a02e2..96e75405ee3c 100644 --- a/pkgs/development/python-modules/cccolutils/default.nix +++ b/pkgs/development/python-modules/cccolutils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy3k, krb5Full, nose, GitPython, mock, git }: +{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k, krb5Full, nose, GitPython, mock, git }: buildPythonPackage rec { pname = "CCColUtils"; @@ -14,7 +14,7 @@ buildPythonPackage rec { doCheck = isPy3k; # needs unpackaged module to run tests on python2 - meta = with stdenv.lib; { + meta = with lib; { description = "Python Kerberos 5 Credential Cache Collection Utilities"; homepage = "https://pagure.io/cccolutils"; license = licenses.gpl2; diff --git a/pkgs/development/python-modules/cddb/default.nix b/pkgs/development/python-modules/cddb/default.nix index 5c27b48d62f3..0956a971ebd8 100644 --- a/pkgs/development/python-modules/cddb/default.nix +++ b/pkgs/development/python-modules/cddb/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , pkgs , isPy3k @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "098xhd575ibvdx7i3dny3lwi851yxhjg2hn5jbbgrwj833rg5l5w"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://cddb-py.sourceforge.net/"; description = "CDDB and FreeDB audio CD track info access"; license = licenses.gpl2Plus; diff --git a/pkgs/development/python-modules/cdecimal/default.nix b/pkgs/development/python-modules/cdecimal/default.nix index 3508b392203d..f788d32520e1 100644 --- a/pkgs/development/python-modules/cdecimal/default.nix +++ b/pkgs/development/python-modules/cdecimal/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, buildPythonPackage, isPy3k }: +{ lib, stdenv, fetchurl, buildPythonPackage, isPy3k }: with stdenv.lib; @@ -16,7 +16,7 @@ buildPythonPackage rec { # Upstream tests are not included s. a. http://www.bytereef.org/mpdecimal/testing.html doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Fast drop-in replacement for decimal.py"; homepage = "http://www.bytereef.org/mpdecimal/"; license = licenses.bsd2; diff --git a/pkgs/development/python-modules/cement/default.nix b/pkgs/development/python-modules/cement/default.nix index 9117908f399a..9133389f0ce9 100644 --- a/pkgs/development/python-modules/cement/default.nix +++ b/pkgs/development/python-modules/cement/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy3k }: +{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k }: buildPythonPackage rec { pname = "cement"; @@ -15,7 +15,7 @@ buildPythonPackage rec { disabled = !isPy3k; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://builtoncement.com/"; description = "A CLI Application Framework for Python."; maintainers = with maintainers; [ eqyiel ]; diff --git a/pkgs/development/python-modules/cerberus/default.nix b/pkgs/development/python-modules/cerberus/default.nix index b0c35204d6e7..08b7527c54c1 100644 --- a/pkgs/development/python-modules/cerberus/default.nix +++ b/pkgs/development/python-modules/cerberus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, pytestrunner, pytest }: +{ lib, stdenv, buildPythonPackage, fetchPypi, pytestrunner, pytest }: buildPythonPackage rec { pname = "Cerberus"; @@ -15,7 +15,7 @@ buildPythonPackage rec { pytest -k 'not nested_oneofs' ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://python-cerberus.org/"; description = "Lightweight, extensible schema and data validation tool for Python dictionaries"; license = licenses.mit; diff --git a/pkgs/development/python-modules/cert-chain-resolver/default.nix b/pkgs/development/python-modules/cert-chain-resolver/default.nix new file mode 100644 index 000000000000..eea43d5c7393 --- /dev/null +++ b/pkgs/development/python-modules/cert-chain-resolver/default.nix @@ -0,0 +1,36 @@ +{ lib +, fetchFromGitHub +, buildPythonPackage +, pytestCheckHook +, pytest-mock +, cryptography +}: + +buildPythonPackage rec { + pname = "cert-chain-resolver"; + version = "1.0.1"; + + src = fetchFromGitHub { + owner = "rkoopmans"; + repo = "python-certificate-chain-resolver"; + rev = version; + sha256 = "1kmig4ksbx1wvgcjn4r9jjg2pn1ag5rq871bjwxkp9kslb3x3d1l"; + }; + + propagatedBuildInputs = [ cryptography ]; + + checkInputs = [ pytestCheckHook pytest-mock ]; + + # online tests + disabledTests = [ + "test_cert_returns_completed_chain" + "test_display_flag_is_properly_formatted" + ]; + + meta = with lib; { + homepage = "https://github.com/rkoopmans/python-certificate-chain-resolver"; + description = "Resolve / obtain the certificate intermediates of a x509 certificate"; + license = licenses.mit; + maintainers = with maintainers; [ veehaitch ]; + }; +} diff --git a/pkgs/development/python-modules/certifi/default.nix b/pkgs/development/python-modules/certifi/default.nix index e86ad90caeb0..eac32816caca 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.11.8"; + version = "2020.12.5"; src = fetchPypi { inherit pname version; - sha256 = "f05def092c44fbf25834a51509ef6e631dc19765ab8a57b4e7ab85531f0a9cf4"; + sha256 = "177mdbw0livdjvp17sz6wsfrc32838m9y59v871gpgv2888raj8s"; }; pythonImportsCheck = [ "certifi" ]; diff --git a/pkgs/development/python-modules/certipy/default.nix b/pkgs/development/python-modules/certipy/default.nix index 5d34eede3110..049e3ffdb5d9 100644 --- a/pkgs/development/python-modules/certipy/default.nix +++ b/pkgs/development/python-modules/certipy/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , pyopenssl @@ -17,7 +17,7 @@ buildPythonPackage rec { doCheck = false; #no tests were included - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/LLNL/certipy"; description = "wrapper for pyOpenSSL"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/cffi/default.nix b/pkgs/development/python-modules/cffi/default.nix index 07492240ffe9..55390ea5ff94 100644 --- a/pkgs/development/python-modules/cffi/default.nix +++ b/pkgs/development/python-modules/cffi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, isPyPy, fetchPypi, libffi, pycparser, pytest }: +{ lib, stdenv, buildPythonPackage, isPyPy, fetchPypi, libffi, pycparser, pytest }: if isPyPy then null else buildPythonPackage rec { pname = "cffi"; @@ -37,7 +37,7 @@ if isPyPy then null else buildPythonPackage rec { py.test -k "not test_char_pointer_conversion" ''; - meta = with stdenv.lib; { + meta = with lib; { maintainers = with maintainers; [ domenkozar lnl7 ]; homepage = "https://cffi.readthedocs.org/"; license = with licenses; [ mit ]; diff --git a/pkgs/development/python-modules/cfn-lint/default.nix b/pkgs/development/python-modules/cfn-lint/default.nix index b79bf7613177..f55042c58d23 100644 --- a/pkgs/development/python-modules/cfn-lint/default.nix +++ b/pkgs/development/python-modules/cfn-lint/default.nix @@ -14,25 +14,25 @@ , requests , setuptools , six -# Test inputs -, pytestCheckHook , mock , pydot +, pytestCheckHook }: buildPythonPackage rec { pname = "cfn-lint"; - version = "0.35.1"; + version = "0.42.0"; src = fetchFromGitHub { owner = "aws-cloudformation"; - repo = "cfn-python-lint"; + repo = "cfn-python-lint"; rev = "v${version}"; - sha256 = "1ajb0412hw9fg9m4b3xbpfbp8cixmnpjxrkaks6k749xinzsv7qk"; + sha256 = "0cqpq7pxpslpd7am6mp6nmwhsb2p2a5lq3hjjxi8imv3wv7zql98"; }; postPatch = '' - substituteInPlace setup.py --replace 'importlib_resources~=1.4;python_version<"3.7" and python_version!="3.4"' 'importlib_resources;python_version<"3.7"' + substituteInPlace setup.py \ + --replace 'importlib_resources~=1.4;python_version<"3.7" and python_version!="3.4"' 'importlib_resources;python_version<"3.7"' ''; propagatedBuildInputs = [ @@ -48,6 +48,27 @@ buildPythonPackage rec { six ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata importlib-resources ]; + checkInputs = [ + mock + pydot + pytestCheckHook + ]; + + preCheck = '' + export PATH=$out/bin:$PATH + ''; + + disabledTests = [ + # These tests depend on the current date, for example because of issues like this. + # This makes it possible for them to succeed on hydra and then begin to fail without + # any code changes. + # https://github.com/aws-cloudformation/cfn-python-lint/issues/1705 + # See also: https://github.com/NixOS/nixpkgs/issues/108076 + "TestQuickStartTemplates" + # requires git directory + "test_update_docs" + ]; + pythonImportsCheck = [ "cfnlint" "cfnlint.conditions" @@ -64,9 +85,6 @@ buildPythonPackage rec { "cfnlint.transform" ]; - checkInputs = [ pytestCheckHook mock pydot ]; - preCheck = "export PATH=$out/bin:$PATH"; - meta = with lib; { description = "Checks cloudformation for practices and behaviour that could potentially be improved"; homepage = "https://github.com/aws-cloudformation/cfn-python-lint"; diff --git a/pkgs/development/python-modules/cgroup-utils/default.nix b/pkgs/development/python-modules/cgroup-utils/default.nix index a94b4439250e..2000a4e0a3bc 100644 --- a/pkgs/development/python-modules/cgroup-utils/default.nix +++ b/pkgs/development/python-modules/cgroup-utils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, pep8, nose }: +{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pep8, nose }: buildPythonPackage rec { version = "0.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "0qnbn8cnq8m14s8s1hcv25xjd55dyb6yy54l5vc7sby5xzzp11fq"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Utility tools for control groups of Linux"; maintainers = with maintainers; [ layus ]; platforms = platforms.linux; diff --git a/pkgs/development/python-modules/chai/default.nix b/pkgs/development/python-modules/chai/default.nix index 16166d2db80e..3400b33635a8 100644 --- a/pkgs/development/python-modules/chai/default.nix +++ b/pkgs/development/python-modules/chai/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi }: +{ lib, stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "chai"; @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "ff8d2b6855f660cd23cd5ec79bd10264d39f24f6235773331b48e7fcd637d6cc"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Mocking, stubbing and spying framework for python"; }; } diff --git a/pkgs/development/python-modules/chainmap/default.nix b/pkgs/development/python-modules/chainmap/default.nix index 17a51f17763a..3858fc44f234 100644 --- a/pkgs/development/python-modules/chainmap/default.nix +++ b/pkgs/development/python-modules/chainmap/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi }: +{ lib, stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "chainmap"; @@ -12,7 +12,7 @@ buildPythonPackage rec { # Requires tox doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Backport/clone of ChainMap"; homepage = "https://bitbucket.org/jeunice/chainmap"; license = licenses.psfl; diff --git a/pkgs/development/python-modules/chameleon/default.nix b/pkgs/development/python-modules/chameleon/default.nix index 0af3d18824af..a2ffcb9a0236 100644 --- a/pkgs/development/python-modules/chameleon/default.nix +++ b/pkgs/development/python-modules/chameleon/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchFromGitHub }: @@ -17,7 +17,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "chameleon" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://chameleon.readthedocs.io/"; description = "Fast HTML/XML Template Compiler"; license = licenses.bsd0; diff --git a/pkgs/development/python-modules/channels-redis/default.nix b/pkgs/development/python-modules/channels-redis/default.nix index fb0774478a00..3f341f5527ae 100644 --- a/pkgs/development/python-modules/channels-redis/default.nix +++ b/pkgs/development/python-modules/channels-redis/default.nix @@ -1,52 +1,43 @@ -{ stdenv, buildPythonPackage, fetchPypi, pythonOlder -, redis, channels, msgpack, aioredis, hiredis, asgiref -# , fetchFromGitHub, async_generator, async-timeout, cryptography, pytest, pytest-asyncio +{ lib, stdenv +, aioredis +, asgiref +, buildPythonPackage +, channels +, fetchPypi +, hiredis +, msgpack +, pythonOlder +, redis }: buildPythonPackage rec { pname = "channels-redis"; - version = "2.4.0"; + version = "3.2.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit version; pname = "channels_redis"; - sha256 = "1g4izdf8237pwxn85bv5igc2bajrvck1p2a7q448qmjfznrbrk5p"; + sha256 = "1rjs9irnq59yr6zwc9k6nnw6xrmr48dakrm25m0gcwskn1iimcrg"; }; buildInputs = [ redis hiredis ]; propagatedBuildInputs = [ channels msgpack aioredis asgiref ]; - # Fetch from github (no tests files on pypi) - # src = fetchFromGitHub { - # rev = version; - # owner = "django"; - # repo = "channels_redis"; - # sha256 = "05niaqjv790mnrvca26kbnvb50fgnk2zh0k4np60cn6ilp4nl0kc"; - # }; - # - # checkInputs = [ - # async_generator - # async-timeout - # cryptography - # pytest - # pytest-asyncio - # ]; - # - # # Fails with : ConnectionRefusedError: [Errno 111] Connect call failed ('127.0.0.1', 6379) - # # (even with a local redis instance running) - # checkPhase = '' - # pytest -p no:django tests/ - # ''; + # Fails with : ConnectionRefusedError: [Errno 111] Connect call failed ('127.0.0.1', 6379) + # (even with a local Redis instance running) + doCheck = false; postPatch = '' sed -i "s/msgpack~=0.6.0/msgpack/" setup.py sed -i "s/aioredis~=1.0/aioredis/" setup.py ''; - meta = with stdenv.lib; { + pythonImportsCheck = [ "channels_redis" ]; + + meta = with lib; { homepage = "https://github.com/django/channels_redis/"; description = "Redis-backed ASGI channel layer implementation"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/channels/default.nix b/pkgs/development/python-modules/channels/default.nix index 63b1699101d4..c2836ef4faa0 100644 --- a/pkgs/development/python-modules/channels/default.nix +++ b/pkgs/development/python-modules/channels/default.nix @@ -1,13 +1,13 @@ -{ stdenv, buildPythonPackage, fetchPypi, +{ lib, stdenv, buildPythonPackage, fetchPypi, asgiref, django, daphne }: buildPythonPackage rec { pname = "channels"; - version = "3.0.2"; + version = "3.0.3"; src = fetchPypi { inherit pname version; - sha256 = "f50a6e79757a64c1e45e95e144a2ac5f1e99ee44a0718ab182c501f5e5abd268"; + sha256 = "056b72e51080a517a0f33a0a30003e03833b551d75394d6636c885d4edb8188f"; }; # Files are missing in the distribution @@ -15,7 +15,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ asgiref django daphne ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Brings event-driven capabilities to Django with a channel system"; license = licenses.bsd3; homepage = "https://github.com/django/channels"; diff --git a/pkgs/development/python-modules/chardet/default.nix b/pkgs/development/python-modules/chardet/default.nix index 1a8b1f36e998..bbc41df0cd82 100644 --- a/pkgs/development/python-modules/chardet/default.nix +++ b/pkgs/development/python-modules/chardet/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, fetchpatch +{ lib, stdenv, buildPythonPackage, fetchPypi, fetchpatch , pytest, pytestrunner, hypothesis }: buildPythonPackage rec { @@ -20,7 +20,7 @@ buildPythonPackage rec { checkInputs = [ pytest pytestrunner hypothesis ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/chardet/chardet"; description = "Universal encoding detector"; license = licenses.lgpl2; diff --git a/pkgs/development/python-modules/check-manifest/default.nix b/pkgs/development/python-modules/check-manifest/default.nix index 6368ebf4b737..18ce078269a9 100644 --- a/pkgs/development/python-modules/check-manifest/default.nix +++ b/pkgs/development/python-modules/check-manifest/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, pep517, toml, mock, breezy, git }: +{ lib, stdenv, buildPythonPackage, fetchPypi, pep517, toml, mock, breezy, git }: buildPythonPackage rec { pname = "check-manifest"; @@ -18,7 +18,7 @@ buildPythonPackage rec { checkInputs = [ mock breezy git ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/mgedmin/check-manifest"; description = "Check MANIFEST.in in a Python source package for completeness"; license = licenses.mit; diff --git a/pkgs/development/python-modules/cheroot/default.nix b/pkgs/development/python-modules/cheroot/default.nix index 6c99b7bbf662..c9d3094d5951 100644 --- a/pkgs/development/python-modules/cheroot/default.nix +++ b/pkgs/development/python-modules/cheroot/default.nix @@ -1,4 +1,5 @@ { lib, stdenv, fetchPypi, buildPythonPackage, isPy3k +, jaraco_functools , jaraco_text , more-itertools , portend @@ -23,12 +24,17 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "1089c28a9c320d19fdf9a4b0ed6ace23a0948db1c171a36ac985f3741bc62865"; + sha256 = "0r98qqdp9ww5r5ma6wf1n66r9813rrmfvc54z7yij39jkj5c528h"; }; nativeBuildInputs = [ setuptools_scm setuptools-scm-git-archive ]; - propagatedBuildInputs = [ more-itertools six ]; + propagatedBuildInputs = [ + # install_requires + jaraco_functools + + more-itertools six + ]; checkInputs = [ jaraco_text diff --git a/pkgs/development/python-modules/cherrypy/17.nix b/pkgs/development/python-modules/cherrypy/17.nix index 5e5541b26e27..9982db19f381 100644 --- a/pkgs/development/python-modules/cherrypy/17.nix +++ b/pkgs/development/python-modules/cherrypy/17.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ lib, stdenv, buildPythonPackage, fetchPypi , setuptools_scm , cheroot, contextlib2, portend, routes, six, zc_lockfile , backports_unittest-mock, objgraph, pathpy, pytest, pytestcov, backports_functools_lru_cache, requests_toolbelt @@ -28,7 +28,7 @@ buildPythonPackage rec { pytest ${stdenv.lib.optionalString stdenv.isDarwin "--ignore=cherrypy/test/test_wsgi_unix_socket.py"} ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.cherrypy.org"; description = "A pythonic, object-oriented HTTP framework"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/cherrypy/default.nix b/pkgs/development/python-modules/cherrypy/default.nix index f23d06001922..76fd780e5231 100644 --- a/pkgs/development/python-modules/cherrypy/default.nix +++ b/pkgs/development/python-modules/cherrypy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy3k +{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k , setuptools_scm , cheroot, portend, more-itertools, zc_lockfile, routes , jaraco_collections @@ -45,7 +45,9 @@ buildPythonPackage rec { "--deselect=cherrypy/test/test_bus.py::BusMethodTests::test_block"} ''; - meta = with stdenv.lib; { + __darwinAllowLocalNetworking = true; + + meta = with lib; { homepage = "https://www.cherrypy.org"; description = "A pythonic, object-oriented HTTP framework"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/cirq/default.nix b/pkgs/development/python-modules/cirq/default.nix index 537ffdbaf958..ebc0eb51df43 100644 --- a/pkgs/development/python-modules/cirq/default.nix +++ b/pkgs/development/python-modules/cirq/default.nix @@ -5,7 +5,7 @@ , fetchFromGitHub , fetchpatch , freezegun -, google_api_core +, google-api-core , matplotlib , networkx , numpy @@ -54,7 +54,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ freezegun - google_api_core + google-api-core numpy matplotlib networkx diff --git a/pkgs/development/python-modules/cjson/default.nix b/pkgs/development/python-modules/cjson/default.nix index 1ecd43fccdee..ce70a2f459da 100644 --- a/pkgs/development/python-modules/cjson/default.nix +++ b/pkgs/development/python-modules/cjson/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy3k, isPyPy }: +{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k, isPyPy }: buildPythonPackage rec { pname = "python-cjson"; @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "3006c2c218297be3448dc793218e0b15d20fe9839775521bfc294fc6aa24972b"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A very fast JSON encoder/decoder for Python"; homepage = "https://ag-projects.com/"; license = licenses.lgpl2; diff --git a/pkgs/development/python-modules/ckcc-protocol/default.nix b/pkgs/development/python-modules/ckcc-protocol/default.nix index 7f5311f45b00..dd72f5705e70 100644 --- a/pkgs/development/python-modules/ckcc-protocol/default.nix +++ b/pkgs/development/python-modules/ckcc-protocol/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ click ecdsa hidapi pyaes ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Communicate with your Coldcard using Python"; homepage = "https://github.com/Coldcard/ckcc-protocol"; license = licenses.gpl3; diff --git a/pkgs/development/python-modules/cld2-cffi/default.nix b/pkgs/development/python-modules/cld2-cffi/default.nix index 7775fee5ba0d..df28bcdf3aa7 100644 --- a/pkgs/development/python-modules/cld2-cffi/default.nix +++ b/pkgs/development/python-modules/cld2-cffi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, six, cffi, nose }: +{ lib, stdenv, buildPythonPackage, fetchPypi, six, cffi, nose }: buildPythonPackage rec { pname = "cld2-cffi"; @@ -17,7 +17,7 @@ buildPythonPackage rec { checkPhase = "nosetests -v"; - meta = with stdenv.lib; { + meta = with lib; { description = "CFFI bindings around Google Chromium's embedded compact language detection library (CLD2)"; homepage = "https://github.com/GregBowyer/cld2-cffi"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/clf/default.nix b/pkgs/development/python-modules/clf/default.nix index d3741ef38a93..f4168d689d44 100644 --- a/pkgs/development/python-modules/clf/default.nix +++ b/pkgs/development/python-modules/clf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ lib, stdenv, buildPythonPackage, fetchPypi , docopt, requests, pygments }: buildPythonPackage rec { @@ -20,7 +20,7 @@ buildPythonPackage rec { # No local packages or download links found for requests doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/ncrocfer/clf"; description = "Command line tool to search snippets on Commandlinefu.com"; license = licenses.mit; diff --git a/pkgs/development/python-modules/cliapp/default.nix b/pkgs/development/python-modules/cliapp/default.nix index 497306c293a4..4b7611c092e2 100644 --- a/pkgs/development/python-modules/cliapp/default.nix +++ b/pkgs/development/python-modules/cliapp/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchgit , sphinx @@ -21,7 +21,7 @@ buildPythonPackage { # error: invalid command 'test' doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://liw.fi/cliapp/"; description = "Python framework for Unix command line programs"; license = licenses.gpl2; diff --git a/pkgs/development/python-modules/click-completion/default.nix b/pkgs/development/python-modules/click-completion/default.nix index 3fd41f54f66c..61a154286325 100644 --- a/pkgs/development/python-modules/click-completion/default.nix +++ b/pkgs/development/python-modules/click-completion/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy3k, +{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k, click, jinja2, shellingham, six }: @@ -14,7 +14,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ click jinja2 shellingham six ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Add or enhance bash, fish, zsh and powershell completion in Click"; homepage = "https://github.com/click-contrib/click-completion"; license = licenses.mit; diff --git a/pkgs/development/python-modules/click-didyoumean/default.nix b/pkgs/development/python-modules/click-didyoumean/default.nix index 58d7da4fd391..8d3c3ba3e240 100644 --- a/pkgs/development/python-modules/click-didyoumean/default.nix +++ b/pkgs/development/python-modules/click-didyoumean/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, +{ lib, stdenv, buildPythonPackage, fetchPypi, click }: @@ -13,7 +13,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ click ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Enable git-like did-you-mean feature in click"; homepage = "https://github.com/click-contrib/click-didyoumean"; license = licenses.mit; diff --git a/pkgs/development/python-modules/click-help-colors/default.nix b/pkgs/development/python-modules/click-help-colors/default.nix index e66f23d09b21..dbe4e33ca84c 100644 --- a/pkgs/development/python-modules/click-help-colors/default.nix +++ b/pkgs/development/python-modules/click-help-colors/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage +{ lib, stdenv, fetchPypi, buildPythonPackage , click, pytest }: @@ -19,7 +19,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "click_help_colors" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Colorization of help messages in Click"; homepage = "https://github.com/r-m-n/click-help-colors"; license = licenses.mit; diff --git a/pkgs/development/python-modules/click-log/default.nix b/pkgs/development/python-modules/click-log/default.nix index dd2b4b158ed5..4aa63dd45378 100644 --- a/pkgs/development/python-modules/click-log/default.nix +++ b/pkgs/development/python-modules/click-log/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, click }: +{ lib, stdenv, buildPythonPackage, fetchPypi, click }: buildPythonPackage rec { pname = "click-log"; @@ -11,7 +11,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ click ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/click-contrib/click-log/"; description = "Logging integration for Click"; license = licenses.mit; diff --git a/pkgs/development/python-modules/click-plugins/default.nix b/pkgs/development/python-modules/click-plugins/default.nix index a8c1d7a489ff..c2b25341e17c 100644 --- a/pkgs/development/python-modules/click-plugins/default.nix +++ b/pkgs/development/python-modules/click-plugins/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, +{ lib, stdenv, buildPythonPackage, fetchPypi, click, pytest }: @@ -19,7 +19,7 @@ buildPythonPackage rec { pytest ]; - meta = with stdenv.lib; { + meta = with lib; { description = "An extension module for click to enable registering CLI commands"; homepage = "https://github.com/click-contrib/click-plugins"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/click-repl/default.nix b/pkgs/development/python-modules/click-repl/default.nix index 03c9520014c4..23adb12da658 100644 --- a/pkgs/development/python-modules/click-repl/default.nix +++ b/pkgs/development/python-modules/click-repl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, click, prompt_toolkit }: +{ lib, stdenv, buildPythonPackage, fetchPypi, click, prompt_toolkit }: buildPythonPackage rec { pname = "click-repl"; @@ -11,7 +11,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ click prompt_toolkit ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/click-contrib/click-repl"; description = "Subcommand REPL for click apps"; license = licenses.mit; diff --git a/pkgs/development/python-modules/clickclick/default.nix b/pkgs/development/python-modules/clickclick/default.nix index b2e23dc55bdb..e211b955ac84 100644 --- a/pkgs/development/python-modules/clickclick/default.nix +++ b/pkgs/development/python-modules/clickclick/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { "test_choice_default" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Click command line utilities"; homepage = "https://github.com/hjacobs/python-clickclick/"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/cliff/default.nix b/pkgs/development/python-modules/cliff/default.nix index f25170cc6ae7..1c551bfb0d90 100644 --- a/pkgs/development/python-modules/cliff/default.nix +++ b/pkgs/development/python-modules/cliff/default.nix @@ -7,12 +7,11 @@ , six , stevedore , pyyaml -, unicodecsv , cmd2 -, pytest -, mock +, pytestCheckHook , testtools , fixtures +, which }: buildPythonPackage rec { @@ -32,20 +31,21 @@ buildPythonPackage rec { stevedore pyyaml cmd2 - unicodecsv ]; - # remove version constraints postPatch = '' - sed -i '/cmd2/c\cmd2' requirements.txt + sed -i -e '/cmd2/c\cmd2' -e '/PrettyTable/c\PrettyTable' requirements.txt ''; - checkInputs = [ fixtures mock pytest testtools ]; + checkInputs = [ fixtures pytestCheckHook testtools which ]; # add some tests - checkPhase = '' - pytest cliff/tests/test_{utils,app,command,help,lister}.py \ - -k 'not interactive_mode' - ''; + pytestFlagsArray = [ + "cliff/tests/test_utils.py" + "cliff/tests/test_app.py" + "cliff/tests/test_command.py" + "cliff/tests/test_help.py" + "cliff/tests/test_lister.py" + ]; meta = with lib; { description = "Command Line Interface Formulation Framework"; diff --git a/pkgs/development/python-modules/clifford/default.nix b/pkgs/development/python-modules/clifford/default.nix index 9fe60ba55da8..85ed160413e7 100644 --- a/pkgs/development/python-modules/clifford/default.nix +++ b/pkgs/development/python-modules/clifford/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, fetchpatch , isPy27 , future , h5py @@ -22,6 +23,15 @@ buildPythonPackage rec { sha256 = "ade11b20d0631dfc9c2f18ce0149f1e61e4baf114108b27cfd68e5c1619ecc0c"; }; + patches = [ + (fetchpatch { + # Compatibility with h5py 3. + # Will be included in the next releasse after 1.3.1 + url = "https://github.com/pygae/clifford/pull/388/commits/955d141662c68d3d61aa50a162b39e656684c208.patch"; + sha256 = "0pkpwnk0kfdxsbzsxqlqh8kgif17l5has0mg31g3kyp8lncj89b1"; + }) + ]; + propagatedBuildInputs = [ future h5py @@ -46,10 +56,11 @@ buildPythonPackage rec { cd clifford/test ''; - pytestFlagsArray = [ - "-m \"not veryslow\"" - "--ignore=test_algebra_initialisation.py" # fails without JIT - "--ignore=test_cga.py" + disabledTests = [ + "veryslow" + "test_algebra_initialisation" + "test_cga" + "test_estimate_rotor_sequential[random_sphere]" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/cligj/default.nix b/pkgs/development/python-modules/cligj/default.nix index 91124cd21f4b..f9d953d8536e 100644 --- a/pkgs/development/python-modules/cligj/default.nix +++ b/pkgs/development/python-modules/cligj/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub +{ lib, stdenv, buildPythonPackage, fetchFromGitHub , click, pytest, glibcLocales }: @@ -23,7 +23,7 @@ buildPythonPackage rec { LC_ALL=en_US.utf-8 pytest tests ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Click params for commmand line interfaces to GeoJSON"; homepage = "https://github.com/mapbox/cligj"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/clint/default.nix b/pkgs/development/python-modules/clint/default.nix index 329cf4f07ccf..133fc0de55c6 100644 --- a/pkgs/development/python-modules/clint/default.nix +++ b/pkgs/development/python-modules/clint/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , python @@ -29,7 +29,7 @@ buildPythonPackage rec { buildInputs = [ mock nose nose_progressive pkgs.glibcLocales ]; propagatedBuildInputs = [ pillow blessings args ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/kennethreitz/clint"; description = "Python Command Line Interface Tools"; license = licenses.isc; diff --git a/pkgs/development/python-modules/clize/default.nix b/pkgs/development/python-modules/clize/default.nix index e2ef3ea5bb1c..c9c3f5c905ce 100644 --- a/pkgs/development/python-modules/clize/default.nix +++ b/pkgs/development/python-modules/clize/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , dateutil @@ -45,7 +45,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "clize" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Command-line argument parsing for Python"; homepage = "https://github.com/epsy/clize"; license = licenses.mit; diff --git a/pkgs/development/python-modules/closure-linter/default.nix b/pkgs/development/python-modules/closure-linter/default.nix index b814455da3ff..75f5ba0b449e 100644 --- a/pkgs/development/python-modules/closure-linter/default.nix +++ b/pkgs/development/python-modules/closure-linter/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchgit , isPy3k @@ -24,7 +24,7 @@ buildPythonPackage { propagatedBuildInputs = [ gflags ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Checks JavaScript files against Google's style guide."; homepage = "https://developers.google.com/closure/utilities/"; license = with licenses; [ asl20 ]; diff --git a/pkgs/development/python-modules/cloudflare/default.nix b/pkgs/development/python-modules/cloudflare/default.nix index a7b6d204f199..a21faa492dfe 100644 --- a/pkgs/development/python-modules/cloudflare/default.nix +++ b/pkgs/development/python-modules/cloudflare/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "cloudflare"; - version = "2.8.14"; + version = "2.8.15"; src = fetchPypi { inherit pname version; - sha256 = "5787892fdee3a6408b4290de0371426ab778a7ebf44decad9d843cab1ef0a1ac"; + sha256 = "1f47bd324f80e91487dea2c79be934b1dc612bcfa63e784dcf74c6a2f52a41cc"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/cloudpickle/default.nix b/pkgs/development/python-modules/cloudpickle/default.nix index cd21e125ccef..e5b4a63a564e 100644 --- a/pkgs/development/python-modules/cloudpickle/default.nix +++ b/pkgs/development/python-modules/cloudpickle/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy27, pytest, mock }: +{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27, pytest, mock }: buildPythonPackage rec { pname = "cloudpickle"; @@ -20,7 +20,7 @@ buildPythonPackage rec { # TypeError: cannot serialize '_io.FileIO' object doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Extended pickling support for Python objects"; homepage = "https://github.com/cloudpipe/cloudpickle"; license = with licenses; [ bsd3 ]; diff --git a/pkgs/development/python-modules/cloudscraper/default.nix b/pkgs/development/python-modules/cloudscraper/default.nix new file mode 100644 index 000000000000..faa1affcd060 --- /dev/null +++ b/pkgs/development/python-modules/cloudscraper/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, isPy3k +, fetchPypi +, requests +, requests-toolbelt +, pyparsing +}: + +buildPythonPackage rec { + pname = "cloudscraper"; + version = "1.2.52"; + disabled = !isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "07j2nhzimzhcskj2wpxpvpb3dhpci19daw02r2ckkjiq3zifhm6v"; + }; + + propagatedBuildInputs = [ + requests + requests-toolbelt + pyparsing + ]; + + # The tests require several other dependencies, some of which aren't in + # nixpkgs yet, and also aren't included in the PyPI bundle. TODO. + doCheck = false; + + pythonImportsCheck = [ "cloudscraper" ]; + + meta = with lib; { + description = "A Python module to bypass Cloudflare's anti-bot page"; + homepage = https://github.com/venomous/cloudscraper; + license = licenses.mit; + maintainers = with maintainers; [ kini ]; + }; +} diff --git a/pkgs/development/python-modules/clustershell/default.nix b/pkgs/development/python-modules/clustershell/default.nix index 86d44aed532c..a0e744f9919d 100644 --- a/pkgs/development/python-modules/clustershell/default.nix +++ b/pkgs/development/python-modules/clustershell/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, pyyaml, openssh +{ lib, stdenv, buildPythonPackage, fetchPypi, pyyaml, openssh , nose, bc, hostname, coreutils, bash, gnused }: @@ -80,7 +80,7 @@ buildPythonPackage rec { tests/*.py ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Scalable Python framework for cluster administration"; homepage = "https://cea-hpc.github.io/clustershell"; license = licenses.lgpl21; diff --git a/pkgs/development/python-modules/cmd2/default.nix b/pkgs/development/python-modules/cmd2/default.nix index 889ef3fba15c..be4e64f760ee 100644 --- a/pkgs/development/python-modules/cmd2/default.nix +++ b/pkgs/development/python-modules/cmd2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage, pythonOlder, isPy3k +{ lib, stdenv, fetchPypi, buildPythonPackage, pythonOlder, isPy3k , pyperclip, six, pyparsing, vim, wcwidth, colorama, attrs , contextlib2 ? null, typing ? null, setuptools_scm , pytest, mock ? null, pytest-mock @@ -52,7 +52,7 @@ buildPythonPackage rec { py.test -k 'not test_path_completion_user_expansion' ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Enhancements for standard library's cmd module"; homepage = "https://github.com/python-cmd2/cmd2"; maintainers = with maintainers; [ teto ]; diff --git a/pkgs/development/python-modules/cmdline/default.nix b/pkgs/development/python-modules/cmdline/default.nix index 39f1f9de0c67..4249ed7164b9 100644 --- a/pkgs/development/python-modules/cmdline/default.nix +++ b/pkgs/development/python-modules/cmdline/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, pyyaml }: +{ lib, stdenv, buildPythonPackage, fetchPypi, pyyaml }: buildPythonPackage rec { pname = "cmdline"; @@ -13,7 +13,7 @@ buildPythonPackage rec { doCheck = false; propagatedBuildInputs = [ pyyaml ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Utilities for consistent command line tools"; homepage = "https://github.com/rca/cmdline"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/cmdtest/default.nix b/pkgs/development/python-modules/cmdtest/default.nix index 5c53cafdb4e1..5bb4ef79a20c 100644 --- a/pkgs/development/python-modules/cmdtest/default.nix +++ b/pkgs/development/python-modules/cmdtest/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchurl , cliapp @@ -23,7 +23,7 @@ buildPythonPackage rec { # TODO: cmdtest tests must be run before the buildPhase doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://liw.fi/cmdtest/"; description = "Black box tests Unix command line tools"; license = licenses.gpl3; diff --git a/pkgs/development/python-modules/cocotb/default.nix b/pkgs/development/python-modules/cocotb/default.nix index 9e6ebbe260e4..e95900d17b52 100644 --- a/pkgs/development/python-modules/cocotb/default.nix +++ b/pkgs/development/python-modules/cocotb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, setuptools, swig, verilog }: +{ lib, stdenv, buildPythonPackage, fetchFromGitHub, setuptools, swig, verilog }: buildPythonPackage rec { pname = "cocotb"; @@ -43,7 +43,7 @@ buildPythonPackage rec { make test ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Coroutine based cosimulation library for writing VHDL and Verilog testbenches in Python"; homepage = "https://github.com/cocotb/cocotb"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/cogapp/default.nix b/pkgs/development/python-modules/cogapp/default.nix index 2962e65a7fb6..019faeaebc30 100644 --- a/pkgs/development/python-modules/cogapp/default.nix +++ b/pkgs/development/python-modules/cogapp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi }: +{ lib, stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "cogapp"; @@ -12,7 +12,7 @@ buildPythonPackage rec { # there are no tests doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "A code generator for executing Python snippets in source files"; homepage = "http://nedbatchelder.com/code/cog"; license = licenses.mit; diff --git a/pkgs/development/python-modules/coilmq/default.nix b/pkgs/development/python-modules/coilmq/default.nix index 8b103b55171d..bc0b6af146af 100644 --- a/pkgs/development/python-modules/coilmq/default.nix +++ b/pkgs/development/python-modules/coilmq/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ lib, stdenv, buildPythonPackage, fetchPypi , stompclient, python-daemon, redis, pid, pytest, six, click, coverage , sqlalchemy }: @@ -17,7 +17,7 @@ buildPythonPackage rec { # The teste data is not included in the distribution doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Simple, lightweight, and easily extensible STOMP message broker"; homepage = "https://github.com/hozn/coilmq/"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/colanderalchemy/default.nix b/pkgs/development/python-modules/colanderalchemy/default.nix index aba5ebf609b8..a5b29af1c31a 100644 --- a/pkgs/development/python-modules/colanderalchemy/default.nix +++ b/pkgs/development/python-modules/colanderalchemy/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , unittest2 @@ -20,7 +20,7 @@ buildPythonPackage rec { # Tests are not included in Pypi doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Autogenerate Colander schemas based on SQLAlchemy models"; homepage = "https://github.com/stefanofontanelli/ColanderAlchemy"; license = licenses.mit; diff --git a/pkgs/development/python-modules/colorama/default.nix b/pkgs/development/python-modules/colorama/default.nix index 063491845827..6778c6acadb8 100644 --- a/pkgs/development/python-modules/colorama/default.nix +++ b/pkgs/development/python-modules/colorama/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage }: +{ lib, stdenv, fetchPypi, buildPythonPackage }: buildPythonPackage rec { pname = "colorama"; @@ -12,7 +12,7 @@ buildPythonPackage rec { # No tests in archive doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/tartley/colorama"; license = licenses.bsd3; description = "Cross-platform colored terminal text"; diff --git a/pkgs/development/python-modules/colorcet/default.nix b/pkgs/development/python-modules/colorcet/default.nix index a80895de3d15..05304175b71d 100644 --- a/pkgs/development/python-modules/colorcet/default.nix +++ b/pkgs/development/python-modules/colorcet/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , param @@ -40,7 +40,7 @@ buildPythonPackage rec { pytest colorcet -k 'not matplotlib_default_colormap_plot' ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Collection of perceptually uniform colormaps"; homepage = "https://colorcet.pyviz.org"; license = licenses.cc-by-40; diff --git a/pkgs/development/python-modules/colorclass/default.nix b/pkgs/development/python-modules/colorclass/default.nix index 4a627cab5451..08da356e222e 100644 --- a/pkgs/development/python-modules/colorclass/default.nix +++ b/pkgs/development/python-modules/colorclass/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi }: +{ lib, stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "colorclass"; @@ -12,7 +12,7 @@ buildPythonPackage rec { # No tests in archive doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/Robpol86/colorclass"; license = licenses.mit; description = "Automatic support for console colors"; diff --git a/pkgs/development/python-modules/colored/default.nix b/pkgs/development/python-modules/colored/default.nix index 2d2cac3da1b9..5caa0cad2f6f 100644 --- a/pkgs/development/python-modules/colored/default.nix +++ b/pkgs/development/python-modules/colored/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi }: @@ -15,7 +15,7 @@ buildPythonPackage rec { # No proper test suite doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://gitlab.com/dslackw/colored"; description = "Simple library for color and formatting to terminal"; license = licenses.mit; diff --git a/pkgs/development/python-modules/colorlog/default.nix b/pkgs/development/python-modules/colorlog/default.nix index 0b40284fd5eb..829f157fced0 100644 --- a/pkgs/development/python-modules/colorlog/default.nix +++ b/pkgs/development/python-modules/colorlog/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, pytest }: +{ lib, stdenv, buildPythonPackage, fetchPypi, pytest }: buildPythonPackage rec { pname = "colorlog"; @@ -19,7 +19,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "colorlog" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Log formatting with colors"; homepage = "https://github.com/borntyping/python-colorlog"; license = licenses.mit; diff --git a/pkgs/development/python-modules/colour/default.nix b/pkgs/development/python-modules/colour/default.nix index d0f802072a38..6a6ad9d4946a 100644 --- a/pkgs/development/python-modules/colour/default.nix +++ b/pkgs/development/python-modules/colour/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, d2to1 }: +{ lib, stdenv, buildPythonPackage, fetchPypi, d2to1 }: buildPythonPackage rec { pname = "colour"; @@ -11,7 +11,7 @@ buildPythonPackage rec { buildInputs = [ d2to1 ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Converts and manipulates common color representation (RGB, HSV, web, ...)"; homepage = "https://github.com/vaab/colour"; license = licenses.bsd2; diff --git a/pkgs/development/python-modules/commandparse/default.nix b/pkgs/development/python-modules/commandparse/default.nix new file mode 100644 index 000000000000..68da870f4e2d --- /dev/null +++ b/pkgs/development/python-modules/commandparse/default.nix @@ -0,0 +1,25 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "commandparse"; + version = "1.1.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "06mcxc0vs5qdcywalgyx5zm18z4xcsrg5g0wsqqv5qawkrvmvl53"; + }; + + # tests only distributed upstream source, not PyPi + doCheck = false; + pythonImportsCheck = [ "commandparse" ]; + + meta = with lib; { + description = "Python module to parse command based CLI application"; + homepage = "https://github.com/flgy/commandparse"; + license = with licenses; [ mit ]; + maintainers = [ maintainers.fab ]; + }; +} diff --git a/pkgs/development/python-modules/configobj/default.nix b/pkgs/development/python-modules/configobj/default.nix index 82ca70c46795..d0988689275e 100644 --- a/pkgs/development/python-modules/configobj/default.nix +++ b/pkgs/development/python-modules/configobj/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage +{ lib, stdenv, buildPythonPackage , fetchFromGitHub , six , mock, pytest @@ -25,7 +25,7 @@ buildPythonPackage rec { checkInputs = [ mock pytest ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Config file reading, writing and validation"; homepage = "https://pypi.python.org/pypi/configobj"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/configparser/4.nix b/pkgs/development/python-modules/configparser/4.nix index 9c6c631d9c27..cbef6fd2ce7f 100644 --- a/pkgs/development/python-modules/configparser/4.nix +++ b/pkgs/development/python-modules/configparser/4.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, setuptools_scm }: +{ lib, stdenv, buildPythonPackage, fetchPypi, setuptools_scm }: buildPythonPackage rec { pname = "configparser"; @@ -18,7 +18,7 @@ buildPythonPackage rec { export LC_ALL=${if stdenv.isDarwin then "en_US" else "C"}.UTF-8 ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Updated configparser from Python 3.7 for Python 2.6+."; license = licenses.mit; homepage = "https://github.com/jaraco/configparser"; diff --git a/pkgs/development/python-modules/configparser/default.nix b/pkgs/development/python-modules/configparser/default.nix index ad9a13c28bf0..e8610f053da6 100644 --- a/pkgs/development/python-modules/configparser/default.nix +++ b/pkgs/development/python-modules/configparser/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, setuptools_scm +{ lib, stdenv, buildPythonPackage, fetchPypi, setuptools_scm , toml }: @@ -20,7 +20,7 @@ buildPythonPackage rec { export LC_ALL=${if stdenv.isDarwin then "en_US" else "C"}.UTF-8 ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Updated configparser from Python 3.7 for Python 2.6+."; license = licenses.mit; homepage = "https://github.com/jaraco/configparser"; diff --git a/pkgs/development/python-modules/configshell/default.nix b/pkgs/development/python-modules/configshell/default.nix index 6a21c1074ea7..ba3700962bf6 100644 --- a/pkgs/development/python-modules/configshell/default.nix +++ b/pkgs/development/python-modules/configshell/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildPythonPackage, pyparsing, six, urwid }: +{ lib, stdenv, fetchFromGitHub, buildPythonPackage, pyparsing, six, urwid }: buildPythonPackage rec { pname = "configshell"; @@ -13,7 +13,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pyparsing six urwid ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A Python library for building configuration shells"; homepage = "https://github.com/open-iscsi/configshell-fb"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/confluent-kafka/default.nix b/pkgs/development/python-modules/confluent-kafka/default.nix index 8048d6f78a27..f3e8b1c943b1 100644 --- a/pkgs/development/python-modules/confluent-kafka/default.nix +++ b/pkgs/development/python-modules/confluent-kafka/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy3k, rdkafka, requests, avro3k, avro, futures, enum34 }: +{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k, rdkafka, requests, avro3k, avro, futures, enum34 }: buildPythonPackage rec { version = "1.5.0"; @@ -14,7 +14,7 @@ buildPythonPackage rec { # No tests in PyPi Tarball doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Confluent's Apache Kafka client for Python"; homepage = "https://github.com/confluentinc/confluent-kafka-python"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/confuse/default.nix b/pkgs/development/python-modules/confuse/default.nix new file mode 100644 index 000000000000..8f1c1754056a --- /dev/null +++ b/pkgs/development/python-modules/confuse/default.nix @@ -0,0 +1,27 @@ +{ buildPythonPackage +, enum34 +, fetchPypi +, isPy27 +, lib +, pathlib +, pyyaml +}: + +buildPythonPackage rec { + pname = "confuse"; + version = "1.4.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-kvwEUcbiwnMqw2PQ9Z1+pgir3b7QYt2o6Y6ajJhs5GQ="; + }; + + propagatedBuildInputs = [ pyyaml ] ++ lib.optionals isPy27 [ enum34 pathlib ] ; + + meta = with lib; { + description = "Confuse is a configuration library for Python that uses YAML."; + homepage = "https://github.com/beetbox/confuse"; + license = licenses.mit; + maintainers = with maintainers; [ lovesegfault ]; + }; +} diff --git a/pkgs/development/python-modules/connect_box/default.nix b/pkgs/development/python-modules/connect_box/default.nix new file mode 100644 index 000000000000..6c92ac025d8d --- /dev/null +++ b/pkgs/development/python-modules/connect_box/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, fetchPypi +, aiohttp +, attrs +, defusedxml +}: + +buildPythonPackage rec { + pname = "connect-box"; + version = "0.2.8"; + + src = fetchPypi { + pname = "connect_box"; + inherit version; + sha256 = "1lvz7g2f0a9ifnjczmbavn105miirdgyayr4sixhzgdgadcdhz3l"; + }; + + propagatedBuildInputs = [ + aiohttp + attrs + defusedxml + ]; + + # no tests are present + doCheck = false; + + pythonImportsCheck = [ "connect_box" ]; + + meta = with lib; { + description = "Interact with a Compal CH7465LG cable modem/router"; + longDescription = '' + Python Client for interacting with the cable modem/router Compal + CH7465LG which is provided under different names by various ISP + in Europe, e.g., UPC Connect Box (CH), Irish Virgin Media Super + Hub 3.0 (IE), Ziggo Connectbox (NL) or Unitymedia Connect Box (DE). + ''; + homepage = "https://github.com/home-assistant-ecosystem/python-connect-box"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/constantly/default.nix b/pkgs/development/python-modules/constantly/default.nix index 9b7222b7bbc6..189573699b91 100644 --- a/pkgs/development/python-modules/constantly/default.nix +++ b/pkgs/development/python-modules/constantly/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ lib, stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "constantly"; @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "0dgwdla5kfpqz83hfril716inm41hgn9skxskvi77605jbmp4qsq"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/twisted/constantly"; description = "symbolic constant support"; license = licenses.mit; diff --git a/pkgs/development/python-modules/construct/default.nix b/pkgs/development/python-modules/construct/default.nix index cf9ab42f3259..bb334f11c756 100644 --- a/pkgs/development/python-modules/construct/default.nix +++ b/pkgs/development/python-modules/construct/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder +{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder , six, pytestCheckHook, pytest-benchmark, numpy, arrow, ruamel_yaml }: @@ -22,7 +22,7 @@ buildPythonPackage rec { pytestFlagsArray = [ "--benchmark-disable" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Powerful declarative parser (and builder) for binary data"; homepage = "https://construct.readthedocs.org/"; license = licenses.mit; diff --git a/pkgs/development/python-modules/consul/default.nix b/pkgs/development/python-modules/consul/default.nix index 589076481c90..3978b14484ac 100644 --- a/pkgs/development/python-modules/consul/default.nix +++ b/pkgs/development/python-modules/consul/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ lib, stdenv, buildPythonPackage, fetchPypi , requests, six, pytest }: buildPythonPackage rec { @@ -15,7 +15,7 @@ buildPythonPackage rec { # No tests distributed. https://github.com/cablehead/python-consul/issues/133 doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Python client for Consul (https://www.consul.io/)"; homepage = "https://github.com/cablehead/python-consul"; license = licenses.mit; diff --git a/pkgs/development/python-modules/contexter/default.nix b/pkgs/development/python-modules/contexter/default.nix index 0fa72dfa687d..d8b74d4fedba 100644 --- a/pkgs/development/python-modules/contexter/default.nix +++ b/pkgs/development/python-modules/contexter/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi }: +{ lib, stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "contexter"; @@ -9,6 +9,6 @@ buildPythonPackage rec { sha256 = "c730890b1a915051414a6350d8ea1cddca7d01d8f756badedb30b9bf305ea0a8"; }; - meta = with stdenv.lib; { + meta = with lib; { }; } diff --git a/pkgs/development/python-modules/convertdate/default.nix b/pkgs/development/python-modules/convertdate/default.nix index c60d4778012c..f28923002f70 100644 --- a/pkgs/development/python-modules/convertdate/default.nix +++ b/pkgs/development/python-modules/convertdate/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, pymeeus, pytz }: +{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pymeeus, pytz }: buildPythonPackage rec { pname = "convertdate"; @@ -14,7 +14,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pymeeus pytz ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/fitnr/convertdate"; description = "Utils for converting between date formats and calculating holidays"; license = licenses.mit; diff --git a/pkgs/development/python-modules/cookiecutter/default.nix b/pkgs/development/python-modules/cookiecutter/default.nix index 23bc8bcec524..f9a4fe982082 100644 --- a/pkgs/development/python-modules/cookiecutter/default.nix +++ b/pkgs/development/python-modules/cookiecutter/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPyPy +{ lib, stdenv, buildPythonPackage, fetchPypi, isPyPy , pytest, pytestcov, pytest-mock, freezegun , jinja2, future, binaryornot, click, whichcraft, poyo, jinja2_time, requests , python-slugify }: @@ -26,7 +26,7 @@ buildPythonPackage rec { pytest ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/audreyr/cookiecutter"; description = "A command-line utility that creates projects from project templates"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/cookies/default.nix b/pkgs/development/python-modules/cookies/default.nix index 7ae110fef3c2..59d2214f758e 100644 --- a/pkgs/development/python-modules/cookies/default.nix +++ b/pkgs/development/python-modules/cookies/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi }: +{ lib, stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "cookies"; @@ -11,7 +11,7 @@ buildPythonPackage rec { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Friendlier RFC 6265-compliant cookie parser/renderer"; homepage = "https://github.com/sashahart/cookies"; license = licenses.mit; diff --git a/pkgs/development/python-modules/coreapi/default.nix b/pkgs/development/python-modules/coreapi/default.nix index 521b06755cec..8ac69a457396 100644 --- a/pkgs/development/python-modules/coreapi/default.nix +++ b/pkgs/development/python-modules/coreapi/default.nix @@ -1,5 +1,5 @@ { - stdenv, + lib, stdenv, fetchFromGitHub, buildPythonPackage, django, @@ -35,7 +35,7 @@ buildPythonPackage rec { pytest ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Python client library for Core API"; homepage = "https://github.com/core-api/python-client"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/coreschema/default.nix b/pkgs/development/python-modules/coreschema/default.nix index 5b5ca3f5044e..73167dea8a7d 100644 --- a/pkgs/development/python-modules/coreschema/default.nix +++ b/pkgs/development/python-modules/coreschema/default.nix @@ -1,5 +1,5 @@ { - stdenv, + lib, stdenv, fetchFromGitHub, buildPythonPackage, jinja2, @@ -25,7 +25,7 @@ buildPythonPackage rec { pytest ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Python client library for Core Schema"; homepage = "https://github.com/ivegotasthma/python-coreschema"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/cornice/default.nix b/pkgs/development/python-modules/cornice/default.nix index d09cffb31d64..10c559201931 100644 --- a/pkgs/development/python-modules/cornice/default.nix +++ b/pkgs/development/python-modules/cornice/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , pyramid @@ -21,7 +21,7 @@ buildPythonPackage rec { # tests not packaged with pypi release doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/mozilla-services/cornice"; description = "Build Web Services with Pyramid"; license = licenses.mpl20; diff --git a/pkgs/development/python-modules/coronavirus/default.nix b/pkgs/development/python-modules/coronavirus/default.nix new file mode 100644 index 000000000000..ddf87816b8f7 --- /dev/null +++ b/pkgs/development/python-modules/coronavirus/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, aiohttp +}: + +buildPythonPackage rec { + pname = "coronavirus"; + version = "1.1.1"; + + src = fetchFromGitHub { + owner = "nabucasa"; + repo = pname; + rev = version; + sha256 = "0mx6ifp8irj3669c67hs9r79k8gar6j4aq7d4ji21pllyhyahdwm"; + }; + + propagatedBuildInputs = [ + aiohttp + ]; + + # no tests are present + doCheck = false; + pythonImportsCheck = [ "coronavirus" ]; + + meta = with lib; { + description = "Python client for getting Corona virus info"; + homepage = "https://github.com/nabucasa/coronavirus"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/cot/default.nix b/pkgs/development/python-modules/cot/default.nix index 8952d79634d7..89e26545d795 100644 --- a/pkgs/development/python-modules/cot/default.nix +++ b/pkgs/development/python-modules/cot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, isPy3k +{ lib, stdenv, buildPythonPackage, fetchPypi, pythonOlder, isPy3k , argcomplete, colorlog, pyvmomi, requests, verboselogs , psutil, pyopenssl, setuptools , mock, pytest, pytest-mock, pytestCheckHook, qemu @@ -43,7 +43,7 @@ buildPythonPackage rec { substituteInPlace setup.py --replace "'argparse'," "" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Common OVF Tool"; longDescription = '' COT (the Common OVF Tool) is a tool for editing Open Virtualization Format (.ovf, .ova) virtual appliances, diff --git a/pkgs/development/python-modules/cov-core/default.nix b/pkgs/development/python-modules/cov-core/default.nix index ad85218709e8..44461a8ca9fb 100644 --- a/pkgs/development/python-modules/cov-core/default.nix +++ b/pkgs/development/python-modules/cov-core/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, coverage }: +{ lib, stdenv, buildPythonPackage, fetchPypi, coverage }: buildPythonPackage rec { pname = "cov-core"; @@ -11,7 +11,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ coverage ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Plugin core for use by pytest-cov, nose-cov and nose2-cov"; }; } diff --git a/pkgs/development/python-modules/coveralls/default.nix b/pkgs/development/python-modules/coveralls/default.nix index 68cf993a5a81..55032864c3f5 100644 --- a/pkgs/development/python-modules/coveralls/default.nix +++ b/pkgs/development/python-modules/coveralls/default.nix @@ -36,6 +36,10 @@ buildPythonPackage rec { pytestrunner ]; + postPatch = '' + sed -i "s/'coverage>=\([^,]\+\),.*',$/'coverage>=\1',/" setup.py + ''; + # FIXME: tests requires .git directory to be present doCheck = false; diff --git a/pkgs/development/python-modules/cppheaderparser/default.nix b/pkgs/development/python-modules/cppheaderparser/default.nix index 688d394198f4..b51499de449c 100644 --- a/pkgs/development/python-modules/cppheaderparser/default.nix +++ b/pkgs/development/python-modules/cppheaderparser/default.nix @@ -1,7 +1,7 @@ { buildPythonPackage , fetchPypi , ply -, stdenv +, lib, stdenv }: buildPythonPackage rec { @@ -17,7 +17,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "CppHeaderParser" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Parse C++ header files using ply.lex to generate navigable class tree representing the class structure"; homepage = "https://sourceforge.net/projects/cppheaderparser/"; license = licenses.bsdOriginal; diff --git a/pkgs/development/python-modules/crate/default.nix b/pkgs/development/python-modules/crate/default.nix index 1cae57c6faf7..37e49210009a 100644 --- a/pkgs/development/python-modules/crate/default.nix +++ b/pkgs/development/python-modules/crate/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchPypi , buildPythonPackage , urllib3 @@ -28,7 +28,7 @@ buildPythonPackage rec { pytestCheckHook ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/crate/crate-python"; description = "A Python client library for CrateDB"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/crayons/default.nix b/pkgs/development/python-modules/crayons/default.nix index f262d289af71..c93bf71687fb 100644 --- a/pkgs/development/python-modules/crayons/default.nix +++ b/pkgs/development/python-modules/crayons/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage, colorama }: +{ lib, stdenv, fetchPypi, buildPythonPackage, colorama }: buildPythonPackage rec { pname = "crayons"; @@ -11,7 +11,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ colorama ]; - meta = with stdenv.lib; { + meta = with lib; { description = "TextUI colors for Python"; homepage = "https://github.com/kennethreitz/crayons"; license = licenses.mit; diff --git a/pkgs/development/python-modules/crc16/default.nix b/pkgs/development/python-modules/crc16/default.nix index 01f5bb8a7e53..1e3c9cbbf4ff 100644 --- a/pkgs/development/python-modules/crc16/default.nix +++ b/pkgs/development/python-modules/crc16/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi }: +{ lib, stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "crc16"; @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "15nkx0pa4lskwin84flpk8fsw3jqg6wic6v3s83syjqg76h6my61"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://code.google.com/archive/p/pycrc16/"; description = "Python library for calculating CRC16"; license = licenses.lgpl3; diff --git a/pkgs/development/python-modules/crccheck/default.nix b/pkgs/development/python-modules/crccheck/default.nix index 92a4cc8a8415..1ddf2a2ba684 100644 --- a/pkgs/development/python-modules/crccheck/default.nix +++ b/pkgs/development/python-modules/crccheck/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ lib, stdenv, buildPythonPackage, fetchPypi , nose }: buildPythonPackage rec { @@ -13,7 +13,7 @@ buildPythonPackage rec { extension = "zip"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Python library for CRCs and checksums"; homepage = "https://bitbucket.org/martin_scharrer/crccheck"; license = licenses.gpl3Plus; diff --git a/pkgs/development/python-modules/crcmod/default.nix b/pkgs/development/python-modules/crcmod/default.nix index 47e1b4097d3d..488b723d89fd 100644 --- a/pkgs/development/python-modules/crcmod/default.nix +++ b/pkgs/development/python-modules/crcmod/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi }: +{ lib, stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "crcmod"; @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "07k0hgr42vw2j92cln3klxka81f33knd7459cn3d8aszvfh52w6w"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Python module for generating objects that compute the Cyclic Redundancy Check (CRC)"; homepage = "http://crcmod.sourceforge.net/"; license = licenses.mit; diff --git a/pkgs/development/python-modules/credstash/default.nix b/pkgs/development/python-modules/credstash/default.nix index 1f9b4b28f294..ca5e1fe334a0 100644 --- a/pkgs/development/python-modules/credstash/default.nix +++ b/pkgs/development/python-modules/credstash/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, cryptography, boto3, pyyaml, docutils, pytest, fetchpatch }: +{ lib, stdenv, buildPythonPackage, fetchPypi, cryptography, boto3, pyyaml, docutils, pytest, fetchpatch }: buildPythonPackage rec { pname = "credstash"; @@ -30,7 +30,7 @@ buildPythonPackage rec { # No tests in archive doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "A utility for managing secrets in the cloud using AWS KMS and DynamoDB"; homepage = "https://github.com/LuminalOSS/credstash"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/croniter/default.nix b/pkgs/development/python-modules/croniter/default.nix index a8ae75746880..308070355790 100644 --- a/pkgs/development/python-modules/croniter/default.nix +++ b/pkgs/development/python-modules/croniter/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "croniter"; - version = "0.3.36"; + version = "0.3.37"; src = fetchPypi { inherit pname version; - sha256 = "9d3098e50f7edc7480470455d42f09c501fa1bb7e2fc113526ec6e90b068f32c"; + sha256 = "12ced475dfc107bf7c6c1440af031f34be14cd97bbbfaf0f62221a9c11e86404"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/cryptacular/default.nix b/pkgs/development/python-modules/cryptacular/default.nix index 5ec1ccacae99..dc97e96e4f5d 100644 --- a/pkgs/development/python-modules/cryptacular/default.nix +++ b/pkgs/development/python-modules/cryptacular/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy27, pythonAtLeast +{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27, pythonAtLeast , coverage, nose, pbkdf2 }: buildPythonPackage rec { @@ -20,7 +20,7 @@ buildPythonPackage rec { # https://bitbucket.org/dholth/cryptacular/issues/11 disabled = isPy27 || pythonAtLeast "3.6"; - meta = with stdenv.lib; { + meta = with lib; { maintainers = with maintainers; [ domenkozar ]; }; } diff --git a/pkgs/development/python-modules/cryptography/3.3.nix b/pkgs/development/python-modules/cryptography/3.3.nix index a76e62dd4ddb..a95318241584 100644 --- a/pkgs/development/python-modules/cryptography/3.3.nix +++ b/pkgs/development/python-modules/cryptography/3.3.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , fetchpatch @@ -65,7 +65,7 @@ buildPythonPackage rec { # can do until nix 1.11's release __impureHostDeps = [ "/usr/lib" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A package which provides cryptographic recipes and primitives"; longDescription = '' Cryptography includes both high level recipes and low level interfaces to diff --git a/pkgs/development/python-modules/cryptography/default.nix b/pkgs/development/python-modules/cryptography/default.nix index 0bee19c3f4f3..bae494989c7d 100644 --- a/pkgs/development/python-modules/cryptography/default.nix +++ b/pkgs/development/python-modules/cryptography/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , fetchpatch @@ -63,7 +63,7 @@ buildPythonPackage rec { # can do until nix 1.11's release __impureHostDeps = [ "/usr/lib" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A package which provides cryptographic recipes and primitives"; longDescription = '' Cryptography includes both high level recipes and low level interfaces to diff --git a/pkgs/development/python-modules/crytic-compile/default.nix b/pkgs/development/python-modules/crytic-compile/default.nix index b9345e78eab0..936db1081b6a 100644 --- a/pkgs/development/python-modules/crytic-compile/default.nix +++ b/pkgs/development/python-modules/crytic-compile/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "crytic-compile"; - version = "0.1.9"; + version = "0.1.12"; disabled = pythonOlder "3.6"; @@ -10,12 +10,13 @@ buildPythonPackage rec { owner = "crytic"; repo = "crytic-compile"; rev = version; - sha256 = "01mis7bqsh0l5vjl6jwibzy99djza35fxmywy56q8k4jbxwmdcna"; + sha256 = "1q75n84yxv2cb6x7gqyk3vcwkxpq7pni30wgz3d1bk6pmi2pqgw6"; }; propagatedBuildInputs = [ pysha3 setuptools ]; doCheck = false; + pythonImportsCheck = [ "crytic_compile" ]; meta = with lib; { description = "Abstraction layer for smart contract build systems"; diff --git a/pkgs/development/python-modules/cssmin/default.nix b/pkgs/development/python-modules/cssmin/default.nix index deace3233b24..a6f6f3c956ae 100644 --- a/pkgs/development/python-modules/cssmin/default.nix +++ b/pkgs/development/python-modules/cssmin/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi }: +{ lib, stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "cssmin"; @@ -12,7 +12,7 @@ buildPythonPackage rec { # no tests doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "A Python port of the YUI CSS compression algorithm"; homepage = "https://github.com/zacharyvoase/cssmin"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/cssselect/default.nix b/pkgs/development/python-modules/cssselect/default.nix index 00e6c0f7a627..fe13fa9582ea 100644 --- a/pkgs/development/python-modules/cssselect/default.nix +++ b/pkgs/development/python-modules/cssselect/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi }: +{ lib, stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "cssselect"; @@ -12,6 +12,6 @@ buildPythonPackage rec { # AttributeError: 'module' object has no attribute 'tests' doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { }; } diff --git a/pkgs/development/python-modules/cssutils/default.nix b/pkgs/development/python-modules/cssutils/default.nix index 1db154ac1b8c..ea3ac6236e90 100644 --- a/pkgs/development/python-modules/cssutils/default.nix +++ b/pkgs/development/python-modules/cssutils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, mock }: +{ lib, stdenv, buildPythonPackage, fetchPypi, mock }: buildPythonPackage rec { pname = "cssutils"; @@ -14,7 +14,7 @@ buildPythonPackage rec { # couple of failing tests doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "A Python package to parse and build CSS"; homepage = "http://cthedot.de/cssutils/"; license = licenses.lgpl3Plus; diff --git a/pkgs/development/python-modules/cupy/default.nix b/pkgs/development/python-modules/cupy/default.nix index 91fd7ba11d4f..09685d392d6a 100644 --- a/pkgs/development/python-modules/cupy/default.nix +++ b/pkgs/development/python-modules/cupy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage +{ lib, stdenv, buildPythonPackage , fetchPypi, isPy3k, linuxPackages , fastrlock, numpy, six, wheel, pytest, mock, setuptools , cudatoolkit, cudnn, nccl @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "cupy"; - version = "8.2.0"; + version = "8.3.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "8e4bc8428fb14309d73194e19bc4b47e1d6a330678a200e36d9d4b932f1be2e8"; + sha256 = "db699fddfde7806445908cf6454c6f4985e7a9563b40405ddf97845d808c5f12"; }; checkInputs = [ @@ -40,7 +40,7 @@ buildPythonPackage rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A NumPy-compatible matrix library accelerated by CUDA"; homepage = "https://cupy.chainer.org/"; license = licenses.mit; diff --git a/pkgs/development/python-modules/curtsies/default.nix b/pkgs/development/python-modules/curtsies/default.nix index 9f45c2fd2ba6..f860f2ae5ebc 100644 --- a/pkgs/development/python-modules/curtsies/default.nix +++ b/pkgs/development/python-modules/curtsies/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, fetchpatch, pythonOlder, blessings, mock, nose, pyte, wcwidth, typing }: +{ lib, stdenv, buildPythonPackage, fetchPypi, fetchpatch, pythonOlder, blessings, mock, nose, pyte, wcwidth, typing }: buildPythonPackage rec { pname = "curtsies"; @@ -25,7 +25,7 @@ buildPythonPackage rec { nosetests tests ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Curses-like terminal wrapper, with colored strings!"; homepage = "https://github.com/bpython/curtsies"; license = licenses.mit; diff --git a/pkgs/development/python-modules/curve25519-donna/default.nix b/pkgs/development/python-modules/curve25519-donna/default.nix index 1672557f1b95..e42f4021a6f2 100644 --- a/pkgs/development/python-modules/curve25519-donna/default.nix +++ b/pkgs/development/python-modules/curve25519-donna/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi }: +{ lib, stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "curve25519-donna"; @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "1w0vkjyh4ki9n98lr2hg09f1lr1g3pz48kshrlic01ba6pasj60q"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Python wrapper for the portable curve25519-donna implementation"; homepage = "http://code.google.com/p/curve25519-donna/"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/cx_freeze/default.nix b/pkgs/development/python-modules/cx_freeze/default.nix index e4350bada331..14a585617c64 100644 --- a/pkgs/development/python-modules/cx_freeze/default.nix +++ b/pkgs/development/python-modules/cx_freeze/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, pythonOlder, fetchPypi, ncurses, importlib-metadata }: +{ lib, stdenv, buildPythonPackage, pythonOlder, fetchPypi, ncurses, importlib-metadata }: buildPythonPackage rec { pname = "cx_Freeze"; @@ -24,7 +24,7 @@ buildPythonPackage rec { # fails to find Console even though it exists on python 3.x doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "A set of scripts and modules for freezing Python scripts into executables"; homepage = "http://cx-freeze.sourceforge.net/"; license = licenses.psfl; diff --git a/pkgs/development/python-modules/cx_oracle/default.nix b/pkgs/development/python-modules/cx_oracle/default.nix index 440e43cf81c8..ceacad12059d 100644 --- a/pkgs/development/python-modules/cx_oracle/default.nix +++ b/pkgs/development/python-modules/cx_oracle/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, odpic }: +{ lib, stdenv, buildPythonPackage, fetchPypi, odpic }: buildPythonPackage rec { pname = "cx_Oracle"; @@ -19,7 +19,7 @@ buildPythonPackage rec { # Check need an Oracle database to run doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Python interface to Oracle"; homepage = "https://oracle.github.io/python-cx_Oracle"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/cymem/default.nix b/pkgs/development/python-modules/cymem/default.nix index e563e6615fe8..d805ba5de1f9 100644 --- a/pkgs/development/python-modules/cymem/default.nix +++ b/pkgs/development/python-modules/cymem/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchFromGitHub , cython @@ -30,7 +30,7 @@ buildPythonPackage rec { ${python.interpreter} -m unittest discover -p "*test*" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Cython memory pool for RAII-style memory management"; homepage = "https://github.com/explosion/cymem"; license = licenses.mit; diff --git a/pkgs/development/python-modules/cypari2/default.nix b/pkgs/development/python-modules/cypari2/default.nix index ee2c9ded18df..8a0adb3d6c96 100644 --- a/pkgs/development/python-modules/cypari2/default.nix +++ b/pkgs/development/python-modules/cypari2/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , python , fetchPypi @@ -46,7 +46,7 @@ buildPythonPackage rec { make check ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Cython bindings for PARI"; license = licenses.gpl2; maintainers = teams.sage.members; diff --git a/pkgs/development/python-modules/daemonize/default.nix b/pkgs/development/python-modules/daemonize/default.nix index 9db823806843..30d4f1bd7146 100644 --- a/pkgs/development/python-modules/daemonize/default.nix +++ b/pkgs/development/python-modules/daemonize/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi }: @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "1hwbl3gf9fdds9sc14zgjyjisjvxidrvqc11xlbb0b6jz17nw0nx"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Library to enable your code run as a daemon process on Unix-like systems"; homepage = "https://github.com/thesharp/daemonize"; license = licenses.mit; diff --git a/pkgs/development/python-modules/daphne/default.nix b/pkgs/development/python-modules/daphne/default.nix index cbd80333b2f0..fc48f9150124 100644 --- a/pkgs/development/python-modules/daphne/default.nix +++ b/pkgs/development/python-modules/daphne/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, isPy3k, fetchFromGitHub +{ lib, stdenv, buildPythonPackage, isPy3k, fetchFromGitHub , asgiref, autobahn, twisted, pytestrunner , hypothesis, pytest, pytest-asyncio, service-identity, pyopenssl }: @@ -27,7 +27,7 @@ buildPythonPackage rec { py.test ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Django ASGI (HTTP/WebSocket) server"; license = licenses.bsd3; homepage = "https://github.com/django/daphne"; diff --git a/pkgs/development/python-modules/darcsver/default.nix b/pkgs/development/python-modules/darcsver/default.nix index 33c7eb2d1168..6484d84253b5 100644 --- a/pkgs/development/python-modules/darcsver/default.nix +++ b/pkgs/development/python-modules/darcsver/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy3k, mock }: +{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k, mock }: buildPythonPackage rec { pname = "darcsver"; @@ -21,7 +21,7 @@ buildPythonPackage rec { # AttributeError: 'module' object has no attribute 'test_darcsver' doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Darcsver, generate a version number from Darcs history"; homepage = "https://pypi.python.org/pypi/darcsver"; license = "BSD-style"; diff --git a/pkgs/development/python-modules/dask-glm/default.nix b/pkgs/development/python-modules/dask-glm/default.nix index 0a88323fafd8..1db03b66ffb0 100644 --- a/pkgs/development/python-modules/dask-glm/default.nix +++ b/pkgs/development/python-modules/dask-glm/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , cloudpickle @@ -26,7 +26,7 @@ buildPythonPackage rec { py.test dask_glm ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/dask/dask-glm/"; description = "Generalized Linear Models with Dask"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/dask-image/default.nix b/pkgs/development/python-modules/dask-image/default.nix index 453cb715b12b..eac503c2f855 100644 --- a/pkgs/development/python-modules/dask-image/default.nix +++ b/pkgs/development/python-modules/dask-image/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , fetchpatch @@ -39,7 +39,7 @@ buildPythonPackage rec { pytest --ignore=tests/test_dask_image/ ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/dask/dask-image"; description = "Distributed image processing"; license = licenses.bsdOriginal; diff --git a/pkgs/development/python-modules/dask-jobqueue/default.nix b/pkgs/development/python-modules/dask-jobqueue/default.nix index 52e22a093311..be27399b71f6 100644 --- a/pkgs/development/python-modules/dask-jobqueue/default.nix +++ b/pkgs/development/python-modules/dask-jobqueue/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , dask @@ -24,7 +24,7 @@ buildPythonPackage rec { py.test dask_jobqueue/tests/test_jobqueue_core.py ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/dask/dask-jobqueue"; description = "Deploy Dask on job schedulers like PBS, SLURM, and SGE"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/dask-ml/default.nix b/pkgs/development/python-modules/dask-ml/default.nix index 441c698c2ad0..4d3aa8e79a05 100644 --- a/pkgs/development/python-modules/dask-ml/default.nix +++ b/pkgs/development/python-modules/dask-ml/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , pythonOlder @@ -55,7 +55,7 @@ buildPythonPackage rec { "dask_ml.utils" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/dask/dask-ml"; description = "Scalable Machine Learn with Dask"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/dask-mpi/default.nix b/pkgs/development/python-modules/dask-mpi/default.nix index 2794bcba7aed..f2d8737b38e9 100644 --- a/pkgs/development/python-modules/dask-mpi/default.nix +++ b/pkgs/development/python-modules/dask-mpi/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , dask @@ -27,7 +27,7 @@ buildPythonPackage rec { # hardcoded mpirun path in tests doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/dask/dask-mpi"; description = "Deploy Dask using mpi4py"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/dask-xgboost/default.nix b/pkgs/development/python-modules/dask-xgboost/default.nix index 9730ca8a2feb..c60f628d72eb 100644 --- a/pkgs/development/python-modules/dask-xgboost/default.nix +++ b/pkgs/development/python-modules/dask-xgboost/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , xgboost @@ -26,7 +26,7 @@ buildPythonPackage rec { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/dask/dask-xgboost"; description = "Interactions between Dask and XGBoost"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix index 19c6962c5759..2fb393035834 100644 --- a/pkgs/development/python-modules/dask/default.nix +++ b/pkgs/development/python-modules/dask/default.nix @@ -59,6 +59,7 @@ buildPythonPackage rec { "test_count_nonzero_str" "rolling_methods" # floating percision error ~0.1*10^8 small "num_workers_config" # flaky + "test_2args_with_array[pandas1-darray1-ldexp]" # flaky ]; meta = { diff --git a/pkgs/development/python-modules/databricks-cli/default.nix b/pkgs/development/python-modules/databricks-cli/default.nix index 2184a7e41940..30001b781d28 100644 --- a/pkgs/development/python-modules/databricks-cli/default.nix +++ b/pkgs/development/python-modules/databricks-cli/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ lib, stdenv, buildPythonPackage, fetchPypi , click , requests , tabulate @@ -32,7 +32,7 @@ buildPythonPackage rec { configparser ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/databricks/databricks-cli"; description = "A command line interface for Databricks"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/dataclasses/default.nix b/pkgs/development/python-modules/dataclasses/default.nix index 5cfaf237059d..a88995937d83 100644 --- a/pkgs/development/python-modules/dataclasses/default.nix +++ b/pkgs/development/python-modules/dataclasses/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy36 }: +{ lib, stdenv, buildPythonPackage, fetchPypi, isPy36 }: buildPythonPackage rec { pname = "dataclasses"; @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "8479067f342acf957dc82ec415d355ab5edb7e7646b90dc6e2fd1d96ad084c97"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "An implementation of PEP 557: Data Classes"; homepage = "https://github.com/ericvsmith/dataclasses"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/datadiff/default.nix b/pkgs/development/python-modules/datadiff/default.nix index 0c30f2f84689..680462352275 100644 --- a/pkgs/development/python-modules/datadiff/default.nix +++ b/pkgs/development/python-modules/datadiff/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , nose @@ -16,7 +16,7 @@ buildPythonPackage rec { buildInputs = [ nose ]; - meta = with stdenv.lib; { + meta = with lib; { description = "DataDiff"; homepage = "https://sourceforge.net/projects/datadiff/"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/datamodeldict/default.nix b/pkgs/development/python-modules/datamodeldict/default.nix index e4c10d8c22c7..f3eab1d1d4e2 100644 --- a/pkgs/development/python-modules/datamodeldict/default.nix +++ b/pkgs/development/python-modules/datamodeldict/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , xmltodict @@ -18,7 +18,7 @@ buildPythonPackage rec { # no tests doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/usnistgov/DataModelDict/"; description = "Class allowing for data models equivalently represented as Python dictionaries, JSON, and XML"; license = licenses.mit; diff --git a/pkgs/development/python-modules/datasets/default.nix b/pkgs/development/python-modules/datasets/default.nix index 4214304a9c93..fc349cdc277b 100644 --- a/pkgs/development/python-modules/datasets/default.nix +++ b/pkgs/development/python-modules/datasets/default.nix @@ -35,6 +35,10 @@ buildPythonPackage rec { xxhash ]; + postPatch = '' + substituteInPlace setup.py --replace '"tqdm>=4.27,<4.50.0"' '"tqdm>=4.27"' + ''; + # Tests require pervasive internet access. doCheck = false; diff --git a/pkgs/development/python-modules/datashader/default.nix b/pkgs/development/python-modules/datashader/default.nix index 233aac688abd..c49e2e30b809 100644 --- a/pkgs/development/python-modules/datashader/default.nix +++ b/pkgs/development/python-modules/datashader/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, fetchpatch , dask , distributed , bokeh @@ -36,6 +37,12 @@ buildPythonPackage rec { inherit pname version; sha256 = "b1f80415f72f92ccb660aaea7b2881ddd35d07254f7c44101709d42e819d6be6"; }; + patches = [ (fetchpatch { + # Unpins pyct==0.46 (Sep. 11, 2020). + # Will be incorporated into the next datashader release after 0.11.1 + url = "https://github.com/holoviz/datashader/pull/960/commits/d7a462fa399106c34fd0d44505a8a73789dbf874.patch"; + sha256 = "1wqsk9dpxnkxr49fa7y5q6ahin80cvys05lnirs2w2p1dja35y4x"; + })]; propagatedBuildInputs = [ dask diff --git a/pkgs/development/python-modules/dateutil/default.nix b/pkgs/development/python-modules/dateutil/default.nix index 88024265d948..a6aca68ef293 100644 --- a/pkgs/development/python-modules/dateutil/default.nix +++ b/pkgs/development/python-modules/dateutil/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, six, setuptools_scm, pytest }: +{ lib, stdenv, buildPythonPackage, fetchPypi, six, setuptools_scm, pytest }: buildPythonPackage rec { pname = "python-dateutil"; version = "2.8.1"; @@ -18,7 +18,7 @@ buildPythonPackage rec { # Requires fixing doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Powerful extensions to the standard datetime module"; homepage = "https://pypi.python.org/pypi/python-dateutil"; license = "BSD-style"; diff --git a/pkgs/development/python-modules/datrie/default.nix b/pkgs/development/python-modules/datrie/default.nix index 7cb30937e0db..c7f74730c161 100644 --- a/pkgs/development/python-modules/datrie/default.nix +++ b/pkgs/development/python-modules/datrie/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, fetchpatch +{ lib, stdenv, buildPythonPackage, fetchPypi, fetchpatch , cython, pytest, pytestrunner, hypothesis }: buildPythonPackage rec { @@ -27,7 +27,7 @@ buildPythonPackage rec { ./update_c.sh ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Super-fast, efficiently stored Trie for Python"; homepage = "https://github.com/kmike/datrie"; license = licenses.lgpl2; diff --git a/pkgs/development/python-modules/dbf/default.nix b/pkgs/development/python-modules/dbf/default.nix index 9eb6e4f89a26..348f91ea6831 100644 --- a/pkgs/development/python-modules/dbf/default.nix +++ b/pkgs/development/python-modules/dbf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage, aenum, isPy3k, pythonOlder, enum34, python }: +{ lib, stdenv, fetchPypi, buildPythonPackage, aenum, isPy3k, pythonOlder, enum34, python }: buildPythonPackage rec { pname = "dbf"; @@ -19,7 +19,7 @@ buildPythonPackage rec { ${python.interpreter} dbf/test.py ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Pure python package for reading/writing dBase, FoxPro, and Visual FoxPro .dbf files"; homepage = "https://pypi.python.org/pypi/dbf"; license = licenses.bsd2; diff --git a/pkgs/development/python-modules/dbfread/default.nix b/pkgs/development/python-modules/dbfread/default.nix index 9dda98e03acf..9f78f3fdde1b 100644 --- a/pkgs/development/python-modules/dbfread/default.nix +++ b/pkgs/development/python-modules/dbfread/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage }: +{ lib, stdenv, fetchPypi, buildPythonPackage }: buildPythonPackage rec { pname = "dbfread"; @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "07c8a9af06ffad3f6f03e8fe91ad7d2733e31a26d2b72c4dd4cfbae07ee3b73d"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Read DBF Files with Python"; homepage = "https://dbfread.readthedocs.org/"; license = with licenses; [ mit ]; diff --git a/pkgs/development/python-modules/dbus-next/default.nix b/pkgs/development/python-modules/dbus-next/default.nix index bbca0df8d8e9..76385ac8023a 100644 --- a/pkgs/development/python-modules/dbus-next/default.nix +++ b/pkgs/development/python-modules/dbus-next/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchFromGitHub , python @@ -32,7 +32,7 @@ buildPythonPackage rec { -k "not test_peer_interface" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/altdesktop/python-dbus-next"; description = "A zero-dependency DBus library for Python with asyncio support"; license = licenses.mit; diff --git a/pkgs/development/python-modules/dbutils/default.nix b/pkgs/development/python-modules/dbutils/default.nix new file mode 100644 index 000000000000..42ae779e0d21 --- /dev/null +++ b/pkgs/development/python-modules/dbutils/default.nix @@ -0,0 +1,21 @@ +{ lib, stdenv, buildPythonPackage, fetchPypi, pytestCheckHook }: + +buildPythonPackage rec { + version = "2.0"; + pname = "dbutils"; + + src = fetchPypi { + inherit version; + pname = "DBUtils"; + sha256 = "131ifm2c2a7bipij597i8fvjka0dk2qv1xr2ghcvbc30jlkvag2g"; + }; + + checkInputs = [ pytestCheckHook ]; + + meta = with lib; { + description = "Database connections for multi-threaded environments"; + homepage = "https://webwareforpython.github.io/DBUtils/"; + license = licenses.mit; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/development/python-modules/dcmstack/default.nix b/pkgs/development/python-modules/dcmstack/default.nix index f06e361dc716..a6669d0e30df 100644 --- a/pkgs/development/python-modules/dcmstack/default.nix +++ b/pkgs/development/python-modules/dcmstack/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchFromGitHub , pythonAtLeast @@ -30,7 +30,7 @@ buildPythonPackage rec { runHook postCheck ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/moloney/dcmstack"; description = "DICOM to Nifti conversion preserving metadata"; license = licenses.mit; diff --git a/pkgs/development/python-modules/deap/default.nix b/pkgs/development/python-modules/deap/default.nix index 5a09c42a9bbf..21dc9d3832c8 100644 --- a/pkgs/development/python-modules/deap/default.nix +++ b/pkgs/development/python-modules/deap/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, python, numpy, matplotlib, nose }: +{ lib, stdenv, buildPythonPackage, fetchPypi, python, numpy, matplotlib, nose }: buildPythonPackage rec { pname = "deap"; @@ -16,7 +16,7 @@ buildPythonPackage rec { ${python.interpreter} setup.py nosetests --verbosity=3 ''; - meta = with stdenv.lib; { + meta = with lib; { description = "DEAP is a novel evolutionary computation framework for rapid prototyping and testing of ideas."; homepage = "https://github.com/DEAP/deap"; license = licenses.lgpl3; diff --git a/pkgs/development/python-modules/deluge-client/default.nix b/pkgs/development/python-modules/deluge-client/default.nix index 8a2bdee1d922..a271371e22fc 100644 --- a/pkgs/development/python-modules/deluge-client/default.nix +++ b/pkgs/development/python-modules/deluge-client/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi }: +{ lib, stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "deluge-client"; @@ -12,7 +12,7 @@ buildPythonPackage rec { # it will try to connect to a running instance doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Lightweight pure-python rpc client for deluge"; homepage = "https://github.com/JohnDoee/deluge-client"; license = licenses.mit; diff --git a/pkgs/development/python-modules/demjson/default.nix b/pkgs/development/python-modules/demjson/default.nix index 58f2012aea71..988c2815da8c 100644 --- a/pkgs/development/python-modules/demjson/default.nix +++ b/pkgs/development/python-modules/demjson/default.nix @@ -1,16 +1,21 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy3k }: +{ lib, stdenv, python, buildPythonPackage, fetchPypi, isPy3k }: buildPythonPackage rec { pname = "demjson"; version = "2.2.4"; - disabled = isPy3k; src = fetchPypi { inherit pname version; sha256 = "0ygbddpnvp5lby6mr5kz60la3hkvwwzv3wwb3z0w9ngxl0w21pii"; }; - meta = with stdenv.lib; { + checkPhase = stdenv.lib.optionalString isPy3k '' + ${python.interpreter} -m lib2to3 -w test/test_demjson.py + '' + '' + ${python.interpreter} test/test_demjson.py + ''; + + meta = with lib; { description = "Encoder/decoder and lint/validator for JSON (JavaScript Object Notation)"; homepage = "https://github.com/dmeranda/demjson"; license = licenses.lgpl3Plus; diff --git a/pkgs/development/python-modules/denonavr/default.nix b/pkgs/development/python-modules/denonavr/default.nix index 3d047213f7f5..b02e1e498b9d 100644 --- a/pkgs/development/python-modules/denonavr/default.nix +++ b/pkgs/development/python-modules/denonavr/default.nix @@ -3,14 +3,14 @@ buildPythonPackage rec { pname = "denonavr"; - version = "0.9.9"; + version = "0.9.10"; disabled = isPy27; src = fetchFromGitHub { owner = "scarface-4711"; repo = "denonavr"; rev = version; - sha256 = "08zh8rdadmxcgr707if6g5k5j2xz21s6jrn4kxh1c7xqpgdfggd9"; + sha256 = "sha256-3ap8F3ayBTpaR98md+gT0+hkIWlFBNxStTGWT5AL//A="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/dependency-injector/default.nix b/pkgs/development/python-modules/dependency-injector/default.nix index a9c0b517a134..0c2e2055ff9f 100644 --- a/pkgs/development/python-modules/dependency-injector/default.nix +++ b/pkgs/development/python-modules/dependency-injector/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy3k, six, unittest2, pyyaml, flask }: +{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k, six, unittest2, pyyaml, flask }: let testPath = @@ -23,7 +23,7 @@ buildPythonPackage rec { unit2 discover -s tests/unit -p "${testPath}" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Dependency injection microframework for Python"; homepage = "https://github.com/ets-labs/python-dependency-injector"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/deprecated/default.nix b/pkgs/development/python-modules/deprecated/default.nix index d6e5acdeaf8c..bca1de711f24 100644 --- a/pkgs/development/python-modules/deprecated/default.nix +++ b/pkgs/development/python-modules/deprecated/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage, +{ lib, stdenv, fetchPypi, buildPythonPackage, wrapt, pytest, tox }: buildPythonPackage rec { @@ -12,7 +12,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ wrapt ]; checkInputs = [ pytest ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/tantale/deprecated"; description = "Python @deprecated decorator to deprecate old python classes, functions or methods"; platforms = platforms.all; diff --git a/pkgs/development/python-modules/derpconf/default.nix b/pkgs/development/python-modules/derpconf/default.nix index 9138ef28530a..f9b8f5dec7c0 100644 --- a/pkgs/development/python-modules/derpconf/default.nix +++ b/pkgs/development/python-modules/derpconf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, six }: +{ lib, stdenv, buildPythonPackage, fetchPypi, six }: buildPythonPackage rec { pname = "derpconf"; @@ -11,7 +11,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six ]; - meta = with stdenv.lib; { + meta = with lib; { description = "derpconf abstracts loading configuration files for your app"; homepage = "https://github.com/globocom/derpconf"; license = licenses.mit; diff --git a/pkgs/development/python-modules/descartes/default.nix b/pkgs/development/python-modules/descartes/default.nix index c726492f69d4..5280ff2417aa 100644 --- a/pkgs/development/python-modules/descartes/default.nix +++ b/pkgs/development/python-modules/descartes/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, +{ lib, stdenv, buildPythonPackage, fetchPypi, matplotlib, shapely }: @@ -16,7 +16,7 @@ buildPythonPackage rec { shapely ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Python library to use Shapely or GeoJSON objects as matplotlib paths"; homepage = "https://bitbucket.org/sgillies/descartes/"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/deskcon/default.nix b/pkgs/development/python-modules/deskcon/default.nix index 7beaa838a825..01918445b342 100644 --- a/pkgs/development/python-modules/deskcon/default.nix +++ b/pkgs/development/python-modules/deskcon/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , pyopenssl , pkgs @@ -33,7 +33,7 @@ buildPythonPackage { wrapPythonProgramsIn $out/bin "$out $pythonPath" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Integrates an Android device into a desktop"; homepage = "https://github.com/screenfreeze/deskcon-desktop"; license = licenses.gpl3; diff --git a/pkgs/development/python-modules/diff_cover/default.nix b/pkgs/development/python-modules/diff_cover/default.nix index ab9d9493fd60..9672cca46b05 100644 --- a/pkgs/development/python-modules/diff_cover/default.nix +++ b/pkgs/development/python-modules/diff_cover/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ lib, stdenv, buildPythonPackage, fetchPypi , inflect , jinja2 , jinja2_pluralize @@ -37,7 +37,7 @@ buildPythonPackage rec { pytest -k 'not added_file_pylint_console and not file_does_not_exist' ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Automatically find diff lines that need test coverage"; homepage = "https://github.com/Bachmann1234/diff-cover"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/digi-xbee/default.nix b/pkgs/development/python-modules/digi-xbee/default.nix index 32d8c47a9801..ad653c6313c6 100644 --- a/pkgs/development/python-modules/digi-xbee/default.nix +++ b/pkgs/development/python-modules/digi-xbee/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { # Upstream doesn't contain unit tests, only functional tests which require specific hardware doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Python library to interact with Digi International's XBee radio frequency modules"; homepage = "https://github.com/digidotcom/xbee-python"; license = licenses.mpl20; diff --git a/pkgs/development/python-modules/digitalocean/default.nix b/pkgs/development/python-modules/digitalocean/default.nix index 404331a49577..f052d8f978e5 100644 --- a/pkgs/development/python-modules/digitalocean/default.nix +++ b/pkgs/development/python-modules/digitalocean/default.nix @@ -8,7 +8,7 @@ , pytestCheckHook , requests , responses -, stdenv +, lib, stdenv }: buildPythonPackage rec { @@ -41,7 +41,7 @@ buildPythonPackage rec { cd digitalocean ''; - meta = with stdenv.lib; { + meta = with lib; { description = "digitalocean.com API to manage Droplets and Images"; homepage = "https://pypi.python.org/pypi/python-digitalocean"; license = licenses.lgpl3; diff --git a/pkgs/development/python-modules/discid/default.nix b/pkgs/development/python-modules/discid/default.nix index 2684d4a06a91..1c24402926f3 100644 --- a/pkgs/development/python-modules/discid/default.nix +++ b/pkgs/development/python-modules/discid/default.nix @@ -1,4 +1,4 @@ -{ stdenv, libdiscid, buildPythonPackage, fetchPypi }: +{ lib, stdenv, libdiscid, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "discid"; @@ -17,7 +17,7 @@ buildPythonPackage rec { "_open_library('${libdiscid}/lib/libdiscid${extension}')" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Python binding of libdiscid"; homepage = "https://python-discid.readthedocs.org/"; license = licenses.lgpl3Plus; diff --git a/pkgs/development/python-modules/discogs_client/default.nix b/pkgs/development/python-modules/discogs_client/default.nix index 8d8fb12d4d9b..5e3ac1e1fcde 100644 --- a/pkgs/development/python-modules/discogs_client/default.nix +++ b/pkgs/development/python-modules/discogs_client/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, requests, oauthlib }: +{ lib, stdenv, buildPythonPackage, fetchPypi, requests, oauthlib }: buildPythonPackage rec { pname = "discogs-client"; @@ -11,7 +11,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests oauthlib ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Official Python API client for Discogs"; license = licenses.bsd2; homepage = "https://github.com/discogs/discogs_client"; diff --git a/pkgs/development/python-modules/discordpy/default.nix b/pkgs/development/python-modules/discordpy/default.nix index 4f784642537f..9c30606f75d9 100644 --- a/pkgs/development/python-modules/discordpy/default.nix +++ b/pkgs/development/python-modules/discordpy/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "discord.py"; - version = "1.5.1"; + version = "1.6.0"; disabled = pythonOlder "3.5.3"; # only distributes wheels on pypi now @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "Rapptz"; repo = pname; rev = "v${version}"; - sha256 = "1bidyclwv20p1kfphj21r5gm3kr2vxx0zd151wg7fcngbbx7gmza"; + sha256 = "036prc4iw91qx31zz48hy3b30kn2qnlg68lgrvv2mcvsjxf2gd1l"; }; propagatedBuildInputs = [ aiohttp websockets ]; diff --git a/pkgs/development/python-modules/distlib/default.nix b/pkgs/development/python-modules/distlib/default.nix index af9b82e42dc3..403834a3731c 100644 --- a/pkgs/development/python-modules/distlib/default.nix +++ b/pkgs/development/python-modules/distlib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi }: +{ lib, stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "distlib"; @@ -13,7 +13,7 @@ buildPythonPackage rec { # Tests use pypi.org. doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Low-level components of distutils2/packaging"; homepage = "https://distlib.readthedocs.io"; license = licenses.psfl; diff --git a/pkgs/development/python-modules/distorm3/default.nix b/pkgs/development/python-modules/distorm3/default.nix index 29524240a8a7..e9b8e66d4c99 100644 --- a/pkgs/development/python-modules/distorm3/default.nix +++ b/pkgs/development/python-modules/distorm3/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi }: +{ lib, stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "distorm3"; @@ -13,7 +13,7 @@ buildPythonPackage rec { # no tests included doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Powerful Disassembler Library For x86/AMD64"; homepage = "https://github.com/gdabah/distorm"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/distro/default.nix b/pkgs/development/python-modules/distro/default.nix index baaf54dd061d..81bcccd8bd6c 100644 --- a/pkgs/development/python-modules/distro/default.nix +++ b/pkgs/development/python-modules/distro/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage }: +{ lib, stdenv, fetchPypi, buildPythonPackage }: buildPythonPackage rec { pname = "distro"; @@ -14,7 +14,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "distro" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/nir0s/distro"; description = "Linux Distribution - a Linux OS platform information API."; license = licenses.asl20; diff --git a/pkgs/development/python-modules/distutils_extra/default.nix b/pkgs/development/python-modules/distutils_extra/default.nix index 1e66f04374be..882a39957993 100644 --- a/pkgs/development/python-modules/distutils_extra/default.nix +++ b/pkgs/development/python-modules/distutils_extra/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchurl }: @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "1bv3h2p9ffbzyddhi5sccsfwrm3i6yxzn0m06fdxkj2zsvs28gvj"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://launchpad.net/python-distutils-extra"; description = "Enhancements to Python's distutils"; license = licenses.gpl2; diff --git a/pkgs/development/python-modules/dj-email-url/default.nix b/pkgs/development/python-modules/dj-email-url/default.nix index 711eee059caa..f8dd9dca202c 100644 --- a/pkgs/development/python-modules/dj-email-url/default.nix +++ b/pkgs/development/python-modules/dj-email-url/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , python @@ -20,7 +20,7 @@ buildPythonPackage rec { # tests not included with pypi release doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/migonzalvar/dj-email-url"; description = "Use an URL to configure email backend settings in your Django Application"; license = licenses.bsd0; diff --git a/pkgs/development/python-modules/dj-search-url/default.nix b/pkgs/development/python-modules/dj-search-url/default.nix index f86f08ae60b9..321bec8149d1 100644 --- a/pkgs/development/python-modules/dj-search-url/default.nix +++ b/pkgs/development/python-modules/dj-search-url/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi }: @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "424d1a5852500b3c118abfdd0e30b3e0016fe68e7ed27b8553a67afa20d4fb40"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/dstufft/dj-search-url"; description = "Use Search URLs in your Django Haystack Application"; license = licenses.bsd0; diff --git a/pkgs/development/python-modules/django-allauth/default.nix b/pkgs/development/python-modules/django-allauth/default.nix index a91bd6cadc3e..fafd7ab9a63f 100644 --- a/pkgs/development/python-modules/django-allauth/default.nix +++ b/pkgs/development/python-modules/django-allauth/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, requests, requests_oauthlib +{ lib, stdenv, buildPythonPackage, fetchFromGitHub, requests, requests_oauthlib , django, python3-openid, mock, coverage }: buildPythonPackage rec { @@ -23,7 +23,7 @@ buildPythonPackage rec { coverage run manage.py test allauth ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Integrated set of Django applications addressing authentication, registration, account management as well as 3rd party (social) account authentication"; homepage = "https://www.intenct.nl/projects/django-allauth"; license = licenses.mit; diff --git a/pkgs/development/python-modules/django-anymail/default.nix b/pkgs/development/python-modules/django-anymail/default.nix index 32fb40341941..892cf179c370 100644 --- a/pkgs/development/python-modules/django-anymail/default.nix +++ b/pkgs/development/python-modules/django-anymail/default.nix @@ -1,5 +1,5 @@ { - stdenv, + lib, stdenv, buildPythonPackage, fetchFromGitHub, six, @@ -38,7 +38,7 @@ buildPythonPackage rec { # this package allows multiple email backends # sparkpost is missing because it's not packaged yet - meta = with stdenv.lib; { + meta = with lib; { description = "Django email backends and webhooks for Mailgun"; homepage = "https://github.com/anymail/django-anymail"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/django-auth-ldap/default.nix b/pkgs/development/python-modules/django-auth-ldap/default.nix index 84b9df28bce6..d0dacd659a15 100644 --- a/pkgs/development/python-modules/django-auth-ldap/default.nix +++ b/pkgs/development/python-modules/django-auth-ldap/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi, isPy27 , ldap , django @@ -20,7 +20,7 @@ buildPythonPackage rec { # 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; - meta = with stdenv.lib; { + meta = with lib; { description = "Django authentication backend that authenticates against an LDAP service"; homepage = "https://github.com/django-auth-ldap/django-auth-ldap"; license = licenses.bsd2; diff --git a/pkgs/development/python-modules/django-cache-url/default.nix b/pkgs/development/python-modules/django-cache-url/default.nix index 6abe92c43f76..103bfb29578d 100644 --- a/pkgs/development/python-modules/django-cache-url/default.nix +++ b/pkgs/development/python-modules/django-cache-url/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , pytest @@ -22,7 +22,7 @@ buildPythonPackage rec { # tests not included with pypi release doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/ghickman/django-cache-url"; description = "Use Cache URLs in your Django application"; license = licenses.mit; diff --git a/pkgs/development/python-modules/django-cleanup/default.nix b/pkgs/development/python-modules/django-cleanup/default.nix index 66d202304ee7..39f65275feed 100644 --- a/pkgs/development/python-modules/django-cleanup/default.nix +++ b/pkgs/development/python-modules/django-cleanup/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, django +{ lib, stdenv, buildPythonPackage, fetchPypi, django , redis, async-timeout, hiredis }: @@ -12,7 +12,7 @@ buildPythonPackage rec { checkInputs = [ django ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Automatically deletes old file for FileField and ImageField. It also deletes files on models instance deletion"; homepage = "https://github.com/un1t/django-cleanup"; license = licenses.mit; diff --git a/pkgs/development/python-modules/django-compat/default.nix b/pkgs/development/python-modules/django-compat/default.nix index 57426181b735..ef18bfe77ec9 100644 --- a/pkgs/development/python-modules/django-compat/default.nix +++ b/pkgs/development/python-modules/django-compat/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, python, +{ lib, stdenv, buildPythonPackage, fetchFromGitHub, python, django, six }: @@ -33,7 +33,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ django six ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Forward and backwards compatibility layer for Django 1.4, 1.7, 1.8, 1.9, 1.10 and 1.11"; homepage = "https://github.com/arteria/django-compat"; license = licenses.mit; diff --git a/pkgs/development/python-modules/django-configurations/default.nix b/pkgs/development/python-modules/django-configurations/default.nix index 5b813977493e..bf1835071f88 100644 --- a/pkgs/development/python-modules/django-configurations/default.nix +++ b/pkgs/development/python-modules/django-configurations/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , django-discover-runner @@ -35,7 +35,7 @@ buildPythonPackage rec { # django.core.exceptions.ImproperlyConfigured: django-configurations settings importer wasn't correctly installed doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://django-configurations.readthedocs.io/"; description = "A helper for organizing Django settings"; license = licenses.bsd0; diff --git a/pkgs/development/python-modules/django-csp/default.nix b/pkgs/development/python-modules/django-csp/default.nix index 1eed9578a8a2..d87e39b8e3f7 100644 --- a/pkgs/development/python-modules/django-csp/default.nix +++ b/pkgs/development/python-modules/django-csp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage, django }: +{ lib, stdenv, fetchPypi, buildPythonPackage, django }: buildPythonPackage rec { pname = "django-csp"; @@ -15,7 +15,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ django ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Adds Content-Security-Policy headers to Django"; homepage = "https://github.com/mozilla/django-csp"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/django-discover-runner/default.nix b/pkgs/development/python-modules/django-discover-runner/default.nix index 43ae9a7c83a5..63d51d41fc93 100644 --- a/pkgs/development/python-modules/django-discover-runner/default.nix +++ b/pkgs/development/python-modules/django-discover-runner/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , django @@ -18,7 +18,7 @@ buildPythonPackage rec { # tests not included with release doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/jezdez/django-discover-runner"; description = "A Django test runner based on unittest2's test discovery"; license = licenses.bsd0; diff --git a/pkgs/development/python-modules/django-dynamic-preferences/default.nix b/pkgs/development/python-modules/django-dynamic-preferences/default.nix index de3424c9fec5..7288896c4fea 100644 --- a/pkgs/development/python-modules/django-dynamic-preferences/default.nix +++ b/pkgs/development/python-modules/django-dynamic-preferences/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ lib, stdenv, buildPythonPackage, fetchPypi , django, persisting-theory, six }: @@ -16,7 +16,7 @@ buildPythonPackage rec { # 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; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/EliotBerriot/django-dynamic-preferences"; description = "Dynamic global and instance settings for your django project"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/django-filter/default.nix b/pkgs/development/python-modules/django-filter/default.nix index 93f3f20f3051..e4ca546bbc28 100644 --- a/pkgs/development/python-modules/django-filter/default.nix +++ b/pkgs/development/python-modules/django-filter/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , django @@ -25,7 +25,7 @@ buildPythonPackage rec { runHook postCheck ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Reusable Django application for allowing users to filter querysets dynamically"; homepage = "https://pypi.org/project/django-filter/"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/django-gravatar2/default.nix b/pkgs/development/python-modules/django-gravatar2/default.nix index 4ea3b7e7ee58..083126066039 100644 --- a/pkgs/development/python-modules/django-gravatar2/default.nix +++ b/pkgs/development/python-modules/django-gravatar2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi }: +{ lib, stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "django-gravatar2"; @@ -11,7 +11,7 @@ buildPythonPackage rec { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Essential Gravatar support for Django"; homepage = "https://github.com/twaddington/django-gravatar"; license = licenses.mit; diff --git a/pkgs/development/python-modules/django-hijack-admin/default.nix b/pkgs/development/python-modules/django-hijack-admin/default.nix index e30fc88079ca..54056547f48a 100644 --- a/pkgs/development/python-modules/django-hijack-admin/default.nix +++ b/pkgs/development/python-modules/django-hijack-admin/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, python, +{ lib, stdenv, buildPythonPackage, fetchFromGitHub, python, django_hijack, django_nose }: buildPythonPackage rec { pname = "django-hijack-admin"; @@ -29,7 +29,7 @@ buildPythonPackage rec { runHook postCheck ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Admin integration for django-hijack"; homepage = "https://github.com/arteria/django-hijack-admin"; license = licenses.mit; diff --git a/pkgs/development/python-modules/django-hijack/default.nix b/pkgs/development/python-modules/django-hijack/default.nix index d736e69ae6ef..bd6f870de66e 100644 --- a/pkgs/development/python-modules/django-hijack/default.nix +++ b/pkgs/development/python-modules/django-hijack/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, python, +{ lib, stdenv, buildPythonPackage, fetchFromGitHub, python, django, django_compat, django_nose }: buildPythonPackage rec { @@ -30,7 +30,7 @@ buildPythonPackage rec { runHook postCheck ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Allows superusers to hijack (=login as) and work on behalf of another user"; homepage = "https://github.com/arteria/django-hijack"; license = licenses.mit; diff --git a/pkgs/development/python-modules/django-logentry-admin/default.nix b/pkgs/development/python-modules/django-logentry-admin/default.nix index d9734ff4a220..59e9782f0501 100644 --- a/pkgs/development/python-modules/django-logentry-admin/default.nix +++ b/pkgs/development/python-modules/django-logentry-admin/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildPythonPackage, django, pytest, pytest-django }: +{ lib, stdenv, fetchFromGitHub, buildPythonPackage, django, pytest, pytest-django }: buildPythonPackage rec { pname = "django-logentry-admin"; @@ -19,7 +19,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ django ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Show all LogEntry objects in the Django admin site"; homepage = "https://github.com/yprez/django-logentry-admin"; license = licenses.isc; diff --git a/pkgs/development/python-modules/django-mailman3/default.nix b/pkgs/development/python-modules/django-mailman3/default.nix index afa504f1bc71..40063c89e432 100644 --- a/pkgs/development/python-modules/django-mailman3/default.nix +++ b/pkgs/development/python-modules/django-mailman3/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, django-gravatar2, django_compressor +{ lib, stdenv, buildPythonPackage, fetchPypi, django-gravatar2, django_compressor , django-allauth, mailmanclient, django, mock }: @@ -21,7 +21,7 @@ buildPythonPackage rec { PYTHONPATH=.:$PYTHONPATH django-admin.py test --settings=django_mailman3.tests.settings_test ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Django library for Mailman UIs"; homepage = "https://gitlab.com/mailman/django-mailman3"; license = licenses.gpl3; diff --git a/pkgs/development/python-modules/django-maintenance-mode/default.nix b/pkgs/development/python-modules/django-maintenance-mode/default.nix index 2e433aa5d459..c599e28d2062 100644 --- a/pkgs/development/python-modules/django-maintenance-mode/default.nix +++ b/pkgs/development/python-modules/django-maintenance-mode/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildPythonPackage, pytest, django }: +{ lib, stdenv, fetchFromGitHub, buildPythonPackage, pytest, django }: buildPythonPackage rec { pname = "django-maintenance-mode"; @@ -15,7 +15,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ django ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Shows a 503 error page when maintenance-mode is on"; homepage = "https://github.com/fabiocaccamo/django-maintenance-mode"; maintainers = with maintainers; [ mrmebelman ]; diff --git a/pkgs/development/python-modules/django-oauth-toolkit/default.nix b/pkgs/development/python-modules/django-oauth-toolkit/default.nix index 83f1049a2e56..6e16af5bc8f9 100644 --- a/pkgs/development/python-modules/django-oauth-toolkit/default.nix +++ b/pkgs/development/python-modules/django-oauth-toolkit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub +{ lib, stdenv, buildPythonPackage, fetchFromGitHub , django, requests, oauthlib }: @@ -18,7 +18,7 @@ buildPythonPackage rec { # django.core.exceptions.ImproperlyConfigured: Requested setting OAUTH2_PROVIDER, but settings are not configured. You must either define the environment variable DJANGO_SETTINGS_MODULE or call settings.configure() before accessing settings doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "OAuth2 goodies for the Djangonauts"; homepage = "https://github.com/jazzband/django-oauth-toolkit"; license = licenses.bsd2; diff --git a/pkgs/development/python-modules/django-paintstore/default.nix b/pkgs/development/python-modules/django-paintstore/default.nix index b2c755907c15..4fed9bf470b2 100644 --- a/pkgs/development/python-modules/django-paintstore/default.nix +++ b/pkgs/development/python-modules/django-paintstore/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, requests, requests_oauthlib +{ lib, stdenv, buildPythonPackage, fetchPypi, requests, requests_oauthlib , django, python3-openid }: buildPythonPackage rec { @@ -12,7 +12,7 @@ buildPythonPackage rec { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Django app that integrates jQuery ColorPicker with the Django admin"; homepage = "https://github.com/gsiegman/django-paintstore"; license = licenses.mit; diff --git a/pkgs/development/python-modules/django-postgresql-netfields/default.nix b/pkgs/development/python-modules/django-postgresql-netfields/default.nix index 73c15850d33c..f2bd574919aa 100644 --- a/pkgs/development/python-modules/django-postgresql-netfields/default.nix +++ b/pkgs/development/python-modules/django-postgresql-netfields/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , django , netaddr @@ -41,7 +41,7 @@ buildPythonPackage rec { six ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Django PostgreSQL netfields implementation"; homepage = "https://github.com/jimfunk/django-postgresql-netfields"; license = licenses.bsd2; diff --git a/pkgs/development/python-modules/django-q/default.nix b/pkgs/development/python-modules/django-q/default.nix index 0755c5055a1e..2eb3b19f554b 100644 --- a/pkgs/development/python-modules/django-q/default.nix +++ b/pkgs/development/python-modules/django-q/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, django-picklefield, arrow +{ lib, stdenv, buildPythonPackage, fetchPypi, django-picklefield, arrow , blessed, django, future }: buildPythonPackage rec { @@ -16,7 +16,7 @@ buildPythonPackage rec { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "A multiprocessing distributed task queue for Django"; homepage = "https://django-q.readthedocs.org"; license = licenses.mit; diff --git a/pkgs/development/python-modules/django-ranged-response/default.nix b/pkgs/development/python-modules/django-ranged-response/default.nix index 29b2baf89cdc..d517563590fb 100644 --- a/pkgs/development/python-modules/django-ranged-response/default.nix +++ b/pkgs/development/python-modules/django-ranged-response/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchPypi, buildPythonPackage, django }: +{ lib, stdenv, fetchurl, fetchPypi, buildPythonPackage, django }: buildPythonPackage rec { pname = "django-ranged-response"; @@ -14,7 +14,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ django ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A modified FileResponse that returns `Content-Range` headers with the HTTP response, so browsers (read Safari 9+) that request the file, can stream the response properly"; homepage = "https://github.com/wearespindle/django-ranged-fileresponse"; license = licenses.mit; diff --git a/pkgs/development/python-modules/django-raster/default.nix b/pkgs/development/python-modules/django-raster/default.nix index 056f8dffdcfc..a3aed647a33b 100644 --- a/pkgs/development/python-modules/django-raster/default.nix +++ b/pkgs/development/python-modules/django-raster/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy3k, +{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k, numpy, django_colorful, pillow, psycopg2, pyparsing, django, celery, boto3, importlib-metadata }: @@ -22,7 +22,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ numpy django_colorful pillow psycopg2 pyparsing django celery boto3 importlib-metadata ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Basic raster data integration for Django"; homepage = "https://github.com/geodesign/django-raster"; license = licenses.mit; diff --git a/pkgs/development/python-modules/django-storages/default.nix b/pkgs/development/python-modules/django-storages/default.nix index bdf7c21514c2..869c3bf74eef 100644 --- a/pkgs/development/python-modules/django-storages/default.nix +++ b/pkgs/development/python-modules/django-storages/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ lib, stdenv, buildPythonPackage, fetchPypi , django }: @@ -16,7 +16,7 @@ buildPythonPackage rec { # django.core.exceptions.ImproperlyConfigured: Requested setting DEFAULT_INDEX_TABLESPACE, but settings are not configured. You must either define the environment variable DJANGO_SETTINGS_MODULE or call settings.configure() before accessing settings. doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Collection of custom storage backends for Django"; homepage = "https://django-storages.readthedocs.io"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/django-versatileimagefield/default.nix b/pkgs/development/python-modules/django-versatileimagefield/default.nix index de5854192d20..39912f474204 100644 --- a/pkgs/development/python-modules/django-versatileimagefield/default.nix +++ b/pkgs/development/python-modules/django-versatileimagefield/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , django @@ -22,7 +22,7 @@ buildPythonPackage rec { # tests not included with pypi release doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Replaces django's ImageField with a more flexible interface"; homepage = "https://github.com/respondcreate/django-versatileimagefield/"; license = licenses.mit; diff --git a/pkgs/development/python-modules/django-widget-tweaks/default.nix b/pkgs/development/python-modules/django-widget-tweaks/default.nix index 99e3abda890a..8529df09bb76 100644 --- a/pkgs/development/python-modules/django-widget-tweaks/default.nix +++ b/pkgs/development/python-modules/django-widget-tweaks/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, fetchFromGitHub, python, stdenv, django }: +{ buildPythonPackage, fetchFromGitHub, python, lib, stdenv, django }: buildPythonPackage rec { pname = "django-widget-tweaks"; @@ -14,7 +14,7 @@ buildPythonPackage rec { checkPhase = "${python.interpreter} runtests.py"; propagatedBuildInputs = [ django ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Tweak the form field rendering in templates, not in python-level form definitions."; homepage = "https://github.com/jazzband/django-widget-tweaks"; license = licenses.mit; diff --git a/pkgs/development/python-modules/django/2.nix b/pkgs/development/python-modules/django/2.nix index 64897890759e..641ec02aae01 100644 --- a/pkgs/development/python-modules/django/2.nix +++ b/pkgs/development/python-modules/django/2.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, substituteAll, +{ lib, stdenv, buildPythonPackage, fetchPypi, substituteAll, isPy3k, geos, gdal, pytz, sqlparse, withGdal ? false @@ -29,7 +29,7 @@ buildPythonPackage rec { # too complicated to setup doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "A high-level Python Web framework"; homepage = "https://www.djangoproject.com/"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/django/3.nix b/pkgs/development/python-modules/django/3.nix index c3644d6946fd..2ea5b5a006c8 100644 --- a/pkgs/development/python-modules/django/3.nix +++ b/pkgs/development/python-modules/django/3.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , substituteAll @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "Django"; - version = "3.1.4"; + version = "3.1.5"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "edb10b5c45e7e9c0fb1dc00b76ec7449aca258a39ffd613dbd078c51d19c9f03"; + sha256 = "2d78425ba74c7a1a74b196058b261b9733a8570782f4e2828974777ccca7edf7"; }; patches = stdenv.lib.optional withGdal @@ -39,7 +39,7 @@ buildPythonPackage rec { # too complicated to setup doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "A high-level Python Web framework"; homepage = "https://www.djangoproject.com/"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/django_appconf/default.nix b/pkgs/development/python-modules/django_appconf/default.nix index 45116ddd5548..c9c9913d7644 100644 --- a/pkgs/development/python-modules/django_appconf/default.nix +++ b/pkgs/development/python-modules/django_appconf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, six, django, fetchpatch }: +{ lib, stdenv, buildPythonPackage, fetchFromGitHub, six, django, fetchpatch }: buildPythonPackage rec { pname = "django-appconf"; version = "1.0.3"; @@ -26,7 +26,7 @@ buildPythonPackage rec { python -m django test --settings="tests.test_settings" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A helper class for handling configuration defaults of packaged apps gracefully"; homepage = "https://django-appconf.readthedocs.org/"; license = licenses.bsd2; diff --git a/pkgs/development/python-modules/django_classytags/default.nix b/pkgs/development/python-modules/django_classytags/default.nix index 102e2e7cf935..e0a297e53c0c 100644 --- a/pkgs/development/python-modules/django_classytags/default.nix +++ b/pkgs/development/python-modules/django_classytags/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , django @@ -19,7 +19,7 @@ buildPythonPackage rec { # pypi version doesn't include runtest.py, needed to run tests doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Class based template tags for Django"; homepage = "https://github.com/divio/django-classy-tags"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/django_colorful/default.nix b/pkgs/development/python-modules/django_colorful/default.nix index 10068f87b079..468327139e64 100644 --- a/pkgs/development/python-modules/django_colorful/default.nix +++ b/pkgs/development/python-modules/django_colorful/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , django @@ -19,7 +19,7 @@ buildPythonPackage rec { # Requires Django >= 1.8 buildInputs = [ django ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Django extension that provides database and form color fields"; homepage = "https://github.com/charettes/django-colorful"; license = licenses.mit; diff --git a/pkgs/development/python-modules/django_compressor/default.nix b/pkgs/development/python-modules/django_compressor/default.nix index 1408032d0c27..f00804364899 100644 --- a/pkgs/development/python-modules/django_compressor/default.nix +++ b/pkgs/development/python-modules/django_compressor/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, +{ lib, stdenv, buildPythonPackage, fetchPypi, rcssmin, rjsmin, django_appconf }: buildPythonPackage rec { pname = "django_compressor"; @@ -18,7 +18,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ rcssmin rjsmin django_appconf ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Compresses linked and inline JavaScript or CSS into single cached files"; homepage = "https://django-compressor.readthedocs.org/en/latest/"; license = licenses.mit; diff --git a/pkgs/development/python-modules/django_contrib_comments/default.nix b/pkgs/development/python-modules/django_contrib_comments/default.nix index 3f5371e397af..a8872967df4d 100644 --- a/pkgs/development/python-modules/django_contrib_comments/default.nix +++ b/pkgs/development/python-modules/django_contrib_comments/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , django @@ -15,7 +15,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ django ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/django/django-contrib-comments"; description = "The code formerly known as django.contrib.comments"; license = licenses.bsd0; diff --git a/pkgs/development/python-modules/django_environ/default.nix b/pkgs/development/python-modules/django_environ/default.nix index e4ec7505c831..fa2618fa1a71 100644 --- a/pkgs/development/python-modules/django_environ/default.nix +++ b/pkgs/development/python-modules/django_environ/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , django @@ -18,7 +18,7 @@ buildPythonPackage rec { doCheck = false; propagatedBuildInputs = [ django six ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Utilize environment variables to configure your Django application"; homepage = "https://github.com/joke2k/django-environ/"; license = licenses.mit; diff --git a/pkgs/development/python-modules/django_evolution/default.nix b/pkgs/development/python-modules/django_evolution/default.nix index e3b7be798775..dba92efb2d94 100644 --- a/pkgs/development/python-modules/django_evolution/default.nix +++ b/pkgs/development/python-modules/django_evolution/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , isPy3k @@ -17,7 +17,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ django ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A database schema evolution tool for the Django web framework"; homepage = "https://github.com/beanbaginc/django-evolution"; license = licenses.bsd0; diff --git a/pkgs/development/python-modules/django_guardian/default.nix b/pkgs/development/python-modules/django_guardian/default.nix index 364a5e12f52f..60023660ea56 100644 --- a/pkgs/development/python-modules/django_guardian/default.nix +++ b/pkgs/development/python-modules/django_guardian/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ lib, stdenv, buildPythonPackage, fetchPypi , django_environ, mock, django , pytest, pytestrunner, pytest-django }: @@ -14,7 +14,7 @@ buildPythonPackage rec { checkInputs = [ pytest pytestrunner pytest-django django_environ mock ]; propagatedBuildInputs = [ django ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Per object permissions for Django"; homepage = "https://github.com/django-guardian/django-guardian"; license = [ licenses.mit licenses.bsd2 ]; diff --git a/pkgs/development/python-modules/django_modelcluster/default.nix b/pkgs/development/python-modules/django_modelcluster/default.nix index e41b455cd4b5..500fe2e2fbce 100644 --- a/pkgs/development/python-modules/django_modelcluster/default.nix +++ b/pkgs/development/python-modules/django_modelcluster/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , pytz @@ -21,7 +21,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pytz six ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Django extension to allow working with 'clusters' of models as a single unit, independently of the database"; homepage = "https://github.com/torchbox/django-modelcluster/"; license = licenses.bsd2; diff --git a/pkgs/development/python-modules/django_nose/default.nix b/pkgs/development/python-modules/django_nose/default.nix index 66a4ad7857b9..7f2f9efcfc5b 100644 --- a/pkgs/development/python-modules/django_nose/default.nix +++ b/pkgs/development/python-modules/django_nose/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , nose @@ -19,7 +19,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ django nose ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Provides all the goodness of nose in your Django tests"; homepage = "https://github.com/django-nose/django-nose"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/django_redis/default.nix b/pkgs/development/python-modules/django_redis/default.nix index 114962477fd6..434dea7f0f21 100644 --- a/pkgs/development/python-modules/django_redis/default.nix +++ b/pkgs/development/python-modules/django_redis/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage, +{ lib, stdenv, fetchPypi, buildPythonPackage, mock, django, redis, msgpack }: buildPythonPackage rec { pname = "django-redis"; @@ -19,7 +19,7 @@ buildPythonPackage rec { msgpack ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Full featured redis cache backend for Django"; homepage = "https://github.com/niwibe/django-redis"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/django_reversion/default.nix b/pkgs/development/python-modules/django_reversion/default.nix index 9d307734367c..16574770ff9e 100644 --- a/pkgs/development/python-modules/django_reversion/default.nix +++ b/pkgs/development/python-modules/django_reversion/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , django @@ -18,7 +18,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ django ]; - meta = with stdenv.lib; { + meta = with lib; { description = "An extension to the Django web framework that provides comprehensive version control facilities"; homepage = "https://github.com/etianen/django-reversion"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/django_silk/default.nix b/pkgs/development/python-modules/django_silk/default.nix index 8efd62d7d181..66475b35d2a3 100644 --- a/pkgs/development/python-modules/django_silk/default.nix +++ b/pkgs/development/python-modules/django_silk/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , python , fetchFromGitHub @@ -54,7 +54,7 @@ buildPythonPackage rec { DB=sqlite3 DB_NAME=db.sqlite3 ${python.interpreter} manage.py test ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Silky smooth profiling for the Django Framework"; homepage = "https://github.com/jazzband/django-silk"; license = licenses.mit; diff --git a/pkgs/development/python-modules/django_taggit/default.nix b/pkgs/development/python-modules/django_taggit/default.nix index 80ee899b1832..e715dde7c41e 100644 --- a/pkgs/development/python-modules/django_taggit/default.nix +++ b/pkgs/development/python-modules/django_taggit/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , python , fetchPypi @@ -28,7 +28,7 @@ buildPythonPackage rec { ${python.interpreter} -m django test --settings=tests.settings ''; - meta = with stdenv.lib; { + meta = with lib; { description = "django-taggit is a reusable Django application for simple tagging"; homepage = "https://github.com/alex/django-taggit/tree/master/"; license = licenses.bsd2; diff --git a/pkgs/development/python-modules/django_treebeard/default.nix b/pkgs/development/python-modules/django_treebeard/default.nix index 060867d837f9..fd8789d1fb87 100644 --- a/pkgs/development/python-modules/django_treebeard/default.nix +++ b/pkgs/development/python-modules/django_treebeard/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , pytest @@ -20,7 +20,7 @@ buildPythonPackage rec { # tests fail "AppRegistryNotReady("Apps aren't loaded yet.")" doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Efficient tree implementations for Django 1.6+"; homepage = "https://tabo.pe/projects/django-treebeard/"; maintainers = with maintainers; [ desiderius ]; diff --git a/pkgs/development/python-modules/djangorestframework/default.nix b/pkgs/development/python-modules/djangorestframework/default.nix index 8d1055029b7a..ce92fab3e965 100644 --- a/pkgs/development/python-modules/djangorestframework/default.nix +++ b/pkgs/development/python-modules/djangorestframework/default.nix @@ -1,13 +1,15 @@ -{ stdenv, buildPythonPackage, fetchPypi, django, isPy27 }: +{ lib, stdenv, buildPythonPackage, fetchFromGitHub, django, isPy27 }: buildPythonPackage rec { - version = "3.11.2"; + version = "3.12.2"; pname = "djangorestframework"; disabled = isPy27; - src = fetchPypi { - inherit pname version; - sha256 = "a5967b68a04e0d97d10f4df228e30f5a2d82ba63b9d03e1759f84993b7bf1b53"; + src = fetchFromGitHub { + owner = "encode"; + repo = "django-rest-framework"; + rev = version; + sha256 = "y/dw6qIOc6NaNpBWJXDwHX9aFodgKv9rGKWQKS6STlk="; }; # Test settings are missing @@ -15,7 +17,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ django ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Web APIs for Django, made easy"; homepage = "https://www.django-rest-framework.org/"; maintainers = with maintainers; [ desiderius ]; diff --git a/pkgs/development/python-modules/dkimpy/default.nix b/pkgs/development/python-modules/dkimpy/default.nix index aaecda77780c..e7a80d91d24c 100644 --- a/pkgs/development/python-modules/dkimpy/default.nix +++ b/pkgs/development/python-modules/dkimpy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, openssl, buildPythonPackage +{ lib, stdenv, fetchPypi, openssl, buildPythonPackage , pytest, dnspython, pynacl, authres, python }: buildPythonPackage rec { @@ -22,7 +22,7 @@ buildPythonPackage rec { ${python.interpreter} ./test.py ''; - meta = with stdenv.lib; { + meta = with lib; { description = "DKIM + ARC email signing/verification tools + Python module"; longDescription = '' Python module that implements DKIM (DomainKeys Identified Mail) email diff --git a/pkgs/development/python-modules/dlib/default.nix b/pkgs/development/python-modules/dlib/default.nix index 027500ff2abf..204c1a985425 100644 --- a/pkgs/development/python-modules/dlib/default.nix +++ b/pkgs/development/python-modules/dlib/default.nix @@ -24,6 +24,5 @@ buildPythonPackage { checkInputs = [ pytest more-itertools ]; - enableParallelBuilding = true; dontUseCmakeConfigure = true; } diff --git a/pkgs/development/python-modules/dnachisel/default.nix b/pkgs/development/python-modules/dnachisel/default.nix new file mode 100644 index 000000000000..50ba05aca6f3 --- /dev/null +++ b/pkgs/development/python-modules/dnachisel/default.nix @@ -0,0 +1,62 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, biopython +, docopt +, flametree +, numpy +, proglog +, pytestCheckHook +, python-codon-tables +, primer3 +, genome-collector +, matplotlib +}: + +buildPythonPackage rec { + pname = "dnachisel"; + version = "3.2.6"; + + src = fetchFromGitHub { + owner = "Edinburgh-Genome-Foundry"; + repo = "DnaChisel"; + rev = "v${version}"; + sha256 = "0m88biw7sycjwsmncdybj9n3yf4n9cyvifv9zv7irm8ha3scchji"; + }; + + propagatedBuildInputs = [ + biopython + docopt + flametree + numpy + proglog + python-codon-tables + ]; + + checkInputs = [ + primer3 + genome-collector + matplotlib + pytestCheckHook + ]; + + # Disable tests which requires network access + disabledTests = [ + "test_circular_sequence_optimize_with_report" + "test_constraints_reports" + "test_optimize_with_report" + "test_optimize_with_report_no_solution" + "test_avoid_blast_matches_with_list" + "test_avoid_phage_blast_matches" + "test_avoid_matches_with_list" + "test_avoid_matches_with_phage" + ]; + pythonImportsCheck = [ "dnachisel" ]; + + meta = with lib; { + homepage = "https://github.com/Edinburgh-Genome-Foundry/DnaChisel"; + description = "Optimize DNA sequences under constraints"; + license = licenses.mit; + maintainers = with maintainers; [ prusnak ]; + }; +} diff --git a/pkgs/development/python-modules/docker-pycreds/default.nix b/pkgs/development/python-modules/docker-pycreds/default.nix index a75278d45d43..543f4994020c 100644 --- a/pkgs/development/python-modules/docker-pycreds/default.nix +++ b/pkgs/development/python-modules/docker-pycreds/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, six }: +{ lib, stdenv, buildPythonPackage, fetchPypi, six }: buildPythonPackage rec { pname = "docker-pycreds"; @@ -14,7 +14,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Python bindings for the docker credentials store API."; homepage = "https://github.com/shin-/dockerpy-creds"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/docker/default.nix b/pkgs/development/python-modules/docker/default.nix index 7a23d17aca2a..5b148a9d62af 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.4.0"; + version = "4.4.1"; src = fetchPypi { inherit pname version; - sha256 = "cffc771d4ea1389fc66bc95cb72d304aa41d1a1563482a9a000fba3a84ed5071"; + sha256 = "sha256-BgSnRxnV0t5Dh1OTS3Vb/NpvYvSbjkswlppLCiqKEiA="; }; 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 e3a998126e9c..74e363d18b97 100644 --- a/pkgs/development/python-modules/dockerfile-parse/default.nix +++ b/pkgs/development/python-modules/dockerfile-parse/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, six, pytestcov, pytest }: +{ lib, stdenv, buildPythonPackage, fetchPypi, six, pytestcov, pytest }: buildPythonPackage rec { version = "1.1.0"; @@ -17,7 +17,7 @@ buildPythonPackage rec { checkInputs = [ pytestcov pytest ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Python library for parsing Dockerfile files"; homepage = "https://github.com/DBuildService/dockerfile-parse"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/dockerpty/default.nix b/pkgs/development/python-modules/dockerpty/default.nix index fd9d7b4b88da..b6267b87c1bd 100644 --- a/pkgs/development/python-modules/dockerpty/default.nix +++ b/pkgs/development/python-modules/dockerpty/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, six }: +{ lib, stdenv, buildPythonPackage, fetchPypi, six }: buildPythonPackage rec { pname = "dockerpty"; @@ -11,7 +11,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Functionality needed to operate the pseudo-tty (PTY) allocated to a docker container"; homepage = "https://github.com/d11wtq/dockerpty"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/docopt/default.nix b/pkgs/development/python-modules/docopt/default.nix index 135bedfc43e8..2dc4bb38cf14 100644 --- a/pkgs/development/python-modules/docopt/default.nix +++ b/pkgs/development/python-modules/docopt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi }: +{ lib, stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "docopt"; @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "14f4hn6d1j4b99svwbaji8n2zj58qicyz19mm0x6pmhb50jsics9"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Pythonic argument parser, that will make you smile"; homepage = "http://docopt.org/"; license = licenses.mit; diff --git a/pkgs/development/python-modules/doctest-ignore-unicode/default.nix b/pkgs/development/python-modules/doctest-ignore-unicode/default.nix index 0241fd15ad48..12d15799ecc6 100644 --- a/pkgs/development/python-modules/doctest-ignore-unicode/default.nix +++ b/pkgs/development/python-modules/doctest-ignore-unicode/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, nose }: +{ lib, stdenv, buildPythonPackage, fetchPypi, nose }: buildPythonPackage rec { pname = "doctest-ignore-unicode"; @@ -11,7 +11,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ nose ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Add flag to ignore unicode literal prefixes in doctests"; license = with licenses; [ asl20 ]; homepage = "https://github.com/gnublade/doctest-ignore-unicode"; diff --git a/pkgs/development/python-modules/dogpile.cache/default.nix b/pkgs/development/python-modules/dogpile.cache/default.nix index f36e1347be9f..5dba1b91bc17 100644 --- a/pkgs/development/python-modules/dogpile.cache/default.nix +++ b/pkgs/development/python-modules/dogpile.cache/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , pythonOlder @@ -37,7 +37,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ decorator stevedore ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A caching front-end based on the Dogpile lock"; homepage = "https://bitbucket.org/zzzeek/dogpile.cache"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/dogpile.core/default.nix b/pkgs/development/python-modules/dogpile.core/default.nix index 41340cda26ee..f6eabc378b3b 100644 --- a/pkgs/development/python-modules/dogpile.core/default.nix +++ b/pkgs/development/python-modules/dogpile.core/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi }: +{ lib, stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "dogpile.core"; @@ -11,7 +11,7 @@ buildPythonPackage rec { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "A 'dogpile' lock, typically used as a component of a larger caching solution"; homepage = "https://bitbucket.org/zzzeek/dogpile.core"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/dot2tex/default.nix b/pkgs/development/python-modules/dot2tex/default.nix index 03445f79117f..2626f420676a 100644 --- a/pkgs/development/python-modules/dot2tex/default.nix +++ b/pkgs/development/python-modules/dot2tex/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , python , buildPythonPackage , fetchPypi @@ -37,7 +37,7 @@ buildPythonPackage rec { ${python.interpreter} tests/test_dot2tex.py ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Convert graphs generated by Graphviz to LaTeX friendly formats"; homepage = "https://github.com/kjellmf/dot2tex"; license = licenses.mit; diff --git a/pkgs/development/python-modules/dpath/default.nix b/pkgs/development/python-modules/dpath/default.nix index 548bd5168385..505bd7bb456c 100644 --- a/pkgs/development/python-modules/dpath/default.nix +++ b/pkgs/development/python-modules/dpath/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage, isPy27 +{ lib, stdenv, fetchPypi, buildPythonPackage, isPy27 , mock, pytestCheckHook, nose, hypothesis }: @@ -15,7 +15,7 @@ buildPythonPackage rec { # use pytest as nosetests hangs checkInputs = [ mock nose pytestCheckHook hypothesis ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/akesterson/dpath-python"; license = [ licenses.mit ]; description = "A python library for accessing and searching dictionaries via /slashed/paths ala xpath"; diff --git a/pkgs/development/python-modules/dpkt/default.nix b/pkgs/development/python-modules/dpkt/default.nix index 4dd0de3b2d8c..177b260e8044 100644 --- a/pkgs/development/python-modules/dpkt/default.nix +++ b/pkgs/development/python-modules/dpkt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage }: +{ lib, stdenv, fetchPypi, buildPythonPackage }: buildPythonPackage rec { pname = "dpkt"; @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "f4e579cbaf6e2285ebf3a9e84019459b4367636bac079ba169527e582fca48b4"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Fast, simple packet creation / parsing, with definitions for the basic TCP/IP protocols"; homepage = "https://github.com/kbandla/dpkt"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/drf-yasg/default.nix b/pkgs/development/python-modules/drf-yasg/default.nix index 1488d9382289..dd92d51d6c6b 100644 --- a/pkgs/development/python-modules/drf-yasg/default.nix +++ b/pkgs/development/python-modules/drf-yasg/default.nix @@ -1,5 +1,5 @@ { - stdenv, + lib, stdenv, buildPythonPackage, fetchPypi, inflection, @@ -31,7 +31,7 @@ buildPythonPackage rec { djangorestframework ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Generation of Swagger/OpenAPI schemas for Django REST Framework"; homepage = "https://github.com/axnsan12/drf-yasg"; maintainers = with maintainers; [ ivegotasthma ]; diff --git a/pkgs/development/python-modules/dropbox/default.nix b/pkgs/development/python-modules/dropbox/default.nix index b58d24e3fecf..22e66d0a4a43 100644 --- a/pkgs/development/python-modules/dropbox/default.nix +++ b/pkgs/development/python-modules/dropbox/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ lib, stdenv, buildPythonPackage, fetchPypi , pytestrunner, requests, urllib3, mock, setuptools }: buildPythonPackage rec { @@ -16,7 +16,7 @@ buildPythonPackage rec { buildInputs = [ pytestrunner ]; propagatedBuildInputs = [ requests urllib3 mock setuptools ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A Python library for Dropbox's HTTP-based Core and Datastore APIs"; homepage = "https://www.dropbox.com/developers/core/docs"; license = licenses.mit; diff --git a/pkgs/development/python-modules/ds-store/default.nix b/pkgs/development/python-modules/ds-store/default.nix new file mode 100644 index 000000000000..00d10e749496 --- /dev/null +++ b/pkgs/development/python-modules/ds-store/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, mac_alias +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "ds_store"; + version = "1.3.0"; + + src = fetchFromGitHub { + owner = "al45tair"; + repo = pname; + rev = "v${version}"; + sha256 = "1zmhnz110dvisydp5h6s0ry2v9qf4rgr60xhhlak0c66zpvlkkl0"; + }; + + propagatedBuildInputs = [ mac_alias ]; + + checkInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "ds_store" ]; + + meta = with lib; { + homepage = "https://github.com/al45tair/ds_store"; + description = "Manipulate Finder .DS_Store files from Python"; + license = licenses.mit; + maintainers = with maintainers; [ prusnak ]; + }; +} diff --git a/pkgs/development/python-modules/dtopt/default.nix b/pkgs/development/python-modules/dtopt/default.nix index 4b649cad9668..84631c217089 100644 --- a/pkgs/development/python-modules/dtopt/default.nix +++ b/pkgs/development/python-modules/dtopt/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , isPy3k @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "06ae07a12294a7ba708abaa63f838017d1a2faf6147a1e7a14ca4fa28f86da7f"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Add options to doctest examples while they are running"; homepage = "https://pypi.python.org/pypi/dtopt"; license = licenses.mit; diff --git a/pkgs/development/python-modules/dufte/default.nix b/pkgs/development/python-modules/dufte/default.nix index 8fe202592359..7836c8aa60a0 100644 --- a/pkgs/development/python-modules/dufte/default.nix +++ b/pkgs/development/python-modules/dufte/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , isPy3k @@ -35,7 +35,7 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "dufte" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Clean matplotlib plots"; homepage = "https://github.com/nschloe/dufte"; license = licenses.gpl3Plus; diff --git a/pkgs/development/python-modules/dulwich/0_19.nix b/pkgs/development/python-modules/dulwich/0_19.nix index 82b9bed492cc..f0d3bad7a04f 100644 --- a/pkgs/development/python-modules/dulwich/0_19.nix +++ b/pkgs/development/python-modules/dulwich/0_19.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ lib, stdenv, buildPythonPackage, fetchPypi , urllib3, certifi , gevent, geventhttpclient, mock, fastimport , git, glibcLocales }: @@ -21,7 +21,7 @@ buildPythonPackage rec { doCheck = !stdenv.isDarwin; - meta = with stdenv.lib; { + meta = with lib; { description = "Simple Python implementation of the Git file formats and protocols"; homepage = "https://samba.org/~jelmer/dulwich/"; license = licenses.gpl2Plus; diff --git a/pkgs/development/python-modules/dulwich/default.nix b/pkgs/development/python-modules/dulwich/default.nix index fb29133da0ef..dd067514cccc 100644 --- a/pkgs/development/python-modules/dulwich/default.nix +++ b/pkgs/development/python-modules/dulwich/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ lib, stdenv, buildPythonPackage, fetchPypi , urllib3, certifi , gevent, geventhttpclient, mock, fastimport , git, glibcLocales }: @@ -21,7 +21,7 @@ buildPythonPackage rec { doCheck = !stdenv.isDarwin; - meta = with stdenv.lib; { + meta = with lib; { description = "Simple Python implementation of the Git file formats and protocols"; homepage = "https://samba.org/~jelmer/dulwich/"; license = licenses.gpl2Plus; diff --git a/pkgs/development/python-modules/dyn/default.nix b/pkgs/development/python-modules/dyn/default.nix index cc7a330e97cf..b5fa28f2de6b 100644 --- a/pkgs/development/python-modules/dyn/default.nix +++ b/pkgs/development/python-modules/dyn/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, pytest, pytestcov, mock +{ lib, stdenv, buildPythonPackage, fetchPypi, pytest, pytestcov, mock , pytest_xdist, covCore, glibcLocales }: buildPythonPackage rec { @@ -24,7 +24,7 @@ buildPythonPackage rec { LC_ALL="en_US.UTF-8"; - meta = with stdenv.lib; { + meta = with lib; { description = "Dynect dns lib"; homepage = "https://dyn.readthedocs.org/en/latest/intro.html"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/dynd/default.nix b/pkgs/development/python-modules/dynd/default.nix index 9150a6746a2b..f23d19510ee7 100644 --- a/pkgs/development/python-modules/dynd/default.nix +++ b/pkgs/development/python-modules/dynd/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , isPyPy , isPy3k @@ -35,7 +35,7 @@ buildPythonPackage rec { buildInputs = [ pkgs.libdynd.dev cython ]; propagatedBuildInputs = [ numpy pkgs.libdynd ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://libdynd.org"; license = licenses.bsd2; description = "Python exposure of dynd"; diff --git a/pkgs/development/python-modules/easygui/default.nix b/pkgs/development/python-modules/easygui/default.nix index 30c03ae6e2c5..441d839d36f6 100644 --- a/pkgs/development/python-modules/easygui/default.nix +++ b/pkgs/development/python-modules/easygui/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage }: +{ lib, stdenv, fetchPypi, buildPythonPackage }: buildPythonPackage rec { pname = "easygui"; @@ -11,7 +11,7 @@ buildPythonPackage rec { doCheck = false; # No tests available - meta = with stdenv.lib; { + meta = with lib; { description = "Very simple, very easy GUI programming in Python"; homepage = "https://github.com/robertlugg/easygui"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/easyprocess/default.nix b/pkgs/development/python-modules/easyprocess/default.nix index 3dda2c914556..fc86edf5d4d0 100644 --- a/pkgs/development/python-modules/easyprocess/default.nix +++ b/pkgs/development/python-modules/easyprocess/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi }: +{ lib, stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "EasyProcess"; @@ -12,7 +12,7 @@ buildPythonPackage rec { # No tests doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Easy to use python subprocess interface"; homepage = "https://github.com/ponty/EasyProcess"; license = licenses.bsdOriginal; diff --git a/pkgs/development/python-modules/ecdsa/default.nix b/pkgs/development/python-modules/ecdsa/default.nix index 1d2a780bbbbd..2a17f84bb3b4 100644 --- a/pkgs/development/python-modules/ecdsa/default.nix +++ b/pkgs/development/python-modules/ecdsa/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , pkgs @@ -18,7 +18,7 @@ buildPythonPackage rec { # Only needed for tests checkInputs = [ pkgs.openssl ]; - meta = with stdenv.lib; { + meta = with lib; { description = "ECDSA cryptographic signature library"; homepage = "https://github.com/warner/python-ecdsa"; license = licenses.mit; diff --git a/pkgs/development/python-modules/ed25519/default.nix b/pkgs/development/python-modules/ed25519/default.nix index 27ebc6a0ff27..183d7cc3ca55 100644 --- a/pkgs/development/python-modules/ed25519/default.nix +++ b/pkgs/development/python-modules/ed25519/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage }: +{ lib, stdenv, fetchPypi, buildPythonPackage }: buildPythonPackage rec { pname = "ed25519"; @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "0n1k83ww0pr4q6z0h7p8hvy21hcgb96jvgllfbwhvvyf37h3w182"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Ed25519 public-key signatures"; homepage = "https://github.com/warner/python-ed25519"; license = licenses.mit; diff --git a/pkgs/development/python-modules/editorconfig/default.nix b/pkgs/development/python-modules/editorconfig/default.nix index ac3845bb6671..727c3003db5c 100644 --- a/pkgs/development/python-modules/editorconfig/default.nix +++ b/pkgs/development/python-modules/editorconfig/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchgit , cmake @@ -25,7 +25,7 @@ buildPythonPackage rec { ctest -E "utf_8_char" . ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://editorconfig.org"; description = "EditorConfig File Locator and Interpreter for Python"; license = licenses.psfl; diff --git a/pkgs/development/python-modules/edward/default.nix b/pkgs/development/python-modules/edward/default.nix index 0f42ddcc799b..c1171043356a 100644 --- a/pkgs/development/python-modules/edward/default.nix +++ b/pkgs/development/python-modules/edward/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy27, pythonAtLeast +{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27, pythonAtLeast , Keras, numpy, scipy, six, tensorflow }: buildPythonPackage rec { @@ -17,7 +17,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ Keras numpy scipy six tensorflow ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Probabilistic programming language using Tensorflow"; homepage = "https://github.com/blei-lab/edward"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/eggdeps/default.nix b/pkgs/development/python-modules/eggdeps/default.nix index 8c7d7679005e..ae339368ff5d 100644 --- a/pkgs/development/python-modules/eggdeps/default.nix +++ b/pkgs/development/python-modules/eggdeps/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , zope_interface @@ -20,7 +20,7 @@ buildPythonPackage rec { # tests fail, see https://hydra.nixos.org/build/4316603/log/raw doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "A tool which computes a dependency graph between active Python eggs"; homepage = "http://thomas-lotze.de/en/software/eggdeps/"; license = licenses.zpl20; diff --git a/pkgs/development/python-modules/elasticsearch-dsl/default.nix b/pkgs/development/python-modules/elasticsearch-dsl/default.nix index 06c4e4045ce1..441889025911 100644 --- a/pkgs/development/python-modules/elasticsearch-dsl/default.nix +++ b/pkgs/development/python-modules/elasticsearch-dsl/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , isPy3k @@ -24,7 +24,7 @@ buildPythonPackage rec { # Tests require a local instance of elasticsearch doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "High level Python client for Elasticsearch"; longDescription = '' Elasticsearch DSL is a high-level library whose aim is to help with diff --git a/pkgs/development/python-modules/elasticsearch/default.nix b/pkgs/development/python-modules/elasticsearch/default.nix index 8f403469e193..4929d1f51a48 100644 --- a/pkgs/development/python-modules/elasticsearch/default.nix +++ b/pkgs/development/python-modules/elasticsearch/default.nix @@ -2,7 +2,7 @@ , fetchPypi , urllib3, requests , nosexcover, mock -, stdenv +, lib, stdenv }: buildPythonPackage (rec { @@ -20,7 +20,7 @@ buildPythonPackage (rec { propagatedBuildInputs = [ urllib3 requests ]; buildInputs = [ nosexcover mock ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Official low-level client for Elasticsearch"; homepage = "https://github.com/elasticsearch/elasticsearch-py"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/elementpath/default.nix b/pkgs/development/python-modules/elementpath/default.nix index 9b9597c98bef..270405263127 100644 --- a/pkgs/development/python-modules/elementpath/default.nix +++ b/pkgs/development/python-modules/elementpath/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, fetchFromGitHub, isPy27 }: buildPythonPackage rec { - version = "2.0.4"; + version = "2.1.0"; pname = "elementpath"; disabled = isPy27; # uses incompatible class syntax @@ -9,7 +9,7 @@ buildPythonPackage rec { owner = "sissaschool"; repo = "elementpath"; rev = "v${version}"; - sha256 = "0812il5xn7cq0qa0vmkszrvprakfpyxmilk7s918l9kavdy4al8x"; + sha256 = "17a0gcwmv87kikirgkgr305f5c7wz34hf7djssx4xbk9lfq9m2lg"; }; # avoid circular dependency with xmlschema which directly depends on this diff --git a/pkgs/development/python-modules/eliot/default.nix b/pkgs/development/python-modules/eliot/default.nix index 557be014f86c..472834c5c725 100644 --- a/pkgs/development/python-modules/eliot/default.nix +++ b/pkgs/development/python-modules/eliot/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , pythonOlder @@ -15,12 +15,12 @@ buildPythonPackage rec { pname = "eliot"; - version = "1.12.0"; + version = "1.13.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "0wabv7hk63l12881f4zw02mmj06583qsx2im0yywdjlj8f56vqdn"; + sha256 = "5760194b308a7ab35514ae1b942d88e9f2359071556d82580383f09ca586fff7"; }; checkInputs = [ @@ -47,7 +47,7 @@ buildPythonPackage rec { pytest -k 'not test_parse_stream' ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://eliot.readthedocs.io"; description = "Logging library that tells you why it happened"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/emcee/default.nix b/pkgs/development/python-modules/emcee/default.nix index ed513579457f..12974a9422d6 100644 --- a/pkgs/development/python-modules/emcee/default.nix +++ b/pkgs/development/python-modules/emcee/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ lib, stdenv, buildPythonPackage, fetchPypi , numpy }: buildPythonPackage rec { @@ -12,7 +12,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ numpy ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Kick ass affine-invariant ensemble MCMC sampling"; homepage = "https://emcee.readthedocs.io/"; license = licenses.mit; diff --git a/pkgs/development/python-modules/emv/default.nix b/pkgs/development/python-modules/emv/default.nix index 6dfe39f8b6b1..26d40d8d2052 100644 --- a/pkgs/development/python-modules/emv/default.nix +++ b/pkgs/development/python-modules/emv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub +{ lib, stdenv, buildPythonPackage, fetchFromGitHub , click, enum-compat, pyscard, pycountry, terminaltables , pytestCheckHook, pythonOlder }: @@ -30,7 +30,7 @@ buildPythonPackage rec { --replace '"argparse==1.4.0",' "" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/russss/python-emv"; description = "Implementation of the EMV chip-and-pin smartcard protocol"; license = licenses.mit; diff --git a/pkgs/development/python-modules/enum/default.nix b/pkgs/development/python-modules/enum/default.nix index 92d3faa59891..ad266623c78b 100644 --- a/pkgs/development/python-modules/enum/default.nix +++ b/pkgs/development/python-modules/enum/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , isPy3k @@ -17,7 +17,7 @@ buildPythonPackage rec { doCheck = !isPyPy; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://pypi.python.org/pypi/enum/"; description = "Robust enumerated type support in Python"; license = licenses.gpl2; diff --git a/pkgs/development/python-modules/enum34/default.nix b/pkgs/development/python-modules/enum34/default.nix index 1f0d10942766..5e26853098fb 100644 --- a/pkgs/development/python-modules/enum34/default.nix +++ b/pkgs/development/python-modules/enum34/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , pythonAtLeast @@ -18,7 +18,7 @@ if pythonAtLeast "3.4" then null else buildPythonPackage rec { ${python.interpreter} -m unittest discover ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://pypi.python.org/pypi/enum34"; description = "Python 3.4 Enum backported to 3.3, 3.2, 3.1, 2.7, 2.6, 2.5, and 2.4"; license = licenses.bsd0; diff --git a/pkgs/development/python-modules/epc/default.nix b/pkgs/development/python-modules/epc/default.nix index fe3cc4420c48..d74595431639 100644 --- a/pkgs/development/python-modules/epc/default.nix +++ b/pkgs/development/python-modules/epc/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , sexpdata @@ -16,7 +16,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ sexpdata ]; doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "EPC (RPC stack for Emacs Lisp) implementation in Python"; homepage = "https://github.com/tkf/python-epc"; license = licenses.gpl3; diff --git a/pkgs/development/python-modules/ephem/default.nix b/pkgs/development/python-modules/ephem/default.nix index 32fe91cb72d5..4d6e59409266 100644 --- a/pkgs/development/python-modules/ephem/default.nix +++ b/pkgs/development/python-modules/ephem/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy3k +{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k , glibcLocales, pytest }: buildPythonPackage rec { @@ -17,7 +17,7 @@ buildPythonPackage rec { LC_ALL="en_US.UTF-8" py.test --pyargs ephem.tests -k "not JPLTest" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Compute positions of the planets and stars"; homepage = "https://pypi.python.org/pypi/ephem/"; license = licenses.lgpl3; diff --git a/pkgs/development/python-modules/et_xmlfile/default.nix b/pkgs/development/python-modules/et_xmlfile/default.nix index 09475329c1bb..5ba9490d945a 100644 --- a/pkgs/development/python-modules/et_xmlfile/default.nix +++ b/pkgs/development/python-modules/et_xmlfile/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , lxml @@ -19,7 +19,7 @@ buildPythonPackage rec { py.test $out ''; - meta = with stdenv.lib; { + meta = with lib; { description = "An implementation of lxml.xmlfile for the standard library"; longDescription = '' et_xmlfile is a low memory library for creating large XML files. diff --git a/pkgs/development/python-modules/etcd/default.nix b/pkgs/development/python-modules/etcd/default.nix index 7a122f1b616e..338992259a14 100644 --- a/pkgs/development/python-modules/etcd/default.nix +++ b/pkgs/development/python-modules/etcd/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchurl , simplejson @@ -25,7 +25,7 @@ buildPythonPackage rec { # No proper tests are available doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "A Python etcd client that just works"; homepage = "https://github.com/dsoprea/PythonEtcdClient"; license = licenses.gpl2; diff --git a/pkgs/development/python-modules/etebase/default.nix b/pkgs/development/python-modules/etebase/default.nix index 366c447ed942..c0f9125a8d79 100644 --- a/pkgs/development/python-modules/etebase/default.nix +++ b/pkgs/development/python-modules/etebase/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , wheel , rustPlatform , pipInstallHook @@ -52,7 +52,7 @@ rustPlatform.buildRustPackage rec { pipInstallPhase ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.etebase.com/"; description = "A Python client library for Etebase"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/eve/default.nix b/pkgs/development/python-modules/eve/default.nix index c50cc2aeb827..b931db188e3e 100644 --- a/pkgs/development/python-modules/eve/default.nix +++ b/pkgs/development/python-modules/eve/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , flask @@ -32,7 +32,7 @@ buildPythonPackage rec { # tests call a running mongodb instance doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://python-eve.org/"; description = "Open source Python REST API framework designed for human beings"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/eventlet/default.nix b/pkgs/development/python-modules/eventlet/default.nix index 5eb3efe6009a..93b058859858 100644 --- a/pkgs/development/python-modules/eventlet/default.nix +++ b/pkgs/development/python-modules/eventlet/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "eventlet"; - version = "0.29.1"; + version = "0.30.0"; src = fetchPypi { inherit pname version; - sha256 = "9faff63631b01277c463ae91cd4ab3f25a2f0f5abe3219d43a386ef1daa6159a"; + sha256 = "19d6f3aa9525221ba60d0ec31b570508021af7ad5497fb77f77501fe9a7c34d3"; }; propagatedBuildInputs = [ dnspython greenlet monotonic six ] diff --git a/pkgs/development/python-modules/eventlib/default.nix b/pkgs/development/python-modules/eventlib/default.nix index 4f684612f184..1b2b44d65f70 100644 --- a/pkgs/development/python-modules/eventlib/default.nix +++ b/pkgs/development/python-modules/eventlib/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , isPy3k , fetchdarcs @@ -21,7 +21,7 @@ buildPythonPackage rec { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Eventlib bindings for python"; homepage = "https://ag-projects.com/"; license = licenses.lgpl2; diff --git a/pkgs/development/python-modules/evernote/default.nix b/pkgs/development/python-modules/evernote/default.nix index b245ff117474..70c7fad963af 100644 --- a/pkgs/development/python-modules/evernote/default.nix +++ b/pkgs/development/python-modules/evernote/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , isPy27 @@ -17,7 +17,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ oauth2 ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Evernote SDK for Python"; homepage = "https://dev.evernote.com"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/exchangelib/default.nix b/pkgs/development/python-modules/exchangelib/default.nix index 0635f8f027cc..e380ca613cfd 100644 --- a/pkgs/development/python-modules/exchangelib/default.nix +++ b/pkgs/development/python-modules/exchangelib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildPythonPackage, +{ lib, stdenv, fetchFromGitHub, buildPythonPackage, pythonOlder, lxml, tzlocal, python-dateutil, pygments, requests-kerberos, defusedxml, cached-property, isodate, requests_ntlm, dnspython, @@ -29,7 +29,7 @@ buildPythonPackage rec { oauthlib requests_oauthlib ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Client for Microsoft Exchange Web Services (EWS)"; homepage = "https://github.com/ecederstrand/exchangelib"; license = licenses.bsd2; diff --git a/pkgs/development/python-modules/execnet/default.nix b/pkgs/development/python-modules/execnet/default.nix index bc7b67f52d42..0a22ab4b0516 100644 --- a/pkgs/development/python-modules/execnet/default.nix +++ b/pkgs/development/python-modules/execnet/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { __darwinAllowLocalNetworking = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Rapid multi-Python deployment"; license = licenses.gpl2; homepage = "https://execnet.readthedocs.io/"; diff --git a/pkgs/development/python-modules/exifread/default.nix b/pkgs/development/python-modules/exifread/default.nix index 3c7b814a3c83..e86a681a8e39 100644 --- a/pkgs/development/python-modules/exifread/default.nix +++ b/pkgs/development/python-modules/exifread/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi }: @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "a0f74af5040168d3883bbc980efe26d06c89f026dc86ba28eb34107662d51766"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Easy to use Python module to extract Exif metadata from tiff and jpeg files"; homepage = "https://github.com/ianare/exif-py"; license = licenses.bsd0; diff --git a/pkgs/development/python-modules/eyed3/default.nix b/pkgs/development/python-modules/eyed3/default.nix index 321c26542d11..08faf5c2ba84 100644 --- a/pkgs/development/python-modules/eyed3/default.nix +++ b/pkgs/development/python-modules/eyed3/default.nix @@ -12,13 +12,13 @@ }: buildPythonPackage rec { - version = "0.9.5"; + version = "0.9.6"; pname = "eyeD3"; disabled = isPyPy; src = fetchPypi { inherit pname version; - sha256 = "faf5806197f2093e82c2830d41f2378f07b3a9da07a16fafb14fc6fbdebac50a"; + sha256 = "4b5064ec0fb3999294cca0020d4a27ffe4f29149e8292fdf7b2de9b9cabb7518"; }; # requires special test data: @@ -36,7 +36,7 @@ buildPythonPackage rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A Python module and command line program for processing ID3 tags"; homepage = "https://eyed3.nicfit.net/"; license = licenses.gpl2; diff --git a/pkgs/development/python-modules/ezdxf/default.nix b/pkgs/development/python-modules/ezdxf/default.nix index a745566a6451..6dfefe092040 100644 --- a/pkgs/development/python-modules/ezdxf/default.nix +++ b/pkgs/development/python-modules/ezdxf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, pythonOlder, fetchFromGitHub, pyparsing, pytest }: +{ lib, stdenv, buildPythonPackage, pythonOlder, fetchFromGitHub, pyparsing, pytest }: buildPythonPackage rec { version = "0.12"; @@ -18,7 +18,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pyparsing ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Python package to read and write DXF drawings (interface to the DXF file format)"; homepage = "https://github.com/mozman/ezdxf/"; license = licenses.mit; diff --git a/pkgs/development/python-modules/face/default.nix b/pkgs/development/python-modules/face/default.nix index 71fbca916104..89e7156fa524 100644 --- a/pkgs/development/python-modules/face/default.nix +++ b/pkgs/development/python-modules/face/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, boltons, pytest }: +{ lib, stdenv, buildPythonPackage, fetchPypi, boltons, pytest }: buildPythonPackage rec { pname = "face"; @@ -18,7 +18,7 @@ buildPythonPackage rec { # reporting doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/mahmoud/face"; description = "A command-line interface parser and framework"; longDescription = '' diff --git a/pkgs/development/python-modules/face_recognition/default.nix b/pkgs/development/python-modules/face_recognition/default.nix index 2b26fa735e6d..1896bdfac592 100644 --- a/pkgs/development/python-modules/face_recognition/default.nix +++ b/pkgs/development/python-modules/face_recognition/default.nix @@ -1,5 +1,5 @@ { buildPythonPackage, fetchFromGitHub, pillow, click, dlib, numpy -, face_recognition_models, stdenv, flake8, pytest, glibcLocales +, face_recognition_models, lib, stdenv, flake8, pytest, glibcLocales }: buildPythonPackage rec { @@ -33,7 +33,7 @@ buildPythonPackage rec { LC_ALL="en_US.UTF-8" py.test ''; - meta = with stdenv.lib; { + meta = with lib; { license = licenses.mit; homepage = "https://github.com/ageitgey/face_recognition"; maintainers = with maintainers; [ ma27 ]; diff --git a/pkgs/development/python-modules/face_recognition_models/default.nix b/pkgs/development/python-modules/face_recognition_models/default.nix index 427ad364dde6..d5838438b7d9 100644 --- a/pkgs/development/python-modules/face_recognition_models/default.nix +++ b/pkgs/development/python-modules/face_recognition_models/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, stdenv, fetchPypi, setuptools }: +{ buildPythonPackage, lib, stdenv, fetchPypi, setuptools }: buildPythonPackage rec { pname = "face_recognition_models"; @@ -14,7 +14,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ setuptools ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/ageitgey/face_recognition_models"; license = licenses.cc0; maintainers = with maintainers; [ ma27 ]; diff --git a/pkgs/development/python-modules/fake-useragent/default.nix b/pkgs/development/python-modules/fake-useragent/default.nix index fb85408dd3d2..be26ab98af62 100644 --- a/pkgs/development/python-modules/fake-useragent/default.nix +++ b/pkgs/development/python-modules/fake-useragent/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage, six, pytest }: +{ lib, stdenv, fetchPypi, buildPythonPackage, six, pytest }: buildPythonPackage rec { pname = "fake-useragent"; @@ -13,7 +13,7 @@ buildPythonPackage rec { checkInputs = [ pytest ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Up to date simple useragent faker with real world database"; homepage = "https://github.com/hellysmile/fake-useragent"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/fake_factory/default.nix b/pkgs/development/python-modules/fake_factory/default.nix index ab947756fa98..82af8d04e077 100644 --- a/pkgs/development/python-modules/fake_factory/default.nix +++ b/pkgs/development/python-modules/fake_factory/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , python @@ -26,7 +26,7 @@ buildPythonPackage rec { ${python.interpreter} -m unittest faker.tests ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A Python package that generates fake data for you"; homepage = "https://pypi.python.org/pypi/fake-factory"; license = licenses.mit; diff --git a/pkgs/development/python-modules/faker/default.nix b/pkgs/development/python-modules/faker/default.nix index abdb0f583941..990908efe034 100644 --- a/pkgs/development/python-modules/faker/default.nix +++ b/pkgs/development/python-modules/faker/default.nix @@ -1,59 +1,45 @@ -{ lib, buildPythonPackage, fetchPypi, pythonOlder, -# Build inputs -dateutil, six, text-unidecode, ipaddress ? null -# Test inputs -, email_validator +{ lib +, buildPythonPackage +, fetchPypi +, dateutil +, text-unidecode , freezegun -, mock -, more-itertools , pytestCheckHook -, pytestrunner , ukpostcodeparser , validators }: -assert pythonOlder "3.3" -> ipaddress != null; - buildPythonPackage rec { pname = "Faker"; - version = "4.18.0"; + version = "5.5.1"; src = fetchPypi { inherit pname version; - sha256 = "0raxw6mgvf9523v7917zqw76vqnpp0d6v3i310qnjnhpxmm78yb2"; + sha256 = "1bskhmiir1ajipj7j535j2mxgnp6s3mxbvlag4aryj9zbhgg1c19"; }; - nativeBuildInputs = [ pytestrunner ]; + propagatedBuildInputs = [ + dateutil + text-unidecode + ]; + checkInputs = [ - email_validator freezegun pytestCheckHook ukpostcodeparser validators - ] - ++ lib.optionals (pythonOlder "3.3") [ mock ] - ++ lib.optionals (pythonOlder "3.0") [ more-itertools ]; + ]; # avoid tests which import random2, an abandoned library pytestFlagsArray = [ "--ignore=tests/providers/test_ssn.py" ]; - - propagatedBuildInputs = [ - dateutil - six - text-unidecode - ]; - - postPatch = '' - substituteInPlace setup.py --replace "pytest>=3.8.0,<3.9" "pytest" - ''; + pythonImportsCheck = [ "faker" ]; meta = with lib; { - description = "A Python library for generating fake user data"; - homepage = "http://faker.rtfd.org"; - license = licenses.mit; + description = "Python library for generating fake user data"; + homepage = "http://faker.rtfd.org"; + license = licenses.mit; maintainers = with maintainers; [ lovek323 ]; - platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/falcon/default.nix b/pkgs/development/python-modules/falcon/default.nix index 20a767774138..8d1aa02026c1 100644 --- a/pkgs/development/python-modules/falcon/default.nix +++ b/pkgs/development/python-modules/falcon/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , coverage @@ -24,7 +24,7 @@ buildPythonPackage rec { # OSError: [Errno 98] Address already in use doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "An unladen web framework for building APIs and app backends"; homepage = "https://falconframework.org/"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/fastapi/default.nix b/pkgs/development/python-modules/fastapi/default.nix index 32ebd6a0307d..dadfc41c68bc 100644 --- a/pkgs/development/python-modules/fastapi/default.nix +++ b/pkgs/development/python-modules/fastapi/default.nix @@ -1,61 +1,58 @@ { lib , buildPythonPackage , fetchFromGitHub -, uvicorn -, starlette , pydantic -, isPy3k -, pytest -, pytestcov -, pyjwt -, passlib +, starlette +, pytestCheckHook +, pytest-asyncio , aiosqlite -, peewee +, databases , flask +, httpx +, passlib +, peewee +, python-jose +, sqlalchemy }: buildPythonPackage rec { pname = "fastapi"; - version = "0.55.1"; + version = "0.63.0"; format = "flit"; - disabled = !isPy3k; src = fetchFromGitHub { owner = "tiangolo"; repo = "fastapi"; rev = version; - sha256 = "1515nhwari48v0angyl5z3cfpvwn4al2nvqh0cjd9xgxzvm310s8"; + sha256 = "0l3imrcs42pqf9d6k8c1q15k5sqcnapl5zk71xl52mrxhz49lgpi"; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace "starlette ==0.13.2" "starlette" + --replace "starlette ==0.13.6" "starlette" ''; propagatedBuildInputs = [ - uvicorn starlette pydantic ]; checkInputs = [ - pytest - pytestcov - pyjwt - passlib aiosqlite - peewee + databases flask + httpx + passlib + peewee + python-jose + pytestCheckHook + pytest-asyncio + sqlalchemy ]; - # test_default_response_class.py: requires orjson, which requires rust toolchain - # test_custom_response/test_tutorial001b.py: requires orjson - # tests/test_tutorial/test_sql_databases/test_testing_databases.py: just broken, don't know why - checkPhase = '' - pytest --ignore=tests/test_default_response_class.py \ - --ignore=tests/test_tutorial/test_custom_response/test_tutorial001b.py \ - --ignore=tests/test_tutorial/test_sql_databases/test_testing_databases.py - ''; + # disabled tests require orjson which requires rust nightly + pytestFlagsArray = [ "--ignore=tests/test_default_response_class.py" ]; + disabledTests = [ "test_get_custom_response" ]; meta = with lib; { homepage = "https://github.com/tiangolo/fastapi"; diff --git a/pkgs/development/python-modules/fastdiff/default.nix b/pkgs/development/python-modules/fastdiff/default.nix new file mode 100644 index 000000000000..b3e27d7a5e81 --- /dev/null +++ b/pkgs/development/python-modules/fastdiff/default.nix @@ -0,0 +1,30 @@ +{ lib, buildPythonPackage, fetchPypi, pytestCheckHook, pytest-benchmark, wasmer }: + +buildPythonPackage rec { + pname = "fastdiff"; + version = "0.2.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1ai95vjchl4396zjl1b69xfqvn9kn1y7c40d9l0qxdss0pcx6fk2"; + }; + + postPatch = '' + substituteInPlace setup.py \ + --replace 'pytest-runner' "" + ''; + + propagatedBuildInputs = [ wasmer ]; + + checkInputs = [ pytestCheckHook pytest-benchmark ]; + + pythonImportsCheck = [ "fastdiff" ]; + disabledTests = [ "test_native" ]; + + meta = with lib; { + description = "A fast native implementation of diff algorithm with a pure Python fallback"; + homepage = "https://github.com/syrusakbary/fastdiff"; + license = licenses.mit; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/development/python-modules/fasteners/default.nix b/pkgs/development/python-modules/fasteners/default.nix index 75719a78fb21..b81ebb4faa03 100644 --- a/pkgs/development/python-modules/fasteners/default.nix +++ b/pkgs/development/python-modules/fasteners/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , six @@ -26,7 +26,7 @@ buildPythonPackage rec { nosetests ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A python package that provides useful locks"; homepage = "https://github.com/harlowja/fasteners"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/fastentrypoints/default.nix b/pkgs/development/python-modules/fastentrypoints/default.nix index 08e2e384ff92..eb86784ddc7b 100644 --- a/pkgs/development/python-modules/fastentrypoints/default.nix +++ b/pkgs/development/python-modules/fastentrypoints/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi }: +{ lib, stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "fastentrypoints"; @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "02s1j8i2dzbpbwgq2a3fiqwm3cnmhii2qzc0k42l0rdxd4a4ya7z"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Makes entry_points specified in setup.py load more quickly"; homepage = "https://github.com/ninjaaron/fast-entry_points"; license = licenses.bsd2; diff --git a/pkgs/development/python-modules/fastimport/default.nix b/pkgs/development/python-modules/fastimport/default.nix index c1fab50c06e1..55aad9d71ea5 100644 --- a/pkgs/development/python-modules/fastimport/default.nix +++ b/pkgs/development/python-modules/fastimport/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, python, fetchPypi}: +{ lib, stdenv, buildPythonPackage, python, fetchPypi}: buildPythonPackage rec { pname = "fastimport"; @@ -13,7 +13,7 @@ buildPythonPackage rec { ${python.interpreter} -m unittest discover ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://launchpad.net/python-fastimport"; description = "VCS fastimport/fastexport parser"; maintainers = with maintainers; [ koral ]; diff --git a/pkgs/development/python-modules/fastpair/default.nix b/pkgs/development/python-modules/fastpair/default.nix index edb45eb06877..82964070d03b 100644 --- a/pkgs/development/python-modules/fastpair/default.nix +++ b/pkgs/development/python-modules/fastpair/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, pytestrunner, pytest, scipy }: +{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pytestrunner, pytest, scipy }: buildPythonPackage { pname = "fastpair"; @@ -26,7 +26,7 @@ buildPythonPackage { pytest fastpair ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/carsonfarmer/fastpair"; description = "Data-structure for the dynamic closest-pair problem"; license = licenses.mit; diff --git a/pkgs/development/python-modules/fastparquet/default.nix b/pkgs/development/python-modules/fastparquet/default.nix index 47c7d5063090..07922ee19efa 100644 --- a/pkgs/development/python-modules/fastparquet/default.nix +++ b/pkgs/development/python-modules/fastparquet/default.nix @@ -3,22 +3,19 @@ thrift, pytest, python-snappy, lz4, zstd }: buildPythonPackage rec { pname = "fastparquet"; - version = "0.4.1"; + version = "0.5.0"; src = fetchFromGitHub { owner = "dask"; repo = pname; rev = version; - sha256 = "ViZRGEv227/RgCBYAQN8F3Z0m8WrNUT5KUdyFosjg9s="; + sha256 = "17i091kky34m2xivk29fqsyxxxa7v4352n79w01n7ni93za6wana"; }; postPatch = '' # FIXME: package zstandard # removing the test dependency for now substituteInPlace setup.py --replace "'zstandard'," "" - - # workaround for https://github.com/dask/fastparquet/issues/517 - rm fastparquet/test/test_partition_filters_specialstrings.py ''; nativeBuildInputs = [ pytestrunner ]; diff --git a/pkgs/development/python-modules/fastpbkdf2/default.nix b/pkgs/development/python-modules/fastpbkdf2/default.nix index 568d894805fd..e033dc42d457 100644 --- a/pkgs/development/python-modules/fastpbkdf2/default.nix +++ b/pkgs/development/python-modules/fastpbkdf2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildPythonPackage +{ lib, stdenv, fetchFromGitHub, buildPythonPackage , openssl, pytest, cffi, six }: buildPythonPackage rec { @@ -17,7 +17,7 @@ buildPythonPackage rec { checkInputs = [ pytest ]; propagatedBuildInputs = [ cffi six ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/Ayrx/python-fastpbkdf2"; description = "Python bindings for fastpbkdf2"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/fastprogress/default.nix b/pkgs/development/python-modules/fastprogress/default.nix index a542b5805653..25cc2b8792f7 100644 --- a/pkgs/development/python-modules/fastprogress/default.nix +++ b/pkgs/development/python-modules/fastprogress/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , numpy @@ -22,7 +22,7 @@ buildPythonPackage rec { doCheck = false; pythonImportsCheck = [ "fastprogress" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/fastai/fastprogress"; description = "Simple and flexible progress bar for Jupyter Notebook and console"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/fastrlock/default.nix b/pkgs/development/python-modules/fastrlock/default.nix index e44639942a0d..7aedbbdd8f7c 100644 --- a/pkgs/development/python-modules/fastrlock/default.nix +++ b/pkgs/development/python-modules/fastrlock/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi }: +{ lib, stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "fastrlock"; @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "9ae1a31f6e069b5f0f28ba63c594d0c952065de0a375f7b491d21ebaccc5166f"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/scoder/fastrlock"; description = "A fast RLock implementation for CPython"; license = licenses.mit; diff --git a/pkgs/development/python-modules/fasttext/default.nix b/pkgs/development/python-modules/fasttext/default.nix index 42e6446e8643..bf3bd987564a 100644 --- a/pkgs/development/python-modules/fasttext/default.nix +++ b/pkgs/development/python-modules/fasttext/default.nix @@ -1,4 +1,4 @@ -{stdenv, buildPythonPackage, fetchFromGitHub, numpy, pkgs, pybind11 }: +{lib, stdenv, buildPythonPackage, fetchFromGitHub, numpy, pkgs, pybind11 }: buildPythonPackage rec { inherit (pkgs.fasttext) pname version src; @@ -13,7 +13,7 @@ buildPythonPackage rec { HOME=$TMPDIR ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Python module for text classification and representation learning"; homepage = "https://fasttext.cc/"; license = licenses.mit; diff --git a/pkgs/development/python-modules/fdint/default.nix b/pkgs/development/python-modules/fdint/default.nix index 68c3b039a47f..4de0d18ca8b7 100644 --- a/pkgs/development/python-modules/fdint/default.nix +++ b/pkgs/development/python-modules/fdint/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , cython @@ -27,7 +27,7 @@ buildPythonPackage rec { ${python.interpreter} -m fdint.tests ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/scott-maddox/fdint"; description = "A free, open-source python package for quickly and precisely approximating Fermi-Dirac integrals"; license = licenses.mit; diff --git a/pkgs/development/python-modules/feedgen/default.nix b/pkgs/development/python-modules/feedgen/default.nix index dbc303f43026..509ffaed9d71 100644 --- a/pkgs/development/python-modules/feedgen/default.nix +++ b/pkgs/development/python-modules/feedgen/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, dateutil, lxml }: +{ lib, stdenv, buildPythonPackage, fetchPypi, dateutil, lxml }: buildPythonPackage rec { pname = "feedgen"; @@ -14,7 +14,7 @@ buildPythonPackage rec { # No tests in archive doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Python module to generate ATOM feeds, RSS feeds and Podcasts."; downloadPage = "https://github.com/lkiesow/python-feedgen/releases"; homepage = "https://github.com/lkiesow/python-feedgen"; diff --git a/pkgs/development/python-modules/feedgenerator/default.nix b/pkgs/development/python-modules/feedgenerator/default.nix index c0ccb7d345a9..8508cc637f22 100644 --- a/pkgs/development/python-modules/feedgenerator/default.nix +++ b/pkgs/development/python-modules/feedgenerator/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, glibcLocales, fetchPypi, six, pytz }: +{ lib, stdenv, buildPythonPackage, glibcLocales, fetchPypi, six, pytz }: buildPythonPackage rec { pname = "feedgenerator"; @@ -15,7 +15,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six pytz ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Standalone version of django.utils.feedgenerator, compatible with Py3k"; homepage = "https://github.com/dmdm/feedgenerator-py3k.git"; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/python-modules/feedparser/5.nix b/pkgs/development/python-modules/feedparser/5.nix index 31fc61053b92..a79048c55254 100644 --- a/pkgs/development/python-modules/feedparser/5.nix +++ b/pkgs/development/python-modules/feedparser/5.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi }: @@ -15,7 +15,7 @@ buildPythonPackage rec { # lots of networking failures doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/kurtmckee/feedparser"; description = "Universal feed parser"; license = licenses.bsd2; diff --git a/pkgs/development/python-modules/feedparser/default.nix b/pkgs/development/python-modules/feedparser/default.nix index aeeb9b3e4960..7b48fe6f73e5 100644 --- a/pkgs/development/python-modules/feedparser/default.nix +++ b/pkgs/development/python-modules/feedparser/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , isPy27 @@ -21,7 +21,7 @@ buildPythonPackage rec { python -Wd tests/runtests.py ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/kurtmckee/feedparser"; description = "Universal feed parser"; license = licenses.bsd2; diff --git a/pkgs/development/python-modules/filebrowser_safe/default.nix b/pkgs/development/python-modules/filebrowser_safe/default.nix index 014e3b9810a9..df132211d4f9 100644 --- a/pkgs/development/python-modules/filebrowser_safe/default.nix +++ b/pkgs/development/python-modules/filebrowser_safe/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , django @@ -18,7 +18,7 @@ buildPythonPackage rec { # There is no test embedded doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "A snapshot of django-filebrowser for the Mezzanine CMS"; longDescription = '' filebrowser_safe was created to provide a snapshot of the diff --git a/pkgs/development/python-modules/filebytes/default.nix b/pkgs/development/python-modules/filebytes/default.nix index 7404620896c9..bfac6a0e6b23 100644 --- a/pkgs/development/python-modules/filebytes/default.nix +++ b/pkgs/development/python-modules/filebytes/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi }: @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "0h97i6h525hg401dvvaa5krxi184qpvldbdn0izmirvr9pvh4hkn"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://scoding.de/filebytes-introduction"; license = licenses.gpl2; description = "Scripts to parse ELF, PE, Mach-O and OAT (Android Runtime)"; diff --git a/pkgs/development/python-modules/filelock/default.nix b/pkgs/development/python-modules/filelock/default.nix index 9729c1543cb4..77ddec306fc2 100644 --- a/pkgs/development/python-modules/filelock/default.nix +++ b/pkgs/development/python-modules/filelock/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi }: +{ lib, stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "filelock"; @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "18d82244ee114f543149c66a6e0c14e9c4f8a1044b5cdaadd0f82159d6a6ff59"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/benediktschmitt/py-filelock"; description = "A platform independent file lock for Python"; license = licenses.unlicense; diff --git a/pkgs/development/python-modules/filterpy/default.nix b/pkgs/development/python-modules/filterpy/default.nix index bae362d3a4a4..53059ce43d05 100644 --- a/pkgs/development/python-modules/filterpy/default.nix +++ b/pkgs/development/python-modules/filterpy/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , numpy @@ -28,7 +28,7 @@ buildPythonPackage rec { pytest --ignore=filterpy/common/tests/test_discretization.py ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/rlabbe/filterpy"; description = "Kalman filtering and optimal estimation library"; license = licenses.mit; diff --git a/pkgs/development/python-modules/fints/default.nix b/pkgs/development/python-modules/fints/default.nix index 10915e766ac2..8e02dac58508 100644 --- a/pkgs/development/python-modules/fints/default.nix +++ b/pkgs/development/python-modules/fints/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, isPy27 +{ lib, stdenv, buildPythonPackage, fetchFromGitHub, isPy27 , bleach , mt-940 , pytest @@ -27,7 +27,7 @@ buildPythonPackage rec { pytest . --ignore=tests/test_client.py -k 'not robust_mode' ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/raphaelm/python-fints/"; description = "Pure-python FinTS (formerly known as HBCI) implementation"; license = licenses.lgpl3; diff --git a/pkgs/development/python-modules/fiona/default.nix b/pkgs/development/python-modules/fiona/default.nix index 0e90bb10f956..665bb0c8df0e 100644 --- a/pkgs/development/python-modules/fiona/default.nix +++ b/pkgs/development/python-modules/fiona/default.nix @@ -41,9 +41,7 @@ buildPythonPackage rec { checkPhase = '' rm -r fiona # prevent importing local fiona # Some tests access network, others test packaging - pytest -k "not test_*_http \ - and not test_*_https \ - and not test_*_wheel" + pytest -k "not (http or https or wheel)" ''; meta = with lib; { diff --git a/pkgs/development/python-modules/fire/default.nix b/pkgs/development/python-modules/fire/default.nix index 6c81a708d57d..5a14f772546f 100644 --- a/pkgs/development/python-modules/fire/default.nix +++ b/pkgs/development/python-modules/fire/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, fetchpatch, six, hypothesis, mock +{ lib, stdenv, buildPythonPackage, fetchFromGitHub, fetchpatch, six, hypothesis, mock , python-Levenshtein, pytest, termcolor, isPy27, enum34 }: buildPythonPackage rec { @@ -22,7 +22,7 @@ buildPythonPackage rec { py.test -k 'not testInitRequiresFlag' ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A library for automatically generating command line interfaces"; longDescription = '' Python Fire is a library for automatically generating command line diff --git a/pkgs/development/python-modules/first/default.nix b/pkgs/development/python-modules/first/default.nix index 6956addb29f3..a5bdf847eff2 100644 --- a/pkgs/development/python-modules/first/default.nix +++ b/pkgs/development/python-modules/first/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi }: +{ lib, stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "first"; @@ -11,7 +11,7 @@ buildPythonPackage rec { doCheck = false; # no tests - meta = with stdenv.lib; { + meta = with lib; { description = "The function you always missed in Python"; homepage = "https://github.com/hynek/first/"; license = licenses.mit; diff --git a/pkgs/development/python-modules/fixerio/default.nix b/pkgs/development/python-modules/fixerio/default.nix new file mode 100644 index 000000000000..786681df1c83 --- /dev/null +++ b/pkgs/development/python-modules/fixerio/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, requests +, pytestCheckHook +, httpretty +}: + +buildPythonPackage rec { + pname = "fixerio"; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "amatellanes"; + repo = pname; + rev = "v${version}"; + sha256 = "1k9ss5jc7sbpkjd2774vbmvljny0wm2lrc8155ha8yk2048jsaxk"; + }; + + postPatch = '' + substituteInPlace setup.py --replace "requests==2.10.0" "requests" + ''; + + propagatedBuildInputs = [ + requests + ]; + + checkInputs = [ + httpretty + pytestCheckHook + ]; + + pythonImportsCheck = [ "fixerio" ]; + + meta = with lib; { + description = "Python client for Fixer.io"; + longDescription = '' + Fixer.io is a free JSON API for current and historical foreign + exchange rates published by the European Central Bank. + ''; + homepage = "https://github.com/amatellanes/fixerio"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/fixtures/default.nix b/pkgs/development/python-modules/fixtures/default.nix index 3042acbbe848..9f1549e98f9f 100644 --- a/pkgs/development/python-modules/fixtures/default.nix +++ b/pkgs/development/python-modules/fixtures/default.nix @@ -5,6 +5,7 @@ , testtools , mock , python +, isPy39 }: buildPythonPackage rec { @@ -26,5 +27,6 @@ buildPythonPackage rec { description = "Reusable state for writing clean tests and more"; homepage = "https://pypi.python.org/pypi/fixtures"; license = lib.licenses.asl20; + broken = isPy39; # see https://github.com/testing-cabal/fixtures/issues/44 }; } diff --git a/pkgs/development/python-modules/flake8/default.nix b/pkgs/development/python-modules/flake8/default.nix index a369919b98fb..33459b7c66b3 100644 --- a/pkgs/development/python-modules/flake8/default.nix +++ b/pkgs/development/python-modules/flake8/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, pythonOlder +{ lib, stdenv, buildPythonPackage, fetchPypi, pythonOlder , mock, pytest, pytestrunner , configparser, enum34, mccabe, pycodestyle, pyflakes, functools32, typing, importlib-metadata }: @@ -24,7 +24,7 @@ buildPythonPackage rec { py.test tests --ignore=tests/integration/test_checker.py ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Code checking using pep8 and pyflakes"; homepage = "https://pypi.python.org/pypi/flake8"; license = licenses.mit; diff --git a/pkgs/development/python-modules/flaky/default.nix b/pkgs/development/python-modules/flaky/default.nix index 9bf20e6cc3b5..02b0641a34e2 100644 --- a/pkgs/development/python-modules/flaky/default.nix +++ b/pkgs/development/python-modules/flaky/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , mock @@ -26,7 +26,7 @@ buildPythonPackage rec { pytest --force-flaky --max-runs 2 test/test_pytest/test_pytest_options_example.py ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/box/flaky"; description = "Plugin for nose or py.test that automatically reruns flaky tests"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/flametree/default.nix b/pkgs/development/python-modules/flametree/default.nix new file mode 100644 index 000000000000..d4cba69afcb0 --- /dev/null +++ b/pkgs/development/python-modules/flametree/default.nix @@ -0,0 +1,26 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "flametree"; + version = "0.1.11"; + + src = fetchPypi { + inherit pname version; + sha256 = "c8eb81dea8c7f8261a2aa03d2bac98b1d21ebceec9c67efaac423f7c1b4fe061"; + }; + + # no tests in tarball + doCheck = false; + + pythonImportsCheck = [ "flametree" ]; + + meta = with lib; { + homepage = "https://github.com/Edinburgh-Genome-Foundry/Flametree"; + description = "Python file and zip operations made easy"; + license = licenses.mit; + maintainers = with maintainers; [ prusnak ]; + }; +} diff --git a/pkgs/development/python-modules/flask-babel/default.nix b/pkgs/development/python-modules/flask-babel/default.nix index 0eb9f61d697f..da6176e6781f 100644 --- a/pkgs/development/python-modules/flask-babel/default.nix +++ b/pkgs/development/python-modules/flask-babel/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , python , fetchPypi @@ -30,7 +30,7 @@ buildPythonPackage rec { ${python.interpreter} -m unittest discover -s tests ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Adds i18n/l10n support to Flask applications"; longDescription = '' Implements i18n and l10n support for Flask. diff --git a/pkgs/development/python-modules/flask-common/default.nix b/pkgs/development/python-modules/flask-common/default.nix index 40c7903aee3d..7dbf507f2205 100644 --- a/pkgs/development/python-modules/flask-common/default.nix +++ b/pkgs/development/python-modules/flask-common/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage +{ lib, stdenv, fetchPypi, buildPythonPackage , crayons, flask, flask-caching, gunicorn, maya, meinheld, whitenoise }: buildPythonPackage rec { @@ -12,7 +12,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ crayons flask flask-caching gunicorn maya meinheld whitenoise ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Flask extension with lots of common time-savers"; homepage = "https://github.com/kennethreitz/flask-common"; license = licenses.asl20; # XXX: setup.py lists BSD but git repo has Apache 2.0 LICENSE diff --git a/pkgs/development/python-modules/flask-compress/default.nix b/pkgs/development/python-modules/flask-compress/default.nix index fe55705bb521..9491ca8be779 100644 --- a/pkgs/development/python-modules/flask-compress/default.nix +++ b/pkgs/development/python-modules/flask-compress/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage, flask +{ lib, stdenv, fetchPypi, buildPythonPackage, flask , brotli }: @@ -13,7 +13,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ flask brotli ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Compress responses in your Flask app with gzip"; homepage = "https://libwilliam.github.io/flask-compress/"; license = licenses.mit; diff --git a/pkgs/development/python-modules/flask-cors/default.nix b/pkgs/development/python-modules/flask-cors/default.nix index da61365e3ae8..731e8b106ab7 100644 --- a/pkgs/development/python-modules/flask-cors/default.nix +++ b/pkgs/development/python-modules/flask-cors/default.nix @@ -1,13 +1,13 @@ -{ stdenv, fetchPypi, buildPythonPackage +{ lib, stdenv, fetchPypi, buildPythonPackage , nose, flask, six, packaging }: buildPythonPackage rec { pname = "Flask-Cors"; - version = "3.0.9"; + version = "3.0.10"; src = fetchPypi { inherit pname version; - sha256 = "6bcfc100288c5d1bcb1dbb854babd59beee622ffd321e444b05f24d6d58466b8"; + sha256 = "b60839393f3b84a0f3746f6cdca56c1ad7426aa738b70d6c61375857823181de"; }; checkInputs = [ nose packaging ]; @@ -19,7 +19,7 @@ buildPythonPackage rec { nosetests --exclude test_acl_uncaught_exception_500 ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A Flask extension adding a decorator for CORS support"; homepage = "https://github.com/corydolphin/flask-cors"; license = with licenses; [ mit ]; diff --git a/pkgs/development/python-modules/flask-elastic/default.nix b/pkgs/development/python-modules/flask-elastic/default.nix index 9f8e27ea20f9..6986cd75be69 100644 --- a/pkgs/development/python-modules/flask-elastic/default.nix +++ b/pkgs/development/python-modules/flask-elastic/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ lib, stdenv, buildPythonPackage, fetchPypi , flask, elasticsearch }: buildPythonPackage rec { @@ -13,7 +13,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ flask elasticsearch ]; doCheck = false; # no tests - meta = with stdenv.lib; { + meta = with lib; { description = "Integrates official client for Elasticsearch into Flask"; license = licenses.bsd3; maintainers = [ maintainers.mic92 ]; diff --git a/pkgs/development/python-modules/flask-jwt-extended/default.nix b/pkgs/development/python-modules/flask-jwt-extended/default.nix index 4d45343c2658..cf8a70b05330 100644 --- a/pkgs/development/python-modules/flask-jwt-extended/default.nix +++ b/pkgs/development/python-modules/flask-jwt-extended/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, dateutil, flask, pyjwt, werkzeug, pytest }: +{ lib, stdenv, buildPythonPackage, fetchPypi, dateutil, flask, pyjwt, werkzeug, pytest }: buildPythonPackage rec { pname = "Flask-JWT-Extended"; @@ -16,7 +16,7 @@ buildPythonPackage rec { pytest tests/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "JWT extension for Flask"; homepage = "https://flask-jwt-extended.readthedocs.io/"; license = licenses.mit; diff --git a/pkgs/development/python-modules/flask-ldap-login/default.nix b/pkgs/development/python-modules/flask-ldap-login/default.nix index 2573f5497408..1673ca24e6e0 100644 --- a/pkgs/development/python-modules/flask-ldap-login/default.nix +++ b/pkgs/development/python-modules/flask-ldap-login/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, isPy3k, fetchFromGitHub, fetchpatch +{ lib, stdenv, buildPythonPackage, isPy3k, fetchFromGitHub, fetchpatch , flask, flask_wtf, flask_testing, ldap , mock, nose }: @@ -27,7 +27,7 @@ buildPythonPackage rec { checkPhase = "nosetests -d"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/ContinuumIO/flask-ldap-login"; description = "User session management for Flask"; license = licenses.mit; diff --git a/pkgs/development/python-modules/flask-limiter/default.nix b/pkgs/development/python-modules/flask-limiter/default.nix index 1f24919b73c0..38d42da1c8a7 100644 --- a/pkgs/development/python-modules/flask-limiter/default.nix +++ b/pkgs/development/python-modules/flask-limiter/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage, flask, limits }: +{ lib, stdenv, fetchPypi, buildPythonPackage, flask, limits }: buildPythonPackage rec { pname = "Flask-Limiter"; @@ -11,7 +11,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ flask limits ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Rate limiting for flask applications"; homepage = "https://flask-limiter.readthedocs.org/"; license = licenses.mit; diff --git a/pkgs/development/python-modules/flask-login/default.nix b/pkgs/development/python-modules/flask-login/default.nix index a4cd86ee69d4..919e353eb8e0 100644 --- a/pkgs/development/python-modules/flask-login/default.nix +++ b/pkgs/development/python-modules/flask-login/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, pythonAtLeast +{ lib, stdenv, buildPythonPackage, fetchPypi, pythonAtLeast , flask, blinker, nose, mock, semantic-version }: buildPythonPackage rec { @@ -17,7 +17,7 @@ buildPythonPackage rec { doCheck = pythonAtLeast "3.3"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/maxcountryman/flask-login"; description = "User session management for Flask"; license = licenses.mit; diff --git a/pkgs/development/python-modules/flask-reverse-proxy-fix/default.nix b/pkgs/development/python-modules/flask-reverse-proxy-fix/default.nix index f8001bc2aff5..550f6520e7db 100644 --- a/pkgs/development/python-modules/flask-reverse-proxy-fix/default.nix +++ b/pkgs/development/python-modules/flask-reverse-proxy-fix/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchFromGitHub , isPy3k @@ -30,7 +30,7 @@ buildPythonPackage rec { werkzeug ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Python Flask middleware for applications running under a reverse proxy"; maintainers = with maintainers; [ matthiasbeyer ]; homepage = "https://github.com/antarctica/flask-reverse-proxy-fix"; diff --git a/pkgs/development/python-modules/flask-silk/default.nix b/pkgs/development/python-modules/flask-silk/default.nix index fc8c57be99a4..92d2f90848cb 100644 --- a/pkgs/development/python-modules/flask-silk/default.nix +++ b/pkgs/development/python-modules/flask-silk/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchFromGitHub , flask @@ -21,7 +21,7 @@ buildPythonPackage { flask ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Adds silk icons to your Flask application or module, or extension"; license = licenses.bsd3; maintainers = teams.sage.members; diff --git a/pkgs/development/python-modules/flask-socketio/default.nix b/pkgs/development/python-modules/flask-socketio/default.nix index 80f6edb79d35..496676600fc9 100644 --- a/pkgs/development/python-modules/flask-socketio/default.nix +++ b/pkgs/development/python-modules/flask-socketio/default.nix @@ -1,18 +1,21 @@ { lib , buildPythonPackage -, fetchPypi -, flask -, python-socketio , coverage +, fetchFromGitHub +, flask +, pytestCheckHook +, python-socketio }: buildPythonPackage rec { pname = "Flask-SocketIO"; - version = "4.3.2"; + version = "5.0.1"; - src = fetchPypi { - inherit pname version; - sha256 = "37001b3507f2fa5d1c8d9c8e211dd88da6c5286ff0ebce16f27cb1b467d25d68"; + src = fetchFromGitHub { + owner = "miguelgrinberg"; + repo = "Flask-SocketIO"; + rev = "v${version}"; + sha256 = "01zf6cy95pgc4flgn0740z2my90l7rxwliahp6rb2xbp7rh32cng"; }; propagatedBuildInputs = [ @@ -20,9 +23,12 @@ buildPythonPackage rec { python-socketio ]; - checkInputs = [ coverage ]; - # tests only on github, but lates release there is not tagged - doCheck = false; + checkInputs = [ + coverage + pytestCheckHook + ]; + + pythonImportsCheck = [ "flask_socketio" ]; meta = with lib; { description = "Socket.IO integration for Flask applications"; diff --git a/pkgs/development/python-modules/flask-sqlalchemy/default.nix b/pkgs/development/python-modules/flask-sqlalchemy/default.nix index c811ce24157e..16b8c9c7fc79 100644 --- a/pkgs/development/python-modules/flask-sqlalchemy/default.nix +++ b/pkgs/development/python-modules/flask-sqlalchemy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, flask, mock, sqlalchemy, pytest }: +{ lib, stdenv, buildPythonPackage, fetchPypi, flask, mock, sqlalchemy, pytest }: buildPythonPackage rec { pname = "Flask-SQLAlchemy"; @@ -16,7 +16,7 @@ buildPythonPackage rec { pytest ''; - meta = with stdenv.lib; { + meta = with lib; { description = "SQLAlchemy extension for Flask"; homepage = "http://flask-sqlalchemy.pocoo.org/"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/flask-swagger-ui/default.nix b/pkgs/development/python-modules/flask-swagger-ui/default.nix index cc4b4e06bfcc..79650e7c1755 100644 --- a/pkgs/development/python-modules/flask-swagger-ui/default.nix +++ b/pkgs/development/python-modules/flask-swagger-ui/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, flask }: +{ lib, stdenv, buildPythonPackage, fetchPypi, flask }: buildPythonPackage rec { pname = "flask-swagger-ui"; @@ -15,7 +15,7 @@ buildPythonPackage rec { flask ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/sveint/flask-swagger-ui"; license = licenses.mit; description = "Swagger UI blueprint for Flask"; diff --git a/pkgs/development/python-modules/flask-swagger/default.nix b/pkgs/development/python-modules/flask-swagger/default.nix index c690e4e64ae5..20624c318620 100644 --- a/pkgs/development/python-modules/flask-swagger/default.nix +++ b/pkgs/development/python-modules/flask-swagger/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ lib, stdenv, buildPythonPackage, fetchPypi , flask, pyyaml }: buildPythonPackage rec { @@ -18,7 +18,7 @@ buildPythonPackage rec { pyyaml ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/gangverk/flask-swagger"; license = licenses.mit; description = "Extract swagger specs from your flask project"; diff --git a/pkgs/development/python-modules/flask-testing/default.nix b/pkgs/development/python-modules/flask-testing/default.nix index 24e2e6343a20..9f4d66335de5 100644 --- a/pkgs/development/python-modules/flask-testing/default.nix +++ b/pkgs/development/python-modules/flask-testing/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage, isPy3k, flask, blinker, twill }: +{ lib, stdenv, fetchPypi, buildPythonPackage, isPy3k, flask, blinker, twill }: buildPythonPackage rec { pname = "Flask-Testing"; @@ -23,7 +23,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "flask_testing" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Flask unittest integration."; homepage = "https://pythonhosted.org/Flask-Testing/"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/flask-versioned/default.nix b/pkgs/development/python-modules/flask-versioned/default.nix index 3bd5ef98b322..15e7b2c1875d 100644 --- a/pkgs/development/python-modules/flask-versioned/default.nix +++ b/pkgs/development/python-modules/flask-versioned/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, flask }: +{ lib, stdenv, buildPythonPackage, fetchFromGitHub, flask }: buildPythonPackage rec { pname = "Flask-Versioned"; @@ -13,7 +13,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ flask ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Flask plugin to rewrite file paths to add version info"; homepage = "https://github.com/pilt/flask-versioned"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/flask-wtf/default.nix b/pkgs/development/python-modules/flask-wtf/default.nix index 060f592b2cff..eadc7842a013 100644 --- a/pkgs/development/python-modules/flask-wtf/default.nix +++ b/pkgs/development/python-modules/flask-wtf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage, flask, wtforms, nose }: +{ lib, stdenv, fetchPypi, buildPythonPackage, flask, wtforms, nose }: buildPythonPackage rec { pname = "Flask-WTF"; @@ -13,7 +13,7 @@ buildPythonPackage rec { doCheck = false; # requires external service - meta = with stdenv.lib; { + meta = with lib; { description = "Simple integration of Flask and WTForms."; license = licenses.bsd3; maintainers = [ maintainers.mic92 ]; diff --git a/pkgs/development/python-modules/flask/default.nix b/pkgs/development/python-modules/flask/default.nix index bbac89406fc3..d121b4e32c8b 100644 --- a/pkgs/development/python-modules/flask/default.nix +++ b/pkgs/development/python-modules/flask/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ lib, stdenv, buildPythonPackage, fetchPypi , itsdangerous, click, werkzeug, jinja2, pytest }: buildPythonPackage rec { @@ -20,7 +20,7 @@ buildPythonPackage rec { # Tests require extra dependencies doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://flask.pocoo.org/"; description = "A microframework based on Werkzeug, Jinja 2, and good intentions"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/flaskbabel/default.nix b/pkgs/development/python-modules/flaskbabel/default.nix index 2956e2036c9d..eef31359f504 100644 --- a/pkgs/development/python-modules/flaskbabel/default.nix +++ b/pkgs/development/python-modules/flaskbabel/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , flask @@ -19,7 +19,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ flask jinja2 speaklater Babel pytz ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Adds i18n/l10n support to Flask applications"; homepage = "https://github.com/mitsuhiko/flask-babel"; license = licenses.bsd0; diff --git a/pkgs/development/python-modules/flatbuffers/default.nix b/pkgs/development/python-modules/flatbuffers/default.nix index 065808dfe6ef..d06ea28b3344 100644 --- a/pkgs/development/python-modules/flatbuffers/default.nix +++ b/pkgs/development/python-modules/flatbuffers/default.nix @@ -8,6 +8,10 @@ buildPythonPackage rec { sourceRoot = "source/python"; + # flatbuffers needs VERSION environment variable for setting the correct + # version, otherwise it uses the current date. + VERSION = "${version}"; + pythonImportsCheck = [ "flatbuffers" ]; meta = flatbuffers.meta // { diff --git a/pkgs/development/python-modules/flower/default.nix b/pkgs/development/python-modules/flower/default.nix index b31cbc7424d9..605d08d1258e 100644 --- a/pkgs/development/python-modules/flower/default.nix +++ b/pkgs/development/python-modules/flower/default.nix @@ -22,6 +22,7 @@ buildPythonPackage rec { # rely on using example programs (flowers/examples/tasks.py) which # are not part of the distribution rm tests/load.py + substituteInPlace requirements/default.txt --replace "prometheus_client==0.8.0" "prometheus_client>=0.8.0" ''; propagatedBuildInputs = [ @@ -39,5 +40,6 @@ buildPythonPackage rec { homepage = "https://github.com/mher/flower"; license = licenses.bsdOriginal; maintainers = [ maintainers.arnoldfarkas ]; + broken = (celery.version == "5.0.2"); # currently broken with celery>=5.0 by https://github.com/mher/flower/pull/1021 }; } diff --git a/pkgs/development/python-modules/flowlogs_reader/default.nix b/pkgs/development/python-modules/flowlogs_reader/default.nix index 717e3a3291b6..1a6591040a2e 100644 --- a/pkgs/development/python-modules/flowlogs_reader/default.nix +++ b/pkgs/development/python-modules/flowlogs_reader/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , isPy27 @@ -22,7 +22,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ botocore boto3 docutils ]; buildInputs = [ unittest2 mock ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Python library to make retrieving Amazon VPC Flow Logs from CloudWatch Logs a bit easier"; homepage = "https://github.com/obsrvbl/flowlogs-reader"; maintainers = with maintainers; [ cransom ]; diff --git a/pkgs/development/python-modules/flufl/i18n.nix b/pkgs/development/python-modules/flufl/i18n.nix index b980449661ee..8b0c98635507 100644 --- a/pkgs/development/python-modules/flufl/i18n.nix +++ b/pkgs/development/python-modules/flufl/i18n.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "flufl.i18n"; - version = "3.1.3"; + version = "3.1.4"; propagatedBuildInputs = [ atpublic ]; @@ -12,6 +12,6 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "dcca738be27f2c43ddf6f9307667a17478353190071f38a9f92c9af8d2252ba4"; + sha256 = "e19036292a825a69f0e0a87566d1628830c69eecd3b0295d22f582039477a6bb"; }; } diff --git a/pkgs/development/python-modules/flup/default.nix b/pkgs/development/python-modules/flup/default.nix index a6ef4d421df3..52ac5da27aa1 100644 --- a/pkgs/development/python-modules/flup/default.nix +++ b/pkgs/development/python-modules/flup/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , isPy3k , fetchPypi @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "5eb09f26eb0751f8380d8ac43d1dfb20e1d42eca0fa45ea9289fa532a79cd159"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.saddi.com/software/flup/"; description = "FastCGI Python module set"; license = licenses.bsd0; diff --git a/pkgs/development/python-modules/flux-led/default.nix b/pkgs/development/python-modules/flux-led/default.nix index 1cbfca78462f..ddec811e21ce 100644 --- a/pkgs/development/python-modules/flux-led/default.nix +++ b/pkgs/development/python-modules/flux-led/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub +{ lib, stdenv, buildPythonPackage, fetchFromGitHub , aiohttp, zigpy , pytest, isPy27 }: @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "1zgajlkhclyrqhkmivna4ha2lyvfpk5929s042gy59p7mzpkvjx7"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A Python library to communicate with the flux_led smart bulbs"; homepage = "https://github.com/Danielhiversen/flux_led"; license = licenses.lgpl3; diff --git a/pkgs/development/python-modules/folium/default.nix b/pkgs/development/python-modules/folium/default.nix index 800ece5261da..c0adaeaa5589 100644 --- a/pkgs/development/python-modules/folium/default.nix +++ b/pkgs/development/python-modules/folium/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "folium"; - version = "0.11.0"; + version = "0.12.0"; src = fetchPypi { inherit pname version; - sha256 = "540789abc21872469e52c59ac3962c61259a8df557feadd6514eb23eb0a64ca7"; + sha256 = "d45ace0a813ae65f202ce0356eb29c40a5e8fde071e4d6b5be0a89587ebaeab2"; }; disabled = pythonOlder "3.5"; diff --git a/pkgs/development/python-modules/foolscap/default.nix b/pkgs/development/python-modules/foolscap/default.nix index 0c5a0fff79d2..396bef6d009e 100644 --- a/pkgs/development/python-modules/foolscap/default.nix +++ b/pkgs/development/python-modules/foolscap/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , mock @@ -24,7 +24,7 @@ buildPythonPackage rec { # trial foolscap ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://foolscap.lothar.com/"; description = "Foolscap, an RPC protocol for Python that follows the distributed object-capability model"; longDescription = '' diff --git a/pkgs/development/python-modules/forbiddenfruit/default.nix b/pkgs/development/python-modules/forbiddenfruit/default.nix index 75b4fdef3378..64713d96adea 100644 --- a/pkgs/development/python-modules/forbiddenfruit/default.nix +++ b/pkgs/development/python-modules/forbiddenfruit/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , nose @@ -20,7 +20,7 @@ buildPythonPackage rec { nosetests ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Patch python built-in objects"; homepage = "https://pypi.python.org/pypi/forbiddenfruit"; license = licenses.mit; diff --git a/pkgs/development/python-modules/foxdot/default.nix b/pkgs/development/python-modules/foxdot/default.nix index cc9ad87052b0..d60c1e89900a 100644 --- a/pkgs/development/python-modules/foxdot/default.nix +++ b/pkgs/development/python-modules/foxdot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, tkinter, supercollider }: +{ lib, stdenv, buildPythonPackage, fetchPypi, tkinter, supercollider }: buildPythonPackage rec { pname = "FoxDot"; @@ -14,7 +14,7 @@ buildPythonPackage rec { # Requires a running SuperCollider instance doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Live coding music with SuperCollider"; homepage = "https://foxdot.org/"; license = licenses.cc-by-sa-40; diff --git a/pkgs/development/python-modules/freezegun/0.3.nix b/pkgs/development/python-modules/freezegun/0.3.nix index 219fc180b225..9dc88596f267 100644 --- a/pkgs/development/python-modules/freezegun/0.3.nix +++ b/pkgs/development/python-modules/freezegun/0.3.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , isPy27 @@ -23,7 +23,7 @@ buildPythonPackage rec { # contains python3 specific code doCheck = !isPy27; - meta = with stdenv.lib; { + meta = with lib; { description = "FreezeGun: Let your Python tests travel through time"; homepage = "https://github.com/spulec/freezegun"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/freezegun/default.nix b/pkgs/development/python-modules/freezegun/default.nix index 743b041775f0..f1b1d9738d72 100644 --- a/pkgs/development/python-modules/freezegun/default.nix +++ b/pkgs/development/python-modules/freezegun/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , pythonOlder , fetchPypi @@ -25,7 +25,7 @@ buildPythonPackage rec { # contains python3 specific code doCheck = !isPy27; - meta = with stdenv.lib; { + meta = with lib; { description = "FreezeGun: Let your Python tests travel through time"; homepage = "https://github.com/spulec/freezegun"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/fritzconnection/default.nix b/pkgs/development/python-modules/fritzconnection/default.nix index d55941bd5b47..05999d8da79f 100644 --- a/pkgs/development/python-modules/fritzconnection/default.nix +++ b/pkgs/development/python-modules/fritzconnection/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, pythonOlder, fetchFromGitHub, pytest, requests }: +{ lib, stdenv, buildPythonPackage, pythonOlder, fetchFromGitHub, pytest, requests }: buildPythonPackage rec { pname = "fritzconnection"; @@ -29,7 +29,7 @@ buildPythonPackage rec { pytest ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Python-Tool to communicate with the AVM FritzBox using the TR-064 protocol"; homepage = "https://bitbucket.org/kbr/fritzconnection"; license = licenses.mit; diff --git a/pkgs/development/python-modules/frozendict/default.nix b/pkgs/development/python-modules/frozendict/default.nix index 583dad1b014d..dd0c99298265 100644 --- a/pkgs/development/python-modules/frozendict/default.nix +++ b/pkgs/development/python-modules/frozendict/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi }: +{ lib, stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "frozendict"; @@ -12,7 +12,7 @@ buildPythonPackage rec { # frozendict does not come with tests doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/slezica/python-frozendict"; description = "An immutable dictionary"; license = licenses.mit; diff --git a/pkgs/development/python-modules/ftfy/default.nix b/pkgs/development/python-modules/ftfy/default.nix index a781230a9193..63342c7045d0 100644 --- a/pkgs/development/python-modules/ftfy/default.nix +++ b/pkgs/development/python-modules/ftfy/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , isPy3k , fetchPypi @@ -34,7 +34,7 @@ buildPythonPackage rec { PATH=$out/bin:$PATH pytest ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Given Unicode text, make its representation consistent and possibly less broken"; homepage = "https://github.com/LuminosoInsight/python-ftfy"; license = licenses.mit; diff --git a/pkgs/development/python-modules/fudge/default.nix b/pkgs/development/python-modules/fudge/default.nix index 16656fb19a74..3f53b66d1efa 100644 --- a/pkgs/development/python-modules/fudge/default.nix +++ b/pkgs/development/python-modules/fudge/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , nose @@ -21,7 +21,7 @@ buildPythonPackage rec { nosetests -v ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/fudge-py/fudge"; description = "Replace real objects with fakes (mocks, stubs, etc) while testing"; license = licenses.mit; diff --git a/pkgs/development/python-modules/funcparserlib/default.nix b/pkgs/development/python-modules/funcparserlib/default.nix index 3a9503419ecd..773ed1dccd67 100644 --- a/pkgs/development/python-modules/funcparserlib/default.nix +++ b/pkgs/development/python-modules/funcparserlib/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , python @@ -21,7 +21,7 @@ buildPythonPackage rec { # Tests are Python 2.x only judging from SyntaxError doCheck = !(isPy3k); - meta = with stdenv.lib; { + meta = with lib; { description = "Recursive descent parsing library based on functional combinators"; homepage = "https://github.com/vlasovskikh/funcparserlib"; license = licenses.mit; diff --git a/pkgs/development/python-modules/funcsigs/default.nix b/pkgs/development/python-modules/funcsigs/default.nix index 1febf9d356eb..aaa49254eccb 100644 --- a/pkgs/development/python-modules/funcsigs/default.nix +++ b/pkgs/development/python-modules/funcsigs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ lib, stdenv, buildPythonPackage, fetchPypi , isPyPy, isPy3k, unittest2 }: @@ -16,7 +16,7 @@ buildPythonPackage rec { # https://github.com/testing-cabal/funcsigs/issues/10 patches = stdenv.lib.optional (isPyPy && isPy3k) [ ./fix-pypy3-tests.patch ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Python function signatures from PEP362 for Python 2.6, 2.7 and 3.2+"; homepage = "https://github.com/aliles/funcsigs"; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/python-modules/functools32/default.nix b/pkgs/development/python-modules/functools32/default.nix index fea79db3d05b..cec9da423958 100644 --- a/pkgs/development/python-modules/functools32/default.nix +++ b/pkgs/development/python-modules/functools32/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , isPy3k @@ -13,7 +13,7 @@ if isPy3k then null else buildPythonPackage rec { sha256 = "0v8ya0b58x47wp216n1zamimv4iw57cxz3xxhzix52jkw3xks9gn"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "This is a backport of the functools standard library module from"; homepage = "https://github.com/MiCHiLU/python-functools32"; license = licenses.psfl; diff --git a/pkgs/development/python-modules/funcy/default.nix b/pkgs/development/python-modules/funcy/default.nix index 96b12e631abf..3db08cf22bbd 100644 --- a/pkgs/development/python-modules/funcy/default.nix +++ b/pkgs/development/python-modules/funcy/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi }: @@ -15,7 +15,7 @@ buildPythonPackage rec { # No tests doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Collection of fancy functional tools focused on practicality"; homepage = "https://funcy.readthedocs.org/"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/furl/default.nix b/pkgs/development/python-modules/furl/default.nix index 5893e5a6b941..b7592885007e 100644 --- a/pkgs/development/python-modules/furl/default.nix +++ b/pkgs/development/python-modules/furl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, flake8, six, orderedmultidict, pytest }: +{ lib, stdenv, buildPythonPackage, fetchPypi, flake8, six, orderedmultidict, pytest }: buildPythonPackage rec { pname = "furl"; @@ -18,7 +18,7 @@ buildPythonPackage rec { pytest -k 'not join' ''; - meta = with stdenv.lib; { + meta = with lib; { description = "furl is a small Python library that makes parsing and manipulating URLs easy"; homepage = "https://github.com/gruns/furl"; license = licenses.unlicense; diff --git a/pkgs/development/python-modules/fuse-python/default.nix b/pkgs/development/python-modules/fuse-python/default.nix index ab87f57be395..01ab12b1ab51 100644 --- a/pkgs/development/python-modules/fuse-python/default.nix +++ b/pkgs/development/python-modules/fuse-python/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, pkgconfig, fuse }: +{ lib, stdenv, buildPythonPackage, fetchPypi, pkgconfig, fuse }: buildPythonPackage rec { pname = "fuse-python"; @@ -15,7 +15,7 @@ buildPythonPackage rec { # no tests in the Pypi archive doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Python bindings for FUSE"; homepage = "https://github.com/libfuse/python-fuse"; license = licenses.lgpl21; diff --git a/pkgs/development/python-modules/fusepy/default.nix b/pkgs/development/python-modules/fusepy/default.nix index 57355126dde2..858d3e13ea0c 100644 --- a/pkgs/development/python-modules/fusepy/default.nix +++ b/pkgs/development/python-modules/fusepy/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , pkgs @@ -23,7 +23,7 @@ buildPythonPackage rec { "find_library('fuse')" "'${pkgs.fuse}/lib/libfuse.so'" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Simple ctypes bindings for FUSE"; longDescription = '' Python module that provides a simple interface to FUSE and MacFUSE. diff --git a/pkgs/development/python-modules/fuzzywuzzy/default.nix b/pkgs/development/python-modules/fuzzywuzzy/default.nix index 8baec8c1089a..c2d16a559842 100644 --- a/pkgs/development/python-modules/fuzzywuzzy/default.nix +++ b/pkgs/development/python-modules/fuzzywuzzy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, python-Levenshtein, pycodestyle, hypothesis, pytest }: +{ lib, stdenv, buildPythonPackage, fetchPypi, python-Levenshtein, pycodestyle, hypothesis, pytest }: buildPythonPackage rec { pname = "fuzzywuzzy"; @@ -12,7 +12,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ python-Levenshtein ]; checkInputs = [ pycodestyle hypothesis pytest ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Fuzzy string matching for Python"; homepage = "https://github.com/seatgeek/fuzzywuzzy"; license = licenses.gpl2; diff --git a/pkgs/development/python-modules/gast/default.nix b/pkgs/development/python-modules/gast/default.nix index 49687ebe3184..e4dbe43ef8d7 100644 --- a/pkgs/development/python-modules/gast/default.nix +++ b/pkgs/development/python-modules/gast/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage, astunparse }: +{ lib, stdenv, fetchPypi, buildPythonPackage, astunparse }: buildPythonPackage rec { pname = "gast"; @@ -8,7 +8,7 @@ buildPythonPackage rec { sha256 = "40feb7b8b8434785585ab224d1568b857edb18297e5a3047f1ba012bc83b42c1"; }; checkInputs = [ astunparse ] ; - meta = with stdenv.lib; { + meta = with lib; { description = "GAST provides a compatibility layer between the AST of various Python versions, as produced by ast.parse from the standard ast module."; license = licenses.bsd3; maintainers = with maintainers; [ jyp ]; diff --git a/pkgs/development/python-modules/gateone/default.nix b/pkgs/development/python-modules/gateone/default.nix index 372cdae8c233..981cbbb7e8c3 100644 --- a/pkgs/development/python-modules/gateone/default.nix +++ b/pkgs/development/python-modules/gateone/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , tornado , futures @@ -25,7 +25,7 @@ buildPythonPackage { cp -R "$out/gateone/"* $out/lib/python2.7/site-packages/gateone ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://liftoffsoftware.com/"; description = "GateOne is a web-based terminal emulator and SSH client"; maintainers = with maintainers; [ tomberek ]; diff --git a/pkgs/development/python-modules/gcovr/default.nix b/pkgs/development/python-modules/gcovr/default.nix index 774b2087d8fd..bedb7f3a3755 100644 --- a/pkgs/development/python-modules/gcovr/default.nix +++ b/pkgs/development/python-modules/gcovr/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , jinja2 @@ -30,7 +30,7 @@ buildPythonPackage rec { "gcovr.configuration" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A Python script for summarizing gcov data"; license = licenses.bsd0; homepage = "https://www.gcovr.com/"; diff --git a/pkgs/development/python-modules/gdata/default.nix b/pkgs/development/python-modules/gdata/default.nix index 182fdc402a64..bf9c01c250ab 100644 --- a/pkgs/development/python-modules/gdata/default.nix +++ b/pkgs/development/python-modules/gdata/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchurl }: @@ -15,7 +15,7 @@ buildPythonPackage rec { # Fails with "error: invalid command 'test'" doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/google/gdata-python-client"; description = "Python client library for Google data APIs"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/gdrivefs/default.nix b/pkgs/development/python-modules/gdrivefs/default.nix index 24b788f2c6d7..aab5efea97de 100644 --- a/pkgs/development/python-modules/gdrivefs/default.nix +++ b/pkgs/development/python-modules/gdrivefs/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchurl , isPy3k @@ -29,7 +29,7 @@ buildPythonPackage rec { --replace "==" ">=" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Mount Google Drive as a local file system"; longDescription = '' GDriveFS is a FUSE wrapper for Google Drive developed. Design goals: diff --git a/pkgs/development/python-modules/geeknote/default.nix b/pkgs/development/python-modules/geeknote/default.nix index cacc832486e2..4eb209a8af7f 100644 --- a/pkgs/development/python-modules/geeknote/default.nix +++ b/pkgs/development/python-modules/geeknote/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchFromGitHub , isPy27 @@ -28,7 +28,7 @@ buildPythonPackage { propagatedBuildInputs = [ thrift beautifulsoup4 markdown2 sqlalchemy html2text evernote ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Work with Evernote from command line"; homepage = "http://www.geeknote.me"; license = licenses.gpl1; diff --git a/pkgs/development/python-modules/genanki/default.nix b/pkgs/development/python-modules/genanki/default.nix index bda80fe9e752..f43fdabf09e5 100644 --- a/pkgs/development/python-modules/genanki/default.nix +++ b/pkgs/development/python-modules/genanki/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy3k +{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k , cached-property, frozendict, pystache, pyyaml, pytest, pytestrunner }: @@ -29,7 +29,7 @@ buildPythonPackage rec { py.test ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/kerrickstaley/genanki"; description = "Generate Anki decks programmatically"; license = licenses.mit; diff --git a/pkgs/development/python-modules/genome-collector/default.nix b/pkgs/development/python-modules/genome-collector/default.nix new file mode 100644 index 000000000000..70589912520a --- /dev/null +++ b/pkgs/development/python-modules/genome-collector/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, appdirs +, biopython +, fetchPypi +, proglog +}: + +buildPythonPackage rec { + pname = "genome_collector"; + version = "0.1.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "0023ihrz0waxbhq28xh1ymvk51ih882y9psg4glm6s9d1zmqvdph"; + }; + + propagatedBuildInputs = [ + appdirs + biopython + proglog + ]; + + # Project hasn't released the tests yet + doCheck = false; + pythonImportsCheck = [ "genome_collector" ]; + + meta = with lib; { + description = "Genomes and build BLAST/Bowtie indexes in Python"; + homepage = "https://github.com/Edinburgh-Genome-Foundry/genome_collector"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/genshi/default.nix b/pkgs/development/python-modules/genshi/default.nix index 9e6bab6e1690..9a6e4508e30e 100644 --- a/pkgs/development/python-modules/genshi/default.nix +++ b/pkgs/development/python-modules/genshi/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , setuptools @@ -22,7 +22,7 @@ buildPythonPackage rec { setuptools six ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Python components for parsing HTML, XML and other textual content"; longDescription = '' Python library that provides an integrated set of components for diff --git a/pkgs/development/python-modules/genzshcomp/default.nix b/pkgs/development/python-modules/genzshcomp/default.nix index 5917d71c4408..8f486cc29efb 100644 --- a/pkgs/development/python-modules/genzshcomp/default.nix +++ b/pkgs/development/python-modules/genzshcomp/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , setuptools @@ -15,7 +15,7 @@ buildPythonPackage rec { buildInputs = [ setuptools ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Automatically generated zsh completion function for Python's option parser modules"; homepage = "https://bitbucket.org/hhatto/genzshcomp/"; license = licenses.bsd0; diff --git a/pkgs/development/python-modules/geoalchemy2/default.nix b/pkgs/development/python-modules/geoalchemy2/default.nix index e96c67b044db..56f9346668f6 100644 --- a/pkgs/development/python-modules/geoalchemy2/default.nix +++ b/pkgs/development/python-modules/geoalchemy2/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , sqlalchemy @@ -22,7 +22,7 @@ buildPythonPackage rec { # https://github.com/geoalchemy/geoalchemy2/blob/e05a676350b11f0e73609379dae5625c5de2e868/TEST.rst doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://geoalchemy.org/"; license = licenses.mit; description = "Toolkit for working with spatial databases"; diff --git a/pkgs/development/python-modules/geographiclib/default.nix b/pkgs/development/python-modules/geographiclib/default.nix index 0c275b672abd..98c1ee417e43 100644 --- a/pkgs/development/python-modules/geographiclib/default.nix +++ b/pkgs/development/python-modules/geographiclib/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi }: @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "0cn6ap5fkh3mkfa57l5b44z3gvz7j6lpmc9rl4g2jny2gvp4dg8j"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://geographiclib.sourceforge.io"; description = "Algorithms for geodesics (Karney, 2013) for solving the direct and inverse problems for an ellipsoid of revolution"; license = licenses.mit; diff --git a/pkgs/development/python-modules/geopandas/default.nix b/pkgs/development/python-modules/geopandas/default.nix index 200dfffa562b..70963a85d41d 100644 --- a/pkgs/development/python-modules/geopandas/default.nix +++ b/pkgs/development/python-modules/geopandas/default.nix @@ -1,6 +1,6 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, isPy27 +{ lib, stdenv, buildPythonPackage, fetchFromGitHub, isPy27 , pandas, shapely, fiona, descartes, pyproj -, pytest, Rtree, fetchpatch }: +, pytestCheckHook, Rtree, fetchpatch }: buildPythonPackage rec { pname = "geopandas"; @@ -20,14 +20,15 @@ buildPythonPackage rec { url = "https://github.com/geopandas/geopandas/pull/1544/commits/6ce868a33a2f483b071089d51e178030fa4414d0.patch"; sha256 = "1sjgxrqgbhz5krx51hrv230ywszcdl6z8q3bj6830kfad8n8b5dq"; }) + # Fix GeoJSON for Fiona>=1.8.16 (Sep. 7, 2020). + # https://github.com/geopandas/geopandas/issues/1606 + # Will be included in next upstream release after 0.8.1 + (fetchpatch { + url = "https://github.com/geopandas/geopandas/commit/72427d3d8c128039bfce1d54a76c0b652887b276.patch"; + sha256 = "1726mrpddgmba0ngff73a5bsb6ywpsg63a2pdd2grp9339bgvi4a"; + }) ]; - checkInputs = [ pytest Rtree ]; - - checkPhase = '' - py.test geopandas -m "not web" - ''; - propagatedBuildInputs = [ pandas shapely @@ -36,7 +37,12 @@ buildPythonPackage rec { pyproj ]; - meta = with stdenv.lib; { + doCheck = !stdenv.isDarwin; + checkInputs = [ pytestCheckHook Rtree ]; + disabledTests = [ "web" ]; + pytestFlagsArray = [ "geopandas" ]; + + meta = with lib; { description = "Python geospatial data analysis framework"; homepage = "https://geopandas.org"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/geopy/2.nix b/pkgs/development/python-modules/geopy/2.nix index 2863d30f4684..ae4e07e25479 100644 --- a/pkgs/development/python-modules/geopy/2.nix +++ b/pkgs/development/python-modules/geopy/2.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , isPy27 @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "0jypkaqlbyr8icqypwm23lzsvq7flakp3a3nqr8ib5fmd0fzsq7q"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/geopy/geopy"; description = "Python Geocoding Toolbox"; license = licenses.mit; diff --git a/pkgs/development/python-modules/geopy/default.nix b/pkgs/development/python-modules/geopy/default.nix index 817c1e38418e..fdf478d16103 100644 --- a/pkgs/development/python-modules/geopy/default.nix +++ b/pkgs/development/python-modules/geopy/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchFromGitHub , isPy3k @@ -21,7 +21,7 @@ buildPythonPackage rec { sha256 = "07l1pblzg3hb3dbvd9rq8x78ly5dv0zxbc5hwskqil0bhv5v1p39"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/geopy/geopy"; description = "Python Geocoding Toolbox"; license = licenses.mit; diff --git a/pkgs/development/python-modules/gevent-socketio/default.nix b/pkgs/development/python-modules/gevent-socketio/default.nix index 2b847275bed0..88d1089d5a31 100644 --- a/pkgs/development/python-modules/gevent-socketio/default.nix +++ b/pkgs/development/python-modules/gevent-socketio/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , versiontools @@ -20,7 +20,7 @@ buildPythonPackage rec { buildInputs = [ versiontools gevent-websocket mock pytest ]; propagatedBuildInputs = [ gevent ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/abourget/gevent-socketio"; description = "SocketIO server based on the Gevent pywsgi server, a Python network library"; license = licenses.bsd0; diff --git a/pkgs/development/python-modules/gevent-websocket/default.nix b/pkgs/development/python-modules/gevent-websocket/default.nix index adc13738d5ea..431a0c09a30c 100644 --- a/pkgs/development/python-modules/gevent-websocket/default.nix +++ b/pkgs/development/python-modules/gevent-websocket/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , isPy3k @@ -17,7 +17,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ gevent gunicorn ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.gitlab.com/noppo/gevent-websocket"; description = "Websocket handler for the gevent pywsgi server, a Python network library"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/gevent/default.nix b/pkgs/development/python-modules/gevent/default.nix index bf066f519065..ba80a928f255 100644 --- a/pkgs/development/python-modules/gevent/default.nix +++ b/pkgs/development/python-modules/gevent/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage, isPyPy, python, libev, greenlet +{ lib, stdenv, fetchPypi, buildPythonPackage, isPyPy, python, libev, greenlet , zope_interface }: @@ -25,7 +25,7 @@ buildPythonPackage rec { # Bunch of failures. doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Coroutine-based networking library"; homepage = "http://www.gevent.org/"; license = licenses.mit; diff --git a/pkgs/development/python-modules/geventhttpclient/default.nix b/pkgs/development/python-modules/geventhttpclient/default.nix index 55ef8c39981a..fafbef12bd3a 100644 --- a/pkgs/development/python-modules/geventhttpclient/default.nix +++ b/pkgs/development/python-modules/geventhttpclient/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , pytest @@ -26,7 +26,7 @@ buildPythonPackage rec { py.test $out ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/gwik/geventhttpclient"; description = "HTTP client library for gevent"; license = licenses.mit; diff --git a/pkgs/development/python-modules/ghdiff/default.nix b/pkgs/development/python-modules/ghdiff/default.nix index c58d63a08375..a9582648117a 100644 --- a/pkgs/development/python-modules/ghdiff/default.nix +++ b/pkgs/development/python-modules/ghdiff/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ lib, stdenv, buildPythonPackage, fetchPypi , zope_testrunner, six, chardet}: buildPythonPackage rec { @@ -13,7 +13,7 @@ buildPythonPackage rec { checkInputs = [ zope_testrunner ]; propagatedBuildInputs = [ six chardet ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/kilink/ghdiff"; license = licenses.mit; description = "Generate Github-style HTML for unified diffs."; diff --git a/pkgs/development/python-modules/gipc/default.nix b/pkgs/development/python-modules/gipc/default.nix index 04dc8b0c068d..a48547f29099 100644 --- a/pkgs/development/python-modules/gipc/default.nix +++ b/pkgs/development/python-modules/gipc/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , gevent @@ -15,7 +15,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ gevent ]; - meta = with stdenv.lib; { + meta = with lib; { description = "gevent-cooperative child processes and IPC"; longDescription = '' Usage of Python's multiprocessing package in a gevent-powered diff --git a/pkgs/development/python-modules/git-annex-adapter/default.nix b/pkgs/development/python-modules/git-annex-adapter/default.nix index e5d9910024a5..1c76e5622b8d 100644 --- a/pkgs/development/python-modules/git-annex-adapter/default.nix +++ b/pkgs/development/python-modules/git-annex-adapter/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, isPy3k, fetchFromGitHub, substituteAll +{ lib, stdenv, buildPythonPackage, isPy3k, fetchFromGitHub, substituteAll , python, util-linux, pygit2, gitMinimal, git-annex, cacert }: @@ -35,7 +35,7 @@ buildPythonPackage rec { ''; pythonImportsCheck = [ "git_annex_adapter" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/alpernebbi/git-annex-adapter"; description = "Call git-annex commands from Python"; license = licenses.gpl3Plus; diff --git a/pkgs/development/python-modules/git-sweep/default.nix b/pkgs/development/python-modules/git-sweep/default.nix index aa2a223c7774..adb9de4dbc0d 100644 --- a/pkgs/development/python-modules/git-sweep/default.nix +++ b/pkgs/development/python-modules/git-sweep/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , GitPython @@ -15,7 +15,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ GitPython ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A command-line tool that helps you clean up Git branches"; homepage = "https://github.com/arc90/git-sweep"; license = licenses.mit; diff --git a/pkgs/development/python-modules/glances-api/default.nix b/pkgs/development/python-modules/glances-api/default.nix new file mode 100644 index 000000000000..23e152c300f3 --- /dev/null +++ b/pkgs/development/python-modules/glances-api/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, aiohttp +, async-timeout +}: + +buildPythonPackage rec { + pname = "glances-api"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "home-assistant-ecosystem"; + repo = "python-glances-api"; + rev = version; + sha256 = "0rgv77n0lvr7d3vk4qc8svipxafmm6s4lfxrl976hsygrhaqidch"; + }; + + propagatedBuildInputs = [ + aiohttp + async-timeout + ]; + + # no tests are present + doCheck = false; + pythonImportsCheck = [ "glances_api" ]; + + meta = with lib; { + description = "Python Wrapper for interacting with the Volkszahler API"; + homepage = "https://github.com/home-assistant-ecosystem/python-glances-api"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/globre/default.nix b/pkgs/development/python-modules/globre/default.nix index ff2302f54678..21d2983ab015 100644 --- a/pkgs/development/python-modules/globre/default.nix +++ b/pkgs/development/python-modules/globre/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , pythonAtLeast , buildPythonPackage , fetchPypi @@ -19,7 +19,7 @@ buildPythonPackage rec { checkInputs = [ nose coverage ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/metagriffin/globre"; description = "A python glob-like regular expression generation library."; maintainers = with maintainers; [ glittershark ]; diff --git a/pkgs/development/python-modules/glom/default.nix b/pkgs/development/python-modules/glom/default.nix index cae43e59c288..2acc87a17ac4 100644 --- a/pkgs/development/python-modules/glom/default.nix +++ b/pkgs/development/python-modules/glom/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , boltons @@ -24,7 +24,7 @@ buildPythonPackage rec { # test_cli.py checks the output of running "glom" checkPhase = "PATH=$out/bin:$PATH pytest glom/test"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/mahmoud/glom"; description = "Restructuring data, the Python way"; longDescription = '' diff --git a/pkgs/development/python-modules/glymur/default.nix b/pkgs/development/python-modules/glymur/default.nix index d2721951ad78..f8a0e4632389 100644 --- a/pkgs/development/python-modules/glymur/default.nix +++ b/pkgs/development/python-modules/glymur/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchFromGitHub , numpy @@ -42,7 +42,7 @@ buildPythonPackage rec { ${python.interpreter} -m unittest discover ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Tools for accessing JPEG2000 files"; homepage = "https://github.com/quintusdias/glymur"; license = licenses.mit; diff --git a/pkgs/development/python-modules/gmpy2/default.nix b/pkgs/development/python-modules/gmpy2/default.nix index cfc481a90afb..808b918681bb 100644 --- a/pkgs/development/python-modules/gmpy2/default.nix +++ b/pkgs/development/python-modules/gmpy2/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchFromGitHub , fetchpatch @@ -27,7 +27,7 @@ buildPythonPackage { buildInputs = [ gmp mpfr libmpc ]; - meta = with stdenv.lib; { + meta = with lib; { description = "GMP/MPIR, MPFR, and MPC interface to Python 2.6+ and 3.x"; homepage = "https://github.com/aleaxit/gmpy/"; license = licenses.gpl3Plus; diff --git a/pkgs/development/python-modules/gmusicapi/default.nix b/pkgs/development/python-modules/gmusicapi/default.nix index deae0037bb2d..821e0ba0afa9 100644 --- a/pkgs/development/python-modules/gmusicapi/default.nix +++ b/pkgs/development/python-modules/gmusicapi/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , validictory @@ -29,7 +29,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ validictory decorator mutagen protobuf setuptools requests dateutil proboscis mock appdirs oauth2client pyopenssl gpsoauth MechanicalSoup future ]; - meta = with stdenv.lib; { + meta = with lib; { description = "An unofficial API for Google Play Music"; homepage = "https://pypi.python.org/pypi/gmusicapi/"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/gnureadline/default.nix b/pkgs/development/python-modules/gnureadline/default.nix index 3b9263258584..71116c37041b 100644 --- a/pkgs/development/python-modules/gnureadline/default.nix +++ b/pkgs/development/python-modules/gnureadline/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , isPyPy @@ -20,7 +20,7 @@ buildPythonPackage rec { substituteInPlace setup.py --replace "/bin/bash" "${pkgs.bash}/bin/bash" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "The standard Python readline extension statically linked against the GNU readline library"; homepage = "https://github.com/ludwigschwardt/python-gnureadline"; license = licenses.gpl3; diff --git a/pkgs/development/python-modules/gnutls/default.nix b/pkgs/development/python-modules/gnutls/default.nix index f26791fdbe96..addbee81bd3f 100644 --- a/pkgs/development/python-modules/gnutls/default.nix +++ b/pkgs/development/python-modules/gnutls/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , isPy3k @@ -22,7 +22,7 @@ buildPythonPackage rec { substituteInPlace gnutls/library/__init__.py --replace "/usr/local/lib" "${pkgs.gnutls.out}/lib" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Python wrapper for the GnuTLS library"; homepage = "https://github.com/AGProjects/python-gnutls"; license = licenses.lgpl2; diff --git a/pkgs/development/python-modules/goobook/default.nix b/pkgs/development/python-modules/goobook/default.nix index a3d327275157..c587c928e7e7 100644 --- a/pkgs/development/python-modules/goobook/default.nix +++ b/pkgs/development/python-modules/goobook/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy3k +{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k , docutils, installShellFiles , google_api_python_client, simplejson, oauth2client, setuptools, xdg }: @@ -27,7 +27,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "goobook" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Access your Google contacts from the command line"; longDescription = '' The purpose of GooBook is to make it possible to use your Google Contacts diff --git a/pkgs/development/python-modules/goocalendar/default.nix b/pkgs/development/python-modules/goocalendar/default.nix index 441fdc85bac2..46bafa43388b 100644 --- a/pkgs/development/python-modules/goocalendar/default.nix +++ b/pkgs/development/python-modules/goocalendar/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchPypi , buildPythonPackage , pkgconfig @@ -40,7 +40,7 @@ buildPythonPackage rec { # No upstream tests available doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "A calendar widget for GTK using PyGoocanvas."; homepage = "https://goocalendar.tryton.org/"; license = licenses.gpl2; diff --git a/pkgs/development/python-modules/google_api_core/default.nix b/pkgs/development/python-modules/google-api-core/default.nix similarity index 52% rename from pkgs/development/python-modules/google_api_core/default.nix rename to pkgs/development/python-modules/google-api-core/default.nix index efe74d478848..6715590dc329 100644 --- a/pkgs/development/python-modules/google_api_core/default.nix +++ b/pkgs/development/python-modules/google-api-core/default.nix @@ -1,27 +1,44 @@ -{ lib, buildPythonPackage, fetchPypi, pythonOlder, google_auth, protobuf -, googleapis_common_protos, requests, grpcio, mock, pytest, pytest-asyncio, pytestCheckHook }: +{ lib +, buildPythonPackage +, fetchPypi +, google-auth +, googleapis_common_protos +, grpcio +, protobuf +, pytz +, requests +, mock +, pytest +, pytest-asyncio +, pytestCheckHook +}: buildPythonPackage rec { pname = "google-api-core"; - version = "1.23.0"; - disabled = pythonOlder "3.5"; + version = "1.24.1"; src = fetchPypi { inherit pname version; - sha256 = "1bb3c485c38eacded8d685b1759968f6cf47dd9432922d34edb90359eaa391e2"; + sha256 = "0sflnpgsvk2h1cr1m3mgxx6pzz55xw7sk4y4qdimhs5jdm2fw78g"; }; - propagatedBuildInputs = - [ googleapis_common_protos protobuf google_auth requests grpcio ]; + propagatedBuildInputs = [ + googleapis_common_protos + google-auth + grpcio + protobuf + pytz + requests + ]; - checkInputs = [ google_auth mock protobuf pytest-asyncio pytestCheckHook ]; + checkInputs = [ mock pytest-asyncio pytestCheckHook ]; # prevent google directory from shadowing google imports preCheck = '' rm -r google ''; - pythonImportsCheck = [ "google.auth" "google.protobuf" "google.api" ]; + pythonImportsCheck = [ "google.api_core" ]; meta = with lib; { description = "Core Library for Google Client Libraries"; @@ -33,6 +50,6 @@ buildPythonPackage rec { changelog = "https://github.com/googleapis/python-api-core/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } 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 b14276b0a1a2..854ec37a1e4a 100644 --- a/pkgs/development/python-modules/google-api-python-client/default.nix +++ b/pkgs/development/python-modules/google-api-python-client/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchPypi -, google_auth, google-auth-httplib2, google_api_core -, httplib2, six, uritemplate, oauth2client }: +, google-auth, google-auth-httplib2, google-api-core +, httplib2, six, uritemplate, oauth2client, setuptools }: buildPythonPackage rec { pname = "google-api-python-client"; @@ -15,8 +15,12 @@ buildPythonPackage rec { doCheck = false; propagatedBuildInputs = [ - google_auth google-auth-httplib2 google_api_core - httplib2 six uritemplate oauth2client + google-auth google-auth-httplib2 google-api-core + httplib2 six uritemplate oauth2client setuptools + ]; + + pythonImportsCheck = [ + "googleapiclient" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/google_apputils/default.nix b/pkgs/development/python-modules/google-apputils/default.nix similarity index 77% rename from pkgs/development/python-modules/google_apputils/default.nix rename to pkgs/development/python-modules/google-apputils/default.nix index c7b386623ef8..7cc7f4858826 100644 --- a/pkgs/development/python-modules/google_apputils/default.nix +++ b/pkgs/development/python-modules/google-apputils/default.nix @@ -1,6 +1,7 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi +, isPy3k , pytz , gflags , dateutil @@ -11,10 +12,11 @@ buildPythonPackage rec { pname = "google-apputils"; version = "0.4.2"; + disabled = isPy3k; src = fetchPypi { inherit pname version; - sha256 = "47959d0651c32102c10ad919b8a0ffe0ae85f44b8457ddcf2bdc0358fb03dc29"; + sha256 = "0afw0gxmh0yw5g7xsmw49gs8bbp0zyhbh6fr1b0h48f3a439v5a7"; }; preConfigure = '' @@ -30,10 +32,10 @@ buildPythonPackage rec { # ERROR:root:Trying to access flag test_tmpdir before flags were parsed. doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Google Application Utilities for Python"; homepage = "https://github.com/google/google-apputils"; license = licenses.asl20; + maintainers = with maintainers; [ SuperSandro2000 ]; }; - } diff --git a/pkgs/development/python-modules/google-auth-httplib2/default.nix b/pkgs/development/python-modules/google-auth-httplib2/default.nix index ff5aa3b2bac7..bb7836ef85d1 100644 --- a/pkgs/development/python-modules/google-auth-httplib2/default.nix +++ b/pkgs/development/python-modules/google-auth-httplib2/default.nix @@ -3,13 +3,11 @@ , buildPythonPackage , fetchPypi , flask -, mock -, six -, pytest -, pytest-localserver -, google_auth +, google-auth , httplib2 - +, mock +, pytestCheckHook +, pytest-localserver }: buildPythonPackage rec { @@ -18,28 +16,25 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "8d092cc60fb16517b12057ec0bba9185a96e3b7169d86ae12eae98e645b7bc39"; + sha256 = "0fdwnx2yd65f5vhnmn39f4xnxac5j6x0pv2p42qifrdi1z32q2cd"; }; - checkInputs = [ - flask mock six pytest pytest-localserver - ]; - propagatedBuildInputs = [ - google_auth httplib2 + google-auth + httplib2 ]; - checkPhase = '' - py.test - ''; + checkInputs = [ + flask + mock + pytestCheckHook + pytest-localserver + ]; - # ImportError: No module named google.auth - doCheck = isPy3k; - - meta = { + meta = with lib; { description = "Google Authentication Library: httplib2 transport"; homepage = "https://github.com/GoogleCloudPlatform/google-auth-library-python-httplib2"; - license = lib.licenses.asl20; + license = licenses.asl20; + maintainers = with maintainers; [ SuperSandro2000 ]; }; - } diff --git a/pkgs/development/python-modules/google-auth-oauthlib/default.nix b/pkgs/development/python-modules/google-auth-oauthlib/default.nix index bdea58de8999..7fa7200fbbe5 100644 --- a/pkgs/development/python-modules/google-auth-oauthlib/default.nix +++ b/pkgs/development/python-modules/google-auth-oauthlib/default.nix @@ -1,44 +1,37 @@ { lib , buildPythonPackage , fetchPypi -, pythonOlder -, isPy3k , click , mock -, pytest -, futures -, google_auth +, pytestCheckHook +, google-auth , requests_oauthlib }: buildPythonPackage rec { pname = "google-auth-oauthlib"; version = "0.4.2"; - disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "65b65bc39ad8cab15039b35e5898455d3d66296d0584d96fe0e79d67d04c51d9"; + sha256 = "1nai9k86g7g7w1pxk105dllncgax8nc5hpmk758b3jnqkb1mpdk5"; }; - checkInputs = [ - click mock pytest - ] ++ lib.optionals (!isPy3k) [ futures ]; - propagatedBuildInputs = [ - google_auth requests_oauthlib + google-auth + requests_oauthlib ]; - doCheck = isPy3k; - checkPhase = '' - rm -fr tests/__pycache__/ google - py.test - ''; + checkInputs = [ + click + mock + pytestCheckHook + ]; meta = with lib; { description = "Google Authentication Library: oauthlib integration"; homepage = "https://github.com/GoogleCloudPlatform/google-auth-library-python-oauthlib"; license = licenses.asl20; - maintainers = with maintainers; [ terlar ]; + maintainers = with maintainers; [ SuperSandro2000 terlar ]; }; } diff --git a/pkgs/development/python-modules/google-auth/default.nix b/pkgs/development/python-modules/google-auth/default.nix new file mode 100644 index 000000000000..9120f93a3bdd --- /dev/null +++ b/pkgs/development/python-modules/google-auth/default.nix @@ -0,0 +1,54 @@ +{ lib, stdenv +, buildPythonPackage +, fetchpatch +, fetchPypi +, pytestCheckHook +, cachetools +, flask +, freezegun +, mock +, oauth2client +, pyasn1-modules +, pytest-localserver +, responses +, rsa +}: + +buildPythonPackage rec { + pname = "google-auth"; + version = "1.24.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0bmdqkyv8k8n6s8dss4zpbcq1cdxwicpb42kwybd02ia85mh43hb"; + }; + + propagatedBuildInputs = [ pyasn1-modules cachetools rsa ]; + + checkInputs = [ + flask + freezegun + mock + oauth2client + pytestCheckHook + pytest-localserver + responses + ]; + + pythonImportsCheck = [ + "google.auth" + "google.oauth2" + ]; + + meta = with lib; { + description = "Google Auth Python Library"; + longDescription = '' + This library simplifies using Google’s various server-to-server + authentication mechanisms to access Google APIs. + ''; + homepage = "https://github.com/googleapis/google-auth-library-python"; + changelog = "https://github.com/googleapis/google-auth-library-python/blob/v${version}/CHANGELOG.md"; + license = licenses.asl20; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix b/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix index 01f7bc9ce33e..3f614258a8fb 100644 --- a/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix +++ b/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, pythonOlder, google_api_core }: +{ lib, buildPythonPackage, fetchPypi, pythonOlder, google-api-core }: buildPythonPackage rec { pname = "google-cloud-access-context-manager"; @@ -9,19 +9,19 @@ buildPythonPackage rec { sha256 = "1qy7wv1xn7g3x5z0vvv0pwmxhin4hw2m9fs9iklnghy00vg37v0b"; }; - disabled = pythonOlder "3.5"; - - propagatedBuildInputs = [ google_api_core ]; + propagatedBuildInputs = [ google-api-core ]; # No tests in repo doCheck = false; - pythonImportsCheck = [ "google.identity.accesscontextmanager" ]; + pythonImportsCheck = [ + "google.identity.accesscontextmanager" + ]; meta = with lib; { description = "Protobufs for Google Access Context Manager."; homepage = "https://github.com/googleapis/python-access-context-manager"; license = licenses.asl20; - maintainers = with maintainers; [ austinbutler ]; + maintainers = with maintainers; [ austinbutler SuperSandro2000 ]; }; } diff --git a/pkgs/development/python-modules/google-cloud-asset/default.nix b/pkgs/development/python-modules/google-cloud-asset/default.nix new file mode 100644 index 000000000000..8f04fb7451d2 --- /dev/null +++ b/pkgs/development/python-modules/google-cloud-asset/default.nix @@ -0,0 +1,54 @@ +{ lib, stdenv +, buildPythonPackage +, fetchPypi +, grpc_google_iam_v1 +, google-api-core +, google-cloud-access-context-manager +, google-cloud-org-policy +, google-cloud-os-config +, google-cloud-testutils +, libcst +, proto-plus +, pytest +, pytest-asyncio +, pytestCheckHook +, mock +}: + +buildPythonPackage rec { + pname = "google-cloud-asset"; + version = "2.2.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "05q0yaw6b553qmzylr45zin17h8mvi8yyyxhbv3cxa7f0ahviw8w"; + }; + + propagatedBuildInputs = [ + grpc_google_iam_v1 + google-api-core + google-cloud-access-context-manager + google-cloud-org-policy + google-cloud-os-config + libcst + proto-plus + ]; + + checkInputs = [ google-cloud-testutils mock pytest-asyncio pytestCheckHook ]; + + pythonImportsCheck = [ + "google.cloud.asset" + "google.cloud.asset_v1" + "google.cloud.asset_v1p1beta1" + "google.cloud.asset_v1p2beta1" + "google.cloud.asset_v1p4beta1" + "google.cloud.asset_v1p5beta1" + ]; + + meta = with lib; { + description = "Python Client for Google Cloud Asset API"; + homepage = "https://github.com/googleapis/python-asset"; + license = licenses.asl20; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/development/python-modules/google-cloud-automl/default.nix b/pkgs/development/python-modules/google-cloud-automl/default.nix new file mode 100644 index 000000000000..302ce8ceaed3 --- /dev/null +++ b/pkgs/development/python-modules/google-cloud-automl/default.nix @@ -0,0 +1,59 @@ +{ lib, stdenv +, buildPythonPackage +, fetchPypi +, pytestCheckHook +, libcst +, google-api-core +, google-cloud-storage +, google-cloud-testutils +, pandas +, proto-plus +, pytest-asyncio +, mock +}: + +buildPythonPackage rec { + pname = "google-cloud-automl"; + version = "2.1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "520dfe2ee04d28f3088c9c582fa2a534fc272647d5e2e59acc903c0152e61696"; + }; + + propagatedBuildInputs = [ google-api-core libcst proto-plus ]; + + checkInputs = [ + google-cloud-storage + google-cloud-testutils + mock + pandas + pytest-asyncio + pytestCheckHook + ]; + + preCheck = '' + # do not shadow imports + rm -r google + # requires credentials + rm tests/system/gapic/v1beta1/test_system_tables_client_v1.py + ''; + + disabledTests = [ + # requires credentials + "test_prediction_client_client_info" + ]; + + pythonImportsCheck = [ + "google.cloud.automl" + "google.cloud.automl_v1" + "google.cloud.automl_v1beta1" + ]; + + meta = with lib; { + description = "Cloud AutoML API client library"; + homepage = "https://github.com/googleapis/python-automl"; + license = licenses.asl20; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix b/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix new file mode 100644 index 000000000000..4ec12a8fa2fb --- /dev/null +++ b/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix @@ -0,0 +1,35 @@ +{ lib, stdenv +, buildPythonPackage +, fetchPypi +, google-api-core +, libcst +, proto-plus +, pytestCheckHook +, pytest-asyncio +, mock +}: + +buildPythonPackage rec { + pname = "google-cloud-bigquery-datatransfer"; + version = "3.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0hmsqvs2srmqcwmli48vd5vw829zax3pwj63fsxig6sdhjlf6j7j"; + }; + + propagatedBuildInputs = [ google-api-core libcst proto-plus ]; + checkInputs = [ mock pytestCheckHook pytest-asyncio ]; + + pythonImportsCheck = [ + "google.cloud.bigquery_datatransfer" + "google.cloud.bigquery_datatransfer_v1" + ]; + + meta = with lib; { + description = "BigQuery Data Transfer API client library"; + homepage = "https://github.com/googleapis/python-bigquery-datatransfer"; + license = licenses.asl20; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/development/python-modules/google-cloud-bigquery/default.nix b/pkgs/development/python-modules/google-cloud-bigquery/default.nix new file mode 100644 index 000000000000..b8620ee8b35d --- /dev/null +++ b/pkgs/development/python-modules/google-cloud-bigquery/default.nix @@ -0,0 +1,58 @@ +{ lib, stdenv +, buildPythonPackage +, fetchPypi +, pytestCheckHook +, freezegun +, google-cloud-core +, google-cloud-testutils +, google-resumable-media +, grpcio +, ipython +, mock +, pandas +, proto-plus +, pyarrow +}: + +buildPythonPackage rec { + pname = "google-cloud-bigquery"; + version = "2.6.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "1vs4im0fixmszh6p77icys9g7fymwmkfc6va0ng9kpjv1h6gv68z"; + }; + + propagatedBuildInputs = [ + google-resumable-media + google-cloud-core + proto-plus + pyarrow + ]; + + checkInputs = [ + freezegun + google-cloud-testutils + ipython + mock + pandas + pytestCheckHook + ]; + + # prevent google directory from shadowing google imports + preCheck = '' + rm -r google + ''; + + pythonImportsCheck = [ + "google.cloud.bigquery" + "google.cloud.bigquery_v2" + ]; + + meta = with lib; { + description = "Google BigQuery API client library"; + homepage = "https://github.com/googleapis/python-bigquery"; + license = licenses.asl20; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/development/python-modules/google_cloud_bigtable/default.nix b/pkgs/development/python-modules/google-cloud-bigtable/default.nix similarity index 79% rename from pkgs/development/python-modules/google_cloud_bigtable/default.nix rename to pkgs/development/python-modules/google-cloud-bigtable/default.nix index bd12aa592d50..9632dc902d15 100644 --- a/pkgs/development/python-modules/google_cloud_bigtable/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigtable/default.nix @@ -1,9 +1,9 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , grpc_google_iam_v1 -, google_api_core -, google_cloud_core +, google-api-core +, google-cloud-core , pytest , mock }: @@ -18,14 +18,14 @@ buildPythonPackage rec { }; checkInputs = [ pytest mock ]; - propagatedBuildInputs = [ grpc_google_iam_v1 google_api_core google_cloud_core ]; + propagatedBuildInputs = [ grpc_google_iam_v1 google-api-core google-cloud-core ]; checkPhase = '' rm -r google pytest tests/unit -k 'not policy' ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Google Cloud Bigtable API client library"; homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/google-cloud-container/default.nix b/pkgs/development/python-modules/google-cloud-container/default.nix new file mode 100644 index 000000000000..6d91bed83ae7 --- /dev/null +++ b/pkgs/development/python-modules/google-cloud-container/default.nix @@ -0,0 +1,43 @@ +{ lib, stdenv +, buildPythonPackage +, fetchPypi +, google-api-core +, grpc_google_iam_v1 +, libcst +, mock +, proto-plus +, pytestCheckHook +, pytest-asyncio +}: + +buildPythonPackage rec { + pname = "google-cloud-container"; + version = "2.3.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "04f9mx1wxy3l9dvzvvr579fnjp1fdqhgplv5y2gl7h2mvn281k8d"; + }; + + propagatedBuildInputs = [ google-api-core grpc_google_iam_v1 libcst proto-plus ]; + + checkInputs = [ mock pytestCheckHook pytest-asyncio ]; + + disabledTests = [ + # requires credentials + "test_list_clusters" + ]; + + pythonImportsCheck = [ + "google.cloud.container" + "google.cloud.container_v1" + "google.cloud.container_v1beta1" + ]; + + meta = with lib; { + description = "Google Container Engine API client library"; + homepage = "https://github.com/googleapis/python-container"; + license = licenses.asl20; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/development/python-modules/google_cloud_core/default.nix b/pkgs/development/python-modules/google-cloud-core/default.nix similarity index 50% rename from pkgs/development/python-modules/google_cloud_core/default.nix rename to pkgs/development/python-modules/google-cloud-core/default.nix index 1ad08ea05af4..72709c62ceca 100644 --- a/pkgs/development/python-modules/google_cloud_core/default.nix +++ b/pkgs/development/python-modules/google-cloud-core/default.nix @@ -1,31 +1,38 @@ -{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, pytestCheckHook, python -, google_api_core, grpcio, mock }: +{ lib, stdenv +, buildPythonPackage +, fetchPypi +, pythonOlder +, pytestCheckHook +, python +, google-api-core +, grpcio +, mock +}: buildPythonPackage rec { pname = "google-cloud-core"; - version = "1.4.3"; + version = "1.5.0"; src = fetchPypi { inherit pname version; - sha256 = "21afb70c1b0bce8eeb8abb5dca63c5fd37fc8aea18f4b6d60e803bd3d27e6b80"; + sha256 = "01liq4nrd2g3ingg8v0ly4c86db8agnr9h1fiz219c7fz0as0xqj"; }; - disabled = pythonOlder "3.5"; + propagatedBuildInputs = [ google-api-core ]; - propagatedBuildInputs = [ google_api_core grpcio ]; - checkInputs = [ google_api_core mock pytestCheckHook ]; - - pythonImportsCheck = [ "google.cloud" ]; + checkInputs = [ mock pytestCheckHook ]; # prevent google directory from shadowing google imports preCheck = '' rm -r google ''; - meta = with stdenv.lib; { + pythonImportsCheck = [ "google.cloud" ]; + + meta = with lib; { description = "API Client library for Google Cloud: Core Helpers"; homepage = "https://github.com/googleapis/python-cloud-core"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } diff --git a/pkgs/development/python-modules/google-cloud-dataproc/default.nix b/pkgs/development/python-modules/google-cloud-dataproc/default.nix new file mode 100644 index 000000000000..1b7a570fed21 --- /dev/null +++ b/pkgs/development/python-modules/google-cloud-dataproc/default.nix @@ -0,0 +1,42 @@ +{ lib, stdenv +, buildPythonPackage +, fetchPypi +, google-api-core +, mock +, libcst +, proto-plus +, pytestCheckHook +, pytest-asyncio +}: + +buildPythonPackage rec { + pname = "google-cloud-dataproc"; + version = "2.2.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "07rv2kgbaqkbd71k5i2zn9kcxasfzkkyai8jnbszhkf92k0lmi41"; + }; + + propagatedBuildInputs = [ google-api-core libcst proto-plus ]; + + checkInputs = [ mock pytestCheckHook pytest-asyncio ]; + + disabledTests = [ + # requires credentials + "test_list_clusters" + ]; + + pythonImportsCheck = [ + "google.cloud.dataproc" + "google.cloud.dataproc_v1" + "google.cloud.dataproc_v1beta2" + ]; + + meta = with lib; { + description = "Google Cloud Dataproc API client library"; + homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; + license = licenses.asl20; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/development/python-modules/google-cloud-datastore/default.nix b/pkgs/development/python-modules/google-cloud-datastore/default.nix new file mode 100644 index 000000000000..84f98550b9a3 --- /dev/null +++ b/pkgs/development/python-modules/google-cloud-datastore/default.nix @@ -0,0 +1,46 @@ +{ lib, stdenv +, buildPythonPackage +, fetchPypi +, google-api-core +, google-cloud-core +, libcst +, proto-plus +, mock +, pytestCheckHook +, pytest-asyncio +, google-cloud-testutils +}: + +buildPythonPackage rec { + pname = "google-cloud-datastore"; + version = "2.1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1yyk9ix1jms5q4kk76cfxzy42wzzyl5qladdswjy5l0pg6iypr8i"; + }; + + propagatedBuildInputs = [ google-api-core google-cloud-core libcst proto-plus ]; + + checkInputs = [ google-cloud-testutils mock pytestCheckHook pytest-asyncio ]; + + preCheck = '' + # directory shadows imports + rm -r google + # requires credentials + rm tests/system/test_system.py + ''; + + pythonImportsCheck = [ + "google.cloud.datastore" + "google.cloud.datastore_admin_v1" + "google.cloud.datastore_v1" + ]; + + meta = with lib; { + description = "Google Cloud Datastore API client library"; + homepage = "https://github.com/googleapis/python-datastore"; + license = licenses.asl20; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/development/python-modules/google-cloud-dlp/default.nix b/pkgs/development/python-modules/google-cloud-dlp/default.nix new file mode 100644 index 000000000000..9076c1298040 --- /dev/null +++ b/pkgs/development/python-modules/google-cloud-dlp/default.nix @@ -0,0 +1,42 @@ +{ lib, stdenv +, buildPythonPackage +, fetchPypi +, google-api-core +, google-cloud-testutils +, libcst +, proto-plus +, pytestCheckHook +, pytest-asyncio +, mock +}: + +buildPythonPackage rec { + pname = "google-cloud-dlp"; + version = "3.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "09rnzpdlycr1wv8agcfx05v1prn35ylphsbr07486zqdkh5wjk8p"; + }; + + propagatedBuildInputs = [ google-api-core libcst proto-plus ]; + + checkInputs = [ google-cloud-testutils mock pytestCheckHook pytest-asyncio ]; + + disabledTests = [ + # requires credentials + "test_inspect_content" + ]; + + pythonImportsCheck = [ + "google.cloud.dlp" + "google.cloud.dlp_v2" + ]; + + meta = with lib; { + description = "Cloud Data Loss Prevention (DLP) API API client library"; + homepage = "https://github.com/googleapis/python-dlp"; + license = licenses.asl20; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/development/python-modules/google-cloud-dns/default.nix b/pkgs/development/python-modules/google-cloud-dns/default.nix new file mode 100644 index 000000000000..0636da60e9af --- /dev/null +++ b/pkgs/development/python-modules/google-cloud-dns/default.nix @@ -0,0 +1,41 @@ +{ lib, stdenv +, buildPythonPackage +, fetchPypi +, google-api-core +, google-cloud-core +, pytestCheckHook +, mock +}: + +buildPythonPackage rec { + pname = "google-cloud-dns"; + version = "0.32.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "01l6pvfic0vxcvd97ckbxyc7ccr9vb9ln4lyhpp3amdmcy0far3j"; + }; + + propagatedBuildInputs = [ google-api-core google-cloud-core ]; + + checkInputs = [ mock pytestCheckHook ]; + + preCheck = '' + # don#t shadow python imports + rm -r google + ''; + + disabledTests = [ + # requires credentials + "test_quota" + ]; + + pythonImportsCheck = [ "google.cloud.dns" ]; + + meta = with lib; { + description = "Google Cloud DNS API client library"; + homepage = "https://github.com/googleapis/python-dns"; + license = licenses.asl20; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/development/python-modules/google_cloud_error_reporting/default.nix b/pkgs/development/python-modules/google-cloud-error-reporting/default.nix similarity index 50% rename from pkgs/development/python-modules/google_cloud_error_reporting/default.nix rename to pkgs/development/python-modules/google-cloud-error-reporting/default.nix index 19f90275ae99..b3181f8fcded 100644 --- a/pkgs/development/python-modules/google_cloud_error_reporting/default.nix +++ b/pkgs/development/python-modules/google-cloud-error-reporting/default.nix @@ -1,6 +1,14 @@ -{ stdenv, buildPythonPackage, fetchPypi, pytestCheckHook, pythonOlder -, google_cloud_logging, google_cloud_testutils, libcst, mock, proto-plus -, pytest-asyncio }: +{ lib, stdenv +, buildPythonPackage +, fetchPypi +, pytestCheckHook +, google-cloud-logging +, google-cloud-testutils +, libcst +, mock +, proto-plus +, pytest-asyncio +}: buildPythonPackage rec { pname = "google-cloud-error-reporting"; @@ -11,22 +19,25 @@ buildPythonPackage rec { sha256 = "2fd6fe25343f7017c22e2733a0358c64b3171edc1669d0c8a1e1f07f86a048c4"; }; - disabled = pythonOlder "3.6"; + propagatedBuildInputs = [ google-cloud-logging libcst proto-plus ]; - checkInputs = [ google_cloud_testutils mock pytestCheckHook pytest-asyncio ]; - propagatedBuildInputs = [ google_cloud_logging libcst proto-plus ]; + checkInputs = [ google-cloud-testutils mock pytestCheckHook pytest-asyncio ]; + + disabledTests = [ + # require credentials + "test_report_error_event" + "test_report_exception" + ]; - # Disable tests that require credentials - disabledTests = [ "test_report_error_event" "test_report_exception" ]; # prevent google directory from shadowing google imports preCheck = '' rm -r google ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Stackdriver Error Reporting API client library"; homepage = "https://github.com/googleapis/python-error-reporting"; license = licenses.asl20; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } diff --git a/pkgs/development/python-modules/google-cloud-firestore/default.nix b/pkgs/development/python-modules/google-cloud-firestore/default.nix new file mode 100644 index 000000000000..f0c235ca0c98 --- /dev/null +++ b/pkgs/development/python-modules/google-cloud-firestore/default.nix @@ -0,0 +1,64 @@ +{ lib, stdenv +, buildPythonPackage +, fetchPypi +, aiounittest +, google-api-core +, google-cloud-testutils +, google-cloud-core +, mock +, proto-plus +, pytestCheckHook +, pytest-asyncio +}: + +buildPythonPackage rec { + pname = "google-cloud-firestore"; + version = "2.0.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "1q5s2gpkibnjxal9zrz02jfnazf7rxk0bi0ln5a3di6i47kjnga9"; + }; + + propagatedBuildInputs = [ + google-api-core + google-cloud-core + proto-plus + ]; + + checkInputs = [ + aiounittest + google-cloud-testutils + mock + pytestCheckHook + pytest-asyncio + ]; + + preCheck = '' + # do not shadow imports + rm -r google + ''; + + pytestFlagsArray = [ + # tests are broken + "--ignore=tests/system/test_system.py" + "--ignore=tests/system/test_system_async.py" + ]; + + disabledTests = [ + # requires credentials + "test_collections" + ]; + + pythonImportsCheck = [ + "google.cloud.firestore_v1" + "google.cloud.firestore_admin_v1" + ]; + + meta = with lib; { + description = "Google Cloud Firestore API client library"; + homepage = "https://github.com/googleapis/python-firestore"; + license = licenses.asl20; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/development/python-modules/google-cloud-iam/default.nix b/pkgs/development/python-modules/google-cloud-iam/default.nix index 9d6120629380..f96940f4e67f 100644 --- a/pkgs/development/python-modules/google-cloud-iam/default.nix +++ b/pkgs/development/python-modules/google-cloud-iam/default.nix @@ -1,5 +1,14 @@ -{ lib, buildPythonPackage, fetchPypi, pytestCheckHook, pythonOlder -, google_api_core, libcst, mock, proto-plus, pytest-asyncio }: +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +, pythonOlder +, google-api-core +, libcst +, mock +, proto-plus +, pytest-asyncio +}: buildPythonPackage rec { pname = "google-cloud-iam"; @@ -10,13 +19,19 @@ buildPythonPackage rec { sha256 = "1zxsx5avs8njiyw32zvsx2yblmmiwxy771x334hbgmy0aqms4lak"; }; - propagatedBuildInputs = [ google_api_core libcst proto-plus ]; + propagatedBuildInputs = [ google-api-core libcst proto-plus ]; + checkInputs = [ mock pytestCheckHook pytest-asyncio ]; + pythonImportsCheck = [ + "google.cloud.iam_credentials" + "google.cloud.iam_credentials_v1" + ]; + meta = with lib; { - description = "Google Cloud IAM API client library"; + description = "IAM Service Account Credentials API client library"; homepage = "https://github.com/googleapis/python-iam"; license = licenses.asl20; - maintainers = with maintainers; [ austinbutler ]; + maintainers = with maintainers; [ austinbutler SuperSandro2000 ]; }; } diff --git a/pkgs/development/python-modules/google-cloud-iot/default.nix b/pkgs/development/python-modules/google-cloud-iot/default.nix new file mode 100644 index 000000000000..2b28f84a3158 --- /dev/null +++ b/pkgs/development/python-modules/google-cloud-iot/default.nix @@ -0,0 +1,42 @@ +{ lib, stdenv +, buildPythonPackage +, fetchPypi +, grpc_google_iam_v1 +, google-api-core +, libcst +, proto-plus +, pytestCheckHook +, pytest-asyncio +, mock +}: + +buildPythonPackage rec { + pname = "google-cloud-iot"; + version = "2.0.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "08spn5g0s386x21dgwb46na8aknbwq5d1sn8bh6kayk9fjfbxwla"; + }; + + propagatedBuildInputs = [ grpc_google_iam_v1 google-api-core libcst proto-plus ]; + + checkInputs = [ mock pytestCheckHook pytest-asyncio ]; + + disabledTests = [ + # requires credentials + "test_list_device_registries" + ]; + + pythonImportsCheck = [ + "google.cloud.iot" + "google.cloud.iot_v1" + ]; + + meta = with lib; { + description = "Cloud IoT API API client library"; + homepage = "https://github.com/googleapis/python-iot"; + license = licenses.asl20; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/development/python-modules/google_cloud_kms/default.nix b/pkgs/development/python-modules/google-cloud-kms/default.nix similarity index 57% rename from pkgs/development/python-modules/google_cloud_kms/default.nix rename to pkgs/development/python-modules/google-cloud-kms/default.nix index a4d2439fb49c..6675767a2445 100644 --- a/pkgs/development/python-modules/google_cloud_kms/default.nix +++ b/pkgs/development/python-modules/google-cloud-kms/default.nix @@ -1,5 +1,13 @@ -{ stdenv, buildPythonPackage, fetchPypi, pytestCheckHook, pythonOlder -, grpc_google_iam_v1, google_api_core, libcst, mock, proto-plus, pytest-asyncio +{ lib, stdenv +, buildPythonPackage +, fetchPypi +, pytestCheckHook +, grpc_google_iam_v1 +, google-api-core +, libcst +, mock +, proto-plus +, pytest-asyncio }: buildPythonPackage rec { @@ -11,19 +19,22 @@ buildPythonPackage rec { sha256 = "0f3k2ixp1zsgydpvkj75bs2mb805389snyw30hn41c38qq5ksdga"; }; - disabled = pythonOlder "3.6"; + propagatedBuildInputs = [ grpc_google_iam_v1 google-api-core libcst proto-plus ]; checkInputs = [ mock pytestCheckHook pytest-asyncio ]; - propagatedBuildInputs = - [ grpc_google_iam_v1 google_api_core libcst proto-plus ]; # Disable tests that need credentials disabledTests = [ "test_list_global_key_rings" ]; - meta = with stdenv.lib; { + pythonImportsCheck = [ + "google.cloud.kms" + "google.cloud.kms_v1" + ]; + + meta = with lib; { description = "Cloud Key Management Service (KMS) API API client library"; homepage = "https://github.com/googleapis/python-kms"; license = licenses.asl20; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } diff --git a/pkgs/development/python-modules/google-cloud-language/default.nix b/pkgs/development/python-modules/google-cloud-language/default.nix new file mode 100644 index 000000000000..7186ecd6f355 --- /dev/null +++ b/pkgs/development/python-modules/google-cloud-language/default.nix @@ -0,0 +1,37 @@ +{ lib, stdenv +, buildPythonPackage +, fetchPypi +, google-api-core +, libcst +, mock +, proto-plus +, pytestCheckHook +, pytest-asyncio +}: + +buildPythonPackage rec { + pname = "google-cloud-language"; + version = "2.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "123vqfrn7pyn3ia7cmhx8bgafd4gxxlmhf33s3vgspyjck6sprxb"; + }; + + propagatedBuildInputs = [ google-api-core libcst proto-plus ]; + + checkInputs = [ mock pytestCheckHook pytest-asyncio ]; + + pythonImportsCheck = [ + "google.cloud.language" + "google.cloud.language_v1" + "google.cloud.language_v1beta2" + ]; + + meta = with lib; { + description = "Google Cloud Natural Language API client library"; + homepage = "https://github.com/googleapis/python-language"; + license = licenses.asl20; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/development/python-modules/google-cloud-logging/default.nix b/pkgs/development/python-modules/google-cloud-logging/default.nix new file mode 100644 index 000000000000..58d03f206fc7 --- /dev/null +++ b/pkgs/development/python-modules/google-cloud-logging/default.nix @@ -0,0 +1,59 @@ +{ lib, stdenv +, buildPythonPackage +, fetchPypi +, django +, flask +, google-api-core +, google-cloud-core +, google-cloud-testutils +, mock +, proto-plus +, pytestCheckHook +, pytest-asyncio +, webapp2 +}: + +buildPythonPackage rec { + pname = "google-cloud-logging"; + version = "2.0.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "0s09vs4rnq4637j8zw7grv3f4j7njqprm744b1knzldj91rg0vmi"; + }; + + propagatedBuildInputs = [ google-api-core google-cloud-core proto-plus ]; + + checkInputs = [ + django + flask + google-cloud-testutils + mock + pytestCheckHook + pytest-asyncio + ]; + + disabledTests = [ + # requires credentials + "test_write_log_entries" + ]; + + preCheck = '' + # prevent google directory from shadowing google imports + rm -r google + # requires credentials + rm tests/system/test_system.py tests/unit/test__gapic.py + ''; + + pythonImortsCheck = [ + "google.cloud.logging" + "google.cloud.logging_v2" + ]; + + meta = with lib; { + description = "Stackdriver Logging API client library"; + homepage = "https://github.com/googleapis/python-logging"; + license = licenses.asl20; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/development/python-modules/google-cloud-monitoring/default.nix b/pkgs/development/python-modules/google-cloud-monitoring/default.nix new file mode 100644 index 000000000000..8dc665fe2103 --- /dev/null +++ b/pkgs/development/python-modules/google-cloud-monitoring/default.nix @@ -0,0 +1,42 @@ +{ lib, stdenv +, buildPythonPackage +, fetchPypi +, google-api-core +, google-cloud-testutils +, libcst +, proto-plus +, pytestCheckHook +, pytest-asyncio +, mock +}: + +buildPythonPackage rec { + pname = "google-cloud-monitoring"; + version = "2.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "07r0y995fin6cbnqlhmd38fv3pfhhqyw04l7nr38sldrd82gmsqx"; + }; + + propagatedBuildInputs = [ libcst google-api-core proto-plus ]; + + checkInputs = [ google-cloud-testutils mock pytestCheckHook pytest-asyncio ]; + + disabledTests = [ + # requires credentials + "test_list_monitored_resource_descriptors" + ]; + + pythonImportsCheck = [ + "google.cloud.monitoring" + "google.cloud.monitoring_v3" + ]; + + meta = with lib; { + description = "Stackdriver Monitoring API client library"; + homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; + license = licenses.asl20; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/development/python-modules/google-cloud-org-policy/default.nix b/pkgs/development/python-modules/google-cloud-org-policy/default.nix index 39cc0dc9c24b..10ee559b8f0b 100644 --- a/pkgs/development/python-modules/google-cloud-org-policy/default.nix +++ b/pkgs/development/python-modules/google-cloud-org-policy/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, pythonOlder, google_api_core }: +{ lib, buildPythonPackage, fetchPypi, pythonOlder, google-api-core }: buildPythonPackage rec { pname = "google-cloud-org-policy"; @@ -9,9 +9,7 @@ buildPythonPackage rec { sha256 = "0ncgcnbvmgqph54yh2pjx2hh82gnkhsrw5yirp4wlf7jclh6j9xh"; }; - disabled = pythonOlder "3.5"; - - propagatedBuildInputs = [ google_api_core ]; + propagatedBuildInputs = [ google-api-core ]; # No tests in repo doCheck = false; @@ -22,6 +20,6 @@ buildPythonPackage rec { description = "Protobufs for Google Cloud Organization Policy."; homepage = "https://github.com/googleapis/python-org-policy"; license = licenses.asl20; - maintainers = with maintainers; [ austinbutler ]; + maintainers = with maintainers; [ austinbutler SuperSandro2000 ]; }; } diff --git a/pkgs/development/python-modules/google-cloud-os-config/default.nix b/pkgs/development/python-modules/google-cloud-os-config/default.nix new file mode 100644 index 000000000000..94d8d4738f5c --- /dev/null +++ b/pkgs/development/python-modules/google-cloud-os-config/default.nix @@ -0,0 +1,29 @@ +{ lib, buildPythonPackage, fetchPypi, google-api-core, libcst, mock, proto-plus, pytestCheckHook, pytest-asyncio }: + +buildPythonPackage rec { + pname = "google-cloud-os-config"; + version = "1.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "07zvagy9hwaccwvg1xad5nkalgkria0maa5yxiwqf1yk9f7gbyq1"; + }; + + propagatedBuildInputs = [ google-api-core libcst proto-plus ]; + + checkInputs = [ mock pytestCheckHook pytest-asyncio ]; + + pythonImportsCheck = [ "google.cloud.osconfig" ]; + + disabledTests = [ + "test_patch_deployment" + "test_patch_job" + ]; + + meta = with lib; { + description = "Google Cloud OS Config API client library"; + homepage = "https://github.com/googleapis/python-os-config"; + license = licenses.asl20; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/development/python-modules/google-cloud-pubsub/default.nix b/pkgs/development/python-modules/google-cloud-pubsub/default.nix new file mode 100644 index 000000000000..46a28b1ffd1d --- /dev/null +++ b/pkgs/development/python-modules/google-cloud-pubsub/default.nix @@ -0,0 +1,42 @@ +{ lib, stdenv +, buildPythonPackage +, fetchPypi +, pytestCheckHook +, google-api-core +, google-cloud-testutils +, grpc_google_iam_v1 +, libcst +, mock +, proto-plus +, pytest-asyncio +}: + +buildPythonPackage rec { + pname = "google-cloud-pubsub"; + version = "2.2.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1rfdbkxbndi00wx9dx733ihp3hmcsk6k23pcjni0ki7m0c4acl5w"; + }; + + propagatedBuildInputs = [ grpc_google_iam_v1 google-api-core libcst proto-plus ]; + + checkInputs = [ google-cloud-testutils mock pytestCheckHook pytest-asyncio ]; + + preCheck = '' + # prevent google directory from shadowing google imports + rm -r google + # Tests in pubsub_v1 attempt to contact pubsub.googleapis.com + rm -r tests/unit/pubsub_v1 + ''; + + pythonImportsCheck = [ "google.cloud.pubsub" ]; + + meta = with lib; { + description = "Google Cloud Pub/Sub API client library"; + homepage = "https://pypi.org/project/google-cloud-pubsub"; + license = licenses.asl20; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/development/python-modules/google-cloud-redis/default.nix b/pkgs/development/python-modules/google-cloud-redis/default.nix new file mode 100644 index 000000000000..4dcf7fd3d318 --- /dev/null +++ b/pkgs/development/python-modules/google-cloud-redis/default.nix @@ -0,0 +1,37 @@ +{ lib, stdenv +, buildPythonPackage +, fetchPypi +, google-api-core +, libcst +, mock +, proto-plus +, pytestCheckHook +, pytest-asyncio +}: + +buildPythonPackage rec { + pname = "google-cloud-redis"; + version = "2.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1f67mr473vzv0qgjm4hycfnrjgiqrsv47vqrynwjy9yrca2130y7"; + }; + + propagatedBuildInputs = [ google-api-core libcst proto-plus ]; + + checkInputs = [ mock pytestCheckHook pytest-asyncio ]; + + pythonImportsCheck = [ + "google.cloud.redis" + "google.cloud.redis_v1" + "google.cloud.redis_v1beta1" + ]; + + meta = with lib; { + description = "Google Cloud Memorystore for Redis API client library"; + homepage = "https://github.com/googleapis/python-redis"; + license = licenses.asl20; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/development/python-modules/google-cloud-resource-manager/default.nix b/pkgs/development/python-modules/google-cloud-resource-manager/default.nix new file mode 100644 index 000000000000..11baf3d73f3d --- /dev/null +++ b/pkgs/development/python-modules/google-cloud-resource-manager/default.nix @@ -0,0 +1,36 @@ +{ lib, stdenv +, buildPythonPackage +, fetchPypi +, pytestCheckHook +, google-cloud-core +, google-api-core +, mock +}: + +buildPythonPackage rec { + pname = "google-cloud-resource-manager"; + version = "0.30.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "1la643vkf6fm2gapz57cm92xzvmhzgpzv3bb6112yz1cizrvnxrm"; + }; + + propagatedBuildInputs = [ google-api-core google-cloud-core ]; + + checkInputs = [ mock pytestCheckHook ]; + + # prevent google directory from shadowing google imports + preCheck = '' + rm -r google + ''; + + pythonImportsCheck = [ "google.cloud.resource_manager" ]; + + meta = with lib; { + description = "Google Cloud Resource Manager API client library"; + homepage = "https://github.com/googleapis/python-resource-manager"; + license = licenses.asl20; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix b/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix new file mode 100644 index 000000000000..81fa97f152bb --- /dev/null +++ b/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix @@ -0,0 +1,39 @@ +{ lib, stdenv +, buildPythonPackage +, fetchPypi +, google-api-core +, google-cloud-core +, mock +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "google-cloud-runtimeconfig"; + version = "0.32.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "1bd8hlp0ssi20ds4gknbxai8mih6xiz8b60ab7p0ngpdqp1kw52p"; + }; + + propagatedBuildInputs = [ google-api-core google-cloud-core ]; + + checkInputs = [ mock pytestCheckHook ]; + + # Client tests require credentials + disabledTests = [ "client_options" ]; + + # prevent google directory from shadowing google imports + preCheck = '' + rm -r google + ''; + + pythonImportsCheck = [ "google.cloud.runtimeconfig" ]; + + meta = with lib; { + description = "Google Cloud RuntimeConfig API client library"; + homepage = "https://pypi.org/project/google-cloud-runtimeconfig"; + license = licenses.asl20; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/development/python-modules/google-cloud-secret-manager/default.nix b/pkgs/development/python-modules/google-cloud-secret-manager/default.nix new file mode 100644 index 000000000000..bb18b72caad6 --- /dev/null +++ b/pkgs/development/python-modules/google-cloud-secret-manager/default.nix @@ -0,0 +1,47 @@ +{ lib +, buildPythonPackage +, fetchPypi +, google-api-core +, grpc_google_iam_v1 +, libcst +, mock +, proto-plus +, pytestCheckHook +, pytest-asyncio +}: + +buildPythonPackage rec { + pname = "google-cloud-secret-manager"; + version = "2.1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0c2w8ny3n84faq1mq86f16lzqgqbk1977q2f5qxn5a5ccj8v821g"; + }; + + propagatedBuildInputs = [ + google-api-core + grpc_google_iam_v1 + libcst + proto-plus + ]; + + checkInputs = [ + mock + pytestCheckHook + pytest-asyncio + ]; + + pythonImportsCheck = [ + "google.cloud.secretmanager" + "google.cloud.secretmanager_v1" + "google.cloud.secretmanager_v1beta1" + ]; + + meta = with lib; { + description = "Secret Manager API API client library"; + homepage = "https://github.com/googleapis/python-secret-manager"; + license = licenses.asl20; + maintainers = with maintainers; [ siriobalmelli SuperSandro2000 ]; + }; +} diff --git a/pkgs/development/python-modules/google-cloud-securitycenter/default.nix b/pkgs/development/python-modules/google-cloud-securitycenter/default.nix new file mode 100644 index 000000000000..242198a21971 --- /dev/null +++ b/pkgs/development/python-modules/google-cloud-securitycenter/default.nix @@ -0,0 +1,39 @@ +{ lib, stdenv +, buildPythonPackage +, fetchPypi +, grpc_google_iam_v1 +, google-api-core +, libcst +, mock +, proto-plus +, pytestCheckHook +, pytest-asyncio +}: + +buildPythonPackage rec { + pname = "google-cloud-securitycenter"; + version = "1.1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1lgz6qpsfv4b7p5ff4sdpjpaddxpbazdvlcrqr1i0c0qil2lkm2i"; + }; + + propagatedBuildInputs = [ grpc_google_iam_v1 google-api-core libcst proto-plus ]; + + checkInputs = [ mock pytestCheckHook pytest-asyncio ]; + + pythonImportsCheck = [ + "google.cloud.securitycenter" + "google.cloud.securitycenter_v1" + "google.cloud.securitycenter_v1beta1" + "google.cloud.securitycenter_v1p1beta1" + ]; + + meta = with lib; { + description = "Cloud Security Command Center API API client library"; + homepage = "https://github.com/googleapis/python-securitycenter"; + license = licenses.asl20; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/development/python-modules/google-cloud-spanner/default.nix b/pkgs/development/python-modules/google-cloud-spanner/default.nix new file mode 100644 index 000000000000..c78f32847307 --- /dev/null +++ b/pkgs/development/python-modules/google-cloud-spanner/default.nix @@ -0,0 +1,54 @@ +{ lib, stdenv +, buildPythonPackage +, fetchPypi +, grpc_google_iam_v1 +, google-cloud-core +, google-cloud-testutils +, libcst +, mock +, proto-plus +, pytestCheckHook +, pytest-asyncio +, sqlparse +}: + +buildPythonPackage rec { + pname = "google-cloud-spanner"; + version = "2.1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0mkkx6l3cbwfwng12zpisbv6m919fkhdb48xk24ayc19193bi86n"; + }; + + postPatch = '' + substituteInPlace setup.py \ + --replace '"proto-plus == 1.11.0"' '"proto-plus"' + ''; + + propagatedBuildInputs = [ google-cloud-core grpc_google_iam_v1 libcst proto-plus sqlparse ]; + + checkInputs = [ google-cloud-testutils mock pytestCheckHook pytest-asyncio ]; + + preCheck = '' + # prevent google directory from shadowing google imports + rm -r google + # disable tests which require credentials + rm tests/system/test_{system,system_dbapi}.py + rm tests/unit/spanner_dbapi/test_{connect,connection,cursor}.py + ''; + + pythonImportsCheck = [ + "google.cloud.spanner_admin_database_v1" + "google.cloud.spanner_admin_instance_v1" + "google.cloud.spanner_dbapi" + "google.cloud.spanner_v1" + ]; + + meta = with lib; { + description = "Cloud Spanner API client library"; + homepage = "https://github.com/googleapis/python-spanner"; + license = licenses.asl20; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/development/python-modules/google-cloud-speech/default.nix b/pkgs/development/python-modules/google-cloud-speech/default.nix new file mode 100644 index 000000000000..3359cfdd743a --- /dev/null +++ b/pkgs/development/python-modules/google-cloud-speech/default.nix @@ -0,0 +1,43 @@ +{ lib, stdenv +, buildPythonPackage +, fetchPypi +, google-api-core +, libcst +, mock +, proto-plus +, pytestCheckHook +, pytest-asyncio +}: + +buildPythonPackage rec { + pname = "google-cloud-speech"; + version = "2.0.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "0ch85h5xrb15fcml5v0f30s0niw02k4v8gi7i8a40161yj882hm7"; + }; + + propagatedBuildInputs = [ libcst google-api-core proto-plus ]; + + checkInputs = [ mock pytestCheckHook pytest-asyncio ]; + + pytestFlagsArray = [ + # requrire credentials + "--ignore=tests/system/gapic/v1/test_system_speech_v1.py" + "--ignore=tests/system/gapic/v1p1beta1/test_system_speech_v1p1beta1.py" + ]; + + pythonImportsCheck = [ + "google.cloud.speech" + "google.cloud.speech_v1" + "google.cloud.speech_v1p1beta1" + ]; + + meta = with lib; { + description = "Google Cloud Speech API client library"; + homepage = "https://github.com/googleapis/python-speech"; + license = licenses.asl20; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/development/python-modules/google-cloud-storage/default.nix b/pkgs/development/python-modules/google-cloud-storage/default.nix new file mode 100644 index 000000000000..cf869d5c8eff --- /dev/null +++ b/pkgs/development/python-modules/google-cloud-storage/default.nix @@ -0,0 +1,64 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +, google-auth +, google-cloud-iam +, google-cloud-core +, google-cloud-kms +, google-cloud-testutils +, google-resumable-media +, mock +}: + +buildPythonPackage rec { + pname = "google-cloud-storage"; + version = "1.35.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "17kal75wmyjpva7g04cb9yg7qbyrgwfn575z4gqijd4gz2r0sp2m"; + }; + + propagatedBuildInputs = [ + google-auth + google-cloud-core + google-resumable-media + ]; + + checkInputs = [ + google-cloud-iam + google-cloud-kms + google-cloud-testutils + mock + pytestCheckHook + ]; + + # disable tests which require credentials and network access + disabledTests = [ + "create" + "download" + "get" + "post" + "test_build_api_url" + ]; + + pytestFlagsArray = [ + "--ignore=tests/unit/test_bucket.py" + "--ignore=tests/system/test_system.py" + ]; + + # prevent google directory from shadowing google imports + preCheck = '' + rm -r google + ''; + + pythonImportsCheck = [ "google.cloud.storage" ]; + + meta = with lib; { + description = "Google Cloud Storage API client library"; + homepage = "https://github.com/googleapis/python-storage"; + license = licenses.asl20; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/development/python-modules/google-cloud-tasks/default.nix b/pkgs/development/python-modules/google-cloud-tasks/default.nix new file mode 100644 index 000000000000..e30986af6106 --- /dev/null +++ b/pkgs/development/python-modules/google-cloud-tasks/default.nix @@ -0,0 +1,44 @@ +{ lib, stdenv +, buildPythonPackage +, fetchPypi +, google-api-core +, grpc_google_iam_v1 +, libcst +, mock +, proto-plus +, pytestCheckHook +, pytest-asyncio +}: + +buildPythonPackage rec { + pname = "google-cloud-tasks"; + version = "2.1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1jsf7y88lvln9r08pmx673ibmgw397qmir5drrcfvlmgqvszp7qx"; + }; + + propagatedBuildInputs = [ google-api-core grpc_google_iam_v1 libcst proto-plus ]; + + checkInputs = [ mock pytestCheckHook pytest-asyncio ]; + + disabledTests = [ + # requires credentials + "test_list_queues" + ]; + + pythonImportsCheck = [ + "google.cloud.tasks" + "google.cloud.tasks_v2" + "google.cloud.tasks_v2beta2" + "google.cloud.tasks_v2beta3" + ]; + + meta = with lib; { + description = "Cloud Tasks API API client library"; + homepage = "https://github.com/googleapis/python-tasks"; + license = licenses.asl20; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/development/python-modules/google_cloud_testutils/default.nix b/pkgs/development/python-modules/google-cloud-testutils/default.nix similarity index 60% rename from pkgs/development/python-modules/google_cloud_testutils/default.nix rename to pkgs/development/python-modules/google-cloud-testutils/default.nix index dfd6354dcc4b..3f6792fa77b7 100644 --- a/pkgs/development/python-modules/google_cloud_testutils/default.nix +++ b/pkgs/development/python-modules/google-cloud-testutils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, google_auth, pytest, six }: +{ lib, stdenv, buildPythonPackage, fetchPypi, google-auth, six }: buildPythonPackage rec { pname = "google-cloud-testutils"; @@ -9,15 +9,17 @@ buildPythonPackage rec { sha256 = "1bn1pz00lxym3vkl6l45b3nydpmfdvmylwggh2lspldrxwx39a0k"; }; - propagatedBuildInputs = [ google_auth six ]; + propagatedBuildInputs = [ google-auth six ]; - # There are no tests + # does not contain tests doCheck = false; - meta = with stdenv.lib; { + pythonImportsCheck = [ "test_utils" ]; + + meta = with lib; { description = "System test utilities for google-cloud-python"; homepage = "https://github.com/googleapis/python-test-utils"; license = licenses.asl20; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } diff --git a/pkgs/development/python-modules/google-cloud-texttospeech/default.nix b/pkgs/development/python-modules/google-cloud-texttospeech/default.nix new file mode 100644 index 000000000000..a7228a42999b --- /dev/null +++ b/pkgs/development/python-modules/google-cloud-texttospeech/default.nix @@ -0,0 +1,43 @@ +{ lib, stdenv +, buildPythonPackage +, fetchPypi +, pytestCheckHook +, google-api-core +, libcst +, mock +, proto-plus +, pytest-asyncio +}: + +buildPythonPackage rec { + pname = "google-cloud-texttospeech"; + version = "2.2.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "17igfwh34369gkvsbrm46j1ii61i6268wg2g2dl9c65nf9z3kgfb"; + }; + + propagatedBuildInputs = [ libcst google-api-core proto-plus ]; + + checkInputs = [ mock pytest-asyncio pytestCheckHook ]; + + disabledTests = [ + # Disable tests that require credentials + "test_list_voices" + "test_synthesize_speech" + ]; + + pythonImportsCheck = [ + "google.cloud.texttospeech" + "google.cloud.texttospeech_v1" + "google.cloud.texttospeech_v1beta1" + ]; + + meta = with lib; { + description = "Google Cloud Text-to-Speech API client library"; + homepage = "https://github.com/googleapis/python-texttospeech"; + license = licenses.asl20; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/development/python-modules/google-cloud-trace/default.nix b/pkgs/development/python-modules/google-cloud-trace/default.nix new file mode 100644 index 000000000000..1252c99bf486 --- /dev/null +++ b/pkgs/development/python-modules/google-cloud-trace/default.nix @@ -0,0 +1,44 @@ +{ lib, stdenv +, buildPythonPackage +, fetchPypi +, google-api-core +, google-cloud-core +, google-cloud-testutils +, mock +, proto-plus +, pytestCheckHook +, pytest-asyncio +}: + +buildPythonPackage rec { + pname = "google-cloud-trace"; + version = "1.1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1lvcm4w1l7hiqg64kdscch3f3bq19q9ii49xj4lljn2a4xffxl8v"; + }; + + propagatedBuildInputs = [ google-api-core google-cloud-core proto-plus ]; + + checkInputs = [ google-cloud-testutils mock pytestCheckHook pytest-asyncio ]; + + disabledTests = [ + # require credentials + "test_batch_write_spans" + "test_list_traces" + ]; + + pythonImportsCheck = [ + "google.cloud.trace" + "google.cloud.trace_v1" + "google.cloud.trace_v2" + ]; + + meta = with lib; { + description = "Cloud Trace API client library"; + homepage = "https://github.com/googleapis/python-trace"; + license = licenses.asl20; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/development/python-modules/google-cloud-translate/default.nix b/pkgs/development/python-modules/google-cloud-translate/default.nix new file mode 100644 index 000000000000..32d402e1cf03 --- /dev/null +++ b/pkgs/development/python-modules/google-cloud-translate/default.nix @@ -0,0 +1,46 @@ +{ lib, stdenv +, buildPythonPackage +, fetchPypi +, pytestCheckHook +, google-api-core +, google-cloud-core +, google-cloud-testutils +, grpcio +, libcst +, mock +, proto-plus +, pytest-asyncio +}: + +buildPythonPackage rec { + pname = "google-cloud-translate"; + version = "3.0.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "1s2gvlzfqd2gsrzaz7yl9q8s1k03dlsjahgg95s017vlcn21d0v1"; + }; + + propagatedBuildInputs = [ google-api-core google-cloud-core libcst proto-plus ]; + + checkInputs = [ google-cloud-testutils mock pytestCheckHook pytest-asyncio ]; + + preCheck = '' + # prevent shadowing imports + rm -r google + ''; + + pythonImportsCheck = [ + "google.cloud.translate" + "google.cloud.translate_v2" + "google.cloud.translate_v3" + "google.cloud.translate_v3beta1" + ]; + + meta = with lib; { + description = "Google Cloud Translation API client library"; + homepage = "https://github.com/googleapis/python-translate"; + license = licenses.asl20; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/development/python-modules/google-cloud-videointelligence/default.nix b/pkgs/development/python-modules/google-cloud-videointelligence/default.nix new file mode 100644 index 000000000000..43fed1fe27fa --- /dev/null +++ b/pkgs/development/python-modules/google-cloud-videointelligence/default.nix @@ -0,0 +1,45 @@ +{ lib, stdenv +, buildPythonPackage +, fetchPypi +, mock +, google-api-core +, google-cloud-testutils +, proto-plus +, pytestCheckHook +, pytest-asyncio +}: + +buildPythonPackage rec { + pname = "google-cloud-videointelligence"; + version = "2.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1yhmizig41ymr2dz0i6ccrwszp0ivyykmq11vqxp82l9ncjima82"; + }; + + propagatedBuildInputs = [ google-api-core proto-plus ]; + + checkInputs = [ google-cloud-testutils mock pytestCheckHook pytest-asyncio ]; + + disabledTests = [ + # require credentials + "test_annotate_video" + ]; + + pythonImportsCheck = [ + "google.cloud.videointelligence" + "google.cloud.videointelligence_v1" + "google.cloud.videointelligence_v1beta2" + "google.cloud.videointelligence_v1p1beta1" + "google.cloud.videointelligence_v1p2beta1" + "google.cloud.videointelligence_v1p3beta1" + ]; + + meta = with lib; { + description = "Google Cloud Video Intelligence API client library"; + homepage = "https://github.com/googleapis/python-videointelligence"; + license = licenses.asl20; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/development/python-modules/google-cloud-vision/default.nix b/pkgs/development/python-modules/google-cloud-vision/default.nix new file mode 100644 index 000000000000..57a51f96e65e --- /dev/null +++ b/pkgs/development/python-modules/google-cloud-vision/default.nix @@ -0,0 +1,41 @@ +{ lib, stdenv +, buildPythonPackage +, fetchPypi +, google-api-core +, libcst +, mock +, proto-plus +, pytestCheckHook +, pytest-asyncio +}: + +buildPythonPackage rec { + pname = "google-cloud-vision"; + version = "2.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0qbwhapmn5ia853c4nfnz1qiksngvr8j0xxjasrykwhxcsd7s1ka"; + }; + + propagatedBuildInputs = [ libcst google-api-core proto-plus]; + + checkInputs = [ mock pytestCheckHook pytest-asyncio ]; + + pythonImportsCheck = [ + "google.cloud.vision" + "google.cloud.vision_helpers" + "google.cloud.vision_v1" + "google.cloud.vision_v1p1beta1" + "google.cloud.vision_v1p2beta1" + "google.cloud.vision_v1p3beta1" + "google.cloud.vision_v1p4beta1" + ]; + + meta = with lib; { + description = "Cloud Vision API API client library"; + homepage = "https://github.com/googleapis/python-vision"; + license = licenses.asl20; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix b/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix new file mode 100644 index 000000000000..20614f5b5d86 --- /dev/null +++ b/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix @@ -0,0 +1,36 @@ +{ lib, stdenv +, buildPythonPackage +, fetchPypi +, pytestCheckHook +, google-api-core +, libcst +, mock +, proto-plus +, pytest-asyncio +}: + +buildPythonPackage rec { + pname = "google-cloud-websecurityscanner"; + version = "1.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "14sky9bkl00n65ksig3f6psm31pkmkvlcprlk6s9if470j40zrhx"; + }; + + propagatedBuildInputs = [ google-api-core libcst proto-plus ]; + + checkInputs = [ mock pytest-asyncio pytestCheckHook ]; + + pythonImportsCheck = [ + "google.cloud.websecurityscanner_v1alpha" + "google.cloud.websecurityscanner_v1beta" + ]; + + meta = with lib; { + description = "Google Cloud Web Security Scanner API client library"; + homepage = "https://github.com/googleapis/python-websecurityscanner"; + license = licenses.asl20; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/development/python-modules/google-crc32c/default.nix b/pkgs/development/python-modules/google-crc32c/default.nix index fbed406cebce..aaf16d9e7c82 100644 --- a/pkgs/development/python-modules/google-crc32c/default.nix +++ b/pkgs/development/python-modules/google-crc32c/default.nix @@ -1,31 +1,31 @@ -{ lib, buildPythonPackage, isPy3k, fetchFromGitHub, cffi, crc32c, pytestCheckHook }: +{ lib, buildPythonPackage, fetchFromGitHub, cffi, crc32c, pytestCheckHook }: buildPythonPackage rec { pname = "google-crc32c"; - version = "1.0.0"; - - disabled = !isPy3k; + version = "1.1.0"; src = fetchFromGitHub { owner = "googleapis"; repo = "python-crc32c"; rev = "v${version}"; - sha256 = "0n3ggsxmk1fhq0kz6p5rcj4gypfb05i26fcn7lsawakgl7fzxqyl"; + sha256 = "0vbidg9yrv9k8xvk8rl43lsf4cg3dci4a9k4srwwrchbxivz1gr6"; }; - buildInputs = [ crc32c ]; + buildInputs = [ crc32c ]; + propagatedBuildInputs = [ cffi ]; LDFLAGS = "-L${crc32c}/lib"; CFLAGS = "-I${crc32c}/include"; checkInputs = [ pytestCheckHook crc32c ]; + pythonImportsCheck = [ "google_crc32c" ]; meta = with lib; { homepage = "https://github.com/googleapis/python-crc32c"; description = "Wrapper the google/crc32c hardware-based implementation of the CRC32C hashing algorithm"; license = with licenses; [ asl20 ]; - maintainers = with maintainers; [ freezeboy ]; + maintainers = with maintainers; [ freezeboy SuperSandro2000 ]; }; } diff --git a/pkgs/development/python-modules/google-i18n-address/default.nix b/pkgs/development/python-modules/google-i18n-address/default.nix index 56a77258c8aa..590962590e5f 100644 --- a/pkgs/development/python-modules/google-i18n-address/default.nix +++ b/pkgs/development/python-modules/google-i18n-address/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, fetchPypi, lib, requests, pytest, pytestcov, mock }: +{ buildPythonPackage, fetchPypi, lib, requests, pytestCheckHook, mock }: buildPythonPackage rec { pname = "google-i18n-address"; @@ -11,12 +11,12 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests ]; - checkInputs = [ pytest pytestcov mock ]; + checkInputs = [ pytestCheckHook mock ]; meta = with lib; { description = "Google's i18n address data packaged for Python"; homepage = "https://pypi.org/project/google-i18n-address/"; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ SuperSandro2000 ]; license = licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/google-music-proto/default.nix b/pkgs/development/python-modules/google-music-proto/default.nix index 16363192c81b..a883f707bdf1 100644 --- a/pkgs/development/python-modules/google-music-proto/default.nix +++ b/pkgs/development/python-modules/google-music-proto/default.nix @@ -1,4 +1,7 @@ -{ lib, buildPythonPackage, fetchPypi, pythonOlder +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder , attrs , audio-metadata , importlib-metadata @@ -10,7 +13,6 @@ buildPythonPackage rec { pname = "google-music-proto"; version = "2.10.0"; - disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; @@ -20,7 +22,7 @@ buildPythonPackage rec { postPatch = '' sed -i -e "/audio-metadata/c\'audio-metadata'," -e "/marshmallow/c\'marshmallow'," setup.py substituteInPlace setup.py \ - --replace "pendulum>=2.0,<=3.0,!=2.0.5,!=2.1.0" "pendulum>=2.0,<=3.0" + --replace "'attrs>=18.2,<19.4'" "'attrs'" ''; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-music-utils/default.nix b/pkgs/development/python-modules/google-music-utils/default.nix index b7fd2738e048..801b4b78a178 100644 --- a/pkgs/development/python-modules/google-music-utils/default.nix +++ b/pkgs/development/python-modules/google-music-utils/default.nix @@ -1,30 +1,35 @@ -{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder -, audio-metadata, multidict, wrapt -, pytest +{ lib +, buildPythonPackage +, fetchFromGitHub +, audio-metadata +, multidict +, poetry +, pytestCheckHook }: buildPythonPackage rec { pname = "google-music-utils"; - version = "2.1.0"; + version = "2.5.0"; # Pypi tarball doesn't contain tests src = fetchFromGitHub { owner = "thebigmunch"; repo = "google-music-utils"; rev = version; - sha256 = "0fn4zp0gf1wx2x06dbc840qcq21j4p3ajghxp7646w2n6n9gxhh7"; + sha256 = "0vwbrgakk23fypjspmscz4gllnb3dksv2njy4j4bm8vyr6fwbi5f"; }; + format = "pyproject"; - propagatedBuildInputs = [ - audio-metadata multidict wrapt - ]; - - checkInputs = [ pytest ]; - checkPhase = '' - pytest + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'multidict = "^4.0"' 'multidict = ">4.0"' ''; - disabled = pythonOlder "3.6"; + nativeBuildInputs = [ poetry ]; + + propagatedBuildInputs = [ audio-metadata multidict ]; + + checkInputs = [ pytestCheckHook ]; meta = with lib; { homepage = "https://github.com/thebigmunch/google-music-utils"; diff --git a/pkgs/development/python-modules/google-music/default.nix b/pkgs/development/python-modules/google-music/default.nix index 9d2f0def99b2..e5b42c5310f7 100644 --- a/pkgs/development/python-modules/google-music/default.nix +++ b/pkgs/development/python-modules/google-music/default.nix @@ -1,4 +1,6 @@ -{ lib, buildPythonPackage, fetchPypi, pythonOlder +{ lib +, buildPythonPackage +, fetchPypi , appdirs , audio-metadata , google-music-proto @@ -14,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "b79956cc0df86345c74436ae6213b700345403c91d51947288806b174322573b"; + sha256 = "0fsp491ifsw0i1r98l8xr41m8d00nw9n5bin8k3laqzq1p65d6dp"; }; postPatch = '' @@ -35,8 +37,6 @@ buildPythonPackage rec { # No tests doCheck = false; - disabled = pythonOlder "3.6"; - meta = with lib; { homepage = "https://github.com/thebigmunch/google-music"; description = "A Google Music API wrapper"; diff --git a/pkgs/development/python-modules/google-resumable-media/default.nix b/pkgs/development/python-modules/google-resumable-media/default.nix new file mode 100644 index 000000000000..531dc1a28603 --- /dev/null +++ b/pkgs/development/python-modules/google-resumable-media/default.nix @@ -0,0 +1,46 @@ +{ lib +, buildPythonPackage +, fetchPypi +, google-auth +, google-cloud-testutils +, google-crc32c +, mock +, pytestCheckHook +, pytest-asyncio +, requests +}: + +buildPythonPackage rec { + pname = "google-resumable-media"; + version = "1.2.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0hwxdgsqh6933kp4jkv6hwwdcqs7bgjn9j08ga399njv3s9b367f"; + }; + + propagatedBuildInputs = [ google-auth google-crc32c requests ]; + + checkInputs = [ google-auth google-cloud-testutils mock pytestCheckHook pytest-asyncio ]; + + preCheck = '' + # prevent shadowing imports + rm -r google + # fixture 'authorized_transport' not found + rm tests/system/requests/test_upload.py + # requires network + rm tests/system/requests/test_download.py + ''; + + pythonImportsCheck = [ + "google._async_resumable_media" + "google.resumable_media" + ]; + + meta = with lib; { + description = "Utilities for Google Media Downloads and Resumable Uploads"; + homepage = "https://github.com/GoogleCloudPlatform/google-resumable-media-python"; + license = licenses.asl20; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/development/python-modules/google_auth/default.nix b/pkgs/development/python-modules/google_auth/default.nix deleted file mode 100644 index 3f47a366fba8..000000000000 --- a/pkgs/development/python-modules/google_auth/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ stdenv, buildPythonPackage, fetchpatch, fetchPypi, pythonOlder -, pytestCheckHook, cachetools, flask, freezegun, mock, oauth2client -, pyasn1-modules, pytest, pytest-localserver, requests, responses, rsa -, setuptools, six, urllib3 }: - -buildPythonPackage rec { - pname = "google-auth"; - version = "1.23.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "5176db85f1e7e837a646cd9cede72c3c404ccf2e3373d9ee14b2db88febad440"; - }; - - disabled = pythonOlder "3.5"; - - propagatedBuildInputs = [ six pyasn1-modules cachetools rsa setuptools ]; - - checkInputs = [ - flask - freezegun - mock - oauth2client - pytestCheckHook - pytest-localserver - requests - responses - urllib3 - ]; - - meta = with stdenv.lib; { - description = "Google Auth Python Library"; - longDescription = '' - This library simplifies using Google’s various server-to-server - authentication mechanisms to access Google APIs. - ''; - homepage = "https://github.com/googleapis/google-auth-library-python"; - changelog = - "https://github.com/googleapis/google-auth-library-python/blob/v${version}/CHANGELOG.md"; - # Documentation: https://googleapis.dev/python/google-auth/latest/index.html - license = licenses.asl20; - maintainers = with maintainers; [ ]; - }; -} diff --git a/pkgs/development/python-modules/google_cloud_asset/default.nix b/pkgs/development/python-modules/google_cloud_asset/default.nix deleted file mode 100644 index 87b1fdf8fc9d..000000000000 --- a/pkgs/development/python-modules/google_cloud_asset/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, grpc_google_iam_v1 -, google_api_core, google-cloud-access-context-manager, google-cloud-org-policy -, libcst, proto-plus, pytest, pytest-asyncio, pytestCheckHook, mock }: - -buildPythonPackage rec { - pname = "google-cloud-asset"; - version = "2.2.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "1cf1b8a102eea8cec65eb07bef51dc15c1136cfc8564ea7fc5a39465b8f20017"; - }; - - disabled = pythonOlder "3.6"; - - checkInputs = [ mock pytest-asyncio pytestCheckHook ]; - disabledTests = [ "asset_service_transport_auth_adc" ]; - propagatedBuildInputs = [ - grpc_google_iam_v1 - google_api_core - google-cloud-access-context-manager - google-cloud-org-policy - libcst - proto-plus - ]; - - # Remove tests intended to be run in VPC - preCheck = '' - rm -rf tests/system - ''; - - meta = with stdenv.lib; { - description = "Python Client for Google Cloud Asset API"; - homepage = "https://github.com/googleapis/python-asset"; - license = licenses.asl20; - maintainers = [ maintainers.costrouc ]; - }; -} diff --git a/pkgs/development/python-modules/google_cloud_automl/default.nix b/pkgs/development/python-modules/google_cloud_automl/default.nix deleted file mode 100644 index 3ad8dcb12fb3..000000000000 --- a/pkgs/development/python-modules/google_cloud_automl/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, pytestCheckHook, libcst -, google_api_core, google_cloud_storage, google_cloud_testutils, pandas -, proto-plus, pytest-asyncio, mock }: - -buildPythonPackage rec { - pname = "google-cloud-automl"; - version = "2.1.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "520dfe2ee04d28f3088c9c582fa2a534fc272647d5e2e59acc903c0152e61696"; - }; - - disabled = pythonOlder "3.6"; - - checkInputs = [ - google_cloud_storage - google_cloud_testutils - mock - pandas - pytest-asyncio - pytestCheckHook - ]; - propagatedBuildInputs = [ google_api_core libcst proto-plus ]; - - # ignore tests which need credentials - disabledTests = [ "test_prediction_client_client_info" ]; - preCheck = '' - rm -r google - rm tests/system/gapic/v1beta1/test_system_tables_client_v1.py - ''; - - meta = with stdenv.lib; { - description = "Cloud AutoML API client library"; - homepage = "https://github.com/googleapis/python-automl"; - license = licenses.asl20; - maintainers = [ maintainers.costrouc ]; - }; -} diff --git a/pkgs/development/python-modules/google_cloud_bigquery/default.nix b/pkgs/development/python-modules/google_cloud_bigquery/default.nix deleted file mode 100644 index 3255475fbf51..000000000000 --- a/pkgs/development/python-modules/google_cloud_bigquery/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ stdenv, buildPythonPackage, fetchPypi, pytestCheckHook, pythonOlder, freezegun -, google_api_core, google_cloud_core, google_cloud_testutils -, google_resumable_media, grpcio, ipython, mock, pandas, proto-plus, pyarrow }: - -buildPythonPackage rec { - pname = "google-cloud-bigquery"; - version = "2.6.1"; - - src = fetchPypi { - inherit pname version; - sha256 = "1f99fd0c0c5bde999e056a1be666e5d5bbf392f62c9e730dfcbaf6e8408d44ef"; - }; - - disabled = pythonOlder "3.6"; - - checkInputs = - [ freezegun google_cloud_testutils ipython mock pytestCheckHook ]; - propagatedBuildInputs = [ - google_resumable_media - google_api_core - google_cloud_core - pandas - proto-plus - pyarrow - ]; - - # prevent google directory from shadowing google imports - # test_magics requires modifying sys.path - preCheck = '' - rm -r google - rm tests/unit/test_magics.py - ''; - - # call_api_applying_custom_retry_on_timeout requires credentials - # to_dataframe_timestamp_out_of_pyarrow_bounds has inconsistent results - disabledTests = [ - "call_api_applying_custom_retry_on_timeout" - "to_dataframe_timestamp_out_of_pyarrow_bounds" - ]; - - meta = with stdenv.lib; { - description = "Google BigQuery API client library"; - homepage = "https://pypi.org/project/google-cloud-bigquery"; - license = licenses.asl20; - maintainers = [ maintainers.costrouc ]; - }; -} diff --git a/pkgs/development/python-modules/google_cloud_bigquery_datatransfer/default.nix b/pkgs/development/python-modules/google_cloud_bigquery_datatransfer/default.nix deleted file mode 100644 index 8c71ac92c994..000000000000 --- a/pkgs/development/python-modules/google_cloud_bigquery_datatransfer/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ stdenv -, buildPythonPackage -, fetchPypi -, google_api_core -, pytest -, mock -}: - -buildPythonPackage rec { - pname = "google-cloud-bigquery-datatransfer"; - version = "2.1.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "0cca79f6ee312159ec3f3b7fea218c3dd51408d39c429ecbea037982e91cc827"; - }; - - checkInputs = [ pytest mock ]; - propagatedBuildInputs = [ google_api_core ]; - - checkPhase = '' - pytest tests/unit - ''; - - meta = with stdenv.lib; { - description = "BigQuery Data Transfer API client library"; - homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; - license = licenses.asl20; - maintainers = [ maintainers.costrouc ]; - }; -} diff --git a/pkgs/development/python-modules/google_cloud_container/default.nix b/pkgs/development/python-modules/google_cloud_container/default.nix deleted file mode 100644 index c5415b84ba1f..000000000000 --- a/pkgs/development/python-modules/google_cloud_container/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, google_api_core -, grpc_google_iam_v1, libcst, mock, proto-plus, pytest, pytest-asyncio }: - -buildPythonPackage rec { - pname = "google-cloud-container"; - version = "2.3.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "0dcd8084dd55c0439ff065d3fb206e2e5c695d3a25effd774b74f8ce43afc911"; - }; - - disabled = pythonOlder "3.6"; - - checkInputs = [ mock pytest pytest-asyncio ]; - propagatedBuildInputs = - [ google_api_core grpc_google_iam_v1 libcst proto-plus ]; - - checkPhase = '' - pytest tests/unit - ''; - - meta = with stdenv.lib; { - description = "Google Container Engine API client library"; - homepage = "https://github.com/googleapis/python-container"; - license = licenses.asl20; - maintainers = [ maintainers.costrouc ]; - }; -} diff --git a/pkgs/development/python-modules/google_cloud_dataproc/default.nix b/pkgs/development/python-modules/google_cloud_dataproc/default.nix deleted file mode 100644 index b0067d4316da..000000000000 --- a/pkgs/development/python-modules/google_cloud_dataproc/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ stdenv -, buildPythonPackage -, fetchPypi -, google_api_core -, pytest -, mock -, libcst -, proto-plus -}: - -buildPythonPackage rec { - pname = "google-cloud-dataproc"; - version = "2.2.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "81c44ac114c94df8f5b21245e5e7fc4eabce66b25fc432c3696b62b5de143b1f"; - }; - - checkInputs = [ pytest mock ]; - propagatedBuildInputs = [ google_api_core libcst proto-plus ]; - - checkPhase = '' - pytest tests/unit - ''; - - meta = with stdenv.lib; { - description = "Google Cloud Dataproc API client library"; - homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; - license = licenses.asl20; - maintainers = [ maintainers.costrouc ]; - }; -} diff --git a/pkgs/development/python-modules/google_cloud_datastore/default.nix b/pkgs/development/python-modules/google_cloud_datastore/default.nix deleted file mode 100644 index 07c6cd87237f..000000000000 --- a/pkgs/development/python-modules/google_cloud_datastore/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ stdenv -, buildPythonPackage -, fetchPypi -, google_api_core -, google_cloud_core -, pytest -, mock -}: - -buildPythonPackage rec { - pname = "google-cloud-datastore"; - version = "2.0.1"; - - src = fetchPypi { - inherit pname version; - sha256 = "0ebf3b0bcb483e066dfe73679e019e2d7b8c1652e26984702cf5e3f020592f6a"; - }; - - checkInputs = [ pytest mock ]; - propagatedBuildInputs = [ google_api_core google_cloud_core ]; - - checkPhase = '' - rm -r google - pytest tests/unit - ''; - - meta = with stdenv.lib; { - description = "Google Cloud Datastore API client library"; - homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; - license = licenses.asl20; - maintainers = [ maintainers.costrouc ]; - }; -} diff --git a/pkgs/development/python-modules/google_cloud_dlp/default.nix b/pkgs/development/python-modules/google_cloud_dlp/default.nix deleted file mode 100644 index a5a602dbeadb..000000000000 --- a/pkgs/development/python-modules/google_cloud_dlp/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ stdenv -, buildPythonPackage -, fetchPypi -, enum34 -, google_api_core -, pytest -, mock -}: - -buildPythonPackage rec { - pname = "google-cloud-dlp"; - version = "2.0.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "112c8a46979eebd60c3651037e62572fed413977ff2811901aa925c7b7ab9a5a"; - }; - - checkInputs = [ pytest mock ]; - propagatedBuildInputs = [ enum34 google_api_core ]; - - checkPhase = '' - pytest tests/unit - ''; - - meta = with stdenv.lib; { - description = "Cloud Data Loss Prevention (DLP) API API client library"; - homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; - license = licenses.asl20; - maintainers = [ maintainers.costrouc ]; - }; -} diff --git a/pkgs/development/python-modules/google_cloud_dns/default.nix b/pkgs/development/python-modules/google_cloud_dns/default.nix deleted file mode 100644 index d488b7ad5632..000000000000 --- a/pkgs/development/python-modules/google_cloud_dns/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ stdenv -, buildPythonPackage -, fetchPypi -, google_api_core -, google_cloud_core -, pytest -, mock -}: - -buildPythonPackage rec { - pname = "google-cloud-dns"; - version = "0.32.1"; - - src = fetchPypi { - inherit pname version; - sha256 = "7264e58067b55535ee859e124bd3da29337698ef6bb293da667d0316ddbe8606"; - }; - - checkInputs = [ pytest mock ]; - propagatedBuildInputs = [ google_api_core google_cloud_core ]; - - checkPhase = '' - rm -r google - pytest tests/unit - ''; - - meta = with stdenv.lib; { - description = "Google Cloud DNS API client library"; - homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; - license = licenses.asl20; - maintainers = [ maintainers.costrouc ]; - }; -} diff --git a/pkgs/development/python-modules/google_cloud_firestore/default.nix b/pkgs/development/python-modules/google_cloud_firestore/default.nix deleted file mode 100644 index 4f819bbf9bfa..000000000000 --- a/pkgs/development/python-modules/google_cloud_firestore/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ stdenv -, buildPythonPackage -, fetchPypi -, google_api_core -, google_cloud_core -, pytest -}: - -buildPythonPackage rec { - pname = "google-cloud-firestore"; - version = "2.0.1"; - - src = fetchPypi { - inherit pname version; - sha256 = "ae1f58d9174a6fb2c9fd2758c6d4fd237fb4f0decc632b80c217bfbceda38eb6"; - }; - - checkInputs = [ pytest ]; - propagatedBuildInputs = [ google_api_core google_cloud_core ]; - - # tests were not included with release - # See issue https://github.com/googleapis/google-cloud-python/issues/6380 - doCheck = false; - - checkPhase = '' - pytest tests/unit - ''; - - meta = with stdenv.lib; { - description = "Google Cloud Firestore API client library"; - homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; - license = licenses.asl20; - maintainers = [ maintainers.costrouc ]; - }; -} diff --git a/pkgs/development/python-modules/google_cloud_iot/default.nix b/pkgs/development/python-modules/google_cloud_iot/default.nix deleted file mode 100644 index 96364cfd7029..000000000000 --- a/pkgs/development/python-modules/google_cloud_iot/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ stdenv -, buildPythonPackage -, fetchPypi -, enum34 -, grpc_google_iam_v1 -, google_api_core -, pytest -, mock -}: - -buildPythonPackage rec { - pname = "google-cloud-iot"; - version = "2.0.1"; - - src = fetchPypi { - inherit pname version; - sha256 = "8af2be9c74697a350d5cc8ead00ae6cb4e85943564f1d782e8060d0d5eb15723"; - }; - - checkInputs = [ pytest mock ]; - propagatedBuildInputs = [ enum34 grpc_google_iam_v1 google_api_core ]; - - checkPhase = '' - pytest tests/unit - ''; - - meta = with stdenv.lib; { - description = "Cloud IoT API API client library"; - homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; - license = licenses.asl20; - # maintainers = [ maintainers. ]; - }; -} diff --git a/pkgs/development/python-modules/google_cloud_language/default.nix b/pkgs/development/python-modules/google_cloud_language/default.nix deleted file mode 100644 index 4f3defb4e4b9..000000000000 --- a/pkgs/development/python-modules/google_cloud_language/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ stdenv -, buildPythonPackage -, fetchPypi -, enum34 -, google_api_core -, pytest -, mock -}: - -buildPythonPackage rec { - pname = "google-cloud-language"; - version = "2.0.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "abe7abcd64d25ffdf6d063385869ef8f34a7de421d5676541cd6df63b3c37b88"; - }; - - checkInputs = [ pytest mock ]; - propagatedBuildInputs = [ enum34 google_api_core ]; - - checkPhase = '' - pytest tests/unit - ''; - - meta = with stdenv.lib; { - description = "Google Cloud Natural Language API client library"; - homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; - license = licenses.asl20; - maintainers = [ maintainers.costrouc ]; - }; -} diff --git a/pkgs/development/python-modules/google_cloud_logging/default.nix b/pkgs/development/python-modules/google_cloud_logging/default.nix deleted file mode 100644 index 96473edd583b..000000000000 --- a/pkgs/development/python-modules/google_cloud_logging/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ stdenv, buildPythonPackage, fetchPypi, pytestCheckHook, pythonOlder, django -, flask, google_api_core, google_cloud_core, google_cloud_testutils, mock -, webapp2 }: - -buildPythonPackage rec { - pname = "google-cloud-logging"; - version = "2.0.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "c8e4869ec22aa7958ff937c1acbd34d7a2a8a446af9a09ce442f24128eee063c"; - }; - - disabled = pythonOlder "3.5"; - - checkInputs = - [ django flask google_cloud_testutils mock pytestCheckHook webapp2 ]; - propagatedBuildInputs = [ google_api_core google_cloud_core ]; - - # api_url test broken, fix not yet released - # https://github.com/googleapis/python-logging/pull/66 - disabledTests = - [ "test_build_api_url_w_custom_endpoint" "test_write_log_entries" ]; - - # prevent google directory from shadowing google imports - # remove system integration tests - preCheck = '' - rm -r google - rm tests/system/test_system.py - ''; - - meta = with stdenv.lib; { - description = "Stackdriver Logging API client library"; - homepage = "https://github.com/googleapis/python-logging"; - license = licenses.asl20; - maintainers = [ maintainers.costrouc ]; - }; -} diff --git a/pkgs/development/python-modules/google_cloud_monitoring/default.nix b/pkgs/development/python-modules/google_cloud_monitoring/default.nix deleted file mode 100644 index 99557565e63a..000000000000 --- a/pkgs/development/python-modules/google_cloud_monitoring/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ stdenv -, buildPythonPackage -, fetchPypi -, google_api_core -, pandas -, pytest -, mock -}: - -buildPythonPackage rec { - pname = "google-cloud-monitoring"; - version = "2.0.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "1debfa046ab9518d46b68712c03d86d0ddb11d1aad428aed62c6465752f2201f"; - }; - - checkInputs = [ pytest mock ]; - propagatedBuildInputs = [ google_api_core pandas ]; - - checkPhase = '' - pytest tests/unit - ''; - - meta = with stdenv.lib; { - description = "Stackdriver Monitoring API client library"; - homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; - license = licenses.asl20; - maintainers = [ maintainers.costrouc ]; - }; -} diff --git a/pkgs/development/python-modules/google_cloud_pubsub/default.nix b/pkgs/development/python-modules/google_cloud_pubsub/default.nix deleted file mode 100644 index b7b810370f98..000000000000 --- a/pkgs/development/python-modules/google_cloud_pubsub/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, pytestCheckHook -, google_api_core, google_cloud_testutils, grpc_google_iam_v1, libcst, mock -, proto-plus, pytest-asyncio }: - -buildPythonPackage rec { - pname = "google-cloud-pubsub"; - version = "2.2.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "bc50a60803f5c409a295ec0e31cdd4acc271611ce3f4963a072036bbfa5ccde5"; - }; - - disabled = pythonOlder "3.6"; - - checkInputs = [ google_cloud_testutils mock pytestCheckHook pytest-asyncio ]; - propagatedBuildInputs = - [ grpc_google_iam_v1 google_api_core libcst proto-plus ]; - - # prevent google directory from shadowing google imports - # Tests in pubsub_v1 attempt to contact pubsub.googleapis.com - preCheck = '' - rm -r google - rm -r tests/unit/pubsub_v1 - ''; - - pythonImportsCheck = [ "google.cloud.pubsub" ]; - - meta = with stdenv.lib; { - description = "Google Cloud Pub/Sub API client library"; - homepage = "https://pypi.org/project/google-cloud-pubsub"; - license = licenses.asl20; - maintainers = [ maintainers.costrouc ]; - }; -} diff --git a/pkgs/development/python-modules/google_cloud_redis/default.nix b/pkgs/development/python-modules/google_cloud_redis/default.nix deleted file mode 100644 index 3337d9f3c55b..000000000000 --- a/pkgs/development/python-modules/google_cloud_redis/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ stdenv -, buildPythonPackage -, fetchPypi -, enum34 -, google_api_core -, pytest -, mock -}: - -buildPythonPackage rec { - pname = "google-cloud-redis"; - version = "2.0.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "c783118462d9272fb9f519ef43b6ce383e99ad631e922a1f06fbef7148aec7b8"; - }; - - checkInputs = [ pytest mock ]; - propagatedBuildInputs = [ enum34 google_api_core ]; - - # requires old version of google-api-core (override) - preBuild = '' - sed -i "s/'google-api-core\[grpc\] >= 0.1.0, < 0.2.0dev'/'google-api-core'/g" setup.py - sed -i "s/google-api-core\[grpc\]<0.2.0dev,>=0.1.0/google-api-core/g" google_cloud_redis.egg-info/requires.txt - ''; - - checkPhase = '' - pytest tests/unit - ''; - - meta = with stdenv.lib; { - description = "Google Cloud Memorystore for Redis API client library"; - homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; - license = licenses.asl20; - maintainers = [ maintainers.costrouc ]; - }; -} diff --git a/pkgs/development/python-modules/google_cloud_resource_manager/default.nix b/pkgs/development/python-modules/google_cloud_resource_manager/default.nix deleted file mode 100644 index 815ecc118f9b..000000000000 --- a/pkgs/development/python-modules/google_cloud_resource_manager/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ stdenv, buildPythonPackage, fetchPypi, pytestCheckHook, pythonOlder -, google_cloud_core, google_api_core, mock, pytest }: - -buildPythonPackage rec { - pname = "google-cloud-resource-manager"; - version = "0.30.3"; - - src = fetchPypi { - inherit pname version; - sha256 = "3577bbf38f2c7c2f42306b8dfdeffbb0eedf45aaec947fd513d51937f72046d1"; - }; - - disabled = pythonOlder "3.5"; - - checkInputs = [ mock pytestCheckHook ]; - propagatedBuildInputs = [ google_api_core google_cloud_core ]; - - # api_url test broken, fix not yet released - # https://github.com/googleapis/python-resource-manager/pull/31 - disabledTests = - [ "api_url_no_extra_query_param" "api_url_w_custom_endpoint" ]; - - # prevent google directory from shadowing google imports - preCheck = '' - rm -r google - ''; - - meta = with stdenv.lib; { - description = "Google Cloud Resource Manager API client library"; - homepage = "https://github.com/googleapis/python-resource-manager"; - license = licenses.asl20; - maintainers = [ maintainers.costrouc ]; - }; -} diff --git a/pkgs/development/python-modules/google_cloud_runtimeconfig/default.nix b/pkgs/development/python-modules/google_cloud_runtimeconfig/default.nix deleted file mode 100644 index d4fb4c59a18c..000000000000 --- a/pkgs/development/python-modules/google_cloud_runtimeconfig/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ stdenv, buildPythonPackage, fetchPypi, pytestCheckHook, pythonOlder -, google_api_core, google_cloud_core, mock }: - -buildPythonPackage rec { - pname = "google-cloud-runtimeconfig"; - version = "0.32.1"; - - src = fetchPypi { - inherit pname version; - sha256 = "57143ec3c5ed3e0bee590a98857eec06c68aa2eacbce477403226a0d2e85a8ad"; - }; - - disabled = pythonOlder "3.5"; - - checkInputs = [ mock pytestCheckHook ]; - propagatedBuildInputs = [ google_api_core google_cloud_core ]; - - # api_url test broken, fix not yet released - # https://github.com/googleapis/python-resource-manager/pull/31 - # Client tests require credentials - disabledTests = [ "build_api_url_w_custom_endpoint" "client_options" ]; - - # prevent google directory from shadowing google imports - preCheck = '' - rm -r google - ''; - - meta = with stdenv.lib; { - description = "Google Cloud RuntimeConfig API client library"; - homepage = "https://pypi.org/project/google-cloud-runtimeconfig"; - license = licenses.asl20; - maintainers = [ maintainers.costrouc ]; - }; -} diff --git a/pkgs/development/python-modules/google_cloud_secret_manager/default.nix b/pkgs/development/python-modules/google_cloud_secret_manager/default.nix deleted file mode 100644 index c744701c7789..000000000000 --- a/pkgs/development/python-modules/google_cloud_secret_manager/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib, buildPythonPackage, fetchPypi -, grpc_google_iam_v1, google_api_core, libcst, proto-plus -, pytest, mock -}: - -buildPythonPackage rec { - pname = "google-cloud-secret-manager"; - version = "2.1.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "2f08b49164aca8623b2e4ee07352980b3ffca909ce205c03568e203bbc455c30"; - }; - - propagatedBuildInputs = [ - google_api_core - grpc_google_iam_v1 - libcst - proto-plus - ]; - - checkInputs = [ - mock - pytest - ]; - checkPhase = '' - pytest - ''; - - meta = with lib; { - description = "Secret Manager API: Stores, manages, and secures access to application secrets"; - homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; - license = licenses.asl20; - maintainers = with maintainers; [ siriobalmelli ]; - }; -} diff --git a/pkgs/development/python-modules/google_cloud_securitycenter/default.nix b/pkgs/development/python-modules/google_cloud_securitycenter/default.nix deleted file mode 100644 index cad4b0799c28..000000000000 --- a/pkgs/development/python-modules/google_cloud_securitycenter/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ stdenv -, buildPythonPackage -, fetchPypi -, enum34 -, grpc_google_iam_v1 -, google_api_core -, pytest -, mock -}: - -buildPythonPackage rec { - pname = "google-cloud-securitycenter"; - version = "1.0.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "45d47a4389f2f19958a9db8e5c2f169c9b9385e74338fef0a4e49160153df7f7"; - }; - - checkInputs = [ pytest mock ]; - propagatedBuildInputs = [ enum34 grpc_google_iam_v1 google_api_core ]; - - checkPhase = '' - pytest tests/unit - ''; - - meta = with stdenv.lib; { - description = "Cloud Security Command Center API API client library"; - homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; - license = licenses.asl20; - maintainers = [ maintainers.costrouc ]; - }; -} diff --git a/pkgs/development/python-modules/google_cloud_spanner/default.nix b/pkgs/development/python-modules/google_cloud_spanner/default.nix deleted file mode 100644 index 38bd65aa091d..000000000000 --- a/pkgs/development/python-modules/google_cloud_spanner/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ stdenv, buildPythonPackage, fetchPypi, pytestCheckHook, pythonOlder -, grpc_google_iam_v1, grpcio-gcp, google_api_core, google_cloud_core -, google_cloud_testutils, mock, pytest }: - -buildPythonPackage rec { - pname = "google-cloud-spanner"; - version = "2.0.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "edac9d86ea2d8e87c048423f610cd3e5dbb6f9db7f1f9353ff133014689e97c6"; - }; - - disabled = pythonOlder "3.5"; - - checkInputs = [ google_cloud_testutils mock pytestCheckHook ]; - propagatedBuildInputs = - [ grpcio-gcp grpc_google_iam_v1 google_api_core google_cloud_core ]; - - # prevent google directory from shadowing google imports - # remove tests that require credentials - preCheck = '' - rm -r google - rm tests/system/test_system.py - ''; - - meta = with stdenv.lib; { - description = "Cloud Spanner API client library"; - homepage = "https://pypi.org/project/google-cloud-spanner"; - license = licenses.asl20; - maintainers = [ maintainers.costrouc ]; - }; -} diff --git a/pkgs/development/python-modules/google_cloud_speech/default.nix b/pkgs/development/python-modules/google_cloud_speech/default.nix deleted file mode 100644 index 57b2efb9ebbc..000000000000 --- a/pkgs/development/python-modules/google_cloud_speech/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, buildPythonPackage, fetchPypi -, google_api_core, pytest, mock }: - -buildPythonPackage rec { - pname = "google-cloud-speech"; - version = "2.0.1"; - - src = fetchPypi { - inherit pname version; - sha256 = "a7428190f4c10440148a273eb4c91480470b34180eec422b7325acdc0b2c0832"; - }; - - propagatedBuildInputs = [ google_api_core ]; - checkInputs = [ pytest mock ]; - - checkPhase = '' - pytest tests/unit - ''; - - meta = with stdenv.lib; { - description = "Cloud Speech API enables integration of Google speech recognition into applications."; - homepage = "https://github.com/googleapis/google-cloud-python/tree/master/speech"; - license = licenses.asl20; - maintainers = with maintainers; [ ]; - }; -} diff --git a/pkgs/development/python-modules/google_cloud_storage/default.nix b/pkgs/development/python-modules/google_cloud_storage/default.nix deleted file mode 100644 index a1b572db11e5..000000000000 --- a/pkgs/development/python-modules/google_cloud_storage/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ lib, buildPythonPackage, fetchPypi, pytestCheckHook, pythonOlder -, google_api_core, google_auth, google-cloud-iam, google_cloud_core -, google_cloud_kms, google_cloud_testutils, google_resumable_media, mock -, requests }: - -buildPythonPackage rec { - pname = "google-cloud-storage"; - version = "1.33.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "900ba027bdee6b97f21cd22d1db3d1a6233ede5de2db4754db860438bdad72d2"; - }; - - disabled = pythonOlder "3.5"; - - propagatedBuildInputs = [ - google_api_core - google_auth - google_cloud_core - google_resumable_media - requests - ]; - checkInputs = [ - google-cloud-iam - google_cloud_kms - google_cloud_testutils - mock - pytestCheckHook - ]; - - # disable tests which require credentials - disabledTests = [ "create" "get" "post" "test_build_api_url" ]; - - # prevent google directory from shadowing google imports - # remove tests which require credentials - preCheck = '' - rm -r google - rm tests/system/test_system.py tests/unit/test_client.py - ''; - - meta = with lib; { - description = "Google Cloud Storage API client library"; - homepage = "https://github.com/googleapis/python-storage"; - license = licenses.asl20; - maintainers = with maintainers; [ costrouc ]; - }; -} diff --git a/pkgs/development/python-modules/google_cloud_tasks/default.nix b/pkgs/development/python-modules/google_cloud_tasks/default.nix deleted file mode 100644 index ca252b2c5edb..000000000000 --- a/pkgs/development/python-modules/google_cloud_tasks/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ stdenv -, buildPythonPackage -, fetchPypi -, enum34 -, grpc_google_iam_v1 -, google_api_core -, pytest -, mock -}: - -buildPythonPackage rec { - pname = "google-cloud-tasks"; - version = "2.0.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "a9dd004057fc441eee8c18bb2dc3bb20ba7b85f353d66894c61e42aeb8764e76"; - }; - - checkInputs = [ pytest mock ]; - propagatedBuildInputs = [ enum34 grpc_google_iam_v1 google_api_core ]; - - checkPhase = '' - pytest tests/unit - ''; - - meta = with stdenv.lib; { - description = "Cloud Tasks API API client library"; - homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; - license = licenses.asl20; - maintainers = [ maintainers.costrouc ]; - }; -} diff --git a/pkgs/development/python-modules/google_cloud_texttospeech/default.nix b/pkgs/development/python-modules/google_cloud_texttospeech/default.nix deleted file mode 100644 index 32e8fa223a88..000000000000 --- a/pkgs/development/python-modules/google_cloud_texttospeech/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ stdenv, buildPythonPackage, fetchPypi, pytestCheckHook, pythonOlder -, google_api_core, libcst, mock, proto-plus, pytest-asyncio, }: - -buildPythonPackage rec { - pname = "google-cloud-texttospeech"; - version = "2.2.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "cbbd397e72b6189668134f3c8e8c303198188334a4e6a5f77cc90c3220772f9e"; - }; - - disabled = pythonOlder "3.5"; - - checkInputs = [ mock pytest-asyncio pytestCheckHook ]; - propagatedBuildInputs = [ google_api_core libcst proto-plus ]; - - # Disable tests that require credentials - disabledTests = ["test_synthesize_speech" "test_list_voices"]; - - meta = with stdenv.lib; { - description = "Google Cloud Text-to-Speech API client library"; - homepage = "https://github.com/googleapis/python-texttospeech"; - license = licenses.asl20; - maintainers = [ maintainers.costrouc ]; - }; -} diff --git a/pkgs/development/python-modules/google_cloud_trace/default.nix b/pkgs/development/python-modules/google_cloud_trace/default.nix deleted file mode 100644 index b0efb65d0d2f..000000000000 --- a/pkgs/development/python-modules/google_cloud_trace/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ stdenv -, buildPythonPackage -, fetchPypi -, google_api_core -, google_cloud_core -, pytest -, mock -}: - -buildPythonPackage rec { - pname = "google-cloud-trace"; - version = "1.1.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "1bd1ee5c274a584929913d9118134e01afe106644cb749ccc3111e1a38a96cd3"; - }; - - checkInputs = [ pytest mock ]; - propagatedBuildInputs = [ google_api_core google_cloud_core ]; - - checkPhase = '' - pytest tests/unit - ''; - - meta = with stdenv.lib; { - description = "Stackdriver Trace API client library"; - homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; - license = licenses.asl20; - maintainers = [ maintainers.costrouc ]; - }; -} diff --git a/pkgs/development/python-modules/google_cloud_translate/default.nix b/pkgs/development/python-modules/google_cloud_translate/default.nix deleted file mode 100644 index 1049895bda1b..000000000000 --- a/pkgs/development/python-modules/google_cloud_translate/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ stdenv, buildPythonPackage, fetchPypi, pytestCheckHook, pythonOlder -, google_api_core, google_cloud_core, google_cloud_testutils, grpcio, libcst -, mock, proto-plus, pytest-asyncio }: - -buildPythonPackage rec { - pname = "google-cloud-translate"; - version = "3.0.2"; - - src = fetchPypi { - inherit pname version; - sha256 = "6183168465749f007449ef4125356d03cca0114ed49faf7ed64f34ec3edd4fe8"; - }; - - disabled = pythonOlder "3.6"; - - # google_cloud_core[grpc] -> grpcio - propagatedBuildInputs = - [ google_api_core google_cloud_core grpcio libcst proto-plus ]; - - checkInputs = [ google_cloud_testutils mock pytest-asyncio pytestCheckHook ]; - - # test_http.py broken, fix not yet released - # https://github.com/googleapis/python-translate/pull/69 - disabledTests = [ - "test_build_api_url_w_extra_query_params" - "test_build_api_url_no_extra_query_params" - "test_build_api_url_w_custom_endpoint" - ]; - - preCheck = '' - rm -r google - ''; - - meta = with stdenv.lib; { - description = "Google Cloud Translation API client library"; - homepage = "https://github.com/googleapis/python-translate"; - license = licenses.asl20; - maintainers = [ maintainers.costrouc ]; - }; -} diff --git a/pkgs/development/python-modules/google_cloud_videointelligence/default.nix b/pkgs/development/python-modules/google_cloud_videointelligence/default.nix deleted file mode 100644 index b823e105b843..000000000000 --- a/pkgs/development/python-modules/google_cloud_videointelligence/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ stdenv -, buildPythonPackage -, fetchPypi -, google_api_core -, pytest -, mock -}: - -buildPythonPackage rec { - pname = "google-cloud-videointelligence"; - version = "2.0.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "02a91a25b3890a743bde21e03abddf11dcaf7966cc44f09bc8d507f2e28f15fa"; - }; - - checkInputs = [ pytest mock ]; - propagatedBuildInputs = [ google_api_core ]; - - checkPhase = '' - pytest tests/unit - ''; - - meta = with stdenv.lib; { - description = "Google Cloud Video Intelligence API client library"; - homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; - license = licenses.asl20; - maintainers = [ maintainers.costrouc ]; - }; -} diff --git a/pkgs/development/python-modules/google_cloud_vision/default.nix b/pkgs/development/python-modules/google_cloud_vision/default.nix deleted file mode 100644 index fd738a522661..000000000000 --- a/pkgs/development/python-modules/google_cloud_vision/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ stdenv -, buildPythonPackage -, fetchPypi -, enum34 -, google_api_core -, mock -}: - -buildPythonPackage rec { - pname = "google-cloud-vision"; - version = "2.0.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "6a067d9a661df2e9b356b2772051decfea1971f8d659c246412a165baf827c61"; - }; - - checkInputs = [ mock ]; - propagatedBuildInputs = [ enum34 google_api_core ]; - - # pytest seems to pick up some file which overrides PYTHONPATH - checkPhase = '' - cd tests/unit - python -m unittest discover - ''; - - meta = with stdenv.lib; { - description = "Cloud Vision API API client library"; - homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; - license = licenses.asl20; - maintainers = [ maintainers.costrouc ]; - }; -} diff --git a/pkgs/development/python-modules/google_cloud_websecurityscanner/default.nix b/pkgs/development/python-modules/google_cloud_websecurityscanner/default.nix deleted file mode 100644 index 356759f9bcb5..000000000000 --- a/pkgs/development/python-modules/google_cloud_websecurityscanner/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, buildPythonPackage, fetchPypi, pytestCheckHook, pythonOlder -, google_api_core, libcst, mock, proto-plus, pytest-asyncio }: - -buildPythonPackage rec { - pname = "google-cloud-websecurityscanner"; - version = "1.0.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "1de60f880487b898b499345f46f7acf38651f5356ebca8673116003a57f25393"; - }; - - disabled = pythonOlder "3.6"; - - checkInputs = [ mock pytest-asyncio pytestCheckHook ]; - propagatedBuildInputs = [ google_api_core libcst proto-plus ]; - - meta = with stdenv.lib; { - description = "Google Cloud Web Security Scanner API client library"; - homepage = "https://github.com/googleapis/python-websecurityscanner"; - license = licenses.asl20; - maintainers = [ maintainers.costrouc ]; - }; -} diff --git a/pkgs/development/python-modules/google_resumable_media/default.nix b/pkgs/development/python-modules/google_resumable_media/default.nix deleted file mode 100644 index 37bfbfc481ba..000000000000 --- a/pkgs/development/python-modules/google_resumable_media/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib -, buildPythonPackage -, isPy3k -, fetchPypi -, six -, requests -, setuptools -, pytest -, mock -, crcmod -, google-crc32c -}: - -buildPythonPackage rec { - pname = "google-resumable-media"; - version = "1.1.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "dcdab13e95bc534d268f87d5293e482cce5bc86dfce6ca0f2e2e89cbb73ef38c"; - }; - - checkInputs = [ pytest mock ]; - propagatedBuildInputs = [ requests setuptools six ] - ++ lib.optional isPy3k google-crc32c - ++ lib.optional (!isPy3k) crcmod; - - checkPhase = '' - py.test tests/unit - ''; - - meta = with lib; { - description = "Utilities for Google Media Downloads and Resumable Uploads"; - homepage = "https://github.com/GoogleCloudPlatform/google-resumable-media-python"; - license = licenses.asl20; - maintainers = [ maintainers.costrouc ]; - }; -} diff --git a/pkgs/development/python-modules/googleapis_common_protos/default.nix b/pkgs/development/python-modules/googleapis_common_protos/default.nix index 507c3ba229a6..7e5b786b4fba 100644 --- a/pkgs/development/python-modules/googleapis_common_protos/default.nix +++ b/pkgs/development/python-modules/googleapis_common_protos/default.nix @@ -1,5 +1,10 @@ -{ stdenv, buildPythonPackage, fetchPypi -, protobuf, pytest, setuptools }: +{ lib, stdenv +, buildPythonPackage +, fetchPypi +, grpc +, protobuf +, pytestCheckHook +}: buildPythonPackage rec { pname = "googleapis-common-protos"; @@ -7,18 +12,26 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "560716c807117394da12cecb0a54da5a451b5cf9866f1d37e9a5e2329a665351"; + sha256 = "0lakcsd35qm5x4visvw6z5f1niasv9a0mjyf2bd98wqi0z41c1sn"; }; - propagatedBuildInputs = [ protobuf setuptools ]; - checkInputs = [ pytest ]; + propagatedBuildInputs = [ grpc protobuf ]; - doCheck = false; # there are no tests + # does not contain tests + doCheck = false; - meta = with stdenv.lib; { + pythonImportsCheck = [ + "google.api" + "google.logging" + "google.longrunning" + "google.rpc" + "google.type" + ]; + + meta = with lib; { description = "Common protobufs used in Google APIs"; - homepage = "https://github.com/googleapis/googleapis"; + homepage = "https://github.com/googleapis/python-api-common-protos"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } diff --git a/pkgs/development/python-modules/googlemaps/default.nix b/pkgs/development/python-modules/googlemaps/default.nix index 7e13aedec475..c971119833e6 100644 --- a/pkgs/development/python-modules/googlemaps/default.nix +++ b/pkgs/development/python-modules/googlemaps/default.nix @@ -1,6 +1,11 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub +{ lib, stdenv +, buildPythonPackage +, fetchFromGitHub , requests -, responses, pytestCheckHook, pytest, pytestcov, isPy27 +, responses +, pytestCheckHook +, pytestcov +, isPy27 }: buildPythonPackage rec { @@ -25,7 +30,7 @@ buildPythonPackage rec { "test_transit_without_time" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/googlemaps/google-maps-services-python"; description = "Python client library for Google Maps API Web Services"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/googletrans/default.nix b/pkgs/development/python-modules/googletrans/default.nix index 06d008200059..32b839ab11c2 100644 --- a/pkgs/development/python-modules/googletrans/default.nix +++ b/pkgs/development/python-modules/googletrans/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchFromGitHub, requests, pytest, coveralls }: +{ lib, buildPythonPackage, fetchFromGitHub, requests }: buildPythonPackage rec { pname = "googletrans"; @@ -11,17 +11,10 @@ buildPythonPackage rec { sha256 = "0wzzinn0k9rfv9z1gmfk9l4kljyd4n6kizsjw4wjxv91kfhj92hz"; }; - propagatedBuildInputs = [ - requests - ]; - - checkInputs = [ pytest coveralls ]; + propagatedBuildInputs = [ requests ]; # majority of tests just try to ping Google's Translate API endpoint doCheck = false; - checkPhase = '' - pytest - ''; pythonImportsCheck = [ "googletrans" ]; diff --git a/pkgs/development/python-modules/gorilla/default.nix b/pkgs/development/python-modules/gorilla/default.nix index d93cddee765e..bf4212edc510 100644 --- a/pkgs/development/python-modules/gorilla/default.nix +++ b/pkgs/development/python-modules/gorilla/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi}: +{ lib, stdenv, buildPythonPackage, fetchPypi}: buildPythonPackage rec { pname = "gorilla"; @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "feb2899b923935c25420b94aa8c266ccb5c0315199c685b725303a73195d802c"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/christophercrouzet/gorilla"; description = "Convenient approach to monkey patching"; license = licenses.mit; diff --git a/pkgs/development/python-modules/gpapi/default.nix b/pkgs/development/python-modules/gpapi/default.nix index 1181c59c1fc4..788473b5ab8f 100644 --- a/pkgs/development/python-modules/gpapi/default.nix +++ b/pkgs/development/python-modules/gpapi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, pythonOlder +{ lib, stdenv, buildPythonPackage, fetchPypi, pythonOlder , requests , protobuf , pycryptodome @@ -16,7 +16,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests protobuf pycryptodome ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/NoMore201/googleplay-api"; license = licenses.gpl3; description = "Google Play Unofficial Python API"; diff --git a/pkgs/development/python-modules/gphoto2/default.nix b/pkgs/development/python-modules/gphoto2/default.nix index 2834fc5a735d..a25c85514902 100644 --- a/pkgs/development/python-modules/gphoto2/default.nix +++ b/pkgs/development/python-modules/gphoto2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage +{ lib, stdenv, fetchPypi, buildPythonPackage , pkgconfig , libgphoto2 }: @@ -17,7 +17,7 @@ buildPythonPackage rec { doCheck = false; # No tests available - meta = with stdenv.lib; { + meta = with lib; { description = "Python interface to libgphoto2"; homepage = "https://github.com/jim-easterbrook/python-gphoto2"; license = licenses.gpl3; diff --git a/pkgs/development/python-modules/gplaycli/default.nix b/pkgs/development/python-modules/gplaycli/default.nix index 7e7403239010..ecd52ad848c9 100644 --- a/pkgs/development/python-modules/gplaycli/default.nix +++ b/pkgs/development/python-modules/gplaycli/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, stdenv, libffi, isPy3k, pyasn1, clint, ndg-httpsclient +{ buildPythonPackage, lib, stdenv, libffi, isPy3k, pyasn1, clint, ndg-httpsclient , protobuf, requests, args, gpapi, pyaxmlparser, fetchFromGitHub }: @@ -17,7 +17,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ libffi pyasn1 clint ndg-httpsclient protobuf requests args gpapi pyaxmlparser ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/matlink/gplaycli"; description = "Google Play Downloader via Command line"; license = licenses.agpl3Plus; diff --git a/pkgs/development/python-modules/gpsoauth/default.nix b/pkgs/development/python-modules/gpsoauth/default.nix index 57130a7aa529..2c4dfcd81395 100644 --- a/pkgs/development/python-modules/gpsoauth/default.nix +++ b/pkgs/development/python-modules/gpsoauth/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , cffi @@ -26,7 +26,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ cffi cryptography enum34 idna ipaddress ndg-httpsclient pyopenssl pyasn1 pycparser pycryptodomex requests six ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A python client library for Google Play Services OAuth"; homepage = "https://github.com/simon-weber/gpsoauth"; license = licenses.mit; diff --git a/pkgs/development/python-modules/gpy/default.nix b/pkgs/development/python-modules/gpy/default.nix index e4a20bc83d72..9c444f465f30 100644 --- a/pkgs/development/python-modules/gpy/default.nix +++ b/pkgs/development/python-modules/gpy/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , numpy @@ -43,7 +43,7 @@ buildPythonPackage rec { "GPy" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Gaussian process framework in Python"; homepage = "https://sheffieldml.github.io/GPy"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/gpyopt/default.nix b/pkgs/development/python-modules/gpyopt/default.nix index 67f934ccf053..22e6743582c2 100644 --- a/pkgs/development/python-modules/gpyopt/default.nix +++ b/pkgs/development/python-modules/gpyopt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, setuptools +{ lib, stdenv, buildPythonPackage, fetchFromGitHub, setuptools , numpy, scipy, gpy, emcee, nose }: buildPythonPackage rec { @@ -20,7 +20,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ setuptools numpy scipy gpy emcee ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Bayesian optimization toolbox in Python"; homepage = "https://sheffieldml.github.io/GPyOpt"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/gradient_sdk/default.nix b/pkgs/development/python-modules/gradient_sdk/default.nix index 3ee66a1c5242..adaafd8eadbe 100644 --- a/pkgs/development/python-modules/gradient_sdk/default.nix +++ b/pkgs/development/python-modules/gradient_sdk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage +{ lib, stdenv, fetchPypi, buildPythonPackage , hyperopt }: @@ -15,7 +15,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "gradient_sdk" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Gradient ML SDK"; homepage = "https://github.com/Paperspace/gradient-sdk"; license = licenses.mit; diff --git a/pkgs/development/python-modules/gradient_statsd/default.nix b/pkgs/development/python-modules/gradient_statsd/default.nix index 14623ff625f5..607737d99ae0 100644 --- a/pkgs/development/python-modules/gradient_statsd/default.nix +++ b/pkgs/development/python-modules/gradient_statsd/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { # Pypi does not contain tests doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Wrapper around the DogStatsd client"; homepage = "https://paperspace.com"; license = licenses.mit; diff --git a/pkgs/development/python-modules/graphene/default.nix b/pkgs/development/python-modules/graphene/default.nix new file mode 100644 index 000000000000..301ffca03477 --- /dev/null +++ b/pkgs/development/python-modules/graphene/default.nix @@ -0,0 +1,50 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, aniso8601 +, iso8601 +, graphql-core +, graphql-relay +, pytestCheckHook +, pytest-asyncio +, pytest-benchmark +, pytest-mock +, pytz +, snapshottest +}: + +buildPythonPackage rec { + pname = "graphene"; + version = "3.0.0b7"; + + src = fetchFromGitHub { + owner = "graphql-python"; + repo = "graphene"; + rev = "v${version}"; + sha256 = "sha256-bVCCLPnV5F8PqLMg3GwcpwpGldrxsU+WryL6gj6y338="; + }; + + propagatedBuildInputs = [ + aniso8601 + graphql-core + graphql-relay + ]; + + checkInputs = [ + pytestCheckHook + pytest-asyncio + pytest-benchmark + pytest-mock + pytz + snapshottest + ]; + + pythonImportsCheck = [ "graphene" ]; + + meta = with lib; { + description = "GraphQL Framework for Python"; + homepage = "https://github.com/graphql-python/graphene"; + license = licenses.mit; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/development/python-modules/graphite-web/default.nix b/pkgs/development/python-modules/graphite-web/default.nix index 16341e718084..0bced13cd112 100644 --- a/pkgs/development/python-modules/graphite-web/default.nix +++ b/pkgs/development/python-modules/graphite-web/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy3k +{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k , django, django_tagging, whisper, pycairo, cairocffi, ldap, memcached, pytz, urllib3, scandir }: buildPythonPackage rec { @@ -28,7 +28,7 @@ buildPythonPackage rec { --replace "join(WEBAPP_DIR, 'content')" "join('$out', 'webapp', 'content')" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://graphiteapp.org/"; description = "Enterprise scalable realtime graphing"; maintainers = with maintainers; [ offline basvandijk ]; diff --git a/pkgs/development/python-modules/graphite_beacon/default.nix b/pkgs/development/python-modules/graphite_beacon/default.nix index cc070f55323c..06b66ccbc145 100644 --- a/pkgs/development/python-modules/graphite_beacon/default.nix +++ b/pkgs/development/python-modules/graphite_beacon/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ lib, stdenv, buildPythonPackage, fetchPypi , tornado_5, pyyaml, funcparserlib , nixosTests }: @@ -24,7 +24,7 @@ buildPythonPackage rec { nixos = nixosTests.graphite; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A simple alerting application for Graphite metrics"; homepage = "https://github.com/klen/graphite-beacon"; maintainers = [ maintainers.offline ]; diff --git a/pkgs/development/python-modules/graphql-relay/default.nix b/pkgs/development/python-modules/graphql-relay/default.nix new file mode 100644 index 000000000000..fa6a9ec60a73 --- /dev/null +++ b/pkgs/development/python-modules/graphql-relay/default.nix @@ -0,0 +1,24 @@ +{ lib, buildPythonPackage, fetchPypi, graphql-core, pytestCheckHook }: + +buildPythonPackage rec { + pname = "graphql-relay"; + version = "3.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0mjmpf4abrxfyln0ykxq4xa6lp7xwgqr8631qp011hv0nfl6jgxd"; + }; + + propagatedBuildInputs = [ graphql-core ]; + + checkInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "graphql_relay" ]; + + meta = with lib; { + description = "A library to help construct a graphql-py server supporting react-relay"; + homepage = "https://github.com/graphql-python/graphql-relay-py/"; + license = licenses.mit; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/development/python-modules/grappelli_safe/default.nix b/pkgs/development/python-modules/grappelli_safe/default.nix index 299ce04f6fa2..7b2dd7e3fedd 100644 --- a/pkgs/development/python-modules/grappelli_safe/default.nix +++ b/pkgs/development/python-modules/grappelli_safe/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi }: @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "35b7ccaf9acc54684c73aeefbeaddc63b8a16143bd981bd5b3ebef253def07df"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A snapshot of django-grappelli for the Mezzanine CMS"; longDescription = '' grappelli_safe was created to provide a snapshot of the diff --git a/pkgs/development/python-modules/grequests/default.nix b/pkgs/development/python-modules/grequests/default.nix index 34e8c7ff16ff..5ce5df8cdea2 100644 --- a/pkgs/development/python-modules/grequests/default.nix +++ b/pkgs/development/python-modules/grequests/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , requests @@ -19,7 +19,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests gevent ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Asynchronous HTTP requests"; homepage = "https://github.com/kennethreitz/grequests"; license = with licenses; [ bsd2 ]; diff --git a/pkgs/development/python-modules/grip/default.nix b/pkgs/development/python-modules/grip/default.nix index cf29b11b268e..019cd798d640 100644 --- a/pkgs/development/python-modules/grip/default.nix +++ b/pkgs/development/python-modules/grip/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , fetchpatch # Python bits: @@ -42,7 +42,7 @@ buildPythonPackage rec { py.test -xm "not assumption" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Preview GitHub Markdown files like Readme locally before committing them"; homepage = "https://github.com/joeyespo/grip"; license = licenses.mit; diff --git a/pkgs/development/python-modules/grpc_google_iam_v1/default.nix b/pkgs/development/python-modules/grpc_google_iam_v1/default.nix index caa3b8cafb4c..dd9527006dad 100644 --- a/pkgs/development/python-modules/grpc_google_iam_v1/default.nix +++ b/pkgs/development/python-modules/grpc_google_iam_v1/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , grpcio @@ -22,7 +22,7 @@ buildPythonPackage rec { doCheck = false; checkInputs = [ pytest ]; - meta = with stdenv.lib; { + meta = with lib; { description = "GRPC library for the google-iam-v1 service"; homepage = "https://github.com/googleapis/googleapis"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/grpcio-gcp/default.nix b/pkgs/development/python-modules/grpcio-gcp/default.nix index 6af70be2f6cb..1b631c0973ed 100644 --- a/pkgs/development/python-modules/grpcio-gcp/default.nix +++ b/pkgs/development/python-modules/grpcio-gcp/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , grpcio @@ -15,7 +15,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ grpcio ]; - meta = with stdenv.lib; { + meta = with lib; { description = "gRPC extensions for Google Cloud Platform"; homepage = "https://grpc.io"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/grpcio-tools/default.nix b/pkgs/development/python-modules/grpcio-tools/default.nix index 417b9d82e2e2..efae4b102d44 100644 --- a/pkgs/development/python-modules/grpcio-tools/default.nix +++ b/pkgs/development/python-modules/grpcio-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, protobuf, grpcio, setuptools }: +{ lib, stdenv, buildPythonPackage, fetchPypi, protobuf, grpcio, setuptools }: buildPythonPackage rec { pname = "grpcio-tools"; @@ -18,7 +18,7 @@ buildPythonPackage rec { # no tests in the package doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Protobuf code generator for gRPC"; license = licenses.asl20; homepage = "https://grpc.io/grpc/python/"; diff --git a/pkgs/development/python-modules/grpcio/default.nix b/pkgs/development/python-modules/grpcio/default.nix index 55d569c90547..6288828cd1bf 100644 --- a/pkgs/development/python-modules/grpcio/default.nix +++ b/pkgs/development/python-modules/grpcio/default.nix @@ -1,6 +1,18 @@ -{ stdenv, buildPythonPackage, darwin, grpc -, six, protobuf, enum34, futures, isPy27, pkgconfig -, cython, c-ares, openssl, zlib }: +{ lib, stdenv +, buildPythonPackage +, darwin +, grpc +, six +, protobuf +, enum34 +, futures +, isPy27 +, pkg-config +, cython +, c-ares +, openssl +, zlib +}: buildPythonPackage rec { inherit (grpc) src version; @@ -8,12 +20,12 @@ buildPythonPackage rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ cython pkgconfig ] - ++ stdenv.lib.optional stdenv.isDarwin darwin.cctools; + nativeBuildInputs = [ cython pkg-config ] + ++ stdenv.lib.optional stdenv.isDarwin darwin.cctools; buildInputs = [ c-ares openssl zlib ]; propagatedBuildInputs = [ six protobuf ] - ++ stdenv.lib.optionals (isPy27) [ enum34 futures ]; + ++ stdenv.lib.optionals (isPy27) [ enum34 futures ]; preBuild = stdenv.lib.optionalString stdenv.isDarwin "unset AR"; @@ -22,10 +34,15 @@ buildPythonPackage rec { GRPC_PYTHON_BUILD_SYSTEM_ZLIB = 1; GRPC_PYTHON_BUILD_SYSTEM_CARES = 1; - meta = with stdenv.lib; { + # does not contain any tests + doCheck = false; + + pythonImportsCheck = [ "grpc" ]; + + meta = with lib; { description = "HTTP/2-based RPC framework"; license = licenses.asl20; homepage = "https://grpc.io/grpc/python/"; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } diff --git a/pkgs/development/python-modules/gsd/1.7.nix b/pkgs/development/python-modules/gsd/1.7.nix index 6e6f0504aa72..0512a4906a27 100644 --- a/pkgs/development/python-modules/gsd/1.7.nix +++ b/pkgs/development/python-modules/gsd/1.7.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , numpy @@ -18,7 +18,7 @@ buildPythonPackage rec { # tests not packaged with gsd doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://bitbucket.org/glotzer/gsd"; description = "General simulation data file format"; license = licenses.bsd2; diff --git a/pkgs/development/python-modules/gspread/default.nix b/pkgs/development/python-modules/gspread/default.nix index 5fd73541dd42..7cf2a8c8df11 100644 --- a/pkgs/development/python-modules/gspread/default.nix +++ b/pkgs/development/python-modules/gspread/default.nix @@ -1,8 +1,8 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , requests -, google_auth +, google-auth , google-auth-oauthlib }: @@ -15,9 +15,9 @@ buildPythonPackage rec { sha256 = "e04f1a6267b3929fc1600424c5ec83906d439672cafdd61a9d5b916a139f841c"; }; - propagatedBuildInputs = [ requests google_auth google-auth-oauthlib ]; + propagatedBuildInputs = [ requests google-auth google-auth-oauthlib ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Google Spreadsheets client library"; homepage = "https://github.com/burnash/gspread"; license = licenses.mit; diff --git a/pkgs/development/python-modules/gtimelog/default.nix b/pkgs/development/python-modules/gtimelog/default.nix index c092da735854..3af8e97ba71b 100644 --- a/pkgs/development/python-modules/gtimelog/default.nix +++ b/pkgs/development/python-modules/gtimelog/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, makeWrapper +{ lib, stdenv, fetchFromGitHub, makeWrapper , glibcLocales, gobject-introspection, gtk3, libsoup, libsecret , buildPythonPackage, python , pygobject3, freezegun, mock @@ -37,7 +37,7 @@ buildPythonPackage rec { --prefix LD_LIBRARY_PATH ":" "${gtk3.out}/lib" \ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A time tracking app"; longDescription = '' GTimeLog is a small time tracking application for GNOME. diff --git a/pkgs/development/python-modules/guestfs/default.nix b/pkgs/development/python-modules/guestfs/default.nix index a446166c2917..23a2545525a3 100644 --- a/pkgs/development/python-modules/guestfs/default.nix +++ b/pkgs/development/python-modules/guestfs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchurl, libguestfs, qemu }: +{ lib, stdenv, buildPythonPackage, fetchurl, libguestfs, qemu }: buildPythonPackage rec { pname = "guestfs"; @@ -11,7 +11,11 @@ buildPythonPackage rec { propagatedBuildInputs = [ libguestfs qemu ]; - meta = with stdenv.lib; { + # no tests + doCheck = false; + pythonImportsCheck = [ "guestfs" ]; + + meta = with lib; { homepage = "https://libguestfs.org/guestfs-python.3.html"; description = "Use libguestfs from Python"; license = licenses.lgpl2Plus; diff --git a/pkgs/development/python-modules/gunicorn/19.nix b/pkgs/development/python-modules/gunicorn/19.nix index f9681eef97e3..c1091fa980c9 100644 --- a/pkgs/development/python-modules/gunicorn/19.nix +++ b/pkgs/development/python-modules/gunicorn/19.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ lib, stdenv, buildPythonPackage, fetchPypi , coverage , mock , pytest @@ -31,7 +31,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "gunicorn" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/benoitc/gunicorn"; description = "WSGI HTTP Server for UNIX"; license = licenses.mit; diff --git a/pkgs/development/python-modules/gunicorn/default.nix b/pkgs/development/python-modules/gunicorn/default.nix index 8bdc42969032..983335f4395b 100644 --- a/pkgs/development/python-modules/gunicorn/default.nix +++ b/pkgs/development/python-modules/gunicorn/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy27 +{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27 , coverage , mock , pytest @@ -32,7 +32,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "gunicorn" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/benoitc/gunicorn"; description = "WSGI HTTP Server for UNIX"; license = licenses.mit; diff --git a/pkgs/development/python-modules/guzzle_sphinx_theme/default.nix b/pkgs/development/python-modules/guzzle_sphinx_theme/default.nix index 7b4498afb2c5..f70625b86fe2 100644 --- a/pkgs/development/python-modules/guzzle_sphinx_theme/default.nix +++ b/pkgs/development/python-modules/guzzle_sphinx_theme/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, sphinx, fetchPypi }: +{ lib, stdenv, buildPythonPackage, sphinx, fetchPypi }: buildPythonPackage rec { pname = "guzzle_sphinx_theme"; @@ -12,7 +12,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ sphinx ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Sphinx theme used by Guzzle: http://guzzlephp.org"; homepage = "https://github.com/guzzle/guzzle_sphinx_theme/"; license = licenses.mit; diff --git a/pkgs/development/python-modules/gviz-api/default.nix b/pkgs/development/python-modules/gviz-api/default.nix new file mode 100644 index 000000000000..fabc2d147fca --- /dev/null +++ b/pkgs/development/python-modules/gviz-api/default.nix @@ -0,0 +1,26 @@ +{ lib, fetchPypi, buildPythonPackage +, six +}: + +buildPythonPackage rec { + pname = "gviz_api"; + version = "1.9.0"; + format = "wheel"; + + src = fetchPypi { + inherit pname version; + format = "wheel"; + sha256 = "1yag559lpmwfdxpxn679a6ajifcbpgljr5n6k5b7rrj38k2xq7jg"; + }; + + propagatedBuildInputs = [ + six + ]; + + meta = with lib; { + description = "Python API for Google Visualization"; + homepage = https://developers.google.com/chart/interactive/docs/dev/gviz_api_lib; + license = licenses.asl20; + maintainers = with maintainers; [ ndl ]; + }; +} diff --git a/pkgs/development/python-modules/gyp/default.nix b/pkgs/development/python-modules/gyp/default.nix index c951c97b20f4..b08814d4bd12 100644 --- a/pkgs/development/python-modules/gyp/default.nix +++ b/pkgs/development/python-modules/gyp/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchFromGitiles , isPy3k @@ -19,7 +19,7 @@ buildPythonPackage { ./no-xcode.patch ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A tool to generate native build files"; homepage = "https://chromium.googlesource.com/external/gyp/+/master/README.md"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/h11/default.nix b/pkgs/development/python-modules/h11/default.nix index 28461311021f..f3d37dacfa3c 100644 --- a/pkgs/development/python-modules/h11/default.nix +++ b/pkgs/development/python-modules/h11/default.nix @@ -1,33 +1,26 @@ -{ lib, buildPythonPackage, fetchPypi, pytest, fetchpatch }: +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +}: buildPythonPackage rec { pname = "h11"; - version = "0.9.0"; + version = "0.12.0"; src = fetchPypi { inherit pname version; - sha256 = "1qfad70h59hya21vrzz8dqyyaiqhac0anl2dx3s3k80gpskvrm1k"; + sha256 = "0hk0nll6qazsambp3kl8cxxsbl4gv5y9252qadyk0jky0sv2q8j7"; }; - patches = [ - # pytest5 compatability - (fetchpatch { - url = "https://github.com/python-hyper/h11/commit/241e220493a511a5f5a5d472cb88d72661a92ab1.patch"; - sha256 = "1s3ipf9s41m1lksws3xv3j133q7jnjdqvmgk4sfnm8q7li2dww39"; - }) - ]; - - checkInputs = [ pytest ]; - - checkPhase = '' - py.test - ''; + checkInputs = [ pytestCheckHook ]; # Some of the tests use localhost networking. __darwinAllowLocalNetworking = true; meta = with lib; { description = "Pure-Python, bring-your-own-I/O implementation of HTTP/1.1"; + homepage = "https://github.com/python-hyper/h11"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/h2/default.nix b/pkgs/development/python-modules/h2/default.nix index 7597abbe0f9e..6dad775732c0 100644 --- a/pkgs/development/python-modules/h2/default.nix +++ b/pkgs/development/python-modules/h2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ lib, stdenv, buildPythonPackage, fetchPypi , enum34, hpack, hyperframe, pytestCheckHook, hypothesis }: buildPythonPackage rec { @@ -14,7 +14,7 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook hypothesis ]; - meta = with stdenv.lib; { + meta = with lib; { description = "HTTP/2 State-Machine based protocol implementation"; homepage = "http://hyper.rtfd.org/"; license = licenses.mit; diff --git a/pkgs/development/python-modules/h3/default.nix b/pkgs/development/python-modules/h3/default.nix index e0d6ffce6531..46b774a25c1e 100644 --- a/pkgs/development/python-modules/h3/default.nix +++ b/pkgs/development/python-modules/h3/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , cmake , fetchPypi @@ -25,7 +25,7 @@ buildPythonPackage rec { --subst-var-by libh3_path ${h3}/lib/libh3${stdenv.hostPlatform.extensions.sharedLibrary} ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/uber/h3-py"; description = "This library provides Python bindings for the H3 Core Library."; license = licenses.asl20; diff --git a/pkgs/development/python-modules/ha-ffmpeg/default.nix b/pkgs/development/python-modules/ha-ffmpeg/default.nix index 01d0343b171f..653c4483ce82 100644 --- a/pkgs/development/python-modules/ha-ffmpeg/default.nix +++ b/pkgs/development/python-modules/ha-ffmpeg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy3k +{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k , ffmpeg_3, async-timeout }: buildPythonPackage rec { @@ -19,7 +19,7 @@ buildPythonPackage rec { # only manual tests doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/pvizeli/ha-ffmpeg"; description = "Library for home-assistant to handle ffmpeg"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/handout/default.nix b/pkgs/development/python-modules/handout/default.nix index c5c111845d15..b2b7b4b3d142 100644 --- a/pkgs/development/python-modules/handout/default.nix +++ b/pkgs/development/python-modules/handout/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ lib, stdenv, buildPythonPackage, fetchPypi , imageio, imageio-ffmpeg }: buildPythonPackage rec { @@ -12,7 +12,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ imageio imageio-ffmpeg ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Turn Python scripts into handouts with Markdown and figures"; homepage = "https://github.com/danijar/handout"; license = licenses.gpl3; diff --git a/pkgs/development/python-modules/hawkauthlib/default.nix b/pkgs/development/python-modules/hawkauthlib/default.nix index 1a8ddacdd690..a0b7d50b560d 100644 --- a/pkgs/development/python-modules/hawkauthlib/default.nix +++ b/pkgs/development/python-modules/hawkauthlib/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchFromGitHub , requests @@ -18,7 +18,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests webob ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/mozilla-services/hawkauthlib"; description = "Hawk Access Authentication protocol"; license = licenses.mpl20; diff --git a/pkgs/development/python-modules/hbmqtt/default.nix b/pkgs/development/python-modules/hbmqtt/default.nix index 76ae5718024a..053e955ad806 100644 --- a/pkgs/development/python-modules/hbmqtt/default.nix +++ b/pkgs/development/python-modules/hbmqtt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy3k, setuptools +{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k, setuptools , transitions, websockets, passlib, docopt, pyyaml, nose }: buildPythonPackage rec { @@ -27,7 +27,7 @@ buildPythonPackage rec { nosetests -e test_connect_tcp ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/beerfactory/hbmqtt"; description = "MQTT client/broker using Python asynchronous I/O"; license = licenses.mit; diff --git a/pkgs/development/python-modules/hcs_utils/default.nix b/pkgs/development/python-modules/hcs_utils/default.nix index 445c2fe1f827..56e9811396e6 100644 --- a/pkgs/development/python-modules/hcs_utils/default.nix +++ b/pkgs/development/python-modules/hcs_utils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pythonOlder, buildPythonPackage, fetchPypi, six, glibcLocales, pytest }: +{ lib, stdenv, pythonOlder, buildPythonPackage, fetchPypi, six, glibcLocales, pytest }: buildPythonPackage rec { pname = "hcs_utils"; @@ -21,7 +21,7 @@ buildPythonPackage rec { disabled = pythonOlder "3.4"; - meta = with stdenv.lib; { + meta = with lib; { description = "Library collecting some useful snippets"; homepage = "https://pypi.python.org/pypi/hcs_utils/1.3"; license = licenses.isc; diff --git a/pkgs/development/python-modules/hdmedians/default.nix b/pkgs/development/python-modules/hdmedians/default.nix index 80e287d376f4..3b65e10bfcec 100644 --- a/pkgs/development/python-modules/hdmedians/default.nix +++ b/pkgs/development/python-modules/hdmedians/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , nose @@ -26,7 +26,7 @@ buildPythonPackage rec { nosetests ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/daleroberts/hdmedians"; description = "High-dimensional medians"; license = licenses.gpl3; diff --git a/pkgs/development/python-modules/heapdict/default.nix b/pkgs/development/python-modules/heapdict/default.nix index 159e0a7d74e9..4cd695925f28 100644 --- a/pkgs/development/python-modules/heapdict/default.nix +++ b/pkgs/development/python-modules/heapdict/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy3k }: +{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k }: buildPythonPackage rec { pname = "HeapDict"; @@ -11,7 +11,7 @@ buildPythonPackage rec { doCheck = !isPy3k; - meta = with stdenv.lib; { + meta = with lib; { description = "a heap with decrease-key and increase-key operations."; homepage = "http://stutzbachenterprises.com"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/helper/default.nix b/pkgs/development/python-modules/helper/default.nix index 00e4ddce8b4b..4c7ff0c3878f 100644 --- a/pkgs/development/python-modules/helper/default.nix +++ b/pkgs/development/python-modules/helper/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, pyyaml, mock }: +{ lib, stdenv, buildPythonPackage, fetchPypi, pyyaml, mock }: buildPythonPackage rec { pname = "helper"; @@ -15,7 +15,7 @@ buildPythonPackage rec { # No tests in the pypi tarball doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Development library for quickly writing configurable applications and daemons"; homepage = "https://helper.readthedocs.org/"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/hetzner/default.nix b/pkgs/development/python-modules/hetzner/default.nix index 2909d2c2a6c5..3b938dfc237c 100644 --- a/pkgs/development/python-modules/hetzner/default.nix +++ b/pkgs/development/python-modules/hetzner/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchFromGitHub }: @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "152fklxff08s71v0b78yp5ajwpqyszm3sd7j0qsrwa2x9ik4968h"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/RedMoonStudios/hetzner"; description = "High-level Python API for accessing the Hetzner robot"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/heudiconv/default.nix b/pkgs/development/python-modules/heudiconv/default.nix index 29a29a3b6522..ce2918188241 100644 --- a/pkgs/development/python-modules/heudiconv/default.nix +++ b/pkgs/development/python-modules/heudiconv/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , isPy27 @@ -40,7 +40,7 @@ buildPythonPackage rec { # and these aren't in Nixpkgs checkPhase = "pytest -k 'not test_dlad and not test_monitor' heudiconv/tests"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://heudiconv.readthedocs.io"; description = "Flexible DICOM converter for organizing imaging data"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/hg-evolve/default.nix b/pkgs/development/python-modules/hg-evolve/default.nix index 434c6ffba2b9..bcc93ba10cb2 100644 --- a/pkgs/development/python-modules/hg-evolve/default.nix +++ b/pkgs/development/python-modules/hg-evolve/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , isPy3k @@ -15,7 +15,7 @@ buildPythonPackage rec { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Enables the “changeset evolution” feature of Mercurial core"; homepage = "https://www.mercurial-scm.org/doc/evolution/"; maintainers = with maintainers; [ xavierzwirtz ]; diff --git a/pkgs/development/python-modules/hg-git/default.nix b/pkgs/development/python-modules/hg-git/default.nix index c82352f9bfef..fd321493b09b 100644 --- a/pkgs/development/python-modules/hg-git/default.nix +++ b/pkgs/development/python-modules/hg-git/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , dulwich @@ -26,7 +26,7 @@ buildPythonPackage rec { sha256 = "12r4qzbc5xcqwv0kvf8g4wjji7n45421zkbf6i75vyi4nl6n4j15"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Push and pull from a Git server using Mercurial"; homepage = "http://hg-git.github.com/"; maintainers = with maintainers; [ koral ]; diff --git a/pkgs/development/python-modules/hglib/default.nix b/pkgs/development/python-modules/hglib/default.nix index e96d7e228708..afac7983584c 100644 --- a/pkgs/development/python-modules/hglib/default.nix +++ b/pkgs/development/python-modules/hglib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, fetchpatch, substituteAll, python, nose, mercurial }: +{ lib, stdenv, buildPythonPackage, fetchPypi, fetchpatch, substituteAll, python, nose, mercurial }: buildPythonPackage rec { pname = "python-hglib"; @@ -33,7 +33,7 @@ buildPythonPackage rec { ${python.interpreter} test.py --with-hg "${mercurial}/bin/hg" -v ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Mercurial Python library"; homepage = "http://selenic.com/repo/python-hglib"; license = licenses.mit; diff --git a/pkgs/development/python-modules/hgsvn/default.nix b/pkgs/development/python-modules/hgsvn/default.nix index ccf8635b8b11..2ee6024cd475 100644 --- a/pkgs/development/python-modules/hgsvn/default.nix +++ b/pkgs/development/python-modules/hgsvn/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , nose @@ -23,7 +23,7 @@ buildPythonPackage rec { doCheck = false; # too many assumptions - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://pypi.python.org/pypi/hgsvn"; description = "A set of scripts to work locally on Subversion checkouts using Mercurial"; license = licenses.gpl2; diff --git a/pkgs/development/python-modules/hidapi/default.nix b/pkgs/development/python-modules/hidapi/default.nix index 856a36f77916..c5ee1c208392 100644 --- a/pkgs/development/python-modules/hidapi/default.nix +++ b/pkgs/development/python-modules/hidapi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, libusb1, udev, darwin, fetchPypi, buildPythonPackage, cython }: +{ lib, stdenv, libusb1, udev, darwin, fetchPypi, buildPythonPackage, cython }: buildPythonPackage rec { pname = "hidapi"; @@ -25,7 +25,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "hid" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A Cython interface to the hidapi from https://github.com/libusb/hidapi"; homepage = "https://github.com/trezor/cython-hidapi"; # license can actually be either bsd3 or gpl3 diff --git a/pkgs/development/python-modules/hieroglyph/default.nix b/pkgs/development/python-modules/hieroglyph/default.nix index 0959d117de34..418059c51658 100644 --- a/pkgs/development/python-modules/hieroglyph/default.nix +++ b/pkgs/development/python-modules/hieroglyph/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage, isPy27, sphinx }: +{ lib, stdenv, fetchPypi, buildPythonPackage, isPy27, sphinx }: buildPythonPackage rec { pname = "hieroglyph"; @@ -16,7 +16,7 @@ buildPythonPackage rec { # test_absolute_paths_made_relative (hieroglyph.tests.test_path_fixing.PostProcessImageTests) ... ERROR doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Generate HTML presentations from plain text sources"; homepage = "https://github.com/nyergler/hieroglyph/"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/hiredis/default.nix b/pkgs/development/python-modules/hiredis/default.nix index 891c79f1b7b8..e9d5677f8beb 100644 --- a/pkgs/development/python-modules/hiredis/default.nix +++ b/pkgs/development/python-modules/hiredis/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , redis @@ -21,7 +21,7 @@ buildPythonPackage rec { ''; pythonImportsCheck = [ "hiredis" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Wraps protocol parsing code in hiredis, speeds up parsing of multi bulk replies"; homepage = "https://github.com/redis/hiredis-py"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/hiro/default.nix b/pkgs/development/python-modules/hiro/default.nix index f8ef8ba028d0..3ff672a22db6 100644 --- a/pkgs/development/python-modules/hiro/default.nix +++ b/pkgs/development/python-modules/hiro/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, six, mock }: +{ lib, stdenv, buildPythonPackage, fetchPypi, six, mock }: buildPythonPackage rec { pname = "hiro"; version = "0.5.1"; @@ -10,7 +10,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six mock ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Time manipulation utilities for Python"; homepage = "https://hiro.readthedocs.io/en/latest/"; license = licenses.mit; diff --git a/pkgs/development/python-modules/hjson/default.nix b/pkgs/development/python-modules/hjson/default.nix index 13dce54b9c3a..3393ad186918 100644 --- a/pkgs/development/python-modules/hjson/default.nix +++ b/pkgs/development/python-modules/hjson/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchFromGitHub , pythonImportsCheckHook @@ -26,7 +26,7 @@ buildPythonPackage rec { wrapProgram $out/bin/hjson --set PYTHONPATH "$PYTHONPATH" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A user interface for JSON"; homepage = "https://github.com/hjson/hjson-py"; license = licenses.mit; diff --git a/pkgs/development/python-modules/hkdf/default.nix b/pkgs/development/python-modules/hkdf/default.nix index 347cd94c8f51..966ce7001fbb 100644 --- a/pkgs/development/python-modules/hkdf/default.nix +++ b/pkgs/development/python-modules/hkdf/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , nose @@ -22,7 +22,7 @@ buildPythonPackage rec { # no tests in PyPI tarball doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "HMAC-based Extract-and-Expand Key Derivation Function (HKDF)"; homepage = "https://github.com/casebeer/python-hkdf"; license = licenses.bsd2; diff --git a/pkgs/development/python-modules/hocr-tools/default.nix b/pkgs/development/python-modules/hocr-tools/default.nix index fdc578c76dff..79a2e83508aa 100644 --- a/pkgs/development/python-modules/hocr-tools/default.nix +++ b/pkgs/development/python-modules/hocr-tools/default.nix @@ -3,7 +3,7 @@ , lxml , pillow , reportlab -, stdenv +, lib, stdenv }: buildPythonPackage rec { pname = "hocr-tools"; @@ -21,7 +21,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pillow lxml reportlab ]; - meta = with stdenv.lib; { + meta = with lib; { description = " Tools for manipulating and evaluating the hOCR format for representing multi-lingual OCR results by embedding them into HTML"; homepage = "https://github.com/tmbdev/hocr-tools"; diff --git a/pkgs/development/python-modules/hole/default.nix b/pkgs/development/python-modules/hole/default.nix new file mode 100644 index 000000000000..87c63be32e8c --- /dev/null +++ b/pkgs/development/python-modules/hole/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchPypi +, aiohttp +, async-timeout +}: + +buildPythonPackage rec { + pname = "hole"; + version = "0.5.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "065fxc0l16j8xkjd0y0qar9cmqmjyp8jcshakbakldkfscpx3s5m"; + }; + + propagatedBuildInputs = [ + aiohttp + async-timeout + ]; + + # no tests are present + doCheck = false; + + pythonImportsCheck = [ "hole" ]; + + meta = with lib; { + description = "Python API for interacting with a Pihole instance."; + homepage = "https://github.com/home-assistant-ecosystem/python-hole"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/holidays/default.nix b/pkgs/development/python-modules/holidays/default.nix index 10ee1bbf2e76..b5e0062d115a 100644 --- a/pkgs/development/python-modules/holidays/default.nix +++ b/pkgs/development/python-modules/holidays/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , convertdate @@ -24,7 +24,7 @@ buildPythonPackage rec { ]; pythonImportsCheck = [ "holidays" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/dr-prodigy/python-holidays"; description = "Generate and work with holidays in Python"; license = licenses.mit; diff --git a/pkgs/development/python-modules/hoomd-blue/default.nix b/pkgs/development/python-modules/hoomd-blue/default.nix index 7d6ceb0cc5a6..edb647a3fc60 100644 --- a/pkgs/development/python-modules/hoomd-blue/default.nix +++ b/pkgs/development/python-modules/hoomd-blue/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit +{ lib, stdenv, fetchgit , cmake, pkgconfig , python , mpi ? null @@ -33,8 +33,6 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ python.pkgs.numpy ] ++ stdenv.lib.optionals withMPI [ python.pkgs.mpi4py ]; - enableParallelBuilding = true; - dontAddPrefix = true; cmakeFlags = [ "-DENABLE_MPI=${onOffBool withMPI}" @@ -54,7 +52,7 @@ stdenv.mkDerivation rec { doCheck = false; checkTarget = "test"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://glotzerlab.engin.umich.edu/hoomd-blue/"; description = "HOOMD-blue is a general-purpose particle simulation toolkit"; license = licenses.bsdOriginal; diff --git a/pkgs/development/python-modules/hpack/default.nix b/pkgs/development/python-modules/hpack/default.nix index 36578856286f..9b6f724cd318 100644 --- a/pkgs/development/python-modules/hpack/default.nix +++ b/pkgs/development/python-modules/hpack/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi }: @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "fc41de0c63e687ebffde81187a948221294896f6bdc0ae2312708df339430095"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Pure-Python HPACK header compression"; homepage = "http://hyper.rtfd.org"; license = licenses.mit; diff --git a/pkgs/development/python-modules/hsaudiotag/default.nix b/pkgs/development/python-modules/hsaudiotag/default.nix index 2da6e4a150c9..fba71dc3f109 100644 --- a/pkgs/development/python-modules/hsaudiotag/default.nix +++ b/pkgs/development/python-modules/hsaudiotag/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , isPy3k @@ -17,7 +17,7 @@ buildPythonPackage rec { # no tests doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "A pure Python library that lets one to read metadata from media files"; homepage = "http://hg.hardcoded.net/hsaudiotag/"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/hsaudiotag3k/default.nix b/pkgs/development/python-modules/hsaudiotag3k/default.nix index d12d3bc8c832..52919e489837 100644 --- a/pkgs/development/python-modules/hsaudiotag3k/default.nix +++ b/pkgs/development/python-modules/hsaudiotag3k/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , isPy3k @@ -17,7 +17,7 @@ buildPythonPackage rec { # no tests doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "A pure Python library that lets one to read metadata from media files"; homepage = "http://hg.hardcoded.net/hsaudiotag/"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/hstspreload/default.nix b/pkgs/development/python-modules/hstspreload/default.nix index 9944816f8a1c..7562e36e4d95 100644 --- a/pkgs/development/python-modules/hstspreload/default.nix +++ b/pkgs/development/python-modules/hstspreload/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "hstspreload"; - version = "2020.11.21"; + version = "2020.12.22"; disabled = isPy27; src = fetchFromGitHub { owner = "sethmlarson"; repo = pname; rev = version; - sha256 = "0z2bq51dw1zak13558s2vj7pdnwad402f3ia5j2an0r678rwhsij"; + sha256 = "1jzcw4clmpbyw67pzskms5rq5b7285iwh42jzc4ly6jz9amggdzc"; }; # tests require network connection diff --git a/pkgs/development/python-modules/html2text/2018.nix b/pkgs/development/python-modules/html2text/2018.nix index e0a60e1ef0ac..73540359ee1a 100644 --- a/pkgs/development/python-modules/html2text/2018.nix +++ b/pkgs/development/python-modules/html2text/2018.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi }: @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "627514fb30e7566b37be6900df26c2c78a030cc9e6211bda604d8181233bcdd4"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Turn HTML into equivalent Markdown-structured text"; homepage = "https://github.com/Alir3z4/html2text/"; license = licenses.gpl3; diff --git a/pkgs/development/python-modules/html5-parser/default.nix b/pkgs/development/python-modules/html5-parser/default.nix index 4962e89526d8..61c23ac20222 100644 --- a/pkgs/development/python-modules/html5-parser/default.nix +++ b/pkgs/development/python-modules/html5-parser/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, pkgs, pkgconfig, chardet, lxml }: +{ lib, stdenv, buildPythonPackage, fetchPypi, pkgs, pkgconfig, chardet, lxml }: buildPythonPackage rec { pname = "html5-parser"; @@ -14,7 +14,7 @@ buildPythonPackage rec { doCheck = false; # No such file or directory: 'run_tests.py' - meta = with stdenv.lib; { + meta = with lib; { description = "Fast C based HTML 5 parsing for python"; homepage = "https://html5-parser.readthedocs.io"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/htmllaundry/default.nix b/pkgs/development/python-modules/htmllaundry/default.nix index 33d3691e85ad..ef660fc0b924 100644 --- a/pkgs/development/python-modules/htmllaundry/default.nix +++ b/pkgs/development/python-modules/htmllaundry/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi, nose , six @@ -21,7 +21,7 @@ buildPythonPackage rec { # not relevant for me, if releavnt for you, fix it... doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Simple HTML cleanup utilities"; license = licenses.bsd3; homepage = "https://pypi.org/project/htmllaundry/"; diff --git a/pkgs/development/python-modules/htmltreediff/default.nix b/pkgs/development/python-modules/htmltreediff/default.nix deleted file mode 100644 index cd742606f8b9..000000000000 --- a/pkgs/development/python-modules/htmltreediff/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ buildPythonPackage, fetchFromGitHub, isPy3k, lxml, html5lib, nose, stdenv }: - -buildPythonPackage rec { - version = "0.1.2"; - pname = "htmltreediff"; - - disabled = isPy3k; - - src = fetchFromGitHub { - owner = "christian-oudard"; - repo = pname; - rev = "v${version}"; - sha256 = "16mqp2jyznrw1mgd3qzybq28h2k5wz7vmmz1m6xpgscazyjhvvd1"; - }; - - propagatedBuildInputs = [ lxml html5lib ]; - - checkInputs = [ nose ]; - - meta = with stdenv.lib; { - description = " Structure-aware diff for html and xml documents"; - homepage = "https://github.com/christian-oudard/htmltreediff"; - license = licenses.bsdOriginal; - maintainers = with maintainers; [ ma27 ]; - }; -} diff --git a/pkgs/development/python-modules/httmock/default.nix b/pkgs/development/python-modules/httmock/default.nix index 5913ceca777b..117c7f5e132f 100644 --- a/pkgs/development/python-modules/httmock/default.nix +++ b/pkgs/development/python-modules/httmock/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, requests }: +{ lib, stdenv, buildPythonPackage, fetchFromGitHub, requests }: buildPythonPackage rec { pname = "httmock"; @@ -13,7 +13,7 @@ buildPythonPackage rec { checkInputs = [ requests ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A mocking library for requests"; homepage = "https://github.com/patrys/httmock"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/http_signature/default.nix b/pkgs/development/python-modules/http_signature/default.nix index d86861a92517..145eea751b9b 100644 --- a/pkgs/development/python-modules/http_signature/default.nix +++ b/pkgs/development/python-modules/http_signature/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , isPy3k @@ -17,7 +17,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pycrypto ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/atl/py-http-signature"; description = "Simple secure signing for HTTP requests using http-signature"; license = licenses.mit; diff --git a/pkgs/development/python-modules/httpauth/default.nix b/pkgs/development/python-modules/httpauth/default.nix index bab2193f6a2d..b7867e22f175 100644 --- a/pkgs/development/python-modules/httpauth/default.nix +++ b/pkgs/development/python-modules/httpauth/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi }: @@ -14,7 +14,7 @@ buildPythonPackage rec { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "WSGI HTTP Digest Authentication middleware"; homepage = "https://github.com/jonashaag/httpauth"; license = licenses.bsd2; diff --git a/pkgs/development/python-modules/httpbin/default.nix b/pkgs/development/python-modules/httpbin/default.nix index cf5891ed0ee2..cbaf89c3ca61 100644 --- a/pkgs/development/python-modules/httpbin/default.nix +++ b/pkgs/development/python-modules/httpbin/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , fetchpatch @@ -26,7 +26,7 @@ buildPythonPackage rec { # No tests doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/kennethreitz/httpbin"; description = "HTTP Request & Response Service"; license = licenses.mit; diff --git a/pkgs/development/python-modules/httpretty/0.nix b/pkgs/development/python-modules/httpretty/0.nix index ee0e598a9ac2..436bbd97fd2f 100644 --- a/pkgs/development/python-modules/httpretty/0.nix +++ b/pkgs/development/python-modules/httpretty/0.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , tornado @@ -44,7 +44,7 @@ buildPythonPackage rec { "tests.functional.test_requests.test_httpretty_should_allow_adding_and_overwritting_by_kwargs_u2" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://httpretty.readthedocs.org/"; description = "HTTP client request mocking tool"; license = licenses.mit; diff --git a/pkgs/development/python-modules/httpretty/default.nix b/pkgs/development/python-modules/httpretty/default.nix index 0d061df86bf7..93cf6a0927f1 100644 --- a/pkgs/development/python-modules/httpretty/default.nix +++ b/pkgs/development/python-modules/httpretty/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , tornado @@ -51,7 +51,7 @@ buildPythonPackage rec { "tests.functional.test_requests.test_httpretty_should_allow_adding_and_overwritting_by_kwargs_u2" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://httpretty.readthedocs.org/"; description = "HTTP client request mocking tool"; license = licenses.mit; diff --git a/pkgs/development/python-modules/httpx/default.nix b/pkgs/development/python-modules/httpx/default.nix index 1f527b47ec08..6e81cc92193c 100644 --- a/pkgs/development/python-modules/httpx/default.nix +++ b/pkgs/development/python-modules/httpx/default.nix @@ -56,6 +56,8 @@ buildPythonPackage rec { "test_sync_proxy_close" ]; + __darwinAllowLocalNetworking = true; + meta = with lib; { description = "The next generation HTTP client"; homepage = "https://github.com/encode/httpx"; diff --git a/pkgs/development/python-modules/humanize/default.nix b/pkgs/development/python-modules/humanize/default.nix index 70ac0297b739..09e94f6275dd 100644 --- a/pkgs/development/python-modules/humanize/default.nix +++ b/pkgs/development/python-modules/humanize/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , isPy27 @@ -21,7 +21,7 @@ buildPythonPackage rec { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Python humanize utilities"; homepage = "https://github.com/jmoiron/humanize"; license = licenses.mit; diff --git a/pkgs/development/python-modules/hwi/default.nix b/pkgs/development/python-modules/hwi/default.nix index 6431791d65e6..7c34235a190b 100644 --- a/pkgs/development/python-modules/hwi/default.nix +++ b/pkgs/development/python-modules/hwi/default.nix @@ -1,46 +1,47 @@ { lib , buildPythonPackage -, fetchPypi -, mnemonic +, fetchFromGitHub +, bitbox02 , ecdsa -, typing-extensions , hidapi , libusb1 +, mnemonic , pyaes -, trezor -, btchip -, ckcc-protocol +, pythonAtLeast }: buildPythonPackage rec { pname = "hwi"; version = "1.2.1"; + disabled = pythonAtLeast "3.9"; - src = fetchPypi { - inherit pname version; - sha256 = "d0d220a4967d7f106b828b12a98b78c220d609d7cc6c811898e24fcf1a6f04f3"; + src = fetchFromGitHub { + owner = "bitcoin-core"; + repo = "HWI"; + rev = version; + sha256 = "0fs3152lw7y5l9ssr5as8gd739m9lb7wxpv1vc5m77k5nw7l8ax5"; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "'ecdsa>=0.13.0,<0.14.0'" "'ecdsa'" \ + --replace "'hidapi>=0.7.99,<0.8.0'" "'hidapi'" \ + --replace "'mnemonic>=0.18.0,<0.19.0'" "'mnemonic'" + ''; + propagatedBuildInputs = [ - mnemonic + bitbox02 ecdsa - typing-extensions hidapi libusb1 + mnemonic pyaes - trezor - btchip - ckcc-protocol ]; - patches = [ ./relax-deps.patch ]; - - # tests are not packaged in the released tarball + # tests require to clone quite a few firmwares doCheck = false; - pythonImportsCheck = [ - "hwilib" - ]; + pythonImportsCheck = [ "hwilib" ]; meta = { description = "Bitcoin Hardware Wallet Interface"; diff --git a/pkgs/development/python-modules/hwi/relax-deps.patch b/pkgs/development/python-modules/hwi/relax-deps.patch deleted file mode 100644 index ff6c6b9768f6..000000000000 --- a/pkgs/development/python-modules/hwi/relax-deps.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- a/setup.py -+++ b/setup.py -@@ -98,10 +98,10 @@ package_data = \ - modules = \ - ['hwi', 'hwi-qt'] - install_requires = \ --['ecdsa>=0.13.0,<0.14.0', -- 'hidapi>=0.7.99,<0.8.0', -+['ecdsa', -+ 'hidapi', - 'libusb1>=1.7,<2.0', -+ 'mnemonic', -- 'mnemonic>=0.18.0,<0.19.0', - 'pyaes>=1.6,<2.0', - 'typing-extensions>=3.7,<4.0'] - diff --git a/pkgs/development/python-modules/hydrawiser/default.nix b/pkgs/development/python-modules/hydrawiser/default.nix new file mode 100644 index 000000000000..feccc73707c2 --- /dev/null +++ b/pkgs/development/python-modules/hydrawiser/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytest-asyncio +, pytest-cov +, pytestCheckHook +, pythonOlder +, pyyaml +, requests +, requests-mock +}: + +buildPythonPackage rec { + pname = "hydrawiser"; + version = "0.2"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "ptcryan"; + repo = pname; + rev = "v${version}"; + sha256 = "161hazlpvd71xcl2ja86560wm5lnrjv210ki3ji37l6c6gwmhjdj"; + }; + + propagatedBuildInputs = [ requests ]; + + checkInputs = [ + pytest-asyncio + pytest-cov + pytestCheckHook + requests + requests-mock + ]; + + pythonImportsCheck = [ "hydrawiser" ]; + + meta = with lib; { + description = "Python library for Hydrawise API"; + homepage = "https://github.com/ptcryan/hydrawiser"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/hyperframe/default.nix b/pkgs/development/python-modules/hyperframe/default.nix index 2c6796ca6d0c..a74198f38321 100644 --- a/pkgs/development/python-modules/hyperframe/default.nix +++ b/pkgs/development/python-modules/hyperframe/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, pytestCheckHook }: +{ lib, stdenv, buildPythonPackage, fetchPypi, pytestCheckHook }: buildPythonPackage rec { pname = "hyperframe"; @@ -11,7 +11,7 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook ]; - meta = with stdenv.lib; { + meta = with lib; { description = "HTTP/2 framing layer for Python"; homepage = "http://hyper.rtfd.org/"; license = licenses.mit; diff --git a/pkgs/development/python-modules/hyperopt/default.nix b/pkgs/development/python-modules/hyperopt/default.nix index 16599214ede7..ba4aeef402ec 100644 --- a/pkgs/development/python-modules/hyperopt/default.nix +++ b/pkgs/development/python-modules/hyperopt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage +{ lib, stdenv, fetchPypi, buildPythonPackage , cloudpickle, numpy, future, networkx , six, tqdm, scipy, pymongo }: @@ -19,7 +19,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "hyperopt" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Distributed Asynchronous Hyperparameter Optimization"; homepage = "http://hyperopt.github.com/hyperopt/"; license = licenses.bsd2; diff --git a/pkgs/development/python-modules/i3-py/default.nix b/pkgs/development/python-modules/i3-py/default.nix index ea6e449947c5..4dea7526b7e7 100644 --- a/pkgs/development/python-modules/i3-py/default.nix +++ b/pkgs/development/python-modules/i3-py/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi }: @@ -15,7 +15,7 @@ buildPythonPackage rec { # no tests in tarball doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Tools for i3 users and developers"; homepage = "https://github.com/ziberna/i3-py"; license = licenses.gpl3; diff --git a/pkgs/development/python-modules/i3ipc/default.nix b/pkgs/development/python-modules/i3ipc/default.nix index 231cb4f1d413..c27d41354112 100644 --- a/pkgs/development/python-modules/i3ipc/default.nix +++ b/pkgs/development/python-modules/i3ipc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub +{ lib, stdenv, buildPythonPackage, fetchFromGitHub , xorgserver, pytest, pytest-xvfb, i3, python, xlib, xdpyinfo , makeFontsConf, coreutils }: @@ -32,7 +32,7 @@ buildPythonPackage rec { ''; - meta = with stdenv.lib; { + meta = with lib; { description = "An improved Python library to control i3wm and sway"; homepage = "https://github.com/acrisci/i3ipc-python"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/icalendar/default.nix b/pkgs/development/python-modules/icalendar/default.nix index c8a3a09fd550..4499d5d62f4f 100644 --- a/pkgs/development/python-modules/icalendar/default.nix +++ b/pkgs/development/python-modules/icalendar/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , setuptools @@ -18,7 +18,7 @@ buildPythonPackage rec { buildInputs = [ setuptools ]; propagatedBuildInputs = [ dateutil pytz ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A parser/generator of iCalendar files"; homepage = "https://icalendar.readthedocs.org/"; license = licenses.bsd2; diff --git a/pkgs/development/python-modules/icmplib/default.nix b/pkgs/development/python-modules/icmplib/default.nix new file mode 100644 index 000000000000..b89df0bd2ce0 --- /dev/null +++ b/pkgs/development/python-modules/icmplib/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pbr +, pythonOlder +, requests +, six +}: + +buildPythonPackage rec { + pname = "icmplib"; + version = "2.0.1"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "ValentinBELYN"; + repo = pname; + rev = "v${version}"; + sha256 = "0vps4iz87f8l0z3va92srsx5v19nnd65c22hvbgvhag3vhqsxg7h"; + }; + + propagatedBuildInputs = [ + pbr + six + requests + ]; + + # Project has no tests + doCheck = false; + pythonImportsCheck = [ "icmplib" ]; + + meta = with lib; { + description = "Python implementation of the ICMP protocol"; + homepage = "https://github.com/ValentinBELYN/icmplib"; + license = with licenses; [ lgpl3Plus ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/ics/default.nix b/pkgs/development/python-modules/ics/default.nix index 30661c9bc91a..c186020fee1e 100644 --- a/pkgs/development/python-modules/ics/default.nix +++ b/pkgs/development/python-modules/ics/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder +{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder , tatsu, arrow , pytestCheckHook, pytest-flakes }: @@ -25,7 +25,7 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook pytest-flakes ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Pythonic and easy iCalendar library (RFC 5545)"; longDescription = '' Ics.py is a pythonic and easy iCalendar library. Its goals are to read and diff --git a/pkgs/development/python-modules/identify/default.nix b/pkgs/development/python-modules/identify/default.nix index 833e1e3dd29e..7f2f8c26339a 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.5.10"; + version = "1.5.11"; src = fetchPypi { inherit pname version; - sha256 = "943cd299ac7f5715fcb3f684e2fc1594c1e0f22a90d15398e5888143bd4144b5"; + sha256 = "b2c71bf9f5c482c389cef816f3a15f1c9d7429ad70f497d4a2e522442d80c6de"; }; # Tests not included in PyPI tarball diff --git a/pkgs/development/python-modules/ifaddr/default.nix b/pkgs/development/python-modules/ifaddr/default.nix index b4a9b20f08d1..47997dbdc265 100644 --- a/pkgs/development/python-modules/ifaddr/default.nix +++ b/pkgs/development/python-modules/ifaddr/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , ipaddress @@ -20,7 +20,7 @@ buildPythonPackage rec { ${python.interpreter} -m unittest discover ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/pydron/ifaddr"; description = "Enumerates all IP addresses on all network adapters of the system"; license = licenses.mit; diff --git a/pkgs/development/python-modules/ifconfig-parser/default.nix b/pkgs/development/python-modules/ifconfig-parser/default.nix index cb3fb0fded5d..bdfd3767f8c4 100644 --- a/pkgs/development/python-modules/ifconfig-parser/default.nix +++ b/pkgs/development/python-modules/ifconfig-parser/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub }: +{ lib, stdenv, buildPythonPackage, fetchFromGitHub }: buildPythonPackage rec { pname = "ifconfig-parser"; @@ -16,7 +16,7 @@ buildPythonPackage rec { python -m unittest -v test_ifconfig_parser.TestIfconfigParser ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Unsophisticated python package for parsing raw output of ifconfig."; homepage = "https://github.com/KnightWhoSayNi/ifconfig-parser"; license = licenses.mit; diff --git a/pkgs/development/python-modules/ifcopenshell/default.nix b/pkgs/development/python-modules/ifcopenshell/default.nix index 16ee8dcbace8..75d1c4d77405 100644 --- a/pkgs/development/python-modules/ifcopenshell/default.nix +++ b/pkgs/development/python-modules/ifcopenshell/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchFromGitHub , substituteAll @@ -58,7 +58,7 @@ buildPythonPackage rec { "-DLIBXML2_LIBRARIES=${libxml2.out}/lib/${if stdenv.isDarwin then "libxml2.dylib" else "libxml2.so"}" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Open source IFC library and geometry engine"; homepage = http://ifcopenshell.org/; license = licenses.lgpl3; diff --git a/pkgs/development/python-modules/ijson/default.nix b/pkgs/development/python-modules/ijson/default.nix index 8dc22d20e69a..a82a20ca7c8a 100644 --- a/pkgs/development/python-modules/ijson/default.nix +++ b/pkgs/development/python-modules/ijson/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi }: +{ lib, stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "ijson"; @@ -11,7 +11,7 @@ buildPythonPackage rec { doCheck = false; # something about yajl - meta = with stdenv.lib; { + meta = with lib; { description = "Iterative JSON parser with a standard Python iterator interface"; homepage = "https://github.com/ICRAR/ijson"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/image-match/default.nix b/pkgs/development/python-modules/image-match/default.nix index 6bb45f83790f..5c1953d6ac3f 100644 --- a/pkgs/development/python-modules/image-match/default.nix +++ b/pkgs/development/python-modules/image-match/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, pytestrunner, scikitimage }: +{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pytestrunner, scikitimage }: buildPythonPackage { pname = "image-match"; @@ -25,7 +25,7 @@ buildPythonPackage { # tests cannot work without elasticsearch doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/ascribe/image-match"; description = "Quickly search over billions of images"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/imagecorruptions/default.nix b/pkgs/development/python-modules/imagecorruptions/default.nix index 843537453c53..65c1cfd020a8 100644 --- a/pkgs/development/python-modules/imagecorruptions/default.nix +++ b/pkgs/development/python-modules/imagecorruptions/default.nix @@ -2,7 +2,7 @@ , fetchPypi , numpy , scikitimage -, stdenv +, lib, stdenv , opencv3 }: @@ -26,7 +26,7 @@ buildPythonPackage rec { opencv3 ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/bethgelab/imagecorruptions"; description = "This package provides a set of image corruptions"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/imageio-ffmpeg/default.nix b/pkgs/development/python-modules/imageio-ffmpeg/default.nix index d9991ee7845f..db59ba70bb26 100644 --- a/pkgs/development/python-modules/imageio-ffmpeg/default.nix +++ b/pkgs/development/python-modules/imageio-ffmpeg/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, fetchpatch , isPy3k }: @@ -9,9 +10,15 @@ buildPythonPackage rec { version = "0.4.2"; src = fetchPypi { - sha256 = "13b05b17a941a9f4a90b16910b1ffac159448cff051a153da8ba4b4343ffa195"; inherit pname version; + sha256 = "13b05b17a941a9f4a90b16910b1ffac159448cff051a153da8ba4b4343ffa195"; }; + patches = [ (fetchpatch { + # Fixes compatibility with python3.9 + # Should be included in the next release after 0.4.2 + url = "https://github.com/imageio/imageio-ffmpeg/pull/43/commits/b90c39fe3d29418d67d953588ed9fdf4d848f811.patch"; + sha256 = "0d9kf4w6ldwag3s2dr9zjin6wrj66fnl4fn8379ci4q4qfsqgx3f"; + })]; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/imageio/default.nix b/pkgs/development/python-modules/imageio/default.nix index ce24dfb5896a..e63678a524ab 100644 --- a/pkgs/development/python-modules/imageio/default.nix +++ b/pkgs/development/python-modules/imageio/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , isPy27 , pathlib @@ -46,7 +46,7 @@ buildPythonPackage rec { substituteInPlace tests/test_ffmpeg.py --replace 'test_get_exe_installed' 'get_exe_installed' ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Library for reading and writing a wide range of image, video, scientific, and volumetric data formats"; homepage = "http://imageio.github.io/"; license = licenses.bsd2; diff --git a/pkgs/development/python-modules/imagesize/default.nix b/pkgs/development/python-modules/imagesize/default.nix index ab3ee46c1b83..cd48f54ee8f4 100644 --- a/pkgs/development/python-modules/imagesize/default.nix +++ b/pkgs/development/python-modules/imagesize/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi }: @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "b1f6b5a4eab1f73479a50fb79fcf729514a900c341d8503d62a62dbc4127a2b1"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Getting image size from png/jpeg/jpeg2000/gif file"; homepage = "https://github.com/shibukawa/imagesize_py"; license = with licenses; [ mit ]; diff --git a/pkgs/development/python-modules/imapclient/default.nix b/pkgs/development/python-modules/imapclient/default.nix index ea9bc4844fad..c091f53b8d4f 100644 --- a/pkgs/development/python-modules/imapclient/default.nix +++ b/pkgs/development/python-modules/imapclient/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchFromGitHub , mock @@ -26,7 +26,7 @@ buildPythonPackage rec { checkInputs = [ mock ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://imapclient.readthedocs.io"; description = "Easy-to-use, Pythonic and complete IMAP client library"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/imbalanced-learn/0.4.nix b/pkgs/development/python-modules/imbalanced-learn/0.4.nix index 1ec139d5b3ad..fe21096d635d 100644 --- a/pkgs/development/python-modules/imbalanced-learn/0.4.nix +++ b/pkgs/development/python-modules/imbalanced-learn/0.4.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, scikitlearn, pandas, nose, pytest }: +{ lib, stdenv, buildPythonPackage, fetchPypi, scikitlearn, pandas, nose, pytest }: buildPythonPackage rec { pname = "imbalanced-learn"; @@ -21,7 +21,7 @@ buildPythonPackage rec { and not wrong_memory' ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Library offering a number of re-sampling techniques commonly used in datasets showing strong between-class imbalance"; homepage = "https://github.com/scikit-learn-contrib/imbalanced-learn"; license = licenses.mit; diff --git a/pkgs/development/python-modules/imbalanced-learn/default.nix b/pkgs/development/python-modules/imbalanced-learn/default.nix index 1cb3dc2a7b9e..4253ed30e415 100644 --- a/pkgs/development/python-modules/imbalanced-learn/default.nix +++ b/pkgs/development/python-modules/imbalanced-learn/default.nix @@ -1,7 +1,6 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy27 -, nose +{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27 , pandas -, pytest +, pytestCheckHook , scikitlearn , tensorflow }: @@ -17,18 +16,19 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ scikitlearn ]; - checkInputs = [ nose pytest pandas ]; - checkPhase = '' + checkInputs = [ pytestCheckHook pandas ]; + preCheck = '' export HOME=$TMPDIR - # skip some tests that fail because of minimal rounding errors - # or very large dependencies (keras + tensorflow) - py.test imblearn -k 'not estimator \ - and not classification \ - and not _generator \ - and not show_versions' ''; + disabledTests = [ + "estimator" + "classification" + "_generator" + "show_versions" + "test_make_imbalanced_iris" + ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Library offering a number of re-sampling techniques commonly used in datasets showing strong between-class imbalance"; homepage = "https://github.com/scikit-learn-contrib/imbalanced-learn"; license = licenses.mit; diff --git a/pkgs/development/python-modules/imgaug/default.nix b/pkgs/development/python-modules/imgaug/default.nix index 82f10c1bb74c..9ca8531dbbce 100644 --- a/pkgs/development/python-modules/imgaug/default.nix +++ b/pkgs/development/python-modules/imgaug/default.nix @@ -9,7 +9,7 @@ , scipy , shapely , six -, stdenv +, lib, stdenv }: buildPythonPackage rec { @@ -49,7 +49,7 @@ buildPythonPackage rec { checkInputs = [ opencv3 pytest ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/aleju/imgaug"; description = "Image augmentation for machine learning experiments"; license = licenses.mit; diff --git a/pkgs/development/python-modules/imgsize/default.nix b/pkgs/development/python-modules/imgsize/default.nix index d4f066b8b0b2..d1a69c043d0f 100644 --- a/pkgs/development/python-modules/imgsize/default.nix +++ b/pkgs/development/python-modules/imgsize/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchFromGitHub }: @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "0k24qj4i996fz7lpjrs36il6lp51rh13b0j2wip87cy5v9109m2d"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Pure Python image size library"; homepage = "https://github.com/ojii/imgsize"; license = with licenses; [ bsd3 ]; diff --git a/pkgs/development/python-modules/impacket/default.nix b/pkgs/development/python-modules/impacket/default.nix index dee40a6dbba2..15d148f168f1 100644 --- a/pkgs/development/python-modules/impacket/default.nix +++ b/pkgs/development/python-modules/impacket/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k }: +{ lib, buildPythonPackage, fetchPypi, flask, ldapdomaindump, pycryptodomex, pyasn1, pyopenssl }: buildPythonPackage rec { pname = "impacket"; @@ -9,16 +9,18 @@ buildPythonPackage rec { sha256 = "4bf7e7b595356585599b4b2773b8a463d7b9765c97012dcd5a44eb6d547f6a1d"; }; - disabled = isPy3k; + propagatedBuildInputs = [ flask ldapdomaindump pycryptodomex pyasn1 pyopenssl ]; - # no tests + # fail with: + # RecursionError: maximum recursion depth exceeded doCheck = false; + pythonImportsCheck = [ "impacket" ]; meta = with lib; { description = "Network protocols Constructors and Dissectors"; homepage = "https://github.com/CoreSecurity/impacket"; # Modified Apache Software License, Version 1.1 license = licenses.free; - maintainers = with maintainers; [ peterhoeg ]; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } diff --git a/pkgs/development/python-modules/importmagic/default.nix b/pkgs/development/python-modules/importmagic/default.nix index 5217474ac232..3a6a3c9ef8d7 100644 --- a/pkgs/development/python-modules/importmagic/default.nix +++ b/pkgs/development/python-modules/importmagic/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , six @@ -17,7 +17,7 @@ buildPythonPackage rec { doCheck = false; # missing json file from tarball - meta = with stdenv.lib; { + meta = with lib; { description = "Python Import Magic - automagically add, remove and manage imports"; homepage = "https://github.com/alecthomas/importmagic"; license = licenses.bsd0; diff --git a/pkgs/development/python-modules/imread/default.nix b/pkgs/development/python-modules/imread/default.nix index 1e4ccde4b310..0caff8849678 100644 --- a/pkgs/development/python-modules/imread/default.nix +++ b/pkgs/development/python-modules/imread/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , nose @@ -25,7 +25,7 @@ buildPythonPackage rec { buildInputs = [ nose libjpeg libpng libtiff libwebp ]; propagatedBuildInputs = [ numpy ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Python package to load images as numpy arrays"; homepage = "https://imread.readthedocs.io/en/latest/"; maintainers = with maintainers; [ luispedro ]; diff --git a/pkgs/development/python-modules/imutils/default.nix b/pkgs/development/python-modules/imutils/default.nix index 9a0797f095f6..33c2ae0001c2 100644 --- a/pkgs/development/python-modules/imutils/default.nix +++ b/pkgs/development/python-modules/imutils/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , opencv3 @@ -18,7 +18,7 @@ buildPythonPackage rec { # no tests doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/jrosebr1/imutils"; description = "A series of convenience functions to make basic image processing functions"; license = licenses.mit; diff --git a/pkgs/development/python-modules/influxdb/default.nix b/pkgs/development/python-modules/influxdb/default.nix index 650235b29401..2d0fd5a93adb 100644 --- a/pkgs/development/python-modules/influxdb/default.nix +++ b/pkgs/development/python-modules/influxdb/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , requests @@ -29,7 +29,7 @@ buildPythonPackage rec { doCheck = false; propagatedBuildInputs = [ requests dateutil pytz six msgpack ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Python client for InfluxDB"; homepage = "https://github.com/influxdb/influxdb-python"; license = licenses.mit; diff --git a/pkgs/development/python-modules/influxgraph/default.nix b/pkgs/development/python-modules/influxgraph/default.nix index c4597650fe71..982b3fb8db5b 100644 --- a/pkgs/development/python-modules/influxgraph/default.nix +++ b/pkgs/development/python-modules/influxgraph/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy3k +{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k , influxdb, graphite_api, memcached }: @@ -21,7 +21,7 @@ buildPythonPackage rec { passthru.moduleName = "influxgraph.InfluxDBFinder"; - meta = with stdenv.lib; { + meta = with lib; { description = "InfluxDB storage plugin for Graphite-API"; homepage = "https://github.com/InfluxGraph/influxgraph"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/infoqscraper/default.nix b/pkgs/development/python-modules/infoqscraper/default.nix index 4a1543083432..4baa891a7790 100644 --- a/pkgs/development/python-modules/infoqscraper/default.nix +++ b/pkgs/development/python-modules/infoqscraper/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , html5lib , six @@ -23,7 +23,7 @@ buildPythonPackage rec { buildInputs = [ html5lib ]; propagatedBuildInputs = [ six beautifulsoup4 pkgs.ffmpeg_3 pkgs.swftools pkgs.rtmpdump ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Discover presentations and/or create a movie consisting of slides and audio track from an infoq url"; homepage = "https://github.com/cykl/infoqscraper/wiki"; license = licenses.mit; diff --git a/pkgs/development/python-modules/inifile/default.nix b/pkgs/development/python-modules/inifile/default.nix index e64ef76356d1..9bd24a4d7889 100644 --- a/pkgs/development/python-modules/inifile/default.nix +++ b/pkgs/development/python-modules/inifile/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi }: @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "0zgd53czc1irwx6b5zip8xlmyfr40hz2pd498d8yv61znj6lm16h"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A small INI library for Python"; homepage = "https://github.com/mitsuhiko/python-inifile"; license = licenses.bsd0; diff --git a/pkgs/development/python-modules/iniparse/default.nix b/pkgs/development/python-modules/iniparse/default.nix index e240b0863c23..c515b7865b15 100644 --- a/pkgs/development/python-modules/iniparse/default.nix +++ b/pkgs/development/python-modules/iniparse/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , python @@ -23,7 +23,7 @@ buildPythonPackage rec { # Does not install tests doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Accessing and Modifying INI files"; homepage = "https://github.com/candlepin/python-iniparse"; license = licenses.mit; diff --git a/pkgs/development/python-modules/inquirer/default.nix b/pkgs/development/python-modules/inquirer/default.nix index c17c3eb4af88..c434a3f52bce 100644 --- a/pkgs/development/python-modules/inquirer/default.nix +++ b/pkgs/development/python-modules/inquirer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, python-editor, readchar, blessed, pytest, pytestcov, pexpect, pytest-mock }: +{ lib, stdenv, buildPythonPackage, fetchFromGitHub, python-editor, readchar, blessed, pytest, pytestcov, pexpect, pytest-mock }: buildPythonPackage rec { pname = "inquirer"; @@ -26,7 +26,7 @@ buildPythonPackage rec { pytest --cov-report=term-missing --cov inquirer --no-cov-on-fail tests/unit tests/integration ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/magmax/python-inquirer"; description = "A collection of common interactive command line user interfaces, based on Inquirer.js"; license = licenses.mit; diff --git a/pkgs/development/python-modules/interruptingcow/default.nix b/pkgs/development/python-modules/interruptingcow/default.nix index 279fb1c9685b..b4e1dfaff181 100644 --- a/pkgs/development/python-modules/interruptingcow/default.nix +++ b/pkgs/development/python-modules/interruptingcow/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi }: +{ lib, stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "interruptingcow"; version = "0.8"; @@ -8,7 +8,7 @@ buildPythonPackage rec { sha256 = "3e8cd5058b651e625702cba53e3b1fb76d7a5ec07ab69c52a167a9f784e3306c"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A watchdog that interrupts long running code"; homepage = "https://bitbucket.org/evzijst/interruptingcow"; license = licenses.mit; diff --git a/pkgs/development/python-modules/intervaltree/default.nix b/pkgs/development/python-modules/intervaltree/default.nix index 8b0bbf2dd395..27a5fa3650e8 100644 --- a/pkgs/development/python-modules/intervaltree/default.nix +++ b/pkgs/development/python-modules/intervaltree/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ lib, stdenv, buildPythonPackage, fetchPypi , python, pytest, sortedcontainers }: buildPythonPackage rec { @@ -21,7 +21,7 @@ buildPythonPackage rec { runHook postCheck ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Editable interval tree data structure for Python 2 and 3"; homepage = "https://github.com/chaimleib/intervaltree"; license = [ licenses.asl20 ]; diff --git a/pkgs/development/python-modules/ipaddr/default.nix b/pkgs/development/python-modules/ipaddr/default.nix index e76aa6ee2a57..427681fedb86 100644 --- a/pkgs/development/python-modules/ipaddr/default.nix +++ b/pkgs/development/python-modules/ipaddr/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , isPy3k @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "1ml8r8z3f0mnn381qs1snbffa920i9ycp6mm2am1d3aqczkdz4j0"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Google's IP address manipulation library"; homepage = "https://github.com/google/ipaddr-py"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/ipaddress/default.nix b/pkgs/development/python-modules/ipaddress/default.nix index 0074ad2420d8..f2e479aff96e 100644 --- a/pkgs/development/python-modules/ipaddress/default.nix +++ b/pkgs/development/python-modules/ipaddress/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , pythonAtLeast @@ -18,7 +18,7 @@ if (pythonAtLeast "3.3") then null else buildPythonPackage rec { ${python.interpreter} test_ipaddress.py ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Port of the 3.3+ ipaddress module to 2.6, 2.7, and 3.2"; homepage = "https://github.com/phihag/ipaddress"; license = licenses.psfl; diff --git a/pkgs/development/python-modules/ipdb/default.nix b/pkgs/development/python-modules/ipdb/default.nix index df2ae6b46616..b21907f75ff5 100644 --- a/pkgs/development/python-modules/ipdb/default.nix +++ b/pkgs/development/python-modules/ipdb/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , ipython @@ -24,7 +24,7 @@ buildPythonPackage rec { export HOME=$(mktemp -d) ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/gotcha/ipdb"; description = "IPython-enabled pdb"; license = licenses.bsd0; diff --git a/pkgs/development/python-modules/ipdbplugin/default.nix b/pkgs/development/python-modules/ipdbplugin/default.nix index 7c9ee263b2b4..057d82cbebc3 100644 --- a/pkgs/development/python-modules/ipdbplugin/default.nix +++ b/pkgs/development/python-modules/ipdbplugin/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , nose @@ -16,7 +16,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ nose ipython ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/flavioamieiro/nose-ipdb/tree/master"; description = "Nose plugin to use iPdb instead of Pdb when tests fail"; license = licenses.lgpl2; diff --git a/pkgs/development/python-modules/ipfsapi/default.nix b/pkgs/development/python-modules/ipfsapi/default.nix index 1778e5a81af6..3deb0c6cb80c 100644 --- a/pkgs/development/python-modules/ipfsapi/default.nix +++ b/pkgs/development/python-modules/ipfsapi/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchFromGitHub , isPy27 @@ -20,7 +20,7 @@ buildPythonPackage { propagatedBuildInputs = [ six requests ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A python client library for the IPFS API"; license = licenses.mit; maintainers = with maintainers; [ mguentner ]; diff --git a/pkgs/development/python-modules/iptools/default.nix b/pkgs/development/python-modules/iptools/default.nix index 9498ee2762a3..431c05bb3881 100644 --- a/pkgs/development/python-modules/iptools/default.nix +++ b/pkgs/development/python-modules/iptools/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , nose @@ -15,7 +15,7 @@ buildPythonPackage rec { buildInputs = [ nose ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Utilities for manipulating IP addresses including a class that can be used to include CIDR network blocks in Django's INTERNAL_IPS setting"; homepage = "https://pypi.python.org/pypi/iptools"; license = licenses.bsd0; diff --git a/pkgs/development/python-modules/iso3166/default.nix b/pkgs/development/python-modules/iso3166/default.nix index f6a4a00283c5..acf6d3c9331d 100644 --- a/pkgs/development/python-modules/iso3166/default.nix +++ b/pkgs/development/python-modules/iso3166/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildPythonPackage, pytest }: +{ lib, stdenv, fetchFromGitHub, buildPythonPackage, pytest }: buildPythonPackage { pname = "iso3166"; @@ -18,7 +18,7 @@ buildPythonPackage { py.test ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/deactivated/python-iso3166"; description = "Self-contained ISO 3166-1 country definitions"; license = licenses.mit; diff --git a/pkgs/development/python-modules/isodate/default.nix b/pkgs/development/python-modules/isodate/default.nix index d46fb7ed74ca..d2098a83c95e 100644 --- a/pkgs/development/python-modules/isodate/default.nix +++ b/pkgs/development/python-modules/isodate/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , python @@ -20,7 +20,7 @@ buildPythonPackage rec { ${python.interpreter} -m unittest discover -s src/isodate/tests ''; - meta = with stdenv.lib; { + meta = with lib; { description = "ISO 8601 date/time parser"; homepage = "http://cheeseshop.python.org/pypi/isodate"; license = licenses.bsd0; diff --git a/pkgs/development/python-modules/itemloaders/default.nix b/pkgs/development/python-modules/itemloaders/default.nix index 08c7e50e95e9..107585f0416c 100644 --- a/pkgs/development/python-modules/itemloaders/default.nix +++ b/pkgs/development/python-modules/itemloaders/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "itemloaders"; - version = "1.0.3"; + version = "1.0.4"; disabled = isPy27; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "scrapy"; repo = pname; rev = "v${version}"; - sha256 = "1s8c2il7jyfixpb7h5zq0lf4s07pqwia4ycpf3slb8whcp0h8bfm"; + sha256 = "0j68xgx2z63sc1nc9clw6744036vfbijdsghvjv6pk674d5lgyam"; }; propagatedBuildInputs = [ w3lib parsel jmespath itemadapter ]; diff --git a/pkgs/development/python-modules/itsdangerous/default.nix b/pkgs/development/python-modules/itsdangerous/default.nix index 4761a98dc301..e89786d4e18d 100644 --- a/pkgs/development/python-modules/itsdangerous/default.nix +++ b/pkgs/development/python-modules/itsdangerous/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi }: @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "321b033d07f2a4136d3ec762eac9f16a10ccd60f53c0c91af90217ace7ba1f19"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Helpers to pass trusted data to untrusted environments and back"; homepage = "https://pypi.python.org/pypi/itsdangerous/"; license = licenses.bsd0; diff --git a/pkgs/development/python-modules/itypes/default.nix b/pkgs/development/python-modules/itypes/default.nix index 17ba3a2183a3..417d1a20b3bf 100644 --- a/pkgs/development/python-modules/itypes/default.nix +++ b/pkgs/development/python-modules/itypes/default.nix @@ -1,5 +1,5 @@ { - stdenv, + lib, stdenv, fetchFromGitHub, buildPythonPackage, pytest, @@ -22,7 +22,7 @@ buildPythonPackage rec { pytest tests.py ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Simple immutable types for python"; homepage = "https://github.com/tomchristie/itypes"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/j2cli/default.nix b/pkgs/development/python-modules/j2cli/default.nix index b2b80e2766c7..14cf18ae694f 100644 --- a/pkgs/development/python-modules/j2cli/default.nix +++ b/pkgs/development/python-modules/j2cli/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , jinja2 @@ -18,7 +18,7 @@ buildPythonPackage rec { doCheck = false; # tests aren't installed thus aren't found, so skip propagatedBuildInputs = [ jinja2 pyyaml setuptools ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/kolypto/j2cli"; description = "Jinja2 Command-Line Tool"; license = licenses.bsd2; diff --git a/pkgs/development/python-modules/jabberbot/default.nix b/pkgs/development/python-modules/jabberbot/default.nix index 4e550bcca20c..4c625d944859 100644 --- a/pkgs/development/python-modules/jabberbot/default.nix +++ b/pkgs/development/python-modules/jabberbot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, isPy3k, fetchPypi, xmpppy }: +{ lib, stdenv, buildPythonPackage, isPy3k, fetchPypi, xmpppy }: buildPythonPackage rec { pname = "jabberbot"; @@ -14,7 +14,7 @@ buildPythonPackage rec { doCheck = false; # lol, it does not even specify dependencies properly - meta = with stdenv.lib; { + meta = with lib; { description = "A framework for writing Jabber/XMPP bots and services"; homepage = "http://thp.io/2007/python-jabberbot/"; license = licenses.gpl3; diff --git a/pkgs/development/python-modules/jc/default.nix b/pkgs/development/python-modules/jc/default.nix index cc74076b6c72..6f120fa6ea2e 100644 --- a/pkgs/development/python-modules/jc/default.nix +++ b/pkgs/development/python-modules/jc/default.nix @@ -1,27 +1,30 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchFromGitHub , ruamel_yaml , xmltodict , pygments , isPy27 +, pytestCheckHook }: buildPythonPackage rec { pname = "jc"; - version = "1.13.4"; + version = "1.14.1"; disabled = isPy27; src = fetchFromGitHub { owner = "kellyjonbrazil"; repo = "jc"; rev = "v${version}"; - sha256 = "0rwvyyrdnw43pixp8h51rncq2inc9pbbj1j2191y5si00pjw34zr"; + sha256 = "1vzzz7dlg6apxhcl0qkfdpp2v9d0q6jyafpfmklkcbjs31zvwcsw"; }; propagatedBuildInputs = [ ruamel_yaml xmltodict pygments ]; - meta = with stdenv.lib; { + checkInputs = [ pytestCheckHook ]; + + meta = with lib; { description = "This tool serializes the output of popular command line tools and filetypes to structured JSON output"; homepage = "https://github.com/kellyjonbrazil/jc"; license = licenses.mit; diff --git a/pkgs/development/python-modules/jdatetime/default.nix b/pkgs/development/python-modules/jdatetime/default.nix index d51d54287e76..d4aa49c3ca3c 100644 --- a/pkgs/development/python-modules/jdatetime/default.nix +++ b/pkgs/development/python-modules/jdatetime/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, six }: +{ lib, stdenv, buildPythonPackage, fetchPypi, six }: buildPythonPackage rec { pname = "jdatetime"; @@ -11,7 +11,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Jalali datetime binding for python"; homepage = "https://pypi.python.org/pypi/jdatetime"; license = licenses.psfl; diff --git a/pkgs/development/python-modules/jedi/default.nix b/pkgs/development/python-modules/jedi/default.nix index ab8f72ea9f18..6e833a774604 100644 --- a/pkgs/development/python-modules/jedi/default.nix +++ b/pkgs/development/python-modules/jedi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, fetchPypi, pytest, glibcLocales, tox, pytestcov, parso }: +{ lib, stdenv, buildPythonPackage, fetchFromGitHub, fetchPypi, pytest, glibcLocales, tox, pytestcov, parso }: buildPythonPackage rec { pname = "jedi"; @@ -25,7 +25,7 @@ buildPythonPackage rec { # tox required for tests: https://github.com/davidhalter/jedi/issues/808 doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/davidhalter/jedi"; description = "An autocompletion tool for Python that can be used for text editors"; license = licenses.lgpl3Plus; diff --git a/pkgs/development/python-modules/jenkinsapi/default.nix b/pkgs/development/python-modules/jenkinsapi/default.nix index 40bf7752a90b..912c21cc8fb4 100644 --- a/pkgs/development/python-modules/jenkinsapi/default.nix +++ b/pkgs/development/python-modules/jenkinsapi/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , mock @@ -30,7 +30,7 @@ buildPythonPackage rec { -k "not systests and not test_plugins and not test_view" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A Python API for accessing resources on a Jenkins continuous-integration server"; homepage = "https://github.com/salimfadhley/jenkinsapi"; maintainers = with maintainers; [ drets ]; diff --git a/pkgs/development/python-modules/jinja2/default.nix b/pkgs/development/python-modules/jinja2/default.nix index 45178377026d..5dc3cbe105e5 100644 --- a/pkgs/development/python-modules/jinja2/default.nix +++ b/pkgs/development/python-modules/jinja2/default.nix @@ -1,10 +1,10 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , isPy3k , fetchPypi , pytest , markupsafe -, setuptools +, setuptools }: buildPythonPackage rec { @@ -27,7 +27,7 @@ buildPythonPackage rec { pytest -v tests ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://jinja.pocoo.org/"; description = "Stand-alone template engine"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/jinja2_pluralize/default.nix b/pkgs/development/python-modules/jinja2_pluralize/default.nix index 4a62fa4c25b7..0a6d0c365a04 100644 --- a/pkgs/development/python-modules/jinja2_pluralize/default.nix +++ b/pkgs/development/python-modules/jinja2_pluralize/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, jinja2, inflect }: +{ lib, stdenv, buildPythonPackage, fetchPypi, jinja2, inflect }: buildPythonPackage rec { pname = "jinja2_pluralize"; @@ -14,7 +14,7 @@ buildPythonPackage rec { inflect ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Jinja2 pluralize filters"; homepage = "https://github.com/audreyr/jinja2_pluralize"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/jinja2_time/default.nix b/pkgs/development/python-modules/jinja2_time/default.nix index d84c16f1abae..7887fe96f75e 100644 --- a/pkgs/development/python-modules/jinja2_time/default.nix +++ b/pkgs/development/python-modules/jinja2_time/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , arrow @@ -16,7 +16,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ arrow jinja2 ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/hackebrot/jinja2-time"; description = "Jinja2 Extension for Dates and Times"; license = licenses.mit; diff --git a/pkgs/development/python-modules/jmespath/default.nix b/pkgs/development/python-modules/jmespath/default.nix index 993955f2a032..3b31700de0eb 100644 --- a/pkgs/development/python-modules/jmespath/default.nix +++ b/pkgs/development/python-modules/jmespath/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , ply @@ -17,7 +17,7 @@ buildPythonPackage rec { buildInputs = [ nose ]; propagatedBuildInputs = [ ply ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/boto/jmespath"; description = "JMESPath allows you to declaratively specify how to extract elements from a JSON document"; license = "BSD"; diff --git a/pkgs/development/python-modules/johnnycanencrypt/Cargo.lock.patch b/pkgs/development/python-modules/johnnycanencrypt/Cargo.lock.patch new file mode 100644 index 000000000000..b70f9304c728 --- /dev/null +++ b/pkgs/development/python-modules/johnnycanencrypt/Cargo.lock.patch @@ -0,0 +1,1194 @@ +diff --git a/Cargo.lock b/Cargo.lock +new file mode 100644 +index 0000000..84c37bc +--- /dev/null ++++ b/Cargo.lock +@@ -0,0 +1,1188 @@ ++# This file is automatically @generated by Cargo. ++# It is not intended for manual editing. ++[[package]] ++name = "addr2line" ++version = "0.14.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a55f82cfe485775d02112886f4169bde0c5894d75e79ead7eafe7e40a25e45f7" ++dependencies = [ ++ "gimli", ++] ++ ++[[package]] ++name = "adler" ++version = "0.2.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ee2a4ec343196209d6594e19543ae87a39f96d5534d7174822a3ad825dd6ed7e" ++ ++[[package]] ++name = "aead" ++version = "0.3.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7fc95d1bdb8e6666b2b217308eeeb09f2d6728d104be3e31916cc74d15420331" ++dependencies = [ ++ "generic-array", ++] ++ ++[[package]] ++name = "aho-corasick" ++version = "0.7.15" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7404febffaa47dac81aa44dba71523c9d069b1bdc50a77db41195149e17f68e5" ++dependencies = [ ++ "memchr", ++] ++ ++[[package]] ++name = "anyhow" ++version = "1.0.37" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ee67c11feeac938fae061b232e38e0b6d94f97a9df10e6271319325ac4c56a86" ++ ++[[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.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" ++ ++[[package]] ++name = "ascii-canvas" ++version = "2.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ff8eb72df928aafb99fe5d37b383f2fe25bd2a765e3e5f7c365916b6f2463a29" ++dependencies = [ ++ "term", ++] ++ ++[[package]] ++name = "atty" ++version = "0.2.14" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" ++dependencies = [ ++ "hermit-abi", ++ "libc", ++ "winapi", ++] ++ ++[[package]] ++name = "autocfg" ++version = "1.0.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" ++ ++[[package]] ++name = "backtrace" ++version = "0.3.55" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ef5140344c85b01f9bbb4d4b7288a8aa4b3287ccef913a14bcc78a1063623598" ++dependencies = [ ++ "addr2line", ++ "cfg-if 1.0.0", ++ "libc", ++ "miniz_oxide", ++ "object", ++ "rustc-demangle", ++] ++ ++[[package]] ++name = "base64" ++version = "0.13.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" ++ ++[[package]] ++name = "bindgen" ++version = "0.51.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ebd71393f1ec0509b553aa012b9b58e81dadbdff7130bd3b8cba576e69b32f75" ++dependencies = [ ++ "bitflags", ++ "cexpr", ++ "cfg-if 0.1.10", ++ "clang-sys", ++ "lazy_static", ++ "peeking_take_while", ++ "proc-macro2", ++ "quote", ++ "regex", ++ "rustc-hash", ++ "shlex", ++] ++ ++[[package]] ++name = "bit-set" ++version = "0.5.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6e11e16035ea35e4e5997b393eacbf6f63983188f7a2ad25bfb13465f5ad59de" ++dependencies = [ ++ "bit-vec", ++] ++ ++[[package]] ++name = "bit-vec" ++version = "0.6.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" ++ ++[[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.11" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "afa748e348ad3be8263be728124b24a24f268266f6f5d58af9d75f6a40b5c587" ++dependencies = [ ++ "arrayref", ++ "arrayvec", ++ "constant_time_eq", ++] ++ ++[[package]] ++name = "buffered-reader" ++version = "1.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f5711ccfa79a8167779ad2176d3334078f03b1579ddf8f42aa556196eba60a42" ++dependencies = [ ++ "bzip2", ++ "flate2", ++ "libc", ++] ++ ++[[package]] ++name = "byteorder" ++version = "1.3.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de" ++ ++[[package]] ++name = "bzip2" ++version = "0.4.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "275d84fe348b838dc49477d39770682839b3e73e21a3eadc07b12924f1a9fcbe" ++dependencies = [ ++ "bzip2-sys", ++ "libc", ++] ++ ++[[package]] ++name = "bzip2-sys" ++version = "0.1.9+1.0.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ad3b39a260062fca31f7b0b12f207e8f2590a67d32ec7d59c20484b07ea7285e" ++dependencies = [ ++ "cc", ++ "libc", ++ "pkg-config", ++] ++ ++[[package]] ++name = "cc" ++version = "1.0.66" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4c0496836a84f8d0495758516b8621a622beb77c0fed418570e50764093ced48" ++ ++[[package]] ++name = "cexpr" ++version = "0.3.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fce5b5fb86b0c57c20c834c1b412fd09c77c8a59b9473f86272709e78874cd1d" ++dependencies = [ ++ "nom", ++] ++ ++[[package]] ++name = "cfg-if" ++version = "0.1.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" ++ ++[[package]] ++name = "cfg-if" ++version = "1.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" ++ ++[[package]] ++name = "chrono" ++version = "0.4.19" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73" ++dependencies = [ ++ "libc", ++ "num-integer", ++ "num-traits", ++ "time", ++ "winapi", ++] ++ ++[[package]] ++name = "cipher" ++version = "0.2.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "12f8e7987cbd042a63249497f41aed09f8e65add917ea6566effbc56578d6801" ++dependencies = [ ++ "generic-array", ++] ++ ++[[package]] ++name = "clang-sys" ++version = "0.28.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "81de550971c976f176130da4b2978d3b524eaa0fd9ac31f3ceb5ae1231fb4853" ++dependencies = [ ++ "glob", ++ "libc", ++ "libloading", ++] ++ ++[[package]] ++name = "cmac" ++version = "0.5.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "73d4de4f7724e5fe70addfb2bd37c2abd2f95084a429d7773b0b9645499b4272" ++dependencies = [ ++ "crypto-mac", ++ "dbl", ++] ++ ++[[package]] ++name = "constant_time_eq" ++version = "0.1.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" ++ ++[[package]] ++name = "crc32fast" ++version = "1.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "81156fece84ab6a9f2afdb109ce3ae577e42b1228441eded99bd77f627953b1a" ++dependencies = [ ++ "cfg-if 1.0.0", ++] ++ ++[[package]] ++name = "crossbeam-utils" ++version = "0.8.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "02d96d1e189ef58269ebe5b97953da3274d83a93af647c2ddd6f9dab28cedb8d" ++dependencies = [ ++ "autocfg", ++ "cfg-if 1.0.0", ++ "lazy_static", ++] ++ ++[[package]] ++name = "crunchy" ++version = "0.2.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" ++ ++[[package]] ++name = "crypto-mac" ++version = "0.10.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4857fd85a0c34b3c3297875b747c1e02e06b6a0ea32dd892d8192b9ce0813ea6" ++dependencies = [ ++ "cipher", ++ "generic-array", ++ "subtle", ++] ++ ++[[package]] ++name = "ctor" ++version = "0.1.17" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "373c88d9506e2e9230f6107701b7d8425f4cb3f6df108ec3042a26e936666da5" ++dependencies = [ ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "ctr" ++version = "0.6.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fb4a30d54f7443bf3d6191dcd486aca19e67cb3c49fa7a06a319966346707e7f" ++dependencies = [ ++ "cipher", ++] ++ ++[[package]] ++name = "dbl" ++version = "0.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2735145c3b9ba15f2d7a3ae8cdafcbc8c98a7bef7f62afe9d08bd99fbf7130de" ++dependencies = [ ++ "generic-array", ++] ++ ++[[package]] ++name = "diff" ++version = "0.1.12" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0e25ea47919b1560c4e3b7fe0aaab9becf5b84a10325ddf7db0f0ba5e1026499" ++ ++[[package]] ++name = "digest" ++version = "0.9.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" ++dependencies = [ ++ "generic-array", ++] ++ ++[[package]] ++name = "dirs" ++version = "1.0.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3fd78930633bd1c6e35c4b42b1df7b0cbc6bc191146e512bb3bedf243fcc3901" ++dependencies = [ ++ "libc", ++ "redox_users", ++ "winapi", ++] ++ ++[[package]] ++name = "dyn-clone" ++version = "1.0.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ee2626afccd7561a06cf1367e2950c4718ea04565e20fb5029b6c7d8ad09abcf" ++ ++[[package]] ++name = "eax" ++version = "0.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e1f76e7a5e594b299a0fa9a99de627530725e341df41376aa342aecb2c5eb76e" ++dependencies = [ ++ "aead", ++ "cipher", ++ "cmac", ++ "ctr", ++ "subtle", ++] ++ ++[[package]] ++name = "either" ++version = "1.6.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" ++ ++[[package]] ++name = "ena" ++version = "0.14.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d7402b94a93c24e742487327a7cd839dc9d36fec9de9fb25b09f2dae459f36c3" ++dependencies = [ ++ "log", ++] ++ ++[[package]] ++name = "fixedbitset" ++version = "0.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "37ab347416e802de484e4d03c7316c48f1ecb56574dfd4a46a80f173ce1de04d" ++ ++[[package]] ++name = "flate2" ++version = "1.0.19" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7411863d55df97a419aa64cb4d2f167103ea9d767e2c54a1868b7ac3f6b47129" ++dependencies = [ ++ "cfg-if 1.0.0", ++ "crc32fast", ++ "libc", ++ "miniz_oxide", ++] ++ ++[[package]] ++name = "generic-array" ++version = "0.14.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "501466ecc8a30d1d3b7fc9229b122b2ce8ed6e9d9223f1138d4babb253e51817" ++dependencies = [ ++ "typenum", ++ "version_check 0.9.2", ++] ++ ++[[package]] ++name = "getrandom" ++version = "0.1.16" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" ++dependencies = [ ++ "cfg-if 1.0.0", ++ "libc", ++ "wasi 0.9.0+wasi-snapshot-preview1", ++] ++ ++[[package]] ++name = "ghost" ++version = "0.1.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1a5bcf1bbeab73aa4cf2fde60a846858dc036163c7c33bec309f8d17de785479" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "gimli" ++version = "0.23.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f6503fe142514ca4799d4c26297c4248239fe8838d827db6bd6065c6ed29a6ce" ++ ++[[package]] ++name = "glob" ++version = "0.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" ++ ++[[package]] ++name = "hashbrown" ++version = "0.9.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04" ++ ++[[package]] ++name = "hermit-abi" ++version = "0.1.17" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5aca5565f760fb5b220e499d72710ed156fdb74e631659e99377d9ebfbd13ae8" ++dependencies = [ ++ "libc", ++] ++ ++[[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.6.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4fb1fa934250de4de8aef298d81c729a7d33d8c239daa3a7575e6b92bfc7313b" ++dependencies = [ ++ "autocfg", ++ "hashbrown", ++] ++ ++[[package]] ++name = "indoc" ++version = "1.0.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e5a75aeaaef0ce18b58056d306c27b07436fbb34b8816c53094b76dd81803136" ++dependencies = [ ++ "unindent", ++] ++ ++[[package]] ++name = "instant" ++version = "0.1.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "61124eeebbd69b8190558df225adf7e4caafce0d743919e5d6b19652314ec5ec" ++dependencies = [ ++ "cfg-if 1.0.0", ++] ++ ++[[package]] ++name = "inventory" ++version = "0.1.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0f0f7efb804ec95e33db9ad49e4252f049e37e8b0a4652e3cd61f7999f2eff7f" ++dependencies = [ ++ "ctor", ++ "ghost", ++ "inventory-impl", ++] ++ ++[[package]] ++name = "inventory-impl" ++version = "0.1.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "75c094e94816723ab936484666968f5b58060492e880f3c8d00489a1e244fa51" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "itertools" ++version = "0.9.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b" ++dependencies = [ ++ "either", ++] ++ ++[[package]] ++name = "johnnycanencrypt" ++version = "0.5.0" ++dependencies = [ ++ "anyhow", ++ "chrono", ++ "pyo3", ++ "sequoia-openpgp", ++ "talktosc", ++] ++ ++[[package]] ++name = "lalrpop" ++version = "0.19.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5c64e04d8ea9c95c2135dfc4298088eafaf956bc90ba372eb1bea4f715634587" ++dependencies = [ ++ "ascii-canvas", ++ "atty", ++ "bit-set", ++ "diff", ++ "ena", ++ "itertools", ++ "lalrpop-util", ++ "petgraph", ++ "pico-args", ++ "regex", ++ "regex-syntax", ++ "string_cache", ++ "term", ++ "tiny-keccak", ++ "unicode-xid", ++] ++ ++[[package]] ++name = "lalrpop-util" ++version = "0.19.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f9de203e2fa3e883364fcc778a1293ab4d936f6cff400433013c20105df178c5" ++dependencies = [ ++ "regex", ++] ++ ++[[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.81" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1482821306169ec4d07f6aca392a4681f66c75c9918aa49641a2595db64053cb" ++ ++[[package]] ++name = "libloading" ++version = "0.5.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f2b111a074963af1d37a139918ac6d49ad1d0d5e47f72fd55388619691a7d753" ++dependencies = [ ++ "cc", ++ "winapi", ++] ++ ++[[package]] ++name = "lock_api" ++version = "0.4.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "dd96ffd135b2fd7b973ac026d28085defbe8983df057ced3eb4f2130b0831312" ++dependencies = [ ++ "scopeguard", ++] ++ ++[[package]] ++name = "log" ++version = "0.4.11" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b" ++dependencies = [ ++ "cfg-if 0.1.10", ++] ++ ++[[package]] ++name = "matches" ++version = "0.1.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" ++ ++[[package]] ++name = "memchr" ++version = "2.3.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525" ++ ++[[package]] ++name = "memsec" ++version = "0.6.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2af4f95d8737f4ffafbd1fb3c703cdc898868a244a59786793cba0520ebdcbdd" ++ ++[[package]] ++name = "miniz_oxide" ++version = "0.4.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0f2d26ec3309788e423cfbf68ad1800f061638098d76a83681af979dc4eda19d" ++dependencies = [ ++ "adler", ++ "autocfg", ++] ++ ++[[package]] ++name = "nettle" ++version = "7.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b1afae85450b829ad720f2827e3b07d78e06b5521cfe5ed72808a9f593e7cdd8" ++dependencies = [ ++ "getrandom", ++ "libc", ++ "nettle-sys", ++ "thiserror", ++] ++ ++[[package]] ++name = "nettle-sys" ++version = "2.0.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b8629333ff5f3b74d251dae253e383cda9242410fac4244a4fe855469be101fb" ++dependencies = [ ++ "bindgen", ++ "pkg-config", ++] ++ ++[[package]] ++name = "new_debug_unreachable" ++version = "1.0.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54" ++ ++[[package]] ++name = "nom" ++version = "4.2.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2ad2a91a8e869eeb30b9cb3119ae87773a8f4ae617f41b1eb9c154b2905f7bd6" ++dependencies = [ ++ "memchr", ++ "version_check 0.1.5", ++] ++ ++[[package]] ++name = "num-integer" ++version = "0.1.44" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db" ++dependencies = [ ++ "autocfg", ++ "num-traits", ++] ++ ++[[package]] ++name = "num-traits" ++version = "0.2.14" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290" ++dependencies = [ ++ "autocfg", ++] ++ ++[[package]] ++name = "object" ++version = "0.22.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8d3b63360ec3cb337817c2dbd47ab4a0f170d285d8e5a2064600f3def1402397" ++ ++[[package]] ++name = "parking_lot" ++version = "0.11.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6d7744ac029df22dca6284efe4e898991d28e3085c706c972bcd7da4a27a15eb" ++dependencies = [ ++ "instant", ++ "lock_api", ++ "parking_lot_core", ++] ++ ++[[package]] ++name = "parking_lot_core" ++version = "0.8.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9ccb628cad4f84851442432c60ad8e1f607e29752d0bf072cbd0baf28aa34272" ++dependencies = [ ++ "cfg-if 1.0.0", ++ "instant", ++ "libc", ++ "redox_syscall", ++ "smallvec", ++ "winapi", ++] ++ ++[[package]] ++name = "paste" ++version = "1.0.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c5d65c4d95931acda4498f675e332fcbdc9a06705cd07086c510e9b6009cd1c1" ++ ++[[package]] ++name = "pcsc" ++version = "2.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "88e09a8d8705a2c9b1ffe1f9dd9580efe3f8e80c19fc9f99038fe99b7bb56c83" ++dependencies = [ ++ "bitflags", ++ "pcsc-sys", ++] ++ ++[[package]] ++name = "pcsc-sys" ++version = "1.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e1b7bfecba2c0f1b5efb0e7caf7533ab1c295024165bcbb066231f60d33e23ea" ++dependencies = [ ++ "pkg-config", ++] ++ ++[[package]] ++name = "peeking_take_while" ++version = "0.1.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" ++ ++[[package]] ++name = "petgraph" ++version = "0.5.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "467d164a6de56270bd7c4d070df81d07beace25012d5103ced4e9ff08d6afdb7" ++dependencies = [ ++ "fixedbitset", ++ "indexmap", ++] ++ ++[[package]] ++name = "phf_shared" ++version = "0.8.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c00cf8b9eafe68dde5e9eaa2cef8ee84a9336a47d566ec55ca16589633b65af7" ++dependencies = [ ++ "siphasher", ++] ++ ++[[package]] ++name = "pico-args" ++version = "0.3.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "28b9b4df73455c861d7cbf8be42f01d3b373ed7f02e378d55fa84eafc6f638b1" ++ ++[[package]] ++name = "pkg-config" ++version = "0.3.19" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3831453b3449ceb48b6d9c7ad7c96d5ea673e9b470a1dc578c2ce6521230884c" ++ ++[[package]] ++name = "precomputed-hash" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" ++ ++[[package]] ++name = "proc-macro2" ++version = "1.0.24" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71" ++dependencies = [ ++ "unicode-xid", ++] ++ ++[[package]] ++name = "pyo3" ++version = "0.13.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5cdd01a4c2719dd1f3ceab0875fa1a2c2cd3c619477349d78f43cd716b345436" ++dependencies = [ ++ "cfg-if 1.0.0", ++ "ctor", ++ "indoc", ++ "inventory", ++ "libc", ++ "parking_lot", ++ "paste", ++ "pyo3-macros", ++ "unindent", ++] ++ ++[[package]] ++name = "pyo3-macros" ++version = "0.13.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7f8218769d13e354f841d559a19b0cf22cfd55959c7046ef594e5f34dbe46d16" ++dependencies = [ ++ "pyo3-macros-backend", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "pyo3-macros-backend" ++version = "0.13.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fc4da0bfdf76f0a5971c698f2cb6b3f832a6f80f16dedeeb3f123eb0431ecce2" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "quote" ++version = "1.0.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "991431c3519a3f36861882da93630ce66b52918dcf1b8e2fd66b397fc96f28df" ++dependencies = [ ++ "proc-macro2", ++] ++ ++[[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.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "de0737333e7a9502c789a36d7c7fa6092a49895d4faa31ca5df163857ded2e9d" ++dependencies = [ ++ "getrandom", ++ "redox_syscall", ++ "rust-argon2", ++] ++ ++[[package]] ++name = "regex" ++version = "1.4.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "38cf2c13ed4745de91a5eb834e11c00bcc3709e773173b2ce4c56c9fbde04b9c" ++dependencies = [ ++ "aho-corasick", ++ "memchr", ++ "regex-syntax", ++ "thread_local", ++] ++ ++[[package]] ++name = "regex-syntax" ++version = "0.6.21" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3b181ba2dcf07aaccad5448e8ead58db5b742cf85dfe035e2227f137a539a189" ++ ++[[package]] ++name = "rpassword" ++version = "5.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d755237fc0f99d98641540e66abac8bc46a0652f19148ac9e21de2da06b326c9" ++dependencies = [ ++ "libc", ++ "winapi", ++] ++ ++[[package]] ++name = "rust-argon2" ++version = "0.8.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4b18820d944b33caa75a71378964ac46f58517c92b6ae5f762636247c09e78fb" ++dependencies = [ ++ "base64", ++ "blake2b_simd", ++ "constant_time_eq", ++ "crossbeam-utils", ++] ++ ++[[package]] ++name = "rustc-demangle" ++version = "0.1.18" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6e3bad0ee36814ca07d7968269dd4b7ec89ec2da10c4bb613928d3077083c232" ++ ++[[package]] ++name = "rustc-hash" ++version = "1.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" ++ ++[[package]] ++name = "scopeguard" ++version = "1.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" ++ ++[[package]] ++name = "sequoia-openpgp" ++version = "1.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "664de0a9388e38d0f350547056f18fcc03f78d85e5a49fa4fa8927ca6aea1424" ++dependencies = [ ++ "anyhow", ++ "backtrace", ++ "base64", ++ "buffered-reader", ++ "bzip2", ++ "chrono", ++ "dyn-clone", ++ "eax", ++ "flate2", ++ "idna", ++ "lalrpop", ++ "lalrpop-util", ++ "lazy_static", ++ "libc", ++ "memsec", ++ "nettle", ++ "regex", ++ "sha1collisiondetection", ++ "thiserror", ++ "unicode-normalization", ++] ++ ++[[package]] ++name = "sha1collisiondetection" ++version = "0.2.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d7a6cf187c4059b3e63de2358b7e2f9a2261b6f3fd8ef4e7342308d0863ed082" ++dependencies = [ ++ "digest", ++ "generic-array", ++ "libc", ++] ++ ++[[package]] ++name = "shlex" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2" ++ ++[[package]] ++name = "siphasher" ++version = "0.3.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fa8f3741c7372e75519bd9346068370c9cdaabcc1f9599cbcf2a2719352286b7" ++ ++[[package]] ++name = "smallvec" ++version = "1.6.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1a55ca5f3b68e41c979bf8c46a6f1da892ca4db8f94023ce0bd32407573b1ac0" ++ ++[[package]] ++name = "string_cache" ++version = "0.8.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8ddb1139b5353f96e429e1a5e19fbaf663bddedaa06d1dbd49f82e352601209a" ++dependencies = [ ++ "lazy_static", ++ "new_debug_unreachable", ++ "phf_shared", ++ "precomputed-hash", ++] ++ ++[[package]] ++name = "subtle" ++version = "2.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1e81da0851ada1f3e9d4312c704aa4f8806f0f9d69faaf8df2f3464b4a9437c2" ++ ++[[package]] ++name = "syn" ++version = "1.0.57" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4211ce9909eb971f111059df92c45640aad50a619cf55cd76476be803c4c68e6" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "unicode-xid", ++] ++ ++[[package]] ++name = "talktosc" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "eda5fee425f91e5a4083946f4468948f59cc16412cdcd659554e474c647a5645" ++dependencies = [ ++ "pcsc", ++ "rpassword", ++ "thiserror", ++] ++ ++[[package]] ++name = "term" ++version = "0.5.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "edd106a334b7657c10b7c540a0106114feadeb4dc314513e97df481d5d966f42" ++dependencies = [ ++ "byteorder", ++ "dirs", ++ "winapi", ++] ++ ++[[package]] ++name = "thiserror" ++version = "1.0.23" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "76cc616c6abf8c8928e2fdcc0dbfab37175edd8fb49a4641066ad1364fdab146" ++dependencies = [ ++ "thiserror-impl", ++] ++ ++[[package]] ++name = "thiserror-impl" ++version = "1.0.23" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9be73a2caec27583d0046ef3796c3794f868a5bc813db689eed00c7631275cd1" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "thread_local" ++version = "1.0.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14" ++dependencies = [ ++ "lazy_static", ++] ++ ++[[package]] ++name = "time" ++version = "0.1.44" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255" ++dependencies = [ ++ "libc", ++ "wasi 0.10.0+wasi-snapshot-preview1", ++ "winapi", ++] ++ ++[[package]] ++name = "tiny-keccak" ++version = "2.0.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" ++dependencies = [ ++ "crunchy", ++] ++ ++[[package]] ++name = "tinyvec" ++version = "1.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ccf8dbc19eb42fba10e8feaaec282fb50e2c14b2726d6301dbfeed0f73306a6f" ++dependencies = [ ++ "tinyvec_macros", ++] ++ ++[[package]] ++name = "tinyvec_macros" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" ++ ++[[package]] ++name = "typenum" ++version = "1.12.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "373c8a200f9e67a0c95e62a4f52fbf80c23b4381c05a17845531982fa99e6b33" ++ ++[[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.16" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a13e63ab62dbe32aeee58d1c5408d35c36c392bba5d9d3142287219721afe606" ++dependencies = [ ++ "tinyvec", ++] ++ ++[[package]] ++name = "unicode-xid" ++version = "0.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564" ++ ++[[package]] ++name = "unindent" ++version = "0.1.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f14ee04d9415b52b3aeab06258a3f07093182b88ba0f9b8d203f211a7a7d41c7" ++ ++[[package]] ++name = "version_check" ++version = "0.1.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd" ++ ++[[package]] ++name = "version_check" ++version = "0.9.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b5a972e5669d67ba988ce3dc826706fb0a8b01471c088cb0b6110b805cc36aed" ++ ++[[package]] ++name = "wasi" ++version = "0.9.0+wasi-snapshot-preview1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" ++ ++[[package]] ++name = "wasi" ++version = "0.10.0+wasi-snapshot-preview1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" ++ ++[[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" diff --git a/pkgs/development/python-modules/johnnycanencrypt/default.nix b/pkgs/development/python-modules/johnnycanencrypt/default.nix new file mode 100644 index 000000000000..407bb44d8b2d --- /dev/null +++ b/pkgs/development/python-modules/johnnycanencrypt/default.nix @@ -0,0 +1,92 @@ +{ stdenv +, rustPlatform +, fetchFromGitHub +, pipInstallHook +, llvmPackages +, pkg-config +, maturin +, pcsclite +, nettle +, python +, requests +, vcrpy +, numpy +, pytestCheckHook +, pythonOlder +, PCSC +}: + +rustPlatform.buildRustPackage rec { + pname = "johnnycanencrypt"; + version = "0.5.0"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "kushaldas"; + repo = "johnnycanencrypt"; + rev = "v${version}"; + sha256 = "192wfrlyylrpzq70yki421mi1smk8q2cyki2a1d03q7h6apib3j4"; + }; + cargoPatches = [ ./Cargo.lock.patch ]; + + cargoSha256 = "0ifvpdizcdp2c5x2x2j1bhhy5a75q0pk7a63dmh52mlpmh45fy6r"; + + LIBCLANG_PATH = llvmPackages.libclang + "/lib"; + + propagatedBuildInputs = [ + requests + vcrpy + ]; + + nativeBuildInputs = [ + llvmPackages.clang + pkg-config + python + maturin + pipInstallHook + ]; + + buildInputs = [ + pcsclite + nettle + ] ++ stdenv.lib.optionals stdenv.isDarwin [ PCSC ]; + + # Needed b/c need to check AFTER python wheel is installed (using Rust Build, not buildPythonPackage) + doCheck = false; + doInstallCheck = true; + + installCheckInputs = [ + pytestCheckHook + numpy + ]; + + buildPhase = '' + runHook preBuild + maturin build --release --manylinux off --strip --cargo-extra-args="-j $NIX_BUILD_CORES --frozen" + runHook postBuild + ''; + + installPhase = '' + install -Dm644 -t dist target/wheels/*.whl + pipInstallPhase + ''; + + preCheck = '' + export TESTDIR=$(mktemp -d) + cp -r tests/ $TESTDIR + pushd $TESTDIR + ''; + + postCheck = '' + popd + ''; + + pythonImportsCheck = [ "johnnycanencrypt" ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/kushaldas/johnnycanencrypt"; + description = "Python module for OpenPGP written in Rust"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ _0x4A6F ]; + }; +} diff --git a/pkgs/development/python-modules/jpylyzer/default.nix b/pkgs/development/python-modules/jpylyzer/default.nix index 0d6398a768a1..c5c9cdf15056 100644 --- a/pkgs/development/python-modules/jpylyzer/default.nix +++ b/pkgs/development/python-modules/jpylyzer/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , buildPythonPackage , six @@ -21,7 +21,7 @@ buildPythonPackage rec { # runner seems to be upset by the project layout doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "JP2 (JPEG 2000 Part 1) image validator and properties extractor"; homepage = "https://jpylyzer.openpreservation.org/"; license = licenses.lgpl3; diff --git a/pkgs/development/python-modules/json-schema-for-humans/default.nix b/pkgs/development/python-modules/json-schema-for-humans/default.nix new file mode 100644 index 000000000000..bc32f57f50a7 --- /dev/null +++ b/pkgs/development/python-modules/json-schema-for-humans/default.nix @@ -0,0 +1,43 @@ +{ stdenv, buildPythonPackage, fetchFromGitHub, fetchurl +, pbr, click, dataclasses-json, htmlmin, jinja2, markdown2, pygments, pytz, pyyaml, requests, pytestCheckHook, beautifulsoup4, tox +}: + +buildPythonPackage rec { + pname = "json-schema-for-humans"; + version = "0.27.0"; + + src = fetchFromGitHub { + owner = "coveooss"; + repo = pname; + rev = "v${version}"; + sha256 = "1r40i192z6aasil5vsgcgp5yvx392dhhqnfc2qxbxvpja6l3p6p2"; + }; + + patches = [ (fetchurl { + url = "https://github.com/coveooss/json-schema-for-humans/commit/1fe2e2391da5a796204fd1889e4a11a53f83f7c9.patch"; + sha256 = "0kpydpddlg0rib9snl8albhbrrs6d3ds292gpgpg7bdpqrwamdib"; + }) (fetchurl { + url = "https://github.com/astro/json-schema-for-humans/commit/9bcc9b461102062dff214ca1ec2375b8aea53711.patch"; + sha256 = "142a07v8bn1j20b7177yb60f4944kbx4cdqqq2nz6xkxmamw704d"; + }) ]; + + nativeBuildInputs = [ pbr ]; + propagatedBuildInputs = [ + click dataclasses-json htmlmin jinja2 markdown2 + pygments pytz pyyaml requests + ]; + + preBuild = '' + export PBR_VERSION=0.0.1 + ''; + + checkInputs = [ pytestCheckHook beautifulsoup4 ]; + pytestFlagsArray = [ "--ignore tests/generate_test.py" ]; + + meta = with stdenv.lib; { + description = "Quickly generate HTML documentation from a JSON schema"; + homepage = "https://github.com/coveooss/json-schema-for-humans"; + license = licenses.asl20; + maintainers = with maintainers; [ astro ]; + }; +} diff --git a/pkgs/development/python-modules/jsonfield/default.nix b/pkgs/development/python-modules/jsonfield/default.nix index e9887b473793..07ee609d6534 100644 --- a/pkgs/development/python-modules/jsonfield/default.nix +++ b/pkgs/development/python-modules/jsonfield/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage, django, pytestCheckHook, pytest-django }: +{ lib, stdenv, fetchPypi, buildPythonPackage, django, pytestCheckHook, pytest-django }: buildPythonPackage rec { pname = "jsonfield"; @@ -15,7 +15,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ django ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Reusable model field that allows you to store validated JSON, automatically handling serialization to and from the database"; homepage = "https://github.com/rpkilby/jsonfield/"; license = licenses.mit; diff --git a/pkgs/development/python-modules/jsonpath_rw/default.nix b/pkgs/development/python-modules/jsonpath_rw/default.nix index 4b842a02af83..81a6eb3fb27b 100644 --- a/pkgs/development/python-modules/jsonpath_rw/default.nix +++ b/pkgs/development/python-modules/jsonpath_rw/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , isPyPy @@ -22,7 +22,7 @@ buildPythonPackage rec { # ImportError: No module named tests doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/kennknowles/python-jsonpath-rw"; description = "A robust and significantly extended implementation of JSONPath for Python, with a clear AST for metaprogramming"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/jsonpointer/default.nix b/pkgs/development/python-modules/jsonpointer/default.nix index 6971393b80c9..e2f22ec86387 100644 --- a/pkgs/development/python-modules/jsonpointer/default.nix +++ b/pkgs/development/python-modules/jsonpointer/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi }: @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "0qjkjy1qlyc1nl3k95wd03ssxac0a717x8889ypgs1cfcj3bm4n1"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Resolve JSON Pointers in Python"; homepage = "https://github.com/stefankoegl/python-json-pointer"; license = stdenv.lib.licenses.bsd2; # "Modified BSD license, says pypi" diff --git a/pkgs/development/python-modules/jsonref/default.nix b/pkgs/development/python-modules/jsonref/default.nix index c174a011b5fa..b901d811a230 100644 --- a/pkgs/development/python-modules/jsonref/default.nix +++ b/pkgs/development/python-modules/jsonref/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ lib, stdenv, buildPythonPackage, fetchPypi , pytest, mock }: buildPythonPackage rec { @@ -16,7 +16,7 @@ buildPythonPackage rec { py.test tests.py ''; - meta = with stdenv.lib; { + meta = with lib; { description = "An implementation of JSON Reference for Python"; homepage = "https://github.com/gazpachoking/jsonref"; license = licenses.mit; diff --git a/pkgs/development/python-modules/jsonrpc-async/default.nix b/pkgs/development/python-modules/jsonrpc-async/default.nix index c410b9407ea6..0b77db5df4e6 100644 --- a/pkgs/development/python-modules/jsonrpc-async/default.nix +++ b/pkgs/development/python-modules/jsonrpc-async/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ lib, stdenv, buildPythonPackage, fetchPypi , aiohttp, jsonrpc-base }: buildPythonPackage rec { @@ -12,7 +12,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp jsonrpc-base ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A JSON-RPC client library for asyncio"; homepage = "https://github.com/armills/jsonrpc-async"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/jsonrpc-base/default.nix b/pkgs/development/python-modules/jsonrpc-base/default.nix index 9318fc09373c..cc4bd1b2f686 100644 --- a/pkgs/development/python-modules/jsonrpc-base/default.nix +++ b/pkgs/development/python-modules/jsonrpc-base/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi }: +{ lib, stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "jsonrpc-base"; @@ -11,7 +11,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A JSON-RPC client library base interface"; homepage = "https://github.com/armills/jsonrpc-base"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/jsonrpc-websocket/default.nix b/pkgs/development/python-modules/jsonrpc-websocket/default.nix index 4fe136f69b7b..d14d382f013c 100644 --- a/pkgs/development/python-modules/jsonrpc-websocket/default.nix +++ b/pkgs/development/python-modules/jsonrpc-websocket/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ lib, stdenv, buildPythonPackage, fetchPypi , aiohttp, jsonrpc-base, pep8 , pytestCheckHook , pytest-asyncio @@ -20,7 +20,7 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook pytest-asyncio ]; pytestFlagsArray = [ "tests.py" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A JSON-RPC websocket client library for asyncio"; homepage = "https://github.com/armills/jsonrpc-websocket"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/jsonwatch/default.nix b/pkgs/development/python-modules/jsonwatch/default.nix index 1b859e21e904..feced9442257 100644 --- a/pkgs/development/python-modules/jsonwatch/default.nix +++ b/pkgs/development/python-modules/jsonwatch/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchurl , six @@ -17,7 +17,7 @@ buildPythonPackage { propagatedBuildInputs = [ six ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Like watch -d but for JSON"; longDescription = '' jsonwatch is a command line utility with which you can track diff --git a/pkgs/development/python-modules/jug/default.nix b/pkgs/development/python-modules/jug/default.nix index edfc7573d4e4..eff6accaa024 100644 --- a/pkgs/development/python-modules/jug/default.nix +++ b/pkgs/development/python-modules/jug/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, fetchpatch +{ lib, stdenv, buildPythonPackage, fetchPypi, fetchpatch , nose, numpy , bottle, pyyaml, redis, six , zlib @@ -25,7 +25,7 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "jug" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A Task-Based Parallelization Framework"; license = licenses.mit; homepage = "https://jug.readthedocs.io/"; diff --git a/pkgs/development/python-modules/junos-eznc/default.nix b/pkgs/development/python-modules/junos-eznc/default.nix index d47130c5f3fb..d9234d836b0f 100644 --- a/pkgs/development/python-modules/junos-eznc/default.nix +++ b/pkgs/development/python-modules/junos-eznc/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , six @@ -35,7 +35,7 @@ buildPythonPackage rec { nosetests -v --with-coverage --cover-package=jnpr.junos --cover-inclusive -a unit ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.github.com/Juniper/py-junos-eznc"; description = "Junos 'EZ' automation for non-programmers"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/jupyter-repo2docker/default.nix b/pkgs/development/python-modules/jupyter-repo2docker/default.nix index 4dc878e26701..f01605513cb6 100644 --- a/pkgs/development/python-modules/jupyter-repo2docker/default.nix +++ b/pkgs/development/python-modules/jupyter-repo2docker/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, pythonAtLeast +{ lib, stdenv, buildPythonPackage, fetchPypi, pythonAtLeast , docker , escapism , jinja2 @@ -43,7 +43,7 @@ buildPythonPackage rec { "repo2docker.contentproviders.base" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://repo2docker.readthedocs.io/en/latest/"; description = "Repo2docker: Turn code repositories into Jupyter enabled Docker Images"; license = licenses.bsdOriginal; diff --git a/pkgs/development/python-modules/jupyter-telemetry/default.nix b/pkgs/development/python-modules/jupyter-telemetry/default.nix index 4b3093cf6ce1..0f0c0d346e6a 100644 --- a/pkgs/development/python-modules/jupyter-telemetry/default.nix +++ b/pkgs/development/python-modules/jupyter-telemetry/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { python-json-logger jsonschema ruamel_yaml traitlets ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Telemetry for Jupyter Applications and extensions"; homepage = "https://jupyter-telemetry.readthedocs.io/"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/jupyter/default.nix b/pkgs/development/python-modules/jupyter/default.nix index b6d2a5e5a901..03d28bbf55d6 100644 --- a/pkgs/development/python-modules/jupyter/default.nix +++ b/pkgs/development/python-modules/jupyter/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , notebook @@ -23,7 +23,7 @@ buildPythonPackage rec { # Meta-package, no tests doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Installs all the Jupyter components in one go"; homepage = "https://jupyter.org/"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/jupyterlab-git/default.nix b/pkgs/development/python-modules/jupyterlab-git/default.nix index 1c6c9a5b9e3c..3219bd5730bb 100644 --- a/pkgs/development/python-modules/jupyterlab-git/default.nix +++ b/pkgs/development/python-modules/jupyterlab-git/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , pythonOlder @@ -31,7 +31,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "jupyterlab_git" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Jupyter lab extension for version control with Git."; license = with licenses; [ bsd3 ]; homepage = "https://github.com/jupyterlab/jupyterlab-git"; diff --git a/pkgs/development/python-modules/jupyterlab_server/default.nix b/pkgs/development/python-modules/jupyterlab_server/default.nix index 0344a66cf663..bfbd1cc89e08 100644 --- a/pkgs/development/python-modules/jupyterlab_server/default.nix +++ b/pkgs/development/python-modules/jupyterlab_server/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , notebook @@ -30,7 +30,7 @@ buildPythonPackage rec { pytest ''; - meta = with stdenv.lib; { + meta = with lib; { description = "JupyterLab Server"; homepage = "https://jupyter.org"; license = licenses.bsdOriginal; diff --git a/pkgs/development/python-modules/kaa-base/default.nix b/pkgs/development/python-modules/kaa-base/default.nix index a0b8cd97ced6..24a02f7f696a 100644 --- a/pkgs/development/python-modules/kaa-base/default.nix +++ b/pkgs/development/python-modules/kaa-base/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , isPyPy @@ -41,7 +41,7 @@ buildPythonPackage rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Generic application framework, providing the foundation for other modules"; homepage = "https://github.com/freevo/kaa-base"; license = licenses.lgpl21; diff --git a/pkgs/development/python-modules/kaa-metadata/default.nix b/pkgs/development/python-modules/kaa-metadata/default.nix index 31f87965a038..5164004e8ea5 100644 --- a/pkgs/development/python-modules/kaa-metadata/default.nix +++ b/pkgs/development/python-modules/kaa-metadata/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , kaa-base @@ -46,7 +46,7 @@ buildPythonPackage rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Python library for parsing media metadata, which can extract metadata (e.g., such as id3 tags) from a wide range of media files"; homepage = "https://github.com/freevo/kaa-metadata"; license = licenses.gpl2; diff --git a/pkgs/development/python-modules/kafka-python/default.nix b/pkgs/development/python-modules/kafka-python/default.nix index 8069632c1705..b147b30c2ce3 100644 --- a/pkgs/development/python-modules/kafka-python/default.nix +++ b/pkgs/development/python-modules/kafka-python/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, pytest, six, mock }: +{ lib, stdenv, buildPythonPackage, fetchPypi, pytest, six, mock }: buildPythonPackage rec { version = "2.0.2"; @@ -20,7 +20,7 @@ buildPythonPackage rec { # E ImportError: cannot import name 'unittest' doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Pure Python client for Apache Kafka"; homepage = "https://github.com/dpkp/kafka-python"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/kaitaistruct/default.nix b/pkgs/development/python-modules/kaitaistruct/default.nix index 61892063278b..866042b6942c 100644 --- a/pkgs/development/python-modules/kaitaistruct/default.nix +++ b/pkgs/development/python-modules/kaitaistruct/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi }: +{ lib, stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "kaitaistruct"; @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "3d5845817ec8a4d5504379cc11bd570b038850ee49c4580bc0998c8fb1d327ad"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Kaitai Struct: runtime library for Python"; homepage = "https://github.com/kaitai-io/kaitai_struct_python_runtime"; license = licenses.mit; diff --git a/pkgs/development/python-modules/kajiki/default.nix b/pkgs/development/python-modules/kajiki/default.nix index 8643e562fa07..2a45404919c0 100644 --- a/pkgs/development/python-modules/kajiki/default.nix +++ b/pkgs/development/python-modules/kajiki/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , Babel @@ -19,7 +19,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ Babel pytz nine ]; checkInputs = [ nose ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Kajiki provides fast well-formed XML templates"; homepage = "https://github.com/nandoflorestan/kajiki"; license = licenses.mit; diff --git a/pkgs/development/python-modules/kaptan/default.nix b/pkgs/development/python-modules/kaptan/default.nix index 78a33a8e3022..dea22059f096 100644 --- a/pkgs/development/python-modules/kaptan/default.nix +++ b/pkgs/development/python-modules/kaptan/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , pyyaml @@ -22,7 +22,7 @@ buildPythonPackage rec { checkInputs = [ pytest ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Configuration manager for python applications"; homepage = "https://kaptan.readthedocs.io/"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/kazoo/default.nix b/pkgs/development/python-modules/kazoo/default.nix index 3c040abc7247..d8743776578e 100644 --- a/pkgs/development/python-modules/kazoo/default.nix +++ b/pkgs/development/python-modules/kazoo/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , six @@ -35,7 +35,7 @@ buildPythonPackage rec { doCheck = false; #ZOOKEEPER_PATH = "${pkgs.zookeeper}"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://kazoo.readthedocs.org"; description = "Higher Level Zookeeper Client"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/keep/default.nix b/pkgs/development/python-modules/keep/default.nix index 4e7003aef9f9..22ae853c043c 100644 --- a/pkgs/development/python-modules/keep/default.nix +++ b/pkgs/development/python-modules/keep/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , PyGithub @@ -24,9 +24,10 @@ buildPythonPackage rec { ]; # no tests + doCheck = false; pythonImportsCheck = [ "keep" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/orkohunter/keep"; description = "A Meta CLI toolkit: Personal shell command keeper and snippets manager"; platforms = platforms.all; diff --git a/pkgs/development/python-modules/keepalive/default.nix b/pkgs/development/python-modules/keepalive/default.nix index c53bc25d198d..7a488edf895d 100644 --- a/pkgs/development/python-modules/keepalive/default.nix +++ b/pkgs/development/python-modules/keepalive/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi }: @@ -15,7 +15,7 @@ buildPythonPackage rec { # No tests included doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "An HTTP handler for `urllib2` that supports HTTP 1.1 and keepalive"; homepage = "https://github.com/wikier/keepalive"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/keepkey/default.nix b/pkgs/development/python-modules/keepkey/default.nix index 82391d377503..437a0193c61d 100644 --- a/pkgs/development/python-modules/keepkey/default.nix +++ b/pkgs/development/python-modules/keepkey/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildPythonPackage, pytest +{ lib, stdenv, fetchFromGitHub, buildPythonPackage, pytest , ecdsa , mnemonic, protobuf, hidapi, trezor }: buildPythonPackage rec { @@ -24,7 +24,7 @@ buildPythonPackage rec { # Remove impossible dependency constraint postPatch = "sed -i -e 's|hidapi==|hidapi>=|' setup.py"; - meta = with stdenv.lib; { + meta = with lib; { description = "KeepKey Python client"; homepage = "https://github.com/keepkey/python-keepkey"; license = licenses.gpl3; diff --git a/pkgs/development/python-modules/keepkey_agent/default.nix b/pkgs/development/python-modules/keepkey_agent/default.nix index fec2d198fdd9..b9189cf4e167 100644 --- a/pkgs/development/python-modules/keepkey_agent/default.nix +++ b/pkgs/development/python-modules/keepkey_agent/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , keepkey @@ -20,7 +20,10 @@ buildPythonPackage rec { keepkey libagent setuptools wheel ]; - meta = with stdenv.lib; { + doCheck = false; + pythonImportsChecks = [ "keepkey_agent" ]; + + meta = with lib; { description = "Using KeepKey as hardware-based SSH/PGP agent"; homepage = "https://github.com/romanz/trezor-agent"; license = licenses.gpl3; diff --git a/pkgs/development/python-modules/keras/default.nix b/pkgs/development/python-modules/keras/default.nix index f2243a1531f6..7274d3d17a69 100644 --- a/pkgs/development/python-modules/keras/default.nix +++ b/pkgs/development/python-modules/keras/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ lib, stdenv, buildPythonPackage, fetchPypi , pytest, pytestcov, pytest_xdist , six, numpy, scipy, pyyaml, h5py , keras-applications, keras-preprocessing @@ -27,7 +27,7 @@ buildPythonPackage rec { # Couldn't get tests working doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Deep Learning library for Theano and TensorFlow"; homepage = "https://keras.io"; license = licenses.mit; diff --git a/pkgs/development/python-modules/kerberos/default.nix b/pkgs/development/python-modules/kerberos/default.nix index 7f5341a6a253..df9babdc5829 100644 --- a/pkgs/development/python-modules/kerberos/default.nix +++ b/pkgs/development/python-modules/kerberos/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , kerberos @@ -18,7 +18,7 @@ buildPythonPackage rec { # No tests in archive doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Kerberos high-level interface"; homepage = "https://pypi.python.org/pypi/kerberos"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/keyring/2.nix b/pkgs/development/python-modules/keyring/2.nix index ce4aa145e8ee..1dc7eb0a8f98 100644 --- a/pkgs/development/python-modules/keyring/2.nix +++ b/pkgs/development/python-modules/keyring/2.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ lib, stdenv, buildPythonPackage, fetchPypi , dbus-python, setuptools_scm, entrypoints, secretstorage , pytest, pytest-flake8 }: @@ -23,7 +23,7 @@ buildPythonPackage rec { py.test ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Store and access your passwords safely"; homepage = "https://pypi.python.org/pypi/keyring"; license = licenses.psfl; diff --git a/pkgs/development/python-modules/keyrings-alt/default.nix b/pkgs/development/python-modules/keyrings-alt/default.nix index 506081659f65..eb1f12e0aa39 100644 --- a/pkgs/development/python-modules/keyrings-alt/default.nix +++ b/pkgs/development/python-modules/keyrings-alt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, isPy27, six +{ lib, stdenv, buildPythonPackage, fetchPypi, pythonOlder, isPy27, six , pytest, backports_unittest-mock, keyring, setuptools_scm, toml }: @@ -32,7 +32,7 @@ buildPythonPackage rec { "keyrings.alt" ]; - meta = with stdenv.lib; { + meta = with lib; { license = licenses.mit; description = "Alternate keyring implementations"; homepage = "https://github.com/jaraco/keyrings.alt"; diff --git a/pkgs/development/python-modules/kitchen/default.nix b/pkgs/development/python-modules/kitchen/default.nix index 494a4f8fc063..1a14b974114e 100644 --- a/pkgs/development/python-modules/kitchen/default.nix +++ b/pkgs/development/python-modules/kitchen/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi }: +{ lib, stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "kitchen"; version = "1.2.6"; @@ -8,7 +8,7 @@ buildPythonPackage rec { sha256 = "0g5hq2icnng9vy4www5hnr3r5srisfwp0wxw1sv5c5dxy61gak5q"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Kitchen contains a cornucopia of useful code"; license = licenses.lgpl2; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/python-modules/korean-lunar-calendar/default.nix b/pkgs/development/python-modules/korean-lunar-calendar/default.nix index 41569ac9dc9b..8ad94d955aec 100644 --- a/pkgs/development/python-modules/korean-lunar-calendar/default.nix +++ b/pkgs/development/python-modules/korean-lunar-calendar/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi }: @@ -16,7 +16,7 @@ buildPythonPackage rec { # no real tests pythonImportsCheck = [ "korean_lunar_calendar" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A library to convert Korean lunar-calendar to Gregorian calendar."; homepage = "https://github.com/usingsky/korean_lunar_calendar_py"; license = licenses.mit; diff --git a/pkgs/development/python-modules/kubernetes/default.nix b/pkgs/development/python-modules/kubernetes/default.nix index 2679c81de0f0..172180781968 100644 --- a/pkgs/development/python-modules/kubernetes/default.nix +++ b/pkgs/development/python-modules/kubernetes/default.nix @@ -1,5 +1,5 @@ -{ stdenv, buildPythonPackage, fetchPypi, pythonAtLeast, - ipaddress, websocket_client, urllib3, pyyaml, requests_oauthlib, python-dateutil, google_auth, adal, +{ lib, stdenv, buildPythonPackage, fetchPypi, pythonAtLeast, + ipaddress, websocket_client, urllib3, pyyaml, requests_oauthlib, python-dateutil, google-auth, adal, isort, pytest, coverage, mock, sphinx, autopep8, pep8, codecov, recommonmark, nose }: buildPythonPackage rec { @@ -28,9 +28,9 @@ buildPythonPackage rec { }; checkInputs = [ isort coverage pytest mock sphinx autopep8 pep8 codecov recommonmark nose ]; - propagatedBuildInputs = [ ipaddress websocket_client urllib3 pyyaml requests_oauthlib python-dateutil google_auth adal ]; + propagatedBuildInputs = [ ipaddress websocket_client urllib3 pyyaml requests_oauthlib python-dateutil google-auth adal ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Kubernetes python client"; homepage = "https://github.com/kubernetes-client/python"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/labelbox/default.nix b/pkgs/development/python-modules/labelbox/default.nix index 0556411ee47e..1efe01092124 100644 --- a/pkgs/development/python-modules/labelbox/default.nix +++ b/pkgs/development/python-modules/labelbox/default.nix @@ -8,7 +8,8 @@ , shapely , ndjson , backoff -, google_api_core +, google-api-core +, backports-datetime-fromisoformat }: buildPythonPackage rec { @@ -22,12 +23,11 @@ buildPythonPackage rec { propagatedBuildInputs = [ jinja2 requests pillow rasterio shapely ndjson backoff - google_api_core + google-api-core backports-datetime-fromisoformat ]; # Test cases are not running on pypi or GitHub doCheck = false; - pythonImportsCheck = [ "labelbox" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/larch/default.nix b/pkgs/development/python-modules/larch/default.nix index 3be8b2404192..7708bc0dbc02 100644 --- a/pkgs/development/python-modules/larch/default.nix +++ b/pkgs/development/python-modules/larch/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchurl , sphinx @@ -22,7 +22,7 @@ buildPythonPackage rec { # error: invalid command 'test' doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://liw.fi/larch/"; description = "Python B-tree library"; license = licenses.gpl3; diff --git a/pkgs/development/python-modules/lasagne/default.nix b/pkgs/development/python-modules/lasagne/default.nix index febd38acc63f..5bddf5cbe6f2 100644 --- a/pkgs/development/python-modules/lasagne/default.nix +++ b/pkgs/development/python-modules/lasagne/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , numpy @@ -21,7 +21,7 @@ buildPythonPackage rec { # there are no tests doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Lightweight library to build and train neural networks in Theano"; homepage = "https://github.com/Lasagne/Lasagne"; maintainers = with maintainers; [ NikolaMandic ]; diff --git a/pkgs/development/python-modules/lazy-object-proxy/default.nix b/pkgs/development/python-modules/lazy-object-proxy/default.nix index dc2eecb002d4..63784b4005bb 100644 --- a/pkgs/development/python-modules/lazy-object-proxy/default.nix +++ b/pkgs/development/python-modules/lazy-object-proxy/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , pytest @@ -24,7 +24,7 @@ buildPythonPackage rec { # Broken tests. Seem to be fixed upstream according to Travis. doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "A fast and thorough lazy object proxy"; homepage = "https://github.com/ionelmc/python-lazy-object-proxy"; license = with licenses; [ bsd2 ]; diff --git a/pkgs/development/python-modules/lazy_import/default.nix b/pkgs/development/python-modules/lazy_import/default.nix index 743604d539ba..1bc52b3a65c8 100644 --- a/pkgs/development/python-modules/lazy_import/default.nix +++ b/pkgs/development/python-modules/lazy_import/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ lib, stdenv, buildPythonPackage, fetchPypi , pytest , pytest_xdist , six }: @@ -26,7 +26,7 @@ buildPythonPackage rec { pytest --boxed ''; - meta = with stdenv.lib; { + meta = with lib; { description = "lazy_import provides a set of functions that load modules, and related attributes, in a lazy fashion."; homepage = https://github.com/mnmelo/lazy_import; license = licenses.gpl3; diff --git a/pkgs/development/python-modules/ldap/default.nix b/pkgs/development/python-modules/ldap/default.nix index 0e4f5597ce64..e5cd3d3828e1 100644 --- a/pkgs/development/python-modules/ldap/default.nix +++ b/pkgs/development/python-modules/ldap/default.nix @@ -1,6 +1,6 @@ { buildPythonPackage, fetchPypi , pyasn1, pyasn1-modules, pytest -, openldap, cyrus_sasl, stdenv }: +, openldap, cyrus_sasl, lib, stdenv }: buildPythonPackage rec { pname = "python-ldap"; @@ -29,7 +29,7 @@ buildPythonPackage rec { doCheck = !stdenv.isDarwin; - meta = with stdenv.lib; { + meta = with lib; { description = "Python modules for implementing LDAP clients"; homepage = "https://www.python-ldap.org/"; license = licenses.psfl; diff --git a/pkgs/development/python-modules/ldap3/default.nix b/pkgs/development/python-modules/ldap3/default.nix index 178477dcc6b0..e1accc4d177e 100644 --- a/pkgs/development/python-modules/ldap3/default.nix +++ b/pkgs/development/python-modules/ldap3/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage, pyasn1 }: +{ lib, stdenv, fetchPypi, buildPythonPackage, pyasn1 }: buildPythonPackage rec { pname = "ldap3"; @@ -13,7 +13,7 @@ buildPythonPackage rec { doCheck = false; # requires network - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://pypi.python.org/pypi/ldap3"; description = "A strictly RFC 4510 conforming LDAP V3 pure Python client library"; license = licenses.lgpl3; diff --git a/pkgs/development/python-modules/ldapdomaindump/default.nix b/pkgs/development/python-modules/ldapdomaindump/default.nix new file mode 100644 index 000000000000..3e1358cd8f22 --- /dev/null +++ b/pkgs/development/python-modules/ldapdomaindump/default.nix @@ -0,0 +1,24 @@ +{ lib, buildPythonPackage, fetchPypi, dnspython, future, ldap3 }: + +buildPythonPackage rec { + pname = "ldapdomaindump"; + version = "0.9.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "10cis8cllpa9qi5qil9k7521ag3921mxwg2wj9nyn0lk41rkjagc"; + }; + + propagatedBuildInputs = [ dnspython future ldap3 ]; + + # requires ldap server + doCheck = false; + pythonImportsCheck = [ "ldapdomaindump" ]; + + meta = with lib; { + description = "Active Directory information dumper via LDAP"; + homepage = "https://github.com/dirkjanm/ldapdomaindump/"; + license = licenses.mit; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/development/python-modules/ldappool/default.nix b/pkgs/development/python-modules/ldappool/default.nix index d1b9da15cc5f..bc08633da8b4 100644 --- a/pkgs/development/python-modules/ldappool/default.nix +++ b/pkgs/development/python-modules/ldappool/default.nix @@ -14,6 +14,8 @@ buildPythonPackage rec { postPatch = '' # Tests run without most of the dependencies echo "" > test-requirements.txt + # PrettyTable is now maintained again + substituteInPlace requirements.txt --replace "PrettyTable<0.8,>=0.7.2" "PrettyTable" ''; nativeBuildInputs = [ pbr ]; @@ -24,7 +26,7 @@ buildPythonPackage rec { meta = with lib; { description = "A simple connector pool for python-ldap"; - homepage = "https://git.openstack.org/cgit/openstack/ldappool"; - license = licenses.mpl20; + homepage = "https://opendev.org/openstack/ldappool/"; + license = with licenses; [ mpl11 lgpl21Plus gpl2Plus ]; }; } diff --git a/pkgs/development/python-modules/le/default.nix b/pkgs/development/python-modules/le/default.nix index 927b3f44bcf3..6415b255c716 100644 --- a/pkgs/development/python-modules/le/default.nix +++ b/pkgs/development/python-modules/le/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchurl , isPy3k @@ -21,7 +21,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ simplejson psutil ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/rapid7/le"; description = "Logentries agent"; license = licenses.mit; diff --git a/pkgs/development/python-modules/leather/default.nix b/pkgs/development/python-modules/leather/default.nix index 30a76747723a..99c1f080a031 100644 --- a/pkgs/development/python-modules/leather/default.nix +++ b/pkgs/development/python-modules/leather/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage, six }: +{ lib, stdenv, fetchPypi, buildPythonPackage, six }: buildPythonPackage rec { pname = "leather"; @@ -11,7 +11,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://leather.rtfd.io"; description = "Python charting library"; license = licenses.mit; diff --git a/pkgs/development/python-modules/ledger_agent/default.nix b/pkgs/development/python-modules/ledger_agent/default.nix index 605fbed98a19..4fc935799c31 100644 --- a/pkgs/development/python-modules/ledger_agent/default.nix +++ b/pkgs/development/python-modules/ledger_agent/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , ledgerblue @@ -20,7 +20,10 @@ buildPythonPackage rec { ledgerblue libagent setuptools wheel ]; - meta = with stdenv.lib; { + # no tests + doCheck = false; + + meta = with lib; { description = "Using Ledger as hardware-based SSH/PGP agent"; homepage = "https://github.com/romanz/trezor-agent"; license = licenses.gpl3; diff --git a/pkgs/development/python-modules/ledgerblue/default.nix b/pkgs/development/python-modules/ledgerblue/default.nix index c84d5fa471bd..f853dfbf01f9 100644 --- a/pkgs/development/python-modules/ledgerblue/default.nix +++ b/pkgs/development/python-modules/ledgerblue/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage, hidapi +{ lib, stdenv, fetchPypi, buildPythonPackage, hidapi , pycrypto, pillow, protobuf, future, ecpy, python-u2flib-host, pycryptodomex , websocket_client }: @@ -19,7 +19,7 @@ buildPythonPackage rec { # No tests doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Python library to communicate with Ledger Blue/Nano S"; homepage = "https://github.com/LedgerHQ/blue-loader-python"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/ledgerwallet/default.nix b/pkgs/development/python-modules/ledgerwallet/default.nix index e25e9d5d2a4f..a95d8140e115 100644 --- a/pkgs/development/python-modules/ledgerwallet/default.nix +++ b/pkgs/development/python-modules/ledgerwallet/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , buildPythonPackage , cryptography @@ -32,7 +32,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "ledgerwallet" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/LedgerHQ/ledgerctl"; description = "A library to control Ledger devices"; license = licenses.mit; diff --git a/pkgs/development/python-modules/libagent/default.nix b/pkgs/development/python-modules/libagent/default.nix index 4bc07e969330..debe88f2f6cc 100644 --- a/pkgs/development/python-modules/libagent/default.nix +++ b/pkgs/development/python-modules/libagent/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildPythonPackage, ed25519, ecdsa , semver, mnemonic, +{ lib, stdenv, fetchFromGitHub, buildPythonPackage, ed25519, ecdsa , semver, mnemonic, unidecode, mock, pytest , backports-shutil-which, ConfigArgParse, python-daemon, pymsgbox }: @@ -22,7 +22,7 @@ buildPythonPackage rec { py.test libagent/tests ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Using hardware wallets as SSH/GPG agent"; homepage = "https://github.com/romanz/trezor-agent"; license = licenses.gpl3; diff --git a/pkgs/development/python-modules/libais/default.nix b/pkgs/development/python-modules/libais/default.nix index 3d7408e87126..eb1ce861dd26 100644 --- a/pkgs/development/python-modules/libais/default.nix +++ b/pkgs/development/python-modules/libais/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, +{ lib, stdenv, buildPythonPackage, fetchPypi, six, pytest, pytestrunner, pytestcov, coverage }: buildPythonPackage rec { @@ -16,7 +16,7 @@ buildPythonPackage rec { checkInputs = [ pytest pytestrunner pytestcov coverage ]; propagatedBuildInputs = [ six ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/schwehr/libais"; description = "Library for decoding maritime Automatic Identification System messages"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/libarchive-c/default.nix b/pkgs/development/python-modules/libarchive-c/default.nix index 6bcb7f80484c..73d99afda674 100644 --- a/pkgs/development/python-modules/libarchive-c/default.nix +++ b/pkgs/development/python-modules/libarchive-c/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , pytest @@ -29,7 +29,7 @@ buildPythonPackage rec { py.test tests -k 'not test_check_archiveentry_with_unicode_entries_and_name_zip and not test_check_archiveentry_using_python_testtar' ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/Changaco/python-libarchive-c"; description = "Python interface to libarchive"; license = licenses.cc0; diff --git a/pkgs/development/python-modules/libarcus/default.nix b/pkgs/development/python-modules/libarcus/default.nix index e69e51ccf555..5a5116de5478 100644 --- a/pkgs/development/python-modules/libarcus/default.nix +++ b/pkgs/development/python-modules/libarcus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, python, fetchFromGitHub +{ lib, stdenv, buildPythonPackage, python, fetchFromGitHub , cmake, sip, protobuf, pythonOlder }: buildPythonPackage rec { @@ -23,7 +23,7 @@ buildPythonPackage rec { sed -i 's#''${Python3_SITEARCH}#${placeholder "out"}/${python.sitePackages}#' cmake/SIPMacros.cmake ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Communication library between internal components for Ultimaker software"; homepage = "https://github.com/Ultimaker/libArcus"; license = licenses.lgpl3Plus; diff --git a/pkgs/development/python-modules/libasyncns/default.nix b/pkgs/development/python-modules/libasyncns/default.nix index fa7320bdf4ec..72147fb70f20 100644 --- a/pkgs/development/python-modules/libasyncns/default.nix +++ b/pkgs/development/python-modules/libasyncns/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchurl +{ lib, stdenv, buildPythonPackage, fetchurl , libasyncns, pkgconfig }: buildPythonPackage rec { @@ -16,7 +16,7 @@ buildPythonPackage rec { nativeBuildInputs = [ pkgconfig ]; doCheck = false; # requires network access - meta = with stdenv.lib; { + meta = with lib; { description = "libasyncns-python is a python binding for the asynchronous name service query library"; license = licenses.lgpl21; maintainers = [ maintainers.mic92 ]; diff --git a/pkgs/development/python-modules/libcloud/default.nix b/pkgs/development/python-modules/libcloud/default.nix index 671de812f272..bda0553b8eee 100644 --- a/pkgs/development/python-modules/libcloud/default.nix +++ b/pkgs/development/python-modules/libcloud/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "apache-libcloud"; - version = "3.2.0"; + version = "3.3.0"; src = fetchPypi { inherit pname version; - sha256 = "1b14b1f5f91ceeff5cf228613e76577d7b41e790dccd53a0f647ef816fb5495c"; + sha256 = "2e3e4d02f9b3197f9119e737bc704fba52f34459d4bc96d8ad8f183d600747ba"; }; checkInputs = [ mock pytest pytestrunner requests-mock ]; diff --git a/pkgs/development/python-modules/libcst/default.nix b/pkgs/development/python-modules/libcst/default.nix index e0ea0e332af6..f064c34e1586 100644 --- a/pkgs/development/python-modules/libcst/default.nix +++ b/pkgs/development/python-modules/libcst/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchFromGitHub, pythonOlder, black, isort -, pytestCheckHook, pyyaml, typing-extensions, typing-inspect }: +, pytestCheckHook, pyyaml, typing-extensions, typing-inspect, dataclasses }: buildPythonPackage rec { pname = "libcst"; @@ -16,7 +16,8 @@ buildPythonPackage rec { disabled = pythonOlder "3.6"; - propagatedBuildInputs = [ pyyaml typing-inspect ]; + propagatedBuildInputs = [ pyyaml typing-inspect ] + ++ lib.optional (pythonOlder "3.7") dataclasses; checkInputs = [ black isort pytestCheckHook ]; diff --git a/pkgs/development/python-modules/libevdev/default.nix b/pkgs/development/python-modules/libevdev/default.nix index a17612c79cbc..227cabe0099e 100644 --- a/pkgs/development/python-modules/libevdev/default.nix +++ b/pkgs/development/python-modules/libevdev/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , isPy27 , fetchPypi @@ -26,7 +26,7 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Python wrapper around the libevdev C library"; homepage = "https://gitlab.freedesktop.org/libevdev/python-libevdev"; license = licenses.mit; diff --git a/pkgs/development/python-modules/libgpuarray/default.nix b/pkgs/development/python-modules/libgpuarray/default.nix index 40a4f6f7429f..80e560e4cce6 100644 --- a/pkgs/development/python-modules/libgpuarray/default.nix +++ b/pkgs/development/python-modules/libgpuarray/default.nix @@ -63,8 +63,6 @@ buildPythonPackage rec { Mako ]; - enableParallelBuilding = true; - nativeBuildInputs = [ cmake ]; buildInputs = [ @@ -72,7 +70,7 @@ buildPythonPackage rec { nose ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/Theano/libgpuarray"; description = "Library to manipulate tensors on GPU."; license = licenses.free; diff --git a/pkgs/development/python-modules/libkeepass/default.nix b/pkgs/development/python-modules/libkeepass/default.nix index 0969e62c79e8..cfc687e37c14 100644 --- a/pkgs/development/python-modules/libkeepass/default.nix +++ b/pkgs/development/python-modules/libkeepass/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage +{ lib, stdenv, fetchPypi, buildPythonPackage , lxml, pycryptodome, colorama }: buildPythonPackage rec { @@ -15,7 +15,7 @@ buildPythonPackage rec { # No tests on PyPI doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/libkeepass/libkeepass"; description = "A library to access KeePass 1.x/KeePassX (v3) and KeePass 2.x (v4) files"; license = licenses.gpl2Plus; diff --git a/pkgs/development/python-modules/liblarch/default.nix b/pkgs/development/python-modules/liblarch/default.nix index 30b52be0b850..b824dec172ed 100644 --- a/pkgs/development/python-modules/liblarch/default.nix +++ b/pkgs/development/python-modules/liblarch/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , buildPythonPackage , python @@ -37,7 +37,7 @@ buildPythonPackage rec { runHook postCheck ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A python library built to easily handle data structure such are lists, trees and acyclic graphs"; homepage = "https://github.com/getting-things-gnome/liblarch"; downloadPage = "https://github.com/getting-things-gnome/liblarch/releases"; diff --git a/pkgs/development/python-modules/libmr/default.nix b/pkgs/development/python-modules/libmr/default.nix index 7b1bbf6020d2..a0ef924e56e6 100644 --- a/pkgs/development/python-modules/libmr/default.nix +++ b/pkgs/development/python-modules/libmr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, numpy, cython }: +{ lib, stdenv, buildPythonPackage, fetchPypi, numpy, cython }: buildPythonPackage rec { pname = "libmr"; @@ -15,7 +15,7 @@ buildPythonPackage rec { # No tests in the pypi tarball doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "libMR provides core MetaRecognition and Weibull fitting functionality"; homepage = "https://github.com/Vastlab/libMR"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/libnacl/default.nix b/pkgs/development/python-modules/libnacl/default.nix index 9e19fe5e8e17..2406738cf1bb 100644 --- a/pkgs/development/python-modules/libnacl/default.nix +++ b/pkgs/development/python-modules/libnacl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, pytest, libsodium }: +{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pytest, libsodium }: buildPythonPackage rec { pname = "libnacl"; @@ -23,7 +23,7 @@ buildPythonPackage rec { py.test ''; - meta = with stdenv.lib; { + meta = with lib; { maintainers = with maintainers; [ xvapx ]; description = "Python bindings for libsodium based on ctypes"; homepage = "https://pypi.python.org/pypi/libnacl"; diff --git a/pkgs/development/python-modules/librosa/default.nix b/pkgs/development/python-modules/librosa/default.nix index 0fc5d857fb84..777eed4ddb33 100644 --- a/pkgs/development/python-modules/librosa/default.nix +++ b/pkgs/development/python-modules/librosa/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , joblib @@ -31,7 +31,7 @@ buildPythonPackage rec { # check that import works, this allows to capture errors like https://github.com/librosa/librosa/issues/1160 pythonImportsCheck = [ "librosa" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Python module for audio and music processing"; homepage = "http://librosa.github.io/"; license = licenses.isc; diff --git a/pkgs/development/python-modules/libsavitar/default.nix b/pkgs/development/python-modules/libsavitar/default.nix index 9b6aa7bc3a8d..559289987e6c 100644 --- a/pkgs/development/python-modules/libsavitar/default.nix +++ b/pkgs/development/python-modules/libsavitar/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, python, pythonOlder, fetchFromGitHub, cmake, sip }: +{ lib, stdenv, buildPythonPackage, python, pythonOlder, fetchFromGitHub, cmake, sip }: buildPythonPackage rec { pname = "libsavitar"; @@ -22,7 +22,7 @@ buildPythonPackage rec { disabled = pythonOlder "3.4.0"; - meta = with stdenv.lib; { + meta = with lib; { description = "C++ implementation of 3mf loading with SIP python bindings"; homepage = "https://github.com/Ultimaker/libSavitar"; license = licenses.lgpl3Plus; diff --git a/pkgs/development/python-modules/libsoundtouch/default.nix b/pkgs/development/python-modules/libsoundtouch/default.nix index 119cb6cbefa7..40f1b2f8e9ca 100644 --- a/pkgs/development/python-modules/libsoundtouch/default.nix +++ b/pkgs/development/python-modules/libsoundtouch/default.nix @@ -26,7 +26,7 @@ buildPythonPackage { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Bose Soundtouch Python library"; homepage = "https://github.com/CharlesBlonde/libsoundtouch"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/libthumbor/default.nix b/pkgs/development/python-modules/libthumbor/default.nix index e8b7c45417a1..72e62514a526 100644 --- a/pkgs/development/python-modules/libthumbor/default.nix +++ b/pkgs/development/python-modules/libthumbor/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , django @@ -20,7 +20,7 @@ buildPythonPackage rec { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "libthumbor is the python extension to thumbor"; homepage = "https://github.com/heynemann/libthumbor"; license = licenses.mit; diff --git a/pkgs/development/python-modules/libtmux/default.nix b/pkgs/development/python-modules/libtmux/default.nix index 9df5cffec97b..df9728eb334b 100644 --- a/pkgs/development/python-modules/libtmux/default.nix +++ b/pkgs/development/python-modules/libtmux/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage, pytest }: +{ lib, stdenv, fetchPypi, buildPythonPackage, pytest }: buildPythonPackage rec { pname = "libtmux"; @@ -17,7 +17,7 @@ buildPythonPackage rec { # No tests in archive doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Scripting library for tmux"; homepage = "https://libtmux.readthedocs.io/"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/libusb1/default.nix b/pkgs/development/python-modules/libusb1/default.nix index f756790e288e..0446299fd1bd 100644 --- a/pkgs/development/python-modules/libusb1/default.nix +++ b/pkgs/development/python-modules/libusb1/default.nix @@ -1,12 +1,12 @@ -{ stdenv, buildPythonPackage, fetchPypi, libusb1, pytest }: +{ lib, stdenv, buildPythonPackage, fetchPypi, libusb1, pytest }: buildPythonPackage rec { pname = "libusb1"; - version = "1.9"; + version = "1.9.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256:0l7vj04xm0i5ikxjdqrr5939q7amh0hfp0fqifkcvyjv9fvhyz65"; + sha256 = "14ljk7rywy3fiv23dpayvk14y1ywma729r3b1x2cxf68919g2gnh"; }; postPatch = '' @@ -25,7 +25,7 @@ buildPythonPackage rec { py.test -k 'not testUSBPollerThreadExit' usb1/testUSB1.py ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/vpelletier/python-libusb1"; description = "Python ctype-based wrapper around libusb1"; license = licenses.lgpl2Plus; diff --git a/pkgs/development/python-modules/libversion/default.nix b/pkgs/development/python-modules/libversion/default.nix index ed3629ce65d5..dafaf412f07a 100644 --- a/pkgs/development/python-modules/libversion/default.nix +++ b/pkgs/development/python-modules/libversion/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, pkgconfig, libversion, pythonOlder }: +{ lib, stdenv, buildPythonPackage, fetchPypi, pkgconfig, libversion, pythonOlder }: buildPythonPackage rec { pname = "libversion"; @@ -14,7 +14,7 @@ buildPythonPackage rec { disabled = pythonOlder "3.6"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/repology/py-libversion"; description = "Python bindings for libversion, which provides fast, powerful and correct generic version string comparison algorithm"; license = licenses.mit; diff --git a/pkgs/development/python-modules/libvirt/5.9.0.nix b/pkgs/development/python-modules/libvirt/5.9.0.nix index 7b0b7c438d9a..c751734e1533 100644 --- a/pkgs/development/python-modules/libvirt/5.9.0.nix +++ b/pkgs/development/python-modules/libvirt/5.9.0.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchgit, pkgconfig, lxml, libvirt, nose }: +{ lib, stdenv, buildPythonPackage, fetchgit, pkgconfig, lxml, libvirt, nose }: buildPythonPackage rec { pname = "libvirt"; @@ -18,7 +18,7 @@ buildPythonPackage rec { nosetests ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.libvirt.org/"; description = "libvirt Python bindings"; license = licenses.lgpl2; diff --git a/pkgs/development/python-modules/libvirt/default.nix b/pkgs/development/python-modules/libvirt/default.nix index 4c0e730f7d57..e02b34e3816a 100644 --- a/pkgs/development/python-modules/libvirt/default.nix +++ b/pkgs/development/python-modules/libvirt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitLab, pkgconfig, lxml, libvirt, nose }: +{ lib, stdenv, buildPythonPackage, fetchFromGitLab, pkgconfig, lxml, libvirt, nose }: buildPythonPackage rec { pname = "libvirt"; @@ -19,7 +19,7 @@ buildPythonPackage rec { nosetests ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://libvirt.org/python.html"; description = "libvirt Python bindings"; license = licenses.lgpl2; diff --git a/pkgs/development/python-modules/lightblue/default.nix b/pkgs/development/python-modules/lightblue/default.nix index 99db9e5c2f73..3e85a3cfaa04 100644 --- a/pkgs/development/python-modules/lightblue/default.nix +++ b/pkgs/development/python-modules/lightblue/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchurl , pkgs @@ -17,7 +17,7 @@ buildPythonPackage rec { buildInputs = [ pkgs.bluez pkgs.openobex ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://lightblue.sourceforge.net"; description = "Cross-platform Bluetooth API for Python"; maintainers = with maintainers; [ leenaars ]; diff --git a/pkgs/development/python-modules/lightgbm/default.nix b/pkgs/development/python-modules/lightgbm/default.nix index eae2e4208d1d..d7157244b6a5 100644 --- a/pkgs/development/python-modules/lightgbm/default.nix +++ b/pkgs/development/python-modules/lightgbm/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , cmake @@ -53,7 +53,7 @@ buildPythonPackage rec { # `make check`. doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "A fast, distributed, high performance gradient boosting (GBDT, GBRT, GBM or MART) framework"; homepage = "https://github.com/Microsoft/LightGBM"; license = licenses.mit; diff --git a/pkgs/development/python-modules/lightning/default.nix b/pkgs/development/python-modules/lightning/default.nix index 8b128e7cb892..782bd41413eb 100644 --- a/pkgs/development/python-modules/lightning/default.nix +++ b/pkgs/development/python-modules/lightning/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , pytest @@ -21,7 +21,7 @@ buildPythonPackage rec { buildInputs = [ pytest ]; propagatedBuildInputs = [ jinja2 matplotlib numpy requests six ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A Python client library for the Lightning data visualization server"; homepage = "http://lightning-viz.org"; license = licenses.mit; diff --git a/pkgs/development/python-modules/limits/default.nix b/pkgs/development/python-modules/limits/default.nix index 22bd6607fb6b..e1cd31867de4 100644 --- a/pkgs/development/python-modules/limits/default.nix +++ b/pkgs/development/python-modules/limits/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage, six }: +{ lib, stdenv, fetchPypi, buildPythonPackage, six }: buildPythonPackage rec { pname = "limits"; @@ -13,7 +13,7 @@ buildPythonPackage rec { doCheck = false; # ifilter - meta = with stdenv.lib; { + meta = with lib; { description = "Rate limiting utilities"; license = licenses.mit; homepage = "https://limits.readthedocs.org/"; diff --git a/pkgs/development/python-modules/limnoria/default.nix b/pkgs/development/python-modules/limnoria/default.nix index b46d1566532b..c92e014e9898 100644 --- a/pkgs/development/python-modules/limnoria/default.nix +++ b/pkgs/development/python-modules/limnoria/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , isPy27 @@ -22,7 +22,7 @@ buildPythonPackage rec { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "A modified version of Supybot, an IRC bot"; homepage = "https://github.com/ProgVal/Limnoria"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/linecache2/default.nix b/pkgs/development/python-modules/linecache2/default.nix index ba2525155d30..3945ec5001cd 100644 --- a/pkgs/development/python-modules/linecache2/default.nix +++ b/pkgs/development/python-modules/linecache2/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , pbr @@ -18,7 +18,7 @@ buildPythonPackage rec { # circular dependencies for tests doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "A backport of linecache to older supported Pythons"; homepage = "https://github.com/testing-cabal/linecache2"; license = licenses.psfl; diff --git a/pkgs/development/python-modules/linode/default.nix b/pkgs/development/python-modules/linode/default.nix index d0c8b0ff7943..611b91bb9309 100644 --- a/pkgs/development/python-modules/linode/default.nix +++ b/pkgs/development/python-modules/linode/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , requests @@ -15,7 +15,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/ghickman/linode"; description = "A thin python wrapper around Linode's API"; license = licenses.mit; diff --git a/pkgs/development/python-modules/liquidctl/default.nix b/pkgs/development/python-modules/liquidctl/default.nix new file mode 100644 index 000000000000..97d80fbbbda7 --- /dev/null +++ b/pkgs/development/python-modules/liquidctl/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, docopt +, hidapi +, pyusb +, smbus-cffi +}: + +buildPythonPackage rec { + pname = "liquidctl"; + version = "1.4.2"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "v${version}"; + sha256 = "1h5kqpvlx7xppd2wli986lkslqkcrlz1wixv7fvrppzjc2nfz5d4"; + }; + + propagatedBuildInputs = [ + docopt + hidapi + pyusb + smbus-cffi + ]; + + # does not contain tests + doCheck = false; + pythonImportsCheck = [ "liquidctl" ]; + + meta = with lib; { + description = "Cross-platform CLI and Python drivers for AIO liquid coolers and other devices"; + homepage = "https://github.com/liquidctl/liquidctl"; + changelog = "https://github.com/liquidctl/liquidctl/blob/master/CHANGELOG.md"; + license = licenses.gpl3; + maintainers = with maintainers; [ arturcygan ]; + }; +} diff --git a/pkgs/development/python-modules/livelossplot/default.nix b/pkgs/development/python-modules/livelossplot/default.nix index c58a18dffe8e..bbf1b966bf1e 100644 --- a/pkgs/development/python-modules/livelossplot/default.nix +++ b/pkgs/development/python-modules/livelossplot/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchFromGitHub , isPy27 @@ -31,7 +31,7 @@ buildPythonPackage rec { pytest tests tests/external_test_examples.py ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Live training loss plot in Jupyter for Keras, PyTorch, and others"; homepage = "https://github.com/stared/livelossplot"; license = licenses.mit; diff --git a/pkgs/development/python-modules/livestreamer-curses/default.nix b/pkgs/development/python-modules/livestreamer-curses/default.nix index 846f7633924b..d76eb736ac73 100644 --- a/pkgs/development/python-modules/livestreamer-curses/default.nix +++ b/pkgs/development/python-modules/livestreamer-curses/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchurl , isPyPy @@ -17,7 +17,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ livestreamer ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/gapato/livestreamer-curses"; description = "Curses frontend for livestreamer"; license = licenses.mit; diff --git a/pkgs/development/python-modules/livestreamer/default.nix b/pkgs/development/python-modules/livestreamer/default.nix index 83bd4bcfb72c..3583d4694340 100644 --- a/pkgs/development/python-modules/livestreamer/default.nix +++ b/pkgs/development/python-modules/livestreamer/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , pkgs , isPyPy @@ -28,7 +28,7 @@ buildPythonPackage rec { wrapProgram $out/bin/livestreamer --prefix PATH : ${pkgs.rtmpdump}/bin ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://livestreamer.tanuki.se"; description = '' Livestreamer is CLI program that extracts streams from various diff --git a/pkgs/development/python-modules/llfuse/default.nix b/pkgs/development/python-modules/llfuse/default.nix index ac9360cb02df..35235aaab40b 100644 --- a/pkgs/development/python-modules/llfuse/default.nix +++ b/pkgs/development/python-modules/llfuse/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, fetchpatch, buildPythonPackage, pkgconfig, pytest, fuse, attr, which +{ lib, stdenv, fetchPypi, fetchpatch, buildPythonPackage, pkgconfig, pytest, fuse, attr, which , contextlib2, osxfuse }: @@ -36,7 +36,7 @@ buildPythonPackage rec { py.test -k "not test_listdir" ${optionalString stdenv.isDarwin ''-m "not uses_fuse"''} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Python bindings for the low-level FUSE API"; homepage = "https://github.com/python-llfuse/python-llfuse"; license = licenses.lgpl2Plus; diff --git a/pkgs/development/python-modules/lmdb/default.nix b/pkgs/development/python-modules/lmdb/default.nix index 76cd2acd7435..20020b97ef23 100644 --- a/pkgs/development/python-modules/lmdb/default.nix +++ b/pkgs/development/python-modules/lmdb/default.nix @@ -1,8 +1,10 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi -, pytest +, pytestCheckHook , cffi +, lmdb +, ludios_wpull }: buildPythonPackage rec { @@ -14,16 +16,18 @@ buildPythonPackage rec { sha256 = "4136ffdf0aad61da86d1402808029d002a771b2a9ccc9b39c6bcafa7847c21b6"; }; - checkInputs = [ pytest cffi ]; - checkPhase = '' - py.test - ''; + buildInputs = [ lmdb ]; - meta = with stdenv.lib; { + propogatedBuildInputs = [ ludios_wpull ]; + + checkInputs = [ cffi pytestCheckHook ]; + + LMDB_FORCE_SYSTEM=1; + + meta = with lib; { description = "Universal Python binding for the LMDB 'Lightning' Database"; homepage = "https://github.com/dw/py-lmdb"; license = licenses.openldap; maintainers = with maintainers; [ copumpkin ivan ]; }; - } diff --git a/pkgs/development/python-modules/lmtpd/default.nix b/pkgs/development/python-modules/lmtpd/default.nix index 336b799eee2c..3a1beba29d40 100644 --- a/pkgs/development/python-modules/lmtpd/default.nix +++ b/pkgs/development/python-modules/lmtpd/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, fetchPypi, isPy3k, stdenv }: +{ buildPythonPackage, fetchPypi, isPy3k, lib, stdenv }: buildPythonPackage rec { pname = "lmtpd"; @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "2c6825d2ffa1de099440411a742f58e1b3e8deeb3345adcfd4c2c38d4baf62b3"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/moggers87/lmtpd"; description = "LMTP counterpart to smtpd in the Python standard library"; license = licenses.mit; diff --git a/pkgs/development/python-modules/localzone/default.nix b/pkgs/development/python-modules/localzone/default.nix index f4ed4b98ef59..8690b1e4c91e 100644 --- a/pkgs/development/python-modules/localzone/default.nix +++ b/pkgs/development/python-modules/localzone/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchFromGitHub , dnspython @@ -25,7 +25,7 @@ buildPythonPackage rec { pytest ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A simple DNS library for managing zone files"; homepage = "https://localzone.iomaestro.com"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/locket/default.nix b/pkgs/development/python-modules/locket/default.nix index d98ab6379744..45985a17d3e9 100644 --- a/pkgs/development/python-modules/locket/default.nix +++ b/pkgs/development/python-modules/locket/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, pytest }: +{ lib, stdenv, buildPythonPackage, fetchPypi, pytest }: buildPythonPackage rec { pname = "locket"; @@ -14,7 +14,7 @@ buildPythonPackage rec { # weird test requirements (spur.local>=0.3.7,<0.4) doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Locket implements a lock that can be used by multiple processes provided they use the same path."; homepage = "https://github.com/mwilliamson/locket.py"; license = licenses.bsd2; diff --git a/pkgs/development/python-modules/logilab/common.nix b/pkgs/development/python-modules/logilab/common.nix index 3da263757cc6..b7ba746d79ee 100644 --- a/pkgs/development/python-modules/logilab/common.nix +++ b/pkgs/development/python-modules/logilab/common.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy27, unittest2, six }: +{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27, unittest2, six }: buildPythonPackage rec { pname = "logilab-common"; @@ -16,7 +16,7 @@ buildPythonPackage rec { # and is not currently in nixos doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Python packages and modules used by Logilab "; homepage = "https://www.logilab.org/project/logilab-common"; license = licenses.lgpl21; diff --git a/pkgs/development/python-modules/logilab/constraint.nix b/pkgs/development/python-modules/logilab/constraint.nix index aa26f21820b7..9a071b5cf5f9 100644 --- a/pkgs/development/python-modules/logilab/constraint.nix +++ b/pkgs/development/python-modules/logilab/constraint.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, logilab_common, six }: +{ lib, stdenv, buildPythonPackage, fetchPypi, logilab_common, six }: buildPythonPackage rec { pname = "logilab-constraint"; @@ -14,7 +14,7 @@ buildPythonPackage rec { ]; - meta = with stdenv.lib; { + meta = with lib; { description = "logilab-database provides some classes to make unified access to different"; homepage = "https://www.logilab.org/project/logilab-database"; }; diff --git a/pkgs/development/python-modules/logilab_astng/default.nix b/pkgs/development/python-modules/logilab_astng/default.nix index 81879b2218de..15cea1d7baaa 100644 --- a/pkgs/development/python-modules/logilab_astng/default.nix +++ b/pkgs/development/python-modules/logilab_astng/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchurl , logilab_common @@ -15,7 +15,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ logilab_common ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.logilab.org/project/logilab-astng"; description = "Python Abstract Syntax Tree New Generation"; license = licenses.lgpl2; diff --git a/pkgs/development/python-modules/loguru/default.nix b/pkgs/development/python-modules/loguru/default.nix index 216fb3c5181e..da91d9eeddd3 100644 --- a/pkgs/development/python-modules/loguru/default.nix +++ b/pkgs/development/python-modules/loguru/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy27, colorama, pytestCheckHook }: +{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27, colorama, pytestCheckHook }: buildPythonPackage rec { pname = "loguru"; @@ -17,7 +17,7 @@ buildPythonPackage rec { disabledTests = [ "test_time_rotation_reopening" "test_file_buffering" ] ++ stdenv.lib.optionals stdenv.isDarwin [ "test_rotation_and_retention" "test_rotation_and_retention_timed_file" "test_renaming" "test_await_complete_inheritance" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/Delgan/loguru"; description = "Python logging made (stupidly) simple"; license = licenses.mit; diff --git a/pkgs/development/python-modules/logutils/default.nix b/pkgs/development/python-modules/logutils/default.nix index 8b4cb4e69c5c..d49667d7cc8a 100644 --- a/pkgs/development/python-modules/logutils/default.nix +++ b/pkgs/development/python-modules/logutils/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi }: @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "bc058a25d5c209461f134e1f03cab637d66a7a5ccc12e593db56fbb279899a82"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Logging utilities"; homepage = "https://bitbucket.org/vinay.sajip/logutils/"; license = licenses.bsd0; diff --git a/pkgs/development/python-modules/lpod/default.nix b/pkgs/development/python-modules/lpod/default.nix index effdc3f432a6..67b48cecd62c 100644 --- a/pkgs/development/python-modules/lpod/default.nix +++ b/pkgs/development/python-modules/lpod/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchFromGitHub , lxml @@ -22,7 +22,7 @@ buildPythonPackage { sha256 = "1mikvzp27wxkzpr2lii4wg1hhx8h610agckqynvsrdc8v3nw9ciw"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/lpod/lpod-python/"; description = "Library implementing the ISO/IEC 26300 OpenDocument Format standard (ODF) "; license = licenses.gpl3; diff --git a/pkgs/development/python-modules/lsassy/default.nix b/pkgs/development/python-modules/lsassy/default.nix new file mode 100644 index 000000000000..6b1d5ec2bb4c --- /dev/null +++ b/pkgs/development/python-modules/lsassy/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, impacket +, netaddr +, pypykatz +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "lsassy"; + version = "2.1.3"; + + src = fetchFromGitHub { + owner = "Hackndo"; + repo = pname; + rev = "v${version}"; + sha256 = "1zig34ymc1h18gjc2ji0w0711im5sm9xm6nydc01c13yfpvvj1rh"; + }; + + propagatedBuildInputs = [ + impacket + netaddr + pypykatz + ]; + + # Tests require an active domain controller + doCheck = false; + pythonImportsCheck = [ "lsassy" ]; + + meta = with lib; { + description = "Python module to extract data from Local Security Authority Subsystem Service (LSASS)"; + homepage = "https://github.com/Hackndo/lsassy"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/lsi/default.nix b/pkgs/development/python-modules/lsi/default.nix index 5f193f52e9a5..0fca2f7b372f 100644 --- a/pkgs/development/python-modules/lsi/default.nix +++ b/pkgs/development/python-modules/lsi/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , isPy3k , fetchPypi @@ -19,7 +19,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ colored boto pkgs.openssh pkgs.which ]; - meta = with stdenv.lib; { + meta = with lib; { description = "CLI for querying and SSHing onto AWS EC2 instances"; homepage = "https://github.com/NarrativeScience/lsi"; maintainers = [maintainers.adnelson]; diff --git a/pkgs/development/python-modules/lxc/default.nix b/pkgs/development/python-modules/lxc/default.nix index 2798cb800757..a20db9dd5034 100644 --- a/pkgs/development/python-modules/lxc/default.nix +++ b/pkgs/development/python-modules/lxc/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchFromGitHub , isPy3k @@ -19,7 +19,7 @@ buildPythonPackage { buildInputs = [ pkgs.lxc ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Out of tree python 2.7 binding for liblxc"; homepage = "https://github.com/lxc/python2-lxc"; license = licenses.lgpl2; diff --git a/pkgs/development/python-modules/lyricwikia/default.nix b/pkgs/development/python-modules/lyricwikia/default.nix index 4e58c6a7d676..585c38ab33ec 100644 --- a/pkgs/development/python-modules/lyricwikia/default.nix +++ b/pkgs/development/python-modules/lyricwikia/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage, pytestrunner, six, beautifulsoup4, requests, }: +{ lib, stdenv, fetchPypi, buildPythonPackage, pytestrunner, six, beautifulsoup4, requests, }: buildPythonPackage rec { pname = "lyricwikia"; version = "0.1.11"; @@ -13,7 +13,7 @@ buildPythonPackage rec { # upstream has no code tests doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/enricobacis/lyricwikia"; maintainers = [ maintainers.kmein ]; description = "LyricWikia API for song lyrics"; diff --git a/pkgs/development/python-modules/m2crypto/default.nix b/pkgs/development/python-modules/m2crypto/default.nix index f3ca43f5e9a5..af07be47dcdc 100644 --- a/pkgs/development/python-modules/m2crypto/default.nix +++ b/pkgs/development/python-modules/m2crypto/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { doCheck = false; # another test that depends on the network. - meta = with stdenv.lib; { + meta = with lib; { description = "A Python crypto and SSL toolkit"; homepage = "https://gitlab.com/m2crypto/m2crypto"; license = licenses.mit; diff --git a/pkgs/development/python-modules/m2r/default.nix b/pkgs/development/python-modules/m2r/default.nix index 3de9ec079d49..149e4d6ed562 100644 --- a/pkgs/development/python-modules/m2r/default.nix +++ b/pkgs/development/python-modules/m2r/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, +{ lib, stdenv, buildPythonPackage, fetchPypi, mistune, docutils } : buildPythonPackage rec { pname = "m2r"; @@ -15,7 +15,7 @@ buildPythonPackage rec { # deleted by some tests and not properly regenerated) doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/miyakogi/m2r"; description = "converts a markdown file including reST markups to a valid reST format"; license = licenses.mit; diff --git a/pkgs/development/python-modules/maestral/default.nix b/pkgs/development/python-modules/maestral/default.nix index cb7119860f59..b24ebbcc9eb1 100644 --- a/pkgs/development/python-modules/maestral/default.nix +++ b/pkgs/development/python-modules/maestral/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchFromGitHub , pythonOlder @@ -55,7 +55,7 @@ buildPythonPackage rec { # no tests doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Open-source Dropbox client for macOS and Linux"; license = licenses.mit; maintainers = with maintainers; [ peterhoeg ]; diff --git a/pkgs/development/python-modules/magic-wormhole-mailbox-server/default.nix b/pkgs/development/python-modules/magic-wormhole-mailbox-server/default.nix index 571a92900c90..14ae268c03a0 100644 --- a/pkgs/development/python-modules/magic-wormhole-mailbox-server/default.nix +++ b/pkgs/development/python-modules/magic-wormhole-mailbox-server/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy27, six, attrs, twisted, pyopenssl, service-identity, autobahn, treq, mock, pytest }: +{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27, six, attrs, twisted, pyopenssl, service-identity, autobahn, treq, mock, pytest }: buildPythonPackage rec { version = "0.4.1"; @@ -18,7 +18,7 @@ buildPythonPackage rec { pytest ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Securely transfer data between computers"; homepage = "https://github.com/warner/magic-wormhole-mailbox-server"; license = licenses.mit; diff --git a/pkgs/development/python-modules/magic-wormhole/default.nix b/pkgs/development/python-modules/magic-wormhole/default.nix index 9e73001a1499..c85c7e2307fa 100644 --- a/pkgs/development/python-modules/magic-wormhole/default.nix +++ b/pkgs/development/python-modules/magic-wormhole/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , isPy27 @@ -54,7 +54,7 @@ buildPythonPackage rec { --replace 'locale_env = dict(LC_ALL=locale, LANG=locale)' 'locale_env = dict(LC_ALL=locale, LANG=locale, LOCALE_ARCHIVE=os.getenv("LOCALE_ARCHIVE"))' ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Securely transfer data between computers"; homepage = "https://github.com/warner/magic-wormhole"; license = licenses.mit; diff --git a/pkgs/development/python-modules/magic/default.nix b/pkgs/development/python-modules/magic/default.nix index 98e6731a1b86..45fd740e2e89 100644 --- a/pkgs/development/python-modules/magic/default.nix +++ b/pkgs/development/python-modules/magic/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , pkgs }: @@ -19,7 +19,7 @@ buildPythonPackage { # No test suite doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "A Python wrapper around libmagic"; homepage = "http://www.darwinsys.com/file/"; license = licenses.lgpl2; diff --git a/pkgs/development/python-modules/mahotas/default.nix b/pkgs/development/python-modules/mahotas/default.nix index b7d17d943f7b..818ff459985c 100644 --- a/pkgs/development/python-modules/mahotas/default.nix +++ b/pkgs/development/python-modules/mahotas/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, fetchFromGitHub, nose, pillow, scipy, numpy, imread, stdenv }: +{ buildPythonPackage, fetchFromGitHub, nose, pillow, scipy, numpy, imread, lib, stdenv }: buildPythonPackage rec { pname = "mahotas"; @@ -23,7 +23,7 @@ buildPythonPackage rec { disabled = stdenv.isi686; # Failing tests - meta = with stdenv.lib; { + meta = with lib; { description = "Computer vision package based on numpy"; homepage = "https://mahotas.readthedocs.io/"; maintainers = with maintainers; [ luispedro ]; diff --git a/pkgs/development/python-modules/mailcap-fix/default.nix b/pkgs/development/python-modules/mailcap-fix/default.nix index 886a3ed66b37..08991edce4aa 100644 --- a/pkgs/development/python-modules/mailcap-fix/default.nix +++ b/pkgs/development/python-modules/mailcap-fix/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , isPy36 @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "02lijkq6v379r8zkqg9q2srin3i80m4wvwik3hcbih0s14v0ng0i"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A patched mailcap module that conforms to RFC 1524"; homepage = "https://github.com/michael-lazar/mailcap_fix"; license = licenses.unlicense; diff --git a/pkgs/development/python-modules/mailchimp/default.nix b/pkgs/development/python-modules/mailchimp/default.nix index b9640a4ab5d5..0032caa7a0a5 100644 --- a/pkgs/development/python-modules/mailchimp/default.nix +++ b/pkgs/development/python-modules/mailchimp/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , docopt @@ -20,7 +20,7 @@ buildPythonPackage rec { sed -i 's/==/>=/' setup.py ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A CLI client and Python API library for the MailChimp email platform"; homepage = "http://apidocs.mailchimp.com/api/2.0/"; license = licenses.mit; diff --git a/pkgs/development/python-modules/mailman-hyperkitty/default.nix b/pkgs/development/python-modules/mailman-hyperkitty/default.nix index 6abe5f5c6bc4..8ab80e337179 100644 --- a/pkgs/development/python-modules/mailman-hyperkitty/default.nix +++ b/pkgs/development/python-modules/mailman-hyperkitty/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, mailman, mock }: +{ lib, stdenv, buildPythonPackage, fetchPypi, mailman, mock }: buildPythonPackage rec { pname = "mailman-hyperkitty"; @@ -17,7 +17,7 @@ buildPythonPackage rec { ''; doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Mailman archiver plugin for HyperKitty"; homepage = "https://gitlab.com/mailman/mailman-hyperkitty"; license = licenses.gpl3; diff --git a/pkgs/development/python-modules/mailman-rss/default.nix b/pkgs/development/python-modules/mailman-rss/default.nix index d0d103bfbec5..c47d300d8507 100644 --- a/pkgs/development/python-modules/mailman-rss/default.nix +++ b/pkgs/development/python-modules/mailman-rss/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python3Packages, withTwitter ? false}: +{ lib, stdenv, python3Packages, withTwitter ? false}: python3Packages.buildPythonApplication rec { pname = "mailman-rss"; @@ -16,7 +16,7 @@ python3Packages.buildPythonApplication rec { # No tests in Pypi Tarball doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Mailman archive -> rss converter"; homepage = "https://github.com/kyamagu/mailman-rss"; license = licenses.mit; diff --git a/pkgs/development/python-modules/mailmanclient/default.nix b/pkgs/development/python-modules/mailmanclient/default.nix index 45dfc55ae9a8..280ee95b8301 100644 --- a/pkgs/development/python-modules/mailmanclient/default.nix +++ b/pkgs/development/python-modules/mailmanclient/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy3k, six, httplib2, requests }: +{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k, six, httplib2, requests }: buildPythonPackage rec { pname = "mailmanclient"; @@ -12,7 +12,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six httplib2 requests ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.gnu.org/software/mailman/"; description = "REST client for driving Mailman 3"; license = licenses.lgpl3; diff --git a/pkgs/development/python-modules/manhole/default.nix b/pkgs/development/python-modules/manhole/default.nix index 13b887f6ee4d..b9d57a7c0899 100644 --- a/pkgs/development/python-modules/manhole/default.nix +++ b/pkgs/development/python-modules/manhole/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , pytest @@ -38,7 +38,7 @@ buildPythonPackage rec { py.test -vv -k "not test_uwsgi" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/ionelmc/python-manhole"; description = "Debugging manhole for Python applications"; license = licenses.bsd2; diff --git a/pkgs/development/python-modules/manticore/default.nix b/pkgs/development/python-modules/manticore/default.nix new file mode 100644 index 000000000000..f9ca3afc4b15 --- /dev/null +++ b/pkgs/development/python-modules/manticore/default.nix @@ -0,0 +1,109 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, capstone +, crytic-compile +, ply +, prettytable +, pyelftools +, pyevmasm +, pysha3 +, pyyaml +, rlp +, stdenv +, unicorn +, wasm +, yices +, pytestCheckHook +, z3 +}: + +buildPythonPackage rec { + pname = "manticore"; + version = "0.3.5"; + + src = fetchFromGitHub { + owner = "trailofbits"; + repo = "manticore"; + rev = version; + sha256 = "0z2nhfcraa5dx6srbrw8s11awh2la0x7d88yw9in8g548nv6qa69"; + }; + + propagatedBuildInputs = [ + crytic-compile + ply + prettytable + pyevmasm + pysha3 + pyyaml + rlp + wasm + ] ++ lib.optionals (stdenv.isLinux) [ + capstone + pyelftools + unicorn + ]; + + # Python API is not used in the code, only z3 from PATH + postPatch = '' + sed -ie s/z3-solver// setup.py + ''; + + checkInputs = [ pytestCheckHook ]; + preCheck = "export PATH=${yices}/bin:${z3}/bin:$PATH"; + pytestFlagsArray = [ + "--ignore=tests/ethereum" # TODO: enable when solc works again + "--ignore=tests/ethereum_bench" + ] ++ lib.optionals (!stdenv.isLinux) [ + "--ignore=tests/native" + "--ignore=tests/other/test_locking.py" + ]; + disabledTests = [ + # failing tests + "test_chmod" + "test_timeout" + "test_wasm_main" + # slow tests + "testmprotectFailSymbReading" + "test_ConstraintsForking" + "test_resume" + "test_symbolic" + "test_symbolic_syscall_arg" + "test_state_merging" + "test_decree" + "test_register_comparison" + "test_arguments_assertions_armv7" + "test_integration_basic_stdout" + "test_fclose_linux_amd64" + "test_fileio_linux_amd64" + "test_arguments_assertions_amd64" + "test_ioctl_bogus" + "test_ioctl_socket" + "test_brk_regression" + "test_basic_arm" + "test_logger_verbosity" + "test_profiling_data" + "test_integration_basic_stdin" + "test_getchar" + "test_ccmp_reg" + "test_ld1_mlt_structs" + "test_ccmp_imm" + "test_try_to_allocate_greater_than_last_space_memory_page_12" + "test_not_enough_memory_page_12" + "test_PCMPISTRI_30_symbolic" + "test_ld1_mlt_structs" + "test_time" + "test_implicit_call" + "test_trace" + "test_plugin" + ]; + + meta = with lib; { + description = "Symbolic execution tool for analysis of smart contracts and binaries"; + homepage = "https://github.com/trailofbits/manticore"; + changelog = "https://github.com/trailofbits/manticore/releases/tag/${version}"; + license = licenses.agpl3Only; + platforms = platforms.unix; + maintainers = with maintainers; [ arturcygan ]; + }; +} diff --git a/pkgs/development/python-modules/manuel/default.nix b/pkgs/development/python-modules/manuel/default.nix index 1f2c09d43709..59243783ecf9 100644 --- a/pkgs/development/python-modules/manuel/default.nix +++ b/pkgs/development/python-modules/manuel/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , isPy27 @@ -19,7 +19,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six ]; checkInputs = [ zope_testing ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A documentation builder"; homepage = "https://pypi.python.org/pypi/manuel"; license = licenses.zpl20; diff --git a/pkgs/development/python-modules/mapsplotlib/default.nix b/pkgs/development/python-modules/mapsplotlib/default.nix index d21d09571ad1..54d0ade40f35 100644 --- a/pkgs/development/python-modules/mapsplotlib/default.nix +++ b/pkgs/development/python-modules/mapsplotlib/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , isPy3k , fetchPypi @@ -22,7 +22,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ matplotlib scipy pandas requests pillow ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Custom Python plots on a Google Maps background"; homepage = "https://github.com/tcassou/mapsplotlib"; license = licenses.mit; diff --git a/pkgs/development/python-modules/marionette-harness/mozdevice.nix b/pkgs/development/python-modules/marionette-harness/mozdevice.nix index 03187c00bef9..56c8fc5254d2 100644 --- a/pkgs/development/python-modules/marionette-harness/mozdevice.nix +++ b/pkgs/development/python-modules/marionette-harness/mozdevice.nix @@ -12,9 +12,8 @@ buildPythonPackage rec { format = "wheel"; src = fetchPypi { - inherit pname version; + inherit pname version format; sha256 = "1n7l3drdh3rm3320v98c9hhh37ljk9l861hyw18psca7jdd717n5"; - format = "wheel"; }; propagatedBuildInputs = [ mozlog moznetwork mozprocess ]; diff --git a/pkgs/development/python-modules/marionette-harness/mozinfo.nix b/pkgs/development/python-modules/marionette-harness/mozinfo.nix index 1aca4cb58468..b7d91cc16f52 100644 --- a/pkgs/development/python-modules/marionette-harness/mozinfo.nix +++ b/pkgs/development/python-modules/marionette-harness/mozinfo.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , isPy3k @@ -18,7 +18,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ mozfile ]; - meta = with stdenv.lib; { + meta = with lib; { description = "System information utilities for Mozilla testing"; homepage = "https://wiki.mozilla.org/Auto-tools/Projects/Mozbase"; license = licenses.mpl20; diff --git a/pkgs/development/python-modules/marisa/default.nix b/pkgs/development/python-modules/marisa/default.nix index 0fa5a98f7522..a30f7062df0a 100644 --- a/pkgs/development/python-modules/marisa/default.nix +++ b/pkgs/development/python-modules/marisa/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, marisa, swig +{ lib, stdenv, buildPythonPackage, fetchFromGitHub, marisa, swig , isPy3k }: @@ -20,7 +20,7 @@ buildPythonPackage rec { sourceRoot = "${src.name}/bindings/python"; - meta = with stdenv.lib; { + meta = with lib; { description = "Python binding for marisa package (do not confuse with marisa-trie python bindings)"; homepage = "https://github.com/s-yata/marisa-trie"; license = with licenses; [ bsd2 lgpl2 ]; diff --git a/pkgs/development/python-modules/markdown-macros/default.nix b/pkgs/development/python-modules/markdown-macros/default.nix index 41a634f4b9a5..e248bfe60cc4 100644 --- a/pkgs/development/python-modules/markdown-macros/default.nix +++ b/pkgs/development/python-modules/markdown-macros/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , fetchpatch @@ -30,7 +30,7 @@ buildPythonPackage rec { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "An extension for python-markdown that makes writing trac-like macros easy"; homepage = "https://github.com/wnielson/markdown-macros"; license = licenses.mit; diff --git a/pkgs/development/python-modules/markdown2/default.nix b/pkgs/development/python-modules/markdown2/default.nix index 8add8f15298f..2f929012df89 100644 --- a/pkgs/development/python-modules/markdown2/default.nix +++ b/pkgs/development/python-modules/markdown2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi }: +{ lib, stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "markdown2"; @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "08a124043aa0ad36ba2136239547d5011a2b770278abb11a5609611e0040ea05"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A fast and complete Python implementation of Markdown"; homepage = "https://github.com/trentm/python-markdown2"; license = licenses.mit; diff --git a/pkgs/development/python-modules/markerlib/default.nix b/pkgs/development/python-modules/markerlib/default.nix index 256f395a8f8f..d039198b3938 100644 --- a/pkgs/development/python-modules/markerlib/default.nix +++ b/pkgs/development/python-modules/markerlib/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , setuptools @@ -21,7 +21,7 @@ buildPythonPackage rec { nosetests ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://bitbucket.org/dholth/markerlib/"; description = "A compiler for PEP 345 environment markers"; license = licenses.mit; diff --git a/pkgs/development/python-modules/markupsafe/default.nix b/pkgs/development/python-modules/markupsafe/default.nix index 864e30214efa..6a6e06cd3177 100644 --- a/pkgs/development/python-modules/markupsafe/default.nix +++ b/pkgs/development/python-modules/markupsafe/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi }: @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "29872e92839765e546828bb7754a68c418d927cd064fd4708fab9fe9c8bb116b"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Implements a XML/HTML/XHTML Markup safe string"; homepage = "http://dev.pocoo.org"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/matplotlib/2.nix b/pkgs/development/python-modules/matplotlib/2.nix index dd25860795ba..17a9fb246bd7 100644 --- a/pkgs/development/python-modules/matplotlib/2.nix +++ b/pkgs/development/python-modules/matplotlib/2.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, python, buildPythonPackage, pycairo, backports_functools_lru_cache +{ lib, stdenv, fetchPypi, python, buildPythonPackage, pycairo, backports_functools_lru_cache , which, cycler, dateutil, nose, numpy, pyparsing, sphinx, tornado, kiwisolver , freetype, libpng, pkgconfig, mock, pytz, pygobject3, gobject-introspection, functools32, subprocess32 , fetchpatch @@ -77,7 +77,7 @@ buildPythonPackage rec { # order for all of the tests to pass. doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Python plotting library, making publication quality plots"; homepage = "https://matplotlib.org/"; maintainers = with maintainers; [ lovek323 veprbl ]; diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix index 5ad3c92393d8..f075ba47ce8a 100644 --- a/pkgs/development/python-modules/matplotlib/default.nix +++ b/pkgs/development/python-modules/matplotlib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, python, buildPythonPackage, isPy3k, pycairo, backports_functools_lru_cache +{ lib, 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 , certifi, pillow @@ -68,7 +68,7 @@ buildPythonPackage rec { # order for all of the tests to pass. doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Python plotting library, making publication quality plots"; homepage = "https://matplotlib.org/"; maintainers = with maintainers; [ lovek323 veprbl ]; diff --git a/pkgs/development/python-modules/matrix-client/default.nix b/pkgs/development/python-modules/matrix-client/default.nix index 71092583d7fd..34c99a1ebe1c 100644 --- a/pkgs/development/python-modules/matrix-client/default.nix +++ b/pkgs/development/python-modules/matrix-client/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , requests @@ -18,7 +18,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Matrix Client-Server SDK"; homepage = "https://github.com/matrix-org/matrix-python-sdk"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/mautrix/default.nix b/pkgs/development/python-modules/mautrix/default.nix index 7cfd8e83dbf7..0944d5fa4cfe 100644 --- a/pkgs/development/python-modules/mautrix/default.nix +++ b/pkgs/development/python-modules/mautrix/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "mautrix"; - version = "0.8.5"; + version = "0.8.6"; src = fetchPypi { inherit pname version; - sha256 = "564ffe240fd9a29978959c7d7827610cf4d8ff02ed612c3fd8067e2fba2cba59"; + sha256 = "e28d89cb8297ec36d78ef79507613c45ab3ab0bc709f1944ca5be349797f8f6b"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/maya/default.nix b/pkgs/development/python-modules/maya/default.nix index 6df4091664b3..9cd1019a0301 100644 --- a/pkgs/development/python-modules/maya/default.nix +++ b/pkgs/development/python-modules/maya/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, fetchpatch, buildPythonPackage +{ lib, stdenv, fetchPypi, fetchpatch, buildPythonPackage , dateparser, humanize, pendulum, ruamel_yaml, tzlocal }: buildPythonPackage rec { @@ -24,7 +24,7 @@ buildPythonPackage rec { # No tests doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Datetimes for Humans"; homepage = "https://github.com/kennethreitz/maya"; license = licenses.mit; diff --git a/pkgs/development/python-modules/mccabe/default.nix b/pkgs/development/python-modules/mccabe/default.nix index 7a4605e68ced..2886a436a00d 100644 --- a/pkgs/development/python-modules/mccabe/default.nix +++ b/pkgs/development/python-modules/mccabe/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, pytest, pytestrunner }: +{ lib, stdenv, buildPythonPackage, fetchPypi, pytest, pytestrunner }: buildPythonPackage rec { pname = "mccabe"; @@ -11,7 +11,7 @@ buildPythonPackage rec { buildInputs = [ pytest pytestrunner ]; - meta = with stdenv.lib; { + meta = with lib; { description = "McCabe checker, plugin for flake8"; homepage = "https://github.com/flintwork/mccabe"; license = licenses.mit; diff --git a/pkgs/development/python-modules/mdp/default.nix b/pkgs/development/python-modules/mdp/default.nix index a93b00a0f91e..5313cd8e89aa 100644 --- a/pkgs/development/python-modules/mdp/default.nix +++ b/pkgs/development/python-modules/mdp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, pytest, future, numpy }: +{ lib, stdenv, buildPythonPackage, fetchPypi, pytest, future, numpy }: buildPythonPackage rec { pname = "MDP"; @@ -15,7 +15,7 @@ buildPythonPackage rec { # Tests disabled because of missing dependencies not in nix doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Library for building complex data processing software by combining widely used machine learning algorithms"; homepage = "http://mdp-toolkit.sourceforge.net"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/mechanize/default.nix b/pkgs/development/python-modules/mechanize/default.nix index 1d63a6e2b6a1..e2d2269a43c0 100644 --- a/pkgs/development/python-modules/mechanize/default.nix +++ b/pkgs/development/python-modules/mechanize/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , html5lib @@ -17,7 +17,7 @@ buildPythonPackage rec { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Stateful programmatic web browsing in Python"; homepage = "https://github.com/python-mechanize/mechanize"; license = "BSD-style"; diff --git a/pkgs/development/python-modules/mediafile/default.nix b/pkgs/development/python-modules/mediafile/default.nix new file mode 100644 index 000000000000..5d11d253b6d9 --- /dev/null +++ b/pkgs/development/python-modules/mediafile/default.nix @@ -0,0 +1,44 @@ +{ buildPythonPackage +, enum34 +, fetchpatch +, fetchPypi +, isPy27 +, lib +, mutagen +, six +}: + +buildPythonPackage rec { + pname = "mediafile"; + version = "0.6.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-o/tSAHu8FTr6LZoMHvegr9uCZovNLHS9KkP2U9y4uko="; + }; + + propagatedBuildInputs = [ mutagen six ] ++ lib.optional isPy27 enum34; + + # NB: Remove in the next release + patches = [ + (fetchpatch { + url = "https://github.com/beetbox/mediafile/commit/0ff753d493a1a7f406cb3378545ffe2c85a9afa3.patch"; + sha256 = "sha256-AQ7YedoYPmLqt4a/odgghIKOY61i9YfA0To0RVFqlk8="; + }) + (fetchpatch { + url = "https://github.com/beetbox/mediafile/commit/f0fb4e5111d9dfaa3b38d196ec41fcd237d97953.patch"; + sha256 = "sha256-5O6RiAqkQEz3Bvqjwwv/LOS33nSIBnT2H/vasGGVrpI="; + }) + (fetchpatch { + url = "https://github.com/beetbox/mediafile/commit/d2fc3b59f77c515b02dfe7ad936f89264375d2b4.patch"; + sha256 = "sha256-SMH0XhCaKLDNB4M8VmZWfGuuelfY5xladZyQYtXtP18="; + }) + ]; + + meta = with lib; { + description = "MediaFile is a simple interface to the metadata tags for many audio file formats."; + homepage = "https://github.com/beetbox/mediafile"; + license = licenses.mit; + maintainers = with maintainers; [ lovesegfault ]; + }; +} diff --git a/pkgs/development/python-modules/meinheld/default.nix b/pkgs/development/python-modules/meinheld/default.nix index 2941505184de..ce7f23168007 100644 --- a/pkgs/development/python-modules/meinheld/default.nix +++ b/pkgs/development/python-modules/meinheld/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage, greenlet }: +{ lib, stdenv, fetchPypi, buildPythonPackage, greenlet }: buildPythonPackage rec { pname = "meinheld"; @@ -14,7 +14,7 @@ buildPythonPackage rec { # No tests doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "High performance asynchronous Python WSGI Web Server"; homepage = "https://meinheld.org/"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/meld3/default.nix b/pkgs/development/python-modules/meld3/default.nix index b2f514623315..8871bfdda463 100644 --- a/pkgs/development/python-modules/meld3/default.nix +++ b/pkgs/development/python-modules/meld3/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi }: @@ -14,7 +14,7 @@ buildPythonPackage rec { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "An HTML/XML templating engine used by supervisor"; homepage = "https://github.com/supervisor/meld3"; license = licenses.free; diff --git a/pkgs/development/python-modules/meliae/default.nix b/pkgs/development/python-modules/meliae/default.nix index e02e72c1add5..d602e3d94fdc 100644 --- a/pkgs/development/python-modules/meliae/default.nix +++ b/pkgs/development/python-modules/meliae/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , cython @@ -32,7 +32,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ cython ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Python Memory Usage Analyzer"; homepage = "https://launchpad.net/meliae"; license = licenses.gpl3; diff --git a/pkgs/development/python-modules/memcached/default.nix b/pkgs/development/python-modules/memcached/default.nix index 0e1ec2a2765c..b75bd31361de 100644 --- a/pkgs/development/python-modules/memcached/default.nix +++ b/pkgs/development/python-modules/memcached/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchurl , fetchPypi @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "124s98m6hvxj6x90d7aynsjfz878zli771q96ns767r2mbqn7192"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Python API for communicating with the memcached distributed memory object cache daemon"; homepage = "http://www.tummy.com/Community/software/python-memcached/"; license = licenses.psfl; diff --git a/pkgs/development/python-modules/memory_profiler/default.nix b/pkgs/development/python-modules/memory_profiler/default.nix index 0dafde83c404..28ff6b7c5e31 100644 --- a/pkgs/development/python-modules/memory_profiler/default.nix +++ b/pkgs/development/python-modules/memory_profiler/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , python }: @@ -16,7 +16,7 @@ python.pkgs.buildPythonPackage rec { matplotlib # needed for plotting memory usage ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A module for monitoring memory usage of a process"; longDescription = '' This is a python module for monitoring memory consumption of a process as diff --git a/pkgs/development/python-modules/mergedeep/default.nix b/pkgs/development/python-modules/mergedeep/default.nix index 3b5536ed6fbc..13aadbc9952f 100644 --- a/pkgs/development/python-modules/mergedeep/default.nix +++ b/pkgs/development/python-modules/mergedeep/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, isPy27, fetchFromGitHub, pytest }: +{ lib, stdenv, buildPythonPackage, isPy27, fetchFromGitHub, pytest }: buildPythonPackage rec { pname = "mergedeep"; @@ -17,7 +17,7 @@ buildPythonPackage rec { checkPhase = "pytest"; pythonImportsCheck = [ "mergedeep" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/clarketm/mergedeep"; description = "A deep merge function for python"; license = licenses.mit; diff --git a/pkgs/development/python-modules/mesa/default.nix b/pkgs/development/python-modules/mesa/default.nix index 78c0f1656a3c..5b97f972dad1 100644 --- a/pkgs/development/python-modules/mesa/default.nix +++ b/pkgs/development/python-modules/mesa/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, isPy27 +{ lib, stdenv, buildPythonPackage, fetchFromGitHub, isPy27 , cookiecutter, networkx , pandas, tornado, tqdm , pytest }: @@ -25,7 +25,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ cookiecutter networkx pandas tornado tqdm ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/projectmesa/mesa"; description = "An agent-based modeling (or ABM) framework in Python"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/metaphone/default.nix b/pkgs/development/python-modules/metaphone/default.nix index a9a4409c0de6..1c8557f15c41 100644 --- a/pkgs/development/python-modules/metaphone/default.nix +++ b/pkgs/development/python-modules/metaphone/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, isPy3k, fetchPypi, nose }: +{ lib, stdenv, buildPythonPackage, isPy3k, fetchPypi, nose }: buildPythonPackage rec { pname = "metaphone"; @@ -14,7 +14,7 @@ buildPythonPackage rec { buildInputs = [ nose ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/oubiwann/metaphone"; description = "A Python implementation of the metaphone and double metaphone algorithms"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/micawber/default.nix b/pkgs/development/python-modules/micawber/default.nix index 5129fe253c71..9d31dd378ac4 100644 --- a/pkgs/development/python-modules/micawber/default.nix +++ b/pkgs/development/python-modules/micawber/default.nix @@ -1,17 +1,17 @@ -{ stdenv, buildPythonPackage, fetchPypi, beautifulsoup4 }: +{ lib, stdenv, buildPythonPackage, fetchPypi, beautifulsoup4 }: buildPythonPackage rec { pname = "micawber"; - version = "0.5.1"; + version = "0.5.2"; src = fetchPypi { inherit pname version; - sha256 = "5e1e6fbab5bfc1edc6d575b900707c24a3484c51cf2e01f059a7e070724a3633"; + sha256 = "ac2d737d8ff27ed01ea3825ed8806970e8137d7b342cef37b39b6dd17e6eb3a4"; }; propagatedBuildInputs = [ beautifulsoup4 ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://micawber.readthedocs.io/en/latest/"; description = "A small library for extracting rich content from urls"; license = licenses.mit; diff --git a/pkgs/development/python-modules/midiutil/default.nix b/pkgs/development/python-modules/midiutil/default.nix index 0b9945f97d3d..5ac8d917d75d 100644 --- a/pkgs/development/python-modules/midiutil/default.nix +++ b/pkgs/development/python-modules/midiutil/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi }: +{ lib, stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "MIDIUtil"; @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "02m9sqv36zrzgz5zg2w9qmz8snzlm27yg3ways2hgipgs4xriykr"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/MarkCWirt/MIDIUtil"; description = "A pure python library for creating multi-track MIDI files"; license = licenses.mit; diff --git a/pkgs/development/python-modules/milc/default.nix b/pkgs/development/python-modules/milc/default.nix index adee40650bce..dc824d565474 100644 --- a/pkgs/development/python-modules/milc/default.nix +++ b/pkgs/development/python-modules/milc/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchFromGitHub , appdirs @@ -29,7 +29,7 @@ buildPythonPackage rec { ./hello | grep "Hello, World" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "An Opinionated Batteries-Included Python 3 CLI Framework"; homepage = "https://milc.clueboard.co"; license = licenses.mit; diff --git a/pkgs/development/python-modules/minidump/default.nix b/pkgs/development/python-modules/minidump/default.nix new file mode 100644 index 000000000000..346430d23926 --- /dev/null +++ b/pkgs/development/python-modules/minidump/default.nix @@ -0,0 +1,25 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "minidump"; + version = "0.0.13"; + + src = fetchPypi { + inherit pname version; + sha256 = "1w93yh2dz7llxjgv0jn7gf9praz7d5952is7idgh0lsyj67ri2ms"; + }; + + # Upstream doesn't have tests + doCheck = false; + pythonImportsCheck = [ "minidump" ]; + + meta = with lib; { + description = "Python library to parse and read Microsoft minidump file format"; + homepage = "https://github.com/skelsec/minidump"; + license = with licenses; [ mit ]; + maintainers = [ maintainers.fab ]; + }; +} diff --git a/pkgs/development/python-modules/minikerberos/default.nix b/pkgs/development/python-modules/minikerberos/default.nix new file mode 100644 index 000000000000..51ee529e234b --- /dev/null +++ b/pkgs/development/python-modules/minikerberos/default.nix @@ -0,0 +1,32 @@ +{ lib +, asn1crypto +, asysocks +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "minikerberos"; + version = "0.2.8"; + + src = fetchPypi { + inherit pname version; + sha256 = "16bbyihap2ygsi7xg58rwdn14ms1j0jy2kxbdljpg39s9q1rz6ps"; + }; + + propagatedBuildInputs = [ + asn1crypto + asysocks + ]; + + # no tests are published: https://github.com/skelsec/minikerberos/pull/5 + doCheck = false; + pythonImportsCheck = [ "minikerberos" ]; + + meta = with lib; { + description = "Kerberos manipulation library in Python"; + homepage = "https://github.com/skelsec/minikerberos"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/minimock/default.nix b/pkgs/development/python-modules/minimock/default.nix index 6275d92b0559..f154eabb744c 100644 --- a/pkgs/development/python-modules/minimock/default.nix +++ b/pkgs/development/python-modules/minimock/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchurl , nose @@ -19,7 +19,7 @@ buildPythonPackage rec { ./test ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A minimalistic mocking library for python"; homepage = "https://pypi.python.org/pypi/MiniMock"; license = licenses.mit; diff --git a/pkgs/development/python-modules/miniupnpc/default.nix b/pkgs/development/python-modules/miniupnpc/default.nix index b3c559c84622..7178405ab74c 100644 --- a/pkgs/development/python-modules/miniupnpc/default.nix +++ b/pkgs/development/python-modules/miniupnpc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi }: +{ lib, stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "miniupnpc"; @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "0ca94zz7sr2x57j218aypxqcwkr23n8js30f3yrvvqbg929nr93y"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "miniUPnP client"; homepage = "http://miniupnp.free.fr/"; license = licenses.mit; diff --git a/pkgs/development/python-modules/mitmproxy/default.nix b/pkgs/development/python-modules/mitmproxy/default.nix index d22ce7df128a..dd351931e062 100644 --- a/pkgs/development/python-modules/mitmproxy/default.nix +++ b/pkgs/development/python-modules/mitmproxy/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , buildPythonPackage , isPy27 @@ -107,7 +107,7 @@ buildPythonPackage rec { requests ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Man-in-the-middle proxy"; homepage = "https://mitmproxy.org/"; license = licenses.mit; diff --git a/pkgs/development/python-modules/mlflow/default.nix b/pkgs/development/python-modules/mlflow/default.nix index e86a27e1657f..89cc8f991466 100644 --- a/pkgs/development/python-modules/mlflow/default.nix +++ b/pkgs/development/python-modules/mlflow/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy27 +{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27 , alembic , click , cloudpickle @@ -61,7 +61,7 @@ buildPythonPackage rec { gunicorn ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/mlflow/mlflow"; description = "Open source platform for the machine learning lifecycle"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/mlrose/default.nix b/pkgs/development/python-modules/mlrose/default.nix index 5fd39d9b347a..c3c7c55f292d 100644 --- a/pkgs/development/python-modules/mlrose/default.nix +++ b/pkgs/development/python-modules/mlrose/default.nix @@ -1,4 +1,4 @@ -{ stdenv, isPy27, buildPythonPackage, fetchPypi, scikitlearn }: +{ lib, stdenv, isPy27, buildPythonPackage, fetchPypi, scikitlearn }: buildPythonPackage rec { pname = "mlrose"; @@ -16,7 +16,7 @@ buildPythonPackage rec { sed -i 's,sklearn,scikit-learn,g' setup.py ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Machine Learning, Randomized Optimization and SEarch"; homepage = "https://github.com/gkhayes/mlrose"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/mlxtend/default.nix b/pkgs/development/python-modules/mlxtend/default.nix index 2bfd12249101..94af156d9afb 100644 --- a/pkgs/development/python-modules/mlxtend/default.nix +++ b/pkgs/development/python-modules/mlxtend/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchFromGitHub , isPy27 @@ -39,7 +39,7 @@ buildPythonPackage rec { joblib ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A library of Python tools and extensions for data science"; homepage = "https://github.com/rasbt/mlxtend"; license= licenses.bsd3; diff --git a/pkgs/development/python-modules/mmpython/default.nix b/pkgs/development/python-modules/mmpython/default.nix index dbb6590eee6d..e40fc197a5bf 100644 --- a/pkgs/development/python-modules/mmpython/default.nix +++ b/pkgs/development/python-modules/mmpython/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchurl , isPyPy @@ -17,7 +17,7 @@ buildPythonPackage rec { disabled = isPyPy || isPy3k; - meta = with stdenv.lib; { + meta = with lib; { description = "Media Meta Data retrieval framework"; homepage = "https://sourceforge.net/projects/mmpython/"; license = licenses.gpl2; diff --git a/pkgs/development/python-modules/mocket/default.nix b/pkgs/development/python-modules/mocket/default.nix index 60b32665ca84..f7e97bb955c3 100644 --- a/pkgs/development/python-modules/mocket/default.nix +++ b/pkgs/development/python-modules/mocket/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "mocket"; - version = "3.9.4"; + version = "3.9.35"; src = fetchPypi { inherit pname version; - sha256 = "0b3nx8qa66isfl7rm3ljgxflr087qwabnf0a2xa1l5s28rikfj04"; + sha256 = "d822a2adfd8e028a2856785fbfe78e7dd8c7a3b623516298aef6d42a4c9149d1"; }; patchPhase = '' diff --git a/pkgs/development/python-modules/mockito/default.nix b/pkgs/development/python-modules/mockito/default.nix index 1238388a91c0..534d6674a8d9 100644 --- a/pkgs/development/python-modules/mockito/default.nix +++ b/pkgs/development/python-modules/mockito/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy3k, funcsigs, pytest, numpy }: +{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k, funcsigs, pytest, numpy }: buildPythonPackage rec { version = "1.2.2"; @@ -18,7 +18,7 @@ buildPythonPackage rec { pytest ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Spying framework"; homepage = "https://github.com/kaste/mockito-python"; license = licenses.mit; diff --git a/pkgs/development/python-modules/modeled/default.nix b/pkgs/development/python-modules/modeled/default.nix index e4cdec7766d6..66fe63e3daf1 100644 --- a/pkgs/development/python-modules/modeled/default.nix +++ b/pkgs/development/python-modules/modeled/default.nix @@ -5,7 +5,7 @@ , six , moretools , pathpy -, pytest +, pytestCheckHook }: buildPythonPackage rec { @@ -15,31 +15,19 @@ buildPythonPackage rec { src = fetchPypi { extension = "zip"; inherit pname version; - sha256 = "64934c68cfcdb75ed4a1ccadcfd5d2a46bf1b8e8e81dde89ef0f042c401e94f1"; + sha256 = "1wcl3r02q10gxy4xw7g8x2wg2sx4sbawzbfcl7a5xdydrxl4r4v4"; }; - buildInputs = [ - zetup - ]; + buildInputs = [ zetup ]; - propagatedBuildInputs = [ - six - moretools - pathpy - ]; + propagatedBuildInputs = [ six moretools pathpy ]; - checkInputs = [ - pytest - ]; - - checkPhase = '' - pytest test - ''; + checkInputs = [ pytestCheckHook ]; meta = with lib; { description = "Universal data modeling for Python"; homepage = "https://bitbucket.org/userzimmermann/python-modeled"; - license = licenses.lgpl3; + license = licenses.lgpl3Only; maintainers = [ maintainers.costrouc ]; }; } diff --git a/pkgs/development/python-modules/modestmaps/default.nix b/pkgs/development/python-modules/modestmaps/default.nix index c7b1071954d2..19316c26802d 100644 --- a/pkgs/development/python-modules/modestmaps/default.nix +++ b/pkgs/development/python-modules/modestmaps/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , pillow @@ -17,7 +17,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pillow ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A library for building interactive maps"; homepage = "http://modestmaps.com"; license = stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/python-modules/mongodict/default.nix b/pkgs/development/python-modules/mongodict/default.nix index 932160bb9fad..467093e84ceb 100644 --- a/pkgs/development/python-modules/mongodict/default.nix +++ b/pkgs/development/python-modules/mongodict/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , pymongo @@ -15,7 +15,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pymongo ]; - meta = with stdenv.lib; { + meta = with lib; { description = "MongoDB-backed Python dict-like interface"; homepage = "https://github.com/turicas/mongodict/"; license = licenses.gpl3; diff --git a/pkgs/development/python-modules/monotonic/default.nix b/pkgs/development/python-modules/monotonic/default.nix index 38a25841c7b6..7dffd3284427 100644 --- a/pkgs/development/python-modules/monotonic/default.nix +++ b/pkgs/development/python-modules/monotonic/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi }: @@ -19,7 +19,7 @@ buildPythonPackage rec { "ctypes.util.find_library('c')" "'${stdenv.glibc.out}/lib/libc.so.6'" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "An implementation of time.monotonic() for Python 2 & < 3.3"; homepage = "https://github.com/atdt/monotonic"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/moretools/default.nix b/pkgs/development/python-modules/moretools/default.nix index c9fd953f350e..d39f67a73113 100644 --- a/pkgs/development/python-modules/moretools/default.nix +++ b/pkgs/development/python-modules/moretools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ lib, stdenv, buildPythonPackage, fetchPypi , six, pathpy, zetup, pytest , decorator }: @@ -19,7 +19,7 @@ buildPythonPackage rec { checkInputs = [ six pathpy pytest ]; propagatedBuildInputs = [ decorator ]; - meta = with stdenv.lib; { + meta = with lib; { description = '' Many more basic tools for python 2/3 extending itertools, functools, operator and collections ''; diff --git a/pkgs/development/python-modules/moviepy/default.nix b/pkgs/development/python-modules/moviepy/default.nix index 1e08d5dc3af2..13f8d5884cf6 100644 --- a/pkgs/development/python-modules/moviepy/default.nix +++ b/pkgs/development/python-modules/moviepy/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , pythonAtLeast @@ -43,7 +43,7 @@ buildPythonPackage rec { opencv3 scikitimage scikitlearn scipy matplotlib youtube-dl ]); - meta = with stdenv.lib; { + meta = with lib; { description = "Video editing with Python"; homepage = "https://zulko.github.io/moviepy/"; license = licenses.mit; diff --git a/pkgs/development/python-modules/mox/default.nix b/pkgs/development/python-modules/mox/default.nix index 3537d936bb61..94d4791224df 100644 --- a/pkgs/development/python-modules/mox/default.nix +++ b/pkgs/development/python-modules/mox/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchurl }: @@ -15,7 +15,7 @@ buildPythonPackage rec { # error: invalid command 'test' doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://pymox.readthedocs.io/"; description = "A mock object framework for Python"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/mox3/default.nix b/pkgs/development/python-modules/mox3/default.nix index 70b982ef4b86..77a02ae8a733 100644 --- a/pkgs/development/python-modules/mox3/default.nix +++ b/pkgs/development/python-modules/mox3/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , pythonOlder @@ -29,7 +29,7 @@ buildPythonPackage rec { # https://opendev.org/openstack/mox3/src/branch/master/test-requirements.txt doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Mock object framework for Python"; homepage = "https://docs.openstack.org/mox3/latest/"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/mozsvc/default.nix b/pkgs/development/python-modules/mozsvc/default.nix index 780a162a916e..55afb1773fe3 100644 --- a/pkgs/development/python-modules/mozsvc/default.nix +++ b/pkgs/development/python-modules/mozsvc/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchFromGitHub , pyramid @@ -20,7 +20,7 @@ buildPythonPackage rec { doCheck = false; # too many dependencies and conflicting versions; I (nadrieril) gave up propagatedBuildInputs = [ pyramid simplejson konfig ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/mozilla-services/mozservices"; description = "Various utilities for Mozilla apps"; license = licenses.mpl20; diff --git a/pkgs/development/python-modules/mpd/default.nix b/pkgs/development/python-modules/mpd/default.nix index 5ae3e2b41ec7..212e6b5f13c4 100644 --- a/pkgs/development/python-modules/mpd/default.nix +++ b/pkgs/development/python-modules/mpd/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , isPy3k @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "02812eba1d2e0f46e37457f5a6fa23ba203622e4bcab0a19b265e66b08cd21b4"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "An MPD (Music Player Daemon) client library written in pure Python"; homepage = "http://jatreuman.indefero.net/p/python-mpd/"; license = licenses.gpl3; diff --git a/pkgs/development/python-modules/mpd2/default.nix b/pkgs/development/python-modules/mpd2/default.nix index 3573c7987c59..046a338a9931 100644 --- a/pkgs/development/python-modules/mpd2/default.nix +++ b/pkgs/development/python-modules/mpd2/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , pythonOlder @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "python-mpd2"; - version = "3.0.1"; + version = "3.0.2"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "772fa6861273bb9f363a97987c2c45ca3965eb770570f1f02566efec9c89fc5f"; + sha256 = "0ibl2xyj4380ai60i2bfhm8qn1sjyjbwwjmgzfcqa12wlnhck7ki"; }; buildInputs = [ mock ]; @@ -23,7 +23,7 @@ buildPythonPackage rec { ${python.interpreter} -m unittest mpd.tests ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A Python client module for the Music Player Daemon"; homepage = "https://github.com/Mic92/python-mpd2"; license = licenses.lgpl3Plus; diff --git a/pkgs/development/python-modules/mpmath/default.nix b/pkgs/development/python-modules/mpmath/default.nix index 1cbb8b04130b..86d55b34f044 100644 --- a/pkgs/development/python-modules/mpmath/default.nix +++ b/pkgs/development/python-modules/mpmath/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi }: @@ -15,7 +15,7 @@ buildPythonPackage rec { # error: invalid command 'test' doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://mpmath.org/"; description = "A pure-Python library for multiprecision floating arithmetic"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/mpv/default.nix b/pkgs/development/python-modules/mpv/default.nix index 6dab88e0286c..0ff66fa8132e 100644 --- a/pkgs/development/python-modules/mpv/default.nix +++ b/pkgs/development/python-modules/mpv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, python, isPy27 +{ lib, stdenv, buildPythonPackage, fetchFromGitHub, python, isPy27 , mpv }: @@ -25,7 +25,7 @@ buildPythonPackage rec { # tests impure, will error if it can't load libmpv.so checkPhase = "${python.interpreter} -c 'import mpv'"; - meta = with stdenv.lib; { + meta = with lib; { description = "A python interface to the mpv media player"; homepage = "https://github.com/jaseg/python-mpv"; license = licenses.agpl3; diff --git a/pkgs/development/python-modules/mrbob/default.nix b/pkgs/development/python-modules/mrbob/default.nix index 7074dab739be..64d0ce13a86d 100644 --- a/pkgs/development/python-modules/mrbob/default.nix +++ b/pkgs/development/python-modules/mrbob/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, stdenv, glibcLocales, mock, nose, isPy3k, jinja2, six +{ buildPythonPackage, lib, stdenv, glibcLocales, mock, nose, isPy3k, jinja2, six , fetchPypi }: @@ -21,7 +21,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ jinja2 six ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/domenkozar/mr.bob"; description = "A tool to generate code skeletons from templates"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/msal/default.nix b/pkgs/development/python-modules/msal/default.nix index 6bbdc6f5e5f9..37266df5f216 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.6.0"; + version = "1.8.0"; src = fetchPypi { inherit pname version; - sha256 = "15mx1fakz9c5qrrspsckd3yr3l5lac0pbjq8v65r26n3203xx5f9"; + sha256 = "1dcc737ca517df53438bc9a3fae97f17d93d7a93fa1389e6bc44e82eee81ab83"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/msgpack-numpy/default.nix b/pkgs/development/python-modules/msgpack-numpy/default.nix index ad612550d7e8..56bfa06a628a 100644 --- a/pkgs/development/python-modules/msgpack-numpy/default.nix +++ b/pkgs/development/python-modules/msgpack-numpy/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , cython @@ -29,7 +29,7 @@ buildPythonPackage rec { ${python.interpreter} msgpack_numpy.py ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Numpy data type serialization using msgpack"; homepage = "https://github.com/lebedov/msgpack-numpy"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/msgpack/default.nix b/pkgs/development/python-modules/msgpack/default.nix index 70a52dfe9946..262e5d5ecd0e 100644 --- a/pkgs/development/python-modules/msgpack/default.nix +++ b/pkgs/development/python-modules/msgpack/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "msgpack"; - version = "1.0.0"; + version = "1.0.2"; src = fetchPypi { inherit pname version; - sha256 = "1h5mxh84rcw04dvxy1qbfn2hisavfqgilh9k09rgyjhd936dad4m"; + sha256 = "1109s2yynrahwi64ikax68hx0mbclz8p35afmpphw5dwynb49q7s"; }; checkPhase = '' @@ -22,6 +22,7 @@ buildPythonPackage rec { meta = { homepage = "https://github.com/msgpack/msgpack-python"; description = "MessagePack serializer implementation for Python"; + changelog = "https://github.com/msgpack/msgpack-python/blob/master/ChangeLog.rst"; license = lib.licenses.asl20; # maintainers = ?? ; }; diff --git a/pkgs/development/python-modules/msldap/default.nix b/pkgs/development/python-modules/msldap/default.nix new file mode 100644 index 000000000000..3a5546c0afe7 --- /dev/null +++ b/pkgs/development/python-modules/msldap/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, fetchPypi +, asn1crypto +, asysocks +, minikerberos +, prompt_toolkit +, tqdm +, winacl +, winsspi +}: + +buildPythonPackage rec { + pname = "msldap"; + version = "0.3.22"; + + src = fetchPypi { + inherit pname version; + sha256 = "1ivq56953skql8f255nqx2sg4mm0kz2pr5b4dx62dx7jdgd1xym3"; + }; + + propagatedBuildInputs = [ + asn1crypto + asysocks + minikerberos + prompt_toolkit + tqdm + winacl + winsspi + ]; + + # Project doesn't have tests + doCheck = false; + pythonImportsCheck = [ "msldap" ]; + + meta = with lib; { + description = "Python LDAP library for auditing MS AD"; + homepage = "https://github.com/skelsec/msldap"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/msrest/default.nix b/pkgs/development/python-modules/msrest/default.nix index 1f21778f7db8..21b93bf5bfe3 100644 --- a/pkgs/development/python-modules/msrest/default.nix +++ b/pkgs/development/python-modules/msrest/default.nix @@ -18,7 +18,7 @@ }: buildPythonPackage rec { - version = "0.6.18"; + version = "0.6.19"; pname = "msrest"; # no tests in PyPI tarball @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "Azure"; repo = "msrest-for-python"; rev = "v${version}"; - sha256 = "0j0dbca47qnxnhpfgj3v5bglg8dpx2cy1psix8kp3ldrkf6rjwdb"; + sha256 = "sha256-hcUJrWw5EU0aO5Gyhn5+LmuRQN9Bom59cTz3maQ0jvw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/msrplib/default.nix b/pkgs/development/python-modules/msrplib/default.nix index ffb87ff48ee0..16c4cc0f43ae 100644 --- a/pkgs/development/python-modules/msrplib/default.nix +++ b/pkgs/development/python-modules/msrplib/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchdarcs , eventlib @@ -18,7 +18,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ eventlib application gnutls ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/AGProjects/python-msrplib"; description = "Client library for MSRP protocol and its relay extension (RFC 4975 and RFC4976)"; license = licenses.lgpl3; diff --git a/pkgs/development/python-modules/mulpyplexer/default.nix b/pkgs/development/python-modules/mulpyplexer/default.nix new file mode 100644 index 000000000000..ee27dc20766d --- /dev/null +++ b/pkgs/development/python-modules/mulpyplexer/default.nix @@ -0,0 +1,25 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "mulpyplexer"; + version = "0.09"; + + src = fetchPypi { + inherit pname version; + sha256 = "0c5xzci1djy1yi9hxxh8g67l6ms8r7ad7ja20pv8hfbdysdrwkhl"; + }; + + # Project has no tests + doCheck = false; + pythonImportsCheck = [ "mulpyplexer" ]; + + meta = with lib; { + description = "Multiplex interactions with lists of Python objects"; + homepage = "https://github.com/zardus/mulpyplexer"; + license = with licenses; [ bsd2 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/multi_key_dict/default.nix b/pkgs/development/python-modules/multi_key_dict/default.nix index a094b373f8f3..f76cde9bec53 100644 --- a/pkgs/development/python-modules/multi_key_dict/default.nix +++ b/pkgs/development/python-modules/multi_key_dict/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi }: @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "17lkx4rf4waglwbhc31aak0f28c63zl3gx5k5i1iq2m3gb0xxsyy"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "multi_key_dict"; homepage = "https://github.com/formiaczek/multi_key_dict"; license = licenses.mit; diff --git a/pkgs/development/python-modules/munch/default.nix b/pkgs/development/python-modules/munch/default.nix index 0d7d6f7c633a..2ff2ce4cefb9 100644 --- a/pkgs/development/python-modules/munch/default.nix +++ b/pkgs/development/python-modules/munch/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , six @@ -19,7 +19,7 @@ buildPythonPackage rec { # No tests in archive doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "A dot-accessible dictionary (a la JavaScript objects)"; license = licenses.mit; homepage = "https://github.com/Infinidat/munch"; diff --git a/pkgs/development/python-modules/munkres/default.nix b/pkgs/development/python-modules/munkres/default.nix index 3df0e2b01f3b..cb88b666cfa0 100644 --- a/pkgs/development/python-modules/munkres/default.nix +++ b/pkgs/development/python-modules/munkres/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , fetchpatch @@ -28,7 +28,7 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://bmc.github.com/munkres/"; description = "Munkres algorithm for the Assignment Problem"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/murmurhash/default.nix b/pkgs/development/python-modules/murmurhash/default.nix index 2bd156bd63fd..68aa29a6edeb 100644 --- a/pkgs/development/python-modules/murmurhash/default.nix +++ b/pkgs/development/python-modules/murmurhash/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , cython @@ -28,7 +28,7 @@ buildPythonPackage rec { pytest murmurhash ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Cython bindings for MurmurHash2"; homepage = "https://github.com/explosion/murmurhash"; license = licenses.mit; diff --git a/pkgs/development/python-modules/musicbrainzngs/default.nix b/pkgs/development/python-modules/musicbrainzngs/default.nix index 7ae3445377e6..02ec38157117 100644 --- a/pkgs/development/python-modules/musicbrainzngs/default.nix +++ b/pkgs/development/python-modules/musicbrainzngs/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , pkgs @@ -22,7 +22,7 @@ buildPythonPackage rec { rm test/test_submit.py ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://python-musicbrainzngs.readthedocs.org/"; description = "Python bindings for musicbrainz NGS webservice"; license = licenses.bsd2; diff --git a/pkgs/development/python-modules/mutag/default.nix b/pkgs/development/python-modules/mutag/default.nix index 273a009a1f41..45725c0fabb7 100644 --- a/pkgs/development/python-modules/mutag/default.nix +++ b/pkgs/development/python-modules/mutag/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchgit , isPy3k @@ -18,7 +18,7 @@ buildPythonPackage { propagatedBuildInputs = [ pyparsing ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/aroig/mutag"; description = "A script to change email tags in a mu indexed maildir"; license = licenses.gpl3; diff --git a/pkgs/development/python-modules/muttils/default.nix b/pkgs/development/python-modules/muttils/default.nix index 01e789fb7594..1d6b5ce8df44 100644 --- a/pkgs/development/python-modules/muttils/default.nix +++ b/pkgs/development/python-modules/muttils/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchurl , isPy3k @@ -17,7 +17,7 @@ buildPythonPackage { # Tests don't work doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Utilities for use with console mail clients, like mutt"; homepage = "https://www.blacktrash.org/hg/muttils"; license = licenses.gpl2Plus; diff --git a/pkgs/development/python-modules/mwclient/default.nix b/pkgs/development/python-modules/mwclient/default.nix index 644f01fdb1f2..ac9373b574ac 100644 --- a/pkgs/development/python-modules/mwclient/default.nix +++ b/pkgs/development/python-modules/mwclient/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub +{ lib, stdenv, buildPythonPackage, fetchFromGitHub , requests, requests_oauthlib, six , pytest, pytestcache, pytestcov, responses, mock }: @@ -22,7 +22,7 @@ buildPythonPackage rec { py.test ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Python client library to the MediaWiki API"; license = licenses.mit; homepage = "https://github.com/mwclient/mwclient"; diff --git a/pkgs/development/python-modules/mwlib-ext/default.nix b/pkgs/development/python-modules/mwlib-ext/default.nix index cfcbdc2d0ac3..0a81fd58d7ee 100644 --- a/pkgs/development/python-modules/mwlib-ext/default.nix +++ b/pkgs/development/python-modules/mwlib-ext/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , isPy3k @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "9229193ee719568d482192d9d913b3c4bb96af7c589d6c31ed4a62caf5054278"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Dependencies for mwlib markup"; homepage = "http://pediapress.com/code/"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/mwlib-rl/default.nix b/pkgs/development/python-modules/mwlib-rl/default.nix index 21820d95c7fa..d27de2ed45cc 100644 --- a/pkgs/development/python-modules/mwlib-rl/default.nix +++ b/pkgs/development/python-modules/mwlib-rl/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , mwlib @@ -18,7 +18,7 @@ buildPythonPackage rec { buildInputs = [ mwlib mwlib-ext pygments ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Generate pdfs from mediawiki markup"; homepage = "http://pediapress.com/code/"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/mwlib/default.nix b/pkgs/development/python-modules/mwlib/default.nix index 55a19e1a6da3..e9defe3ee148 100644 --- a/pkgs/development/python-modules/mwlib/default.nix +++ b/pkgs/development/python-modules/mwlib/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , isPy3k @@ -45,7 +45,7 @@ buildPythonPackage rec { # Tests are in build directory but we need extension modules that are in $out doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Library for parsing MediaWiki articles and converting them to different output formats"; homepage = "http://pediapress.com/code/"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/mwparserfromhell/default.nix b/pkgs/development/python-modules/mwparserfromhell/default.nix index e52e033cdb00..0546688b867e 100644 --- a/pkgs/development/python-modules/mwparserfromhell/default.nix +++ b/pkgs/development/python-modules/mwparserfromhell/default.nix @@ -1,18 +1,18 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi }: buildPythonPackage rec { pname = "mwparserfromhell"; - version = "0.5.4"; + version = "0.6"; src = fetchPypi { inherit pname version; - sha256 = "aaf5416ab9b75e99e286f8a4216f77a2f7d834afd4c8f81731e701e59bf99305"; + sha256 = "75787b6ab140ab267b313d37d045f3276f5dc6a9741074eddfbabc1635cb2efc"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "MWParserFromHell is a parser for MediaWiki wikicode"; homepage = "https://mwparserfromhell.readthedocs.io/en/latest/"; license = licenses.mit; diff --git a/pkgs/development/python-modules/mygpoclient/default.nix b/pkgs/development/python-modules/mygpoclient/default.nix index 2af73f2d8974..c6956b828dbc 100644 --- a/pkgs/development/python-modules/mygpoclient/default.nix +++ b/pkgs/development/python-modules/mygpoclient/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildPythonPackage, nose, minimock }: +{ lib, stdenv, fetchFromGitHub, buildPythonPackage, nose, minimock }: buildPythonPackage rec { pname = "mypgoclient"; @@ -19,7 +19,7 @@ buildPythonPackage rec { doCheck = (!stdenv.isDarwin); - meta = with stdenv.lib; { + meta = with lib; { description = "A gpodder.net client library"; longDescription = '' The mygpoclient library allows developers to utilize a Pythonic interface diff --git a/pkgs/development/python-modules/mypy-protobuf/default.nix b/pkgs/development/python-modules/mypy-protobuf/default.nix index 3e0ab2cf1820..f444ba039c20 100644 --- a/pkgs/development/python-modules/mypy-protobuf/default.nix +++ b/pkgs/development/python-modules/mypy-protobuf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonApplication, protobuf }: +{ lib, stdenv, fetchPypi, buildPythonApplication, protobuf }: buildPythonApplication rec { pname = "mypy-protobuf"; @@ -11,7 +11,7 @@ buildPythonApplication rec { propagatedBuildInputs = [ protobuf ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Generate mypy stub files from protobuf specs"; homepage = "https://github.com/dropbox/mypy-protobuf"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/mypy/default.nix b/pkgs/development/python-modules/mypy/default.nix index 1b8d763eb6fe..4bea992f6ba8 100644 --- a/pkgs/development/python-modules/mypy/default.nix +++ b/pkgs/development/python-modules/mypy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildPythonPackage, typed-ast, psutil, isPy3k +{ lib, stdenv, fetchFromGitHub, buildPythonPackage, typed-ast, psutil, isPy3k , mypy-extensions , typing-extensions , fetchpatch @@ -56,7 +56,7 @@ buildPythonPackage rec { # is64bit: unfortunately the build would exhaust all possible memory on i686-linux. MYPY_USE_MYPYC = stdenv.buildPlatform.is64bit; - meta = with stdenv.lib; { + meta = with lib; { description = "Optional static typing for Python"; homepage = "http://www.mypy-lang.org"; license = licenses.mit; diff --git a/pkgs/development/python-modules/mypy/extensions.nix b/pkgs/development/python-modules/mypy/extensions.nix index b3bb68a53b72..21a3ee21dbd9 100644 --- a/pkgs/development/python-modules/mypy/extensions.nix +++ b/pkgs/development/python-modules/mypy/extensions.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage, typing, pythonOlder }: +{ lib, stdenv, fetchPypi, buildPythonPackage, typing, pythonOlder }: buildPythonPackage rec { pname = "mypy-extensions"; @@ -15,7 +15,7 @@ buildPythonPackage rec { propagatedBuildInputs = if pythonOlder "3.5" then [ typing ] else [ ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Experimental type system extensions for programs checked with the mypy typechecker"; homepage = "http://www.mypy-lang.org"; license = licenses.mit; diff --git a/pkgs/development/python-modules/mysqlclient/default.nix b/pkgs/development/python-modules/mysqlclient/default.nix index bc924000ed1f..9d91543b7ff3 100644 --- a/pkgs/development/python-modules/mysqlclient/default.nix +++ b/pkgs/development/python-modules/mysqlclient/default.nix @@ -1,8 +1,8 @@ -{ stdenv, buildPythonPackage, fetchPypi, libmysqlclient }: +{ lib, stdenv, buildPythonPackage, fetchPypi, libmysqlclient }: buildPythonPackage rec { pname = "mysqlclient"; - version = "2.0.2"; + version = "2.0.3"; nativeBuildInputs = [ libmysqlclient @@ -17,10 +17,10 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "8df057b08fc27d8f7106bfa997d0a21e2acef017f905f06d6fb0aa6a20d4d2b2"; + sha256 = "f6ebea7c008f155baeefe16c56cd3ee6239f7a5a9ae42396c2f1860f08a7c432"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Python interface to MySQL"; homepage = "https://github.com/PyMySQL/mysqlclient-python"; license = licenses.gpl1; diff --git a/pkgs/development/python-modules/namebench/default.nix b/pkgs/development/python-modules/namebench/default.nix index 44b590bae2cf..eefdcce79901 100644 --- a/pkgs/development/python-modules/namebench/default.nix +++ b/pkgs/development/python-modules/namebench/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , isPy3k , isPyPy @@ -27,7 +27,7 @@ buildPythonPackage rec { sed -i "s|import os|import os; os.chdir(\"$out/namebench\")|" "$out/bin/namebench.py" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/google/namebench"; # Formerly https://code.google.com/archive/p/namebench/ description = "Find fastest DNS servers available"; license = with licenses; [ diff --git a/pkgs/development/python-modules/nameparser/default.nix b/pkgs/development/python-modules/nameparser/default.nix index 3384ed67c1ef..0c8e442affcf 100644 --- a/pkgs/development/python-modules/nameparser/default.nix +++ b/pkgs/development/python-modules/nameparser/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , glibcLocales @@ -16,7 +16,7 @@ buildPythonPackage rec { LC_ALL="en_US.UTF-8"; buildInputs = [ glibcLocales ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A simple Python module for parsing human names into their individual components"; homepage = "https://github.com/derek73/python-nameparser"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/python-modules/nanoleaf/default.nix b/pkgs/development/python-modules/nanoleaf/default.nix index ea15da78bfb5..f6131cd53095 100644 --- a/pkgs/development/python-modules/nanoleaf/default.nix +++ b/pkgs/development/python-modules/nanoleaf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, requests }: +{ lib, stdenv, buildPythonPackage, fetchPypi, requests }: buildPythonPackage rec { pname = "nanoleaf"; @@ -16,7 +16,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A python interface for Nanoleaf Aurora lighting"; homepage = "https://github.com/software-2/nanoleaf"; license = licenses.mit; diff --git a/pkgs/development/python-modules/nanomsg-python/default.nix b/pkgs/development/python-modules/nanomsg-python/default.nix index 29d71d0243f9..4cf33fb2074c 100644 --- a/pkgs/development/python-modules/nanomsg-python/default.nix +++ b/pkgs/development/python-modules/nanomsg-python/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, nanomsg }: +{ lib, stdenv, buildPythonPackage, fetchFromGitHub, nanomsg }: buildPythonPackage { pname = "nanomsg-python"; @@ -16,7 +16,7 @@ buildPythonPackage { # Tests requires network connections doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Bindings for nanomsg"; homepage = "https://github.com/tonysimpson/nanomsg-python"; license = licenses.mit; diff --git a/pkgs/development/python-modules/nassl/default.nix b/pkgs/development/python-modules/nassl/default.nix index 0df4b0218b59..908ecff8c177 100644 --- a/pkgs/development/python-modules/nassl/default.nix +++ b/pkgs/development/python-modules/nassl/default.nix @@ -5,13 +5,15 @@ , pkgsStatic , openssl , invoke -, pytest , tls-parser , cacert +, pytestCheckHook }: let - zlibStatic = pkgsStatic.zlib; + zlibStatic = pkgsStatic.zlib.override { + splitStaticOutput = false; + }; nasslOpensslArgs = { static = true; enableSSL2 = true; @@ -34,17 +36,16 @@ let opensslStatic = (openssl.override nasslOpensslArgs).overrideAttrs ( oldAttrs: rec { name = "openssl-${version}"; - version = "1.1.1"; + version = "1.1.1h"; src = fetchurl { url = "https://www.openssl.org/source/${name}.tar.gz"; - sha256 = "0gbab2fjgms1kx5xjvqx8bxhr98k4r8l2fa8vw7kvh491xd8fdi8"; + sha256 = "1ncmcnh5bmxkwrvm0m1q4kdcjjfpwvlyjspjhibkxc6p9dvsi72w"; }; configureFlags = oldAttrs.configureFlags ++ nasslOpensslFlagsCommon ++ [ "enable-weak-ssl-ciphers" "enable-tls1_3" "no-async" ]; - patches = [ ./nix-ssl-cert-file.patch ]; buildInputs = oldAttrs.buildInputs ++ [ zlibStatic cacert ]; } ); @@ -66,32 +67,36 @@ let in buildPythonPackage rec { pname = "nassl"; - version = "3.0.0"; + version = "3.1.0"; src = fetchFromGitHub { owner = "nabla-c0d3"; repo = pname; rev = version; - sha256 = "1dhgkpldadq9hg5isb6mrab7z80sy5bvzad2fb54pihnknfwhp8z"; + sha256 = "1x1v0fpb6gcc2r0k2rsy0mc3v25s3qbva78apvi46n08c2l309ci"; }; - postPatch = '' - mkdir -p deps/openssl-OpenSSL_1_0_2e/ + postPatch = let + legacyOpenSSLVersion = lib.replaceStrings ["."] ["_"] opensslLegacyStatic.version; + modernOpenSSLVersion = lib.replaceStrings ["."] ["_"] opensslStatic.version; + zlibVersion = zlibStatic.version; + in '' + mkdir -p deps/openssl-OpenSSL_${legacyOpenSSLVersion}/ 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.bin}/bin deps/openssl-OpenSSL_1_0_2e/apps + deps/openssl-OpenSSL_${legacyOpenSSLVersion}/ + ln -s ${opensslLegacyStatic.out.dev}/include deps/openssl-OpenSSL_${legacyOpenSSLVersion}/include + ln -s ${opensslLegacyStatic.bin}/bin deps/openssl-OpenSSL_${legacyOpenSSLVersion}/apps - mkdir -p deps/openssl-OpenSSL_1_1_1/ + mkdir -p deps/openssl-OpenSSL_${modernOpenSSLVersion}/ 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.bin}/bin deps/openssl-OpenSSL_1_1_1/apps + deps/openssl-OpenSSL_${modernOpenSSLVersion}/ + ln -s ${opensslStatic.out.dev}/include deps/openssl-OpenSSL_${modernOpenSSLVersion}/include + ln -s ${opensslStatic.bin}/bin deps/openssl-OpenSSL_${modernOpenSSLVersion}/apps - mkdir -p deps/zlib-1.2.11/ - cp ${zlibStatic.out}/lib/libz.a deps/zlib-1.2.11/ + mkdir -p deps/zlib-${zlibVersion}/ + cp ${zlibStatic.out}/lib/libz.a deps/zlib-${zlibVersion}/ ''; propagatedBuildInputs = [ tls-parser ]; @@ -103,7 +108,7 @@ buildPythonPackage rec { invoke package.wheel ''; - checkInputs = [ pytest ]; + checkInputs = [ pytestCheckHook ]; checkPhase = '' # Skip online tests diff --git a/pkgs/development/python-modules/nassl/nix-ssl-cert-file.patch b/pkgs/development/python-modules/nassl/nix-ssl-cert-file.patch deleted file mode 100644 index 893fb3eb6643..000000000000 --- a/pkgs/development/python-modules/nassl/nix-ssl-cert-file.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -ru -x '*~' openssl-1.0.2j-orig/crypto/x509/by_file.c openssl-1.0.2j/crypto/x509/by_file.c ---- openssl-1.0.2j-orig/crypto/x509/by_file.c 2016-09-26 11:49:07.000000000 +0200 -+++ openssl-1.0.2j/crypto/x509/by_file.c 2016-10-13 16:54:31.400288302 +0200 -@@ -97,7 +97,9 @@ - switch (cmd) { - case X509_L_FILE_LOAD: - if (argl == X509_FILETYPE_DEFAULT) { -- file = getenv(X509_get_default_cert_file_env()); -+ file = getenv("NIX_SSL_CERT_FILE"); -+ if (!file) -+ file = getenv(X509_get_default_cert_file_env()); - if (file) - ok = (X509_load_cert_crl_file(ctx, file, - X509_FILETYPE_PEM) != 0); diff --git a/pkgs/development/python-modules/nbclient/default.nix b/pkgs/development/python-modules/nbclient/default.nix index f37cb3bc58f9..d846511eb3f4 100644 --- a/pkgs/development/python-modules/nbclient/default.nix +++ b/pkgs/development/python-modules/nbclient/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, +{ lib, stdenv, buildPythonPackage, fetchPypi, pythonOlder, async_generator, traitlets, nbformat, nest-asyncio, jupyter_client, pytest, xmltodict, nbconvert, ipywidgets , doCheck ? true @@ -18,7 +18,7 @@ buildPythonPackage rec { checkInputs = [ pytest xmltodict nbconvert ipywidgets ]; propagatedBuildInputs = [ async_generator traitlets nbformat nest-asyncio jupyter_client ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/jupyter/nbclient"; description = "A client library for executing notebooks"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/nbxmpp/default.nix b/pkgs/development/python-modules/nbxmpp/default.nix index fb1945ddf427..28946bd1a6e7 100644 --- a/pkgs/development/python-modules/nbxmpp/default.nix +++ b/pkgs/development/python-modules/nbxmpp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchzip, gobject-introspection, idna, libsoup, precis-i18n, pygobject3, pyopenssl }: +{ lib, stdenv, buildPythonPackage, fetchzip, gobject-introspection, idna, libsoup, precis-i18n, pygobject3, pyopenssl }: let pname = "nbxmpp"; @@ -18,7 +18,7 @@ in buildPythonPackage { checkInputs = [ gobject-introspection libsoup pygobject3 ]; propagatedBuildInputs = [ idna pyopenssl ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://dev.gajim.org/gajim/python-nbxmpp"; description = "Non-blocking Jabber/XMPP module"; license = licenses.gpl3; diff --git a/pkgs/development/python-modules/ncclient/default.nix b/pkgs/development/python-modules/ncclient/default.nix index 203ffc656806..f933587dcad1 100644 --- a/pkgs/development/python-modules/ncclient/default.nix +++ b/pkgs/development/python-modules/ncclient/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , paramiko @@ -30,7 +30,7 @@ buildPythonPackage rec { #Unfortunately the test hangs at te end doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/ncclient/ncclient"; description = "Python library for NETCONF clients"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/ndg-httpsclient/default.nix b/pkgs/development/python-modules/ndg-httpsclient/default.nix index 687f589fe1af..7768614a5d12 100644 --- a/pkgs/development/python-modules/ndg-httpsclient/default.nix +++ b/pkgs/development/python-modules/ndg-httpsclient/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchFromGitHub , pyopenssl @@ -20,7 +20,7 @@ buildPythonPackage rec { # uses networking doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/cedadev/ndg_httpsclient/"; description = "Provide enhanced HTTPS support for httplib and urllib2 using PyOpenSSL"; license = licenses.bsd2; diff --git a/pkgs/development/python-modules/netaddr/default.nix b/pkgs/development/python-modules/netaddr/default.nix index 95f567a6c0c6..d92673104a9f 100644 --- a/pkgs/development/python-modules/netaddr/default.nix +++ b/pkgs/development/python-modules/netaddr/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , pythonOlder @@ -22,7 +22,7 @@ buildPythonPackage rec { checkInputs = [ glibcLocales pytestCheckHook ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://netaddr.readthedocs.io/en/latest/"; downloadPage = "https://github.com/netaddr/netaddr/releases"; changelog = "https://netaddr.readthedocs.io/en/latest/changes.html"; diff --git a/pkgs/development/python-modules/netcdf4/default.nix b/pkgs/development/python-modules/netcdf4/default.nix index 33c7d307b037..456124b19bd3 100644 --- a/pkgs/development/python-modules/netcdf4/default.nix +++ b/pkgs/development/python-modules/netcdf4/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { CURL_DIR=curl.dev; JPEG_DIR=libjpeg.dev; - meta = with stdenv.lib; { + meta = with lib; { description = "Interface to netCDF library (versions 3 and 4)"; homepage = "https://pypi.python.org/pypi/netCDF4"; license = licenses.free; # Mix of license (all MIT* like) diff --git a/pkgs/development/python-modules/netdata/default.nix b/pkgs/development/python-modules/netdata/default.nix new file mode 100644 index 000000000000..f4e625b12b4e --- /dev/null +++ b/pkgs/development/python-modules/netdata/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchPypi +, aiohttp +, async-timeout +}: + +buildPythonPackage rec { + pname = "netdata"; + version = "0.2.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "14kyjp1q3clizs1bqx4rp31d2awjmi5v65z8sarr2ycgwqqmkrzw"; + }; + + propagatedBuildInputs = [ + aiohttp + async-timeout + ]; + + # no tests are present + doCheck = false; + + pythonImportsCheck = [ "netdata" ]; + + meta = with lib; { + description = "Python API for interacting with Netdata"; + homepage = "https://github.com/home-assistant-ecosystem/python-netdata"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/netdisco/default.nix b/pkgs/development/python-modules/netdisco/default.nix index a26a212d8f7e..e546ac6cd579 100644 --- a/pkgs/development/python-modules/netdisco/default.nix +++ b/pkgs/development/python-modules/netdisco/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, isPy3k, fetchPypi, requests, zeroconf, netifaces, pytest }: +{ lib, stdenv, buildPythonPackage, isPy3k, fetchPypi, requests, zeroconf, netifaces, pytest }: buildPythonPackage rec { pname = "netdisco"; @@ -19,7 +19,7 @@ buildPythonPackage rec { py.test ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Python library to scan local network for services and devices"; homepage = "https://github.com/home-assistant/netdisco"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/netifaces/default.nix b/pkgs/development/python-modules/netifaces/default.nix index 94cdb8290133..07dc63c2181f 100644 --- a/pkgs/development/python-modules/netifaces/default.nix +++ b/pkgs/development/python-modules/netifaces/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi }: @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "2dee9ffdd16292878336a58d04a20f0ffe95555465fee7c9bd23b3490ef2abf3"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://alastairs-place.net/projects/netifaces/"; description = "Portable access to network interfaces from Python"; license = licenses.mit; diff --git a/pkgs/development/python-modules/neuronpy/default.nix b/pkgs/development/python-modules/neuronpy/default.nix index 1d258effda7d..b81398f918cd 100644 --- a/pkgs/development/python-modules/neuronpy/default.nix +++ b/pkgs/development/python-modules/neuronpy/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , numpy @@ -22,7 +22,7 @@ buildPythonPackage rec { #No tests included doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Interfaces and utilities for the NEURON simulator and analysis of neural data"; maintainers = [ maintainers.nico202 ]; license = licenses.mit; diff --git a/pkgs/development/python-modules/nevow/default.nix b/pkgs/development/python-modules/nevow/default.nix index 301d2c7a3947..356754fdeac8 100644 --- a/pkgs/development/python-modules/nevow/default.nix +++ b/pkgs/development/python-modules/nevow/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchpatch, fetchPypi, isPy3k, twisted }: +{ lib, stdenv, buildPythonPackage, fetchpatch, fetchPypi, isPy3k, twisted }: buildPythonPackage rec { pname = "Nevow"; @@ -18,7 +18,7 @@ buildPythonPackage rec { trial formless nevow ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Nevow, a web application construction kit for Python"; longDescription = '' Nevow - Pronounced as the French "nouveau", or "noo-voh", Nevow diff --git a/pkgs/development/python-modules/nimfa/default.nix b/pkgs/development/python-modules/nimfa/default.nix index bd3e92e90dbc..dc889440aa41 100644 --- a/pkgs/development/python-modules/nimfa/default.nix +++ b/pkgs/development/python-modules/nimfa/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , isPy3k @@ -21,7 +21,7 @@ buildPythonPackage rec { checkInputs = [ matplotlib pytest ]; doCheck = !isPy3k; # https://github.com/marinkaz/nimfa/issues/42 - meta = with stdenv.lib; { + meta = with lib; { description = "Nonnegative matrix factorization library"; homepage = "http://nimfa.biolab.si"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/nine/default.nix b/pkgs/development/python-modules/nine/default.nix index e0d1cb173ea7..1747332ed5a2 100644 --- a/pkgs/development/python-modules/nine/default.nix +++ b/pkgs/development/python-modules/nine/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi }: @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "e8a96b6326341637d25ca9c257c1d2af4033c957946438d9d37bf6eb798d3bbe"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Let's write Python 3 right now!"; homepage = "https://github.com/nandoflorestan/nine"; license = licenses.free; diff --git a/pkgs/development/python-modules/nipy/default.nix b/pkgs/development/python-modules/nipy/default.nix index fef24e837d1b..719e07b617bf 100644 --- a/pkgs/development/python-modules/nipy/default.nix +++ b/pkgs/development/python-modules/nipy/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , pythonOlder @@ -40,7 +40,7 @@ buildPythonPackage rec { # nipy.tests.test_scripts.test_nipy_3_4d # ditto re.: `nipy_3_4d` script doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://nipy.org/nipy"; description = "Software for structural and functional neuroimaging analysis"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/nipype/default.nix b/pkgs/development/python-modules/nipype/default.nix index f152287d25dc..5f847007bdc5 100644 --- a/pkgs/development/python-modules/nipype/default.nix +++ b/pkgs/development/python-modules/nipype/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , isPy27 @@ -106,7 +106,7 @@ buildPythonPackage rec { ''; pythonImportsCheck = [ "nipype" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://nipy.org/nipype/"; description = "Neuroimaging in Python: Pipelines and Interfaces"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/nitime/default.nix b/pkgs/development/python-modules/nitime/default.nix index 8fa40465c10d..68eeab46afc4 100644 --- a/pkgs/development/python-modules/nitime/default.nix +++ b/pkgs/development/python-modules/nitime/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , python , fetchPypi -, pytest +, pytestCheckHook , cython , numpy , scipy @@ -21,11 +21,11 @@ buildPythonPackage rec { sha256 = "0hb3x5196z2zaawb8s7lhja0vd3n983ncaynqfl9qg315x9ax7i6"; }; - checkInputs = [ pytest ]; buildInputs = [ cython ]; + propagatedBuildInputs = [ numpy scipy matplotlib networkx nibabel ]; - checkPhase = "pytest nitime/tests"; + checkInputs = [ pytestCheckHook ]; meta = with lib; { homepage = "https://nipy.org/nitime"; diff --git a/pkgs/development/python-modules/nixpkgs/default.nix b/pkgs/development/python-modules/nixpkgs/default.nix index 7df6d72c55c4..4edd31d6a25f 100644 --- a/pkgs/development/python-modules/nixpkgs/default.nix +++ b/pkgs/development/python-modules/nixpkgs/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , pbr @@ -19,7 +19,11 @@ buildPythonPackage rec { buildInputs = [ pbr ]; propagatedBuildInputs = [ pythonix ]; - meta = with stdenv.lib; { + # does not have any tests + doCheck = false; + pythonImportsCheck = [ "nixpkgs" ]; + + meta = with lib; { description = "Allows to `from nixpkgs import` stuff in interactive Python sessions"; homepage = "https://github.com/t184256/nixpkgs-python-importer"; license = licenses.mit; diff --git a/pkgs/development/python-modules/nocaselist/default.nix b/pkgs/development/python-modules/nocaselist/default.nix index 055b55da45d3..e7947eba92ae 100644 --- a/pkgs/development/python-modules/nocaselist/default.nix +++ b/pkgs/development/python-modules/nocaselist/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "nocaselist"; - version = "1.0.3"; + version = "1.0.4"; src = fetchPypi { inherit pname version; - sha256 = "fm3st9hVY7kESRPJCH70tpG8PaTXrR2IlozepAlVMyY="; + sha256 = "73a9c0659e7135c66e46a6ab06e2cb637ce9248d73c690ebd31afb72a4e03ac0"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/node-semver/default.nix b/pkgs/development/python-modules/node-semver/default.nix index 9c787147407a..5ba62fb9210e 100644 --- a/pkgs/development/python-modules/node-semver/default.nix +++ b/pkgs/development/python-modules/node-semver/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage, pytest }: +{ lib, stdenv, fetchPypi, buildPythonPackage, pytest }: buildPythonPackage rec { version = "0.7.0"; @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "1p7ink1wajkc31r05k1yn37gk377033a9vhin8v4j757d4ha1f91"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/podhmo/python-semver"; description = "A port of node-semver"; license = licenses.mit; diff --git a/pkgs/development/python-modules/noise/default.nix b/pkgs/development/python-modules/noise/default.nix index 736444ec6e19..98f336c49866 100644 --- a/pkgs/development/python-modules/noise/default.nix +++ b/pkgs/development/python-modules/noise/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi }: +{ lib, stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "noise"; @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "0rcv40dcshqpchwkdlhsv3n68h9swm9fh4d1cgzr2hsp6rs7k8jp"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/caseman/noise"; description = "Native-code and shader implementations of Perlin noise"; license = licenses.mit; diff --git a/pkgs/development/python-modules/noiseprotocol/default.nix b/pkgs/development/python-modules/noiseprotocol/default.nix new file mode 100644 index 000000000000..76ed1b1fc2a0 --- /dev/null +++ b/pkgs/development/python-modules/noiseprotocol/default.nix @@ -0,0 +1,26 @@ +{ lib, buildPythonPackage, fetchFromGitHub, cryptography, pytestCheckHook }: + +buildPythonPackage rec { + pname = "noiseprotocol"; + version = "0.3.1"; + + src = fetchFromGitHub { + owner = "plizonczyk"; + repo = "noiseprotocol"; + rev = "v${version}"; + sha256 = "1mk0rqpjifdv3v1cjwkdnjbrfmzzjm9f3qqs1r8vii4j2wvhm6am"; + }; + + propagatedBuildInputs = [ cryptography ]; + + checkInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "noise" ]; + + meta = with lib; { + description = "Noise Protocol Framework"; + homepage = "https://github.com/plizonczyk/noiseprotocol/"; + license = licenses.mit; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/development/python-modules/nose-cover3/default.nix b/pkgs/development/python-modules/nose-cover3/default.nix index 7f954f7ebca3..185270176acb 100644 --- a/pkgs/development/python-modules/nose-cover3/default.nix +++ b/pkgs/development/python-modules/nose-cover3/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , nose @@ -18,7 +18,7 @@ buildPythonPackage rec { # No tests included doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Coverage 3.x support for Nose"; homepage = "https://github.com/ask/nosecover3"; license = licenses.lgpl21; diff --git a/pkgs/development/python-modules/nose-cprof/default.nix b/pkgs/development/python-modules/nose-cprof/default.nix index aa3f0d37f092..4f90ee4be8b4 100644 --- a/pkgs/development/python-modules/nose-cprof/default.nix +++ b/pkgs/development/python-modules/nose-cprof/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , nose @@ -16,7 +16,7 @@ buildPythonPackage rec { buildInputs = [ nose ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A python nose plugin to profile using cProfile rather than the default Hotshot profiler"; homepage = "https://github.com/msherry/nose-cprof"; license = licenses.bsd0; diff --git a/pkgs/development/python-modules/nose-focus/default.nix b/pkgs/development/python-modules/nose-focus/default.nix index d7b13eb1059b..8e31867d85c0 100644 --- a/pkgs/development/python-modules/nose-focus/default.nix +++ b/pkgs/development/python-modules/nose-focus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, six, nose, nose-of-yeti +{ lib, stdenv, buildPythonPackage, fetchFromGitHub, six, nose, nose-of-yeti , nose-pattern-exclude, which }: buildPythonPackage rec { @@ -26,7 +26,7 @@ buildPythonPackage rec { ./test.sh ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Decorator and plugin to make nose focus on specific tests"; homepage = "https://nose-focus.readthedocs.io/en/latest/"; license = licenses.wtfpl; diff --git a/pkgs/development/python-modules/nose-of-yeti/default.nix b/pkgs/development/python-modules/nose-of-yeti/default.nix index b7fd1e241aaa..2bd63f3295d4 100644 --- a/pkgs/development/python-modules/nose-of-yeti/default.nix +++ b/pkgs/development/python-modules/nose-of-yeti/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, six, nose, fudge, should-dsl }: +{ lib, stdenv, buildPythonPackage, fetchFromGitHub, six, nose, fudge, should-dsl }: buildPythonPackage rec { pname = "nose-of-yeti"; @@ -21,7 +21,7 @@ buildPythonPackage rec { ./test.sh ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Nose plugin providing BDD dsl for python"; homepage = "https://github.com/delfick/nose-of-yeti"; license = licenses.mit; diff --git a/pkgs/development/python-modules/nose-pattern-exclude/default.nix b/pkgs/development/python-modules/nose-pattern-exclude/default.nix index 2170ac224d95..05a7102f1ae7 100644 --- a/pkgs/development/python-modules/nose-pattern-exclude/default.nix +++ b/pkgs/development/python-modules/nose-pattern-exclude/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, nose }: +{ lib, stdenv, buildPythonPackage, fetchPypi, nose }: buildPythonPackage rec { pname = "nose-pattern-exclude"; @@ -14,7 +14,7 @@ buildPythonPackage rec { # There are no tests doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Exclude specific files and directories from nosetests runs"; homepage = "https://github.com/jakubroztocil/nose-pattern-exclude"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/nose/default.nix b/pkgs/development/python-modules/nose/default.nix index a5ed49a29d73..2805b7c2ea19 100644 --- a/pkgs/development/python-modules/nose/default.nix +++ b/pkgs/development/python-modules/nose/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , python @@ -24,7 +24,7 @@ buildPythonPackage rec { ${python}/bin/${python.executable} selftest.py ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A unittest-based testing framework for python that makes writing and running tests easier"; homepage = "http://readthedocs.org/docs/nose/"; license = licenses.lgpl3; diff --git a/pkgs/development/python-modules/nose2/default.nix b/pkgs/development/python-modules/nose2/default.nix index 300ed80ca408..b815e223d82d 100644 --- a/pkgs/development/python-modules/nose2/default.nix +++ b/pkgs/development/python-modules/nose2/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , six @@ -23,7 +23,7 @@ buildPythonPackage rec { # AttributeError: 'module' object has no attribute 'collector' doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "nose2 is the next generation of nicer testing for Python"; homepage = "https://github.com/nose-devs/nose2"; license = licenses.bsd0; diff --git a/pkgs/development/python-modules/nose_progressive/default.nix b/pkgs/development/python-modules/nose_progressive/default.nix index b4683ef12cbf..b920bb40736c 100644 --- a/pkgs/development/python-modules/nose_progressive/default.nix +++ b/pkgs/development/python-modules/nose_progressive/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , nose @@ -22,7 +22,7 @@ buildPythonPackage rec { # fails with obscure error doCheck = !isPy3k; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/erikrose/nose-progressive"; description = "A testrunner with a progress bar and smarter tracebacks"; license = licenses.mit; diff --git a/pkgs/development/python-modules/nosejs/default.nix b/pkgs/development/python-modules/nosejs/default.nix index 9d30855c68e1..c165e87ff2ee 100644 --- a/pkgs/development/python-modules/nosejs/default.nix +++ b/pkgs/development/python-modules/nosejs/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , nose @@ -19,7 +19,7 @@ buildPythonPackage rec { nosetests -v ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://pypi.org/project/NoseJS/"; description = "A Nose plugin for integrating JavaScript tests into a Python test suite"; license = licenses.free; diff --git a/pkgs/development/python-modules/nosexcover/default.nix b/pkgs/development/python-modules/nosexcover/default.nix index 84cc4994b08a..36747a50aae7 100644 --- a/pkgs/development/python-modules/nosexcover/default.nix +++ b/pkgs/development/python-modules/nosexcover/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , coverage @@ -16,7 +16,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ coverage nose ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Extends nose.plugins.cover to add Cobertura-style XML reports"; homepage = "https://github.com/cmheisel/nose-xcover/"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/notify/default.nix b/pkgs/development/python-modules/notify/default.nix index 7e71eb8b3021..5621f0b24aff 100644 --- a/pkgs/development/python-modules/notify/default.nix +++ b/pkgs/development/python-modules/notify/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , python , pygobject2 @@ -32,7 +32,7 @@ stdenv.mkDerivation { postInstall = "cd $out/lib/python*/site-packages && ln -s gtk-*/pynotify ."; - meta = with stdenv.lib; { + meta = with lib; { description = "Python bindings for libnotify"; homepage = "http://www.galago-project.org/"; license = licenses.lgpl3; diff --git a/pkgs/development/python-modules/notmuch/2.nix b/pkgs/development/python-modules/notmuch/2.nix index 593eed6c2514..970928e03f40 100644 --- a/pkgs/development/python-modules/notmuch/2.nix +++ b/pkgs/development/python-modules/notmuch/2.nix @@ -1,4 +1,5 @@ -{ stdenv +{ lib +, stdenv , buildPythonPackage , notmuch , python @@ -13,7 +14,11 @@ buildPythonPackage { buildInputs = [ python notmuch cffi ]; - meta = with stdenv.lib; { + # no tests + doCheck = false; + pythonImportsCheck = [ "notmuch2" ]; + + meta = with lib; { description = "Pythonic bindings for the notmuch mail database using CFFI"; homepage = "https://notmuchmail.org/"; license = licenses.gpl3; diff --git a/pkgs/development/python-modules/notmuch/default.nix b/pkgs/development/python-modules/notmuch/default.nix index 4ae42b3390b5..609d4c78d5d7 100644 --- a/pkgs/development/python-modules/notmuch/default.nix +++ b/pkgs/development/python-modules/notmuch/default.nix @@ -1,4 +1,5 @@ -{ stdenv +{ lib +, stdenv , buildPythonPackage , notmuch , python @@ -16,7 +17,11 @@ buildPythonPackage { notmuch/globals.py ''; - meta = with stdenv.lib; { + # no tests + doCheck = false; + pythonImportsCheck = [ "notmuch" ]; + + meta = with lib; { description = "A Python wrapper around notmuch"; homepage = "https://notmuchmail.org/"; license = licenses.gpl3; diff --git a/pkgs/development/python-modules/ntplib/default.nix b/pkgs/development/python-modules/ntplib/default.nix index e87fc6292e74..266482a8ff28 100644 --- a/pkgs/development/python-modules/ntplib/default.nix +++ b/pkgs/development/python-modules/ntplib/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi }: @@ -15,7 +15,7 @@ buildPythonPackage rec { # Require networking doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Python NTP library"; homepage = "http://code.google.com/p/ntplib/"; license = licenses.mit; diff --git a/pkgs/development/python-modules/nuitka/default.nix b/pkgs/development/python-modules/nuitka/default.nix index 890180d0dec9..4056c8a440e7 100644 --- a/pkgs/development/python-modules/nuitka/default.nix +++ b/pkgs/development/python-modules/nuitka/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchurl , vmprof @@ -43,7 +43,7 @@ in buildPythonPackage rec { # Requires CPython disabled = isPyPy; - meta = with stdenv.lib; { + meta = with lib; { description = "Python compiler with full language support and CPython compatibility"; license = licenses.asl20; homepage = "https://nuitka.net/"; diff --git a/pkgs/development/python-modules/numericalunits/default.nix b/pkgs/development/python-modules/numericalunits/default.nix index f628daf833b4..0c71b065a32d 100644 --- a/pkgs/development/python-modules/numericalunits/default.nix +++ b/pkgs/development/python-modules/numericalunits/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , isPy3k @@ -15,7 +15,7 @@ buildPythonPackage rec { disabled = !isPy3k; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://pypi.python.org/pypi/numericalunits"; description = "A package that lets you define quantities with unit"; license = licenses.mit; diff --git a/pkgs/development/python-modules/nvchecker/default.nix b/pkgs/development/python-modules/nvchecker/default.nix index b675fa6f06be..832e281a9a1e 100644 --- a/pkgs/development/python-modules/nvchecker/default.nix +++ b/pkgs/development/python-modules/nvchecker/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchFromGitHub , pythonOlder @@ -46,7 +46,7 @@ buildPythonPackage rec { pytestFlagsArray = [ "-m 'not needs_net'" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/lilydjwg/nvchecker"; description = "New version checker for software"; license = licenses.mit; diff --git a/pkgs/development/python-modules/nwdiag/default.nix b/pkgs/development/python-modules/nwdiag/default.nix index 9e7d4958e3be..4676fdef0cdc 100644 --- a/pkgs/development/python-modules/nwdiag/default.nix +++ b/pkgs/development/python-modules/nwdiag/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, buildPythonPackage, pep8, nose, unittest2, docutils +{ lib, stdenv, fetchurl, buildPythonPackage, pep8, nose, unittest2, docutils , blockdiag, setuptools }: @@ -18,7 +18,7 @@ buildPythonPackage rec { # tests fail doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Generate network-diagram image from spec-text file (similar to Graphviz)"; homepage = "http://blockdiag.com/"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/nxt-python/default.nix b/pkgs/development/python-modules/nxt-python/default.nix index aae9b5f74370..4057ba1de8ad 100644 --- a/pkgs/development/python-modules/nxt-python/default.nix +++ b/pkgs/development/python-modules/nxt-python/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchgit , isPy3k @@ -25,7 +25,7 @@ buildPythonPackage { # Tests fail on Mac dependency doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Python driver/interface for Lego Mindstorms NXT robot"; homepage = "https://github.com/Eelviny/nxt-python"; license = licenses.gpl3; diff --git a/pkgs/development/python-modules/oath/default.nix b/pkgs/development/python-modules/oath/default.nix index a64eeb8e1036..158cf0368406 100644 --- a/pkgs/development/python-modules/oath/default.nix +++ b/pkgs/development/python-modules/oath/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi }: @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "1xqgcqgx6aa0j21hwsdb3aqpqhviwj756bcqjjjcm1h1aij11p6m"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Python implementation of the three main OATH specifications: HOTP, TOTP and OCRA"; homepage = "https://github.com/bdauvergne/python-oath"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/oauth/default.nix b/pkgs/development/python-modules/oauth/default.nix index 133640f66202..0e53eaec7c0e 100644 --- a/pkgs/development/python-modules/oauth/default.nix +++ b/pkgs/development/python-modules/oauth/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi }: @@ -15,7 +15,7 @@ buildPythonPackage rec { # No tests included in archive doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://code.google.com/archive/p/oauth/"; description = "Library for OAuth version 1.0a"; license = licenses.mit; diff --git a/pkgs/development/python-modules/oauth2/default.nix b/pkgs/development/python-modules/oauth2/default.nix index 8233b132344f..70b2e94e37ca 100644 --- a/pkgs/development/python-modules/oauth2/default.nix +++ b/pkgs/development/python-modules/oauth2/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , httplib2 @@ -21,7 +21,7 @@ buildPythonPackage rec { # ServerNotFoundError: Unable to find the server at oauth-sandbox.sevengoslings.net doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/simplegeo/python-oauth2"; description = "Library for OAuth version 1.0"; license = licenses.mit; diff --git a/pkgs/development/python-modules/oauthlib/3.1.nix b/pkgs/development/python-modules/oauthlib/3.1.nix index 185ef9748637..40501733e4c7 100644 --- a/pkgs/development/python-modules/oauthlib/3.1.nix +++ b/pkgs/development/python-modules/oauthlib/3.1.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , mock @@ -24,7 +24,7 @@ buildPythonPackage rec { py.test tests/ ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/idan/oauthlib"; description = "A generic, spec-compliant, thorough implementation of the OAuth request-signing logic"; maintainers = with maintainers; [ prikhi ]; diff --git a/pkgs/development/python-modules/oauthlib/default.nix b/pkgs/development/python-modules/oauthlib/default.nix index bc2c8c1094c0..df65547a256d 100644 --- a/pkgs/development/python-modules/oauthlib/default.nix +++ b/pkgs/development/python-modules/oauthlib/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchFromGitHub , mock @@ -27,7 +27,7 @@ buildPythonPackage rec { py.test tests/ ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/idan/oauthlib"; description = "A generic, spec-compliant, thorough implementation of the OAuth request-signing logic"; maintainers = with maintainers; [ prikhi ]; diff --git a/pkgs/development/python-modules/obfsproxy/default.nix b/pkgs/development/python-modules/obfsproxy/default.nix index c320f299ddb1..1dec57cafb44 100644 --- a/pkgs/development/python-modules/obfsproxy/default.nix +++ b/pkgs/development/python-modules/obfsproxy/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchgit , pyptlib @@ -27,7 +27,7 @@ buildPythonPackage rec { # No tests in archive doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "A pluggable transport proxy"; homepage = "https://www.torproject.org/projects/obfsproxy"; repositories.git = "https://git.torproject.org/pluggable-transports/obfsproxy.git"; diff --git a/pkgs/development/python-modules/objgraph/default.nix b/pkgs/development/python-modules/objgraph/default.nix index 79c448b5cced..8bb119bcb4bf 100644 --- a/pkgs/development/python-modules/objgraph/default.nix +++ b/pkgs/development/python-modules/objgraph/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , isPyPy @@ -31,7 +31,7 @@ buildPythonPackage rec { checkInputs = [ mock ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Draws Python object reference graphs with graphviz"; homepage = "https://mg.pov.lt/objgraph/"; license = licenses.mit; diff --git a/pkgs/development/python-modules/offtrac/default.nix b/pkgs/development/python-modules/offtrac/default.nix index be796b5c37df..edec161a133b 100644 --- a/pkgs/development/python-modules/offtrac/default.nix +++ b/pkgs/development/python-modules/offtrac/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi }: @@ -14,7 +14,7 @@ buildPythonPackage rec { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://fedorahosted.org/offtrac"; description = "Trac xmlrpc library"; license = licenses.gpl2; diff --git a/pkgs/development/python-modules/ofxclient/default.nix b/pkgs/development/python-modules/ofxclient/default.nix index 7eb4bef73504..5ef7060b7f66 100644 --- a/pkgs/development/python-modules/ofxclient/default.nix +++ b/pkgs/development/python-modules/ofxclient/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, +{ lib, stdenv, buildPythonPackage, fetchPypi, ofxhome, ofxparse, beautifulsoup4, lxml, keyring }: @@ -20,7 +20,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ ofxhome ofxparse beautifulsoup4 lxml keyring ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/captin411/ofxclient"; description = "OFX client for dowloading transactions from banks"; license = licenses.mit; diff --git a/pkgs/development/python-modules/ofxhome/default.nix b/pkgs/development/python-modules/ofxhome/default.nix index 518c34951fce..d9a28da18060 100644 --- a/pkgs/development/python-modules/ofxhome/default.nix +++ b/pkgs/development/python-modules/ofxhome/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, nose }: +{ lib, stdenv, buildPythonPackage, fetchPypi, nose }: buildPythonPackage rec { version = "0.3.3"; @@ -14,7 +14,7 @@ buildPythonPackage rec { # ImportError: No module named tests doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/captin411/ofxhome"; description = "ofxhome.com financial institution lookup REST client"; license = licenses.mit; diff --git a/pkgs/development/python-modules/ofxparse/default.nix b/pkgs/development/python-modules/ofxparse/default.nix index fbdafc291dc5..235875eec7ce 100644 --- a/pkgs/development/python-modules/ofxparse/default.nix +++ b/pkgs/development/python-modules/ofxparse/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , six @@ -17,7 +17,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six beautifulsoup4 lxml ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://sites.google.com/site/ofxparse"; description = "Tools for working with the OFX (Open Financial Exchange) file format"; license = licenses.mit; diff --git a/pkgs/development/python-modules/ofxtools/default.nix b/pkgs/development/python-modules/ofxtools/default.nix index da087e8b520f..8f280d1cfd45 100644 --- a/pkgs/development/python-modules/ofxtools/default.nix +++ b/pkgs/development/python-modules/ofxtools/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchFromGitHub , nose @@ -27,7 +27,7 @@ buildPythonPackage rec { HOME=$TMPDIR nosetests tests/*.py ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/csingley/ofxtools"; description = "Library for working with Open Financial Exchange (OFX) formatted data used by financial institutions"; license = licenses.mit; diff --git a/pkgs/development/python-modules/olefile/default.nix b/pkgs/development/python-modules/olefile/default.nix index 5667da7fbc6d..96c0a0b51bef 100644 --- a/pkgs/development/python-modules/olefile/default.nix +++ b/pkgs/development/python-modules/olefile/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi }: +{ lib, stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "olefile"; version = "0.46"; @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "133b031eaf8fd2c9399b78b8bc5b8fcbe4c31e85295749bb17a87cba8f3c3964"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Python package to parse, read and write Microsoft OLE2 files"; homepage = "https://www.decalage.info/python/olefileio"; # BSD like + reference to Pillow diff --git a/pkgs/development/python-modules/omegaconf/default.nix b/pkgs/development/python-modules/omegaconf/default.nix index 4219aad3865f..930a03678243 100644 --- a/pkgs/development/python-modules/omegaconf/default.nix +++ b/pkgs/development/python-modules/omegaconf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder +{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder , pytest, pytestrunner, pyyaml, six, pathlib2, isPy27 }: buildPythonPackage rec { @@ -16,7 +16,7 @@ buildPythonPackage rec { buildInputs = [ pytestrunner ]; propagatedBuildInputs = [ pyyaml six ] ++ stdenv.lib.optional isPy27 pathlib2; - meta = with stdenv.lib; { + meta = with lib; { description = "A framework for configuring complex applications"; homepage = "https://github.com/omry/omegaconf"; license = licenses.free; # prior bsd license (1988) diff --git a/pkgs/development/python-modules/onkyo-eiscp/default.nix b/pkgs/development/python-modules/onkyo-eiscp/default.nix index 117b8228d2e5..067db3a69fef 100644 --- a/pkgs/development/python-modules/onkyo-eiscp/default.nix +++ b/pkgs/development/python-modules/onkyo-eiscp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ lib, stdenv, buildPythonPackage, fetchPypi , docopt, netifaces }: buildPythonPackage rec { @@ -12,7 +12,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ docopt netifaces ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Control Onkyo receivers over ethernet"; homepage = "https://github.com/miracle2k/onkyo-eiscp"; license = licenses.mit; diff --git a/pkgs/development/python-modules/openant/default.nix b/pkgs/development/python-modules/openant/default.nix index a9598825dd00..374b7cb059d1 100644 --- a/pkgs/development/python-modules/openant/default.nix +++ b/pkgs/development/python-modules/openant/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchFromGitHub , pyusb @@ -28,7 +28,7 @@ buildPythonPackage { propagatedBuildInputs = [ pyusb ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/Tigge/openant"; description = "ANT and ANT-FS Python Library"; license = licenses.mit; diff --git a/pkgs/development/python-modules/openidc-client/default.nix b/pkgs/development/python-modules/openidc-client/default.nix index 9cfe714ef6f2..7d373c13a8a5 100644 --- a/pkgs/development/python-modules/openidc-client/default.nix +++ b/pkgs/development/python-modules/openidc-client/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, requests }: +{ lib, stdenv, buildPythonPackage, fetchPypi, requests }: buildPythonPackage rec { pname = "openidc-client"; @@ -12,7 +12,7 @@ buildPythonPackage rec { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "A CLI python OpenID Connect client with token caching and management"; homepage = "https://github.com/puiterwijk"; license = licenses.mit; diff --git a/pkgs/development/python-modules/openrazer/common.nix b/pkgs/development/python-modules/openrazer/common.nix index 67896c362f56..843380ebf21d 100644 --- a/pkgs/development/python-modules/openrazer/common.nix +++ b/pkgs/development/python-modules/openrazer/common.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub }: rec { version = "2.9.0"; @@ -8,7 +8,7 @@ rev = "v${version}"; sha256 = "1js7hq7zx5kj99brffrfaaah283ydkffmmrzsxv4mkd3nnd6rykk"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://openrazer.github.io/"; license = licenses.gpl2; maintainers = with maintainers; [ roelvandijk evanjs ]; diff --git a/pkgs/development/python-modules/openrazer/daemon.nix b/pkgs/development/python-modules/openrazer/daemon.nix index fb7b48e2266f..6c22d3bae5d0 100644 --- a/pkgs/development/python-modules/openrazer/daemon.nix +++ b/pkgs/development/python-modules/openrazer/daemon.nix @@ -1,4 +1,5 @@ -{ buildPythonApplication +{ lib +, buildPythonApplication , isPy3k , daemonize , dbus-python @@ -15,7 +16,7 @@ }: let - common = import ./common.nix { inherit stdenv fetchFromGitHub; }; + common = import ./common.nix { inherit stdenv lib fetchFromGitHub; }; in buildPythonApplication (common // rec { pname = "openrazer_daemon"; diff --git a/pkgs/development/python-modules/openrazer/pylib.nix b/pkgs/development/python-modules/openrazer/pylib.nix index 2f9ff467b2d9..52fe63318a3e 100644 --- a/pkgs/development/python-modules/openrazer/pylib.nix +++ b/pkgs/development/python-modules/openrazer/pylib.nix @@ -1,4 +1,5 @@ -{ buildPythonPackage +{ lib +, buildPythonPackage , dbus-python , fetchFromGitHub , numpy @@ -7,7 +8,7 @@ }: let - common = import ./common.nix { inherit stdenv fetchFromGitHub; }; + common = import ./common.nix { inherit stdenv lib fetchFromGitHub; }; in buildPythonPackage (common // rec { pname = "openrazer"; diff --git a/pkgs/development/python-modules/opensensemap-api/default.nix b/pkgs/development/python-modules/opensensemap-api/default.nix new file mode 100644 index 000000000000..d9f4cb6b1add --- /dev/null +++ b/pkgs/development/python-modules/opensensemap-api/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchPypi +, aiohttp +, async-timeout +}: + +buildPythonPackage rec { + pname = "opensensemap-api"; + version = "0.1.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "1f3iqwl8ynvrkdd961v2hjsbldwbr217pv5pay2m5f0m974bhblx"; + }; + + propagatedBuildInputs = [ + aiohttp + async-timeout + ]; + + # no tests are present + doCheck = false; + + pythonImportsCheck = [ "opensensemap_api" ]; + + meta = with lib; { + description = "OpenSenseMap API Python client"; + longDescription = '' + Python Client for interacting with the openSenseMap API. All + available information from the sensor can be retrieved. + ''; + homepage = "https://github.com/home-assistant-ecosystem/python-opensensemap-api"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/openwebifpy/default.nix b/pkgs/development/python-modules/openwebifpy/default.nix index 5cf070d610fb..60f94072681d 100644 --- a/pkgs/development/python-modules/openwebifpy/default.nix +++ b/pkgs/development/python-modules/openwebifpy/default.nix @@ -4,12 +4,12 @@ buildPythonPackage rec { pname = "openwebifpy"; - version = "3.1.1"; + version = "3.2.7"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "0zqa74i54ww9qjciiv8s58mxbs6vxq06cq5k4pxfarc0l75l4gh2"; + sha256 = "0n9vi6b0y8b41fd7m9p361y3qb5m3b9p9d8g4fasqi7yy4mw2hns"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/openwrt-luci-rpc/default.nix b/pkgs/development/python-modules/openwrt-luci-rpc/default.nix index 935a64b4186e..2e7666d3ab0b 100644 --- a/pkgs/development/python-modules/openwrt-luci-rpc/default.nix +++ b/pkgs/development/python-modules/openwrt-luci-rpc/default.nix @@ -10,11 +10,11 @@ with lib; buildPythonPackage rec { pname = "openwrt-luci-rpc"; - version = "1.1.6"; + version = "1.1.7"; src = fetchPypi { inherit pname version; - sha256 = "841c7fc956ad42825a2f2cd0cb2aa02005c3482b200ff7aaccd390345c9f3e18"; + sha256 = "8074c1ed24cdd1fadc5a99bd63d9313a0a44703714473ed781ed11e7fb45c96f"; }; postPatch = '' diff --git a/pkgs/development/python-modules/optuna/default.nix b/pkgs/development/python-modules/optuna/default.nix index 64ed54cafbe2..aa61b18291d6 100644 --- a/pkgs/development/python-modules/optuna/default.nix +++ b/pkgs/development/python-modules/optuna/default.nix @@ -84,6 +84,7 @@ buildPythonPackage rec { ''; meta = with lib; { + broken = true; # Dashboard broken, other build failures. description = "A hyperparameter optimization framework"; homepage = "https://optuna.org/"; license = licenses.mit; diff --git a/pkgs/development/python-modules/opuslib/default.nix b/pkgs/development/python-modules/opuslib/default.nix index aa7fc4add493..7db467f26d50 100644 --- a/pkgs/development/python-modules/opuslib/default.nix +++ b/pkgs/development/python-modules/opuslib/default.nix @@ -3,7 +3,7 @@ isPy27, libopus, nose, - stdenv, + lib, stdenv, substituteAll, }: @@ -29,7 +29,7 @@ buildPythonPackage rec { checkInputs = [ nose ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Python bindings to the libopus, IETF low-delay audio codec"; homepage = "https://github.com/orion-labs/opuslib"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/ordereddict/default.nix b/pkgs/development/python-modules/ordereddict/default.nix index 9c028777fc9f..e2931840a66a 100644 --- a/pkgs/development/python-modules/ordereddict/default.nix +++ b/pkgs/development/python-modules/ordereddict/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi }: @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "07qvy11nvgxpzarrni3wrww3vpc9yafgi2bch4j2vvvc42nb8d8w"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A drop-in substitute for Py2.7's new collections.OrderedDict that works in Python 2.4-2.6"; license = licenses.bsd3; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/python-modules/orderedmultidict/default.nix b/pkgs/development/python-modules/orderedmultidict/default.nix index 1a3ab347945a..7cb4871031b3 100644 --- a/pkgs/development/python-modules/orderedmultidict/default.nix +++ b/pkgs/development/python-modules/orderedmultidict/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, flake8, six, pythonOlder, importlib-metadata }: +{ lib, stdenv, buildPythonPackage, fetchPypi, flake8, six, pythonOlder, importlib-metadata }: buildPythonPackage rec { pname = "orderedmultidict"; @@ -16,7 +16,7 @@ buildPythonPackage rec { importlib-metadata ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Ordered Multivalue Dictionary."; homepage = "https://github.com/gruns/orderedmultidict"; license = licenses.publicDomain; diff --git a/pkgs/development/python-modules/orderedset/default.nix b/pkgs/development/python-modules/orderedset/default.nix index ac7b21361c97..aced6cf08536 100644 --- a/pkgs/development/python-modules/orderedset/default.nix +++ b/pkgs/development/python-modules/orderedset/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi }: +{ lib, stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "orderedset"; @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "0abf19w37kxypsj6v7dz79jj92y1kivjk2zivnrv7rw6bbxwrxdj"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "An Ordered Set implementation in Cython"; homepage = "https://pypi.python.org/pypi/orderedset"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/orm/default.nix b/pkgs/development/python-modules/orm/default.nix index dece359b0c0f..872a54076125 100644 --- a/pkgs/development/python-modules/orm/default.nix +++ b/pkgs/development/python-modules/orm/default.nix @@ -4,8 +4,9 @@ , databases , typesystem , aiosqlite -, pytest +, pytestCheckHook , pytestcov +, typing-extensions }: buildPythonPackage rec { @@ -26,13 +27,12 @@ buildPythonPackage rec { checkInputs = [ aiosqlite - pytest + pytestCheckHook pytestcov + typing-extensions ]; - checkPhase = '' - PYTHONPATH=$PYTHONPATH:. pytest - ''; + pythonImportsCheck = [ "orm" ]; meta = with lib; { description = "An async ORM"; diff --git a/pkgs/development/python-modules/osc/default.nix b/pkgs/development/python-modules/osc/default.nix index cae6a468c776..dad78727f2d1 100644 --- a/pkgs/development/python-modules/osc/default.nix +++ b/pkgs/development/python-modules/osc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, bashInteractive, urlgrabber +{ lib, stdenv, buildPythonPackage, fetchFromGitHub, bashInteractive, urlgrabber , m2crypto, rpm, chardet }: @@ -30,7 +30,7 @@ buildPythonPackage rec { EOF ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/openSUSE/osc"; description = "opensuse-commander with svn like handling"; maintainers = [ maintainers.peti ]; diff --git a/pkgs/development/python-modules/osmnx/default.nix b/pkgs/development/python-modules/osmnx/default.nix index 856c2bb45dbc..c624e262cf96 100755 --- a/pkgs/development/python-modules/osmnx/default.nix +++ b/pkgs/development/python-modules/osmnx/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, geopandas, descartes, matplotlib, networkx, numpy +{ lib, stdenv, buildPythonPackage, fetchFromGitHub, geopandas, descartes, matplotlib, networkx, numpy , pandas, requests, Rtree, shapely, pytest, coverage, coveralls, folium, scikitlearn, scipy}: buildPythonPackage rec { @@ -23,7 +23,7 @@ buildPythonPackage rec { # coverage run --source osmnx -m pytest --verbose #''; - meta = with stdenv.lib; { + meta = with lib; { description = "A package to easily download, construct, project, visualize, and analyze complex street networks from OpenStreetMap with NetworkX."; homepage = "https://github.com/gboeing/osmnx"; license = licenses.mit; diff --git a/pkgs/development/python-modules/osqp/default.nix b/pkgs/development/python-modules/osqp/default.nix index 88189493a62f..e2eb0139f123 100644 --- a/pkgs/development/python-modules/osqp/default.nix +++ b/pkgs/development/python-modules/osqp/default.nix @@ -4,6 +4,7 @@ , cmake , future , numpy +, qdldl , scipy # check inputs , pytestCheckHook @@ -11,11 +12,11 @@ buildPythonPackage rec { pname = "osqp"; - version = "0.6.1"; + version = "0.6.2"; src = fetchPypi { inherit pname version; - sha256 = "130frig5bznfacqp9jwbshmbqd2xw3ixdspsbkrwsvkdaab7kca7"; + sha256 = "262162039f6ad6c9ffee658541b18cfae8240b65edbde71d9b9e3af42fbfe4b3"; }; nativeBuildInputs = [ cmake ]; @@ -24,15 +25,22 @@ buildPythonPackage rec { propagatedBuildInputs = [ future numpy + qdldl scipy ]; pythonImportsCheck = [ "osqp" ]; checkInputs = [ pytestCheckHook ]; - dontUseSetuptoolsCheck = true; # don't run checks twice disabledTests = [ "mkl_" - "update_matrices_tests" # broken w/ scipy >= 1.5.0. Remove next release. See https://github.com/oxfordcontrol/osqp-python/issues/44 + ]; + pytestFlagsArray = [ + # These cannot collect b/c of circular dependency on cvxpy: https://github.com/oxfordcontrol/osqp-python/issues/50 + "--ignore=module/tests/basic_test.py" + "--ignore=module/tests/feasibility_test.py" + "--ignore=module/tests/polishing_test.py" + "--ignore=module/tests/unconstrained_test.py" + "--ignore=module/tests/update_matrices_test.py" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/ovito/default.nix b/pkgs/development/python-modules/ovito/default.nix index 5e5847dce033..a33e5d19b44e 100644 --- a/pkgs/development/python-modules/ovito/default.nix +++ b/pkgs/development/python-modules/ovito/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitLab , cmake , ffmpeg @@ -15,26 +15,25 @@ }: stdenv.mkDerivation rec { - version = "3.3.1"; + version = "3.3.5"; pname = "ovito"; src = fetchFromGitLab { owner = "stuko"; repo = pname; rev = "v${version}"; - sha256 = "0rm1qxa0fanaaqg0idr6rf2s2xlbyn1dzjzwh3rddy9mgl60lj2h"; + sha256 = "2tptLK0RU0afSFFE7uzL8bZ5j+nyRyh97ujJAHFh0wQ="; }; - buildInputs = [ cmake ffmpeg netcdf qscintilla zlib boost zlib git fftw hdf5 libssh qt5.qtbase qt5.qtsvg ]; + nativeBuildInputs = [ cmake git ]; + buildInputs = [ ffmpeg netcdf qscintilla zlib boost zlib fftw hdf5 libssh qt5.qtbase qt5.qtsvg ]; propagatedBuildInputs = with python.pkgs; [ sphinx numpy sip pyqt5 matplotlib ase ]; - enableParallelBuilding = true; - - meta = with stdenv.lib; { + meta = with lib; { description = "Scientific visualization and analysis software for atomistic simulation data"; homepage = "https://www.ovito.org"; - license = licenses.gpl3; + license = with licenses; [ gpl3Only mit ]; maintainers = with maintainers; [ costrouc ]; # ensures not built on hydra # https://github.com/NixOS/nixpkgs/pull/46846#issuecomment-436388048 diff --git a/pkgs/development/python-modules/owslib/default.nix b/pkgs/development/python-modules/owslib/default.nix index c82668008eab..92a78ce0cf3f 100644 --- a/pkgs/development/python-modules/owslib/default.nix +++ b/pkgs/development/python-modules/owslib/default.nix @@ -1,11 +1,11 @@ { lib, buildPythonPackage, fetchPypi, dateutil, requests, pytz, pyproj , pytest, pyyaml } : buildPythonPackage rec { pname = "OWSLib"; - version = "0.20.0"; + version = "0.21.0"; src = fetchPypi { inherit pname version; - sha256 = "334988857b260c8cdf1f6698d07eab61839c51acb52ee10eed1275439200a40e"; + sha256 = "408d40b3a6a210bcb3f3609b607960eeedaa63ffd574dde7896906691c354814"; }; buildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/packaging/2.nix b/pkgs/development/python-modules/packaging/2.nix index 36764e64b860..5d841eb4fb13 100644 --- a/pkgs/development/python-modules/packaging/2.nix +++ b/pkgs/development/python-modules/packaging/2.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , pyparsing @@ -31,7 +31,7 @@ buildPythonPackage rec { # Prevent circular dependency doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Core utilities for Python packages"; homepage = "https://github.com/pypa/packaging"; license = [ licenses.bsd2 licenses.asl20 ]; diff --git a/pkgs/development/python-modules/packaging/default.nix b/pkgs/development/python-modules/packaging/default.nix index 061e8edaac6f..973e516f5a90 100644 --- a/pkgs/development/python-modules/packaging/default.nix +++ b/pkgs/development/python-modules/packaging/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , pyparsing @@ -36,7 +36,7 @@ buildPythonPackage rec { # Prevent circular dependency doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Core utilities for Python packages"; homepage = "https://github.com/pypa/packaging"; license = [ licenses.bsd2 licenses.asl20 ]; diff --git a/pkgs/development/python-modules/pagelabels/default.nix b/pkgs/development/python-modules/pagelabels/default.nix index d7adc9b17c04..5daa60f475d3 100644 --- a/pkgs/development/python-modules/pagelabels/default.nix +++ b/pkgs/development/python-modules/pagelabels/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, pdfrw }: +{ lib, stdenv, buildPythonPackage, fetchPypi, pdfrw }: buildPythonPackage rec { pname = "pagelabels"; @@ -14,7 +14,7 @@ buildPythonPackage rec { # upstream doesn't contain tests doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Python library to manipulate PDF page labels."; homepage = "https://github.com/lovasoa/pagelabels-py"; maintainers = with maintainers; [ teto ]; diff --git a/pkgs/development/python-modules/pagerduty/default.nix b/pkgs/development/python-modules/pagerduty/default.nix index 00236f3c2345..ebe2c8b5854d 100644 --- a/pkgs/development/python-modules/pagerduty/default.nix +++ b/pkgs/development/python-modules/pagerduty/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , isPy3k @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "e8c237239d3ffb061069aa04fc5b3d8ae4fb0af16a9713fe0977f02261d323e9"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/samuel/python-pagerduty"; description = "Library for the PagerDuty service API"; license = licenses.bsd0; diff --git a/pkgs/development/python-modules/palettable/default.nix b/pkgs/development/python-modules/palettable/default.nix index f96e05950b80..d61973aa3bfa 100644 --- a/pkgs/development/python-modules/palettable/default.nix +++ b/pkgs/development/python-modules/palettable/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, pytest }: +{ lib, stdenv, buildPythonPackage, fetchPypi, pytest }: buildPythonPackage rec { pname = "palettable"; @@ -15,7 +15,7 @@ buildPythonPackage rec { pytest ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A library of color palettes"; homepage = "https://jiffyclub.github.io/palettable/"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pamela/default.nix b/pkgs/development/python-modules/pamela/default.nix index 9a55719d77f3..40597c36b589 100644 --- a/pkgs/development/python-modules/pamela/default.nix +++ b/pkgs/development/python-modules/pamela/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , pkgs @@ -21,7 +21,7 @@ buildPythonPackage rec { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "PAM interface using ctypes"; homepage = "https://github.com/minrk/pamela"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pamqp/default.nix b/pkgs/development/python-modules/pamqp/default.nix index 8353e8d7895f..2e8e4500f247 100644 --- a/pkgs/development/python-modules/pamqp/default.nix +++ b/pkgs/development/python-modules/pamqp/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , mock @@ -19,7 +19,7 @@ buildPythonPackage rec { buildInputs = [ mock nose pep8 pylint mccabe ]; - meta = with stdenv.lib; { + meta = with lib; { description = "RabbitMQ Focused AMQP low-level library"; homepage = "https://pypi.python.org/pypi/pamqp"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/pandas-datareader/default.nix b/pkgs/development/python-modules/pandas-datareader/default.nix index 92adfb9d3f16..c4bf9c140df3 100644 --- a/pkgs/development/python-modules/pandas-datareader/default.nix +++ b/pkgs/development/python-modules/pandas-datareader/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , pytestCheckHook @@ -24,7 +24,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pandas lxml requests ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Up to date remote data access for pandas, works for multiple versions of pandas"; homepage = "https://github.com/pydata/pandas-datareader"; license= licenses.bsd3; diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix index 46348deca8d6..b9865fe628b0 100644 --- a/pkgs/development/python-modules/pandas/default.nix +++ b/pkgs/development/python-modules/pandas/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , python @@ -85,7 +85,6 @@ in buildPythonPackage rec { doCheck = !stdenv.isAarch64; # upstream doesn't test this architecture pytestFlagsArray = [ - "$out/${python.sitePackages}/pandas" "--skip-slow" "--skip-network" ]; @@ -120,7 +119,10 @@ in buildPythonPackage rec { "test_clipboard" ]; + # tests have relative paths, and need to reference compiled C extensions + # so change directory where `import .test` is able to be resolved preCheck = '' + cd $out/${python.sitePackages}/pandas export LC_ALL="en_US.UTF-8" PYTHONPATH=$out/${python.sitePackages}:$PYTHONPATH '' @@ -134,7 +136,7 @@ in buildPythonPackage rec { export PATH=$(pwd):$PATH ''; - meta = with stdenv.lib; { + meta = with lib; { # https://github.com/pandas-dev/pandas/issues/14866 # pandas devs are no longer testing i686 so safer to assume it's broken broken = stdenv.isi686; diff --git a/pkgs/development/python-modules/pandocfilters/default.nix b/pkgs/development/python-modules/pandocfilters/default.nix index 848e59313af9..d31bc2657c93 100644 --- a/pkgs/development/python-modules/pandocfilters/default.nix +++ b/pkgs/development/python-modules/pandocfilters/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi }: @@ -15,7 +15,7 @@ buildPythonPackage rec { # No tests available doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "A python module for writing pandoc filters, with a collection of examples"; homepage = "https://github.com/jgm/pandocfilters"; license = licenses.mit; diff --git a/pkgs/development/python-modules/paperspace/default.nix b/pkgs/development/python-modules/paperspace/default.nix index fad394a5339b..4553b253819f 100644 --- a/pkgs/development/python-modules/paperspace/default.nix +++ b/pkgs/development/python-modules/paperspace/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage +{ lib, stdenv, fetchPypi, buildPythonPackage , boto3, requests, gradient_statsd, terminaltables , click-completion , click-didyoumean, click-help-colors , colorama, requests_toolbelt, gradient_sdk, progressbar2 @@ -21,7 +21,7 @@ buildPythonPackage rec { # tries to use /homeless-shelter to mimic container usage, etc doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Python API for Paperspace Cloud"; homepage = "https://paperspace.com"; license = licenses.isc; diff --git a/pkgs/development/python-modules/parameterized/default.nix b/pkgs/development/python-modules/parameterized/default.nix index 77529c059afd..16925bd1286b 100644 --- a/pkgs/development/python-modules/parameterized/default.nix +++ b/pkgs/development/python-modules/parameterized/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage, nose, mock, glibcLocales, isPy3k, isPy38 }: +{ lib, stdenv, fetchPypi, buildPythonPackage, nose, mock, glibcLocales, isPy3k, isPy38 }: buildPythonPackage rec { pname = "parameterized"; @@ -19,7 +19,7 @@ buildPythonPackage rec { LC_ALL="en_US.UTF-8" nosetests -v ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Parameterized testing with any Python test framework"; homepage = "https://pypi.python.org/pypi/parameterized"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/paramz/default.nix b/pkgs/development/python-modules/paramz/default.nix index 63014647880d..65cc79745caa 100644 --- a/pkgs/development/python-modules/paramz/default.nix +++ b/pkgs/development/python-modules/paramz/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, numpy, scipy, six, decorator, nose }: +{ lib, stdenv, buildPythonPackage, fetchPypi, numpy, scipy, six, decorator, nose }: buildPythonPackage rec { pname = "paramz"; @@ -17,7 +17,7 @@ buildPythonPackage rec { nosetests -v paramz/tests ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Parameterization framework for parameterized model creation and handling"; homepage = "https://github.com/sods/paramz"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/parse-type/default.nix b/pkgs/development/python-modules/parse-type/default.nix index cbf4ee0836e4..e787c65fc118 100644 --- a/pkgs/development/python-modules/parse-type/default.nix +++ b/pkgs/development/python-modules/parse-type/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi +{ lib, stdenv, fetchPypi , buildPythonPackage, pythonOlder , pytest, pytestrunner , parse, six, enum34 @@ -20,7 +20,7 @@ buildPythonPackage rec { py.test tests ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/jenisys/parse_type"; description = "Simplifies to build parse types based on the parse module"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/parse/default.nix b/pkgs/development/python-modules/parse/default.nix index 7b160237d5eb..d72e607bc410 100644 --- a/pkgs/development/python-modules/parse/default.nix +++ b/pkgs/development/python-modules/parse/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi +{ lib, stdenv, fetchPypi , buildPythonPackage, python }: buildPythonPackage rec { @@ -14,7 +14,7 @@ buildPythonPackage rec { ${python.interpreter} test_parse.py ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/r1chardj0n3s/parse"; description = "parse() is the opposite of format()"; license = licenses.bsdOriginal; diff --git a/pkgs/development/python-modules/parsedatetime/default.nix b/pkgs/development/python-modules/parsedatetime/default.nix index 0b7d5cd6fb4c..1f98940fff06 100644 --- a/pkgs/development/python-modules/parsedatetime/default.nix +++ b/pkgs/development/python-modules/parsedatetime/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , isPy27 @@ -20,7 +20,7 @@ buildPythonPackage rec { buildInputs = [ pytest pytestrunner ]; propagatedBuildInputs = [ future ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Parse human-readable date/time text"; homepage = "https://github.com/bear/parsedatetime"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/parsimonious/default.nix b/pkgs/development/python-modules/parsimonious/default.nix index 69e6d1d2bb2c..d41953246db9 100644 --- a/pkgs/development/python-modules/parsimonious/default.nix +++ b/pkgs/development/python-modules/parsimonious/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , nose @@ -17,7 +17,10 @@ buildPythonPackage rec { checkInputs = [ nose ]; propagatedBuildInputs = [ six ]; - meta = with stdenv.lib; { + # performance tests tend to fail sometimes + NOSE_EXCLUDE = "test_benchmarks"; + + meta = with lib; { homepage = "https://github.com/erikrose/parsimonious"; description = "Fast arbitrary-lookahead parser written in pure Python"; license = licenses.mit; diff --git a/pkgs/development/python-modules/paste/default.nix b/pkgs/development/python-modules/paste/default.nix index 6bed8144a21e..a29deed503ed 100644 --- a/pkgs/development/python-modules/paste/default.nix +++ b/pkgs/development/python-modules/paste/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , six @@ -25,7 +25,7 @@ buildPythonPackage rec { py.test -k "not test_cgiapp and not test_proxy" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Tools for using a Web Server Gateway Interface stack"; homepage = "http://pythonpaste.org/"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pastedeploy/default.nix b/pkgs/development/python-modules/pastedeploy/default.nix index 21149da917f1..950b232fa7e4 100644 --- a/pkgs/development/python-modules/pastedeploy/default.nix +++ b/pkgs/development/python-modules/pastedeploy/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , pytestrunner @@ -22,7 +22,7 @@ buildPythonPackage rec { # should be included with versions > 2.0.1 doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Load, configure, and compose WSGI applications and servers"; homepage = "http://pythonpaste.org/deploy/"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pastescript/default.nix b/pkgs/development/python-modules/pastescript/default.nix index ce012c3d102a..57dbb7b9352e 100644 --- a/pkgs/development/python-modules/pastescript/default.nix +++ b/pkgs/development/python-modules/pastescript/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , nose @@ -22,7 +22,7 @@ buildPythonPackage rec { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "A pluggable command-line frontend, including commands to setup package file layouts"; homepage = "https://github.com/cdent/pastescript/"; license = licenses.mit; diff --git a/pkgs/development/python-modules/patator/default.nix b/pkgs/development/python-modules/patator/default.nix index 81d9e50b28ff..96ed85d7bcee 100644 --- a/pkgs/development/python-modules/patator/default.nix +++ b/pkgs/development/python-modules/patator/default.nix @@ -1,22 +1,28 @@ -{ stdenv, buildPythonPackage, isPy3k, fetchPypi, - paramiko, pycurl, ajpy, pyopenssl, cx_oracle, mysqlclient, - psycopg2, pycrypto, dnspython, ipy, pysnmp, pyasn1 }: +{ lib, stdenv, buildPythonPackage, isPy27, fetchPypi +, paramiko, pycurl, ajpy, impacket, pyopenssl, cx_oracle, mysqlclient +, psycopg2, pycrypto, dnspython, ipy, pysnmp, pyasn1, pysqlcipher3 }: buildPythonPackage rec { pname = "patator"; version = "0.9"; - disabled = !(isPy3k); + disabled = isPy27; src = fetchPypi { inherit pname version; sha256 = "68cb24bdc3042ee0d47a288b19a8b99a6c54bdbd4ddf0c5817d9b9ac0a0d8a15"; }; + postPatch = '' + substituteInPlace requirements.txt \ + --replace psycopg2-binary psycopg2 + ''; + propagatedBuildInputs = [ paramiko pycurl ajpy + impacket pyopenssl cx_oracle mysqlclient @@ -26,15 +32,16 @@ buildPythonPackage rec { ipy pysnmp pyasn1 + pysqlcipher3 ]; - # No tests provided by patator + # tests require docker-compose and vagrant doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "multi-purpose brute-forcer"; homepage = "https://github.com/lanjelot/patator"; license = licenses.gpl2; - maintainers = with maintainers; [ y0no ]; + maintainers = with maintainers; [ y0no SuperSandro2000 ]; }; } diff --git a/pkgs/development/python-modules/patch-ng/default.nix b/pkgs/development/python-modules/patch-ng/default.nix index 7cab25707984..981dc067fe7e 100644 --- a/pkgs/development/python-modules/patch-ng/default.nix +++ b/pkgs/development/python-modules/patch-ng/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi }: @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "1kja1nn08w0k8k6j4kad48k581hh9drvjjb8x60v9j13sxdvqyk2"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Library to parse and apply unified diffs."; homepage = "https://github.com/conan-io/python-patch"; license = licenses.mit; diff --git a/pkgs/development/python-modules/patch/default.nix b/pkgs/development/python-modules/patch/default.nix index a4af8319f622..8d7e78c6c27c 100644 --- a/pkgs/development/python-modules/patch/default.nix +++ b/pkgs/development/python-modules/patch/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchzip }: @@ -16,7 +16,7 @@ buildPythonPackage rec { # No tests included in archive doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "A library to parse and apply unified diffs"; homepage = "https://github.com/techtonik/python-patch/"; license = licenses.mit; diff --git a/pkgs/development/python-modules/path-and-address/default.nix b/pkgs/development/python-modules/path-and-address/default.nix index f30a6ddd4083..9512b0eb0b88 100644 --- a/pkgs/development/python-modules/path-and-address/default.nix +++ b/pkgs/development/python-modules/path-and-address/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchFromGitHub , pytest @@ -21,7 +21,7 @@ buildPythonPackage rec { py.test ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Functions for server CLI applications used by humans"; homepage = "https://github.com/joeyespo/path-and-address"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pathos/default.nix b/pkgs/development/python-modules/pathos/default.nix index 2b9134750fe2..778070906022 100644 --- a/pkgs/development/python-modules/pathos/default.nix +++ b/pkgs/development/python-modules/pathos/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , dill @@ -21,7 +21,7 @@ buildPythonPackage rec { # Require network doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Parallel graph management and execution in heterogeneous computing"; homepage = "https://github.com/uqfoundation/pathos/"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/pathtools/default.nix b/pkgs/development/python-modules/pathtools/default.nix index 75901743c7e4..57fff82a81d7 100644 --- a/pkgs/development/python-modules/pathtools/default.nix +++ b/pkgs/development/python-modules/pathtools/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi }: @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "1h7iam33vwxk8bvslfj4qlsdprdnwf8bvzhqh3jq5frr391cadbw"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Pattern matching and various utilities for file systems paths"; homepage = "https://github.com/gorakhargosh/pathtools"; license = licenses.mit; diff --git a/pkgs/development/python-modules/paver/default.nix b/pkgs/development/python-modules/paver/default.nix index ec4a40fec1b4..5d01df22b6d5 100644 --- a/pkgs/development/python-modules/paver/default.nix +++ b/pkgs/development/python-modules/paver/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , nose @@ -23,7 +23,7 @@ buildPythonPackage rec { # the tests do not pass doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "A Python-based build/distribution/deployment scripting tool"; homepage = "https://github.com/paver/paver"; maintainers = with maintainers; [ lovek323 ]; diff --git a/pkgs/development/python-modules/pbkdf2/default.nix b/pkgs/development/python-modules/pbkdf2/default.nix index c83cada08f2e..18a2b9b95a3a 100644 --- a/pkgs/development/python-modules/pbkdf2/default.nix +++ b/pkgs/development/python-modules/pbkdf2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi }: +{ lib, stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "pbkdf2"; @@ -12,7 +12,7 @@ buildPythonPackage rec { # ImportError: No module named test doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { maintainers = with maintainers; [ domenkozar ]; }; } diff --git a/pkgs/development/python-modules/pc-ble-driver-py/default.nix b/pkgs/development/python-modules/pc-ble-driver-py/default.nix index e85df06b5002..6a12eea1b00c 100644 --- a/pkgs/development/python-modules/pc-ble-driver-py/default.nix +++ b/pkgs/development/python-modules/pc-ble-driver-py/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, git, swig, boost, udev, pc-ble-driver, pythonOlder +{ lib, stdenv, fetchFromGitHub, cmake, git, swig, boost, udev, pc-ble-driver, pythonOlder , buildPythonPackage, enum34, wrapt, future, setuptools, scikit-build, pythonAtLeast }: buildPythonPackage rec { @@ -22,7 +22,7 @@ buildPythonPackage rec { dontUseCmakeConfigure = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Bluetooth Low Energy nRF5 SoftDevice serialization"; homepage = "https://github.com/NordicSemiconductor/pc-ble-driver-py"; license = licenses.unfreeRedistributable; diff --git a/pkgs/development/python-modules/pcpp/default.nix b/pkgs/development/python-modules/pcpp/default.nix index f57798c40a84..aea7ff0fcdaf 100644 --- a/pkgs/development/python-modules/pcpp/default.nix +++ b/pkgs/development/python-modules/pcpp/default.nix @@ -1,6 +1,6 @@ { buildPythonPackage , fetchFromGitHub -, stdenv +, lib, stdenv }: buildPythonPackage rec { @@ -15,7 +15,7 @@ buildPythonPackage rec { fetchSubmodules = true; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/ned14/pcpp"; description = "A C99 preprocessor written in pure Python"; license = licenses.bsd0; diff --git a/pkgs/development/python-modules/pdf2image/default.nix b/pkgs/development/python-modules/pdf2image/default.nix index b9342821b209..adc43ef4c2ed 100644 --- a/pkgs/development/python-modules/pdf2image/default.nix +++ b/pkgs/development/python-modules/pdf2image/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, pillow, poppler_utils }: +{ lib, stdenv, buildPythonPackage, fetchPypi, pillow, poppler_utils }: buildPythonPackage rec { pname = "pdf2image"; @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "066527e1bf954762fb4369c677ae3bc15f2ce8707eee830cccef8471fde736d7"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A python module that wraps the pdftoppm utility to convert PDF to PIL Image object"; homepage = "https://github.com/Belval/pdf2image"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pdfkit/default.nix b/pkgs/development/python-modules/pdfkit/default.nix index dc9d33ddf0df..10bc09e8ca92 100644 --- a/pkgs/development/python-modules/pdfkit/default.nix +++ b/pkgs/development/python-modules/pdfkit/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi }: @@ -15,7 +15,7 @@ buildPythonPackage rec { # tests are not distributed doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://pypi.python.org/pypi/pdfkit"; description = "Wkhtmltopdf python wrapper to convert html to pdf using the webkit rendering engine and qt"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pdfminer_six/default.nix b/pkgs/development/python-modules/pdfminer_six/default.nix index 9bc8f8915701..9a659eebe330 100644 --- a/pkgs/development/python-modules/pdfminer_six/default.nix +++ b/pkgs/development/python-modules/pdfminer_six/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, isPy3k, cryptography, chardet, nose, sortedcontainers }: +{ lib, stdenv, buildPythonPackage, fetchFromGitHub, isPy3k, cryptography, chardet, nose, sortedcontainers }: buildPythonPackage rec { pname = "pdfminer_six"; @@ -21,7 +21,7 @@ buildPythonPackage rec { nosetests ''; - meta = with stdenv.lib; { + meta = with lib; { description = "PDF parser and analyzer"; homepage = "https://github.com/pdfminer/pdfminer.six"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pdfposter/default.nix b/pkgs/development/python-modules/pdfposter/default.nix index 43e2f1f57f75..0a21ed1e4999 100644 --- a/pkgs/development/python-modules/pdfposter/default.nix +++ b/pkgs/development/python-modules/pdfposter/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, pypdf2 }: +{ lib, stdenv, buildPythonPackage, fetchPypi, pypdf2 }: buildPythonPackage rec { pname = "pdftools.pdfposter"; @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "0c1avpbr9q53yzq5ar2x485rmp9d0l3z27aham32bg7gplzd7w0j"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Split large pages of a PDF into smaller ones for poster printing"; homepage = "https://pdfposter.readthedocs.io"; license = licenses.gpl3; diff --git a/pkgs/development/python-modules/pdfrw/default.nix b/pkgs/development/python-modules/pdfrw/default.nix index 15b8a8dc8d6b..49abb3751c91 100644 --- a/pkgs/development/python-modules/pdfrw/default.nix +++ b/pkgs/development/python-modules/pdfrw/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi }: +{ lib, stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "pdfrw"; @@ -12,7 +12,7 @@ buildPythonPackage rec { # tests require the extra download of github.com/pmaupin/static_pdfs doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "pdfrw is a pure Python library that reads and writes PDFs."; homepage = "https://github.com/pmaupin/pdfrw"; maintainers = with maintainers; [ teto ]; diff --git a/pkgs/development/python-modules/pdfx/default.nix b/pkgs/development/python-modules/pdfx/default.nix index d2397fb5c82b..97dee7e75705 100644 --- a/pkgs/development/python-modules/pdfx/default.nix +++ b/pkgs/development/python-modules/pdfx/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, pdfminer, chardet, pytest }: +{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pdfminer, chardet, pytest }: buildPythonPackage rec { pname = "pdfx"; @@ -24,7 +24,7 @@ buildPythonPackage rec { py.test ''; - meta = with stdenv.lib; { + meta = with lib; { inherit (src.meta) homepage; description = "Extract references (pdf, url, doi, arxiv) and metadata from a PDF"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/pecan/default.nix b/pkgs/development/python-modules/pecan/default.nix index 332f5153a981..7303a9b15045 100644 --- a/pkgs/development/python-modules/pecan/default.nix +++ b/pkgs/development/python-modules/pecan/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchPypi , buildPythonPackage , isPy27 @@ -51,7 +51,7 @@ buildPythonPackage rec { "--pyargs pecan " ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Pecan"; homepage = "http://www.pecanpy.org/"; changelog = "https://pecan.readthedocs.io/en/latest/changes.html"; diff --git a/pkgs/development/python-modules/pelican/default.nix b/pkgs/development/python-modules/pelican/default.nix index 30d6546d5705..0b103b780c08 100644 --- a/pkgs/development/python-modules/pelican/default.nix +++ b/pkgs/development/python-modules/pelican/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, isPy27 +{ lib, stdenv, buildPythonPackage, fetchFromGitHub, isPy27 , glibcLocales, git , mock, nose, markdown, lxml, typogrify , jinja2, pygments, docutils, pytz, unidecode, six, dateutil, feedgenerator @@ -67,7 +67,7 @@ buildPythonPackage rec { patchShebangs $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A tool to generate a static blog from reStructuredText or Markdown input files"; homepage = "http://getpelican.com/"; license = licenses.agpl3; diff --git a/pkgs/development/python-modules/pep257/default.nix b/pkgs/development/python-modules/pep257/default.nix index 8f3a1e0ea8bd..296b55eec125 100644 --- a/pkgs/development/python-modules/pep257/default.nix +++ b/pkgs/development/python-modules/pep257/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchurl, pytest, mock }: +{ lib, stdenv, buildPythonPackage, fetchurl, pytest, mock }: buildPythonPackage rec { pname = "pep257"; version = "0.7.0"; @@ -14,7 +14,7 @@ buildPythonPackage rec { py.test ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/GreenSteam/pep257/"; description = "Python docstring style checker"; longDescription = "Static analysis tool for checking compliance with Python PEP 257."; diff --git a/pkgs/development/python-modules/pep517/default.nix b/pkgs/development/python-modules/pep517/default.nix index a56366569844..90dc50461990 100644 --- a/pkgs/development/python-modules/pep517/default.nix +++ b/pkgs/development/python-modules/pep517/default.nix @@ -14,12 +14,12 @@ buildPythonPackage rec { pname = "pep517"; - version = "0.8.2"; + version = "0.9.1"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "8e6199cf1288d48a0c44057f112acf18aa5ebabbf73faa242f598fbe145ba29e"; + sha256 = "0zqidxah03qpnp6zkg3zd1kmd5f79hhdsfmlc0cldaniy80qddxf"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pep8/default.nix b/pkgs/development/python-modules/pep8/default.nix index 12176b97380d..8ef3bfea0f5d 100644 --- a/pkgs/development/python-modules/pep8/default.nix +++ b/pkgs/development/python-modules/pep8/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi }: @@ -15,7 +15,7 @@ buildPythonPackage rec { # FAIL: test_checkers_testsuite (testsuite.test_all.Pep8TestCase) doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://pep8.readthedocs.org/"; description = "Python style guide checker"; license = licenses.mit; diff --git a/pkgs/development/python-modules/peppercorn/default.nix b/pkgs/development/python-modules/peppercorn/default.nix index 51114a591a57..6caf61b0cd0d 100644 --- a/pkgs/development/python-modules/peppercorn/default.nix +++ b/pkgs/development/python-modules/peppercorn/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi }: @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "1ip4bfwcpwkq9hz2dai14k2cyabvwrnvcvrcmzxmqm04g8fnimwn"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A library for converting a token stream into a data structure for use in web form posts"; homepage = "https://docs.pylonsproject.org/projects/peppercorn/en/latest/"; maintainers = with maintainers; [ domenkozar ]; diff --git a/pkgs/development/python-modules/persisting-theory/default.nix b/pkgs/development/python-modules/persisting-theory/default.nix index ca14f80868c8..86bae927d9ff 100644 --- a/pkgs/development/python-modules/persisting-theory/default.nix +++ b/pkgs/development/python-modules/persisting-theory/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ lib, stdenv, buildPythonPackage, fetchPypi , nose }: @@ -15,7 +15,7 @@ buildPythonPackage rec { checkPhase = "nosetests"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://code.eliotberriot.com/eliotberriot/persisting-theory"; description = "Automate data discovering and access inside a list of packages"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/pex/default.nix b/pkgs/development/python-modules/pex/default.nix index 0bbbf551f280..1d7de0088a84 100644 --- a/pkgs/development/python-modules/pex/default.nix +++ b/pkgs/development/python-modules/pex/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , setuptools @@ -18,7 +18,7 @@ buildPythonPackage rec { # A few more dependencies I don't want to handle right now... doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "A library and tool for generating .pex (Python EXecutable) files"; homepage = "https://github.com/pantsbuild/pex"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/pexif/default.nix b/pkgs/development/python-modules/pexif/default.nix index f3086b6b0553..326dde176ae6 100644 --- a/pkgs/development/python-modules/pexif/default.nix +++ b/pkgs/development/python-modules/pexif/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi }: @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "45a3be037c7ba8b64bbfc48f3586402cc17de55bb9d7357ef2bc99954a18da3f"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A module for editing JPEG EXIF data"; homepage = "http://www.benno.id.au/code/pexif/"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pg8000/1_12.nix b/pkgs/development/python-modules/pg8000/1_12.nix index bc4ff9f4f031..d84bb2014b80 100644 --- a/pkgs/development/python-modules/pg8000/1_12.nix +++ b/pkgs/development/python-modules/pg8000/1_12.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , pytz @@ -16,7 +16,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pytz six ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/tlocke/pg8000"; description = "PostgreSQL interface library, for asyncio"; maintainers = with maintainers; [ domenkozar ]; diff --git a/pkgs/development/python-modules/pg8000/default.nix b/pkgs/development/python-modules/pg8000/default.nix index 0c9459772186..8f63e00e7997 100644 --- a/pkgs/development/python-modules/pg8000/default.nix +++ b/pkgs/development/python-modules/pg8000/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , scramp @@ -19,7 +19,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ passlib scramp ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/tlocke/pg8000"; description = "PostgreSQL interface library, for asyncio"; maintainers = with maintainers; [ domenkozar ]; diff --git a/pkgs/development/python-modules/pgpdump/default.nix b/pkgs/development/python-modules/pgpdump/default.nix index 0f200409622a..d795cc3678f7 100644 --- a/pkgs/development/python-modules/pgpdump/default.nix +++ b/pkgs/development/python-modules/pgpdump/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi }: @@ -15,7 +15,7 @@ buildPythonPackage rec { # Disabling check because of: https://github.com/toofishes/python-pgpdump/issues/18 doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Python library for parsing PGP packets"; homepage = "https://github.com/toofishes/python-pgpdump"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/pgpy/default.nix b/pkgs/development/python-modules/pgpy/default.nix index 9067817a3ba9..2c527d87d186 100644 --- a/pkgs/development/python-modules/pgpy/default.nix +++ b/pkgs/development/python-modules/pgpy/default.nix @@ -1,7 +1,6 @@ { lib, isPy3k, fetchFromGitHub, buildPythonPackage , six, enum34, pyasn1, cryptography, singledispatch -, fetchPypi -, gpgme, flake8, pytest, pytestcov, pep8-naming, pytest-ordering }: +, fetchPypi, pytestCheckHook }: buildPythonPackage rec { pname = "pgpy"; @@ -22,17 +21,10 @@ buildPythonPackage rec { ] ++ lib.optional (!isPy3k) enum34; checkInputs = [ - gpgme - flake8 - pytest - pytestcov - pep8-naming - pytest-ordering + pytestCheckHook ]; - checkPhase = '' - pytest - ''; + disabledTests = [ "test_sign_string" "test_verify_string" ]; meta = with lib; { homepage = "https://github.com/SecurityInnovation/PGPy"; diff --git a/pkgs/development/python-modules/pgsanity/default.nix b/pkgs/development/python-modules/pgsanity/default.nix index f7212493e59c..b95f461aa370 100644 --- a/pkgs/development/python-modules/pgsanity/default.nix +++ b/pkgs/development/python-modules/pgsanity/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , python , fetchPypi , buildPythonPackage @@ -20,7 +20,7 @@ buildPythonPackage rec { checkInputs = [ postgresql ]; propagatedBuildInputs = [ postgresql ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/markdrago/pgsanity"; description = "Checks the syntax of Postgresql SQL files"; longDescription = '' diff --git a/pkgs/development/python-modules/pgspecial/default.nix b/pkgs/development/python-modules/pgspecial/default.nix index 61ab5532ca9d..796a38198814 100644 --- a/pkgs/development/python-modules/pgspecial/default.nix +++ b/pkgs/development/python-modules/pgspecial/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, pytest, psycopg2, click, sqlparse }: +{ lib, stdenv, buildPythonPackage, fetchPypi, pytest, psycopg2, click, sqlparse }: buildPythonPackage rec { pname = "pgspecial"; @@ -17,7 +17,7 @@ buildPythonPackage rec { py.test tests ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Meta-commands handler for Postgres Database"; homepage = "https://pypi.python.org/pypi/pgspecial"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/phe/default.nix b/pkgs/development/python-modules/phe/default.nix index 6a849734e908..5a00a4ccb099 100644 --- a/pkgs/development/python-modules/phe/default.nix +++ b/pkgs/development/python-modules/phe/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPyPy, isPy3k, click, gmpy2, numpy } : +{ lib, stdenv, buildPythonPackage, fetchPypi, isPyPy, isPy3k, click, gmpy2, numpy } : let pname = "phe"; @@ -21,7 +21,7 @@ buildPythonPackage { # 29/233 tests fail doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "A library for Partially Homomorphic Encryption in Python"; homepage = "https://github.com/n1analytics/python-paillier"; license = licenses.gpl3; diff --git a/pkgs/development/python-modules/phonopy/default.nix b/pkgs/development/python-modules/phonopy/default.nix index 1a768b7cf57f..03e0c54caab7 100644 --- a/pkgs/development/python-modules/phonopy/default.nix +++ b/pkgs/development/python-modules/phonopy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, python, fetchPypi, numpy, pyyaml, matplotlib, h5py, spglib, pytestCheckHook }: +{ lib, stdenv, buildPythonPackage, python, fetchPypi, numpy, pyyaml, matplotlib, h5py, spglib, pytestCheckHook }: buildPythonPackage rec { pname = "phonopy"; @@ -20,7 +20,7 @@ buildPythonPackage rec { rm -r phonopy ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A package for phonon calculations at harmonic and quasi-harmonic levels"; homepage = "https://atztogo.github.io/phonopy/"; license = licenses.bsd0; diff --git a/pkgs/development/python-modules/phx-class-registry/default.nix b/pkgs/development/python-modules/phx-class-registry/default.nix index db0359a1d4fc..9ed84e86371c 100644 --- a/pkgs/development/python-modules/phx-class-registry/default.nix +++ b/pkgs/development/python-modules/phx-class-registry/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy27, pytestCheckHook }: +{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27, pytestCheckHook }: buildPythonPackage rec { pname = "phx-class-registry"; @@ -19,7 +19,7 @@ buildPythonPackage rec { "test_len" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Registry pattern for Python classes, with setuptools entry points integration"; homepage = "https://github.com/todofixthis/class-registry"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pickleshare/default.nix b/pkgs/development/python-modules/pickleshare/default.nix index 496d20d52e3c..0171adc6bfcc 100644 --- a/pkgs/development/python-modules/pickleshare/default.nix +++ b/pkgs/development/python-modules/pickleshare/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , pathpy @@ -21,7 +21,7 @@ buildPythonPackage rec { # No proper test suite doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Tiny 'shelve'-like database with concurrency support"; homepage = "https://github.com/vivainio/pickleshare"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pid/default.nix b/pkgs/development/python-modules/pid/default.nix index e934ea4577b4..95aca29da5d1 100644 --- a/pkgs/development/python-modules/pid/default.nix +++ b/pkgs/development/python-modules/pid/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , nose @@ -18,7 +18,7 @@ buildPythonPackage rec { # No tests included doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Pidfile featuring stale detection and file-locking"; homepage = "https://github.com/trbs/pid/"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/piep/default.nix b/pkgs/development/python-modules/piep/default.nix index 667a8e3b7371..c4fd24d070e6 100644 --- a/pkgs/development/python-modules/piep/default.nix +++ b/pkgs/development/python-modules/piep/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , nose @@ -17,7 +17,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pygments ]; checkInputs = [ nose ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Bringing the power of python to stream editing"; homepage = "https://github.com/timbertson/piep"; maintainers = with maintainers; [ timbertson ]; diff --git a/pkgs/development/python-modules/piexif/default.nix b/pkgs/development/python-modules/piexif/default.nix index af4b539d4574..c08ee8338b0a 100644 --- a/pkgs/development/python-modules/piexif/default.nix +++ b/pkgs/development/python-modules/piexif/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, pillow }: +{ lib, stdenv, buildPythonPackage, fetchPypi, pillow }: buildPythonPackage rec { pname = "piexif"; @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "06sz58q4mrw472p8fbnq7wsj8zpi5js5r8phm2hiwfmz0v33bjw3"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Simplify Exif manipulations with Python"; homepage = "https://github.com/hMatoba/Piexif"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pika-pool/default.nix b/pkgs/development/python-modules/pika-pool/default.nix index c13490fb3e80..a36fcdf18bb5 100644 --- a/pkgs/development/python-modules/pika-pool/default.nix +++ b/pkgs/development/python-modules/pika-pool/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ lib, stdenv, buildPythonPackage, fetchPypi , pika }: @@ -19,7 +19,7 @@ buildPythonPackage rec { doCheck = false; propagatedBuildInputs = [ pika ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/bninja/pika-pool"; license = licenses.bsdOriginal; description = "Pools for pikas."; diff --git a/pkgs/development/python-modules/pika/default.nix b/pkgs/development/python-modules/pika/default.nix index 8b0807e3569b..ec8310bdb55f 100644 --- a/pkgs/development/python-modules/pika/default.nix +++ b/pkgs/development/python-modules/pika/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , nose @@ -18,7 +18,7 @@ buildPythonPackage rec { checkInputs = [ nose mock twisted tornado ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Pure-Python implementation of the AMQP 0-9-1 protocol"; homepage = "https://pika.readthedocs.org"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/pikepdf/default.nix b/pkgs/development/python-modules/pikepdf/default.nix index a5f512fae97f..ff2a2ce4c5e7 100644 --- a/pkgs/development/python-modules/pikepdf/default.nix +++ b/pkgs/development/python-modules/pikepdf/default.nix @@ -18,7 +18,7 @@ , qpdf , setuptools-scm-git-archive , setuptools_scm -, stdenv +, lib, stdenv }: buildPythonPackage rec { @@ -68,7 +68,7 @@ buildPythonPackage rec { HOME=$TMPDIR ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/pikepdf/pikepdf"; description = "Read and write PDFs with Python, powered by qpdf"; license = licenses.mpl20; diff --git a/pkgs/development/python-modules/pilkit/default.nix b/pkgs/development/python-modules/pilkit/default.nix index 019d5551a3a6..4a3c682c1229 100644 --- a/pkgs/development/python-modules/pilkit/default.nix +++ b/pkgs/development/python-modules/pilkit/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , pillow @@ -26,7 +26,7 @@ buildPythonPackage rec { buildInputs = [ pillow nose_progressive nose mock blessings ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/matthewwithanm/pilkit/"; description = "A collection of utilities and processors for the Python Imaging Libary"; license = licenses.bsd0; diff --git a/pkgs/development/python-modules/pillow/6.nix b/pkgs/development/python-modules/pillow/6.nix index 64f162c24eb7..ce28b19a013e 100644 --- a/pkgs/development/python-modules/pillow/6.nix +++ b/pkgs/development/python-modules/pillow/6.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPyPy +{ lib, stdenv, buildPythonPackage, fetchPypi, isPyPy , olefile , freetype, libjpeg, zlib, libtiff, libwebp, tcl, lcms2, tk, libX11 , openjpeg, libimagequant @@ -67,7 +67,7 @@ buildPythonPackage rec { --replace '"/System/Library/Frameworks"' "" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://python-pillow.github.io/"; description = "Fork of The Python Imaging Library (PIL)"; longDescription = '' diff --git a/pkgs/development/python-modules/pillow/default.nix b/pkgs/development/python-modules/pillow/default.nix index 199bdae8fc25..1122d21b5340 100644 --- a/pkgs/development/python-modules/pillow/default.nix +++ b/pkgs/development/python-modules/pillow/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPyPy +{ lib, stdenv, buildPythonPackage, fetchPypi, isPyPy , olefile , freetype, libjpeg, zlib, libtiff, libwebp, tcl, lcms2, tk, libX11 , openjpeg, libimagequant @@ -67,7 +67,7 @@ buildPythonPackage rec { --replace '"/System/Library/Frameworks"' "" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://python-pillow.org/"; description = "The friendly PIL fork (Python Imaging Library)"; longDescription = '' diff --git a/pkgs/development/python-modules/pillowfight/default.nix b/pkgs/development/python-modules/pillowfight/default.nix index ed0daf123d46..9e23f69d19c5 100644 --- a/pkgs/development/python-modules/pillowfight/default.nix +++ b/pkgs/development/python-modules/pillowfight/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , pillow @@ -15,7 +15,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pillow ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Eases the transition from PIL to Pillow for Python packages"; homepage = "https://github.com/beanbaginc/pillowfight"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pims/default.nix b/pkgs/development/python-modules/pims/default.nix index 76eaa4fac698..d2a5641acff5 100644 --- a/pkgs/development/python-modules/pims/default.nix +++ b/pkgs/development/python-modules/pims/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , slicerator @@ -24,7 +24,7 @@ buildPythonPackage rec { # not everything packaged with pypi release doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/soft-matter/pims"; description = "Python Image Sequence: Load video and sequential images in many formats with a simple, consistent interface"; license = licenses.bsdOriginal; diff --git a/pkgs/development/python-modules/pip-tools/default.nix b/pkgs/development/python-modules/pip-tools/default.nix index 0952c7056c31..398ab8cd29be 100644 --- a/pkgs/development/python-modules/pip-tools/default.nix +++ b/pkgs/development/python-modules/pip-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage, pip, pytest, click, six +{ lib, stdenv, fetchPypi, buildPythonPackage, pip, pytest, click, six , setuptools_scm, git, glibcLocales, mock }: buildPythonPackage rec { @@ -42,7 +42,7 @@ buildPythonPackage rec { py.test -k "${disabledTests}" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Keeps your pinned dependencies fresh"; homepage = "https://github.com/jazzband/pip-tools/"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/pivy/default.nix b/pkgs/development/python-modules/pivy/default.nix index 3d3f93f21a27..aae90d2f8b49 100644 --- a/pkgs/development/python-modules/pivy/default.nix +++ b/pkgs/development/python-modules/pivy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, pkgs, qtbase, qmake, soqt }: +{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pkgs, qtbase, qmake, soqt }: buildPythonPackage rec { pname = "pivy"; @@ -38,7 +38,7 @@ buildPythonPackage rec { \$'{Coin_INCLUDE_DIR}'\;\$'{SoQt_INCLUDE_DIRS}' ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/coin3d/pivy/"; description = "A Python binding for Coin"; license = licenses.bsd0; diff --git a/pkgs/development/python-modules/pkgconfig/default.nix b/pkgs/development/python-modules/pkgconfig/default.nix index 05f13e8878a3..1b03f720fbcd 100644 --- a/pkgs/development/python-modules/pkgconfig/default.nix +++ b/pkgs/development/python-modules/pkgconfig/default.nix @@ -1,10 +1,10 @@ -{ lib, buildPythonPackage, fetchPypi, nose, pkgconfig }: +{ lib, buildPythonPackage, fetchPypi, pkg-config }: buildPythonPackage rec { pname = "pkgconfig"; version = "1.5.1"; - inherit (pkgconfig) + inherit (pkg-config) setupHooks wrapperName suffixSalt @@ -17,19 +17,18 @@ buildPythonPackage rec { sha256 = "97bfe3d981bab675d5ea3ef259045d7919c93897db7d3b59d4e8593cba8d354f"; }; - checkInputs = [ nose ]; - nativeBuildInputs = [ pkgconfig ]; + propagatedNativeBuildInputs = [ pkg-config ]; - checkPhase = '' - nosetests - ''; + doCheck = false; patches = [ ./executable.patch ]; postPatch = '' - substituteInPlace pkgconfig/pkgconfig.py --replace 'PKG_CONFIG_EXE = "pkg-config"' 'PKG_CONFIG_EXE = "${pkgconfig}/bin/${pkgconfig.targetPrefix}pkg-config"' + substituteInPlace pkgconfig/pkgconfig.py --replace 'PKG_CONFIG_EXE = "pkg-config"' 'PKG_CONFIG_EXE = "${pkg-config}/bin/${pkg-config.targetPrefix}pkg-config"' ''; + pythonImportsCheck = [ "pkgconfig" ]; + meta = with lib; { description = "Interface Python with pkg-config"; homepage = "https://github.com/matze/pkgconfig"; diff --git a/pkgs/development/python-modules/pkginfo/default.nix b/pkgs/development/python-modules/pkginfo/default.nix index 7a0fc2080702..dbf487c5d3aa 100644 --- a/pkgs/development/python-modules/pkginfo/default.nix +++ b/pkgs/development/python-modules/pkginfo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi }: +{ lib, stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "pkginfo"; @@ -11,7 +11,7 @@ buildPythonPackage rec { doCheck = false; # I don't know why, but with doCheck = true it fails. - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://pypi.python.org/pypi/pkginfo"; license = licenses.mit; description = "Query metadatdata from sdists / bdists / installed packages"; diff --git a/pkgs/development/python-modules/pkuseg/default.nix b/pkgs/development/python-modules/pkuseg/default.nix index 3b1c2bd5bce4..8e3e301793aa 100644 --- a/pkgs/development/python-modules/pkuseg/default.nix +++ b/pkgs/development/python-modules/pkuseg/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , isPy3k @@ -27,7 +27,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "pkuseg" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Toolkit for multi-domain Chinese word segmentation"; homepage = "https://github.com/lancopku/pkuseg-python"; license = licenses.unfree; diff --git a/pkgs/development/python-modules/plac/default.nix b/pkgs/development/python-modules/plac/default.nix index dbcd7f213008..9e2c66d9d1ed 100644 --- a/pkgs/development/python-modules/plac/default.nix +++ b/pkgs/development/python-modules/plac/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , python @@ -17,7 +17,7 @@ buildPythonPackage rec { ${python.interpreter} -m unittest discover -p "*test_plac*" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Parsing the Command Line the Easy Way"; homepage = "https://github.com/micheles/plac"; license = licenses.bsdOriginal; diff --git a/pkgs/development/python-modules/pluginbase/default.nix b/pkgs/development/python-modules/pluginbase/default.nix index c35fbf7bd13a..956ea1b720ae 100644 --- a/pkgs/development/python-modules/pluginbase/default.nix +++ b/pkgs/development/python-modules/pluginbase/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage, pytest }: +{ lib, stdenv, fetchPypi, buildPythonPackage, pytest }: buildPythonPackage rec { version = "1.0.0"; @@ -16,7 +16,7 @@ buildPythonPackage rec { PYTHONPATH=.. pytest ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/mitsuhiko/pluginbase"; description = "A support library for building plugins sytems in Python"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/plyvel/default.nix b/pkgs/development/python-modules/plyvel/default.nix index c768c606ca8a..0872a5347604 100644 --- a/pkgs/development/python-modules/plyvel/default.nix +++ b/pkgs/development/python-modules/plyvel/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , pkgs @@ -20,7 +20,7 @@ buildPythonPackage rec { # no tests for python2 doCheck = isPy3k; - meta = with stdenv.lib; { + meta = with lib; { description = "Fast and feature-rich Python interface to LevelDB"; platforms = platforms.unix; homepage = "https://github.com/wbolster/plyvel"; diff --git a/pkgs/development/python-modules/pocket/default.nix b/pkgs/development/python-modules/pocket/default.nix index e351d26ca481..3599d3dec55d 100644 --- a/pkgs/development/python-modules/pocket/default.nix +++ b/pkgs/development/python-modules/pocket/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , requests @@ -15,7 +15,7 @@ buildPythonPackage rec { buildInputs = [ requests ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Wrapper for the pocket API"; homepage = "https://github.com/tapanpandita/pocket"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/polib/default.nix b/pkgs/development/python-modules/polib/default.nix index 304ef95a8846..f7c4e1139a86 100644 --- a/pkgs/development/python-modules/polib/default.nix +++ b/pkgs/development/python-modules/polib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi }: +{ lib, stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "polib"; @@ -12,7 +12,7 @@ buildPythonPackage rec { # error: invalid command 'test' doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "A library to manipulate gettext files (po and mo files)"; homepage = "https://bitbucket.org/izi/polib/"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pomegranate/default.nix b/pkgs/development/python-modules/pomegranate/default.nix index c3d5638841d6..7595730eb31b 100644 --- a/pkgs/development/python-modules/pomegranate/default.nix +++ b/pkgs/development/python-modules/pomegranate/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, numpy, scipy, cython, networkx, joblib, nose, pyyaml }: +{ lib, stdenv, buildPythonPackage, fetchFromGitHub, numpy, scipy, cython, networkx, joblib, nose, pyyaml }: buildPythonPackage rec { pname = "pomegranate"; @@ -15,7 +15,7 @@ buildPythonPackage rec { checkInputs = [ nose ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Probabilistic and graphical models for Python, implemented in cython for speed"; homepage = "https://github.com/jmschrei/pomegranate"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pony/default.nix b/pkgs/development/python-modules/pony/default.nix index 1ed0a7cafffb..7a734927ee1e 100644 --- a/pkgs/development/python-modules/pony/default.nix +++ b/pkgs/development/python-modules/pony/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python, buildPythonPackage, fetchPypi }: +{ lib, stdenv, python, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "pony"; @@ -16,7 +16,7 @@ buildPythonPackage rec { rm -rf $out/${python.sitePackages}/pony/orm/tests ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Pony is a Python ORM with beautiful query syntax"; homepage = "https://ponyorm.org/"; maintainers = with maintainers; [ d-goldin xvapx ]; diff --git a/pkgs/development/python-modules/pooch/default.nix b/pkgs/development/python-modules/pooch/default.nix index 6530cbd4a5d1..282239d9890b 100644 --- a/pkgs/development/python-modules/pooch/default.nix +++ b/pkgs/development/python-modules/pooch/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , isPy27 , fetchPypi @@ -40,7 +40,7 @@ buildPythonPackage rec { "integration" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A friend to fetch your data files."; homepage = "https://github.com/fatiando/pooch"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/poolsense/default.nix b/pkgs/development/python-modules/poolsense/default.nix new file mode 100644 index 000000000000..0ffdf8952277 --- /dev/null +++ b/pkgs/development/python-modules/poolsense/default.nix @@ -0,0 +1,28 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "poolsense"; + version = "0.0.8"; + + src = fetchPypi { + inherit pname version; + sha256 = "09y4fq0gdvgkfsykpxnvmfv92dpbknnq5v82spz43ak6hjnhgcyp"; + }; + + propagatedBuildInputs = [ aiohttp ]; + + # Project has no tests + doCheck = false; + pythonImportsCheck = [ "poolsense" ]; + + meta = with lib; { + description = "Python module to access PoolSense device"; + homepage = "https://github.com/haemishkyd/poolsense"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/poppler-qt5/default.nix b/pkgs/development/python-modules/poppler-qt5/default.nix index 6f12a9e69810..cd2aac6275e5 100644 --- a/pkgs/development/python-modules/poppler-qt5/default.nix +++ b/pkgs/development/python-modules/poppler-qt5/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, fetchPypi, stdenv, sip, qtbase, pyqt5, poppler, pkgconfig, fetchpatch +{ buildPythonPackage, fetchPypi, lib, stdenv, sip, qtbase, pyqt5, poppler, pkgconfig, fetchpatch , substituteAll }: @@ -34,7 +34,7 @@ buildPythonPackage rec { # no tests, just bindings for `poppler_qt5` doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/wbsoft/python-poppler-qt5"; license = licenses.gpl2; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/python-modules/portend/default.nix b/pkgs/development/python-modules/portend/default.nix index 280cadf4db4e..10b30d05fa3e 100644 --- a/pkgs/development/python-modules/portend/default.nix +++ b/pkgs/development/python-modules/portend/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ lib, stdenv, buildPythonPackage, fetchPypi , pytest, setuptools_scm, tempora, pytest-black, pytestcov }: buildPythonPackage rec { @@ -27,7 +27,7 @@ buildPythonPackage rec { # Some of the tests use localhost networking. __darwinAllowLocalNetworking = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Monitor TCP ports for bound or unbound states"; homepage = "https://github.com/jaraco/portend"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/posix_ipc/default.nix b/pkgs/development/python-modules/posix_ipc/default.nix index 2be2a89cc6da..2fb6128dc1b1 100644 --- a/pkgs/development/python-modules/posix_ipc/default.nix +++ b/pkgs/development/python-modules/posix_ipc/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi }: @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "6cddb1ce2cf4aae383f2a0079c26c69bee257fe2720f372201ef047f8ceb8b97"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "POSIX IPC primitives (semaphores, shared memory and message queues)"; license = licenses.bsd3; homepage = "http://semanchuk.com/philip/posix_ipc/"; diff --git a/pkgs/development/python-modules/poster3/default.nix b/pkgs/development/python-modules/poster3/default.nix index 269995717aa4..09e8055bdd91 100644 --- a/pkgs/development/python-modules/poster3/default.nix +++ b/pkgs/development/python-modules/poster3/default.nix @@ -15,8 +15,7 @@ buildPythonPackage rec { disabled = !isPy3k; src = fetchPypi { - inherit pname version; - format = "wheel"; + inherit pname version format; python = "py3"; sha256 = "1b27d7d63e3191e5d7238631fc828e4493590e94dcea034e386c079d853cce14"; }; diff --git a/pkgs/development/python-modules/potr/default.nix b/pkgs/development/python-modules/potr/default.nix index adcb71104676..9f2774b9a607 100644 --- a/pkgs/development/python-modules/potr/default.nix +++ b/pkgs/development/python-modules/potr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage, pycrypto }: +{ lib, stdenv, fetchPypi, buildPythonPackage, pycrypto }: buildPythonPackage rec { pname = "python-potr"; @@ -11,7 +11,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pycrypto ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A pure Python OTR implementation"; homepage = "http://python-otr.pentabarf.de/"; license = licenses.lgpl3Plus; diff --git a/pkgs/development/python-modules/power/default.nix b/pkgs/development/python-modules/power/default.nix index b3d750f7e652..d1998faf6b64 100644 --- a/pkgs/development/python-modules/power/default.nix +++ b/pkgs/development/python-modules/power/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi }: @@ -15,7 +15,7 @@ buildPythonPackage rec { # Tests can't work because there is no power information available. doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Cross-platform system power status information"; homepage = "https://github.com/Kentzo/Power"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pox/default.nix b/pkgs/development/python-modules/pox/default.nix index e4869a8f46cc..e7013154f998 100644 --- a/pkgs/development/python-modules/pox/default.nix +++ b/pkgs/development/python-modules/pox/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi }: @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "06afe1a4a1dbf8b47f7ad5a3c1d8ada9104c64933a1da11338269a2bd8642778"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Utilities for filesystem exploration and automated builds"; license = licenses.bsd3; homepage = "https://github.com/uqfoundation/pox/"; diff --git a/pkgs/development/python-modules/poyo/default.nix b/pkgs/development/python-modules/poyo/default.nix index 3eff663aed9c..d600e46c6b42 100644 --- a/pkgs/development/python-modules/poyo/default.nix +++ b/pkgs/development/python-modules/poyo/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi }: @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "1pflivs6j22frz0v3dqxnvc8yb8fb52g11lqr88z0i8cg2m5csg2"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/hackebrot/poyo"; description = "A lightweight YAML Parser for Python"; license = licenses.mit; diff --git a/pkgs/development/python-modules/ppft/default.nix b/pkgs/development/python-modules/ppft/default.nix index d8e8f33181f6..ba23948fdb8c 100644 --- a/pkgs/development/python-modules/ppft/default.nix +++ b/pkgs/development/python-modules/ppft/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , python @@ -23,7 +23,7 @@ buildPythonPackage rec { ${python.interpreter} -m ppft.tests ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Distributed and parallel python"; homepage = "https://github.com/uqfoundation"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/ppscore/default.nix b/pkgs/development/python-modules/ppscore/default.nix index 3fd047402ee7..00542c6e90e1 100644 --- a/pkgs/development/python-modules/ppscore/default.nix +++ b/pkgs/development/python-modules/ppscore/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchFromGitHub , isPy27 @@ -26,7 +26,7 @@ buildPythonPackage rec { scikitlearn ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A Python implementation of the Predictive Power Score (PPS)"; homepage = "https://github.com/8080labs/ppscore/"; license = licenses.mit; diff --git a/pkgs/development/python-modules/praw/6.3.nix b/pkgs/development/python-modules/praw/6.3.nix index 6c2201d1f1d2..00182eda0379 100644 --- a/pkgs/development/python-modules/praw/6.3.nix +++ b/pkgs/development/python-modules/praw/6.3.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub +{ lib, stdenv, buildPythonPackage, fetchFromGitHub , betamax , betamax-serializers , betamax-matchers @@ -44,7 +44,7 @@ buildPythonPackage rec { six ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Python Reddit API wrapper"; homepage = "https://praw.readthedocs.org/"; license = licenses.bsd2; diff --git a/pkgs/development/python-modules/praw/default.nix b/pkgs/development/python-modules/praw/default.nix index 698c9cc1ccf6..61b869e87fb2 100644 --- a/pkgs/development/python-modules/praw/default.nix +++ b/pkgs/development/python-modules/praw/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub +{ lib, stdenv, buildPythonPackage, fetchFromGitHub , betamax , betamax-serializers , betamax-matchers @@ -44,7 +44,7 @@ buildPythonPackage rec { six ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Python Reddit API wrapper"; homepage = "https://praw.readthedocs.org/"; license = licenses.bsd2; diff --git a/pkgs/development/python-modules/prawcore/default.nix b/pkgs/development/python-modules/prawcore/default.nix index 7be75eae90a5..533c31d87ce2 100644 --- a/pkgs/development/python-modules/prawcore/default.nix +++ b/pkgs/development/python-modules/prawcore/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy27 +{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27 , requests , testfixtures, mock, requests_toolbelt , betamax, betamax-serializers, betamax-matchers, pytest @@ -32,7 +32,7 @@ buildPythonPackage rec { pytest ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Low-level communication layer for PRAW"; homepage = "https://praw.readthedocs.org/"; license = licenses.gpl3; diff --git a/pkgs/development/python-modules/preggy/default.nix b/pkgs/development/python-modules/preggy/default.nix index a3ca7d15c77e..a2144f303be7 100644 --- a/pkgs/development/python-modules/preggy/default.nix +++ b/pkgs/development/python-modules/preggy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, six, unidecode, nose, yanc }: +{ lib, stdenv, buildPythonPackage, fetchPypi, six, unidecode, nose, yanc }: buildPythonPackage rec { pname = "preggy"; @@ -16,7 +16,7 @@ buildPythonPackage rec { nosetests . ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Assertion library for Python"; homepage = "http://heynemann.github.io/preggy/"; license = licenses.mit; diff --git a/pkgs/development/python-modules/preshed/default.nix b/pkgs/development/python-modules/preshed/default.nix index a544d6fab910..5d75c95d770b 100644 --- a/pkgs/development/python-modules/preshed/default.nix +++ b/pkgs/development/python-modules/preshed/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , murmurhash @@ -30,7 +30,7 @@ buildPythonPackage rec { ${python.interpreter} setup.py test ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Cython hash tables that assume keys are pre-hashed"; homepage = "https://github.com/explosion/preshed"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pretend/default.nix b/pkgs/development/python-modules/pretend/default.nix index af5b33998315..4fe726591e60 100644 --- a/pkgs/development/python-modules/pretend/default.nix +++ b/pkgs/development/python-modules/pretend/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi }: +{ lib, stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "pretend"; @@ -12,7 +12,7 @@ buildPythonPackage rec { # No tests in archive doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/alex/pretend"; license = licenses.bsd3; }; diff --git a/pkgs/development/python-modules/prettytable/1.nix b/pkgs/development/python-modules/prettytable/1.nix index ccaa02e2f494..5b7457af9bf7 100644 --- a/pkgs/development/python-modules/prettytable/1.nix +++ b/pkgs/development/python-modules/prettytable/1.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , glibcLocales @@ -28,7 +28,7 @@ buildPythonPackage rec { doCheck = false; pythonImportsCheck = [ "prettytable" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Simple Python library for easily displaying tabular data in a visually appealing ASCII table format"; homepage = "http://code.google.com/p/prettytable/"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/prettytable/default.nix b/pkgs/development/python-modules/prettytable/default.nix index bc8bd3f835d6..5a15cfd24eb0 100644 --- a/pkgs/development/python-modules/prettytable/default.nix +++ b/pkgs/development/python-modules/prettytable/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , glibcLocales @@ -28,7 +28,7 @@ buildPythonPackage rec { doCheck = false; pythonImportsCheck = [ "prettytable" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Simple Python library for easily displaying tabular data in a visually appealing ASCII table format"; homepage = "http://code.google.com/p/prettytable/"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/primer3/default.nix b/pkgs/development/python-modules/primer3/default.nix new file mode 100644 index 000000000000..e8aa83ed94d9 --- /dev/null +++ b/pkgs/development/python-modules/primer3/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, cython +, click +}: + +buildPythonPackage rec { + pname = "primer3"; + version = "0.6.1"; + + src = fetchFromGitHub { + owner = "libnano"; + repo = "primer3-py"; + rev = version; + sha256 = "1glybwp9w2m1ydvaphr41gj31d8fvlh40s35galfbjqa563si72g"; + }; + + nativeBuildInputs = [ cython ]; + + # pytestCheckHook leads to a circular import issue + checkInputs = [ click ]; + + pythonImportsCheck = [ "primer3" ]; + + meta = with lib; { + description = "Oligo analysis and primer design"; + homepage = "https://github.com/libnano/primer3-py"; + license = with licenses; [ gpl2Only ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/proboscis/default.nix b/pkgs/development/python-modules/proboscis/default.nix index 9d4ae92f2c10..00905136716f 100644 --- a/pkgs/development/python-modules/proboscis/default.nix +++ b/pkgs/development/python-modules/proboscis/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, nose }: +{ lib, stdenv, buildPythonPackage, fetchPypi, nose }: buildPythonPackage rec { pname = "proboscis"; @@ -12,7 +12,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ nose ]; doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "A Python test framework that extends Python's built-in unittest module and Nose with features from TestNG"; homepage = "https://pypi.python.org/pypi/proboscis"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/process-tests/default.nix b/pkgs/development/python-modules/process-tests/default.nix index de43ea71fd48..4b83205d723e 100644 --- a/pkgs/development/python-modules/process-tests/default.nix +++ b/pkgs/development/python-modules/process-tests/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi }: @@ -15,7 +15,7 @@ buildPythonPackage rec { # No tests doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Tools for testing processes"; license = licenses.bsd2; homepage = "https://github.com/ionelmc/python-process-tests"; diff --git a/pkgs/development/python-modules/proglog/default.nix b/pkgs/development/python-modules/proglog/default.nix index ef5c21f450d5..3f8c11043811 100644 --- a/pkgs/development/python-modules/proglog/default.nix +++ b/pkgs/development/python-modules/proglog/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage, tqdm }: +{ lib, stdenv, fetchPypi, buildPythonPackage, tqdm }: buildPythonPackage rec { pname = "proglog"; @@ -11,7 +11,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ tqdm ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Logs and progress bars manager for Python"; homepage = "https://github.com/Edinburgh-Genome-Foundry/Proglog"; license = licenses.mit; diff --git a/pkgs/development/python-modules/progress/default.nix b/pkgs/development/python-modules/progress/default.nix index 9ebef268571c..2c5dbc1386e8 100644 --- a/pkgs/development/python-modules/progress/default.nix +++ b/pkgs/development/python-modules/progress/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , python @@ -17,7 +17,7 @@ buildPythonPackage rec { ${python.interpreter} test_progress.py ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/verigak/progress/"; description = "Easy to use progress bars"; license = licenses.mit; diff --git a/pkgs/development/python-modules/progressbar/default.nix b/pkgs/development/python-modules/progressbar/default.nix index c756a41b5d0e..a1fdddd95db8 100644 --- a/pkgs/development/python-modules/progressbar/default.nix +++ b/pkgs/development/python-modules/progressbar/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi }: +{ lib, stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "progressbar"; @@ -12,7 +12,7 @@ buildPythonPackage rec { # invalid command 'test' doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://pypi.python.org/pypi/progressbar"; description = "Text progressbar library for python"; license = licenses.lgpl3Plus; diff --git a/pkgs/development/python-modules/progressbar2/default.nix b/pkgs/development/python-modules/progressbar2/default.nix index 55590f8bd063..cc3029ade64e 100644 --- a/pkgs/development/python-modules/progressbar2/default.nix +++ b/pkgs/development/python-modules/progressbar2/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , python , buildPythonPackage , fetchPypi @@ -22,7 +22,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "progressbar" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://progressbar-2.readthedocs.io/en/latest/"; description = "Text progressbar library for python"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/progressbar231/default.nix b/pkgs/development/python-modules/progressbar231/default.nix index 5271912cc0ad..f8980647482c 100644 --- a/pkgs/development/python-modules/progressbar231/default.nix +++ b/pkgs/development/python-modules/progressbar231/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy3k }: +{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k }: buildPythonPackage rec { pname = "progressbar231"; @@ -14,7 +14,7 @@ buildPythonPackage rec { # no tests implemented doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://pypi.python.org/pypi/progressbar231"; description = "Text progressbar library for python"; license = licenses.lgpl3Plus; diff --git a/pkgs/development/python-modules/progressbar33/default.nix b/pkgs/development/python-modules/progressbar33/default.nix index 5aef28447849..0b53b83f5cca 100644 --- a/pkgs/development/python-modules/progressbar33/default.nix +++ b/pkgs/development/python-modules/progressbar33/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi }: +{ lib, stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "progressbar33"; @@ -12,7 +12,7 @@ buildPythonPackage rec { # no tests implemented doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://pypi.python.org/pypi/progressbar33"; description = "Text progressbar library for python"; license = licenses.lgpl3Plus; diff --git a/pkgs/development/python-modules/proto-plus/default.nix b/pkgs/development/python-modules/proto-plus/default.nix index 4a36b625298d..1cd732b19aea 100644 --- a/pkgs/development/python-modules/proto-plus/default.nix +++ b/pkgs/development/python-modules/proto-plus/default.nix @@ -1,30 +1,33 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , isPy3k , protobuf -, google_api_core +, googleapis_common_protos , pytestCheckHook +, pytz }: buildPythonPackage rec { pname = "proto-plus"; - version = "1.11.0"; + version = "1.13.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "416a0f13987789333cd8760a0ee998f8eccd6d7165ee9f283d64ca2de3e8774d"; + sha256 = "1i5jjnwpd288378h37zads08h695iwmhxm0sxbr3ln6aax97rdb1"; }; propagatedBuildInputs = [ protobuf ]; - checkInputs = [ pytestCheckHook google_api_core ]; + checkInputs = [ pytestCheckHook pytz googleapis_common_protos ]; - meta = with stdenv.lib; { + pythonImportsCheck = [ "proto" ]; + + meta = with lib; { description = "Beautiful, idiomatic protocol buffers in Python"; homepage = "https://github.com/googleapis/proto-plus-python"; license = licenses.asl20; - maintainers = [ maintainers.ruuda ]; + maintainers = with maintainers; [ ruuda SuperSandro2000 ]; }; } diff --git a/pkgs/development/python-modules/protobuf/default.nix b/pkgs/development/python-modules/protobuf/default.nix index ab95eeb51f91..4925c3dfd02f 100644 --- a/pkgs/development/python-modules/protobuf/default.nix +++ b/pkgs/development/python-modules/protobuf/default.nix @@ -1,6 +1,18 @@ -{ buildPackages, stdenv, fetchpatch, python, buildPythonPackage, isPy37 -, protobuf, google_apputils, pyext, libcxx, isPy27 -, disabled, doCheck ? true }: +{ buildPackages +, stdenv +, fetchpatch +, python +, buildPythonPackage +, isPy37 +, protobuf +, google-apputils +, six +, pyext +, libcxx +, isPy27 +, disabled +, doCheck ? true +}: with stdenv.lib; @@ -17,9 +29,9 @@ buildPythonPackage { outputs = [ "out" "dev" ]; - propagatedBuildInputs = [ google_apputils ]; - propagatedNativeBuildInputs = [ buildPackages.protobuf ]; # For protoc. - nativeBuildInputs = [ google_apputils pyext ]; + propagatedBuildInputs = [ six ] ++ optionals isPy27 [ google-apputils ]; + propagatedNativeBuildInputs = [ buildPackages.protobuf ]; # For protoc. + nativeBuildInputs = [ pyext ] ++ optionals isPy27 [ google-apputils ]; buildInputs = [ protobuf ]; patches = optional (isPy37 && (versionOlder protobuf.version "3.6.1.2")) diff --git a/pkgs/development/python-modules/prov/default.nix b/pkgs/development/python-modules/prov/default.nix index 3844a0fade9e..fba5a41389c7 100644 --- a/pkgs/development/python-modules/prov/default.nix +++ b/pkgs/development/python-modules/prov/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , lxml @@ -42,7 +42,7 @@ buildPythonPackage rec { export LC_ALL="en_US.utf-8" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A Python library for W3C Provenance Data Model (PROV)"; homepage = "https://github.com/trungdong/prov"; license = licenses.mit; diff --git a/pkgs/development/python-modules/psutil/default.nix b/pkgs/development/python-modules/psutil/default.nix index 2d9f0a9440d5..6760ff168e56 100644 --- a/pkgs/development/python-modules/psutil/default.nix +++ b/pkgs/development/python-modules/psutil/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "psutil"; - version = "5.7.3"; + version = "5.8.0"; src = fetchPypi { inherit pname version; - sha256 = "af73f7bcebdc538eda9cc81d19db1db7bf26f103f91081d780bbacfcb620dee2"; + sha256 = "1immnj532bnnrh1qmk5q3lsw3san8qfk9kxy1cpmy0knmfcwp70c"; }; # arch doesn't report frequency is the same way diff --git a/pkgs/development/python-modules/ptable/default.nix b/pkgs/development/python-modules/ptable/default.nix index f1118325610c..ffa9bdacd2d1 100644 --- a/pkgs/development/python-modules/ptable/default.nix +++ b/pkgs/development/python-modules/ptable/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, nose }: +{ lib, stdenv, buildPythonPackage, fetchFromGitHub, nose }: buildPythonPackage { pname = "ptable"; @@ -18,7 +18,7 @@ buildPythonPackage { nosetests --with-coverage --cover-package=prettytable --cover-min-percentage=75 ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/kxxoling/PTable"; description = "A simple Python library designed to make it quick and easy to represent tabular data in visually appealing ASCII tables"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/ptest/default.nix b/pkgs/development/python-modules/ptest/default.nix index 0cdbeb372e3b..c19780a4411c 100644 --- a/pkgs/development/python-modules/ptest/default.nix +++ b/pkgs/development/python-modules/ptest/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchFromGitHub }: @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "0v1zpfjagjlvdmgv6d502nmb7s996wadvpzg93i651s64rrlwq4s"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Test classes and test cases using decorators, execute test cases by command line, and get clear reports"; homepage = "https://pypi.python.org/pypi/ptest"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/ptpython/default.nix b/pkgs/development/python-modules/ptpython/default.nix index 85ba8838f667..fd7b92692fc6 100644 --- a/pkgs/development/python-modules/ptpython/default.nix +++ b/pkgs/development/python-modules/ptpython/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { # no tests to run doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "An advanced Python REPL"; license = licenses.bsd3; maintainers = with maintainers; [ mlieberman85 ]; diff --git a/pkgs/development/python-modules/publicsuffix/default.nix b/pkgs/development/python-modules/publicsuffix/default.nix index 061ad6858614..abac4fb3baa0 100644 --- a/pkgs/development/python-modules/publicsuffix/default.nix +++ b/pkgs/development/python-modules/publicsuffix/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy3k }: +{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k }: buildPythonPackage rec { pname = "publicsuffix"; @@ -16,7 +16,7 @@ buildPythonPackage rec { \\t@unittest.skip('requires internet')" -e "/def additional_tests():/,+1d" tests.py ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Allows to get the public suffix of a domain name"; homepage = "https://pypi.python.org/pypi/publicsuffix/"; license = licenses.mit; diff --git a/pkgs/development/python-modules/publicsuffix2/default.nix b/pkgs/development/python-modules/publicsuffix2/default.nix index fe360168aa5a..2d9bc73baa3f 100644 --- a/pkgs/development/python-modules/publicsuffix2/default.nix +++ b/pkgs/development/python-modules/publicsuffix2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, requests }: +{ lib, stdenv, buildPythonPackage, fetchFromGitHub, requests }: buildPythonPackage rec { pname = "publicsuffix2"; @@ -15,7 +15,7 @@ buildPythonPackage rec { nativeBuildInputs = [ requests ]; - meta = with stdenv.lib; { + meta = with lib; { description = '' Get a public suffix for a domain name using the Public Suffix List. Forked from and using the same API as the publicsuffix package. diff --git a/pkgs/development/python-modules/pudb/default.nix b/pkgs/development/python-modules/pudb/default.nix index 789a9484d730..0ee2a8470b5e 100644 --- a/pkgs/development/python-modules/pudb/default.nix +++ b/pkgs/development/python-modules/pudb/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , pygments @@ -20,7 +20,7 @@ buildPythonPackage rec { # Tests fail on python 3 due to writes to the read-only home directory doCheck = !isPy3k; - meta = with stdenv.lib; { + meta = with lib; { description = "A full-screen, console-based Python debugger"; license = licenses.mit; platforms = platforms.all; diff --git a/pkgs/development/python-modules/pulp/default.nix b/pkgs/development/python-modules/pulp/default.nix index 590fc022d669..480714e9e28d 100644 --- a/pkgs/development/python-modules/pulp/default.nix +++ b/pkgs/development/python-modules/pulp/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchPypi , buildPythonPackage , pyparsing @@ -20,7 +20,7 @@ buildPythonPackage rec { doCheck = false; pythonImportsCheck = [ "pulp" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/coin-or/pulp"; description = "PuLP is an LP modeler written in python"; maintainers = with maintainers; [ teto ]; diff --git a/pkgs/development/python-modules/pure-pcapy3/default.nix b/pkgs/development/python-modules/pure-pcapy3/default.nix index 43d6244ebf0c..9679cc593df0 100644 --- a/pkgs/development/python-modules/pure-pcapy3/default.nix +++ b/pkgs/development/python-modules/pure-pcapy3/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi }: +{ lib, stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "pure-pcapy3"; @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "14panfklap6wwi9avw46gvd7wg9mkv9xbixvbvmi1m2adpqlb7mr"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Pure Python reimplementation of pcapy. This package is API compatible and a drop-in replacement."; homepage = "https://bitbucket.org/viraptor/pure-pcapy"; license = licenses.bsd2; diff --git a/pkgs/development/python-modules/purepng/default.nix b/pkgs/development/python-modules/purepng/default.nix index fe504a0776b7..715b2ca69029 100644 --- a/pkgs/development/python-modules/purepng/default.nix +++ b/pkgs/development/python-modules/purepng/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , python , fetchFromGitHub @@ -38,7 +38,7 @@ buildPythonPackage { ${python.interpreter} code/test_png.py ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Pure Python library for PNG image encoding/decoding"; homepage = "https://github.com/scondo/purepng"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pushover/default.nix b/pkgs/development/python-modules/pushover/default.nix index 72d38259129e..1093f125a969 100644 --- a/pkgs/development/python-modules/pushover/default.nix +++ b/pkgs/development/python-modules/pushover/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ lib, stdenv, buildPythonPackage, fetchPypi , requests }: buildPythonPackage rec { @@ -15,7 +15,7 @@ buildPythonPackage rec { # tests require network doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Bindings and command line utility for the Pushover notification service"; homepage = "https://github.com/Thibauth/python-pushover"; license = licenses.gpl3; diff --git a/pkgs/development/python-modules/pvlib/default.nix b/pkgs/development/python-modules/pvlib/default.nix index f9d97c211055..006246e58366 100644 --- a/pkgs/development/python-modules/pvlib/default.nix +++ b/pkgs/development/python-modules/pvlib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, fetchpatch, pythonOlder, numpy, pandas, pytz, six +{ lib, stdenv, buildPythonPackage, fetchPypi, fetchpatch, pythonOlder, numpy, pandas, pytz, six , pytestCheckHook, flaky, mock, pytest-mock, requests }: buildPythonPackage rec { @@ -45,7 +45,7 @@ buildPythonPackage rec { "backtrack" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://pvlib-python.readthedocs.io"; description = "Simulate the performance of photovoltaic energy systems"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/pweave/default.nix b/pkgs/development/python-modules/pweave/default.nix index aba58b54c3b5..fe74fcece1c0 100644 --- a/pkgs/development/python-modules/pweave/default.nix +++ b/pkgs/development/python-modules/pweave/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , mock @@ -26,7 +26,7 @@ buildPythonPackage rec { # fails due to trying to run CSS as test doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Scientific reports with embedded python computations with reST, LaTeX or markdown"; homepage = "http://mpastell.com/pweave/"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/pwntools/default.nix b/pkgs/development/python-modules/pwntools/default.nix index a6f43ae5b1f8..8f559edf41f2 100644 --- a/pkgs/development/python-modules/pwntools/default.nix +++ b/pkgs/development/python-modules/pwntools/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , debugger , fetchPypi @@ -65,7 +65,7 @@ buildPythonPackage rec { makeWrapper "${debugger}/bin/${stdenv.lib.strings.getName debugger}" "$out/bin/pwntools-gdb" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://pwntools.com"; description = "CTF framework and exploit development library"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pxml/default.nix b/pkgs/development/python-modules/pxml/default.nix index 229b174adec2..57614089e66e 100644 --- a/pkgs/development/python-modules/pxml/default.nix +++ b/pkgs/development/python-modules/pxml/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , pythonAtLeast , isPy27 , buildPythonPackage @@ -28,7 +28,7 @@ buildPythonPackage rec { nosetests -e 'test_prefixedWhitespace' ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/metagriffin/pxml"; description = ''A python library and command-line tool to "prettify" and colorize XML.''; maintainers = with maintainers; [ glittershark ]; diff --git a/pkgs/development/python-modules/py-air-control-exporter/default.nix b/pkgs/development/python-modules/py-air-control-exporter/default.nix index 0ec483c16f30..b5ffc1fc0a5d 100644 --- a/pkgs/development/python-modules/py-air-control-exporter/default.nix +++ b/pkgs/development/python-modules/py-air-control-exporter/default.nix @@ -1,5 +1,6 @@ -{ buildPythonPackage, fetchPypi, flask, isPy27, lib, prometheus_client -, py-air-control, pytestCheckHook, pytestcov, pytestrunner, setuptools_scm }: +{ buildPythonPackage, fetchPypi, flask, isPy27, lib, nixosTests +, prometheus_client, py-air-control, pytestCheckHook, pytestcov, pytestrunner +, setuptools_scm }: buildPythonPackage rec { pname = "py-air-control-exporter"; @@ -15,6 +16,8 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook pytestcov pytestrunner ]; propagatedBuildInputs = [ flask prometheus_client py-air-control ]; + passthru.tests = { inherit (nixosTests.prometheus-exporters) py-air-control; }; + meta = with lib; { description = "Exports Air Quality Metrics to Prometheus."; homepage = "https://github.com/urbas/py-air-control-exporter"; diff --git a/pkgs/development/python-modules/py-radix/default.nix b/pkgs/development/python-modules/py-radix/default.nix index 16a362591dd7..fa057ae99254 100644 --- a/pkgs/development/python-modules/py-radix/default.nix +++ b/pkgs/development/python-modules/py-radix/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchFromGitHub , coverage @@ -19,7 +19,7 @@ buildPythonPackage rec { doCheck = true; checkInputs = [ coverage nose ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Python radix tree for IPv4 and IPv6 prefix matching"; homepage = "https://github.com/mjschultz/py-radix"; license = with licenses; [ isc bsdOriginal ]; diff --git a/pkgs/development/python-modules/py/default.nix b/pkgs/development/python-modules/py/default.nix index 19366ea7146c..4d2b77bb1f2a 100644 --- a/pkgs/development/python-modules/py/default.nix +++ b/pkgs/development/python-modules/py/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, setuptools_scm }: +{ lib, stdenv, buildPythonPackage, fetchPypi, setuptools_scm }: buildPythonPackage rec { pname = "py"; @@ -18,7 +18,7 @@ buildPythonPackage rec { "py" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Library with cross-python path, ini-parsing, io, code, log facilities"; homepage = "https://pylib.readthedocs.org/"; license = licenses.mit; diff --git a/pkgs/development/python-modules/py3buddy/default.nix b/pkgs/development/python-modules/py3buddy/default.nix index 459922c9bafd..b8a25480799b 100644 --- a/pkgs/development/python-modules/py3buddy/default.nix +++ b/pkgs/development/python-modules/py3buddy/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , python , pyusb @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { install -D 99-ibuddy.rules $out/lib/udev/rules.d/99-ibuddy.rules ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Code to work with the iBuddy MSN figurine"; homepage = "https://github.com/armijnhemel/py3buddy"; license = with licenses; [ mit ]; diff --git a/pkgs/development/python-modules/py3dns/default.nix b/pkgs/development/python-modules/py3dns/default.nix index 223e6c0ab7a4..1f7aeaf1e118 100644 --- a/pkgs/development/python-modules/py3dns/default.nix +++ b/pkgs/development/python-modules/py3dns/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi }: @@ -21,7 +21,7 @@ buildPythonPackage rec { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Python 3 DNS library"; homepage = "https://launchpad.net/py3dns"; license = licenses.psfl; diff --git a/pkgs/development/python-modules/py3status/default.nix b/pkgs/development/python-modules/py3status/default.nix index 03f142a8aba6..a2aeaceef6dd 100644 --- a/pkgs/development/python-modules/py3status/default.nix +++ b/pkgs/development/python-modules/py3status/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , requests @@ -49,7 +49,7 @@ buildPythonPackage rec { sed -i -e "s|'xset|'${xorg.xset}/bin/xset|" py3status/modules/keyboard_layout.py ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Extensible i3status wrapper"; license = licenses.bsd3; homepage = "https://github.com/ultrabug/py3status"; diff --git a/pkgs/development/python-modules/py4j/default.nix b/pkgs/development/python-modules/py4j/default.nix index e8faee8d817d..588d7a32d22f 100644 --- a/pkgs/development/python-modules/py4j/default.nix +++ b/pkgs/development/python-modules/py4j/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, fetchPypi, stdenv }: +{ buildPythonPackage, fetchPypi, lib, stdenv }: buildPythonPackage rec { pname = "py4j"; @@ -13,7 +13,7 @@ buildPythonPackage rec { # No tests in archive doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Py4J enables Python programs running in a Python interpreter to dynamically access Java objects in a Java Virtual Machine. Methods are called as if the Java objects resided in the Python interpreter and Java collections can be accessed through standard Python collection methods. Py4J also enables Java programs to call back Python objects."; homepage = "https://www.py4j.org/"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/pyGithub/default.nix b/pkgs/development/python-modules/pyGithub/default.nix index c82f18d377d3..e30ecb95765b 100644 --- a/pkgs/development/python-modules/pyGithub/default.nix +++ b/pkgs/development/python-modules/pyGithub/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , cryptography , deprecated @@ -28,7 +28,7 @@ buildPythonPackage rec { # Test suite makes REST calls against github.com doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/PyGithub/PyGithub"; description = "A Python (2 and 3) library to access the GitHub API v3"; platforms = platforms.all; diff --git a/pkgs/development/python-modules/py_scrypt/default.nix b/pkgs/development/python-modules/py_scrypt/default.nix index e7c75f98231b..af86ce3821eb 100644 --- a/pkgs/development/python-modules/py_scrypt/default.nix +++ b/pkgs/development/python-modules/py_scrypt/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , openssl @@ -16,7 +16,7 @@ buildPythonPackage rec { buildInputs = [ openssl ]; doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Bindings for scrypt key derivation function library"; homepage = "https://pypi.python.org/pypi/scrypt"; maintainers = []; diff --git a/pkgs/development/python-modules/pyacoustid/default.nix b/pkgs/development/python-modules/pyacoustid/default.nix index 75b0964e259d..d424b2144292 100644 --- a/pkgs/development/python-modules/pyacoustid/default.nix +++ b/pkgs/development/python-modules/pyacoustid/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , requests @@ -23,7 +23,7 @@ buildPythonPackage rec { acoustid.py ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Bindings for Chromaprint acoustic fingerprinting"; homepage = "https://github.com/sampsyo/pyacoustid"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pyairvisual/default.nix b/pkgs/development/python-modules/pyairvisual/default.nix index 084852fa5371..2e9aa97f1f23 100644 --- a/pkgs/development/python-modules/pyairvisual/default.nix +++ b/pkgs/development/python-modules/pyairvisual/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pyairvisual"; - version = "5.0.4"; + version = "5.0.5"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = version; - sha256 = "0z769xrb6w6bhqcq02sjryl1qyvk9dc1xfn06fc3mdqnrbr0xxj3"; + sha256 = "0jjvng3py5g97gvx6rdbk5zxbn5rw8gq1ki4qi4vfsypchxbpz2q"; }; nativeBuildInputs = [ poetry ]; @@ -43,13 +43,15 @@ buildPythonPackage rec { pytestCheckHook ]; - pytestFlagsArray = [ - "tests" - ]; + # Ignore the examples as they are prefixed with test_ + pytestFlagsArray = [ "--ignore examples/" ]; + pythonImportsCheck = [ "pyairvisual" ]; meta = with lib; { - description = "A simple, clean, well-tested Python library for interacting with AirVisual©"; - license = licenses.mit; + description = "Python library for interacting with AirVisual"; homepage = "https://github.com/bachya/pyairvisual"; + changelog = "https://github.com/bachya/pyairvisual/releases/tag/${version}"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/pyalgotrade/default.nix b/pkgs/development/python-modules/pyalgotrade/default.nix index 3703b5fcca4c..075103e9e40f 100644 --- a/pkgs/development/python-modules/pyalgotrade/default.nix +++ b/pkgs/development/python-modules/pyalgotrade/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , matplotlib @@ -32,7 +32,7 @@ buildPythonPackage rec { # no tests in PyPI tarball doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Python Algorithmic Trading"; homepage = "http://gbeced.github.io/pyalgotrade/"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/pyamf/default.nix b/pkgs/development/python-modules/pyamf/default.nix index 1c31efadff7c..f0cf111a87ad 100644 --- a/pkgs/development/python-modules/pyamf/default.nix +++ b/pkgs/development/python-modules/pyamf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage, isPy3k, defusedxml }: +{ lib, stdenv, fetchPypi, buildPythonPackage, isPy3k, defusedxml }: buildPythonPackage rec { pname = "PyAMF"; @@ -14,7 +14,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ defusedxml ]; - meta = with stdenv.lib; { + meta = with lib; { description = "AMF (Action Message Format) support for Python"; homepage = "https://pypi.python.org/pypi/PyAMF"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pyannotate/default.nix b/pkgs/development/python-modules/pyannotate/default.nix index a2dd4eaf7cf0..4442d90ae71a 100644 --- a/pkgs/development/python-modules/pyannotate/default.nix +++ b/pkgs/development/python-modules/pyannotate/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , pythonOlder @@ -25,7 +25,7 @@ buildPythonPackage rec { py.test ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/dropbox/pyannotate"; description = "Auto-generate PEP-484 annotations"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pyarlo/default.nix b/pkgs/development/python-modules/pyarlo/default.nix new file mode 100644 index 000000000000..76fe9bc0a108 --- /dev/null +++ b/pkgs/development/python-modules/pyarlo/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, mock +, pytestCheckHook +, requests +, requests-mock +, sseclient-py +}: + +buildPythonPackage rec { + pname = "pyarlo"; + version = "0.2.4"; + + src = fetchFromGitHub { + owner = "tchellomello"; + repo = "python-arlo"; + rev = version; + sha256 = "0pp7y2llk4xnf6zh57j5xas0gw5zqm42qaqssd8p4qa3g5rds8k3"; + }; + + propagatedBuildInputs = [ + requests + sseclient-py + ]; + + checkInputs = [ + pytestCheckHook + mock + requests-mock + ]; + + pythonImportsCheck = [ "pyarlo" ]; + + meta = with lib; { + description = "Python library to work with Netgear Arlo cameras"; + homepage = "https://github.com/tchellomello/python-arlo"; + license = with licenses; [ lgpl3Plus ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pyasn1-modules/default.nix b/pkgs/development/python-modules/pyasn1-modules/default.nix index 87e72e1ae5bd..2be2e8b9c11a 100644 --- a/pkgs/development/python-modules/pyasn1-modules/default.nix +++ b/pkgs/development/python-modules/pyasn1-modules/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , pyasn1 @@ -26,7 +26,7 @@ buildPythonPackage rec { py.test ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A collection of ASN.1-based protocols modules"; homepage = "https://pypi.python.org/pypi/pyasn1-modules"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/pyasn1/default.nix b/pkgs/development/python-modules/pyasn1/default.nix index 206db053a564..9b269f79c86a 100644 --- a/pkgs/development/python-modules/pyasn1/default.nix +++ b/pkgs/development/python-modules/pyasn1/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, }: +{ lib, stdenv, buildPythonPackage, fetchPypi, }: buildPythonPackage rec { pname = "pyasn1"; @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "aef77c9fb94a3ac588e87841208bdec464471d9871bd5050a287cc9a475cd0ba"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "ASN.1 tools for Python"; homepage = "http://pyasn1.sourceforge.net/"; license = "mBSD"; diff --git a/pkgs/development/python-modules/pyatspi/default.nix b/pkgs/development/python-modules/pyatspi/default.nix index 232e44d0999e..6ac0c776fcd2 100644 --- a/pkgs/development/python-modules/pyatspi/default.nix +++ b/pkgs/development/python-modules/pyatspi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, buildPythonPackage, isPy3k, at-spi2-core, pygobject3, gnome3 }: +{ lib, stdenv, fetchurl, pkgconfig, buildPythonPackage, isPy3k, at-spi2-core, pygobject3, gnome3 }: buildPythonPackage rec { pname = "pyatspi"; @@ -26,7 +26,7 @@ buildPythonPackage rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Python client bindings for D-Bus AT-SPI"; homepage = "https://wiki.linuxfoundation.org/accessibility/d-bus"; license = licenses.gpl2; diff --git a/pkgs/development/python-modules/pyatv/default.nix b/pkgs/development/python-modules/pyatv/default.nix index 647866b143fb..187f94dbd778 100644 --- a/pkgs/development/python-modules/pyatv/default.nix +++ b/pkgs/development/python-modules/pyatv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage +{ lib, stdenv, buildPythonPackage , aiohttp , aiozeroconf , asynctest @@ -46,7 +46,9 @@ buildPythonPackage rec { pytestCheckHook ]; - meta = with stdenv.lib; { + __darwinAllowLocalNetworking = true; + + meta = with lib; { description = "A python client library for the Apple TV"; homepage = "https://github.com/postlund/pyatv"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pyaudio/default.nix b/pkgs/development/python-modules/pyaudio/default.nix index 91791f5a0674..d88dc7009b73 100644 --- a/pkgs/development/python-modules/pyaudio/default.nix +++ b/pkgs/development/python-modules/pyaudio/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , isPyPy @@ -17,7 +17,7 @@ buildPythonPackage rec { buildInputs = [ pkgs.portaudio ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Python bindings for PortAudio"; homepage = "https://people.csail.mit.edu/hubert/pyaudio/"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pyaxmlparser/default.nix b/pkgs/development/python-modules/pyaxmlparser/default.nix index 045cf19c8c00..63e180b11b2b 100644 --- a/pkgs/development/python-modules/pyaxmlparser/default.nix +++ b/pkgs/development/python-modules/pyaxmlparser/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, stdenv, lxml, click, fetchFromGitHub, pytest, isPy3k }: +{ buildPythonPackage, lib, stdenv, lxml, click, fetchFromGitHub, pytest, isPy3k }: buildPythonPackage rec { version = "0.3.24"; @@ -25,11 +25,11 @@ buildPythonPackage rec { py.test tests/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Python3 Parser for Android XML file and get Application Name without using Androguard"; homepage = "https://github.com/appknox/pyaxmlparser"; # Files from Androguard are licensed ASL 2.0 license = with licenses; [ mit asl20 ]; - maintainers = with maintainers; [ ma27 ]; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } diff --git a/pkgs/development/python-modules/pybase64/default.nix b/pkgs/development/python-modules/pybase64/default.nix index d48fed13543b..e462d53fea88 100644 --- a/pkgs/development/python-modules/pybase64/default.nix +++ b/pkgs/development/python-modules/pybase64/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, isPy3k, stdenv, fetchPypi, six, pytest }: +{ buildPythonPackage, isPy3k, lib, stdenv, fetchPypi, six, pytest }: buildPythonPackage rec { pname = "pybase64"; @@ -18,7 +18,7 @@ buildPythonPackage rec { py.test ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://pypi.python.org/pypi/pybase64"; description = "Fast Base64 encoding/decoding"; license = licenses.bsd2; diff --git a/pkgs/development/python-modules/pybindgen/default.nix b/pkgs/development/python-modules/pybindgen/default.nix index 136917c68371..4b6f7f1682ff 100644 --- a/pkgs/development/python-modules/pybindgen/default.nix +++ b/pkgs/development/python-modules/pybindgen/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage, isPy3k, setuptools_scm, pygccxml }: +{ lib, stdenv, fetchPypi, buildPythonPackage, isPy3k, setuptools_scm, pygccxml }: buildPythonPackage rec { pname = "PyBindGen"; version = "0.21.0"; @@ -13,7 +13,7 @@ buildPythonPackage rec { checkInputs = [ pygccxml ]; doCheck = (!isPy3k); # Fails to import module 'cxxfilt' from pygccxml on Py3k - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/gjcarneiro/pybindgen"; description = "Python Bindings Generator"; license = licenses.lgpl2; diff --git a/pkgs/development/python-modules/pyblock/default.nix b/pkgs/development/python-modules/pyblock/default.nix index e7af4f70b1e5..0e94764e4a22 100644 --- a/pkgs/development/python-modules/pyblock/default.nix +++ b/pkgs/development/python-modules/pyblock/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , python , pkgs , isPy3k @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { "SITELIB=$(out)/${python.sitePackages}" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.centos.org/docs/5/html/5.4/Technical_Notes/python-pyblock.html"; description = "Interface for working with block devices"; license = licenses.gpl2Plus; diff --git a/pkgs/development/python-modules/pyblosxom/default.nix b/pkgs/development/python-modules/pyblosxom/default.nix index dfb3e94ba276..dee6aea559a5 100644 --- a/pkgs/development/python-modules/pyblosxom/default.nix +++ b/pkgs/development/python-modules/pyblosxom/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchurl , pygments @@ -22,7 +22,7 @@ buildPythonPackage rec { # both tests fail due to time issue that doesn't seem to matter in practice doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://pyblosxom.github.io"; description = "File-based blogging engine"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pybluez/default.nix b/pkgs/development/python-modules/pybluez/default.nix index 47c70758e4ca..a02861c68cda 100644 --- a/pkgs/development/python-modules/pybluez/default.nix +++ b/pkgs/development/python-modules/pybluez/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchFromGitHub , pkgs @@ -20,7 +20,7 @@ buildPythonPackage rec { # the tests do not pass doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Bluetooth Python extension module"; license = licenses.gpl2; maintainers = with maintainers; [ leenaars ]; diff --git a/pkgs/development/python-modules/pybotvac/default.nix b/pkgs/development/python-modules/pybotvac/default.nix index c5e239ab8973..06ebf85ffe8c 100644 --- a/pkgs/development/python-modules/pybotvac/default.nix +++ b/pkgs/development/python-modules/pybotvac/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, requests }: +{ lib, stdenv, buildPythonPackage, fetchPypi, requests }: buildPythonPackage rec { pname = "pybotvac"; @@ -11,7 +11,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Python package for controlling Neato pybotvac Connected vacuum robot"; homepage = "https://github.com/stianaske/pybotvac"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pybrowserid/default.nix b/pkgs/development/python-modules/pybrowserid/default.nix index fe5ace886ac0..eacbd81055c5 100644 --- a/pkgs/development/python-modules/pybrowserid/default.nix +++ b/pkgs/development/python-modules/pybrowserid/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ lib, stdenv, buildPythonPackage, fetchPypi , requests, mock }: buildPythonPackage rec { @@ -14,7 +14,7 @@ buildPythonPackage rec { checkInputs = [ mock ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Python library for the BrowserID Protocol"; homepage = "https://github.com/mozilla/PyBrowserID"; license = licenses.mpl20; diff --git a/pkgs/development/python-modules/pycallgraph/default.nix b/pkgs/development/python-modules/pycallgraph/default.nix index 293489cce05b..1353af406ca4 100644 --- a/pkgs/development/python-modules/pycallgraph/default.nix +++ b/pkgs/development/python-modules/pycallgraph/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , pytest @@ -18,7 +18,7 @@ buildPythonPackage rec { # Tests do not work due to this bug: https://github.com/gak/pycallgraph/issues/118 doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://pycallgraph.slowchop.com"; description = "Call graph visualizations for Python applications"; maintainers = with maintainers; [ auntie ]; diff --git a/pkgs/development/python-modules/pycangjie/default.nix b/pkgs/development/python-modules/pycangjie/default.nix index dc4ab1d4bbda..74c8ecd92b17 100644 --- a/pkgs/development/python-modules/pycangjie/default.nix +++ b/pkgs/development/python-modules/pycangjie/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bash, autoconf, automake, libtool, pkgconfig, libcangjie +{ lib, stdenv, fetchurl, bash, autoconf, automake, libtool, pkgconfig, libcangjie , sqlite, buildPythonPackage, cython }: @@ -26,7 +26,7 @@ in buildPythonPackage { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Python wrapper to libcangjie"; homepage = "http://cangjians.github.io/projects/pycangjie/"; license = licenses.lgpl3Plus; diff --git a/pkgs/development/python-modules/pycapnp/default.nix b/pkgs/development/python-modules/pycapnp/default.nix index 1997021ce010..ab9088cf1e5f 100644 --- a/pkgs/development/python-modules/pycapnp/default.nix +++ b/pkgs/development/python-modules/pycapnp/default.nix @@ -1,34 +1,35 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage -, fetchPypi , capnproto , cython +, fetchFromGitHub +, isPy27 , isPyPy -, isPy3k +, pkgconfig }: buildPythonPackage rec { pname = "pycapnp"; version = "1.0.0"; - disabled = isPyPy || isPy3k; + disabled = isPyPy || isPy27; - src = fetchPypi { - inherit pname version; - sha256 = "9f6fcca349ebf2ec04ca7eacb076aea3e4fcdc010ac33c98b54f0a19d4e5d3e0"; + src = fetchFromGitHub { + owner = "capnproto"; + repo = pname; + rev = "v${version}"; + sha256 = "1n6dq2fbagi3wvrpkyb7wx4y15nkm2grln4y75hrqgmnli8ggi9v"; }; - buildInputs = [ capnproto cython ]; + buildInputs = [ capnproto cython pkgconfig ]; - # import setuptools as soon as possible, to minimize monkeypatching mayhem. - postConfigure = '' - sed -i '3iimport setuptools' setup.py - ''; + # Tests disabled due to dependency on jinja and various other libraries. + doCheck = false; - meta = with stdenv.lib; { - maintainers = with maintainers; [ cstrahan ]; + pythonImportsCheck = [ "capnp" ]; + + meta = with lib; { + maintainers = with maintainers; [ cstrahan lukeadams ]; license = licenses.bsd2; - homepage = "http://jparyani.github.io/pycapnp/index.html"; - broken = true; # 2018-04-11 + homepage = "https://capnproto.github.io/pycapnp/"; }; - } diff --git a/pkgs/development/python-modules/pycarddav/default.nix b/pkgs/development/python-modules/pycarddav/default.nix index 674c9e9af86b..7885cf65b83b 100644 --- a/pkgs/development/python-modules/pycarddav/default.nix +++ b/pkgs/development/python-modules/pycarddav/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , isPy3k @@ -22,7 +22,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ vobject lxml requests urwid pyxdg ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Command-line interface carddav client"; homepage = "http://lostpackets.de/pycarddav"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pycares/default.nix b/pkgs/development/python-modules/pycares/default.nix index e233d8d70884..8404063ac1f8 100644 --- a/pkgs/development/python-modules/pycares/default.nix +++ b/pkgs/development/python-modules/pycares/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , python @@ -26,7 +26,7 @@ buildPythonPackage rec { # requires network access doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/saghul/pycares"; description = "Interface for c-ares"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pycdio/default.nix b/pkgs/development/python-modules/pycdio/default.nix index d5633f9eaefa..b290d9ea959b 100644 --- a/pkgs/development/python-modules/pycdio/default.nix +++ b/pkgs/development/python-modules/pycdio/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , setuptools @@ -37,7 +37,7 @@ buildPythonPackage rec { nosetests ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.gnu.org/software/libcdio/"; description = "Wrapper around libcdio (CD Input and Control library)"; maintainers = with maintainers; [ rycee ]; diff --git a/pkgs/development/python-modules/pychart/default.nix b/pkgs/development/python-modules/pychart/default.nix index 98c3242cb29d..2c2399fca92e 100644 --- a/pkgs/development/python-modules/pychart/default.nix +++ b/pkgs/development/python-modules/pychart/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy27 }: +{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27 }: buildPythonPackage rec { pname = "pychart"; @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "882650928776a7ca72e67054a9e0ac98f78645f279c0cfb5910db28f03f07c2e"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Library for creating high quality encapsulated Postscript, PDF, PNG, or SVG charts"; homepage = "https://pypi.python.org/pypi/PyChart"; license = licenses.gpl2; diff --git a/pkgs/development/python-modules/pychef/default.nix b/pkgs/development/python-modules/pychef/default.nix index 6d60573b96eb..1702cde840cf 100644 --- a/pkgs/development/python-modules/pychef/default.nix +++ b/pkgs/development/python-modules/pychef/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , six @@ -21,7 +21,7 @@ buildPythonPackage rec { # FIXME doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/coderanger/pychef"; description = "Python implementation of a Chef API client"; license = licenses.bsd0; diff --git a/pkgs/development/python-modules/pychromecast/default.nix b/pkgs/development/python-modules/pychromecast/default.nix index 6e45eb2a626f..fecf3f09ca7c 100644 --- a/pkgs/development/python-modules/pychromecast/default.nix +++ b/pkgs/development/python-modules/pychromecast/default.nix @@ -2,17 +2,19 @@ buildPythonPackage rec { pname = "PyChromecast"; - version = "7.7.1"; + version = "7.7.2"; src = fetchPypi { inherit pname version; - sha256 = "09mdz1y1bfwkszxsawffwy1mr7lc1j2rma571qkb60sk76107zfn"; + sha256 = "1w7jayb0z529bh1ybb16pfm0m08qqi4px1q0qwlvcxlcrd2v3m5a"; }; disabled = !isPy3k; propagatedBuildInputs = [ requests zeroconf protobuf casttube ]; + # no tests available + doCheck = false; pythonImportsCheck = [ "pychromecast" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/pyclipper/default.nix b/pkgs/development/python-modules/pyclipper/default.nix index 6096f30181a1..e89389547096 100644 --- a/pkgs/development/python-modules/pyclipper/default.nix +++ b/pkgs/development/python-modules/pyclipper/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchPypi , buildPythonPackage , setuptools_scm @@ -26,7 +26,7 @@ buildPythonPackage rec { doCheck = false; pythonImportsCheck = [ "pyclipper" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Cython wrapper for clipper library"; homepage = "https://github.com/fonttools/pyclipper"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pycm/default.nix b/pkgs/development/python-modules/pycm/default.nix index a51aa1b931aa..ada4eeeb556c 100644 --- a/pkgs/development/python-modules/pycm/default.nix +++ b/pkgs/development/python-modules/pycm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, isPy3k, numpy, pytest }: +{ lib, stdenv, buildPythonPackage, fetchFromGitHub, isPy3k, numpy, pytest }: buildPythonPackage rec { pname = "pycm"; @@ -26,7 +26,7 @@ buildPythonPackage rec { pytest Test/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Multiclass confusion matrix library"; homepage = "https://pycm.ir"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pycoin/default.nix b/pkgs/development/python-modules/pycoin/default.nix index cb0431be61f8..a21c8f6f549d 100644 --- a/pkgs/development/python-modules/pycoin/default.nix +++ b/pkgs/development/python-modules/pycoin/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchPypi , buildPythonPackage , gnupg @@ -33,7 +33,7 @@ buildPythonPackage rec { "test_tx_with_gpg" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Utilities for Bitcoin and altcoin addresses and transaction manipulation"; homepage = "https://github.com/richardkiss/pycoin"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pycollada/default.nix b/pkgs/development/python-modules/pycollada/default.nix index 4015f9164e9d..4b177012f4ed 100644 --- a/pkgs/development/python-modules/pycollada/default.nix +++ b/pkgs/development/python-modules/pycollada/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage, numpy, dateutil }: +{ lib, stdenv, fetchPypi, buildPythonPackage, numpy, dateutil }: buildPythonPackage rec { pname = "pycollada"; @@ -15,7 +15,7 @@ buildPythonPackage rec { # (upstream packaging issue) doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Python library for reading and writing collada documents"; homepage = "http://pycollada.github.io/"; license = "BSD"; # they don't specify which BSD variant diff --git a/pkgs/development/python-modules/pycontracts/default.nix b/pkgs/development/python-modules/pycontracts/default.nix index 330acab3e1d0..0b511e024dc0 100644 --- a/pkgs/development/python-modules/pycontracts/default.nix +++ b/pkgs/development/python-modules/pycontracts/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ lib, stdenv, buildPythonPackage, fetchPypi , nose, pyparsing, decorator, six, future }: buildPythonPackage rec { @@ -13,7 +13,7 @@ buildPythonPackage rec { buildInputs = [ nose ]; propagatedBuildInputs = [ pyparsing decorator six future ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Allows to declare constraints on function parameters and return values"; homepage = "https://pypi.python.org/pypi/PyContracts"; license = licenses.lgpl2; diff --git a/pkgs/development/python-modules/pycountry/default.nix b/pkgs/development/python-modules/pycountry/default.nix index 2cd707ee8dcb..b402e9092406 100644 --- a/pkgs/development/python-modules/pycountry/default.nix +++ b/pkgs/development/python-modules/pycountry/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "0hnbabsmqimx5hqh0jbd2f64i8fhzhhbrvid57048hs5sd9ll241"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://bitbucket.org/flyingcircus/pycountry"; description = "ISO country, subdivision, language, currency and script definitions and their translations"; license = licenses.lgpl2; diff --git a/pkgs/development/python-modules/pycparser/default.nix b/pkgs/development/python-modules/pycparser/default.nix index f3fa6f883fb6..a246ce53a1e0 100644 --- a/pkgs/development/python-modules/pycparser/default.nix +++ b/pkgs/development/python-modules/pycparser/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, python }: +{ lib, stdenv, buildPythonPackage, fetchPypi, python }: buildPythonPackage rec { pname = "pycparser"; @@ -13,7 +13,7 @@ buildPythonPackage rec { ${python.interpreter} -m unittest discover -s tests ''; - meta = with stdenv.lib; { + meta = with lib; { description = "C parser in Python"; homepage = "https://github.com/eliben/pycparser"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/pycryptopp/default.nix b/pkgs/development/python-modules/pycryptopp/default.nix index 25ac99082c0a..0f17d9e59a80 100644 --- a/pkgs/development/python-modules/pycryptopp/default.nix +++ b/pkgs/development/python-modules/pycryptopp/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , fetchpatch @@ -34,7 +34,7 @@ buildPythonPackage rec { buildInputs = [ setuptoolsDarcs darcsver pkgs.cryptopp ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://tahoe-lafs.org/trac/pycryptopp"; description = "Python wrappers for the Crypto++ library"; license = licenses.gpl2Plus; diff --git a/pkgs/development/python-modules/pycuda/default.nix b/pkgs/development/python-modules/pycuda/default.nix index 3876485dd966..368894228afc 100644 --- a/pkgs/development/python-modules/pycuda/default.nix +++ b/pkgs/development/python-modules/pycuda/default.nix @@ -12,7 +12,7 @@ , cudatoolkit , python , mkDerivation -, stdenv +, lib, stdenv }: let compyte = import ./compyte.nix { @@ -60,7 +60,7 @@ buildPythonPackage rec { Mako ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/inducer/pycuda/"; description = "CUDA integration for Python."; license = licenses.mit; diff --git a/pkgs/development/python-modules/pydenticon/default.nix b/pkgs/development/python-modules/pydenticon/default.nix index db04991e6ebc..763cfb9b8456 100644 --- a/pkgs/development/python-modules/pydenticon/default.nix +++ b/pkgs/development/python-modules/pydenticon/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , pillow @@ -16,7 +16,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pillow mock ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/azaghal/pydenticon"; description = "Library for generating identicons. Port of Sigil (https://github.com/cupcake/sigil) with enhancements"; license = licenses.bsd0; diff --git a/pkgs/development/python-modules/pydexcom/default.nix b/pkgs/development/python-modules/pydexcom/default.nix new file mode 100644 index 000000000000..f83d3cbf1102 --- /dev/null +++ b/pkgs/development/python-modules/pydexcom/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, requests +}: + +buildPythonPackage rec { + pname = "pydexcom"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "gagebenne"; + repo = pname; + rev = version; + sha256 = "19h7r0qbsqd6k6g4nz6z3k9kdmk0sx5zpsrgxwnhsff5fqi0y2ls"; + }; + + propagatedBuildInputs = [ requests ]; + + # tests are interacting with the Dexcom API + doCheck = false; + pythonImportsCheck = [ "pydexcom" ]; + + meta = with lib; { + description = "Python API to interact with Dexcom Share service"; + homepage = "https://github.com/gagebenne/pydexcom"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pydicom/default.nix b/pkgs/development/python-modules/pydicom/default.nix index 24186c09dcd5..08c5f099d28c 100644 --- a/pkgs/development/python-modules/pydicom/default.nix +++ b/pkgs/development/python-modules/pydicom/default.nix @@ -1,31 +1,57 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage -, fetchPypi +, fetchFromGitHub , isPy27 -, pytest , pytestrunner , pytestCheckHook , numpy , pillow }: -buildPythonPackage rec { - version = "2.1.1"; +let pname = "pydicom"; - disabled = isPy27; + version = "2.1.2"; - src = fetchPypi { - inherit pname version; - sha256 = "72a11086f6a277c1529a552583fde73e03256a912173f15e9bc256e5b28f28f1"; + src = fetchFromGitHub { + owner = "${pname}"; + repo = "${pname}"; + rev = "v${version}"; + sha256 = "sha256-iExy+mUs1uqs/u9N6btlqyP6/TvoPVsuOuzs56zZAS8="; }; + # Pydicom needs pydicom-data to run some tests. If these files are downloaded + # before the package creation, it'll try to download during the checkPhase. + test_data = fetchFromGitHub { + owner = "${pname}"; + repo = "${pname}-data"; + rev = "bbb723879690bb77e077a6d57657930998e92bd5"; + sha256 = "sha256-dCI1temvpNWiWJYVfQZKy/YJ4ad5B0e9hEKHJnEeqzk="; + }; + +in +buildPythonPackage { + inherit pname version src; + disabled = isPy27; + propagatedBuildInputs = [ numpy pillow ]; - checkInputs = [ pytest pytestrunner pytestCheckHook ]; - disabledTests = [ "test_invalid_bit_depth_raises" ]; - # harmless failure; see https://github.com/pydicom/pydicom/issues/1119 + checkInputs = [ pytestrunner pytestCheckHook ]; - meta = with stdenv.lib; { + # Setting $HOME to prevent pytest to try to create a folder inside + # /homeless-shelter which is read-only. + # Linking pydicom-data dicom files to $HOME/.pydicom/data + preCheck = '' + export HOME=$TMP/test-home + mkdir -p $HOME/.pydicom/ + ln -s ${test_data}/data_store/data $HOME/.pydicom/data + ''; + + # This test try to remove a dicom inside $HOME/.pydicom/data/ and download it again. + disabledTests = [ + "test_fetch_data_files" + ]; + + meta = with lib; { homepage = "https://pydicom.github.io"; description = "Pure-Python package for working with DICOM files"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pydispatcher/default.nix b/pkgs/development/python-modules/pydispatcher/default.nix index 066410b7a0da..d132fad73138 100644 --- a/pkgs/development/python-modules/pydispatcher/default.nix +++ b/pkgs/development/python-modules/pydispatcher/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , pytest @@ -19,7 +19,7 @@ buildPythonPackage rec { py.test ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://pydispatcher.sourceforge.net/"; description = "Signal-registration and routing infrastructure for use in multiple contexts"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/pydns/default.nix b/pkgs/development/python-modules/pydns/default.nix index 399eab3e6742..a93820bfaef2 100644 --- a/pkgs/development/python-modules/pydns/default.nix +++ b/pkgs/development/python-modules/pydns/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi }: @@ -14,7 +14,7 @@ buildPythonPackage rec { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Python DNS library"; homepage = "http://pydns.sourceforge.net/"; license = licenses.psfl; diff --git a/pkgs/development/python-modules/pydotplus/default.nix b/pkgs/development/python-modules/pydotplus/default.nix index bb25ecd85e26..f794a150ec15 100644 --- a/pkgs/development/python-modules/pydotplus/default.nix +++ b/pkgs/development/python-modules/pydotplus/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , pyparsing @@ -19,7 +19,7 @@ buildPythonPackage rec { graphviz ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/erocarrera/pydot"; description = "An improved version of the old pydot project that provides a Python Interface to Graphviz’s Dot language"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pydub/default.nix b/pkgs/development/python-modules/pydub/default.nix index 42d33c00cbe8..13b999831985 100644 --- a/pkgs/development/python-modules/pydub/default.nix +++ b/pkgs/development/python-modules/pydub/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, scipy, ffmpeg-full }: +{ lib, stdenv, buildPythonPackage, fetchFromGitHub, scipy, ffmpeg-full }: buildPythonPackage rec { pname = "pydub"; @@ -24,7 +24,7 @@ buildPythonPackage rec { python test/test.py ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Manipulate audio with a simple and easy high level interface."; homepage = "http://pydub.com/"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pyechonest/default.nix b/pkgs/development/python-modules/pyechonest/default.nix index 510849edf475..10ade4fa2cab 100644 --- a/pkgs/development/python-modules/pyechonest/default.nix +++ b/pkgs/development/python-modules/pyechonest/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy3k }: +{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k }: buildPythonPackage rec { pname = "pyechonest"; @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "1da4b3b8b457232a7eb35b59a48390b3c208759b01d596acaa71e6a172b40495"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Tap into The Echo Nest's Musical Brain for the best music search, information, recommendations and remix tools on the web"; homepage = "https://github.com/echonest/pyechonest"; }; diff --git a/pkgs/development/python-modules/pyelftools/default.nix b/pkgs/development/python-modules/pyelftools/default.nix index 51e1886f1d0d..5686a6ffadb2 100644 --- a/pkgs/development/python-modules/pyelftools/default.nix +++ b/pkgs/development/python-modules/pyelftools/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchFromGitHub , python @@ -24,7 +24,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "elftools" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A library for analyzing ELF files and DWARF debugging information"; homepage = "https://github.com/eliben/pyelftools"; license = licenses.publicDomain; diff --git a/pkgs/development/python-modules/pyemd/default.nix b/pkgs/development/python-modules/pyemd/default.nix index c6bc941046d5..4e7594fbab5b 100644 --- a/pkgs/development/python-modules/pyemd/default.nix +++ b/pkgs/development/python-modules/pyemd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, numpy, cython }: +{ lib, stdenv, buildPythonPackage, fetchPypi, numpy, cython }: buildPythonPackage rec { pname = "pyemd"; @@ -12,7 +12,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ numpy ]; buildInputs = [ cython ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A Python wrapper for Ofir Pele and Michael Werman's implementation of the Earth Mover's Distance"; homepage = "https://github.com/wmayner/pyemd"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pyenchant/default.nix b/pkgs/development/python-modules/pyenchant/default.nix index 1c82f7c9d630..fe4182fd53d8 100644 --- a/pkgs/development/python-modules/pyenchant/default.nix +++ b/pkgs/development/python-modules/pyenchant/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , isPy27 , fetchPypi @@ -35,7 +35,7 @@ buildPythonPackage rec { # dictionaries needed for tests doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "pyenchant: Python bindings for the Enchant spellchecker"; homepage = "https://github.com/pyenchant/pyenchant"; license = licenses.lgpl21; diff --git a/pkgs/development/python-modules/pyeverlights/default.nix b/pkgs/development/python-modules/pyeverlights/default.nix new file mode 100644 index 000000000000..00b9f8fb0154 --- /dev/null +++ b/pkgs/development/python-modules/pyeverlights/default.nix @@ -0,0 +1,30 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchFromGitHub +}: + +buildPythonPackage rec { + pname = "pyeverlights"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "joncar"; + repo = pname; + rev = version; + sha256 = "16xpq933j8yydq78fnf4f7ivyw5a45ix4mfycpmm91aj549p6pm0"; + }; + + propagatedBuildInputs = [ aiohttp ]; + + # no tests are present + doCheck = false; + pythonImportsCheck = [ "pyeverlights" ]; + + meta = with lib; { + description = "Python module for interfacing with an EverLights control box"; + homepage = "https://github.com/joncar/pyeverlights"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pyevmasm/default.nix b/pkgs/development/python-modules/pyevmasm/default.nix new file mode 100644 index 000000000000..d2923f1ad44a --- /dev/null +++ b/pkgs/development/python-modules/pyevmasm/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, future +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "pyevmasm"; + version = "0.2.3"; + + src = fetchFromGitHub { + owner = "crytic"; + repo = pname; + rev = version; + sha256 = "134q0z0dqzxzr0jw5jr98kp90kx2dl0qw9smykwxdgq555q1l6qa"; + }; + + propagatedBuildInputs = [ future ]; + + checkInputs = [ pytestCheckHook ]; + + meta = with lib; { + description = "Ethereum Virtual Machine (EVM) assembler and disassembler"; + homepage = "https://github.com/crytic/pyevmasm"; + changelog = "https://github.com/crytic/pyevmasm/releases/tag/${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ arturcygan ]; + }; +} diff --git a/pkgs/development/python-modules/pyexcelerator/default.nix b/pkgs/development/python-modules/pyexcelerator/default.nix index 2dfb5831f7fe..373885073949 100644 --- a/pkgs/development/python-modules/pyexcelerator/default.nix +++ b/pkgs/development/python-modules/pyexcelerator/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , isPy3k @@ -18,7 +18,7 @@ buildPythonPackage rec { # No tests are included in archive doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "library for generating Excel 97/2000/XP/2003 and OpenOffice Calc compatible spreadsheets."; homepage = "https://sourceforge.net/projects/pyexcelerator"; license = licenses.bsdOriginal; diff --git a/pkgs/development/python-modules/pyext/default.nix b/pkgs/development/python-modules/pyext/default.nix index 9351ee5d1043..befbd3c2de1d 100644 --- a/pkgs/development/python-modules/pyext/default.nix +++ b/pkgs/development/python-modules/pyext/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub }: +{ lib, stdenv, buildPythonPackage, fetchFromGitHub }: buildPythonPackage { pname = "pyext"; @@ -15,7 +15,7 @@ buildPythonPackage { # Has no test suite doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Simple Python extensions"; homepage = "https://github.com/kirbyfan64/PyExt"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pyface/default.nix b/pkgs/development/python-modules/pyface/default.nix index 68afbafef308..db118fbbd8c2 100644 --- a/pkgs/development/python-modules/pyface/default.nix +++ b/pkgs/development/python-modules/pyface/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage +{ lib, stdenv, fetchPypi, buildPythonPackage , setuptools, six, traits }: @@ -15,7 +15,7 @@ buildPythonPackage rec { doCheck = false; # Needs X server - meta = with stdenv.lib; { + meta = with lib; { description = "Traits-capable windowing framework"; homepage = "https://github.com/enthought/pyface"; maintainers = with stdenv.lib.maintainers; [ knedlsepp ]; diff --git a/pkgs/development/python-modules/pyfakefs/default.nix b/pkgs/development/python-modules/pyfakefs/default.nix index 6f44b7fb2796..4deaa3eb2688 100644 --- a/pkgs/development/python-modules/pyfakefs/default.nix +++ b/pkgs/development/python-modules/pyfakefs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, python, pytest, glibcLocales }: +{ lib, stdenv, buildPythonPackage, fetchPypi, pythonOlder, python, pytest, glibcLocales }: buildPythonPackage rec { version = "4.3.2"; @@ -34,7 +34,7 @@ buildPythonPackage rec { ${python.interpreter} -m pytest pyfakefs/pytest_tests/pytest_plugin_test.py ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Fake file system that mocks the Python file system modules"; license = licenses.asl20; homepage = "http://pyfakefs.org/"; diff --git a/pkgs/development/python-modules/pyfantom/default.nix b/pkgs/development/python-modules/pyfantom/default.nix index a3facfc771ce..a17388b34b5c 100644 --- a/pkgs/development/python-modules/pyfantom/default.nix +++ b/pkgs/development/python-modules/pyfantom/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchgit }: @@ -15,7 +15,7 @@ buildPythonPackage { # No tests included doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://pyfantom.ni.fr.eu.org/"; description = "Wrapper for the LEGO Mindstorms Fantom Driver"; license = licenses.gpl2; diff --git a/pkgs/development/python-modules/pyfftw/default.nix b/pkgs/development/python-modules/pyfftw/default.nix index c8dc83b4eba5..ff66dc8f8675 100644 --- a/pkgs/development/python-modules/pyfftw/default.nix +++ b/pkgs/development/python-modules/pyfftw/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ lib, stdenv, buildPythonPackage, fetchPypi , fftw, fftwFloat, fftwLongDouble, numpy, scipy, cython, dask }: buildPythonPackage rec { @@ -25,7 +25,7 @@ buildPythonPackage rec { # export DYLD_LIBRARY_PATH="${pkgs.fftw.out}/lib" #''; - meta = with stdenv.lib; { + meta = with lib; { description = "A pythonic wrapper around FFTW, the FFT library, presenting a unified interface for all the supported transforms"; homepage = "http://hgomersall.github.com/pyFFTW/"; license = with licenses; [ bsd2 bsd3 ]; diff --git a/pkgs/development/python-modules/pyfido/default.nix b/pkgs/development/python-modules/pyfido/default.nix new file mode 100644 index 000000000000..43909e2c130f --- /dev/null +++ b/pkgs/development/python-modules/pyfido/default.nix @@ -0,0 +1,28 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "pyfido"; + version = "2.1.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "0b28bhyhscaw7dbc92dxswann05x8mz92cagyawdfm8jnc67gq4b"; + }; + + propagatedBuildInputs = [ aiohttp ]; + + # Project has no tests + doCheck = false; + pythonImportsCheck = [ "pyfido" ]; + + meta = with lib; { + description = "Python client to get fido account data"; + homepage = "https://github.com/titilambert/pyfido"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pyfiglet/default.nix b/pkgs/development/python-modules/pyfiglet/default.nix index d8256e9632a3..a4fe9ec9dfe6 100644 --- a/pkgs/development/python-modules/pyfiglet/default.nix +++ b/pkgs/development/python-modules/pyfiglet/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi }: +{ lib, stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { version = "0.8.post1"; @@ -11,7 +11,7 @@ buildPythonPackage rec { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "FIGlet in pure Python"; license = licenses.gpl2Plus; maintainers = with maintainers; [ thoughtpolice ]; diff --git a/pkgs/development/python-modules/pyflakes/default.nix b/pkgs/development/python-modules/pyflakes/default.nix index 04bc56df12d2..2ff88a78a4e7 100644 --- a/pkgs/development/python-modules/pyflakes/default.nix +++ b/pkgs/development/python-modules/pyflakes/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, unittest2 }: +{ lib, stdenv, buildPythonPackage, fetchPypi, pythonOlder, unittest2 }: buildPythonPackage rec { pname = "pyflakes"; @@ -14,7 +14,7 @@ buildPythonPackage rec { # some tests are output dependent, which have changed slightly doCheck = pythonOlder "3.9"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://launchpad.net/pyflakes"; description = "A simple program which checks Python source files for errors"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pyfnip/default.nix b/pkgs/development/python-modules/pyfnip/default.nix new file mode 100644 index 000000000000..1306c530bb43 --- /dev/null +++ b/pkgs/development/python-modules/pyfnip/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchPypi +, requests +}: + +buildPythonPackage rec { + pname = "pyfnip"; + version = "0.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "0q52rb0kshgbligxjqrwz0v7kgqjbv6jahdb66ndxy93mfr0ig3a"; + }; + + propagatedBuildInputs = [ requests ]; + + # Project has no tests + doCheck = false; + pythonImportsCheck = [ "pyfnip" ]; + + meta = with lib; { + description = "Python client to get fido account data"; + homepage = "https://github.com/juhaniemi/pyfnip"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pyfribidi/default.nix b/pkgs/development/python-modules/pyfribidi/default.nix index e71550867a3d..17905b2bb396 100644 --- a/pkgs/development/python-modules/pyfribidi/default.nix +++ b/pkgs/development/python-modules/pyfribidi/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , isPyPy @@ -20,7 +20,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A simple wrapper around fribidi"; homepage = "https://github.com/pediapress/pyfribidi"; license = stdenv.lib.licenses.gpl2; diff --git a/pkgs/development/python-modules/pyftdi/default.nix b/pkgs/development/python-modules/pyftdi/default.nix index 4cb6138d5ebb..2b46a4ce6825 100644 --- a/pkgs/development/python-modules/pyftdi/default.nix +++ b/pkgs/development/python-modules/pyftdi/default.nix @@ -1,24 +1,39 @@ -{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder, pyusb, pyserial }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, pyserial +, pythonOlder +, pyusb +}: buildPythonPackage rec { pname = "pyftdi"; - version = "0.51.2"; + version = "0.52.9"; disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "eblot"; repo = pname; rev = "v${version}"; - sha256 = "14mkwk44bgm6s4kqagz7nm6p6gsygmksl2628jaqh7ppblxca9as"; + sha256 = "07q9wmpl97a6laxfbcjqhv373msbsjppsyf5i77h0f6ccil0q1i6"; }; propagatedBuildInputs = [ pyusb pyserial ]; + # tests requires access to the serial port + doCheck = false; + pythonImportsCheck = [ "pyftdi" ]; - meta = { + meta = with lib; { description = "User-space driver for modern FTDI devices"; + longDescription = '' + PyFtdi aims at providing a user-space driver for popular FTDI devices. + This includes UART, GPIO and multi-serial protocols (SPI, I2C, JTAG) + bridges. + ''; homepage = "https://github.com/eblot/pyftdi"; - license = lib.licenses.bsd3; + license = licenses.bsd3; + maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/pyftpdlib/default.nix b/pkgs/development/python-modules/pyftpdlib/default.nix index 721d279478d6..5d0d72eb4959 100644 --- a/pkgs/development/python-modules/pyftpdlib/default.nix +++ b/pkgs/development/python-modules/pyftpdlib/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , mock @@ -23,7 +23,7 @@ buildPythonPackage rec { # on Hydra: https://hydra.nixos.org/build/84374861 doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/giampaolo/pyftpdlib/"; description = "Very fast asynchronous FTP server library"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pyfttt/default.nix b/pkgs/development/python-modules/pyfttt/default.nix index 8592d9b0aeef..8648ad4f876d 100644 --- a/pkgs/development/python-modules/pyfttt/default.nix +++ b/pkgs/development/python-modules/pyfttt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ lib, stdenv, buildPythonPackage, fetchPypi , requests }: buildPythonPackage rec { @@ -15,7 +15,7 @@ buildPythonPackage rec { # tests need a server to run against doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Package for sending events to the IFTTT Webhooks Channel"; homepage = "https://github.com/briandconnelly/pyfttt"; maintainers = with maintainers; [ peterhoeg ]; diff --git a/pkgs/development/python-modules/pygal/default.nix b/pkgs/development/python-modules/pygal/default.nix index b02b60434252..733bfa15a4c5 100644 --- a/pkgs/development/python-modules/pygal/default.nix +++ b/pkgs/development/python-modules/pygal/default.nix @@ -1,6 +1,7 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi +, fetchpatch , isPyPy , flask , pyquery @@ -16,12 +17,20 @@ buildPythonPackage rec { pname = "pygal"; version = "2.4.0"; - doCheck = !isPyPy; # one check fails with pypy + doCheck = !isPyPy; # one check fails with pypy src = fetchPypi { inherit pname version; sha256 = "9204f05380b02a8a32f9bf99d310b51aa2a932cba5b369f7a4dc3705f0a4ce83"; }; + patches = [ + # Fixes compatibility with latest pytest. October 12, 2020. + # Should be included in the next release after 2.4.0 + (fetchpatch { + url = "https://github.com/Kozea/pygal/commit/19e5399be18a054b3b293f4a8a2777d2df4f9c18.patch"; + sha256 = "1j0hpcvd2mhi449wmlr0ml9gw4cakqk3av1j79bi2qy86dyrss2l"; + }) + ]; buildInputs = [ flask @@ -48,10 +57,10 @@ buildPythonPackage rec { propagatedBuildInputs = [ cairosvg tinycss cssselect ] ++ stdenv.lib.optionals (!isPyPy) [ lxml ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Sexy and simple python charting"; homepage = "http://www.pygal.org"; - license = licenses.lgpl3; + license = licenses.lgpl3Plus; maintainers = with maintainers; [ sjourdois ]; }; diff --git a/pkgs/development/python-modules/pygame_sdl2/default.nix b/pkgs/development/python-modules/pygame_sdl2/default.nix index ab46a5670eeb..afca3dd7bc19 100644 --- a/pkgs/development/python-modules/pygame_sdl2/default.nix +++ b/pkgs/development/python-modules/pygame_sdl2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchurl, isPy27 +{ lib, stdenv, buildPythonPackage, fetchurl, isPy27 , cython, SDL2, SDL2_image, SDL2_ttf, SDL2_mixer, libjpeg, libpng }: buildPythonPackage rec { @@ -34,7 +34,7 @@ buildPythonPackage rec { ln -s pygame-sdl2 pygame_sdl2 || true ; ) ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A reimplementation of parts of pygame API using SDL2"; homepage = "https://github.com/renpy/pygame_sdl2"; # Some parts are also available under Zlib License diff --git a/pkgs/development/python-modules/pygccxml/default.nix b/pkgs/development/python-modules/pygccxml/default.nix index 14bd14ab75e7..a1a6b0222b83 100644 --- a/pkgs/development/python-modules/pygccxml/default.nix +++ b/pkgs/development/python-modules/pygccxml/default.nix @@ -1,4 +1,4 @@ -{ stdenv, castxml, fetchFromGitHub, buildPythonPackage, +{ lib, stdenv, castxml, fetchFromGitHub, buildPythonPackage, llvmPackages }: buildPythonPackage rec { pname = "pygccxml"; @@ -17,7 +17,7 @@ buildPythonPackage rec { # but the format doesn't accept -isystem directives doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/gccxml/pygccxml"; description = "Python package for easy C++ declarations navigation"; license = licenses.boost; diff --git a/pkgs/development/python-modules/pygeoip/default.nix b/pkgs/development/python-modules/pygeoip/default.nix index 6cd21a94a9be..7aa16ac1e9a8 100644 --- a/pkgs/development/python-modules/pygeoip/default.nix +++ b/pkgs/development/python-modules/pygeoip/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ lib, stdenv, buildPythonPackage, fetchPypi , nose }: buildPythonPackage rec { @@ -15,7 +15,7 @@ buildPythonPackage rec { buildInputs = [ nose ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Pure Python GeoIP API"; homepage = "https://github.com/appliedsec/pygeoip"; license = licenses.lgpl3Plus; diff --git a/pkgs/development/python-modules/pyglet/default.nix b/pkgs/development/python-modules/pyglet/default.nix index a37872d90945..1bb36d6029ec 100644 --- a/pkgs/development/python-modules/pyglet/default.nix +++ b/pkgs/development/python-modules/pyglet/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , libGL @@ -75,7 +75,7 @@ buildPythonPackage rec { py.test tests/unit tests/integration ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.pyglet.org/"; description = "A cross-platform windowing and multimedia library"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/pygments-better-html/default.nix b/pkgs/development/python-modules/pygments-better-html/default.nix index 87b8e0b3ffb7..2e5d6271c66a 100644 --- a/pkgs/development/python-modules/pygments-better-html/default.nix +++ b/pkgs/development/python-modules/pygments-better-html/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , pygments @@ -22,7 +22,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "pygments_better_html" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/Kwpolska/pygments_better_html"; description = "Improved line numbering for Pygments’ HTML formatter."; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/pygments-markdown-lexer/default.nix b/pkgs/development/python-modules/pygments-markdown-lexer/default.nix index 8f41995cf395..31a6b043494d 100644 --- a/pkgs/development/python-modules/pygments-markdown-lexer/default.nix +++ b/pkgs/development/python-modules/pygments-markdown-lexer/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , pygments @@ -18,7 +18,7 @@ buildPythonPackage rec { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/jhermann/pygments-markdown-lexer"; description = "Pygments Markdown Lexer – A Markdown lexer for Pygments to highlight Markdown code snippets"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/pygmt/default.nix b/pkgs/development/python-modules/pygmt/default.nix index 28e7db2a99ea..318706edd930 100644 --- a/pkgs/development/python-modules/pygmt/default.nix +++ b/pkgs/development/python-modules/pygmt/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , pythonOlder , buildPythonPackage , fetchFromGitHub @@ -36,7 +36,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "pygmt" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A Python interface for the Generic Mapping Tools"; homepage = "https://github.com/GenericMappingTools/pygmt"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/pygobject/3.36.nix b/pkgs/development/python-modules/pygobject/3.36.nix index 7e31e788f31e..59e192271960 100644 --- a/pkgs/development/python-modules/pygobject/3.36.nix +++ b/pkgs/development/python-modules/pygobject/3.36.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, buildPythonPackage, pkgconfig, glib, gobject-introspection, +{ lib, stdenv, fetchurl, buildPythonPackage, pkgconfig, glib, gobject-introspection, pycairo, cairo, which, ncurses, meson, ninja, isPy3k, gnome3 }: buildPythonPackage rec { @@ -30,7 +30,7 @@ buildPythonPackage rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://pygobject.readthedocs.io/"; description = "Python bindings for Glib"; license = licenses.gpl2; diff --git a/pkgs/development/python-modules/pygobject/3.nix b/pkgs/development/python-modules/pygobject/3.nix index 6e34e7f91007..68f1bfa7b26d 100644 --- a/pkgs/development/python-modules/pygobject/3.nix +++ b/pkgs/development/python-modules/pygobject/3.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, buildPythonPackage, pkgconfig, glib, gobject-introspection, +{ lib, stdenv, fetchurl, buildPythonPackage, pkgconfig, glib, gobject-introspection, pycairo, cairo, which, ncurses, meson, ninja, isPy3k, gnome3 }: buildPythonPackage rec { @@ -28,7 +28,7 @@ buildPythonPackage rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://pygobject.readthedocs.io/"; description = "Python bindings for Glib"; license = licenses.gpl2; diff --git a/pkgs/development/python-modules/pygobject/default.nix b/pkgs/development/python-modules/pygobject/default.nix index a7b25e57a336..0b72561e870b 100644 --- a/pkgs/development/python-modules/pygobject/default.nix +++ b/pkgs/development/python-modules/pygobject/default.nix @@ -1,9 +1,10 @@ -{ stdenv, fetchurl, python, buildPythonPackage, pkgconfig, glib, isPy3k }: +{ stdenv, fetchurl, python, buildPythonPackage, pkgconfig, glib, isPy3k, pythonAtLeast }: buildPythonPackage rec { pname = "pygobject"; version = "2.28.7"; format = "other"; + disabled = pythonAtLeast "3.9"; src = fetchurl { url = "mirror://gnome/sources/pygobject/2.28/${pname}-${version}.tar.xz"; diff --git a/pkgs/development/python-modules/pygpgme/default.nix b/pkgs/development/python-modules/pygpgme/default.nix index 4322e76e3e74..416410ab3ce7 100644 --- a/pkgs/development/python-modules/pygpgme/default.nix +++ b/pkgs/development/python-modules/pygpgme/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchurl, isPyPy +{ lib, stdenv, buildPythonPackage, fetchurl, isPyPy , gpgme }: buildPythonPackage rec { @@ -16,7 +16,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ gpgme ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://launchpad.net/pygpgme"; description = "A Python wrapper for the GPGME library"; license = licenses.lgpl21; diff --git a/pkgs/development/python-modules/pygraphviz/default.nix b/pkgs/development/python-modules/pygraphviz/default.nix index a8d80f6e6175..0b3e99dd28b7 100644 --- a/pkgs/development/python-modules/pygraphviz/default.nix +++ b/pkgs/development/python-modules/pygraphviz/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, isPy3k, fetchPypi, substituteAll, graphviz +{ lib, stdenv, buildPythonPackage, isPy3k, fetchPypi, substituteAll, graphviz , pkgconfig, doctest-ignore-unicode, mock, nose }: buildPythonPackage rec { @@ -31,7 +31,7 @@ buildPythonPackage rec { # https://github.com/pygraphviz/pygraphviz/pull/129 doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Python interface to Graphviz graph drawing package"; homepage = "https://github.com/pygraphviz/pygraphviz"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/pygreat/default.nix b/pkgs/development/python-modules/pygreat/default.nix index bdced30f9831..20a96d1f8f2c 100644 --- a/pkgs/development/python-modules/pygreat/default.nix +++ b/pkgs/development/python-modules/pygreat/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, isPy3k, fetchFromGitHub, future, pyusb }: +{ lib, stdenv, buildPythonPackage, isPy3k, fetchFromGitHub, future, pyusb }: buildPythonPackage { pname = "pygreat"; @@ -22,7 +22,7 @@ buildPythonPackage { echo "$version" > ../VERSION ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Python library for talking with libGreat devices"; homepage = "https://greatscottgadgets.com/greatfet/"; license = with licenses; [ bsd3 ]; diff --git a/pkgs/development/python-modules/pygtk/default.nix b/pkgs/development/python-modules/pygtk/default.nix index 4779f76aed46..22a44ce76079 100644 --- a/pkgs/development/python-modules/pygtk/default.nix +++ b/pkgs/development/python-modules/pygtk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, python, pkgconfig, gtk2, pygobject2, pycairo, pango +{ lib, stdenv, fetchurl, fetchpatch, python, pkgconfig, gtk2, pygobject2, pycairo, pango , buildPythonPackage, libglade ? null, isPy3k }: buildPythonPackage rec { @@ -65,7 +65,7 @@ buildPythonPackage rec { $out/lib/${python.libPrefix}/site-packages/${pname}-${version}.pth ''; - meta = with stdenv.lib; { + meta = with lib; { description = "GTK 2 Python bindings"; homepage = "https://gitlab.gnome.org/Archive/pygtk"; platforms = platforms.all; diff --git a/pkgs/development/python-modules/pyhamcrest/1.nix b/pkgs/development/python-modules/pyhamcrest/1.nix index 592172c6550d..5df52d9b658c 100644 --- a/pkgs/development/python-modules/pyhamcrest/1.nix +++ b/pkgs/development/python-modules/pyhamcrest/1.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ lib, stdenv, buildPythonPackage, fetchPypi , mock, pytest , six }: @@ -16,7 +16,7 @@ buildPythonPackage rec { doCheck = false; # pypi tarball does not include tests - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/hamcrest/PyHamcrest"; description = "Hamcrest framework for matcher objects"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/pyhamcrest/default.nix b/pkgs/development/python-modules/pyhamcrest/default.nix index 40469bd0deba..a66e26b1319a 100644 --- a/pkgs/development/python-modules/pyhamcrest/default.nix +++ b/pkgs/development/python-modules/pyhamcrest/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ lib, stdenv, buildPythonPackage, fetchPypi , mock, pytest , six }: @@ -16,7 +16,7 @@ buildPythonPackage rec { doCheck = false; # pypi tarball does not include tests - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/hamcrest/PyHamcrest"; description = "Hamcrest framework for matcher objects"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/pyhaversion/default.nix b/pkgs/development/python-modules/pyhaversion/default.nix index 1a32851e6f38..3af6b3a263e8 100644 --- a/pkgs/development/python-modules/pyhaversion/default.nix +++ b/pkgs/development/python-modules/pyhaversion/default.nix @@ -1,49 +1,49 @@ { lib -, buildPythonPackage -, fetchPypi -, isPy3k -# propagatedBuildInputs , aiohttp -, async-timeout -, semantic-version -# buildInputs -, pytestrunner -# checkInputs -, pytest -, pytest-asyncio , aresponses +, async-timeout +, awesomeversion +, buildPythonPackage +, fetchFromGitHub +, pythonAtLeast +, pytest-asyncio +, pytestCheckHook }: + buildPythonPackage rec { pname = "pyhaversion"; - version = "3.4.2"; + version = "20.12.1"; - # needs aiohttp which is py3k-only - disabled = !isPy3k; + # Only 3.8.0 and beyond are supported + disabled = pythonAtLeast "3.8"; - src = fetchPypi { - inherit pname version; - sha256 = "b4e49dfa0f9dae10edd072e630d902e5497daa312baad58b7df7618efe863377"; + src = fetchFromGitHub { + owner = "ludeeus"; + repo = pname; + rev = version; + sha256 = "17yl67dgw75dghljcfwzblm11kqnh6sxf47w62mxz86aq9zrvcxd"; }; propagatedBuildInputs = [ aiohttp async-timeout - semantic-version - ]; - - buildInputs = [ - pytestrunner + awesomeversion ]; checkInputs = [ - pytest - pytest-asyncio aresponses + awesomeversion + pytest-asyncio + pytestCheckHook ]; + pythonImportsCheck = [ "pyhaversion" ]; + meta = with lib; { - description = "A python module to the newest version number of Home Assistant"; + description = "Python module to the newest version number of Home Assistant"; homepage = "https://github.com/ludeeus/pyhaversion"; - maintainers = [ maintainers.makefu ]; + changelog = "https://github.com/ludeeus/pyhaversion/releases/tag/${version}"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ makefu ]; }; } diff --git a/pkgs/development/python-modules/pyhomematic/default.nix b/pkgs/development/python-modules/pyhomematic/default.nix index 0dab202a79a7..502d648b4007 100644 --- a/pkgs/development/python-modules/pyhomematic/default.nix +++ b/pkgs/development/python-modules/pyhomematic/default.nix @@ -1,21 +1,21 @@ -{ stdenv, buildPythonPackage, isPy3k, fetchPypi }: +{ lib, stdenv, buildPythonPackage, isPy3k, fetchPypi }: buildPythonPackage rec { pname = "pyhomematic"; - version = "0.1.70"; + version = "0.1.71"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "1c9ae61c870e37348483966f6aa46f650f339f5f1169e5beb19d681c6434c247"; + sha256 = "0z09bw2mlhg7n9jyqmcyir306wpxr5nw1qsp5ps2iaw1qnyz5s9n"; }; # PyPI tarball does not include tests/ directory # Unreliable timing: https://github.com/danielperna84/pyhomematic/issues/126 doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Python 3 Interface to interact with Homematic devices"; homepage = "https://github.com/danielperna84/pyhomematic"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pyi2cflash/default.nix b/pkgs/development/python-modules/pyi2cflash/default.nix new file mode 100644 index 000000000000..7ac3aa5af08e --- /dev/null +++ b/pkgs/development/python-modules/pyi2cflash/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pyftdi +}: + +buildPythonPackage rec { + pname = "pyi2cflash"; + version = "0.2.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "1nkazgf7pajz7jym5rfy2df71lyfp4skxqbrg5ch0h4dwjdwllx1"; + }; + + propagatedBuildInputs = [ + pyftdi + ]; + + # tests are not shipped with the PyPI source + doCheck = false; + + pythonImportsCheck = [ "i2cflash" ]; + + meta = with lib; { + description = "I2C eeprom device drivers in Python"; + homepage = "https://github.com/eblot/pyi2cflash"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pyicu/default.nix b/pkgs/development/python-modules/pyicu/default.nix index 9dcdfb64c93a..3512e33c81d7 100644 --- a/pkgs/development/python-modules/pyicu/default.nix +++ b/pkgs/development/python-modules/pyicu/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , pytest @@ -29,7 +29,7 @@ buildPythonPackage rec { checkInputs = [ pytest ]; propagatedBuildInputs = [ six ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://pypi.python.org/pypi/PyICU/"; description = "Python extension wrapping the ICU C++ API"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pyinotify/default.nix b/pkgs/development/python-modules/pyinotify/default.nix index 7193fe118fd2..92c2f5bb6717 100644 --- a/pkgs/development/python-modules/pyinotify/default.nix +++ b/pkgs/development/python-modules/pyinotify/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi }: @@ -15,7 +15,7 @@ buildPythonPackage rec { # No tests distributed doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/seb-m/pyinotify/wiki"; description = "Monitor filesystems events on Linux platforms with inotify"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pyinputevent/default.nix b/pkgs/development/python-modules/pyinputevent/default.nix index 90d13ae07877..a52a0bb40010 100644 --- a/pkgs/development/python-modules/pyinputevent/default.nix +++ b/pkgs/development/python-modules/pyinputevent/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchFromGitHub }: @@ -14,7 +14,7 @@ buildPythonPackage { sha256 = "0rkis0xp8f9jc00x7jb9kbvhdla24z1vl30djqa6wy6fx0cr6sib"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/ntzrmtthihu777/pyinputevent"; description = "Python interface to the Input Subsystem's input_event and uinput"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/pyinsteon/default.nix b/pkgs/development/python-modules/pyinsteon/default.nix new file mode 100644 index 000000000000..8596883326ba --- /dev/null +++ b/pkgs/development/python-modules/pyinsteon/default.nix @@ -0,0 +1,60 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, aiofiles +, aiohttp +, async_generator +, pypubsub +, pyserial +, pyserial-asyncio +, pyyaml +, pytestCheckHook +, pythonOlder +, pytest-cov +, pytest-asyncio +, pytest-timeout +}: + +buildPythonPackage rec { + pname = "pyinsteon"; + version = "1.0.8"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = version; + sha256 = "0d028fcqmdzxp0vsz7digx794s9l65ydsnsyvyx275z6577x7h4h"; + }; + + propagatedBuildInputs = [ + aiofiles + aiohttp + async_generator + pypubsub + pyserial + pyserial-asyncio + pyyaml + ]; + + checkInputs = [ + pytest-asyncio + pytest-cov + pytest-timeout + pytestCheckHook + ]; + + pythonImportsCheck = [ "pyinsteon" ]; + + meta = with lib; { + description = "Python library to support Insteon home automation projects"; + longDescription = '' + This is a Python package to interface with an Insteon Modem. It has been + tested to work with most USB or RS-232 serial based devices such as the + 2413U, 2412S, 2448A7 and Hub models 2242 and 2245. + ''; + homepage = "https://github.com/pyinsteon/pyinsteon"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pyiqvia/default.nix b/pkgs/development/python-modules/pyiqvia/default.nix new file mode 100644 index 000000000000..762e39fe4b14 --- /dev/null +++ b/pkgs/development/python-modules/pyiqvia/default.nix @@ -0,0 +1,53 @@ +{ lib +, buildPythonPackage +, aiohttp +, aresponses +, fetchFromGitHub +, poetry +, pytest-aiohttp +, pytest-asyncio +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pyiqvia"; + version = "0.3.1"; + format = "pyproject"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "bachya"; + repo = pname; + rev = version; + sha256 = "1yjsbq4p040a35n8g2l0wgnv83wkjirv4rj73s2mjzn3cxf395bz"; + }; + + nativeBuildInputs = [ poetry ]; + + propagatedBuildInputs = [ aiohttp ]; + + checkInputs = [ + aresponses + pytest-aiohttp + pytest-asyncio + pytestCheckHook + ]; + + # Ignore the examples as they are prefixed with test_ + pytestFlagsArray = [ "--ignore examples/" ]; + pythonImportsCheck = [ "pyiqvia" ]; + + meta = with lib; { + description = "Python3 API for IQVIA data"; + longDescription = '' + pyiqvia is an async-focused Python library for allergen, asthma, and + disease data from the IQVIA family of websites (such as https://pollen.com, + https://flustar.com and more). + ''; + homepage = "https://github.com/bachya/pyiqvia"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pykdtree/default.nix b/pkgs/development/python-modules/pykdtree/default.nix index 9f355743ead2..f37ddb2483e1 100644 --- a/pkgs/development/python-modules/pykdtree/default.nix +++ b/pkgs/development/python-modules/pykdtree/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, numpy, nose, openmp }: +{ lib, stdenv, buildPythonPackage, fetchPypi, numpy, nose, openmp }: buildPythonPackage rec { pname = "pykdtree"; @@ -15,7 +15,7 @@ buildPythonPackage rec { checkInputs = [ nose ]; - meta = with stdenv.lib; { + meta = with lib; { description = "kd-tree implementation for fast nearest neighbour search in Python"; homepage = "https://github.com/storpipfugl/pykdtree"; license = licenses.lgpl3; diff --git a/pkgs/development/python-modules/pykerberos/default.nix b/pkgs/development/python-modules/pykerberos/default.nix index 07db7e7002bd..07a32a25a0c6 100644 --- a/pkgs/development/python-modules/pykerberos/default.nix +++ b/pkgs/development/python-modules/pykerberos/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage, krb5 }: +{ lib, stdenv, fetchPypi, buildPythonPackage, krb5 }: buildPythonPackage rec { pname = "pykerberos"; @@ -16,7 +16,7 @@ buildPythonPackage rec { # there are no tests doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "High-level interface to Kerberos"; license = licenses.asl20; maintainers = with maintainers; [ catern ]; diff --git a/pkgs/development/python-modules/pykickstart/default.nix b/pkgs/development/python-modules/pykickstart/default.nix index 6461f0391caa..bc10295e232a 100644 --- a/pkgs/development/python-modules/pykickstart/default.nix +++ b/pkgs/development/python-modules/pykickstart/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchurl , urlgrabber @@ -29,7 +29,7 @@ buildPythonPackage rec { ${python.interpreter} tests/baseclass.py -vv ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://fedoraproject.org/wiki/Pykickstart"; description = "Read and write Fedora kickstart files"; license = licenses.gpl2Plus; diff --git a/pkgs/development/python-modules/pykira/default.nix b/pkgs/development/python-modules/pykira/default.nix new file mode 100644 index 000000000000..43d381e6bce7 --- /dev/null +++ b/pkgs/development/python-modules/pykira/default.nix @@ -0,0 +1,25 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "pykira"; + version = "0.1.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "0zxglzmd2k1nc4wri76ykra910fdgli027nw9d6541ic7xmw87vj"; + }; + + # Project has no tests + doCheck = false; + pythonImportsCheck = [ "pykira" ]; + + meta = with lib; { + description = "Python module to interact with Kira modules"; + homepage = "https://github.com/stu-gott/pykira"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pylacrosse/default.nix b/pkgs/development/python-modules/pylacrosse/default.nix new file mode 100644 index 000000000000..74b244f52965 --- /dev/null +++ b/pkgs/development/python-modules/pylacrosse/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, mock +, nose +, pyserial +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "pylacrosse"; + version = "0.4"; + + src = fetchFromGitHub { + owner = "hthiery"; + repo = "python-lacrosse"; + rev = version; + sha256 = "0g5hqm8lq0gsnvhcydjk54rjf7lpxzph8k7w1nnvnqfbhf31xfcf"; + }; + + propagatedBuildInputs = [ pyserial ]; + + checkInputs = [ + mock + nose + pytestCheckHook + ]; + + pythonImportsCheck = [ "pylacrosse" ]; + + meta = with lib; { + description = "Python library for Jeelink LaCrosse"; + homepage = "https://github.com/hthiery/python-lacrosse"; + license = with licenses; [ lgpl2Plus ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pylast/default.nix b/pkgs/development/python-modules/pylast/default.nix index 12fac476f633..707554be5599 100644 --- a/pkgs/development/python-modules/pylast/default.nix +++ b/pkgs/development/python-modules/pylast/default.nix @@ -1,16 +1,16 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy3k, certifi, six +{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k, certifi, six , setuptools_scm }: buildPythonPackage rec { pname = "pylast"; - version = "4.0.0"; + version = "4.1.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "8ec555d6c4c1b474e9b3c96c3786abd38303a1a5716d928b0f3cfdcb4499b093"; + sha256 = "ad084aec1bf7e307bc42d7cc1a003851f5bee1ad24fb697a9fdc300bbfe63932"; }; nativeBuildInputs = [ setuptools_scm ]; @@ -19,7 +19,7 @@ buildPythonPackage rec { # tests require last.fm credentials doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/pylast/pylast"; description = "A python interface to last.fm (and compatibles)"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/pylibconfig2/default.nix b/pkgs/development/python-modules/pylibconfig2/default.nix index 3c2a0be941df..25989d0353e0 100644 --- a/pkgs/development/python-modules/pylibconfig2/default.nix +++ b/pkgs/development/python-modules/pylibconfig2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, pyparsing }: +{ lib, stdenv, buildPythonPackage, fetchPypi, pyparsing }: buildPythonPackage rec { pname = "pylibconfig2"; version = "0.2.5"; @@ -13,7 +13,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pyparsing ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/heinzK1X/pylibconfig2"; description = "Pure python library for libconfig syntax"; license = licenses.gpl3; diff --git a/pkgs/development/python-modules/pyliblo/default.nix b/pkgs/development/python-modules/pyliblo/default.nix index 4c0a406bed34..454f08fd10ed 100644 --- a/pkgs/development/python-modules/pyliblo/default.nix +++ b/pkgs/development/python-modules/pyliblo/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchurl , isPyPy @@ -18,7 +18,7 @@ buildPythonPackage rec { buildInputs = [ liblo cython ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://das.nasophon.de/pyliblo/"; description = "Python wrapper for the liblo OSC library"; license = licenses.lgpl21; diff --git a/pkgs/development/python-modules/pylibmc/default.nix b/pkgs/development/python-modules/pylibmc/default.nix index 26d6e4fb6fb6..8bb62c091348 100644 --- a/pkgs/development/python-modules/pylibmc/default.nix +++ b/pkgs/development/python-modules/pylibmc/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, fetchPypi, stdenv, libmemcached, zlib, cyrus_sasl }: +{ buildPythonPackage, fetchPypi, lib, stdenv, libmemcached, zlib, cyrus_sasl }: buildPythonPackage rec { version = "1.6.1"; @@ -15,7 +15,7 @@ buildPythonPackage rec { # requires an external memcached server running doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Quick and small memcached client for Python"; homepage = "http://sendapatch.se/projects/pylibmc/"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/pyls-spyder/default.nix b/pkgs/development/python-modules/pyls-spyder/default.nix new file mode 100644 index 000000000000..7e1fa0606191 --- /dev/null +++ b/pkgs/development/python-modules/pyls-spyder/default.nix @@ -0,0 +1,24 @@ +{ lib, buildPythonPackage, fetchPypi, python-language-server }: + +buildPythonPackage rec { + pname = "pyls-spyder"; + version = "0.3.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "07apxh12b8ybkx5izr7pg8kbg5g5wgzw7vh5iy2n8dhiqarzp7s1"; + }; + + propagatedBuildInputs = [ python-language-server ]; + + # no tests + doCheck = false; + pythonImportsCheck = [ "pyls_spyder" ]; + + meta = with lib; { + description = "Spyder extensions for the python-language-server"; + homepage = "https://github.com/spyder-ide/pyls-spyder"; + license = licenses.mit; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/development/python-modules/pylutron/default.nix b/pkgs/development/python-modules/pylutron/default.nix new file mode 100644 index 000000000000..90a45640812e --- /dev/null +++ b/pkgs/development/python-modules/pylutron/default.nix @@ -0,0 +1,25 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "pylutron"; + version = "0.2.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "1q8qdy26s9hvfsh75pak7xiqjwrwsgq18p4d86dwf4dwmy5s4qj1"; + }; + + # Project has no tests + doCheck = false; + pythonImportsCheck = [ "pylutron" ]; + + meta = with lib; { + description = "Python library for controlling a Lutron RadioRA 2 system"; + homepage = "https://github.com/thecynic/pylutron"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pymaging/default.nix b/pkgs/development/python-modules/pymaging/default.nix index 68a2e59b298c..3b35ce3e7166 100644 --- a/pkgs/development/python-modules/pymaging/default.nix +++ b/pkgs/development/python-modules/pymaging/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchFromGitHub }: @@ -14,7 +14,7 @@ buildPythonPackage { sha256 = "18g3n7kfrark30l4vzykh0gdbnfv5wb1zvvjbs17sj6yampypn38"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Pure Python imaging library with Python 2.6, 2.7, 3.1+ support"; homepage = "http://pymaging.rtfd.org"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pymaging_png/default.nix b/pkgs/development/python-modules/pymaging_png/default.nix index 9bf2559e2f0c..64ea5b4ff5b0 100644 --- a/pkgs/development/python-modules/pymaging_png/default.nix +++ b/pkgs/development/python-modules/pymaging_png/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchFromGitHub , pymaging @@ -17,7 +17,7 @@ buildPythonPackage { propagatedBuildInputs = [ pymaging ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Pure Python imaging library with Python 2.6, 2.7, 3.1+ support"; homepage = "https://github.com/ojii/pymaging-png/"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pymatgen/default.nix b/pkgs/development/python-modules/pymatgen/default.nix index ce89cb1e079e..84fcdbef6a3f 100644 --- a/pkgs/development/python-modules/pymatgen/default.nix +++ b/pkgs/development/python-modules/pymatgen/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ lib, stdenv, buildPythonPackage, fetchPypi , enum34 , glibcLocales , matplotlib @@ -53,7 +53,7 @@ buildPythonPackage rec { # No tests in pypi tarball. doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "A robust materials analysis code that defines core object representations for structures and molecules"; homepage = "https://pymatgen.org/"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pymediainfo/default.nix b/pkgs/development/python-modules/pymediainfo/default.nix index 8438df73c1c4..b04276f1f559 100644 --- a/pkgs/development/python-modules/pymediainfo/default.nix +++ b/pkgs/development/python-modules/pymediainfo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage +{ lib, stdenv, fetchPypi, buildPythonPackage , libmediainfo , setuptools_scm , pytest, glibcLocales }: @@ -31,7 +31,7 @@ buildPythonPackage rec { py.test -k 'not test_parse_url' tests ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Python wrapper for the mediainfo library"; homepage = "https://github.com/sbraz/pymediainfo"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pymeeus/default.nix b/pkgs/development/python-modules/pymeeus/default.nix index 4c8097325bcc..96fb9d6f6943 100644 --- a/pkgs/development/python-modules/pymeeus/default.nix +++ b/pkgs/development/python-modules/pymeeus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, pytest }: +{ lib, stdenv, buildPythonPackage, fetchPypi, pytest }: buildPythonPackage rec { pname = "PyMeeus"; @@ -15,7 +15,7 @@ buildPythonPackage rec { pytest . ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/architest/pymeeus"; description = "Library of astronomical algorithms"; license = licenses.lgpl3; diff --git a/pkgs/development/python-modules/pymemoize/default.nix b/pkgs/development/python-modules/pymemoize/default.nix index 4efafeaaca42..b44ff9fef491 100644 --- a/pkgs/development/python-modules/pymemoize/default.nix +++ b/pkgs/development/python-modules/pymemoize/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , django @@ -19,7 +19,7 @@ buildPythonPackage rec { # django.core.exceptions.ImproperlyConfigured: Requested settings, but settings are not configured. You must either define the environment variable DJANGO_SETTINGS_MODULE or call settings.configure() before accessing settings doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Simple Python cache and memoizing module"; homepage = "https://github.com/mikeboers/PyMemoize"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/pymetar/default.nix b/pkgs/development/python-modules/pymetar/default.nix index 6896eaa097ec..84139091ae49 100644 --- a/pkgs/development/python-modules/pymetar/default.nix +++ b/pkgs/development/python-modules/pymetar/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python, buildPythonPackage, isPy3k, fetchPypi }: +{ lib, stdenv, python, buildPythonPackage, isPy3k, fetchPypi }: buildPythonPackage rec { pname = "pymetar"; @@ -21,7 +21,7 @@ buildPythonPackage rec { ./runtests.sh ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A command-line tool to show the weather report by a given station ID"; homepage = "http://www.schwarzvogel.de/software/pymetar.html"; license = licenses.gpl2Plus; diff --git a/pkgs/development/python-modules/pymetno/default.nix b/pkgs/development/python-modules/pymetno/default.nix index 92e26c4f6e53..2b10e2f164fb 100644 --- a/pkgs/development/python-modules/pymetno/default.nix +++ b/pkgs/development/python-modules/pymetno/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchFromGitHub , aiohttp @@ -22,7 +22,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "metno"]; - meta = with stdenv.lib; { + meta = with lib; { description = "A library to communicate with the met.no api"; homepage = "https://github.com/Danielhiversen/pyMetno/"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pymodbus/default.nix b/pkgs/development/python-modules/pymodbus/default.nix new file mode 100644 index 000000000000..76f2e9a9338b --- /dev/null +++ b/pkgs/development/python-modules/pymodbus/default.nix @@ -0,0 +1,59 @@ +{ lib +, asynctest +, buildPythonPackage +, fetchFromGitHub +, mock +, pyserial +, pyserial-asyncio +, pytestCheckHook +, pythonOlder +, redis +, sqlalchemy +, tornado +, twisted +}: + +buildPythonPackage rec { + pname = "pymodbus"; + version = "2.4.0"; + + src = fetchFromGitHub { + owner = "riptideio"; + repo = pname; + rev = "v${version}"; + sha256 = "0x0dv02shcc2yxxm9kvcbhip111sna74dvcfssxdzzy967vnq76v"; + }; + + # Twisted asynchronous version is not supported due to a missing dependency + propagatedBuildInputs = [ + pyserial + pyserial-asyncio + tornado + ]; + + checkInputs = [ + asynctest + mock + pyserial-asyncio + pytestCheckHook + redis + sqlalchemy + tornado + twisted + ]; + + pythonImportsCheck = [ "pymodbus" ]; + + meta = with lib; { + description = "Python implementation of the Modbus protocol"; + longDescription = '' + Pymodbus is a full Modbus protocol implementation using twisted, + torndo or asyncio for its asynchronous communications core. It can + also be used without any third party dependencies if a more + lightweight project is needed. + ''; + homepage = "https://github.com/riptideio/pymodbus"; + license = with licenses; [ bsd3 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pympler/default.nix b/pkgs/development/python-modules/pympler/default.nix index f80c91e8f2dd..856458bf043f 100644 --- a/pkgs/development/python-modules/pympler/default.nix +++ b/pkgs/development/python-modules/pympler/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi }: @@ -18,7 +18,7 @@ buildPythonPackage rec { doCheck = stdenv.hostPlatform.isLinux; - meta = with stdenv.lib; { + meta = with lib; { description = "Tool to measure, monitor and analyze memory behavior"; homepage = "https://pythonhosted.org/Pympler/"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/pymsgbox/default.nix b/pkgs/development/python-modules/pymsgbox/default.nix index d844144addbc..d69c0011ac53 100644 --- a/pkgs/development/python-modules/pymsgbox/default.nix +++ b/pkgs/development/python-modules/pymsgbox/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage, tkinter }: +{ lib, stdenv, fetchPypi, buildPythonPackage, tkinter }: buildPythonPackage rec { pname = "PyMsgBox"; @@ -15,7 +15,7 @@ buildPythonPackage rec { # Finding tests fails doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "A simple, cross-platform, pure Python module for JavaScript-like message boxes"; homepage = "https://github.com/asweigart/PyMsgBox"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/pymupdf/default.nix b/pkgs/development/python-modules/pymupdf/default.nix index 30df7589c9ee..8ce7d5a19c6f 100644 --- a/pkgs/development/python-modules/pymupdf/default.nix +++ b/pkgs/development/python-modules/pymupdf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, mupdf, swig }: +{ lib, stdenv, buildPythonPackage, fetchPypi, mupdf, swig }: buildPythonPackage rec { pname = "pymupdf"; version = "1.18.0"; @@ -18,7 +18,7 @@ buildPythonPackage rec { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Python bindings for MuPDF's rendering library."; homepage = "https://github.com/pymupdf/PyMuPDF"; maintainers = with maintainers; [ teto ]; diff --git a/pkgs/development/python-modules/pymyq/default.nix b/pkgs/development/python-modules/pymyq/default.nix new file mode 100644 index 000000000000..2500909d534e --- /dev/null +++ b/pkgs/development/python-modules/pymyq/default.nix @@ -0,0 +1,36 @@ +{ lib +, aiodns +, aiohttp +, async-timeout +, buildPythonPackage +, fetchFromGitHub +}: + +buildPythonPackage rec { + pname = "pymyq"; + version = "2.0.14"; + + src = fetchFromGitHub { + owner = "arraylabs"; + repo = pname; + rev = "v${version}"; + sha256 = "18825b9c6qk4zcvva79hpg6098z4zqxyapnqmjsli23npw0zh67w"; + }; + + propagatedBuildInputs = [ + aiodns + aiohttp + async-timeout + ]; + + # Project has no tests + doCheck = false; + pythonImportsCheck = [ "pymyq" ]; + + meta = with lib; { + description = "Python wrapper for MyQ API"; + homepage = "https://github.com/arraylabs/pymyq"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pymysqlsa/default.nix b/pkgs/development/python-modules/pymysqlsa/default.nix index 16c0e1a58d3f..6009b03e5086 100644 --- a/pkgs/development/python-modules/pymysqlsa/default.nix +++ b/pkgs/development/python-modules/pymysqlsa/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , pymysql @@ -17,7 +17,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pymysql sqlalchemy ]; - meta = with stdenv.lib; { + meta = with lib; { description = "PyMySQL dialect for SQL Alchemy"; homepage = "https://pypi.python.org/pypi/pymysql_sa"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pynac/default.nix b/pkgs/development/python-modules/pynac/default.nix index 69233adc264e..656825a36bbb 100644 --- a/pkgs/development/python-modules/pynac/default.nix +++ b/pkgs/development/python-modules/pynac/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchurl }: @@ -12,7 +12,7 @@ buildPythonPackage { sha256 = "0avzqqcxl54karjmla9jbsyid98mva36lxahwmrsx5h40ys2ggxp"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/se-esss-litterbox/Pynac"; description = "A Python wrapper around the Dynac charged particle simulator"; license = licenses.gpl3; diff --git a/pkgs/development/python-modules/pynacl/default.nix b/pkgs/development/python-modules/pynacl/default.nix index dfce6652d03a..be69bf3d8023 100644 --- a/pkgs/development/python-modules/pynacl/default.nix +++ b/pkgs/development/python-modules/pynacl/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , pytest @@ -28,7 +28,7 @@ buildPythonPackage rec { py.test ''; - meta = with stdenv.lib; { + meta = with lib; { maintainers = with maintainers; [ va1entin ]; description = "Python binding to the Networking and Cryptography (NaCl) library"; homepage = "https://github.com/pyca/pynacl/"; diff --git a/pkgs/development/python-modules/pync/default.nix b/pkgs/development/python-modules/pync/default.nix index b7c819c4593d..20811f2df9d7 100644 --- a/pkgs/development/python-modules/pync/default.nix +++ b/pkgs/development/python-modules/pync/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , isPy27 @@ -23,7 +23,7 @@ buildPythonPackage rec { sed -i 's|^\([ ]*\)self.bin_path.*$|\1self.bin_path = "${pkgs.terminal-notifier}/bin/terminal-notifier"|' build/lib/pync/TerminalNotifier.py ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Python Wrapper for Mac OS 10.8 Notification Center"; homepage = "https://pypi.python.org/pypi/pync/1.4"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pynest2d/default.nix b/pkgs/development/python-modules/pynest2d/default.nix index 3a7c6b43392b..6214f3db42b2 100644 --- a/pkgs/development/python-modules/pynest2d/default.nix +++ b/pkgs/development/python-modules/pynest2d/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, python3, cmake +{ lib, stdenv, buildPythonPackage, fetchFromGitHub, python3, cmake , pythonOlder, libnest2d, sip, clipper }: buildPythonPackage rec { @@ -22,7 +22,7 @@ buildPythonPackage rec { sed -i 's#''${Python3_SITEARCH}#${placeholder "out"}/${python3.sitePackages}#' cmake/SIPMacros.cmake ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Python bindings for libnest2d"; homepage = "https://github.com/Ultimaker/pynest2d"; license = licenses.lgpl3; diff --git a/pkgs/development/python-modules/pynisher/default.nix b/pkgs/development/python-modules/pynisher/default.nix index e2ead68d11b9..0ecac704e1e8 100644 --- a/pkgs/development/python-modules/pynisher/default.nix +++ b/pkgs/development/python-modules/pynisher/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, psutil, docutils }: +{ lib, stdenv, buildPythonPackage, fetchPypi, psutil, docutils }: buildPythonPackage rec { pname = "pynisher"; @@ -14,7 +14,7 @@ buildPythonPackage rec { # no tests in the Pypi archive doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "The pynisher is a little module intended to limit a functions resources."; homepage = "https://github.com/sfalkner/pynisher"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pynput/default.nix b/pkgs/development/python-modules/pynput/default.nix index b525f22b2d34..5f193a8ab351 100644 --- a/pkgs/development/python-modules/pynput/default.nix +++ b/pkgs/development/python-modules/pynput/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, sphinx, setuptools-lint, xlib, evdev }: +{ lib, stdenv, buildPythonPackage, fetchPypi, sphinx, setuptools-lint, xlib, evdev }: buildPythonPackage rec { pname = "pynput"; @@ -18,7 +18,7 @@ buildPythonPackage rec { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "A library to control and monitor input devices"; homepage = "https://github.com/moses-palmer/pynput"; license = licenses.lgpl3; diff --git a/pkgs/development/python-modules/pynzb/default.nix b/pkgs/development/python-modules/pynzb/default.nix index 530a5e2e179f..294c2374f537 100644 --- a/pkgs/development/python-modules/pynzb/default.nix +++ b/pkgs/development/python-modules/pynzb/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , python @@ -20,7 +20,7 @@ buildPythonPackage rec { # Can't get them working doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/ericflo/pynzb"; description = "Unified API for parsing NZB files"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/pyodbc/default.nix b/pkgs/development/python-modules/pyodbc/default.nix index 7451b1102ed2..2dec1d8705bb 100644 --- a/pkgs/development/python-modules/pyodbc/default.nix +++ b/pkgs/development/python-modules/pyodbc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPyPy, unixODBC }: +{ lib, stdenv, buildPythonPackage, fetchPypi, isPyPy, unixODBC }: buildPythonPackage rec { pname = "pyodbc"; @@ -14,7 +14,7 @@ buildPythonPackage rec { doCheck = false; # tests require a database server - meta = with stdenv.lib; { + meta = with lib; { description = "Python ODBC module to connect to almost any database"; homepage = "https://github.com/mkleehammer/pyodbc"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pyopencl/default.nix b/pkgs/development/python-modules/pyopencl/default.nix index 297757687688..4171eaeeb57e 100644 --- a/pkgs/development/python-modules/pyopencl/default.nix +++ b/pkgs/development/python-modules/pyopencl/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchPypi , buildPythonPackage , Mako @@ -40,7 +40,7 @@ buildPythonPackage rec { # gcc: error: pygpu_language_opencl.cpp: No such file or directory doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Python wrapper for OpenCL"; homepage = "https://github.com/pyopencl/pyopencl"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pyopengl/default.nix b/pkgs/development/python-modules/pyopengl/default.nix index 2a3b90733c46..b2d62e3730d1 100644 --- a/pkgs/development/python-modules/pyopengl/default.nix +++ b/pkgs/development/python-modules/pyopengl/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , pkgs @@ -46,7 +46,7 @@ buildPythonPackage rec { # Should run test suite from $out/${python.sitePackages} doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://pyopengl.sourceforge.net/"; description = "PyOpenGL, the Python OpenGL bindings"; longDescription = '' diff --git a/pkgs/development/python-modules/pyopenssl/default.nix b/pkgs/development/python-modules/pyopenssl/default.nix index 202607186b94..023e5f12fd48 100644 --- a/pkgs/development/python-modules/pyopenssl/default.nix +++ b/pkgs/development/python-modules/pyopenssl/default.nix @@ -56,7 +56,7 @@ let optionals (versionAtLeast (getVersion openssl.name) "1.1") failingOpenSSL_1_1Tests ) ++ ( # https://github.com/pyca/pyopenssl/issues/974 - optionals stdenv.isi686 [ "test_verify_with_time" ] + optionals stdenv.is32bit [ "test_verify_with_time" ] ); # Compose the final string expression, including the "-k" and the single quotes. diff --git a/pkgs/development/python-modules/pyopnsense/default.nix b/pkgs/development/python-modules/pyopnsense/default.nix new file mode 100644 index 000000000000..f4f5bf6c70d4 --- /dev/null +++ b/pkgs/development/python-modules/pyopnsense/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchPypi +, fixtures +, mock +, pbr +, pytest-cov +, pytestCheckHook +, pythonOlder +, requests +, six +}: + +buildPythonPackage rec { + pname = "pyopnsense"; + version = "0.3.0"; + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "06rssdb3zhccnm63z96mw5yd38d9i99fgigfcdxn9divalbbhp5a"; + }; + + propagatedBuildInputs = [ + pbr + six + requests + ]; + + checkInputs = [ + fixtures + mock + pytest-cov + pytestCheckHook + ]; + + pythonImportsCheck = [ "pyopnsense" ]; + + meta = with lib; { + description = "Python client for the OPNsense API"; + homepage = "https://github.com/mtreinish/pyopnsense"; + license = with licenses; [ gpl3Plus ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pyosmium/default.nix b/pkgs/development/python-modules/pyosmium/default.nix index ffcd3569e0a3..577f00fd1114 100644 --- a/pkgs/development/python-modules/pyosmium/default.nix +++ b/pkgs/development/python-modules/pyosmium/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "pyosmium"; - version = "3.0.1"; + version = "3.1.0"; disabled = pythonOlder "3.4" || isPyPy; @@ -12,7 +12,7 @@ buildPythonPackage rec { owner = "osmcode"; repo = pname; rev = "v${version}"; - sha256 = "06jngbmmmswhyi5q5bjph6gwss28d2azn5414zf0arik5bcvz128"; + sha256 = "0m11hdgiysdhyi5yn6nj8a8ycjzx5hpjy7n1c4j6q5caifj7rf7h"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/python-modules/pypandoc/default.nix b/pkgs/development/python-modules/pypandoc/default.nix index 3da9c3ae0a7c..ffe7bf014232 100644 --- a/pkgs/development/python-modules/pypandoc/default.nix +++ b/pkgs/development/python-modules/pypandoc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, fetchpatch +{ lib, stdenv, buildPythonPackage, fetchFromGitHub, fetchpatch , pandoc, haskellPackages, texlive }: buildPythonPackage rec { @@ -32,7 +32,7 @@ buildPythonPackage rec { export PATH="${haskellPackages.pandoc-citeproc}/bin:${texlive.combined.scheme-small}/bin:$PATH" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Thin wrapper for pandoc"; homepage = "https://github.com/bebraw/pypandoc"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pyparsing/default.nix b/pkgs/development/python-modules/pyparsing/default.nix index 4acc4fa804b3..5ecfdfb88839 100644 --- a/pkgs/development/python-modules/pyparsing/default.nix +++ b/pkgs/development/python-modules/pyparsing/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "pyparsing"; - version = "2.4.6"; + version = "2.4.7"; src = fetchFromGitHub { owner = "pyparsing"; repo = pname; rev = "pyparsing_${version}"; - sha256 = "1fh7s3cfr274pd6hh6zygl99842rqws98an2nkrrqj2spb9ldxcm"; + sha256 = "14pfy80q2flgzjcx8jkracvnxxnr59kjzp3kdm5nh232gk1v6g6h"; }; # https://github.com/pyparsing/pyparsing/blob/847af590154743bae61a32c3dc1a6c2a19009f42/tox.ini#L6 diff --git a/pkgs/development/python-modules/pyparted/default.nix b/pkgs/development/python-modules/pyparted/default.nix index c51c55a5eb23..b6768ad992d1 100644 --- a/pkgs/development/python-modules/pyparted/default.nix +++ b/pkgs/development/python-modules/pyparted/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , buildPythonPackage , isPyPy @@ -47,7 +47,7 @@ buildPythonPackage rec { make test PYTHON=${python.executable} ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/dcantrell/pyparted/"; description = "Python interface for libparted"; license = licenses.gpl2Plus; diff --git a/pkgs/development/python-modules/pypck/default.nix b/pkgs/development/python-modules/pypck/default.nix new file mode 100644 index 000000000000..f8e6cc96aff6 --- /dev/null +++ b/pkgs/development/python-modules/pypck/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytest-asyncio +, pytest-cov +, pytest-timeout +, pytestCheckHook +, pythonOlder +, stdenv +}: + +buildPythonPackage rec { + pname = "pypck"; + version = "0.7.8"; + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "alengwenus"; + repo = pname; + rev = version; + sha256 = "06yqyqpzpypid27z31prvsp7nzpjqzn7gjlfqwjhhxl8fdgh8hkr"; + }; + + checkInputs = [ + pytest-asyncio + pytest-cov + pytest-timeout + pytestCheckHook + ]; + + disabledTests = lib.optionals stdenv.isDarwin [ + "test_connection_lost" + ]; + + __darwinAllowLocalNetworking = true; + + pythonImportsCheck = [ "pypck" ]; + + meta = with lib; { + description = "LCN-PCK library written in Python"; + homepage = "https://github.com/alengwenus/pypck"; + license = with licenses; [ epl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pypdf/default.nix b/pkgs/development/python-modules/pypdf/default.nix index 5842e1c510af..d69b1078aeef 100644 --- a/pkgs/development/python-modules/pypdf/default.nix +++ b/pkgs/development/python-modules/pypdf/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , isPy3k @@ -16,7 +16,7 @@ buildPythonPackage rec { # Not supported. Package is no longer maintained. disabled = isPy3k; - meta = with stdenv.lib; { + meta = with lib; { description = "Pure-Python PDF toolkit"; homepage = "http://pybrary.net/pyPdf/"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/pypdf2/default.nix b/pkgs/development/python-modules/pypdf2/default.nix index 1c3b908396ec..cd91cc347a4f 100644 --- a/pkgs/development/python-modules/pypdf2/default.nix +++ b/pkgs/development/python-modules/pypdf2/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , glibcLocales @@ -25,7 +25,7 @@ buildPythonPackage rec { # Tests broken on Python 3.x doCheck = !(isPy3k); - meta = with stdenv.lib; { + meta = with lib; { description = "A Pure-Python library built as a PDF toolkit"; homepage = "http://mstamy2.github.com/PyPDF2/"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/pypeg2/default.nix b/pkgs/development/python-modules/pypeg2/default.nix index 7aa0f2eda42c..1f16a307a0c1 100644 --- a/pkgs/development/python-modules/pypeg2/default.nix +++ b/pkgs/development/python-modules/pypeg2/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , isPy3k @@ -21,7 +21,7 @@ buildPythonPackage rec { #https://bitbucket.org/fdik/pypeg/issues/36/test-failures-on-py35 doCheck = !isPy3k; - meta = with stdenv.lib; { + meta = with lib; { description = "PEG parser interpreter in Python"; homepage = "http://fdik.org/pyPEG"; license = licenses.gpl2; diff --git a/pkgs/development/python-modules/pyphen/default.nix b/pkgs/development/python-modules/pyphen/default.nix index b5018e40d7eb..d8b9abcf97a3 100644 --- a/pkgs/development/python-modules/pyphen/default.nix +++ b/pkgs/development/python-modules/pyphen/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi }: +{ lib, stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "Pyphen"; @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "719b21dfb4b04fbc11cc0f6112418535fe35474021120cccfffc43a25fe63128"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Pure Python module to hyphenate text"; homepage = "https://github.com/Kozea/Pyphen"; license = with licenses; [gpl2 lgpl21 mpl20]; diff --git a/pkgs/development/python-modules/pypillowfight/default.nix b/pkgs/development/python-modules/pypillowfight/default.nix index feb1f9451bca..bc0e45359990 100644 --- a/pkgs/development/python-modules/pypillowfight/default.nix +++ b/pkgs/development/python-modules/pypillowfight/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitLab, nose, pillow +{ lib, stdenv, buildPythonPackage, fetchFromGitLab, nose, pillow , isPy3k, isPyPy }: buildPythonPackage rec { @@ -30,7 +30,7 @@ buildPythonPackage rec { buildInputs = [ nose ]; propagatedBuildInputs = [ pillow ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Library containing various image processing algorithms"; inherit (src.meta) homepage; license = licenses.gpl3Plus; diff --git a/pkgs/development/python-modules/pyplatec/default.nix b/pkgs/development/python-modules/pyplatec/default.nix index 78d939bca1cf..8747840fd7c0 100644 --- a/pkgs/development/python-modules/pyplatec/default.nix +++ b/pkgs/development/python-modules/pyplatec/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi }: @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "0kqx33flcrrlipccmqs78d14pj5749bp85b6k5fgaq2c7yzz02jg"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Library to simulate plate tectonics with Python bindings"; homepage = "https://github.com/Mindwerks/plate-tectonics"; license = licenses.lgpl3; diff --git a/pkgs/development/python-modules/pypoppler/default.nix b/pkgs/development/python-modules/pypoppler/default.nix index 3287c70db9cb..83190bc292ab 100644 --- a/pkgs/development/python-modules/pypoppler/default.nix +++ b/pkgs/development/python-modules/pypoppler/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , isPy3k @@ -32,7 +32,7 @@ buildPythonPackage rec { # No tests in archive doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://code.launchpad.net/~mriedesel/poppler-python/main"; description = "Python bindings for poppler-glib, unofficial branch including bug fixes, and removal of gtk dependencies"; license = licenses.gpl2; diff --git a/pkgs/development/python-modules/pyppeteer/default.nix b/pkgs/development/python-modules/pyppeteer/default.nix index 09d2415f8e0a..a15f7aadb88c 100644 --- a/pkgs/development/python-modules/pyppeteer/default.nix +++ b/pkgs/development/python-modules/pyppeteer/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pyppeteer"; - version = "0.2.2"; + version = "0.2.4"; src = fetchPypi { inherit pname version; - sha256 = "1s92izan7s3iffc85wpwi1qv9brcq0rlfqyi84wmpmg1dxk64g0m"; + sha256 = "d1bcc61575ff788249d3bcaee696d856fa1153401a5428cb7376d826dd68dd9b"; }; # tests want to write to /homeless-shelter diff --git a/pkgs/development/python-modules/pyprind/default.nix b/pkgs/development/python-modules/pyprind/default.nix index 42c99c300883..d270136558fc 100644 --- a/pkgs/development/python-modules/pyprind/default.nix +++ b/pkgs/development/python-modules/pyprind/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage +{ lib, stdenv, fetchPypi, buildPythonPackage , psutil , pytest }: @@ -19,7 +19,7 @@ buildPythonPackage rec { py.test tests ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Python Progress Bar and Percent Indicator Utility"; homepage = "https://github.com/rasbt/pyprind"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/pyptlib/default.nix b/pkgs/development/python-modules/pyptlib/default.nix index f820f161de56..af2575d21431 100644 --- a/pkgs/development/python-modules/pyptlib/default.nix +++ b/pkgs/development/python-modules/pyptlib/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , isPyPy @@ -17,7 +17,7 @@ buildPythonPackage rec { doCheck = false; # No such file or directory errors on 32bit - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://pypi.org/project/pyptlib/"; description = "A python implementation of the Pluggable Transports for Circumvention specification for Tor"; license = licenses.bsd2; diff --git a/pkgs/development/python-modules/pypugjs/default.nix b/pkgs/development/python-modules/pypugjs/default.nix index e6bf3b9211af..b806177b4d7d 100644 --- a/pkgs/development/python-modules/pypugjs/default.nix +++ b/pkgs/development/python-modules/pypugjs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, fetchpatch, six, chardet, nose +{ lib, stdenv, buildPythonPackage, fetchPypi, fetchpatch, six, chardet, nose , django, jinja2, tornado, pyramid, pyramid_mako, Mako }: buildPythonPackage rec { @@ -17,7 +17,7 @@ buildPythonPackage rec { nosetests pypugjs ''; - meta = with stdenv.lib; { + meta = with lib; { description = "PugJS syntax template adapter for Django, Jinja2, Mako and Tornado templates"; homepage = "https://github.com/kakulukia/pypugjs"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pypykatz/default.nix b/pkgs/development/python-modules/pypykatz/default.nix new file mode 100644 index 000000000000..2e5f19e1d12d --- /dev/null +++ b/pkgs/development/python-modules/pypykatz/default.nix @@ -0,0 +1,40 @@ +{ lib +, aiowinreg +, buildPythonPackage +, fetchFromGitHub +, minidump +, minikerberos +, msldap +, winsspi +}: + +buildPythonPackage rec { + pname = "pypykatz"; + version = "0.3.15"; + + src = fetchFromGitHub { + owner = "skelsec"; + repo = pname; + rev = version; + sha256 = "0bx2jdcfr1pdy3jgzg8fr5id9ffl2m1nc81dqhcplxdj8p214yri"; + }; + + propagatedBuildInputs = [ + aiowinreg + minikerberos + msldap + winsspi + minidump + ]; + + # Project doesn't have tests + doCheck = false; + pythonImportsCheck = [ "pypykatz" ]; + + meta = with lib; { + description = "Mimikatz implementation in Python"; + homepage = "https://github.com/skelsec/pypykatz"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pyqtgraph/default.nix b/pkgs/development/python-modules/pyqtgraph/default.nix index 80f914294848..98b30b247077 100644 --- a/pkgs/development/python-modules/pyqtgraph/default.nix +++ b/pkgs/development/python-modules/pyqtgraph/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , numpy @@ -22,7 +22,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "pyqtgraph" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Scientific Graphics and GUI Library for Python"; homepage = "http://www.pyqtgraph.org/"; changelog = "https://github.com/pyqtgraph/pyqtgraph/blob/master/CHANGELOG"; diff --git a/pkgs/development/python-modules/pyquery/default.nix b/pkgs/development/python-modules/pyquery/default.nix index 6ba9cb91982b..2496d9d968fc 100644 --- a/pkgs/development/python-modules/pyquery/default.nix +++ b/pkgs/development/python-modules/pyquery/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , cssselect @@ -21,7 +21,7 @@ buildPythonPackage rec { # circular dependency on webtest doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/gawel/pyquery"; description = "A jquery-like library for python"; license = licenses.bsd0; diff --git a/pkgs/development/python-modules/pyramid/default.nix b/pkgs/development/python-modules/pyramid/default.nix index a7ba7728a355..5f1e5c7d75a8 100644 --- a/pkgs/development/python-modules/pyramid/default.nix +++ b/pkgs/development/python-modules/pyramid/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , webtest @@ -33,7 +33,7 @@ buildPythonPackage rec { # https://github.com/Pylons/pyramid/issues/1899 doCheck = !isPy35; - meta = with stdenv.lib; { + meta = with lib; { description = "The Pyramid Web Framework, a Pylons project"; homepage = "https://trypyramid.com/"; license = licenses.bsd0; diff --git a/pkgs/development/python-modules/pyramid_beaker/default.nix b/pkgs/development/python-modules/pyramid_beaker/default.nix index 19b26a30ad71..88dc62886fc6 100644 --- a/pkgs/development/python-modules/pyramid_beaker/default.nix +++ b/pkgs/development/python-modules/pyramid_beaker/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, pytest, beaker, pyramid }: +{ lib, stdenv, buildPythonPackage, fetchPypi, pytest, beaker, pyramid }: buildPythonPackage rec { pname = "pyramid_beaker"; @@ -18,7 +18,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ beaker pyramid ]; - meta = with stdenv.lib; { + meta = with lib; { maintainers = with maintainers; [ domenkozar ]; }; } diff --git a/pkgs/development/python-modules/pyramid_chameleon/default.nix b/pkgs/development/python-modules/pyramid_chameleon/default.nix index 9e148ca8ed51..2bb5a03bdb91 100644 --- a/pkgs/development/python-modules/pyramid_chameleon/default.nix +++ b/pkgs/development/python-modules/pyramid_chameleon/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , chameleon @@ -23,7 +23,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ chameleon pyramid zope_interface setuptools ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Chameleon template compiler for pyramid"; homepage = "https://github.com/Pylons/pyramid_chameleon"; license = licenses.bsd0; diff --git a/pkgs/development/python-modules/pyramid_exclog/default.nix b/pkgs/development/python-modules/pyramid_exclog/default.nix index 0c2abeb74e28..80514cc91b48 100644 --- a/pkgs/development/python-modules/pyramid_exclog/default.nix +++ b/pkgs/development/python-modules/pyramid_exclog/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , pyramid @@ -15,7 +15,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pyramid ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A package which logs to a Python logger when an exception is raised by a Pyramid application"; homepage = "https://docs.pylonsproject.org/"; license = licenses.bsd0; diff --git a/pkgs/development/python-modules/pyramid_hawkauth/default.nix b/pkgs/development/python-modules/pyramid_hawkauth/default.nix index fc76d9af68d9..ab4025b72309 100644 --- a/pkgs/development/python-modules/pyramid_hawkauth/default.nix +++ b/pkgs/development/python-modules/pyramid_hawkauth/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchFromGitHub , pyramid @@ -21,7 +21,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pyramid hawkauthlib tokenlib ]; buildInputs = [ webtest ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/mozilla-services/pyramid_hawkauth"; description = "A Pyramid authentication plugin for HAWK"; license = licenses.mpl20; diff --git a/pkgs/development/python-modules/pyramid_jinja2/default.nix b/pkgs/development/python-modules/pyramid_jinja2/default.nix index 6be0fe479d2f..0497ab79613f 100644 --- a/pkgs/development/python-modules/pyramid_jinja2/default.nix +++ b/pkgs/development/python-modules/pyramid_jinja2/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , webtest @@ -18,7 +18,7 @@ buildPythonPackage rec { buildInputs = [ webtest ]; propagatedBuildInputs = [ jinja2 pyramid ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Jinja2 template bindings for the Pyramid web framework"; homepage = "https://github.com/Pylons/pyramid_jinja2"; license = licenses.bsd0; diff --git a/pkgs/development/python-modules/pyramid_mako/default.nix b/pkgs/development/python-modules/pyramid_mako/default.nix index 2bae93d1e306..8c71563e2d77 100644 --- a/pkgs/development/python-modules/pyramid_mako/default.nix +++ b/pkgs/development/python-modules/pyramid_mako/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , webtest @@ -18,7 +18,7 @@ buildPythonPackage rec { buildInputs = [ webtest ]; propagatedBuildInputs = [ pyramid Mako ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/Pylons/pyramid_mako"; description = "Mako template bindings for the Pyramid web framework"; license = licenses.bsd0; diff --git a/pkgs/development/python-modules/pyramid_multiauth/default.nix b/pkgs/development/python-modules/pyramid_multiauth/default.nix index f441aaed8c13..9167918fc47d 100644 --- a/pkgs/development/python-modules/pyramid_multiauth/default.nix +++ b/pkgs/development/python-modules/pyramid_multiauth/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , pyramid @@ -15,7 +15,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pyramid ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Authentication policy for Pyramid that proxies to a stack of other authentication policies"; homepage = "https://github.com/mozilla-services/pyramid_multiauth"; license = licenses.mpl20; diff --git a/pkgs/development/python-modules/pyreport/default.nix b/pkgs/development/python-modules/pyreport/default.nix index 9795d30ea2e2..09a1e7c6b418 100644 --- a/pkgs/development/python-modules/pyreport/default.nix +++ b/pkgs/development/python-modules/pyreport/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , isPy3k @@ -17,7 +17,7 @@ buildPythonPackage rec { # error: invalid command 'test' doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://pypi.python.org/pypi/pyreport"; license = licenses.bsd0; description = "Pyreport makes notes out of a python script"; diff --git a/pkgs/development/python-modules/pyres/default.nix b/pkgs/development/python-modules/pyres/default.nix index d4bd8789144a..6d49bd025948 100644 --- a/pkgs/development/python-modules/pyres/default.nix +++ b/pkgs/development/python-modules/pyres/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage, fetchFromGitHub, simplejson, redis, setproctitle, nose, pkgs }: +{ lib, stdenv, fetchPypi, buildPythonPackage, fetchFromGitHub, simplejson, redis, setproctitle, nose, pkgs }: let @@ -36,7 +36,7 @@ buildPythonPackage rec { nosetests . --exclude test_worker_pids ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Python resque clone"; homepage = "https://github.com/binarydud/pyres"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pyrfc3339/default.nix b/pkgs/development/python-modules/pyrfc3339/default.nix index 3c157d83fec1..f6be3c4c8974 100644 --- a/pkgs/development/python-modules/pyrfc3339/default.nix +++ b/pkgs/development/python-modules/pyrfc3339/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , pytz @@ -17,7 +17,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pytz ]; buildInputs = [ nose ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Generate and parse RFC 3339 timestamps"; homepage = "https://github.com/kurtraschke/pyRFC3339"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pyro4/default.nix b/pkgs/development/python-modules/pyro4/default.nix index 713b257a195b..a84b22e06567 100644 --- a/pkgs/development/python-modules/pyro4/default.nix +++ b/pkgs/development/python-modules/pyro4/default.nix @@ -32,20 +32,26 @@ buildPythonPackage rec { ]; checkInputs = [ pytestCheckHook ]; + # add testsupport.py to PATH preCheck = "PYTHONPATH=tests/PyroTests:$PYTHONPATH"; + # ignore network related tests, which fail in sandbox pytestFlagsArray = [ "--ignore=tests/PyroTests/test_naming.py" ]; + disabledTests = [ "StartNSfunc" "Broadcast" "GetIP" ]; - meta = with stdenv.lib; { + # otherwise the tests hang the build + __darwinAllowLocalNetworking = true; + + meta = with lib; { description = "Distributed object middleware for Python (RPC)"; homepage = "https://github.com/irmen/Pyro4"; license = licenses.mit; maintainers = with maintainers; [ prusnak ]; - }; + }; } diff --git a/pkgs/development/python-modules/pyroma/default.nix b/pkgs/development/python-modules/pyroma/default.nix index 4ec06506b38b..e533f6501697 100644 --- a/pkgs/development/python-modules/pyroma/default.nix +++ b/pkgs/development/python-modules/pyroma/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ lib, stdenv, buildPythonPackage, fetchPypi , docutils, pygments, setuptools }: @@ -13,7 +13,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ docutils pygments setuptools ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Test your project's packaging friendliness"; homepage = "https://github.com/regebro/pyroma"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pyroute2/default.nix b/pkgs/development/python-modules/pyroute2/default.nix index b7dfd6d42b3d..f2378863720c 100644 --- a/pkgs/development/python-modules/pyroute2/default.nix +++ b/pkgs/development/python-modules/pyroute2/default.nix @@ -1,4 +1,4 @@ -{stdenv, buildPythonPackage, fetchPypi}: +{lib, stdenv, buildPythonPackage, fetchPypi}: buildPythonPackage rec { pname = "pyroute2"; @@ -12,7 +12,7 @@ buildPythonPackage rec { # requires root priviledges doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Python Netlink library"; homepage = "https://github.com/svinota/pyroute2"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/pyrr/default.nix b/pkgs/development/python-modules/pyrr/default.nix index 96d160619588..f8ac5d8e8675 100644 --- a/pkgs/development/python-modules/pyrr/default.nix +++ b/pkgs/development/python-modules/pyrr/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , setuptools @@ -18,7 +18,7 @@ buildPythonPackage rec { buildInputs = [ setuptools ]; propagatedBuildInputs = [ multipledispatch numpy ]; - meta = with stdenv.lib; { + meta = with lib; { description = "3D mathematical functions using NumPy"; homepage = "https://github.com/adamlwgriffiths/Pyrr/"; license = licenses.bsd2; diff --git a/pkgs/development/python-modules/pyrsistent/default.nix b/pkgs/development/python-modules/pyrsistent/default.nix index 7da3239f3e74..211bc85f5112 100644 --- a/pkgs/development/python-modules/pyrsistent/default.nix +++ b/pkgs/development/python-modules/pyrsistent/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , isPy27 @@ -27,7 +27,7 @@ buildPythonPackage rec { substituteInPlace setup.py --replace 'pytest<5' 'pytest' ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/tobgu/pyrsistent/"; description = "Persistent/Functional/Immutable data structures"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pyrss2gen/default.nix b/pkgs/development/python-modules/pyrss2gen/default.nix index ee51e84ba0f4..e3586e6dbf1c 100644 --- a/pkgs/development/python-modules/pyrss2gen/default.nix +++ b/pkgs/development/python-modules/pyrss2gen/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi }: @@ -15,7 +15,7 @@ buildPythonPackage rec { # No tests in archive doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.dalkescientific.om/Python/PyRSS2Gen.html"; description = "Library for generating RSS 2.0 feeds"; license = licenses.bsd2; diff --git a/pkgs/development/python-modules/pysaml2/default.nix b/pkgs/development/python-modules/pysaml2/default.nix index f30fddc1efd8..7d2fdb5b4260 100644 --- a/pkgs/development/python-modules/pysaml2/default.nix +++ b/pkgs/development/python-modules/pysaml2/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , isPy3k , fetchFromGitHub @@ -53,7 +53,7 @@ buildPythonPackage rec { and not test_conf_syslog" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/rohe/pysaml2"; description = "Python implementation of SAML Version 2 Standard"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/pyscss/default.nix b/pkgs/development/python-modules/pyscss/default.nix index 30b5205050dd..87f23b8edf7c 100644 --- a/pkgs/development/python-modules/pyscss/default.nix +++ b/pkgs/development/python-modules/pyscss/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchFromGitHub , pytest @@ -30,7 +30,7 @@ buildPythonPackage rec { py.test ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A Scss compiler for Python"; homepage = "https://pyscss.readthedocs.org/en/latest/"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pysendfile/default.nix b/pkgs/development/python-modules/pysendfile/default.nix index b49ec5030f9a..a35f2ae77f02 100644 --- a/pkgs/development/python-modules/pysendfile/default.nix +++ b/pkgs/development/python-modules/pysendfile/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , python @@ -19,7 +19,7 @@ buildPythonPackage rec { ${python.executable} test/test_sendfile.py ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/giampaolo/pysendfile"; description = "A Python interface to sendfile(2)"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pysensors/default.nix b/pkgs/development/python-modules/pysensors/default.nix index cc2dee7957d8..214412c4ceed 100644 --- a/pkgs/development/python-modules/pysensors/default.nix +++ b/pkgs/development/python-modules/pysensors/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, python, fetchFromGitHub, lm_sensors }: +{ lib, stdenv, buildPythonPackage, python, fetchFromGitHub, lm_sensors }: buildPythonPackage { version = "2017-07-13"; pname = "pysensors"; @@ -22,7 +22,7 @@ buildPythonPackage { ${python.interpreter} -m unittest discover ''; - meta = with stdenv.lib; { + meta = with lib; { maintainers = with maintainers; [ guibou ]; description = "Easy hardware health monitoring in Python for Linux systems"; homepage = "https://pysensors.readthedocs.org"; diff --git a/pkgs/development/python-modules/pyserial-asyncio/default.nix b/pkgs/development/python-modules/pyserial-asyncio/default.nix index 5e721504eda5..ff3d624490ba 100644 --- a/pkgs/development/python-modules/pyserial-asyncio/default.nix +++ b/pkgs/development/python-modules/pyserial-asyncio/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy3k +{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k , pyserial }: buildPythonPackage rec { @@ -14,7 +14,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pyserial ]; - meta = with stdenv.lib; { + meta = with lib; { description = "asyncio extension package for pyserial"; homepage = "https://github.com/pyserial/pyserial-asyncio"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/pysftp/default.nix b/pkgs/development/python-modules/pysftp/default.nix index 61fc4f122d29..28daf6b385e6 100644 --- a/pkgs/development/python-modules/pysftp/default.nix +++ b/pkgs/development/python-modules/pysftp/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , isPyPy @@ -17,7 +17,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ paramiko ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://bitbucket.org/dundeemt/pysftp"; description = "A friendly face on SFTP"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pyshp/default.nix b/pkgs/development/python-modules/pyshp/default.nix index 33ebe945b231..661c70a0ab26 100644 --- a/pkgs/development/python-modules/pyshp/default.nix +++ b/pkgs/development/python-modules/pyshp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ lib, stdenv, buildPythonPackage, fetchPypi , setuptools }: buildPythonPackage rec { @@ -12,7 +12,7 @@ buildPythonPackage rec { buildInputs = [ setuptools ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Pure Python read/write support for ESRI Shapefile format"; homepage = "https://github.com/GeospatialPython/pyshp"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pyside/apiextractor.nix b/pkgs/development/python-modules/pyside/apiextractor.nix index 07ddfb69fa0f..10f030b13f62 100644 --- a/pkgs/development/python-modules/pyside/apiextractor.nix +++ b/pkgs/development/python-modules/pyside/apiextractor.nix @@ -11,8 +11,6 @@ in stdenv.mkDerivation { sha256 = "1zj8yrxy08iv1pk38djxw3faimm226w6wmi0gm32w4yczblylwz3"; }; - enableParallelBuilding = true; - outputs = [ "out" "dev" ]; preConfigure = '' diff --git a/pkgs/development/python-modules/pyside/default.nix b/pkgs/development/python-modules/pyside/default.nix index 2bbeb7a1233f..08fd8cbfa862 100644 --- a/pkgs/development/python-modules/pyside/default.nix +++ b/pkgs/development/python-modules/pyside/default.nix @@ -11,8 +11,6 @@ buildPythonPackage rec { sha256 = "90f2d736e2192ac69e5a2ac798fce2b5f7bf179269daa2ec262986d488c3b0f7"; }; - enableParallelBuilding = true; - outputs = [ "out" "dev" ]; preConfigure = '' diff --git a/pkgs/development/python-modules/pyside/generatorrunner.nix b/pkgs/development/python-modules/pyside/generatorrunner.nix index 8fc505a89fc4..cbc586f47348 100644 --- a/pkgs/development/python-modules/pyside/generatorrunner.nix +++ b/pkgs/development/python-modules/pyside/generatorrunner.nix @@ -13,8 +13,6 @@ in stdenv.mkDerivation { sha256 = "0vzk3cp0pfbhd921r8f1xkcz96znla39dhj074k623x9k26lj2sj"; }; - enableParallelBuilding = true; - outputs = [ "out" "dev" ]; preConfigure = '' diff --git a/pkgs/development/python-modules/pyside/shiboken.nix b/pkgs/development/python-modules/pyside/shiboken.nix index cf7192f92ffb..2690422932f2 100644 --- a/pkgs/development/python-modules/pyside/shiboken.nix +++ b/pkgs/development/python-modules/pyside/shiboken.nix @@ -27,8 +27,6 @@ buildPythonPackage rec { sha256 = "0x2lyg52m6a0vn0665pgd1z1qrydglyfxxcggw6xzngpnngb6v5v"; }; - enableParallelBuilding = true; - nativeBuildInputs = [ cmake pkg-config pysideApiextractor pysideGeneratorrunner sphinx qt4 ]; buildInputs = [ python libxml2 libxslt ]; diff --git a/pkgs/development/python-modules/pyside2-tools/default.nix b/pkgs/development/python-modules/pyside2-tools/default.nix index 9f1f94ffecbb..095a10c1047d 100644 --- a/pkgs/development/python-modules/pyside2-tools/default.nix +++ b/pkgs/development/python-modules/pyside2-tools/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, wrapPython, python, fetchurl, stdenv, cmake, qt5, +{ buildPythonPackage, wrapPython, python, fetchurl, lib, stdenv, cmake, qt5, shiboken2, pyside2 }: stdenv.mkDerivation { @@ -41,7 +41,7 @@ stdenv.mkDerivation { wrapPythonPrograms ''; - meta = with stdenv.lib; { + meta = with lib; { description = "PySide2 development tools"; license = licenses.gpl2; homepage = "https://wiki.qt.io/Qt_for_Python"; diff --git a/pkgs/development/python-modules/pyside2/default.nix b/pkgs/development/python-modules/pyside2/default.nix index 8133b677db28..6986c8e5384b 100644 --- a/pkgs/development/python-modules/pyside2/default.nix +++ b/pkgs/development/python-modules/pyside2/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, python, fetchurl, stdenv, +{ buildPythonPackage, python, fetchurl, lib, stdenv, cmake, ninja, qt5, shiboken2 }: stdenv.mkDerivation rec { @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ]; propagatedBuildInputs = [ shiboken2 ]; - meta = with stdenv.lib; { + meta = with lib; { description = "LGPL-licensed Python bindings for Qt"; license = licenses.lgpl21; homepage = "https://wiki.qt.io/Qt_for_Python"; diff --git a/pkgs/development/python-modules/pysigset/default.nix b/pkgs/development/python-modules/pysigset/default.nix index 4e1b87a1f1b0..8e31735db2e4 100644 --- a/pkgs/development/python-modules/pysigset/default.nix +++ b/pkgs/development/python-modules/pysigset/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi }: +{ lib, stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "pysigset"; @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "0ym44z3nwp8chfi7snmknkqnl2q9bghzv9p923r8w748i5hvyxx8"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Provides access to sigprocmask(2) and friends and convenience wrappers to python application developers wanting to SIG_BLOCK and SIG_UNBLOCK signals"; homepage = "https://github.com/ossobv/pysigset"; license = licenses.gpl3; diff --git a/pkgs/development/python-modules/pysmbc/default.nix b/pkgs/development/python-modules/pysmbc/default.nix index e242dbe5e96e..eff4dd58c1db 100644 --- a/pkgs/development/python-modules/pysmbc/default.nix +++ b/pkgs/development/python-modules/pysmbc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ lib, stdenv, buildPythonPackage, fetchPypi , samba, pkgconfig , setuptools }: @@ -15,7 +15,7 @@ buildPythonPackage rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ setuptools samba ]; - meta = with stdenv.lib; { + meta = with lib; { description = "libsmbclient binding for Python"; homepage = "https://github.com/hamano/pysmbc"; license = licenses.gpl2Plus; diff --git a/pkgs/development/python-modules/pysmf/default.nix b/pkgs/development/python-modules/pysmf/default.nix index ef5e560b08c7..02559510100c 100644 --- a/pkgs/development/python-modules/pysmf/default.nix +++ b/pkgs/development/python-modules/pysmf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, pkg-config, libsmf, glib, pytest }: +{ lib, stdenv, buildPythonPackage, fetchPypi, pkg-config, libsmf, glib, pytest }: buildPythonPackage rec { pname = "pysmf"; @@ -12,7 +12,7 @@ buildPythonPackage rec { nativeBuildInputs = [ pkg-config pytest ]; buildInputs = [ libsmf glib ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://das.nasophon.de/pysmf/"; description = "Python extension module for reading and writing Standard MIDI Files, based on libsmf."; license = licenses.bsd2; diff --git a/pkgs/development/python-modules/pysmi/default.nix b/pkgs/development/python-modules/pysmi/default.nix index a3a7c3d7ec10..953581aa3029 100644 --- a/pkgs/development/python-modules/pysmi/default.nix +++ b/pkgs/development/python-modules/pysmi/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , ply @@ -18,7 +18,7 @@ buildPythonPackage rec { # Tests require pysnmp, which in turn requires pysmi => infinite recursion doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://pysmi.sf.net"; description = "SNMP SMI/MIB Parser"; license = licenses.bsd2; diff --git a/pkgs/development/python-modules/pysnmp/default.nix b/pkgs/development/python-modules/pysnmp/default.nix index c0bed855a4cd..7dce4d9b4d18 100644 --- a/pkgs/development/python-modules/pysnmp/default.nix +++ b/pkgs/development/python-modules/pysnmp/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , pyasn1 @@ -22,7 +22,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pyasn1 pycryptodomex pysmi ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://snmplabs.com/pysnmp/index.html"; description = "A pure-Python SNMPv1/v2c/v3 library"; license = licenses.bsd2; diff --git a/pkgs/development/python-modules/pysocks/default.nix b/pkgs/development/python-modules/pysocks/default.nix index e8d853d625d4..79c163726b76 100644 --- a/pkgs/development/python-modules/pysocks/default.nix +++ b/pkgs/development/python-modules/pysocks/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi }: @@ -15,7 +15,7 @@ buildPythonPackage rec { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "SOCKS module for Python"; license = licenses.bsd3; maintainers = with maintainers; [ thoughtpolice ]; diff --git a/pkgs/development/python-modules/pyspark/default.nix b/pkgs/development/python-modules/pyspark/default.nix index d181d6a29d90..342755131a3d 100644 --- a/pkgs/development/python-modules/pyspark/default.nix +++ b/pkgs/development/python-modules/pyspark/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, fetchPypi, stdenv, py4j }: +{ buildPythonPackage, fetchPypi, lib, stdenv, py4j }: buildPythonPackage rec { pname = "pyspark"; @@ -21,7 +21,7 @@ buildPythonPackage rec { # Tests assume running spark... doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Apache Spark"; homepage = "https://github.com/apache/spark/tree/master/python"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/pyspice/default.nix b/pkgs/development/python-modules/pyspice/default.nix index bed00ddabe7d..53fb7e6d248f 100644 --- a/pkgs/development/python-modules/pyspice/default.nix +++ b/pkgs/development/python-modules/pyspice/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , pythonOlder , fetchPypi @@ -44,7 +44,7 @@ buildPythonPackage rec { "ffi.dlopen('${libngspice}/lib/libngspice${stdenv.hostPlatform.extensions.sharedLibrary}')" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Simulate electronic circuit using Python and the Ngspice / Xyce simulators"; homepage = "https://github.com/FabriceSalvaire/PySpice"; license = licenses.gpl3Only; diff --git a/pkgs/development/python-modules/pyspiflash/default.nix b/pkgs/development/python-modules/pyspiflash/default.nix new file mode 100644 index 000000000000..fcab563b5ab3 --- /dev/null +++ b/pkgs/development/python-modules/pyspiflash/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pyftdi +}: + +buildPythonPackage rec { + pname = "pyspiflash"; + version = "0.6.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "0ifnw1qm4nssb03af93qw6vpa92rmyc2hisw9m4043pm9ryqcmpc"; + }; + + propagatedBuildInputs = [ + pyftdi + ]; + + # tests are not shipped with the PyPI source + doCheck = false; + + pythonImportsCheck = [ "spiflash" ]; + + meta = with lib; { + description = "SPI data flash device drivers in Python"; + homepage = "https://github.com/eblot/pyspiflash"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pyspotify/default.nix b/pkgs/development/python-modules/pyspotify/default.nix index d6d0a6007f66..a6bf14cdca08 100644 --- a/pkgs/development/python-modules/pyspotify/default.nix +++ b/pkgs/development/python-modules/pyspotify/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchurl , cffi @@ -33,7 +33,7 @@ buildPythonPackage rec { # There are no tests doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://pyspotify.mopidy.com"; description = "A Python interface to Spotify’s online music streaming service"; license = licenses.unfree; diff --git a/pkgs/development/python-modules/pyspread/default.nix b/pkgs/development/python-modules/pyspread/default.nix index 2e7f458253ea..a14911b7a3ed 100644 --- a/pkgs/development/python-modules/pyspread/default.nix +++ b/pkgs/development/python-modules/pyspread/default.nix @@ -1,7 +1,7 @@ { buildPythonPackage , fetchPypi , isPy3k -, stdenv +, lib, stdenv , numpy , wxPython , matplotlib @@ -48,7 +48,7 @@ buildPythonPackage rec { cp $desktopItem/share/applications/* $out/share/applications ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Pyspread is a non-traditional spreadsheet application that is based on and written in the programming language Python"; homepage = "https://manns.github.io/pyspread/"; license = licenses.gpl3; diff --git a/pkgs/development/python-modules/pysqlcipher3/default.nix b/pkgs/development/python-modules/pysqlcipher3/default.nix new file mode 100644 index 000000000000..ab3f949cf1ed --- /dev/null +++ b/pkgs/development/python-modules/pysqlcipher3/default.nix @@ -0,0 +1,24 @@ +{ lib, buildPythonPackage, fetchPypi, pythonAtLeast, sqlcipher }: + +buildPythonPackage rec { + pname = "pysqlcipher3"; + version = "1.0.3"; + + disabled = pythonAtLeast "3.9"; + + src = fetchPypi { + inherit pname version; + sha256 = "0c54m18h52llwkfc9zaag3qkmfzzp5a1w9jzsm5hd2nfdsxmnkk9"; + }; + + buildInputs = [ sqlcipher ]; + + pythonImportsCheck = [ "pysqlcipher3" ]; + + meta = with lib; { + description = "Python 3 bindings for SQLCipher"; + homepage = "https://github.com/rigglemania/pysqlcipher3/"; + license = licenses.zlib; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/development/python-modules/pysqlite/default.nix b/pkgs/development/python-modules/pysqlite/default.nix index a1916f09a6cd..fec1bbd0beda 100644 --- a/pkgs/development/python-modules/pysqlite/default.nix +++ b/pkgs/development/python-modules/pysqlite/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , isPy3k @@ -29,7 +29,7 @@ buildPythonPackage rec { ${stdenv.lib.optionalString (!stdenv.isDarwin) ''export LDSHARED="$CC -pthread -shared"''} ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://pysqlite.org/"; description = "Python bindings for the SQLite embedded relational database engine"; longDescription = '' diff --git a/pkgs/development/python-modules/pysqueezebox/default.nix b/pkgs/development/python-modules/pysqueezebox/default.nix index 11c9d9c40d06..7c5d8ca5abf5 100644 --- a/pkgs/development/python-modules/pysqueezebox/default.nix +++ b/pkgs/development/python-modules/pysqueezebox/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage, pythonOlder, aiohttp }: +{ lib, stdenv, fetchPypi, buildPythonPackage, pythonOlder, aiohttp }: buildPythonPackage rec { pname = "pysqueezebox"; @@ -18,7 +18,7 @@ buildPythonPackage rec { doCheck = false; pythonImportsCheck = [ "pysqueezebox" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Asynchronous library to control Logitech Media Server"; homepage = "https://github.com/rajlaud/pysqueezebox"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/pysrt/default.nix b/pkgs/development/python-modules/pysrt/default.nix index e8c9aa3d5c88..4012a7324660 100644 --- a/pkgs/development/python-modules/pysrt/default.nix +++ b/pkgs/development/python-modules/pysrt/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchFromGitHub , chardet @@ -23,7 +23,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ chardet ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/byroot/pysrt"; license = licenses.gpl3; description = "Python library used to edit or create SubRip files"; diff --git a/pkgs/development/python-modules/pyssim/default.nix b/pkgs/development/python-modules/pyssim/default.nix index ad2057351d9a..4f73ada61af6 100644 --- a/pkgs/development/python-modules/pyssim/default.nix +++ b/pkgs/development/python-modules/pyssim/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, numpy, scipy, pillow }: +{ lib, stdenv, buildPythonPackage, fetchFromGitHub, numpy, scipy, pillow }: buildPythonPackage rec { pname = "pyssim"; @@ -23,7 +23,7 @@ buildPythonPackage rec { $out/bin/pyssim --cw --width 128 --height 128 test-images/test3-orig.jpg test-images/test3-rot.jpg | grep 0.938 ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Module for computing Structured Similarity Image Metric (SSIM) in Python"; homepage = "https://github.com/jterrace/pyssim"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pystache/default.nix b/pkgs/development/python-modules/pystache/default.nix index 1900bc31f212..6ed036aecb1a 100644 --- a/pkgs/development/python-modules/pystache/default.nix +++ b/pkgs/development/python-modules/pystache/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, python, fetchPypi, isPy3k, glibcLocales }: +{ lib, stdenv, buildPythonPackage, python, fetchPypi, isPy3k, glibcLocales }: buildPythonPackage rec { pname = "pystache"; @@ -21,7 +21,7 @@ buildPythonPackage rec { # https://github.com/defunkt/pystache/issues/181 doCheck = !isPy3k; - meta = with stdenv.lib; { + meta = with lib; { description = "A framework-agnostic, logic-free templating system inspired by ctemplate and et"; homepage = "https://github.com/defunkt/pystache"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pystemd/default.nix b/pkgs/development/python-modules/pystemd/default.nix index 1ff26ffa37ba..691865919490 100644 --- a/pkgs/development/python-modules/pystemd/default.nix +++ b/pkgs/development/python-modules/pystemd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python, systemd }: +{ lib, stdenv, python, systemd }: python.pkgs.buildPythonPackage rec { pname = "pystemd"; @@ -15,7 +15,7 @@ python.pkgs.buildPythonPackage rec { checkInputs = with python.pkgs; [ pytest mock ]; checkPhase = "pytest tests"; - meta = with stdenv.lib; { + meta = with lib; { description = "A thin Cython-based wrapper on top of libsystemd, focused on exposing the dbus API via sd-bus in an automated and easy to consume way."; homepage = "https://github.com/facebookincubator/pystemd/"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/python-modules/pystemmer/default.nix b/pkgs/development/python-modules/pystemmer/default.nix index 37260404906b..0ba23ffec5df 100644 --- a/pkgs/development/python-modules/pystemmer/default.nix +++ b/pkgs/development/python-modules/pystemmer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python, fetchPypi, buildPythonPackage, cython }: +{ lib, stdenv, python, fetchPypi, buildPythonPackage, cython }: buildPythonPackage rec { pname = "PyStemmer"; @@ -19,7 +19,7 @@ buildPythonPackage rec { ${python.interpreter} runtests.py ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Snowball stemming algorithms, for information retrieval"; homepage = "http://snowball.tartarus.org/"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pysvn/default.nix b/pkgs/development/python-modules/pysvn/default.nix index d56c10a9591e..9e9948607093 100644 --- a/pkgs/development/python-modules/pysvn/default.nix +++ b/pkgs/development/python-modules/pysvn/default.nix @@ -60,11 +60,11 @@ buildPythonPackage rec { sed -i "s|/bin/bash|${bash}/bin/bash|" ../Tests/test-*.sh make -C ../Tests + ${python.interpreter} -c "import pysvn" + runHook postCheck ''; - pythonImportCheck = [ "pysvn" ]; - installPhase = '' dest=$(toPythonPath $out)/pysvn mkdir -p $dest @@ -75,10 +75,9 @@ buildPythonPackage rec { rm -v $out/share/doc/pysvn-${version}/generate_cpp_docs_from_html_docs.py ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Python bindings for Subversion"; homepage = "http://pysvn.tigris.org/"; license = licenses.asl20; }; - } diff --git a/pkgs/development/python-modules/pytabix/default.nix b/pkgs/development/python-modules/pytabix/default.nix index eb21ca198180..db8437d8957c 100644 --- a/pkgs/development/python-modules/pytabix/default.nix +++ b/pkgs/development/python-modules/pytabix/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , isPy3k , fetchPypi @@ -23,7 +23,7 @@ buildPythonPackage rec { ''; pythonImportsCheck = [ "tabix" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/slowkow/pytabix"; description = "Python interface for tabix"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pytado/default.nix b/pkgs/development/python-modules/pytado/default.nix index 40b221d3dc9d..636210c93d59 100644 --- a/pkgs/development/python-modules/pytado/default.nix +++ b/pkgs/development/python-modules/pytado/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub }: +{ lib, stdenv, buildPythonPackage, fetchFromGitHub }: buildPythonPackage rec { pname = "PyTado"; @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "14xdfw4913g4j4h576hjbigm7fiw8k0dc8s98gh2ag9xrc2ifgr0"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Python binding for Tado web API. Pythonize your central heating!"; homepage = "https://github.com/wmalgadey/PyTado"; license = licenses.gpl3; diff --git a/pkgs/development/python-modules/pyte/default.nix b/pkgs/development/python-modules/pyte/default.nix index f09bd95d0703..65d3d9218d06 100644 --- a/pkgs/development/python-modules/pyte/default.nix +++ b/pkgs/development/python-modules/pyte/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, pytest, pytestrunner, wcwidth }: +{ lib, stdenv, buildPythonPackage, fetchPypi, pytest, pytestrunner, wcwidth }: buildPythonPackage rec { pname = "pyte"; @@ -17,7 +17,7 @@ buildPythonPackage rec { py.test -k "not test_input_output" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Simple VTXXX-compatible linux terminal emulator"; homepage = "https://github.com/selectel/pyte"; license = licenses.lgpl3; diff --git a/pkgs/development/python-modules/pytest-aiohttp/default.nix b/pkgs/development/python-modules/pytest-aiohttp/default.nix index f2491bd571c1..7384eb360704 100644 --- a/pkgs/development/python-modules/pytest-aiohttp/default.nix +++ b/pkgs/development/python-modules/pytest-aiohttp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, pytest, aiohttp }: +{ lib, stdenv, buildPythonPackage, fetchPypi, pytest, aiohttp }: buildPythonPackage rec { pname = "pytest-aiohttp"; @@ -14,7 +14,7 @@ buildPythonPackage rec { # There are no tests doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/aio-libs/pytest-aiohttp/"; description = "Pytest plugin for aiohttp support"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/pytest-annotate/default.nix b/pkgs/development/python-modules/pytest-annotate/default.nix index 53879bffbc8a..1a7f77bf9b6e 100644 --- a/pkgs/development/python-modules/pytest-annotate/default.nix +++ b/pkgs/development/python-modules/pytest-annotate/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , pyannotate @@ -30,7 +30,7 @@ buildPythonPackage rec { # no testing in a testing module... doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/kensho-technologies/pytest-annotate"; description = "Generate PyAnnotate annotations from your pytest tests"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/pytest-ansible/default.nix b/pkgs/development/python-modules/pytest-ansible/default.nix index 2e98654c5d46..309a33e89073 100644 --- a/pkgs/development/python-modules/pytest-ansible/default.nix +++ b/pkgs/development/python-modules/pytest-ansible/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchFromGitHub , ansible @@ -33,7 +33,7 @@ buildPythonPackage rec { HOME=$TMPDIR pytest tests/ ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/jlaska/pytest-ansible"; description = "Plugin for py.test to simplify calling ansible modules from tests or fixtures"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pytest-asyncio/default.nix b/pkgs/development/python-modules/pytest-asyncio/default.nix index 8942263a5788..961845a28e15 100644 --- a/pkgs/development/python-modules/pytest-asyncio/default.nix +++ b/pkgs/development/python-modules/pytest-asyncio/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, pytest, isPy3k, isPy35, async_generator }: +{ lib, stdenv, buildPythonPackage, fetchPypi, pytest, isPy3k, isPy35, async_generator }: buildPythonPackage rec { pname = "pytest-asyncio"; version = "0.14.0"; @@ -21,7 +21,7 @@ buildPythonPackage rec { substituteInPlace setup.cfg --replace "license_file = LICENSE" "" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "library for testing asyncio code with pytest"; license = licenses.asl20; homepage = "https://github.com/pytest-dev/pytest-asyncio"; diff --git a/pkgs/development/python-modules/pytest-bdd/default.nix b/pkgs/development/python-modules/pytest-bdd/default.nix index ccde881d3839..493a2307e7e7 100644 --- a/pkgs/development/python-modules/pytest-bdd/default.nix +++ b/pkgs/development/python-modules/pytest-bdd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub +{ lib, stdenv, buildPythonPackage, fetchFromGitHub , execnet , glob2 , Mako @@ -30,7 +30,7 @@ buildPythonPackage rec { PATH=$PATH:$out/bin pytest ''; - meta = with stdenv.lib; { + meta = with lib; { description = "BDD library for the py.test runner"; homepage = "https://github.com/pytest-dev/pytest-bdd"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pytest-catchlog/default.nix b/pkgs/development/python-modules/pytest-catchlog/default.nix index 35d3fce49d1b..2fb02244d1d7 100644 --- a/pkgs/development/python-modules/pytest-catchlog/default.nix +++ b/pkgs/development/python-modules/pytest-catchlog/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, pytest, unzip }: +{ lib, stdenv, buildPythonPackage, fetchPypi, pytest, unzip }: buildPythonPackage rec { pname = "pytest-catchlog"; @@ -16,7 +16,7 @@ buildPythonPackage rec { # Requires pytest < 3.1 doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { license = licenses.mit; homepage = "https://pypi.python.org/pypi/pytest-catchlog/"; description = "py.test plugin to catch log messages. This is a fork of pytest-capturelog."; diff --git a/pkgs/development/python-modules/pytest-celery/default.nix b/pkgs/development/python-modules/pytest-celery/default.nix index e3d463a39aa6..034c657b5b0f 100644 --- a/pkgs/development/python-modules/pytest-celery/default.nix +++ b/pkgs/development/python-modules/pytest-celery/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, pytest, setuptools_scm }: +{ lib, stdenv, buildPythonPackage, fetchPypi, pytest, setuptools_scm }: buildPythonPackage rec { pname = "pytest-celery"; @@ -13,7 +13,7 @@ buildPythonPackage rec { doCheck = false; # This package has nothing to test or import. - meta = with stdenv.lib; { + meta = with lib; { description = "pytest plugin for unittest subTest() support and subtests fixture"; homepage = "https://github.com/pytest-dev/pytest-subtests"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pytest-check/default.nix b/pkgs/development/python-modules/pytest-check/default.nix index 9636d20c73b7..41f316a18a65 100644 --- a/pkgs/development/python-modules/pytest-check/default.nix +++ b/pkgs/development/python-modules/pytest-check/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , pytest @@ -18,7 +18,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pytest ]; checkInputs = [ pytestCheckHook ]; - meta = with stdenv.lib; { + meta = with lib; { description = "pytest plugin allowing multiple failures per test"; homepage = "https://github.com/okken/pytest-check"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pytest-cov/default.nix b/pkgs/development/python-modules/pytest-cov/default.nix index 649e41f7d662..aa921ddeb3d1 100644 --- a/pkgs/development/python-modules/pytest-cov/default.nix +++ b/pkgs/development/python-modules/pytest-cov/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ lib, stdenv, buildPythonPackage, fetchPypi , pytest, coverage }: buildPythonPackage rec { @@ -22,7 +22,7 @@ buildPythonPackage rec { py.test tests ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Plugin for coverage reporting with support for both centralised and distributed testing, including subprocesses and multiprocessing"; homepage = "https://github.com/pytest-dev/pytest-cov"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pytest-datadir/default.nix b/pkgs/development/python-modules/pytest-datadir/default.nix index 6ce784419206..b1cdb1033a64 100644 --- a/pkgs/development/python-modules/pytest-datadir/default.nix +++ b/pkgs/development/python-modules/pytest-datadir/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub +{ lib, stdenv, buildPythonPackage, fetchFromGitHub , setuptools_scm, pytest, cmake }: @@ -23,7 +23,7 @@ buildPythonPackage rec { checkInputs = [ pytest ]; checkPhase = "pytest"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/gabrielcnr/pytest-datadir"; description = "pytest plugin for manipulating test data directories and files"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pytest-datafiles/default.nix b/pkgs/development/python-modules/pytest-datafiles/default.nix index 2fafdcd1aaa0..bc6e2441b0f0 100644 --- a/pkgs/development/python-modules/pytest-datafiles/default.nix +++ b/pkgs/development/python-modules/pytest-datafiles/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, py, pytest }: +{ lib, stdenv, buildPythonPackage, fetchPypi, py, pytest }: buildPythonPackage rec { pname = "pytest-datafiles"; @@ -10,7 +10,7 @@ buildPythonPackage rec { buildInputs = [ py pytest ]; - meta = with stdenv.lib; { + meta = with lib; { license = licenses.mit; homepage = "https://github.com/omarkohl/pytest-datafiles"; description = "py.test plugin to create a 'tmpdir' containing predefined files/directories."; diff --git a/pkgs/development/python-modules/pytest-dependency/default.nix b/pkgs/development/python-modules/pytest-dependency/default.nix index 9e570a801f99..9a3dbed55b15 100644 --- a/pkgs/development/python-modules/pytest-dependency/default.nix +++ b/pkgs/development/python-modules/pytest-dependency/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, fetchpatch, pytest }: +{ lib, stdenv, buildPythonPackage, fetchPypi, fetchpatch, pytest }: buildPythonPackage rec { version = "0.5.1"; @@ -17,7 +17,7 @@ buildPythonPackage rec { pytest ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/RKrahl/pytest-dependency"; description = "Manage dependencies of tests"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/pytest-django/default.nix b/pkgs/development/python-modules/pytest-django/default.nix index 4b257b0a3d13..069aa2812eb5 100644 --- a/pkgs/development/python-modules/pytest-django/default.nix +++ b/pkgs/development/python-modules/pytest-django/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , pytest @@ -24,7 +24,7 @@ buildPythonPackage rec { # Complicated. Requires Django setup. doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "py.test plugin for testing of Django applications"; homepage = "https://pytest-django.readthedocs.org/en/latest/"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/pytest-factoryboy/default.nix b/pkgs/development/python-modules/pytest-factoryboy/default.nix index 48c5020a44f8..e63b7329c965 100644 --- a/pkgs/development/python-modules/pytest-factoryboy/default.nix +++ b/pkgs/development/python-modules/pytest-factoryboy/default.nix @@ -1,42 +1,44 @@ -{ stdenv -, fetchFromGitHub +{ lib , buildPythonPackage -, pytestCheckHook -, pytest -, inflection , factory_boy -, pytestcache -, pytestcov +, fetchFromGitHub +, inflection , mock +, pytest +, pytestcache +, pytestCheckHook +, pytestcov }: buildPythonPackage rec { pname = "pytest-factoryboy"; - version = "2.0.3"; + version = "2.1.0"; src = fetchFromGitHub { owner = "pytest-dev"; repo = "pytest-factoryboy"; rev = version; - sha256 = "0m1snyybq2k51khlydhisq300vzys897vdbsicph628iran950hn"; + sha256 = "0v6b4ly0p8nknpnp3f4dbslfsifzzjx2vv27rfylx04kzdhg4m9p"; }; - # TODO: remove in next release, it's removed in master. - postPatch = "substituteInPlace tox.ini --replace '--pep8' ''"; + propagatedBuildInputs = [ + factory_boy + inflection + pytest + ]; - propagatedBuildInputs = [ factory_boy inflection pytest ]; - - # The project uses tox, which we can't. So we simply run pytest manually. checkInputs = [ mock pytestCheckHook pytestcache pytestcov ]; - pytestFlagsArray = [ "--ignore=docs" ]; - meta = with stdenv.lib; { - description = "Integration of factory_boy into the pytest runner."; + pytestFlagsArray = [ "--ignore=docs" ]; + pythonImportsCheck = [ "pytest_factoryboy" ]; + + meta = with lib; { + description = "Integration of factory_boy into the pytest runner"; homepage = "https://pytest-factoryboy.readthedocs.io/en/latest/"; maintainers = with maintainers; [ winpat ]; license = licenses.mit; diff --git a/pkgs/development/python-modules/pytest-fixture-config/default.nix b/pkgs/development/python-modules/pytest-fixture-config/default.nix index 7c7d4c66cd47..061f62bfc17b 100644 --- a/pkgs/development/python-modules/pytest-fixture-config/default.nix +++ b/pkgs/development/python-modules/pytest-fixture-config/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ lib, stdenv, buildPythonPackage, fetchPypi , setuptools-git, pytest }: buildPythonPackage rec { @@ -16,7 +16,7 @@ buildPythonPackage rec { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Simple configuration objects for Py.test fixtures. Allows you to skip tests when their required config variables aren’t set."; homepage = "https://github.com/manahl/pytest-plugins"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pytest-flakes/default.nix b/pkgs/development/python-modules/pytest-flakes/default.nix index 440cc632185b..fd4ed0978060 100644 --- a/pkgs/development/python-modules/pytest-flakes/default.nix +++ b/pkgs/development/python-modules/pytest-flakes/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, pythonOlder +{ lib, stdenv, buildPythonPackage, fetchPypi, pythonOlder , pytest , pyflakes }: @@ -26,7 +26,7 @@ buildPythonPackage rec { py.test test_flakes.py -k 'not test_syntax_error' ''; - meta = with stdenv.lib; { + meta = with lib; { license = licenses.mit; homepage = "https://pypi.python.org/pypi/pytest-flakes"; description = "pytest plugin to check source code with pyflakes"; diff --git a/pkgs/development/python-modules/pytest-flask/default.nix b/pkgs/development/python-modules/pytest-flask/default.nix index 1e6c34aee3c0..74e33a7731b3 100644 --- a/pkgs/development/python-modules/pytest-flask/default.nix +++ b/pkgs/development/python-modules/pytest-flask/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, pytest, flask, werkzeug, setuptools_scm, isPy27 }: +{ lib, stdenv, buildPythonPackage, fetchPypi, pytest, flask, werkzeug, setuptools_scm, isPy27 }: buildPythonPackage rec { pname = "pytest-flask"; @@ -20,7 +20,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools_scm ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/pytest-dev/pytest-flask/"; license = licenses.mit; description = "A set of py.test fixtures to test Flask applications"; diff --git a/pkgs/development/python-modules/pytest-helpers-namespace/default.nix b/pkgs/development/python-modules/pytest-helpers-namespace/default.nix index 8f24d1dc1f68..41263ce692b3 100644 --- a/pkgs/development/python-modules/pytest-helpers-namespace/default.nix +++ b/pkgs/development/python-modules/pytest-helpers-namespace/default.nix @@ -1,7 +1,7 @@ { buildPythonPackage , fetchFromGitHub , pytest -, stdenv +, lib, stdenv }: buildPythonPackage rec { @@ -26,7 +26,7 @@ buildPythonPackage rec { # The tests fail with newest pytest. They passed with pytest_3, which no longer exists doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/saltstack/pytest-helpers-namespace"; description = "PyTest Helpers Namespace"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/pytest-html/default.nix b/pkgs/development/python-modules/pytest-html/default.nix index e6e17adc92ee..0b1090f7b81d 100644 --- a/pkgs/development/python-modules/pytest-html/default.nix +++ b/pkgs/development/python-modules/pytest-html/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, pythonOlder +{ lib, stdenv, buildPythonPackage, fetchPypi, pythonOlder , pytest, pytest-metadata, setuptools_scm }: buildPythonPackage rec { @@ -14,7 +14,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools_scm ]; propagatedBuildInputs = [ pytest pytest-metadata ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Plugin for generating HTML reports"; homepage = "https://github.com/pytest-dev/pytest-html"; license = licenses.mpl20; diff --git a/pkgs/development/python-modules/pytest-metadata/default.nix b/pkgs/development/python-modules/pytest-metadata/default.nix index f2191ab617d2..e8b224dc1d4d 100644 --- a/pkgs/development/python-modules/pytest-metadata/default.nix +++ b/pkgs/development/python-modules/pytest-metadata/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ lib, stdenv, buildPythonPackage, fetchPypi , pytest, setuptools_scm }: buildPythonPackage rec { @@ -13,7 +13,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools_scm ]; propagatedBuildInputs = [ pytest ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Plugin for accessing test session metadata"; homepage = "https://github.com/pytest-dev/pytest-metadata"; license = licenses.mpl20; diff --git a/pkgs/development/python-modules/pytest-mpl/default.nix b/pkgs/development/python-modules/pytest-mpl/default.nix index 78d5243cf641..0cc3a993c235 100644 --- a/pkgs/development/python-modules/pytest-mpl/default.nix +++ b/pkgs/development/python-modules/pytest-mpl/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , pytest @@ -44,7 +44,7 @@ buildPythonPackage rec { ln -s $HOME/.config/matplotlib $HOME/.matplotlib ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Pytest plugin to help with testing figures output from Matplotlib"; homepage = "https://github.com/matplotlib/pytest-mpl"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/pytest-pep257/default.nix b/pkgs/development/python-modules/pytest-pep257/default.nix index 8c20cf873aba..eb5203c02466 100644 --- a/pkgs/development/python-modules/pytest-pep257/default.nix +++ b/pkgs/development/python-modules/pytest-pep257/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, pytest, pep257 }: +{ lib, stdenv, buildPythonPackage, fetchPypi, pytest, pep257 }: buildPythonPackage rec { pname = "pytest-pep257"; @@ -12,7 +12,7 @@ buildPythonPackage rec { buildInputs = [ pytest ]; propagatedBuildInputs = [ pep257 ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/anderslime/pytest-pep257"; description = "py.test plugin for PEP257"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pytest-quickcheck/default.nix b/pkgs/development/python-modules/pytest-quickcheck/default.nix index 7db982ed857c..5148fa4b7608 100644 --- a/pkgs/development/python-modules/pytest-quickcheck/default.nix +++ b/pkgs/development/python-modules/pytest-quickcheck/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, pytest, pytest-flakes, tox }: +{ lib, stdenv, buildPythonPackage, fetchPypi, pytest, pytest-flakes, tox }: buildPythonPackage rec { pname = "pytest-quickcheck"; version = "0.8.6"; @@ -11,7 +11,7 @@ buildPythonPackage rec { buildInputs = [ pytest ]; propagatedBuildInputs = [ pytest-flakes tox ]; - meta = with stdenv.lib; { + meta = with lib; { license = licenses.asl20; homepage = "https://pypi.python.org/pypi/pytest-quickcheck"; description = "pytest plugin to generate random data inspired by QuickCheck"; diff --git a/pkgs/development/python-modules/pytest-raisesregexp/default.nix b/pkgs/development/python-modules/pytest-raisesregexp/default.nix index 638548e9424f..0d02a25ec3c7 100644 --- a/pkgs/development/python-modules/pytest-raisesregexp/default.nix +++ b/pkgs/development/python-modules/pytest-raisesregexp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ lib, stdenv, buildPythonPackage, fetchPypi , py, pytest }: buildPythonPackage rec { @@ -18,7 +18,7 @@ buildPythonPackage rec { substituteInPlace setup.py --replace "long_description=open('README.rst').read()," "long_description=io.open('README.rst', encoding='utf-8').read()," ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Simple pytest plugin to look for regex in Exceptions"; homepage = "https://github.com/Walkman/pytest_raisesregexp"; license = with licenses; [ mit ]; diff --git a/pkgs/development/python-modules/pytest-random-order/default.nix b/pkgs/development/python-modules/pytest-random-order/default.nix index 088f8702436f..2def886c5cba 100644 --- a/pkgs/development/python-modules/pytest-random-order/default.nix +++ b/pkgs/development/python-modules/pytest-random-order/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , pythonOlder @@ -18,7 +18,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pytest ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/jbasko/pytest-random-order"; description = "Randomise the order of tests with some control over the randomness"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pytest-relaxed/default.nix b/pkgs/development/python-modules/pytest-relaxed/default.nix index c9871368bbe4..401307039e55 100644 --- a/pkgs/development/python-modules/pytest-relaxed/default.nix +++ b/pkgs/development/python-modules/pytest-relaxed/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , pytest @@ -31,7 +31,7 @@ buildPythonPackage rec { pytest tests ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://pytest-relaxed.readthedocs.io/"; description = "Relaxed test discovery/organization for pytest"; license = licenses.bsd0; diff --git a/pkgs/development/python-modules/pytest-rerunfailures/default.nix b/pkgs/development/python-modules/pytest-rerunfailures/default.nix index 384681eee1f9..537f32316a31 100644 --- a/pkgs/development/python-modules/pytest-rerunfailures/default.nix +++ b/pkgs/development/python-modules/pytest-rerunfailures/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, pythonOlder, fetchPypi, pytest, mock }: +{ lib, stdenv, buildPythonPackage, pythonOlder, fetchPypi, pytest, mock }: buildPythonPackage rec { pname = "pytest-rerunfailures"; @@ -19,7 +19,7 @@ buildPythonPackage rec { py.test test_pytest_rerunfailures.py ''; - meta = with stdenv.lib; { + meta = with lib; { description = "pytest plugin to re-run tests to eliminate flaky failures"; homepage = "https://github.com/pytest-dev/pytest-rerunfailures"; license = licenses.mpl20; diff --git a/pkgs/development/python-modules/pytest-server-fixtures/default.nix b/pkgs/development/python-modules/pytest-server-fixtures/default.nix index 90b60686ee6c..41fcfc7b1597 100644 --- a/pkgs/development/python-modules/pytest-server-fixtures/default.nix +++ b/pkgs/development/python-modules/pytest-server-fixtures/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ lib, stdenv, buildPythonPackage, fetchPypi , pytest, pytest-shutil, pytest-fixture-config, psutil , requests, future, retry }: @@ -17,7 +17,7 @@ buildPythonPackage rec { # RuntimeError: Unable to find a free server number to start Xvfb doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Extensible server fixures for py.test"; homepage = "https://github.com/manahl/pytest-plugins"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pytest-shutil/default.nix b/pkgs/development/python-modules/pytest-shutil/default.nix index ef03762e188d..3edafdfb4734 100644 --- a/pkgs/development/python-modules/pytest-shutil/default.nix +++ b/pkgs/development/python-modules/pytest-shutil/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { py.test ${lib.optionalString isPyPy "-k'not (test_run or test_run_integration)'"} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A goodie-bag of unix shell and environment tools for py.test"; homepage = "https://github.com/manahl/pytest-plugins"; maintainers = with maintainers; [ ryansydnor ]; diff --git a/pkgs/development/python-modules/pytest-snapshot/default.nix b/pkgs/development/python-modules/pytest-snapshot/default.nix new file mode 100644 index 000000000000..42f399bb67f9 --- /dev/null +++ b/pkgs/development/python-modules/pytest-snapshot/default.nix @@ -0,0 +1,26 @@ +{ lib, buildPythonPackage, fetchPypi, packaging, pytest, setuptools-scm }: + +buildPythonPackage rec { + pname = "pytest-snapshot"; + version = "0.4.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "1p33fcplfykwf5mdwg25n8hjgzxpx8w1iprjnfzibpxclfrxmy5i"; + }; + + nativeBuildInputs = [ setuptools-scm ]; + + propagatedBuildInputs = [ packaging pytest ]; + + # pypi does not contain tests and GitHub archive is not supported because setuptools-scm can't detect the version + doCheck = false; + pythonImportsCheck = [ "pytest_snapshot" ]; + + meta = with lib; { + description = "A plugin to enable snapshot testing with pytest"; + homepage = "https://github.com/joseph-roitman/pytest-snapshot/"; + license = licenses.mit; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/development/python-modules/pytest-subtesthack/default.nix b/pkgs/development/python-modules/pytest-subtesthack/default.nix index d42eb5f8aa31..f7454ee644ca 100644 --- a/pkgs/development/python-modules/pytest-subtesthack/default.nix +++ b/pkgs/development/python-modules/pytest-subtesthack/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, pytest }: +{ lib, stdenv, buildPythonPackage, fetchPypi, pytest }: buildPythonPackage rec { pname = "pytest-subtesthack"; @@ -14,7 +14,7 @@ buildPythonPackage rec { # no upstream test doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Terrible plugin to set up and tear down fixtures within the test function itself"; homepage = "https://github.com/untitaker/pytest-subtesthack"; license = licenses.publicDomain; diff --git a/pkgs/development/python-modules/pytest-virtualenv/default.nix b/pkgs/development/python-modules/pytest-virtualenv/default.nix index 27350efd7457..5234723a536f 100644 --- a/pkgs/development/python-modules/pytest-virtualenv/default.nix +++ b/pkgs/development/python-modules/pytest-virtualenv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ lib, stdenv, buildPythonPackage, fetchPypi , pytest, pytestcov, mock, cmdline, pytest-fixture-config, pytest-shutil, virtualenv }: buildPythonPackage rec { @@ -16,7 +16,7 @@ buildPythonPackage rec { nativeBuildInputs = [ pytest ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Create a Python virtual environment in your test that cleans up on teardown. The fixture has utility methods to install packages and list what’s installed."; homepage = "https://github.com/manahl/pytest-plugins"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pytest-xdist/1.nix b/pkgs/development/python-modules/pytest-xdist/1.nix index 6dc4b666db54..0c5ae06e8611 100644 --- a/pkgs/development/python-modules/pytest-xdist/1.nix +++ b/pkgs/development/python-modules/pytest-xdist/1.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage, execnet, pytest +{ lib, stdenv, fetchPypi, buildPythonPackage, execnet, pytest , setuptools_scm, pytest-forked, filelock, psutil, six, isPy3k }: buildPythonPackage rec { @@ -27,7 +27,7 @@ buildPythonPackage rec { and not test_rsyncignore" ''; - meta = with stdenv.lib; { + meta = with 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; diff --git a/pkgs/development/python-modules/pytest-xdist/default.nix b/pkgs/development/python-modules/pytest-xdist/default.nix index cc58c5ab6bde..e5019f842fee 100644 --- a/pkgs/development/python-modules/pytest-xdist/default.nix +++ b/pkgs/development/python-modules/pytest-xdist/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage, execnet, pytest_6 +{ lib, stdenv, fetchPypi, buildPythonPackage, execnet, pytest_6 , setuptools_scm, pytest-forked, filelock, psutil, six, isPy3k }: buildPythonPackage rec { @@ -24,7 +24,7 @@ buildPythonPackage rec { -k "not (distribution_rsyncdirs_example or rsync or warning_captured_deprecated_in_pytest_6)" ''; - meta = with stdenv.lib; { + meta = with 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; diff --git a/pkgs/development/python-modules/pytest/4.nix b/pkgs/development/python-modules/pytest/4.nix index 43cfe6c822c4..88963537c9d5 100644 --- a/pkgs/development/python-modules/pytest/4.nix +++ b/pkgs/development/python-modules/pytest/4.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, pythonOlder, fetchPypi, attrs, hypothesis, py +{ lib, stdenv, buildPythonPackage, pythonOlder, fetchPypi, attrs, hypothesis, py , setuptools_scm, setuptools, six, pluggy, funcsigs, isPy3k, more-itertools , atomicwrites, mock, writeText, pathlib2, wcwidth, packaging, isPyPy }: @@ -40,7 +40,7 @@ buildPythonPackage rec { preDistPhases+=" pytestcachePhase" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://docs.pytest.org"; description = "Framework for writing tests"; maintainers = with maintainers; [ domenkozar lovek323 madjar lsix ]; diff --git a/pkgs/development/python-modules/pytest/5.nix b/pkgs/development/python-modules/pytest/5.nix index 2b45c330cf38..ade36f4aa0b2 100644 --- a/pkgs/development/python-modules/pytest/5.nix +++ b/pkgs/development/python-modules/pytest/5.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, pythonOlder, fetchPypi, isPy3k, isPyPy +{ lib, stdenv, buildPythonPackage, pythonOlder, fetchPypi, isPy3k, isPyPy , atomicwrites , attrs , funcsigs @@ -71,7 +71,7 @@ buildPythonPackage rec { "pytest" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://docs.pytest.org"; description = "Framework for writing tests"; maintainers = with maintainers; [ domenkozar lovek323 madjar lsix ]; diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix index 93282218871a..3c8e00f1af8d 100644 --- a/pkgs/development/python-modules/pytest/default.nix +++ b/pkgs/development/python-modules/pytest/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, pythonOlder, fetchPypi, isPy3k, isPyPy +{ lib, stdenv, buildPythonPackage, pythonOlder, fetchPypi, isPy3k, isPyPy , atomicwrites , attrs , funcsigs @@ -58,6 +58,12 @@ buildPythonPackage rec { checkPhase = '' runHook preCheck $out/bin/py.test -x testing/ -k "not test_collect_pyargs_with_testpaths" --ignore=testing/test_junitxml.py + + # tests leave behind unreproducible pytest binaries in the output directory, remove: + find $out/lib -name "*-pytest-${version}.pyc" -delete + # specifically testing/test_assertion.py and testing/test_assertrewrite.py leave behind those: + find $out/lib -name "*opt-2.pyc" -delete + runHook postCheck ''; @@ -73,7 +79,7 @@ buildPythonPackage rec { "pytest" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://docs.pytest.org"; description = "Framework for writing tests"; maintainers = with maintainers; [ domenkozar lovek323 madjar lsix ]; diff --git a/pkgs/development/python-modules/pytestcache/default.nix b/pkgs/development/python-modules/pytestcache/default.nix index f2427991e3f2..877e357d9469 100644 --- a/pkgs/development/python-modules/pytestcache/default.nix +++ b/pkgs/development/python-modules/pytestcache/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ lib, stdenv, buildPythonPackage, fetchPypi , pytest, execnet }: buildPythonPackage rec { @@ -20,7 +20,7 @@ buildPythonPackage rec { # Too many failing tests. Are they maintained? doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { license = licenses.mit; homepage = "https://pypi.python.org/pypi/pytest-cache/"; description = "pytest plugin with mechanisms for caching across test runs"; diff --git a/pkgs/development/python-modules/pytestrunner/default.nix b/pkgs/development/python-modules/pytestrunner/default.nix index 5ea632fa7f80..7fd901babd0b 100644 --- a/pkgs/development/python-modules/pytestrunner/default.nix +++ b/pkgs/development/python-modules/pytestrunner/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, setuptools_scm, pytest }: +{ lib, stdenv, buildPythonPackage, fetchPypi, setuptools_scm, pytest }: buildPythonPackage rec { pname = "pytest-runner"; @@ -22,7 +22,7 @@ buildPythonPackage rec { # Fixture not found doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Invoke py.test as distutils command with dependency resolution"; homepage = "https://github.com/pytest-dev/pytest-runner"; license = licenses.mit; diff --git a/pkgs/development/python-modules/python-codon-tables/default.nix b/pkgs/development/python-modules/python-codon-tables/default.nix new file mode 100644 index 000000000000..4c1ec6a3a20e --- /dev/null +++ b/pkgs/development/python-modules/python-codon-tables/default.nix @@ -0,0 +1,27 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "python-codon-tables"; + version = "0.1.10"; + + src = fetchPypi { + pname = "python_codon_tables"; + inherit version; + sha256 = "265beac928cbb77c6745bc728471adc7ffef933b794be303d272ecb9ad37d3d4"; + }; + + # no tests in tarball + doCheck = false; + + pythonImportsCheck = [ "python_codon_tables" ]; + + meta = with lib; { + homepage = "https://github.com/Edinburgh-Genome-Foundry/codon-usage-tables"; + description = "Codon Usage Tables for Python, from kazusa.or.jp"; + license = licenses.mit; + maintainers = with maintainers; [ prusnak ]; + }; +} diff --git a/pkgs/development/python-modules/python-doi/default.nix b/pkgs/development/python-modules/python-doi/default.nix index 2fcd30e84b3e..7e94f743da46 100644 --- a/pkgs/development/python-modules/python-doi/default.nix +++ b/pkgs/development/python-modules/python-doi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, isPy3k }: +{ lib, stdenv, buildPythonPackage, fetchFromGitHub, isPy3k }: buildPythonPackage rec { pname = "python-doi"; @@ -13,7 +13,7 @@ buildPythonPackage rec { disabled = !isPy3k; - meta = with stdenv.lib; { + meta = with lib; { description = "Python library to work with Document Object Identifiers (doi)"; homepage = "https://github.com/alejandrogallo/python-doi"; maintainers = with maintainers; [ teto ]; diff --git a/pkgs/development/python-modules/python-editor/default.nix b/pkgs/development/python-modules/python-editor/default.nix index 523229220efe..19efcb89d3d3 100644 --- a/pkgs/development/python-modules/python-editor/default.nix +++ b/pkgs/development/python-modules/python-editor/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi }: +{ lib, stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { version = "1.0.4"; @@ -12,7 +12,7 @@ buildPythonPackage rec { # No proper tests doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "A library that provides the `editor` module for programmatically"; homepage = "https://github.com/fmoo/python-editor"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/python-efl/default.nix b/pkgs/development/python-modules/python-efl/default.nix index 4e3cffa9d223..bfd14ab3635d 100644 --- a/pkgs/development/python-modules/python-efl/default.nix +++ b/pkgs/development/python-modules/python-efl/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , buildPythonPackage , pkgconfig @@ -38,7 +38,7 @@ buildPythonPackage rec { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Python bindings for EFL and Elementary"; homepage = "https://phab.enlightenment.org/w/projects/python_bindings_for_efl/"; platforms = platforms.linux; diff --git a/pkgs/development/python-modules/python-engineio/default.nix b/pkgs/development/python-modules/python-engineio/default.nix index a74ee0455f2f..19c8941d2fcb 100644 --- a/pkgs/development/python-modules/python-engineio/default.nix +++ b/pkgs/development/python-modules/python-engineio/default.nix @@ -1,4 +1,6 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub +{ lib, stdenv +, buildPythonPackage +, fetchFromGitHub , aiohttp , eventlet , iana-etc @@ -14,19 +16,15 @@ buildPythonPackage rec { pname = "python-engineio"; - version = "3.13.2"; + version = "4.0.0"; src = fetchFromGitHub { owner = "miguelgrinberg"; repo = "python-engineio"; rev = "v${version}"; - sha256 = "1hn5nnxp7y2dpf52vrwdxza2sqmzj8admcnwgjkmcxk65s2dhvy1"; + sha256 = "00x9pmmnl1yd59wd96ivkiqh4n5nphl8cwk43hf4nqr0icgsyhar"; }; - propagatedBuildInputs = [ - six - ]; - checkInputs = [ aiohttp eventlet @@ -38,6 +36,8 @@ buildPythonPackage rec { pytestCheckHook ]; + doCheck = !stdenv.isDarwin; + preCheck = stdenv.lib.optionalString stdenv.isLinux '' echo "nameserver 127.0.0.1" > resolv.conf export NIX_REDIRECTS=/etc/protocols=${iana-etc}/etc/protocols:/etc/resolv.conf=$(realpath resolv.conf) \ @@ -47,11 +47,16 @@ buildPythonPackage rec { # somehow effective log level does not change? disabledTests = [ "test_logger" ]; + pythonImportsCheck = [ "engineio" ]; - meta = with stdenv.lib; { - description = "Engine.IO server"; + meta = with lib; { + description = "Python based Engine.IO client and server"; + longDescription = '' + Engine.IO is a lightweight transport protocol that enables real-time + bidirectional event-based communication between clients and a server. + ''; homepage = "https://github.com/miguelgrinberg/python-engineio/"; - license = licenses.mit; - maintainers = [ maintainers.mic92 ]; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ mic92 ]; }; } diff --git a/pkgs/development/python-modules/python-etcd/default.nix b/pkgs/development/python-modules/python-etcd/default.nix index 714c324b4405..f4305473797c 100644 --- a/pkgs/development/python-modules/python-etcd/default.nix +++ b/pkgs/development/python-modules/python-etcd/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , nose @@ -28,7 +28,7 @@ buildPythonPackage rec { # Some issues with etcd not in path even though most tests passed doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "A python client for Etcd"; homepage = "https://github.com/jplana/python-etcd"; license = licenses.mit; diff --git a/pkgs/development/python-modules/python-forecastio/default.nix b/pkgs/development/python-modules/python-forecastio/default.nix index 7ef2eee4f2e5..392c5c2126d3 100644 --- a/pkgs/development/python-modules/python-forecastio/default.nix +++ b/pkgs/development/python-modules/python-forecastio/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, stdenv, fetchPypi +{ buildPythonPackage, lib, stdenv, fetchPypi , requests , nose , responses @@ -22,7 +22,7 @@ buildPythonPackage rec { nosetests ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://zeevgilovitz.com/python-forecast.io/"; description = "A thin Python Wrapper for the Dark Sky (formerly forecast.io) weather API"; license = licenses.bsd2; diff --git a/pkgs/development/python-modules/python-frontmatter/default.nix b/pkgs/development/python-modules/python-frontmatter/default.nix index 8edd87556675..661ea4ba2493 100644 --- a/pkgs/development/python-modules/python-frontmatter/default.nix +++ b/pkgs/development/python-modules/python-frontmatter/default.nix @@ -20,7 +20,7 @@ python3Packages.buildPythonPackage rec { pytest ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/eyeseast/python-frontmatter"; description = "Parse and manage posts with YAML (or other) frontmatter"; license = licenses.mit; diff --git a/pkgs/development/python-modules/python-gitlab/default.nix b/pkgs/development/python-modules/python-gitlab/default.nix index 6108ea74a23a..c706ff7903c3 100644 --- a/pkgs/development/python-modules/python-gitlab/default.nix +++ b/pkgs/development/python-modules/python-gitlab/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, requests, mock, httmock, pythonOlder, pytest, responses }: +{ lib, stdenv, buildPythonPackage, fetchPypi, requests, mock, httmock, pythonOlder, pytest, responses }: buildPythonPackage rec { pname = "python-gitlab"; @@ -15,7 +15,7 @@ buildPythonPackage rec { disabled = pythonOlder "3.6"; - meta = with stdenv.lib; { + meta = with lib; { description = "Interact with GitLab API"; homepage = "https://github.com/python-gitlab/python-gitlab"; license = licenses.lgpl3; diff --git a/pkgs/development/python-modules/python-gnupg/default.nix b/pkgs/development/python-modules/python-gnupg/default.nix index 3dd44a72ea46..36ca3a719061 100644 --- a/pkgs/development/python-modules/python-gnupg/default.nix +++ b/pkgs/development/python-modules/python-gnupg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, gnupg }: +{ lib, stdenv, buildPythonPackage, fetchPypi, gnupg }: buildPythonPackage rec { pname = "python-gnupg"; @@ -18,7 +18,7 @@ buildPythonPackage rec { --replace "test_search_keys" "disabled__test_search_keys" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A wrapper for the Gnu Privacy Guard"; homepage = "https://pypi.python.org/pypi/python-gnupg"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/python-hosts/default.nix b/pkgs/development/python-modules/python-hosts/default.nix index e76dbc3e3b24..238b9b9e4afa 100644 --- a/pkgs/development/python-modules/python-hosts/default.nix +++ b/pkgs/development/python-modules/python-hosts/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, pyyaml, pytest, pytestcov }: +{ lib, stdenv, buildPythonPackage, fetchPypi, pyyaml, pytest, pytestcov }: buildPythonPackage rec { pname = "python-hosts"; @@ -23,7 +23,7 @@ buildPythonPackage rec { pytest tests/test_utils.py ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A library for managing a hosts file. It enables adding and removing entries, or importing them from a file or URL"; homepage = "https://github.com/jonhadfield/python-hosts"; license = licenses.mit; diff --git a/pkgs/development/python-modules/python-jose/default.nix b/pkgs/development/python-modules/python-jose/default.nix index 6b8104516ea9..0de220094c06 100644 --- a/pkgs/development/python-modules/python-jose/default.nix +++ b/pkgs/development/python-modules/python-jose/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub +{ lib, stdenv, buildPythonPackage, fetchFromGitHub , future, six, ecdsa, rsa , pycrypto, pytestcov, pytestrunner, cryptography , pytestCheckHook @@ -37,7 +37,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ future six ecdsa rsa ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/mpdavis/python-jose"; description = "A JOSE implementation in Python"; license = licenses.mit; diff --git a/pkgs/development/python-modules/python-json-logger/default.nix b/pkgs/development/python-modules/python-json-logger/default.nix index d21e1dfccc91..96ce13ab265b 100644 --- a/pkgs/development/python-modules/python-json-logger/default.nix +++ b/pkgs/development/python-modules/python-json-logger/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , isPy27 @@ -17,7 +17,7 @@ buildPythonPackage rec { checkInputs = [ nose ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/madzak/python-json-logger"; description = "A python library adding a json log formatter"; license = licenses.bsdOriginal; diff --git a/pkgs/development/python-modules/python-jsonrpc-server/default.nix b/pkgs/development/python-modules/python-jsonrpc-server/default.nix index fa6ba97b406d..9879a441b3e2 100644 --- a/pkgs/development/python-modules/python-jsonrpc-server/default.nix +++ b/pkgs/development/python-modules/python-jsonrpc-server/default.nix @@ -1,49 +1,31 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder -, pytest, mock, pytestcov, coverage +{ stdenv, lib, buildPythonPackage, fetchFromGitHub, pythonOlder +, pytestCheckHook, mock, pytestcov, coverage , future, futures, ujson, isPy38 -, fetchpatch }: buildPythonPackage rec { pname = "python-jsonrpc-server"; - version = "0.3.4"; + version = "0.4.0"; src = fetchFromGitHub { owner = "palantir"; repo = "python-jsonrpc-server"; rev = version; - sha256 = "027sx5pv4i9a192kr00bjjcxxprh2xyr8q5372q8ghff3xryk9dd"; + sha256 = "0pcf50qvcxqnz3db58whqd8z89cdph19pfs1whgfm0zmwbwk0lw6"; }; postPatch = '' sed -i "s/version=versioneer.get_version(),/version=\"$version\",/g" setup.py - # https://github.com/palantir/python-jsonrpc-server/issues/36 - sed -iEe "s!'ujson.*\$!'ujson',!" setup.py ''; checkInputs = [ - pytest mock pytestcov coverage - ]; - - checkPhase = '' - pytest - ''; - - patches = [ - (fetchpatch { - url = "https://github.com/palantir/python-jsonrpc-server/commit/0a04cc4e9d44233b1038b12d63cd3bd437c2374e.patch"; - sha256 = "177zdnp1808r2pg189bvzab44l8i2alsgv04kmrlhhnv40h66qyg"; - }) - (fetchpatch { - url = "https://github.com/palantir/python-jsonrpc-server/commit/5af6e43d0c1fb9a6a29b96d38cfd6dbeec85d0ea.patch"; - sha256 = "1gx7lc1jxar1ngqqfkdn21s46y1mfnjf7ky2886ydk53nkaba91m"; - }) + pytestCheckHook mock pytestcov coverage ]; propagatedBuildInputs = [ future ujson ] ++ stdenv.lib.optional (pythonOlder "3.2") futures; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/palantir/python-jsonrpc-server"; description = "A Python 2 and 3 asynchronous JSON RPC server"; license = licenses.mit; diff --git a/pkgs/development/python-modules/python-language-server/default.nix b/pkgs/development/python-modules/python-language-server/default.nix index 4558bc7edba4..dc3b33a6f539 100644 --- a/pkgs/development/python-modules/python-language-server/default.nix +++ b/pkgs/development/python-modules/python-language-server/default.nix @@ -1,6 +1,6 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, fetchpatch, pythonOlder, isPy27 +{ stdenv, lib, buildPythonPackage, fetchFromGitHub, pythonOlder, isPy27 , backports_functools_lru_cache, configparser, futures, future, jedi, pluggy, python-jsonrpc-server, flake8 -, pytestCheckHook, mock, pytestcov, coverage, setuptools, ujson +, pytestCheckHook, mock, pytestcov, coverage, setuptools, ujson, flaky , # Allow building a limited set of providers, e.g. ["pycodestyle"]. providers ? ["*"] # The following packages are optional and @@ -21,33 +21,33 @@ in buildPythonPackage rec { pname = "python-language-server"; - version = "0.34.1"; + version = "0.36.2"; src = fetchFromGitHub { owner = "palantir"; repo = "python-language-server"; rev = version; - sha256 = "sha256-/tVzaoyUO6+7DSvnf3JxpcTY0rU+hHBu5qlru/ZTpxU="; + sha256 = "07x6jr4z20jxn03bxblwc8vk0ywha492cgwfhj7q97nb5cm7kx0q"; }; - patches = [ - # https://github.com/palantir/python-language-server/pull/851 - (fetchpatch { - url = "https://github.com/palantir/python-language-server/commit/f513f3297132492dd41e001d943980e6c4f40809.patch"; - sha256 = "04c9hrb3dzlfchjk4625ipazyfcbq6qq2kj2hg3zf2xsny2jcvi5"; - }) - ]; + propagatedBuildInputs = [ setuptools jedi pluggy future python-jsonrpc-server flake8 ujson ] + ++ stdenv.lib.optional (withProvider "autopep8") autopep8 + ++ stdenv.lib.optional (withProvider "mccabe") mccabe + ++ stdenv.lib.optional (withProvider "pycodestyle") pycodestyle + ++ stdenv.lib.optional (withProvider "pydocstyle") pydocstyle + ++ stdenv.lib.optional (withProvider "pyflakes") pyflakes + ++ stdenv.lib.optional (withProvider "pylint") pylint + ++ stdenv.lib.optional (withProvider "rope") rope + ++ stdenv.lib.optional (withProvider "yapf") yapf + ++ stdenv.lib.optional isPy27 configparser + ++ stdenv.lib.optionals (pythonOlder "3.2") [ backports_functools_lru_cache futures ]; - postPatch = '' - # https://github.com/palantir/python-jsonrpc-server/issues/36 - sed -i -e 's!ujson<=!ujson>=!' setup.py - ''; # The tests require all the providers, disable otherwise. doCheck = providers == ["*"]; checkInputs = [ - pytestCheckHook mock pytestcov coverage + pytestCheckHook mock pytestcov coverage flaky # rope is technically a dependency, but we don't add it by default since we # already have jedi, which is the preferred option rope @@ -67,21 +67,10 @@ buildPythonPackage rec { "test_matplotlib_completions" "test_snippet_parsing" "test_numpy_hover" + "test_symbols" ] ++ stdenv.lib.optional isPy27 "test_flake8_lint"; - propagatedBuildInputs = [ setuptools jedi pluggy future python-jsonrpc-server flake8 ujson ] - ++ stdenv.lib.optional (withProvider "autopep8") autopep8 - ++ stdenv.lib.optional (withProvider "mccabe") mccabe - ++ stdenv.lib.optional (withProvider "pycodestyle") pycodestyle - ++ stdenv.lib.optional (withProvider "pydocstyle") pydocstyle - ++ stdenv.lib.optional (withProvider "pyflakes") pyflakes - ++ stdenv.lib.optional (withProvider "pylint") pylint - ++ stdenv.lib.optional (withProvider "rope") rope - ++ stdenv.lib.optional (withProvider "yapf") yapf - ++ stdenv.lib.optional isPy27 configparser - ++ stdenv.lib.optionals (pythonOlder "3.2") [ backports_functools_lru_cache futures ]; - - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/palantir/python-language-server"; description = "An implementation of the Language Server Protocol for Python"; license = licenses.mit; diff --git a/pkgs/development/python-modules/python-ldap-test/default.nix b/pkgs/development/python-modules/python-ldap-test/default.nix index 3f543e8569b9..94d8abd1fabd 100644 --- a/pkgs/development/python-modules/python-ldap-test/default.nix +++ b/pkgs/development/python-modules/python-ldap-test/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, py4j }: +{ lib, stdenv, buildPythonPackage, fetchPypi, py4j }: buildPythonPackage rec { pname = "python-ldap-test"; @@ -14,7 +14,7 @@ buildPythonPackage rec { # Tests needs java to be present in path doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Tool for testing code speaking with LDAP server"; homepage = "https://github.com/zoldar/python-ldap-test"; license = licenses.mit; diff --git a/pkgs/development/python-modules/python-levenshtein/default.nix b/pkgs/development/python-modules/python-levenshtein/default.nix index 7a16621da0a5..60767e77e761 100644 --- a/pkgs/development/python-modules/python-levenshtein/default.nix +++ b/pkgs/development/python-modules/python-levenshtein/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi }: @@ -15,7 +15,7 @@ buildPythonPackage rec { # No tests included in archive doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Functions for fast computation of Levenshtein distance and string similarity"; homepage = "https://github.com/ztane/python-Levenshtein"; license = licenses.gpl2; diff --git a/pkgs/development/python-modules/python-ly/default.nix b/pkgs/development/python-modules/python-ly/default.nix index f8b7f023717c..6f83a7f61c75 100644 --- a/pkgs/development/python-modules/python-ly/default.nix +++ b/pkgs/development/python-modules/python-ly/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, fetchPypi, stdenv }: +{ buildPythonPackage, fetchPypi, lib, stdenv }: buildPythonPackage rec { pname = "python-ly"; @@ -13,7 +13,7 @@ buildPythonPackage rec { # seem to be broken ATM: https://github.com/wbsoft/python-ly/issues/70 doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Tool and library for manipulating LilyPond files"; license = licenses.gpl2; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/python-modules/python-lzf/default.nix b/pkgs/development/python-modules/python-lzf/default.nix index 3064afe3ba42..a1fd01134235 100644 --- a/pkgs/development/python-modules/python-lzf/default.nix +++ b/pkgs/development/python-modules/python-lzf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi }: +{ lib, stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { version = "0.2.4"; @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "1l8m6vzwm1m8hn7ldw8j8r2b6r199k8z3q0wnhdyy4p68hahyhni"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "liblzf python bindings"; homepage = "https://github.com/teepark/python-lzf"; license = licenses.mit; diff --git a/pkgs/development/python-modules/python-mapnik/default.nix b/pkgs/development/python-modules/python-mapnik/default.nix index 61cd5e34855c..e129bf452195 100644 --- a/pkgs/development/python-modules/python-mapnik/default.nix +++ b/pkgs/development/python-modules/python-mapnik/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , isPyPy , python @@ -57,7 +57,7 @@ in buildPythonPackage rec { ]); propagatedBuildInputs = [ pillow pycairo ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Python bindings for Mapnik"; homepage = "https://mapnik.org"; license = licenses.lgpl21; diff --git a/pkgs/development/python-modules/python-miio/default.nix b/pkgs/development/python-modules/python-miio/default.nix index 136483761cf8..8321795c2fba 100644 --- a/pkgs/development/python-modules/python-miio/default.nix +++ b/pkgs/development/python-modules/python-miio/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , appdirs @@ -42,7 +42,7 @@ buildPythonPackage rec { pytest ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Python library for interfacing with Xiaomi smart appliances"; homepage = "https://github.com/rytilahti/python-miio"; license = licenses.gpl3; diff --git a/pkgs/development/python-modules/python-mnist/default.nix b/pkgs/development/python-modules/python-mnist/default.nix index 0004c297b619..a24f2a383a31 100644 --- a/pkgs/development/python-modules/python-mnist/default.nix +++ b/pkgs/development/python-modules/python-mnist/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi }: +{ lib, stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "python-mnist"; @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "a0cced01e83b5b844cff86109280df7a672a8e4e38fc19fa68999a17f8a9fbd8"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/sorki/python-mnist"; description = "Simple MNIST data parser written in Python"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/python-mystrom/default.nix b/pkgs/development/python-modules/python-mystrom/default.nix new file mode 100644 index 000000000000..ccda98b2eb1a --- /dev/null +++ b/pkgs/development/python-modules/python-mystrom/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchPypi +, aiohttp +, click +, requests +, setuptools +}: + +buildPythonPackage rec { + pname = "python-mystrom"; + version = "2.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "050dkx29wrmdd8z7pmyk36k2ihpapqi4qmyb70bm6xl5l4jh4k7j"; + }; + + propagatedBuildInputs = [ + aiohttp + click + requests + setuptools + ]; + + # no tests are present + doCheck = false; + + pythonImportsCheck = [ + "pymystrom.bulb" + "pymystrom.pir" + "pymystrom.switch" + ]; + + meta = with lib; { + description = "Python API client for interacting with myStrom devices"; + longDescription = '' + Asynchronous Python API client for interacting with myStrom devices. + There is support for bulbs, motion sensors, plugs and buttons. + ''; + homepage = "https://github.com/home-assistant-ecosystem/python-mystrom"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/python-nomad/default.nix b/pkgs/development/python-modules/python-nomad/default.nix index f03b3b10e487..ba3ecd3883a4 100644 --- a/pkgs/development/python-modules/python-nomad/default.nix +++ b/pkgs/development/python-modules/python-nomad/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, requests }: +{ lib, stdenv, buildPythonPackage, fetchPypi, requests }: buildPythonPackage rec { pname = "python-nomad"; @@ -14,7 +14,7 @@ buildPythonPackage rec { # Tests require nomad agent doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Python client library for Hashicorp Nomad"; homepage = "https://github.com/jrxFive/python-nomad"; license = licenses.mit; diff --git a/pkgs/development/python-modules/python-opendata-transport/default.nix b/pkgs/development/python-modules/python-opendata-transport/default.nix new file mode 100644 index 000000000000..634ccea371e0 --- /dev/null +++ b/pkgs/development/python-modules/python-opendata-transport/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchPypi +, aiohttp +, async-timeout +, urllib3 +}: + +buildPythonPackage rec { + pname = "python-opendata-transport"; + version = "0.2.1"; + + src = fetchPypi { + pname = "python_opendata_transport"; + inherit version; + sha256 = "0pxs9zqk00vn1s74cx1416mqmixrr74wb0jb0j6b1c3xpvzlfbks"; + }; + + propagatedBuildInputs = [ + aiohttp + async-timeout + urllib3 + ]; + + # no tests are present + doCheck = false; + + pythonImportsCheck = [ "opendata_transport" ]; + + meta = with lib; { + description = "Python client for interacting with transport.opendata.ch"; + homepage = "https://github.com/home-assistant-ecosystem/python-opendata-transport"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/python-otr/default.nix b/pkgs/development/python-modules/python-otr/default.nix index d83d25972450..7a40998eebdc 100644 --- a/pkgs/development/python-modules/python-otr/default.nix +++ b/pkgs/development/python-modules/python-otr/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchFromGitHub , isPy3k @@ -22,7 +22,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ zope_interface cryptography application gmpy2 ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A pure python implementation of OTR"; homepage = "https://github.com/AGProjects/python-otr"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/python-modules/python-packer/default.nix b/pkgs/development/python-modules/python-packer/default.nix index 420efb40039e..ba02ec84635f 100644 --- a/pkgs/development/python-modules/python-packer/default.nix +++ b/pkgs/development/python-modules/python-packer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, fetchpatch, sh }: +{ lib, stdenv, buildPythonPackage, fetchPypi, fetchpatch, sh }: buildPythonPackage rec { pname = "python-packer"; @@ -20,7 +20,7 @@ buildPythonPackage rec { # Tests requires network connections doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "An interface for packer.io"; homepage = "https://github.com/nir0s/python-packer"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/python-pipedrive/default.nix b/pkgs/development/python-modules/python-pipedrive/default.nix index e21f01d5cd6b..6e0c0ef5788e 100644 --- a/pkgs/development/python-modules/python-pipedrive/default.nix +++ b/pkgs/development/python-modules/python-pipedrive/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , python @@ -18,7 +18,7 @@ buildPythonPackage rec { doCheck = false; # Tests are not provided. - meta = with stdenv.lib; { + meta = with lib; { description = "Python library for interacting with the pipedrive.com API"; homepage = "https://github.com/jscott1989/python-pipedrive"; license = licenses.unfree; diff --git a/pkgs/development/python-modules/python-prjxray/default.nix b/pkgs/development/python-modules/python-prjxray/default.nix new file mode 100644 index 000000000000..5b92311612b0 --- /dev/null +++ b/pkgs/development/python-modules/python-prjxray/default.nix @@ -0,0 +1,44 @@ +{ stdenv +, fetchFromGitHub +, pkgs +, buildPythonPackage +, intervaltree +, numpy +, openpyxl +, parse +, progressbar +, pyjson5 +, pyyaml +, simplejson +, symbiflow-fasm +, textx +}: + +buildPythonPackage rec { + pname = "python-prjxray"; + version = pkgs.prjxray-tools.version; + + src = pkgs.prjxray-tools.src; + + propagatedBuildInputs = [ + intervaltree + numpy + openpyxl + parse + progressbar + pyjson5 + pyyaml + simplejson + symbiflow-fasm + textx + ]; + + doCheck = false; + + meta = with stdenv.lib; { + description = "Documenting the Xilinx 7-series bit-stream format"; + homepage = "https://github.com/SymbiFlow/prjxray"; + license = licenses.isc; + maintainers = with maintainers; [ mcaju ]; + }; +} diff --git a/pkgs/development/python-modules/python-ptrace/default.nix b/pkgs/development/python-modules/python-ptrace/default.nix index 5eff4707d4e2..2d81581c0cc1 100644 --- a/pkgs/development/python-modules/python-ptrace/default.nix +++ b/pkgs/development/python-modules/python-ptrace/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , six @@ -18,7 +18,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Python binding of ptrace library"; homepage = "https://github.com/vstinner/python-ptrace"; license = licenses.gpl2; diff --git a/pkgs/development/python-modules/python-rapidjson/default.nix b/pkgs/development/python-modules/python-rapidjson/default.nix index b128e767d872..c4cf0dc74255 100644 --- a/pkgs/development/python-modules/python-rapidjson/default.nix +++ b/pkgs/development/python-modules/python-rapidjson/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , pythonOlder @@ -28,7 +28,7 @@ buildPythonPackage rec { pytest tests ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/python-rapidjson/python-rapidjson"; description = "Python wrapper around rapidjson "; license = licenses.mit; diff --git a/pkgs/development/python-modules/python-redis-lock/default.nix b/pkgs/development/python-modules/python-redis-lock/default.nix index 32189495cdd4..7cf2affc4174 100644 --- a/pkgs/development/python-modules/python-redis-lock/default.nix +++ b/pkgs/development/python-modules/python-redis-lock/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , redis @@ -27,7 +27,7 @@ buildPythonPackage rec { ++ stdenv.lib.optional withDjango django_redis; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/ionelmc/python-redis-lock"; license = licenses.bsd2; description = "Lock context manager implemented via redis SETNX/BLPOP"; diff --git a/pkgs/development/python-modules/python-simple-hipchat/default.nix b/pkgs/development/python-modules/python-simple-hipchat/default.nix index f41aefe92aaa..8ec7f6887ad4 100644 --- a/pkgs/development/python-modules/python-simple-hipchat/default.nix +++ b/pkgs/development/python-modules/python-simple-hipchat/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ lib, stdenv, buildPythonPackage, fetchPypi , unzip }: buildPythonPackage rec { @@ -12,7 +12,7 @@ buildPythonPackage rec { buildInputs = [ unzip ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Easy peasy wrapper for HipChat's v1 API"; homepage = "https://github.com/kurttheviking/simple-hipchat-py"; license = licenses.mit; diff --git a/pkgs/development/python-modules/python-slugify/default.nix b/pkgs/development/python-modules/python-slugify/default.nix index 30ce55a12a0c..1860ff6d24d5 100644 --- a/pkgs/development/python-modules/python-slugify/default.nix +++ b/pkgs/development/python-modules/python-slugify/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage, python, text-unidecode }: +{ lib, stdenv, fetchPypi, buildPythonPackage, python, text-unidecode }: buildPythonPackage rec { pname = "python-slugify"; @@ -15,7 +15,7 @@ buildPythonPackage rec { ${python.interpreter} test.py ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/un33k/python-slugify"; description = "A Python Slugify application that handles Unicode"; license = licenses.mit; diff --git a/pkgs/development/python-modules/python-socketio/default.nix b/pkgs/development/python-modules/python-socketio/default.nix index cfa260205715..ee9a60301444 100644 --- a/pkgs/development/python-modules/python-socketio/default.nix +++ b/pkgs/development/python-modules/python-socketio/default.nix @@ -1,33 +1,43 @@ -{ lib +{ lib, stdenv +, bidict , buildPythonPackage -, fetchPypi -, six -, python-engineio +, fetchFromGitHub , mock +, pytestCheckHook +, python-engineio }: buildPythonPackage rec { pname = "python-socketio"; - version = "4.6.1"; + version = "5.0.4"; - src = fetchPypi { - inherit pname version; - sha256 = "cd1f5aa492c1eb2be77838e837a495f117e17f686029ebc03d62c09e33f4fa10"; + src = fetchFromGitHub { + owner = "miguelgrinberg"; + repo = "python-socketio"; + rev = "v${version}"; + sha256 = "0mpqr53mrdzk9ki24y1inpsfvjlvm7pvxf8q4d52m80i5pcd5v5q"; }; propagatedBuildInputs = [ - six + bidict python-engineio ]; - checkInputs = [ mock ]; - # tests only on github, but latest github release not tagged - doCheck = false; + checkInputs = [ + mock + pytestCheckHook + ]; + + pythonImportsCheck = [ "socketio" ]; meta = with lib; { - description = "Socket.IO server"; - homepage = "https://github.com/miguelgrinberg/python-socketio/"; - license = licenses.mit; - maintainers = [ maintainers.mic92 ]; + description = "Python Socket.IO server and client"; + longDescription = '' + Socket.IO is a lightweight transport protocol that enables real-time + bidirectional event-based communication between clients and a server. + ''; + homepage = "https://github.com/miguelgrinberg/python-engineio/"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ mic92 ]; }; } diff --git a/pkgs/development/python-modules/python-telegram-bot/default.nix b/pkgs/development/python-modules/python-telegram-bot/default.nix index f16f581ade3d..52dea24c45fe 100644 --- a/pkgs/development/python-modules/python-telegram-bot/default.nix +++ b/pkgs/development/python-modules/python-telegram-bot/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchPypi , buildPythonPackage , certifi @@ -33,7 +33,7 @@ buildPythonPackage rec { doCheck = false; pythonImportsCheck = [ "telegram" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "This library provides a pure Python interface for the Telegram Bot API."; homepage = "https://python-telegram-bot.org"; license = licenses.lgpl3; diff --git a/pkgs/development/python-modules/python-twitter/default.nix b/pkgs/development/python-modules/python-twitter/default.nix index 6210c13f56e8..4b1e7e2c1eba 100644 --- a/pkgs/development/python-modules/python-twitter/default.nix +++ b/pkgs/development/python-modules/python-twitter/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchFromGitHub , fetchpatch @@ -35,7 +35,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ future requests requests_oauthlib ]; checkInputs = [ pytest responses hypothesis ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A Python wrapper around the Twitter API"; homepage = "https://github.com/bear/python-twitter"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/python-u2flib-host/default.nix b/pkgs/development/python-modules/python-u2flib-host/default.nix index eddf0deb015c..7f6f14c9888c 100644 --- a/pkgs/development/python-modules/python-u2flib-host/default.nix +++ b/pkgs/development/python-modules/python-u2flib-host/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage, requests, hidapi }: +{ lib, stdenv, fetchPypi, buildPythonPackage, requests, hidapi }: buildPythonPackage rec { pname = "python-u2flib-host"; @@ -14,7 +14,7 @@ buildPythonPackage rec { # Tests fail: "ValueError: underlying buffer has been detached" doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Python based U2F host library"; homepage = "https://github.com/Yubico/python-u2flib-host"; license = licenses.bsd2; diff --git a/pkgs/development/python-modules/python-uinput/default.nix b/pkgs/development/python-modules/python-uinput/default.nix index e7579058f71a..69f741e74379 100644 --- a/pkgs/development/python-modules/python-uinput/default.nix +++ b/pkgs/development/python-modules/python-uinput/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ lib, stdenv, buildPythonPackage, fetchPypi , udev }: buildPythonPackage rec { @@ -14,7 +14,7 @@ buildPythonPackage rec { NIX_CFLAGS_LINK = "-ludev"; - meta = with stdenv.lib; { + meta = with lib; { description = "Pythonic API to Linux uinput kernel module"; homepage = "http://tjjr.fi/sw/python-uinput/"; license = licenses.gpl3Plus; diff --git a/pkgs/development/python-modules/python-unshare/default.nix b/pkgs/development/python-modules/python-unshare/default.nix index a7f0bd93b0af..fa82027777f6 100644 --- a/pkgs/development/python-modules/python-unshare/default.nix +++ b/pkgs/development/python-modules/python-unshare/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchFromGitHub }: @@ -16,7 +16,7 @@ buildPythonPackage { sha256 = "1h9biinhy5m7r2cj4abhvsg2hb6xjny3n2dxnj1336zpa082ys3h"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Python bindings for the Linux unshare() syscall"; homepage = "https://github.com/thetincho/python-unshare"; license = licenses.gpl2; diff --git a/pkgs/development/python-modules/python-vipaccess/default.nix b/pkgs/development/python-modules/python-vipaccess/default.nix index cdafd3cd2a0f..f96086393f2e 100644 --- a/pkgs/development/python-modules/python-vipaccess/default.nix +++ b/pkgs/development/python-modules/python-vipaccess/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , oath @@ -31,7 +31,7 @@ buildPythonPackage rec { pytest tests/ -k 'not test_check_token' ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A free software implementation of Symantec's VIP Access application and protocol"; homepage = "https://github.com/dlenski/python-vipaccess"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/python-whois/default.nix b/pkgs/development/python-modules/python-whois/default.nix new file mode 100644 index 000000000000..c4d163100ca9 --- /dev/null +++ b/pkgs/development/python-modules/python-whois/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchPypi +, future +, nose +, pytestCheckHook +, simplejson +}: + +buildPythonPackage rec { + pname = "python-whois"; + version = "0.7.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "05jaxbnlw5wck0hl124py364jqrx7a4mmv0hy3d2jzvmp0012sk5"; + }; + + propagatedBuildInputs = [ future ]; + + checkInputs = [ + nose + pytestCheckHook + simplejson + ]; + + # Exclude tests that require network access + disabledTests = [ + "test_dk_parse" + "test_ipv4" + "test_ipv6" + ]; + pythonImportsCheck = [ "whois" ]; + + meta = with lib; { + description = "Python module to produce parsed WHOIS data"; + homepage = "https://github.com/richardpenman/whois"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/python-wifi/default.nix b/pkgs/development/python-modules/python-wifi/default.nix index 7300efc77bcc..503fbe101b92 100644 --- a/pkgs/development/python-modules/python-wifi/default.nix +++ b/pkgs/development/python-modules/python-wifi/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , isPy27 @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "149c3dznb63d82143cz5hqdim0mqjysz6p3yk0zv271vq3xnmzvv"; }; - meta = with stdenv.lib; { + meta = with lib; { inherit version; description = "Read & write wireless card capabilities using the Linux Wireless Extensions"; homepage = "http://pythonwifi.tuxfamily.org/"; diff --git a/pkgs/development/python-modules/python-xmp-toolkit/default.nix b/pkgs/development/python-modules/python-xmp-toolkit/default.nix index e5d7a7f0326d..ff4942abef55 100644 --- a/pkgs/development/python-modules/python-xmp-toolkit/default.nix +++ b/pkgs/development/python-modules/python-xmp-toolkit/default.nix @@ -4,7 +4,7 @@ , mock , pythonOlder , pytz -, stdenv +, lib, stdenv }: buildPythonPackage { @@ -35,7 +35,7 @@ buildPythonPackage { --replace "ctypes.util.find_library('exempi')" "'${exempi}/lib/libexempi${stdenv.hostPlatform.extensions.sharedLibrary}'" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/python-xmp-toolkit/python-xmp-toolkit"; description = "Python XMP Toolkit for working with metadata"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/python2-pythondialog/default.nix b/pkgs/development/python-modules/python2-pythondialog/default.nix index a19156d1018b..b9d9b110f60c 100644 --- a/pkgs/development/python-modules/python2-pythondialog/default.nix +++ b/pkgs/development/python-modules/python2-pythondialog/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , isPy3k @@ -18,7 +18,7 @@ buildPythonPackage rec { substituteInPlace dialog.py --replace ":/bin:/usr/bin" ":$out/bin" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A Python interface to the UNIX dialog utility and mostly-compatible programs (Python 2 backport)"; homepage = "http://pythondialog.sourceforge.net/"; license = licenses.lgpl3; diff --git a/pkgs/development/python-modules/python3-openid/default.nix b/pkgs/development/python-modules/python3-openid/default.nix index 2a85482cbb68..ad8ea88d1d0d 100644 --- a/pkgs/development/python-modules/python3-openid/default.nix +++ b/pkgs/development/python-modules/python3-openid/default.nix @@ -1,4 +1,4 @@ -{ stdenv, isPy3k, buildPythonPackage, fetchPypi, defusedxml }: +{ lib, stdenv, isPy3k, buildPythonPackage, fetchPypi, defusedxml }: buildPythonPackage rec { pname = "python3-openid"; @@ -15,7 +15,7 @@ buildPythonPackage rec { disabled = !isPy3k; - meta = with stdenv.lib; { + meta = with lib; { description = "OpenID support for modern servers and consumers"; homepage = "https://github.com/necaris/python3-openid"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/python_fedora/default.nix b/pkgs/development/python-modules/python_fedora/default.nix index 2224c94ac6f7..df12d7aeaff6 100644 --- a/pkgs/development/python-modules/python_fedora/default.nix +++ b/pkgs/development/python-modules/python_fedora/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, kitchen, requests, bunch, paver +{ lib, stdenv, buildPythonPackage, fetchPypi, kitchen, requests, bunch, paver , six, munch, urllib3, beautifulsoup4, openidc-client, lockfile }: buildPythonPackage rec { @@ -13,7 +13,7 @@ buildPythonPackage rec { six munch urllib3 beautifulsoup4 openidc-client ]; doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Python Fedora Module"; homepage = "https://github.com/fedora-infra/python-fedora"; license = licenses.lgpl2; diff --git a/pkgs/development/python-modules/python_keyczar/default.nix b/pkgs/development/python-modules/python_keyczar/default.nix index c9e29ab5c639..5fff75ada911 100644 --- a/pkgs/development/python-modules/python_keyczar/default.nix +++ b/pkgs/development/python-modules/python_keyczar/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , pyasn1 @@ -16,7 +16,7 @@ buildPythonPackage rec { buildInputs = [ pyasn1 pycrypto ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Toolkit for safe and simple cryptography"; homepage = "https://pypi.python.org/pypi/python-keyczar"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/python_mimeparse/default.nix b/pkgs/development/python-modules/python_mimeparse/default.nix index 9484d24f5e2f..c3f85affe81b 100644 --- a/pkgs/development/python-modules/python_mimeparse/default.nix +++ b/pkgs/development/python-modules/python_mimeparse/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi }: @@ -15,7 +15,7 @@ buildPythonPackage rec { # error: invalid command 'test' doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "A module provides basic functions for parsing mime-type names and matching them against a list of media-ranges"; homepage = "https://github.com/dbtsai/python-mimeparse"; license = licenses.mit; diff --git a/pkgs/development/python-modules/python_openzwave/default.nix b/pkgs/development/python-modules/python_openzwave/default.nix index d3f1a0a81204..7c7151ed9283 100644 --- a/pkgs/development/python-modules/python_openzwave/default.nix +++ b/pkgs/development/python-modules/python_openzwave/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy3k +{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k , pkgconfig , systemd, libyaml, openzwave, cython, pyserial , six, pydispatcher, urwid }: @@ -32,7 +32,7 @@ buildPythonPackage rec { # no tests available doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Python wrapper for the OpenZWave C++ library"; homepage = "https://github.com/OpenZWave/python-openzwave"; license = licenses.gpl3Plus; diff --git a/pkgs/development/python-modules/python_statsd/default.nix b/pkgs/development/python-modules/python_statsd/default.nix index 6455b6945172..ae293c44c0f7 100644 --- a/pkgs/development/python-modules/python_statsd/default.nix +++ b/pkgs/development/python-modules/python_statsd/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , isPy3k @@ -19,7 +19,7 @@ buildPythonPackage rec { buildInputs = [ mock nose coverage ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A client for Etsy's node-js statsd server"; homepage = "https://github.com/WoLpH/python-statsd"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/pythondialog/default.nix b/pkgs/development/python-modules/pythondialog/default.nix index 4f54c5a8fad8..c385f11b2f01 100644 --- a/pkgs/development/python-modules/pythondialog/default.nix +++ b/pkgs/development/python-modules/pythondialog/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , isPy3k @@ -18,7 +18,7 @@ buildPythonPackage rec { substituteInPlace dialog.py --replace ":/bin:/usr/bin" ":$out/bin" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A Python interface to the UNIX dialog utility and mostly-compatible programs"; homepage = "http://pythondialog.sourceforge.net/"; license = licenses.lgpl3; diff --git a/pkgs/development/python-modules/pythonirclib/default.nix b/pkgs/development/python-modules/pythonirclib/default.nix index 6074b76d300a..178e1855a061 100644 --- a/pkgs/development/python-modules/pythonirclib/default.nix +++ b/pkgs/development/python-modules/pythonirclib/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchurl , paver @@ -25,7 +25,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ paver ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Python IRC library"; homepage = "https://github.com/jaraco/irc"; license = with licenses; [ lgpl21 ]; diff --git a/pkgs/development/python-modules/pythonix/default.nix b/pkgs/development/python-modules/pythonix/default.nix index 6ed150d12398..80535b28bf23 100644 --- a/pkgs/development/python-modules/pythonix/default.nix +++ b/pkgs/development/python-modules/pythonix/default.nix @@ -1,24 +1,32 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, ninja, boost, meson, pkgconfig, nix, isPy3k }: +{ lib, stdenv, buildPythonPackage, fetchFromGitHub, ninja, boost, meson, pkg-config, nix, isPy3k, python }: buildPythonPackage rec { pname = "pythonix"; - version = "0.1.6"; + version = "0.1.7"; format = "other"; src = fetchFromGitHub { owner = "Mic92"; repo = "pythonix"; rev = "v${version}"; - sha256 = "1qzcrpn333hsgn6fj1m1s3cvaf0ny8qpygamcrazqv57xmwyr8h5"; + sha256 = "1wxqv3i4bva2qq9mx670bcx0g0irjn68fvk28dwvhay9ndwcspqf"; }; disabled = !isPy3k; - nativeBuildInputs = [ meson ninja pkgconfig ]; + nativeBuildInputs = [ meson ninja pkg-config ]; buildInputs = [ nix boost ]; - meta = with stdenv.lib; { + postInstall = '' + # This is typically set by pipInstallHook/eggInstallHook, + # so we have to do so manually when using meson + export PYTHONPATH=$out/${python.sitePackages}:$PYTHONPATH + ''; + + pythonImportsCheck = [ "nix" ]; + + meta = with lib; { description = '' Eval nix code from python. ''; diff --git a/pkgs/development/python-modules/pythonocc-core/default.nix b/pkgs/development/python-modules/pythonocc-core/default.nix index 96c79a45b277..cbcf4ab9d02d 100644 --- a/pkgs/development/python-modules/pythonocc-core/default.nix +++ b/pkgs/development/python-modules/pythonocc-core/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python, fetchFromGitHub, cmake, swig, ninja +{ lib, stdenv, python, fetchFromGitHub, cmake, swig, ninja , opencascade, smesh, freetype, libGL, libGLU, libX11 , Cocoa }: @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { "-DPYTHONOCC_WRAP_SMESH=TRUE" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Python wrapper for the OpenCASCADE 3D modeling kernel"; homepage = "https://github.com/tpaviot/pythonocc-core"; license = licenses.lgpl3; diff --git a/pkgs/development/python-modules/pytidylib/default.nix b/pkgs/development/python-modules/pytidylib/default.nix index a0aade1fe670..16f6e4232b30 100644 --- a/pkgs/development/python-modules/pytidylib/default.nix +++ b/pkgs/development/python-modules/pytidylib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, python, html-tidy }: +{ lib, stdenv, buildPythonPackage, fetchPypi, python, html-tidy }: buildPythonPackage rec { pname = "pytidylib"; @@ -25,7 +25,7 @@ buildPythonPackage rec { ${python.interpreter} -m unittest discover ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Python wrapper for HTML Tidy (tidylib) on Python 2 and 3"; homepage = "https://countergram.github.io/pytidylib/"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pytile/default.nix b/pkgs/development/python-modules/pytile/default.nix new file mode 100644 index 000000000000..52b3d828dedf --- /dev/null +++ b/pkgs/development/python-modules/pytile/default.nix @@ -0,0 +1,58 @@ +{ lib +, aiohttp +, async-timeout +, aresponses +, buildPythonPackage +, fetchFromGitHub +, poetry +, pylint +, pytest-aiohttp +, pytest-asyncio +, pytestCheckHook +, pythonAtLeast +}: +buildPythonPackage rec { + pname = "pytile"; + version = "5.1.0"; + disabled = pythonAtLeast "3.9"; + + src = fetchFromGitHub { + owner = "bachya"; + repo = pname; + rev = version; + sha256 = "0hdyb8ca4ihqf7yfkr3hbpkwz7g182ycra151y5dxn0319fillc3"; + }; + + format = "pyproject"; + + nativeBuildInputs = [ poetry ]; + + propagatedBuildInputs = [ + aiohttp + pylint + ]; + + checkInputs = [ + aresponses + pytest-aiohttp + pytest-asyncio + pytestCheckHook + ]; + + # Ignore the examples as they are prefixed with test_ + pytestFlagsArray = [ "--ignore examples/" ]; + pythonImportsCheck = [ "pytile" ]; + + __darwinAllowLocalNetworking = true; + + meta = with lib; { + description = " Python API for Tile Bluetooth trackers"; + longDescription = '' + pytile is a simple Python library for retrieving information on Tile + Bluetooth trackers (including last location and more). + ''; + homepage = "https://github.com/bachya/pytile"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pytimeparse/default.nix b/pkgs/development/python-modules/pytimeparse/default.nix index 9aa11a480cd6..1ced64375301 100644 --- a/pkgs/development/python-modules/pytimeparse/default.nix +++ b/pkgs/development/python-modules/pytimeparse/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage, nose }: +{ lib, stdenv, fetchPypi, buildPythonPackage, nose }: buildPythonPackage rec { pname = "pytimeparse"; @@ -11,7 +11,7 @@ buildPythonPackage rec { checkInputs = [ nose ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A small Python library to parse various kinds of time expressions"; homepage = "https://github.com/wroberts/pytimeparse"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pytmx/default.nix b/pkgs/development/python-modules/pytmx/default.nix index aa6eecfdeb53..17c18a96c736 100644 --- a/pkgs/development/python-modules/pytmx/default.nix +++ b/pkgs/development/python-modules/pytmx/default.nix @@ -1,21 +1,28 @@ -{ lib, fetchFromGitHub, isPy3k, buildPythonPackage, pygame, pyglet, pysdl2, six }: +{ lib, fetchFromGitHub +, python, buildPythonPackage, isPy27 +, pygame, pyglet, pysdl2, six +}: buildPythonPackage rec { pname = "pytmx"; - version = "3.22.0"; + version = "3.24.0"; + + disabled = isPy27; src = fetchFromGitHub { # The release was not git tagged. owner = "bitcraft"; repo = "PyTMX"; - rev = "187fd429dadcdc5828e78e6748a983aa1434e4d2"; - sha256 = "0480pr61v54bwdyzb983sk0fqkyfbcgrdn8k11yf1yck4zb119gc"; + rev = "eb96efea30d57b731654b2a167d86b8b553b147d"; + sha256 = "1g1j4w75zw76p5f8m5v0hdigdlva2flf0ngyk8nvqcwzcl5vq5wc"; }; propagatedBuildInputs = [ pygame pyglet pysdl2 six ]; checkPhase = '' - python -m unittest tests.pytmx.test_pytmx + # Change into the test directory due to a relative resource path. + cd tests/pytmx + ${python.interpreter} -m unittest test_pytmx ''; meta = with lib; { diff --git a/pkgs/development/python-modules/pytoml/default.nix b/pkgs/development/python-modules/pytoml/default.nix index 8ec17b158449..64e6ed4c669a 100644 --- a/pkgs/development/python-modules/pytoml/default.nix +++ b/pkgs/development/python-modules/pytoml/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchFromGitHub , python @@ -25,7 +25,7 @@ buildPythonPackage rec { ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A TOML parser/writer for Python"; homepage = "https://github.com/avakar/pytoml"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pytorch/bin.nix b/pkgs/development/python-modules/pytorch/bin.nix index 6a97e6d30a4f..a25f2013adf7 100644 --- a/pkgs/development/python-modules/pytorch/bin.nix +++ b/pkgs/development/python-modules/pytorch/bin.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchurl , isPy37 @@ -63,7 +63,7 @@ in buildPythonPackage { pythonImportsCheck = [ "torch" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Open source, prototype-to-production deep learning platform"; homepage = "https://pytorch.org/"; license = licenses.unfree; # Includes CUDA and Intel MKL. diff --git a/pkgs/development/python-modules/pytrends/default.nix b/pkgs/development/python-modules/pytrends/default.nix index 8317c5ea0182..83980c3d00b9 100644 --- a/pkgs/development/python-modules/pytrends/default.nix +++ b/pkgs/development/python-modules/pytrends/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , isPy27 @@ -21,7 +21,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests lxml pandas ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Pseudo API for Google Trends"; homepage = "https://github.com/GeneralMills/pytrends"; license = [ licenses.asl20 ]; diff --git a/pkgs/development/python-modules/pytricia/default.nix b/pkgs/development/python-modules/pytricia/default.nix index 80e95fb60507..8e168bf8181a 100644 --- a/pkgs/development/python-modules/pytricia/default.nix +++ b/pkgs/development/python-modules/pytricia/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchFromGitHub }: @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "0qp5774xkm700g35k5c76pck8pdzqlyzbaqgrz76a1yh67s2ri8h"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A library for fast IP address lookup in Python"; homepage = "https://github.com/jsommers/pytricia"; license = with licenses; [ lgpl3Plus ]; diff --git a/pkgs/development/python-modules/pytun/default.nix b/pkgs/development/python-modules/pytun/default.nix index fed78cea96fe..2b49b169c6d1 100644 --- a/pkgs/development/python-modules/pytun/default.nix +++ b/pkgs/development/python-modules/pytun/default.nix @@ -1,27 +1,27 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchFromGitHub }: buildPythonPackage rec { pname = "pytun"; - version = "2.2.1"; + version = "2.3.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "montag451"; repo = "pytun"; - sha256 = "1bxk0z0v8m0b01xg94f039j3bsclkshb7girvjqfzk5whbd2nryh"; + sha256 = "1cqq8aci38058fjh4a0xf21wac177fw576p2yjl2b8jd9rnsqbl5"; }; + # Test directory contains examples, not tests. doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/montag451/pytun"; description = "Linux TUN/TAP wrapper for Python"; license = licenses.mit; maintainers = with maintainers; [ montag451 ]; platforms = platforms.linux; }; - } diff --git a/pkgs/development/python-modules/pytzdata/default.nix b/pkgs/development/python-modules/pytzdata/default.nix index 5adcbd0d2368..739325d33337 100644 --- a/pkgs/development/python-modules/pytzdata/default.nix +++ b/pkgs/development/python-modules/pytzdata/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage }: +{ lib, stdenv, fetchPypi, buildPythonPackage }: buildPythonPackage rec { pname = "pytzdata"; @@ -12,7 +12,7 @@ buildPythonPackage rec { # No tests doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Timezone database for Python"; homepage = "https://github.com/sdispater/pytzdata"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pyunifi/default.nix b/pkgs/development/python-modules/pyunifi/default.nix index ed2dd4cc2564..1eec6f3ea84d 100644 --- a/pkgs/development/python-modules/pyunifi/default.nix +++ b/pkgs/development/python-modules/pyunifi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ lib, stdenv, buildPythonPackage, fetchPypi , requests }: buildPythonPackage rec { @@ -12,7 +12,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests ]; - meta = with stdenv.lib; { + meta = with lib; { description = "API towards Ubiquity Networks UniFi controller"; homepage = "https://github.com/finish06/unifi-api"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pyupdate/default.nix b/pkgs/development/python-modules/pyupdate/default.nix index 9ce93d67a52a..f33aba8d6256 100644 --- a/pkgs/development/python-modules/pyupdate/default.nix +++ b/pkgs/development/python-modules/pyupdate/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy3k +{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k , requests }: buildPythonPackage rec { @@ -18,7 +18,7 @@ buildPythonPackage rec { # no tests doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { # This description is terrible, but it's what upstream uses. description = "Package to update stuff"; homepage = "https://github.com/ludeeus/pyupdate"; diff --git a/pkgs/development/python-modules/pyusb/default.nix b/pkgs/development/python-modules/pyusb/default.nix index 7e5fc90453ff..41207984e0ca 100644 --- a/pkgs/development/python-modules/pyusb/default.nix +++ b/pkgs/development/python-modules/pyusb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage, libusb1, setuptools_scm }: +{ lib, stdenv, fetchPypi, buildPythonPackage, libusb1, setuptools_scm }: buildPythonPackage rec { pname = "pyusb"; @@ -26,7 +26,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "usb" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Python USB access module (wraps libusb 1.0)"; # can use other backends homepage = "https://pyusb.github.io/pyusb/"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/pyutil/default.nix b/pkgs/development/python-modules/pyutil/default.nix index a943c8eb523b..effb9f7b7e67 100644 --- a/pkgs/development/python-modules/pyutil/default.nix +++ b/pkgs/development/python-modules/pyutil/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , setuptoolsDarcs @@ -28,7 +28,7 @@ buildPythonPackage rec { grep -rl 'utf-8-with-signature-unix' ./ | xargs sed -i -e "s|utf-8-with-signature-unix|utf-8|g" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Pyutil, a collection of mature utilities for Python programmers"; longDescription = '' diff --git a/pkgs/development/python-modules/pyuv/default.nix b/pkgs/development/python-modules/pyuv/default.nix index 7f476d3c11d2..95477196d8b9 100644 --- a/pkgs/development/python-modules/pyuv/default.nix +++ b/pkgs/development/python-modules/pyuv/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , isPyPy , pkgs @@ -18,7 +18,7 @@ buildPythonPackage rec { buildInputs = [ pkgs.libuv ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Python interface for libuv"; homepage = "https://github.com/saghul/pyuv"; repositories.git = "git://github.com/saghul/pyuv.git"; diff --git a/pkgs/development/python-modules/pyvera/default.nix b/pkgs/development/python-modules/pyvera/default.nix new file mode 100644 index 000000000000..4415ca7c376d --- /dev/null +++ b/pkgs/development/python-modules/pyvera/default.nix @@ -0,0 +1,54 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, fetchpatch +, poetry-core +, pytest-cov +, pytest-asyncio +, pytest-timeout +, responses +, pytestCheckHook +, requests +}: + +buildPythonPackage rec { + pname = "pyvera"; + version = "0.3.11"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "pavoni"; + repo = pname; + rev = version; + sha256 = "0yi2cjd3jag95xa0k24f7d7agi26ywb3219a0j0k8l2nsx2sdi87"; + }; + + patches = [ + (fetchpatch { + # build-system section is missing https://github.com/pavoni/pyvera/pull/142 + url = "https://github.com/pavoni/pyvera/pull/142/commits/e90995a8d55107118d324e8cf189ddf1d9e3aa6c.patch"; + sha256 = "1psq3fiwg20kcwyybzh5g17dzn5fh29lhm238npyg846innbzgs7"; + }) + ]; + + nativeBuildInputs = [ poetry-core ]; + + propagatedBuildInputs = [ requests ]; + + checkInputs = [ + pytest-asyncio + pytest-timeout + pytest-cov + pytestCheckHook + responses + ]; + + pythonImportsCheck = [ "pyvera" ]; + + meta = with lib; { + description = "Python library to control devices via the Vera hub"; + homepage = "https://github.com/pavoni/pyvera"; + license = with licenses; [ gpl2Only ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pyvoro/default.nix b/pkgs/development/python-modules/pyvoro/default.nix index e99865417820..7013cc7809dd 100644 --- a/pkgs/development/python-modules/pyvoro/default.nix +++ b/pkgs/development/python-modules/pyvoro/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi }: @@ -15,7 +15,7 @@ buildPythonPackage rec { # No tests in package doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/joe-jordan/pyvoro"; description = "2D and 3D Voronoi tessellations: a python entry point for the voro++ library"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pywatchman/default.nix b/pkgs/development/python-modules/pywatchman/default.nix index f9951465e256..5e3c4d6cc5a0 100644 --- a/pkgs/development/python-modules/pywatchman/default.nix +++ b/pkgs/development/python-modules/pywatchman/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, watchman }: +{ lib, stdenv, buildPythonPackage, fetchPypi, watchman }: buildPythonPackage rec { pname = "pywatchman"; @@ -17,7 +17,7 @@ buildPythonPackage rec { # No tests in archive doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Watchman client for Python"; homepage = "https://facebook.github.io/watchman/"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/pywebdav/default.nix b/pkgs/development/python-modules/pywebdav/default.nix index 9a56bf760464..5ed3e28b5b1b 100644 --- a/pkgs/development/python-modules/pywebdav/default.nix +++ b/pkgs/development/python-modules/pywebdav/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage, isPy3k }: +{ lib, stdenv, fetchPypi, buildPythonPackage, isPy3k }: buildPythonPackage rec { pname = "PyWebDAV"; @@ -8,7 +8,7 @@ buildPythonPackage rec { inherit pname version; sha256 = "1v10vg79h85milnq8w7yd75qq5z6297ywkn9b2kxajldzwqxn3ji"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://code.google.com/p/pywebdav/"; description = "WebDAV library including a standalone server for python"; maintainers = with maintainers; [ johbo ]; diff --git a/pkgs/development/python-modules/pywilight/default.nix b/pkgs/development/python-modules/pywilight/default.nix new file mode 100644 index 000000000000..66bdcca4793d --- /dev/null +++ b/pkgs/development/python-modules/pywilight/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchPypi +, ifaddr +, requests +}: + +buildPythonPackage rec { + pname = "pywilight"; + version = "0.0.65"; + + src = fetchPypi { + inherit pname version; + sha256 = "1bldhg81lal9mbf55ky3gj2ndlplr0vfjp1bamd0mz5d9icas8nf"; + }; + + propagatedBuildInputs = [ + ifaddr + requests + ]; + + # no tests are present + doCheck = false; + pythonImportsCheck = [ "pywilight" ]; + + meta = with lib; { + description = "Python API for WiLight device"; + homepage = "https://github.com/leofig-rj/pywilight"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pywizlight/default.nix b/pkgs/development/python-modules/pywizlight/default.nix new file mode 100644 index 000000000000..32baa25e52e7 --- /dev/null +++ b/pkgs/development/python-modules/pywizlight/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, asyncio-dgram +, click +}: + +buildPythonPackage rec { + pname = "pywizlight"; + version = "0.4.1"; + + src = fetchFromGitHub { + owner = "sbidy"; + repo = pname; + rev = "v${version}"; + sha256 = "0kyhyda28zbni9sjv6kvky6wlhqldl47niddgpbjsv5dlb9xvxns"; + }; + + propagatedBuildInputs = [ + asyncio-dgram + click + ]; + + # no tests are present + doCheck = false; + pythonImportsCheck = [ "pywizlight" ]; + + meta = with lib; { + description = "Python connector for WiZ light bulbs"; + homepage = "https://github.com/sbidy/pywizlight"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pyx/default.nix b/pkgs/development/python-modules/pyx/default.nix index 339fa9029b70..b19e5f97e141 100644 --- a/pkgs/development/python-modules/pyx/default.nix +++ b/pkgs/development/python-modules/pyx/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , isPy3k @@ -18,7 +18,7 @@ buildPythonPackage rec { # No tests in archive doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Python package for the generation of PostScript, PDF, and SVG files"; homepage = "http://pyx.sourceforge.net/"; license = with licenses; [ gpl2 ]; diff --git a/pkgs/development/python-modules/pyxeoma/default.nix b/pkgs/development/python-modules/pyxeoma/default.nix new file mode 100644 index 000000000000..9b8b6eeac8ff --- /dev/null +++ b/pkgs/development/python-modules/pyxeoma/default.nix @@ -0,0 +1,28 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "pyxeoma"; + version = "1.4.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "0c9q6xdh2ciisv0crlz069haz01gfkhd5kasyr14jng4vjpzinc7"; + }; + + propagatedBuildInputs = [ aiohttp ]; + + # Project doesn't have any tests + doCheck = false; + pythonImportsCheck = [ "pyxeoma" ]; + + meta = with lib; { + description = "Python wrapper for Xeoma web server API"; + homepage = "https://github.com/jeradM/pyxeoma"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pyzufall/default.nix b/pkgs/development/python-modules/pyzufall/default.nix index 2c5121e61e80..03fce00629d8 100644 --- a/pkgs/development/python-modules/pyzufall/default.nix +++ b/pkgs/development/python-modules/pyzufall/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, python, buildPythonPackage, nose, future, coverage }: +{ lib, stdenv, fetchPypi, python, buildPythonPackage, nose, future, coverage }: buildPythonPackage rec { pname = "PyZufall"; @@ -20,7 +20,7 @@ buildPythonPackage rec { ${python.interpreter} setup.py nosetests ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://pyzufall.readthedocs.io/de/latest/"; description = "Library for generating random data and sentences in german language"; license = licenses.gpl3Plus; diff --git a/pkgs/development/python-modules/qdldl/default.nix b/pkgs/development/python-modules/qdldl/default.nix new file mode 100644 index 000000000000..d8e043d546da --- /dev/null +++ b/pkgs/development/python-modules/qdldl/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchPypi +, cmake +, pybind11 +, numpy +, scipy +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "qdldl"; + version = "0.1.5.post0"; + + src = fetchPypi { + inherit pname version; + sha256 = "c392c7427651d8b226423c7aba4a0f2338a1f38a4bbdabac6bc4afd8bc934f06"; + }; + + dontUseCmakeConfigure = true; + nativeBuildInputs = [ cmake ]; + + buildInputs = [ pybind11 ]; + + propagatedBuildInputs = [ + numpy + scipy + ]; + + pythonImportsCheck = [ "qdldl" ]; + checkInputs = [ pytestCheckHook ]; + + meta = with lib; { + description = "A free LDL factorization routine"; + homepage = "https://github.com/oxfordcontrol/qdldl"; + downloadPage = "https://github.com/oxfordcontrol/qdldl-python"; + license = licenses.asl20; + maintainers = with maintainers; [ drewrisinger ]; + }; +} diff --git a/pkgs/development/python-modules/qpid-python/default.nix b/pkgs/development/python-modules/qpid-python/default.nix index f7221a981ea6..ef540538792d 100644 --- a/pkgs/development/python-modules/qpid-python/default.nix +++ b/pkgs/development/python-modules/qpid-python/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchurl , isPy3k @@ -17,7 +17,7 @@ buildPythonPackage rec { # needs a broker running and then ./qpid-python-test doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://qpid.apache.org/"; description = "Python client implementation and AMQP conformance tests for Apache Qpid"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/qrcode/default.nix b/pkgs/development/python-modules/qrcode/default.nix index 714c74188976..113d53ff29b8 100644 --- a/pkgs/development/python-modules/qrcode/default.nix +++ b/pkgs/development/python-modules/qrcode/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , six @@ -20,7 +20,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six pillow pymaging_png setuptools ]; checkInputs = [ mock ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Quick Response code generation for Python"; homepage = "https://pypi.python.org/pypi/qrcode"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/qscintilla/default.nix b/pkgs/development/python-modules/qscintilla/default.nix index e44f6205d39f..82c3773f3032 100644 --- a/pkgs/development/python-modules/qscintilla/default.nix +++ b/pkgs/development/python-modules/qscintilla/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , disabledIf , isPy3k @@ -34,7 +34,7 @@ disabledIf (isPy3k || isPyPy) --sipdir $out/share/sip ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A Python binding to QScintilla, Qt based text editing control"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ danbst ]; diff --git a/pkgs/development/python-modules/qserve/default.nix b/pkgs/development/python-modules/qserve/default.nix index ad1a7fd2ca36..ff606d132363 100644 --- a/pkgs/development/python-modules/qserve/default.nix +++ b/pkgs/development/python-modules/qserve/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , isPy3k @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "0b04b2d4d11b464ff1efd42a9ea9f8136187d59f4076f57c9ba95361d41cd7ed"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Job queue server"; homepage = "https://github.com/pediapress/qserve"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/qtawesome/default.nix b/pkgs/development/python-modules/qtawesome/default.nix index 6ec8ce367735..11b4885e4c8a 100644 --- a/pkgs/development/python-modules/qtawesome/default.nix +++ b/pkgs/development/python-modules/qtawesome/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, qtpy, six, pyqt5, pytest }: +{ lib, stdenv, buildPythonPackage, fetchPypi, qtpy, six, pyqt5, pytest }: buildPythonPackage rec { pname = "QtAwesome"; @@ -20,7 +20,7 @@ buildPythonPackage rec { # Requires https://github.com/boylea/qtbot doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Iconic fonts in PyQt and PySide applications"; homepage = "https://github.com/spyder-ide/qtawesome"; license = licenses.mit; diff --git a/pkgs/development/python-modules/qtpy/default.nix b/pkgs/development/python-modules/qtpy/default.nix index 313b1266a52d..76db7090a045 100644 --- a/pkgs/development/python-modules/qtpy/default.nix +++ b/pkgs/development/python-modules/qtpy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, pyside, pytest }: +{ lib, stdenv, buildPythonPackage, fetchPypi, pyside, pytest }: buildPythonPackage rec { pname = "QtPy"; @@ -17,7 +17,7 @@ buildPythonPackage rec { py.test qtpy/tests ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Abstraction layer for PyQt5/PyQt4/PySide2/PySide"; homepage = "https://github.com/spyder-ide/qtpy"; license = licenses.mit; diff --git a/pkgs/development/python-modules/quandl/default.nix b/pkgs/development/python-modules/quandl/default.nix index 33fc54241d9a..56b80a4676b8 100644 --- a/pkgs/development/python-modules/quandl/default.nix +++ b/pkgs/development/python-modules/quandl/default.nix @@ -1,11 +1,10 @@ -{ - lib, fetchPypi, buildPythonPackage, isPy3k, pythonOlder, - # runtime dependencies - pandas, numpy, requests, inflection, python-dateutil, six, more-itertools, importlib-metadata, - # test suite dependencies - nose, unittest2, flake8, httpretty, mock, jsondate, parameterized, faker, factory_boy, - # additional runtime dependencies are required on Python 2.x - pyOpenSSL ? null, ndg-httpsclient ? null, pyasn1 ? null +{ lib, fetchPypi, buildPythonPackage, isPy3k, pythonOlder +# runtime dependencies +, pandas, numpy, requests, inflection, python-dateutil, six, more-itertools, importlib-metadata +# test suite dependencies +, nose, unittest2, flake8, httpretty, mock, jsondate, parameterized, faker, factory_boy +# additional runtime dependencies are required on Python 2.x +, pyopenssl, ndg-httpsclient, pyasn1 }: buildPythonPackage rec { @@ -19,8 +18,6 @@ buildPythonPackage rec { sha256 = "0zpw0nwqr4g56l9z4my0fahfgpcmfx74acbmv6nfx1dmq5ggraf3"; }; - doCheck = true; - checkInputs = [ nose unittest2 @@ -42,7 +39,7 @@ buildPythonPackage rec { six more-itertools ] ++ lib.optionals (!isPy3k) [ - pyOpenSSL + pyopenssl ndg-httpsclient pyasn1 ] ++ lib.optionals (pythonOlder "3.8") [ diff --git a/pkgs/development/python-modules/querystring-parser/default.nix b/pkgs/development/python-modules/querystring-parser/default.nix index f9d04a8f797c..25b3c113cec6 100644 --- a/pkgs/development/python-modules/querystring-parser/default.nix +++ b/pkgs/development/python-modules/querystring-parser/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, python, isPy27 +{ lib, stdenv, buildPythonPackage, fetchPypi, python, isPy27 , six }: @@ -20,7 +20,7 @@ buildPythonPackage rec { # one test fails due to https://github.com/bernii/querystring-parser/issues/35 doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/bernii/querystring-parser"; description = "QueryString parser for Python/Django that correctly handles nested dictionaries"; license = licenses.mit; diff --git a/pkgs/development/python-modules/queuelib/default.nix b/pkgs/development/python-modules/queuelib/default.nix index dbcdd4c5924e..7471ea180655 100644 --- a/pkgs/development/python-modules/queuelib/default.nix +++ b/pkgs/development/python-modules/queuelib/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , pytest @@ -15,7 +15,7 @@ buildPythonPackage rec { buildInputs = [ pytest ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A collection of persistent (disk-based) queues for Python"; homepage = "https://github.com/scrapy/queuelib"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/r2pipe/default.nix b/pkgs/development/python-modules/r2pipe/default.nix index 341d3f9660c5..3fbb0fb4042c 100644 --- a/pkgs/development/python-modules/r2pipe/default.nix +++ b/pkgs/development/python-modules/r2pipe/default.nix @@ -18,10 +18,10 @@ buildPythonPackage rec { '' # Fix find_library, can be removed after # https://github.com/NixOS/nixpkgs/issues/7307 is resolved. - substituteInPlace r2pipe/native.py --replace "find_library('r_core')" "'${libr_core}'" + substituteInPlace r2pipe/native.py --replace 'find_library("r_core")' "'${libr_core}'" # Fix the default r2 executable - substituteInPlace r2pipe/open_sync.py --replace "r2e = 'radare2'" "r2e = '${radare2}/bin/radare2'" + substituteInPlace r2pipe/open_sync.py --replace 'r2e = "radare2"' "r2e = '${radare2}/bin/radare2'" substituteInPlace r2pipe/open_base.py --replace 'which("radare2")' "'${radare2}/bin/radare2'" ''; @@ -42,7 +42,7 @@ buildPythonPackage rec { EOF ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Interact with radare2"; homepage = "https://github.com/radare/radare2-r2pipe"; license = licenses.mit; diff --git a/pkgs/development/python-modules/rabbitpy/default.nix b/pkgs/development/python-modules/rabbitpy/default.nix index 9844c8dca443..79975ada5015 100644 --- a/pkgs/development/python-modules/rabbitpy/default.nix +++ b/pkgs/development/python-modules/rabbitpy/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchFromGitHub , mock @@ -34,7 +34,7 @@ buildPythonPackage rec { --replace 'pamqp>=2,<3' 'pamqp' ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A pure python, thread-safe, minimalistic and pythonic RabbitMQ client library"; homepage = "https://pypi.python.org/pypi/rabbitpy"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/radicale_infcloud/default.nix b/pkgs/development/python-modules/radicale_infcloud/default.nix index 4b30d643fbd7..5c561b6e6541 100644 --- a/pkgs/development/python-modules/radicale_infcloud/default.nix +++ b/pkgs/development/python-modules/radicale_infcloud/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildPythonPackage }: +{ lib, stdenv, fetchFromGitHub, buildPythonPackage }: buildPythonPackage { pname = "radicale_infcloud"; @@ -13,7 +13,7 @@ buildPythonPackage { doCheck = false; # Tries to import radicale, circular dependency - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/Unrud/RadicaleInfCloud/"; description = "Integrate InfCloud into Radicale's web interface"; license = with licenses; [ agpl3 gpl3 ]; diff --git a/pkgs/development/python-modules/rainbowstream/default.nix b/pkgs/development/python-modules/rainbowstream/default.nix index 7fc7f057009a..c5ec1d3ab4ef 100644 --- a/pkgs/development/python-modules/rainbowstream/default.nix +++ b/pkgs/development/python-modules/rainbowstream/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , python @@ -44,7 +44,7 @@ buildPythonPackage rec { buildInputs = [ pkgs.libjpeg pkgs.freetype pkgs.zlib pkgs.glibcLocales pillow twitter pyfiglet requests arrow dateutil pysocks pocket ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Streaming command-line twitter client"; homepage = "http://www.rainbowstream.org/"; license = licenses.mit; diff --git a/pkgs/development/python-modules/ramlfications/default.nix b/pkgs/development/python-modules/ramlfications/default.nix index 0f870a5ab7a1..2d3e2bdc0e03 100644 --- a/pkgs/development/python-modules/ramlfications/default.nix +++ b/pkgs/development/python-modules/ramlfications/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ lib, stdenv, buildPythonPackage, fetchPypi , mock, pytest, pytest-mock, pytest-server-fixtures, pytest-localserver , termcolor, click, markdown2, six, jsonref, pyyaml, xmltodict, attrs }: @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "0xvnna7kaq4nm5nfnwcwbr5bcm2s532hgyp7kq4v9iivn48rrf3v"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A Python RAML parser."; homepage = "https://ramlfications.readthedocs.org"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/random2/default.nix b/pkgs/development/python-modules/random2/default.nix index 1334fa2aa32c..9ed7701a3f45 100644 --- a/pkgs/development/python-modules/random2/default.nix +++ b/pkgs/development/python-modules/random2/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , isPyPy @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "34ad30aac341039872401595df9ab2c9dc36d0b7c077db1cea9ade430ed1c007"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://pypi.python.org/pypi/random2"; description = "Python 3 compatible Python 2 `random` Module"; license = licenses.psfl; diff --git a/pkgs/development/python-modules/rarfile/default.nix b/pkgs/development/python-modules/rarfile/default.nix index 6502d9f4ae6a..6b875528d1df 100644 --- a/pkgs/development/python-modules/rarfile/default.nix +++ b/pkgs/development/python-modules/rarfile/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, pytestCheckHook, nose, libarchive, glibcLocales, isPy27 +{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pytestCheckHook, nose, libarchive, glibcLocales, isPy27 # unrar is non-free software , useUnrar ? false, unrar }: @@ -35,7 +35,7 @@ buildPythonPackage rec { LC_ALL = "en_US.UTF-8"; pythonImportsCheck = [ "rarfile" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "RAR archive reader for Python"; homepage = "https://github.com/markokr/rarfile"; license = licenses.isc; diff --git a/pkgs/development/python-modules/ratelimiter/default.nix b/pkgs/development/python-modules/ratelimiter/default.nix index 15437889fc2f..4d3ff6d486b4 100644 --- a/pkgs/development/python-modules/ratelimiter/default.nix +++ b/pkgs/development/python-modules/ratelimiter/default.nix @@ -1,5 +1,5 @@ { - stdenv + lib, stdenv , buildPythonPackage , fetchPypi , pytest @@ -25,7 +25,7 @@ buildPythonPackage rec { py.test tests ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/RazerM/ratelimiter"; license = licenses.asl20; description = "Simple python rate limiting object"; diff --git a/pkgs/development/python-modules/rawkit/default.nix b/pkgs/development/python-modules/rawkit/default.nix index a114d2400aa7..974f7ac4d1c6 100644 --- a/pkgs/development/python-modules/rawkit/default.nix +++ b/pkgs/development/python-modules/rawkit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage, fetchpatch +{ lib, stdenv, fetchPypi, buildPythonPackage, fetchpatch , libraw , pytest, mock }: @@ -27,7 +27,7 @@ buildPythonPackage rec { py.test tests ''; - meta = with stdenv.lib; { + meta = with lib; { description = "CTypes based LibRaw bindings for Python"; homepage = "https://rawkit.readthedocs.org/"; license = licenses.mit; diff --git a/pkgs/development/python-modules/rbtools/default.nix b/pkgs/development/python-modules/rbtools/default.nix index 477a11f2ce90..f1c9685d5cca 100644 --- a/pkgs/development/python-modules/rbtools/default.nix +++ b/pkgs/development/python-modules/rbtools/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchurl , isPy3k @@ -25,7 +25,7 @@ buildPythonPackage rec { # The kgb test dependency is not in nixpkgs doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.reviewboard.org/docs/rbtools/dev/"; description = "RBTools is a set of command line tools for working with Review Board and RBCommons"; license = licenses.mit; diff --git a/pkgs/development/python-modules/rcssmin/default.nix b/pkgs/development/python-modules/rcssmin/default.nix index 30d5a3c0e278..507102222fe0 100644 --- a/pkgs/development/python-modules/rcssmin/default.nix +++ b/pkgs/development/python-modules/rcssmin/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi }: +{ lib, stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "rcssmin"; version = "1.0.6"; @@ -12,7 +12,7 @@ buildPythonPackage rec { # tests auto-discovery doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://opensource.perlig.de/rcssmin/"; license = licenses.asl20; description = "CSS minifier written in pure python"; diff --git a/pkgs/development/python-modules/readchar/default.nix b/pkgs/development/python-modules/readchar/default.nix index 1ed4539dca08..211f5d63a7dd 100644 --- a/pkgs/development/python-modules/readchar/default.nix +++ b/pkgs/development/python-modules/readchar/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, flake8, pytest, pytestcov, pexpect }: +{ lib, stdenv, buildPythonPackage, fetchFromGitHub, flake8, pytest, pytestcov, pexpect }: buildPythonPackage rec { pname = "readchar"; @@ -15,7 +15,7 @@ buildPythonPackage rec { nativeBuildInputs = [ flake8 ]; checkInputs = [ pytest pytestcov pexpect ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/magmax/python-readchar"; description = "Python library to read characters and key strokes"; license = licenses.mit; diff --git a/pkgs/development/python-modules/readme/default.nix b/pkgs/development/python-modules/readme/default.nix index 057283babe7b..044c487eb037 100644 --- a/pkgs/development/python-modules/readme/default.nix +++ b/pkgs/development/python-modules/readme/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , pytest @@ -30,7 +30,7 @@ buildPythonPackage rec { # package is not readme_renderer doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Readme is a library for rendering readme descriptions for Warehouse"; homepage = "https://github.com/pypa/readme"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/rebulk/default.nix b/pkgs/development/python-modules/rebulk/default.nix index f1591e4df741..750efe357c22 100644 --- a/pkgs/development/python-modules/rebulk/default.nix +++ b/pkgs/development/python-modules/rebulk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, pytest, pytestrunner, six, regex}: +{ lib, stdenv, buildPythonPackage, fetchPypi, pytest, pytestrunner, six, regex}: buildPythonPackage rec { pname = "rebulk"; @@ -14,7 +14,7 @@ buildPythonPackage rec { buildInputs = [ pytest pytestrunner ]; propagatedBuildInputs = [ six regex ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/Toilal/rebulk/"; license = licenses.mit; description = "Advanced string matching from simple patterns"; diff --git a/pkgs/development/python-modules/recaptcha_client/default.nix b/pkgs/development/python-modules/recaptcha_client/default.nix index bcb6741bb295..08e7ff47aa1c 100644 --- a/pkgs/development/python-modules/recaptcha_client/default.nix +++ b/pkgs/development/python-modules/recaptcha_client/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , pythonAtLeast @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "28c6853c1d13d365b7dc71a6b05e5ffb56471f70a850de318af50d3d7c0dea2f"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A CAPTCHA for Python using the reCAPTCHA service"; homepage = "http://recaptcha.net/"; license = licenses.mit; diff --git a/pkgs/development/python-modules/rednose/default.nix b/pkgs/development/python-modules/rednose/default.nix index 948fe39dae7d..73b7f5d4758e 100644 --- a/pkgs/development/python-modules/rednose/default.nix +++ b/pkgs/development/python-modules/rednose/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy27, pythonAtLeast +{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27, pythonAtLeast , nose, six, colorama, termstyle }: buildPythonPackage rec { @@ -22,7 +22,7 @@ buildPythonPackage rec { checkInputs = [ six ]; propagatedBuildInputs = [ nose colorama termstyle ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A python nose plugin adding color to console results"; homepage = "https://github.com/JBKahn/rednose"; license = licenses.mit; diff --git a/pkgs/development/python-modules/reedsolo/default.nix b/pkgs/development/python-modules/reedsolo/default.nix index 2a22907ebe6c..c87a89b82a44 100644 --- a/pkgs/development/python-modules/reedsolo/default.nix +++ b/pkgs/development/python-modules/reedsolo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, cython, nose }: +{ lib, stdenv, buildPythonPackage, fetchFromGitHub, cython, nose }: buildPythonPackage rec { pname = "reedsolo"; @@ -18,7 +18,7 @@ buildPythonPackage rec { checkInputs = [ nose ]; checkPhase = "nosetests"; - meta = with stdenv.lib; { + meta = with lib; { description = "Pure-python universal errors-and-erasures Reed-Solomon Codec"; homepage = "https://github.com/tomerfiliba/reedsolomon"; license = licenses.publicDomain; diff --git a/pkgs/development/python-modules/reflink/default.nix b/pkgs/development/python-modules/reflink/default.nix new file mode 100644 index 000000000000..e9b8beadd16d --- /dev/null +++ b/pkgs/development/python-modules/reflink/default.nix @@ -0,0 +1,33 @@ +{ buildPythonPackage +, cffi +, fetchPypi +, lib +, pytestCheckHook +, pytestrunner +}: + +buildPythonPackage rec { + pname = "reflink"; + version = "0.2.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-ySU1gtskQTv9cDq/wbKkneePMbSQcjnyhumhkpoebjo="; + }; + + propagatedBuildInputs = [ cffi pytestrunner ]; + + checkInputs = [ pytestCheckHook ]; + + # FIXME: These do not work, and I have been unable to figure out why. + doCheck = false; + + pythonImportsCheck = [ "reflink" ]; + + meta = with lib; { + description = "Python reflink wraps around platform specific reflink implementations"; + homepage = "https://gitlab.com/rubdos/pyreflink"; + license = licenses.mit; + maintainers = with maintainers; [ lovesegfault ]; + }; +} diff --git a/pkgs/development/python-modules/remotecv/default.nix b/pkgs/development/python-modules/remotecv/default.nix index 9ab250f78afb..dc40763f6fe6 100644 --- a/pkgs/development/python-modules/remotecv/default.nix +++ b/pkgs/development/python-modules/remotecv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, pillow, pyres, nose +{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pillow, pyres, nose , preggy, numpy, yanc, nose-focus, mock, opencv }: buildPythonPackage rec { @@ -29,7 +29,7 @@ buildPythonPackage rec { nosetests --with-yanc -s tests/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "OpenCV worker for facial and feature recognition"; homepage = "https://github.com/thumbor/remotecv/wiki"; license = licenses.mit; diff --git a/pkgs/development/python-modules/rencode/default.nix b/pkgs/development/python-modules/rencode/default.nix index 3240c524d3bd..a8f0f81ee71d 100644 --- a/pkgs/development/python-modules/rencode/default.nix +++ b/pkgs/development/python-modules/rencode/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchgit , cython @@ -16,7 +16,7 @@ buildPythonPackage { buildInputs = [ cython ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/aresch/rencode"; description = "Fast (basic) object serialization similar to bencode"; license = licenses.gpl3; diff --git a/pkgs/development/python-modules/repeated_test/default.nix b/pkgs/development/python-modules/repeated_test/default.nix index c5c2e43b6573..a9355cda41ca 100644 --- a/pkgs/development/python-modules/repeated_test/default.nix +++ b/pkgs/development/python-modules/repeated_test/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , unittest2 @@ -17,7 +17,7 @@ buildPythonPackage rec { buildInputs = [ unittest2 ]; propagatedBuildInputs = [ six ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A quick unittest-compatible framework for repeating a test function over many fixtures"; homepage = "https://github.com/epsy/repeated_test"; license = licenses.mit; diff --git a/pkgs/development/python-modules/repocheck/default.nix b/pkgs/development/python-modules/repocheck/default.nix index 88437ae90327..ad8c3aef2eac 100644 --- a/pkgs/development/python-modules/repocheck/default.nix +++ b/pkgs/development/python-modules/repocheck/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchFromGitHub }: @@ -14,7 +14,7 @@ buildPythonPackage rec { owner = "kynikos"; }; - meta = with stdenv.lib; { + meta = with lib; { inherit (src.meta) homepage; description = "Check the status of code repositories under a root directory"; license = licenses.gpl3Plus; diff --git a/pkgs/development/python-modules/repoze_lru/default.nix b/pkgs/development/python-modules/repoze_lru/default.nix index afaac0b35f3e..7b8f0ecd8091 100644 --- a/pkgs/development/python-modules/repoze_lru/default.nix +++ b/pkgs/development/python-modules/repoze_lru/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi }: @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "0429a75e19380e4ed50c0694e26ac8819b4ea7851ee1fc7583c8572db80aff77"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A tiny LRU cache implementation and decorator"; homepage = "http://www.repoze.org/"; license = licenses.bsd0; diff --git a/pkgs/development/python-modules/repoze_sphinx_autointerface/default.nix b/pkgs/development/python-modules/repoze_sphinx_autointerface/default.nix index 0cc55ef7fea5..53761203113d 100644 --- a/pkgs/development/python-modules/repoze_sphinx_autointerface/default.nix +++ b/pkgs/development/python-modules/repoze_sphinx_autointerface/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , zope_interface @@ -16,7 +16,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ zope_interface sphinx ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/repoze/repoze.sphinx.autointerface"; description = "Auto-generate Sphinx API docs from Zope interfaces"; license = licenses.bsd0; diff --git a/pkgs/development/python-modules/repoze_who/default.nix b/pkgs/development/python-modules/repoze_who/default.nix index 7f4a89f3d24e..f64158f26a10 100644 --- a/pkgs/development/python-modules/repoze_who/default.nix +++ b/pkgs/development/python-modules/repoze_who/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , zope_interface @@ -16,7 +16,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ zope_interface webob ]; - meta = with stdenv.lib; { + meta = with lib; { description = "WSGI Authentication Middleware / API"; homepage = "http://www.repoze.org"; license = licenses.bsd0; diff --git a/pkgs/development/python-modules/requests-cache/default.nix b/pkgs/development/python-modules/requests-cache/default.nix index 4042197e1c31..2b3d57831c8d 100644 --- a/pkgs/development/python-modules/requests-cache/default.nix +++ b/pkgs/development/python-modules/requests-cache/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ lib, stdenv, buildPythonPackage, fetchPypi , mock, requests, six, urllib3 }: buildPythonPackage rec { @@ -13,7 +13,7 @@ buildPythonPackage rec { buildInputs = [ mock ]; propagatedBuildInputs = [ requests six urllib3 ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Persistent cache for requests library"; homepage = "https://pypi.python.org/pypi/requests-cache"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/requests-http-signature/default.nix b/pkgs/development/python-modules/requests-http-signature/default.nix index 992c54930ca6..cd36a4528198 100644 --- a/pkgs/development/python-modules/requests-http-signature/default.nix +++ b/pkgs/development/python-modules/requests-http-signature/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchFromGitHub , requests @@ -23,7 +23,7 @@ buildPythonPackage rec { ${python.interpreter} test/test.py ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A Requests auth module for HTTP Signature"; homepage = "https://github.com/kislyuk/requests-http-signature"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/requests-kerberos/default.nix b/pkgs/development/python-modules/requests-kerberos/default.nix index ab0758a84e16..a1c6f4fb0a1b 100644 --- a/pkgs/development/python-modules/requests-kerberos/default.nix +++ b/pkgs/development/python-modules/requests-kerberos/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildPythonPackage, requests, pykerberos, mock }: +{ lib, stdenv, fetchFromGitHub, buildPythonPackage, requests, pykerberos, mock }: buildPythonPackage rec { pname = "requests-kerberos"; @@ -18,7 +18,7 @@ buildPythonPackage rec { # they have a setup.py which mentions a test suite that doesn't exist... patches = [ ./fix_setup.patch ]; - meta = with stdenv.lib; { + meta = with lib; { description = "An authentication handler for using Kerberos with Python Requests."; homepage = "https://github.com/requests/requests-kerberos"; license = licenses.isc; diff --git a/pkgs/development/python-modules/requests-oauthlib/default.nix b/pkgs/development/python-modules/requests-oauthlib/default.nix index c4394fa87cdf..5de13530f66d 100644 --- a/pkgs/development/python-modules/requests-oauthlib/default.nix +++ b/pkgs/development/python-modules/requests-oauthlib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ lib, stdenv, buildPythonPackage, fetchPypi , oauthlib, requests }: buildPythonPackage rec { @@ -13,7 +13,7 @@ buildPythonPackage rec { doCheck = false; # Internet tests fail when building in chroot propagatedBuildInputs = [ oauthlib requests ]; - meta = with stdenv.lib; { + meta = with lib; { description = "OAuthlib authentication support for Requests"; homepage = "https://github.com/requests/requests-oauthlib"; maintainers = with maintainers; [ prikhi ]; diff --git a/pkgs/development/python-modules/requests/default.nix b/pkgs/development/python-modules/requests/default.nix index 47431274b2c6..a49b07102201 100644 --- a/pkgs/development/python-modules/requests/default.nix +++ b/pkgs/development/python-modules/requests/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage +{ lib, stdenv, fetchPypi, buildPythonPackage , urllib3, idna, chardet, certifi , pytest }: @@ -16,7 +16,7 @@ buildPythonPackage rec { # sadly, tests require networking doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "An Apache2 licensed HTTP library, written in Python, for human beings"; homepage = "http://docs.python-requests.org/en/latest/"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/resampy/default.nix b/pkgs/development/python-modules/resampy/default.nix index 43088cf5122e..38b4ae9911d2 100644 --- a/pkgs/development/python-modules/resampy/default.nix +++ b/pkgs/development/python-modules/resampy/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchFromGitHub , pytest @@ -29,7 +29,7 @@ buildPythonPackage rec { pytest tests ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/bmcfee/resampy"; description = "Efficient signal resampling"; license = licenses.isc; diff --git a/pkgs/development/python-modules/rethinkdb/default.nix b/pkgs/development/python-modules/rethinkdb/default.nix index 616cabc29a01..b35900233736 100644 --- a/pkgs/development/python-modules/rethinkdb/default.nix +++ b/pkgs/development/python-modules/rethinkdb/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , six @@ -19,7 +19,7 @@ buildPythonPackage rec { doCheck = false; pythonImportsCheck = [ "rethinkdb" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Python driver library for the RethinkDB database server"; homepage = "https://pypi.python.org/pypi/rethinkdb"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/retry_decorator/default.nix b/pkgs/development/python-modules/retry_decorator/default.nix index c1e495f56a99..12ba4f9a1a5b 100644 --- a/pkgs/development/python-modules/retry_decorator/default.nix +++ b/pkgs/development/python-modules/retry_decorator/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi }: @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "e1e8ad02e518fe11073f2ea7d80b6b8be19daa27a60a1838aff7c731ddcf2ebe"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/pnpnpn/retry-decorator"; description = "Retry Decorator for python functions"; license = licenses.mit; diff --git a/pkgs/development/python-modules/retrying/default.nix b/pkgs/development/python-modules/retrying/default.nix index 75a17fb6dc44..65127d040f42 100644 --- a/pkgs/development/python-modules/retrying/default.nix +++ b/pkgs/development/python-modules/retrying/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , six @@ -18,7 +18,7 @@ buildPythonPackage rec { # doesn't ship tests in tarball doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/rholder/retrying"; description = "General-purpose retrying library"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/rfc-bibtex/default.nix b/pkgs/development/python-modules/rfc-bibtex/default.nix index 7eb79d1b251c..c002f0baaa9d 100644 --- a/pkgs/development/python-modules/rfc-bibtex/default.nix +++ b/pkgs/development/python-modules/rfc-bibtex/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonApplication, fetchPypi, isPy3k }: +{ lib, stdenv, buildPythonApplication, fetchPypi, isPy3k }: buildPythonApplication rec { pname = "rfc-bibtex"; @@ -11,7 +11,7 @@ buildPythonApplication rec { disabled = !isPy3k; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/iluxonchik/rfc-bibtex/"; description = "Generate Bibtex entries for IETF RFCs and Internet-Drafts"; license = licenses.mit; diff --git a/pkgs/development/python-modules/rfc3986/default.nix b/pkgs/development/python-modules/rfc3986/default.nix index 3af6d2f022be..561bda08d0cd 100644 --- a/pkgs/development/python-modules/rfc3986/default.nix +++ b/pkgs/development/python-modules/rfc3986/default.nix @@ -1,5 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, - pytest }: +{ lib, stdenv, buildPythonPackage, fetchPypi, idna, pytestCheckHook }: buildPythonPackage rec { pname = "rfc3986"; @@ -10,14 +9,14 @@ buildPythonPackage rec { sha256 = "17dvx15m3r49bmif5zlli8kzjd6bys6psixzbp14sd5367d9h8qi"; }; - checkInputs = [ pytest ]; - checkPhase = '' - pytest - ''; + propagatedBuildInputs = [ idna ]; - meta = with stdenv.lib; { + checkInputs = [ pytestCheckHook ]; + + meta = with lib; { + description = "Validating URI References per RFC 3986"; homepage = "https://rfc3986.readthedocs.org"; license = licenses.asl20; - description = "Validating URI References per RFC 3986"; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } diff --git a/pkgs/development/python-modules/rfc3987/default.nix b/pkgs/development/python-modules/rfc3987/default.nix index 6488dfdd8ce5..1ec8fc2153c1 100644 --- a/pkgs/development/python-modules/rfc3987/default.nix +++ b/pkgs/development/python-modules/rfc3987/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi }: +{ lib, stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "rfc3987"; @@ -10,7 +10,7 @@ buildPythonPackage rec { }; doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://pypi.python.org/pypi/rfc3987"; license = licenses.gpl3Plus; description = "Parsing and validation of URIs (RFC 3986) and IRIs (RFC 3987)"; diff --git a/pkgs/development/python-modules/rich/default.nix b/pkgs/development/python-modules/rich/default.nix index 6284ed7b649a..1e667f1f3de6 100644 --- a/pkgs/development/python-modules/rich/default.nix +++ b/pkgs/development/python-modules/rich/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchFromGitHub , pythonOlder @@ -37,7 +37,7 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "rich" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Render rich text, tables, progress bars, syntax highlighting, markdown and more to the terminal"; homepage = "https://github.com/willmcgugan/rich"; license = licenses.mit; diff --git a/pkgs/development/python-modules/rjsmin/default.nix b/pkgs/development/python-modules/rjsmin/default.nix index 49520b1ee452..7ca9d711739a 100644 --- a/pkgs/development/python-modules/rjsmin/default.nix +++ b/pkgs/development/python-modules/rjsmin/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi }: +{ lib, stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "rjsmin"; version = "1.1.0"; @@ -12,7 +12,7 @@ buildPythonPackage rec { # tests auto-discovery doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://opensource.perlig.de/rjsmin/"; license = licenses.asl20; description = "Javascript minifier written in python"; diff --git a/pkgs/development/python-modules/rl-coach/default.nix b/pkgs/development/python-modules/rl-coach/default.nix index e9efb0c02b4e..0ac5d9ab2a3b 100644 --- a/pkgs/development/python-modules/rl-coach/default.nix +++ b/pkgs/development/python-modules/rl-coach/default.nix @@ -89,7 +89,7 @@ buildPythonPackage rec { disabled = pythonOlder "3.5"; # minimum required version - meta = with stdenv.lib; { + meta = with lib; { description = "Enables easy experimentation with state of the art Reinforcement Learning algorithms"; homepage = "https://nervanasystems.github.io/coach/"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/robomachine/default.nix b/pkgs/development/python-modules/robomachine/default.nix index 11fff472e98a..fe069be459cc 100644 --- a/pkgs/development/python-modules/robomachine/default.nix +++ b/pkgs/development/python-modules/robomachine/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage, pyparsing, robotframework, allpairspy }: +{ lib, stdenv, fetchPypi, buildPythonPackage, pyparsing, robotframework, allpairspy }: buildPythonPackage rec { pname = "RoboMachine"; @@ -20,7 +20,7 @@ buildPythonPackage rec { substituteInPlace setup.py --replace "argparse" "" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Test data generator for Robot Framework"; homepage = "https://github.com/mkorpela/RoboMachine"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/robot-detection/default.nix b/pkgs/development/python-modules/robot-detection/default.nix index 5cf864cd8019..3cf064d2669d 100644 --- a/pkgs/development/python-modules/robot-detection/default.nix +++ b/pkgs/development/python-modules/robot-detection/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, six }: +{ lib, stdenv, buildPythonPackage, fetchPypi, six }: buildPythonPackage rec { pname = "robot-detection"; @@ -14,7 +14,7 @@ buildPythonPackage rec { # no tests in archive doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Library for detecting if a HTTP User Agent header is likely to be a bot"; homepage = "https://github.com/rory/robot-detection"; license = licenses.gpl3Plus; diff --git a/pkgs/development/python-modules/robotframework-databaselibrary/default.nix b/pkgs/development/python-modules/robotframework-databaselibrary/default.nix index 73b538aa12f7..c3eb309dfe0b 100644 --- a/pkgs/development/python-modules/robotframework-databaselibrary/default.nix +++ b/pkgs/development/python-modules/robotframework-databaselibrary/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , robotframework @@ -18,7 +18,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ robotframework ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Database Library contains utilities meant for Robot Framework"; homepage = "https://github.com/franz-see/Robotframework-Database-Library"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/robotframework-requests/default.nix b/pkgs/development/python-modules/robotframework-requests/default.nix index 0a22dc1eec6c..967138620e98 100644 --- a/pkgs/development/python-modules/robotframework-requests/default.nix +++ b/pkgs/development/python-modules/robotframework-requests/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , unittest2 @@ -19,7 +19,7 @@ buildPythonPackage rec { buildInputs = [ unittest2 ]; propagatedBuildInputs = [ robotframework lxml requests ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Robot Framework keyword library wrapper around the HTTP client library requests"; homepage = "https://github.com/bulkan/robotframework-requests"; license = licenses.mit; diff --git a/pkgs/development/python-modules/robotframework-ride/default.nix b/pkgs/development/python-modules/robotframework-ride/default.nix index 368c4e4c15ad..39e42596e2ae 100644 --- a/pkgs/development/python-modules/robotframework-ride/default.nix +++ b/pkgs/development/python-modules/robotframework-ride/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, buildPythonPackage, isPy3k, pygments, wxPython }: +{ lib, stdenv, fetchurl, buildPythonPackage, isPy3k, pygments, wxPython }: buildPythonPackage rec { version = "1.2.3"; @@ -22,7 +22,7 @@ buildPythonPackage rec { # error: invalid command 'test' doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Light-weight and intuitive editor for Robot Framework test case files"; homepage = "https://code.google.com/p/robotframework-ride/"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/robotframework-selenium2library/default.nix b/pkgs/development/python-modules/robotframework-selenium2library/default.nix index 14ce2db5d0b2..5fa87d17d11f 100644 --- a/pkgs/development/python-modules/robotframework-selenium2library/default.nix +++ b/pkgs/development/python-modules/robotframework-selenium2library/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, robotframework-seleniumlibrary }: +{ lib, stdenv, buildPythonPackage, fetchPypi, robotframework-seleniumlibrary }: buildPythonPackage rec { version = "3.0.0"; @@ -14,7 +14,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ robotframework-seleniumlibrary ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Web testing library for Robot Framework"; homepage = "https://github.com/robotframework/Selenium2Library"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix b/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix index 2bba9cfbdd8a..60123d6b87d1 100644 --- a/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix +++ b/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, python, robotframework, selenium, mockito, robotstatuschecker, approvaltests }: +{ lib, stdenv, buildPythonPackage, fetchFromGitHub, python, robotframework, selenium, mockito, robotstatuschecker, approvaltests }: buildPythonPackage rec { version = "3.3.1"; @@ -21,7 +21,7 @@ buildPythonPackage rec { ${python.interpreter} utest/run.py ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Web testing library for Robot Framework"; homepage = "https://github.com/robotframework/SeleniumLibrary"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/robotframework-sshlibrary/default.nix b/pkgs/development/python-modules/robotframework-sshlibrary/default.nix index e5e2d022dc8a..7e3bcbcc55da 100644 --- a/pkgs/development/python-modules/robotframework-sshlibrary/default.nix +++ b/pkgs/development/python-modules/robotframework-sshlibrary/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , robotframework @@ -20,7 +20,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ robotframework paramiko scp ]; - meta = with stdenv.lib; { + meta = with lib; { description = "SSHLibrary is a Robot Framework test library for SSH and SFTP"; homepage = "https://github.com/robotframework/SSHLibrary"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/robotframework-tools/default.nix b/pkgs/development/python-modules/robotframework-tools/default.nix index 0ed0bcaf4948..5bc7bbceae71 100644 --- a/pkgs/development/python-modules/robotframework-tools/default.nix +++ b/pkgs/development/python-modules/robotframework-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , isPy3k @@ -41,7 +41,7 @@ buildPythonPackage rec { pytest test --ignore test/remote/test_remote.py ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Python Tools for Robot Framework and Test Libraries"; homepage = "https://bitbucket.org/userzimmermann/robotframework-tools"; license = licenses.gpl3; diff --git a/pkgs/development/python-modules/robotframework/default.nix b/pkgs/development/python-modules/robotframework/default.nix index 1a3b55451537..953602ca1ada 100644 --- a/pkgs/development/python-modules/robotframework/default.nix +++ b/pkgs/development/python-modules/robotframework/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage }: +{ lib, stdenv, fetchPypi, buildPythonPackage }: buildPythonPackage rec { pname = "robotframework"; @@ -10,7 +10,7 @@ buildPythonPackage rec { extension = "zip"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Generic test automation framework"; homepage = "https://robotframework.org/"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/robotstatuschecker/default.nix b/pkgs/development/python-modules/robotstatuschecker/default.nix index c5094b4ee59d..b0bd44f9c152 100644 --- a/pkgs/development/python-modules/robotstatuschecker/default.nix +++ b/pkgs/development/python-modules/robotstatuschecker/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, python, robotframework }: +{ lib, stdenv, buildPythonPackage, fetchFromGitHub, python, robotframework }: buildPythonPackage rec { version = "1.3"; @@ -18,7 +18,7 @@ buildPythonPackage rec { ${python.interpreter} test/run.py ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A tool for checking that Robot Framework test cases have expected statuses and log messages"; homepage = "https://github.com/robotframework/statuschecker"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/robotsuite/default.nix b/pkgs/development/python-modules/robotsuite/default.nix index e9d4ddbed116..126153ec50e5 100644 --- a/pkgs/development/python-modules/robotsuite/default.nix +++ b/pkgs/development/python-modules/robotsuite/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ lib, stdenv, buildPythonPackage, fetchPypi , unittest2, lxml, robotframework }: @@ -19,7 +19,7 @@ buildPythonPackage rec { --replace robotframework-python3 robotframework ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Python unittest test suite for Robot Framework"; homepage = "https://github.com/collective/robotsuite/"; license = licenses.gpl3; diff --git a/pkgs/development/python-modules/roku/default.nix b/pkgs/development/python-modules/roku/default.nix index 6cdfa2aa15b1..5e3644468fe8 100644 --- a/pkgs/development/python-modules/roku/default.nix +++ b/pkgs/development/python-modules/roku/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildPythonPackage, requests, pytest, flask, isPy27 +{ lib, stdenv, fetchFromGitHub, buildPythonPackage, requests, pytest, flask, isPy27 }: buildPythonPackage rec { @@ -18,7 +18,7 @@ buildPythonPackage rec { checkInputs = [ pytest flask ]; pythonImportsCheck = [ "roku" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Screw remotes. Control your Roku with Python."; homepage = "https://github.com/jcarbaugh/python-roku"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/roman/default.nix b/pkgs/development/python-modules/roman/default.nix index 52d45d728752..33f0f7f18d7d 100644 --- a/pkgs/development/python-modules/roman/default.nix +++ b/pkgs/development/python-modules/roman/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi }: @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "90e83b512b44dd7fc83d67eb45aa5eb707df623e6fc6e66e7f273abd4b2613ae"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Integer to Roman numerals converter"; homepage = "https://pypi.python.org/pypi/roman"; license = licenses.psfl; diff --git a/pkgs/development/python-modules/rope/default.nix b/pkgs/development/python-modules/rope/default.nix index 81e306f81db2..65edd602d8de 100644 --- a/pkgs/development/python-modules/rope/default.nix +++ b/pkgs/development/python-modules/rope/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, pythonAtLeast, nose }: +{ lib, stdenv, buildPythonPackage, fetchPypi, pythonAtLeast, nose }: buildPythonPackage rec { pname = "rope"; @@ -15,7 +15,7 @@ buildPythonPackage rec { NOSE_IGNORE_FILES=type_hinting_test.py nosetests ropetest ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Python refactoring library"; homepage = "https://github.com/python-rope/rope"; maintainers = with maintainers; [ goibhniu ]; diff --git a/pkgs/development/python-modules/ropper/default.nix b/pkgs/development/python-modules/ropper/default.nix index 51fc191dd467..8b193caa7b8b 100644 --- a/pkgs/development/python-modules/ropper/default.nix +++ b/pkgs/development/python-modules/ropper/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonApplication , fetchPypi , capstone @@ -23,7 +23,7 @@ buildPythonApplication rec { checkInputs = [pytest]; propagatedBuildInputs = [ capstone filebytes ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://scoding.de/ropper/"; license = licenses.bsd3; description = "Show information about files in different file formats"; diff --git a/pkgs/development/python-modules/routes/default.nix b/pkgs/development/python-modules/routes/default.nix index 95eebe8ab69d..0129ef69e2c6 100644 --- a/pkgs/development/python-modules/routes/default.nix +++ b/pkgs/development/python-modules/routes/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , repoze_lru @@ -25,7 +25,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "routes" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A Python re-implementation of the Rails routes system for mapping URLs to application actions"; homepage = "http://routes.groovie.org/"; license = licenses.mit; diff --git a/pkgs/development/python-modules/rpdb/default.nix b/pkgs/development/python-modules/rpdb/default.nix index d7faeeaed7c9..fb84adb7d240 100644 --- a/pkgs/development/python-modules/rpdb/default.nix +++ b/pkgs/development/python-modules/rpdb/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi }: @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "5d1a1cee34378ab075879dc30fa6328d448a9f680a66c4e84cac7382ad92f15f"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "pdb wrapper with remote access via tcp socket"; homepage = "https://github.com/tamentis/rpdb"; license = licenses.bsd2; diff --git a/pkgs/development/python-modules/rpkg/default.nix b/pkgs/development/python-modules/rpkg/default.nix index 2be6830130dc..731a5738e73e 100644 --- a/pkgs/development/python-modules/rpkg/default.nix +++ b/pkgs/development/python-modules/rpkg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, isPy3k, fetchurl, six, pycurl, cccolutils +{ lib, stdenv, buildPythonPackage, isPy3k, fetchurl, six, pycurl, cccolutils , koji, rpmfluff }: buildPythonPackage rec { @@ -17,7 +17,7 @@ buildPythonPackage rec { doCheck = false; # needs /var/lib/rpm database to run tests - meta = with stdenv.lib; { + meta = with lib; { description = "Python library for dealing with rpm packaging"; homepage = "https://pagure.io/fedpkg"; license = licenses.gpl2Plus; diff --git a/pkgs/development/python-modules/rply/default.nix b/pkgs/development/python-modules/rply/default.nix index 1c4fd16eedf6..0da9d2b71018 100644 --- a/pkgs/development/python-modules/rply/default.nix +++ b/pkgs/development/python-modules/rply/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pytest, fetchFromGitHub, buildPythonPackage, appdirs }: +{ lib, stdenv, pytest, fetchFromGitHub, buildPythonPackage, appdirs }: buildPythonPackage rec { pname = "rply"; @@ -18,7 +18,7 @@ buildPythonPackage rec { HOME=$(mktemp -d) py.test tests ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A python Lex/Yacc that works with RPython"; homepage = "https://github.com/alex/rply"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/rpmfluff/default.nix b/pkgs/development/python-modules/rpmfluff/default.nix index 1893f7dd19c3..96050ba14b01 100644 --- a/pkgs/development/python-modules/rpmfluff/default.nix +++ b/pkgs/development/python-modules/rpmfluff/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchurl , glibcLocales @@ -16,7 +16,7 @@ buildPythonPackage rec { LC_ALL="en_US.utf-8"; buildInputs = [ glibcLocales ]; - meta = with stdenv.lib; { + meta = with lib; { description = "lightweight way of building RPMs, and sabotaging them"; homepage = "https://pagure.io/rpmfluff"; license = licenses.gpl2; diff --git a/pkgs/development/python-modules/rpy2/default.nix b/pkgs/development/python-modules/rpy2/default.nix index 055341dfd1d3..0b042288fb75 100644 --- a/pkgs/development/python-modules/rpy2/default.nix +++ b/pkgs/development/python-modules/rpy2/default.nix @@ -1,4 +1,5 @@ -{ lib +{ stdenv +, lib , python , buildPythonPackage , fetchpatch @@ -20,30 +21,37 @@ , cffi , tzlocal , simplegeneric -, pytest +, pytestCheckHook , extraRPackages ? [] }: buildPythonPackage rec { - version = "3.3.6"; + version = "3.4.1"; pname = "rpy2"; disabled = isPyPy; src = fetchPypi { inherit version pname; - sha256 = "0xvfkxvh01r5ibd5mpisp8bz385hgpn27b988y8v65z7hqr3y1nf"; + sha256 = "1qnjjlgh6i31z45jykwd29n1336gq678fn9zw7gh0rv5d6sn0hv4"; }; + patches = [ + # R_LIBS_SITE is used by the nix r package to point to the installed R libraries. + # This patch sets R_LIBS_SITE when rpy2 is imported. + ./rpy2-3.x-r-libs-site.patch + ]; + + postPatch = '' + substituteInPlace 'rpy2/rinterface_lib/embedded.py' --replace '@NIX_R_LIBS_SITE@' "$R_LIBS_SITE" + substituteInPlace 'requirements.txt' --replace 'pytest' "" + ''; + buildInputs = [ - R pcre lzma bzip2 zlib icu - - # is in the upstream `requires` although it shouldn't be -- this is easier than patching it away - pytest ] ++ (with rPackages; [ # packages expected by the test framework ggplot2 @@ -58,23 +66,10 @@ buildPythonPackage rec { tidyr ]) ++ extraRPackages ++ rWrapper.recommendedPackages; - checkPhase = '' - pytest - ''; - nativeBuildInputs = [ R # needed at setup time to detect R_HOME (alternatively set R_HOME explicitly) ]; - patches = [ - # R_LIBS_SITE is used by the nix r package to point to the installed R libraries. - # This patch sets R_LIBS_SITE when rpy2 is imported. - ./rpy2-3.x-r-libs-site.patch - ]; - postPatch = '' - substituteInPlace 'rpy2/rinterface_lib/embedded.py' --replace '@NIX_R_LIBS_SITE@' "$R_LIBS_SITE" - ''; - propagatedBuildInputs = [ ipython jinja2 @@ -86,8 +81,10 @@ buildPythonPackage rec { simplegeneric ]; + doCheck = !stdenv.isDarwin; + checkInputs = [ - pytest + pytestCheckHook ]; meta = { diff --git a/pkgs/development/python-modules/rpyc/default.nix b/pkgs/development/python-modules/rpyc/default.nix index 5b6dba0f9ed0..e549a00c8948 100644 --- a/pkgs/development/python-modules/rpyc/default.nix +++ b/pkgs/development/python-modules/rpyc/default.nix @@ -1,34 +1,38 @@ -{ stdenv +{ lib , buildPythonPackage , fetchFromGitHub , nose , plumbum +, pytestCheckHook }: buildPythonPackage rec { pname = "rpyc"; - version = "4.1.3"; + version = "5.0.1"; src = fetchFromGitHub { owner = "tomerfiliba"; repo = pname; rev = version; - sha256 = "145mi8p37x9cbfm5117g4ng7b5rmghjjwgm319qqhwgzvqg3y4j9"; + sha256 = "1g75k4valfjgab00xri4pf8c8bb2zxkhgkpyy44fjk7s5j66daa1"; }; propagatedBuildInputs = [ plumbum ]; - checkInputs = [ nose ]; - checkPhase = '' - cd tests - # some tests have added complexities and some tests attempt network use - nosetests -I test_deploy -I test_gevent_server -I test_ssh -I test_registry - ''; + checkInputs = [ pytestCheckHook ]; - meta = with stdenv.lib; { + # Disable tests that requires network access + disabledTests = [ + "test_api" + "test_pruning" + "test_rpyc" + ]; + pythonImportsCheck = [ "rpyc" ]; + + meta = with lib; { description = "Remote Python Call (RPyC), a transparent and symmetric RPC library"; homepage = "https://rpyc.readthedocs.org"; - license = licenses.mit; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; }; - } diff --git a/pkgs/development/python-modules/rq/default.nix b/pkgs/development/python-modules/rq/default.nix index c788d4164102..c9ca5977cb10 100644 --- a/pkgs/development/python-modules/rq/default.nix +++ b/pkgs/development/python-modules/rq/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildPythonPackage, isPy27, click, redis }: +{ lib, stdenv, fetchFromGitHub, buildPythonPackage, isPy27, click, redis }: buildPythonPackage rec { pname = "rq"; @@ -17,7 +17,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ click redis ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A simple, lightweight library for creating background jobs, and processing them"; homepage = "https://github.com/nvie/rq/"; maintainers = with maintainers; [ mrmebelman ]; diff --git a/pkgs/development/python-modules/rsa/4_0.nix b/pkgs/development/python-modules/rsa/4_0.nix index 459ca0437968..a6aa89b2ea1e 100644 --- a/pkgs/development/python-modules/rsa/4_0.nix +++ b/pkgs/development/python-modules/rsa/4_0.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , unittest2 @@ -24,7 +24,7 @@ buildPythonPackage rec { substituteInPlace setup.py --replace "open('README.md')" "open('README.md',encoding='utf-8')" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://stuvel.eu/rsa"; license = licenses.asl20; description = "A pure-Python RSA implementation"; diff --git a/pkgs/development/python-modules/rsa/default.nix b/pkgs/development/python-modules/rsa/default.nix index a5380709eda9..1f26350fc36e 100644 --- a/pkgs/development/python-modules/rsa/default.nix +++ b/pkgs/development/python-modules/rsa/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , unittest2 @@ -28,7 +28,7 @@ buildPythonPackage rec { # No tests in archive doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://stuvel.eu/rsa"; license = licenses.asl20; description = "A pure-Python RSA implementation"; diff --git a/pkgs/development/python-modules/rtslib/default.nix b/pkgs/development/python-modules/rtslib/default.nix index aaf879d2a3f4..e53756b0181a 100644 --- a/pkgs/development/python-modules/rtslib/default.nix +++ b/pkgs/development/python-modules/rtslib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildPythonPackage, six, pyudev, pygobject3 }: +{ lib, stdenv, fetchFromGitHub, buildPythonPackage, six, pyudev, pygobject3 }: buildPythonPackage rec { pname = "rtslib"; @@ -13,7 +13,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six pyudev pygobject3 ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A Python object API for managing the Linux LIO kernel target"; homepage = "https://github.com/open-iscsi/rtslib-fb"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/ruamel_base/default.nix b/pkgs/development/python-modules/ruamel_base/default.nix index f7e473f9f561..950f523f4a9a 100644 --- a/pkgs/development/python-modules/ruamel_base/default.nix +++ b/pkgs/development/python-modules/ruamel_base/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi }: @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "1wswxrn4givsm917mfl39rafgadimf1sldpbjdjws00g1wx36hf0"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Common routines for ruamel packages"; homepage = "https://sourceforge.net/projects/ruamel-base/"; license = licenses.mit; diff --git a/pkgs/development/python-modules/ruamel_ordereddict/default.nix b/pkgs/development/python-modules/ruamel_ordereddict/default.nix index 7f05229a4f54..1e5820a37f73 100644 --- a/pkgs/development/python-modules/ruamel_ordereddict/default.nix +++ b/pkgs/development/python-modules/ruamel_ordereddict/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , isPy3k @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "d7d9cf8b11e7662deb460260cf062980cd84b87a1d0457132060ab9d44e0a5f4"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A version of dict that keeps keys in insertion resp. sorted order"; homepage = "https://sourceforge.net/projects/ruamel-ordereddict/"; license = licenses.mit; diff --git a/pkgs/development/python-modules/ruamel_yaml_clib/default.nix b/pkgs/development/python-modules/ruamel_yaml_clib/default.nix index 46b55c04d30e..debf2aaf7747 100644 --- a/pkgs/development/python-modules/ruamel_yaml_clib/default.nix +++ b/pkgs/development/python-modules/ruamel_yaml_clib/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchhg , ruamel_base @@ -19,7 +19,7 @@ buildPythonPackage rec { # outputs match wheel doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "YAML parser/emitter that supports roundtrip preservation of comments, seq/map flow style, and map key order"; homepage = "https://sourceforge.net/projects/ruamel-yaml-clib/"; license = licenses.mit; diff --git a/pkgs/development/python-modules/rubymarshal/default.nix b/pkgs/development/python-modules/rubymarshal/default.nix index 6115702009ac..edb793c19d51 100644 --- a/pkgs/development/python-modules/rubymarshal/default.nix +++ b/pkgs/development/python-modules/rubymarshal/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, hypothesis, isPy3k }: +{ lib, stdenv, buildPythonPackage, fetchPypi, hypothesis, isPy3k }: buildPythonPackage rec { pname = "rubymarshal"; @@ -17,7 +17,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "rubymarshal" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/d9pouces/RubyMarshal/"; description = "Read and write Ruby-marshalled data"; license = licenses.wtfpl; diff --git a/pkgs/development/python-modules/ruffus/default.nix b/pkgs/development/python-modules/ruffus/default.nix index da905f7ab477..a425c077343f 100644 --- a/pkgs/development/python-modules/ruffus/default.nix +++ b/pkgs/development/python-modules/ruffus/default.nix @@ -4,7 +4,7 @@ , hostname , pytest , python -, stdenv +, lib, stdenv }: buildPythonPackage rec { @@ -38,7 +38,7 @@ buildPythonPackage rec { ''; pythonImportsCheck = [ "ruffus" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Light-weight Python Computational Pipeline Management"; homepage = "http://www.ruffus.org.uk"; license = licenses.mit; diff --git a/pkgs/development/python-modules/runsnakerun/default.nix b/pkgs/development/python-modules/runsnakerun/default.nix index 6d601197d76e..1475b0032313 100644 --- a/pkgs/development/python-modules/runsnakerun/default.nix +++ b/pkgs/development/python-modules/runsnakerun/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , squaremap @@ -16,7 +16,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ squaremap wxPython ]; - meta = with stdenv.lib; { + meta = with lib; { description = "GUI Viewer for Python profiling runs"; homepage = "http://www.vrplumber.com/programming/runsnakerun/"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/s3fs/default.nix b/pkgs/development/python-modules/s3fs/default.nix index 9c900610e031..0154059c4f7b 100644 --- a/pkgs/development/python-modules/s3fs/default.nix +++ b/pkgs/development/python-modules/s3fs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, docutils, boto3, fsspec }: +{ lib, stdenv, buildPythonPackage, fetchPypi, docutils, aiobotocore, fsspec }: buildPythonPackage rec { pname = "s3fs"; @@ -10,14 +10,14 @@ buildPythonPackage rec { }; buildInputs = [ docutils ]; - propagatedBuildInputs = [ boto3 fsspec ]; + propagatedBuildInputs = [ aiobotocore fsspec ]; # Depends on `moto` which has a long dependency chain with exact # version requirements that can't be made to work with current # pythonPackages. doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "S3FS builds on boto3 to provide a convenient Python filesystem interface for S3."; homepage = "https://github.com/dask/s3fs/"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/sacremoses/default.nix b/pkgs/development/python-modules/sacremoses/default.nix index f5c0ee715c3a..9f97757edad4 100644 --- a/pkgs/development/python-modules/sacremoses/default.nix +++ b/pkgs/development/python-modules/sacremoses/default.nix @@ -1,5 +1,5 @@ { buildPythonPackage -, stdenv +, lib, stdenv , fetchFromGitHub , click , six @@ -27,7 +27,7 @@ buildPythonPackage rec { pytest -k 'not truecase' ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/alvations/sacremoses"; description = "Python port of Moses tokenizer, truecaser and normalizer"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/python-modules/safe/default.nix b/pkgs/development/python-modules/safe/default.nix index f7f6f7eabf91..d167760c3e0e 100644 --- a/pkgs/development/python-modules/safe/default.nix +++ b/pkgs/development/python-modules/safe/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , nose @@ -15,7 +15,7 @@ buildPythonPackage rec { buildInputs = [ nose ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/lepture/safe"; license = licenses.bsd3; description = "Check password strength"; diff --git a/pkgs/development/python-modules/salmon-mail/default.nix b/pkgs/development/python-modules/salmon-mail/default.nix index a33bec431d68..5e6aa5927eca 100644 --- a/pkgs/development/python-modules/salmon-mail/default.nix +++ b/pkgs/development/python-modules/salmon-mail/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, dnspython, chardet, lmtpd +{ lib, stdenv, buildPythonPackage, fetchPypi, dnspython, chardet, lmtpd , python-daemon, six, jinja2, mock, click }: buildPythonPackage rec { @@ -20,10 +20,12 @@ buildPythonPackage rec { # The tests use salmon executable installed by salmon itself so we need to add # that to PATH checkPhase = '' + # tests fail and pytest is not supported + rm tests/server_tests.py PATH=$out/bin:$PATH python setup.py test ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://salmon-mail.readthedocs.org/"; description = "Pythonic mail application server"; license = licenses.gpl3; diff --git a/pkgs/development/python-modules/samplerate/default.nix b/pkgs/development/python-modules/samplerate/default.nix index 02278d9be415..a4a19f7ad12e 100644 --- a/pkgs/development/python-modules/samplerate/default.nix +++ b/pkgs/development/python-modules/samplerate/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , numpy , pkgs @@ -27,7 +27,7 @@ buildPythonPackage { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/cournape/samplerate"; description = "High quality sampling rate convertion from audio data in numpy arrays"; license = licenses.gpl2; diff --git a/pkgs/development/python-modules/sandboxlib/default.nix b/pkgs/development/python-modules/sandboxlib/default.nix index 541bd8108714..42872e318916 100644 --- a/pkgs/development/python-modules/sandboxlib/default.nix +++ b/pkgs/development/python-modules/sandboxlib/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , pbr @@ -17,7 +17,7 @@ buildPythonPackage rec { buildInputs = [ pbr ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Sandboxing Library for Python"; homepage = "https://pypi.python.org/pypi/sandboxlib/0.3.1"; license = licenses.gpl2; diff --git a/pkgs/development/python-modules/sane/default.nix b/pkgs/development/python-modules/sane/default.nix index 2359ff0aa7fe..d45c736d8d03 100644 --- a/pkgs/development/python-modules/sane/default.nix +++ b/pkgs/development/python-modules/sane/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "sane"; - version = "2.8.2"; + version = "2.9.1"; src = fetchPypi { inherit version; pname = "python-sane"; - sha256 = "0sri01h9sld6w7vgfhwp29n5w19g6idz01ba2giwnkd99k1y2iqg"; + sha256 = "JAmOuDxujhsBEm5q16WwR5wHsBPF0iBQm1VYkv5JJd4="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/sanic-auth/default.nix b/pkgs/development/python-modules/sanic-auth/default.nix index 4642b69f7d2e..c78b6f13d152 100644 --- a/pkgs/development/python-modules/sanic-auth/default.nix +++ b/pkgs/development/python-modules/sanic-auth/default.nix @@ -1,21 +1,19 @@ -{ lib, buildPythonPackage, fetchPypi, pytest, sanic }: +{ lib, buildPythonPackage, fetchPypi, sanic, pytestCheckHook }: buildPythonPackage rec { pname = "Sanic-Auth"; - version = "0.2.0"; + version = "0.3.0"; src = fetchPypi { inherit pname version; - sha256 = "b7cb9e93296c035ada0aa1ebfb33f9f7b62f7774c519e374b7fe703ff73589cb"; + sha256 = "0dc24ynqjraqwgvyk0g9bj87zgpq4xnssl24hnsn7l5vlkmk8198"; }; propagatedBuildInputs = [ sanic ]; - checkInputs = [ pytest ]; + checkInputs = [ pytestCheckHook ]; - checkPhase = '' - pytest tests - ''; + pythonImportsCheck = [ "sanic_auth" ]; meta = with lib; { description = "Simple Authentication for Sanic"; diff --git a/pkgs/development/python-modules/sanic/default.nix b/pkgs/development/python-modules/sanic/default.nix index aaedaa5ef8c5..f503b0b85561 100644 --- a/pkgs/development/python-modules/sanic/default.nix +++ b/pkgs/development/python-modules/sanic/default.nix @@ -36,6 +36,8 @@ buildPythonPackage rec { "test_zero_downtime" # No "examples.delayed_response.app" module in pypi distribution. ]; + __darwinAllowLocalNetworking = true; + meta = with lib; { description = "A microframework based on uvloop, httptools, and learnings of flask"; homepage = "http://github.com/channelcat/sanic/"; diff --git a/pkgs/development/python-modules/sapi-python-client/default.nix b/pkgs/development/python-modules/sapi-python-client/default.nix index 847acb3c9cd4..8a7a62d8ce84 100644 --- a/pkgs/development/python-modules/sapi-python-client/default.nix +++ b/pkgs/development/python-modules/sapi-python-client/default.nix @@ -1,4 +1,4 @@ -{ stdenv, git, setuptools, setuptools_scm, fetchFromGitHub, requests, boto3, buildPythonPackage, responses }: +{ lib, stdenv, git, setuptools, setuptools_scm, fetchFromGitHub, requests, boto3, buildPythonPackage, responses }: buildPythonPackage rec { pname = "sapi-python-client"; @@ -21,7 +21,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ setuptools requests boto3 responses ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Keboola Connection Storage API client"; homepage = "https://github.com/keboola/sapi-python-client"; maintainers = with maintainers; [ mrmebelman ]; diff --git a/pkgs/development/python-modules/scales/default.nix b/pkgs/development/python-modules/scales/default.nix index 0407c1fa86d8..5aae62972688 100644 --- a/pkgs/development/python-modules/scales/default.nix +++ b/pkgs/development/python-modules/scales/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , nose @@ -20,7 +20,7 @@ buildPythonPackage rec { # No tests included doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Stats for Python processes"; homepage = "https://www.github.com/Cue/scales"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/schedule/default.nix b/pkgs/development/python-modules/schedule/default.nix index 118c95cc8c57..596ed993233e 100644 --- a/pkgs/development/python-modules/schedule/default.nix +++ b/pkgs/development/python-modules/schedule/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , mock @@ -15,7 +15,7 @@ buildPythonPackage rec { buildInputs = [ mock ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Python job scheduling for humans"; homepage = "https://github.com/dbader/schedule"; license = licenses.mit; diff --git a/pkgs/development/python-modules/schema/default.nix b/pkgs/development/python-modules/schema/default.nix index 8dd89480074a..1502c7d10abe 100644 --- a/pkgs/development/python-modules/schema/default.nix +++ b/pkgs/development/python-modules/schema/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, contextlib2, pytest, mock }: +{ lib, stdenv, buildPythonPackage, fetchPypi, contextlib2, pytest, mock }: buildPythonPackage rec { @@ -19,7 +19,7 @@ buildPythonPackage rec { checkInputs = [ pytest mock ]; checkPhase = "pytest ./test_schema.py"; - meta = with stdenv.lib; { + meta = with lib; { description = "Library for validating Python data structures"; homepage = "https://github.com/keleshev/schema"; license = licenses.mit; diff --git a/pkgs/development/python-modules/schiene/default.nix b/pkgs/development/python-modules/schiene/default.nix new file mode 100644 index 000000000000..8f479500a138 --- /dev/null +++ b/pkgs/development/python-modules/schiene/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchPypi +, requests +, beautifulsoup4 +}: + +buildPythonPackage rec { + pname = "schiene"; + version = "0.23"; + + src = fetchPypi { + inherit pname version; + sha256 = "014aaxmk7yxyml1xgfk3zqallyb5zi04m0v7jgqjkbjqq4n4j3ck"; + }; + + propagatedBuildInputs = [ + requests + beautifulsoup4 + ]; + + # tests are not present + doCheck = false; + + pythonImportsCheck = [ "schiene" ]; + + meta = with lib; { + description = "Python library for interacting with Bahn.de"; + homepage = "https://github.com/kennell/schiene"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/scikit-bio/default.nix b/pkgs/development/python-modules/scikit-bio/default.nix index 650a67709913..8fa0186498f4 100644 --- a/pkgs/development/python-modules/scikit-bio/default.nix +++ b/pkgs/development/python-modules/scikit-bio/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , cython @@ -45,7 +45,7 @@ buildPythonPackage rec { ${python.interpreter} -m skbio.test ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://scikit-bio.org/"; description = "Data structures, algorithms and educational resources for bioinformatics"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/scikitlearn/0.20.nix b/pkgs/development/python-modules/scikitlearn/0.20.nix index 4d8e8d00f434..81915e83d2dc 100644 --- a/pkgs/development/python-modules/scikitlearn/0.20.nix +++ b/pkgs/development/python-modules/scikitlearn/0.20.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ lib, stdenv, buildPythonPackage, fetchPypi , gfortran, glibcLocales , numpy, scipy, pytest, pillow }: @@ -29,7 +29,7 @@ buildPythonPackage rec { HOME=$TMPDIR OMP_NUM_THREADS=1 pytest -k "not test_feature_importance_regression" --pyargs sklearn ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A set of python modules for machine learning and data mining"; homepage = "https://scikit-learn.org"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/scikitlearn/default.nix b/pkgs/development/python-modules/scikitlearn/default.nix index cffd29f09d3a..5414fe43cc15 100644 --- a/pkgs/development/python-modules/scikitlearn/default.nix +++ b/pkgs/development/python-modules/scikitlearn/default.nix @@ -52,7 +52,7 @@ buildPythonPackage rec { HOME=$TMPDIR OMP_NUM_THREADS=1 pytest -k "not test_feature_importance_regression" --pyargs sklearn ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A set of python modules for machine learning and data mining"; changelog = let major = versions.major version; diff --git a/pkgs/development/python-modules/scikits-odes/default.nix b/pkgs/development/python-modules/scikits-odes/default.nix index d85d8e396f20..383cf1f70c68 100644 --- a/pkgs/development/python-modules/scikits-odes/default.nix +++ b/pkgs/development/python-modules/scikits-odes/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { pytest ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A scikit offering extra ode/dae solvers, as an extension to what is available in scipy"; homepage = "https://github.com/bmcage/odes"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/scipy/default.nix b/pkgs/development/python-modules/scipy/default.nix index 218415354db7..3a78dd2f2026 100644 --- a/pkgs/development/python-modules/scipy/default.nix +++ b/pkgs/development/python-modules/scipy/default.nix @@ -37,8 +37,6 @@ in buildPythonPackage rec { ln -s ${numpy.cfg} site.cfg ''; - enableParallelBuilding = true; - checkPhase = '' runHook preCheck pushd dist diff --git a/pkgs/development/python-modules/scp/default.nix b/pkgs/development/python-modules/scp/default.nix index a37927b9a641..f5cd96e71aaf 100644 --- a/pkgs/development/python-modules/scp/default.nix +++ b/pkgs/development/python-modules/scp/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , paramiko @@ -25,7 +25,7 @@ buildPythonPackage rec { #The Pypi package doesn't include the test doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/jbardin/scp.py"; description = "SCP module for paramiko"; license = licenses.lgpl3; diff --git a/pkgs/development/python-modules/scrapy-deltafetch/default.nix b/pkgs/development/python-modules/scrapy-deltafetch/default.nix index cf6f8a010714..900943a0e153 100644 --- a/pkgs/development/python-modules/scrapy-deltafetch/default.nix +++ b/pkgs/development/python-modules/scrapy-deltafetch/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage, pytest, scrapy, bsddb3 }: +{ stdenv, lib, fetchPypi, buildPythonPackage, scrapy, bsddb3 }: buildPythonPackage rec { pname = "scrapy-deltafetch"; @@ -11,9 +11,11 @@ buildPythonPackage rec { propagatedBuildInputs = [ bsddb3 scrapy ]; - checkInputs = [ pytest ]; + # no tests + doCheck = false; + pythonImportsCheck = [ "scrapy_deltafetch" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Scrapy spider middleware to ignore requests to pages containing items seen in previous crawls"; homepage = "https://github.com/scrapy-plugins/scrapy-deltafetch"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/scrapy-fake-useragent/default.nix b/pkgs/development/python-modules/scrapy-fake-useragent/default.nix index b2de4e9a993b..4f6eecfe9143 100644 --- a/pkgs/development/python-modules/scrapy-fake-useragent/default.nix +++ b/pkgs/development/python-modules/scrapy-fake-useragent/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildPythonPackage, pytestCheckHook, pytestcov, pytest-mock, fake-useragent, faker, scrapy }: +{ lib, stdenv, fetchFromGitHub, buildPythonPackage, pytestCheckHook, pytestcov, pytest-mock, fake-useragent, faker, scrapy }: buildPythonPackage rec { pname = "scrapy-fake-useragent"; @@ -16,7 +16,7 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook scrapy pytestcov pytest-mock ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Random User-Agent middleware based on fake-useragent"; homepage = "https://github.com/alecxe/scrapy-fake-useragent"; license = licenses.mit; diff --git a/pkgs/development/python-modules/scrapy-splash/default.nix b/pkgs/development/python-modules/scrapy-splash/default.nix index 7799186d6216..ab00377f4a0e 100644 --- a/pkgs/development/python-modules/scrapy-splash/default.nix +++ b/pkgs/development/python-modules/scrapy-splash/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage, pytest, hypothesis, scrapy }: +{ stdenv, lib, fetchPypi, buildPythonPackage, scrapy, six }: buildPythonPackage rec { pname = "scrapy-splash"; @@ -9,9 +9,13 @@ buildPythonPackage rec { sha256 = "1dg7csdza2hzqskd9b9gx0v3saqsch4f0fwdp0a3p0822aqqi488"; }; - checkInputs = [ pytest hypothesis scrapy ]; + propagatedBuildInputs = [ scrapy six ]; - meta = with stdenv.lib; { + # no tests + doCheck = false; + pythonImportsCheck = [ "scrapy_splash" ]; + + meta = with lib; { description = "Scrapy+Splash for JavaScript integration"; homepage = "https://github.com/scrapy-plugins/scrapy-splash"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/scrapy/default.nix b/pkgs/development/python-modules/scrapy/default.nix index c377ace69685..48bafa41dff7 100644 --- a/pkgs/development/python-modules/scrapy/default.nix +++ b/pkgs/development/python-modules/scrapy/default.nix @@ -1,4 +1,5 @@ -{ stdenv +{ lib +, stdenv , buildPythonPackage , isPy27 , fetchPypi @@ -79,7 +80,10 @@ buildPythonPackage rec { "test_retry_dns_error" "test_custom_asyncio_loop_enabled_true" "test_custom_loop_asyncio" - ] ++ stdenv.lib.optionals stdenv.isDarwin [ "test_xmliter_encoding" ]; + ] ++ stdenv.lib.optionals stdenv.isDarwin [ + "test_xmliter_encoding" + "test_download" + ]; src = fetchPypi { inherit pname version; @@ -92,7 +96,9 @@ buildPythonPackage rec { install -m 644 -D extras/scrapy_zsh_completion $out/share/zsh/site-functions/_scrapy ''; - meta = with stdenv.lib; { + __darwinAllowLocalNetworking = true; + + meta = with lib; { description = "A fast high-level web crawling and web scraping framework, used to crawl websites and extract structured data from their pages"; homepage = "https://scrapy.org/"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/screeninfo/default.nix b/pkgs/development/python-modules/screeninfo/default.nix index 1b79a43af9c9..f53a7053ff58 100644 --- a/pkgs/development/python-modules/screeninfo/default.nix +++ b/pkgs/development/python-modules/screeninfo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonApplication, fetchPypi, isPy27, isPy36, dataclasses, libX11, libXinerama, libXrandr }: +{ lib, stdenv, buildPythonApplication, fetchPypi, isPy27, isPy36, dataclasses, libX11, libXinerama, libXrandr }: buildPythonApplication rec { pname = "screeninfo"; @@ -27,7 +27,7 @@ buildPythonApplication rec { buildInputs = [ libX11 libXinerama libXrandr]; - meta = with stdenv.lib; { + meta = with lib; { description = "Fetch location and size of physical screens"; homepage = "https://github.com/rr-/screeninfo"; license = licenses.mit; diff --git a/pkgs/development/python-modules/scripttest/default.nix b/pkgs/development/python-modules/scripttest/default.nix index ab53585fe8c2..ab234ce22434 100644 --- a/pkgs/development/python-modules/scripttest/default.nix +++ b/pkgs/development/python-modules/scripttest/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , pytest @@ -18,7 +18,7 @@ buildPythonPackage rec { # Tests are not included. See https://github.com/pypa/scripttest/issues/11 doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "A library for testing interactive command-line applications"; homepage = "https://pypi.python.org/pypi/ScriptTest/"; license = licenses.mit; diff --git a/pkgs/development/python-modules/sdnotify/default.nix b/pkgs/development/python-modules/sdnotify/default.nix index f1a7fc4d52c0..0003d9c01312 100644 --- a/pkgs/development/python-modules/sdnotify/default.nix +++ b/pkgs/development/python-modules/sdnotify/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi }: @@ -12,7 +12,7 @@ buildPythonPackage rec { inherit pname version; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A pure Python implementation of systemd's service notification protocol"; homepage = "https://github.com/bb4242/sdnotify"; license = licenses.mit; diff --git a/pkgs/development/python-modules/seabreeze/default.nix b/pkgs/development/python-modules/seabreeze/default.nix index 7cf062765d3b..cc9594d04525 100644 --- a/pkgs/development/python-modules/seabreeze/default.nix +++ b/pkgs/development/python-modules/seabreeze/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , buildPythonPackage , pyusb @@ -34,7 +34,7 @@ buildPythonPackage rec { setupPyBuildFlags = [ "--without-cseabreeze" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/ap--/python-seabreeze"; description = "A python library to access Ocean Optics spectrometers"; maintainers = []; diff --git a/pkgs/development/python-modules/seekpath/default.nix b/pkgs/development/python-modules/seekpath/default.nix index e70ba02ce0e3..637b55eec8d7 100644 --- a/pkgs/development/python-modules/seekpath/default.nix +++ b/pkgs/development/python-modules/seekpath/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder, numpy, future, spglib, glibcLocales, pytest, scipy }: +{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder, numpy, future, spglib, glibcLocales, pytest, scipy }: buildPythonPackage rec { pname = "seekpath"; @@ -26,7 +26,7 @@ buildPythonPackage rec { pytest . -k 'not oI2Y' ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A module to obtain and visualize band paths in the Brillouin zone of crystal structures."; homepage = "https://github.com/giovannipizzi/seekpath"; license = licenses.mit; diff --git a/pkgs/development/python-modules/selectors2/default.nix b/pkgs/development/python-modules/selectors2/default.nix index c78f1811a069..ff6b81d3105d 100644 --- a/pkgs/development/python-modules/selectors2/default.nix +++ b/pkgs/development/python-modules/selectors2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ lib, stdenv, buildPythonPackage, fetchPypi , nose, psutil, mock }: buildPythonPackage rec { @@ -21,7 +21,7 @@ buildPythonPackage rec { --exclude=test_above_fd_setsize ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.github.com/SethMichaelLarson/selectors2"; description = "Back-ported, durable, and portable selectors"; license = licenses.mit; diff --git a/pkgs/development/python-modules/selectors34/default.nix b/pkgs/development/python-modules/selectors34/default.nix index 6d02c9dc79b2..ea3b403fdaed 100644 --- a/pkgs/development/python-modules/selectors34/default.nix +++ b/pkgs/development/python-modules/selectors34/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , python @@ -20,7 +20,7 @@ buildPythonPackage rec { ${python.interpreter} setup.py test ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A backport of the selectors module from Python 3.4"; homepage = "https://github.com/berkerpeksag/selectors34"; license = licenses.psfl; diff --git a/pkgs/development/python-modules/semantic/default.nix b/pkgs/development/python-modules/semantic/default.nix index f0371f860cf5..83e4879e1fdd 100644 --- a/pkgs/development/python-modules/semantic/default.nix +++ b/pkgs/development/python-modules/semantic/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , isPy3k @@ -21,7 +21,7 @@ buildPythonPackage rec { # strange setuptools error (can not import semantic.test) doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Common Natural Language Processing Tasks for Python"; homepage = "https://github.com/crm416/semantic"; license = licenses.mit; diff --git a/pkgs/development/python-modules/semver/default.nix b/pkgs/development/python-modules/semver/default.nix index 5aca34b52f11..71ec776db7c4 100644 --- a/pkgs/development/python-modules/semver/default.nix +++ b/pkgs/development/python-modules/semver/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , buildPythonPackage , pytestCheckHook @@ -19,7 +19,7 @@ buildPythonPackage rec { preCheck = "rm -rf dist"; # confuses source vs dist imports in pytest checkInputs = [ pytestCheckHook pytestcov ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Python package to work with Semantic Versioning (http://semver.org/)"; homepage = "https://python-semver.readthedocs.io/en/latest/"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/send2trash/default.nix b/pkgs/development/python-modules/send2trash/default.nix index 16528c976ac6..a91be0151119 100644 --- a/pkgs/development/python-modules/send2trash/default.nix +++ b/pkgs/development/python-modules/send2trash/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchFromGitHub , pytest @@ -19,7 +19,7 @@ buildPythonPackage rec { checkPhase = "HOME=$TMPDIR pytest"; checkInputs = [ pytest ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Send file to trash natively under macOS, Windows and Linux"; homepage = "https://github.com/hsoft/send2trash"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/sentry-sdk/default.nix b/pkgs/development/python-modules/sentry-sdk/default.nix index 9df9453b2b4d..b846c0bc743b 100644 --- a/pkgs/development/python-modules/sentry-sdk/default.nix +++ b/pkgs/development/python-modules/sentry-sdk/default.nix @@ -17,7 +17,7 @@ , rq , sanic , sqlalchemy -, stdenv +, lib, stdenv , tornado , urllib3 , trytond @@ -42,12 +42,6 @@ buildPythonPackage rec { propagatedBuildInputs = [ urllib3 certifi ]; - meta = with stdenv.lib; { - homepage = "https://github.com/getsentry/sentry-python"; - description = "New Python SDK for Sentry.io"; - license = licenses.bsd2; - maintainers = with maintainers; [ gebner ]; - }; # The Sentry tests need access to `/etc/protocols` (the tests call # `socket.getprotobyname('tcp')`, which reads from this file). Normally @@ -57,5 +51,17 @@ buildPythonPackage rec { export NIX_REDIRECTS=/etc/protocols=${iana-etc}/etc/protocols export LD_PRELOAD=${libredirect}/lib/libredirect.so ''; + postCheck = "unset NIX_REDIRECTS LD_PRELOAD"; + + # no tests + doCheck = false; + pythonImportsCheck = [ "sentry_sdk" ]; + + meta = with lib; { + homepage = "https://github.com/getsentry/sentry-python"; + description = "New Python SDK for Sentry.io"; + license = licenses.bsd2; + maintainers = with maintainers; [ gebner ]; + }; } diff --git a/pkgs/development/python-modules/sepaxml/default.nix b/pkgs/development/python-modules/sepaxml/default.nix index 94fd2d65d464..095b47db2bff 100644 --- a/pkgs/development/python-modules/sepaxml/default.nix +++ b/pkgs/development/python-modules/sepaxml/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, isPy27 +{ lib, stdenv, buildPythonPackage, fetchFromGitHub, isPy27 , lxml , pytest , text-unidecode @@ -28,7 +28,7 @@ buildPythonPackage rec { pytest ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/raphaelm/python-sepaxml/"; description = "SEPA Direct Debit XML generation in python"; license = licenses.mit; diff --git a/pkgs/development/python-modules/seqdiag/default.nix b/pkgs/development/python-modules/seqdiag/default.nix index b7fba9986002..ba4cdca0c636 100644 --- a/pkgs/development/python-modules/seqdiag/default.nix +++ b/pkgs/development/python-modules/seqdiag/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, buildPythonPackage, isPy27, pep8, nose, unittest2, docutils +{ lib, stdenv, fetchurl, buildPythonPackage, isPy27, pep8, nose, unittest2, docutils , blockdiag }: @@ -21,7 +21,7 @@ buildPythonPackage rec { # ERROR: Failure: OSError ([Errno 2] No such file or directory: '/tmp/nix-build-python2.7-seqdiag-0.9.0.drv-0/seqdiag-0.9.0/src/seqdiag/tests/diagrams/') doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Generate sequence-diagram image from spec-text file (similar to Graphviz)"; homepage = "http://blockdiag.com/"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/serpent/default.nix b/pkgs/development/python-modules/serpent/default.nix index cfb734e54759..36840813b401 100644 --- a/pkgs/development/python-modules/serpent/default.nix +++ b/pkgs/development/python-modules/serpent/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { ${python.interpreter} setup.py test ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A simple serialization library based on ast.literal_eval"; homepage = "https://github.com/irmen/Serpent"; license = licenses.mit; diff --git a/pkgs/development/python-modules/serversyncstorage/default.nix b/pkgs/development/python-modules/serversyncstorage/default.nix index e8541da6cd45..fa212d6a4de5 100644 --- a/pkgs/development/python-modules/serversyncstorage/default.nix +++ b/pkgs/development/python-modules/serversyncstorage/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchFromGitHub , isPy27 @@ -37,7 +37,7 @@ buildPythonPackage rec { pymysqlsa umemcache WSGIProxy requests pybrowserid ]; - meta = with stdenv.lib; { + meta = with lib; { broken = cornice.version != "0.17"; description = "The SyncServer server software, as used by Firefox Sync"; homepage = "https://github.com/mozilla-services/server-syncstorage"; diff --git a/pkgs/development/python-modules/setproctitle/default.nix b/pkgs/development/python-modules/setproctitle/default.nix index 473ef25e162e..a9c0e7fda893 100644 --- a/pkgs/development/python-modules/setproctitle/default.nix +++ b/pkgs/development/python-modules/setproctitle/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , pytestCheckHook @@ -18,7 +18,7 @@ buildPythonPackage rec { # tries to compile programs with dependencies that aren't available pytestFlagsArray = [ "--ignore=tests/setproctitle_test.py" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Allows a process to change its title (as displayed by system tools such as ps and top)"; homepage = "https://github.com/dvarrazzo/py-setproctitle"; license = licenses.bsdOriginal; diff --git a/pkgs/development/python-modules/setuptools-git/default.nix b/pkgs/development/python-modules/setuptools-git/default.nix index 5c0b40b4af4e..18fae7b1610b 100644 --- a/pkgs/development/python-modules/setuptools-git/default.nix +++ b/pkgs/development/python-modules/setuptools-git/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , pkgs @@ -16,7 +16,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pkgs.git ]; doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Setuptools revision control system plugin for Git"; homepage = "https://pypi.python.org/pypi/setuptools-git"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/setuptools-lint/default.nix b/pkgs/development/python-modules/setuptools-lint/default.nix index fbe1528c4c3b..ba42c21ad360 100644 --- a/pkgs/development/python-modules/setuptools-lint/default.nix +++ b/pkgs/development/python-modules/setuptools-lint/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, pylint }: +{ lib, stdenv, buildPythonPackage, fetchPypi, pylint }: buildPythonPackage rec { pname = "setuptools-lint"; @@ -11,7 +11,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pylint ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Package to expose pylint as a lint command into setup.py"; homepage = "https://github.com/johnnoone/setuptools-pylint"; license = licenses.bsdOriginal; diff --git a/pkgs/development/python-modules/setuptools-rust/default.nix b/pkgs/development/python-modules/setuptools-rust/default.nix index 5125e166a0ce..2d9a4b17d40f 100644 --- a/pkgs/development/python-modules/setuptools-rust/default.nix +++ b/pkgs/development/python-modules/setuptools-rust/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , isPy27 @@ -23,7 +23,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ semantic-version setuptools toml ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Setuptools plugin for Rust support"; homepage = "https://github.com/PyO3/setuptools-rust"; changelog = "https://github.com/PyO3/setuptools-rust/releases/tag/v${version}"; diff --git a/pkgs/development/python-modules/setuptools-scm-git-archive/default.nix b/pkgs/development/python-modules/setuptools-scm-git-archive/default.nix index d2b464054969..d8558aaf83a7 100644 --- a/pkgs/development/python-modules/setuptools-scm-git-archive/default.nix +++ b/pkgs/development/python-modules/setuptools-scm-git-archive/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, setuptools_scm, pytest }: +{ lib, stdenv, buildPythonPackage, fetchPypi, setuptools_scm, pytest }: buildPythonPackage rec { pname = "setuptools-scm-git-archive"; @@ -17,7 +17,7 @@ buildPythonPackage rec { doCheck = false; pythonImportsCheck = [ "setuptools_scm_git_archive" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "setuptools_scm plugin for git archives"; homepage = "https://github.com/Changaco/setuptools_scm_git_archive"; license = licenses.mit; diff --git a/pkgs/development/python-modules/setuptools/44.0.nix b/pkgs/development/python-modules/setuptools/44.0.nix index c2f6eb230b47..7c7d6b01e408 100644 --- a/pkgs/development/python-modules/setuptools/44.0.nix +++ b/pkgs/development/python-modules/setuptools/44.0.nix @@ -73,7 +73,7 @@ in buildPythonPackage rec { # Requires pytest, causing infinite recursion. doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Utilities to facilitate the installation of Python packages"; homepage = "https://pypi.python.org/pypi/setuptools"; license = with licenses; [ psfl zpl20 ]; diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix index 987c75ba5a03..12bbbb7d0e5b 100644 --- a/pkgs/development/python-modules/setuptools/default.nix +++ b/pkgs/development/python-modules/setuptools/default.nix @@ -73,7 +73,7 @@ in buildPythonPackage rec { # Requires pytest, causing infinite recursion. doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Utilities to facilitate the installation of Python packages"; homepage = "https://pypi.python.org/pypi/setuptools"; license = with licenses; [ psfl zpl20 ]; diff --git a/pkgs/development/python-modules/setuptools_scm/default.nix b/pkgs/development/python-modules/setuptools_scm/default.nix index fb527a1336d9..a766bb6c294f 100644 --- a/pkgs/development/python-modules/setuptools_scm/default.nix +++ b/pkgs/development/python-modules/setuptools_scm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, pip, pytest }: +{ lib, stdenv, buildPythonPackage, fetchPypi, pip, pytest }: buildPythonPackage rec { pname = "setuptools_scm"; @@ -12,7 +12,7 @@ buildPythonPackage rec { # Requires pytest, circular dependency doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://bitbucket.org/pypa/setuptools_scm/"; description = "Handles managing your python package versions in scm metadata"; license = licenses.mit; diff --git a/pkgs/development/python-modules/setuptoolsdarcs/default.nix b/pkgs/development/python-modules/setuptoolsdarcs/default.nix index 5e58f80985f5..f6358a831c9c 100644 --- a/pkgs/development/python-modules/setuptoolsdarcs/default.nix +++ b/pkgs/development/python-modules/setuptoolsdarcs/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , darcsver @@ -22,7 +22,7 @@ buildPythonPackage rec { substituteInPlace setup.py --replace "name=PKG" "name=PKG, version='${version}'" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Setuptools plugin for the Darcs version control system"; homepage = "http://allmydata.org/trac/setuptools_darcs"; license = licenses.bsd0; diff --git a/pkgs/development/python-modules/setuptoolstrial/default.nix b/pkgs/development/python-modules/setuptoolstrial/default.nix index b393d0eb2003..1d29f77cf0f2 100644 --- a/pkgs/development/python-modules/setuptoolstrial/default.nix +++ b/pkgs/development/python-modules/setuptoolstrial/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , pytest @@ -28,7 +28,7 @@ buildPythonPackage rec { # Couldn't get tests working doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Setuptools plugin that makes unit tests execute with trial instead of pyunit."; homepage = "https://github.com/rutsky/setuptools-trial"; license = licenses.bsd2; diff --git a/pkgs/development/python-modules/sexpdata/default.nix b/pkgs/development/python-modules/sexpdata/default.nix index 1e282f9660a8..89f716d9be25 100644 --- a/pkgs/development/python-modules/sexpdata/default.nix +++ b/pkgs/development/python-modules/sexpdata/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi }: @@ -14,7 +14,7 @@ buildPythonPackage rec { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "S-expression parser for Python"; homepage = "https://github.com/tkf/sexpdata"; license = licenses.bsd0; diff --git a/pkgs/development/python-modules/shap/default.nix b/pkgs/development/python-modules/shap/default.nix index deb6dcf2a21a..1ce9a879ee19 100644 --- a/pkgs/development/python-modules/shap/default.nix +++ b/pkgs/development/python-modules/shap/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchFromGitHub , isPy27 @@ -60,7 +60,7 @@ buildPythonPackage rec { "test_single_row_gradient_boosting_regressor" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A unified approach to explain the output of any machine learning model"; homepage = "https://github.com/slundberg/shap"; license = licenses.mit; diff --git a/pkgs/development/python-modules/shapely/default.nix b/pkgs/development/python-modules/shapely/default.nix index e2b738c479e6..f852f77bcfda 100644 --- a/pkgs/development/python-modules/shapely/default.nix +++ b/pkgs/development/python-modules/shapely/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, substituteAll, pythonOlder +{ lib, stdenv, buildPythonPackage, fetchPypi, substituteAll, pythonOlder , geos, pytest, cython , numpy }: @@ -39,7 +39,7 @@ buildPythonPackage rec { py.test tests ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Geometric objects, predicates, and operations"; maintainers = with maintainers; [ knedlsepp ]; homepage = "https://pypi.python.org/pypi/Shapely/"; diff --git a/pkgs/development/python-modules/shellingham/default.nix b/pkgs/development/python-modules/shellingham/default.nix index 238d394ee11e..77a4b98f54c3 100644 --- a/pkgs/development/python-modules/shellingham/default.nix +++ b/pkgs/development/python-modules/shellingham/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ lib, stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "576c1982bea0ba82fb46c36feb951319d7f42214a82634233f58b40d858a751e"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Tool to Detect Surrounding Shell"; homepage = "https://github.com/sarugaku/shellingham"; license = licenses.isc; diff --git a/pkgs/development/python-modules/shiboken2/default.nix b/pkgs/development/python-modules/shiboken2/default.nix index 9b2062dbf6c6..b7508a8f6447 100644 --- a/pkgs/development/python-modules/shiboken2/default.nix +++ b/pkgs/development/python-modules/shiboken2/default.nix @@ -1,5 +1,5 @@ -{ buildPythonPackage, python, fetchurl, stdenv, pyside2, - cmake, qt5, llvmPackages }: +{ buildPythonPackage, python, fetchurl, lib, stdenv, pyside2 +, cmake, qt5, llvmPackages }: stdenv.mkDerivation { pname = "shiboken2"; @@ -27,10 +27,11 @@ stdenv.mkDerivation { rm $out/bin/shiboken_tool.py ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Generator for the PySide2 Qt bindings"; license = with licenses; [ gpl2 lgpl21 ]; homepage = "https://wiki.qt.io/Qt_for_Python"; maintainers = with maintainers; [ gebner ]; + broken = stdenv.isDarwin; }; } diff --git a/pkgs/development/python-modules/shippai/default.nix b/pkgs/development/python-modules/shippai/default.nix index 1bae1c50fb66..8fd15b71a015 100644 --- a/pkgs/development/python-modules/shippai/default.nix +++ b/pkgs/development/python-modules/shippai/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi }: +{ lib, stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "shippai"; @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "0r6iwvmay8ygn2m15pyjrk9am4mfpk7rkf0lcbcb15pnabixlyzj"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Use Rust failures as Python exceptions"; homepage = "https://github.com/untitaker/shippai"; license = licenses.mit; diff --git a/pkgs/development/python-modules/shortuuid/default.nix b/pkgs/development/python-modules/shortuuid/default.nix index 4fec2a3f04c0..35401afa6e3e 100644 --- a/pkgs/development/python-modules/shortuuid/default.nix +++ b/pkgs/development/python-modules/shortuuid/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , isPy3k , fetchPypi @@ -18,7 +18,7 @@ buildPythonPackage rec { buildInputs = [pep8]; - meta = with stdenv.lib; { + meta = with lib; { description = "A generator library for concise, unambiguous and URL-safe UUIDs"; homepage = "https://github.com/stochastic-technologies/shortuuid/"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/should-dsl/default.nix b/pkgs/development/python-modules/should-dsl/default.nix index abfe47bfc7a7..1499f1ce4bc8 100644 --- a/pkgs/development/python-modules/should-dsl/default.nix +++ b/pkgs/development/python-modules/should-dsl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi }: +{ lib, stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "should-dsl"; @@ -13,7 +13,7 @@ buildPythonPackage rec { # There are no tests doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Should assertions in Python as clear and readable as possible"; homepage = "http://www.should-dsl.info/"; license = licenses.mit; diff --git a/pkgs/development/python-modules/shouldbe/default.nix b/pkgs/development/python-modules/shouldbe/default.nix index 068ed9343117..9959f26036cf 100644 --- a/pkgs/development/python-modules/shouldbe/default.nix +++ b/pkgs/development/python-modules/shouldbe/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , pythonAtLeast , fetchPypi @@ -20,7 +20,7 @@ buildPythonPackage rec { checkInputs = [ nose ]; propagatedBuildInputs = [ forbiddenfruit ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Python Assertion Helpers inspired by Shouldly"; homepage = "https://pypi.python.org/pypi/shouldbe/"; license = licenses.mit; diff --git a/pkgs/development/python-modules/signedjson/default.nix b/pkgs/development/python-modules/signedjson/default.nix index 69f7a93f509d..12614a3446bb 100644 --- a/pkgs/development/python-modules/signedjson/default.nix +++ b/pkgs/development/python-modules/signedjson/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchFromGitHub , canonicaljson @@ -20,7 +20,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ canonicaljson unpaddedbase64 pynacl typing-extensions ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://pypi.org/project/signedjson/"; description = "Sign JSON with Ed25519 signatures"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/sigtools/default.nix b/pkgs/development/python-modules/sigtools/default.nix index 92a39e26da0e..0c11a2b6c561 100644 --- a/pkgs/development/python-modules/sigtools/default.nix +++ b/pkgs/development/python-modules/sigtools/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , repeated_test @@ -24,7 +24,7 @@ buildPythonPackage rec { patchPhase = ''sed -i s/test_suite="'"sigtools.tests"'"/test_suite="'"unittest2.collector"'"/ setup.py''; - meta = with stdenv.lib; { + meta = with lib; { description = "Utilities for working with 3.3's inspect.Signature objects."; homepage = "https://pypi.python.org/pypi/sigtools"; license = licenses.mit; diff --git a/pkgs/development/python-modules/simanneal/default.nix b/pkgs/development/python-modules/simanneal/default.nix index 5b084c399ba5..958f53be567d 100644 --- a/pkgs/development/python-modules/simanneal/default.nix +++ b/pkgs/development/python-modules/simanneal/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildPythonPackage, pytest }: +{ lib, stdenv, fetchFromGitHub, buildPythonPackage, pytest }: buildPythonPackage rec { pname = "simanneal"; @@ -14,7 +14,7 @@ buildPythonPackage rec { checkInputs = [ pytest ]; checkPhase = "pytest tests"; - meta = with stdenv.lib; { + meta = with lib; { description = "A python implementation of the simulated annealing optimization technique"; homepage = "https://github.com/perrygeo/simanneal"; license = licenses.isc; diff --git a/pkgs/development/python-modules/simple-websocket-server/default.nix b/pkgs/development/python-modules/simple-websocket-server/default.nix index c80206813724..f8d579b6088d 100644 --- a/pkgs/development/python-modules/simple-websocket-server/default.nix +++ b/pkgs/development/python-modules/simple-websocket-server/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub }: +{ lib, stdenv, buildPythonPackage, fetchFromGitHub }: buildPythonPackage { pname = "simple-websocket-server"; @@ -12,7 +12,7 @@ buildPythonPackage { doCheck = false; # no tests - meta = with stdenv.lib; { + meta = with lib; { description = "A python based websocket server that is simple and easy to use"; homepage = "https://github.com/dpallot/simple-websocket-server/"; license = licenses.mit; diff --git a/pkgs/development/python-modules/simpleai/default.nix b/pkgs/development/python-modules/simpleai/default.nix index c8d1a99326f9..0786ebfae6e4 100644 --- a/pkgs/development/python-modules/simpleai/default.nix +++ b/pkgs/development/python-modules/simpleai/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , numpy @@ -20,7 +20,7 @@ buildPythonPackage rec { #No tests in archive doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/simpleai-team/simpleai"; description = "This lib implements many of the artificial intelligence algorithms described on the book 'Artificial Intelligence, a Modern Approach'"; maintainers = with maintainers; [ NikolaMandic ]; diff --git a/pkgs/development/python-modules/simplebayes/default.nix b/pkgs/development/python-modules/simplebayes/default.nix index 57f7df73c21d..b7dd0310a087 100644 --- a/pkgs/development/python-modules/simplebayes/default.nix +++ b/pkgs/development/python-modules/simplebayes/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchFromGitHub , nose @@ -27,7 +27,7 @@ buildPythonPackage { checkPhase = "nosetests tests/test.py"; - meta = with stdenv.lib; { + meta = with lib; { description = "Memory-based naive bayesian text classifier"; homepage = "https://github.com/hickeroar/simplebayes"; license = licenses.mit; diff --git a/pkgs/development/python-modules/simpleparse/default.nix b/pkgs/development/python-modules/simpleparse/default.nix index d1117b3a9d89..6395f4af223d 100644 --- a/pkgs/development/python-modules/simpleparse/default.nix +++ b/pkgs/development/python-modules/simpleparse/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , isPy3k @@ -18,7 +18,7 @@ buildPythonPackage rec { doCheck = false; # weird error - meta = with stdenv.lib; { + meta = with lib; { description = "A Parser Generator for Python"; homepage = "https://pypi.python.org/pypi/SimpleParse"; license = licenses.bsd0; diff --git a/pkgs/development/python-modules/skein/default.nix b/pkgs/development/python-modules/skein/default.nix index 32320c5042fc..40a179264273 100644 --- a/pkgs/development/python-modules/skein/default.nix +++ b/pkgs/development/python-modules/skein/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { ln -s ${skeinJar} skein/java/skein.jar ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://jcristharif.com/skein"; description = "A tool and library for easily deploying applications on Apache YARN"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/sklearn-deap/default.nix b/pkgs/development/python-modules/sklearn-deap/default.nix index e4a01778352a..36ec8b18ca7e 100644 --- a/pkgs/development/python-modules/sklearn-deap/default.nix +++ b/pkgs/development/python-modules/sklearn-deap/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, fetchpatch, numpy, scipy, deap, scikitlearn, python }: +{ lib, stdenv, buildPythonPackage, fetchFromGitHub, fetchpatch, numpy, scipy, deap, scikitlearn, python }: buildPythonPackage rec { pname = "sklearn-deap"; @@ -26,7 +26,7 @@ buildPythonPackage rec { ${python.interpreter} test.py ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Use evolutionary algorithms instead of gridsearch in scikit-learn"; homepage = "https://github.com/rsteca/sklearn-deap"; license = licenses.lgpl3; diff --git a/pkgs/development/python-modules/slackclient/default.nix b/pkgs/development/python-modules/slackclient/default.nix index b2578d5dd63d..571398b783dc 100644 --- a/pkgs/development/python-modules/slackclient/default.nix +++ b/pkgs/development/python-modules/slackclient/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchFromGitHub , aiohttp @@ -49,7 +49,7 @@ buildPythonPackage rec { responses ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A client for Slack, which supports the Slack Web API and Real Time Messaging (RTM) API"; homepage = "https://github.com/slackapi/python-slackclient"; license = licenses.mit; diff --git a/pkgs/development/python-modules/sleekxmpp/default.nix b/pkgs/development/python-modules/sleekxmpp/default.nix index 426019fc8a97..e6d5e59a80e7 100644 --- a/pkgs/development/python-modules/sleekxmpp/default.nix +++ b/pkgs/development/python-modules/sleekxmpp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage, dns, pyasn1 }: +{ lib, stdenv, fetchPypi, buildPythonPackage, dns, pyasn1 }: buildPythonPackage rec { pname = "sleekxmpp"; @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "d213c1de71d92505f95ced0460ee0f84fdc4ddcacb7d7dd343739ed4028e5569"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "XMPP library for Python"; license = licenses.mit; homepage = "http://sleekxmpp.com/"; diff --git a/pkgs/development/python-modules/slicer/default.nix b/pkgs/development/python-modules/slicer/default.nix index 8711055766c6..b5521f415d7b 100644 --- a/pkgs/development/python-modules/slicer/default.nix +++ b/pkgs/development/python-modules/slicer/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , isPy27 @@ -19,7 +19,7 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook pandas pytorch ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Wraps tensor-like objects and provides a uniform slicing interface via __getitem__"; homepage = "https://github.com/interpretml/slicer"; license = licenses.mit; diff --git a/pkgs/development/python-modules/slicerator/default.nix b/pkgs/development/python-modules/slicerator/default.nix index 45d406f560e6..396692200039 100644 --- a/pkgs/development/python-modules/slicerator/default.nix +++ b/pkgs/development/python-modules/slicerator/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , python @@ -23,7 +23,7 @@ buildPythonPackage rec { # run_tests.py not packaged with pypi release doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/soft-matter/slicerator"; description = "A lazy-loading, fancy-sliceable iterable"; license = licenses.bsdOriginal; diff --git a/pkgs/development/python-modules/slither-analyzer/default.nix b/pkgs/development/python-modules/slither-analyzer/default.nix index 19677a71eca3..deb12817a7bd 100644 --- a/pkgs/development/python-modules/slither-analyzer/default.nix +++ b/pkgs/development/python-modules/slither-analyzer/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "slither-analyzer"; - version = "0.6.14"; + version = "0.7.0"; disabled = pythonOlder "3.6"; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "79f5098d27c149ca9cce2b8008ed29e2e0c8cee8fa3414c7e5455cb73c90a9a8"; + sha256 = "10r479xidgxvas4wb0z6injp59jrn7rfq8d7bxlcalc2dy4mawr0"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/python-modules/slixmpp/default.nix b/pkgs/development/python-modules/slixmpp/default.nix index 2fd7d92e3d7c..012a49eb3236 100644 --- a/pkgs/development/python-modules/slixmpp/default.nix +++ b/pkgs/development/python-modules/slixmpp/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "slixmpp"; - version = "1.5.2"; + version = "1.6.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "0c5g4r5c6zm5fgvk6dd0dbx9gl3ws2swajc5knlacnpfykwzp5b4"; + sha256 = "0jamly1jv31ragpv8yn52av1m48iwl4i7f9knb67vmk8c22rjdwa"; }; patches = [ diff --git a/pkgs/development/python-modules/slob/default.nix b/pkgs/development/python-modules/slob/default.nix index 9e6ba2ff6350..a7520c62a62c 100644 --- a/pkgs/development/python-modules/slob/default.nix +++ b/pkgs/development/python-modules/slob/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchFromGitHub , isPy3k @@ -24,7 +24,7 @@ buildPythonPackage { ${python.interpreter} -m unittest slob ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/itkach/slob/"; description = "Reference implementation of the slob (sorted list of blobs) format"; license = licenses.gpl3; diff --git a/pkgs/development/python-modules/slowaes/default.nix b/pkgs/development/python-modules/slowaes/default.nix index f9175e507b46..5d738fea57e0 100644 --- a/pkgs/development/python-modules/slowaes/default.nix +++ b/pkgs/development/python-modules/slowaes/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , isPy3k @@ -15,7 +15,7 @@ buildPythonPackage rec { disabled = isPy3k; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://code.google.com/p/slowaes/"; description = "AES implemented in pure python"; license = with licenses; [ asl20 ]; diff --git a/pkgs/development/python-modules/smart_open/default.nix b/pkgs/development/python-modules/smart_open/default.nix index ba57d081658a..3a1c890f0481 100644 --- a/pkgs/development/python-modules/smart_open/default.nix +++ b/pkgs/development/python-modules/smart_open/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "smart_open"; - version = "4.0.1"; + version = "4.1.0"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "49396d86de8e0d609ec40422c59f837dd944dcdf727feed6f2ff8cbdc0e3bc8e"; + sha256 = "26af5c1a3f2b76aab8c3200310f0fc783790ec5a231ffeec102e620acdd6262e"; }; # nixpkgs version of moto is >=1.2.0, remove version pin to fix build diff --git a/pkgs/development/python-modules/smartdc/default.nix b/pkgs/development/python-modules/smartdc/default.nix index 2fe9926cab9a..0b36a7e9f6e7 100644 --- a/pkgs/development/python-modules/smartdc/default.nix +++ b/pkgs/development/python-modules/smartdc/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , requests @@ -16,7 +16,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests http_signature ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Joyent SmartDataCenter CloudAPI connector using http-signature authentication via Requests"; homepage = "https://github.com/atl/py-smartdc"; license = licenses.mit; diff --git a/pkgs/development/python-modules/smartypants/default.nix b/pkgs/development/python-modules/smartypants/default.nix index 71ff2037de89..a497f3db413b 100644 --- a/pkgs/development/python-modules/smartypants/default.nix +++ b/pkgs/development/python-modules/smartypants/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchhg , isPyPy @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "1cmzz44d2hm6y8jj2xcq1wfr26760gi7iq92ha8xbhb1axzd7nq6"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Python with the SmartyPants"; homepage = "https://bitbucket.org/livibetter/smartypants.py"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/smbus-cffi/default.nix b/pkgs/development/python-modules/smbus-cffi/default.nix index b762730914b5..6715cfd60d95 100644 --- a/pkgs/development/python-modules/smbus-cffi/default.nix +++ b/pkgs/development/python-modules/smbus-cffi/default.nix @@ -42,5 +42,6 @@ buildPythonPackage rec { homepage = "https://github.com/bivab/smbus-cffi"; license = licenses.gpl2; maintainers = with maintainers; [ mic92 ]; + platforms = platforms.linux; }; } diff --git a/pkgs/development/python-modules/snakeviz/default.nix b/pkgs/development/python-modules/snakeviz/default.nix index a34996b8734c..2c54f65d9c35 100644 --- a/pkgs/development/python-modules/snakeviz/default.nix +++ b/pkgs/development/python-modules/snakeviz/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage, tornado }: +{ lib, stdenv, fetchPypi, buildPythonPackage, tornado }: buildPythonPackage rec { pname = "snakeviz"; @@ -13,7 +13,7 @@ buildPythonPackage rec { doCheck = false; propagatedBuildInputs = [ tornado ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Browser based viewer for profiling data"; homepage = "https://jiffyclub.github.io/snakeviz"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/snapcast/default.nix b/pkgs/development/python-modules/snapcast/default.nix index 93d7d1d9d9cf..8446683cb1aa 100644 --- a/pkgs/development/python-modules/snapcast/default.nix +++ b/pkgs/development/python-modules/snapcast/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy3k, pytest +{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k, pytest , construct }: buildPythonPackage rec { @@ -19,7 +19,7 @@ buildPythonPackage rec { # no checks from Pypi - https://github.com/happyleavesaoc/python-snapcast/issues/23 doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Control Snapcast, a multi-room synchronous audio solution"; homepage = "https://github.com/happyleavesaoc/python-snapcast/"; license = licenses.mit; diff --git a/pkgs/development/python-modules/snappergui/default.nix b/pkgs/development/python-modules/snappergui/default.nix index ff274c1ba8b3..d63390185a98 100644 --- a/pkgs/development/python-modules/snappergui/default.nix +++ b/pkgs/development/python-modules/snappergui/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchgit , pygobject3 @@ -20,7 +20,7 @@ buildPythonPackage { propagatedBuildInputs = [ pygobject3 dbus-python ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/ricardomv/snapper-gui"; description = "Graphical frontend for snapper"; license = licenses.gpl2; diff --git a/pkgs/development/python-modules/snapshottest/default.nix b/pkgs/development/python-modules/snapshottest/default.nix new file mode 100644 index 000000000000..b20f9afff9e6 --- /dev/null +++ b/pkgs/development/python-modules/snapshottest/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchPypi +, fastdiff +, six +, termcolor +, pytestCheckHook +, pytest-cov +, django +}: + +buildPythonPackage rec { + pname = "snapshottest"; + version = "0.6.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0g35ggqw4jd9zmazw55kj6gfjdghv49qx4jw5q231qyqj8fzijmv"; + }; + + propagatedBuildInputs = [ fastdiff six termcolor ]; + + checkInputs = [ django pytestCheckHook pytest-cov ]; + + pythonImportsCheck = [ "snapshottest" ]; + + meta = with lib; { + description = "Snapshot testing for pytest, unittest, Django, and Nose"; + homepage = "https://github.com/syrusakbary/snapshottest"; + license = licenses.mit; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/development/python-modules/snowballstemmer/default.nix b/pkgs/development/python-modules/snowballstemmer/default.nix index c546fefcf503..3364470da1b3 100644 --- a/pkgs/development/python-modules/snowballstemmer/default.nix +++ b/pkgs/development/python-modules/snowballstemmer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, PyStemmer, fetchPypi }: +{ lib, stdenv, buildPythonPackage, PyStemmer, fetchPypi }: buildPythonPackage rec { pname = "snowballstemmer"; @@ -14,7 +14,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ PyStemmer ]; - meta = with stdenv.lib; { + meta = with lib; { description = "16 stemmer algorithms (15 + Poerter English stemmer) generated from Snowball algorithms"; homepage = "http://sigal.saimon.org/en/latest/index.html"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/socksipy-branch/default.nix b/pkgs/development/python-modules/socksipy-branch/default.nix index e17f38cb50dd..ca9d8707ac63 100644 --- a/pkgs/development/python-modules/socksipy-branch/default.nix +++ b/pkgs/development/python-modules/socksipy-branch/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi }: @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "01l41v4g7fy9fzvinmjxy6zcbhgqaif8dhdqm4w90fwcw9h51a8p"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://code.google.com/p/socksipy-branch/"; description = "This Python module allows you to create TCP connections through a SOCKS proxy without any special effort"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/somajo/default.nix b/pkgs/development/python-modules/somajo/default.nix index c0b8aaca24fc..bd351b5e86fa 100644 --- a/pkgs/development/python-modules/somajo/default.nix +++ b/pkgs/development/python-modules/somajo/default.nix @@ -1,4 +1,4 @@ -{ pkgs, stdenv, fetchFromGitHub, buildPythonPackage, isPy3k, regex }: +{ pkgs, lib, stdenv, fetchFromGitHub, buildPythonPackage, isPy3k, regex }: buildPythonPackage rec { pname = "SoMaJo"; @@ -14,7 +14,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ regex ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Tokenizer and sentence splitter for German and English web texts"; homepage = "https://github.com/tsproisl/SoMaJo"; license = licenses.gpl3; diff --git a/pkgs/development/python-modules/sopel/default.nix b/pkgs/development/python-modules/sopel/default.nix index 706175dfaad3..095c0917e596 100644 --- a/pkgs/development/python-modules/sopel/default.nix +++ b/pkgs/development/python-modules/sopel/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPyPy +{ lib, stdenv, buildPythonPackage, fetchPypi, isPyPy , dnspython , geoip2 , ipython @@ -52,7 +52,7 @@ buildPythonPackage rec { popd ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Simple and extensible IRC bot"; homepage = "http://sopel.chat"; license = licenses.efl20; diff --git a/pkgs/development/python-modules/sorl_thumbnail/default.nix b/pkgs/development/python-modules/sorl_thumbnail/default.nix index 03fbc638f160..e918a1aee3bc 100644 --- a/pkgs/development/python-modules/sorl_thumbnail/default.nix +++ b/pkgs/development/python-modules/sorl_thumbnail/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , isPy27 @@ -19,7 +19,7 @@ buildPythonPackage rec { # Disabled due to an improper configuration error when tested against django. This looks like something broken in the test cases for sorl. doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://sorl-thumbnail.readthedocs.org/en/latest/"; description = "Thumbnails for Django"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/sortedcollections/default.nix b/pkgs/development/python-modules/sortedcollections/default.nix index 3742c625205c..7bdeeffc0869 100644 --- a/pkgs/development/python-modules/sortedcollections/default.nix +++ b/pkgs/development/python-modules/sortedcollections/default.nix @@ -1,27 +1,31 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage -, fetchPypi +, fetchFromGitHub +, pytestCheckHook , sortedcontainers }: buildPythonPackage rec { pname = "sortedcollections"; - version = "1.2.1"; + version = "1.2.3"; - src = fetchPypi { - inherit pname version; - sha256 = "0sihzm5aqz7r3irh4jn6rzicb7lf81d27z7vl6kaslnhwcsizhsq"; + src = fetchFromGitHub { + owner = "grantjenks"; + repo = "python-sortedcollections"; + rev = "v${version}"; + sha256 = "06ifkbhkj5fpsafibw0fs7b778g7q0gd03crvbjk04k0f3wjxc5z"; }; propagatedBuildInputs = [ sortedcontainers ]; - # No tests in PyPi tarball - doCheck = false; + checkInputs = [ pytestCheckHook ]; - meta = with stdenv.lib; { + pythonImportsCheck = [ "sortedcollections" ]; + + meta = with lib; { description = "Python Sorted Collections"; homepage = "http://www.grantjenks.com/docs/sortedcollections/"; - license = licenses.asl20; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; }; - } diff --git a/pkgs/development/python-modules/spacy/models.nix b/pkgs/development/python-modules/spacy/models.nix index c4a314ea4742..4279383ae6b1 100644 --- a/pkgs/development/python-modules/spacy/models.nix +++ b/pkgs/development/python-modules/spacy/models.nix @@ -16,7 +16,7 @@ let pythonImportsCheck = [ pname ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Models for the spaCy NLP library"; homepage = "https://github.com/explosion/spacy-models"; license = licenses.${license}; diff --git a/pkgs/development/python-modules/spark_parser/default.nix b/pkgs/development/python-modules/spark_parser/default.nix index b513a9f33c8c..cfb641ddcfb5 100644 --- a/pkgs/development/python-modules/spark_parser/default.nix +++ b/pkgs/development/python-modules/spark_parser/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , nose @@ -17,7 +17,7 @@ buildPythonPackage rec { buildInputs = [ nose ]; propagatedBuildInputs = [ click ]; - meta = with stdenv.lib; { + meta = with lib; { description = ''An Early-Algorithm Context-free grammar Parser''; homepage = "https://github.com/rocky/python-spark"; license = licenses.mit; diff --git a/pkgs/development/python-modules/sparqlwrapper/default.nix b/pkgs/development/python-modules/sparqlwrapper/default.nix index fe400630507b..b97cbee2a5fe 100644 --- a/pkgs/development/python-modules/sparqlwrapper/default.nix +++ b/pkgs/development/python-modules/sparqlwrapper/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , six @@ -27,7 +27,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six isodate pyparsing html5lib keepalive ]; - meta = with stdenv.lib; { + meta = with lib; { description = "This is a wrapper around a SPARQL service. It helps in creating the query URI and, possibly, convert the result into a more manageable format"; homepage = "http://rdflib.github.io/sparqlwrapper"; license = licenses.w3c; diff --git a/pkgs/development/python-modules/speaklater/default.nix b/pkgs/development/python-modules/speaklater/default.nix index 03b525147bfd..efb0908dc5fc 100644 --- a/pkgs/development/python-modules/speaklater/default.nix +++ b/pkgs/development/python-modules/speaklater/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi }: @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "1ab5dbfzzgz6cnz4xlwx79gz83id4bhiw67k1cgqrlzfs0va7zjr"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Implements a lazy string for python useful for use with gettext"; homepage = "https://github.com/mitsuhiko/speaklater"; license = licenses.bsd0; diff --git a/pkgs/development/python-modules/spglib/default.nix b/pkgs/development/python-modules/spglib/default.nix index 37b9c24a22e1..08bbb34156bf 100644 --- a/pkgs/development/python-modules/spglib/default.nix +++ b/pkgs/development/python-modules/spglib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, fetchpatch, numpy, nose, pyyaml }: +{ lib, stdenv, buildPythonPackage, fetchPypi, fetchpatch, numpy, nose, pyyaml }: buildPythonPackage rec { pname = "spglib"; @@ -13,7 +13,7 @@ buildPythonPackage rec { checkInputs = [ nose pyyaml ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Python bindings for C library for finding and handling crystal symmetries"; homepage = "https://atztogo.github.io/spglib"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/sphinx_pypi_upload/default.nix b/pkgs/development/python-modules/sphinx_pypi_upload/default.nix index 6d353cc63c96..77f283795db5 100644 --- a/pkgs/development/python-modules/sphinx_pypi_upload/default.nix +++ b/pkgs/development/python-modules/sphinx_pypi_upload/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi }: @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "5f919a47ce7a7e6028dba809de81ae1297ac192347cf6fc54efca919d4865159"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Setuptools command for uploading Sphinx documentation to PyPI"; homepage = "https://bitbucket.org/jezdez/sphinx-pypi-upload/"; license = licenses.bsd0; diff --git a/pkgs/development/python-modules/sphinx_rtd_theme/default.nix b/pkgs/development/python-modules/sphinx_rtd_theme/default.nix index bb9fcb293da7..11e3c2a87e93 100644 --- a/pkgs/development/python-modules/sphinx_rtd_theme/default.nix +++ b/pkgs/development/python-modules/sphinx_rtd_theme/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , sphinx @@ -23,7 +23,7 @@ buildPythonPackage rec { py.test ''; - meta = with stdenv.lib; { + meta = with lib; { description = "ReadTheDocs.org theme for Sphinx"; homepage = "https://github.com/snide/sphinx_rtd_theme/"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/sphinxcontrib-applehelp/default.nix b/pkgs/development/python-modules/sphinxcontrib-applehelp/default.nix index 95aa0c5fdeb8..e2bfc5bdaa55 100644 --- a/pkgs/development/python-modules/sphinxcontrib-applehelp/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-applehelp/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , isPy27 @@ -18,7 +18,7 @@ buildPythonPackage rec { # Check is disabled due to circular dependency of sphinx doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "sphinxcontrib-applehelp is a sphinx extension which outputs Apple help books"; homepage = "http://sphinx-doc.org/"; license = licenses.bsd0; diff --git a/pkgs/development/python-modules/sphinxcontrib-autoapi/default.nix b/pkgs/development/python-modules/sphinxcontrib-autoapi/default.nix index 03ac746137f7..6822c0f153d3 100644 --- a/pkgs/development/python-modules/sphinxcontrib-autoapi/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-autoapi/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , pythonOlder @@ -32,7 +32,7 @@ buildPythonPackage rec { pytest ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/readthedocs/sphinx-autoapi"; description = "Provides 'autodoc' style documentation"; longDescription = "Sphinx AutoAPI provides 'autodoc' style documentation for multiple programming languages without needing to load, run, or import the project being documented."; diff --git a/pkgs/development/python-modules/sphinxcontrib-blockdiag/default.nix b/pkgs/development/python-modules/sphinxcontrib-blockdiag/default.nix index b8f23afabcd5..a2603b876e5e 100644 --- a/pkgs/development/python-modules/sphinxcontrib-blockdiag/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-blockdiag/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , python @@ -26,7 +26,7 @@ buildPythonPackage rec { ${python.interpreter} -m unittest discover -s tests ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Sphinx blockdiag extension"; homepage = "https://github.com/blockdiag/sphinxcontrib-blockdiag"; maintainers = with maintainers; [ nand0p ]; diff --git a/pkgs/development/python-modules/sphinxcontrib-devhelp/default.nix b/pkgs/development/python-modules/sphinxcontrib-devhelp/default.nix index 01d34dd0ae62..7398cbc433ff 100644 --- a/pkgs/development/python-modules/sphinxcontrib-devhelp/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-devhelp/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi }: @@ -16,7 +16,7 @@ buildPythonPackage rec { # Check is disabled due to circular dependency of sphinx doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "sphinxcontrib-devhelp is a sphinx extension which outputs Devhelp document."; homepage = "http://sphinx-doc.org/"; license = licenses.bsd0; diff --git a/pkgs/development/python-modules/sphinxcontrib-htmlhelp/default.nix b/pkgs/development/python-modules/sphinxcontrib-htmlhelp/default.nix index 8eec8ab3267a..150840f19b40 100644 --- a/pkgs/development/python-modules/sphinxcontrib-htmlhelp/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-htmlhelp/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , isPy27 @@ -18,7 +18,7 @@ buildPythonPackage rec { # Check is disabled due to circular dependency of sphinx doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "sphinxcontrib-htmlhelp is a sphinx extension which ..."; homepage = "http://sphinx-doc.org/"; license = licenses.bsd0; diff --git a/pkgs/development/python-modules/sphinxcontrib-jsmath/default.nix b/pkgs/development/python-modules/sphinxcontrib-jsmath/default.nix index 9b1d93287b03..609799f18647 100644 --- a/pkgs/development/python-modules/sphinxcontrib-jsmath/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-jsmath/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , isPy27 @@ -18,7 +18,7 @@ buildPythonPackage rec { # Check is disabled due to circular dependency of sphinx doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "sphinxcontrib-jsmath is a sphinx extension which renders display math in HTML via JavaScript."; homepage = "http://sphinx-doc.org/"; license = licenses.bsd0; diff --git a/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix b/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix index bd62d2ef4f8f..6375bdab3c24 100644 --- a/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , isPy27 @@ -24,7 +24,7 @@ buildPythonPackage rec { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/ikalnytskyi/sphinxcontrib-openapi"; description = "OpenAPI (fka Swagger) spec renderer for Sphinx"; license = licenses.bsd0; diff --git a/pkgs/development/python-modules/sphinxcontrib-qthelp/default.nix b/pkgs/development/python-modules/sphinxcontrib-qthelp/default.nix index f8e826adf1f3..adf02860d127 100644 --- a/pkgs/development/python-modules/sphinxcontrib-qthelp/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-qthelp/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , isPy27 @@ -18,7 +18,7 @@ buildPythonPackage rec { # Check is disabled due to circular dependency of sphinx doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "sphinxcontrib-qthelp is a sphinx extension which outputs QtHelp document."; homepage = "http://sphinx-doc.org/"; license = licenses.bsd0; diff --git a/pkgs/development/python-modules/sphinxcontrib-serializinghtml/default.nix b/pkgs/development/python-modules/sphinxcontrib-serializinghtml/default.nix index 05f2749c49d6..52ebe15c1b62 100644 --- a/pkgs/development/python-modules/sphinxcontrib-serializinghtml/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-serializinghtml/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , isPy27 @@ -18,7 +18,7 @@ buildPythonPackage rec { # Check is disabled due to circular dependency of sphinx doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "sphinxcontrib-serializinghtml is a sphinx extension which outputs \"serialized\" HTML files (json and pickle)."; homepage = "http://sphinx-doc.org/"; license = licenses.bsd0; diff --git a/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix b/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix index 44e19997569c..a3054f341450 100644 --- a/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { # No tests included doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Sphinx spelling extension"; homepage = "https://bitbucket.org/dhellmann/sphinxcontrib-spelling"; maintainers = with maintainers; [ nand0p ]; diff --git a/pkgs/development/python-modules/sphinxcontrib_httpdomain/default.nix b/pkgs/development/python-modules/sphinxcontrib_httpdomain/default.nix index 9f042efcc97b..ee652b42d8a1 100644 --- a/pkgs/development/python-modules/sphinxcontrib_httpdomain/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib_httpdomain/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , sphinx @@ -19,7 +19,7 @@ buildPythonPackage rec { # https://bitbucket.org/pypa/setuptools/issue/137/typeerror-unorderable-types-str-nonetype doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Provides a Sphinx domain for describing RESTful HTTP APIs"; homepage = "https://bitbucket.org/birkenfeld/sphinx-contrib"; license = licenses.bsd0; diff --git a/pkgs/development/python-modules/sphinxcontrib_newsfeed/default.nix b/pkgs/development/python-modules/sphinxcontrib_newsfeed/default.nix index 93c53581c4fa..2d56b57df9be 100644 --- a/pkgs/development/python-modules/sphinxcontrib_newsfeed/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib_newsfeed/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , sphinx @@ -15,7 +15,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ sphinx ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Extension for adding a simple Blog, News or Announcements section to a Sphinx website"; homepage = "https://bitbucket.org/prometheus/sphinxcontrib-newsfeed"; license = licenses.bsd2; diff --git a/pkgs/development/python-modules/sphinxcontrib_plantuml/default.nix b/pkgs/development/python-modules/sphinxcontrib_plantuml/default.nix index ce65822e3b1f..db8997dfd216 100644 --- a/pkgs/development/python-modules/sphinxcontrib_plantuml/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib_plantuml/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , sphinx @@ -19,7 +19,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ sphinx plantuml ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Provides a Sphinx domain for embedding UML diagram with PlantUML"; homepage = "https://github.com/sphinx-contrib/plantuml/"; license = with licenses; [ bsd2 ]; diff --git a/pkgs/development/python-modules/spyder-kernels/default.nix b/pkgs/development/python-modules/spyder-kernels/default.nix index 8655d9cbbd5d..e0a8d6b9c18a 100644 --- a/pkgs/development/python-modules/spyder-kernels/default.nix +++ b/pkgs/development/python-modules/spyder-kernels/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, cloudpickle, ipykernel, wurlitzer, +{ lib, stdenv, buildPythonPackage, fetchPypi, cloudpickle, ipykernel, wurlitzer, jupyter_client, pyzmq }: buildPythonPackage rec { @@ -21,7 +21,7 @@ buildPythonPackage rec { # No tests doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Jupyter kernels for Spyder's console"; homepage = "https://docs.spyder-ide.org/current/ipythonconsole.html"; downloadPage = "https://github.com/spyder-ide/spyder-kernels/releases"; diff --git a/pkgs/development/python-modules/spyder/3.nix b/pkgs/development/python-modules/spyder/3.nix index cac20ad6fce5..34d59d0eb227 100644 --- a/pkgs/development/python-modules/spyder/3.nix +++ b/pkgs/development/python-modules/spyder/3.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, jedi, pycodestyle, +{ lib, stdenv, buildPythonPackage, fetchFromGitHub, jedi, pycodestyle, psutil, pyflakes, rope, pylint, keyring, numpydoc, qtconsole, qtawesome, nbconvert, mccabe, pyopengl, cloudpickle, pygments, spyder-kernels_0_5, qtpy, pyzmq, chardet, pyqtwebengine @@ -31,7 +31,7 @@ buildPythonPackage rec { substituteInPlace setup.py --replace "pyqt5<5.13" "pyqt5" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Library providing a scientific python development environment"; longDescription = '' Spyder (previously known as Pydee) is a powerful interactive development diff --git a/pkgs/development/python-modules/spyder/default.nix b/pkgs/development/python-modules/spyder/default.nix index f0c4ea50e72e..de1b8123dd97 100644 --- a/pkgs/development/python-modules/spyder/default.nix +++ b/pkgs/development/python-modules/spyder/default.nix @@ -1,8 +1,8 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy27, makeDesktopItem, intervaltree, jedi, pycodestyle, +{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27, makeDesktopItem, intervaltree, jedi, pycodestyle, psutil, pyflakes, rope, numpy, scipy, matplotlib, pylint, keyring, numpydoc, qtconsole, qtawesome, nbconvert, mccabe, pyopengl, cloudpickle, pygments, spyder-kernels, qtpy, pyzmq, chardet, qdarkstyle, watchdog, python-language-server -, pyqtwebengine, atomicwrites, pyxdg, diff-match-patch +, pyqtwebengine, atomicwrites, pyxdg, diff-match-patch, three-merge, pyls-black, pyls-spyder }: buildPythonPackage rec { @@ -22,7 +22,7 @@ buildPythonPackage rec { intervaltree jedi pycodestyle psutil pyflakes rope numpy scipy matplotlib pylint keyring numpydoc qtconsole qtawesome nbconvert mccabe pyopengl cloudpickle spyder-kernels pygments qtpy pyzmq chardet pyqtwebengine qdarkstyle watchdog python-language-server - atomicwrites pyxdg diff-match-patch + atomicwrites pyxdg diff-match-patch three-merge pyls-black pyls-spyder ]; # There is no test for spyder @@ -51,7 +51,7 @@ buildPythonPackage rec { postInstall = '' # add Python libs to env so Spyder subprocesses # created to run compute kernels don't fail with ImportErrors - wrapProgram $out/bin/spyder3 --prefix PYTHONPATH : "$PYTHONPATH" + wrapProgram $out/bin/spyder --prefix PYTHONPATH : "$PYTHONPATH" # Create desktop item mkdir -p $out/share/icons @@ -65,7 +65,7 @@ buildPythonPackage rec { makeWrapperArgs+=("''${qtWrapperArgs[@]}") ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Scientific python development environment"; longDescription = '' Spyder (previously known as Pydee) is a powerful interactive development diff --git a/pkgs/development/python-modules/sqlalchemy-imageattach/default.nix b/pkgs/development/python-modules/sqlalchemy-imageattach/default.nix index 35e6854137e3..6a8c910cfce6 100644 --- a/pkgs/development/python-modules/sqlalchemy-imageattach/default.nix +++ b/pkgs/development/python-modules/sqlalchemy-imageattach/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , pytest , Wand @@ -32,7 +32,7 @@ buildPythonPackage rec { doCheck = !isPyPy; # failures due to sqla version mismatch - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/dahlia/sqlalchemy-imageattach"; description = "SQLAlchemy extension for attaching images to entity objects"; license = licenses.mit; diff --git a/pkgs/development/python-modules/sqlalchemy-migrate/default.nix b/pkgs/development/python-modules/sqlalchemy-migrate/default.nix index c64d8f61f79c..bb757ab45b0a 100644 --- a/pkgs/development/python-modules/sqlalchemy-migrate/default.nix +++ b/pkgs/development/python-modules/sqlalchemy-migrate/default.nix @@ -1,15 +1,15 @@ -{ stdenv, buildPythonPackage, fetchPypi, fetchpatch, python +{ lib, stdenv, buildPythonPackage, fetchPypi, fetchpatch, python , unittest2, scripttest, pytz, mock , testtools, pbr, tempita, decorator, sqlalchemy , six, sqlparse, testrepository }: buildPythonPackage rec { pname = "sqlalchemy-migrate"; - version = "0.12.0"; + version = "0.13.0"; src = fetchPypi { inherit pname version; - sha256 = "1bngmbcry97kwhrxwm0d74zg9qg7gmiws6rd78xshyfgpcqdmylc"; + sha256 = "1y0lcqii7b4vp7yh9dyxrl4i77hi8jkkw7d06mgdw2h458ljxh0b"; }; # See: https://review.openstack.org/#/c/608382/ @@ -40,7 +40,7 @@ buildPythonPackage rec { ${python.interpreter} setup.py test ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/openstack/sqlalchemy-migrate"; description = "Schema migration tools for SQLAlchemy"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/sqlite-utils/default.nix b/pkgs/development/python-modules/sqlite-utils/default.nix index 79c5cf25e303..99a6369de559 100644 --- a/pkgs/development/python-modules/sqlite-utils/default.nix +++ b/pkgs/development/python-modules/sqlite-utils/default.nix @@ -15,12 +15,12 @@ buildPythonPackage rec { pname = "sqlite-utils"; - version = "3.1"; + version = "3.2"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "53950eb89f77066d6caf553c52ec01701a8bebbaffa9e0a627df3f229ca8720f"; + sha256 = "83d60e0f0de5e4a367e2ad414dc008c0602e2af35325b09e41c7b2c69808dcc1"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/sqlite3dbm/default.nix b/pkgs/development/python-modules/sqlite3dbm/default.nix index 66a1200eeb2a..1d0b3f15c3fc 100644 --- a/pkgs/development/python-modules/sqlite3dbm/default.nix +++ b/pkgs/development/python-modules/sqlite3dbm/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , isPy3k @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "4721607e0b817b89efdba7e79cab881a03164b94777f4cf796ad5dd59a7612c5"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "sqlite-backed dictionary"; homepage = "https://github.com/Yelp/sqlite3dbm"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/sqlmap/default.nix b/pkgs/development/python-modules/sqlmap/default.nix index fe17c909efac..940dbdab9894 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.11"; + version = "1.4.12"; src = fetchPypi { inherit pname version; - sha256 = "5c91d13f090c8e891201c7b924cc2b2feccf12042b42075a5623b4986b9c9ee7"; + sha256 = "166adazdrv92azx4p0qng0cm3va6i301vfsr4yyf0azj3sdg0waj"; }; postPatch = '' @@ -26,6 +26,8 @@ buildPythonPackage rec { # No tests in archive doCheck = false; + pythonImportsCheck = [ "sqlmap" ]; + meta = with lib; { homepage = "http://sqlmap.org"; license = licenses.gpl2; diff --git a/pkgs/development/python-modules/sqlobject/default.nix b/pkgs/development/python-modules/sqlobject/default.nix index ccd4190bbfde..ccbc6659fe3d 100644 --- a/pkgs/development/python-modules/sqlobject/default.nix +++ b/pkgs/development/python-modules/sqlobject/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , pytest @@ -20,7 +20,7 @@ buildPythonPackage rec { checkInputs = [ pytest ]; propagatedBuildInputs = [ FormEncode PasteDeploy paste pydispatcher ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Object Relational Manager for providing an object interface to your database"; homepage = "http://www.sqlobject.org/"; license = licenses.lgpl21; diff --git a/pkgs/development/python-modules/squaremap/default.nix b/pkgs/development/python-modules/squaremap/default.nix index 4927d8c725d4..c17a88435dd6 100644 --- a/pkgs/development/python-modules/squaremap/default.nix +++ b/pkgs/development/python-modules/squaremap/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , isPy3k , fetchPypi @@ -19,7 +19,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six wxPython ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Hierarchic visualization control for wxPython"; homepage = "https://launchpad.net/squaremap"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/srptools/default.nix b/pkgs/development/python-modules/srptools/default.nix index 9fca318db0b9..f130009d30d6 100644 --- a/pkgs/development/python-modules/srptools/default.nix +++ b/pkgs/development/python-modules/srptools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, six, pytest, pytestrunner }: +{ lib, stdenv, buildPythonPackage, fetchPypi, six, pytest, pytestrunner }: buildPythonPackage rec { pname = "srptools"; @@ -13,7 +13,7 @@ buildPythonPackage rec { checkInputs = [ pytest pytestrunner ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Python-Tools to implement Secure Remote Password (SRP) authentication"; homepage = "https://github.com/idlesign/srptools"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/srsly/default.nix b/pkgs/development/python-modules/srsly/default.nix index ee53af641a05..42320e50fa8d 100644 --- a/pkgs/development/python-modules/srsly/default.nix +++ b/pkgs/development/python-modules/srsly/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "srsly" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Modern high-performance serialization utilities for Python"; homepage = "https://github.com/explosion/srsly"; license = licenses.mit; diff --git a/pkgs/development/python-modules/srvlookup/default.nix b/pkgs/development/python-modules/srvlookup/default.nix index 6cbdc81ef86d..c399ee760fd6 100644 --- a/pkgs/development/python-modules/srvlookup/default.nix +++ b/pkgs/development/python-modules/srvlookup/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage +{ lib, stdenv, fetchPypi, buildPythonPackage , dnspython , mock, nose }: @@ -15,7 +15,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ dnspython ]; checkInputs = [ mock nose ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/gmr/srvlookup"; license = [ licenses.bsd3 ]; description = "A small wrapper for dnspython to return SRV records for a given host, protocol, and domain name as a list of namedtuples."; diff --git a/pkgs/development/python-modules/ssdeep/default.nix b/pkgs/development/python-modules/ssdeep/default.nix index fc6b548ed5b8..8300c3ec2f65 100644 --- a/pkgs/development/python-modules/ssdeep/default.nix +++ b/pkgs/development/python-modules/ssdeep/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , pkgs @@ -24,7 +24,7 @@ buildPythonPackage rec { # tests repository does not include required files doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/DinoTools/python-ssdeep"; description = "Python wrapper for the ssdeep library"; license = licenses.lgpl3; diff --git a/pkgs/development/python-modules/ssdp/default.nix b/pkgs/development/python-modules/ssdp/default.nix index 3c1d2c9976fa..82ea4b066a3c 100644 --- a/pkgs/development/python-modules/ssdp/default.nix +++ b/pkgs/development/python-modules/ssdp/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , isPy27 @@ -23,7 +23,7 @@ buildPythonPackage rec { # test suite uses new async primitives doCheck = !isPy27; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/codingjoe/ssdp"; description = "Python asyncio library for Simple Service Discovery Protocol (SSDP)."; license = licenses.mit; diff --git a/pkgs/development/python-modules/sseclient/default.nix b/pkgs/development/python-modules/sseclient/default.nix index ebc6435bc794..9d944e112fe2 100644 --- a/pkgs/development/python-modules/sseclient/default.nix +++ b/pkgs/development/python-modules/sseclient/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy27 +{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27 , requests, six , backports_unittest-mock, pytestCheckHook, pytestrunner }: @@ -20,7 +20,7 @@ buildPythonPackage rec { # tries to open connection to wikipedia disabledTests = [ "event_stream" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Client library for reading Server Sent Event streams"; homepage = "https://github.com/btubbs/sseclient"; license = licenses.mit; diff --git a/pkgs/development/python-modules/sslib/default.nix b/pkgs/development/python-modules/sslib/default.nix index 0f1edfd31bde..026ac8a30b75 100644 --- a/pkgs/development/python-modules/sslib/default.nix +++ b/pkgs/development/python-modules/sslib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage, isPy3k }: +{ lib, stdenv, fetchPypi, buildPythonPackage, isPy3k }: buildPythonPackage rec { pname = "sslib"; @@ -13,7 +13,7 @@ buildPythonPackage rec { # No tests available doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/jqueiroz/python-sslib"; description = "A Python3 library for sharing secrets"; license = licenses.mit; diff --git a/pkgs/development/python-modules/sslyze/default.nix b/pkgs/development/python-modules/sslyze/default.nix index 24b334ef8822..991f85c900ec 100644 --- a/pkgs/development/python-modules/sslyze/default.nix +++ b/pkgs/development/python-modules/sslyze/default.nix @@ -1,30 +1,30 @@ { lib , fetchFromGitHub -, pytest , buildPythonPackage , nassl , cryptography , typing-extensions , faker +, pytestCheckHook }: buildPythonPackage rec { pname = "sslyze"; - version = "3.0.8"; + version = "3.1.0"; src = fetchFromGitHub { owner = "nabla-c0d3"; repo = pname; rev = version; - sha256 = "06mwzxw6xaqin2gwzcqb9r7qhbyx3k7zcxygxywi2bpxyjv9lq32"; + sha256 = "02p0lgpkfq88dys0dqw0z8bpg9g8pds2lvs9awd9f2w5cb1pwr83"; }; patchPhase = '' substituteInPlace setup.py \ - --replace "cryptography>=2.6,<=2.9" "cryptography" + --replace "cryptography>=2.6,<3.3" "cryptography>=2.6,<4.0" ''; - checkInputs = [ pytest ]; + checkInputs = [ pytestCheckHook ]; checkPhase = '' # Most of the tests are online; hence, applicable tests are listed diff --git a/pkgs/development/python-modules/starlette/default.nix b/pkgs/development/python-modules/starlette/default.nix index ff8a93d335ea..d802a2300035 100644 --- a/pkgs/development/python-modules/starlette/default.nix +++ b/pkgs/development/python-modules/starlette/default.nix @@ -2,25 +2,26 @@ , stdenv , buildPythonPackage , fetchFromGitHub +, isPy27 , aiofiles , graphene , itsdangerous , jinja2 +, python-multipart , pyyaml , requests , ujson -, python-multipart -, pytest -, uvicorn -, isPy27 -, darwin -, databases , aiosqlite +, databases +, pytestCheckHook +, pytest-asyncio +, pytestcov +, typing-extensions +, ApplicationServices }: buildPythonPackage rec { pname = "starlette"; - version = "0.13.8"; disabled = isPy27; @@ -36,22 +37,21 @@ buildPythonPackage rec { graphene itsdangerous jinja2 + python-multipart pyyaml requests ujson - uvicorn - python-multipart - databases - ] ++ stdenv.lib.optional stdenv.isDarwin [ darwin.apple_sdk.frameworks.ApplicationServices ]; + ] ++ lib.optional stdenv.isDarwin [ ApplicationServices ]; checkInputs = [ - pytest aiosqlite + databases + pytestCheckHook + typing-extensions ]; - checkPhase = '' - pytest --ignore=tests/test_graphql.py - ''; + pytestFlagsArray = [ "--ignore=tests/test_graphql.py" ]; + pythonImportsCheck = [ "starlette" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/staticjinja/default.nix b/pkgs/development/python-modules/staticjinja/default.nix index cba55e5aca28..d49bae2eab91 100644 --- a/pkgs/development/python-modules/staticjinja/default.nix +++ b/pkgs/development/python-modules/staticjinja/default.nix @@ -1,24 +1,45 @@ { lib -, fetchPypi +, fetchFromGitHub , buildPythonPackage +, isPy27 , docopt , easywatch , jinja2 +, pytestCheckHook +, markdown }: buildPythonPackage rec { pname = "staticjinja"; version = "0.4.0"; - src = fetchPypi { - inherit pname version; - sha256 = "597837899008409359680ee9cd04779639b9c0eb3380b6545025d26a702ba36c"; + disabled = isPy27; # 0.4.0 drops python2 support + + # For some reason, in pypi the tests get disabled when using + # PY_IGNORE_IMPORTMISMATCH, so we just fetch from GitHub + src = fetchFromGitHub { + owner = "staticjinja"; + repo = pname; + rev = version; + sha256 = "0pysk8pzmcg1nfxz8m4i6bvww71w2zg6xp33zgg5vrf8yd2dfx9i"; }; - propagatedBuildInputs = [ jinja2 docopt easywatch ]; + propagatedBuildInputs = [ + jinja2 + docopt + easywatch + ]; - # There are no tests on pypi - doCheck = false; + checkInputs = [ + pytestCheckHook + markdown + ]; + + # Import paths differ by a "build/lib" subdirectory, but the files are + # the same, so we ignore import mismatches. + preCheck = '' + export PY_IGNORE_IMPORTMISMATCH=1 + ''; meta = with lib; { description = "A library and cli tool that makes it easy to build static sites using Jinja2"; @@ -27,4 +48,3 @@ buildPythonPackage rec { maintainers = with maintainers; [ fgaz ]; }; } - diff --git a/pkgs/development/python-modules/statsd/default.nix b/pkgs/development/python-modules/statsd/default.nix index cf376113b3e3..447fed3263c3 100644 --- a/pkgs/development/python-modules/statsd/default.nix +++ b/pkgs/development/python-modules/statsd/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , nose @@ -23,7 +23,7 @@ buildPythonPackage rec { sed -i 's/assert_called_once()/called/' statsd/tests.py ''; - meta = with stdenv.lib; { + meta = with lib; { maintainers = with maintainers; [ domenkozar ]; description = "A simple statsd client"; license = licenses.mit; diff --git a/pkgs/development/python-modules/stdiomask/default.nix b/pkgs/development/python-modules/stdiomask/default.nix new file mode 100644 index 000000000000..8ef59074fc00 --- /dev/null +++ b/pkgs/development/python-modules/stdiomask/default.nix @@ -0,0 +1,26 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "stdiomask"; + version = "0.0.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "19m3p6i7fj7nmkbsjhiha3f2l7d05j9gf9ha2pd0pqfrx9lp1r61"; + }; + + # tests are not published: https://github.com/asweigart/stdiomask/issues/5 + doCheck = false; + pythonImportsCheck = [ "stdiomask" ]; + + meta = with lib; { + description = "Python module for masking passwords"; + homepage = "https://github.com/asweigart/stdiomask"; + license = with licenses; [ gpl3Plus ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/stompclient/default.nix b/pkgs/development/python-modules/stompclient/default.nix index 4cb59cf5f285..17bafbad282e 100644 --- a/pkgs/development/python-modules/stompclient/default.nix +++ b/pkgs/development/python-modules/stompclient/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , isPy3k @@ -20,7 +20,7 @@ buildPythonPackage rec { # XXX: Ran 0 tests in 0.217s - meta = with stdenv.lib; { + meta = with lib; { description = "Lightweight and extensible STOMP messaging client"; homepage = "https://bitbucket.org/hozn/stompclient"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/strict-rfc3339/default.nix b/pkgs/development/python-modules/strict-rfc3339/default.nix index 7f45f326903a..53701999b021 100644 --- a/pkgs/development/python-modules/strict-rfc3339/default.nix +++ b/pkgs/development/python-modules/strict-rfc3339/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi }: +{ lib, stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "strict-rfc3339"; @@ -11,7 +11,7 @@ buildPythonPackage rec { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/danielrichman/strict-rfc3339"; license = licenses.gpl3; description = "Strict, simple, lightweight RFC3339 functions"; diff --git a/pkgs/development/python-modules/strictyaml/default.nix b/pkgs/development/python-modules/strictyaml/default.nix index ee18a6ca6b22..8f383b60b175 100644 --- a/pkgs/development/python-modules/strictyaml/default.nix +++ b/pkgs/development/python-modules/strictyaml/default.nix @@ -7,13 +7,13 @@ }: buildPythonPackage rec { - version = "1.1.1"; + version = "1.3.0"; pname = "strictyaml"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "ea2bb97aacc12fff7df11bd4cb4ae64b1418a0311fbd1611445cc59dc650bdd3"; + sha256 = "f640ae4e6fe761c3ae7138092c3dcb9b5050ec56e9cbac45d8a6b549d7ec973c"; }; propagatedBuildInputs = [ ruamel_yaml python-dateutil ]; diff --git a/pkgs/development/python-modules/stringcase/default.nix b/pkgs/development/python-modules/stringcase/default.nix index 531f1eb92231..10afb5113931 100644 --- a/pkgs/development/python-modules/stringcase/default.nix +++ b/pkgs/development/python-modules/stringcase/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, fetchPypi, stdenv +{ buildPythonPackage, fetchPypi, lib, stdenv }: buildPythonPackage rec { @@ -13,7 +13,7 @@ buildPythonPackage rec { # PyPi package does not include tests. doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/okunishinishi/python-stringcase"; description = "Convert string cases between camel case, pascal case, snake case etc…"; license = licenses.mit; diff --git a/pkgs/development/python-modules/subarulink/default.nix b/pkgs/development/python-modules/subarulink/default.nix new file mode 100644 index 000000000000..5b6362b76a14 --- /dev/null +++ b/pkgs/development/python-modules/subarulink/default.nix @@ -0,0 +1,44 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, aiohttp +, asynctest +, stdiomask +, cryptography +, pytestcov +, pytest-asyncio +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "subarulink"; + version = "0.3.11"; + + src = fetchFromGitHub { + owner = "G-Two"; + repo = pname; + rev = "subaru-v${version}"; + sha256 = "1ink9bhph6blidnfsqwq01grhp7ghacmkd4vzgb9hnhl9l52s1jq"; + }; + + propagatedBuildInputs = [ aiohttp stdiomask ]; + + checkInputs = [ + asynctest + cryptography + pytest-asyncio + pytestcov + pytestCheckHook + ]; + + __darwinAllowLocalNetworking = true; + + pythonImportsCheck = [ "subarulink" ]; + + meta = with lib; { + description = "Python module for interacting with STARLINK-enabled vehicle"; + homepage = "https://github.com/G-Two/subarulink"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/subdownloader/default.nix b/pkgs/development/python-modules/subdownloader/default.nix index c4d57bef0ea9..2dac94ac15d2 100644 --- a/pkgs/development/python-modules/subdownloader/default.nix +++ b/pkgs/development/python-modules/subdownloader/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchurl , mmpython @@ -57,7 +57,7 @@ buildPythonPackage rec { echo '${setup}' > $sourceRoot/setup.py ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Tool for automatic download/upload subtitles for videofiles using fast hashing"; homepage = "https://www.subdownloader.net"; license = licenses.gpl3; diff --git a/pkgs/development/python-modules/suds-jurko/default.nix b/pkgs/development/python-modules/suds-jurko/default.nix index e83448d82cf9..4bf74fe00b4e 100644 --- a/pkgs/development/python-modules/suds-jurko/default.nix +++ b/pkgs/development/python-modules/suds-jurko/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , isPyPy @@ -23,7 +23,7 @@ buildPythonPackage rec { --replace "test_sending_unicode_data" "noop" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Lightweight SOAP client (Jurko's fork)"; homepage = "https://bitbucket.org/jurko/suds"; license = licenses.lgpl3; diff --git a/pkgs/development/python-modules/suds/default.nix b/pkgs/development/python-modules/suds/default.nix index 77f4c731265e..24425fef95f1 100644 --- a/pkgs/development/python-modules/suds/default.nix +++ b/pkgs/development/python-modules/suds/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , isPy3k @@ -16,7 +16,7 @@ buildPythonPackage rec { patches = [ ./suds-0.4-CVE-2013-2217.patch ]; - meta = with stdenv.lib; { + meta = with lib; { # Broken for security issues: # - https://github.com/NixOS/nixpkgs/issues/19678 # - https://lwn.net/Vulnerabilities/559200/ diff --git a/pkgs/development/python-modules/sumo/default.nix b/pkgs/development/python-modules/sumo/default.nix index 504d91212874..e647cd4a9d27 100644 --- a/pkgs/development/python-modules/sumo/default.nix +++ b/pkgs/development/python-modules/sumo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, isPy27 +{ lib, stdenv, buildPythonPackage, fetchFromGitHub, isPy27 , h5py , matplotlib , numpy @@ -33,7 +33,7 @@ buildPythonPackage rec { # tests have type annotations, can only run on 3.5+ doCheck = (!isPy27); - meta = with stdenv.lib; { + meta = with lib; { description = "Toolkit for plotting and analysis of ab initio solid-state calculation data"; homepage = "https://github.com/SMTG-UCL/sumo"; license = licenses.mit; diff --git a/pkgs/development/python-modules/sure/default.nix b/pkgs/development/python-modules/sure/default.nix index 2e6e7548efd8..efff79f679f4 100644 --- a/pkgs/development/python-modules/sure/default.nix +++ b/pkgs/development/python-modules/sure/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , rednose @@ -20,7 +20,7 @@ buildPythonPackage rec { buildInputs = [ rednose ]; propagatedBuildInputs = [ six mock ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Utility belt for automated testing"; homepage = "https://sure.readthedocs.io/en/latest/"; license = licenses.gpl3Plus; diff --git a/pkgs/development/python-modules/survey/default.nix b/pkgs/development/python-modules/survey/default.nix index 1f5438140e2b..f9bec0451ff4 100644 --- a/pkgs/development/python-modules/survey/default.nix +++ b/pkgs/development/python-modules/survey/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , wrapio @@ -20,7 +20,7 @@ buildPythonPackage rec { doCheck = false; pythonImportsCheck = [ "survey" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/Exahilosys/survey"; description = "A simple library for creating beautiful interactive prompts"; license = licenses.mit; diff --git a/pkgs/development/python-modules/svg-path/default.nix b/pkgs/development/python-modules/svg-path/default.nix index a8427558f436..585dbf64b3c3 100644 --- a/pkgs/development/python-modules/svg-path/default.nix +++ b/pkgs/development/python-modules/svg-path/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi }: +{ lib, stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "svg.path"; version = "4.0.2"; @@ -8,7 +8,7 @@ buildPythonPackage rec { sha256 = "4bd627ec6526cd5da14f3c6a51205d930187db2d8992aed626825492c033b195"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "SVG path objects and parser"; homepage = "https://github.com/regebro/svg.path"; license = licenses.mit; diff --git a/pkgs/development/python-modules/svg2tikz/default.nix b/pkgs/development/python-modules/svg2tikz/default.nix index b592ee75dece..fb0475ef3b97 100644 --- a/pkgs/development/python-modules/svg2tikz/default.nix +++ b/pkgs/development/python-modules/svg2tikz/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchgit , lxml @@ -18,7 +18,7 @@ buildPythonPackage { rev = "ad36f2c3818da13c4136d70a0fd8153acf8daef4"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/kjellmf/svg2tikz"; description = "An SVG to TikZ converter"; license = licenses.gpl2Plus; diff --git a/pkgs/development/python-modules/swagger-ui-bundle/default.nix b/pkgs/development/python-modules/swagger-ui-bundle/default.nix index 823f834b417c..613de201b2d1 100644 --- a/pkgs/development/python-modules/swagger-ui-bundle/default.nix +++ b/pkgs/development/python-modules/swagger-ui-bundle/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, jinja2, flake8 }: +{ lib, stdenv, buildPythonPackage, fetchPypi, jinja2, flake8 }: buildPythonPackage rec { pname = "swagger-ui-bundle"; @@ -20,7 +20,7 @@ buildPythonPackage rec { # package contains no tests doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "bundled swagger-ui pip package"; homepage = "https://github.com/dtkav/swagger_ui_bundle"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/swspotify/default.nix b/pkgs/development/python-modules/swspotify/default.nix index 27e5f0cb0bb8..321a48e72b6f 100644 --- a/pkgs/development/python-modules/swspotify/default.nix +++ b/pkgs/development/python-modules/swspotify/default.nix @@ -18,7 +18,8 @@ buildPythonPackage rec { preConfigure = '' substituteInPlace setup.py \ - --replace 'requests>=2.24.0' 'requests~=2.23' + --replace 'requests>=2.24.0' 'requests~=2.23' \ + --replace 'flask-cors==3.0.8' 'flask-cors' ''; checkPhase = '' @@ -27,7 +28,9 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook mock ]; - meta = with stdenv.lib; { + pythonImportsCheck = [ "SwSpotify" ]; + + meta = with lib; { homepage = "https://github.com/SwagLyrics/SwSpotify"; description = "Library to get the currently playing song and artist from Spotify"; license = licenses.mit; diff --git a/pkgs/development/python-modules/sybase/default.nix b/pkgs/development/python-modules/sybase/default.nix index 8fd0f023d0fa..20c2a158a3b2 100644 --- a/pkgs/development/python-modules/sybase/default.nix +++ b/pkgs/development/python-modules/sybase/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchurl , isPy3k @@ -20,7 +20,7 @@ buildPythonPackage rec { SYBASE = freetds; setupPyBuildFlags = [ "-DHAVE_FREETDS" "-UWANT_BULKCOPY" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "The Sybase module provides a Python interface to the Sybase relational database system"; homepage = "http://python-sybase.sourceforge.net"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/symbiflow-fasm/default.nix b/pkgs/development/python-modules/symbiflow-fasm/default.nix new file mode 100644 index 000000000000..609987441ea6 --- /dev/null +++ b/pkgs/development/python-modules/symbiflow-fasm/default.nix @@ -0,0 +1,27 @@ +{ stdenv +, pkgs +, fetchFromGitHub +, buildPythonPackage +, textx +}: + +buildPythonPackage rec { + pname = "symbiflow-fasm"; + version = "0.0.1-g4857dde"; + + src = fetchFromGitHub { + owner = "SymbiFlow"; + repo = "fasm"; + rev = "4857dde757edd88688c2faf808774d85bdbe3900"; + sha256 = "1za7f8slf8wvp1mfbfc3vdv61115p49k0vwngs4db6ips1qg1435"; + }; + + propagatedBuildInputs = [ textx ]; + + meta = with stdenv.lib; { + description = "FPGA Assembly (FASM) Parser and Generation library"; + homepage = "https://github.com/SymbiFlow/fasm"; + license = licenses.isc; + maintainers = with maintainers; [ mcaju ]; + }; +} diff --git a/pkgs/development/python-modules/sympy/default.nix b/pkgs/development/python-modules/sympy/default.nix index 9c3353aa2e74..c935176e0d51 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.2"; + version = "1.7.1"; src = fetchPypi { inherit pname version; - sha256 = "1cfadcc80506e4b793f5b088558ca1fcbeaec24cd6fc86f1fdccaa3ee1d48708"; + sha256 = "sha256-o96SYel1Nbg7uGB7DaLH0DEmZQ+v6isniWV7Ipwkay4="; }; checkInputs = [ glibcLocales ]; diff --git a/pkgs/development/python-modules/systemd/default.nix b/pkgs/development/python-modules/systemd/default.nix index f0be01b92d89..63ad1023b871 100644 --- a/pkgs/development/python-modules/systemd/default.nix +++ b/pkgs/development/python-modules/systemd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, systemd, pkgconfig }: +{ lib, stdenv, buildPythonPackage, fetchFromGitHub, systemd, pkgconfig }: buildPythonPackage rec { pname = "systemd"; @@ -16,7 +16,7 @@ buildPythonPackage rec { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Python module for native access to the systemd facilities"; homepage = "http://www.freedesktop.org/software/systemd/python-systemd/"; license = licenses.lgpl21; diff --git a/pkgs/development/python-modules/sysv_ipc/default.nix b/pkgs/development/python-modules/sysv_ipc/default.nix index 1c2e3baa526b..87a81e4fb17d 100644 --- a/pkgs/development/python-modules/sysv_ipc/default.nix +++ b/pkgs/development/python-modules/sysv_ipc/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi }: @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "1p5lx3yz4p40rfb453m80a4hh8341yp4dki2nhhxz7bq2zfi1zwf"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "SysV IPC primitives (semaphores, shared memory and message queues)"; license = licenses.bsd3; homepage = "http://semanchuk.com/philip/sysv_ipc/"; diff --git a/pkgs/development/python-modules/tarman/default.nix b/pkgs/development/python-modules/tarman/default.nix index f2a503cb55d8..682da22ced8a 100644 --- a/pkgs/development/python-modules/tarman/default.nix +++ b/pkgs/development/python-modules/tarman/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , isPy3k @@ -25,7 +25,7 @@ buildPythonPackage rec { # tests are still failing doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/matejc/tarman"; description = "Archive manager with curses interface"; license = licenses.bsd0; diff --git a/pkgs/development/python-modules/tasklib/default.nix b/pkgs/development/python-modules/tasklib/default.nix index 319dd98234d2..591f4cdabe96 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.2.1"; + version = "2.3.0"; src = fetchPypi { inherit pname version; - sha256 = "21525a34469928876b64edf8abf79cf788bb3fa796d4554ba22a68bc1f0693f5"; + sha256 = "7fe8676acb4559129c4e958be7704c12dccdbae302fff47c5398bc0dd1c9e563"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/taskw/default.nix b/pkgs/development/python-modules/taskw/default.nix index ee9a9716d117..5a1358947130 100644 --- a/pkgs/development/python-modules/taskw/default.nix +++ b/pkgs/development/python-modules/taskw/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , nose @@ -31,7 +31,7 @@ buildPythonPackage rec { buildInputs = [ nose pkgs.taskwarrior tox ]; propagatedBuildInputs = [ six dateutil kitchen pytz ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/ralphbean/taskw"; description = "Python bindings for your taskwarrior database"; license = licenses.gpl3Plus; diff --git a/pkgs/development/python-modules/tatsu/default.nix b/pkgs/development/python-modules/tatsu/default.nix index 922ca1b9b957..0469fc30e750 100644 --- a/pkgs/development/python-modules/tatsu/default.nix +++ b/pkgs/development/python-modules/tatsu/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder +{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder , colorama, mypy, pyyaml, regex , dataclasses, typing , pytestrunner, pytest-mypy @@ -33,7 +33,7 @@ buildPythonPackage rec { pytest test/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Generates Python parsers from grammars in a variation of EBNF"; longDescription = '' TatSu (the successor to Grako) is a tool that takes grammars in a diff --git a/pkgs/development/python-modules/tblib/default.nix b/pkgs/development/python-modules/tblib/default.nix index 86992e6e16aa..7e704e0b2c60 100644 --- a/pkgs/development/python-modules/tblib/default.nix +++ b/pkgs/development/python-modules/tblib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi }: +{ lib, stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "tblib"; @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "059bd77306ea7b419d4f76016aef6d7027cc8a0785579b5aad198803435f882c"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Traceback fiddling library. Allows you to pickle tracebacks."; homepage = "https://github.com/ionelmc/python-tblib"; license = licenses.bsd2; diff --git a/pkgs/development/python-modules/tbm-utils/default.nix b/pkgs/development/python-modules/tbm-utils/default.nix index 2d0efeceda04..bcc5cbbef946 100644 --- a/pkgs/development/python-modules/tbm-utils/default.nix +++ b/pkgs/development/python-modules/tbm-utils/default.nix @@ -5,17 +5,15 @@ , pendulum , pprintpp , wrapt -, pythonOlder }: buildPythonPackage rec { pname = "tbm-utils"; version = "2.6.0"; - disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "235748cceeb22c042e32d2fdfd4d710021bac9b938c4f2c35e1fce1cfd58f7ec"; + sha256 = "1v7pb3yirkhzbv1z5i1qp74vl880f56zvzfj68p08b5jxv64hmr3"; }; propagatedBuildInputs = [ attrs pendulum pprintpp wrapt ]; @@ -24,7 +22,7 @@ buildPythonPackage rec { # issues with package failing to build from source, but nixpkgs is better postPatch = '' substituteInPlace setup.py \ - --replace "pendulum>=2.0,<=3.0,!=2.0.5,!=2.1.0" "pendulum>=2.0,<=3.0" + --replace "'attrs>=18.2,<19.4'" "'attrs'" ''; # No tests in archive. diff --git a/pkgs/development/python-modules/telegram/default.nix b/pkgs/development/python-modules/telegram/default.nix index 6074f479071e..95293d095fd5 100644 --- a/pkgs/development/python-modules/telegram/default.nix +++ b/pkgs/development/python-modules/telegram/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi }: @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "1495l2ml8mg120wfvqhikqkfczhwwaby40vdmsz8v2l69jps01fl"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/liluo/telegram"; description = "Telegram APIs"; license = licenses.mit; diff --git a/pkgs/development/python-modules/tenacity/default.nix b/pkgs/development/python-modules/tenacity/default.nix index 18570c90c00f..51f055d06607 100644 --- a/pkgs/development/python-modules/tenacity/default.nix +++ b/pkgs/development/python-modules/tenacity/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "tenacity"; - version = "6.2.0"; + version = "6.3.1"; src = fetchPypi { inherit pname version; - sha256 = "16ikf6n6dw1kzncs6vjc4iccl76f9arln59jhiiai27lzbkr1bi9"; + sha256 = "0zsdajdpcjd7inrl7r9pwiyh7qpgh9jk7g2bj1iva2d3n0gijkg1"; }; nativeBuildInputs = [ pbr setuptools_scm ]; diff --git a/pkgs/development/python-modules/tensorboard-plugin-profile/default.nix b/pkgs/development/python-modules/tensorboard-plugin-profile/default.nix new file mode 100644 index 000000000000..1ae1aa471be5 --- /dev/null +++ b/pkgs/development/python-modules/tensorboard-plugin-profile/default.nix @@ -0,0 +1,31 @@ +{ lib, fetchPypi, buildPythonPackage +, gviz-api +, protobuf +, werkzeug +}: + +buildPythonPackage rec { + pname = "tensorboard_plugin_profile"; + version = "2.4.0"; + format = "wheel"; + + src = fetchPypi { + inherit pname version; + format = "wheel"; + python = "py3"; + sha256 = "0z6dcjvkk3pzmmmjxi2ybawnfshz5qa3ga92kqj69ld1g9k3i9bj"; + }; + + propagatedBuildInputs = [ + gviz-api + protobuf + werkzeug + ]; + + meta = with lib; { + description = "Profile Tensorboard Plugin."; + homepage = http://tensorflow.org; + license = licenses.asl20; + maintainers = with maintainers; [ ndl ]; + }; +} diff --git a/pkgs/development/python-modules/tensorboard-plugin-wit/default.nix b/pkgs/development/python-modules/tensorboard-plugin-wit/default.nix new file mode 100644 index 000000000000..b0966ca2c7c0 --- /dev/null +++ b/pkgs/development/python-modules/tensorboard-plugin-wit/default.nix @@ -0,0 +1,22 @@ +{ lib, fetchPypi, buildPythonPackage +}: + +buildPythonPackage rec { + pname = "tensorboard_plugin_wit"; + version = "1.7.0"; + format = "wheel"; + + src = fetchPypi { + inherit pname version; + format = "wheel"; + python = "py3"; + sha256 = "0nv855qm2fav70lndsrv810pqgg41sbmd70fk86wk18ih825yxzf"; + }; + + meta = with lib; { + description = "What-If Tool TensorBoard plugin."; + homepage = http://tensorflow.org; + license = licenses.asl20; + maintainers = with maintainers; [ ndl ]; + }; +} diff --git a/pkgs/development/python-modules/tensorflow-estimator/1/default.nix b/pkgs/development/python-modules/tensorflow-estimator/1/default.nix deleted file mode 100644 index c34d6948d89e..000000000000 --- a/pkgs/development/python-modules/tensorflow-estimator/1/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ stdenv, fetchPypi, buildPythonPackage -, numpy -, absl-py -, mock -}: - -buildPythonPackage rec { - pname = "tensorflow-estimator"; - # This is effectively 1.15.0. Upstream tagged 1.15.0 by mistake before - # actually updating the version in setup.py, which is why this tag is called - # 1.15.1. - version = "1.15.1"; - format = "wheel"; - - src = fetchPypi { - pname = "tensorflow_estimator"; - inherit version format; - sha256 = "1fc61wmc0w22frs79j2x4g6wnv5g21xc6rix1g4bsvy9qfvvylw8"; - }; - - propagatedBuildInputs = [ mock numpy absl-py ]; - - meta = with stdenv.lib; { - description = "TensorFlow Estimator is a high-level API that encapsulates model training, evaluation, prediction, and exporting."; - homepage = "http://tensorflow.org"; - license = licenses.asl20; - maintainers = with maintainers; [ jyp ]; - }; -} - diff --git a/pkgs/development/python-modules/tensorflow-estimator/2/default.nix b/pkgs/development/python-modules/tensorflow-estimator/default.nix similarity index 76% rename from pkgs/development/python-modules/tensorflow-estimator/2/default.nix rename to pkgs/development/python-modules/tensorflow-estimator/default.nix index 750ef6e8a907..bca75224fa3e 100644 --- a/pkgs/development/python-modules/tensorflow-estimator/2/default.nix +++ b/pkgs/development/python-modules/tensorflow-estimator/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage +{ lib, stdenv, fetchPypi, buildPythonPackage , numpy , absl-py , mock @@ -6,18 +6,18 @@ buildPythonPackage rec { pname = "tensorflow-estimator"; - version = "2.3.0"; + version = "2.4.0"; format = "wheel"; src = fetchPypi { pname = "tensorflow_estimator"; inherit version format; - sha256 = "11n4sl9wfr00fv1i837b7a36ink86ggmlsgj7i06kcfc011h6pmp"; + sha256 = "1w0pkcslm6934qqd6m5gxyjdlnb4pbl47k6s99wsh6dyvvr7nysv"; }; propagatedBuildInputs = [ mock numpy absl-py ]; - meta = with stdenv.lib; { + meta = with lib; { description = "TensorFlow Estimator is a high-level API that encapsulates model training, evaluation, prediction, and exporting."; homepage = "http://tensorflow.org"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/tensorflow-probability/default.nix b/pkgs/development/python-modules/tensorflow-probability/default.nix index a89c6fa307ea..91880562eb3a 100644 --- a/pkgs/development/python-modules/tensorflow-probability/default.nix +++ b/pkgs/development/python-modules/tensorflow-probability/default.nix @@ -122,9 +122,10 @@ in buildPythonPackage { ''; meta = with lib; { + broken = true; # tf-probability 0.8.0 is not compatible with tensorflow 2.3.2 description = "Library for probabilistic reasoning and statistical analysis"; homepage = "https://www.tensorflow.org/probability/"; license = licenses.asl20; - maintainers = with maintainers; [ timokau ]; + maintainers = with maintainers; []; # This package is maintainerless. }; } diff --git a/pkgs/development/python-modules/tensorflow-tensorboard/1/default.nix b/pkgs/development/python-modules/tensorflow-tensorboard/1/default.nix index 6cc3636b7f30..f58b1a207719 100644 --- a/pkgs/development/python-modules/tensorflow-tensorboard/1/default.nix +++ b/pkgs/development/python-modules/tensorflow-tensorboard/1/default.nix @@ -20,8 +20,7 @@ buildPythonPackage rec { src = fetchPypi ({ pname = "tensorboard"; - inherit version; - format = "wheel"; + inherit version format; } // (if isPy3k then { python = "py3"; sha256 = "1g62i3nrgp8q9wfsyqqjkkfnsz7x2k018c26kdh527h1yrjjrbac"; diff --git a/pkgs/development/python-modules/tensorflow-tensorboard/2/default.nix b/pkgs/development/python-modules/tensorflow-tensorboard/default.nix similarity index 78% rename from pkgs/development/python-modules/tensorflow-tensorboard/2/default.nix rename to pkgs/development/python-modules/tensorflow-tensorboard/default.nix index 945896dda018..031254205066 100644 --- a/pkgs/development/python-modules/tensorflow-tensorboard/2/default.nix +++ b/pkgs/development/python-modules/tensorflow-tensorboard/default.nix @@ -5,9 +5,10 @@ , protobuf , grpcio , markdown -, futures , absl-py , google-auth-oauthlib +, tensorboard-plugin-wit +, tensorboard-plugin-profile }: # tensorflow/tensorboard is built from a downloaded wheel, because @@ -16,20 +17,16 @@ buildPythonPackage rec { pname = "tensorflow-tensorboard"; - version = "2.1.0"; + version = "2.4.0"; format = "wheel"; + disabled = !isPy3k; - src = fetchPypi ({ + src = fetchPypi { pname = "tensorboard"; - inherit version; - format = "wheel"; - } // (if isPy3k then { + inherit version format; python = "py3"; - sha256 = "1wpjdzhjpcdkyaahzd4bl71k4l30z5c55280ndiwj32hw70lxrp6"; - } else { - python = "py2"; - sha256 = "1f805839xa36wxb7xac9fyxzaww92vw4d50vs6g61wnlr4byp00w"; - })); + sha256 = "0f17h6i398n8maam0r3rssqvdqnqbwjyf96nnhf482anm1iwdq6d"; + }; propagatedBuildInputs = [ numpy @@ -39,10 +36,12 @@ buildPythonPackage rec { grpcio absl-py google-auth-oauthlib + tensorboard-plugin-profile + tensorboard-plugin-wit # not declared in install_requires, but used at runtime # https://github.com/NixOS/nixpkgs/issues/73840 wheel - ] ++ lib.optional (!isPy3k) futures; + ]; # in the absence of a real test suite, run cli and imports checkPhase = '' diff --git a/pkgs/development/python-modules/tensorflow/1/bin.nix b/pkgs/development/python-modules/tensorflow/1/bin.nix deleted file mode 100644 index 5c93e957f7c1..000000000000 --- a/pkgs/development/python-modules/tensorflow/1/bin.nix +++ /dev/null @@ -1,120 +0,0 @@ -{ stdenv -, lib -, fetchurl -, buildPythonPackage -, isPy3k, pythonOlder, pythonAtLeast -, astor -, gast -, google-pasta -, wrapt -, numpy -, six -, termcolor -, protobuf -, absl-py -, grpcio -, mock -, backports_weakref -, tensorflow-estimator_1 -, tensorflow-tensorboard -, cudaSupport ? false -, cudatoolkit ? null -, cudnn ? null -, nvidia_x11 ? null -, zlib -, python -, symlinkJoin -, keras-applications -, keras-preprocessing -, addOpenGLRunpath -}: - -# We keep this binary build for two reasons: -# - the source build doesn't work on Darwin. -# - the source build is currently brittle and not easy to maintain - -assert cudaSupport -> cudatoolkit != null - && cudnn != null - && nvidia_x11 != null; - -# unsupported combination -assert ! (stdenv.isDarwin && cudaSupport); - -let - packages = import ./binary-hashes.nix; - - variant = if cudaSupport then "-gpu" else ""; - pname = "tensorflow${variant}"; - -in buildPythonPackage { - inherit pname; - inherit (packages) version; - format = "wheel"; - disabled = pythonAtLeast "3.8"; - - src = let - pyVerNoDot = lib.strings.stringAsChars (x: if x == "." then "" else x) python.pythonVersion; - pyver = if stdenv.isDarwin then builtins.substring 0 1 pyVerNoDot else pyVerNoDot; - platform = if stdenv.isDarwin then "mac" else "linux"; - unit = if cudaSupport then "gpu" else "cpu"; - key = "${platform}_py_${pyver}_${unit}"; - in fetchurl packages.${key}; - - propagatedBuildInputs = [ - protobuf - numpy - termcolor - grpcio - six - astor - absl-py - gast - google-pasta - wrapt - tensorflow-estimator_1 - tensorflow-tensorboard - keras-applications - keras-preprocessing - ] ++ lib.optional (!isPy3k) mock - ++ lib.optionals (pythonOlder "3.4") [ backports_weakref ]; - - nativeBuildInputs = lib.optional cudaSupport addOpenGLRunpath; - - # Upstream has a pip hack that results in bin/tensorboard being in both tensorflow - # and the propageted input tensorflow-tensorboard which causes environment collisions. - # another possibility would be to have tensorboard only in the buildInputs - # https://github.com/tensorflow/tensorflow/blob/v1.7.1/tensorflow/tools/pip_package/setup.py#L79 - postInstall = '' - rm $out/bin/tensorboard - ''; - - # Note that we need to run *after* the fixup phase because the - # libraries are loaded at runtime. If we run in preFixup then - # patchelf --shrink-rpath will remove the cuda libraries. - postFixup = let - rpath = stdenv.lib.makeLibraryPath - ([ stdenv.cc.cc.lib zlib ] ++ lib.optionals cudaSupport [ cudatoolkit.out cudatoolkit.lib cudnn nvidia_x11 ]); - in - lib.optionalString stdenv.isLinux '' - rrPath="$out/${python.sitePackages}/tensorflow/:$out/${python.sitePackages}/tensorflow/contrib/tensor_forest/:${rpath}" - internalLibPath="$out/${python.sitePackages}/tensorflow/python/_pywrap_tensorflow_internal.so" - find $out -type f \( -name '*.so' -or -name '*.so.*' \) | while read lib; do - patchelf --set-rpath "$rrPath" "$lib" - ${lib.optionalString cudaSupport '' - addOpenGLRunpath "$lib" - ''} - done - ''; - - - meta = with stdenv.lib; { - description = "Computation using data flow graphs for scalable machine learning"; - homepage = "http://tensorflow.org"; - license = licenses.asl20; - maintainers = with maintainers; [ jyp abbradar ]; - platforms = [ "x86_64-linux" "x86_64-darwin" ]; - # Python 2.7 build uses different string encoding. - # See https://github.com/NixOS/nixpkgs/pull/37044#issuecomment-373452253 - broken = stdenv.isDarwin && !isPy3k; - }; -} diff --git a/pkgs/development/python-modules/tensorflow/1/binary-hashes.nix b/pkgs/development/python-modules/tensorflow/1/binary-hashes.nix deleted file mode 100644 index fa4809dc3f19..000000000000 --- a/pkgs/development/python-modules/tensorflow/1/binary-hashes.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ -version = "1.14.0"; -linux_py_27_cpu = { - url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.14.0-cp27-none-linux_x86_64.whl"; - sha256 = "0yywdrfk97dh1bxhibspg0raz70fx9lcczj6xlimqy4xb60clx7k"; -}; -linux_py_35_cpu = { - url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.14.0-cp35-cp35m-linux_x86_64.whl"; - sha256 = "1xvyb6xcrjhlwvrmrhn5vs9xy7g98smqmpv4i3hhpry4qyasphhj"; -}; -linux_py_36_cpu = { - url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.14.0-cp36-cp36m-linux_x86_64.whl"; - sha256 = "1psd9vyxz9f39dwj77nvrg373sxv3p5vdp9fnz81dpsm0b0mwl44"; -}; -linux_py_37_cpu = { - url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.14.0-cp37-cp37m-linux_x86_64.whl"; - sha256 = "0bg2sb1n2ag27r7ww695kg5hb0mjrw4kc5893krmixx2j71860c5"; -}; -linux_py_27_gpu = { - url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.14.0-cp27-none-linux_x86_64.whl"; - sha256 = "0y1x91gayg6pjddgl8ndcm63wfzhyv4s5khgl7ffzsgni1ivaqw5"; -}; -linux_py_35_gpu = { - url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.14.0-cp35-cp35m-linux_x86_64.whl"; - sha256 = "03piggpbz1jx8m2b95spq3jrdff4w6xx63ji07am7hyw2nsgx3mx"; -}; -linux_py_36_gpu = { - url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.14.0-cp36-cp36m-linux_x86_64.whl"; - sha256 = "0ypkp8cfhharsyyikb1qgf44cfm6284km9xswzvzymjzz75vg3gd"; -}; -linux_py_37_gpu = { - url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.14.0-cp37-cp37m-linux_x86_64.whl"; - sha256 = "0virp8nn2ysx4855hq29kas6fm6b3dsiybwzdxy9nnb9n2d8qlm2"; -}; -mac_py_2_cpu = { - url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.14.0-py2-none-any.whl"; - sha256 = "14f86k3pgq7z6i4s4im55zpp38f0drnm7xlclavsgcc0nxnj3z26"; -}; -mac_py_3_cpu = { - url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.14.0-py3-none-any.whl"; - sha256 = "0f3swpcjfgqhj6h5wnx8snc0xjkx4hnkqx83fmlrwpncs8c131d3"; -}; -} diff --git a/pkgs/development/python-modules/tensorflow/1/default.nix b/pkgs/development/python-modules/tensorflow/1/default.nix deleted file mode 100644 index 599f809f8646..000000000000 --- a/pkgs/development/python-modules/tensorflow/1/default.nix +++ /dev/null @@ -1,451 +0,0 @@ -{ stdenv, pkgs, bazel_0_26, buildBazelPackage, lib, fetchFromGitHub, fetchpatch, symlinkJoin -, addOpenGLRunpath -# Python deps -, buildPythonPackage, isPy3k, isPy27, pythonOlder, pythonAtLeast, python -# Python libraries -, numpy, tensorflow-tensorboard_1, backports_weakref, mock, enum34, absl-py -, future, setuptools, wheel, keras-preprocessing, keras-applications, google-pasta -, functools32 -, opt-einsum -, termcolor, grpcio, six, wrapt, protobuf, tensorflow-estimator_1 -# Common deps -, git, swig, which, binutils, glibcLocales, cython -# Common libraries -, jemalloc, openmpi, astor, gast, grpc, sqlite, openssl, jsoncpp, re2 -, curl, snappy, flatbuffers, icu, double-conversion, libpng, libjpeg, giflib -# Upsteam by default includes cuda support since tensorflow 1.15. We could do -# that in nix as well. It would make some things easier and less confusing, but -# it would also make the default tensorflow package unfree. See -# https://groups.google.com/a/tensorflow.org/forum/#!topic/developers/iRCt5m4qUz0 -, cudaSupport ? false, nvidia_x11 ? null, cudatoolkit ? null, cudnn ? null, nccl ? null -, mklSupport ? false, mkl ? null -# XLA without CUDA is broken -, xlaSupport ? cudaSupport -# Default from ./configure script -, cudaCapabilities ? [ "3.5" "5.2" ] -, sse42Support ? stdenv.hostPlatform.sse4_2Support -, avx2Support ? stdenv.hostPlatform.avx2Support -, fmaSupport ? stdenv.hostPlatform.fmaSupport -# Darwin deps -, Foundation, Security -}: - -assert cudaSupport -> nvidia_x11 != null - && cudatoolkit != null - && cudnn != null; - -# unsupported combination -assert ! (stdenv.isDarwin && cudaSupport); - -assert mklSupport -> mkl != null; - -let - withTensorboard = pythonOlder "3.6"; - - cudatoolkit_joined = symlinkJoin { - name = "${cudatoolkit.name}-merged"; - paths = [ - cudatoolkit.lib - cudatoolkit.out - # for some reason some of the required libs are in the targets/x86_64-linux - # directory; not sure why but this works around it - "${cudatoolkit}/targets/${stdenv.system}" - ]; - }; - - cudatoolkit_cc_joined = symlinkJoin { - name = "${cudatoolkit.cc.name}-merged"; - paths = [ - cudatoolkit.cc - binutils.bintools # for ar, dwp, nm, objcopy, objdump, strip - ]; - }; - - # Needed for _some_ system libraries, grep INCLUDEDIR. - includes_joined = symlinkJoin { - name = "tensorflow-deps-merged"; - paths = [ - pkgs.protobuf - jsoncpp - ]; - }; - - tfFeature = x: if x then "1" else "0"; - - version = "1.15.4"; - variant = if cudaSupport then "-gpu" else ""; - pname = "tensorflow${variant}"; - - pythonEnv = python.withPackages (_: - [ # python deps needed during wheel build time (not runtime, see the buildPythonPackage part for that) - numpy - keras-preprocessing - protobuf - wrapt - gast - astor - absl-py - termcolor - keras-applications - setuptools - wheel - ] ++ lib.optionals (!isPy3k) - [ future - functools32 - mock - ]); - - bazel-build = buildBazelPackage { - name = "${pname}-${version}"; - bazel = bazel_0_26; - - src = fetchFromGitHub { - owner = "tensorflow"; - repo = "tensorflow"; - rev = "v${version}"; - sha256 = "0lg8ahyr2k7dmp0yfypk8ivl9a0xcg3j0f0dakmn5ljk8nsji0bj"; - }; - - patches = [ - # Work around https://github.com/tensorflow/tensorflow/issues/24752 - ../no-saved-proto.patch - # Fixes for NixOS jsoncpp - ../system-jsoncpp.patch - - # https://github.com/tensorflow/tensorflow/pull/29673 - (fetchpatch { - name = "fix-compile-with-cuda-and-mpi.patch"; - url = "https://github.com/tensorflow/tensorflow/pull/29673/commits/498e35a3bfe38dd75cf1416a1a23c07c3b59e6af.patch"; - sha256 = "1m2qmwv1ysqa61z6255xggwbq6mnxbig749bdvrhnch4zydxb4di"; - }) - (fetchpatch { - name = "backport-pr-18950.patch"; - url = "https://github.com/tensorflow/tensorflow/commit/73640aaec2ab0234d9fff138e3c9833695570c0a.patch"; - sha256 = "1n9ypbrx36fc1kc9cz5b3p9qhg15xxhq4nz6ap3hwqba535nakfz"; - }) - - (fetchpatch { - # be compatible with gast >0.2 instead of only gast 0.2.2 - name = "gast-update.patch"; - url = "https://github.com/tensorflow/tensorflow/commit/85751ad6c7f5fd12c6c79545d96896cba92fa8b4.patch"; - sha256 = "077cpj0kzyqxzdya1dwh8df17zfzhqn7c685hx6iskvw2979zg2n"; - }) - ./lift-gast-restriction.patch - - (fetchpatch { - # fix compilation with numpy >= 1.19 - name = "add-const-overload.patch"; - url = "https://github.com/tensorflow/tensorflow/commit/75ea0b31477d6ba9e990e296bbbd8ca4e7eebadf.patch"; - sha256 = "1xp1icacig0xm0nmb05sbrf4nw4xbln9fhc308birrv8286zx7wv"; - }) - - # cuda 10.2 does not have "-bin2c-path" option anymore - # https://github.com/tensorflow/tensorflow/issues/34429 - ../cuda-10.2-no-bin2c-path.patch - ]; - - # On update, it can be useful to steal the changes from gentoo - # https://gitweb.gentoo.org/repo/gentoo.git/tree/sci-libs/tensorflow - - nativeBuildInputs = [ - swig which pythonEnv - ] ++ lib.optional cudaSupport addOpenGLRunpath; - - buildInputs = [ - jemalloc - openmpi - glibcLocales - git - - # libs taken from system through the TF_SYS_LIBS mechanism - # grpc - sqlite - openssl - jsoncpp - pkgs.protobuf - curl - snappy - flatbuffers - icu - double-conversion - libpng - libjpeg - giflib - re2 - pkgs.lmdb - ] ++ lib.optionals cudaSupport [ - cudatoolkit - cudnn - nvidia_x11 - ] ++ lib.optionals mklSupport [ - mkl - ] ++ lib.optionals stdenv.isDarwin [ - Foundation - Security - ]; - - # arbitrarily set to the current latest bazel version, overly careful - TF_IGNORE_MAX_BAZEL_VERSION = true; - - # Take as many libraries from the system as possible. Keep in sync with - # list of valid syslibs in - # https://github.com/tensorflow/tensorflow/blob/master/third_party/systemlibs/syslibs_configure.bzl - TF_SYSTEM_LIBS = lib.concatStringsSep "," [ - "absl_py" - "astor_archive" - "boringssl" - # Not packaged in nixpkgs - # "com_github_googleapis_googleapis" - # "com_github_googlecloudplatform_google_cloud_cpp" - "com_google_protobuf" - "com_googlesource_code_re2" - "curl" - "cython" - "double_conversion" - "flatbuffers" - "gast_archive" - "gif_archive" - # Lots of errors, requires an older version - # "grpc" - "hwloc" - "icu" - "jpeg" - "jsoncpp_git" - "keras_applications_archive" - "lmdb" - "nasm" - # "nsync" # not packaged in nixpkgs - "opt_einsum_archive" - "org_sqlite" - "pasta" - "pcre" - "png_archive" - "six_archive" - "snappy" - "swig" - "termcolor_archive" - "wrapt" - "zlib_archive" - ]; - - INCLUDEDIR = "${includes_joined}/include"; - - PYTHON_BIN_PATH = pythonEnv.interpreter; - - TF_NEED_GCP = true; - TF_NEED_HDFS = true; - TF_ENABLE_XLA = tfFeature xlaSupport; - - CC_OPT_FLAGS = " "; - - # https://github.com/tensorflow/tensorflow/issues/14454 - TF_NEED_MPI = tfFeature cudaSupport; - - TF_NEED_CUDA = tfFeature cudaSupport; - TF_CUDA_PATHS = lib.optionalString cudaSupport "${cudatoolkit_joined},${cudnn},${nccl}"; - GCC_HOST_COMPILER_PREFIX = lib.optionalString cudaSupport "${cudatoolkit_cc_joined}/bin"; - GCC_HOST_COMPILER_PATH = lib.optionalString cudaSupport "${cudatoolkit_cc_joined}/bin/gcc"; - TF_CUDA_COMPUTE_CAPABILITIES = lib.concatStringsSep "," cudaCapabilities; - - postPatch = '' - # https://github.com/tensorflow/tensorflow/issues/20919 - sed -i '/androidndk/d' tensorflow/lite/kernels/internal/BUILD - - # Tensorboard pulls in a bunch of dependencies, some of which may - # include security vulnerabilities. So we make it optional. - # https://github.com/tensorflow/tensorflow/issues/20280#issuecomment-400230560 - sed -i '/tensorboard >=/d' tensorflow/tools/pip_package/setup.py - - substituteInPlace tensorflow/tools/pip_package/setup.py \ - --replace "numpy >= 1.16.0, < 1.19.0" "numpy >= 1.16.0" - ''; - - preConfigure = let - opt_flags = [] - ++ lib.optionals sse42Support ["-msse4.2"] - ++ lib.optionals avx2Support ["-mavx2"] - ++ lib.optionals fmaSupport ["-mfma"]; - in '' - patchShebangs configure - - # dummy ldconfig - mkdir dummy-ldconfig - echo "#!${stdenv.shell}" > dummy-ldconfig/ldconfig - chmod +x dummy-ldconfig/ldconfig - export PATH="$PWD/dummy-ldconfig:$PATH" - - export PYTHON_LIB_PATH="$NIX_BUILD_TOP/site-packages" - export CC_OPT_FLAGS="${lib.concatStringsSep " " opt_flags}" - mkdir -p "$PYTHON_LIB_PATH" - - # To avoid mixing Python 2 and Python 3 - unset PYTHONPATH - ''; - - configurePhase = '' - runHook preConfigure - ./configure - runHook postConfigure - ''; - - # FIXME: Tensorflow uses dlopen() for CUDA libraries. - NIX_LDFLAGS = lib.optionalString cudaSupport "-lcudart -lcublas -lcufft -lcurand -lcusolver -lcusparse -lcudnn"; - - hardeningDisable = [ "format" ]; - - bazelFlags = [ - # temporary fixes to make the build work with bazel 0.27 - "--incompatible_no_support_tools_in_action_inputs=false" - ]; - bazelBuildFlags = [ - "--config=opt" # optimize using the flags set in the configure phase - ] - ++ lib.optionals (mklSupport) [ "--config=mkl" ]; - - bazelTarget = "//tensorflow/tools/pip_package:build_pip_package //tensorflow/tools/lib_package:libtensorflow"; - - fetchAttrs = { - # So that checksums don't depend on these. - TF_SYSTEM_LIBS = null; - - # cudaSupport causes fetch of ncclArchive, resulting in different hashes - sha256 = if cudaSupport then - "1bi6aydidgi943hiqj0d279jbz2g173hvafdqla1ifw2qdsm73pb" - else - "0l5510fr8n22c4hx9llr0vqqhx9wlgkyxl55fxbixhssd0ai05r4"; - }; - - buildAttrs = { - outputs = [ "out" "python" ]; - - preBuild = '' - patchShebangs . - ''; - - installPhase = '' - mkdir -p "$out" - tar -xf bazel-bin/tensorflow/tools/lib_package/libtensorflow.tar.gz -C "$out" - # Write pkgconfig file. - mkdir "$out/lib/pkgconfig" - cat > "$out/lib/pkgconfig/tensorflow.pc" << EOF - Name: TensorFlow - Version: ${version} - Description: Library for computation using data flow graphs for scalable machine learning - Requires: - Libs: -L$out/lib -ltensorflow - Cflags: -I$out/include/tensorflow - EOF - - # build the source code, then copy it to $python (build_pip_package - # actually builds a symlink farm so we must dereference them). - bazel-bin/tensorflow/tools/pip_package/build_pip_package --src "$PWD/dist" - cp -Lr "$PWD/dist" "$python" - ''; - - postFixup = lib.optionalString cudaSupport '' - find $out -type f \( -name '*.so' -or -name '*.so.*' \) | while read lib; do - addOpenGLRunpath "$lib" - done - ''; - }; - - meta = with stdenv.lib; { - description = "Computation using data flow graphs for scalable machine learning"; - homepage = "http://tensorflow.org"; - license = licenses.asl20; - maintainers = with maintainers; [ jyp abbradar ]; - platforms = with platforms; linux ++ darwin; - # The py2 build fails due to some issue importing protobuf. Possibly related to the fix in - # https://github.com/akesandgren/easybuild-easyblocks/commit/1f2e517ddfd1b00a342c6abb55aef3fd93671a2b - broken = !(xlaSupport -> cudaSupport) || !isPy3k; - }; - }; - -in buildPythonPackage { - inherit version pname; - disabled = isPy27 || (pythonAtLeast "3.8"); - - src = bazel-build.python; - - # Upstream has a pip hack that results in bin/tensorboard being in both tensorflow - # and the propagated input tensorflow-tensorboard, which causes environment collisions. - # Another possibility would be to have tensorboard only in the buildInputs - # https://github.com/tensorflow/tensorflow/blob/v1.7.1/tensorflow/tools/pip_package/setup.py#L79 - postInstall = '' - rm $out/bin/tensorboard - ''; - - setupPyGlobalFlags = [ "--project_name ${pname}" ]; - - # tensorflow/tools/pip_package/setup.py - propagatedBuildInputs = [ - absl-py - astor - gast - google-pasta - keras-applications - keras-preprocessing - numpy - six - protobuf - tensorflow-estimator_1 - termcolor - wrapt - grpcio - opt-einsum - ] ++ lib.optionals (!isPy3k) [ - mock - future - functools32 - ] ++ lib.optionals (pythonOlder "3.4") [ - backports_weakref enum34 - ] ++ lib.optionals withTensorboard [ - tensorflow-tensorboard_1 - ]; - - nativeBuildInputs = lib.optional cudaSupport addOpenGLRunpath; - - postFixup = lib.optionalString cudaSupport '' - find $out -type f \( -name '*.so' -or -name '*.so.*' \) | while read lib; do - addOpenGLRunpath "$lib" - done - ''; - - # Actual tests are slow and impure. - # TODO try to run them anyway - # TODO better test (files in tensorflow/tools/ci_build/builds/*test) - checkPhase = '' - ${python.interpreter} <= 1.1.6;python_version<"3.4"', - # functools comes with python3, need to install the backport for python2 - 'functools32 >= 3.2.3;python_version<"3"', -- 'gast == 0.2.2', -+ 'gast >= 0.2.2', - 'google_pasta >= 0.1.6', - 'keras_applications >= 1.0.8', - 'keras_preprocessing >= 1.0.5', diff --git a/pkgs/development/python-modules/tensorflow/1/prefetcher.sh b/pkgs/development/python-modules/tensorflow/1/prefetcher.sh deleted file mode 100755 index d590fb0f1732..000000000000 --- a/pkgs/development/python-modules/tensorflow/1/prefetcher.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env bash - -version=1.14.0 -hashfile=binary-hashes.nix -rm -f $hashfile -echo "{" >> $hashfile -echo "version = \"$version\";" >> $hashfile -for sys in "linux" "mac"; do - for tfpref in "cpu/tensorflow" "gpu/tensorflow_gpu"; do - for pykind in "py2-none-any" "py3-none-any" "cp27-none-linux_x86_64" "cp35-cp35m-linux_x86_64" "cp36-cp36m-linux_x86_64" "cp37-cp37m-linux_x86_64"; do - if [ $sys == "mac" ]; then - [[ $pykind =~ py.* ]] && [[ $tfpref =~ cpu.* ]] - result=$? - pyver=${pykind:2:1} - flavour=cpu - else - [[ $pykind =~ .*linux.* ]] - result=$? - pyver=${pykind:2:2} - flavour=${tfpref:0:3} - fi - if [ $result == 0 ]; then - url=https://storage.googleapis.com/tensorflow/$sys/$tfpref-$version-$pykind.whl - hash=$(nix-prefetch-url $url) - echo "${sys}_py_${pyver}_${flavour} = {" >> $hashfile - echo " url = \"$url\";" >> $hashfile - echo " sha256 = \"$hash\";" >> $hashfile - echo "};" >> $hashfile - fi - done - done -done -echo "}" >> $hashfile diff --git a/pkgs/development/python-modules/tensorflow/2/relax-dependencies.patch b/pkgs/development/python-modules/tensorflow/2/relax-dependencies.patch deleted file mode 100644 index fc11a04cbdc5..000000000000 --- a/pkgs/development/python-modules/tensorflow/2/relax-dependencies.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/tensorflow/tools/pip_package/setup.py b/tensorflow/tools/pip_package/setup.py -index 594e74f40c0..bfbf010144f 100644 ---- a/tensorflow/tools/pip_package/setup.py -+++ b/tensorflow/tools/pip_package/setup.py -@@ -54,9 +54,9 @@ _VERSION = '2.3.1' - REQUIRED_PACKAGES = [ - 'absl-py >= 0.7.0', - 'astunparse == 1.6.3', -- 'gast == 0.3.3', -+ 'gast >= 0.3.3', - 'google_pasta >= 0.1.8', -- 'h5py >= 2.10.0, < 2.11.0', -+ 'h5py >= 2.10.0', - 'keras_preprocessing >= 1.1.1, < 1.2', - # TODO(mihaimaruseac): numpy 1.19.0 has ABI breakage - # https://github.com/numpy/numpy/pull/15355 diff --git a/pkgs/development/python-modules/tensorflow/2/bin.nix b/pkgs/development/python-modules/tensorflow/bin.nix similarity index 99% rename from pkgs/development/python-modules/tensorflow/2/bin.nix rename to pkgs/development/python-modules/tensorflow/bin.nix index 8dd282666a75..c0a9d5eadaff 100644 --- a/pkgs/development/python-modules/tensorflow/2/bin.nix +++ b/pkgs/development/python-modules/tensorflow/bin.nix @@ -174,7 +174,7 @@ in buildPythonPackage { "tensorflow.python.framework" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Computation using data flow graphs for scalable machine learning"; homepage = "http://tensorflow.org"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/tensorflow/2/binary-hashes.nix b/pkgs/development/python-modules/tensorflow/binary-hashes.nix similarity index 100% rename from pkgs/development/python-modules/tensorflow/2/binary-hashes.nix rename to pkgs/development/python-modules/tensorflow/binary-hashes.nix diff --git a/pkgs/development/python-modules/tensorflow/cuda-10.2-no-bin2c-path.patch b/pkgs/development/python-modules/tensorflow/cuda-10.2-no-bin2c-path.patch deleted file mode 100644 index 25f1ba7a5518..000000000000 --- a/pkgs/development/python-modules/tensorflow/cuda-10.2-no-bin2c-path.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/third_party/nccl/build_defs.bzl.tpl -+++ b/third_party/nccl/build_defs.bzl.tpl -@@ -113,7 +113,6 @@ def _device_link_impl(ctx): - "--cmdline=--compile-only", - "--link", - "--compress-all", -- "--bin2c-path=%s" % bin2c.dirname, - "--create=%s" % tmp_fatbin.path, - "--embedded-fatbin=%s" % fatbin_h.path, - ] + images, diff --git a/pkgs/development/python-modules/tensorflow/2/default.nix b/pkgs/development/python-modules/tensorflow/default.nix similarity index 79% rename from pkgs/development/python-modules/tensorflow/2/default.nix rename to pkgs/development/python-modules/tensorflow/default.nix index 68c983c05941..342a87a6e8d5 100644 --- a/pkgs/development/python-modules/tensorflow/2/default.nix +++ b/pkgs/development/python-modules/tensorflow/default.nix @@ -1,24 +1,25 @@ -{ stdenv, pkgs, bazel_3, buildBazelPackage, lib, fetchFromGitHub, fetchpatch, symlinkJoin +{ stdenv, bazel_3, buildBazelPackage, isPy3k, lib, fetchFromGitHub, symlinkJoin , addOpenGLRunpath # Python deps -, buildPythonPackage, isPy3k, isPy27, pythonOlder, pythonAtLeast, python +, buildPythonPackage, pythonOlder, pythonAtLeast, python # Python libraries -, numpy, tensorflow-tensorboard_2, backports_weakref, mock, enum34, absl-py -, future, setuptools, wheel, keras-preprocessing, keras-applications, google-pasta -, functools32 +, numpy, tensorflow-tensorboard_2, absl-py +, future, setuptools, wheel, keras-preprocessing, google-pasta , opt-einsum, astunparse, h5py , termcolor, grpcio, six, wrapt, protobuf, tensorflow-estimator_2 +, dill, flatbuffers-python, tblib, typing-extensions # Common deps -, git, swig, which, binutils, glibcLocales, cython +, git, pybind11, which, binutils, glibcLocales, cython, perl # Common libraries -, jemalloc, openmpi, astor, gast, grpc, sqlite, openssl, jsoncpp, re2 -, curl, snappy, flatbuffers, icu, double-conversion, libpng, libjpeg, giflib +, jemalloc, openmpi, gast, grpc, sqlite, boringssl, jsoncpp +, curl, snappy, flatbuffers-core, lmdb-core, icu, double-conversion, libpng, libjpeg_turbo, giflib # Upsteam by default includes cuda support since tensorflow 1.15. We could do # that in nix as well. It would make some things easier and less confusing, but # it would also make the default tensorflow package unfree. See # https://groups.google.com/a/tensorflow.org/forum/#!topic/developers/iRCt5m4qUz0 , cudaSupport ? false, cudatoolkit ? null, cudnn ? null, nccl ? null , mklSupport ? false, mkl ? null +, tensorboardSupport ? true # XLA without CUDA is broken , xlaSupport ? cudaSupport # Default from ./configure script @@ -39,7 +40,7 @@ assert ! (stdenv.isDarwin && cudaSupport); assert mklSupport -> mkl != null; let - withTensorboard = pythonOlder "3.6"; + withTensorboard = (pythonOlder "3.6") || tensorboardSupport; cudatoolkit_joined = symlinkJoin { name = "${cudatoolkit.name}-merged"; @@ -65,34 +66,40 @@ let includes_joined = symlinkJoin { name = "tensorflow-deps-merged"; paths = [ - pkgs.protobuf jsoncpp ]; }; tfFeature = x: if x then "1" else "0"; - version = "2.3.1"; + version = "2.4.0"; variant = if cudaSupport then "-gpu" else ""; pname = "tensorflow${variant}"; pythonEnv = python.withPackages (_: [ # python deps needed during wheel build time (not runtime, see the buildPythonPackage part for that) - numpy - keras-preprocessing - protobuf - wrapt - gast - astor + # This list can likely be shortened, but each trial takes multiple hours so won't bother for now. absl-py - termcolor - keras-applications + astunparse + dill + flatbuffers-python + gast + google-pasta + grpcio + h5py + keras-preprocessing + numpy + opt-einsum + protobuf setuptools + six + tblib + tensorflow-estimator_2 + tensorflow-tensorboard_2 + termcolor + typing-extensions wheel - ] ++ lib.optionals (!isPy3k) - [ future - functools32 - mock + wrapt ]); bazel-build = buildBazelPackage { @@ -103,27 +110,21 @@ let owner = "tensorflow"; repo = "tensorflow"; rev = "v${version}"; - sha256 = "1lvmrqfnwzh24fl5rdkksiqfv2bn0ld5gvzq1z57rphfkf0zg996"; + sha256 = "0yl06aypfxrcs35828xf04mkidz1x0j89v0q5h4d2xps1cb5rv3f"; }; patches = [ - # Fixes for NixOS jsoncpp - ../system-jsoncpp.patch - + # Relax too strict Python packages versions dependencies. ./relax-dependencies.patch - - # see https://github.com/tensorflow/tensorflow/issues/40688 - (fetchpatch { - url = "https://github.com/tensorflow/tensorflow/commit/75ea0b31477d6ba9e990e296bbbd8ca4e7eebadf.patch"; - sha256 = "1xp1icacig0xm0nmb05sbrf4nw4xbln9fhc308birrv8286zx7wv"; - }) + # Add missing `io_bazel_rules_docker` dependency. + ./workspace.patch ]; # On update, it can be useful to steal the changes from gentoo # https://gitweb.gentoo.org/repo/gentoo.git/tree/sci-libs/tensorflow nativeBuildInputs = [ - swig which pythonEnv + which pythonEnv cython perl ] ++ lib.optional cudaSupport addOpenGLRunpath; buildInputs = [ @@ -135,19 +136,18 @@ let # libs taken from system through the TF_SYS_LIBS mechanism grpc sqlite - openssl + boringssl jsoncpp - pkgs.protobuf curl + pybind11 snappy - flatbuffers + flatbuffers-core icu double-conversion libpng - libjpeg + libjpeg_turbo giflib - re2 - pkgs.lmdb + lmdb-core ] ++ lib.optionals cudaSupport [ cudatoolkit cudnn @@ -173,10 +173,17 @@ let # "com_github_googleapis_googleapis" # "com_github_googlecloudplatform_google_cloud_cpp" "com_github_grpc_grpc" - "com_google_protobuf" - "com_googlesource_code_re2" + # Multiple issues with custom protobuf. + # First `com_github_googleapis` fails to configure. Can be worked around by disabling `com_github_googleapis` + # and related functionality, but then the next error is about "dangling symbolic link", and in general + # looks like that's only the beginning: see + # https://stackoverflow.com/questions/55578884/how-to-build-tensorflow-1-13-1-with-custom-protobuf + # "com_google_protobuf" + # Fails with the error: external/org_tensorflow/tensorflow/core/profiler/utils/tf_op_utils.cc:46:49: error: no matching function for call to 're2::RE2::FullMatch(absl::lts_2020_02_25::string_view&, re2::RE2&)' + # "com_googlesource_code_re2" "curl" "cython" + "dill_archive" "double_conversion" "enum34_archive" "flatbuffers" @@ -198,8 +205,9 @@ let "pybind11" "six_archive" "snappy" - "swig" + "tblib_archive" "termcolor_archive" + "typing_extensions_archive" "wrapt" "zlib" ]; @@ -224,18 +232,18 @@ let TF_CUDA_COMPUTE_CAPABILITIES = lib.concatStringsSep "," cudaCapabilities; postPatch = '' + # bazel 3.3 should work just as well as bazel 3.1 + rm -f .bazelversion + '' + lib.optionalString (!withTensorboard) '' # Tensorboard pulls in a bunch of dependencies, some of which may # include security vulnerabilities. So we make it optional. # https://github.com/tensorflow/tensorflow/issues/20280#issuecomment-400230560 - sed -i '/tensorboard >=/d' tensorflow/tools/pip_package/setup.py - - # numpy 1.19 added in https://github.com/tensorflow/tensorflow/commit/75ea0b31477d6ba9e990e296bbbd8ca4e7eebadf.patch - sed -i 's/numpy >= 1.16.0, < 1.19.0/numpy >= 1.16.0/' tensorflow/tools/pip_package/setup.py - - # bazel 3.3 should work just as well as bazel 3.1 - rm -f .bazelversion + sed -i '/tensorboard ~=/d' tensorflow/tools/pip_package/setup.py ''; + # https://github.com/tensorflow/tensorflow/pull/39470 + NIX_CFLAGS_COMPILE = [ "-Wno-stringop-truncation" ]; + preConfigure = let opt_flags = [] ++ lib.optionals sse42Support ["-msse4.2"] @@ -274,16 +282,15 @@ let bazelTarget = "//tensorflow/tools/pip_package:build_pip_package //tensorflow/tools/lib_package:libtensorflow"; removeRulesCC = false; + # Without this Bazel complaints about sandbox violations. + dontAddBazelOpts = true; fetchAttrs = { - # So that checksums don't depend on these. - TF_SYSTEM_LIBS = null; - # cudaSupport causes fetch of ncclArchive, resulting in different hashes sha256 = if cudaSupport then - "11blnw3ghp1kdi9hh9pdqa4qni9ysc3nk9iqqk9bg4dlr9zl1yld" + "0vyy1hv0jy5pqwvnc8pxb9isgnbw07c4a4d4wn61db00np114crz" else - "1kkghhwhl8frs68kv28r408lps7mpgq1xvq6hc3k0j35asv1g2kc"; + "0vczv5f9s4dxgwdkmf1y9b9ybh5d3y1nllqhb5q8aj9kq73izyn9"; }; buildAttrs = { @@ -320,21 +327,19 @@ let ''; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Computation using data flow graphs for scalable machine learning"; homepage = "http://tensorflow.org"; license = licenses.asl20; maintainers = with maintainers; [ jyp abbradar ]; platforms = with platforms; linux ++ darwin; - # The py2 build fails due to some issue importing protobuf. Possibly related to the fix in - # https://github.com/akesandgren/easybuild-easyblocks/commit/1f2e517ddfd1b00a342c6abb55aef3fd93671a2b - broken = !(xlaSupport -> cudaSupport) || !isPy3k; + broken = !(xlaSupport -> cudaSupport); }; }; in buildPythonPackage { inherit version pname; - disabled = isPy27; + disabled = !isPy3k; src = bazel-build.python; @@ -351,27 +356,23 @@ in buildPythonPackage { # tensorflow/tools/pip_package/setup.py propagatedBuildInputs = [ absl-py - astor + astunparse + dill + flatbuffers-python gast google-pasta - keras-applications + grpcio + h5py keras-preprocessing numpy - six + opt-einsum protobuf + six + tblib tensorflow-estimator_2 termcolor + typing-extensions wrapt - grpcio - opt-einsum - astunparse - h5py - ] ++ lib.optionals (!isPy3k) [ - mock - future - functools32 - ] ++ lib.optionals (pythonOlder "3.4") [ - backports_weakref enum34 ] ++ lib.optionals withTensorboard [ tensorflow-tensorboard_2 ]; diff --git a/pkgs/development/python-modules/tensorflow/no-saved-proto.patch b/pkgs/development/python-modules/tensorflow/no-saved-proto.patch deleted file mode 100644 index ead112f8ddd6..000000000000 --- a/pkgs/development/python-modules/tensorflow/no-saved-proto.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/tensorflow/cc/saved_model/BUILD b/tensorflow/cc/saved_model/BUILD -index 8626ed0087..27deb34387 100644 ---- a/tensorflow/cc/saved_model/BUILD -+++ b/tensorflow/cc/saved_model/BUILD -@@ -49,9 +49,6 @@ cc_library( - # tf_lib depending on the build platform. - "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", -- ]) + if_mobile([ -- # Mobile-friendly SavedModel proto. See go/portable-proto for more info. -- "//tensorflow/core:saved_model_portable_proto", - ]) + if_android([ - "//tensorflow/core:android_tensorflow_lib", - ]) + if_ios([ diff --git a/pkgs/development/python-modules/tensorflow/2/prefetcher.sh b/pkgs/development/python-modules/tensorflow/prefetcher.sh similarity index 100% rename from pkgs/development/python-modules/tensorflow/2/prefetcher.sh rename to pkgs/development/python-modules/tensorflow/prefetcher.sh diff --git a/pkgs/development/python-modules/tensorflow/relax-dependencies.patch b/pkgs/development/python-modules/tensorflow/relax-dependencies.patch new file mode 100644 index 000000000000..b26c1e95a645 --- /dev/null +++ b/pkgs/development/python-modules/tensorflow/relax-dependencies.patch @@ -0,0 +1,51 @@ +diff --git a/tensorflow/tools/pip_package/setup.py b/tensorflow/tools/pip_package/setup.py +index 65133afdafe..8ef6364ff7e 100644 +--- a/tensorflow/tools/pip_package/setup.py ++++ b/tensorflow/tools/pip_package/setup.py +@@ -75,23 +75,23 @@ if '--project_name' in sys.argv: + # comment the versioning scheme. + # NOTE: Please add test only packages to `TEST_PACKAGES` below. + REQUIRED_PACKAGES = [ +- 'absl-py ~= 0.10', +- 'astunparse ~= 1.6.3', +- 'flatbuffers ~= 1.12.0', +- 'google_pasta ~= 0.2', +- 'h5py ~= 2.10.0', +- 'keras_preprocessing ~= 1.1.2', +- 'numpy ~= 1.19.2', +- 'opt_einsum ~= 3.3.0', ++ 'absl-py >= 0.10', ++ 'astunparse >= 1.6.3', ++ 'flatbuffers >= 1.12.0', ++ 'google_pasta >= 0.2', ++ 'h5py >= 2.10.0', ++ 'keras_preprocessing >= 1.1.2', ++ 'numpy >= 1.19.1', ++ 'opt_einsum >= 3.3.0', + 'protobuf >= 3.9.2', +- 'six ~= 1.15.0', +- 'termcolor ~= 1.1.0', +- 'typing_extensions ~= 3.7.4', +- 'wheel ~= 0.35', +- 'wrapt ~= 1.12.1', ++ 'six >= 1.15.0', ++ 'termcolor >= 1.1.0', ++ 'typing_extensions >= 3.7.4', ++ 'wheel >= 0.34.2', ++ 'wrapt >= 1.12.1', + # These packages needs to be pinned exactly as newer versions are + # incompatible with the rest of the ecosystem +- 'gast == 0.3.3', ++ 'gast >= 0.3.3', + # TensorFlow ecosystem packages that TF exposes API for + # These need to be in sync with the existing TF version + # They are updated during the release process +@@ -118,7 +118,7 @@ if 'tf_nightly' in project_name: + # BoringSSL support. + # See https://github.com/tensorflow/tensorflow/issues/17882. + if sys.byteorder == 'little': +- REQUIRED_PACKAGES.append('grpcio ~= 1.32.0') ++ REQUIRED_PACKAGES.append('grpcio >= 1.31.0') + + + # Packages which are only needed for testing code. diff --git a/pkgs/development/python-modules/tensorflow/system-jsoncpp.patch b/pkgs/development/python-modules/tensorflow/system-jsoncpp.patch deleted file mode 100644 index ecb2d04d7eef..000000000000 --- a/pkgs/development/python-modules/tensorflow/system-jsoncpp.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/third_party/systemlibs/jsoncpp.BUILD b/third_party/systemlibs/jsoncpp.BUILD -index 526fd0c418..646f3fdcea 100644 ---- a/third_party/systemlibs/jsoncpp.BUILD -+++ b/third_party/systemlibs/jsoncpp.BUILD -@@ -7,6 +7,7 @@ filegroup( - - HEADERS = [ - "include/json/autolink.h", -+ "include/json/allocator.h", - "include/json/config.h", - "include/json/features.h", - "include/json/forwards.h", -@@ -23,7 +24,7 @@ genrule( - cmd = """ - for i in $(OUTS); do - i=$${i##*/} -- ln -sf $(INCLUDEDIR)/jsoncpp/json/$$i $(@D)/include/json/$$i -+ ln -sf $(INCLUDEDIR)/json/$$i $(@D)/include/json/$$i - done - """, - ) diff --git a/pkgs/development/python-modules/tensorflow/workspace.patch b/pkgs/development/python-modules/tensorflow/workspace.patch new file mode 100644 index 000000000000..15a527815ec3 --- /dev/null +++ b/pkgs/development/python-modules/tensorflow/workspace.patch @@ -0,0 +1,18 @@ +diff --git a/WORKSPACE b/WORKSPACE +index 9db1d9b80eb..c46f13f4ca4 100644 +--- a/WORKSPACE ++++ b/WORKSPACE +@@ -12,6 +12,13 @@ http_archive( + ], + ) + ++http_archive( ++ name = "io_bazel_rules_docker", ++ sha256 = "1698624e878b0607052ae6131aa216d45ebb63871ec497f26c67455b34119c80", ++ strip_prefix = "rules_docker-0.15.0", ++ urls = ["https://github.com/bazelbuild/rules_docker/releases/download/v0.15.0/rules_docker-v0.15.0.tar.gz"], ++) ++ + # Load tf_repositories() before loading dependencies for other repository so + # that dependencies like com_google_protobuf won't be overridden. + load("//tensorflow:workspace.bzl", "tf_repositories") diff --git a/pkgs/development/python-modules/termcolor/default.nix b/pkgs/development/python-modules/termcolor/default.nix index 7879482f17d7..df0f4d6208a3 100644 --- a/pkgs/development/python-modules/termcolor/default.nix +++ b/pkgs/development/python-modules/termcolor/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi }: @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "1d6d69ce66211143803fbc56652b41d73b4a400a2891d7bf7a1cdf4c02de613b"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Termcolor"; homepage = "https://pypi.python.org/pypi/termcolor"; license = licenses.mit; diff --git a/pkgs/development/python-modules/terminaltables/default.nix b/pkgs/development/python-modules/terminaltables/default.nix index bb6961f77ecf..28e49316ad71 100644 --- a/pkgs/development/python-modules/terminaltables/default.nix +++ b/pkgs/development/python-modules/terminaltables/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi }: @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "f3eb0eb92e3833972ac36796293ca0906e998dc3be91fbe1f8615b331b853b81"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Display simple tables in terminals"; homepage = "https://github.com/Robpol86/terminaltables"; license = licenses.mit; diff --git a/pkgs/development/python-modules/teslajsonpy/default.nix b/pkgs/development/python-modules/teslajsonpy/default.nix new file mode 100644 index 000000000000..c4520b1c1982 --- /dev/null +++ b/pkgs/development/python-modules/teslajsonpy/default.nix @@ -0,0 +1,39 @@ +{ lib +, aiohttp +, backoff +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, wrapt +}: + +buildPythonPackage rec { + pname = "teslajsonpy"; + version = "0.10.4"; + + src = fetchFromGitHub { + owner = "zabuldon"; + repo = pname; + rev = "v${version}"; + sha256 = "18frynmy47i9c24mdy819y2dnjwmhnmkly5mbmhikpbmm6d0yjf1"; + }; + + propagatedBuildInputs = [ + aiohttp + backoff + wrapt + ]; + + checkInputs = [ pytestCheckHook ]; + + # Not all Home Assistant related check pass + disabledTests = [ "test_values_on_init" ]; + pythonImportsCheck = [ "teslajsonpy" ]; + + meta = with lib; { + description = "Python library to work with Tesla API"; + homepage = "https://github.com/zabuldon/teslajsonpy"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/testpath/default.nix b/pkgs/development/python-modules/testpath/default.nix index 8357cd2c4568..a5ab52e5cdd5 100644 --- a/pkgs/development/python-modules/testpath/default.nix +++ b/pkgs/development/python-modules/testpath/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi }: @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "bfcf9411ef4bf3db7579063e0546938b1edda3d69f4e1fb8756991f5951f85d4"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Test utilities for code working with files and commands"; license = licenses.mit; homepage = "https://github.com/jupyter/testpath"; diff --git a/pkgs/development/python-modules/testrepository/default.nix b/pkgs/development/python-modules/testrepository/default.nix index f3c7e169207f..c249ca212b6d 100644 --- a/pkgs/development/python-modules/testrepository/default.nix +++ b/pkgs/development/python-modules/testrepository/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , testtools @@ -26,7 +26,7 @@ buildPythonPackage rec { ${python.interpreter} ./testr ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A database of test results which can be used as part of developer workflow"; homepage = "https://pypi.python.org/pypi/testrepository"; license = licenses.bsd2; diff --git a/pkgs/development/python-modules/testscenarios/default.nix b/pkgs/development/python-modules/testscenarios/default.nix index 751ab02670a3..465384edcb0c 100644 --- a/pkgs/development/python-modules/testscenarios/default.nix +++ b/pkgs/development/python-modules/testscenarios/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , testtools @@ -21,7 +21,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ testtools ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A pyunit extension for dependency injection"; homepage = "https://pypi.python.org/pypi/testscenarios"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/textx/default.nix b/pkgs/development/python-modules/textx/default.nix new file mode 100644 index 000000000000..07c568b87d48 --- /dev/null +++ b/pkgs/development/python-modules/textx/default.nix @@ -0,0 +1,36 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, pytestCheckHook +, arpeggio +, click +, jinja2 +}: + +buildPythonPackage rec { + pname = "textX"; + version = "2.2.0"; + + src = fetchPypi { + inherit pname; + inherit version; + sha256 = "00mwd588ms96qp27m5vpjkzk30wfw53hnmv8y77slxca8lw9vq82"; + }; + + checkInputs = [ pytestCheckHook ]; + + pytestFlagsArray = [ "tests/functional" ]; + + propagatedBuildInputs = [ + arpeggio + click + jinja2 + ]; + + meta = with stdenv.lib; { + description = "textX is a meta-language for building Domain-Specific Languages (DSLs) in Python"; + homepage = "https://textx.github.io"; + license = licenses.mit; + maintainers = with maintainers; [ mcaju ]; + }; +} diff --git a/pkgs/development/python-modules/thinc/default.nix b/pkgs/development/python-modules/thinc/default.nix index cfc926424605..bd520f2c4bfd 100644 --- a/pkgs/development/python-modules/thinc/default.nix +++ b/pkgs/development/python-modules/thinc/default.nix @@ -74,7 +74,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "thinc" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Practical Machine Learning for NLP in Python"; homepage = "https://github.com/explosion/thinc"; license = licenses.mit; diff --git a/pkgs/development/python-modules/threadpool/default.nix b/pkgs/development/python-modules/threadpool/default.nix index bbc3074c9642..7a1696feb665 100644 --- a/pkgs/development/python-modules/threadpool/default.nix +++ b/pkgs/development/python-modules/threadpool/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi }: @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "197gzrxn9lbk0q1v079814c6s05cr4rwzyl6c1m6inkyif4yzr6c"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://chrisarndt.de/projects/threadpool/"; description = "Easy to use object-oriented thread pool framework"; license = licenses.mit; diff --git a/pkgs/development/python-modules/three-merge/default.nix b/pkgs/development/python-modules/three-merge/default.nix new file mode 100644 index 000000000000..dab312c88455 --- /dev/null +++ b/pkgs/development/python-modules/three-merge/default.nix @@ -0,0 +1,24 @@ +{ lib, buildPythonPackage, fetchPypi, diff-match-patch }: + +buildPythonPackage rec { + pname = "three-merge"; + version = "0.1.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "0w6rv7rv1zm901wbjkmm6d3vkwyf3csja9p37bb60mar8khszxk0"; + }; + + propagatedBuildInputs = [ diff-match-patch ]; + + dontUseSetuptoolsCheck = true; + + pythonImportsCheck = [ "three_merge" ]; + + meta = with lib; { + description = "Simple library for merging two strings with respect to a base one"; + homepage = "https://github.com/spyder-ide/three-merge"; + license = licenses.mit; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/development/python-modules/thrift/default.nix b/pkgs/development/python-modules/thrift/default.nix index 999d950771c7..c7279b867b10 100644 --- a/pkgs/development/python-modules/thrift/default.nix +++ b/pkgs/development/python-modules/thrift/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , six @@ -18,7 +18,7 @@ buildPythonPackage rec { # No tests. Breaks when not disabling. doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Python bindings for the Apache Thrift RPC system"; homepage = "http://thrift.apache.org/"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/thumborpexif/default.nix b/pkgs/development/python-modules/thumborpexif/default.nix index 586045edc273..abfad4ffaac9 100644 --- a/pkgs/development/python-modules/thumborpexif/default.nix +++ b/pkgs/development/python-modules/thumborpexif/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , isPy27 @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "96dcc03ea6066d9546baf54f6841f4048b0b24a291eed65d098b3348c8872d99"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Module to parse and edit the EXIF data tags in a JPEG image"; homepage = "http://www.benno.id.au/code/pexif/"; license = licenses.mit; diff --git a/pkgs/development/python-modules/tilestache/default.nix b/pkgs/development/python-modules/tilestache/default.nix index d4e54fcc40e1..170360c133ed 100644 --- a/pkgs/development/python-modules/tilestache/default.nix +++ b/pkgs/development/python-modules/tilestache/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , modestmaps @@ -23,7 +23,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ modestmaps pillow pycairo python-mapnik simplejson werkzeug ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A tile server for rendered geographic data"; homepage = "http://tilestache.org"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/timelib/default.nix b/pkgs/development/python-modules/timelib/default.nix index 559dd0dd92f0..65b121ddfafd 100644 --- a/pkgs/development/python-modules/timelib/default.nix +++ b/pkgs/development/python-modules/timelib/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi }: @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "6ac9f79b09b63bbc07db88525c1f62de1f6d50b0fd9937a0cb05e3d38ce0af45"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Parse english textual date descriptions"; homepage = "https://github.com/pediapress/timelib/"; license = licenses.zlib; diff --git a/pkgs/development/python-modules/timeout-decorator/default.nix b/pkgs/development/python-modules/timeout-decorator/default.nix index d3b4a58c17e3..b1160cafe309 100644 --- a/pkgs/development/python-modules/timeout-decorator/default.nix +++ b/pkgs/development/python-modules/timeout-decorator/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi }: +{ lib, stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "timeout-decorator"; version = "0.5.0"; @@ -8,7 +8,7 @@ buildPythonPackage rec { sha256 = "6a2f2f58db1c5b24a2cc79de6345760377ad8bdc13813f5265f6c3e63d16b3d7"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Timeout decorator"; license = licenses.mit; homepage = "https://github.com/pnpnpn/timeout-decorator"; diff --git a/pkgs/development/python-modules/tissue/default.nix b/pkgs/development/python-modules/tissue/default.nix index 8f551ab5926d..fc4316c98fe9 100644 --- a/pkgs/development/python-modules/tissue/default.nix +++ b/pkgs/development/python-modules/tissue/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , nose @@ -17,7 +17,7 @@ buildPythonPackage rec { buildInputs = [ nose ]; propagatedBuildInputs = [ pep8 ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/WoLpH/tissue"; description = "Tissue - automated pep8 checker for nose"; license = licenses.lgpl2; diff --git a/pkgs/development/python-modules/tld/default.nix b/pkgs/development/python-modules/tld/default.nix index 43a2e46dcfb9..13f23edaad15 100644 --- a/pkgs/development/python-modules/tld/default.nix +++ b/pkgs/development/python-modules/tld/default.nix @@ -1,39 +1,39 @@ -{ stdenv, fetchPypi, python }: +{ lib +, buildPythonPackage +, factory_boy +, faker +, fetchPypi +, pytest-cov +, pytestCheckHook +, six +, tox +}: -python.pkgs.buildPythonPackage rec { - pname = "tld"; - version = "0.12.3"; +buildPythonPackage rec { + pname = "tld"; + version = "0.12.5"; src = fetchPypi { inherit pname version; - sha256 = "1959d0db03b7644f5528748f348d5eecdcd27120a8bb4ef00d932b1b1acdf13d"; + sha256 = "0d1lbbg2qdw5jjxks0dqlf69bki5885mhj8ysvgylmrni56hjqqv"; }; - propagatedBuildInputs = with python.pkgs; [ six ]; - checkInputs = with python.pkgs; [ factory_boy faker pytestcov tox pytestCheckHook]; - - # https://github.com/barseghyanartur/tld/issues/54 - disabledTests = [ - "test_1_update_tld_names" - "test_1_update_tld_names_command" - "test_2_update_tld_names_module" + checkInputs = [ + factory_boy + faker + pytest-cov + pytestCheckHook + tox ]; - preCheck = '' - export PATH="$PATH:$out/bin" - ''; + pythonImportsCheck = [ "tld" ]; - dontUseSetuptoolsCheck = true; - - pythonImportsCheck = [ - "tld" - ]; - - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/barseghyanartur/tld"; description = "Extracts the top level domain (TLD) from the URL given"; - license = licenses.lgpl21; - maintainers = with maintainers; [ ]; + # https://github.com/barseghyanartur/tld/blob/master/README.rst#license + # MPL-1.1 OR GPL-2.0-only OR LGPL-2.1-or-later + license = with licenses; [ lgpl21Plus mpl11 gpl2Only ]; + maintainers = with maintainers; [ fab ]; }; - } diff --git a/pkgs/development/python-modules/tlsh/default.nix b/pkgs/development/python-modules/tlsh/default.nix index 3448d40cf3a4..302b113364d2 100644 --- a/pkgs/development/python-modules/tlsh/default.nix +++ b/pkgs/development/python-modules/tlsh/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchFromGitHub , cmake @@ -24,7 +24,7 @@ buildPythonPackage { cd ../py_ext ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Trend Micro Locality Sensitive Hash"; homepage = "https://github.com/trendmicro/tlsh"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/tlslite-ng/default.nix b/pkgs/development/python-modules/tlslite-ng/default.nix index 7c8bb17b8b70..a952c95d93e4 100644 --- a/pkgs/development/python-modules/tlslite-ng/default.nix +++ b/pkgs/development/python-modules/tlslite-ng/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , ecdsa @@ -15,7 +15,7 @@ buildPythonPackage rec { buildInputs = [ ecdsa ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Pure python implementation of SSL and TLS."; homepage = "https://pypi.python.org/pypi/tlslite-ng"; license = licenses.lgpl2; diff --git a/pkgs/development/python-modules/tlslite/default.nix b/pkgs/development/python-modules/tlslite/default.nix index ac0c572ec3e7..a1e78c5db76c 100644 --- a/pkgs/development/python-modules/tlslite/default.nix +++ b/pkgs/development/python-modules/tlslite/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi }: @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "9b9a487694c239efea8cec4454a99a56ee1ae1a5f3af0858ccf8029e2ac2d42d"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A pure Python implementation of SSL and TLS"; homepage = "https://pypi.python.org/pypi/tlslite"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/tmb/default.nix b/pkgs/development/python-modules/tmb/default.nix new file mode 100644 index 000000000000..88bda79b8b35 --- /dev/null +++ b/pkgs/development/python-modules/tmb/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, requests +}: + +buildPythonPackage rec { + pname = "tmb"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "alemuro"; + repo = pname; + rev = version; + sha256 = "0fmwm9dz2mik9zni50wrnw7k9ld4l4w3p92aws6jcrdfxfi7aq7p"; + }; + + propagatedBuildInputs = [ requests ]; + + # Project has no tests + doCheck = false; + pythonImportsCheck = [ "tmb" ]; + + meta = with lib; { + homepage = "https://github.com/alemuro/tmb"; + description = "Python library that interacts with TMB API"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/toggl-cli/default.nix b/pkgs/development/python-modules/toggl-cli/default.nix index 89c612abfef8..875e70cee58e 100644 --- a/pkgs/development/python-modules/toggl-cli/default.nix +++ b/pkgs/development/python-modules/toggl-cli/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, pythonAtLeast, pythonOlder +{ lib, stdenv, buildPythonPackage, fetchPypi, pythonAtLeast, pythonOlder , click , click-completion , factory_boy @@ -19,13 +19,13 @@ buildPythonPackage rec { pname = "toggl-cli"; - version = "2.2.1"; + version = "2.4.1"; disabled = pythonOlder "3.5"; src = fetchPypi { pname = "togglCli"; inherit version; - sha256 = "1izsxag98lvivkwf7724g2ak6icjak9jdqphaq1a79kwdnqprx1m"; + sha256 = "19lry8adcznzmzbvghyid3yl4j05db6931bw38af5vrkkyzyf62i"; }; postPatch = '' @@ -61,7 +61,7 @@ buildPythonPackage rec { validate-email ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://toggl.uhlir.dev/"; description = "Command line tool and set of Python wrapper classes for interacting with toggl's API"; license = licenses.mit; diff --git a/pkgs/development/python-modules/tokenizers/default.nix b/pkgs/development/python-modules/tokenizers/default.nix index 4e5aacd6c7ac..d5d92b19061a 100644 --- a/pkgs/development/python-modules/tokenizers/default.nix +++ b/pkgs/development/python-modules/tokenizers/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , rustPlatform , fetchFromGitHub , fetchurl @@ -105,7 +105,7 @@ in rustPlatform.buildRustPackage rec { pipInstallPhase ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/huggingface/tokenizers"; description = "Fast State-of-the-Art Tokenizers optimized for Research and Production"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/tokenlib/default.nix b/pkgs/development/python-modules/tokenlib/default.nix index 7c8e99cc399a..2bed18870166 100644 --- a/pkgs/development/python-modules/tokenlib/default.nix +++ b/pkgs/development/python-modules/tokenlib/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchFromGitHub , requests @@ -18,7 +18,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests webob ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/mozilla-services/tokenlib"; description = "Generic support library for signed-token-based auth schemes"; license = licenses.mpl20; diff --git a/pkgs/development/python-modules/toml/default.nix b/pkgs/development/python-modules/toml/default.nix index 96c6635771c7..0d0d87c73d11 100644 --- a/pkgs/development/python-modules/toml/default.nix +++ b/pkgs/development/python-modules/toml/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi }: +{ lib, stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "toml"; @@ -14,7 +14,7 @@ buildPythonPackage rec { # git to download a test suite. doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "a Python library for parsing and creating TOML"; homepage = "https://github.com/uiri/toml"; license = licenses.mit; diff --git a/pkgs/development/python-modules/toposort/default.nix b/pkgs/development/python-modules/toposort/default.nix index f1767862ad32..43df3c4e21e9 100644 --- a/pkgs/development/python-modules/toposort/default.nix +++ b/pkgs/development/python-modules/toposort/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi }: @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "a7428f56ef844f5055bb9e9e44b343983773ae6dce0fe5b101e08e27ffbd50ac"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A topological sort algorithm"; homepage = "https://pypi.python.org/pypi/toposort/1.1"; maintainers = with maintainers; [ tstrobel ]; diff --git a/pkgs/development/python-modules/torchvision/default.nix b/pkgs/development/python-modules/torchvision/default.nix index ea702a78fe1d..928616eb4f8a 100644 --- a/pkgs/development/python-modules/torchvision/default.nix +++ b/pkgs/development/python-modules/torchvision/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchFromGitHub , ninja @@ -41,7 +41,7 @@ buildPythonPackage rec { checkInputs = [ pytest ]; - meta = with stdenv.lib; { + meta = with lib; { description = "PyTorch vision library"; homepage = "https://pytorch.org/"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/traceback2/default.nix b/pkgs/development/python-modules/traceback2/default.nix index 3a70df1548d0..5309ae47a02d 100644 --- a/pkgs/development/python-modules/traceback2/default.nix +++ b/pkgs/development/python-modules/traceback2/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , pbr @@ -19,7 +19,7 @@ buildPythonPackage rec { # circular dependencies for tests doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "A backport of traceback to older supported Pythons"; homepage = "https://pypi.python.org/pypi/traceback2/"; license = licenses.psfl; diff --git a/pkgs/development/python-modules/tracing/default.nix b/pkgs/development/python-modules/tracing/default.nix index 6f9091d8517f..f4c01f003a9a 100644 --- a/pkgs/development/python-modules/tracing/default.nix +++ b/pkgs/development/python-modules/tracing/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchurl , sphinx @@ -18,7 +18,7 @@ buildPythonPackage rec { # error: invalid command 'test' doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://liw.fi/tracing/"; description = "Python debug logging helper"; license = licenses.gpl3; diff --git a/pkgs/development/python-modules/trackpy/default.nix b/pkgs/development/python-modules/trackpy/default.nix index 6d198534149d..6132a30c4141 100644 --- a/pkgs/development/python-modules/trackpy/default.nix +++ b/pkgs/development/python-modules/trackpy/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchFromGitHub , numpy @@ -49,7 +49,7 @@ buildPythonPackage rec { --ignore trackpy/tests/test_legacy_linking.py ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Particle-tracking toolkit"; homepage = "https://github.com/soft-matter/trackpy"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/traits/default.nix b/pkgs/development/python-modules/traits/default.nix index 789ba7a1691e..e3bc8b43fe4e 100644 --- a/pkgs/development/python-modules/traits/default.nix +++ b/pkgs/development/python-modules/traits/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , isPy27 @@ -31,7 +31,7 @@ buildPythonPackage rec { # Furthermore, some tests fail due to being in a chroot doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Explicitly typed attributes for Python"; homepage = "https://pypi.python.org/pypi/traits"; license = "BSD"; diff --git a/pkgs/development/python-modules/transaction/default.nix b/pkgs/development/python-modules/transaction/default.nix index 887c46863362..def2559a72d0 100644 --- a/pkgs/development/python-modules/transaction/default.nix +++ b/pkgs/development/python-modules/transaction/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchPypi , buildPythonPackage , zope_interface @@ -17,7 +17,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ zope_interface mock ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Transaction management"; homepage = "https://pypi.python.org/pypi/transaction"; license = licenses.zpl20; diff --git a/pkgs/development/python-modules/transformers/default.nix b/pkgs/development/python-modules/transformers/default.nix index bd9040668c08..743cbebea755 100644 --- a/pkgs/development/python-modules/transformers/default.nix +++ b/pkgs/development/python-modules/transformers/default.nix @@ -1,5 +1,5 @@ { buildPythonPackage -, stdenv +, lib, stdenv , fetchFromGitHub , isPy39 , cookiecutter @@ -97,7 +97,7 @@ buildPythonPackage rec { "test_tokenizer_identifier_non_existent" ]; - meta = with stdenv.lib; { + meta = with 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}"; diff --git a/pkgs/development/python-modules/transip/default.nix b/pkgs/development/python-modules/transip/default.nix index 8ea70a19ead4..e270d5a0662d 100644 --- a/pkgs/development/python-modules/transip/default.nix +++ b/pkgs/development/python-modules/transip/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchFromGitHub , isPy27 @@ -32,7 +32,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests cryptography suds-jurko ]; - meta = with stdenv.lib; { + meta = with lib; { description = "TransIP API Connector"; homepage = "https://github.com/benkonrath/transip-api"; license = licenses.mit; diff --git a/pkgs/development/python-modules/transitions/default.nix b/pkgs/development/python-modules/transitions/default.nix index 2691890a5ee1..82958029923a 100644 --- a/pkgs/development/python-modules/transitions/default.nix +++ b/pkgs/development/python-modules/transitions/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ lib, stdenv, buildPythonPackage, fetchPypi , six, nose, mock, dill, pycodestyle }: buildPythonPackage rec { @@ -22,7 +22,7 @@ buildPythonPackage rec { nosetests ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/pytransitions/transitions"; description = "A lightweight, object-oriented finite state machine implementation in Python"; license = licenses.mit; diff --git a/pkgs/development/python-modules/translationstring/default.nix b/pkgs/development/python-modules/translationstring/default.nix index 013615de800b..2f39b57b480f 100644 --- a/pkgs/development/python-modules/translationstring/default.nix +++ b/pkgs/development/python-modules/translationstring/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi }: @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "bf947538d76e69ba12ab17283b10355a9ecfbc078e6123443f43f2107f6376f3"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://pylonsproject.org/"; description = "Utility library for i18n relied on by various Repoze and Pyramid packages"; license = licenses.bsd0; diff --git a/pkgs/development/python-modules/transmissionrpc/default.nix b/pkgs/development/python-modules/transmissionrpc/default.nix index eb209a0d49ec..a128b150579a 100644 --- a/pkgs/development/python-modules/transmissionrpc/default.nix +++ b/pkgs/development/python-modules/transmissionrpc/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , six @@ -15,7 +15,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Python implementation of the Transmission bittorent client RPC protocol"; homepage = "https://pypi.python.org/pypi/transmissionrpc/"; license = licenses.mit; diff --git a/pkgs/development/python-modules/treq/default.nix b/pkgs/development/python-modules/treq/default.nix index 919ef529407a..477223e96186 100644 --- a/pkgs/development/python-modules/treq/default.nix +++ b/pkgs/development/python-modules/treq/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage, service-identity, requests, six +{ lib, stdenv, fetchPypi, buildPythonPackage, service-identity, requests, six , mock, twisted, incremental, pep8, httpbin }: @@ -47,7 +47,7 @@ buildPythonPackage rec { # Failing tests https://github.com/twisted/treq/issues/208 doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/twisted/treq"; description = "A requests-like API built on top of twisted.web's Agent"; license = licenses.mit; diff --git a/pkgs/development/python-modules/trezor_agent/default.nix b/pkgs/development/python-modules/trezor_agent/default.nix index 82cb14b31cb1..537b4db7995a 100644 --- a/pkgs/development/python-modules/trezor_agent/default.nix +++ b/pkgs/development/python-modules/trezor_agent/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , trezor @@ -24,7 +24,10 @@ buildPythonPackage rec { propagatedBuildInputs = [ setuptools trezor libagent ecdsa ed25519 mnemonic keepkey semver wheel pinentry ]; - meta = with stdenv.lib; { + doCheck = false; + pythonImportsCheck = [ "libagent" ]; + + meta = with lib; { description = "Using Trezor as hardware SSH agent"; homepage = "https://github.com/romanz/trezor-agent"; license = licenses.gpl3; diff --git a/pkgs/development/python-modules/trimesh/default.nix b/pkgs/development/python-modules/trimesh/default.nix index 251d6c3d94dd..b157e32ed876 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.8.19"; + version = "3.9.1"; src = fetchPypi { inherit pname version; - sha256 = "e2ec4fc75bddf46fd494a9c95adc0bf0fe6f667cae242ead99955ad659d6e375"; + sha256 = "d19cbdb830a17297aa218ba6ce4955fc11b4b553414289cfd71f58f8144cc91f"; }; propagatedBuildInputs = [ numpy ]; diff --git a/pkgs/development/python-modules/trollius/default.nix b/pkgs/development/python-modules/trollius/default.nix index b81a92d08e66..019326c54217 100644 --- a/pkgs/development/python-modules/trollius/default.nix +++ b/pkgs/development/python-modules/trollius/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { sed -i -e "s|test_write_pty|skip_test_write_pty|g" tests/test_events.py ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Port of the asyncio project to Python 2.7"; homepage = "https://github.com/vstinner/trollius"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/trueskill/default.nix b/pkgs/development/python-modules/trueskill/default.nix index 18033aff391c..0c3efa404ec6 100644 --- a/pkgs/development/python-modules/trueskill/default.nix +++ b/pkgs/development/python-modules/trueskill/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ lib, stdenv, buildPythonPackage, fetchPypi , six }: buildPythonPackage rec { @@ -17,7 +17,7 @@ buildPythonPackage rec { # Can't build distribute, see https://github.com/NixOS/nixpkgs/pull/49340 doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "The video game rating system"; homepage = "https://trueskill.org"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/trytond/default.nix b/pkgs/development/python-modules/trytond/default.nix index 781604fb9b0f..7db53969402b 100644 --- a/pkgs/development/python-modules/trytond/default.nix +++ b/pkgs/development/python-modules/trytond/default.nix @@ -25,12 +25,12 @@ with stdenv.lib; buildPythonApplication rec { pname = "trytond"; - version = "5.8.1"; + version = "5.8.2"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "9c1afca73b13ede07680015d69f611c7dec33b8c22565de70f0cbbf0464b8db7"; + sha256 = "dea7d11ec0b4584a438fab7a1acb56864b32cc9e7d6ffa166572f75a2b033dc0"; }; # Tells the tests which database to use diff --git a/pkgs/development/python-modules/ttystatus/default.nix b/pkgs/development/python-modules/ttystatus/default.nix index a76a5f8df383..24eb10637078 100644 --- a/pkgs/development/python-modules/ttystatus/default.nix +++ b/pkgs/development/python-modules/ttystatus/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchurl , sphinx @@ -20,7 +20,7 @@ buildPythonPackage rec { # error: invalid command 'test' doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://liw.fi/ttystatus/"; description = "Progress and status updates on terminals for Python"; license = licenses.gpl3; diff --git a/pkgs/development/python-modules/tumpa/default.nix b/pkgs/development/python-modules/tumpa/default.nix new file mode 100644 index 000000000000..28560feb04fb --- /dev/null +++ b/pkgs/development/python-modules/tumpa/default.nix @@ -0,0 +1,36 @@ +{ stdenv +, buildPythonPackage +, fetchFromGitHub +, setuptools +, pyside2 +, johnnycanencrypt +, pythonOlder +}: + +buildPythonPackage rec { + pname = "tumpa"; + version = "0.1.1"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "kushaldas"; + repo = "tumpa"; + rev = "v${version}"; + sha256 = "1wvs64s0jxn4p8zr643d2hcczw3a175r6ib3481gdhjx38kgxjbq"; + }; + + propagatedBuildInputs = [ + setuptools + johnnycanencrypt + pyside2 + ]; + + doCheck = false; + + meta = with stdenv.lib; { + description = "OpenPGP key creation and smartcard access"; + homepage = "https://github.com/kushaldas/tumpa"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ _0x4A6F ]; + }; +} diff --git a/pkgs/development/python-modules/tvdb_api/default.nix b/pkgs/development/python-modules/tvdb_api/default.nix index beabc8c23106..f2cdbe8dc633 100644 --- a/pkgs/development/python-modules/tvdb_api/default.nix +++ b/pkgs/development/python-modules/tvdb_api/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , requests-cache @@ -21,7 +21,7 @@ buildPythonPackage rec { # requires network access doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Simple to use TVDB (thetvdb.com) API in Python"; homepage = "https://github.com/dbr/tvdb_api"; license = licenses.unlicense; diff --git a/pkgs/development/python-modules/tvnamer/default.nix b/pkgs/development/python-modules/tvnamer/default.nix index 81fa2e61b02a..fa155b86f407 100644 --- a/pkgs/development/python-modules/tvnamer/default.nix +++ b/pkgs/development/python-modules/tvnamer/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , pytest @@ -20,7 +20,7 @@ buildPythonPackage rec { # a ton of tests fail with: IOError: tvnamer/main.py could not be found in . or .. doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Automatic TV episode file renamer, uses data from thetvdb.com via tvdb_api."; homepage = "https://github.com/dbr/tvnamer"; license = licenses.unlicense; diff --git a/pkgs/development/python-modules/twiggy/default.nix b/pkgs/development/python-modules/twiggy/default.nix index fdff4a90f9e1..9647dc8ae67c 100644 --- a/pkgs/development/python-modules/twiggy/default.nix +++ b/pkgs/development/python-modules/twiggy/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , six @@ -16,7 +16,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six ]; doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://twiggy.wearpants.org"; # Taken from http://i.wearpants.org/blog/meet-twiggy/ description = "Twiggy is the first totally new design for a logger since log4j"; diff --git a/pkgs/development/python-modules/twilio/default.nix b/pkgs/development/python-modules/twilio/default.nix index d4cd7b5d59bf..7931a4ad0ec9 100644 --- a/pkgs/development/python-modules/twilio/default.nix +++ b/pkgs/development/python-modules/twilio/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub +{ lib, stdenv, buildPythonPackage, fetchFromGitHub , pyjwt, pysocks, pytz, requests, six, nose, mock }: buildPythonPackage rec { @@ -16,7 +16,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pyjwt pysocks pytz six requests ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Twilio API client and TwiML generator"; homepage = "https://github.com/twilio/twilio-python/"; license = licenses.mit; diff --git a/pkgs/development/python-modules/twisted/default.nix b/pkgs/development/python-modules/twisted/default.nix index d38d6aebcbd8..efec0b737bce 100644 --- a/pkgs/development/python-modules/twisted/default.nix +++ b/pkgs/development/python-modules/twisted/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , python @@ -49,7 +49,7 @@ buildPythonPackage rec { # Tests require network doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://twistedmatrix.com/"; description = "Twisted, an event-driven networking engine written in Python"; longDescription = '' diff --git a/pkgs/development/python-modules/twitter-common-collections/default.nix b/pkgs/development/python-modules/twitter-common-collections/default.nix index d562eac5cc7d..72f30514dc67 100644 --- a/pkgs/development/python-modules/twitter-common-collections/default.nix +++ b/pkgs/development/python-modules/twitter-common-collections/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , twitter-common-lang @@ -15,7 +15,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ twitter-common-lang ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Twitter's common collections"; homepage = "https://twitter.github.io/commons/"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/twitter-common-confluence/default.nix b/pkgs/development/python-modules/twitter-common-confluence/default.nix index 1253b8077e75..ee5bf9bdbe10 100644 --- a/pkgs/development/python-modules/twitter-common-confluence/default.nix +++ b/pkgs/development/python-modules/twitter-common-confluence/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , twitter-common-log @@ -15,7 +15,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ twitter-common-log ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Twitter's API to the confluence wiki"; homepage = "https://twitter.github.io/commons/"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/twitter-common-dirutil/default.nix b/pkgs/development/python-modules/twitter-common-dirutil/default.nix index df2f614c5a04..14b0bcd0673c 100644 --- a/pkgs/development/python-modules/twitter-common-dirutil/default.nix +++ b/pkgs/development/python-modules/twitter-common-dirutil/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , twitter-common-lang @@ -15,7 +15,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ twitter-common-lang ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Utilities for manipulating and finding files and directories"; homepage = "https://twitter.github.io/commons/"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/twitter-common-lang/default.nix b/pkgs/development/python-modules/twitter-common-lang/default.nix index 59f6d74ad67a..4b4a5c0fc2e2 100644 --- a/pkgs/development/python-modules/twitter-common-lang/default.nix +++ b/pkgs/development/python-modules/twitter-common-lang/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi }: @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "6e967ca2b5bb96ea749d21052f45b18e37deb5cc160eb12c64a8f1cb9dba7a22"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Twitter's 2.x / 3.x compatibility swiss-army knife"; homepage = "https://twitter.github.io/commons/"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/twitter-common-log/default.nix b/pkgs/development/python-modules/twitter-common-log/default.nix index 1c3d1808f5dd..8cf99c39dc20 100644 --- a/pkgs/development/python-modules/twitter-common-log/default.nix +++ b/pkgs/development/python-modules/twitter-common-log/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , twitter-common-options @@ -16,7 +16,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ twitter-common-options twitter-common-dirutil ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Twitter's common logging library"; homepage = "https://twitter.github.io/commons/"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/twitter-common-options/default.nix b/pkgs/development/python-modules/twitter-common-options/default.nix index 12e55a46ab8e..a5505330bc0a 100644 --- a/pkgs/development/python-modules/twitter-common-options/default.nix +++ b/pkgs/development/python-modules/twitter-common-options/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi }: @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "a495bcdffc410039bc4166f1a30c2caa3c92769d7a161a4a39d3651836dd27e1"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Twitter's optparse wrapper"; homepage = "https://twitter.github.io/commons/"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/twitter/default.nix b/pkgs/development/python-modules/twitter/default.nix index 2e8481198a41..23d647d93153 100644 --- a/pkgs/development/python-modules/twitter/default.nix +++ b/pkgs/development/python-modules/twitter/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi }: @@ -14,7 +14,7 @@ buildPythonPackage rec { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Twitter API library"; license = licenses.mit; maintainers = with maintainers; [ thoughtpolice ]; diff --git a/pkgs/development/python-modules/txaio/default.nix b/pkgs/development/python-modules/txaio/default.nix index 7e87a2d59ea4..4d756fa89f3f 100644 --- a/pkgs/development/python-modules/txaio/default.nix +++ b/pkgs/development/python-modules/txaio/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, pytest, mock, six, twisted, isPy37, isPy27 }: +{ lib, stdenv, buildPythonPackage, fetchPypi, pytest, mock, six, twisted, isPy37, isPy27 }: buildPythonPackage rec { pname = "txaio"; @@ -21,7 +21,7 @@ buildPythonPackage rec { # Needs some fixing doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Utilities to support code that runs unmodified on Twisted and asyncio."; homepage = "https://github.com/crossbario/txaio"; license = licenses.mit; diff --git a/pkgs/development/python-modules/txamqp/default.nix b/pkgs/development/python-modules/txamqp/default.nix index db973dbffbed..f0e3904a8815 100644 --- a/pkgs/development/python-modules/txamqp/default.nix +++ b/pkgs/development/python-modules/txamqp/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , twisted @@ -15,7 +15,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ twisted ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/txamqp/txamqp"; description = "Library for communicating with AMQP peers and brokers using Twisted"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/txdbus/default.nix b/pkgs/development/python-modules/txdbus/default.nix index f6bc44981fb1..461ddeee34b4 100644 --- a/pkgs/development/python-modules/txdbus/default.nix +++ b/pkgs/development/python-modules/txdbus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, six, twisted }: +{ lib, stdenv, buildPythonPackage, fetchPypi, six, twisted }: buildPythonPackage rec { pname = "txdbus"; @@ -12,7 +12,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six twisted ]; pythonImportsCheck = [ "txdbus" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Native Python implementation of DBus for Twisted"; homepage = "https://github.com/cocagne/txdbus"; license = licenses.mit; diff --git a/pkgs/development/python-modules/txgithub/default.nix b/pkgs/development/python-modules/txgithub/default.nix index 5340b202e688..402e5011ede6 100644 --- a/pkgs/development/python-modules/txgithub/default.nix +++ b/pkgs/development/python-modules/txgithub/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , pyopenssl @@ -29,7 +29,7 @@ buildPythonPackage rec { # No tests distributed doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "GitHub API client implemented using Twisted."; homepage = "https://github.com/tomprince/txgithub"; license = licenses.mit; diff --git a/pkgs/development/python-modules/txrequests/default.nix b/pkgs/development/python-modules/txrequests/default.nix index ee7d09d51657..06979e2b9b39 100644 --- a/pkgs/development/python-modules/txrequests/default.nix +++ b/pkgs/development/python-modules/txrequests/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , twisted @@ -25,7 +25,7 @@ buildPythonPackage rec { ${python.interpreter} -m unittest discover ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Asynchronous Python HTTP for Humans."; homepage = "https://github.com/tardyp/txrequests"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/typeguard/default.nix b/pkgs/development/python-modules/typeguard/default.nix index ee36a6dab810..448e52af7afa 100644 --- a/pkgs/development/python-modules/typeguard/default.nix +++ b/pkgs/development/python-modules/typeguard/default.nix @@ -1,7 +1,7 @@ { buildPythonPackage , fetchPypi , pythonOlder -, stdenv +, lib, stdenv , setuptools_scm , pytest , typing-extensions @@ -34,7 +34,7 @@ buildPythonPackage rec { disabled = pythonOlder "3.3"; - meta = with stdenv.lib; { + meta = with lib; { description = "This library provides run-time type checking for functions defined with argument type annotations"; homepage = "https://github.com/agronholm/typeguard"; license = licenses.mit; diff --git a/pkgs/development/python-modules/typesystem/default.nix b/pkgs/development/python-modules/typesystem/default.nix index bfaed58b13fb..e993363769a8 100644 --- a/pkgs/development/python-modules/typesystem/default.nix +++ b/pkgs/development/python-modules/typesystem/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchFromGitHub , isPy27 -, pytest +, pytestCheckHook , pytestcov , jinja2 , pyyaml @@ -26,14 +26,11 @@ buildPythonPackage rec { ]; checkInputs = [ - pytest + pytestCheckHook pytestcov ]; - # for some reason jinja2 not picking up forms directory (1% of tests) - checkPhase = '' - pytest --ignore=tests/test_forms.py - ''; + disabledTests = [ "test_to_json_schema_complex_regular_expression" ]; meta = with lib; { description = "A type system library for Python"; diff --git a/pkgs/development/python-modules/typing-inspect/default.nix b/pkgs/development/python-modules/typing-inspect/default.nix index 849b56d2d0c2..569096cb466c 100644 --- a/pkgs/development/python-modules/typing-inspect/default.nix +++ b/pkgs/development/python-modules/typing-inspect/default.nix @@ -3,6 +3,7 @@ , fetchPypi , typing-extensions , mypy-extensions +, isPy39 }: buildPythonPackage rec { @@ -25,5 +26,6 @@ buildPythonPackage rec { homepage = "https://github.com/ilevkivskyi/typing_inspect"; license = licenses.mit; maintainers = with maintainers; [ albakham ]; + broken = isPy39; # see https://github.com/ilevkivskyi/typing_inspect/issues/65 }; } diff --git a/pkgs/development/python-modules/typogrify/default.nix b/pkgs/development/python-modules/typogrify/default.nix index f5724877bf2b..faa1c8641c05 100644 --- a/pkgs/development/python-modules/typogrify/default.nix +++ b/pkgs/development/python-modules/typogrify/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , isPyPy @@ -22,7 +22,7 @@ buildPythonPackage rec { # Wants to set up Django doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Filters to enhance web typography, including support for Django & Jinja templates"; homepage = "https://github.com/mintchaos/typogrify"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/tzlocal/default.nix b/pkgs/development/python-modules/tzlocal/default.nix index e5ab11595303..df0923833fd5 100644 --- a/pkgs/development/python-modules/tzlocal/default.nix +++ b/pkgs/development/python-modules/tzlocal/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ lib, stdenv, buildPythonPackage, fetchPypi , pytz }: buildPythonPackage rec { @@ -15,7 +15,7 @@ buildPythonPackage rec { # test fail (timezone test fail) doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Tzinfo object for the local timezone"; homepage = "https://github.com/regebro/tzlocal"; license = licenses.cddl; diff --git a/pkgs/development/python-modules/ua-parser/default.nix b/pkgs/development/python-modules/ua-parser/default.nix index 875f0ee2075a..370ed527d193 100644 --- a/pkgs/development/python-modules/ua-parser/default.nix +++ b/pkgs/development/python-modules/ua-parser/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, pyyaml }: +{ lib, stdenv, buildPythonPackage, fetchPypi, pyyaml }: buildPythonPackage rec { pname = "ua-parser"; @@ -13,7 +13,7 @@ buildPythonPackage rec { doCheck = false; # requires files from uap-core - meta = with stdenv.lib; { + meta = with lib; { description = "A python implementation of the UA Parser"; homepage = "https://github.com/ua-parser/uap-python"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/ujson/2.nix b/pkgs/development/python-modules/ujson/2.nix index e1d1185f6f5e..f31b26a1960a 100644 --- a/pkgs/development/python-modules/ujson/2.nix +++ b/pkgs/development/python-modules/ujson/2.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , setuptools_scm @@ -20,7 +20,7 @@ buildPythonPackage rec { pytestCheckHook ]; - meta = with stdenv.lib; { + meta = with 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 e7a9ee8f35a7..1c12a092a2f5 100644 --- a/pkgs/development/python-modules/ujson/default.nix +++ b/pkgs/development/python-modules/ujson/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , isPy3k @@ -18,7 +18,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools_scm ]; - meta = with stdenv.lib; { + meta = with 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/umalqurra/default.nix b/pkgs/development/python-modules/umalqurra/default.nix index 2eea9ebf385c..4411dbac11b8 100644 --- a/pkgs/development/python-modules/umalqurra/default.nix +++ b/pkgs/development/python-modules/umalqurra/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi }: @@ -17,7 +17,7 @@ buildPythonPackage rec { # See for license # https://github.com/tytkal/python-hijiri-ummalqura/issues/4 - meta = with stdenv.lib; { + meta = with lib; { description = "Date Api that support Hijri Umalqurra calendar"; homepage = "https://github.com/tytkal/python-hijiri-ummalqura"; license = with licenses; [ publicDomain ]; diff --git a/pkgs/development/python-modules/umemcache/default.nix b/pkgs/development/python-modules/umemcache/default.nix index 07bb181958ad..f852483cda68 100644 --- a/pkgs/development/python-modules/umemcache/default.nix +++ b/pkgs/development/python-modules/umemcache/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, isPy3k, fetchurl }: +{ lib, stdenv, buildPythonPackage, isPy3k, fetchurl }: buildPythonPackage rec { pname = "umemcache"; @@ -12,7 +12,7 @@ buildPythonPackage rec { hardeningDisable = [ "format" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Ultra fast memcache client written in highly optimized C++ with Python bindings"; homepage = "https://github.com/esnme/ultramemcache"; license = licenses.bsdOriginal; diff --git a/pkgs/development/python-modules/uncertainties/default.nix b/pkgs/development/python-modules/uncertainties/default.nix index 84705be59bc1..117188198ca8 100644 --- a/pkgs/development/python-modules/uncertainties/default.nix +++ b/pkgs/development/python-modules/uncertainties/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage +{ lib, stdenv, fetchPypi, buildPythonPackage , nose, numpy, future }: @@ -16,7 +16,7 @@ buildPythonPackage rec { checkPhase = "python setup.py nosetests -sv"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://pythonhosted.org/uncertainties/"; description = "Transparent calculations with uncertainties on the quantities involved (aka error propagation)"; maintainers = with maintainers; [ rnhmjoj ]; diff --git a/pkgs/development/python-modules/uncompyle6/default.nix b/pkgs/development/python-modules/uncompyle6/default.nix index 425b2e31ca61..4f8d461c87e2 100644 --- a/pkgs/development/python-modules/uncompyle6/default.nix +++ b/pkgs/development/python-modules/uncompyle6/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , pythonAtLeast @@ -30,7 +30,7 @@ buildPythonPackage rec { runHook postCheck ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Python cross-version byte-code deparser"; homepage = "https://github.com/rocky/python-uncompyle6/"; license = licenses.gpl3; diff --git a/pkgs/development/python-modules/unicode-slugify/default.nix b/pkgs/development/python-modules/unicode-slugify/default.nix index 111ff6278eab..80ac5151b53f 100644 --- a/pkgs/development/python-modules/unicode-slugify/default.nix +++ b/pkgs/development/python-modules/unicode-slugify/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , nose @@ -20,7 +20,7 @@ buildPythonPackage rec { checkInputs = [ nose unittest2 ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Generates unicode slugs"; homepage = "https://pypi.org/project/unicode-slugify/"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/unicodecsv/default.nix b/pkgs/development/python-modules/unicodecsv/default.nix index 83ef602de600..9393ff58bc27 100644 --- a/pkgs/development/python-modules/unicodecsv/default.nix +++ b/pkgs/development/python-modules/unicodecsv/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi }: @@ -15,7 +15,7 @@ buildPythonPackage rec { # ImportError: No module named runtests doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Drop-in replacement for Python2's stdlib csv module, with unicode support"; homepage = "https://github.com/jdunck/python-unicodecsv"; maintainers = with maintainers; [ koral ]; diff --git a/pkgs/development/python-modules/unicorn/default.nix b/pkgs/development/python-modules/unicorn/default.nix index 8bd6507bb5ba..215a32e3b60f 100644 --- a/pkgs/development/python-modules/unicorn/default.nix +++ b/pkgs/development/python-modules/unicorn/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, setuptools, unicorn-emu }: +{ lib, stdenv, buildPythonPackage, setuptools, unicorn-emu }: buildPythonPackage rec { pname = "unicorn"; @@ -14,7 +14,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ setuptools ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Python bindings for Unicorn CPU emulator engine"; homepage = "https://www.unicorn-engine.org/"; license = [ licenses.gpl2 ]; diff --git a/pkgs/development/python-modules/unidecode/default.nix b/pkgs/development/python-modules/unidecode/default.nix index 0ff066850ddb..34de3d713866 100644 --- a/pkgs/development/python-modules/unidecode/default.nix +++ b/pkgs/development/python-modules/unidecode/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, glibcLocales }: +{ lib, stdenv, buildPythonPackage, fetchPypi, glibcLocales }: buildPythonPackage rec { pname = "Unidecode"; @@ -13,7 +13,7 @@ buildPythonPackage rec { buildInputs = [ glibcLocales ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://pypi.python.org/pypi/Unidecode/"; description = "ASCII transliterations of Unicode text"; license = licenses.gpl2; diff --git a/pkgs/development/python-modules/unifi/default.nix b/pkgs/development/python-modules/unifi/default.nix index 4d2eae618c32..66ab9ba3972b 100644 --- a/pkgs/development/python-modules/unifi/default.nix +++ b/pkgs/development/python-modules/unifi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage +{ lib, stdenv, buildPythonPackage , fetchPypi, urllib3 }: buildPythonPackage rec { @@ -15,7 +15,7 @@ buildPythonPackage rec { # upstream has no tests doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "An API towards the Ubiquity Networks UniFi controller"; homepage = "https://pypi.python.org/pypi/unifi/"; license = licenses.mit; diff --git a/pkgs/development/python-modules/unifiled/default.nix b/pkgs/development/python-modules/unifiled/default.nix new file mode 100644 index 000000000000..68fa57165df2 --- /dev/null +++ b/pkgs/development/python-modules/unifiled/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, requests +, urllib3 +}: + +buildPythonPackage rec { + pname = "unifiled"; + version = "1.1"; + + src = fetchFromGitHub { + owner = "florisvdk"; + repo = pname; + rev = "v${version}"; + sha256 = "1nmqxxhwa0isxdb889nhbp7w4axj1mcrwd3pr9d8nhpw4yj9h3vq"; + }; + + propagatedBuildInputs = [ + requests + urllib3 + ]; + + # Project doesn't have any tests + doCheck = false; + pythonImportsCheck = [ "unifiled" ]; + + meta = with lib; { + description = "Python module for Ubiquiti Unifi LED controller"; + homepage = "https://github.com/florisvdk/unifiled"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/unittest2/default.nix b/pkgs/development/python-modules/unittest2/default.nix index 65774d1e33ab..a7c1252f4b46 100644 --- a/pkgs/development/python-modules/unittest2/default.nix +++ b/pkgs/development/python-modules/unittest2/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , six @@ -29,7 +29,7 @@ buildPythonPackage rec { sed -i 's/version=VERSION/version=str(VERSION)/' setup.py ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A backport of the new features added to the unittest testing framework"; homepage = "https://pypi.python.org/pypi/unittest2"; license = licenses.bsd0; diff --git a/pkgs/development/python-modules/unpaddedbase64/default.nix b/pkgs/development/python-modules/unpaddedbase64/default.nix index 386478cbb752..52d2a42b4baf 100644 --- a/pkgs/development/python-modules/unpaddedbase64/default.nix +++ b/pkgs/development/python-modules/unpaddedbase64/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchFromGitHub }: @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "0if3fjfxga0bwdq47v77fs9hrcqpmwdxry2i2a7pdqsp95258nxd"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/matrix-org/python-unpaddedbase64"; description = "Unpadded Base64"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/upass/default.nix b/pkgs/development/python-modules/upass/default.nix index 2d532be36404..442876d7a975 100644 --- a/pkgs/development/python-modules/upass/default.nix +++ b/pkgs/development/python-modules/upass/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchurl , pyperclip @@ -18,7 +18,7 @@ buildPythonPackage rec { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Console UI for pass"; homepage = "https://github.com/Kwpolska/upass"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/update_checker/default.nix b/pkgs/development/python-modules/update_checker/default.nix index 6779a50e2c47..f9171e8cbc9d 100644 --- a/pkgs/development/python-modules/update_checker/default.nix +++ b/pkgs/development/python-modules/update_checker/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, requests, isPy27 +{ lib, stdenv, buildPythonPackage, fetchPypi, requests, isPy27 }: buildPythonPackage rec { @@ -16,7 +16,7 @@ buildPythonPackage rec { # requires network doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "A python module that will check for package updates"; homepage = "https://github.com/bboe/update_checker"; license = licenses.bsd2; diff --git a/pkgs/development/python-modules/uproot3-methods/default.nix b/pkgs/development/python-modules/uproot3-methods/default.nix index 3a9457a574ba..5164bf854ada 100644 --- a/pkgs/development/python-modules/uproot3-methods/default.nix +++ b/pkgs/development/python-modules/uproot3-methods/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , numpy @@ -21,7 +21,7 @@ buildPythonPackage rec { # No tests on PyPi doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/scikit-hep/uproot3-methods"; description = "Pythonic mix-ins for ROOT classes"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/uproot3/default.nix b/pkgs/development/python-modules/uproot3/default.nix index 0d0c2365b637..1150c76d2b48 100644 --- a/pkgs/development/python-modules/uproot3/default.nix +++ b/pkgs/development/python-modules/uproot3/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "uproot3"; - version = "3.14.1"; + version = "3.14.2"; src = fetchFromGitHub { owner = "scikit-hep"; repo = "uproot3"; rev = version; - sha256 = "1npwh4l96wg3m24jhfc8i84nfwfc18flrmymf80fx101wmpi2qz8"; + sha256 = "sha256-6/e+qMgwyFUo8MRRTAaGp9WLPxE2fqMEK4paq26Epzc="; }; nativeBuildInputs = [ pytestrunner ]; diff --git a/pkgs/development/python-modules/uptime/default.nix b/pkgs/development/python-modules/uptime/default.nix index 0e1d10f7ae5e..8f8c067d36ae 100644 --- a/pkgs/development/python-modules/uptime/default.nix +++ b/pkgs/development/python-modules/uptime/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi }: @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "0wr9jkixprlywz0plyn5p42a5fd31aiwvjrxdvj7r02vfxa04c3w"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/Cairnarvon/uptime"; description = "Cross-platform way to retrieve system uptime and boot time"; license = licenses.bsd2; diff --git a/pkgs/development/python-modules/uranium/default.nix b/pkgs/development/python-modules/uranium/default.nix index 0bcfa0305e8c..f5bca2ed0fef 100644 --- a/pkgs/development/python-modules/uranium/default.nix +++ b/pkgs/development/python-modules/uranium/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, python, cmake +{ lib, stdenv, buildPythonPackage, fetchFromGitHub, python, cmake , pyqt5, numpy, scipy, shapely, libarcus, doxygen, gettext, pythonOlder }: buildPythonPackage rec { @@ -27,7 +27,7 @@ buildPythonPackage rec { UM/Application.py ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A Python framework for building Desktop applications"; homepage = "https://github.com/Ultimaker/Uranium"; license = licenses.lgpl3Plus; diff --git a/pkgs/development/python-modules/uritools/default.nix b/pkgs/development/python-modules/uritools/default.nix index 570fc5dc7180..b06da7c6acc7 100644 --- a/pkgs/development/python-modules/uritools/default.nix +++ b/pkgs/development/python-modules/uritools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy27 }: +{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27 }: buildPythonPackage rec { pname = "uritools"; @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "405917a31ce58a57c8ccd0e4ea290f38baf2f4823819c3688f5331f1aee4ccb0"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "RFC 3986 compliant, Unicode-aware, scheme-agnostic replacement for urlparse"; license = licenses.mit; maintainers = [ maintainers.rvolosatovs ]; diff --git a/pkgs/development/python-modules/urlgrabber/default.nix b/pkgs/development/python-modules/urlgrabber/default.nix index 7af69e5ded89..3a7158be73c8 100644 --- a/pkgs/development/python-modules/urlgrabber/default.nix +++ b/pkgs/development/python-modules/urlgrabber/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, pycurl, six }: +{ lib, stdenv, buildPythonPackage, fetchPypi, pycurl, six }: buildPythonPackage rec { pname = "urlgrabber"; @@ -11,7 +11,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pycurl six ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://urlgrabber.baseurl.org"; license = licenses.lgpl2Plus; description = "Python module for downloading files"; diff --git a/pkgs/development/python-modules/urllib3/default.nix b/pkgs/development/python-modules/urllib3/default.nix index aafa11720a22..4bf364391744 100644 --- a/pkgs/development/python-modules/urllib3/default.nix +++ b/pkgs/development/python-modules/urllib3/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ lib, stdenv, buildPythonPackage, fetchPypi , pytest, mock, tornado, pyopenssl, cryptography , idna, certifi, ipaddress, pysocks }: @@ -25,7 +25,7 @@ buildPythonPackage rec { checkInputs = [ pytest mock tornado ]; propagatedBuildInputs = [ pyopenssl cryptography idna certifi ipaddress pysocks ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Powerful, sanity-friendly HTTP client for Python"; homepage = "https://github.com/shazow/urllib3"; license = licenses.mit; diff --git a/pkgs/development/python-modules/urwid/default.nix b/pkgs/development/python-modules/urwid/default.nix index 0846d801059a..e3c5311136c2 100644 --- a/pkgs/development/python-modules/urwid/default.nix +++ b/pkgs/development/python-modules/urwid/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy3k, isPy27, glibcLocales }: +{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k, isPy27, glibcLocales }: buildPythonPackage rec { pname = "urwid"; @@ -19,7 +19,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "urwid" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A full-featured console (xterm et al.) user interface library"; homepage = "http://excess.org/urwid"; repositories.git = "git://github.com/wardi/urwid.git"; diff --git a/pkgs/development/python-modules/urwidtrees/default.nix b/pkgs/development/python-modules/urwidtrees/default.nix index c441d93f6f76..4c3a3e896f86 100644 --- a/pkgs/development/python-modules/urwidtrees/default.nix +++ b/pkgs/development/python-modules/urwidtrees/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchFromGitHub , glibcLocales @@ -29,7 +29,7 @@ buildPythonPackage rec { checkInputs = [ glibcLocales ]; LC_ALL="en_US.UTF-8"; - meta = with stdenv.lib; { + meta = with lib; { description = "Tree widgets for urwid"; homepage = "https://github.com/pazz/urwidtrees"; license = licenses.gpl3; diff --git a/pkgs/development/python-modules/usbtmc/default.nix b/pkgs/development/python-modules/usbtmc/default.nix index 34e6025dcfb6..b1f5b301dee4 100644 --- a/pkgs/development/python-modules/usbtmc/default.nix +++ b/pkgs/development/python-modules/usbtmc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, buildPythonPackage, pyusb }: +{ lib, stdenv, fetchurl, buildPythonPackage, pyusb }: buildPythonPackage rec { pname = "usbtmc"; @@ -11,7 +11,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pyusb ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Python implementation of the USBTMC instrument control protocol"; homepage = "http://alexforencich.com/wiki/en/python-usbtmc/start"; license = licenses.mit; diff --git a/pkgs/development/python-modules/user-agents/default.nix b/pkgs/development/python-modules/user-agents/default.nix index 5fb926607bae..7f8470cfbdc8 100644 --- a/pkgs/development/python-modules/user-agents/default.nix +++ b/pkgs/development/python-modules/user-agents/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, ua-parser }: +{ lib, stdenv, buildPythonPackage, fetchFromGitHub, ua-parser }: buildPythonPackage rec { pname = "user-agents"; @@ -14,7 +14,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ ua-parser ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A Python library to identify devices by parsing user agent strings"; homepage = "https://github.com/selwin/python-user-agents"; license = licenses.mit; diff --git a/pkgs/development/python-modules/uvicorn/default.nix b/pkgs/development/python-modules/uvicorn/default.nix index 55511be4926c..36e8b12929e0 100644 --- a/pkgs/development/python-modules/uvicorn/default.nix +++ b/pkgs/development/python-modules/uvicorn/default.nix @@ -1,4 +1,5 @@ { stdenv +, lib , buildPythonPackage , fetchFromGitHub , click @@ -7,21 +8,26 @@ , uvloop , websockets , wsproto -, pytest +, pytestCheckHook +, pytest-mock +, pyyaml , requests +, trustme +, typing-extensions , isPy27 +, pythonOlder }: buildPythonPackage rec { pname = "uvicorn"; - version = "0.11.5"; + version = "0.13.2"; disabled = isPy27; src = fetchFromGitHub { owner = "encode"; repo = pname; rev = version; - sha256 = "0cf0vw6kzxwlkvk5gw85wv3kg1kdil0wkq3s7rmxpvrk6gjk8jvq"; + sha256 = "04zgmp9z46k72ay6cz7plga6d3w3a6x41anabm7ramp7jdqf6na9"; }; propagatedBuildInputs = [ @@ -31,25 +37,33 @@ buildPythonPackage rec { uvloop websockets wsproto + ] ++ lib.optionals (pythonOlder "3.8") [ + typing-extensions ]; - postPatch = '' - substituteInPlace setup.py \ - --replace "h11==0.8.*" "h11" \ - --replace "httptools==0.0.13" "httptools" - ''; - - checkInputs = [ pytest requests ]; + checkInputs = [ + pytestCheckHook + pytest-mock + pyyaml + requests + trustme + ]; doCheck = !stdenv.isDarwin; - # watchgod required the watchgod package, which isn't available in nixpkgs - checkPhase = '' - pytest --ignore=tests/supervisors/test_watchgodreload.py \ - -k 'not test_supported_upgrade_request and not test_invalid_upgrade[WSProtocol]' - ''; + __darwinAllowLocalNetworking = true; - meta = with stdenv.lib; { + pytestFlagsArray = [ + # watchgod required the watchgod package, which isn't available in nixpkgs + "--ignore=tests/supervisors/test_reload.py" + ]; + + disabledTests = [ + "test_supported_upgrade_request" + "test_invalid_upgrade" + ]; + + meta = with lib; { homepage = "https://www.uvicorn.org/"; description = "The lightning-fast ASGI server"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/validate-email/default.nix b/pkgs/development/python-modules/validate-email/default.nix index ea2c5a8db749..327cfcf3f0d3 100644 --- a/pkgs/development/python-modules/validate-email/default.nix +++ b/pkgs/development/python-modules/validate-email/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi }: +{ lib, stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "validate-email"; @@ -13,7 +13,7 @@ buildPythonPackage rec { # No tests doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/syrusakbary/validate_email"; description = "Verify if an email address is valid and really exists"; license = licenses.lgpl3Plus; diff --git a/pkgs/development/python-modules/validictory/default.nix b/pkgs/development/python-modules/validictory/default.nix index 81e80375e680..e89b3d7bcd23 100644 --- a/pkgs/development/python-modules/validictory/default.nix +++ b/pkgs/development/python-modules/validictory/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi }: @@ -14,7 +14,7 @@ buildPythonPackage rec { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Validate dicts against a schema"; homepage = "https://github.com/sunlightlabs/validictory"; license = licenses.mit; diff --git a/pkgs/development/python-modules/vcver/default.nix b/pkgs/development/python-modules/vcver/default.nix index 74b44cddc464..a328cb104bc1 100644 --- a/pkgs/development/python-modules/vcver/default.nix +++ b/pkgs/development/python-modules/vcver/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { # circular dependency on test tool uranium https://pypi.org/project/uranium/ doCheck = false; - pythonImportTests = [ "vcver" ]; + pythonImportsCheck = [ "vcver" ]; meta = with lib; { description = "Reference Implementation of vcver"; diff --git a/pkgs/development/python-modules/vcversioner/default.nix b/pkgs/development/python-modules/vcversioner/default.nix index 5f7f30e2c336..7d73a6e812dd 100644 --- a/pkgs/development/python-modules/vcversioner/default.nix +++ b/pkgs/development/python-modules/vcversioner/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi }: +{ lib, stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "vcversioner"; @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "16z10sm78jd7ca3jbkgc3q5i8a8q7y1h21q1li21yy3rlhbhrrns"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "take version numbers from version control"; homepage = "https://github.com/habnabit/vcversioner"; license = licenses.isc; diff --git a/pkgs/development/python-modules/vdf/default.nix b/pkgs/development/python-modules/vdf/default.nix index 7d4e3e34b86d..9e4e92d21ae7 100644 --- a/pkgs/development/python-modules/vdf/default.nix +++ b/pkgs/development/python-modules/vdf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub +{ lib, stdenv, buildPythonPackage, fetchFromGitHub , pytest, pytestcov, mock }: buildPythonPackage rec { @@ -15,7 +15,7 @@ buildPythonPackage rec { checkInputs = [ pytest pytestcov mock ]; checkPhase = "make test"; - meta = with stdenv.lib; { + meta = with lib; { description = "Library for working with Valve's VDF text format"; homepage = "https://github.com/ValvePython/vdf"; license = licenses.mit; diff --git a/pkgs/development/python-modules/vdirsyncer/default.nix b/pkgs/development/python-modules/vdirsyncer/default.nix index b93050144eb6..bda65ab49076 100644 --- a/pkgs/development/python-modules/vdirsyncer/default.nix +++ b/pkgs/development/python-modules/vdirsyncer/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , isPy27 @@ -58,7 +58,7 @@ buildPythonPackage rec { "test_create_collections" # Flaky test exceeds deadline on hydra: https://github.com/pimutils/vdirsyncer/issues/837 ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/pimutils/vdirsyncer"; description = "Synchronize calendars and contacts"; license = licenses.mit; diff --git a/pkgs/development/python-modules/vega/default.nix b/pkgs/development/python-modules/vega/default.nix index b81481b0774a..3a36d5de6064 100644 --- a/pkgs/development/python-modules/vega/default.nix +++ b/pkgs/development/python-modules/vega/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage , fetchPypi, pythonOlder +{ lib, stdenv, buildPythonPackage , fetchPypi, pythonOlder , pytest, jupyter_core, pandas, ipywidgets, jupyter, altair }: buildPythonPackage rec { @@ -18,7 +18,7 @@ buildPythonPackage rec { doCheck = false; checkInputs = [ altair ]; - meta = with stdenv.lib; { + meta = with lib; { description = "An IPython/Jupyter widget for Vega and Vega-Lite"; longDescription = '' To use this you have to enter a nix-shell with vega. Then run: diff --git a/pkgs/development/python-modules/venusian/default.nix b/pkgs/development/python-modules/venusian/default.nix index 06f0d55acf00..68d974aabec8 100644 --- a/pkgs/development/python-modules/venusian/default.nix +++ b/pkgs/development/python-modules/venusian/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , isPy27 @@ -22,7 +22,7 @@ buildPythonPackage rec { pytest ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A library for deferring decorator actions"; homepage = "https://pylonsproject.org/"; license = licenses.bsd0; diff --git a/pkgs/development/python-modules/versioneer/default.nix b/pkgs/development/python-modules/versioneer/default.nix index 31042c8cc1c4..fa3329503a36 100644 --- a/pkgs/development/python-modules/versioneer/default.nix +++ b/pkgs/development/python-modules/versioneer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy27 }: +{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27 }: buildPythonPackage rec { @@ -15,7 +15,7 @@ buildPythonPackage rec { # pip. doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Version-string management for VCS-controlled trees"; homepage = "https://github.com/warner/python-versioneer"; license = licenses.publicDomain; diff --git a/pkgs/development/python-modules/versiontools/default.nix b/pkgs/development/python-modules/versiontools/default.nix index ea282c22ddc8..45b34d95301d 100644 --- a/pkgs/development/python-modules/versiontools/default.nix +++ b/pkgs/development/python-modules/versiontools/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , isPy3k @@ -15,7 +15,7 @@ buildPythonPackage rec { doCheck = (!isPy3k); - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://launchpad.net/versiontools"; description = "Smart replacement for plain tuple used in __version__"; license = licenses.lgpl2; diff --git a/pkgs/development/python-modules/veryprettytable/default.nix b/pkgs/development/python-modules/veryprettytable/default.nix index eff996c3ae4c..f2c8cee451d3 100644 --- a/pkgs/development/python-modules/veryprettytable/default.nix +++ b/pkgs/development/python-modules/veryprettytable/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , termcolor @@ -16,7 +16,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ termcolor colorama ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A simple Python library for easily displaying tabular data in a visually appealing ASCII table format"; homepage = "https://github.com/smeggingsmegger/VeryPrettyTable"; license = licenses.free; diff --git a/pkgs/development/python-modules/vidstab/default.nix b/pkgs/development/python-modules/vidstab/default.nix index f43fe542677b..548105a01778 100644 --- a/pkgs/development/python-modules/vidstab/default.nix +++ b/pkgs/development/python-modules/vidstab/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , numpy @@ -24,7 +24,7 @@ buildPythonPackage rec { # tests not packaged with pypi doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/AdamSpannbauer/python_video_stab"; description = "Video Stabilization using OpenCV"; license = licenses.mit; diff --git a/pkgs/development/python-modules/vine/default.nix b/pkgs/development/python-modules/vine/default.nix index 1f4933d7dd8a..048fa435e0be 100644 --- a/pkgs/development/python-modules/vine/default.nix +++ b/pkgs/development/python-modules/vine/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ lib, stdenv, buildPythonPackage, fetchPypi , case, pytest, pythonOlder }: buildPythonPackage rec { @@ -14,7 +14,7 @@ buildPythonPackage rec { buildInputs = [ case pytest ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Python promises"; homepage = "https://github.com/celery/vine"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/virtual-display/default.nix b/pkgs/development/python-modules/virtual-display/default.nix index 958f8a01704c..7559ae1ccca5 100644 --- a/pkgs/development/python-modules/virtual-display/default.nix +++ b/pkgs/development/python-modules/virtual-display/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "PyVirtualDisplay"; - version = "1.3.2"; + version = "2.0"; propagatedBuildInputs = [ EasyProcess ]; src = fetchPypi { inherit pname version; - sha256 = "3fa85a6e490e45eab64e6be19841e0ab15ec8054c97f162079a061da6a93eba0"; + sha256 = "3cdacd70970a74d163a2417d8581f43a56bb1ac8d31c71a1a6a4348969062d65"; }; # requires X server diff --git a/pkgs/development/python-modules/virtualenv-clone/default.nix b/pkgs/development/python-modules/virtualenv-clone/default.nix index cc68d4b7090f..9b225021cf21 100644 --- a/pkgs/development/python-modules/virtualenv-clone/default.nix +++ b/pkgs/development/python-modules/virtualenv-clone/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , pytest @@ -20,7 +20,7 @@ buildPythonPackage rec { # needs tox to run the tests doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/edwardgeorge/virtualenv-clone"; description = "Script to clone virtualenvs"; license = licenses.mit; diff --git a/pkgs/development/python-modules/virtualenvwrapper/default.nix b/pkgs/development/python-modules/virtualenvwrapper/default.nix index 19ec56a1ece8..658f41126fc9 100644 --- a/pkgs/development/python-modules/virtualenvwrapper/default.nix +++ b/pkgs/development/python-modules/virtualenvwrapper/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , pbr @@ -66,7 +66,7 @@ EOF done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Enhancements to virtualenv"; homepage = "https://pypi.python.org/pypi/virtualenvwrapper"; license = licenses.mit; diff --git a/pkgs/development/python-modules/vmprof/default.nix b/pkgs/development/python-modules/vmprof/default.nix index 149efb753e20..f8be722ef90f 100644 --- a/pkgs/development/python-modules/vmprof/default.nix +++ b/pkgs/development/python-modules/vmprof/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , colorama @@ -24,7 +24,7 @@ buildPythonPackage rec { doCheck = false; pythonImportsCheck = [ "vmprof" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A vmprof client"; license = licenses.mit; homepage = "https://vmprof.readthedocs.org/"; diff --git a/pkgs/development/python-modules/vncdo/default.nix b/pkgs/development/python-modules/vncdo/default.nix index ffc01906f459..cb1b1677e1b5 100644 --- a/pkgs/development/python-modules/vncdo/default.nix +++ b/pkgs/development/python-modules/vncdo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , buildPythonPackage, isPy27 , pillow , twisted @@ -27,7 +27,7 @@ buildPythonPackage rec { doCheck = !isPy27; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/sibson/vncdotool"; description = "A command line VNC client and python library"; license = licenses.mit; diff --git a/pkgs/development/python-modules/volkszaehler/default.nix b/pkgs/development/python-modules/volkszaehler/default.nix new file mode 100644 index 000000000000..fdd3e1923a39 --- /dev/null +++ b/pkgs/development/python-modules/volkszaehler/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchPypi +, aiohttp +, async-timeout +}: + +buildPythonPackage rec { + pname = "volkszaehler"; + version = "0.2.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "087gw1k3f81lm859r0j65cjia8c2dcy4cx8c7s3mb5msb1csdh0x"; + }; + + propagatedBuildInputs = [ + aiohttp + async-timeout + ]; + + # no tests are present + doCheck = false; + + pythonImportsCheck = [ "volkszaehler" ]; + + meta = with lib; { + description = "Python Wrapper for interacting with the Volkszahler API"; + homepage = "https://github.com/home-assistant-ecosystem/python-volkszaehler"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/voluptuous-serialize/default.nix b/pkgs/development/python-modules/voluptuous-serialize/default.nix index 383eed03a4e3..d054a32c30e0 100644 --- a/pkgs/development/python-modules/voluptuous-serialize/default.nix +++ b/pkgs/development/python-modules/voluptuous-serialize/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, isPy3k, fetchPypi, voluptuous, pytest }: +{ lib, stdenv, buildPythonPackage, isPy3k, fetchPypi, voluptuous, pytest }: buildPythonPackage rec { pname = "voluptuous-serialize"; @@ -26,7 +26,7 @@ buildPythonPackage rec { # no tests in PyPI tarball doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/balloob/voluptuous-serialize"; license = licenses.asl20; description = "Convert Voluptuous schemas to dictionaries so they can be serialized"; diff --git a/pkgs/development/python-modules/voluptuous/default.nix b/pkgs/development/python-modules/voluptuous/default.nix index 4d5b5d48fda5..63be8cd4bd05 100644 --- a/pkgs/development/python-modules/voluptuous/default.nix +++ b/pkgs/development/python-modules/voluptuous/default.nix @@ -1,12 +1,12 @@ -{ stdenv, buildPythonPackage, fetchPypi, nose }: +{ lib, stdenv, buildPythonPackage, fetchPypi, nose }: buildPythonPackage rec { pname = "voluptuous"; - version = "0.12.0"; + version = "0.12.1"; src = fetchPypi { inherit pname version; - sha256 = "1p5j3fgbpqj31fajkaisdrz10ah9667sijz4kp3m0sbgw6ag4kis"; + sha256 = "0js4avmhmmys78z376xk1w9305hq5nad8zqrnksgmpc1j90p4db6"; }; checkInputs = [ nose ]; @@ -14,7 +14,7 @@ buildPythonPackage rec { nosetests ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Voluptuous is a Python data validation library"; homepage = "http://alecthomas.github.io/voluptuous/"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/vultr/default.nix b/pkgs/development/python-modules/vultr/default.nix index 236e4121cf86..d4349d310be2 100644 --- a/pkgs/development/python-modules/vultr/default.nix +++ b/pkgs/development/python-modules/vultr/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchFromGitHub , requests @@ -20,7 +20,7 @@ buildPythonPackage rec { # Tests disabled. They fail because they try to access the network doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Vultr.com API Client"; homepage = "https://github.com/spry-group/python-vultr"; license = licenses.mit; diff --git a/pkgs/development/python-modules/vulture/default.nix b/pkgs/development/python-modules/vulture/default.nix index 76f379ef8449..b657d26c706f 100644 --- a/pkgs/development/python-modules/vulture/default.nix +++ b/pkgs/development/python-modules/vulture/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy27, coverage, pytest, pytestcov }: +{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27, coverage, pytest, pytestcov }: buildPythonPackage rec { pname = "vulture"; @@ -13,7 +13,7 @@ buildPythonPackage rec { checkInputs = [ coverage pytest pytestcov ]; checkPhase = "pytest"; - meta = with stdenv.lib; { + meta = with lib; { description = "Finds unused code in Python programs"; homepage = "https://github.com/jendrikseipp/vulture"; license = licenses.mit; diff --git a/pkgs/development/python-modules/vxi11/default.nix b/pkgs/development/python-modules/vxi11/default.nix index 15a9d7073abc..5d9531aa904d 100644 --- a/pkgs/development/python-modules/vxi11/default.nix +++ b/pkgs/development/python-modules/vxi11/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, nose }: +{ lib, stdenv, buildPythonPackage, fetchFromGitHub, nose }: buildPythonPackage rec { pname = "python-vxi11"; @@ -17,7 +17,7 @@ buildPythonPackage rec { nosetests ''; - meta = with stdenv.lib; { + meta = with lib; { description = "VXI-11 driver for controlling instruments over Ethernet"; homepage = "https://github.com/python-ivi/python-vxi11"; license = licenses.mit; diff --git a/pkgs/development/python-modules/w3lib/default.nix b/pkgs/development/python-modules/w3lib/default.nix index a37f786c018d..ae404e01cfb9 100644 --- a/pkgs/development/python-modules/w3lib/default.nix +++ b/pkgs/development/python-modules/w3lib/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , six @@ -16,7 +16,7 @@ buildPythonPackage rec { buildInputs = [ six pytest ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A library of web-related functions"; homepage = "https://github.com/scrapy/w3lib"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/waitress/default.nix b/pkgs/development/python-modules/waitress/default.nix index 3812ed06b60c..09f4f66e0b52 100644 --- a/pkgs/development/python-modules/waitress/default.nix +++ b/pkgs/development/python-modules/waitress/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi }: @@ -14,7 +14,7 @@ buildPythonPackage rec { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/Pylons/waitress"; description = "Waitress WSGI server"; license = licenses.zpl20; diff --git a/pkgs/development/python-modules/wakeonlan/default.nix b/pkgs/development/python-modules/wakeonlan/default.nix index dd947c0555ce..29c30e7ba6ad 100644 --- a/pkgs/development/python-modules/wakeonlan/default.nix +++ b/pkgs/development/python-modules/wakeonlan/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage, setuptools_scm, pytest, mock }: +{ lib, stdenv, fetchPypi, buildPythonPackage, setuptools_scm, pytest, mock }: buildPythonPackage rec { pname = "wakeonlan"; @@ -22,7 +22,7 @@ buildPythonPackage rec { py.test ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A small python module for wake on lan"; homepage = "https://github.com/remcohaszing/pywakeonlan"; license = licenses.wtfpl; diff --git a/pkgs/development/python-modules/warlock/default.nix b/pkgs/development/python-modules/warlock/default.nix index 34815f99a94c..80dcabdcb207 100644 --- a/pkgs/development/python-modules/warlock/default.nix +++ b/pkgs/development/python-modules/warlock/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , six @@ -18,7 +18,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six jsonpatch jsonschema jsonpointer ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/bcwaldon/warlock"; description = "Python object model built on JSON schema and JSON patch"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/wasabi/default.nix b/pkgs/development/python-modules/wasabi/default.nix index ec9cbb3d5608..5a0c2ecaa5f5 100644 --- a/pkgs/development/python-modules/wasabi/default.nix +++ b/pkgs/development/python-modules/wasabi/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , pytestCheckHook @@ -15,7 +15,7 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook ]; - meta = with stdenv.lib; { + meta = with 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}"; diff --git a/pkgs/development/python-modules/wasm/default.nix b/pkgs/development/python-modules/wasm/default.nix new file mode 100644 index 000000000000..f6c2cc42e387 --- /dev/null +++ b/pkgs/development/python-modules/wasm/default.nix @@ -0,0 +1,27 @@ +{ buildPythonPackage +, fetchPypi +, lib +}: + +buildPythonPackage rec { + pname = "wasm"; + version = "1.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "179xcinfc35xgk0bf9y58kwxzymzk7c1p58w6khmqfiqvb91j3r8"; + }; + + # there are no tests + doCheck = false; + + pythonImportsCheck = [ "wasm" ]; + + meta = with lib; { + description = "WebAssembly decoder and disassembler"; + homepage = "https://github.com/athre0z/wasm"; + changelog = "https://github.com/athre0z/wasm/blob/master/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ arturcygan ]; + }; +} diff --git a/pkgs/development/python-modules/wasmer/default.nix b/pkgs/development/python-modules/wasmer/default.nix new file mode 100644 index 000000000000..e8307365574c --- /dev/null +++ b/pkgs/development/python-modules/wasmer/default.nix @@ -0,0 +1,73 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, maturin +, buildPythonPackage +, isPy38 +, python +}: +let + pname = "wasmer"; + version = "1.0.0-beta1"; + + wheel = rustPlatform.buildRustPackage rec { + name = "${pname}-${version}-py${python.version}"; + + src = fetchFromGitHub { + owner = "wasmerio"; + repo = "wasmer-python"; + rev = version; + sha256 = "0302lcfjlw7nz18nf86z6swhhpp1qnpwcsm2fj4avl22rsv0h78j"; + }; + + cargoSha256 = "0d83dniijjq8rc4fcwj6ja5x4hxh187afnqfd8c9fzb8nx909a0v"; + + nativeBuildInputs = [ maturin python ]; + + preBuild = '' + cd packages/api + ''; + + buildPhase = '' + runHook preBuild + maturin build --release --manylinux off --strip + runHook postBuild + ''; + + postBuild = '' + cd ../.. + ''; + + doCheck = false; + + installPhase = '' + runHook preInstall + install -Dm644 -t $out target/wheels/*.whl + runHook postInstall + ''; + }; + +in +buildPythonPackage rec { + inherit pname version; + # we can only support one python version because the cargo hash changes with the python version + disabled = !isPy38; + + format = "wheel"; + src = wheel; + + unpackPhase = '' + mkdir -p dist + cp $src/*.whl dist + ''; + + pythonImportsCheck = [ "wasmer" ]; + + meta = with lib; { + description = "Python extension to run WebAssembly binaries"; + homepage = "https://github.com/wasmerio/wasmer-python"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/development/python-modules/watchdog/default.nix b/pkgs/development/python-modules/watchdog/default.nix index ffec68785260..893cdd7e99b4 100644 --- a/pkgs/development/python-modules/watchdog/default.nix +++ b/pkgs/development/python-modules/watchdog/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , argh @@ -22,7 +22,7 @@ buildPythonPackage rec { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Python API and shell utilities to monitor file system events"; homepage = "https://github.com/gorakhargosh/watchdog"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/weasyprint/default.nix b/pkgs/development/python-modules/weasyprint/default.nix index c1eaa1fd7543..a7188a3103f4 100644 --- a/pkgs/development/python-modules/weasyprint/default.nix +++ b/pkgs/development/python-modules/weasyprint/default.nix @@ -11,7 +11,7 @@ glib, pango, fontconfig, - stdenv, + lib, stdenv, pytest, pytestrunner, pytest-isort, @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "weasyprint"; - version = "50"; + version = "52"; disabled = !isPy3k; # excluded test needs the Ahem font @@ -59,10 +59,10 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "WeasyPrint"; - sha256 = "0invs96zvmcr6wh5klj52jrcnr9qg150v9wpmbhcsf3vv1d1hbcw"; + sha256 = "0rwf43111ws74m8b1alkkxzz57g0np3vmd8as74adwnxslfcg4gs"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://weasyprint.org/"; description = "Converts web documents to PDF"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/weasyprint/library-paths.patch b/pkgs/development/python-modules/weasyprint/library-paths.patch index eabbdbdcd6ee..c6eb87c94585 100644 --- a/pkgs/development/python-modules/weasyprint/library-paths.patch +++ b/pkgs/development/python-modules/weasyprint/library-paths.patch @@ -1,8 +1,8 @@ diff --git a/weasyprint/fonts.py b/weasyprint/fonts.py -index 377716c1..2016e01c 100644 +index 79e3b5b..4438eb4 100644 --- a/weasyprint/fonts.py +++ b/weasyprint/fonts.py -@@ -48,11 +48,8 @@ else: +@@ -45,11 +45,8 @@ else: # with OSError: dlopen() failed to load a library: cairo / cairo-2 # So let's hope we find the same file as cairo already did ;) # Same applies to pangocairo requiring pangoft2 @@ -10,26 +10,26 @@ index 377716c1..2016e01c 100644 - 'libfontconfig-1.dll', - 'libfontconfig.so.1', 'libfontconfig-1.dylib') - pangoft2 = dlopen(ffi, 'pangoft2-1.0', 'libpangoft2-1.0-0', -- 'libpangoft2-1.0.so', 'libpangoft2-1.0.dylib') +- 'libpangoft2-1.0.so.0', 'libpangoft2-1.0.dylib') + fontconfig = dlopen(ffi, '@fontconfig@') + pangoft2 = dlopen(ffi, '@pangoft2@') ffi.cdef(''' // FontConfig diff --git a/weasyprint/text.py b/weasyprint/text.py -index 035074e9..08e40395 100644 +index 1dc5e4d..b070bad 100644 --- a/weasyprint/text.py +++ b/weasyprint/text.py -@@ -243,12 +243,9 @@ def dlopen(ffi, *names): +@@ -255,12 +255,9 @@ def dlopen(ffi, *names): return ffi.dlopen(names[0]) # pragma: no cover --gobject = dlopen(ffi, 'gobject-2.0', 'libgobject-2.0-0', 'libgobject-2.0.so', +-gobject = dlopen(ffi, 'gobject-2.0', 'libgobject-2.0-0', 'libgobject-2.0.so.0', - 'libgobject-2.0.dylib') --pango = dlopen(ffi, 'pango-1.0', 'libpango-1.0-0', 'libpango-1.0.so', +-pango = dlopen(ffi, 'pango-1.0', 'libpango-1.0-0', 'libpango-1.0.so.0', - 'libpango-1.0.dylib') -pangocairo = dlopen(ffi, 'pangocairo-1.0', 'libpangocairo-1.0-0', -- 'libpangocairo-1.0.so', 'libpangocairo-1.0.dylib') +- 'libpangocairo-1.0.so.0', 'libpangocairo-1.0.dylib') +gobject = dlopen(ffi, '@gobject@') +pango = dlopen(ffi, '@pango@') +pangocairo = dlopen(ffi, '@pangocairo@') diff --git a/pkgs/development/python-modules/web/default.nix b/pkgs/development/python-modules/web/default.nix index 769ac6d2e5fa..84b4cc8dcfbb 100644 --- a/pkgs/development/python-modules/web/default.nix +++ b/pkgs/development/python-modules/web/default.nix @@ -1,20 +1,27 @@ -{ stdenv -, buildPythonPackage -, fetchPypi -, isPy3k +{ lib, stdenv, buildPythonPackage, fetchPypi, pytestCheckHook +, cheroot +, dbutils, mysqlclient, pymysql, mysql-connector, psycopg2 }: buildPythonPackage rec { version = "0.62"; pname = "web.py"; - disabled = isPy3k; src = fetchPypi { inherit pname version; sha256 = "5ce684caa240654cae5950da8b4b7bc178812031e08f990518d072bd44ab525e"; }; - meta = with stdenv.lib; { + propagatedBuildInputs = [ cheroot ]; + + # requires multiple running databases + doCheck = false; + + pythonImportsCheck = [ "web" ]; + + checkInputs = [ pytestCheckHook dbutils mysqlclient pymysql mysql-connector psycopg2 ]; + + meta = with lib; { description = "Makes web apps"; longDescription = '' Think about the ideal way to write a web app. @@ -22,7 +29,7 @@ buildPythonPackage rec { ''; homepage = "https://webpy.org/"; license = licenses.publicDomain; - maintainers = with maintainers; [ layus ]; + maintainers = with maintainers; [ layus SuperSandro2000 ]; }; } diff --git a/pkgs/development/python-modules/webapp2/default.nix b/pkgs/development/python-modules/webapp2/default.nix index 01c1ca309d4c..048c5d91b1d2 100644 --- a/pkgs/development/python-modules/webapp2/default.nix +++ b/pkgs/development/python-modules/webapp2/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , webob @@ -19,7 +19,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ webob six ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Taking Google App Engine's webapp to the next level"; homepage = "http://webapp-improved.appspot.com"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/webhelpers/default.nix b/pkgs/development/python-modules/webhelpers/default.nix index d88f8210ae1d..040341ed376a 100644 --- a/pkgs/development/python-modules/webhelpers/default.nix +++ b/pkgs/development/python-modules/webhelpers/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , routes @@ -21,7 +21,7 @@ buildPythonPackage rec { # TODO: failing tests https://bitbucket.org/bbangert/webhelpers/pull-request/1/fix-error-on-webob-123/diff doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://webhelpers.readthedocs.org/en/latest/"; description = "Web Helpers"; license = licenses.free; diff --git a/pkgs/development/python-modules/webob/default.nix b/pkgs/development/python-modules/webob/default.nix index 17b20ecd34dd..78ca8f918a3f 100644 --- a/pkgs/development/python-modules/webob/default.nix +++ b/pkgs/development/python-modules/webob/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , nose @@ -16,7 +16,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ nose pytest ]; - meta = with stdenv.lib; { + meta = with lib; { description = "WSGI request and response object"; homepage = "http://pythonpaste.org/webob/"; license = licenses.mit; diff --git a/pkgs/development/python-modules/websockify/default.nix b/pkgs/development/python-modules/websockify/default.nix index e885a1ba9b72..021344b2207a 100644 --- a/pkgs/development/python-modules/websockify/default.nix +++ b/pkgs/development/python-modules/websockify/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , numpy @@ -15,7 +15,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ numpy ]; - meta = with stdenv.lib; { + meta = with lib; { description = "WebSockets support for any application/server"; homepage = "https://github.com/kanaka/websockify"; license = licenses.lgpl3; diff --git a/pkgs/development/python-modules/webtest/default.nix b/pkgs/development/python-modules/webtest/default.nix index 48acb6c881de..98ee58d3f6c4 100644 --- a/pkgs/development/python-modules/webtest/default.nix +++ b/pkgs/development/python-modules/webtest/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , isPy27 @@ -35,7 +35,7 @@ buildPythonPackage rec { # Some of the tests use localhost networking. __darwinAllowLocalNetworking = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Helper to test WSGI applications"; homepage = "https://webtest.readthedocs.org/en/latest/"; license = licenses.mit; diff --git a/pkgs/development/python-modules/webthing/default.nix b/pkgs/development/python-modules/webthing/default.nix new file mode 100644 index 000000000000..92e4ea5a8fb5 --- /dev/null +++ b/pkgs/development/python-modules/webthing/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, ifaddr +, jsonschema +, pyee +, tornado +, zeroconf +}: + +buildPythonPackage rec { + pname = "webthing"; + version = "0.15.0"; + + src = fetchFromGitHub { + owner = "WebThingsIO"; + repo = "webthing-python"; + rev = "v${version}"; + sha256 = "06264rwchy4qmbn7lv7m00qg864y7aw3rngcqqcr9nvaqz4rb0fg"; + }; + + propagatedBuildInputs = [ + ifaddr + jsonschema + pyee + tornado + zeroconf + ]; + + # no tests are present + doCheck = false; + pythonImportsCheck = [ "webthing" ]; + + meta = with lib; { + description = "Python implementation of a Web Thing server"; + homepage = "https://github.com/WebThingsIO/webthing-python"; + license = with licenses; [ mpl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/werkzeug/default.nix b/pkgs/development/python-modules/werkzeug/default.nix index fd634e51796e..858130b805f1 100644 --- a/pkgs/development/python-modules/werkzeug/default.nix +++ b/pkgs/development/python-modules/werkzeug/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ lib, stdenv, buildPythonPackage, fetchPypi , itsdangerous, hypothesis , pytestCheckHook, requests , pytest-timeout @@ -21,7 +21,7 @@ buildPythonPackage rec { "test_get_machine_id" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://palletsprojects.com/p/werkzeug/"; description = "A WSGI utility library for Python"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/wfuzz/default.nix b/pkgs/development/python-modules/wfuzz/default.nix index a43aa915ea0b..f42df0054952 100644 --- a/pkgs/development/python-modules/wfuzz/default.nix +++ b/pkgs/development/python-modules/wfuzz/default.nix @@ -1,5 +1,6 @@ { buildPythonPackage , chardet +, colorama , configparser , fetchFromGitHub , future @@ -8,44 +9,61 @@ , mock , netaddr , pkgs -, pyparsing , pycurl +, pyparsing , pytest +, pytestCheckHook +, setuptools , six +, stdenv }: buildPythonPackage rec { pname = "wfuzz"; - version = "2.4.2"; + version = "3.1.0"; src = fetchFromGitHub { owner = "xmendez"; repo = pname; - rev = "v.${version}"; - sha256 = "15dihrc7jsvpxcmb4fp254s633mkjm7ksjfkr9pqaai49qmnddyf"; + rev = "v${version}"; + sha256 = "1izasczm2zwknwzxbfzqhlf4zp02jvb54ha1hfk4rlwiz0rr1kj4"; }; - buildInputs = [ pyparsing configparser ]; - propagatedBuildInputs = [ chardet - future pycurl six + setuptools + pyparsing + ] ++ lib.optionals isPy27 [ + mock + future + ] ++ lib.optionals stdenv.hostPlatform.isWindows [ + colorama ]; - checkInputs = [ netaddr pytest ] ++ lib.optionals isPy27 [ mock ]; + checkInputs = [ + netaddr + pytest + pytestCheckHook + ] ++ lib.optionals isPy27 [ + mock + ]; - # Skip tests requiring a local web server. - checkPhase = '' - HOME=$TMPDIR pytest \ - tests/test_{moduleman,filterintro,reqresp,api,clparser,dotdict}.py - ''; + preCheck = "export HOME=$(mktemp -d)"; + # The skipped tests are requiring a local web server + pytestFlagsArray = [ "tests/test_{moduleman,filterintro,reqresp,api,clparser}.py" ]; + pythonImportsCheck = [ "wfuzz" ]; meta = with lib; { - description = "Web content fuzzer, to facilitate web applications assessments"; + description = "Web content fuzzer to facilitate web applications assessments"; + longDescription = '' + Wfuzz provides a framework to automate web applications security assessments + and could help you to secure your web applications by finding and exploiting + web application vulnerabilities. + ''; homepage = "https://wfuzz.readthedocs.io"; - license = licenses.gpl2; + license = with licenses; [ gpl2Only ]; maintainers = with maintainers; [ pamplemousse ]; }; } diff --git a/pkgs/development/python-modules/whisper/default.nix b/pkgs/development/python-modules/whisper/default.nix index 70709d3e6663..ad25df4868a4 100644 --- a/pkgs/development/python-modules/whisper/default.nix +++ b/pkgs/development/python-modules/whisper/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, mock, six }: +{ lib, stdenv, buildPythonPackage, fetchPypi, mock, six }: buildPythonPackage rec { pname = "whisper"; @@ -12,7 +12,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six ]; checkInputs = [ mock ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://graphite.wikidot.com/"; description = "Fixed size round-robin style database"; maintainers = with maintainers; [ offline basvandijk ]; diff --git a/pkgs/development/python-modules/whitenoise/default.nix b/pkgs/development/python-modules/whitenoise/default.nix index dbc069f434e4..2399c6ed73f2 100644 --- a/pkgs/development/python-modules/whitenoise/default.nix +++ b/pkgs/development/python-modules/whitenoise/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage, isPy27 }: +{ lib, stdenv, fetchPypi, buildPythonPackage, isPy27 }: buildPythonPackage rec { pname = "whitenoise"; @@ -13,7 +13,7 @@ buildPythonPackage rec { # No tests doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Radically simplified static file serving for WSGI applications"; homepage = "http://whitenoise.evans.io/"; license = licenses.mit; diff --git a/pkgs/development/python-modules/whois/default.nix b/pkgs/development/python-modules/whois/default.nix new file mode 100644 index 000000000000..759bc0cd8ee9 --- /dev/null +++ b/pkgs/development/python-modules/whois/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, inetutils +}: + +buildPythonPackage rec { + pname = "whois"; + version = "0.9.7"; + + src = fetchFromGitHub { + owner = "DannyCork"; + repo = "python-whois"; + rev = version; + sha256 = "1rbc4xif4dn455vc8dhxdvwszrb0nik5q9fy12db6mxfx6zikb7z"; + }; + + # whois is needed + propagatedBuildInputs = [ inetutils ]; + + # tests require network access + doCheck = false; + pythonImportsCheck = [ "whois" ]; + + meta = with lib; { + description = "Python module/library for retrieving WHOIS information"; + homepage = "https://github.com/DannyCork/python-whois/"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/whoosh/default.nix b/pkgs/development/python-modules/whoosh/default.nix index e203cdb29344..f5bbccec2a5e 100644 --- a/pkgs/development/python-modules/whoosh/default.nix +++ b/pkgs/development/python-modules/whoosh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, pytest }: +{ lib, stdenv, buildPythonPackage, fetchPypi, pytest }: buildPythonPackage rec { pname = "Whoosh"; @@ -20,7 +20,7 @@ buildPythonPackage rec { py.test -k "not test_timelimit and not test_minimize_dfa" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Fast, pure-Python full text indexing, search, and spell checking library."; homepage = "https://bitbucket.org/mchaput/whoosh"; diff --git a/pkgs/development/python-modules/willow/default.nix b/pkgs/development/python-modules/willow/default.nix index e9e5001fec91..fbf4965117b3 100644 --- a/pkgs/development/python-modules/willow/default.nix +++ b/pkgs/development/python-modules/willow/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , pythonOlder @@ -23,7 +23,7 @@ buildPythonPackage rec { # https://github.com/torchbox/Willow/issues/34 doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "A Python image library that sits on top of Pillow, Wand and OpenCV"; homepage = "https://github.com/torchbox/Willow/"; license = licenses.bsd2; diff --git a/pkgs/development/python-modules/winacl/default.nix b/pkgs/development/python-modules/winacl/default.nix new file mode 100644 index 000000000000..c08c5541a61a --- /dev/null +++ b/pkgs/development/python-modules/winacl/default.nix @@ -0,0 +1,25 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "winacl"; + version = "0.1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "05xhdhbvzs1hcd8lxmdr9mpr6ifx5flhlvk6jr0qi6h25imhqclp"; + }; + + # Project doesn't have tests + doCheck = false; + pythonImportsCheck = [ "winacl" ]; + + meta = with lib; { + description = "Python module for ACL/ACE/Security descriptor manipulation"; + homepage = "https://github.com/skelsec/winacl"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/winsspi/default.nix b/pkgs/development/python-modules/winsspi/default.nix new file mode 100644 index 000000000000..02156ba17e50 --- /dev/null +++ b/pkgs/development/python-modules/winsspi/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchPypi +, minikerberos +, pythonAtLeast +}: + +buildPythonPackage rec { + pname = "winsspi"; + version = "0.0.9"; + + src = fetchPypi { + inherit pname version; + sha256 = "1q8hr8l8d9jxyp55qsrlkyhdhqjc0n18ajzms7hf1xkhdl7rrbd2"; + }; + propagatedBuildInputs = [ minikerberos ]; + + # Project doesn't have tests + doCheck = false; + pythonImportsCheck = [ "winsspi" ]; + + meta = with lib; { + description = "Python module for ACL/ACE/Security descriptor manipulation"; + homepage = "https://github.com/skelsec/winsspi"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/word2vec/default.nix b/pkgs/development/python-modules/word2vec/default.nix index 1e448c377096..647914bfbe5f 100644 --- a/pkgs/development/python-modules/word2vec/default.nix +++ b/pkgs/development/python-modules/word2vec/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , fetchzip @@ -43,7 +43,7 @@ buildPythonPackage rec { pytest ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Tool for computing continuous distributed representations of words"; homepage = "https://github.com/danielfrg/word2vec"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/wordcloud/default.nix b/pkgs/development/python-modules/wordcloud/default.nix index d005527b4c35..b4dd108ae739 100644 --- a/pkgs/development/python-modules/wordcloud/default.nix +++ b/pkgs/development/python-modules/wordcloud/default.nix @@ -1,34 +1,45 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub +{ lib, stdenv, buildPythonPackage, fetchFromGitHub , matplotlib , mock , numpy , pillow -, pytest +, cython , pytestcov +, pytest +, fetchpatch }: buildPythonPackage rec { pname = "word_cloud"; - version = "1.6.0"; + version = "1.8.1"; # tests are not included in pypi tarball src = fetchFromGitHub { owner = "amueller"; repo = pname; rev = version; - sha256 = "1ncjr90m3w3b4zi23kw6ai11gxahdyah96x8jb2yn2x4573022x2"; + sha256 = "sha256-4EFQfv+Jn9EngUAyDoJP0yv9zr9Tnbrdwq1YzDacB9Q="; }; + nativeBuildInputs = [ cython ]; propagatedBuildInputs = [ matplotlib numpy pillow ]; # Tests require extra dependencies checkInputs = [ mock pytest pytestcov ]; - # skip tests which make assumptions about installation + checkPhase = '' - pytest -k 'not cli_as_executable' + PATH=$out/bin:$PATH pytest test ''; - meta = with stdenv.lib; { + patches = [ + (fetchpatch { + # https://github.com/amueller/word_cloud/pull/616 + url = "https://github.com/amueller/word_cloud/commit/858a8ac4b5b08494c1d25d9e0b35dd995151a1e5.patch"; + sha256 = "sha256-+aDTMPtOibVwjPrRLxel0y4JFD5ERB2bmJi4zRf/asg="; + }) + ]; + + meta = with lib; { description = "A little word cloud generator in Python"; homepage = "https://github.com/amueller/word_cloud"; license = licenses.mit; diff --git a/pkgs/development/python-modules/worldengine/default.nix b/pkgs/development/python-modules/worldengine/default.nix index dafa948f69d8..51c0de77917d 100644 --- a/pkgs/development/python-modules/worldengine/default.nix +++ b/pkgs/development/python-modules/worldengine/default.nix @@ -1,9 +1,8 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , pythonOlder , isPy27 , fetchFromGitHub -, nose , noise , numpy , pyplatec @@ -11,6 +10,7 @@ , purepng , h5py , gdal +, pytestCheckHook }: buildPythonPackage rec { @@ -47,15 +47,14 @@ buildPythonPackage rec { --replace 'PyPlatec==1.4.0' 'PyPlatec' \ ''; - # with python<3.5, unittest fails to discover tests because of their filenames - # so nose is used instead. doCheck = !isPy27; # google namespace clash - checkInputs = stdenv.lib.optional (pythonOlder "3.5") [ nose ]; - postCheck = stdenv.lib.optionalString (pythonOlder "3.5") '' - nosetests tests - ''; + checkInputs = [ pytestCheckHook ]; - meta = with stdenv.lib; { + disabledTests = [ + "TestSerialization" + ]; + + meta = with lib; { homepage = "http://world-engine.org"; description = "World generator using simulation of plates, rain shadow, erosion, etc"; license = licenses.mit; diff --git a/pkgs/development/python-modules/wrapio/default.nix b/pkgs/development/python-modules/wrapio/default.nix index 4289c2020727..757585bd1455 100644 --- a/pkgs/development/python-modules/wrapio/default.nix +++ b/pkgs/development/python-modules/wrapio/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi }: @@ -15,7 +15,7 @@ buildPythonPackage rec { doCheck = false; pythonImportsCheck = [ "wrapio" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/Exahilosys/wrapio"; description = "Handling event-based streams"; license = licenses.mit; diff --git a/pkgs/development/python-modules/ws4py/default.nix b/pkgs/development/python-modules/ws4py/default.nix index 83e1fbad3233..2b7a66df285c 100644 --- a/pkgs/development/python-modules/ws4py/default.nix +++ b/pkgs/development/python-modules/ws4py/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, pytest, mock, git +{ lib, stdenv, buildPythonPackage, fetchPypi, pytest, mock, git , cherrypy, gevent, tornado }: buildPythonPackage rec { @@ -17,7 +17,7 @@ buildPythonPackage rec { pytest ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://ws4py.readthedocs.org"; description = "A WebSocket package for Python"; maintainers = []; diff --git a/pkgs/development/python-modules/wsgiproxy/default.nix b/pkgs/development/python-modules/wsgiproxy/default.nix index 8ae8b4aefa54..12aa3c88d968 100644 --- a/pkgs/development/python-modules/wsgiproxy/default.nix +++ b/pkgs/development/python-modules/wsgiproxy/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , paste @@ -18,7 +18,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ paste six ]; - meta = with stdenv.lib; { + meta = with lib; { description = "WSGIProxy gives tools to proxy arbitrary(ish) WSGI requests to other"; homepage = "http://pythonpaste.org/wsgiproxy/"; license = licenses.mit; diff --git a/pkgs/development/python-modules/wsgiproxy2/default.nix b/pkgs/development/python-modules/wsgiproxy2/default.nix index ef3ce69742c1..81a2f98b86f8 100644 --- a/pkgs/development/python-modules/wsgiproxy2/default.nix +++ b/pkgs/development/python-modules/wsgiproxy2/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , six @@ -20,7 +20,7 @@ buildPythonPackage rec { # circular dep on webtest doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://pythonpaste.org/wsgiproxy/"; description = "HTTP proxying tools for WSGI apps"; license = licenses.mit; diff --git a/pkgs/development/python-modules/wtforms/default.nix b/pkgs/development/python-modules/wtforms/default.nix index 66667c74ef3d..45c465ddcba7 100644 --- a/pkgs/development/python-modules/wtforms/default.nix +++ b/pkgs/development/python-modules/wtforms/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , markupsafe @@ -18,7 +18,7 @@ buildPythonPackage rec { # Django tests are broken "django.core.exceptions.AppRegistryNotReady: Apps aren't loaded yet." doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "A flexible forms validation and rendering library for Python"; homepage = "https://github.com/wtforms/wtforms"; changelog = "https://github.com/wtforms/wtforms/blob/${version}/CHANGES.rst"; diff --git a/pkgs/development/python-modules/x11_hash/default.nix b/pkgs/development/python-modules/x11_hash/default.nix index 22ce5917e2a6..21bb787402c1 100644 --- a/pkgs/development/python-modules/x11_hash/default.nix +++ b/pkgs/development/python-modules/x11_hash/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi }: @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "172skm9xbbrivy1p4xabxihx9lsnzi53hvzryfw64m799k2fmp22"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Binding for X11 proof of work hashing"; homepage = "https://github.com/mazaclub/x11_hash"; license = licenses.mit; diff --git a/pkgs/development/python-modules/x256/default.nix b/pkgs/development/python-modules/x256/default.nix index bc0f0f657908..4ceb2dcae791 100644 --- a/pkgs/development/python-modules/x256/default.nix +++ b/pkgs/development/python-modules/x256/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ lib, stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { @@ -12,7 +12,7 @@ buildPythonPackage rec { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Find the nearest xterm 256 color index for an RGB"; homepage = "https://github.com/magarcia/python-x256"; license = licenses.mit; diff --git a/pkgs/development/python-modules/xapp/default.nix b/pkgs/development/python-modules/xapp/default.nix index de779fc2c00b..28901017b2b5 100644 --- a/pkgs/development/python-modules/xapp/default.nix +++ b/pkgs/development/python-modules/xapp/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , buildPythonPackage , psutil @@ -33,7 +33,7 @@ buildPythonPackage rec { substituteInPlace "xapp/os.py" --replace "/usr/bin/pkexec" "${polkit}/bin/pkexec" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/linuxmint/python-xapp"; description = "Cross-desktop libraries and common resources for python"; license = licenses.lgpl2; diff --git a/pkgs/development/python-modules/xattr/default.nix b/pkgs/development/python-modules/xattr/default.nix index 8634d616b736..3583358a5605 100644 --- a/pkgs/development/python-modules/xattr/default.nix +++ b/pkgs/development/python-modules/xattr/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , python @@ -23,7 +23,7 @@ buildPythonPackage rec { ${python.interpreter} -m compileall -f xattr ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/xattr/xattr"; description = "Python wrapper for extended filesystem attributes"; license = licenses.mit; diff --git a/pkgs/development/python-modules/xc-fasm/default.nix b/pkgs/development/python-modules/xc-fasm/default.nix new file mode 100644 index 000000000000..bf00bb159010 --- /dev/null +++ b/pkgs/development/python-modules/xc-fasm/default.nix @@ -0,0 +1,45 @@ +{ stdenv +, fetchFromGitHub +, buildPythonPackage +, pytestCheckHook +, simplejson +, intervaltree +, python-prjxray +, symbiflow-fasm +, textx +}: + +buildPythonPackage rec { + pname = "xc-fasm"; + version = "0.0.1-g0ddd9516"; + + src = fetchFromGitHub { + owner = "SymbiFlow"; + repo = "xc-fasm"; + rev = "0ddd951602d47d5b95f2072f8aa751af5e81e577"; + sha256 = "15bzw92sx99s0zldr48na4yhrnp7b90nxsd8ya6ag1pvvijp2al4"; + }; + + propagatedBuildInputs = [ + simplejson + intervaltree + python-prjxray + symbiflow-fasm + textx + ]; + + # Pip will check for and then install missing dependecies. + # Because some of them are installed from git, it will try + # to download them even if they're present in + # propagatedBuildInputs. + pipInstallFlags = [ "--no-deps" ]; + + checkInputs = [ pytestCheckHook ]; + + meta = with stdenv.lib; { + description = "XC FASM libraries"; + homepage = "https://github.com/SymbiFlow/xc-fasm"; + license = licenses.isc; + maintainers = with maintainers; [ mcaju ]; + }; +} diff --git a/pkgs/development/python-modules/xcaplib/default.nix b/pkgs/development/python-modules/xcaplib/default.nix index 25061d5321ab..f6bb5712c2eb 100644 --- a/pkgs/development/python-modules/xcaplib/default.nix +++ b/pkgs/development/python-modules/xcaplib/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchdarcs , isPy3k @@ -19,7 +19,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ eventlib application ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/AGProjects/python-xcaplib"; description = "XCAP (RFC4825) client library"; license = licenses.gpl2; diff --git a/pkgs/development/python-modules/xcffib/default.nix b/pkgs/development/python-modules/xcffib/default.nix index b75179bdc2a4..33431684708b 100644 --- a/pkgs/development/python-modules/xcffib/default.nix +++ b/pkgs/development/python-modules/xcffib/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , xorg @@ -27,7 +27,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "xcffib" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A drop in replacement for xpyb, an XCB python binding"; homepage = "https://github.com/tych0/xcffib"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/xdg/default.nix b/pkgs/development/python-modules/xdg/default.nix index 8b2d73b00fb8..e47a91fb993b 100644 --- a/pkgs/development/python-modules/xdg/default.nix +++ b/pkgs/development/python-modules/xdg/default.nix @@ -1,11 +1,11 @@ { lib, buildPythonPackage, fetchFromGitHub, isPy27 , clikit -, poetry +, poetry-core , pytestCheckHook }: buildPythonPackage rec { - version = "4.0.1"; + version = "5.0.1"; pname = "xdg"; disabled = isPy27; format = "pyproject"; @@ -14,10 +14,10 @@ buildPythonPackage rec { owner = "srstevenson"; repo = pname; rev = version; - sha256 = "13kgnbwam6wmdbig0m98vmyjcqrp0j62nmfknb6prr33ns2nxbs2"; + sha256 = "sha256-WMY9Hs9SbErTp8hVBoCWTz4dLQhuzqTRpXFEyE7+woo="; }; - nativeBuildInputs = [ poetry ]; + nativeBuildInputs = [ poetry-core ]; propagatedBuildInputs = [ clikit diff --git a/pkgs/development/python-modules/xdot/default.nix b/pkgs/development/python-modules/xdot/default.nix index e8b95e5d09cc..21b45b9c322d 100644 --- a/pkgs/development/python-modules/xdot/default.nix +++ b/pkgs/development/python-modules/xdot/default.nix @@ -1,5 +1,5 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k -, wrapGAppsHook, gobject-introspection, pygobject3, graphviz, gtk3 }: +{ lib, buildPythonPackage, fetchPypi, isPy3k, python3, xvfb_run, stdenv +, wrapGAppsHook, gobject-introspection, pygobject3, graphviz, gtk3, numpy }: buildPythonPackage rec { pname = "xdot"; @@ -11,9 +11,17 @@ buildPythonPackage rec { }; disabled = !isPy3k; - nativeBuildInputs = [ wrapGAppsHook ]; - propagatedBuildInputs = [ gobject-introspection pygobject3 graphviz gtk3 ]; + propagatedBuildInputs = [ gobject-introspection pygobject3 graphviz gtk3 numpy ]; + checkInputs = [ xvfb_run ]; + + checkPhase = '' + xvfb-run -s '-screen 0 800x600x24' ${python3.interpreter} nix_run_setup test + ''; + + # https://github.com/NixOS/nixpkgs/pull/107872#issuecomment-752175866 + # cannot import name '_gi' from partially initialized module 'gi' (most likely due to a circular import) + doCheck = false; meta = with lib; { description = "An interactive viewer for graphs written in Graphviz's dot"; diff --git a/pkgs/development/python-modules/xhtml2pdf/default.nix b/pkgs/development/python-modules/xhtml2pdf/default.nix index 88143b2193f4..e3328c7e4534 100644 --- a/pkgs/development/python-modules/xhtml2pdf/default.nix +++ b/pkgs/development/python-modules/xhtml2pdf/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , pillow @@ -25,7 +25,7 @@ buildPythonPackage rec { sha256 = "6797e974fac66f0efbe927c1539a2756ca4fe8777eaa5882bac132fc76b39421"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A PDF generator using HTML and CSS"; homepage = "https://github.com/xhtml2pdf/xhtml2pdf"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/xkcdpass/default.nix b/pkgs/development/python-modules/xkcdpass/default.nix index 8cb5b5f0777a..88f7b9b94a1f 100644 --- a/pkgs/development/python-modules/xkcdpass/default.nix +++ b/pkgs/development/python-modules/xkcdpass/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi }: @@ -16,7 +16,7 @@ buildPythonPackage rec { # https://github.com/redacted/XKCD-password-generator/issues/32 doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://pypi.python.org/pypi/xkcdpass/"; description = "Generate secure multiword passwords/passphrases, inspired by XKCD"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/xknx/default.nix b/pkgs/development/python-modules/xknx/default.nix new file mode 100644 index 000000000000..19720a55d23a --- /dev/null +++ b/pkgs/development/python-modules/xknx/default.nix @@ -0,0 +1,47 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, netifaces +, voluptuous +, pyyaml +, pytest-asyncio +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "xknx"; + version = "0.16.0"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "XKNX"; + repo = pname; + rev = version; + sha256 = "0a9pxah37ml2a5qpc841ps22d256003i8d4mix2gh7nwxab2qp8j"; + }; + + propagatedBuildInputs = [ + voluptuous + netifaces + pyyaml + ]; + + checkInputs = [ + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ "xknx" ]; + + meta = with lib; { + description = "KNX Library Written in Python"; + longDescription = '' + XKNX is an asynchronous Python library for reading and writing KNX/IP + packets. It provides support for KNX/IP routing and tunneling devices. + ''; + homepage = "https://github.com/XKNX/xknx"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/xlib/default.nix b/pkgs/development/python-modules/xlib/default.nix index 599abf1974cd..1819fd5a5124 100644 --- a/pkgs/development/python-modules/xlib/default.nix +++ b/pkgs/development/python-modules/xlib/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchFromGitHub , six @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "xlib"; - version = "0.28"; + version = "0.29"; src = fetchFromGitHub { owner = "python-xlib"; repo = "python-xlib"; rev = version; - sha256 = "13551vi65034pjf2g7zkw5dyjqcjfyk32a640g5jr055ssf0bjkc"; + sha256 = "sha256-zOG1QzRa5uN36Ngv8i5s3mq+VIoRzxFj5ltUbKdonJ0="; }; checkPhase = '' @@ -32,7 +32,7 @@ buildPythonPackage rec { doCheck = !stdenv.isDarwin; - meta = with stdenv.lib; { + meta = with lib; { description = "Fully functional X client library for Python programs"; homepage = "http://python-xlib.sourceforge.net/"; license = licenses.gpl2Plus; diff --git a/pkgs/development/python-modules/xlrd/default.nix b/pkgs/development/python-modules/xlrd/default.nix index 9b5e8b83e306..031ac047936e 100644 --- a/pkgs/development/python-modules/xlrd/default.nix +++ b/pkgs/development/python-modules/xlrd/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , pytest @@ -19,7 +19,7 @@ buildPythonPackage rec { py.test -k "not test_tilde_path_expansion" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.python-excel.org/"; description = "Library for developers to extract data from Microsoft Excel (tm) spreadsheet files"; license = licenses.bsd0; diff --git a/pkgs/development/python-modules/xlsx2csv/default.nix b/pkgs/development/python-modules/xlsx2csv/default.nix index 1c42b1b17845..a5b67632d836 100644 --- a/pkgs/development/python-modules/xlsx2csv/default.nix +++ b/pkgs/development/python-modules/xlsx2csv/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi }: @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "09vigknmz15izirfddkmb3a39h1rp2jmc00bnrff12i757n7jjl4"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/bitprophet/alabaster"; description = "Convert xlsx to csv"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/xml2rfc/default.nix b/pkgs/development/python-modules/xml2rfc/default.nix index 9f32a6de2d89..e06daf3c5b86 100644 --- a/pkgs/development/python-modules/xml2rfc/default.nix +++ b/pkgs/development/python-modules/xml2rfc/default.nix @@ -1,11 +1,11 @@ -{ lib, fetchPypi, buildPythonPackage, intervaltree, pyflakes, requests, lxml, google-i18n-address -, pycountry, html5lib, six, kitchen, pypdf2, dict2xml, weasyprint, pyyaml, jinja2 -, stdenv +{ lib, stdenv, fetchPypi, buildPythonPackage, pythonAtLeast, intervaltree, pyflakes, requests, lxml, google-i18n-address +, pycountry, html5lib, six, kitchen, pypdf2, dict2xml, weasyprint, pyyaml, jinja2, ConfigArgParse, appdirs }: buildPythonPackage rec { pname = "xml2rfc"; version = "3.5.0"; + disabled = pythonAtLeast "3.9"; src = fetchPypi { inherit pname version; @@ -27,6 +27,8 @@ buildPythonPackage rec { pypdf2 dict2xml weasyprint + ConfigArgParse + appdirs ]; preCheck = '' @@ -35,6 +37,7 @@ buildPythonPackage rec { # lxml tries to fetch from the internet doCheck = false; + pythonImportsCheck = [ "xml2rfc" ]; meta = with lib; { description = "Tool generating IETF RFCs and drafts from XML sources"; diff --git a/pkgs/development/python-modules/xmlschema/default.nix b/pkgs/development/python-modules/xmlschema/default.nix index 55b45fb51714..e31054e74c13 100644 --- a/pkgs/development/python-modules/xmlschema/default.nix +++ b/pkgs/development/python-modules/xmlschema/default.nix @@ -5,14 +5,14 @@ }: buildPythonPackage rec { - version = "1.3.1"; + version = "1.4.1"; pname = "xmlschema"; src = fetchFromGitHub { owner = "sissaschool"; repo = "xmlschema"; rev = "v${version}"; - sha256 = "08p6fm15600h40r5h7f3gfv34cys481f89pf57dv3y8gf6y2if56"; + sha256 = "1yd7whf74z8bw99gldxlnrs8bjnjzald29b5cf2ka0i144sxbvad"; }; propagatedBuildInputs = [ elementpath ]; diff --git a/pkgs/development/python-modules/xmodem/default.nix b/pkgs/development/python-modules/xmodem/default.nix index 48d658ba49b9..9023c4cc79ee 100644 --- a/pkgs/development/python-modules/xmodem/default.nix +++ b/pkgs/development/python-modules/xmodem/default.nix @@ -1,14 +1,14 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, pytest, which, lrzsz }: +{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pytest, which, lrzsz }: buildPythonPackage rec { pname = "xmodem"; - version = "0.4.5"; + version = "0.4.6"; src = fetchFromGitHub { owner = "tehmaze"; repo = "xmodem"; rev = version; - sha256 = "0nz2gxwaq3ys1knpw6zlz3xrc3ziambcirg3fmp3nvzjdq8ma3h0"; + sha256 = "1xx7wd8bnswxa1fv3bfim2gcamii79k7qmwg7dbxbjvrhbcjjc0l"; }; checkInputs = [ pytest which lrzsz ]; @@ -17,7 +17,7 @@ buildPythonPackage rec { pytest ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Pure python implementation of the XMODEM protocol"; maintainers = with maintainers; [ emantor ]; homepage = "https://github.com/tehmaze/xmodem"; diff --git a/pkgs/development/python-modules/xmpppy/default.nix b/pkgs/development/python-modules/xmpppy/default.nix index b812609a7d7b..fd046adadd97 100644 --- a/pkgs/development/python-modules/xmpppy/default.nix +++ b/pkgs/development/python-modules/xmpppy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchurl, isPy3k }: +{ lib, stdenv, buildPythonPackage, fetchurl, isPy3k }: buildPythonPackage rec { pname = "xmpp.py"; version = "0.5.0rc1"; @@ -17,7 +17,7 @@ buildPythonPackage rec { disabled = isPy3k; - meta = with stdenv.lib; { + meta = with lib; { description = "XMPP python library"; homepage = "http://xmpppy.sourceforge.net/"; license = licenses.gpl3; diff --git a/pkgs/development/python-modules/xvfbwrapper/default.nix b/pkgs/development/python-modules/xvfbwrapper/default.nix index dacb3b634368..0852fd2e15cf 100644 --- a/pkgs/development/python-modules/xvfbwrapper/default.nix +++ b/pkgs/development/python-modules/xvfbwrapper/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , xorgserver @@ -20,7 +20,7 @@ buildPythonPackage rec { checkInputs = [ mock ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Run headless display inside X virtual framebuffer (Xvfb)"; homepage = "https://github.com/cgoldberg/xvfbwrapper"; license = licenses.mit; diff --git a/pkgs/development/python-modules/xxhash/default.nix b/pkgs/development/python-modules/xxhash/default.nix index 52b3f8b1b5b5..d2f6ae54a4cf 100644 --- a/pkgs/development/python-modules/xxhash/default.nix +++ b/pkgs/development/python-modules/xxhash/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi }: @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "58ca818554c1476fa1456f6cd4b87002e2294f09baf0f81e5a2a4968e62c423c"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/ifduyue/python-xxhash"; description = "Python Binding for xxHash https://pypi.org/project/xxhash/"; license = licenses.bsd2; diff --git a/pkgs/development/python-modules/yamllint/default.nix b/pkgs/development/python-modules/yamllint/default.nix index f0407dff1735..7145c504cd92 100644 --- a/pkgs/development/python-modules/yamllint/default.nix +++ b/pkgs/development/python-modules/yamllint/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ lib, stdenv, buildPythonPackage, fetchPypi , nose, pyyaml, pathspec }: buildPythonPackage rec { @@ -17,7 +17,7 @@ buildPythonPackage rec { # Two test failures doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "A linter for YAML files"; homepage = "https://github.com/adrienverge/yamllint"; license = licenses.gpl3; diff --git a/pkgs/development/python-modules/yanc/default.nix b/pkgs/development/python-modules/yanc/default.nix index 9bbfc4100682..6d4a3b41fbcc 100644 --- a/pkgs/development/python-modules/yanc/default.nix +++ b/pkgs/development/python-modules/yanc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, pythonOlder, fetchPypi, nose }: +{ lib, stdenv, buildPythonPackage, pythonOlder, fetchPypi, nose }: buildPythonPackage rec { pname = "yanc"; @@ -18,7 +18,7 @@ buildPythonPackage rec { nosetests . ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Yet another nose colorer"; homepage = "https://github.com/0compute/yanc"; license = licenses.gpl3; diff --git a/pkgs/development/python-modules/yapf/default.nix b/pkgs/development/python-modules/yapf/default.nix index 65a4e9abcb29..36409ae40195 100644 --- a/pkgs/development/python-modules/yapf/default.nix +++ b/pkgs/development/python-modules/yapf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi }: +{ lib, stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "yapf"; @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "3000abee4c28daebad55da6c85f3cd07b8062ce48e2e9943c8da1b9667d48427"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A formatter for Python code."; homepage = "https://github.com/google/yapf"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/yapsy/default.nix b/pkgs/development/python-modules/yapsy/default.nix index f0d39f69e555..359a855a3e5f 100644 --- a/pkgs/development/python-modules/yapsy/default.nix +++ b/pkgs/development/python-modules/yapsy/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi }: @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "12rznbnswfw0w7qfbvmmffr9r317gl1rqg36nijwzsklkjgks4fq"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://yapsy.sourceforge.net/"; description = "Yet another plugin system"; license = licenses.bsd0; diff --git a/pkgs/development/python-modules/yarl/default.nix b/pkgs/development/python-modules/yarl/default.nix index 7a15907e59be..7a88b695f639 100644 --- a/pkgs/development/python-modules/yarl/default.nix +++ b/pkgs/development/python-modules/yarl/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { typing-extensions ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Yet another URL library"; homepage = "https://github.com/aio-libs/yarl/"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/ydiff/default.nix b/pkgs/development/python-modules/ydiff/default.nix index 822bb40783e9..89b063f84be7 100644 --- a/pkgs/development/python-modules/ydiff/default.nix +++ b/pkgs/development/python-modules/ydiff/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi }: +{ lib, stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "ydiff"; @@ -15,7 +15,7 @@ buildPythonPackage rec { $out/bin/ydiff --help ''; - meta = with stdenv.lib; { + meta = with lib; { description = "View colored, incremental diff in workspace or from stdin with side by side and auto pager support (Was \"cdiff\")"; longDescription = '' Term based tool to view colored, incremental diff in a Git/Mercurial/Svn @@ -24,6 +24,6 @@ buildPythonPackage rec { ''; homepage = "https://github.com/ymattw/ydiff"; license = licenses.bsd3; - maintainers = [ maintainers.limeytexan ]; + maintainers = teams.deshaw.members; }; } diff --git a/pkgs/development/python-modules/yowsup/default.nix b/pkgs/development/python-modules/yowsup/default.nix index 0436fe8a0f00..48c21434194f 100644 --- a/pkgs/development/python-modules/yowsup/default.nix +++ b/pkgs/development/python-modules/yowsup/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, stdenv, fetchFromGitHub, six, python-axolotl, pytest +{ buildPythonPackage, lib, stdenv, fetchFromGitHub, six, python-axolotl, pytest , isPy3k, consonance, appdirs }: @@ -26,10 +26,10 @@ buildPythonPackage rec { propagatedBuildInputs = [ six python-axolotl consonance appdirs ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/tgalal/yowsup"; description = "The python WhatsApp library"; license = licenses.gpl3; - maintainers = with maintainers; [ ma27 ]; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } diff --git a/pkgs/development/python-modules/z3c-checkversions/default.nix b/pkgs/development/python-modules/z3c-checkversions/default.nix index f4f42cf9e3fc..f1af120d56eb 100644 --- a/pkgs/development/python-modules/z3c-checkversions/default.nix +++ b/pkgs/development/python-modules/z3c-checkversions/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , python @@ -23,7 +23,7 @@ buildPythonPackage rec { ${python.interpreter} -m zope.testrunner --test-path=src [] ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/zopefoundation/z3c.checkversions"; description = "Find newer package versions on PyPI"; license = licenses.zpl21; diff --git a/pkgs/development/python-modules/zake/default.nix b/pkgs/development/python-modules/zake/default.nix index 8eafaafadf58..1d1d21a462ec 100644 --- a/pkgs/development/python-modules/zake/default.nix +++ b/pkgs/development/python-modules/zake/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , kazoo @@ -26,7 +26,7 @@ buildPythonPackage rec { ${python.interpreter} -m unittest discover zake/tests ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/yahoo/Zake"; description = "A python package that works to provide a nice set of testing utilities for the kazoo library"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/zbaemon/default.nix b/pkgs/development/python-modules/zbaemon/default.nix index a87bd3093f4f..4e126074b184 100644 --- a/pkgs/development/python-modules/zbaemon/default.nix +++ b/pkgs/development/python-modules/zbaemon/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , zconfig @@ -18,7 +18,7 @@ buildPythonPackage rec { # too many deps.. doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "A daemon process control library and tools for Unix-based systems"; homepage = "https://pypi.python.org/pypi/zdaemon"; license = licenses.zpl20; diff --git a/pkgs/development/python-modules/zbase32/default.nix b/pkgs/development/python-modules/zbase32/default.nix index 9c97ad066ed5..a4e7a476beca 100644 --- a/pkgs/development/python-modules/zbase32/default.nix +++ b/pkgs/development/python-modules/zbase32/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , setuptoolsDarcs @@ -19,7 +19,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ setuptoolsDarcs pyutil ]; - meta = with stdenv.lib; { + meta = with lib; { description = "zbase32, a base32 encoder/decoder"; homepage = "https://pypi.python.org/pypi/zbase32"; license = licenses.bsd0; diff --git a/pkgs/development/python-modules/zc_lockfile/default.nix b/pkgs/development/python-modules/zc_lockfile/default.nix index 18fc7bcf5115..3b75de3a24b6 100644 --- a/pkgs/development/python-modules/zc_lockfile/default.nix +++ b/pkgs/development/python-modules/zc_lockfile/default.nix @@ -2,7 +2,7 @@ , fetchPypi , mock , zope_testing -, stdenv +, lib, stdenv }: buildPythonPackage rec { @@ -17,7 +17,7 @@ buildPythonPackage rec { buildInputs = [ mock ]; propagatedBuildInputs = [ zope_testing ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Inter-process locks"; homepage = "https://www.python.org/pypi/zc.lockfile"; license = licenses.zpl20; diff --git a/pkgs/development/python-modules/zconfig/default.nix b/pkgs/development/python-modules/zconfig/default.nix index ef4754504dd6..4882f92b0475 100644 --- a/pkgs/development/python-modules/zconfig/default.nix +++ b/pkgs/development/python-modules/zconfig/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchPypi , fetchpatch , buildPythonPackage @@ -28,7 +28,7 @@ buildPythonPackage rec { buildInputs = [ manuel docutils ]; propagatedBuildInputs = [ zope_testrunner ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Structured Configuration Library"; homepage = "https://pypi.python.org/pypi/ZConfig"; license = licenses.zpl20; diff --git a/pkgs/development/python-modules/zdaemon/default.nix b/pkgs/development/python-modules/zdaemon/default.nix index a87bd3093f4f..4e126074b184 100644 --- a/pkgs/development/python-modules/zdaemon/default.nix +++ b/pkgs/development/python-modules/zdaemon/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , zconfig @@ -18,7 +18,7 @@ buildPythonPackage rec { # too many deps.. doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "A daemon process control library and tools for Unix-based systems"; homepage = "https://pypi.python.org/pypi/zdaemon"; license = licenses.zpl20; diff --git a/pkgs/development/python-modules/zerobin/default.nix b/pkgs/development/python-modules/zerobin/default.nix index efc2bb380b8e..e12088756686 100644 --- a/pkgs/development/python-modules/zerobin/default.nix +++ b/pkgs/development/python-modules/zerobin/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchFromGitHub , cherrypy @@ -24,7 +24,7 @@ buildPythonPackage { # can wrongly fail the check phase. doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "A client side encrypted pastebin"; homepage = "https://0bin.net/"; license = licenses.wtfpl; diff --git a/pkgs/development/python-modules/zeroc-ice/default.nix b/pkgs/development/python-modules/zeroc-ice/default.nix index 16bf5b7855c5..f85674d68673 100644 --- a/pkgs/development/python-modules/zeroc-ice/default.nix +++ b/pkgs/development/python-modules/zeroc-ice/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, openssl, bzip2 }: +{ lib, stdenv, buildPythonPackage, fetchPypi, openssl, bzip2 }: buildPythonPackage rec { pname = "zeroc-ice"; @@ -11,7 +11,7 @@ buildPythonPackage rec { buildInputs = [ openssl bzip2 ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://zeroc.com/"; license = licenses.gpl2; description = "Comprehensive RPC framework with support for Python, C++, .NET, Java, JavaScript and more."; diff --git a/pkgs/development/python-modules/zeroconf/default.nix b/pkgs/development/python-modules/zeroconf/default.nix index a8715a2133c3..a3b00ec32324 100644 --- a/pkgs/development/python-modules/zeroconf/default.nix +++ b/pkgs/development/python-modules/zeroconf/default.nix @@ -1,4 +1,5 @@ -{ lib +{ stdenv +, lib , buildPythonPackage , fetchPypi , ifaddr @@ -10,12 +11,12 @@ buildPythonPackage rec { pname = "zeroconf"; - version = "0.28.6"; + version = "0.28.8"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "70f10f0f16e3a8c4eb5e1a106b812b8d052253041cf1ee1195933df706f5261c"; + sha256 = "0narq8haa3b375vfblbyil77n8bw0wxqnanl91pl0wwwm884mqjb"; }; propagatedBuildInputs = [ ifaddr ] @@ -29,12 +30,15 @@ buildPythonPackage rec { "test_launch_and_close_v4_v6" "test_launch_and_close_v6_only" "test_integration_with_listener_ipv6" + ] ++ lib.optionals stdenv.isDarwin [ + "test_lots_of_names" ]; + __darwinAllowLocalNetworking = true; pythonImportsCheck = [ "zeroconf" ]; meta = with lib; { - description = "A pure python implementation of multicast DNS service discovery"; + description = "Python implementation of multicast DNS service discovery"; homepage = "https://github.com/jstasiak/python-zeroconf"; license = licenses.lgpl21; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/development/python-modules/zfec/default.nix b/pkgs/development/python-modules/zfec/default.nix index b365438a1c97..8a5aaf46b0e4 100644 --- a/pkgs/development/python-modules/zfec/default.nix +++ b/pkgs/development/python-modules/zfec/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , setuptoolsDarcs @@ -22,7 +22,7 @@ buildPythonPackage rec { sed -i -e '/argparse/d' setup.py ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://allmydata.org/trac/zfec"; description = "Zfec, a fast erasure codec which can be used with the command-line, C, Python, or Haskell"; longDescription = '' diff --git a/pkgs/development/python-modules/zha-quirks/default.nix b/pkgs/development/python-modules/zha-quirks/default.nix index 0c6ac7dbf499..2f3500516cb9 100644 --- a/pkgs/development/python-modules/zha-quirks/default.nix +++ b/pkgs/development/python-modules/zha-quirks/default.nix @@ -1,18 +1,25 @@ -{ lib, buildPythonPackage, fetchPypi -, aiohttp, zigpy, conftest, asynctest -, pytestCheckHook }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, aiohttp +, zigpy +, asynctest +, pytestCheckHook +}: buildPythonPackage rec { pname = "zha-quirks"; - version = "0.0.47"; + version = "0.0.51"; + + src = fetchFromGitHub { + owner = "zigpy"; + repo = "zha-device-handlers"; + rev = version; + sha256 = "14v01kclf096ax88cd6ckfs8gcffqissli9vpr0wfzli08afmbi9"; + }; propagatedBuildInputs = [ aiohttp zigpy ]; - checkInputs = [ pytestCheckHook conftest asynctest ]; - - src = fetchPypi { - inherit pname version; - sha256 = "bf7dbd5d1c1a3849b059e62afcef248b6955f5ceef78f87201ae2fc8420738de"; - }; + checkInputs = [ pytestCheckHook asynctest ]; meta = with lib; { description = "ZHA Device Handlers are custom quirks implementations for Zigpy"; diff --git a/pkgs/development/python-modules/zict/default.nix b/pkgs/development/python-modules/zict/default.nix index c5629a6fb73f..da36c1cba899 100644 --- a/pkgs/development/python-modules/zict/default.nix +++ b/pkgs/development/python-modules/zict/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ lib, stdenv, buildPythonPackage, fetchPypi , pytest, heapdict, pythonOlder }: buildPythonPackage rec { @@ -15,7 +15,7 @@ buildPythonPackage rec { buildInputs = [ pytest ]; propagatedBuildInputs = [ heapdict ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Mutable mapping tools."; homepage = "https://github.com/dask/zict"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/zigpy-deconz/default.nix b/pkgs/development/python-modules/zigpy-deconz/default.nix index 12964652752f..d9c7854bf984 100644 --- a/pkgs/development/python-modules/zigpy-deconz/default.nix +++ b/pkgs/development/python-modules/zigpy-deconz/default.nix @@ -1,20 +1,29 @@ -{ stdenv, buildPythonPackage, fetchPypi -, pyserial, pyserial-asyncio, zigpy -, pytest, pytest-asyncio, asynctest }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, pyserial +, pyserial-asyncio +, zigpy +, pytestCheckHook +, pytest-asyncio +, asynctest +}: buildPythonPackage rec { pname = "zigpy-deconz"; - version = "0.11.0"; + version = "0.11.1"; - propagatedBuildInputs = [ pyserial pyserial-asyncio zigpy ]; - checkInputs = [ pytest pytest-asyncio asynctest ]; - - src = fetchPypi { - inherit pname version; - sha256 = "a2263f8bc5807ebac55bb665eca553b514384ce270b66f83df02c39184193020"; + src = fetchFromGitHub { + owner = "zigpy"; + repo = pname; + rev = version; + sha256 = "1p9mdsfc200iyszppcflazzfwqg4v8nqqwqsx114nip5km7a5s37"; }; - meta = with stdenv.lib; { + propagatedBuildInputs = [ pyserial pyserial-asyncio zigpy ]; + checkInputs = [ pytestCheckHook pytest-asyncio asynctest ]; + + meta = with lib; { description = "Library which communicates with Deconz radios for zigpy"; homepage = "https://github.com/zigpy/zigpy-deconz"; license = licenses.gpl3Plus; diff --git a/pkgs/development/python-modules/zigpy-zigate/default.nix b/pkgs/development/python-modules/zigpy-zigate/default.nix index 018017c89a4c..5ebb17dd498b 100644 --- a/pkgs/development/python-modules/zigpy-zigate/default.nix +++ b/pkgs/development/python-modules/zigpy-zigate/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "zigpy-zigate"; - version = "0.7.3"; + version = "0.7.4"; # https://github.com/Martiusweb/asynctest/issues/152 # broken by upstream python bug with asynctest and # is used exclusively by home-assistant with python 3.8 @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zigpy-zigate"; rev = version; - sha256 = "068v8n8yimmpnwqcdz5m9g35z1x0dir478cbc1s1nyhw1xn50vg1"; + sha256 = "0xl8qgljvmypi602f52m89iv9pcrzsdal3jw619vrcavp40rc04d"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/zigpy-znp/default.nix b/pkgs/development/python-modules/zigpy-znp/default.nix index 9b8e65e23d03..4de49cbc46b3 100644 --- a/pkgs/development/python-modules/zigpy-znp/default.nix +++ b/pkgs/development/python-modules/zigpy-znp/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , async-timeout , asynctest , buildPythonPackage @@ -45,7 +45,12 @@ buildPythonPackage rec { pytestCheckHook ]; - meta = with stdenv.lib; { + disabledTests = [ + # zigpy-znp was too slow to sync up with the zigpy 0.29 release and has API breakage, remove >0.3.0 + "test_force_remove" + ]; + + meta = with lib; { description = "A library for zigpy which communicates with TI ZNP radios"; homepage = "https://github.com/zha-ng/zigpy-znp"; license = licenses.gpl3Plus; diff --git a/pkgs/development/python-modules/zigpy/default.nix b/pkgs/development/python-modules/zigpy/default.nix index 54f0df340169..483c239ae5d0 100644 --- a/pkgs/development/python-modules/zigpy/default.nix +++ b/pkgs/development/python-modules/zigpy/default.nix @@ -1,5 +1,6 @@ { lib , aiohttp +, aiosqlite , asynctest , buildPythonPackage , crccheck @@ -14,17 +15,18 @@ buildPythonPackage rec { pname = "zigpy"; - version = "0.26.0"; + version = "0.29.0"; src = fetchFromGitHub { owner = "zigpy"; repo = "zigpy"; rev = version; - sha256 = "ba8Ru6RCbFOHhctFtklnrxVD3uEpxF4XDvO5RMgXPBs="; + sha256 = "1r4i2ya9f241rls9mi24dksx4srrzi8agshnqy12rclxlh7qb1aw"; }; propagatedBuildInputs = [ aiohttp + aiosqlite crccheck pycrypto pycryptodome diff --git a/pkgs/development/python-modules/zodb/default.nix b/pkgs/development/python-modules/zodb/default.nix index e8097461d3b1..d48b9c4b9507 100644 --- a/pkgs/development/python-modules/zodb/default.nix +++ b/pkgs/development/python-modules/zodb/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchPypi , buildPythonPackage , python @@ -52,7 +52,7 @@ buildPythonPackage rec { ${python.interpreter} -m zope.testrunner --test-path=src [] ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Zope Object Database: object database and persistence"; homepage = "https://pypi.python.org/pypi/ZODB"; license = licenses.zpl21; diff --git a/pkgs/development/python-modules/zope_broken/default.nix b/pkgs/development/python-modules/zope_broken/default.nix index aa12167bddc2..899d7f3344be 100644 --- a/pkgs/development/python-modules/zope_broken/default.nix +++ b/pkgs/development/python-modules/zope_broken/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , zope_interface @@ -16,7 +16,7 @@ buildPythonPackage rec { buildInputs = [ zope_interface ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://pypi.python.org/pypi/zope.broken"; description = "Zope Broken Object Interfaces"; license = licenses.zpl20; diff --git a/pkgs/development/python-modules/zope_component/default.nix b/pkgs/development/python-modules/zope_component/default.nix index df0835841bce..6ea86b9b984d 100644 --- a/pkgs/development/python-modules/zope_component/default.nix +++ b/pkgs/development/python-modules/zope_component/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , zope-deferredimport @@ -27,7 +27,7 @@ buildPythonPackage rec { # ignore tests because of a circular dependency on zope_security doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/zopefoundation/zope.component"; description = "Zope Component Architecture"; license = licenses.zpl20; diff --git a/pkgs/development/python-modules/zope_configuration/default.nix b/pkgs/development/python-modules/zope_configuration/default.nix index 587cbf60d88c..e8d05b7767b3 100644 --- a/pkgs/development/python-modules/zope_configuration/default.nix +++ b/pkgs/development/python-modules/zope_configuration/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , zope_i18nmessageid @@ -23,7 +23,7 @@ buildPythonPackage rec { # Need to investigate how to run the tests with zope-testrunner doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Zope Configuration Markup Language (ZCML)"; homepage = "https://github.com/zopefoundation/zope.configuration"; license = licenses.zpl20; diff --git a/pkgs/development/python-modules/zope_contenttype/default.nix b/pkgs/development/python-modules/zope_contenttype/default.nix index b1792d718543..6b66cca18aab 100644 --- a/pkgs/development/python-modules/zope_contenttype/default.nix +++ b/pkgs/development/python-modules/zope_contenttype/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , zope_testrunner @@ -15,7 +15,7 @@ buildPythonPackage rec { checkInputs = [ zope_testrunner ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/zopefoundation/zope.contenttype"; description = "A utility module for content-type (MIME type) handling"; license = licenses.zpl20; diff --git a/pkgs/development/python-modules/zope_deprecation/default.nix b/pkgs/development/python-modules/zope_deprecation/default.nix index c4059dbcd416..cda7af8e7a0c 100644 --- a/pkgs/development/python-modules/zope_deprecation/default.nix +++ b/pkgs/development/python-modules/zope_deprecation/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , zope_testing @@ -15,7 +15,7 @@ buildPythonPackage rec { buildInputs = [ zope_testing ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/zopefoundation/zope.deprecation"; description = "Zope Deprecation Infrastructure"; license = licenses.zpl20; diff --git a/pkgs/development/python-modules/zope_dottedname/default.nix b/pkgs/development/python-modules/zope_dottedname/default.nix index b2afc9cc23f4..0e8f35431364 100644 --- a/pkgs/development/python-modules/zope_dottedname/default.nix +++ b/pkgs/development/python-modules/zope_dottedname/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi }: @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "0cec09844d309550359ac1941abfcd9141e213f67f3c19bb8f90360c40787576"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://pypi.python.org/pypi/zope.dottedname"; description = "Resolver for Python dotted names"; license = licenses.zpl20; diff --git a/pkgs/development/python-modules/zope_event/default.nix b/pkgs/development/python-modules/zope_event/default.nix index b5481ae2e2b7..cc82da7ea9a1 100644 --- a/pkgs/development/python-modules/zope_event/default.nix +++ b/pkgs/development/python-modules/zope_event/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi }: @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "5e76517f5b9b119acf37ca8819781db6c16ea433f7e2062c4afc2b6fbedb1330"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "An event publishing system"; homepage = "https://pypi.python.org/pypi/zope.event"; license = licenses.zpl20; diff --git a/pkgs/development/python-modules/zope_exceptions/default.nix b/pkgs/development/python-modules/zope_exceptions/default.nix index ae7797b8736b..09f08c7bba48 100644 --- a/pkgs/development/python-modules/zope_exceptions/default.nix +++ b/pkgs/development/python-modules/zope_exceptions/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , zope_interface @@ -18,7 +18,7 @@ buildPythonPackage rec { # circular deps doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Exception interfaces and implementations"; homepage = "https://pypi.python.org/pypi/zope.exceptions"; license = licenses.zpl20; diff --git a/pkgs/development/python-modules/zope_filerepresentation/default.nix b/pkgs/development/python-modules/zope_filerepresentation/default.nix index 635727a11734..7aae2a24d623 100644 --- a/pkgs/development/python-modules/zope_filerepresentation/default.nix +++ b/pkgs/development/python-modules/zope_filerepresentation/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , zope_schema @@ -20,7 +20,7 @@ buildPythonPackage rec { cd src/zope/filerepresentation && python -m unittest ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://zopefilerepresentation.readthedocs.io/"; description = "File-system Representation Interfaces"; license = licenses.zpl20; diff --git a/pkgs/development/python-modules/zope_i18nmessageid/default.nix b/pkgs/development/python-modules/zope_i18nmessageid/default.nix index ca5f818cd620..49270488ecdb 100644 --- a/pkgs/development/python-modules/zope_i18nmessageid/default.nix +++ b/pkgs/development/python-modules/zope_i18nmessageid/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , six @@ -19,7 +19,7 @@ buildPythonPackage rec { checkInputs = [ coverage zope_testrunner ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/zopefoundation/zope.i18nmessageid"; description = "Message Identifiers for internationalization"; license = licenses.zpl20; diff --git a/pkgs/development/python-modules/zope_interface/default.nix b/pkgs/development/python-modules/zope_interface/default.nix index 919c3ade3c28..7a32045fc3e3 100644 --- a/pkgs/development/python-modules/zope_interface/default.nix +++ b/pkgs/development/python-modules/zope_interface/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , zope_event @@ -17,7 +17,7 @@ buildPythonPackage rec { doCheck = false; # Circular deps. - meta = with stdenv.lib; { + meta = with lib; { description = "Zope.Interface"; homepage = "https://zope.org/Products/ZopeInterface"; license = licenses.zpl20; diff --git a/pkgs/development/python-modules/zope_lifecycleevent/default.nix b/pkgs/development/python-modules/zope_lifecycleevent/default.nix index 6494aa7a71af..28070ea67e70 100644 --- a/pkgs/development/python-modules/zope_lifecycleevent/default.nix +++ b/pkgs/development/python-modules/zope_lifecycleevent/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , isPy3k @@ -27,7 +27,7 @@ buildPythonPackage rec { "zope.interface" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/zopefoundation/zope.lifecycleevent"; description = "Object life-cycle events"; license = licenses.zpl20; diff --git a/pkgs/development/python-modules/zope_location/default.nix b/pkgs/development/python-modules/zope_location/default.nix index 1c868a739719..62b2cef9ea75 100644 --- a/pkgs/development/python-modules/zope_location/default.nix +++ b/pkgs/development/python-modules/zope_location/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , zope_proxy @@ -22,7 +22,7 @@ buildPythonPackage rec { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/zopefoundation/zope.location/"; description = "Zope Location"; license = licenses.zpl20; diff --git a/pkgs/development/python-modules/zope_proxy/default.nix b/pkgs/development/python-modules/zope_proxy/default.nix index 7092f7508708..af108c058c7f 100644 --- a/pkgs/development/python-modules/zope_proxy/default.nix +++ b/pkgs/development/python-modules/zope_proxy/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , zope_interface @@ -18,7 +18,7 @@ buildPythonPackage rec { # circular deps doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/zopefoundation/zope.proxy"; description = "Generic Transparent Proxies"; license = licenses.zpl20; diff --git a/pkgs/development/python-modules/zope_schema/default.nix b/pkgs/development/python-modules/zope_schema/default.nix index d32fb05ef94a..c7e228c4e05b 100644 --- a/pkgs/development/python-modules/zope_schema/default.nix +++ b/pkgs/development/python-modules/zope_schema/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , zope_location @@ -23,7 +23,7 @@ buildPythonPackage rec { # Package seems to work fine. doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/zopefoundation/zope.schema"; description = "zope.interface extension for defining data schemas"; license = licenses.zpl20; diff --git a/pkgs/development/python-modules/zope_size/default.nix b/pkgs/development/python-modules/zope_size/default.nix index 92df0aa1eb7e..79eadc880a25 100644 --- a/pkgs/development/python-modules/zope_size/default.nix +++ b/pkgs/development/python-modules/zope_size/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , zope_i18nmessageid @@ -16,7 +16,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ zope_i18nmessageid zope_interface ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/zopefoundation/zope.size"; description = "Interfaces and simple adapter that give the size of an object"; license = licenses.zpl20; diff --git a/pkgs/development/python-modules/zope_testing/default.nix b/pkgs/development/python-modules/zope_testing/default.nix index 1ea12eb377d9..3d7cbf90c25f 100644 --- a/pkgs/development/python-modules/zope_testing/default.nix +++ b/pkgs/development/python-modules/zope_testing/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , isPyPy @@ -20,7 +20,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ zope_interface zope_exceptions zope_location ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Zope testing helpers"; homepage = "http://pypi.python.org/pypi/zope.testing"; license = licenses.zpl20; diff --git a/pkgs/development/python-modules/zope_testrunner/default.nix b/pkgs/development/python-modules/zope_testrunner/default.nix index 90fa0b8143cd..c516106e48bb 100644 --- a/pkgs/development/python-modules/zope_testrunner/default.nix +++ b/pkgs/development/python-modules/zope_testrunner/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , zope_interface @@ -21,7 +21,7 @@ buildPythonPackage rec { doCheck = false; # custom test modifies sys.path - meta = with stdenv.lib; { + meta = with lib; { description = "A flexible test runner with layer support"; homepage = "https://pypi.python.org/pypi/zope.testrunner"; license = licenses.zpl20; diff --git a/pkgs/development/python-modules/zstandard/default.nix b/pkgs/development/python-modules/zstandard/default.nix index 39c7a42899a8..fc5f8c3161ed 100755 --- a/pkgs/development/python-modules/zstandard/default.nix +++ b/pkgs/development/python-modules/zstandard/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "zstandard"; - version = "0.15.0"; + version = "0.15.1"; src = fetchPypi { inherit pname version; - sha256 = "22395e97bcfdb222246da4fdf8739ed762ffce1e5d0b526eb051c90da20268d7"; + sha256 = "cb7c6a6f7d62350b9f5539045da54422975630e34dd9069584cc776b9917115f"; }; propagatedBuildInputs = [ cffi ]; diff --git a/pkgs/development/python-modules/zstd/default.nix b/pkgs/development/python-modules/zstd/default.nix index 95626c802bad..716b13726452 100644 --- a/pkgs/development/python-modules/zstd/default.nix +++ b/pkgs/development/python-modules/zstd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgconfig, fetchPypi, buildPythonPackage +{ lib, stdenv, pkgconfig, fetchPypi, buildPythonPackage , buildPackages , zstd, pytest }: @@ -36,7 +36,7 @@ buildPythonPackage rec { pytest ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Simple python bindings to Yann Collet ZSTD compression library"; homepage = "https://github.com/sergey-dryabzhinsky/python-zstd"; license = licenses.bsd2; diff --git a/pkgs/development/r-modules/bioc-annotation-packages.nix b/pkgs/development/r-modules/bioc-annotation-packages.nix index 773e64ec8027..372f1438ebff 100644 --- a/pkgs/development/r-modules/bioc-annotation-packages.nix +++ b/pkgs/development/r-modules/bioc-annotation-packages.nix @@ -7,7 +7,7 @@ let derive2 = derive { biocVersion = "3.11"; }; in with self; { AHCytoBands = derive2 { name="AHCytoBands"; version="0.99.0"; sha256="0g92nz33rx14zl5can7s701bipdgz7rxqygvvc22c4a0qj52ijnq"; depends=[]; }; - AHEnsDbs = derive2 { name="AHEnsDbs"; version="1.0.14"; sha256="0fb94bxk6ggx09a0icraaxfzncvvgxk223146b17lbxsyl6i02z8"; depends=[AnnotationHubData ensembldb]; }; + AHEnsDbs = derive2 { name="AHEnsDbs"; version="1.0.15"; sha256="0by0y2nyqhihpwzm36lggkc0dqvxz22k6ck1wcmrf7sck8xg54ji"; depends=[AnnotationHubData ensembldb]; }; BSgenome_Alyrata_JGI_v1 = derive2 { name="BSgenome.Alyrata.JGI.v1"; version="1.0.0"; sha256="06549kkzy36n378zb61lrf9zardncp7i20r73rmmiq1pnfjp3gww"; depends=[BSgenome]; }; BSgenome_Amellifera_BeeBase_assembly4 = derive2 { name="BSgenome.Amellifera.BeeBase.assembly4"; version="1.4.0"; sha256="02zs16q441zcbfp7xvv1gny5nn02ivfr8md1wh5s5rpnj6sdl6kj"; depends=[BSgenome]; }; BSgenome_Amellifera_UCSC_apiMel2 = derive2 { name="BSgenome.Amellifera.UCSC.apiMel2"; version="1.4.0"; sha256="1967w7aly7qydykk7rar712kvgsav3zjr4kirybkj17nwiynd74g"; depends=[BSgenome]; }; diff --git a/pkgs/development/r-modules/bioc-experiment-packages.nix b/pkgs/development/r-modules/bioc-experiment-packages.nix index 0fb24f27daaf..a5fca5b2b55f 100644 --- a/pkgs/development/r-modules/bioc-experiment-packages.nix +++ b/pkgs/development/r-modules/bioc-experiment-packages.nix @@ -249,13 +249,13 @@ in with self; { curatedCRCData = derive2 { name="curatedCRCData"; version="2.20.0"; sha256="0bcfa5w6sqabz35npl2vmrj35ymgciiqkcgjhplm0ngimsm9f0wn"; depends=[BiocGenerics nlme]; }; curatedMetagenomicData = derive2 { name="curatedMetagenomicData"; version="1.18.2"; sha256="02m06scv1wxvh858bpxwlvwz4lf0qmvd8246axx65d2ln5fkvrc9"; depends=[AnnotationHub Biobase dplyr ExperimentHub magrittr S4Vectors tidyr]; }; curatedOvarianData = derive2 { name="curatedOvarianData"; version="1.26.0"; sha256="0wvpbagh9v1lyc9rsvymzy38r18g23yajvis1pj0rl7wa0zk2p4x"; depends=[affy BiocGenerics]; }; - curatedTCGAData = derive2 { name="curatedTCGAData"; version="1.10.0"; sha256="0f8ariq3c0xh3w1gcfp8vgmkmlx3ybfry215flq01cc523pgrka7"; depends=[AnnotationHub ExperimentHub HDF5Array MultiAssayExperiment S4Vectors SummarizedExperiment]; }; + curatedTCGAData = derive2 { name="curatedTCGAData"; version="1.10.1"; sha256="05vlj0ivd9dym0078cjd3wswkmqsa7k5ffkl792fw9r5246s9dqc"; depends=[AnnotationHub ExperimentHub HDF5Array MultiAssayExperiment S4Vectors SummarizedExperiment]; }; davidTiling = derive2 { name="davidTiling"; version="1.28.0"; sha256="0cqkz6rlkk2a3fsaa736s731lb3mdvpqzd6ywff2l1wkdza7n3ha"; depends=[Biobase GO_db tilingArray]; }; depmap = derive2 { name="depmap"; version="1.2.0"; sha256="0ymdfkddrl3rbini83528x2ah8lvlvy0ard9m303dkpg5b90axim"; depends=[AnnotationHub dplyr ExperimentHub]; }; derfinderData = derive2 { name="derfinderData"; version="2.6.0"; sha256="1kbdwwdn7ykrdm36bqd8hnj0rw9ikcnxwg0w1xdc5caqmxsg1w8h"; depends=[]; }; diffloopdata = derive2 { name="diffloopdata"; version="1.16.0"; sha256="03rl0ffl9103zi3mk028l79vhlpnlybx0hnl8x9fsxnqkx1rkj32"; depends=[]; }; diggitdata = derive2 { name="diggitdata"; version="1.20.0"; sha256="0wb6g9q5m2cjnxnpz2aralridmsdmd70lp1iwszdl6qc2634c2bc"; depends=[Biobase viper]; }; - dorothea = derive2 { name="dorothea"; version="1.0.0"; sha256="0c8bp0fxqf2kwi196al34a4pc78y6v0lchrjw0jn29cbihs2yjax"; depends=[bcellViper dplyr magrittr]; }; + dorothea = derive2 { name="dorothea"; version="1.0.1"; sha256="189j44hfc12bf3r28hjm2wnigb9k4mmpwp6wnbxyx69nci3jh4zj"; depends=[bcellViper dplyr magrittr]; }; dressCheck = derive2 { name="dressCheck"; version="0.26.0"; sha256="0sa5d4isv3ni6bdq1i2yskycq357272flj2wbravy4zi7xrsk7iw"; depends=[Biobase]; }; dsQTL = derive2 { name="dsQTL"; version="0.26.0"; sha256="1pkwppfkfacf8xxmdflckql8x2n6abvfdvwly1va69288ibxy1xf"; depends=[Biobase GGBase SummarizedExperiment]; }; dyebiasexamples = derive2 { name="dyebiasexamples"; version="1.28.0"; sha256="1l8628150dic4l48r8gqasxpil6552d3h9imysvznkq13j5j48wa"; depends=[GEOquery marray]; }; @@ -357,7 +357,7 @@ in with self; { pwrEWAS_data = derive2 { name="pwrEWAS.data"; version="1.2.0"; sha256="02aq2sqilz11sknbwkdfca7gw95i4x5mf2n477kzn09dhiplq1l9"; depends=[ExperimentHub]; }; qPLEXdata = derive2 { name="qPLEXdata"; version="1.6.0"; sha256="16jzij7cmiagxb0cp2pyna8s424kx3gz55b6v2qsssm9apy77bg3"; depends=[dplyr knitr MSnbase qPLEXanalyzer]; }; rRDPData = derive2 { name="rRDPData"; version="1.8.0"; sha256="09n5289fk5mq1q9skfzmg4rxq66l68k5rv72pz256p7k5xslxx2y"; depends=[rRDP]; }; - rcellminerData = derive2 { name="rcellminerData"; version="2.10.0"; sha256="0v8aj14pwjm60rvnk9nsp02m3vavhn6l49ny0k0rmdrq79bvyymn"; depends=[Biobase]; }; + rcellminerData = derive2 { name="rcellminerData"; version="2.10.2"; sha256="0w8hyfyk1sqlz0kicxazn60rl6zxi36c2g6yrdnxfdm3sfjvws1d"; depends=[Biobase]; }; restfulSEData = derive2 { name="restfulSEData"; version="1.10.0"; sha256="0l4qamp6x2g5k2bix0mlxpv344yqzz3ap80zdw4b2jgdlq9gvfgg"; depends=[ExperimentHub SummarizedExperiment]; }; rheumaticConditionWOLLBOLD = derive2 { name="rheumaticConditionWOLLBOLD"; version="1.26.0"; sha256="1bsv8i3xapkpga04388598slqqjwpkh9nh3vy9q4ibj14wnmcf0w"; depends=[]; }; sampleClassifierData = derive2 { name="sampleClassifierData"; version="1.12.0"; sha256="1v5qi6fh86snfpw4q0lqi0sznfdqv5d95a07bsdqf3g4p6saalxd"; depends=[SummarizedExperiment]; }; @@ -370,14 +370,14 @@ in with self; { sesameData = derive2 { name="sesameData"; version="1.6.0"; sha256="0fyiwd2sfqdyb1msm4clz8lwbxlw4dfl83kkj25xmp5hh2dh915a"; depends=[AnnotationHub curl ExperimentHub]; }; seventyGeneData = derive2 { name="seventyGeneData"; version="1.24.0"; sha256="1rla88mcnpl0w3k0szbhzzkbc786fq67vqyqwv2aq9f4nssjw95k"; depends=[]; }; shinyMethylData = derive2 { name="shinyMethylData"; version="1.8.0"; sha256="19wfry1xx7kvl5mrmn4pv4amlv035nl73ni58qa6s5kwxzklpavn"; depends=[]; }; - signatureSearchData = derive2 { name="signatureSearchData"; version="1.2.1"; sha256="0q5p2g3im5nyngpdfdvk4xm1fp064cgavjrx7pf1q2fkijc3m07a"; depends=[affy Biobase dplyr ExperimentHub limma magrittr R_utils rhdf5 signatureSearch]; }; + signatureSearchData = derive2 { name="signatureSearchData"; version="1.2.2"; sha256="0fm3zy3z1p8f7li14ic2za219pav1sslsxkxd8yprlbi20ab7rx9"; depends=[affy Biobase dplyr ExperimentHub limma magrittr R_utils rhdf5 signatureSearch]; }; simpIntLists = derive2 { name="simpIntLists"; version="1.24.0"; sha256="1sxscydcd43xlyxr4rn3rmjc9hmwvqzrqw40ihmkva0ld8r635n1"; depends=[]; }; spatialLIBD = derive2 { name="spatialLIBD"; version="1.0.0"; sha256="0yx12mcrmb2g6sjnk1ajclnc0z3i2aps2snw85gyanaad5l1igq5"; depends=[AnnotationHub benchmarkme cowplot DT ExperimentHub fields ggplot2 golem IRanges plotly png Polychrome RColorBrewer S4Vectors scater sessioninfo shiny shinyWidgets SingleCellExperiment SummarizedExperiment viridisLite]; }; spqnData = derive2 { name="spqnData"; version="1.0.0"; sha256="19sisn5l3nvz2nr400jgz5clcj0iygk17xhpsjqgswi9p43a3k9z"; depends=[SummarizedExperiment]; }; stemHypoxia = derive2 { name="stemHypoxia"; version="1.24.0"; sha256="03kzrmdlixi31k6jfjhcn4dkm5g16rbd315ws4pqilpdwhgmrlff"; depends=[]; }; stjudem = derive2 { name="stjudem"; version="1.28.0"; sha256="07cbpxzc78asjm41rx5nl4gyzczp7j293ih86ins31r65grwjwm3"; depends=[]; }; synapterdata = derive2 { name="synapterdata"; version="1.26.0"; sha256="0a1k831pw0sl0blr1iy5is0s06sw4kadb30prd0h2l2z8s6ldarm"; depends=[synapter]; }; - systemPipeRdata = derive2 { name="systemPipeRdata"; version="1.16.1"; sha256="1rjh7ki3kczfx2f5vfrmbd6gwjm0f4dpm845x79fxy4k4sfb9zq2"; depends=[BiocGenerics devtools]; }; + systemPipeRdata = derive2 { name="systemPipeRdata"; version="1.16.2"; sha256="0iamb2hp4dlib85jmzr77xm02ykriyzbh1ikqx9gs0hy15bribyv"; depends=[BiocGenerics devtools]; }; tartare = derive2 { name="tartare"; version="1.2.0"; sha256="0v4s0xbxqrv8syihn1ahcrak8gsyklxl3xnzfy4dmqz6bzarpcgd"; depends=[AnnotationHub ExperimentHub]; }; tcgaWGBSData_hg19 = derive2 { name="tcgaWGBSData.hg19"; version="1.6.0"; sha256="06f4xi2lh8idv7h5hmrmlha71k0dxc4s07apc2lj27l2wpm5dp85"; depends=[bsseq ExperimentHub knitr]; }; tinesath1cdf = derive2 { name="tinesath1cdf"; version="1.26.0"; sha256="04f3wy2k884vxyij1yrivxb6jymkh2j7byh0qzmkq2gs9k2lbrka"; depends=[]; }; diff --git a/pkgs/development/r-modules/bioc-packages.nix b/pkgs/development/r-modules/bioc-packages.nix index 3fca87d57fd7..9d33a3cdc076 100644 --- a/pkgs/development/r-modules/bioc-packages.nix +++ b/pkgs/development/r-modules/bioc-packages.nix @@ -13,7 +13,7 @@ in with self; { ACME = derive2 { name="ACME"; version="2.44.0"; sha256="0hsfi1xmdp6kxv4vpacy8awwj2mils7avfqx418s2fwh6ms0l2a9"; depends=[Biobase BiocGenerics]; }; ADAM = derive2 { name="ADAM"; version="1.4.0"; sha256="1r702walyspqad5xr1qf5xjifszlmgqqac4qbvz3qg1zcgc9l17w"; depends=[dplyr DT GO_db KEGGREST knitr pbapply Rcpp stringr SummarizedExperiment]; }; ADAMgui = derive2 { name="ADAMgui"; version="1.4.0"; sha256="05apdy8r16r9j42wd43y67206ysmi2qhyayyc9v1adnxdsx5jiw0"; depends=[ADAM colorRamps data_table dplyr DT ggplot2 ggpubr ggrepel ggsignif GO_db gridExtra knitr RColorBrewer reshape2 shiny shinyjs stringi stringr testthat varhandle]; }; - ADaCGH2 = derive2 { name="ADaCGH2"; version="2.28.0"; sha256="0xwzl1yhcgv6rppzdspyygs8nr1hhnv53xnc3m2wh30di09fpyi9"; depends=[aCGH bit cluster DNAcopy ff ffbase GLAD snapCGH tilingArray waveslim]; }; + ADaCGH2 = derive2 { name="ADaCGH2"; version="2.28.1"; sha256="0k040bgb2j1wjlsi51m0pj5jfsb9qnqf297a5hjv46kga08w77af"; depends=[aCGH bit cluster DNAcopy ff ffbase GLAD snapCGH tilingArray waveslim]; }; AGDEX = derive2 { name="AGDEX"; version="1.36.0"; sha256="1n08v7x7fgqyr79dmc5fkbcl6bgd1gjfx61hpm2ixp2px8b609ic"; depends=[Biobase GSEABase]; }; AIMS = derive2 { name="AIMS"; version="1.20.0"; sha256="024hd1p37ccmfvvd5saa5qa531mb6rp90glzmd1scibz6hg4jg1g"; depends=[Biobase e1071]; }; ALDEx2 = derive2 { name="ALDEx2"; version="1.20.0"; sha256="1cns8gdgcic6whry6b3hjlzhhfnrwjd4n4d1ijr3yaamp010rhph"; depends=[BiocParallel GenomicRanges IRanges multtest S4Vectors SummarizedExperiment zCompositions]; }; @@ -31,7 +31,7 @@ in with self; { ASSIGN = derive2 { name="ASSIGN"; version="1.24.0"; sha256="1qspirfdmqgh2lxba5xgny4qf12mc1wkbxbx7dbdp2r4balbca1h"; depends=[ggplot2 gplots msm Rlab sva yaml]; }; ASpediaFI = derive2 { name="ASpediaFI"; version="1.2.0"; sha256="10k8cj6klbxidhrxp2ms059k5aacbgmgz2psp7dx82agwssxi3si"; depends=[BiocParallel biomaRt dplyr DRaWR e1071 fgsea GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges ggplot2 Gviz igraph IRanges IVAS limma Matrix mGSZ reshape2 ROCR Rsamtools rtracklayer S4Vectors scales SummarizedExperiment]; }; ASpli = derive2 { name="ASpli"; version="1.14.0"; sha256="0lbi8jmkbl8jrf6i6xraqk419k7jlgpym3hj87jvr1ws3jp7yxrl"; depends=[AnnotationDbi BiocGenerics BiocStyle edgeR GenomicAlignments GenomicFeatures GenomicRanges Gviz IRanges Rsamtools S4Vectors]; }; - ATACseqQC = derive2 { name="ATACseqQC"; version="1.12.3"; sha256="12710c4024pndwwqiiqr6dhrd360z26fc8r3fxhs739gyd0ddk9r"; depends=[BiocGenerics Biostrings BSgenome ChIPpeakAnno edgeR GenomeInfoDb GenomicAlignments GenomicRanges GenomicScores IRanges KernSmooth limma motifStack preseqR randomForest Rsamtools rtracklayer S4Vectors]; }; + ATACseqQC = derive2 { name="ATACseqQC"; version="1.12.5"; sha256="1103daz82k97vzmxjmf7jwm2nd3w8i0jwplrsi9996bkih11qwbf"; depends=[BiocGenerics Biostrings BSgenome ChIPpeakAnno edgeR GenomeInfoDb GenomicAlignments GenomicRanges GenomicScores IRanges KernSmooth limma motifStack preseqR randomForest Rsamtools rtracklayer S4Vectors]; }; AUCell = derive2 { name="AUCell"; version="1.10.0"; sha256="0fgqkgjhf92vkljkwn44lm8cjvzq1lvk80nk6xhsp5q6s5isbmns"; depends=[BiocGenerics data_table GSEABase mixtools R_utils S4Vectors shiny SummarizedExperiment]; }; AWFisher = derive2 { name="AWFisher"; version="1.2.0"; sha256="0ay1pv299akm9nbqhsw1s638c0wh15kgn3zc3qrwlivi9pzfa6qy"; depends=[edgeR limma]; }; AffiXcan = derive2 { name="AffiXcan"; version="1.6.0"; sha256="0073z6waxg6bba1p4ks5cqilyywrm5c7cv6ggjpqg3msz4f2y3y8"; depends=[BiocParallel crayon MultiAssayExperiment SummarizedExperiment]; }; @@ -73,7 +73,7 @@ in with self; { BLMA = derive2 { name="BLMA"; version="1.12.0"; sha256="19ndm2cp6xp5mdydqv58klbj8aijkrb6qrfh17v7qcxjjfxhq3l3"; depends=[Biobase graph GSA limma PADOG ROntoTools]; }; BPRMeth = derive2 { name="BPRMeth"; version="1.14.1"; sha256="1sha7gbvckd7li9vc804w1lydp1jg735kz0a5sh5fzi3wzs7rjqk"; depends=[assertthat BiocStyle cowplot data_table doParallel e1071 earth foreach GenomicRanges ggplot2 IRanges kernlab magrittr MASS matrixcalc mvtnorm randomForest Rcpp RcppArmadillo S4Vectors truncnorm]; }; BRAIN = derive2 { name="BRAIN"; version="1.34.0"; sha256="1xk955fq92rrgiccbxps34mc56xl8dy9yyc4ah62lhhxccxwf84c"; depends=[Biostrings lattice PolynomF]; }; - BRGenomics = derive2 { name="BRGenomics"; version="1.0.2"; sha256="03j8mmdd6im6x611c44flha7zxq3l7cdq2g94ccgm2rqxszaz5fs"; depends=[DESeq2 GenomeInfoDb GenomicAlignments GenomicRanges IRanges Rsamtools rtracklayer S4Vectors SummarizedExperiment]; }; + BRGenomics = derive2 { name="BRGenomics"; version="1.0.3"; sha256="1q0kay73f1llhkfcfsh45i9bcbbp2r7br60fsi6rahq1as3xp3p5"; depends=[DESeq2 GenomeInfoDb GenomicAlignments GenomicRanges IRanges Rsamtools rtracklayer S4Vectors SummarizedExperiment]; }; BSgenome = derive2 { name="BSgenome"; version="1.56.0"; sha256="1jw8r1qm9fpg2s1cw2y4np243jjxm65j2xdy2785h8fc1b02msf6"; depends=[BiocGenerics Biostrings GenomeInfoDb GenomicRanges IRanges matrixStats Rsamtools rtracklayer S4Vectors XVector]; }; BUMHMM = derive2 { name="BUMHMM"; version="1.12.0"; sha256="1baisaavlyrg83gqyzh0p0ls0bvq6darjs14ah9vpjdl7w50ngsj"; depends=[Biostrings devtools gtools IRanges stringi SummarizedExperiment]; }; BUS = derive2 { name="BUS"; version="1.44.0"; sha256="0wcdjirgkc5d3xhwfjn8mnwv7aj3cac1sp7zh54k762j13jr794r"; depends=[infotheo minet]; }; @@ -84,7 +84,7 @@ in with self; { BaseSpaceR = derive2 { name="BaseSpaceR"; version="1.32.0"; sha256="0c5hzf56q7nsiz316ldbafn0gg829ww6037i2miy4gprkj6s3f33"; depends=[RCurl RJSONIO]; }; Basic4Cseq = derive2 { name="Basic4Cseq"; version="1.24.0"; sha256="08sqiqxyc1cadwsp30sqbf9hwy45bcscf8cpaj8zp5llrbjlwhyy"; depends=[Biostrings BSgenome_Ecoli_NCBI_20080805 caTools GenomicAlignments GenomicRanges RCircos]; }; BasicSTARRseq = derive2 { name="BasicSTARRseq"; version="1.16.0"; sha256="1f4la089chpypj1lhsazgzb3010swadk4xmaz403k8isj9winc0h"; depends=[GenomeInfoDb GenomicAlignments GenomicRanges IRanges S4Vectors]; }; - BatchQC = derive2 { name="BatchQC"; version="1.16.2"; sha256="0k3ccz3rmrq27c0dn0c4yh1xqyryiwfdy95274mappsy60lhwffp"; depends=[corpcor ggvis gplots heatmaply knitr limma Matrix matrixStats MCMCpack moments pander reshape2 rmarkdown shiny sva]; }; + BatchQC = derive2 { name="BatchQC"; version="1.16.3"; sha256="1cc5a0wy6na5nb9zbbizl727biq4r35s1nk5w2xkan9rsgwicp47"; depends=[corpcor ggvis gplots heatmaply knitr limma Matrix matrixStats MCMCpack moments pander reshape2 rmarkdown shiny sva]; }; BayesKnockdown = derive2 { name="BayesKnockdown"; version="1.14.0"; sha256="0ndn6v8j526dx66j038d09jjlphx1gcdr1jbd8d0ybzqnv51zlxm"; depends=[Biobase]; }; BayesPeak = derive2 { name="BayesPeak"; version="1.39.0"; sha256="1qzfvxp5jsp8zv9gdglmz9mf4xjl2ck4wjz2lngnjrnlxb9v6y4g"; depends=[IRanges]; }; BeadDataPackR = derive2 { name="BeadDataPackR"; version="1.40.0"; sha256="1k05fizqvdj4z4snp170mzj2vnaim2jy49k7wbv31fkin2xbf4bb"; depends=[]; }; @@ -116,7 +116,7 @@ in with self; { BiocSet = derive2 { name="BiocSet"; version="1.2.2"; sha256="041hq3rp0kv7kjwcjjrksk8lw3sj6j1v3wdcr8z611k0g0z6p0cj"; depends=[AnnotationDbi dplyr KEGGREST plyr rlang rtracklayer tibble]; }; BiocSingular = derive2 { name="BiocSingular"; version="1.4.0"; sha256="0368a9xj4cvicqkxmhh12ln46q9gnxla70s1dqrxxfn3b6k525ih"; depends=[beachmat BiocGenerics BiocParallel DelayedArray irlba Matrix Rcpp rsvd S4Vectors]; }; BiocSklearn = derive2 { name="BiocSklearn"; version="1.10.3"; sha256="11vv7b10q2az0l60d572sriyf37xcvm65yaw4i6bwjx7cpy5ch2v"; depends=[basilisk knitr Rcpp reticulate SummarizedExperiment]; }; - BiocStyle = derive2 { name="BiocStyle"; version="2.16.0"; sha256="07rjl2n4sazdg581zh7w3yykzphgr2gpz41ba4ryqs7347vh9nbf"; depends=[BiocManager bookdown knitr rmarkdown yaml]; }; + BiocStyle = derive2 { name="BiocStyle"; version="2.16.1"; sha256="09sz2bnbfbj8wz16k0q8xrvag9fldxqyp5vbg9pvd9skh28hv7c7"; depends=[BiocManager bookdown knitr rmarkdown yaml]; }; BiocVersion = derive2 { name="BiocVersion"; version="3.11.1"; sha256="1rrzx3dqds0jlj1bmjc744wiamb2hssbh3jfxz1s9jp4cvnwrpmz"; depends=[]; }; BiocWorkflowTools = derive2 { name="BiocWorkflowTools"; version="1.14.0"; sha256="0p9r71ql67sdlgd5pv118lhz8b85pr5y4ijfwzcy8wrr8jwlbddy"; depends=[BiocStyle bookdown git2r httr knitr rmarkdown rstudioapi stringr usethis]; }; Biostrings = derive2 { name="Biostrings"; version="2.56.0"; sha256="0imhfz7dg8b3l5qzipjranqqshdsg2x6zc49drlhn8sc7j40cvi8"; depends=[BiocGenerics crayon IRanges S4Vectors XVector]; }; @@ -136,7 +136,7 @@ in with self; { CATALYST = derive2 { name="CATALYST"; version="1.12.2"; sha256="1m6cqv0h75bzw3gd9dq72y4iyk8clp894an5dzws6gr5vcd1vl8j"; depends=[circlize ComplexHeatmap ConsensusClusterPlus cowplot data_table dplyr drc flowCore FlowSOM ggplot2 ggrepel ggridges gridExtra magrittr Matrix matrixStats nnls purrr RColorBrewer reshape2 Rtsne S4Vectors scales scater SingleCellExperiment SummarizedExperiment]; }; CAnD = derive2 { name="CAnD"; version="1.20.0"; sha256="1gh5l8bw6ilc0gq24sqgaghp7q54fx0834mzd837ppshz3bd9vkf"; depends=[ggplot2 reshape]; }; CCPROMISE = derive2 { name="CCPROMISE"; version="1.14.0"; sha256="18zs0nrarzw5xfs3q2zknf81dcjphwmiqlfim5rlnz6icp53prrp"; depends=[Biobase CCP GSEABase PROMISE]; }; - CEMiTool = derive2 { name="CEMiTool"; version="1.12.1"; sha256="1dx0z9z89p741bg6w9ay1bbz9db1nzaama1fz4yilw68yj151i18"; depends=[clusterProfiler data_table dplyr DT fastcluster fgsea ggdendro ggplot2 ggpmisc ggrepel ggthemes gridExtra gtable htmltools igraph intergraph knitr matrixStats network pracma rmarkdown scales sna stringr WGCNA]; }; + CEMiTool = derive2 { name="CEMiTool"; version="1.12.2"; sha256="1wm69dyfkhr1rapvc73lfj4si8ff3snz8hgay6c7y8nwgkykk0pn"; depends=[clusterProfiler data_table dplyr DT fastcluster fgsea ggdendro ggplot2 ggpmisc ggrepel ggthemes gridExtra gtable htmltools igraph intergraph knitr matrixStats network pracma rmarkdown scales sna stringr WGCNA]; }; CFAssay = derive2 { name="CFAssay"; version="1.22.0"; sha256="0kdv5i6cm63yjai2xg25y1mq0728drwnqs8r9vx3k7djxrkx8ad7"; depends=[]; }; CGEN = derive2 { name="CGEN"; version="3.23.0"; sha256="0m40xq2ixdkdhq4fpi8bw0p2y2p1vln40ly0iixjyl33z2zpyrrj"; depends=[mvtnorm survival]; }; CGHbase = derive2 { name="CGHbase"; version="1.48.0"; sha256="0gfqqa9rs5hid53ihlky88qndgrwxxz0s6j7s505f660dd5nzlkf"; depends=[Biobase marray]; }; @@ -178,15 +178,15 @@ in with self; { Cardinal = derive2 { name="Cardinal"; version="2.6.0"; sha256="15l3ra6r45ppj49yapzrk9js92znnsfsvisvrdh8q177dvr9i64z"; depends=[Biobase BiocGenerics BiocParallel dplyr EBImage irlba lattice magrittr Matrix matter mclust nlme ProtGenerics S4Vectors signal sp viridisLite]; }; Category = derive2 { name="Category"; version="2.54.0"; sha256="1grspdzk5a4vidnxwcd1jmy1vcn494aydsp3vydx235yv7iqac1b"; depends=[annotate AnnotationDbi Biobase BiocGenerics DBI genefilter graph GSEABase Matrix RBGL]; }; CausalR = derive2 { name="CausalR"; version="1.20.0"; sha256="189qvw32ih926k1fvhjb8bj0rfdmrijip5j8vsvx7v1mh7xk4kvx"; depends=[igraph]; }; - CeTF = derive2 { name="CeTF"; version="1.0.6"; sha256="1is1vjrbnm15wvzag2jpl26j7mpwwc0qgrm45k7zxnawb7bgk0w4"; depends=[circlize clusterProfiler ComplexHeatmap DESeq2 GenomicTools GenomicTools_fileHandler GGally ggnetwork ggplot2 ggpubr ggrepel igraph Matrix network Rcpp RcppArmadillo RCy3 S4Vectors SummarizedExperiment WebGestaltR]; }; + CeTF = derive2 { name="CeTF"; version="1.0.7"; sha256="13q5fzlvrfmdv75hdl2dk1vjgl503dnxrdjfr9yrf0zch8h5b51f"; depends=[circlize clusterProfiler ComplexHeatmap DESeq2 GenomicTools GenomicTools_fileHandler GGally ggnetwork ggplot2 ggpubr ggrepel igraph Matrix network Rcpp RcppArmadillo RCy3 S4Vectors SummarizedExperiment WebGestaltR]; }; CellBench = derive2 { name="CellBench"; version="1.4.1"; sha256="0b854k76459gplbibc9dl9mmcspnn6cp2b0dipi6k7cm48vcv67x"; depends=[BiocFileCache BiocParallel dplyr glue lubridate magrittr memoise purrr rappdirs rlang SingleCellExperiment tibble tidyr tidyselect]; }; CellMapper = derive2 { name="CellMapper"; version="1.14.0"; sha256="04rv1xr4kdz85s1178jcai1047f3ah67clargmxw3qzb49q999db"; depends=[S4Vectors]; }; - CellMixS = derive2 { name="CellMixS"; version="1.4.1"; sha256="1zhxay1injsciz0sdkay9i444zlyz1v7hxr1sg3jnnlzr6cblk18"; depends=[BiocGenerics BiocNeighbors BiocParallel cowplot dplyr ggplot2 ggridges kSamples magrittr purrr scater SingleCellExperiment SummarizedExperiment tidyr viridis]; }; + CellMixS = derive2 { name="CellMixS"; version="1.4.2"; sha256="0qi5mmhsbi9qw42v9qnphawqw5l5rpjn3gkskbj0450skgz6f712"; depends=[BiocGenerics BiocNeighbors BiocParallel cowplot dplyr ggplot2 ggridges kSamples magrittr purrr scater SingleCellExperiment SummarizedExperiment tidyr viridis]; }; CellNOptR = derive2 { name="CellNOptR"; version="1.34.0"; sha256="16fs4baafwf3mg99386l3kgwzzpf5cqxv1ib3dsv0hldz8n95zkg"; depends=[ggplot2 graph hash igraph RBGL RCurl Rgraphviz stringi stringr XML]; }; CellScore = derive2 { name="CellScore"; version="1.8.0"; sha256="15j8cgpvkvw6hyah6437lqrlqfspzdqs71v162s0sqmfk501b9g3"; depends=[Biobase gplots lsa RColorBrewer squash]; }; CellTrails = derive2 { name="CellTrails"; version="1.6.1"; sha256="1gf5m553vgsh216s7dgg7dawlzkaibqwmmnd5ra31gj720f47ilh"; depends=[Biobase BiocGenerics cba dendextend dtw EnvStats ggplot2 ggrepel igraph maptree mgcv reshape2 Rtsne SingleCellExperiment SummarizedExperiment]; }; CexoR = derive2 { name="CexoR"; version="1.26.0"; sha256="1vlb38msz8hc5xy3w9an3vlv70yxh8ryy0rshn4ghjamcbfiv9qz"; depends=[genomation GenomeInfoDb GenomicRanges idr IRanges RColorBrewer Rsamtools rtracklayer S4Vectors]; }; - ChAMP = derive2 { name="ChAMP"; version="2.18.2"; sha256="08ix46pakcrxyh3y0kg2jr0v5hfn4b51r7zvnnkl5a2q3x30ml73"; depends=[bumphunter ChAMPdata combinat dendextend DMRcate DNAcopy doParallel DT FEM GenomicRanges ggplot2 globaltest goseq Hmisc Illumina450ProbeVariants_db IlluminaHumanMethylation450kmanifest IlluminaHumanMethylationEPICanno_ilm10b4_hg19 IlluminaHumanMethylationEPICmanifest illuminaio impute isva kpmt limma marray matrixStats minfi missMethyl plotly plyr preprocessCore prettydoc quadprog qvalue RColorBrewer rmarkdown RPMM shiny shinythemes sva wateRmelon]; }; + ChAMP = derive2 { name="ChAMP"; version="2.18.3"; sha256="1b5ndi5r404yg1dzr58bflzd3p8l317di1yb5hc48f6yk4fwysif"; depends=[bumphunter ChAMPdata combinat dendextend DMRcate DNAcopy doParallel DT GenomicRanges ggplot2 globaltest goseq Hmisc Illumina450ProbeVariants_db IlluminaHumanMethylation450kmanifest IlluminaHumanMethylationEPICanno_ilm10b4_hg19 IlluminaHumanMethylationEPICmanifest illuminaio impute isva kpmt limma marray matrixStats minfi missMethyl plotly plyr preprocessCore prettydoc quadprog qvalue RColorBrewer rmarkdown RPMM shiny shinythemes sva wateRmelon]; }; ChIC = derive2 { name="ChIC"; version="1.8.0"; sha256="1lc21gjw8g6plgbcv7m13wfd8lczmh1zdllfxah2cxzzvkdswgpv"; depends=[BiocGenerics caret caTools ChIC_data GenomicRanges IRanges progress S4Vectors spp]; }; ChIPComp = derive2 { name="ChIPComp"; version="1.18.0"; sha256="0780kj9vbzdhf2jkfb1my8m58pcdwk6jqw6zfng82g46jias98cp"; depends=[BiocGenerics BSgenome_Hsapiens_UCSC_hg19 BSgenome_Mmusculus_UCSC_mm9 GenomeInfoDb GenomicRanges IRanges limma Rsamtools rtracklayer S4Vectors]; }; ChIPQC = derive2 { name="ChIPQC"; version="1.24.1"; sha256="13znqva6xn2qn9c11kf3ghycb1hck0rzk300bp08zw64mk1nh6v5"; depends=[Biobase BiocGenerics BiocParallel chipseq DiffBind GenomicAlignments GenomicFeatures GenomicRanges ggplot2 gtools IRanges Nozzle_R1 reshape2 Rsamtools S4Vectors TxDb_Celegans_UCSC_ce6_ensGene TxDb_Dmelanogaster_UCSC_dm3_ensGene TxDb_Hsapiens_UCSC_hg18_knownGene TxDb_Hsapiens_UCSC_hg19_knownGene TxDb_Mmusculus_UCSC_mm10_knownGene TxDb_Mmusculus_UCSC_mm9_knownGene TxDb_Rnorvegicus_UCSC_rn4_ensGene]; }; @@ -194,13 +194,13 @@ in with self; { ChIPXpress = derive2 { name="ChIPXpress"; version="1.32.0"; sha256="0xb8p0ap0kmj53skp7bm151lmf6cdwlyv18jaji7lcsrvnni3ilm"; depends=[affy biganalytics bigmemory Biobase ChIPXpressData frma GEOquery]; }; ChIPanalyser = derive2 { name="ChIPanalyser"; version="1.10.0"; sha256="0wxq7w95gxvb9wjm2amh37hvnbsy1cikyzdh8aa7a21nr71jp8km"; depends=[BiocManager Biostrings BSgenome GenomeInfoDb GenomicRanges IRanges RcppRoll ROCR rtracklayer S4Vectors]; }; ChIPexoQual = derive2 { name="ChIPexoQual"; version="1.12.0"; sha256="02rsf1rvm0p6dn18zq2a4hpvpd9m2i5rziyi4zm8j43qvs8xhafp"; depends=[BiocParallel biovizBase broom data_table dplyr GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 hexbin IRanges RColorBrewer rmarkdown Rsamtools S4Vectors scales viridis]; }; - ChIPpeakAnno = derive2 { name="ChIPpeakAnno"; version="3.22.2"; sha256="199mlg0gwjy39afyk0ah6lzcm759bzxla4hgcajj0ay9jiibjqpa"; depends=[AnnotationDbi Biobase BiocGenerics BiocManager biomaRt Biostrings BSgenome DBI DelayedArray ensembldb GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges GO_db graph idr IRanges limma matrixStats multtest RBGL regioneR Rsamtools rtracklayer S4Vectors seqinr SummarizedExperiment VennDiagram]; }; + ChIPpeakAnno = derive2 { name="ChIPpeakAnno"; version="3.22.4"; sha256="0wxgjdikinkqj7jvs2725ak0291q6zhikyf1c93w8cngwvd9i1gq"; depends=[AnnotationDbi Biobase BiocGenerics BiocManager biomaRt Biostrings BSgenome DBI DelayedArray ensembldb GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges GO_db graph idr IRanges limma matrixStats multtest RBGL regioneR Rsamtools rtracklayer S4Vectors seqinr SummarizedExperiment VennDiagram]; }; ChIPseeker = derive2 { name="ChIPseeker"; version="1.24.0"; sha256="04lvw4bglab7vrhz5frn8vvp311dhr19ff2r97l1qharh22bnyq2"; depends=[AnnotationDbi BiocGenerics boot dplyr enrichplot GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 gplots gtools IRanges magrittr plotrix RColorBrewer rtracklayer S4Vectors TxDb_Hsapiens_UCSC_hg19_knownGene]; }; ChIPseqR = derive2 { name="ChIPseqR"; version="1.42.0"; sha256="1r60ia052wlkmvjlfwagfnnx4kzgmh91b8na3g7wn05fl708nyzl"; depends=[BiocGenerics Biostrings fBasics GenomicRanges HilbertVis IRanges S4Vectors ShortRead timsac]; }; ChIPsim = derive2 { name="ChIPsim"; version="1.42.0"; sha256="12v77hzh9d5iz4byn80qlsssj5vgyhhmd0xfbcczjw1hv81iizxq"; depends=[Biostrings IRanges ShortRead XVector]; }; ChemmineOB = derive2 { name="ChemmineOB"; version="1.26.0"; sha256="1507fqhdw3zm5yi8zg8wbvf2nymyvg72qwsj2m11q42xsy6czns2"; depends=[BH BiocGenerics Rcpp zlibbioc]; }; ChemmineR = derive2 { name="ChemmineR"; version="3.40.0"; sha256="0cna5xsqflvhlp2k47asxyv3w4ympmz2wy2cwjyzlal6936fjikf"; depends=[base64enc BH BiocGenerics DBI digest DT ggplot2 gridExtra png Rcpp RCurl rjson rsvg]; }; - Chicago = derive2 { name="Chicago"; version="1.16.0"; sha256="1x8rv9132yasb0nda80b0cig0ylbbzbwhjxyf8wmvk6fxpar1wbr"; depends=[data_table Delaporte Hmisc MASS matrixStats]; }; + Chicago = derive2 { name="Chicago"; version="1.16.1"; sha256="1jkkkh5nxmrbyzki111hyvv1yabwj3my4d7vqyzhqvq3iny3anys"; depends=[data_table Delaporte Hmisc MASS matrixStats]; }; ChromHeatMap = derive2 { name="ChromHeatMap"; version="1.42.0"; sha256="0zwqpsnl2zwibv0l4dqp28w3c2f53l73hz1vh0mcrg43lr7p2cx8"; depends=[annotate AnnotationDbi Biobase BiocGenerics GenomicRanges IRanges rtracklayer]; }; CiteFuse = derive2 { name="CiteFuse"; version="1.0.0"; sha256="1arf69yk6zkijq0pinh8w3vgxp4qdg5bsc8f3s7417r95p998141"; depends=[cowplot dbscan ggplot2 ggraph ggridges gridExtra igraph Matrix mixtools pheatmap propr randomForest reshape2 rhdf5 rlang Rtsne S4Vectors scales scran SingleCellExperiment SNFtool SummarizedExperiment uwot]; }; ClassifyR = derive2 { name="ClassifyR"; version="2.8.0"; sha256="1gdxj4gccbl8w82piyvkkg5dgwdjyqnbyy4rjxrxw8ngri0rrd6q"; depends=[BiocParallel locfit MultiAssayExperiment plyr S4Vectors]; }; @@ -227,8 +227,8 @@ in with self; { CrossICC = derive2 { name="CrossICC"; version="1.2.0"; sha256="1ilfgmrpr85i0x6grhjlrb3gq74hnjlvsmz0af41ajvnz9mbh6s0"; depends=[Biobase cluster ConsensusClusterPlus data_table dplyr limma MASS MergeMaid]; }; CytoDx = derive2 { name="CytoDx"; version="1.8.0"; sha256="052k8p47kdqvidw28qzp6x1g599crlx15wakz17ja6067drs5axx"; depends=[doParallel dplyr flowCore glmnet rpart rpart_plot]; }; CytoML = derive2 { name="CytoML"; version="2.0.5"; sha256="174brv027mm90lydfg6hnhazwh8jy4vf6ial4hpsfalwa5jrz55n"; depends=[base64enc BH Biobase corpcor cytolib data_table dplyr flowCore flowWorkspace ggcyto graph jsonlite lattice openCyto plyr RBGL Rcpp RcppArmadillo RcppParallel Rgraphviz Rhdf5lib RProtoBufLib RUnit tibble XML xml2 yaml]; }; - DAMEfinder = derive2 { name="DAMEfinder"; version="1.0.2"; sha256="18ydik1xapv8zan7qcrfx0c68n4ddh60ik9d1zq456nsmgysy71l"; depends=[BiocGenerics Biostrings bumphunter cowplot GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 IRanges limma plyr readr reshape2 Rsamtools S4Vectors stringr SummarizedExperiment VariantAnnotation]; }; - DAPAR = derive2 { name="DAPAR"; version="1.20.2"; sha256="1c1vs8pxvgnvgf2i6pln4bp5jw3p9zjkjcq2220q1ld65cwfgdp0"; depends=[AnnotationDbi Cairo clusterProfiler cp4p DAPARdata doParallel dplyr factoextra FactoMineR foreach ggplot2 gplots graph highcharter igraph imp4p impute knitr lattice limma lme4 Matrix MSnbase norm openxlsx pcaMethods png preprocessCore RColorBrewer readxl reshape2 scales siggenes stringr tidyr tidyverse tmvtnorm vioplot visNetwork vsn]; }; + DAMEfinder = derive2 { name="DAMEfinder"; version="1.0.3"; sha256="0wdcycgsd9zcjnagp3spbzy8dn20q3a1a21dw5f0rl3yllpk12s9"; depends=[BiocGenerics Biostrings bumphunter cowplot GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 IRanges limma plyr readr reshape2 Rsamtools S4Vectors stringr SummarizedExperiment VariantAnnotation]; }; + DAPAR = derive2 { name="DAPAR"; version="1.20.3"; sha256="1ndi82gk3mshccr9iyhlk6y9zxazgg5qvcby90w8kkhhiq34vi7v"; depends=[AnnotationDbi Cairo clusterProfiler cp4p DAPARdata doParallel dplyr factoextra FactoMineR foreach ggplot2 gplots graph highcharter igraph imp4p impute knitr lattice limma lme4 Matrix MSnbase norm openxlsx pcaMethods png preprocessCore RColorBrewer readxl reshape2 scales siggenes stringr tidyr tidyverse tmvtnorm vioplot visNetwork vsn]; }; DART = derive2 { name="DART"; version="1.36.0"; sha256="1gjhhxyypaza598f51cvyn5564m5dgli6v3cl6rqmh9qzil482hv"; depends=[igraph]; }; DBChIP = derive2 { name="DBChIP"; version="1.32.0"; sha256="16zzgbfnnvjissnzg8lqsy60kpivjwyfzh1zp7b4bhzmfw8awwqy"; depends=[DESeq edgeR]; }; DChIPRep = derive2 { name="DChIPRep"; version="1.18.0"; sha256="0xpafzd8xdcqjnn4i8iv819240rnvi4wbwwlzn8kb76cdqn6299x"; depends=[assertthat ChIPpeakAnno DESeq2 fdrtool GenomicRanges ggplot2 plyr purrr reshape2 S4Vectors smoothmest soGGi SummarizedExperiment tidyr]; }; @@ -253,7 +253,7 @@ in with self; { DMCHMM = derive2 { name="DMCHMM"; version="1.10.0"; sha256="1zyjpimvgsimz1xb4i9mc79yl9cj5ivqzc1rlvdpmisb1zls89q9"; depends=[BiocParallel calibrate fdrtool GenomicRanges IRanges multcomp rtracklayer S4Vectors SummarizedExperiment]; }; DMRScan = derive2 { name="DMRScan"; version="1.10.0"; sha256="09rdmd0x5rhysxvipdnvfhp7y5l9n3r8b5xqn8dz96pfdddli8nm"; depends=[GenomeInfoDb GenomicRanges IRanges MASS Matrix mvtnorm RcppRoll]; }; DMRcaller = derive2 { name="DMRcaller"; version="1.20.0"; sha256="0an24sa3d760d6pp2z5dclammmqys0snbx41rlcgb0yhljv5bja5"; depends=[betareg GenomicRanges IRanges Rcpp RcppRoll S4Vectors]; }; - DMRcate = derive2 { name="DMRcate"; version="2.2.2"; sha256="1991mwka0ajazwxszlnbbmr928i1q5fdl6hr7x0z4a5faymn3m3n"; depends=[bsseq DSS edgeR ExperimentHub GenomeInfoDb GenomicRanges Gviz IRanges limma minfi missMethyl plyr S4Vectors SummarizedExperiment]; }; + DMRcate = derive2 { name="DMRcate"; version="2.2.3"; sha256="1ly90isdzbpqhy3y0gjkhg5qkgdqj0w1n6kvjyl4xi8s70v1nps5"; depends=[bsseq DSS edgeR ExperimentHub GenomeInfoDb GenomicRanges Gviz IRanges limma minfi missMethyl plyr S4Vectors SummarizedExperiment]; }; DMRforPairs = derive2 { name="DMRforPairs"; version="1.24.0"; sha256="0fxsf7m0ks9ycx7nnyi4v7qr5lcgab8ayfvl1bk763wy77nipaiq"; depends=[GenomicRanges Gviz R2HTML]; }; DNABarcodeCompatibility = derive2 { name="DNABarcodeCompatibility"; version="1.4.0"; sha256="0l9q3c12lramf4pdbv58hcmyv3d8j082l17aqjpyjvabla4zk8yc"; depends=[DNABarcodes dplyr numbers purrr stringr tidyr]; }; DNABarcodes = derive2 { name="DNABarcodes"; version="1.18.0"; sha256="03y39hjpkb05fnawy3k797bph1iydi1blmpgyy4244zjgk6rs5x7"; depends=[BH Matrix Rcpp]; }; @@ -272,13 +272,13 @@ in with self; { DelayedDataFrame = derive2 { name="DelayedDataFrame"; version="1.4.0"; sha256="1wipxplcgzhglrgjnwb7f3n2acrf40qv8nb02im233ixyb7r4l3c"; depends=[BiocGenerics DelayedArray S4Vectors]; }; DelayedMatrixStats = derive2 { name="DelayedMatrixStats"; version="1.10.1"; sha256="046sam0rz42ph0m7jz7v3bck7d3h2mp45gzywh5dvc1qkjq6fdxx"; depends=[BiocParallel DelayedArray HDF5Array IRanges Matrix matrixStats S4Vectors]; }; DepecheR = derive2 { name="DepecheR"; version="1.4.1"; sha256="0dscfl6wxpl5538jzkrwisdwbr873d38rzd19vl6z5br71jvpv3v"; depends=[beanplot doSNOW dplyr FNN foreach ggplot2 gplots MASS matrixStats mixOmics moments Rcpp RcppEigen reshape2 robustbase viridis]; }; - DiffBind = derive2 { name="DiffBind"; version="2.16.0"; sha256="1mwqgljya1c7r2dfrdds3nswn9bn1l3ak1wavbpv4lbv3nkmykn5"; depends=[amap BiocParallel DESeq2 dplyr edgeR GenomicAlignments GenomicRanges ggplot2 ggrepel gplots IRanges lattice limma locfit RColorBrewer Rcpp Rhtslib Rsamtools S4Vectors SummarizedExperiment systemPipeR]; }; + DiffBind = derive2 { name="DiffBind"; version="2.16.2"; sha256="11y9kigdikqcd0cnksh306nsaadak0kgivk7773mv3yszrxxwzj1"; depends=[amap BiocParallel DESeq2 dplyr edgeR GenomicAlignments GenomicRanges ggplot2 ggrepel gplots IRanges lattice limma locfit RColorBrewer Rcpp Rhtslib Rsamtools S4Vectors SummarizedExperiment systemPipeR]; }; DiffLogo = derive2 { name="DiffLogo"; version="2.12.2"; sha256="0wl8q1vm4b9f0hfypn4q1xc3jiqgjl1h7kiigkfj2kxih96qw3jw"; depends=[cba]; }; Director = derive2 { name="Director"; version="1.14.0"; sha256="144jkdnxfkvp2pxh1fq6xr9qilsxv3g8b6y294l45hxm8zag8r9v"; depends=[htmltools]; }; DirichletMultinomial = derive2 { name="DirichletMultinomial"; version="1.30.0"; sha256="1m9dsrddrllb2i88qzik1867iv9mggrgdkn0dlp8sq7gl69vmalb"; depends=[BiocGenerics IRanges S4Vectors]; }; - DiscoRhythm = derive2 { name="DiscoRhythm"; version="1.4.1"; sha256="004wv9b16fzz4w8smzda1fzs3mwis1wf54zyw4qvfkdsc4mcq5wn"; depends=[BiocGenerics BiocStyle broom data_table dplyr DT ggExtra ggplot2 gridExtra heatmaply kableExtra knitr magick matrixStats matrixTests MetaCycle plotly reshape2 rmarkdown S4Vectors shiny shinyBS shinycssloaders shinydashboard shinyjs SummarizedExperiment UpSetR VennDiagram viridis zip]; }; + DiscoRhythm = derive2 { name="DiscoRhythm"; version="1.4.2"; sha256="0vrra6mrd0awjnhvb1vha0g35nn7wa5bdxq5g8qaiq5bq850p886"; depends=[BiocGenerics BiocStyle broom data_table dplyr DT ggExtra ggplot2 gridExtra heatmaply kableExtra knitr magick matrixStats matrixTests MetaCycle plotly reshape2 rmarkdown S4Vectors shiny shinyBS shinycssloaders shinydashboard shinyjs SummarizedExperiment UpSetR VennDiagram viridis zip]; }; DominoEffect = derive2 { name="DominoEffect"; version="1.8.0"; sha256="0m9l1zdghsv3haqk03ab9768vqbsiz0dibp9xlhl998mjlaixmbz"; depends=[AnnotationDbi biomaRt Biostrings data_table GenomeInfoDb GenomicRanges IRanges SummarizedExperiment VariantAnnotation]; }; - Doscheda = derive2 { name="Doscheda"; version="1.10.0"; sha256="199lrd1d2sn7w86mnmg9lqfywjfqcplp8dwrzrwqcda8z8hrqq37"; depends=[affy calibrate corrgram drc DT ggplot2 gridExtra httr jsonlite limma matrixStats prodlim readxl reshape2 shiny shinydashboard stringr vsn]; }; + Doscheda = derive2 { name="Doscheda"; version="1.10.4"; sha256="1zgy89gpylzxikrddbsv39ilx0q6pkjjyrbz5jnmlp7jp0l50zf0"; depends=[affy calibrate corrgram drc DT ggplot2 gridExtra httr jsonlite limma matrixStats prodlim readxl reshape2 shiny shinydashboard stringr vsn]; }; DriverNet = derive2 { name="DriverNet"; version="1.28.0"; sha256="02sw2dpa0hkmq7pn8x22mp6zvy1q9ck26rx3bpnlkzwa4ij95rc6"; depends=[]; }; DropletUtils = derive2 { name="DropletUtils"; version="1.8.0"; sha256="0zqwx0a9frsw3pmm47pwpd6rxaps0cy1hqv1iw0qv14zdhi379y2"; depends=[beachmat BH BiocParallel dqrng edgeR HDF5Array Matrix R_utils Rcpp rhdf5 Rhdf5lib S4Vectors SingleCellExperiment]; }; DrugVsDisease = derive2 { name="DrugVsDisease"; version="2.30.0"; sha256="1mv7g47qjzf7id00jlxcd8s5irps13nqi5m1n1g5q3jp3rgxk6db"; depends=[affy annotate ArrayExpress BiocGenerics biomaRt cMap2data DrugVsDiseasedata GEOquery hgu133a_db hgu133a2_db hgu133plus2_db limma qvalue RUnit xtable]; }; @@ -304,10 +304,10 @@ in with self; { ERSSA = derive2 { name="ERSSA"; version="1.6.0"; sha256="06d2yjcpzk40hr6n87ivfcaxjr9bwj97i0ns7cnlkzyzf3ymck9v"; depends=[BiocParallel DESeq2 edgeR ggplot2 plyr RColorBrewer]; }; EasyqpcR = derive2 { name="EasyqpcR"; version="1.30.0"; sha256="0pf9k6hgbwhlhi75bgs640cp5jri2vc21pml0s89phs048cpkqqb"; depends=[matrixStats plotrix plyr]; }; EmpiricalBrownsMethod = derive2 { name="EmpiricalBrownsMethod"; version="1.16.0"; sha256="1brvls8z49x632yny835s90smxbac8bgnykcmn96sgs2lm6g7qbj"; depends=[]; }; - EnMCB = derive2 { name="EnMCB"; version="1.0.8"; sha256="00dsc431x0h0h5wh4nnxpqjl2yjr7mjwy5xycwi0zgjq2cxavi4l"; depends=[doParallel foreach ggplot2 glmnet IlluminaHumanMethylation450kanno_ilmn12_hg19 minfi rms survival survivalROC survivalsvm]; }; + EnMCB = derive2 { name="EnMCB"; version="1.0.11"; sha256="17c1bwdb92d17v547pw9flrkryr5bi9kbh9cwka0zbzfb32pbc16"; depends=[doParallel foreach ggplot2 glmnet IlluminaHumanMethylation450kanno_ilmn12_hg19 minfi survival survivalROC survivalsvm]; }; EnhancedVolcano = derive2 { name="EnhancedVolcano"; version="1.6.0"; sha256="0xmsk3c2sz3c5rimaza5vj3ps2fdyl9dxxyvkws9frcz9d39mwb3"; depends=[ggplot2 ggrepel]; }; EnrichedHeatmap = derive2 { name="EnrichedHeatmap"; version="1.18.2"; sha256="1alz7awnmv0ml1vabqis2av9g4rr50bnjfmcwvixzaq23g6m969l"; depends=[circlize ComplexHeatmap GenomicRanges GetoptLong IRanges locfit matrixStats Rcpp]; }; - EnrichmentBrowser = derive2 { name="EnrichmentBrowser"; version="2.18.0"; sha256="1gs27n6cwwz8a0w2alnrc3m9walbady3km4pa9d3nrlhm003glhm"; depends=[AnnotationDbi BiocFileCache biocGraph BiocManager ComplexHeatmap edgeR geneplotter GO_db graph graphite GSEABase hwriter KEGGgraph KEGGREST limma pathview rappdirs Rgraphviz S4Vectors safe SPIA SummarizedExperiment topGO]; }; + EnrichmentBrowser = derive2 { name="EnrichmentBrowser"; version="2.18.2"; sha256="0frknd19zgb8iw4wvdybhwrlbzwkki02bj9qx9sqwvfk0gvc54rk"; depends=[AnnotationDbi BiocFileCache biocGraph BiocManager ComplexHeatmap edgeR geneplotter GO_db graph graphite GSEABase hwriter KEGGgraph KEGGREST limma pathview rappdirs Rgraphviz S4Vectors safe SPIA SummarizedExperiment topGO]; }; EpiDISH = derive2 { name="EpiDISH"; version="2.4.0"; sha256="0igymdkwcla1vlbkmnvdd6js0mizygsa082fwp61wbw49b872g40"; depends=[e1071 locfdr MASS matrixStats quadprog stringr]; }; EpiTxDb = derive2 { name="EpiTxDb"; version="1.0.0"; sha256="02a5zwmbkymx2xzfjgzq5ix364820pi1q6y72cayqn9pv4qgaxll"; depends=[AnnotationDbi BiocFileCache BiocGenerics Biostrings curl DBI GenomeInfoDb GenomicFeatures GenomicRanges httr IRanges Modstrings RSQLite S4Vectors tRNAdbImport xml2]; }; EventPointer = derive2 { name="EventPointer"; version="2.6.0"; sha256="1dbb3zjzn2d7ccd0dnhw6md284vfblh443mm7nzj8jr90520zbwf"; depends=[affxparser Biostrings BSgenome BSgenome_Hsapiens_UCSC_hg38 cobs doParallel foreach GenomeInfoDb GenomicFeatures GenomicRanges graph igraph IRanges limma MASS Matrix matrixStats nnls prodlim qvalue RBGL rhdf5 S4Vectors SGSeq stringr SummarizedExperiment]; }; @@ -323,7 +323,7 @@ in with self; { FEM = derive2 { name="FEM"; version="3.15.0"; sha256="1d0p5jibzmfs2kmxlr30yr2ws1b3jyhpsbng1iszd6q904k302xd"; depends=[AnnotationDbi BiocGenerics corrplot graph igraph impute limma marray Matrix org_Hs_eg_db]; }; FGNet = derive2 { name="FGNet"; version="3.22.1"; sha256="02jlkhi81d0z8f384acl4c1xzzv0hlgzkb9y3gmydx7pai3a6rrb"; depends=[hwriter igraph plotrix png R_utils RColorBrewer reshape2 XML]; }; FISHalyseR = derive2 { name="FISHalyseR"; version="1.22.0"; sha256="1hhfi6rznqjzf4iq606qx9phql7kdv35m1dl71dpvczvsyajxlsn"; depends=[abind EBImage]; }; - FRASER = derive2 { name="FRASER"; version="1.0.1"; sha256="15i3pwr58d352qkyirppzbq3yzw790fn7r9nwlrqrnqicl3hvyil"; depends=[AnnotationDbi BBmisc Biobase BiocGenerics BiocParallel biomaRt BSgenome cowplot data_table DelayedArray DelayedMatrixStats extraDistr GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges ggplot2 HDF5Array IRanges matrixStats pcaMethods pheatmap plotly PRROC R_utils RColorBrewer Rcpp RcppArmadillo rhdf5 Rsamtools Rsubread S4Vectors SummarizedExperiment tibble VGAM]; }; + FRASER = derive2 { name="FRASER"; version="1.0.2"; sha256="1x64kv8lrxspai1yafxcj8gnzjcb1b33mynnnfw0sh91ffj2222v"; depends=[AnnotationDbi BBmisc Biobase BiocGenerics BiocParallel biomaRt BSgenome cowplot data_table DelayedArray DelayedMatrixStats extraDistr GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges ggplot2 ggrepel HDF5Array IRanges matrixStats pcaMethods pheatmap plotly PRROC R_utils RColorBrewer Rcpp RcppArmadillo rhdf5 Rsamtools Rsubread S4Vectors SummarizedExperiment tibble VGAM]; }; FRGEpistasis = derive2 { name="FRGEpistasis"; version="1.24.0"; sha256="0wxxhhfy8y8nnz037wxxj69hsyf1hznklhd955r2ifzjnhm0kv79"; depends=[fda MASS]; }; FamAgg = derive2 { name="FamAgg"; version="1.16.0"; sha256="1igmbcca10fanlnyjkhhnsbpcadq3914yggp5b7r857inqrv76jp"; depends=[BiocGenerics gap igraph kinship2 Matrix survey]; }; FastqCleaner = derive2 { name="FastqCleaner"; version="1.6.0"; sha256="1b4il9hvpif6galzgzhcp4j6y1kh62y7hc3wislv7zp33lq80888"; depends=[Biostrings DT htmltools IRanges Rcpp S4Vectors shiny shinyBS ShortRead]; }; @@ -360,7 +360,7 @@ in with self; { GMRP = derive2 { name="GMRP"; version="1.16.0"; sha256="0l38yqjyl6za6wkx435cygcwj1mhqw57l7bgcnp7s0606a82vql1"; depends=[diagram GenomicRanges plotrix]; }; GNET2 = derive2 { name="GNET2"; version="1.4.0"; sha256="0853nrd4zwgidmn73az1352y5jcxl65siijnx1v0gac8wj1vgkn1"; depends=[DiagrammeR dplyr ggplot2 igraph matrixStats Rcpp reshape2 SummarizedExperiment xgboost]; }; GOFunction = derive2 { name="GOFunction"; version="1.35.0"; sha256="172abls5qlcg7kq0bax9z0xj75f7wmj3725h6s7hl0dwjjiypair"; depends=[AnnotationDbi Biobase DBI GO_db graph Rgraphviz SparseM]; }; - GOSemSim = derive2 { name="GOSemSim"; version="2.14.1"; sha256="0v4q9xr1cm5xr08pgbzrss41kh3yz7xyh31n55l0sjmr1629ykln"; depends=[AnnotationDbi GO_db Rcpp]; }; + GOSemSim = derive2 { name="GOSemSim"; version="2.14.2"; sha256="02r7m1x6g8bb7q8l0hpvakdzdv5v1nplhx5lbiy798a7c3xg895b"; depends=[AnnotationDbi GO_db Rcpp]; }; GOSim = derive2 { name="GOSim"; version="1.26.0"; sha256="1q8q48vggqsi1wnv2c188rhcvn8njzzmgi479z99854l3557va32"; depends=[annotate AnnotationDbi cluster corpcor flexmix GO_db graph Matrix org_Hs_eg_db RBGL Rcpp topGO]; }; GOTHiC = derive2 { name="GOTHiC"; version="1.24.0"; sha256="077wrwf7y10nwvkc3pv1kw38bm14zivr0h5df7b1382sisbqv69n"; depends=[BiocGenerics BiocManager Biostrings BSgenome data_table GenomeInfoDb GenomicRanges ggplot2 IRanges Rsamtools rtracklayer S4Vectors ShortRead]; }; GOexpress = derive2 { name="GOexpress"; version="1.22.0"; sha256="1zkqly6xsyna7151yfdws089i0imzh8ck0q003ds8bvm764prds0"; depends=[Biobase biomaRt ggplot2 gplots randomForest RColorBrewer RCurl stringr]; }; @@ -380,7 +380,7 @@ in with self; { GSEAlm = derive2 { name="GSEAlm"; version="1.48.0"; sha256="1jgh806jysws49czkcrbz7b69hkyrwwrsjarzf6nd234097rxbbc"; depends=[Biobase]; }; GSRI = derive2 { name="GSRI"; version="2.36.0"; sha256="1w53fn9aihj1l2shv2dydvnc9kjxmxmj4lw2vp1ds0fs833bvh7y"; depends=[Biobase fdrtool genefilter GSEABase les]; }; GSReg = derive2 { name="GSReg"; version="1.22.0"; sha256="1zpsqaqxhqhgf2jr7hq918f6bdjlvb2vsyp46bxkspkbprpljx6b"; depends=[AnnotationDbi GenomicFeatures Homo_sapiens org_Hs_eg_db]; }; - GSVA = derive2 { name="GSVA"; version="1.36.2"; sha256="0sv3hhky9npykf3pjvmrzkxjjv3phg2z562v3mv3n50bj5r21sis"; depends=[Biobase BiocGenerics BiocParallel fastmatch GSEABase S4Vectors shiny shinythemes SummarizedExperiment]; }; + GSVA = derive2 { name="GSVA"; version="1.36.3"; sha256="1arbzjr88yibbg8f9zmb6s5lvambbp72bc1rg0dmm6a032y9crjq"; depends=[Biobase BiocGenerics BiocParallel fastmatch GSEABase S4Vectors shiny shinythemes SummarizedExperiment]; }; GUIDEseq = derive2 { name="GUIDEseq"; version="1.18.0"; sha256="0synw91pis14ysi0bwndgzf8pa2cq2ls9l7l4v47163yi7ddcfi1"; depends=[BiocGenerics BiocParallel Biostrings BSgenome ChIPpeakAnno CRISPRseek data_table dplyr GenomeInfoDb GenomicAlignments GenomicRanges hash IRanges limma matrixStats Rsamtools S4Vectors]; }; GWASTools = derive2 { name="GWASTools"; version="1.34.0"; sha256="18jxfgv5l1cg0024pzf5ns7l2s4dpfai6xz2lzbi0afjms9x0awp"; depends=[Biobase DBI DNAcopy dplyr gdsfmt GWASExactHW lmtest logistf quantsmooth RSQLite sandwich survival]; }; GateFinder = derive2 { name="GateFinder"; version="1.8.0"; sha256="076165xapgmds3syrq4j1r7w8lwlqxchdmrn9clqasd3pp97dp1x"; depends=[diptest flowCore flowFP mvoutlier splancs]; }; @@ -451,11 +451,11 @@ in with self; { HybridMTest = derive2 { name="HybridMTest"; version="1.32.0"; sha256="1knqyqb3q1l21h4n5572j773hm23rim8i7wbazldbg39dwxkmcwx"; depends=[Biobase fdrtool MASS survival]; }; IHW = derive2 { name="IHW"; version="1.16.0"; sha256="169ir0k1gygdh1wybwa0drdxnhrdrlyzzy0rkygi7jsirn69m74j"; depends=[BiocGenerics fdrtool lpsymphony slam]; }; IMAS = derive2 { name="IMAS"; version="1.12.0"; sha256="1vq0i0568c6gqn4vqsaqrj038dm4qrnh32kmqmn3c0blwal8abia"; depends=[AnnotationDbi BiocGenerics BiocParallel doParallel foreach GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges ggfortify ggplot2 gridExtra IRanges IVAS lattice lme4 Matrix Rsamtools S4Vectors survival]; }; - IMMAN = derive2 { name="IMMAN"; version="1.7.0"; sha256="009hnr27jcj9pwz5s1vbjrvrxhp0pvdfg5w575vgx180yrp9gfhy"; depends=[Biostrings igraph seqinr STRINGdb]; }; + IMMAN = derive2 { name="IMMAN"; version="1.8.2"; sha256="06f3yfyzxxz6nk7i3irpxnsbd2dqaixyj1i26bfha4mn2wrfd882"; depends=[Biostrings igraph seqinr STRINGdb]; }; IMPCdata = derive2 { name="IMPCdata"; version="1.24.0"; sha256="0jnj6mrwfjyfp4vgiyn5h2l9nry2gcqyjhp5bfsb086xvj98qvr4"; depends=[rjson]; }; INDEED = derive2 { name="INDEED"; version="2.2.0"; sha256="10nlkkcqan6ihn9g2fxw306bcvgqvsfdcv2ar4pvs6jy939m6g1y"; depends=[devtools glasso igraph visNetwork]; }; INPower = derive2 { name="INPower"; version="1.24.0"; sha256="1cfny1pyx29gdfcgp9xv87ra9n9kgl73qiv8kc71l5zdvvwja4l4"; depends=[mvtnorm]; }; - INSPEcT = derive2 { name="INSPEcT"; version="1.18.0"; sha256="1yyglkdc3ww2jzswhcxk9g1imydfm39krl87as5l9fbm7mv3vd4z"; depends=[Biobase BiocGenerics BiocParallel DESeq2 deSolve gdata GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges IRanges KernSmooth plgem pROC rootSolve Rsamtools rtracklayer S4Vectors shiny SummarizedExperiment TxDb_Mmusculus_UCSC_mm9_knownGene]; }; + INSPEcT = derive2 { name="INSPEcT"; version="1.18.1"; sha256="16bdrfn4sx83nl81m7qvdxbx8l80y9da983497s6c45cad0jws6y"; depends=[Biobase BiocGenerics BiocParallel DESeq2 deSolve gdata GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges IRanges KernSmooth plgem pROC rootSolve Rsamtools rtracklayer S4Vectors shiny SummarizedExperiment TxDb_Mmusculus_UCSC_mm9_knownGene]; }; IONiseR = derive2 { name="IONiseR"; version="2.12.0"; sha256="05fndlblczabva60gn6h0dijqxyn0wknrv8a925fgc4bn415g31w"; depends=[BiocGenerics BiocParallel Biostrings bit64 dplyr ggplot2 magrittr rhdf5 ShortRead stringr tibble tidyr XVector]; }; IPO = derive2 { name="IPO"; version="1.14.0"; sha256="07agz8ambs974dfssvbralmk4id4dvrwz1grxzp1gh72a27f2072"; depends=[BiocParallel CAMERA rsm xcms]; }; IPPD = derive2 { name="IPPD"; version="1.35.0"; sha256="00aa0pfawwinnx6wnmgwf8vm7j5g77xm1cikswj1f3k1r604p1ha"; depends=[bitops digest MASS Matrix XML]; }; @@ -488,14 +488,14 @@ in with self; { KEGGlincs = derive2 { name="KEGGlincs"; version="1.14.0"; sha256="043nhw0yjz735v6injd4axygkjy15b6a4xa3qnnzrg8qg82jg2xf"; depends=[AnnotationDbi gtools hgu133a_db httr igraph KEGGgraph KEGGREST KOdata org_Hs_eg_db plyr RJSONIO XML]; }; KEGGprofile = derive2 { name="KEGGprofile"; version="1.30.0"; sha256="017zm9ciasyfqqil7wszcs1kdj6qzzcbmknm1nnp7ylsm7gdlz0y"; depends=[AnnotationDbi biomaRt ggplot2 KEGG_db KEGGREST png RCurl reshape2 TeachingDemos XML]; }; KinSwingR = derive2 { name="KinSwingR"; version="1.6.0"; sha256="1cxj8cw5q9976wpy950ra8ghkpz1dy5zp4rf5d7hgb9kfs16pscr"; depends=[BiocParallel data_table sqldf]; }; - KnowSeq = derive2 { name="KnowSeq"; version="1.2.1"; sha256="09flwbmxz02wjh3730lywjkyfxb2kz5q6p8mb7d69m4sh38zsada"; depends=[Biobase caret class cqn e1071 edgeR ggplot2 gplots gridExtra Hmisc httr jsonlite kernlab limma multtest pathview praznik R_utils randomForest RCurl reshape2 rlist rmarkdown stringr sva XML]; }; + KnowSeq = derive2 { name="KnowSeq"; version="1.2.2"; sha256="1nh0j0i8mdq8vllwhchwc3jgpdk1jn1fxzwj70cg45rgzx1d7vkq"; depends=[Biobase caret class cqn e1071 edgeR ggplot2 gplots gridExtra Hmisc httr jsonlite kernlab limma multtest pathview praznik R_utils randomForest reshape2 rlist rmarkdown stringr sva XML]; }; LACE = derive2 { name="LACE"; version="1.0.0"; sha256="1xkv6w4q9waqxsmj0r1p2km0y2jg04sbgz3sqpbsc46ncmzaf1zs"; depends=[igraph RColorBrewer Rfast SummarizedExperiment]; }; LBE = derive2 { name="LBE"; version="1.56.0"; sha256="1ks7qryqqkkl0j081ip8j6k41gy2031bknpxkx0dv0g2gzsiflcc"; depends=[]; }; LEA = derive2 { name="LEA"; version="3.0.0"; sha256="1ynzv0kdyy9sz3cf8izv47gy6nqm6znfcgsjqk7wc9xy3nn22a40"; depends=[]; }; LINC = derive2 { name="LINC"; version="1.15.0"; sha256="0w9fildgdliq938kbiirhbs4i7nb918ggn080yh24wwya19b763s"; depends=[ape Biobase clusterProfiler DOSE ggplot2 ggtree gridExtra org_Hs_eg_db png Rcpp ReactomePA reshape2 sva]; }; LMGene = derive2 { name="LMGene"; version="2.43.0"; sha256="1pj8kwdyb7hkj1jmng2zxmijrspjmfcysswlz4hjg0xn4xqi8kr5"; depends=[affy Biobase multtest survival]; }; LOBSTAHS = derive2 { name="LOBSTAHS"; version="1.14.0"; sha256="1psx9z3smc1v9mlbgnr13m2b4wz1cal5mry6fcczzs04qrg3sa0c"; depends=[CAMERA xcms]; }; - LOLA = derive2 { name="LOLA"; version="1.18.0"; sha256="1whpbny38a50q6ibzadzqwj1v1khm0y845wvshf8kqw0k9jsnviz"; depends=[BiocGenerics data_table GenomicRanges IRanges reshape2 S4Vectors]; }; + LOLA = derive2 { name="LOLA"; version="1.18.1"; sha256="04kxsgl6h7gfg9bvhy3qlkj6hzrj3g1wyl84w4b7p75j0ams0xm9"; depends=[BiocGenerics data_table GenomicRanges IRanges reshape2 S4Vectors]; }; LPE = derive2 { name="LPE"; version="1.62.0"; sha256="0f9l6zbkgqg389x4yf8v20fc1irvivjqdw1s0lr4z4rm1g71s9ln"; depends=[]; }; LPEadj = derive2 { name="LPEadj"; version="1.48.0"; sha256="06skkc26ah4kxlvs8bmx27z5l38yp68d9dn7vbfh04gxcmc1cbi9"; depends=[LPE]; }; LRBaseDbi = derive2 { name="LRBaseDbi"; version="1.6.0"; sha256="1dcwb1qjvyir29plkai4lslfhip4vnngkcch8n57fhvs5cgjwf27"; depends=[AnnotationDbi Biobase DBI RSQLite]; }; @@ -513,7 +513,7 @@ in with self; { M3Drop = derive2 { name="M3Drop"; version="1.14.0"; sha256="0l3gzakicn9n6fcylfzf4h8cc2v7arih9mhyi41jdalqbhycx7x4"; depends=[bbmle gplots Hmisc irlba Matrix matrixStats numDeriv RColorBrewer reldist statmod]; }; MACPET = derive2 { name="MACPET"; version="1.8.0"; sha256="0d4g8pf7qlm0pp1zcsknhlz974q4qc5d28yiypc89yd7nhkivb1q"; depends=[BH bigmemory BiocParallel Biostrings futile_logger GenomeInfoDb GenomicAlignments GenomicRanges GEOquery gtools InteractionSet intervals IRanges knitr plyr Rbowtie Rcpp Rsamtools rtracklayer S4Vectors ShortRead]; }; MACSQuantifyR = derive2 { name="MACSQuantifyR"; version="1.2.0"; sha256="13fcrka1k1c4q7vmvpwip37midfd1ki4bkzlk4h4b4gnbff4scc0"; depends=[ggplot2 ggrepel gridExtra lattice latticeExtra png prettydoc readxl rmarkdown rvest xml2]; }; - MADSEQ = derive2 { name="MADSEQ"; version="1.14.0"; sha256="16vzh5h4iblw0xmv29zcg9pln629zjnp185zar8mxml8l0fdj4f9"; depends=[Biostrings BSgenome BSgenome_Hsapiens_UCSC_hg19 coda GenomeInfoDb GenomicAlignments GenomicRanges IRanges preprocessCore rjags Rsamtools rtracklayer S4Vectors SummarizedExperiment VariantAnnotation VGAM zlibbioc]; }; + MADSEQ = derive2 { name="MADSEQ"; version="1.14.0"; sha256="16vzh5h4iblw0xmv29zcg9pln629zjnp185zar8mxml8l0fdj4f9"; depends=[Biostrings BSgenome BSgenome_Hsapiens_UCSC_hg19 coda GenomeInfoDb GenomicAlignments GenomicRanges IRanges preprocessCore rjags Rsamtools rtracklayer S4Vectors SummarizedExperiment VariantAnnotation vcfR VGAM zlibbioc]; }; MAGeCKFlute = derive2 { name="MAGeCKFlute"; version="1.8.0"; sha256="0n649c8nn9snxc5n11303jaqwnsa1nnhiacsah9g272pqyrymq7z"; depends=[Biobase biomaRt clusterProfiler data_table dendextend DOSE enrichplot ggplot2 ggpubr ggrepel ggsci graph gridExtra KEGGgraph KEGGREST msigdbr pathview pheatmap png scales sva XML]; }; MAIT = derive2 { name="MAIT"; version="1.22.1"; sha256="1aqb7isy691jj0xf1jqjr000pg6jz9rg7xc5am5g8wa3p8p9sv8x"; depends=[agricolae CAMERA caret class e1071 gplots MASS pls plsgenomics Rcpp xcms]; }; MANOR = derive2 { name="MANOR"; version="1.60.0"; sha256="04kdiw2ps0y1q9ipk6zfa4fsc6viadqzkqnfmrl7jxgmsadfv3na"; depends=[GLAD]; }; @@ -526,7 +526,7 @@ in with self; { MCbiclust = derive2 { name="MCbiclust"; version="1.12.0"; sha256="1283kaxj4874alcqv5crc2a3kp75hx93mhdza8lr4c83mfl58izd"; depends=[AnnotationDbi BiocParallel cluster GGally ggplot2 GO_db org_Hs_eg_db scales WGCNA]; }; MDTS = derive2 { name="MDTS"; version="1.8.0"; sha256="1vg2sriwkkqc1d7s4lj4rf96aj3shj7vfrkzmrhw1crswp10x3kk"; depends=[Biostrings DNAcopy GenomicAlignments GenomicRanges IRanges Rsamtools stringr]; }; MEAL = derive2 { name="MEAL"; version="1.18.0"; sha256="17h6hr30vkyknkkc90l9ns5xq3kwpaj22izi7wh8hl43g58yka2a"; depends=[Biobase BiocGenerics GenomicRanges ggplot2 Gviz IRanges isva limma matrixStats minfi missMethyl MultiDataSet permute S4Vectors SmartSVA SummarizedExperiment vegan]; }; - MEAT = derive2 { name="MEAT"; version="1.0.3"; sha256="18yzxs0j4zr59fk06hrb9zk6ah7rdhds7yygabv4vvy3fyc062n7"; depends=[dplyr dynamicTreeCut glmnet impute minfi RPMM stringr SummarizedExperiment tibble wateRmelon]; }; + MEAT = derive2 { name="MEAT"; version="1.0.4"; sha256="19bbhyjdkhimqm079m0dp9v1ri4r324rijl3656555x3hzgraal3"; depends=[dplyr dynamicTreeCut glmnet impute minfi RPMM stringr SummarizedExperiment tibble wateRmelon]; }; MEB = derive2 { name="MEB"; version="1.2.0"; sha256="0yjw3mpk3cjya2vwx5c6zpnq8bwd2b7knirqml1lnm0p1qxgixlc"; depends=[e1071 SummarizedExperiment]; }; MEDIPS = derive2 { name="MEDIPS"; version="1.40.0"; sha256="14y2ybanmvcxac86wfnhnq4mwjfmsqypg1n5a77rnhac5j0z1v88"; depends=[biomaRt Biostrings BSgenome DNAcopy edgeR GenomicRanges gtools IRanges preprocessCore Rsamtools rtracklayer]; }; MEDME = derive2 { name="MEDME"; version="1.48.0"; sha256="1fdb2r8nvfjsyk526lybfyah0fg0sbirm0am4gwjb19w9yxvq4lm"; depends=[Biostrings drc MASS]; }; @@ -546,17 +546,17 @@ in with self; { MOFA = derive2 { name="MOFA"; version="1.4.0"; sha256="0wjc3k9bqdjrwa25a430rb2sh7bj4s692hmd7iy01wcph7nhaq4g"; depends=[Biobase corrplot cowplot doParallel dplyr foreach GGally ggbeeswarm ggplot2 ggrepel MultiAssayExperiment pheatmap RColorBrewer reshape2 reticulate rhdf5 scales]; }; MOMA = derive2 { name="MOMA"; version="1.0.2"; sha256="1rdw3yafr9f9dr6iwb8dlh5yfi9cppvx2l1h6zc20p31df9qwy81"; depends=[circlize cluster ComplexHeatmap dplyr ggplot2 magrittr MKmisc MultiAssayExperiment qvalue RColorBrewer readr reshape2 rlang stringr tibble tidyr]; }; MOSim = derive2 { name="MOSim"; version="1.2.0"; sha256="063aspwbqhcf578qi5ryj3fzrr8wby14r40vxb1ckx7ca3pcxvxw"; depends=[Biobase dplyr ggplot2 HiddenMarkov IRanges lazyeval matrixStats purrr rlang S4Vectors scales stringi stringr tibble tidyr zoo]; }; - MPFE = derive2 { name="MPFE"; version="1.23.0"; sha256="09n55k60n86mqv7mm6ms17qbvm6s5963bmclz3wp6pb1zqhzjnxb"; depends=[]; }; + MPFE = derive2 { name="MPFE"; version="1.24.1"; sha256="0b7a5ncdcfpwbnhiqnra1q2y8qj62lcxr1hsjgxr27jfxdzns3g1"; depends=[]; }; MPRAnalyze = derive2 { name="MPRAnalyze"; version="1.6.0"; sha256="1sc62bk6dp6c34a9q5x5j1a81s4jrxrrkj56348581k56i6rlk0i"; depends=[BiocParallel progress SummarizedExperiment]; }; MSGFgui = derive2 { name="MSGFgui"; version="1.22.0"; sha256="16s4zlps57sjkdkm1gkx8ypmpvl7dcngiv82m944mrvsk3xkac54"; depends=[MSGFplus mzID mzR shiny shinyFiles xlsx]; }; MSGFplus = derive2 { name="MSGFplus"; version="1.22.0"; sha256="14g2wf4h8qsldv2s07viizq37q6r7fnb31hb2qkyynx1hxyw1f7d"; depends=[mzID ProtGenerics]; }; MSnID = derive2 { name="MSnID"; version="1.22.0"; sha256="0dwa6j2nqb3223a8g4f453aznjh69wngrpvdi12iy69j1psbbjcc"; depends=[Biobase data_table doParallel dplyr foreach iterators MSnbase mzID mzR ProtGenerics R_cache Rcpp reshape2]; }; MSnbase = derive2 { name="MSnbase"; version="2.14.2"; sha256="17vlv9gh41s1hp043b7j1jfqiw52alh1misjzy1kxl0g90rld00l"; depends=[affy Biobase BiocGenerics BiocParallel digest ggplot2 impute IRanges lattice MALDIquant MASS mzID mzR pcaMethods plyr preprocessCore ProtGenerics Rcpp S4Vectors scales vsn XML]; }; - MSstats = derive2 { name="MSstats"; version="3.20.1"; sha256="0y2bswgvpyfiz470j01lsjiyhxig23m47rl1x0b3qrckl2gp0ayc"; depends=[broom data_table doSNOW dplyr foreach ggplot2 ggrepel gplots limma lme4 marray MASS minpack_lm preprocessCore purrr reshape2 snow statmod stringr survival tidyr]; }; + MSstats = derive2 { name="MSstats"; version="3.20.3"; sha256="05s2nakl93p5hanb7lf34k3dv9m6jlbx6dqjmf272p3x3w9v7mkl"; depends=[broom data_table doSNOW dplyr foreach ggplot2 ggrepel gplots limma lme4 marray MASS minpack_lm preprocessCore purrr reshape2 snow statmod stringr survival tidyr]; }; MSstatsQC = derive2 { name="MSstatsQC"; version="2.6.0"; sha256="1nbr01ybx4a764w5hfgpyzhp893lcajrwansxl9sarfj600xl50i"; depends=[dplyr ggExtra ggplot2 MSnbase plotly qcmetrics]; }; MSstatsQCgui = derive2 { name="MSstatsQCgui"; version="1.8.0"; sha256="11dawln2v70m0x6n5ybkpnb1xz2jzvx4440s33s87algnsgaiy5s"; depends=[dplyr ggExtra gridExtra MSstatsQC plotly shiny]; }; MSstatsSampleSize = derive2 { name="MSstatsSampleSize"; version="1.2.0"; sha256="1nz70ixbb948izqziip1hla83kzj386y1czinf7af71x7ic8hw77"; depends=[BiocParallel caret ggplot2 gridExtra MSstats reshape2]; }; - MSstatsTMT = derive2 { name="MSstatsTMT"; version="1.6.3"; sha256="1xwcsfdskbqndxvwv8yv6458953dfkdzamvcrk7gzqlpxkmck7fh"; depends=[data_table dplyr ggplot2 limma lme4 lmerTest matrixStats MSstats reshape2 statmod tidyr]; }; + MSstatsTMT = derive2 { name="MSstatsTMT"; version="1.6.6"; sha256="0dq5bcbz2x1l07xwrhay044vkii31jcy641cl6zgbjvplljqcnp1"; depends=[data_table dplyr ggplot2 limma lme4 lmerTest matrixStats MSstats reshape2 statmod tidyr]; }; MVCClass = derive2 { name="MVCClass"; version="1.62.0"; sha256="0vjw6dr7h0d71jknxwlm34xrgp7nm5y8mir5l4qqa5bnn148qzqk"; depends=[]; }; MWASTools = derive2 { name="MWASTools"; version="1.12.0"; sha256="0v9rwhalsv4kiwqcbcrhhx17flgpqcvkkpv0z8gm4f867pdsln0a"; depends=[boot car ComplexHeatmap ggplot2 glm2 gridExtra igraph KEGGgraph KEGGREST ppcor qvalue RCurl SummarizedExperiment]; }; Maaslin2 = derive2 { name="Maaslin2"; version="1.2.0"; sha256="1jickmbz84z25klg5bhq5p1vr45j0gd9ifzrki4wvqjbi69pp3wl"; depends=[biglm car chemometrics cplm data_table dplyr edgeR ggplot2 hash lmerTest logging lpsymphony MASS metagenomeSeq MuMIn optparse pbapply pcaPP pheatmap pscl robustbase vegan]; }; @@ -628,10 +628,10 @@ in with self; { OLINgui = derive2 { name="OLINgui"; version="1.62.0"; sha256="05si2bln02mhczwvqsz2m5g46f511p226lfcddsxsy19qq301jdc"; depends=[marray OLIN tkWidgets widgetTools]; }; OMICsPCA = derive2 { name="OMICsPCA"; version="1.6.0"; sha256="0d3h3lpy0k099ja59sqjr5ca3czk20qf0nlzslnh4d5vlp60z7vh"; depends=[cluster clValid corrplot cowplot data_table factoextra FactoMineR fpc GenomeInfoDb ggplot2 HelloRanges IRanges kableExtra magick MASS MultiAssayExperiment NbClust OMICsPCAdata pdftools PerformanceAnalytics reshape2 rgl rmarkdown rtracklayer tidyr]; }; OPWeight = derive2 { name="OPWeight"; version="1.10.0"; sha256="1plhy2klsl104vxqhd3yf87w0r5075vhq59p248b8100hl9vjg10"; depends=[MASS qvalue tibble]; }; - ORFik = derive2 { name="ORFik"; version="1.8.1"; sha256="185kp4l3pqc8v6dqg6b6lxqnb4y7043677hnidx5yqpp31fkkx49"; depends=[AnnotationDbi BiocGenerics BiocParallel Biostrings data_table DESeq2 GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges GGally ggplot2 gridExtra IRanges Rcpp Rsamtools rtracklayer S4Vectors SummarizedExperiment]; }; + ORFik = derive2 { name="ORFik"; version="1.8.6"; sha256="13km1084prm49ydizkic97qxhi44z75dfy6qv7h5gfljqk791mw8"; depends=[AnnotationDbi BiocGenerics BiocParallel biomartr Biostrings cowplot data_table DESeq2 fst GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges GGally ggplot2 gridExtra IRanges R_utils Rcpp Rsamtools rtracklayer S4Vectors SummarizedExperiment]; }; OSAT = derive2 { name="OSAT"; version="1.36.0"; sha256="0j5qhsla3b4sfhd5i8pn1mn1zj885x88mpc421r33mw259i7a8r6"; depends=[]; }; OTUbase = derive2 { name="OTUbase"; version="1.38.0"; sha256="12ysm7fhkpi0jza71a48jkllf4dz11g13712ciprqnxqr93afs7n"; depends=[Biobase Biostrings IRanges S4Vectors ShortRead vegan]; }; - OUTRIDER = derive2 { name="OUTRIDER"; version="1.6.0"; sha256="1rw4bms5zsd263v6dk9k4n46wymfkqacjlv25d697y7rylcvybin"; depends=[BBmisc Biobase BiocGenerics BiocParallel data_table DESeq2 GenomicFeatures GenomicRanges ggplot2 gplots heatmaply IRanges matrixStats pcaMethods pheatmap plotly plyr PRROC RColorBrewer Rcpp RcppArmadillo reshape2 S4Vectors scales SummarizedExperiment]; }; + OUTRIDER = derive2 { name="OUTRIDER"; version="1.6.1"; sha256="1y2rvz29inrg6f394an228k122nv753nxdwqrjrwxaxmwxhm32fa"; depends=[BBmisc BiocGenerics BiocParallel data_table DESeq2 generics GenomicFeatures GenomicRanges ggplot2 heatmaply IRanges matrixStats pcaMethods pheatmap plotly plyr PRROC RColorBrewer Rcpp RcppArmadillo reshape2 S4Vectors scales SummarizedExperiment]; }; OVESEG = derive2 { name="OVESEG"; version="1.4.0"; sha256="02skny8ndwm1afm7sb1g64l78vx64yi02f7isc3rcbcfdkpzsf8f"; depends=[BiocParallel fdrtool limma Rcpp SummarizedExperiment]; }; OmaDB = derive2 { name="OmaDB"; version="2.4.0"; sha256="0flvx8bai79j4krlmhjmgvbwmgk9w10f1h0k9dzhdz104csgpbmw"; depends=[ape Biostrings GenomicRanges httr IRanges jsonlite plyr topGO]; }; OmicCircos = derive2 { name="OmicCircos"; version="1.26.0"; sha256="062m61f69fs2ld11g27pwpwm6vri19i447spi2lac458wkn0hq00"; depends=[GenomicRanges]; }; @@ -649,7 +649,7 @@ in with self; { OutlierD = derive2 { name="OutlierD"; version="1.52.0"; sha256="0qhw5zr3d5dxa1mcqhzbamgzydk27zd009laibh3c4nn5107p7f9"; depends=[Biobase quantreg]; }; PAA = derive2 { name="PAA"; version="1.22.0"; sha256="1g15f0f84r8fdlq1ifbypzg25jv4sa30r0w8l5c5a5qvi902hlsc"; depends=[e1071 gplots gtools limma MASS mRMRe randomForest Rcpp ROCR sva]; }; PADOG = derive2 { name="PADOG"; version="1.30.0"; sha256="1zgyr3arzmc54h19jcq7rs883n63fkgjqn4z8g41rlfgmhzynk0a"; depends=[AnnotationDbi Biobase doRNG foreach GSA hgu133a_db hgu133plus2_db KEGGdzPathwaysGEO KEGGREST limma nlme]; }; - PAIRADISE = derive2 { name="PAIRADISE"; version="1.4.0"; sha256="1f9s1kxqljfazsxpi24kppabpbi45hk6j8v8xqgk3ivxhbhvgbkl"; depends=[abind BiocParallel nloptr S4Vectors SummarizedExperiment]; }; + PAIRADISE = derive2 { name="PAIRADISE"; version="1.4.1"; sha256="1cdmps7k9vdp3j00fqvp3d4iyrav78db8fzxy8b6wbs2s35vpl59"; depends=[abind BiocParallel nloptr S4Vectors SummarizedExperiment]; }; PANR = derive2 { name="PANR"; version="1.34.0"; sha256="12dan58ccd677rb75dsvvd7lhbzdydfz7fwzgafc4kiixnhdxcrh"; depends=[igraph MASS pvclust RedeR]; }; PAST = derive2 { name="PAST"; version="1.4.3"; sha256="1n2gk4b6lyxnrmyh0w4sp2xjg6dnvwn6fsyaddj0j566kmss359z"; depends=[doParallel dplyr foreach GenomicRanges ggplot2 iterators qvalue rlang rtracklayer S4Vectors]; }; PCAN = derive2 { name="PCAN"; version="1.16.0"; sha256="1wr5djwfgyp7703s5kk2zd7x6x40933q06cq3ljzq0wqb6val9ir"; depends=[BiocParallel]; }; @@ -657,7 +657,7 @@ in with self; { PCpheno = derive2 { name="PCpheno"; version="1.50.0"; sha256="1wgvq9hvbnr01rbkigs43lky7bh5vcz3ixqlq0w5dwsgkklxwfbs"; depends=[annotate AnnotationDbi Biobase Category GO_db graph GSEABase KEGG_db ppiData ppiStats ScISI SLGI]; }; PECA = derive2 { name="PECA"; version="1.24.0"; sha256="0y84f8hnb0wx9981lawnn29v5hl2ly9jw6q1384qxmhsd1al657q"; depends=[affy aroma_affymetrix aroma_core genefilter limma preprocessCore ROTS]; }; PERFect = derive2 { name="PERFect"; version="1.2.0"; sha256="10nhmjxnplp03lq1dxk07axdf8a2c50z0s5gyiwwrws4m1732mys"; depends=[fitdistrplus ggplot2 Matrix phyloseq psych sn zoo]; }; - PGA = derive2 { name="PGA"; version="1.18.0"; sha256="1wjr80d8s334wd5ai0wc5b9372l8rx85l4rvjc84g3xccdvr4ld6"; depends=[AnnotationDbi biomaRt Biostrings customProDB data_table dplyr GenomicFeatures GenomicRanges ggplot2 IRanges Nozzle_R1 pheatmap processx RCurl readr Rsamtools RSQLite rTANDEM rtracklayer S4Vectors seqinr stringr VariantAnnotation]; }; + PGA = derive2 { name="PGA"; version="1.18.1"; sha256="07jw0kab971yv2891jcgmdv96lkqa7qnk983vcj9b2nr1rvfm7aq"; depends=[AnnotationDbi biomaRt Biostrings customProDB data_table dplyr GenomicFeatures GenomicRanges ggplot2 IRanges Nozzle_R1 pheatmap processx RCurl readr Rsamtools RSQLite rTANDEM rtracklayer S4Vectors seqinr stringr VariantAnnotation]; }; PGSEA = derive2 { name="PGSEA"; version="1.61.0"; sha256="05dd1wrzzsfzhb3zpc1dh10dpywj2jxdwy2hiqsbzm0ybnx4cfnx"; depends=[annaffy AnnotationDbi Biobase GO_db KEGG_db]; }; PICS = derive2 { name="PICS"; version="2.32.0"; sha256="1vyf99llhbmwih0cxmzbsq0chfdgb6q0clhmmdvy2pz8dq3clc7m"; depends=[GenomicAlignments GenomicRanges IRanges Rsamtools]; }; PING = derive2 { name="PING"; version="2.32.0"; sha256="05b3fvlnykrqjshqngvy7w2z23h2b0bnk5hxgcpw9hbkii92kv60"; depends=[BiocGenerics BSgenome fda GenomicRanges Gviz IRanges PICS S4Vectors]; }; @@ -678,10 +678,10 @@ in with self; { PathoStat = derive2 { name="PathoStat"; version="1.14.0"; sha256="0b3rhzcjvi0n6x46bkavgwis08jf8pld38mg3srkw1l6s65ipcaz"; depends=[ape BiocStyle ComplexHeatmap corpcor DESeq2 devtools dplyr DT edgeR ggplot2 glmnet gmodels knitr limma matrixStats phyloseq plotly plyr RColorBrewer rentrez reshape2 ROCR scales shiny shinyjs tidyr vegan webshot XML]; }; PathwaySplice = derive2 { name="PathwaySplice"; version="1.11.0"; sha256="0645k6gipcgs4zp2yfyj9ylh358lzfcfpzh06ky2jg6dh0zilbjj"; depends=[annotate AnnotationDbi AnnotationHub BiasedUrn Biobase BiocGenerics DOSE dplyr EnrichmentBrowser ensembldb gdata geneLenDataBase GO_db goseq gplots gridExtra htmlwidgets igraph JunctionSeq KEGGREST mgcv org_Hs_eg_db org_Mm_eg_db plotly RColorBrewer reshape2 S4Vectors tibble VennDiagram webshot]; }; PepsNMR = derive2 { name="PepsNMR"; version="1.6.1"; sha256="12fr13bn576xgqwgss0kskx695gqqiizv9j53xn55ya8r739ahl7"; depends=[ggplot2 gridExtra Matrix matrixStats ptw reshape2]; }; - PharmacoGx = derive2 { name="PharmacoGx"; version="2.0.5"; sha256="18xc66dw9bp33nl4whfl3nyz60wy72sralk1jmnwikyk4j2vn28i"; depends=[Biobase BiocParallel caTools CoreGx downloader ggplot2 jsonlite magicaxis RColorBrewer reshape2 S4Vectors SummarizedExperiment testthat]; }; + PharmacoGx = derive2 { name="PharmacoGx"; version="2.0.9"; sha256="0if6jhy6jz9ph0njl8xkrvgk6lwh8jhqp29v10x8q6ydd97hgqjh"; depends=[Biobase BiocParallel caTools CoreGx downloader ggplot2 jsonlite magicaxis RColorBrewer reshape2 S4Vectors SummarizedExperiment testthat]; }; PhenStat = derive2 { name="PhenStat"; version="2.24.0"; sha256="0yg1gpm2qz0q2x3v8yl472x16r590vh1knc9x17kjjh58fk8lr7v"; depends=[car corrplot ggplot2 graph knitr lme4 logistf MASS msgps nlme nortest pingr reshape SmoothWin]; }; PhyloProfile = derive2 { name="PhyloProfile"; version="1.2.8"; sha256="0zlfxq2s28jfmklki6hnxfkvj88j6b0l02jgc126iy6cxgpkmppk"; depends=[ape BiocStyle bioDist Biostrings colourpicker data_table DT energy ExperimentHub ggplot2 gridExtra OmaDB pbapply plyr RColorBrewer shiny shinyBS shinyjs xml2 zoo]; }; - Pi = derive2 { name="Pi"; version="2.0.2"; sha256="1yq2pgaj62ysfd29815ja90g58shbxrvirsdzdsh7vkp8ml8wwr4"; depends=[BiocGenerics caret dnet dplyr GenomeInfoDb GenomicRanges ggbio ggnetwork ggplot2 ggrepel glmnet Gviz igraph IRanges lattice MASS Matrix osfr plot3D purrr randomForest RCircos readr ROCR scales supraHex tibble tidyr]; }; + Pi = derive2 { name="Pi"; version="2.0.3"; sha256="1ziqnz7cxwqv7770f8lwbqgmr70z15sayrfb00izlxlyh1nqna16"; depends=[BiocGenerics caret dnet dplyr GenomeInfoDb GenomicRanges ggbio ggnetwork ggplot2 ggrepel glmnet Gviz igraph IRanges lattice MASS Matrix osfr plot3D purrr randomForest RCircos readr ROCR scales supraHex tibble tidyr]; }; Pigengene = derive2 { name="Pigengene"; version="1.14.0"; sha256="1j32bmjksz6ywkgdqzzl60arjpcaqpf0dyz8x13xnigkj8rf2gj7"; depends=[bnlearn C50 dplyr gdata GO_db graph impute MASS matrixStats partykit pheatmap preprocessCore Rgraphviz WGCNA]; }; PloGO2 = derive2 { name="PloGO2"; version="1.0.0"; sha256="1cizkdp5wc6pi2cip77n2qd4lisjwckqsic82mnr9fwb41i95wwc"; depends=[GO_db GOstats httr lattice openxlsx xtable]; }; PoTRA = derive2 { name="PoTRA"; version="1.4.0"; sha256="1kark8hn5yb0visn7r02qqy54mfw46ypdh7wnvckwnkb5dbyh5ff"; depends=[BiocGenerics graph graphite igraph org_Hs_eg_db]; }; @@ -713,7 +713,7 @@ in with self; { RCAS = derive2 { name="RCAS"; version="1.14.0"; sha256="0f812pgv3ys1zv4n9sqkgm01hj4cdd0i0h85dqbhkwd94zl6cavl"; depends=[BiocGenerics Biostrings BSgenome BSgenome_Hsapiens_UCSC_hg19 cowplot data_table DT genomation GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 ggseqlogo gprofiler2 IRanges knitr pbapply pheatmap plotly plotrix proxy ranger rmarkdown RSQLite rtracklayer S4Vectors]; }; RCASPAR = derive2 { name="RCASPAR"; version="1.34.0"; sha256="0ddy2zkp5xk4x12s0217y61im63aikb3ijy7c59karj64h8dl0nv"; depends=[]; }; RCM = derive2 { name="RCM"; version="1.4.0"; sha256="0sq1wxr04igw13dn50ljczj6fbbisz4qkwf3dwpmbsk74pc2kfjw"; depends=[alabama edgeR ggplot2 MASS nleqslv phyloseq RColorBrewer reshape2 tensor tseries vegan VGAM]; }; - RCy3 = derive2 { name="RCy3"; version="2.8.0"; sha256="1rj8h6h17shnd94ra74l0ag549jbhcnc7s040g9faashh3w8pdjf"; depends=[BiocGenerics graph httr igraph R_utils RJSONIO XML]; }; + RCy3 = derive2 { name="RCy3"; version="2.8.1"; sha256="0wfqq3xiisd7rk3xsi4jymcj387yqj1944ms6akzjmnda2p9qq8d"; depends=[BiocGenerics graph httr igraph R_utils RJSONIO XML]; }; RCyjs = derive2 { name="RCyjs"; version="2.10.0"; sha256="0mimh459rzry2gfsgry7k8wzxfpn656b7l2abmhp9v7h7g6as5zg"; depends=[base64enc BiocGenerics BrowserViz graph httpuv]; }; RDAVIDWebService = derive2 { name="RDAVIDWebService"; version="1.26.0"; sha256="1dmqszi1f5cwjphrcw98fib53c6n340avprfayd2jaxzkxlr7ylx"; depends=[Category ggplot2 GO_db GOstats graph RBGL rJava]; }; RDRToolbox = derive2 { name="RDRToolbox"; version="1.38.0"; sha256="0vff12kknq0smrw34np9zn92s3vxkz13yqx1maaavpwpnhxi9d04"; depends=[MASS rgl]; }; @@ -730,13 +730,13 @@ in with self; { RJMCMCNucleosomes = derive2 { name="RJMCMCNucleosomes"; version="1.12.0"; sha256="18z2bn8l5wp7pxa8pkbgg1g0z81c2yyx9x60djac616vnwqzc4bp"; depends=[BiocGenerics BiocParallel consensusSeekeR GenomeInfoDb GenomicRanges IRanges Rcpp S4Vectors]; }; RLMM = derive2 { name="RLMM"; version="1.50.0"; sha256="0xzrj61x4bdh4q4hszg3zbyj8rnndb5i5h841vih58419yp86dbk"; depends=[MASS]; }; RMassBank = derive2 { name="RMassBank"; version="2.16.0"; sha256="066hvm406r9jy0s5jv8a808k14dchfb3rr23r521mlqcy6f4s8rm"; depends=[Biobase digest enviPat httr MSnbase mzR rcdk Rcpp RCurl rjson S4Vectors XML yaml]; }; - RNAAgeCalc = derive2 { name="RNAAgeCalc"; version="1.0.1"; sha256="1p8cl4wj1bs1089lwyz0lhlj17g2wypjj2cfq551vm1hvscmf5mf"; depends=[AnnotationDbi ggplot2 impute org_Hs_eg_db recount SummarizedExperiment]; }; + RNAAgeCalc = derive2 { name="RNAAgeCalc"; version="1.0.2"; sha256="06h6gv4zxz9ca8bsaq2vq51mz3mw0r6b2an4sp241b99hwgl2pw4"; depends=[AnnotationDbi ggplot2 impute org_Hs_eg_db recount SummarizedExperiment]; }; RNASeqPower = derive2 { name="RNASeqPower"; version="1.28.0"; sha256="14ir731p4ccbszkmlyf7ncbz2vm2nzqqgyflrqrdc2ik060gvzcr"; depends=[]; }; RNASeqR = derive2 { name="RNASeqR"; version="1.6.0"; sha256="1pggfzy2ji0k6wyjm2sacdwk3ndbkjlvksisw02ic7hgim3hc3bw"; depends=[ballgown Biostrings clusterProfiler corrplot DESeq2 DOSE edgeR factoextra FactoMineR ggplot2 gridExtra org_Hs_eg_db org_Sc_sgd_db pathview PerformanceAnalytics pheatmap rafalib reshape2 reticulate Rsamtools stringr systemPipeR systemPipeRdata]; }; RNAdecay = derive2 { name="RNAdecay"; version="1.8.0"; sha256="06y0slqalgksp3kwmm0rw7mj99jw02w42nqfrwhv401kknxga8hn"; depends=[ggplot2 gplots nloptr scales TMB]; }; RNAinteract = derive2 { name="RNAinteract"; version="1.36.0"; sha256="0nh9ll8f8wfwhbxyq1lj4y0v854wj55q2zg2bdrzg1bl89dakqa6"; depends=[abind Biobase cellHTS2 geneplotter gplots hwriter ICS ICSNP lattice latticeExtra limma locfit RColorBrewer splots]; }; RNAither = derive2 { name="RNAither"; version="2.36.0"; sha256="0lf1swy8f990bciss3y95ha22lkigb0gwdk884rsbkn20f6xn6p0"; depends=[biomaRt car geneplotter limma prada RankProd splots topGO]; }; - RNAmodR = derive2 { name="RNAmodR"; version="1.2.2"; sha256="1yssncp2raf9mw6wlcsww792k2v93apqgl2sgpz7fj7n84vgl8sm"; depends=[BiocGenerics BiocParallel Biostrings BSgenome colorRamps GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges ggplot2 Gviz IRanges matrixStats Modstrings RColorBrewer reshape2 ROCR Rsamtools rtracklayer S4Vectors]; }; + RNAmodR = derive2 { name="RNAmodR"; version="1.2.3"; sha256="0lhf84hsw0qnrb2ndj2qkdzgllf6bk56dysvnn0qg0ssglm0gd2i"; depends=[BiocGenerics BiocParallel Biostrings BSgenome colorRamps GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges ggplot2 Gviz IRanges matrixStats Modstrings RColorBrewer reshape2 ROCR Rsamtools rtracklayer S4Vectors]; }; RNAmodR_AlkAnilineSeq = derive2 { name="RNAmodR.AlkAnilineSeq"; version="1.2.0"; sha256="16fnsvpfj1cq4sznna09ky8bm8j02sznqvknhq82il1d3b40ysmz"; depends=[BiocGenerics GenomicRanges Gviz IRanges RNAmodR S4Vectors]; }; RNAmodR_ML = derive2 { name="RNAmodR.ML"; version="1.2.1"; sha256="19q4gh79kxz1hpa477rvishab1sgzp7kgw73ki6cisrz6hsvfjqn"; depends=[BiocGenerics GenomicRanges IRanges ranger RNAmodR S4Vectors]; }; RNAmodR_RiboMethSeq = derive2 { name="RNAmodR.RiboMethSeq"; version="1.2.0"; sha256="06lzarfip7477r080jc145pvvmrhqc5nh3jb4z8g1b7zf30ca0ir"; depends=[BiocGenerics GenomicRanges Gviz IRanges RNAmodR S4Vectors]; }; @@ -756,8 +756,8 @@ in with self; { RTCGA = derive2 { name="RTCGA"; version="1.18.0"; sha256="1jlmwb7b3gapx47kc0rgq11vzhm3g554pwv8mg6jfxcl1ypw9v57"; depends=[assertthat data_table dplyr ggplot2 ggthemes knitr purrr rvest scales stringi survival survminer viridis XML xml2]; }; RTCGAToolbox = derive2 { name="RTCGAToolbox"; version="2.18.0"; sha256="0idn65dbm12p1gnbgqfs0fk3q95y3171mmzfwwpxpdrkm4hywbqk"; depends=[BiocGenerics data_table DelayedArray GenomeInfoDb GenomicRanges httr limma RaggedExperiment RCircos RCurl RJSONIO S4Vectors stringr SummarizedExperiment survival TCGAutils XML]; }; RTN = derive2 { name="RTN"; version="2.12.1"; sha256="139v6hyssdhkr5gmrlir41gwmy6da1wpi7csjvmv98qxg09h84zp"; depends=[car data_table igraph IRanges limma minet mixtools pheatmap pwr RedeR S4Vectors snow SummarizedExperiment viper]; }; - RTNduals = derive2 { name="RTNduals"; version="1.12.1"; sha256="0491wsi6978990a0rzxjfrn9sk7nxizc2rbrpmw9g8502dbdc489"; depends=[RTN]; }; - RTNsurvival = derive2 { name="RTNsurvival"; version="1.12.1"; sha256="1cwsn33pdah3mfflarb1244g4s3vfqlhfhya47y2lanjksfjx753"; depends=[data_table dunn_test egg ggplot2 pheatmap RColorBrewer RTN RTNduals scales survival]; }; + RTNduals = derive2 { name="RTNduals"; version="1.12.2"; sha256="0150avr4aba7gpfxq7bv287shqhpwiwkwrlsk4c7ip16656jc59r"; depends=[RTN]; }; + RTNsurvival = derive2 { name="RTNsurvival"; version="1.12.2"; sha256="1rnjj373y98ywcwdbxzzmk01cp4gwr1ni07yc3g7fiscmrlcsgck"; depends=[data_table dunn_test egg ggplot2 pheatmap RColorBrewer RTN RTNduals scales survival]; }; RTopper = derive2 { name="RTopper"; version="1.34.0"; sha256="0ia8h1xmz6flv0bvrzrskwzi7acx96mv95hxfyklpivndhfd7bkg"; depends=[Biobase limma multtest]; }; RUVSeq = derive2 { name="RUVSeq"; version="1.22.0"; sha256="0yqs9xgyzw3cwb4l7zjl1cjgbsjp05qrqnwyvh7q81wdp7x5p55x"; depends=[Biobase EDASeq edgeR MASS]; }; RUVcorr = derive2 { name="RUVcorr"; version="1.20.0"; sha256="01kdmvbvl8aip8xb4ld2jdv3139cfsa71a2s0p15rf87ipjj9hwl"; depends=[BiocParallel bladderbatch corrplot gridExtra lattice MASS psych reshape2 snowfall]; }; @@ -779,7 +779,7 @@ in with self; { RcwlPipelines = derive2 { name="RcwlPipelines"; version="1.4.5"; sha256="0pqa462iaiih2zxxfa51fm320yjjyj89d0h6xsihbxrwrsicwrcm"; depends=[BiocFileCache rappdirs Rcwl]; }; Rdisop = derive2 { name="Rdisop"; version="1.48.0"; sha256="1danfv8v16mn1phha8wb5ip7gdv7mxyvzkbaylx5xj9qhdzm9rnj"; depends=[Rcpp]; }; ReQON = derive2 { name="ReQON"; version="1.34.0"; sha256="06m0hd4aqsxjyzhs8b1zys7lz8289qgwn7jp2dpln1j7cf02q4bz"; depends=[rJava Rsamtools seqbias]; }; - ReactomeGSA = derive2 { name="ReactomeGSA"; version="1.2.2"; sha256="00w5vzxjs27wxm1j3qb5l41sn8cf6d0mzc1bwacq0xwj191mvly9"; depends=[ggplot2 gplots httr jsonlite progress RColorBrewer]; }; + ReactomeGSA = derive2 { name="ReactomeGSA"; version="1.2.4"; sha256="04f2w24ia2w84ws1ray8nmiankqpy4sbsn5pda9k90avxcsqbrpd"; depends=[ggplot2 gplots httr jsonlite progress RColorBrewer]; }; ReactomePA = derive2 { name="ReactomePA"; version="1.32.0"; sha256="1ngilyn1mihwxs4sh5gk9y829xghdmh277cfw3vfgflz9sgwy21x"; depends=[AnnotationDbi DOSE enrichplot ggplot2 ggraph graphite igraph reactome_db]; }; ReadqPCR = derive2 { name="ReadqPCR"; version="1.34.0"; sha256="1z97qb1vlwddbzpq4g9n986g46qk39mk69hhxwfqw3xdgnqqbj92"; depends=[Biobase]; }; RedeR = derive2 { name="RedeR"; version="1.36.0"; sha256="15f1qb5k9x7agjjjrinc4i237ag4vjv1875a1kqakwlg1jvw5izg"; depends=[igraph]; }; @@ -809,7 +809,7 @@ in with self; { Rtreemix = derive2 { name="Rtreemix"; version="1.50.0"; sha256="11vxwsx9nv8hkj747yk27ln6a06idf1x78dzfijyqs85gcvdsjaw"; depends=[Biobase graph Hmisc]; }; S4Vectors = derive2 { name="S4Vectors"; version="0.26.1"; sha256="1ddr3ngyczx332zw9ai1a6h7442lgrbfcj8vrhvbkdkzqwj14xmb"; depends=[BiocGenerics]; }; SAGx = derive2 { name="SAGx"; version="1.62.0"; sha256="0ar2chczdzzadib0mz3fyk8g2anqsi6jsxh61r2x74r8gwy0w6q0"; depends=[Biobase multtest]; }; - SAIGEgds = derive2 { name="SAIGEgds"; version="1.2.1"; sha256="0zb6lsdbhc2zm5ipj4r51q96w7pgh3s054jmljqc1xgq3ygy4a5m"; depends=[gdsfmt Rcpp RcppArmadillo RcppParallel SeqArray SPAtest]; }; + SAIGEgds = derive2 { name="SAIGEgds"; version="1.2.3"; sha256="04mgsakqjd0zr6bjj1sm8zsp0jrg32qyqqmdf77k9dd6w2f847rx"; depends=[gdsfmt Rcpp RcppArmadillo RcppParallel SeqArray SPAtest]; }; SBGNview = derive2 { name="SBGNview"; version="1.2.0"; sha256="05391s9alhxdjx4zdqsx03jnsm0agnm1cky18mwlmbrv0i0bm0js"; depends=[AnnotationDbi igraph knitr pathview Rdpack rmarkdown rsvg SBGNview_data SummarizedExperiment xml2]; }; SBMLR = derive2 { name="SBMLR"; version="1.84.0"; sha256="07k2a259pdynh0lchzcmdkj85f0054h6ad7h5rnxjv21fqscqfqj"; depends=[deSolve XML]; }; SC3 = derive2 { name="SC3"; version="1.16.0"; sha256="15x7q8c13r4b6shrn0j88hw5vbrj7vrinihg5ihgd3l5g1x8x499"; depends=[BiocGenerics cluster doParallel doRNG e1071 foreach ggplot2 pheatmap Rcpp RcppArmadillo robustbase ROCR rrcov S4Vectors shiny SingleCellExperiment SummarizedExperiment WriteXLS]; }; @@ -880,7 +880,7 @@ in with self; { SpatialCPie = derive2 { name="SpatialCPie"; version="1.4.0"; sha256="1sdnc8f7x6n5k5i7qgfv7gh0y5s27gy3zh94ffwwic947xzw1b7k"; depends=[colorspace data_table digest dplyr ggforce ggiraph ggplot2 ggrepel igraph lpSolve purrr readr rlang shiny shinycssloaders shinyjs shinyWidgets SummarizedExperiment tibble tidyr tidyselect zeallot]; }; SpeCond = derive2 { name="SpeCond"; version="1.42.0"; sha256="0vr4assa8i8dnsfsvwqi0dg57qxi1yg3sjiqxs109ybcfg3y5rlj"; depends=[Biobase fields hwriter mclust RColorBrewer]; }; SpectralTAD = derive2 { name="SpectralTAD"; version="1.4.0"; sha256="0ncqmfzip0bggxsrsbgfkh39d59d9pv031rg11r2spknd9hyn3mn"; depends=[BiocParallel cluster dplyr GenomicRanges HiCcompare magrittr Matrix PRIMME]; }; - SpidermiR = derive2 { name="SpidermiR"; version="1.18.1"; sha256="0y32rmq8c68rlvkm9bxkw6ifzqgivd56ikzm3mz3xfrq2xgb9pzq"; depends=[AnnotationDbi gdata ggplot2 gplots gridExtra httr igraph lattice latticeExtra MAGeCKFlute miRNAtap miRNAtap_db networkD3 org_Hs_eg_db TCGAbiolinks visNetwork]; }; + SpidermiR = derive2 { name="SpidermiR"; version="1.18.2"; sha256="166wjg5xk2vyqr9lzpabapaydi92n5bd58if3mb9apxwfsdskszy"; depends=[AnnotationDbi gdata ggplot2 gplots gridExtra httr igraph lattice latticeExtra MAGeCKFlute miRNAtap miRNAtap_db networkD3 org_Hs_eg_db TCGAbiolinks visNetwork]; }; SplicingGraphs = derive2 { name="SplicingGraphs"; version="1.28.0"; sha256="1a19dr126cs3lr0bjnwnnz2qjxyl0dmw1xm15p14w4lgvmndg5az"; depends=[BiocGenerics BiocParallel GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges graph igraph IRanges Rgraphviz Rsamtools S4Vectors]; }; StarBioTrek = derive2 { name="StarBioTrek"; version="1.14.0"; sha256="010a9fmlwknrig642g12lk3r583rynsq2kwpj7an2ax1ndc8my87"; depends=[AnnotationDbi e1071 ggplot2 graphite igraph MLmetrics reshape2 ROCR SpidermiR]; }; Starr = derive2 { name="Starr"; version="1.43.0"; sha256="1cbbgdz92ja25fvn3v0cq83lb9h2dgpw7c03galjxprnkkgngmb5"; depends=[affxparser affy MASS pspline Ringo zlibbioc]; }; @@ -898,10 +898,10 @@ in with self; { TAPseq = derive2 { name="TAPseq"; version="1.0.0"; sha256="1az32hk1l9n6j1ak70npfji8xkwjyggca8najq6hm9z22n1mj90n"; depends=[BiocGenerics BiocParallel Biostrings BSgenome dplyr GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges IRanges S4Vectors tidyr]; }; TBSignatureProfiler = derive2 { name="TBSignatureProfiler"; version="1.0.0"; sha256="1gcn1876qm9fzra1hiqg47vxlpqqh79mg6n61f5f3ik3qsarxyy5"; depends=[ASSIGN BiocParallel bioDist boot caret circlize ComplexHeatmap DESeq2 DT e1071 edgeR gdata ggfortify ggplot2 glmnet GSVA RColorBrewer readr reshape2 ROCit S4Vectors shiny singscore SummarizedExperiment]; }; TCC = derive2 { name="TCC"; version="1.28.0"; sha256="0ah46f6h4y9l737a4jgd3y6af1nz693fl9pm3nxkgdakf0v46bly"; depends=[baySeq DESeq DESeq2 edgeR ROC]; }; - TCGAbiolinks = derive2 { name="TCGAbiolinks"; version="2.16.3"; sha256="06d15k7khlwia0z1j6zhsbkvdfyqpc6sqdlig5alajcb76p2a8kx"; depends=[biomaRt data_table downloader dplyr GenomicRanges ggplot2 httr IRanges jsonlite knitr plyr purrr R_utils readr rvest S4Vectors stringr SummarizedExperiment tibble tidyr XML xml2]; }; + TCGAbiolinks = derive2 { name="TCGAbiolinks"; version="2.16.4"; sha256="0v360yaics0p3xlnvb2acgfmfapafmxpj6dvmk6cldgksnazv0sx"; depends=[biomaRt data_table downloader dplyr GenomicRanges ggplot2 httr IRanges jsonlite knitr plyr purrr R_utils readr rvest S4Vectors stringr SummarizedExperiment tibble tidyr XML xml2]; }; TCGAbiolinksGUI = derive2 { name="TCGAbiolinksGUI"; version="1.14.0"; sha256="1jjq7jcf0978mik9k25y4rqyljwlcy2wypmz607vkyxl58q6kql1"; depends=[caret clusterProfiler colourpicker data_table downloader DT ELMER ggplot2 ggrepel maftools pathview plotly readr sesame shiny shinyBS shinydashboard shinyFiles shinyjs stringr SummarizedExperiment TCGAbiolinks TCGAbiolinksGUI_data]; }; - TCGAutils = derive2 { name="TCGAutils"; version="1.8.0"; sha256="0mggkcp3pr53315k4938wncbh04bn75j1x50h8b87py0hg88d6n8"; depends=[AnnotationDbi BiocGenerics GenomeInfoDb GenomicDataCommons GenomicFeatures GenomicRanges IRanges MultiAssayExperiment RaggedExperiment rvest S4Vectors stringr SummarizedExperiment xml2]; }; - TCseq = derive2 { name="TCseq"; version="1.12.0"; sha256="1s0grvs1a5x857jw4r9x6ymg2bm987nrhnfxcz2p512pwn79s62j"; depends=[BiocGenerics cluster e1071 edgeR GenomicAlignments GenomicRanges ggplot2 IRanges locfit reshape2 Rsamtools SummarizedExperiment]; }; + TCGAutils = derive2 { name="TCGAutils"; version="1.8.1"; sha256="1ikkjz73q7qw86jzrmbddqr9sd40g7xaznpyf4zz9aj0dzjvdj5z"; depends=[AnnotationDbi BiocGenerics GenomeInfoDb GenomicDataCommons GenomicFeatures GenomicRanges IRanges MultiAssayExperiment RaggedExperiment rvest S4Vectors stringr SummarizedExperiment xml2]; }; + TCseq = derive2 { name="TCseq"; version="1.12.1"; sha256="0xfbvr1qah0vwa5g15jpbzdqx4x3dkygdg6p92k67ip1qwsjar26"; depends=[BiocGenerics cluster e1071 edgeR GenomicAlignments GenomicRanges ggplot2 IRanges locfit reshape2 Rsamtools SummarizedExperiment]; }; TDARACNE = derive2 { name="TDARACNE"; version="1.38.0"; sha256="1k59i57nq2k8a5ih8i8ikyim9i4nr41s74anggbgwnpypdxbvrdy"; depends=[Biobase GenKern Rgraphviz]; }; TEQC = derive2 { name="TEQC"; version="4.10.0"; sha256="1bb2yar0qjlpr5zw5ld4pmvgn3ni3fz6n01q7j8a8zs9ql8jiqjk"; depends=[Biobase BiocGenerics hwriter IRanges Rsamtools]; }; TFARM = derive2 { name="TFARM"; version="1.10.0"; sha256="0w7rs22wga1xjyqfg500lcfd0yaajgck7jkpp510daksw9f0xw9r"; depends=[arules fields GenomicRanges gplots stringr]; }; @@ -913,7 +913,7 @@ in with self; { TMixClust = derive2 { name="TMixClust"; version="1.10.0"; sha256="0lzzfwcl0zvhjyzjq88n8fr90spw6b35slbmgxmca0lc3py12gwi"; depends=[Biobase BiocParallel cluster flexclust gss mvtnorm SPEM zoo]; }; TNBC_CMS = derive2 { name="TNBC.CMS"; version="1.4.0"; sha256="114w957i392yls73w33qcmw2ynyfc415y8gdvqh6p3k6kyiv7c90"; depends=[e1071 forestplot GGally ggplot2 ggpubr GSVA pheatmap pracma quadprog R_utils RColorBrewer SummarizedExperiment survival]; }; TOAST = derive2 { name="TOAST"; version="1.2.0"; sha256="1q7xan3qwmxjr0l8mlxi97khnp5h22r2q84vgca4wl9s9j5rz7vl"; depends=[EpiDISH limma nnls RefFreeEWAS SummarizedExperiment]; }; - TPP = derive2 { name="TPP"; version="3.16.2"; sha256="032yvln001808fxjkmwi98dl98h2700dxv0rsa7pg3whj4fj61kq"; depends=[Biobase biobroom broom data_table doParallel dplyr foreach futile_logger ggplot2 gridExtra knitr limma magrittr MASS mefa nls2 openxlsx plyr purrr RColorBrewer RCurl reshape2 rmarkdown stringr tibble tidyr VennDiagram VGAM]; }; + TPP = derive2 { name="TPP"; version="3.16.5"; sha256="0flaz2p6j4rlk65589i1f6d9m8spis19h51lc0is9rdbqzz721xb"; depends=[Biobase biobroom broom data_table doParallel dplyr foreach futile_logger ggplot2 gridExtra knitr limma magrittr MASS mefa nls2 openxlsx plyr purrr RColorBrewer RCurl reshape2 rmarkdown stringr tibble tidyr VennDiagram VGAM]; }; TPP2D = derive2 { name="TPP2D"; version="1.4.1"; sha256="0r790nr2x5blnphsvb4xmjq6n9ivrrdihaxxpp2f9hg14rdi1l47"; depends=[BiocParallel doParallel dplyr foreach ggplot2 limma MASS openxlsx RCurl stringr tidyr]; }; TRONCO = derive2 { name="TRONCO"; version="2.20.1"; sha256="0nq2nmb69wabblal845llyx89fqna1rk2kjj0aw0scm0gydrs232"; depends=[bnlearn cgdsr circlize doParallel foreach gridExtra gtable gtools igraph iterators R_matlab RColorBrewer Rgraphviz scales xtable]; }; TSCAN = derive2 { name="TSCAN"; version="1.26.0"; sha256="0hvrnva8lanr97p34i6irx8i6gskdk9jsa1mj6jhh7jlb0khv7d9"; depends=[combinat fastICA ggplot2 gplots igraph mclust mgcv plyr shiny]; }; @@ -930,7 +930,7 @@ in with self; { ToPASeq = derive2 { name="ToPASeq"; version="1.22.0"; sha256="04bd54xy2qhccbj8mpa3c7lgzf54q2lxprh9zxv5jirplkmklkf0"; depends=[Biobase corpcor graph graphite gRbase limma RBGL Rcpp SummarizedExperiment]; }; TransView = derive2 { name="TransView"; version="1.32.0"; sha256="1bcyz9hk4vqlv6nv70m146fs3ha2x89vpli56g3n7rz718q79yj2"; depends=[BiocGenerics GenomicRanges gplots IRanges Rhtslib S4Vectors zlibbioc]; }; TreeAndLeaf = derive2 { name="TreeAndLeaf"; version="1.0.0"; sha256="0g7fd5l0r4sqc35cfw4dx7sskb89ikyr7xkmc8qx7y3hj57kidpp"; depends=[ape igraph RedeR]; }; - TreeSummarizedExperiment = derive2 { name="TreeSummarizedExperiment"; version="1.4.6"; sha256="1708kgbfddy3dy4q1i9h2zxrdqv6xaj171940vn6h6d59kxsvf6m"; depends=[ape BiocGenerics dplyr rlang S4Vectors SingleCellExperiment SummarizedExperiment]; }; + TreeSummarizedExperiment = derive2 { name="TreeSummarizedExperiment"; version="1.4.8"; sha256="1cs7w9yl2nc2dl96pghpvxhqw586lw7cblhsmhl22m50n7d92wj4"; depends=[ape BiocGenerics dplyr rlang S4Vectors SingleCellExperiment SummarizedExperiment]; }; Trendy = derive2 { name="Trendy"; version="1.10.0"; sha256="0snsipp212s4f646pk5r7hychbkf4xjyfng8pmawss9h1qsig32f"; depends=[BiocParallel DT gplots magrittr S4Vectors segmented shiny shinyFiles SummarizedExperiment]; }; TurboNorm = derive2 { name="TurboNorm"; version="1.36.0"; sha256="17jxsgi3096xcyfddanqm38cd1gm5agmxzqcpyr07ys7snqy9vdf"; depends=[affy convert lattice limma marray]; }; TxRegInfra = derive2 { name="TxRegInfra"; version="1.8.0"; sha256="07z97cs3dv4d3a5q36k8lslg2ic8r3f8dhk0hq4d52r2wcg8axnx"; depends=[BiocParallel GenomeInfoDb GenomicRanges IRanges mongolite RaggedExperiment rjson S4Vectors SummarizedExperiment]; }; @@ -956,7 +956,7 @@ in with self; { XINA = derive2 { name="XINA"; version="1.6.0"; sha256="0k3w3cbp7gv1pv0ylz6gq619hq0i4dm2955s4pawfm7lgh5nls3m"; depends=[alluvial ggplot2 gridExtra igraph mclust plyr STRINGdb]; }; XVector = derive2 { name="XVector"; version="0.28.0"; sha256="11h1hszv4798q1gbx8r6zf8vlaqx4v9ql0lbh2xaxybp66a03pvc"; depends=[BiocGenerics IRanges S4Vectors zlibbioc]; }; Xeva = derive2 { name="Xeva"; version="1.4.0"; sha256="0x5gg018bgmv9dpawzpqf64k05rdrhwk30zxd4yfbxxfq8r7pa8m"; depends=[BBmisc Biobase ComplexHeatmap doParallel downloader ggplot2 nlme PharmacoGx Rmisc scales]; }; - YAPSA = derive2 { name="YAPSA"; version="1.14.0"; sha256="06lkf01vl4fyhj82srx8k870fhw76a1han0kp4jglh43b1c19c1k"; depends=[Biostrings BSgenome_Hsapiens_UCSC_hg19 circlize ComplexHeatmap corrplot dendextend doParallel dplyr GenomeInfoDb GenomicRanges GetoptLong ggbeeswarm ggplot2 gridExtra gtrellis KEGGREST magrittr PMCMR pracma reshape2 SomaticSignatures VariantAnnotation]; }; + YAPSA = derive2 { name="YAPSA"; version="1.14.0"; sha256="06lkf01vl4fyhj82srx8k870fhw76a1han0kp4jglh43b1c19c1k"; depends=[Biostrings BSgenome_Hsapiens_UCSC_hg19 circlize ComplexHeatmap corrplot dendextend doParallel dplyr GenomeInfoDb GenomicRanges GetoptLong ggbeeswarm ggplot2 gridExtra gtrellis KEGGREST lsei magrittr PMCMR pracma reshape2 SomaticSignatures VariantAnnotation]; }; a4 = derive2 { name="a4"; version="1.36.0"; sha256="1rzxg1h48jnlwqfjyyqzz6i3zlkfzc0i714rfplry7dyni6asgr7"; depends=[a4Base a4Classif a4Core a4Preproc a4Reporting]; }; a4Base = derive2 { name="a4Base"; version="1.36.0"; sha256="0b7fy1wcydb9z43wb1663skswvhivn7ji15g00gqcshwkkiq4x02"; depends=[a4Core a4Preproc annaffy AnnotationDbi Biobase genefilter glmnet gplots limma mpm multtest]; }; a4Classif = derive2 { name="a4Classif"; version="1.36.0"; sha256="0bj8m4nprw3maahd1qx9jjdxfip9ihbbpydbzwjxn6dlgw2i8mcr"; depends=[a4Core a4Preproc glmnet MLInterfaces pamr ROCR varSelRF]; }; @@ -1020,7 +1020,7 @@ in with self; { beadarray = derive2 { name="beadarray"; version="2.38.0"; sha256="1yg0039zyj0azb28kz6ljrd2nwc7afvncmqqsi0d72fjlznh6rrh"; depends=[AnnotationDbi BeadDataPackR Biobase BiocGenerics GenomicRanges ggplot2 hexbin illuminaio IRanges limma reshape2]; }; beadarraySNP = derive2 { name="beadarraySNP"; version="1.54.0"; sha256="0c6fhl9h1f3rm9a1qi5p8jfaj94iffjg2jzdksns2mf2mcjhky4k"; depends=[Biobase quantsmooth]; }; bgafun = derive2 { name="bgafun"; version="1.49.0"; sha256="0hp1kljv7dx6p3g4k9frsrgspg2gfr1mnypgwz05f6ll3zfjfm1c"; depends=[ade4 made4 seqinr]; }; - bgx = derive2 { name="bgx"; version="1.54.0"; sha256="0r67a6m5hrnsxgk0f57hl5yaagi2wai2kpfyjjlhrck4rlm1sjcx"; depends=[affy Biobase gcrma Rcpp]; }; + bgx = derive2 { name="bgx"; version="1.54.1"; sha256="0a10fg9n5p024jrmbis102gqpbz23sc6vdn1sal2697hlxikzb46"; depends=[affy Biobase gcrma Rcpp]; }; bigPint = derive2 { name="bigPint"; version="1.4.0"; sha256="1m92ngkzimcc37byf0ziphrby8wmjd5hfa53gvfphgaakyj9bjg8"; depends=[DelayedArray dplyr GGally ggplot2 gridExtra hexbin Hmisc htmlwidgets plotly plyr RColorBrewer reshape shiny shinycssloaders shinydashboard stringr SummarizedExperiment tidyr]; }; bigmelon = derive2 { name="bigmelon"; version="1.14.0"; sha256="1cryjhbiacm45g097rpqgbva49hs5vdx4y4h5h2v1gw4k78hwb4y"; depends=[Biobase BiocGenerics gdsfmt GEOquery methylumi minfi wateRmelon]; }; bigmemoryExtras = derive2 { name="bigmemoryExtras"; version="1.36.0"; sha256="053bqcd3p4i7agj43ccjxfz40a1sxrymd49vdpfq8ypslkwk7g0g"; depends=[bigmemory]; }; @@ -1031,7 +1031,7 @@ in with self; { biobtreeR = derive2 { name="biobtreeR"; version="1.0.0"; sha256="1vl06mv3ns0bnxd5sjypidw5v1spjqz8gvrjm5x5cwsdgg9zrvqn"; depends=[httpuv httr jsonlite stringi]; }; biocGraph = derive2 { name="biocGraph"; version="1.50.0"; sha256="1372bm4y3czqhpki10pnprxfkfncfcsy59zzvf8wj6q03acaavrj"; depends=[BiocGenerics geneplotter graph Rgraphviz]; }; biocViews = derive2 { name="biocViews"; version="1.56.2"; sha256="0kw0qfm1fw5yv2rbz6x23431rh0fnzj66f2bls7j285biyjmmx7w"; depends=[Biobase BiocManager graph RBGL RCurl RUnit XML]; }; - biomaRt = derive2 { name="biomaRt"; version="2.44.1"; sha256="0np4nh3gj60mgb6312z7x0z9fg5bhrhw872sp3dzgmqc8q8b84iz"; depends=[AnnotationDbi BiocFileCache httr openssl progress rappdirs stringr XML]; }; + biomaRt = derive2 { name="biomaRt"; version="2.44.4"; sha256="1zx98zas8ngy5g2pmdvcv1b0afhh7v2skyimkjmbgmi99sswp09i"; depends=[AnnotationDbi BiocFileCache httr openssl progress rappdirs stringr XML xml2]; }; biomformat = derive2 { name="biomformat"; version="1.16.0"; sha256="1l126nd1jmix4x3lh9my5nskc9bzbzrbz1brr23677vplfhrhy38"; depends=[jsonlite Matrix plyr rhdf5]; }; biomvRCNS = derive2 { name="biomvRCNS"; version="1.28.0"; sha256="0bzw6pm0xgbi1gc3ybvf07hvih4k61hhpxk67gsqiq2w50010hp8"; depends=[GenomicRanges Gviz IRanges mvtnorm]; }; biosigner = derive2 { name="biosigner"; version="1.16.0"; sha256="1v760q7hzaybkf2q9230rmr4phi8hglm59qwsjzvncxrhs3dpj06"; depends=[Biobase e1071 MultiDataSet randomForest ropls]; }; @@ -1050,7 +1050,7 @@ in with self; { bridge = derive2 { name="bridge"; version="1.52.0"; sha256="0cy35wcab4941s4136nqwwd27s4gqdgy06q0cvggld39jrpn467f"; depends=[rama]; }; bsseq = derive2 { name="bsseq"; version="1.24.4"; sha256="0ymay9csrylpg6x9s7fgbr1mbw47skw9lqv2p7jn8fyilk2rbbcj"; depends=[beachmat Biobase BiocGenerics BiocParallel Biostrings BSgenome data_table DelayedArray DelayedMatrixStats GenomeInfoDb GenomicRanges gtools HDF5Array IRanges limma locfit permute R_utils Rcpp rhdf5 S4Vectors scales SummarizedExperiment]; }; bumphunter = derive2 { name="bumphunter"; version="1.30.0"; sha256="04y6spdx89j3bsq2xniqd3sbfmakwc0klbpzjlp1q2xs9kywr4dq"; depends=[AnnotationDbi BiocGenerics doRNG foreach GenomeInfoDb GenomicFeatures GenomicRanges IRanges iterators limma locfit matrixStats S4Vectors]; }; - cBioPortalData = derive2 { name="cBioPortalData"; version="2.0.7"; sha256="0v3k3iznfzn3419ixlm1zv5sjfj5arpiyvfy5fc1682g762zv3lk"; depends=[AnVIL BiocFileCache digest dplyr GenomeInfoDb GenomicRanges httr IRanges MultiAssayExperiment RaggedExperiment rappdirs readr RTCGAToolbox S4Vectors SummarizedExperiment TCGAutils tibble tidyr]; }; + cBioPortalData = derive2 { name="cBioPortalData"; version="2.0.10"; sha256="1fqm5hsdmx3v9x0ziwhjjhrjjfzm26i51as2wkmpnvn7y13zws1j"; depends=[AnVIL BiocFileCache digest dplyr GenomeInfoDb GenomicRanges httr IRanges MultiAssayExperiment RaggedExperiment readr RTCGAToolbox S4Vectors SummarizedExperiment TCGAutils tibble tidyr]; }; cTRAP = derive2 { name="cTRAP"; version="1.6.1"; sha256="09fwxr40q6wcqiwdr8q75sr5njrfl48jp6dl68z9a7parmpmgv9q"; depends=[biomaRt cowplot data_table dplyr fgsea ggplot2 ggrepel httr limma pbapply R_utils readxl reshape2 rhdf5 scales]; }; caOmicsV = derive2 { name="caOmicsV"; version="1.18.0"; sha256="1cfqw7xvr4sr3b14w7slrvw093m4933c7717l9inlv0dj7jkz4g9"; depends=[bc3net igraph]; }; calm = derive2 { name="calm"; version="1.2.0"; sha256="09by842lv26psr85sck0n94w011kjav4bm5bx4kwji7vrd12m869"; depends=[mgcv]; }; @@ -1064,7 +1064,7 @@ in with self; { ccrepe = derive2 { name="ccrepe"; version="1.24.0"; sha256="0kyrrllpmrn2bbxyvfwxs1g9qvjxhisfw34b545z8hhjmdhlxlwk"; depends=[infotheo]; }; ceRNAnetsim = derive2 { name="ceRNAnetsim"; version="1.0.0"; sha256="0j79b1gg709i23r776h37gydnvvbg0hi60wkwlp0r638263l3qr1"; depends=[dplyr furrr future ggplot2 ggraph igraph purrr rlang tibble tidygraph tidyr]; }; celaref = derive2 { name="celaref"; version="1.6.0"; sha256="0k1vzwr91l4cdb81lqxil5302888q94qrwc1y237734ldkrj1bhh"; depends=[BiocGenerics DelayedArray dplyr ggplot2 magrittr MAST Matrix readr rlang S4Vectors SummarizedExperiment tibble]; }; - celda = derive2 { name="celda"; version="1.4.6"; sha256="0afmvwl8s3crk48iag22whq3p7am3xw745gcy9mcp3hda128xlwq"; depends=[data_table dbscan DelayedArray dendextend digest doParallel enrichR foreach ggdendro ggplot2 ggrepel gridExtra gtable MAST Matrix matrixStats MCMCprecision plyr pROC RColorBrewer Rcpp RcppEigen reshape2 Rtsne S4Vectors scales scater scran Seurat SingleCellExperiment stringi stringr SummarizedExperiment uwot withr]; }; + celda = derive2 { name="celda"; version="1.4.7"; sha256="1h3psbfv0az7n17bh3j3lanp6r2kmw5kxnja2qn50gny342wf1la"; depends=[data_table dbscan DelayedArray dendextend digest doParallel enrichR foreach ggdendro ggplot2 ggrepel gridExtra gtable MAST Matrix matrixStats MCMCprecision plyr pROC RColorBrewer Rcpp RcppEigen reshape2 Rtsne S4Vectors scales scater scran Seurat SingleCellExperiment stringi stringr SummarizedExperiment uwot withr]; }; cellHTS2 = derive2 { name="cellHTS2"; version="2.52.0"; sha256="11h7jyysl98mqqa6224sxrmrl19jghl8b7p3lkni4qgri9n0wdd2"; depends=[Biobase BiocGenerics Category genefilter GSEABase hwriter locfit prada RColorBrewer splots vsn]; }; cellTree = derive2 { name="cellTree"; version="1.18.0"; sha256="050hyrghmbgc2rw0x9jzx787gnapa7xh5djp16bw0s3h20xqw0gl"; depends=[gplots igraph maptpx slam topGO topicmodels xtable]; }; cellbaseR = derive2 { name="cellbaseR"; version="1.12.0"; sha256="0n7sv3wy71p32hffhrkhvxaj98m7j63hf6576yi0srllxgffr991"; depends=[BiocParallel data_table doParallel foreach httr jsonlite pbapply R_utils Rsamtools tidyr]; }; @@ -1081,7 +1081,7 @@ in with self; { chromVAR = derive2 { name="chromVAR"; version="1.10.0"; sha256="0igzsa206m29r7fhpkgkyllii30rd4kbiwqby8nz2cz86znmmx5w"; depends=[BiocGenerics BiocParallel Biostrings BSgenome DT GenomeInfoDb GenomicRanges ggplot2 IRanges Matrix miniUI nabor plotly RColorBrewer Rcpp RcppArmadillo Rsamtools Rtsne S4Vectors shiny SummarizedExperiment TFBSTools]; }; chromstaR = derive2 { name="chromstaR"; version="1.14.1"; sha256="1y71ipmg1wacx9ga1jyfzxr39s30kxfy9qji77fhxmalasvp9gbm"; depends=[bamsignals BiocGenerics chromstaRData doParallel foreach GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 IRanges mvtnorm reshape2 Rsamtools S4Vectors]; }; chromswitch = derive2 { name="chromswitch"; version="1.10.0"; sha256="1ii4shpbr3k5gpvw1l9ihvdc34qjbzgq05bj31v2p3a9p8wx6ii2"; depends=[Biobase BiocParallel cluster dplyr GenomicRanges gplots IRanges lazyeval magrittr matrixStats NMF rtracklayer S4Vectors tidyr]; }; - cicero = derive2 { name="cicero"; version="1.6.1"; sha256="0nf9yqg5krj26n4n82iyx3rsr84d46b17i9zfk35sh12l4xssbii"; depends=[assertthat Biobase BiocGenerics data_table dplyr FNN GenomicRanges ggplot2 glasso Gviz igraph IRanges Matrix monocle plyr reshape2 S4Vectors stringi stringr tibble tidyr VGAM]; }; + cicero = derive2 { name="cicero"; version="1.6.2"; sha256="042ba6yfa7fksij2v7cwnp2sca3vmz7izn6fsxx9xswnncrkgcqh"; depends=[assertthat Biobase BiocGenerics data_table dplyr FNN GenomicRanges ggplot2 glasso Gviz igraph IRanges Matrix monocle plyr reshape2 S4Vectors stringi stringr tibble tidyr VGAM]; }; circRNAprofiler = derive2 { name="circRNAprofiler"; version="1.2.1"; sha256="0x6acd7gfbna9dv5c459sg1k89kz8q9wpp96d3rfgrwjlssx6vmm"; depends=[AnnotationHub Biostrings BSgenome BSgenome_Hsapiens_UCSC_hg19 DESeq2 dplyr edgeR GenomeInfoDb GenomicRanges ggplot2 gwascat IRanges magrittr R_utils readr reshape2 rlang rtracklayer S4Vectors seqinr stringi stringr universalmotif]; }; cisPath = derive2 { name="cisPath"; version="1.28.0"; sha256="0vc7j6j6f18hrvja38crmxq85hashwic21skfvz3379xv0qzhypj"; depends=[]; }; cleanUpdTSeq = derive2 { name="cleanUpdTSeq"; version="1.26.0"; sha256="1hjs1hjr6mb9iqy1ba10sc8mrhff4p8bra11gq9k4sc5axiwcdjp"; depends=[BiocGenerics BSgenome BSgenome_Drerio_UCSC_danRer7 e1071 GenomeInfoDb GenomicRanges IRanges seqinr]; }; @@ -1153,8 +1153,8 @@ in with self; { ddPCRclust = derive2 { name="ddPCRclust"; version="1.8.0"; sha256="1il123xc37pckj58nlh8vzbdmfwi9qqghdvkl5948c747swrfyy1"; depends=[clue flowCore flowDensity flowPeaks ggplot2 openxlsx plotrix R_utils SamSPECTRAL]; }; dearseq = derive2 { name="dearseq"; version="1.0.0"; sha256="1v2w3b9z638vqwjqfssibkbjvydby4d73jqj5h87sbsapgjhcvqq"; depends=[CompQuadForm ggplot2 KernSmooth matrixStats pbapply statmod]; }; debCAM = derive2 { name="debCAM"; version="1.6.0"; sha256="0ifbn3vmlrpi4d2ybqhvygndqa200h0hb0b47523fx0vw985f9k5"; depends=[apcluster Biobase BiocParallel corpcor DMwR geometry NMF nnls pcaPP rJava SummarizedExperiment]; }; - debrowser = derive2 { name="debrowser"; version="1.16.2"; sha256="1iz1mjsarrc0xrrm7nlk7llbhsja47a039chs5ahrjg4bsj52wpf"; depends=[annotate AnnotationDbi clusterProfiler colourpicker DESeq2 DOSE DT edgeR enrichplot GenomicRanges ggplot2 gplots Harman heatmaply igraph IRanges jsonlite limma org_Hs_eg_db org_Mm_eg_db pathview plotly RColorBrewer RCurl reshape2 S4Vectors shiny shinyBS shinydashboard shinyjs stringi SummarizedExperiment sva]; }; - deco = derive2 { name="deco"; version="1.4.0"; sha256="05rzdk88grl05vwpzvrd1p6bwg1sx6fbvnlzmh9mb0ls668gj2h7"; depends=[ade4 AnnotationDbi Biobase BiocParallel BiocStyle cluster foreign gdata ggplot2 gplots gridExtra limma locfit made4 RColorBrewer reshape2 scatterplot3d sfsmisc SummarizedExperiment]; }; + debrowser = derive2 { name="debrowser"; version="1.16.3"; sha256="0lqsagl0qwzikm6mw8mw8ygpvylzr4jz810fjm020a8h155pwp2g"; depends=[annotate AnnotationDbi clusterProfiler colourpicker DESeq2 DOSE DT edgeR enrichplot GenomicRanges ggplot2 gplots Harman heatmaply igraph IRanges jsonlite limma org_Hs_eg_db org_Mm_eg_db pathview plotly RColorBrewer RCurl reshape2 S4Vectors shiny shinyBS shinydashboard shinyjs stringi SummarizedExperiment sva]; }; + deco = derive2 { name="deco"; version="1.4.1"; sha256="1lbrlacbdr16mw21jsvall18gfzq001p854nsa3jpgbhfs9y13zs"; depends=[ade4 AnnotationDbi Biobase BiocParallel BiocStyle cluster foreign gdata ggplot2 gplots gridExtra limma locfit made4 RColorBrewer reshape2 scatterplot3d sfsmisc SummarizedExperiment]; }; decompTumor2Sig = derive2 { name="decompTumor2Sig"; version="2.4.1"; sha256="014z3p784v53bv3wpx1njcc0xzwg1hklaa44qjvg9x7j95vrpmq9"; depends=[BiocGenerics Biostrings BSgenome_Hsapiens_UCSC_hg19 data_table GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 ggseqlogo gridExtra Matrix plyr quadprog S4Vectors SummarizedExperiment TxDb_Hsapiens_UCSC_hg19_knownGene VariantAnnotation]; }; decontam = derive2 { name="decontam"; version="1.8.0"; sha256="10y3iydzgwbr9ixyyylzxkd7jfg0qz14gmphmdhq94ys0frhwpxi"; depends=[ggplot2 reshape2]; }; deepSNV = derive2 { name="deepSNV"; version="1.34.1"; sha256="1hagkdq06c3xsrba3c3bnqwwmk406f9plkdh66a4hypx6hbwp6k7"; depends=[Biostrings GenomicRanges IRanges Rhtslib SummarizedExperiment VariantAnnotation VGAM]; }; @@ -1173,7 +1173,7 @@ in with self; { diffuStats = derive2 { name="diffuStats"; version="1.8.0"; sha256="10ln1c1ic44inxmi19fvxi4scnwl9qi5hpswhsnqsngql3yg69wp"; depends=[expm igraph MASS Matrix plyr precrec Rcpp RcppArmadillo RcppParallel]; }; diggit = derive2 { name="diggit"; version="1.20.0"; sha256="1k6i7w70yizc8drsdvz05sdfyrxr7z7fflbznc1wpnfv54phx00m"; depends=[Biobase ks viper]; }; discordant = derive2 { name="discordant"; version="1.12.0"; sha256="161y6xmzrsj88swii85v43q48n10snawzfz6305m2hsdj6463qxq"; depends=[Biobase biwt gtools MASS]; }; - distinct = derive2 { name="distinct"; version="1.0.3"; sha256="1a10v4ldgqqsk5lrnq1zi9pkw5brv9zys8bqdkfdb7xbc06yzgzq"; depends=[doParallel doRNG foreach ggplot2 limma Matrix Rcpp RcppArmadillo SingleCellExperiment SummarizedExperiment]; }; + distinct = derive2 { name="distinct"; version="1.0.4"; sha256="1c0pp3sqm0l8gyfixv9774lvdzsdk9x7gz82hf8ldinvyn6frraf"; depends=[doParallel doRNG foreach ggplot2 limma Matrix Rcpp RcppArmadillo scater SingleCellExperiment SummarizedExperiment]; }; dittoSeq = derive2 { name="dittoSeq"; version="1.0.2"; sha256="1fj7chyv077ffqnqvh2vv7x9x2alibk92fz3sihdfb167l0acdp4"; depends=[colorspace cowplot edgeR ggplot2 ggrepel ggridges gridExtra pheatmap reshape2 S4Vectors SingleCellExperiment SummarizedExperiment]; }; divergence = derive2 { name="divergence"; version="1.4.0"; sha256="0m87v1z2mjmy9b74aknzbal22r2rj55prqclpq68shg6g2iw8q8c"; depends=[SummarizedExperiment]; }; dks = derive2 { name="dks"; version="1.34.0"; sha256="1mrixifn868p0wjl6fcal1wm7ngf942lgas35wn0z1sqxnzqxl9n"; depends=[cubature]; }; @@ -1268,7 +1268,7 @@ in with self; { gCMAP = derive2 { name="gCMAP"; version="1.32.0"; sha256="04aaqa9gvv97ijgnr05drwcn637w1n1k1v9gna0zzxrbcwln36n8"; depends=[annotate AnnotationDbi bigmemory bigmemoryExtras Biobase Category DESeq genefilter GSEABase GSEAlm limma Matrix]; }; gCMAPWeb = derive2 { name="gCMAPWeb"; version="1.27.0"; sha256="1361qlzq5lgj24ssb7l1pds5h0g1wzn7q2ff9f03kpl5nhlbzrwd"; depends=[annotate AnnotationDbi Biobase BiocGenerics brew gCMAP GSEABase hwriter Rook yaml]; }; gCrisprTools = derive2 { name="gCrisprTools"; version="1.16.0"; sha256="0n5zxyrfnr981r1ynlclcxh6axxmbpd3m169zf767zicmjsxxcl7"; depends=[Biobase ggplot2 limma PANTHER_db rmarkdown RobustRankAggreg SummarizedExperiment]; }; - gQTLBase = derive2 { name="gQTLBase"; version="1.20.0"; sha256="06xvzp4fn3qfa46ggg8kxi267gbyd821vvx4040173xkqxpr0g5j"; depends=[BatchJobs BBmisc BiocGenerics bit doParallel ff ffbase foreach GenomicFiles GenomicRanges rtracklayer S4Vectors SummarizedExperiment]; }; + gQTLBase = derive2 { name="gQTLBase"; version="1.20.4"; sha256="1ly14vhhqxjpbxjypi6ppd37dycabdhf4ny4nsvp9969k418zv41"; depends=[BatchJobs BBmisc BiocGenerics bit doParallel ff ffbase foreach GenomicFiles GenomicRanges rtracklayer S4Vectors SummarizedExperiment]; }; gQTLstats = derive2 { name="gQTLstats"; version="1.20.0"; sha256="1jjqfpjp93nmxjn757j5mzcax96bzcqdd1gr3rsdxg7ap008l2w7"; depends=[AnnotationDbi BatchJobs BBmisc beeswarm Biobase BiocGenerics doParallel dplyr erma ffbase foreach GenomeInfoDb GenomicFeatures GenomicFiles GenomicRanges ggbeeswarm ggplot2 gQTLBase HardyWeinberg Homo_sapiens IRanges limma mgcv plotly reshape2 S4Vectors shiny snpStats SummarizedExperiment VariantAnnotation]; }; gaga = derive2 { name="gaga"; version="2.34.0"; sha256="10livlmxsdzf82rybhpqz81zdc0ndchy9z3kz62c651hc4x4pki1"; depends=[Biobase coda EBarrays mgcv]; }; gage = derive2 { name="gage"; version="2.38.3"; sha256="1bqmvjiya1df0b3h491lp1jxahiyidvaf9n094z0sk84x5y3xh2p"; depends=[AnnotationDbi GO_db graph KEGGREST]; }; @@ -1280,7 +1280,7 @@ in with self; { gcrma = derive2 { name="gcrma"; version="2.60.0"; sha256="1klbnygc1i5ac1x00bsk0rjw5h5dn6pn65fa3y9r09q47gpy1c5g"; depends=[affy affyio Biobase BiocManager Biostrings XVector]; }; gdsfmt = derive2 { name="gdsfmt"; version="1.24.1"; sha256="0ipf60wylbhvwk9q3mbnak0f1n6k7spfh90s1c1c0b47ryxsri67"; depends=[]; }; geNetClassifier = derive2 { name="geNetClassifier"; version="1.28.0"; sha256="163fbly8yglkmwqzwksj5ss4b50sma82khc2q74qgxrd8ji9155i"; depends=[Biobase e1071 EBarrays minet]; }; - geecc = derive2 { name="geecc"; version="1.21.0"; sha256="018yfiik3x0nchhgr5lb58ycngapx300p4r0aplzv2fz43avf4yi"; depends=[gplots hypergea MASS Rcpp]; }; + geecc = derive2 { name="geecc"; version="1.21.0"; sha256="018yfiik3x0nchhgr5lb58ycngapx300p4r0aplzv2fz43avf4yi"; depends=[gplots MASS Rcpp]; }; gemini = derive2 { name="gemini"; version="1.2.0"; sha256="1n5h9rvwpnvibbrdy71n4irc8j41b6hizqqff8ffh4pjy5n6g1hs"; depends=[dplyr ggplot2 magrittr mixtools pbmcapply scales]; }; genArise = derive2 { name="genArise"; version="1.64.0"; sha256="03kih2334l3np25k09mnhyvjzs0l6a7nbnbgc3wwkrrds8fbncnc"; depends=[locfit tkrplot xtable]; }; genbankr = derive2 { name="genbankr"; version="1.16.0"; sha256="0vd115ccllmzi5wr69aw46c2ny79qj76ds8qdm9bj4mrx1ayj611"; depends=[Biobase BiocGenerics Biostrings GenomeInfoDb GenomicFeatures GenomicRanges IRanges rtracklayer S4Vectors VariantAnnotation]; }; @@ -1311,7 +1311,7 @@ in with self; { globalSeq = derive2 { name="globalSeq"; version="1.16.1"; sha256="0zlb0h3djabwrm5sszx76r55r9svavpahhnlgzf1qi2iz6a9mjc5"; depends=[]; }; globaltest = derive2 { name="globaltest"; version="5.42.0"; sha256="0ndkpwi8dmz5kv2yzmdfx0qq00x6jismiah0xd6kh44l42k88510"; depends=[annotate AnnotationDbi Biobase survival]; }; gmapR = derive2 { name="gmapR"; version="1.30.0"; sha256="14dda16jgpc29nm4llswz6yr47hwmndd9zg2qlz2psfbn31z5k6w"; depends=[Biobase BiocGenerics BiocParallel Biostrings BSgenome GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges IRanges Rsamtools rtracklayer S4Vectors VariantAnnotation]; }; - gmoviz = derive2 { name="gmoviz"; version="1.0.0"; sha256="1489jqx8ih2hb9915xpg9xgxkal4h5cai1zwikzqshsdd4g1z327"; depends=[BiocGenerics Biostrings circlize colorspace ComplexHeatmap GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges gridBase IRanges pracma Rsamtools rtracklayer S4Vectors]; }; + gmoviz = derive2 { name="gmoviz"; version="1.0.1"; sha256="0rrqzqr64724ip19ql34yds3vd7r9s8bhw4bicq80pffz0c0idyx"; depends=[BiocGenerics Biostrings circlize colorspace ComplexHeatmap GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges gridBase IRanges pracma Rsamtools rtracklayer S4Vectors]; }; goProfiles = derive2 { name="goProfiles"; version="1.50.0"; sha256="0kdmr4mdjjb79srljbd0lr7np14gz58fya2v21qgny4m5lpw902d"; depends=[AnnotationDbi Biobase CompQuadForm GO_db stringr]; }; goSTAG = derive2 { name="goSTAG"; version="1.12.1"; sha256="1p4rhmfc09vzywrdkzak6784y92bdfkr6jw3l4xfq6sw77wd3wml"; depends=[AnnotationDbi biomaRt GO_db memoise]; }; goTools = derive2 { name="goTools"; version="1.62.0"; sha256="185ydv7hajhxw0jgv5gplcx59grbv7aqypfrxx6ny422d5mb86rm"; depends=[AnnotationDbi GO_db]; }; @@ -1361,7 +1361,7 @@ in with self; { iSeq = derive2 { name="iSeq"; version="1.40.0"; sha256="1k5fw917z94imflwz87zz0qlazsnvz2c8cka4i7l02h6nqs16yhn"; depends=[]; }; iasva = derive2 { name="iasva"; version="1.6.0"; sha256="1fbbwz6fjw83ca9z910rv96wf4qv9v43fyxncydmn1d02fq9ck13"; depends=[BiocParallel cluster irlba SummarizedExperiment]; }; ibh = derive2 { name="ibh"; version="1.36.0"; sha256="1wkd36673b1ksk7aph87awlpm7wwqfpa3qznkmv894nvmxhrd9r6"; depends=[simpIntLists]; }; - icetea = derive2 { name="icetea"; version="1.6.0"; sha256="0690siz5cd8qjpalyhrahqz7q5svfdyyq8hm61ygf3g5jqi1pczd"; depends=[BiocGenerics BiocParallel Biostrings csaw DESeq2 edgeR GenomicAlignments GenomicFeatures GenomicRanges ggplot2 IRanges limma Rsamtools rtracklayer S4Vectors ShortRead SummarizedExperiment TxDb_Dmelanogaster_UCSC_dm6_ensGene VariantAnnotation]; }; + icetea = derive2 { name="icetea"; version="1.6.1"; sha256="0lxiyha44m2ir9h68wbizzzg28c38290dd709c50kpcfd9mfg7n9"; depends=[BiocGenerics BiocParallel Biostrings csaw DESeq2 edgeR GenomicAlignments GenomicFeatures GenomicRanges ggplot2 IRanges limma Rsamtools rtracklayer S4Vectors ShortRead SummarizedExperiment TxDb_Dmelanogaster_UCSC_dm6_ensGene VariantAnnotation]; }; ideal = derive2 { name="ideal"; version="1.12.1"; sha256="1j1ys3sizvnkv8i54gf9vbakjaj84mmb3353lpj56wl2i4qvhvfb"; depends=[AnnotationDbi base64enc BiocParallel DESeq2 dplyr DT GenomicRanges ggplot2 ggrepel GO_db goseq GOstats gplots heatmaply IHW IRanges knitr limma pcaExplorer pheatmap plotly rentrez rintrojs rmarkdown S4Vectors shiny shinyAce shinyBS shinydashboard stringr SummarizedExperiment topGO UpSetR]; }; idiogram = derive2 { name="idiogram"; version="1.64.0"; sha256="1fia0sa7xqylshk8alwkg2a9vgvgqicwss8jvplvppniyan364bh"; depends=[annotate Biobase plotrix]; }; idr2d = derive2 { name="idr2d"; version="1.2.2"; sha256="1ycnjj4zy0k4qij7xv5i5w3jgd633nn4gxcb8n0z4kxh60117cq4"; depends=[dplyr futile_logger GenomeInfoDb GenomicRanges ggplot2 idr IRanges magrittr reticulate scales stringr]; }; @@ -1384,7 +1384,7 @@ in with self; { iteremoval = derive2 { name="iteremoval"; version="1.8.0"; sha256="1z2d4ggnh6n5k36rh1c9s2vmnbm4kvali7fsrb13xs60947c4r4m"; depends=[GenomicRanges ggplot2 magrittr SummarizedExperiment]; }; ivygapSE = derive2 { name="ivygapSE"; version="1.10.0"; sha256="0fsfh8mczbv6ng79h84i9hz0awyrp69np25jv6k2krxixan58adk"; depends=[ggplot2 hwriter plotly S4Vectors shiny SummarizedExperiment survival survminer UpSetR]; }; joda = derive2 { name="joda"; version="1.35.0"; sha256="044fhha4vrsfzz0bpa5q263lxqaz7nfb1b9hz0q870ja7j9wcmb3"; depends=[bgmm RBGL]; }; - karyoploteR = derive2 { name="karyoploteR"; version="1.14.0"; sha256="0h0gk4xd95k5phy6qcsv7j931d7gk3p24i2fg4mz5dsk110lpifs"; depends=[AnnotationDbi bamsignals bezier biovizBase digest GenomeInfoDb GenomicFeatures GenomicRanges IRanges memoise regioneR Rsamtools rtracklayer S4Vectors VariantAnnotation]; }; + karyoploteR = derive2 { name="karyoploteR"; version="1.14.1"; sha256="1wlnzkq58baqj9854nzf5rbglchb2xy4wsp3s0q8xfq8v0p3baxf"; depends=[AnnotationDbi bamsignals bezier biovizBase digest GenomeInfoDb GenomicFeatures GenomicRanges IRanges memoise regioneR Rsamtools rtracklayer S4Vectors VariantAnnotation]; }; kebabs = derive2 { name="kebabs"; version="1.22.0"; sha256="10jgn45dq0x1brpx6lgl2z8p6pg06ncrhi3ywasj4sjgvakil63r"; depends=[apcluster Biostrings e1071 IRanges kernlab LiblineaR Matrix Rcpp S4Vectors XVector]; }; keggorthology = derive2 { name="keggorthology"; version="2.40.0"; sha256="1y25xmj0f99nmlgi7ff0lqsyin5vx9jshmh3k98c4znls6k3hrpx"; depends=[AnnotationDbi DBI graph hgu95av2_db]; }; kimod = derive2 { name="kimod"; version="1.15.0"; sha256="1rrjfy4hibvzwprb4cg9q83b0rlzrbw68j5rrg1frvddgfimycz4"; depends=[Biobase cluster]; }; @@ -1414,7 +1414,7 @@ in with self; { maanova = derive2 { name="maanova"; version="1.58.0"; sha256="1vqq5y34cg27pr5ma51m60jcivcvarrz5h7j8rrb77vms08r6ad9"; depends=[Biobase]; }; macat = derive2 { name="macat"; version="1.62.0"; sha256="1fjcp8cy0bn916bli0iy040mbhmmswlacy4pc5kcb4yji1nlj4x2"; depends=[annotate Biobase]; }; made4 = derive2 { name="made4"; version="1.61.0"; sha256="1bm2n99rkl38y97zzg8mvb52jnf42ka0gqljzg4jphq8j97f8qj2"; depends=[ade4 gplots RColorBrewer scatterplot3d]; }; - maftools = derive2 { name="maftools"; version="2.4.05"; sha256="1wwd2n3xlqdv0yfw64hrpj443gmjyyibcfavfp7jd4ccph9g5wfd"; depends=[data_table RColorBrewer survival]; }; + maftools = derive2 { name="maftools"; version="2.4.12"; sha256="1hzgvi0siav2gzn3nc99bclk4am5b40jk8njkn4ggil223cn1ajv"; depends=[data_table RColorBrewer survival]; }; maigesPack = derive2 { name="maigesPack"; version="1.52.0"; sha256="14jf4b0kcd0l9mbnrvl2c55a7pggyfj14kj1gf7mc0k34ys9q04g"; depends=[convert graph limma marray]; }; makecdfenv = derive2 { name="makecdfenv"; version="1.64.0"; sha256="1mzsqkyyldcvf0b26j9pzwdy19n5hrsalvaw4vfhp36793f7r99v"; depends=[affy affyio Biobase zlibbioc]; }; mapscape = derive2 { name="mapscape"; version="1.12.0"; sha256="0yzf1p9nvg7ncpadnvad50c4mrxc6isn32b3vvyfrhq0adqidykl"; depends=[base64enc htmlwidgets jsonlite stringr]; }; @@ -1425,7 +1425,7 @@ in with self; { massiR = derive2 { name="massiR"; version="1.24.0"; sha256="1ki1886i90wfd5jmjjn6nddnkaaxq81xr5jmz9l226g5xmq7xh0l"; depends=[Biobase cluster diptest gplots]; }; matchBox = derive2 { name="matchBox"; version="1.30.0"; sha256="1mfrxp3scmfakysbyqs5i7kjw9kx2jllcz1vnb6jpdlvah7928ij"; depends=[]; }; matter = derive2 { name="matter"; version="1.14.0"; sha256="0ys1zmfyxz7lmffa8v02qcd5lg5aypjh3lhwzyzaal4cncx16fnp"; depends=[biglm BiocGenerics BiocParallel digest irlba Matrix ProtGenerics]; }; - mbkmeans = derive2 { name="mbkmeans"; version="1.4.0"; sha256="113s6cxvx61y75cky0y0a9q4b3zhj2qwx2d5ldvbmji3mfxh7i7x"; depends=[beachmat benchmarkme BiocParallel ClusterR DelayedArray Matrix Rcpp RcppArmadillo Rhdf5lib SingleCellExperiment SummarizedExperiment]; }; + mbkmeans = derive2 { name="mbkmeans"; version="1.4.1"; sha256="0h1phy2nvs4cpg7zm06dwlvm5v60s5029wg2h69p3cqiimciihrm"; depends=[beachmat benchmarkme BiocParallel ClusterR DelayedArray Matrix Rcpp RcppArmadillo Rhdf5lib SingleCellExperiment SummarizedExperiment]; }; mcaGUI = derive2 { name="mcaGUI"; version="1.36.0"; sha256="1b7ww5vd295a5dws1qx5mzsdy95ch81svbk9xcmnjkyp5kjjmlfi"; depends=[bpca foreign lattice MASS OTUbase proto vegan]; }; mdgsa = derive2 { name="mdgsa"; version="1.20.0"; sha256="1yv2fvjfmhvs2xdawm8clrsgasvmaiadfja606igrg0vdj4bmpwd"; depends=[AnnotationDbi cluster DBI GO_db KEGG_db Matrix]; }; mdp = derive2 { name="mdp"; version="1.8.0"; sha256="01dwydhclszzxhd91j4jdvpn88s77bn3dyfpf36q6wx2qzjfql6h"; depends=[ggplot2 gridExtra]; }; @@ -1467,7 +1467,7 @@ in with self; { miRNAmeConverter = derive2 { name="miRNAmeConverter"; version="1.16.0"; sha256="0x83bz4mg4sr3kcjb6kzigyb4w5r3571y0whd77a57baw4n3ywr0"; depends=[AnnotationDbi DBI miRBaseVersions_db reshape2]; }; miRNApath = derive2 { name="miRNApath"; version="1.48.0"; sha256="0r0s1hcq5wqlv0gpizh0abjqnk93fpii1hj4y128qd6fcgf1pkgf"; depends=[]; }; miRNAtap = derive2 { name="miRNAtap"; version="1.22.0"; sha256="1bxllfl9nc7hfzc996jlri6sqnydm1hyg1awc253vvxyccvinbn0"; depends=[AnnotationDbi DBI plyr RSQLite sqldf stringr]; }; - miRSM = derive2 { name="miRSM"; version="1.6.0"; sha256="1n86a4mqkmcb8x3rf5r8dv6lw0iqixgfp8wxraa1dr0syp43rj3g"; depends=[BiBitR BicARE biclust Biobase dbscan dynamicTreeCut energy fabia flashClust GFA GSEABase iBBiG igraph isa2 linkcomm MatrixCorrelation MCL mclust miRspongeR NMF org_Hs_eg_db PMA ppclust Rcpp rqubic runibic s4vd SOMbrero subspace SummarizedExperiment WGCNA]; }; + miRSM = derive2 { name="miRSM"; version="1.6.4"; sha256="06c8qygdbzr9yr30wki060bd18bv4a5nawjx0wf8pir4hlznyig8"; depends=[BiBitR BicARE biclust Biobase dbscan dynamicTreeCut energy fabia flashClust GFA GSEABase iBBiG igraph isa2 linkcomm MatrixCorrelation MCL mclust miRspongeR NMF org_Hs_eg_db PMA ppclust Rcpp rqubic s4vd SOMbrero subspace SummarizedExperiment WGCNA]; }; miRcomp = derive2 { name="miRcomp"; version="1.18.0"; sha256="1n5n1sp204a7rzdi3wbmqk2wp997s33kfkijg9i5qzrfj041ndyz"; depends=[Biobase KernSmooth miRcompData]; }; miRmine = derive2 { name="miRmine"; version="1.10.0"; sha256="1fllcmq5vb0fx4yxyrxwzflh5sy5yla8x4h12lb5vhy252c08y3b"; depends=[SummarizedExperiment]; }; miRspongeR = derive2 { name="miRspongeR"; version="1.14.0"; sha256="074w9bchvj4il92zdm39agr3l83flizl82x2gcqqnmmj7phcsv8v"; depends=[clusterProfiler corpcor DOSE igraph linkcomm MCL org_Hs_eg_db Rcpp ReactomePA survival varhandle]; }; @@ -1480,10 +1480,10 @@ in with self; { mirIntegrator = derive2 { name="mirIntegrator"; version="1.18.0"; sha256="11k73fabgnzj3b50xxhccqn850gid2d8bkns272yhpi2qj0ip8cx"; depends=[AnnotationDbi ggplot2 graph org_Hs_eg_db Rgraphviz ROntoTools]; }; missMethyl = derive2 { name="missMethyl"; version="1.22.0"; sha256="0h5m45v0s23a17b8glr5x2pmaz79znillnca7zdr7fvs0da3xdxg"; depends=[AnnotationDbi BiasedUrn Biobase BiocGenerics GenomicRanges GO_db IlluminaHumanMethylation450kanno_ilmn12_hg19 IlluminaHumanMethylation450kmanifest IlluminaHumanMethylationEPICanno_ilm10b4_hg19 IlluminaHumanMethylationEPICmanifest IRanges limma methylumi minfi org_Hs_eg_db ruv S4Vectors statmod stringr SummarizedExperiment]; }; missRows = derive2 { name="missRows"; version="1.8.0"; sha256="031ahbgpb4808wb6rr3qvaxq2gn3am28kjxcndlwpcwmhd55dpaq"; depends=[ggplot2 gtools MultiAssayExperiment plyr S4Vectors]; }; - mitch = derive2 { name="mitch"; version="1.0.8"; sha256="0ym4jpvyxivh82wsf48799am9xcppxnd18xgka7h9v3w1vv3l199"; depends=[beeswarm echarts4r GGally ggplot2 gplots gridExtra knitr MASS pbmcapply plyr reshape2 rmarkdown]; }; + mitch = derive2 { name="mitch"; version="1.0.10"; sha256="1qajkgni8pinkh0s95r910zwc50syzwxjdnx23a7imddwpfjca88"; depends=[beeswarm echarts4r GGally ggplot2 gplots gridExtra knitr MASS plyr reshape2 rmarkdown]; }; mitoODE = derive2 { name="mitoODE"; version="1.26.1"; sha256="1iskvlg811dfpzcr6xskw73piwf2ga3wv3c17hgppc66zygc6z3f"; depends=[KernSmooth MASS minpack_lm mitoODEdata]; }; - mixOmics = derive2 { name="mixOmics"; version="6.12.1"; sha256="13kq9l5xwhwp30y5gfqfh5f11n63vn8rk195mb2y2mww4cwi6lv4"; depends=[corpcor dplyr ellipse ggplot2 gridExtra igraph lattice MASS matrixStats rARPACK RColorBrewer reshape2 tidyr]; }; - mnem = derive2 { name="mnem"; version="1.4.1"; sha256="1nq01w5kzd1w065k4iwnr6badk2gwmgby1zqn9c2fh74hcsr32d8"; depends=[cluster data_table e1071 flexclust graph lattice Linnorm matrixStats naturalsort Rcpp RcppEigen Rgraphviz snowfall tsne]; }; + mixOmics = derive2 { name="mixOmics"; version="6.12.2"; sha256="1nkqlvm9j1f4vfj3f3kyxqgan38rpa9imimvl9pwivvsfl647vvc"; depends=[corpcor dplyr ellipse ggplot2 gridExtra igraph lattice MASS matrixStats rARPACK RColorBrewer reshape2 tidyr]; }; + mnem = derive2 { name="mnem"; version="1.4.5"; sha256="1arbsisinygjxhg94j74np4bmjv3yrpba08xdgm31b9ip6nkyb7g"; depends=[cluster data_table e1071 flexclust graph lattice Linnorm matrixStats naturalsort Rcpp RcppEigen Rgraphviz snowfall tsne]; }; mogsa = derive2 { name="mogsa"; version="1.22.1"; sha256="0gzi0j6cx6scb3gcc8xgv117yzma79cgllyklss8wrb97l1w8nvz"; depends=[Biobase BiocGenerics cluster corpcor genefilter gplots graphite GSEABase svd]; }; monocle = derive2 { name="monocle"; version="2.16.0"; sha256="1vziidavlyhixmx6j7lf29qx8xcjwrc9q3x2f63gcff41q3jf9xd"; depends=[Biobase BiocGenerics biocViews cluster combinat DDRTree densityClust dplyr fastICA ggplot2 HSMMSingleCell igraph irlba limma MASS Matrix matrixStats pheatmap plyr proxy qlcMatrix RANN Rcpp reshape2 Rtsne slam stringr tibble VGAM viridis]; }; mosaics = derive2 { name="mosaics"; version="2.26.0"; sha256="1n5s8j7v1l619msnxfg88rpkgm2kcldm4y1v491h1bnxw336gyjn"; depends=[GenomeInfoDb GenomicAlignments GenomicRanges IRanges lattice MASS Rcpp Rsamtools S4Vectors]; }; @@ -1493,8 +1493,8 @@ in with self; { motifcounter = derive2 { name="motifcounter"; version="1.12.0"; sha256="082hc9g08qsc659wcq8kazaghd9japichvdb6821cfm2vwafc93a"; depends=[Biostrings]; }; motifmatchr = derive2 { name="motifmatchr"; version="1.10.0"; sha256="145d9nykhzaf9kr30iq38c9yyv2pn459b7q4ypfmgi1g302lxfxz"; depends=[Biostrings BSgenome GenomeInfoDb GenomicRanges IRanges Matrix Rcpp RcppArmadillo Rsamtools S4Vectors SummarizedExperiment TFBSTools]; }; mpra = derive2 { name="mpra"; version="1.10.0"; sha256="1p12skbhgi4r1xcmg0fbf7696y9694r1ih95pi85xv5vjqwp1jx0"; depends=[BiocGenerics limma S4Vectors scales statmod SummarizedExperiment]; }; - msPurity = derive2 { name="msPurity"; version="1.14.0"; sha256="0r59bv8bj4165vnwdck51fyz544krwchzf5hx9fk0sbjbgzmm4hs"; depends=[DBI dbplyr doSNOW dplyr fastcluster foreach ggplot2 jsonlite magrittr mzR plyr Rcpp reshape2 RSQLite stringr uuid]; }; - msa = derive2 { name="msa"; version="1.20.0"; sha256="1dq75smsh5jhz95azi7xzmcnpqwhc06g0ncmpg84dyjvs5wsigcq"; depends=[BiocGenerics Biostrings IRanges Rcpp S4Vectors]; }; + msPurity = derive2 { name="msPurity"; version="1.14.1"; sha256="0fgy4k823xz85g03758hzhvsfmyqr7r543n52mb9lypz3h6pqarz"; depends=[DBI dbplyr doSNOW dplyr fastcluster foreach ggplot2 jsonlite magrittr mzR plyr Rcpp reshape2 RSQLite stringr uuid]; }; + msa = derive2 { name="msa"; version="1.20.1"; sha256="027l9kvhf6y8rh8hb9lg0g2qdjvyk4fsdpm35g7y5zc5y75p8cv5"; depends=[BiocGenerics Biostrings IRanges Rcpp S4Vectors]; }; msgbsR = derive2 { name="msgbsR"; version="1.12.0"; sha256="0v86y2ivzy0b4zrwcmy0vagnqms2735r552a6z1md2hx6lh9k2qi"; depends=[BSgenome easyRNASeq edgeR GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges ggbio ggplot2 IRanges plyr R_utils Rsamtools S4Vectors SummarizedExperiment]; }; msmsEDA = derive2 { name="msmsEDA"; version="1.26.0"; sha256="02fm1z9fidmhkkhijxmjzhzl2kmahif24gcllhfjc2g191kbwns2"; depends=[gplots MASS MSnbase RColorBrewer]; }; msmsTests = derive2 { name="msmsTests"; version="1.26.0"; sha256="0vg8523kwc3xals6ghja6z2rdcc0q8nzdh2h2637b6clkbs0g1cy"; depends=[edgeR msmsEDA MSnbase qvalue]; }; @@ -1514,14 +1514,14 @@ in with self; { ncGTW = derive2 { name="ncGTW"; version="1.2.0"; sha256="19qlxpwc0ir5bvwnls8k87lv7mrp8aa1kly627vy8326na9f8la9"; depends=[BiocParallel Rcpp xcms]; }; ncdfFlow = derive2 { name="ncdfFlow"; version="2.34.0"; sha256="0avxn2abh4fk1gkncrxz7jwzgvd90m3m0ly318q0z38cjhsw3j9f"; depends=[BH Biobase BiocGenerics flowCore Rcpp RcppArmadillo Rhdf5lib zlibbioc]; }; ndexr = derive2 { name="ndexr"; version="1.10.0"; sha256="11zzh4p9gj5srkmv5gx563s58q0n9hs84pw5szb6xs5jkfx85jy9"; depends=[httr igraph jsonlite plyr tidyr]; }; - netDx = derive2 { name="netDx"; version="1.0.3"; sha256="0zl3fjgl88lgkn4bb3dz8mhaz1cl31mjhpiklh99p972idi3mk6q"; depends=[bigmemory BiocFileCache combinat doParallel foreach GenomeInfoDb GenomicRanges ggplot2 glmnet igraph IRanges MultiAssayExperiment pracma rappdirs RColorBrewer RCy3 reshape2 ROCR S4Vectors]; }; + netDx = derive2 { name="netDx"; version="1.0.4"; sha256="1adn2gh5am1x61s3waiar7zivisbg46vmjnccfqg488d41minj82"; depends=[bigmemory BiocFileCache clusterExperiment combinat doParallel foreach GenomeInfoDb GenomicRanges ggplot2 glmnet igraph IRanges MultiAssayExperiment netSmooth pracma rappdirs RColorBrewer RCy3 reshape2 ROCR Rtsne S4Vectors scater]; }; netReg = derive2 { name="netReg"; version="1.11.0"; sha256="08caaspcjgmczawmp5ng6xl5lsp1nbwc72mww69isx9bnx25vn21"; depends=[Rcpp RcppArmadillo]; }; netSmooth = derive2 { name="netSmooth"; version="1.8.0"; sha256="13ypki31mq03kxg30hcpj2p5nf5fjhr779mfyynx9dzzm6jq9kf4"; depends=[cluster clusterExperiment data_table DelayedArray entropy HDF5Array Matrix scater SingleCellExperiment SummarizedExperiment]; }; netbenchmark = derive2 { name="netbenchmark"; version="1.19.0"; sha256="13ni8hi5n4arp5p12ximw04my79vckadjamadxj63rlmkknff6sp"; depends=[c3net corpcor fdrtool GeneNet GENIE3 grndata Matrix minet pracma Rcpp]; }; netbiov = derive2 { name="netbiov"; version="1.22.0"; sha256="03c2v8ihlrk6v0wqkdy047p6nf7iwaal4s0mm5l4hcjihalsg1pl"; depends=[igraph]; }; netboost = derive2 { name="netboost"; version="1.4.0"; sha256="190zwyfadlqz162qp08dbrvnznm5p1zbfjm8xm8p510jmsb2fxkl"; depends=[colorspace dynamicTreeCut impute R_utils Rcpp RcppParallel WGCNA]; }; - netboxr = derive2 { name="netboxr"; version="1.0.0"; sha256="1ljl61dy5wx5rm2zw8s2da69x23sp63wf4c5s79jg6khywmbsi6c"; depends=[clusterProfiler data_table DT gplots igraph jsonlite plyr]; }; - nethet = derive2 { name="nethet"; version="1.20.0"; sha256="0d96nmyzihzhv8vg81hmdspz2cj6pc7gib3z7r810fzab8mfgivd"; depends=[CompQuadForm GeneNet ggm ggplot2 glasso glmnet GSA huge ICSNP limma mclust multtest mvtnorm network]; }; + netboxr = derive2 { name="netboxr"; version="1.0.1"; sha256="1c496av5h6iqsvbl6dd1xh8yrcy8vw5l12wnmxn8jjjxl7fgwfdx"; depends=[clusterProfiler data_table DT gplots igraph jsonlite plyr RColorBrewer]; }; + nethet = derive2 { name="nethet"; version="1.20.1"; sha256="025ylsxvqdz50bggzmcf535fhflj29flic49956hygpf0mjyiqh6"; depends=[CompQuadForm GeneNet ggm ggplot2 glasso glmnet GSA huge ICSNP limma mclust multtest mvtnorm network]; }; netprioR = derive2 { name="netprioR"; version="1.14.0"; sha256="0qwbz1pjyppwvf5sfd14n9q5w2hpn8ns5pdgl16fj1w1y3nnih2q"; depends=[doParallel dplyr foreach ggplot2 gridExtra Matrix pROC sparseMVN]; }; netresponse = derive2 { name="netresponse"; version="1.48.0"; sha256="0sdly4lba4yyqxqdkx45zvj2p3179llkkf65i62wp9p01pc0xgpa"; depends=[dmt ggplot2 graph igraph mclust minet plyr qvalue RColorBrewer reshape2 Rgraphviz]; }; networkBMA = derive2 { name="networkBMA"; version="2.28.0"; sha256="0pymqhmrwmbkdvjaf0wk6wqgv3lbkmsw6g21nqm6vjvilf2rgcl9"; depends=[BH BMA leaps Rcpp RcppArmadillo RcppEigen]; }; @@ -1545,14 +1545,14 @@ in with self; { oncomix = derive2 { name="oncomix"; version="1.10.0"; sha256="0hxbagxra2630yjl858prlijgcyq1v4qz7aq0b78vrwpcrnv5rqj"; depends=[ggplot2 ggrepel mclust RColorBrewer SummarizedExperiment]; }; oneSENSE = derive2 { name="oneSENSE"; version="1.10.0"; sha256="0zd6xwrggsc4p66f8dm387mlpwficxa8zl880xprkqsia74g7m2k"; depends=[flowCore gplots plotly Rtsne scatterplot3d shiny shinyFiles webshot]; }; onlineFDR = derive2 { name="onlineFDR"; version="1.6.0"; sha256="1laqprlxbfy8lfdcihsbqvwzi5gwvgwz5d7ihri77nvddild9swr"; depends=[]; }; - ontoProc = derive2 { name="ontoProc"; version="1.10.0"; sha256="1iwq1wi1qnq10594hdd9pkhc4srzwvsw0fk7mzfaygjzg9ppd369"; depends=[AnnotationDbi Biobase dplyr DT graph magrittr ontologyIndex ontologyPlot Rgraphviz S4Vectors shiny]; }; + ontoProc = derive2 { name="ontoProc"; version="1.10.1"; sha256="0fm53qm1qq4nf4669j5ls9440jg8hhhyn1wkm5sjglg2avz4xb19"; depends=[AnnotationDbi Biobase dplyr DT graph magrittr ontologyIndex ontologyPlot Rgraphviz S4Vectors shiny]; }; openCyto = derive2 { name="openCyto"; version="2.0.0"; sha256="10dyd6dddskv70vhpwfbsqdb8pb9i3ka0fgvl1h51wqlckbsj89m"; depends=[Biobase BiocGenerics clue data_table flowClust flowCore flowStats flowViz flowWorkspace graph gtools ks lattice MASS ncdfFlow plyr R_utils RBGL RColorBrewer Rcpp rrcov]; }; openPrimeR = derive2 { name="openPrimeR"; version="1.10.4"; sha256="1hv2q37s6f1ns17jhcqnlwk2arqd2ikwy4ncp3fbzc3xwlqc7qwb"; depends=[ape BiocGenerics Biostrings DECIPHER digest distr distrEx dplyr fitdistrplus foreach GenomicRanges ggplot2 Hmisc IRanges lpSolveAPI magrittr openxlsx plyr RColorBrewer reshape2 S4Vectors scales seqinr stringdist stringr uniqtag XML]; }; openPrimeRui = derive2 { name="openPrimeRui"; version="1.10.0"; sha256="0vx3fba6faczqv3m5zaw53md9d6j0sm0c2n4w5gr5skyyhqfwpy6"; depends=[DT openPrimeR rmarkdown shiny shinyBS shinyjs]; }; oposSOM = derive2 { name="oposSOM"; version="2.6.0"; sha256="1dickvmach4vm3553l4xxkgbmbn7pjvafcsg0bpf6b03w1nb5rdg"; depends=[ape Biobase biomaRt fastICA fdrtool igraph pixmap Rcpp RcppParallel scatterplot3d tsne]; }; oppar = derive2 { name="oppar"; version="1.16.0"; sha256="0k8r8a11x4ckjc14fxy84jw9dn2kj2k9m1x1wpbs4hzfj013yk9q"; depends=[Biobase GSEABase GSVA]; }; oppti = derive2 { name="oppti"; version="1.2.0"; sha256="0v8mrdz1li7g1g827h0m4gbhpxmz1qffhpczmyw7pxd6467c15yp"; depends=[devtools ggplot2 knitr limma pheatmap RColorBrewer reshape]; }; - optimalFlow = derive2 { name="optimalFlow"; version="1.0.0"; sha256="072mqa8lhihzd238qy7zqv4fsrcd0v5affhr7wsdx8xp1gsikx9f"; depends=[dbscan doParallel dplyr ellipse flowMeans foreach optimalFlowData randomForest Rfast rgl rlang robustbase transport]; }; + optimalFlow = derive2 { name="optimalFlow"; version="1.0.1"; sha256="0jzaq9f4r631d0a3przf42sg19p4ssblb48v9x5dry3nxnjch59s"; depends=[dbscan doParallel dplyr ellipse flowMeans foreach optimalFlowData randomForest Rfast rgl rlang robustbase transport]; }; pRoloc = derive2 { name="pRoloc"; version="1.28.0"; sha256="0g2ji5cx3wxvni2rf2y1np7fha4yvcx6rzg2arkrhsgqnh731kv4"; depends=[Biobase BiocGenerics BiocParallel biomaRt caret class coda dendextend e1071 FNN ggplot2 gtools hexbin kernlab knitr LaplacesDemon lattice MASS mclust mixtools MLInterfaces MSnbase mvtnorm nnet plyr proxy randomForest RColorBrewer Rcpp RcppArmadillo sampling scales]; }; pRolocGUI = derive2 { name="pRolocGUI"; version="1.22.0"; sha256="1c22zfkk8ww4h79mfwig5x177gnqb73y136d5vjjylgpxvrsd20a"; depends=[Biobase dplyr DT ggplot2 MSnbase pRoloc scales shiny]; }; packFinder = derive2 { name="packFinder"; version="1.0.0"; sha256="1zd991v8ni6qid2prd2i8yqnzcp9v008c7x8xah77ci9aslq8wzn"; depends=[ape Biostrings GenomicRanges IRanges kmer S4Vectors]; }; @@ -1622,7 +1622,7 @@ in with self; { progeny = derive2 { name="progeny"; version="1.10.0"; sha256="09rq3nf9zm7w9djmx8xc8j3win3597p2v36zqgkhgkjwq5rkjgsh"; depends=[Biobase dplyr ggplot2 ggrepel gridExtra tidyr]; }; projectR = derive2 { name="projectR"; version="1.4.0"; sha256="1xn8kfxw6g1mq53yp8380p401lxwff6j0z5px6iq0ssajrl7md67"; depends=[cluster CoGAPS dplyr ggalluvial ggplot2 limma NMF RColorBrewer reshape2 ROCR scales viridis]; }; proteinProfiles = derive2 { name="proteinProfiles"; version="1.28.0"; sha256="0qdax0xq0hw6im9f9ai8k230gin66vnba23i132d8mg0hlh4aic6"; depends=[]; }; - psichomics = derive2 { name="psichomics"; version="1.14.2"; sha256="1rgi89van6h8wkwhflkf9k79jxh4cz6wmrh897nqg0l330sdw7q0"; depends=[AnnotationDbi AnnotationHub BiocFileCache cluster colourpicker data_table digest dplyr DT edgeR fastICA fastmatch ggplot2 ggrepel highcharter htmltools httr jsonlite limma org_Hs_eg_db pairsD3 plyr R_utils Rcpp recount reshape2 Rfast shiny shinyBS shinyjs stringr SummarizedExperiment survival XML xtable]; }; + psichomics = derive2 { name="psichomics"; version="1.14.4"; sha256="11bbk8k29bppd0fx5piqm5h17451bvn1nmsvchaldnrm0wj4bcah"; depends=[AnnotationDbi AnnotationHub BiocFileCache cluster colourpicker data_table digest dplyr DT edgeR fastICA fastmatch ggplot2 ggrepel highcharter htmltools httr jsonlite limma org_Hs_eg_db pairsD3 plyr R_utils Rcpp recount reshape2 Rfast shiny shinyBS shinyjs stringr SummarizedExperiment survival XML xtable]; }; psygenet2r = derive2 { name="psygenet2r"; version="1.20.0"; sha256="1321yih217rqspfxi829p6ymdda10d1q0vk1vkn0dj5721c4p1sg"; depends=[BgeeDB Biobase BiocManager biomaRt ggplot2 GO_db igraph labeling RCurl reshape2 stringr topGO]; }; pulsedSilac = derive2 { name="pulsedSilac"; version="1.2.0"; sha256="13isv3ip1ia5z09sa3fydcf5736ymlm1d00iy0p5b8m38g7znryv"; depends=[cowplot ggplot2 ggridges MuMIn R_utils robustbase S4Vectors SummarizedExperiment taRifx UpSetR]; }; puma = derive2 { name="puma"; version="3.30.0"; sha256="02qdjc64ad5h564p1q06fr5pj4dx0lwbk06kf73jlzv0xzsqzlym"; depends=[affy affyio Biobase mclust oligo oligoClasses]; }; @@ -1654,20 +1654,20 @@ in with self; { rTANDEM = derive2 { name="rTANDEM"; version="1.27.0"; sha256="095nqny8nzh3400b4l2npgxy4jwg4vq3j6zircipyr7qz6qd61fs"; depends=[data_table Rcpp XML]; }; rTRM = derive2 { name="rTRM"; version="1.26.0"; sha256="0ah6idnvxdyq9wq06ja6nkswl6prg0n3yfnbag4hnr9vz7dw1xbf"; depends=[AnnotationDbi DBI igraph RSQLite]; }; rTRMui = derive2 { name="rTRMui"; version="1.26.0"; sha256="1bwqd31pp9b27r7ckw3ixm06vbajljby42d9w6fffl7sl464qbnf"; depends=[MotifDb org_Hs_eg_db org_Mm_eg_db rTRM shiny]; }; - rWikiPathways = derive2 { name="rWikiPathways"; version="1.8.3"; sha256="0ymjmnmz3lffjz6js2xdz0qfqrvmz33yb0d58ssdwfjf9nq0gx38"; depends=[data_table httr rjson tidyr XML]; }; + rWikiPathways = derive2 { name="rWikiPathways"; version="1.8.5"; sha256="08mrwmkd0lb9psp42c8252gg835q2ydyjw4mlaw9r8hq92hc0912"; depends=[data_table httr rjson tidyr XML]; }; rain = derive2 { name="rain"; version="1.22.0"; sha256="1sgz52j08y35828rpb46iv25k62yw70bqw3qp5l9nj7kbkqrvjqw"; depends=[gmp multtest]; }; rama = derive2 { name="rama"; version="1.62.0"; sha256="1cir9jp0ma4afj427n1k0w8g41mqglbswhmb3q3hsc9dg4skcl1x"; depends=[]; }; ramwas = derive2 { name="ramwas"; version="1.12.0"; sha256="134lalqnqqphc13glh460za2anbcgysfd5dci9iyb7sykmil3cl4"; depends=[BiocGenerics biomaRt Biostrings digest filematrix GenomicAlignments glmnet KernSmooth Rsamtools]; }; randPack = derive2 { name="randPack"; version="1.34.0"; sha256="1qvnk0bl3wkk23a3h50khjbbnf7yhcqc6sr7yf5nnill0d1rqk1h"; depends=[Biobase]; }; randRotation = derive2 { name="randRotation"; version="1.0.0"; sha256="0maz3h4p7z08z6qifh3qkcj5nb92q2naa8hg71a2109qqbifl04r"; depends=[Rdpack]; }; rbsurv = derive2 { name="rbsurv"; version="2.46.0"; sha256="13l4llcgic3z56vz1rf17k8v958193bj93dapapibjrj384mhfck"; depends=[Biobase survival]; }; - rcellminer = derive2 { name="rcellminer"; version="2.10.0"; sha256="0vzsw24jbsvnjcb5ia814jnw1zgy3h7j1g54zqwivmpq1pidcni7"; depends=[Biobase ggplot2 gplots rcellminerData shiny stringr]; }; + rcellminer = derive2 { name="rcellminer"; version="2.10.2"; sha256="0y6d6i0djc6slr5rg6dc0bw5aml03cc53h2x4xak2a6aaa8xajs1"; depends=[Biobase ggplot2 gplots rcellminerData shiny stringr]; }; reb = derive2 { name="reb"; version="1.65.0"; sha256="0id6acnzaqahrn2gax8zy07hrk8dnpzbb7n8aki4qadggn2i7fl6"; depends=[Biobase idiogram]; }; receptLoss = derive2 { name="receptLoss"; version="1.0.0"; sha256="0r74bfgjyikg9z7bnr933cc1s4x2jipam1ygx3wx86f5s39srvr3"; depends=[dplyr ggplot2 magrittr SummarizedExperiment tidyr]; }; reconsi = derive2 { name="reconsi"; version="1.0.0"; sha256="1xzmzi22mrwslbar1clh253vyv3hv427dbb7rhjqn5z4vib6piz9"; depends=[ggplot2 KernSmooth MASS phyloseq reshape2]; }; recount = derive2 { name="recount"; version="1.14.0"; sha256="1x5wyml3hmpgs32f97hikm8h0150nj66ai7ldqpsn600fx2qivy8"; depends=[BiocParallel derfinder downloader GenomeInfoDb GenomicRanges GEOquery IRanges RCurl rentrez rtracklayer S4Vectors SummarizedExperiment]; }; recoup = derive2 { name="recoup"; version="1.16.0"; sha256="0wv5s62mmigkq9xj3rlz229g8m6x2n9zkjk3rimxb1izg0ix22m2"; depends=[BiocGenerics biomaRt circlize ComplexHeatmap GenomicAlignments GenomicRanges ggplot2 rtracklayer S4Vectors]; }; - regionReport = derive2 { name="regionReport"; version="1.22.0"; sha256="001j7b45gqc4shh4f71686zflj1z331vw0ll9z8gmgki5a0vdms9"; depends=[BiocStyle DEFormats derfinder DESeq2 GenomeInfoDb GenomicRanges knitcitations knitr knitrBootstrap RefManageR rmarkdown S4Vectors SummarizedExperiment]; }; + regionReport = derive2 { name="regionReport"; version="1.22.0"; sha256="001j7b45gqc4shh4f71686zflj1z331vw0ll9z8gmgki5a0vdms9"; depends=[BiocStyle DEFormats derfinder DESeq2 GenomeInfoDb GenomicRanges knitr knitrBootstrap RefManageR rmarkdown S4Vectors SummarizedExperiment]; }; regioneR = derive2 { name="regioneR"; version="1.20.1"; sha256="0bzjwzj5mvb49wgvs3gd3jfpm7s0zfkca763i65i7m994lgvz33c"; depends=[Biostrings BSgenome GenomeInfoDb GenomicRanges IRanges memoise rtracklayer S4Vectors]; }; regsplice = derive2 { name="regsplice"; version="1.14.0"; sha256="07fglqjm8zi64r4sp3hf7x4a86vblrbmv78km73lj6602nk3wqb7"; depends=[edgeR glmnet limma pbapply S4Vectors SummarizedExperiment]; }; regutools = derive2 { name="regutools"; version="1.0.1"; sha256="1jwfxw5il4f4kdgkn3zi57fbf05ag51ab18k0mx50glmca8271r6"; depends=[AnnotationDbi AnnotationHub BiocFileCache Biostrings DBI GenomicRanges Gviz IRanges RCy3 RSQLite S4Vectors]; }; @@ -1676,7 +1676,7 @@ in with self; { rfPred = derive2 { name="rfPred"; version="1.26.0"; sha256="1w2kwjqsvak271h82v96aqyrzilavz4ynnk5r5ldpyfi4all4lsz"; depends=[data_table GenomicRanges IRanges Rsamtools]; }; rfaRm = derive2 { name="rfaRm"; version="1.0.0"; sha256="0zrmb2accyr7naccnk2kp8fkg2zzwflx2knymgvv3gfmdysnq4bc"; depends=[Biostrings data_table httr magick rsvg stringi]; }; rgsepd = derive2 { name="rgsepd"; version="1.20.2"; sha256="179dn7kc7frr87f03qjkm7vxj3licn7mrq9yvagzfjm7pnqzr5ps"; depends=[AnnotationDbi biomaRt DESeq2 GO_db goseq gplots hash org_Hs_eg_db SummarizedExperiment]; }; - rhdf5 = derive2 { name="rhdf5"; version="2.32.2"; sha256="1v6ygi0avh3gmaj2ld2nr7vww4ipw39b5kqci9w27i3ja985lb8j"; depends=[Rhdf5lib]; }; + rhdf5 = derive2 { name="rhdf5"; version="2.32.4"; sha256="1qlgqn68xki82qm4i07h1z8c59dnjw29mravds9kby8419ra19gq"; depends=[Rhdf5lib]; }; rhdf5client = derive2 { name="rhdf5client"; version="1.10.0"; sha256="0l49i56dnvabls011rd8yiqv6qkf8iszwq5afirzcs3fs2acb6iz"; depends=[DelayedArray httr R6 rjson S4Vectors]; }; rhdf5filters = derive2 { name="rhdf5filters"; version="1.0.1"; sha256="06lp7phfz1asvppgm6sx9ix5w4wh8qz2dvklz1k0rvzrli5mb7pp"; depends=[Rhdf5lib]; }; riboSeqR = derive2 { name="riboSeqR"; version="1.22.0"; sha256="04a4dkmacd6xy55m84amxa0fspbc4kgg9r9k7bc3wrxswk77ccxk"; depends=[abind baySeq GenomeInfoDb GenomicRanges IRanges Rsamtools seqLogo]; }; @@ -1686,12 +1686,12 @@ in with self; { rnaSeqMap = derive2 { name="rnaSeqMap"; version="2.46.0"; sha256="17s1ad22zj09cklqxnccb3c4x75vgv01da5y7r1c08g6cvzv456a"; depends=[Biobase DBI DESeq edgeR GenomicAlignments GenomicRanges IRanges Rsamtools]; }; rnaseqcomp = derive2 { name="rnaseqcomp"; version="1.18.0"; sha256="1cqfx6fwkpbx7c31dhq6j0ijll39y90r54a1bnhxg2q0m4fba2a7"; depends=[RColorBrewer]; }; roar = derive2 { name="roar"; version="1.24.0"; sha256="069g887migvk70n0377dqr0fk7wjbz3w0asgk42bwhp8xpjfym6f"; depends=[BiocGenerics GenomeInfoDb GenomicAlignments GenomicRanges IRanges rtracklayer S4Vectors SummarizedExperiment]; }; - rols = derive2 { name="rols"; version="2.16.3"; sha256="1hyp0q7jlixjia850xxr2kl2094xwmjfj92cgjxq3lmg173ljl2y"; depends=[Biobase BiocGenerics httr jsonlite progress]; }; + rols = derive2 { name="rols"; version="2.16.4"; sha256="1zbj2m1xnbpw5wlpa2v6c7z72hsy4r5k1gdfvh0f7yv9nppxy1r8"; depends=[Biobase BiocGenerics httr jsonlite progress]; }; ropls = derive2 { name="ropls"; version="1.20.0"; sha256="1drww1mr0nira3qplyga6s3mljpjxshjgbn524kzxi0nrfbcvmnx"; depends=[Biobase MultiDataSet]; }; rpx = derive2 { name="rpx"; version="1.24.0"; sha256="1m9n19dj4wvnx31m3hlpw4pf55rw1wvh5s7fwsh4xil4c4h236m8"; depends=[RCurl xml2]; }; rqt = derive2 { name="rqt"; version="1.14.0"; sha256="0hv1hhmnk6qbilwbg6978mljk9cssz1ma1ri3qqmq9wdn6z6bxjl"; depends=[car CompQuadForm glmnet Matrix metap pls ropls RUnit SummarizedExperiment]; }; rqubic = derive2 { name="rqubic"; version="1.34.0"; sha256="1n1xdkgcynlawp0gl12fbynrxzjf5rpxa9i8ywc9dbl5q7dg7082"; depends=[biclust Biobase BiocGenerics]; }; - rrvgo = derive2 { name="rrvgo"; version="1.0.1"; sha256="19slkap9fy60p8xkq73vyzc4r1q2qkq0wi640dkgjnydxjpkm9p7"; depends=[AnnotationDbi ggplot2 ggrepel GO_db GOSemSim pheatmap shiny tm treemap wordcloud]; }; + rrvgo = derive2 { name="rrvgo"; version="1.0.2"; sha256="0v6skch7wgncbzqqzzwph0c37l7yh245i09j4p2nszjkx8c7kgj7"; depends=[AnnotationDbi ggplot2 ggrepel GO_db GOSemSim pheatmap shiny tm treemap wordcloud]; }; rsbml = derive2 { name="rsbml"; version="2.46.0"; sha256="1i1izznnwzrc6m7s3hblfff466icfvxl2gjdqaln8qfg9v87rslx"; depends=[BiocGenerics graph]; }; rtracklayer = derive2 { name="rtracklayer"; version="1.48.0"; sha256="1zcgk92sidhy4y7ws9ms4nkkh2hnccfhfh53qgna0kma9jy4v5xf"; depends=[BiocGenerics Biostrings GenomeInfoDb GenomicAlignments GenomicRanges IRanges RCurl Rsamtools S4Vectors XML XVector zlibbioc]; }; runibic = derive2 { name="runibic"; version="1.10.0"; sha256="1x3a710pxa0slw51267r6hrx7048mv3qfj7brdp27n8wyrrfih8w"; depends=[biclust Rcpp SummarizedExperiment testthat]; }; @@ -1758,13 +1758,13 @@ in with self; { sigaR = derive2 { name="sigaR"; version="1.35.0"; sha256="05cmjdd7brmmshlam940qhpj1wzk7a4j86hqp3i5rwcqljc7qhzf"; depends=[Biobase CGHbase corpcor igraph limma marray MASS mvtnorm penalized quadprog snowfall]; }; siggenes = derive2 { name="siggenes"; version="1.62.0"; sha256="0i4y1hgq1ljxkf6sypb6c8yp412a8q5v5z68cx1zrgxnccvp0mfy"; depends=[Biobase multtest scrime]; }; sights = derive2 { name="sights"; version="1.14.0"; sha256="1m71q14hwqlyrisgsl8j93rl4z2qkya531pzsajq70n2x87ghjxy"; depends=[ggplot2 lattice MASS qvalue reshape2]; }; - signatureSearch = derive2 { name="signatureSearch"; version="1.2.4"; sha256="0wbf4bk8chkhb930c2clcvllvnrwx2p779h56fm4v7x1qp9shzxz"; depends=[AnnotationDbi BiocParallel clusterProfiler data_table DelayedArray DOSE dplyr ExperimentHub fastmatch fgsea ggplot2 GSEABase HDF5Array magrittr Matrix qvalue Rcpp readr reshape2 rhdf5 RSQLite scales SummarizedExperiment visNetwork]; }; + signatureSearch = derive2 { name="signatureSearch"; version="1.2.5"; sha256="1fwx8xhv7c9hxhb2ny0niyj89rsd51vfdvzni0cx8pj7l6vpssg6"; depends=[AnnotationDbi BiocParallel clusterProfiler data_table DelayedArray DOSE dplyr ExperimentHub fastmatch fgsea ggplot2 GSEABase HDF5Array magrittr Matrix qvalue Rcpp readr reshape2 rhdf5 RSQLite scales SummarizedExperiment visNetwork]; }; signeR = derive2 { name="signeR"; version="1.14.0"; sha256="1mjnh1vxqx0mld10m5plsnml1c30j534nbwqiyxcv2habchkdfnf"; depends=[BiocGenerics Biostrings class GenomeInfoDb GenomicRanges IRanges nloptr NMF PMCMR Rcpp RcppArmadillo VariantAnnotation]; }; signet = derive2 { name="signet"; version="1.7.0"; sha256="1qq3hnawaslqv2fp5dc5c552r430kmxhf0b0qwzny8ms9g83azf5"; depends=[graph igraph RBGL]; }; sigsquared = derive2 { name="sigsquared"; version="1.20.0"; sha256="1mgg4gg5h0ms6srbib8am1i8l9k0vcxj99j7i90h72pmdipwmy4a"; depends=[Biobase survival]; }; similaRpeak = derive2 { name="similaRpeak"; version="1.20.0"; sha256="02nhbwf0xck8inn49hnhk629f5jbh3ian069nif7hvi6pxg5l8bx"; depends=[R6]; }; simpleaffy = derive2 { name="simpleaffy"; version="2.64.0"; sha256="040043spblr8v67lkn3nnxhgfmfh2iwaizph4fnms1ik6qz662x7"; depends=[affy Biobase BiocGenerics gcrma genefilter]; }; - simulatorZ = derive2 { name="simulatorZ"; version="1.22.0"; sha256="1i8bp08bs129d9crj7hhqabb2di72zwcl27v58a0vzbnwkf1m0fd"; depends=[Biobase BiocGenerics CoxBoost gbm GenomicRanges Hmisc SummarizedExperiment survival]; }; + simulatorZ = derive2 { name="simulatorZ"; version="1.22.0"; sha256="1i8bp08bs129d9crj7hhqabb2di72zwcl27v58a0vzbnwkf1m0fd"; depends=[Biobase BiocGenerics gbm GenomicRanges Hmisc SummarizedExperiment survival]; }; sincell = derive2 { name="sincell"; version="1.20.0"; sha256="1byzikl2c0w25ni9djksdzqsvlxdm0n03lc476qafai46vk7jzr6"; depends=[cluster entropy fastICA fields ggplot2 igraph MASS proxy Rcpp reshape2 Rtsne scatterplot3d statmod TSP]; }; singleCellTK = derive2 { name="singleCellTK"; version="1.8.0"; sha256="069p7nh2lkdy8kb7rdp6zqjjyjbsbvycf8zfcvbxr7fmxyvnks2r"; depends=[AnnotationDbi ape Biobase celda circlize cluster colourpicker ComplexHeatmap data_table DelayedArray DESeq2 DT enrichR ggplot2 ggtree gridExtra GSVA GSVAdata limma MAST matrixStats multtest plotly RColorBrewer reshape2 Rtsne S4Vectors shiny shinyalert shinyBS shinycssloaders shinyjs shinythemes SingleCellExperiment SummarizedExperiment sva umap]; }; singscore = derive2 { name="singscore"; version="1.8.0"; sha256="134ycza15x82g7f039fd6qyq2gwzvwq1jx9wya3qpi13lbfazicw"; depends=[Biobase BiocParallel edgeR ggplot2 ggrepel GSEABase magrittr matrixStats plotly plyr RColorBrewer reshape reshape2 S4Vectors SummarizedExperiment tidyr]; }; @@ -1782,7 +1782,7 @@ in with self; { sojourner = derive2 { name="sojourner"; version="1.2.1"; sha256="0sda3mb8r6s5s4c1ha9570n29ls76x57wvyq8nclrys7x0v325gi"; depends=[dplyr EBImage fitdistrplus ggplot2 gridExtra lattice MASS mclust minpack_lm mixtools mltools nls2 pixmap plyr R_matlab Rcpp reshape2 rlang rtiff sampSurf scales shiny shinyjs sp truncnorm]; }; sparseDOSSA = derive2 { name="sparseDOSSA"; version="1.12.0"; sha256="0fckk5iy4masrc0kyw666mrz8mdzvmpn9akk9fr4qa63shxxgfaq"; depends=[MASS MCMCpack optparse tmvtnorm]; }; sparseMatrixStats = derive2 { name="sparseMatrixStats"; version="1.0.5"; sha256="1jjf467q3minqc01rvmm8phkpas61k63c18iqzdrngdy9yj6kb2z"; depends=[Matrix MatrixGenerics matrixStats Rcpp]; }; - sparsenetgls = derive2 { name="sparsenetgls"; version="1.6.0"; sha256="1pn2v98d16y3y8d6x41x0srx12zz6lki4apcvsj76nz88m7kr64l"; depends=[glmnet huge MASS Matrix]; }; + sparsenetgls = derive2 { name="sparsenetgls"; version="1.6.1"; sha256="0s7qhr49j1q0iisnjc5c88v1vnvnw0hpydfgsmsl01pmhwzmzvmp"; depends=[glmnet huge MASS Matrix]; }; specL = derive2 { name="specL"; version="1.22.0"; sha256="1h0lfbqx1qsqvrwhhh16s52g1wlr9c2pkb26wbrlb3nar2514x66"; depends=[DBI protViz RSQLite seqinr]; }; spicyR = derive2 { name="spicyR"; version="1.0.1"; sha256="1dqnf39pw0d6fbxl5sz5r9zi5ns3bj0003jhm4ipckp5h4kiydqq"; depends=[BiocGenerics BiocParallel class concaveman ggplot2 IRanges lme4 lmerTest mgcv pheatmap purrr rlang S4Vectors spatstat]; }; spikeLI = derive2 { name="spikeLI"; version="2.48.0"; sha256="0s9qm44n8m03vwl66zmjhq0hpcvm8j7a9xqag7ig8kwv5n6rhzsr"; depends=[]; }; @@ -1792,7 +1792,7 @@ in with self; { splots = derive2 { name="splots"; version="1.54.0"; sha256="16a18m8q04avv46wn75pz1vkfpschhs0j1gfvmdl6dd29r82d9r4"; depends=[RColorBrewer]; }; spotSegmentation = derive2 { name="spotSegmentation"; version="1.61.0"; sha256="1fsz8xqxrc000jj1mn59ip3lx558j0589snyxvb9kkkhbc253n6c"; depends=[mclust]; }; spqn = derive2 { name="spqn"; version="1.0.0"; sha256="14z5dyi8wl03f4sc56d03z72nhyzgf7dcxq7ap5s2ch961ifyycp"; depends=[BiocGenerics ggplot2 ggridges matrixStats SummarizedExperiment]; }; - srnadiff = derive2 { name="srnadiff"; version="1.8.0"; sha256="01pxawr362wgfj0smnivjrwr3f5p8wlnhb5jrjv2hpshak2jsacg"; depends=[BiocManager BiocParallel BiocStyle DESeq2 devtools GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges Gviz IRanges Rcpp Rsamtools rtracklayer S4Vectors SummarizedExperiment]; }; + srnadiff = derive2 { name="srnadiff"; version="1.8.2"; sha256="1fsb2p44iyz0xhgvj6qmpssmynm1l22q8ccfb9rd95dh2p2pc0kl"; depends=[BiocManager BiocParallel BiocStyle DESeq2 devtools GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges Gviz IRanges Rcpp Rsamtools rtracklayer S4Vectors SummarizedExperiment]; }; ssPATHS = derive2 { name="ssPATHS"; version="1.2.0"; sha256="0n6safqhsw8490vpy1xvagx9m1am4l9y0plkq4ldds4m92g6p432"; depends=[dml MESS ROCR SummarizedExperiment]; }; sscore = derive2 { name="sscore"; version="1.60.0"; sha256="141jwdaj5kww1fb0vv6m36ai1irz4z2gqb4xzl1hvch42m5ryfkl"; depends=[affy affyio]; }; sscu = derive2 { name="sscu"; version="2.18.0"; sha256="13avxlg06r3xmirb6hgya4m5sgza66agxfm5x9y2xc93azww28js"; depends=[BiocGenerics Biostrings seqinr]; }; @@ -1828,20 +1828,20 @@ in with self; { tidybulk = derive2 { name="tidybulk"; version="1.0.2"; sha256="06yawix0whsg0knhbc1km1in1njx5lj4yq39j475imbv23wr3gjl"; depends=[dplyr lifecycle magrittr preprocessCore purrr readr rlang tibble tidyr]; }; tigre = derive2 { name="tigre"; version="1.42.0"; sha256="1ai4ygai6094shavp5s6zkczgsmkfc8sv3xad5z2hdi53lap3gvl"; depends=[annotate AnnotationDbi Biobase BiocGenerics DBI gplots RSQLite]; }; tilingArray = derive2 { name="tilingArray"; version="1.66.0"; sha256="0q2h1bgyj9sa03d8f6lyrqx336ln74zky1ijqzdrhnd1vyjdlbbf"; depends=[affy Biobase genefilter pixmap RColorBrewer strucchange vsn]; }; - timeOmics = derive2 { name="timeOmics"; version="1.0.1"; sha256="0ks7aarl88sl5x0p43x8w0i6ai64ydz86jm47vysya0mdl3apsyc"; depends=[dplyr ggplot2 ggrepel lmms lmtest magrittr mixOmics propr purrr stringr tibble tidyr]; }; + timeOmics = derive2 { name="timeOmics"; version="1.0.1"; sha256="0ks7aarl88sl5x0p43x8w0i6ai64ydz86jm47vysya0mdl3apsyc"; depends=[dplyr ggplot2 ggrepel lmtest magrittr mixOmics propr purrr stringr tibble tidyr]; }; timecourse = derive2 { name="timecourse"; version="1.60.0"; sha256="16pla2lp8agkv23pjg015dh0davwjdxhlb0npyynnnrgsbrsnxn7"; depends=[Biobase limma marray MASS]; }; timescape = derive2 { name="timescape"; version="1.12.0"; sha256="0as8viljb0ivq8ngvjqc4kli48x559amgr9v5jkmxl29bpblv2l5"; depends=[dplyr gtools htmlwidgets jsonlite stringr]; }; tkWidgets = derive2 { name="tkWidgets"; version="1.66.0"; sha256="1v335n7yb9586i43q5m3fzw3gxnyghwib66zb5z5bj9720z0h7cy"; depends=[DynDoc widgetTools]; }; - tofsims = derive2 { name="tofsims"; version="1.16.0"; sha256="0ij0nmans69hp3h6l80aqn3lhzxlfyn7gvxmc1fmikv5y15sv3ds"; depends=[ALS ChemometricsWithR KernSmooth ProtGenerics Rcpp RcppArmadillo signal]; }; + tofsims = derive2 { name="tofsims"; version="1.16.0"; sha256="0ij0nmans69hp3h6l80aqn3lhzxlfyn7gvxmc1fmikv5y15sv3ds"; depends=[ALS KernSmooth ProtGenerics Rcpp RcppArmadillo signal]; }; topGO = derive2 { name="topGO"; version="2.40.0"; sha256="13rhbvn27sj75fklf1cnjaazacx8yyjlhqlnbp5zk157q6y5cwdr"; depends=[AnnotationDbi Biobase BiocGenerics DBI GO_db graph lattice matrixStats SparseM]; }; topconfects = derive2 { name="topconfects"; version="1.4.0"; sha256="1wphsf09ji2mdhdyd4xzka4b6s8xc8kmyz7gk798796h2qr4w5s7"; depends=[assertthat ggplot2]; }; topdownr = derive2 { name="topdownr"; version="1.10.0"; sha256="0vhlic84vlq8m6npkq97r1vzppfwpyzl7q6mhw2g6kjaglp0gkyh"; depends=[Biobase BiocGenerics Biostrings ggplot2 Matrix MSnbase mzR ProtGenerics S4Vectors]; }; - trackViewer = derive2 { name="trackViewer"; version="1.24.1"; sha256="0hsqkxckjby9zidcsqplc5cync4r44akn3al2ff4iw6m2fjsf78b"; depends=[AnnotationDbi BiocGenerics GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges graph grImport Gviz htmlwidgets InteractionSet IRanges plotrix Rgraphviz Rsamtools rtracklayer S4Vectors scales]; }; + trackViewer = derive2 { name="trackViewer"; version="1.24.2"; sha256="172vxksv33f829vibdvvcl11jqv8q8kqqsnzm3kvvm1virwj6z39"; depends=[AnnotationDbi BiocGenerics GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges graph grImport Gviz htmlwidgets InteractionSet IRanges plotrix Rgraphviz Rsamtools rtracklayer S4Vectors scales]; }; tracktables = derive2 { name="tracktables"; version="1.22.0"; sha256="1r8i05wak92s9cq7jg9s5kdyx2yix973d6rpav2lc9ngnqaa485d"; depends=[GenomicRanges IRanges RColorBrewer Rsamtools stringr tractor_base XML XVector]; }; tradeSeq = derive2 { name="tradeSeq"; version="1.2.01"; sha256="1jqy2xn58j89lfsah9gvkphq9a5a8s7h6g5025r13n7ksh3whfbp"; depends=[Biobase BiocParallel clusterExperiment dplyr edgeR ggplot2 igraph magrittr mgcv monocle pbapply princurve RColorBrewer S4Vectors SingleCellExperiment slingshot SummarizedExperiment tibble]; }; transcriptR = derive2 { name="transcriptR"; version="1.16.0"; sha256="0wy5jdfivbr1wfcpi56srn7xc0gg7iz3jq21k50z48zr8f3vmmbp"; depends=[BiocGenerics caret chipseq e1071 GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges ggplot2 IRanges pROC reshape2 Rsamtools rtracklayer S4Vectors]; }; transcriptogramer = derive2 { name="transcriptogramer"; version="1.10.0"; sha256="13bjcs3wl4ky5b51p9lvlhn2a3472shkim6jjy5jhh23njvynnq1"; depends=[biomaRt data_table doSNOW foreach ggplot2 igraph limma progress RedeR snow tidyr topGO]; }; - transite = derive2 { name="transite"; version="1.6.1"; sha256="0x6490avcmxkmilsmw6q4vq79q4xfvf9xsh75mibza6cx68f8nw9"; depends=[BiocGenerics Biostrings dplyr GenomicRanges ggplot2 ggseqlogo gridExtra Rcpp RcppArmadillo scales TFMPvalue]; }; + transite = derive2 { name="transite"; version="1.6.2"; sha256="0l0yca9az9ggbd6bmwjzs4rcm6fbwi07i50fjm96gx2zapgsjx74"; depends=[BiocGenerics Biostrings dplyr GenomicRanges ggplot2 ggseqlogo gridExtra Rcpp RcppArmadillo scales TFMPvalue]; }; traseR = derive2 { name="traseR"; version="1.18.0"; sha256="0hd6483s92mby7pdzx8siil1issf1dz13f6yrpi1jzbjw16vcla5"; depends=[BSgenome_Hsapiens_UCSC_hg19 GenomicRanges IRanges]; }; treeio = derive2 { name="treeio"; version="1.12.0"; sha256="1jkd96gqcfnhvx3d4f4ba9r39nxz2fyykc9i1kgl6ac43kcnrhfp"; depends=[ape dplyr jsonlite magrittr rlang tibble tidytree]; }; trena = derive2 { name="trena"; version="1.10.2"; sha256="06d561sj2x3n9lcz9pjzrljk5lqdc4c76h27fpqjm9h2iwkkc02x"; depends=[AnnotationDbi BiocParallel biomaRt Biostrings BSgenome BSgenome_Hsapiens_UCSC_hg19 BSgenome_Hsapiens_UCSC_hg38 BSgenome_Mmusculus_UCSC_mm10 DBI GenomicRanges glmnet lassopv MotifDb org_Hs_eg_db randomForest RMySQL RPostgreSQL RSQLite SNPlocs_Hsapiens_dbSNP150_GRCh38 vbsr xgboost]; }; @@ -1854,11 +1854,11 @@ in with self; { tweeDEseq = derive2 { name="tweeDEseq"; version="1.34.0"; sha256="1xmh63nb407nvkrdgxp2gav09496pxaadw482gcbs02qk45lah42"; depends=[cqn edgeR limma MASS]; }; twilight = derive2 { name="twilight"; version="1.64.0"; sha256="1hq28bskrz4fyzcfy0zz2vjbn1dz2y3yks5rcprnq6gjhy0dgv7f"; depends=[Biobase]; }; twoddpcr = derive2 { name="twoddpcr"; version="1.12.0"; sha256="0i2084pqswhcwr8ldkw3f9d3phwi0rq5jl6b6xw7fzlmifa0l1gb"; depends=[class ggplot2 hexbin RColorBrewer S4Vectors scales shiny]; }; - tximeta = derive2 { name="tximeta"; version="1.6.2"; sha256="13wqkmqbjlw970fjmqng3c8ii6fhram30j9ajqih2m5ywfadswsa"; depends=[AnnotationDbi AnnotationHub BiocFileCache Biostrings ensembldb GenomeInfoDb GenomicFeatures GenomicRanges IRanges jsonlite Matrix rappdirs S4Vectors SummarizedExperiment tibble tximport]; }; + tximeta = derive2 { name="tximeta"; version="1.6.3"; sha256="19yacn1pmgmvj8fclz32mhm76d4qdkplfwj12bcp9492qpxyldma"; depends=[AnnotationDbi AnnotationHub BiocFileCache Biostrings ensembldb GenomeInfoDb GenomicFeatures GenomicRanges IRanges jsonlite Matrix rappdirs S4Vectors SummarizedExperiment tibble tximport]; }; tximport = derive2 { name="tximport"; version="1.16.1"; sha256="1x9959lkjl2h869rgd1b30q1idxzjkr1fyqbpndqk3kbi4q2gr40"; depends=[]; }; uSORT = derive2 { name="uSORT"; version="1.14.0"; sha256="1qsgbr4ljngl4qjdvrx7plj81alxyaqnbzy94w44agxngl8y44z6"; depends=[Biobase BiocGenerics cluster fpc gplots igraph Matrix monocle plyr RANN RSpectra VGAM]; }; unifiedWMWqPCR = derive2 { name="unifiedWMWqPCR"; version="1.24.0"; sha256="1l9gxq3askr3cz2a4bqsw7vjr1agivzvx651cblkygv57x08zf81"; depends=[BiocGenerics HTqPCR]; }; - universalmotif = derive2 { name="universalmotif"; version="1.6.3"; sha256="1iw2yq0cfpdq6fnng61x8w7z8j0qwz9x4y6n2jv641xjwpv5drdd"; depends=[ape BiocGenerics Biostrings ggplot2 ggseqlogo ggtree MASS processx Rcpp RcppThread Rdpack rlang S4Vectors yaml]; }; + universalmotif = derive2 { name="universalmotif"; version="1.6.4"; sha256="10j37wj2lyazgq32xxjrisgc8lqr17n8igmic2adgm3azc79m2q0"; depends=[ape BiocGenerics Biostrings ggplot2 ggseqlogo ggtree MASS processx Rcpp RcppThread Rdpack rlang S4Vectors yaml]; }; variancePartition = derive2 { name="variancePartition"; version="1.18.3"; sha256="1jrlhi2c5ibvq8a41g5hwdq4kk4rdd7m464rz5767zaaci7l2ay0"; depends=[Biobase BiocParallel colorRamps doParallel foreach ggplot2 gplots iterators limma lme4 lmerTest MASS pbkrtest progress reshape2 scales]; }; vasp = derive2 { name="vasp"; version="1.0.0"; sha256="1zvby4m66q61d6mjh9hlfhr2sf9iy3g83xwjd7fbxcj5vlp86piv"; depends=[ballgown cluster GenomeInfoDb GenomicAlignments GenomicRanges IRanges matrixStats Rsamtools S4Vectors Sushi]; }; vbmp = derive2 { name="vbmp"; version="1.56.0"; sha256="0vgskhxmgdfwk3dvmsh62x4sw2rqdhcckjbifbj5s8dv636jf5w8"; depends=[]; }; @@ -1875,13 +1875,13 @@ in with self; { weitrix = derive2 { name="weitrix"; version="1.0.0"; sha256="1wy2s2jgwy0gzhs3q4m1g0djmn3wxmzndxw7w460za3k2yfsh067"; depends=[assertthat BiocGenerics BiocParallel DelayedArray DelayedMatrixStats dplyr ggplot2 limma purrr reshape2 RhpcBLASctl S4Vectors scales SummarizedExperiment]; }; widgetTools = derive2 { name="widgetTools"; version="1.66.0"; sha256="0lrdpsgm9r7yfyyj5crvb7px4hrghxhmiic4iissz40slbfyvilx"; depends=[]; }; wiggleplotr = derive2 { name="wiggleplotr"; version="1.12.1"; sha256="1wknigh1md3w4h68caqlpq945maipdkpmw10hc2rlx4nbbpcnawp"; depends=[assertthat cowplot dplyr GenomeInfoDb GenomicRanges ggplot2 IRanges purrr rtracklayer S4Vectors]; }; - xcms = derive2 { name="xcms"; version="3.10.1"; sha256="1aa11gy1v7kkamv3hsnvdx715q8f1saw9p664j6wifyjj0hx13kn"; depends=[Biobase BiocGenerics BiocParallel IRanges lattice MassSpecWavelet MSnbase mzR plyr ProtGenerics RANN RColorBrewer robustbase S4Vectors SummarizedExperiment]; }; + xcms = derive2 { name="xcms"; version="3.10.2"; sha256="0sk53jcl7sjrpw2ncdpl8sw1b1j9mizlrj517rinr1qrbm6lsn8f"; depends=[Biobase BiocGenerics BiocParallel IRanges lattice MassSpecWavelet MSnbase mzR plyr ProtGenerics RANN RColorBrewer robustbase S4Vectors SummarizedExperiment]; }; xmapbridge = derive2 { name="xmapbridge"; version="1.46.0"; sha256="1qz39p1nr0j245smcng0qzraz7k9j363c48ppp5hdw076cz622m0"; depends=[]; }; xps = derive2 { name="xps"; version="1.48.0"; sha256="185cvningg3vnzvchfczjph2wlpwfmyhhnfjfigf0gis8a8asar9"; depends=[]; }; yamss = derive2 { name="yamss"; version="1.14.0"; sha256="00x2lnssgzbmhy5bb2m0f8rq2nsz3lb5xlp2vhkcagza39h3xb0c"; depends=[BiocGenerics data_table EBImage IRanges limma Matrix mzR S4Vectors SummarizedExperiment]; }; yaqcaffy = derive2 { name="yaqcaffy"; version="1.48.0"; sha256="1l0cblh9sfrsil15bjya7d8kkas8bj6klj2w3c4384njdsjsjcf0"; depends=[simpleaffy]; }; yarn = derive2 { name="yarn"; version="1.14.0"; sha256="1xdjwy1gkfg8lhgq4iwwmbi01903qljjs7yd96cvacmvgn8z6qvx"; depends=[Biobase biomaRt downloader edgeR gplots limma matrixStats preprocessCore quantro RColorBrewer readr]; }; zFPKM = derive2 { name="zFPKM"; version="1.10.0"; sha256="0scszhfqrgzhglz1a6kxfydq9dx8fqx28j3dypp91y5ah2w6mdys"; depends=[checkmate dplyr ggplot2 SummarizedExperiment tidyr]; }; - zinbwave = derive2 { name="zinbwave"; version="1.10.0"; sha256="16giyks17hv6svl9kvhgd2vp14mbg3b3bp7z16bzcjf9adhf0wi5"; depends=[BiocParallel edgeR genefilter Matrix SingleCellExperiment softImpute SummarizedExperiment]; }; + zinbwave = derive2 { name="zinbwave"; version="1.10.1"; sha256="10p3map06plf68d8xls6hdx1crqrrxwzxr1k6kgz9jhdjlcnnfgd"; depends=[BiocParallel edgeR genefilter Matrix SingleCellExperiment softImpute SummarizedExperiment]; }; zlibbioc = derive2 { name="zlibbioc"; version="1.34.0"; sha256="0j1l052jb2cwc1nifxzwknc9csagf4f2d092zs0i95dz0rma89l0"; depends=[]; }; } diff --git a/pkgs/development/r-modules/cran-packages.nix b/pkgs/development/r-modules/cran-packages.nix index 530f0dcf177a..1482a872dffd 100644 --- a/pkgs/development/r-modules/cran-packages.nix +++ b/pkgs/development/r-modules/cran-packages.nix @@ -4,7 +4,7 @@ # Rscript generate-r-packages.R cran >new && mv new cran-packages.nix { self, derive }: -let derive2 = derive { snapshot = "2020-08-19"; }; +let derive2 = derive { snapshot = "2020-12-31"; }; in with self; { A3 = derive2 { name="A3"; version="1.0.0"; sha256="017hq9pjsv1h9i7cqk5cfx27as54shlhdsdvr6jkhb8jfkpdb6cw"; depends=[pbapply xtable]; }; AATtools = derive2 { name="AATtools"; version="0.0.1"; sha256="08is383xhs2lc9wfffykcwqyl8mwcxfpk3lnvlpkp96hq9m9ikbf"; depends=[doParallel dplyr foreach magrittr]; }; @@ -19,38 +19,41 @@ in with self; { ACCLMA = derive2 { name="ACCLMA"; version="1.0"; sha256="1na27sp18fq12gp6vxgqw1ffsz2yi1d8xvrxbrzx5g1kqxrayy0v"; depends=[]; }; ACD = derive2 { name="ACD"; version="1.5.3"; sha256="1a67bi3hklq8nlc50r0qnyr4k7m9kpvijy8sqqpm54by5hsysfd6"; depends=[]; }; ACDm = derive2 { name="ACDm"; version="1.0.4"; sha256="0b4f02ga5ra66mbrm79g0bnlzmii82rks9kmxixxqgf18yhlyjil"; depends=[dplyr ggplot2 plyr Rsolnp zoo]; }; - ACEt = derive2 { name="ACEt"; version="1.8.0"; sha256="0626d6kg485xjya164wagrr5z223jvi93ywbwpdns7fkm03c0dlq"; depends=[BH MASS Rcpp RcppArmadillo]; }; + ACEsearch = derive2 { name="ACEsearch"; version="1.0.0"; sha256="1ssq8avj20dk2mal0j5dvshf7qgk0as90sgl71cn91cq8lbiilpn"; depends=[httr testthat]; }; + ACEt = derive2 { name="ACEt"; version="1.8.1"; sha256="0b5lfpnppyk0237phr2aybhx29nhm8ngwk2qa1y4lshrvsw97wg4"; depends=[BH MASS Rcpp RcppArmadillo]; }; ACNE = derive2 { name="ACNE"; version="0.8.1"; sha256="0kzapsalzw6jsi990qicp4glijh5ddnfimsg5pidgbwxg4i05grl"; depends=[aroma_affymetrix aroma_core MASS matrixStats R_filesets R_methodsS3 R_oo R_utils]; }; ACSNMineR = derive2 { name="ACSNMineR"; version="0.16.8.25"; sha256="0gh604s8qall6zfjlwcg2ilxjvz08dplf9k5g47idhv43scm748l"; depends=[ggplot2 gridExtra scales]; }; ACSWR = derive2 { name="ACSWR"; version="1.0"; sha256="195vjrkang5cl7gwsna0aq4p0h4jym9xg9yh94bnf8vq6wf8j83n"; depends=[MASS]; }; ACTCD = derive2 { name="ACTCD"; version="1.2-0"; sha256="0mzjxxr2zfdidw8ibh6w8mvpkw3q3nvngqi05g9ind26ckvk053p"; depends=[GDINA R_methodsS3]; }; - ADAPTS = derive2 { name="ADAPTS"; version="1.0.3"; sha256="12hh0l5zp0camadn0nfj5v3k3wvyp9kmq8hh4bi71g4s4ygaipbk"; depends=[ComICS DeconRNASeq doParallel e1071 foreach missForest nnls pcaMethods pheatmap preprocessCore quantmod ranger WGCNA]; }; + ADAPTS = derive2 { name="ADAPTS"; version="1.0.6"; sha256="1rfj4j5y4bxla62f25wfrcbbxjh97lj5cpfhd2i70dm1450ilksl"; depends=[ComICS doParallel e1071 foreach missForest nnls pcaMethods pheatmap preprocessCore quantmod ranger WGCNA]; }; ADCT = derive2 { name="ADCT"; version="0.1.0"; sha256="1glf83ydx4v3ld8c4gb9h3jk6srd054bis5l8k57p1ba4fnqnnpp"; depends=[mvtnorm]; }; ADDT = derive2 { name="ADDT"; version="2.0"; sha256="044bb1jw2m8vwk5q8l7rlz4kqphjvy8i9d59rjg0k5q5l9vczfrp"; depends=[coneproj Matrix nlme]; }; ADGofTest = derive2 { name="ADGofTest"; version="0.3"; sha256="0ik817qzqp6kfbckjp1z7srlma0w6z2zcwykh0jdiv7nahwk3ncw"; depends=[]; }; ADMM = derive2 { name="ADMM"; version="0.3.2"; sha256="0wxjl9pdrcrbbcl1vq48ajgqdm2m1ymaf5xcnr5sf44v50lxyqic"; depends=[doParallel foreach Matrix Rcpp RcppArmadillo Rdpack]; }; - ADMMnet = derive2 { name="ADMMnet"; version="0.1"; sha256="15f1zhgv7xai954qz2ahj4kpxyvr2svxpmybz7j43bhjpkq72dmq"; depends=[Matrix Rcpp RcppEigen]; }; + ADMMnet = derive2 { name="ADMMnet"; version="0.1.1"; sha256="1la92fwg75ylqbz00znqd0rhv5r509kgh9wwznjacppif773wp6i"; depends=[Matrix Rcpp RcppEigen]; }; ADMMsigma = derive2 { name="ADMMsigma"; version="2.1"; sha256="1943dza086s22pr0yz41wzn9cdg11x7fl9zr3w012865yj219m7l"; depends=[doParallel dplyr foreach ggplot2 Rcpp RcppArmadillo RcppProgress]; }; + ADMUR = derive2 { name="ADMUR"; version="1.0.1"; sha256="1h32vm2gs95dd339b0v7nxspig04m13wvpyri94ngcz70gl9sa79"; depends=[mathjaxr scales zoo]; }; ADPF = derive2 { name="ADPF"; version="0.0.1"; sha256="1n7302xx77ngvp9i2h582i1mqslzllcdr0bn3pl2zk9jd8k97p7n"; depends=[]; }; ADPclust = derive2 { name="ADPclust"; version="0.7"; sha256="0s47cpsjykn7imsssa9w9b6g9d1sz2yah78yqzxmh0i3lqd757c1"; depends=[cluster dplyr fields knitr]; }; + ADtools = derive2 { name="ADtools"; version="0.5.4"; sha256="0bl6wgdjhf55cxjkw2k7wd2kmkhlr1006lgs35ny1av8s7m2bwmk"; depends=[assertthat dplyr magrittr Matrix mvtnorm purrr Rcpp RcppArmadillo]; }; AEDForecasting = derive2 { name="AEDForecasting"; version="0.20.0"; sha256="16q2sn5zzvysyy3r32jnr21pbdkkn0k0sbarni6fdkx7pj27yijn"; depends=[changepoint forecast signal]; }; AEP = derive2 { name="AEP"; version="0.1.2"; sha256="07a3nlkiqbbwbd59n27sgiinlwsgfpy4mn13h41va97wlvd5zl2b"; depends=[]; }; AER = derive2 { name="AER"; version="1.2-9"; sha256="03al0jfxdbi8sqkav7gz3aqbxm32qjdnh4l93vy1jr3n2h5kjy9v"; depends=[car Formula lmtest sandwich survival zoo]; }; AEenrich = derive2 { name="AEenrich"; version="1.0.0"; sha256="1rly49n3azga6xbfjgg38387pw9mw92j37k5l7ccczay039597ax"; depends=[dplyr magrittr qvalue]; }; AF = derive2 { name="AF"; version="0.1.5"; sha256="1r87ra55g0qm2s8cgsmdwck93ia2vr8zfab3in45mxm5xc501xgk"; depends=[data_table drgee ivtools stdReg survival]; }; - AFM = derive2 { name="AFM"; version="1.2.6"; sha256="0yngk3j1wkamqzrwibn2csbn61jbdb872n0gi4d3hyhgilqzwbwf"; depends=[data_table dbscan fftwtools fractaldim ggplot2 gridExtra gstat igraph mixtools moments plyr png pracma rgl scales shiny shinyjs sp stringr]; }; + AFM = derive2 { name="AFM"; version="2.0"; sha256="1l0yd68h8vlii1437zhyrxj6fq1ghfaqclk860c25q2d055ajnqd"; depends=[data_table dbscan fftwtools fractaldim ggplot2 gridExtra gstat igraph mixtools moments plyr png pracma rgl scales shiny shinyjs sp stringr]; }; AFheritability = derive2 { name="AFheritability"; version="0.1.0"; sha256="03w0a4z2x539ykyzdxm1mfqkhzz03cg0aqvgi062jrrm5m6f57ix"; depends=[ggplot2 mvtnorm reshape2 shiny]; }; AGD = derive2 { name="AGD"; version="0.39"; sha256="0hmq684snnffc2v7vmns4ky200a6zh1ggiap03n5cvpb3nlqc6lr"; depends=[gamlss gamlss_dist]; }; - AGHmatrix = derive2 { name="AGHmatrix"; version="1.0.2"; sha256="0qipqk8p80463hfkbjnkw8ivziqj2xb15l54x52kcgbd9hl4zami"; depends=[Matrix zoo]; }; + AGHmatrix = derive2 { name="AGHmatrix"; version="2.0.0"; sha256="1hm9ak885xi6b6fzqaj5ipykwc81a1r6p68fcfhwcd2qy0cqqsvv"; depends=[Matrix zoo]; }; + AGPRIS = derive2 { name="AGPRIS"; version="1.0"; sha256="0xlaz75d19adfq79sh5aa52bzpmjqawshay2a3vw9mq8l23z64if"; depends=[Matrix matrixcalc maxLik plyr rgdal sp spacetime spdep]; }; AGSDest = derive2 { name="AGSDest"; version="2.3.2"; sha256="0f3qchvdi2n1cr8ipjj332dw8hdza58dvfk21p0c6bhmxzg7f71i"; depends=[ldbounds]; }; AGread = derive2 { name="AGread"; version="1.1.1"; sha256="0ar0cnlaxxmvn2gdydmm9vr45xjhx06kky556d17l93k0xwfvzm3"; depends=[anytime binaryLogic data_table DescTools dplyr GGIR lubridate magrittr PAutilities Rcpp reshape2 rlang seewave stringr]; }; AHM = derive2 { name="AHM"; version="1.0.1"; sha256="00r1rn7d64a18rckbxvla5yapqv00p9ajxv72fx7s6p80kfal89w"; depends=[devtools dplyr glmnet Matrix mixexp plgp quadprog tibble tidyr]; }; - AHMbook = derive2 { name="AHMbook"; version="0.2.0"; sha256="1m3xfvaqzgl3vjdcsrbrf7alzm7sxqda47pzks8qgdddsc9hcj8n"; depends=[coda mvtnorm plotrix RandomFields raster sp spdep unmarked]; }; - AICcmodavg = derive2 { name="AICcmodavg"; version="2.3-0"; sha256="092y9q80sql90nfpplm0kfpzs64nclwv4jfqzp79vgj9qprwyssd"; depends=[lattice MASS Matrix nlme survival unmarked VGAM xtable]; }; + AHMbook = derive2 { name="AHMbook"; version="0.2.2"; sha256="0js9hlpi5yw6dwc7lsff7d71x045gx4scggik352p6y2y339hhpr"; depends=[coda mvtnorm plotrix RandomFields raster sp spdep unmarked]; }; + AICcmodavg = derive2 { name="AICcmodavg"; version="2.3-1"; sha256="1c2qqizssy7jvzkndlljazk28rjq5csgawzs43gv3s9qbahpslfh"; depends=[lattice MASS Matrix nlme survival unmarked VGAM xtable]; }; AID = derive2 { name="AID"; version="2.5"; sha256="0il6qjv1gcbxdf1lknsfij4vxzc31qyp359abqzdvkzyxwgbbzsy"; depends=[ggplot2 MASS nortest psych tseries]; }; AIG = derive2 { name="AIG"; version="0.1.9"; sha256="1jnnfmcwxcv4fsdcz7jb2lgczxdwrq3qxg2bhsh1610iwz4gzii7"; depends=[dplyr magrittr mgcv rgl]; }; - AIM = derive2 { name="AIM"; version="1.01"; sha256="11lkfilxk265a7jkc1wq5xlgxa56xhg302f1q9xb7gmjnzdigb21"; depends=[survival]; }; - ALA4R = derive2 { name="ALA4R"; version="1.8.0"; sha256="0bxfpzj6993sdhh5002vmf84r6gfd46s9vjw3d58hbyrxnsiaipr"; depends=[assertthat data_table digest httr jsonlite sp stringr wellknown]; }; + ALA4R = derive2 { name="ALA4R"; version="1.9.0"; sha256="0bxsdv2spdcbll09lmayln8ald8gbkngnqxwn0q5ccjdiaavmc4f"; depends=[assertthat data_table digest httr jsonlite sp stringr wellknown]; }; ALDqr = derive2 { name="ALDqr"; version="1.0"; sha256="0gk8hxh4p0fi47sf1zsvvxxbzp38vzk60wh8hmc63phnjab6qkv4"; depends=[HyperbolicDist sn]; }; ALEPlot = derive2 { name="ALEPlot"; version="1.1"; sha256="0bakl8a7xda7vh9zsc66kkd5w5jmb5j28kfwpfq2ifvk2mrakr3w"; depends=[yaImpute]; }; ALS = derive2 { name="ALS"; version="0.0.6"; sha256="1swrn39vy50fazkpf97r7c542gkj6mlvy8gmcxllg7mf2mqx546a"; depends=[Iso nnls]; }; @@ -66,23 +69,25 @@ in with self; { AMOEBA = derive2 { name="AMOEBA"; version="1.1"; sha256="1npzh3rpfnxd4r1pj1hm214sfgbw4wmq4ws093lnl7pvsl0q37xn"; depends=[rlecuyer snowfall spdep]; }; AMORE = derive2 { name="AMORE"; version="0.2-16"; sha256="0vw6hhykg1r6xxja6d4zb2y00x7pfkmhcq9xkidz8p4arinb7xnl"; depends=[]; }; AMPLE = derive2 { name="AMPLE"; version="0.0.2"; sha256="0j19f8rl7gkads4n52l5gfc5k7dx27sswzrypwl7dnxhfp4ivql7"; depends=[dplyr ggplot2 shiny shinyjs tidyr wesanderson]; }; - AMR = derive2 { name="AMR"; version="1.3.0"; sha256="1qjdlrpx3g6011pylmdsy3vvv00xvq0vz4f1x8700daxipsnahwy"; depends=[]; }; - ANN2 = derive2 { name="ANN2"; version="2.3.3"; sha256="12l02fnnfa42qy4w1bv2zr963k61xn7mbpj9rycdzi8wl18hxrb8"; depends=[ggplot2 Rcpp RcppArmadillo reshape2 testthat viridisLite]; }; + AMR = derive2 { name="AMR"; version="1.4.0"; sha256="1mni1yxg9pgbc45n1c7rpipj3794llw674ryzrihim0h8rpgh39i"; depends=[]; }; + ANN2 = derive2 { name="ANN2"; version="2.3.4"; sha256="1izljhz3rkzq05dkvg9q3fdyj7q871j8lsky67d5r8ffpzm1lk3z"; depends=[ggplot2 Rcpp RcppArmadillo reshape2 testthat viridisLite]; }; ANOM = derive2 { name="ANOM"; version="0.5"; sha256="14nfy9xplbabfprwxz5fvx26nmqhp657vr6d90dc8vk8ds63ckiz"; depends=[ggplot2 MCPAN multcomp nparcomp SimComp]; }; ANOVAIREVA = derive2 { name="ANOVAIREVA"; version="0.1.0"; sha256="04z2g79nnh5yhn4aqw0i7ck2b1z5dbasf1zp1sj6rjjrp9aqmaa6"; depends=[car dplyr ggplot2 plotly rmarkdown shiny]; }; ANOVAShiny = derive2 { name="ANOVAShiny"; version="0.1.0"; sha256="1z8wi8c8j3rlchfk1vx101qz1r9j2jl5lfh72y5lqsisqxl2fyyz"; depends=[DescTools dplyr HH rhandsontable rmarkdown shiny]; }; + ANOVAShiny2 = derive2 { name="ANOVAShiny2"; version="0.1.0"; sha256="0bnxfg5c37wi5g53jd0zqq31yx29zvlk2m2jh6jlwki8khpp9y00"; depends=[DescTools dplyr HH rhandsontable rmarkdown shiny]; }; ANOVAreplication = derive2 { name="ANOVAreplication"; version="1.1.4"; sha256="0rq4aphjmqrr4pm55vpc8qr4rghqkmlsqsvxzarx3kmr3aqlmqg8"; depends=[quadprog shiny]; }; + AOV1R = derive2 { name="AOV1R"; version="0.1.0"; sha256="0dv7k0mifybkarpwqyla5j6cvw9dcch09wvdq09ra9bsf4vyk652"; depends=[cellranger data_table lazyeval purrr]; }; APCanalysis = derive2 { name="APCanalysis"; version="1.0"; sha256="11snn5i8zyjpzf58ica762fpp14v7x5h8a8iwx4s4v81pgvlx862"; depends=[]; }; APFr = derive2 { name="APFr"; version="1.0.2"; sha256="1vax7rfccds6qz3bi6n1h3nzl9jnxpwk331wmpsbqlk23md3m4g4"; depends=[]; }; - APIS = derive2 { name="APIS"; version="1.0.0"; sha256="1lifc1nlksprb9zjmirxkgjddd56avbp6dli93yqr9d81xasrp5p"; depends=[doParallel foreach ggplot2 gridExtra]; }; + APIS = derive2 { name="APIS"; version="1.0.1"; sha256="1af82mixamllly7v1jfvn1anpm1pafkv5mshwp6nmc27vaq201z5"; depends=[doParallel foreach ggplot2 gridExtra]; }; + APML = derive2 { name="APML"; version="0.0.1"; sha256="0qd3r6j5in0b9cz7k4pyb8qg0s5p7gvav41lm89mf4wm9gsdijpy"; depends=[DMwR dplyr dummies ggplot2 h2o pROC survival tidyverse]; }; APML0 = derive2 { name="APML0"; version="0.10"; sha256="1l6mw1mqb7qnsvfv9w6yydqjsrwrsrqx3bpifyp43cf2q71yx5gp"; depends=[Matrix Rcpp RcppEigen]; }; APPEstimation = derive2 { name="APPEstimation"; version="0.1.1"; sha256="1bg9ma4i3k3xdgyk2h4f368gqnczvlhvjw4114iznmrv1wl4g25c"; depends=[densratio]; }; - APSIM = derive2 { name="APSIM"; version="0.9.3"; sha256="1pqyy170h2s0kv7nf9v6xr8lgp8yh4psnmpi0naghjg7h72bl53k"; depends=[data_table lubridate plyr RSQLite sirad stringr]; }; APSIMBatch = derive2 { name="APSIMBatch"; version="0.1.0.2374"; sha256="0j44ijq1v1k60lka9nmw8m1jfjw7pidny9bvswqy5v82gzmwl29d"; depends=[]; }; - APfun = derive2 { name="APfun"; version="0.1.4"; sha256="0k4m3zwxcjfb1y4njig6yyjqzsvqi99zmglbfpvp65s829zxd881"; depends=[maptools raster rgdal sp]; }; + APfun = derive2 { name="APfun"; version="0.1.6"; sha256="0j54pcjzr5f8xhvp41vrl0i1hchphnij6p87j16rawp21apvnxyd"; depends=[maptools raster rgdal sp withr]; }; APtools = derive2 { name="APtools"; version="6.8.8"; sha256="171aydyd7s8qll7djl4ysy596wxdf5wfwpqwfi14jjglc9r9qrrr"; depends=[cmprsk survival]; }; AQLSchemes = derive2 { name="AQLSchemes"; version="1.7-1"; sha256="10j8qh7m975666ipgdvzrjiraqqb5rn8qj4w76s3ijl83y0v5j3v"; depends=[]; }; - AQuadtree = derive2 { name="AQuadtree"; version="1.0.1"; sha256="0k9457xyhl8h3jhkn3py48ppylyhzm466ap9rzcy6l56g16vclyk"; depends=[dplyr sp]; }; + AQuadtree = derive2 { name="AQuadtree"; version="1.0.2"; sha256="1nq2k8dkviazh09pglgla7vgvxwgckkbwx20rs8q9k0xnmsz86yz"; depends=[dplyr sp]; }; AR = derive2 { name="AR"; version="1.1"; sha256="1wn4g2997c4vc3mzq2pv8ld0ryp0i78v4zlqqryvhshxgnz4f2pr"; depends=[DISTRIB]; }; ARCensReg = derive2 { name="ARCensReg"; version="2.1"; sha256="05zjk1wxqfigzg80lvx1940a059jfdr9zbzgzmz2n01glj1lvj63"; depends=[msm mvtnorm numDeriv tmvtnorm]; }; ARCokrig = derive2 { name="ARCokrig"; version="0.1.1"; sha256="0l7z23k4bc2s295cvm3gs8kgkaawgq8g0j0r5jz1c2q2cdadh68q"; depends=[ggplot2 mvtnorm Rcpp RcppArmadillo RcppEigen]; }; @@ -93,13 +98,13 @@ in with self; { ARPobservation = derive2 { name="ARPobservation"; version="1.2.0"; sha256="1kgflalpymbsfzwg4c70mdxgrbsg8r8z44433v3y9rymhfyq9nmj"; depends=[]; }; ART = derive2 { name="ART"; version="1.0"; sha256="186w1ivj5v3h906crl953qxgai5wiznaih83dgvwgnmabs9p1wvk"; depends=[car]; }; ARTP2 = derive2 { name="ARTP2"; version="0.9.45"; sha256="12nqxry2jkl1n07rbms38mrnp39cn00d0h272d9f1z5x883flv62"; depends=[data_table Formula]; }; - ARTool = derive2 { name="ARTool"; version="0.10.7"; sha256="1qk029q5ikz33s0d1gpywdb54ljvdlyxkb9v6zrc86f5ixcc7dnd"; depends=[car dplyr lme4 magrittr plyr]; }; + ARTool = derive2 { name="ARTool"; version="0.10.8"; sha256="1m7vc6ipbhl9rbrnk77af8l5f3z36500whynmp5v8k9ayv2h5b6k"; depends=[car dplyr lme4 magrittr plyr]; }; ARpLMEC = derive2 { name="ARpLMEC"; version="1.1"; sha256="1arn9cks6jbj0rk1r915bw92ac70jfk2b13zwgk78npxbwrnm80x"; depends=[gmm lmec MASS Matrix mnormt mvtnorm numDeriv sandwich tmvtnorm]; }; ASGS_foyer = derive2 { name="ASGS.foyer"; version="0.2.1"; sha256="0f0bl1fxda012d8pgqpaqb80m0nn490xih3ddscfqgb87zgrp4sx"; depends=[sp]; }; ASIP = derive2 { name="ASIP"; version="0.4.9"; sha256="06f1nvy920vyx3bmdi77mwvfsn32xsfxaslhagnf1zh652vfkbwi"; depends=[raster rgdal stringr]; }; ASMap = derive2 { name="ASMap"; version="1.0-4"; sha256="0xnrl8jhbvbc789w5gc9dz7j7gzc7wsc94a3d2wdplrmxn186nrb"; depends=[fields gtools lattice qtl RColorBrewer]; }; ASPBay = derive2 { name="ASPBay"; version="1.2"; sha256="0b1qpyvmj7z10ixrmdxp42bj9s72c1l9rihzmv9p58f12a5aznjz"; depends=[hexbin Rcpp RcppArmadillo]; }; - ASSA = derive2 { name="ASSA"; version="1.0"; sha256="0xdmkl3qy1i6rb5wpiw6rqhz5c88zg9nav7qll235jvxwh3388xk"; depends=[]; }; + ASSA = derive2 { name="ASSA"; version="2.0"; sha256="10r5406g6i0959k1zm5h9cbwqmnyf7zy80ahiqsyrapm3g5rphxg"; depends=[]; }; ASSISTant = derive2 { name="ASSISTant"; version="1.4.2"; sha256="1vh1glk83lg010v2fc289gr6xy0dzbrqcjfva2mmaymk6v78a1w5"; depends=[dplyr knitr magrittr mvtnorm R6]; }; ASSOCShiny = derive2 { name="ASSOCShiny"; version="0.1.0"; sha256="1g1ba9d5ywd3gbwjb36xnms8l15dg1vwc6r0nsb5adhpb602xsw1"; depends=[arules arulesViz dplyr plotly rmarkdown shiny shinyMatrix]; }; AST = derive2 { name="AST"; version="0.1.0"; sha256="0z5dw5qw0i61v4796ms7pp66f9y4ylxrcls31ixzcmkklh3rcnp3"; depends=[]; }; @@ -108,23 +113,20 @@ in with self; { ATmet = derive2 { name="ATmet"; version="1.2.1"; sha256="17lzb4qnxgvlwy5zaz250mb0c4ayk509700k8mj8zf4dgv51kxa3"; depends=[DiceDesign lhs metRology msm sensitivity]; }; AUC = derive2 { name="AUC"; version="0.3.0"; sha256="0ripcib2qz0m7rgr1kiz68nx8f6p408l1ww7j78ljqik7p3g41g7"; depends=[]; }; AUCRF = derive2 { name="AUCRF"; version="1.1"; sha256="00d7jcg2dyvf7sc9w7vxxd85m7nsbcmfqsavrv236vxfpfc9yn7i"; depends=[randomForest]; }; - AUtests = derive2 { name="AUtests"; version="0.98"; sha256="0m2nl55qfwfzlf92f43b9q75xqvrlx7qzcz6qlnjbjcr80s0qj9q"; depends=[logistf]; }; - AWAPer = derive2 { name="AWAPer"; version="0.1.3"; sha256="0v753kp4acjhhfyq9492sr7x9931cq3i774yva322x4dskvk8n2w"; depends=[chron Evapotranspiration maptools ncdf4 R_utils raster sp zoo]; }; + AUtests = derive2 { name="AUtests"; version="0.99"; sha256="0ima350mjlqvij6f9xy6wfcibvlji7nh0prpqngj7apn82ri4m2k"; depends=[logistf]; }; AWR = derive2 { name="AWR"; version="1.11.189"; sha256="0q9ss6cyx8vv85zif5v4s2bkv0amhyvzbs41mjjgmwb1csg53jgd"; depends=[rJava]; }; AWR_Athena = derive2 { name="AWR.Athena"; version="2.0.7-0"; sha256="1j9bqhyk0jzry4g379ml65gwxlszn7pjif1dywgns98jbry8mavh"; depends=[rJava RJDBC]; }; AWR_KMS = derive2 { name="AWR.KMS"; version="0.1"; sha256="00aqhyqlncsv0vfcyhaazxaclwm63v5kscssash7529avdwd4gqg"; depends=[AWR jsonlite rJava]; }; AWR_Kinesis = derive2 { name="AWR.Kinesis"; version="1.7.3"; sha256="1gfjzbb8xxfd2x5zabysqi0x10sb1c9826wqw8y555nsxgksqxz8"; depends=[AWR futile_logger jsonlite rJava]; }; AbSim = derive2 { name="AbSim"; version="0.2.6"; sha256="16ddjk8b6xw80ch4jis1y751i9561wdxh0gifbf15qiz3vjckq8m"; depends=[ape poweRlaw]; }; - AbsFilterGSEA = derive2 { name="AbsFilterGSEA"; version="1.5.1"; sha256="15srxkxsvn38kd5frdrwfdf0ad8gskrd0h01wmdf9hglq8fjrp7w"; depends=[Biobase DESeq limma Rcpp RcppArmadillo]; }; Ac3net = derive2 { name="Ac3net"; version="1.2.2"; sha256="1ns4n0xxz6p34c11bj0k7nzgmyqr9mis2b0g5nfz37dbikndyqyz"; depends=[data_table]; }; AcceptanceSampling = derive2 { name="AcceptanceSampling"; version="1.0-6"; sha256="1z3rmln63ki2kik9kinbwr9qhr32ggbmh4mm3xqy6di119n47ca9"; depends=[]; }; AcousticNDLCodeR = derive2 { name="AcousticNDLCodeR"; version="1.0.2"; sha256="1fgzgwanpv2pzy74xdk3hamc44p8qch467wh163dxby8jr9ik0sb"; depends=[seewave tuneR zoo]; }; AcrossTic = derive2 { name="AcrossTic"; version="1.0-3"; sha256="03180h79jhjd66ibrnsfp3yyp2jlfysp7cymw46phzj2palghsc0"; depends=[lpSolve treeClust]; }; ActCR = derive2 { name="ActCR"; version="0.1.0"; sha256="1rrbn0l0yy8nlp9ghjya1gh0c7brbypazdy934209h3kqm17cgzv"; depends=[cosinor cosinor2 dplyr zoo]; }; ActFrag = derive2 { name="ActFrag"; version="0.1.1"; sha256="08r3gwjz4fkyy85dxqix0ffm5xyq45032qv3snnzxnlqxslxbqn1"; depends=[accelerometry dplyr ineq survival tidyr]; }; - Actigraphy = derive2 { name="Actigraphy"; version="1.4.0"; sha256="0bpmvszzv5fm72nar3wgnmfl5am7znqfajmlbv38ihkbi7jbwk20"; depends=[fda]; }; ActiveDriver = derive2 { name="ActiveDriver"; version="1.0.0"; sha256="10c7ga48fwvpd5mc4dqiyw4kc2l0iz5qn4hg7xk15r1qmm5rsipa"; depends=[MASS]; }; - ActiveDriverWGS = derive2 { name="ActiveDriverWGS"; version="1.0.1"; sha256="08l9dj8d3cd74z1dqn8n4yqykwvqjxsfa067wnxyh7xnfvvnm5v1"; depends=[Biostrings BSgenome BSgenome_Hsapiens_UCSC_hg19 GenomeInfoDb GenomicRanges IRanges plyr S4Vectors]; }; + ActiveDriverWGS = derive2 { name="ActiveDriverWGS"; version="1.1.1"; sha256="06mvakdc8d2pn91p0sr4ixc561s4ia5h1cvd1p7pqd6s50dy4say"; depends=[Biostrings BSgenome BSgenome_Hsapiens_UCSC_hg19 GenomeInfoDb GenomicRanges IRanges S4Vectors]; }; ActivePathways = derive2 { name="ActivePathways"; version="1.0.2"; sha256="1hxy760x141ykrpqdbfldq4ggj1svj3lsrpwi4rb2x7r4lna937l"; depends=[data_table ggplot2]; }; AcuityView = derive2 { name="AcuityView"; version="0.1"; sha256="0f0iclmnwdc8ixiiai4svk4x1g3pjy7dhm3cm58fv6ckx12d3d2l"; depends=[fftwtools imager plotrix]; }; AdMit = derive2 { name="AdMit"; version="2.1.5"; sha256="1gsskg3ayzyz0wa4abi20zzmkbnal6igwd6m7rafvpgzlffms1r9"; depends=[mvtnorm]; }; @@ -142,16 +144,17 @@ in with self; { AdvBinomApps = derive2 { name="AdvBinomApps"; version="1.0"; sha256="1cnmn6c2dyl8qfl7g5sqwbjb52psqxzrj1mbm06zak2y1j7j8f49"; depends=[GenBinomApps rootSolve]; }; AdvDif4 = derive2 { name="AdvDif4"; version="0.7.18"; sha256="1xdbk7w55cb2fh0mqlyrkdpnglrs55kyvvp32anvf2nw3ssrfmy7"; depends=[]; }; AeRobiology = derive2 { name="AeRobiology"; version="2.0.1"; sha256="14d5gjx53v2wfij8m4br0k7lfi6x2frc8ny1li4g8c05qv2dvnbb"; depends=[circular data_table dplyr ggplot2 ggvis lubridate plotly scales tidyr writexl zoo]; }; - AggregateR = derive2 { name="AggregateR"; version="0.0.2"; sha256="15gxzs3baa6f1rqwv7s7k6zybx0za1mpzc7db1n47jy9rbh2yxb2"; depends=[dummy]; }; + AggregateR = derive2 { name="AggregateR"; version="0.1.1"; sha256="1s2q888bqx6ilisv5s4g8ryja97nz6cz4ycm4sw1i63l5wjrwljc"; depends=[data_table NCmisc tibble]; }; AgreementInterval = derive2 { name="AgreementInterval"; version="0.1.1"; sha256="1bvinzylvsaipa8mq15f45b6h37znavlrdl0rbrx1pqw52r7z8kv"; depends=[psych]; }; - AhoCorasickTrie = derive2 { name="AhoCorasickTrie"; version="0.1.0"; sha256="0k2lcyxfsavis9g1g5293f0mw7f6jakkr11wkkjvxdlnba9c80r8"; depends=[Rcpp]; }; + AhoCorasickTrie = derive2 { name="AhoCorasickTrie"; version="0.1.2"; sha256="0zh3y5jd8m0xbj6lqr01zvwj9qd1xr3iq7vd6sgr3g3qh4kqm5pq"; depends=[Rcpp]; }; + AirSensor = derive2 { name="AirSensor"; version="1.0.2"; sha256="01fnsn8g9d99mvrp9kyjvfd2m4d7gh21n8v2yi93i1g4fwp3dmj7"; depends=[countrycode cowplot dplyr dygraphs geodist geosphere GGally ggmap ggplot2 gridExtra httpcode httr jsonlite leaflet lubridate magrittr MazamaCoreUtils MazamaLocationUtils MazamaSpatialUtils openair PWFSLSmoke RColorBrewer readr rlang scales seismicRoll sp stringr tibble tidyr tidyselect worldmet xts zoo]; }; Ake = derive2 { name="Ake"; version="1.0"; sha256="1dj598xfdyjqvysc39a0d5gizgk367c5lkddmwmsqa8zjmvpr15a"; depends=[]; }; AlgDesign = derive2 { name="AlgDesign"; version="1.2.0"; sha256="0ammlg148gk0p24fh700116nd66636np0jb1wwh0axq5jphwk1pz"; depends=[]; }; AlgebraicHaploPackage = derive2 { name="AlgebraicHaploPackage"; version="1.2"; sha256="1krm5cx609sv2p0g3xm5jaiqs9li06v717lw7ywjvx7myc9x4c07"; depends=[]; }; AllPossibleSpellings = derive2 { name="AllPossibleSpellings"; version="1.1"; sha256="0ksfm2pfjka3yjgcd257v7sns1niaylsfxvhhh2jwdi016cpdw10"; depends=[]; }; AlleleRetain = derive2 { name="AlleleRetain"; version="2.0.2"; sha256="0b6h5giskqbjbrk8nf29i75wrhxsjw1c87laiqzrpbp9n717bl20"; depends=[]; }; AlphaPart = derive2 { name="AlphaPart"; version="0.8.1"; sha256="0gmiwx6f1bzyakz6yz9bk25xlys7rlapglrqv5qkmn4l4ddqyhwq"; depends=[directlabels gdata ggplot2 pedigree Rcpp reshape]; }; - AlphaSimR = derive2 { name="AlphaSimR"; version="0.12.2"; sha256="0cfz2dh6qdyi8nj81dyy2g26xhwn8l6cfr0r7q6bm0ci21vmcwl0"; depends=[BH R6 Rcpp RcppArmadillo]; }; + AlphaSimR = derive2 { name="AlphaSimR"; version="0.13.0"; sha256="0rhdj7gy8k6nfdczg1y5xa0lhjmsxr9g7cpd0z68mxdzycrchhvl"; depends=[BH R6 Rcpp RcppArmadillo]; }; AlphaVantageClient = derive2 { name="AlphaVantageClient"; version="0.0.1"; sha256="095m850v945lw7i3qd812p28srdb5hdk9h52zf6bkr166zai1ni0"; depends=[httr xts]; }; Amelia = derive2 { name="Amelia"; version="1.7.6"; sha256="1shvc8x1kmb0cincgggsv5c5w25k36kqvisdqd3ayy5g98vqvh33"; depends=[foreign Rcpp RcppArmadillo]; }; AmericanCallOpt = derive2 { name="AmericanCallOpt"; version="0.95"; sha256="1nhy44j5bmmjsp6g79nrn741rzzxikhdnxk4wwbdj9igcc1bs573"; depends=[]; }; @@ -162,14 +165,15 @@ in with self; { AmpliconDuo = derive2 { name="AmpliconDuo"; version="1.1.1"; sha256="0vw06x47vc0dqzafgpkn4abdsrhxfs9dq8nnrr2pl49skj5n4hks"; depends=[ggplot2 xtable]; }; AmyloGram = derive2 { name="AmyloGram"; version="1.1"; sha256="1xdi3i3nw4fzj4d040r55f0gid72gy3vbz5nbdrvapl97zk3kp8c"; depends=[biogram ranger seqinr shiny]; }; AnDE = derive2 { name="AnDE"; version="1.0"; sha256="1yil8ab50wvlqmdla9kmfba8vfgy5r694r6igb58s6vnmld78yf2"; depends=[discretization foreign functional stringr]; }; - AnaCoDa = derive2 { name="AnaCoDa"; version="0.1.3.0"; sha256="1aps8fnh2d4vw5c9ypmgqnvwqzkjjfrmm7wq4xcy6lmlqks35zdv"; depends=[mvtnorm Rcpp]; }; - AnalyzeFMRI = derive2 { name="AnalyzeFMRI"; version="1.1-21"; sha256="1gn0ixxi42rw8vr4ykl232cmdcc1qqbbivhw3n8f20jgicwg8x06"; depends=[fastICA R_matlab tkrplot]; }; + AnaCoDa = derive2 { name="AnaCoDa"; version="0.1.4.4"; sha256="1b03bxysvw9v4j3bzsmrjf5ci06v6s83ix89qxy73ba5akf2gb7h"; depends=[mvtnorm Rcpp VGAM]; }; + AnalyzeFMRI = derive2 { name="AnalyzeFMRI"; version="1.1-23"; sha256="0i4llbd0h266y26j1skkgmlsbvg4imka5zyd951n2bl1zr7wlds2"; depends=[fastICA R_matlab]; }; AncestryMapper = derive2 { name="AncestryMapper"; version="2.0"; sha256="1fr2y1a5rn7rq8aly94f618kywix32jwysi70nfhaqx8hf4zzprb"; depends=[svd]; }; - Andromeda = derive2 { name="Andromeda"; version="0.3.2"; sha256="1irkfhxz12m343a8lw0g0r6xvmgzm636kqcv1wygmdzzz9mf554c"; depends=[cli DBI dbplyr dplyr pillar RSQLite tidyselect zip]; }; + AnchorRegression = derive2 { name="AnchorRegression"; version="0.1.1"; sha256="1inv40r39f3lakvaxsrr7ffqfym6yzsnc088w1mv7y087218bz1w"; depends=[glmnet selectiveInference]; }; + Andromeda = derive2 { name="Andromeda"; version="0.4.0"; sha256="05zp89ns9adh9ffyk8lswiydzdm2pinzslrxzg82j4c16q9k94h5"; depends=[cli DBI dbplyr dplyr pillar rlang RSQLite tidyselect zip]; }; AnglerCreelSurveySimulation = derive2 { name="AnglerCreelSurveySimulation"; version="1.0.2"; sha256="1nhd0i30g5wb5jh96gfaa0lgnbnj0m2vy4gz7v2c3142396zalnx"; depends=[dplyr ggplot2]; }; AnimalHabitatNetwork = derive2 { name="AnimalHabitatNetwork"; version="0.1.0"; sha256="1bhqypkiw5v9w26jbdmhndqj5hjfmf7zwivrq2hgs0zcjxwa8gfn"; depends=[ggplot2 igraph]; }; AnnotLists = derive2 { name="AnnotLists"; version="1.2"; sha256="1g2khb2ggniwg2zcjamsm3bxyrl2zabvk540b5vyy9am9k83m1g9"; depends=[]; }; - AnnotationBustR = derive2 { name="AnnotationBustR"; version="1.2"; sha256="1r52qry6xvn79b6qsbch35jhzg8y71kxqq9xm6gd302cv2xbwq7q"; depends=[ape seqinr]; }; + AnnotationBustR = derive2 { name="AnnotationBustR"; version="1.3.0"; sha256="1q5yxzzmzvw1r64r4y0xh1fiyhaqbx5q4lzpawqaggra4w9igdl8"; depends=[ape seqinr]; }; AnnuityRIR = derive2 { name="AnnuityRIR"; version="1.0-0"; sha256="0yvfqzwhm5nhywfhzkxkfm07c0qi6z21j1cdaypz89qn567aj1d9"; depends=[actuar EnvStats fitdistrplus mc2d tseries]; }; AntAngioCOOL = derive2 { name="AntAngioCOOL"; version="1.2"; sha256="1krwms0y3xppc2y4m0az51wcbh4jq7mlr0jwinp66w8gh4k3qnp2"; depends=[caret rJava rpart RWeka]; }; AntWeb = derive2 { name="AntWeb"; version="0.7"; sha256="1ykfg3zzjdvjppr2l4f26lx00cn5vaqhhz1j1b5yh113ggyl40qw"; depends=[assertthat httr leafletR plyr rjson]; }; @@ -183,10 +187,10 @@ in with self; { ArCo = derive2 { name="ArCo"; version="0.3-1"; sha256="1afjdmcalx3m19jlvqs83fg5qlds59l5zzg3pzk13qk31r0hz7mk"; depends=[boot glmnet Matrix]; }; ArDec = derive2 { name="ArDec"; version="2.0"; sha256="14niggcq7xlvpdhxhy8j870gb11cpk4rwn9gwsfmcfvh49g58i80"; depends=[]; }; ArchaeoChron = derive2 { name="ArchaeoChron"; version="0.1"; sha256="1qma2432mm73h72g9ah1k02wlcb6yrhc6mpai9nj7v58s126ffxn"; depends=[ArchaeoPhases Bchron coda rjags]; }; - ArchaeoPhases = derive2 { name="ArchaeoPhases"; version="1.4.5"; sha256="1i7xpxm8mj1vfn6yc4rz566vssjdvpgi3pnk6xdrbhk83hgi4gn3"; depends=[coda DT ggalt ggplot2 ggthemes hdrcde readr shiny shinythemes toOrdinal]; }; + ArchaeoPhases = derive2 { name="ArchaeoPhases"; version="1.5"; sha256="1jp5ip595vvni1iqqm5wiqmqw9g2d1vvvwl06cr8qj8yh4n6xsfw"; depends=[coda digest dplyr DT ggalt ggplot2 ggthemes gplots hdrcde magrittr readr reshape2 shiny shinythemes tibble toOrdinal]; }; ArchaeoPhases_dataset = derive2 { name="ArchaeoPhases.dataset"; version="0.1.0"; sha256="1bwfw3azhz4cbcinimj1nnmz04zw4lmn3bh419w73jmcswqrym0n"; depends=[]; }; ArgumentCheck = derive2 { name="ArgumentCheck"; version="0.10.2"; sha256="0mgx7mzbg2wynixcf9hvs0i9p4zka7c3chrfvjmvvvwwgsy24hkc"; depends=[]; }; - Arothron = derive2 { name="Arothron"; version="1.1.1"; sha256="18vman573mss704v5rqa13vq5nwlbdrg1j5b4wc441782znm34y3"; depends=[abind alphashape3d compositions doParallel foreach geometry Morpho rgl Rvcg stringr vegan]; }; + Arothron = derive2 { name="Arothron"; version="2.0.1"; sha256="10gfw64y34dvds72s1fj2dphm18nc3xrnvadxarq89aaxsknil3h"; depends=[abind alphashape3d compositions doParallel foreach geometry Morpho rgl Rvcg stringr vegan]; }; ArrayBin = derive2 { name="ArrayBin"; version="0.2"; sha256="0jlhcv2d7pmqi32w71nz063ri1yj4i4isr3msnw7ckzvi9r42jwm"; depends=[SAGx]; }; AsioHeaders = derive2 { name="AsioHeaders"; version="1.16.1-1"; sha256="0hp08v6if476745v2mk9k2sp1ikiac94fcnp8v9jdcyx954fqqlq"; depends=[]; }; AssetCorr = derive2 { name="AssetCorr"; version="1.0.3"; sha256="0xcyj9xw895p4j03j9c76k7ylhkmf777akg4m90av12ad05njjbv"; depends=[boot ggplot2 mvQuad mvtnorm numDeriv Rdpack VineCopula]; }; @@ -205,18 +209,19 @@ in with self; { Autoplotprotein = derive2 { name="Autoplotprotein"; version="1.1"; sha256="13mxqmhhdiq7mz4m6nx39dsq7x3bm8fsgskswx48vsq6x2k6byxa"; depends=[ade4 plotrix plyr seqinr XML]; }; AutoregressionMDE = derive2 { name="AutoregressionMDE"; version="1.0"; sha256="1dmg0q4sp2d2anzhw2my8xjhpyjsx0kf7r202q5bkw8yr57jnhvr"; depends=[]; }; Autoseed = derive2 { name="Autoseed"; version="0.1.0"; sha256="0xr3sjfccvp8h18jqxzajb2pfn4nm8q9maic6k9zzr15fxvphiy5"; depends=[]; }; - AzureAuth = derive2 { name="AzureAuth"; version="1.2.4"; sha256="0f0skabl51xv72c3cvj4nd8l686hvqakh0gpghs8fnay1qbh78gg"; depends=[httr jose jsonlite openssl R6 rappdirs]; }; - AzureCognitive = derive2 { name="AzureCognitive"; version="1.0.0"; sha256="1yg8fq77fbgf21dg9zq7kkgqyx6ax9ma46yv1nhnvdhc3dpvax5a"; depends=[AzureAuth AzureRMR httr jsonlite]; }; - AzureContainers = derive2 { name="AzureContainers"; version="1.3.0"; sha256="08n878lxwxsp0sra0y44qzwb813rfbpcj6sl779nlkhfmjk66pz8"; depends=[AzureGraph AzureRMR httr openssl processx R6]; }; - AzureGraph = derive2 { name="AzureGraph"; version="1.1.1"; sha256="15l6bl7w8d4kq0kmhywmncyrdx5zmgyprd4m8ikraxk5xkrhf4c2"; depends=[AzureAuth httr jsonlite openssl R6]; }; - AzureKeyVault = derive2 { name="AzureKeyVault"; version="1.0.3"; sha256="06lz7cg3f9qrl9nzi54fsx37gm517skjl0jn1fwq4s4b07p4klia"; depends=[AzureAuth AzureGraph AzureRMR httr jose jsonlite openssl R6]; }; + AzureAuth = derive2 { name="AzureAuth"; version="1.2.5"; sha256="10lwfnsl08s6l0c1ll1pdysznkaj2xxizi3bny99zlvl4phqxgy5"; depends=[httr jose jsonlite openssl R6 rappdirs]; }; + AzureCognitive = derive2 { name="AzureCognitive"; version="1.0.1"; sha256="1mn3qw5g77x24qyhybhn1p3h4s9ymdafrj35i24f32ncr5abnd2f"; depends=[AzureAuth AzureRMR httr jsonlite]; }; + AzureContainers = derive2 { name="AzureContainers"; version="1.3.1"; sha256="1ms576p6g0lkm3b7jzj9b6b0phdrz4z8ws1nsrvdhn13s33zwrzi"; depends=[AzureGraph AzureRMR httr openssl processx R6]; }; + AzureGraph = derive2 { name="AzureGraph"; version="1.1.2"; sha256="0ghhv6ifpgwc3gbwvsp5dz6qfci3xwd99r3wfzjh1cdan09i7l6m"; depends=[AzureAuth httr jsonlite openssl R6]; }; + AzureKeyVault = derive2 { name="AzureKeyVault"; version="1.0.4"; sha256="0b56z3b2f6l58gy2z3zy3sx3kpagvywr8dasl65qvg4ha6wbz3xg"; depends=[AzureAuth AzureGraph AzureRMR httr jose jsonlite openssl R6]; }; AzureKusto = derive2 { name="AzureKusto"; version="1.0.6"; sha256="02wj1nzbs9l6aapk94p89gahbffmk3gy80l57bd1l0afpw0y3jr8"; depends=[AzureAuth AzureRMR DBI dplyr httr jsonlite openssl R6 rlang tibble tidyselect]; }; - AzureQstor = derive2 { name="AzureQstor"; version="1.0.0"; sha256="0cdzslsb00wpg2di9nm444iwaizk9if4irx2q8gj6hrhn8sp0qn9"; depends=[AzureRMR AzureStor httr openssl]; }; - AzureRMR = derive2 { name="AzureRMR"; version="2.3.5"; sha256="0q0611ddmq7d6hxl6cyrii5mnc019zl6z70r83rmynjymznbjar9"; depends=[AzureAuth AzureGraph httr jsonlite R6 uuid]; }; - AzureStor = derive2 { name="AzureStor"; version="3.2.3"; sha256="137jcv5gm2wd40w787r00y98kby03s7ah8jmk2dxhl1681055ykg"; depends=[AzureRMR httr mime openssl R6 xml2]; }; - AzureVM = derive2 { name="AzureVM"; version="2.2.1"; sha256="08mw3x60xqa6by1mzr0axf3vidwncxli29cd5ss0kvf8pmvlir0z"; depends=[AzureRMR jsonlite R6]; }; - AzureVMmetadata = derive2 { name="AzureVMmetadata"; version="1.0.0"; sha256="0k99ncp9zkyxl0r51041rfgq49gb65f5d3yc89d1gg2aqavk3g2y"; depends=[httr openssl]; }; - AzureVision = derive2 { name="AzureVision"; version="1.0.1"; sha256="0wfnq77rn10wpj0d3s8mbpybc3dgvjc4f3lhgalabif4h11zgz9c"; depends=[AzureCognitive AzureRMR httr]; }; + AzureQstor = derive2 { name="AzureQstor"; version="1.0.1"; sha256="1z7j8kakiarpw3q2rii7gl9zc2nsb49nzs1nxg1hgfyvcdhw2fcg"; depends=[AzureRMR AzureStor httr openssl]; }; + AzureRMR = derive2 { name="AzureRMR"; version="2.3.6"; sha256="0ck7g1idrpkqsv1qdhlb98i45jslgj242l7mk5k06dcmqa17q2wx"; depends=[AzureAuth AzureGraph httr jsonlite R6 uuid]; }; + AzureStor = derive2 { name="AzureStor"; version="3.3.0"; sha256="1qb1cl1wndx330gyd9w62gbr9kkrfivwn7ywb97lwkp8b7yhqpsm"; depends=[AzureRMR httr mime openssl R6 xml2]; }; + AzureTableStor = derive2 { name="AzureTableStor"; version="1.0.0"; sha256="0xrfpi9psn1h21g4mvcbqsjav56s8cha381vsjkp1swilrxhmk5l"; depends=[AzureRMR AzureStor httr jsonlite openssl uuid vctrs]; }; + AzureVM = derive2 { name="AzureVM"; version="2.2.2"; sha256="0766a4y17qgq3vgb398n6zn8sdjrv65gpvrnr9b9g89zdsdy9fc4"; depends=[AzureRMR jsonlite R6]; }; + AzureVMmetadata = derive2 { name="AzureVMmetadata"; version="1.0.1"; sha256="15ghijzva6qzq2riq8ci4bh6ssknnp15yyy1fql0k4878wkf7vs0"; depends=[httr openssl]; }; + AzureVision = derive2 { name="AzureVision"; version="1.0.2"; sha256="0a4lnj60577bxy5vyd7yqji984kgwpwd4zykxz2d060r8l31rf42"; depends=[AzureCognitive AzureRMR httr]; }; BACA = derive2 { name="BACA"; version="1.3"; sha256="1vbip7wbzix1s2izbm4058wmwar7w5rv3q8bmj9pm7hcapfi19k0"; depends=[ggplot2 RDAVIDWebService rJava]; }; BACCO = derive2 { name="BACCO"; version="2.0-9"; sha256="0i1dnk0g3miyv3b60rzgjjm60180wxzv6v2q477r71q74b0v0r1y"; depends=[approximator calibrator emulator]; }; BACCT = derive2 { name="BACCT"; version="1.0"; sha256="0bpm4l27vbblzi2hhfbjw2af3ic2jbnyghkvchpq8ww43k8068iv"; depends=[ggplot2 reshape2 rjags]; }; @@ -231,15 +236,16 @@ in with self; { BANOVA = derive2 { name="BANOVA"; version="1.1.8"; sha256="1xa0mp6m78w07a70ii8cbmlsx0qhqm09pczmwb085f4l6bqc8d16"; depends=[coda rjags rstan runjags]; }; BAREB = derive2 { name="BAREB"; version="0.1.0"; sha256="1h3bgfxbs489cywgblrpl8jjhgs1krimdvv6fryjnc9rhw1mymdr"; depends=[Rcpp RcppArmadillo]; }; BARIS = derive2 { name="BARIS"; version="1.1.1"; sha256="1h1zrgpn69nvz61567c08vfynmzy70g31a37wp4p6g8wri1hr7xg"; depends=[checkmate data_table downloader dplyr httr janitor jsonlite magrittr memoise miniUI rgdal rio rstudioapi sf shiny stringi stringr XML]; }; - BART = derive2 { name="BART"; version="2.7"; sha256="16klaqzp525da6swlcdcr13mjlm88zpqyqnzjk6l4nlcwa3b7z1m"; depends=[nlme nnet Rcpp survival]; }; + BART = derive2 { name="BART"; version="2.8"; sha256="05vh4bzbimf81dcpdzvrylfl78p6mviapzwha1420hprfq9zgvzc"; depends=[nlme nnet Rcpp survival]; }; BAS = derive2 { name="BAS"; version="1.5.5"; sha256="1iakx36r4lnl6xs77m9mfcj5w3mb4g482s2mpzq65v69k10nj8lj"; depends=[]; }; BASIX = derive2 { name="BASIX"; version="1.1"; sha256="18dkvv1iwskfnlpl6xridcgqpalbbpm2616mvc3hfrc0b26v01id"; depends=[]; }; - BASS = derive2 { name="BASS"; version="1.2.0"; sha256="00fww6nwfq8di21ja5y4fl2ria5p9a80x58xz43im20iz1f83i28"; depends=[gsl truncdist]; }; + BASS = derive2 { name="BASS"; version="1.2.2"; sha256="14zimfdkpsil22n1z4ldpi9smmja5kf7qqlklr5sr7y5avnh0hd9"; depends=[hypergeo truncdist]; }; BASiNET = derive2 { name="BASiNET"; version="0.0.4"; sha256="0pmn4znqhpav729ai7zr027a7sx6bz2lmlk086crmwm1fnwipqq4"; depends=[Biostrings igraph randomForest rJava rmcfs RWeka]; }; - BAT = derive2 { name="BAT"; version="2.1.0"; sha256="1mhspbgn860vkysncz0cd62jgq2i8vr3gzkivmaq04fb2glh36ns"; depends=[hypervolume nls2 raster spatstat vegan]; }; + BAT = derive2 { name="BAT"; version="2.4.1"; sha256="1swi3r99200bg4hmpf075y2zfmdf8r5wcnmyz1fwr1l82w4mfgds"; depends=[geometry hypervolume nls2 raster spatstat vegan]; }; BAYSTAR = derive2 { name="BAYSTAR"; version="0.2-9"; sha256="0crillww1f1jvhjw639sf09lpc3wpzd69milah143gk9zlrkhmz2"; depends=[coda mvtnorm]; }; BAwiR = derive2 { name="BAwiR"; version="1.2.4"; sha256="19iphlhas0d5hyjv00761zbdxx1ijycrnswww5sczr30r5dkacp8"; depends=[Anthropometry dplyr ggplot2 ggthemes hrbrthemes httr lubridate magrittr plyr purrr reshape2 rvest rworldmap scales stringi stringr tibble tidyr xml2]; }; BB = derive2 { name="BB"; version="2019.10-1"; sha256="0kf9sfsm3n036a8a8gjfpc9qdryvadb019kqjh80n1szdv7bdl04"; depends=[quadprog]; }; + BBEST = derive2 { name="BBEST"; version="0.1-8"; sha256="0j3ykxsmxima75h40mhqm32l2ffc27pk11rfzjyvv1cm6q2q3gbh"; depends=[aws DEoptim ggplot2 reshape2 shiny]; }; BBI = derive2 { name="BBI"; version="0.3.0"; sha256="167sndfp3776p8n9zdpihc9xhqqi8wygzpl49dzkfj53gwa77rnn"; depends=[vegan]; }; BBMM = derive2 { name="BBMM"; version="3.0"; sha256="1cvv786wf1rr5906qg1di2krrv5jgw3dnyl8z2pvs8jyn0kb3fkj"; depends=[]; }; BBMV = derive2 { name="BBMV"; version="2.1"; sha256="11d4wd1zx99hrhwagw73jkk088rz5vgkjml6mckssc2iqvhj1dc9"; depends=[ape]; }; @@ -257,57 +263,60 @@ in with self; { BCHM = derive2 { name="BCHM"; version="1.00"; sha256="1nyf65grcyf74sixixzl12gylk2rzh7n5id4mbhim4lzdm4j272i"; depends=[cluster coda crayon knitr plyr rjags]; }; BCRA = derive2 { name="BCRA"; version="2.1.2"; sha256="17h0ara1y3fh2xyhjarbw3b549v6kq108bg946ndh7kjykara9dd"; depends=[]; }; BCSub = derive2 { name="BCSub"; version="0.5"; sha256="0c8dlxsx23qfyygmajg2amj78ax01kb3808d9hvy7g3hkgp2i2fp"; depends=[MASS mcclust nFactors Rcpp RcppArmadillo]; }; + BCT = derive2 { name="BCT"; version="1.1"; sha256="058iir5mhgc7zy1nha8g6299ya9jvg1skxj3flgn3b97snjx5qky"; depends=[igraph Rcpp stringr]; }; BCellMA = derive2 { name="BCellMA"; version="0.3.4"; sha256="1njprs7ksv0w18ffs0agz0290aa2akw48225iaa3bjhbl08dpidl"; depends=[ggplot2 reshape2]; }; BCgee = derive2 { name="BCgee"; version="0.1"; sha256="0ad0dj2ymgvkmcmq3jlpmn0pgigdql0xgvcwsbpdydv33a6snr04"; depends=[]; }; BClustLonG = derive2 { name="BClustLonG"; version="0.1.3"; sha256="1p6fm60vhs9l3b120h2l7nz4rf4ckhka7124kzwjd7znax2a336g"; depends=[lme4 MASS mcclust Rcpp RcppArmadillo]; }; BDEsize = derive2 { name="BDEsize"; version="1.2"; sha256="1b2lms4nmn6gfjmnjq1vq1g3s1ikv7pl4xpbsxfrph14g6awidax"; depends=[fpow ggplot2 shiny shinyalert]; }; BDP2 = derive2 { name="BDP2"; version="0.1.3"; sha256="14m85sigx6hk0qzhfgih43m2lxp9xczmp9g3z4pping6msbnbdrz"; depends=[rmarkdown shiny shinyBS]; }; BDWreg = derive2 { name="BDWreg"; version="1.2.0"; sha256="07j6dy69q1as1nwgp2790wzpzmjich2256cddhl7n3h2rs1dja74"; depends=[coda doParallel DWreg foreach MASS]; }; - BDgraph = derive2 { name="BDgraph"; version="2.62"; sha256="1b1vfar940swvn3pcil848qsp8ji50fjjll8jjzp6y2adx0f8pby"; depends=[igraph]; }; - BE = derive2 { name="BE"; version="0.1.1"; sha256="1ldzj1fvbgmnp0cn7g348md2xskm2q5b7y6l1sm3pa2am8jc7ixa"; depends=[rtf]; }; + BDgraph = derive2 { name="BDgraph"; version="2.63"; sha256="05q6dbvdnxmh7myvw60zqcqx16f80i8d6qa4y7xnfkx02l9lwiyc"; depends=[igraph]; }; + BE = derive2 { name="BE"; version="0.1.2"; sha256="0y67jvlakpga21r0gxmbp0kdmnvcvikgnjsi5g715vh79612sbb2"; depends=[rtf]; }; BEACH = derive2 { name="BEACH"; version="1.3.1"; sha256="0biq6c74k8vb8ykafzf3blyi08rp65x1vaw3bfpwdc1ihc9wrgjr"; depends=[devtools DT haven plyr rJava rtf sas7bdat shiny WriteXLS xtable]; }; BEDASSLE = derive2 { name="BEDASSLE"; version="1.5"; sha256="1bz3lr0waly9vj9adwhmgs3lq7zjdkcbvm3y9rnn72qlrwmv5fbn"; depends=[emdbook MASS matrixcalc]; }; BEDMatrix = derive2 { name="BEDMatrix"; version="2.0.3"; sha256="1pq333x1shxw3wcqgcb4gqg6rwa0hyc24rib235q4zg10r2gyrbm"; depends=[crochet]; }; - BENMMI = derive2 { name="BENMMI"; version="4.3-6"; sha256="07jmf4icij8yb83bf7x0vsaf60gcvdzaijjckv5400xjykpm7scm"; depends=[benthos dplyr ggplot2 jsonlite knitr markdown purrr readr tidyr xtable]; }; + BENMMI = derive2 { name="BENMMI"; version="4.3-7"; sha256="1v96g4l1zkpvvx8jdifnafyaz4ml8v1bxbl97r1n5n6mgw88gk77"; depends=[benthos dplyr ggplot2 jsonlite knitr markdown purrr readr tidyr xtable]; }; BEST = derive2 { name="BEST"; version="0.5.2"; sha256="0mx5j6hxxvs9mc2ss2wyavdylh857833bsci3yi6lljidv9g28zc"; depends=[coda HDInterval rjags]; }; BESTree = derive2 { name="BESTree"; version="0.5.2"; sha256="0yij6xdlvhbqifckaylgbhszwwp38d9x6vbpr1nl40mwwnv4bswz"; depends=[plyr]; }; + BET = derive2 { name="BET"; version="0.2.0"; sha256="04dx2338ahkhxwc69cvv5vpy70q48prbf79pmrxwiw6xbbn265bs"; depends=[Rcpp]; }; BETS = derive2 { name="BETS"; version="0.4.9"; sha256="0daixk7mqmk2jq35i7mjaslz11gxbnnjgwxfvj8x1s88vz9l74sm"; depends=[DBI digest dplyr DT dygraphs forecast foreign ggplot2 grnn htmltools httr lubridate miniUI plotly rjson rmarkdown RMySQL rstudioapi rvest seasonal shiny sqldf stringr urca webshot xml2 zoo]; }; BFS = derive2 { name="BFS"; version="0.2.5"; sha256="0qcqgxzj00n04p20w6hm60lcnccl2mpbxn9mri0x0wdad587jfgi"; depends=[janitor magrittr pins progress purrr pxR rvest tibble xml2]; }; - BFpack = derive2 { name="BFpack"; version="0.2.1"; sha256="1ar1b6sfsd8j7q5pay3a0arlkiff0qvzng7m3ccwhw8i0gffkvs2"; depends=[bain lme4 MASS Matrix mvtnorm pracma]; }; + BFpack = derive2 { name="BFpack"; version="0.3.1"; sha256="1bzcbpb1wwln0panpfgbkqfqnls002z229nqhkb5f9m5gyi78rv4"; depends=[bain extraDistr lme4 MASS Matrix mvtnorm pracma]; }; BGData = derive2 { name="BGData"; version="2.2.0"; sha256="1pn8vwpinn6l6h3lsfpszrp0m2wc3896pi408rjxk8ali0np0182"; depends=[BEDMatrix bigmemory bit crochet ff LinkedMatrix symDMatrix synchronicity]; }; BGGE = derive2 { name="BGGE"; version="0.6.5"; sha256="1h76c40y45xhf2vp9g0q5j9lfwh16q9axbk5c9aqn4md008xr1j2"; depends=[]; }; - BGGM = derive2 { name="BGGM"; version="2.0.2"; sha256="0z3vgmc92x3ch8gkddgqc4m7libxi7zddmbx0hhawr7amfhqmfgg"; depends=[BFpack GGally ggplot2 ggridges MASS mvnfast network Rcpp RcppArmadillo RcppDist RcppProgress Rdpack reshape sna]; }; + BGGM = derive2 { name="BGGM"; version="2.0.3"; sha256="0nybs1x2as01cnpqakls1v63y9c6sj074s5cfkhahaaipig1ivp8"; depends=[BFpack GGally ggplot2 ggridges MASS mvnfast network Rcpp RcppArmadillo RcppDist RcppProgress Rdpack reshape sna]; }; BGLR = derive2 { name="BGLR"; version="1.0.8"; sha256="15cv5k44yj5cws9jjd70hvrkm8gzn5x4hfx408n2fbqbv289b5jy"; depends=[truncnorm]; }; BGPhazard = derive2 { name="BGPhazard"; version="2.0.1"; sha256="1bpj644mcfy1lx9f611zymsc8znr250xwms16rwsbrplifwgpylp"; depends=[dplyr ggplot2 ggthemes gridExtra magrittr purrr readr rlang survival tibble]; }; BGSIMD = derive2 { name="BGSIMD"; version="1.0"; sha256="0xkr56z8l72wps7faqi5pna1nzalc3qj09jvd3v9zy8s7zf5r7w4"; depends=[]; }; - BGVAR = derive2 { name="BGVAR"; version="2.0.1"; sha256="0rjh5rvkf89q06arggz09ndk7c8ifmdg6an2r2lfy7xg5pmm5f5h"; depends=[abind bayesm coda doParallel foreach GIGrvg knitr MASS Matrix Rcpp RcppArmadillo RcppProgress stochvol xts zoo]; }; + BGVAR = derive2 { name="BGVAR"; version="2.1.5"; sha256="0m419i2yrhk3yh8zi3z4bv5gcz4vxrz2ic8pd4xdv0y0m9x6z817"; depends=[abind bayesm coda GIGrvg knitr MASS Matrix Rcpp RcppArmadillo RcppProgress stochvol xts zoo]; }; + BGmisc = derive2 { name="BGmisc"; version="0.1"; sha256="15xgm3n3hn5zkrvyfcylyz5q3zah0155914a0rck0ipihb45sbbl"; depends=[Matrix]; }; BH = derive2 { name="BH"; version="1.72.0-3"; sha256="1ay8vb6i730lipg8b8g3893vqglhw2kqpc29lwdrxdkb66iw33l8"; depends=[]; }; BHAI = derive2 { name="BHAI"; version="0.99.2"; sha256="1hawa55mk590is8ziav7fdszsa3a42bqb0znzqsazz5lkg4daaa7"; depends=[MCMCpack plotrix prevtoinc]; }; BHH2 = derive2 { name="BHH2"; version="2016.05.31"; sha256="1m4fcx979nbm97hi89vbjjix0sx6qhdzs486risck9bi7yzih5k4"; depends=[]; }; BHMSMAfMRI = derive2 { name="BHMSMAfMRI"; version="1.3"; sha256="1cha6bw0zvv30y2hjl1a4d04g1r80dfa7r7zi63q5jjnnbklbswg"; depends=[oro_nifti wavethresh]; }; - BHSBVAR = derive2 { name="BHSBVAR"; version="2.0.2"; sha256="1y0fjdrg0wg66r3blb8app0h52f24v8vl04n0mgk9ypm45hm64my"; depends=[Rcpp RcppArmadillo]; }; + BHSBVAR = derive2 { name="BHSBVAR"; version="2.1.0"; sha256="16d1jn96qwk569zy49qbxspayi3p6q826mhpizdpnwd1044lcllv"; depends=[Rcpp RcppArmadillo]; }; BHTSpack = derive2 { name="BHTSpack"; version="0.5"; sha256="1sz99sgxhiajxca5bx2ns9g9qs9ymsvh8i5882nlp7c78qxmqc4g"; depends=[R2HTML xtable]; }; BICORN = derive2 { name="BICORN"; version="0.1.0"; sha256="0mqk8vgp6jdk7f0paa06yqlibkd1y3vs69pg7i9mkvxmda7p4nkq"; depends=[]; }; BIEN = derive2 { name="BIEN"; version="1.2.4"; sha256="1dagrs54ciagm2mgqrvxl6k2akahr0qk63ifxqnks7iljm0x1gw6"; depends=[ape DBI doParallel fasterize foreach raster rgdal rgeos RPostgreSQL sf sp]; }; BIFIEsurvey = derive2 { name="BIFIEsurvey"; version="3.3-12"; sha256="1kphczvj3rxyjvi93cx2j714scvmmpqv5wrg5pdyy8l891jxsr89"; depends=[miceadds Rcpp RcppArmadillo]; }; - BIGDAWG = derive2 { name="BIGDAWG"; version="2.3"; sha256="1lnw31dl161siml6vcp74c30g0rld962ry3am9ljxmd9mw83shnz"; depends=[haplo_stats httr knitr XML]; }; - BIGL = derive2 { name="BIGL"; version="1.5.2"; sha256="1n5izivzj01kx94n5p7shd6zlvknqwy6cbdr6xhg32g7p4rvi7s0"; depends=[ggplot2 MASS minpack_lm numDeriv progress rgl robustbase scales]; }; + BIGDAWG = derive2 { name="BIGDAWG"; version="2.3.1"; sha256="19dc4rsy8w53jdhvmc63pbd769m5sv5s0n4jz71qmvvnh76jaw82"; depends=[haplo_stats httr knitr XML]; }; + BIGL = derive2 { name="BIGL"; version="1.6.0"; sha256="1nrb8856vp97krnwmnj8vb8hwcqncs51nqhmwlimc4j34n39h3m4"; depends=[ggplot2 MASS minpack_lm nleqslv numDeriv progress rgl robustbase scales]; }; BINCOR = derive2 { name="BINCOR"; version="0.2.0"; sha256="0x2s82jql429shk70bhjdy9kamz8dz5ymsxj6kp8ga1711bpwyq6"; depends=[pracma]; }; BIOM_utils = derive2 { name="BIOM.utils"; version="0.9"; sha256="0xckhdvf15a62awfk9rjyqbi6rm7p4awxz7vg2m7bqiqzdll80p7"; depends=[]; }; - BIOMASS = derive2 { name="BIOMASS"; version="2.1.3"; sha256="185k2j38jvzgan76qwyvnx8safj25w1q0rzh2h8p3lh9rgqzz7dz"; depends=[data_table jsonlite minpack_lm proj4 rappdirs raster sp]; }; + BIOMASS = derive2 { name="BIOMASS"; version="2.1.4"; sha256="0ghpw6w9w4llf835x18k3v9fiw2girkhriiqm1ny8hqnx1p5iaps"; depends=[data_table jsonlite minpack_lm proj4 rappdirs raster sp]; }; BIOdry = derive2 { name="BIOdry"; version="0.8"; sha256="1zga8g50wjnnz2h9b3ak9q67qnl1f14cq6hvdzf9f84pphsnpasa"; depends=[ecodist nlme]; }; - BIRDS = derive2 { name="BIRDS"; version="0.1"; sha256="1bfkwyc2hbd23adh11hgzkfr1dpffc3kzshjirizs6nzb7yyq0gz"; depends=[data_table dplyr esquisse geosphere leaflet lubridate magrittr mapedit nnet rgdal rgeos rlang sf shiny shotGroups sp stringr xts]; }; + BIRDS = derive2 { name="BIRDS"; version="0.1.2"; sha256="11iir53h7a4sqsqpp08yawbwwpwpsn34cxadqzgnq6ygh28w6niz"; depends=[data_table dbscan dplyr esquisse geosphere leaflet lubridate magrittr mapedit nnet rgdal rgeos rlang sf shiny shotGroups sp stringr taxize tidyr xts]; }; BIS = derive2 { name="BIS"; version="0.2.1"; sha256="0mngmchgc46wc9a7ksyqrvj6k46nm4ih7x69k3xijfia9bgkym0v"; depends=[dplyr readr rvest tidyr xml2]; }; BKPC = derive2 { name="BKPC"; version="1.0.1"; sha256="17gmhf6qq8jn2xzkqvjq60xzy0slz6kgfpd0d6hlpnf30ww7q923"; depends=[kernlab]; }; - BLCOP = derive2 { name="BLCOP"; version="0.3.2"; sha256="00x8xk7c8pdwpbmzshjg2ph1yz55vxmliblj1xr7y0gqhcmgyr27"; depends=[fBasics fMultivar fPortfolio MASS quadprog RUnit timeSeries]; }; BLModel = derive2 { name="BLModel"; version="1.0.2"; sha256="0l5f2v5ggadmrci3qhhmxm3j9i6jii0anq5rv5vk50y2qzii2q15"; depends=[]; }; BLOQ = derive2 { name="BLOQ"; version="0.1-1"; sha256="0qs4pnzpfwkii6wpd8my34zw9k003b3is0y0aj1lhcm0qnn1p8h4"; depends=[maxLik mvtnorm]; }; BLPestimatoR = derive2 { name="BLPestimatoR"; version="0.3.2"; sha256="0prc2m3hixv8hmnyhr5549406ln509llkhpqra2ifpzif0waw704"; depends=[Formula Matrix mvQuad numDeriv randtoolbox Rcpp RcppArmadillo]; }; BLR = derive2 { name="BLR"; version="1.6"; sha256="1wivqh19kxgr7nwa09s5ay6x1yidjk4hqanv0mzb1nbik98w9024"; depends=[]; }; BLRPM = derive2 { name="BLRPM"; version="1.0"; sha256="15q0jkw4swz35c58nv23k8g1dy1kkbqh5aydjck7pd0fmppqrhpx"; depends=[R6]; }; BLRShiny = derive2 { name="BLRShiny"; version="0.1.0"; sha256="0z3gr0bvjs7y0jkygh7h9habnk2807cwziajpgfmb7dxdrhccj68"; depends=[caret dplyr e1071 ggplot2 rhandsontable rmarkdown shiny]; }; + BLRShiny2 = derive2 { name="BLRShiny2"; version="0.1.0"; sha256="0cl959hlchba4ikzdvxv2jz30sswh5hc0d8hwx8ckzz52kkj4csa"; depends=[caret dplyr e1071 ggplot2 rhandsontable rmarkdown shiny]; }; BLSM = derive2 { name="BLSM"; version="0.1.0"; sha256="02xidwp91rh34rcqd0q552wzm2j80axs1nnwwv2aj04g96lf7myj"; depends=[Rcpp RcppEigen]; }; - BMA = derive2 { name="BMA"; version="3.18.12"; sha256="0yfx6m0y8chxlpyngzw27xsgz3g7481ra0xdhsli36mhj9yvgayb"; depends=[inline leaps robustbase rrcov survival]; }; + BMA = derive2 { name="BMA"; version="3.18.14"; sha256="08ybcbs7vj0hbg0abh2sl3w0fx4ncsr9znlfdbf1fn0w012gvh1v"; depends=[inline leaps robustbase rrcov survival]; }; BMAmevt = derive2 { name="BMAmevt"; version="1.0.4"; sha256="10241cibzmgrmxzjw7fpw64qkayc1wig5xilahyc182841k4if6w"; depends=[coda]; }; BMRBr = derive2 { name="BMRBr"; version="0.2.0"; sha256="0v2ysap5jfkq9fc5blqlfhsv2bs8rqybmp5z4q3g6y3y7qzhypjw"; depends=[rvest xml2]; }; BMRSr = derive2 { name="BMRSr"; version="1.0.1"; sha256="0falfkw3gx0c1y52lf82lr6z9l6w7lw8bh04vvl2f1cq02c59nvk"; depends=[httr readr stringr tibble xml2]; }; @@ -315,11 +324,11 @@ in with self; { BMS = derive2 { name="BMS"; version="0.3.4"; sha256="0z3mk1xd1fphf80kdbashkn04jwsr2bghms4d7nav3pw73q41wql"; depends=[]; }; BMT = derive2 { name="BMT"; version="0.1.0.3"; sha256="1vdah5bsn41s2qriq15xi7dw9qzngaacmn5gk6yc7hi89dwyy3yj"; depends=[fitdistrplus partitions]; }; BMTAR = derive2 { name="BMTAR"; version="0.1.0"; sha256="016pjaddszisj8rgq0k82zss37zkiij5wa9q884w2zxk5c245sy7"; depends=[Brobdingnag doParallel expm ggplot2 ks MASS MCMCpack mvtnorm]; }; - BMTME = derive2 { name="BMTME"; version="1.0.15"; sha256="1vbivzkf6m8808x6mhk6wkpg4i35ik1mzpy69sj0rhi7j4xb3f6c"; depends=[BGLR doSNOW dplyr foreach matrixcalc mvtnorm progress Rcpp RcppArmadillo snow tidyr]; }; - BMisc = derive2 { name="BMisc"; version="1.4.1"; sha256="176sqq24xyw9sz1pq721inmqwjxqqzbcp6w65f0m0n4b64yk5gyd"; depends=[]; }; + BMTME = derive2 { name="BMTME"; version="1.0.19"; sha256="07iw6aqcwn4a29b85cavfw6hp66csdzlaqwas40zr5ga3kp72j51"; depends=[BGLR doSNOW dplyr foreach matrixcalc mvtnorm progress Rcpp RcppArmadillo snow tidyr]; }; + BMisc = derive2 { name="BMisc"; version="1.4.2"; sha256="03bhq5gf4x959sam0mhk3sm9h6q6ylbwqp3399l00k7zhg6n7dw8"; depends=[tidyr]; }; BNDataGenerator = derive2 { name="BNDataGenerator"; version="1.0"; sha256="17zi83jhpn9ygavkpr9haffvd4622sca18jzzxxxmfq0ilrj201g"; depends=[]; }; BNN = derive2 { name="BNN"; version="1.0.2"; sha256="13h9xqfdqnc9d8brx1xlmvb4nrkpwncwjz98y7i3wijih85wkikd"; depends=[mvtnorm]; }; - BNPMIXcluster = derive2 { name="BNPMIXcluster"; version="1.2.4"; sha256="06s0cs3anbby93n7pjcin9195agfzfq9im6f9k7ih3cbg8mzfaqy"; depends=[gplots MASS matrixcalc mvtnorm plyr Rcpp RcppArmadillo truncnorm]; }; + BNPMIXcluster = derive2 { name="BNPMIXcluster"; version="1.3"; sha256="1dnylvag24zqp93acdbn0ilbdzbn250pjjp6hjdd9d1zvla2ck85"; depends=[gplots MASS matrixcalc mvtnorm plyr Rcpp RcppArmadillo truncnorm]; }; BNPTSclust = derive2 { name="BNPTSclust"; version="2.0"; sha256="1ymvklv6d9684xzwdkvaxdjd1q20xmsf6kkfibn2wphlaqs2rh2n"; depends=[MASS mvtnorm]; }; BNPdensity = derive2 { name="BNPdensity"; version="2020.3.4"; sha256="0775fcf5y78ibmhl5fljrlvznn1a74s5ihldb6wgixmm4c0xmz3x"; depends=[coda dplyr ggplot2 gridExtra survival tidyr viridis]; }; BNPmix = derive2 { name="BNPmix"; version="0.2.6"; sha256="1r359fxiir0avy5pynszj839hxj17g0ypy8zqfkchmapdzh04zhj"; depends=[coda ggplot2 ggpubr Rcpp RcppArmadillo]; }; @@ -327,7 +336,7 @@ in with self; { BNSP = derive2 { name="BNSP"; version="2.1.4"; sha256="0685f979zr8mbisbzf27n95064pgr7amk41c024w9gw1p0dj1lai"; depends=[coda corrplot cubature Formula ggplot2 gridExtra label_switching mgcv plot3D plyr threejs]; }; BNrich = derive2 { name="BNrich"; version="0.1.1"; sha256="0m3cz7npc7mwq2vj68hllbd2vf5xqw00jaxv1pm3c28mq7pb459j"; depends=[bnlearn corpcor glmnet graph]; }; BOG = derive2 { name="BOG"; version="2.0"; sha256="0lz5af813b67hfl4hzcydn58sjhgn5706n2h44g488bks928k940"; depends=[DIME hash]; }; - BOIN = derive2 { name="BOIN"; version="2.6.8"; sha256="1p4hj6z6i4xbv9cwdzdalf5ja48jcq3plg59xzqfkgslwwn96gpx"; depends=[Iso]; }; + BOIN = derive2 { name="BOIN"; version="2.7.1"; sha256="1rpb90wpa9rgbxhxi1nn83k1vd8ixv9gbh738y6rrnnk3cp95vk2"; depends=[Iso]; }; BOJ = derive2 { name="BOJ"; version="0.2.2"; sha256="0xr55jif6al9qyz25k7ab0k938z93j0gzwf6njwv0xnp92j3a30i"; depends=[dplyr readr rvest tidyr tidyselect xml2]; }; BOSSreg = derive2 { name="BOSSreg"; version="0.1.0"; sha256="1nngs9j1hbb9ws423dxccjxwpkc5zl6l0zv46gb0v6m8y11d077b"; depends=[Matrix Rcpp RcppArmadillo]; }; BPEC = derive2 { name="BPEC"; version="1.3.1"; sha256="0jvq56cq1wnhwd6wvg02hbx4b5vc2hz1lyxi63pl41rk0xva615a"; depends=[ape coda fields ggmap ggplot2 igraph maptools mvtnorm OpenStreetMap phytools sp]; }; @@ -337,29 +346,29 @@ in with self; { BRISC = derive2 { name="BRISC"; version="0.2.0"; sha256="0dnkf4ld1blbadmxvgd0k021ihszrf2x19qypvv8jvgfrgcr8ax7"; depends=[matrixStats pbapply RANN rdist]; }; BRL = derive2 { name="BRL"; version="0.1.0"; sha256="13qi78v3057qn4hfby14sp26hy3ibl50f06x8gpak6gi76g8bhwi"; depends=[]; }; BRugs = derive2 { name="BRugs"; version="0.9-0"; sha256="0f0v30mvfw97vfwzkjpqzf2894b2yhksja0xhpranprk135srxp0"; depends=[coda]; }; + BSBT = derive2 { name="BSBT"; version="1.0.0"; sha256="191c3scnlbbqs16xj4mfk3k8vl53gjw1dif827dysac9wi1m0ryc"; depends=[igraph lifecycle MASS]; }; BSDA = derive2 { name="BSDA"; version="1.2.0"; sha256="0gs33yyca45jd4f5k5f7qid4ayw2rnl2wl7a6m7vf39dfx7ympm2"; depends=[e1071 lattice]; }; BSGS = derive2 { name="BSGS"; version="2.0"; sha256="08m8g4zbsp55msqbic4f17lcry07mdn0f5a61zdcy2msn2ihzzf9"; depends=[batchmeans MASS plyr pscl]; }; BSGW = derive2 { name="BSGW"; version="0.9.2"; sha256="1q6qvm9yxh35wywrzs3kr31jsa0bmbwrqh0r3qjc0dzi6q8n6pjy"; depends=[doParallel foreach MfUSampler survival]; }; - BSL = derive2 { name="BSL"; version="3.0.0"; sha256="1cmydj59slj88awc2i7jg84hfaa9j3qp4d1042dgamc7xqvfh397"; depends=[coda copula foreach ggplot2 glasso gridExtra MASS mvtnorm Rcpp RcppArmadillo]; }; + BSL = derive2 { name="BSL"; version="3.2.0"; sha256="1qv7p6x7gb78qdif32c1n16rkn4yaw4905amz9x8w13mffia682n"; depends=[coda copula doRNG foreach ggplot2 glasso gridExtra MASS mvtnorm Rcpp RcppArmadillo Rdpack stringr whitening]; }; BSPADATA = derive2 { name="BSPADATA"; version="1.0"; sha256="1g709i0icxlxq2ljb2sm5iyc8ljqxadi62xc4mg702fsgl0x5ny9"; depends=[mvtnorm pscl spdep]; }; BSS = derive2 { name="BSS"; version="0.1.0"; sha256="1lxmrdmr6c0niqz61kc9ybzszprn66jyinfy4dr9r6i161gvs4qg"; depends=[hypergeo MASS phangorn]; }; BSSasymp = derive2 { name="BSSasymp"; version="1.2-1"; sha256="0w141yxqpck59n85rjc6d3qy6bwhk1z80zsm21hda0bgfwy9v6wy"; depends=[fICA JADE]; }; BSW = derive2 { name="BSW"; version="0.1.0"; sha256="0wh8m09nqzvsij8q8mdyr5yafdq7h568s28vih2wpplp0sv01945"; depends=[Matrix matrixStats quadprog]; }; BSagri = derive2 { name="BSagri"; version="0.1-10"; sha256="096l2ilr4x2fbjxchkksxkbiyaf7wwdmzn4xyjx001w873x9dgf6"; depends=[boot gamlss MCPAN mratios multcomp mvtnorm]; }; - BTLLasso = derive2 { name="BTLLasso"; version="0.1-10"; sha256="0ab19dcn55nzkl3q865affiqjkd4j9yiil0a7kxcpbm0rva9x6zj"; depends=[Matrix psychotools Rcpp RcppArmadillo stringr TeachingDemos]; }; - BTM = derive2 { name="BTM"; version="0.3.1"; sha256="0dl8gnq31xm5dfxdn9s47p31j3dhqpq5gfhq1q8wjm9gdiybg4ad"; depends=[Rcpp]; }; - BTSPAS = derive2 { name="BTSPAS"; version="2020.1.1"; sha256="004klyyg9gqalwx2i5lx57p1qxrm50nszzg839kv3v421b14qg80"; depends=[actuar coda data_table ggforce ggplot2 gridExtra plyr R2jags reshape2]; }; - BTYD = derive2 { name="BTYD"; version="2.4"; sha256="13szcsgsrd7mwc4f47xrfrmsm2sg5sf7pfm21ly4cbvqcz8m0147"; depends=[hypergeo Matrix]; }; - BTYDplus = derive2 { name="BTYDplus"; version="1.0.1"; sha256="0x8as4zskpbsvhh8gnvzgp833dkv01cs5fqfva9qri296343kppv"; depends=[bayesm BTYD coda data_table mvtnorm Rcpp]; }; + BTLLasso = derive2 { name="BTLLasso"; version="0.1-11"; sha256="1nz90jg74xzcwjxi9ppp7a78bg4976h2cmvlz140ss5403pnfbsk"; depends=[Matrix psychotools Rcpp RcppArmadillo stringr TeachingDemos]; }; + BTM = derive2 { name="BTM"; version="0.3.4"; sha256="0b0ksk8k7gr53v4jgnm55ki4vhvk1c5p7wnfr8xwffgd8iml345h"; depends=[Rcpp]; }; + BTSPAS = derive2 { name="BTSPAS"; version="2021.1.1"; sha256="1clppkr1bflqp1kvy8k7vnr1bjaqy135k7zn5mxfrnkh5hhcj7zm"; depends=[actuar coda data_table ggforce ggplot2 gridExtra plyr R2jags reshape2 scales]; }; + BTYD = derive2 { name="BTYD"; version="2.4.2"; sha256="0yccq603vxjzhssb59icmps4iz0sn52wirwajx7995rz0zkfgfvh"; depends=[dplyr hypergeo Matrix optimx]; }; BTdecayLasso = derive2 { name="BTdecayLasso"; version="0.1.0"; sha256="0x1s2zvv3vnapk5wp8582zwflsqvgc8khkvl5ch9i70v739jxp15"; depends=[ggplot2 optimr]; }; - BUCSS = derive2 { name="BUCSS"; version="1.2.0"; sha256="0shz72l69iz0d1ncdwzklhabmvhp983vr2yqhmdhpzcmz3fkp1wp"; depends=[]; }; - BVAR = derive2 { name="BVAR"; version="1.0.0"; sha256="1fkf8yl9f8c70p8hmz8xx3phdqhyh4s9kbrxjmp75yq1piwqrpsx"; depends=[mvtnorm]; }; - BVS = derive2 { name="BVS"; version="4.12.1"; sha256="111g61bpwh80v6gy44q087swcrnnnzdcibm22pzzi9jsfphy6l0c"; depends=[haplo_stats MASS msm]; }; - BVSNLP = derive2 { name="BVSNLP"; version="1.1.8"; sha256="0qlmvi189ky6h0a3jyvyil488asx3v6x52mvca7s93dvarxr6rw1"; depends=[doParallel foreach Rcpp RcppArmadillo RcppEigen RcppNumerical]; }; + BUCSS = derive2 { name="BUCSS"; version="1.2.1"; sha256="1nf0xpy5r49yfd0xydzxxxrc6isj14s8lswrf5nhh7g60nkkwcxr"; depends=[]; }; + BVAR = derive2 { name="BVAR"; version="1.0.1"; sha256="0nfq5ffa600hx3cbr85jbwawdfczrnr1dvg80qqz74v6lh3k8j7x"; depends=[mvtnorm]; }; + BVARverse = derive2 { name="BVARverse"; version="0.0.1"; sha256="00nghvd5bavmn5hw89pcz20x5kbpxr707r5yvvsakn77rdis37ig"; depends=[BVAR generics ggplot2 rlang tidyr]; }; + BVSNLP = derive2 { name="BVSNLP"; version="1.1.9"; sha256="1k2sr9wq0q7lq2hmgp75hzxy6v688lw5npwvpma88975yqi6ghiw"; depends=[doParallel foreach Rcpp RcppArmadillo RcppEigen RcppNumerical]; }; BWGS = derive2 { name="BWGS"; version="0.1.0"; sha256="10cqwc9lx5m2s3qay1223whah3jj9fcmyqsw3x8schi9wvrfx8v8"; depends=[BGLR brnn e1071 glmnet randomForest rrBLUP]; }; BWStest = derive2 { name="BWStest"; version="0.2.2"; sha256="02amzlfprmw5pyis0dg0kg0x8xqh50a4vfdcxxmklrzik3b1vzzs"; depends=[memoise Rcpp]; }; BaBooN = derive2 { name="BaBooN"; version="0.2-0"; sha256="145q2kabjks2ql3m48sfjis5y35l8rcqnr5s176viv9yhfafn351"; depends=[coda Hmisc MASS nnet Rcpp RcppArmadillo]; }; - BaM = derive2 { name="BaM"; version="1.0.1"; sha256="0y8m6mhghlrp379swj9cfrzqcdr3a7y29mx4d6zld4is00wdw16b"; depends=[coda dlm MASS mice nnet]; }; + BaM = derive2 { name="BaM"; version="1.0.2"; sha256="017x6i8glbbx8aqglyglv9pvcss4vg6l6rnwzaa4vbln95y4582d"; depends=[dlm MASS mice]; }; BaMORC = derive2 { name="BaMORC"; version="1.0.1"; sha256="133j1rhfvsq1qxr7hxp7gfarbj8lfimirr73gyyrpfkq1vjxmhc9"; depends=[BMRBr data_table DEoptim devtools docopt httr jsonlite RBMRB readr stringr tidyr]; }; BaPreStoPro = derive2 { name="BaPreStoPro"; version="0.1"; sha256="0zyyyrr5h8dhjsmgaii8jmb8ignvixpc9nzbfishw9yymjswvm57"; depends=[]; }; BaSTA = derive2 { name="BaSTA"; version="1.9.4"; sha256="1j092gsdip7rpw0g74ha0kjsrqpp5swi7wd4sxlmx6zarcqnxlal"; depends=[snowfall]; }; @@ -373,16 +382,17 @@ in with self; { BarcodingR = derive2 { name="BarcodingR"; version="1.0-3"; sha256="03x26mrlvg00rnfh74wacpgbdk7xr2lq4yd0bx4q2442nli54rdv"; depends=[ape class nnet sp]; }; Barnard = derive2 { name="Barnard"; version="1.8"; sha256="1ki58hjs5kpmp76kwj1qi6hwmdvjphqb1lvrlhnmkgqxg4hw4vqg"; depends=[]; }; Barycenter = derive2 { name="Barycenter"; version="1.3.1"; sha256="0yhc0wwjqms569gnm8z2l9hgcbw8lyy437ynkij47pa4c1a1qvjy"; depends=[Rcpp RcppArmadillo]; }; + BaseSet = derive2 { name="BaseSet"; version="0.0.14"; sha256="0x1171g819vkh23v96l72jvrmmala478jcpvbm9z9z1c7qxhwwbx"; depends=[dplyr magrittr rlang]; }; BasketballAnalyzeR = derive2 { name="BasketballAnalyzeR"; version="0.5.0"; sha256="1bad287llg89smqg43lgz2hdkjg3l39mh4k82avgb52xwqp5gjxc"; depends=[circlize corrplot dendextend directlabels dplyr GGally ggnetwork ggplot2 ggplotify ggrepel gridExtra hexbin magrittr MASS network operators PBSmapping plyr readr rlang scales sna sp statnet_common stringr tidyr]; }; BatchExperiments = derive2 { name="BatchExperiments"; version="1.4.2"; sha256="0zvcpgzhbna6p37jlf57j7mzrvh5xs5w17janmv9v4210cpbzi1q"; depends=[backports BatchJobs BBmisc checkmate data_table DBI RSQLite]; }; - BatchGetSymbols = derive2 { name="BatchGetSymbols"; version="2.5.7"; sha256="155wwskqagz3qcng71nn0v52mvassdinhmvaf1hv74dakvvfjrj2"; depends=[crayon curl dplyr furrr future lubridate purrr quantmod rvest scales stringr tibble tidyr XML zoo]; }; + BatchGetSymbols = derive2 { name="BatchGetSymbols"; version="2.6.1"; sha256="0jm4bswczmha7p8xb78n4q3wxyjxmi7ya5zrfm0gb31g7r275wba"; depends=[crayon curl dplyr furrr future lubridate purrr quantmod rvest scales stringr tibble tidyr XML zoo]; }; BatchJobs = derive2 { name="BatchJobs"; version="1.8"; sha256="1zz4sspj596pijxlz321g0jy2rg9ki83j6fihbwisjwr66p2vk1m"; depends=[backports BBmisc brew checkmate data_table DBI digest RSQLite sendmailR stringi]; }; BayHaz = derive2 { name="BayHaz"; version="0.1-3"; sha256="08ilghlkgyma5758yw7mdgqycqcillqmx73knzzdlg2kzc77dvg6"; depends=[]; }; - BayLum = derive2 { name="BayLum"; version="0.1.3"; sha256="0hina84s8ax01zpnji4jqqkdap0phvxr78s4rnab0407xrydbf0w"; depends=[ArchaeoPhases coda hexbin KernSmooth Luminescence rjags]; }; + BayLum = derive2 { name="BayLum"; version="0.2.0"; sha256="1i0pfqygn8s6r63089wgs74fx6cwm7ypascr70g4zwgbgkp8l80d"; depends=[ArchaeoPhases coda hexbin KernSmooth Luminescence rjags runjags]; }; BaySIC = derive2 { name="BaySIC"; version="1.0"; sha256="023ji6q1nvksmhp3ny8ad39xxccc0a1rv9iaiaagwavgzzc0pjd9"; depends=[fields poibin rjags]; }; BayesARIMAX = derive2 { name="BayesARIMAX"; version="0.1.1"; sha256="1rcfq0r8sqiqs65mbpcr8i4667cdb50k6bx6wdh9spr0djh8gfv0"; depends=[coda forecast]; }; BayesBEKK = derive2 { name="BayesBEKK"; version="0.1.0"; sha256="0fykcmf54820krwy7q573gmlcrx96i94knx7rgzc83i287lnpnfg"; depends=[coda MTS mvtnorm]; }; - BayesBP = derive2 { name="BayesBP"; version="1.0"; sha256="1gmjljkp4pvm87qf6rq2kixqdx64sfg34b1xxdl242a3cckmjc5y"; depends=[iterators openxlsx]; }; + BayesBP = derive2 { name="BayesBP"; version="1.1"; sha256="043msccrins1smaizmf7qc6q1cyjdzirw2ygnvi56lskib1cls7m"; depends=[iterators openxlsx]; }; BayesBinMix = derive2 { name="BayesBinMix"; version="1.4.1"; sha256="1b18qg0mjbmrilwqffrq33gw04fzask2xgj1bp4cli51cjf2slf7"; depends=[coda doParallel foreach label_switching]; }; BayesCR = derive2 { name="BayesCR"; version="2.1"; sha256="1qav7l64iqqdvr1v6c7hlzvbx7zbvsa55pyisvkq5rsayy1rdsl1"; depends=[mnormt mvtnorm rootSolve truncdist]; }; BayesCTDesign = derive2 { name="BayesCTDesign"; version="0.6.0"; sha256="1ym2v5ynmb28miwivyjx604vfsfi5ksmaha0far0ddq2cl06if2q"; depends=[eha ggplot2 reshape2 survival]; }; @@ -390,20 +400,19 @@ in with self; { BayesComm = derive2 { name="BayesComm"; version="0.1-2"; sha256="1rrbvwcfm93cw0m33g0zn6nyshfjc97kb3fby9cga0zaixc0a8rk"; depends=[abind coda mvtnorm Rcpp RcppArmadillo]; }; BayesDA = derive2 { name="BayesDA"; version="2012.04-1"; sha256="0fp27cmhw8dsxr4mc1flm6qh907476kph8ch2889g9p31xm1psjc"; depends=[]; }; BayesESS = derive2 { name="BayesESS"; version="0.1.19"; sha256="023r5pxqa2ll3vyfmchdlcg6ay0qixphz24078g1immqp43mlrxm"; depends=[dfcrm LaplacesDemon MASS MatrixModels MCMCpack Rcpp RcppArmadillo RcppEigen]; }; - BayesFM = derive2 { name="BayesFM"; version="0.1.3"; sha256="0bfi1g6s02brd3phsg3sxvyc7sqvd48vlx37yavbg1nnyx1c53rw"; depends=[checkmate coda ggplot2 gridExtra plyr]; }; + BayesFM = derive2 { name="BayesFM"; version="0.1.4"; sha256="14m318nxb4aqxni4zm0p6g9pysx81rmay48qglwm98gmdjxigzzk"; depends=[checkmate coda ggplot2 gridExtra plyr]; }; BayesFactor = derive2 { name="BayesFactor"; version="0.9.12-4.2"; sha256="1z083v7is21gm0a458jm5ph3xfdm7mh29a6sg2r1njq82f8x3s3g"; depends=[coda gtools hypergeo Matrix MatrixModels mvtnorm pbapply Rcpp RcppEigen stringr]; }; BayesGESM = derive2 { name="BayesGESM"; version="1.4"; sha256="0qw2byb48f67461m1k8a1rqh6a0c3zq1rc4ni9xzxv8dih4wkq0f"; depends=[Formula GIGrvg normalp]; }; BayesGOF = derive2 { name="BayesGOF"; version="5.2"; sha256="17wm0228xq3db431abyi9jr0q1q86nnajsn7hmy4dwzgvrlz5s0i"; depends=[Bolstad2 nleqslv orthopolynom VGAM]; }; BayesGPfit = derive2 { name="BayesGPfit"; version="0.1.0"; sha256="1sz0bb102h5fj1yz0k89cvcy0pvsh6rfm06i6lfz3pdhdjszsx00"; depends=[lattice]; }; BayesGWQS = derive2 { name="BayesGWQS"; version="0.0.2"; sha256="0xy71d121hl8mg71cfyqw3j0sjx46qj5bifdk55h7jyfynr80pax"; depends=[coda rjags]; }; BayesLCA = derive2 { name="BayesLCA"; version="1.9"; sha256="11ji5s1njip57zkr4bxwp3agx1ddv7yagm5prn9ckcbasan4rbx1"; depends=[coda e1071 fields MCMCpack nlme]; }; - BayesLN = derive2 { name="BayesLN"; version="0.1.2"; sha256="16nw6nxqqcqlcqjbz1nyk2laz5naqfj9hg1a616x1ms88bhxmcsx"; depends=[coda data_table fAsianOptions ghyp lme4 MASS optimx Rcpp RcppArmadillo]; }; + BayesLN = derive2 { name="BayesLN"; version="0.2.1"; sha256="1km5jq0jxkwafn1ak0srsmxzrkv4vfhgvrkcy25laap1yn95qrvm"; depends=[coda data_table fAsianOptions ghyp lme4 MASS Matrix optimx Rcpp RcppEigen]; }; BayesLogit = derive2 { name="BayesLogit"; version="2.1"; sha256="0w3bzk39sxdskwikcz5i0xwfsll4sqgkpr8vw8jvzlcy6dl3yhis"; depends=[]; }; - BayesMAMS = derive2 { name="BayesMAMS"; version="0.1"; sha256="1qq3j9nm0k58gpyfavz77v1dwghy8pmpk0v52cj7l8sb3a3aiinm"; depends=[mvtnorm]; }; BayesMFSurv = derive2 { name="BayesMFSurv"; version="0.1.0"; sha256="1yxxzwjh1fgfh7qkzf9dfm3x0vbgb0v4p6bf6b5w14kvm06rzhkg"; depends=[coda FastGP MCMCpack mvtnorm Rcpp RcppArmadillo]; }; BayesMRA = derive2 { name="BayesMRA"; version="1.0.0"; sha256="005pygpa8bmr153naxnag7kn876lqwq34d8pzbj954nivlxl4zaw"; depends=[fields igraph Matrix mvnfast Rcpp RcppArmadillo spam]; }; - BayesMallows = derive2 { name="BayesMallows"; version="0.4.4"; sha256="1zgvmdhygfvbql6fhb81h6734kqs1h7v0qqicq8s9z5d6zgy247g"; depends=[cowplot dplyr ggplot2 HDInterval igraph PerMallows purrr Rcpp RcppArmadillo Rdpack relations rlang sets tidyr]; }; - BayesMassBal = derive2 { name="BayesMassBal"; version="0.2.0"; sha256="1ac1kirnic8c5mzja1m2mnv3wd89z0r0l3nqjx7a0h36cddykl6s"; depends=[HDInterval LaplacesDemon MASS Matrix pracma Rdpack tmvtnorm]; }; + BayesMallows = derive2 { name="BayesMallows"; version="0.5.0"; sha256="0m8npkp76z566sam02kdyhfx0jpch8k8cj8j165l7mqz8v7x7b9n"; depends=[cowplot dplyr ggplot2 HDInterval igraph PerMallows purrr Rcpp RcppArmadillo Rdpack relations rlang sets tidyr]; }; + BayesMassBal = derive2 { name="BayesMassBal"; version="1.0.0"; sha256="158vwfp5wn9g28fg48zmd95lfsr6flmcdm4igfw4cmgp4w0w69lq"; depends=[coda HDInterval LaplacesDemon Matrix pracma Rdpack tmvtnorm]; }; BayesMixSurv = derive2 { name="BayesMixSurv"; version="0.9.1"; sha256="19kf39881q00pap9afwvvggk4s4w3qpz17b7065nig1mvk8dnp8r"; depends=[survival]; }; BayesNI = derive2 { name="BayesNI"; version="0.1"; sha256="0zvr6rkb5zxgl53xby69d0j3yrfnlcmac6kwkxz77q5616w9dwq0"; depends=[]; }; BayesNSGP = derive2 { name="BayesNSGP"; version="0.1.1"; sha256="11c83iafhl8yasyy8xwk9wladbj986xpmgc8d3yd9dxkic71flw8"; depends=[FNN Matrix nimble StatMatch]; }; @@ -411,11 +420,13 @@ in with self; { BayesPieceHazSelect = derive2 { name="BayesPieceHazSelect"; version="1.1.0"; sha256="0znbmv7crqycdx75jh02h6z8d6cifjszbrldv2yva4mkjxsydag5"; depends=[mvtnorm]; }; BayesPiecewiseICAR = derive2 { name="BayesPiecewiseICAR"; version="0.2.1"; sha256="1qrmw7zmygdzz84p76hyh2d8dx88b8xhbbd7radqm39g35zq5wz6"; depends=[mvtnorm]; }; BayesPostEst = derive2 { name="BayesPostEst"; version="0.2.1"; sha256="0n2blfdzga93zmf0v94wlcmcyqlvbga50chqyv5pkx2z6l5xhdnc"; depends=[carData caTools coda dplyr ggmcmc ggplot2 ggridges HDInterval R2jags reshape2 rlang ROCR runjags texreg tidyr]; }; + BayesProject = derive2 { name="BayesProject"; version="1.0"; sha256="0b1xqw7f9kfbmr8m6fl9d2fpwr364s4a5vdw57l6i5rm6lszyfh5"; depends=[Rcpp RcppEigen Rdpack]; }; BayesRS = derive2 { name="BayesRS"; version="0.1.3"; sha256="0fhvnckabp0z1cdsbjgv3ijnzaxwhrk83fwcflgqbhvm3a9lzr77"; depends=[coda ggplot2 metRology reshape rjags]; }; - BayesReversePLLH = derive2 { name="BayesReversePLLH"; version="1.3"; sha256="07ijys5qd29qpa1hh6kbbp6fx97nmxydiijd0k0dh262vqfhh5ll"; depends=[Rcpp RcppArmadillo]; }; + BayesReversePLLH = derive2 { name="BayesReversePLLH"; version="1.4"; sha256="1wigp9692z0vf1vm3cpbl6wcgp3zyqzfbrkd344hi88421kj1yxj"; depends=[Rcpp RcppArmadillo]; }; BayesS5 = derive2 { name="BayesS5"; version="1.41"; sha256="0vs6s50h4gpxda9lbxfgn76k9kp81l62a6bv22r7ixsjlnd4baql"; depends=[abind Matrix snowfall splines2]; }; BayesSAE = derive2 { name="BayesSAE"; version="1.0-2"; sha256="1xbx9hr254agpcqs1fl7qi7h19fd2bbmjszn44l566n2svgvxwf5"; depends=[coda Formula lattice]; }; - BayesSUR = derive2 { name="BayesSUR"; version="1.2-1"; sha256="08319q3xcid9vmh78x5l18xc53ca43xm9ij5bya3nznf2safbwls"; depends=[igraph Matrix Rcpp RcppArmadillo tikzDevice xml2]; }; + BayesSPsurv = derive2 { name="BayesSPsurv"; version="0.1.1"; sha256="1szzhqr6m8cbl8lrah0aj03pnkva2b7r4ga34fzpard2l6aypbvw"; depends=[ape coda dplyr FastGP ggplot2 MCMCpack Rcpp RcppArmadillo reshape2]; }; + BayesSUR = derive2 { name="BayesSUR"; version="1.2-4"; sha256="0qwqydmikf3ja4z3mwf6r1a6wxqnvkmx2747g38nzhcj53ipgsw0"; depends=[igraph Matrix Rcpp RcppArmadillo tikzDevice xml2]; }; BayesSampling = derive2 { name="BayesSampling"; version="1.0.0"; sha256="06gy902ksa753hn5p4zmsxaw6qg4qx4prd8n5m2w1300561cfbkl"; depends=[MASS Matrix]; }; BayesSenMC = derive2 { name="BayesSenMC"; version="0.1.2"; sha256="0vzvc7xmr39mlhqx0cmqrw2bszmxfbzbyy2l3ssbw2cz0c4xarkj"; depends=[dplyr ggplot2 lme4 Rcpp rstan]; }; BayesSpec = derive2 { name="BayesSpec"; version="0.5.3"; sha256="17gchdijcjhbr2y4glbq9szjh4qmgivzh6p4fllh589da18nzjcr"; depends=[mvtnorm pscl trust]; }; @@ -428,24 +439,26 @@ in with self; { BayesX = derive2 { name="BayesX"; version="0.3-1"; sha256="0g4cdkvicqzg75qgr62j89dc9mni38ai7705j6jbfx59vn6dbrr5"; depends=[coda colorspace maptools shapefiles sp]; }; BayesXsrc = derive2 { name="BayesXsrc"; version="3.0-1"; sha256="0l8c6xsyqj09m722hdanr1d9n6a1ps77ybm1jaqmp86bqmq1br03"; depends=[]; }; BayesianAnimalTracker = derive2 { name="BayesianAnimalTracker"; version="1.2"; sha256="1pgjijqznfdpvw296h5vksnxgspxs7qhy6s84ww7abnlhg59bz5s"; depends=[TrackReconstruction]; }; - BayesianFROC = derive2 { name="BayesianFROC"; version="0.3.0"; sha256="0h5qnkvm2grhl4wvyyfy2n86d4llpqw3bijgzkdw7871j5h7yflg"; depends=[bridgesampling car crayon DiagrammeR ggplot2 knitr pracma Rcpp readxl rhandsontable rstan shiny shinydashboard shinythemes xlsx]; }; + BayesianFROC = derive2 { name="BayesianFROC"; version="0.4.0"; sha256="1rq75kz2s4gphmiqr9jwv2jdjkia64bxa95sglb0h55wlsrww1fh"; depends=[bridgesampling car crayon ggplot2 knitr pracma Rcpp readxl rhandsontable rstan shiny shinydashboard shinythemes xlsx]; }; BayesianGLasso = derive2 { name="BayesianGLasso"; version="0.2.0"; sha256="09yb1qqx6qlsspk3ndrcqxy0956iqznw0rmyvqxgxxp3zd3y21xp"; depends=[MASS statmod]; }; + BayesianLaterality = derive2 { name="BayesianLaterality"; version="0.1.0"; sha256="1wrpgha9xfc9w2vf8z2fqagkrh8iyp2xgm92y2pwn3dmmbqza8d2"; depends=[dplyr purrr Rdpack rlang tidyr tmvtnorm]; }; BayesianNetwork = derive2 { name="BayesianNetwork"; version="0.1.5"; sha256="0vnnxzxz68dkfwr9wif8lam3a4khgbslbf49xkygqm8n1swysx2x"; depends=[bnlearn heatmaply lattice networkD3 plotly rintrojs shiny shinyAce shinydashboard shinytest shinyWidgets testthat]; }; BayesianPower = derive2 { name="BayesianPower"; version="0.2.3"; sha256="00rn3wmqrhk2pssbq5j2prl8m6cgfarr49672pnksp2dcbi47p20"; depends=[]; }; BayesianReasoning = derive2 { name="BayesianReasoning"; version="0.3.2"; sha256="1d9s47bkx5m6dsdq4hbflm7x1lax4n9gk3wbvilpybp6gn3bhlm9"; depends=[dplyr ggforce ggplot2 magrittr reshape2 tibble tidyr]; }; BayesianTools = derive2 { name="BayesianTools"; version="0.1.7"; sha256="0330bbnny35h4gsmwg31p3n3i511wrckzmp174ydm55pvsdkhjdg"; depends=[bridgesampling coda DHARMa ellipse emulator gap IDPmisc MASS Matrix msm mvtnorm numDeriv Rcpp tmvtnorm]; }; Bayesiangammareg = derive2 { name="Bayesiangammareg"; version="0.1.0"; sha256="0b0fqmig7vgmlrq2884q0apfd89nn5k4dj8rqjizkkbw4qpzmylb"; depends=[mvtnorm]; }; - Bayesrel = derive2 { name="Bayesrel"; version="0.6.1"; sha256="1mdc53g17c4r078mw74iiir03ks8kv60qh16l8fqy00vzwvbgpi9"; depends=[coda ggplot2 ggridges LaplacesDemon lavaan MASS plotrix Rcsdp Rdpack]; }; + Bayesrel = derive2 { name="Bayesrel"; version="0.7.0.2"; sha256="1in4bz0b18qaix5dakfrzl8wpzljpy239pp5dsz2xl0c89iqvb9y"; depends=[coda LaplacesDemon lavaan MASS Rcpp RcppArmadillo Rdpack]; }; BcDiag = derive2 { name="BcDiag"; version="1.0.10"; sha256="1gyinmx5wn2kk70hiy28ghilkhfirfjbfqdrqq5h3wfb4khnq6pz"; depends=[fabia]; }; - Bchron = derive2 { name="Bchron"; version="4.7.1"; sha256="1s6rvbxmsj5ksykxlvfzprxapn83wd8wcrq0yxpfd647jq4y7c20"; depends=[coda dplyr ggforce ggplot2 ggridges magrittr MASS mclust purrr scales stringr]; }; + Bchron = derive2 { name="Bchron"; version="4.7.3"; sha256="045hr118yyny9qbm9n0i85zrzx70bj0d5mbllak782sj9wspll3l"; depends=[coda dplyr ggforce ggplot2 ggridges magrittr MASS mclust purrr scales stringr]; }; Bclim = derive2 { name="Bclim"; version="3.1.2"; sha256="0dd4fx3rlljj3zb1m8q1bam1bswg497l3y8k0h0mkvjn94b4jbag"; depends=[ggplot2 MASS mclust statmod]; }; BeSS = derive2 { name="BeSS"; version="1.0.9"; sha256="1fslwh0fyhgaqrlhn6gsiq8rs3xcylwva98dqvch0hjg6sckccww"; depends=[glmnet Matrix Rcpp RcppEigen survival]; }; + BeastJar = derive2 { name="BeastJar"; version="1.10.6"; sha256="0581q9m7lb681d12vld231vn6wqv5s2sqkvav4fd0xllvjighlx7"; depends=[rJava]; }; Benchmarking = derive2 { name="Benchmarking"; version="0.29"; sha256="06zphnpnxvp6frl2gkmrsfils8xi64b4m8gvs483k8l0z4bjrfbk"; depends=[lpSolveAPI quadprog Rcpp ucminf]; }; BenfordTests = derive2 { name="BenfordTests"; version="1.2.0"; sha256="1nnj0w0zwcmg7maqmmpixx7alvsyxva370ssc26ahg6kxy5a621w"; depends=[]; }; - Bergm = derive2 { name="Bergm"; version="5.0.1"; sha256="1zy2ar43v7pf1ibbhf7visy1ia24lfpa2kb921vxd7hiilky1h8v"; depends=[coda ergm Matrix matrixcalc MCMCpack mvtnorm network]; }; + Bergm = derive2 { name="Bergm"; version="5.0.2"; sha256="03v90hh30ydpf9i60f6fraxrlr8i3zjxq3pg1yd56122kb93aa5y"; depends=[coda ergm Matrix matrixcalc MCMCpack mvtnorm network statnet_common]; }; Bessel = derive2 { name="Bessel"; version="0.6-0"; sha256="0iwm08nhlivi4zwcqdi296a1l4n4lfanfxhaysh9vcsyk1kpiacf"; depends=[Rmpfr]; }; Bestie = derive2 { name="Bestie"; version="0.1.1"; sha256="1vd139nl8dh707nvq35hylcng1hs8zycvjksnzxmwar1db9kgr7p"; depends=[BiDAG Rcpp]; }; - BetaBit = derive2 { name="BetaBit"; version="1.3"; sha256="1x9mfnijgi8726p82d52g2zgmliwsc97v2g96mz9ccz2vqqnwq4w"; depends=[digest]; }; + BetaBit = derive2 { name="BetaBit"; version="1.4"; sha256="11cvl9m20ycc0zsxbdapjflgsiaxx4dzaygjhv948adjfi5fycbn"; depends=[digest]; }; BetaPASS = derive2 { name="BetaPASS"; version="1.1-1"; sha256="17q1bfmijv38zyaj5fxlylf5zmkqry4ca9wm5km6zpksgsg2kjjq"; depends=[betareg ggplot2 pbapply]; }; BeviMed = derive2 { name="BeviMed"; version="5.7"; sha256="1fjxin14x9i44wq6ad2i70k6sdfzy7zxyq1pibnmsyk4a0k2cfv1"; depends=[Rcpp]; }; BeyondBenford = derive2 { name="BeyondBenford"; version="1.4"; sha256="04jdx35955g44v2is6zxfw1gip7zh3li8divc7iy5hl0jrshfhv3"; depends=[ggplot2]; }; @@ -456,6 +469,7 @@ in with self; { BiProbitPartial = derive2 { name="BiProbitPartial"; version="1.0.3"; sha256="0y19b8bkwr7rpygmj03013slmfbyd7aj6714hm14w5rdbnckymw3"; depends=[coda Formula mvtnorm numDeriv optimr pbivnorm Rcpp RcppArmadillo RcppTN]; }; BiSEp = derive2 { name="BiSEp"; version="2.2"; sha256="1ha7rc1q54dr2xl4bpkiwl703igmmi9qphsgv2h0flq7iz0gr351"; depends=[AnnotationDbi GOSemSim mclust]; }; BiTrinA = derive2 { name="BiTrinA"; version="1.3"; sha256="0sjq5a21vpsjs0ad0v8gsqlbk3n8virg1hzj0nvgm3h3xqhymh1d"; depends=[diptest]; }; + BiasCorrector = derive2 { name="BiasCorrector"; version="0.1.2"; sha256="1aa7h3l8rnwdkgbx000idkin671fqz8461fnqzdx9qcc2v1zbnv2"; depends=[data_table DT magrittr rBiasCorrection shiny shinydashboard shinyjs]; }; BiasedUrn = derive2 { name="BiasedUrn"; version="1.07"; sha256="13i2lgfnjhlbbm2yxfc2l5hswqw6x03pwba5csjmirv8kpjw4xr3"; depends=[]; }; BibPlots = derive2 { name="BibPlots"; version="0.0.6"; sha256="0gbywbxhqw226mzhxlkl98yky206f9m81wcrp6r4wj8wqhzc2fay"; depends=[]; }; BigQuic = derive2 { name="BigQuic"; version="1.1-9"; sha256="09fpqs5b733gq2kb7yj8a8snhr6zqg0mqa04p7fm6z2vas9cl3ri"; depends=[Matrix Rcpp scalreg]; }; @@ -484,14 +498,15 @@ in with self; { BioPETsurv = derive2 { name="BioPETsurv"; version="0.1.0"; sha256="0svwf8pzvlmlp8aacf70hzlg2h81m6lyhh4p73ixqw5v9bnyq6m0"; depends=[ggplot2 gridExtra survival]; }; BioProbability = derive2 { name="BioProbability"; version="1.0"; sha256="051m761zf079s0p4q0ambwqc22qjz2yajxrsmnjnxvqiaadaj1q7"; depends=[]; }; BioStatR = derive2 { name="BioStatR"; version="3.0.0"; sha256="1fv37xckhpn0b744r71q7h57pr5j2y0v8hcc97cgzdsqd8p4axmk"; depends=[ggplot2]; }; + BioVenn = derive2 { name="BioVenn"; version="1.1.0"; sha256="0y3drysz6s535yd0wkrinfpkm7kxkh9h6gk64cs0ln81sad4ifcx"; depends=[biomaRt plotrix svglite]; }; BiocManager = derive2 { name="BiocManager"; version="1.30.10"; sha256="03n9s2vf7vgpgb5alpxwamf9xfkn32cbzngwyn6spq1bnh9a9dzk"; depends=[]; }; Biocomb = derive2 { name="Biocomb"; version="0.4"; sha256="0jqfac81r5731m0i9jq7v5ns9263p8r7i03jyz10y915kfr6ikh6"; depends=[arules class e1071 FSelector gtools MASS nnet pamr pROC randomForest Rcpp rgl ROCR rpart RWeka]; }; Biodem = derive2 { name="Biodem"; version="0.4"; sha256="0k0p4s21089wg3r3pvyy9cxsdf4ijdl598gmxynbzvwpr670qnsh"; depends=[]; }; - BiodiversityR = derive2 { name="BiodiversityR"; version="2.12-1"; sha256="1dziagy01ksckpkvrfq2hiamb7k1g8sh2g93l9zr8nk7q0y690p4"; depends=[Rcmdr rgl vegan vegan3d]; }; + BiodiversityR = derive2 { name="BiodiversityR"; version="2.12-3"; sha256="1f3r156m53j823vwnyqfmsqd0z0gyhdili7f91y3d4p9x3d4ggw8"; depends=[Rcmdr vegan]; }; Bioi = derive2 { name="Bioi"; version="0.2.10"; sha256="1ay8889490nfhxhh72fvk9z4h58xknm2b145xhbx2wbzj65zf9ib"; depends=[assertthat dplyr igraph Rcpp]; }; Biolinv = derive2 { name="Biolinv"; version="0.1-2"; sha256="0g9vw1jcsjawmddkixssm5gbncy17fdd6a3c5b2qd4hx81kxz8q9"; depends=[classInt fields raster sp spatstat]; }; Biopeak = derive2 { name="Biopeak"; version="1.0"; sha256="1l08m1jl8yygbdfzk8klpj1q2m7icvxi98vmk7akxs0sswjc6wd2"; depends=[cluster dbscan factoextra gplots RColorBrewer]; }; - Bios2cor = derive2 { name="Bios2cor"; version="2.1"; sha256="04wk1cjrrxhpv1kdhd67r1qvjv268xxi0z0r105wy912110z9m6x"; depends=[bigmemory bio3d circular igraph]; }; + Bios2cor = derive2 { name="Bios2cor"; version="2.2"; sha256="1wkj9vr33m9jilidil9jpw5rzr3pf7gkimxdvch22ks4bgkx7l1w"; depends=[bigmemory bio3d circular igraph]; }; Biotech = derive2 { name="Biotech"; version="1.0.0"; sha256="01ddpxlgav8jjns0r23yjjynv80gwqcfalnz8gr553lm0wffdvj5"; depends=[dr4pl ggplot2 magrittr tidyverse]; }; BisRNA = derive2 { name="BisRNA"; version="0.2.2"; sha256="11jl5109nlm272vncprwplkz4kpvg7yx6yfnbjg47lfrsxcj8n0g"; depends=[MASS]; }; BisqueRNA = derive2 { name="BisqueRNA"; version="1.0.4"; sha256="01g34n87ml7n3pck77497ddgbv3rr5p4153ac8ninpgjijlm3jw2"; depends=[Biobase limSolve]; }; @@ -501,18 +516,19 @@ in with self; { BivUnifBin = derive2 { name="BivUnifBin"; version="1.3.2"; sha256="14v00fycxwnnm4x4hckckqb90j5m8hsbkr65z2zln459l6rsdwx9"; depends=[BinOrdNonNor rootSolve]; }; BivarP = derive2 { name="BivarP"; version="1.0"; sha256="08f7sphylaj3kximy1avaf29hxj2n800adsnssh01p9bcxnzb2i4"; depends=[copula dfoptim survival]; }; Bivariate_Pareto = derive2 { name="Bivariate.Pareto"; version="1.0.3"; sha256="11knwynqfxdz6zl7vzr48jpygcilsxarpmwphaajh62asdlg5w6p"; depends=[compound_Cox]; }; + BlackCarbon = derive2 { name="BlackCarbon"; version="0.1.0"; sha256="19ll2lcdxj5bmgh4wyk47ddxpwrqdiy67wsvj7mi1vm7y5ccyfhn"; depends=[]; }; BlakerCI = derive2 { name="BlakerCI"; version="1.0-6"; sha256="0dcmnaf0k195caajy8h4qymyfj45cjwmkcgsbwv0z7x3h9sx5k6v"; depends=[]; }; BlandAltmanLeh = derive2 { name="BlandAltmanLeh"; version="0.3.1"; sha256="11p30zqb3f9ifk3v18dspg18sclz5zxjygy7hw8ccb4bcqhx68lm"; depends=[]; }; Blaunet = derive2 { name="Blaunet"; version="2.1.0"; sha256="0rbqbi57f4qkdd8b2zbw1i8afb6355ba4yv0zg6f410qqgxiq0c4"; depends=[cairoDevice ergm foreign haven network plot3D plot3Drgl rgl RGtk2 sna statnet_common]; }; Blendstat = derive2 { name="Blendstat"; version="1.0.3"; sha256="0d5zzqiav7b5prh8332kwqy6ga96lkbkdjis8qwifa11j5qa087a"; depends=[lattice MASS]; }; BlockCov = derive2 { name="BlockCov"; version="0.1.1"; sha256="1ilqd8kvhlq0nc1n4y7g0aiwran3kyqs8i143j6dv2wy3myn5x0l"; depends=[BBmisc dplyr magrittr Matrix Rdpack rlang tibble]; }; - BlockFeST = derive2 { name="BlockFeST"; version="1.6"; sha256="0hj7a5as7nxbgjac7lbj6qfwffx3g8x8phpf9a55f1c9cdzi73a5"; depends=[BASIX]; }; + BlockFeST = derive2 { name="BlockFeST"; version="1.8"; sha256="12cbrmgqszlj729zrn9d1d7drbr0iay43knnmrzcxs6v7lfszsx5"; depends=[BASIX]; }; BlockMessage = derive2 { name="BlockMessage"; version="1.0"; sha256="1jrcb9j1ikbpw098gqbcj29yhffa15xav90y6vpginmhbfpwlbf4"; depends=[]; }; BlythStillCasellaCI = derive2 { name="BlythStillCasellaCI"; version="1.0.0"; sha256="0xgrrh6rf732c2dh1z1qyvkqw8ga1yl6i802r399bb7k55g6z6d0"; depends=[]; }; Bmix = derive2 { name="Bmix"; version="0.6"; sha256="17swhn2p7jv29fkspacg2v181lkc9yd3xww2fx31xs8hsndcm857"; depends=[mvtnorm]; }; - BoSSA = derive2 { name="BoSSA"; version="3.6"; sha256="00jxml2lyw1rc0ifs111sbz30186z61zvz1qy6wz74024c6gsw89"; depends=[ape jsonlite phangorn plotrix RSQLite]; }; + BoSSA = derive2 { name="BoSSA"; version="3.7"; sha256="0qhcar3grp6l6islbjc27jqvgh37kkdi0nql6plsqwilldv3kis6"; depends=[ape jsonlite phangorn plotrix RSQLite]; }; BoardGames = derive2 { name="BoardGames"; version="1.0.0"; sha256="1w3ghs29qlnjrd46lvv055snclwwy6a22fgdqszqm377w4favnhm"; depends=[]; }; - Bolstad = derive2 { name="Bolstad"; version="0.2-40"; sha256="1xz2x8gm27aqw1b3psjbpmzkxla8rvkvb974c3imgj71d1x0ykgm"; depends=[mvtnorm]; }; + Bolstad = derive2 { name="Bolstad"; version="0.2-41"; sha256="0rrx254wmr4i57h097ahba151chm8l2287qfg01p1lg47znld21h"; depends=[mvtnorm]; }; Bolstad2 = derive2 { name="Bolstad2"; version="1.0-28"; sha256="08cfadvl9jl9278ilsf8cm2i2a3i8zsa2f3vjzw2nlv85fwi2c7v"; depends=[]; }; BoltzMM = derive2 { name="BoltzMM"; version="0.1.4"; sha256="17nsjr2y8nniaxd6f13g85gb9rshar72qqp45yh2ygg4zrx1d226"; depends=[BH Rcpp RcppArmadillo]; }; BonEV = derive2 { name="BonEV"; version="1.0"; sha256="0lmgrg53b0abb5hidyjjmwn7lf2ani84k9fil7g6j6mdajjhh1b7"; depends=[qvalue]; }; @@ -527,7 +543,6 @@ in with self; { BootstrapQTL = derive2 { name="BootstrapQTL"; version="1.0.2"; sha256="1qf93wmrh6znm81jr3gyn1sl8x4i6pdx811r70fg8k026fbfjn3a"; depends=[data_table foreach MatrixEQTL]; }; Boptbd = derive2 { name="Boptbd"; version="1.0.5"; sha256="1p786avc37yq5g01zh6sqx7b1rvbxrh6gbxsad4bdvr12cjdsss6"; depends=[igraph MASS Matrix]; }; Boruta = derive2 { name="Boruta"; version="7.0.0"; sha256="0y2w4wb45kfnzrxcrdsiwgal9fsnlr3wad1sqdc70qv8gp921xbg"; depends=[ranger]; }; - BosonSampling = derive2 { name="BosonSampling"; version="0.1.1"; sha256="0wxn12h903a0mlrkrr3w4qd9ld2a4bifs95i98cnl2dsb76rwf12"; depends=[Rcpp RcppArmadillo]; }; BoutrosLab_plotting_general = derive2 { name="BoutrosLab.plotting.general"; version="6.0.1"; sha256="0wg81bg1bm9llir17v4xmsai3jgx3f10fqphwk450w4zr889fhy5"; depends=[cluster e1071 gridExtra gtable hexbin lattice latticeExtra MASS]; }; BradleyTerry2 = derive2 { name="BradleyTerry2"; version="1.1-2"; sha256="0vss3ib74cz2zn1afmrvllawghj9z2ay4x1ysvk4rqvjmiia4a2i"; depends=[brglm gtools lme4 qvcalc]; }; Branching = derive2 { name="Branching"; version="0.9.4"; sha256="1c209gdasm7qipv2gg4d1hr0jmhnzz5rddgjxb7xacazc0c2mhff"; depends=[]; }; @@ -546,7 +561,7 @@ in with self; { Bvalue = derive2 { name="Bvalue"; version="1.0"; sha256="17zlllzjrcq4grggal3hlg384990n62wnflr2g21fa6hcnglwy7d"; depends=[]; }; C443 = derive2 { name="C443"; version="3.0.0"; sha256="1wfj5avyrqf60g0vdfk6dmrs7dzp3zq22g9j9j9j78hcykbnjdj4"; depends=[cluster ggplot2 gridExtra igraph MASS partykit plyr qgraph RColorBrewer reshape2 rpart]; }; C50 = derive2 { name="C50"; version="0.1.3.1"; sha256="0ikm0awb6v5iignr1izmcaw6l32gyn3rsinq58panl7gvsl1n58b"; depends=[Cubist partykit]; }; - CA3variants = derive2 { name="CA3variants"; version="2.5"; sha256="0n9zzca5vdp09yp0c9znph6av28pc33lrm5hbfijs5riplp1ixa1"; depends=[ggforce ggplot2 ggrepel gridExtra multichull plotly]; }; + CA3variants = derive2 { name="CA3variants"; version="3.0"; sha256="0n0a4rxaskz94kibcycrsg46w8r515r4pzadvlv6b43qpgwrqh92"; depends=[checkmate ggforce ggplot2 ggrepel gridExtra multichull plotly]; }; CADFtest = derive2 { name="CADFtest"; version="0.3-3"; sha256="06bwv728ckalzibxginzfica24w18m4g87i0i064m3q89ghmnlqm"; depends=[dynlm sandwich tseries urca]; }; CADStat = derive2 { name="CADStat"; version="3.0.8"; sha256="0wdglw1vyd5gz70r9ma0mwshvizv39nb4ahp8pvr70c4qqzsfhc0"; depends=[bio_infer car gdata gmodels JavaGD JGR lattice MASS quantreg rJava rpart XML]; }; CAISEr = derive2 { name="CAISEr"; version="1.0.16"; sha256="08br6hdpgf9y2fix299diwd8r3q4gylpbzll4knpxq0vi18a3hz3"; depends=[assertthat ggplot2 gridExtra pbmcapply]; }; @@ -555,7 +570,7 @@ in with self; { CANSIM2R = derive2 { name="CANSIM2R"; version="1.14.1"; sha256="1dnzbd9lyqj3w80lx12qxcsbmv8wy6hxknyi5ijp99cfv7kaq1kc"; depends=[downloader Hmisc reshape2]; }; CARBayes = derive2 { name="CARBayes"; version="5.2"; sha256="08ajcgc0ycngcl2d757yjz1mpki88aq2jp07nr64j8aqpych5lw2"; depends=[CARBayesdata coda dplyr GGally leaflet MASS matrixcalc MCMCpack Rcpp rgdal sp spam spdep truncnorm]; }; CARBayesST = derive2 { name="CARBayesST"; version="3.1"; sha256="12l4jdbaadnyngqphzc8fsspynryci9p9h6bl1196arqd5igax94"; depends=[CARBayesdata coda dplyr GGally ggplot2 gridExtra gtools leaflet MASS matrixcalc matrixStats Rcpp rgdal sp spam spdep testthat truncdist truncnorm]; }; - CARBayesdata = derive2 { name="CARBayesdata"; version="2.1"; sha256="09rjxdrbpnqm6gv9g1jxh91jmww345wi9vlhb4s1n6b3xnh44fhs"; depends=[shapefiles sp]; }; + CARBayesdata = derive2 { name="CARBayesdata"; version="2.2"; sha256="06pkhmlkp4hl7c6bgarhab6z640h1xvgw86q1ihipbc432an4gvl"; depends=[shapefiles sp]; }; CARE1 = derive2 { name="CARE1"; version="1.1.0"; sha256="1zwl4zv60mrzlzfgd7n37jjlr0j918a8ji36n94s5xw8wwipiznw"; depends=[]; }; CARLIT = derive2 { name="CARLIT"; version="1.0"; sha256="04kpjfps4ydf8fj75isqp16g1asdsyf8nszhbfkpw1zxkrmiksyp"; depends=[]; }; CARRoT = derive2 { name="CARRoT"; version="2.5.1"; sha256="0z5vrsyzfiv1nzggqmrgybfyjg0wdcdag4xjg0f70p5x91fg1cqk"; depends=[doParallel foreach nnet Rdpack]; }; @@ -568,15 +583,14 @@ in with self; { CAinterprTools = derive2 { name="CAinterprTools"; version="1.1.0"; sha256="07rvi91ysqyfwagmip0cnqjahv1n8slicd5hznqf5v3l841xh7p7"; depends=[ca classInt cluster FactoMineR ggplot2 ggrepel Hmisc RcmdrMisc reshape2]; }; CAvariants = derive2 { name="CAvariants"; version="5.5"; sha256="0bxifvhpjay18k6gkppypc1d0zaln1zhnxabvvld0pz4h59s2hlv"; depends=[ggforce ggplot2 ggrepel gridExtra plotly]; }; CB2 = derive2 { name="CB2"; version="1.3.4"; sha256="0431bd956hmkrhs9x845vjwbzzwzd7n9nfx9y95mv6qv84zd4wv2"; depends=[dplyr ggplot2 glue magrittr metap pheatmap R_utils Rcpp RcppArmadillo readr stringr tibble tidyr]; }; - CBCgrps = derive2 { name="CBCgrps"; version="2.7"; sha256="1hqndrz3snir3pibqsbyzgbllgmdiprgq27a31vl29vkswpiwwsm"; depends=[nortest]; }; + CBCgrps = derive2 { name="CBCgrps"; version="2.8.1"; sha256="1dqzn7ip49y5q863bzw5i086nl3ck2cfsvyw86k8dhcbs785pr56"; depends=[nortest]; }; CBDA = derive2 { name="CBDA"; version="1.0.0"; sha256="0qm77vvqjgi83i8izly995ziv9ski8kgzqyq4g81i2k7a5dp8vxv"; depends=[doParallel foreach prettydoc SuperLearner]; }; CBPS = derive2 { name="CBPS"; version="0.21"; sha256="0av9lgdn9z57xl9cp53pi9nq971a6fj4przczw7sdb5saml3yr30"; depends=[glmnet MASS MatchIt nnet numDeriv]; }; CBSr = derive2 { name="CBSr"; version="1.0.3"; sha256="0lfs8p9nha1aq6dn6sd3pc9x0931zawxprpflfv9gqb8w7n1z4sd"; depends=[NlcOptim rJava]; }; CBT = derive2 { name="CBT"; version="1.0"; sha256="13h6sf7w03nfq2arqymwww13ywnv9xnqbqazlzn856mj3ggaqda7"; depends=[]; }; CC = derive2 { name="CC"; version="1.0"; sha256="189si37ggichqmzy8m686zw1cijix7yfy8ma5iqpnq1q9vm3pcvy"; depends=[]; }; CCA = derive2 { name="CCA"; version="1.2"; sha256="00zy6bln22qshhlll0y0adnvb8wa1f7famqyws71b6pcnwxki5ha"; depends=[fda fields]; }; - CCAGFA = derive2 { name="CCAGFA"; version="1.0.8"; sha256="1jxb6d1h5p97wnr45s1fsspksqn771nib415ihxi4vj5w8s94j8b"; depends=[]; }; - CCAMLRGIS = derive2 { name="CCAMLRGIS"; version="3.0.5"; sha256="1sdgpp96ja4lkkr276aj0d5f5gipayp7fdq7dfd48iraqyb8y2ph"; depends=[dplyr geosphere magrittr raster rgdal rgeos sp]; }; + CCAMLRGIS = derive2 { name="CCAMLRGIS"; version="3.0.6"; sha256="1xcxg3k0qgsh85l60sr9mi7a1mjjrw0rim4k05piwr2binwn1s1c"; depends=[dplyr geosphere magrittr raster rgdal rgeos sp]; }; CCM = derive2 { name="CCM"; version="1.2"; sha256="1mhl7yppniybdffylddbbb65n7gmv029fb46wlsxm4yf2xkplmwy"; depends=[]; }; CCP = derive2 { name="CCP"; version="1.1"; sha256="07jxh33pb8llk1gx4rc80ppi35z8y1gwsf19zrca9w91aahcs8cx"; depends=[]; }; CCTpack = derive2 { name="CCTpack"; version="1.5.2"; sha256="1kkxsk9x4jz2bvldmba7fsri3zc1cjz15z0xicjmfc7lj72ngdig"; depends=[MASS mvtnorm polycor psych R2jags rjags]; }; @@ -586,25 +600,25 @@ in with self; { CDM = derive2 { name="CDM"; version="7.5-15"; sha256="159ny2dz0rf1r3k1mqlfwambffc8rx425sggf5bn51nybpzanq3l"; depends=[mvtnorm polycor Rcpp RcppArmadillo]; }; CDNmoney = derive2 { name="CDNmoney"; version="2012.4-2"; sha256="1isbvfq0lygs75y1hn3klqms8q7g1xbkcr8fgj75h1c99d4khvm6"; depends=[]; }; CDROM = derive2 { name="CDROM"; version="1.1"; sha256="0mvhqs4m8jp39x1rk31a1sqqmfq1avcnasgh8bizlyxx62igmi1b"; depends=[]; }; - CDVine = derive2 { name="CDVine"; version="1.4"; sha256="0cp78pb6yny4n5q2j9k6xdql588536572gbphnw8zkdmrg65qyz7"; depends=[igraph MASS mvtnorm]; }; CDVineCopulaConditional = derive2 { name="CDVineCopulaConditional"; version="0.1.1"; sha256="1wyy324vrwipdsq0p021bj1gdhyxg09g3dkw8wv5v6rfrrs84m9k"; depends=[combinat VineCopula]; }; CEC = derive2 { name="CEC"; version="0.10.2"; sha256="03fxhqlpn7x3djfanlix3yzf1cy6zf854g70gq2d93ix9gis7knv"; depends=[]; }; CEGO = derive2 { name="CEGO"; version="2.4.0"; sha256="1rmx9ppiw7k5cznanz3m4lnhriz3fs4f7wk5h3q9wg9cyzfjhh38"; depends=[DEoptim fastmatch MASS Matrix ParamHelpers quadprog]; }; CENFA = derive2 { name="CENFA"; version="1.1.0"; sha256="03l0i24m2mh0gfmg7b48qg15zmfr8a39l1nswvmbmcj2a5hxybf4"; depends=[doSNOW foreach magrittr pbapply raster Rcpp snow sp]; }; CEoptim = derive2 { name="CEoptim"; version="1.2"; sha256="0bbjrhl63cbx1rsr5gclbqhjpnjid8ynk2ygaf1chf8z381n7650"; depends=[MASS msm sna]; }; + CFAcoop = derive2 { name="CFAcoop"; version="0.1.0"; sha256="11p53kr15s6xmv0wmn93n71dja2rkivkb5f83lhpy6iv5ihcf1wq"; depends=[Hmisc mvtnorm]; }; CFC = derive2 { name="CFC"; version="1.1.2"; sha256="0k0685cgsd0lm7id6h216r4x236xn3nqj4h906qn2i0kvwmx4nda"; depends=[abind doParallel foreach Rcpp RcppArmadillo RcppProgress survival]; }; CFF = derive2 { name="CFF"; version="1.0"; sha256="04z3q0s4b1yns5l7lplw8qrcdjzsdy9crnhakyzd6r449hjfsvnz"; depends=[]; }; - CFilt = derive2 { name="CFilt"; version="0.1.0"; sha256="1kxpw91rsnd6c962ldvvn3xylc0sadb69yi5gv3zkzj9isncv2zy"; depends=[]; }; + CFilt = derive2 { name="CFilt"; version="0.2.1"; sha256="1iah41s0pd8s4vmg7r6npsgmfr6mvyp5wfnyimx51fqr2f3narwf"; depends=[]; }; CGE = derive2 { name="CGE"; version="0.3.3"; sha256="0q1fv62159cx9z25488fxf6a6fi1m59hdh60ldypsjwil77q0s3i"; depends=[]; }; CGGP = derive2 { name="CGGP"; version="1.0.2"; sha256="0z71sl1vsz3f84scxa25444fb6wm1jbd05syapggjxnjcglmiq45"; depends=[Rcpp RcppArmadillo]; }; CGManalyzer = derive2 { name="CGManalyzer"; version="1.3"; sha256="1wmp5im18s447rjkj891skrm7558xkqlbx43n9hyxiqg49zq1ng9"; depends=[]; }; CGP = derive2 { name="CGP"; version="2.1-1"; sha256="05a6gydlb99yk2jpy2hyg4c30hqyp8dg2i9dmbjc1n5cmgpg3im9"; depends=[]; }; - CGPfunctions = derive2 { name="CGPfunctions"; version="0.6.2"; sha256="05f1h29hd1mr2h68rz6yc1ickkmbv12z2xav8gppqqj5657zxnhf"; depends=[BayesFactor broom car DescTools dplyr forcats ggmosaic ggplot2 ggrepel paletteer partykit purrr rlang scales sjstats stringr tidyr]; }; + CGPfunctions = derive2 { name="CGPfunctions"; version="0.6.3"; sha256="12l3ww9wfrk8i0a63wv5h4ayqj6fj5fz5yvkiskvaaida32vds2m"; depends=[BayesFactor DescTools dplyr forcats ggmosaic ggplot2 ggrepel paletteer partykit purrr rlang scales sjstats stringr tidyr]; }; CHCN = derive2 { name="CHCN"; version="1.5"; sha256="18n8f002w0p0l1s5mrrsyjddn10kdbb6b7jx1v9h1m81ifdbv0xb"; depends=[bitops RCurl]; }; CHFF = derive2 { name="CHFF"; version="0.1.0"; sha256="0jv75p1bnwsad2vpxf1zwq97al9xxhk2hpnpsilf0jn0w7g9b2d3"; depends=[]; }; CHMM = derive2 { name="CHMM"; version="0.1.1"; sha256="07fdvnwhblwvljbl2z0vs42nwki67yl5ly3fj40p50k3rnqqmavj"; depends=[mclust]; }; - CHNCapitalStock = derive2 { name="CHNCapitalStock"; version="0.0.2"; sha256="187rkb7bi5lm4xfg6ibw3n1x5cgrbz30d9x3i1jdyhg619xgg8nl"; depends=[dplyr magrittr]; }; - CHNOSZ = derive2 { name="CHNOSZ"; version="1.3.6"; sha256="0imfyvagvxqffvz3ksvkmfc2lbfli5lsxvnqby7iw2dp1gzpaxqc"; depends=[]; }; + CHNCapitalStock = derive2 { name="CHNCapitalStock"; version="0.1.0"; sha256="1w8abj1rxkpql696dr6w19xsgxjmkm0jwnln7lp48fnxdsa424x8"; depends=[dplyr magrittr]; }; + CHNOSZ = derive2 { name="CHNOSZ"; version="1.4.0"; sha256="0lifanx2y2crhmfdqja26dj5agyb3qnryjhp3c1vnnp774vqabr6"; depends=[]; }; CHsharp = derive2 { name="CHsharp"; version="0.4"; sha256="19mb5zzi9x4pm2z9jbha5dz4k5f1iqjv31aisyv4qh14k5ysdz2i"; depends=[KernSmooth scatterplot3d]; }; CIAAWconsensus = derive2 { name="CIAAWconsensus"; version="1.3"; sha256="0yhay4fp5lyf0sdcf807yvys17qz9cr5f5ikim25mq336p7fp03x"; depends=[Matrix mvtnorm numDeriv stringr]; }; CIEE = derive2 { name="CIEE"; version="0.1.1"; sha256="03kq9cp0v41y0r2l9j5imcrsail2xsvlzhhhsrw454d4s9gqdql9"; depends=[survival]; }; @@ -619,23 +633,26 @@ in with self; { CJAMP = derive2 { name="CJAMP"; version="0.1.1"; sha256="0caznbqy5hsp7h0gkdbv966vfpq8z1khvbizi4vpc9mxck1nqc99"; depends=[optimx]; }; CKAT = derive2 { name="CKAT"; version="0.1.0"; sha256="03vxl91z2mhi1h0xgcwhw63mvj56156zgphm16ijdff63pqxaryr"; depends=[CompQuadForm]; }; CKLRT = derive2 { name="CKLRT"; version="0.2.3"; sha256="1d8sg3ncns3fpjaghz1h1z9nfrl31v09xijrzzsias8xjrpi191b"; depends=[MASS mgcv nlme Rcpp RcppEigen]; }; - CLA = derive2 { name="CLA"; version="0.95-1"; sha256="0h3b1wmmfhajdgd2nmm1wkrg83fwbwj4yphjqin8yw9a0izqf0mz"; depends=[]; }; + CLA = derive2 { name="CLA"; version="0.96-1"; sha256="1nxzs0y6mid5f2903pxrkqc3rhk7vpax8wm588ddlz6c97y3m8gk"; depends=[]; }; CLME = derive2 { name="CLME"; version="2.0-12"; sha256="161maq22r8wbd6c2dc8b47mh6991vc4iqmjr8g6yqb5gcwca8zhg"; depends=[isotone lme4 MASS nlme openxlsx prettyR shiny stringr]; }; CLONETv2 = derive2 { name="CLONETv2"; version="2.1.0"; sha256="15wqs4hdxyfdglfr4dkm4rndz15rbq7dxlq1zq3vfslvi1qxaxdb"; depends=[arules ggplot2 ggrepel sets]; }; CLSOCP = derive2 { name="CLSOCP"; version="1.0"; sha256="0rkwq9rl2ph4h5zwb2i3yphjyzxmh6b6k23a8gcczycx6xdq4yhw"; depends=[Matrix]; }; CLUSTShiny = derive2 { name="CLUSTShiny"; version="0.1.0"; sha256="19mh5g1ylvlab4xjxw7girxk9zkpxxczhbfijf11b592hbw0qxqk"; depends=[cluster dplyr klaR MASS psycho rmarkdown shiny]; }; - CLVTools = derive2 { name="CLVTools"; version="0.6.0"; sha256="165b8mxmvfm7j2v10c0pn451fy05gy90vlxqbm3n1m4il0ynlhs3"; depends=[data_table foreach ggplot2 lubridate MASS Matrix optimx Rcpp RcppArmadillo RcppGSL]; }; + CLVTools = derive2 { name="CLVTools"; version="0.7.0"; sha256="0w15dnl9ld5fjsq9xmm7j8fpar3fgr3mz6aj7ndnsxwhpja21rn5"; depends=[data_table foreach ggplot2 lubridate MASS Matrix optimx Rcpp RcppArmadillo RcppGSL]; }; CMC = derive2 { name="CMC"; version="1.0"; sha256="1r9a5k79fyw01yiwxq02327hpn4l1v2lp0958jj9217wxmhn3pr5"; depends=[]; }; + CME_assistant = derive2 { name="CME.assistant"; version="1.1.1"; sha256="1dfb1pld4bsdkmgcfmaxyxqj8dh8wjsmvm82klc45sbhbaj10s5c"; depends=[data_table ggforce ggplot2 here lubridate readr readxl scales stringr usethis xlsx]; }; CMF = derive2 { name="CMF"; version="1.0.2"; sha256="0hm6srsylg1syz86iz93qyxr7xgh1qvmp27k2hgkj1z1z8lsw1ca"; depends=[Rcpp]; }; CMLS = derive2 { name="CMLS"; version="1.0-0"; sha256="1542qqsl6sksrcpwhnn55d260hkbmy4ikd0v2an96yxk5w95spvn"; depends=[quadprog]; }; CMShiny = derive2 { name="CMShiny"; version="0.1.0"; sha256="0ciis3930yhn4dmazsg2yp7wi9hdfj5slr032x8qfllxis7m4k0w"; depends=[caret e1071 epitools Matrix rmarkdown shiny shinyMatrix]; }; CMapViz = derive2 { name="CMapViz"; version="0.1.0"; sha256="1s7xyp13p7fpbq0bghk07dfv90339kxs7k3343jqhrn8djf3as67"; depends=[dplyr ggplot2 readxl reshape2 scales stringr]; }; CMatching = derive2 { name="CMatching"; version="2.3.0"; sha256="0q0hplhsamj46z7g6pa7yg1bap5822ka1419yhcip551djhvnpmv"; depends=[lme4 lmtest Matching multiwayvcov]; }; CMplot = derive2 { name="CMplot"; version="3.6.2"; sha256="13y05j5gsdc712fn7yvcz5nx2pbcdvl201hfb6jzpvl86qx2l0j1"; depends=[]; }; + CNAIM = derive2 { name="CNAIM"; version="1.0.1"; sha256="1k1n4a60mslkrazarn12yaj54kibqsdhj44himpcjvf4kzv8k7vd"; depends=[dplyr htmltools htmlwidgets jsonlite magrittr plyr r2d3 readxl stringr testthat tibble widgetframe]; }; CNLTreg = derive2 { name="CNLTreg"; version="0.1-2"; sha256="07yi0ajil1113663v3gp5d3453r4l9qm442jnpydx4ygvjk7m2ha"; depends=[adlift miscTools nlt]; }; CNLTtsa = derive2 { name="CNLTtsa"; version="0.1-2"; sha256="1vy0jjg6s8yvsvkx4pin183y5bnikm5cmjcpa9znz9dj1w6hwr5r"; depends=[adlift CNLTreg fields nlt]; }; CNOGpro = derive2 { name="CNOGpro"; version="1.1"; sha256="1frsmhfqrlg1vsa06cabqmrzngq4p5gqwyb9qgnsgg81a9ybm6l8"; depends=[seqinr]; }; - CNVScope = derive2 { name="CNVScope"; version="3.1.8"; sha256="1qgnwivb66bw1m5f3r5r3r4a8439pja0w44rdvbpdlwfdfk23d0b"; depends=[biomaRt data_table doParallel dplyr foreach GenomicInteractions ggplot2 jointseg magrittr Matrix matrixStats numbers OpenImageR plotly plyr RCurl reshape2 rtracklayer shiny stringr tidyr]; }; + CNVRG = derive2 { name="CNVRG"; version="0.2"; sha256="1678bkhpyynl0vzgdf9knn4xwa3289pmiw7x383fgv3hh8jsp1mn"; depends=[BH Rcpp RcppEigen RcppParallel rstan rstantools StanHeaders vegan]; }; + CNVScope = derive2 { name="CNVScope"; version="3.3.9"; sha256="0l2wrh314cyslyxd2fkx92ay4s5a7v23in4whs316qx5al04jbzw"; depends=[biomaRt data_table doParallel dplyr foreach GenomicInteractions ggplot2 jointseg magrittr Matrix matrixStats numbers OpenImageR plotly plyr RCurl reshape2 rtracklayer shiny stringr tidyr]; }; CNprep = derive2 { name="CNprep"; version="2.0"; sha256="08dpjikx3ldqzw2kwb12q0kbw15qzl09srjdfs0sz9si0x6bfxs6"; depends=[mclust rlecuyer]; }; CNull = derive2 { name="CNull"; version="1.0"; sha256="14hy86zg18hqxi63bfzrpkz70yrzfxp2v2pva5xnrvx9dmlyz820"; depends=[ape Matrix PhyloMeasures Rcpp]; }; COBRA = derive2 { name="COBRA"; version="0.99.4"; sha256="1r1cw12d7c148pcgcg08bfsr1q1s736kfpyyss6b4d7ny7wgmqy4"; depends=[]; }; @@ -651,10 +668,11 @@ in with self; { COST = derive2 { name="COST"; version="0.1.0"; sha256="06xgnsccd621ihlrdmnnh14vh83q1r2bnp3iqi7vp5553b3y4l3w"; depends=[copula mvtnorm]; }; COUNT = derive2 { name="COUNT"; version="1.3.4"; sha256="02f7779fy0d2bql88x5v9csbxljhnyvl8wb8h83xrmwl7kaxsdpy"; depends=[MASS msme sandwich]; }; COUSCOus = derive2 { name="COUSCOus"; version="1.0.0"; sha256="1ykqi72v8v1b3g9qy6h34dvk5fynzf1rl2mby65p08axmaba5798"; depends=[bio3d matrixcalc]; }; - COVID19 = derive2 { name="COVID19"; version="2.2.0"; sha256="0h4a1r84xb5d97p4v24xp518jv08kb9798fcnxrzy059cqv2dip8"; depends=[dplyr tidyr wbstats]; }; + COVID19 = derive2 { name="COVID19"; version="2.3.1"; sha256="0a2d7hl22hmmwqnv88y7n2habvn85zi3gn2q18n16w03wp1kmnvq"; depends=[dplyr tidyr]; }; + COVIDIBGE = derive2 { name="COVIDIBGE"; version="0.1.0"; sha256="0r505811wnskya507f9qwwy1j4gkv3cj4h8nl42892m3vk07w0vl"; depends=[dplyr magrittr RCurl readr readxl survey tibble timeDate]; }; CP = derive2 { name="CP"; version="1.6"; sha256="18zblf13riiz3mq3hkvg6vhiwjzpsn6mvgc2p0bqyldy98v4aisd"; depends=[survival]; }; CPAT = derive2 { name="CPAT"; version="0.1.0"; sha256="0zygncwww3cazwmx06bhzq0g41xcqfpw307azdhygc8jmcy6qj71"; depends=[purrr Rcpp RcppArmadillo Rdpack]; }; - CPBayes = derive2 { name="CPBayes"; version="1.0.0"; sha256="0m9hy14xmaa0lswn2dlrjvqcsg14smxy3w1nmy48l3af1c2kjnxv"; depends=[forestplot MASS mvtnorm purrr]; }; + CPBayes = derive2 { name="CPBayes"; version="1.1.0"; sha256="1kw0r8spqm0s7cb3w5gplw67mhfmcbbf3ligngbary77ghkzirnb"; depends=[forestplot MASS mvtnorm purrr]; }; CPE = derive2 { name="CPE"; version="1.5.1"; sha256="0n3pd6daj0mzhh547syh7nz8iys6q27igqngldb8zd4ib4778603"; depends=[rms survival]; }; CPMCGLM = derive2 { name="CPMCGLM"; version="1.2"; sha256="07hx2ik5zg05w1h6i94398mp54q958phws9ydgp6syjqlp9dpf1p"; depends=[abind mvtnorm plyr]; }; CPP = derive2 { name="CPP"; version="0.1.0"; sha256="1kdf43pnavjbmxkvrj78fiwl0ykln9x9ck8pcivhj9q5rsfbhbh4"; depends=[ineq kappalab mc2d]; }; @@ -668,59 +686,66 @@ in with self; { CRPClustering = derive2 { name="CRPClustering"; version="1.2"; sha256="19m7jg6ck2gqmry2p35h3vv8msm4w1x7qwwmm746r646q7w9ylml"; depends=[dplyr lucid MASS mvtnorm png randomcoloR]; }; CRTSize = derive2 { name="CRTSize"; version="1.0"; sha256="1d45zx26bf0zk0piham69gvb8djqf48g6iisbldv0ds3s2hhcsin"; depends=[]; }; CRTgeeDR = derive2 { name="CRTgeeDR"; version="2.0"; sha256="1fzw8618k152b8d4d6wmzp0bfkz2grwp0rqsplwvfdx23nxq437n"; depends=[ggplot2 MASS Matrix]; }; - CRUF = derive2 { name="CRUF"; version="0.5.1"; sha256="0mx7ksd5csy7v7v0wacfafs84sdfd41sy3f0yzpis9f07r7pqp3w"; depends=[aod miceadds survival survminer]; }; CRWRM = derive2 { name="CRWRM"; version="0.0.1"; sha256="0w6lg5q2c0w5p9vg5qr32pycyl8d1zp0s55jlvf2xhmqx34677hd"; depends=[]; }; CSESA = derive2 { name="CSESA"; version="1.2.0"; sha256="0pv6iabq1w22qbhlsbckdvva4n7igpzrjnrahmq83a6wxgvjbf5j"; depends=[Biostrings]; }; CSFA = derive2 { name="CSFA"; version="1.2.0"; sha256="1nkyhk8qhrrlx8v26yw86l954m4xfcxma4pqbhgw95jvqql5h3li"; depends=[elasticnet fabia FactoMineR pls randomcoloR snowFT]; }; CSMES = derive2 { name="CSMES"; version="1.0.0"; sha256="1ddr2b39d7nwan6dqf5xx9h6gzfxxk50r1d9vbpb9hc8a7d15vnp"; depends=[caTools data_table mco ROCR rpart zoo]; }; CSTools = derive2 { name="CSTools"; version="3.1.0"; sha256="11mw7kl85m5l6ixlsbbmb9rfy6z6mfjdbgwmwrggjn4wbb0d0p76"; depends=[abind ClimProjDiags data_table ggplot2 maps multiApply ncdf4 plyr qmap rainfarmr RColorBrewer reshape2 s2dv s2dverification verification]; }; + CSUV = derive2 { name="CSUV"; version="0.1.1"; sha256="1gh8gxwnrg4j017c08xfhm57rwci24sqmxxx00k3d0mw6j0mbdvw"; depends=[caret doParallel DT futile_logger ggplot2 glmnet HDCI MASS ncvreg relaxo reshape2 shiny shinyjs]; }; CSclone = derive2 { name="CSclone"; version="1.0"; sha256="0lqsqsgh2sf44fr1r7g179556v294yr1wy7x4320g7adxshrwyh5"; depends=[DNAcopy lpSolve mcclust moments]; }; CSeqpat = derive2 { name="CSeqpat"; version="0.1.2"; sha256="1nqk873cagpn4fba4rmyzb6hni1p5lqcvsr9givrcm0gfx756w1h"; depends=[NLP tm]; }; CTAShiny = derive2 { name="CTAShiny"; version="0.1.0"; sha256="18qw8nx1r4gwlxj9zxn4hllpn29fv3i4fgwyl5fh3qsv9hmbvi0x"; depends=[epitools rpivotTable shiny shinyMatrix]; }; + CTD = derive2 { name="CTD"; version="0.99.8"; sha256="1mq9hb5b8x08lc0x9xng09v1bw1w15fscvdj9lmwvwjg2hmjqfdg"; depends=[gmp igraph]; }; CTM = derive2 { name="CTM"; version="0.2"; sha256="0h1lpygjq46nwkn4km49bngvxmgrnh3csrfln3yjr9yyzs7d3lz1"; depends=[jiebaR plyr]; }; + CTP = derive2 { name="CTP"; version="2.0.0"; sha256="10nzqswzga0rnsv5ivz120a9ybarnzq690xnxzfhsswhbc5mld6i"; depends=[clinfun diagram dplyr Gmisc magrittr MASS shape survival]; }; CTShiny = derive2 { name="CTShiny"; version="0.1.0"; sha256="0lmzf02w8j4rgz1kh7jwvl0sb6y38r56gwmsf7pkc00w1dskb722"; depends=[caret dplyr e1071 party rhandsontable rmarkdown rpart rpart_plot shiny]; }; + CTShiny2 = derive2 { name="CTShiny2"; version="0.1.0"; sha256="13klj1h0m80hlf5hbbzm2xriy37ky772pk1fm4b6k3xma7ss2a6q"; depends=[caret dplyr e1071 party rhandsontable rmarkdown rpart rpart_plot shiny]; }; CTT = derive2 { name="CTT"; version="2.3.3"; sha256="02z354gf7rzh9xzyflmsag4hgmqgv3sr9s9ja903rwdz1pjqrlff"; depends=[]; }; CTTShiny = derive2 { name="CTTShiny"; version="0.1"; sha256="1c9vsiqyig6kfjpy3dfrysc466h4v9530m49aynz65i1njplswyh"; depends=[CTT ltm psych shiny shinyAce]; }; CTTinShiny = derive2 { name="CTTinShiny"; version="0.1.0"; sha256="1dc6kaxajkvviszmrcvhh9cg2k8g1hbpf1f6fg3wlgnb80fsx9b7"; depends=[CTT foreign shiny]; }; CUB = derive2 { name="CUB"; version="1.1.4"; sha256="1l47fkfvd91mbfzgl0vwaahbyi53jv3md6zah9ns85ns6xlwap7n"; depends=[Formula]; }; - CUFF = derive2 { name="CUFF"; version="1.6"; sha256="06ip6jrw6zgysz1lhlxxj26bv6hwg87qx6spqfinqrc9lz3p1y93"; depends=[DT lmerTest nlme openxlsx xtable]; }; + CUFF = derive2 { name="CUFF"; version="1.7"; sha256="1fvzr5fq4ciwqkfcasv9lad3g831l2nmx307ya91qamjblaaryqb"; depends=[DT lmerTest nlme xlsx xtable]; }; CUMP = derive2 { name="CUMP"; version="2.0"; sha256="0rdscywmi4sylpjpr8r472iapddizb1mqyrd532cvw6frxins7w0"; depends=[]; }; CUSUMdesign = derive2 { name="CUSUMdesign"; version="1.1.5"; sha256="1qxq1a8b5pnmlq6rpjzvcp32scn2qknafch3h7qjsy8499zzbxx8"; depends=[]; }; CVD = derive2 { name="CVD"; version="1.0.2"; sha256="0agb0liwbp4wvmxbyxgfb7471ki1agfb6ssh77kvwbkxqmrc8d96"; depends=[]; }; + CVEK = derive2 { name="CVEK"; version="0.1-2"; sha256="03z4s0szi8rl3izc651rvrhl2z247aaflyphzizplgmpw81xv1ry"; depends=[limSolve MASS]; }; CVR = derive2 { name="CVR"; version="0.1.1"; sha256="1y8m9r409jq5h6xx1rvz7c7aj882jldfxly89zf3cvp2qg3jh7rj"; depends=[PMA Rcpp RcppArmadillo]; }; CVST = derive2 { name="CVST"; version="0.2-2"; sha256="05l3yzkfrbds09ah9cdwn2sn4ryhq78lz33ryzrgkv176jc8qjw5"; depends=[kernlab Matrix]; }; CVThresh = derive2 { name="CVThresh"; version="1.1.1"; sha256="19d7pslzj8r3z5gn3cplpz2h2ayz6k1nrfx3s2b7a8w1il3vmi69"; depends=[EbayesThresh wavethresh]; }; CVTuningCov = derive2 { name="CVTuningCov"; version="1.0"; sha256="1bwzis82lqwcqp2djy4bnd3vvjr47krlv3pdc5msh12wcs0xhs7n"; depends=[]; }; - CVXR = derive2 { name="CVXR"; version="1.0-1"; sha256="023pf67ar0g795jdm6k3xjagns7gacmvab0sivrgisl4s51firdk"; depends=[bit64 ECOSolveR gmp Matrix osqp R6 Rcpp RcppEigen Rmpfr scs]; }; + CVXR = derive2 { name="CVXR"; version="1.0-8"; sha256="02hb7msmsal1b4svpb8bxvd8d4mpvscp48ajhsggh576h23y1mnv"; depends=[bit64 ECOSolveR gmp Matrix osqp R6 Rcpp RcppEigen Rmpfr scs]; }; CVcalibration = derive2 { name="CVcalibration"; version="1.0-1"; sha256="0ca582fnysrldlzxc3pihsph9pvdgygdh7sfzgxvr5fc3z1jbjzb"; depends=[]; }; CVglasso = derive2 { name="CVglasso"; version="1.0"; sha256="1bh09cd0yabhqv5yfahhvayx3f09yqapzl1yr9nc9xqwyx1d0cfd"; depends=[doParallel dplyr foreach ggplot2 glasso]; }; + CVrisk = derive2 { name="CVrisk"; version="1.0.0"; sha256="1cv9nkmligbl46mabhhlp35csgmqsri536qr6vxs493xmq4wjlyf"; depends=[]; }; CaDENCE = derive2 { name="CaDENCE"; version="1.2.5"; sha256="1z3p5y1l67r470x6wrhnyjvw1ndppcm08fpj99x122j7kn6byff2"; depends=[pso]; }; CaPO4Sim = derive2 { name="CaPO4Sim"; version="0.1.0"; sha256="1ihkx0swj9adz2pgfm9c20pcipq748czkyg76q3y0zk1j987nfik"; depends=[DT htmltools magrittr plotly purrr rintrojs shiny shinycssloaders shinydashboard shinydashboardPlus shinyjqui shinyjs shinyWidgets visNetwork]; }; Cairo = derive2 { name="Cairo"; version="1.5-12.2"; sha256="14hgz5wmnhlbqkd1g662n1agmjnlj3pq69gfng1vb0ivr02l2lnx"; depends=[]; }; - CalSim = derive2 { name="CalSim"; version="0.3.2"; sha256="1a4w9kh9ykms1i30hhd7h8gdkbfl6g071jmcy26j1sbshxrnq8s1"; depends=[spatstat]; }; + CalSim = derive2 { name="CalSim"; version="0.5.1"; sha256="1412i1d4i184yc34j221i59m4w46s02467sjnr1a955faj1k3c9k"; depends=[ExactMultinom spatstat]; }; Calculator_LR_FNs = derive2 { name="Calculator.LR.FNs"; version="1.3"; sha256="03qg9rnz623dwnp68xhhsh9788s49n6xp0migg1nnjaqhrahlgdd"; depends=[]; }; CalibratR = derive2 { name="CalibratR"; version="0.1.2"; sha256="1hnmhijckxd35h8mhpzqpglk1ykdih2c5kg17myc7cci5xjk9nfr"; depends=[doParallel fitdistrplus foreach ggplot2 pROC reshape2]; }; CalibrateSSB = derive2 { name="CalibrateSSB"; version="1.3.0"; sha256="0qwqvyrpprxc5v0ng6qjp9gmdf0n0iiv46z14d8h303xpi84g42x"; depends=[survey]; }; CamelUp = derive2 { name="CamelUp"; version="2.0.2"; sha256="102adw46rwhjx2wp34lhjxlgwi858dpmlzpj5wq85cnx5qkx01yx"; depends=[data_table dplyr ggplot2 magrittr Rcpp shiny]; }; + CancerGram = derive2 { name="CancerGram"; version="1.0.0"; sha256="1p612dbn6dxn3nz8m0pzlsbczg3f8gwqk9q0fnxbcdlbll0vf2k0"; depends=[biogram devtools dplyr pbapply ranger shiny stringi]; }; Canopy = derive2 { name="Canopy"; version="1.3.0"; sha256="0979hpphzhf4v71jx0shh3l8nffmpsn9l6f8ip2wxzcyx571i1wd"; depends=[ape fields pheatmap scatterplot3d]; }; CarletonStats = derive2 { name="CarletonStats"; version="2.0"; sha256="0pgzvw6gf8kjv8ndprwp4wlgdgh5sb75ga8z5syfw57fb05v7ac3"; depends=[]; }; Carlson = derive2 { name="Carlson"; version="1.0.0"; sha256="1m030x30cd0w2r6y280v9kpqalx6djhyx9hfzhk1qbqh5rk7br2l"; depends=[]; }; Cascade = derive2 { name="Cascade"; version="1.8"; sha256="0d75a9f43ligyjv62476plb86ipfq9y7g9njq4rx84cp17vbb662"; depends=[abind animation cluster igraph lars lattice limma magic nnls survival tnet VGAM]; }; CascadeData = derive2 { name="CascadeData"; version="1.2"; sha256="0czc41f1vj61rkdl6gnnnga3qliyxp0ffl5j9wrhrlwnbdaknics"; depends=[]; }; + CatDataAnalysis = derive2 { name="CatDataAnalysis"; version="0.1-3"; sha256="15wz7yjb83rd6d3xx0lb0p4x3ccnqpdkfanmbhykia50y8y32k5n"; depends=[]; }; CatDyn = derive2 { name="CatDyn"; version="1.1-1"; sha256="0gkaxs7apqhq7mp3chjsyhrnk3qkk11f8p7smmyj6h73888ry8jn"; depends=[BB optimx]; }; CatEncoders = derive2 { name="CatEncoders"; version="0.1.1"; sha256="1q9wzq06lac8z9y8b65alsxpb48bw8wqmifd893kknk51xq6r9kl"; depends=[data_table Matrix]; }; CatPredi = derive2 { name="CatPredi"; version="1.1"; sha256="1fqz2mb3xhpzvamf0bpqfql3vd86vq6fq7n6p8xq7lraj1w77lys"; depends=[CPE mgcv rgenoud rms survival]; }; - CatReg = derive2 { name="CatReg"; version="1.0.0"; sha256="10qvp3v8bwsynxxl1a6qkp9ddfqygjc0cm1nbxi86dwyi26mcvz0"; depends=[Rcpp Rdpack]; }; + CatReg = derive2 { name="CatReg"; version="2.0.1"; sha256="1wlzs7my9bdjb85bayq3rgb9mw5aqzhsf7s1j498w60z7hsgf7df"; depends=[Rcpp Rdpack]; }; CateSelection = derive2 { name="CateSelection"; version="1.0"; sha256="194lk6anrb05gaarwdg8lj5wm6k61b4r702cja3nf3z91i8paqi7"; depends=[]; }; - CausalFX = derive2 { name="CausalFX"; version="1.0.1"; sha256="0v0diqq9fa1v9n3v5m5shvwlgmj91cbbb78243rwib1h3pyacihf"; depends=[igraph rcdd rje]; }; CausalGAM = derive2 { name="CausalGAM"; version="0.1-4"; sha256="1riz11hfg96iks7734rg692l75nfrd3hmr9gw563j27rkk1nfkl6"; depends=[gam]; }; CausalImpact = derive2 { name="CausalImpact"; version="1.2.4"; sha256="0nszqvaxmz9jrb7wqdmjjplajk8mxpyyl14n2fm5p4pyx8srwphq"; depends=[assertthat Boom bsts dplyr ggplot2 zoo]; }; CausalKinetiX = derive2 { name="CausalKinetiX"; version="0.2.1"; sha256="0haxw4vvbw48hlvsl1d1y3xm48qm5vl0d3k5lj89ajwc618nk5jg"; depends=[cvTools deSolve fda glmnet pspline quadprog randomForest sundialr]; }; + CausalMBSTS = derive2 { name="CausalMBSTS"; version="0.1.0"; sha256="19ils8254vrbm3hbrjkk2r7xczr52zjhd38dfy7p1ksd2lm6x5qy"; depends=[CholWishart forecast KFAS MASS Matrix MixMatrix]; }; CausalQueries = derive2 { name="CausalQueries"; version="0.0.3"; sha256="1hnxxyix9zrg5ryzqksv0cl8m3n3n660dbg1msa0pn18dnbjbmj0"; depends=[BH dagitty dplyr gtools randomizr Rcpp RcppEigen rlang rstan rstantools StanHeaders stringr]; }; CautiousLearning = derive2 { name="CautiousLearning"; version="1.0.1"; sha256="1m5x93l4bscrpcxk0pva6d6n2qnzhzxh0a6a81p97l8lqgs1qw2q"; depends=[BH Rcpp sitmo spc]; }; CePa = derive2 { name="CePa"; version="0.7.0"; sha256="0jykh0f168azphjd3h1q81wlvj8zn8qy0c4wi275gvw0xwi104mk"; depends=[graph igraph Rgraphviz]; }; CeRNASeek = derive2 { name="CeRNASeek"; version="2.1.3"; sha256="0l36bz73xy9miikqdigbnyr0bk83dx6wsaqlsc14b0r64jca4ak6"; depends=[gtools igraph survival]; }; - CenBAR = derive2 { name="CenBAR"; version="0.1.0"; sha256="0qa1jzgvf33fi0vns7v49hjk0wkaxic7dw67m0wr33wjplf93wnh"; depends=[cvTools foreach glmnet MASS mvtnorm survival]; }; + CenBAR = derive2 { name="CenBAR"; version="0.1.1"; sha256="1k8ycm2rzwadr5bg6m0ay81c5v4wjg04yigch6a1w7g75gw01q50"; depends=[cvTools foreach glmnet MASS mvtnorm survival]; }; CensMFM = derive2 { name="CensMFM"; version="2.11"; sha256="0rq0a9041ipl6pjm15plb1hjz3a3fk27wzj94z91wf1jsmdj3j9z"; depends=[ggplot2 gridExtra MomTrunc mvtnorm tlrmvnmvt]; }; CensRegMod = derive2 { name="CensRegMod"; version="1.0"; sha256="0qqwkxn8knhcjb6mph7mp7mma56zxslbvkfgfajq2lq4gbg901y4"; depends=[]; }; CensSpatial = derive2 { name="CensSpatial"; version="2.58"; sha256="1jlr6v4qmqvmhcs10iv2nckmlhz3hzmrmj2gsdvfa5n8pgi2mak9"; depends=[geoR lattice moments msm mvtnorm numDeriv optimx psych raster tlrmvnmvt tmvtnorm]; }; @@ -738,28 +763,26 @@ in with self; { ChaosGame = derive2 { name="ChaosGame"; version="0.4"; sha256="10bq8i6b6zkg8nzq5np998xabyvijizxfbvw1m2nvfh74vxspj4p"; depends=[colorRamps ggplot2 gridExtra plot3D RColorBrewer rgl sphereplot]; }; ChargeTransport = derive2 { name="ChargeTransport"; version="1.0.2"; sha256="0mq06ckp3yyj5g1z2sla79fiqdk2nlbclm618frhqcgmq93h0vha"; depends=[]; }; CheckDigit = derive2 { name="CheckDigit"; version="0.1-1"; sha256="0091q9f77a0n701n668zaghi6b2k3n2jlb1y91nghijkv32a7d0j"; depends=[]; }; - ChemoSpec = derive2 { name="ChemoSpec"; version="5.2.12"; sha256="1qr09n2yc009x8ag0lbmn1m93qhck05jc8vx7j5wfa0g4i1b2r7f"; depends=[ChemoSpecUtils plyr readJDX]; }; - ChemoSpec2D = derive2 { name="ChemoSpec2D"; version="0.4.147"; sha256="0rmnkk9ddxr32l09bj8qkh1jpffwkyczjr6vwk1qliwfwsbc78rl"; depends=[ChemoSpecUtils colorspace readJDX]; }; + ChemoSpec = derive2 { name="ChemoSpec"; version="5.3.2"; sha256="0f1jl018a5mbr5dn6996n3il1y3cc6iabvh1vqjf6f0wgxa2k94s"; depends=[ChemoSpecUtils plyr readJDX]; }; + ChemoSpec2D = derive2 { name="ChemoSpec2D"; version="0.4.176"; sha256="0a6vs1zr0kjcaph0vkxzhy6i5fzv48nkdzavvq788mqaszd50kxv"; depends=[ChemoSpecUtils colorspace readJDX]; }; ChemoSpecUtils = derive2 { name="ChemoSpecUtils"; version="0.4.51"; sha256="0wwzv6qkm6iya6gld1jlxk1hnzf6ndpwjppk93bi6pgjkgjq5i5g"; depends=[plyr]; }; - ChemometricsWithR = derive2 { name="ChemometricsWithR"; version="0.1.13"; sha256="166va1g3m1wv21qkmw4wpz0bsrclh3jih8smxphdc13l9pqgclpq"; depends=[devtools kohonen MASS pls]; }; ChillModels = derive2 { name="ChillModels"; version="1.0.2"; sha256="06hgg893anh5z8an4l1xl4liz7d0m79n21h116vkdlymayccydbr"; depends=[]; }; ChoR = derive2 { name="ChoR"; version="0.0-4"; sha256="08mildsx542zfm0kcdakcv7c71hb4jgbcq1lhidf0fz76zj1pzk1"; depends=[commonsMath rJava]; }; ChoiceModelR = derive2 { name="ChoiceModelR"; version="1.2"; sha256="0dkp3354gvrn44010s8fjbmkpgn1hpl4xbfs5xslql8sk8rw0n2c"; depends=[]; }; CholWishart = derive2 { name="CholWishart"; version="1.1.0"; sha256="1p92i5ibv9805fg8s5wrpxx63k4c1ihs1x2zlaz9vbkqypkl8aqz"; depends=[]; }; - CircMLE = derive2 { name="CircMLE"; version="0.2.3"; sha256="02nhxw75w84m95p3hmkcgbrs547scvfap8130fxm480y0r3d0zc6"; depends=[circular]; }; + CircMLE = derive2 { name="CircMLE"; version="0.3.0"; sha256="1nr6qicy5y247j970jw74pkbyhx4zjgajf2ygkxmdw6gfx5byn64"; depends=[circular energy]; }; CircNNTSR = derive2 { name="CircNNTSR"; version="2.2-1"; sha256="0mpm6vrkl3ap67khky8dndwvl9yzycm0rlv0vzznlygvlsg8sc38"; depends=[]; }; CircOutlier = derive2 { name="CircOutlier"; version="3.2.3"; sha256="1vyac4mjkn6p4p9n5finqqak6g7m3hj04a66v3w797jn1wbd1xly"; depends=[CircStats circular]; }; CircSpaceTime = derive2 { name="CircSpaceTime"; version="0.9.0"; sha256="0dplgm5x4c1xxnv6062n643mn5zh0najw3f41pv2qafc1lil4wx8"; depends=[circular coda ggplot2 Rcpp RcppArmadillo RInside]; }; CircStats = derive2 { name="CircStats"; version="0.2-6"; sha256="07bg4zrs2iqh0pmi44pybi8hlvnxwcaa5zpg85rmf55kflxxkzlf"; depends=[boot MASS]; }; CircularDDM = derive2 { name="CircularDDM"; version="0.1.0"; sha256="1wxdjj7dndvhvl00cykcrwmw9f7halsg3a0db56kp2mhf54rj37z"; depends=[Rcpp RcppArmadillo]; }; - Cite = derive2 { name="Cite"; version="0.1.0"; sha256="1gfjirhswh4dkz88z4gl8m8jznqrvcgd4z3mnszyg1k5w3avlf1q"; depends=[miniUI RefManageR rstudioapi shiny]; }; CityPlot = derive2 { name="CityPlot"; version="2.0"; sha256="0lskgxmagqjglvpq39hgbygkf4qp28i2bj6b4m2av1s3pzb4465g"; depends=[]; }; CityWaterBalance = derive2 { name="CityWaterBalance"; version="0.1.0"; sha256="0nvm6bv2cxszjf33xgn1xcvhrgrgbdcar0jahwf7bs03gdlpmgi1"; depends=[dataRetrieval dplyr EcoHydRology geoknife lubridate reshape2 tgp xts zoo]; }; Ckmeans_1d_dp = derive2 { name="Ckmeans.1d.dp"; version="4.3.3"; sha256="0k08smvgplzcjq1rdbxyalw6iynr129bhdq0wcdn95baqpb5w556"; depends=[Rcpp Rdpack]; }; - Claddis = derive2 { name="Claddis"; version="0.3.4"; sha256="161qgj4r8qah3r1m7gx2rwn9ng62y1p6gn62r1gp43pkrp2jlqj9"; depends=[ape clipr gdata phytools strap]; }; + Claddis = derive2 { name="Claddis"; version="0.6.3"; sha256="0wq34n6vj5sdc22yf9p4g9iy8ssgr4kkrsr2ak4sqahadwgngl8i"; depends=[ape clipr geoscale phytools strap]; }; ClamR = derive2 { name="ClamR"; version="2.1-1"; sha256="0raz1n79g24a9mc93zj49r20xcmdziw6vvcw5sd3qyjp1ycia13c"; depends=[]; }; ClassComparison = derive2 { name="ClassComparison"; version="3.1.8"; sha256="0fd5s4697pvj295fzvvn5mislf42wfzrcvks17v98388rph586gl"; depends=[Biobase oompaBase]; }; - ClassDiscovery = derive2 { name="ClassDiscovery"; version="3.3.12"; sha256="1r9fri9mlvzhd5ki5spd6xqq6767p6hha72cr3r20s1z5327wkpy"; depends=[Biobase cluster mclust oompaBase oompaData]; }; + ClassDiscovery = derive2 { name="ClassDiscovery"; version="3.3.13"; sha256="08ngmp77aff3dhh711wmzybk4ial2lv9750g3w19l0wjjd1rsm0m"; depends=[Biobase cluster mclust oompaBase oompaData]; }; CleanBSequences = derive2 { name="CleanBSequences"; version="0.4.0"; sha256="12s24v2kfyc32pm34ibw58zzjqhzwlrqrkhl0m70jcqvn50b5r98"; depends=[Biostrings]; }; ClickClust = derive2 { name="ClickClust"; version="1.1.5"; sha256="0b46f453mffg4ym6yvmh7g3v05mc9gphwfra75j28y1425s87yvw"; depends=[]; }; ClickClustCont = derive2 { name="ClickClustCont"; version="0.1.7"; sha256="1caymvpwvxq4rirnjm2kwzvqm1pl01rdc3785k8mq4k2m0n6l2rz"; depends=[gtools]; }; @@ -773,14 +796,14 @@ in with self; { ClinicalUtilityRecal = derive2 { name="ClinicalUtilityRecal"; version="0.1.0"; sha256="17xj9cmdkjrzx7mshka2hlkxh8887sprdqix7fd8jcr9bmc6ad9r"; depends=[caret cowplot ggplot2 lattice nloptr]; }; CliquePercolation = derive2 { name="CliquePercolation"; version="0.2.0"; sha256="1zllhl1674734sr0hmfgwdyqlk4rcjdqqrd7rx30llqri478jdff"; depends=[colorspace igraph magrittr Matrix Polychrome qgraph]; }; CloneSeeker = derive2 { name="CloneSeeker"; version="1.0.10"; sha256="1mpzcbwrrah7kf60l6khdqd4nivm6hpp5xmgg40rahph4wl5ydfp"; depends=[combinat gtools quantmod]; }; - CluMP = derive2 { name="CluMP"; version="0.8"; sha256="130aqfxdp1pj5z3hnmy06rp5ywcmr389wn114ja5c2imxxkm3fi3"; depends=[amap data_table dplyr ggplot2 MASS NbClust rlang tableone]; }; + CluMP = derive2 { name="CluMP"; version="0.8.1"; sha256="1vpxl2rcknqx32b94b48iirkh7r7cdri9mcljrw29gsbvhrfc46k"; depends=[amap data_table dplyr ggplot2 MASS NbClust rlang tableone]; }; ClueR = derive2 { name="ClueR"; version="1.4"; sha256="0awl3ag48idg0396hcgqrh5f16mbgximr5xbxjiimib5zysdc558"; depends=[e1071]; }; ClusBoot = derive2 { name="ClusBoot"; version="1.0"; sha256="1wh9mv932zarl8w098lgv2jpanp6r8nzdkyayv8nxk7nddl0bn1k"; depends=[]; }; ClusVis = derive2 { name="ClusVis"; version="1.2.0"; sha256="06yckdl3gxjia1gjjqpc29lvy4f7qf47fncslng9ggjnks6il145"; depends=[MASS mgcv mvtnorm Rcpp RcppArmadillo Rmixmod VarSelLCM]; }; ClussCluster = derive2 { name="ClussCluster"; version="0.1.0"; sha256="1436849m2mnm8j7lf653zv8lcvvg2ch8kkks4bvr39kx21wxy8ss"; depends=[ggplot2 reshape2 rlang scales VennDiagram]; }; - ClustBlock = derive2 { name="ClustBlock"; version="2.2.0"; sha256="07hcgfap2bjcwy8bynz1hk2cb1amli204k2fsjc30m9p7bhyrqs3"; depends=[FactoMineR]; }; + ClustBlock = derive2 { name="ClustBlock"; version="2.3.1"; sha256="16dhwrpw6c8l9nzk2k3wryhz9ydmnl3va1ncab6wl52gzdbd7c9j"; depends=[FactoMineR]; }; ClustGeo = derive2 { name="ClustGeo"; version="2.0"; sha256="1p5k2w1k7hnacbazzj2yhxh4z2jngnsl4v5a9b3c8z1dr4nhcwxc"; depends=[sp spdep]; }; - ClustImpute = derive2 { name="ClustImpute"; version="0.1.5"; sha256="17wx4w0cw0cvfbibj1dchi6g0ipr4ly6x5d2iy4lz6r9yj185nmw"; depends=[ClusterR copula dplyr magrittr rlang]; }; + ClustImpute = derive2 { name="ClustImpute"; version="0.1.6"; sha256="1jv3hlbw2k94pw8vhyli9lnr3vb3czrh346rgd4wkiwk7c7a58bz"; depends=[ClusterR copula dplyr magrittr rlang]; }; ClustMMDD = derive2 { name="ClustMMDD"; version="1.0.4"; sha256="0sblf3crpai53dflhyi27yn6mg0xyy9dxhwsk8j57sq5vr50x686"; depends=[Rcpp]; }; ClustOfVar = derive2 { name="ClustOfVar"; version="1.1"; sha256="0grhkab7s58ji4cf7cxh7ahd2dxrj8aqfdf3119b40zxkxbwxcr0"; depends=[PCAmixdata]; }; ClustVarLV = derive2 { name="ClustVarLV"; version="2.0.1"; sha256="1wl4kkhf17fi3vgbv0ph0yii2l93cgisxm3s0g9w8zhyn60dwwb0"; depends=[doParallel foreach iterators plyr Rcpp RcppEigen]; }; @@ -790,18 +813,18 @@ in with self; { ClusterRankTest = derive2 { name="ClusterRankTest"; version="1.0"; sha256="01gzalhibqcdx3a6yc2cm1v77rscva73v5m5m0qkrgqdp9c8ph2a"; depends=[]; }; ClusterStability = derive2 { name="ClusterStability"; version="1.0.3"; sha256="1laa5m3y1rc7jr8q3i9qb3izs7qmadz169w9xm8q3mm3834ngn9b"; depends=[cluster clusterCrit copula Rcpp WeightedCluster]; }; ClusteredMutations = derive2 { name="ClusteredMutations"; version="1.0.1"; sha256="1n31nnvpjh1faw751k8m3ga3wfl0yhdpnszwckqhfzlma1jr8z04"; depends=[seriation]; }; - Clustering = derive2 { name="Clustering"; version="1.6"; sha256="0r0awijhzv611qf2r2n1xwd369s9719r5hfvw2hipiy0jssfqfbv"; depends=[advclust amap apcluster cluster ClusterR data_table gama ggplot2 glue gmp pracma pvclust sqldf xtable]; }; + Clustering = derive2 { name="Clustering"; version="1.7.1"; sha256="0al1vgik1qp4nxfm2hfz7m72q158czdkiv0fs9ka73hjwgzdvf1v"; depends=[advclust amap apcluster cluster ClusterR data_table doParallel dplyr foreach future gama ggplot2 gmp pracma pvclust shiny sqldf xtable]; }; CoClust = derive2 { name="CoClust"; version="0.3-2"; sha256="04xv807785xv9kdspsspx1302ardv8gda06kd590lgawjixai7dh"; depends=[copula gtools]; }; CoDiNA = derive2 { name="CoDiNA"; version="1.1.2"; sha256="1zjj86z8ica9j0x2nfyq9y6nyp54w07dwskcsg7z6kqibrkfvaq9"; depends=[data_table igraph magrittr plyr reshape2 visNetwork]; }; CoFRA = derive2 { name="CoFRA"; version="0.1002"; sha256="0ldf84dxaanww3qkf64mz5gv3yv2rjp9m6dy64xckds66vw6x0m3"; depends=[gplots stringr]; }; CoImp = derive2 { name="CoImp"; version="1.0"; sha256="06y722flpiqpwq0p7ik86s09mdnvqw3hdybhdzn8vfns5swc8x1y"; depends=[copula gtools locfit nnet]; }; - CoRpower = derive2 { name="CoRpower"; version="1.0.3"; sha256="007v6khv2kkf398cqy3vjv0ncd7zc8ad084a5qhpplsnj1f3ll2j"; depends=[osDesign survival]; }; + CoMiRe = derive2 { name="CoMiRe"; version="0.7"; sha256="19q9qq85xnxlw9zdijmpis83zw98r8spxvb8fsfzp3vyk7hk8gyg"; depends=[ggplot2 gtools KernSmooth mvtnorm NonpModelCheck Rcpp RcppArmadillo rlang splines2 truncnorm]; }; + CoRpower = derive2 { name="CoRpower"; version="1.0.4"; sha256="08chsbbl74rskinp68pwzpvnxx5lkfqf71j7ryp1cwy7199h3jyw"; depends=[osDesign survival]; }; CoSMoS = derive2 { name="CoSMoS"; version="2.0.0"; sha256="1qnpfipf24szzrmkla7v5dn8g6mrg5x5lqsc6418mm1p795ym3ry"; depends=[animation cowplot data_table directlabels ggplot2 mAr Matrix matrixcalc MBA mvtnorm nloptr plotly pracma]; }; CodataGS = derive2 { name="CodataGS"; version="1.43"; sha256="1bjn6s1f5jn64gwrvjz5kvwfkbqrqhavib6dj9k37rb5nzqkwhp6"; depends=[Matrix]; }; CodeDepends = derive2 { name="CodeDepends"; version="0.6.5"; sha256="0l7kiv3awx50glf5cs841b4zzsff1ml90f0zr868ygvwsr4ps1hq"; depends=[codetools graph XML]; }; CoinMinD = derive2 { name="CoinMinD"; version="1.1"; sha256="0invnbj5589wbs0k2w5aq9qak7axc3s0g9nw85c48lnl0v95s91i"; depends=[MCMCpack]; }; Coinprofile = derive2 { name="Coinprofile"; version="0.1.9"; sha256="1bcip62gm34cx5m8a1mx9px2rhgvdmsgnn6q9q40k8p5hw4cx9g0"; depends=[coin exactRankTests ggplot2 plyr Rdpack zoo]; }; - CollapsABEL = derive2 { name="CollapsABEL"; version="0.10.11"; sha256="0libm1wv34av3vm2vvbqcnxjh4y1rwfi8qzjca8qdz9490vngags"; depends=[biganalytics bigmemory collUtils dplyr ggplot2 haplo_stats R_utils rJava RSQLite stringr]; }; CollapseLevels = derive2 { name="CollapseLevels"; version="0.3.0"; sha256="1d2grxh95893j260igh4yh2z3rm3zymlpadqyp6w3na91birazb4"; depends=[dplyr ggplot2 lazyeval magrittr]; }; CollocInfer = derive2 { name="CollocInfer"; version="1.0.4"; sha256="1iwf5g2y7i0j8dc19hdhya4m6g47jj968glnclj7a2yaq2yx37cj"; depends=[deSolve fda MASS Matrix spam]; }; ColorPalette = derive2 { name="ColorPalette"; version="1.0-1"; sha256="1dsj5njikx3qm2lnamqqg4qgwwyr11fwx9s5sdi7dkfx3nmf6dac"; depends=[]; }; @@ -816,8 +839,10 @@ in with self; { CommonMean_Copula = derive2 { name="CommonMean.Copula"; version="1.0.0"; sha256="0j489hb4vlj3xkdq9vf2qjmcfb8ccff82vsmz63f25ws9pgc2lk2"; depends=[mvtnorm pracma]; }; CommunityCorrelogram = derive2 { name="CommunityCorrelogram"; version="1.0"; sha256="1wkrm5lil595sc4ih3qsf4sgvfipzlav0n7339ixqw9zxm2pg4nj"; depends=[vegan]; }; Comp2ROC = derive2 { name="Comp2ROC"; version="1.1.4"; sha256="06hpbid9z1pzg7k4gqp2zn8l7sm375z32fsn54i27qbl3inp7m2d"; depends=[boot ROCR]; }; + CompAREdesign = derive2 { name="CompAREdesign"; version="1.5"; sha256="10c782r1sgwnm0yqfyg3m2x3k8dmpazvb1hy7gvb2kn0z6rzlpbh"; depends=[]; }; CompDist = derive2 { name="CompDist"; version="1.0"; sha256="02c18ksk6clv674yh79bzg3mh9hymzhal51j6g0rnvqd5ra8g66c"; depends=[actuar fExtremes numDeriv PearsonDS rmutil VGAM]; }; CompLognormal = derive2 { name="CompLognormal"; version="3.0"; sha256="1dhgr9l713l2n889bpa47lbg2qab0fz0r15qa928c0b9nz688ddm"; depends=[numDeriv]; }; + CompModels = derive2 { name="CompModels"; version="0.2.0"; sha256="058yvwb7p6rj6g1hcwgdzgjv0lwg7m5hgrv1pjfi4dskaibd4k17"; depends=[]; }; CompQuadForm = derive2 { name="CompQuadForm"; version="1.4.3"; sha256="1i30hrqdk64q17vsn918c3q79brchgx2wzh1gbsgbn0dh1ncabq4"; depends=[]; }; CompR = derive2 { name="CompR"; version="1.0"; sha256="1k4q0yanvhdh3ksia7d42lxky19yci5vxhmi6h716g9sxzfsjk6b"; depends=[MASS]; }; CompRandFld = derive2 { name="CompRandFld"; version="1.0.3-6"; sha256="1yr1d97l6yc07jwh30j26gda15pjfcwx2z3w55dh3nr15vds0qcp"; depends=[fields mapproj maps RandomFields scatterplot3d spam]; }; @@ -827,13 +852,15 @@ in with self; { ComparisonCR = derive2 { name="ComparisonCR"; version="1.0.4"; sha256="10xw3ppkzpc3njc409ln7g6bg33csf2ilw3f11hn60ry5xbnn82y"; depends=[boot CIFsmry cmprsk]; }; ComparisonSurv = derive2 { name="ComparisonSurv"; version="1.0.9"; sha256="1xvxkj0i59fq05df6szx4k32w2447mxcx3877l2myag4x6i6c74l"; depends=[muhaz survival survRM2 TSHRC]; }; Compind = derive2 { name="Compind"; version="2.1"; sha256="1cjvpgankifiql67imhxx382q2lz1jq9k0nrwzq560h0xizkak6i"; depends=[Benchmarking boot GPArotation Hmisc lpSolve MASS nonparaeff np psych smaa spdep]; }; - Compositional = derive2 { name="Compositional"; version="3.9"; sha256="0ma5law5dx87x9sjdbffgck80cxxbyhq20jld2ic4hdsm41h934z"; depends=[doParallel emplik FlexDir foreach MASS mda mixture RANN Rfast Rfast2 sn]; }; + ComplexUpset = derive2 { name="ComplexUpset"; version="0.7.3"; sha256="0hyxkr9y001gl49qs5d6rdjmykmgh24mwrjd8cjvh22q43pdn23n"; depends=[ggplot2 patchwork scales]; }; + Compositional = derive2 { name="Compositional"; version="4.2"; sha256="1a1cv5m5b79zavgzpz8hjzls3sm658n3f9qhv609g5681w2m6iq7"; depends=[codalm doParallel emplik FlexDir foreach MASS mda mixture nnet RANN Rfast Rfast2 sn]; }; CompoundEvents = derive2 { name="CompoundEvents"; version="0.1.0"; sha256="03shw3016xc41a6by8pnpqs7mmnhs0qmg5aqd4hlfcy3dv2w9wkf"; depends=[]; }; Compounding = derive2 { name="Compounding"; version="1.0.2"; sha256="1xlb3ylwjv70850agir0mx79kcvs43h0n1sm22zcny3509s2r7lf"; depends=[hypergeo]; }; - ConConPiWiFun = derive2 { name="ConConPiWiFun"; version="0.4.6"; sha256="1kkc4xp5b6q54b76wk4ga28wl668psbpyivl6bnh3xm21276yx5k"; depends=[Rcpp]; }; + ConConPiWiFun = derive2 { name="ConConPiWiFun"; version="0.4.6.1"; sha256="1ziy646lbx297kia797xjxa8hyl826x1hiighyjslvnlvrhapx08"; depends=[Rcpp]; }; ConR = derive2 { name="ConR"; version="1.3.0"; sha256="1q93x2b7a2jgkybazk24x8gvwvjjvkhi1gy5zx1sc2f4arm73myq"; depends=[doSNOW fields foreach geosphere raster rgdal rgeos rnaturalearth sf snow sp tibble writexl]; }; ConSpline = derive2 { name="ConSpline"; version="1.2"; sha256="16r0v0llj0pri69jqxribp8dpzh6yn6acpq20aaky14fyh3i4q7x"; depends=[coneproj]; }; Conake = derive2 { name="Conake"; version="1.0"; sha256="1rj1rv8r53516jqhwp9xqqwjxh4gx1w47c0bw59f87wiy5pbchpf"; depends=[]; }; + ConcordanceTest = derive2 { name="ConcordanceTest"; version="0.1.0"; sha256="04csv3l9avrb304m55plnfhrhrc3kk1kbvzx7r83f3k9c09w41mc"; depends=[Rglpk]; }; CondIndTests = derive2 { name="CondIndTests"; version="0.1.5"; sha256="0km4z8wnj5msg1pmphk2fccbw1cidsxv174817lwcyii9nf5iwsm"; depends=[caTools kernlab lawstat MASS mgcv mize pracma quantregForest randomForest RPtests]; }; CondReg = derive2 { name="CondReg"; version="0.20"; sha256="1ffnrjfjcb66i9nyvidkcn4k9pcj4r7xanjwzcxcrj2qm39apkqx"; depends=[]; }; ConfIntVariance = derive2 { name="ConfIntVariance"; version="1.0.2"; sha256="0xm3vh3vmf16faa3934100rnrg4rvlqkgjlsqa2smzcvy5vb86z4"; depends=[]; }; @@ -850,19 +877,19 @@ in with self; { ConvergenceClubs = derive2 { name="ConvergenceClubs"; version="2.2.1"; sha256="0mn0lnycz5pi821q52g1njjs2pcmvv8yynr13bh237c8cashk2n3"; depends=[lmtest sandwich]; }; ConvergenceConcepts = derive2 { name="ConvergenceConcepts"; version="1.2.2"; sha256="1pvcl0bgd4anrbn6wqxsd1s23ycsc7jhrk94yzwx67xx0qs9mmrw"; depends=[lattice tkrplot]; }; CoopGame = derive2 { name="CoopGame"; version="0.2.1"; sha256="1c11b5l6r5csa6zw5a6lfqaygzhnp5jfdf0vkrxpl7fb4bbxhm31"; depends=[geometry gtools rcdd rgl]; }; - CoordinateCleaner = derive2 { name="CoordinateCleaner"; version="2.0-15"; sha256="0hvvfdcdmdi72yd2rsgza8d7ngp6w913rggbvvcj4vh9wvqpk1r3"; depends=[dplyr geosphere ggplot2 raster rgbif rgdal rgeos rnaturalearth sp tidyselect]; }; + CoordinateCleaner = derive2 { name="CoordinateCleaner"; version="2.0-18"; sha256="0gdvna1a43p419hrs78afas9w7xhiqaqr4yivbkjms3l9cr5zb87"; depends=[dplyr geosphere ggplot2 raster rgbif rgdal rgeos rnaturalearth sp tidyselect]; }; CopCTS = derive2 { name="CopCTS"; version="1.0.0"; sha256="1j0bhkjk181y9k69442diswgwax5whmh5vfqydhf3b1r5ll1wkm3"; depends=[copBasic copula msm]; }; Copula_Markov = derive2 { name="Copula.Markov"; version="2.8"; sha256="0wyb80jj9zgh7kn0nah7dljps72083c92hpds94dw4ccmw6cfwf6"; depends=[]; }; Copula_Markov_survival = derive2 { name="Copula.Markov.survival"; version="1.0.0"; sha256="1sxg0ir39f4hj4m6imija0c88j513j6fflcp7xc0599iglwsrbvs"; depends=[survival]; }; - Copula_surv = derive2 { name="Copula.surv"; version="1.0"; sha256="1cq12vmsvrxd6anpv6b5jig7x1lf6pj589353h2ba9k0fhkpk51y"; depends=[]; }; + Copula_surv = derive2 { name="Copula.surv"; version="1.1"; sha256="1zs2jvb07948g2aspy8877j4hdzavd57lmv4x2yrf6gb4xzs3x3n"; depends=[]; }; CopulaCenR = derive2 { name="CopulaCenR"; version="1.1.2"; sha256="1ksxqgb91vww5q4njidchxwia64g5229dvpxhqhfp8w6hvmib1k1"; depends=[caret copula corpcor flexsurv icenReg magrittr plotly pracma survival]; }; CopulaDTA = derive2 { name="CopulaDTA"; version="1.0.0"; sha256="1bx0jvlbhaxf4yhrfpd5l5zp7kmp6f17ckb1y9974sgc7s3hpqcd"; depends=[ggplot2 plyr reshape2 rstan]; }; CopulaREMADA = derive2 { name="CopulaREMADA"; version="1.3"; sha256="152g8nfa3ksj0dlzlch9a6g18b1vi6dlw748a6m55haghchbyr9l"; depends=[matlab mc2d statmod tensor]; }; CopyDetect = derive2 { name="CopyDetect"; version="1.3"; sha256="1g3bwd805h62x93xvvn67acf9v6vn7s7ghxpvjhwcfdfj7fwzh6l"; depends=[mirt]; }; - CorBin = derive2 { name="CorBin"; version="0.3.3"; sha256="0jf3d0mbr0vmcqmk5p4rcvc3nc4dn6cqcj8fcqyf32y9vwxd2wii"; depends=[]; }; + CorBin = derive2 { name="CorBin"; version="1.0.0"; sha256="0mjvhj9cw21xjg96fz5bcyfxgwdw367l1942a38by77ylypdfq3y"; depends=[]; }; CorDiff = derive2 { name="CorDiff"; version="1.0"; sha256="12rgfhygrdq1ign4ybr8g171wxic8zbp83n1xdsnqpj910k5jdr5"; depends=[mcc]; }; - Corbi = derive2 { name="Corbi"; version="0.6-0"; sha256="17jk4kidlvrwhyjgm3hs22pzs7170r7smihmf7v0pnhvn57ak12c"; depends=[Matrix]; }; - CornerstoneR = derive2 { name="CornerstoneR"; version="2.0.1"; sha256="1vy1zcz4vjpv52icz50gfn5276n1wpjwmzhh90i9ippii7q76vim"; depends=[checkmate data_table minpack_lm ranger SpatialTools vcd]; }; + Corbi = derive2 { name="Corbi"; version="0.6-1"; sha256="0ig0rx4llkgqvg2sx6xmzhh9sjgy4qnw22xs84gxgqidi50f2a85"; depends=[CRF igraph MASS Matrix]; }; + CornerstoneR = derive2 { name="CornerstoneR"; version="2.0.2"; sha256="04dvryhcyi7f6bmm4067cn5vmy7kdqi3bys7ln8nnsc0kkdjxhi5"; depends=[checkmate data_table minpack_lm ranger SpatialTools vcd]; }; CorporaCoCo = derive2 { name="CorporaCoCo"; version="1.1-0"; sha256="1s3wlcy6mnw9riivw5lc4gd6bjbsd77m15ipr95g46isdcrli8zb"; depends=[data_table RColorBrewer rlist]; }; CorrBin = derive2 { name="CorrBin"; version="1.6"; sha256="0iwad5qf7hqii02s5f85155c5s7v8ghnac4l6l3c45dshrpapp2m"; depends=[boot combinat dirmult geepack mvtnorm]; }; CorrMixed = derive2 { name="CorrMixed"; version="1.0"; sha256="0rj987k8pzsw9n9a20ky23rwc3zyqsl0fcibpmry7p8pw2miaj0z"; depends=[nlme psych]; }; @@ -877,29 +904,28 @@ in with self; { CovSel = derive2 { name="CovSel"; version="1.2.1"; sha256="02fsiykbg96ynqw25vfyrams7fs39xjmfhvb23zjbqb7ql6d0xdk"; depends=[dr MASS np]; }; CovSelHigh = derive2 { name="CovSelHigh"; version="1.1.1"; sha256="0dvvpkqml2k00gicpgp475z1rjspq3s37ys1mam29k54qlshhny6"; depends=[bartMachine bindata bnlearn doParallel doRNG foreach glmnet MASS Matching randomForest tmle xtable]; }; CovTools = derive2 { name="CovTools"; version="0.5.3"; sha256="0r3q97zl72v7i1d9nhxgsilqczihhfq6zzhl4cmz8rbk3b7c7qrc"; depends=[doParallel expm foreach geigen Matrix mvtnorm pracma Rcpp RcppArmadillo Rdpack shapes SHT]; }; - CoxBoost = derive2 { name="CoxBoost"; version="1.4"; sha256="1bxkanc8zr4g3abn4ds5wqibv65flvm4y648fs9s0l4vc9vmyshg"; depends=[Matrix prodlim survival]; }; + CovidMutations = derive2 { name="CovidMutations"; version="0.1.3"; sha256="03bl9frjfj8i7ydgi245113yzyg8rkgqxasicmqcjdd68zbz00kn"; depends=[cowplot dplyr ggplot2 ggpubr seqinr stringr VennDiagram]; }; CoxPhLb = derive2 { name="CoxPhLb"; version="1.2.0"; sha256="0jlh2k5ygj896sfx7dcw5qlb80bl64rsvqfayv0c6a107bmrzsw4"; depends=[survival]; }; CoxPlus = derive2 { name="CoxPlus"; version="1.1.1"; sha256="038wsz206bgc0pnzx403b5ihcwhxpkrpxmwvrvqcxf8333pb62l5"; depends=[Rcpp RcppArmadillo]; }; CoxR2 = derive2 { name="CoxR2"; version="1.0"; sha256="1fjsa403lbx0hi7b0gsdaz0q9axw521q4xzphbfbknify4y72md6"; depends=[survival]; }; - CoxRidge = derive2 { name="CoxRidge"; version="0.9.2"; sha256="0p65mg4hzdgks03k1lj90yj6qbk50s94rwvcwzkb5xxxwrijd10r"; depends=[survival]; }; CpGFilter = derive2 { name="CpGFilter"; version="1.1"; sha256="0ccvk7lawmay0wqdyhs6ww7396dcfzazn72sq6zwyw7dl45k2j0i"; depends=[matrixStats]; }; CpGassoc = derive2 { name="CpGassoc"; version="2.60"; sha256="1zx18x8pxjl2ajnj7a7lb8383m75ysg17f4mzz0vkgl5mnf617ny"; depends=[nlme]; }; Cprob = derive2 { name="Cprob"; version="1.4.1"; sha256="1m4ys8xpj1jbn3lf8fym935y94dxipiimsf9zxwyw5sy71y7skgq"; depends=[geepack lattice lgtdl prodlim tpr]; }; CreditMetrics = derive2 { name="CreditMetrics"; version="0.0-2"; sha256="16g3xw8r6axqwqv2f0bbqmwicgyx7nwzff59dz967iqna1wh3spi"; depends=[]; }; CreditRisk = derive2 { name="CreditRisk"; version="0.1.3"; sha256="09ks8xlsrbp3an1drcwmmd6df4fsfz61z21ma2p62a1pk0bnc86c"; depends=[fOptions]; }; + Cronbach = derive2 { name="Cronbach"; version="0.1"; sha256="1gkapi7pgf1mwidhgdf3y5cm4bz5igzb7mdflz560aa67asp1qyf"; depends=[boot]; }; CropDetectR = derive2 { name="CropDetectR"; version="0.0.1"; sha256="14sabqld94if7f2m39bh6652cb62hcwx53k8q5k23anzzsn93qlj"; depends=[dplyr EBImage imager reshape2]; }; - CropScapeR = derive2 { name="CropScapeR"; version="1.1.1"; sha256="103mnnppa30hxzy3pkaq66n7p5qfnv8g8dh34gqx0n80q2xpck2b"; depends=[data_table dplyr httr magrittr raster RJSONIO sf]; }; - CrossScreening = derive2 { name="CrossScreening"; version="0.1.1"; sha256="1gig80r8p611ysn35ajx7xdjj5wnkcf1vspcf0i06dmh75xpm3w9"; depends=[plyr tables]; }; + CropScapeR = derive2 { name="CropScapeR"; version="1.1.2"; sha256="1d2pyr0p7m7yw7n4ghvyxs2cwxyrpgc4238ma8fy8f29dfp7mnbq"; depends=[data_table dplyr httr magrittr raster RJSONIO sf]; }; CrossVA = derive2 { name="CrossVA"; version="0.10.0"; sha256="08mq8d6la5gz3yv5a3lc70dxdgf29q1vngi8lrgdy58p9415pxjv"; depends=[stringi]; }; CrossValidate = derive2 { name="CrossValidate"; version="2.3.4"; sha256="1q5wnw2llvlw3hbjg0zccipk3ns31m2339x1aj6m526zhvgl2wvx"; depends=[Modeler oompaBase]; }; - CryptRndTest = derive2 { name="CryptRndTest"; version="1.2.2"; sha256="1cg0agwqp1f7pgxdf9wilwparklyfsv900r47fpihnqw3ycvbdai"; depends=[gmp kSamples LambertW MissMech Rmpfr sfsmisc tseries]; }; + CruzPlot = derive2 { name="CruzPlot"; version="1.4.2"; sha256="1sbw0i0d3qh417ivxxc5hghn94x6055wm985bmm1hscj1ym4vaxq"; depends=[dplyr DT geosphere mapdata maps marmap shiny shinydashboard shinyjs stringr swfscDAS]; }; CrypticIBDcheck = derive2 { name="CrypticIBDcheck"; version="0.3-3"; sha256="1c7n020i9lxp0fam05k9v4az4rvx8fakhzi9fkma82smpl709x8q"; depends=[car chopsticks ellipse rJPSGCS]; }; CsChange = derive2 { name="CsChange"; version="0.1.6"; sha256="0ahgzir1rz5hh2jkgabp9vccg527vbvmkdyxf9lyz5yxkig3jv2s"; depends=[boot Hmisc rms survival]; }; Cubist = derive2 { name="Cubist"; version="0.2.3"; sha256="1x71n72n12alyl7d9vdf3xb3ks14lql4pxxxnimk2gq7brc5z10r"; depends=[lattice reshape2]; }; CustomerScoringMetrics = derive2 { name="CustomerScoringMetrics"; version="1.0.0"; sha256="166v0hbxy4xgbfqh7sx6zsrv4pghqpimx5xry3h2qwynnvr4ng1a"; depends=[]; }; CustosAscensor = derive2 { name="CustosAscensor"; version="0.1.0"; sha256="1axyhwf9rc9dvrrcrpmx69kp49nwb0an7csn9qbjmx9jwwav11l5"; depends=[]; }; CutpointsOEHR = derive2 { name="CutpointsOEHR"; version="0.1.2"; sha256="0r772zb7g10akcfnf2hnyvpvba4px9pgslyns7drmijdsh0ncnvj"; depends=[survival]; }; - Cyclops = derive2 { name="Cyclops"; version="3.0.0"; sha256="0g10pkas9zd87nk47imxywgxdh5kx2kyj4kmmkzi2dba95f8pwil"; depends=[Andromeda BH dbplyr dplyr Matrix Rcpp RcppEigen rlang survival]; }; + Cyclops = derive2 { name="Cyclops"; version="3.1.0"; sha256="0xb9rd3bjgng4ydr4syrwibyix5h6a6ywq52pidg8g0wnbg8icfz"; depends=[Andromeda BH bit64 dplyr Matrix Rcpp RcppEigen rlang survival]; }; CytobankAPI = derive2 { name="CytobankAPI"; version="1.3.0"; sha256="1rrqhsqv5xc58dvkrbs9c83pkqz5np59shm7xjmqxdjj2rxj8zqn"; depends=[curl httr jsonlite]; }; CytobankAPIstats = derive2 { name="CytobankAPIstats"; version="2.0"; sha256="0xczcgaxd8dv6fd1j5c8y4il852lq8859d1y16sxs8a3gqn9fbz2"; depends=[CytobankAPI pheatmap shiny shinyFiles xlsx]; }; CytobankBridgeR = derive2 { name="CytobankBridgeR"; version="1.0.0"; sha256="0m8gxbm3p9gvdszymqx10n5rzb406r4f70a0in798c56mp2rcsl4"; depends=[CytobankAPI]; }; @@ -907,16 +933,15 @@ in with self; { D3partitionR = derive2 { name="D3partitionR"; version="0.5.0"; sha256="10067rdgbpjzgw2wiq75kdd0gd7bl41hp16sxc0k2p72ybqfpw03"; depends=[data_table functional htmlwidgets magrittr RColorBrewer titanic]; }; DAAG = derive2 { name="DAAG"; version="1.24"; sha256="09fxd21p7v9mpy9s876n1jyc3l7w7s3vs5iglc3xphqbffgzfnvs"; depends=[lattice latticeExtra]; }; DAAGbio = derive2 { name="DAAGbio"; version="0.63-3"; sha256="0n82d9nsvpl6cwp95by8ff9fmdafs2fdi603dlik5890adaw42x4"; depends=[limma]; }; - DAC = derive2 { name="DAC"; version="0.1.1"; sha256="0abnl70k4c98n29qi64sfd5nch10abw9fknhf2aksyi0qadsiyjq"; depends=[blavaan flexmix sfsmisc truncnorm]; }; DACF = derive2 { name="DACF"; version="1.0.0"; sha256="0hv7c9lk6ivj4iz953yn11iy5p611q4si4ghn9d5a9i229s5hig8"; depends=[]; }; DAIME = derive2 { name="DAIME"; version="2.1.3"; sha256="099pbzgryz9lxhcqlrywcv8zl5af4ir5dyyqvgc16xi5bddxk7ld"; depends=[]; }; - DAISIE = derive2 { name="DAISIE"; version="3.0.0"; sha256="1114h6qsydjy1gz3inpmjy4kx9skkkr0n1x3y3nz1igwwr44jp1n"; depends=[DDD deSolve doParallel foreach magrittr Matrix pracma subplex tensor testit]; }; + DAISIE = derive2 { name="DAISIE"; version="3.0.1"; sha256="10b55m4ycb07l0mfjx58zfmckk627arj575p9via6kr7lp1c3j59"; depends=[DDD deSolve doParallel foreach magrittr Matrix pracma subplex tensor testit]; }; DAKS = derive2 { name="DAKS"; version="2.1-3"; sha256="0vmpwxvksnmyq40faimbgpj0y3zbk519986n38ipwdfzllcg0zs4"; depends=[relations sets]; }; - DALEX = derive2 { name="DALEX"; version="1.3.1.1"; sha256="0akw1yzhb3shpg6yb89vralqd2z80z5yk9azqaa55dx56as52kjs"; depends=[ggplot2 iBreakDown ingredients]; }; - DALEXtra = derive2 { name="DALEXtra"; version="1.3.2"; sha256="1acasrhg7apdqd3p2vkkssdpirbg4alsv4lv60ngqvb3ccd8hy31"; depends=[DALEX ggdendro ggplot2 glmnet gridExtra reticulate]; }; + DALEX = derive2 { name="DALEX"; version="2.0.1"; sha256="1hiknx55d91abyfj3w4a2xxin7f1q8h5k0041m7w93xjdc4kis98"; depends=[ggplot2 iBreakDown ingredients]; }; + DALEXtra = derive2 { name="DALEXtra"; version="2.0"; sha256="1fbl0idvvhpqn6qiw6pn426n1dvf0hdi228nkr23f2d08rgfbsxh"; depends=[DALEX ggplot2 gridExtra reticulate]; }; DALY = derive2 { name="DALY"; version="1.5.0"; sha256="1v7ld01xcn5jiygl1c3xhd5h71ip90lks87fs9gmpnivp8jz5cr5"; depends=[]; }; DAMOCLES = derive2 { name="DAMOCLES"; version="2.3"; sha256="0pk9gq82qa18fl7zp74d47bgy8lhj9rkvfq23w8844nz9kn58s1f"; depends=[ape caper DDD deSolve expm Hmisc Matrix matrixStats picante]; }; - DAMisc = derive2 { name="DAMisc"; version="1.5.4"; sha256="1xs9jibpxg6py9ry4mad2yj4x99jnv19df0d6f9yc760wipb5ymk"; depends=[AICcmodavg boot car clarkeTest coda effects fANCOVA gdata ggplot2 glue lattice latticeExtra MASS nnet optiscale rstan xtable]; }; + DAMisc = derive2 { name="DAMisc"; version="1.6.2"; sha256="0arazw6pjgd9xgsdnyz8ccwyrpakyqzraw6j08zlrnn6hv7p29mr"; depends=[AICcmodavg boot car clarkeTest coda dplyr DT effects gamlss ggplot2 glue haven janitor jtools lattice latticeExtra magrittr MASS nnet optiscale rlang rstan survey tibble tidyr tidyselect xtable]; }; DAP = derive2 { name="DAP"; version="1.0"; sha256="0zzb05yxfaqp6qnr979q20rqy8sl5l825mxs0x9366qr7mz5k5ws"; depends=[MASS]; }; DBEST = derive2 { name="DBEST"; version="1.8"; sha256="1a598g02hpfgv572gchllqkppynnsp4lx764jg0g66w3b66k0kdy"; depends=[zoo]; }; DBGSA = derive2 { name="DBGSA"; version="1.2"; sha256="04zqh9y3nqcdzs5jn8aaq5idy9zl450ikvl788xs860wlg692qv2"; depends=[fdrtool]; }; @@ -932,7 +957,7 @@ in with self; { DCL = derive2 { name="DCL"; version="0.1.0"; sha256="1ls3x3v0wmddfy7ii7509cglb28l1ix1zaicdc6mhwin0rpp2rx3"; depends=[lattice latticeExtra]; }; DCODE = derive2 { name="DCODE"; version="1.0"; sha256="19dwms88q0ylxd92l3ivig8p8jjyhk8mhgz0l36m9pcq11gyjc0n"; depends=[seqinr]; }; DCPO = derive2 { name="DCPO"; version="0.5.3"; sha256="1h14xnii6kv6sc7pfxalif3bj0mifnxg46x4lwbixx9vzxxz96sq"; depends=[beepr BH dplyr forcats janitor purrr Rcpp RcppEigen rstan rstantools StanHeaders tibble tidyr]; }; - DCchoice = derive2 { name="DCchoice"; version="0.0.16"; sha256="0wwhdpljg1k70kydhh89lk6c461a9vjw6p2ijzhvgkv2pl5rxaag"; depends=[Formula interval MASS]; }; + DCchoice = derive2 { name="DCchoice"; version="0.0.17"; sha256="0bhnhrwq54kksaqazz18hsy2x63876rj02d1q62by6vpxb5k0k9w"; depends=[Formula interval MASS]; }; DChaos = derive2 { name="DChaos"; version="0.1-5"; sha256="0dzwyqncv5cb8qr0bwpy91ijbz8yamlhnhxwpc4wpiffzhf2d4hq"; depends=[nnet outliers pracma sandwich xts zoo]; }; DCluster = derive2 { name="DCluster"; version="0.2-7"; sha256="008nyry64s5g80narcc58273v0jhqzfgwynka6mh7jgi7qsqnxjd"; depends=[boot MASS spdep]; }; DClusterm = derive2 { name="DClusterm"; version="1.0-1"; sha256="04i9fyph2k3ffds0nv49371p8lw6dkzcf27pc98f99x0l6c8k5iq"; depends=[DCluster lme4 sp spacetime xts]; }; @@ -940,31 +965,33 @@ in with self; { DDHFm = derive2 { name="DDHFm"; version="1.1.2"; sha256="0lgh6kcfas06p2yy7zy21r05k5521xbj5af3wwwssp5li1cia35g"; depends=[lokern wavethresh]; }; DDIwR = derive2 { name="DDIwR"; version="0.4"; sha256="0z994anrw746iy83503bah2n39rd7qvx4spxn4qwhxhxbjp4gkfw"; depends=[admisc haven readr tibble xml2]; }; DDM = derive2 { name="DDM"; version="1.0-0"; sha256="19g06qk3lzasj294x9wfij729mlq6ryvjqkn3rgl5xp1w0gx9wi2"; depends=[]; }; - DDPGPSurv = derive2 { name="DDPGPSurv"; version="1.0"; sha256="1d271yv621jmwd4dmdnhpwrk95gbpw7g6r2v05lc3d6wzlzpd78c"; depends=[MASS mc2d mvnfast Rcpp RcppArmadillo survival]; }; DDPNA = derive2 { name="DDPNA"; version="0.2.6"; sha256="0ygyyxhhggyrllgzgmyxk4g1syz9qkp2rsawjgb8cz6w8nr06saq"; depends=[ggalt ggplot2 Hmisc igraph MEGENA plyr scales VennDiagram]; }; DDRTree = derive2 { name="DDRTree"; version="0.1.5"; sha256="16s5fjw7kwlxhrkzdny62sx32fvmg3rxjc3wrh6krd31jh1fqlfk"; depends=[BH irlba Rcpp RcppEigen]; }; DDoutlier = derive2 { name="DDoutlier"; version="0.1.0"; sha256="1az5zq0l3kj959572mlpc4zl73f16iag0yrs217fa9m8xpd3c2sd"; depends=[dbscan pracma proxy]; }; DECIDE = derive2 { name="DECIDE"; version="1.2"; sha256="18kn2pm9r0ims2k1jfsfzh258wwxz0xg86rsbwgq6szh0azlq3qy"; depends=[]; }; DEEPR = derive2 { name="DEEPR"; version="0.1"; sha256="0q8970q3gpjxwxdf2bkhpnqrxpm00w27b20a9sn9vv314rn1n7s8"; depends=[dirmult]; }; DEEVD = derive2 { name="DEEVD"; version="1.2.1"; sha256="0r8ymkwqjxjh49bh463f6wgdx22m420y0lkbgdwkbnzfgp5jmaar"; depends=[evd]; }; - DELTD = derive2 { name="DELTD"; version="2.6.5"; sha256="069njvzrffq64f0y05mm8pn58l9xsxacy12slj1w6np5nbvsp7b2"; depends=[]; }; + DELTD = derive2 { name="DELTD"; version="2.6.6"; sha256="1slhxclan82sqxi6zyd07z4iapf8p68hrqk4ssr7csr4ffxbp2y9"; depends=[]; }; DEMOVA = derive2 { name="DEMOVA"; version="1.0"; sha256="09dqhhhihphhdnplmhdq4q5zwc0qvqhirdrxa9x6fr43vwa5zfp4"; depends=[leaps]; }; + DEPONS2R = derive2 { name="DEPONS2R"; version="1.0.0"; sha256="17iw3cy5hypp0x43x0wwq7mfajbkz4q55bwj7c8pqnfma59vslb8"; depends=[raster sp xml2]; }; DES = derive2 { name="DES"; version="1.0.0"; sha256="16p38i8ykwc8gjw6c9dhdwjjpa1b17n9wqhz3rhkbzjh978pky31"; depends=[]; }; DESnowball = derive2 { name="DESnowball"; version="1.0"; sha256="012kdnxmzap6afc3ffkcvk1mazlkp286av6g9fwz2wcbf5mh9n1m"; depends=[clue cluster combinat MASS]; }; DET = derive2 { name="DET"; version="2.0.2"; sha256="01vyb3mv4g7zpk7cn44i4069ndk9sn9qqs9k52clqbnf1kl1ynbx"; depends=[doParallel pROC]; }; DEoptim = derive2 { name="DEoptim"; version="2.2-5"; sha256="0nlm2gdvd33yrwambmlrgj76inxz2a65ya7727l98fd4skfdw4mf"; depends=[]; }; DEoptimR = derive2 { name="DEoptimR"; version="1.0-8"; sha256="1vz546hyjyhly70z62h5n3mn62b8llhhmim8ffp9y6jnnb0i2sc4"; depends=[]; }; DEploid = derive2 { name="DEploid"; version="0.5.3"; sha256="0k5bcpfwf9fhkv0wp6s1nvp4l6xgwmdbz3l8mmiy8q1ym7gpvwml"; depends=[htmlwidgets magrittr plotly Rcpp rmarkdown scales]; }; - DFA = derive2 { name="DFA"; version="0.1.0"; sha256="14766binxz1bv4c492r4clj77ykp31v2h5bajydfn2336zz18m5y"; depends=[]; }; - DFA_CANCOR = derive2 { name="DFA.CANCOR"; version="0.1.8"; sha256="1jcvxngghfx5sdw5vjpx7yf5nqp5ws8fnwb07ycpzsa4sgb4nddn"; depends=[MASS MVN]; }; + DFA = derive2 { name="DFA"; version="0.9.0"; sha256="0nk8k6xxqbbk1zhq3xsm59azvkj9499vp92pjl9xygasarim90rl"; depends=[]; }; + DFA_CANCOR = derive2 { name="DFA.CANCOR"; version="0.2.0"; sha256="1kfnqg281cdws7gqn5s0klcvdc505d0y1chab2925wdihib7m2w4"; depends=[MASS MVN]; }; DFIT = derive2 { name="DFIT"; version="1.0-3"; sha256="1h0wvcplb7j7dqz9hkaw30x92ngxzkdvkwpg0142hrqb201zfrac"; depends=[ggplot2 mvtnorm simex]; }; DGCA = derive2 { name="DGCA"; version="1.0.2"; sha256="0k2a24ycagyxdx54dh9w8km25xhmmmhyyl26g76z4g5gqvcw092k"; depends=[matrixStats WGCNA]; }; + DGEobj = derive2 { name="DGEobj"; version="1.0.1"; sha256="0fvjlb45fx44dqz1njsxdgiiwcmvi7ifzywbrxbvrx0ar7c4yd0m"; depends=[assertthat GenomicRanges magrittr stringr]; }; DGLMExtPois = derive2 { name="DGLMExtPois"; version="0.1.3"; sha256="1prsnkkhb61y01flxz57875a9arvyy2qxjl0lz5ajpmf8dhr08j8"; depends=[COMPoissonReg nloptr progress]; }; - DGM = derive2 { name="DGM"; version="1.7.2"; sha256="0z0f8bazzsahvjkpfif50db700mqb7arcglwsfxcar9qdy082vsn"; depends=[data_table ggplot2 Rcpp RcppArmadillo reshape2]; }; DGVM3D = derive2 { name="DGVM3D"; version="1.0.0"; sha256="17cxv8rm7kmxms7v7hzbwbdwa3xl1hwgiljf97ppwswglqyik9iv"; depends=[rgl]; }; - DHARMa = derive2 { name="DHARMa"; version="0.3.2.0"; sha256="1xhn8bw3fdq1wqwkabdwgv0g41zxjc38kjbj049zjn0k1y1nzhqw"; depends=[ape doParallel foreach gap glmmTMB lme4 lmtest MASS mgcv qgam sfsmisc]; }; + DHARMa = derive2 { name="DHARMa"; version="0.3.3.0"; sha256="125wmcsnjp8h6bpqk812rysb6yv6ib5jyzf703l3q54bm0g2ww99"; depends=[ape doParallel foreach gap glmmTMB lme4 lmtest MASS mgcv qgam sfsmisc]; }; DHBins = derive2 { name="DHBins"; version="1.1"; sha256="1g69acac7pxw8x0d9czyds7xljhbv9d686c99a3y8b4vh7dnx62s"; depends=[ggplot2]; }; - DHS_rates = derive2 { name="DHS.rates"; version="0.7.1"; sha256="0n5cqbi5j57dxah04nsjr5cd0x7ini31fnqwkq6xiq7ds9k5ikf0"; depends=[crayon haven matrixStats reshape survey]; }; + DHS_rates = derive2 { name="DHS.rates"; version="0.8.0"; sha256="1mq4hqkghp6nk7jjwp9hfd81mjxrnkl4dvafd0vgav4yb8mhq8c2"; depends=[crayon dplyr haven matrixStats reshape rlang survey]; }; + DICOMread = derive2 { name="DICOMread"; version="0.0.0.2"; sha256="0b78057did8ww4hyfy33ly6b9f7lzpiwjzdm7mjfd4gkfilmvh0j"; depends=[matlabr]; }; + DIDmultiplegt = derive2 { name="DIDmultiplegt"; version="0.1.0"; sha256="1jzc2ixb92mxlm39xf3rmab9c8959xylnxacr4xqjnhi9hlkq30n"; depends=[assertthat dplyr fixest plotrix sampling stringr]; }; DIFboost = derive2 { name="DIFboost"; version="0.3"; sha256="07x31ccy2l0drv1356g1v4jw71i7zqb3d0v856gsd3kpqhclpvx0"; depends=[mboost penalized stabs]; }; DIFlasso = derive2 { name="DIFlasso"; version="1.0-4"; sha256="13ls5018l790cdr26431li4gi9zw03ilypszfqglg4hj485h7dyw"; depends=[grplasso miscTools penalized]; }; DIFplus = derive2 { name="DIFplus"; version="1.1"; sha256="1k03lr437gx5y762z3h40hz9kcl4m8xgrndxvbyvsgmn2h6pbwsd"; depends=[plyr TestDataImputation]; }; @@ -973,12 +1000,14 @@ in with self; { DIMORA = derive2 { name="DIMORA"; version="0.1.0"; sha256="0qcy2pqpx7za4ckf6wvmbhz5a52j44ksn81f8j1lj0z90idj6psn"; depends=[minpack_lm numDeriv]; }; DIRECT = derive2 { name="DIRECT"; version="1.0.1"; sha256="00z4xlc9kxn19lw2b8xq6krsf5v3wfbr1ghl5ah5shr9dnv84lc1"; depends=[]; }; DISTRIB = derive2 { name="DISTRIB"; version="1.0"; sha256="0whwmmdx2k2vrjjkz4ww9v7z9ad3835819pby91119lyic27w727"; depends=[]; }; - DIZutils = derive2 { name="DIZutils"; version="0.0.4"; sha256="1z6kinc7sg88yjb27c2ljrfj3jlyj6s63kvcfyvgdm4113ljclhs"; depends=[config data_table DBI RJDBC RPostgres shiny shinyjs]; }; + DIZutils = derive2 { name="DIZutils"; version="0.0.6"; sha256="1h53wvbzgbqkyxjblcba4g6fiimyppgan19jlw9gn26qvrs62prs"; depends=[config data_table DBI RJDBC RPostgres shiny shinyjs]; }; DIconvex = derive2 { name="DIconvex"; version="1.0.0"; sha256="0bnrq9nmryshir6ll43nz20aaqmmw0zjvfml72cpwbvrma8a3qmz"; depends=[lpSolveAPI]; }; - DJL = derive2 { name="DJL"; version="3.4"; sha256="15lawdpyq1vi325jg5s5rgwi20fak7imddd3wwyh0fw69854pff3"; depends=[car lpSolveAPI]; }; + DImodels = derive2 { name="DImodels"; version="1.0"; sha256="1kgnfcw386x19vmzhhir907rjvfz15rlrs6xa8ph2w95j5ai4pf0"; depends=[hnp rootSolve]; }; + DIscBIO = derive2 { name="DIscBIO"; version="1.1.0"; sha256="01v90gy9c9rfynfxjw96icshg6ndj88kifx17m40s98kx67q5iiz"; depends=[AnnotationDbi boot cluster fpc ggplot2 httr igraph impute mclust NetIndices org_Hs_eg_db philentropy png RColorBrewer readr rpart rpart_plot RWeka SingleCellExperiment statmod TSCAN tsne]; }; + DJL = derive2 { name="DJL"; version="3.6"; sha256="1drfqzla0lqlch21bvyjq5qjwm75c6rggpsc92p4dw5vwzs3p8lj"; depends=[car lpSolveAPI]; }; DLASSO = derive2 { name="DLASSO"; version="2.0.2"; sha256="0xdygf6h89d9z4kqb46iqfxgdzq9dmkrxf9ypw78l4d8n9xx2gaa"; depends=[MASS]; }; DLMtool = derive2 { name="DLMtool"; version="5.4.5"; sha256="1ngvdi88n2qkfr24wqvla0ghwiqhlz66qn9mry9xra8js6c8camw"; depends=[abind dplyr ggplot2 Rcpp RcppArmadillo snowfall]; }; - DMCfun = derive2 { name="DMCfun"; version="0.12.1"; sha256="0bkm9mvx2zknzrdmyh0cf41yzs9m9nvy10hjic221a2nyzyr99yx"; depends=[BH dplyr optimr pbapply Rcpp tibble tidyr]; }; + DMCfun = derive2 { name="DMCfun"; version="1.1.0"; sha256="05f0m82cxdpi5lj34h9aiaf2h3shahgf3w0ac4w81y122ikqdl70"; depends=[BH DEoptim dplyr optimr pbapply Rcpp tidyr]; }; DMMF = derive2 { name="DMMF"; version="0.5.1.2"; sha256="0p82cfp0561j4ki20rznx46z7vqdxh128a0m0zj8d2wp3csn1aag"; depends=[raster rgdal sp]; }; DMRMark = derive2 { name="DMRMark"; version="1.1.1"; sha256="15wr6j0v9kvbv8y6flkp4svfqy059ziv89nxv91vp0pjmavhpdlz"; depends=[ellipse MCMCpack mvtnorm]; }; DMRnet = derive2 { name="DMRnet"; version="0.2.0"; sha256="1rbba8w4li240gw5z675d7skm72rh0zxzp4rhsn6ivj72jya7jw4"; depends=[glmnet grpreg]; }; @@ -989,38 +1018,40 @@ in with self; { DNLC = derive2 { name="DNLC"; version="1.0.0"; sha256="05410xgpfjsydjmnzry454qcjpws9vhh252q2xq7l0scdj87ly00"; depends=[caTools fdrtool GOstats igraph locfdr mvtnorm spdep]; }; DNMF = derive2 { name="DNMF"; version="1.3"; sha256="09yp6x6vd44ahklcag96fpjgyphyn45rkqkbwr1n36a2d8vxk9nc"; depends=[doParallel foreach gplots Matrix]; }; DOBAD = derive2 { name="DOBAD"; version="1.0.6"; sha256="0ifrrfm4yp1416z58qgnak042rgj1xvqby2vvzgrv19z6b3250p3"; depends=[lattice Matrix numDeriv]; }; - DODR = derive2 { name="DODR"; version="0.99.2"; sha256="16ia9j8vab8n2i6a17wz8nfvkfgj2gsyhxvwgxvjg2cz99hsbhdj"; depends=[Matrix npsm Rfit]; }; DOS = derive2 { name="DOS"; version="1.0.0"; sha256="0vvkwn4wfvspbk74nb6124hdx9158h6yfksib14xqq7rx7c97ad4"; depends=[MASS]; }; DOS2 = derive2 { name="DOS2"; version="0.5.2"; sha256="0lcqk2fxfl5pdnxlpppqiqnyc23jyhp1kcxwci8ilagjv4djipmw"; depends=[MASS sensitivity2x2xk sensitivitymult sensitivitymv senstrat]; }; DOT = derive2 { name="DOT"; version="0.1"; sha256="0qh5n57cp9c2n5yn59q4wggz82943pwfanp3kx869aba2x3sj30i"; depends=[V8]; }; DOvalidation = derive2 { name="DOvalidation"; version="1.1.0"; sha256="1mzws3w7djpxnfqxjcqwgia7p17kb0qlnzj6qcfg2m1vamb1cn2z"; depends=[]; }; DPBBM = derive2 { name="DPBBM"; version="0.2.5"; sha256="1qypxrcm3sb727lqb09ssjf3hblixqayw3qsyql01imrxwm609i2"; depends=[CEoptim gplots tmvtnorm VGAM]; }; DPP = derive2 { name="DPP"; version="0.1.2"; sha256="1qalcm4gwh03qpy07d0p323ccq8xmk04v6z30g7wg6ic613bqg7m"; depends=[coda Rcpp]; }; - DPQ = derive2 { name="DPQ"; version="0.4-1"; sha256="1yz905cl0fcafnp5fm1nw0a24m38lgamsm2fxqnlzxmybhfphpxk"; depends=[sfsmisc]; }; - DPWeibull = derive2 { name="DPWeibull"; version="1.5"; sha256="1dxrhd3wklg7q3grvplas6wcbs05kga1b2va6d0wkynld01ww9ii"; depends=[binaryLogic Rcpp truncdist]; }; + DPQ = derive2 { name="DPQ"; version="0.4-2"; sha256="0h6605jqqh0wivcpyxn67br9111f4gkyf6fs5xma8mjjvbf8vlwz"; depends=[sfsmisc]; }; + DPQmpfr = derive2 { name="DPQmpfr"; version="0.3-0"; sha256="00zi574g4dxxwchhqfbd7dwg1h6bxmg530h3n6r19sjvhhnd0mbz"; depends=[DPQ gmp Rmpfr]; }; + DPWeibull = derive2 { name="DPWeibull"; version="1.7"; sha256="1z261fhx5dr3yxfy10jrnj5xpc5i8bcs169wqp9p32frwpz20ad3"; depends=[binaryLogic prodlim Rcpp RcppArmadillo survival truncdist]; }; DPtree = derive2 { name="DPtree"; version="1.0.1"; sha256="0d7zf695lwkx4gv50f08cbi3p3mjjay0qgrbmvybf9m15i4zmyd7"; depends=[MASS MCMCpack plyr Rdpack]; }; DRAYL = derive2 { name="DRAYL"; version="1.0"; sha256="0cf5pyx6nwh8srdylpnmymv3dr67fm6qqpwd1hvj1wmyfc8fznpp"; depends=[cubature pracma RConics rmutil]; }; DRDID = derive2 { name="DRDID"; version="1.0.0"; sha256="0fb23sn8v0y35czmg3hh8qff2w329k2aw00q3paxm3sas6ih72rz"; depends=[BMisc trust]; }; DREGAR = derive2 { name="DREGAR"; version="0.1.3.0"; sha256="15cplshs85r0z659mc7xmj5db7vc95wxs01c34isc22p8z0a287i"; depends=[msgps]; }; DRHotNet = derive2 { name="DRHotNet"; version="1.2"; sha256="0qvxxqcixzxg6gxgnafgfxwpy5haxgh4nbj9axk3kb9gn3b5g6mq"; depends=[maptools PBSmapping raster sp spatstat spdep]; }; - DRIP = derive2 { name="DRIP"; version="1.4"; sha256="1rds1161h19waqhiq08hqk5zcn48afccaggmb42xr1zyk31irpi6"; depends=[readbitmap]; }; + DRIP = derive2 { name="DRIP"; version="1.6"; sha256="08qyv2xwl3a70jrpmyxq37g0cryzc0ca904znyhzidmjgy13d18i"; depends=[]; }; DRR = derive2 { name="DRR"; version="0.0.4"; sha256="1y70si1gig4l7jx5jiqsqliyywfsvimkx53x3zh1lc3yj2j6bqwk"; depends=[CVST kernlab Matrix]; }; DRaWR = derive2 { name="DRaWR"; version="1.0.1"; sha256="1pfdczwzd236c64yw94bgbk0hbl4dhlgjfjwkljmqgqrzsddvgqh"; depends=[Matrix ROCR]; }; - DRomics = derive2 { name="DRomics"; version="2.0-1"; sha256="0lfjk202fgvxjljjpakbmdqc41hbpgl39lym215hlqksfpi0jq7a"; depends=[DESeq2 ggplot2 limma]; }; + DRomics = derive2 { name="DRomics"; version="2.1-3"; sha256="0cr24wajnd19xfp0abiga2znks0alynvp768jj04iqk13q8wwv0i"; depends=[DESeq2 ggplot2 limma SummarizedExperiment]; }; DSAIDE = derive2 { name="DSAIDE"; version="0.8.3"; sha256="0n1ffv48202pnnsdcd3zpgpviy8613fcgx5c796whjffrc4v8m31"; depends=[adaptivetau deSolve dplyr ggplot2 gridExtra lhs nloptr plotly shiny XML]; }; DSAIRM = derive2 { name="DSAIRM"; version="0.8.6"; sha256="1c43k56ly4bdfv6drd3zj9dgxg77dy3h36ya2znk2xgkq03smh4y"; depends=[adaptivetau boot deSolve dplyr ggplot2 gridExtra lhs nloptr plotly rlang shiny tidyr XML]; }; DSBayes = derive2 { name="DSBayes"; version="1.1"; sha256="0iv4l11dww45qg8x6xcf82f9rcz8bcb9w1mj7c7ha9glv5sfb25v"; depends=[BB]; }; - DSI = derive2 { name="DSI"; version="1.1.0"; sha256="0ggwfm2678gc98kkprdjyghb9dyydv5wwmh7dy7xl51pi80zplci"; depends=[progress R6]; }; + DSI = derive2 { name="DSI"; version="1.1.1"; sha256="0wn4vnn81kdp79nqycr0m8ljis78gagk3gnwn3r3xgiapg8xmh85"; depends=[progress R6]; }; DSL = derive2 { name="DSL"; version="0.1-7"; sha256="05wj3zypr2kqfbka930qnwnk2r43pqi13pbs5n6lm8vdq4zjblw4"; depends=[]; }; DSLite = derive2 { name="DSLite"; version="1.1.0"; sha256="16nd178lgx89i1qacv9xs8r127kxzchkn3757ps35anci50h8kbh"; depends=[DSI R6]; }; + DSMolgenisArmadillo = derive2 { name="DSMolgenisArmadillo"; version="1.3.4"; sha256="0xq7cfw94p0aikn4zh07rw3vv0mgbzc041m16qfzbjnk73rshzbx"; depends=[base64enc DSI httr MolgenisAuth stringr urltools]; }; DSOpal = derive2 { name="DSOpal"; version="1.1.0"; sha256="0n0112alq946zm8am13v5p35kmkc57yfwcbc085sfydpmcwbsjnj"; depends=[DSI opalr]; }; DSSAT = derive2 { name="DSSAT"; version="0.0.2"; sha256="15v64cgbfi51kj3p2wjmir8cfznhilx4gsd5w24734lwblmqf1bm"; depends=[dplyr glue lubridate purrr readr rlang stringr tidyr]; }; + DSjobtracker = derive2 { name="DSjobtracker"; version="0.1.1"; sha256="1vi07n7ygsdjj4830rnx7kvacmnizl146c6bfw2fnby47apg38f9"; depends=[]; }; DSpat = derive2 { name="DSpat"; version="0.1.6"; sha256="1v6dahrp8q7fx0yrwgh6lk3ll2l8lzy146r28vkhz08ab8hiw431"; depends=[mgcv RandomFields rgeos sp spatstat]; }; DSpoty = derive2 { name="DSpoty"; version="0.1.0"; sha256="18z8gk3zj7k2szxg9579qy5klrqjw6zsk5x9jmwrv4qhb98fyji6"; depends=[dplyr httr purrr stringr]; }; DSsim = derive2 { name="DSsim"; version="1.1.5"; sha256="0dr8dc91m7s5c198k9cb26a09f14wb8ihr46c0mr9cg33l2wf3nv"; depends=[fields mgcv mrds rgeos shapefiles sp splancs]; }; DStree = derive2 { name="DStree"; version="1.0"; sha256="14wba25ylmsyrndh007kl377dv4r34wr1555yxl6kyxrs4yg3jir"; depends=[Ecdat pec Rcpp rpart rpart_plot survival]; }; DSviaDRM = derive2 { name="DSviaDRM"; version="1.0"; sha256="1hj2pgnldrpgapwwz1kf4k6mvyzwdvb1i6czd7sbimsx5hafwps8"; depends=[igraph ppcor]; }; - DT = derive2 { name="DT"; version="0.15"; sha256="1wc2aiqkn01i571h29847yaq7vb624bkf44axp4ygpn0r85hdq7k"; depends=[crosstalk htmltools htmlwidgets jsonlite magrittr promises]; }; + DT = derive2 { name="DT"; version="0.16"; sha256="0in4d34nxb4pk2jygj0a21cqf0k0m4dhm4rjv68bnkp5kmmz6kbk"; depends=[crosstalk htmltools htmlwidgets jsonlite magrittr promises]; }; DTAT = derive2 { name="DTAT"; version="0.3-4"; sha256="1ddmih8cxbgc1p4m0sm8gdbnf0d3ka8z7014zd4aykz75j3pr002"; depends=[data_table dplyr Hmisc jsonlite km_ci pomp r2d3 shiny survival]; }; DTAXG = derive2 { name="DTAXG"; version="0.1.0"; sha256="1jxa0ix0z35i0xdnjl698j8iqjmp6nz8ckah9bap5ay9rkq0xd7f"; depends=[]; }; DTComPair = derive2 { name="DTComPair"; version="1.0.3"; sha256="1af2293ckkpz0gjcibgzzvz37852cav4wa4girpc87yn3p4ajlri"; depends=[gee PropCIs]; }; @@ -1031,8 +1062,8 @@ in with self; { DTMCPack = derive2 { name="DTMCPack"; version="0.1-2"; sha256="0bibas5cf06qq834x9q2l2fyh6q9wrg07k8cn6almcyirzax6811"; depends=[]; }; DTR = derive2 { name="DTR"; version="1.7"; sha256="1lzvk9ar6xf3n2vvy8vb9mvrbx3nafzzhvz5g7vf79jd71yz54jd"; depends=[aod ggplot2 survival]; }; DTRlearn2 = derive2 { name="DTRlearn2"; version="1.1"; sha256="0l756zb1wkpa1z5zjkc8jndmh2630gckxxfqslabzjmgsjf7fjgm"; depends=[foreach glmnet kernlab MASS Matrix]; }; - DTRreg = derive2 { name="DTRreg"; version="1.6"; sha256="10r81d5b9g4znbpkbcip4wfipq7r4fsgmqvinhvkhsnnwghb865w"; depends=[dplyr MASS]; }; - DTSg = derive2 { name="DTSg"; version="0.6.0"; sha256="1g5i9cizbm6r5h1vjgsnjlylbir4911ixc6mifwxknapfd7clib3"; depends=[checkmate data_table R6]; }; + DTRreg = derive2 { name="DTRreg"; version="1.7"; sha256="0fr2c8fg1acs2kk0r67zml5fp71mvxw116ixqf7yq34n9ljd5yph"; depends=[dplyr MASS]; }; + DTSg = derive2 { name="DTSg"; version="0.7.0"; sha256="0fqvpffjkkfs8wdv12wi0bp9h02vq2lqn41z29283s0dp8gn6p7l"; depends=[checkmate data_table R6]; }; DTWBI = derive2 { name="DTWBI"; version="1.1"; sha256="06lp4yc5nhacrgic78l014g2w1ibwgs8dp8zrahk5aripaczl25y"; depends=[dtw e1071 entropy lsa rlist]; }; DTWUMI = derive2 { name="DTWUMI"; version="1.0"; sha256="0pybgbfs2yp2ljbs0kra5z70x3llkiwdngp6cadgs3j9rar4vq4q"; depends=[dtw DTWBI e1071 entropy lsa rlist]; }; DVHmetrics = derive2 { name="DVHmetrics"; version="0.3.10"; sha256="1d8zig3ljld05pwaqsahyvjf95y8k183al5ibx09h6hj3r5bfd8n"; depends=[DT ggplot2 KernSmooth reshape2 shiny]; }; @@ -1050,33 +1081,34 @@ in with self; { Data2LD = derive2 { name="Data2LD"; version="3.2.1"; sha256="1y6nyysm96q5mlrcl0vkjhq5lr624n2266xpmyl4ck0h1dhjb6bz"; depends=[deSolve fda knitr rmarkdown]; }; DataClean = derive2 { name="DataClean"; version="1.0"; sha256="0wkafjyp6c2mx7g1bpz2pbxyl5nm2wba2hly8miizv0fdc762za5"; depends=[xlsx XML]; }; DataCombine = derive2 { name="DataCombine"; version="0.2.21"; sha256="0iwb4726bk0cjhay694dp43b1553yyk9lpxbncs85kz229b26arm"; depends=[data_table dplyr]; }; - DataEditR = derive2 { name="DataEditR"; version="0.0.5"; sha256="0mqwbz2g3k1b9pxzznv6v8l47ggkwdkcbpg1d0j9mqgmlkadvd5a"; depends=[htmltools rhandsontable shiny shinythemes]; }; + DataEditR = derive2 { name="DataEditR"; version="0.0.9"; sha256="1m9bh4hgm4rkr25kira3835bpj3x3ig796hyb8b43qqy353rlrds"; depends=[htmltools miniUI rhandsontable rstudioapi shiny shinyBS shinyjs shinythemes]; }; DataEntry = derive2 { name="DataEntry"; version="0.9-3"; sha256="0gfsg7wfwy88x7y1dwpgwi6fkizjnhrzj0a5ij70y4a4sjmyiy55"; depends=[digest gWidgets2 gWidgets2RGtk2 RGtk2]; }; - DataExplorer = derive2 { name="DataExplorer"; version="0.8.1"; sha256="0724ngcw2b1i2cf8jbak61saqk71f06wszvx7nhba4n0z8l503cz"; depends=[data_table ggplot2 gridExtra networkD3 reshape2 rmarkdown scales]; }; + DataExplorer = derive2 { name="DataExplorer"; version="0.8.2"; sha256="0451fnlaqvyzpqhn25g6lj2svjfsfaxii9vmwhqw7p29fl71zaln"; depends=[data_table ggplot2 gridExtra networkD3 reshape2 rmarkdown scales]; }; DataGraph = derive2 { name="DataGraph"; version="1.2.1"; sha256="164wbh3by8qf0p84l5v7vwrzf0f2s305fwmrl01khcll8pk34xlm"; depends=[Rcpp]; }; DataLoader = derive2 { name="DataLoader"; version="1.3"; sha256="18mih6mb95v5xjvmqwby2mma74fcxwyqdm5w8j3bhi4iwgfn6d7v"; depends=[plyr rChoiceDialogs readxl xlsx]; }; - DataSpaceR = derive2 { name="DataSpaceR"; version="0.7.3"; sha256="0jg77zq12fvwnzfdk83y6wi4547g9r5zlvhjmjj1bp0xp7spcbyk"; depends=[assertthat curl data_table digest httr jsonlite R6 Rlabkey]; }; - DataVisualizations = derive2 { name="DataVisualizations"; version="1.2.0"; sha256="10hjhxqm0f8s59x8hqn1nfganx4974lfkcghlqsi686h7vd7fzb3"; depends=[ggplot2 Rcpp RcppArmadillo sp]; }; + DataSpaceR = derive2 { name="DataSpaceR"; version="0.7.4"; sha256="1sag3mzwx6sb7xjg3xbid9487bgs2rl3xm3qyz1zzd8qm58s3h55"; depends=[assertthat curl data_table digest httr jsonlite R6 Rlabkey]; }; + DataVisualizations = derive2 { name="DataVisualizations"; version="1.2.1"; sha256="1mnc8klc47fqlglim4y33aqqii8bd58g3csa7635l0khx45qjx99"; depends=[ggplot2 Rcpp RcppArmadillo sp]; }; DataViz = derive2 { name="DataViz"; version="0.2.8"; sha256="1dr5nvdzc63x9ymlysvv5i8b7zcffq13pa39q0ychdwr1s3x7vzw"; depends=[Rcpp tibble]; }; DatabaseConnector = derive2 { name="DatabaseConnector"; version="3.0.0"; sha256="01a4xx7wdfmpvbq2ywdjg7pc90a2xa1rf3ka8vm4xbz31ir066y5"; depends=[DatabaseConnectorJars DBI rJava SqlRender stringr urltools]; }; DatabaseConnectorJars = derive2 { name="DatabaseConnectorJars"; version="1.1.0"; sha256="18m6ynj30r5xdy51b3s39h0jcz1k2wgka888skr6ds2233lhqk2w"; depends=[rJava]; }; DatabionicSwarm = derive2 { name="DatabionicSwarm"; version="1.1.3"; sha256="1qjlczpxadvzjn4gl2q7rnmpgygsh8ylk8cfvmynx8p675g657cz"; depends=[deldir GeneralizedUmatrix Rcpp RcppArmadillo]; }; + DatastreamDSWS2R = derive2 { name="DatastreamDSWS2R"; version="1.7.9"; sha256="01fc1rzcgfjlllimvq7va6gdmsavpckgyf4gk1vjd2lvnkf5z592"; depends=[dplyr foreach httr jsonlite stringi stringr xts zoo]; }; Davies = derive2 { name="Davies"; version="1.1-9"; sha256="19n2szki2dc8z01zh5a7bq4scgisnpd2qqbiimgrswjrykgh2fpm"; depends=[]; }; DeCAFS = derive2 { name="DeCAFS"; version="3.1.5"; sha256="0f56xl4is1cknlg55s2vprcf8f41if1vn0hh4xxhpficc6pxmnbv"; depends=[ggplot2 Rcpp]; }; DeLorean = derive2 { name="DeLorean"; version="1.5.0"; sha256="1ry6j4mvxms9hddi9c56p9yhjh66fzss41wqkf6xq398h1wbn4q1"; depends=[BH broom coda dplyr fastICA functional ggplot2 kernlab lattice MASS memoise Rcpp RcppEigen reshape2 rstan rstantools seriation StanHeaders stringr]; }; DeRezende_Ferreira = derive2 { name="DeRezende.Ferreira"; version="0.1.0"; sha256="05c99z3hlwwm0p02cl9z6gjwfxfq2b2qn90l85270bi16llgf42h"; depends=[xts]; }; DealGPL570 = derive2 { name="DealGPL570"; version="0.2.0"; sha256="1c202gzbhqaisxvpiiajcbfsjnqrvygd19304m2n89ansv81vi8r"; depends=[affy dplyr GEOquery stringr tibble]; }; DecisionAnalysis = derive2 { name="DecisionAnalysis"; version="1.1.0"; sha256="0vgvp1c6n8lmi48w1n5v86f8vrf7pf0dksb8wr3fxzg41nc9whrm"; depends=[Cairo data_tree DiagrammeR dplyr ggplot2 gridExtra qpdf tidyr viridisLite]; }; - DeclareDesign = derive2 { name="DeclareDesign"; version="0.22.0"; sha256="1c4ij70d2002rj595fzik75x44jf0gdnrs4bbm5fv4lqnbrm5j37"; depends=[estimatr fabricatr generics randomizr rlang]; }; - DecomposeR = derive2 { name="DecomposeR"; version="1.0.2"; sha256="0qimryr3hrl2ni99i3l9m7l4sfz0pkv9nmghh1yjb7wc0hdlayfk"; depends=[colorRamps dplyr hexbin hht StratigrapheR]; }; - DecorateR = derive2 { name="DecorateR"; version="0.1.1"; sha256="1dvyadlksqv8ns043yh91f6kw162k6r0zwn13j1g6pvismw04br9"; depends=[rJava RWeka RWekajars]; }; + DeclareDesign = derive2 { name="DeclareDesign"; version="0.24.0"; sha256="0gfxbnl1wnxqghljicrsvwhzkjp1al29rhfn8sjydyq006mv1yy8"; depends=[estimatr fabricatr generics randomizr rlang]; }; + DecomposeR = derive2 { name="DecomposeR"; version="1.0.3"; sha256="19p3iqpjjbfqb2jgd4n443qi3ksjys426bg41ql4bfp3af0nfw4l"; depends=[colorRamps dplyr hexbin hht StratigrapheR]; }; + DecorateR = derive2 { name="DecorateR"; version="0.1.2"; sha256="1za2qvdq96f75rmnm421xmq8s01ny4666ghv14i72iy3s4ml2hq9"; depends=[rJava RWeka RWekajars]; }; Deducer = derive2 { name="Deducer"; version="0.7-9"; sha256="14kakyf28i654pndlswjzp6h3h7szpznrg6xznqg150mmn0bs3s6"; depends=[car e1071 effects foreign ggplot2 JGR MASS multcomp plyr rJava scales]; }; DeducerPlugInExample = derive2 { name="DeducerPlugInExample"; version="0.2-0"; sha256="03aw7wr957xzw920ybyzxnck5kx0q2xpcrpq8jh2afyzszy6hzbi"; depends=[Deducer]; }; DeducerPlugInScaling = derive2 { name="DeducerPlugInScaling"; version="0.1-0"; sha256="1qg11vi4szznchh54p9345jbmrfzfr9z5l3x5xz4m86myjkys1mb"; depends=[Deducer GPArotation irr klaR mvnormtest psych]; }; DeducerSpatial = derive2 { name="DeducerSpatial"; version="0.7"; sha256="0133qk3yjcifyha7c4pqr5s0hmbci72bzgil2r0sxjmrljs3q727"; depends=[Deducer Hmisc JavaGD maptools OpenStreetMap rgdal scales sp UScensus2010]; }; DeducerSurvival = derive2 { name="DeducerSurvival"; version="0.1-0"; sha256="03qk3y4pibvrxbnxbm5rlksw807dvbilip1jbpn1r7k02ibzq676"; depends=[Deducer]; }; DeducerText = derive2 { name="DeducerText"; version="0.1-2"; sha256="0if2p9j74wa5rva4iv0i8iax22grl9j7lqcqzqlywjgqwnlzxa05"; depends=[Deducer RColorBrewer SnowballC tm wordcloud]; }; - Delaporte = derive2 { name="Delaporte"; version="7.0.3"; sha256="1gwsnrdgiz9sx2hnpywvps1rbxxibcrkq0z43ls0gzpydcjv2dmi"; depends=[]; }; + Delaporte = derive2 { name="Delaporte"; version="7.0.5"; sha256="1bph2ddvgmzcqvhj6s9rbwq58x0pczkjydfis96kv5zvsaca123x"; depends=[]; }; DelayedEffect_Design = derive2 { name="DelayedEffect.Design"; version="0.0.4"; sha256="0n1dw9bqisfarg7him49mzqn60gcfr660d5x9k6b37r12dnmy48v"; depends=[msm survival]; }; Delta = derive2 { name="Delta"; version="0.2.0.3"; sha256="0bi9qca4ky481zycp8r7ihvqfjkpvi7hb9wrjsw9avawqa6ck9bv"; depends=[]; }; Demerelate = derive2 { name="Demerelate"; version="0.9-3"; sha256="1bsf09di6nh0hznqx829jnbn3092rya03hnc82cns6rm8d3bn0a9"; depends=[fts mlogit sfsmisc vegan]; }; @@ -1089,20 +1121,21 @@ in with self; { Density_T_HoldOut = derive2 { name="Density.T.HoldOut"; version="2.00"; sha256="0kh5nns1kqyiqqfsgvxhx774i2mf4gcim8fp5jjyq577x4679r31"; depends=[histogram]; }; DepLogo = derive2 { name="DepLogo"; version="1.0"; sha256="0h4jpflf8amip62r936lg0k428gypag296kwl58w1d0qa5jyxrkk"; depends=[]; }; DepthProc = derive2 { name="DepthProc"; version="2.1.3"; sha256="1dq5y6fgmm00imkim4v2s6kn4z5qnwa0dkfkcq4pap7imvi35aab"; depends=[colorspace geometry ggplot2 lattice MASS np Rcpp RcppArmadillo rrcov sm zoo]; }; - Deriv = derive2 { name="Deriv"; version="4.0"; sha256="03mlfy8jzzzbh2l18gnmw0a71n9savx4cw72yhkxq93v2xj8fy3n"; depends=[]; }; - DescTools = derive2 { name="DescTools"; version="0.99.37"; sha256="1pjgmvdwlzjbbwj27fkf7w87k6k1brl8j13qyx49y1nd1blfkspm"; depends=[BH boot Exact expm MASS mvtnorm Rcpp rstudioapi]; }; - DescToolsAddIns = derive2 { name="DescToolsAddIns"; version="1.7"; sha256="0k9qsz6wn97gy23rzm1rr8c6az05xr01jnsqcxknalkx6hj8h1mg"; depends=[DescTools foreign manipulate rstudioapi writexl]; }; + Deriv = derive2 { name="Deriv"; version="4.1.2"; sha256="1j9sh1w9lsnnhlh59g4ghykyfx46rxh380s8imvm7pzna7rw7c64"; depends=[]; }; + DescTools = derive2 { name="DescTools"; version="0.99.39"; sha256="03yd43jnb6xb3mz57fpgw48hsbxcsj0k85w3aqy2335lprdhxy2k"; depends=[BH boot Exact expm gld MASS mvtnorm Rcpp rstudioapi]; }; + DescToolsAddIns = derive2 { name="DescToolsAddIns"; version="1.8"; sha256="108f4p1iy2f2qpxwmsqvd9dxhaysvym40jdpzcmsagdrcgpwfh82"; depends=[DescTools foreign manipulate rstudioapi writexl]; }; + DescrTab2 = derive2 { name="DescrTab2"; version="2.0.3"; sha256="1dhni83jhl1v094l6axhaain67k307ba6cppzxmhn74ba5rikfcl"; depends=[cli DescTools dplyr exact2x2 flextable forcats kableExtra magrittr nlme officer rlang scales stringr tibble tidyselect]; }; DescribeDisplay = derive2 { name="DescribeDisplay"; version="0.2.7"; sha256="0241mbz0y3ala7fsb4fwjd0xigsk0wq77hfrjyvnnp97rfjfzmcv"; depends=[GGally ggplot2 plyr reshape2 scales]; }; DescriptiveStats_OBeu = derive2 { name="DescriptiveStats.OBeu"; version="1.3.2"; sha256="0f2inlfkwl2q9ll5lh0ynpsbf6zci149s5nj0s0x0g98z72z8mly"; depends=[dplyr jsonlite magrittr RCurl reshape]; }; - DesignLibrary = derive2 { name="DesignLibrary"; version="0.1.4"; sha256="16j9ca3y8mcdbd64yqm6js4lb9hjc74dh4r5y3h1ifvwzj0a78yc"; depends=[DeclareDesign estimatr fabricatr generics glue randomizr rlang]; }; - DetLifeInsurance = derive2 { name="DetLifeInsurance"; version="0.1.2"; sha256="1d9fi77vfy1494qgskx1v0b8k84fnl17kd14agf3mxhzhxkixpnm"; depends=[]; }; + DesignLibrary = derive2 { name="DesignLibrary"; version="0.1.5.5"; sha256="1qr6abnyfgf71vcqirpwk4k8zsiddx4s5hd5cjin5jvgkp2q2fjy"; depends=[DeclareDesign estimatr fabricatr generics glue randomizr rlang]; }; + DetLifeInsurance = derive2 { name="DetLifeInsurance"; version="0.1.3"; sha256="15yh66mn84cm5ix99lg5lp783dp8il03dyirkhil7m5pwzss42r4"; depends=[]; }; DetMCD = derive2 { name="DetMCD"; version="0.0.5"; sha256="034wb5hwpikli6h2rwiqr19qvzxrr4qwi4q436y7c5a5wgkfzgl5"; depends=[pcaPP Rcpp RcppEigen robustbase]; }; DetR = derive2 { name="DetR"; version="0.0.5"; sha256="1dd4nzkgj5pl9397aa0z3q5fpl27xbdf7q0pqbs821dyynylxzn9"; depends=[MASS pcaPP Rcpp RcppEigen robustbase]; }; DetSel = derive2 { name="DetSel"; version="1.0.4"; sha256="01mpjy1cmgbrchdjl0gmrq3zx3mlkznml1qcradj2v5mgz26ifrv"; depends=[ash]; }; DevTreatRules = derive2 { name="DevTreatRules"; version="1.1.0"; sha256="1h4p78mwl5ir31hfb38x1dwq5xxbdlsasvk5vxa3c7xdvhsd2yrf"; depends=[DynTxRegime glmnet modelObj]; }; Devore7 = derive2 { name="Devore7"; version="0.7.6"; sha256="1m18p8h9vv4v0aq2fkjyj39vzb8a09azbbczhfiv4y88w540i8nw"; depends=[lattice MASS]; }; Dforest = derive2 { name="Dforest"; version="0.4.2"; sha256="19jyph2zqfyq9vv22kb6fqy89l0vcviv19zgk10hbd7q850f6ryn"; depends=[ggplot2 rpart]; }; - DiPALM = derive2 { name="DiPALM"; version="1.0"; sha256="1l7rd2jbviipywnx8fkls21qmzj8kd57158g46s6222yv17rl4qy"; depends=[ggplot2 limma WGCNA]; }; + DiPALM = derive2 { name="DiPALM"; version="1.1"; sha256="0wni4xz8a9mf9pih332k1fmc62bha9rs63x56dn6w85hsd8wqz7n"; depends=[ggplot2 limma WGCNA]; }; DiPhiSeq = derive2 { name="DiPhiSeq"; version="0.2.0"; sha256="11l2inf99vxz9k292307j8c2b25kc1066svy3vxrfl72rrm4fqa7"; depends=[]; }; DiPs = derive2 { name="DiPs"; version="0.6.1"; sha256="0r6r0i417z4ax7cw1a7jbjhi0h2i2n43vf0y4770hyrl3m6spwfj"; depends=[liqueueR mvnfast plyr]; }; DiSSMod = derive2 { name="DiSSMod"; version="1.0.0"; sha256="199yipbc2sx2lsl51rpfyh80bfxaahfd2llqmfsp946gvj7339hv"; depends=[MASS matrixcalc psych sfsmisc]; }; @@ -1111,9 +1144,8 @@ in with self; { DiallelAnalysisR = derive2 { name="DiallelAnalysisR"; version="0.3.0"; sha256="10qfjskawrdrvayrzxpblx9jxwngpwwi1q5aisvx3rpf9c3xrii2"; depends=[ggplot2]; }; DiceDesign = derive2 { name="DiceDesign"; version="1.8-1"; sha256="11s1m543kxd6gv4amh8z6pph1n67sj9sfwm6hjy83wfs65syf5vp"; depends=[]; }; DiceEval = derive2 { name="DiceEval"; version="1.5"; sha256="0yvpq0bbp70ipjc9bg2jf0ah7m5nsil669vhky11f42kijm8rsj2"; depends=[DiceKriging]; }; - DiceKriging = derive2 { name="DiceKriging"; version="1.5.6"; sha256="14jfwvj8vhrngcpkqdzr6klhnqwgr1g5wm5rqz8q6w7ip4nnsii5"; depends=[]; }; - DiceOptim = derive2 { name="DiceOptim"; version="2.0.1"; sha256="09qggq9csnvc0y8i9cki33095yfjidfirs11lri4aspsg5vjsiv4"; depends=[DiceDesign DiceKriging mnormt pbivnorm randtoolbox rgenoud]; }; - DiceView = derive2 { name="DiceView"; version="2.0-0"; sha256="041k45xmh4ks8gxvahlvxnigizljmyk3n9xb83wmnrng9z5jbr94"; depends=[DiceDesign DiceEval DiceKriging geometry R_cache rgl scatterplot3d]; }; + DiceKriging = derive2 { name="DiceKriging"; version="1.5.8"; sha256="0xsdpyqv7hjr6x617kiymi9al9ds11nppqksi2wdn2dm9j4jpl0i"; depends=[]; }; + DiceView = derive2 { name="DiceView"; version="2.0-1"; sha256="0y2k7j63qj1nwks9pbm85zj05mfx4q74w52hl2lbj1z1pk3hhcdh"; depends=[DiceDesign DiceEval DiceKriging geometry R_cache scatterplot3d]; }; Dict = derive2 { name="Dict"; version="0.1.0"; sha256="1v8yp03gajg9i82qyfww14jx93l4jbfq8mh6jqyf6calgrsj06jc"; depends=[dplyr magrittr purrr R6 rlang]; }; DidacticBoost = derive2 { name="DidacticBoost"; version="0.1.1"; sha256="0z1h61n6nfjvb64fgkzi1sq7ag747crhh593hxkx0cpza29778rz"; depends=[rpart]; }; Diderot = derive2 { name="Diderot"; version="0.13"; sha256="04d1drxn99r0fqq3zym7yyip9c8rfqhghq20q4zyb42l3hfgv9ai"; depends=[data_table doParallel foreach igraph RCurl splitstackshape stringi]; }; @@ -1123,13 +1155,14 @@ in with self; { DiffusionRgqd = derive2 { name="DiffusionRgqd"; version="0.1.3"; sha256="1gf5jpvimfrc9ccva0jk85rl4zfkbijm2305ky1rxcgm4kgw4lax"; depends=[colorspace Rcpp RcppArmadillo rgl]; }; DiffusionRimp = derive2 { name="DiffusionRimp"; version="0.1.2"; sha256="1h7145ldlgwrrwj4l1wxdp2rbg2pm4v3pngiq0saz0xi3vpcxwl6"; depends=[colorspace Rcpp RcppArmadillo rgl]; }; DiffusionRjgqd = derive2 { name="DiffusionRjgqd"; version="0.1.1"; sha256="1yb1jaq324qm2x8cl3bs2dflnsx8yfygpw2m3kk5hzaai9gfkqjf"; depends=[colorspace Rcpp RcppArmadillo rgl]; }; + DirStats = derive2 { name="DirStats"; version="0.1.6"; sha256="1ysz68x18v77b05r6yfkc0c0x87cvj2zxkhl638af0a76xa5ajg4"; depends=[movMF rotasym]; }; DirectEffects = derive2 { name="DirectEffects"; version="0.2"; sha256="0cawn1i1cyczsr9zpcaky79dfdl9anfjgiaa2404capacnj3call"; depends=[Formula glue sandwich]; }; DirectStandardisation = derive2 { name="DirectStandardisation"; version="1.3"; sha256="1qlfvzlig3a2v78fiq6sbbpxklmjczikxdw57m6mqngzrl9vdl2g"; depends=[]; }; DirectedClustering = derive2 { name="DirectedClustering"; version="0.1.1"; sha256="1shdqz0c5bbgknvfqr3ais26cb5mpywnah3d3584w97sy8v7gxm2"; depends=[igraph]; }; - Directional = derive2 { name="Directional"; version="4.4"; sha256="0119yi3l4zmb6n3n8jbhvmzz6cwr10z0cpyzd0n8mz7024vvka7w"; depends=[bigstatsr doParallel foreach MASS RANN Rfast Rfast2 rgl]; }; + Directional = derive2 { name="Directional"; version="4.5"; sha256="19xd0krp54gjlhy70689g9ypp3xf3612446y6srsc4j06lv86xkl"; depends=[bigstatsr doParallel foreach MASS RANN Rfast Rfast2 rgl]; }; DirichletReg = derive2 { name="DirichletReg"; version="0.7-0"; sha256="10189c3mj85nbqp7fd5ll4g0qr950309hhma4b7bpv2gb7hvpzsp"; depends=[Formula maxLik]; }; DisHet = derive2 { name="DisHet"; version="1.0.0"; sha256="056jcs1qpiyadnmlzd0cj4kp0qzkichxi0pdnxypyq1fsqnpvan3"; depends=[gtools matrixStats]; }; - DisImpact = derive2 { name="DisImpact"; version="0.0.12"; sha256="1ba7z0r7s50vbgcff664z9si3l3kihmascy955p6gl8j9d9p2v5k"; depends=[dplyr purrr rlang tidyr tidyselect]; }; + DisImpact = derive2 { name="DisImpact"; version="0.0.14"; sha256="1pzvrk9qna9yrmjxn964ysncpram7qqf3sxmfpnjn7zwicjkj4is"; depends=[dplyr purrr rlang tidyr tidyselect]; }; DiscreteFDR = derive2 { name="DiscreteFDR"; version="1.3-4"; sha256="0r3z56xcb5als38rhydia482j5xl9kcgamdj6ibd22yi0ya6k4iv"; depends=[Rcpp]; }; DiscreteInverseWeibull = derive2 { name="DiscreteInverseWeibull"; version="1.0.2"; sha256="0vjsvl4m4zccfgizv7mzidbbpzqcm101x448vllcdcrn2xlnkmnq"; depends=[Rsolnp]; }; DiscreteLaplace = derive2 { name="DiscreteLaplace"; version="1.1.1"; sha256="17w4vjvsm7jacvwckjczyah3hglq044r3m6vqdcrg8haz884rav2"; depends=[]; }; @@ -1138,15 +1171,14 @@ in with self; { DiscriMiner = derive2 { name="DiscriMiner"; version="0.1-29"; sha256="1ii8aa4dwfk991qdnpmkva20wvs5fqcna9030c799ybf11qpdass"; depends=[]; }; Disequilibrium = derive2 { name="Disequilibrium"; version="1.1"; sha256="1jm5n01ih4rnga13058yh939zp2lvjn5pgb6rrwp5fdlk5kqsgb0"; depends=[Formula numDeriv optimr]; }; DisimForMixed = derive2 { name="DisimForMixed"; version="0.2"; sha256="00mknsalikangr17946877m5fy2jgkgasgl6ng4f2nr44f0q9l6q"; depends=[cluster dplyr]; }; - Distance = derive2 { name="Distance"; version="1.0.1"; sha256="1vlsp3dap52hhm70z18k43wf6c3sv222l7w8bz95xzd1vmbnh7qw"; depends=[dplyr mrds rlang]; }; + Distance = derive2 { name="Distance"; version="1.0.2"; sha256="09cgbhk2ilxkbbaw3hw6zdgrsq174y7bffgkc48gaybnvf8vdgy5"; depends=[dplyr mrds rlang]; }; DistatisR = derive2 { name="DistatisR"; version="1.0.1"; sha256="0myzfki8yrk0nhgdgsqs4wjbqhzmkdil1g005hc7p4lz3gi09bfx"; depends=[car prettyGraphs]; }; - Distributacalcul = derive2 { name="Distributacalcul"; version="0.2.2"; sha256="0gsfgfxgbckyp17xr5y3k05pl22bpkajf2x26cwbgnidq9vk6hdp"; depends=[dplyr ggplot2 plotly rlang shiny shinydashboard shinydashboardPlus shinyWidgets statmod tippy]; }; + Distributacalcul = derive2 { name="Distributacalcul"; version="0.3.0"; sha256="08v6wc7al6wbf06i22g8cil1a5c4incr9d1c2znb4zgjj31ibbzp"; depends=[dplyr ggplot2 plotly rlang shiny shiny_i18n shinydashboard shinydashboardPlus shinyWidgets statmod tippy]; }; DistributionFitR = derive2 { name="DistributionFitR"; version="0.1"; sha256="0wg43gqsdy1ja0l489k27k9q1w2zq45wzmqnv9wfc734rf8kvlba"; depends=[doParallel foreach stringr]; }; DistributionOptimization = derive2 { name="DistributionOptimization"; version="1.2.6"; sha256="0pp0f7c9szyx426bnnz4fz4vh5q73m8x896z6pqgx04b6v445361"; depends=[AdaptGauss GA ggplot2 pracma]; }; DistributionTest = derive2 { name="DistributionTest"; version="1.1"; sha256="11xhr6yv42s1i4qqlb1pvzm8q2116v10gjlkhl0ml3id6lx27nmj"; depends=[MASS]; }; DistributionUtils = derive2 { name="DistributionUtils"; version="0.6-0"; sha256="08vq54pyqxlqsj6q6gsg5ikqa0z3x842j52ld5dxaq272p6xchvl"; depends=[]; }; DivE = derive2 { name="DivE"; version="1.2"; sha256="1czj89ljvpgl03471cknki2lc64swdqdpf5wsgicad35kgmlrwlh"; depends=[deSolve FME rgeos sp]; }; - DivMelt = derive2 { name="DivMelt"; version="1.0.3"; sha256="03vkz8d283l3zgqg7bh5dg3bss27pxv4qih7zwspwyjk81nw3xmr"; depends=[glmnet]; }; DiversityOccupancy = derive2 { name="DiversityOccupancy"; version="1.0.6"; sha256="16x3fpchgd12mccvr1k11vjka97sy5vjvjcyd5y3pskgnpycc2sv"; depends=[dplyr ggplot2 glmulti MuMIn qpcR raster unmarked vegan]; }; DnE = derive2 { name="DnE"; version="2.1.0"; sha256="02cbfb3m9xf24wkgqc06k3k0rx7qlqh4ma43khg6fpvif6yyahrn"; depends=[]; }; DoE_MIParray = derive2 { name="DoE.MIParray"; version="0.13"; sha256="0lbcqfizgrnqmp0b2yn14br7xmabbhywy8h7161hx6hnvnam5r99"; depends=[combinat DoE_base]; }; @@ -1156,27 +1188,30 @@ in with self; { DoEstRare = derive2 { name="DoEstRare"; version="0.2"; sha256="0y9ymw7114jk1rwiasq400bpgvkxv6rpc954c7v9mgxd3c2nfza7"; depends=[]; }; DoTC = derive2 { name="DoTC"; version="0.2"; sha256="1hjjkmxrbiysy3xl6n4q7kxcygdq68jcsgki1p937zj9a17sa62j"; depends=[ggplot2 plyr]; }; Dodge = derive2 { name="Dodge"; version="0.9-2"; sha256="0767n6hyspqrv5cgx3ghhai0qffj6haga7s86pv7mq8zvjcxjlzv"; depends=[]; }; - Dominance = derive2 { name="Dominance"; version="1.1.0"; sha256="1dzfj79hv3ds72dy4fn14bp68fiw06vdxkp4dvyvj37yrrqpcxyz"; depends=[chron gdata igraph XLConnect]; }; + Dominance = derive2 { name="Dominance"; version="1.1.2"; sha256="0hdia3pp6k035mb28z1iddq1zipy0wq0644sqd49wrsi2k6hcl9h"; depends=[chron gdata igraph XLConnect]; }; DoseFinding = derive2 { name="DoseFinding"; version="0.9-17"; sha256="1lj96443dj61nxqfl20rc1f6ja2clbr9j6b6l8vi2gpspx5i76qw"; depends=[lattice mvtnorm]; }; DoubleCone = derive2 { name="DoubleCone"; version="1.1"; sha256="1kbvsj93nn2306s6pgqiiznmlcn2nqsgcxinihl613ivczxhzpqg"; depends=[coneproj MASS Matrix]; }; DoubleExpSeq = derive2 { name="DoubleExpSeq"; version="1.1"; sha256="00xpj5xmpgmvp6h76imkmghrnlfk6c50ydvv0jram6m6ix3z8323"; depends=[numDeriv]; }; + DoubleML = derive2 { name="DoubleML"; version="0.1.1"; sha256="1kvix57h29khdfq6cbjh8vza4fxqfswwc8cq28x7yzcw1g9mw11r"; depends=[checkmate clusterGeneration data_table mlr3 mlr3tuning mvtnorm R6 readstata13]; }; Dowd = derive2 { name="Dowd"; version="0.12"; sha256="1fgaq22n7gm8pqxdfkiayqgjfqjn7knjjjr1x12jgv77cv08xyjk"; depends=[bootstrap forecast MASS]; }; Dpit = derive2 { name="Dpit"; version="1.0"; sha256="02pnc00sk3bwxmxrg27638x0q62r7nsx2nr14zjjc5q880prdisv"; depends=[fitdistrplus gsl moments VGAM]; }; DrBats = derive2 { name="DrBats"; version="0.1.5"; sha256="1iaffippp9kwfrwryf7klmn8nsm2k8pc0bkgpxcsl4vxyy2na3mp"; depends=[ade4 coda MASS Matrix rstan sde]; }; DrImpute = derive2 { name="DrImpute"; version="1.0"; sha256="1adzarrwqb282pqgx2yqswp9rpwd1naxsmar54kddr6qyd6b923b"; depends=[Rcpp RcppArmadillo]; }; DrInsight = derive2 { name="DrInsight"; version="0.1.2"; sha256="1zz9i4aj0ijqfgp30wv0bvrgx2n003dysqg0pm13f7hni27819ff"; depends=[igraph qusage]; }; + DramaAnalysis = derive2 { name="DramaAnalysis"; version="3.0.2"; sha256="0nsnwais0r592c50nphfzkr1bbygl67mriwsx7dxbvmpdsswlvl1"; depends=[data_table git2r httr readr reshape2 stringr tokenizers xml2]; }; DriftBurstHypothesis = derive2 { name="DriftBurstHypothesis"; version="0.4.0.1"; sha256="1pmsbv1rl79s520nxj536m8gf7xyfjskj8r88rxmxscbgp8c1xz2"; depends=[Rcpp RcppArmadillo xts zoo]; }; DrillR = derive2 { name="DrillR"; version="0.1"; sha256="0n7pim5kk0wfdjcc67v4vvdb7wyhn5bcgi2a12nbyfyydss7pk1g"; depends=[httr]; }; DriveML = derive2 { name="DriveML"; version="0.1.0"; sha256="0ikhbdgshx51fk629yhwhrdwiqg40qa7rsljb5ihax02cg0cv796"; depends=[caTools data_table ggplot2 iml mlr ParamHelpers rmarkdown sampling SmartEDA]; }; DrugClust = derive2 { name="DrugClust"; version="0.2"; sha256="0acvjqwzkbjmy101m501l7fkfxzkp6zflwvn56li5307xv9ggnfg"; depends=[cclust cluster e1071 MESS ROCR]; }; - DstarM = derive2 { name="DstarM"; version="0.3.0"; sha256="16vcv21dgnymhsy9j5x5pblnipf4hdyscajx6pr8kl6i95hs3hmj"; depends=[DEoptim ggplot2 Rcpp RcppArmadillo rtdists RWiener]; }; + DstarM = derive2 { name="DstarM"; version="0.4.0"; sha256="0wm5kr2pkgbvh9svjq8zq46zn50hwf58rs3y1ybnwcfjc2q75h1s"; depends=[DEoptim ggplot2 Rcpp RcppArmadillo rtdists RWiener]; }; DtD = derive2 { name="DtD"; version="0.2.2"; sha256="1czspjdxjhbfk2df7wk0x3d1ilwrjqw4s4gdc4hq0gjcjqyx0c39"; depends=[checkmate Rcpp RcppArmadillo]; }; DunnettTests = derive2 { name="DunnettTests"; version="2.0"; sha256="1sf0bdxays10n8jh2qy85fv7p593x58d4pas9dwlvvah0bddhggg"; depends=[mvtnorm]; }; DySeq = derive2 { name="DySeq"; version="0.22"; sha256="1sx6mg0bcqb5ff6x305k43zx3fwd16rvxc7xb3ai5h3w7fs9zz7y"; depends=[boot MASS TraMineR]; }; Dykstra = derive2 { name="Dykstra"; version="1.0-0"; sha256="1rc1409ky0ysqr3ccq28yhbs94m6d0z2dfa66k4c7irxjvbagwz6"; depends=[]; }; DynClust = derive2 { name="DynClust"; version="3.13"; sha256="020zl2yljp47r03rcbzrbdmwk482xx27awwzv4kdrbchbzwhxqgm"; depends=[]; }; + DynComm = derive2 { name="DynComm"; version="2020.1.6"; sha256="09nhcp9rldwrybwhyg86mgpgwq4hzlpp4rm5a5gl33nnhvcdm0mx"; depends=[igraph Rcpp Rdpack]; }; DynNom = derive2 { name="DynNom"; version="5.0.1"; sha256="1ahs93mks2z423sxk4wjgivdz4ggvwm87dha0aan4fg4jarai98s"; depends=[BBmisc compare dplyr ggplot2 magrittr plotly prediction rms shiny stargazer survival]; }; - DynTxRegime = derive2 { name="DynTxRegime"; version="4.7"; sha256="10lsp58jmn9mmpj8yq9adj5a0sa2wd5izgish61g4f643c40rk18"; depends=[dfoptim kernlab modelObj rgenoud]; }; + DynTxRegime = derive2 { name="DynTxRegime"; version="4.9"; sha256="0apwqlqdn5vwb4z7s60r2nsgdw7bzkbxj6199aibyansnsai0s35"; depends=[dfoptim kernlab modelObj rgenoud]; }; DynaRankR = derive2 { name="DynaRankR"; version="1.1.0"; sha256="1fzicainh1dm016cglm2x6j1i2g5r71vgrj0dnsflbxc5v426sqm"; depends=[dplyr rlang]; }; DynamicDistribution = derive2 { name="DynamicDistribution"; version="1.1"; sha256="1s78hpj2pxjs4vixin1i816qjbn3wk7b8rd2zdjp4d4rbxifcqf5"; depends=[]; }; DynamicGP = derive2 { name="DynamicGP"; version="1.1-6"; sha256="1d3ycx6vcv7rcagaxvfyxgsdigbzigxarm66ypkdasbli1507is3"; depends=[lhs]; }; @@ -1187,11 +1222,10 @@ in with self; { EAinference = derive2 { name="EAinference"; version="0.2.3"; sha256="1kzcfya3z6rf1vqjn72yjymdhrn4dzgmwifh3w6k22cy5jxffzn4"; depends=[hdi limSolve MASS msm mvtnorm Rcpp RcppArmadillo]; }; EBASS = derive2 { name="EBASS"; version="0.1"; sha256="14hxzj06wrc4ihflr7dqk28fsjwbcizr0jy54vhv0mk1y1gd4201"; depends=[]; }; EBEN = derive2 { name="EBEN"; version="4.6"; sha256="0gcf5b2viiq69vs8bd8nhk65g9sbzgg212w7zpnz4y6cv9jkk5zz"; depends=[]; }; - EBMAforecast = derive2 { name="EBMAforecast"; version="1.0.0"; sha256="15pw49nj7lq9rfq3sn7p19w28kzx7ypc5dflx0lslaay3fdhria1"; depends=[abind gtools Hmisc plyr Rcpp separationplot]; }; - EBPRS = derive2 { name="EBPRS"; version="2.0.4"; sha256="00rbxmcgaip961g3bkpv6gyjm9bhisfscq51dy00g431rcccjcx4"; depends=[ROCR]; }; + EBMAforecast = derive2 { name="EBMAforecast"; version="1.0.2"; sha256="0xnzb7hvkc50b65bgq4xbnzks6sb0241lwd6zwp3cz22s3wpyhhr"; depends=[abind gtools Hmisc plyr Rcpp separationplot]; }; + EBPRS = derive2 { name="EBPRS"; version="2.1.0"; sha256="14wal81cai08xr26fpc2w4ramr5jyv7vwfyqb5hzw3kqxx76y9xx"; depends=[BEDMatrix data_table ROCR]; }; EBglmnet = derive2 { name="EBglmnet"; version="4.1"; sha256="0wlscmimj74alcr8k5h1g3alvlpss4g2ah7zkpd42akam3zb4s5z"; depends=[]; }; EBrank = derive2 { name="EBrank"; version="1.0.0"; sha256="1qzhrr3n2zv31mjp224b35324nr9nigzazyfv11j4zhwl1ipf632"; depends=[]; }; - ECFsup = derive2 { name="ECFsup"; version="0.1-2"; sha256="0fpcab0gjgsc3sx0plpx068rw3a7kfzs2nyrr477a5m0rcbqf1kh"; depends=[foreach Rcpp RcppArmadillo]; }; ECGofTestDx = derive2 { name="ECGofTestDx"; version="0.4"; sha256="0y8bw1k9spwxyzc7vsi2iblnmjsidxbybjrzzh2j6frjmv3rk4g1"; depends=[bootstrap orthopolynom]; }; ECLRMC = derive2 { name="ECLRMC"; version="1.0"; sha256="01z2hmbpb754s2rsvx3i5wf7kkkr2mvs2g89ih2bqrif7w5rmgyg"; depends=[softImpute]; }; ECOSolveR = derive2 { name="ECOSolveR"; version="0.5.3"; sha256="1xglkx1x9kidznvcz61w0ayhfkgbmkxad92frabr9jsnlf6ns78n"; depends=[]; }; @@ -1202,22 +1236,22 @@ in with self; { EDFIR = derive2 { name="EDFIR"; version="1.0"; sha256="0nv1badyg1dri6z91fvs68a72g22vdg0rpi3fkpxw527r11fvrrv"; depends=[geometry lpSolve MASS vertexenum]; }; EDISON = derive2 { name="EDISON"; version="1.1.1"; sha256="12cc13ng5fc4nm0nvqxqplpb2ycz4cln73xqkk85dka2fnpykjc7"; depends=[corpcor MASS]; }; EDMeasure = derive2 { name="EDMeasure"; version="1.2.0"; sha256="1gyv86vip0a3939dbbwz29xkqzncw24r68fzykdjnv3b995510iv"; depends=[dHSIC energy rBayesianOptimization]; }; - EDOIF = derive2 { name="EDOIF"; version="0.1.1"; sha256="0lhaajiq01rrvpp2xq2n6ka7pd4xz0spxrf1xv8ljpi2w9kk4p7l"; depends=[boot distr ellipsis ggplot2 igraph simpleboot]; }; + EDNE_EQ = derive2 { name="EDNE.EQ"; version="1.0"; sha256="13aflnpznpzjrrdrn0r7v2mch6hjd77s6c3l7mnc2p59vq7mzmpg"; depends=[MASS]; }; + EDOIF = derive2 { name="EDOIF"; version="0.1.2"; sha256="0aiz8nxa56qcjcrp6j7vfn02vmf6n00wnir6cxgk2kh9q5rp5ds7"; depends=[boot distr ellipsis ggplot2 igraph simpleboot]; }; EEM = derive2 { name="EEM"; version="1.1.1"; sha256="0w20kakgcpyhfi7fcrss4w67pbaj87hi2scy7g05q3sg2ygac7gj"; depends=[colorRamps ggplot2 R_utils reshape2 sp]; }; EFA_MRFA = derive2 { name="EFA.MRFA"; version="1.0.9"; sha256="0id0dhpq9350ax573i769m83fncrd6rlp4qmwvf9jz1lbksighf0"; depends=[ggplot2 optimbase PCovR psych reshape2 scales]; }; EFA_dimensions = derive2 { name="EFA.dimensions"; version="0.1.6"; sha256="1372f56h7plijyga851nxjb4j2h3f3wf81qb1zjrqfv7k4imdp25"; depends=[polycor psych]; }; - EFAtools = derive2 { name="EFAtools"; version="0.1.1"; sha256="0xy2kywpwh9y46jn37w1bl09c8i1nxmhrqqkn9ffdx5qyqmcsn4w"; depends=[checkmate cli crayon dplyr future future_apply ggplot2 GPArotation lavaan magrittr psych Rcpp RcppArmadillo stringr tibble viridisLite]; }; - EFAutilities = derive2 { name="EFAutilities"; version="2.0.0"; sha256="1vbpz9papk6vvch3kb2qm6nspa4llp4mpck6ky1j8kvkhjzm1za0"; depends=[GPArotation mvtnorm plyr]; }; + EFAtools = derive2 { name="EFAtools"; version="0.3.0"; sha256="1wksbf485f2iqclh6gnrg2r18sa7f9qmgjgxf0yb5fcwdkivhc79"; depends=[checkmate cli crayon dplyr future future_apply ggplot2 GPArotation lavaan magrittr progress progressr psych Rcpp RcppArmadillo rlang stringr tibble tidyr viridisLite]; }; + EFAutilities = derive2 { name="EFAutilities"; version="2.1.1"; sha256="0kdwdjv4c9rfy49qs7a4134vwa2sm2pcam17a3xii2dq8mghg1za"; depends=[GPArotation MASS mvtnorm plyr]; }; EFDR = derive2 { name="EFDR"; version="1.0"; sha256="1344ysvrniqn1qv2hx9b9afg9fivccfrj393xy9cqz4j395b6jx0"; depends=[copula doParallel dplyr foreach gstat Matrix sp tidyr waveslim]; }; EFS = derive2 { name="EFS"; version="1.0.3"; sha256="1q8cf8dnxpv5s3lr9145y0wjhak4rz18dzah4xfs5qr4c8nlpl54"; depends=[party pROC randomForest ROCR]; }; EGAnet = derive2 { name="EGAnet"; version="0.9.6"; sha256="0ddz6qdvgwj9visdvx3k4wm6qgxn5pvjpd6nyh9h4cz06dd2xji0"; depends=[dplyr glasso igraph lavaan Matrix NetworkToolbox plotly qgraph semPlot]; }; EGRET = derive2 { name="EGRET"; version="3.0.2"; sha256="02c9cakj7szywx0r4rylbdnk63b4npqp2i5x1fhxjy0j5bn0hc2f"; depends=[dataRetrieval fields foreach survival truncnorm]; }; EGRETci = derive2 { name="EGRETci"; version="2.0.3"; sha256="1fzcndah890nfd3fg83jhp5lpwb0xfyrccabgvilkrrm4i4x675m"; depends=[binom EGRET]; }; - EHR = derive2 { name="EHR"; version="0.1-3"; sha256="1y12j0sjr1zp3bzha1p31f903js674l6ifjccw0y9718sry8dbv2"; depends=[logistf]; }; - EHRtemporalVariability = derive2 { name="EHRtemporalVariability"; version="1.1.1"; sha256="15mbc23mqkaj09ilrazqwwijp1dx8m65w9bvfn6kw6c0kdhds39m"; depends=[dplyr lubridate MASS plotly RColorBrewer scales viridis xts zoo]; }; + EHR = derive2 { name="EHR"; version="0.3-1"; sha256="1grg1k4lgl3gfvjw5srflrvci39gs2hr3mw82nx7yya95m3f30id"; depends=[data_table]; }; + EHRtemporalVariability = derive2 { name="EHRtemporalVariability"; version="1.1.2.1"; sha256="1253iya21k9rnp7aqg6cs18haiv5vxhgdhsxbcwzd9wzcxwwab5j"; depends=[dplyr lubridate MASS plotly RColorBrewer scales viridis xts zoo]; }; EIAdata = derive2 { name="EIAdata"; version="0.1.1"; sha256="06xq17x3zdk5q9zjvw3lxvayyggnz4ck4wpzzpsdd3s6j1b0fmhz"; depends=[XML xts zoo]; }; EILA = derive2 { name="EILA"; version="0.1-2"; sha256="0wxl9k4fa0f7jadw3lvn97iwy7n2d02m8wvm9slnhr2n8r8sx3hb"; depends=[class quantreg]; }; - EIX = derive2 { name="EIX"; version="1.1"; sha256="0mz7q35w304mm412x6jqlr65ji7xfkb293iwrqgifgi2pc6f77ny"; depends=[DALEX data_table ggiraphExtra ggplot2 ggrepel iBreakDown MASS Matrix purrr scales tidyr xgboost]; }; EKMCMC = derive2 { name="EKMCMC"; version="0.1.0"; sha256="0sfj6w8780fik0ar9bg8zrxkj10wqagvwrngd58g50fc0z4lhr53"; depends=[numDeriv]; }; EL = derive2 { name="EL"; version="1.0"; sha256="13r7vjy2608h8jph8kwy69rnkg98b2v69117nrl728r3ayc46a18"; depends=[]; }; EL2Surv = derive2 { name="EL2Surv"; version="1.1"; sha256="0bn2481rf61qnia468y7k95hhazjaghrv919a2y9ar5wcz5nq2kk"; depends=[survival]; }; @@ -1232,7 +1266,7 @@ in with self; { EMC = derive2 { name="EMC"; version="1.3"; sha256="0sdpxf229z3j67mr9s7z4adzvvphgvynna09xkkpdj21mpml23p6"; depends=[MASS mvtnorm]; }; EMCluster = derive2 { name="EMCluster"; version="0.2-12"; sha256="03s828pczfll5fkwa0w6n4m4wb75paj6x0cxgg9r4qmw8w4ag464"; depends=[MASS Matrix]; }; EMD = derive2 { name="EMD"; version="1.5.8"; sha256="0bvwx5ry41cpj646v93vm50c6qb3m5d7mda9q7znmcr4sdf521j5"; depends=[fields locfit]; }; - EML = derive2 { name="EML"; version="2.0.3"; sha256="0scqyblnz9h0313wr6yq726gpmqx9mvklc4ckz6h6ksy81f82kjp"; depends=[digest dplyr emld jqr jsonlite rmarkdown uuid xml2]; }; + EML = derive2 { name="EML"; version="2.0.4"; sha256="0hwm2sl616mq4504zpyfafv6m6mbrcpk85wjhbmcy5lvgl05njnk"; depends=[digest dplyr emld jqr jsonlite rmarkdown uuid xml2]; }; EMMAgeo = derive2 { name="EMMAgeo"; version="0.9.7"; sha256="1wz4zw45xfqbk589cpd188j7619h2ar2czfkisil9x8ksijfixls"; depends=[caTools GPArotation limSolve matrixStats shiny]; }; EMMIXgene = derive2 { name="EMMIXgene"; version="0.1.3"; sha256="0a5q78s9y6ba1641lrv87kglg39x9wbk5xg7ihzbpl4adrb5sz4f"; depends=[BH ggplot2 mclust Rcpp RcppArmadillo reshape scales]; }; EMMIXmfa = derive2 { name="EMMIXmfa"; version="2.0.11"; sha256="06lfmpw908chhzx512anqacixvvx3y02wm1n4wmpb890rd85n11r"; depends=[]; }; @@ -1241,43 +1275,43 @@ in with self; { EMP = derive2 { name="EMP"; version="2.0.5"; sha256="0piagbxk8siagmvzqv2bh12g1y0hy3c0vkxpddlmp7gm3i304rpi"; depends=[ROCR]; }; EMSC = derive2 { name="EMSC"; version="0.9.2"; sha256="0qdm0g0bwln2ykqvzvxpmv1h9bgqmb1ws0bccjl4f5ni5v295xjn"; depends=[pracma]; }; EMSNM = derive2 { name="EMSNM"; version="1.0"; sha256="0rhaadzhq9jfpnwxfqcsb3yz96rqlwkm165k5n5jxzwxpg1rg2n0"; depends=[]; }; - EMSS = derive2 { name="EMSS"; version="1.0.1"; sha256="0b2hl3vvdd1lwqdx415jp25k9993nnzbz45zxx0128vvqcr743hr"; depends=[mvtnorm sampleSelection]; }; + EMSS = derive2 { name="EMSS"; version="1.0.2"; sha256="1kgs1xq4q31v0p7nchvvqij8fslyg3gkiwfks1jbswk96gdh5pk7"; depends=[mvtnorm sampleSelection]; }; EMSaov = derive2 { name="EMSaov"; version="2.3"; sha256="1hpvwimhkl7za5s8j9n4a8883vy89jrxrhlh0k3cfprnndh4zz05"; depends=[shiny]; }; EMT = derive2 { name="EMT"; version="1.1"; sha256="0m3av1x3jcp3hxnzrfb128kch9gy2zlr6wpy96c5c8kgbngndmph"; depends=[]; }; EMVS = derive2 { name="EMVS"; version="1.1"; sha256="0pxf2vy3ab5d5zbq089fl27x01yyhh7nyp3g1w4xnifwnm55lx9w"; depends=[Rcpp RcppArmadillo]; }; EMbC = derive2 { name="EMbC"; version="2.0.3"; sha256="0ns6jmshblf00n4harhls03q9c6h1wvgvjzn8jvr3kf4gm2iz2jd"; depends=[maptools mnormt RColorBrewer Rcpp RcppArmadillo sp]; }; - ENMTools = derive2 { name="ENMTools"; version="1.0"; sha256="1zrykjcwh0qnqfkvzi72jq0mygbpph4mvqil0v6j98d9qwlm4avd"; depends=[dismo ENMeval ggplot2 ggpubr gridExtra knitr lhs magrittr raster rgdal rgeos sp spatstat]; }; - ENMeval = derive2 { name="ENMeval"; version="0.3.0"; sha256="0q5s8nxig8kbr0cblfmf3k20ri19fjs770a0fnzsk0kwlac414hw"; depends=[dismo doParallel foreach maxnet raster]; }; + ENMTools = derive2 { name="ENMTools"; version="1.0.2"; sha256="19b11y3ph1diqq4a1gqmxhh9c4x13jl3bf0dlp59c53k4nczpviv"; depends=[dismo ENMeval forcats ggplot2 ggpubr gridExtra knitr lhs magrittr raster rgdal rgeos sp spatstat]; }; + ENMeval = derive2 { name="ENMeval"; version="0.3.1"; sha256="1l43065mbhlrniqw3pqjz0vn7r2azkikqvm8mjiq5pky9ldhrwp7"; depends=[dismo doParallel foreach maxnet raster]; }; EPGMr = derive2 { name="EPGMr"; version="1.0.0"; sha256="1ii4lccv4hyydy3sd5l7c22pgx27x3mdml20sfbdj85pmpyab6q9"; depends=[]; }; EPT = derive2 { name="EPT"; version="0.7.5"; sha256="1llypf8600mk62cqxnwv5fds8ypfx5is2qkpbp4bh70l3s3lvj31"; depends=[]; }; - EPX = derive2 { name="EPX"; version="1.0.2"; sha256="0wsyh26n5gjgn7csdxcf4lx70hi58zy8qy8d3m1dvn4y62achksd"; depends=[doParallel doRNG foreach nnet randomForest rngtools]; }; + EPX = derive2 { name="EPX"; version="1.0.3"; sha256="1bq94pxl60y6km1lhi0nzsa5qfkb1gqfx3h002g2n4n0avlq928s"; depends=[doParallel doRNG foreach nnet randomForest rngtools]; }; EQL = derive2 { name="EQL"; version="1.0-1"; sha256="0pa33h0f30l352m6ix296l55lvqxdaib666x2dwy9zx0lmk23w8m"; depends=[lattice ttutils]; }; EQUIVNONINF = derive2 { name="EQUIVNONINF"; version="1.0"; sha256="103wrry0cmikprihmgx8y4kk1pnbjis7rs1xw13w14v902xkr2rq"; depends=[BiasedUrn]; }; - ER = derive2 { name="ER"; version="1.0.0"; sha256="0lblgass55ypy61wf8xra3cxzr77301dyqhbnzh1mk76m9hflvzf"; depends=[ggplot2 glmnet gridExtra pls plsVarSel scales]; }; + ER = derive2 { name="ER"; version="1.0.2"; sha256="151d120s9kdh8ibxr6j3g40azqb7nzf49ahs1zzza7m5qbsi3nsm"; depends=[ggplot2 glmnet gridExtra pls plsVarSel scales]; }; ERP = derive2 { name="ERP"; version="2.2"; sha256="17i04rgfj9crnvpi7mf2spwmaw9jgw4kn5fx6x9xbl9cvwwx6q4k"; depends=[corpcor fdrtool irlba mnormt pacman]; }; + ERSA = derive2 { name="ERSA"; version="0.1.3"; sha256="0djh633vmc89vl4bp7p4bazlb0pshpd2yckfj0yjk6vc9lrbql69"; depends=[broom car combinat dplyr ggplot2 leaps miniUI purrr RColorBrewer shiny tidyr]; }; ES = derive2 { name="ES"; version="1.0"; sha256="1rapwf6kryr6allzbjk6wmxpj9idd3xlnh87rwbh6196xb7rp8lv"; depends=[]; }; ESEA = derive2 { name="ESEA"; version="1.0"; sha256="06r5lki32mxkznj6yxvlz0ikqcxm3jbaralv4qp9xrw6dy6yyg27"; depends=[igraph parmigene XML]; }; - ESG = derive2 { name="ESG"; version="0.1"; sha256="1jw6239asv6lwxrz5v0r5pzg6v500bqxg8361sh4jj67rsrc7g9m"; depends=[]; }; - ESGtoolkit = derive2 { name="ESGtoolkit"; version="0.2.0"; sha256="1bzl483lijnxkkxkf32xqf8lxm4436ns1gw8jjyarf19s1acajga"; depends=[CDVine ggplot2 gridExtra Rcpp reshape2 ycinterextra]; }; + ESG = derive2 { name="ESG"; version="1.2"; sha256="17kw82dikcibqsdb1fvbx2x2f3shzbqggygabprcvwki8bg9hgni"; depends=[]; }; ESTER = derive2 { name="ESTER"; version="0.2.0"; sha256="1jiyqq5hgqc754r434sik9jnlpw66xz56cjdf5ig95qkffzsg224"; depends=[brms cowplot doParallel dplyr foreach ggplot2 lme4 magrittr rlang tidyr]; }; ETAS = derive2 { name="ETAS"; version="0.4.6"; sha256="02xknf7acpha4y2mwn9q974dr2d75nw48wx28i7gprqc7hf6rcsw"; depends=[fields goftest lattice maps Rcpp spatstat]; }; ETC = derive2 { name="ETC"; version="1.3"; sha256="1nvb9n0my7h1kq996mk91canxi6vxy3mzhrshrvm13ixvl48lkkh"; depends=[mvtnorm]; }; ETLUtils = derive2 { name="ETLUtils"; version="1.5"; sha256="0s0q4f3wzpdd87l3pnzysa8aq7zgz29589xnm65a6xfy9znbpzs3"; depends=[bit ff]; }; - EValue = derive2 { name="EValue"; version="3.0.0"; sha256="0kaky3hs6wkxbkyz4ry3qwjr1rpna0m56jd6skic91b57ipfbzsq"; depends=[devtools ggplot2 metafor msm]; }; + EValue = derive2 { name="EValue"; version="4.1.0"; sha256="0yxmi1211f7b2kfmxi8kwrmin4jc2dmqy2r6avjk0ydgdv2gw9f3"; depends=[boot dplyr ggplot2 metafor MetaUtility]; }; EW = derive2 { name="EW"; version="1.1"; sha256="0wc3v9qisiikvlp28xhlgsxb92fhkm6vslia6d0vpihyai0p1h1g"; depends=[]; }; EWGoF = derive2 { name="EWGoF"; version="2.2.2"; sha256="19gd9grjjdv6hilqj41g5qhz7m0ga40q88clwggbp5f0f1yd5sym"; depends=[Rcpp]; }; EWOC2 = derive2 { name="EWOC2"; version="1.0"; sha256="1x3l332pmh69kl0c1rka264mi69avdm938mzd79ck4y3qcgn07vr"; depends=[MASS rjags]; }; EWS = derive2 { name="EWS"; version="0.1.0"; sha256="04bsl0s690k2wm7jnvgihj5r1fd1r3s2547j1sgl0zm8yvia2l8x"; depends=[numDeriv]; }; EXRQ = derive2 { name="EXRQ"; version="1.0"; sha256="1iqsr52sl2j5q03122a7rsp6n6a2bkysk2r908c89l36gk4sj2i5"; depends=[mnormt quantreg]; }; - EZtune = derive2 { name="EZtune"; version="2.0.0"; sha256="1arrd9zkssb8ixx7r4nxwayksz1mk7jkvlcbm264pv9ya6kh3yrh"; depends=[ada e1071 GA gbm optimx rpart]; }; - Eagle = derive2 { name="Eagle"; version="2.3"; sha256="0rkj1d2qwcyz13cl3zxb1kd9l38ckqx69bhn92kvjpxfc0h5xwis"; depends=[data_table ggplot2 ggthemes matrixcalc mmap R_utils Rcpp RcppEigen shiny shinyBS shinyFiles shinyjs shinythemes]; }; + EZtune = derive2 { name="EZtune"; version="3.0.0"; sha256="1s4hdd1j352k8brbfbdyh8mw183df2n37a61rlxhswyhfrp2w877"; depends=[ada e1071 GA gbm glmnet optimx ROCR rpart]; }; + Eagle = derive2 { name="Eagle"; version="2.4.2"; sha256="13i64kalb5hjfzvj3rs54rn4lzkwr51vmbapqibcddga22d6i40b"; depends=[data_table ggplot2 ggthemes matrixcalc mmap plotly R_utils Rcpp RcppEigen shiny shinyBS shinyFiles shinyjs shinythemes]; }; EasyABC = derive2 { name="EasyABC"; version="1.5"; sha256="17qv6y8sf2iwwqcv5wfg6sii259gv5jyr72dnfpir2bw78wb3mqx"; depends=[abc lhs MASS mnormt pls tensorA]; }; EasyHTMLReport = derive2 { name="EasyHTMLReport"; version="0.1.1"; sha256="1hgg8i7py7bx48cldyc7yydf0bggmbj3fx3kwiv9jh1x5wyh929z"; depends=[base64enc ggplot2 knitr markdown reshape2 scales xtable]; }; EasyMARK = derive2 { name="EasyMARK"; version="1.0"; sha256="10slkblbyxq98c3sxgs194dnkx996khfcpxj6jhz355dp35z7c9d"; depends=[coda doParallel foreach MASS random rjags stringr]; }; EasyMx = derive2 { name="EasyMx"; version="0.2-12"; sha256="00wj08nwv5zi5d4a1fss40f4cms4svam1hmmxvh60hvc55ygsc3z"; depends=[OpenMx]; }; EbayesThresh = derive2 { name="EbayesThresh"; version="1.4-12"; sha256="07a2dd3za2dc81n6m2xy794sclp3yw7f46lg1igaflh7m9407198"; depends=[wavethresh]; }; - Ecdat = derive2 { name="Ecdat"; version="0.3-7"; sha256="0isaysjagpx10fq47xs57ywr5jidi62g18zjv5a1jd3c0wswxbkv"; depends=[Ecfun]; }; - Ecfun = derive2 { name="Ecfun"; version="0.2-2"; sha256="0gal91rhyrgpdxalnsy9pn7s0pj444zscv1m7pdgfzlnqcmf1vlf"; depends=[BMA fda gdata jpeg MASS mvtnorm RCurl stringi TeachingDemos tis XML xml2]; }; + Ecdat = derive2 { name="Ecdat"; version="0.3-9"; sha256="112yg3v0pwssfw38nbbrrn1zrlg2h39brr79m3rdlp8hr810q92b"; depends=[Ecfun]; }; + Ecfun = derive2 { name="Ecfun"; version="0.2-4"; sha256="0qi0582yxs2bpyryv55j2wr6f20g6zchp1z9r54wakhxr3sllr50"; depends=[BMA fda jpeg MASS mvtnorm RCurl stringi TeachingDemos tis XML xml2]; }; EcoDiet = derive2 { name="EcoDiet"; version="1.0.0"; sha256="19x2ypmsw6jnq1s0nqk3pdkwi5g3g92r6fgxrxlnyvd0jqi9l8b3"; depends=[coda ggplot2 rjags]; }; EcoGenetics = derive2 { name="EcoGenetics"; version="1.2.1-6"; sha256="15lj6l29lwhk89mbmh5hqshg7yf0kgjlrc07b9x56w8382sg849l"; depends=[doParallel edgebundleR foreach ggplot2 htmlwidgets igraph jsonlite magrittr networkD3 party pheatmap plotly raster reshape2 rgdal rkt SoDA sp]; }; EcoHydRology = derive2 { name="EcoHydRology"; version="0.4.12.1"; sha256="075kgy6cxppkclk6nj5xs1f5yv9w8cpr09xwhf2101a6wswknb88"; depends=[DEoptim operators topmodel XML]; }; @@ -1288,7 +1322,8 @@ in with self; { EcoVirtual = derive2 { name="EcoVirtual"; version="1.1"; sha256="1aryl2sb5ak390lgnm427ilm6xv9lmsjhwdnapzc033zvqb099gj"; depends=[]; }; Ecohydmod = derive2 { name="Ecohydmod"; version="1.0.0"; sha256="0imkzjqp3g28l42jz5m4p85wg5rawmn9hy1wys9xndnaliv6d7r2"; depends=[]; }; EconDemand = derive2 { name="EconDemand"; version="1.0"; sha256="1slpwiaxj7w21zdri9myrzwbwzl62m3cnp0g4fr2rkdlzgb6j5yj"; depends=[]; }; - EdSurvey = derive2 { name="EdSurvey"; version="2.5.0"; sha256="09zh0r93a0qkw4glnyrqzxjc13fai5nfjzd9sq06wnl6i9750bmq"; depends=[car data_table Formula glm2 haven LaF lfactors lme4 MASS Matrix NAEPprimer quantreg readxl tibble wCorr WeMix xtable]; }; + EcotoneFinder = derive2 { name="EcotoneFinder"; version="0.2.2"; sha256="02f9sm5dc7150yj6blmg1zgwppj396639v2wc1ypbal6bc0fphy4"; depends=[cluster colorspace corrplot e1071 ggplot2 igraph philentropy plyr purrr qgraph reshape rlang Rmisc vegan vegclust withr]; }; + EdSurvey = derive2 { name="EdSurvey"; version="2.6.1"; sha256="1ixqbbpl90pvw2n4rczh336jni9xz0dvr2l5qwvwv9kv75q1hgj3"; depends=[car data_table Formula glm2 haven LaF lfactors lme4 MASS Matrix NAEPprimer quantreg readxl tibble wCorr WeMix xtable]; }; EditImputeCont = derive2 { name="EditImputeCont"; version="1.1.6"; sha256="1hpm198awl30i7vbg1jk578s2i3f2kskirb33xvampcwn8mz0nhh"; depends=[editrules igraph Rcpp]; }; EffectLiteR = derive2 { name="EffectLiteR"; version="0.4-4"; sha256="17mhp4acj0myr2b54hgbb3wi5j6a6q999nqr9lwcbx3plyrwlljl"; depends=[car foreign ggplot2 lavaan lavaan_survey nnet shiny survey]; }; EffectStars = derive2 { name="EffectStars"; version="1.9-1"; sha256="131w5bdc615gaa2czi4wyc2f96jcg24ahcmggajrvyhxmi6rag5x"; depends=[VGAM]; }; @@ -1296,6 +1331,7 @@ in with self; { EffectTreat = derive2 { name="EffectTreat"; version="1.1"; sha256="1kw1vq9y1q3xyiqsk855wjn9jqkzdh6h4xklbl9kvbqsvvhhsgkz"; depends=[]; }; EffectsRelBaseline = derive2 { name="EffectsRelBaseline"; version="0.5"; sha256="1dsnakcrgmlx44599ii92wvhxbxrh0hij59709wsskx1x1152zvh"; depends=[]; }; EfficientMaxEigenpair = derive2 { name="EfficientMaxEigenpair"; version="0.1.4"; sha256="1s0i9a2vk2g4f5gadsvzjfkw91hcjsrbyjg2vgnj1v17xrwgp40w"; depends=[]; }; + EigenR = derive2 { name="EigenR"; version="1.0.0"; sha256="173yfqipha8g6m4djkgxki8wlys72xq9cpj7zir9r5lwfkygdzfc"; depends=[Rcpp RcppEigen]; }; EleChemr = derive2 { name="EleChemr"; version="1.1.0"; sha256="109dv7ayg5nm6zjd70dp8h5qqwrijikymzgb41dl8vx4pqhv43v3"; depends=[ggplot2]; }; EloChoice = derive2 { name="EloChoice"; version="0.29.4"; sha256="1g8ivvnv16c2gniwd9xa9z89bm4rac0nrg3mcg1risgf9yk4rgm5"; depends=[psychotools Rcpp RcppArmadillo Rdpack]; }; EloOptimized = derive2 { name="EloOptimized"; version="0.3.0"; sha256="185vh8h6r5wqcbaq3glq8k3fr8jp6h3q2h2ly54agi6bi3fvbs05"; depends=[BAMMtools dplyr lubridate magrittr reshape2 rlang rlist]; }; @@ -1303,7 +1339,7 @@ in with self; { ElstonStewart = derive2 { name="ElstonStewart"; version="1.1"; sha256="1y2g4x3fhi78c2406bk8r8c3x9zhx8ya3qlbnypdm65j0minixsn"; depends=[digest kinship2]; }; EmbedSOM = derive2 { name="EmbedSOM"; version="2.1.1"; sha256="1w61dni4vsglxqdhwdy5dcmzb6hx1wb9fhfki8wmal1yaza23ljy"; depends=[FNN ggplot2 igraph Matrix Rtsne umap uwot]; }; EmiStatR = derive2 { name="EmiStatR"; version="1.2.2.0"; sha256="0xwmwbybiyb9688l5n98vir3rwbbjgpw5qb25p20lhlj1pqg95w1"; depends=[doParallel foreach lattice xts zoo]; }; - EmissV = derive2 { name="EmissV"; version="0.665.2.1"; sha256="1525h28xwwq94maj07rnx13l7i9q7wcrssld5q99741clvzrygk0"; depends=[data_table ncdf4 raster sf sp units]; }; + EmissV = derive2 { name="EmissV"; version="0.665.3.0"; sha256="0wfksrca1wl0ic7vqzvns4xsg8vfv1hzpc6v7mq1ibn0c0m68rk3"; depends=[data_table ncdf4 raster sf sp units]; }; EmpiricalCalibration = derive2 { name="EmpiricalCalibration"; version="2.0.2"; sha256="10as0xl24w9pap26cz21nqgysba70l9s4qxfbia7x0wfsz2s25jf"; depends=[ggplot2 gridExtra]; }; EncDNA = derive2 { name="EncDNA"; version="1.0.2"; sha256="0wy2cmcvyqjhg5mqbvdzmihfv8swx7ym2n9mjdqgx0kgnc7k614y"; depends=[Biostrings]; }; EnergyOnlineCPM = derive2 { name="EnergyOnlineCPM"; version="1.0"; sha256="1a3wvclqdwcvq5inhliwjnd7xzqbjvzs8h8ncy6qlhjq6s5n7nm8"; depends=[energy MASS]; }; @@ -1317,31 +1353,36 @@ in with self; { EntropyExplorer = derive2 { name="EntropyExplorer"; version="1.1"; sha256="02ljnq9ayxg4lrrnb6nlxr1k5ki8dd5i8hjb9fvvb19hwr2id5h4"; depends=[]; }; EntropyMCMC = derive2 { name="EntropyMCMC"; version="1.0.4"; sha256="065djml9dmn5ahbgaljnshvhziwg61xciq6fzh76449x3wy6bg65"; depends=[mixtools RANN]; }; EnvCpt = derive2 { name="EnvCpt"; version="1.1.2"; sha256="1him08xs05zrifvhkckljgrskrj777dssv5vs8v4hq8apgifm8sa"; depends=[changepoint MASS zoo]; }; + EnvExpInd = derive2 { name="EnvExpInd"; version="0.1.0"; sha256="063f3c10a7k9j3f85xilj1s6dd9ky5sw8sbvhzkhg5hg92c9dpns"; depends=[dplyr gstat maptools RCurl sp stringi zoo]; }; EnvNicheR = derive2 { name="EnvNicheR"; version="1.4"; sha256="0hxx9wmzlw0clvdgdsy8msc78nvm81j3naxr57i7lqqa360sjy3a"; depends=[IDPmisc]; }; - EnvStats = derive2 { name="EnvStats"; version="2.3.1"; sha256="0ang2s222znrvzvidyvj2sa2bqx95bxicff64p6w2a7z88mx8lyp"; depends=[ggplot2 MASS nortest]; }; + EnvStats = derive2 { name="EnvStats"; version="2.4.0"; sha256="0505j1hh1xky6hm2i8m22pkw62ql7plkxn0v0bcb6dr085v9wia9"; depends=[ggplot2 MASS nortest]; }; EnviroPRA = derive2 { name="EnviroPRA"; version="1.0"; sha256="0yirh3vy7wap0qmm3kvjz9y68gcvp9i8qshv80wh8aijxwklpr8n"; depends=[fitdistrplus kSamples MASS truncdist]; }; EnviroStat = derive2 { name="EnviroStat"; version="0.4-2"; sha256="0ckax6vkx0vwczn21nm1dr8skvpm59xs3dgsa5bs54a3xhn5z9hs"; depends=[MASS]; }; - Epi = derive2 { name="Epi"; version="2.41"; sha256="09miba6zk63bwc79n3030kgzlvy3whkq968pgqyghxnsjfh5ckp5"; depends=[cmprsk data_table etm MASS Matrix mgcv numDeriv plyr survival zoo]; }; - EpiContactTrace = derive2 { name="EpiContactTrace"; version="0.13.0"; sha256="1m9gawd0fv0pl9q8n9rnid8shdy88kxw4hr5fvvf9ifngf8ffmqa"; depends=[]; }; - EpiCurve = derive2 { name="EpiCurve"; version="2.3-1"; sha256="0yi49mdij8gx90kbppxdkm0xzaxhr9i7bpgis64vbx4bpy4ynxbb"; depends=[dplyr ggplot2 ISOweek RColorBrewer scales tibble timeDate]; }; + Epi = derive2 { name="Epi"; version="2.42"; sha256="1vsyxlxl6n5y3wr8w7ji17hnhvbr0xsawqbdl1ajcfg5faizm9sl"; depends=[cmprsk data_table dplyr etm MASS Matrix mgcv numDeriv plyr survival zoo]; }; + EpiContactTrace = derive2 { name="EpiContactTrace"; version="0.15.0"; sha256="1ghpvdfwqcxx4gnn6nfkik6bvdk7xnlrkljlqgzd4rdqlxg4gdq1"; depends=[]; }; + EpiCurve = derive2 { name="EpiCurve"; version="2.4-1"; sha256="028yvxf5zmby7m5xwklhx1xrn9yw3dqhwddg03jq42vpjngds1b6"; depends=[dplyr ggplot2 ISOweek RColorBrewer scales tibble timeDate]; }; EpiDynamics = derive2 { name="EpiDynamics"; version="0.3.1"; sha256="0m6yay3r7dqih19f76wxwgq6dh9p1zmp5d9ilj9nd262q61jcy53"; depends=[deSolve ggplot2 reshape2]; }; EpiEstim = derive2 { name="EpiEstim"; version="2.2-3"; sha256="0rg2ys9plqm9crz4h9xh8k045zwnsdwxsyp4k5bpdkdnrh8nvw08"; depends=[coarseDataTools coda fitdistrplus ggplot2 gridExtra incidence reshape2 scales]; }; - EpiILM = derive2 { name="EpiILM"; version="1.5.1"; sha256="15676j8w7xsh1bdr3ggi8zdf6hf072bzmiymn050jv35l80azqx8"; depends=[adaptMCMC coda LaplacesDemon]; }; + EpiILM = derive2 { name="EpiILM"; version="1.5.2"; sha256="0drs4qywx9axs7k5qk7sp5r3g8pykn4lqqbm0hxyl24r6b5l3d6b"; depends=[adaptMCMC coda LaplacesDemon]; }; EpiILMCT = derive2 { name="EpiILMCT"; version="1.1.6"; sha256="0qhpmh28zmgqnsyfxgv06g2slix12nn2pglgpvagx2q40rs4fann"; depends=[coda igraph]; }; - EpiModel = derive2 { name="EpiModel"; version="2.0.2"; sha256="18r66y267si0zv76k7y93mph5290p8xmlanwg8q8fz6y4rwv5sfa"; depends=[ape deSolve doParallel ergm foreach ggplot2 lazyeval network networkDynamic RColorBrewer tergm tergmLite]; }; + EpiModel = derive2 { name="EpiModel"; version="2.0.3"; sha256="1nsrgnabl41cpp9c4lsajgkynxbvbqvdihbdzzkwxkaad40b86p8"; depends=[ape deSolve doParallel ergm foreach ggplot2 lazyeval network networkDynamic RColorBrewer tergm tergmLite]; }; + EpiNow2 = derive2 { name="EpiNow2"; version="1.3.2"; sha256="1rcyhk0f18asrym9zd7hr5ss7aw2dd2m5wrjcsqkr8q7x6apwh3g"; depends=[BH cowplot data_table futile_logger future future_apply ggplot2 lifecycle lubridate patchwork progressr purrr R_utils Rcpp RcppEigen rlang rstan runner scales StanHeaders truncnorm]; }; EpiReport = derive2 { name="EpiReport"; version="0.1.1"; sha256="19pl75ld3s3dzg3z54f65j39di5hw3q4jgasj3cw87hjyqgzgbaq"; depends=[dplyr extrafont flextable ggplot2 knitr officer png rmarkdown tidyr zoo]; }; EpiSignalDetection = derive2 { name="EpiSignalDetection"; version="0.1.1"; sha256="04bagnx9fs0r3167hmwgc389fl5hq7l4j6kdjjmi360vcaimx9qi"; depends=[dplyr DT ggplot2 ISOweek knitr pander rmarkdown shiny surveillance]; }; EpiStats = derive2 { name="EpiStats"; version="1.4-1"; sha256="1i9ymqf0p8wplbmbq4j0ixprjvg22l4z05imxhfj087p3p2sqq8w"; depends=[dplyr epiR]; }; EpistemicGameTheory = derive2 { name="EpistemicGameTheory"; version="0.1.2"; sha256="0b2gnrvhlsw85qv63ib32pj55l7w63wgvbrj5rb209g6h46fby8m"; depends=[lpSolve]; }; Eplot = derive2 { name="Eplot"; version="1.0"; sha256="1glmkjjj432z9g4gi56pgvfrm5w86iplirnd5hm4s99qci2hgc64"; depends=[]; }; Equalden_HD = derive2 { name="Equalden.HD"; version="1.2"; sha256="1lwqnm2xg7x79xajjb4fx5b5yaqs0rn8myb2h52pfgm0v37lzvmb"; depends=[]; }; + EquiSurv = derive2 { name="EquiSurv"; version="0.1.0"; sha256="1yml5s3rswayxlxqsqknpwa2i55pj9q1p233kj9xsm8f1zmzk1mf"; depends=[eha survival]; }; EstCRM = derive2 { name="EstCRM"; version="1.4"; sha256="1p99hmmyiy3havj72jd4xksr1j9gfmy0i7z7f3vqs5sqp72alq1k"; depends=[Hmisc lattice]; }; EstHer = derive2 { name="EstHer"; version="1.0"; sha256="1j8sczwfzil16j85mw5d1c7cxy7wimh0qq7zhmkh7mfnr36m9phr"; depends=[glmnet MASS Rcpp RcppArmadillo]; }; EstMix = derive2 { name="EstMix"; version="1.0.1"; sha256="13zwhxm0qm83c8k5k4slvq2snkmbq1zz3i5cqvxxwhvkb4b8aja4"; depends=[PSCBS Rcpp RcppArmadillo]; }; EstSimPDMP = derive2 { name="EstSimPDMP"; version="1.2"; sha256="05gp0gdix4d98111sky8y88p33qr5w4vffkp6mg9klggn37kdj8j"; depends=[]; }; + EstimDiagnostics = derive2 { name="EstimDiagnostics"; version="0.0.1"; sha256="1jdk6v2n0c73jxvjv5c67pwqzg9zj6zpk1x4mniidw1p2jlxb902"; depends=[foreach ggplot2 goftest reshape2 rlang testthat]; }; EstimateGroupNetwork = derive2 { name="EstimateGroupNetwork"; version="0.2.2"; sha256="17sx309w4jjhgmpmk27gpj3d5pbra72vxdif4als0jhyd59kk0jw"; depends=[dplyr ggplot2 igraph qgraph]; }; EstimationTools = derive2 { name="EstimationTools"; version="2.0.0"; sha256="09d0rnlm925my7m3kc3b7dzxvq7zqbyfk3p2m0hr4r6d8s0cwab9"; depends=[BBmisc boot DEoptim foreign numDeriv RCurl Rdpack stringr survival]; }; EthSEQ = derive2 { name="EthSEQ"; version="2.1.3"; sha256="168wxxb1cyrfr8s4f9gxqj64dmc4i24g5k6yys3xay9c932gf98y"; depends=[data_table gdsfmt geometry MASS plot3D SNPRelate]; }; + Eunomia = derive2 { name="Eunomia"; version="1.0.1"; sha256="06a42qsf3nx1pbynikkdvmbhh1rmgnfmiggdn86b3a0ij6cq0p2r"; depends=[DatabaseConnector RSQLite SqlRender]; }; EurosarcBayes = derive2 { name="EurosarcBayes"; version="1.1"; sha256="12311s6ibw9q6kykhh689r93r7mwjhwrhkzdpc75grvw6ilgjmpm"; depends=[clinfun data_table plyr shiny VGAM]; }; EvCombR = derive2 { name="EvCombR"; version="0.1-2"; sha256="1f5idjaza91npf64hvcnpgnr72mpb7y6kf91dp57xy9m14k7jx5g"; depends=[]; }; EvalEst = derive2 { name="EvalEst"; version="2015.4-2"; sha256="1jkis39iz3zvi5yfd0arvw7bym6naq45f5cravywg8c37n9v967x"; depends=[dse setRNG tfplot tframe]; }; @@ -1349,16 +1390,19 @@ in with self; { EvaluationMeasures = derive2 { name="EvaluationMeasures"; version="1.1.0"; sha256="0b65y4rb650hhlgc18z0sm0danrrawqkazzdl9krl877djrgx87g"; depends=[]; }; Evapotranspiration = derive2 { name="Evapotranspiration"; version="1.15"; sha256="1hvvlc8qwgal4lhlccf4dk817xgpyyiqzzlzk7w3ydnczr8pk4bk"; depends=[zoo]; }; EventDetectGUI = derive2 { name="EventDetectGUI"; version="0.3.0"; sha256="02gwgbp692cfmf933jg1f7h4gghhc1v2cswz7rpcazm8h39mc4wh"; depends=[DT EventDetectR ggplot2 plotly shiny shinyBS shinydashboard shinyjs XML]; }; - EventDetectR = derive2 { name="EventDetectR"; version="0.3.4"; sha256="1zyv9k0l1s5djvp5hbbrlz96gw3126n43nm2iv6xsil90k2fp827"; depends=[forecast ggplot2 gridExtra imputeTS neuralnet]; }; + EventDetectR = derive2 { name="EventDetectR"; version="0.3.5"; sha256="0wx3bcs8n95fmyc5vnlrwd75bzqqvy6czb9bsbp04g3770c5ja0r"; depends=[forecast ggplot2 gridExtra imputeTS neuralnet]; }; EventStudy = derive2 { name="EventStudy"; version="0.36"; sha256="0pd7qbpj4agaqc57lianqinnardyh929nr8ammmpal191v2i7hmw"; depends=[curl data_table dplyr ggplot2 httr jsonlite magrittr miniUI openxlsx purrr RColorBrewer readr rlang rstudioapi scales shiny stringr testthat tidyquant tidyr]; }; + EvidenceSynthesis = derive2 { name="EvidenceSynthesis"; version="0.2.2"; sha256="1jcs8r3xnigij1k86s2g9xrbgry7ls90ny07p0f86ljm2b3cyfvi"; depends=[BeastJar coda Cyclops EmpiricalCalibration ggplot2 gridExtra HDInterval meta rJava rlang survival]; }; EviewsR = derive2 { name="EviewsR"; version="0.1.0"; sha256="1chg3g1jsdflgby2bksqw2nf27xin4nayqigxkji4zwbspp6m8ai"; depends=[knitr]; }; EvoRAG = derive2 { name="EvoRAG"; version="2.0"; sha256="0gb269mpl2hbx1cqakv3qicpyrlfb4k8a3a7whhg90masbgmh8f6"; depends=[]; }; EvolutionaryGames = derive2 { name="EvolutionaryGames"; version="0.1.0"; sha256="1v6xpxk4kbjbmv8vh517rd76gyrd9znpxqdh4jqz8lvdpnpla4wv"; depends=[deSolve geometry ggplot2 interp MASS reshape2 rgl]; }; Evomorph = derive2 { name="Evomorph"; version="0.9"; sha256="1br2fyggwz2mxpic8sk384xq1lpbpv0j5gf6xyzhkn2n7kfpf6d5"; depends=[geomorph ggplot2 reshape2 stringr]; }; - ExPanDaR = derive2 { name="ExPanDaR"; version="0.5.1"; sha256="10jgwvq04cf17kdsjggyvnvmkialgcl38r53k5vj64h2zfwyj2wx"; depends=[corrplot dplyr DT ggplot2 kableExtra lfe lmtest multiwayvcov openssl rio rlang scales shiny shinycssloaders stargazer tictoc tidyr zip]; }; + EwR = derive2 { name="EwR"; version="1.4"; sha256="1i0cwyylr1lqilykn1q2y1ad2gawfqkw9c51g04yn061c623pkam"; depends=[]; }; + ExPanDaR = derive2 { name="ExPanDaR"; version="0.5.3"; sha256="1y4ccyvlvdx9lcgpyns6k2npc0rzwk8db4bmbi3pq9xmv7ycgmcz"; depends=[corrplot dplyr DT ggplot2 kableExtra lmtest multiwayvcov openssl plm rio rlang scales shiny shinycssloaders stargazer tictoc tidyr zip]; }; ExPosition = derive2 { name="ExPosition"; version="2.8.23"; sha256="0x9400ggmgrnaish0cfgnyvw549g4ibfv9aj6vzq7j68n58vq405"; depends=[prettyGraphs]; }; - Exact = derive2 { name="Exact"; version="2.0"; sha256="142yiz9bz1abgpdqkzgdsz3bp3dwbjlmyg29a62djb8630aicgyn"; depends=[]; }; + Exact = derive2 { name="Exact"; version="2.1"; sha256="0clzxgqc7a112vaw7qy66kldj7spmj4ni5fvdhwxkn54749jk388"; depends=[rootSolve]; }; ExactCIdiff = derive2 { name="ExactCIdiff"; version="1.3"; sha256="1vayq8x7gk1fnr1jrlscg6rb58wncriybw4m1z0glfgzr259103y"; depends=[]; }; + ExactMultinom = derive2 { name="ExactMultinom"; version="0.1.2"; sha256="1ygsiwcsmda0pbp7lzr03sb461mr9fff7hxp1lil40y9z0xgdmmb"; depends=[Rcpp]; }; ExceedanceTools = derive2 { name="ExceedanceTools"; version="1.2.2"; sha256="084sc6pggfbcyavhfnd5whyigw7dyjhb4cxmxi0kh2jiam5k8v5b"; depends=[SpatialTools splancs]; }; ExcelFunctionsR = derive2 { name="ExcelFunctionsR"; version="0.1.4"; sha256="1j3vfvfk8lp46zb6fwvq9lafk7r2qrnx4vxyhaih71c0a8g6dz9n"; depends=[lubridate plyr roperators stringr tidyr]; }; ExcessMass = derive2 { name="ExcessMass"; version="1.0"; sha256="1z8l1lja02wxw8l72s3bq6sgjymn5929n123xk6b7ndd52zlfgf5"; depends=[]; }; @@ -1369,53 +1413,57 @@ in with self; { ExpRep = derive2 { name="ExpRep"; version="1.0"; sha256="0spv3wd9c8sr338n5kdzrs28yh7s90fl70wsdnkibmlxhnh3ay3g"; depends=[]; }; ExpertChoice = derive2 { name="ExpertChoice"; version="0.2.0"; sha256="1pd4v240ywc4wzh249axxb4kz5dccizc08jdjnaygz35hjdg5hvj"; depends=[DoE_base dplyr far purrr rlist]; }; ExplainPrediction = derive2 { name="ExplainPrediction"; version="1.3.0"; sha256="14m3b9fsrpfpr8avsnhl8b3bzk2xlhwgkwag5iq8bj7bzvv4yck1"; depends=[CORElearn semiArtificial]; }; + ExtDist = derive2 { name="ExtDist"; version="0.6-4"; sha256="006q9xahq5zk7s6yc44ihjkr6cnjzp10pgw47zyk1rk81pjblzp3"; depends=[numDeriv optimx]; }; ExtMallows = derive2 { name="ExtMallows"; version="0.1.0"; sha256="0903jslp74s1vzbklq88y2dm0dgkhd6g77b7aipxam98933k0hzz"; depends=[]; }; ExtractTrainData = derive2 { name="ExtractTrainData"; version="9.1.5"; sha256="132f43mk2mjsfv9pfhj1371b4vxnqmnj5lf8xvfznf57xjna7wp1"; depends=[raster rgdal rgeos sp]; }; ExtremalDep = derive2 { name="ExtremalDep"; version="0.0.3-3"; sha256="0svl7szscv1blgi2vh4kaqclg95sn871hk650bym2vdkjljy6x2x"; depends=[CompRandFld copula evd fda gtools mvtnorm nloptr numDeriv quadprog rlist sn]; }; ExtremeBounds = derive2 { name="ExtremeBounds"; version="0.1.6"; sha256="12bc4mmkmggvk3kfmz6nq13fa2470z0bx8smnvq9vf1ypdiiw85y"; depends=[Formula]; }; - ExtremeRisks = derive2 { name="ExtremeRisks"; version="0.0.3"; sha256="1ja53780gh4xyid9dd36lc0ikfwr2fd18m1mvsfq069h65b2a8vg"; depends=[copula evd mvtnorm]; }; + ExtremeRisks = derive2 { name="ExtremeRisks"; version="0.0.4"; sha256="1mvkrwyj9kwg35dzm9jzx311qqd4v3nnbrr6d64x476ni4pnrbl8"; depends=[copula evd mvtnorm plot3D pracma tmvtnorm]; }; FABInference = derive2 { name="FABInference"; version="0.1"; sha256="0d11vxxa0mry735n7an8n97wmxyffsj4hirxlysljs941zhkhhw4"; depends=[MASS]; }; FACTMLE = derive2 { name="FACTMLE"; version="1.1"; sha256="0qz2i0hnn84bpps1h8jmfkgp5p59axr0wayj9dvl839radrvpqvy"; depends=[rARPACK]; }; FADA = derive2 { name="FADA"; version="1.3.5"; sha256="0srv3rghbkgyxbcjc1v68c5qgcir1d618skpc8imfmdaz9pnxchn"; depends=[corpcor crossval elasticnet glmnet MASS matrixStats mnormt sda sparseLDA]; }; FAMILY = derive2 { name="FAMILY"; version="0.1.19"; sha256="1912l2zj2cmh8yx8lkg8fpgvfddn6wbi1vrr4yx04mh73gk1s5mk"; depends=[pheatmap pROC]; }; FAMT = derive2 { name="FAMT"; version="2.5"; sha256="0mn85yy9zmiklfwqjbhbhzbawwp2yqrm9pvm8jhasn9c3kw1pcp2"; depends=[impute mnormt]; }; FAMoS = derive2 { name="FAMoS"; version="0.3.0"; sha256="14gr9wv9bpibk0rrzzwijvdncx1fgnpbv55nqzbb4jhq7fdckmsa"; depends=[future R_utils]; }; - FAOSTAT = derive2 { name="FAOSTAT"; version="2.1.2"; sha256="11pmbjz4vkg8a68qfkbqlhnggln1vp8m5pllg2y7wwxxa4ld71qk"; depends=[classInt data_table ggplot2 labeling MASS plyr RJSONIO]; }; + FAOSTAT = derive2 { name="FAOSTAT"; version="2.2.1"; sha256="1i1zd62qv1zrrnpkrchhk3maj9pfabvbc960gck3ry8l0ns926q9"; depends=[classInt data_table ggplot2 labeling MASS plyr RJSONIO XML]; }; FARDEEP = derive2 { name="FARDEEP"; version="1.0.1"; sha256="0blvjakcpkh9vpxryk7qyaqnija0r375ckv37kjlr34xg8pg9qnm"; depends=[nnls preprocessCore]; }; FASeg = derive2 { name="FASeg"; version="0.1.9"; sha256="0lazx8dyycyycr8467m9rkxkxhp4r2w737kpkb40y59wncmbvkik"; depends=[]; }; FAdist = derive2 { name="FAdist"; version="2.3"; sha256="0vy9yavg5apawjfvch5a7abrmsnx36zhlk8jff3dvcx409lykrrn"; depends=[]; }; FAmle = derive2 { name="FAmle"; version="1.3.5"; sha256="1j6x5bbxnrwp9d6xlxc861xslawzfqhi3d11nphyc97afsz0ymnr"; depends=[mvtnorm]; }; - FAwR = derive2 { name="FAwR"; version="1.1.1"; sha256="1hzgaxinq81v4f9743lnlj3bkby8pwmaw1gq0fb4yxazav8y7ihy"; depends=[glpkAPI lattice MASS]; }; + FAwR = derive2 { name="FAwR"; version="1.1.2"; sha256="1x90wvp0w7fhid7i5160b4fiv4xn5mpvy33zjzy0mvqvp0yp8xf0"; depends=[glpkAPI lattice MASS]; }; FBFsearch = derive2 { name="FBFsearch"; version="1.1"; sha256="17fi501prnwwy5dh7kv7cx2zlz2dknjj542ga024s7jvg7i2rhg0"; depends=[Rcpp RcppArmadillo]; }; FBN = derive2 { name="FBN"; version="1.5.1"; sha256="0723krsddfi4cy2i3vd6pi483qjxniychnsi9r8nw7dm052nb4sf"; depends=[]; }; FCGR = derive2 { name="FCGR"; version="1.0-0"; sha256="015nnnc9fasx0qjrc3lbxv14rqwyx36xzsw9076grwm5pqahrdsb"; depends=[kerdiest KernSmooth MASS mgcv nlme pspline sfsmisc]; }; FCMapper = derive2 { name="FCMapper"; version="1.1"; sha256="1yjh8rs65nqslvwv7x4rif469zds41s7v3vhq6pca1y17kvj2in1"; depends=[igraph]; }; - FCPS = derive2 { name="FCPS"; version="1.2.3"; sha256="1v7hq2gbimnpn9icgr5y05lfz3ml6433z3dbhzchvwla4qkm1xp1"; depends=[DataVisualizations ggplot2 mclust]; }; - FCSlib = derive2 { name="FCSlib"; version="1.1.1"; sha256="1nr037pg74rwd6i1q1gbhijv3ffjifsjbzcf6hqy3mwy58pflh5d"; depends=[stringr tiff]; }; + FCPS = derive2 { name="FCPS"; version="1.2.6"; sha256="13r8qv8n14g9dxmgpx1f4vc6r5mbnxs4b92gzqck49j38k5a1m77"; depends=[DataVisualizations ggplot2 mclust]; }; + FCSlib = derive2 { name="FCSlib"; version="1.3.0"; sha256="1191ba6dwpakcdnbcq61zm5xq24isxjnn98nmvk67fpf1ycw70w9"; depends=[bitops fields stringr tiff]; }; FD = derive2 { name="FD"; version="1.0-12"; sha256="0xdpciq14i8rh7v6mw174hip64r7mrzhx7gwri3vp9y7a1380sbi"; depends=[ade4 ape geometry vegan]; }; FDRSeg = derive2 { name="FDRSeg"; version="1.0-3"; sha256="0dh6m5vlx664kryh56jzi3zxydjwa5217nhbwn6adp0q5qdh6d8a"; depends=[Rcpp stepR]; }; + FDRestimation = derive2 { name="FDRestimation"; version="1.0.0"; sha256="1m4k71bsfj2sbsnyqi1s9p5wxbvvn24w98lqwms6z4irc0sk6r3g"; depends=[Rdpack]; }; FDRreg = derive2 { name="FDRreg"; version="0.1"; sha256="17hppvyncbmyqpi7sin9qsrgffrnx8xjcla2ra6y0sqzam1145y4"; depends=[fda mosaic Rcpp RcppArmadillo]; }; FDRsampsize = derive2 { name="FDRsampsize"; version="1.0"; sha256="0g8kawzyi9x5yndvh330wzqw6rvcnprwq56ngd0j6z51hvvw8qhw"; depends=[]; }; - FDX = derive2 { name="FDX"; version="1.0.1"; sha256="1za2w2xykbfy2pvxxr9xq2lblk65mxrskx80cdcr00ivzj1jx2bn"; depends=[DiscreteFDR PoissonBinomial pracma Rcpp]; }; + FDX = derive2 { name="FDX"; version="1.0.3"; sha256="1bwads0w8g2w4vb78rq6j4gy5i9f12pcb4y1l540y1acb7d1dsji"; depends=[DiscreteFDR PoissonBinomial pracma Rcpp]; }; + FDboost = derive2 { name="FDboost"; version="1.0-0"; sha256="1227fda2m8lsq3cndv0xgbgbcfdxhc4fjiyj2dmha1z4sycd7a28"; depends=[gamboostLSS MASS Matrix mboost mgcv stabs zoo]; }; FENmlm = derive2 { name="FENmlm"; version="2.4.3"; sha256="1a205a4iv54haixanyzx210lzqg7cnryjvqayvkdj1lhmdql4anw"; depends=[Formula MASS numDeriv Rcpp]; }; FESta = derive2 { name="FESta"; version="1.0.0"; sha256="1kf5iqw8x8079gjaxicrgax5l798l8hxcc5y83l5pqh0ync5bxm6"; depends=[]; }; FEprovideR = derive2 { name="FEprovideR"; version="1.1"; sha256="02hfdk9qhaq4y19p700w2i7qsdp4z2kyww0pr0pijfivkqks0vpi"; depends=[ggplot2 Matrix poibin]; }; FFD = derive2 { name="FFD"; version="1.0-6"; sha256="19yqb45qj54fmjkqfjbcqsx3wz6fk8inrqif9ds93xjkm6aaiqgp"; depends=[R2HTML tkrplot]; }; + FFdownload = derive2 { name="FFdownload"; version="1.0.5"; sha256="0fs4bdwr9xhzlvkrjmcfkifkgqlmklp7l5297ahb7acg65h7yawn"; depends=[plyr rvest xml2 xts zoo]; }; FField = derive2 { name="FField"; version="0.1.0"; sha256="05q16v2vv64qhbnf2l66dwzmvgzyaq8vxwwdabp534bw7z7zpi8q"; depends=[]; }; FGSG = derive2 { name="FGSG"; version="1.0.2"; sha256="1r3sjhzf9gcnbcx6rqr1s555z8lcwm3fxl096md2jji336ijlk79"; depends=[]; }; FGalgorithm = derive2 { name="FGalgorithm"; version="1.0"; sha256="1dq6yyb3l6c9fzvk9gs6pb240xb5hvc6fh8p3qd3c91b3m289mcc"; depends=[]; }; - FHDI = derive2 { name="FHDI"; version="1.4.0"; sha256="1plc4klvjid5ara6ay081xamxr14j3ldgqdm6ni8543cv07zwd74"; depends=[]; }; - FHtest = derive2 { name="FHtest"; version="1.4"; sha256="1wsn0j9ydpp9nfswiqg21p09kgkvaq8fh0y0h8syqgizah7i8vs2"; depends=[interval KMsurv MASS perm survival]; }; + FHDI = derive2 { name="FHDI"; version="1.4.1"; sha256="1n1rbrqdphp0prmkili6rnpxwdb7fgwsgncllr6yxlrkr5rb76pm"; depends=[]; }; + FHtest = derive2 { name="FHtest"; version="1.5"; sha256="00mql2r4f5hxhdqf27q3x9s5rz2zzakx2myym97b1w1s7c5znl4q"; depends=[interval KMsurv MASS perm survival]; }; FI = derive2 { name="FI"; version="1.0"; sha256="17qzl8qvxklpqrzsmvw4wq3lyqz3zkidr7ihxc4vdzmmz69pyh2f"; depends=[]; }; - FIACH = derive2 { name="FIACH"; version="0.1.2"; sha256="151lc5m8pb7l07kxljm32zy5kd7a4zr5vgsgwsx7ywhijh0r0585"; depends=[Rcpp RcppArmadillo RNiftyReg tkrplot]; }; FIT = derive2 { name="FIT"; version="0.0.6"; sha256="1nkjms9cvigc9sjha1krzhd3nmwsfh8pi0f1plf5k8zpb773zzb2"; depends=[gglasso MASS Rcpp RcppEigen XML]; }; FITSio = derive2 { name="FITSio"; version="2.1-0"; sha256="021xmbavigg70m96xw1bvsdasi5yj2wmafgb6xw4b09fmyv9hvjp"; depends=[]; }; FKF = derive2 { name="FKF"; version="0.1.7"; sha256="1s3qilbkmdfsxcc0vj4yv8jyh8gl9i9rq9f8xb8wiycccpzx119v"; depends=[]; }; + FKF_SP = derive2 { name="FKF.SP"; version="0.1.0"; sha256="0ni256m45fy5v7mwlfkqc3xx7z03rs069z69ifykklmshxzjwdsy"; depends=[curl mathjaxr Rdpack]; }; FKSUM = derive2 { name="FKSUM"; version="0.1.4"; sha256="02nicfw0wcprdg0p2p44g740j6bjf6xgzjxcvyfcbcsbr6bpjknx"; depends=[MASS rARPACK Rcpp RcppArmadillo]; }; FLAME = derive2 { name="FLAME"; version="2.0.0"; sha256="067yy0b668pj25a0jscpjb98in22048vxs249a7pa4rs2c1cyai9"; depends=[devtools dplyr glmnet gmp magrittr mice rlang tidyr xgboost]; }; FLLat = derive2 { name="FLLat"; version="1.2-1"; sha256="0306bpwp2az4x4m5sv88hlh7vs0y5isfby7lxrn2gjnk76gg6mw1"; depends=[gplots]; }; FLR = derive2 { name="FLR"; version="1.0"; sha256="0k50vi73qj7sjps0s6b2hq1cmpa4qr2vwkpd2wv2w1hhhrj8lm0n"; depends=[combinat]; }; - FLSSS = derive2 { name="FLSSS"; version="8.5.6"; sha256="1c6j54ihc385m1f0r86yb83zqv2myfskq48bh9dcynlnc9crs428"; depends=[Rcpp RcppParallel]; }; + FLSSS = derive2 { name="FLSSS"; version="8.6.6"; sha256="0kw28zmvgdy4zmj2vnrs84n0rg6jvqj3x8f3ihjjkzkwqrqyiia9"; depends=[Rcpp RcppParallel]; }; FLightR = derive2 { name="FLightR"; version="0.5.0"; sha256="00walvfjf2rr308mv4v3734qad4i1sgv0mwjldgpgjq077h4xw38"; depends=[bit CircStats circular fields GeoLight ggmap ggplot2 ggsn maptools mgcv nlme raster RcppArmadillo rgdal rgeos sp truncnorm]; }; FMAdist = derive2 { name="FMAdist"; version="0.1.0"; sha256="0aa4sw93ia6cp386hrq6x448x4w0p6k198rjaqs474j25gqgxrv0"; depends=[EnvStats extraDistr fitdistrplus MASS quadprog STAR]; }; FMC = derive2 { name="FMC"; version="1.0.0"; sha256="1pfqxx7slgcmw4al7i8hy59f4han6b0b7b5az7yh1mscdnghl9bj"; depends=[minimalRSD]; }; @@ -1436,34 +1484,36 @@ in with self; { FRCC = derive2 { name="FRCC"; version="1.0"; sha256="1g1rsdqsvwf7wc16dj16y6r0347j8jsv5l1pxvj1h0579zinaf2b"; depends=[calibrate CCP corpcor MASS]; }; FREEtree = derive2 { name="FREEtree"; version="0.1.0"; sha256="1i2liqbcg993snj5vq341mmafzhn1yrwljvx4f3kyzy0pa59k6rn"; depends=[glmertree MASS pre WGCNA]; }; FREQ = derive2 { name="FREQ"; version="1.0"; sha256="01nra30pbnqdd63pa87lcws3hnhhzybcjvx2jqyxjghn6khz47j0"; depends=[]; }; - FRESA_CAD = derive2 { name="FRESA.CAD"; version="3.1.0"; sha256="1gi637fwfpwbghms96bmfqs7zirjskd9hxiw43s0765h3ypjqwx1"; depends=[Hmisc miscTools pROC Rcpp RcppArmadillo stringr]; }; + FRESA_CAD = derive2 { name="FRESA.CAD"; version="3.3.0"; sha256="069pj6x4prlzg43q9ag8dl822awz3plk5020x13fv77jmyzq6srb"; depends=[Hmisc miscTools pROC Rcpp RcppArmadillo stringr]; }; FRK = derive2 { name="FRK"; version="0.2.2.1"; sha256="0fjfhkv899v08419109qs1gabnc22h7a5b4z6s6fd1zk1dc4agjn"; depends=[digest dplyr ggplot2 Hmisc Matrix plyr Rcpp sp spacetime sparseinv]; }; - FSA = derive2 { name="FSA"; version="0.8.30"; sha256="0f567dm1fcffjsmm4j8c81q748rl944ia5ll22b2ayvv3qf7v9y7"; depends=[car dplyr dunn_test lmtest plotrix plyr sciplot withr]; }; + FSA = derive2 { name="FSA"; version="0.8.31"; sha256="0a5arvmabks14a52y1ydbnx52klj6dzfak10b7kfqpygbi2rc37n"; depends=[car dplyr dunn_test lmtest plotrix plyr sciplot withr]; }; FSAdata = derive2 { name="FSAdata"; version="0.3.8"; sha256="0i7wkz0baxcf1dv6qvc891b4ja4x65p4qicil472k6a9gcf5d4qm"; depends=[]; }; + FSDAM = derive2 { name="FSDAM"; version="2020.11-18"; sha256="09l7zvmbvmbcr5pxizdhs5fn79r6cl4ic0hsz2bazdymsqv3s3nm"; depends=[kyotil reticulate]; }; FSInteract = derive2 { name="FSInteract"; version="0.1.2"; sha256="1aci1398aaz0nrl5jy6yh7xik355wf7pwngrsak4qsi94vdj05iy"; depends=[Matrix Rcpp]; }; - FSK2R = derive2 { name="FSK2R"; version="0.1.1"; sha256="046d47zcig1rs76q32v3p6kc9shhb073659gw5vd585svkvcr4ic"; depends=[dplyr googlesheets purrr R_utils readtext readxl rjson rlang shiny stringr tibble tidyr XML xml2 zip]; }; + FSK2R = derive2 { name="FSK2R"; version="0.1.2"; sha256="0baar5dg9zz89bz4f9x074qknxs296bdclipdy8m1ljzclhxpsbf"; depends=[dplyr googlesheets purrr R_utils readtext readxl rjson rlang shiny stringr tibble tidyr XML xml2 zip]; }; FSMUMI = derive2 { name="FSMUMI"; version="1.0"; sha256="06ri1zi86cm4arjdlp2pha2bvcc8vz6irvd9n3ja074hv62wxcw4"; depends=[FuzzyR lsa]; }; FSSF = derive2 { name="FSSF"; version="0.1.1"; sha256="024g2rv64yqxmbbwrbkpkrzdfshl0n6jll6axsgsp4q4ia4r9401"; depends=[Rcpp RcppArmadillo]; }; FSTpackage = derive2 { name="FSTpackage"; version="0.1"; sha256="1fjqsl59fg4x9vkbv4b0qmfxlaa2q3rzpl40grv24yg6ixfagmdb"; depends=[CompQuadForm MASS Matrix mvtnorm SKAT]; }; FSelector = derive2 { name="FSelector"; version="0.31"; sha256="1ryqrwz9h7ggxvmxyw4viajlkvd3r7i6ihcfrwsz6axyk5y0qarg"; depends=[digest entropy randomForest RWeka]; }; - FSelectorRcpp = derive2 { name="FSelectorRcpp"; version="0.3.3"; sha256="0x0jysqjvplzmcjs223wma9ng2pyd9mcbdgqmgsiifv0wdic07vi"; depends=[BH foreach iterators Rcpp RcppArmadillo testthat]; }; - FSinR = derive2 { name="FSinR"; version="2.0.3"; sha256="13p28wn4b5f2q28g083r2qyahqrkw6qp6d4ibsipk4zclcrlpqax"; depends=[caret class digest dplyr e1071 GA mlbench neuralnet prodlim purrr Rdpack rlang rpart tidyr]; }; + FSelectorRcpp = derive2 { name="FSelectorRcpp"; version="0.3.7"; sha256="1y1hvcxs3516xf5fnzlm4hhd22i9h6cgklv2g2wbs3qph86334rl"; depends=[BH foreach iterators Rcpp RcppArmadillo testthat]; }; + FSinR = derive2 { name="FSinR"; version="2.0.5"; sha256="11ss38qpasbyym9hcfqmv254jvr8lzsw6r85dlm7xlnhfnxil59l"; depends=[caret class digest dplyr e1071 GA mlbench neuralnet prodlim purrr Rdpack rlang rpart tidyr]; }; FTICRMS = derive2 { name="FTICRMS"; version="0.8"; sha256="0kv02mdmwflhqdrkhzb55si5qnqqgdadgyabqc2hwr6iccn7aq8c"; depends=[lattice Matrix]; }; FUNTA = derive2 { name="FUNTA"; version="0.1.0"; sha256="02yxz95s2hs26mfmgwhv5d54yyjz0aczjpnay8b4gpzbpd6aci61"; depends=[]; }; FWDselect = derive2 { name="FWDselect"; version="2.1.0"; sha256="0w0hkmhcz7h1lixk7p3yffbbalgxwh2lv463vqz361k80sri6wz7"; depends=[cvTools mgcv]; }; FacPad = derive2 { name="FacPad"; version="3.0"; sha256="0h7knzin0rfk25li127zwjsyz223w7nx959cs328p6b2azhgn59b"; depends=[MASS Rlab]; }; FactMixtAnalysis = derive2 { name="FactMixtAnalysis"; version="1.0"; sha256="1l4wfp39b7g38vdk6jpd5zq08sjhsg0s71f662aca2rj6l3a2x3r"; depends=[MASS mvtnorm]; }; FactoClass = derive2 { name="FactoClass"; version="1.2.7"; sha256="0hvlr9cw6wfckl8rzl5qqyp0h8rv8gcnyj6x930jq7h44kj0ji7d"; depends=[ade4 ggplot2 ggrepel KernSmooth scatterplot3d xtable]; }; - FactoInvestigate = derive2 { name="FactoInvestigate"; version="1.6"; sha256="0y32k41i1mfh1yxkd8mcgw7x2xkibq9xqf2vgysnibgnabwi15w2"; depends=[FactoMineR ggplot2 rmarkdown rrcov]; }; - FactoMineR = derive2 { name="FactoMineR"; version="2.3"; sha256="0ldgf3daksh6lpblhqys67m4mxqx3q9s9n5plfam6dwshfik0ky6"; depends=[car cluster ellipse flashClust ggplot2 ggrepel lattice leaps MASS scatterplot3d]; }; + FactoInvestigate = derive2 { name="FactoInvestigate"; version="1.7"; sha256="0lndh80pmr5zhhh7j9lhxl4j007rak5gh3dwxd1883cy0d6whjs9"; depends=[FactoMineR ggplot2 rmarkdown rrcov]; }; + FactoMineR = derive2 { name="FactoMineR"; version="2.4"; sha256="0lg8n9fxxk46nchnj4pbpqqf4swxfsq7r9jzr36dmd36kb7avqxr"; depends=[car cluster DT ellipse flashClust ggplot2 ggrepel lattice leaps MASS scatterplot3d]; }; FactorAssumptions = derive2 { name="FactorAssumptions"; version="1.1.2"; sha256="0k5jjqfajrq5wc0vp07s6kbfyjks6124hpy09nxw2blrai66vhcm"; depends=[MASS psych]; }; + FactorCopula = derive2 { name="FactorCopula"; version="0.5"; sha256="0mqw6qwm8n2cfqz8srsynqcrki7qd98p5wmkp14i1j8c6n0i4vxd"; depends=[abind polycor statmod]; }; FactorsR = derive2 { name="FactorsR"; version="1.4"; sha256="1nw63j9bi4x09pgdvdml0w0qxfy1dda5hkxbhd3d6f7rky1z0nyf"; depends=[]; }; - Factoshiny = derive2 { name="Factoshiny"; version="2.2"; sha256="0niic7k9z1j3684l0wmyhkbm1x8a2djig6m2k0s49vgfdaf1hcc0"; depends=[colourpicker DT FactoInvestigate FactoMineR ggplot2 ggrepel missMDA shiny shinydashboard shinyjqui]; }; + Factoshiny = derive2 { name="Factoshiny"; version="2.3"; sha256="1mg1dynmxbfmagaa6fw3jg6x519nmq0vyq7bbkq4d6wiw7qykx57"; depends=[colourpicker DT FactoInvestigate FactoMineR ggplot2 ggrepel missMDA shiny shinydashboard shinyjqui]; }; Fahrmeir = derive2 { name="Fahrmeir"; version="2016.5.31"; sha256="16fbc1zb9x9p04bl7y5nd375pha6bd3hfqqchlk1bqxrj4879y5g"; depends=[]; }; FamEvent = derive2 { name="FamEvent"; version="2.0"; sha256="07xb1k3yxsbwxxg6avw2gvai2qpjjd1imjggr8q6lkgcd8j3yxrb"; depends=[eha kinship2 MASS pracma survival truncnorm]; }; Familias = derive2 { name="Familias"; version="2.4"; sha256="1k6ig2zfkr1a4s3s85ygixmmsrb5m8vqqab8l5ffkspgjvh4dfz2"; depends=[kinship2 paramlink Rsolnp]; }; FarmSelect = derive2 { name="FarmSelect"; version="1.0.2"; sha256="174rzv9k0hdcfdkv7bisy70rip2iy0bnj3qa54i00wqwjdglgjdn"; depends=[fBasics ncvreg Rcpp RcppArmadillo]; }; - FarmTest = derive2 { name="FarmTest"; version="2.1.0"; sha256="0vm6mvl8iixm5w3xrzmc685ifypnlhjch4cpqjsvk0pamp5f24dl"; depends=[Rcpp RcppArmadillo]; }; + FarmTest = derive2 { name="FarmTest"; version="2.2.0"; sha256="1mr2cscz3ywyq280ifaj4gypxanvvl9s7w33ysmwn952camra2md"; depends=[Rcpp RcppArmadillo]; }; FastBandChol = derive2 { name="FastBandChol"; version="0.1.1"; sha256="1hlgipn792vaylvc0r44clkjcnkns6p241a1fs8sb3gpq81naazk"; depends=[Rcpp RcppArmadillo]; }; FastCUB = derive2 { name="FastCUB"; version="0.0.2"; sha256="04bphkfkkjp7gfnsgar5gcxzmkr437mz6y8mbf015m7f4cvdhzjz"; depends=[CUB Formula]; }; FastGP = derive2 { name="FastGP"; version="1.2"; sha256="120qai1yw3yhwm762zridk78n4qclpivwm9f2hkij4bz851qibqv"; depends=[MASS mvtnorm rbenchmark Rcpp RcppEigen]; }; @@ -1504,7 +1554,7 @@ in with self; { FisHiCal = derive2 { name="FisHiCal"; version="1.1"; sha256="1dds629jlja3vw2l010n1334yh3z10nijqksr0q98ckd2yrwg2rf"; depends=[igraph Rcpp RcppArmadillo]; }; FisPro = derive2 { name="FisPro"; version="1.0"; sha256="0wj5xf8qcrbmfixmsirwaf9yl5gk0bb588csp867c8n5jnqqyq0p"; depends=[Rcpp Rdpack]; }; FishResp = derive2 { name="FishResp"; version="1.0.3"; sha256="0cydxs9knbmsyxrhqi68aqa12x20k6wcs6jw7z58k2jisypwqclw"; depends=[chron lattice mclust respirometry rMR]; }; - FisherEM = derive2 { name="FisherEM"; version="1.5.2"; sha256="1s9k7p8wij79aljxgmni1nddrqsa1k4bdbxyar54rmrjxxz8y31l"; depends=[elasticnet MASS]; }; + FisherEM = derive2 { name="FisherEM"; version="1.6"; sha256="18xn0hnj5diq7falrjl04abqyyrvyzaikb9l6wh7hfhflhsd382c"; depends=[elasticnet ellipse ggplot2 MASS plyr]; }; FitAR = derive2 { name="FitAR"; version="1.94"; sha256="1mkk3kvfq4v0pdabnhbwrk31ji2mv2v6ns16xsvvr1qyg2fnx6hq"; depends=[bestglm lattice leaps ltsa]; }; FitARMA = derive2 { name="FitARMA"; version="1.6.1"; sha256="02di0pkz6hh92glpn3li6z9azkcqa64ja8zfpy0mkh1l97mw6jsv"; depends=[FitAR]; }; FitUltD = derive2 { name="FitUltD"; version="3.1.0"; sha256="17fj211riybq71k63wjfv2ndc2h46ay5svrac2v5i3b92cb9hkbv"; depends=[ADGofTest assertthat cowplot fitdistrplus ggplot2 MASS mclust purrr]; }; @@ -1513,13 +1563,15 @@ in with self; { FlexDir = derive2 { name="FlexDir"; version="1.0"; sha256="1gb5alv9jsnw0135g63cy757pxhdw6cgwfm8dpcm8dj9zqg10dkm"; depends=[]; }; FlexGAM = derive2 { name="FlexGAM"; version="0.7.2"; sha256="04xbglg9vli18fd24k1qyvbl7svp70k67ig3jiss96fgkgbi6w7c"; depends=[MASS Matrix mgcv scam]; }; FlexParamCurve = derive2 { name="FlexParamCurve"; version="1.5-5"; sha256="1404cn3bhcdr3mjhpr072zcyl0wnksarsg2sry5d1scsmrn4xq83"; depends=[nlme]; }; + FlexReg = derive2 { name="FlexReg"; version="1.0"; sha256="0zwm9jd7idakmf344fh7bgwyl20cl5iszxh7rk1iw94yjcq3g06l"; depends=[bayesplot BH Formula ggplot2 loo Rcpp RcppEigen rstan rstantools StanHeaders]; }; FlexScan = derive2 { name="FlexScan"; version="0.2.0"; sha256="1jd93h96qhqvk9xx3va78v76fzl6y0rbm85022zpvk3wz4z2g1xs"; depends=[smerc sp spdep]; }; FlickrAPI = derive2 { name="FlickrAPI"; version="0.1.0.0"; sha256="0bbk7ac4s3gbcjhfg3yz06pxjid3hpd0mqzxzlj5sghn95f479h9"; depends=[jsonlite magrittr RCurl stringr]; }; - FloodMapper = derive2 { name="FloodMapper"; version="1.0"; sha256="09pr6324namqrwdr2impgqmdmsf34g9pq91091cg9b1031djgzyq"; depends=[magick raster rgdal sp]; }; FlowRegEnvCost = derive2 { name="FlowRegEnvCost"; version="0.1.1"; sha256="0lw4kv4z0s23jy11y53rxxh7zxa7vajxrcnjgxd74xxs64vjlj88"; depends=[zoo]; }; FlowScreen = derive2 { name="FlowScreen"; version="1.2.6"; sha256="1s9xyrvfsgrl2zxm2an5qj3rs1qx7v7j8wc83jzl28pkwa5xr351"; depends=[changepoint evir zyp]; }; FluMoDL = derive2 { name="FluMoDL"; version="0.0.3"; sha256="0vp3w6hpph6svz8940w9yk9c5iv4n9mj94f9si1ks0xjbi948rqd"; depends=[dlnm mvmeta tsModel]; }; Flury = derive2 { name="Flury"; version="0.1-3"; sha256="105fv9azjkd8bsb9b8ba3gpy3pjnyyyp753qhrd11byp3d0bbxy0"; depends=[]; }; + FlyingR = derive2 { name="FlyingR"; version="0.2.0"; sha256="0smishimssanzssndbwh9d276sq8vdldpzb3ww9c4nlwypxjmr8z"; depends=[kableExtra knitr Rcpp rmarkdown]; }; + FoReco = derive2 { name="FoReco"; version="0.1.1"; sha256="1vlys6wv2h6bdzx5c33glykbipk0dsdf431ww5vgdl6r7p0h9xqs"; depends=[cli corpcor Matrix osqp pracma]; }; ForIT = derive2 { name="ForIT"; version="1.0"; sha256="0mi2cw09mbc54s8qwcwxin2na1gfyi60cdssy2ncynma7alq3733"; depends=[]; }; ForImp = derive2 { name="ForImp"; version="1.0.3"; sha256="0ai4i6q233sdsi8xilpbkxjqdf4pxw93clkdkhcxal6q43rnf7vd"; depends=[homals mvtnorm sampling]; }; ForeCA = derive2 { name="ForeCA"; version="0.2.7"; sha256="1falhz9v0z76h60gz66rh9wvk3jsjv8fvbkhkx9jmzbrkla397cd"; depends=[astsa MASS reshape2]; }; @@ -1528,10 +1580,10 @@ in with self; { ForecastTB = derive2 { name="ForecastTB"; version="1.0.1"; sha256="1wqgw4i65ajwj8la8mgv2qqm4ydgk90i6chdkd8h33rlwh8yddc6"; depends=[circlize decomposedPSF forecast ggplot2 gridExtra imputeTestbench PSF RColorBrewer reshape2]; }; ForestDisc = derive2 { name="ForestDisc"; version="0.1.0"; sha256="1mzlrqjxsja51yyxckj4ym1vpfpq30vlhvs8clrg8jv7kz86hdwk"; depends=[moments nloptr randomForest]; }; ForestFit = derive2 { name="ForestFit"; version="0.6.1"; sha256="1gbf1pgmqw102vp1792jls7f53ag93spkyyvk3qh1s76ag3shzac"; depends=[ars pracma]; }; - ForestGapR = derive2 { name="ForestGapR"; version="0.0.2"; sha256="0xig9nal83xg312kgq6dhi7n67sa8ixlnh79x957w3n5rv9kdyf2"; depends=[igraph raster rgeos sp spatstat VGAM viridis]; }; + ForestGapR = derive2 { name="ForestGapR"; version="0.0.3"; sha256="1r5bcgmvdpjyq5csxcvvrm4gd4nj4hm0sn6xf6j45bm9az2v9nj8"; depends=[igraph poweRlaw raster rgeos sp spatstat VGAM viridis]; }; ForestTools = derive2 { name="ForestTools"; version="0.2.1"; sha256="08cx8pyg2giwpf1lnq5c8s98c1srspmgcwj62rdmb69gl0yp0l1j"; depends=[APfun doSNOW foreach imager plyr progress radiomics raster rgeos sp]; }; FormalSeries = derive2 { name="FormalSeries"; version="1.0"; sha256="09m4ifinasww0xfprs29xsrqhxxkw9zffb3919xnkkjkwp0nax4v"; depends=[]; }; - Formula = derive2 { name="Formula"; version="1.2-3"; sha256="0wiqh8rr9d5ciy80wj8f5fnmiiw0ywanvvnhkwd622dx42dk848l"; depends=[]; }; + Formula = derive2 { name="Formula"; version="1.2-4"; sha256="1bsw282i5m8rlirbhz7hqvf25zbxschk7yrp152whbzdnmry6w6b"; depends=[]; }; ForwardSearch = derive2 { name="ForwardSearch"; version="1.0"; sha256="0yd47832piqxzjxgl7bc8pn0c8f7vbgsm9z6894rzyi615kjl70b"; depends=[robustbase]; }; FossilSim = derive2 { name="FossilSim"; version="2.1.1"; sha256="1dffk14lszq84k61s1jar658qpjc1hm6rwa1gcwwvppvxj6gkvky"; depends=[ape TreeSim]; }; FourScores = derive2 { name="FourScores"; version="1.5.1"; sha256="1la9d1hfcmi0zg58yl0a7nj36giagh0fwrc7wxyqdq0c7zf1hfzq"; depends=[]; }; @@ -1547,8 +1599,10 @@ in with self; { FunCC = derive2 { name="FunCC"; version="1.0"; sha256="0n8fnrq3grsxxcz1841d3d643nyrwc7y15na1205zxq6rmdjx7wa"; depends=[biclust ggplot2 narray RColorBrewer reshape]; }; FunChisq = derive2 { name="FunChisq"; version="2.5.1"; sha256="153l9mlynfl1j6ld7v4dl6lvs6rz20hchz009qngpg13szddafzb"; depends=[BH Rcpp Rdpack]; }; FunCluster = derive2 { name="FunCluster"; version="1.09"; sha256="0i73asn1w4s6ydf2ddn5wpr0mwbbxzgmaly1pslarzkx71wk03fz"; depends=[cluster Hmisc]; }; + FunWithNumbers = derive2 { name="FunWithNumbers"; version="1.0"; sha256="0kzmfy2dn41v7991crshxjcycp1s432ip0ivw8bq6x9v638skwkk"; depends=[gmp Rmpfr]; }; FuncMap = derive2 { name="FuncMap"; version="1.0.10"; sha256="0iaay6qz9a2s77xjfpp7wm37y7xwnvmlw6s5k5riccmqzc6dcjs7"; depends=[mvbutils]; }; - FunnelPlotR = derive2 { name="FunnelPlotR"; version="0.2.3"; sha256="16bw1fx2pzmxm8gavq791drnpsczxq5yyfbnl2h1xcrzlw4fw4b0"; depends=[dplyr ggplot2 ggrepel rlang scales]; }; + FuncNN = derive2 { name="FuncNN"; version="1.0"; sha256="0kcr7c54igzi0imp8w9a0mnrqaa2qcls9777scsjz5sbcxdy3if3"; depends=[caret doParallel fda fda_usc flux foreach ggplot2 ggpubr keras Matrix pbapply reshape2 tensorflow]; }; + FunnelPlotR = derive2 { name="FunnelPlotR"; version="0.3.2"; sha256="0pplrbw4grphh92d941vqpqwqphc8d5iglgzzb0d0xknr5m20b8w"; depends=[dplyr ggplot2 ggrepel scales]; }; FusionLearn = derive2 { name="FusionLearn"; version="0.1.1"; sha256="0n8bj7k2r2vf0v2nsw31k75hzkqj5l4hyfnmvid102hx9cl8hv3y"; depends=[]; }; Fuzzy_p_value = derive2 { name="Fuzzy.p.value"; version="1.1"; sha256="13h6armh9g57zqxyjqk6mq81jlfqxqrg2sb5p9rrhslka5m01zis"; depends=[FuzzyNumbers]; }; FuzzyAHP = derive2 { name="FuzzyAHP"; version="0.9.5"; sha256="02sx32vlvnr0fzw8rf0f6hiikqn7xp1ibpqzxhxwv8yij2qkiyci"; depends=[MASS]; }; @@ -1557,7 +1611,7 @@ in with self; { FuzzyNumbers = derive2 { name="FuzzyNumbers"; version="0.4-6"; sha256="1zba28kmzpcza099k1ck7aqn7ms2fh3ijcn05xdimvssjbhsag81"; depends=[]; }; FuzzyNumbers_Ext_2 = derive2 { name="FuzzyNumbers.Ext.2"; version="3.2"; sha256="0gldq0bg1p1vmrn35prha44d7lyymz0jzshdyp2c5rx433mny7h5"; depends=[FuzzyNumbers]; }; FuzzyR = derive2 { name="FuzzyR"; version="2.3"; sha256="0y22924vhvybiwhsfl3svizk4sgrvg4a8wl30b5kb2c0vjv03ad6"; depends=[plyr shiny]; }; - FuzzySTs = derive2 { name="FuzzySTs"; version="0.1"; sha256="1xg140vaw3rwv62n3s52v1z96nfii43m6b8b3l84cdyv5y9bwrln"; depends=[FuzzyNumbers polynom]; }; + FuzzySTs = derive2 { name="FuzzySTs"; version="0.2"; sha256="0zs1pyn9apysspxa0glqc96h6npmvvhiqvqpcm0brslz0b6xnilp"; depends=[FuzzyNumbers polynom]; }; FuzzyStatProb = derive2 { name="FuzzyStatProb"; version="2.0.4"; sha256="1jpqb8xczi1d4g306vrwpi02f9h59aki1pgnckvfmiclr306prpb"; depends=[DEoptim FuzzyNumbers MultinomialCI]; }; FuzzyStatTra = derive2 { name="FuzzyStatTra"; version="1.0"; sha256="1ijrlnlmq9d5ahgrpzba6kzkaq1zq59zqdgcizybsf9alsswcm00"; depends=[]; }; FuzzyToolkitUoN = derive2 { name="FuzzyToolkitUoN"; version="1.0"; sha256="104s45mmlam67vwpshhpns2mgwvmhnbj8w1918jyk2r5mqibwz06"; depends=[]; }; @@ -1570,10 +1624,12 @@ in with self; { GADAG = derive2 { name="GADAG"; version="0.99.0"; sha256="1ycg48idrq2yrk1fxs16yl5wwg3kbfki8xppmh311rrzf75c6z4g"; depends=[igraph MASS Rcpp RcppArmadillo]; }; GADMTools = derive2 { name="GADMTools"; version="3.8-1"; sha256="02rqpvqawk0y8w20d89cbdbjlmpyvvp826gzzdajqba1wazj6ikx"; depends=[classInt dplyr ggmap ggplot2 ggspatial gridExtra jsonlite lattice maptools prettymapr raster RColorBrewer rgdal rgeos rosm sf sp stringr]; }; GAIPE = derive2 { name="GAIPE"; version="1.0"; sha256="04iarbwxrhn48bk329wxis7ifzndi67kpjx6dcakawkh3g2mzsfz"; depends=[]; }; - GAMBoost = derive2 { name="GAMBoost"; version="1.2-3"; sha256="0450h9zf12r524lxk1lrv9imvvkk6fmyd3chnxp18nnvys7215pv"; depends=[Matrix]; }; + GALLO = derive2 { name="GALLO"; version="1.1"; sha256="1jx8y2ph3jmsx9y7y3r1ap5aybqy7zdk43jpnvcfamzv0q5v8mf0"; depends=[circlize data_table doParallel dplyr DT dynamicTreeCut foreach ggplot2 lattice magick RColorBrewer rtracklayer stringr unbalhaar]; }; GAMens = derive2 { name="GAMens"; version="1.2.1"; sha256="1z10wxcg277fra2lch464l0kb02lspw9qr1i2wmq11wcz0k9qnl8"; depends=[caTools gam mlbench]; }; GANPA = derive2 { name="GANPA"; version="1.0"; sha256="0ia8djv46jm397nxjrm9yc5gacf1r4z0ckiliz57cbrqwh7z2wpa"; depends=[GANPAdata]; }; GANPAdata = derive2 { name="GANPAdata"; version="1.0"; sha256="0mhdadl7zgsacn59ym42magg3214k1xhabwn78fv7kgccszcgc86"; depends=[]; }; + GARCHIto = derive2 { name="GARCHIto"; version="0.1.0"; sha256="1rh9da9gb1krxasx1apldns5k3wl2xjjqc8bidsd5c0h5jlqdvr6"; depends=[Rsolnp]; }; + GARCOM = derive2 { name="GARCOM"; version="1.2.0"; sha256="1fgr03gw86fjrj6hx32qvl6jsc6ax9i1ss4bbfmi8iz2f1nq43wi"; depends=[data_table vcfR]; }; GAS = derive2 { name="GAS"; version="0.3.3"; sha256="0w5rgx3f965jxl2r6rhsj5ad4bbbwir8hbki3q0cs2z9hc4g6vh9"; depends=[cubature MASS numDeriv Rcpp RcppArmadillo Rsolnp xts zoo]; }; GAabbreviate = derive2 { name="GAabbreviate"; version="1.3"; sha256="0cq6bg3w0ji44rsz1p4j17fk0jg8rafbjixwi3fjdndc3yd874r5"; depends=[GA psych]; }; GAparsimony = derive2 { name="GAparsimony"; version="0.9.4"; sha256="1p1s5q1basy9v3jy1qxpx5g8mzpkwdfarxmmf7s06c6wq0dl9vp8"; depends=[foreach iterators]; }; @@ -1581,59 +1637,60 @@ in with self; { GB2group = derive2 { name="GB2group"; version="0.2.0"; sha256="185am9j88f3qjv0h8ag91x8qrck4qk0a4k0mcg5k56rf2lf7s7zi"; depends=[GB2 ineq minpack_lm numDeriv]; }; GBJ = derive2 { name="GBJ"; version="0.5.3"; sha256="12lsddkcxz37hn2fvjq158wb1bc6b3hx6wj8q8nj21zpmyl3n2qh"; depends=[BH mvtnorm Rcpp SKAT]; }; GCAI_bias = derive2 { name="GCAI.bias"; version="1.0"; sha256="10092mwpmfbcga0n39a0i6g8xxch8xiwg15cckipw6yxjyx0sivc"; depends=[]; }; - GCD = derive2 { name="GCD"; version="4.0.6"; sha256="1lc2n9avg1rfh55gbj3q0yd1gvfw60088zg279s7aikx10zv4sx7"; depends=[raster]; }; + GCD = derive2 { name="GCD"; version="4.0.7"; sha256="1259z76hajapzzq75fas2sq19r0wapn1ybghdaqdc6dksifdz6fv"; depends=[raster]; }; GCPM = derive2 { name="GCPM"; version="1.2.2"; sha256="0k2ng78bk3bxpj6nz80j5cvjd56zjz328ga68vyyc3hvdjgpspqj"; depends=[Rcpp RcppProgress]; }; + GCSM = derive2 { name="GCSM"; version="0.1.0"; sha256="05fyjdchnls4aikhwis3v691vsvxf657f9jf55a61ilvn59552q5"; depends=[Rcpp RcppArmadillo]; }; GCalcium = derive2 { name="GCalcium"; version="1.0.0"; sha256="0r84qmdsqsgpaqr08imh48mdvy26s2b62hi0hxxwhr9kg7qvj0rd"; depends=[caTools dplyr]; }; - GCalignR = derive2 { name="GCalignR"; version="1.0.2"; sha256="1x0as6mmapvn3a28c3qk3wd5gjkx17xgf9c7yb68wp3lj8pknsnm"; depends=[ggplot2 pbapply readr reshape2 stringr]; }; + GCalignR = derive2 { name="GCalignR"; version="1.0.3"; sha256="0fq5jglgbw2cqm4pa7x4lczqjr1w65ddnhzlr2i97skzk0gcdlr5"; depends=[ggplot2 pbapply readr reshape2 stringr tibble]; }; GD = derive2 { name="GD"; version="1.9"; sha256="00sagb5hxxpgvbycbf86kw7nf0wvxcbam9ni8nlp7asjkmkpv5zq"; depends=[badger]; }; GDAdata = derive2 { name="GDAdata"; version="0.93"; sha256="13ks97i289rc4i7gpqrifwbj0m9rx8csjhnfg8mad10qmjwz7p8b"; depends=[]; }; GDAtools = derive2 { name="GDAtools"; version="1.5"; sha256="1xya99dqzb9mgkw7h7aj592ya36j1hai8j8zgy1dpmpfxwsbjd6y"; depends=[FactoMineR ggplot2 ggrepel moreparty nleqslv nnet RColorBrewer rlang]; }; GDELTtools = derive2 { name="GDELTtools"; version="1.2"; sha256="1rx6kjh7kmyycqapvbizcxkcfp09qvqv7k8f25v333sxkacpz6p5"; depends=[plyr TimeWarp]; }; GDINA = derive2 { name="GDINA"; version="2.8.0"; sha256="0chxnhp37xfd78gafkgwqrmc0jf3pvpdyrkc438kl0l53fb7dld7"; depends=[alabama ggplot2 MASS nloptr numDeriv Rcpp RcppArmadillo Rsolnp shiny shinydashboard]; }; - GE = derive2 { name="GE"; version="0.1.4"; sha256="0h0g3ngdih69lhkkjxbn6i0abw8kg2jdpqbvzzn2xw0cjww2fjh1"; depends=[CGE data_tree DiagrammeR]; }; + GE = derive2 { name="GE"; version="0.1.6"; sha256="17wwyjzsp2hxc8g3xziwfxqm4df2pngw6dwcqxaljlav10li0s3r"; depends=[CGE data_tree DiagrammeR]; }; GEEaSPU = derive2 { name="GEEaSPU"; version="1.0.2"; sha256="02pwjqd94kranc1f69bx9rzk27kchavhvhl9fygjhrr40nwq3pbg"; depends=[gee Rcpp RcppArmadillo]; }; GEEmediate = derive2 { name="GEEmediate"; version="1.1.3"; sha256="1xprkpjp1pkq4ci1n32d3yy80hx3r4xf2j7f6hv7dvsn4cvdp417"; depends=[gee]; }; - GENEAclassify = derive2 { name="GENEAclassify"; version="1.4.18"; sha256="17m58i3jridgxzcckcm0ydd2ijw3zjvg9w4an8j5jbnr62hmcb2s"; depends=[changepoint GENEAread MASS rpart signal]; }; - GENEAread = derive2 { name="GENEAread"; version="2.0.8"; sha256="1phiwdq05h92vlrjbvx4xvazzls5bdlnwfxn5mghx0v9j0n3ahrm"; depends=[bitops mmap]; }; + GENEAclassify = derive2 { name="GENEAclassify"; version="1.5.1"; sha256="0xwvq0vbv2a9r7r0kcn1a32r6d2kgxz3cxnrclq4b4kwrdc8n7nn"; depends=[changepoint GENEAread MASS rpart signal]; }; + GENEAread = derive2 { name="GENEAread"; version="2.0.9"; sha256="00whn2xqlcdcgmrifng04j2csxynfb1dmj9wkx981ylz13jsnwm9"; depends=[bitops mmap]; }; GENEAsphere = derive2 { name="GENEAsphere"; version="1.5.1"; sha256="1kgj7i9v2yn0b8lvvsf0nc6lg3i2syrcygwa51pcrzp57vv7hxn5"; depends=[GENEAread ggplot2 MASS misc3d rgl]; }; GENLIB = derive2 { name="GENLIB"; version="1.0.9"; sha256="1ch3wz3y6p6z0rs9b3877iihvp0ycha062ajzf2fhxgjzgf0v5d1"; depends=[bootstrap doParallel foreach kinship2 lattice Matrix quadprog Rcpp]; }; GENMETA = derive2 { name="GENMETA"; version="0.1"; sha256="1mxwqnbg5bvx1qg62xcd62dl81k11l64yckhl3v854asnaczq3pp"; depends=[magic MASS Matrix]; }; GEOmap = derive2 { name="GEOmap"; version="2.4-4"; sha256="0wk2v0fwcwcm59k711fg829h2w58wkd36im4mg974iai6mqif7qh"; depends=[fields MBA RPMG splancs]; }; GESE = derive2 { name="GESE"; version="2.0.1"; sha256="0h3s2sbnv5wilr2mj6bnl2892p16pxrs341gg6jql1a540p669sk"; depends=[kinship2]; }; GESTr = derive2 { name="GESTr"; version="0.1"; sha256="1q12l2vcq6bcyybnknrmfbm6rpzcmxgq2vyj33xwhkmm9g2ii9k6"; depends=[gtools mclust]; }; - GET = derive2 { name="GET"; version="0.1-7"; sha256="0q32a7c09h6qcgyf2xav2i4ajc3i4hd2i7k1il99g5i5p6sx040i"; depends=[ggplot2 gridExtra spatstat]; }; - GEVStableGarch = derive2 { name="GEVStableGarch"; version="1.1"; sha256="1iypv0k4cbvsdyglgvf7y52sqvl5qcin627pjqwq42kisqynm8d7"; depends=[fExtremes fGarch Rsolnp skewt stabledist timeDate timeSeries]; }; + GET = derive2 { name="GET"; version="0.2-1"; sha256="0jzl6yf9ljjsr5k8y71qjr8w2a5gcnrlhiirzcm9wc1h6hchbmqp"; depends=[ggplot2 gridExtra viridisLite]; }; + GEVACO = derive2 { name="GEVACO"; version="1.0.0"; sha256="0rslnxqbj1pbbnp849pdn6l9dyfib9w19a1q3fw7kdjfir76gk6a"; depends=[nlme RLRsim]; }; GEVcdn = derive2 { name="GEVcdn"; version="1.1.6-2"; sha256="0vmm9fhyrk5m0zwy7fpq5j9zinws0gn2saf4j9plqc9gj1gphjn0"; depends=[]; }; GEint = derive2 { name="GEint"; version="0.1.5"; sha256="179gpq4qjhgx1fhyjdb80rf2ip80zhhfyn8xjgwq1a425163q1y7"; depends=[bindata geepack mvtnorm nleqslv pracma rje speedglm]; }; GExMap = derive2 { name="GExMap"; version="1.1.3"; sha256="1a6i2z9ndgia4v96nkr77cjqnbgxigqbqlibg82gwa0a6pl7r7nz"; depends=[Biobase multtest]; }; GFA = derive2 { name="GFA"; version="1.0.3"; sha256="10sivsqxliwcrp0ay3n2my28zki6f8vpv8i9lbld8qinx1iv2mq3"; depends=[]; }; - GFD = derive2 { name="GFD"; version="0.2.6"; sha256="1z98j6nvaa4vrh840q1iy5r0h9ns4xbrk3qfkq51l2kmbrck8r7a"; depends=[magic MASS Matrix plotrix plyr]; }; + GFD = derive2 { name="GFD"; version="0.2.9"; sha256="1q60n2l00vm5v0wl9zk780lhvh294fqmvcfgch37zm3lyr9zllvh"; depends=[magic MASS Matrix plotrix plyr]; }; GFE = derive2 { name="GFE"; version="0.1.0"; sha256="0ywrg23z13kp8ggw4wbm4jvr2rvb6kra7ma0mgfj8xzkrxs6vi6m"; depends=[data_table dplyr TeachingSampling]; }; GFGM_copula = derive2 { name="GFGM.copula"; version="1.0.4"; sha256="0cw8ih9dj86cvks0qcpffzjx8lv6qiwvk3f1wri8zashj8lk9am6"; depends=[cmprsk compound_Cox joint_Cox]; }; GGClassification = derive2 { name="GGClassification"; version="0.1"; sha256="03wis5ng2mnfhp33xrag8xbmvjagzr1909a6x94wv7s2spji00rp"; depends=[Rcpp RcppEigen]; }; GGEBiplotGUI = derive2 { name="GGEBiplotGUI"; version="1.0-9"; sha256="0nd0ky3m1avy82z48g7hcysq0y0agxjxdn0g624dkm2w99avxw3j"; depends=[rgl tkrplot]; }; GGEBiplots = derive2 { name="GGEBiplots"; version="0.1.1"; sha256="1xnxaylikjd378flw3rqw36z27b2limkmyad97zhf1cbva317d1b"; depends=[gge GGEBiplotGUI ggforce ggplot2 scales]; }; - GGIR = derive2 { name="GGIR"; version="2.0-0"; sha256="10s5q3srmms3h4nwvsdd8clqvifimkqihw5jy5zh03aplwkqwzrq"; depends=[bitops data_table doParallel foreach GENEAread matlab Rcpp signal tuneR zoo]; }; - GGMM = derive2 { name="GGMM"; version="1.0.1"; sha256="1d0qxxdk7b3hzg7dimsbjabpf5rxn3azn2hy00pa1c6wya7kxyvv"; depends=[equSA huge mvtnorm]; }; - GGMncv = derive2 { name="GGMncv"; version="1.1.0"; sha256="1h7mym10z2y3p6k1xkrnxp3442720453h4k8zclz7kvcqbdwwaiq"; depends=[ggplot2 glassoFast MASS numDeriv psych Rcpp RcppArmadillo Rdpack reshape]; }; + GGIR = derive2 { name="GGIR"; version="2.2-0"; sha256="1zqlc49d5ydrz7qj59j7a0yqdvmikicslskxki8fybzdbxn65cya"; depends=[bitops data_table doParallel foreach GENEAread matlab Rcpp signal tuneR unisensR zoo]; }; + GGMncv = derive2 { name="GGMncv"; version="2.0.0"; sha256="1h1h2qx784f41ihmylj8zxhcxcd67r10qpz5938iynnr04mjm6l0"; depends=[ggplot2 glassoFast MASS mathjaxr numDeriv Rcpp RcppArmadillo Rdpack reshape]; }; GGMridge = derive2 { name="GGMridge"; version="1.1"; sha256="0zbfvvp7l836m118m8nmdvw1w7xq6d3b7qirskjsq1dkk23j41hs"; depends=[MASS mvtnorm]; }; GGMselect = derive2 { name="GGMselect"; version="0.1-12.4"; sha256="0p9djnkclnk64bcrd66agi2gw2j3bqvqhamfm0h59b810kh50kbn"; depends=[gtools lars mvtnorm]; }; GGUM = derive2 { name="GGUM"; version="0.4-1"; sha256="09f4vha23z915fn8nj7wj4ry1m7ifqfqig1gbn0vx6kwg1d03whq"; depends=[abind psych Rdpack viridis xlsx]; }; GGally = derive2 { name="GGally"; version="2.0.0"; sha256="1gkmpzh1yvwvypkw0nwqv3gsf6za3220wig3rfv8g23kss60rl1s"; depends=[ggplot2 gtable lifecycle plyr progress RColorBrewer reshape rlang scales]; }; - GHQp = derive2 { name="GHQp"; version="1.0"; sha256="0qpcpwv7rz67qhz1p5k2im02jvs7l8z9sa6ypz13hig5fzm8j9bp"; depends=[statmod]; }; GHS = derive2 { name="GHS"; version="0.1"; sha256="1khjfy62a67r59s2rax9mmnqy5xnnwhbydzhqwwmyspl48mxycdj"; depends=[MASS]; }; + GHap = derive2 { name="GHap"; version="2.0.0"; sha256="0br9civfdlksn5xmyrvz2y0knikcd2i175kddxjdqmiyyayckc8w"; depends=[class data_table e1071 lme4 Matrix]; }; GIFTr = derive2 { name="GIFTr"; version="0.1.0"; sha256="101vr2qasky8hnxp5i3lhlnymwzciypqwvhpl6mrr0r0czgpcz2f"; depends=[glue stringr]; }; GIGrvg = derive2 { name="GIGrvg"; version="0.5"; sha256="0mx4n4kf34343yiww80fw5yy0x624xsj71n8fr4dm0a2338pxq8v"; depends=[]; }; GISTools = derive2 { name="GISTools"; version="0.7-4"; sha256="06alb5d2k4qj344i9cpgm3lz9m68rkmjqfx5k2hzn7z458xjrlxs"; depends=[maptools MASS RColorBrewer rgeos sp]; }; GInSARCorW = derive2 { name="GInSARCorW"; version="1.15.6"; sha256="0rpq8ng9skxg6qzhainsc9jkznql6glq65a1bdbrkc6pwx3pc7lc"; depends=[circular raster rgdal rgeos sp]; }; - GJRM = derive2 { name="GJRM"; version="0.2-2"; sha256="0hwa3nnlk3q810x5gyx9la090vn8fysm9rdv2gg80j8jifzhs48h"; depends=[copula distrEx evd gamlss_dist ggplot2 ismev magic matrixcalc matrixStats mgcv mnormt numDeriv psych Rmpfr scam survey survival trust trustOptim VGAM VineCopula]; }; + GJRM = derive2 { name="GJRM"; version="0.2-3"; sha256="0hmryv66qlj8kzm5d0fh1qjr7gzfy99dh73fy8knv7ph0l2lc6x6"; depends=[copula distrEx evd gamlss_dist ggplot2 ismev magic matrixcalc matrixStats mgcv mnormt numDeriv psych Rmpfr scam survey survival trust trustOptim VGAM VineCopula]; }; GK2011 = derive2 { name="GK2011"; version="0.1.3"; sha256="13vafhbgcsj485f12qv962y07v3hil3pla51vkl2b030amzy86jv"; depends=[]; }; GLDEX = derive2 { name="GLDEX"; version="2.0.0.7"; sha256="1w5ahwbnz9xsn3rdxzcxxvc6m5cgq46nln3i5v8vp4imrs8aafb3"; depends=[cluster]; }; GLDreg = derive2 { name="GLDreg"; version="1.0.7"; sha256="1wjrr4x1k0fz8nx9idb4ysamldypriiypj96b5v028lx38jwsk3l"; depends=[ddst GLDEX]; }; GLIDE = derive2 { name="GLIDE"; version="1.0.2"; sha256="1z5h8br6aig24g5gsh8h6npm269id3h5gjjyf5avs4v08b51rpcv"; depends=[doParallel foreach MASS]; }; GLMMRR = derive2 { name="GLMMRR"; version="0.2.0"; sha256="0s3jfh720acfmbadilq2c6gql3yifsbijpmw1jkzbsdc87pqi1db"; depends=[lattice lme4]; }; - GLMMadaptive = derive2 { name="GLMMadaptive"; version="0.7-0"; sha256="0ngqshbqi2gzykh8ckg8867mqvzlbyjgs31dsz00k7yzs25gc4np"; depends=[MASS matrixStats nlme]; }; + GLMMadaptive = derive2 { name="GLMMadaptive"; version="0.7-15"; sha256="1nshqmwa1imlx0h5nsw69d8lw4bj5gdxdxccfh7h0f12q505yjgl"; depends=[MASS matrixStats nlme]; }; GLMaSPU = derive2 { name="GLMaSPU"; version="1.0"; sha256="0zx2bza5v5cfp9v7hf42s57522b6prawcwl77aa3kvjcnb0ish6g"; depends=[MASS mnormt mvtnorm Rcpp RcppArmadillo]; }; + GLMcat = derive2 { name="GLMcat"; version="0.1.0"; sha256="102yydldnggklx8dw1slm5pdf1c798j8a8pg1rc0mw42yvn75zs8"; depends=[BH Rcpp RcppEigen]; }; GLMpack = derive2 { name="GLMpack"; version="0.1.0"; sha256="15bpw42y999ljdw8ka2ysrrm0y73xz37wwi3j67i01wafipq82xy"; depends=[AER censReg effects foreign lme4 lmtest MASS Matrix nnet pBrackets plm pscl sandwich]; }; GLMsData = derive2 { name="GLMsData"; version="1.0.0"; sha256="12q41zxniblzys20vjrf5skj8cbzlwb92mwk6jvnyd86lc70bsh1"; depends=[]; }; GLSME = derive2 { name="GLSME"; version="1.0.5"; sha256="18gixzg8b8yql91dhv8xsrcrxdix0kr0qgmiva0hwmyzpsn6rqam"; depends=[corpcor mvtnorm]; }; @@ -1642,13 +1699,14 @@ in with self; { GMDH = derive2 { name="GMDH"; version="1.6"; sha256="093glyz73246m5f2xb2xgbgi80haj4fanmr325byr99dnf4x35yn"; depends=[MASS]; }; GMDH2 = derive2 { name="GMDH2"; version="1.5"; sha256="0y132zc8q4daj4856xikp4xvrqcibmn9r2shnmwpwxnfbik2ikfb"; depends=[e1071 glmnet magrittr MASS nnet plotly randomForest xtable]; }; GMDHreg = derive2 { name="GMDHreg"; version="0.2.1"; sha256="1rav4xhli8gy27sa5zh3lvpgz6zpff37783z1k23n0xf4n0h61nh"; depends=[]; }; - GMKMcharlie = derive2 { name="GMKMcharlie"; version="1.0.3"; sha256="1ncz3czjg1md1hfahc2403k33nby11ldlq0yixpjs4s8panwpgsb"; depends=[Rcpp RcppArmadillo RcppParallel]; }; - GMMAT = derive2 { name="GMMAT"; version="1.2.0"; sha256="09zvqak85242xkkfwkhw8r3j8wj6s3zx5w2rcx26gn9lgifmfdhz"; depends=[CompQuadForm foreach Matrix Rcpp RcppArmadillo SeqArray SeqVarTools]; }; + GMKMcharlie = derive2 { name="GMKMcharlie"; version="1.1.1"; sha256="1adra4qjq0xriyg08zyh9f99x1sry59kmvrissb0kssaqs4r7gk9"; depends=[Rcpp RcppArmadillo RcppParallel]; }; + GMMAT = derive2 { name="GMMAT"; version="1.3.1"; sha256="0p1wl9wppddggn0hrxmhy3jbw42n9h52jjwijjha5zmhjjlr665b"; depends=[CompQuadForm foreach Matrix Rcpp RcppArmadillo SeqArray SeqVarTools]; }; GMMBoost = derive2 { name="GMMBoost"; version="1.1.3"; sha256="0p9jnwjc8g83qsxkjz9lhaip1hkpdg6n4fdpz34b96vb7qhzrrqc"; depends=[magic minqa]; }; GMPro = derive2 { name="GMPro"; version="0.1.0"; sha256="0xhja221wz89cm76qbq01nqz73jx7d2zx9i2ky5vd31zkspmlqkm"; depends=[combinat igraph transport]; }; GMSE = derive2 { name="GMSE"; version="0.6.0.4"; sha256="1q3laiyrkps9v51hlhyvmam9a5a1djmxkgjl562p46fszk1hm17n"; depends=[shiny shinydashboard shinyjs]; }; GMSimpute = derive2 { name="GMSimpute"; version="0.0.1.0"; sha256="1hmn5ss81df9j9ibgibs95j98irqzif94vq0c861mq4a65y59fcp"; depends=[ggplot2 glmnet reshape2]; }; - GNAR = derive2 { name="GNAR"; version="1.1.0"; sha256="14vp64wlpi0z0h3rwfncdmnrhz57nmv1d6n3b0zi1kmylmpng2sw"; depends=[igraph wordcloud]; }; + GMZTests = derive2 { name="GMZTests"; version="0.1.3"; sha256="0crvgjx47fbv3lnc7h8ra8x04yr9gz4nppn9z7j4860qpwr8f890"; depends=[DCCA fgpt fitdistrplus nonlinearTseries PerformanceAnalytics tseries]; }; + GNAR = derive2 { name="GNAR"; version="1.1.1"; sha256="1ryiv671nhhhif8xqj8lx6jfh503ayqvldnmzkwfma2ww1518y08"; depends=[igraph wordcloud]; }; GNE = derive2 { name="GNE"; version="0.99-3"; sha256="11pk9w4xj27dyfn05bna99xqdb89wp0ljl798d5dyk5fcnhh7217"; depends=[alabama BB nleqslv SQUAREM]; }; GNRS = derive2 { name="GNRS"; version="0.1.0"; sha256="05iclnrdcp4i6h8lfkw4dbkl0qmm814rvb621ypq4w5r4g96h72r"; depends=[jsonlite RCurl rjson]; }; GNSSseg = derive2 { name="GNSSseg"; version="6.0"; sha256="1zkj98xh63wfyyygg2ahq3m54xlvi3x9sy0rhcn2dlfvbxaxfl4k"; depends=[capushe robustbase]; }; @@ -1656,14 +1714,15 @@ in with self; { GOGANPA = derive2 { name="GOGANPA"; version="1.0"; sha256="1xbir21zvr5hv2y6nndzpsrpmnr7glrc7y6xgcyb856wx46ajan9"; depends=[GANPA WGCNA]; }; GORCure = derive2 { name="GORCure"; version="2.0"; sha256="1hazin0q74hf16azxa5h08kfj7g1079q77n2fn4fahpfxb8hmvwm"; depends=[ICsurv MASS pracma survival]; }; GOplot = derive2 { name="GOplot"; version="1.0.2"; sha256="1y8dv0kbzpr9za91njw0x233vx5d13vqml9hmpddcyi9s6va5nix"; depends=[ggdendro ggplot2 gridExtra RColorBrewer]; }; + GOxploreR = derive2 { name="GOxploreR"; version="1.1.0"; sha256="1a3333d94xrj8iavn2yawgb8x296ilji3drcwwvrjs7v7rib0k5f"; depends=[annotate biomaRt dplyr ggnetwork ggplot2 GO_db gontr igraph network]; }; GPArotation = derive2 { name="GPArotation"; version="2014.11-1"; sha256="15jh5qqqwx47ara6glilzha87rnih0hs5fsz0jjqwv6wr1gw26rm"; depends=[]; }; GPCMlasso = derive2 { name="GPCMlasso"; version="0.1-4"; sha256="1ff49549cxrylicqgmf1b4gdqqhj8lk5fw0rzyni8ip970bfbkw9"; depends=[caret cubature ltm mirt mvtnorm Rcpp RcppArmadillo statmod TeachingDemos]; }; - GPCSIV = derive2 { name="GPCSIV"; version="0.1.0"; sha256="118l792mwd54xsi3g8afg3vc6wds8j6fyaz3mwmq04mlcyblym4l"; depends=[scatterplot3d sqldf]; }; GPFDA = derive2 { name="GPFDA"; version="2.2"; sha256="1xqk03g8b8hi1vdqh6a9wml8ln0ad6lmy14z8k8c4wdc5kbzdr0b"; depends=[fda fda_usc MASS spam]; }; GPGame = derive2 { name="GPGame"; version="1.1.0"; sha256="00qiqd7p84k22wbmlmj8a81fy5m5rl6afhj2q61j0akicnbzjfw9"; depends=[DiceDesign DiceKriging GPareto KrigInv MASS mnormt mvtnorm Rcpp]; }; GPL2025 = derive2 { name="GPL2025"; version="1.0.1"; sha256="0af42g3v91fbcmla2yq98v8rd4ifaznb1xvw7ny41r3843d8appc"; depends=[dplyr]; }; GPLTR = derive2 { name="GPLTR"; version="1.2"; sha256="0b4s090jlp2qpqqr0b1ifwyf2fal156y7vg9mjkw53y623ms5pix"; depends=[rpart]; }; GPM = derive2 { name="GPM"; version="3.0.1"; sha256="01vd68w5pnwhng83x5i0k9c5fhsn9siyzzndkvkmpis4mjm42sgv"; depends=[doParallel foreach iterators lattice lhs pracma randtoolbox Rcpp RcppArmadillo]; }; + GPP = derive2 { name="GPP"; version="0.1"; sha256="1qryza8mamwzwqiy31drf176w192ksw34kpsa0wc8gsp3ylkm2f9"; depends=[rstan]; }; GPRMortality = derive2 { name="GPRMortality"; version="0.1.0"; sha256="0k5pfyl7r5vsac927aqx19lz93vyk5l3ydqkazn2hwwaw1lh2wav"; depends=[rstan]; }; GPSCDF = derive2 { name="GPSCDF"; version="0.1.1"; sha256="1l50a6p81lykiqlqiwb6kix5s6wzwdi8vddqhl418dlwlsh83ybf"; depends=[dplyr MASS nbpMatching nnet survival]; }; GPSeqClus = derive2 { name="GPSeqClus"; version="1.0.0"; sha256="1zxihac4hd2b1vvrb36v2c6lhn8pfs8q4zgzi2flyb0dnb5di09r"; depends=[geosphere leaflet leaflet_extras plotKML plyr purrr rgdal sp spacetime suncalc]; }; @@ -1678,6 +1737,7 @@ in with self; { GRANCore = derive2 { name="GRANCore"; version="0.2.7"; sha256="0xnm7jb2s4ag4qvsfs1fq0f2ikvfqm3bvxhj8kmmxwynwl5pw287"; depends=[switchr]; }; GRAPE = derive2 { name="GRAPE"; version="0.1.1"; sha256="1jzvf45ch8x8f2x9kmvv02xz9bix5vplh8143vc4m1yyq42x09c6"; depends=[]; }; GRCdata = derive2 { name="GRCdata"; version="1.0"; sha256="0nshii6kfvffncgcrmm7wvniq94j9djj84jikcb6ck49viikkrky"; depends=[cubature nloptr]; }; + GREMLINS = derive2 { name="GREMLINS"; version="0.2.0"; sha256="0wdqikz6k5d2cxcb347lhy7rj54blgf1m4sjv64zd4nx6c4r0ai8"; depends=[aricode blockmodels igraph mclust pbmcapply R6]; }; GROAN = derive2 { name="GROAN"; version="1.2.0"; sha256="14n3k1wwz5pn82wcj00cdns4bp699f58k1nj8hp8jn0q7xr2sgv5"; depends=[plyr rrBLUP]; }; GRPtests = derive2 { name="GRPtests"; version="0.1.0"; sha256="1l03rr20xbl6gdj8k3rmmj13basnbmkl80hphldcnmg5iklyqyha"; depends=[glmnet MASS randomForest RPtests]; }; GRS_test = derive2 { name="GRS.test"; version="1.1"; sha256="1ap9453rj5zan6c3ix7jb1qxhxh42bfv295dgqbgjpdygjdlbm6n"; depends=[]; }; @@ -1692,7 +1752,7 @@ in with self; { GSIF = derive2 { name="GSIF"; version="0.5-5.1"; sha256="1nc177f200m3wfppmdh9cf6g2npx87c0mz2g17zdrw5crx688i8d"; depends=[aqp dismo gstat plotKML plyr raster rgdal RSAGA scales sp]; }; GSM = derive2 { name="GSM"; version="1.3.2"; sha256="04xjs9w4gaszwzxmsr7657ry2ywa9pvpwpczpvinxi8vpj347jbb"; depends=[gtools]; }; GSMX = derive2 { name="GSMX"; version="1.3"; sha256="1n1d7rixj14ari46snsmi48qfmy00ihmzvayk3hkrp2d2d0xi2gh"; depends=[MASS]; }; - GSODR = derive2 { name="GSODR"; version="2.1.1"; sha256="1x996cpbq0ms9l94kw02c9aa8by0y0j8jsqff6fpndhyppjk59yv"; depends=[countrycode curl data_table future_apply httr R_utils]; }; + GSODR = derive2 { name="GSODR"; version="2.1.2"; sha256="0kppdg0si05mfg6rn1zl9q6slq9287fad9hprkc5a462ns2d1hag"; depends=[countrycode curl data_table future_apply httr R_utils]; }; GSSE = derive2 { name="GSSE"; version="0.1"; sha256="034mmxa6kjq5kgikhb5q75viagz5ck9irrjbxm26zq9099qxm13b"; depends=[Iso zoo]; }; GSelection = derive2 { name="GSelection"; version="0.1.0"; sha256="052vh1haxlzbh3c5i24nrwphapik1y8ribmh6q4axd447ggc0ff9"; depends=[gdata penalized SAM]; }; GSparO = derive2 { name="GSparO"; version="1.0"; sha256="0xna2crxqwy8fj0s79rxbdcaz9x912rp1vdwqv1557fsnmfv2yf0"; depends=[ggplot2 ThreeWay]; }; @@ -1705,15 +1765,15 @@ in with self; { GWASExactHW = derive2 { name="GWASExactHW"; version="1.01"; sha256="19qmk8h7kxmn9kzw0x4xns5p3qqz27xkqq4q6zmh4jzizd0fsl78"; depends=[]; }; GWASbyCluster = derive2 { name="GWASbyCluster"; version="0.1.7"; sha256="0ivlkxbh8m23vbnjfmhk0vfczd5b8lzy9w4gm1m6jpvdm40kn70x"; depends=[Biobase limma rootSolve snpStats]; }; GWASinlps = derive2 { name="GWASinlps"; version="1.2"; sha256="036lv8f58kz6qdwaviyk1q1qsgcj9cimipq1cjrfpn8snkn7s1gh"; depends=[horseshoe mombf speedglm]; }; - GWASinspector = derive2 { name="GWASinspector"; version="1.4.8"; sha256="00495z13r7z5yzpkc4vqqxidkk463n7xlz3mm8a4483zbk7p4l1x"; depends=[data_table futile_logger ggplot2 gridExtra hash ini kableExtra knitr R_utils rmarkdown RSQLite]; }; + GWASinspector = derive2 { name="GWASinspector"; version="1.4.8.2"; sha256="10kd09rijlwib9ssfgn8mkql1wqwhvp823iw1qi0mnwv2ilrsmxi"; depends=[data_table futile_logger ggplot2 gridExtra hash ini kableExtra knitr R_utils rmarkdown RSQLite]; }; GWEX = derive2 { name="GWEX"; version="1.0.2"; sha256="0iykciifbskcrx1qv4874nxli1sq6nbmlfinq4ksir3p93y7ds87"; depends=[abind doParallel EnvStats fGarch foreach lmomco MASS mvtnorm nleqslv Renext]; }; GWG = derive2 { name="GWG"; version="1.0"; sha256="1va0cd229dhhi1lmrkpwapcm96hrdmxilrmba02xnl7ikhisw0my"; depends=[]; }; GWLelast = derive2 { name="GWLelast"; version="1.2.2"; sha256="1nm4w5m4ca6npmpvh9nb0cnrbzlyv95nvvhgs3pqcrw4igagm4hj"; depends=[doParallel foreach geosphere glmnet sp spgwr]; }; GWRM = derive2 { name="GWRM"; version="2.1.0.3"; sha256="16ahlf1pbcpgha50a7ml2c336by50r287kihwshiazshifi5p3n3"; depends=[doParallel foreach]; }; - GWSDAT = derive2 { name="GWSDAT"; version="3.0.3"; sha256="10xvnnhqjs2p1r6yzflhkfi4985ljs57k5k8r6g85y2hq46m80p8"; depends=[deldir digest geometry Kendall lattice MASS Matrix officer readxl rhandsontable sf shiny shinycssloaders shinydashboard shinyjs sm sp splancs zoo]; }; - GWmodel = derive2 { name="GWmodel"; version="2.1-4"; sha256="13gm37b43m6i8j0qz4k7lv0myamap88s38fn6m664683bpw8il7h"; depends=[FNN maptools Rcpp RcppArmadillo robustbase sp spacetime spatialreg spdep]; }; - GWnnegPCA = derive2 { name="GWnnegPCA"; version="0.0.2"; sha256="0aa3lzzgbfy13fc19aq80dj09nwb1r6i2c8iarbhakyc75956npl"; depends=[GWmodel nsprcomp sf sp]; }; - GWpcor = derive2 { name="GWpcor"; version="0.1.2"; sha256="0gq7fjdry7wysx2x2amzvfz1fs7l0511incgdajyxxi9mls3wcp3"; depends=[corpcor doParallel dplyr foreach GWmodel sf sp]; }; + GWSDAT = derive2 { name="GWSDAT"; version="3.0.5"; sha256="1j68jyp3528apdi5nb6m4a04x5lf0k1krfg3vmc7r31ylk71q0jm"; depends=[deldir digest geometry Kendall lattice lubridate MASS Matrix officer raster readxl rhandsontable sf shiny shinycssloaders shinydashboard shinyjs sm sp splancs zoo]; }; + GWmodel = derive2 { name="GWmodel"; version="2.2-2"; sha256="01lagyqns2kd5myw4x9amk5ayjfqvqvw2mzhqkzjij7vhldj4asf"; depends=[FNN maptools Rcpp RcppArmadillo robustbase sp spacetime spatialreg spdep]; }; + GWnnegPCA = derive2 { name="GWnnegPCA"; version="0.0.4"; sha256="1yinzlp22z9z5fk9f1nm14i408yfm5kfgkn3pqnh4bkghs569ivg"; depends=[geodist nsprcomp pracma sf sp spData]; }; + GWpcor = derive2 { name="GWpcor"; version="0.1.5"; sha256="0ci8fjp3k3vpyq83z1vgi23cfc1n5vr757rjbxg7rbnqn43g9dfl"; depends=[corpcor doParallel dplyr foreach geodist pracma sf sp]; }; GWsignif = derive2 { name="GWsignif"; version="1.2"; sha256="0bss5s3ijnlckz44p7jj49bn2r8nwqckpzwzcv0vci915q8jfsj2"; depends=[]; }; GaDiFPT = derive2 { name="GaDiFPT"; version="1.0"; sha256="15fnj1w30h0zdj032f3js0bbb1qlyk4b54a4aclykwzicqdgalkg"; depends=[]; }; GameTheory = derive2 { name="GameTheory"; version="2.7"; sha256="0vb7sjia5s58gw9zpkzddps8knxvbrz7fbi3m6digl8bf5vwhxxw"; depends=[combinat gtools ineq kappalab lpSolveAPI]; }; @@ -1724,9 +1784,9 @@ in with self; { GaussianHMM1d = derive2 { name="GaussianHMM1d"; version="1.0.1"; sha256="1j1cwh0p7czy2l4qf6nymqcp8kkfaki0j2rj8p99nqn2vgc3vcax"; depends=[doParallel foreach]; }; GeDS = derive2 { name="GeDS"; version="0.1.3"; sha256="1ddq4hnyl3m3s4cchccxiqphi742ljcm86zqpa01a5nrjbnr87x6"; depends=[Matrix Rcpp Rmpfr]; }; GeNetIt = derive2 { name="GeNetIt"; version="0.1-4"; sha256="1z9h3prlf5r7ks0ys4wy0i5i3giaplqmngsqwxllsy70jjb9s90h"; depends=[exactextractr nlme raster rgeos sf sp spdep]; }; - GenAlgo = derive2 { name="GenAlgo"; version="2.1.5"; sha256="0d3y9kc2njsbzdngv67d4qrdsnn7nsxph5acc09vmwxpv1cyhxiw"; depends=[ClassDiscovery MASS oompaBase]; }; + GenAlgo = derive2 { name="GenAlgo"; version="2.2.0"; sha256="1pihqxif2v62hwf5761fshyhigcjmlgbvp2j7immxlsysjfw5xgq"; depends=[ClassDiscovery MASS oompaBase]; }; GenBinomApps = derive2 { name="GenBinomApps"; version="1.1"; sha256="1w6k02bkawk7la7yjj8xby8w2a303gfk18xz08c7gka9a3m1lxqx"; depends=[]; }; - GenEst = derive2 { name="GenEst"; version="1.4.4"; sha256="17yqf3bd7cwkv3m2gk3zd5pf6jafps82x85qj2bpqp08ca6j6fli"; depends=[corpus DT gsl gtools hellno htmltools htmlwidgets lubridate MASS matrixStats mvtnorm Rcpp shiny shinyjs survival]; }; + GenEst = derive2 { name="GenEst"; version="1.4.5"; sha256="176yzgd4xbiypr0w0bywsld2zz7c7bg6c94mk3i7jdvl5csw2ghl"; depends=[corpus DT gsl gtools hellno htmltools htmlwidgets lubridate MASS matrixStats mvtnorm Rcpp shiny shinyjs survival]; }; GenForImp = derive2 { name="GenForImp"; version="1.0"; sha256="1wcvi52fclcm6kknbjh4r9bpkc2rg8nk6cddnf5j8zqbvrwf4k5x"; depends=[mvtnorm sn]; }; GenKern = derive2 { name="GenKern"; version="1.2-60"; sha256="12qmd9ydizl7h178ndn25i4xscjnrssl5k7bifwv94m0wrgj4x6c"; depends=[KernSmooth]; }; GenOrd = derive2 { name="GenOrd"; version="1.4.0"; sha256="17mfrj1fwj8mri1w0bl2pw1rqriidmd67i7gpn9v56g9dzw5rzms"; depends=[MASS Matrix mvtnorm]; }; @@ -1741,7 +1801,7 @@ in with self; { GeneralOaxaca = derive2 { name="GeneralOaxaca"; version="1.0"; sha256="19j5c5xr6mdb6pmih94wbjas4yh0dmsqfggg8clvdxkpwk0h338v"; depends=[boot]; }; GeneralisedCovarianceMeasure = derive2 { name="GeneralisedCovarianceMeasure"; version="0.1.0"; sha256="02s1wbsdp5ma4pnmcsdl5dwm156zx12d3n1ypzkc33lxg21ashzj"; depends=[CVST kernlab mgcv xgboost]; }; GeneralizedHyperbolic = derive2 { name="GeneralizedHyperbolic"; version="0.8-4"; sha256="01gqfvmzfslhxdnigzbl3rd55hk6r0kgd8fm9xjl0kb9vmb735lm"; depends=[DistributionUtils MASS]; }; - GeneralizedUmatrix = derive2 { name="GeneralizedUmatrix"; version="1.1.9"; sha256="02wbs1q9wzzgbfnx8nfc8wiyqim8vznlps3w91hgx7s28biq37n7"; depends=[ggplot2 Rcpp RcppArmadillo]; }; + GeneralizedUmatrix = derive2 { name="GeneralizedUmatrix"; version="1.2.1"; sha256="0dbrm0cfnvp38jkvcc0ib77bjqng9p1czbd2d1i4pdrnwb64xdx6"; depends=[ggplot2 Rcpp RcppArmadillo]; }; GeneticSubsetter = derive2 { name="GeneticSubsetter"; version="0.8"; sha256="0bd4snv3dwabc7mknmd2rjmffj67xq535x0bycajhd83d1jhjars"; depends=[]; }; GenoScan = derive2 { name="GenoScan"; version="0.1"; sha256="0p98imfvvz7l94kim3pxypyjs2pbxng4a2nagbafbady82ylr2vi"; depends=[data_table MASS Matrix seqminer SKAT]; }; GenomicMating = derive2 { name="GenomicMating"; version="2.0"; sha256="02v1pkarmardf7g8hf2n4jj4cq4707g5lcc7gnwsiyyh7pknd1y6"; depends=[dplyr emoa kohonen LowRankQP magrittr plotly qtl Rcpp RcppArmadillo scatterplot3d SOMbrero]; }; @@ -1753,21 +1813,22 @@ in with self; { GeoMongo = derive2 { name="GeoMongo"; version="1.0.1"; sha256="19wim724sgmxx9rd5yvmqdml0hppb92b8qvpl5zqrlnzxzm0ih5x"; depends=[data_table geojsonR R6 reticulate]; }; GeoRange = derive2 { name="GeoRange"; version="0.1.0"; sha256="0krj9570wkhdvpaqkq3nf0maglqd44mpwn4v1bymvgpk1i1wf5p3"; depends=[moments proj4 raster sp velociraptr]; }; GeoTcgaData = derive2 { name="GeoTcgaData"; version="0.2.4"; sha256="03m669vy0yj9rj524dkrgkqyhjzwc0xckm3zd1272a48jyc1jywd"; depends=[data_table]; }; + GeodRegr = derive2 { name="GeodRegr"; version="0.1.0"; sha256="1wr2n1lkn42vix9jfpw1k7y70lvl3qbqzm0kzvq6yyxnl30sirgs"; depends=[zipfR]; }; GeomComb = derive2 { name="GeomComb"; version="1.0"; sha256="05xb6m2ciszxd13yhqdkildh9nsq19ss8885ngj6ynvbchqkii7r"; depends=[forecast ForecastCombinations ggplot2 Matrix mtsdi psych]; }; - GermaParl = derive2 { name="GermaParl"; version="1.5.1"; sha256="0mlzmjxnhql3691km3kr0b70g4hfxa7zhsfnndzdinrckzj5mn0w"; depends=[cwbtools zen4R]; }; - GerminaR = derive2 { name="GerminaR"; version="1.4.2"; sha256="1sppkh42yj5p9kwlpiq3l1v720idbc9ni82m1hbdf9bg49h1gf3i"; depends=[agricolae assertthat dplyr DT ggplot2 gsheet gtools magrittr purrr readxl shiny shinydashboard tibble tidyr]; }; + GermaParl = derive2 { name="GermaParl"; version="1.5.2"; sha256="1046zglr72xvv2jfyilrzv5isch867rxg33iq56b5jn8xr3b6780"; depends=[cli cwbtools zen4R]; }; + GerminaR = derive2 { name="GerminaR"; version="2.0.1"; sha256="0d8waa20s0l56ckns2za5vgcny4r75lhb12jy32hq4nv5fh8krh6"; depends=[agricolae dplyr ggplot2 gtools purrr shiny tibble tidyr]; }; GetBCBData = derive2 { name="GetBCBData"; version="0.5"; sha256="1i5b5sawa8ngjp1afm1grm9hbmkhd5pcwqagkamlihsrmsvcdffn"; depends=[curl dplyr furrr future jsonlite lubridate memoise purrr RCurl readr stringr]; }; GetDFPData = derive2 { name="GetDFPData"; version="1.5.3"; sha256="1l2zhay8r16pwmprjmvk4agr0l1ysbvvf99abcihvd1i117ixarq"; depends=[curl dplyr lubridate readr reshape2 stringr tibble xlsx XML]; }; GetLattesData = derive2 { name="GetLattesData"; version="1.4"; sha256="129hnhmw8aw81whyj3g7npwgmg4fmvsji9h2xfg78nrp0abjxijv"; depends=[curl dplyr readr stringdist stringr XML]; }; GetQuandlData = derive2 { name="GetQuandlData"; version="0.1.0"; sha256="1g1as4m853ab1wp57rzqm0552g0vm7kxzypibv0xywc85084pnmc"; depends=[dplyr jsonlite memoise purrr readr scales stringr]; }; GetR = derive2 { name="GetR"; version="0.1"; sha256="1b2wirhz4nhvmf863czwb8z8b42ilsyjjrg9rc4nd9b7nz50bmjg"; depends=[party]; }; GetTDData = derive2 { name="GetTDData"; version="1.4.2"; sha256="1qz75hq1c89riq0jpzjkr9gbk5y7894kb0ydhdyji7kjl1kvgyvx"; depends=[bizdays curl RCurl readxl rvest stringi stringr tidyr XML xml2]; }; - GetoptLong = derive2 { name="GetoptLong"; version="1.0.2"; sha256="1p89v2qzqfxyrmqzkv245716n9i4bllnq77a6gw811mgdhxbd51l"; depends=[crayon GlobalOptions rjson]; }; + GetoptLong = derive2 { name="GetoptLong"; version="1.0.5"; sha256="00fpm6nd3kqa2ikasxa62jzywi46fvvmx1mdavcp5yrxxn37j8wc"; depends=[crayon GlobalOptions rjson]; }; Ghat = derive2 { name="Ghat"; version="0.1.0"; sha256="1w5agphnbngc0ldb3gbgh4b8ww956lf31bfyxw2zp56crx4akcxf"; depends=[rrBLUP]; }; Ghost = derive2 { name="Ghost"; version="0.1.0"; sha256="0anrb1n3f3jnq2p0dgqzw5a0gby2slafv2bybgy5gm3f9fsj831w"; depends=[R6]; }; - GiANT = derive2 { name="GiANT"; version="1.3"; sha256="01dzjlcbl6byqa1vxalhr6fpf2vczd38dn1q77c4jgcfz2a25wqz"; depends=[]; }; + GiANT = derive2 { name="GiANT"; version="1.3.1"; sha256="0788c7yxbi804c2r05hf5dys9lnr961zs835w7siprgwbvnv6apn"; depends=[]; }; GiNA = derive2 { name="GiNA"; version="1.0.1"; sha256="0his7wsgnggyv9526blxzxa1ni8hwq2ws64wkmha45nvvnm3dsiw"; depends=[doParallel EBImage foreach png]; }; - GiRaF = derive2 { name="GiRaF"; version="1.0"; sha256="02356cq0g6v5m72fy5z83bw3nsb7kpc9sy7sykk97735n928z92n"; depends=[BH Rcpp RcppArmadillo]; }; + GiRaF = derive2 { name="GiRaF"; version="1.0.1"; sha256="1m19jxr6h485v32iqq260cizf30cgrx3pk802r73fbp3ssj7nmvh"; depends=[BH Rcpp RcppArmadillo]; }; GibbsACOV = derive2 { name="GibbsACOV"; version="1.1"; sha256="1ikcdsf72sn1zgk527zmxw3zjhx0yvkal6dv001cgkv202842kll"; depends=[MASS]; }; Gifi = derive2 { name="Gifi"; version="0.3-9"; sha256="0rwyj60cldf3k118cnc5px16dc5p5bfxgl0w2m1lh6rsqlmza25a"; depends=[colorspace]; }; GillespieSSA = derive2 { name="GillespieSSA"; version="0.6.1"; sha256="0li0jqnbl9rfj8gbspq7fv327fii53rh93ffsxpic7804rmrnbi7"; depends=[]; }; @@ -1782,21 +1843,21 @@ in with self; { Gmedian = derive2 { name="Gmedian"; version="1.2.5"; sha256="0xx8x4g6wb9djmkx3q1bwwa1vgf10avi6ka3x1jzgsxk6x0jsx0i"; depends=[Rcpp RcppArmadillo robustbase RSpectra]; }; Gmisc = derive2 { name="Gmisc"; version="1.11.0"; sha256="1fyjyd75mk21y6nfjai1bg3g37sdz27w6vghhcr9zxhlcnwdb6id"; depends=[abind checkmate forestplot glue Hmisc htmlTable knitr lattice lubridate magrittr Rcpp rmarkdown stringr XML yaml]; }; GoFKernel = derive2 { name="GoFKernel"; version="2.1-1"; sha256="0xygsdmggl35fafyp431mkwalwixw2r3f32qll1pf72dfwd8y8d3"; depends=[KernSmooth]; }; - GofKmt = derive2 { name="GofKmt"; version="2.1.1"; sha256="11dspnx1cljbbwk4xhg1l5vv2c8q24k294c122rdgc2zqp8k2c04"; depends=[ggplot2 Rcpp RcppArmadillo Rsolnp]; }; + GofKmt = derive2 { name="GofKmt"; version="2.2.0"; sha256="1v9n1hfracincgaip7pym2l9h54azajw4fmsld0ff2rsd5np362z"; depends=[ggplot2 Rcpp RcppArmadillo Rsolnp]; }; GomoGomonoMi = derive2 { name="GomoGomonoMi"; version="0.1.0"; sha256="16kvf355yzpv0z2rndc5f50pxjnav6ld48j40vyip4h353wpwaks"; depends=[glue htmltools]; }; GoodmanKruskal = derive2 { name="GoodmanKruskal"; version="0.0.3"; sha256="1d0xkmkcfcwx0qs8m4b9dgrbkg1qpb859mmzg4d1rww8rc0wxh9h"; depends=[classInt corrplot]; }; GoogleKnowledgeGraphR = derive2 { name="GoogleKnowledgeGraphR"; version="0.1.0"; sha256="1jxiq1s48skn43pydsw8s67hf70v9fhhw2drcx9vni3c3szs44qd"; depends=[curl jsonlite]; }; - GpGp = derive2 { name="GpGp"; version="0.2.2"; sha256="03lkk4mi5d1gm3wz9ngvndzjylrgx76vlh8xjnm0wmd5y4ncbk8a"; depends=[FNN Rcpp RcppArmadillo]; }; + GpGp = derive2 { name="GpGp"; version="0.3.1"; sha256="0wp4b2sh52h99j24vimbah0iip6hhdjim5lfhzwan2vjpg9j3fjd"; depends=[BH FNN Rcpp RcppArmadillo]; }; Grace = derive2 { name="Grace"; version="0.5.3"; sha256="0r41zvgdd5rqm15axqqssik6plwy7snpgw8m32labkfn3f0pp7n0"; depends=[glmnet MASS scalreg]; }; GraphPCA = derive2 { name="GraphPCA"; version="1.1"; sha256="0x6j3lyd70zc0c1al1407ma8crzi174d5dqkz6lx4vx24knrlhbs"; depends=[FactoMineR ggplot2 ggplot2movies scatterplot3d]; }; - GrapheR = derive2 { name="GrapheR"; version="1.9-86"; sha256="1iizknyrpgiz1fh1fjls58n5v5fpki25j7kfbwfkp5ijf1q54ml6"; depends=[]; }; + GrapheR = derive2 { name="GrapheR"; version="1.9-86-3"; sha256="0wpq7w4lclkzj9ffmqwk2qp5r6kwggh7by47lvhmai4j8g2ha56c"; depends=[]; }; GrassmannOptim = derive2 { name="GrassmannOptim"; version="2.0"; sha256="05r5zg4kf3xd6pp56bl8ldchdxvspxkdfd33b623hndjhn4lj2lq"; depends=[Matrix]; }; GreedyEPL = derive2 { name="GreedyEPL"; version="1.0"; sha256="19b8fwxsjd6shwjxhpawa8pmlj6yn0j4577g6b93xbcs76wgrvd1"; depends=[Rcpp RcppArmadillo]; }; - GreedyExperimentalDesign = derive2 { name="GreedyExperimentalDesign"; version="1.2"; sha256="1x3hnyqq75krlygg82qm0ldd8nsv071nzgr63zkjmifc7hgi0nvb"; depends=[GreedyExperimentalDesignJARs rJava]; }; + GreedyExperimentalDesign = derive2 { name="GreedyExperimentalDesign"; version="1.4"; sha256="0j2grrnd4yn4d1ly62dzqq0y7l7mh3lpnlfpf5n41a9w489m03hw"; depends=[checkmate GreedyExperimentalDesignJARs kernlab nbpMatching Rcpp rJava survey]; }; GreedyExperimentalDesignJARs = derive2 { name="GreedyExperimentalDesignJARs"; version="1.0"; sha256="14i6m5qlh1fca9xmzid01hicd3bkf6rzl139ss78gvw544zrapw7"; depends=[rJava]; }; GreedySBTM = derive2 { name="GreedySBTM"; version="1.0"; sha256="1r29cd8nxpyc82rz2xb9mk9wc17gcdlcl9lw1j3y4npr2z0qhf13"; depends=[Rcpp RcppArmadillo]; }; Greg = derive2 { name="Greg"; version="1.3.4"; sha256="1s46arnraj9xc98kxj0av64jjg0khxjrvgj1gjqz5f6bw2bxmkm3"; depends=[Epi forestplot Gmisc Hmisc htmlTable knitr magrittr nlme rms sandwich stringr]; }; - GridOnClusters = derive2 { name="GridOnClusters"; version="0.0.7"; sha256="009h5yx81by6jscvibkxb2j5xi4wqarcrw0504yxdnmgi8w3khmr"; depends=[cluster dqrng fossil Rcpp]; }; + GridOnClusters = derive2 { name="GridOnClusters"; version="0.0.8"; sha256="16wr7zssiy6y0hvg2s7vhy30qxq5ja8yplv8xncn6iz8giy1wdww"; depends=[cluster dqrng fossil plotrix Rcpp Rdpack]; }; GriegSmith = derive2 { name="GriegSmith"; version="1.0"; sha256="1a7gnaig1wvxpph7d8c37kx51dznzk0457fzf7alw95iwpyb4z7j"; depends=[spatstat]; }; GrimR = derive2 { name="GrimR"; version="0.5"; sha256="005ywc31yn1cs54kjlkrryw0s7zm8dqqfjkdlkm4s1sbc9r3mssz"; depends=[car]; }; GroupBN = derive2 { name="GroupBN"; version="0.2.0"; sha256="0aql2ggcyrdpr02bq88xcnpq9jr33iawhwsdi93pzks94hvi8wwz"; depends=[arules bnlearn ClustOfVar magrittr MLmetrics PCAmixdata plyr PRROC rlist stringr visNetwork zoo]; }; @@ -1808,8 +1869,9 @@ in with self; { GuardianR = derive2 { name="GuardianR"; version="0.9"; sha256="0z0bgm3kr7yqx0yfzhs07k1gs97zpjajfnxn1w1m5w76s7czfzl7"; depends=[RCurl RJSONIO]; }; Guerry = derive2 { name="Guerry"; version="1.7.0"; sha256="0r92xs1ps48yznc146gqmdvz47zvlqfb14yz2ys8bjlk0wna9agv"; depends=[sp]; }; GuessCompx = derive2 { name="GuessCompx"; version="1.0.3"; sha256="1xbkh1wh2z0n964w8lwi7q4rr7mls0awf5k7n5jjklhq4b6gswic"; depends=[boot dplyr ggplot2 lubridate reshape2]; }; + GxEScanR = derive2 { name="GxEScanR"; version="2.0.2"; sha256="0k3avad4b2x4sqv8iilx5a8gkybjlipx50mj0la4kl9xv0azshkd"; depends=[prodlim Rcpp RcppArmadillo]; }; GxM = derive2 { name="GxM"; version="1.1"; sha256="02rv8qb46ylk22iqn9cgh63vkyrg9a8nr1d0d3j5hqhi0wyhc41r"; depends=[minqa nlme Rcpp]; }; - HAC = derive2 { name="HAC"; version="1.0-7"; sha256="066d0hrhqx3m7ksc136r12wfwscbhj2wi0ibgrsqqbgkpdd9fc8g"; depends=[copula numDeriv]; }; + HAC = derive2 { name="HAC"; version="1.0-8"; sha256="04pp3xanw8bm5i3fpxg2j6h4qrff81087jmid5grgzs1pgd59p1c"; depends=[copula numDeriv]; }; HACSim = derive2 { name="HACSim"; version="1.0.5"; sha256="0161h3yhi3bh0jq7x105p3rjlrvl46k4iahfz4k84wsvw3akgk1a"; depends=[ape pegas Rcpp RcppArmadillo]; }; HAPim = derive2 { name="HAPim"; version="1.3"; sha256="03qy0pxazv3gdq3fck7171ixilb9zi1dwnvc4v7d726g0lvn80pg"; depends=[]; }; HARModel = derive2 { name="HARModel"; version="1.0"; sha256="17sajqi2g5z69gvnfhkn850jkavi8syhm58xadd2khrm73nvwh2i"; depends=[Rcpp RcppArmadillo sandwich xts zoo]; }; @@ -1829,19 +1891,20 @@ in with self; { HDInterval = derive2 { name="HDInterval"; version="0.2.2"; sha256="1vb5fn9zfig0jqs3mvkpik4wvrndj4qmxqx8rg0iv8nvqc4fnzh4"; depends=[]; }; HDLSSkST = derive2 { name="HDLSSkST"; version="1.0.1"; sha256="1rslx3zxqh0byi6g4a446v3pagn174ibn115wd3dncpm8gka6q7s"; depends=[Rcpp]; }; HDMD = derive2 { name="HDMD"; version="1.2"; sha256="0na0z08fdf47ghfl2r3fp9qg5pi99kvp7liymwxym2wglkwl4chq"; depends=[MASS psych]; }; - HDMT = derive2 { name="HDMT"; version="1.0.1"; sha256="0wqaz3h1xdzfcgn4gp1x8ini6a836fxwm7izxgjf7r5y48cnl5z7"; depends=[cp4p fdrtool]; }; - HDPenReg = derive2 { name="HDPenReg"; version="0.94.6"; sha256="08kjyr0lkc0x5hky0i11n6x4dm9az8lbs79c0lmz32qrf9rhayg9"; depends=[Matrix Rcpp rtkore]; }; + HDMT = derive2 { name="HDMT"; version="1.0.2"; sha256="1nab737pmafsbpda4n7rzf79bpjvaklwhfd93s65x7daz90c1whi"; depends=[fdrtool]; }; + HDPenReg = derive2 { name="HDPenReg"; version="0.94.7"; sha256="16kmx3lddjvz8k7sric0s9ajhlgp62gf1zkyiscaf7w0pjwzin28"; depends=[Matrix Rcpp rtkore]; }; HDclassif = derive2 { name="HDclassif"; version="2.2.0"; sha256="1l5zxhayhzh7q50ycl481hy0br66ylxyvzw1ahmjjrdkm8s3czyj"; depends=[MASS rARPACK]; }; HDclust = derive2 { name="HDclust"; version="1.0.3"; sha256="18l4qp261gj3kscfxs3s03kmb9y5ml31vnpgpm1iy125bks4mr2y"; depends=[Rcpp RcppProgress Rtsne]; }; HDcpDetect = derive2 { name="HDcpDetect"; version="0.1.0"; sha256="0ai35d9df5pmva52sb1rr20f11h0mbal6d179g865b7w6n90kfr1"; depends=[]; }; - HDoutliers = derive2 { name="HDoutliers"; version="1.0.2"; sha256="13dwshjrz17wv8hn10sjii4caxs771w666mvk0fg831d4afj5bdc"; depends=[FactoMineR FNN mclust]; }; + HDiR = derive2 { name="HDiR"; version="1.0"; sha256="0aqllrkljj02rr25rr2hci00wgicghqwqc6ivfv2ll67kyfpvviq"; depends=[circular Directional movMF NPCirc rgl]; }; + HDoutliers = derive2 { name="HDoutliers"; version="1.0.3"; sha256="167g72b23jpjfhnz2faxia2lma328gvqkrlnz6xizzq7vb7cmb18"; depends=[FactoMineR FNN mclust]; }; HDtest = derive2 { name="HDtest"; version="2.1"; sha256="1c9x4s59762sp7drbm5h1xv22kpifq7p0x3dkrfcd0ficbbma5v8"; depends=[checkmate clime doParallel expm fastclime foreach MASS mvtnorm]; }; HDtweedie = derive2 { name="HDtweedie"; version="1.1"; sha256="14awd7sws0464f68f5xwnv1xvr0xflvx2z2zzcfj1csvk3af0zzj"; depends=[]; }; - HEMDAG = derive2 { name="HEMDAG"; version="2.6.1"; sha256="138byk1vzkw9g58ml3vf2ivj0bdanj8klqv0y8s7af3s5swlis18"; depends=[doParallel foreach graph plyr precrec preprocessCore RBGL]; }; + HEMDAG = derive2 { name="HEMDAG"; version="2.7.3"; sha256="13sclhqcl8zl54j5sdli3jnc7vw2f26sn2b0cs3hdbrsa4s2kssc"; depends=[doParallel foreach graph plyr precrec preprocessCore RBGL]; }; HETOP = derive2 { name="HETOP"; version="0.2-6"; sha256="1fjwyqh7l296pghmc4m81q8icgbhvqvxr61zd638fr46gls3ky2p"; depends=[R2jags]; }; HGNChelper = derive2 { name="HGNChelper"; version="0.8.1"; sha256="0qwkk5658j4j6w2wgvxkp38cyvscjp93d3zc7gb97vcihqx0ngxa"; depends=[]; }; HGSL = derive2 { name="HGSL"; version="1.0.0"; sha256="1p453xr3d1bmqc6mrmzb0hz9p0gp25m6v6qr0l3bapcf71vzbvq1"; depends=[]; }; - HH = derive2 { name="HH"; version="3.1-40"; sha256="18m8sj1s1v94a2nvrbii96ji0j9v3jajqyv9wrky72m903cj8nbr"; depends=[abind colorspace gridExtra Hmisc lattice latticeExtra leaps multcomp RColorBrewer reshape2 Rmpfr shiny vcd]; }; + HH = derive2 { name="HH"; version="3.1-43"; sha256="0nr3sa6di06cjmljdxfq7bcpnp9d6kna4f9lrv9fk4khr67mrlrf"; depends=[abind colorspace gridExtra Hmisc lattice latticeExtra leaps multcomp RColorBrewer reshape2 Rmpfr shiny vcd]; }; HHG = derive2 { name="HHG"; version="2.3.2"; sha256="159bs5cxdm770h66fam48451n9krpw2fn5gr397h730x2w7l41ki"; depends=[Rcpp]; }; HI = derive2 { name="HI"; version="0.4"; sha256="0i7y4zcdr6wcjy43lz9h8glzpdv0pz7livr95xb1j4p8zafykday"; depends=[]; }; HIMA = derive2 { name="HIMA"; version="1.0.7"; sha256="0mvphwmm8gmin933bji2l2gbpjzm42vyc7sdka4xpjfsaal9pp9i"; depends=[doParallel foreach iterators ncvreg]; }; @@ -1849,7 +1912,7 @@ in with self; { HIest = derive2 { name="HIest"; version="2.0"; sha256="0ik55kxhzjyg6z6072iz9nfaj7x1nvf91l1kysgvkjccr6jf3y86"; depends=[nnet]; }; HK80 = derive2 { name="HK80"; version="0.0.2"; sha256="0c8scpzl5xgqm9rlsvh5nl3bz42i5pzvb873j9bn3bi15gcknbny"; depends=[]; }; HKprocess = derive2 { name="HKprocess"; version="0.0-2"; sha256="1j2yhb7k8zf4nlzdf0p6x9ca7ak4lwwak8mcc60kpilw2fws27k5"; depends=[gtools MCMCpack]; }; - HLMdiag = derive2 { name="HLMdiag"; version="0.3.1"; sha256="02pgvfyj3xpy7laxryqivsws8jl3m79fwfzpqj8ad794a06gh87g"; depends=[ggplot2 MASS Matrix mgcv plyr Rcpp RcppArmadillo reshape2 RLRsim]; }; + HLMdiag = derive2 { name="HLMdiag"; version="0.4.0"; sha256="0nmqbz3wva2xsn3v1ir5nayfg3wnr6pz8zp7xmyrgdvvs7hsfqhp"; depends=[dplyr ggplot2 ggrepel janitor magrittr MASS Matrix mgcv plyr purrr Rcpp RcppArmadillo reshape2 rlang stringr tibble tidyselect]; }; HLSM = derive2 { name="HLSM"; version="0.8.2"; sha256="1jqfk5mlx603s3v069dab7wm0wy8qil50rw1s5x6f21xrahaqks2"; depends=[abind coda igraph MASS]; }; HMB = derive2 { name="HMB"; version="1.1"; sha256="19z3d0b98fyjcnbxh3g6h2g927nv0408sbxjlzalrjlw9mbpzd2b"; depends=[Rcpp RcppArmadillo]; }; HMDHFDplus = derive2 { name="HMDHFDplus"; version="1.9.13"; sha256="1n507nsqz1blikci56jhp48rdpq38dnadh8warc2jmvwizl22a3b"; depends=[httr RCurl XML]; }; @@ -1867,20 +1930,22 @@ in with self; { HPLB = derive2 { name="HPLB"; version="1.0.0"; sha256="1xxckjz90sdmng0sm9dlhwpzj79pxa3vd1cidxc44wjk4h25rq7q"; depends=[data_table]; }; HPbayes = derive2 { name="HPbayes"; version="0.1"; sha256="1kpqnv7ymf95sgb0ik7npc4qfkzc1zb483vwnjpba4f42jhf508y"; depends=[boot corpcor MASS mvtnorm numDeriv]; }; HRM = derive2 { name="HRM"; version="1.2.1"; sha256="0qsxwi0v61k1waw21nrz86jazd5wgq2drhan3w8pmb35q2z20s35"; depends=[data_table doBy ggplot2 MASS matrixcalc mvtnorm plyr pseudorank Rcpp reshape2 xtable]; }; + HRM_curve = derive2 { name="HRM.curve"; version="0.0.1"; sha256="0p3kvldpz347c0cdjkrdm0x2nfj85hm5cp59lirqhq77hf1zfnd5"; depends=[]; }; HRW = derive2 { name="HRW"; version="1.0-3"; sha256="12y43sl30949jc9ab10ipx8k4rvb9g8gwaazi8j3k1grh26ivpii"; depends=[KernSmooth]; }; HS = derive2 { name="HS"; version="1.1"; sha256="1vhbchc446j49jj7jgmy4l59n8ahk5l8jp1rl5xwsmn9iqir62mp"; depends=[data_table ggplot2 ggpubr partitions reshape2 tidyr zoo]; }; HSAR = derive2 { name="HSAR"; version="0.5.1"; sha256="03ryscvgiiwjcqk6gy3251nqqk43x508kz3ibw35hi84m2s7fsxj"; depends=[Rcpp RcppArmadillo spatialreg spdep]; }; HSAUR = derive2 { name="HSAUR"; version="1.3-9"; sha256="0b2hyn59lr2pma87fcj7mli3qmrbnfhgd8fv02fa317rj52399qz"; depends=[]; }; - HSAUR2 = derive2 { name="HSAUR2"; version="1.1-17"; sha256="0jc554lz5lj7180vd4rbrjkywar4bh38c7i9kyxhd5clg4afxpw8"; depends=[]; }; - HSAUR3 = derive2 { name="HSAUR3"; version="1.0-9"; sha256="1rpvblak0xvkavbvbd35zq1lcsl5z1zp30vn70wqbkdj7szhj9b4"; depends=[]; }; + HSAUR2 = derive2 { name="HSAUR2"; version="1.1-18"; sha256="0ggya24clwydi7aligdayds3jpq2ckr4xfm4nik0r6j97x4gl1mj"; depends=[]; }; + HSAUR3 = derive2 { name="HSAUR3"; version="1.0-10"; sha256="1wi0ficlhh3h60chyrvjb0g3z75avh4bq717nm4zh0b0j838qavg"; depends=[]; }; HSDiC = derive2 { name="HSDiC"; version="0.1"; sha256="0wiixb1ylx0l8qfgh5ark6alkdq87xaak1jlxizw1m589vghvqfp"; depends=[glmnet Matrix ncvreg quadprog]; }; HSPOR = derive2 { name="HSPOR"; version="1.1.9"; sha256="06lr8l71y5fcqcnmgq7cgiab1pcc98wnqzndbxcbikbh33cx7nxv"; depends=[corpcor npregfast]; }; HSSVD = derive2 { name="HSSVD"; version="1.2"; sha256="1k7ga397grl0r4p0ipjgw5xlafb2528rpww67bw7mmy01w87a1cc"; depends=[bcv]; }; - HTLR = derive2 { name="HTLR"; version="0.4-2"; sha256="1q8zlb4iya0sq2jqp4m77v66hdrfc7ncc0k8qllf16h06k24s88x"; depends=[BCBCSF glmnet magrittr Rcpp RcppArmadillo]; }; + HTLR = derive2 { name="HTLR"; version="0.4-3"; sha256="1bxgfiwbnvpdw0d6k34c1wc47z6pvx0imnz36c6r99zls5bm129y"; depends=[BCBCSF glmnet magrittr Rcpp RcppArmadillo]; }; HTMLUtils = derive2 { name="HTMLUtils"; version="0.1.7"; sha256="05y505jazzahnd6jsp3plqz8hd75991hhhcpcdn8093rinb1f8l1"; depends=[R2HTML]; }; HTSCluster = derive2 { name="HTSCluster"; version="2.0.8"; sha256="0wnbfh6hdx8692jilgmv8sys1zm6fqc6mim7vvjhyqlmpm8gm0kg"; depends=[capushe edgeR plotrix]; }; HTSSIP = derive2 { name="HTSSIP"; version="1.4.1"; sha256="1j2f6f3i4di4bvsk44gxz0narg45ld2rahfn23wpgni5bszy0vb3"; depends=[ape coenocliner DESeq2 dplyr ggplot2 igraph lazyeval magrittr phyloseq plyr stringr tidyr vegan]; }; HUM = derive2 { name="HUM"; version="1.0"; sha256="1bq74l88jvscmq9ihv5wn06w2wng073ybvqb2bdx2dmiqlpv6jw2"; depends=[gtools Rcpp rgl]; }; + HURDAT = derive2 { name="HURDAT"; version="0.2.3.2"; sha256="13lq6vdjf5iqwmg61rnq3i6s88q0h54s2dmr2hj0vf8hvisfj0bs"; depends=[dplyr purrr readr rlang rvest tidyr xml2]; }; HW_pval = derive2 { name="HW.pval"; version="1.0"; sha256="14nmyqw2d9cmn64789yc54fmiqanh6n1dizp7vj94h7b0jwq63yy"; depends=[]; }; HWEBayes = derive2 { name="HWEBayes"; version="1.4"; sha256="1rbffx6pn031a278ps9aqxcaq8yi73s5kf60za143ysbfxv9dphw"; depends=[MCMCpack mvtnorm]; }; HWEintrinsic = derive2 { name="HWEintrinsic"; version="1.2.2"; sha256="035r5bi7m66g351cmrfmf4cj5qqm4fn5pgy3lzsp3gyp2dv0rkg5"; depends=[]; }; @@ -1888,19 +1953,21 @@ in with self; { HaDeX = derive2 { name="HaDeX"; version="1.2.1"; sha256="0y380z92blxq52hg20cw71g6vs962xpgk5x2mvl35sz27lm4fr4f"; depends=[data_table dplyr DT ggplot2 gsubfn latex2exp readr readxl reshape2 shiny stringr tidyr]; }; HadamardR = derive2 { name="HadamardR"; version="1.0.0"; sha256="0nr8m6fchpmlvhyisb61y0fymjjrk2k1sd67r14n87sgn3mafh4a"; depends=[numbers openxlsx]; }; HadoopStreaming = derive2 { name="HadoopStreaming"; version="0.2"; sha256="1l9msaizjvnsj1jrpghj4g057qifdgg6vbqhfxhn1fiqdqi2056q"; depends=[getopt]; }; - HandTill2001 = derive2 { name="HandTill2001"; version="1.0.0"; sha256="0qxaxwizx24gm3iycdmwdn8mqvnwnjhacsp9nwl9w4djayb5a9sg"; depends=[]; }; + HandTill2001 = derive2 { name="HandTill2001"; version="1.0.1"; sha256="0wgr3rhz1iklirpnzk25afh8fv1qpi2ijmx4xwzplw3w3qir4yv6"; depends=[]; }; Hapi = derive2 { name="Hapi"; version="0.0.3"; sha256="0jqjhfq38k161kqff5cx0vxpsmjm2y5ca7049mvqiwqwvi4fp08m"; depends=[ggplot2 HMM]; }; - Haplin = derive2 { name="Haplin"; version="7.2.2"; sha256="15q0p563qbf0v91hnx3bdcxwc7chcqzc507wmr5zrsdl8y2pqn40"; depends=[ff ffbase MASS mgcv rlang]; }; + Haplin = derive2 { name="Haplin"; version="7.2.3"; sha256="1s1jlyr0gwvigfndqjbxb8zib6hkmn341khsnv87f82vzakmhi80"; depends=[ff MASS mgcv rlang]; }; HaploSim = derive2 { name="HaploSim"; version="1.8.4"; sha256="0794f76hc9qvjmay7c61cmzycqafljs0g0hliq9xfrw4f23gq3sa"; depends=[]; }; - HardyWeinberg = derive2 { name="HardyWeinberg"; version="1.6.6"; sha256="1qn1bbzfk4w3mqrzisshw5xx7x249sgmj6qdi39lkqb58a4mf4kh"; depends=[mice Rcpp Rsolnp]; }; + HardyWeinberg = derive2 { name="HardyWeinberg"; version="1.7.0"; sha256="0fadvv0xv5c2znnmcyaa8dmlijiyv9602wcls600wjlr4l88f67r"; depends=[mice Rcpp Rsolnp]; }; HarmonicRegression = derive2 { name="HarmonicRegression"; version="1.0"; sha256="0inz3l610wl0ibqjyrhfbmwmcfzcmcfhixai4lpkbfsyx93z2i4d"; depends=[]; }; Harvest_Tree = derive2 { name="Harvest.Tree"; version="1.1"; sha256="021zmppy7p2iakaxirfjdb5jzakg1ijma9d25ly2ni0nx0p1mh6z"; depends=[rpart]; }; + HeckmanEM = derive2 { name="HeckmanEM"; version="0.1.1"; sha256="1v0359c2v514k139kgjjww3f0z4xgr5s4l0649xxm9hdq7qs6667"; depends=[MomTrunc mvtnorm PerformanceAnalytics sampleSelection]; }; HellCor = derive2 { name="HellCor"; version="1.3"; sha256="1bzc2ipm7vw7s849d43lcs0xrk2rs67h223dn9kahqg152mmknza"; depends=[energy FNN orthopolynom]; }; HelpersMG = derive2 { name="HelpersMG"; version="4.3"; sha256="0kgsvzwya6r1zhzy0mwjdm41hpxssyd2qn16bcmpxkdd3njbk4bs"; depends=[coda lme4]; }; HeritSeq = derive2 { name="HeritSeq"; version="1.0.1"; sha256="0l1saxwj99xwkzcy43v0k9sicqwpw9gc8ywxpablagcddfj05pi3"; depends=[cplm DESeq2 lme4 MASS pbapply SummarizedExperiment tweedie]; }; + HeterFunctionalData = derive2 { name="HeterFunctionalData"; version="0.1.0"; sha256="0qrfmxwrxn0rd2ncy3afhraf7m0010nf9739jkj19h1j5vksi9n1"; depends=[]; }; HextractoR = derive2 { name="HextractoR"; version="1.4"; sha256="1wp7n92wgrjyklq159ymrw8y5ads6lhj2fcz54rzdnccdyx5naxi"; depends=[doParallel foreach seqinr]; }; HiCfeat = derive2 { name="HiCfeat"; version="1.4"; sha256="1imz7zfax74aakzk8457jww9r66qxpr2ncyvjj0y5paxdn76lnnq"; depends=[GenomeInfoDb GenomicRanges glmnet IRanges Matrix rtracklayer]; }; - HiClimR = derive2 { name="HiClimR"; version="2.1.6"; sha256="1s7l78xjvld8cdbz18zk6mbzwwzpm9x6vj6fq4j4hrz11bzsr14y"; depends=[ncdf4]; }; + HiClimR = derive2 { name="HiClimR"; version="2.1.7"; sha256="0gzpxwzrr4kh2kd1yy3dlf0d4qricah7l6q1mwz6g79c54z86dz7"; depends=[ncdf4]; }; HiCseg = derive2 { name="HiCseg"; version="1.1"; sha256="19581k3g71wrznyqrp4hmspqyzcbcfbc48xgjlq13zmqii45hcn6"; depends=[]; }; HiDimDA = derive2 { name="HiDimDA"; version="0.2-4"; sha256="0gxkxzys9mcy33xvsim8klaqmb2xwvy5bvgkn9r400j4qfjd3cgg"; depends=[]; }; HiLMM = derive2 { name="HiLMM"; version="1.1"; sha256="09135cwi6kqrvzdlivm86q1dqn6cbbi6nspdm0c2s700jl49pl5z"; depends=[]; }; @@ -1914,8 +1981,8 @@ in with self; { HistData = derive2 { name="HistData"; version="0.8-6"; sha256="0an8cki2ahaf3ynbcqgikxi90l3bv7gcn6nnwnli9g1br89y3bd4"; depends=[]; }; HistogramTools = derive2 { name="HistogramTools"; version="0.3.2"; sha256="1wkv6ypn006d8j6bpbhc1knw0bky4y8r7jp87482yd19q5ljsgv0"; depends=[ash Hmisc stringr]; }; HiveR = derive2 { name="HiveR"; version="0.3.63"; sha256="1vi24k23a017czfy9kihmq4s1dywzm274dyhyp1imx94afsnmhc3"; depends=[jpeg plyr png RColorBrewer rgl]; }; - Hmisc = derive2 { name="Hmisc"; version="4.4-1"; sha256="0mm3r2kv0kgrhg7salk2hw0s37d4i2mghwk0l0qxaw2ny0w8w5z6"; depends=[base64enc cluster data_table foreign Formula ggplot2 gridExtra gtable htmlTable htmltools lattice latticeExtra nnet rpart survival viridis]; }; - Hmsc = derive2 { name="Hmsc"; version="3.0-6"; sha256="1n02akdrz4g33aqwigbh9ckdplxvgnzsznwlyx6j40s4rqgv2zrz"; depends=[abind ape BayesLogit coda fields FNN ggplot2 MASS Matrix MCMCpack mvtnorm nnet pdist pROC rlang statmod truncnorm]; }; + Hmisc = derive2 { name="Hmisc"; version="4.4-2"; sha256="1j7vkckmahdh90ndcl646sjpxq82y4x55ngxqvkni22mv16wc2j9"; depends=[base64enc cluster data_table foreign Formula ggplot2 gridExtra gtable htmlTable htmltools lattice latticeExtra nnet rpart survival viridis]; }; + Hmsc = derive2 { name="Hmsc"; version="3.0-9"; sha256="1xy6xbnfpr7nnrgq9v3gzrfjchnng74p5f9nfxg584n6zyqk4lj0"; depends=[abind ape BayesLogit coda fields FNN ggplot2 MASS Matrix MCMCpack nnet pROC rlang sp statmod truncnorm]; }; HoRM = derive2 { name="HoRM"; version="0.1.2"; sha256="0vfsya6423i25szdj5s8pa8pwshiqykikxdbbj7r2nz73x3qp6hy"; depends=[ggplot2 MASS orthopolynom quantmod rsm]; }; Holidays = derive2 { name="Holidays"; version="1.0-7"; sha256="1srfbhlrf0pd6gzhp4hbic555lb7camk084rn1qz2g7fjvyijqiq"; depends=[TimeWarp]; }; Homeric = derive2 { name="Homeric"; version="0.1-3"; sha256="1vcs8fj39zpz45p7gph0mnx65hgr35na0b79i8llyw7i1h7zqzxr"; depends=[]; }; @@ -1924,25 +1991,26 @@ in with self; { HyRiM = derive2 { name="HyRiM"; version="2.0.0"; sha256="1wif31xvrwz0dr6z0hfn1v2fxi8rxws52al6h9rlbzciy6xyl7a3"; depends=[compare grImport2 orthopolynom purrr Rglpk]; }; HybridMC = derive2 { name="HybridMC"; version="0.2"; sha256="1wgzfyk0scwq9s2sdmc91fj7r4d7zlgwgnj6mdiia8w88ja8kzqy"; depends=[coda]; }; HydeNet = derive2 { name="HydeNet"; version="0.10.11"; sha256="1qi87k2drizqba1nz8psh697ks8ai8xz492kzsrs76xlxpbk1i9k"; depends=[checkmate DiagrammeR dplyr graph magrittr nnet pixiedust plyr rjags stringr]; }; - HydroCode = derive2 { name="HydroCode"; version="1.0.1"; sha256="0093a19d52pvy5f0c8l8vxix0kni2c6ablqsfxflwwg9wbms81pa"; depends=[sp]; }; - HydroMe = derive2 { name="HydroMe"; version="2.0"; sha256="1a1d3lay94mzwk8n22l650h3p133npdf4aj63zgrdw4760p54rqf"; depends=[minpack_lm nlme]; }; + HydroCode = derive2 { name="HydroCode"; version="1.0.2"; sha256="1igshik28xcxrdg116vs9s2yfbz5fik9xvlgfkgai3w9qj0x1h5q"; depends=[sp]; }; HyperbolicDist = derive2 { name="HyperbolicDist"; version="0.6-2"; sha256="1wgqbx9ascyk6gw1dmvfz6hljvbh49gb9shr9qgf22qbq83waiva"; depends=[]; }; - HypergeoMat = derive2 { name="HypergeoMat"; version="3.0.0"; sha256="03xnvb7d80nak7wawfi2sniq9syjbjx5gk71xsgchgwqsdnixp8y"; depends=[gsl Rcpp RcppArmadillo]; }; + HypergeoMat = derive2 { name="HypergeoMat"; version="3.1.0"; sha256="1pnwj0mqzangjvxnp5yq1ll4qhkpkvv427nzq3sqwpn9qd8gisvf"; depends=[gsl Rcpp RcppArmadillo]; }; IASD = derive2 { name="IASD"; version="1.1"; sha256="1slhd42k639mbyxccl7n69p7ng2qx6pqag8wz3kdwn479spkavzn"; depends=[]; }; IAT = derive2 { name="IAT"; version="0.3"; sha256="110rn2q09gspfd4msyh30dllxdxdraffkr18h1nm72brzhmx9cfi"; depends=[dplyr ggplot2 lazyeval]; }; IATScore = derive2 { name="IATScore"; version="0.1.1"; sha256="0sg4apj1sp0xc311cbkvflhv9kw1jxvjhdr0xjw79s662mnhkhgz"; depends=[]; }; IATanalytics = derive2 { name="IATanalytics"; version="0.1.1"; sha256="10g9iscfjmlxrkzls9320h9azpc5fnhh6276p7zn8sxqgp1nvnz9"; depends=[]; }; IATscores = derive2 { name="IATscores"; version="0.2.7"; sha256="1dmcwkylq6zazjycjsmbxnzvkav19w13j69gnm1f558wsdxpvhx1"; depends=[dplyr qgraph reshape2 stringr]; }; IAbin = derive2 { name="IAbin"; version="1.0"; sha256="1cpj2mx72n4v0yd8jbbnhj2w5d0sc8pw7rc8ahnn1hfa38pwwsyx"; depends=[]; }; + IAcsSPCR = derive2 { name="IAcsSPCR"; version="1.2.1"; sha256="0x0h1vicw0jlm9p10cw7g75g2x0d73rjpdwh1j7lxq6cnbpkbxf9"; depends=[abind FrF2 lattice stringi]; }; IBCF_MTME = derive2 { name="IBCF.MTME"; version="1.6-0"; sha256="1nlfsfdw8lfr3n2717i6kn1hafwr6hmqzfpg249amlrfjn0pghji"; depends=[dplyr lsa tidyr]; }; IBDLabels = derive2 { name="IBDLabels"; version="1.1"; sha256="1m9fd058yjxva6hin7i72i2nl285wfm0jkdn5xcng27yqlijyrm9"; depends=[]; }; IBDhaploRtools = derive2 { name="IBDhaploRtools"; version="1.8"; sha256="1754239pdil6b383mpzyi8zb9l9hzg15dwgn5246v97g1y3mlp5r"; depends=[]; }; IBDsim = derive2 { name="IBDsim"; version="0.9-8"; sha256="1a0xz1khl6cz6ajcn903fcmsv8g7hfdh7684zhk0g6awsgwqdf5q"; depends=[paramlink]; }; + IBMPopSim = derive2 { name="IBMPopSim"; version="0.3.1"; sha256="1infqxfwqg6y4d8g3wmi3wg243hqjjmzirm00dhxiav4ps8yrg1q"; depends=[checkmate dplyr ggplot2 purrr Rcpp readr reshape rlang tidyr]; }; IBrokers = derive2 { name="IBrokers"; version="0.9-12"; sha256="0mhh4kgwrncrcysvnvah6xc7fhx5ywjzn258cs9xj9kzns0jblk6"; depends=[xts zoo]; }; IC2 = derive2 { name="IC2"; version="1.0-1"; sha256="03jjb62msxjxdg9l3zd1ns0d2w37hkxy5pnjgaywxw3vfk4zwfj9"; depends=[]; }; ICAFF = derive2 { name="ICAFF"; version="1.0.1"; sha256="0zazx4nv81s75appg10aayks04mx6m5n9yf5hqrbxh3yj68vzxfy"; depends=[]; }; - ICAMS = derive2 { name="ICAMS"; version="2.1.2"; sha256="0jgylkc3asg41b0vac5vcyril0n93yqijjbzwwprfh3ps7pq87s0"; depends=[Biostrings BSgenome data_table dplyr GenomeInfoDb GenomicRanges IRanges RColorBrewer stringi zip]; }; - ICAOD = derive2 { name="ICAOD"; version="1.0.0"; sha256="0gcq4f5pa6sa9850968mr275z2n7xfzlsy12d4khkq9ysd2b6y5p"; depends=[cubature mnormt mvQuad nloptr Rcpp RcppEigen sn]; }; + ICAMS = derive2 { name="ICAMS"; version="2.2.4"; sha256="1qlyj6fqz27gbyjhncmjj0wms8jl562l1yyf30mb0ia2wbc54895"; depends=[Biostrings BSgenome data_table dplyr GenomeInfoDb GenomicRanges IRanges RColorBrewer stringi zip]; }; + ICAOD = derive2 { name="ICAOD"; version="1.0.1"; sha256="07fxh60vsndlvjijjsh1a9l2qkp78sb9nkg5x5mslh209lpjjhw1"; depends=[cubature mnormt mvQuad nloptr Rcpp RcppEigen sn]; }; ICBayes = derive2 { name="ICBayes"; version="1.2"; sha256="1hdh7g4nk6yy0xz9564vpvh1blrw30lvyw2wc5mmgn78kwjqla34"; depends=[coda HI survival]; }; ICC = derive2 { name="ICC"; version="2.3.0"; sha256="0y8zh9715cp9bglxpygqwgigrarq37sj845lk1xl0ydwinl0a6kk"; depends=[]; }; ICC_Sample_Size = derive2 { name="ICC.Sample.Size"; version="1.0"; sha256="1w6v1jp8bfvf6c49ikswkc5527gdx5cyqnw95x00pgmm6riwlsp9"; depends=[]; }; @@ -1951,11 +2019,11 @@ in with self; { ICDS = derive2 { name="ICDS"; version="0.1.1"; sha256="1jb98xi37jcf6nl5lx2ip9614l4w7lz7v53jpcbdj0ymqbfx1s70"; depends=[graphite igraph metap org_Hs_eg_db]; }; ICE = derive2 { name="ICE"; version="0.69"; sha256="04p8lakaha28mdh965w0ppyxfrz5ssi1n9xifvsbn3ihdra67rip"; depends=[KernSmooth]; }; ICEbox = derive2 { name="ICEbox"; version="1.1.2"; sha256="170gg2fg9307yc2b25lsj8d1zla0frjxl47qh0njlqlrpi8jmm7i"; depends=[sfsmisc]; }; - ICEinfer = derive2 { name="ICEinfer"; version="1.1"; sha256="0q07npgnssia7assvl1084080w3w434viyz5r1lj5slrx9gfdh8b"; depends=[lattice]; }; + ICEinfer = derive2 { name="ICEinfer"; version="1.3"; sha256="0hg1vdg9clsk24lqdh89dfzlb0mnig690wq06pzd5nl9mr6dlvns"; depends=[lattice]; }; ICGE = derive2 { name="ICGE"; version="0.3"; sha256="0xin7zml1nbygyi08hhg3wwr2jr1zcsvrlgia89zp4xanxlzgaqa"; depends=[cluster MASS]; }; ICGOR = derive2 { name="ICGOR"; version="2.0"; sha256="18fn10f5nqqbrfibqmp602nqpx794fy3gpxp1bd10xn48llhqfc4"; depends=[ICsurv MASS pracma survival]; }; ICODS = derive2 { name="ICODS"; version="1.0"; sha256="13wi4mqdwdrjfjh42sjifc6vlkj6jlm4z0x6680xdzkwq8byipi9"; depends=[MASS]; }; - ICON = derive2 { name="ICON"; version="0.2.0"; sha256="1g8lffp66h3pl6qjbns6427ms696ikhnr48c3qs61isir93x9hvf"; depends=[]; }; + ICON = derive2 { name="ICON"; version="0.4.0"; sha256="02ilj6mwgzam5pgd3iadpwpyvigbq2y113lh099yrmcq325jb8z5"; depends=[network]; }; ICRanks = derive2 { name="ICRanks"; version="3.1"; sha256="1vwzqkjg7i5hm96s8frp72n6xqadlsawzr1wby1fhsxl2m5f1797"; depends=[gmp multcomp Rcpp]; }; ICS = derive2 { name="ICS"; version="1.3-1"; sha256="0x3cwhvzcibgyb8gqy6dc6lgnvbf6x8425zai57g8yn5i6zzc1li"; depends=[mvtnorm survey]; }; ICSNP = derive2 { name="ICSNP"; version="1.1-1"; sha256="1zf0k1kwdmjjqsbiiy3r2l47vjsrg09fj65p6zfld3j4gjbp17fd"; depends=[ICS mvtnorm]; }; @@ -1976,8 +2044,9 @@ in with self; { IDmeasurer = derive2 { name="IDmeasurer"; version="1.0.0"; sha256="0n7rziaaxm9dqixmw6rxgq9dwnwdl3dsdnpd9s59k5skdlaxnl5m"; depends=[infotheo lme4 MASS]; }; IDmining = derive2 { name="IDmining"; version="1.0.6"; sha256="0fsl1byz0n5jwswh2ydzz5lsycja54545cf7dr1r3h1a372yz2mv"; depends=[data_table doParallel foreach]; }; IETD = derive2 { name="IETD"; version="1.0.0"; sha256="0avhyw0zcb8vj0nqfy41yq5kcd8yf9rmaawdvfcy5rqwxmi1mw9l"; depends=[doParallel dplyr foreach ggplot2 lubridate Rdpack]; }; - IFC = derive2 { name="IFC"; version="0.0.9"; sha256="0arjy1bz0hcncw0kiv1pcrkdrn5kh2f9q1qhbw504plpzk5rgh67"; depends=[DT gridExtra jpeg KernSmooth lattice latticeExtra png Rcpp RcppProgress tiff visNetwork xml2]; }; - IFP = derive2 { name="IFP"; version="0.2.1"; sha256="06zyadcr8p6q0c5h9n29yl02ixysdj6lfbn9hfir0bk9hyv9yfyr"; depends=[coda haplo_stats]; }; + IFAA = derive2 { name="IFAA"; version="1.0.0"; sha256="138q74hbvr93qlkb01a9gf9463zb4llklz45gqyf4fxps7m0nggw"; depends=[doParallel expm foreach future HDCI mathjaxr Matrix picasso rlecuyer]; }; + IFC = derive2 { name="IFC"; version="0.1.1"; sha256="0nr05xz5i9cv4ffjnrxxvxp1mwnym7bmz9jq83z5gi6ca42128xv"; depends=[DT gridExtra jpeg KernSmooth lattice latticeExtra png Rcpp RcppProgress tiff visNetwork xml2]; }; + IFP = derive2 { name="IFP"; version="0.2.4"; sha256="066wz6bjqcvq22gjg2wcmglp798f87rsc8yhm13p0dic3arb5ph6"; depends=[coda haplo_stats]; }; IGG = derive2 { name="IGG"; version="1.0"; sha256="1cibb9z18xc1zx1813lk14n6p5am84hm7w0hkrsif4j3p89lrwif"; depends=[GIGrvg glmnet MASS Matrix pscl]; }; IGP = derive2 { name="IGP"; version="0.1.0"; sha256="0xv89gmyfgnq5kzcmjbp5nx9zbr3gbdzkvffp99bxbkvf759m255"; depends=[PythonInR R6]; }; IGST = derive2 { name="IGST"; version="0.1.0"; sha256="12ycrfsgwakaj3k39k1j4ky58wr7a2ibyz6j9cznvjjv6cgz9zg5"; depends=[BootMRMR e1071]; }; @@ -1985,9 +2054,11 @@ in with self; { ILS = derive2 { name="ILS"; version="0.2"; sha256="0lj3ripkaq6jn00lpxjihjhm8g1gbkppmb1y9kkrymphg80k1by7"; depends=[depthTools fda_usc lattice MASS multcomp]; }; IM = derive2 { name="IM"; version="1.0"; sha256="1f1vr5zfqnanc5xmmlfkjkvxwbyyysi3mcvkg95p8r687a7zl0cx"; depends=[bmp jpeg png]; }; IMAGE = derive2 { name="IMAGE"; version="1.0"; sha256="0xgrja7qhklcmbm0zz5xg94gw5kl05nk3v77l7vxq2d5sk0435g3"; depends=[doParallel foreach Matrix Rcpp RcppArmadillo]; }; + IMEC = derive2 { name="IMEC"; version="0.2.0"; sha256="1k85pr6s6lysn53n59i8rcdhyg7r3il5avbckvvz43p6lh0fgxpy"; depends=[igraph IsingSampler qgraph]; }; IMFData = derive2 { name="IMFData"; version="0.2.0"; sha256="1mlxpsbyvh1zi8ivdblbd58zfv5hflnknbasz5z8xk9911czrn6p"; depends=[httr jsonlite plyr]; }; - IMIFA = derive2 { name="IMIFA"; version="2.1.3"; sha256="08dikyzl3c34y1hjhcbqx34bn33nfhkggb3m208fjnmq82yqgfm6"; depends=[matrixStats mclust mvnfast Rfast slam viridis]; }; + IMIFA = derive2 { name="IMIFA"; version="2.1.4"; sha256="00g07ps87wm4r2klkyr3xmf7q369mzxdnq2n7vsi4lig2x05pdq3"; depends=[matrixStats mclust mvnfast Rfast slam viridisLite]; }; IMIS = derive2 { name="IMIS"; version="0.1"; sha256="09zb48vdj0i3vf8vxrs07xwb9ji27vp2fyvmg6jfq631licsryc2"; depends=[mvtnorm]; }; + IMIX = derive2 { name="IMIX"; version="1.1.0"; sha256="06n03nck5475xsh41pwxlyvdw4y6b0vlh809fmfsjdadjipd218v"; depends=[crayon ggplot2 MASS mclust mixtools mvtnorm]; }; IMP = derive2 { name="IMP"; version="1.1"; sha256="0ilvgz2bngffyx6ifqqx1snsn6mmq7rx3wg44093yrviaw39qdfv"; depends=[dplyr ggplot2 shiny tidyr]; }; IMPACT = derive2 { name="IMPACT"; version="0.1.1"; sha256="0ai22gvmfj9j00cw742szfqqay63b5lmnszkwwdfdvidls43v0bm"; depends=[]; }; IMTest = derive2 { name="IMTest"; version="1.0.0"; sha256="0n0swbi051cr7mrjmszqg79hxa38ccyq69ws8c37ixwb0lpxmx48"; depends=[lme4 ltm MASS reshape2]; }; @@ -1998,10 +2069,12 @@ in with self; { INLABMA = derive2 { name="INLABMA"; version="0.1-11"; sha256="0wzyb3c7zpksqz198kigi4rpblvk0rjamngmyabw5xdpizxdg6zi"; depends=[Matrix sp spdep]; }; INLAMSM = derive2 { name="INLAMSM"; version="0.1"; sha256="0km7kwwif2hqqa9jhglvkinzcm6gfp7mn219hqm5ds5rfgrcyl75"; depends=[Matrix MCMCpack]; }; INSPIRE = derive2 { name="INSPIRE"; version="1.5"; sha256="0938l50yxnb5q628mp874ayx9ybvcjddis20y1hzm5cmlsg0hqhg"; depends=[missMDA]; }; + INTRIGUE = derive2 { name="INTRIGUE"; version="0.1.0"; sha256="1l1vfl0m4iqniwp4bp1bfjpqhwahg341fpyxhryr0j8lypqaw7si"; depends=[dplyr rlist SQUAREM]; }; IOHanalyzer = derive2 { name="IOHanalyzer"; version="0.1.4"; sha256="1wp9i4vy40a10y5lj4m2hs2nx5nz1qyqz6gd27284zkydrwhpnxr"; depends=[bsplus colorRamps colorspace colourpicker data_table dplyr DT ggplot2 igraph kableExtra magrittr markdown PlayerRatings plotly RColorBrewer Rcpp reshape2 shiny shinyjs stringi]; }; - IOHexperimenter = derive2 { name="IOHexperimenter"; version="0.1.3"; sha256="0xk470mm4av9knj8fyss57yvq88qhg2nyapnzlccr63v28v3mn9b"; depends=[assertthat BH magrittr Rcpp]; }; + IOHexperimenter = derive2 { name="IOHexperimenter"; version="0.1.4"; sha256="0aacliznncl488rjsnx02pfj1mchhcyb36v816g959ll38pvc6bk"; depends=[assertthat BH magrittr Rcpp]; }; IPCWK = derive2 { name="IPCWK"; version="1.0"; sha256="0hah1xl6zli0346jh57rjc5x8vynhaysj0l481rmvznsghv6im23"; depends=[MASS survival]; }; - IPDFileCheck = derive2 { name="IPDFileCheck"; version="0.6.3"; sha256="173b9vj19622gay58aaz2vad58aw5q2v2xm00y7cpaa2spzb2r85"; depends=[dplyr eeptools GlobalOptions lubridate testthat]; }; + IPDFileCheck = derive2 { name="IPDFileCheck"; version="0.6.4"; sha256="1pkdgj4glqarzwn1zrbyrwb59583l8v3qk2p3g3iir1gvpdm9icx"; depends=[dplyr eeptools GlobalOptions lubridate testthat]; }; + IPDfromKM = derive2 { name="IPDfromKM"; version="0.1.10"; sha256="1pqi6cshiha4gnra25fgpggyi42mn2hg25s9m9mh091rn5km44q0"; depends=[dplyr ggplot2 gridExtra readbitmap survival]; }; IPEC = derive2 { name="IPEC"; version="0.1.3"; sha256="0h1b9h33zxx23rj8c9790nsqykwhznavy8hfkgv9gx7nphrsy5ma"; depends=[MASS numDeriv]; }; IPMRF = derive2 { name="IPMRF"; version="1.2"; sha256="1zvwwhiy0p134zvm5ldc92pdd1ap72bhbrlf02rz9m2hlsxmwy67"; depends=[gbm party randomForest]; }; IPPP = derive2 { name="IPPP"; version="1.1"; sha256="19ccs25fd56ns7ssi51w2jzjd4d57vyimwmfvf27mmigb537bd5y"; depends=[]; }; @@ -2009,9 +2082,10 @@ in with self; { IPWboxplot = derive2 { name="IPWboxplot"; version="0.1.0"; sha256="0lyqcjnbissick5hzwrx21pykq4pww9j0i03j0gy43awl1cq5qq8"; depends=[isotone]; }; IQCC = derive2 { name="IQCC"; version="0.7"; sha256="1zalpmyywkrnci0jd8irakjhiqmr52zhj1sbxf9pz5c7wks2rdbc"; depends=[MASS miscTools qcc]; }; IRATER = derive2 { name="IRATER"; version="0.0.1"; sha256="0jxdvjmnmangbqy3ibb5qrj9jz3wrzs0wa1r2gjk4v8vsbk0ipcf"; depends=[coda lattice plyr R2admb]; }; - IRISMustangMetrics = derive2 { name="IRISMustangMetrics"; version="2.4.1"; sha256="0bxxs88s0x1n01c7dwm9ki0x9qcfjxsynih5fmfacq5n274cmyz3"; depends=[dplyr IRISSeismic pracma RCurl seismicRoll signal stringr XML]; }; - IRISSeismic = derive2 { name="IRISSeismic"; version="1.5.2"; sha256="117p2kh2r2iw758iqlpqaak83czfv34p15907g18x496r5vri429"; depends=[pracma RCurl seismicRoll signal stringr XML]; }; - IROmiss = derive2 { name="IROmiss"; version="1.0.2"; sha256="0rcyijx5w8nn7n1hc4sdrphgggnq3676f8fpzxs85vkk52z0vp0a"; depends=[equSA huge mvtnorm ncvreg]; }; + IRISMustangMetrics = derive2 { name="IRISMustangMetrics"; version="2.4.3"; sha256="1wqm8qd1w07whfg7yn916zp1ks9ffpxz6y6ghsal0d9n9rlmc21w"; depends=[dplyr IRISSeismic pracma RCurl seismicRoll signal stringr XML]; }; + IRISSeismic = derive2 { name="IRISSeismic"; version="1.6.0"; sha256="0dgfy7ifghblsd9nxcylbdqlcpxhyladv91r6w2aqykpbkin705r"; depends=[pracma RCurl seismicRoll signal stringr XML]; }; + IRSF = derive2 { name="IRSF"; version="1.0.3"; sha256="1cq196z2i4by7dfij6w849a49d8dzzcdk5a68nxvmvwq3xskywam"; depends=[abind randomForestSRC survival]; }; + IRTBEMM = derive2 { name="IRTBEMM"; version="1.0.7"; sha256="09siwm2shjb8hhk64r66fspzykzr2r0m011pv8qcl9k7g040mxpi"; depends=[]; }; IRTShiny = derive2 { name="IRTShiny"; version="1.2"; sha256="094ax94y6k5z4vlxfla2w19f57q0z32nwwd5npjbgmnkhvfhhl9v"; depends=[beeswarm CTT ltm psych shiny shinyAce]; }; IRdisplay = derive2 { name="IRdisplay"; version="0.7.0"; sha256="12chk53nf4zckgc4yl7gbvd7m5dvli52inp5b3f0zvcjvfncksli"; depends=[repr]; }; IRkernel = derive2 { name="IRkernel"; version="1.1.1"; sha256="1y06v3difaiihxfm2abm88nnjzvkla4p346cm1nxmga4iwb2k8gm"; depends=[crayon digest evaluate IRdisplay jsonlite pbdZMQ repr uuid]; }; @@ -2021,11 +2095,11 @@ in with self; { ISEtools = derive2 { name="ISEtools"; version="3.1.1.1"; sha256="00d6znqz2mfmyi9ijgrg2pwl4lnvvsy00ysa7a7vjq7ip8qvcjfq"; depends=[coda Xmisc]; }; ISLR = derive2 { name="ISLR"; version="1.2"; sha256="1bfay6cs40crhh34v2ksn4zdxivimfyjvk19wqbnjr7vs837l3xh"; depends=[]; }; ISM = derive2 { name="ISM"; version="0.1.0"; sha256="0by0w6zgnwcwzbmxx16s8mb1avhc6aiavqp0qkxx6hr70vrgb997"; depends=[rJava xlsx xlsxjars]; }; - ISOcodes = derive2 { name="ISOcodes"; version="2020.03.16"; sha256="1hz1sj57qkkkrgn8slsz2n4jv1fkyp40503j9rg30lxy4gmb83hn"; depends=[]; }; + ISOcodes = derive2 { name="ISOcodes"; version="2020.12.04"; sha256="18373rkhmwm7y2drvfbhrxkqw9d23avf0ndvh0fg00z4djvddkjx"; depends=[]; }; ISOpureR = derive2 { name="ISOpureR"; version="1.1.3"; sha256="1ydhsh3v6n7prrg0dm7hsg8wx1244g791xnz1sjyhljhm31hgwc0"; depends=[futile_logger Rcpp RcppEigen]; }; ISOweek = derive2 { name="ISOweek"; version="0.6-2"; sha256="1f1h8pgjaa14cvaj8ldl87b4vslxwvyfj46m0hkylwp73sv3g2mm"; depends=[stringr]; }; ISR3 = derive2 { name="ISR3"; version="0.98"; sha256="0mmpdl9ndlj9i0k3zl7ja0g7y9pm67igw925ld5qnz7a36plygxs"; depends=[]; }; - ISRaD = derive2 { name="ISRaD"; version="1.2.3"; sha256="1xgk0mda2w22yf44flyyga15cxffzn25rg83g7dmqa8rqjiis51j"; depends=[assertthat devtools dplyr ggplot2 maps openxlsx pangaear raster rcrossref RCurl rgdal stringr tidyr tidyverse]; }; + ISRaD = derive2 { name="ISRaD"; version="1.5.6"; sha256="1rjhxg4q0lg4y5y5minqv40wq5ngci8rkj1dgbzpsnphjy55541x"; depends=[dplyr ggplot2 maps raster RCurl readxl tidyr writexl]; }; ISwR = derive2 { name="ISwR"; version="2.0-8"; sha256="1bay7na68awq68bw82dwhcfxp2d3di2dg33islq0mgrhd4sfdfza"; depends=[]; }; ITGM = derive2 { name="ITGM"; version="0.41"; sha256="0q278ga51asrr918l088v6qdl17vnmrcbz7y1xc4rzmb61lkwqy7"; depends=[data_table Fgmutils gsubfn plyr sqldf]; }; ITNr = derive2 { name="ITNr"; version="0.6.0"; sha256="0yxn3768819ph49bizprj3arrvz9rzhb45rkcpfivwfwlyf010yy"; depends=[blockmodeling circlize cowplot dplyr fastmatch GGally ggplot2 igraph intergraph maps network networkDynamic plyr RColorBrewer reshape2 sna tnet WDI]; }; @@ -2035,21 +2109,23 @@ in with self; { IalsaSynthesis = derive2 { name="IalsaSynthesis"; version="0.1.6"; sha256="15iwywvzhgiyigl8f488b7ra89rz0a7ymfsdgdlqfls3fmld7b4a"; depends=[testit]; }; Iboot = derive2 { name="Iboot"; version="0.1-1"; sha256="1fahh86kgv2axj2qg14n87v888sc0kb567s6zr3fh5zv361phwkq"; depends=[]; }; IceCast = derive2 { name="IceCast"; version="2.1.0"; sha256="0h3z68lfjw5s51601m17m2gvn12vkwj5gzc70dqzfjmxdkgv3p28"; depends=[coda maptools MASS ncdf4 raster Rcpp RcppArmadillo rgeos sp]; }; + IgAScores = derive2 { name="IgAScores"; version="0.1.2"; sha256="0ckqjbn0xc894dc23gbaqzr6z6rl5h0k8gc5gjhbhwvrc2zlyfsp"; depends=[]; }; IgorR = derive2 { name="IgorR"; version="0.8.1"; sha256="1lkiz3gxj8i1xbr5jp69z21rpk7kz3a68h29inp1qa7zi7gikmgx"; depends=[bitops]; }; ImaginR = derive2 { name="ImaginR"; version="0.1.7"; sha256="12ypfrqw6xym84i1axd3h0qd2md96rc0glas3rgzpdhdyw4lbfmn"; depends=[imager jpeg]; }; Imap = derive2 { name="Imap"; version="1.32"; sha256="0b4w0mw9ljw6zxwvi0qzb08yq9n169lzgkdcwizrd07x9k9xjxs7"; depends=[]; }; Immigrate = derive2 { name="Immigrate"; version="0.2.1"; sha256="0pnnvv63kkg7pgyblb1vlx54c6169n40fn58aypdy5xcnknabvxn"; depends=[pROC Rcpp]; }; - ImpactEffectsize = derive2 { name="ImpactEffectsize"; version="0.6.0"; sha256="0i2bc72rw410sq8f64nfj6vvkm3wmmlwps19ndg966gcfg9llv6k"; depends=[caTools matrixStats parallelDist Rcpp]; }; + ImpactEffectsize = derive2 { name="ImpactEffectsize"; version="0.6.1"; sha256="12pl4kif6s8jllncm3r5133vrknq98h8awbskq4sh55p1ldaldfq"; depends=[caTools matrixStats parallelDist Rcpp]; }; ImpactIV = derive2 { name="ImpactIV"; version="1.0"; sha256="1bb6gw1h15hscr71hy779k2x5ywzx63ylim3hby02d7fnnj46p58"; depends=[nnet]; }; - ImportExport = derive2 { name="ImportExport"; version="1.1"; sha256="12i9mwspk59zicn1mn21xrs90c8dqxm1q7alqbzscgkpf3xbjrnn"; depends=[chron gdata haven Hmisc RODBC xlsx]; }; + ImportExport = derive2 { name="ImportExport"; version="1.3"; sha256="07i7p9xha1f23r07lw87ak13hd4wavdvwh8vb8sg2gyvnpa5njwp"; depends=[chron gdata haven Hmisc readxl RODBC writexl]; }; ImputeRobust = derive2 { name="ImputeRobust"; version="1.3-1"; sha256="1zvwlpffpm4gqysz57clf8jkqr72yjbzx90pdy95la51m0b6cdbd"; depends=[extremevalues gamlss gamlss_dist lattice mice purrr]; }; - InDisc = derive2 { name="InDisc"; version="1.0.2"; sha256="1mvd6r1ly924n17275n4i9p8sghvm929kbir0bq6850kk2m0dgq7"; depends=[optimbase psych]; }; + InDisc = derive2 { name="InDisc"; version="1.0.3"; sha256="05xcf7gqq9ik8azmyas7ggzg54rlwrrcglzsn0znjd5h2vjp310a"; depends=[matrixStats optimbase psych]; }; InPosition = derive2 { name="InPosition"; version="0.12.7.1"; sha256="0d9c7dwaa1v0j8p5ff9223fc2gkbmbvyqylma2d8l4x5m92jmkv0"; depends=[ExPosition prettyGraphs]; }; InSilicoVA = derive2 { name="InSilicoVA"; version="1.3.0"; sha256="0yaqn9hy6cq2n6cylbgycyg1f9l4d0hm00il6g275zflijjzirq7"; depends=[coda ggplot2 InterVA5 rJava]; }; - IncDTW = derive2 { name="IncDTW"; version="1.1.3.1"; sha256="1hwwsh70mmdwqaqw4xxnbvc3g2nhmx64bd0hzxh63wr15jch0w8b"; depends=[data_table ggplot2 Rcpp RcppArmadillo RcppParallel scales]; }; + IncDTW = derive2 { name="IncDTW"; version="1.1.4.2"; sha256="0am4sm244aaqy2jc9fllyxgj2ww6jabfm8n72rg26wyh7zcbr7vj"; depends=[data_table ggplot2 Rcpp RcppArmadillo RcppParallel scales]; }; IncomPair = derive2 { name="IncomPair"; version="0.1.0"; sha256="156mc4csbxz976md7ikjd6sqamzsfc8ik9xf1qbhrfl8y7957kbb"; depends=[]; }; - IndTestPP = derive2 { name="IndTestPP"; version="1.0"; sha256="1ywl35k2syv46pz6ap5sjkynapqj04aq197czspqky0pvrq7ldr1"; depends=[]; }; + IndTestPP = derive2 { name="IndTestPP"; version="3.0"; sha256="1z48pr8znbk1gdvjfdvszxlzhj7v88p3y7zhi1f0xw75dkfpnwwy"; depends=[]; }; IndepTest = derive2 { name="IndepTest"; version="0.2.0"; sha256="017jasqsxm5m13rhfy9gxvd8nfib5k5y5c8520p3hcffqrxr683p"; depends=[FNN mvtnorm Rdpack]; }; + IndependenceTests = derive2 { name="IndependenceTests"; version="0.5"; sha256="1azqn5jnwyf9mqhz3d016sp0bgjq4fl1w8h1xzbs9gprhgb4mnrx"; depends=[CompQuadForm MASS Runuran xtable]; }; IndexConstruction = derive2 { name="IndexConstruction"; version="0.1-3"; sha256="08bi3x7a9plxshgj6hq58mzkf1117a7p0fd1akqjh7k8mgywifwf"; depends=[fGarch KernSmooth lubridate RcppBDT xts zoo]; }; IndexNumR = derive2 { name="IndexNumR"; version="0.1.3"; sha256="1jrbl2gwgp4msigkspgqcvgvxq169jiiz4acixky37i6hw0n34p6"; depends=[]; }; IndexNumber = derive2 { name="IndexNumber"; version="1.2"; sha256="0xiy84gfks24c1cmqdki95nysa8gkihcgcsdfbm0wn8w8n3vb6va"; depends=[]; }; @@ -2065,6 +2141,7 @@ in with self; { Infusion = derive2 { name="Infusion"; version="1.4.1"; sha256="0nxp416mbzawrdk4qwhg5j7lm8zdyplrngka2hw2rlsqmlwhvqzl"; depends=[blackbox foreach mvtnorm numDeriv pbapply proxy spaMM viridis]; }; InjurySeverityScore = derive2 { name="InjurySeverityScore"; version="0.0.0.2"; sha256="0g52cksa774in18ykrym61l3my9zm343bgsq5mg7mki9x65xd35z"; depends=[dplyr rlang tidyr]; }; InspectChangepoint = derive2 { name="InspectChangepoint"; version="1.1"; sha256="0zrfyzz3l9jff7044dhrjv8rp8f258fz993ycyxyd29nd7x9n9nj"; depends=[MASS]; }; + IntCal = derive2 { name="IntCal"; version="0.1.3"; sha256="1drr1wly23sddn4kfqjx1iijpp21zgw1342d354s6id2l3r4cf11"; depends=[]; }; IntClust = derive2 { name="IntClust"; version="0.1.0"; sha256="0whmc084gq5zip82vnwailnwvw9jawk9rx4wqiz1lr693w9xbq66"; depends=[a4Core ade4 analogue Biobase circlize cluster data_table e1071 FactoMineR ggplot2 gplots gridExtra gtools igraph limma lsa plotrix pls plyr Rdpack SNFtool]; }; IntLik = derive2 { name="IntLik"; version="1.0"; sha256="13ww5bsbf1vnpaip0w53rw99a8hxzziibj7j66cm31jmi8l6fznf"; depends=[maxLik]; }; IntNMF = derive2 { name="IntNMF"; version="1.2.0"; sha256="09qzyvv7d4wr68qrlhcd4ivr65is3mypv1vaxpswwcjmcmyr4gzp"; depends=[cluster InterSIM MASS mclust NMF]; }; @@ -2076,63 +2153,64 @@ in with self; { InterVA5 = derive2 { name="InterVA5"; version="1.1.0"; sha256="058vncqp3z1bqr5bdx5rvv07si7pblyfw2n35022bq2k4rc63093"; depends=[curl readxl]; }; Interact = derive2 { name="Interact"; version="1.1"; sha256="1g9zhafdpr7j410bi8p03d8x9f8m3n329x8v01yk15f65fp7pl1d"; depends=[]; }; InteractiveIGraph = derive2 { name="InteractiveIGraph"; version="1.0.6.1"; sha256="0srxlp77xqq0vw2phfv7zcnqswi2i5nzkpqbpa5limqx00jd12zy"; depends=[igraph]; }; - Interatrix = derive2 { name="Interatrix"; version="1.1.1"; sha256="1ljxgiia0y8wv1rlm5brd0yvs1r7r5wyrs6nykmwrwwya4k34mpz"; depends=[MASS tkrplot]; }; + Interatrix = derive2 { name="Interatrix"; version="1.1.3"; sha256="1pjyfg5p6081hng9h6wcmfnlfkcs300c3x9ksdj01587b97ph9s1"; depends=[MASS]; }; InterfaceqPCR = derive2 { name="InterfaceqPCR"; version="1.0"; sha256="12nmkv6qnzh2dnbhk1656dla6mrznh24gqblmn4xai7wg4p92fbx"; depends=[plyr reshape2 tkrplot xlsx]; }; Interpol = derive2 { name="Interpol"; version="1.3.1"; sha256="1598lnnrcxihxysdljphqxig15fd8z7linw9byjmqypwcpk6r5jn"; depends=[]; }; Interpol_T = derive2 { name="Interpol.T"; version="2.1.1"; sha256="1fbsl1ypkc65y6c0p32gpi2a2aal8jg02mclz7ri57hf4c1k09gz"; depends=[chron date]; }; InterpretMSSpectrum = derive2 { name="InterpretMSSpectrum"; version="1.2"; sha256="1iaw4i14l2vp1f163g2q4pwv9cnqrx14ik4s8zw0iha4zwcrc3ja"; depends=[DBI doParallel enviPat foreach plyr Rdisop RSQLite]; }; IntervalSurgeon = derive2 { name="IntervalSurgeon"; version="1.0"; sha256="0dpgfgnnx6r29y8y3pac1rgi503wvlwggx5dh6fhqnxw5yfink61"; depends=[Rcpp]; }; - IntrinioStockAPI = derive2 { name="IntrinioStockAPI"; version="0.0.1"; sha256="0gvkynyi2iag2kwwb51b8125md8kw65b48zk9qdf8pppg9s1r46a"; depends=[gtools httr jsonlite stringr]; }; InvariantCausalPrediction = derive2 { name="InvariantCausalPrediction"; version="0.8"; sha256="01ckyvjl9lxdpkr0v1da4n4lw3b5z1bxlmf0v6ibqly1mhfwybjl"; depends=[glmnet mboost]; }; InvasionCorrection = derive2 { name="InvasionCorrection"; version="0.1"; sha256="1wwx2kssjysl1lraac36pvxq34vg8qm0vwi861rs1iipfc35i84j"; depends=[lattice]; }; Inventorymodel = derive2 { name="Inventorymodel"; version="1.1.0"; sha256="1l87xghdksgmb2k3a8j382p7ffi2pma38a6pn31sfjsa6bgmrdnk"; depends=[e1071 GameTheoryAllocation]; }; Irescale = derive2 { name="Irescale"; version="2.3.0"; sha256="037bzli0zwlfbf5xmllqg2pi0shs33ggrnw69kzyw2sf780y3hs2"; depends=[e1071 fBasics ggplot2 imager Rdpack reshape2 sp]; }; IrishDirectorates = derive2 { name="IrishDirectorates"; version="1.4"; sha256="1mwjrmqga7f0p5w2m4f0i6mb68jimx6791pz03r8iqj3yx0vzkh0"; depends=[Rcpp RcppArmadillo]; }; - IrregLong = derive2 { name="IrregLong"; version="0.3.2"; sha256="112adsl4lxb5r77zdynn21qi932px6j037r3pnbirk723b306xng"; depends=[data_table frailtypack geepack survival]; }; + IrregLong = derive2 { name="IrregLong"; version="0.3.3"; sha256="1qmpim7r5wzifr73bb261xhpsxz93n5h70yc883wiaikjg031abb"; depends=[data_table geepack survival]; }; IsingFit = derive2 { name="IsingFit"; version="0.3.1"; sha256="1prdzzp15klkdy72379bjksdgxr15nk16pqm35w95341cddxchc7"; depends=[glmnet Matrix qgraph]; }; IsingSampler = derive2 { name="IsingSampler"; version="0.2.1"; sha256="1cs4vk53b5fy6kywvycfjf62571yx92nvgp5i8hlvms1362ir7gv"; depends=[dplyr magrittr nnet plyr Rcpp]; }; Iso = derive2 { name="Iso"; version="0.0-18.1"; sha256="0vy6jdyvp751430sf2f690yhasjr70cpk3p3lnaaxjq3fs5gg99g"; depends=[]; }; IsoCI = derive2 { name="IsoCI"; version="1.1"; sha256="0r7ksfic6p2v95c953s4gbzzclk4ldxysm8szb8xba1w0nx2izil"; depends=[KernSmooth]; }; IsoCheck = derive2 { name="IsoCheck"; version="0.1.0"; sha256="06g0srp14yiha95mbmifaqf5yr5ppjnc20nyr237ah3l776mhsif"; depends=[dplyr gtools plyr]; }; + IsoCorr = derive2 { name="IsoCorr"; version="1.0"; sha256="0rhbclbpfd9d0dawbwwprlzx2j9k59gsmrb11yabiv5305b7vpx8"; depends=[]; }; IsoGene = derive2 { name="IsoGene"; version="1.0-24"; sha256="0flm0mszankvl3aizwsazyhvz2xkr4gfqiqywpc0r1swqj19610r"; depends=[affy Biobase ff Iso xtable]; }; - IsoSpecR = derive2 { name="IsoSpecR"; version="2.1.2"; sha256="11vni4fwwfwby0r3bsidnb05v1phim5l9njl03l40d2sw08wr11s"; depends=[Rcpp]; }; - IsoplotR = derive2 { name="IsoplotR"; version="3.4"; sha256="14y4n1v0lrcff4fx3iiywph11zqjarzzv0nbx7pcm9yvyxkh83zf"; depends=[MASS]; }; - IsoriX = derive2 { name="IsoriX"; version="0.8.1"; sha256="0rr9frj0mhismls60vgax357jgfyq2wci7rvhvp70fh5k998mzid"; depends=[lattice latticeExtra numDeriv raster rasterVis sp spaMM viridisLite]; }; + IsoSpecR = derive2 { name="IsoSpecR"; version="2.1.3"; sha256="0cy9y3lh20xxj9sah8s2zrwnbzk39s5xmscj4mskvn897bmlksh6"; depends=[Rcpp]; }; + IsoplotR = derive2 { name="IsoplotR"; version="3.6"; sha256="0dm8kr2m13rwgw4g45k71l3chd4zs9vqrhr2hwi37zxgn84z3cy3"; depends=[MASS]; }; + IsoplotRgui = derive2 { name="IsoplotRgui"; version="3.6"; sha256="1xn11ybr9ab73dchhgmd7k62sqlbg00hz8rfdpzncfgfdxyanhrm"; depends=[httpuv IsoplotR jsonlite later]; }; + IsoriX = derive2 { name="IsoriX"; version="0.8.2"; sha256="1yk2xlz658c1kvm3kb89qmacy5g9qnzjawi2pk5xkn7g9v214adr"; depends=[lattice latticeExtra numDeriv raster rasterVis sp spaMM viridisLite]; }; IsotopeR = derive2 { name="IsotopeR"; version="0.5.4"; sha256="0xgha5alh5y5qfz00rl73q4xlamnmrwij7kckljmy6zgrlrdnl6x"; depends=[colorspace ellipse fgui plotrix runjags]; }; - ItemResponseTrees = derive2 { name="ItemResponseTrees"; version="0.2.5"; sha256="02lfirlahc1v6mm24j2zvc485q64ybdmh65fgvq8bvy9kgj902kh"; depends=[checkmate dplyr generics glue magrittr MASS Matrix mirt purrr rlang sets stringr tibble tidyr tidyselect]; }; JADE = derive2 { name="JADE"; version="2.0-3"; sha256="1fj2wawx5ac1fvlp28naqha0i17f1sb47j2qqzgccvx17ycqmmjn"; depends=[clue]; }; JASPAR = derive2 { name="JASPAR"; version="0.0.1"; sha256="0wiyn7cz45hwy9zkvacx28zdrg78q6715cg4r9xgcb39q25s0dcy"; depends=[gtools]; }; - JFE = derive2 { name="JFE"; version="2.1.3"; sha256="16fbwi9znvf560vlrpdipg69vw1kyg2081iz1l2adc2wyxp81dda"; depends=[BurStFin fAssets fBasics fPortfolio FRAPO iClick MASS quantmod rugarch tcltk2 timeDate timeSeries xts zoo]; }; + JFE = derive2 { name="JFE"; version="2.5.1"; sha256="1393gdfm2kv0c0vadkzcj2kcxscrlgg02kihkhbsvnjzadhi1lb1"; depends=[caret fPortfolio magrittr tcltk2 xts zoo]; }; JGEE = derive2 { name="JGEE"; version="1.1"; sha256="078348n623hlyc3n9yh67vv5acsnxapmbwybvrb1i7kawmqw5msi"; depends=[gee MASS]; }; JGL = derive2 { name="JGL"; version="2.3.1"; sha256="02p9z32f8j60wnh1szkjr2zfa9zwyw0gqinpsvll4dymf8cjawpw"; depends=[igraph]; }; JGR = derive2 { name="JGR"; version="1.8-7"; sha256="0bwnps4n078ssmmnxc3pbhs3wc2x45i9f567yb5h7nqscmhb20fi"; depends=[JavaGD rJava]; }; JM = derive2 { name="JM"; version="1.4-8"; sha256="1nq07hw30fqnag1h08b7crl2yfs85gyrn70aaw11bdbjv06r2x55"; depends=[MASS nlme survival]; }; JMI = derive2 { name="JMI"; version="0.1.0"; sha256="05phkwfb9v4g9jixlvbj6br7sbi64zvrgjwfr0v87ijddkxc9si9"; depends=[Rcpp RcppArmadillo]; }; JMbayes = derive2 { name="JMbayes"; version="0.8-85"; sha256="0s11jpzflc2zg60g4ffcw23c2f4zz3mzddrc2cl5y43xl2v304lb"; depends=[doParallel foreach Hmisc jagsUI MASS nlme Rcpp RcppArmadillo rstan shiny survival xtable]; }; - JMcmprsk = derive2 { name="JMcmprsk"; version="0.9.8"; sha256="0dzwyndiind2h6i2mpaizzd7iyaxq31g7w8xzz64fmagfdza9d6r"; depends=[MASS Rcpp statmod]; }; + JMcmprsk = derive2 { name="JMcmprsk"; version="0.9.9"; sha256="0zpl2dp6z7qrpmcsv07fbznr68pa4gz3znd7a55pwdknc41nk4m6"; depends=[dplyr MASS pracma Rcpp reshape2 statmod]; }; JMdesign = derive2 { name="JMdesign"; version="1.1"; sha256="0w5nzhp82g0k7j5704fif16sf95rpckd76jjz9fbd71pp2d80vlh"; depends=[]; }; - JOP = derive2 { name="JOP"; version="3.6"; sha256="1kpb1dy2vm4jgzd3h0qgdw53nfp2qi74hgq5l5inxx4aayncclk7"; depends=[dglm Rsolnp]; }; JOUSBoost = derive2 { name="JOUSBoost"; version="2.1.0"; sha256="0f3rr7aw20nvmlpqrq3wzgmr55lqdqhk3wphpqq7msgvaf1zrcl7"; depends=[doParallel foreach Rcpp rpart]; }; JPEN = derive2 { name="JPEN"; version="1.0"; sha256="12rvp5bmlkwyr1gg336k655hp09gym0d2wwry70c1rz30x1sf2zs"; depends=[mvtnorm]; }; JQL = derive2 { name="JQL"; version="3.6.9"; sha256="0d926hngv4r6zl5f6yai3jwhl9hql2hv6ja3yjgplglkns66g4lh"; depends=[caret pdist randomForest]; }; JRF = derive2 { name="JRF"; version="0.1-4"; sha256="1xpvscn9iawwa0vfh3kfwzdni436bf42nvm18b8abh033ljvqpij"; depends=[]; }; + JSM = derive2 { name="JSM"; version="1.0.1"; sha256="0vcsay1jpjlfdwykad4hp319swr9lv1ajlcyhmiizwr1ph3f1az9"; depends=[nlme Rcpp RcppEigen statmod survival]; }; + JSconsole = derive2 { name="JSconsole"; version="0.1.0"; sha256="1jpa48xb7hh4ap25sqrl67rzqra53qhcfwpfgs6hmpjnrld8n3ha"; depends=[rstudioapi V8]; }; JSmediation = derive2 { name="JSmediation"; version="0.1.1"; sha256="06p413jfv02k88jdsbplnz696knxglgcqa4pjrgkhhic6awdh0jf"; depends=[broom data_table dplyr glue knitr magrittr MASS purrr rlang tibble]; }; - JWileymisc = derive2 { name="JWileymisc"; version="1.1.1"; sha256="10nig4b9fgxnlyaiippk6sp65ia1lcwy344cry9b5pdlxnhzva88"; depends=[cowplot data_table emmeans extraoperators ggplot2 ggthemes lavaan lme4 MASS mgcv mice multcompView psych quantreg rms robustbase VGAM]; }; + JWileymisc = derive2 { name="JWileymisc"; version="1.2.0"; sha256="0c140kcq0fw91r4g33xri8yxms0nk291zi708h00pszliwpg4qhq"; depends=[data_table emmeans extraoperators ggplot2 ggpubr ggthemes lavaan lme4 MASS mgcv mice multcompView psych quantreg rms robustbase VGAM]; }; JacobiEigen = derive2 { name="JacobiEigen"; version="0.3-3"; sha256="1zcs9qhf2216c590hj6qc837rnciyfsirg4zg655vxn59fgzpvyb"; depends=[Rcpp]; }; JamendoR = derive2 { name="JamendoR"; version="0.1.0"; sha256="1v5i4ggc4igp83pik32fqp07ff8iv7dp93b3qhxcsy1msa4l88lx"; depends=[dplyr httr jsonlite]; }; - JavaGD = derive2 { name="JavaGD"; version="0.6-2"; sha256="0bqfwfq2smkxsci2ryw35qms600iffxs1vnm7j5yhqxay4ksmbj7"; depends=[rJava]; }; + JavaGD = derive2 { name="JavaGD"; version="0.6-4"; sha256="1q48iykjzy22avmx0yy03vv9c7h87qsphg5hsrzfmx5gvck61m06"; depends=[rJava]; }; Jaya = derive2 { name="Jaya"; version="0.1.9"; sha256="0b23l7xp4waxjy1vkk09xaali5axr5900v9hkki4f75wh4gb1l53"; depends=[GA]; }; Jdmbs = derive2 { name="Jdmbs"; version="1.4"; sha256="14wprvxjyx1da1642z11wkzjiyxd5rbpaw1mzq4x6aw53dvh1kgv"; depends=[ggplot2 igraph png]; }; Jmisc = derive2 { name="Jmisc"; version="0.3.1"; sha256="1szn29dng54l2xmrm6pg3d5rmwdc1ks23vsnsmplnr5rx7yj002s"; depends=[]; }; JoF = derive2 { name="JoF"; version="0.1.0"; sha256="1my6fc4awrc822ibsvx3hiz4l49vp8dx0j05v56r7d27xizy8j0j"; depends=[]; }; JoSAE = derive2 { name="JoSAE"; version="0.3.0"; sha256="1vjxzbfs8a7kpmn2lb9dca67d4njmzjr3pl16s0r9ihmmxxwwili"; depends=[nlme]; }; Johnson = derive2 { name="Johnson"; version="1.4"; sha256="12ajcfz5mwxvimv8nq683a2x3590gz0gnyviviyzf5x066a4q0lj"; depends=[]; }; - JointAI = derive2 { name="JointAI"; version="0.6.1"; sha256="10q1wnyj56mdgkp9m2csxxxpsl7k71a8vq27cbpisf3b1anq9yyw"; depends=[coda doParallel foreach MASS mcmcse rjags rlang]; }; + JointAI = derive2 { name="JointAI"; version="1.0.1"; sha256="136100b7lhq2r8nk69l2zwfrkmdvhb9y0f4nfrkzi0hrsm2434sx"; depends=[coda foreach future MASS mathjaxr mcmcse rjags rlang survival]; }; JointModel = derive2 { name="JointModel"; version="1.0"; sha256="1zgs5c7saqyqxvxmhw5sxy5w67abq344aid6igw1da05bfy2az6h"; depends=[lme4 statmod survival]; }; JointNets = derive2 { name="JointNets"; version="2.0.1"; sha256="18n9dsy0w0nh7dznp6gw6g5fhhjhf5y589nb49hri0721kq1h3rb"; depends=[brainR igraph JGL lpSolve MASS misc3d oro_nifti pcaPP rgl shiny]; }; Julia = derive2 { name="Julia"; version="1.1"; sha256="0i1n150d89pkds7qyr0xycz6h07zikb2y07d5fcpaqs4446a8prg"; depends=[]; }; JuliaCall = derive2 { name="JuliaCall"; version="0.17.1"; sha256="0v0mn3q9mp8xq6bpm870v9a228b20n22cph3s0ngphni07pi0kwr"; depends=[knitr Rcpp]; }; - JuliaConnectoR = derive2 { name="JuliaConnectoR"; version="0.6.1"; sha256="1i1yc9vcnswfzjqds7x44gcn9fyfr2pn43zkqcqxl90x2yl0kxm9"; depends=[]; }; + JuliaConnectoR = derive2 { name="JuliaConnectoR"; version="0.6.2"; sha256="0xz7w8a8ilklrh71s9jpd0bai0lnljakpgyn89q4d3k9074mznf0"; depends=[]; }; JumpTest = derive2 { name="JumpTest"; version="1.1"; sha256="0y375m5477nq0ybnjmfnd8hi45d8jmdnprqvw5f70llpd7bcghh0"; depends=[MASS Rcpp RcppEigen]; }; KANT = derive2 { name="KANT"; version="2.0"; sha256="169j72pmdkcj6hv8qgmc02aps0ppvvl1vnr1hzrb1gsf7zj7bs3y"; depends=[affy Biobase]; }; KCSKNNShiny = derive2 { name="KCSKNNShiny"; version="0.1.0"; sha256="13gzqf3g7vj8cc0xm5902q7lad2way8d0ri1fs01dnv97wmwbxvn"; depends=[caret dplyr FNN rhandsontable shiny]; }; @@ -2140,12 +2218,12 @@ in with self; { KDViz = derive2 { name="KDViz"; version="1.3.1"; sha256="1if4lkq9kvncqw56j7m9kh4piph091zkivvnhxzxj72zq661q5br"; depends=[htmlwidgets igraph mpa networkD3 rvest stringr tm xml2]; }; KENDL = derive2 { name="KENDL"; version="1.1"; sha256="05vsh3x0li964a485q3n19c7fahcprvg1bnrvffagkxf8w1iz153"; depends=[]; }; KERE = derive2 { name="KERE"; version="1.0.0"; sha256="1b16cb3ihcsp9jffmd45sd7ia4pibikmj62ad344wmq22q4fpliy"; depends=[]; }; - KFAS = derive2 { name="KFAS"; version="1.3.7"; sha256="1bmph8ww9f5xpwdpwb4h4wsjkvsbgj30qz7hzfk1wkl6hc3jxxxk"; depends=[]; }; + KFAS = derive2 { name="KFAS"; version="1.4.1"; sha256="0arsxak3j8xa6w3rqp8z2bh0vrp1yh6v6hdqjl0j6d0db7960ps8"; depends=[]; }; KFKSDS = derive2 { name="KFKSDS"; version="1.6"; sha256="1g11f936p554bfxlm4slxhfxki5vqkks1mrbqw4w83v2rcb50f8d"; depends=[]; }; KGode = derive2 { name="KGode"; version="1.0.3"; sha256="0r5664vwq3nsjg08xxsx3lrvc4z2758fc013j8djwz5ydaas7xxs"; depends=[mvtnorm pracma pspline R6]; }; KMDA = derive2 { name="KMDA"; version="1.0"; sha256="0x4kjjdd59wvgg699vrj99wqg3s1qbkbskis1c34xv9b8bzcv94j"; depends=[]; }; KMsurv = derive2 { name="KMsurv"; version="0.1-5"; sha256="0hi5vvk584rl70gbrr75w9hc775xmbxnaig0dd6hlpi4071pnqjm"; depends=[]; }; - KMunicate = derive2 { name="KMunicate"; version="0.0.2"; sha256="0xkghzw7vdd4d0yq3hrz6xjkxbzivjjc120axwn3ydy5jqc665g0"; depends=[checkmate cowplot ggplot2 pammtools survival tidyr]; }; + KMunicate = derive2 { name="KMunicate"; version="0.2.0"; sha256="1ji1db4h8mxgs37swr05l74l0yl06jfizdhfmmznbac4p1fx3d6c"; depends=[checkmate cowplot ggplot2 pammtools survival tidyr]; }; KNNShiny = derive2 { name="KNNShiny"; version="0.1.0"; sha256="16zm8bhdivaap3mvhdx2qn1b1j2iqyarclb0y2qd1n4viwcfm9c1"; depends=[caret dplyr e1071 FNN psycho rhandsontable rmarkdown shiny]; }; KOBT = derive2 { name="KOBT"; version="0.1.0"; sha256="0dw6s68x95d4z5a6p8bs1368jcxv5jx0wd87js28i2qm3q57ss71"; depends=[glmnet knockoff MASS Rdpack spcov xgboost]; }; KOGMWU = derive2 { name="KOGMWU"; version="1.2"; sha256="1vz0099gp1r10n7w4p480l8rswdw100sns196d9xin2ibmmd2fx9"; depends=[pheatmap]; }; @@ -2156,39 +2234,39 @@ in with self; { KSEAapp = derive2 { name="KSEAapp"; version="0.99.0"; sha256="1gfgpa2d32y6bzvf4ww70sm7niq34sqmyrhi0phlqxshqq9xviqc"; depends=[gplots]; }; KSPM = derive2 { name="KSPM"; version="0.2.1"; sha256="13fq0d016z6880rr93y918l27fsxd5dxc6gbdnkma5sgsjni5cxh"; depends=[CompQuadForm DEoptim expm]; }; KScorrect = derive2 { name="KScorrect"; version="1.4.0"; sha256="1khvwc610yp3fd4fn0wcgqpzxg9g7sicjjmwvfcahs8qxn3m5vfa"; depends=[doParallel foreach iterators MASS mclust]; }; - KSgeneral = derive2 { name="KSgeneral"; version="0.1.2"; sha256="15h65pkkdkakqc86vh90qx2ny9pfmd2pm5vc3qrb797l4b02mqqc"; depends=[dgof MASS Rcpp]; }; - KTensorGraphs = derive2 { name="KTensorGraphs"; version="1.0"; sha256="1gjcclcqx123xl0i0a31my8l7w4h17y9yxn1dw35dbiyahvn4sdj"; depends=[]; }; + KSgeneral = derive2 { name="KSgeneral"; version="1.0.0"; sha256="0pfrhmqgdxa13bjs1jgqkggbjfvwbmx6khkjxcfb96rnf2wccgyc"; depends=[dgof MASS Rcpp]; }; + KTensorGraphs = derive2 { name="KTensorGraphs"; version="1.1"; sha256="1szl66ix6c6vb0zzyp404psglx3lk125903zc4za0qfzcic7a9p6"; depends=[]; }; KappaGUI = derive2 { name="KappaGUI"; version="2.0.2"; sha256="0vklny804xpd9r60j4a01j2gak8jizwjw0abf7yvbcalv3zbpb3k"; depends=[irr shiny]; }; KappaV = derive2 { name="KappaV"; version="0.3"; sha256="13mmfb8ijpgvzfj20andqb662950lp9g25k5b26r5ba65p7nhva7"; depends=[maptools PresenceAbsence rgeos sp]; }; - KarsTS = derive2 { name="KarsTS"; version="2.3"; sha256="08z5gdawkp1chpkkns019aznm6ybrnamv3s9lyrlxqb8x6fj2r8q"; depends=[circular forecast infotheo mgcv missForest MVN nonlinearTseries plot3D rgl stinepack stlplus tcltk2 tkrplot tseries tseriesChaos zoo]; }; + KarsTS = derive2 { name="KarsTS"; version="2.4"; sha256="1jd4303xipf7b8bfqvz6xfw0wc2zk61n1926x5wf2ik82l507mzx"; depends=[circular forecast infotheo mgcv missForest MVN nonlinearTseries plot3D rgl stinepack stlplus tcltk2 tseries tseriesChaos zoo]; }; KbMvtSkew = derive2 { name="KbMvtSkew"; version="1.0.2"; sha256="14g27a0dkj4gpf5l2k96fd3aa21fz8b85lf5a1jxj0qgjmr4kib0"; depends=[]; }; KenSyn = derive2 { name="KenSyn"; version="0.3"; sha256="0s8sq3caxn4swac81196dp52r9lbmxb3ni45yaxh53f5g34slsi8"; depends=[lme4 metafor nlme]; }; Kendall = derive2 { name="Kendall"; version="2.2"; sha256="0z2yr3x2nvdm81w2imb61hxwcbmg14kfb2bxgh3wmkmv3wfjwkwn"; depends=[boot]; }; - KernSmooth = derive2 { name="KernSmooth"; version="2.23-17"; sha256="11g6b0q67vasxag6v9m4px33qqxpmnx47c73yv1dninv2pz76g9b"; depends=[]; }; + KernSmooth = derive2 { name="KernSmooth"; version="2.23-18"; sha256="14640ddvxmczd5xjg1xsd51gll2glfg946vks8wmac6jb8680d43"; depends=[]; }; KernSmoothIRT = derive2 { name="KernSmoothIRT"; version="6.4"; sha256="0qqlmcd04m89pmhrbmxxx4lzzb6sksgrm0j8x7fs5r0sxdqy6rcp"; depends=[plotrix Rcpp rgl]; }; KernelKnn = derive2 { name="KernelKnn"; version="1.1.0"; sha256="1w8k4b2q5bh0kx72ixrdb43aificl991j1akh00xn1zx3gbrjb0p"; depends=[Rcpp RcppArmadillo]; }; Kernelheaping = derive2 { name="Kernelheaping"; version="2.2.2"; sha256="1aq1yhbs07wl5rjz4v5b8k8brap4p25f76qwr5cif655fxdzxc20"; depends=[fastmatch ks magrittr MASS mvtnorm plyr sp sparr]; }; Keyboard = derive2 { name="Keyboard"; version="0.1.0"; sha256="12i9zfpbh2297j78yrz6nnbmj926n3xdkbzmy1p9z7g9bi4cqrp1"; depends=[Iso Rcpp]; }; KnapsackSampling = derive2 { name="KnapsackSampling"; version="0.1.0"; sha256="17yzmd11k1n5iy54vbcvpzvkm8ypbl6n1kfi931wwrrcq9y7hg22"; depends=[lpSolve]; }; + KneeArrower = derive2 { name="KneeArrower"; version="1.0.0"; sha256="1blmim4l7375psa9c3wbpksywj5nfbawly4001n6311wcv4dybl5"; depends=[signal]; }; KnockoffScreen = derive2 { name="KnockoffScreen"; version="0.1.0"; sha256="0z0gzss6p3p9ilcg6jj4nqkb9h3lqc679x1q2vnmyiv6zl9cdrbm"; depends=[CompQuadForm data_table Matrix seqminer SPAtest]; }; Knoema = derive2 { name="Knoema"; version="0.1.16"; sha256="0v6w8rrw8nd4l1by5w9xd4hbxp55cma89kljha47ykvmnflsrjsc"; depends=[base64enc digest httr jsonlite lubridate xts zoo]; }; KnowBR = derive2 { name="KnowBR"; version="2.0"; sha256="0i934gff8ldg0lm5cfcf3ip7abnparaaviq8avs7cbnacs6nw8i1"; depends=[fossil mgcv plotrix sp vegan]; }; KnowGRRF = derive2 { name="KnowGRRF"; version="1.0"; sha256="0nk0baibd184rsg23jx1wg4c2fcaqf8ww7822xrs3w5ym6vwd0rs"; depends=[MASS PRROC randomForest RRF]; }; - KoulMde = derive2 { name="KoulMde"; version="3.1.1"; sha256="0k9077jpr6pv862l7rmrjmi06rl0nlfvn4zdxybsd876r1g861d1"; depends=[expm Rcpp RcppArmadillo]; }; + KoulMde = derive2 { name="KoulMde"; version="3.2.1"; sha256="0yx04my2vwjpi4l35h1i5xwqckca8b72divww39y1frcvia33g08"; depends=[expm Rcpp RcppArmadillo]; }; Kpart = derive2 { name="Kpart"; version="1.2.2"; sha256="02df0pr8a0gm8558gbw9svxf5sybmg27grymy71ar9hjnhw5xlf2"; depends=[leaps]; }; KraljicMatrix = derive2 { name="KraljicMatrix"; version="0.2.1"; sha256="0yzilmiiyzd2x3v0cnjphf0wdwiblh37kgrvmfrdy49qly48pvi2"; depends=[dplyr ggplot2 magrittr tibble]; }; KrigInv = derive2 { name="KrigInv"; version="1.4.1"; sha256="0x12xff7lgr1v2243shfz9a8r02qs56p7i0b8j2s6bmrzj1abrwb"; depends=[anMC DiceKriging mvtnorm pbivnorm randtoolbox rgenoud]; }; - Kurt = derive2 { name="Kurt"; version="1.0"; sha256="03ivbvgkw3irmcv41zp1wcqzykz81pvvnh39b20qhbgrai2yln79"; depends=[expm labstatR matrixcalc polynom]; }; L0Learn = derive2 { name="L0Learn"; version="1.2.0"; sha256="17k006nxn9n66nh6nrnhv24p150s7icbhzsaimjidj7hx2c24lms"; depends=[ggplot2 Matrix Rcpp RcppArmadillo reshape2]; }; L1mstate = derive2 { name="L1mstate"; version="1.0"; sha256="04gw078zyzpmnrxibqz27gf4dgyhhcn6lg15w10c6la079vfixx2"; depends=[colorspace MASS Matrix mstate Rcpp RcppEigen]; }; - L1pack = derive2 { name="L1pack"; version="0.38.19"; sha256="09n1045lsx1ap47mhzcqghmwwhj24kvpjjr3ysprj058jp5g7ri0"; depends=[]; }; + L1pack = derive2 { name="L1pack"; version="0.38.196"; sha256="1cayk11wp6f2vpyz14j7my8wpd8hny2mxpjsdsw4wlz0mmwml70l"; depends=[fastmatrix]; }; L2DensityGoFtest = derive2 { name="L2DensityGoFtest"; version="0.1.0"; sha256="0yhcj58inmj3qafvvpghs1qi8h5f14jki4qxy28jc7g8ciqxcw60"; depends=[fGarch kedd nor1mix]; }; - LAGOSNE = derive2 { name="LAGOSNE"; version="2.0.1"; sha256="1lay0zb24k5ms4nfr62pgpriy7nfafnkdjjrd7xxznsi7dqrav0y"; depends=[curl dplyr lazyeval magrittr memoise progress purrr rappdirs rlang sf stringr tibble tidyr]; }; + LAGOSNE = derive2 { name="LAGOSNE"; version="2.0.2"; sha256="0fhy590mnkypknxk34c7vrhwrgsjrkf1f0yvfbjy1kvzvla0hjkl"; depends=[curl dplyr lazyeval magrittr memoise progress purrr qs rappdirs rlang sf stringr tibble tidyr]; }; LAM = derive2 { name="LAM"; version="0.5-15"; sha256="18p8w2n2k4788vpxhdxnmcafwj7a5bvihk530fiynkra3xrn1cr4"; depends=[CDM Rcpp RcppArmadillo sirt]; }; LANDD = derive2 { name="LANDD"; version="1.1.0"; sha256="13szkww9nw8zywfrqd8mwgj9csgragm0bx8ia52rcpakpc3hv3hx"; depends=[BH doParallel fdrtool foreach GGally ggplot2 GOSemSim GOstats igraph intergraph Matrix modeest mvtnorm pROC Rcpp]; }; LARF = derive2 { name="LARF"; version="1.4"; sha256="1sqib7smgjacn07ishwls1nlbvcb6fpp1vhrjwf9g4xf9jk30i8h"; depends=[Formula]; }; LARisk = derive2 { name="LARisk"; version="0.1.0"; sha256="05pszgm53dndq114qqb3kcddbvc16a9mgalxjsyh56aa2a4wh7q6"; depends=[Rcpp]; }; - LAWBL = derive2 { name="LAWBL"; version="1.1.0"; sha256="0sl2pdmf297qds9p818wd17mlj3w6qfynqvc07myjxiwsv8fimkk"; depends=[coda MASS]; }; + LAWBL = derive2 { name="LAWBL"; version="1.3.0"; sha256="0ixxppxg9kaqk3h0labiq0z0m8x4gzvyh41z4g1ni33br97vdq76"; depends=[coda MASS]; }; LBSPR = derive2 { name="LBSPR"; version="0.1.5"; sha256="0bkq7lj45c5inm4klwxkwv1y39rkhwis53d1qsr908k5xmkbgg0i"; depends=[dplyr ggplot2 gridExtra plotrix RColorBrewer Rcpp shiny tidyr]; }; LCA = derive2 { name="LCA"; version="0.1.1"; sha256="014kih33y8b9nls0pcigw68jbz7vgnq8w1xbwm2d37g1m5y6xlyw"; depends=[]; }; LCAextend = derive2 { name="LCAextend"; version="1.3"; sha256="1l75y3vkbsmsm3pjd5pwy0hlv6gz5ryxs4pkx9aiyhxz2y9wnhpb"; depends=[boot kinship2 mvtnorm rms]; }; @@ -2199,10 +2277,12 @@ in with self; { LCox = derive2 { name="LCox"; version="0.1.0"; sha256="1cqkqmi6bkd41xxwqqzpdiwdv8m5nrqz3f6cajnnbmgfcjawmrzq"; depends=[fdapace survival]; }; LDATS = derive2 { name="LDATS"; version="0.2.7"; sha256="0im5lvhfbxvrkz9yvfg5xibzdlss869rdz5mixr4ric9lj0ixx0g"; depends=[coda digest extraDistr lubridate magrittr memoise mvtnorm nnet progress topicmodels viridis]; }; LDAvis = derive2 { name="LDAvis"; version="0.3.2"; sha256="1y9wd379rfv3rd3f65ll21nvh6i8yafvv11f8gw8nn06194dgfzg"; depends=[proxy RJSONIO]; }; + LDNN = derive2 { name="LDNN"; version="1.10"; sha256="092mnjdmc0l471vd8nym09r9sfx1scp4x6nh22mj6413vaicagq0"; depends=[devtools keras reticulate tensorflow]; }; LDOD = derive2 { name="LDOD"; version="1.0"; sha256="0mf2sy01yv57mqicrz08a17m6crigklx6fmw9zpxv7g85qw1iq4v"; depends=[Rmpfr Rsolnp]; }; LDPD = derive2 { name="LDPD"; version="1.1.2"; sha256="1khdx8vwlpliyjc4sxcdiywbxl8lc9f5s3457vcip1j8dv537lbm"; depends=[MASS nleqslv]; }; LDRTools = derive2 { name="LDRTools"; version="0.2-1"; sha256="05srfyplsypi3whfa71lx7pnad23irpf0p7rxmrpv28jgdmrz6wf"; depends=[]; }; - LDcorSV = derive2 { name="LDcorSV"; version="1.3.2"; sha256="0lvk3xz400yd3w0cjdfi6hir1ym1mffd504vycwgck5fkzljpcvx"; depends=[]; }; + LDcorSV = derive2 { name="LDcorSV"; version="1.3.3"; sha256="0wr8i9q9p48vpcia8v3rd8bb2pfijr9r6kg9x26k4wncpg7n83cp"; depends=[]; }; + LDheatmap = derive2 { name="LDheatmap"; version="1.0-4"; sha256="1jp578cf29qcgx95w10lpymlwx2pgjsf0nypwkl9b8g635gkisq7"; depends=[genetics Rcpp snpStats]; }; LDlinkR = derive2 { name="LDlinkR"; version="1.0.2"; sha256="0143g41hcljqsfngly56g47pc2pj5xc3myyqia1akxrlwpzdlh7h"; depends=[httr]; }; LDtests = derive2 { name="LDtests"; version="1.0"; sha256="1jwqr7zlp9hv7vw8xp80xvrwbdv796wjgr914v393wfa07j5wbd1"; depends=[]; }; LEANR = derive2 { name="LEANR"; version="1.4.9"; sha256="053xy13ys5hibafdnbkwqdk36hw7dhanp4frfacpfpn5f9nfh95r"; depends=[foreach igraph]; }; @@ -2210,28 +2290,31 @@ in with self; { LEAPFrOG = derive2 { name="LEAPFrOG"; version="1.0.7"; sha256="0z9ahkk4qzc45h1r806frv9cd84vvshvn5mr84gx7qdxljfkfq6h"; depends=[alabama MASS]; }; LEGIT = derive2 { name="LEGIT"; version="1.3.1"; sha256="19wkqj7wj8lpni2i2bbfa8l77xb0wbb121fb82srsi6hn76i392g"; depends=[boot doSNOW foreach formula_tools glmnet Hmisc iterators pROC RColorBrewer snow]; }; LFDR_MLE = derive2 { name="LFDR.MLE"; version="1.0.1"; sha256="0ykcd24w71zxb53nch041g7xh83gmg1ia3sysdpn0yzkhm0w7cdl"; depends=[]; }; + LFDR_MME = derive2 { name="LFDR.MME"; version="1.0"; sha256="1ln0s3ki37cz1a7r96xn0zqw42im7fcanmz2vjk5zycshb423y22"; depends=[]; }; LFDREmpiricalBayes = derive2 { name="LFDREmpiricalBayes"; version="1.0"; sha256="1imw3djmbpdyplv9dmdzzirp9imk88j0kcxcyfh8yr9ywgd77x6b"; depends=[matrixStats R6]; }; LGEWIS = derive2 { name="LGEWIS"; version="1.1"; sha256="1i52vp0ghjzmyh4r8h6jpyij7x4skw99xvw017b56m8fg64zy70r"; depends=[CompQuadForm geeM mvtnorm SKAT]; }; LGRF = derive2 { name="LGRF"; version="1.0"; sha256="1kdx6y55aa9n6v43zfz6jk8amvvxbx79sqm1jx4ihgkpgcdglan7"; depends=[CompQuadForm geepack SKAT]; }; - LHD = derive2 { name="LHD"; version="1.1.0"; sha256="0aqsb5qfv15il4b52agn4izf6lxvw9z9hh5mhirgfnbqb6w6l0r3"; depends=[]; }; + LHD = derive2 { name="LHD"; version="1.3.1"; sha256="0y8z829s6l4hml4j0cdd5sh0pax1g8vvnphmvnyf506i8z72k141"; depends=[numbers]; }; LICORS = derive2 { name="LICORS"; version="0.2.0"; sha256="0p9y21k1mj1v397jpb5g6jiw7rpzbyfwr4kv2rp3lyxyasy2ykf0"; depends=[fields FNN locfit Matrix mvtnorm RColorBrewer zoo]; }; + LIHKGr = derive2 { name="LIHKGr"; version="0.1.0"; sha256="16yyalsdbaxncgfabsz2q2fixzmwyd62gvnvnxazf4vlypp6xlqz"; depends=[dplyr magrittr purrr R6 raster RSelenium rvest tibble xml2]; }; LIHNPSD = derive2 { name="LIHNPSD"; version="0.2.1"; sha256="08ils29vvaq6abkgxbh028vwjw6l6h10cirbnwr65s458zvh4xqv"; depends=[BB Bolstad2 moments optimx Rmpfr sn]; }; LIM = derive2 { name="LIM"; version="1.4.6"; sha256="03x1gnm06bw1wrzc01110bjzd2mvjdzbc2mbrazh22jrmb32w5d8"; depends=[diagram limSolve]; }; LINselect = derive2 { name="LINselect"; version="1.1.3"; sha256="1qxqwph5ja2kf1s4ggsv8w6hjgf9mr53a0gahhjix2v78309z42g"; depends=[elasticnet gtools MASS mvtnorm pls randomForest]; }; LIStest = derive2 { name="LIStest"; version="2.1"; sha256="1gk253v3f1jcr4z5ps8nrqf1n7isjhbynxsi9jq729w7h725806a"; depends=[]; }; LLM = derive2 { name="LLM"; version="1.1.0"; sha256="0kxppzaim7cmjawg5rjih4dsz8adq0asairgq3vx5lyjppb2cybx"; depends=[partykit reghelper RWeka scales stringr survey]; }; LLSR = derive2 { name="LLSR"; version="0.0.2.19"; sha256="19flvf15sn3fd21fymcg7ag1psl265m0i7siw1fqb6j6fvsn0y8v"; depends=[crayon digest dplyr ggplot2 minpack_lm nleqslv rootSolve svDialogs svglite XLConnect]; }; - LMERConvenienceFunctions = derive2 { name="LMERConvenienceFunctions"; version="2.10"; sha256="08jz0i7sv7gn3bqckphbmnx0kc6yjnfvi06iyf7pcdzjaybxhj06"; depends=[fields LCFdata lme4 Matrix mgcv rgl]; }; - LMest = derive2 { name="LMest"; version="2.6.1"; sha256="16amjb7dj5czlsjmr5s2hnjrfsiqwnc430q3hcncp3lllqib552g"; depends=[Formula MASS mix mmm MultiLCIRT mvtnorm]; }; - LMfilteR = derive2 { name="LMfilteR"; version="0.1.2"; sha256="10agjrljnqw689nn9af9ihhb9sq2gmsx7l3zfmrizkavjjk67mcd"; depends=[MASS]; }; + LMERConvenienceFunctions = derive2 { name="LMERConvenienceFunctions"; version="3.0"; sha256="0jg889qh5a9wdi01yiw6z7kivs9dzh5dcq39f4zifdpqzglhshzb"; depends=[fields LCFdata lme4 Matrix mgcv]; }; + LMest = derive2 { name="LMest"; version="3.0.1"; sha256="1ibzk6g2lxxb6cylcfml41dmy1aj4alzi066vsd2v1mfn2b9g1r7"; depends=[diagram Formula MASS mclust mix MultiLCIRT mvtnorm scatterplot3d]; }; + LMfilteR = derive2 { name="LMfilteR"; version="0.1.3"; sha256="0c27154jghfl83n3sn26pr8mjcybrq02glvnjcx8hllrmz4gmnmi"; depends=[MASS]; }; + LMoFit = derive2 { name="LMoFit"; version="0.1.6"; sha256="10xiaa5h8c0sq9z70yjs29z8jnjyqgybdv33d6s2100h3n46jd31"; depends=[ggplot2 lmom pracma sf]; }; LN0SCIs = derive2 { name="LN0SCIs"; version="0.1.5"; sha256="09zr6lrvv7lw9qp3vz4n2dv0v3q7wq06wwvwpb2pm0r335bnrf89"; depends=[]; }; - LNIRT = derive2 { name="LNIRT"; version="0.4.0"; sha256="0g2yqpsxz2fsvgvgn60yv2k8mv63anf6g2zzd9njarc524n874r8"; depends=[MASS]; }; + LNIRT = derive2 { name="LNIRT"; version="0.5.0"; sha256="1s7dys4a1gygb9k30l9zby3ls5fwrdy3dvvw4mwdgqsd84zw0rrw"; depends=[MASS]; }; LOGAN = derive2 { name="LOGAN"; version="1.0.0"; sha256="00y8kcykw01gv2g20vmpwkc3qqyafwbiw5pa731xlfnh1b8sn0hi"; depends=[dplyr foreign ggplot2 magrittr modules pander psych rlang stringr]; }; LOGICOIL = derive2 { name="LOGICOIL"; version="0.99.0"; sha256="1wgg7kigzzk5ghjn3hkjf1bb8d6mvjfmkwq64phri5jpxd742ps9"; depends=[nnet]; }; LOPART = derive2 { name="LOPART"; version="2020.6.29"; sha256="1zxaag5pj3l9rzxhlrkx8q4adlap7wsdysb4y6ijvsmxvv63j22k"; depends=[data_table Rcpp]; }; LOST = derive2 { name="LOST"; version="2.0.2"; sha256="15ggmvjy2k4j692y9h3anfzmb0hgnx66cbr76grwvcfysdx87ick"; depends=[e1071 gdata geomorph MASS miscTools pcaMethods rgl shapes]; }; LPBkg = derive2 { name="LPBkg"; version="1.2"; sha256="1pgv6cb7m2j7qnrzybnv6x67a3ry8kpvisqj86rvxzclc9q56fdn"; depends=[Hmisc orthopolynom polynom]; }; - LPCM = derive2 { name="LPCM"; version="0.46-3"; sha256="1bm5y95lzwcv8arlh55sy17m6hz1x48bcjkrwf3x34ax90qimf66"; depends=[]; }; + LPCM = derive2 { name="LPCM"; version="0.46-7"; sha256="1gdinsfn7y3fmv2zr1y8cvy0qwc9zwzf0q1xsnpbmcwljgxb6zdh"; depends=[]; }; LPGraph = derive2 { name="LPGraph"; version="2.1"; sha256="1d2kslravi3v9kf6sdabwfpa9s9xxqj3s3d7f7qfcrpfydqixq1q"; depends=[car PMA]; }; LPKsample = derive2 { name="LPKsample"; version="2.1"; sha256="0ifhx8w9f6sacmnck2g7i7r742i8bwwzf0rgajw3klw2wni9ikqx"; depends=[apcluster igraph LPGraph mclust]; }; LPM = derive2 { name="LPM"; version="2.8"; sha256="0a4cf7chjyfwp1s8dfyfgbm2k6nybfmfh4bhz8b8pfj1an68bdr6"; depends=[fracdiff MASS powdist]; }; @@ -2242,7 +2325,7 @@ in with self; { LPWC = derive2 { name="LPWC"; version="1.0.0"; sha256="0jgz8rkhhsdiwz7jq568axcsfwlkzdpwssr76zx33r0gz6mf3lln"; depends=[nleqslv]; }; LPmerge = derive2 { name="LPmerge"; version="1.7"; sha256="1wf7hfj670pnzzxyqm3vwrbrvxdbyprh42s5vpv4y54a0w4nr83g"; depends=[Matrix Rglpk]; }; LPower = derive2 { name="LPower"; version="0.1.1"; sha256="00sabp2snfm0175c0cfyv83yd1zb3b8h2wrr7yxgkmr4i3py1fn7"; depends=[MASS nlme]; }; - LPsmooth = derive2 { name="LPsmooth"; version="0.1.1"; sha256="039f3iz4zihwb9lx1243jbjaxy5qwgaa2w9kjdcxqls7ax0bixvf"; depends=[Hmisc LPBkg LPGraph nloptr orthopolynom polynom truncnorm]; }; + LPsmooth = derive2 { name="LPsmooth"; version="0.1.3"; sha256="0fvn6vwfl37xhzzj44vadk8fr3d85zv58jjg7qfdjqvyw8khd59p"; depends=[Hmisc LPBkg LPGraph nloptr orthopolynom polynom truncnorm]; }; LRQMM = derive2 { name="LRQMM"; version="1.2.2"; sha256="1gly4s8pr8wzcv547h6m1qr74q5n45zn0dz0lmx4pfvfgv1kym47"; depends=[GeneticsPed kinship2 Matrix MCMCglmm quantreg R_matlab rsvd SparseM sparsesvd]; }; LRTH = derive2 { name="LRTH"; version="1.3"; sha256="08vakwb7ca7956gifynzijka441yyx0wd5bq5jfhz56lzcxgfb99"; depends=[]; }; LRcontrast = derive2 { name="LRcontrast"; version="1.0"; sha256="0fs06p853r42nws2camvs87py39hb1ssxhfm6d5n9kkq81snfx4q"; depends=[DoseFinding]; }; @@ -2257,48 +2340,52 @@ in with self; { LSMonteCarlo = derive2 { name="LSMonteCarlo"; version="1.0"; sha256="0w5042phkba5dw92r67ppp2s4khjpw5mm701dh9dya9lhj88bz6s"; depends=[fBasics mvtnorm]; }; LSPFP = derive2 { name="LSPFP"; version="1.0.3"; sha256="0wxqpwfyyhk9dig9ji5na7czk19jx14lr9iqb2rllggz4cji9y65"; depends=[bit64 data_table R_utils RCurl seqinr]; }; LSRS = derive2 { name="LSRS"; version="0.2.0"; sha256="0p70v5vbxi1rf055mqgsp8v0lxnaj53bmbghli1764yn3x1k3iw6"; depends=[]; }; + LSX = derive2 { name="LSX"; version="0.9.6"; sha256="1lw0nzjzcazakmmwn83rzclgsmxzlg2nwc9wrrdgvvxwpqfwirhy"; depends=[digest e1071 ggplot2 ggrepel irlba locfit Matrix proxyC quanteda quanteda_textmodels quanteda_textstats reshape2 rsparse RSpectra rsvd stringi]; }; LTPDvar = derive2 { name="LTPDvar"; version="1.2"; sha256="0r9v5g5y9n85jdcvm7zpapm73ism48m3mmybpcmgcs028h2ndv7v"; depends=[]; }; - LTRCforests = derive2 { name="LTRCforests"; version="0.5.0"; sha256="0bd2ykcflmwlzvl0iknbnmnw35pm0bvgc50x66l595xsaxgiylwy"; depends=[ipred partykit prodlim survival]; }; - LTRCtrees = derive2 { name="LTRCtrees"; version="1.1.0"; sha256="07mvbk3hwl240r46ahha0a4fzq96awk963zl8dhky51b6abp83gz"; depends=[icenReg inum partykit rpart survival]; }; + LTRCforests = derive2 { name="LTRCforests"; version="0.5.2"; sha256="0khmgrlb4g091m1a38hcmc29a2k0wr31f5jx5l4xyy8gcphn1aws"; depends=[ipred partykit prodlim survival]; }; LUCIDus = derive2 { name="LUCIDus"; version="2.1.0"; sha256="133cxmvsxm26jmx65snfswqf69ch10bnfbninkks80h2c1y46kq6"; depends=[boot glasso glmnet lbfgs mclust networkD3 nnet]; }; LVGP = derive2 { name="LVGP"; version="2.1.5"; sha256="03sd777s16nv04ikn9b3rj67ad6n4bwi0rycc7wqdnq0dx6xgniy"; depends=[lhs randtoolbox]; }; LW1949 = derive2 { name="LW1949"; version="1.1.0"; sha256="147ymp7j98ihp1dcz3p5v9ar6h767phjdnga5q5vf1wwa2mxawg7"; depends=[MASS mgcv plotrix]; }; LZeroSpikeInference = derive2 { name="LZeroSpikeInference"; version="1.0.3"; sha256="15x29afaq13iwlj66h97k3kczg9rfgp6i9d76rji58hfgh8i8by6"; depends=[]; }; LaF = derive2 { name="LaF"; version="0.8.4"; sha256="1mj010bl4ql0hm33vl0dd08s9dab11y9fa32nsqs6kbb22gjzk6p"; depends=[Rcpp]; }; LabRS = derive2 { name="LabRS"; version="0.1.0"; sha256="1a9qafimia83qldsif5wfqx273mvqbx22p5i0hg8n4jvj4vzpy2w"; depends=[knitr]; }; - LabourMarketAreas = derive2 { name="LabourMarketAreas"; version="3.2.4"; sha256="0xm6rn8r5z3b04zd7gdrclhzmqcvqxyyjlch5npdyq8sbfd163hh"; depends=[data_table maptools rgdal rgeos sp spdep]; }; + LabourMarketAreas = derive2 { name="LabourMarketAreas"; version="3.2.5"; sha256="1fhr677mp7dp18q9yvqycsmyqvqh007y3pc8r500n2axiczjzkqg"; depends=[data_table maptools rgdal rgeos sp spdep]; }; LadR = derive2 { name="LadR"; version="1.0.6"; sha256="14n58y1p14wwxwwrbdqv2kkplma8ficpqx8nd22qp931idijpsji"; depends=[L1pack]; }; LagSequential = derive2 { name="LagSequential"; version="0.1.1"; sha256="1i8h4acfx21r0kxbg4i0k48kvhwy2abri191wp4b22amhz4vqyyd"; depends=[]; }; Lahman = derive2 { name="Lahman"; version="8.0-0"; sha256="1ha4idp96z9kc2rs0v0iqf7jrg2riccjdqv7rj1vbwz6vjvghbfm"; depends=[dplyr]; }; LakeMetabolizer = derive2 { name="LakeMetabolizer"; version="1.5.0"; sha256="06mvdrdyl0rh9rwd0jxww0sycadcp7cj08hq35q6vyzq0jkxn2xf"; depends=[plyr rLakeAnalyzer]; }; Lambda4 = derive2 { name="Lambda4"; version="3.0"; sha256="04ikkflfr0nmy1gr3gfldlh2v8mpl82k1wwnzp57d2kn75m9vbxz"; depends=[]; }; - LambertW = derive2 { name="LambertW"; version="0.6.5"; sha256="1c7rd1zyi43aam1lil764kgpcimpns06d4l980ng59h7bin4yq80"; depends=[ggplot2 lamW MASS RColorBrewer Rcpp reshape2]; }; + LambertW = derive2 { name="LambertW"; version="0.6.6"; sha256="02pi98nnscaz044jkh2nrxxdyafdbiy9x0szdfkx894s3bwrf29i"; depends=[ggplot2 lamW MASS RColorBrewer Rcpp reshape2]; }; Langevin = derive2 { name="Langevin"; version="1.2.1"; sha256="1bl7145585z173jv8y6f36ba29q1iq29anm44bdq9hcpql235ihy"; depends=[Rcpp RcppArmadillo]; }; LaplaceDeconv = derive2 { name="LaplaceDeconv"; version="1.0.4"; sha256="0n56cmrb536j1vmfizzag1x8wm68c2znpclwbdl8qraqzp8rmffx"; depends=[orthopolynom polynom]; }; LaplacesDemon = derive2 { name="LaplacesDemon"; version="16.1.4"; sha256="1nv1kx86cg8f2s8q15pzskc0lg94bb250p0fhybrx5sjqv1s2lj1"; depends=[]; }; LassoBacktracking = derive2 { name="LassoBacktracking"; version="0.1.2"; sha256="1z1cnj6r6cq3b8xa9qck3ijfmzsr70r2p9m1ndakijb36pgwrzcs"; depends=[Matrix Rcpp]; }; + LassoGEE = derive2 { name="LassoGEE"; version="1.0"; sha256="1zascnl9hihw0gx2ssmdiv8gcp2672kz9vmsp5vrc2wr9cdcdjz3"; depends=[caret MASS mvtnorm PGEE Rcpp RcppArmadillo SimCorMultRes]; }; LassoNet = derive2 { name="LassoNet"; version="0.8.3"; sha256="02m0g078wg9ka3ck92nrpqrm3msw1m7r8k43brcaiffqwhky99vy"; depends=[Rcpp]; }; LassoSIR = derive2 { name="LassoSIR"; version="0.1.1"; sha256="0ap8335ms12nsc7jvd48244zya54w05wj91qkhb0i63730r508c3"; depends=[glmnet]; }; Laterality = derive2 { name="Laterality"; version="0.9.3"; sha256="0pl5bfbkzhgxjjzzh99s6rh4jsq0pbcgc902i0z2lmmivgs5qmd6"; depends=[ade4]; }; - LatticeDesign = derive2 { name="LatticeDesign"; version="1.0-1"; sha256="1wlchqa7914401r0mzca4fffps99nfbj0jym1jxkclnjivdgcn24"; depends=[]; }; + LatticeDesign = derive2 { name="LatticeDesign"; version="2.0-4"; sha256="1spmm9gk09i5dkz6xh4qvmq9r7wd9r8a84xqh8d21678kvl2j3fc"; depends=[]; }; LatticeKrig = derive2 { name="LatticeKrig"; version="8.4"; sha256="153yaf0k4l5za8f13yh2mzjv66bnmi5kp6zaxq9vrisld4vdp58h"; depends=[fields spam]; }; Lavash = derive2 { name="Lavash"; version="1.0"; sha256="0cjl8crk0rdkyzp069fk4k0sapcjmqm3q40z5mgl0i1n59kn4s07"; depends=[glmnet MASS pracma]; }; LeArEst = derive2 { name="LeArEst"; version="1.0.0"; sha256="0kga9n0ia2zljyw4xa9n572zmxpwql8xd3ys4p9jp02h432pfkpp"; depends=[conicfit doParallel foreach jpeg opencpu]; }; LeMaRns = derive2 { name="LeMaRns"; version="0.1.2"; sha256="0k7mpl2dgy2qvs068mzgfagvlk116p80cxj4dfzjkrr8wzrmwyni"; depends=[abind Rcpp RcppArmadillo]; }; LeafArea = derive2 { name="LeafArea"; version="0.1.8"; sha256="0a464bcanq6jfm5j6692h61pipy28vm7m89y5i0hrhz7lzpy9x5z"; depends=[]; }; LearnBayes = derive2 { name="LearnBayes"; version="2.15.1"; sha256="0ch54v2zz2yyyk0lvn5rfikdmyz1qh9j1wk3585wl8v58mc0h4cv"; depends=[]; }; + LearnClust = derive2 { name="LearnClust"; version="1.1"; sha256="0r2ns1bnsygc6jhr83v1ylfp8fkn3j76233zk5cwsxrq0grx5iqs"; depends=[magick]; }; LearnGeom = derive2 { name="LearnGeom"; version="1.5"; sha256="1pnxiwjkdj78p4hkl1lqagmd937q63yncb45fcra28sa9v9psrcs"; depends=[]; }; LearningRlab = derive2 { name="LearningRlab"; version="1.3"; sha256="14q8pm51yrfpny2wg5l0x02zibh7qn11zkg51igadq3r6256rfd1"; depends=[crayon magick]; }; - LexisNexisTools = derive2 { name="LexisNexisTools"; version="0.3.1"; sha256="1ydkc14hn49z3j1lypjkjnn45gpy5snbdi62q5hksa8733frf9m9"; depends=[data_table pbapply quanteda stringdist stringi tibble]; }; + LexisNexisTools = derive2 { name="LexisNexisTools"; version="0.3.3"; sha256="1n4jfdj6b4znwl2vpfc51dy60bksbsniwik8lbdp8z28gm7bdaqv"; depends=[data_table pbapply quanteda quanteda_textstats stringdist stringi tibble]; }; LexisPlotR = derive2 { name="LexisPlotR"; version="0.4.0"; sha256="0vlm8wcaj3755cbxrfb7ybla9znd2cbklw2xwyyn6r9i4c9xsfih"; depends=[dplyr ggplot2 tidyr]; }; LibOPF = derive2 { name="LibOPF"; version="2.6.0"; sha256="0xs4098qd4j1c1vl8x8620xkrfg0iisdzs203djaqb7vqlywmlrn"; depends=[]; }; LiblineaR = derive2 { name="LiblineaR"; version="2.10-8"; sha256="17ykazac7iv02bxl8xg948vhbdr32icdm1v4bk31zmslp4xsk08g"; depends=[]; }; LiblineaR_ACF = derive2 { name="LiblineaR.ACF"; version="1.94-2"; sha256="1ldkb63yhm1ki8i585wp5byx6y0kvclwy3ncacgcdqqk0p41cyi6"; depends=[]; }; Libra = derive2 { name="Libra"; version="1.6"; sha256="0fqmc6fhcmpg9ragk4r4k000wrix9dsd52baz58bp1c80wpvvcf3"; depends=[nnls]; }; LifeHist = derive2 { name="LifeHist"; version="1.0-1"; sha256="0q6l6rva5kxl8yzqa7ni4sdj6p4c61sdsjx8zhckzxb7xlwg2hh0"; depends=[BB Hmisc optimx]; }; + LifeInsuranceContracts = derive2 { name="LifeInsuranceContracts"; version="0.0.2"; sha256="13ml74q19z72ihy7w6vgfrp0wvy8sc2s0kpz4ys875aym6cwrfmf"; depends=[abind dplyr lubridate MortalityTables objectProperties openxlsx R6 rlang scales stringr]; }; LifeTables = derive2 { name="LifeTables"; version="1.0"; sha256="1dyivvi5cjsnbhncj3arkrndadg7v81nzdf6p6mpgqwqvwn5li8x"; depends=[mclust]; }; LightningR = derive2 { name="LightningR"; version="1.0.2"; sha256="1va673aw2hgir8ybbjad6dhbs8izs1z4jcikwa7qp3mkv0zqd0vq"; depends=[httr R6 RCurl RJSONIO]; }; LilRhino = derive2 { name="LilRhino"; version="1.2.0"; sha256="1d1mg77k67b5ddlp41haygagash48b6jy30q20lb231lbiss9ncp"; depends=[beepr data_table dplyr e1071 fastmatch FNN ggplot2 keras neuralnet readr SnowballC stringi textclean tm]; }; + LimnoPalettes = derive2 { name="LimnoPalettes"; version="0.1.0"; sha256="0qzcx182nn5ygqlsqmxl1r4r0gg89q0qqgk6hk5lvgb5ghf91z3y"; depends=[]; }; LinCal = derive2 { name="LinCal"; version="1.0"; sha256="1xr9jnna20hh78dh9wjg70jm8fhaxvdwql894kdp0y5h4pchkdph"; depends=[]; }; LinRegInteractive = derive2 { name="LinRegInteractive"; version="0.3-3"; sha256="1rkxvkv3ls0cgqcvs74dy6qabh62cjc0xh89dlk88bpc8mz76k8z"; depends=[rpanel xtable]; }; LindenmayeR = derive2 { name="LindenmayeR"; version="0.1.13"; sha256="01wnvmxdb91ai21h3plgsmy6ds7564s5wq2xyr905ma4a2d8afn5"; depends=[stringr]; }; @@ -2308,25 +2395,26 @@ in with self; { LinkageMapView = derive2 { name="LinkageMapView"; version="2.1.2"; sha256="101g4djzkxgxbn87an2vz4s9nwn8gwz7a3p3wg0y4zpdd1pdp716"; depends=[plotrix qtl RColorBrewer]; }; LinkedGASP = derive2 { name="LinkedGASP"; version="1.0"; sha256="1win1yd8y677rmic531dyd29f49p7pr1r3kbjysvv9syi5nkydyj"; depends=[nloptr spBayes]; }; LinkedMatrix = derive2 { name="LinkedMatrix"; version="1.4.0"; sha256="0p6qjnrljxnj3c5nynmx563vcqhxj4jf7czqdg750h38gjy8qzxi"; depends=[crochet]; }; - LipidMS = derive2 { name="LipidMS"; version="1.1.0"; sha256="193s5pc2dh848hvwwr1jw79yw90l7b9ic396s4jm36187y9nlw7n"; depends=[CHNOSZ enviPick LipidMSdata purrr]; }; + LipidMS = derive2 { name="LipidMS"; version="1.2.0"; sha256="0fajq38ys1il0x4004xqlx867fsyw0ajbkq4zlkxmqffqbgy0hkq"; depends=[CHNOSZ enviPick LipidMSdata purrr]; }; LipidMSdata = derive2 { name="LipidMSdata"; version="1.0.0"; sha256="110wvbk59knhsnbv665ji7v0kp4vjn0937k5fg2d724ksy44gxic"; depends=[]; }; Lmoments = derive2 { name="Lmoments"; version="1.3-1"; sha256="0pc63bj9a8hzr5m3yssrc4kin39fffwkl8rggs3sagzr12d4i7bw"; depends=[Rcpp RcppArmadillo]; }; LncFinder = derive2 { name="LncFinder"; version="1.1.4"; sha256="04ndxl368glx63pq58mxpyiddj2p84kyi22ylfy1x1x24xmgbdnn"; depends=[caret e1071 seqinr]; }; LncMod = derive2 { name="LncMod"; version="1.1"; sha256="08001y7s93i3k3478jqfh9zsgpq6ym1xmdmldi7s76zbfr1nknvy"; depends=[pheatmap survival]; }; LncPath = derive2 { name="LncPath"; version="1.1"; sha256="1cpsy681yq96867nr9g75xb0dilb016shqlhxpdn5xyiakrgjl4v"; depends=[igraph]; }; LocFDRPois = derive2 { name="LocFDRPois"; version="1.0.0"; sha256="0zzdp9wgwr6wn3grimghpj4vq34x37c8bqg8acfzlzih8frqal3r"; depends=[dplyr ggplot2]; }; - LocalControl = derive2 { name="LocalControl"; version="1.1.2.1"; sha256="123s7r11ivnp7fz6zcvzrgfyc17cqvn8k1786hcmgkplq9qnmnf4"; depends=[cluster gss lattice Rcpp]; }; + LocalControl = derive2 { name="LocalControl"; version="1.1.2.2"; sha256="1lqcjy5fzz1ndqih5nikidy2zfkn2dn7smbyvdjy47pgcjbzm96a"; depends=[cluster gss lattice Rcpp]; }; LocalControlStrategy = derive2 { name="LocalControlStrategy"; version="1.3.3"; sha256="05vggk5d0w3f9w5217c9hzy5jhwv24p2g8pcj0l6zxkhic01nbrl"; depends=[cluster lattice]; }; Lock5Data = derive2 { name="Lock5Data"; version="2.8"; sha256="17awskq78h23z2dy96d7hziljhnkx5phpd48q7cppxidyvzfywim"; depends=[]; }; Lock5withR = derive2 { name="Lock5withR"; version="1.2.2"; sha256="10x3i11pb4cig4pgfmw9984na5zjbg7d41y6crakiimf53ihx0c2"; depends=[]; }; - LogConcDEAD = derive2 { name="LogConcDEAD"; version="1.6-3"; sha256="0gplkprvldw2dq43kvij215lv9x9xdnp47smn8m1r93nk4pxy5mr"; depends=[MASS mclust mvtnorm tkrplot]; }; + LogConcDEAD = derive2 { name="LogConcDEAD"; version="1.6-4"; sha256="0lfpsm9iqjl8hmagbd26ks7pwngn5z57s6iiy2l6n8xbnvaax2x8"; depends=[MASS mclust mvtnorm]; }; LogicReg = derive2 { name="LogicReg"; version="1.6.2"; sha256="004dd3vrb0xbwfkij4ickhvsmhfmhd3r4qr6j9haihffnbm6xbjh"; depends=[survival]; }; LogisticDx = derive2 { name="LogisticDx"; version="0.2"; sha256="0ciygvynnyajpn1glxy6mwj9vbl7iv8a8dfsi6wxjxp2rac68rig"; depends=[aod data_table pROC RColorBrewer rms speedglm statmod]; }; LogitNet = derive2 { name="LogitNet"; version="0.1-1"; sha256="08xi5rpbqkc1b3qj24blv3l0r68wcqbsbjcqxiypm75f3c2irc4i"; depends=[]; }; LogrankA = derive2 { name="LogrankA"; version="1.0"; sha256="005zkpzi8h03qvqlpkygrf9xv4q77klafkfxw47x04jvkhklwigb"; depends=[]; }; LogrankPower = derive2 { name="LogrankPower"; version="1.0.0"; sha256="04vynymfv01q423dd9i1li92rl3lp1af3rzn3z4mamkn51mi6my0"; depends=[survival survminer]; }; - LongCART = derive2 { name="LongCART"; version="2.0"; sha256="1xpbyz6hqwhbcgjv6fxkry30fhq11nw2r9s3smwik8cw8yiciwl5"; depends=[Formula magic nlme rpart survival survminer]; }; + LongCART = derive2 { name="LongCART"; version="2.1"; sha256="0fgk9qx23kzzqc2s4i4zqf4qaj2fxwcsl54n1zx1qvd8mvi8mkzh"; depends=[Formula magic nlme rpart survival survminer]; }; LongMemoryTS = derive2 { name="LongMemoryTS"; version="0.1.0"; sha256="0n378sad8i283vs7q63spdhwpwjly2d5zj15d4v2085j7sc7z8vi"; depends=[fracdiff longmemo mvtnorm partitions Rcpp RcppArmadillo]; }; + LongituRF = derive2 { name="LongituRF"; version="0.9"; sha256="0h70g0qhv0rgz40i58ykrcak1wibbvya7fql0v79xkd21217y1av"; depends=[latex2exp mvtnorm randomForest rpart]; }; LoopAnalyst = derive2 { name="LoopAnalyst"; version="1.2-6"; sha256="1gy9v6qiwkwbwp4snif2imf6zn50ffjrig54ln57c5v5pk3phnvv"; depends=[nlme]; }; LoopDetectR = derive2 { name="LoopDetectR"; version="0.1.2"; sha256="0c65svz9v8z9886awdf9jm3ysk7nc7gk7q2ihpy20fcciiv05b30"; depends=[igraph numDeriv]; }; LoopRig = derive2 { name="LoopRig"; version="0.1.1"; sha256="11rarb9fg8abc4dpd8sd8safqw3v6g8k6rcrg2nw97xppwcz8c6b"; depends=[GenomicRanges IRanges S4Vectors]; }; @@ -2334,25 +2422,30 @@ in with self; { LowRankQP = derive2 { name="LowRankQP"; version="1.0.4"; sha256="0cg8f42s15vphnifw6gnrhxaj6j5hmgbq8xki5mkwjsizd0ch5na"; depends=[]; }; LowWAFOMNX = derive2 { name="LowWAFOMNX"; version="1.1.1"; sha256="0f75qsv6pisgvk39yagzfxscnyfsgh63rmhp4gpybpl0pqmjp48x"; depends=[Rcpp RSQLite]; }; LowWAFOMSobol = derive2 { name="LowWAFOMSobol"; version="1.1.1"; sha256="1ym3i2m1am356di9lcp5nfmxq0np3c4bwsv6bbmf7hg02j7dhwi4"; depends=[Rcpp RSQLite]; }; - Luminescence = derive2 { name="Luminescence"; version="0.9.7"; sha256="15slaiwhk5a15kmxr5slkbsm963v0dwmdl4adnhvc3j0b0c0d0r8"; depends=[bbmle data_table DEoptim httr magrittr matrixStats minpack_lm plotrix raster Rcpp RcppArmadillo readxl shape XML zoo]; }; + Luminescence = derive2 { name="Luminescence"; version="0.9.10"; sha256="0ikiqnvj3ivzx9bmq3bv3k2d6c91v1j1cbrarv1svxv37zdh6qbr"; depends=[bbmle data_table DEoptim httr magrittr matrixStats minpack_lm plotrix raster Rcpp RcppArmadillo readxl shape XML zoo]; }; M2SMF = derive2 { name="M2SMF"; version="2.0"; sha256="160qjrb3mxybvr4z6zra6rzf6scyrb9mplw36gqlfxj418ndnmm1"; depends=[dplyr MASS]; }; + M2SMJF = derive2 { name="M2SMJF"; version="1.0"; sha256="0v4sg5h3h2pjp996jspv206c8cymjpn1fg38ivaw12s7bmx8j409"; depends=[dplyr MASS]; }; M3 = derive2 { name="M3"; version="0.3"; sha256="1l40alk166lshckqp72k5zmsgm7s5mgyzxlp11l64mgncjwkw2r3"; depends=[mapdata maps ncdf4 rgdal]; }; + MABOUST = derive2 { name="MABOUST"; version="1.0.0"; sha256="0wa948r87sycq828kx58b8zilsl8lfcy6w6hh9pisw59s6f0jsj2"; depends=[Rcpp RcppArmadillo]; }; MADPop = derive2 { name="MADPop"; version="1.1.2"; sha256="0hwnkjrc3w9x3gha0y70fidfc587b6gfdhzwzdzrfvxrhsdy05yd"; depends=[BH Rcpp RcppEigen rstan StanHeaders]; }; MAGNAMWAR = derive2 { name="MAGNAMWAR"; version="2.0.4"; sha256="1asr18byrgy6bkpxpmnkczgr3dam6ymf30lw6izq112krc891bg4"; depends=[ape coxme doParallel dplyr foreach iterators lme4 multcomp plyr qqman seqinr survival]; }; - MAINT_Data = derive2 { name="MAINT.Data"; version="2.4.1"; sha256="1vqh7yfv2wdijhl3jcvm4am9ap91gapfhzcm48pas83bfmazvpri"; depends=[GGally ggplot2 MASS mclust miscTools pcaPP Rcpp RcppArmadillo robustbase rrcov sn]; }; + MAINT_Data = derive2 { name="MAINT.Data"; version="2.5.0"; sha256="1zjxzl1qnv6drbzqpjdhm6p32cf3xp5yyfmpsm5lksw29bw6x91n"; depends=[GGally ggplot2 MASS mclust miscTools pcaPP Rcpp RcppArmadillo robustbase rrcov sn]; }; MALDIquant = derive2 { name="MALDIquant"; version="1.19.3"; sha256="0b7kdz3x4sdq413h1q09l1qhcvdnnwv6fqsqwllks1cd3xy34c57"; depends=[]; }; MALDIquantForeign = derive2 { name="MALDIquantForeign"; version="0.12"; sha256="1r37x1hnhq246dazc76d17jfjc57khxayswbzvc4md39z8dnbihx"; depends=[base64enc digest MALDIquant readBrukerFlexData readMzXmlData XML]; }; - MAMS = derive2 { name="MAMS"; version="1.3"; sha256="181i1p84pacl31qsh5vkvyxnca9sx6rabi7cs42w9qpzk2fxcmzj"; depends=[mvtnorm]; }; + MALDIrppa = derive2 { name="MALDIrppa"; version="1.0.5"; sha256="02wm9i4lhrhxxmhh0a7d1x0np290fbvwr3rb4scp66ix0s1as4fk"; depends=[lattice MALDIquant robustbase signal]; }; + MAMS = derive2 { name="MAMS"; version="1.4.1"; sha256="1zc0lnbq4fvsrlyh3a9i010h6gms4872nxv534j5xglq2x2pm7rh"; depends=[mvtnorm]; }; MAMSE = derive2 { name="MAMSE"; version="0.2-1"; sha256="0spi7fqkxjiw5j0nf7ambcr8kpzdhjzh9y3dk23y1mrk2dgc5dkw"; depends=[]; }; MANCIE = derive2 { name="MANCIE"; version="1.4"; sha256="0940xl3z5bca6hcnj2bj341l79wajilxlxzmyz3dlgrz0b3bbdmm"; depends=[]; }; - MANOVA_RM = derive2 { name="MANOVA.RM"; version="0.3.4"; sha256="0x7l9k35g7fm70ybddjxy0xni6xhmb9kjnpgabm3ljjipj62vshv"; depends=[data_table ellipse magic MASS Matrix multcomp plotrix plyr]; }; + MANOVA_RM = derive2 { name="MANOVA.RM"; version="0.4.2"; sha256="0kjqswz3drpp12cy3imvkkh37lm70fjh2wg6qxn51ykmz4dkr8sa"; depends=[data_table ellipse magic MASS Matrix multcomp plotrix plyr]; }; MAP = derive2 { name="MAP"; version="0.1.3"; sha256="19d0m30jh50ibbdgvcvq1vsz5i1vf8qvl0d0nbqklvnndch61jhk"; depends=[flexmix Matrix]; }; MAPA = derive2 { name="MAPA"; version="2.0.4"; sha256="02s223s58k2jk49m0xlz3q9m3nip3h4dl4v58j18z2vgi54dwnjr"; depends=[forecast RColorBrewer smooth]; }; + MAPITR = derive2 { name="MAPITR"; version="1.1.2"; sha256="0vmsdspja4qfs2z14p835g78zggk8h54v25cn268z1hg2p6zxish"; depends=[CompQuadForm doParallel Rcpp RcppArmadillo]; }; MAPLES = derive2 { name="MAPLES"; version="1.0"; sha256="0hzsh7z1k7qazpxjqbm9842zgdpl51irg7yfd119a7b2sd3a8li9"; depends=[mgcv]; }; - MARSS = derive2 { name="MARSS"; version="3.10.12"; sha256="09b0q9aq1y4nrgpvr1xkzibv5xf9qdcaxlz02zl9sv4x1zmpi80w"; depends=[KFAS mvtnorm nlme]; }; + MARSS = derive2 { name="MARSS"; version="3.11.3"; sha256="03lk838wd88xh4x8ch77z098syn1373nzljckr6pp1jyhxxkvx5z"; depends=[KFAS mvtnorm nlme]; }; MARX = derive2 { name="MARX"; version="0.2"; sha256="1rc87hz719khl8mclbkfdix499nsc4nyihaaavd73nany7iprm02"; depends=[fBasics matlab metRology stabledist tseries]; }; - MASS = derive2 { name="MASS"; version="7.3-52"; sha256="0c4scl7r4m0bikr0wmdrnn7wfzy1vg5v7gsq6bms2vknzs9ymhxp"; depends=[]; }; - MASSTIMATE = derive2 { name="MASSTIMATE"; version="1.4"; sha256="1lpmpxgqnczlizx5gwgw96kxqkjqvbjqwf373zkvfmax2pfqr6dn"; depends=[]; }; + MASS = derive2 { name="MASS"; version="7.3-53"; sha256="0f2bwsbqr3nzsqxva051lg8wd068naqif3vc48hac0m3mmq4x0j1"; depends=[]; }; + MASSExtra = derive2 { name="MASSExtra"; version="1.0.2"; sha256="1z2671zidiv0w0w0yi80mh91wgg4gyvcps86kqb2cwghynf5b805"; depends=[MASS]; }; + MASSTIMATE = derive2 { name="MASSTIMATE"; version="2.0-1"; sha256="1dvidwjw4zgflms5njbd9n85g1gbgfg6hk0fb63q5n65iyxxfmyh"; depends=[]; }; MAT = derive2 { name="MAT"; version="2.2"; sha256="093axw2zp4i3f6s9621zwibcxrracp77xrc0q5q0m4yv3m35x908"; depends=[Rcpp RcppArmadillo]; }; MATA = derive2 { name="MATA"; version="0.4"; sha256="0x155izylzwajlnlbdnawb3b8gwxd1cx03xb1sqi3w2g50bcljbf"; depends=[]; }; MATTOOLS = derive2 { name="MATTOOLS"; version="1.1"; sha256="1nzrkm3a08rpsd9vplyf33rrkadlrd0ln70k95qxj98ndh2v97px"; depends=[]; }; @@ -2363,29 +2456,28 @@ in with self; { MAclinical = derive2 { name="MAclinical"; version="1.0-5"; sha256="1g0ka1kqww2xim8rp5rznkzn0a541zvf841s3lbphfh9k3y3ixs3"; depends=[e1071 party plsgenomics st]; }; MAd = derive2 { name="MAd"; version="0.8-2.1"; sha256="096vdhfsp7bd3zvv6ydai6p230r16jx8zlqc4hlhnzma8rqypm35"; depends=[]; }; MBA = derive2 { name="MBA"; version="0.0-9"; sha256="06kmrdkhwwvr3kd5w8ws6r528hhpvbhixyj98lv36kkwlx14x06g"; depends=[BH]; }; - MBC = derive2 { name="MBC"; version="0.10-4"; sha256="1fp06xx9jpz5mcxs0yppzzhch9w9c1qbsdbb60r4izrxnrhggpf7"; depends=[energy Matrix]; }; + MBC = derive2 { name="MBC"; version="0.10-5"; sha256="0iks5nhk4im7l1dxgwcwi4mlnh271zfq9mrlaklpk38zakzyf2n4"; depends=[energy FNN Matrix]; }; MBCbook = derive2 { name="MBCbook"; version="0.1.1"; sha256="0jmvgyzrahnxfkwdn86k3ffk0zfbbd34ya4zmlnsmp2m9xds7lgn"; depends=[MASS mclust mvtnorm Rmixmod]; }; MBCluster_Seq = derive2 { name="MBCluster.Seq"; version="1.0"; sha256="0xbi2r0g0gzsy05qrq1ljr5f5s3glwxj204vk2f1lgwdx3fd116m"; depends=[]; }; MBESS = derive2 { name="MBESS"; version="4.8.0"; sha256="14zji1iy7ai3hdxz5jpqbac8q9rp96700bimx24if2s9k6f208x9"; depends=[boot gsl lavaan MASS mnormt nlme OpenMx sem semTools]; }; - MBHdesign = derive2 { name="MBHdesign"; version="2.1.6"; sha256="188kx7594qsxq5wnkpzh3xm6rjvsyj5r4hv8kqaa2mcqp5730k1j"; depends=[class geometry mgcv mvtnorm randtoolbox]; }; + MBHdesign = derive2 { name="MBHdesign"; version="2.1.8"; sha256="0b9bk4qwsymhqylpimsv1vghlwwbnd1jxik927wn2h4ijqq3a9q8"; depends=[class geometry mgcv mvtnorm randtoolbox]; }; MBI = derive2 { name="MBI"; version="1.0"; sha256="1lb0sjwa6x360n9a9pagz6yhxh37gxq1fk0f5c3i2sd56ny9jpns"; depends=[]; }; - MBNMAdose = derive2 { name="MBNMAdose"; version="0.2.7"; sha256="1r8gz0kpkmgs1czyzwrv018l0z8gypwjdd4gmwbbhhaj84fr3gni"; depends=[checkmate dplyr magrittr R2jags Rdpack reshape2 rjags scales]; }; + MBNMAdose = derive2 { name="MBNMAdose"; version="0.3.0"; sha256="12ij19828nd1r0x1vp7clkwr0zfksk3f755xghzylz0ryjjb716d"; depends=[checkmate dplyr formatR igraph magrittr R2jags Rdpack reshape2 rgeos rjags scales utf8]; }; MBNMAtime = derive2 { name="MBNMAtime"; version="0.1.3"; sha256="1yyynsdgxdw3zfv0byxbjli332wc3bm8pfhrcy4rsvvvhj458vy7"; depends=[checkmate dplyr magrittr R2jags Rdpack reshape2 rjags]; }; MBSGS = derive2 { name="MBSGS"; version="1.1.0"; sha256="1h5vhmpgrqza12j7ivhwgd5wyb7kkb8mjbxl5w756vyid8g03flz"; depends=[MASS MCMCpack mgcv mnormt truncnorm]; }; MBSP = derive2 { name="MBSP"; version="1.0"; sha256="0mds6jfqgmnm4saqqqqqfcg8zh4qsvd2503g3ij1sn70f0aakwaj"; depends=[coda GIGrvg MASS Matrix MCMCpack]; }; - MBmca = derive2 { name="MBmca"; version="0.0.3-5"; sha256="0p7ddpsy4hwkfwyyszidi33qpdg4xllny7g9x24gk782p7kjfgq9"; depends=[chipPCR robustbase]; }; MC2toPath = derive2 { name="MC2toPath"; version="0.0.16"; sha256="0jdn9wpxavn2wrml907v23mfxr62wwjdh7487ihjj59g434ry7wh"; depends=[RNetCDF]; }; - MCAvariants = derive2 { name="MCAvariants"; version="2.2"; sha256="012374zm77i8bl4nm3dg97m7x22697ryq1766mhsgh6gl3jgcm66"; depends=[ggplot2 ggrepel gridExtra]; }; + MCAvariants = derive2 { name="MCAvariants"; version="2.5"; sha256="17v554ammsk39i3h8i85m2jl0wf4ra1ag3n9x3mcpqakha0p7852"; depends=[ggplot2 ggrepel gridExtra plotly]; }; MCBackscattering = derive2 { name="MCBackscattering"; version="0.1.1"; sha256="0vvcqjrh8psl480s4q2830rzm2bwy9mmvk9kipp72lzln51qnha6"; depends=[]; }; MCDA = derive2 { name="MCDA"; version="0.0.20"; sha256="1pzp68dirby5ddwz37kjh9dnmwsbdfi37gfr8pgmngqzgbr9x6dd"; depends=[combinat glpkAPI RColorBrewer Rglpk]; }; MCDM = derive2 { name="MCDM"; version="1.2"; sha256="0r27y9mqvfnv1m0yi2xdyjr4y1s43d5yav960kz2xa732hrrxw01"; depends=[RankAggreg]; }; MCI = derive2 { name="MCI"; version="1.3.3"; sha256="1wn8lcr5sq3697nsmly6syb9jv7p99ks0fy933ff5rx54x3rf9hz"; depends=[]; }; - MCI2 = derive2 { name="MCI2"; version="1.1.2"; sha256="1vxzfab8yn18icarsdvz8ky7frspxax22sb8c0ki91y1mj9m9mgj"; depends=[MCI osrm REAT reshape tmaptools]; }; MCL = derive2 { name="MCL"; version="1.0"; sha256="1w36h4vhd525h57pz6ik3abbsrvxnkcqypl2aj1ijb6wm7nfp4ri"; depends=[expm]; }; MCMC_OTU = derive2 { name="MCMC.OTU"; version="1.0.10"; sha256="15k3y4bm4cxjb6r30afpw9gksflsxigzb17zwm1ipygq0d0h0zkg"; depends=[coda ggplot2 MCMCglmm]; }; MCMC_qpcr = derive2 { name="MCMC.qpcr"; version="1.2.4"; sha256="0v0d43wnq3swbrcsbg9qmwkmk4s50grd6cik4ng5baj2i6i4hd2n"; depends=[coda ggplot2 MCMCglmm]; }; MCMC4Extremes = derive2 { name="MCMC4Extremes"; version="1.1"; sha256="06p6xdbja7vrdq4vnhybpkmyf4rkaihcmy9sc81sb0h2wa21vcq0"; depends=[evir]; }; MCMCglmm = derive2 { name="MCMCglmm"; version="2.29"; sha256="1d37rk10zi2yymsxif9091z9lnav7p4cazjfq29fhj90x8vpifhk"; depends=[ape coda corpcor cubature Matrix tensorA]; }; + MCMChybridGP = derive2 { name="MCMChybridGP"; version="5.4"; sha256="19nbch76g7jf53nrb1lyzr3zd0z6rpz2k86mq1r9aidwwxh81g7p"; depends=[MASS]; }; MCMCpack = derive2 { name="MCMCpack"; version="1.4-9"; sha256="1fskidw7fgy65isqk9msmnfk0ygpb97cla84kgmndxakqy4c2i9c"; depends=[coda lattice MASS mcmc quantreg]; }; MCMCprecision = derive2 { name="MCMCprecision"; version="0.4.0"; sha256="0r0qchiv61sk3drrb0rhwsk55gci4w343hd2gsvclrlyb8r9qhaf"; depends=[combinat Matrix Rcpp RcppArmadillo RcppEigen RcppProgress]; }; MCMCtreeR = derive2 { name="MCMCtreeR"; version="1.1"; sha256="00r6f62h7ryil7qxd25icvkqypjjssjsrz4i5sbqsnw5cdy5al8z"; depends=[ape coda sn]; }; @@ -2393,7 +2485,8 @@ in with self; { MCPAN = derive2 { name="MCPAN"; version="1.1-21"; sha256="0q1m0xg8825q9zjwxcz2h2n0dyr21q5bk29qbqpdhirlwm6f1a51"; depends=[magic MCMCpack multcomp mvtnorm plyr]; }; MCPMod = derive2 { name="MCPMod"; version="1.0-10.1"; sha256="0j15dpxy62vwbd6pcsvkbpi1nklh0yjzwf53kcmv4jhj0v6xmpp9"; depends=[lattice mvtnorm]; }; MCPModGeneral = derive2 { name="MCPModGeneral"; version="0.1-1"; sha256="0izhbiivlb818ak49hl1f7li1chlyrxk5f80cmw4zkim3l6ddaxq"; depends=[DoseFinding MASS]; }; - MCPModPack = derive2 { name="MCPModPack"; version="0.3"; sha256="0g404qj8prh5cqq9v641vwa6kx4p9ja2migyq9n8s5a6g1sxyrnl"; depends=[devEMF flextable mvtnorm officer Rcpp RcppEigen RcppNumerical shiny shinydashboard]; }; + MCPModPack = derive2 { name="MCPModPack"; version="0.4"; sha256="1xal4dj6i4qvifv4k8x7i1xzh1qq6fcddxk5d8wgriz1viqy2v03"; depends=[devEMF flextable mvtnorm officer Rcpp RcppEigen RcppNumerical shiny shinydashboard]; }; + MCPtests = derive2 { name="MCPtests"; version="1.0.1"; sha256="1lzlvzw60fb0mllbl0dx8s30zigzbl9shjas629syb9yw55ypxa2"; depends=[doParallel foreach SMR writexl xtable]; }; MCS = derive2 { name="MCS"; version="0.1.3"; sha256="1kiz1jq1bm2n8f33nsybp5jfrzzl9xbsi3m9l8818ybmph99xms6"; depends=[]; }; MCSim = derive2 { name="MCSim"; version="1.0"; sha256="1nqry41qa5c02an5fxm3y1g3w1vcqjgsy1an95i3szz1w1ndaj14"; depends=[CircStats MASS]; }; MCTM = derive2 { name="MCTM"; version="1.0"; sha256="14xjfskyrqi0m58lkwjfjpss5j7wy3ajr148n526czrrpccg108j"; depends=[]; }; @@ -2410,7 +2503,7 @@ in with self; { MDplot = derive2 { name="MDplot"; version="1.0.1"; sha256="1xijh18hrkb807nfkdr7g642aspn5psc8nw29q387jl5hly2w8s9"; depends=[gplots gtools MASS RColorBrewer]; }; MED = derive2 { name="MED"; version="0.1.0"; sha256="0fy0qmxirkdz5kigy2r7l5czjzws0fhjxy13kv1kqh628ldrp109"; depends=[]; }; MEDITS = derive2 { name="MEDITS"; version="0.1.7"; sha256="0n3llnvpxd4bs1vslhmsahvl9vm0pmbmc94gijss16linpskxxkj"; depends=[ggplot2 hms raster rgdal rgeos sp tibble vegan]; }; - MEDseq = derive2 { name="MEDseq"; version="1.1.1"; sha256="1pd29wjnyffbjhivg567wilqybpqq30ypnj93p1lrf0920ffnvfy"; depends=[cluster matrixStats nnet seriation stringdist TraMineR WeightedCluster]; }; + MEDseq = derive2 { name="MEDseq"; version="1.2.0"; sha256="12wvqar21b077v5dhyab8prfliild7im2xzfw222jncl228ypgxq"; depends=[cluster matrixStats nnet seriation stringdist TraMineR WeightedCluster]; }; MEGENA = derive2 { name="MEGENA"; version="1.3.7"; sha256="0cr10pmj1n831scz5kgaq3nkglr3imwgc62cxng2dvdxr9991g21"; depends=[BH cluster doParallel foreach fpc ggplot2 ggraph ggrepel igraph Matrix Rcpp reshape]; }; MEMSS = derive2 { name="MEMSS"; version="0.9-3"; sha256="0fq85jrajfwavq2fvsw2x9hknc57wc253zw2vw970f04khfbragd"; depends=[lme4]; }; MEPDF = derive2 { name="MEPDF"; version="3.0"; sha256="15hbp7g5dsdpvi239jm6jn11fn371ir6la31g0flqkilq6sr1sqd"; depends=[gtools mvtnorm plyr pracma]; }; @@ -2421,23 +2514,25 @@ in with self; { MFAg = derive2 { name="MFAg"; version="1.7"; sha256="0cc1p677lsmdyw9x7kzc4prlw70y4rqmygspkvd4r11hrs54m05a"; depends=[]; }; MFDFA = derive2 { name="MFDFA"; version="1.1"; sha256="0nr78p6y4jpg1hrl0h7b7hyvwbr61paf85y3f2dx815x5hscmdhy"; depends=[numbers]; }; MFHD = derive2 { name="MFHD"; version="0.0.1"; sha256="0gb8y297y1x03wy46530psmlawyv4z5dydilk36qcmadlk1wx02k"; depends=[deldir depth depthTools fda_usc matrixStats]; }; - MFPCA = derive2 { name="MFPCA"; version="1.3-5"; sha256="0w198ygksipgxwl73qnz5l0jv6z2irk0dk3dw66vx5wrd08yvxwg"; depends=[abind foreach funData irlba Matrix mgcv plyr]; }; + MFPCA = derive2 { name="MFPCA"; version="1.3-6"; sha256="1xync706kn4l0ky9fbj13f76r34bs95qp32pnsawa3qqsipxi2w3"; depends=[abind foreach funData irlba Matrix mgcv plyr]; }; MFT = derive2 { name="MFT"; version="2.0"; sha256="0n1xws3dw0650037qyqgp600p8cf098qa5hkbncdfdbl0w34qamy"; depends=[]; }; MGBT = derive2 { name="MGBT"; version="1.0.4"; sha256="1x2yqfb5diqkq82j81slh9kxzxgyy67axyqlqjpv237yf8p0djc0"; depends=[]; }; - MGDrivE = derive2 { name="MGDrivE"; version="1.5.0"; sha256="1dgmmc34m2pj1l2gkwg85sj4rbhhwyrp8cj4m9b9hlz134n3qgwy"; depends=[R6 Rcpp Rdpack]; }; + MGDrivE = derive2 { name="MGDrivE"; version="1.6.0"; sha256="0ynn7iwxi5yfpjyrvfr6ym4ns7h8qfy8c10clab7i72pv90jqqlr"; depends=[R6 Rcpp Rdpack]; }; + MGDrivE2 = derive2 { name="MGDrivE2"; version="1.0.1"; sha256="0s4z2czqp3h6kwjiqngw2xdfjg2sf282sdd7nqxy3br9vw6i0682"; depends=[deSolve Matrix]; }; MGL = derive2 { name="MGL"; version="1.1"; sha256="03q453swnangxyc4nvjhzw2zpcy5vp1wpilap5rwymnf0c0xi4j7"; depends=[]; }; MGLM = derive2 { name="MGLM"; version="0.2.0"; sha256="0yyqm53lvp59zy8lkffw9x3zhqrnh29j5v3yyzk6qrgj2slnc7nk"; depends=[]; }; + MGMM = derive2 { name="MGMM"; version="0.3.1"; sha256="1q33p1syvw8q4akl172ndcbl23gw2nfsx40dyafl349h5bqyj6rk"; depends=[cluster mvnfast plyr Rcpp RcppArmadillo]; }; MGMS2 = derive2 { name="MGMS2"; version="1.0.2"; sha256="04f1ng4s163x7gvy1iaf0j8pzs0pm2r2saji0srbp2jyhrj68d7z"; depends=[MALDIquant MALDIquantForeign]; }; MGRASTer = derive2 { name="MGRASTer"; version="0.9"; sha256="0jmf2900r56v60981sabflkhid3yrqd9xd7crb56vgfl1qkva9zp"; depends=[]; }; MGSDA = derive2 { name="MGSDA"; version="1.4"; sha256="0grwl740yvz2av5nkvmyyrr8ji5f39sjs1c5gxp6lp9p36i2wc32"; depends=[MASS]; }; - MHCtools = derive2 { name="MHCtools"; version="1.2.1"; sha256="1mf70x1vd8h8i0iapl54fp8q4gpqd61faxvhpxlhv49g8s5n9pbd"; depends=[rlist]; }; + MHCtools = derive2 { name="MHCtools"; version="1.3.0"; sha256="1vfyq2c2lrx2vsxz969pif38gw0vsh0bixyr3wh1rvswbw9wlj0b"; depends=[]; }; MHMM = derive2 { name="MHMM"; version="1.0.0"; sha256="0d3djaydw0h7x3vlaghrbgmx024rgv36wfsjhlixzzssb2d6lqzi"; depends=[BH ggplot2 gridExtra Rcpp RcppArmadillo reshape2]; }; MHTcop = derive2 { name="MHTcop"; version="0.1.1"; sha256="1mr8y8brsi37b5qx3fqm0bj90dgknzzwhxfmvyd9kxbxh19whgxq"; depends=[copula matrixStats MCMCpack mvtnorm stabledist]; }; MHTdiscrete = derive2 { name="MHTdiscrete"; version="1.0.1"; sha256="0czpsk4jiwbzd6g2dwssmggsdhwchikmc1skv48d9j4xvglns7yw"; depends=[]; }; MHTmult = derive2 { name="MHTmult"; version="0.1.0"; sha256="1y3vh2kab6nfkiz4nzdhrpy9h6drk1ibfd2h62hpr3y09z9a2yld"; depends=[]; }; MHTrajectoryR = derive2 { name="MHTrajectoryR"; version="1.0.1"; sha256="13idcjx7pjpwvr4c52938yqhhaj1gprb8hjhaim3jx4062wf9pla"; depends=[mgcv]; }; MHadaptive = derive2 { name="MHadaptive"; version="1.1-8"; sha256="1w3bm82v8ahxrf0vqn0pznv7dqn212drinkz8y5kr1flx423l9ws"; depends=[MASS]; }; - MIAmaxent = derive2 { name="MIAmaxent"; version="1.1.1"; sha256="0azp8w626fhlwrk2qj7lyz9mpxj1hl2l8l1f7pviigdqp35shwf1"; depends=[dplyr e1071 raster]; }; + MIAmaxent = derive2 { name="MIAmaxent"; version="1.2.0"; sha256="0r4q1735f7apfj0jz4f52ra7sisbkkkk2n6i0kii3q64sx2h3xbj"; depends=[dplyr e1071 raster rlang]; }; MIDASwrappeR = derive2 { name="MIDASwrappeR"; version="0.5.1"; sha256="07108dg16i20fg6cvsnbflfz65smwk08vjmf1b193zyvhdikwhfm"; depends=[Rcpp]; }; MIDN = derive2 { name="MIDN"; version="1.0"; sha256="08i9zfmaywi5imp36ahjpirlkl55k01x543nz95i089w3sfrsz0g"; depends=[BiasedUrn]; }; MIICD = derive2 { name="MIICD"; version="2.4"; sha256="1xlvhyh3gg77cym10i8hrxm8r1jm4plvny2c4izic6w89snplyq6"; depends=[MASS mstate survival]; }; @@ -2449,18 +2544,22 @@ in with self; { MImix = derive2 { name="MImix"; version="1.0"; sha256="033gxr0z2xba0pgckiigblb1xa94wrfmpgv3j122cdynjch44j4r"; depends=[]; }; MInt = derive2 { name="MInt"; version="1.0.1"; sha256="1nk02baainxk7z083yyajxrnadg2y1dnhr51fianibvph1pjjkl6"; depends=[glasso MASS testthat trust]; }; MKLE = derive2 { name="MKLE"; version="0.05"; sha256="00hcihjn3xfkzy0lvb70hl2acjkwk6s3y7l4gprix24shnblvxzi"; depends=[]; }; - MKdescr = derive2 { name="MKdescr"; version="0.5"; sha256="0dgdglr173pjlvbh9kd67pl890pnlzlcfm04ax4bdas6gp1cb6j6"; depends=[ggplot2 scales]; }; - MKinfer = derive2 { name="MKinfer"; version="0.5"; sha256="1zb7zcqis8pdqrgz8pivmysl9lsj03zaikxnljyvhvhcpgy6msgb"; depends=[arrangements boot ggplot2 MKdescr nlme]; }; + MKclass = derive2 { name="MKclass"; version="0.3"; sha256="0sw0h99k24418iqvvq247kg5558y9mgashr5amay7gbf2va79v6j"; depends=[]; }; + MKdescr = derive2 { name="MKdescr"; version="0.6"; sha256="14rqbamvf9ndk4ivcpvrcl4ad1nar6gfk9m3q7pb5fg8gs39wypn"; depends=[ggplot2 scales]; }; + MKinfer = derive2 { name="MKinfer"; version="0.6"; sha256="13ga5pwlnlm28dm6nxg4ccc7br51jg7wvwp61sx31yvzgr5m45ld"; depends=[arrangements boot ggplot2 MKdescr nlme]; }; MKmisc = derive2 { name="MKmisc"; version="1.6"; sha256="0x518icdgq4mrc6qm1flb5lpr9y7j9znh0ah3gw2xsbjiplqd323"; depends=[ggplot2 limma RColorBrewer robustbase scales]; }; MKomics = derive2 { name="MKomics"; version="0.5"; sha256="0mr0y1ai3jf3jj4dqvs6xv3clgli7d7lzqk8ya6zah388rqmkg9s"; depends=[limma RColorBrewer robustbase]; }; - MKpower = derive2 { name="MKpower"; version="0.4"; sha256="1s9njvdjpqn4i4dxarb9agcdmx9dx1g4icg7mfp8bd6rnslsscn5"; depends=[coin ggplot2 matrixTests MKdescr MKinfer qqplotr]; }; + MKpower = derive2 { name="MKpower"; version="0.5"; sha256="1yr9yk7x8da2b8hj71v4f5c2nikljbr6ayqp004whdi2bh67v95n"; depends=[coin ggplot2 matrixTests MKdescr MKinfer qqplotr]; }; ML_MSBD = derive2 { name="ML.MSBD"; version="1.2.0"; sha256="1dxvvyha984j3h170s2brhbf4lm53f16f12lhnqf3sl4sc0f4xv8"; depends=[ape foreach]; }; + ML2Pvae = derive2 { name="ML2Pvae"; version="1.0.0"; sha256="0laazb78qz6348kdyivb062nrmiz45imr3l3ck338a230avy4w4d"; depends=[keras reticulate tensorflow tfprobability]; }; MLCIRTwithin = derive2 { name="MLCIRTwithin"; version="2.1.1"; sha256="1x0xmka7kkbjnh3yv4zxxyl17cpmf0rb9hxmdl1srb6ijld4np1b"; depends=[limSolve MASS MultiLCIRT]; }; MLCM = derive2 { name="MLCM"; version="0.4.2"; sha256="14sd9ybwyilympnbyaqmwdrbip4vyn1p93rh9mlxls3bmk6nc4hv"; depends=[]; }; MLDAShiny = derive2 { name="MLDAShiny"; version="0.1.0"; sha256="14n8pffzw5y7lq3qx1xly4jwm05cyvs14gn838h6y9yssb16xnmr"; depends=[caret DiscriMiner dplyr e1071 klaR MASS rhandsontable rmarkdown shiny]; }; + MLDAShiny2 = derive2 { name="MLDAShiny2"; version="0.1.0"; sha256="1mx8js54mrrf16jriy467dysxpkcsza9fvdmpdbmxr5m3y564sc7"; depends=[caret DiscriMiner dplyr e1071 klaR MASS rhandsontable rmarkdown shiny]; }; MLDS = derive2 { name="MLDS"; version="0.4.5"; sha256="1a5y031kd6zx0zqlk6dvxzsv3isbvg9jap4gqad2jwryh0a9x3c1"; depends=[MASS]; }; MLEcens = derive2 { name="MLEcens"; version="0.1-4"; sha256="0zlmrcjraypscgs2v0w4s4hm7qccsmaz4hjsgqpn0058vx622945"; depends=[]; }; - MLGL = derive2 { name="MLGL"; version="0.6.1"; sha256="01z4gc1zhhyiin58dm5mwr9x799gq73agh4s10wk4q82f0nn3f55"; depends=[FactoMineR fastcluster gglasso MASS Matrix parallelDist]; }; + MLGL = derive2 { name="MLGL"; version="0.6.5"; sha256="1qrqw39hghdlbrs0dkv38awrgwdf8lj95rhb3hixcc6nfb2lkr8j"; depends=[FactoMineR fastcluster gglasso MASS Matrix parallelDist]; }; + MLGdata = derive2 { name="MLGdata"; version="0.1.0"; sha256="0ysvrnx8m903h99wr40zgg1c6d26m9vsh62zjxh8mvndh69ikzid"; depends=[]; }; MLID = derive2 { name="MLID"; version="1.0.1"; sha256="0ygahmcfbydzic5q3h1ppv5b2ks4lh8mcyfqq27ssmn4g1n6hdvp"; depends=[lme4 nlme]; }; MLML2R = derive2 { name="MLML2R"; version="0.3.3"; sha256="1jgk0h3chab831g5nsppgc6p0xplv11j82491iymnxixqfswb08w"; depends=[]; }; MLMOI = derive2 { name="MLMOI"; version="0.1.1"; sha256="0fliax6ajacm2i416xi26qlwg3y7iw8y6hykkz0mcwp7djyn3n6s"; depends=[Rdpack rJava Rmpfr XLConnect]; }; @@ -2477,6 +2576,7 @@ in with self; { MM2Sdata = derive2 { name="MM2Sdata"; version="1.0.3"; sha256="0hlm6jp8jq38vkszwdgpf30w11l1fhpblg26zv05j50a6whpmhqd"; depends=[Biobase]; }; MM4LMM = derive2 { name="MM4LMM"; version="2.0.2"; sha256="0zcaqxz1yxv2lkp39ly4jkl9wk94k7md5ks5wjk9l1qk7k5q7yx9"; depends=[MASS Matrix Rcpp RcppEigen]; }; MMAC = derive2 { name="MMAC"; version="0.1.2"; sha256="1xwz48iizf0lvmhc7krsraabc49ky85qvgr23w4ip6jzfv4sn1jr"; depends=[]; }; + MMDCopula = derive2 { name="MMDCopula"; version="0.1.0"; sha256="0xldnz4393hqkidfy03mdb8ia3nycdj5q3s37j8q05m0pn4pjk1z"; depends=[cubature pcaPP randtoolbox VineCopula]; }; MMDai = derive2 { name="MMDai"; version="2.0.0"; sha256="0b9lksql266sqhxy4k3chz2pcaabgijkp7g0v4pm7ci5v50d4vag"; depends=[]; }; MMDvariance = derive2 { name="MMDvariance"; version="0.0.9"; sha256="1yiqabifym7gdknqrhfnql6qc8p163npzrrckbyqjry3yvkqr5wi"; depends=[Biobase lawstat MASS]; }; MMLR = derive2 { name="MMLR"; version="0.2.0"; sha256="1jc33ani6w54j38kxzk0kfj1hjfk80cil2hdja2hcsk6kqwd431d"; depends=[pracma]; }; @@ -2486,15 +2586,15 @@ in with self; { MMWRweek = derive2 { name="MMWRweek"; version="0.1.3"; sha256="1l1ks44v52iggw9nhs56lfj6804yab5b17k8fzrc6h1kvj3vda0s"; depends=[]; }; MMeM = derive2 { name="MMeM"; version="0.1.0"; sha256="1b0wdcyqnliw85il5vnwy9l4x1z42kirbg872hl47plwfrp9gahc"; depends=[jointDiag lme4 MASS Matrix matrixcalc psych stringr]; }; MNLR = derive2 { name="MNLR"; version="0.1.0"; sha256="0q80232ndp7pkklzqdbga1vf51dmsxaivm4ia4wah32rc2c87fqp"; depends=[caret e1071 nnet rmarkdown shiny]; }; - MNLpred = derive2 { name="MNLpred"; version="0.0.3"; sha256="1cs2mnk10amhqgzmvrf7357g8yqsgljx9a7klcnb0bq4rwkpwcxx"; depends=[MASS]; }; + MNLpred = derive2 { name="MNLpred"; version="0.0.4"; sha256="0kazydv6ln6vh5a1l72gg7v4v6j0pma7c3qxlfsgy6p73fhr5hxk"; depends=[MASS]; }; MNM = derive2 { name="MNM"; version="1.0-3"; sha256="16b2yrm2kn943vzrr38qhk6qq20a842xv7iiln4is02csijxw2b3"; depends=[ellipse ICS ICSNP SpatialNP]; }; - MNP = derive2 { name="MNP"; version="3.1-0"; sha256="06qs2vsmjs6rcpqlwfc1n5y5hzxf7pngbdmiza1wijm9hh54ikh0"; depends=[MASS]; }; + MNP = derive2 { name="MNP"; version="3.1-1"; sha256="0hzm048afxick1r8y26dj478mn9kwaww5v2s0b9ks1i01vbjakcl"; depends=[MASS]; }; MNS = derive2 { name="MNS"; version="1.0"; sha256="0if46a6rw0f2d72wnykkaa5z5b1p2c0r43il6cbwbcnnb3zd8acb"; depends=[doParallel glmnet igraph MASS mvtnorm]; }; MOCCA = derive2 { name="MOCCA"; version="1.4"; sha256="0g70s7hnmrp4sm8gx49vsijj54y4amlcy6axc4k37k4c9g4sdics"; depends=[cclust class clue cluster]; }; - MODIS = derive2 { name="MODIS"; version="1.2.2"; sha256="0yap72w9i8gc3513lh8m3zfp2cr3v9bw72wazqv5wg0lk61k2lhb"; depends=[bitops curl devtools mapdata mapedit maps maptools ptw raster rgdal rgeos sf sp]; }; + MODIS = derive2 { name="MODIS"; version="1.2.3"; sha256="03bl3a248cx3kd3szqy96vnz4sbccfnj755y6fq2b81ykpw5x47q"; depends=[bitops curl devtools mapdata mapedit maps maptools ptw raster rgdal rgeos sf sp]; }; MODISSnow = derive2 { name="MODISSnow"; version="0.1.0.0"; sha256="1p0mil074gapw6v8paw9595rzp85hxrfsc65llh0ljalmacwgx04"; depends=[gdalUtils lubridate raster RCurl]; }; MODISTools = derive2 { name="MODISTools"; version="1.1.1"; sha256="0188cffsnpy7nmb0c03i64674xyizx6imkymrwsj3mf9s77wa2v0"; depends=[httr jsonlite memoise raster sf]; }; - MODIStsp = derive2 { name="MODIStsp"; version="1.4.0"; sha256="1jkq7c5sc0bdb4sgxinzdv43lh64psykvscl4fh3a8p052lyb96b"; depends=[bitops data_table gdalUtilities httr jsonlite leaflet mapedit mapview raster sf shiny stringr xml2 xts]; }; + MODIStsp = derive2 { name="MODIStsp"; version="2.0.5"; sha256="0qrgb5gx550ybx6j8zvdjzrvrp02vigh5gp9iz3pa9mc24665ml4"; depends=[assertthat bitops data_table gdalUtilities geojsonio httr jsonlite raster sf stringr xml2 xts]; }; MOEADr = derive2 { name="MOEADr"; version="1.1.1"; sha256="0aqkqw5ph5rvsgpasc94i264lxapr37gpjhk4rkkynph2gnvq1zx"; depends=[assertthat FNN]; }; MOLHD = derive2 { name="MOLHD"; version="0.2"; sha256="1lrl24x7iig15jwxigvqm3jdwnxkn948sxmywn6zi2b1a5hqz05k"; depends=[arrangements fields]; }; MOQA = derive2 { name="MOQA"; version="2.0.0"; sha256="17w4iwf38k0r2fiwqr420hkbbz1a3r89sqwnd2yn300zmaz64hpr"; depends=[gplots psych readr]; }; @@ -2503,41 +2603,42 @@ in with self; { MOrder = derive2 { name="MOrder"; version="0.1"; sha256="1vhy20xyvfc18f04hvlb1jm2n0caaz8ysy13w2rra5i4kjdvz52i"; depends=[]; }; MPBoost = derive2 { name="MPBoost"; version="0.1-3"; sha256="0fmyy4s2h7hjca6nww0bgcax7309nkqp295mpp8hl8yllz7ylmsm"; depends=[BH Rcpp]; }; MPCI = derive2 { name="MPCI"; version="1.0.7"; sha256="1l55q09lliv0y4q1hc0jgzls47wkmsfag6b4iq5y6wrllr5wq7sa"; depends=[]; }; - MPDiR = derive2 { name="MPDiR"; version="0.1-16"; sha256="10g4dnysjnzf106qibqqcrxz3xw2nfh4ck1n1dlciwahr0f80j13"; depends=[]; }; + MPDiR = derive2 { name="MPDiR"; version="0.1-19"; sha256="14bjb9c1v2si3gan1pfvvhmfa46q1qrn606sb4zvrqpfs8f7wil7"; depends=[]; }; + MPGE = derive2 { name="MPGE"; version="1.0.0"; sha256="10lzkk8fhpxd1z4yp051q3k36fsvddrwssv7nn03r2bkp6q8rpzb"; depends=[car purrr]; }; MPINet = derive2 { name="MPINet"; version="1.0"; sha256="1zw3piqhhpagg5qahc2xahxxfdwdk8w94aass1virlpl0f52ik8s"; depends=[BiasedUrn mgcv]; }; MPLikelihoodWB = derive2 { name="MPLikelihoodWB"; version="1.1"; sha256="0xgj349jkv29ldia4lmsiwnkhrk99aqcrvyiy3si5knmi1jvx9q0"; depends=[MASS survival]; }; MPN = derive2 { name="MPN"; version="0.3.0"; sha256="0rrigkq5bkarncswv8kgvvwd1vrq5cqnb5vypa9d39q2ksqf8j3d"; depends=[]; }; MPR_genotyping = derive2 { name="MPR.genotyping"; version="0.8"; sha256="0lsrbks7nhfnrmk8kclh09rc132j3divjxrzjfrg8zijbzkfx1pn"; depends=[qtl]; }; MPS = derive2 { name="MPS"; version="2.3.1"; sha256="08yzynznf33y7y3pf7fayks5hi3cdvzwzn8axg7aky5kvi2bfv22"; depends=[]; }; MPSEM = derive2 { name="MPSEM"; version="0.3-6"; sha256="0kw3aixhl5j8nq4lcx65l80v4lihvpa4qd12n2jrc96lnm6mw00b"; depends=[ape MASS]; }; - MPTinR = derive2 { name="MPTinR"; version="1.12.0"; sha256="0iv7hy0lmxadw34cq4gsb5i2my8lbvdfp23qadhiw6ca179hgamy"; depends=[Brobdingnag numDeriv Rcpp RcppEigen]; }; + MPTinR = derive2 { name="MPTinR"; version="1.13.0"; sha256="16824bydfgm3wf63hrf9lwqwybdvrl3835pk8irl482y6v6x3h91"; depends=[Brobdingnag numDeriv Rcpp RcppEigen]; }; MPTmultiverse = derive2 { name="MPTmultiverse"; version="0.4-2"; sha256="0fjfj8jk0dk1s3jc9rl9kza6gm5pm6dgsqyk0aq7pir2hrsr3qwy"; depends=[coda dplyr ggplot2 limSolve magrittr MPTinR purrr readr reshape2 rlang runjags tibble tidyr TreeBUGS]; }; MPV = derive2 { name="MPV"; version="1.55"; sha256="127m19q5dq38x2k29rkgvvfidazbmzsarzf9m2sjpx6ay8j8hvpl"; depends=[KernSmooth]; }; MPkn = derive2 { name="MPkn"; version="0.1.0"; sha256="0nvd6sv1wypcmphm0wcymbibcxrqzx3c9s9b191p1pmxyz607vxv"; depends=[]; }; MPsychoR = derive2 { name="MPsychoR"; version="0.10-8"; sha256="19gp2pjy8bllk4pbx139vcydnw04nldfqq9q7291vr5krylfjcqv"; depends=[]; }; - MQMF = derive2 { name="MQMF"; version="0.1.0"; sha256="0pg120003zgnxw51agmfjzj8snkb19r1d4hyssxxl5y0ykxk1hn0"; depends=[MASS mvtnorm]; }; + MQMF = derive2 { name="MQMF"; version="0.1.1"; sha256="0cbcmrgd3jvr2b95awklzsr694dqxgc5kk840r293qvhpsbxf27y"; depends=[MASS mvtnorm]; }; MRCV = derive2 { name="MRCV"; version="0.3-3"; sha256="0m29mpsd3kackwrawvahi22j0aghfb12x9j18xk4x1w4bkpiscmf"; depends=[tables]; }; MRFA = derive2 { name="MRFA"; version="0.4"; sha256="1ivzyp3q2nb6h5mhykina75ak7ajfw62rh23yr4pljma7gmr1hhm"; depends=[fields foreach glmnet grplasso plyr randtoolbox]; }; MRFcov = derive2 { name="MRFcov"; version="1.0.37"; sha256="1xh7zlnkr93bdgcfmfvrwjc3rj6mfqsxl2rpbzzm204q7n1dh502"; depends=[caret dplyr ggplot2 glmnet gridExtra igraph magrittr MASS Matrix mgcv pbapply plyr purrr reshape2 sfsmisc]; }; MRH = derive2 { name="MRH"; version="2.2"; sha256="1icwlq8js58g9fkiq7fwjg8r97ca47xl3dscnhnga99gkgsfgjwl"; depends=[coda KMsurv survival]; }; MRHawkes = derive2 { name="MRHawkes"; version="1.0"; sha256="0qhwm708jijv1w6iml18bg7fc2igdcmydwpb9dzpa4gwwads8b78"; depends=[IHSEP]; }; MRMR = derive2 { name="MRMR"; version="0.1.4"; sha256="0dgbhlynaaka7mdzl6igwgcdzvy6cm2y8mbxaf9pfla8w3z8y0lq"; depends=[ggplot2 lmtest lubridate plyr reshape2]; }; - MRPC = derive2 { name="MRPC"; version="2.2.0"; sha256="1ks23kf273khzidgxg6gzkynxlga8dybfcwfigli9wv0kcrzvdpx"; depends=[bnlearn compositions dynamicTreeCut fastcluster GGally graph gtools Hmisc mice network pcalg psych Rgraphviz sna WGCNA]; }; + MRPC = derive2 { name="MRPC"; version="2.2.1"; sha256="02aa52gk0kflf21hzszsfvmwyvq8n21cxzraxqf1v6f1d41n2w89"; depends=[bnlearn compositions dynamicTreeCut fastcluster GGally graph gtools Hmisc mice network pcalg plyr psych Rgraphviz sna WGCNA]; }; MRQoL = derive2 { name="MRQoL"; version="1.0"; sha256="0isn4g3jpz7wm99ymrshl6zgkb7iancdzdxl2w98n8fbxsh5z6sw"; depends=[]; }; - MRReg = derive2 { name="MRReg"; version="0.1.1"; sha256="10ijb1814lfizc7gfhckvpqw8ajl2wc7hp0bfla7gc8c1qqhw60v"; depends=[caret ggplot2 igraph]; }; + MRReg = derive2 { name="MRReg"; version="0.1.2"; sha256="18s9f61fgpmj5wwsg8q8w675mbg9ii4hngzh54bpbml44k3v91cf"; depends=[caret igraph]; }; MRS = derive2 { name="MRS"; version="1.2.4"; sha256="1sksg70zb72ys1b7vi8amjaqarmdh8vf2l1rb0rasrlvrip3z3br"; depends=[igraph Rcpp RcppArmadillo]; }; - MRTSampleSize = derive2 { name="MRTSampleSize"; version="0.2.0"; sha256="0c5svjsnzbskj7i0l5p7j04gh9rjvw72f6yyazxwcb339vb5mf7z"; depends=[]; }; - MRmediation = derive2 { name="MRmediation"; version="1.0.0"; sha256="1k9lknp0xd501x810lrnlrjshv79yvghs4l2clnx3m7zzkvxni5h"; depends=[fda MASS]; }; + MRTSampleSize = derive2 { name="MRTSampleSize"; version="0.3.0"; sha256="03c6jkanff241rcv1yixvmlnya3sd8hqpawf9dx9mpsri4pp6mdk"; depends=[]; }; + MRmediation = derive2 { name="MRmediation"; version="1.0.1"; sha256="0v0kn6x4fwj35imj1fb2f2024ifb7081z4cwlhjmdxhabcy6xbx7"; depends=[fda MASS]; }; MRsurv = derive2 { name="MRsurv"; version="0.2"; sha256="148myzk6r8whkpv1yv59dmdlr2n8vdwmaww165aw696xfjxwq550"; depends=[mvtnorm survival]; }; MSCMT = derive2 { name="MSCMT"; version="1.3.4"; sha256="1vh0i9nxqiy3qdnb7z7cn5kpp2jahdmaqpnv7q5650pkswhwmfpc"; depends=[ggplot2 lpSolve lpSolveAPI Rdpack Rglpk]; }; MSCquartets = derive2 { name="MSCquartets"; version="1.0.5"; sha256="0gfbawv7ib31pxmcj8ki67a72jqacm8nlizgk95yg7afjlqiyz8v"; depends=[ape phangorn RandomFieldsUtils Rdpack zipfR]; }; - MSEtool = derive2 { name="MSEtool"; version="2.0.0"; sha256="0fssl4yanb4y9dw0b3gpibb362dmirzmq6m4bgfmm27anvpfjhsm"; depends=[abind coda corpcor DLMtool dplyr gplots MASS mvtnorm RcppEigen reshape2 rmarkdown snowfall TMB]; }; - MSG = derive2 { name="MSG"; version="0.4"; sha256="0fdxgqfc87iwqnnrgh7m8bfxh8lv42ffi0xxy4i1rv94aiw8gfr5"; depends=[RColorBrewer]; }; + MSEtool = derive2 { name="MSEtool"; version="2.0.1"; sha256="0d9kyz8gbax4g4hmnjgkq3j0rx67zhrw2fx7y4y60kjc6i299f7i"; depends=[abind coda corpcor DLMtool dplyr gplots MASS mvtnorm RcppEigen reshape2 rmarkdown snowfall TMB]; }; + MSG = derive2 { name="MSG"; version="0.6"; sha256="19pckq41gyy4m97ag5q97lbdchl4fpx9xd8xv9r0jmlj66mz2dm7"; depends=[RColorBrewer]; }; MSGARCH = derive2 { name="MSGARCH"; version="2.42"; sha256="1n5fvj6yx8sfi1vizw89410hc0d37w8mpqfsksdv01pgnfdcs11a"; depends=[coda expm fanplot MASS numDeriv Rcpp RcppArmadillo zoo]; }; + MSGARCHelm = derive2 { name="MSGARCHelm"; version="0.1.0"; sha256="172xpvs98b9ay44ffb8bp9k4zsjzhy92pp7bv3d1j186pqhl13ib"; depends=[forecast MSGARCH nnfor]; }; MSGLasso = derive2 { name="MSGLasso"; version="2.1"; sha256="1k17vnvzr647pwfbdxrpqcsp34iygq86wf0ns4rq8cj6q5mik1bv"; depends=[]; }; - MSIseq = derive2 { name="MSIseq"; version="1.0.0"; sha256="1v2why1k6pjsc04044nr74571p7541nciq7xkzmya3jq6dw878j3"; depends=[IRanges R_utils rJava RWeka]; }; MSMwRA = derive2 { name="MSMwRA"; version="1.3"; sha256="0b0fqfv6iick1brqik4rqz2936nfa51i6xlfavs65r9692wks73q"; depends=[]; }; - MSPRT = derive2 { name="MSPRT"; version="2.1"; sha256="0c0hhpjpkx8yl5bxqn6nw747jli9fdzkwmi31lzr664r5xinxyf7"; depends=[doParallel foreach ggplot2 iterators nleqslv]; }; + MSPRT = derive2 { name="MSPRT"; version="3.0"; sha256="0fvikvnf3fa4ski9idg8llxx33bgkrfj5sgkjn0d1dz30kgcx2w2"; depends=[doParallel foreach ggplot2 ggpubr iterators nleqslv]; }; MSQC = derive2 { name="MSQC"; version="1.0.2"; sha256="11wcy04cpjlnc71s2svs4lm1cp718dz1p4a1603x6zwpbf22bygn"; depends=[rgl]; }; MSRDT = derive2 { name="MSRDT"; version="0.1.0"; sha256="1i35zsip6p177k9pnbmvkjdc1hpr6nclhbx2sfah95ls5v6xnzz8"; depends=[dplyr gtools reshape2]; }; MST = derive2 { name="MST"; version="2.2"; sha256="0p833nyq9p0r0hy02f4sy6gv1wm9flj3dxkv73ihy8503r89bbzz"; depends=[Formula MASS partykit survival]; }; @@ -2548,7 +2649,7 @@ in with self; { MTAR = derive2 { name="MTAR"; version="0.1.1"; sha256="17r2da1hdvs8qvgar87zdl51jy8w30vczcsi6jrq0rdyi1lld641"; depends=[CompQuadForm MASS Matrix]; }; MTDrh = derive2 { name="MTDrh"; version="0.1.0"; sha256="0ass3b90nr4i0y7v30hk8xhq3hj9bxaxcsr4f8wfi0lnvzfv6aaa"; depends=[]; }; MTLR = derive2 { name="MTLR"; version="0.2.1"; sha256="070121qn7vmxmxgvzv7ymhk19j9kxks4xa7qpd8vkc2rp3ara4cp"; depends=[Rcpp RcppArmadillo survival]; }; - MTPS = derive2 { name="MTPS"; version="0.1.9"; sha256="125ja7wz8fz1w7hfxks7qs524vwk86rp459ahxw9cjnn1qxyv38k"; depends=[class e1071 glmnet MASS rpart]; }; + MTPS = derive2 { name="MTPS"; version="1.0.1"; sha256="1jdlw943ywmrp64w1qrjqymqjh2jahnq0i5px8af1l3msznj20x4"; depends=[class e1071 glmnet MASS rpart]; }; MTS = derive2 { name="MTS"; version="1.0"; sha256="09pypanjmqrvxbrrckydxyyswsgjx4nhb052x4llk7va9w4lbcjs"; depends=[fBasics fGarch mvtnorm Rcpp]; }; MTSYS = derive2 { name="MTSYS"; version="1.2.0"; sha256="04dkan3hxl3difflskp7d1lw1bvxhg4s28ssy2v4m7z7wbpj3v1m"; depends=[]; }; MUACz = derive2 { name="MUACz"; version="2.1.0"; sha256="1d771vb2aimr87kyqj7zkmwarmxcxzbh7mvr396pf2zr3h8wi30c"; depends=[dplyr epiDisplay ggplot2]; }; @@ -2568,8 +2669,8 @@ in with self; { MWLasso = derive2 { name="MWLasso"; version="1.3.1"; sha256="11lyk46lmjcd60q0mixi41b8ybjgyp1xi18g3ag4450xyhw3r17s"; depends=[]; }; MWRidge = derive2 { name="MWRidge"; version="1.0.0"; sha256="17kvs9npr1ff24z3pv9x2qnfwyy6w3hc7hm60ynzbjlk2rr11xr9"; depends=[glmnet]; }; MWright = derive2 { name="MWright"; version="0.3.2"; sha256="1c57f0wnlhl4gqy17vi93r4fknycvv67b9bifgcvabws390jpx7q"; depends=[cubature]; }; - MXM = derive2 { name="MXM"; version="1.4.8"; sha256="0hhiqsln7i14cbqkfs3dchf0w38hcs58pmfsxp983vnwphdv61sw"; depends=[bigmemory coxme doParallel dplyr energy foreach geepack Hmisc knitr lme4 MASS nnet ordinal quantreg relations Rfast Rfast2 survival visNetwork]; }; - MaOEA = derive2 { name="MaOEA"; version="0.5.2"; sha256="1yaa8wr1gr1npqpls5g6mlr9dgjwiyvhk6p1dmjw29f7a4g2cam5"; depends=[e1071 gtools lhs MASS nnet nsga2R randtoolbox reticulate stringr]; }; + MXM = derive2 { name="MXM"; version="1.4.9"; sha256="14iksg94dc2bqfdjhj83z1zxwj67zsqn4rj0f1g59fj7843z4k6s"; depends=[bigmemory coxme doParallel dplyr energy foreach geepack Hmisc knitr lme4 MASS nnet ordinal quantreg relations Rfast Rfast2 survival visNetwork]; }; + MaOEA = derive2 { name="MaOEA"; version="0.6.2"; sha256="0s8jvp7821mb6xff8xwnh78mhz4qfrbk4g7sp4dfnm2ii7ah9c6b"; depends=[e1071 gtools lhs MASS nnet nsga2R pracma randtoolbox reticulate stringr]; }; MaXact = derive2 { name="MaXact"; version="0.2.1"; sha256="1n7af7kg54jbr09qk2a8gb9cjh25cnxzj2snscpn8sr8cmcrij0i"; depends=[mnormt]; }; MachineShop = derive2 { name="MachineShop"; version="2.5.0"; sha256="0awx838zjb2n2b9r32cx9h1cvg3h4x57xsif9hskjp5mba9pk78x"; depends=[abind dials foreach ggplot2 kernlab magrittr Matrix nnet party polspline progress recipes rlang rsample Rsolnp survival tibble]; }; Maeswrap = derive2 { name="Maeswrap"; version="1.7"; sha256="0cnnr5zq7ax1j7dx7ira7iccqppc6qpdjghjarvdb2zj0lf69yyb"; depends=[geometry lattice rgl stringr]; }; @@ -2582,23 +2683,23 @@ in with self; { Map2NCBI = derive2 { name="Map2NCBI"; version="1.4"; sha256="1ssqnm9g5p0nnhdyp9dqbbsz3hw8jzdwy0rv3csp8fxm0f1bi1kb"; depends=[rentrez]; }; MapGAM = derive2 { name="MapGAM"; version="1.2-5"; sha256="0ardqsa7smx0syh1l591bm6a1rb7kvcyw3rlb3hkfk8rk4k60qmr"; depends=[colorspace gam maptools sp survival]; }; Mapinguari = derive2 { name="Mapinguari"; version="1.0.0"; sha256="1jfqinfr6wkpmkp4jm9ixgawcywm3n1ni03h6zngvx74saz7kd3g"; depends=[dplyr magrittr raster rgdal rlang stringr testthat]; }; - MareyMap = derive2 { name="MareyMap"; version="1.3.5"; sha256="1k7hnfrlpj06k8v93xsvph0hwy5f99swg5gw07sn85nls03jdnak"; depends=[tkrplot]; }; + MareyMap = derive2 { name="MareyMap"; version="1.3.6"; sha256="0zbg72vck9p14zk1924407n5ap84qiisqhbq1vr715sw67fwdcxi"; depends=[]; }; MargCond = derive2 { name="MargCond"; version="1.0.0"; sha256="07qh1lgy8ds11cwlb4rxkl6aiph91zq29sy27b8wwxalycdgjrg8"; depends=[gee lme4 MASS Matrix]; }; MarginalMediation = derive2 { name="MarginalMediation"; version="0.7.0"; sha256="0jwp8rzv0ghir8k7dfmfrq4rvcqf7xww6va16p3jj2nk3r9hiq0x"; depends=[betareg boot cli crayon furniture magrittr purrr rstudioapi stringr tibble]; }; MarketMatching = derive2 { name="MarketMatching"; version="1.1.2"; sha256="0i3wccclrl7lixny24jif0xvmf6lgmwsgqxc6h5c3mv405cp0h1r"; depends=[bsts CausalImpact data_table doParallel dplyr dtw foreach ggplot2 iterators reshape2 scales zoo]; }; - Markovchart = derive2 { name="Markovchart"; version="1.0.6"; sha256="1r1rxsrdil7jxmhfzk8s4rqqs3v97kfvynbh5qa62g14acafm615"; depends=[doParallel foreach ggplot2 metR optimParallel]; }; + Markovchart = derive2 { name="Markovchart"; version="1.1.1"; sha256="0w15a19b35hah3zjbncgw4bq8ki1wdd86r90y1pr9fhw4vgmc1w2"; depends=[doParallel foreach ggplot2 metR optimParallel]; }; MarkowitzR = derive2 { name="MarkowitzR"; version="1.0.2"; sha256="0p234zs7lvi83fv02mijrhp7hmr5cklddayb61krhx1h2hn4gzb9"; depends=[gtools matrixcalc]; }; MaskJointDensity = derive2 { name="MaskJointDensity"; version="1.0"; sha256="0nxhsz57cw96in0sg5xg7sicv920kcnxr2rikn39y2qk4vrw6r78"; depends=[ks MASS np plyr]; }; Massign = derive2 { name="Massign"; version="1.1.0"; sha256="09i32lsrx40rxrnb9alfipfrkipy4mza5nr4gcpn2a5h86ak9290"; depends=[]; }; MasterBayes = derive2 { name="MasterBayes"; version="2.57"; sha256="0f8rc6799nji03slal27gbmprndy3dby0hhsmg2rm9l4ki44vz2y"; depends=[coda genetics gtools kinship2]; }; MatManlyMix = derive2 { name="MatManlyMix"; version="1.1.1"; sha256="1d2vd5b9lirdybjclxh0nn4mghq64qjj4l8vnj95cni5pfa18a2c"; depends=[]; }; MatSkew = derive2 { name="MatSkew"; version="0.1.5"; sha256="019v2b1r0bvw84xs50smjb3jdz7gd2adz5d84xd8zq43lnml96d1"; depends=[]; }; - MatTransMix = derive2 { name="MatTransMix"; version="0.1.10"; sha256="12zd0wgpphnv0j8fw437kilcnmci2wjv046jbzhfa48s9n6xc4rz"; depends=[]; }; - MatchIt = derive2 { name="MatchIt"; version="3.0.2"; sha256="1pp91pw2sy9hik4sgn4gcsp40hb01n9pfccrwdcffwji5fd1aavq"; depends=[MASS Matching]; }; + MatTransMix = derive2 { name="MatTransMix"; version="0.1.12"; sha256="0ygs4xnhkp50xb8238h3gis87z17ahvl0ywxysbiz26mnn751j5y"; depends=[mvtnorm]; }; + MatchIt = derive2 { name="MatchIt"; version="4.1.0"; sha256="18bvk73mf70a8r9js2mg8fn0yj0i1d1xaj8qg1mhrdygp35nfixk"; depends=[backports Rcpp RcppProgress]; }; MatchLinReg = derive2 { name="MatchLinReg"; version="0.7.3"; sha256="1si0zn6vlgyj08841hfjx8an96a8ipnawl4zbalabmpy7r5bfwx8"; depends=[Hmisc Matching]; }; MatchThem = derive2 { name="MatchThem"; version="0.9.3"; sha256="05m141qn0a9ahraga1lpcjffbddmm70bx9m3javrr9727nnar9wf"; depends=[broom dplyr MatchIt mice survey WeightIt]; }; Matching = derive2 { name="Matching"; version="4.9-7"; sha256="0vgw0nm40bicda2nwgklc27qsjxbqbjpl9yd28hqxj71xfsyqmhr"; depends=[MASS]; }; - Matrix = derive2 { name="Matrix"; version="1.2-18"; sha256="06b1rc1vq65b271f2wpzhqkvhng8hwwnvjflzxkng50i52603zzp"; depends=[lattice]; }; + Matrix = derive2 { name="Matrix"; version="1.3-0"; sha256="1hkxzxdqdlbxf3ai371amrj9s4b0fyibf5j9jdc00k1m2zwr3nl7"; depends=[lattice]; }; Matrix_utils = derive2 { name="Matrix.utils"; version="0.9.8"; sha256="0a5fq1scykqk0kc9j051j6fix6j2dqwz5wbgb0amaxsiywz9vigb"; depends=[grr Matrix]; }; MatrixCorrelation = derive2 { name="MatrixCorrelation"; version="0.9.4"; sha256="1p98ixz81swvf6d934h4djpgbi46x1hwbhrbxap5ywidplfi322i"; depends=[plotrix pracma progress Rcpp RcppArmadillo RSpectra]; }; MatrixEQTL = derive2 { name="MatrixEQTL"; version="2.3"; sha256="10r6h5bidj44kfbwiml9pkysbikqphfb21ig61qnx0qa12xcl6l8"; depends=[]; }; @@ -2608,35 +2709,35 @@ in with self; { MaxPro = derive2 { name="MaxPro"; version="4.1-2"; sha256="19a2wp93kx1wkbzd5bvljbm1rr96gr14w4fb0ppbgr2y2a4g8i1v"; depends=[nloptr]; }; MaxSkew = derive2 { name="MaxSkew"; version="1.1"; sha256="0x5x0jpvhp189jnmgh6d1h3ya0dicj5qfcrgr2fhp1v8jjhl125m"; depends=[]; }; MaxentVariableSelection = derive2 { name="MaxentVariableSelection"; version="1.0-3"; sha256="1cmxfdkm5k85b4ivlfy5521hkfj0gq2pb1qlxxklh0fprw87kp9c"; depends=[ggplot2 raster]; }; - MazamaCoreUtils = derive2 { name="MazamaCoreUtils"; version="0.4.4"; sha256="06db5xmcimqd0c5kwm2yavrs6dmb5qaflz3wavjhcxdzmhf4lpwh"; depends=[devtools dplyr futile_logger lubridate magrittr purrr rlang rvest stringr tibble xml2]; }; + MazamaCoreUtils = derive2 { name="MazamaCoreUtils"; version="0.4.6"; sha256="02qk8xlrvkpd36hx92yn1162ggfg6y0w6xxivw22wpzbq8mc7inn"; depends=[devtools dplyr futile_logger lubridate magrittr purrr rlang rvest stringr tibble xml2]; }; MazamaLocationUtils = derive2 { name="MazamaLocationUtils"; version="0.1.6"; sha256="187lrpc9z3k4jnd1nvqsb0qibz9xz9i1i61vssqm72h1hx1j9j6f"; depends=[digest dplyr geodist httr lubridate magrittr MazamaCoreUtils MazamaSpatialUtils readr revgeo rlang stringr]; }; - MazamaSpatialUtils = derive2 { name="MazamaSpatialUtils"; version="0.6.4"; sha256="0wb221h8lwdcx5h5hkvpz9rarizry22qzydibcc2gs6b0d5514ms"; depends=[countrycode dplyr geojsonio lubridate magrittr rgdal rgeos rlang rmapshaper rvest shiny sp stringr xml2]; }; + MazamaSpatialUtils = derive2 { name="MazamaSpatialUtils"; version="0.7.3"; sha256="1ckgsrjy1vxk4zf7p8fw25bb7hw59262pwfmk7414mv7xi4fij2g"; depends=[cleangeo countrycode dplyr magrittr MazamaCoreUtils rgdal rgeos rlang rmapshaper sp stringr tidyr]; }; McSpatial = derive2 { name="McSpatial"; version="2.0"; sha256="18nmdzhszqcb5z9g8r9whxgsa0w3g7fk7852sgbahzyw750k95n4"; depends=[lattice locfit maptools quantreg RANN SparseM]; }; Mcomp = derive2 { name="Mcomp"; version="2.8"; sha256="1wz5fr3dhxn4s0qvxm2mzq9dbz3x0vgh6pixjrgk9d4i9w2p7s60"; depends=[forecast ggplot2]; }; MeTo = derive2 { name="MeTo"; version="0.1.0"; sha256="14hdyh3p3q8yb9w2li2y9pc356jnymsn6n2750zdsrh52b751lpm"; depends=[lubridate]; }; MedDietCalc = derive2 { name="MedDietCalc"; version="0.1.1"; sha256="11q1yn6l697qa33wqik9y9lji39r6pph109yxkkprg9p80c187xy"; depends=[]; }; MedOr = derive2 { name="MedOr"; version="0.1"; sha256="1rwc14s16lnzgb78ac2017hv9pss7zw7nw3y7vrvq1qx4fgiw6f8"; depends=[]; }; - MedSurvey = derive2 { name="MedSurvey"; version="1.1.1.2.0"; sha256="1cxnni1j827pz3v9wb7l15acn9phxs86xxv1031vi5abmal5ngbp"; depends=[lavaan Matrix survey]; }; + MedSurvey = derive2 { name="MedSurvey"; version="1.1.1.3.0"; sha256="11lkli2arl5w2aizzd93fb6xsy30000nf3qc08qirrm07rwypaly"; depends=[lavaan Matrix survey]; }; MediaK = derive2 { name="MediaK"; version="1.0"; sha256="19cmxl2wksw9kvjsfn1m4nkr5gpcx6bk0sqrabj1n0dla1l32v2a"; depends=[Rcpp RcppEigen]; }; Mediana = derive2 { name="Mediana"; version="1.0.8"; sha256="0j1ikc2iaxl70134v0gijj2i2g0xgjafvn8rc108r9fhm8rpw564"; depends=[doParallel doRNG foreach MASS mvtnorm survival]; }; - Mega2R = derive2 { name="Mega2R"; version="1.0.7"; sha256="1x93jf3p1yifw9avhpd2lkm7grc7r655f8jbnhypms4a7nz8fjyi"; depends=[AnnotationDbi DBI famSKATRC gdsfmt GenomeInfoDb kinship2 pedgene Rcpp RSQLite SKAT]; }; - MendelianRandomization = derive2 { name="MendelianRandomization"; version="0.4.3"; sha256="0k90mbidynw8jxm4xr6ys86q7965v27a9z1y8fb07xiqpck1dann"; depends=[ggplot2 iterpc knitr Matrix plotly rjson rmarkdown robustbase]; }; - Mercator = derive2 { name="Mercator"; version="0.10.0"; sha256="04hfcg85vs7gkbbgbsymv7xadzzm2rvypw5awnxrnfmdhwn9r9bk"; depends=[ClassDiscovery cluster dendextend igraph KernSmooth Polychrome Rtsne Thresher]; }; + Mega2R = derive2 { name="Mega2R"; version="1.0.8"; sha256="1p81p371r721wcfz3qrc9l2bbk0v91csgqc961dx2sl7llhmj1fr"; depends=[AnnotationDbi DBI famSKATRC gdsfmt GenomeInfoDb kinship2 pedgene Rcpp RSQLite SKAT]; }; + MendelianRandomization = derive2 { name="MendelianRandomization"; version="0.5.0"; sha256="00gygggy0yl1qby5xdb8g7z8jllrxf4jwksy8a640qpv5v84r6al"; depends=[ggplot2 glmnet iterpc knitr Matrix plotly quantreg rjson rmarkdown robustbase]; }; + Mercator = derive2 { name="Mercator"; version="0.11.5"; sha256="0lv1gj0dfh37613gapm0mr1vxj5vsnfyvfqilkmpkjnz0gyd0ay5"; depends=[ClassDiscovery cluster dendextend flexmix igraph KernSmooth Polychrome Rtsne Thresher]; }; MetABEL = derive2 { name="MetABEL"; version="0.2-0"; sha256="0rqjv85mgswrbbp8b8ip6cdmz0cvfy9lm5mcr8a7h38rzgx3g3i3"; depends=[]; }; MetFns = derive2 { name="MetFns"; version="3.2.2"; sha256="15fd2d0yysibi2x43qv6b8i1pa18l7z4n0zpmrqhsmvqkgy8sla0"; depends=[astroFns lubridate plotrix pracma]; }; MetGen = derive2 { name="MetGen"; version="0.5"; sha256="00yzaicrpwfnxi5mdzwx1ai721vczkkf2yl50q9wwpxhmfx0xbbh"; depends=[chron glmnet MASS]; }; MetNorm = derive2 { name="MetNorm"; version="0.1"; sha256="0vfi3k0yp2dz47gwj1n1avs3ji0a2nlrrljz5d0l66zfh4474jb4"; depends=[]; }; MetProc = derive2 { name="MetProc"; version="1.0.1"; sha256="1z6538pij1rq5wv9s8rjcn0sck15y26asv4vamav8a6s4135ia3q"; depends=[fastcluster gplots]; }; MetaAnalyser = derive2 { name="MetaAnalyser"; version="0.2.1"; sha256="0k58325nb7svihhpga7kdbryr9bi5470qsb8aa5llpiggs8j7sfz"; depends=[DT ggvis rstudioapi shiny]; }; - MetaClean = derive2 { name="MetaClean"; version="0.1.0"; sha256="0nd5da7gg28dfmhjnzm90z8y7nkl9scg847rqj5h18hm7hp8gy4h"; depends=[BiocStyle caret fastAdaboost ggplot2 graph kernlab klaR knitr MLmetrics plotrix randomForest reshape2 Rgraphviz rpart xcms]; }; + MetaClean = derive2 { name="MetaClean"; version="1.0.0"; sha256="12vgdizggyz6wx08qf34jfhwgpzfrkgq63fvhfgi5gbf1nhma5zz"; depends=[BiocStyle caret fastAdaboost ggplot2 graph kernlab klaR knitr MLmetrics plotrix randomForest reshape2 Rgraphviz rpart xcms]; }; MetaComp = derive2 { name="MetaComp"; version="1.1.2"; sha256="1yb115qdmf5rxmjl4y7qr0i6668n46scs4yjpfq9bmy3w9i4ji1x"; depends=[Cairo data_table dplyr ggplot2 plyr reshape2]; }; MetaCycle = derive2 { name="MetaCycle"; version="1.2.0"; sha256="1lh1msrcz70p5jixz5j83pqa3cid21y7m1zvlk872k16awmif00k"; depends=[gnm]; }; + MetaDBparse = derive2 { name="MetaDBparse"; version="1.0.0"; sha256="166z1zmrs19ngcdqdxzpdshqvrk8pxx1rlr1harjbzyh0bv3pv46"; depends=[ChemmineR cmmr data_table DBI enviPat gsubfn Hmisc httr jsonlite KEGGREST openxlsx pacman pbapply progress R_utils rcdk RCurl Rdisop readxl reshape2 rJava RJSONIO rlist RSQLite rvest SPARQL stringi stringr webchem WikidataQueryServiceR XML xml2 zip]; }; + MetaIntegration = derive2 { name="MetaIntegration"; version="0.1.1"; sha256="0dsc6s8msi08rz7j8jbjd0p2wa3xsfriyxi6r42dhfd21bfcsw7v"; depends=[corpcor knitr MASS Rsolnp]; }; MetaIntegrator = derive2 { name="MetaIntegrator"; version="2.1.3"; sha256="1763in7zcfr4abhwc0sy27c1qbzbhkyjsasrhwdjjmsc645sqxlx"; depends=[AnnotationDbi Biobase BiocManager boot COCONUT data_table DBI dplyr DT GEOmetadb GEOquery ggplot2 ggpubr gplots HGNChelper httpuv magrittr manhattanly Metrics multtest pheatmap plotly plyr pracma preprocessCore readr reshape2 rmarkdown rmeta Rmisc RMySQL ROCR RSQLite stringr zoo]; }; MetaLandSim = derive2 { name="MetaLandSim"; version="1.0.7"; sha256="1vcwfrw20mjyf926zix530zzr0yw4yydg0i5r5rpddygbz5szd6g"; depends=[coda e1071 fgui googleVis igraph knitr maptools minpack_lm raster rgeos rgrass7 sp spatstat zipfR]; }; MetaLonDA = derive2 { name="MetaLonDA"; version="1.1.8"; sha256="0nalkmsii2anw07r16zcpgafb01l87hgpfr1mwc7nggvhdfp3w2g"; depends=[DESeq2 doParallel edgeR ggplot2 gss metagenomeSeq plyr pracma zoo]; }; - MetaPCA = derive2 { name="MetaPCA"; version="0.1.4"; sha256="14g4v3hyxnds4l2q36mpz282yqg8ahgdw3b0qmj0xg17krrf5l2s"; depends=[foreach]; }; MetaPath = derive2 { name="MetaPath"; version="1.0"; sha256="1vvpfv6yc4rd4apqfs2yzm97xxsv43ghwqnjq6w1xrc4pdx2p634"; depends=[Biobase genefilter GSEABase impute]; }; - MetaSKAT = derive2 { name="MetaSKAT"; version="0.80"; sha256="1hkkirbxl17v7sdbj4646fijlwvdw3p10h97r9h46cw6cn77v5gq"; depends=[SKAT]; }; MetaStan = derive2 { name="MetaStan"; version="0.2.0"; sha256="035qmzkijaql5d9h1a83p535gihy4bbv9n839q9kpp0l05mdwgwm"; depends=[BH Rcpp RcppEigen rstan rstantools StanHeaders]; }; MetaSubtract = derive2 { name="MetaSubtract"; version="1.60"; sha256="19xg95g2qgyi90pz3733l596gzdj6dmb0k9i4qmhaq4yck69rrhj"; depends=[]; }; MetaUtility = derive2 { name="MetaUtility"; version="2.1.0"; sha256="1lbqqh56pwxlcksv0kf463hc20jb4rkjqkcqal000rzyzd4bi2zj"; depends=[dplyr metafor purrr stringr]; }; @@ -2644,7 +2745,6 @@ in with self; { MetaboLouise = derive2 { name="MetaboLouise"; version="1.0.0"; sha256="1agcp520in0wpxv3x2jvvmv61hasazdymnvjhzl66nwv8lifl98z"; depends=[igraph]; }; MetaboQC = derive2 { name="MetaboQC"; version="1.0"; sha256="1hm0ndwda1ciyyg8igkpaalvvdyd7aq5wnl9gzza8fr1l9fxp4a2"; depends=[plyr]; }; MetabolAnalyze = derive2 { name="MetabolAnalyze"; version="1.3.1"; sha256="070qws759nczjrfdlh7jpbyjz4z3zm1hzb7vcvfgfks82wwb2ny0"; depends=[ellipse gplots gtools mclust mvtnorm]; }; - MetabolicSurv = derive2 { name="MetabolicSurv"; version="1.1.0"; sha256="0pi3pdl1wz8lbj47d0rvgrrdc72bffjf9q07dp92qx2857pppwz8"; depends=[ggplot2 glmnet gplots matrixStats pls Rdpack rms superpc survival survminer tidyr]; }; MetabolomicsBasics = derive2 { name="MetabolomicsBasics"; version="1.1"; sha256="13q8s96s71g7nyr6mi5q7jwmf4vx3pcr8l9ixqlc8hglnkd0y6rk"; depends=[C50 caret e1071 mixOmics pcaMethods plyr rlang ropls rpart]; }; MetaheuristicFPA = derive2 { name="MetaheuristicFPA"; version="1.0"; sha256="096k866mgrdgj55rzvdj080z80hzlj0667mydpz7gjaqdfriw8jg"; depends=[Rcpp RcppArmadillo]; }; Metatron = derive2 { name="Metatron"; version="0.1-1"; sha256="0apz2k3za19px1bcg4ls0axaljrpxnqhs86b6s862c370sspc1x8"; depends=[lme4 Matrix mpt]; }; @@ -2658,7 +2758,7 @@ in with self; { MfUSampler = derive2 { name="MfUSampler"; version="1.0.4"; sha256="0i5siq1jacxbfvakb97qnj3h7pk471rrx8ckwm0d8nl3j586s36y"; depends=[ars coda HI]; }; MiDA = derive2 { name="MiDA"; version="0.1.2"; sha256="144gxsxqljzskxsw5k0y69ix0pxlfvyyznxkjpf2ng4l47pg11z5"; depends=[caret gbm genefilter limma preprocessCore pROC SQN]; }; MiRAnorm = derive2 { name="MiRAnorm"; version="1.0.0"; sha256="154wv0j82xyc4y5cd2czh0q8kzhgrk6qsn0ahc1zn3fnrzc9fgz0"; depends=[ArgumentCheck cluster dendextend ggplot2 MASS npmv plyr reshape2]; }; - MiRKAT = derive2 { name="MiRKAT"; version="1.1.0"; sha256="15ah3zgf67sv0rxw99qvxsfbivni5pkcrmqhf0c3656bjwb397hd"; depends=[CompQuadForm ecodist GUniFrac lme4 MASS Matrix mixtools PearsonDS permute quantreg survival]; }; + MiRKAT = derive2 { name="MiRKAT"; version="1.1.1"; sha256="0qzfqc26ryngr1iar96a36z4skph7ddjq0nxbbznxhrz6kihyqzi"; depends=[CompQuadForm GUniFrac lme4 MASS Matrix mixtools PearsonDS permute quantreg survival]; }; MiRNAQCD = derive2 { name="MiRNAQCD"; version="1.1"; sha256="0bxzgk1jiw5jdl39pqm63bggpf7bsav6pj2nyyi59sshbrk7c104"; depends=[ggplot2 pROC]; }; MiRSEA = derive2 { name="MiRSEA"; version="1.1"; sha256="0jpl6ws5yx1qjzdnip9a37nmvx81az4cbsjm57x613qjpwmg6by3"; depends=[]; }; MiSPU = derive2 { name="MiSPU"; version="1.0"; sha256="1l6q0fm5z5i6gigr940h8kc5rka08psmhcprp8grmsxk3qy2kply"; depends=[ape aSPU cluster Rcpp RcppArmadillo vegan]; }; @@ -2667,22 +2767,22 @@ in with self; { MicroDatosEs = derive2 { name="MicroDatosEs"; version="0.8.2"; sha256="0k0hmi3ciipizmgjw1i5rrsg34yx21s1msn40vc4qc9s1n4wd8dl"; depends=[readr]; }; MicroMacroMultilevel = derive2 { name="MicroMacroMultilevel"; version="0.4.0"; sha256="1q5cyqr4hdl1wp2isk6p4p084i83kg6hd406wdp1nj9lv5i0xvgw"; depends=[]; }; MicroNiche = derive2 { name="MicroNiche"; version="1.0.0"; sha256="166ci4crkwnnh05rhs5hyrljgm4cdf7gp0ff8kjxjmd60byw80mz"; depends=[ggplot2 reshape2]; }; - MinBAR = derive2 { name="MinBAR"; version="1.1.1"; sha256="12a44lpcpdwf39dfqcng5l253gp54znvv083hzm9xqa3fbrbypca"; depends=[dismo ecospat geosphere lattice latticeExtra maxnet raster rgdal sp]; }; + MicroSEC = derive2 { name="MicroSEC"; version="1.1.3"; sha256="1imdxm15f792xw5kc9lhry5jsw739j6y3f2fs64abj22hqxfwypi"; depends=[BiocGenerics Biostrings data_table dplyr GenomeInfoDb GenomicAlignments gtools magrittr openxlsx R_utils Rsamtools stringr tidyr]; }; + MinBAR = derive2 { name="MinBAR"; version="1.1.2"; sha256="099afazil0gfs5yq92clc7ahis5azyvlql4zs7fhp82v9m6b80qj"; depends=[dismo ecospat geosphere lattice latticeExtra maxnet raster rgdal sp]; }; MinEDfind = derive2 { name="MinEDfind"; version="0.1.3"; sha256="1y0iv92mp7hf14vrj54qd0yvmjrv52jv3vg25kc5q7pml63njkqa"; depends=[ggplot2 gridExtra Iso]; }; MindOnStats = derive2 { name="MindOnStats"; version="0.11"; sha256="13995v4n0hfb53w02jk81pl7nazkvqwwv87y1sr99jr9ppzc08mz"; depends=[]; }; Miney = derive2 { name="Miney"; version="0.1"; sha256="0sgln0653rgglinr8rns5s2az0lgyp9slmynyhhhs265grkhrfj0"; depends=[]; }; Minirand = derive2 { name="Minirand"; version="0.1.3"; sha256="19lib0qh3xfzvpgsskl3yypmjygss0w7pimz0136av0px5b4jran"; depends=[]; }; - MissMech = derive2 { name="MissMech"; version="1.0.2"; sha256="1b7i1balfl1cqr3l4l4wxlahk2gmawzv9rhyibwzf0yp60cb1sv9"; depends=[]; }; MitISEM = derive2 { name="MitISEM"; version="1.2"; sha256="0dn398vrxh16gmy7ghh5000dgk7cbhb3gi3myrxp5dfri3ysjxcj"; depends=[mvtnorm]; }; MittagLeffleR = derive2 { name="MittagLeffleR"; version="0.3.0"; sha256="0lp3jazmcg90gp019djr4xx8zwxrrmjidp53rc2v7s122razn9lr"; depends=[stabledist]; }; MixAll = derive2 { name="MixAll"; version="1.5.1"; sha256="1jsh29ygy1n7lbz93ks725li9hnvfa0kp1qik13m72nmgw7g7q5a"; depends=[Rcpp rtkore]; }; - MixGHD = derive2 { name="MixGHD"; version="2.3.3"; sha256="16x8pq077w8ikksypr9szy863pwcfzmfa9f13pssb61x7yyqfa2f"; depends=[Bessel cluster e1071 ghyp MASS mixture mvtnorm numDeriv]; }; + MixGHD = derive2 { name="MixGHD"; version="2.3.4"; sha256="06h4sa5ws2ng87c9sqc0fl9psmk78gy2lxbxvspab1v1i636dq3j"; depends=[Bessel cluster e1071 ghyp MASS mixture mvtnorm numDeriv]; }; MixMAP = derive2 { name="MixMAP"; version="1.3.4"; sha256="0gxghym5ghbyxf589hda2fhv5l3x5jvm6i40x5xdwx4hadcn8k9a"; depends=[lme4]; }; MixMatrix = derive2 { name="MixMatrix"; version="0.2.4"; sha256="1bmd99p98brp8nzqhf442py2hmdj2vnzn15qwhrdskh6i0gzaqc4"; depends=[CholWishart Rcpp RcppArmadillo]; }; MixOptim = derive2 { name="MixOptim"; version="0.1.2"; sha256="14blyb1dqbdb14rby4nrggpqdx6b43lbb2xwi3059biq9mrj3a2x"; depends=[desirability ggplot2 patchwork rlang]; }; MixRF = derive2 { name="MixRF"; version="1.0"; sha256="1av1wx7wmfc3z8a4bc6g3i3b807nc28n3s2rs3yh0rcwq1pfl0ir"; depends=[doParallel foreach lme4 randomForest]; }; MixSAL = derive2 { name="MixSAL"; version="1.0"; sha256="15dymyzfs3bwskaf6xndj291g6nhw7k1q93y1cba55a6fdjh5qz9"; depends=[MASS]; }; - MixSIAR = derive2 { name="MixSIAR"; version="3.1.11"; sha256="1zv5qxbh5vs814r5x33nq5z42m43v9qgvin0q2fdi7gd87hyrpad"; depends=[bayesplot coda ggmcmc ggplot2 lattice loo MASS MCMCpack R2jags RColorBrewer reshape reshape2 splancs]; }; + MixSIAR = derive2 { name="MixSIAR"; version="3.1.12"; sha256="07wiv7x2c9mhqk37zndxvdb76m9shizc48qz2bp2f4g5z9hciid7"; depends=[bayesplot coda ggmcmc ggplot2 lattice loo MASS MCMCpack R2jags RColorBrewer reshape reshape2 splancs]; }; MixSim = derive2 { name="MixSim"; version="1.1-3"; sha256="1mrzbax2inpmhxz26zlybci6ks5q780f10vcy1za638dmkz16fnv"; depends=[MASS]; }; MixedPoisson = derive2 { name="MixedPoisson"; version="2.0"; sha256="0g5mpzj0wda6g46q3cg5mm3x4dvpz9gdclzn2m17l62lzny2i10p"; depends=[gaussquad MASS Rmpfr]; }; MixedPsy = derive2 { name="MixedPsy"; version="1.0.0"; sha256="19cgw82jdkcpkca90bab1k5gcb2prlxm634n4m7yx0p0mj736fha"; depends=[beepr boot brglm lme4 Matrix mnormt]; }; @@ -2691,7 +2791,7 @@ in with self; { MixtureInf = derive2 { name="MixtureInf"; version="1.1"; sha256="12qcflmrpzh4w5b40xq5qicks6p0cwqpf5k84pwabkjb168afddv"; depends=[quadprog]; }; MixtureRegLTIC = derive2 { name="MixtureRegLTIC"; version="1.0.0"; sha256="052gyk4gqv49fa2rxbxnib29f1vjxiw4q8llkfhsv8kw5pw38699"; depends=[]; }; MoBPS = derive2 { name="MoBPS"; version="1.4.87"; sha256="0wzmb02d9b49jrz8a4z28yri2zd8dh016an46h2dkmykr1asxg95"; depends=[]; }; - MoEClust = derive2 { name="MoEClust"; version="1.3.1"; sha256="1jl0zc6jiay8xmbdjiyyhx7qcq60n1w37kfb6hriajr3phr0ilv8"; depends=[lattice matrixStats mclust mvnfast nnet vcd]; }; + MoEClust = derive2 { name="MoEClust"; version="1.3.2"; sha256="1mmhf5pl2c9x2fvpq1jj5q3ifj6xgs8f1fsdqs7qvhbwxk3bk0hc"; depends=[lattice matrixStats mclust mvnfast nnet vcd]; }; MoLE = derive2 { name="MoLE"; version="1.0.1"; sha256="0bq19vwqjn5hl4mw5imkydbp39gal992vnh2dwrq8bb8cmj3qh91"; depends=[]; }; MoMPCA = derive2 { name="MoMPCA"; version="1.0.0"; sha256="049byaiwxl3h05pvwv9jj94g7dk2nrnba7qgx76hwwfbamvk6n5x"; depends=[doParallel dplyr foreach magrittr Matrix slam tm topicmodels]; }; MoTBFs = derive2 { name="MoTBFs"; version="1.4"; sha256="1b69wzsy0wnzgbk04x363wb1dfnxz610sn8d28cn2akvf7n8na70"; depends=[bnlearn ggm lpSolve Matrix quadprog]; }; @@ -2703,25 +2803,26 @@ in with self; { ModelMetrics = derive2 { name="ModelMetrics"; version="1.2.2.2"; sha256="0mrlsw4c5y1vdsqynxr2dcvmhh5h37pnd71jw5a5djpbda9g21jy"; depends=[data_table Rcpp]; }; Modelcharts = derive2 { name="Modelcharts"; version="0.1.0"; sha256="1jy78kyyh4r13px2d5bm7fra5bkcpimzfji0hmydspkfi3qla37x"; depends=[dplyr plotly]; }; Modeler = derive2 { name="Modeler"; version="3.4.5"; sha256="15gbg5568qj81wp6yy31amb2b7wl1wvlmgpmdp29lvz1p33jx2y1"; depends=[class ClassComparison ClassDiscovery e1071 neuralnet nnet oompaBase randomForest rpart TailRank]; }; - MomTrunc = derive2 { name="MomTrunc"; version="5.89"; sha256="0r6p28h2b348l8rr75yp760k18kvan0sns6lmcdbq9r34rmbsc90"; depends=[hypergeo mvtnorm Rcpp RcppArmadillo tlrmvnmvt]; }; - Momocs = derive2 { name="Momocs"; version="1.3.0"; sha256="149q4qyplgvcvscg7846m0cjagvby3rj40g9bpx6kvd67arfrl6y"; depends=[cluster dendextend dplyr geometry geomorph ggplot2 jpeg magrittr MASS progress RColorBrewer rgeos sp vegan]; }; + MolgenisAuth = derive2 { name="MolgenisAuth"; version="0.0.14"; sha256="0b9k1l66v30hcblbw9m3ylscx8fd4i51d8iggmm0l0gclnkbs5df"; depends=[httr urltools]; }; + MomTrunc = derive2 { name="MomTrunc"; version="5.91"; sha256="055llc2q32vybk16bkpy9x6na2asrjjhg2d9j489jdv9cn3n5w9s"; depends=[hypergeo mvtnorm Rcpp RcppArmadillo tlrmvnmvt]; }; + Momocs = derive2 { name="Momocs"; version="1.3.2"; sha256="1rjfq4vp5n8352v9yqaflcrzj3ysanzbacvx0qzj5k50my7grnhg"; depends=[cluster dendextend dplyr geometry geomorph ggplot2 jpeg magrittr MASS progress RColorBrewer rgeos sp tibble vegan]; }; Mondrian = derive2 { name="Mondrian"; version="1.1.0"; sha256="1x40cdry6dwixwqx10kv42xr4254kj1f17va186haw9m949xn5gd"; depends=[RColorBrewer]; }; MonetDB_R = derive2 { name="MonetDB.R"; version="2.0.0"; sha256="0b5flc9l4nshy2fmwxbzcsn7pdivwy3x6kic94ppyyiqzz41h0b1"; depends=[codetools DBI digest testthat]; }; MonoInc = derive2 { name="MonoInc"; version="1.1"; sha256="14rykw3bfj0vznz0rw4vsg1k4vanfv9cy867vspw966ncl4bw70h"; depends=[compare doParallel foreach iterators sitar]; }; MonoPoly = derive2 { name="MonoPoly"; version="0.3-10"; sha256="0ls3sjfkinp9c5002ww0xm4l2galf20w2f45nm5irkk9sbqas0jq"; depends=[quadprog]; }; Monte_Carlo_se = derive2 { name="Monte.Carlo.se"; version="0.1.0"; sha256="1d5gp4wvpvrlp82g8k8v668mzhmdlk2pvky34v7hxysap9xgmsqr"; depends=[]; }; MonteCarlo = derive2 { name="MonteCarlo"; version="1.0.6"; sha256="1jwq3by8zfy6sbzahcj5l0vicqn7yyqpb7xhfsaymfspm7xyq6pj"; depends=[abind codetools reshape rlecuyer snow snowfall]; }; + MonteCarloSEM = derive2 { name="MonteCarloSEM"; version="0.0.1"; sha256="0r6slgm7ka0flpzw0gzrdgjs27sf9757jbx2jsh5fjqfndzsz12j"; depends=[lavaan Matrix]; }; Morpho = derive2 { name="Morpho"; version="2.8"; sha256="080ix1j0r67l0y66zq4xzfl8lhd3q4y4hzmmxphxkhmx83rhsik0"; depends=[colorRamps doParallel foreach MASS Matrix Rcpp RcppArmadillo rgl Rvcg]; }; MorseGen = derive2 { name="MorseGen"; version="1.2"; sha256="1kq35n00ky70zmxb20g4mwx0hn8c5g1hw3csmd5n6892mbrri8s9"; depends=[]; }; MortCast = derive2 { name="MortCast"; version="2.3-0"; sha256="0jdfmwz2yd81dz8ks9f79wz5az6j59skvf3cp1rv2122bg5wl7n2"; depends=[wpp2017]; }; MortalityGaps = derive2 { name="MortalityGaps"; version="1.0.0"; sha256="0nfm8xa7gnshrl8hsvmvr3za8nbppp7f7i5h4ni204w7xwvh8jxc"; depends=[crch forecast MASS pbapply]; }; - MortalityLaws = derive2 { name="MortalityLaws"; version="1.8.4"; sha256="0sgxkw9f8s3iv6x2clsx6505wjflg6xa3w19m4q6gz8fkbh2sxfv"; depends=[minpack_lm pbapply RCurl tidyr]; }; - MortalitySmooth = derive2 { name="MortalitySmooth"; version="2.3.4"; sha256="1clx8gb8jqvxcmfgv0b8jyvh39yrmcmwr472j9g3ymm95m4hr8fq"; depends=[lattice svcm]; }; - MortalityTables = derive2 { name="MortalityTables"; version="1.0"; sha256="07pbjgc4qvznw1rfvmz6ndg0gzj0k61iajwn51ijpb7hscwi8937"; depends=[ggplot2 scales]; }; - MplusAutomation = derive2 { name="MplusAutomation"; version="0.7-3"; sha256="0sidvznbknc4pdk4w6izpizap2yvbzxbjnmnrxmwj45ypm9pjpqc"; depends=[boot coda data_table digest ggplot2 gsubfn lattice pander plyr rlang texreg xtable]; }; + MortalityLaws = derive2 { name="MortalityLaws"; version="1.8.5"; sha256="1kkf2blrv68s7rjcmcq6nbaxlizxqnrsy69cqk077ga0arlzjq1i"; depends=[minpack_lm pbapply RCurl tidyr]; }; + MortalityTables = derive2 { name="MortalityTables"; version="2.0.2"; sha256="1i2qgk772qyp9mcsrrv7cjwr6afw0fjid26073c1gi1rssifhvib"; depends=[ggplot2 pracma scales]; }; + MplusAutomation = derive2 { name="MplusAutomation"; version="0.8"; sha256="08k8c4h17k21g9gxj2hwg59dyny7j80kjk7086rgwq9lhqf022y9"; depends=[boot coda data_table digest ggplot2 gsubfn lattice pander plyr rlang texreg xtable]; }; MplusTrees = derive2 { name="MplusTrees"; version="0.1.1"; sha256="1s119p1fgr27rkh671zpzbfnd368m0s1607r8xwgjm0y5ncxwkv7"; depends=[MplusAutomation nlme rpart rpart_plot]; }; Mqrcm = derive2 { name="Mqrcm"; version="1.1"; sha256="15pxrh5i8pm6ckp44mlgq1ld5b1y9kg6vjvis5k812h64gm3aizq"; depends=[Hmisc pch]; }; - MrSGUIDE = derive2 { name="MrSGUIDE"; version="0.1.1"; sha256="09r5dqi4a9fc9hszjwqz0ry96jp80g1f2ibnq3zdngicp3gpm1x9"; depends=[BH magrittr Rcpp RcppArmadillo yaml]; }; + MrSGUIDE = derive2 { name="MrSGUIDE"; version="0.1.2"; sha256="1hd0lvvy12r6kxa64vwnjavyv2f7a9jqgjxgmlw86wwh5g09hvfd"; depends=[BH magrittr Rcpp RcppArmadillo yaml]; }; MsdeParEst = derive2 { name="MsdeParEst"; version="1.7"; sha256="1zhi1jr30sl7jpsw37lc3akfzixlhm9k2hjkha1pjy5fmd5lddlx"; depends=[MASS moments mvtnorm sde]; }; MtreeRing = derive2 { name="MtreeRing"; version="1.4.2"; sha256="097w65ijhdkag26z39kzqqp7bs3bcx4iqapj3qc8inh0iynhnxp6"; depends=[bmp dplR dplyr imager jpeg magick magrittr measuRing png shiny shinydashboard shinyWidgets spatstat tiff]; }; MuChPoint = derive2 { name="MuChPoint"; version="0.6.1"; sha256="15bqsc7bsjg55qxjwxh58bxbwz61a6wv4xxph994g4020b98l01x"; depends=[capushe Matrix Rcpp shiny]; }; @@ -2759,17 +2860,18 @@ in with self; { Myrrix = derive2 { name="Myrrix"; version="1.2"; sha256="05x2h4ppjhfm0wlpwyp8ycjg59qj3gv0yqdilxrzb1lkrzln92xb"; depends=[Myrrixjars rJava]; }; Myrrixjars = derive2 { name="Myrrixjars"; version="1.0-2"; sha256="1hhfg83z5kl6l250z3lippx3qc68k1wj1qlfzd6m66rgmk699gyl"; depends=[rJava]; }; N2H4 = derive2 { name="N2H4"; version="0.5.7"; sha256="0wpwcv17jvrjgvr0qhjrjr1i2rdxcga49c1c6m7s58p9wmdi8fg2"; depends=[dplyr httr jsonlite lubridate rvest tibble tidyr xml2]; }; + N2R = derive2 { name="N2R"; version="0.1.1"; sha256="1wjz145d5v1ml2zyvw2znvv550sn6cm7c3rdshg450f7c4j7qyp8"; depends=[Matrix Rcpp RcppEigen RcppSpdlog]; }; NACHO = derive2 { name="NACHO"; version="1.0.1"; sha256="14xifjfrrpf7mwjqzk9vqnd6hhxf4xm558j7hspjsr5gg0nq6ps6"; depends=[cli crayon dplyr ggbeeswarm ggforce ggplot2 ggrepel knitr magrittr purrr rlang rmarkdown rstudioapi scales sessioninfo shiny shinyWidgets tibble tidyr]; }; NADA = derive2 { name="NADA"; version="1.6-1.1"; sha256="0jp4mqr77cx7q5lff84s6wb0dwjy9mi0jyhbjc5fsx50bdczc3v7"; depends=[survival]; }; + NADIA = derive2 { name="NADIA"; version="0.4.0"; sha256="09ykmvk72j78ypcgfdiwknik83pk3wn1mvlhsvlj227rff16hj2x"; depends=[Amelia data_table doParallel foreach glmnet mice missForest missMDA missRanger mlr3 mlr3learners mlr3pipelines paradox softImpute testthat VIM]; }; NAEPprimer = derive2 { name="NAEPprimer"; version="1.0.1"; sha256="19p1livdnayfcl88f8r9x1vg30x522q8lgx66pfgwpkxjzvrqa2l"; depends=[]; }; NAM = derive2 { name="NAM"; version="1.7.3"; sha256="12d2yjl0af2ailvwk30fswalx1wzyj500qbrhiczsg1vr4rcqhkh"; depends=[Rcpp]; }; - NAPPA = derive2 { name="NAPPA"; version="2.0.1"; sha256="0nn4wgl8bs7sy7v56xfif7i9az6kdz9xw7m98z1gnvl2g7damvn3"; depends=[NanoStringNorm plyr]; }; NB = derive2 { name="NB"; version="0.9"; sha256="1gh42z7lp6g09fsfmikxqzyvqp2874cx3a6vr96w43jfwmgi2diq"; depends=[]; }; NB_MClust = derive2 { name="NB.MClust"; version="1.1.1"; sha256="0hzmrszxgx3pylf9pjjwk2ryjhwz7naxxkhcqpnfjv337vv5dg0i"; depends=[MASS]; }; NBAloveR = derive2 { name="NBAloveR"; version="0.1.3.3"; sha256="0k1f14srzks26x5wnhj8mrfwcq7wgbywcklr804lxsh04h4d6pwp"; depends=[dplyr magrittr tidyr]; }; NBBttest = derive2 { name="NBBttest"; version="1.0.0"; sha256="165j4smwqz4yra3946nd7ssgfwf7wjpysn22yj0bml36qk9y6vs7"; depends=[gplots gtools]; }; NBDdirichlet = derive2 { name="NBDdirichlet"; version="1.3"; sha256="1657mqwn5i1b0g0gva387zl02vpymn98f71b0p7i7xv033mqnpqw"; depends=[]; }; - NBDesign = derive2 { name="NBDesign"; version="1.0.0"; sha256="15iwrhwpx2c72xg2jk743qgm85vfv4yhyi5i6pm84ya8drsij70p"; depends=[MASS PWEALL]; }; + NBDesign = derive2 { name="NBDesign"; version="2.0.0"; sha256="0593rh2lf8wlxzjmwh2xx3jsb6miqx0wipqw9di10cbxbf6binb1"; depends=[MASS PWEALL]; }; NBLDA = derive2 { name="NBLDA"; version="1.0.0"; sha256="0sw84h1mgzhr6vmvxi4smk57r4gplg3kxq38gydcy6ckv2g8nzz2"; depends=[ggplot2]; }; NBPSeq = derive2 { name="NBPSeq"; version="0.3.0"; sha256="0l4ylxhs2k9ww21jjqs67fygk92avdchhx2y1ixzl7yr2yh1y9by"; depends=[qvalue]; }; NBR = derive2 { name="NBR"; version="0.1.3"; sha256="1bh1xwr80qz7qvk3m5ilk9ci03wmjb1bm8qq8kzbg35six6n4har"; depends=[nlme]; }; @@ -2784,10 +2886,11 @@ in with self; { NDP = derive2 { name="NDP"; version="0.1.0"; sha256="0wmld7g4w3d7d8lyj4132h3jpr8ng8kpy4ssqjp8r0lqwif2i86b"; depends=[rmarkdown shiny]; }; NEff = derive2 { name="NEff"; version="1.1"; sha256="16ys1fi28kbzg3am9vz1c5pc9x0ac47pl6za04h63lspk99yplzk"; depends=[bit msm]; }; NEpiC = derive2 { name="NEpiC"; version="1.0.1"; sha256="11zf112xcsg3k93vks2fnsflw2v2d56a0bsjpd460d21k3gipfz8"; depends=[igraph PairedData]; }; + NFLSimulatoR = derive2 { name="NFLSimulatoR"; version="0.2.1"; sha256="18rq5h1lwdkywr035gasm2gyvc0nlnq5i4m892rp29xwh7avy6kc"; depends=[data_table progress]; }; NFP = derive2 { name="NFP"; version="0.99.3"; sha256="18alq3nb47jyz0dh54y536a0igkfbh2x5nf2jxryfnizr47qc3a5"; depends=[apcluster dplyr ggplot2 graph igraph KEGGgraph magrittr plyr stringr tidyr]; }; NFWdist = derive2 { name="NFWdist"; version="0.1.0"; sha256="0833lg0pd763awrc6ibidwf2ldl79w9lmm5acq4bnpd2hzsx60l8"; depends=[]; }; NGBVS = derive2 { name="NGBVS"; version="0.2.0"; sha256="1k7m7wy54irqci6ccclpylbmz0613ha7r531cji99jb7nkpzl6l0"; depends=[Rfast]; }; - NGSSEML = derive2 { name="NGSSEML"; version="2.0"; sha256="0pl40dhjr28b4lbbi758n669k484q7diljbp5095gvzbd71pdh02"; depends=[car dlm fields interp mvtnorm]; }; + NGSSEML = derive2 { name="NGSSEML"; version="2.1"; sha256="0fjpq1nqqh4wbi2xzybz07x48d1nmwm25n93gj7znf7dm8qanxqs"; depends=[car dlm fields interp mvtnorm]; }; NHANES = derive2 { name="NHANES"; version="2.1.0"; sha256="0aphv3rakfcfrv2km1xyxpj1bxiazy6gwrvs7lyhxmq468fk4c9a"; depends=[]; }; NHLData = derive2 { name="NHLData"; version="1.0.0"; sha256="0dfqalccbkmqrn3h1z6s78l818c8sqn7d6yc8mg872ygmszryci7"; depends=[]; }; NHMM = derive2 { name="NHMM"; version="3.11"; sha256="1ynxk4dpllb3w8229dmxzjdmf0zh5cgmh3wa55d02disc6yhm77k"; depends=[BayesLogit MASS MCMCpack msm Rcpp]; }; @@ -2800,7 +2903,7 @@ in with self; { NISTunits = derive2 { name="NISTunits"; version="1.0.1"; sha256="0km9l3k9p35sb1qrhrz4ijjsdihvsp6j7cz5kh46lgf7nn6xdk7a"; depends=[]; }; NITPicker = derive2 { name="NITPicker"; version="1.0.1"; sha256="00jmin7y1bp7a4a1qcvv3rkgiy9qij7gbkxcdgpiyzcs6aaif59z"; depends=[fda fda_usc fdasrvf]; }; NLMR = derive2 { name="NLMR"; version="1.0"; sha256="0i5whvr42mizkv37fa4am81sfq58fsz9rnrhjlig4id9nddm6m9x"; depends=[checkmate dplyr fasterize RandomFields raster Rcpp sf spatstat tibble]; }; - NLP = derive2 { name="NLP"; version="0.2-0"; sha256="0xbhkrnxcbf322jfw31xcn4y2gnk5y7ccq1bz4h3prf44h0whr7w"; depends=[]; }; + NLP = derive2 { name="NLP"; version="0.2-1"; sha256="1dpj04fmld2lnhg072ahgjbhmciqqy9h1lrz0wf32mr7mm9s9sh5"; depends=[]; }; NLPclient = derive2 { name="NLPclient"; version="1.0"; sha256="0jhlz9mqziyk5574vl8qjjs4g75x27rlk90wvzm3q9kjrjyvad35"; depends=[curl NLP xml2]; }; NLPutils = derive2 { name="NLPutils"; version="0.0-5"; sha256="1jxxly85iajzb9qckkkar0przyxv005cyvry0qi5dkzhbyl5k490"; depends=[NLP qdap SnowballC]; }; NLRoot = derive2 { name="NLRoot"; version="1.0"; sha256="1x8mcdgqqrhyykr12bv4hl4wbh1zw2qgpnd2yrm68kb92iy95rh4"; depends=[]; }; @@ -2809,11 +2912,12 @@ in with self; { NMF = derive2 { name="NMF"; version="0.23.0"; sha256="0ls7q9yc9l1z10jphq5a11wkfgcxc3gm3sfjj376zx3vnc0wl30g"; depends=[Biobase BiocManager cluster colorspace digest doParallel foreach ggplot2 gridBase pkgmaker RColorBrewer registry reshape2 rngtools stringr]; }; NMFN = derive2 { name="NMFN"; version="2.0"; sha256="0n5fxqwyvy4c1lr0glilcz1nmwqdc9krkqgqh3nlyv23djby9np5"; depends=[]; }; NMI = derive2 { name="NMI"; version="2.0"; sha256="1rxphy9rhy9zhdiz48dvl9m26x6k681lnyn39lqxs0a6jhrxg7y3"; depends=[]; }; - NMOF = derive2 { name="NMOF"; version="2.1-0"; sha256="10dxy35ps8qmyfqhrz0g1yyc30d84wwmf084m94nv0pk87blw7s3"; depends=[]; }; + NMOF = derive2 { name="NMOF"; version="2.2-2"; sha256="0hj6yb32s79a65192jk4i77780bmgms57xsxldwxgw13j3w74i76"; depends=[]; }; NMVANOVA = derive2 { name="NMVANOVA"; version="1.1.0"; sha256="1jlqyg5vn7j8srvifjghd5a7820kadl8kbwib4qxalrfprq81h8p"; depends=[]; }; NNMIS = derive2 { name="NNMIS"; version="1.0.1"; sha256="1w2i4xlx249p589yqdgbx1ra406ycxw729vbk1lqadbn71m6blaz"; depends=[survival]; }; - NNS = derive2 { name="NNS"; version="0.5.4.3"; sha256="1g13h12n2mgnzkq65nrw0s3jayjwyd2z1f3229n25nq29fwca7dy"; depends=[data_table doParallel dtw meboot Rfast rgl stringr tdigest]; }; + NNS = derive2 { name="NNS"; version="0.5.6"; sha256="1whq73gl9s0h5nr380s0swv3479synvxbvlc2vsnzxq65nd5qhv1"; depends=[caret data_table doParallel dtw meboot Rfast rgl stringr tdigest]; }; NNTbiomarker = derive2 { name="NNTbiomarker"; version="0.29.11"; sha256="0sqlf7vzhpmq2g98c2qlrcqn3ba4ycfxbczgcjiqqhqsvgkpacc1"; depends=[magrittr mvbutils shiny stringr xtable]; }; + NNbenchmark = derive2 { name="NNbenchmark"; version="3.1.6"; sha256="188x3j339ljc7lg665x3zv0azdvdcd7h4wv2fdvwhwv2gzi887ry"; depends=[pkgload R6]; }; NORMA = derive2 { name="NORMA"; version="0.1"; sha256="193q6dwn8v7k8xq0amjpvb3v6mn7c6agqa487gvjj78dy1qz720a"; depends=[rootSolve]; }; NORMT3 = derive2 { name="NORMT3"; version="1.0-3"; sha256="041s0qwmksy3c7j45n4hhqhq3rv2hncm2fi5srjpwf9fcj5wxypg"; depends=[]; }; NPBayesImputeCat = derive2 { name="NPBayesImputeCat"; version="0.2"; sha256="0fxcs2l6g1gkvydl04ippkq192jn0zl2c304ww4hczzpvn7l8lsp"; depends=[Rcpp]; }; @@ -2824,27 +2928,28 @@ in with self; { NPHazardRate = derive2 { name="NPHazardRate"; version="0.1"; sha256="0na4iphva1dadz457ii8kxrhnki2asaxpbwr824rljyrldj9rcgg"; depends=[survival]; }; NPMLENCC = derive2 { name="NPMLENCC"; version="1.0"; sha256="1l11vczs7ijfpqv7i7j8c5sxyfcbipqx00lf75i2c0kf21njv1vx"; depends=[MASS survival]; }; NPMLEcmprsk = derive2 { name="NPMLEcmprsk"; version="3.0"; sha256="0nm88fsxgrfk0j0lmir57bhxy4p8ah503gpj6jdlvjqw862jigiq"; depends=[]; }; + NPMLEmix = derive2 { name="NPMLEmix"; version="1.2"; sha256="056jb3kz34lajryfbzkhq0g372iib6h8mr74mq18xkarp5blgmsl"; depends=[CAMAN dplyr FDRreg Hmisc latexpdf Matrix mosaic pbapply pracma progress R_utils Rcpp REBayes Rmosek spatstat]; }; NPMVCP = derive2 { name="NPMVCP"; version="1.1"; sha256="13jpm46abwziq8859jhl6hg1znk3ws1q7g4vlr2jyri3qa6h22dd"; depends=[]; }; NPP = derive2 { name="NPP"; version="0.2.0"; sha256="0zm67b9gs32snsd1knmdmz0ksksdin9cvqrqd94n7g378gdql96y"; depends=[]; }; NPS = derive2 { name="NPS"; version="1.1"; sha256="02idja149a2sj97sks4lhsaflpifyxi6n0rjlcq9993f84szfgsi"; depends=[]; }; NPflow = derive2 { name="NPflow"; version="0.13.3"; sha256="1bgdkm82pmzjv46pkxpvh5ffffmc6q68x5jjl7k330w9vwgx2kf0"; depends=[ellipse fastcluster ggplot2 pheatmap Rcpp RcppArmadillo reshape2 truncnorm]; }; NPsimex = derive2 { name="NPsimex"; version="0.2-1"; sha256="1k9i1f5ckvzdns8f5qnm2zq7qs3wsgzsnfwdz21zmhmi6d0pwchm"; depends=[]; }; NRejections = derive2 { name="NRejections"; version="1.2.0"; sha256="0lzj7kyn4s8l306a6xwkgkv1z4dlfsr61i902lvdxv4ln4m6a5kq"; depends=[doParallel foreach matrixcalc mvtnorm StepwiseTest]; }; - NSM3 = derive2 { name="NSM3"; version="1.14"; sha256="0w6ls6k3m395wka6zl64i0nvxjm9c6b3yyd80f6k9k14lmgivm8p"; depends=[agricolae ash binom BSDA coin combinat fANCOVA gtools Hmisc km_ci MASS metafor nortest np partitions quantreg Rfit SemiPar SuppDists survival waveslim]; }; + NSM3 = derive2 { name="NSM3"; version="1.15"; sha256="1ss4gkswb6qr58v1pm9b77qllpn9ks9xq5faiixvmbijjz3kkbj2"; depends=[agricolae ash binom BSDA coin combinat fANCOVA gtools Hmisc km_ci MASS metafor nortest np partitions quantreg Rfit SemiPar SuppDists survival waveslim]; }; NSO1212 = derive2 { name="NSO1212"; version="1.1.0"; sha256="0agsabhdx3il284ycycqq9jhkin513ygsfdbjx5l3h88smy8i7f2"; depends=[httr jsonlite]; }; - NST = derive2 { name="NST"; version="2.0.4"; sha256="0kwdfqr30av50k1s8sdf7714kzq9z1qrg85c3r7ljzrajj16vnl3"; depends=[ape permute vegan]; }; + NST = derive2 { name="NST"; version="3.0.3"; sha256="13ki87gkrxczd45kx7bn37sk7r7bgvrs9ysz9ya6mmvc2nab6gpn"; depends=[ape bigmemory iCAMP permute vegan]; }; NSUM = derive2 { name="NSUM"; version="1.0"; sha256="1as4g3v7qlk9wxlpwhg293980jq9gy6qay77bbcrjf481gvkkbp6"; depends=[MASS MCMCpack]; }; NScluster = derive2 { name="NScluster"; version="1.3.4"; sha256="1bkzmm573ic6xrsqbbln865rfw2xnmby632m3jcgamddxppx3fjf"; depends=[]; }; NTS = derive2 { name="NTS"; version="1.1.2"; sha256="02gh9yqflwgqws7a14wwb1y7qx0whw4ss1kkfgh9jp6bxc2dclnf"; depends=[dlm MASS MSwM Rdpack tensor]; }; NUCOMBog = derive2 { name="NUCOMBog"; version="1.0.4.2"; sha256="0s6gm3adc9qdh94pxzgccbxx1f1lbgqyvd4xk37xp6f3b5hwljdz"; depends=[snowfall]; }; NVCSSL = derive2 { name="NVCSSL"; version="1.0"; sha256="00dpi0b0zm5cfkyb2z8wfkw6xcax2kkplm9rzkvfjz7fchlmkx5r"; depends=[grpreg Matrix plyr]; }; NameNeedle = derive2 { name="NameNeedle"; version="1.2.6"; sha256="0cs65hs6fbkxv8pc2m4394c68nqbahjcryjnhhrhg50wam3y03lq"; depends=[]; }; - NanoStringNorm = derive2 { name="NanoStringNorm"; version="1.2.1"; sha256="05r1hvrxwi2mcq3pv6b699291qg120ijad96s5dah2f6cwx7gm7j"; depends=[gdata vsn XML]; }; + NanoStringNorm = derive2 { name="NanoStringNorm"; version="1.2.1.1"; sha256="1c2w129mz0linnc959h11zyhm8kyfmifwnbyi75iinqs373kv7vw"; depends=[gdata vsn XML]; }; NatureSounds = derive2 { name="NatureSounds"; version="1.0.3"; sha256="0db7y6213bkmfjr2r3jkdbx0wja778cgnavap03v7fswrl61w61m"; depends=[knitr tuneR]; }; NbClust = derive2 { name="NbClust"; version="3.0"; sha256="1vwb48zy6ln1ddpqmfngii1i80n8qmqyxnzdp6gbaq96lakl3w3c"; depends=[]; }; NegBinBetaBinreg = derive2 { name="NegBinBetaBinreg"; version="1.0"; sha256="0ryi9gdf4sis77c0qxm6r86mfkk1nq9djs297y64nr6ng3rv9p9d"; depends=[boot Matrix mvtnorm]; }; + Neighboot = derive2 { name="Neighboot"; version="1.0.0"; sha256="116q82svg8sw1xwnx253nd8vrv5i70rj45v7lf00m778rh9l2rmr"; depends=[dplyr igraph magrittr RDS RDStreeboot]; }; NestedCategBayesImpute = derive2 { name="NestedCategBayesImpute"; version="1.2.1"; sha256="15j54whvhqy26v1iikpk8ys75d7m5b188ggdzrlgzhjg0f9j45fl"; depends=[coda dplyr Rcpp RcppParallel]; }; - NestedCohort = derive2 { name="NestedCohort"; version="1.1-3"; sha256="10hsc6zik8sz2mp6ig3xr6z3bq0c6rlvqkn11pxny17a4n02wapp"; depends=[MASS survival]; }; NetCluster = derive2 { name="NetCluster"; version="0.2"; sha256="0aby8kfniw07jap795cwk69z83p45q5rap73zp1qbmkm3qcb31g4"; depends=[sna]; }; NetComp = derive2 { name="NetComp"; version="1.6"; sha256="11rxpdihn575diqfvc7yvxhlr2c19fig4v4a5c6jhqyfdsd60fsv"; depends=[gdata]; }; NetData = derive2 { name="NetData"; version="0.3"; sha256="1jf05zwy0c6gmm7kvxlwvai61bz4wpsw7cl0h4i21ipzn1rqxmqj"; depends=[]; }; @@ -2853,7 +2958,7 @@ in with self; { NetMix = derive2 { name="NetMix"; version="0.1.5"; sha256="1s6h5d34fd6brpiank2mpvpscvsgw86zfyq677s8nh8bkrc4idzs"; depends=[clue gtools igraph lda MASS Matrix poisbinom Rcpp RcppArmadillo RSpectra]; }; NetOrigin = derive2 { name="NetOrigin"; version="1.0-3"; sha256="162dhyx7z1nd3z14lfvm3dz0qwwvrc3n17zswbnwcfj6g1b1p2f1"; depends=[colorspace Hmisc igraph]; }; NetPreProc = derive2 { name="NetPreProc"; version="1.1"; sha256="0r51dqymf2nqm86py4zwdlf7qf120j0bg9r6a9c0gsyyijh4z40p"; depends=[graph]; }; - NetRep = derive2 { name="NetRep"; version="1.2.1"; sha256="0adlnq22nslp8ildbrf0z26783kzgz4cyn45a981qyjbw4c42hin"; depends=[abind BH foreach RColorBrewer Rcpp RcppArmadillo RhpcBLASctl statmod]; }; + NetRep = derive2 { name="NetRep"; version="1.2.4"; sha256="1swlb2k9bc7whvslxbklz864j9ynvna73hvq5rhv61cv5vy05ksd"; depends=[abind BH foreach RColorBrewer Rcpp RcppArmadillo RhpcBLASctl statmod]; }; NetSimR = derive2 { name="NetSimR"; version="0.1.0"; sha256="0iadlvc7m78svkjcwx18pk18jg7dv69gm1cvkz8k2a7b1absd9f5"; depends=[]; }; NetSwan = derive2 { name="NetSwan"; version="0.1"; sha256="1mwdy3ahagiifj2bd1ajrafvnxzi74a1x1d3i2laf1hqpz3fbgld"; depends=[igraph]; }; NetWeaver = derive2 { name="NetWeaver"; version="0.0.6"; sha256="058fi3vbp11mbg69n4yp1zf48akfdl6s2p0qpa0v6ngmk2zjk0bq"; depends=[]; }; @@ -2865,16 +2970,16 @@ in with self; { NetworkReg = derive2 { name="NetworkReg"; version="1.0"; sha256="0ymbigvl1n5348g77jqs1bcda00kdqrm7zifc0ibh5mwsrx6cmds"; depends=[Matrix randnet RSpectra]; }; NetworkRiskMeasures = derive2 { name="NetworkRiskMeasures"; version="0.1.4"; sha256="1121ma43jxc4p9rw0sc8w32shf9xrmn5qd1xsqgzr8diymc49zhg"; depends=[dplyr expm ggplot2 Matrix]; }; NetworkSim = derive2 { name="NetworkSim"; version="0.1.0"; sha256="1gvhzlmq46p99wald4pjnv9wxxqdympjkh3bzi98qa7qi84lny7y"; depends=[igraph incgraph]; }; - NetworkToolbox = derive2 { name="NetworkToolbox"; version="1.4.0"; sha256="1z7qkcj2djxf9bgdhjk7bgfxhb54m013qcsi421lbdjlppsysm7a"; depends=[corrplot doParallel fdrtool foreach igraph IsingFit MASS Matrix pbapply ppcor psych pwr qgraph R_matlab]; }; + NetworkToolbox = derive2 { name="NetworkToolbox"; version="1.4.1"; sha256="1zm6qgjijwadmwm7hx2w9j813qdrg4hxdxgq619gsjvmqmhgskl5"; depends=[corrplot doParallel fdrtool foreach igraph IsingFit MASS pbapply ppcor psych pwr qgraph R_matlab]; }; NeuralNetTools = derive2 { name="NeuralNetTools"; version="1.5.2"; sha256="0d73rbp8v0k0j8dp4yigan7krhglx6qfbadvyg7nsj67xc00vbfd"; depends=[ggplot2 nnet reshape2 scales tidyr]; }; - NeuralSens = derive2 { name="NeuralSens"; version="0.2.1"; sha256="0nr060vc30yyff9iydmb3sbj0snjaghk0jbcf8iydh89rcb1m0hk"; depends=[caret fastDummies ggforce ggnewscale ggplot2 gridExtra Hmisc NeuralNetTools reshape2 scales stringr]; }; + NeuralSens = derive2 { name="NeuralSens"; version="0.2.2"; sha256="17i4dyd487wnvw1zj3jciw684spc62hmjxkcy5scjbpvjv1ymn4y"; depends=[caret fastDummies ggforce ggnewscale ggplot2 gridExtra Hmisc NeuralNetTools reshape2 scales stringr]; }; Newdistns = derive2 { name="Newdistns"; version="2.1"; sha256="1b5njkzj8b0wrvvfv904di0933k9d320gadmfm5zl6pzdp34bh1i"; depends=[AdequacyModel]; }; NewmanOmics = derive2 { name="NewmanOmics"; version="1.0.4"; sha256="1ny1w4kwdgfzm4jsj6mf3k0c10bwzwz4gmpb5vg3qffddly9wfaz"; depends=[oompaBase]; }; NightDay = derive2 { name="NightDay"; version="1.0.1.1"; sha256="1gwwxk428gkvci4dhfb3zikvidalpqkl0q2r6qpm58c12j14jk1h"; depends=[maps]; }; NipponMap = derive2 { name="NipponMap"; version="0.2"; sha256="0jk3zz05vhximbbm15h7ngb0ffxp5w8zhisifipkdgvg1hpi7pb7"; depends=[sf tibble]; }; NitrogenUptake2016 = derive2 { name="NitrogenUptake2016"; version="0.2.3"; sha256="13mh63z3x8yqd31v5a4d10bhzk4y67ac38flwk2msv7qcx37sny6"; depends=[car MASS zoo]; }; NlcOptim = derive2 { name="NlcOptim"; version="0.6"; sha256="121njnbfww6qijbc9x6prw35glyzm18di01qvvjn62z4kgq4f7vi"; depends=[MASS quadprog]; }; - NlinTS = derive2 { name="NlinTS"; version="1.4.2"; sha256="017y7f7di8bmw0kvbkskv9g4zyaqxk2qxw6bm3nd5llfhgrr6q21"; depends=[Rcpp Rdpack timeSeries]; }; + NlinTS = derive2 { name="NlinTS"; version="1.4.4"; sha256="1v01gmk3g8j9wampldn2h82cxwqpqd12z5bydkx7b8a47znnfgij"; depends=[Rcpp Rdpack timeSeries]; }; NlsyLinks = derive2 { name="NlsyLinks"; version="2.0.6"; sha256="1kdqifwjkkk4x1ixg3ca6lbqx79ab907nnzwxca5iw721mbk5njg"; depends=[lavaan]; }; Nmisc = derive2 { name="Nmisc"; version="0.3.5"; sha256="1328sfxhkq1lyx8wx2k112iq9lxhg067gnk36vgxpcsq42vdzycr"; depends=[dplyr magrittr purrr rappdirs rlang stringr tibble tidyselect]; }; NobBS = derive2 { name="NobBS"; version="0.1.0"; sha256="0i0jyny1c29knpcl4szqwyxvdc3dqjfk5lf2xvwjdx3qas92w03l"; depends=[coda dplyr magrittr rjags]; }; @@ -2893,10 +2998,10 @@ in with self; { NormalLaplace = derive2 { name="NormalLaplace"; version="0.3-0"; sha256="0njgjdx2yvvy5jb5zn6zr7jdz5hck5bbkicv15z4ai4ibmckqjmh"; depends=[DistributionUtils GeneralizedHyperbolic]; }; NostalgiR = derive2 { name="NostalgiR"; version="1.0.2"; sha256="0rpvwi815sdhaxqpji1y6g0vy8mkn5k6wci0a4jf54pkywwkwrwp"; depends=[txtplot]; }; Nozzle_R1 = derive2 { name="Nozzle.R1"; version="1.1-1"; sha256="05sjip4sz12mwd3jcbvk342p83kdmrd4l2jrh17p18w4l7w4nn0z"; depends=[]; }; - Numero = derive2 { name="Numero"; version="1.6.0"; sha256="1f27b8zyh3fpsg6qfvlm1nq1ph5fdydxfff0609plr7prafqz85f"; depends=[Rcpp]; }; - NutrienTrackeR = derive2 { name="NutrienTrackeR"; version="0.99.2"; sha256="1vzha3ywjbd877fqy3r2xkgi8m44s3ss65bij0vcc4mx8lajhgb5"; depends=[ggplot2]; }; - OAIHarvester = derive2 { name="OAIHarvester"; version="0.3-0"; sha256="1c57jxb9n397wdkrirbfh70sxllrg9zsy0np698z7kcx83rz5lqr"; depends=[curl xml2]; }; - OBASpatial = derive2 { name="OBASpatial"; version="1.1"; sha256="1a6n440z50v75ms3lmjsa9z7cz0fkmj3k98wsqhq1s7sazd85am4"; depends=[cubature invgamma LaplacesDemon modeest truncdist]; }; + Numero = derive2 { name="Numero"; version="1.7.2"; sha256="0pizlng63mlmyy44sw35ajr9cyq09h1j6495hz9fq65d21jp652b"; depends=[Rcpp]; }; + NutrienTrackeR = derive2 { name="NutrienTrackeR"; version="1.0.0"; sha256="1cdmscxyr3fm036iw0dh3anbck2zr5fv2kmhx5qc2zr8y7c1kys2"; depends=[ggplot2 shiny]; }; + OAIHarvester = derive2 { name="OAIHarvester"; version="0.3-1"; sha256="00715bw5ix4w5qfwwqd2bhqcs8m6b44402nglfdwjr9crp95whhq"; depends=[curl xml2]; }; + OBASpatial = derive2 { name="OBASpatial"; version="1.7"; sha256="0zn5cbj40nfnqw51rc4jg1fhkr95yapcsdp76jdhnh3fqi4i228f"; depends=[cubature HDInterval invgamma LaplacesDemon modeest mvtnorm truncdist]; }; OBMbpkg = derive2 { name="OBMbpkg"; version="1.0.0"; sha256="01wch8wwij3fd0jambk0hpkhlnp4ryrq8qnnr2w1iad9zssjyii5"; depends=[]; }; OBsMD = derive2 { name="OBsMD"; version="6.1"; sha256="0jvvcx2lc39rdnlbhykam6cf94lbci9zc1vshwfhvygblnmjgrzr"; depends=[]; }; OCA = derive2 { name="OCA"; version="0.2"; sha256="02kja2ixqv4rcjlkzidwmjplmpkjlzcniabyn39zdi6601hfv1jr"; depends=[]; }; @@ -2911,8 +3016,10 @@ in with self; { OHPL = derive2 { name="OHPL"; version="1.4"; sha256="0svim112khdymdj1bsj8vri6r0zph5312y148mlh5h98rah40i08"; depends=[glmnet mvtnorm pls]; }; OIdata = derive2 { name="OIdata"; version="1.0"; sha256="078khxrszwnrww2h0ag153bf59fnyhirxy4m56ssgr2gmfahaymf"; depends=[maps RCurl]; }; OLScurve = derive2 { name="OLScurve"; version="0.2.0"; sha256="1zqapfwgwy9rxnbhmlgplkphw1bdia4cyi9q6iwcppw3rjw75f1n"; depends=[lattice]; }; + ONEST = derive2 { name="ONEST"; version="0.0.1"; sha256="1r6nz5fmx7vsqq0hyns5kkimm1cgi845cd887xs2qvknzq52v362"; depends=[]; }; ONETr = derive2 { name="ONETr"; version="1.0.3"; sha256="14l56qcmyyk2ivcfkfv7j2k4i1mfrngpi9zcc88w6xfhz5qlb548"; depends=[plyr RCurl XML]; }; OOBCurve = derive2 { name="OOBCurve"; version="0.3"; sha256="1i7prybs3b60ipl34zrq6mcr6w9kc1d44b14mxcd752k42k6xs2r"; depends=[mlr randomForest ranger]; }; + OOI = derive2 { name="OOI"; version="0.1.0"; sha256="0ivxgq539v68kak3zzakywppba0grzh7qn1h404s4ag30cxv0g8p"; depends=[modi]; }; OOR = derive2 { name="OOR"; version="0.1.3"; sha256="13v04rx2q6pbiq7dyd29wvimkr4sbq2f5rnn3a0lcbwr3x35r7h9"; depends=[]; }; OOmisc = derive2 { name="OOmisc"; version="1.2"; sha256="09vaxn5czsgn6wpr27lka40kzd76jzqgqxavf26ms3m9kkdf83g4"; depends=[]; }; OPDOE = derive2 { name="OPDOE"; version="1.0-10"; sha256="04z944i4f3i0cjnxh32wf7n2dfyynnvkz4lxdkn90flam2np58yv"; depends=[crossdes gmp mvtnorm nlme orthopolynom polynom]; }; @@ -2928,12 +3035,11 @@ in with self; { OSDR = derive2 { name="OSDR"; version="1.1.3"; sha256="059sj003zsrabmjfhwvvpi599ssrckcqpiw2b3vz405ljnhjmlap"; depends=[]; }; OSMscale = derive2 { name="OSMscale"; version="0.5.1"; sha256="0rjhyhh1iafgd9h1pbd2clyg2sh0gg7y1aqmiislqyn6h6jrvgqn"; depends=[berryFunctions OpenStreetMap sp]; }; OSNMTF = derive2 { name="OSNMTF"; version="0.1.0"; sha256="0g83wqh97iz3g4ganj2dy3biyn8cmb0v8zz6rydald1hfszj8aa2"; depends=[dplyr MASS]; }; - OSTSC = derive2 { name="OSTSC"; version="0.0.1"; sha256="0p92w25xvajsn44rd5hg1m7l9l4m0rpmw175nnqr438432hqh7cc"; depends=[doParallel doSNOW fields foreach MASS]; }; OTE = derive2 { name="OTE"; version="1.0.1"; sha256="0jvvrrfhpc5kibbxrd5r4dj97jp5m072fxnkpcyz11gi65db3z4g"; depends=[randomForest]; }; OTRselect = derive2 { name="OTRselect"; version="1.0"; sha256="1bh14228yz552ngywjf1qyh1isqj4cgiy7n7d4zg8dpqwxr04ykp"; depends=[lars survival]; }; OTUtable = derive2 { name="OTUtable"; version="1.1.2"; sha256="1sm037ihm12xyp7ns5f0c1psflvm1aj3xnsj5nzh2rsjn35hvd6h"; depends=[]; }; - OTclust = derive2 { name="OTclust"; version="1.0.2"; sha256="1nrgjn13nbki59i51m28h3z0bppmvcp7qgv09h2r2vvdk858iy9z"; depends=[class ggplot2 magrittr RColorBrewer Rcpp]; }; - OUwie = derive2 { name="OUwie"; version="2.4"; sha256="0b5bhb6xw5s1xx37b8bgqnq1z05zzsdpcxrg7j72v17l0q7ai51w"; depends=[ape corpcor geiger igraph interp lhs nloptr numDeriv paleotree phangorn phytools RColorBrewer]; }; + OTclust = derive2 { name="OTclust"; version="1.0.4"; sha256="11mr67zp68wzf1dd6vb3f31g8a430im97sdjsb0w4awqpmjdyyrz"; depends=[class ggplot2 magrittr RColorBrewer Rcpp]; }; + OUwie = derive2 { name="OUwie"; version="2.5"; sha256="1kvs6s18qbvc9k9i99lhnyfgsvhf5rwm5wj7sc06d751jllk7b16"; depends=[ape corpcor geiger igraph interp lhs nloptr numDeriv paleotree phangorn phylolm phytools RColorBrewer]; }; OWEA = derive2 { name="OWEA"; version="0.1.1"; sha256="00mx94v3krivsxha6sh13xhn2bdj77g8858vc4r2cy23ab4bg0g7"; depends=[gtools MASS shiny]; }; Oarray = derive2 { name="Oarray"; version="1.4-9"; sha256="04jng89s19rd8lbjm76wm4p4ggkffwnsa5qa60c4lwn2rj89a8a1"; depends=[]; }; OasisR = derive2 { name="OasisR"; version="3.0.2"; sha256="1388ld2nws3ppnkavg8s59q3inqf365c5cf9qvzbj6icmwqs9rdd"; depends=[measurements outliers rgdal rgeos seg spdep]; }; @@ -2952,7 +3058,7 @@ in with self; { Oncotree = derive2 { name="Oncotree"; version="0.3.3"; sha256="147rc9ci66lxbb91ys2ig40sgmldi15p604yysrd4ccbxpbk2zwf"; depends=[boot]; }; OneArmPhaseTwoStudy = derive2 { name="OneArmPhaseTwoStudy"; version="1.0.3"; sha256="0q8g33s1jq0ipvwq83xhrly8idsh68licgyivxc628zbm1id5p38"; depends=[Rcpp]; }; OneR = derive2 { name="OneR"; version="2.2"; sha256="1k7rzhcwq5b2yi4zfsc1r0yb6w65gxj9835d2a1dclallja3zav2"; depends=[]; }; - OneStep = derive2 { name="OneStep"; version="0.9.0"; sha256="19ndvx1jzdi6jn8sj7sw048pzq8s936icbi45ncvp598lnbwh5br"; depends=[fitdistrplus numDeriv]; }; + OneStep = derive2 { name="OneStep"; version="0.9.1"; sha256="1qqc5rvy2hssflw4qpr548xs7hjian191827dim29b3mr2i2hnry"; depends=[fitdistrplus numDeriv]; }; OneTwoSamples = derive2 { name="OneTwoSamples"; version="1.0-3"; sha256="0019rc2f4jmbm6sinkvalvjqwi822x78aiin88kg8qbbb5ml8l89"; depends=[]; }; OpVaR = derive2 { name="OpVaR"; version="1.1.1"; sha256="0sb2brwv20ppgsw1x2zz4frkdwhgq8766k8fchr6flp4c4jkkyma"; depends=[actuar evmix MASS pracma ReIns tea truncnorm VineCopula]; }; OpasnetUtils = derive2 { name="OpasnetUtils"; version="1.3"; sha256="0mmn4dpk1wl8slg55xzhpk7jdwhkrka53rwmrsr73sikkh3mcyfn"; depends=[digest ggplot2 httpRequest igraph plyr RCurl reshape2 rgdal rjson sp triangle xtable]; }; @@ -2961,18 +3067,18 @@ in with self; { OpenLand = derive2 { name="OpenLand"; version="1.0.1"; sha256="1wa7hkfwvzzj9lm07hdajwf6g8ys3g2ff8vqva3gqwqa9j1fam9n"; depends=[circlize dplyr ggplot2 gridExtra networkD3 raster tidyr]; }; OpenML = derive2 { name="OpenML"; version="1.10"; sha256="132swv22ymm0wxq8y65y2niq8chmga1mnl1lgn6m3cgljvwad47r"; depends=[backports BBmisc checkmate curl data_table digest httr jsonlite memoise stringi XML]; }; OpenMPController = derive2 { name="OpenMPController"; version="0.2-5"; sha256="00hs8v47pr2d726z8izkfrgmayw147hdm16rr9rw1zs3ad216zjj"; depends=[]; }; - OpenMx = derive2 { name="OpenMx"; version="2.17.4"; sha256="07y4w7xdb63p5kkrj6sdx1kabbsgbbj7nw9hc690jy84r15aryal"; depends=[BH digest MASS Matrix Rcpp RcppEigen rpf StanHeaders]; }; + OpenMx = derive2 { name="OpenMx"; version="2.18.1"; sha256="0gyjps0l3ig90piccgd04s63cz65kk5i5l9iyakps4bv27h1lzwm"; depends=[BH digest lifecycle MASS Matrix Rcpp RcppEigen rpf StanHeaders]; }; OpenRepGrid = derive2 { name="OpenRepGrid"; version="0.1.12"; sha256="02p9b2y99z9yrrm2pl86p0yqwah0yjic2wdcd4k0mhccimmmkaip"; depends=[abind colorspace GPArotation openxlsx plyr psych pvclust rgl stringr XML]; }; - OpenRepGrid_ic = derive2 { name="OpenRepGrid.ic"; version="0.3.0"; sha256="0crhznaqyyjinyd7bzdkjd1zhy4v0mk3g20p1r2490s435vr2hxn"; depends=[dplyr DT formattable igraph magrittr openxlsx reshape2 rintrojs scales shiny shinyBS shinycssloaders shinydashboard shinydashboardPlus shinyFeedback shinyjs shinythemes shinyWidgets stringr testthat tidyr tidyverse]; }; + OpenRepGrid_ic = derive2 { name="OpenRepGrid.ic"; version="0.4.0"; sha256="0d6pq31f0r8pqyvv51zp8hcrhnfmp4dw7m6vlqy1b5kkr7622hy3"; depends=[dplyr DT formattable igraph magrittr openxlsx RColorBrewer reshape2 rintrojs scales shiny shinyBS shinycssloaders shinydashboard shinydashboardPlus shinyFeedback shinyjs shinythemes shinyWidgets stringr testthat tidyr tidyverse withr]; }; OpenStreetMap = derive2 { name="OpenStreetMap"; version="0.3.4"; sha256="0kyv14lxi86n6aba4jqmsfpmn075k0ki34q6gkkvhq8yv48wg831"; depends=[ggplot2 raster rgdal rJava sp]; }; Opportunistic = derive2 { name="Opportunistic"; version="1.2"; sha256="0kaj11ziij1v65l972x4kbr7vzkx4dwa27ymabiip4dg57a976wr"; depends=[]; }; Opt5PL = derive2 { name="Opt5PL"; version="0.1.1"; sha256="0v3ibfzmkfnkhxylhaqcd3yqygsk7027ga12vb6gj4h4zcccf17f"; depends=[matrixcalc Rcpp]; }; + OptCirClust = derive2 { name="OptCirClust"; version="0.0.3"; sha256="0z0ak5h2m7cpws17v8z203hjr17jkqsm1h1gw7lqrzsl8cjwnkrn"; depends=[Ckmeans_1d_dp plotrix Rcpp]; }; OptGS = derive2 { name="OptGS"; version="1.1.1"; sha256="1acwwjng5ri5vganv7b5pagp7524ifr0q8h1pbfb5g6z3x6w08kh"; depends=[]; }; OptHedging = derive2 { name="OptHedging"; version="1.0"; sha256="0g7qaf5abvbcqv2h1dciwn3gwpz084ryqjjk0yabdm4ym0y38ddm"; depends=[]; }; OptInterim = derive2 { name="OptInterim"; version="3.0.1"; sha256="1ks24yv5jjhlvscwjppad27iass59da1mls99hlif0li9mvkbvyk"; depends=[clinfun mvtnorm]; }; OptM = derive2 { name="OptM"; version="0.1.3"; sha256="1dykfhnkrqz2axzzggpzaiknd52rx8zj4nk3nv2rvh74f9hv8px7"; depends=[boot SiZer]; }; OptSig = derive2 { name="OptSig"; version="2.1"; sha256="1k43qsjdc00plgsindjkfn6v098v0zfy7sjkh4n4ybib2qx3v8fn"; depends=[pwr]; }; - OptimClassifier = derive2 { name="OptimClassifier"; version="0.1.5"; sha256="1j2svfy5lzvz5vazpf55fvzqy5kk0l47x8qfy6j2jz1dc3gjh2rs"; depends=[clisymbols crayon dplyr e1071 ggplot2 lme4 lmtest MASS nnet nortest rpart]; }; OptimaRegion = derive2 { name="OptimaRegion"; version="1.1"; sha256="1bikc12a5v3q7f26r14pdfmnxpyqzxa94a10mx5g954km3a329ly"; depends=[boot DepthProc fields geometry magrittr mclust nloptr Rdpack Rdsdp rsm spam stringr]; }; OptimalCutpoints = derive2 { name="OptimalCutpoints"; version="1.1-4"; sha256="0n2vmzkc733yzs155zdj2n8ng74x9hy4m91fl7fac8d4gnrnc8yg"; depends=[]; }; OptimalDesign = derive2 { name="OptimalDesign"; version="1.0.1"; sha256="02vxxb25q7fl73y7zq0a89ra0s88wji4mrql7p88014p073lj2as"; depends=[lpSolve Matrix matrixcalc matrixStats plyr quadprog rgl]; }; @@ -2994,14 +3100,16 @@ in with self; { OutrankingTools = derive2 { name="OutrankingTools"; version="1.0"; sha256="0z7pslkkinn7flc4xwjg0bsfswf8ad4jv9rmglaj3fmjcx9b6wgj"; depends=[igraph]; }; OwenQ = derive2 { name="OwenQ"; version="1.0.3"; sha256="0kra8pvz21kqwzwsrqh6vwfyq9qqrar3glcycd2gip19273whdim"; depends=[BH Rcpp RcppEigen RcppNumerical]; }; OxyBS = derive2 { name="OxyBS"; version="1.5"; sha256="11l3gm0jvw993jb13f6kpv77m6z0d1jswscma2v28qzkw053r3dc"; depends=[]; }; - PAC = derive2 { name="PAC"; version="1.1.2"; sha256="1xh8y6ypicfabfm7kv0l4074mskjbcvyv5y13r10g5b7gqk35vkz"; depends=[dplyr ggplot2 ggrepel igraph infotheo parmigene Rcpp Rtsne]; }; + PAC = derive2 { name="PAC"; version="1.1.3"; sha256="12q8zwdwfhf2g1jgs7783hj2r4n2bl056n4230lwfg773f7ks6l5"; depends=[dplyr ggplot2 ggrepel igraph infotheo parmigene Rcpp Rtsne]; }; PACLasso = derive2 { name="PACLasso"; version="1.0.0"; sha256="1qzzymhfsjy8mk0r0xpd5h4wrx4wk8gq3vi6fnawkq5xkrg26rld"; depends=[lars limSolve MASS penalized quadprog]; }; - PACVr = derive2 { name="PACVr"; version="0.9.2"; sha256="0pn4k1yxja0blc89ksmhn7pwn3p647hvn6zmi7d0k47dfzy5rch5"; depends=[BiocGenerics Biostrings genbankr GenomicAlignments optparse RCircos]; }; + PACVr = derive2 { name="PACVr"; version="0.9.4"; sha256="0sj5ibqaw452lncxxbm6xkgmmh9ny6hx4b9hppzwglpgk6vvb5f3"; depends=[BiocGenerics Biostrings genbankr GenomicAlignments GenomicRanges IRanges optparse RCircos]; }; PAFit = derive2 { name="PAFit"; version="1.0.1.8"; sha256="12rqf7mcbsc4ngq75gw8nrllqc2nd9l5p8jdnx6gjn26ldydg6h6"; depends=[igraph knitr magicaxis mapproj MASS network networkDynamic plyr RColorBrewer Rcpp VGAM]; }; PAFway = derive2 { name="PAFway"; version="0.1.3"; sha256="1ggmqbls8i5zqihzi66kaw09bbip2spiiizfzkx7amcvpm8zsr7r"; depends=[GGally ggplot2 igraph network scales sna]; }; PAGI = derive2 { name="PAGI"; version="1.0"; sha256="01j1dz5ihqslpwp9yidmhw86l112l7rfkswmf03vss872mpvyp3f"; depends=[igraph]; }; PAGWAS = derive2 { name="PAGWAS"; version="2.0"; sha256="0bz47ivd32kx1amgqllqbxyyvj773q7wasgk924hmibabiixa8nx"; depends=[foreach lars mnormt]; }; PAMA = derive2 { name="PAMA"; version="0.1.1"; sha256="0iwfak74422gmfciin940rkqg7m2dkzv0d52jrkk0i6z58rhs426"; depends=[mc2d PerMallows]; }; + PAMmisc = derive2 { name="PAMmisc"; version="1.6.5"; sha256="11jilwsjb7vkfg79d6ajwwy3ylg30yg5s3qi7s55kvxx8ii5r8kv"; depends=[dplyr geosphere ggplot2 hoardr httr lubridate magrittr ncdf4 PamBinaries plotKML purrr RcppRoll rerddap RSQLite seewave stringr tuneR]; }; + PAMpal = derive2 { name="PAMpal"; version="0.9.14"; sha256="1ijzqrndkpqhjczki6g2arp4fscvdff9gixgqlr9ibvr7g7b0z3f"; depends=[data_table dplyr gam ggplot2 knitr lubridate magrittr manipulate PamBinaries PAMmisc purrr readr reticulate rjson rlang RSQLite rstudioapi seewave signal stringr tidyr tuneR xml2]; }; PANDA = derive2 { name="PANDA"; version="0.9.9"; sha256="1sf3c49v4mb3mz2imqlqdbh1iab7bc2pxpi8bmgj2jld133555ip"; depends=[cluster GO_db]; }; PAS = derive2 { name="PAS"; version="1.2.5"; sha256="175p3bnpnhknfsc29hri0l2ipz1x6qcxs2bq7awns8lccam466r2"; depends=[glmnet]; }; PASSED = derive2 { name="PASSED"; version="1.0-3"; sha256="1snphwngs9alg114h9m5i84dpg3zpm577kvz8qlrlk37ar1mxalk"; depends=[betareg rootSolve]; }; @@ -3014,6 +3122,7 @@ in with self; { PAutilities = derive2 { name="PAutilities"; version="1.0.1"; sha256="13k0dkgz82d4iqc7kpz1cw71w1m3bjkar4a7xndms1nj6sp7vp03"; depends=[dplyr equivalence ggplot2 lazyeval lubridate magrittr matchingMarkets Rcpp reshape2 rlang]; }; PBD = derive2 { name="PBD"; version="1.4"; sha256="1n8gq8ms6gszr469hblipbgalc5m7gfiknpsbqywxml62sr4wbsb"; depends=[ade4 ape DDD deSolve phytools]; }; PBIBD = derive2 { name="PBIBD"; version="1.3"; sha256="0zh73bsiwmsqw1vhs2dazndsf0894kfv3vfv88wr4fnh7njysz6r"; depends=[]; }; + PBIR = derive2 { name="PBIR"; version="0.1-0"; sha256="1br53bxqp2bhljph2a0nvdlxf695iknymgwy2drfc7pm383w1ma1"; depends=[cmprsk survival]; }; PBImisc = derive2 { name="PBImisc"; version="1.0"; sha256="18gjp66q6l0w6vsgm6d5sjgpa906z1gyyp6yf58lq5vyg1bnfmcl"; depends=[lme4 Matrix]; }; PBNPA = derive2 { name="PBNPA"; version="0.0.3"; sha256="1wmgcmspilfv6pjy7696j2xmq8m41p27plnr1qr0fnzyz66pf37m"; depends=[metaRNASeq]; }; PBRF = derive2 { name="PBRF"; version="1.0.0"; sha256="1ibwywgbxnxcb3z2kl2bgh7fz512nhgy2zcdym67asp76c6rkqg6"; depends=[]; }; @@ -3035,10 +3144,10 @@ in with self; { PCMBaseCpp = derive2 { name="PCMBaseCpp"; version="0.1.9"; sha256="0k40mxs8w1vk7qwpkv8gnq6cq3kpj7wvf0i6f1qn1wmm2vvz1kfy"; depends=[abind data_table PCMBase Rcpp RcppArmadillo]; }; PCMRS = derive2 { name="PCMRS"; version="0.1-2"; sha256="1zr2kzwxgr7rifkkmgz9vhq5i9ky6lqrss742vybwl0nx78mad3p"; depends=[cubature ltm mvtnorm Rcpp RcppArmadillo statmod]; }; PCPS = derive2 { name="PCPS"; version="1.0.7"; sha256="0gxymz0yws1q1bxkpxi0lmbv57xx62h3dl7z3i2cnbagswkax3zh"; depends=[ape nlme phylobase picante RcppArmadillo SYNCSA vegan]; }; - PCRedux = derive2 { name="PCRedux"; version="1.0-6"; sha256="0s7g6y8iw4w42ihpiqqhbgwaf4fim91pwsp8hh7fh5nawj2wg9k7"; depends=[bcp changepoint chipPCR ecp fda_usc MBmca pbapply pracma qpcR robustbase shiny zoo]; }; PCS = derive2 { name="PCS"; version="1.2"; sha256="0488h6s1yz6fwiqf88z2vgckn6i0kwls8cazmpw3wspnaqvl2n4s"; depends=[multtest statmod]; }; PCSinR = derive2 { name="PCSinR"; version="0.1.0"; sha256="1z8yjryw3c43vc6fxcwiindmyq6r63pc1zr3aybwmys6mv697bb4"; depends=[]; }; PCovR = derive2 { name="PCovR"; version="2.7"; sha256="00920h0qlw81vwh46inmvm4mdv0dfd8xvqvrj7l038hhmjb7qsjz"; depends=[GPArotation MASS Matrix ThreeWay]; }; + PDE = derive2 { name="PDE"; version="1.1.2"; sha256="0hmi3mfs9bab0irn682jla4bqiq1fibi4lw3806wl2pmwdf071jj"; depends=[tcltk2]; }; PDFEstimator = derive2 { name="PDFEstimator"; version="0.1-3"; sha256="0baqysb01xii86akbdq8yix1qrrqqfiyzrpb50jxd7y782xalcly"; depends=[]; }; PDM = derive2 { name="PDM"; version="0.1"; sha256="1pbdy13ji9c6krgh2r1qgrzmf4hdmrdzylsr71n3hh5jq4n9xg8x"; depends=[jpeg]; }; PDN = derive2 { name="PDN"; version="0.1.0"; sha256="082ydvwcjc2rs7hlakrkgbbm9c419m408a14a9dgfdwm16yif3jd"; depends=[ggplot2 glmnet network survival]; }; @@ -3046,7 +3155,7 @@ in with self; { PDSCE = derive2 { name="PDSCE"; version="1.2"; sha256="17lc6d8ly6jbvjijpzg45dvqrzrh5s1sp415nycazgpbg9ypwr2h"; depends=[]; }; PDShiny = derive2 { name="PDShiny"; version="0.1.0"; sha256="0s09sywvy83dj06rkxzyi06wfymwnfpgf3lpgjbb8ps8q3byd4vs"; depends=[shiny]; }; PEGroupTesting = derive2 { name="PEGroupTesting"; version="1.0"; sha256="1z863ard0cc2g8ibxnmxhiqhvs53r6b8gpnavnfchm9432ifcbwi"; depends=[]; }; - PEIP = derive2 { name="PEIP"; version="2.2-1"; sha256="0bzynmd7azs33994dlsabxp29lncs1v2njp6iy5l62rwrnxj9y0a"; depends=[bvls fields geigen Matrix pracma RSEIS]; }; + PEIP = derive2 { name="PEIP"; version="2.2-3"; sha256="1ljalgffgrn9l3q914jjxrn1j740jqk4j8q1vzn3si4np9mz92vp"; depends=[bvls fields geigen Matrix pracma RSEIS]; }; PELVIS = derive2 { name="PELVIS"; version="2.0.2"; sha256="07lb0vfi6szcbznd7ylqmk02l6w02b5v26i9vbwkvpy71nzvvfxd"; depends=[DT MASS shiny]; }; PEMM = derive2 { name="PEMM"; version="1.0"; sha256="18dd9hsbdrnhrrff7gpdqrw2jv44j8lg0v3lkcdpbd4pppcaq84h"; depends=[]; }; PGEE = derive2 { name="PGEE"; version="1.5"; sha256="1qcxbqnbpplnfjy83nm9fj9y4abzgbxnsggzx7ix3vb9qs18cdwh"; depends=[MASS mvtnorm]; }; @@ -3054,7 +3163,7 @@ in with self; { PGRdup = derive2 { name="PGRdup"; version="0.2.3.6"; sha256="0bv3fzkylg70yhvyar1lbpwicli479ql1zfascjv60pic5ia1bc7"; depends=[data_table ggplot2 gridExtra igraph stringdist stringi]; }; PHENIX = derive2 { name="PHENIX"; version="1.3.1"; sha256="1gd9ycrwawi81al4f5v559km1112giwqnwvvk8ynj4kdb5bqpyq4"; depends=[ppcor SuppDists]; }; PHEindicatormethods = derive2 { name="PHEindicatormethods"; version="1.3.2"; sha256="193fc3l1zbbrnr4jl07bxv8jssyhpgh9aydi6f4w8mh56x9nazhk"; depends=[broom dplyr purrr rlang tibble tidyr]; }; - PHInfiniteEstimates = derive2 { name="PHInfiniteEstimates"; version="1.3"; sha256="097a1wqh6c8y0ny6ikpkfqym4fw2vz7rrhqpf6xfb71vf3big90k"; depends=[coxphf lpSolve mlogit Rdpack survival]; }; + PHInfiniteEstimates = derive2 { name="PHInfiniteEstimates"; version="1.6"; sha256="1dlmsj5i9f0h91vq5g2kqh4xk38vbc9cszk6075y2flnh5aiv759"; depends=[coxphf lpSolve mlogit Rdpack survival]; }; PHYLOGR = derive2 { name="PHYLOGR"; version="1.0.11"; sha256="1fq2ny093b4881nwgj6wr8qd5g4dcxb51sdx40ndyxxpq6jj16n9"; depends=[]; }; PHeval = derive2 { name="PHeval"; version="0.5.4"; sha256="06fy5dm4mnp29f01163rw1d1hyl7rlcp4pfw18s87ckpr931qyma"; depends=[survival]; }; PIGShift = derive2 { name="PIGShift"; version="1.0.1"; sha256="115dnsh4b1rxx1d2kc8x3vl5366h5f0i6gg8l1w3v0f8309qigis"; depends=[ape mvtnorm]; }; @@ -3071,79 +3180,86 @@ in with self; { PLNmodels = derive2 { name="PLNmodels"; version="0.10.6"; sha256="1rjryyw9zydcqaak72xv8x0gjybl7aan1n52jxj9m5672sw3knwr"; depends=[corrplot dplyr ggplot2 glassoFast gridExtra igraph magrittr MASS Matrix nloptr R6 Rcpp RcppArmadillo tidyr]; }; PLRModels = derive2 { name="PLRModels"; version="1.1"; sha256="0dwnzfw7a1cxz9s00kxf19jmjsc8cy6cc9q2mjqf8z7690wrg7hb"; depends=[]; }; PLSbiplot1 = derive2 { name="PLSbiplot1"; version="0.1"; sha256="1l8d1k913ic0qwxvrrd447p5ni3mzc6v9lv45b7vqrpzkxdci6gy"; depends=[]; }; - PLmixed = derive2 { name="PLmixed"; version="0.1.4"; sha256="1plkcv7k6jijywhxrsx2lxcbavzvagzl8wnz132nqq619wvb57ia"; depends=[lme4 Matrix numDeriv optimx]; }; + PLmixed = derive2 { name="PLmixed"; version="0.1.5"; sha256="03ivginsg1zhdxv5bzzmh6mxjz2b6qi8p4cq7sfm5q4llkld46x6"; depends=[lme4 Matrix numDeriv optimx]; }; PLordprob = derive2 { name="PLordprob"; version="1.1"; sha256="1g23h3121g9csr85falm6vgzbva42wz3skhfr2rxmvlc3ca4afyp"; depends=[mnormt]; }; PMA = derive2 { name="PMA"; version="1.2.1"; sha256="1rhiylm3jfarnqdkv7nwg536sgsa30ic80dk9byks9w0wf4mn59s"; depends=[]; }; PMCMR = derive2 { name="PMCMR"; version="4.3"; sha256="09bvdj2h1086r2cgy3myrhlylplxxlliv8nwx09c8kb1vn02i2ij"; depends=[]; }; - PMCMRplus = derive2 { name="PMCMRplus"; version="1.4.4"; sha256="1myj2hf1sx32j6hcql1zrbxkibg6l0qggcnrpsr2y40kzbw463pi"; depends=[BWStest gmp kSamples MASS multcompView mvtnorm Rmpfr SuppDists]; }; + PMCMRplus = derive2 { name="PMCMRplus"; version="1.7.1"; sha256="1njyxm69kmparzsawqnm3mjad181pf2fgn3fc4wslls96bcngyrw"; depends=[BWStest gmp kSamples MASS multcompView mvtnorm Rmpfr SuppDists]; }; PML = derive2 { name="PML"; version="1.2"; sha256="0r4mfnkbg7chrnm3lb78hjcz25fal6vvvqwvnzvicl46mdhl94yb"; depends=[dplyr rbokeh tibble tidyr]; }; - PMwR = derive2 { name="PMwR"; version="0.14-0"; sha256="15qfpsnnak8qf41cfq3n4g6iwxnzbifxqm50pnbk76v6727s21hy"; depends=[datetimeutils fastmatch NMOF orgutils textutils zoo]; }; - PNADcIBGE = derive2 { name="PNADcIBGE"; version="0.6.0"; sha256="1xwjw8wcr0xys3bwk7aj0rih2nzdw86rja7fwqis2rfcbk9r8cim"; depends=[dplyr magrittr RCurl readr readxl survey tibble timeDate]; }; + PMwR = derive2 { name="PMwR"; version="0.15-0"; sha256="1xj2j72j907yayxshfckq2pycj9cxiakyz4kdr4xg9wqificivcw"; depends=[datetimeutils fastmatch NMOF orgutils textutils zoo]; }; + PNADcIBGE = derive2 { name="PNADcIBGE"; version="0.6.1"; sha256="0hj7c1d1l6zxfpba2mjhapwx8kpqx89kbp0gzic8mbyn354p4fxn"; depends=[dplyr magrittr RCurl readr readxl survey tibble timeDate]; }; + PNSIBGE = derive2 { name="PNSIBGE"; version="0.1.0"; sha256="19z7yv91f3v992k74sl5g91czcyzr12khr83xhxr5m53qwbs84yj"; depends=[dplyr magrittr RCurl readr readxl survey tibble timeDate]; }; PNWColors = derive2 { name="PNWColors"; version="0.1.0"; sha256="1phplnclkficfv8s6wsyrckk4ixzbayiy5iix6dddg40485l9nyj"; depends=[]; }; + PO_EN = derive2 { name="PO.EN"; version="1.0"; sha256="1b4vcj6dnfji99nlskjvls996cmb1b2s3mfdammi07sdx625pvji"; depends=[glmnet pROC PUlasso Rcpp RcppArmadillo]; }; POCRE = derive2 { name="POCRE"; version="0.5.0"; sha256="0aph1lmb0xkzm4l4ah2wrx13d138igf4k4w9wb9lca4vv6m7xzqf"; depends=[EbayesThresh ggplot2 pracma]; }; POD = derive2 { name="POD"; version="1.2.0"; sha256="1xg2xzfmzg2qrwd02xy4fwsfmccigw6lm5266z6w1kxzb7p7bbw0"; depends=[]; }; POET = derive2 { name="POET"; version="2.0"; sha256="0w3jhj45sxisyrpcsazbrbcsz7rmraw71jjm0zixbcgc4klb98ar"; depends=[]; }; + POFIBGE = derive2 { name="POFIBGE"; version="0.1.0"; sha256="1lpcas2x8lnrs8acxa05nl32khbx261rilnsq26ywm1fycyx2aaz"; depends=[dplyr magrittr RCurl readr readxl survey tibble timeDate]; }; POINT = derive2 { name="POINT"; version="1.1"; sha256="0bkrsvcmm7927d7c56wr804a2wv5c1dn8y8zhf76433ckj45068x"; depends=[CompQuadForm Matrix rARPACK]; }; POMaSPU = derive2 { name="POMaSPU"; version="1.0.0"; sha256="0jz3jgzdykv0xvfw3ix0hbs32as6dp7p5v8bj5nddknx10d0siya"; depends=[MASS matrixStats Rcpp RcppArmadillo]; }; POPdemog = derive2 { name="POPdemog"; version="1.0.3"; sha256="0j83c853ligmw8ag4pb0vj46sfn2w2ynh4wvgkabzs688hxxni8r"; depends=[]; }; POT = derive2 { name="POT"; version="1.1-7"; sha256="1xxm293lmj22dsiaimivpd90xpwnrr36xa371zg6k6w05q4jjfn3"; depends=[]; }; - POUMM = derive2 { name="POUMM"; version="2.1.6"; sha256="16yiymfaci9zklbx3klf3nn9xlf305mdbq5n1ccx4w7g7h0ivdi1"; depends=[adaptMCMC ape coda data_table foreach ggplot2 lamW Rcpp]; }; + POUMM = derive2 { name="POUMM"; version="2.1.7"; sha256="0pwa97sffb571nfqnbc35dj9lr8z07wjsjnwibj9dhj2dr5b2cfp"; depends=[adaptMCMC ape coda data_table foreach ggplot2 lamW Rcpp]; }; + POV = derive2 { name="POV"; version="0.1.4"; sha256="0mqhi410rwpgr6x5h57wqg0f5k01vva0c280zlfpmf8php121x7j"; depends=[broom formula_tools]; }; PP = derive2 { name="PP"; version="0.6.2"; sha256="1y6f8pnvdp59xnm0vh1rjhcxy3nyd3il7r76yyrrfamdr42hh8lc"; depends=[Rcpp]; }; PP3 = derive2 { name="PP3"; version="1.2"; sha256="1g36al9w1rxyhfzbvpw9siqq57h2xl0zr94wysz8i0jzqkkqkrvf"; depends=[]; }; PPCI = derive2 { name="PPCI"; version="0.1.5"; sha256="141811iq0g2rq7lxpz9a44kyjfylj85yqgcjq7b23xfg2wbcp8dd"; depends=[rARPACK]; }; PPMR = derive2 { name="PPMR"; version="1.0"; sha256="07fky5xc1dmmn23wwdjm46c86i7q20dv5f2147828v52hhky873g"; depends=[Rcpp RcppArmadillo]; }; - PPQplan = derive2 { name="PPQplan"; version="1.0.0"; sha256="159mgwd2d7qzfwj6dnxr77p0fm7rgq9bpks2ra54s446cm4ahgkd"; depends=[ggplot2 plotly tolerance]; }; + PPQplan = derive2 { name="PPQplan"; version="1.1.0"; sha256="072r7myqsnpyla37q6bj9glwvbygb9g8xkl60q055yzxmfh4rsbr"; depends=[ggplot2 plotly]; }; PPRL = derive2 { name="PPRL"; version="0.3.5.2"; sha256="083al6xi9b62vbx71684bxq2xynvmxw25ak01gwngln1r84gsz5l"; depends=[Rcpp settings]; }; + PPTcirc = derive2 { name="PPTcirc"; version="0.1.0"; sha256="082w0p8f1yacqjid017hhkk2946z7g5wf86af01cb26dhss0y9sy"; depends=[circular progress]; }; PPforest = derive2 { name="PPforest"; version="0.1.1"; sha256="0iplbw5b2vhqbp6gc123ykzmilwa80akljkv3jzfmi90ckm4k08m"; depends=[doParallel dplyr magrittr plyr Rcpp RcppArmadillo tidyr]; }; PPtree = derive2 { name="PPtree"; version="2.3.0"; sha256="002qjdx52r2h90wzrf2r3kz8fv3nwx08qbp909whn6r4pbdl532v"; depends=[MASS penalizedLDA]; }; PPtreeViz = derive2 { name="PPtreeViz"; version="2.0.4"; sha256="008hlgi56p9wydpsb2f1dxi4slml7p417c34lw00hivbl53d6x97"; depends=[ggplot2 gridExtra partykit Rcpp RcppArmadillo]; }; PQLseq = derive2 { name="PQLseq"; version="1.2"; sha256="0md6s7yb24zq74b12ackhh1yggyfsg3226acwfaf1pb3l4yvway4"; depends=[doParallel foreach Matrix Rcpp RcppArmadillo]; }; + PRDA = derive2 { name="PRDA"; version="1.0.0"; sha256="1lklwfakd54ylm5gizq36ng6498c2izapsz9yz2a95cjf860rr23"; depends=[MASS pbapply Rcpp RcppArmadillo]; }; PREPShiny = derive2 { name="PREPShiny"; version="0.1.0"; sha256="0zsg07y6nhp2lma3pdz8xd981y3mh8k21il5jv0inma1d1xr4g3f"; depends=[dplyr psycho rmarkdown shiny]; }; PRIMAL = derive2 { name="PRIMAL"; version="1.0.2"; sha256="04fn0c10v9ai7vrrd4qr84rid3x42wq749rn5p1i6nkvmjv3dnhs"; depends=[Matrix Rcpp RcppEigen]; }; - PRIMME = derive2 { name="PRIMME"; version="3.1-1"; sha256="1gwdix0qbnap3figh6lskqy3d5hzb4hqi97hbqhp3sz1vnkgm4bz"; depends=[Matrix Rcpp]; }; - PRIMsrc = derive2 { name="PRIMsrc"; version="0.8.2"; sha256="04g1saf511xs26m1iv9xfsmfs15fdfaxh5qlbay2mcb198270pd8"; depends=[glmnet Hmisc quantreg superpc survival]; }; - PRISM_forecast = derive2 { name="PRISM.forecast"; version="0.2.0"; sha256="1r2fjnd5wjlb0y5x9pnh80dmkdfdr9yhqckynkc92ngc7dr1f44z"; depends=[glmnet xts zoo]; }; + PRIMME = derive2 { name="PRIMME"; version="3.1-3"; sha256="0afncp0grxr1hb1ymqq8gigl5cvq1wb0vjnxsc8nh39jqsw08cjx"; depends=[Matrix Rcpp]; }; + PRISM_forecast = derive2 { name="PRISM.forecast"; version="0.2.1"; sha256="07kq6fprbj8zccs6cx1aiy5mrcg77b0fh42zvg2pimbvr8cqhy31"; depends=[glmnet xts zoo]; }; PRISMA = derive2 { name="PRISMA"; version="0.2-7"; sha256="0sk2d07m8rhipa0kdbaf8ngryda6f1ihp5akpnyw2llajf0x8as5"; depends=[ggplot2 gplots Matrix]; }; PRISMAstatement = derive2 { name="PRISMAstatement"; version="1.1.1"; sha256="1vvab8h71g8c910s2h4d12qafqdncfzmsh5f1b4m79plpqi3s49z"; depends=[DiagrammeR]; }; PROBShiny = derive2 { name="PROBShiny"; version="0.1.0"; sha256="17p6pb8nwq36ha697f2lf8nwzj5cylmh8rdzyag49ks5hi9painb"; depends=[epitools LaplacesDemon rmarkdown rpivotTable shiny shinyMatrix]; }; - PROJ = derive2 { name="PROJ"; version="0.1.6"; sha256="0h0iky99wqb4cz7imrwz2p3w71s8n21vfdjwi30w240vim6d3lgg"; depends=[]; }; + PROJ = derive2 { name="PROJ"; version="0.4.0"; sha256="1rqw28qqcyzla3ssif9jghvv0nyms9riabj2lxhlx1l3rbz0rsfx"; depends=[]; }; PROMETHEE = derive2 { name="PROMETHEE"; version="1.1"; sha256="0r53mb9ndwm4yli3h50cfamsjzpq6b67g72mszm7lpbqpj58wqw6"; depends=[lpSolve]; }; PROSPER = derive2 { name="PROSPER"; version="0.3.3"; sha256="1wdrdqii7d4yfky6706n9xjmabnz99jjja1c80nbj3fp8idsbli5"; depends=[data_table]; }; PROTOLIDAR = derive2 { name="PROTOLIDAR"; version="0.1"; sha256="0bz3071b0wlcvh40vl3dyiiixk5avsj6kjjnvlvx264i5g08rij4"; depends=[]; }; PROreg = derive2 { name="PROreg"; version="1.1"; sha256="0jws41hgrpcih5ispp6f627f81sjbdygzgjbw4gawf31n5z8pi5a"; depends=[car fmsb Matrix matrixcalc numDeriv RColorBrewer rootSolve]; }; PROscorer = derive2 { name="PROscorer"; version="0.0.1"; sha256="0mgj0mi0vzdk0agimsx4k9i4bss0j5lqiayzhldr1hrqrx2a4f3d"; depends=[PROscorerTools]; }; PROscorerTools = derive2 { name="PROscorerTools"; version="0.0.1"; sha256="1vliffkfqdn5l96bncfgayv19i20kmawlxi8q853wamj6npdpv5r"; depends=[]; }; - PROsetta = derive2 { name="PROsetta"; version="0.1.4"; sha256="06lpwkcnx71lfawlv20d83y5i7iqskipg8d3wvdc99k4cirdypjy"; depends=[equate lavaan mirt plink psych]; }; + PROsetta = derive2 { name="PROsetta"; version="0.2.1"; sha256="0lw6biwjrb54b69mq6dj7jmvlpya47n33wvksbqky2pkvgk3iqyj"; depends=[equate lavaan mirt mvnfast plink psych]; }; PRROC = derive2 { name="PRROC"; version="1.3.1"; sha256="1m28h8pcd78049lz2qixhkcr9h5b3jik3maqzfbvq9y58z71i4a7"; depends=[]; }; PRSim = derive2 { name="PRSim"; version="1.2-2"; sha256="0amvri7s32zrzc7a6lldwhpfsi0z92k3ps0rzlgys57dhpzl0mfs"; depends=[goftest homtest splus2R wavScalogram]; }; PReMiuM = derive2 { name="PReMiuM"; version="3.2.3"; sha256="1znr1swz73n1ws657dvv56y6crmqicfllbz460vaw8a0dnjiqsc9"; depends=[ald BH cluster data_table gamlss_dist ggplot2 plotrix Rcpp RcppEigen rgdal spdep]; }; - PResiduals = derive2 { name="PResiduals"; version="0.2-6"; sha256="11r0zn626s701hprjy634a7d3v3sq6lmlzpamv02609fg8wjhy9h"; depends=[Formula MASS rms SparseM]; }; + PResiduals = derive2 { name="PResiduals"; version="1.0-0"; sha256="0rfi8y12cz6h8bm9715ppq3px4g123k0rlrri4py8brca40smb69"; depends=[Formula MASS rms SparseM]; }; PSAgraphics = derive2 { name="PSAgraphics"; version="2.1.1"; sha256="05c0k94dxddyrhsnhnd4jcv6fxbbv9vdkss2hvlf3m3xc6jbwvh9"; depends=[rpart]; }; PSCBS = derive2 { name="PSCBS"; version="0.65.0"; sha256="16irvlc3ds7p03racjzyljqsc43bbwng3zsb0bmrkibmadfhcr9k"; depends=[aroma_light DNAcopy future listenv matrixStats R_cache R_methodsS3 R_oo R_utils]; }; PSF = derive2 { name="PSF"; version="0.4"; sha256="1hjry8vjqr6zk2i2ppf3fcpsr4v4jm1705qv6i1iz2agl6g2rcnp"; depends=[cluster data_table forecast knitr]; }; PSIMEX = derive2 { name="PSIMEX"; version="1.1"; sha256="0cndzasvg4y49incyd9nfz8y3z88ywbc7xk0zzjir665pv2xn23b"; depends=[knitr MCMCglmm pedigree plotrix]; }; PSLM2015 = derive2 { name="PSLM2015"; version="0.2.0"; sha256="1f8kzlqil2ac8a9fbj9fhdni2narh2yaaz044mlx7gsv2ns3ai19"; depends=[dplyr ggplot2 magrittr]; }; - PSPManalysis = derive2 { name="PSPManalysis"; version="0.2.2"; sha256="0g59r13nc6w4a4gkjxnvkygp9hax1sw34a5rv6r170gwdj9fiswq"; depends=[pkgbuild]; }; - PSSMCOOL = derive2 { name="PSSMCOOL"; version="0.2.0"; sha256="1y2y3ajxph5w67gww0yycy766r8yhgiz70228b89yiiildniryps"; depends=[dtt gtools infotheo phonTools]; }; + PSPManalysis = derive2 { name="PSPManalysis"; version="0.3.4"; sha256="1w51b0dck9b14vnk91ihrm3z574m65b7mdi29jwjsj5v0vh1gang"; depends=[pkgbuild rstudioapi]; }; + PSS_Health = derive2 { name="PSS.Health"; version="0.1.5"; sha256="0rbxr1rkv9549w9yj2hg143w5izcx3i9f1jiqk5s1vbpdrhwxyq6"; depends=[DT easypower EnvStats ICC_Sample_Size kappaSize longpower MESS plotly powerMediation powerSurvEpi presize pROC pwr pwr2 shiny shinycssloaders shinyFeedback shinyhelper shinythemes tidyverse TrialSize WebPower writexl]; }; + PSSIM = derive2 { name="PSSIM"; version="0.1.0"; sha256="144lh31b1c4ycq0wrgf9745q0c8b5sfnmrd0f7vwx95i86bzr3mj"; depends=[]; }; + PSSMCOOL = derive2 { name="PSSMCOOL"; version="0.2.1"; sha256="0ixxaxgpngi27r3zpqzrk5df8aqmrs4iwiyfrgg1ab1kjd1hnpk4"; depends=[dtt gtools infotheo phonTools]; }; PST = derive2 { name="PST"; version="0.94"; sha256="0f28zrnlficbi9iil6wbh51k9mghpkz63hw05lpmlpx1yl5nd0a6"; depends=[RColorBrewer TraMineR]; }; PSW = derive2 { name="PSW"; version="1.1-3"; sha256="0ahm7rp795d7j88n15b3q0gl573p3g0krc7jd1zv87g4bsdc9b5x"; depends=[gtools Hmisc]; }; - PSweight = derive2 { name="PSweight"; version="0.1.1"; sha256="17lbmpl68vwsx3240rvj787j30x47sbmhvwp8lfv29kfnlqvyiv9"; depends=[ggplot2 MASS nnet numDeriv]; }; + PSweight = derive2 { name="PSweight"; version="1.1.2"; sha256="0aa2lbnank1ivqis8l5z3gch6j0awrzvcyhixsp1mjaxz5izd2yn"; depends=[ggplot2 MASS nnet numDeriv]; }; PTAk = derive2 { name="PTAk"; version="1.3-34"; sha256="0ylnag492v1n0pmzsz73w12frhv8c3r3dxgarf58ny0ir0i0ywvl"; depends=[tensor]; }; PTE = derive2 { name="PTE"; version="1.7"; sha256="1azkrij4kfmvp03lnzm88gwgvz8g54jq94j0qg8ynxvyjzrppc98"; depends=[doParallel foreach survival]; }; - PTXQC = derive2 { name="PTXQC"; version="1.0.5"; sha256="0g70fz6ssgz8k0yy33j6135qnf6mbg1ipn6lli27yshzdzwl6yhz"; depends=[data_table ggdendro ggplot2 gtable kableExtra knitr plyr RColorBrewer reshape2 rmarkdown seqinr UpSetR yaml]; }; + PTXQC = derive2 { name="PTXQC"; version="1.0.8"; sha256="0x3jp829nw4mp2mc1damvbyxsjfp8m21yn3an3m6f6rj3mlk8p30"; depends=[data_table ggdendro ggplot2 gtable kableExtra knitr plyr RColorBrewer reshape2 rmarkdown seqinr UpSetR yaml]; }; PTwins = derive2 { name="PTwins"; version="0.1.1"; sha256="166mc7w52n9d3n72h5jvvhbki87prkils3yigdf57dn9pyixrd66"; depends=[]; }; PUPAIM = derive2 { name="PUPAIM"; version="0.2.0"; sha256="1ky6f4yhm3hjrfxwk8vfalzzjgkq1922my26w457q8nfng7f2m53"; depends=[Metrics minpack_lm nls2]; }; PUlasso = derive2 { name="PUlasso"; version="3.2.3"; sha256="07jf81q898833qswwairkv21dxlz7890219fdgnw3ywgp5kvlp41"; depends=[doParallel foreach ggplot2 Matrix Rcpp RcppEigen]; }; PVAClone = derive2 { name="PVAClone"; version="0.1-6"; sha256="0fj5p3z2cwnyshrr4rq88wpij2xax5p4aq0x4p342kadx9d6x2ga"; depends=[coda dclone dcmle]; }; PVR = derive2 { name="PVR"; version="0.3"; sha256="0pcnazkiwmicr3k6k70r8skqk0pd46fcqhhxghawxjs4slgnygkj"; depends=[ape MASS splancs]; }; + PVplr = derive2 { name="PVplr"; version="0.1.0"; sha256="1ssmdhq2qczk6n50f8jj4j3nym7jj9bshfc1f29lccvmp7wxdp9a"; depends=[broom cluster dplyr ggplot2 magrittr minpack_lm purrr rlang segmented stlplus tidyr]; }; PWD = derive2 { name="PWD"; version="1.0"; sha256="0ksr3biaqd4p5a4lv28i4cwk1fn9822ndq2161mgvc1c344p06fj"; depends=[Rcpp RcppArmadillo]; }; PWEALL = derive2 { name="PWEALL"; version="1.3.0"; sha256="0nb0v6wvj9ay90qcbrr9drg2g84fb7a9m78pzb69wp8789i8ixhk"; depends=[survival]; }; PWFSLSmoke = derive2 { name="PWFSLSmoke"; version="1.2.111"; sha256="0gry7nq8gqxfspihsc05pcwn25fciw41hjy9bnd1bsqqk5f520d0"; depends=[cluster curl dplyr dygraphs geosphere ggmap glue httr jsonlite leaflet lubridate magrittr mapproj maps maptools MazamaCoreUtils MazamaSpatialUtils openair png purrr raster RColorBrewer readr reshape2 rgdal RgoogleMaps rlang sf slippymath sp stringr tibble tidyr xts]; }; PabonLasso = derive2 { name="PabonLasso"; version="1.0"; sha256="158xg9i13nqy1bnpch8r6a7yas01hsdidmcypgccmyh7d7l52mr1"; depends=[]; }; - Pade = derive2 { name="Pade"; version="1.0.1"; sha256="11i8cjmqkly78is9rhnd1ipjb8awmwlscv2kvdf75qc71yigvlgz"; depends=[]; }; - PairViz = derive2 { name="PairViz"; version="1.3.3"; sha256="0zhj4b33dahsyyw0jlnwn2swz2qislgphy8xn9lxdifb6iq7arbr"; depends=[graph gtools TSP]; }; + Pade = derive2 { name="Pade"; version="1.0.3"; sha256="0q4pk2qk7v9wn5sdlvrwn9ir01jxy9nlzygnwkjzhq5vfa720d1k"; depends=[]; }; + PairViz = derive2 { name="PairViz"; version="1.3.4"; sha256="1jd99b4bc2yiv91z7szhrgqhrbh6h6qwacvwf1cl6r8nrv5kqd13"; depends=[graph gtools TSP]; }; PairedData = derive2 { name="PairedData"; version="1.1.1"; sha256="07y5fd4fkwfp0lbacf41ya8cn7x4n1haxl0cln9iibjffc1mbr5q"; depends=[ggplot2 gld lattice MASS mvtnorm]; }; - PairwiseD = derive2 { name="PairwiseD"; version="0.9.62"; sha256="19qjms99gf7s39nwwgj56n8426d0gw80dipz165sk3km4zb2mcwv"; depends=[openxlsx xlsx]; }; PakPC2017 = derive2 { name="PakPC2017"; version="1.0.0"; sha256="196jvhv7pv4pvnnz9izk6icxv3aml26mif0w6g4907izyszf8cal"; depends=[dplyr magrittr]; }; PakPMICS2014Ch = derive2 { name="PakPMICS2014Ch"; version="0.1.0"; sha256="0gjrx34613d9wzal292zfzh8hmkav271fqb0skdxd1f8rs2c79dg"; depends=[data_table]; }; PakPMICS2014HH = derive2 { name="PakPMICS2014HH"; version="0.1.0"; sha256="1n6cyanqafscizgi1xqmc19w59yigxk5mvqinbivpdr7rydhrac6"; depends=[data_table]; }; @@ -3155,18 +3271,22 @@ in with self; { PakPMICS2018hh = derive2 { name="PakPMICS2018hh"; version="0.1.0"; sha256="0wkjxy8qkndhnyf1w03cr3g7s03cm60yn0lxn5j6hvh019b28nmz"; depends=[tibble]; }; PakPMICS2018mm = derive2 { name="PakPMICS2018mm"; version="0.1.0"; sha256="08f2n134q545kwysy705mgsy6319ns4l9pwxldlxvbzq0lha4hf9"; depends=[tibble]; }; PakPMICS2018mn = derive2 { name="PakPMICS2018mn"; version="0.1.0"; sha256="1r5cn1mx7i7hif64lhfcdz4xqqfj3j45i092370xhhi19pqq217n"; depends=[tibble]; }; + PamBinaries = derive2 { name="PamBinaries"; version="1.4.0"; sha256="09b1964k5fipilzzfn8fzrpa29wdbakprzd7gcz04ba29jp1f89g"; depends=[dplyr ggplot2]; }; PanCanVarSel = derive2 { name="PanCanVarSel"; version="0.0.3"; sha256="06xkzg2kvyr6ivm1z71x2pk20j37h36sx6kf4kmc8q50cq73k9jl"; depends=[Matrix msm mvtnorm smoothmest]; }; PanJen = derive2 { name="PanJen"; version="1.6"; sha256="18cl9rls98v286kk6lyxxws3w59zpzgmqi5250gdgcf71xy2lhvm"; depends=[mgcv]; }; + PandemicLP = derive2 { name="PandemicLP"; version="0.2.0"; sha256="1icqg6a3nfxjnr5r02ndx4gbz88flf9agash5pb6jvzwjw14bl4f"; depends=[BH curl dplyr plotly Rcpp RcppEigen RcppParallel rstan rstantools StanHeaders tidyr]; }; PanelCount = derive2 { name="PanelCount"; version="1.0.9"; sha256="1b6c83qypjc3ylvhh24xm4pjk8w34s24v0i9ddlmg92f1518hlkj"; depends=[Rcpp RcppArmadillo statmod]; }; PanelMatch = derive2 { name="PanelMatch"; version="1.0.0"; sha256="02nsi5bhzqdn3v164f70xs0lll929gi602jw2b1xza7wcszdchfd"; depends=[CBPS data_table ggplot2 MASS Matrix Rcpp RcppArmadillo RcppEigen]; }; Paneldata = derive2 { name="Paneldata"; version="1.0"; sha256="00hk340x5d4mnpl3k0hy1nypgj55as2j7y2pgzfk3fpn3zls5zib"; depends=[]; }; - ParBayesianOptimization = derive2 { name="ParBayesianOptimization"; version="1.1.0"; sha256="1famkdri08qsamn5ji4knq42pj8z4lkhacbr8mbj439hkmpsfxkv"; depends=[crayon data_table dbscan DiceKriging foreach ggplot2 ggpubr lhs plotly]; }; + PantaRhei = derive2 { name="PantaRhei"; version="0.1.2"; sha256="0lv04aa70yd5gr0zfh2gmah4d4h3kw0lym6284akcvll8mhdi8dd"; depends=[]; }; + ParBayesianOptimization = derive2 { name="ParBayesianOptimization"; version="1.2.1"; sha256="13zsmhbfgxg6ip1zmq24hgj9y5b2h67vlbpdk7rgcj3li3m894kc"; depends=[crayon data_table dbscan DiceKriging foreach ggplot2 ggpubr lhs plotly]; }; ParDNAcopy = derive2 { name="ParDNAcopy"; version="2.0"; sha256="017xwznhfibi8kp0ifww02c0qcq0vxs06rjww4kcp2bvdmld8kc4"; depends=[DNAcopy]; }; - ParallelLogger = derive2 { name="ParallelLogger"; version="2.0.0"; sha256="1hja8flwhkgqj9g7mflvfxdkzx2l8ll5scj06kmib3pihm6s21ag"; depends=[jsonlite snow XML]; }; + ParallelDSM = derive2 { name="ParallelDSM"; version="0.1"; sha256="0pgkcc2a3k1h0n997m9x0zj4adv4i0q6qfh7m25l3f80kzlxhqdi"; depends=[caret geoR gstat quantregForest randomForest raster rgdal snowfall sp]; }; + ParallelLogger = derive2 { name="ParallelLogger"; version="2.0.1"; sha256="0vvilx5rcr00nl9gsjynx6dddc692llq63v3mhj3zlmblifxwkyr"; depends=[jsonlite snow xml2]; }; ParallelPC = derive2 { name="ParallelPC"; version="1.2"; sha256="07y7xb16865khxkvwsk1yglzyy7ja4aj2wpkipaz48i77c3x8bi2"; depends=[]; }; ParallelTree = derive2 { name="ParallelTree"; version="0.1.3"; sha256="1h53qwhc63fglm452b3by7f3g6f3hyqwkmwmbdqdb9rv3j4gvnvg"; depends=[ggplot2]; }; ParamHelpers = derive2 { name="ParamHelpers"; version="1.14"; sha256="1sx2ddm8hwvvmk0z65wa689w80py3fny82zjd4d29qwxlv854xmi"; depends=[backports BBmisc checkmate fastmatch]; }; - Pareto = derive2 { name="Pareto"; version="2.2.0"; sha256="0yzqwgl669k461xrwadi8py5krc1kmrqqzygf5yg8q1359r4c2pv"; depends=[]; }; + Pareto = derive2 { name="Pareto"; version="2.2.1"; sha256="1n438xawc45l3maliw6p3rmp0a97i9wvjfzhvzdbs07ls160wb2d"; depends=[]; }; ParetoPosStable = derive2 { name="ParetoPosStable"; version="1.1"; sha256="1fwji5wrhbxr089dll812csamvb5q2pxn1607rpirarifgfbj28m"; depends=[ADGofTest doParallel foreach lmom]; }; PartCensReg = derive2 { name="PartCensReg"; version="1.39"; sha256="0blzv57cbxqghkz4fc3plvrcw80g0kx17dzmajkfv598m1wm6hc8"; depends=[Matrix optimx ssym]; }; Partiallyoverlapping = derive2 { name="Partiallyoverlapping"; version="2.0"; sha256="0pb0digyigqyzb0zqikgz002kqf1xprcjhxr62a7iqbzy1yycayf"; depends=[]; }; @@ -3187,7 +3307,7 @@ in with self; { PenCoxFrail = derive2 { name="PenCoxFrail"; version="1.0.1"; sha256="0snjf8jxzyf30xj3wx9p6g073dqw592l1j1c6yxfg8y4kgzhzwq7"; depends=[Matrix Rcpp RcppArmadillo survival]; }; PenIC = derive2 { name="PenIC"; version="1.0.0"; sha256="0vcqawmbm8z6lkcxfq1b2png9viz5q669npbv0s7dn6smwhanlzz"; depends=[MASS Matrix numDeriv]; }; PepSAVIms = derive2 { name="PepSAVIms"; version="0.9.1"; sha256="0m4jrq6wcjy0k80gvrnm9f7kvi1ifx9182xfq0psyaxpj0ggvzij"; depends=[elasticnet]; }; - Peptides = derive2 { name="Peptides"; version="2.4.2"; sha256="150hxr2qpmp0ad32mkvnr9pagxq38g4c83khbdv8h34bj97nharf"; depends=[Rcpp]; }; + Peptides = derive2 { name="Peptides"; version="2.4.3"; sha256="1ml1dnk4bigv9gfxx9xpxp9b8id2nid3gngmza9dz9zfcy5dbc1f"; depends=[Rcpp]; }; PerFit = derive2 { name="PerFit"; version="1.4.3"; sha256="0qmh78wrx3vzz41z30db3bb62n325blphjhpzdzykfx77gr8plyr"; depends=[fda Hmisc irtoys ltm MASS Matrix mirt]; }; PerMallows = derive2 { name="PerMallows"; version="1.13"; sha256="0ny2vc8f0npixaw1kp2d93xr4g46nsg8jjwvi6afv9xjvaz0i6wy"; depends=[Rcpp]; }; Perc = derive2 { name="Perc"; version="0.1.5"; sha256="1097cdx69jliwk1d5yv6v0igmqk4dwgypcb4k9dnqla19rbxx8xc"; depends=[]; }; @@ -3203,19 +3323,19 @@ in with self; { PharmPow = derive2 { name="PharmPow"; version="1.0"; sha256="0gabkd8p4zsig9p697lyk8m2jxb5abjk81rpzd5ih1yk1qanhsn5"; depends=[scatterplot3d]; }; Phase123 = derive2 { name="Phase123"; version="2.1"; sha256="0bz867wsnrflzlzrql1vgacymx70rb9wik9jw3g34i2vigpl8x8i"; depends=[Rcpp RcppArmadillo survival]; }; Phase12Compare = derive2 { name="Phase12Compare"; version="1.5"; sha256="0n9rjgdllpnj451a8d4p8x3mjf23czcmk7cn1c9v3l7mg4jn18h2"; depends=[mvtnorm Rcpp RcppArmadillo]; }; + PheCAP = derive2 { name="PheCAP"; version="1.2.1"; sha256="00dfy0iby21kqfxz2npz4dn1klxcdlll8xrk2hsmc56fjfidbdhz"; depends=[glmnet RMySQL]; }; Phenotype = derive2 { name="Phenotype"; version="0.1.0"; sha256="0bfg2vk35hrfzmpjpnv3yhnsfr17505c49msbppqrrbpw5wgawy5"; depends=[lme4 tidyr]; }; PhenotypeSimulator = derive2 { name="PhenotypeSimulator"; version="0.3.3"; sha256="1micildhgqx4h52927p68g6jvw2rif6maf90d3dzvn76ll2zbpwh"; depends=[cowplot data_table dplyr ggplot2 mvtnorm optparse R_utils Rcpp reshape2 snpStats zoo]; }; Phxnlme = derive2 { name="Phxnlme"; version="1.0.0"; sha256="0h9mi8p95rp1s8xsdv38j9fpy2cy9zvjnldjmnj0n469kimp2782"; depends=[ggplot2 gridExtra lattice manipulate testthat]; }; - PhyInformR = derive2 { name="PhyInformR"; version="1.0"; sha256="10d720ww909b1xmdrms554pnn0757nzppnrniar4n157mh0qw7ms"; depends=[ape doParallel foreach geiger ggplot2 gplots gridExtra hexbin iterators PBSmodelling phytools RColorBrewer]; }; PhySortR = derive2 { name="PhySortR"; version="1.0.8"; sha256="19426xjdii74qds0wmq5sa88zys81nyqb9lvf9pfihbjgrjr770a"; depends=[ape phytools]; }; PhyloMeasures = derive2 { name="PhyloMeasures"; version="2.1"; sha256="01axs78s10y1bkx8dbs9vvnphdzik7hpibkwyib1x9mznmyg90hr"; depends=[ape]; }; PhylogeneticEM = derive2 { name="PhylogeneticEM"; version="1.4.0"; sha256="14a1lczwr8xhv27wqc88raj3yhy8gvflvxjrx8f5hlq15y3wfp4w"; depends=[ape capushe foreach gglasso glmnet LINselect MASS Matrix plyr Rcpp RcppArmadillo robustbase]; }; - PhysActBedRest = derive2 { name="PhysActBedRest"; version="1.0"; sha256="0gmqh700cf6aiagb45iyyf85pgp3b86fx7fbv9lrsm4mda0r8h75"; depends=[chron lubridate stringr]; }; + PhysActBedRest = derive2 { name="PhysActBedRest"; version="1.1"; sha256="0ww9gcni9f0mwya1d3v45wazrss7lq8b75xcp4fb4kxwbh9s35kw"; depends=[chron lubridate stringr]; }; PhysicalActivity = derive2 { name="PhysicalActivity"; version="0.2-2"; sha256="14z6plgwyr46vs9m997rvlz8sdglfs9g087an8668zqkzzs2w4ln"; depends=[]; }; PieceExpIntensity = derive2 { name="PieceExpIntensity"; version="1.0.4"; sha256="023hq0gg1vi0j3yf8p5lisgs8wfp5qwyd4akxxzx7wad2985gxb3"; depends=[Rcpp RcppArmadillo]; }; - Pijavski = derive2 { name="Pijavski"; version="1.0"; sha256="1027lmmk17br9zxah980j6l3k2p92065bwigw6gpy9g0g5jjl4f1"; depends=[Rcpp]; }; - PivotalR = derive2 { name="PivotalR"; version="0.1.18.3.1"; sha256="1npfi5bdn0f4arp3wpi5ai21ad5fxx3lm7n5wjhvzvcyr6gl38as"; depends=[Matrix]; }; - PlackettLuce = derive2 { name="PlackettLuce"; version="0.2-9"; sha256="1sv37wvvp44iwv4bpjhp3mnpyk77c60vi0xwrapzywszi222ynbl"; depends=[igraph Matrix partykit psychotools psychotree qvcalc RSpectra sandwich]; }; + Pijavski = derive2 { name="Pijavski"; version="1.0.3"; sha256="0jspc19fn1mqv3zjr89sy7rqbbyjk3ij3rhrg2dsw167w63lpykx"; depends=[Rcpp]; }; + PivotalR = derive2 { name="PivotalR"; version="0.1.18.4"; sha256="18fnpa45q6zfndkb7p6nx7am3kfp6yx0cmvg13gafsaw7imf760y"; depends=[Matrix semver]; }; + PlackettLuce = derive2 { name="PlackettLuce"; version="0.3.1"; sha256="00qvcick4ph3awr46ihrd6m1zfr4h3pf9laisxl3x7yajdl9qgk8"; depends=[igraph Matrix partykit psychotools psychotree qvcalc RSpectra sandwich]; }; PlaneGeometry = derive2 { name="PlaneGeometry"; version="1.2.0"; sha256="19ynvclgj2148gphqq825byj6xdvjr5i15h448505gv4j1viw0cx"; depends=[gsl R6 sdpt3r stringr uniformly]; }; Planesmuestra = derive2 { name="Planesmuestra"; version="0.1"; sha256="0v7l4hrfckcf7zmk0ihq2ij0qli7x12j17vd6752d1yjk27fgk57"; depends=[]; }; PlasmaMutationDetector = derive2 { name="PlasmaMutationDetector"; version="1.7.2"; sha256="0qra7q2pzw212qylyrfhv6zjcsldfw84b93cari0qjqnw4gyfph2"; depends=[GenomicRanges ggplot2 robustbase Rsamtools rtracklayer S4Vectors SummarizedExperiment VariantAnnotation]; }; @@ -3226,7 +3346,7 @@ in with self; { PlotPrjNetworks = derive2 { name="PlotPrjNetworks"; version="1.0.0"; sha256="13kbyx2phxb3kss6l32f7krf4k5i350indlsmbhav686v0h3nsgp"; depends=[ggplot2 reshape2]; }; PlotRegionHighlighter = derive2 { name="PlotRegionHighlighter"; version="1.0"; sha256="0n1nkfr3sdaq6f5p9kgx4slrsvhpdbax3rinrkfkb1vnjj4swj77"; depends=[]; }; PoA = derive2 { name="PoA"; version="1.2.1"; sha256="0y8aqz1ainxdglxlfp9iqhvkmirpmc7dvwrcxz2l8lln86yrfqx6"; depends=[dplyr nloptr pracma tibble]; }; - PoSI = derive2 { name="PoSI"; version="1.0"; sha256="0c08czjvm09mcnkqnas4l22v22r9akgklnacx1j62smk4m546q2m"; depends=[]; }; + PoSI = derive2 { name="PoSI"; version="1.1"; sha256="1xwlj8dibaik37z6vj9q9vawavi7d49906wvxdd4drjzxzapq4ng"; depends=[]; }; PogromcyDanych = derive2 { name="PogromcyDanych"; version="1.5"; sha256="1m6sycca44h8kdf9cd67annw6dxxwiscidzfnjrzqmqa4v6n7rsg"; depends=[dplyr SmarterPoland]; }; PoiClaClu = derive2 { name="PoiClaClu"; version="1.0.2.1"; sha256="1q89b0nypz2iivmgwg1nb1l7p285wy00s40j3qp8zc78ra1rjhyx"; depends=[]; }; PointFore = derive2 { name="PointFore"; version="0.2.0"; sha256="0ml6xcdl4ygr01q0cjwd11ql7wal91jnf3hs1rfhfr4mh8jpgivx"; depends=[boot car ggplot2 gmm lubridate MASS sandwich]; }; @@ -3236,12 +3356,12 @@ in with self; { PoisBinOrdNor = derive2 { name="PoisBinOrdNor"; version="1.6.2"; sha256="19ilr0fczr7candrmj372hhc6sai863qwcmnpimqgpfac7393qr5"; depends=[corpcor GenOrd Matrix mvtnorm psych]; }; PoisNonNor = derive2 { name="PoisNonNor"; version="1.6.2"; sha256="1bf0qzgclw7993dc7x1sf3hfzgfv0jlga8ykvaif455d6nkiyy0k"; depends=[BB corpcor MASS Matrix]; }; PoisNor = derive2 { name="PoisNor"; version="1.3.2"; sha256="1kpac3fz3cq4vi5maij0gbiwqm9qlvjwawvn2qz3sp5f2wn71w90"; depends=[corpcor Matrix mvtnorm]; }; - PoissonBinomial = derive2 { name="PoissonBinomial"; version="1.1.1"; sha256="0zz8zxd1gl95fd3izwc1hwwbrd6zkxcspzdskqfwb61zp1z6q0zp"; depends=[BH Rcpp]; }; + PoissonBinomial = derive2 { name="PoissonBinomial"; version="1.2.1"; sha256="10wcz6imlfzikgk5mj9hv3q1c6fcqfq0vri0aiapfl5cfl2mraj7"; depends=[BH Rcpp]; }; PoissonPCA = derive2 { name="PoissonPCA"; version="1.0.2"; sha256="0rb30l0x8knwvh8li62cfxms9b20db77g4r8cwgwasb9jjljxv3s"; depends=[]; }; PoissonSeq = derive2 { name="PoissonSeq"; version="1.1.2"; sha256="1hhx0gv06cp6hm6h36mqy411qn9x15y45crpzbyf8crfs85c6gbg"; depends=[combinat]; }; PolyPatEx = derive2 { name="PolyPatEx"; version="0.9.2"; sha256="1z1hwvsw7b6cz5xfy35a5ldrzb3fhp3swiyz56v1zqblpsaz8n9g"; depends=[gtools]; }; PolyTrend = derive2 { name="PolyTrend"; version="1.2"; sha256="17n6phkzgaqrlzs8x1l5smnij1gxfklr0zj9pqfy5n8xqnpwssm5"; depends=[]; }; - Polychrome = derive2 { name="Polychrome"; version="1.2.5"; sha256="028lzsswb36pdb6mmyysb4iggzlsvwrcxlcdbrkyz3338mvqabn2"; depends=[colorspace scatterplot3d]; }; + Polychrome = derive2 { name="Polychrome"; version="1.2.6"; sha256="0363cgrbbva56146hr0dh7bj7g86c8c1rqh82rbqk7cam3an8g9a"; depends=[colorspace scatterplot3d]; }; PolynomF = derive2 { name="PolynomF"; version="2.0-3"; sha256="067l71i2zjv6gvd0br2m034ls3r5lcmc0amml1qbj4wchd7mqlw9"; depends=[Rcpp]; }; Pomic = derive2 { name="Pomic"; version="1.0.4"; sha256="0xy5fgimbgqqac3n7akhwyvnrvd9fpvx9h8nk4spxrxc8x0km1w7"; depends=[]; }; PooledMeanGroup = derive2 { name="PooledMeanGroup"; version="1.0"; sha256="0i9s7qskjnji3mf6clsi69rnni57v8cysgr9gh3hvxjzlf1sq8y7"; depends=[]; }; @@ -3251,8 +3371,8 @@ in with self; { PopGenome = derive2 { name="PopGenome"; version="2.7.5"; sha256="0xdwgih1n7bkykbzrnp293yzrlj80vr2v6rlsww61nxlhynbh9yn"; depends=[ff]; }; PopVar = derive2 { name="PopVar"; version="1.2.1"; sha256="09az5wa0zai6axhvrljqdjn74nb7jikqwjqy8f570qxb6jbgfgay"; depends=[BGLR qtl rrBLUP]; }; PortRisk = derive2 { name="PortRisk"; version="1.1.0"; sha256="05yxqcv0cijy3s9zx68f9xy59jv55kmj3v0pz5pgl17j23kb9rlc"; depends=[copula MASS MCMCpack tseries zoo]; }; - PortalHacienda = derive2 { name="PortalHacienda"; version="0.1.4"; sha256="1mm9939inmrr77irmw30620zff6jf86zw5nf65k5j4i5nawzsx15"; depends=[curl dplyr forecast httr lubridate magrittr readr tibble timetk xts zoo]; }; - PortfolioAnalysis = derive2 { name="PortfolioAnalysis"; version="1.0.6"; sha256="1chmh1r3hphl4wxy6i5404y8fnlbq6kmr7x8s5s97d5lwkr3dg36"; depends=[dplyr ggplot2 lubridate PerformanceAnalytics plotly purrr quadprog quantmod readr rMorningStar rvest stringi stringr tidyr xml2 xts]; }; + PortalHacienda = derive2 { name="PortalHacienda"; version="0.1.6"; sha256="11fcd1m751xahv13s61n2lzxqxhzfkcxk3zv9kyjvrzb0fiy4jss"; depends=[curl dplyr forecast httr lubridate magrittr purrr tibble timetk xts zoo]; }; + PortfolioAnalysis = derive2 { name="PortfolioAnalysis"; version="1.1"; sha256="11nmfyzjkvczwnlr71wg57p0pkgvr3b8ywbvrws820x7yzd1k8l6"; depends=[dplyr ggplot2 lubridate PerformanceAnalytics plotly purrr quadprog quantmod readr rMorningStar rvest stringi stringr tidyr xml2 xts]; }; PortfolioAnalytics = derive2 { name="PortfolioAnalytics"; version="1.1.0"; sha256="1jy89brrdw8ilbi9pjxxq5yhqw85ik4kzdd2sa60crjlhvipx0ff"; depends=[foreach PerformanceAnalytics xts zoo]; }; PortfolioEffectEstim = derive2 { name="PortfolioEffectEstim"; version="1.4"; sha256="1sfgkwyn7vfy3rqb1cglywiv5xmyxhzvj38vgrvfq5jf3hvzsg21"; depends=[PortfolioEffectHFT rJava]; }; PortfolioEffectHFT = derive2 { name="PortfolioEffectHFT"; version="1.8"; sha256="0y4x0d91j6g52136d921hfs5swzf85gkxafxfkf3c15dl5ns120v"; depends=[ggplot2 rJava zoo]; }; @@ -3263,41 +3383,42 @@ in with self; { PoweR = derive2 { name="PoweR"; version="1.0.7"; sha256="040wc7hxa8y6bm1rs7ip2skdxmmwksxkyb6xzqgdjp8m7a25fppb"; depends=[Rcpp RcppArmadillo]; }; Power2Stage = derive2 { name="Power2Stage"; version="0.5.2"; sha256="1837pc94syhyl5i0kjdmlc1h7ckas3vcpwhvhgh46sv022lrg2gi"; depends=[cubature mvtnorm PowerTOST]; }; PowerNormal = derive2 { name="PowerNormal"; version="1.2.0"; sha256="1kryqcjvgwk0l4z3gqxdiz47mha3jw5583jlb9z7ml6v7cam06sm"; depends=[]; }; - PowerTOST = derive2 { name="PowerTOST"; version="1.5-0"; sha256="0bsdrancxrymylakgxzgqgqmnbnp8ms09f323gffh985fmm1lxfc"; depends=[cubature mvtnorm TeachingDemos]; }; + PowerTOST = derive2 { name="PowerTOST"; version="1.5-2"; sha256="0afrznjqnfin8am8naj3d9n0kkw26cqy6yim8va2gc592nk62h7s"; depends=[cubature mvtnorm TeachingDemos]; }; PowerUpR = derive2 { name="PowerUpR"; version="1.0.4"; sha256="0ng88x1zs4kb8cf2v51kynbp32iz41mh40my5sciyvjbw430bk59"; depends=[]; }; PracTools = derive2 { name="PracTools"; version="1.2.2"; sha256="08s8pm55814w6mjz3q4n1bcxccmjypb5qiws5g8pcafl6dj7z0wh"; depends=[]; }; PreKnitPostHTMLRender = derive2 { name="PreKnitPostHTMLRender"; version="0.1.0"; sha256="1749cd734f4bf0n4068s2m617k6as8h9bwp44mm3la2xy3vjf5g1"; depends=[knitr rmarkdown XML]; }; PreProcess = derive2 { name="PreProcess"; version="3.1.7"; sha256="1fxzkmrj76mc94xdj7a0nq450021i1jxkigmh5jhrmamkp5581jf"; depends=[oompaBase]; }; PreciseSums = derive2 { name="PreciseSums"; version="0.4"; sha256="054y84w3i5yrq74w2hsdxz1z1glccy540dq4jxicnknkkp2c0nmx"; depends=[]; }; - PredCRG = derive2 { name="PredCRG"; version="1.0.1"; sha256="070cpm4a90s9q78hw352g9bp49im39grd66s8d870likhr8fnrwv"; depends=[Biostrings kernlab Peptides protr]; }; + PredCRG = derive2 { name="PredCRG"; version="1.0.2"; sha256="0z84p8l2q66rapb9lhx8m8iadz3q989q5qkvcp8ylv80cz6qkibx"; depends=[Biostrings e1071 kernlab Peptides protr]; }; PredPsych = derive2 { name="PredPsych"; version="0.4"; sha256="00h4p1szqzh4a2kjvlriyinh330cfwxsrvs6fi089mr207q890vj"; depends=[caret e1071 ggplot2 MASS mclust party plyr randomForest rpart statmod]; }; PredictABEL = derive2 { name="PredictABEL"; version="1.2-4"; sha256="144xmfsp62ssmg501f4y173jrqyv8vps36j4yrwg6ghcmyc01wf8"; depends=[Hmisc lazyeval PBSmodelling ROCR]; }; PredictionR = derive2 { name="PredictionR"; version="1.0-12"; sha256="0kgc8rjdqskasdaxsbir9gwvm55rw5cpdg3y9nsj7ccg9fc1ji19"; depends=[fitdistrplus Renext]; }; PredictiveRegression = derive2 { name="PredictiveRegression"; version="0.1-4"; sha256="15vkisj3q4hinc3d537s8inhj3wk62q67qhy050xmp9j563ainmd"; depends=[]; }; PresenceAbsence = derive2 { name="PresenceAbsence"; version="1.1.9"; sha256="17qn4ggkr5aqml45nkihj1j35y479ywkm1xcfkb2g8ky66jb0c0s"; depends=[]; }; + PressPurt = derive2 { name="PressPurt"; version="1.0.2"; sha256="05kca0rlhlvhgnw3r3p4sh42zwvhrhcjdwz65ykp14jxybfhc8in"; depends=[data_table ggplot2 gridExtra reticulate]; }; PrevMap = derive2 { name="PrevMap"; version="1.5.3"; sha256="0pgrfrfw587vsci98lxd205r8wl7x7c9ns15ypnhwr8xaysdxnpf"; depends=[lme4 Matrix maxLik numDeriv pdist raster splancs truncnorm]; }; PriorCD = derive2 { name="PriorCD"; version="0.1.0"; sha256="1mb50w2i8sfxjzqd5xnfysn3jnzkkyv6l8algxnp0xpyhcq41pfs"; depends=[dplyr igraph ROCR visNetwork]; }; PriorGen = derive2 { name="PriorGen"; version="1.1.2"; sha256="0qvdqqdy7wdwwcq95mkgfyf7xf6xlpwdfs3gq299yyv2ba57flnm"; depends=[rootSolve]; }; PrivateLR = derive2 { name="PrivateLR"; version="1.2-22"; sha256="0d142fa3wk7yadvs8jszajs6hq9m03p0j6h5r4pbw7j0d1l72hgc"; depends=[]; }; ProDenICA = derive2 { name="ProDenICA"; version="1.0"; sha256="04gnsnd0xzw3bfbssdp06bar0lk305ry2c97pmwxgiz3ay88dfsj"; depends=[gam]; }; ProFit = derive2 { name="ProFit"; version="1.3.3"; sha256="0jrw0v7dg5mf4zxg7pqybh9qzsiqb3nnz8g5qlc4iz73mhr9gm2b"; depends=[celestial checkmate cubature FITSio LaplacesDemon magicaxis RColorBrewer]; }; - ProFound = derive2 { name="ProFound"; version="1.3.4"; sha256="1kn9kj0vq18jxiavdzx4l4kgyfwjnflfbyqfdihrdfrkz4xz4w3c"; depends=[celestial data_table doParallel FITSio foreach magicaxis RColorBrewer Rcpp]; }; + ProFound = derive2 { name="ProFound"; version="1.14.1"; sha256="1p2mdy0z5p7as1x6vc572wjcl6f0acwgpvb39rmk2273kb1ldwz5"; depends=[celestial data_table FITSio foreach magicaxis RColorBrewer Rcpp]; }; ProPublicaR = derive2 { name="ProPublicaR"; version="1.1.1"; sha256="08bhqm64r79ywj394l1ywwcsjc79wzi85wlbp5xnr49bxzaysfp1"; depends=[config dplyr httr lubridate stringr]; }; ProTrackR = derive2 { name="ProTrackR"; version="0.3.7"; sha256="15m8g9v254avi68qr7v5q4fzhclkv1q849sj69fs0c9qcli1x384"; depends=[audio lattice signal tuneR XML]; }; ProbBayes = derive2 { name="ProbBayes"; version="1.1"; sha256="0bkbqyrmpy9swaxsl91w6iiw81znjf1lk4b0vqgn6wdnrir6gkmn"; depends=[ggplot2 gridExtra LearnBayes shiny]; }; ProbForecastGOP = derive2 { name="ProbForecastGOP"; version="1.3.2"; sha256="0fnw3g19lx4vs8vmn4qdirvybkiy2cxkhwkn9qa3phz45iixnvx4"; depends=[fields RandomFields]; }; ProbMarg = derive2 { name="ProbMarg"; version="1.0.1"; sha256="02qc6c08vfg3inh14d3dzq28zgsgk9p7kb2ni9d14pcx5w9q6sji"; depends=[]; }; - ProbReco = derive2 { name="ProbReco"; version="0.1.0"; sha256="127gqc80ja4jwm0j2hc1gg3063knvgdhmr0l5i5iqpc64n6ljdnh"; depends=[BH mvtnorm purrr Rcpp RcppEigen StanHeaders]; }; + ProbReco = derive2 { name="ProbReco"; version="0.1.0.1"; sha256="0ck5jvbgmf2j4qr4rsamjdrds5jzcggwcvs2hqzhh23ildk7hj7h"; depends=[BH mvtnorm purrr Rcpp RcppEigen Rdpack StanHeaders]; }; ProbYX = derive2 { name="ProbYX"; version="1.1-0"; sha256="0dphf6jr72l235v3yjhwi8bqmv6ac7yrbyfwhx4qjrrcdnsb7qhl"; depends=[rootSolve]; }; ProbeDeveloper = derive2 { name="ProbeDeveloper"; version="1.0.0"; sha256="1d2zr8ikia3mspp2arpx7iwf4a4pq1ywl82pxbxrw6xpz313d5x9"; depends=[Biostrings TmCalculator]; }; ProcData = derive2 { name="ProcData"; version="0.2.5"; sha256="17nm9sxv9k5mqjqabla6ldz1781446z566vz8cqs6cg1i6ngkrw8"; depends=[keras Rcpp]; }; - ProcMod = derive2 { name="ProcMod"; version="1.0.3"; sha256="17x4c9vgf14l1x3hx3vyv3ygl8bb5qzq7fxg2cnl910drcdnv5sz"; depends=[expm foreach MASS Matrix mvtnorm permute Rdpack]; }; + ProcMod = derive2 { name="ProcMod"; version="1.0.7"; sha256="0ka02pwnmgvm55cqh8lqjnamz42dqfwi3c0xglrz6zrmgag119f8"; depends=[foreach MASS Matrix permute Rdpack]; }; ProfessR = derive2 { name="ProfessR"; version="2.4-1"; sha256="1wsbx0dsygc1ipzhgs1pd0lhdb0qvp4ydqzwarn6zv27rzf4p3bd"; depends=[RPMG]; }; ProfileLikelihood = derive2 { name="ProfileLikelihood"; version="1.1"; sha256="16cdp1nimhg1sd2x0qbffm7clgk54p0838y688z8lnsrjaggmb0x"; depends=[MASS nlme]; }; ProfoundData = derive2 { name="ProfoundData"; version="0.2.1"; sha256="1zqg821pv3i5nf76s7yppnmy13y14pj0l7rjhk50wlxrxdb53ibz"; depends=[DBI RNetCDF RSQLite settings sqldf zoo]; }; ProjectManagement = derive2 { name="ProjectManagement"; version="1.3.3"; sha256="186vq7kd2rzqml88q6iskwb9h1xbl0azkn4dv2msd04klw6fir7j"; depends=[GameTheory igraph kappalab lpSolveAPI plotly triangle]; }; - ProjectTemplate = derive2 { name="ProjectTemplate"; version="0.9.2"; sha256="0ni0clx9k4amkhkss9ssw3gn40z6mnbxn1gaxgnphaasw0hj1mql"; depends=[]; }; - ProjectionBasedClustering = derive2 { name="ProjectionBasedClustering"; version="1.1.1"; sha256="17y1yf8cbcl3yha7mbk22lxmk2v5n98mfqsa886a3012ang4m5sp"; depends=[deldir GeneralizedUmatrix geometry ggplot2 plotly Rcpp shiny shinyjs shinythemes vegan]; }; + ProjectTemplate = derive2 { name="ProjectTemplate"; version="0.9.3"; sha256="09flfskpp0v7h9n7x9b15i4q242mzbcz6jkd2dqvrfa7sm4hpp8f"; depends=[]; }; + ProjectionBasedClustering = derive2 { name="ProjectionBasedClustering"; version="1.1.6"; sha256="0b2bljw5gslkw6jkajnk3jsx1kgi7bk9vrnivgkaxq76qi8bgsr9"; depends=[deldir GeneralizedUmatrix geometry ggplot2 plotly Rcpp shiny shinyjs shinythemes vegan]; }; ProliferativeIndex = derive2 { name="ProliferativeIndex"; version="1.0.1"; sha256="03ipsbs8pfwr8wsx7j2y9c67ic4qcady7xpa47l8dr14ff63cfk7"; depends=[]; }; PropCIs = derive2 { name="PropCIs"; version="0.3-0"; sha256="1ywzi88igzaj2wnbrqa08cy7pw886z2m0x3j7rk45rin9mgpfdfd"; depends=[]; }; PropClust = derive2 { name="PropClust"; version="1.4-6"; sha256="1p15n98b6qprphgbhdqgnsxy9d9kik19h6j9f2dy6x1hkinrzsfa"; depends=[dynamicTreeCut fastcluster]; }; @@ -3309,18 +3430,21 @@ in with self; { PsyControl = derive2 { name="PsyControl"; version="1.0.0.0"; sha256="1c5ml6s3c8kzf7p0mig84bmq40b0491ah713bm6jpy2s3nwnmafs"; depends=[irtoys ltm]; }; PtProcess = derive2 { name="PtProcess"; version="3.3-13"; sha256="0vk1n7hk6v592fi5ld70db6m92zgpjx97axs5h8p53c29984qhwz"; depends=[]; }; PubBias = derive2 { name="PubBias"; version="1.0"; sha256="0dr5dhfx57knrs05pbx9ngg4k2937n8gjzsgd0jfqd8dfxhy051k"; depends=[R_utils rmeta]; }; + PubMedMining = derive2 { name="PubMedMining"; version="1.0.0"; sha256="03lhml5jk69racmhlh6xa8j2rv8xb87vg6hr1caiqpd4kqg16n1q"; depends=[easyPubMed stringr]; }; PubMedWordcloud = derive2 { name="PubMedWordcloud"; version="0.3.6"; sha256="1wfp1fpr4an7psrwidx38brvhvghmvfsgjy4gdx81p1bdsdn2kw2"; depends=[RColorBrewer RCurl stringr tm wordcloud XML]; }; PublicationBias = derive2 { name="PublicationBias"; version="2.2.0"; sha256="1mdvzf2qiq4zvp4iinjnnj0rq3dqcz18r27nr62znh05jp6i96gx"; depends=[dplyr ggplot2 metafor MetaUtility Rdpack robumeta]; }; - Publish = derive2 { name="Publish"; version="2019.12.04"; sha256="0vcfz6hx2bkwrksz6b0rx0w6j24h3qswgca06jhgq3jzvsmjjckx"; depends=[data_table lava multcomp prodlim survival]; }; + Publish = derive2 { name="Publish"; version="2020.11.30"; sha256="0szyyb9b7g928qbiafakb6q8mnsld1bk8kya2vaiw3m30k2jgv3n"; depends=[data_table lava multcomp prodlim survival]; }; PupilPre = derive2 { name="PupilPre"; version="0.6.2"; sha256="123m1zqld0jl26vqz41iic7vxzyfs1aw8zi5ki2cy6wzw9ss87m6"; depends=[dplyr ggplot2 mgcv rlang robustbase shiny signal tidyr VWPre zoo]; }; PupillometryR = derive2 { name="PupillometryR"; version="0.0.3"; sha256="19llm6p67z0z29zxmjfz9ad624428szdjdd1ssj7j3zjcyjvqihy"; depends=[data_table dplyr fda ggplot2 itsadug lazyeval mgcv rlang signal tidyr zoo]; }; PurBayes = derive2 { name="PurBayes"; version="1.3"; sha256="0nbm4cyrwfbwwbjbjkylr86cshaqbvbif6dkp4fag8kbcgyyx5qh"; depends=[rjags]; }; Pursuit = derive2 { name="Pursuit"; version="1.0.1"; sha256="0c4bc0ldfx02a8ws3g3gn7smikg3fdjygybs3q764kxhq88kv42l"; depends=[MASS]; }; - PxWebApiData = derive2 { name="PxWebApiData"; version="0.3.0"; sha256="1c2liqh1asd0mk4cvrwpl4pdid2rqfxrma284ah4hwr6sah5lk6w"; depends=[httr jsonlite pxweb rjstat]; }; + PxWebApiData = derive2 { name="PxWebApiData"; version="0.4.0"; sha256="0n126fnfyfyvndvhalf8wiybnh00hlg25afxvni66s06r5v2pq8l"; depends=[httr jsonlite pxweb rjstat]; }; PythonInR = derive2 { name="PythonInR"; version="0.1-12"; sha256="0f6jijbqdn6p2530l4v0b0ys1gcgji1d1i63bcd8g1ml21grvyfg"; depends=[pack R6]; }; + Q2q = derive2 { name="Q2q"; version="0.1.0"; sha256="1n97axhcq64fg92cbndqw70c8awknjap91bh2h6i5cvd0c80pb85"; depends=[]; }; + Q7 = derive2 { name="Q7"; version="0.1.0"; sha256="09jhqraajvlm7iiri4f7xlllkcx8q5h3sg472ishj47wg5qf2rym"; depends=[magrittr]; }; QAIG = derive2 { name="QAIG"; version="0.1.7"; sha256="04ygizvplvrzhf1p0vwj75x7k8sl0ym5zbrsvn63y983awih2p6i"; depends=[Formula stringr]; }; QBAsyDist = derive2 { name="QBAsyDist"; version="0.1.2"; sha256="1yql29npaq9yz02bv3hqf5m2mhscjms7qqf4vlaxm8s665rxcxad"; depends=[ald Deriv GoFKernel locpol nloptr quantreg scdensity zipfR]; }; - QCA = derive2 { name="QCA"; version="3.8.2"; sha256="08gja6m64xwwq2ka2a4chsgbliczaj93kq90dcsa4dhwk202w2r4"; depends=[admisc shiny venn]; }; + QCA = derive2 { name="QCA"; version="3.10"; sha256="1ws5k7zv0knsr7jn8xz7wvg2xbp1pbcqll6rpyvfvn4ll007y1wh"; depends=[admisc shiny venn]; }; QCAfalsePositive = derive2 { name="QCAfalsePositive"; version="1.1.1"; sha256="03qzb6vdnbri52gfx3laz14988p2swdv9m8i5z7gpsv3f3bjrxbp"; depends=[]; }; QCApro = derive2 { name="QCApro"; version="1.1-2"; sha256="1glfb1x1h05cs07nq5glqvlil58wp3c0kaxi1l7k94y797i8r7hq"; depends=[lpSolve]; }; QCAtools = derive2 { name="QCAtools"; version="0.2.3"; sha256="1q49l2mf02hqvz2ahqjdx7i3yxniy7dn2s74xjl9l6zdq8bypfw2"; depends=[directlabels ggplot2 QCA stringr]; }; @@ -3329,6 +3453,7 @@ in with self; { QCSIS = derive2 { name="QCSIS"; version="0.1"; sha256="0ibh3060jxf426svdfxiryvfhr8pwk991xs653d50ip4f9290y3a"; depends=[]; }; QCSimulator = derive2 { name="QCSimulator"; version="0.0.1"; sha256="1ff7xagnzibhrwrmkqyky4ik3kx7rrlajrs1ypm210sl1d73jwvs"; depends=[ggplot2]; }; QDComparison = derive2 { name="QDComparison"; version="3.0"; sha256="0y4494r3ixkyh58xr9md7c6xgcj1hgbjzfybvqqdbawjxvy5p38i"; depends=[]; }; + QF = derive2 { name="QF"; version="0.0.3"; sha256="1gd90dyx5h7l1phm1hy7sg78b7l9dxydl63y1jmgaac704zrld1y"; depends=[Rcpp RcppGSL]; }; QFASA = derive2 { name="QFASA"; version="1.0.3"; sha256="1yw745wk9ijvqs3hv0gbm6bkzjrlj42ipwbzypj73s3f7ygl452f"; depends=[boot futile_logger gamlss gamlss_dist Rsolnp]; }; QFRM = derive2 { name="QFRM"; version="1.0.1"; sha256="1k79sq9il4326q7ivwdwlzw7drjv4pwqra3fr8kyyqcpmxh9296h"; depends=[]; }; QGameTheory = derive2 { name="QGameTheory"; version="0.1.2"; sha256="0h3qkb0zg6km3s89bjnv9503hgcng4wfywfy1x5dsbj5azs9hs5w"; depends=[dplyr R_utils RColorBrewer]; }; @@ -3338,42 +3463,43 @@ in with self; { QQperm = derive2 { name="QQperm"; version="1.0.1"; sha256="06xhv54zgnx8i22j23a0dqxhh7my416idpkkwq93qd1rdzgamzc8"; depends=[]; }; QRAGadget = derive2 { name="QRAGadget"; version="0.1.0"; sha256="0vmhbpfbbpbcs6s9zjam893yl54spbx4x4698c504g96hcc19kkp"; depends=[htmlwidgets leaflet magrittr miniUI raster scales shiny sp]; }; QRISK3 = derive2 { name="QRISK3"; version="0.3.0"; sha256="0aqqncmlhb5iks8081y34ydlls3g31j994fqqzsbsc3ckcks87qj"; depends=[]; }; + QRIpkg = derive2 { name="QRIpkg"; version="0.2.1"; sha256="09pqkqi0jydnin1xvzk9vardp0748mf21p84336swl9wjqfnagwb"; depends=[ggplot2 quantreg]; }; QRM = derive2 { name="QRM"; version="0.4-31"; sha256="15dyk3zfy92vj4xny04dh5mqcyb8qh61566m313qs17mxwibvn2a"; depends=[gsl Matrix mgcv mvtnorm numDeriv Rcpp timeDate timeSeries]; }; QRank = derive2 { name="QRank"; version="1.0"; sha256="1f924r5bf5vjfl12hk1n5m3f94g30f6vmvzq2bn8295dflyndck0"; depends=[quantreg]; }; QRegVCM = derive2 { name="QRegVCM"; version="1.2"; sha256="0fcydkf6r2qxd59ylr8vn76bkxks91v58gfzvq3rjd5mqf9vsaaq"; depends=[quantreg SparseM truncSP]; }; QSARdata = derive2 { name="QSARdata"; version="1.3"; sha256="0dhldnh0jzzb4assycc0l14s45ymvha48w04jbnr34lrwgr9krh4"; depends=[]; }; - QTL_gCIMapping = derive2 { name="QTL.gCIMapping"; version="3.3"; sha256="15c43n0cazgzfg1w36vqb5mp4ylsglzzgbdziiqsjqwrhj8hnc6d"; depends=[data_table doParallel foreach glmnet MASS openxlsx qtl Rcpp stringr]; }; - QTL_gCIMapping_GUI = derive2 { name="QTL.gCIMapping.GUI"; version="2.1"; sha256="0m1asf1np9snjb9fj4pzrp34iwrfij44ampvw4ca58fdpaiqmx9h"; depends=[data_table doParallel foreach glmnet MASS openxlsx qtl QTL_gCIMapping Rcpp shiny stringr]; }; + QTL_gCIMapping = derive2 { name="QTL.gCIMapping"; version="3.3.1"; sha256="01lxa52fm6pzicjg252fxqy9hcj0rf511nzc3fcq25cfi9cly0v1"; depends=[data_table doParallel foreach glmnet MASS openxlsx qtl Rcpp stringr]; }; + QTL_gCIMapping_GUI = derive2 { name="QTL.gCIMapping.GUI"; version="2.1.1"; sha256="0a155vl869i3li2i67b89p056x50ycqp9yk0ll5g3fp3xcdl80zs"; depends=[data_table doParallel foreach glmnet MASS openxlsx qtl QTL_gCIMapping Rcpp shiny stringr]; }; QTLRel = derive2 { name="QTLRel"; version="1.6"; sha256="1198qrrl7samm4jzliy5i8wfvladz6wpm48l1g2x6ackm1asiw75"; depends=[gdata lattice]; }; QTOCen = derive2 { name="QTOCen"; version="0.1.1"; sha256="0wlbxk1rd56k02jf3pfzbx6xx5mmf6sb7gvds0067cvb7m42ghcr"; depends=[MatrixModels quantreg Rdpack rgenoud survival]; }; - QUALYPSO = derive2 { name="QUALYPSO"; version="1.1"; sha256="0qpjv6krz66qfgyzndxihy5shmlsb0zs3wh49sxp00fh2bci5msw"; depends=[doParallel expm foreach MASS Rfast]; }; - QZ = derive2 { name="QZ"; version="0.1-9"; sha256="0i6cgywnfk8klsfr6x35fxzdshfhmps0b1fs5c7199r1rby0b3sc"; depends=[Matrix]; }; - Qtools = derive2 { name="Qtools"; version="1.5.2"; sha256="1nv8s0q6snpw8lvf5lm6yf8fcf5cb2c32vswp9b9garv4gai2zmk"; depends=[boot glmx Gmisc MASS Matrix mice np numDeriv quantreg Rcpp RcppArmadillo]; }; + QUALYPSO = derive2 { name="QUALYPSO"; version="1.2"; sha256="0hp99hhlv7rijn34ncshpvbnmhbx3f5km7bzr0z7yr7l3j1vx3sc"; depends=[doParallel expm foreach MASS Rfast]; }; + QZ = derive2 { name="QZ"; version="0.2-1"; sha256="1xivasa5dppm9z02ki6ciqxj0ybxch41w1xszl9zqrf755b6f6xw"; depends=[Matrix]; }; + Qapprox = derive2 { name="Qapprox"; version="0.1.0"; sha256="0mcrpmbpmj2hzv15a5rfc4l1vl3iccbsiw3a04zb4ql5mwr9ksyr"; depends=[]; }; + Qtools = derive2 { name="Qtools"; version="1.5.3"; sha256="02vaz2zmn1vmqmij7zsqxapsydwfabksn0v3ih6bwkxpnnh8kqnf"; depends=[boot glmx Gmisc gtools MASS Matrix np numDeriv quantreg Rcpp RcppArmadillo]; }; QuACN = derive2 { name="QuACN"; version="1.8.0"; sha256="1597blp8gqc5djvbgpfzi8wamvy0x50wh5amxj9cy99qa0jlglxi"; depends=[combinat graph igraph RBGL]; }; QuClu = derive2 { name="QuClu"; version="0.1.0"; sha256="0a2malh9vz5jcjgdx4d98k0c61vz3ip8ynqh5i85x8hzcby11qgj"; depends=[]; }; QualInt = derive2 { name="QualInt"; version="1.0.0"; sha256="1ms96m3nz54848gm9kdcydnk5kn2i8p1rgl2dwn7cqcqblfvsr4j"; depends=[ggplot2 survival]; }; Quandl = derive2 { name="Quandl"; version="2.10.0"; sha256="0kw3hh19q32vc1rr3y65ry3kyxc9dwyb94xpfv9srkpzg48damhr"; depends=[httr jsonlite xts zoo]; }; QuantNorm = derive2 { name="QuantNorm"; version="1.0.5"; sha256="1hds9ybwsgnmcpa22vlmgdq02ilhn0c6a7z1qjiq4i5iqjd4gwf6"; depends=[]; }; QuantPsyc = derive2 { name="QuantPsyc"; version="1.5"; sha256="1i9bh88r8zxndzjqsj14qw64gnvm5a9kvhjhzk3qsrvl3qzjgh93"; depends=[boot MASS]; }; - QuantTools = derive2 { name="QuantTools"; version="0.5.7"; sha256="069rvh4yfar5dh6aj6p0q61gasvs9wr72x9pnj00lvyjlnv06p5n"; depends=[data_table fasttime R6 Rcpp RCurl readxl]; }; - QuantifQuantile = derive2 { name="QuantifQuantile"; version="2.2"; sha256="01bdz8a6nhjil6n2z62x5g41v3d6md5v16g0ladsl5zc8raivqdq"; depends=[rgl]; }; + QuantTools = derive2 { name="QuantTools"; version="0.5.7.1"; sha256="1nkf7ihzfwgz7svh1jybgcvqwbim2dqzi00l4m9pma463va4q19d"; depends=[data_table fasttime R6 Rcpp RCurl readxl]; }; QuantileGradeR = derive2 { name="QuantileGradeR"; version="0.1.1"; sha256="1zwc6bg636gk8zll7wpznd3pzl611hcj2fmzp8b9505rra13p0g2"; depends=[]; }; QuantileNPCI = derive2 { name="QuantileNPCI"; version="0.9.0"; sha256="043lkg1pyaja7a4f9lmcwrvdjpfly2z378s15snwnxj8vb5pgr38"; depends=[]; }; QuantumClone = derive2 { name="QuantumClone"; version="1.0.0.6"; sha256="1520jgkzp8g7gv7ggqhvlrdnpdyhygqjgsd1my5jq30afdqj6qmp"; depends=[DEoptim doParallel foreach fpc ggplot2 gridExtra NbClust optimx]; }; QuantumOps = derive2 { name="QuantumOps"; version="3.0.1"; sha256="0gl1myf7q444imyvsjvxiaxaahf0n0bsggwbd0z3az73l6yf1gjh"; depends=[]; }; - Quartet = derive2 { name="Quartet"; version="1.1.0"; sha256="0sndc86dbd57hv75qm7g8611jayqfx4y6qp215bxgyskhscxv09v"; depends=[ape memoise Rcpp Rdpack Ternary TreeTools]; }; + Quartet = derive2 { name="Quartet"; version="1.2.2"; sha256="0yb4i55zvgn3al01qvr78v9psvn7b1x1fz69mmy3i010lqbyyjnq"; depends=[ape Rcpp Rdpack Ternary TreeTools viridisLite]; }; QuasiSeq = derive2 { name="QuasiSeq"; version="1.0-10-2"; sha256="1mr43vys9l1n859lzlcakjrvjllybgrwl0p8mc28h7m87yjkj670"; depends=[edgeR mgcv pracma]; }; R_SamBada = derive2 { name="R.SamBada"; version="0.1.2"; sha256="123a7s3rcmraq4chiqjkdp969jmr4c5br2xamdgvj6gzaf8zpmg0"; depends=[gdsfmt SNPRelate]; }; R_cache = derive2 { name="R.cache"; version="0.14.0"; sha256="1n8n5ihkryrbxv630dwhz4r048nyv676qd3i9f5z5fa04hvlxbqq"; depends=[digest R_methodsS3 R_oo R_utils]; }; R_devices = derive2 { name="R.devices"; version="2.16.1"; sha256="15zlnq3g27whq26fbcy5zfl5hiddm256h4rga4frblg6wqlbkvdd"; depends=[base64enc R_methodsS3 R_oo R_utils]; }; - R_filesets = derive2 { name="R.filesets"; version="2.13.0"; sha256="124rygq0bl9n4akxcm868nl30cyk3rz0iprb98zlpk62gci9f5fg"; depends=[digest R_cache R_methodsS3 R_oo R_utils]; }; + R_filesets = derive2 { name="R.filesets"; version="2.14.0"; sha256="08xv8b3c81nf54viyr3w912al18483k5gfnjpg7bxbdfk70dfzbh"; depends=[digest R_cache R_methodsS3 R_oo R_utils]; }; R_huge = derive2 { name="R.huge"; version="0.9.0"; sha256="13p558qalv60pgr24nsm6mi92ryj65rsbqa6pgdwy0snjqx12bgi"; depends=[R_methodsS3 R_oo R_utils]; }; R_matlab = derive2 { name="R.matlab"; version="3.6.2"; sha256="1fw6ny8xb2j088k3s9lzd15av3j6xc2bvbccyrp7yjx2f3s3i8qv"; depends=[R_methodsS3 R_oo R_utils]; }; - R_methodsS3 = derive2 { name="R.methodsS3"; version="1.8.0"; sha256="19c5870v7b59fs6xk58bh3rfkmhfralmgsax86zzpdmz47pga1g0"; depends=[]; }; - R_oo = derive2 { name="R.oo"; version="1.23.0"; sha256="189fb7mmyzwg6nn8rza8iip7fbyws7i2vkmzy672x9mhvgilq4pm"; depends=[R_methodsS3]; }; + R_methodsS3 = derive2 { name="R.methodsS3"; version="1.8.1"; sha256="16v1br7lf7vxv40z65giv9jnqkpnyqagcmgqa0s1jy7spj0zp64a"; depends=[]; }; + R_oo = derive2 { name="R.oo"; version="1.24.0"; sha256="1divisff26fmiqg6vmabnwlrx079c066r8qvkakfp336vnwdm89p"; depends=[R_methodsS3]; }; R_rsp = derive2 { name="R.rsp"; version="0.44.0"; sha256="0n9sxrffahgxcc8h9vgxg5i446g14cibixpf82nkpm5bvidhfsc9"; depends=[digest R_cache R_methodsS3 R_oo R_utils]; }; R_temis = derive2 { name="R.temis"; version="0.1.2"; sha256="1bar4vyjnc9plwqm66vbgf6rakgj095zb7wsypmf3j3az694y62q"; depends=[crayon explor FactoMineR igraph NLP slam SnowballC stringi testthat tm tm_plugin_alceste tm_plugin_europresse tm_plugin_factiva tm_plugin_lexisnexis wordcloud]; }; - R_utils = derive2 { name="R.utils"; version="2.9.2"; sha256="1krj1ny7y43lpm2q8c7swxfdc3ngy2j8knzv71f8bfsgh673nsxc"; depends=[R_methodsS3 R_oo]; }; + R_utils = derive2 { name="R.utils"; version="2.10.1"; sha256="1gssnk73nhisc20by9kvfl4byfsmwrk6597na0x40ycck58lyylm"; depends=[R_methodsS3 R_oo]; }; R0 = derive2 { name="R0"; version="1.2-6"; sha256="1yvcgchxlj7hkgqkw6g8pxnracxkld1grgykkcr6wbhminbylqv8"; depends=[MASS]; }; R1magic = derive2 { name="R1magic"; version="0.3.2"; sha256="1xfldr5y7pfdi6qljjvckknsv2wi9rnzwmqxkpgnyc96md2fvwjr"; depends=[]; }; R2019nCoV = derive2 { name="R2019nCoV"; version="0.1.0"; sha256="1959mwacn0zzq0g5ili2v6aqs51rb6qvlsv16xx7qwml8xahf215"; depends=[dplyr ggplot2 jsonlite maps pinyin]; }; @@ -3391,15 +3517,16 @@ in with self; { R2jags = derive2 { name="R2jags"; version="0.6-1"; sha256="0h5si5d8yn6zxbfmv38kmyqhpwm1valnnn3sb445465m8rafl5y6"; depends=[abind coda R2WinBUGS rjags]; }; R2ucare = derive2 { name="R2ucare"; version="1.0.0"; sha256="1nh2wf3syxjz9flxhf8x9fd2c2ndn4dha4k34lz1nq5j4qz7wfp1"; depends=[RMark stringr]; }; R330 = derive2 { name="R330"; version="1.0"; sha256="01sprsg7kph62abhymm8zfqr9bd6dhihrfxzgr4pzi5wj3h80bjm"; depends=[lattice leaps rgl s20x]; }; - R3port = derive2 { name="R3port"; version="0.2.3"; sha256="0m0nkmr0hj4dhb762vnin3iqhp6j4a73aslgz59wwlqi7v421vaj"; depends=[plyr reshape2 tinytex whisker]; }; + R3port = derive2 { name="R3port"; version="0.2.4"; sha256="0h1n5v1hkdqbars8xsid208wkr8jw9gwx5j2gprfl58fh0d2rc94"; depends=[plyr reshape2 tinytex whisker]; }; R4CouchDB = derive2 { name="R4CouchDB"; version="0.7.5"; sha256="1wd1yqbs8m4zqvdm6x7mrcyk5b5pr4azm3r49nrilg8fnr2bk9rz"; depends=[bitops RCurl RJSONIO]; }; - R6 = derive2 { name="R6"; version="2.4.1"; sha256="0gma5z41mx02ka9h96xdyf3p6i1rx0izczrzj26c4mbnh9jgvc16"; depends=[]; }; + R6 = derive2 { name="R6"; version="2.5.0"; sha256="00ifi2kwa7kn67xf0z1w6jfdicjczygbyi5mhfw2qlzc4sbazhdf"; depends=[]; }; R62S3 = derive2 { name="R62S3"; version="1.4.1"; sha256="0g01izg77spn79xqwva2gzrvk66i20xlb789wl5rgcz7pz7gpjd2"; depends=[data_table]; }; R6DS = derive2 { name="R6DS"; version="1.2.0"; sha256="0ai1yqfhn634vm88waxdb6j24vwcna29gdqzdrwm0nxwf7l6g0m3"; depends=[R6]; }; RAC = derive2 { name="RAC"; version="1.5"; sha256="0q0kk9j3blrnhv0rfmryc35lli5j4kds2vmjdpg77znagb45609k"; depends=[maps maptools matrixStats ncdf4 plotrix raster rgdal rgeos rstudioapi sp]; }; RAD = derive2 { name="RAD"; version="0.3"; sha256="0nmgsaykxavq2bskq5x0jvsxzsf4w2gqc0z80a59376li4vs9lpj"; depends=[MASS mvtnorm]; }; RADanalysis = derive2 { name="RADanalysis"; version="0.5.5"; sha256="1py07p24i1pky8wwyy8ajmkg6h2n7nbpxp1w6lrkiyl0p2kgjm20"; depends=[scales sfsmisc]; }; - RAINBOWR = derive2 { name="RAINBOWR"; version="0.1.19"; sha256="1h5z8dwla6bzl0chgczy68dqilxwldaabl0jc8xg3zp30yghxf4g"; depends=[ape cluster MASS Matrix optimx pbmcapply Rcpp RcppEigen rgl rrBLUP stringr]; }; + RAINBOWR = derive2 { name="RAINBOWR"; version="0.1.21"; sha256="076x39rm20j4v7s1c1j0dck7kbwnzm6ddaxd46h9j112f0r5ka76"; depends=[ape cluster expm ggimage ggplot2 ggtree haplotypes MASS Matrix optimx pbapply pbmcapply pegas phylobase Rcpp RcppEigen rgl rrBLUP scatterpie stringr]; }; + RALSA = derive2 { name="RALSA"; version="0.90.1"; sha256="1yssxzyii7jhki8c4mmi8l5z8p81p0hds7lq8y77kd0xflq9mxa6"; depends=[data_table DT foreign gdata Hmisc openxlsx readr shiny shinydashboard shinyFiles shinyjs stringi stringr]; }; RAM = derive2 { name="RAM"; version="1.2.1.7"; sha256="0aalswivpjs1glwf4yh3b79lch3n32fyj5xda55h3v7gzs7p0d7f"; depends=[ade4 ape data_table FD ggmap ggplot2 gplots gridExtra labdsv lattice MASS permute phangorn phytools plyr RColorBrewer reshape reshape2 RgoogleMaps scales vegan VennDiagram]; }; RAMP = derive2 { name="RAMP"; version="2.0.2"; sha256="0836fiycrsxiwdw7srz1rvsf639iqh2rk89gavx4kvn0i0sc8d2x"; depends=[]; }; RAMpath = derive2 { name="RAMpath"; version="0.4"; sha256="0blixfmgiq22hd356hrp4vbhfkkgh0a58143nhirjx3sav9pxc1v"; depends=[ellipse lavaan MASS]; }; @@ -3408,15 +3535,15 @@ in with self; { RAP = derive2 { name="RAP"; version="1.1"; sha256="18dclijs72p6gxawpg8hk7n512ah4by5jfg2jnrp8mz79ajmdgir"; depends=[]; }; RAPIDR = derive2 { name="RAPIDR"; version="0.1.1"; sha256="14cnw4jjs5anb55zlg1yj6qc9yr51rsamigq2q7h8ypj2ggnna1d"; depends=[Biostrings data_table GenomicAlignments GenomicRanges PropCIs Rsamtools]; }; RAPTOR = derive2 { name="RAPTOR"; version="1.0.1"; sha256="1bj3xsl83mb8zwap8icywrfdld382fram79b0n14jbk1l87rj9r4"; depends=[mgcv]; }; - RATest = derive2 { name="RATest"; version="0.1.7"; sha256="0xam006fp8qapq2lggpa0bq33qi1ziads6kfsqprdgvcfk64qzsn"; depends=[ggplot2 gridExtra quantreg]; }; + RATest = derive2 { name="RATest"; version="0.1.8"; sha256="13z2dlyq3cxgqphzjfx4wabbkk4kf33ybmnhcs6f034kya2z7yj3"; depends=[ggplot2 gridExtra quantreg]; }; RAdwords = derive2 { name="RAdwords"; version="0.1.18"; sha256="1c3m2j2cf1s51p783rdng5ns913bv7rbjc1vpmrmsxg2kf5f6qyq"; depends=[RCurl rjson]; }; RAhrefs = derive2 { name="RAhrefs"; version="0.1.4"; sha256="0yd7jbv2x711dnhbvwjjg7qhg8h8bh5564amsv9bkqw661i042m3"; depends=[assertthat httr jsonlite testthat]; }; RApiDatetime = derive2 { name="RApiDatetime"; version="0.0.4"; sha256="0z08xwdn3vzwmprx5yh2xip5bqk13zrd47lwnsa2yin2phz6yry1"; depends=[]; }; RApiSerialize = derive2 { name="RApiSerialize"; version="0.1.0"; sha256="0gm2j8kh40imhncwwx1sx9kmraaxcxycvgwls53lcyy2ap344k9j"; depends=[]; }; - RAppArmor = derive2 { name="RAppArmor"; version="3.2.1"; sha256="0n75clpha3452jqk4idb6kffc4zw3vim60k5wh7ajcpwab10j94s"; depends=[unix]; }; - RAthena = derive2 { name="RAthena"; version="1.10.0"; sha256="116h61850spygvkx64bd8jq9gx5s72bk4cnf70mmyjxbkiyvg3ps"; depends=[data_table DBI reticulate]; }; + RAppArmor = derive2 { name="RAppArmor"; version="3.2.2"; sha256="0l0f4k666nh00db94sjxz60anr4l9vm0259pcc2a4whk2pmjcq5n"; depends=[unix]; }; + RAthena = derive2 { name="RAthena"; version="1.11.1"; sha256="0fb7hnlxkjcwxmjcyiwxhj697zqbcyn96lpvf7x8cviivgx8xldk"; depends=[data_table DBI reticulate uuid]; }; RBF = derive2 { name="RBF"; version="2.0.1"; sha256="1jkjyhb9mdqh59cnyn5x83624cy1wg328x83l422qyh20nckvszp"; depends=[]; }; - RBMRB = derive2 { name="RBMRB"; version="2.1.2"; sha256="1m6n2kfg83mlfy22k75hy5zjf547v0rdwk9w6l04yfyrr6himbr8"; depends=[data_table ggplot2 httr plotly rjson]; }; + RBMRB = derive2 { name="RBMRB"; version="2.1.4"; sha256="1n5kskcsw0ks3f97mnlbkgvwdnxv3s6xy02b8cj5wq3hdpf66h94"; depends=[data_table ggplot2 httr plotly rjson]; }; RBNZ = derive2 { name="RBNZ"; version="1.1.0"; sha256="11fdnc2pmw5nq3lswid078l307ln6853a3b9d383msvrkz6yms26"; depends=[httr lubridate readxl rvest xml2]; }; RBPcurve = derive2 { name="RBPcurve"; version="1.2"; sha256="0zkfvnhm780vid4qqdrx9mnc6jxxrmrnq47pqvk35rm3m4l96782"; depends=[BBmisc checkmate mlr shape TeachingDemos]; }; RBaseX = derive2 { name="RBaseX"; version="0.3.0"; sha256="15hn04ijvqbza8brca7g06yi621hyf3gjgkfvf1wp4jgzysgd8ww"; depends=[data_table dplyr magrittr openssl R6 RCurl stringr tibble]; }; @@ -3424,14 +3551,15 @@ in with self; { RBitmoji = derive2 { name="RBitmoji"; version="0.0.2"; sha256="1v9qj3vmqsvnccsy735nbflmd81183h2flm0f1ckd4kl08r2fr3f"; depends=[getPass httr jsonlite png RCurl]; }; RBtest = derive2 { name="RBtest"; version="1.1"; sha256="09da721zfj6cw4i9gifn5f0sv3nj0qfjb96c5w9g9gzx55ihssnk"; depends=[mice nnet psych]; }; RCA = derive2 { name="RCA"; version="2.0"; sha256="0pidb5czrf0dc3ywy6cwm5akgsc62pvf94kfyxibzmd1favykx1h"; depends=[gplots igraph]; }; - RCAL = derive2 { name="RCAL"; version="1.0"; sha256="1hpn69891h9cildwr6wsssa3fnnzyw0xw9vfgf4qdg0m9x6il6qb"; depends=[trust]; }; + RCAL = derive2 { name="RCAL"; version="2.0"; sha256="1k58im8dclyaqqcqm6v9618rlh8jkp74j7ly2lvqfb9jm0wgkx8h"; depends=[trust]; }; RCALI = derive2 { name="RCALI"; version="0.3.1"; sha256="0hc7h55qi8bpmp9rfh1wgxqs28kbs4yqxch2jlgl42vk5383askq"; depends=[splancs]; }; + RCBR = derive2 { name="RCBR"; version="0.5.9"; sha256="1nxaf485jfg1kr80bxwczf27xz5ab7yz61c5l3bg9192jdf432ql"; depends=[Formula Matrix mvtnorm orthopolynom REBayes Rmosek]; }; RCEIM = derive2 { name="RCEIM"; version="0.3"; sha256="1kil5r88b6lf8vxmswz0wn0hhjxjm8jmlcl5kxjwl6fwjyy2z120"; depends=[]; }; + RCGLS = derive2 { name="RCGLS"; version="1.0.3"; sha256="12mmfs91fmhdxdxr7q16hnjlg7bz2bbkf8chld4cyf8clnflzvsj"; depends=[ncdf4 raster RCurl sp]; }; RCPmod = derive2 { name="RCPmod"; version="2.190"; sha256="1r24g8fcizyqzgp0da90sxpwalgcsgz2b168j2smpylxraiqb037"; depends=[fishMod glmnet gtools MASS]; }; RCRnorm = derive2 { name="RCRnorm"; version="0.0.2"; sha256="1mz1jb7mc9c47hbk9flnddny4zir6r2k5qis30iynwqny521l6ln"; depends=[truncnorm]; }; RCSF = derive2 { name="RCSF"; version="1.0.2"; sha256="1hjl7qsdgcddn3nh2likndhfhnw9gj3453xqq96gddgb1y0m3bh1"; depends=[Rcpp]; }; - RCT = derive2 { name="RCT"; version="1.0.3"; sha256="04p9pc9s7gwjly5d8c7xa2x9y7jz1mcf8jxbjql1x2wvwsbmkq6z"; depends=[broom dplyr forcats ggplot2 glue lfe magrittr MASS pracma purrr rlang stringr tidyr tidyselect]; }; - RCarb = derive2 { name="RCarb"; version="0.1.3"; sha256="0z5hpnlzlvbh14f1wjy9rw4ljdsiqdzmqnmh3yqz7mbw5qxx4gzz"; depends=[interp matrixStats]; }; + RCarb = derive2 { name="RCarb"; version="0.1.4"; sha256="0mlas45ypwdkk6gr35fhsrjgn8am06ikh123drmky1yj1kkg6p76"; depends=[interp matrixStats]; }; RCassandra = derive2 { name="RCassandra"; version="0.1-3"; sha256="0xa241s81cyw6lfjb522f2mlyrd0gav9yz3z5jab9hpdpgg9ri38"; depends=[]; }; RChronoModel = derive2 { name="RChronoModel"; version="0.4"; sha256="0haqxwic160pnnm90bgchzxmsdwmi6m97i9xrh8js8bp2xn76l5f"; depends=[hdrcde]; }; RCircos = derive2 { name="RCircos"; version="1.2.1"; sha256="1zdq3ga2pd0p2gzlm0vr8w3a4rq4hgka3r56kkcym0za0nmqk51v"; depends=[]; }; @@ -3442,7 +3570,8 @@ in with self; { RConics = derive2 { name="RConics"; version="1.0"; sha256="1lwr7hi1102gm8fi9k5ra24s0rjmnkccihhqn3byckqx6y8kq7ds"; depends=[]; }; RCriteo = derive2 { name="RCriteo"; version="1.0.2"; sha256="1vyhnblw9zr5h6c25lf76p9vn95k8vr0hpq1sjkccdwl9yvsyhfy"; depends=[httr plyr RCurl XML]; }; RCurl = derive2 { name="RCurl"; version="1.98-1.2"; sha256="1a57jm41550ah3v7cqdv5gdabhp375qgcndr901lns65qg6s0x2x"; depends=[bitops]; }; - RCzechia = derive2 { name="RCzechia"; version="1.5.1"; sha256="1mxkwrlfg16vpah865lj0519a3vr5icbwsdj33bybkn4gmxfjl3a"; depends=[curl dplyr httr jsonlite magrittr rlang sf]; }; + RCytoGPS = derive2 { name="RCytoGPS"; version="1.0.1"; sha256="0n0vc9r8wd0ccxgadkggjvzim5fjg4hjscs1n037ndgmks02pf3m"; depends=[rjson]; }; + RCzechia = derive2 { name="RCzechia"; version="1.6.1"; sha256="043zsswggi5ckdldjacjgbw2bhyz4jhy9m731rb1rk458jy1k5d3"; depends=[curl httr jsonlite magrittr sf]; }; RDFTensor = derive2 { name="RDFTensor"; version="1.2"; sha256="0ijqb78wwjgz2x52z4zr1mn0lmcj8c0gx04j67cld8zfcqkn0mpg"; depends=[doParallel foreach Matrix pracma]; }; RDIDQ = derive2 { name="RDIDQ"; version="1.0"; sha256="09gincmxv20srh4h82ld1ifwncaibic9b30i56zhy0w35353pxm2"; depends=[]; }; RDML = derive2 { name="RDML"; version="1.0"; sha256="13ly1p42njbcygwvkyii8sjqbsywjy5w5g1kd7m8kswi5dsk3qqv"; depends=[checkmate data_table lubridate pipeR R6 readxl rlist stringr xml2]; }; @@ -3453,15 +3582,14 @@ in with self; { RDieHarder = derive2 { name="RDieHarder"; version="0.2.1"; sha256="1lz5qb51r321wxarnzaf37zxg19fcq8blw2qw3kspgbkvx283l0w"; depends=[]; }; RDocumentation = derive2 { name="RDocumentation"; version="0.8.2"; sha256="0qdn3c5xbjyrhk56wfch50xpyyfd4f79hs0v00cqk9iwsnjlwmb5"; depends=[httr proto rjson]; }; RDota2 = derive2 { name="RDota2"; version="0.1.6"; sha256="0fjsgg4dmzw2xwrf8jxq0f2d7f78bf67bl3ms5qcjk9kskfnymag"; depends=[httr jsonlite]; }; - REAT = derive2 { name="REAT"; version="3.0.2"; sha256="0x5cal502n8abynx1jk2ccmmggvd41rvd2gc6rxkbyvcp4794l82"; depends=[]; }; REBayes = derive2 { name="REBayes"; version="2.2"; sha256="1jh5vw9pbcf5gpmx3b5b36fh8rz5y8npx53aai0kxh49kjf8d63c"; depends=[Matrix reliaR]; }; RECA = derive2 { name="RECA"; version="1.7"; sha256="1xikj20flqajpkw4wyynmqd1pafbylzwfrmc8bz9pqgggjjhrqql"; depends=[]; }; REDCapExporter = derive2 { name="REDCapExporter"; version="0.2.1"; sha256="14hnqjp53w4dl0fwlkr9x9qqm022280r0069akiz4c9axlmyds9r"; depends=[curl data_table keyring lubridate]; }; REDCapR = derive2 { name="REDCapR"; version="0.11.0"; sha256="0frhmnm25w9b84qk7vvvr8wkv1w3dmm0vqxav2cs7jimq38zwcvz"; depends=[checkmate dplyr httr magrittr readr rlang tibble tidyr]; }; - REEMtree = derive2 { name="REEMtree"; version="0.90.3"; sha256="01sp36p12ky8vgsz6aik80w4abs70idr9sn4627lf94r92wwwsbc"; depends=[nlme rpart]; }; REGENT = derive2 { name="REGENT"; version="1.0.6"; sha256="1f2sjqkhw3rbmwbcmx7l7imj696kblisi8y3fz77xygbcbxa6rmq"; depends=[]; }; REPLesentR = derive2 { name="REPLesentR"; version="0.4.1"; sha256="0rwd7hxk12f4f1kpj6sl424yhbxi3h9dz6km5awijazmgv95carz"; depends=[dat knitr modules]; }; REPPlab = derive2 { name="REPPlab"; version="0.9.4"; sha256="1pf8zrjdzziyq2lw31p1ij7cn4j7pf659ygxv8wpfnmcmpaqbc45"; depends=[lattice LDRTools rJava]; }; + REPPlabShiny = derive2 { name="REPPlabShiny"; version="0.4.1"; sha256="0wim27jm01xbi316jfz5j30sid7z1wsznhrpmxrbd97d4312449w"; depends=[DT REPPlab shiny]; }; REPTILE = derive2 { name="REPTILE"; version="1.0"; sha256="11swy4jrmmb0xjjxm1wyxd628fxxcqnialvijdrjwjpdbvraz4gq"; depends=[doParallel flux foreach optparse randomForest]; }; REQS = derive2 { name="REQS"; version="0.8-12"; sha256="049glqhc8h8gf425kmj92jv70917dsigpm37diby0c6hb4jrg8ka"; depends=[gtools]; }; REREFACT = derive2 { name="REREFACT"; version="1.0"; sha256="0nggva4qfqlcs58df3sgiigw0z75l5kg8c1yh0k5qsvjnhiq19vn"; depends=[combinat gdata Matrix psych]; }; @@ -3470,7 +3598,8 @@ in with self; { REdaS = derive2 { name="REdaS"; version="0.9.3"; sha256="09mmcvzgsxvrcq7sq3pw81pxgb1493p8lx8p5hhz8i42vshza6pn"; depends=[]; }; REddyProc = derive2 { name="REddyProc"; version="1.2.2"; sha256="0b1vyv92wxbvdh1jaqmfb4qb1clpbh50j8h55nq777zc1l9ml4a7"; depends=[dplyr magrittr mlegp purrr Rcpp rlang solartime tibble]; }; REddyProcNCDF = derive2 { name="REddyProcNCDF"; version="1.1.4"; sha256="099f4mzqj7pjlrs8rdjg44mjm0058x3pj2imrfvk892hmlk4r53p"; depends=[REddyProc]; }; - REndo = derive2 { name="REndo"; version="2.4.0"; sha256="0rm5fizgqjwsh6n4ld2vr3i7ynxx8dsxh9vfvn6khjnc78l4jlwp"; depends=[AER corpcor data_table Formula lme4 lmtest Matrix mvtnorm optimx Rcpp RcppEigen]; }; + REndo = derive2 { name="REndo"; version="2.4.1"; sha256="0knyyc2l2lsr0wrswhvsqsac1k257j46hii84xdl4nhwqch9qzxi"; depends=[AER corpcor data_table Formula lme4 lmtest Matrix mvtnorm optimx Rcpp RcppEigen]; }; + RFCCA = derive2 { name="RFCCA"; version="1.0.2"; sha256="17zqk95zlm00vhj55yz828kqpkx9bhwg1m6f4s7ij9bcmx72l2gq"; depends=[CCA PMA]; }; RFGLS = derive2 { name="RFGLS"; version="1.1"; sha256="13ggxj74h5b2hfhjyc50ndxznkvlg18j80m78hkzwh25d3948fsk"; depends=[bdsmatrix Matrix]; }; RFLPtools = derive2 { name="RFLPtools"; version="1.6"; sha256="1hl2crg7jl266zac41xvx151h7kl52346wnlvd8hba64s4s4apay"; depends=[RColorBrewer]; }; RFOC = derive2 { name="RFOC"; version="3.4-6"; sha256="0cs5wmpvrlag9aisbfiwkvwcb3skv5z4sawl30krmsq49mzj7yhd"; depends=[GEOmap MASS RPMG RSEIS splancs]; }; @@ -3485,7 +3614,6 @@ in with self; { RGCCA = derive2 { name="RGCCA"; version="2.1.2"; sha256="0zcxakqnmih0243y5b6r9nmcfanzxd6q344pd5bca5pnm3y43wr0"; depends=[Deriv MASS]; }; RGCxGC = derive2 { name="RGCxGC"; version="1.1-2"; sha256="03ihqra8q50a98adgxrx8l7js963f41kg2fy3lxzh9zma4gzj62q"; depends=[colorRamps mixOmics ptw Rdpack RNetCDF]; }; RGENERATE = derive2 { name="RGENERATE"; version="1.3.5"; sha256="12dq04xpl06zhkzwqx3zy0bkpvb5phbdj2inxsyczf6d4dk209mb"; depends=[RMAWGEN]; }; - RGENERATEPREC = derive2 { name="RGENERATEPREC"; version="1.2.5"; sha256="1jqyp91x569la1vc6wl6v7jq6iq1cx2qkds9yiqm85bgzydp4lxw"; depends=[blockmatrix copula Matrix RGENERATE RMAWGEN stringr]; }; RGF = derive2 { name="RGF"; version="1.0.6"; sha256="11pnbiyp39r95c8ajj2jyxz4h1zf6fi8ki78rmn4vp7xm2bl3zff"; depends=[Matrix R6 reticulate]; }; RGIFT = derive2 { name="RGIFT"; version="0.1-5"; sha256="1745fs4bq0ss39fiwljspvrmnkgbbpc1fjvhvcrsmp2iizq12sgn"; depends=[]; }; RGISTools = derive2 { name="RGISTools"; version="1.0.2"; sha256="0pildj5pmc34f58bv39gxl3p2g0cr32przdhjnss37kcdlcv5zlb"; depends=[curl fields httr mapview raster Rdpack rjson rvest sf sp stars tmap urltools XML xml2]; }; @@ -3502,14 +3630,15 @@ in with self; { RH2 = derive2 { name="RH2"; version="0.2.4"; sha256="14590l3a2znd56nrq1zfbfv7fgii4672qy1xfwiynrh3mjad217k"; depends=[chron rJava RJDBC]; }; RHMS = derive2 { name="RHMS"; version="1.6"; sha256="067vxx0s338ziyyshq386br7b8ksycqinn16qnvb53ldshyw0dcm"; depends=[GGally ggplot2 Hmisc network pso]; }; RHPCBenchmark = derive2 { name="RHPCBenchmark"; version="0.1.0"; sha256="1f94d8z15ybqgc2pccsi1m6563xf26ygri6f4pwxkqjmxkxnk34y"; depends=[cluster Matrix mvtnorm]; }; - RHRV = derive2 { name="RHRV"; version="4.2.5"; sha256="1xjmcb9w285x3q930hm91ln4b8zhd9s741h5iwd71pj0cdf184gh"; depends=[lomb nonlinearTseries tkrplot waveslim]; }; + RHRV = derive2 { name="RHRV"; version="4.2.6"; sha256="1rdfq1xnimli709waypwhw1v277hxhmiy7ziizgqi4522nip4h49"; depends=[lomb nonlinearTseries waveslim]; }; + RHSDB = derive2 { name="RHSDB"; version="0.1.0"; sha256="1vhx5q19pi91283d20cc7950f01cqq8frbmxaf9kvxbv6pijhdk9"; depends=[]; }; RHT = derive2 { name="RHT"; version="1.0"; sha256="1gxf8nhj3y92h8al7l3fxa45wc568kb3cykrbdjlsy2zjacf7fcc"; depends=[]; }; RHawkes = derive2 { name="RHawkes"; version="0.0"; sha256="0qi32f6im6fsgvjs8bravc5z21557zn2d0a7i88dy0rri7czm5p7"; depends=[IHSEP]; }; RI2by2 = derive2 { name="RI2by2"; version="1.3"; sha256="0smc0fb9anq5ih9zx2slfbqyx02njm0hc7g22gpfggskmxf2l509"; depends=[gtools Rcpp]; }; RIA = derive2 { name="RIA"; version="1.4.2"; sha256="0i7z16viwgdsdnlkxq44p5l492asxv7ghn8005hlvpyxqihazkqw"; depends=[nat oro_dicom oro_nifti]; }; RIFS = derive2 { name="RIFS"; version="0.1-5"; sha256="0705dhirh7bhy2yf3b1mpk3m7lggg4pwy640lvaspwaxkd6zac5w"; depends=[]; }; - RISCA = derive2 { name="RISCA"; version="0.8.2"; sha256="16vpbg0grl497y5r6a3vm0nj1si6qbc6xxiyjb4wsmfgk13rw1dp"; depends=[caret date doParallel foreach glmnet kernlab MASS mvtnorm nlme nnet relsurv statmod SuperLearner survival]; }; - RISmed = derive2 { name="RISmed"; version="2.1.7"; sha256="08dmkkxsmwp9b4h2g1bbx03cijn793fsnzkmbima8x9d42vxnm1l"; depends=[]; }; + RISCA = derive2 { name="RISCA"; version="0.9"; sha256="0fq474xv8dcj548wm3dydz70cgvmgrz3h8q1mlzyrxbbwrvzx8wm"; depends=[caret date doParallel foreach glmnet kernlab MASS mvtnorm nlme nnet relsurv statmod SuperLearner survival]; }; + RISmed = derive2 { name="RISmed"; version="2.2"; sha256="0nwixhngi4r2f73362salivsmsf7l52bm13jqvhdq8mfiigm80vd"; depends=[]; }; RIdeogram = derive2 { name="RIdeogram"; version="0.2.2"; sha256="0wvzlnisnxwzdzfh8ph4yspr8abi5qk6p4z2qa14ykzn8yry61ni"; depends=[ggplot2 grImport2 rsvg scales tidyr]; }; RImageJROI = derive2 { name="RImageJROI"; version="0.1.1"; sha256="0a4sa60klbpl31qxxvjjbksdhvs3vwm9na1v7014v93fzxy6bjas"; depends=[spatstat]; }; RImagePalette = derive2 { name="RImagePalette"; version="0.1.1"; sha256="054w8xzsn330qg7piq6ajhji9na2swkkdis2567cy3q099npfl5v"; depends=[ggplot2]; }; @@ -3522,7 +3651,8 @@ in with self; { RJSDMX = derive2 { name="RJSDMX"; version="2.3-3"; sha256="02lbg82g4abng5vcn2g8ghvmg69q35my8smnbvd09yvha8hb49ps"; depends=[rJava zoo]; }; RJSONIO = derive2 { name="RJSONIO"; version="1.3-1.4"; sha256="141ijm9570mg1180isvi0jb9vd3b08s5gb9dl1wa5v0m3s9jq52l"; depends=[]; }; RJSplot = derive2 { name="RJSplot"; version="2.5"; sha256="0p2zqbq29pfjl703wqqjzgmif7yfzz7l8rzarjf5axkdy7w7fcyl"; depends=[]; }; - RJafroc = derive2 { name="RJafroc"; version="1.3.2"; sha256="11waf05ljzfrizsbb2y6bd2cd8k7950kbq26sfyfgf4idh5w0mbp"; depends=[bbmle binom dplyr ggplot2 mvtnorm numDeriv openxlsx Rcpp stringr]; }; + RJafroc = derive2 { name="RJafroc"; version="2.0.1"; sha256="1vrjnqn1lv10945ba29zjlbkh3zyw28ppv4093v24lirw8vzmjp4"; depends=[bbmle binom dplyr ggplot2 mvtnorm numDeriv openxlsx Rcpp readxl stringr]; }; + RJcluster = derive2 { name="RJcluster"; version="0.1.0"; sha256="0pjabvh006gplds5h2wq5k7cwzp8rksamzvy3daahhbadvar4jr8"; depends=[doParallel foreach infotheo matrixStats mclust profvis Rcpp RcppArmadillo rlang]; }; RKEA = derive2 { name="RKEA"; version="0.0-6"; sha256="1dncplg83b4zznh1zh90wr8jv5259cy93imrry86c5kqdijmhrrp"; depends=[rJava RKEAjars tm]; }; RKEAjars = derive2 { name="RKEAjars"; version="5.0-4"; sha256="1j4643xc8k3zy4rv0h8dd154jafihnjr43wzz3d93j11g2w9xhq3"; depends=[rJava]; }; RKEEL = derive2 { name="RKEEL"; version="1.3.2"; sha256="120x49zblhs7grqj919m3ll9q5ddr3kkqicy1am5b8hahybiz5al"; depends=[arules doParallel foreach gdata Matrix pmml R6 rJava RKEELdata RKEELjars XML]; }; @@ -3536,80 +3666,84 @@ in with self; { RLT = derive2 { name="RLT"; version="3.2.2"; sha256="1a8cip975z99g8ljng4y86wv1gf1xwg0sqnxz79wj6zxpw8fk37c"; depends=[]; }; RLeafAngle = derive2 { name="RLeafAngle"; version="1.0"; sha256="1anks22hn6qpac556p99kilkhc80h572dvcyz3wj1nqffdrhgrh3"; depends=[]; }; RLogicalOps = derive2 { name="RLogicalOps"; version="0.1"; sha256="1qyn80x3x3bb5wgzyzw6pxs8a6q26yq1fkmkz7f5wywsnrj8hzfj"; depends=[rstackdeque stringr]; }; - RLumCarlo = derive2 { name="RLumCarlo"; version="0.1.6"; sha256="0pprmsd20wqlwbyf9s26p8znpa3i7zj9rn9fhlhhca1zlh0m6ziw"; depends=[abind doParallel foreach khroma magrittr Rcpp RcppArmadillo scatterplot3d]; }; + RLumCarlo = derive2 { name="RLumCarlo"; version="0.1.7"; sha256="1r70d68y3l43pb47wxhhbgbirnnx0hyaklvphlqrhnlkxp04r4xk"; depends=[abind doParallel foreach khroma magrittr Rcpp RcppArmadillo scatterplot3d]; }; + RLumModel = derive2 { name="RLumModel"; version="0.2.7"; sha256="03ydiccwj5a3m2wxhz40za546bw83s2lmcz7akdwx6ms6azdd9kk"; depends=[deSolve Luminescence Rcpp RcppArmadillo]; }; RLumShiny = derive2 { name="RLumShiny"; version="0.2.2"; sha256="0rwl555564ccw4pdzya88s3h3q30iq5dmi77141ji8ir91x4rz3g"; depends=[data_table DT googleVis knitr Luminescence RCarb readxl rhandsontable rmarkdown shiny shinydashboard shinyjs]; }; RM_weights = derive2 { name="RM.weights"; version="2.0"; sha256="1by1z7gwwx0jjhhvsjkr7f6m7n0x43bj080ah5275cja7xqr5nm6"; depends=[Hmisc psychotools]; }; RM2 = derive2 { name="RM2"; version="0.0"; sha256="1v57nhwg8jrpv4zi22fhrphw0p0haynq13pg9k992sb0c72dx70a"; depends=[msm]; }; - RM2006 = derive2 { name="RM2006"; version="0.1.0"; sha256="1qjvdh89jql1fl6ia76g766y1igkshlv0slqmpi0y3bn40413snb"; depends=[]; }; + RM2006 = derive2 { name="RM2006"; version="0.1.1"; sha256="1bx2y58c8fkpv0d1sn5abxbajks3sbz2v00idnvbp7rw1i05i5q4"; depends=[]; }; RMAWGEN = derive2 { name="RMAWGEN"; version="1.3.7"; sha256="10hgssy59fcjbv333grpf6f3m7924hav66xxqhdlsdnwix19q7sb"; depends=[chron date vars]; }; RMKL = derive2 { name="RMKL"; version="1.0"; sha256="118xdnzljskyf4ibdrlhy07r1y1x5r2b0mqagqaabxs7s9503whc"; depends=[caret e1071 kernlab Rcpp RcppArmadillo]; }; RMKdiscrete = derive2 { name="RMKdiscrete"; version="0.1"; sha256="0b4adw46sn98qmy4nxv5l5svcjrp5532x7slfhhgsskqx408lzjf"; depends=[]; }; + RMLPCA = derive2 { name="RMLPCA"; version="0.0.1"; sha256="1xzh6fwl71dzdpbqgpkqnmdzdk8rblg6n1ddic5yxxfvzg3bh13x"; depends=[Matrix pracma RSpectra]; }; RMOA = derive2 { name="RMOA"; version="1.0.1"; sha256="1ppbwqdfxzk1ayms0rqw22l0r8vkk8av39spwpq8avgl6vssw8c4"; depends=[rJava RMOAjars]; }; RMOAjars = derive2 { name="RMOAjars"; version="1.0.1"; sha256="0qzpwsbndn8fw9560z9h9w9ff9bx6xj7mr50683q1n3dpn5z637i"; depends=[rJava]; }; RMPSH = derive2 { name="RMPSH"; version="1.1.1"; sha256="0jffp8942ydwain23kvy7q6avpxxsb77jj1mg4bq43fwgfc9nqjy"; depends=[Rcpp]; }; - RMPSS = derive2 { name="RMPSS"; version="1.1.1"; sha256="0577z4jmzdirc32ibsnc6gslqjni75w6a1vvybxksaf0lmc0mdz6"; depends=[Rcpp]; }; + RMSNumpress = derive2 { name="RMSNumpress"; version="1.0"; sha256="0vc35ciaz03agq2cmlmy54dc0yq0c9d6zm0p04nd5pyaq5rlf318"; depends=[Rcpp]; }; RMTL = derive2 { name="RMTL"; version="0.9"; sha256="08da67wvzmibziqhnlzh43sydaihk4rsq2k5hs6ih3jkkidrhlgv"; depends=[corpcor doParallel foreach MASS psych]; }; RMThreshold = derive2 { name="RMThreshold"; version="1.1"; sha256="0wkc42vcggib002ad6ch43h6avpdgl12szrrrfd2p0wl72cwn5n1"; depends=[Matrix png]; }; RMTstat = derive2 { name="RMTstat"; version="0.3"; sha256="1nn25q4kmh9kj975sxkrpa97vh5irqrlqhwsfinbck6h6ia4rsw1"; depends=[]; }; RMaCzek = derive2 { name="RMaCzek"; version="1.3.4"; sha256="1pg19jx74zdslbffw04agr9fn72sm4ad38rlwgncm84l75m107mr"; depends=[GA seriation]; }; RMallow = derive2 { name="RMallow"; version="1.1"; sha256="1s6a3347739rfc8rrh2773b278gcbp8hf5j5psm61fz7bavy9gcj"; depends=[combinat]; }; - RMariaDB = derive2 { name="RMariaDB"; version="1.0.9"; sha256="0gvs8k70jjy6pymc7l02c2p2inxpgphg5hsvwm2q834clr4xllxi"; depends=[BH bit64 DBI hms plogr Rcpp]; }; + RMariaDB = derive2 { name="RMariaDB"; version="1.0.11"; sha256="0rv41khf13b8vzrb5fl6sgrn1dyfn1d2mvn6ypn68r82q6b3984g"; depends=[BH bit64 DBI hms plogr Rcpp]; }; RMark = derive2 { name="RMark"; version="2.2.7"; sha256="0qxa383cagzqrnfc3izybb4lrg8z1r3nw1j5b7h4wkjwy0k3kczb"; depends=[coda matrixcalc msm]; }; RMediation = derive2 { name="RMediation"; version="1.1.4"; sha256="19idqx0hwljbcfrpqwa81k7cxbd8kv77ji8yi4n4p7517jbkzma6"; depends=[e1071 lavaan MASS]; }; RMixpanel = derive2 { name="RMixpanel"; version="0.7-1"; sha256="1xwmmfvky49n1l0w3kwcyaf2h4rhzz4k5icjwvpc90fqk8sxib6a"; depends=[base64enc jsonlite RCurl uuid]; }; RMixtComp = derive2 { name="RMixtComp"; version="4.1.2"; sha256="1a7digfxx0wx1p0fvyvhznffzd13lzf64c2y6gvrgj7wv2z8hg5k"; depends=[ggplot2 plotly RMixtCompIO RMixtCompUtilities scales]; }; - RMixtCompIO = derive2 { name="RMixtCompIO"; version="4.0.5"; sha256="14xr8ysg9avqhry19iykdg17h0hg8ms15isxcmcvn03q0cap8vim"; depends=[BH doParallel foreach Rcpp RcppEigen]; }; - RMixtCompUtilities = derive2 { name="RMixtCompUtilities"; version="4.1.2"; sha256="1wasg6d3yr5pwwmaflc1ph3vz6s3wgcqxlzrygfaqvaqgg8llk03"; depends=[ggplot2 plotly scales]; }; - RMySQL = derive2 { name="RMySQL"; version="0.10.20"; sha256="0lv9m6zpm8dgv7yixr6xhw379vbq45d7n7gkrmjrppdj8vcih77i"; depends=[DBI]; }; + RMixtCompIO = derive2 { name="RMixtCompIO"; version="4.0.6"; sha256="1r0za8s31mk9d3vgvsj930qpy5xnzdfgz06fjg5qzzc2l6jp96k3"; depends=[BH doParallel foreach Rcpp RcppEigen]; }; + RMixtCompUtilities = derive2 { name="RMixtCompUtilities"; version="4.1.4"; sha256="1rhdmiap7xm96igclas67dz8naywjkddydbk9m3hp0d0zhgblc5i"; depends=[ggplot2 plotly scales]; }; + RMySQL = derive2 { name="RMySQL"; version="0.10.21"; sha256="0cbb5ln9iigl816nzvsls9zil5qlfr8yv2aginapqv6n69nz0srs"; depends=[DBI]; }; RNAseqNet = derive2 { name="RNAseqNet"; version="0.1.4"; sha256="16ab0p0378j4vvcazynffsgx1rq32llf1sz4h4pp5lrx820j6qvx"; depends=[ggplot2 glmnet hot_deck igraph PoiClaClu]; }; RNAsmc = derive2 { name="RNAsmc"; version="0.6.0"; sha256="0q4b24baabzx41zqygy6l2jnyzc4m7knmlnhra4hhc5f5cl5ab8r"; depends=[circlize RRNA]; }; RNAstructureModuleMiner = derive2 { name="RNAstructureModuleMiner"; version="0.1.0"; sha256="026r1h4z1jdfww0ay9iixa77ax6b19pgp589bbn77xg1vwjjlbsk"; depends=[RRNA]; }; RNCBIEUtilsLibs = derive2 { name="RNCBIEUtilsLibs"; version="0.9"; sha256="1h1ywx8wxy6n2rbpmjbqw4c0djz29pbncisd0mlbshj1fw226jba"; depends=[rJava]; }; RNCEP = derive2 { name="RNCEP"; version="1.0.10"; sha256="19ja7pcp7ajwhqhqw92pdmvxzyjc4kw3943pllpx47s1zvi6dmci"; depends=[abind fields maps RColorBrewer sp tgp]; }; RND = derive2 { name="RND"; version="1.2"; sha256="1rl5apgw43c841z0lapi9z2jn979dvqh4x1qkqx1ad77zcq87c85"; depends=[]; }; - RNGforGPD = derive2 { name="RNGforGPD"; version="1.0.2"; sha256="0z1jawq3342ffbv1jp7kfzll9pac5ff09qb3fd0vz564kqcvik0n"; depends=[corpcor Matrix mvtnorm VGAM]; }; + RNGforGPD = derive2 { name="RNGforGPD"; version="1.1.0"; sha256="0zriv0pd86ciwrms95bbb9wh40xvxv20vla2hxbmaynfy1s1vd4j"; depends=[corpcor Matrix mvtnorm]; }; RNHANES = derive2 { name="RNHANES"; version="1.1.0"; sha256="045ykpgxvc22blbp47ysbk6a6x4akjd39pjr114cr23s7f48g6h4"; depends=[dplyr foreign rvest survey xml2]; }; - RNOmni = derive2 { name="RNOmni"; version="0.7.1"; sha256="0lzd820x9yw90ddzmxvd89pkqc3nrljlc6kz4cab50zj3s755ack"; depends=[abind foreach plyr Rcpp RcppEigen]; }; + RNOmni = derive2 { name="RNOmni"; version="1.0.0"; sha256="1zn0yswycvzc3bm5rd7n84b2jbb5rdl66m4x5miz9pv7h6wsckkv"; depends=[plyr Rcpp RcppArmadillo]; }; RNRCS = derive2 { name="RNRCS"; version="0.2.5"; sha256="19q78l8mh4701vqvr36vqc87n39s5ivzhiy5lvnxbd4dgibk1jr2"; depends=[ggplot2 magrittr rvest xml2]; }; RNaviCell = derive2 { name="RNaviCell"; version="0.2"; sha256="15k8hkagn5520fy7x672fy329s2v7l0x44s44f6v7ql9mmg4b635"; depends=[RCurl RJSONIO]; }; RNeXML = derive2 { name="RNeXML"; version="2.4.5"; sha256="1wsl4xq9w5bp3wk69dw57bg0qcw1vs6ajwya4p0w1r00ck5pwrib"; depends=[ape dplyr httr lazyeval plyr reshape2 stringi stringr tidyr uuid XML xml2]; }; RNentropy = derive2 { name="RNentropy"; version="1.2.2"; sha256="0chvmrvpyyghilwb63y6pd1zp94i5qhpv5w19x9nw0ypk86pp2dj"; depends=[]; }; - RNetCDF = derive2 { name="RNetCDF"; version="2.3-1"; sha256="1ij4cfhfplky8yhikc5ghafk8812bp9v8fqf9kfp3bm2wip1jdvm"; depends=[]; }; + RNetCDF = derive2 { name="RNetCDF"; version="2.4-2"; sha256="14jgqp3ynf1ndkzbwx7xmxd9gimjigm4012mrn9p076xd2y4qxci"; depends=[]; }; RNetLogo = derive2 { name="RNetLogo"; version="1.0-4"; sha256="1z7jp454k197c0zbkn64zmf25wadkiznv3w2csgiz917cbx6xcn1"; depends=[igraph rJava]; }; - RNewsflow = derive2 { name="RNewsflow"; version="1.2.4"; sha256="1xbkmm7fvpn0ms0qcyn1k33k1gc462cxr1vr5mf5snqvgl836ykq"; depends=[data_table igraph Matrix quanteda Rcpp RcppEigen RcppProgress scales stringi tm wordcloud]; }; - RNifti = derive2 { name="RNifti"; version="1.1.0"; sha256="1z8ninp3aq18w0slcfn8r2fp48cdz8l0k0namsrnvgyp8lzcpqpn"; depends=[Rcpp]; }; - RNiftyReg = derive2 { name="RNiftyReg"; version="2.6.8"; sha256="19lij5zplw7jw65ykkjl85iqpfq3i6sia4wnq7fmkv1xlzwda2f4"; depends=[ore Rcpp RcppEigen RNifti]; }; + RNewsflow = derive2 { name="RNewsflow"; version="1.2.5"; sha256="0q7w0p727b1srdrx4mhbl31hfl4fxcavs5asg2knim4ihw034qqd"; depends=[data_table igraph Matrix quanteda Rcpp RcppEigen RcppProgress scales stringi tm wordcloud]; }; + RNifti = derive2 { name="RNifti"; version="1.3.0"; sha256="1zr0q79id62csmc30c7gs4hbmavk8n6p50a981sfz51dczhjj5ny"; depends=[Rcpp]; }; + RNiftyReg = derive2 { name="RNiftyReg"; version="2.7.0"; sha256="0y7s2zcjjnb9jakdhyd6hmdj9axdpvbnhijs2finnlwc0d09jpz1"; depends=[ore Rcpp RcppEigen RNifti]; }; ROAuth = derive2 { name="ROAuth"; version="0.9.6"; sha256="0vhsp8qybrl94898m2znqs7hmlnlbsh8sm0q093dwdb2lzrqww4m"; depends=[digest RCurl]; }; ROCR = derive2 { name="ROCR"; version="1.0-11"; sha256="0amvvrkiflmr3qygrsgrsja4gaf2v6r6h6i2bgpsm8r069vmlf2p"; depends=[gplots]; }; ROCS = derive2 { name="ROCS"; version="1.3"; sha256="11vdf8701ap6ya7c7kx9jhvg7qfc6vkij3jridna6f4xj384grki"; depends=[poibin rgl]; }; ROCit = derive2 { name="ROCit"; version="2.1.1"; sha256="0sd6ckh7k8aqwhzzp3qff6g7d03klbr0mbp403pib3823c8pqa55"; depends=[]; }; - ROCnReg = derive2 { name="ROCnReg"; version="1.0-2"; sha256="1wf8fsf5sy5c66c8hpiwl1pja1mva1f5vgp12020z1k7nyyf5ak6"; depends=[lattice MASS Matrix moments nor1mix np pbivnorm spatstat]; }; + ROCnReg = derive2 { name="ROCnReg"; version="1.0-4"; sha256="0kgr3pz39wqd0ngp2xh2avqvcbjg5vnffnpjw0fsfvwjxhrc2i6a"; depends=[lattice MASS Matrix moments nor1mix np pbivnorm spatstat]; }; ROCpsych = derive2 { name="ROCpsych"; version="1.3"; sha256="0fcrhhxmvrrchbswb94liahbgz5pfhs86fbj0vby7vnakrhngh7v"; depends=[pROC reportROC]; }; ROCwoGS = derive2 { name="ROCwoGS"; version="1.0"; sha256="029nramxwhzqim315g1vkg1zsszzkic28w6ahwg9n7bk9d08adzk"; depends=[]; }; RODBC = derive2 { name="RODBC"; version="1.3-17"; sha256="1xq4lzx1a09lmnd2lwj5z099z3pfg3r7y2da7rf4sd2wyqswi7s6"; depends=[]; }; RODBCDBI = derive2 { name="RODBCDBI"; version="0.1.1"; sha256="0jkcc1lm8drsx1pkfj5h6rlbr98cgpvbf9ndzdwr048f3s8gd26i"; depends=[DBI RODBC]; }; RODM = derive2 { name="RODM"; version="1.1"; sha256="0cyi2y3lsw77gqxmawla5jlm4vnhsagh3ykdgb6izxslc4j2fszx"; depends=[RODBC]; }; - ROI = derive2 { name="ROI"; version="0.3-3"; sha256="06d9cqa7g5n10cynkkmy42ilzs7jj2lfz9snimis6ipgkm5n0xr9"; depends=[registry slam]; }; - ROI_models_globalOptTests = derive2 { name="ROI.models.globalOptTests"; version="1.1"; sha256="0cr4iy4p590zsp47jqyrvhamc4xa9nkpnnddmwqbkgvzmzxf83ap"; depends=[globalOptTests ROI]; }; - ROI_models_miplib = derive2 { name="ROI.models.miplib"; version="0.0-2"; sha256="1brlqyprvrq32ww36j3aa4nqfcn1q1mfv58vv92rlv23cb6b94sv"; depends=[R_utils Rglpk ROI]; }; - ROI_models_netlib = derive2 { name="ROI.models.netlib"; version="1.1"; sha256="0dhiiyw9srlih3x381jlgl11y0vr9qyn91b7xi208a0vpsmassa7"; depends=[ROI]; }; - ROI_plugin_alabama = derive2 { name="ROI.plugin.alabama"; version="0.3-1"; sha256="1b70qnm7s5gdcpn7y61gbwcln7r48gvp6hkmdwrvz1qvlsgaz6rk"; depends=[alabama ROI]; }; + ROI = derive2 { name="ROI"; version="1.0-0"; sha256="0hd3l219wanhanbf4pgrh1pbxah50gf5qg2gff1djdr1xns7zn5h"; depends=[registry slam]; }; + ROI_models_globalOptTests = derive2 { name="ROI.models.globalOptTests"; version="1.1-1"; sha256="1zj636cmjhhqbn6hh6760bi5y8lf6y7qqkz72yijq7dj2y1za2ph"; depends=[globalOptTests ROI]; }; + ROI_models_miplib = derive2 { name="ROI.models.miplib"; version="1.0-0"; sha256="12yxra45s9f14dn12wibxrz598g3s39lm3af4dxmw9jnlfb8z84b"; depends=[R_utils Rglpk ROI]; }; + ROI_models_netlib = derive2 { name="ROI.models.netlib"; version="1.1-1"; sha256="1h59i7mc21kgwi4mz0qpfj855bp6d2qkrp40lm02dqhf79sps26k"; depends=[ROI]; }; + ROI_plugin_alabama = derive2 { name="ROI.plugin.alabama"; version="1.0-0"; sha256="1h4154w730y06zak0s199lafwnip4xqnnh33ghkyg39y71sn9nfz"; depends=[alabama ROI]; }; ROI_plugin_clp = derive2 { name="ROI.plugin.clp"; version="0.4"; sha256="0fzrb4q2mcf3j4d4j8r354n6fyv2rik0ypp01l54zbm8s2r29bwb"; depends=[clpAPI Matrix ROI slam]; }; ROI_plugin_cplex = derive2 { name="ROI.plugin.cplex"; version="0.3-0"; sha256="1ipwvclrxws7nvirvns58gpakg23ldiphyl6g0akxk5hczr0lazf"; depends=[Rcplex ROI slam]; }; - ROI_plugin_deoptim = derive2 { name="ROI.plugin.deoptim"; version="0.3-2"; sha256="1crmmmxfqcrwp51c74i2s7gdq3rj1imwr8zhwl6xcnjsg24snm3q"; depends=[DEoptim DEoptimR ROI]; }; - ROI_plugin_ecos = derive2 { name="ROI.plugin.ecos"; version="0.3-1"; sha256="1d409hc4cnd1q9d5ldylygis82a4ha1hfbqq36vn7n4xx89wf0k3"; depends=[ECOSolveR Matrix ROI slam]; }; - ROI_plugin_glpk = derive2 { name="ROI.plugin.glpk"; version="0.3-0"; sha256="1a1vag47lfhiqmplrbkp95k36angpi9nvh0jd4cgy5y2416w22hn"; depends=[Rglpk ROI]; }; - ROI_plugin_lpsolve = derive2 { name="ROI.plugin.lpsolve"; version="0.3-3"; sha256="19iir79dg9vb2dlii9a9j9zn5clawzddypdxdwj3vmqh66yk8n5a"; depends=[lpSolveAPI ROI]; }; - ROI_plugin_msbinlp = derive2 { name="ROI.plugin.msbinlp"; version="0.3-0"; sha256="00zvjqq2sj7iaymc0lrf5lmqfbqilwh8llmq841lvsmbps45w41k"; depends=[ROI slam]; }; - ROI_plugin_neos = derive2 { name="ROI.plugin.neos"; version="0.3-2"; sha256="17s06a9b2adz3m1lh0javw8dfi7gpssnkgalla8693pb38gazbm0"; depends=[ROI xml2 xmlrpc2]; }; - ROI_plugin_nloptr = derive2 { name="ROI.plugin.nloptr"; version="0.3-3"; sha256="0ls241xahmd77q2s02mpzr1i10nq5vqgic5j786y9q00f6c3lxyd"; depends=[nloptr ROI]; }; - ROI_plugin_optimx = derive2 { name="ROI.plugin.optimx"; version="0.3-3"; sha256="0kqzihx655jxw194xrx5qkdp4pls5wqi479pilw5pnkfvzl3sdgp"; depends=[optimx ROI]; }; - ROI_plugin_qpoases = derive2 { name="ROI.plugin.qpoases"; version="0.3-3"; sha256="132zr4nx220697j2x1vm4sl1wklbrnh549zh5gb0zn7q206r56r4"; depends=[checkmate Rcpp ROI slam]; }; - ROI_plugin_quadprog = derive2 { name="ROI.plugin.quadprog"; version="0.2-5"; sha256="1c4fd16kgg60gfs52xc64ii4kzl8fb8qz3rpy69d08avb4q6grir"; depends=[quadprog ROI slam]; }; - ROI_plugin_scs = derive2 { name="ROI.plugin.scs"; version="0.3-2"; sha256="0g48awvbsnmdlviksyc57piqvhwfx63iq68ymyrgfxfwkjrk4fwl"; depends=[ROI scs slam]; }; - ROI_plugin_symphony = derive2 { name="ROI.plugin.symphony"; version="0.2-5"; sha256="1kpa82g33i2fdcnkpcqdpslj14ilrl7cp0fq1jmp4vj8ddz1s9g5"; depends=[ROI Rsymphony slam]; }; + ROI_plugin_deoptim = derive2 { name="ROI.plugin.deoptim"; version="1.0-0"; sha256="1v093r6d14w12p2lmzcnlja9q5lhfvrmfbd3ws7x4igs0fmcdq2y"; depends=[DEoptim DEoptimR ROI]; }; + ROI_plugin_ecos = derive2 { name="ROI.plugin.ecos"; version="1.0-0"; sha256="0wdb86r0z0ck27mn0rfb5l72xq7km2annyk5c5n8nk460j0kygqf"; depends=[ECOSolveR Matrix ROI slam]; }; + ROI_plugin_glpk = derive2 { name="ROI.plugin.glpk"; version="1.0-0"; sha256="0i5l0k5mk2xp2gdvpmlgxjycvzmgc83rkind68ab4x1d4bab0qdk"; depends=[Rglpk ROI]; }; + ROI_plugin_ipop = derive2 { name="ROI.plugin.ipop"; version="1.0-0"; sha256="00xjariraga2j4zk6vyzwl5g4a65ki1jmky556hizma78ksjrikv"; depends=[kernlab ROI slam]; }; + ROI_plugin_lpsolve = derive2 { name="ROI.plugin.lpsolve"; version="1.0-0"; sha256="1cr52sj0nj2bv9bfmm0pcb9bs2376fwyslxd15hyqq88la5y42iy"; depends=[lpSolveAPI ROI]; }; + ROI_plugin_msbinlp = derive2 { name="ROI.plugin.msbinlp"; version="1.0-0"; sha256="1f7wbzp87zq0css7jpphb96kbyan2lxzynnrcvl3hyn5cqmdcsqd"; depends=[ROI slam]; }; + ROI_plugin_neos = derive2 { name="ROI.plugin.neos"; version="1.0-0"; sha256="1q6xj1wg8241lbr9cynx9d4ilh19441qzn3nbqhj4lhpmg423h0p"; depends=[ROI xml2 xmlrpc2]; }; + ROI_plugin_nloptr = derive2 { name="ROI.plugin.nloptr"; version="1.0-0"; sha256="11dgya755w6h7dkxvdhx8aqz3g0dfxw67g5fwag0fszwb2hfblkx"; depends=[nloptr ROI]; }; + ROI_plugin_optimx = derive2 { name="ROI.plugin.optimx"; version="1.0-0"; sha256="0s0p0071s0i1gcqfs6glmbzg8bfh8fdzki9mrnp7hp8a335sga2g"; depends=[optimx ROI]; }; + ROI_plugin_osqp = derive2 { name="ROI.plugin.osqp"; version="1.0-0"; sha256="09g947wx2qdimidayyn96gppiwrw28riff2wzsvvl8xvqi8nrh63"; depends=[Matrix osqp ROI slam]; }; + ROI_plugin_qpoases = derive2 { name="ROI.plugin.qpoases"; version="1.0-0"; sha256="0gha9zzjkkdr2lcalhyghh9sb5260rsaj88k37dk3qncdpk6gnw2"; depends=[checkmate Rcpp ROI slam]; }; + ROI_plugin_quadprog = derive2 { name="ROI.plugin.quadprog"; version="1.0-0"; sha256="08zgz4nnv7n455lghvzif54m4g3fzzj4czh93p6swb0kghb893wr"; depends=[quadprog ROI slam]; }; + ROI_plugin_scs = derive2 { name="ROI.plugin.scs"; version="1.0-0"; sha256="07by36pi82893xi3c0i3amaw7wx814h8pjx44cp4icv3wyxdpqpr"; depends=[ROI scs slam]; }; + ROI_plugin_symphony = derive2 { name="ROI.plugin.symphony"; version="1.0-0"; sha256="0wai3yfglx81f97v139bffxf4cziqlqki4vnq76bw4p22g7hdzl8"; depends=[ROI Rsymphony slam]; }; ROMDB = derive2 { name="ROMDB"; version="0.1.0"; sha256="14jijcqd2zmps8sacx5nwfclj5yvqf4nx72y8pfvr0nswqqb895i"; depends=[dplyr httr magick purrr RODBC stringr]; }; - ROMIplot = derive2 { name="ROMIplot"; version="1.0"; sha256="1njbsvnz7wrsv9l1p70p1ygmckaibz5i6jmvb0sfalp5jdcgl85n"; depends=[MortalitySmooth RCurl]; }; + ROOPSD = derive2 { name="ROOPSD"; version="0.2.5"; sha256="11cm9bnp0355vfwwlb4x4x3vh2z8k28fjms8ah6pah59x0i536i8"; depends=[Lmoments R6]; }; ROP = derive2 { name="ROP"; version="1.0"; sha256="12gh83r3hp1qdmw3p5rr1wfhsh90pirx67q456gl9ai6zgd8nkq8"; depends=[ROCR]; }; ROSE = derive2 { name="ROSE"; version="0.0-3"; sha256="12b9grh3rgaa07blbnxy8nvy5gvpd45m43bfqb3m4k3d0655jpk2"; depends=[]; }; ROlogit = derive2 { name="ROlogit"; version="0.1.2"; sha256="09j9c24f7plzpnnhpmzdi4gapb7w1377ksjwk6i2xpyr4bfsrr5k"; depends=[evd survival]; }; @@ -3622,23 +3756,24 @@ in with self; { ROptRegTS = derive2 { name="ROptRegTS"; version="1.2.0"; sha256="1wy54kjrpfvj2k9ndmq27zzgx6aygh85f7c83g7gn8d5b2y91qy4"; depends=[distr distrEx RandVar ROptEstOld]; }; ROptSpace = derive2 { name="ROptSpace"; version="0.2.2"; sha256="09crzp3anw9p9fknw9gv8kzk1gmmdw0hbw1fa2r8i6601xi81ap4"; depends=[Rcpp RcppArmadillo Rdpack]; }; ROracle = derive2 { name="ROracle"; version="1.3-1"; sha256="07zqzwaq5iqkjcmns2ahl1l71xjlznialb3dbyl4lwsh3p3fhf2n"; depends=[DBI]; }; - RPANDA = derive2 { name="RPANDA"; version="1.8"; sha256="0k9k3zc68kr17jd5r0m6jwmfhf43k5r44h4kqa6kdpd03h60m1rh"; depends=[ape cluster coda corpcor deSolve fields fpc geiger glassoFast igraph Matrix mvMORPH mvtnorm phytools picante pracma pspline pvclust Rmpfr TESS]; }; + RPANDA = derive2 { name="RPANDA"; version="1.9"; sha256="16qhv4zwwrjrjxr06pimjprb74gbzpq2hkii27abln6a62m3z4kb"; depends=[ape bipartite cluster coda corpcor deSolve fields fpc geiger glassoFast igraph Matrix mvMORPH mvtnorm phytools picante pracma pspline pvclust raster Rmpfr TESS]; }; RPCLR = derive2 { name="RPCLR"; version="1.0"; sha256="03kpyszsjb656lfwx2yszv0a9ygxs1x1dla6mpkhcnqw00684fab"; depends=[MASS survival]; }; RPEClust = derive2 { name="RPEClust"; version="0.1.0"; sha256="1ysw45335lrxmj3j17xyvgz76p00v80f2m7wxfndh91wklqxzm8r"; depends=[clue clusteval mclust]; }; - RPEGLMEN = derive2 { name="RPEGLMEN"; version="1.0.1"; sha256="1bcci0ih71bxdrwdz336c5wx47d094nczazy8mv3v41vivrk4jkh"; depends=[PerformanceAnalytics Rcpp RcppEigen RPEIF]; }; - RPEIF = derive2 { name="RPEIF"; version="1.0.8"; sha256="0v8kgwzgn1sqs0rgb0mrvzxy1wnk07bm7s4nyz60xcamsj33laj0"; depends=[PerformanceAnalytics xts zoo]; }; - RPESE = derive2 { name="RPESE"; version="1.0.5"; sha256="0x5lf3xkxmwhilvay1qkklpdbqi1m78z0540mpwnpqwkv7xl1l80"; depends=[boot PerformanceAnalytics RPEGLMEN RPEIF sandwich xts zoo]; }; + RPEGLMEN = derive2 { name="RPEGLMEN"; version="1.1.0"; sha256="0pqfmrnyyxivrzm4xzhma6wrb3zhy34chdalcg8hw5wy92y9gzhd"; depends=[Rcpp RcppEigen RPEIF]; }; + RPEIF = derive2 { name="RPEIF"; version="1.1.0"; sha256="169asw2wsvcbknhmqxni4bjkcvshq70qzkhv0d2h39cvkmbmhagq"; depends=[xts zoo]; }; + RPESE = derive2 { name="RPESE"; version="1.1.0"; sha256="1b8n6y50pzv4w07kchnp5fd4m7j9bqq5085myvwfnm2iklq5yncz"; depends=[boot RPEGLMEN RPEIF sandwich xts zoo]; }; RPEXE_RPEXT = derive2 { name="RPEXE.RPEXT"; version="0.0.2"; sha256="1dwblpfm0s4axiggwh4lbz5k1dz7i0d1nqzl70kxj5gnajm7gn1k"; depends=[]; }; RPEnsemble = derive2 { name="RPEnsemble"; version="0.4"; sha256="0y9g22swcz0m5jbzi87ahxw27fb3jlf3iwvxb73kkzixqlvksw9y"; depends=[class MASS]; }; RPMG = derive2 { name="RPMG"; version="2.2-3"; sha256="1di2bcf58z6gc3xknzx35znsjsy1714swvxkdhlq1ljidbdbmmbl"; depends=[]; }; RPMM = derive2 { name="RPMM"; version="1.25"; sha256="1j48dh434wfhfzka0l21w6f73qlwfm70r9gdddhn504i2d5m4jph"; depends=[cluster]; }; + RPPASPACE = derive2 { name="RPPASPACE"; version="1.0.7"; sha256="0h28nxybsyjjd23m1y29559pym2i814n4bvkw5jas1nzbiw85fkw"; depends=[bmp cobs doParallel foreach imager iterators jpeg MASS mgcv png quantreg robustbase tiff]; }; RPPairwiseDesign = derive2 { name="RPPairwiseDesign"; version="1.0"; sha256="0k2vh698rhs5a0b5vhyvrnnwqnagdzs591zx6hn9vbmm8rm4y1dm"; depends=[]; }; - RPPanalyzer = derive2 { name="RPPanalyzer"; version="1.4.6"; sha256="0ifspa7kiskanqkpi5iw6finfyslvbsirplf2a2l7xgvy96vz9la"; depends=[Biobase gam ggplot2 gplots Hmisc lattice limma quantreg]; }; + RPPanalyzer = derive2 { name="RPPanalyzer"; version="1.4.7"; sha256="16xppv7pzqk6kriqd5ym313z1r61l13dzpxp2q2zi0ai23hjgg92"; depends=[Biobase gam ggplot2 gplots Hmisc lattice limma quantreg]; }; RPS = derive2 { name="RPS"; version="1.0.1"; sha256="16n6wknw2m56kwi6rswgxjwjqblhaz5gyw94f96a7l6navqnvlp4"; depends=[ape geomorph Gmedian igraph MASS matlab]; }; RPostgreSQL = derive2 { name="RPostgreSQL"; version="0.6-2"; sha256="1mdhw5821v2h7hpa53v10wz53k4i90r0vb6a3dia5gq8f9j1h088"; depends=[DBI]; }; - RPostgres = derive2 { name="RPostgres"; version="1.2.0"; sha256="16fjwaj1qvr1i9naq19jg2z3dqssi3pp4wwviyqlkj1mmbyh28zx"; depends=[BH bit64 blob DBI hms plogr Rcpp withr]; }; - RPresto = derive2 { name="RPresto"; version="1.3.4"; sha256="17hwq76vzr27prwisfxahs1ix9grldknaywnq3v2a3s2x79v8vbv"; depends=[DBI httr jsonlite openssl Rcpp stringi]; }; - RProbSup = derive2 { name="RProbSup"; version="2.2"; sha256="0phf3hhppgwm9m5wpj7r2yi7qmppcd553pc9hvqx7y9j4lg8imlf"; depends=[]; }; + RPostgres = derive2 { name="RPostgres"; version="1.2.1"; sha256="1iky0z2jkvn7x3607hlamqr18rbgsv9ym03fa1sqs0z48bmc24gi"; depends=[BH bit64 blob DBI hms plogr Rcpp withr]; }; + RPresto = derive2 { name="RPresto"; version="1.3.5"; sha256="1fhgiin5fa83gp2lnqhzlg41dy2l0zcvwfy7s73cl4rwkk2x4q1p"; depends=[DBI httr jsonlite openssl Rcpp stringi]; }; + RProbSup = derive2 { name="RProbSup"; version="3.0"; sha256="1z53zgx26fwfhb1vxad0l51v34y2lsplhwbjaf4r44rngdaw9h5n"; depends=[]; }; RProtoBuf = derive2 { name="RProtoBuf"; version="0.4.17"; sha256="0krbxalcfg47cmrwfajgbhmn6rs687ranaiq5j0daw7a1k4qdfd8"; depends=[Rcpp RCurl]; }; RPscoring = derive2 { name="RPscoring"; version="0.1.0"; sha256="063w83k9krwv3wvw2iq8bqkhjaj26as14d9g99l8jxfc02ljv1rr"; depends=[]; }; RPtests = derive2 { name="RPtests"; version="0.1.4"; sha256="1r30pslbjq3dip41la81jlin2vhxdmayg902x9ryjy554awfgh7j"; depends=[glmnet randomForest Rcpp]; }; @@ -3647,6 +3782,7 @@ in with self; { RPyGeo = derive2 { name="RPyGeo"; version="1.0.0"; sha256="1alqgx6blqqwxm76w05g82kc2icx8nvjw7qkdz73gf9ckgza5bb3"; depends=[magrittr purrr raster reticulate rmarkdown sf stringr]; }; RQEntangle = derive2 { name="RQEntangle"; version="0.1.3"; sha256="178haddk8nnscy2vym3k2a3ca9lf6nl7rpjja8lxqdjninvhvwb2"; depends=[iterators itertools]; }; RQuantLib = derive2 { name="RQuantLib"; version="0.4.12"; sha256="1bmjgsdwivrvdysba4hq60xpp7xg1c0p1p05mdm0338zvzix5kb8"; depends=[Rcpp zoo]; }; + RRBoost = derive2 { name="RRBoost"; version="0.1"; sha256="0zp3csrpi0awk88m6sq5sf5v7j32q5sd4mwv61x6bblg991k404k"; depends=[RobStatTM rpart]; }; RRF = derive2 { name="RRF"; version="1.9.1"; sha256="135adnf7cfs8gddmmmgmzarjzg0qfrd7l67367yhy2b1k0s5ng1w"; depends=[]; }; RRI = derive2 { name="RRI"; version="1.1"; sha256="0msdc5j5vx4snl8r3q5nn0mw2i80jds5pjykhmigcrx6jzg6h6i7"; depends=[Rcpp RcppArmadillo]; }; RRNA = derive2 { name="RRNA"; version="1.0"; sha256="14rcqh95ygybci8hb8ays8ikb22g3850s9f3sgx3r4f0ky52dcba"; depends=[]; }; @@ -3655,9 +3791,9 @@ in with self; { RRTCS = derive2 { name="RRTCS"; version="0.0.3"; sha256="1riz1gjx3c0pf17xwybizb94nm5zgmfsnv6np3afvw831mb1x3l9"; depends=[sampling samplingVarEst]; }; RRate = derive2 { name="RRate"; version="1.0"; sha256="1q3f2gphdf50aijnk5xqfpxcqfd4jq7byb1gpb0vcnaxgi3a9lwm"; depends=[]; }; RRedshiftSQL = derive2 { name="RRedshiftSQL"; version="0.1.2"; sha256="03jbml8d19hcg6achnyc4hcnl5j10yvsx59j80r46zyn0flsnizq"; depends=[DBI RPostgreSQL]; }; - RRphylo = derive2 { name="RRphylo"; version="2.4.7"; sha256="037d96fvij08j7dwkm3f83nh9v02yh5qqijgqz51hkivfmmy2lgf"; depends=[ape doParallel emmeans foreach geiger phytools]; }; + RRphylo = derive2 { name="RRphylo"; version="2.5.0"; sha256="0bhb4j1sxbww4y6hxi61p0s5npa999lz1x3qjgynzwfaf55p7hvj"; depends=[ape doParallel emmeans foreach geiger phytools]; }; RRreg = derive2 { name="RRreg"; version="0.7.1"; sha256="1mzc9ga5jdh3cf95bxbfy6kdxvqcca74v4hszb63jalzp8w624r9"; depends=[doParallel foreach lme4]; }; - RSA = derive2 { name="RSA"; version="0.10.1"; sha256="1r0hdmh72l3p6djdgj9p8m234b3n6018k1kdsch007fxwbjixnvf"; depends=[aplpack ggplot2 lattice lavaan plyr RColorBrewer tkrplot]; }; + RSA = derive2 { name="RSA"; version="0.10.2"; sha256="082mq3vn75nsxn59b527976x6k2n8sfh78v4i4ncvbnsa7knycc3"; depends=[aplpack ggplot2 lattice lavaan plyr RColorBrewer]; }; RSADBE = derive2 { name="RSADBE"; version="1.0"; sha256="1nzpm88rrzavk0n8iflsx8r3s1xcry15n80zqdw6jijjycz10w1q"; depends=[]; }; RSAGA = derive2 { name="RSAGA"; version="1.3.0"; sha256="1y1zhy2bxkfsv8vmnxjdg9i5rqkvs32kw8h5z1mclv953srgkpn9"; depends=[gstat magrittr plyr rgdal shapefiles stringr]; }; RSAlgaeR = derive2 { name="RSAlgaeR"; version="1.0.0"; sha256="1hp0v2vkj9ixiv541d53kyl0ph3jsdc5w98r81gv5ck5ixrp6bxp"; depends=[cvTools ggplot2 hydroGOF lubridate mblm plyr]; }; @@ -3666,7 +3802,7 @@ in with self; { RSCAT = derive2 { name="RSCAT"; version="1.1.0"; sha256="1sh80zlkwma88kssrlwvb6kpqs2dmhfzkck59fgp0xxgxa3vpram"; depends=[ggplot2 gridExtra Metrics rJava shiny shinycssloaders shinyjs]; }; RSDA = derive2 { name="RSDA"; version="3.0.4"; sha256="1ps4q3xcyzv5wnwnpwmvvx1gf3ry02rd480gifbfg39km8qwhvgz"; depends=[dplyr FactoMineR forcats ggplot2 ggpolypath glmnet labelled magrittr nloptr princurve purrr randomcoloR reshape RJSONIO rlang scales sqldf stringr tibble tidyselect vctrs XML]; }; RSE = derive2 { name="RSE"; version="1.3"; sha256="1dvmj1zwkbp1dj9r8kcvbd8rpknfwfdqaqc5gfl82bh823w72099"; depends=[]; }; - RSEIS = derive2 { name="RSEIS"; version="3.9-0"; sha256="16jmakdq6rkyw3cm1ilnaw3ycsg12544ml9gla7y8mgpbglxsn6i"; depends=[RPMG Rwave]; }; + RSEIS = derive2 { name="RSEIS"; version="3.9-3"; sha256="1wrpsf4cvm34r11ywssnbpcsi56sx4fykkqfhdfb5502agdy2w5w"; depends=[RPMG Rwave]; }; RSGHB = derive2 { name="RSGHB"; version="1.2.2"; sha256="16s9iahbcdqykavm5cq8n76hlpfqlljl17xwh0vrz5ac7z4z3rdz"; depends=[MCMCpack]; }; RSIP = derive2 { name="RSIP"; version="1.0.0"; sha256="1yddqbnz0av69l53y83m7rnznc42qz66fc3qrispzaajs7p9n8d7"; depends=[ncdf4 raster rasterVis rgdal sp]; }; RSKC = derive2 { name="RSKC"; version="2.4.2"; sha256="0r9gpwhzscb6rbba3dg13p78pvskahgvsd59biag0shyii3xvwpm"; depends=[flexclust]; }; @@ -3674,8 +3810,8 @@ in with self; { RSNPset = derive2 { name="RSNPset"; version="0.5.3"; sha256="1llx6anwkl4as0hdyvmsrlg9z8mkn9p1qxgs6kqs39w87gyx0j36"; depends=[doRNG fastmatch foreach qvalue Rcpp RcppEigen]; }; RSPS = derive2 { name="RSPS"; version="1.0"; sha256="0ynxhgnxsf27qm8r5d9lyd59zksnc3kvx35hy25vff8j3bg7fqgi"; depends=[gridExtra lattice plyr]; }; RSQL = derive2 { name="RSQL"; version="0.1.4"; sha256="0zda6cgsx1bd3xw2r9flsphbkrgma95qqv5vz70f234y9gkmc6v3"; depends=[DBI knitr lgr R6 RSQLite]; }; - RSQLite = derive2 { name="RSQLite"; version="2.2.0"; sha256="1m38sj8rwbf3p2lhqabcp7c7djk7s9ng37cz39yxk706v9pi4380"; depends=[BH bit64 blob DBI memoise pkgconfig plogr Rcpp]; }; - RSSL = derive2 { name="RSSL"; version="0.9.1"; sha256="0845azknk90ix8xgcj18mdn7jbicalid4fcqyxzp747qswy4hh98"; depends=[cluster dplyr ggplot2 kernlab MASS Matrix quadprog Rcpp RcppArmadillo reshape2 scales tidyr]; }; + RSQLite = derive2 { name="RSQLite"; version="2.2.1"; sha256="0lynli9144dzb9vhxssba20v7z5h2nirawpvvy8ykv4n3ir7qlsl"; depends=[BH bit64 blob DBI memoise pkgconfig plogr Rcpp]; }; + RSSL = derive2 { name="RSSL"; version="0.9.3"; sha256="10rrgxc0ddnd4b4g7qqgpjkc8gh07bnc94xwmgdp1lx7v7ypcziv"; depends=[cluster dplyr ggplot2 kernlab MASS Matrix quadprog Rcpp RcppArmadillo reshape2 scales tidyr]; }; RSSOP = derive2 { name="RSSOP"; version="1.1"; sha256="119xrxpaf68qdb2kj2pbaja6im2nbxsgibb1bnlpnc3fcxkmqcsf"; depends=[]; }; RSSampling = derive2 { name="RSSampling"; version="1.0"; sha256="0p10l7qmksx4ysz1jb84f9nbqzig8wxhwy33yk8hq29nb5i4c9ik"; depends=[LearnBayes]; }; RSVGTipsDevice = derive2 { name="RSVGTipsDevice"; version="1.0-7"; sha256="0jdr8l0hp4kzsvlgs8j1m74sr98z4v2lmiqinmc238m406nhppab"; depends=[]; }; @@ -3688,6 +3824,7 @@ in with self; { RSentiment = derive2 { name="RSentiment"; version="2.2.2"; sha256="15d1llzxg1apkwykpb7pic2d5lfj9i9a55hab067wrz2yq5jsyfa"; depends=[NLP openNLP plyr stringr]; }; RSiena = derive2 { name="RSiena"; version="1.2-23"; sha256="04picf0f9rahd37r9fm0cisgaiy2aqshnzfh7cvhcqfaqmpxc8kp"; depends=[lattice MASS Matrix]; }; RSiteCatalyst = derive2 { name="RSiteCatalyst"; version="1.4.16"; sha256="1plcmxj6sahdy3vvcmxry8cbq1j23bqzhnhn593bkwmzczka24cy"; depends=[base64enc digest httr jsonlite plyr stringr]; }; + RSmallTelescopes = derive2 { name="RSmallTelescopes"; version="1.0.2"; sha256="0g8h518vzgnxyasb2xqh2hxbmfzhdv3silp084xkmylbgj1hh5cd"; depends=[]; }; RSmartlyIO = derive2 { name="RSmartlyIO"; version="0.1.3"; sha256="02zswadv65a5p5q9rr12f819mh7jjqk8xj1kc1c0wqvr8dgz7fx9"; depends=[RCurl]; }; RSocrata = derive2 { name="RSocrata"; version="1.7.10-6"; sha256="1pzdpy1mifr6hhhj7pq8l5jl8dsn6270ibm6pnmc66psh0xr2zsa"; depends=[httr jsonlite mime plyr]; }; RSpectra = derive2 { name="RSpectra"; version="0.16-0"; sha256="1ab45as2ysjrvkhvmx7y3nbhd0y1w4j9k2a789lcd973zz4wzwda"; depends=[Matrix Rcpp RcppEigen]; }; @@ -3706,16 +3843,18 @@ in with self; { RTConnect = derive2 { name="RTConnect"; version="0.1.4"; sha256="1000jmmqzyhl6vh1ii75jdh88s9inaz52gvfwcin2k2zr7bi91ba"; depends=[]; }; RTD = derive2 { name="RTD"; version="0.4.1"; sha256="0zsv62hx1y9q5a6rd8ri91ff64671b84jr3f88h0q4yni2mribhr"; depends=[dplyr httr jsonlite purrr RcppMsgPack readr urltools uuid]; }; RTDE = derive2 { name="RTDE"; version="0.2-1"; sha256="1dkv0g760384jmyypffl5kbnsancjx272j91ffpgmg3lmsy8nhqq"; depends=[]; }; - RTL = derive2 { name="RTL"; version="0.1.3"; sha256="0sswm0x8m7v27hiz3cy9d6w2qglww5z681iafrx246s0qagl9xzi"; depends=[dplyr fabletools feasts fGarch fitdistrplus forecast ggplot2 httr jsonlite lubridate magrittr PerformanceAnalytics plotly purrr Quandl quantmod readr sp stringr tibble tibbletime tidyquant tidyr timetk tsibble xts zoo]; }; + RTL = derive2 { name="RTL"; version="0.1.5"; sha256="162mwjlhl0py3lr4yrd56ips31kpfsgq0jmg9scm3pakbv63m9ad"; depends=[dplyr fabletools feasts fitdistrplus forecast ggplot2 httr jsonlite lpSolve lubridate magrittr PerformanceAnalytics plotly purrr Quandl quantmod RCurl readr rlang rugarch sp stringr tibble tibbletime tidyquant tidyr timetk tsibble xts zoo]; }; RTOMO = derive2 { name="RTOMO"; version="1.1-6"; sha256="03jb96ahzgp662vj2v65giv8ss61vad5w26kvq8hg9q06z879jza"; depends=[GEOmap RPMG RSEIS splancs]; }; - RTaxometrics = derive2 { name="RTaxometrics"; version="2.3"; sha256="02446y86g21i37ycavg0xc1ggxk0k93d38n71fis9fav06lywxx3"; depends=[]; }; + RTaxometrics = derive2 { name="RTaxometrics"; version="3.0"; sha256="0dm0ashxxz59ri9xk9vhn7671khp35gx16lkl6vjgpfwczhl0mc5"; depends=[]; }; RTextTools = derive2 { name="RTextTools"; version="1.4.3"; sha256="0fxjviqc36k06rn8xzbi8ylzzj9zgf3zsp6xv0kssakss1a45lzz"; depends=[caTools e1071 glmnet ipred nnet randomForest SparseM tau tm tree]; }; RTextureMetrics = derive2 { name="RTextureMetrics"; version="1.1"; sha256="0d0mvpmcpd62cvqlajrqp32lnvpflyf9bqvdzly2v8v1kb8274fc"; depends=[]; }; - RTransferEntropy = derive2 { name="RTransferEntropy"; version="0.2.12"; sha256="066wyama0gk81l6kc0n31cmf007i1975i7hzvf46qbldvhsc52mc"; depends=[future future_apply Rcpp]; }; + RTransferEntropy = derive2 { name="RTransferEntropy"; version="0.2.13"; sha256="17xmz8579xs4plc034c9cgc200g8sgvb3zmhzbina6psn72wl2fx"; depends=[future future_apply Rcpp]; }; RTriangle = derive2 { name="RTriangle"; version="1.6-0.10"; sha256="07ya95gmv53i2argqwgad6wd4sslql2wl1rkvsmgsvmhsb4wp9hd"; depends=[]; }; RUnit = derive2 { name="RUnit"; version="0.4.32"; sha256="1wc1gwb7yw7phf8b0gkig6c23klya3ax11c6i4s0f049k42r78r3"; depends=[]; }; - RVAideMemoire = derive2 { name="RVAideMemoire"; version="0.9-77"; sha256="0iwwqfdcr2l1ax5397j77cj1p6kvmg4005rfb7bhsii4i9w0mwf0"; depends=[ade4 boot car FactoMineR lme4 MASS mixOmics nnet pls pspearman vegan]; }; + RVA = derive2 { name="RVA"; version="0.0.3"; sha256="0w146albda4n74nn8h7jz62k5xmr6shibbgymyby0jphwc30fbc7"; depends=[circlize clusterProfiler ComplexHeatmap data_table dplyr edgeR ggplot2 ggpubr gridExtra GSEABase GSVAdata haven msigdbr org_Hs_eg_db plotly purrr rlang rWikiPathways stringr tibble tidyr XML]; }; + RVAideMemoire = derive2 { name="RVAideMemoire"; version="0.9-78"; sha256="1kiyczn1y3hxpf6shdy2s248848wvna6zhpkx7ng6hkdfkj8nfiy"; depends=[ade4 boot car FactoMineR lme4 MASS mixOmics nnet pls pspearman vegan]; }; RVFam = derive2 { name="RVFam"; version="1.1"; sha256="0gw8rgq11zndnqmay6y3y5rmmljvwhxzm2pqa90vs5413dnchq92"; depends=[coxme kinship2 lme4 MASS Matrix survival]; }; + RVIpkg = derive2 { name="RVIpkg"; version="0.1.1"; sha256="0kgjp79n8pxff2b36xnsz1hgb0kbwwvy8vc5dizinmh3fqr9bmqa"; depends=[]; }; RVenn = derive2 { name="RVenn"; version="1.1.0"; sha256="016m00xv59lkwm2is32v5nr4lw5a1ymdnz34r3ffflcv9bfrc6n4"; depends=[ggforce ggplot2 magrittr pheatmap purrr rlang vegan]; }; RVerbalExpressions = derive2 { name="RVerbalExpressions"; version="0.1.0"; sha256="1p9wmpgqwnz95sr8km8y6kqax8fcz6sqg54wfdx44kiqkf1ybdsp"; depends=[magrittr]; }; RVideoPoker = derive2 { name="RVideoPoker"; version="0.3"; sha256="06s4dlw0pw8rcq5b31xxqdpdk396rf27mai2vpvmn585vbm1ib7a"; depends=[pixmap rpanel tkrplot]; }; @@ -3725,26 +3864,26 @@ in with self; { RWBP = derive2 { name="RWBP"; version="1.0"; sha256="104vr2cdk185hh4zn3vmqvb14p1q8ifk11wdgvk7fli1m1zxxwdd"; depends=[igraph lsa RANN SnowballC]; }; RWDataPlyr = derive2 { name="RWDataPlyr"; version="0.6.4"; sha256="1jjra885339n6kpqz28rn9byy4md4s0k47m6ll4a6srd4hsf3ni3"; depends=[data_table dplyr feather Rcpp tibble tidyr xts zoo]; }; RWebLogo = derive2 { name="RWebLogo"; version="1.0.3"; sha256="1n65mlnr163ywjnyyngnigbj0wpgkr38c3nx8hw5r8mwjnf3d617"; depends=[findpython]; }; - RWeka = derive2 { name="RWeka"; version="0.4-42"; sha256="0111n0hr3a2gjd2pv5vlh8mian6k86cp0xrw0yyh6ijxhwl31rc4"; depends=[rJava RWekajars]; }; + RWeka = derive2 { name="RWeka"; version="0.4-43"; sha256="16hp8vkigk7wqwz51f68g5sp65hbs2yp7srh7k881wfg6mcpl8lc"; depends=[rJava RWekajars]; }; RWekajars = derive2 { name="RWekajars"; version="3.9.3-2"; sha256="06nsylv65z9hxym1b6qnwllh306bq5phsgr0qn4nyr5im8cv1rhn"; depends=[rJava]; }; RWiener = derive2 { name="RWiener"; version="1.3-3"; sha256="0afrgflyfjv4jqm04had74zz4cs934zwvyxaan1r4qpg383kibpq"; depends=[]; }; RWildbook = derive2 { name="RWildbook"; version="0.9.3"; sha256="1pznzmv8n33hhj61h07fha1gzafcx705n8323cnz3mx6ziijfh28"; depends=[data_table jsonlite marked]; }; RWsearch = derive2 { name="RWsearch"; version="4.8.0"; sha256="0zbf03dhcmbyrs2yhl3phk65471qnd7iszvk9rn81fqhd522vq66"; depends=[brew latexpdf networkD3 sig sos XML]; }; RXKCD = derive2 { name="RXKCD"; version="1.9.2"; sha256="1yk12ic6kdbwc44ppag2yfnga7xjmifkglhvcw93vc3qg469mm15"; depends=[jpeg plyr png RJSONIO]; }; RXMCDA = derive2 { name="RXMCDA"; version="1.5.5"; sha256="1ci73q8xf3xxqw8b7sk83v5vz2cqgcb4lkx7qi3hd1ff4xkz1fpa"; depends=[kappalab XML]; }; - RXshrink = derive2 { name="RXshrink"; version="1.4.1"; sha256="1nfph3xz2345kfajg0xbr4ww38vyq1yc46rz0n6ab1h7bys93mx5"; depends=[lars]; }; + RXshrink = derive2 { name="RXshrink"; version="1.5"; sha256="0mffiscf65fyf2xs9w61nzxhrg55ybsxsa0rqy7y2h2hgvbh5wi4"; depends=[ellipse lars]; }; RYandexTranslate = derive2 { name="RYandexTranslate"; version="1.0"; sha256="0qrv5mnnkn5fs7vx6i74z46s0qj9f98km5bizgj00832qyrq8q1s"; depends=[httr jsonlite RCurl]; }; RYoudaoTranslate = derive2 { name="RYoudaoTranslate"; version="1.0"; sha256="1i3iyqh97vpn02bm66kkmw52ni29js30v18n2aw8pvr88jpdgxm4"; depends=[RCurl rjson]; }; RZabbix = derive2 { name="RZabbix"; version="0.1.0"; sha256="0c5803chpzvp7dk9pjfx5f0nqynb76ywakz04ah2nw07ypvcyjyr"; depends=[httr jsonlite]; }; RZigZag = derive2 { name="RZigZag"; version="0.2.1"; sha256="1civ8qrk5y95775vzkd2m5arqczgan584r632ixy4q76nd5wa8zc"; depends=[Rcpp RcppEigen]; }; RZooRoH = derive2 { name="RZooRoH"; version="0.2.3"; sha256="0ihfc8hxqmlkx1xhkz3psw8szwjp01imasvynxbzrjmjf4q6amvq"; depends=[data_table doParallel foreach iterators RColorBrewer]; }; - RaPKod = derive2 { name="RaPKod"; version="0.9"; sha256="1qxzi2lf431zd44bcd98ybhzydy1cz12g864l6r668jk91aqy1qg"; depends=[kernlab MASS proxy Rcpp RcppArmadillo]; }; RaProR = derive2 { name="RaProR"; version="1.1-5"; sha256="11hwg609pjcd13qnbchbs86c3q8f4nmh1xfxg3dsiijljl6lzx3n"; depends=[]; }; - RaSEn = derive2 { name="RaSEn"; version="1.0.0"; sha256="13q9cksn2y56i4rbl95iqhz361bbm2kb454n2rcav2ylpi7prgg5"; depends=[caret class doParallel e1071 foreach formatR ggplot2 gridExtra MASS nnet randomForest rpart]; }; - RaceID = derive2 { name="RaceID"; version="0.2.1"; sha256="1xh2c2vrm7x4573knk17sws61mr5z0w4whafjksyc5ddkm3wwrlz"; depends=[cluster coop FateID FNN fpc ggplot2 ica igraph irlba locfit MASS Matrix NlcOptim pheatmap propr quadprog randomForest RColorBrewer Rcpp Rtsne umap vegan]; }; + RaSEn = derive2 { name="RaSEn"; version="1.1.0"; sha256="0l7k90w4c4xsyr08n93nxnl7jk4818fl6a5kjxbiqzd8f6814q16"; depends=[caret class doParallel e1071 FNN foreach formatR ggplot2 gridExtra MASS nnet randomForest rpart]; }; + RaceID = derive2 { name="RaceID"; version="0.2.2"; sha256="0602qx6hcdw6yxm49zwf7ri9g18ckqynkmv8s3v81lv612wlcd7w"; depends=[cluster coop FateID FNN fpc ggplot2 ica igraph irlba locfit MASS Matrix pheatmap propr quadprog randomForest RColorBrewer Rcpp Rtsne umap vegan]; }; RadData = derive2 { name="RadData"; version="1.0.0"; sha256="14npn5vjcpvymdjkby83msjr3f1gsmzh0083gz6cgrp270fglkaw"; depends=[]; }; RadOnc = derive2 { name="RadOnc"; version="1.1.5"; sha256="0yz2pzcpz32xs04xfs90i714nn28cky7701w1h99cqsxsp892jkq"; depends=[geometry oro_dicom ptinpoly rgl]; }; RadTran = derive2 { name="RadTran"; version="1.0"; sha256="1sb8d4y3b37akbxhdavxrkp34zn3ip061b7gzy0ga57pyn76cvpn"; depends=[ReacTran rootSolve]; }; + RadialVisGadgets = derive2 { name="RadialVisGadgets"; version="0.2.0"; sha256="18a2c89jpdaln9cl5y4w161121fld08wm57m40qacsj1vlnkh6j9"; depends=[caret dplyr ggplot2 miniUI r_import rlang shiny shinyjs shinyscreenshot tidyr]; }; RadioSonde = derive2 { name="RadioSonde"; version="1.4"; sha256="1v9jdpynmb01m3syhas1s08xxlvjawhlvjkyhils2iggi4xw4hiq"; depends=[]; }; Radviz = derive2 { name="Radviz"; version="0.9.2"; sha256="1k4bykrs6932n2iz2nngbs2k45ra7nq3rpxw4acpvxwxfciiq3ia"; depends=[dplyr ggplot2 hexbin igraph pracma Rcpp RcppArmadillo rlang]; }; RagGrid = derive2 { name="RagGrid"; version="0.2.0"; sha256="0crnpd75lyhd0awzqzqy7bzw4ydgxpyhy1ybb1ff4qsnisbjdbba"; depends=[crosstalk htmltools htmlwidgets knitr]; }; @@ -3759,8 +3898,9 @@ in with self; { RandomFieldsUtils = derive2 { name="RandomFieldsUtils"; version="0.5.3"; sha256="0783z23rm5kv0x7796ggx6g07wpf18n7fjzv9r9ryji55sx3r0pa"; depends=[]; }; RanglaPunjab = derive2 { name="RanglaPunjab"; version="2.3.4"; sha256="01j3gww9kil02d44jwlkz6j7lwn2him830bnshkly0s7mgh22pgr"; depends=[jpeg shiny tidyverse]; }; RankAggreg = derive2 { name="RankAggreg"; version="0.6.6"; sha256="1g70njfv776qgp3i52kr6yxg7x9qliqaj33jm5vkgbajw1ampsdx"; depends=[gtools]; }; + RankAggregator = derive2 { name="RankAggregator"; version="0.0.1"; sha256="0j4s4fv28fbc6ij6fzpmza9n5lfrql8ll33fi65vhczz9pjhpjii"; depends=[]; }; RankResponse = derive2 { name="RankResponse"; version="3.1.1"; sha256="04s588zbxcjgvpmbb2x46bbf5l15xm7pwiaxjgc1kn1pn6g1080c"; depends=[]; }; - Rankcluster = derive2 { name="Rankcluster"; version="0.94.2"; sha256="1wm7vbv2a4py9yjpcqrzcpfig18n02ip4qkqi62rw32abdlmz6sx"; depends=[Rcpp RcppEigen]; }; + Rankcluster = derive2 { name="Rankcluster"; version="0.94.4"; sha256="0hdyyncb39a8kl34mj1f296dafng8krk7fbggsj5wg2s181fnqb5"; depends=[Rcpp RcppEigen]; }; RankingProject = derive2 { name="RankingProject"; version="0.2.0"; sha256="1y2sydppi7y7j9c7r6xcqfm4v9z646w48pnksf11da8lq2nczww8"; depends=[]; }; RapidPolygonLookup = derive2 { name="RapidPolygonLookup"; version="0.1.1"; sha256="0h4snn3haa4a5rkafg98419by4nnz219wsm3y0dqgm4hw4bvha0g"; depends=[PBSmapping RANN RgoogleMaps sp]; }; RapidoPGS = derive2 { name="RapidoPGS"; version="1.0.2"; sha256="1lqvf563zzy5i0sljw7jqwilsj78yqnq821ghm0aqs9ixn5f9gn2"; depends=[bigsnpr curl data_table GenomicRanges IRanges RCurl]; }; @@ -3771,30 +3911,33 @@ in with self; { Rata = derive2 { name="Rata"; version="0.0.2"; sha256="1s7am08691lil5hbd8jpa5wnbvr0qqf0gkxczpm6yvizbjpx16qx"; depends=[ggplot2 glpkAPI lpSolveAPI reshape2 Rirt]; }; RatingScaleReduction = derive2 { name="RatingScaleReduction"; version="1.2.2"; sha256="15xkfjp0bkx9wjp8y27vs0iq2ir4qxjdl8405ix59sjb6lkvv3l2"; depends=[ggplot2 pROC]; }; RationalExp = derive2 { name="RationalExp"; version="0.2.2"; sha256="0a51sfps3sfb71m93jdsmbvj6kafbyfrq790ix238j570f5xafpg"; depends=[snowfall]; }; + Ravages = derive2 { name="Ravages"; version="0.1.1"; sha256="0gpmml2y8ai6nkdm6h54yfg3ymjlh5aq4q52sxn0v636krgbmixx"; depends=[BH dfidx Formula gaston mlogit Rcpp RcppEigen RcppParallel]; }; + RavenR = derive2 { name="RavenR"; version="2.0.1"; sha256="0kp5gfs4jfsl05cly79j5gpqbjdik6d3idknlyn86cd837mzc2dc"; depends=[colorspace cowplot deldir dplyr dygraphs gdata ggplot2 igraph lubridate magrittr ncdf4 purrr reshape2 rgdal rgeos scales sf sp xts zoo]; }; Rbeast = derive2 { name="Rbeast"; version="0.2.2"; sha256="12i6jm7x1hwkj6skva9sli02rm4krzb2gmzny68d9cjhdcan5baq"; depends=[]; }; Rbent = derive2 { name="Rbent"; version="0.1.0"; sha256="0xkb57dhhfd3342rv0xwbhbhn4zp5fbfch84fbh0sickm09l9vrj"; depends=[Rfit]; }; Rbgs = derive2 { name="Rbgs"; version="0.2"; sha256="1q0dnbcpgx7x9klr6z33z6g2p9p8mrmhnsqjy6qw15ch720rrgn3"; depends=[imager magrittr rJava]; }; Rbitcoin = derive2 { name="Rbitcoin"; version="0.9.2"; sha256="0ndq4kg1jq6h0jxwhpdp8sw1n5shg53lwa1x0bi7rifmy0gnh66f"; depends=[data_table digest RCurl RJSONIO]; }; - RblDataLicense = derive2 { name="RblDataLicense"; version="0.2.2"; sha256="1xra0sn4s8rrjmayg36jg6l3i1cvx9ngh30xyhi18226h0qinx9n"; depends=[RCurl xts]; }; + RblDataLicense = derive2 { name="RblDataLicense"; version="0.2.3"; sha256="1bkb4q2drz12j2saqq9basm8mw4wx5my28nnyiijrgmwmsd6hp9k"; depends=[RCurl xts]; }; Rblpapi = derive2 { name="Rblpapi"; version="0.3.10"; sha256="14wkrjfbjc3rb3159sz8wdvshmrh3d17s01swp59s8if7hr94hq0"; depends=[BH Rcpp]; }; Rborist = derive2 { name="Rborist"; version="0.2-3"; sha256="0qf4m6ibr4mlrmsybb5b8f1hkmp9n6ksjsxc4msd3q4rr99zkczk"; depends=[data_table digest Rcpp]; }; Rcan = derive2 { name="Rcan"; version="1.3.82"; sha256="0asmlhh786c9gfgxkqybv8xzz8bqzirxvq8nr4gglx1pc812idkb"; depends=[data_table ggplot2 scales]; }; Rcapture = derive2 { name="Rcapture"; version="1.4-3"; sha256="1rk1zgab6zi7hcmyqlb18kycv3cd15c7lwhw5kig96f2n3xymzig"; depends=[]; }; RcellData = derive2 { name="RcellData"; version="1.3-2"; sha256="1zzkgpj2pc42xzz5pspyj981a04gjpna4br3lxna255366ijgz4l"; depends=[]; }; - Rcereal = derive2 { name="Rcereal"; version="1.2.1"; sha256="0nl4p0wqpni16z62610sqcxsz1x6kannl2s1zakpmjkk80pyxlk6"; depends=[]; }; + Rcereal = derive2 { name="Rcereal"; version="1.2.1.1"; sha256="16gak1kgsnla89b6nbhfb5w9xfjhdpxza8sfc2isbhfggvl1h79j"; depends=[]; }; RcextTools = derive2 { name="RcextTools"; version="0.1.1"; sha256="1rrij4ryspff9mn1c3jlzjprnipak7nzlb488pk0ci0awaccp5ga"; depends=[data_table igraph sqldf visNetwork]; }; Rcgmin = derive2 { name="Rcgmin"; version="2013-2.21"; sha256="02igq7bdlxwa7ysfiyvqfhcvgm866lrp2z3060z5lmnp6afa0958"; depends=[numDeriv]; }; RchivalTag = derive2 { name="RchivalTag"; version="0.1.2"; sha256="0285n5mxs643546qhyqkccaq1fkn1hxagrhj2abahskfl53i9rsw"; depends=[dygraphs mapdata maps maptools ncdf4 oceanmap PBSmapping plyr pracma raster readr rgeos sp xts]; }; Rchoice = derive2 { name="Rchoice"; version="0.3-2"; sha256="0ldz39cx4blzikwr454f9w263hm8mscxv3rirryzs9xc8sb7j6df"; depends=[Formula maxLik msm plm plotrix]; }; RclusTool = derive2 { name="RclusTool"; version="0.91.3"; sha256="0f6v2p6dg3fq3vzys6hgwmmgyrxfj2kb4wpbywd7f9p5yd9cfd88"; depends=[class cluster conclust corrplot e1071 factoextra FactoMineR ggplot2 jpeg MASS mclust mda mmand nnet png randomForest reshape sp stringi stringr tcltk2 tkrplot]; }; - Rcmdr = derive2 { name="Rcmdr"; version="2.6-2"; sha256="1fv4qx4w9x3gi64vba9qdkp6kghl83z5q7mmdjx7068n484kyhm1"; depends=[abind car effects lme4 RcmdrMisc relimp tcltk2]; }; + Rcmdr = derive2 { name="Rcmdr"; version="2.7-1"; sha256="1rqj5xdafiqks42ai5rdmvk6szjn1b8yrpssx969d6pdv2pxv96j"; depends=[abind car effects lme4 RcmdrMisc relimp tcltk2]; }; RcmdrMisc = derive2 { name="RcmdrMisc"; version="2.7-1"; sha256="1djm21mfk1l8zmaz6p51li0swpvzs05z9p11ad83d5rbbkdpwl7w"; depends=[abind car colorspace e1071 foreign haven Hmisc lattice MASS nortest readstata13 readxl sandwich]; }; - RcmdrPlugin_BWS1 = derive2 { name="RcmdrPlugin.BWS1"; version="0.1-2"; sha256="1nkrrr90z7ard070i93fsrsw4zdx8vd975846kf4r9kljmbjnii9"; depends=[crossdes Rcmdr support_BWS support_CEs survival]; }; + RcmdrPlugin_BWS1 = derive2 { name="RcmdrPlugin.BWS1"; version="0.1-4"; sha256="1iaywd6wvz41whxzpncbvzyg0k8bgi04banna59pz115dqaqwpmd"; depends=[crossdes Rcmdr support_BWS support_CEs survival]; }; RcmdrPlugin_BiclustGUI = derive2 { name="RcmdrPlugin.BiclustGUI"; version="1.1.3"; sha256="1v0vdr6rffcq5qjqwmnmxbjwcf01zp7lrj81grnjxwqg4xjrcj69"; depends=[BcDiag BiBitR BicARE biclust fabia gplots iBBiG Rcmdr s4vd superbiclust viridis]; }; + RcmdrPlugin_DCCV = derive2 { name="RcmdrPlugin.DCCV"; version="0.1-0"; sha256="0bxq1ar2l7222pd5zqibza8qmqgv26lvacc297qfc0nyyj761ghp"; depends=[DCchoice Rcmdr]; }; RcmdrPlugin_DoE = derive2 { name="RcmdrPlugin.DoE"; version="0.12-3"; sha256="1iifn71kjjgcp7dfz2pjq57mgbv4rrznrl3b3k9gdc2dva1z9zvc"; depends=[DoE_base DoE_wrapper FrF2 Rcmdr RcmdrMisc relimp]; }; RcmdrPlugin_EACSPIR = derive2 { name="RcmdrPlugin.EACSPIR"; version="0.2-2"; sha256="10r6rb0fwlilcnqxa38zh7yxc54x1a0by5x4f6gzdn9zs7aj5l1r"; depends=[abind ez nortest R2HTML Rcmdr RcmdrMisc reshape]; }; RcmdrPlugin_EBM = derive2 { name="RcmdrPlugin.EBM"; version="1.0-10"; sha256="02zips1jbfn7cshjlrm1gr632px2zxlys8i0f1nrf1gifl44v1qw"; depends=[abind epiR Rcmdr]; }; - RcmdrPlugin_EZR = derive2 { name="RcmdrPlugin.EZR"; version="1.51"; sha256="1cyfgg48mz5c0fygl4wwd1ijqg0hjzijd6298rvjpin7x7gra3i4"; depends=[Rcmdr readstata13]; }; + RcmdrPlugin_EZR = derive2 { name="RcmdrPlugin.EZR"; version="1.54"; sha256="01pbl09c233aqq85vksr9zdb79hkh6r79r4kkbbmp7n8nclfgfsg"; depends=[Rcmdr readstata13]; }; RcmdrPlugin_EcoVirtual = derive2 { name="RcmdrPlugin.EcoVirtual"; version="1.0"; sha256="0q879wnrmgbaddv883q9zdnp0i7kjcgn8cffv7lp8nrsqil6l7mc"; depends=[EcoVirtual Rcmdr]; }; RcmdrPlugin_Export = derive2 { name="RcmdrPlugin.Export"; version="0.3-1"; sha256="17fn3si6b6h20c52k1k6fv9mslw3f9v0x1kxixzcvq54scdx0sk0"; depends=[Hmisc Rcmdr xtable]; }; RcmdrPlugin_FactoMineR = derive2 { name="RcmdrPlugin.FactoMineR"; version="1.7"; sha256="1145rpzhq219sl0j2bg5xa0ihq13lmr7ahcn3db4a8mqlz2fp8zy"; depends=[FactoMineR Rcmdr]; }; @@ -3805,25 +3948,24 @@ in with self; { RcmdrPlugin_KMggplot2 = derive2 { name="RcmdrPlugin.KMggplot2"; version="0.2-6"; sha256="0xh0lfgmr5sc15f3v5avwy1zl0gk1krlw3jb1prjyk9prp8albz9"; depends=[ggplot2 ggthemes plyr Rcmdr RColorBrewer scales survival tcltk2]; }; RcmdrPlugin_MA = derive2 { name="RcmdrPlugin.MA"; version="0.0-2"; sha256="1zivlc0r2mkxpx23ba76njmb2wnnjijysvza4f24dg4l47d0sr2p"; depends=[MAd metafor Rcmdr]; }; RcmdrPlugin_MPAStats = derive2 { name="RcmdrPlugin.MPAStats"; version="1.2.2"; sha256="1ynj42p12ncgrbghd8w7mkyys2cq9r9dpbir57rj3k5l46yzj7d5"; depends=[ordinal Rcmdr]; }; - RcmdrPlugin_NMBU = derive2 { name="RcmdrPlugin.NMBU"; version="1.8.11"; sha256="01isc6wswbi39jdgq2wbc3akbjv6fa5x33q1wrmbcc9ph6lvlr4h"; depends=[car MASS mixlm phia pls Rcmdr xtable]; }; + RcmdrPlugin_NMBU = derive2 { name="RcmdrPlugin.NMBU"; version="1.8.12"; sha256="0hl6242xssdbin4xdf5k0qrivdkrmmjpn3mj2nsndsr7wi8rbf1z"; depends=[car MASS mixlm phia pls Rcmdr xtable]; }; RcmdrPlugin_PcaRobust = derive2 { name="RcmdrPlugin.PcaRobust"; version="1.1.4"; sha256="17rq3sv8payazjjn5j37cgd6df5b62d2y8al3grw6hw5nfba7lvn"; depends=[Rcmdr robustbase rrcov tkrplot]; }; RcmdrPlugin_RMTCJags = derive2 { name="RcmdrPlugin.RMTCJags"; version="1.0-2"; sha256="04g5a1dpch54k5ckfkrg4vsap1nc3af1i0i559qigv3hy8n7pm80"; depends=[coda igraph Rcmdr rjags rmeta runjags]; }; RcmdrPlugin_ROC = derive2 { name="RcmdrPlugin.ROC"; version="1.0-18"; sha256="0alwsvwry4k65ps00zvdqky9rh663bbfaw15lhwydbgcpqdkn2n6"; depends=[pROC Rcmdr ResourceSelection ROCR]; }; RcmdrPlugin_RiskDemo = derive2 { name="RcmdrPlugin.RiskDemo"; version="2.0"; sha256="1mclhcb138f13p7ghiggdm8zjrgxqrn3zn8biygfy6yvhw2j396p"; depends=[demography ftsa Rcmdr rgl]; }; RcmdrPlugin_SCDA = derive2 { name="RcmdrPlugin.SCDA"; version="1.2.0"; sha256="1yg2b5vcnf956w04phxg15a4my9hvkbc27nzyn30b2wn47ysxghj"; depends=[Rcmdr SCMA SCRT SCVA]; }; RcmdrPlugin_SLC = derive2 { name="RcmdrPlugin.SLC"; version="0.2"; sha256="1nwpzmgfla1y05dxf81w0wmvvmvcq5jn5k8phlq30920ia7ybs8g"; depends=[Rcmdr SLC]; }; - RcmdrPlugin_TeachStat = derive2 { name="RcmdrPlugin.TeachStat"; version="1.0.10"; sha256="0kbbvwjyfmd14d2nxiyin934vz3n3fgbp04bb8hxpcff3sp3wbxk"; depends=[Hmisc randtests Rcmdr tcltk2 tseries]; }; - RcmdrPlugin_TeachingDemos = derive2 { name="RcmdrPlugin.TeachingDemos"; version="1.1-0"; sha256="0fgl1v1g74ca14pf3mmbv26j09v7jy6ddyap5qavgiy9s8qrwrh8"; depends=[Rcmdr rgl TeachingDemos tkrplot]; }; + RcmdrPlugin_TeachStat = derive2 { name="RcmdrPlugin.TeachStat"; version="1.1.0"; sha256="1djyiqj7k96csrbzql5gmi5dca3c8rf3ymskfskrx62zpxmn4xic"; depends=[distr distrEx Hmisc IndexNumR lme4 randtests Rcmdr tcltk2 tseries]; }; + RcmdrPlugin_TeachingDemos = derive2 { name="RcmdrPlugin.TeachingDemos"; version="1.2-0"; sha256="14zsqjni2w2smq99cv1pjdw90zw83g4nn7h7cn07fms9j0g12yd6"; depends=[Rcmdr TeachingDemos]; }; RcmdrPlugin_UCA = derive2 { name="RcmdrPlugin.UCA"; version="4.2-6"; sha256="1fdy1xvrfjy2yz9ihhayj3d0avyx8xqlblb2wv73fmqvnvihag49"; depends=[randtests Rcmdr rmarkdown TeachingDemos tseries]; }; - RcmdrPlugin_WorldFlora = derive2 { name="RcmdrPlugin.WorldFlora"; version="1.0"; sha256="1hjk3f4r71f3615139h0986bgx09h7ayd6shsvyj37axhkvivj8q"; depends=[Rcmdr WorldFlora]; }; + RcmdrPlugin_WorldFlora = derive2 { name="RcmdrPlugin.WorldFlora"; version="1.1"; sha256="1cv580ar1kp0174h2mcg05nrr1d8sdlmimhyzk908gjhghmi6ahj"; depends=[Rcmdr WorldFlora]; }; RcmdrPlugin_aRnova = derive2 { name="RcmdrPlugin.aRnova"; version="0.0.5"; sha256="0ys3565pcbr554yb1gi2h149vhvwc0gdfmh7mz8zzd4367hqn553"; depends=[Rcmdr]; }; RcmdrPlugin_coin = derive2 { name="RcmdrPlugin.coin"; version="1.0-22"; sha256="0qmdjnjmgq52wgl4llg69q9x7hvwd73mz3swv0sv88v8zqg7xj93"; depends=[coin multcomp Rcmdr survival]; }; - RcmdrPlugin_depthTools = derive2 { name="RcmdrPlugin.depthTools"; version="1.3"; sha256="09mjn5jn4rdj1lh515vr3xlnk615flg13kcwbpk0an2si4xkgm9h"; depends=[depthTools Rcmdr]; }; + RcmdrPlugin_depthTools = derive2 { name="RcmdrPlugin.depthTools"; version="1.4"; sha256="16y60yymx97nh587939lahsh0mk53yy25zy6i90l9vad0r7ih23v"; depends=[depthTools Rcmdr]; }; RcmdrPlugin_lfstat = derive2 { name="RcmdrPlugin.lfstat"; version="0.8.3"; sha256="1rcr43dqyb9zw9av3awkz0640vmvhxrafal5brnhqnpg4hfbpma3"; depends=[lfstat Rcmdr]; }; RcmdrPlugin_orloca = derive2 { name="RcmdrPlugin.orloca"; version="4.7"; sha256="01yd1a7l9r8mb3gqhx7rq9cr3clpjfzzsq7pply6xhv9g77gs88z"; depends=[orloca orloca_es Rcmdr]; }; RcmdrPlugin_plotByGroup = derive2 { name="RcmdrPlugin.plotByGroup"; version="0.1-0"; sha256="10wc7lnihsrldsynq2s0syr1aqmvfnj9rhgwh1nkk7jlrwcgj0z6"; depends=[lattice Rcmdr]; }; RcmdrPlugin_pointG = derive2 { name="RcmdrPlugin.pointG"; version="0.6.6"; sha256="0sc3akbpdys353va05b40g3rq8qihw0pmhvv0kckkhsgrbr8mc07"; depends=[Rcmdr RColorBrewer]; }; - RcmdrPlugin_qual = derive2 { name="RcmdrPlugin.qual"; version="2.2.6"; sha256="00wznh0k909cd9vwdj1ag3224xkqnwjsad1bfkgxbszsx0w6xvy9"; depends=[Rcmdr]; }; RcmdrPlugin_sampling = derive2 { name="RcmdrPlugin.sampling"; version="1.1"; sha256="0fx0s63wq0si1jydl9xyj9ny7iglg91zpvkyrnc05i5pan9l3xd9"; depends=[lpSolve MASS Rcmdr sampling]; }; RcmdrPlugin_sos = derive2 { name="RcmdrPlugin.sos"; version="0.3-0"; sha256="1r9jxzmf5ks62b5jbw0pkf388i1lnld6i27xhfzysjqdxcnzdsdz"; depends=[Rcmdr sos tcltk2]; }; RcmdrPlugin_steepness = derive2 { name="RcmdrPlugin.steepness"; version="0.3-2"; sha256="1na98sl42896y7yklaj07sn88lj6p6ik7gwy9ffaxzicqaa8plgf"; depends=[Rcmdr steepness]; }; @@ -3833,14 +3975,14 @@ in with self; { Rcolombos = derive2 { name="Rcolombos"; version="2.0.2"; sha256="0l92icjqqm5fxafqwd09lnmv5x6kvjdg8cphlm37q86nslwr5rkk"; depends=[httr]; }; Rcplex = derive2 { name="Rcplex"; version="0.3-3"; sha256="0abmrqphrpdlc831hwbwx15z4vdgn385kxhnqlbb9v0sjmfyszsl"; depends=[slam]; }; Rcpp = derive2 { name="Rcpp"; version="1.0.5"; sha256="012wbj446k1wz6bp6bpf6h77ypvcsw69xvnax6qf6vyc7dj2qimq"; depends=[]; }; - Rcpp11 = derive2 { name="Rcpp11"; version="3.1.2.0"; sha256="1x6n1z7kizagr5ymvbwqb7nyn3lca4d4m0ks33zhcn9gay6g0fac"; depends=[]; }; + Rcpp11 = derive2 { name="Rcpp11"; version="3.1.2.0.1"; sha256="0vw41plcl7hbi0af3la0sb4x8zqnhxjpjslx8r8cllfamy9dixki"; depends=[]; }; RcppAPT = derive2 { name="RcppAPT"; version="0.0.6"; sha256="0gkvs276hwa4yzd1bwf12p83cq2i1k021nq4y6ll1gcrj41mkdns"; depends=[Rcpp]; }; RcppAlgos = derive2 { name="RcppAlgos"; version="2.4.1"; sha256="0s97v2agy8pzaqfjm7cabpfxpkidxl1zwi4vkjdhsfzxjp5xwwms"; depends=[gmp Rcpp RcppThread]; }; - RcppAnnoy = derive2 { name="RcppAnnoy"; version="0.0.16"; sha256="0bfa35lp6vc4b0h3ymvdx50br233q8vvyjml34ngi81rj0imz3fr"; depends=[Rcpp]; }; - RcppArmadillo = derive2 { name="RcppArmadillo"; version="0.9.900.2.0"; sha256="03dfy0avzpiaf1jk8h18y2gyj3zwlfvvfixi13q3zq5qaz93by2r"; depends=[Rcpp]; }; + RcppAnnoy = derive2 { name="RcppAnnoy"; version="0.0.18"; sha256="0n68cf77gz34iq6w6ad87pbqwqam45nxp1gjzns4g6qhf7qdvrz4"; depends=[Rcpp]; }; + RcppArmadillo = derive2 { name="RcppArmadillo"; version="0.10.1.2.0"; sha256="0nzi6plhdijx3khavmywzw9wbch0hj8kygphw35wdlslm4cnqcj1"; depends=[Rcpp]; }; RcppBDT = derive2 { name="RcppBDT"; version="0.2.3"; sha256="0gnj4gz754l80df7w3d5qn7a57z9kq494n00wp6f7vr8aqgq8wi1"; depends=[BH Rcpp]; }; - RcppBigIntAlgos = derive2 { name="RcppBigIntAlgos"; version="0.2.4"; sha256="0vy95igfsdnh55vavkhl38f793ifhf63iaxdy3q7m5lhy3fakcz4"; depends=[gmp Rcpp RcppThread]; }; - RcppCCTZ = derive2 { name="RcppCCTZ"; version="0.2.8"; sha256="13r6linn4hrzn1ia68pir861awv55bc99zm2myv68ppkb0w4m15w"; depends=[Rcpp]; }; + RcppBigIntAlgos = derive2 { name="RcppBigIntAlgos"; version="1.0.0"; sha256="1mk3xy5dggvmilm6dnwxz4kj0k0hdza9wssn4838238xyd3mzv8x"; depends=[gmp Rcpp RcppThread]; }; + RcppCCTZ = derive2 { name="RcppCCTZ"; version="0.2.9"; sha256="1bnagfhx70xmzjddbaf1cpz4hmx3mhym4fg36hr9025yl7n4agvj"; depends=[Rcpp]; }; RcppCNPy = derive2 { name="RcppCNPy"; version="0.2.10"; sha256="175bn75akwgz3vcp0n59kiqqz7q9cwkvih241nj8v810cp4gpmkp"; depends=[Rcpp]; }; RcppCWB = derive2 { name="RcppCWB"; version="0.3.0"; sha256="1jzr7zgaq2gkqialscr9zh9imax37rdg1zshvj42cwf30za0fb8f"; depends=[Rcpp]; }; RcppClassic = derive2 { name="RcppClassic"; version="0.9.12"; sha256="0v9v34i1c4dkplavdl14kz1k2rnk4hsaiyv6rkc9403z9isvzzr0"; depends=[Rcpp]; }; @@ -3849,17 +3991,17 @@ in with self; { RcppDL = derive2 { name="RcppDL"; version="0.0.5"; sha256="1gii00bna6k9byaax7gsx42dv1jjnkrp4clbmdq59ybq3vkvw8z2"; depends=[Rcpp]; }; RcppDate = derive2 { name="RcppDate"; version="0.0.1"; sha256="0psa7drm6chwn5w3h6yhaavf33mvzfaghzqa404l5yvxczy22xqi"; depends=[]; }; RcppDist = derive2 { name="RcppDist"; version="0.1.1"; sha256="02g57xwfipdcljv06krhm02dbqn9kfyj2km6rdg0a7vq9prwdz1x"; depends=[Rcpp RcppArmadillo]; }; - RcppDynProg = derive2 { name="RcppDynProg"; version="0.1.4"; sha256="09ylswc8g4v79n1f7vhdbva7rxm8r5xic1rl4fq45w5c1wsgd74j"; depends=[Rcpp RcppArmadillo wrapr]; }; - RcppEigen = derive2 { name="RcppEigen"; version="0.3.3.7.0"; sha256="1b78qcjim0n9klgkr82n794d6bj9r9f33g0kcsszsns2hir65sk2"; depends=[Matrix Rcpp]; }; + RcppDynProg = derive2 { name="RcppDynProg"; version="0.2.0"; sha256="10nc0sx3n83kg8rddbajifr9q8iyjmm59z5xcpqfmmfi345i26al"; depends=[Rcpp RcppArmadillo wrapr]; }; + RcppEigen = derive2 { name="RcppEigen"; version="0.3.3.9.1"; sha256="0qp9gypar280lm84pc8w0fxw4jgwqygwi3qnl5sl52kpkcj8c14a"; depends=[Matrix Rcpp]; }; RcppEigenAD = derive2 { name="RcppEigenAD"; version="1.0.0"; sha256="18zm9hsfqwiicxsdm87ix3qc261ljxxn2s736p6aayx82b6vwkz6"; depends=[BH functional memoise Rcpp RcppEigen Rdpack readr]; }; - RcppEnsmallen = derive2 { name="RcppEnsmallen"; version="0.2.13.0.1"; sha256="016nwz2z17sxw75sph6paj1xkss3zlmcqxiwmhw07ckyrhyf0vji"; depends=[Rcpp RcppArmadillo]; }; + RcppEnsmallen = derive2 { name="RcppEnsmallen"; version="0.2.15.0.1"; sha256="0x86hrii230v7lq424mdvf7py8frb9yvwhq5inwwj9snm1y438hp"; depends=[Rcpp RcppArmadillo]; }; RcppExamples = derive2 { name="RcppExamples"; version="0.1.9"; sha256="0568zipgjxgmx086mlfpp5n7v8kf50gwrylvhl1bgvzb2vvr9dhj"; depends=[Rcpp]; }; RcppFaddeeva = derive2 { name="RcppFaddeeva"; version="0.1.0"; sha256="1rah18sdfmbcxy83i7vc9scrwyr34kn9xljkv9pa31js68gn2jrl"; depends=[knitr Rcpp]; }; RcppGSL = derive2 { name="RcppGSL"; version="0.3.8"; sha256="17nlayy6gvwb3v6l5aiqm84i75yf4dfi3zclxrgpqwf3j9v09yvz"; depends=[Rcpp]; }; RcppGetconf = derive2 { name="RcppGetconf"; version="0.0.3"; sha256="1qcnn482h9b8aw798frnkza4bzzpihp0pf4s1mj6zmn2ar01hsl0"; depends=[Rcpp]; }; RcppGreedySetCover = derive2 { name="RcppGreedySetCover"; version="0.1.0"; sha256="1v84i9gsmvpkmgd4niqnzp58nhrgn2j4rggsrnlh391ikdfrl51x"; depends=[BH data_table Rcpp]; }; RcppHMM = derive2 { name="RcppHMM"; version="1.2.2"; sha256="0scdzmns1yw2gbarblzd6cbvndlysz54ff17qijiz17ql5cyzly6"; depends=[Rcpp RcppArmadillo]; }; - RcppHNSW = derive2 { name="RcppHNSW"; version="0.2.0"; sha256="0gqdkw7vkcm544rz45g0hplg836ygzbfwk9gh9wr0817icvdb3qv"; depends=[Rcpp]; }; + RcppHNSW = derive2 { name="RcppHNSW"; version="0.3.0"; sha256="01z0plf1i6dyibw4ica8shmijyk1grpqb886hcga72z2cpm4xsx0"; depends=[Rcpp]; }; RcppHungarian = derive2 { name="RcppHungarian"; version="0.1"; sha256="1yx7kjjampjk47l8cqpv727g0nv23dnld9n8iwf7h1myfrl3yb6h"; depends=[Rcpp]; }; RcppMLPACK = derive2 { name="RcppMLPACK"; version="1.0.10-7"; sha256="07vh1wyp2rxhfrb4vi5njchrby99bynd88na8qjxcnbypkgsrhbl"; depends=[BH Rcpp RcppArmadillo]; }; RcppMeCab = derive2 { name="RcppMeCab"; version="0.0.1.2"; sha256="0varavfbrqzma176rw0dr9v5chh7pxh5y9g0rs3v7hqnlghp22y2"; depends=[BH Rcpp RcppParallel]; }; @@ -3871,17 +4013,18 @@ in with self; { RcppQuantuccia = derive2 { name="RcppQuantuccia"; version="0.0.3"; sha256="0cj95y8jcjm33d65y42f5ijw775kq3mh2p0659mp3i3r9fvaishk"; depends=[BH Rcpp]; }; RcppRedis = derive2 { name="RcppRedis"; version="0.1.10"; sha256="07cxp0xdrg1bydlvgryf8jivlqicd880xdfdz6grhqqdxwss8qv1"; depends=[BH RApiSerialize Rcpp]; }; RcppRoll = derive2 { name="RcppRoll"; version="0.3.0"; sha256="0srzfhzkk42kzrdjnhbb37946jp1p688rgysy6k3i2is8jb21zyb"; depends=[Rcpp]; }; - RcppSMC = derive2 { name="RcppSMC"; version="0.2.1"; sha256="0k2k1pj05i6hf7gpar3r4mbv9cs04bd4v657saq9vhy30300vg49"; depends=[Rcpp RcppArmadillo]; }; - RcppSimdJson = derive2 { name="RcppSimdJson"; version="0.1.1"; sha256="0vdiqf6riiabb3igmnx95ihd1fv533923qizs71rqq7q2abfpp3a"; depends=[Rcpp]; }; + RcppSMC = derive2 { name="RcppSMC"; version="0.2.2"; sha256="1j9knzm71sszch2wzdr51s7ylmi5n1x540hs5z3ln3v8bz3rb0gn"; depends=[Rcpp RcppArmadillo]; }; + RcppSimdJson = derive2 { name="RcppSimdJson"; version="0.1.3"; sha256="1009mhpgbj06fs2zr0h9w6k7dzn49ss11ay6r8whq7alysfifz9b"; depends=[Rcpp]; }; + RcppSpdlog = derive2 { name="RcppSpdlog"; version="0.0.4"; sha256="02qq31xkn4i3s25670xmi72vbf56qymqnlsj2bba73q74nxxdxsv"; depends=[Rcpp]; }; RcppStreams = derive2 { name="RcppStreams"; version="0.1.3"; sha256="06il7q3afaws57m0fxf04f2p5dvs23l1f7gl78pxwzclacdy3839"; depends=[BH Rcpp]; }; RcppTN = derive2 { name="RcppTN"; version="0.2-2"; sha256="0m2wc5n1fzxv56s4gqqnygb24dbadgrpgjm4bs4hr6qazgjapymf"; depends=[Rcpp]; }; - RcppTOML = derive2 { name="RcppTOML"; version="0.1.6"; sha256="1nyv4ynryh8vcrzyq01nzj13is40bjhxazlj9ilapyjdv9h5w3bs"; depends=[Rcpp]; }; + RcppTOML = derive2 { name="RcppTOML"; version="0.1.7"; sha256="0h8517ipwqhqkhcfiyqmvsb585g01p0ra0azbpzyxip6pq6g029g"; depends=[Rcpp]; }; RcppThread = derive2 { name="RcppThread"; version="0.5.4"; sha256="1mlzng6di30p4nfvq9l3z241vb8rwnpa2yjbafs2vzrl6v3zcfnf"; depends=[]; }; RcppUUID = derive2 { name="RcppUUID"; version="1.0.0"; sha256="0sx25z71bkjsf3ggljqkv1pji5kc32i3lkq28igiwixxfl2kj89b"; depends=[BH Rcpp]; }; RcppXPtrUtils = derive2 { name="RcppXPtrUtils"; version="0.1.1"; sha256="0jh64c46gp99d2nsih14vx34pamc8i7gkmiy2nj94rx3sxq62yh5"; depends=[Rcpp]; }; RcppXsimd = derive2 { name="RcppXsimd"; version="7.1.4"; sha256="171281f8lbdnnv3q9x5c35ak8fkrymx7llnpv88dlh742z8nny1j"; depends=[Rcpp]; }; RcppXts = derive2 { name="RcppXts"; version="0.0.4"; sha256="143rhz97qh8sbr6p2fqzxz4cgigwprbqrizxpkjxyhq8347g8p4i"; depends=[Rcpp xts]; }; - RcppZiggurat = derive2 { name="RcppZiggurat"; version="0.1.5"; sha256="0zmr3nvm5j0fpwxk3x9kxpwqbr66ldfvd10zy8xlgjbslz9myvfv"; depends=[Rcpp RcppGSL]; }; + RcppZiggurat = derive2 { name="RcppZiggurat"; version="0.1.6"; sha256="0wgd1v2p7zajnbrjf3hfi56p3pk3ld6iwkanbb04bjbnlif2ay4w"; depends=[Rcpp RcppGSL]; }; Rcrawler = derive2 { name="Rcrawler"; version="0.1.9-1"; sha256="1m6b1h72h8qjqcg3lzw6im6lpnkxhjg65g9fdjjqay6vy52ynznj"; depends=[callr data_table doParallel foreach httr jsonlite selectr webdriver xml2]; }; Rcriticor = derive2 { name="Rcriticor"; version="2.0"; sha256="1cnmmcdp2g3syrlld1pm7101cbzxh02cpvqvgsj7mp6zxm2k5plv"; depends=[]; }; Rcsdp = derive2 { name="Rcsdp"; version="0.1.57.1"; sha256="1dya0c0fcwr6ydcamz8m06nnq0b80vg7b22dg5jv3qi1n1fgp4lv"; depends=[]; }; @@ -3890,35 +4033,36 @@ in with self; { Rd2roxygen = derive2 { name="Rd2roxygen"; version="1.11"; sha256="1sqzhfffap8i9nwclsj0q77sn6i0gzkn2hqfvw6k2w7j6aypyv4i"; depends=[formatR roxygen2 xfun]; }; Rdca = derive2 { name="Rdca"; version="0.1.0"; sha256="06s4n5xpla937q9f55xmsickvdiwiapxmwqvn6k0zsacisscaagl"; depends=[dplyr magrittr minpack_lm Rcpp RcppArmadillo Rdpack]; }; Rdice = derive2 { name="Rdice"; version="1.0.0"; sha256="1xibvm690808p2g3jch7rh1825yrpgln2hjfclgxjwn822qvs4xr"; depends=[data_table]; }; - Rdimtools = derive2 { name="Rdimtools"; version="1.0.3"; sha256="0s1wq6cc0hsrb3iw8da0cwrf26s616cmlglkqlkg0bi91s0iw971"; depends=[CVXR maotai Rcpp RcppArmadillo RcppDE RcppDist Rcsdp Rdpack RSpectra]; }; + Rdimtools = derive2 { name="Rdimtools"; version="1.0.4"; sha256="07vd0i659pwfvv3drwff07k1wir0m3lhsgihhc135pcpw28j94cz"; depends=[CVXR maotai mclustcomp Rcpp RcppArmadillo RcppDE RcppDist Rcsdp Rdpack RSpectra]; }; Rdistance = derive2 { name="Rdistance"; version="2.1.3"; sha256="03wh6y9h5jgfc6xdncpgyz0v7lqavikp3pf5wwfmm2rqfj7yjr8c"; depends=[]; }; - Rdpack = derive2 { name="Rdpack"; version="1.0.0"; sha256="069yh9h57z3gjl5ih1r6wyiwmgmfzkpjxrpxg8mfq7y6zr1mynsw"; depends=[bibtex gbRd]; }; + Rdpack = derive2 { name="Rdpack"; version="2.1"; sha256="1kmz0kq2z1xl55w22paz98x9jpss06abvicmkslv4zq77kz99q16"; depends=[gbRd rbibutils]; }; Rdroolsjars = derive2 { name="Rdroolsjars"; version="1.0.1"; sha256="1l9bc1bwpj10irr973hzkhr04i1f3g998n8hcl2k2i9kgv1naqmz"; depends=[rJava]; }; - Rdrw = derive2 { name="Rdrw"; version="1.0.1"; sha256="0nagl559jr6vyq47k7axg2ivgbawmb60j80xkc8rbdapl5cb5ky1"; depends=[mvtnorm]; }; + Rdrw = derive2 { name="Rdrw"; version="1.0.2"; sha256="1487r8z6h1y0v6fxkp7qfbh7j96hw8gqbb0fc90m4cxwz0hrqrn2"; depends=[mvtnorm]; }; Rdsdp = derive2 { name="Rdsdp"; version="1.0.5"; sha256="04268fbajm7pgi5mxpghzw0yjwwx1dy9vdi6yhr20q2lmi6xh19w"; depends=[]; }; Rdsm = derive2 { name="Rdsm"; version="2.1.1"; sha256="07fc6c2hv0vvg15va552y54cla1mrqsd75w3zh02vc7yd226l4rj"; depends=[bigmemory]; }; Rdta = derive2 { name="Rdta"; version="1.0.0"; sha256="1zmyh61wrzqwyfjbfcxg41cri7hy9r0jfwnixcvd086y0vxq7fdn"; depends=[MCMCpack mvtnorm Rdpack]; }; Rdtq = derive2 { name="Rdtq"; version="0.1"; sha256="114pyf95nl132014ygn84xi41c2zf1ii2wfgd1acwnnmfzvdw24s"; depends=[Matrix Rcpp]; }; Rduino = derive2 { name="Rduino"; version="0.1"; sha256="0r1yy3a2n8a4niasfjn77gv130a062i802r7xhbg0abljv5m6ra5"; depends=[serial]; }; ReCiPa = derive2 { name="ReCiPa"; version="3.0"; sha256="019vlvgxnqqlwghxygfqggzp2b4x2pqzdrbhaa703zdhm58k0n1g"; depends=[]; }; - ReDaMoR = derive2 { name="ReDaMoR"; version="0.4.2"; sha256="1bvhplbzn3axpl9vwygd209dmfm123ix3c2dpx1i09nhvy2v65lv"; depends=[colourpicker crayon dplyr DT igraph jsonlite magrittr markdown readr rintrojs rstudioapi shiny shinyjs visNetwork]; }; + ReDaMoR = derive2 { name="ReDaMoR"; version="0.4.3"; sha256="0dpqa1j43zgrbp77hyymnw6llqfii95q9ivsxidslkdrj3bqb5dc"; depends=[colourpicker crayon dplyr DT igraph jsonlite magrittr markdown readr rintrojs rstudioapi shiny shinyjs visNetwork]; }; ReIns = derive2 { name="ReIns"; version="1.0.10"; sha256="04rqb2jhmgq1az1c1rbs6jfg6gpxjs34k0m4w3a8gnq48l6dwqi8"; depends=[doParallel foreach Rcpp survival]; }; ReacTran = derive2 { name="ReacTran"; version="1.4.3.1"; sha256="05c9jfvj134gy3by7m3r1fbar0m39vaydr7d2py9cakzs44fqfpj"; depends=[deSolve rootSolve shape]; }; ReadDIM = derive2 { name="ReadDIM"; version="0.2.10"; sha256="0lljl7iazjykgr5kr6j9is5hcs1h7x9im6rxflsniry6bm9j7qy3"; depends=[raster rgdal rgeos sp stringr]; }; RealVAMS = derive2 { name="RealVAMS"; version="0.4-3"; sha256="14jqrqza7bs11y1004wzi3bxkvkdfn43d82l0cyh6py8p37rfz28"; depends=[Matrix numDeriv Rcpp RcppArmadillo]; }; Rearrangement = derive2 { name="Rearrangement"; version="2.1"; sha256="0q253nj62rl65vjsq6503r80qa2j35wac8lv7ydp9w260p28z923"; depends=[quantreg]; }; + RecAssoRules = derive2 { name="RecAssoRules"; version="1.0"; sha256="0jvl9yl1rg69bqb1cimi8r0bry73jhsq73fxfyy33ljwym2cdgv6"; depends=[Rcpp]; }; Recon = derive2 { name="Recon"; version="0.3.0.0"; sha256="11gag2bl00pcy7ysfycaa58qarh6aigznldkc4kkn2178bl4ii62"; depends=[rootSolve]; }; - RecordLinkage = derive2 { name="RecordLinkage"; version="0.4-12"; sha256="0ycx2y8dbcslsvyvr2spnr5jy8m5la11ji0scdlqjymaamij8f3h"; depends=[ada data_table DBI e1071 evd ff ffbase ipred nnet rpart RSQLite xtable]; }; - RecordTest = derive2 { name="RecordTest"; version="0.1.2"; sha256="19gxghp8b56gbyv2crjq2bzgaw5m3agd467ihbwkkjqli8cisgip"; depends=[ggplot2]; }; + RecordLinkage = derive2 { name="RecordLinkage"; version="0.4-12.1"; sha256="0l837hmcn1gwisn1y9q745grg1fyrdbx44jhj81475h2zdn8dbs4"; depends=[ada data_table DBI e1071 evd ff ipred nnet rpart RSQLite xtable]; }; + RecordTest = derive2 { name="RecordTest"; version="1.0.1"; sha256="1sxwnjkp6hvdfc6xfjldi9sbvy9wbzvw4x920ms3pfpvf7x7q930"; depends=[ggplot2]; }; Records = derive2 { name="Records"; version="1.0"; sha256="08y1g2m6bdrvv4rpkhd5v2lh7vprxy9bcx9ahp1f7p062bn2lwji"; depends=[]; }; RecurRisk = derive2 { name="RecurRisk"; version="1.0.2"; sha256="0ss1s0l8hycz90awfa5k4gxiql7ncqfn7vgipdnrxh0ly9s86j9m"; depends=[flexsurvcure SEER2R survival]; }; RedditExtractoR = derive2 { name="RedditExtractoR"; version="2.1.5"; sha256="1b6pp1vdn7jnyl8k828dgkxrx8sy2wyhkrn4rnfavqw4qvhm0mhm"; depends=[dplyr igraph magrittr RJSONIO rlang visNetwork]; }; Redmonder = derive2 { name="Redmonder"; version="0.2.0"; sha256="02qrz1b0g7hdacj2s2bks5gfwnypkbiwlmn0bv7im1zz1swg9cp8"; depends=[]; }; RefFreeEWAS = derive2 { name="RefFreeEWAS"; version="2.2"; sha256="1aya34iz5v3xfpj86x9ab998m7fdwl138ly007mgdayacvqi4a6y"; depends=[quadprog]; }; - RefManageR = derive2 { name="RefManageR"; version="1.2.12"; sha256="1hfxa1qacfryk36mpaqdhdgws5jwxiyy489ikd3wa18bp1wz8dkp"; depends=[bibtex httr jsonlite lubridate plyr stringr xml2]; }; + RefManageR = derive2 { name="RefManageR"; version="1.3.0"; sha256="1spzdp5ni52dybcaxqnhwdphh27wjyrsfy4hsxsplpg9rqwfqfps"; depends=[httr jsonlite lubridate plyr stringr xml2]; }; RegClust = derive2 { name="RegClust"; version="1.0"; sha256="1d9w74phw4fgafglc18j7dpmln96fvxnf1kdc9zddgj90p8yfx63"; depends=[]; }; RegSDC = derive2 { name="RegSDC"; version="0.4.0"; sha256="050b8m56qvbfm1mcbs9ns8mq7yzr645pkxm9238q11lxkx8lgahk"; depends=[MASS Matrix SSBtools]; }; - RegressionFactory = derive2 { name="RegressionFactory"; version="0.7.2"; sha256="1g23paq42xiiqavikbrflwmr8ikls9z97v1xpgg16pb88svdyayc"; depends=[]; }; + RegressionFactory = derive2 { name="RegressionFactory"; version="0.7.4"; sha256="0mhyjqp8x66zwnbxpwq3a8180z48rrm7hp50028grb2x19lp8qkd"; depends=[]; }; RegularizedSCA = derive2 { name="RegularizedSCA"; version="0.5.4"; sha256="1nw6hd9y2n1h3j1fqqkymz13xizv5xrsj93w702kkvkbwyl3yall"; depends=[colorspace ggplot2 gtools lattice mice psych RGCCA]; }; ReinforcementLearning = derive2 { name="ReinforcementLearning"; version="1.0.5"; sha256="0zk1hy4p5adyjm1430a8ad5acn9qaax1si8qqfxqayfmlj954sj9"; depends=[data_table ggplot2 hash]; }; RelValAnalysis = derive2 { name="RelValAnalysis"; version="1.0"; sha256="1jl1gfj44gfkmc1yp6g5wwn4miydwpvxwrg76rnkv9454zrc5pvp"; depends=[zoo]; }; @@ -3929,7 +4073,7 @@ in with self; { RelimpPCR = derive2 { name="RelimpPCR"; version="0.2.4"; sha256="0svfyh313wawzqx9hfb4cg0wn2ir6nd769z1k3dckdsb8d7xkh3q"; depends=[caret ggplot2 relaimpo reshape2 Rmisc]; }; Renext = derive2 { name="Renext"; version="3.1-0"; sha256="074djs4y71667aylpgh514pzijr90rgpzm4w5ayq9cgaqz22m3am"; depends=[evd numDeriv]; }; RenvModule = derive2 { name="RenvModule"; version="1.0"; sha256="0rlgprzy5a08km98yqxjw8lkiyfikryrrmdh6r8bfhx3g2721syc"; depends=[]; }; - Renvlp = derive2 { name="Renvlp"; version="2.8"; sha256="1avpy3hz693qj4d64mg6085hd0w6igwl1gs63jcda08d10zy6hg6"; depends=[Rsolnp]; }; + Renvlp = derive2 { name="Renvlp"; version="2.9"; sha256="0nra1hiwdwdfymmyhlq856p0ijlxakf4l2c5kah76gdyifv1vyvz"; depends=[Rsolnp]; }; ReorderCluster = derive2 { name="ReorderCluster"; version="1.0"; sha256="0ss750frzvj0bm1w7zblmcsjpszhnbffwlkaw31sm003lbx9hy58"; depends=[gplots Rcpp]; }; RepaymentPlan = derive2 { name="RepaymentPlan"; version="0.1.0"; sha256="1fd4n24bd5s2kqmls7mmsidblaf8nzm97kz52mfsb6i6fci0pgah"; depends=[]; }; RepeatedHighDim = derive2 { name="RepeatedHighDim"; version="2.0.0"; sha256="1n9w4jb25pm0mmsahlfhkp9jmhgp5b21l1g85gm2wbxqkjsg7g0g"; depends=[MASS nlme]; }; @@ -3937,17 +4081,18 @@ in with self; { Replication = derive2 { name="Replication"; version="0.1.2"; sha256="1za7zcdaf839xf8hxy4rcrr1p80n6a3ywb2bsl3wikwa0pxdvvbh"; depends=[blavaan lavaan MASS mice quadprog rjags runjags]; }; Repliscope = derive2 { name="Repliscope"; version="1.1.0"; sha256="0hij4ng77bkd979ndbhx1nqq2rfb69q23ghyd7illgvgrc79y9mr"; depends=[colourpicker ggplot2 shiny]; }; RepoGenerator = derive2 { name="RepoGenerator"; version="0.0.1"; sha256="0d6s2sqyycaqrg32xdkp3pr5i7qmvwrfrjcd7f94a9y3lz4bz5b5"; depends=[git2r httr rmarkdown rstudioapi]; }; - Require = derive2 { name="Require"; version="0.0.7"; sha256="06mzbdrf9qg6zkahmcz1yy6r1si14a296khi1rf5m8rcabb1982l"; depends=[data_table remotes]; }; + Require = derive2 { name="Require"; version="0.0.10"; sha256="13bzas88862jbia0s2gdl6jssv9n9byc2hg2c9cj03b69nxw71r0"; depends=[data_table remotes]; }; + ResearchAssociate = derive2 { name="ResearchAssociate"; version="1.0.1"; sha256="00j339ngc72gn2gyn1irjmazrv6l5nbsy3z25r6j1zrjwsbay15p"; depends=[ggplot2 plyr rentrez XML]; }; ResidentialEnergyConsumption = derive2 { name="ResidentialEnergyConsumption"; version="1.0.1"; sha256="1dkk9hbgkc01i765dknzrfdpzpbc9k57vc4am0pj28hmlj32a0vg"; depends=[stringr]; }; ResistorArray = derive2 { name="ResistorArray"; version="1.0-32"; sha256="0zqnl0bbqrj5hn5ywhlqyrlz5ryql88qahlgs9989v4rljcxxlam"; depends=[]; }; ResourceSelection = derive2 { name="ResourceSelection"; version="0.3-5"; sha256="1vg5fkjfwkganxf0ji70pkp071841hjgr5sjxlaky8mx7n0cy80x"; depends=[MASS Matrix pbapply]; }; - RestRserve = derive2 { name="RestRserve"; version="0.3.0"; sha256="19412fxz301q69zzw1lyg1f50gvjqynm5a2jyrdzj9pr9bzids6y"; depends=[checkmate jsonlite mime R6 Rcpp Rserve uuid]; }; + RestRserve = derive2 { name="RestRserve"; version="0.4.0"; sha256="07mm65yxzpwlg6x3lsggj41v8nl4m6v9mszhqjpgj19v3yxvwgi0"; depends=[checkmate jsonlite mime R6 Rcpp Rserve uuid]; }; RevEcoR = derive2 { name="RevEcoR"; version="0.99.3"; sha256="1nym263ynjdir5kxv35jnmki9mshlplq0sk3xnjd4ac6f1cfbfqj"; depends=[gtools igraph magrittr Matrix plyr purrr stringr XML]; }; Rexperigen = derive2 { name="Rexperigen"; version="0.2.1"; sha256="158ksnd1gvzq7ii0ys2v0wrfnr001hni0i8m77p1fn1arixgmqdw"; depends=[digest jsonlite RCurl]; }; RfEmpImp = derive2 { name="RfEmpImp"; version="2.1.5"; sha256="1bvjk71rfhpbj2j7raibsb0y3skbv1qba7yl2g00npnkk2zk14xj"; depends=[mice ranger]; }; Rfacebook = derive2 { name="Rfacebook"; version="0.6.15"; sha256="0hp2mbm0hnyasizszvh5x9hv7z2q633zck1a1gvk36nbxb1shx7c"; depends=[httpuv httr rjson]; }; - Rfast = derive2 { name="Rfast"; version="1.9.9"; sha256="18m8xhg24kygwhq7avdp1hibilicb5wppi2wdmc36fkqljc274y0"; depends=[Rcpp RcppArmadillo RcppZiggurat]; }; - Rfast2 = derive2 { name="Rfast2"; version="0.0.5"; sha256="07w0ypwy19cqf4h94pzh0y8fmq5ibr048qzarrs1qzlnk2hx7k4c"; depends=[Rcpp RcppArmadillo Rfast]; }; + Rfast = derive2 { name="Rfast"; version="2.0.1"; sha256="1cq3mcg49hsvqhwn6f4dgsx7f8ma4qnwr5n6s7m22qy57rg31958"; depends=[Rcpp RcppArmadillo RcppZiggurat]; }; + Rfast2 = derive2 { name="Rfast2"; version="0.0.8"; sha256="03ql7vlslz3l6s0vx8cifkk2kbh9fxav39mb8vwi9j7b4whbs988"; depends=[RANN Rcpp RcppArmadillo Rfast]; }; Rfit = derive2 { name="Rfit"; version="0.24.2"; sha256="1b3pza2xdpifvrcqbdp5r2wy82ws1844bnpna01hqj65xbw2iix8"; depends=[]; }; Rfolding = derive2 { name="Rfolding"; version="1.0"; sha256="15lf73zxr1slin9faj9k0z8qkb1g9nb7h080nfv99gsi2ks68ssg"; depends=[]; }; Rfractran = derive2 { name="Rfractran"; version="1.0"; sha256="0cwc069f7rhkxkr5kn0n43mdy8m47gh0q6d5ijwzkhncrijb10cy"; depends=[gmp]; }; @@ -3963,9 +4108,7 @@ in with self; { RidgeFusion = derive2 { name="RidgeFusion"; version="1.0-3"; sha256="10llmrsfpcqrkcbw7zj44kvfy7ywn9rk49n7zplilz8h94zzcmjv"; depends=[mvtnorm]; }; Ridit = derive2 { name="Ridit"; version="1.1"; sha256="02cni6hzf1bsns7vi8vklnhc0pfb5vwqhjnnfnjnnaxpzpsbvdfn"; depends=[]; }; RiemBase = derive2 { name="RiemBase"; version="0.2.4"; sha256="1h3ascbdgvp56k5ki6qr849296cdkr2bzc33pwwp033rmd8khpr3"; depends=[pracma Rcpp RcppArmadillo Rdpack]; }; - RiemBaseExt = derive2 { name="RiemBaseExt"; version="0.1.2"; sha256="0g0gkwjh1x18ay03f557g3zvb2cfivpx0pcgsrr3gm0gphli96v8"; depends=[cluster dbscan energy fastcluster kernlab Rcpp RcppArmadillo Rdpack RiemBase]; }; - RiemGrassmann = derive2 { name="RiemGrassmann"; version="0.1.0"; sha256="05dann9sdkdzmjp8jalxb963x42j7w007dk7vgkfngm62z6dr24v"; depends=[Rcpp RcppArmadillo RiemBase RiemBaseExt]; }; - RiemStiefel = derive2 { name="RiemStiefel"; version="0.1.1"; sha256="1sdib0xih81n059gi207q01gfb1ac1n02dsyq0qrdqnz1bhffk69"; depends=[Rcpp RcppArmadillo Rdpack RiemBase RiemBaseExt]; }; + Riemann = derive2 { name="Riemann"; version="0.1.0"; sha256="17k7qs0sppr7qwfjkn5v7pv60jzq1p32smd686w36mycd5ir9lp8"; depends=[maotai Rcpp RcppArmadillo Rdpack RiemBase]; }; Riex = derive2 { name="Riex"; version="1.0.1"; sha256="1jri01s08g819bvw0bgd5z5iaf9rlikkqq993lm0455k909wm34v"; depends=[dplyr ggplot2 httr purrr quantmod rjson stringr tibble tidyr tidyverse TTR urltools xts zoo]; }; Rilostat = derive2 { name="Rilostat"; version="1.1"; sha256="0a4bnp0a78a4yflxc535h0pajr4xaclfagx2f527p5ch5k23z2l6"; depends=[data_table dplyr DT haven plyr RCurl readr stringr tibble xml2]; }; Rinstapkg = derive2 { name="Rinstapkg"; version="0.1.0"; sha256="0fvj4jc00g5b8cc4mrsjj72fdcdmvlky05s2ca0g2gndrjs6vxic"; depends=[digest dplyr httr jsonlite lubridate purrr readr rlang uuid]; }; @@ -3980,7 +4123,7 @@ in with self; { RkMetrics = derive2 { name="RkMetrics"; version="1.3"; sha256="1k6vnr1r4h69iznib638z45gd0f8wc4g4h0ji9f0017883g77li1"; depends=[]; }; Rknots = derive2 { name="Rknots"; version="1.3.2"; sha256="1krhma8hy3l5lbm6d8rxjlj9jw1zrd16h4wy4p1clfa5vlhh3bwi"; depends=[bio3d rgl rSymPy]; }; Rlab = derive2 { name="Rlab"; version="2.15.1"; sha256="1pb0pj84i1s4ckdmcglqxa8brhjha4y4rfm9x0na15n7d9lzi9ag"; depends=[]; }; - Rlabkey = derive2 { name="Rlabkey"; version="2.5.2"; sha256="14vl0chazs6ghyya6pvmp1xazvw5zy92dldwzkn1psifrv5cb8fh"; depends=[httr jsonlite Rcpp]; }; + Rlabkey = derive2 { name="Rlabkey"; version="2.5.5"; sha256="0jm9dz0w0drl751j2vmanhgy6d7xaiydynwy0aq9pap9jg1hbq09"; depends=[httr jsonlite Rcpp]; }; Rlda = derive2 { name="Rlda"; version="0.2.6"; sha256="0i8n01h9072q339p1kiqhcpwphw0d2x6bsszbhgfqc2b160dk2bl"; depends=[coda doParallel foreach gtools Rcpp RcppArmadillo RcppProgress]; }; Rlgt = derive2 { name="Rlgt"; version="0.1-3"; sha256="0g610v5rch5s31gc7dy9zx4mcgsdhn82y1pmr2rs14qma0v7x515"; depends=[BH forecast Rcpp RcppEigen rstan rstantools sn StanHeaders]; }; Rlibeemd = derive2 { name="Rlibeemd"; version="1.4.1"; sha256="06bb939awawpwn4g63b9jzq5b658lsznzy272zl0fy19x62c6bwr"; depends=[Rcpp]; }; @@ -3996,18 +4139,19 @@ in with self; { Rmixmod = derive2 { name="Rmixmod"; version="2.1.5"; sha256="0cl0bl7554abjwz2as8gqvrzqswlw5727dac5302p7ksy3id9a1j"; depends=[Rcpp RcppEigen]; }; RmixmodCombi = derive2 { name="RmixmodCombi"; version="1.0"; sha256="0cwcyclq143938wby0aj265xyib6gbca1br3x09ijliaj3pjgdqi"; depends=[Rcpp Rmixmod]; }; Rmosek = derive2 { name="Rmosek"; version="1.3.5"; sha256="18q39n2p3gms9zqrl8g15rjjk4v64365v0rm8r7zvvivh1hy5xa0"; depends=[]; }; - Rmpfr = derive2 { name="Rmpfr"; version="0.8-1"; sha256="09kw7hyca8xc09r2d88qj81cclar8acaq5q9q5rw9f49iffda0rr"; depends=[gmp]; }; + Rmpfr = derive2 { name="Rmpfr"; version="0.8-2"; sha256="007pc7fpzl2mcg3qxa2vfjip6m2dr314qjsnybkj3kdj70bszxkl"; depends=[gmp]; }; Rmpi = derive2 { name="Rmpi"; version="0.6-9"; sha256="1rhycla98hxgnnxlxxldr1x51djak7c2jjvlrv3jcsvgwp1ymqdj"; depends=[]; }; Rmst = derive2 { name="Rmst"; version="0.0.3"; sha256="1fykpii17k460qlsjhhh5vag02lhkyk5l3zjmg8hifqp0cjhz2fl"; depends=[ggplot2 Rata reshape2 Rirt]; }; RnavGraphImageData = derive2 { name="RnavGraphImageData"; version="0.0.4"; sha256="1k1gnkghap878fck0bbz9mm0fr4cli6lh1d11r0cf47fvl6cc4gr"; depends=[]; }; Rnightly = derive2 { name="Rnightly"; version="0.1.0"; sha256="08sb4ic7my8b6xcjn9vim8wp4z3kvk0gyp604dg1az7czc7ics5r"; depends=[glue htmltools]; }; Rnmr1D = derive2 { name="Rnmr1D"; version="1.2.5"; sha256="0z97pmkksma225s948r0myd4638cy8vl1x2244w1r6n0cybymnd9"; depends=[base64enc doParallel foreach ggplot2 igraph impute MASS MassSpecWavelet Matrix plotly plyr ptw Rcpp signal speaq XML]; }; Rnumerai = derive2 { name="Rnumerai"; version="2.1"; sha256="1f16fp9gzcaz3ad7iyw10n8jrnmnhxygn00mrcg582jz62dih9bd"; depends=[dplyr ggplot2 httr lubridate purrr tidyr]; }; - RoBMA = derive2 { name="RoBMA"; version="1.0.4"; sha256="0zd18d2zlh9pcwpmz2y5v5gp6lrsgj2cyrz2cg8d26lr0dvgwhp2"; depends=[BH bridgesampling callr coda DPQ extraDistr psych Rdpack rjags runjags scales]; }; + RoBMA = derive2 { name="RoBMA"; version="1.1.2"; sha256="0f2fjj9hz71gacsimv9gmg8hw72k8r7lmlrbhlhbws642wjs5lwj"; depends=[BH bridgesampling callr coda DPQ extraDistr psych Rdpack rjags runjags scales]; }; RobAStBase = derive2 { name="RobAStBase"; version="1.2.1"; sha256="0dn93bcyz9kxbj38sc1wisfa6v0666v9gk6y3zq0ihjkkhkmdwq3"; depends=[distr distrEx distrMod RandVar rrcov startupmsg]; }; RobAStRDA = derive2 { name="RobAStRDA"; version="1.2.0"; sha256="1s84j5in4av9zbbszv8j2rpigrd9ws9h4hz64jw7xagsj3xb49kz"; depends=[]; }; RobExtremes = derive2 { name="RobExtremes"; version="1.2.0"; sha256="150p94f0g75g54qcaq4x45lk4sxiyvv1zs4hxkicf46raybvsv89"; depends=[actuar distr distrEx distrMod evd RandVar RobAStBase RobAStRDA robustbase ROptEst startupmsg]; }; - RobGARCHBoot = derive2 { name="RobGARCHBoot"; version="1.0.1"; sha256="1zybpvxp0jj15vvwj3s5adh62fijmdq3nhxl7xapigdc6qaskiv1"; depends=[Rcpp RcppArmadillo]; }; + RobGARCHBoot = derive2 { name="RobGARCHBoot"; version="1.2.0"; sha256="142r6cmzwhg4xfbpbgrvngncm2wczly2arg6p8612ypjsk4yinrf"; depends=[doParallel doRNG foreach Rcpp RcppArmadillo]; }; + RobKF = derive2 { name="RobKF"; version="1.0.0"; sha256="05afy56zxl5908z2gqrwsqm19m49q85bz634rmfipb3zmv1pci79"; depends=[ggplot2 Matrix Rcpp RcppEigen Rdpack reshape2]; }; RobLox = derive2 { name="RobLox"; version="1.2.0"; sha256="1lcylkskfidg576lqfi84l14rvrpfbzmr53hcgzzmfipxhli4dr8"; depends=[Biobase distr distrMod lattice RandVar RColorBrewer RobAStBase]; }; RobLoxBioC = derive2 { name="RobLoxBioC"; version="1.2.0"; sha256="01lydp67v7mc4v3svsnl4zqq2jy1czwg9l9blngjn9ky0hv3haf5"; depends=[affy AnnotationDbi beadarray Biobase BiocGenerics distr distrMod lattice RColorBrewer RobLox]; }; RobMixReg = derive2 { name="RobMixReg"; version="1.1.0"; sha256="13w6zvncwh561wzzqy548x0w25rnzf0pfvi5cc6mzn71x5l7cmh2"; depends=[dplyr flexmix glmnet gplots gtools lars MASS RColorBrewer rlang robust robustbase scales]; }; @@ -4020,12 +4164,12 @@ in with self; { RobustAFT = derive2 { name="RobustAFT"; version="1.4-5"; sha256="1i119qqlavfj7k0srb8fbbyy2nhsjv9rgrni854liizr9m51cgac"; depends=[robustbase survival]; }; RobustBayesianCopas = derive2 { name="RobustBayesianCopas"; version="1.0"; sha256="1l6rp3b65927nx2z2xqk6rf1k75fbnflapdjvkq81i9bhwl5q1i5"; depends=[rjags statip]; }; RobustCalibration = derive2 { name="RobustCalibration"; version="0.5.1"; sha256="0wsnvryvrl37acljrda2dm1d8aynqiy66yd2i857m035whixfpqa"; depends=[Rcpp RcppEigen RobustGaSP]; }; - RobustGaSP = derive2 { name="RobustGaSP"; version="0.6.0"; sha256="08f5kkpxv87b00cdbyr401khgbx8n0jp24lqj1kpj0ij7apbncss"; depends=[nloptr Rcpp RcppEigen]; }; + RobustGaSP = derive2 { name="RobustGaSP"; version="0.6.1"; sha256="0bcrgrxlwysk8gg2ln17h4jm78iqlx1d46q0dnm0pxknqihi9jwf"; depends=[nloptr Rcpp RcppEigen]; }; RobustLinearReg = derive2 { name="RobustLinearReg"; version="1.2.0"; sha256="06137f516gyj64qdmwby7m1xnvj4hxzpqj454jn0xcinvl89380w"; depends=[]; }; RobustRankAggreg = derive2 { name="RobustRankAggreg"; version="1.1"; sha256="1pslqyr1lji1zvcrwyax4zg2s81p1jnhfldz8mdfhsp5y7v8iar3"; depends=[]; }; RockFab = derive2 { name="RockFab"; version="1.2"; sha256="1b5mhfll5vmqwl4pblmclyx9604vn07jyza02rm0jcsx915ms8sc"; depends=[EBImage rgl]; }; Rodam = derive2 { name="Rodam"; version="0.1.6"; sha256="1204zj556xciw29bn2dzndv7dfmmvdhyj5r5slgfzhsxyx0ca4i2"; depends=[RCurl]; }; - RolWinMulCor = derive2 { name="RolWinMulCor"; version="0.4.0"; sha256="1i7vnw0v7h0z5ya5g6vxnanv30pn7pxiy4c6x5s1biba2vy65gz9"; depends=[colorspace gtools pracma zoo]; }; + RolWinMulCor = derive2 { name="RolWinMulCor"; version="1.0.0"; sha256="0pmdmw8d6rqcagvwr8l13bm9fkvw414y9rvcz4cvwpvy9sfj0kaw"; depends=[colorspace gtools pracma scales zoo]; }; RonFHIR = derive2 { name="RonFHIR"; version="0.4.0"; sha256="1ajpgpp300m0zzqzzwsn8sfy8x751hrr8py9n9xvzjmkgyrh4hhw"; depends=[httr jsonlite R6 stringr]; }; Rook = derive2 { name="Rook"; version="1.1-1"; sha256="00s9a0kr9rwxvlq433daxjk4ji8m0w60hjdprf502msw9kxfrx00"; depends=[brew]; }; RootsExtremaInflections = derive2 { name="RootsExtremaInflections"; version="1.2.1"; sha256="0qd6cmzp8fkb75ac79xbh4032vqwax7nk7d6yykpdbn0bnk2kvdi"; depends=[doParallel foreach inflection iterators]; }; @@ -4045,14 +4189,13 @@ in with self; { Rpoppler = derive2 { name="Rpoppler"; version="0.1-0"; sha256="19nvv45ahp0c241p1xzlq0sq5qarqg66jw5f1anhqnfi2hi91hcm"; depends=[]; }; Rprofet = derive2 { name="Rprofet"; version="2.2.1"; sha256="150123vxdd31p96f3vsri46ryfng2xvnjgm6mdiqczg48xyfpbdp"; depends=[binr ClustOfVar ggplot2 gridExtra plyr sqldf stringr]; }; Rpvt = derive2 { name="Rpvt"; version="0.1.1"; sha256="0ggd6ikp2s9z4086y8w3qzb9jcyyqpby41p3ayjwam94skh154mf"; depends=[Rcpp RcppArmadillo Rdpack]; }; - Rquake = derive2 { name="Rquake"; version="2.4-0"; sha256="14s2mjq9qqxfvlwmq9126h67y5wr7irlc7945pgv1ab9hl1lgmz8"; depends=[GEOmap MBA minpack_lm rgl RPMG RSEIS]; }; + Rquake = derive2 { name="Rquake"; version="2.4-4"; sha256="1929qxqbb6s316zb9x2q1kwz2pvwpvqr1w6iw8vm5vijyf1nvv30"; depends=[GEOmap MBA minpack_lm RPMG RSEIS]; }; Rquefts = derive2 { name="Rquefts"; version="1.0-7"; sha256="1r1b2ga7kfhxsgr2d6ncfyrcpwx1jy0q1h06xajhfpd7i2sk7i84"; depends=[meteor Rcpp]; }; Rramas = derive2 { name="Rramas"; version="0.1-6"; sha256="16aapvz9j81lvi5ryj41bvn3wf51b0gynnzs0jpvva4m3mvzw6an"; depends=[diagram]; }; Rraven = derive2 { name="Rraven"; version="1.0.10"; sha256="1b0av1pwg6n6rbl5k6md8knjqamismd8wbx7hnlkmak8q1yzk282"; depends=[NatureSounds pbapply seewave tuneR warbleR]; }; Rrdrand = derive2 { name="Rrdrand"; version="0.1-16"; sha256="0j9yyvq8r1cgwj3kw1ak6hyazr67f2q0c1m651wdm0wcvm1ajx7f"; depends=[]; }; Rrelperm = derive2 { name="Rrelperm"; version="0.1.0"; sha256="0cjw91j1sgc27wbx1dcdqk8j4hjkamp3wav78sh4ncdlvkyyz4p0"; depends=[nleqslv Rcpp RcppArmadillo Rdpack]; }; Rsagacmd = derive2 { name="Rsagacmd"; version="0.0.9"; sha256="19kpdq7x70fs4xd09lslpwclwmclc189hl8lpcycf80q74cm2r55"; depends=[foreign magrittr minpack_lm raster rgdal rlang sf stringr tibble XML]; }; - Rsampletrees = derive2 { name="Rsampletrees"; version="1.0.3"; sha256="1qnvnhhzhyfbka4zjblddj5ad5d6q7rzb8rpikzpvcqn9s57lnqk"; depends=[ape haplo_stats Rcpp]; }; Rsampling = derive2 { name="Rsampling"; version="0.1.1"; sha256="14rp3j7iaii4rc3jkbijmbgvlagxxqjkz3vvfwwpxix43rsi8zsk"; depends=[]; }; Rsconctdply = derive2 { name="Rsconctdply"; version="0.1.3"; sha256="12xc1laxgivv4szp8341pvhmxnzzzzc2s4jhnqsqrbx71lbd9szg"; depends=[dplyr rjson rsconnect]; }; Rserve = derive2 { name="Rserve"; version="1.7-3.1"; sha256="16cg0cak9pvd9l35fjy1lsplxr5ncvb4apzg5mish5kff0cyk89v"; depends=[]; }; @@ -4062,9 +4205,11 @@ in with self; { Rspc = derive2 { name="Rspc"; version="1.2.2"; sha256="1cnzqpnh009wfs51dc4id9q3giaa8b6dc75b1lhzpwcvw0cxcy4y"; depends=[]; }; Rspotify = derive2 { name="Rspotify"; version="0.1.2"; sha256="1q8ajjx5ghlgxgch9gifvhi2gmsi0ph8pygwrb9jrd3ijahlw5k4"; depends=[dplyr httr jsonlite magrittr plyr]; }; RsqMed = derive2 { name="RsqMed"; version="0.1.7.1"; sha256="18r78svwbnri5283s5nxg4vrp29r6xx13h0n6w634jdpwaiw56gk"; depends=[GMMAT SIS]; }; - Rssa = derive2 { name="Rssa"; version="1.0.2"; sha256="14gzd6mz9v8c0c15sinf67f1ii6b6ximpfz8daq3800pw2cav49r"; depends=[forecast lattice svd]; }; + Rssa = derive2 { name="Rssa"; version="1.0.3"; sha256="1sjl60djgpn4wkgpw1kbm0c376gk1g507dw4bnaqn518qhi8mp6k"; depends=[forecast lattice svd]; }; + RstoxData = derive2 { name="RstoxData"; version="1.0.17"; sha256="1dfmbfpjqj8p5m7dybjx6h5vapb5xzr4l2sa24z9wjdfxrzf07x9"; depends=[data_table Rcpp readr xml2]; }; Rsurrogate = derive2 { name="Rsurrogate"; version="2.0"; sha256="1pjyhlxqi8mcbywa7qa1vxgxr5jca0nc9vm1bx53vr231wgnb7gf"; depends=[survival]; }; - Rsymphony = derive2 { name="Rsymphony"; version="0.1-28"; sha256="02x54ygbcd2600prcww1l9pb02skn96rj0jdljpky1228jbib4nx"; depends=[]; }; + Rsymphony = derive2 { name="Rsymphony"; version="0.1-29"; sha256="09ilz815phgjm87ah879dsx008scdp51x7h3jn2j48zgzym59sfb"; depends=[]; }; + RtD3 = derive2 { name="RtD3"; version="0.0.1"; sha256="0zbm9pf1z8xl99aj64xy8q3hly98c2rzy34fzkbjyndysvxf9032"; depends=[data_table geojsonsf htmlwidgets jsonlite purrr]; }; Rtauchen = derive2 { name="Rtauchen"; version="1.0"; sha256="09282k6qsjxgm26682npfjymmbx5g8flcc44awmkjl2k4fa1q9ha"; depends=[]; }; Rtnmin = derive2 { name="Rtnmin"; version="2016-7.7"; sha256="0f8ii87v29v61b93hx2yxdppp3nvgnl5imp80sbb4bjsdg0mf989"; depends=[]; }; Rtrack = derive2 { name="Rtrack"; version="1.0.0"; sha256="01xgbz37rsbjkix9nlx64qyimsbbgsmyswcv4jbpqasvkp6d480q"; depends=[crayon Hmisc KernSmooth openxlsx pbapply randomForest raster readxl rgeos rjson sp]; }; @@ -4073,7 +4218,7 @@ in with self; { RtutoR = derive2 { name="RtutoR"; version="1.2"; sha256="19wmi30b5i6zj673d76gxl6j0k3ppfyl5fqrcs0dwmmadrrvbajq"; depends=[colourpicker devtools dplyr DT FSelector ggplot2 ggthemes officer plotly rlang rmarkdown shiny shinyBS shinydashboard shinyjs tidyr]; }; Rtwalk = derive2 { name="Rtwalk"; version="1.8.0"; sha256="0zxf66lsfq8by40flv34xzd5yy0wa1ah9li1d0h7f0yh9nbwhxl5"; depends=[]; }; Runiversal = derive2 { name="Runiversal"; version="1.0.2"; sha256="0667mspsjydmxi848c6wsf14gz72bmdj9b3lilma92b7fhqnv7ai"; depends=[]; }; - Runuran = derive2 { name="Runuran"; version="0.30"; sha256="1a3z49nrx1azbm4blqcwwcbwnxcrcr8md350viakl8a0b3y2v59q"; depends=[]; }; + Runuran = derive2 { name="Runuran"; version="0.33"; sha256="11bn2ifynh0sh8j3aam6x3wb791cbbskdxmn5hicl59jsnr6dm6m"; depends=[]; }; Rvcg = derive2 { name="Rvcg"; version="0.19.1"; sha256="0brqnvhqj9052kkic1i8mxx7y1si9na5rwj1fmslsf5mih8n4grr"; depends=[Rcpp RcppArmadillo RcppEigen]; }; Rvmmin = derive2 { name="Rvmmin"; version="2018-4.17"; sha256="0mhzzwk311wa157l3n4x5x038asvjd81l45g1jclfsjr0smsffym"; depends=[optextras]; }; Rvoterdistance = derive2 { name="Rvoterdistance"; version="1.1"; sha256="16il36hkq1j6gyl5d8bx5khiiv6fy2m8vkhwiaaiqsliw2sspy4j"; depends=[Rcpp]; }; @@ -4083,13 +4228,12 @@ in with self; { Rwofost = derive2 { name="Rwofost"; version="0.6-3"; sha256="0a6fp2hkf51hqmbyp7mlhhnzzxj2gcq0kdrlcm3qmpkv0y44wmmw"; depends=[meteor Rcpp]; }; Rwordseg = derive2 { name="Rwordseg"; version="0.3-2"; sha256="10jhfalh45rrcm76hwz4b5yl408ndx2wkr0i3q1avx6z6i45d8s6"; depends=[HMM tmcn]; }; RxCEcolInf = derive2 { name="RxCEcolInf"; version="0.1-4"; sha256="0qyhxqd5yi4d1prj0i4g3k29zi0mx6wkjx24ynb4arxw6h1vabh4"; depends=[coda lattice MASS MCMCpack mvtnorm]; }; - RxODE = derive2 { name="RxODE"; version="0.9.2-0"; sha256="1ynn38wk08szi34pk0hmlnanmfg19arazsqzafyw5kd1v3fdx4g4"; depends=[assertthat brew cli dparser ggplot2 inline knitr lotri magrittr Matrix memoise mvnfast pillar PreciseSums Rcpp RcppArmadillo rex sys units]; }; RxnSim = derive2 { name="RxnSim"; version="1.0.3"; sha256="0fi4aic2brfbl6rsnnfwqq7l8ygvlmr98w0v749l3djpgn7sfrig"; depends=[data_table fingerprint rcdk rJava]; }; - Rxnat = derive2 { name="Rxnat"; version="1.0.12"; sha256="06w99b5lvpycykzlga6grw33zkajwbb04s89s37wy9zxy42vc4cb"; depends=[dplyr httr RCurl]; }; - Ryacas = derive2 { name="Ryacas"; version="1.1.3"; sha256="12vkylq06c7kqvvf662cyzhdcnpy928xsjflf1kf0nh6y00gywf8"; depends=[magrittr Rcpp]; }; - Ryacas0 = derive2 { name="Ryacas0"; version="0.4.2"; sha256="0k8q9v9016x8vfskwa6zmh2rbblqqfk8bryxslxaj8irzvkggnvl"; depends=[Rcpp settings xml2]; }; + Rxnat = derive2 { name="Rxnat"; version="1.0.14"; sha256="00fl68pa0c2vy4xlny67pn41lzgm7b97wgg3dwm6z35izca62l11"; depends=[dplyr httr RCurl tibble]; }; + Ryacas = derive2 { name="Ryacas"; version="1.1.3.1"; sha256="0c258p7ibas4xbq1wh8c1nfqf6r9d0hicrf8mkkyriw4mb6wmzqq"; depends=[magrittr Rcpp]; }; + Ryacas0 = derive2 { name="Ryacas0"; version="0.4.3"; sha256="1qsj6hbydi923bvc8qy1k34nl73xf3fsmr5ww3dw9gzn1kzg2470"; depends=[Rcpp settings xml2]; }; S2sls = derive2 { name="S2sls"; version="0.1"; sha256="0qq1rff2cdgrm5rj69jxgrl71i0wmzyn424fdvcg02zdv9ggqhd3"; depends=[spanel]; }; - SACCR = derive2 { name="SACCR"; version="2.3"; sha256="0q5fpzmfj08mzxbxksi5fgkfw8n4zsmh37zqnbwkz30llh620hgv"; depends=[data_tree jsonlite Trading]; }; + SACCR = derive2 { name="SACCR"; version="3.0"; sha256="0h5g2qq3zfx0hdibsghcas8vkwisbw5nr7phj8lrnc5r5g2c487l"; depends=[data_tree jsonlite Trading]; }; SACOBRA = derive2 { name="SACOBRA"; version="1.2"; sha256="1v45l56vifkg3v2bfhk3kfg4fn0dfvrjcgy13zzymm8blr7vazi5"; depends=[mgcv R6 testit]; }; SADEG = derive2 { name="SADEG"; version="1.0.0"; sha256="02ilykbdanx1isbd80c43hqpzkckq6dg40y0rklcnck6v96qky3n"; depends=[]; }; SADISA = derive2 { name="SADISA"; version="1.2"; sha256="0yn7f360wl5ykys5zln159xh2h8bx7zb5ddwhv1migjlqry506hp"; depends=[DDD pracma]; }; @@ -4103,7 +4247,7 @@ in with self; { SAMUR = derive2 { name="SAMUR"; version="0.6"; sha256="0iyv7ljjrgakgdmpylcxk3m3xbm2xwc6lbjvl7sk1pmxvpx3hhhc"; depends=[Matching]; }; SAMURAI = derive2 { name="SAMURAI"; version="1.2.1"; sha256="02fipbjcsbp2b2957x6183z20icv1yly2pd1747nyww9bmpa7ycm"; depends=[metafor]; }; SAPP = derive2 { name="SAPP"; version="1.0.8"; sha256="1lb148s8rdx1phmx8ihncgb45iqxzracxznys7zyzs8qcf6hm5wq"; depends=[]; }; - SAR = derive2 { name="SAR"; version="1.0.1"; sha256="0i6ffssr5iyh4z1ygbg0kg2nq4mlvshym7380f93gf85wpdql5gv"; depends=[AzureRMR AzureStor dplyr httr jsonlite Matrix R6 Rcpp RcppArmadillo RcppParallel]; }; + SAR = derive2 { name="SAR"; version="1.0.3"; sha256="1cnf0hsq82lzssvz5xs2abvnrjxda0g6mjx70a1j223zdwjqmw64"; depends=[AzureRMR AzureStor dplyr httr jsonlite Matrix R6 Rcpp RcppArmadillo RcppParallel]; }; SARP_compo = derive2 { name="SARP.compo"; version="0.1.3"; sha256="1rps2zfwhxf579v29p929jh1qq71ayy1ij6a5ja6y8rdflzhp4hb"; depends=[car igraph]; }; SARP_moodle = derive2 { name="SARP.moodle"; version="0.8.1"; sha256="1aszwnyg1nisyz1h75j4zn4b276n83l5wyldf2iysjcb45hir2kl"; depends=[base64enc]; }; SASPECT = derive2 { name="SASPECT"; version="0.1-1"; sha256="1d3yqxg76h9y485pl5mvlx6ls1076f80b320yvx4zxmqq9yxmaba"; depends=[]; }; @@ -4114,17 +4258,19 @@ in with self; { SAVE = derive2 { name="SAVE"; version="1.0"; sha256="1m9rrga8x00hlvn0c1jcz6yz14pdm6h3dq14905mq49sw63c7zll"; depends=[coda DiceKriging]; }; SAVER = derive2 { name="SAVER"; version="1.1.2"; sha256="1s1kw8idkaj7j90fw4qn9k0wd4vz0sblsk06ry6lm4afcar0p158"; depends=[doParallel foreach glmnet iterators Matrix]; }; SAutomata = derive2 { name="SAutomata"; version="0.1.0"; sha256="0d9q7bm2f7s4aslml40n43vwcdkc8rnn9ygydccwi4b9a7y23k58"; depends=[]; }; + SBAGM = derive2 { name="SBAGM"; version="0.1.0"; sha256="0vb1679016b0bhz2xlka9wgr2fxwa0447ymfncm1n5fks60rrnnf"; depends=[forecast MSGARCH rugarch]; }; SBMSplitMerge = derive2 { name="SBMSplitMerge"; version="1.1.1"; sha256="1h44qwz9gkwwgkac25h4vn0kq3mjvjsyq99yfd8v8g6g8fkkclaq"; depends=[ggplot2 reshape2 scales]; }; SBRect = derive2 { name="SBRect"; version="0.26"; sha256="16g0ciy9q9irypsl8x36i0lavl41j3af13r2si0by8q6wj56pxi4"; depends=[rJava]; }; SBSA = derive2 { name="SBSA"; version="0.2.3"; sha256="1v23lzzziyjlvgn5p2n1qcq2zv9hsyz2w15lbnfi5wvinxhlg8sc"; depends=[Rcpp RcppArmadillo]; }; SBSDiff = derive2 { name="SBSDiff"; version="0.1.0"; sha256="0mw1646dmhxw6zz4pq7j0g3mf9bjn72g43sq7m72r8ma8ciqj7r2"; depends=[]; }; - SBdecomp = derive2 { name="SBdecomp"; version="1.0"; sha256="0352pa2l3b3gylkvv1v62vk0b2djy0cyi4d4ps1r4dwilpir69d5"; depends=[survey twang]; }; + SBdecomp = derive2 { name="SBdecomp"; version="1.1"; sha256="0i7nkmaix2w0kxjaxhkkizpicvm18838qa6n39azxsjqph04ykmd"; depends=[survey twang]; }; SBmedian = derive2 { name="SBmedian"; version="0.1.0"; sha256="1flydpajgak0sh6v8r67fvjg3fjaylinqjgfrvi91lf29r822zdw"; depends=[expm Rcpp RcppArmadillo Rdpack]; }; + SC2API = derive2 { name="SC2API"; version="1.0.0"; sha256="1z3rch5238qih5054ial8vjcpj1cdmzgc7cga9agnp58y19a1lcj"; depends=[data_table httr jsonlite]; }; SCAT = derive2 { name="SCAT"; version="0.5.0"; sha256="16dh4l5r8b49n68s571npmk14dnnx6y0np7lzvalg61z31zlya29"; depends=[]; }; SCBiclust = derive2 { name="SCBiclust"; version="1.0.0"; sha256="1wrlzgavri6g7s948775nfls83b8fa5mx3xvbvc8kmbrvdwms6cq"; depends=[sigclust sparcl]; }; SCBmeanfd = derive2 { name="SCBmeanfd"; version="1.2.2"; sha256="045498q71zqgcg8p3665vwd99a8ybf21y0sa7y8316zw66wb1caz"; depends=[boot KernSmooth]; }; SCCI = derive2 { name="SCCI"; version="1.2"; sha256="08ibazxiqmkm3n9g8bfp0cfq26zmg6x2fxb064g3z05nczsf72db"; depends=[Rcpp]; }; - SCCS = derive2 { name="SCCS"; version="1.1"; sha256="1r3lldpd3vaqrwjhlfs4vghjsh70543317brn62z1n08wrxsjjyy"; depends=[corpcor dummies fda gnm R_methodsS3 survival]; }; + SCCS = derive2 { name="SCCS"; version="1.2"; sha256="13j2vgq4kihkx2bmm8k8z9g2qqfw1kv0imwcicxlxqy7i7dprav9"; depends=[corpcor dummies fda gnm R_methodsS3 survival]; }; SCEPtER = derive2 { name="SCEPtER"; version="0.2-1"; sha256="19sphwcsj2z05dvpmz7vgxykzyghkfn79jwqvk6d66daman679mv"; depends=[MASS]; }; SCEPtERbinary = derive2 { name="SCEPtERbinary"; version="0.1-1"; sha256="0rab0widfndx94dn1nchhs06q0d57vq2n3xy79p130l9rgp9v489"; depends=[MASS SCEPtER]; }; SCGLR = derive2 { name="SCGLR"; version="3.0"; sha256="10hsvcjgsycap6wkp06snp2zab1ppsp78kyncpbjnm3vp84qm0nz"; depends=[ade4 expm Formula ggplot2 Matrix pROC]; }; @@ -4133,6 +4279,7 @@ in with self; { SCMA = derive2 { name="SCMA"; version="1.3.1"; sha256="0j0np99mcr8vgpcg664769gdb3rxm665h4jgj3zplihbh5ihxfj1"; depends=[]; }; SCOR = derive2 { name="SCOR"; version="1.1.1"; sha256="0srkn72g1v7hwms68pjmq5sj562blqn27gi628q6q6zlirbmfb9g"; depends=[doParallel foreach iterators]; }; SCORER2 = derive2 { name="SCORER2"; version="0.99.0"; sha256="1a28wga69ip9s98ch2dqgl0qkwa3w6frmaqcvhclc360ik813mxq"; depends=[]; }; + SCORNET = derive2 { name="SCORNET"; version="0.1.0"; sha256="1nmlqmidq0cxfnf5pysgfmv6lkwijfzkx55ijnh9497ynz6yzckn"; depends=[doParallel foreach Matrix pracma Rcpp RcppArmadillo survival]; }; SCORPIUS = derive2 { name="SCORPIUS"; version="1.0.7"; sha256="1mswjc1q9dj4yvhx1db50iy041mw3azbi40ha3zjp38fflwcwf2z"; depends=[dplyr dynutils dynwrap ggplot2 lmds MASS Matrix mclust pbapply pheatmap princurve purrr ranger RANN RColorBrewer reshape2 tidyr TSP]; }; SCOUTer = derive2 { name="SCOUTer"; version="1.0.0"; sha256="1s0mmzfz0zhr5v4wagcjwdba8a5f57xr26vwml92dnw6lai37pj4"; depends=[ggplot2 ggpubr]; }; SCPME = derive2 { name="SCPME"; version="1.0"; sha256="0yhsaaa349wbrswcvp7w8c52wzp7rs3528rs4wqa8b3r3fh983mh"; depends=[doParallel dplyr foreach ggplot2 Rcpp RcppArmadillo RcppProgress]; }; @@ -4140,24 +4287,27 @@ in with self; { SCRT = derive2 { name="SCRT"; version="1.3.1"; sha256="0wkxc22hv08riivjl09lhxvffqxxdy4xnvdmc2y69gssyinkbln1"; depends=[]; }; SCVA = derive2 { name="SCVA"; version="1.3.1"; sha256="1gdicpnbr8bdgrbwwslpwpzw2adpp94p8nhsrkdx0bjlpfhd4g9h"; depends=[ggExtra ggplot2 plotly scales]; }; SCperf = derive2 { name="SCperf"; version="1.1.1"; sha256="1kqi3sv9ds58l20pdcnjrrbf7fin82j73yqj5rbx4kjdw560ylb2"; depends=[]; }; - SCtools = derive2 { name="SCtools"; version="0.3.0"; sha256="0iw7ckgfpijnbqicky69la3mpxmd1i5p4rgzznymprra3q1lx35h"; depends=[cvTools dplyr furrr future ggplot2 purrr stringr Synth]; }; + SCtools = derive2 { name="SCtools"; version="0.3.1"; sha256="0vsv9ipz0ys8nrvg7rwr23svqlc5lvjpa6yss79rnjzxarjcyjjz"; depends=[cvTools dplyr furrr future ggplot2 magrittr purrr stringr Synth]; }; SDALGCP = derive2 { name="SDALGCP"; version="0.3.0"; sha256="1mrx39rspbynnwdpww8vv3rf03589qym70vc9508k7iird5cn0qh"; depends=[geoR maptools mapview Matrix pdist PrevMap progress raster sp spacetime spatstat splancs]; }; - SDAR = derive2 { name="SDAR"; version="0.9-3"; sha256="173qssvca1ds37x3518q3vfl2185b4fnkprvb52pp7mpv1w1xdrp"; depends=[grImport2 linbin readxl]; }; + SDAR = derive2 { name="SDAR"; version="0.9-55"; sha256="1a1dy4wpzhfaqxv4x8knazh4kjx042rnkmvxf62r6wkgbfvq4r6b"; depends=[grImport2 linbin readxl]; }; + SDCNway = derive2 { name="SDCNway"; version="1.0.1"; sha256="0zmjc3xh4qvwyrq4ma2k6q08f4ny4iqnl5a640pj17jk8awzwbg0"; depends=[dplyr ggplot2 MASS plyr Rdpack]; }; SDD = derive2 { name="SDD"; version="1.2"; sha256="0wzgm1hgjv5s00bpd7j387qbvn5zvyrrd5fr2rgyll4cw9p4sd33"; depends=[Hmisc rgl rpanel sm tseries]; }; SDDE = derive2 { name="SDDE"; version="1.0.1"; sha256="14vql1bypn409w9xcx1jdzff6apiagcz2wng3y24h3mk7yjv9bzy"; depends=[doParallel foreach igraph iterators]; }; SDEFSR = derive2 { name="SDEFSR"; version="0.7.21"; sha256="02p46vbyzx5lmyxyhks10l94kz18pldgkxxg2zi5vys80gpy5jd2"; depends=[]; }; SDLfilter = derive2 { name="SDLfilter"; version="2.0.1"; sha256="0ry7aqcc2ihh2b10xxs0fv4syibwsh1ziynjq6q8wbli4v303kcf"; depends=[data_table dplyr ggmap ggplot2 ggsn gridExtra lubridate maps plotKML plyr pracma raster sp trip]; }; SDMPlay = derive2 { name="SDMPlay"; version="1.3"; sha256="0653yzw00ix1kh302h1fs735956dw0m2zvp2ng472f8qywrb395s"; depends=[dismo gbm raster]; }; - SDMtune = derive2 { name="SDMtune"; version="1.1.1"; sha256="02bpdscfw8ql72sq9nh47qik6xnxczr59yysd18m5mf67qf7p0sb"; depends=[dismo gbm ggplot2 jsonlite maxnet nnet progress randomForest raster Rcpp rlang rstudioapi stringr whisker]; }; + SDMtune = derive2 { name="SDMtune"; version="1.1.3"; sha256="05hbisg734w7l6ynr8302ynika4gnwnih5kfgrf4v730svl0hfp7"; depends=[dismo gbm ggplot2 jsonlite maxnet nnet progress randomForest raster Rcpp rlang rstudioapi stringr whisker]; }; SDT = derive2 { name="SDT"; version="1.0.0"; sha256="1jwpfd1pnzy9wcl90qv5bgwi19shsw9064dvml9zwbif8yw8dzjj"; depends=[quadprog]; }; SDaA = derive2 { name="SDaA"; version="0.1-3"; sha256="0z10ba4s9r850fjhnrirj2jgnfj931vwzi3kw9502r5k7941lsx0"; depends=[]; }; SDraw = derive2 { name="SDraw"; version="2.1.13"; sha256="1kx8kfga3zspfdgf9vq2lclszrhf3bfwkfhwqri64kn8fdr34jsq"; depends=[covr deldir rgeos sp spsurvey]; }; + SE_EQ = derive2 { name="SE.EQ"; version="1.0"; sha256="09fqx2rcqpiv072l6gqgfz9pdhas98q4kkkm7m4y28k13q2gicgl"; depends=[MASS]; }; SEA = derive2 { name="SEA"; version="1.0"; sha256="1jcjgiy8459d8f603kiipcdq6d2awfcqzdv13hrdjgxpfnd1n1ha"; depends=[data_table doParallel foreach kolmim KScorrect MASS shiny]; }; SEAsic = derive2 { name="SEAsic"; version="0.1"; sha256="1mg01sag6n1qldjvmvbasac86s7sbhi4k99kdkav2hdh6n9jg467"; depends=[]; }; SECFISH = derive2 { name="SECFISH"; version="0.1.7"; sha256="0yd9k6anz9g4psg5kh1bhp0lr1i4y7in1m0mxk4qp14nl1zqy4fy"; depends=[ggplot2 Hmisc optimization]; }; SECP = derive2 { name="SECP"; version="0.1-4"; sha256="0a4j0ggrbs0jzcph70hc4f5alln4kdn2mrkp3jbh321a6494kwl1"; depends=[SPSL]; }; SEER2R = derive2 { name="SEER2R"; version="1.0"; sha256="0lk0kkp8sv3nl19zwqd7449mmjxsj3pqpzdmqf70qf8xh2pqyvzd"; depends=[]; }; SEERaBomb = derive2 { name="SEERaBomb"; version="2019.2"; sha256="0rlah68jbaw4qbqq5rnlrm6m9ckz7igbsay6iq1yvk4gy24p9bfh"; depends=[DBI demography dplyr forcats ggplot2 labelled LaF mgcv openxlsx plyr purrr Rcpp readr reshape2 rgl RSQLite scales stringr survival tibble tidyr WriteXLS]; }; + SEIRfansy = derive2 { name="SEIRfansy"; version="1.1.0"; sha256="1n7fgn3l4r3xxdppgj9maks151jbamysmlmcdfq13mp6b6c98sja"; depends=[arm DescTools dplyr ggplot2 ggpubr knitr magrittr patchwork pbapply rlang scales]; }; SEL = derive2 { name="SEL"; version="1.0-2"; sha256="1nrk0fx6ff330abq8askvp0790xnfv00m3sraqcr32hciw6ks421"; depends=[lattice quadprog]; }; SELF = derive2 { name="SELF"; version="0.1.1"; sha256="1yafjhxwsanr33dqy7w9x61ghldr29s8k6h68idq6nnfb77ghjyx"; depends=[bnlearn CompareCausalNetworks data_table Rcpp xgboost]; }; SEMID = derive2 { name="SEMID"; version="0.3.2"; sha256="0v1zrx5xxramsg2zzk7b2fyv6kky7xb1q1cg8vi6zg6ln9vgm2dk"; depends=[igraph R_methodsS3 R_oo R_utils]; }; @@ -4188,13 +4338,14 @@ in with self; { SILM = derive2 { name="SILM"; version="1.0.0"; sha256="1iaivpdx18djfm5dqak0q9kfl1xfrnx3gk5x9a4y53h1d7jhl9p6"; depends=[glmnet hdi scalreg SIS]; }; SIMMS = derive2 { name="SIMMS"; version="1.3.0"; sha256="1vnq135sc6f0nn53dmi38as7hzjvifbz3mvhg08zjk2v4rjw8hpw"; depends=[doParallel foreach glmnet MASS randomForestSRC survival]; }; SIN = derive2 { name="SIN"; version="0.6"; sha256="0vq80m3vl8spdnlkwvwy0gk3ziyybqzjp3scnfdcpn942ds7sgg9"; depends=[]; }; + SIPDIBGE = derive2 { name="SIPDIBGE"; version="0.1.0"; sha256="1vvlw2m16r3sxayn21xhqawl3axsfm3f894n9ql6qwz6v17l6xkr"; depends=[cli COVIDIBGE PNADcIBGE png PNSIBGE POFIBGE purrr rstudioapi tibble tidyverse]; }; SIRE = derive2 { name="SIRE"; version="1.1.0"; sha256="0f624j087k7krg73bqn2qxdgzq66jyhvzz8n024vz3h4hwagxs5n"; depends=[dplyr igraph magrittr MASS Matrix matrixcalc numDeriv psych Rsolnp stringr systemfit]; }; SIS = derive2 { name="SIS"; version="0.8-8"; sha256="1f5czwcgpmmn8habm24p3xh4w7jn2faais2x2gmaiq4dpjfnv6h8"; depends=[glmnet ncvreg survival]; }; SISIR = derive2 { name="SISIR"; version="0.1-1"; sha256="13mxw0ad4y29f303zarhhdpw2655ckax1g429grnah07p4kfpkgh"; depends=[doParallel expm foreach glmnet Matrix RSpectra]; }; SITH = derive2 { name="SITH"; version="1.0.1"; sha256="1g200zc4dbwy7822qhcsi571plm3fpvsdpxipm2ra9zm0x9a4df3"; depends=[Rcpp scatterplot3d]; }; SIfEK = derive2 { name="SIfEK"; version="0.1.0"; sha256="037ps6yfy7w6i8vm0b78c8w9kdmw312dl5nc2qz86rfk8kjg7w27"; depends=[MASS numDeriv ramcmc smfsb]; }; SK = derive2 { name="SK"; version="1.1"; sha256="19yg7yc2k4zz29bh42lw2jpjvkdj33f26xkfs8vz8lpp98yjf2vx"; depends=[FitAR GD MASS RColorBrewer rgeos rtop sp]; }; - SKAT = derive2 { name="SKAT"; version="2.0.0"; sha256="1qkc95n31bmz5y3saai0z50a081mngjlsypc259hbw355xayj2xr"; depends=[Matrix SPAtest]; }; + SKAT = derive2 { name="SKAT"; version="2.0.1"; sha256="1iz8s2r295w36m44s2frrz00q4zm78fyzx7kprmnz4kbg3spqqy8"; depends=[Matrix SPAtest]; }; SLC = derive2 { name="SLC"; version="0.3"; sha256="0l0y1sjj0glsb7vwla99ijclcgaq2y85bgz1wqm348n4shsmm2rs"; depends=[]; }; SLDAssay = derive2 { name="SLDAssay"; version="1.8"; sha256="04ykj7s9kpvg5bmf7x16154kfpdy45b7y7hhyh31sxlscv7c5bbp"; depends=[]; }; SLEMI = derive2 { name="SLEMI"; version="1.0"; sha256="1yfyqxl9sszym418p64zalc2yna9s9qgk9wvviz7n44icsdps33q"; depends=[caret corrplot doParallel e1071 foreach ggplot2 ggthemes gridExtra Hmisc nnet reshape2 stringr]; }; @@ -4202,20 +4353,22 @@ in with self; { SLICER = derive2 { name="SLICER"; version="0.2.0"; sha256="10i0hfl6js26n8xwk9pldzm9vv7hmii6gzj04lhqy0g3njds25kp"; depends=[alphahull igraph lle]; }; SLIDE = derive2 { name="SLIDE"; version="1.0.0"; sha256="0x4fm29r7icg33k8gw3vqvxib8n9a1xwg484x9yffybips9ka22c"; depends=[]; }; SLOPE = derive2 { name="SLOPE"; version="0.3.2"; sha256="0hjp34lwwrg60ccwvdy1hnl5vbd8lhyc2j1jp3kfx773akdrqvj1"; depends=[foreach lattice Matrix Rcpp RcppArmadillo]; }; + SLTCA = derive2 { name="SLTCA"; version="0.1.0"; sha256="0pq87fbi79srgjblv40yyj3w1dzf115kfidp8gi564l8xf0qilqg"; depends=[geepack Matrix mvtnorm VGAM]; }; SMARTAR = derive2 { name="SMARTAR"; version="1.1.0"; sha256="0ymhka4pjlqlnpv47abmc76ggijfw83i3jp9mrspnzcnb4d378xm"; depends=[MASS]; }; + SMARTbayesR = derive2 { name="SMARTbayesR"; version="1.0.1"; sha256="0fzmdqsqai5wvn9fvknjlfnyxiz6ya0a9v2v3gw8g87fza3p8nxi"; depends=[]; }; SMARTp = derive2 { name="SMARTp"; version="0.1.1"; sha256="0gkhl9j4l67brfmln28m4q4hfi271jlg5aijnjwahlj8nsi6384y"; depends=[covr mvtnorm sn]; }; SMC = derive2 { name="SMC"; version="1.1"; sha256="1r4ajgi785lmpnlxrba0n6phmk1f0mb6b5yqk6hx8gng2w8ggclz"; depends=[]; }; SMCRM = derive2 { name="SMCRM"; version="0.0-3"; sha256="1x06w00sdijhg5h1s61q4ym5wgk97pw9md6api7if2cxjv7h5zcy"; depends=[]; }; - SMDIC = derive2 { name="SMDIC"; version="0.1.2"; sha256="0a50fjfx1nx6khs8pna0v6fxdai4rf6b2rrribx1kq2k039jjj8l"; depends=[e1071 GSVA maftools MASS pheatmap pracma preprocessCore samr survival survminer]; }; + SMDIC = derive2 { name="SMDIC"; version="0.1.3"; sha256="050lbrgbvyj5pzjswb85dn94fzzhcq1pb212qap64f20l0nzlway"; depends=[backports e1071 GSVA maftools MASS pheatmap pracma preprocessCore quadprog RColorBrewer samr survival survminer]; }; SMFI5 = derive2 { name="SMFI5"; version="1.0"; sha256="10qp33l0dig00y9gfhpzqig6dbkjw76ch9pfq64dn4xrdkpq1kx5"; depends=[corpcor ggplot2 reshape]; }; SMFilter = derive2 { name="SMFilter"; version="1.0.3"; sha256="1islyqg9w08mvs2kf0ddmdlp885arzp0jy7mqvixjm4ayi5zfrri"; depends=[]; }; SMITIDstruct = derive2 { name="SMITIDstruct"; version="0.0.5"; sha256="12ffxj96w3pi18l0scz5sd3dl37vd4vg2wcfykaxdhf8z142ha3k"; depends=[Biostrings ggplot2 sf]; }; - SMITIDvisu = derive2 { name="SMITIDvisu"; version="0.0.6"; sha256="0563z9dypxsd9g532i1xfxdi8d29zwdla5ria15harimfda55ksq"; depends=[htmlwidgets jsonlite magrittr Rcpp yaml]; }; + SMITIDvisu = derive2 { name="SMITIDvisu"; version="0.0.8"; sha256="1g5h0ciwfh53bfdpsngf93zg3qrd596281gjlsgi4nsjzrjfnf3q"; depends=[htmlwidgets jsonlite magrittr Rcpp yaml]; }; SMLE = derive2 { name="SMLE"; version="0.4.1"; sha256="1ssry4kcqz31na2xns2sqfc7nifclhg8bxi1cnri96b1k6zd29qd"; depends=[doParallel foreach glmnet mvnfast]; }; SMLoutliers = derive2 { name="SMLoutliers"; version="0.1"; sha256="10frs7wcyn368m7fvw2f1cyd0xqr6sv5jziixnyvr8q5fadyl2p0"; depends=[]; }; SMM = derive2 { name="SMM"; version="1.0.2"; sha256="1g1c7ssdcnzgv6b221ya1xrypg2ksahc7qj1042j8nlx5wg29cld"; depends=[DiscreteWeibull seqinr]; }; - SMMA = derive2 { name="SMMA"; version="1.0.2"; sha256="13psgrpljnaxpcq4amiyg5mqhpzmb2hyb7jzh3h8wyq18rvs3s4d"; depends=[Rcpp RcppArmadillo]; }; - SMMT = derive2 { name="SMMT"; version="1.0.2"; sha256="0adg0k0sz3n53cxnz7i6xl8xivl21ky3jmigjv0jjgliqyic3dzk"; depends=[dplyr tibble XML]; }; + SMMA = derive2 { name="SMMA"; version="1.0.3"; sha256="1nwxp447m1igm7dlxw5kqw472f8470svwx9awjp2d84m66wplinr"; depends=[Rcpp RcppArmadillo]; }; + SMMT = derive2 { name="SMMT"; version="1.0.5"; sha256="19vx9w04z5x4747c07zb4qnw6y5mgs6mirc6qris9ma5sa65dvh6"; depends=[curl dplyr tibble XML]; }; SMNCensReg = derive2 { name="SMNCensReg"; version="3.0"; sha256="06542jacy74mw6ic0i1ml09pn45sll96bya7dqja6bg9yp0m6bvr"; depends=[Matrix PerformanceAnalytics]; }; SMPracticals = derive2 { name="SMPracticals"; version="1.4-3"; sha256="0zxq84f9i3b86xx6msb25b61gyj9k09iab2b7wg4d93yas9qzayf"; depends=[ellipse MASS nlme survival]; }; SMR = derive2 { name="SMR"; version="2.0.1"; sha256="0qy56fmismcjklpf29ic2gi1g8ajdjpxsl0akb9cqzyisyf641ia"; depends=[]; }; @@ -4223,7 +4376,7 @@ in with self; { SMVar = derive2 { name="SMVar"; version="1.3.3"; sha256="17wr4lixy3p32gr4jq02d7zsr88yrbddjsvynzdsdrwbxf4mwqhp"; depends=[]; }; SNFtool = derive2 { name="SNFtool"; version="2.3.0"; sha256="1yplcwmy7jhsvz19r82ivpxfqav7q88jcf8d0r2k8ll9iqmi1dbc"; depends=[alluvial ExPosition heatmap_plus]; }; SNPMClust = derive2 { name="SNPMClust"; version="1.3"; sha256="1gad1jfla4qpczh8vpwyss5cckzgpffsyj0d71r8drbspr4i3r90"; depends=[MASS mclust]; }; - SNPassoc = derive2 { name="SNPassoc"; version="1.9-2"; sha256="113byj8zbg6xyxb1qzm76sqfyk3fap0sd90691zzm1x2pbfnb3mh"; depends=[haplo_stats mvtnorm survival]; }; + SNPassoc = derive2 { name="SNPassoc"; version="2.0-2"; sha256="16raq5nkm24xqfshncwmf46z2naf2fcixgjs9b7gy1368wn3ahzl"; depends=[BiocStyle ggplot2 haplo_stats mvtnorm plyr poisbinom survival tidyr]; }; SNPknock = derive2 { name="SNPknock"; version="0.8.2"; sha256="121pdgvdffj61hw8x8m76na0cg5iw5gb586q05ikw5d959mmbzrs"; depends=[Rcpp RcppArmadillo RcppProgress Rdpack]; }; SNPmaxsel = derive2 { name="SNPmaxsel"; version="1.0-3"; sha256="0pjvixwqzjd3jwccc8yqq9c76afvbmfq0z1w0cwyj8bblrjpx13z"; depends=[combinat mvtnorm]; }; SNSequate = derive2 { name="SNSequate"; version="1.3.3"; sha256="1qadhk2acpr0lkh2z37ivif9dbp7zb31lfn32ch2sb0z9pp56his"; depends=[emdbook knitr magic plyr progress statmod]; }; @@ -4236,12 +4389,13 @@ in with self; { SOPIE = derive2 { name="SOPIE"; version="1.5"; sha256="0isvb2vzzpn57bq0ix2pfaqdnl5z8qk6v6fvf15vnxcqg2sm63q5"; depends=[ADGofTest circular]; }; SOR = derive2 { name="SOR"; version="0.23.1"; sha256="1accs4bqy080nfmgkdg7bgamdrcwcn01y6nydvvq12w3v8asdvwh"; depends=[Matrix]; }; SOUP = derive2 { name="SOUP"; version="1.1"; sha256="0k8nlvl4681cz07xjazprcc0jhknfa5hgr7w1qxxmgrp3sprr8r4"; depends=[tensor]; }; - SP2000 = derive2 { name="SP2000"; version="0.1.0"; sha256="0x6l09vhx1r5pra7l1psz6wr7vrmqr4r3jdfw1rv7c9aifvs1l0h"; depends=[DT jsonlite pbmcapply purrr rlist tibble XML xml2]; }; + SP2000 = derive2 { name="SP2000"; version="0.2.0"; sha256="01wrc7p36js20jv04zhphj2vq7qqfgxmrzic066wij0c0mnh0xn5"; depends=[DT jsonlite pbmcapply purrr rlist tibble urltools XML xml2]; }; SPADAR = derive2 { name="SPADAR"; version="1.0"; sha256="0xzhcy5nglwx9j2jkm3i9xj1iw1y9wbf6rwfjyhpiwwq6qn8mn5r"; depends=[mapproj RCEIM]; }; SPARQL = derive2 { name="SPARQL"; version="1.16"; sha256="0gak1q06yyhdmcxb2n3v0h9gr1vqd0viqji52wpw211qp6r6dcrc"; depends=[RCurl XML]; }; + SPARSEMODr = derive2 { name="SPARSEMODr"; version="1.0"; sha256="0gifz04i35v5vsw1ad9zrjwj6rxypwqbd14haadgzdzsscjj1ibs"; depends=[data_table future future_apply geosphere lubridate Rcpp tidyverse viridis]; }; SPAS = derive2 { name="SPAS"; version="2020.1.1"; sha256="1bvnyxg3npxv63kikmr30jgc14f1s1a5vfh40qs50nbzq84pl6bx"; depends=[BB MASS Matrix msm numDeriv plyr RcppEigen TMB]; }; SPAr = derive2 { name="SPAr"; version="0.1"; sha256="068jlsvaxx80ih6n86286m2r75cvy6w0m51vpj4gfclhh38py4p4"; depends=[]; }; - SPAtest = derive2 { name="SPAtest"; version="3.0.2"; sha256="0cg8lk0pwzpi5wfcv9843ysnsas94qzh6did7afjjk6z6vv04pks"; depends=[]; }; + SPAtest = derive2 { name="SPAtest"; version="3.1.2"; sha256="1x5r4a6jnizhhazxywb2cf2jj2rx6rfynl6xcscmlix6n394xmxk"; depends=[]; }; SPCALDA = derive2 { name="SPCALDA"; version="1.0"; sha256="1bmp2zz0favmpyp0ap8a2r1mg1nlan7zg5cj75drdnfpqlsn5vgl"; depends=[MASS]; }; SPCAvRP = derive2 { name="SPCAvRP"; version="0.4"; sha256="10bvr4lqnim40fihq495a4fy4f33pvfd7gsaqjj9bh6gy0z8y4mi"; depends=[MASS]; }; SPCDAnalyze = derive2 { name="SPCDAnalyze"; version="0.1.0"; sha256="0zaxlc4dw678s0v22ghv7mc4vqsgkcnmbxh7065w6qj9vm7pg5kz"; depends=[lme4 nlme plyr]; }; @@ -4253,7 +4407,7 @@ in with self; { SPINA = derive2 { name="SPINA"; version="4.1.0"; sha256="0x7y150iq072qqci2niqk7j8pvhcylb7kdvwambg1r1gi3ffycm9"; depends=[]; }; SPIn = derive2 { name="SPIn"; version="1.1"; sha256="109xxrg7bsmmfd6ik85kxrw2qclxbh5ipsh5mmrdl4hki3hnyp2s"; depends=[quadprog]; }; SPODT = derive2 { name="SPODT"; version="0.9-1"; sha256="01yq429a4s63855bwpn2mqjj2k3cz4187kfpi7n7qqdpdvmxz109"; depends=[rgdal sp tree]; }; - SPOT = derive2 { name="SPOT"; version="2.0.6"; sha256="0l781g8qv67f70fnhdv341hif1zbv8qkpqak6xb1vbdvakjiriar"; depends=[DEoptim ggplot2 MASS nloptr plotly randomForest ranger rgenoud rsm]; }; + SPOT = derive2 { name="SPOT"; version="2.1.10"; sha256="0ciix6cpci0ssybrg98k7cv1x532lynfi2svh3lp6h6y5gydb54s"; depends=[DEoptim ggplot2 glmnet MASS nloptr plotly randomForest ranger rgenoud rpart rpart_plot rsm SimInf smoof]; }; SPPcomb = derive2 { name="SPPcomb"; version="0.1"; sha256="1kn3pi3c7g7waill1grm382ixbvnc7z8pbgzqd94hxqzgkivhid7"; depends=[nleqslv]; }; SPREDA = derive2 { name="SPREDA"; version="1.1"; sha256="0fn4p5apjq8zgd3zms2b88ga5wbsv86y59ac5x06w75rf071xglv"; depends=[nlme survival]; }; SPRT = derive2 { name="SPRT"; version="1.0"; sha256="1r4pfqh8k5avi8qgpk5x1cy8lmkn341yvjvd2r7wqwb3mr242r0v"; depends=[]; }; @@ -4266,17 +4420,17 @@ in with self; { SQB = derive2 { name="SQB"; version="0.4"; sha256="12ii8xlwd2r77bj76j7l43898ras25z3plhhv106jaklhpcnk23m"; depends=[caret nnet pls rpart]; }; SQDA = derive2 { name="SQDA"; version="1.0"; sha256="0nfimk625wb64010r5r7hzr64jfwgc6rbn13wvrpn0jgayji87h6"; depends=[limma mvtnorm PDSCE]; }; SQN = derive2 { name="SQN"; version="1.0.5"; sha256="0kb8kf6g482zqdp4avwvhs3pqghfny757dbzfl1abaigmvwvx4qj"; depends=[mclust nor1mix]; }; - SQRL = derive2 { name="SQRL"; version="0.7.2"; sha256="0xvl73rs3ihzd4jg51sh1rgvpfazgsf8jm35zw3jwp1a08ygvnn8"; depends=[RODBC]; }; - SQUAREM = derive2 { name="SQUAREM"; version="2020.3"; sha256="17l05i87vwvcsk79fbg52zrx04zdlwiiyl3ga8qafs7mqx0j976q"; depends=[]; }; + SQRL = derive2 { name="SQRL"; version="0.7.4"; sha256="18h3y5fcxd6sbvjiqsjrjdcq3vlgjiknhvnk2dj0ahhdb060iwhg"; depends=[RODBC]; }; + SQUAREM = derive2 { name="SQUAREM"; version="2020.5"; sha256="1f0j5pbsz2wi7dfl8h8gvdl991bjywiwkd2f6z0xgkh87kl5y0b4"; depends=[]; }; SRCS = derive2 { name="SRCS"; version="1.1"; sha256="13zf3cqs53w68f9zc1fkb9ql84rvzn7g1hbykqrbvss8hjaq8x1r"; depends=[]; }; - SRRS = derive2 { name="SRRS"; version="0.1.1"; sha256="0jv545a97q4pyl89lmhn3y0jhdzyq033mvx144x8lcgx59s7cyi3"; depends=[gtools tcltk2]; }; + SRS = derive2 { name="SRS"; version="0.2.1"; sha256="0yq3bjskwy23i5p7bhgnla6fbgq2a6hddm1jwi3dzm41m4rbvbn2"; depends=[DT shiny shinybusy shinycssloaders vegan]; }; SRTtools = derive2 { name="SRTtools"; version="1.2.0"; sha256="1203i6nqclx0faxyvhdaapmfxy8h95jj83svxriqh1hpava5s1dy"; depends=[magrittr]; }; - SSBtools = derive2 { name="SSBtools"; version="0.7.0"; sha256="12277lqn2qjvxqs4lq7sx41hkxkr2hp7lxgg5f23ixfqvpf375xs"; depends=[Matrix stringr]; }; + SSBtools = derive2 { name="SSBtools"; version="0.8.0"; sha256="06b9zkrlqzv57dp1jzl9zpf37xx85zb2mwp7s4w9nys821q4za15"; depends=[MASS Matrix stringr]; }; SSDM = derive2 { name="SSDM"; version="0.2.8"; sha256="19l78dkjk76ababkd7xsfn0fy99khfa4i502q4vllpvch4cjz51c"; depends=[dismo e1071 earth gbm ggplot2 mgcv nnet poibin randomForest raster reshape2 rpart scales shiny shinydashboard shinyFiles sp spThin]; }; - SSDforR = derive2 { name="SSDforR"; version="1.5.17"; sha256="072ala1qdxnc58227b6m7vw79nyxjiasjhr98p8qll64nxyj4lmj"; depends=[MAd MASS metafor psych SingleCaseES TTR]; }; - SSHAARP = derive2 { name="SSHAARP"; version="1.0.0"; sha256="0qcl4msdwnmrjzxyp1az6zkz4j6abx65ap6n8zxpldg7wgxw26iz"; depends=[BIGDAWG data_table DescTools dplyr filesstrings gmt gtools sessioninfo stringr]; }; + SSDforR = derive2 { name="SSDforR"; version="1.5.20"; sha256="0qcywzvdjavzmmpawji2r5x1lrj0b7i0zyz32l1f89hq2xir53av"; depends=[MAd MASS metafor psych SingleCaseES TTR]; }; + SSHAARP = derive2 { name="SSHAARP"; version="1.0.1"; sha256="1dlfv1clkxra1mkp995zii6p3wdx5igz7i3wj9qvs1ivl27inxa9"; depends=[BIGDAWG data_table DescTools dplyr filesstrings gmt gtools sessioninfo stringr]; }; SSLASSO = derive2 { name="SSLASSO"; version="1.2-2"; sha256="0vnn9ksdf0qgjflgx1sfj6q6j9jfnarbx2222rh9kb10jy8b16jv"; depends=[]; }; - SSLR = derive2 { name="SSLR"; version="0.9.2"; sha256="0xkhvfd8ixgv7zqr2kknl8bhri0nkpx3vf2dv44r0ganq21xaa99"; depends=[dplyr foreach generics magrittr parsnip plyr proxy purrr RANN Rcpp RcppArmadillo rlang RSSL]; }; + SSLR = derive2 { name="SSLR"; version="0.9.3"; sha256="15wx619sjm7yl17q32gm835j61iig8v7brwnfl2qd8bg2q86zf0r"; depends=[conclust dplyr foreach generics magrittr parsnip plyr proxy purrr RANN Rcpp RcppArmadillo rlang RSSL]; }; SSM = derive2 { name="SSM"; version="1.0.1"; sha256="1h8yyzh5rn5jay70kyzvwirfndi049a5w28qigrjv5rxd7ml84l7"; depends=[]; }; SSN = derive2 { name="SSN"; version="1.1.15"; sha256="057lh2ym82ff3c25vyh97csns4jwlbvxwc4jai0i4yplxf0ccmha"; depends=[BH igraph lattice maptools MASS Matrix rgdal rgeos RSQLite sp]; }; SSOSVM = derive2 { name="SSOSVM"; version="0.2.1"; sha256="11wlalpw6yhvv95xr8vvgxgl4jafc2ghzsk5wqyv71ahxarmrlss"; depends=[MASS mvtnorm Rcpp RcppArmadillo]; }; @@ -4296,23 +4450,23 @@ in with self; { STGS = derive2 { name="STGS"; version="0.1.0"; sha256="0xfwd0jsg3glbr3c5l5yyri4is5kg77ivgr6qlzaxp6p8q7yfzqf"; depends=[brnn glmnet kernlab randomForest rrBLUP]; }; STI = derive2 { name="STI"; version="0.1"; sha256="1p408y9w2h4ljaq0bsw7vc1xghczjprf558cyg6994m0nv5fh4c4"; depends=[fitdistrplus zoo]; }; STMedianPolish = derive2 { name="STMedianPolish"; version="0.2"; sha256="0jzgcfhm09cccg2nwbvrmnkah1psbnmg26rc2n7lz26n4b20p3l2"; depends=[gstat maptools nabor reshape2 sp spacetime zoo]; }; - STMotif = derive2 { name="STMotif"; version="2.0.0"; sha256="190qwbh9lhq75mz20cyfsh77y5m91rbg5gharffknbq618gwlcmf"; depends=[ggplot2 RColorBrewer reshape2 scales shiny]; }; + STMotif = derive2 { name="STMotif"; version="2.0.1"; sha256="07725wdm65lxmmivdipxd07yqi3syy7dl10shn4x60ahs0il91nw"; depends=[ggplot2 RColorBrewer reshape2 scales shiny]; }; STOPES = derive2 { name="STOPES"; version="0.1"; sha256="0gv58nf0m67bfqc15c7n4gksqk7h661c9b55qapk210j259b7xbv"; depends=[changepoint glmnet MASS]; }; STPGA = derive2 { name="STPGA"; version="5.2.1"; sha256="0mwjv9r7x925ljmbwk2fl0xvf2n2hnf5n5z5p5rxr57ywvirqw1b"; depends=[AlgDesign emoa scales scatterplot3d]; }; - STRAH = derive2 { name="STRAH"; version="1.0"; sha256="0a2av8by99sq7l28c7cjwm6nqhp1i4pd5qxcsarvwd8f9fckvr5z"; depends=[BiocManager Biostrings BSgenome BSgenome_Hsapiens_UCSC_hg19]; }; STRMPS = derive2 { name="STRMPS"; version="0.5.8"; sha256="0vlmhrna0laqzjpbg4sgnscrli3cly2lc5d69n6iqfl213zsfz78"; depends=[Biostrings dplyr IRanges purrr ShortRead stringr tibble tidyr]; }; STV = derive2 { name="STV"; version="1.0.1"; sha256="1gzy47s4qg83fagvm19jwpbbplkvxi9qv6ac0j86i0s8v0yrlrks"; depends=[]; }; STraTUS = derive2 { name="STraTUS"; version="1.1.2"; sha256="0n3i7gbycp1f10058h9xlh3yk21w2izdb3xgs793mmh1i1sjy394"; depends=[ape ggplot2 ggtree gmp igraph phangorn RcppAlgos]; }; SUE = derive2 { name="SUE"; version="1.0"; sha256="0akv724s84v2zixvwywj1ydfnfvcjnaabv6gm0601nsrh6ij1mi6"; depends=[]; }; SUMMER = derive2 { name="SUMMER"; version="1.0.0"; sha256="11c3yb61gandl3rk92n451sbwgjf9ah3vs4nmm30qldrqjb9gpna"; depends=[data_table ggplot2 ggridges maptools Matrix RColorBrewer reshape2 shadowtext sp spdep survey survival viridis]; }; + SUNGEO = derive2 { name="SUNGEO"; version="0.2.0"; sha256="1j4zsawvbzc8mmnkn8vckdhi60z2lmaf5man6iz2rdwhlflxqyxi"; depends=[cartogram data_table dplyr fasterize httr jsonlite packcircles purrr RANN raster Rcpp RCurl rlang rmapshaper sf sp spdep udunits2]; }; SVMMaj = derive2 { name="SVMMaj"; version="0.2.9"; sha256="1405gigyjfp8by8nfx4g3rhw9x6r6g7dkpgw52jllv6n4036xa3h"; depends=[dplyr ggplot2 gridExtra kernlab reshape2 scales]; }; SVMMatch = derive2 { name="SVMMatch"; version="1.1"; sha256="1ykwrhlid4hs466xh3kv6y2qdhgk0jiglg0l3zwk5qlni6p26zc9"; depends=[Rcpp RcppArmadillo]; }; SVN = derive2 { name="SVN"; version="1.0.1"; sha256="0n93lqb1f2s2qvzc8lrcqmr0fhd57xqbi0ymrqqmll31ns679m92"; depends=[data_table igraph memoise]; }; - SWIM = derive2 { name="SWIM"; version="0.2.1"; sha256="1v8v48pmb1pxjw1jqkvz0qdd0gpi53hb59xh5kak3jjh94sbxz5g"; depends=[ggplot2 Hmisc nleqslv plyr Rdpack reshape2]; }; + SWIM = derive2 { name="SWIM"; version="0.2.2"; sha256="18w7rgs9i9flzayy9rvqx447wjhxqbglcjqcmajmywgajwdzbrrf"; depends=[ggplot2 Hmisc nleqslv plyr Rdpack reshape2]; }; SWMPr = derive2 { name="SWMPr"; version="2.3.1"; sha256="1az6ss8wkdgq4l1cmfflajzs7z6w6140bclb289gb090pi69p7gy"; depends=[data_table dplyr ggmap ggplot2 gridExtra httr lattice maptools oce openair RColorBrewer reshape2 tictoc tidyr XML zoo]; }; - SWMPrExtension = derive2 { name="SWMPrExtension"; version="1.1.5"; sha256="1jjsl6mk4m9394bsdsm2k08chivy9zmpr6hl8hvg455z7kr2pk5m"; depends=[broom dplyr EnvStats flextable ggplot2 ggthemes leaflet lubridate magrittr maptools officer purrr RColorBrewer rgdal rgeos rlang scales sp SWMPr tidyr]; }; + SWMPrExtension = derive2 { name="SWMPrExtension"; version="1.1.6"; sha256="10qai7zfs43x7i7qn1ws3xagq8hi8lx3799fpsp7ckllx1l5mk6p"; depends=[broom dplyr EnvStats flextable ggplot2 ggthemes leaflet lubridate magrittr maptools officer purrr RColorBrewer rgdal rgeos rlang scales sp SWMPr tidyr]; }; SYNCSA = derive2 { name="SYNCSA"; version="1.3.4"; sha256="0n9za302x638s666xs86zy94qch9wn0rln8xy6x9jymhhq9zn0kj"; depends=[FD permute RcppArmadillo vegan]; }; - SailoR = derive2 { name="SailoR"; version="1.1.2"; sha256="01rb3lkf4m969dax36kfyjlavc3zmr7p3si3y1j6x9gf7jzyy1q9"; depends=[]; }; + SailoR = derive2 { name="SailoR"; version="1.2"; sha256="04qrnps40845ypapf37jg1c1g05nii6iwk4fv1x5xyca963hl5ii"; depends=[]; }; Sample_Size = derive2 { name="Sample.Size"; version="1.0"; sha256="1vfnb2gg3rax4sxd81xqznfvh300nv45nn7zjsyrdjyg1n3ym7nw"; depends=[]; }; SampleSize4ClinicalTrials = derive2 { name="SampleSize4ClinicalTrials"; version="0.2.2"; sha256="19dl5sfrsmahrf1q0ljpjmp2821mn2h9d53ds9jyci0wv287gzs9"; depends=[]; }; SampleSizeMeans = derive2 { name="SampleSizeMeans"; version="1.1"; sha256="1wbc46n8b8wbcxl21blbzs5728dr8r0l8d3jpzbha8pcav0xrh1m"; depends=[]; }; @@ -4329,6 +4483,7 @@ in with self; { ScottKnottESD = derive2 { name="ScottKnottESD"; version="2.0.3"; sha256="0gjpjd8ljnp3v4fc72vhwjgscfw9vfivx710yg683pp30z0sv9nf"; depends=[car effsize forecast reshape2]; }; ScrabbleScore = derive2 { name="ScrabbleScore"; version="1.0"; sha256="19vgaxnhvqsbllqxfbnhnar2j4g0fkxi7rfsmkks2bd2py81x04m"; depends=[]; }; ScreenClean = derive2 { name="ScreenClean"; version="1.0.1"; sha256="0haanr05g4vwp5apncyzv8i3r61g4xf9ihm8ilcabcgpri56gpjk"; depends=[MASS Matrix quadprog]; }; + ScriptMapR = derive2 { name="ScriptMapR"; version="0.0.3"; sha256="18pd23yqn3ai1yfl149081n42hbh0d57hm71s2lhm1z7a5ccjkmf"; depends=[dplyr formatR RCy3 stringr]; }; SearchTrees = derive2 { name="SearchTrees"; version="0.5.2"; sha256="11p81x1klkmxarypxpbisf78dlrmhzzg9y9hxpwz75pks1y56gqg"; depends=[]; }; SecKW = derive2 { name="SecKW"; version="0.2"; sha256="13x9l6ncx8qszkcr7dpfzrk4zqj4w8z5lwd394437vl4xf1xv0k6"; depends=[fdrtool pracma]; }; SeedCalc = derive2 { name="SeedCalc"; version="1.0.0"; sha256="1p8ncf3l2zhpbbblpjagg8cg9gf7f2izdcgc48n1aq4f7bmjbqgk"; depends=[]; }; @@ -4342,13 +4497,13 @@ in with self; { SegCorr = derive2 { name="SegCorr"; version="1.2"; sha256="1g4bwfs539jf7ckzjyindi3v1av7vd38yz16m7cb20qqa0a33kbj"; depends=[jointseg]; }; SegEnvIneq = derive2 { name="SegEnvIneq"; version="1.0"; sha256="1xl9q47n4vvmr9nr5yairdq9r8mgms44wh6b4l9sbar2kx9ybwj3"; depends=[OasisR outliers rgdal rgeos spdep]; }; Sejong = derive2 { name="Sejong"; version="0.01"; sha256="1d9gw42dbs74w7xi8r9bs6dhl23y16yxqzyhqqayvcm98q3l77nf"; depends=[]; }; - SeleMix = derive2 { name="SeleMix"; version="1.0.1"; sha256="1qzy59wbjh8llm66l70xi0p3lv94iawh2h5vwa9sqy2ra5vmpaxk"; depends=[mvtnorm]; }; + SeleMix = derive2 { name="SeleMix"; version="1.0.2"; sha256="03q5pdgxdfx944zwpl2w7gzf23va4flbd8in3g03980smq0ai2c1"; depends=[mvtnorm]; }; Select = derive2 { name="Select"; version="1.4"; sha256="1qx4wwxxwjq31vf645xvwb0y2z5h4v6ca8fcrfpaj5kc33f333v2"; depends=[ade4 FD lattice latticeExtra Rsolnp]; }; SelectBoost = derive2 { name="SelectBoost"; version="2.0.0"; sha256="137fxvlpc2vyn5w93ih8bm6pp198xwlbb9ky8dhxgarh0syz8g4v"; depends=[abind Cascade glmnet igraph lars msgps Rfast spls varbvs]; }; SelvarMix = derive2 { name="SelvarMix"; version="1.2.1"; sha256="02d16ffw5syq0d3yiim9jgrjlz99n956zxp23idpsmq6lb2whq66"; depends=[glasso Rcpp RcppArmadillo Rmixmod]; }; - SemNeT = derive2 { name="SemNeT"; version="1.3.0"; sha256="19nh0lc979gdny0yw9ppi2kr8g3bcgpakwawqpmhar6jv5v69aj1"; depends=[dplyr ggplot2 igraph magrittr NetworkToolbox pbapply plyr purrr qgraph RColorBrewer scales]; }; - SemNetCleaner = derive2 { name="SemNetCleaner"; version="1.2.0"; sha256="1zirw6v3xkbw0xjsrwpq3y3rk51v8pxaj0h28c3pjs41dy2wa85i"; depends=[foreign hunspell R_matlab readxl searcher SemNetDictionaries stringdist stringi]; }; - SemNetDictionaries = derive2 { name="SemNetDictionaries"; version="0.1.6"; sha256="1rnclbcq4y8jl395y9im2ink45fq8320zrhbr7bqi54v86banh8r"; depends=[]; }; + SemNeT = derive2 { name="SemNeT"; version="1.4.1"; sha256="1qda5867gzd10zlq934mp6hy65yfv7xfsy6c9km0f3wrvawv0vn9"; depends=[broom car dplyr effects ggplot2 igraph magrittr pbapply philentropy plyr purrr qgraph RColorBrewer scales]; }; + SemNetCleaner = derive2 { name="SemNetCleaner"; version="1.3.1"; sha256="1c1fdfp2gy69d5ph7wnyi8klvyfbc87sb0jhpipfwdmnfss2nkir"; depends=[easycsv foreign R_matlab readxl rstudioapi searcher SemNetDictionaries stringdist stringi]; }; + SemNetDictionaries = derive2 { name="SemNetDictionaries"; version="0.1.8"; sha256="0136mqncpqzrrs11m2w183mg7gxzgmm067gl97d7bzv3gwy2xnk4"; depends=[easycsv knitr]; }; Semblance = derive2 { name="Semblance"; version="1.1.0"; sha256="1kzrg5z3244nx9y37p092wpangni3fxpx04i5fb4dhrmav4rvgab"; depends=[DescTools fields msos PerformanceAnalytics]; }; SemiCompRisks = derive2 { name="SemiCompRisks"; version="3.3"; sha256="06anhf0kqaz4i84g73w3l4gf0q2mwi00vlkciqfbxpwgrbacplf6"; depends=[Formula MASS survival]; }; SemiMarkov = derive2 { name="SemiMarkov"; version="1.4.6"; sha256="0nga790kcrvmbrx5asp4062711x0kjsccc246l4syiiw30b769ig"; depends=[MASS numDeriv Rsolnp]; }; @@ -4365,21 +4520,23 @@ in with self; { SeqMADE = derive2 { name="SeqMADE"; version="1.0"; sha256="0nf1xjhk0kpmmzgcxycg3ccxvwq6gydjq7xq6n9m7k7v35v9v3qf"; depends=[MASS]; }; SeqNet = derive2 { name="SeqNet"; version="1.1.0"; sha256="0dbiafqgqnmws38lpa58mkzciprkan5qnrw9aivi89s065ykjd74"; depends=[fitdistrplus ggplot2 igraph mvtnorm purrr RColorBrewer Rcpp rlang tibble]; }; SequenceSpikeSlab = derive2 { name="SequenceSpikeSlab"; version="0.1.1"; sha256="079qm4klgaml99j4cshy3n54pg7q537zlagib4xd8mswdmqdvll6"; depends=[Rcpp RcppProgress selectiveInference]; }; - Sequential = derive2 { name="Sequential"; version="3.1"; sha256="0wh5bxqgmkmlbz9bmvpv3lp8mq4iih86a73ccl6fycfpqvq6nf6i"; depends=[boot]; }; + Sequential = derive2 { name="Sequential"; version="3.2.1"; sha256="1sjfspcq114ig221lnqcn27nqgbvlh5pdl3g0c5zl35an411jdna"; depends=[boot]; }; SequentialDesign = derive2 { name="SequentialDesign"; version="1.0"; sha256="1gi37pixwbpy7358id1c75rckr352hs8vjs8sk8qgsr97pkm5xdq"; depends=[Sequential]; }; SetMethods = derive2 { name="SetMethods"; version="2.6"; sha256="1yvn5jcv83cd3z4sd7fws1j298fljzcif6037b65wy6ywrrbb73x"; depends=[admisc betareg fmsb ggplot2 ggrepel QCA scatterplot3d stargazer]; }; SetRank = derive2 { name="SetRank"; version="1.1.0"; sha256="0p7vwsw05s5hfw1mfh3fbm9nfzsymnxzrdjin7k21dx7asb618wy"; depends=[data_table igraph XML]; }; SetTest = derive2 { name="SetTest"; version="0.2.0"; sha256="08wc6cbnannmwkncqhpcw6l0y7c1v7z3awk5j7fd853nszfmpbk0"; depends=[]; }; - Seurat = derive2 { name="Seurat"; version="3.2.0"; sha256="1vj3dlsqakgnn4x1jz9fkl2cy0jzc5s65h1c20fnamr7lk45pnf2"; depends=[ape cluster cowplot fitdistrplus future future_apply ggplot2 ggrepel ggridges httr ica igraph irlba jsonlite KernSmooth leiden lmtest MASS Matrix miniUI patchwork pbapply plotly png RANN RColorBrewer Rcpp RcppAnnoy RcppEigen RcppProgress reticulate rlang ROCR rsvd Rtsne scales sctransform shiny spatstat tibble uwot]; }; + Seurat = derive2 { name="Seurat"; version="3.2.3"; sha256="11rzc7h2ad8z8k5r1sbz4d7y4rl3080qp2hh7vibwmipbkvlial3"; depends=[cluster cowplot fitdistrplus future future_apply ggplot2 ggrepel ggridges httr ica igraph irlba jsonlite KernSmooth leiden lmtest MASS Matrix matrixStats miniUI patchwork pbapply plotly png RANN RColorBrewer Rcpp RcppAnnoy RcppEigen RcppProgress reticulate rlang ROCR rsvd Rtsne scales scattermore sctransform shiny spatstat tibble uwot]; }; ShapeChange = derive2 { name="ShapeChange"; version="1.4"; sha256="1ch7avx8mxjk8vrp17inaihmbsv968wflyk1n4fbjvacbl24vn2b"; depends=[coneproj quadprog]; }; ShapePattern = derive2 { name="ShapePattern"; version="2.1.0"; sha256="10lqapjw2vypz1rrwgr7maw79g5j7g3gfp38g88w1sxlxasmx7by"; depends=[igraph landscapemetrics raster rgdal rgeos sp]; }; ShapeRotator = derive2 { name="ShapeRotator"; version="0.1.0"; sha256="1pg2m1wh7fbchm8gp3mngfnf5g2rbhvzim1bpzqyvxqpx6ynicsa"; depends=[plot3D]; }; ShapeSelectForest = derive2 { name="ShapeSelectForest"; version="1.4"; sha256="15ds3024qcvnq3pnbhpyd6hbif26mdzw1srqv44hwsllgzpi7602"; depends=[coneproj raster]; }; SharpeR = derive2 { name="SharpeR"; version="1.2.1"; sha256="1xcnbjwcqc9mhb6kqcarkmjcr5zrn5hryfp4i4rayra9yk9k18r8"; depends=[matrixcalc sadists]; }; + ShellChron = derive2 { name="ShellChron"; version="0.2.8"; sha256="09yqbsfpc3d7z85g3i4b4lkmjr2hf5vk32lsi4fm04n0ips4w19a"; depends=[dplyr ggplot2 ggpubr magrittr rtop scales tidyr tidyverse zoo]; }; ShiftConvolvePoibin = derive2 { name="ShiftConvolvePoibin"; version="1.0.0"; sha256="0pj3vynm8afns2kcwvmramxgbd0s2ksyyc5iha6p4dw2nz4hahc7"; depends=[]; }; ShiftShareSE = derive2 { name="ShiftShareSE"; version="1.0.1"; sha256="09sm3frapxv1zhxy84wqyaxdk5jx62ijszfa34zlknlgivividfy"; depends=[Formula]; }; ShinyImage = derive2 { name="ShinyImage"; version="0.1.0"; sha256="0nhsaq6i9lr8gqpdkahw3qr0c0cb0qwc0nqpk1ism21l6zg6ahc9"; depends=[EBImage R6 shiny shinyjs]; }; - ShinyItemAnalysis = derive2 { name="ShinyItemAnalysis"; version="1.3.3"; sha256="1yc2a2xc6vdfr0qsgw36kd2m15wlfpgam6nx9z0sbxwmr3a95cx6"; depends=[corrplot cowplot CTT data_table deltaPlotR difNLR difR DT ggdendro ggplot2 gridExtra knitr latticeExtra ltm mirt moments msm nnet plotly psych psychometric reshape2 rmarkdown shiny shinyBS shinydashboard shinyjs stringr VGAM xtable]; }; + ShinyItemAnalysis = derive2 { name="ShinyItemAnalysis"; version="1.3.4"; sha256="1j8lb1x7x82wryl4qjqppx9lgbk0mwllm9mkhhi71n65yf8awgdv"; depends=[corrplot cowplot CTT data_table deltaPlotR difNLR difR dplyr DT ggdendro ggplot2 gridExtra knitr latticeExtra ltm mirt moments msm nnet plotly psych psychometric reshape2 rmarkdown rstudioapi shiny shinyBS shinydashboard shinyjs stringr VGAM xtable]; }; + ShinyQuickStarter = derive2 { name="ShinyQuickStarter"; version="1.0.2"; sha256="0zsynf0kl4ippp5qmqfaik6fh7hs010abbkii0i0dnjp5gch6qpc"; depends=[colourpicker data_table dplyr DT fs magrittr miniUI readr rlist shiny shinyalert shinycssloaders shinyFiles shinyjs shinyWidgets stringi stringr styler visNetwork]; }; ShinyTester = derive2 { name="ShinyTester"; version="0.1.0"; sha256="0wm4rl2p8ggw6v2chk9b6ygh5y8p8cwzbyra0nr0qr2ka97didp8"; depends=[dplyr purrr readr stringr tidyr visNetwork]; }; ShortForm = derive2 { name="ShortForm"; version="0.4.6"; sha256="0r8flmfhm47kyzy97j3mr87srfsxwlqqsx7v0ay9qm7q2jfg6xsw"; depends=[ggplot2 lavaan stringr tidyr]; }; ShrinkCovMat = derive2 { name="ShrinkCovMat"; version="1.4.0"; sha256="0iyri3syjk9xv49d87fdyhnxg5c5x827vnak8vgckkkp62sdln2q"; depends=[Rcpp RcppArmadillo]; }; @@ -4388,21 +4545,21 @@ in with self; { SiZer = derive2 { name="SiZer"; version="0.1-7"; sha256="068xaawc9vhi7a0b52jfq5r81kwnxn2wnqar1b35wwckmsd40b20"; depends=[boot]; }; SigOptR = derive2 { name="SigOptR"; version="0.0.1"; sha256="1sylchhhz6kx4r8jx95cvsmjsacjh8pin7acf2fyw2a4nlx9r1a6"; depends=[httr jsonlite]; }; SigTree = derive2 { name="SigTree"; version="1.10.6"; sha256="18gh7azjr979ijc2y4yyskj24ay697rw3j7znc5p4a63s4vpxr9w"; depends=[ape MASS phyext2 phylobase phyloseq RColorBrewer vegan]; }; - SightabilityModel = derive2 { name="SightabilityModel"; version="1.4.0"; sha256="1wxn9jw9vpggl1i5510kkjkh77pmpl1yq28d2c8aivhlc44i1fsm"; depends=[formula_tools Matrix msm plyr survey]; }; - Signac = derive2 { name="Signac"; version="1.0.0"; sha256="1n6sb39xi2n9j1yk536ii4p7mmhb9vwvmx2y3iai55lzhysm4p9i"; depends=[AnnotationFilter Biobase BiocGenerics Biostrings biovizBase data_table dplyr fastmatch future future_apply GenomeInfoDb GenomicRanges ggbio ggplot2 ggrepel ggseqlogo IRanges irlba lsa Matrix patchwork pbapply qvalue Rcpp RcppRoll Rsamtools S4Vectors scales Seurat stringi tidyr]; }; + SightabilityModel = derive2 { name="SightabilityModel"; version="1.4.1"; sha256="1nbz8307jspg40ldh4icsananisa396fd7p2xz13mc9lsk2pa4dc"; depends=[formula_tools Matrix msm plyr survey]; }; + Signac = derive2 { name="Signac"; version="1.1.0"; sha256="1xdcjb81vkrwkv2maqbf3m602r09id4kha0ysp5i38bnp1kfpah2"; depends=[AnnotationFilter BiocGenerics Biostrings biovizBase data_table dplyr fastmatch future future_apply GenomeInfoDb GenomicRanges ggbio ggforce ggplot2 ggrepel ggseqlogo IRanges irlba lsa Matrix patchwork pbapply Rcpp RcppRoll Rsamtools S4Vectors scales Seurat stringi tidyr]; }; SignifReg = derive2 { name="SignifReg"; version="3.0"; sha256="0yvbf56ap29rfm10vdv3mc67x1aklkwwapi72vzsi2xhrgwf395d"; depends=[]; }; - Sim_DiffProc = derive2 { name="Sim.DiffProc"; version="4.6"; sha256="1lkjngfgmk1j4vq2ybg2q0l5y3j7cif7a0yxc07vfxfamr0xq46w"; depends=[Deriv MASS]; }; + Sim_DiffProc = derive2 { name="Sim.DiffProc"; version="4.8"; sha256="16pzcs1g5ihza9a2glnkgd5pxi77l6w34vkn0vxcb78gc6syhbrd"; depends=[Deriv MASS]; }; Sim_PLFN = derive2 { name="Sim.PLFN"; version="1.0"; sha256="1jmsydhpfv2z9cr99hfy8cairhkkxpwk4wnz1adixwxazkn7qfah"; depends=[DISTRIB FuzzyNumbers]; }; SimBIID = derive2 { name="SimBIID"; version="0.2.0"; sha256="1iz3paav7ayaqwifqsbb6h27pcdw0lmp6fl1nhvzbq3livvypgg7"; depends=[coda dplyr ggplot2 mvtnorm purrr RColorBrewer Rcpp RcppArmadillo RcppXPtrUtils tibble tidyr]; }; SimComp = derive2 { name="SimComp"; version="3.3"; sha256="04qkis20zk0z42bv4nznffqlpwby0y0ij27gj4sa0ha864pg0hi5"; depends=[mratios multcomp mvtnorm]; }; SimCop = derive2 { name="SimCop"; version="0.7.0"; sha256="1yrdy77a9h14v92c63ng8phi2ig73wy4xjjdb75322grc0bd3jq6"; depends=[quadprog]; }; SimCorMultRes = derive2 { name="SimCorMultRes"; version="1.7.0"; sha256="10snjwrh95407iracbc52b5cvr3sp2539rrjp7fw63q50pjl285v"; depends=[evd]; }; SimCorrMix = derive2 { name="SimCorrMix"; version="0.1.1"; sha256="1mx8xkg1nbh4x4xr6m672zyg00s3lky2sy5mz7dfkw40vz2bwi53"; depends=[BB ggplot2 MASS Matrix mvtnorm nleqslv SimMultiCorrData triangle VGAM]; }; - SimDesign = derive2 { name="SimDesign"; version="2.0.1"; sha256="00f4dk82zqz5gns3cmnzc009hij8sv591wd77cz6zkssh93mk3j8"; depends=[dplyr foreach pbapply plyr]; }; + SimDesign = derive2 { name="SimDesign"; version="2.2"; sha256="0ssb8l6v41crrwcyid46kpwjf5j0bjk6s9m2ra072h2kc9ymgqil"; depends=[dplyr foreach pbapply plyr]; }; SimDissolution = derive2 { name="SimDissolution"; version="0.1.0"; sha256="1rdsxykh740h22ln635m0ysm00pdw94vp7qhgify4mcvc46c3632"; depends=[alabama dplyr mvtnorm]; }; SimEUCartelLaw = derive2 { name="SimEUCartelLaw"; version="1.0.1"; sha256="1wg9sayk55mp3f2qykvfk0cbqh050vh0n1fhpq4fmlxqll87aml9"; depends=[plot3D plot3Drgl rgl]; }; SimHaz = derive2 { name="SimHaz"; version="0.1"; sha256="04q4xyc1ki1zr3grm3khfg0kbykjy3j9qpg332l7pxp4j3wa3aw3"; depends=[survival]; }; - SimInf = derive2 { name="SimInf"; version="7.0.1"; sha256="14s72krwk9sd405xgh71z2p9s29q5a1hr2qzaxsv1l4p5zbhvds8"; depends=[digest Matrix]; }; + SimInf = derive2 { name="SimInf"; version="8.2.0"; sha256="18lmmp8yqhx7zf8az3as0sk70ljw0bj6jr8g45n8f15fxf72fcql"; depends=[digest Matrix]; }; SimJoint = derive2 { name="SimJoint"; version="0.3.7"; sha256="03xf8n1fbbq63wz8kyj19h9vqz14z463cv8xqhmaknlamnnyhis5"; depends=[Rcpp RcppArmadillo RcppParallel]; }; SimMultiCorrData = derive2 { name="SimMultiCorrData"; version="0.2.2"; sha256="0brszbqxf40y65xp96c5hp7hhvz3gv0xlg93r5ik8qdh0bn0y1sw"; depends=[BB GenOrd ggplot2 Matrix nleqslv psych triangle VGAM]; }; SimPhe = derive2 { name="SimPhe"; version="0.2.0"; sha256="01kzypahw41jk8s2c92h0k9w32yaicis07wb6k8qlqcmv0zj8xry"; depends=[]; }; @@ -4412,6 +4569,8 @@ in with self; { SimReg = derive2 { name="SimReg"; version="3.0"; sha256="188q399xcrvjw7y7lf3hfbb7x0m0hc4zaf9i1w2c4xzswmvljd8r"; depends=[ontologyIndex ontologyPlot ontologySimilarity Rcpp]; }; SimSCRPiecewise = derive2 { name="SimSCRPiecewise"; version="0.1.1"; sha256="0mhlx9m5db8a40wf275qh59345676m8bpjjmyx1v22f6m9p3b2n4"; depends=[]; }; SimSeq = derive2 { name="SimSeq"; version="1.4.0"; sha256="068gg484w07qb4wajik2s3z79xfj0jg5l4pz69267dxi5kzd9fas"; depends=[fdrtool]; }; + SimSurvNMarker = derive2 { name="SimSurvNMarker"; version="0.1.1"; sha256="0jncq5q3ijczpa4h1i74035w36grjy2p8x71gx58v69ab3ca62k6"; depends=[Rcpp RcppArmadillo]; }; + SimSurvey = derive2 { name="SimSurvey"; version="0.1.2"; sha256="0wj8c67v1nzxxvskx5a9prfxxg4l2b1nqf6v4xapa1nfmmrxapik"; depends=[data_table doParallel foreach igraph magrittr plotly progress raster rgeos rlang sp]; }; SimTimeVar = derive2 { name="SimTimeVar"; version="1.0.0"; sha256="1x0lkgqwx1vz1gbyvy0hx20n638n30j0dny1iz5vs0cvviq3cdv8"; depends=[car corpcor ICC metafor miscTools mvtnorm plyr psych]; }; SimVitD = derive2 { name="SimVitD"; version="0.1.2"; sha256="0ilv17ngs1y09z459yn5wlg0bql93awdy3gbmrjhv00iyp30kvjp"; depends=[poisson]; }; SimilaR = derive2 { name="SimilaR"; version="1.0.8"; sha256="1wlxscl94r3gxwsc9yw0y4z5nj28nxilijp0pbzv4z2n4aqc7vy6"; depends=[BH Rcpp stringi]; }; @@ -4423,17 +4582,20 @@ in with self; { Simpsons = derive2 { name="Simpsons"; version="0.1.0"; sha256="1pm6wga1yxc35zgz72plzq23d3l4bbzfdvhszdxmkn1pkk64h8ms"; depends=[mclust]; }; SinIW = derive2 { name="SinIW"; version="0.2"; sha256="1z7rcjy0i09a9hjpjj1x8i46lv042l20lvb6b0pnsky2sx3v78pd"; depends=[fdrtool pracma]; }; SingleCaseES = derive2 { name="SingleCaseES"; version="0.4.3"; sha256="05bd03ka6qxmq8ls9w0nfklya3qay90s3i0iqjpcd6id4g8cz2kb"; depends=[dplyr magrittr purrr rlang tidyr tidyselect]; }; - SiteAdapt = derive2 { name="SiteAdapt"; version="1.0.0"; sha256="0ml11bv3sn8ynwsmaj666xpg17qbfqs9x9xi2b8n0v5gqnw44mpz"; depends=[ggplot2 ggpubr glmulti hydroGOF hyfo RColorBrewer solaR]; }; + SiteAdapt = derive2 { name="SiteAdapt"; version="1.1.0"; sha256="1k79j29d92a8m578xj61iavljikksdmjr2vlzwmdvxpa6rp1i2ff"; depends=[ggplot2 ggpubr glmulti hydroGOF hyfo RColorBrewer solaR]; }; SitesInterest = derive2 { name="SitesInterest"; version="1.0"; sha256="06l6i6jnzwj683cvd9a9dg4nlb1wy1v3wb561y97a25bikm3mfy6"; depends=[plotrix]; }; SixSigma = derive2 { name="SixSigma"; version="0.9-52"; sha256="07s4an2az2pgqhq9c08jrf6b95nrs1b3r1092d53n1ps8wbdmbln"; depends=[e1071 ggplot2 lattice nortest qcc reshape2 scales testthat xtable]; }; SizeEstimation = derive2 { name="SizeEstimation"; version="1.1.1"; sha256="1rz57y76hzp880511kzm7nhxf201n0dr7ccip6slrjz784dl7s27"; depends=[MCMCpack msm]; }; SkewHyperbolic = derive2 { name="SkewHyperbolic"; version="0.4-0"; sha256="1blxibjrgb738q2ybavp4q3d6yn7hayhg851ysghp118wpl32nwr"; depends=[DistributionUtils GeneralizedHyperbolic]; }; Skillings_Mack = derive2 { name="Skillings.Mack"; version="1.10"; sha256="0zxqiw87avw2rb2acj7mvpyfkf7iwnkshg73ib74y5ml9awmg2mw"; depends=[MASS matrixcalc]; }; Sky = derive2 { name="Sky"; version="1.0"; sha256="02vjdggvanzsjx7ihxskapp5d5dlyalj02122wmarj8qf1ha1i2m"; depends=[EBImage]; }; + SlaPMEG = derive2 { name="SlaPMEG"; version="1.0.0"; sha256="1snjcm9rqlgx41kphj0nadlny3yxpdczkvjisk4vp49fp381j4z7"; depends=[ggplot2 globaltest lcmm lme4 magic mvtnorm reshape2]; }; + SleepCycles = derive2 { name="SleepCycles"; version="1.0.1"; sha256="0kcggihymq726g4p4y3giq0bvc4fvqf19gmh6y8dbxmqlaphj5qp"; depends=[devtools ggplot2 plyr reshape2 stringr viridis]; }; Sleuth2 = derive2 { name="Sleuth2"; version="2.0-5"; sha256="18rp23dr55p2zqxqj5i86gi8j25b0y7hc2p88rxqszgmbyn5ynhi"; depends=[]; }; Sleuth3 = derive2 { name="Sleuth3"; version="1.0-3"; sha256="0ngwri80cwqs50wjza8qyzzwign4ag1ck7fa1x7q5x08w9x6w08m"; depends=[]; }; + SlidingWindows = derive2 { name="SlidingWindows"; version="0.1.7"; sha256="1anrmjk0nmhdvq0gnpspdv5xx9sk406g2vjh8qiqhkaglaa9hpw3"; depends=[DCCA nonlinearTseries PerformanceAnalytics TSEntropies]; }; SmCCNet = derive2 { name="SmCCNet"; version="0.99.0"; sha256="0ixvh1pd1gzbscwg4xjlcgxq5c9vqahil0fysfjc3fnba3wiidzx"; depends=[igraph Matrix pbapply PMA]; }; - SmallCountRounding = derive2 { name="SmallCountRounding"; version="0.4.0"; sha256="0rx47hvm4wkmrj1hrwaa8j61y3agfb09n048j9xlda5rismaqk8z"; depends=[Matrix SSBtools]; }; + SmallCountRounding = derive2 { name="SmallCountRounding"; version="0.6.0"; sha256="0ghahp0xc3q3w9b3r5hswrmsj88c12wpkgvw39yycrifrpg1syq7"; depends=[Matrix SSBtools]; }; SmartEDA = derive2 { name="SmartEDA"; version="0.3.6"; sha256="15pry1p82kpyd0w4c9p84bm0812lzblfdpzsr46m221hfhr3spqh"; depends=[data_table GGally ggplot2 gridExtra ISLR rmarkdown sampling scales]; }; SmartMeterAnalytics = derive2 { name="SmartMeterAnalytics"; version="1.0.3"; sha256="0i8my7ngzdbay3cld8axhvbri0nh0dd1dmv2lbsgyx4adr5hb30f"; depends=[FNN futile_logger plyr stinepack zoo]; }; SmartSVA = derive2 { name="SmartSVA"; version="0.1.3"; sha256="10a8s2znsg8ywqkq9fsxiyqfsprrx33pqissazp2vmabs11mg4np"; depends=[isva Rcpp RcppEigen RSpectra sva]; }; @@ -4442,11 +4604,11 @@ in with self; { SmithWilsonYieldCurve = derive2 { name="SmithWilsonYieldCurve"; version="1.0.1"; sha256="0qvhd1dn2wm9gzyp6k7iq057xqpkngkb4cfmvmjqmf0vhysp371w"; depends=[]; }; SmoothHazard = derive2 { name="SmoothHazard"; version="1.4.1"; sha256="147wjxgxnijpmixrfyl8kd4scz2w1xb8dcwvpr60zg32nv22g17r"; depends=[lava mvtnorm prodlim]; }; SmoothWin = derive2 { name="SmoothWin"; version="3.0.0"; sha256="0zq2sq0w4rs3hrra24wgbbzv88d1hx6m8q8gmc5h6nbs1172hs66"; depends=[nlme Rfast]; }; + Snake = derive2 { name="Snake"; version="1.0"; sha256="10i1bqsva70lzavfqvc56ga70ddjfwf0hqpspj8fqwa0jw86jmbh"; depends=[]; }; SnakesAndLaddersAnalysis = derive2 { name="SnakesAndLaddersAnalysis"; version="2.1.0"; sha256="0h3664h6d32q201qfyv9y2gg4fhg3azdpwpmx4qfbc10hsc1ghl9"; depends=[]; }; SnowballC = derive2 { name="SnowballC"; version="0.7.0"; sha256="1wwm71mp4b2mjb5985x782p6xj519dfrpd40qli7lmig6afyw3xi"; depends=[]; }; - SoDA = derive2 { name="SoDA"; version="1.0-6"; sha256="0sh2dan4ga2k14rirnkvgzsvbksx1k4ika5gkf5cy247rjkqnpj0"; depends=[]; }; + SoDA = derive2 { name="SoDA"; version="1.0-6.1"; sha256="0d3jb1dsg1q06c08ldmhj0q2sb1pc0g08rfal29ddng3b4qm1lhh"; depends=[]; }; SobolSequence = derive2 { name="SobolSequence"; version="1.0"; sha256="1vmp5jix3zvasvdirv8m88jc0cd8f34b4m1jvhs8g3v9lk8pxrrr"; depends=[Rcpp]; }; - SocEpi = derive2 { name="SocEpi"; version="1.0.0"; sha256="0r5wns6hisax6ad1v4lhprsp19a7anx2fyjvy9fdmls33jzrh1rv"; depends=[dplyr Rcpp tidyr]; }; SocialNetworks = derive2 { name="SocialNetworks"; version="1.1"; sha256="0d868xka6d35i17r28cvm0ya971xk6y1kycsfff0279w27cjd9x0"; depends=[Rcpp]; }; SocialPosition = derive2 { name="SocialPosition"; version="1.0.1"; sha256="1rrrjlq6czzhzipvkisbq024ca22v2vzx7wa4ddr9j7hnyyzzpic"; depends=[]; }; Sofi = derive2 { name="Sofi"; version="0.16.4.8"; sha256="0h9ir0xrwmsabfhwsr9hbpwabh1fsb3p51y8qcgm92iyvc6dl3mf"; depends=[foreign sampling shiny]; }; @@ -4461,8 +4623,9 @@ in with self; { SorptionAnalysis = derive2 { name="SorptionAnalysis"; version="0.1.0"; sha256="0drns1ajcga5z56hcgjxld1riwjn7vli8k1ma1xqifpy1qwy7ci6"; depends=[]; }; SortableHTMLTables = derive2 { name="SortableHTMLTables"; version="0.1-3"; sha256="1jgrqsm0cj8qlk0s4qn3b83w96mgpp5gmhgcg9q2glc72v8c4ljh"; depends=[brew testthat]; }; SortedEffects = derive2 { name="SortedEffects"; version="1.2.0"; sha256="0p16kxzss0inzvsd23sh7yiry1znpzdl36wf9dzhb9w7y9js8nxr"; depends=[boot dummies Hmisc pbapply quantreg rlist SparseM]; }; + SoundShape = derive2 { name="SoundShape"; version="1.0"; sha256="1rpw1irp049r44w23giz33xblq16vgpb293byha4aaffsahbw2rx"; depends=[abind geomorph plot3D reshape2 seewave tuneR]; }; SoundexBR = derive2 { name="SoundexBR"; version="1.2"; sha256="0chc332v3wcz30v70yvdxhvcfdmvf4fj193cn00gl899xfxal89p"; depends=[]; }; - SoupX = derive2 { name="SoupX"; version="1.4.5"; sha256="0kwcf0v4h5432x6gik5xkbybp2b3xjpwn2wcdgrg3pw4lcybhzi3"; depends=[ggplot2 Matrix Seurat]; }; + SoupX = derive2 { name="SoupX"; version="1.4.8"; sha256="0lyqhzljx2vffcxif6apsh3nsiqjv02w3cv4xmbjxjjv7bmnccdc"; depends=[ggplot2 Matrix Seurat]; }; SourceSet = derive2 { name="SourceSet"; version="0.1.3"; sha256="159kg4pna24yihkghxc2k5f56dqk8aypxcmj1whgnajmgab29ry1"; depends=[graph gRbase gtools igraph plyr progress reshape2 scales]; }; SoyNAM = derive2 { name="SoyNAM"; version="1.6"; sha256="1vwl2mknk6x0sgk0baxsvb6xy4i7mf2ypkmc9lx869nakrx1ypah"; depends=[lme4 NAM reshape2]; }; SpATS = derive2 { name="SpATS"; version="1.0-11"; sha256="00xw6xz764sqlfr7pw2mxzxvm4i1p76n9h8wz62n0p3afn1d1glm"; depends=[data_table fields plot3Drgl spam]; }; @@ -4471,9 +4634,9 @@ in with self; { SpaCCr = derive2 { name="SpaCCr"; version="0.1.0"; sha256="0qm1fr6nnax3i1i77fi73x1z8db557avh6kivs0nskb1dfj8ri4m"; depends=[abind dplyr ggplot2 Rcpp RcppArmadillo tidyr]; }; SpaDES = derive2 { name="SpaDES"; version="2.0.4"; sha256="1ihxkr2c7rfpb02chmdv393nfc1id1cg7lq8pbb64xm5vdpyj0bv"; depends=[quickPlot reproducible SpaDES_addins SpaDES_core SpaDES_tools]; }; SpaDES_addins = derive2 { name="SpaDES.addins"; version="0.1.2"; sha256="0z1n48kfwy460zfam88ayfiq8sbzvnf6cpkasr74nykr4fabs5ha"; depends=[devtools magrittr miniUI reproducible rstudioapi shiny SpaDES_core stringi]; }; - SpaDES_core = derive2 { name="SpaDES.core"; version="1.0.1"; sha256="12963853zk9rb9lsv2l6jsd0n5wi360i8kxvsjl1p3dcp8ii4mxq"; depends=[backports crayon data_table dplyr fastdigest fpCompare igraph lubridate qs quickPlot R_utils raster RCurl reproducible rlang stringi whisker]; }; + SpaDES_core = derive2 { name="SpaDES.core"; version="1.0.3"; sha256="17wgnasy76braiz070fhn9w7la1x0gbgfa6flbr1rr14jvfpnh2d"; depends=[backports crayon data_table dplyr fastdigest fpCompare igraph lubridate qs quickPlot R_utils raster reproducible Require rlang whisker]; }; SpaDES_tools = derive2 { name="SpaDES.tools"; version="0.3.6"; sha256="1rfkdm0dnylpvmsv59vkwxlyq61znrskf43qpr3p8kl7jbkqw7v6"; depends=[backports checkmate CircStats data_table fastmatch fpCompare magrittr quickPlot raster Rcpp reproducible rgeos sp]; }; - SpaTimeClus = derive2 { name="SpaTimeClus"; version="1.0"; sha256="1l204b8yd11pxwcb026xy39f4lps4sqk6mml8cybnjch8clk9djc"; depends=[Rcpp RcppArmadillo]; }; + SpaTimeClus = derive2 { name="SpaTimeClus"; version="1.0.1"; sha256="0w2jxaz2kxfksyss5vy6xy499p8jg8lpqlykwgm2srp1fd2l3rs9"; depends=[Rcpp RcppArmadillo]; }; SpadeR = derive2 { name="SpadeR"; version="0.1.1"; sha256="0iy2rkq4vvps1a73kqq37zpsyl4pvl3vh07dwvpfhvp7f8nxbx99"; depends=[]; }; SparseBiplots = derive2 { name="SparseBiplots"; version="4.0.0"; sha256="0cpibfj106is7k0wq8z21r110wpxpqs393ic9hxx5yx386z5rcav"; depends=[ggplot2 ggrepel gtable rlang sparsepca testthat]; }; SparseDC = derive2 { name="SparseDC"; version="0.1.17"; sha256="0gsfj8631s67a0r9qjjll4rbb57nzk5fwm5bbggvf0027b9hk0pp"; depends=[]; }; @@ -4484,36 +4647,39 @@ in with self; { SparseMDC = derive2 { name="SparseMDC"; version="0.99.5"; sha256="0d3ashk3l9fjdbiyjhaxc05ayyscissrg7lwhnh46hv3fydbixlj"; depends=[doParallel doRNG foreach]; }; SparseMSE = derive2 { name="SparseMSE"; version="2.0.1"; sha256="1alpvj0ya3r64wwfdzz2aaxgaf6512glzl65p97606c2fwrm6db7"; depends=[lpSolve Rcapture]; }; SpatEntropy = derive2 { name="SpatEntropy"; version="0.1.0"; sha256="0nk399anjhsdki9cra650ynk6sa0366495470sawxcfs3vxmlzrl"; depends=[spatstat]; }; - SpatMCA = derive2 { name="SpatMCA"; version="1.0.1.0"; sha256="1sjrm1md4lmhyq1yw3np4llkgdskw3mk667jr0k3isjmr6z88gxa"; depends=[fields MASS Rcpp RcppArmadillo RcppParallel]; }; SpatPCA = derive2 { name="SpatPCA"; version="1.2.0.1"; sha256="0vqajxcjjdp9dv53w0s4d1z63yrnzvs90h7cqs0f6daaihyvm130"; depends=[Rcpp RcppArmadillo RcppParallel]; }; SpatialAcc = derive2 { name="SpatialAcc"; version="0.1-4"; sha256="09rkzfzg6nh4n7dizkqrz651kp617l2557c9qpxacspl3ngbm82i"; depends=[sp]; }; - SpatialBSS = derive2 { name="SpatialBSS"; version="0.8"; sha256="0dbra7m99b1jn107gp88fdv08whaq02ny3fdddgdxvyf4mlqid8p"; depends=[JADE Rcpp RcppArmadillo sp]; }; + SpatialBSS = derive2 { name="SpatialBSS"; version="0.9-0"; sha256="0id5mi8j80kn3s42ibbbsk4m76b48ir1h66y7ds5jck0xl4fndx2"; depends=[JADE Rcpp RcppArmadillo sp]; }; SpatialBall = derive2 { name="SpatialBall"; version="0.1.0"; sha256="09iy1smfqnb0rd2s9a1wqgscb1plwcwwph6a8215l4zrs6svszv2"; depends=[dplyr ggplot2 hexbin lubridate RColorBrewer]; }; SpatialEpi = derive2 { name="SpatialEpi"; version="1.2.3"; sha256="0d0kyh591m3hvalqpbj67pynpb9v00kdx1idc5mw4p9hsbfs10xm"; depends=[maptools MASS Rcpp RcppArmadillo sp spdep]; }; SpatialEpiApp = derive2 { name="SpatialEpiApp"; version="0.3"; sha256="0svnnzqshk08s58ishy8xhqch44mb5svgfphkvpgysdd68dgaysr"; depends=[dplyr dygraphs ggplot2 htmlwidgets knitr leaflet mapproj maptools RColorBrewer rgdal rgeos rmarkdown shiny shinyjs SpatialEpi spdep xts]; }; - SpatialExtremes = derive2 { name="SpatialExtremes"; version="2.0-8"; sha256="0r2byz5xxc46zqnigdax28q7446ibmzmsmi10lmm2hdks3ml6sl3"; depends=[fields maps]; }; + SpatialExtremes = derive2 { name="SpatialExtremes"; version="2.0-9"; sha256="1mhn1c8n3bmgf0fjyac3wji4790zswzkqliqcv3n8kv9806crb0y"; depends=[fields maps]; }; SpatialFloor = derive2 { name="SpatialFloor"; version="1.1.0"; sha256="07mwgcvkkq478l6wxvrdjs9d578x0kgs5xy86lgy5my0xqfcv6y8"; depends=[blocksdesign fields reshape2 taRifx]; }; SpatialGraph = derive2 { name="SpatialGraph"; version="1.0-2"; sha256="0cwswa5g3a6ng8qkwi04jz9pma4i0c16m7jpq6z3djzjin0znyk2"; depends=[igraph rgeos shape sp splancs]; }; - SpatialKDE = derive2 { name="SpatialKDE"; version="0.6.1"; sha256="15znbhfflzz1x396mnnbx9lx8xs6rfr2564kr632qb2d9ihj9s45"; depends=[dplyr glue magrittr raster Rcpp rlang sf]; }; + SpatialKDE = derive2 { name="SpatialKDE"; version="0.6.2"; sha256="00gdx9jhfybxvfigsym122wfc72vks9bs4zlsij5wp9d1l3r0kfr"; depends=[dplyr glue magrittr raster Rcpp rlang sf vctrs]; }; SpatialML = derive2 { name="SpatialML"; version="0.1.3"; sha256="0akip0kkd1jjid12iwmaxkhkvcfzkxmrnrsv0b6nnvpjdl1jb589"; depends=[randomForest]; }; SpatialNP = derive2 { name="SpatialNP"; version="1.1-4"; sha256="1hj9fjhyxcvl2d0wdqyc899wy4f6iyi03g65icavkmqnwcs8c7hc"; depends=[]; }; - SpatialPack = derive2 { name="SpatialPack"; version="0.3-819"; sha256="14479j2kfsd5611afg2zc9yp408awq3dyp4xcam5cg28ai95ifwl"; depends=[]; }; - SpatialPosition = derive2 { name="SpatialPosition"; version="2.0.1"; sha256="0ljhb5j05kxhw1c2ki1m1688mgbg4pnf8z324i21b9idrcypcizn"; depends=[isoband raster rgeos sf sp]; }; + SpatialPack = derive2 { name="SpatialPack"; version="0.3-8196"; sha256="0kbv4ddl8zdm5z8vi6cj0x59paf669js9vgm28d74yxrdmjy29wh"; depends=[fastmatrix]; }; + SpatialPosition = derive2 { name="SpatialPosition"; version="2.1.0"; sha256="0hl1xhihjsz7wfmia2qn65m6hkzafv616gficvfa5nclj5ll2dz7"; depends=[isoband raster sf sp]; }; + SpatialRegimes = derive2 { name="SpatialRegimes"; version="0.2"; sha256="01kbfwzq58zcvclrnmb9n5y3n0ki9nr8zbxyyanzqn7xcng8qmnb"; depends=[GWmodel plm quantreg spdep]; }; SpatialRoMLE = derive2 { name="SpatialRoMLE"; version="0.1.0"; sha256="1m80vcd27g11v0gxnjz6p4ghljpxdb8jpkns8ry5yzhfvcpf29jc"; depends=[]; }; SpatialTools = derive2 { name="SpatialTools"; version="1.0.4"; sha256="0jgbrzsx2klvihv65y1ycqyr8awp5kqqz4qwfyfibx3b56lzna1q"; depends=[Rcpp RcppArmadillo spBayes]; }; SpatialVS = derive2 { name="SpatialVS"; version="1.1"; sha256="1xghfiz9wmmx11ssms7zjy3ggkjmc6kkbdwp3v5wjwpwapafzdk3"; depends=[fields MASS nlme]; }; - SpatialVx = derive2 { name="SpatialVx"; version="0.6-6"; sha256="184bfx6yxv53pn20q50z84q7d5lcik0mk4w28vh84xx3zq9951mx"; depends=[boot CircStats distillery fastcluster fields maps smatr smoothie spatstat turboEM waveslim]; }; - Spbsampling = derive2 { name="Spbsampling"; version="1.3.3"; sha256="14km5g0yngp4ikndnlfmsgrahpklgsclry269fhmxgk9ingr1isx"; depends=[Rcpp RcppArmadillo]; }; + SpatialVx = derive2 { name="SpatialVx"; version="0.7-1"; sha256="0xbbfz92h168lag1h7hwnb86fb30jccxhabcdi8x0kcpcn721x69"; depends=[boot CircStats distillery fastcluster fields maps smatr smoothie spatstat turboEM waveslim]; }; + Spbsampling = derive2 { name="Spbsampling"; version="1.3.4"; sha256="1rsgrfhipx743qdcpii727hxwg9wqcavy67z5b3kwawss8gf8arc"; depends=[Rcpp RcppArmadillo]; }; SpecDetec = derive2 { name="SpecDetec"; version="1.0.0"; sha256="1940pl4vm1kzszq0hwhqkwbk1xmrimjdf03acpdndy089mdg9avc"; depends=[abind]; }; SpecHelpers = derive2 { name="SpecHelpers"; version="0.2.7"; sha256="1v3v717ah2fkx9225860dwppdf5m6nnnaaa4iwmj30rn17nqr4jh"; depends=[gsubfn splancs]; }; SpecsVerification = derive2 { name="SpecsVerification"; version="0.5-3"; sha256="1v76lilyj65f04881yw19v0qi7n08ysdnr7sc4hf5d8wnmvdh3v3"; depends=[Rcpp RcppArmadillo]; }; SpectralMap = derive2 { name="SpectralMap"; version="1.0"; sha256="15689023k9jzg3s7bx5m97dmn00z876amqhxsxksy8n8wf09wr57"; depends=[fields scatterplot3d]; }; Spectrum = derive2 { name="Spectrum"; version="1.1"; sha256="0n38d360azkck6vvhr771zsh0gbvd9qsf9ygg5r18vhz0pb1xcfw"; depends=[ClusterR diptest ggplot2 Rfast]; }; + SphereOptimize = derive2 { name="SphereOptimize"; version="0.1.1"; sha256="1b01jpj0sagi3hwfvgd346wvrcypv5b3hh0xfdd8qqnwjgkq8ixi"; depends=[]; }; SphericalCubature = derive2 { name="SphericalCubature"; version="1.4"; sha256="14xrxhmhavz82rcixnyharnbrvdzs6rh7gbxihaxh431d90w2q3k"; depends=[abind cubature mvmesh SimplicialCubature]; }; SphericalK = derive2 { name="SphericalK"; version="1.2"; sha256="18py4ylm10s75pihjvcy7w948379zy9l9azriw7g7pyp7px29wda"; depends=[]; }; + Spillover = derive2 { name="Spillover"; version="0.1"; sha256="18vk1njd7bzrfic4s1kmnbafcjyrr7wv2lbnifmsafd5qphbx87x"; depends=[fastSOM vars zoo]; }; SplitReg = derive2 { name="SplitReg"; version="1.0.2"; sha256="1s012qldrsq8rpfpzf7kyd7631b65zai269x53xcaqn75r5ssh3f"; depends=[Rcpp RcppArmadillo]; }; SplitSoftening = derive2 { name="SplitSoftening"; version="2.0-1"; sha256="0jk46ymgkjh8jg9b9zzn9490cq92fzchvi2yzqiwisww0k15xlvb"; depends=[]; }; SportsAnalytics = derive2 { name="SportsAnalytics"; version="0.2"; sha256="1vb080ak1mfvr6d0q9i3r8hd547ba80bavjdcri0gclqqcjf1ach"; depends=[]; }; + SpotSampling = derive2 { name="SpotSampling"; version="0.1.0"; sha256="0s47dvigzkcl9ynrdiwrjzwap18dpkb29jngi8ddvf9m4xywj4al"; depends=[BalancedSampling MASS pracma sampling WaveSampling]; }; SqlRender = derive2 { name="SqlRender"; version="1.6.8"; sha256="10v2p5law5nqf2bychrbq28albxn9f1aic7cb9lj9pk12w03rpp0"; depends=[rJava]; }; Sstack = derive2 { name="Sstack"; version="1.0.1"; sha256="137vsas2kw3l37c141g51sgx0j6z8ys6hbxjmsdymz1fxsjr4adg"; depends=[doParallel dplyr foreach randomForest]; }; StAMPP = derive2 { name="StAMPP"; version="1.6.1"; sha256="1x6b032xadjn8yq3n662r9f0lyg5xl71q2lksvx8rn5fmpjlqqrs"; depends=[adegenet doParallel foreach pegas]; }; @@ -4523,10 +4689,10 @@ in with self; { StabilizedRegression = derive2 { name="StabilizedRegression"; version="1.0"; sha256="11hfq13b5rc1jj832msrfb0f3fsklx4clp72aqxfccw0z0n8mdq0"; depends=[corpcor ggplot2 ggrepel glmnet MASS R6]; }; StableEstim = derive2 { name="StableEstim"; version="2.1"; sha256="0agi3bfp1xy5pfxxb9ib6xn434agmplgn7kg47nhbh47vf57vang"; depends=[fBasics MASS Matrix numDeriv stabledist testthat xtable]; }; StakeholderAnalysis = derive2 { name="StakeholderAnalysis"; version="1.2"; sha256="164mah8h8izxaqp8hc43l6mlnf95pydkcx2laqrlqr9b0bybadxb"; depends=[]; }; - StanHeaders = derive2 { name="StanHeaders"; version="2.21.0-6"; sha256="1wwcrss4y6xbi81cg6ldhm57wz5paflzzp3yxh8b6shf9l2jla50"; depends=[RcppEigen RcppParallel]; }; + StanHeaders = derive2 { name="StanHeaders"; version="2.21.0-7"; sha256="0srkyawyiykn3p5lw1z3zf18s4ax4iasv1ci3l1px40f9w36wm17"; depends=[RcppEigen RcppParallel]; }; StandardizeText = derive2 { name="StandardizeText"; version="1.0"; sha256="0s267k2b109pcdiyd26gm4ag5afikrnnb55d3cs6g2fvzp744hfp"; depends=[]; }; Stat2Data = derive2 { name="Stat2Data"; version="2.0.0"; sha256="1fpp3b4k7x915a9wkpyj4dvvqp0wz7c3lpbh154vrxrdsr712z0k"; depends=[]; }; - StatCharrms = derive2 { name="StatCharrms"; version="0.90.95"; sha256="05sfrg19slqb31ifw7p0fn5722d2r91fx3xlfhvql0z5mq4hykah"; depends=[cairoDevice car clinfun coxme gWidgets2 gWidgets2RGtk2 lattice multcomp nlme R2HTML RGtk2 RSCABS survival]; }; + StatCharrms = derive2 { name="StatCharrms"; version="0.90.96"; sha256="1451aj1476qjpmxhpbgd8g55i7rp2msml64xsiy25h7x9g6d9w05"; depends=[cairoDevice car clinfun coxme gWidgets2 gWidgets2RGtk2 lattice multcomp nlme R2HTML RGtk2 RSCABS survival]; }; StatDA = derive2 { name="StatDA"; version="1.7.4"; sha256="1ld7fx1lip54n24r2d9zvd4hri3w02vd174bdi8pi9j5n8xpxl02"; depends=[cluster e1071 geoR MASS MBA mgcv rgl robustbase sgeostat sp xtable]; }; StatDataML = derive2 { name="StatDataML"; version="1.0-26"; sha256="1lcckapbhqdbg6alnhm2yls66lnkxnxamdlzx6pbfqv1dhsy36gf"; depends=[XML]; }; StatMatch = derive2 { name="StatMatch"; version="1.4.0"; sha256="0nd4s57rzq4zgi5b7krbdhz9vwxvj5j63kazdyhlwwqk4b6r2042"; depends=[ggplot2 lpSolve proxy survey]; }; @@ -4534,8 +4700,9 @@ in with self; { StatPerMeCo = derive2 { name="StatPerMeCo"; version="0.1.0"; sha256="1nm6brlj6h7jx8nqagrfk294ay3pfmkiizabwlb87qfnsfwchpk3"; depends=[]; }; StatRank = derive2 { name="StatRank"; version="0.0.6"; sha256="14d8v3bp8vgksi6q0mxajwd9s8zi6lns3qwi1vcr5xp9rjp4n6iy"; depends=[ggplot2 plyr truncdist]; }; SteinIV = derive2 { name="SteinIV"; version="0.1-1"; sha256="1bm4lc7g9h9jkb1dpzb84289bwxcywp0a8vylv6ipvhiqbqk5d95"; depends=[]; }; + SteinerNet = derive2 { name="SteinerNet"; version="3.1.0"; sha256="03wr746dkwp8vg91y986q0xvgz1y9b5q25g0kig2sx6m75li3yif"; depends=[igraph]; }; Stem = derive2 { name="Stem"; version="1.0"; sha256="1fr02mi5qyxbqavdh2hg8ggw4nfjh3vs7g0vh834h6y0v53l71r5"; depends=[MASS mvtnorm]; }; - StempCens = derive2 { name="StempCens"; version="0.1.0"; sha256="11gspjrcl6yiyr19hankan5mcxipfsdkhha6nsiybs1chg5wx6f4"; depends=[distances ggplot2 gridExtra Matrix MCMCglmm mvtnorm optimx sp spTimer ssym tmvtnorm]; }; + StempCens = derive2 { name="StempCens"; version="1.1.0"; sha256="0jphyikfggx0yj5f5k3fykf3fdv9msppymzpyin1m7xfmfi5cwia"; depends=[distances ggplot2 MCMCglmm mvtnorm Rcpp RcppArmadillo Rdpack tmvtnorm]; }; StepReg = derive2 { name="StepReg"; version="1.4.1"; sha256="1ash73v9qwy1717w00vajamkd4rb8rsaxch7y9479yqagclfbl18"; depends=[Rcpp RcppEigen]; }; StepSignalMargiLike = derive2 { name="StepSignalMargiLike"; version="2.6.0"; sha256="0j85lvs2bljfhf482r31sq3xgk8l73hcw22wgxxp8z8nla38cwf9"; depends=[Rcpp]; }; StepwiseTest = derive2 { name="StepwiseTest"; version="1.0"; sha256="1fdm4s9l6grgd45r98ybbsh40rnmnn16c0id6lv28cpmssi0iphi"; depends=[Rcpp RcppArmadillo]; }; @@ -4544,11 +4711,11 @@ in with self; { StrainRanking = derive2 { name="StrainRanking"; version="1.2"; sha256="1r8avm9xajqmsy4x7pgh1yaffq7wl5i5kg75kdilydwmii6n19i0"; depends=[]; }; StratSel = derive2 { name="StratSel"; version="1.3"; sha256="0hd6q8s8aiymcd33kv0gd0a4wzr86xxdzwn18jgpyk9q8pmg8gvl"; depends=[Formula MASS memisc mnormt pbivnorm]; }; Strategy = derive2 { name="Strategy"; version="1.0.1"; sha256="0phja1r0qfvcswvw5w1x6ny86p84wkqb029fdqgw10djdm9xp0f2"; depends=[xts zoo]; }; - StrathE2E2 = derive2 { name="StrathE2E2"; version="3.1.0"; sha256="1j9mx3pi22g62x5ard3vwpcmmh5jwb26rvpsma6xk8qjpbc0yzrf"; depends=[deSolve NetIndices]; }; + StrathE2E2 = derive2 { name="StrathE2E2"; version="3.2.0"; sha256="0yzlnjnczndd06r2s90hs0fnm3rrb0avw0q5mhhsfjglix5p2km3"; depends=[deSolve NetIndices]; }; StratifiedBalancing = derive2 { name="StratifiedBalancing"; version="0.3.0"; sha256="0pklnm0q0imdhyzhwyb4i0j441dkk4k6qqlx8d4q2xnl62drqnvv"; depends=[bnlearn plyr]; }; StratifiedMedicine = derive2 { name="StratifiedMedicine"; version="1.0.2"; sha256="0vrymsq4n88c8shh2ragx731kyy75bp823kfzs4ldam4f77fp1pz"; depends=[dplyr ggparty ggplot2 glmnet mvtnorm partykit ranger survival]; }; StratifiedRF = derive2 { name="StratifiedRF"; version="0.2.2"; sha256="0a5djia6xacs17nnr5knr1acwzicrffz73q9nvnhdmihazq8v27d"; depends=[C50 dplyr]; }; - StratigrapheR = derive2 { name="StratigrapheR"; version="1.1.0"; sha256="0njxvphgjws6349cz8f6scpz0wyiahfqkg50z2dall8ia6kszjnh"; depends=[diagram dplyr shiny stringr XML]; }; + StratigrapheR = derive2 { name="StratigrapheR"; version="1.1.1"; sha256="1r10sxl09diwn6d76i9ila9apjpfwglndh8z4njldk311nv5c2w0"; depends=[diagram dplyr reshape shiny stringr XML]; }; StreamMetabolism = derive2 { name="StreamMetabolism"; version="1.1.2"; sha256="1sv30i7armk7jhxg5x9lh0r9qq3xixn1k2h0q89halkh1yraal8a"; depends=[chron maptools zoo]; }; StressStrength = derive2 { name="StressStrength"; version="1.0.2"; sha256="1fq26bzmwsk4nzz9bgasyxz9alw8x2ssahz67mham7vw483w79pd"; depends=[]; }; String2AdjMatrix = derive2 { name="String2AdjMatrix"; version="0.1.0"; sha256="058r30kjjna02nmd6ngqfcnn1yk5390i20xvl6qb5qk3bcp2wmxn"; depends=[stringr]; }; @@ -4556,30 +4723,31 @@ in with self; { StructFDR = derive2 { name="StructFDR"; version="1.3"; sha256="1y0wj7y36iq0lznc4qpsr2yis3an34iilpabkaxxmas2q4abg0qb"; depends=[ape cluster dirmult matrixStats nlme]; }; StructureMC = derive2 { name="StructureMC"; version="1.0"; sha256="1pj3inznw6flvmk22dzjcfjnwjhx7r98ngckz0axf6ipp3hb85jn"; depends=[MASS matrixcalc]; }; SubCultCon = derive2 { name="SubCultCon"; version="1.0"; sha256="08q6k4nsv3gl5qk87s87smdg047yc2a4i7kg0fp08i7q7h62jkvz"; depends=[]; }; - SubTite = derive2 { name="SubTite"; version="3.0.2"; sha256="1idp6yra1nznkm3hdv82hvp432lywi8kddk3n227g5216q0pmlcn"; depends=[Rcpp RcppArmadillo]; }; + SubTite = derive2 { name="SubTite"; version="4.0.1"; sha256="1nb7wig34xf8wq50s9i2zs5ymd0z782lh39rp165wi6c62nj36rz"; depends=[Rcpp RcppArmadillo]; }; SubVis = derive2 { name="SubVis"; version="2.0.2"; sha256="1nb3zgm6i5lwfwdrn8mk3wkg8a4ldfvs27ai8v46l4316qc1fa9p"; depends=[Biostrings shiny]; }; SubgrPlots = derive2 { name="SubgrPlots"; version="0.1.3"; sha256="1bi5zndkpgvyk563i0jdfrw73kkpa6zi3yx922dv90w6bdb9kvl2"; depends=[alluvial circlize colorspace diagram dplyr ggplot2 ggrepel gridBase gridExtra plyr polyclip scales shape sp survival survRM2 UpSetR VennDiagram]; }; - SubgrpID = derive2 { name="SubgrpID"; version="0.11"; sha256="1by23gdkbls7l5xa9nl055nbm0d3138pmfmasqmcy42h62wf7dw6"; depends=[AIM ggplot2 glmnet Matrix rpart survival]; }; SubpathwayGMir = derive2 { name="SubpathwayGMir"; version="1.0"; sha256="1rw94idhbnaszr2xv1wgnjcxlnxkml912pvmqh2a1nqpwca5mscy"; depends=[igraph XML]; }; SubpathwayLNCE = derive2 { name="SubpathwayLNCE"; version="1.0"; sha256="051csjavr9549y54yirfdn266i7swsvpbcakhziyz4sl4afwx5kl"; depends=[BiasedUrn graph igraph RBGL]; }; - SubtypeDrug = derive2 { name="SubtypeDrug"; version="0.1.1"; sha256="02dq2byh4m84pckxzcp5zbj7dd5xv2fawrj711m1wwr310dqddns"; depends=[BiocGenerics ChemmineR devtools GSVA igraph pheatmap rvest xml2]; }; + SubtypeDrug = derive2 { name="SubtypeDrug"; version="0.1.3"; sha256="0rixcdkrm6l62sl3d4jpwn0kidcgr6z26yz3hzyyfzlkcv599l4j"; depends=[BiocGenerics ChemmineR devtools GSVA igraph pheatmap rvest xml2]; }; + SuessR = derive2 { name="SuessR"; version="0.1.1"; sha256="0hbhwd29q2z0f03p8cf197nbn4i2srrl5nymxy05d4gv2swl1cvn"; depends=[]; }; SummaryLasso = derive2 { name="SummaryLasso"; version="1.2.1"; sha256="1gb1g1xgda5psq93vy50yfr0cbhvymliblpkxz7ck1nwpp65n9py"; depends=[gtools]; }; Sunclarco = derive2 { name="Sunclarco"; version="1.0.0"; sha256="0jv92a4ciwkm0wa4irgb6ql3vf6v6p24fmbnk24pqp5p8drp8g5v"; depends=[survival]; }; Sunder = derive2 { name="Sunder"; version="0.0.4"; sha256="1na41nnscyc4v1qbwzfgqk503r39xxbi6f446pscrz3v0v121f1a"; depends=[mnormt]; }; - SunsVoc = derive2 { name="SunsVoc"; version="0.1.0"; sha256="09czc6z453k7qs5vvslnbdr65h7j1yiy5az56hihwg548i3vcj9y"; depends=[data_table ddiv dplyr magrittr purrr rlang stringr]; }; + SunsVoc = derive2 { name="SunsVoc"; version="0.1.1"; sha256="1rcaip60hdfn496i0ynzkg5r9d9f4g8w502s85icczd07m20y6pb"; depends=[data_table ddiv dplyr magrittr purrr rlang stringr]; }; SunterSampling = derive2 { name="SunterSampling"; version="1.0.1"; sha256="0qfld3j8xlpgp7c58zqw6gzm38m4d740lvdj5vmcflfcc6ja98sf"; depends=[]; }; SupMZ = derive2 { name="SupMZ"; version="0.2.0"; sha256="1n81wqacrpk5x6i1pd1zsjivv2jk41743kg1h7gnp0rb3k58vp7r"; depends=[dplyr magrittr]; }; SuperExactTest = derive2 { name="SuperExactTest"; version="1.0.7"; sha256="1ysfsdzbkldcn7hzxhqikf5h2h9747xhfrirqgr8xx8q81wq989s"; depends=[]; }; - SuperGauss = derive2 { name="SuperGauss"; version="1.0.2"; sha256="08nrw96y7b04a9xpyklcnqgisbjxd35pqffpay6cr67zxx0zg81i"; depends=[fftw Rcpp RcppEigen]; }; + SuperGauss = derive2 { name="SuperGauss"; version="2.0.1"; sha256="1v7bva9a4cjjaf924bj02421sk85hmirijrpcpayhyyjr65jscqh"; depends=[fftw R6 Rcpp RcppEigen]; }; SuperLearner = derive2 { name="SuperLearner"; version="2.0-26"; sha256="10b0fh71ky92mp0ydi81s6zm3sn47k5agppcg4zpgqmailn94qj4"; depends=[cvAUC nnls]; }; SuperPCA = derive2 { name="SuperPCA"; version="0.3.0"; sha256="139nym0szr7l7hq3xy60jwpx61896h5g7vrklxy7098w53iczyj4"; depends=[fBasics glmnet MASS matlab matlabr Matrix matrixStats pracma psych R_matlab RSpectra spls timeSeries]; }; SuperRanker = derive2 { name="SuperRanker"; version="1.1.1"; sha256="1yiklw9zk7yw0xz5g3lmyl5lv325fnysimdwbxa37nyj6qdfv0ls"; depends=[prodlim Rcpp]; }; SuperpixelImageSegmentation = derive2 { name="SuperpixelImageSegmentation"; version="1.0.2"; sha256="07zg9k8a0fb9x37q5wlahvg4xc0lnhidz0xvly8d330iqmxhxmyq"; depends=[ClusterR lattice OpenImageR R6 Rcpp RcppArmadillo]; }; - Superpower = derive2 { name="Superpower"; version="0.0.3"; sha256="0hwlgscygjcqiclgac97ffcmw081g91rvqbd2pj0z0kijz7g597x"; depends=[afex dplyr emmeans ggplot2 gridExtra magrittr MASS mvtnorm reshape2]; }; + Superpower = derive2 { name="Superpower"; version="0.1.0"; sha256="0khslcma1b5nlyfwqdanlydblwxb4an94k75ffxpv603nrn3s26x"; depends=[afex dplyr emmeans ggplot2 gridExtra Hmisc magrittr MASS mvtnorm reshape2 tidyselect]; }; SuppDists = derive2 { name="SuppDists"; version="1.1-9.5"; sha256="1i3iq12a5x5k49ac01mikzcrrq9gc148xq3m08h4xm07bha6f2v8"; depends=[]; }; - SurfaceTortoise = derive2 { name="SurfaceTortoise"; version="1.0.1"; sha256="0q0swp0xs3lmfx2dxffqrna2spyr2l9ka0zbhmw8nkgb1w5rq5q6"; depends=[gstat raster rgeos sp]; }; - Surrogate = derive2 { name="Surrogate"; version="1.7"; sha256="17f91s6fdlbgwxqggnylx45n3j2mdsqi9613ayrhi77yhqhjpm16"; depends=[extraDistr ks lattice latticeExtra lme4 logistf MASS mixtools msm nlme OrdinalLogisticBiplot rgl rms rootSolve survival]; }; + SurfaceTortoise = derive2 { name="SurfaceTortoise"; version="1.0.2"; sha256="1l586x9np5rclqdrnv8b72ixlppzlnsq4yf99ny6aq5a9lwzmcgm"; depends=[gstat raster rgeos sp]; }; + Surrogate = derive2 { name="Surrogate"; version="1.8"; sha256="0kqcij8bxh15ajqlcv6j8zx8c9p5yn0w94i06f0f4b3mpqw3vjik"; depends=[extraDistr ks lattice latticeExtra lme4 logistf MASS mixtools msm nlme OrdinalLogisticBiplot rms rootSolve survival]; }; SurrogateOutcome = derive2 { name="SurrogateOutcome"; version="1.0"; sha256="0x91bmr4n9zn9cc72s91fzzsqhzhrkfpcbcla00gcsfmbjqz3997"; depends=[survival]; }; + SurrogateRegression = derive2 { name="SurrogateRegression"; version="0.5.0"; sha256="06xdkg75fs1ymq5x20k5wnv6rji13rk049pm11b686wjvwycrsg7"; depends=[mvnfast plyr Rcpp RcppArmadillo]; }; SurrogateTest = derive2 { name="SurrogateTest"; version="1.2"; sha256="0wkyz9qkmvsrhvdga6w0qkbgqr7kr0yh04kkc19824sqnx452dc5"; depends=[survival]; }; SurvBoost = derive2 { name="SurvBoost"; version="0.1.2"; sha256="17av00iwa3kpw0ihrvvynrfcghnq492b5k7n9fxfgf2nily24x2p"; depends=[directlabels ggplot2 mvtnorm plyr Rcpp RcppArmadillo RcppParallel reshape2 survival]; }; SurvCorr = derive2 { name="SurvCorr"; version="1.0"; sha256="01rqdl503q1qnkn49iqnsjzis6azdsfi6s2hjky5k2zd6c9g18k5"; depends=[fields survival]; }; @@ -4592,19 +4760,23 @@ in with self; { Survgini = derive2 { name="Survgini"; version="1.0"; sha256="1gxkdv2j1njbgnwb52vyhz7p2lrcg3hp6sry3kyhp4wkvf6gnhxi"; depends=[survival]; }; SvyNom = derive2 { name="SvyNom"; version="1.1"; sha256="1jym2x6nd9a3y7nk5hflqpy54gs67y4sqqspkvkalf5l2cc64did"; depends=[Hmisc rms survey survival]; }; SwarmSVM = derive2 { name="SwarmSVM"; version="0.1-6"; sha256="09xq7jx70qjyhblzh6kc40hdr0636rqqdnbka7m6rawhd8ivp8yz"; depends=[BBmisc checkmate e1071 kernlab LiblineaR Matrix SparseM]; }; - SwimmeR = derive2 { name="SwimmeR"; version="0.3.1"; sha256="10jn491rsaknl6fyialm8g4ipckcr1qcaipqxbhszdakmj8hpfpr"; depends=[dplyr ggplot2 magrittr pdftools purrr rvest scales stringr tibble xml2]; }; + SwimmeR = derive2 { name="SwimmeR"; version="0.6.0"; sha256="0yycvijsrh9cxniy982n7nrdv2hpq2xykhyybrrcn2x6rk3ikq21"; depends=[dplyr magrittr pdftools purrr readr rvest stringr tibble xml2]; }; SwissAir = derive2 { name="SwissAir"; version="1.1.5"; sha256="0lh69924vhyilgn562jqn8m7z4dq3xmdj09501sbs7hbxfaiiyly"; depends=[]; }; SyNet = derive2 { name="SyNet"; version="2.0"; sha256="0mb9dscddkvmkf7l3bbcy4dlfmrvvy588vxdqy5dr783bpa5dkiw"; depends=[tkrplot]; }; - SyScSelection = derive2 { name="SyScSelection"; version="1.0.1"; sha256="1q2w21qdw9dcjdfrngbdk50arm8jmrccbhqpnbp2gypnxv4pic1y"; depends=[pracma]; }; + SyScSelection = derive2 { name="SyScSelection"; version="1.0.2"; sha256="16zx507hlzhdxbh6gzndbgmzpyp6vc59h441l4gv8lx58zi9kyjd"; depends=[pracma]; }; SymTS = derive2 { name="SymTS"; version="1.0"; sha256="17vhm00zd9yxl6li36bsfkm4rsizjsm93ibrzgqnkl72sqmmlwfi"; depends=[]; }; + SymbolicDeterminants = derive2 { name="SymbolicDeterminants"; version="1.2.0"; sha256="1z24qn6dja6axynqq98zw9pzxwx30aafk53lqlajirnnrmxrvxx6"; depends=[fs]; }; SyncMove = derive2 { name="SyncMove"; version="0.1-0"; sha256="1jlnsj5v8y5pijfkww7ng7nkwvj93naw29wcxxj130ww5qk7qk1z"; depends=[]; }; SyncRNG = derive2 { name="SyncRNG"; version="1.3.0"; sha256="0sywfmmy6mq6qsxkxjc67665snn1jds01j3h7ni1200igja139g2"; depends=[]; }; SynchWave = derive2 { name="SynchWave"; version="1.1.1"; sha256="127hllvig8kcs9gr2q14crswzhacv6v2s4zrgj50qdyprj14is18"; depends=[fields]; }; Synth = derive2 { name="Synth"; version="1.1-5"; sha256="1cfvh91nz6skjk8jv04fhwv3ga9kcsfgq3mdy8lx75jkx16zr0pk"; depends=[kernlab optimx]; }; + SynthETIC = derive2 { name="SynthETIC"; version="0.1.0"; sha256="0xlfmsy8dgkajm1r2g5vi63b1vzmq4rvvc6099axn9s8h2yj6w9q"; depends=[ggplot2 magrittr rlang]; }; SynthTools = derive2 { name="SynthTools"; version="1.0.1"; sha256="19vasz3nnm5vgwqs6g2a5bibmk44br1bxga5zavsx938x3jw9gnd"; depends=[dplyr magrittr Rdpack]; }; SystemicR = derive2 { name="SystemicR"; version="0.1.0"; sha256="1vk08w734zxvrwzd81iy0azwcj53k6wvgc1qlaxw96hirdwdg6zr"; depends=[igraph Matrix quantreg xts]; }; T2EQ = derive2 { name="T2EQ"; version="1.1"; sha256="1skkkryw63pfx1xslia1lczb2psja6v6hcbph4isdcksb4l4pcig"; depends=[]; }; - TAG = derive2 { name="TAG"; version="0.2.0"; sha256="0s4n2f9x36df1pb5p8n98926lgg9z79fka5r9xqxxsc91h35q9aw"; depends=[DiceKriging doParallel FastGP Matrix mgcv mlegp randtoolbox Rcpp RcppArmadillo]; }; + T4cluster = derive2 { name="T4cluster"; version="0.1.0"; sha256="11x7y8yb7cmjz1a6n53lzhh6q3l76g8jqh8c3xbmnr7hxzbqiwl6"; depends=[maotai Rcpp RcppArmadillo Rdimtools Rdpack]; }; + T4transport = derive2 { name="T4transport"; version="0.1.0"; sha256="0cp2881j6qyzh1yl23f2layhldsgdy7ic7c8c4hydfv7c7qkkg3d"; depends=[lpSolve Rcpp RcppArmadillo Rdpack]; }; + TAG = derive2 { name="TAG"; version="0.2.1"; sha256="1sr24mi7s7z155xzs0aki21ywcq10gjc93nra2x6pfm20ymlyndl"; depends=[DiceKriging FastGP foreach Matrix mgcv mlegp randtoolbox Rcpp RcppArmadillo]; }; TAM = derive2 { name="TAM"; version="3.5-19"; sha256="1x1pdy0hrk4c3x5l4gcslpvyb0sv2zgly4n3a7y8j6yrzajx0sg7"; depends=[CDM Rcpp RcppArmadillo]; }; TANDEM = derive2 { name="TANDEM"; version="1.0.3"; sha256="151rm95q2naw9y58df1lr2qiadnkgfb5j9v47v41bw4iipsmlp4p"; depends=[glmnet Matrix]; }; TAQMNGR = derive2 { name="TAQMNGR"; version="2018.5-1"; sha256="0bf0sgqa53l9y2bhwg2ngiwlcgrmj0nvxchlsmcc8zin388qf4pb"; depends=[Rcpp]; }; @@ -4612,11 +4784,12 @@ in with self; { TAShiny = derive2 { name="TAShiny"; version="0.1.0"; sha256="1h8k8py7myrj7c18cbp4q7bmgmck64jagw9s9j1jaqzl9qf8cbgq"; depends=[dplyr igraph shiny SnowballC tm wordcloud2]; }; TBEST = derive2 { name="TBEST"; version="5.0"; sha256="15piy507vv8x59xgga17splxszy0vm87qjbfgxycvba633jishsa"; depends=[fdrtool signal]; }; TBFmultinomial = derive2 { name="TBFmultinomial"; version="0.1.3"; sha256="0cd0dr8vkf0sfriaafp2x63dilxmirm0fljxm82zw77c9j5ly3kv"; depends=[nnet plotrix stringr VGAM]; }; - TBRDist = derive2 { name="TBRDist"; version="1.0.1"; sha256="08100f7mswsc9x3h1sf9mibbdh84hwn77mz51a4npxydhkj1bszd"; depends=[ape BH Rcpp TreeDist TreeTools]; }; + TBRDist = derive2 { name="TBRDist"; version="1.0.2"; sha256="0xwr91fyx3x27szkafmcs5sffgs64svky7mddrrgcfnbdl5c4iia"; depends=[ape BH Rcpp Rdpack TreeDist TreeTools]; }; TBSSurvival = derive2 { name="TBSSurvival"; version="1.3"; sha256="1r87qvnlvc18i12yi25lfpdb8b5p33fywi38hs2xp1y2vbvz5s9b"; depends=[BMS coda mcmc normalp R_utils Rsolnp survival]; }; TCA = derive2 { name="TCA"; version="1.1.0"; sha256="0pj052kd378x1gmg5wcbk8c0dca3c2ra65hnagljmsplv169vimy"; depends=[config data_table futile_logger glmnet gmodels Matrix matrixcalc matrixStats nloptr pbapply pracma quadprog rsvd]; }; TCGAretriever = derive2 { name="TCGAretriever"; version="1.5"; sha256="1xg1rz2h5jbpdd5axli3ripqxb0bj64yrd4y5nzr8axajiaybkj9"; depends=[httr]; }; TCIApathfinder = derive2 { name="TCIApathfinder"; version="1.0.6"; sha256="15f3w6vhbqy4xzidxasjnqigxchd3jbr2kpm3gggjnkp7rzsfgaf"; depends=[httr jsonlite]; }; + TCIU = derive2 { name="TCIU"; version="1.1.0"; sha256="0hlav6i4jvqaa1nhqplqpbw35zcswmrm1x4h3h230zcravmrr1gr"; depends=[AnalyzeFMRI cubature doParallel dplyr DT extraDistr fancycut fmri foreach forecast geometry ggplot2 ggpubr gridExtra ICSNP MultiwayRegression plotly pracma RColorBrewer reshape2 rrcov scales spatstat tidyr zoo]; }; TDA = derive2 { name="TDA"; version="1.6.9"; sha256="023jwhh1qc2y30g42pgfaha4n4pixzwrrghxlyss4889fr66q9vw"; depends=[BH FNN igraph Rcpp RcppEigen scales]; }; TDAmapper = derive2 { name="TDAmapper"; version="1.0"; sha256="0cxgr2888v8azgdr3sg4vlcdyivkrxkk6dsp1ahv4frrwvg2z09k"; depends=[]; }; TDAstats = derive2 { name="TDAstats"; version="0.4.1"; sha256="1zmickqk60vm9rzy67hib835v3c45aqjk441p31vpbvhbiy58nq5"; depends=[ggplot2 Rcpp]; }; @@ -4636,9 +4809,10 @@ in with self; { TFX = derive2 { name="TFX"; version="0.1.0"; sha256="0xrjdbvg0ng4i0s8ql1pfyma10x4n045spilkb05750677r5j44p"; depends=[XML]; }; TFisher = derive2 { name="TFisher"; version="0.2.0"; sha256="0vz74ww1lf1prfwz74hfsi3a8nzq8ss7aqjr85c1d87vss2796xx"; depends=[Matrix mvtnorm sn]; }; TGS = derive2 { name="TGS"; version="1.0.1"; sha256="01mwdlgfjlxy0q5lxcmzk6lsb806987va7yag0zpjjd2bzmdh70k"; depends=[bnstruct doParallel foreach ggm minet rjson]; }; + TGST = derive2 { name="TGST"; version="1.0"; sha256="1xnb41ksggdi57gnkjaab98c4nfdkxqx53rv9pyh3j0cg0kbkk9v"; depends=[ggplot2 knitr]; }; TH_data = derive2 { name="TH.data"; version="1.0-10"; sha256="0mgz7aj2d9abbmdr65zgmg1ddp3fdbs3mfj83r5xadh5ldkir2k1"; depends=[MASS survival]; }; TIMP = derive2 { name="TIMP"; version="1.13.2"; sha256="1y1bc6wsd32792apsc6qncxbw5y8ww9xlhy9v49mhwbffgzn6llg"; depends=[colorspace deSolve fields gclus gplots minpack_lm nnls]; }; - TITAN2 = derive2 { name="TITAN2"; version="2.4"; sha256="1ai4mr69iwl8lliy1zak73s3a4skny4w09clh4z1ri7r5fmq1c2q"; depends=[cowplot dplyr ggplot2 ggridges glue purrr snow tibble]; }; + TITAN2 = derive2 { name="TITAN2"; version="2.4.1"; sha256="16zf42s1as2xrvyhd0lnv36mgnr5w19xv11pkl0k8imb5bdkhxa2"; depends=[cowplot dplyr ggplot2 ggridges glue purrr snow tibble]; }; TInPosition = derive2 { name="TInPosition"; version="0.13.6.1"; sha256="1c0h9zg71whmsjn5rnzv5kdrabl9kqrq627caznvrpa74c7pjks9"; depends=[ExPosition InPosition prettyGraphs TExPosition]; }; TLBC = derive2 { name="TLBC"; version="1.0"; sha256="08w187akbhfbz6nrrf7avf02lrhgj7bbrjmim9gkh4wlbjhzvw67"; depends=[caret HMM randomForest signal stringr]; }; TLMoments = derive2 { name="TLMoments"; version="0.7.5"; sha256="0v86rs7f63f59ng9m6lnjgv52czg1xk814flnhz153fjy7y2pidl"; depends=[ggplot2 hypergeo Rcpp]; }; @@ -4652,12 +4826,14 @@ in with self; { TPD = derive2 { name="TPD"; version="1.1.0"; sha256="1ppj6ppi0lhlz079ygjnwx1l5f36bsi8zax23ssr1w6h4csw748m"; depends=[ggplot2 gridExtra ks mvtnorm]; }; TPEA = derive2 { name="TPEA"; version="3.1.0"; sha256="1yyc3q4dyf4d8m7wi851dnxf3xnvvfnvj28kl8z8py4r4jsb2hfy"; depends=[foreach igraph Matrix MESS RCurl XML]; }; TPES = derive2 { name="TPES"; version="1.0.0"; sha256="00g1limcappjrly93x7xb1llrgaxivmiky3kw40w2fs0303ha3d7"; depends=[]; }; + TPLSr = derive2 { name="TPLSr"; version="1.0.1"; sha256="1byi8w38mr4p7ni2wvyamqyjcz97hm6da784070a9c4p8jp4bwv2"; depends=[plotly]; }; TPmsm = derive2 { name="TPmsm"; version="1.2.2"; sha256="1ibb3ayd808x3a562qldaww7czmfq1cd1j4g4ch5k7q38jw5x835"; depends=[KernSmooth]; }; - TR8 = derive2 { name="TR8"; version="0.9.21"; sha256="0zmbzqvsv7ipbhj7gavvdmcblc2ls057n56zizjn5crls7c6jxbm"; depends=[plyr rappdirs RCurl readxl reshape shiny taxize XML]; }; + TR8 = derive2 { name="TR8"; version="0.9.22"; sha256="12miq65yl39pngpsa30qjcwp21vn93a4wvid03pmbf6x6hq0v4k7"; depends=[dplyr plyr rappdirs RCurl readxl reshape shiny taxize XML]; }; TRADER = derive2 { name="TRADER"; version="1.2-3"; sha256="1w9m2b866dyj82s118m64q8j9a1chpq2km2pnn9mfwwj8sivgdgn"; depends=[dplR]; }; TRAMPR = derive2 { name="TRAMPR"; version="1.0-9"; sha256="16fbzp6b6y25k9h7m4qpmbgj10przywm2rh8kvw8a8p0xkskc9k5"; depends=[]; }; TRD = derive2 { name="TRD"; version="1.1"; sha256="0bhn4bcrq39f5dgqc74jqsfhs1iqfxhawacqqyncbk2372013nqp"; depends=[Rlab]; }; - TRES = derive2 { name="TRES"; version="1.1.2"; sha256="1v2bs111h603s57wphaadq7wb6a27n8cm0yg69n51v0z0zy9n39n"; depends=[ManifoldOptim MASS pracma rTensor]; }; + TRES = derive2 { name="TRES"; version="1.1.3"; sha256="104nxscgihmlblypy576h8z6vwspvcbv40miilh5n52ab0hmk5b6"; depends=[ManifoldOptim MASS pracma rTensor]; }; + TSA = derive2 { name="TSA"; version="1.3"; sha256="1bv5q609lhmrcxnjnvcj497fbjlv89zwa8q918hw4iki5nkvwwdb"; depends=[leaps locfit mgcv tseries]; }; TSCS = derive2 { name="TSCS"; version="0.1.1"; sha256="0dllaw69rl26hgqac5q66k13gfmnxhn3wf0j8nx5xvi7yclzc3ay"; depends=[ggplot2 rgl tseries]; }; TSDFGS = derive2 { name="TSDFGS"; version="1.0"; sha256="1wk1j0bzcapp2pknhiichh947xs6dpkrfr2h7s1vqyzb9a0yajif"; depends=[Rcpp RcppEigen]; }; TSDT = derive2 { name="TSDT"; version="1.0.0"; sha256="0cscy8g6qab09lgzdpz9s85l7m7v5gnjf0n3h82730xzd50r4za7"; depends=[hash mlbench modeltools party rpart survival survRM2]; }; @@ -4687,6 +4863,7 @@ in with self; { TScompare = derive2 { name="TScompare"; version="2015.4-1"; sha256="0jmxnrbsdg368f29bp70rc9i88si5zjblbcn8rcjyn2k9vpd3q2f"; depends=[DBI tfplot tframe TSdbi]; }; TSdata = derive2 { name="TSdata"; version="2016.8-1"; sha256="199dy4phc6z0kzbp4kks55519c3xgsx4dkwrypr9sg8xhprrwnib"; depends=[]; }; TSdbi = derive2 { name="TSdbi"; version="2017.4-1"; sha256="0vwx2wyls4byyp67q9bp1psxdq5jnlimwk2162khk6daaxs14aiv"; depends=[DBI tframe]; }; + TSdist = derive2 { name="TSdist"; version="3.7"; sha256="1xw707ry242i8nhldrsqxj391i8dhhmhdbidzdk95d6hma4vq9z3"; depends=[cluster dtw KernSmooth locpol longitudinalData pdc proxy TSclust xts zoo]; }; TSeriesMMA = derive2 { name="TSeriesMMA"; version="0.1.1"; sha256="0dkrz3m5lh872c0q9nw4h0p6g4j1j9fn92hz8xlifpsbsyzpz63b"; depends=[]; }; TSfame = derive2 { name="TSfame"; version="2015.4-1"; sha256="197v123mkxr7qlksnb5iadms5zbc8xqbpgr2cspb8x1krz6phssz"; depends=[DBI fame tframe tframePlus tis TSdbi]; }; TSmisc = derive2 { name="TSmisc"; version="2016.8-1"; sha256="0xvn6qlvvdc65l356r8b5ppddjd35k9fc4b5w5wn3j5wzxfllbk1"; depends=[DBI gdata quantmod tframe tframePlus TSdbi tseries zoo]; }; @@ -4698,12 +4875,12 @@ in with self; { TSstudio = derive2 { name="TSstudio"; version="0.1.6"; sha256="1r45s4xgc9a2rdh225xzmwr7g6qahmjj7v1a6g7haghnhaq6hv4s"; depends=[data_table dplyr forecast forecastHybrid future future_apply lubridate magrittr plotly purrr RColorBrewer reshape2 scales tidyr tsibble viridis xts zoo]; }; TTAinterfaceTrendAnalysis = derive2 { name="TTAinterfaceTrendAnalysis"; version="1.5.6"; sha256="1jkjivfg0k6rd6dn1apxyqdwzkxwvkg8zsm4hd6vlrk98ph9d1h3"; depends=[e1071 lubridate multcomp mvtnorm nlme pastecs relimp reshape rkt stlplus tcltk2 zoo]; }; TTCA = derive2 { name="TTCA"; version="0.1.1"; sha256="16slr4c2nwbchsg6fk5prq22p2v4cjxzk93wd3xggav2lzrf8a5h"; depends=[MASS Matrix quantreg RISmed tcltk2 VennDiagram]; }; - TTR = derive2 { name="TTR"; version="0.24.0"; sha256="0dcmfr98bxhdhszsdr1yjhvy4kplnfm88fh8sdzrkjank1qsxia2"; depends=[curl xts zoo]; }; + TTR = derive2 { name="TTR"; version="0.24.2"; sha256="06vicgbhwpsww09hhha5mbcd0cwip6cvkfbhjjhp950rv64bk1r5"; depends=[curl xts zoo]; }; TTS = derive2 { name="TTS"; version="1.0"; sha256="0dhxj474dqjxqg0fc2dcx8p5hrjn9xfkn0rjn2vz3js92fa9ik9h"; depends=[mgcv sfsmisc]; }; TTmoment = derive2 { name="TTmoment"; version="1.0"; sha256="0a4rdb4fk1mqnvvz0r15kni0g5vcj4xkkcwwv7c2gxc94xh5i5ih"; depends=[mvtnorm]; }; TULIP = derive2 { name="TULIP"; version="1.0.1"; sha256="0kwkyv266pslsb2rpcri8k3jmhb3p4i7z0axdbx51l2cxglw9pzn"; depends=[glmnet MASS Matrix tensr]; }; TUWmodel = derive2 { name="TUWmodel"; version="1.1-1"; sha256="1am3ywcj1rqgz5i2g9c6d6fgiv8b2nabllfy84xx1n18pin7mfbk"; depends=[]; }; - TVMM = derive2 { name="TVMM"; version="3.1"; sha256="014afshwmj4xjqxb7j1fxanag54g7cx2h9wm75i6paq48bpz7150"; depends=[DescToolsAddIns ggplot2 gridExtra MASS robustbase tcltk2 tkrplot]; }; + TVMM = derive2 { name="TVMM"; version="3.2.1"; sha256="0z2gdcci9pbpgnmr6dch5v0rsn34q18rwb14x9gyxdcvh3bch8z0"; depends=[DescToolsAddIns ggplot2 gridExtra MASS robustbase tcltk2]; }; Taba = derive2 { name="Taba"; version="0.2.0"; sha256="0ciczkjm33pr52s9awqmk9dh0qd20jh43g04xk0zphgq8fmhkl20"; depends=[robustbase]; }; Table1Heatmap = derive2 { name="Table1Heatmap"; version="1.1"; sha256="1nrabjivfsdhaqmlq365pskkrp99jqsxn8vy03mdnqn5h5zv7wvx"; depends=[colorRamps]; }; TableHC = derive2 { name="TableHC"; version="0.1.2"; sha256="1il86xjc4h1sdq3gpi4s7xbkcgzpgfqy5ivzjdkbq45d06pssk21"; depends=[]; }; @@ -4712,7 +4889,6 @@ in with self; { TailRank = derive2 { name="TailRank"; version="3.2.1"; sha256="142m0cq9j8y5g9wh4plxya1jqi0dv6p6praxx3jb84kwqspi91xr"; depends=[Biobase oompaBase oompaData]; }; TanB = derive2 { name="TanB"; version="0.1"; sha256="05y9j1a5nzqfpsw48gix5c4ds1cm80liad9wnwmddhbx4fda6p32"; depends=[fdrtool pracma]; }; TangPoemR = derive2 { name="TangPoemR"; version="0.1.0"; sha256="06w5gg36mx0vdagkhy7rskgjv2d3irr0d3nkjw26vxp25x1py4sf"; depends=[jiebaR]; }; - TaoTeProgramming = derive2 { name="TaoTeProgramming"; version="1.0"; sha256="1b36s5mpm5vbhzcwmvm8g5pl7vpn6rsl5cnglfy8kgm1q9nnr7ff"; depends=[]; }; TapeR = derive2 { name="TapeR"; version="0.3.3"; sha256="0q5j7pn05z7hinwl5ypnrgh9ibsw6hvdfszjbnvavzab3bx8l6nn"; depends=[nlme pracma]; }; TargomoR = derive2 { name="TargomoR"; version="0.2.0"; sha256="0dzlqv8v36cm5b9hc9am4351nigknq7vr0mki9kzk2979c18if6b"; depends=[geojsonsf httr jsonlite leaflet magrittr sf tibble xml2]; }; Tariff = derive2 { name="Tariff"; version="1.0.5"; sha256="1mdbc6yyaddkyj617kx93d2737gijh063v8w8jqw4lwmbwyc4a4w"; depends=[]; }; @@ -4722,7 +4898,7 @@ in with self; { Taxonstand = derive2 { name="Taxonstand"; version="2.2"; sha256="1cpx5mp17l9gjvb60f0ypm8r8b69ff520p67jac8y6rvw8aqhc6j"; depends=[pbapply]; }; TcGSA = derive2 { name="TcGSA"; version="0.12.7"; sha256="0l28sldpavyvhm9hab9gb7i7rmlxpj7ivffi6xx8lg7qjn6d21v5"; depends=[cluster cowplot ggplot2 GSA gtools lme4 multtest reshape2 stringr]; }; Tcomp = derive2 { name="Tcomp"; version="1.0.1"; sha256="1k0gsf3yr5n9zc2yi6szxm6s7bf61lz4fx8m3v48jlp5w900prwb"; depends=[forecast Mcomp]; }; - TeXCheckR = derive2 { name="TeXCheckR"; version="0.6.0"; sha256="1qrzslcipg3j1317dhizxhcxyx2dpx7jh91vkms10wgc6vpqgrw4"; depends=[clisymbols crayon data_table fastmatch hunspell hutils magrittr rstudioapi zoo]; }; + TeXCheckR = derive2 { name="TeXCheckR"; version="0.7.0"; sha256="0r85yhk3p4ibkzkbjm7j9zpryp1dhajbmaqyfwr4bv1zh29smrxa"; depends=[clisymbols crayon data_table fastmatch hunspell hutils magrittr rstudioapi zoo]; }; TeachNet = derive2 { name="TeachNet"; version="0.7.1"; sha256="12kkpr96mq0jr07k7ivcmwhrfgas1qrfqfhxa4gm7vv3vkjn0gs9"; depends=[]; }; TeachingDemos = derive2 { name="TeachingDemos"; version="2.12"; sha256="0i46d7269zhvr3c2a2w1lb3jnhc1cgwhcppqdmnl1ymgw5f40x9y"; depends=[]; }; TeachingSampling = derive2 { name="TeachingSampling"; version="4.1.1"; sha256="02nywwmv0r8md00kra7wxwzvm6p51l4p8la51bxh8sqq8ajsdswh"; depends=[dplyr magrittr]; }; @@ -4730,17 +4906,19 @@ in with self; { TempCont = derive2 { name="TempCont"; version="0.1.0"; sha256="1pl0czrpw74zfm5vycyl0h8hc3n5whf4g6a2759a22384gk5fq7k"; depends=[nlme]; }; Temporal = derive2 { name="Temporal"; version="0.2.0"; sha256="114ld41l2dipw7cpyh7fy3n332v1dkiqvdng6vkk9wm6jmda7wya"; depends=[expint numDeriv plyr Rcpp RcppArmadillo]; }; Tendril = derive2 { name="Tendril"; version="2.0.4"; sha256="1wvczfklsccs8jd081vb6d6h7i35lhf6na925fm7wq8ars0b23wd"; depends=[dplyr ggplot2 magrittr plotly plyr reshape2 scales]; }; - Ternary = derive2 { name="Ternary"; version="1.1.4"; sha256="0js2ylif6171f1548d05lfw4kdlqkmqa6a510x6i9px93bvvkhsq"; depends=[viridisLite]; }; - TestDataImputation = derive2 { name="TestDataImputation"; version="1.1"; sha256="10b1g9m2s6nbs8lrpcx3s1jf0fmqyd07mg3vx1pnma8r3vwy1yh7"; depends=[Amelia mice]; }; - TestDesign = derive2 { name="TestDesign"; version="1.0.2"; sha256="1vz0bbbk74g3i4dlsd972n41mf0dhd74f9p2n47mgs3fh1r598zd"; depends=[crayon foreach logitnorm lpSolve Matrix Rcpp Rdpack]; }; - TestDimorph = derive2 { name="TestDimorph"; version="0.3.1"; sha256="163swi09d3nhgp4zkic7gmh302955jm1qr0dv9l3ciyayrc8z842"; depends=[caret corrplot DescTools dplyr ggplot2 klaR MASS multcompView plotROC plyr purrr randomForest reshape2 Rfast rlang stringr tibble tidyr tmvtnorm truncnorm]; }; + TensorTest2D = derive2 { name="TensorTest2D"; version="1.0.0"; sha256="1i031wd2ym2yb38ydgy47hmlsk7nnn0vg4p9l2a7z6x4x7sd3jdv"; depends=[]; }; + Ternary = derive2 { name="Ternary"; version="1.2.1"; sha256="0jbzvxl9pqqw84a3vbgq4sq7m0izxh6zmc3x2d1qxyk11fvbvwxn"; depends=[shiny viridisLite]; }; + TestCor = derive2 { name="TestCor"; version="0.0.2.2"; sha256="01ndiqi0z672ymm2bid0r0cqz8fqd9268xgmmq74z3agj81l5c5j"; depends=[MASS Rcpp RcppArmadillo]; }; + TestDataImputation = derive2 { name="TestDataImputation"; version="1.2"; sha256="1nba79i8wr6g1m8hrfa0msz28j9rly51bm8b1qkigfxnzpdhyjmq"; depends=[Amelia mice]; }; + TestDesign = derive2 { name="TestDesign"; version="1.1.3"; sha256="1bqgyz3d5i0yz839vhs9ag1m5q9ydx6bnw9mbdnyjmhdpmjkb9wm"; depends=[crayon foreach logitnorm lpSolve Rcpp RcppArmadillo]; }; + TestDimorph = derive2 { name="TestDimorph"; version="0.3.5"; sha256="0fqxc5smf27b1njlc40x71kcr3bbby1i40pw4r1hhsam0hyvrp2q"; depends=[caret corrplot cutpointr dplyr ggplot2 multcompView Rfast tibble tidyr tmvtnorm truncnorm]; }; TestFunctions = derive2 { name="TestFunctions"; version="0.2.0"; sha256="018nkz8r6vqahrzq3d588i3ffb1bmd1pdk87j4ivcdsx99mq15sn"; depends=[]; }; TestScorer = derive2 { name="TestScorer"; version="1.7.2"; sha256="006c3g3gx55mfr93srldwvgz5vm6nkr3f57yi4qg6krn0d32865f"; depends=[]; }; TestingSimilarity = derive2 { name="TestingSimilarity"; version="1.1"; sha256="1iq0wh13rl6rby44ql4d286r1akzwmbpsvnq9p8lkl8709z0d34w"; depends=[alabama DoseFinding lattice]; }; TexExamRandomizer = derive2 { name="TexExamRandomizer"; version="1.2.3"; sha256="0l0vpx4rkib2m8hwhwy9j8pqyf7gpb9qg8wpnh3238snwpadgy3a"; depends=[assertthat jsonlite Rcpp stringr]; }; TexMix = derive2 { name="TexMix"; version="0.5.3"; sha256="0qp7rlw4y2kw6bvh3rwy33p1g404q4ar1gg8ycdapwsyckq76nhn"; depends=[classInt Formula maptools RColorBrewer sp]; }; TextForecast = derive2 { name="TextForecast"; version="0.1.2"; sha256="0yj2m22imzllz07wx04nar2mfpyl06jiq0ya1nwgaq74kaiym42p"; depends=[doParallel dplyr forcats ggplot2 glmnet Matrix pdftools plyr pracma RColorBrewer tidyr tidytext tm udpipe wordcloud]; }; - TextMiningGUI = derive2 { name="TextMiningGUI"; version="0.1"; sha256="0s6zng4zl5iqyrqs824103hc2rgbnd301bz8npbfassk91wrib3n"; depends=[dplyr ggplot2 ggwordcloud RColorBrewer slam syuzhet tibble tidyr tidytext tkrplot tm]; }; + TextMiningGUI = derive2 { name="TextMiningGUI"; version="0.2"; sha256="0m4iihwsj8qlnp70nzz10yjql9ynd92iiy2wmdj40pqdrwsx1x13"; depends=[dplyr ggplot2 ggwordcloud RColorBrewer slam syuzhet tibble tidyr tidytext tm]; }; ThankYouStars = derive2 { name="ThankYouStars"; version="0.2.0"; sha256="0r77ns3102wj1wvrfsa06l427imxyfhigpbs36cdxl2j87qrjzl6"; depends=[httr jsonlite]; }; ThermIndex = derive2 { name="ThermIndex"; version="0.2.0"; sha256="0s9d55577dq61qixwwfwmqc2k2c8my00j2ng97ng42cw0jc7aylm"; depends=[]; }; Thermimage = derive2 { name="Thermimage"; version="4.0.1"; sha256="021kjmy0ilg033gf9l46dqfsyd0625v21mcc3sj2smv2dipr8hwd"; depends=[png tiff]; }; @@ -4750,12 +4928,12 @@ in with self; { ThreeWay = derive2 { name="ThreeWay"; version="1.1.3"; sha256="17yl8zq029wiy3c0f4ssljx85dnm9n862wj2d24w7p0lxlvarmz6"; depends=[]; }; ThreeWiseMonkeys = derive2 { name="ThreeWiseMonkeys"; version="0.1.0"; sha256="1qdb3m15q0gg8dk2znc2syy2jdqsp2893a7ilfa8rg3r2vps86yg"; depends=[stringr tuneR]; }; Thresher = derive2 { name="Thresher"; version="1.1.3"; sha256="16zf5cwc2c5j61xcrqsycwrsc162spyqgk9mac7n37mymn5agbwp"; depends=[ade4 ClassDiscovery colorspace MASS movMF oompaBase PCDimension]; }; - ThresholdROC = derive2 { name="ThresholdROC"; version="2.8.2"; sha256="1fsxf43syp371149wmbxjc13rrai69gc61xdlgrqplv4v0nqqk73"; depends=[MASS numDeriv pROC]; }; + ThresholdROC = derive2 { name="ThresholdROC"; version="2.8.3"; sha256="0p999hi30sk0spmy1g0qnsdf6zpyyvxrgsijv3d00vinylba8is8"; depends=[MASS numDeriv pROC]; }; TickExec = derive2 { name="TickExec"; version="1.1"; sha256="0v0m0wi49yw0ply19vnirl2zwnk61sxalx24l8cadvkssgs13509"; depends=[]; }; TiddlyWikiR = derive2 { name="TiddlyWikiR"; version="1.0.1"; sha256="0vwwjdmfc8c0y2gfa8gls1mzvp29y39c9sxryrgpk253jj9px1kr"; depends=[]; }; TideCurves = derive2 { name="TideCurves"; version="0.0.4"; sha256="1i5qm6wwm6m0xrmr6dvk3pn6apxxqw9hznv8vypzwnky7bizkl90"; depends=[chron data_table fields]; }; TideHarmonics = derive2 { name="TideHarmonics"; version="0.1-1"; sha256="1g1v99gh6mns4l8ipmw7kpalbk07m92ybcqjq7b0wsjmdvs1y67s"; depends=[]; }; - TideTables = derive2 { name="TideTables"; version="0.0.2"; sha256="1grm9s9np7xs2d8gql4sgg72rxpxiidw6g1ni8q97qgqr7r3105l"; depends=[chron data_table]; }; + TideTables = derive2 { name="TideTables"; version="0.0.3"; sha256="0xfwikz9f58pw1j5vp45wp44lbr8b8ijlac474nzahq46d411afp"; depends=[chron data_table]; }; Tides = derive2 { name="Tides"; version="2.1"; sha256="0da3z010ali83qf8mf1znicqv8vvsa5r93mc40ax60ln2w33nlrm"; depends=[]; }; TileManager = derive2 { name="TileManager"; version="0.4.0"; sha256="0kc3wgk5n8cxg901c19fjfzq7na46jq0x3gy22fi4jccjb0vgv0v"; depends=[APfun raster rgeos sp XML]; }; TimeProjection = derive2 { name="TimeProjection"; version="0.2.0"; sha256="04yr4cg2khkw9n3y3qk0ni1327k4pxm09zz2xg8mpjdvgi4p9yi3"; depends=[lubridate Matrix timeDate]; }; @@ -4766,19 +4944,20 @@ in with self; { TipDatingBeast = derive2 { name="TipDatingBeast"; version="1.1-0"; sha256="07lw6jnr76qrxwrwv90hi5ih2xf6g4sz4hfapk5vf1y3ayfskkl0"; depends=[DescTools mclust TeachingDemos]; }; Tlasso = derive2 { name="Tlasso"; version="1.0.1"; sha256="0flx4l7q3qndp77349ayfrszyim7mvs7yfvv3j9a1mhf3gdn9j14"; depends=[expm huge igraph rTensor]; }; TmCalculator = derive2 { name="TmCalculator"; version="1.0.1"; sha256="1h1dk4kq6zi3a9wi6bxsqz3b9jk740811dp65sb6lqc668xy5mps"; depends=[]; }; - Tmisc = derive2 { name="Tmisc"; version="0.1.22"; sha256="0h25k5xs8wnyzhl8alzlwircdl1hmclljjpcapnfg7na4yskzsaq"; depends=[dplyr rstudioapi tibble]; }; - Tnseq = derive2 { name="Tnseq"; version="0.1.2"; sha256="1n76yzk15p8i5bp3k6fszmdqk2d791r4sb8hg5hb61zb92r7wqlj"; depends=[Biobase Ckmeans_1d_dp DESeq edgeR limma]; }; + Tmisc = derive2 { name="Tmisc"; version="1.0.0"; sha256="1zs7zxawl13pils9hff0i5aplxy32ccp27jcmjdh39lgf083s3v3"; depends=[dplyr magrittr rstudioapi tibble]; }; TooManyCellsR = derive2 { name="TooManyCellsR"; version="0.1.1.0"; sha256="0cypjf4a9q2kw4gwxlr59nbwn25wrrhrcmpksxi2yhd3qhk71q8n"; depends=[cowplot ggplot2 imager jsonlite Matrix]; }; ToolsForCoDa = derive2 { name="ToolsForCoDa"; version="1.0.5"; sha256="0pg8ymim9pbbmnqnvws1v7g874mv65s1idb4m7dcy800v63pzq7s"; depends=[calibrate MASS robCompositions]; }; TopKLists = derive2 { name="TopKLists"; version="1.0.7"; sha256="0xwp926l8mr0j3lfxy2077d1qs150iid6v7i7015wqzif948jkxz"; depends=[gplots Hmisc]; }; TopicScore = derive2 { name="TopicScore"; version="0.0.1"; sha256="1x6s3yn25rj8mbd25yi7f2rz0nwg8n0l1vs6r250kyjb17d2javm"; depends=[combinat Matrix quadprog RSpectra slam]; }; TotalCopheneticIndex = derive2 { name="TotalCopheneticIndex"; version="1.0.1"; sha256="0yc21vs10rzmwx0z6d0gyyncr25835vb7wpn392csc5big6d73xc"; depends=[memoise]; }; TouRnament = derive2 { name="TouRnament"; version="0.2.5"; sha256="09i0frzzxi5ymjlvh81rmisxh35amrvhxbkjq5351fhlpf1n977z"; depends=[]; }; - TraMineR = derive2 { name="TraMineR"; version="2.2-0.1"; sha256="1mpwns17iqs7wkk6hb9xxphmh0zrbvqxzvhr093b9j1ji4wzhgqj"; depends=[boot cluster colorspace Hmisc RColorBrewer]; }; + Tplyr = derive2 { name="Tplyr"; version="0.2.2"; sha256="0bqwp27qqnjidc816bw96whlrrfmd8iph0mhb3pgd0gxmvxpj4bj"; depends=[assertthat dplyr forcats lifecycle magrittr purrr rlang stringr tibble tidyr tidyselect]; }; + TraMineR = derive2 { name="TraMineR"; version="2.2-1"; sha256="0varwhc2jvmj36x6vslhfmqwms7zzs4p32ciaqh214i9pc93czhl"; depends=[boot cluster colorspace Hmisc RColorBrewer]; }; TraMineRextras = derive2 { name="TraMineRextras"; version="0.6.0"; sha256="00g0as69v92azajbcbkhr6lwihlphzpb41la5wz2lfvshq5ywqz1"; depends=[cluster gtools RColorBrewer survival TraMineR]; }; TrackReconstruction = derive2 { name="TrackReconstruction"; version="1.2"; sha256="1kpdiwwzxsdwv5255xlvcnxvnp39ky0aws41g1l5i7cpbv88kca5"; depends=[fields RColorBrewer]; }; Trading = derive2 { name="Trading"; version="2.1"; sha256="08vhcf3hl3b8pczaawf25vl6j2ap8zbmwdxxdi2g05hq05lywwf9"; depends=[PerformanceAnalytics reticulate]; }; TrafficBDE = derive2 { name="TrafficBDE"; version="0.1.0"; sha256="1lnh9lbjxaradivnd1dkd2szggjh2r4v7klpyxb862dxsmdxxrqw"; depends=[caret data_table dplyr lubridate neuralnet RCurl zoo]; }; + TraitStats = derive2 { name="TraitStats"; version="1.0.0"; sha256="0as86h5zgbd39fdk6ip1b51ln3bpybw3j57kiqr4y6p62cl3sgl9"; depends=[gridExtra lattice qpdf rlist]; }; TrajDataMining = derive2 { name="TrajDataMining"; version="0.1.6"; sha256="1n5qcyc1kb8rdrqaji7pp63l2gyr6jim8spm8ydb4lnqfcnrin9g"; depends=[geosphere rgdal RPostgreSQL sp spacetime trajectories xts]; }; TransModel = derive2 { name="TransModel"; version="2.1"; sha256="0brlr4w5k8xsgbrizm7ha0cmq0kqzd2fcjpszq7gym844jj93csi"; depends=[MASS survival]; }; TransP = derive2 { name="TransP"; version="0.1"; sha256="0p6pfcp8qjdah0lfhx0a396nxjzp3ckpda9hl3snpppx79iyww55"; depends=[]; }; @@ -4786,12 +4965,14 @@ in with self; { TreatmentSelection = derive2 { name="TreatmentSelection"; version="2.1.1"; sha256="1pw64hx697jg2f1r2zd8y98g3ivj2gm8fnixcjfn4drsd0xixb4p"; depends=[binom ggplot2 survival]; }; TreeBUGS = derive2 { name="TreeBUGS"; version="1.4.5"; sha256="1977p6lbb29w0cg5lpa5dyig7k3j6i2rd5jwr5bv6hwaq6yqsyrg"; depends=[coda hypergeo logspline MASS Rcpp RcppArmadillo rjags runjags]; }; TreeDep = derive2 { name="TreeDep"; version="0.1.3"; sha256="0ja2hp9sxzybac6dqdsns5q1rj12swl240znsnsffg9mkvzhq6rl"; depends=[ggplot2 lubridate]; }; - TreeDist = derive2 { name="TreeDist"; version="1.1.1"; sha256="0b2kw32xg7qswbln69vrfkj8967ml8bm6glsl2n3hlv6ybrhhdvl"; depends=[ape colorspace memoise phangorn Rcpp TreeTools]; }; + TreeDiagram = derive2 { name="TreeDiagram"; version="0.1.0"; sha256="0lrdhrvy1nfvsmv7immg1b0pgb81n4ksbq4ybjl5n3dzawfizrnm"; depends=[ape cowplot ggplot2 spatstat stringr tree]; }; + TreeDist = derive2 { name="TreeDist"; version="1.2.1"; sha256="07j44jdf0zni5sb3z5j7d9k2622wirs1inw5gnibr90lh6747kq0"; depends=[ape colorspace memoise phangorn Rcpp Rdpack TreeTools]; }; + TreeLS = derive2 { name="TreeLS"; version="2.0.2"; sha256="1q10i7ym9c3ggslyccfl0q67hwbcag2bhn587j29q80g0sw30klq"; depends=[benchmarkme BH data_table deldir dismo glue lidR magrittr mathjaxr nabor raster Rcpp RcppArmadillo RcppEigen rgl rlas sp]; }; TreePar = derive2 { name="TreePar"; version="3.3"; sha256="1sm518b1b4b1p0n5979qzvi2nacxpp3znbg9n75pf2a8z8wy6p4l"; depends=[ape deSolve Matrix subplex TreeSim]; }; TreeSearch = derive2 { name="TreeSearch"; version="0.4.3"; sha256="0g5fdmadhpqq2cs5ss75008v6qrd77hppsqrbvbk46y2g83kn0bq"; depends=[ape phangorn R_cache Rdpack TreeTools]; }; TreeSim = derive2 { name="TreeSim"; version="2.4"; sha256="0nmzx2723n1f5lr951zz2ih2gnpfim5qzihlayhpf181z1qijv93"; depends=[ape geiger]; }; TreeSimGM = derive2 { name="TreeSimGM"; version="2.5"; sha256="125c9rim272h0dfyygmmijz8dcnch3g9wy1ngki77dyrmdl77yfx"; depends=[ape TreeSim]; }; - TreeTools = derive2 { name="TreeTools"; version="1.2.0"; sha256="148amv8z4ih08w8yw7h2p1xwnmbf6pxapny5i1rd8zgi501x245w"; depends=[ape bit64 colorspace phangorn R_cache Rcpp]; }; + TreeTools = derive2 { name="TreeTools"; version="1.4.1"; sha256="1yx54kd39cj1vl33ydv2ibpkqrgcw4q7nkg1rjz4ksxa9as2n99d"; depends=[ape bit64 colorspace phangorn R_cache Rcpp Rdpack]; }; TrendInTrend = derive2 { name="TrendInTrend"; version="1.1.3"; sha256="0ijkijyhxhjc7202qssa9wnrmwgv4miv5n8jbml4qqj80kcsbdwp"; depends=[nleqslv pracma pROC rms]; }; TrendSLR = derive2 { name="TrendSLR"; version="1.0"; sha256="1x8j2dg3m7b22gva33y4s318a41wl60sz93y868z4j65hp13jb5k"; depends=[changepoint forecast imputeTS plyr Rssa tseries zoo]; }; TriMatch = derive2 { name="TriMatch"; version="0.9.9"; sha256="17v8hdm594i9qs5hvrzb1k94wrzvx07479rmvbk4314fim27mabg"; depends=[ez ggplot2 gridExtra PSAgraphics psych randomForest reshape2 scales]; }; @@ -4807,6 +4988,7 @@ in with self; { TurtleGraphics = derive2 { name="TurtleGraphics"; version="1.0-8"; sha256="0h77pj7rs3lrqi1y2dm1cbrmj13mjpq6y5nw8bcq0s2kbnkfw67l"; depends=[]; }; Tushare = derive2 { name="Tushare"; version="0.1.3"; sha256="12aabkwlifc82yiym3yijpfpjhmhfwpw8mz4fb11qm6n4igr1yhg"; depends=[data_table forecast httr tidyverse]; }; TwitterAutomatedTrading = derive2 { name="TwitterAutomatedTrading"; version="0.1.0"; sha256="1aa6fxxvy0s8al30w19wa2pwzp60zbbdvp5myigv8x26k6w2jwgv"; depends=[curl dplyr jsonlite lubridate magrittr naptime plyr purrr tibble tidytext twitteR]; }; + TwoArmSurvSim = derive2 { name="TwoArmSurvSim"; version="0.1"; sha256="0hxasvahllq88zl2k0p41ra5d2wzsxpn95sqf9cmc1rgbvm1q57z"; depends=[blockrand dplyr survival]; }; TwoCop = derive2 { name="TwoCop"; version="1.0"; sha256="1ycxq8vbp68z82r2dfg2wkc9zk3bn33d94xay20g2p55lnzl2ifd"; depends=[]; }; TwoPhaseInd = derive2 { name="TwoPhaseInd"; version="1.1.1"; sha256="0xsqiq4x7vmhif9j8zi1smbchwm4fsbgb10i4vxi0biijybizk9z"; depends=[survival]; }; TwoRegression = derive2 { name="TwoRegression"; version="0.1.2"; sha256="0qr9zrfmbh4c4207gvwa384q5njjx6nsl6lc58d25m8bkfalifpi"; depends=[data_table dplyr magrittr seewave]; }; @@ -4816,57 +4998,61 @@ in with self; { UBL = derive2 { name="UBL"; version="0.0.6"; sha256="0238irg7r3g248h4x4bdb308wvfqq99hwykywf4k2bssdd25kwjk"; depends=[automap gstat MBA randomForest sp]; }; UCR_ColumnNames = derive2 { name="UCR.ColumnNames"; version="0.1.0"; sha256="1nwwq93f60r9aik51l7mzckg81f81nz5kgzynyzp5sm4y2wmpzwn"; depends=[]; }; UCSCXenaShiny = derive2 { name="UCSCXenaShiny"; version="0.5.0"; sha256="0rilgngbfh4ignlzm5l6z9mwjngwmhlj9dvaknf8rg9a4g67vgqz"; depends=[dplyr DT ggplot2 ggpubr magrittr plotly RColorBrewer shiny shinyBS shinyjs shinythemes shinyWidgets tibble UCSCXenaTools zip]; }; - UCSCXenaTools = derive2 { name="UCSCXenaTools"; version="1.3.3"; sha256="1jgs2rlgsd2mq69jkpkwszzwp0clvdh3zl90c7z4v04nz4b366cx"; depends=[dplyr httr jsonlite magrittr readr rlang]; }; - UComp = derive2 { name="UComp"; version="1.1"; sha256="19465rwpdy60f4ah9i77kax36sd2ff0xmjfd78qi6ziippzgxk88"; depends=[Rcpp RcppArmadillo]; }; + UCSCXenaTools = derive2 { name="UCSCXenaTools"; version="1.3.6"; sha256="031r2p22hj2ivq4z9c43b2aa6cwmby54lrnnjy7fr98h4ykb2658"; depends=[dplyr httr jsonlite magrittr readr rlang]; }; + UComp = derive2 { name="UComp"; version="2.1"; sha256="0l6gn1i6b2ap9ngm6dyrsxs2h59p4yvxqgmqns68wp1iy5zkfdjk"; depends=[Rcpp RcppArmadillo]; }; + UKFE = derive2 { name="UKFE"; version="0.1.2"; sha256="1v4sjdrzrmi1azn89pwpshfvwxyhkixf3vvmz7xcybzhlrlw13lf"; depends=[]; }; UKgrid = derive2 { name="UKgrid"; version="0.1.3"; sha256="1x44iry2j5qbvd8ac9rv9dmg60hbhry2v4jj9hmm49bx10iwl9h2"; depends=[data_table dplyr lubridate magrittr tsibble xts zoo]; }; + UMR = derive2 { name="UMR"; version="1.0.0"; sha256="12xwv39p3ry8ijf9z8px9vvwd48pnda24cnp0y9qfhqp9iy3r083"; depends=[decon]; }; UNCLES = derive2 { name="UNCLES"; version="2.0"; sha256="0c61sm09dh0yfrjrjjnizg7qrf8xgc1zdldwhjh64kq8k8g5wa69"; depends=[class kohonen pdist]; }; UNF = derive2 { name="UNF"; version="2.0.6"; sha256="0sr740dhfp7z9wvhajww43g5gz79x5y5dbflw5a813jgmiqm1jyq"; depends=[base64enc digest]; }; UNPaC = derive2 { name="UNPaC"; version="1.1.0"; sha256="12w6vjvkzivnqa6jd75dwr8h8d8xbc2519pqnqw9fk3yanqzx9rk"; depends=[huge PDSCE]; }; UPMASK = derive2 { name="UPMASK"; version="1.2"; sha256="160rsb0nbndf61khcs3s8xv9nj7ln8zl6l11157ywdcjqd2q5qnq"; depends=[DBI dimRed loe MASS RSQLite]; }; - UPSvarApprox = derive2 { name="UPSvarApprox"; version="0.1.1"; sha256="1lm3xzj70s070ag2sk24nq5ayckk3mnqfmwppbhq5i4y13fw6vip"; depends=[]; }; + UPSvarApprox = derive2 { name="UPSvarApprox"; version="0.1.2"; sha256="0kgbpk2wc7zsiln7301z8fa1fp4911kpg1zfpjyfw3cv7dqaznv2"; depends=[]; }; USAboundaries = derive2 { name="USAboundaries"; version="0.3.1"; sha256="1mqbxkv347307mbvn70929bi3l8wmiwrp86rxdgy45g2ddjdcb6s"; depends=[]; }; - USGSstates2k = derive2 { name="USGSstates2k"; version="1.0.1"; sha256="11yk0pkss23j6fmmxnjkjm9p24ln343y4hijigbrbvcnb21wj2py"; depends=[sp]; }; + USP = derive2 { name="USP"; version="0.1.1"; sha256="1y3argx05bw99lwk94h7h62c5k7xnysdmj1qil38b71psl0ndh88"; depends=[Rdpack]; }; UScancer = derive2 { name="UScancer"; version="0.1-2"; sha256="0p1kxw1phqq598ljk3njznc9kmgscc8gmwdrvx1scba9rr6n61kl"; depends=[rgdal]; }; UScensus2000cdp = derive2 { name="UScensus2000cdp"; version="0.03"; sha256="143hqnzdla3p31n422ddzaaa34wc6xnnhil4y53m4qydyg407700"; depends=[foreign maptools sp]; }; UScensus2000tract = derive2 { name="UScensus2000tract"; version="0.03"; sha256="11ppw75k8zghj7xphx5xyl3azsdsyd142avp0la2g941w6f8l2n1"; depends=[foreign maptools sp]; }; UScensus2010 = derive2 { name="UScensus2010"; version="0.11"; sha256="1q06spkh8f4ijvfg557rl3176ki4i8a1y39cyqm3v7mnzwckyj3l"; depends=[foreign maptools sp]; }; - USgrid = derive2 { name="USgrid"; version="0.1.0"; sha256="0kdbq1vbqcm0avzy2y8g8xk56bp8qnqpc1zfqspkwl6a0gzzfjxz"; depends=[tsibble]; }; + USgas = derive2 { name="USgas"; version="0.1.0"; sha256="0ym75xzbiw0pmnpzkw107rjwa0fjia1fa3ldq6yhsqkr275qmx2r"; depends=[]; }; + USgrid = derive2 { name="USgrid"; version="0.1.1"; sha256="09msy7bsy4jsba94x7vqzlid9bvn1s7871500ri2aw496mjw1q8w"; depends=[tsibble]; }; UStatBookABSC = derive2 { name="UStatBookABSC"; version="1.0.0"; sha256="16r6clhfaalfsg5hmvzm8a128zygxax5hyc0vr1q9bsw9hj7cs0c"; depends=[]; }; UWHAM = derive2 { name="UWHAM"; version="1.0"; sha256="1qaj8anaxqnx4nc6vvzda9hhhzqk9qp8q7bxm26qgia4hgascnrv"; depends=[trust]; }; UdderQuarterInfectionData = derive2 { name="UdderQuarterInfectionData"; version="1.0.0"; sha256="084bq5ai1ccp4www64z0ipic74zkd8j1ygv0py900164a25wdr9b"; depends=[]; }; Ultimixt = derive2 { name="Ultimixt"; version="2.1"; sha256="0fh2qpm7qpv1170jzbmzqhvwsn69lblizzisgasswy2nix2jjz4y"; depends=[coda gtools]; }; Umatrix = derive2 { name="Umatrix"; version="3.3"; sha256="188h959s5pawnny0fxlqmma03iww6af4x0y8p514bwh5xh9rj3kg"; depends=[abind AdaptGauss deldir fields geometry ggplot2 pdist plyr png pracma Rcpp reshape2 shiny shinyjs]; }; Umoments = derive2 { name="Umoments"; version="0.1.1"; sha256="089d0xmsp0419mxjp6fs0s1palvdkr0i5dzqckcn6r2kjqj7izjg"; depends=[]; }; - Umpire = derive2 { name="Umpire"; version="2.0.9"; sha256="1bqq8zrlfgcr741ydzmyy8rmkv05ijlfr0j2x0kgyxkg2j5r9kj4"; depends=[BimodalIndex mc2d]; }; + Umpire = derive2 { name="Umpire"; version="2.0.10"; sha256="1bhz1yfvpszqz4nal2wwjgllbq0hj6y0jf2bja3nfb7amj2m10gg"; depends=[BimodalIndex mc2d]; }; UncDecomp = derive2 { name="UncDecomp"; version="1.0.1"; sha256="1m44pgk7nffay09m4gkwb0khq0qjd7bq1p72blsmib46wmnwqfsa"; depends=[dplyr ggplot2]; }; UncertainInterval = derive2 { name="UncertainInterval"; version="0.6.0"; sha256="0gyw1lgq1mni8m44lfi2vnd2wxq6i6ml6c6hy9amdbwmb7aymhhd"; depends=[car MASS nloptr psych reshape2 rootSolve zoo]; }; UniDOE = derive2 { name="UniDOE"; version="1.0.2"; sha256="14jz4acrvbv59sbr7gya8g0z749vv0i04gl5wl0y4218byjvw6bs"; depends=[Rcpp]; }; UniIsoRegression = derive2 { name="UniIsoRegression"; version="0.0-0"; sha256="0lmrmb9sbk41ak7sbcrzhfnijb1skgb4lqg9m9imc98lcp69h7z0"; depends=[Rcpp]; }; - Unicode = derive2 { name="Unicode"; version="13.0.0-1"; sha256="12q98hdh46bbx17z6869bmn1j9bbhf524flvn76sqf20phk81xjy"; depends=[]; }; + Unicode = derive2 { name="Unicode"; version="13.0.0-2"; sha256="08af3j06npj37z0bcgpqdcya07d1ribll9izkir2fcyw61zs65qy"; depends=[]; }; UnifiedDoseFinding = derive2 { name="UnifiedDoseFinding"; version="0.1.7"; sha256="1kapm7vwsn1a0prjplbd1im480dy6l02vsil82qxbhamvnc8his2"; depends=[]; }; - UniprotR = derive2 { name="UniprotR"; version="1.4.0"; sha256="0f2v347if81rnp1dvmfqz25qxsjmnmgvs27w3dg4bljydvl9s9n0"; depends=[alakazam curl data_tree dplyr ggplot2 ggpubr gridExtra httr magick magrittr plyr scales tidyverse]; }; + UniprotR = derive2 { name="UniprotR"; version="2.0.1"; sha256="1l42nf0jk6gk723zrkhmjh7w9zzlalvxhdhd778iwsrgjcnd8642"; depends=[alakazam curl data_tree dplyr ggplot2 ggpubr gprofiler2 gridExtra htmlwidgets httr magick magrittr networkD3 plyr qdapRegex ReactomePA scales stringr tidyverse]; }; UnitCircle = derive2 { name="UnitCircle"; version="0.1.3"; sha256="0z5ssps8l5ka4aw4984qml15scw4pfssara5dls82afhfhpkszsr"; depends=[]; }; UnivRNG = derive2 { name="UnivRNG"; version="1.2.2"; sha256="1hv0gg371ndljvn3x7s5vbkh51h1l1pjk57livw630mvb67cffqw"; depends=[]; }; UpSetR = derive2 { name="UpSetR"; version="1.4.0"; sha256="007i0njnjjy7vbrxabwav7a1kk2n0hn2mkvqsdzzfk10ckp5y7im"; depends=[ggplot2 gridExtra plyr scales]; }; UsingR = derive2 { name="UsingR"; version="2.0-6"; sha256="1lr8z45r5s7fxrd42rswm6w7s3k5nds244b9d525jb5v4n8w9kpw"; depends=[HistData Hmisc MASS]; }; UtilityFrailtyPH12 = derive2 { name="UtilityFrailtyPH12"; version="1.0"; sha256="06f5gmwwk1r14ab6v5jcxz0pmdph7ffi4y57mjg9byn7pjnibflk"; depends=[bindata mvtnorm Phase123 Rcpp RcppArmadillo]; }; - V8 = derive2 { name="V8"; version="3.2.0"; sha256="0z0dwa538lkggawiwrlplz698xznzlgv9fwhdslm7g7gdxyf0xgm"; depends=[curl jsonlite Rcpp]; }; + V8 = derive2 { name="V8"; version="3.4.0"; sha256="1g9z22pc8ydx1yhv57ww2d2jg5hvrl7ilwa79x89zgn17jha5j7m"; depends=[curl jsonlite Rcpp]; }; VALERIE = derive2 { name="VALERIE"; version="1.1.0"; sha256="15z8234jhh7hv3gijrvy8hap6gdgvm6qll9b00qbji7vyc3dg4pg"; depends=[GenomicAlignments GenomicRanges ggplot2 ggplotify ggpubr IRanges pheatmap plyr Rsamtools scales]; }; VAR_etp = derive2 { name="VAR.etp"; version="0.7"; sha256="0py5my3ilhcmz44m15hh0d219l9cz7rda4a9gbmf8wh9cgvvj1s3"; depends=[]; }; VARSEDIG = derive2 { name="VARSEDIG"; version="1.9"; sha256="18j73wm22bjvf2y0c09bfmdyx4x2gd0jhfcqhbk1sgsk24zjr63z"; depends=[]; }; VARshrink = derive2 { name="VARshrink"; version="0.3.1"; sha256="09hysmxxawcbyfx6bia546aqydryl2r5p3ai7bvl6ghdckw5mnpl"; depends=[ars corpcor MASS mvtnorm strucchange vars]; }; VARsignR = derive2 { name="VARsignR"; version="0.1.3"; sha256="09mnf9hvsi4wx1c81yq97mzggwk6s7nka7awrws63icjybqjmra9"; depends=[HI minqa mvnfast]; }; VARtests = derive2 { name="VARtests"; version="2.0.5"; sha256="0gmm2qrrl4v5vx0nhiwq5brvanhybpb2q0zlf4dihramhjjbwyar"; depends=[Rcpp RcppArmadillo sn]; }; + VBLPCM = derive2 { name="VBLPCM"; version="2.4.7"; sha256="1z2liriwnpz0n81wfwrm12bac0xdby3bi67j6akq4sqn79y0fnkm"; depends=[ergm mclust network sna]; }; VBTree = derive2 { name="VBTree"; version="0.1.0"; sha256="0g0lyvclnfmd3zc8yhcibhli0hyxrba6wb3hx039fsg80q7y02h4"; depends=[tensorA]; }; - VC2copula = derive2 { name="VC2copula"; version="0.1.0"; sha256="1nm42zwb5a5nx2gpm48ihxkiw10vlcvx7jp8x5kmf233bhqiaszf"; depends=[copula VineCopula]; }; + VC2copula = derive2 { name="VC2copula"; version="0.1.1"; sha256="1ylfsszf98b3sp0zr8z67ag8gsa5614ikbv4p1gnhssxrc8s6rwx"; depends=[copula VineCopula]; }; VCA = derive2 { name="VCA"; version="1.4.3"; sha256="0hqvqq8kvqgrli9426x9npy86nzgc3mhfgq45d8vm7ns3fc6zsay"; depends=[lme4 Matrix numDeriv]; }; VDAP = derive2 { name="VDAP"; version="2.0.0"; sha256="134x4aisaim72xkyzb1vb8vhl2m4i12yzh6cj858a1ag7b0ing3n"; depends=[drc ggplot2 reshape2 stringr]; }; VDJgermlines = derive2 { name="VDJgermlines"; version="0.1"; sha256="1aqjhkcj3bd5hk7iz0f2cy5nfp23gvhqsmg6nzlxd9klwc6xpq2h"; depends=[ape stringdist]; }; VDSPCalibration = derive2 { name="VDSPCalibration"; version="1.0"; sha256="1hrmmhvk3mhd3bdl0msnm5shcj4cjgd3pn1rkfkv8fh4llqvz7w8"; depends=[]; }; VFP = derive2 { name="VFP"; version="1.3"; sha256="1mkwm1lpxyfarfhsg77ppm55gvsvynqfa8abdsxn5y8w99qb0kmk"; depends=[gnm MASS VCA]; }; VFS = derive2 { name="VFS"; version="1.0.2"; sha256="1b8sl8id2gj4iqkpjzd3giybbix2jvskwsbw1kqj3zqr77hygxwg"; depends=[e1071 nleqslv]; }; - VGAM = derive2 { name="VGAM"; version="1.1-3"; sha256="1hwlrdx3nhdp83pvy1h23i16vbbhi4kizdhr58c8nvg7kqdzb7qc"; depends=[]; }; - VGAMdata = derive2 { name="VGAMdata"; version="1.0-3"; sha256="1jicadjaqmys1bbgkp64hmm8wwmi6f734il00v8qjz3jl9b02pkn"; depends=[]; }; + VGAM = derive2 { name="VGAM"; version="1.1-4"; sha256="1iwrpyhz3khgw904zxz3pn7d61zvkd5m22gimzk57f8jjplxh1zm"; depends=[]; }; + VGAMdata = derive2 { name="VGAMdata"; version="1.1-4"; sha256="13j32jjrsya69lnfry2gs27fhdkqc8kwclmvmxx266dnbfc6rw4k"; depends=[VGAM]; }; VGAMextra = derive2 { name="VGAMextra"; version="0.0-2"; sha256="18k06k32ajf77z9g53vnbzr8pcb41r89bdv05sbcc9r2833bqa9g"; depends=[VGAM]; }; VHDClassification = derive2 { name="VHDClassification"; version="0.3"; sha256="1ij4h3gzxb9mm9q743kc3sg2q609mnqz6mhlrbim1wcjji2b7bv4"; depends=[e1071 lattice]; }; VIF = derive2 { name="VIF"; version="1.0"; sha256="0yvg6ikrcs7mhg0pavhcywrfysv7ylvnhxpc5sam86dbp69flx9x"; depends=[]; }; @@ -4879,18 +5065,18 @@ in with self; { VLTimeCausality = derive2 { name="VLTimeCausality"; version="0.1.1"; sha256="0l03zxd2s99g8parjka2w5dwmsjp0k6wwag3axhj4qd7x7z0rfyh"; depends=[dtw ggplot2 RTransferEntropy tseries]; }; VNM = derive2 { name="VNM"; version="7.1"; sha256="19qglcibb7r6jjz0n0piklwfv3hi4jphd6vmyfbm0ccjjkmn5nin"; depends=[Rcpp]; }; VOSONDash = derive2 { name="VOSONDash"; version="0.5.7"; sha256="1qivx5ddl9jsn6q6ic2w8jrczxlx23z087k5arfz2rixgj7rndyg"; depends=[data_table httpuv httr igraph lattice magrittr RColorBrewer shiny SnowballC systemfonts syuzhet textutils tm vosonSML wordcloud]; }; - VSE = derive2 { name="VSE"; version="0.99"; sha256="07m5080nw72b77238v2wwdh4dxsvv6y78d4j1329n90wyj2crxl4"; depends=[car GenomicRanges igraph IRanges]; }; VSURF = derive2 { name="VSURF"; version="1.1.0"; sha256="1azfd4sb89mp27l86k293qj81x94gfiy1ihwnb6c558p8h69xsgf"; depends=[doParallel foreach randomForest ranger Rborist rpart]; }; VTShiny = derive2 { name="VTShiny"; version="0.1.0"; sha256="1zq6irla3q7hqs8jpjdya7vy3frqrj72rwmd1sgxwrkgpmpxw6x7"; depends=[EnvStats rmarkdown shiny]; }; VTrack = derive2 { name="VTrack"; version="1.21"; sha256="1acf2b8zy72shc4768rhikfa3590h3l3nwk32jk7pwsms0nb87rf"; depends=[checkmate doParallel foreach gdistance gstat Hmisc intervals lubridate plotKML plyr raster sp spacetime XML]; }; VUROCS = derive2 { name="VUROCS"; version="1.0"; sha256="1r4hq7az50v7lbyx5w6b4zs2kwi5cypqn9k6ac4kr8jr3jlyanr3"; depends=[doParallel foreach Rcpp RcppArmadillo]; }; - VWPre = derive2 { name="VWPre"; version="1.2.3"; sha256="0pvk7qmi6s8yqf6s0vbf1ldwrs2b37kgayrdsvfpvxhljg79zl1i"; depends=[dplyr ggplot2 mgcv rlang shiny tidyr]; }; + VWPre = derive2 { name="VWPre"; version="1.2.4"; sha256="1hhpqxzh9h5dy45r04l1fa1k4a14s0m6z6fhfg22kpwpryszbc44"; depends=[dplyr ggplot2 mgcv rlang shiny tidyr]; }; VaRES = derive2 { name="VaRES"; version="1.0"; sha256="0gw05jiqgirhz3c8skbb07y4h44r6vi68gnd5y7ql455v0c2raza"; depends=[]; }; VancouvR = derive2 { name="VancouvR"; version="0.1.1"; sha256="1nzjdassan5kh7wk3xf6kry4jifgjn0gan61ibwhyzy1awpcfngv"; depends=[digest dplyr httr purrr readr rlang sf tibble urltools]; }; VarBundle = derive2 { name="VarBundle"; version="0.3.0"; sha256="0jfx9gkb3f29lgc0nrz3xc7m2ham0scx9lay7x5a6ira7crga6cr"; depends=[crayon dplyr glue magrittr R6 stringr tibble]; }; VarED = derive2 { name="VarED"; version="1.0.0"; sha256="16j9p2a143y4hqclsv1mig0fccrzjx2r0lll0wz8isjp9x1wzjv8"; depends=[]; }; + VarRedOpt = derive2 { name="VarRedOpt"; version="0.1.0"; sha256="0h44m8850q4aksrqj11yr2a2qj37w8fhv0plpvdzcl087ifyj0g9"; depends=[]; }; VarReg = derive2 { name="VarReg"; version="1.0.2"; sha256="04235hr0r6sp7r3ccvcfb8l6p8yapcdrn6zl7mmvbyc4qb70gawh"; depends=[sn survival]; }; - VarSelLCM = derive2 { name="VarSelLCM"; version="2.1.3"; sha256="07ss4wxw1q1mvf6y860zcl5ja65f5yaqpgqj1k1yi5smqj50y0jk"; depends=[ggplot2 mgcv Rcpp RcppArmadillo shiny]; }; + VarSelLCM = derive2 { name="VarSelLCM"; version="2.1.3.1"; sha256="03rg7zh1cq55vfc0ak6j7crs4n7fnbsxz8nllmplklx8wm47krf5"; depends=[ggplot2 mgcv Rcpp RcppArmadillo shiny]; }; VarSwapPrice = derive2 { name="VarSwapPrice"; version="1.0"; sha256="12q2wp2cqi9q47mzbb7sc250zkjqkhs9z0h93ik0h63dv339abgj"; depends=[]; }; VarfromPDB = derive2 { name="VarfromPDB"; version="2.2.10"; sha256="09j8y6n0bwsj3n620nbni6b7f4pmb91q41770sfpc5v3l5i3jc7c"; depends=[curl RISmed stringi stringr XML XML2R]; }; VariableScreening = derive2 { name="VariableScreening"; version="0.2.0"; sha256="04j75081g88g5hjydcnl3jcf99zzbrhlbjmmzcprvrlm5i5i3k93"; depends=[energy expm gee MASS]; }; @@ -4905,9 +5091,10 @@ in with self; { VeryLargeIntegers = derive2 { name="VeryLargeIntegers"; version="0.1.8"; sha256="0yvm3kkc7ssk85ripdgbxj8gazqb1dfswgjy63c3gb135zi2cbqk"; depends=[Rcpp]; }; VetResearchLMM = derive2 { name="VetResearchLMM"; version="1.0.0"; sha256="1a7wm04bsr5shak7l8ypxlhlnx3qkq1jdpjnji1n05p6b00ih9h1"; depends=[ggplot2 lme4 lmerTest multcomp nlme]; }; ViSiElse = derive2 { name="ViSiElse"; version="1.2.2"; sha256="1ay09dahlqnfrgf4gl4s45a4ahrk2xliagxqz5h826w2vzsawqcc"; depends=[chron colorspace ggplot2 Matrix reshape2 stringr]; }; - VineCopula = derive2 { name="VineCopula"; version="2.3.0"; sha256="0w9lpdb9mjia2vg9h4v418g8zw8xfq83hmih37hf3yp7p88vja1k"; depends=[ADGofTest lattice MASS mvtnorm]; }; + VineCopula = derive2 { name="VineCopula"; version="2.4.1"; sha256="0c6yi6rva1vxc50a9js762cw3ihv1lna7sbgbhshhrhd3bcl15mi"; depends=[ADGofTest lattice MASS mvtnorm]; }; Visualize_CRAN_Downloads = derive2 { name="Visualize.CRAN.Downloads"; version="1.0"; sha256="0hzq00dbddzwvhryl38sffchxqz52xk8fizsfjgk1xxjr3g8icw4"; depends=[cranlogs htmlwidgets plotly]; }; Voss = derive2 { name="Voss"; version="0.1-4"; sha256="056izh1j26vqjhjh01fr7nwiz1l6vwr5z4fll87w99nc5wc4a467"; depends=[fields]; }; + VoxR = derive2 { name="VoxR"; version="1.0.0"; sha256="16r9ggc5x889g8rjqvp1q2kgf5asjzhykd1ldjy3ny9m48p501ad"; depends=[circular data_table dplyr fastcluster FNN geometry raster Rfast rgl]; }; W2CWM2C = derive2 { name="W2CWM2C"; version="2.0"; sha256="139rbbhshiap3iq4s4n84sip3cwwjn2x7lm7kmzwj5glhl5dc6ga"; depends=[colorspace wavemulcor waveslim]; }; W3CMarkupValidator = derive2 { name="W3CMarkupValidator"; version="0.1-6"; sha256="0nfay5nqss3zlw4nikj8h3zzlnjfxjch4pm3qky15qrcigrybrbl"; depends=[curl xml2]; }; WACS = derive2 { name="WACS"; version="1.1.0"; sha256="09fmdlpb99q9dw17lwp0bwpklgvgiqq7bfs9ryx5r54m0niklr9d"; depends=[mclust mnormt mvtnorm tmvtnorm]; }; @@ -4921,16 +5108,18 @@ in with self; { WGCNA = derive2 { name="WGCNA"; version="1.69"; sha256="022hkprnrafvggi8pkjffkvk1qlnibmbbxxrni00wkrdbga5589f"; depends=[AnnotationDbi doParallel dynamicTreeCut fastcluster foreach GO_db Hmisc impute matrixStats preprocessCore Rcpp survival]; }; WGScan = derive2 { name="WGScan"; version="0.1"; sha256="0jma6di9hbdimswdfm58568vahcjy46hbhb78idjsdz4bl9apvq3"; depends=[data_table MASS Matrix seqminer SKAT]; }; WLasso = derive2 { name="WLasso"; version="1.0"; sha256="0q44ljdsqsnnwfnnsmyn3p65inbw0y71v7v5pp7cz2dzbhhpfzpw"; depends=[genlasso ggplot2 MASS Matrix tibble]; }; + WLinfer = derive2 { name="WLinfer"; version="1.1.0"; sha256="0vz5vxn4915z5061iczpl51d7vdz28ss6ghfnllrg4lagn4m1mh6"; depends=[bbmle boot cubature goftest LindleyR nleqslv pracma]; }; WLreg = derive2 { name="WLreg"; version="1.0.0"; sha256="0paghjcshhrr6y1gm98d6gr78zvgzhl678g9f96hppfa4q3lfpr7"; depends=[inline survival]; }; WMDB = derive2 { name="WMDB"; version="1.0"; sha256="10wdjy3g2qg975yf1dhy09w9b8rs3w6iszhbzqx9igfqvi8isrr1"; depends=[]; }; WMWssp = derive2 { name="WMWssp"; version="0.4.0"; sha256="16m4hvjqdcpkvswvqwgm0pq9nm7vjrlqldzi4i69izlwccp37v47"; depends=[]; }; WPC = derive2 { name="WPC"; version="1.0"; sha256="0li502hwa4n945yfnilslyvl12ls66kazbfmxb4kkjbaf500mjp9"; depends=[msm survival]; }; WPKDE = derive2 { name="WPKDE"; version="0.1"; sha256="100vla11fbw16x5n4w4kbslz4n725v4x6j0hrxzrk99ryl0crmf6"; depends=[]; }; WR = derive2 { name="WR"; version="0.1.1"; sha256="153f64b2zsykl5f8iwxlcqby96ag1an4w8lhs7dxx72gy5k4vs6c"; depends=[survival]; }; + WRI = derive2 { name="WRI"; version="0.1.0"; sha256="09klq35q1b9c0v86mhx1klqv41jx0saivhh7a8pq7b3b9f8678zb"; depends=[CVXR expm fdadensity fdapace ggplot2 gridExtra locfit locpol modeest mvtnorm Rcpp RcppArmadillo Rfast rlang]; }; WRS2 = derive2 { name="WRS2"; version="1.1-0"; sha256="1nkqs5nvsk5n7zj3rh19shaf55q9q0kd8v0686vhyv286g71ism7"; depends=[MASS mc2d plyr reshape]; }; WRSS = derive2 { name="WRSS"; version="3.0"; sha256="16a7i6glgl5cshsn3w7gxviybmka06ylw5znz94gigyx0vhgv97p"; depends=[GGally ggplot2 Hmisc network nloptr]; }; WRTDStidal = derive2 { name="WRTDStidal"; version="1.1.2"; sha256="1ssrqqf2hypif4nnfyl4lq03glyyg9ry9s14llf1njxamhjggfgg"; depends=[caret dplyr fields foreach forecast ggplot2 gridExtra lubridate purrr quantreg RColorBrewer survival tidyr]; }; - WVPlots = derive2 { name="WVPlots"; version="1.2.6"; sha256="0d27cbmf31pr2gb84c4hjrw6m19bbj2fbb320nf2v90x5af9rm2z"; depends=[cdata ggplot2 gridExtra mgcv rqdatatable rquery sigr wrapr]; }; + WVPlots = derive2 { name="WVPlots"; version="1.3.1"; sha256="0j93wivnalc558lbz0lnhjsyifw0k2bbqjwqsn34x7j6184y9f49"; depends=[cdata ggplot2 gridExtra mgcv rqdatatable rquery sigr wrapr]; }; WWGbook = derive2 { name="WWGbook"; version="1.0.1"; sha256="0q8lnd1fp4rmz715x0lf61py3xw8wg55yq3gvswaqwy68dlqrzjc"; depends=[]; }; WWR = derive2 { name="WWR"; version="1.2.2"; sha256="0ia1dd12r1l08s9nhgvk55jmqwv58jawm25gd2ni6wpa3mcmq02g"; depends=[inline]; }; WaMaSim = derive2 { name="WaMaSim"; version="1.0.0"; sha256="0sa7qd2bpn3sp06mlpissxxkfhg7j1d07nnwlnz7nyg7pivwnpan"; depends=[magrittr]; }; @@ -4942,18 +5131,19 @@ in with self; { WaveletComp = derive2 { name="WaveletComp"; version="1.1"; sha256="07w2aa0jiflvxyqhgh48705hg8hjspd103jd00i2pcw2v42hwmf8"; depends=[]; }; WaveletGARCH = derive2 { name="WaveletGARCH"; version="0.1.1"; sha256="0dj5bmvzfhj1cpn8qi2ax3iipr7jlq0f9vk4b1idqgh5dmdi8lh6"; depends=[FinTS forecast fracdiff rugarch wavelets]; }; WaverR = derive2 { name="WaverR"; version="1.0"; sha256="084fhzggzm075w6wp2lqd3j0an21idhw8z5l8ynz4y96mpmn204a"; depends=[kimisc MASS]; }; - WeMix = derive2 { name="WeMix"; version="3.1.4"; sha256="0ms4qf6lxf2zn7m3qxlxi0sz1rr9mkx998hxj7si2w0k41rdck8v"; depends=[lme4 Matrix minqa NPflow numDeriv Rmpfr statmod]; }; + WeMix = derive2 { name="WeMix"; version="3.1.6"; sha256="1mk2f7iyd98xf5v3vb71gs0zmx7dqxj6bf2qgkwakipnpnkq1ggw"; depends=[lme4 Matrix minqa NPflow numDeriv Rmpfr statmod]; }; WebGestaltR = derive2 { name="WebGestaltR"; version="0.4.4"; sha256="1rgf9s80hk35baiknrwgnqnhxssrcxdansgpvpyhqv07bqd472nn"; depends=[apcluster doParallel doRNG dplyr foreach httr igraph jsonlite Rcpp readr rlang svglite whisker]; }; WebPower = derive2 { name="WebPower"; version="0.5.2"; sha256="11255q41zai4q6n2mpk3fzhi2lyyr3g8dxqfajkb93f68m1b38jp"; depends=[lavaan lme4 MASS PearsonDS]; }; WeibullFit = derive2 { name="WeibullFit"; version="0.1.0"; sha256="1a80gcqbmvb1rz2dr2syy16wn6ixjn6l40gayys9zy8302hky9ir"; depends=[e1071 FAdist glue kSamples mixdist optimx R_methodsS3 R_oo sqldf xtable]; }; WeibullR = derive2 { name="WeibullR"; version="1.0.12"; sha256="0rj4q9hd49b914lz8q1d8n96xrl0h29avn95aigb3z7f8knf7g9g"; depends=[Rcpp RcppArmadillo]; }; - WeightIt = derive2 { name="WeightIt"; version="0.10.1"; sha256="0fhnnq7r70mrnbr3l1nrvjz8zg4ssrww21gzpzymg313406q46a5"; depends=[backports cobalt crayon ggplot2]; }; + WeightIt = derive2 { name="WeightIt"; version="0.10.2"; sha256="124pxnyhylbz5lyk4prdcqwi018a6x1swjgql2rr4nvq7hs5nz88"; depends=[backports cobalt crayon ggplot2]; }; WeightSVM = derive2 { name="WeightSVM"; version="1.7-5"; sha256="02l2iz4p09dmaybp75a4z2lzq3h4dr03xpnr33m7r280lkimz2fx"; depends=[]; }; Weighted_Desc_Stat = derive2 { name="Weighted.Desc.Stat"; version="1.0"; sha256="030i12mnwlj976avvk3grrccgprsckmc35dm2ajwdfc9dijhypnj"; depends=[]; }; WeightedCluster = derive2 { name="WeightedCluster"; version="1.4-1"; sha256="0d239lfigb51ly79aq48xfihmxf07i6qgc64sq94xc29ffjafpkc"; depends=[cluster RColorBrewer TraMineR]; }; WeightedPortTest = derive2 { name="WeightedPortTest"; version="1.0"; sha256="007v3w9ssiv2sds7sikpal27g6pxwxhs7bvcyw6kr0vg8gvlbi8h"; depends=[]; }; WeightedROC = derive2 { name="WeightedROC"; version="2020.1.31"; sha256="1f43hwsabciraj1qxfh5wcqnnx1vvcf4pwqs376rcfd9161k15xv"; depends=[]; }; WgtEff = derive2 { name="WgtEff"; version="0.1.2"; sha256="1z8pndv43ssgmzldwaq0088lmf1g2mkmrbmzyaismcpngn9fqxsk"; depends=[]; }; + WhatIf = derive2 { name="WhatIf"; version="1.5-10"; sha256="19w5qw123iahrx96379lrx8i7v3x2ck5dhklf58iw0dmj4pfy2kg"; depends=[lpSolve pbmcapply]; }; WhiteStripe = derive2 { name="WhiteStripe"; version="2.3.2"; sha256="0kzwglaazn820fzxd2g1fsiw2rnq0qxagns8b5mm3inflsgs35ng"; depends=[mgcv oro_nifti]; }; WiSEBoot = derive2 { name="WiSEBoot"; version="1.4.0"; sha256="1fch78884ay7m2gy602k8df78gkvjiwzkjk550w0k4xbv430ld0h"; depends=[FAdist wavethresh]; }; WikidataQueryServiceR = derive2 { name="WikidataQueryServiceR"; version="1.0.0"; sha256="1bl1nbhbmss8cj9ni7plsjs996n4rwqv6h8bh1zj4whs8z4fw50f"; depends=[dplyr httr jsonlite purrr ratelimitr readr rex WikipediR]; }; @@ -4961,15 +5151,16 @@ in with self; { WikipediR = derive2 { name="WikipediR"; version="1.5.0"; sha256="1w4ggq42vlq7zbrz3v9ripz9yscbd8m8as60q7cplpxn9zqfdl7q"; depends=[httr jsonlite]; }; WikipediaR = derive2 { name="WikipediaR"; version="1.1"; sha256="0fxk247jb82g0f3nmwraa4kvdpjxy5s4dcyzj9vkjw2lq8by3l0h"; depends=[httr XML]; }; WilcoxCV = derive2 { name="WilcoxCV"; version="1.0-2"; sha256="1kbb7ikgnlxybmvqrbn4cd8xnqrkwipk4xd6yja1xsi39a109xzl"; depends=[]; }; + WinRatio = derive2 { name="WinRatio"; version="1.0"; sha256="0d064qq9zad9bdacldhicj3xhyrvp0fcqrxfj594yzra2qwgkx90"; depends=[dplyr magrittr Rcpp tidyselect tidyverse]; }; WindCurves = derive2 { name="WindCurves"; version="0.1.3"; sha256="0bvbnrkdk0g0radgcw4zbhq6czpvq3f7f34x83qk09i8ngmwd28c"; depends=[drc imputeTestbench readbitmap]; }; + WoodSimulatR = derive2 { name="WoodSimulatR"; version="0.5.0"; sha256="1dd8a0cqa1jdfh0aikm6r2w9iq3s14lwby2awazz9fzcnxs64f6y"; depends=[dplyr purrr rlang scales tibble tidyr]; }; WoodburyMatrix = derive2 { name="WoodburyMatrix"; version="0.0.1"; sha256="1yg61j8dw0yfz6lhz68vr5ndr7z0w3zgdw8hbbnxwfcpw759n8p1"; depends=[Matrix]; }; WordOfMouth = derive2 { name="WordOfMouth"; version="1.0.0"; sha256="1ir928rv0xk27arca8bzsdxjvmrkd0azy4ijwnaziqrrm5dpiasj"; depends=[LambertW]; }; WordPools = derive2 { name="WordPools"; version="1.1-1"; sha256="081qnsq7wn1vczgf6ipz8wjmyg4vwhj1s5nrzh0dw4p9yz28dxv2"; depends=[]; }; WordR = derive2 { name="WordR"; version="0.3.1"; sha256="17g8v3xhdy57y0b95zrakhi0zamqi35v0zcmjpy47xyqyk4b2grs"; depends=[dplyr flextable officer]; }; - WorldFlora = derive2 { name="WorldFlora"; version="1.6"; sha256="1sm4v5kqvvy0rpwcygwgxlppz2pbv9a33kkwqgx3s75lgd3j1808"; depends=[]; }; - Wrapped = derive2 { name="Wrapped"; version="2.0"; sha256="1z5kypsd39z9arsw57axckvl8b4jnr5wv60s9z58f5s89gn5vxxg"; depends=[AdequacyModel ald cubfits evd fBasics gamlss_dist GeneralizedHyperbolic GEVStableGarch glogis irtProb LCA lqmm metRology NormalLaplace normalp ordinal sgt SkewHyperbolic sld sn VarianceGamma VGAM]; }; + WorldFlora = derive2 { name="WorldFlora"; version="1.7"; sha256="0vs0g5dg19kn4r7d6j5hbvqwp8fhyax5wkwqs0wjmcln9xidqnjg"; depends=[]; }; WrightMap = derive2 { name="WrightMap"; version="1.2.3"; sha256="0i84xkd1agyp45r84zsk8vvc02ln8qhxvl4n72xjqib12b38kqzl"; depends=[]; }; - WriteXLS = derive2 { name="WriteXLS"; version="5.0.0"; sha256="1gypq7zh22kpraz0bgj4jyvy2hbj1l8r7m6y34531vjdgwf67sss"; depends=[]; }; + WriteXLS = derive2 { name="WriteXLS"; version="6.1.0"; sha256="05p53xxx4ian0hwq81fcxyb90rfnnl9v9y6j6km8ra4adr7f0ag6"; depends=[]; }; WufooR = derive2 { name="WufooR"; version="1.0.1"; sha256="0iq1lc1b22zdvclkr4yivxxf8z5mdxik7lx9r3b38h2qy2rckqb2"; depends=[dplyr httr jsonlite]; }; XBRL = derive2 { name="XBRL"; version="0.99.18"; sha256="1bwvxqbxdf1ynz2bv27l86h05h8y19q2li2y79xk819p5nkxq341"; depends=[Rcpp]; }; XHWE = derive2 { name="XHWE"; version="1.0"; sha256="1ca8y9q3623d0vn91g62nrqf3pkbcbkpclmddw5byd37sdrgsi5l"; depends=[]; }; @@ -4978,18 +5169,18 @@ in with self; { XLConnect = derive2 { name="XLConnect"; version="1.0.1"; sha256="0fbfkl26v42bvbz27kjw8cqnq67mwalxqpp5avqjphc17i5a6ylj"; depends=[rJava]; }; XML = derive2 { name="XML"; version="3.99-0.5"; sha256="19jkpnbjx2ij0h7rxi13sqnjnwsap6wywmd4gnhfnqpic1rrnlk0"; depends=[]; }; XML2R = derive2 { name="XML2R"; version="0.0.6"; sha256="0azfh950r2b7ck3n1vzk3mdll7zy844nx3mbk676jxnj8gg7nxk5"; depends=[plyr RCurl XML]; }; - XMRF = derive2 { name="XMRF"; version="1.0"; sha256="0jnyy9pcksfadznidqsbwh8nlqv3k0yppj76q8a2g0aidbdmg2cc"; depends=[glmnet igraph MASS Matrix snowfall]; }; XNomial = derive2 { name="XNomial"; version="1.0.4"; sha256="1mwx302576rmsjllbq2clfxilm3hkyp5bw0wmwqbn0kgv5wpy8z6"; depends=[]; }; XR = derive2 { name="XR"; version="0.7.2"; sha256="0j8rkjw9y7mb0yj24nlisfd84148pnnakz8i2y35y2b8gmh5zhvz"; depends=[jsonlite]; }; XRJulia = derive2 { name="XRJulia"; version="0.9.0"; sha256="0s3g6fkam6hj03mxvw75nzsq3zvz84b71jhrw3v64mdngazdv7zm"; depends=[XR]; }; XRPython = derive2 { name="XRPython"; version="0.8"; sha256="0alg33spiaqf3jwg1qn543nxvbfaqv8gvf5px3grhbgrcmi5mcmj"; depends=[reticulate XR]; }; XRSCC = derive2 { name="XRSCC"; version="0.1"; sha256="0hs2whjsd02avaz79zkrd8gjw9qd7l6ysxmhx4w1r7gb1cj9rr7c"; depends=[]; }; - XiMpLe = derive2 { name="XiMpLe"; version="0.10-2"; sha256="16dmslc3ji9zbbm2khw8ib8rhwan0mdlfyd4h29v42lcx6l1d0pv"; depends=[]; }; + XiMpLe = derive2 { name="XiMpLe"; version="0.10-3"; sha256="1j2sg3ik55w81hbs690kfdq5mlsy10mv2r6rfkm63idqxpgv6c0k"; depends=[]; }; Xmisc = derive2 { name="Xmisc"; version="0.2.1"; sha256="11gwlcyxhz1p50m68cnqrxmisdk99v8vrsbvyr7k67f0kvsznzs1"; depends=[]; }; Xplortext = derive2 { name="Xplortext"; version="1.3.2"; sha256="0vs4nagc7bsjx1m5cww5m2bkv0ay1phdz47070vx5pi6hiwhgaak"; depends=[FactoMineR flashClust flexclust ggdendro ggplot2 gridExtra MASS slam stringi stringr tm]; }; YPBP = derive2 { name="YPBP"; version="0.0.1"; sha256="1slc7glr4hb0my5zkssprngb6si98npjj33nsbsm0nbm61hnb9n8"; depends=[BH Formula MASS Rcpp RcppEigen rstan rstantools StanHeaders survival]; }; YPInterimTesting = derive2 { name="YPInterimTesting"; version="1.0.3"; sha256="0fca963rsbs9k7ivffsqk4hzap6ll7s709kqs6aby0plghrdla2w"; depends=[MASS Rcpp]; }; YPPE = derive2 { name="YPPE"; version="1.0.1"; sha256="01q0l22nwfpld2wcygk5x28c2c6cv35hxy2fm1azn8bqsv7xy5il"; depends=[BH Formula MASS Rcpp RcppEigen rstan rstantools StanHeaders survival]; }; + YPmodel = derive2 { name="YPmodel"; version="1.4"; sha256="177rzbd8k0356b8z2sbvl3x5cg2w9kr8ryf36laqijyayhcik093"; depends=[]; }; YRmisc = derive2 { name="YRmisc"; version="0.1.6"; sha256="1crms7dqmhj7br1a5p5j0j7p6sdfimnip31207i6g24f9jkkysv1"; depends=[ggplot2 gridExtra]; }; YaleToolkit = derive2 { name="YaleToolkit"; version="4.2.2"; sha256="12wggdyz0wgnmxnqhp8bypyy1x1p50g49fwdzl2l43il44cdyv0g"; depends=[foreach iterators]; }; Yamm = derive2 { name="Yamm"; version="1.3.1"; sha256="0av5q1vx2f8dvxv0br9w65qmw3zr3y4vja45g8qbqyfb3gkfclhn"; depends=[depth interp OjaNP pcaPP]; }; @@ -5000,10 +5191,10 @@ in with self; { ZIBseq = derive2 { name="ZIBseq"; version="1.2"; sha256="13rjy4jl9wil6hhpra4qmdis0iyqxchzsf9l7q6r0dz1f7dpd2nq"; depends=[gamlss gamlss_dist nlme]; }; ZIM = derive2 { name="ZIM"; version="1.1.0"; sha256="0scyfjn4ilsvha3x41c3b8bcfi31hlhwm77wn2a8hj5dsvnnmzig"; depends=[MASS]; }; ZIPFA = derive2 { name="ZIPFA"; version="0.8.1"; sha256="134pkdn4slhiv27rdkkmh2z7xch30ns0jhzxgd7r05bky0z1iri1"; depends=[doParallel foreach Matrix optimx trustOptim]; }; - ZOIP = derive2 { name="ZOIP"; version="0.1"; sha256="0fraxzr2mfd7w705j2fryhh9vpg6nkag6kmk7p7in3zknxwipfh3"; depends=[boot GHQp numDeriv rmutil]; }; ZRA = derive2 { name="ZRA"; version="0.2"; sha256="1sx1q5yf68hhlb5j1hicpj594rmgajqr25llg7ax416j0m2rnagi"; depends=[dygraphs forecast]; }; ZVCV = derive2 { name="ZVCV"; version="2.1.0"; sha256="0np6h6x74kz1x13wmbkkm1wq43d8bnn2khzjc80prqdi6n0m9v8r"; depends=[abind BH dplyr glmnet magrittr mvtnorm Rcpp RcppArmadillo Rlinsolve]; }; ZeBook = derive2 { name="ZeBook"; version="1.1"; sha256="0v98kbz9njjdx60x9dn8hl8mc6x19i5knjyg2gkwfd667yy1rkl6"; depends=[deSolve triangle]; }; + Zelig = derive2 { name="Zelig"; version="5.1.7"; sha256="1x1zcmlhbbzxbb0y91ynz50nfhpki913lnmhcpmlds7drcbbirnk"; depends=[AER Amelia coda dplyr Formula geepack jsonlite MASS MatchIt maxLik MCMCpack quantreg sandwich survey survival VGAM]; }; ZillowR = derive2 { name="ZillowR"; version="0.1.0"; sha256="1wrr58p76ps29fqzzwgfvfibxrvc72p2yzs5kc2rv1yxzzcpyxvb"; depends=[RCurl XML]; }; ZipRadius = derive2 { name="ZipRadius"; version="1.0.1"; sha256="00q4a2bsajs5ns4vdm289iaj9mczxjn3ssyrnmg2z4wicr2ljizv"; depends=[dplyr geosphere ggplot2 magrittr rlang testthat]; }; Zseq = derive2 { name="Zseq"; version="0.2.0"; sha256="06dndi2b1q79bmxax11bv0l5ifcz1mhpvbn90y6a6xymrgcq0ivi"; depends=[gmp]; }; @@ -5012,6 +5203,7 @@ in with self; { aLFQ = derive2 { name="aLFQ"; version="1.3.6"; sha256="0kphpvhz36859f5l0k8mbf59g9871mynbs4ybdi0h5nm2cdjy9vx"; depends=[bio3d caret data_table lattice plyr randomForest reshape2 ROCR seqinr]; }; aMNLFA = derive2 { name="aMNLFA"; version="0.1"; sha256="0sj6rxsdib5zmz78c94bjdlcdwhfkvbc7sp3pncj6vsvvzgqcjdp"; depends=[devtools ggplot2 gridExtra MplusAutomation plyr reshape2 stringr]; }; aPCoA = derive2 { name="aPCoA"; version="1.2"; sha256="0b5fqxay918if5pfd6xgbzir5myivc3jar2p2is8azrykrr1v2cr"; depends=[ape car cluster randomcoloR vegan]; }; + aRbs = derive2 { name="aRbs"; version="0.0.1"; sha256="0ghd5sr0jrbm9lymhnq4bk6gcqkbak4sjqfjvsk96zp2nyqmhzrw"; depends=[crayon data_table dplyr progress purrr rvest stringr xml2]; }; aRpsDCA = derive2 { name="aRpsDCA"; version="1.1.1"; sha256="0ghg43rd6bnv4jp8pkpd1ixp5l6kq5pr0mxq61q24s24g0m3s64p"; depends=[]; }; aRxiv = derive2 { name="aRxiv"; version="0.5.19"; sha256="0rik0jkh1xi9fizzw46xmcw139g6nla072p7f8jgvzbhp7k58ba2"; depends=[httr XML]; }; aSPC = derive2 { name="aSPC"; version="0.1.2"; sha256="1q301rw7dax5v58srg4jlcam1qq2igkaj7kg8wlnlml0hsck4c4a"; depends=[energy mvtnorm]; }; @@ -5036,20 +5228,20 @@ in with self; { abnormality = derive2 { name="abnormality"; version="0.1.0"; sha256="1fzfskl9akl06nliy8hkv2a0pznpj8pwcypg3gj5r2nzvr3kan9v"; depends=[MASS Matrix]; }; abodOutlier = derive2 { name="abodOutlier"; version="0.1"; sha256="1pvhgxmh23br84r0fbmv7g53z2427birdja96a67vqgz18r3fdvj"; depends=[cluster]; }; abstractr = derive2 { name="abstractr"; version="0.1.0"; sha256="1ymwp7syrynwd4i8aj2x5n8jdi9d96fjzl6jb09n0bnr5fgl7vig"; depends=[colourpicker emojifont ggplot2 gridExtra rintrojs shiny shinythemes]; }; - abtest = derive2 { name="abtest"; version="0.2.1"; sha256="1zfd13d7dplawk24dbdr1ka8cbdp5w6sxb0zlm7k4dhvn6ksi8h0"; depends=[Matrix mvtnorm plotrix qgam RColorBrewer Rcpp sn truncnorm]; }; + abtest = derive2 { name="abtest"; version="0.2.2"; sha256="1ak0m4jd1grriwg4pn3aqf1468qma6rjn5kqjh8izx7zl29jd07v"; depends=[Matrix mvtnorm plotrix qgam RColorBrewer Rcpp sn truncnorm]; }; acc = derive2 { name="acc"; version="1.3.3"; sha256="1ii2vm47djxbixa75h690q1s2f9m9x6i8nkygik93j6dayr6kr1m"; depends=[circlize DBI ggplot2 iterators mhsmm nleqslv PhysicalActivity plyr R_utils Rcpp RcppArmadillo RSQLite zoo]; }; accSDA = derive2 { name="accSDA"; version="1.0.0"; sha256="0sgxy5y8kkc1n35657kifwfjsba7y5m1vbr7rkk5lmbpkzahqm61"; depends=[ggplot2 ggthemes gridExtra MASS rARPACK sparseLDA]; }; accelerometry = derive2 { name="accelerometry"; version="3.1.2"; sha256="13xzrwhr4i1nj9c8vrmfdg2rmrc8n446iihcyxmy99sm99hpzyip"; depends=[dvmisc Rcpp]; }; accelmissing = derive2 { name="accelmissing"; version="1.4"; sha256="1nql9inx6azdzi3z4sfm2vdml2mms6krl8wzlf1dn1c97ahn57fy"; depends=[mice pscl]; }; accept = derive2 { name="accept"; version="0.7.1"; sha256="0pn8q0jsi0nb2mm2kv6sjczflflshhy55y7nqqnk70yx9f6wm83y"; depends=[dplyr extrafont MASS plotly stringr viridis]; }; accrual = derive2 { name="accrual"; version="1.3"; sha256="11clm9s5c5518nmp6hd6pjnp0s28y92b2i2x0xgj4j5g816p4j3z"; depends=[fgui SMPracticals tcltk2]; }; - accrued = derive2 { name="accrued"; version="1.4.1"; sha256="05g1jb5914z18rcai1ahn7nihn27vr2rnadwv94gc1j7ivvikvs5"; depends=[]; }; ace2fastq = derive2 { name="ace2fastq"; version="0.6.0"; sha256="09kk3yyqnr2xp820g0p3aai9a21figigjr9lxkr3zjq2d8gzwfic"; depends=[stringr]; }; - acebayes = derive2 { name="acebayes"; version="1.9"; sha256="1imfwm1vpbb24vfmfn1nljhmaz8429mwjihw34892p387s8h7xz2"; depends=[compare lhs randtoolbox Rcpp RcppArmadillo]; }; + aceEditor = derive2 { name="aceEditor"; version="1.0.0"; sha256="0aphjbzbv308b08jng1pjri1k5macgiz4kl7xc1rxxd45bzr9l7h"; depends=[htmltools htmlwidgets reactR rstudioapi]; }; + acebayes = derive2 { name="acebayes"; version="1.10"; sha256="11bffz430gdfdaxjx3simig66vhynmx6l1ylac4q2shcmj52nx73"; depends=[compare lhs randtoolbox Rcpp RcppArmadillo]; }; acepack = derive2 { name="acepack"; version="1.4.1"; sha256="1f98rpfjmhd92rdc3j004plyfpjailz6j0ycysbac0kgj83haxc2"; depends=[]; }; acfMPeriod = derive2 { name="acfMPeriod"; version="1.0.0"; sha256="1yww8isfrbs2v9s94hx7p2imyszcgadwafdgpj438n2ik0q6p9d5"; depends=[MASS]; }; acid = derive2 { name="acid"; version="1.1"; sha256="030i0y8s283ivbsmjccpbv9v7mgbcg2jk9df7vgcbbns74swf9hd"; depends=[gamlss gamlss_dist Hmisc]; }; - acm4r = derive2 { name="acm4r"; version="1.0"; sha256="1wqzc35i1rshx0zlmas8y4qkkvy6h9r4i4apscjjv1xg2wjflzxa"; depends=[MASS]; }; + acled_api = derive2 { name="acled.api"; version="1.0.8"; sha256="0ghpw1rw5wzf4889k9mq5ajk9smdc6jkj66fdsm6ns4v61kyyjx5"; depends=[httr jsonlite]; }; acmeR = derive2 { name="acmeR"; version="1.1.0"; sha256="000b2hqlhj93958nddw0fqb15ahigs08najv2miivym046x04mf7"; depends=[foreign]; }; acnr = derive2 { name="acnr"; version="1.0.0"; sha256="087hq4i7jp67ba2finzsqjfnqbiprl33na6ryjv9zqzsdawj9cym"; depends=[]; }; acopula = derive2 { name="acopula"; version="0.9.3"; sha256="0vvbbw8pfs9jwfz5c57lw48pr0qj661r0ys007q6zf9jmlrhx1ln"; depends=[]; }; @@ -5058,20 +5250,21 @@ in with self; { acs = derive2 { name="acs"; version="2.1.4"; sha256="0ajw9rf8l8akcvgqvbxjvryc6wjx74521xyxswz2b0bky3m6kah5"; depends=[httr plyr stringr XML]; }; acss = derive2 { name="acss"; version="0.2-5"; sha256="0cqa60544f58l5qd7h6xmsir40b9hqnq6pqgd5hfx2j2l5n7qhmk"; depends=[acss_data zoo]; }; acss_data = derive2 { name="acss.data"; version="1.0"; sha256="09kl4179ipr8bq19g89xcdi1xxs397zcx5cvgp6viy8gn687ilgv"; depends=[]; }; - actel = derive2 { name="actel"; version="1.1.0"; sha256="1v6bjf52ilgh5g6b63hw44fr2bkxyi3m69gavdphdhrcf06jzvxm"; depends=[circular data_table DiagrammeR DiagrammeRsvg fasttime ggplot2 knitr readr reshape2 rmarkdown rsvg scales stringi stringr svglite]; }; + act = derive2 { name="act"; version="0.94"; sha256="1qvz84m0m5s1jarjhqxgsfc4aa5qql31f9f9vv2jlnwi3f60nnj2"; depends=[openxlsx progress stringi stringr XML]; }; + actel = derive2 { name="actel"; version="1.2.0"; sha256="11p4rlb72cvnra1fhaphviafr0gnn24qg8fgaqmq16sjgxw1knvn"; depends=[circular data_table DiagrammeR DiagrammeRsvg fasttime ggplot2 knitr readr reshape2 rmarkdown rsvg scales stringi stringr svglite]; }; activPAL = derive2 { name="activPAL"; version="0.1.3"; sha256="1h6hp5z89ji73gdzxy1dgbfwjysiy5lvcqh90xagpb7sa7ahs3na"; depends=[devtools dplyr ggplot2 lubridate magrittr tidyr]; }; - activegp = derive2 { name="activegp"; version="1.0.4"; sha256="0sqx2pjy0mw8gls4k4qwl64ip55kgs3k10dfdixdrqly035rhr37"; depends=[hetGP lhs numDeriv Rcpp RcppArmadillo]; }; + activegp = derive2 { name="activegp"; version="1.0.5"; sha256="065swmmrcwkvnm5a6rhg4g4agbsgrzjfpkwyr649wr13d07yn291"; depends=[hetGP lhs numDeriv Rcpp RcppArmadillo]; }; activity = derive2 { name="activity"; version="1.3"; sha256="12imqj366dp6pam5gap6ji56p5wf1073xz5g4iikfxf5l8snxw92"; depends=[circular insol pbapply]; }; activityCounts = derive2 { name="activityCounts"; version="0.1.2"; sha256="0zgxr2sk3a8kmygfxx1p5hnrfwdkxx7php6jlrhm8wv6052ck8jz"; depends=[lubridate magrittr seewave signal tibble]; }; activpalProcessing = derive2 { name="activpalProcessing"; version="1.0.2"; sha256="1y0bjx2qx53iy930y9iww4q1yzjj8y16cwgixk1mq3w4g1f116d1"; depends=[chron]; }; actogrammr = derive2 { name="actogrammr"; version="0.2.3"; sha256="1jzvarmd41yqlrkagzlc8m19n5mn0w0b36fy50lyvgrfsafjfbqa"; depends=[dplyr ggplot2 lubridate readr tidyr]; }; actuar = derive2 { name="actuar"; version="3.0-0"; sha256="0dkp1sczldzy7kj70qvh1q59jhsq1brjybmxdz43jnx63y45llpz"; depends=[expint]; }; actuaryr = derive2 { name="actuaryr"; version="1.1.1"; sha256="08dzn565ax2l2hrn2m32k6magjbskybywl0hsgkg11nrjvkznwnx"; depends=[crayon dplyr lubridate magrittr purrr tibble]; }; + acumos = derive2 { name="acumos"; version="0.4-1"; sha256="0ddy8gdpm5kapvlybmjd62pxbqa5lkj6zj2qqsmp63cgj3n6yjq2"; depends=[httr jsonlite RestRserve RProtoBuf Rserve yaml]; }; ada = derive2 { name="ada"; version="2.0-5"; sha256="1h3a07czp0w3hrhjcg1fz721y8vsfclzqi3rq8qfzgpfb4h1f06r"; depends=[rpart]; }; adabag = derive2 { name="adabag"; version="4.2"; sha256="109wrl1pwvmyv2l909hrvk7dg4aa9pv449mvdycp50zwrsw9w0a7"; depends=[caret doParallel foreach rpart]; }; adagio = derive2 { name="adagio"; version="0.7.1"; sha256="1h9l0ddrxq8y35iy9hdkxdvdwsqpnpkzzbkbwwhm4380lq1m7a3k"; depends=[]; }; adamethods = derive2 { name="adamethods"; version="1.2.1"; sha256="150awbd3skb1mqca18bqjykhyycqw8crviw66s6qrcnmcsbk77pj"; depends=[Anthropometry archetypes FNN foreach nnls tolerance univOutl]; }; - adapr = derive2 { name="adapr"; version="2.0.0"; sha256="1s57jdbi5pik56xjz1d4438ax6cywg2yq2s47h5g6wrwvpgr1qfw"; depends=[archivist devtools digest doParallel gdata ggplot2 git2r igraph knitr plotly plyr rmarkdown shiny shinydashboard versions]; }; adapt4pv = derive2 { name="adapt4pv"; version="0.1.0"; sha256="0j0vdil277y035bqff3kwwrimjsv1pzfzj6qshyj7xh80dj6qsz8"; depends=[doParallel foreach glmnet Matrix speedglm xgboost]; }; adaptMCMC = derive2 { name="adaptMCMC"; version="1.3"; sha256="08v11rl0p4w94knb0yzs1ysj42xillya62yaw3zm40d4pqv7vcky"; depends=[coda Matrix]; }; adaptMT = derive2 { name="adaptMT"; version="1.0.0"; sha256="1yllz1zd4cryf5bj8b2lcrj6zl79yjkllyh9p02ikryy5qmg419b"; depends=[]; }; @@ -5090,9 +5283,8 @@ in with self; { additiveDEA = derive2 { name="additiveDEA"; version="1.1"; sha256="15nxpdybsda6yhjk23bpafr8v1zdx8332pcxf26k795q3ypjpiy2"; depends=[Benchmarking lpSolveAPI]; }; additivityTests = derive2 { name="additivityTests"; version="1.1-4"; sha256="048ds90wqjdjy1nyhna3m06asdklbh8sx1n556kss2j1r1pma1sw"; depends=[]; }; addreg = derive2 { name="addreg"; version="3.0"; sha256="13bwmgxylwi02g60j1rr51cr5jvvkl2nvf2lnnhnq46fhvs2ma7s"; depends=[combinat glm2 turboEM]; }; - ade4 = derive2 { name="ade4"; version="1.7-15"; sha256="1xpxznlqm8wb4d5z2dcrl0wi3jjciq2hr5rcx2b5aaipiiyzm1ij"; depends=[MASS pixmap sp]; }; - ade4TkGUI = derive2 { name="ade4TkGUI"; version="0.3-0"; sha256="1k1d5vck8plv6rq9nn664p73nhd4k3kah52fvqc3vg2zv1hbizzk"; depends=[ade4 adegraphics lattice tkrplot]; }; - adeba = derive2 { name="adeba"; version="1.1.2"; sha256="1z1law3qh6l902g62y8yapk4nypdmb20jmpwhxp9jbglalw9lm73"; depends=[mixtools pdist Rcpp]; }; + ade4 = derive2 { name="ade4"; version="1.7-16"; sha256="142m70im8yd4q01q7z02y3ia0f66yh4ikdznv0ps6c7yyigs5mwv"; depends=[MASS pixmap progress sp]; }; + ade4TkGUI = derive2 { name="ade4TkGUI"; version="0.3-1"; sha256="1y0f62n8iv002ayd1nyl3bmszw558niwnfzjpvk0a7cbvfdyvwcg"; depends=[ade4 adegraphics lattice]; }; adegenet = derive2 { name="adegenet"; version="2.1.3"; sha256="1ipnawi0qfd4rfwj37igvh36x1a9d8x4n7xynn1jcr12rd713407"; depends=[ade4 ape boot dplyr ggplot2 igraph MASS reshape2 seqinr shiny spdep vegan]; }; adegraphics = derive2 { name="adegraphics"; version="1.0-15"; sha256="12k77x6vnjz9s9dvz1r81ajqcl1nh9g33r7dymaqk2cs5q3wvfw7"; depends=[ade4 KernSmooth lattice latticeExtra RColorBrewer sp]; }; adehabitatHR = derive2 { name="adehabitatHR"; version="0.4.18"; sha256="0ss3fhpa7i2m4g55ajy9pgwgj393jbw58khgywc3gw9ys53h02sd"; depends=[ade4 adehabitatLT adehabitatMA deldir sp]; }; @@ -5105,21 +5297,23 @@ in with self; { adeptdata = derive2 { name="adeptdata"; version="1.0.1"; sha256="07146kv1llj5kci7s7v2jrqd7bl6h3rczx43nha5fhr57ldpcm40"; depends=[]; }; adespatial = derive2 { name="adespatial"; version="0.3-8"; sha256="01i90802w98zyni6krcngk49f5jgi267w64l0wm8c2izrq4k5zg3"; depends=[ade4 adegraphics adephylo lattice MASS shiny sp spdep vegan]; }; adfExplorer = derive2 { name="adfExplorer"; version="0.1.4"; sha256="11z6jm20giqmmz4dwcpa9fshvrmlmv8m0y1vg053nch05884niz2"; depends=[]; }; + adheRenceRX = derive2 { name="adheRenceRX"; version="1.0.0"; sha256="19kimj88dmcc8mq3s4l7pph9jz8p57gbjyn0pn5zkrcjdrwncslm"; depends=[anytime dplyr lubridate purrr Rcpp rlang tidyr]; }; adhoc = derive2 { name="adhoc"; version="1.1"; sha256="0a59fv9glcqh4zzd0887ndrhlcaylja6vay2ifajp8an29gjk1vv"; depends=[ape pegas polynom]; }; adimpro = derive2 { name="adimpro"; version="0.9.2"; sha256="1ajq2889y70lxjdpf5zdg7zkz35i3i92li72wb7nbfngxmw47xzv"; depends=[awsMethods]; }; - adiv = derive2 { name="adiv"; version="2.0"; sha256="1lp5vylqj8n29smjp3611gxw0nfgk5blcwrhk3c73w1v6695488b"; depends=[ade4 adegraphics adephylo ape cluster FactoMineR phylobase phytools rgl]; }; + adiv = derive2 { name="adiv"; version="2.0.1"; sha256="184wgf91csafsk1x6blyv2l6m974lq1696d4i612ff7qrwbmicpv"; depends=[ade4 adegraphics adephylo ape cluster FactoMineR phylobase phytools rgl]; }; adjclust = derive2 { name="adjclust"; version="0.5.99"; sha256="1ij09mlmsqamvr8gmajg82qfn0l7q4x7hkavm7w42ndzjwwdmf7b"; depends=[capushe Matrix matrixStats]; }; adjustedcranlogs = derive2 { name="adjustedcranlogs"; version="0.1.0"; sha256="08apfvpqvnnalx230p4qf5ckrwm1sgzras4zfrysgym5d4map9ci"; depends=[cranlogs dplyr lubridate rvest xml2]; }; adklakedata = derive2 { name="adklakedata"; version="0.6.1"; sha256="1lzj3ib4bgfkq5lq12n47pwc52h7k35xbbwj6brwsgx1gd4fx3x6"; depends=[httr rappdirs]; }; adlift = derive2 { name="adlift"; version="1.4-1"; sha256="14q7fnhlqvxdhnfjhdhfmadz241srplbm069a7ybbsql21cphpf3"; depends=[EbayesThresh]; }; - admisc = derive2 { name="admisc"; version="0.8"; sha256="071xrqimizhs7qgav84fggw8cls4dhhqvzp8f1g0xw1wvj0wnfx1"; depends=[]; }; + admisc = derive2 { name="admisc"; version="0.11"; sha256="18m2kxr62mw9pkgpnnr7lnik73lb19d5gib8dm0b5d1a2c5abxyh"; depends=[]; }; admixr = derive2 { name="admixr"; version="0.9.1"; sha256="0wszpzs53cbnha13g2ldpq6z5ndw2v2xgrzadqkjm3hsp6akv4bl"; depends=[dplyr magrittr readr rlang stringr tibble]; }; admixturegraph = derive2 { name="admixturegraph"; version="1.0.2"; sha256="0ld4qyyvbnr5lz9ff64wjwif4c9xnqyjmbfgbl9bk6pia98zppl3"; depends=[doParallel dplyr foreach ggplot2 MASS neldermead pracma]; }; admmDensestSubmatrix = derive2 { name="admmDensestSubmatrix"; version="0.1.0"; sha256="1a5lfm10aj6wdjibdnmffn75zvy6x69w8nqcx2i23gxg6v0xlqcl"; depends=[Rdpack]; }; adnuts = derive2 { name="adnuts"; version="1.0.1"; sha256="1l52f33yzbvcz27iw0k6iwcnfanr65lw206d7w4609k2vmlw8ink"; depends=[ellipse R2admb rstan]; }; adoption = derive2 { name="adoption"; version="0.6.2"; sha256="18mjhsh19bjmh27sv5fiay0xv1la0qy96v48b093f7kqfx4c21xb"; depends=[quadprog RandomFieldsUtils tkrplot]; }; - adoptr = derive2 { name="adoptr"; version="0.3.2"; sha256="1s35wm1gkbygzbnma5mwpr60zml4yf74ip5fzkj0vfi77b3lclrr"; depends=[glue nloptr]; }; + adoptr = derive2 { name="adoptr"; version="0.4.1"; sha256="1xx5mg1lhq4n5pi6wgmak2nmkfwyldkphcama5fdls03xiigy0cn"; depends=[glue nloptr]; }; adpss = derive2 { name="adpss"; version="0.1.1"; sha256="0p2gyfc4rxmms8zdsq4hjsh1njfl2s736arq8aq1am2wh1w9k5ch"; depends=[Rcpp]; }; + ads = derive2 { name="ads"; version="1.5-4"; sha256="1f2pd0hbbahqjv9fjvq1bgq1w5s11b73kpvj54j6i8h1ps6j69n7"; depends=[ade4 spatstat spatstat_data spatstat_utils]; }; advclust = derive2 { name="advclust"; version="0.4"; sha256="1g8a8q4zh6d4152jb66fh7wj7k6ks5k4kfcazzw70jdn10yi6b38"; depends=[clue ggplot2 knitr MASS reshape2]; }; adventr = derive2 { name="adventr"; version="0.1.8"; sha256="0nja1a2xhaimz1fg2bb838x9a37sswjqjc68mp59gbdwkfpdii37"; depends=[BayesFactor boot car dplyr effects effsize forcats GGally ggplot2 Hmisc learnr lm_beta nlme readr robust sandwich sjstats tidyr WRS2]; }; adwave = derive2 { name="adwave"; version="1.3"; sha256="11iy50ng0zxvwsvdsvx262j8zgqaai308lp5is47az7xzvk57mx7"; depends=[waveslim]; }; @@ -5127,7 +5321,8 @@ in with self; { aemo = derive2 { name="aemo"; version="0.3.0"; sha256="108scwyf0dyvn969cks3ikbj2pf2g4dw051asahx26pl0ggw7ijw"; depends=[assertthat dplyr lubridate stringr]; }; afCEC = derive2 { name="afCEC"; version="1.0.2"; sha256="0jdppp93z5nb8m5qbry6cvd472mwiq1yrmm11906c3z2bfz7791f"; depends=[Rcpp RcppArmadillo rgl]; }; afc = derive2 { name="afc"; version="1.4.0"; sha256="1iy1wa88kf6zi6x7lbd0jdir653cvzvdraliqpxbac413wwb5gwl"; depends=[]; }; - afex = derive2 { name="afex"; version="0.27-2"; sha256="0qsmcddy4449qjj3ajmqvdiqdkhkswmz5dqf150wxwq897p3bvf2"; depends=[car lme4 lmerTest pbkrtest reshape2]; }; + afex = derive2 { name="afex"; version="0.28-0"; sha256="0c47bq2llzw2b4avhkxyhmf1m2zjh9jsjiw2kww9n1bhwqsyr4ci"; depends=[car lme4 lmerTest pbkrtest reshape2]; }; + affinitymatrix = derive2 { name="affinitymatrix"; version="0.1.0"; sha256="10i7wzl4xiphj5f466ga7c4ha3mkyqn63x1z0jyx50m0b84sggq1"; depends=[expm ggplot2 ggrepel Hmisc MASS]; }; affluenceIndex = derive2 { name="affluenceIndex"; version="1.0"; sha256="1nb2dlsnvjsvkyrfdaskmpr3kv3qgdfb60xgmzvscfli0yf4dzr1"; depends=[]; }; afmToolkit = derive2 { name="afmToolkit"; version="0.0.1"; sha256="1pm3xyh9vq10mmfgknlvlfr9f027xprrgy1dvbbxpi7f111hv1gl"; depends=[assertthat DBI dplyr ggplot2 gridExtra minpack_lm scales tibble]; }; afpt = derive2 { name="afpt"; version="1.1.0.1"; sha256="0cg5cdm9nl1hs6f3j0ljpw4bkqvh3ksyj615b9nnbqs5k28lyds9"; depends=[]; }; @@ -5139,14 +5334,16 @@ in with self; { agricolae = derive2 { name="agricolae"; version="1.3-3"; sha256="13hzlbm7khpz3xq0d7ijfvy4n489y97l3kzdspsqlz7rywbn7cg9"; depends=[AlgDesign cluster klaR MASS nlme]; }; agridat = derive2 { name="agridat"; version="1.17"; sha256="0pgk9p6ynnz03k1ch9c15xbl777b0ml80shkbkxlnqn297q736vq"; depends=[]; }; agriwater = derive2 { name="agriwater"; version="1.0.0"; sha256="0m1dpv69nf3pjp63z3a5710skgb6sbrmjv6b8rxvq9lrw63993g9"; depends=[raster rgdal sp]; }; - agrmt = derive2 { name="agrmt"; version="1.40.4"; sha256="1y2gnq6b4zkxknygg73r8qrd435y7c69iqn8i56kwk1ccc1rwddx"; depends=[]; }; + agrmt = derive2 { name="agrmt"; version="1.42.4"; sha256="0kbhmla14s2jr2sg8fz16zgmqz2n8q2228ny8naar0srjqjnb3c6"; depends=[]; }; agroclim = derive2 { name="agroclim"; version="0.1.0"; sha256="16cyqplzmwziqwkicix0sr06zhc0yx615iv3hda0cxbdyf2rllk3"; depends=[abind cowplot easyNCDF ggforce ggplot2 ggpubr gtable multiApply ncdf4 plyr raster reshape sp zoo]; }; agrostab = derive2 { name="agrostab"; version="0.1.0"; sha256="0mcskv3144j594wqljzn5pwbhkxh6sb76b1c2wabzjvi61zrapiv"; depends=[dplyr ggplot2 rlang]; }; agsemisc = derive2 { name="agsemisc"; version="1.3-1"; sha256="1905q35jgjhghlawql43yh296kbpysp927x3hj750yshz5zayzyr"; depends=[lattice MASS]; }; + agtboost = derive2 { name="agtboost"; version="0.9.1"; sha256="01gydh7rlsgv759y3nahm9qi8pd24x37rpzv1frwzrr5jfbajqdl"; depends=[Rcpp RcppEigen]; }; ahaz = derive2 { name="ahaz"; version="1.14"; sha256="1z7w5rxd5cya7kxhgxqvn72k87y33ginxra9g7j9wrfs5jgx6kvx"; depends=[Matrix survival]; }; ahnr = derive2 { name="ahnr"; version="0.3.1"; sha256="1g8m3q108ricfyn4fjjaihpr93xz7fm2sfzg3i0fz1n1i703jwm8"; depends=[ggplot2 magrittr matrixcalc pdist pracma purrr visNetwork]; }; ahp = derive2 { name="ahp"; version="0.2.12"; sha256="0zjhgl0smzx4bkhmdm4rmpyrq4hmxy1nkxvwqjr40pz7vm69icqx"; depends=[data_tree DiagrammeR formattable yaml]; }; ahpsurvey = derive2 { name="ahpsurvey"; version="0.4.1"; sha256="1r7x4c318nzbx0ppm9272kfpz2bln1cafkv9irnj85nsdcravr33"; depends=[dplyr knitr magrittr randomNames Rdpack tidyr]; }; + ahptopsis2n = derive2 { name="ahptopsis2n"; version="0.1.0"; sha256="1924hwk861mbbmcvf34lsmhxjga2rqz730817a19b0nkr308p6ma"; depends=[]; }; aiRly = derive2 { name="aiRly"; version="0.1.0"; sha256="0d3w5dwk0b3pd49zw2005rili4p3l1i3x4hzp8cf6rljr86x01cy"; depends=[httr jsonlite reshape2 tibble]; }; aiRthermo = derive2 { name="aiRthermo"; version="1.2.1"; sha256="058082qdfi1pbdgf26vbfahri1kbc8b2l816q4dq89j5aj5is0a2"; depends=[]; }; aibd = derive2 { name="aibd"; version="0.1.8"; sha256="1pgfvz3b276y9pl6m3rghjlvhkrqp04w8gj3zzl7j446d372lm9h"; depends=[commonsMath rscala]; }; @@ -5155,65 +5352,72 @@ in with self; { aimPlot = derive2 { name="aimPlot"; version="1.0.0"; sha256="1d52b7kccxba6j7n0gbd7pzs0p87zn32vv8gdf2f7lyr75qzgz7x"; depends=[ggplot2]; }; aimsir17 = derive2 { name="aimsir17"; version="0.0.2"; sha256="0v804maqaygqhw3y9wqap3h9vvjniqnnbsv1psjj500r2yscicxs"; depends=[tibble]; }; airGR = derive2 { name="airGR"; version="1.4.3.65"; sha256="1x9zf6bbcaflszqzaki940xy33g4wj4yqsgbg836a1dwv1crd1l7"; depends=[]; }; - airGRteaching = derive2 { name="airGRteaching"; version="0.2.8.69"; sha256="0z2iwqr0qm9wv7hl337l0kbjnc9h0pjahwnk3y89x8frisa2cc32"; depends=[airGR dygraphs markdown plotrix shiny shinyjs xts]; }; + airGRteaching = derive2 { name="airGRteaching"; version="0.2.9.25"; sha256="0pkr5mkybxdk7axzd5ll87651x4b5yim1h9c8x3yapgp9vihvhnc"; depends=[airGR dygraphs markdown plotrix shiny shinyjs xts]; }; aire_zmvm = derive2 { name="aire.zmvm"; version="0.8.2"; sha256="0z9knqdl7ihx2vph154qi1lh4s6yvlcw6kwry8k47mhh3p7pynsd"; depends=[dplyr httr lubridate progress readr readxl rvest sp stringr tidyr xml2]; }; airportr = derive2 { name="airportr"; version="0.1.3"; sha256="1h8h0cdfqgxv8cf9hp82sx5n4a1z88qyyxicj7d2kmmybqqz2r5n"; depends=[dplyr]; }; airports = derive2 { name="airports"; version="0.1.0"; sha256="1ahfqqfcvr731hj0h7d00jd87h1adiryh42sv4mh318lk5rglm6f"; depends=[]; }; airqualityES = derive2 { name="airqualityES"; version="1.0.0"; sha256="1kf673ajk06ggy9524lip5flpfgq0gql7d46kgnri8l3kbzw7zcj"; depends=[tibble]; }; airr = derive2 { name="airr"; version="1.3.0"; sha256="1lpzd8qz1dr6kkrbc8lnqbknxyamv4y6ahad5w9q5dgwdwn0kpym"; depends=[readr stringi yaml]; }; - airt = derive2 { name="airt"; version="0.1.0"; sha256="0vzc9i2jj20dk4bb818fvg2xb4ik472cn9wrijw4c2qynl5fz7mz"; depends=[mirt pracma tidyr]; }; + airt = derive2 { name="airt"; version="0.2.0"; sha256="1psr3zsvgvvg2r4mah0dq8zgagr6y85a541pmpm7aszzkkga4yp5"; depends=[EstCRM mirt pracma rlang tidyr]; }; ajv = derive2 { name="ajv"; version="1.0.0"; sha256="1qd5ncb7rdnnvqfknsvq9nrpxrh0zv3jyh4b91dcvfvhp262vfrm"; depends=[RJSONIO V8 yaml]; }; - akc = derive2 { name="akc"; version="0.9.4"; sha256="1bvlj3h1fa3n9dkfhr5zhh8j3m8wafr6370sfg24vjwmiqpmx96j"; depends=[data_table dplyr ggforce ggplot2 ggraph ggwordcloud igraph magrittr rlang stringr textstem tibble tidygraph tidytext widyr]; }; + akc = derive2 { name="akc"; version="0.9.5"; sha256="0mjqz5csckdnl9wb2lypcj907qbkvppwbzvmfcl1a06431pj8zgv"; depends=[data_table dplyr ggforce ggplot2 ggraph ggwordcloud igraph magrittr rlang stringr textstem tibble tidygraph tidytext widyr]; }; + akiFlagger = derive2 { name="akiFlagger"; version="0.1.2"; sha256="0dhn44yy9z204blzr8xr7jrphlirl43dj209cxshn5y9wg5s58pp"; depends=[data_table dplyr zoo]; }; akima = derive2 { name="akima"; version="0.6-2.1"; sha256="086q4ip6j226p8z5iqzfg551i15l5c0rnf4y4zavmpmqvwd2szz2"; depends=[sp]; }; + akmbiclust = derive2 { name="akmbiclust"; version="0.1.0"; sha256="19dj12vlry6f3agzrnshx2c4rpa2h7dlx2138r49jjy9sm48pyfw"; depends=[]; }; akmeans = derive2 { name="akmeans"; version="1.1"; sha256="1nqbxbx583n0h2zmpy002rlmr6j86j6bg76xj5c69brrh59dpyw1"; depends=[]; }; akmedoids = derive2 { name="akmedoids"; version="0.1.5"; sha256="0yn5rjgb5rrhphgbjn49098ybkmzda6yxzfqgbsppfgjidrafhza"; depends=[ggplot2 Hmisc kml longitudinalData reshape2 signal]; }; alabama = derive2 { name="alabama"; version="2015.3-1"; sha256="0mlgk929gdismikwx4k2ndqq57nnqj7mlgvd3479b214hksgq036"; depends=[numDeriv]; }; alakazam = derive2 { name="alakazam"; version="1.0.2"; sha256="0ba0gx682g3swbyyw4nmhxnnw0lzxb8rbapcgfq9jaagn8q63d0f"; depends=[ape dplyr ggplot2 igraph lazyeval Matrix progress Rcpp readr rlang scales seqinr stringi tibble tidyr]; }; + albatross = derive2 { name="albatross"; version="0.2-0"; sha256="0448syyfq6lkq4ccdxryzha9pdh61q45c0c1a59i0r2civa8z934"; depends=[lattice multiway pracma]; }; albopictus = derive2 { name="albopictus"; version="0.5"; sha256="0kw1agm9jqi9wl5zbx8bryngy751g3sih36rgbrx0m2170cy42d9"; depends=[]; }; ald = derive2 { name="ald"; version="1.2"; sha256="1xmvxmyc1nmsrlyr0rvzz20jx6g1f2jvxpg9f39v48ngg5gmanjj"; depends=[]; }; alfr = derive2 { name="alfr"; version="1.2.1"; sha256="1ldq8gvgqjjabn86hdqb6hxch8x4hvr6djv5ly4mx039dipc8jxi"; depends=[httr jsonlite magrittr stringr]; }; - alfred = derive2 { name="alfred"; version="0.1.7"; sha256="1467rg5q2dqbqy8vj2061glb1gksq96rnjlifgyiv5rarwzy9b4y"; depends=[dplyr jsonlite lubridate magrittr tibble tidyr]; }; + alfred = derive2 { name="alfred"; version="0.1.8"; sha256="0kw5kdcd253xmpfmjqsxky0ilq0djxn02mlnwydis0sxmrf4rxbh"; depends=[dplyr jsonlite lubridate magrittr rlang tibble tidyr]; }; algaeClassify = derive2 { name="algaeClassify"; version="1.2.0"; sha256="1sna5rij2ngpgqfz5cviqdbyr43xph8cbjc4vnm238n72zgg7cb6"; depends=[httr lubridate plyr RCurl rvest taxize XML xml2]; }; algo = derive2 { name="algo"; version="0.1.0"; sha256="1g18p8jyj9crkqm16y2im3r9xzqwa36javv4vi1wvsqkg31d81si"; depends=[glue htmltools jsonlite]; }; - algorithmia = derive2 { name="algorithmia"; version="0.2.0"; sha256="0h1llcwk1qkxg26ikib44nd19da1q39n3gd8jwwb36687drl26qp"; depends=[base64enc httr rjson]; }; + algorithmia = derive2 { name="algorithmia"; version="0.3.0"; sha256="1ccmcsyxncyv8k0fjvr5y44amygqi7qx2dy6rsy3a5pw281hllr4"; depends=[base64enc httr rjson]; }; aliases2entrez = derive2 { name="aliases2entrez"; version="0.1.1"; sha256="0gv76a8iwmpqrk3iw35mj7jzyfna7lga2amy5csgfpsz8w54jdd6"; depends=[AnnotationDbi doParallel foreach limma org_Hs_eg_db RCurl readr]; }; alignfigR = derive2 { name="alignfigR"; version="0.1.1"; sha256="0jsj0h7zpzj6ynfydl8qbggm03xx8db769rli7rcx9909xdxabk6"; depends=[ggplot2]; }; alineR = derive2 { name="alineR"; version="1.1.4"; sha256="1gi4pl7ij60pz85yjiga5kvldraj9n3nhcyqdxrigs0cqvdwg3ar"; depends=[]; }; allan = derive2 { name="allan"; version="1.01"; sha256="02bv9d5ywbq67achfjifb3i7iiaaxa8r9x3qvpri2jl1cxnlf27m"; depends=[biglm]; }; + allcontributors = derive2 { name="allcontributors"; version="0.0.2"; sha256="0b9qiwp6z33fgci7np4qhsb39rzmarajsj3pa98vkmdn71bw1bxf"; depends=[cli clipr ghql git2r httr jsonlite magrittr]; }; alleHap = derive2 { name="alleHap"; version="0.9.9"; sha256="1fqrw645s3f5363p7jl3dzy8xphxdr1v6wdsjmqcqwpgvjqfr2zz"; depends=[abind]; }; allelematch = derive2 { name="allelematch"; version="2.5.1"; sha256="00117cj01psax4rjvy2nja5r2ss9l8zzjicczh46kp401i1ghmwc"; depends=[dynamicTreeCut]; }; allelic = derive2 { name="allelic"; version="0.1"; sha256="0xs4kd3vqb5ph8kqc3lcqgirrdkz8b627pvnczvci2g0sr3cl18j"; depends=[]; }; - allestimates = derive2 { name="allestimates"; version="0.1.8"; sha256="0wddcc4gdngwikx5ajr8yf45hk05ijqqczipss253y64viwgi3by"; depends=[broom dplyr ggplot2 speedglm stringr survival tidyr]; }; + allestimates = derive2 { name="allestimates"; version="0.1.9"; sha256="1ba3hf3wbhswaxmbi3lfjqzdgk7xf44x5xhggsqdw44kk080z7bb"; depends=[broom dplyr ggplot2 speedglm stringr survival tidyr]; }; alluvial = derive2 { name="alluvial"; version="0.1-2"; sha256="039frwrsxq1lb97s7vf2vbyyadimkigs628ymym06fxka53drdkp"; depends=[]; }; almanac = derive2 { name="almanac"; version="0.1.1"; sha256="0qsczk74ihy7ac5c4dzd6ax5gfmr56wfnjxg396qc2c3xykb7dd5"; depends=[glue lubridate magrittr R6 rlang V8 vctrs]; }; alookr = derive2 { name="alookr"; version="0.3.2"; sha256="197sbnfckk24vsp6znx8q26hlrkawiy69849fkwnzal0bwwqx4l3"; depends=[caTools cli dlookr dplyr future ggmosaic ggplot2 MASS MLmetrics party purrr randomForest ranger RColorBrewer rlang ROCR rpart tibble tidyr tidyselect unbalanced]; }; - alpaca = derive2 { name="alpaca"; version="0.3.2"; sha256="07r13gyqb876p6zx3pydl414zrgc473dnyn5ja6hmzjmkv19lw4k"; depends=[data_table Formula MASS Rcpp RcppArmadillo]; }; + alpaca = derive2 { name="alpaca"; version="0.3.3"; sha256="1mpyy9wg2wvznkd9vgzaxyz87py9zmlrlrzrhqbmqiwqh5y99wnq"; depends=[data_table Formula MASS Rcpp RcppArmadillo]; }; alphaOutlier = derive2 { name="alphaOutlier"; version="1.2.0"; sha256="09yrbv7jsiymw5gzp8p92ki70v1fys2k75x4sb9s7wy3c58wn1cd"; depends=[nleqslv quantreg Rsolnp]; }; alphabetr = derive2 { name="alphabetr"; version="0.2.2"; sha256="1pmp6zwhgycb38y5jbvrbv2nza7gyjh508vy09ml483c2cysvc1r"; depends=[clue dplyr multicool Rcpp]; }; alphahull = derive2 { name="alphahull"; version="2.2"; sha256="024d70z9pasyfp83zwgh7fkjky70l74pbzw1wvazzq75p9m91vzv"; depends=[ggplot2 R_utils sgeostat spatstat splancs tripack]; }; - alphashape3d = derive2 { name="alphashape3d"; version="1.3"; sha256="15l8hsn3jcn5jzwfpya99v2mzrgmhl3i587nw6cx4aky75ajslcx"; depends=[geometry rgl]; }; + alphashape3d = derive2 { name="alphashape3d"; version="1.3.1"; sha256="0d3rxvsb0yl900dlpr1v5w56z8ci9rbp5dlwx7l2laifyprsns2i"; depends=[geometry rgl]; }; alphastable = derive2 { name="alphastable"; version="0.2.1"; sha256="01gwrcxlj2jlb8axs5qmrsixk3a8b7044ypyjg6dpdcxfbcf5fvp"; depends=[mvtnorm nlme nnls stabledist]; }; alphavantager = derive2 { name="alphavantager"; version="0.1.2"; sha256="0c97p8njga4xffvsa0kj0s4y0agjr44y9bnjxs5phm1ldcqjs0yj"; depends=[dplyr glue httr jsonlite purrr readr stringr tibble tidyr timetk]; }; - alr3 = derive2 { name="alr3"; version="2.0.8"; sha256="1vkwgf5c9zb8pphcw47vfwwk12nfj4nggj8dr88jwbdnv7yd257h"; depends=[car]; }; alr4 = derive2 { name="alr4"; version="1.0.6"; sha256="0v98yzi0fcjxq0ak0w05001h8m9nfa9l0ann9bqvz8bwcmb3jlr2"; depends=[car effects]; }; altR2 = derive2 { name="altR2"; version="1.0.0"; sha256="15nvbq3n76p2857ipyf3q6rs2mwjqsp9gr3rmzbjfm8lrj0faxsv"; depends=[gsl purrr]; }; + altadata = derive2 { name="altadata"; version="0.1.1"; sha256="0wv8a0423k0gw5i0qgz5d3wqw22a9pk7r80fp33pn0mxq9b54zdv"; depends=[httr jsonlite]; }; altair = derive2 { name="altair"; version="4.0.1"; sha256="0s3pvlh6y4h3ni5m8yli6gp6gps7pcpndag40ckr31302ai3bxvq"; depends=[assertthat htmlwidgets magrittr repr reticulate vegawidget]; }; - altmeta = derive2 { name="altmeta"; version="3.1"; sha256="1ifdy510m5xdvxzpfjrhjqmxgxr9yxki3vivlgzdcry119fhgh6c"; depends=[coda lme4 Matrix metafor rjags]; }; + altfuelr = derive2 { name="altfuelr"; version="0.1.0"; sha256="0k3f4wr9gbn5aig40xg817hrnz2lx8g4adyy18s59fs8dw03v87h"; depends=[dplyr httr jsonlite lubridate magrittr purrr stringr]; }; + altmeta = derive2 { name="altmeta"; version="3.2"; sha256="0z252lbsknqp33i0b0xf5r7spr535iq47bv40vgip6nsqhgrl7b0"; depends=[coda lme4 Matrix metafor rjags]; }; amap = derive2 { name="amap"; version="0.8-18"; sha256="0zpcb73w413na23f6giml9311jh0j0y766w2fh9i40d2h7bbvyvs"; depends=[]; }; + amapGeocode = derive2 { name="amapGeocode"; version="0.5.0"; sha256="0asnp4rcarxqx575g85wxpbv9ymrmm2xqyfm5p96x679xkmfanc6"; depends=[data_table httr jsonlite lifecycle magrittr sjmisc stringr xml2]; }; + amber = derive2 { name="amber"; version="1.0.3"; sha256="0kc7g5rb0wrs1id1k0qay56063gpffwvcll38983b1l3k215mxiv"; depends=[classInt doParallel foreach Hmisc latex2exp ncdf4 raster rgdal rgeos scico sp viridis xtable]; }; ambhasGW = derive2 { name="ambhasGW"; version="0.0.2"; sha256="0v517i4whip45pk6bwlwval9pz367pcgzz62b2z22mrwgi6m6bck"; depends=[raster rgdal yaml]; }; ambient = derive2 { name="ambient"; version="1.0.0"; sha256="0b8nd8g0ydglql2cwi4wmlnv5kyid8q51vz0p08f9m5x73k3z2bd"; depends=[Rcpp rlang]; }; ameco = derive2 { name="ameco"; version="0.2.9"; sha256="0vzwsy7gp17ghl1hgcsbfs9rarzl8dl36x6lplnzrisqv3dqmk25"; depends=[]; }; amelie = derive2 { name="amelie"; version="0.2.1"; sha256="0f4rfijskrw9nmyzbrbz6yfa9d0a5cxjw8n9c36hc6jvh377i7k7"; depends=[]; }; - amen = derive2 { name="amen"; version="1.3"; sha256="1qaznfmnh3dlnp41afd37lr328qzy50hn8hi0c302wj0f992ycqg"; depends=[]; }; + amen = derive2 { name="amen"; version="1.4.4"; sha256="00c4dw6s8yxagbgadvcpw4ima89aqjqgpm3460zi97xwq9404f1d"; depends=[]; }; amerika = derive2 { name="amerika"; version="0.1.0"; sha256="1c0bi0wrc89d0zv0wzmdvka66mcikgi1w4gn1i22mvg5bivhzaqx"; depends=[]; }; aml = derive2 { name="aml"; version="0.1-1"; sha256="09xxlxp784wlb561apns3j8f2h9pfk497cy5pk8wr4hhqqv4d3al"; depends=[lars]; }; ammistability = derive2 { name="ammistability"; version="0.1.1"; sha256="1vp2857cwn4dd86vj8qf6h4z8hh5q2jvrlpmply8bf70mnmnq18h"; depends=[agricolae ggcorrplot ggplot2 Rdpack reshape2]; }; ampd = derive2 { name="ampd"; version="0.2"; sha256="0bi8qngd37n60ym516yjcahxc536vdwm60rq5ld32170hww69j7c"; depends=[]; }; ampir = derive2 { name="ampir"; version="1.0.0"; sha256="081ah5fvfa4f2yj9zigj5b069dr8z8qs6mwb20w08wldlgcy2a5x"; depends=[caret kernlab Peptides Rcpp]; }; - amt = derive2 { name="amt"; version="0.1.2"; sha256="174rxcalr2gb168ccc0wyj4b94hf1x37mrh4r3160xh2wvxgi84z"; depends=[broom checkmate circular ctmm dplyr fitdistrplus FNN geosphere KernSmooth leaflet lubridate magrittr maptools purrr raster Rcpp rgeos rlang sf sp survival tibble tidyr]; }; + amt = derive2 { name="amt"; version="0.1.3"; sha256="0ln08ivhq2s4kcnl2a5h7nlc22z3yvwx5xl45ps1inliddj99y22"; depends=[broom checkmate circular ctmm dplyr fitdistrplus FNN geosphere KernSmooth leaflet lubridate magrittr maptools purrr raster Rcpp Rdpack rgeos rlang sf sp survival tibble tidyr]; }; anMC = derive2 { name="anMC"; version="0.2.2"; sha256="0ab215nrqn535g9ayqzvgdckhwcrij1mc1296pvlj3grn3f8rhws"; depends=[mvtnorm Rcpp RcppArmadillo]; }; anacor = derive2 { name="anacor"; version="1.1-3"; sha256="0mj8g9p4fla0ax9jvcq7kii4lrhj8g872p11nys06anva22qjp51"; depends=[car colorspace fda]; }; - analogsea = derive2 { name="analogsea"; version="0.8.0"; sha256="1naw9qh6rp1hz3mk19jir0qia1daizbfa695qbp1sg6rdh6is8ag"; depends=[httr jsonlite magrittr yaml]; }; + analogsea = derive2 { name="analogsea"; version="0.9.0"; sha256="0bj9b8ylimjyd4pm29h6dc1inbc0h2dxpbxp4sh2cdm5p65ly3cc"; depends=[httr jsonlite magrittr yaml]; }; analogue = derive2 { name="analogue"; version="0.17-5"; sha256="1iq0hdblpg1yb5ciralfxq7as9zwc58237hrzm0n51yb6a9vd1vd"; depends=[brglm lattice MASS mgcv princurve vegan]; }; analogueExtra = derive2 { name="analogueExtra"; version="0.1-1"; sha256="1s3qs10hf6hkna0bicid1mc8x8r449bl93xpgyw6lnsjgh2yx62c"; depends=[analogue rgl vegan3d]; }; analysisPipelines = derive2 { name="analysisPipelines"; version="1.0.2"; sha256="1rxam52wrbcjrvixb35b9ha37i8a0fczby49vmgzpnrbvkc50ldx"; depends=[dplyr futile_logger ggplot2 magrittr pipeR proto purrr RCurl rlang]; }; @@ -5224,56 +5428,59 @@ in with self; { andrews = derive2 { name="andrews"; version="1.0"; sha256="130i86qkdy1xpcf611jpzqgmd17iik7j7spdcfwzk48f31biyp8v"; depends=[]; }; andurinha = derive2 { name="andurinha"; version="0.0.2"; sha256="1cpz16zv3al6lmsqsb7dl5v6kml2a0hg084rbmwa4wsyk5ygl8bm"; depends=[cowplot ggplot2 plyr rlang signal tidyr]; }; anesrake = derive2 { name="anesrake"; version="0.80"; sha256="1p2g51w80jiadlf4asbnsw46asarzlzr5c1yfhdb31ymqxd7p76q"; depends=[Hmisc weights]; }; - anglr = derive2 { name="anglr"; version="0.7.0"; sha256="0yvpixpi3x83a1xjgcvc7khxc91q7n7k21dmf227wcjjj0mbhrdk"; depends=[colourvalues crsmeta dplyr gridBase magrittr palr png polyclip raster reproj rgl rlang RTriangle scales silicate sp terrainmeshr tibble unjoin viridis]; }; angstroms = derive2 { name="angstroms"; version="0.0.1"; sha256="1k8q4pkb5vcjfp2n2dga3q2ydmdxv020k5qzrb6w01ixrgf15d8l"; depends=[nabor ncdf4 proj4 raster sp spbabel]; }; aniDom = derive2 { name="aniDom"; version="0.1.4"; sha256="1h19q3f16g6kacawd2i9i5lg64q436dsbzk9isf3p2mr7p24xbas"; depends=[rptR]; }; anim_plots = derive2 { name="anim.plots"; version="0.2.1"; sha256="0z811y4zzrqas1ynrq4syhxvbcw2girxa6g9biry9d0qgq1w8cp1"; depends=[animation]; }; + animalEKF = derive2 { name="animalEKF"; version="1.1"; sha256="0bq2d2iza0c971731b915cd1k2f7gq2x1k7xv4z91sy73v0jngl5"; depends=[bezier colorspace deldir ellipse ggplot2 HDInterval maptools MASS Matrix MCMCpack mvtnorm plyr png rgdal rgeos shiny sp]; }; animalTrack = derive2 { name="animalTrack"; version="1.0.0"; sha256="0jlvfflpaq64s48sblzh1n1vx8g3870iss97whigri29s6hn79ry"; depends=[rgl]; }; - animaltracker = derive2 { name="animaltracker"; version="0.1.0"; sha256="1c2qx03yawfdcg992l2k3w52r4hfxakd74ws56phbn5c3bm540k9"; depends=[dplyr elevatr forcats geosphere ggplot2 leaflet leaflet_extras lubridate raster rgdal scales shiny shinyBS shinycssloaders shinyjs shinythemes shinyWidgets sp tibble tidyr V8 zoo]; }; + animaltracker = derive2 { name="animaltracker"; version="0.2.0"; sha256="1zv2nj4wfskz1lxfgw8l4gyrlv418drk8zl4cw55i5na6a39shcv"; depends=[dplyr forcats geosphere ggplot2 httr leaflet leaflet_extras lubridate maptools raster rgdal scales shiny shinyBS shinycssloaders shinyjs shinythemes shinyWidgets sp tibble tidyr zoo]; }; animation = derive2 { name="animation"; version="2.6"; sha256="02jv4h9hpp8niw9656r5n36kqr71jbyynxnywkkkdi0aj8w3cach"; depends=[magick]; }; + animint2 = derive2 { name="animint2"; version="2020.9.18"; sha256="17gr43hyb7yx9rsa0id5ibix09sai95pknc75cf31ra72mkpym8m"; depends=[digest gtable knitr lazyeval MASS plyr reshape2 RJSONIO scales tibble]; }; anipaths = derive2 { name="anipaths"; version="0.9.8"; sha256="02d2z236gjh40p29h86ikspnxim49c3c33r4dnf3yzns622ckm2c"; depends=[animation ggmap mgcv raster RColorBrewer scales sp]; }; aniview = derive2 { name="aniview"; version="0.1.0"; sha256="1klakkmdk4xllaxd0pllvxi4396n6rz2idz55niy91mp0fhcjhwf"; depends=[htmltools jsonlite]; }; + anndata = derive2 { name="anndata"; version="0.7.5"; sha256="0gx2j3xggvp3l793km6v8268ib1qks1qgn5fmjjglavwvs2y2xqc"; depends=[assertthat R6 reticulate]; }; anocva = derive2 { name="anocva"; version="0.1.1"; sha256="1byg40jla71k1901js5h9yq89j63d00vkm60id1fxlpv95c4wdrr"; depends=[cluster]; }; anoint = derive2 { name="anoint"; version="1.4"; sha256="10gdqgag9pddvxh80h458gagvv1474g4pcpa71cg3h7g62rqvmv5"; depends=[glmnet MASS survival]; }; - anomalize = derive2 { name="anomalize"; version="0.2.1"; sha256="0fs70zsfawv4326xqnl6xfi4rg6xk3kakgrpyvlqqvfqhw6vx76v"; depends=[cli crayon dplyr ggplot2 glue purrr rlang rstudioapi sweep tibble tibbletime tidyr timetk]; }; - anomaly = derive2 { name="anomaly"; version="3.0.2"; sha256="0zypvgn59ryik6jrasqmhjyfi9ldp6145455nrb7dxfhk1bkp6kg"; depends=[assertive BH cowplot dplyr ggplot2 Rcpp Rdpack reshape2 rlang robustbase]; }; + anomalize = derive2 { name="anomalize"; version="0.2.2"; sha256="13ncx17hdwv7799s7y6p3wvf59dad97y8rs9p56cbd91f6jkjgs5"; depends=[cli crayon dplyr ggplot2 glue purrr rlang rstudioapi sweep tibble tibbletime tidyr timetk]; }; + anomaly = derive2 { name="anomaly"; version="4.0.0"; sha256="08nlmy65qhxr67lywdgf6kvddms6bkfwfrb9s4pjvdgxp0db5gqk"; depends=[assertive BH cowplot dplyr ggplot2 Rcpp Rdpack reshape2 rlang robustbase]; }; anominate = derive2 { name="anominate"; version="0.6"; sha256="01p2qkqf88bzhwywyass5r8dwg2ycflmkbzmsps7fzy0kv3xyb02"; depends=[coda MCMCpack pscl wnominate]; }; + anovir = derive2 { name="anovir"; version="0.1.0"; sha256="1x7lvj7xchbv6siyc9miivmf0rlxrjflal4icyvbxgdr285s2s9w"; depends=[bbmle]; }; + anscombiser = derive2 { name="anscombiser"; version="1.0.0"; sha256="0jpmxgr5hfyv1hcjn4h1063ch3b3xlgqv983f4f9d2ajz5i5mdwv"; depends=[]; }; antaresEditObject = derive2 { name="antaresEditObject"; version="0.1.9"; sha256="09zmhzfdzxpp01wmdk230gff6zwgd5p2w3ppbq3a0df3f56x0hix"; depends=[antaresRead assertthat data_table whisker]; }; antaresProcessing = derive2 { name="antaresProcessing"; version="0.18.0"; sha256="1rw7g4706g4fdx7c7magxqj71h6iwkbslmyrqfwna4irnifjmv7g"; depends=[antaresRead data_table]; }; antaresRead = derive2 { name="antaresRead"; version="2.2.5"; sha256="10c3ql08211ylc271xk8ffnix3pzmnaylgf0ynwayp34hkgkf37h"; depends=[bit64 data_table lubridate plyr shiny stringr]; }; - antaresViz = derive2 { name="antaresViz"; version="0.15.2"; sha256="1a3h3m34k0ihml8g7d90gy4z9ynyyi7dqlafw4frp90wmc8m1r9g"; depends=[antaresProcessing antaresRead assertthat data_table dygraphs geojsonio htmltools htmlwidgets leaflet leaflet_minicharts lubridate manipulateWidget plotly rAmCharts raster rgeos shiny sp spMaps webshot]; }; - anthro = derive2 { name="anthro"; version="0.9.3"; sha256="1jikrb1177j04fwwivw3dcpv1687jdph3l9xmxrbcghww1w0sfbk"; depends=[survey]; }; - anticlust = derive2 { name="anticlust"; version="0.5.0"; sha256="1w5pw6dvbnbfi6acpih9zbpyknl7wxr426kry64qhss25zvjw7a0"; depends=[Matrix RANN]; }; + antaresViz = derive2 { name="antaresViz"; version="0.15.3"; sha256="07a36dfgbf0bq17kqbvb1xm1mxmbhjj4s8mglawq77jksrjprl11"; depends=[antaresProcessing antaresRead assertthat data_table dygraphs geojsonio htmltools htmlwidgets leaflet leaflet_minicharts lubridate manipulateWidget plotly rAmCharts raster rgeos shiny sp spMaps webshot]; }; + anthro = derive2 { name="anthro"; version="0.9.4"; sha256="0blsfz3ckizkg4r4i3ib6b4yh40krcy8133v32f3yc220g2g2za9"; depends=[survey]; }; + anticlust = derive2 { name="anticlust"; version="0.5.6"; sha256="1f5z05p5fwfgcj4vzg6kg9vihamcdha74yyn9c04m4kydyngnm85"; depends=[Matrix RANN]; }; antitrust = derive2 { name="antitrust"; version="0.99.14"; sha256="0mc7mgvhbfw9rp5w9vdd003mhp13pdjhrb8gybmkvan316mwygds"; depends=[BB evd MASS numDeriv]; }; antiword = derive2 { name="antiword"; version="1.3"; sha256="034znb0g9wwb8gi1r3z75v3sbb4mh83qrc4y8mbfx5lbgh8zhj6j"; depends=[sys]; }; anyLib = derive2 { name="anyLib"; version="1.0.5"; sha256="1x9x58hhkkwdskmgdjv94ynh811n9w0752hh4214adl1qpn576vm"; depends=[BiocManager curl devtools httr withr]; }; - anyflights = derive2 { name="anyflights"; version="0.3.0"; sha256="0q4bg287x60al47m66wn9sd1vmldgll4kyrd6dc9m5lf80mp7hmc"; depends=[curl dplyr glue httr lubridate progress purrr readr roxygen2 stringr usethis vroom]; }; - anytime = derive2 { name="anytime"; version="0.3.8"; sha256="1ac92bjhqjvarrr0ddkgiq3hg5vgzj0m87hh2rsvd5x8136iysck"; depends=[BH Rcpp]; }; + anyflights = derive2 { name="anyflights"; version="0.3.1"; sha256="08x4412xbmiisizdiby6b9xkhrlsag9hrmj681wpm6fm2bpk0q6y"; depends=[curl dplyr glue httr lubridate progress purrr readr roxygen2 stringr usethis vroom]; }; + anytime = derive2 { name="anytime"; version="0.3.9"; sha256="0jjpqynai5nd7mfy1smb44356f3d5bmpxhs1i9x9jw5c959c35hh"; depends=[BH Rcpp]; }; aod = derive2 { name="aod"; version="1.3.1"; sha256="1g03ajhs6bid80i83xn3917abhymzgrydqx86wxxpkqga018hb85"; depends=[]; }; aods3 = derive2 { name="aods3"; version="0.4-1.1"; sha256="1kdmgzd5nkzm0awdjls6fc8p9hxsph9ha9k1jxbppdi4i6f0i7rv"; depends=[boot lme4]; }; aof = derive2 { name="aof"; version="0.1.2"; sha256="0552i5wvm04dq8a8y1x36sprc9cbx6k7c3bmsgqxm71dpsxajb0i"; depends=[bcpa]; }; aoos = derive2 { name="aoos"; version="0.5.0"; sha256="0y92vs27i0mkpjdclqzq4j9g1axkymhi3v8xp1v6hazh35yzjkfj"; depends=[magrittr roxygen2]; }; aoristic = derive2 { name="aoristic"; version="1.0.0"; sha256="1qfphg5mh26q832pkh05q50lg60viyiwwcwmsagqb6r64llmysak"; depends=[foreign formattable ggplot2 htmltools lubridate openxlsx plyr]; }; aos = derive2 { name="aos"; version="0.1.0"; sha256="0nkl7dkqjfp4ahwmn3vs0akx6x2brf0m5gzzzx6pf54j1qwypbhf"; depends=[htmltools jsonlite]; }; - apTreeshape = derive2 { name="apTreeshape"; version="1.5-0"; sha256="0mnydk157557pnkjvcadlghn5d8w9kxas4kwz4y4w21xg7z1jrig"; depends=[ape coda cubature pbapply quantreg]; }; + apTreeshape = derive2 { name="apTreeshape"; version="1.5-0.1"; sha256="1wxhfp21ir9yv4wnbh7ay2x05k822nsyd5smlxmk67wm5w4vr1v1"; depends=[ape coda cubature pbapply quantreg]; }; apa = derive2 { name="apa"; version="0.3.3"; sha256="1nvhl5fqramsdrkpl1nmgr1vmki5c1lkdi1kkx7ihf0cz35f7c2a"; depends=[dplyr magrittr MBESS purrr rmarkdown stringr tibble]; }; apaTables = derive2 { name="apaTables"; version="2.0.5"; sha256="0h986jqdl65fd33gfa433ik77r6lm9zrq75qfk5r8xsdgzb4wgva"; depends=[boot broom car dplyr tibble]; }; apaText = derive2 { name="apaText"; version="0.1.1"; sha256="1r217k60w027i63nbj24b1rm37m4qf7a6iirc941s945babkxcmb"; depends=[dplyr]; }; - apc = derive2 { name="apc"; version="1.3"; sha256="1hgkqkvry9is8kjk2w46k637sig7fdznnc75wbrc8bq1hbrmf785"; depends=[lattice]; }; + apc = derive2 { name="apc"; version="2.0.0"; sha256="0vh6iyxm46k8sfa1xgz0y6m619snnm8s072kml5qgiiw5s7bqnpq"; depends=[AER car ChainLadder ggplot2 ISLR lattice lmtest plm plyr reshape survey]; }; apcf = derive2 { name="apcf"; version="0.1.5"; sha256="1drhzk6v8xirjv3371nay3gz1v6wcklhywrzfqn32ibad7n31ph2"; depends=[Rcpp]; }; apcluster = derive2 { name="apcluster"; version="1.4.8"; sha256="0lzf2jqm56i74wif6x5sw3j0w2qc4sni49zq2fgbl89b7lwkvchj"; depends=[Matrix Rcpp]; }; apdesign = derive2 { name="apdesign"; version="1.0.0"; sha256="041zyd7ih9nnj92jj9vb9ya1ij9lmj1dzx64q74vyiadw1ix5l66"; depends=[Matrix]; }; ape = derive2 { name="ape"; version="5.4-1"; sha256="1r7fwyz30ippcl1ibqiv1xryf44x5crcks5kx19h146ffj76qcgh"; depends=[lattice nlme Rcpp]; }; apercu = derive2 { name="apercu"; version="0.2.4"; sha256="046gf4dzypl6mmq7xqkyrdasq9rsjxzsii7w4nxkbn4c40kh7bf7"; depends=[pls]; }; apex = derive2 { name="apex"; version="1.0.4"; sha256="1ddzbzpnc17yvbl5yfyp0widqlx48qwlh80xcmyzhv045s680rdk"; depends=[adegenet ape phangorn]; }; - apexcharter = derive2 { name="apexcharter"; version="0.1.5"; sha256="0p6my3prqzmvxmnd1dfdfryrk9jy0fndadq9fs69fwkxxr37wvz0"; depends=[ggplot2 htmlwidgets jsonlite magrittr rlang shiny]; }; + apexcharter = derive2 { name="apexcharter"; version="0.1.8"; sha256="0mgd3i4hw5vg7lci6cwsyjpnvlw71zx57m7jjif1zm0ck70g5cfv"; depends=[ggplot2 htmlwidgets jsonlite magrittr rlang shiny]; }; aphid = derive2 { name="aphid"; version="1.3.3"; sha256="1jqpn7w5sgy4k49qd9ci6yj89s55gzwl5w5ldw793mzpg6if7lfn"; depends=[kmer openssl Rcpp]; }; aplore3 = derive2 { name="aplore3"; version="0.9"; sha256="0af6klscsxvh4amp519b6r41bzysf61p040fj4l5706bbya1arhw"; depends=[]; }; - aplot = derive2 { name="aplot"; version="0.0.5"; sha256="19z8r1l54k4rjs4pwm0aldg25m973708bxjymkhsa9q832vfkm6y"; depends=[ggplot2 magrittr patchwork]; }; + aplot = derive2 { name="aplot"; version="0.0.6"; sha256="08kqrm9r57l8zgij897wpp428l4i50qfhp7y78r3pk5pjz37bsan"; depends=[ggplot2 magrittr patchwork]; }; aplpack = derive2 { name="aplpack"; version="1.3.3"; sha256="010saim43d3hr83ksi916846rh6qfbb0gvhsf5jbdx95m4bai9g3"; depends=[]; }; - apmsWAPP = derive2 { name="apmsWAPP"; version="1.0"; sha256="1azgif06dsbadwlvv9nqs8vwixp6balrrbpj62khzmv1jvqr4072"; depends=[aroma_light Biobase DESeq edgeR genefilter gtools multtest seqinr]; }; apng = derive2 { name="apng"; version="1.0"; sha256="13hvr1w566anrhdicaqwqjgfq2lk3zkn5gcfgy8zazjnad4vy07y"; depends=[bitops]; }; - apollo = derive2 { name="apollo"; version="0.1.0"; sha256="0i80js5gxz3rj6977iwnm7pi9qgq2iz4h83nz8301ra94g7kjv40"; depends=[coda Deriv maxLik mnormt mvtnorm numDeriv randtoolbox Rcpp RcppArmadillo RcppEigen RSGHB sandwich]; }; + apollo = derive2 { name="apollo"; version="0.2.2"; sha256="1nfc7fcdfl2p5rs2jmwmljl6vmf02sz37rxf7r9yd8ad96326mmb"; depends=[coda Deriv matrixStats maxLik mnormt mvtnorm numDeriv randtoolbox Rcpp RcppArmadillo RcppEigen RSGHB]; }; apple = derive2 { name="apple"; version="0.3"; sha256="194z2f6hwdjjxdkjwlmfhpfp26p9yp3gparklhdbb6zlb4a9nnhz"; depends=[MASS]; }; applicable = derive2 { name="applicable"; version="0.0.1.2"; sha256="0yzfk4ajdx4l3xivf6v9vn7fqvzfma4842cvjixrng83p2v25sdq"; depends=[dplyr ggplot2 glue hardhat Matrix proxyC purrr rlang tibble tidyr tidyselect]; }; appnn = derive2 { name="appnn"; version="1.0-0"; sha256="0wkpr6lcd68wlzk6n622ab7sd99l837073czn4k56hw8bw9v68j3"; depends=[]; }; @@ -5282,38 +5489,38 @@ in with self; { aprean3 = derive2 { name="aprean3"; version="1.0.1"; sha256="17rnq02sncl6rzwyln10200s43b8z1s2j0kdi9kgcb6qr51v12rv"; depends=[]; }; apricom = derive2 { name="apricom"; version="1.0.0"; sha256="1gyd1yln14cn0iswj7sjs4hav6j6d4f3ncps4gqbci5fwha5blcr"; depends=[logistf penalized rms shrink]; }; aprof = derive2 { name="aprof"; version="0.4.1"; sha256="14qclp88j4ygd4vrxxpgy2s9939wcajjsqycdzpvn64ws29sdpvh"; depends=[testthat]; }; - apsimx = derive2 { name="apsimx"; version="1.946"; sha256="1xwa0yhjzdgyrbc3yc4myjfy369gj0ll8y1nml7lfylc57cjdhx3"; depends=[DBI jsonlite knitr RSQLite xml2]; }; + apsimx = derive2 { name="apsimx"; version="1.964"; sha256="11pzk4jhgn576gbsfp0jrz8lzrg34ixw1s15b4mz4m0fw04fcxjw"; depends=[DBI jsonlite knitr RSQLite xml2]; }; apsrtable = derive2 { name="apsrtable"; version="0.8-8"; sha256="1qmm89npjgqij0bh6p393wywl837lfsshp2mv9b5izh1sg2qfwvw"; depends=[]; }; apt = derive2 { name="apt"; version="3.0"; sha256="14njvpf6q34nffm3r9gqcszlabzbydsxqj0ln9nk4mv59izp8sqm"; depends=[car erer urca]; }; apyramid = derive2 { name="apyramid"; version="0.1.2"; sha256="0ws6dfd6v3p9rhpmf06786yl2gaw1h2n1d76a054iap8bvgyahzw"; depends=[dplyr forcats ggplot2 glue rlang scales tidyselect]; }; - aqp = derive2 { name="aqp"; version="1.19"; sha256="1z5qbzhsn79xz17i53hy48xnwf64k5cc24jxwvysyv8p2ylrir0i"; depends=[cluster digest lattice MASS plotrix plyr RColorBrewer reshape scales sp stringr]; }; + aqp = derive2 { name="aqp"; version="1.25"; sha256="1zy5684jx3j4m7ld8cj34kz7gs721mxs2k45n50q0mp5c1mr8kgl"; depends=[cluster lattice plyr reshape sp stringr]; }; ar_matrix = derive2 { name="ar.matrix"; version="0.1.0"; sha256="1d531hkl50szfa1q0zbp8dp1a9jli63kwvxjgc9n0ar279y47qdz"; depends=[MASS Matrix sp sparseMVN]; }; arabicStemR = derive2 { name="arabicStemR"; version="1.2"; sha256="1vflynbi7aln7x2p4jg9gsvfrxn4v6qkb4wbrzxmj561lqy9fcay"; depends=[]; }; - arc = derive2 { name="arc"; version="1.2"; sha256="1advs0aqxh84c5n9akww8cdafh7npgaibrb42wncwhv9nfi7wy1v"; depends=[arules discretization Matrix R_utils]; }; + arc = derive2 { name="arc"; version="1.3"; sha256="0isfa7d26jpj004lf4f06krbfa68zyzrh5431xa63k2dykvg8c5j"; depends=[arules discretization Matrix R_utils]; }; archdata = derive2 { name="archdata"; version="1.2"; sha256="0igh6qy3yv5hzprj9izpkqp3f6jkb7pydqzmnl8sqhqjqvb3lnij"; depends=[]; }; - archetypal = derive2 { name="archetypal"; version="1.1.0"; sha256="1x1642p2l19drp22mi1pci7v3s19j885pkx0s2kn7aawpjfis9nw"; depends=[doParallel geometry inflection lpSolve Matrix plot3D]; }; + archeofrag = derive2 { name="archeofrag"; version="0.6.0"; sha256="09ph3yhwj9kddd4clpd1ykdhhd4zn19y6rj7zaz52c3swa3wwgg0"; depends=[igraph RBGL]; }; archetypes = derive2 { name="archetypes"; version="2.2-0.1"; sha256="0ibxsr173ib77gjhid91m85s8gjii4mi2w3d52q5301igv20p7r0"; depends=[modeltools nnls]; }; archiDART = derive2 { name="archiDART"; version="3.3"; sha256="01fmyp3f26v5rdgi00qyn139fgq55yxz5nhx223hg78qwrrbjvpw"; depends=[geometry gtools rgl sp TDA XML]; }; archivist = derive2 { name="archivist"; version="2.3.4"; sha256="1i11hrcq1910jgd6diw6h3sxx624v57zjianm49pqvb2dvd0b8y7"; depends=[DBI digest flock httr lubridate magrittr RCurl RSQLite]; }; archivist_github = derive2 { name="archivist.github"; version="0.2.6"; sha256="092fzi505vx9xbk41m86d0isxna42iflp7q2kjiqa6z1ccvim2yx"; depends=[archivist digest git2r httr jsonlite]; }; - arcos = derive2 { name="arcos"; version="1.1"; sha256="1zhpbydn3d2fyiy3vfvpm8cr6gvyja8mnzkwdcyjln1vr8kyz5j1"; depends=[dplyr jsonlite magrittr stringr urltools vroom]; }; + arctools = derive2 { name="arctools"; version="1.0.0"; sha256="092nx4v24ib3m2yw9vr24p38227smvvss30dmf98qwi48pnfdr1k"; depends=[lubridate runstats]; }; areal = derive2 { name="areal"; version="0.1.7"; sha256="1kdnf7c21g51mhf428nl5jl96cfrk5iw1npzp5rv5ys3jp2mvhhi"; depends=[dplyr glue purrr rlang sf]; }; arealDB = derive2 { name="arealDB"; version="0.3.4"; sha256="1235j1w2gsv22k6a6zxanxvxx6fj1sifc5nkial883mpgvkbz789"; depends=[checkmate dplyr magrittr readr rlang sf stringr tabshiftr tibble tidyr tidyselect]; }; - areaplot = derive2 { name="areaplot"; version="1.2-1"; sha256="1bmr092pgflgyss50xy1hs5xjl57i2wmfg7qa513sh120fi2mina"; depends=[]; }; + areaplot = derive2 { name="areaplot"; version="1.2.2"; sha256="0vyhf3662ppcahaw2zrxgpcxcn8fysd6lhl8vgr7cs8kl6fm4x47"; depends=[]; }; arena2r = derive2 { name="arena2r"; version="1.0.0"; sha256="14zjpglp389pldi436935fz6mgi4jdgfii1m035nsvihrms9gqkh"; depends=[dplyr ggplot2 magrittr purrr rlang shiny shinyBS shinydashboard shinyjs tidyr]; }; - arenar = derive2 { name="arenar"; version="0.1.8"; sha256="12nyslzcbxr2j9dnc9fpw4fi7dcmbaaand7c9m7qcy9cqvms2dim"; depends=[auditor DALEX gistr iBreakDown ingredients jsonlite plumber]; }; + arenar = derive2 { name="arenar"; version="0.2.0"; sha256="08b865v7ringqzm5m4ib4nrmlyqywir6bjj7alzmg06dy7mrl9s7"; depends=[auditor DALEX fairmodels gistr iBreakDown ingredients jsonlite plumber]; }; arfima = derive2 { name="arfima"; version="1.7-0"; sha256="0kj8qv6m2fcdw8x735n8fk9cynm0jxi5v9hif0f879sxk6qkxb9y"; depends=[ltsa]; }; argo = derive2 { name="argo"; version="2.0.2"; sha256="08ay5rrdra74x97ff4333w6lib92indjh774rsbn24mzc2n140ji"; depends=[boot glmnet Matrix XML xtable xts zoo]; }; argon2 = derive2 { name="argon2"; version="0.2-0"; sha256="0kqn06rpb39jlzizjlnc5c44mfic8llrshxn7ljgmyj35lbqwxqh"; depends=[]; }; argonDash = derive2 { name="argonDash"; version="0.2.0"; sha256="1wykr7y5375g1nb18ynybccxmd948xrr0gdwxxqsfjf782vlgd2d"; depends=[argonR htmltools shiny]; }; argonR = derive2 { name="argonR"; version="0.2.0"; sha256="15hlvansqnky9bnq4r7xza3hb1hzylmhz8117wxz9lxa1wiky2is"; depends=[htmltools rstudioapi]; }; argosfilter = derive2 { name="argosfilter"; version="0.63"; sha256="0rrc2f28hla0azw90a5gk3zj72vxhm1b6yy8ani7r78yyfhgm9ig"; depends=[]; }; - argparse = derive2 { name="argparse"; version="2.0.1"; sha256="1as7h6z7kzgv0fqzpnp76qbm96b4jcd37azd58b7rz0l1n94764l"; depends=[findpython jsonlite R6]; }; + argparse = derive2 { name="argparse"; version="2.0.3"; sha256="1c2r417m1dxk1jhcggv3g4zax5a59k9rqs9jcs6xy2pa2333jqfj"; depends=[findpython jsonlite R6]; }; argparser = derive2 { name="argparser"; version="0.6"; sha256="1pxiz9jlhlnpzqn1lz349r07i7glw708w202x6dlnxp112fg7k4x"; depends=[]; }; ari = derive2 { name="ari"; version="0.3.5"; sha256="03w99c918jp23d0kl26vx4m7xjicpgwl5rhn9d0fsm4kvv7j87li"; depends=[hms progress purrr rmarkdown rvest text2speech tuneR webshot xml2]; }; ariExtra = derive2 { name="ariExtra"; version="0.2.11"; sha256="1gl2r0qksfisv7h27x83b665h7016c6rlff04mgj8iwp29144lch"; depends=[ari docxtractr httr jsonlite magrittr mime pdftools rmarkdown rvest text2speech tuneR xml2 yaml]; }; aricode = derive2 { name="aricode"; version="1.0.0"; sha256="0i6vynhby4sjiaxscjrgrb5d96f307yjr8r9ff1fhv264lydcqwl"; depends=[Matrix Rcpp]; }; - arkdb = derive2 { name="arkdb"; version="0.0.5"; sha256="00ih2in6q0kismpc5jc8w3609nxjkmybx8i19cjlbr93y2zjm29i"; depends=[DBI progress]; }; + arkdb = derive2 { name="arkdb"; version="0.0.8"; sha256="0028bkxjh1iaiqg1cwszwwz3kix59w4zbwhw01yjdz28giavzdzn"; depends=[DBI R_utils rappdirs]; }; arkhe = derive2 { name="arkhe"; version="0.2.2"; sha256="0wfi6wgarjfkni4l1wy863i1cbqsckcw3ar357rkcwz3kks47f6p"; depends=[]; }; arm = derive2 { name="arm"; version="1.11-2"; sha256="1grb27vayr2vhyalzfqbhx6p278r7c3l4pzi5nrz3dmnyqrbx1c3"; depends=[abind coda Hmisc lme4 MASS Matrix nlme]; }; armada = derive2 { name="armada"; version="0.1.0"; sha256="191iwf5y1za3wssawkyi9jcingfqqxcvv88hglpw6j7y3x5f47hf"; depends=[anapuce circlize ClustOfVar ComplexHeatmap doParallel FAMT glmnet impute mvtnorm qvalue VSURF]; }; @@ -5325,9 +5532,9 @@ in with self; { aroma_core = derive2 { name="aroma.core"; version="3.2.1"; sha256="1nc88h7khjabgzyj4nvjkx9dzmic6bhhfskf024yq3rf1d55v09g"; depends=[BiocManager future listenv matrixStats PSCBS R_cache R_devices R_filesets R_methodsS3 R_oo R_rsp R_utils RColorBrewer]; }; arpr = derive2 { name="arpr"; version="0.1.1"; sha256="0j69nbmhmhmyfna011gv68wvxv1x2lijz94pyg9g2ax720x74i2q"; depends=[magrittr]; }; arrApply = derive2 { name="arrApply"; version="2.1"; sha256="0qy7iwi580rrf3sycsbv6qgxsqcdy9pdbnkdrx81j68qni9iw737"; depends=[Rcpp RcppArmadillo]; }; - arrangements = derive2 { name="arrangements"; version="1.1.8"; sha256="03dzvahy8mwp6w1smnbp83zk8w8pfkmsfd1f68bd8jjvdb5lrz71"; depends=[gmp R6]; }; + arrangements = derive2 { name="arrangements"; version="1.1.9"; sha256="0nrlyxgn6667l2rb1q5rvps1anld9aq88qqr3ch2i6zchnqxrdg9"; depends=[gmp R6]; }; arrayhelpers = derive2 { name="arrayhelpers"; version="1.1-0"; sha256="02rl530qxi1idiqpmzg5wr9vl5c7phizhpj64k5pn8xq9zfxbpaz"; depends=[svUnit]; }; - arrow = derive2 { name="arrow"; version="1.0.0"; sha256="1j0n5sapgwim8qk4vrdy9gw4zrsd11a51c50pllk33xnd9p30v3k"; depends=[assertthat bit64 purrr R6 Rcpp rlang tidyselect vctrs]; }; + arrow = derive2 { name="arrow"; version="2.0.0"; sha256="0n9g8j7bis7aga2icc8gd6mv7fnh2d5m7fy62fqs4z69l69y19r8"; depends=[assertthat bit64 cpp11 purrr R6 rlang tidyselect vctrs]; }; ars = derive2 { name="ars"; version="0.6"; sha256="0zs1rk3i7pc9wcvxrvjcls194mfbvmkz7cb6pwd1cm3fzjwsyxsp"; depends=[]; }; arse = derive2 { name="arse"; version="1.0.0"; sha256="0ssaalc058m09gfcr1n0s729rx2plia3zkhlynj67drclyvhyb0i"; depends=[dplyr pracma]; }; arsenal = derive2 { name="arsenal"; version="3.5.0"; sha256="0avi434wkk3w7axd89a4jwsbb11fi0239mkkla6zasnjwbqgjim0"; depends=[knitr]; }; @@ -5339,9 +5546,9 @@ in with self; { arulesViz = derive2 { name="arulesViz"; version="1.3-3"; sha256="1c51l4hqai07qx20lbdvffxw9kx0vkgbccw7b9wz1h2n5ma90c8y"; depends=[arules colorspace DT igraph plotly scatterplot3d seriation vcd visNetwork]; }; asVPC = derive2 { name="asVPC"; version="1.0.2"; sha256="07nfwr0lsfpwgfdgzcdn1svw8dnjfni5ga9q77yjd1bj0wf76ci2"; depends=[ggplot2 plyr]; }; asaur = derive2 { name="asaur"; version="0.50"; sha256="0c1rgic76w3i2xhna7i52lyc0p01s5b1mxyn55gqw6i19v9mq0b3"; depends=[]; }; - asbio = derive2 { name="asbio"; version="1.6-5"; sha256="0ivsn0ilj4f0mlc9cq5lw89xq6n2wxcp7xxr6cb04zfi4hjp4b0r"; depends=[combinat deSolve gWidgets2 gWidgets2tcltk lattice multcompView mvtnorm pixmap plotrix scatterplot3d tkrplot]; }; - ascii = derive2 { name="ascii"; version="2.3"; sha256="0aqkmbp63vf5339r5yn2r5s6h4ghnh06s663j9h570z2jllbv9jk"; depends=[codetools digest survival]; }; - asciiSetupReader = derive2 { name="asciiSetupReader"; version="2.3.1"; sha256="031x6kvzpfh2falzg2qgch2czj74a4mskl8cn83y9rs0shswvmhx"; depends=[data_table haven miniUI readr rstudioapi shiny stringr vroom zoo]; }; + asbio = derive2 { name="asbio"; version="1.6-7"; sha256="08lmb4dmbsavw17z1jqqiv2jin5ms4zq8nv1n1cjmh8xk3sywafw"; depends=[combinat deSolve gWidgets2 gWidgets2tcltk lattice multcompView mvtnorm pixmap plotrix scatterplot3d]; }; + ascii = derive2 { name="ascii"; version="2.4"; sha256="0k675an7sl00bslx4yb6vvvgnp1kl244cfjljv632asqdm3rkmrv"; depends=[codetools digest survival]; }; + asciiSetupReader = derive2 { name="asciiSetupReader"; version="2.3.2"; sha256="13z1zh9xsf8229xiryms704w9klkj6ivxad2df3ns04ar7jy838z"; depends=[data_table haven miniUI readr rstudioapi shiny stringr vroom zoo]; }; asciicast = derive2 { name="asciicast"; version="1.0.0"; sha256="0vga88cq2hzi0bwq43n1yz5cm8kaag9xpg8v73gj06fb93lhha9x"; depends=[curl jsonlite processx tibble uuid V8]; }; asciichartr = derive2 { name="asciichartr"; version="0.1.0"; sha256="1b73bbysnxy3x3gwhm80xry45m18yh716wrc93v1awk3c1p2cv3m"; depends=[]; }; asciiruler = derive2 { name="asciiruler"; version="0.2"; sha256="0xhkbsy9dypk09avazgxczyfkh3rhdxhwci688dw1lxnhxv1hj24"; depends=[stringr]; }; @@ -5352,11 +5559,12 @@ in with self; { asht = derive2 { name="asht"; version="0.9.6"; sha256="0zi0v7v7ivis5v6a8m1vh21c1wymshxcb948amgrq1j6svm505sf"; depends=[bpcp coin exact2x2 exactci perm ssanv]; }; askpass = derive2 { name="askpass"; version="1.1"; sha256="07q0ik8jzk44vpwh48rr3fnpd7dzsdhjjsl4l850rffv3dyq4h6v"; depends=[sys]; }; aslib = derive2 { name="aslib"; version="0.1.1"; sha256="0vzrxxj298skgv6gn9cbhr75ywmh5amsk9m02zncl20jcydf9j91"; depends=[BatchExperiments BatchJobs BBmisc checkmate corrplot ggplot2 llama mlr parallelMap ParamHelpers plyr reshape2 RWeka stringr yaml]; }; - asnipe = derive2 { name="asnipe"; version="1.1.12"; sha256="01k2qr9vpazj4mhz4zpngav31d69qr73i8fc59x8gdbi3ipic7rs"; depends=[MASS Matrix]; }; + asnipe = derive2 { name="asnipe"; version="1.1.13"; sha256="1y7nvbnwymmw8bmq1g431sbyf3lng8aaianc63nx731n4m9rwhm9"; depends=[MASS Matrix]; }; aspace = derive2 { name="aspace"; version="3.2"; sha256="1g51mrzb6amafky2kg2mx63g6n327f505ndhna6s488xlsr1sl49"; depends=[Hmisc shapefiles splancs]; }; aspect = derive2 { name="aspect"; version="1.0-5"; sha256="0pbc0daxw20xcbgqyyd5gbs9kmbaf2dq8ajllx0mnfwdcak9jfgj"; depends=[]; }; aspi = derive2 { name="aspi"; version="0.2.0"; sha256="0rhvxw243vvdv3hxa6pi343gcjc2cbxq1jzqirl9k1l4i3897l87"; depends=[]; }; - asremlPlus = derive2 { name="asremlPlus"; version="4.2-21"; sha256="1dcrh7fxw338h82pccl28hwv9cq0pcy9fs6b9snr4fxlgs146jnh"; depends=[dae doParallel dplyr foreach ggplot2 plyr RColorBrewer reshape stringr]; }; + asremlPlus = derive2 { name="asremlPlus"; version="4.2-26"; sha256="1ayzf5yc07n0gf72xpclv1x5aw6062mlw3nxadywx6l7df08v3if"; depends=[dae doParallel dplyr foreach ggplot2 plyr RColorBrewer reshape stringr]; }; + r_assert = derive2 { name="r_assert"; version="1.0.1"; sha256="0n5l48yb0djl6rdj50p1dslpw3c5kbi15yz6z6rdgic575gjwzdc"; depends=[]; }; assertable = derive2 { name="assertable"; version="0.2.7"; sha256="1npks9rcrnchmd0silq6qrvqkmdkp9fwjkyyvvp1lqjclyxk6vkk"; depends=[data_table]; }; assertive = derive2 { name="assertive"; version="0.3-6"; sha256="02palil82idqhhshcdjsfsja9qkqnd0dczqzj5gbccy4hfg1c0y4"; depends=[assertive_base assertive_code assertive_data assertive_data_uk assertive_data_us assertive_datetimes assertive_files assertive_matrices assertive_models assertive_numbers assertive_properties assertive_reflection assertive_sets assertive_strings assertive_types knitr]; }; assertive_base = derive2 { name="assertive.base"; version="0.0-7"; sha256="1xs3ysvj0z57c58jw57pckq2rynia6ks4rmjmc02alczhk54wbgh"; depends=[]; }; @@ -5376,9 +5584,9 @@ in with self; { assertive_types = derive2 { name="assertive.types"; version="0.0-3"; sha256="0zxq1jfrzgw95ll7alvm0xnk7aihjdksngq4ya2whyvfjbmv4vdb"; depends=[assertive_base assertive_properties codetools]; }; assertr = derive2 { name="assertr"; version="2.7"; sha256="1x868pd4dac1c7b1q5390wqh2f6s50km8nqcpim3nxcj2l4qkqdb"; depends=[dplyr MASS rlang]; }; assertthat = derive2 { name="assertthat"; version="0.2.1"; sha256="17wy5bdfzg73sg2clisg1k3zyn1adkj59x56m5nwia2k8z67zkw5"; depends=[]; }; - assignPOP = derive2 { name="assignPOP"; version="1.2.0"; sha256="1qv600fbzpfi49sx72avcc0y9xnyppbhlchl32xgk3jcwyfk3pxp"; depends=[caret doParallel e1071 foreach ggplot2 MASS randomForest reshape2 stringr tree]; }; + assignPOP = derive2 { name="assignPOP"; version="1.2.2"; sha256="0ws40rrz3zql8xsa0r8hgb81l75isglzsfhnb8jbvig6s9m058yi"; depends=[caret doParallel e1071 foreach ggplot2 MASS randomForest reshape2 stringr tree]; }; assignR = derive2 { name="assignR"; version="1.2.1"; sha256="0xgqim8c5hi34dl76lrmj9nikqcn88wfcjs643a2dx06cmkkj1vi"; depends=[maptools raster rgdal sp]; }; - assist = derive2 { name="assist"; version="3.1.6"; sha256="13r029z32f2xcspafx01jkgmabbjcvnp8wg1wx1liwxh3mf2zalg"; depends=[lattice nlme]; }; + assist = derive2 { name="assist"; version="3.1.7"; sha256="0avxaa3v4gvb5d7fg761f9l5nr8nyqdq6sq408zpyaki6s6q3acf"; depends=[lattice nlme]; }; assocInd = derive2 { name="assocInd"; version="1.0.1"; sha256="16yzgvlqbapjhvzm5nw8vfrhh8mp9llnhck4bpgmszyrh93z1ha5"; depends=[]; }; assortnet = derive2 { name="assortnet"; version="0.12"; sha256="1vyzrb8vsi9pcdn6jd83k77bg0q2a3dwdvlnmxnshqiif2pakb8m"; depends=[]; }; aster = derive2 { name="aster"; version="1.0-3"; sha256="1bcghw30db8m39fqza2msi6ahfn6yx7gaa3fzcmnxb8jrvrlpjgy"; depends=[trust]; }; @@ -5387,15 +5595,17 @@ in with self; { astrochron = derive2 { name="astrochron"; version="0.9"; sha256="14bzyp2927rklx9lfd3bikf5ck8irvr3s7266mh2245lyy79g9xi"; depends=[doParallel fields foreach IDPmisc iterators multitaper]; }; astrodatR = derive2 { name="astrodatR"; version="0.1"; sha256="00689px4znwmlp6qbj6z2a51b7ylx1yrrjpv6zjkvrwpv6lyj9fw"; depends=[]; }; astrolibR = derive2 { name="astrolibR"; version="0.1"; sha256="0gkgry5aiz29grp9vdq9zgg6ss47ql08nwcmz1pfvd0g0h9h75l8"; depends=[]; }; - astsa = derive2 { name="astsa"; version="1.10"; sha256="0j6106zn9jqmygfw34vjz123ag7l10s84br4z5rqjwwy219ak3b7"; depends=[]; }; + astsa = derive2 { name="astsa"; version="1.12"; sha256="00m0hj9b8rvs0l66i5ahr2gyz2zcxwdwhdn9z2hjagmc2zhn9qq1"; depends=[]; }; asus = derive2 { name="asus"; version="1.0.0"; sha256="16hp8xajb631a5amm1cvhzq8z4cwh1vjiavv3n11fzpxyskhmfrb"; depends=[rwt wavethresh]; }; asymLD = derive2 { name="asymLD"; version="0.1"; sha256="1q05pxwn6arpalspgf2m0cym4ivnwyv94i58k9kaihd37kvm5lgc"; depends=[]; }; asymmetry = derive2 { name="asymmetry"; version="2.0.2"; sha256="0x5yzlf804mhwfr9244b04vnixiyh5d8vmqrfffgid3dijg2zszm"; depends=[gplots smacof]; }; asymmetry_measures = derive2 { name="asymmetry.measures"; version="0.2"; sha256="039afqmdir200aijln9q0g3rkahkxqahw6yz5mnw62jsslr9xskb"; depends=[gamlss_dist skewt sn]; }; asympTest = derive2 { name="asympTest"; version="0.1.4"; sha256="02l07psiy1888zx86j2r1l5lznz47wdmzbh39pd2nbj8r9i80szr"; depends=[]; }; + asymptor = derive2 { name="asymptor"; version="1.0"; sha256="0fdib7wnfdb0vjflds68638wafw79i0wvwa5ak8q3f7ywawzngzx"; depends=[]; }; asypow = derive2 { name="asypow"; version="2015.6.25"; sha256="0il38djkmw5ka7czpalmhq6yycx7flpdpgbd7p5nx52rsjdv49mj"; depends=[]; }; - ata = derive2 { name="ata"; version="1.1.0"; sha256="1v14r9g46pi7fjnf59dh8ljpdbsqxhrwr0zryxxza2y0qrxh0902"; depends=[lpSolve]; }; - atable = derive2 { name="atable"; version="0.1.8"; sha256="1l4cfgpkjd33xxxmhbqiy901g1jl4bcs39dk6wvy02dihv6m1id6"; depends=[DescTools doBy effsize Hmisc plyr reshape2 settings]; }; + ata = derive2 { name="ata"; version="1.1.1"; sha256="08wcnfkbcq2al5ivdjkrjr8alaz0026992ra3ihyw6sd74mcracx"; depends=[lpSolve]; }; + atable = derive2 { name="atable"; version="0.1.10"; sha256="1jbpqsyhkkpiwnhwy9alh5s8q68amh0mylyzlc5pilpw0mnq9cjd"; depends=[DescTools doBy effsize Hmisc plyr reshape2 settings]; }; + atakrig = derive2 { name="atakrig"; version="0.9.7"; sha256="1dhzd9cb2w7l8hjrgvvnp160g32gs885c5d9x43ylxypbjxvl96g"; depends=[doSNOW FNN foreach gstat MASS Rcpp rgeos snow sp]; }; atlas = derive2 { name="atlas"; version="1.0.0"; sha256="02wm22j40llmdi6z3rzgbc5fpkzmjfq0xar33bypvj1dx1zxygnd"; depends=[httr testthat]; }; atmcmc = derive2 { name="atmcmc"; version="1.0"; sha256="05k69b5wlysz3kh0yiqvshgvr0nyz34zkvn6bjs30cwz7s9j21pn"; depends=[]; }; atmopt = derive2 { name="atmopt"; version="0.1.0"; sha256="1h79ngq1236gz4w29fs3nj46a3m1x8a28z3xnhc6wn3a46cf8zzi"; depends=[DoE_base gtools hierNet]; }; @@ -5415,16 +5625,18 @@ in with self; { auditor = derive2 { name="auditor"; version="1.3.0"; sha256="1h6k15z3xf8isqqarbah6mz3nabjva4dbrbnf1fjw34idj804jbw"; depends=[DALEX ggplot2 ggrepel gridExtra hnp scales]; }; augSIMEX = derive2 { name="augSIMEX"; version="3.7.4"; sha256="0620yxqi160ar91shl5macn890zpc60c9nqy4w8i6m7sskv6gl3z"; depends=[Formula MASS nleqslv Rcpp]; }; augmentedRCBD = derive2 { name="augmentedRCBD"; version="0.1.3"; sha256="10xp33901i9xczn5gg6pwbcdp4nqbnqhixj4cjhwj8rfn0kjkq7l"; depends=[dplyr emmeans flextable ggplot2 moments multcomp multcompView officer Rdpack reshape2 stringi]; }; - auk = derive2 { name="auk"; version="0.4.1"; sha256="0xrxl8qzmc0dnjn7s32wwrdv1z7v7a4wfpz4vrradfn84vxway30"; depends=[assertthat countrycode dplyr httr magrittr rlang stringi stringr tidyr]; }; + auk = derive2 { name="auk"; version="0.4.3"; sha256="10dvajhxcxx9fdayqyhq5nkfqb1k17xm04gpgahwdhvxx2g74qq6"; depends=[assertthat countrycode dplyr httr magrittr rlang stringi stringr tidyr]; }; aurelius = derive2 { name="aurelius"; version="0.8.4"; sha256="00bpf9sggvnajpmg3zsdgfjinkb6wbrcf1ris7qfhh1rp5rz4m4m"; depends=[gbm glmnet jsonlite]; }; + ausplotsR = derive2 { name="ausplotsR"; version="1.2.1"; sha256="1wblx9x7lnixdb94park2n3rq06hjdxn0cd843dg17814yfd6w8h"; depends=[betapart curl ggplot2 gtools httr jose jsonlite mapdata maps maptools plyr R_utils simba sp vegan]; }; auth0 = derive2 { name="auth0"; version="0.2.1"; sha256="077nqh28q3b9jb25fy0157l06zpx3x0rg4z5dz2dqsh88xy4nhqj"; depends=[htmltools httr shiny shinyjs yaml]; }; auto_pca = derive2 { name="auto.pca"; version="0.3"; sha256="01m2ldpcxzj7fhgmr9wp4ha3gqdyh7l5bkrnw83smcbq5229hsyy"; depends=[plyr psych]; }; autoBagging = derive2 { name="autoBagging"; version="0.1.0"; sha256="01k44rgkpbbr3m2x360aq0fz2qi7nz036g5dsh2y3jy94rmddbyy"; depends=[abind caret cluster CORElearn e1071 entropy infotheo lsr MASS minerva party rpart xgboost]; }; - autoFRK = derive2 { name="autoFRK"; version="1.3.0"; sha256="0mgnjlkrdj0rra98n58vp4ai3knmlla98lh6w5afm7gr0pwvi1px"; depends=[fields filehash filehashSQLite filematrix FNN LatticeKrig MASS mgcv Rcpp RcppEigen RcppParallel RSpectra spam]; }; + autoCovariateSelection = derive2 { name="autoCovariateSelection"; version="1.0.0"; sha256="0s9ar7bmw0n84hvavp63zhm6769l9p88md0kqqcxl0mw67j8q930"; depends=[data_table dplyr purrr]; }; + autoFRK = derive2 { name="autoFRK"; version="1.3.3"; sha256="0pll0s1xbf16a30g965lxajh806wbi8dl6xlyz01pzafwvs8yjph"; depends=[fields filehash filehashSQLite filematrix FNN LatticeKrig MASS mgcv Rcpp RcppEigen RcppParallel RSpectra spam]; }; autoTS = derive2 { name="autoTS"; version="0.9.11"; sha256="1mwpazynp5hdc2ccnhvddkajfcd4qam23pvjl9accq1rnxzxkiyv"; depends=[dplyr forecast ggplot2 lubridate magrittr plotly prophet RcppRoll rlang shiny shinycssloaders tidyr]; }; autocogs = derive2 { name="autocogs"; version="0.1.3"; sha256="1xv2sv5p5pskp7mw9zcgcbwsbfzjiabigld92npd3mzy8n7zdli6"; depends=[broom checkmate diptest dplyr ggplot2 hexbin MASS mclust moments progress tibble]; }; autoencoder = derive2 { name="autoencoder"; version="1.1"; sha256="0ly1aanayk28nx6yqfhl7d0zm4vg6rfjikf5ibn8zhmkrfyflj1y"; depends=[]; }; - autoimage = derive2 { name="autoimage"; version="2.1.12"; sha256="0qgnz66gm738clfchyz0xp8hd0w548c5r7sq1r6p64v8mvf34fhm"; depends=[fields ggplot2 mapproj maps MBA viridisLite]; }; + autoimage = derive2 { name="autoimage"; version="2.2.1"; sha256="0y60smwfhwaf305cj7k2p9959xg8m4h6yrxgxl581dzp7crykbxl"; depends=[colorspace fields ggplot2 mapproj maps MBA]; }; autokeras = derive2 { name="autokeras"; version="1.0.1"; sha256="171q7i1zygzmkm34bi7grx5rvnjwks60ifk4k86kki5aiipzx4d5"; depends=[keras reticulate]; }; automagic = derive2 { name="automagic"; version="0.5.1"; sha256="1mmm6kj6mxrn3s4v8ryszkxr9z7bh9cvhin7xjq111fkwly7wjkq"; depends=[dplyr formatR knitr magrittr purrr remotes yaml]; }; automap = derive2 { name="automap"; version="1.0-14"; sha256="1190kbmp0x80x0hyifdbblb4ijq79kvrfn9rkp5k6diig4v30n0w"; depends=[gstat lattice reshape sp]; }; @@ -5433,14 +5645,15 @@ in with self; { autoplotly = derive2 { name="autoplotly"; version="0.1.2"; sha256="0ajzzj9w9f0v9n37liml63hq5xwkqq53lw85p0a2h99n4lg2hdg8"; depends=[ggfortify ggplot2 plotly]; }; autoshiny = derive2 { name="autoshiny"; version="0.0.2"; sha256="0s06ynnirgsh19x8qq4020piirkhvjqpvz372syygvlal062y6cn"; depends=[shiny]; }; autota = derive2 { name="autota"; version="0.1.3"; sha256="07n34v4lpql5n0y94pm07ywl2z9azjgjrpw7qyfxa6qw6gv71gid"; depends=[base64enc glue httpuv magrittr memoise purrr RJSONIO rlang rlist rstudioapi stringdist stringr xml2]; }; - autothresholdr = derive2 { name="autothresholdr"; version="1.3.6"; sha256="16yzwq6vy78d7zp88j466086493a06v1hf4dn7xvd20igi3lw22r"; depends=[checkmate filesstrings ijtiff magrittr purrr Rcpp rlang stringr]; }; - av = derive2 { name="av"; version="0.5.0"; sha256="0v99y47dsa2z3c4qawipdrzynla2aab3x0c8qzdi5w9r5y9a38sh"; depends=[]; }; + autothresholdr = derive2 { name="autothresholdr"; version="1.3.9"; sha256="0lncasld1pbzkj5sk77qh75y1zjz71g9qvw8y4hf39zqf2prnp72"; depends=[checkmate ijtiff magrittr purrr Rcpp rlang strex stringr]; }; + av = derive2 { name="av"; version="0.5.1"; sha256="19ac9s8d0ah9ialbqv01lq3dma7lxv8s4alyj6iakjjb8z9l7g29"; depends=[]; }; available = derive2 { name="available"; version="1.0.4"; sha256="18dqm10dicbvjd5wli4nkv4fip0fgh2b9h9gm5511ayfsdg8lc8l"; depends=[cli clisymbols crayon desc glue jsonlite memoise SnowballC stringdist tibble tidytext udapi yesno]; }; avar = derive2 { name="avar"; version="0.1.1"; sha256="1i0bk3y0ca58ihwn4di8rpkp5vs2j5b80rcvaf72n9h2hp8i2ncz"; depends=[Rcpp RcppArmadillo simts]; }; averisk = derive2 { name="averisk"; version="1.0.3"; sha256="02j27d4jxgy2bk5sgxp1xdfyqr321civs99qj0g8cp34gwqk0j3m"; depends=[MASS]; }; + avocado = derive2 { name="avocado"; version="0.1.0"; sha256="0qy9ripwydm3f70rpxwk0asc7r25hg8jcbrr4rz8bxs93q1lsz8x"; depends=[]; }; aweek = derive2 { name="aweek"; version="1.0.1"; sha256="0z2n003qg1565kanacw82i5bj33hjgbkp0glj20blwxgc3c7q25y"; depends=[]; }; - aws = derive2 { name="aws"; version="2.4-3"; sha256="0ccm8ffjf8bylhfr64j9wzi49hzigz4bs172pvkb0bi4d5vdr0l5"; depends=[awsMethods gsl]; }; - aws_alexa = derive2 { name="aws.alexa"; version="0.1.7"; sha256="0k3kwkmi13j2nrkyi6ahpc98s24idx4m5s4wkqkgqhi8xaljpp7c"; depends=[aws_signature dplyr httr xml2]; }; + aws = derive2 { name="aws"; version="2.5"; sha256="1mwg1q7l4a07g5aa9c6kh3fpl9lakk01pbzlk7ixbpy12yfvj9nm"; depends=[awsMethods gsl]; }; + aws_alexa = derive2 { name="aws.alexa"; version="0.1.8"; sha256="0m1i1xgi9fqixq90ai2ag0079aa75nlyhbr3ln3yhk5g8zx9i9m9"; depends=[aws_signature dplyr httr xml2]; }; aws_comprehend = derive2 { name="aws.comprehend"; version="0.2.1"; sha256="0qn4mkdd17c8kmrm4ml7l1x3rzaw3gbykhrj3m0ga53crcqdhqri"; depends=[aws_signature httr jsonlite]; }; aws_ec2metadata = derive2 { name="aws.ec2metadata"; version="0.2.0"; sha256="1lbljg2fp3yh1hwlbmprkc1prw80jv0ycvpg1vggagm68wm5x288"; depends=[curl jsonlite]; }; aws_iam = derive2 { name="aws.iam"; version="0.1.8"; sha256="1p4w50icfw6mrzr6aazdbh977yvyvsf1yavjscyvv11xf3y9f9j2"; depends=[aws_signature httr jsonlite xml2]; }; @@ -5452,11 +5665,11 @@ in with self; { aws_transcribe = derive2 { name="aws.transcribe"; version="0.1.3"; sha256="1nni1b935i2ir67lfhcj0106vzr310mk2jvln32gvzbnqxcggz7m"; depends=[aws_signature httr jsonlite]; }; aws_translate = derive2 { name="aws.translate"; version="0.1.4"; sha256="1x6cvpfddgwywsji4ywygmqn3pwy3i1aci9lk4nsrrfkzggwcbpb"; depends=[aws_signature httr jsonlite]; }; awsMethods = derive2 { name="awsMethods"; version="1.1-1"; sha256="0hbmrcpdyg15zg4rysscsmxpxlpy0dkxx2aa63qibq7l1k14v4sh"; depends=[]; }; - awsjavasdk = derive2 { name="awsjavasdk"; version="0.2.0"; sha256="1461h565il4y68g0a3k7wgn9jyb6pys8405f780ldg6g44aa7p60"; depends=[assertthat R_utils rappdirs rJava]; }; - aziztest = derive2 { name="aziztest"; version="0.1.0"; sha256="0ida4n8dxliq3i1mhjknr5zn0vglfdp4mcg1frz423vds0grzdcn"; depends=[]; }; - azuremlsdk = derive2 { name="azuremlsdk"; version="0.6.85"; sha256="16w4gispm3sk48zaw1mi0qxg3qgkpy995p6rak7liqkndqfpzh7s"; depends=[DT ggplot2 htmltools plyr reticulate rstudioapi servr shiny shinycssloaders]; }; + aziztest = derive2 { name="aziztest"; version="0.2.1"; sha256="0rpnyrb7zi42l1fc8ni0r5d0y6a4dr56917z8i54mv1jrk4hijjd"; depends=[]; }; + azuremlsdk = derive2 { name="azuremlsdk"; version="1.10.0"; sha256="0s64kjrmcdnjdwh5mdm5vxgvrl9ghvfv6bair7qfzz32jlab99m0"; depends=[DT ggplot2 htmltools plyr reticulate rstudioapi servr shiny shinycssloaders]; }; b6e6rl = derive2 { name="b6e6rl"; version="1.1"; sha256="17scdskn677vaxx1h2jypqaffvjgczryplg17nr3wigi1x0cxg7a"; depends=[]; }; bPeaks = derive2 { name="bPeaks"; version="1.2"; sha256="1z6jghcmw0lwv17ms7gdp5zzimaawq3ahbwkxa4062g373592smd"; depends=[]; }; + bRacatus = derive2 { name="bRacatus"; version="1.0.1"; sha256="0miw6bsylfnbsmvjgscl4xzjbwsz43pgq38gaz54nb4vlrcxn9a1"; depends=[data_table geojsonio jsonlite maptools plotfunctions raster rgbif rgeos rworldmap sp]; }; bReeze = derive2 { name="bReeze"; version="0.4-3"; sha256="17nc6qvw9l6sq8knd1mk193md2y3z1jlcjymqzl389yxj8s0i2il"; depends=[lubridate]; }; bSims = derive2 { name="bSims"; version="0.2-1"; sha256="024k9s42a9w5pmw024b15sj5ilcfpkm7lv59yimjicr9lmw246kb"; depends=[deldir intrval MASS mefa4 pbapply]; }; bWGR = derive2 { name="bWGR"; version="1.6.6"; sha256="1m5spafvl5pn0s60vaf8wz7iaibsa7laq7kp8y9xj20pp3f76hvr"; depends=[Rcpp]; }; @@ -5465,22 +5678,23 @@ in with self; { babar = derive2 { name="babar"; version="1.0"; sha256="13j5klrcnd4dwrgdbxlvwcj56l9mzi4j9ga6jj5i04pgdc6vsfx5"; depends=[]; }; babel = derive2 { name="babel"; version="0.3-0"; sha256="1iwvx69051yhlxbcl6bypvc3mcih0q8bf3i29r3i79356hp12xqa"; depends=[edgeR]; }; babelwhale = derive2 { name="babelwhale"; version="1.0.1"; sha256="0mgkg9hji4mab3l33vvyyyc1d2q84l1zrmg63vr3b3gr0d62jcnl"; depends=[crayon dplyr dynutils processx purrr]; }; - babette = derive2 { name="babette"; version="2.1.4"; sha256="03bbd8qlymg6qfz60yprb8xyqix6ag532a9iv043s72ir9nkf1jp"; depends=[beastier beautier mauricer phangorn remotes stringr testit tracerer xml2]; }; + babette = derive2 { name="babette"; version="2.2"; sha256="0gbbx2awdml3z3wsgj7zsbqnfbvng5lmba5cl358xkz5q621cy9d"; depends=[beastier beautier mauricer phangorn remotes stringr testit tracerer xml2]; }; + babsim_hospital = derive2 { name="babsim.hospital"; version="11.5.14"; sha256="0w86psi062gk2i512dpj2a8fd6cfzixmrqvh5il5cbqii23bkahr"; depends=[data_table dplyr ggplot2 golem igraph lubridate markovchain padr reshape2 rvest scales simmer slider SPOT xml2]; }; babynames = derive2 { name="babynames"; version="1.0.0"; sha256="1vchzyk5pkr0zhh1q8k9g771n45jxiislipwkgrgamv7yzr49xsp"; depends=[tibble]; }; bacistool = derive2 { name="bacistool"; version="1.0.0"; sha256="1hby2bmxbc8qgjzgkp2flv89lpzzvg3vr7s98989ayjmv4vgmqaf"; depends=[rjags]; }; backShift = derive2 { name="backShift"; version="0.1.4.3"; sha256="1dhmq51w07vcqlngsb04ip0wqbgqq2xdfdm1w82r082f07ywqb16"; depends=[clue ggplot2 igraph MASS matrixcalc reshape2]; }; - backbone = derive2 { name="backbone"; version="1.2.1"; sha256="1ax6agxiwsckga2hasg0dmyx1fxkr6c4f1xcx9s9b3sljpap7ga7"; depends=[CVXR igraph Matrix network Rcpp]; }; + backbone = derive2 { name="backbone"; version="1.2.2"; sha256="0h6da62ryjzfvfg1n89fj25400v8j012py9shhprss085j923bl4"; depends=[CVXR igraph Matrix network Rcpp]; }; backpipe = derive2 { name="backpipe"; version="0.2.3"; sha256="12k2cv9x8h0b002m9c8g4vj5a7chp4b8jqz377ia0diqw89dydpm"; depends=[]; }; - backports = derive2 { name="backports"; version="1.1.8"; sha256="1irc9c23hwliwkky1b3hi0dkzwalhb7zgjj08562ff1k8dqv4qf6"; depends=[]; }; + backports = derive2 { name="backports"; version="1.2.1"; sha256="1mf2nz78l97lbxyagv55bcxrny51ds8g28h307cfa1g3ayylp0x2"; depends=[]; }; backtest = derive2 { name="backtest"; version="0.3-4"; sha256="1s0mf247dz2vvyf4m3sp9xiqhv7xcs4rphyg9gdcy73060sah2ad"; depends=[lattice]; }; bacondecomp = derive2 { name="bacondecomp"; version="0.1.1"; sha256="1sd6pbhmx8vxz5c2cvvadbjy7p15y91gzs3n0ish7h5br1vq8fpm"; depends=[]; }; bacr = derive2 { name="bacr"; version="1.0.1"; sha256="14zr1v4rihx0ra3x0vsb81vsz0g8gzskkdxkg7nhiz835hp2fiy8"; depends=[MCMCpack]; }; badgecreatr = derive2 { name="badgecreatr"; version="0.2.0"; sha256="0mdixklaxky5gs8zm99ky280vxxlbq1mxnaarq6x0d1cb71bzv4l"; depends=[git2r]; }; - badger = derive2 { name="badger"; version="0.0.8"; sha256="1kcyx8792al9cia2b3cvvv9gh5mpgb3s7w73dvbmjwhrlnif6qv0"; depends=[desc dlstats rvcheck]; }; + badger = derive2 { name="badger"; version="0.0.9"; sha256="0414ynf26apxwgzcwk104dj52j9dbwm475n3s20k4cx471h18xbd"; depends=[desc dlstats rvcheck]; }; baggedcv = derive2 { name="baggedcv"; version="1.0"; sha256="1rqs4sm6g1anck5s2dxlm1vcmylpphcbs2dpvf1sjki5lrzdq9z4"; depends=[doParallel foreach kedd mclust]; }; baggr = derive2 { name="baggr"; version="0.4.0"; sha256="1cbajifb4gavamj46zs9vk6ihhg6wnv2hn75452bdc2mc4ingn5n"; depends=[bayesplot BH crayon forestplot ggplot2 gridExtra Rcpp RcppEigen rstan rstantools StanHeaders testthat]; }; - baguette = derive2 { name="baguette"; version="0.0.1"; sha256="1n8fjac9jha3g48w1iddqrh54gd4lzv1bs3f747y6jasp99y3vg7"; depends=[butcher C50 dials dplyr earth furrr generics hardhat magrittr parsnip purrr rlang rpart rsample tibble tidyr withr]; }; - bahc = derive2 { name="bahc"; version="0.2.0"; sha256="0n57zcm257c01cdyhsy5si36h3yz9b8nwixx46r27f0xzrzdryl2"; depends=[fastcluster matrixStats]; }; + baguette = derive2 { name="baguette"; version="0.1.0"; sha256="0yjy0ba3a1r39b7l5igjyzf6v5gfyb4ll6mvd7wskzvnr0gyaq9n"; depends=[butcher C50 dials dplyr earth furrr generics hardhat magrittr parsnip purrr rlang rpart rsample tibble tidyr withr]; }; + bahc = derive2 { name="bahc"; version="0.3.0"; sha256="0yz0v33fhm38ivhr7bvajk9v7wdmhg9qg7ac8r2qr00rns82m6y3"; depends=[fastcluster matrixStats]; }; bain = derive2 { name="bain"; version="0.2.4"; sha256="15car9j11s0ywss13g5swf1dxjjc91xmbkvx200mivca9bj6245m"; depends=[lavaan]; }; baitmet = derive2 { name="baitmet"; version="1.0.1"; sha256="02ydakqr8v41hdnhcsgigwnic8d48qswryg1srb5w1fqdmdglnkl"; depends=[erah HiClimR Rcpp signal XML]; }; balance = derive2 { name="balance"; version="0.2.4"; sha256="13ksd1ysd2by8qdc3vn1fgnaj1c2v0py7f501bajiyq6hpcwn1c5"; depends=[ggplot2]; }; @@ -5498,10 +5712,10 @@ in with self; { bapred = derive2 { name="bapred"; version="1.0"; sha256="08kvc4cc984jv08ikwbja8zxidrcdiwi5w88hlqakbm8yc6hzssa"; depends=[affy affyPLM Biobase FNN fuzzyRankTests glmnet lme4 MASS mnormt sva]; }; barcode = derive2 { name="barcode"; version="1.1"; sha256="14zh714cwgq80zspvhw88cs5b82gvz4b6yfbshj9b7x0y2961nxd"; depends=[lattice]; }; barplot3d = derive2 { name="barplot3d"; version="1.0.1"; sha256="182kpiknv3id1bsgcc6b3ahbxmm8x3lxcpf1r6rckpr3s0whfx3g"; depends=[rgl]; }; - barsurf = derive2 { name="barsurf"; version="0.5.0"; sha256="1pfy4l3cg1dzn17rxgh2lhdfm34wzd2wvhbvc7n46gqplghrpa7h"; depends=[colorspace kubik]; }; + barsurf = derive2 { name="barsurf"; version="0.6.1"; sha256="1qhmzhj4c1qbgafhq6j4rrmc51bh1ymm42vsl2wxwklyfs7qwl66"; depends=[colorspace kubik]; }; bartBMA = derive2 { name="bartBMA"; version="1.0"; sha256="15syk5a3lgzfyp17wk8mk14317yxsr47br26kyah5jg3dq4cyqdg"; depends=[BH mvnfast Rcpp RcppArmadillo Rdpack]; }; bartCause = derive2 { name="bartCause"; version="1.0-4"; sha256="1a1g4376l31pswxmmipm0xm3zazm1kfm3iwknjx6pchjavjhin9y"; depends=[dbarts]; }; - bartMachine = derive2 { name="bartMachine"; version="1.2.5.1"; sha256="17bxpynwyaa1j5a1smn1k4yb6ygr3fi6xlqdvh05z7q36432013j"; depends=[bartMachineJARs missForest randomForest rJava]; }; + bartMachine = derive2 { name="bartMachine"; version="1.2.6"; sha256="0zw42ffgyx08skl00a428f7gylby2rm8i0jpv6b1md557l1w06jy"; depends=[bartMachineJARs missForest randomForest rJava]; }; bartMachineJARs = derive2 { name="bartMachineJARs"; version="1.1"; sha256="1wpfzrb6mrx3xmxy4rgnwygmpqq2l4ki2xqr4m51g1bl9nwirhzj"; depends=[rJava]; }; basad = derive2 { name="basad"; version="0.2.0"; sha256="1qc2amkrjrgdqys275p82lmbpjszm5rzjdpri7hqc9d8b8q1vc9q"; depends=[Rcpp RcppEigen rmutil]; }; base_rms = derive2 { name="base.rms"; version="1.0"; sha256="0lsbbcvmq5n3dpqic9qkyr8wdbmagaw32qfdnl0ck5b6ijh2wz0a"; depends=[do rms survival]; }; @@ -5510,13 +5724,13 @@ in with self; { base64enc = derive2 { name="base64enc"; version="0.1-3"; sha256="13b89fhg1nx7zds82a0biz847ixphg9byf5zl2cw9kab6s56v1bd"; depends=[]; }; base64url = derive2 { name="base64url"; version="1.4"; sha256="0n1c2b68vza1dh7sk38v6biiwm72c4jpl79kpdg1bsb0hq9qy18x"; depends=[backports]; }; baseballDBR = derive2 { name="baseballDBR"; version="0.1.2"; sha256="0w54g1avcqamc12lmvjchlqbqck9jfjccm441k03nsql460mpydq"; depends=[dplyr magrittr rvest xml2]; }; - baseflow = derive2 { name="baseflow"; version="0.12.0"; sha256="0zz7clrqifxk0igvqr38ic8sif86nli8gp8np8nfx89md2zz1njk"; depends=[airGR]; }; + baseflow = derive2 { name="baseflow"; version="0.12.1"; sha256="17ggwgkz36cq6pp88vfa24gfrwsvgmv5vizp5mqaqrssqji0vsgy"; depends=[airGR]; }; basefun = derive2 { name="basefun"; version="1.0-7"; sha256="1g72g77yzf6ji4aglm4hpaqbz5ma2d6y93g7r17066iwyzl0ygn3"; depends=[Matrix orthopolynom polynom variables]; }; - baseline = derive2 { name="baseline"; version="1.3-0"; sha256="1qdzdcz2417slrp7qw8dh76lyvk266jzdqhff05bdalwnk8dxxbc"; depends=[limSolve SparseM]; }; + baseline = derive2 { name="baseline"; version="1.3-1"; sha256="1spmp8z0hrb6db0r52i16524cp9zy1d1hr4y3b3i9q38m1iskpms"; depends=[limSolve SparseM]; }; basetheme = derive2 { name="basetheme"; version="0.1.2"; sha256="0yck4qc7qd406s7kw95xgnfc0pfvzk3ylhkv6mk6l2wbkfm8ldrb"; depends=[]; }; - basf = derive2 { name="basf"; version="0.1.0"; sha256="0v4hhgg8qq4hdih22i3akrjpc4xjnwi81968nyfcv00gy8fd5gjv"; depends=[sf tibble]; }; - basicMCMCplots = derive2 { name="basicMCMCplots"; version="0.2.5"; sha256="0sdvhm7n9n67gwymv7whk6f6lfgp74gczisqw90096la566ndd2f"; depends=[]; }; - basicTrendline = derive2 { name="basicTrendline"; version="2.0.3"; sha256="10rq9hriyn50b28ikvl0vsvchbkrc0pjzxamq4ix1xd04n4drkl9"; depends=[investr scales]; }; + basf = derive2 { name="basf"; version="0.2.0"; sha256="0l3y5p51jic3b8h1jclhhma4myll1g3vsxr8rj0dx1bvjfimkryw"; depends=[raster sf tibble]; }; + basicMCMCplots = derive2 { name="basicMCMCplots"; version="0.2.6"; sha256="057w8xzr0d3jvphhsq55ph9ck5hf4kiihfj57xbbyqx8biyfrjhc"; depends=[]; }; + basicTrendline = derive2 { name="basicTrendline"; version="2.0.5"; sha256="0402nvm3i32sx3m3c7r74iaj22h570v819yiwkraicjpmg55dghi"; depends=[investr scales]; }; basicspace = derive2 { name="basicspace"; version="0.24"; sha256="1cy226njbax7dcgql89fns4l4w9fq328x3h0vb93l5jk883jgi8h"; depends=[]; }; basictabler = derive2 { name="basictabler"; version="0.3.1"; sha256="1yrrg0mgxfqrn068ggx7b5xqj8wccigb5x6aya2hw3b035cbfprs"; depends=[dplyr htmltools htmlwidgets jsonlite R6]; }; basket = derive2 { name="basket"; version="0.10.2"; sha256="0d3qp1p11w9warl4cd9icnygqyiarm6vzsnph2hl09lmsqbghahl"; depends=[cli crayon dplyr foreach GenSA ggplot2 ggraph gridExtra igraph itertools RColorBrewer tibble tidygraph tidyr]; }; @@ -5526,15 +5740,16 @@ in with self; { batch = derive2 { name="batch"; version="1.1-5"; sha256="0wdgfvk2i542cqg34ikvzwlix09f2jyjb32a0f4zh9vg9nrywswq"; depends=[]; }; batchmeans = derive2 { name="batchmeans"; version="1.0-4"; sha256="0b2npqxrv08zxj59sahj5s87inhl6dyl10bj01v0l1yr14q5g546"; depends=[]; }; batchscr = derive2 { name="batchscr"; version="0.1.0"; sha256="094l2cq7lcdrlsdmsxmbal7srxdg20rxbms46h1sd414wq26d413"; depends=[]; }; - batchtools = derive2 { name="batchtools"; version="0.9.13"; sha256="02bwfinwgn5nl638997javig61jmr0ci0qybmprz13jnvmam1yns"; depends=[backports base64url brew checkmate data_table digest fs progress R6 rappdirs stringi withr]; }; + batchtools = derive2 { name="batchtools"; version="0.9.14"; sha256="1b78r70gm4a0wzjr367hqx2rfphfkbppp14d0l5zs2fvyz166lsx"; depends=[backports base64url brew checkmate data_table digest fs progress R6 rappdirs stringi withr]; }; batman = derive2 { name="batman"; version="0.1.0"; sha256="0ccgx506p4iri23k2ikb8jmh04dp08w66785bv52iy8kd359h43f"; depends=[Rcpp]; }; batteryreduction = derive2 { name="batteryreduction"; version="0.1.1"; sha256="0j838q7063bplkzd50kmnxji80cgysfsq7m1qifv8z7a2zsh8c8g"; depends=[pracma]; }; baycn = derive2 { name="baycn"; version="1.2.0"; sha256="1ykz1brs3mz94n86d5qaq25vf24j5adyzpddxqmn7qklbxxr6fh5"; depends=[egg ggplot2 gtools igraph MASS]; }; bayefdr = derive2 { name="bayefdr"; version="0.1.0"; sha256="1c40jvdhbc23yvqiidjgs2f0p3mp3zw9wq0ap1d91if99p6him7n"; depends=[assertthat ggplot2 reshape2]; }; - bayes4psy = derive2 { name="bayes4psy"; version="1.2.3"; sha256="0f8rlivqc36x15c16dybpqgankhc73gcn206yhnr7nyb896nfnl0"; depends=[BH circular cowplot dplyr emg ggplot2 mcmcse metRology Rcpp RcppEigen reshape rstan rstantools StanHeaders]; }; + bayes4psy = derive2 { name="bayes4psy"; version="1.2.5"; sha256="0lvbp41icr0njyfk87vw2ald8zpmp0gvjabpwaiq2h1km1527yic"; depends=[BH circular cowplot dplyr emg ggplot2 mcmcse metRology Rcpp RcppEigen reshape rstan rstantools scales StanHeaders]; }; bayesAB = derive2 { name="bayesAB"; version="1.1.2"; sha256="0xg29s3h4dy43snlc365q80ix96hwh4mfy1qvv87yys3i9zfinm5"; depends=[ggplot2 Rcpp rlang]; }; bayesCT = derive2 { name="bayesCT"; version="0.99.3"; sha256="0ragig1x34syhsnbnd58l2s7g23j7fb0cl9wkasvxq8cicw5hqgn"; depends=[bayesDP dplyr magrittr purrr survival]; }; bayesDP = derive2 { name="bayesDP"; version="1.3.3"; sha256="0g2kw8rsa9s5ahvsr4j363nqs4s49pmbaxgsqrlg8nizjsmj8p49"; depends=[ggplot2 MCMCpack Rcpp RcppArmadillo survival]; }; + bayesGAM = derive2 { name="bayesGAM"; version="0.0.1"; sha256="072q3kybnxjwc4s6qlww492cg43cr4zk6midyp5av7y3hnxbmqm8"; depends=[bayesplot BH boot cluster corrplot geometry ggplot2 gridExtra loo MASS mlbench Rcpp RcppEigen RcppParallel rstan rstantools SemiPar StanHeaders]; }; bayesGARCH = derive2 { name="bayesGARCH"; version="2.1.5"; sha256="01lmpi659cisr7rixz8khaxzyvkvdkvcxjj37x3lw7dpf4ir2535"; depends=[coda mvtnorm]; }; bayesImageS = derive2 { name="bayesImageS"; version="0.6-0"; sha256="1m0az3z8hwaxpqd1ljly9vlp41dp7c7p39r0rx7k9vcs201vlcg8"; depends=[Rcpp RcppArmadillo]; }; bayesLife = derive2 { name="bayesLife"; version="4.1-0"; sha256="1sswnwv4x77sd07d3hpsf3wfd5szrdnc4fni8glzl8rk3y0r3jns"; depends=[bayesTFR car coda data_table hett wpp2019]; }; @@ -5547,64 +5762,66 @@ in with self; { bayesbio = derive2 { name="bayesbio"; version="1.0.0"; sha256="08qa4lzkrcwin7n3kzfqfdlnlqahdmjl1lxpdh29n780cgyjfvs0"; depends=[]; }; bayesboot = derive2 { name="bayesboot"; version="0.2.2"; sha256="0976ryd0gbw3kpmxg2qxyp1m2swnrpa86vdhvqrqxp7fcrs8cs2z"; depends=[HDInterval plyr]; }; bayesbr = derive2 { name="bayesbr"; version="0.0.0.1"; sha256="0f2sy2m417fzznlp2k2ag2xj6jdn027gibsi0cxhlk189pxxfxri"; depends=[BH coda dplyr fdrtool Formula ggplot2 loo magrittr Rcpp RcppEigen RcppParallel rstan rstantools StanHeaders stringr tidyr]; }; - bayescopulareg = derive2 { name="bayescopulareg"; version="0.1.2"; sha256="15arqmjy99rqaywna643l6grl3zlkvygz2hkmhlrjpr35mqd0kw1"; depends=[Rcpp RcppArmadillo RcppDist]; }; + bayescopulareg = derive2 { name="bayescopulareg"; version="0.1.3"; sha256="0jzj1iwd8g1kpypg6dl3anhay7kjvznfkyzri3sdf538s6vr88m5"; depends=[mvtnorm Rcpp RcppArmadillo RcppDist]; }; bayescount = derive2 { name="bayescount"; version="0.9.99-5"; sha256="0c2b54768wn72mk297va3k244256xlsis9cd6zn6q5n1l7ispj6j"; depends=[coda rjags runjags]; }; - bayesdfa = derive2 { name="bayesdfa"; version="0.1.3"; sha256="1jgk1m49aksc2l04qf6k1vddaj6byxbf5vk259i0wcyb76zw785y"; depends=[BH dplyr ggplot2 loo Rcpp RcppEigen reshape2 rlang rstan rstantools StanHeaders]; }; + bayesdfa = derive2 { name="bayesdfa"; version="0.1.6"; sha256="1syghmscp3fyak8kcvdvhsp3c6qp8yd044ycrmglmy4whny2iwl7"; depends=[BH dplyr ggplot2 loo Rcpp RcppEigen reshape2 rlang rstan rstantools StanHeaders]; }; bayesdistreg = derive2 { name="bayesdistreg"; version="0.1.0"; sha256="04slvxzbqdi2ak3dlw4lfx55rhw28js8yjmvjpy8vvgq39vcx3dq"; depends=[MASS sandwich]; }; bayesianETAS = derive2 { name="bayesianETAS"; version="1.0.3"; sha256="0nbif0b6lcik2kh948zg5ska5mvkdsfr0dg8ndnfpscm2mp7y1dg"; depends=[]; }; bayeslincom = derive2 { name="bayeslincom"; version="1.0.0"; sha256="16wy946c05hq6bfn3h364s597wipzwxvdbpq8j2ja0rcsq5x9vw3"; depends=[ggplot2 lifecycle]; }; - bayeslm = derive2 { name="bayeslm"; version="0.8.0"; sha256="1gvqkbz1wmqkxjwkdgj5pir5j1qy5dzjm4jv6mz3mplm16z5vzbl"; depends=[coda Rcpp RcppArmadillo RcppParallel]; }; bayesloglin = derive2 { name="bayesloglin"; version="1.0.1"; sha256="0j2ziahf6mwsz2gvb1azvdzlmszlpqgr5zqcqa68pxgq947sa2cs"; depends=[igraph]; }; bayeslongitudinal = derive2 { name="bayeslongitudinal"; version="0.1.0"; sha256="0g45ikpnbry1albb3asrzab5z3sy98yf74c64qn02d65xgafifwg"; depends=[LearnBayes MASS mvtnorm]; }; bayesm = derive2 { name="bayesm"; version="3.1-4"; sha256="154glks7rsjkza0sfi1kj7wj727py9sl1ba6sswflwmwc9n226q6"; depends=[Rcpp RcppArmadillo]; }; - bayesmeta = derive2 { name="bayesmeta"; version="2.5"; sha256="1dvprpmrqnwxhsxb4h972rx7mww6r6w7y5mjw7wm4p1pddzdhqyc"; depends=[forestplot metafor]; }; + bayesmeta = derive2 { name="bayesmeta"; version="2.6"; sha256="1wg736y4ccicradwaglx3x9bqkbq6v4qrza6zmqdm3f8f8css9j1"; depends=[forestplot metafor numDeriv]; }; bayesmix = derive2 { name="bayesmix"; version="0.7-4"; sha256="1qms1nnk2nq3gqr8zf2b9ri4wv8jrxv5i8s087k1rwdvya3k5r9a"; depends=[coda rjags]; }; + bayesmove = derive2 { name="bayesmove"; version="0.1.0"; sha256="1ldccziayhf8hd9kjbrg7xr50b7cqay4annbym3x5180h7zkh7qc"; depends=[dplyr furrr future ggplot2 lubridate magrittr MCMCpack progress purrr Rcpp RcppArmadillo rlang tictoc tidyr]; }; bayesplot = derive2 { name="bayesplot"; version="1.7.2"; sha256="0aqy4bfjq1fmds0vpacsmqih528cp8wk4v4w0balzkph6zqzpwcl"; depends=[dplyr ggplot2 ggridges glue reshape2 rlang tibble tidyselect]; }; bayespref = derive2 { name="bayespref"; version="1.0"; sha256="0gwlzs7qkgmf90np7xv85d27jjqggyhfj00vpya664a2znyjb3jm"; depends=[coda lattice MASS MCMCpack RColorBrewer]; }; bayesreg = derive2 { name="bayesreg"; version="1.1"; sha256="12g5sklip3i8fpzrhvbikhgnl6kx8fxb88hfv8f34jy71r3h7zyp"; depends=[pgdraw]; }; bayess = derive2 { name="bayess"; version="1.4"; sha256="0axipk5hn2hw3g4dfh7y3xa0dxqmi8kqpbr77nl14y7ydpija6xm"; depends=[combinat gplots MASS mnormt]; }; bayest = derive2 { name="bayest"; version="1.4"; sha256="1ax1z5aw0irpr5qmfscvbssrz58ablx0nkl0d9fx51f2g1cwm65n"; depends=[MCMCpack]; }; - bayestestR = derive2 { name="bayestestR"; version="0.7.2"; sha256="1c82bpxg2ha93rna4sy9pdp422dnk6b378dcg8x04clfg0y0lsi2"; depends=[insight]; }; + bayestestR = derive2 { name="bayestestR"; version="0.8.0"; sha256="11mxnpqc85y13wf8mnnrh0k8d3jqdsr99hkv4cgvwav38qpvjhhw"; depends=[insight]; }; bayesvl = derive2 { name="bayesvl"; version="0.8.5"; sha256="1gb2in8hjiqb3daqz6phn1639i6p2w641kxrm3zh4rm3d6hg6hzr"; depends=[bayesplot bnlearn coda dplyr ggplot2 reshape2 rstan StanHeaders viridis]; }; bayfoxr = derive2 { name="bayfoxr"; version="0.0.1"; sha256="1295296mbjpmd0bg1pfxvyp0az3sry6gsq9ir3l8x64w5a4qrzd5"; depends=[]; }; baymedr = derive2 { name="baymedr"; version="0.1.0"; sha256="0y01s6dpnhnxqqvl15cdxmb5ysb685bbp47xifyp5nz8sjh2pci0"; depends=[rlang stringr]; }; baystability = derive2 { name="baystability"; version="0.1.0"; sha256="1zv4bf5a4p21w2qpr6lcsgsxb0xv15v8p33031rsypmnbs9i80dp"; depends=[dplyr ggfortify ggplot2 lme4 magrittr MASS matrixStats reshape2 rlang rstiefel scales tibble tidyr tidyverse]; }; - baytrends = derive2 { name="baytrends"; version="1.2.1"; sha256="05vd748wp72dnlc5p1higwlvxpyk2pq2xhcl2i58fy3pky2bxsg5"; depends=[dataRetrieval digest gdata lubridate memoise mgcv plyr survival XML zCompositions]; }; + baytrends = derive2 { name="baytrends"; version="2.0.2"; sha256="07dkc9v5w6f4g5md1qgrsk2sy8sn6aaq9m1bm9810gswks6mlflq"; depends=[dataRetrieval digest lubridate memoise mgcv plyr survival XML]; }; bazar = derive2 { name="bazar"; version="1.0.11"; sha256="1q2w5pvlb51lzbb5k719sf1lrhffandkfqlcvi2prw4dmq7qjxv9"; depends=[kimisc]; }; bbefkr = derive2 { name="bbefkr"; version="4.2"; sha256="1wjx652w3p41sq71a2zdzmb7frjxm6xvcgrc2ark2spwb0lbjjw6"; depends=[]; }; bbemkr = derive2 { name="bbemkr"; version="2.0"; sha256="015c57s8mpimm82nddnh382wlkisxgdmc2hvp7k38pcnqxc5gb5q"; depends=[MASS]; }; bbl = derive2 { name="bbl"; version="0.3.1"; sha256="1a6f5744xwn28qkqxlc5q7crarlx0jjg4z7wpp7jwr6ar152apvm"; depends=[pROC RColorBrewer Rcpp]; }; bbmle = derive2 { name="bbmle"; version="1.0.23.1"; sha256="0p3l9shbr2846qmw8n0fyzf4j7gmi08aypl82jml3dwh26q1whk0"; depends=[bdsmatrix lattice MASS Matrix mvtnorm numDeriv]; }; bbo = derive2 { name="bbo"; version="0.2"; sha256="19xrbla3bb3csg3gjjrpkgyr379zfwyh293bcrcd6j8rnm6g4i01"; depends=[]; }; - bbotk = derive2 { name="bbotk"; version="0.2.0"; sha256="1yrcbpynqh3hfj6zf2czfb12spid9gwfq6anzmvbpj7jg5a394ri"; depends=[checkmate data_table lgr mlr3misc paradox R6]; }; - bbreg = derive2 { name="bbreg"; version="1.0.0"; sha256="1v2m7ky9kd16psm9w8njfjzkwc4prvyq0fgbl6i210pjwwv9zvhr"; depends=[betareg expint Formula statmod]; }; + bbotk = derive2 { name="bbotk"; version="0.2.2"; sha256="06iz6gyymcxkbjiw049v1dk3vjfni646z247q08i2s0x59sqfqxv"; depends=[checkmate data_table lgr mlr3misc paradox R6]; }; + bbreg = derive2 { name="bbreg"; version="2.0.1"; sha256="0wixhqfw8yp37874zwqb4vwi9xrzlkb761lbw7h70bds0dy6jcg5"; depends=[expint Formula pbapply statmod]; }; bbricks = derive2 { name="bbricks"; version="0.1.4"; sha256="1hv4hvnns9vgl6c3n7kg3g9mfcp26ksps29hdl5nwi28cgkx80w2"; depends=[]; }; - bbsBayes = derive2 { name="bbsBayes"; version="2.3.3.2020"; sha256="1zxr93n17svv7ca09gkn7w3j1i1llwilx3nvfsaq57p7qh47mjah"; depends=[dplyr geofacet ggplot2 ggrepel jagsUI latticeExtra progress rappdirs rgdal sbtools sf stringr]; }; + bbsBayes = derive2 { name="bbsBayes"; version="2.3.5.2020"; sha256="02fnj9935i611znj50d4cyilzh69kwqfynhh0irwkvnsc1v1470w"; depends=[dplyr geofacet ggplot2 ggrepel jagsUI latticeExtra progress rappdirs rgdal sbtools sf stringr]; }; bbw = derive2 { name="bbw"; version="0.1.3"; sha256="1z3an561qh0rfi3jhh1ghsdbg8aimqmf4hpqri2jz39in3p0gwg4"; depends=[car]; }; bc3net = derive2 { name="bc3net"; version="1.0.4"; sha256="15dghd0v1s71h77iw8b49v5h7wcda5mb4540lfyibsdipbashv2h"; depends=[c3net igraph infotheo lattice Matrix]; }; bcROCsurface = derive2 { name="bcROCsurface"; version="1.0-4"; sha256="0bhwwr9pa78a8lhjz2cfbm09jq585p89l6dr2ihpil4q5r8cmsjr"; depends=[boot nnet Rcpp RcppArmadillo rgl]; }; bcTSNE = derive2 { name="bcTSNE"; version="0.10.0"; sha256="1109kgrrpizhg7j1wbkk6f84hsw89xk2l6vwxpjpg6rh50z3bfi6"; depends=[RSpectra Rtsne]; }; bcaboot = derive2 { name="bcaboot"; version="0.2-1"; sha256="0wf1igkb0lidz4pvh3kfccs9858m1g9650wprrvrpwsdfrcd7rc9"; depends=[]; }; bcc = derive2 { name="bcc"; version="1.3.1"; sha256="0ac0wasdifd0v47r9sxrsix5hv7masiphn6dyxpqdrd11z7iimgz"; depends=[qcc]; }; - bcdata = derive2 { name="bcdata"; version="0.2.0"; sha256="11sgc0k05pjp3ip923mrwzjr86hnikqdkbma6vj7bymxhh9il5bz"; depends=[cli crul dbplyr dplyr glue jsonlite leaflet leaflet_extras purrr readr readxl rlang sf tibble tidyselect xml2]; }; + bccp = derive2 { name="bccp"; version="0.1.0"; sha256="142aszl8cvikb9ni0n7jc7bi1nfc5rf67vy1a6ind3g3iz931bgb"; depends=[pracma]; }; + bcdata = derive2 { name="bcdata"; version="0.2.1"; sha256="0k0vrh02chkziyq6pvn745n1ncnzxklzsxq1dmy4221zvg8khjsg"; depends=[cli crul DBI dbplyr dplyr glue jsonlite leaflet leaflet_extras purrr readr readxl rlang sf tibble tidyselect xml2]; }; bcf = derive2 { name="bcf"; version="1.3"; sha256="1f8szjgsyhnff3zzmmy7bnsam12ywj46n3fxsj1y3fn1m5wnd8mz"; depends=[Rcpp RcppArmadillo]; }; bcfrailph = derive2 { name="bcfrailph"; version="0.1.0"; sha256="0l5v3bc8xw71cj012sbmq1f0glg7m545jzqyg01gzl8kbgm3lbbj"; depends=[survival]; }; + bcfrailphdv = derive2 { name="bcfrailphdv"; version="0.1.0"; sha256="06xzz5m4s5fp36j3saxmpw1p0bhh42cjd35cadwkk3vg836kj1na"; depends=[bcfrailph survival]; }; bcgam = derive2 { name="bcgam"; version="1.0"; sha256="1dg2fcjw8xal77irviiz260qpar2iqkjvi2k4qfm71jyq0ir0axk"; depends=[coda igraph nimble]; }; bcmaps = derive2 { name="bcmaps"; version="0.18.1"; sha256="11gj4f0qqgcvyri8zsnfzk02y9xyiwkfy18wahrg4zrpb4ai78zp"; depends=[httr rappdirs sf]; }; bcmixed = derive2 { name="bcmixed"; version="0.1.4"; sha256="0am6amk1axfxkxgp9nmfys4fp4snplfncwkzh02im7a6zr3v1m63"; depends=[MASS nlme]; }; bcp = derive2 { name="bcp"; version="4.0.3"; sha256="0vhs89lb2wpanqsljclpvwbjmgdsc3jicws8bzqiqh8mbs3nzpxy"; depends=[Rcpp RcppArmadillo]; }; bcpa = derive2 { name="bcpa"; version="1.1"; sha256="0rwbd39szp0ar9nli2rswhjiwil31zgl7lnwm9phd0qjv8q0ppar"; depends=[plyr Rcpp]; }; bcpmeta = derive2 { name="bcpmeta"; version="1.0"; sha256="02fw1qz9cvr7pvmcng7qg7p04wxxpmvb2s8p78f52w4bf694iqhl"; depends=[mvtnorm]; }; + bcr = derive2 { name="bcr"; version="0.1.1"; sha256="0ahd1y73sn45ygvklq22790kf2x8ciw672qrpjnq9mai4ica8y1c"; depends=[httr jsonlite]; }; bcrm = derive2 { name="bcrm"; version="0.5.4"; sha256="1j8bfa3x7h77vs41k4nqbqlb961szp1fkhc181wzb3zpbnzmjhhy"; depends=[ggplot2 knitr mvtnorm rlang]; }; bcrypt = derive2 { name="bcrypt"; version="1.1"; sha256="1wwdin8x09y8n8zrwj1ylh5ikcz0v0la4wmrsvbdr61cg336wzx4"; depends=[openssl]; }; - bcv = derive2 { name="bcv"; version="1.0.1"; sha256="0yqcfariw9sw0b8cpljcr7vf5rf0cwr1wbif23icchfaxk2m42gj"; depends=[]; }; + bcv = derive2 { name="bcv"; version="1.0.1.1"; sha256="18knmzri856kkwcc224b33vz9526r3y6j3ii4wj3qwc6f3c52s05"; depends=[]; }; bdDwC = derive2 { name="bdDwC"; version="0.1.15"; sha256="0yraq8a0wgz12rzi2dx0gdcz5rx99qd2pzw972wjqyq3rs41pwx0"; depends=[shiny shinyBS shinydashboard shinyFiles shinyjs]; }; - bda = derive2 { name="bda"; version="15.0.2"; sha256="1by3xhx1z44fp1kqx380f6hysfq2w7y9ajpsz0wygiwlricn9gd9"; depends=[]; }; + bda = derive2 { name="bda"; version="15.1.7"; sha256="0di21yahkyj6hrjpij3pr2545lgzzdkk6byxmahxc6pcp6l9y2yl"; depends=[]; }; bdchecks = derive2 { name="bdchecks"; version="0.1.7"; sha256="1pzsvn1m1f9bdmhxmh57pvn9jm4z41rkvv6h60hq2lfgkapnjy7q"; depends=[bdDwC data_table DT finch knitr rgbif shiny shinyBS shinydashboard shinyjs spocc yaml]; }; bdclean = derive2 { name="bdclean"; version="0.1.15"; sha256="14cy8yaqd6bg2zyh2wvndydk9sigaydavxl4cfypqz5kqdhj82z9"; depends=[bdchecks bdDwC data_table DT finch knitr leaflet rgbif rmarkdown shiny shinydashboard shinyjs spocc]; }; bde = derive2 { name="bde"; version="1.0.1"; sha256="1f25gmjfl58x4pns89abfk85yq5aad3bgq9yqpv505g5gxk62d3v"; depends=[ggplot2 shiny]; }; - bdots = derive2 { name="bdots"; version="0.1.19"; sha256="1cj6ly62d50z6713119hadl90cxf5x30wpnpx6mssmd49zds6nxb"; depends=[doParallel doRNG foreach Matrix mvtnorm nlme]; }; - bdpar = derive2 { name="bdpar"; version="2.0.0"; sha256="0vn53pzr8j3jdl03jzcyjgf0n486l472jm3mm92df3219733l2wi"; depends=[magrittr pipeR purrr R6 rlist]; }; + bdpar = derive2 { name="bdpar"; version="3.0.0"; sha256="128s13nrr0djcwxj55y5xdfrzq5gbq9czmvgmdbfjzpshjhndi0k"; depends=[digest R6 rlist]; }; bdpopt = derive2 { name="bdpopt"; version="1.0-1"; sha256="1z7mdqklw3frsdzyhvx8s8wvblwm28fr1gca2yrivqjng0r47lx4"; depends=[coda rjags]; }; bdpv = derive2 { name="bdpv"; version="1.3"; sha256="0wcnmamqrbqwskgv2yhnxq2kb179n63c825y9hsl20rfca0ijh6m"; depends=[]; }; bdribs = derive2 { name="bdribs"; version="1.0.4"; sha256="19qakmdw3l8vfxkr4p1ydkyfs4cmq37lqzw7l5zx5rdn6zlhqwh4"; depends=[rjags]; }; @@ -5620,18 +5837,19 @@ in with self; { beanplot = derive2 { name="beanplot"; version="1.2"; sha256="0wmkr704fl8kdxkjwmaxw2a2h5dwzfgsgpncnk2p2wd4768jknj9"; depends=[]; }; beanz = derive2 { name="beanz"; version="2.4"; sha256="18i4ygz83l60fdfkl4yg9kp5n2vmqn6yd7qkpkiplq0mzg5s4nk9"; depends=[BH loo Rcpp RcppEigen rstan rstantools StanHeaders survival]; }; beast = derive2 { name="beast"; version="1.1"; sha256="0ikbnzdzp2lv1nh5mxxanra81v4dl6svg3ywqcqd6wgzri70a4ry"; depends=[RColorBrewer]; }; - beastier = derive2 { name="beastier"; version="2.1.3"; sha256="1c7n4piai36dll4bpy5q0cv1x8qwqyaz8x9gg2m9rzwk9ask3aby"; depends=[ape assertive beautier phangorn pryr rappdirs remotes rJava stringr xml2]; }; + beastier = derive2 { name="beastier"; version="2.2.1"; sha256="004lvqiaggpvvypqgjklydv7cfxbf4wgv9sldlxgg01pszp4c8dg"; depends=[ape assertive beautier phangorn pryr rappdirs remotes rJava stringr xml2]; }; beats = derive2 { name="beats"; version="0.1.1"; sha256="1vg8h2lyn61lii346pf3b5vwxf5cfswmi4b5mmimvgx1ix2i6sxb"; depends=[dplyr ggplot2 lubridate purrr readr shiny zoo]; }; - beautier = derive2 { name="beautier"; version="2.3.7"; sha256="0fy77fqbz33rykn04130gam66hv9kbr8jw5ir4269g0cm09miv61"; depends=[ape assertive pryr rappdirs seqinr stringr testit]; }; + beautier = derive2 { name="beautier"; version="2.4"; sha256="0wd9k1faw604mbgsp6bkp85cqd0plprcc35wxwrqp6zi78p2qga8"; depends=[ape assertive pryr rappdirs seqinr stringr testit]; }; bedr = derive2 { name="bedr"; version="1.0.7"; sha256="0zpqvyjgwyqawxm8qrhcv8zq2b3yxgcqkkc87br29yrl7sjb8h6j"; depends=[data_table R_utils testthat VennDiagram yaml]; }; beepr = derive2 { name="beepr"; version="1.3"; sha256="061sfld23b516jws4llml0a4jsdk4z74rll4z58l2rvahkqsdrfp"; depends=[audio stringr]; }; beeswarm = derive2 { name="beeswarm"; version="0.2.3"; sha256="0hy89bwv7jixlg91li1fywa77916am2whqp1m1fx1khd45g44581"; depends=[]; }; beezdemand = derive2 { name="beezdemand"; version="0.1.0"; sha256="1i6p36cfvz87k6llpibklmdbjb7vp1v38ijxaqkmv1jzc28sj3cl"; depends=[ggplot2 nlmrt nls2 nlstools reshape2]; }; + befproj = derive2 { name="befproj"; version="0.1.1"; sha256="194kicmfxamy061zx0ljmvrlh8gm56fcmhj1j2qfrihklpab4xhx"; depends=[dplyr]; }; beginr = derive2 { name="beginr"; version="0.1.7"; sha256="1a1lzjmq0qimm8yrb4n6knh23gyqxgax60n95rih95sg34904d0m"; depends=[cranlogs]; }; - behaviorchange = derive2 { name="behaviorchange"; version="0.2.2"; sha256="1xqvlybfmgpr0dg0ys6yjshlghgph6zg81d3bbx8cpbxdysm8lkl"; depends=[BiasedUrn data_tree DiagrammeR DiagrammeRsvg ggplot2 googlesheets gridExtra gtable magrittr png ufs viridis yum]; }; + behaviorchange = derive2 { name="behaviorchange"; version="0.2.4"; sha256="197x6nhfvm6ac4ik3lhwyj0wp4ww9gy3xc13j988fr0rfnb293cb"; depends=[BiasedUrn data_tree DiagrammeR DiagrammeRsvg ggplot2 googlesheets gridExtra gtable magrittr png ufs viridis yum]; }; behavr = derive2 { name="behavr"; version="0.3.2"; sha256="01ny099m2zmvlalwiq3nqkgynnxn1mdspch15lkawwd40q8s9s4p"; depends=[data_table]; }; belex = derive2 { name="belex"; version="0.1.0"; sha256="1563yngc1lvncmx3h6kgsj1r6k3hvxidh6h9rb7apxs2rq5k32ms"; depends=[XML]; }; - belg = derive2 { name="belg"; version="1.4.0"; sha256="1ayk4ajk06bism934xclcikv4ccwr93l86zil63sy2739qypw706"; depends=[raster Rcpp RcppArmadillo]; }; + belg = derive2 { name="belg"; version="1.4.1"; sha256="0ql1hir834hljr58gbi4gxgf939dnd7rpmyp1pxkg0042in4h0p0"; depends=[raster Rcpp RcppArmadillo]; }; bellreg = derive2 { name="bellreg"; version="0.0.1"; sha256="17a0ac5ab9yblkl3cwv9vf1l6s027r34n4lqw9fs8bfs1inxbn9p"; depends=[BH extraDistr Formula magic MASS numbers Rcpp RcppEigen Rdpack rstan rstantools StanHeaders]; }; bench = derive2 { name="bench"; version="1.1.1"; sha256="1ldqmf0anwgw6b9jgy5mnnjjncayc1x54pvjm6f5gqv0225ksdw3"; depends=[glue pillar profmem rlang tibble]; }; benchden = derive2 { name="benchden"; version="1.0.5"; sha256="1cwcgcm660k8rc8cpd9sfpzz66r55b4f4hcjc0hznpml35015zla"; depends=[]; }; @@ -5649,10 +5867,10 @@ in with self; { betaboost = derive2 { name="betaboost"; version="1.0.1"; sha256="1zdyzxl2kp2i5lkiz280wz4av9wqklbn25zmq6n4yb6a579yjfn8"; depends=[gamboostLSS mboost]; }; betacal = derive2 { name="betacal"; version="0.1.0"; sha256="19wgpgf9yhckl9qx9v24f4yh055wfalphcxwm7lg68px6ap2pxl9"; depends=[]; }; betafam = derive2 { name="betafam"; version="1.0"; sha256="1nf5509alqnr5qpva36f1wb7rdnc084p170h91jv89xvzsidqxca"; depends=[]; }; - betafunctions = derive2 { name="betafunctions"; version="1.2.0"; sha256="0jz5cxbi1zd9y7xvazlanwp2pj6j9msdbby1n1nxrbbzix65ks6z"; depends=[]; }; + betafunctions = derive2 { name="betafunctions"; version="1.4.2"; sha256="0gag9hslqz3sa8sb4fr85gds6km5z9r8flmhs6gsgn224iamjf94"; depends=[]; }; betalink = derive2 { name="betalink"; version="2.2.1"; sha256="1wskr8nh1jzcrnc8fn58lscphsvj5z9p1i1pnpfdjn60mdb09rkp"; depends=[igraph plyr stringr]; }; - betapart = derive2 { name="betapart"; version="1.5.1"; sha256="0j72rfvnn0ag6vxp8nw5v68n3qblyp5gd0y8z1kchs4dbq1v288g"; depends=[ape fastmatch geometry picante rcdd]; }; - betaper = derive2 { name="betaper"; version="1.1-1"; sha256="0ids2k783lrrf376nfccflzp3alrq15ym484ixjcnxxz84ncmmcl"; depends=[vegan]; }; + betapart = derive2 { name="betapart"; version="1.5.2"; sha256="176q4zqid38hjarvislf8xchc2sh5bd3rwpd837lniz36idms6k8"; depends=[ape doParallel fastmatch foreach geometry itertools picante rcdd]; }; + betaper = derive2 { name="betaper"; version="1.1-2"; sha256="0gh5xjimg0wgv626g3y34mvgrji2aylnm89iwadg7d6g4s457ynp"; depends=[vegan]; }; betareg = derive2 { name="betareg"; version="3.1-3"; sha256="0ik2qydr75dwaphw35l1myi50fbkw43zmkarrw8jsj8nqmz3h6fc"; depends=[flexmix Formula lmtest modeltools sandwich]; }; betategarch = derive2 { name="betategarch"; version="3.3"; sha256="0hqvyps3lwix2fkzk18wrkhxpqhgardvib9sq1ip8gn8sn1dsi8y"; depends=[zoo]; }; bethel = derive2 { name="bethel"; version="0.2"; sha256="1zlkw672k1c5px47bpa2vk3w2906vkhvifz20h6xm7s51gmm64i0"; depends=[]; }; @@ -5661,28 +5879,32 @@ in with self; { bezier = derive2 { name="bezier"; version="1.1.2"; sha256="1vw5128v8h973xwa1fdm9cw2jvrldj87nd55lddlp3qsz3ag4br6"; depends=[]; }; bfast = derive2 { name="bfast"; version="1.5.7"; sha256="0n75minka55rxpvs3qkj0c65ydn1gc3i8lkr2gdyn1adjkl5yn01"; depends=[forecast raster sp strucchange zoo]; }; bfp = derive2 { name="bfp"; version="0.0-41"; sha256="0v3fcsg9lq6j18igvknmlws9m4mp0xh3k3y01ghk85zpzikby2r3"; depends=[Rcpp]; }; - bfsMaps = derive2 { name="bfsMaps"; version="0.9.4"; sha256="0pb081kpmf7040r99szhg7ppvb21cvc9k9bq6lhglinb8wxad9g8"; depends=[DescTools maptools rgdal rlang sp spdep]; }; + bfsMaps = derive2 { name="bfsMaps"; version="0.9.6"; sha256="0k3bwda32j0rfdkzddqf81mpaa1z73cm05xh19psa51vgrbn9gg9"; depends=[DescTools maptools rgdal rgeos rlang sp spdep]; }; bfsl = derive2 { name="bfsl"; version="0.1.0"; sha256="1hl53nis8bb1ffgkx91ij9vh680cpkb80y548y67y9w18iyd4aw4"; depends=[]; }; bfw = derive2 { name="bfw"; version="0.4.1"; sha256="1dwl6p70wbgippysl7vk8nv6rc78f6h5xl8fna98zv99qf0ib31c"; depends=[coda MASS runjags]; }; bgeva = derive2 { name="bgeva"; version="0.3-1"; sha256="0qm4xknyab8hdyn3in2hsvm8s062cnmqqf41b5jvax1mi5hs0z8c"; depends=[magic mgcv trust]; }; + bggAnalytics = derive2 { name="bggAnalytics"; version="0.1.1"; sha256="1bkyq11wv2hhb5f34668b2ii19kp5ah4jg38lynrxc8y3b7q1kbp"; depends=[assertthat data_table pryr R6 rvest stringr xml2]; }; bggum = derive2 { name="bggum"; version="1.0.2"; sha256="04vr9z81awavkhk3lbi8yasmi242lrbnq0pzqp38xlrn5xkf8b1w"; depends=[Rcpp RcppDist]; }; bgmfiles = derive2 { name="bgmfiles"; version="0.0.6"; sha256="10qldfjjq5fx5jrrakdxc8k2pf0vp8ifg18nq56lvx9n28mqigim"; depends=[]; }; bgmm = derive2 { name="bgmm"; version="1.8.4"; sha256="1r8qd4niah18jg0lw3vqq1465likal5j7nvlgnblpidd5svn4a2n"; depends=[car combinat lattice mvtnorm]; }; bgsmtr = derive2 { name="bgsmtr"; version="0.7"; sha256="17706qims9637ppwg0vszkcm6kmvhzyrdihkgigpiv5lknhk2q3m"; depends=[CholWishart coda EDISON glmnet inline LaplacesDemon Matrix matrixcalc miscTools mnormt mvtnorm Rcpp sparseMVN statmod]; }; bhm = derive2 { name="bhm"; version="1.16"; sha256="097vfpqkkbgps9wkabc1k18fa5vv0shbn1jz6g5l96xv96nvx93w"; depends=[coda ggplot2 MASS survival]; }; bhpm = derive2 { name="bhpm"; version="1.7"; sha256="0fhk2gmghibf7la864dzm19bm76525gzbj03vw0y0zwbv9shbpcp"; depends=[coda]; }; + biClassify = derive2 { name="biClassify"; version="1.0"; sha256="1jawds4b0793k3kv7apa2xscqmzbx9fxmbdkqjz1lk1kykcv7m8n"; depends=[DAAG expm fields MASS Matrix mvtnorm Rcpp RcppArmadillo]; }; biasbetareg = derive2 { name="biasbetareg"; version="1.0"; sha256="1562zdin0y5mrp36ih11ir3h9cv49cx1l98chxd89fkj8x3c1fbg"; depends=[betareg]; }; bib2df = derive2 { name="bib2df"; version="1.1.1"; sha256="0d57883df774qqwpssmly3f1gci32yc5sgwc3x8f2rjih23s1nf6"; depends=[dplyr httr humaniformat stringr]; }; - bibliometrix = derive2 { name="bibliometrix"; version="3.0.2"; sha256="0xf7c31a24mvpzhv6a3byib117b9wzrvkn3fp92kyqv7xqqnh34l"; depends=[dimensionsR dplyr DT factoextra FactoMineR ggplot2 ggraph ggrepel igraph Matrix networkD3 pubmedR RColorBrewer rio rscopus shiny shinycssloaders shinythemes SnowballC stringdist stringr tidyr]; }; - bibtex = derive2 { name="bibtex"; version="0.4.2.2"; sha256="140hkjzdp3033cvji861rd06z1ixgpnn4n5amygqsmhnixk8ff07"; depends=[stringr]; }; + bibliometrix = derive2 { name="bibliometrix"; version="3.0.3"; sha256="1jqcpwxzccn19rwvcq5k6fbyxqj4fbyq09k3lidij6ff648415a3"; depends=[dimensionsR dplyr DT factoextra FactoMineR ggplot2 ggraph ggrepel igraph Matrix networkD3 pubmedR RColorBrewer rio rscopus shiny shinycssloaders shinythemes SnowballC stringdist stringr tidyr]; }; + bibliometrixData = derive2 { name="bibliometrixData"; version="0.1.0"; sha256="0fdfgqsfiq3iacj4vb3bvx98waqzqxdsn2ds8wq86a30lm055d7n"; depends=[]; }; + bibtex = derive2 { name="bibtex"; version="0.4.2.3"; sha256="0vdwx6808r73pk15263f33bkqbfmb08d8jkmr4d7h4ml414ikbbv"; depends=[stringr]; }; biclique = derive2 { name="biclique"; version="1.0.5"; sha256="1fdf2r1jc2x8yw0fcw7yyjdxz4b870w6y7mr68qixqxwpl6943zq"; depends=[]; }; biclust = derive2 { name="biclust"; version="2.0.2"; sha256="1pk7mvwlg4hkc4cn4w6wr2c192qx03d1xfwlzclk5bw1nmcg483b"; depends=[additivityTests colorspace flexclust ggplot2 lattice MASS tidyr]; }; biclustermd = derive2 { name="biclustermd"; version="0.2.2"; sha256="00d7lhkcr9bj45zwpm78hdp3qllfisx097dsql3g64v9ix2q44g5"; depends=[biclust clusteval doParallel dplyr foreach ggplot2 magrittr nycflights13 phyclust tidyr]; }; - bife = derive2 { name="bife"; version="0.7"; sha256="04wnc6n3wcykzmhrnd2zkj507ymzbw1n8wssi3bwcylanzj59a3h"; depends=[data_table Formula Rcpp RcppArmadillo]; }; + bife = derive2 { name="bife"; version="0.7.1"; sha256="0d1hfzji3769nsa5xvlmn7sbn21igwx3aa7vxlcdn1b9ykh7fx76"; depends=[data_table Formula Rcpp RcppArmadillo]; }; bigGP = derive2 { name="bigGP"; version="0.1-6"; sha256="0fwm06rzx1qbh16ii93x26i4v4yb50jk67k3qmzyr3gr4z9b9xhg"; depends=[Rmpi]; }; bigMap = derive2 { name="bigMap"; version="2.3.1"; sha256="08c9s5sk672j70d6pnva7z52i4s3knkby06lva9al9n8a3jiwsvz"; depends=[BH bigmemory colorspace RColorBrewer Rcpp RcppArmadillo]; }; bigQueryR = derive2 { name="bigQueryR"; version="0.5.0"; sha256="051c8rkj77dm78237dzhf3lcdawv0xv72pwfiim9bi89z9mp6f9m"; depends=[assertthat googleAuthR googleCloudStorageR httr jsonlite]; }; bigReg = derive2 { name="bigReg"; version="0.1.2"; sha256="1hmvh5j40zpzz6c88hmikphps8rb741yvkg60dxmkfl8gxqsrp3w"; depends=[MASS Rcpp RcppArmadillo uuid]; }; + bigSurvSGD = derive2 { name="bigSurvSGD"; version="0.0.1"; sha256="08i6hwfr4rpvmxfa0vx8bi2dsa63iasj049ndwfn6zgvai6qaz0s"; depends=[bigmemory doParallel foreach Rcpp survival]; }; biganalytics = derive2 { name="biganalytics"; version="1.1.21"; sha256="19drir6vclzz1ffccvnkxnmiqnwmddiqm7y64pz4j6ifxpc1igfy"; depends=[BH biglm bigmemory foreach Rcpp]; }; bigassertr = derive2 { name="bigassertr"; version="0.1.3"; sha256="1f0abvsixdkrr8nfm0knby69j0pac4srlg8nlsmrymz6nzcf82d9"; depends=[]; }; bigchess = derive2 { name="bigchess"; version="1.9.1"; sha256="1vdzx185y1agh1xjf7qcfi2s6l7qzm1kx6b2kr3cbz2in88bws3n"; depends=[processx]; }; @@ -5690,23 +5912,23 @@ in with self; { bigdist = derive2 { name="bigdist"; version="0.1.4"; sha256="1qfnmhyfadmnnagbhdl4jjrb53i1srszf19idp8fy6bczbjq85yi"; depends=[assertthat bigstatsr furrr proxy]; }; biglasso = derive2 { name="biglasso"; version="1.3-7"; sha256="1s9l8n0a3nv6viyp62k890nhdpfh8jl1ahhsa51x7bx2agdqplhi"; depends=[BH bigmemory Matrix ncvreg Rcpp RcppArmadillo]; }; bigleaf = derive2 { name="bigleaf"; version="0.7.1"; sha256="0hsssz5973vapkmmh9dgzrijyjj1s75iarq3cpfi7ljm4n748qig"; depends=[robustbase solartime]; }; - biglm = derive2 { name="biglm"; version="0.9-2"; sha256="03chwwhnrassz2aqcx2pjzmsl8k1nfi704f9cl6p719k8s0iqhwv"; depends=[DBI]; }; + biglm = derive2 { name="biglm"; version="0.9-2.1"; sha256="0iy9xr2bq42wlizgwlz7w5kh9206yqkw9h2cr6mcsmizgjg3rkvd"; depends=[DBI]; }; biglmm = derive2 { name="biglmm"; version="0.9-2"; sha256="1zj1h2hszps3w913j2dk4cyj5jsqkkxsm3pcjlc4jnq810j100l6"; depends=[DBI]; }; bigmatch = derive2 { name="bigmatch"; version="0.6.2"; sha256="16nmc0n78gzk8x8jhxdilj47gjqqv46sgiivccn5zkv08k1h3jj2"; depends=[liqueueR mvnfast plyr rcbalance]; }; bigmemory = derive2 { name="bigmemory"; version="4.5.36"; sha256="03pg8mxdc7q0249visjmc8bc3xmwxsfg3i2n6higicj4cfz7zihq"; depends=[BH bigmemory_sri Rcpp]; }; bigmemory_sri = derive2 { name="bigmemory.sri"; version="0.1.3"; sha256="0mg14ilwdkd64q2ri9jdwnk7mp55dqim7xfifrs65sdsv1934h2m"; depends=[]; }; - bigparallelr = derive2 { name="bigparallelr"; version="0.2.3"; sha256="1xg48zbwhchclc6lc67hc3j1d0b7cajd4whspj68ipm38w8h7l23"; depends=[bigassertr doParallel flock foreach RhpcBLASctl]; }; + bigparallelr = derive2 { name="bigparallelr"; version="0.3.0"; sha256="1csgvhy192f709g677m1k94j8nx517xj29g28rlmm7x62fivyzav"; depends=[bigassertr doParallel flock foreach RhpcBLASctl]; }; bigreadr = derive2 { name="bigreadr"; version="0.2.0"; sha256="0d5fgs16kdsl23jqrgz7in63pwhh7bvj7m8pa8nj11v84ji6lagr"; depends=[bigassertr data_table Rcpp]; }; - bigrquery = derive2 { name="bigrquery"; version="1.3.1"; sha256="0mq03sqv5lkyn3dlxvyd6lqqwnryfdaqh05pjvngzp194fxmd9cy"; depends=[assertthat bit64 curl DBI gargle glue httr jsonlite prettyunits progress rapidjsonr Rcpp rlang tibble]; }; - bigsnpr = derive2 { name="bigsnpr"; version="1.4.4"; sha256="0khdhbfi4q7s1kvmhfsn1wh4rq6c1lqrfjn3rj9iavka5d77wk5r"; depends=[bigassertr bigparallelr bigreadr bigsparser bigstatsr bigutilsr data_table foreach ggplot2 magrittr Matrix Rcpp RcppArmadillo rmio]; }; - bigsparser = derive2 { name="bigsparser"; version="0.3.1"; sha256="10hhgjzi1dq6hxl0b2wpwk6agmqph5rb2nqfxf6gdbq9406ms0g1"; depends=[bigassertr Rcpp RcppEigen rmio]; }; + bigrquery = derive2 { name="bigrquery"; version="1.3.2"; sha256="16whccv7f94vf57dvbbrhdskz3nnbmpa11a14kp7aynckldlfy0v"; depends=[assertthat bit64 curl DBI gargle glue httr jsonlite prettyunits progress rapidjsonr Rcpp rlang tibble]; }; + bigsnpr = derive2 { name="bigsnpr"; version="1.5.2"; sha256="0i0x98vdh9mr5909ax34yfh4ah73s6l8xkbcybq2xbn74k3b78g2"; depends=[bigassertr bigparallelr bigreadr bigsparser bigstatsr bigutilsr data_table foreach ggplot2 magrittr Matrix Rcpp RcppArmadillo rmio vctrs]; }; + bigsparser = derive2 { name="bigsparser"; version="0.4.0"; sha256="1rhgsh95si0na3ndbliqblbb5cmv8hyvp1qig8nzr6b5va22szkf"; depends=[bigassertr Rcpp RcppEigen rmio]; }; bigsplines = derive2 { name="bigsplines"; version="1.1-1"; sha256="1kf04p2lglzdi1fdryk27nmj2a2jca2ii7ki8vak93sq21isb179"; depends=[quadprog]; }; - bigstatsr = derive2 { name="bigstatsr"; version="1.2.3"; sha256="0386hrfjsdnm5ns9kkym8nhzfadcn0shdr3yj77051lwxfngdmbx"; depends=[bigassertr bigparallelr cowplot foreach ggplot2 Rcpp RcppArmadillo rmio RSpectra tibble]; }; + bigstatsr = derive2 { name="bigstatsr"; version="1.3.1"; sha256="0m8yjwyli68b974ibm50n9a0c7wvjy14gjxry8p0v9jcifv7dr3n"; depends=[bigassertr bigparallelr cowplot foreach ggplot2 Rcpp RcppArmadillo rmio RSpectra tibble]; }; bigstep = derive2 { name="bigstep"; version="1.0.3"; sha256="0ygp1vljqqn5vzpjxlv9d6fxxv3bi2kfyqfs1gf0jgxwb9417b82"; depends=[bigmemory magrittr matrixStats R_utils RcppEigen speedglm]; }; bigtabulate = derive2 { name="bigtabulate"; version="1.1.5"; sha256="1jvp3m0ms2cav9z8vvhh80gsa0kvc351brv2jq99rxv1mwvpa4xj"; depends=[BH biganalytics bigmemory Rcpp]; }; bigtcr = derive2 { name="bigtcr"; version="1.1"; sha256="1l03yc28afdm7glbw4ay0zsywjgqg5l90qz1hfhslsy8gg7d5wq5"; depends=[]; }; bigtime = derive2 { name="bigtime"; version="0.1.0"; sha256="136gy2i4qwa2drklllyzp3z0dbijlavgf3sxy73bf84df2yq1c9i"; depends=[corrplot lattice MASS Rcpp RcppArmadillo RcppEigen zoo]; }; - bigutilsr = derive2 { name="bigutilsr"; version="0.3.2"; sha256="1is0iy4lwx4zbiwbkg9dpkiddjsfp3bgh124k3khfrzn61zldv8i"; depends=[bigassertr bigparallelr nabor Rcpp robustbase RSpectra]; }; + bigutilsr = derive2 { name="bigutilsr"; version="0.3.3"; sha256="0wvym0xnglxvh5502mfd5wx855h98drwib7cchgzy87k87mjza2a"; depends=[bigassertr bigparallelr nabor Rcpp robustbase RSpectra]; }; bikeshare14 = derive2 { name="bikeshare14"; version="0.1.2"; sha256="1sib83driqv9k4aa131nw3xasslrxvnxkn3mr8kxycxccky025n9"; depends=[]; }; bikm1 = derive2 { name="bikm1"; version="1.0.0"; sha256="1pj41d59n3iflwc4iwnwv6g2vhjs9498k85cml7jwb814xpl9jsj"; depends=[ade4 ggplot2 gtools pracma reshape2]; }; bild = derive2 { name="bild"; version="1.2-0"; sha256="0aygx77fn2w249q6ghpxclhm9xb2ngdzrirldr3lpidg6ivc443v"; depends=[]; }; @@ -5729,7 +5951,7 @@ in with self; { binford = derive2 { name="binford"; version="0.1.0"; sha256="04mpdvynlm4gddybys04k0446gc9hyq0vaxr6a525p76ls5aw4b1"; depends=[]; }; bingat = derive2 { name="bingat"; version="1.3"; sha256="1y68rgafipfad78yrzcygdszgy1d5q739kap06pzr78bn3i8hiwa"; depends=[doParallel foreach gplots matrixStats network vegan]; }; binhf = derive2 { name="binhf"; version="1.0-3"; sha256="1vdw2s8zddp7gad8l3c4jpmnjcc0f5wpqbrp6gp9lgp1c3qa505y"; depends=[adlift EbayesThresh wavethresh]; }; - binman = derive2 { name="binman"; version="0.1.1"; sha256="0hm0h285p4v9lhrqjy8s22f1s1vmfpfla5iaycpj8vw3qb3632az"; depends=[assertthat httr jsonlite rappdirs semver xml2 yaml]; }; + binman = derive2 { name="binman"; version="0.1.2"; sha256="00l7m98h41r67gf0qxqis3vx63j7wylnk9vlgcyk41szkrz8ikkc"; depends=[assertthat httr jsonlite rappdirs semver xml2 yaml]; }; binnednp = derive2 { name="binnednp"; version="0.4.0"; sha256="1qswrr982x5hy2vl2fc603j98cjli9l40zzvvjy2l91p8xxrc5dn"; depends=[doParallel fitdistrplus foreach kedd mclust nor1mix Rcpp Rdpack]; }; binom = derive2 { name="binom"; version="1.1-1"; sha256="0mjj92dqf5q69jxzqya4izb1mly3mkydbnmlm4wb3zqqg82a324c"; depends=[]; }; binomSamSize = derive2 { name="binomSamSize"; version="0.1-5"; sha256="1an6dcqsjh5r0w4kc3n6yfvvha5qhrb2i4bpf7g5ykhl3i60zfcc"; depends=[binom]; }; @@ -5740,37 +5962,39 @@ in with self; { binostics = derive2 { name="binostics"; version="0.1.2"; sha256="1izcck2dq8ay9ni1wjg426w5rj39gxwzls1sgnngggapl3pmqzz2"; depends=[]; }; binovisualfields = derive2 { name="binovisualfields"; version="0.1.1"; sha256="0s2p0miqjckkj4v9l0c7zsdnnq69j08p4c5sgdxvkzlv23rnrkyd"; depends=[gtools plotrix shiny]; }; binr = derive2 { name="binr"; version="1.1"; sha256="0kgk91zy7bdrhpkh9c5bi206y9hjwjwzb508i8qqmznqyxmza70r"; depends=[]; }; + binsegRcpp = derive2 { name="binsegRcpp"; version="2020.9.3"; sha256="0vkvczm32nx67aw1mw53yc6jlbsk70faa5mvwq6k6bzv3nb2c48a"; depends=[data_table Rcpp]; }; binseqtest = derive2 { name="binseqtest"; version="1.0.3"; sha256="0661a2bqmv6bckq23c6m04ggwrp8z10lfgjg9dgkz4bfxsd297gs"; depends=[clinfun]; }; binsmooth = derive2 { name="binsmooth"; version="0.2.2"; sha256="1sidv8ra377glaacib1j4ksg5bg759hk7h6fadrfzip3hgxgjg9x"; depends=[ineq pracma triangle]; }; binsreg = derive2 { name="binsreg"; version="0.2.0"; sha256="031a794bkb9qdy51p4jgjg3hvh8ga0hwakcdrjn0hv4ls9f5gsm7"; depends=[ggplot2 sandwich]; }; binst = derive2 { name="binst"; version="0.2.1"; sha256="09kzk7n1j9nzgyijwirzk33z6p6hc67zkd05hv1i9qfijy31gci4"; depends=[rpart]; }; - bio_infer = derive2 { name="bio.infer"; version="1.3-3"; sha256="14pdv6yk0sk6v8g9p6bazbp7mr3wmxgfi6p6dj9n77lhqlvjcgm9"; depends=[]; }; + bio_infer = derive2 { name="bio.infer"; version="1.3-6"; sha256="1hs11c9qpdsl1awgk3b34mcsnr8g1xpg3zd9dlrqrz6ppdqkgxmn"; depends=[]; }; bio3d = derive2 { name="bio3d"; version="2.4-1"; sha256="07rw6c2d95gb5myxh31727j0jrchd0xisa3x89jjmf4zzs3vv7v7"; depends=[Rcpp]; }; bioC_logs = derive2 { name="bioC.logs"; version="1.1"; sha256="18v8hj426vdfz30jifhd17fv65w5nv0f55ff9r8s2ahi6qv3w828"; depends=[]; }; bioOED = derive2 { name="bioOED"; version="0.2.1"; sha256="0wx58bngpzlrbbcnx8l1lqhsg51y98wcym1238p87drf64x2mj1n"; depends=[bioinactivation corrplot dplyr FME ggplot2 MEIGOR rlang tidyr tidyselect tidyverse]; }; bioPN = derive2 { name="bioPN"; version="1.2.0"; sha256="0mvqgsfc7d4h6npgg728chyp5jcsf49xhnq8cgjxfzmdayr1fwr8"; depends=[]; }; bioRad = derive2 { name="bioRad"; version="0.5.2"; sha256="1kx1vh6p37170f1crylwyzap0c7s5d82rx7qqi95f8d26niqcjn9"; depends=[assertthat curl data_table fields ggmap ggplot2 lubridate lutz maptools raster rgdal rhdf5 sp tidyr viridis viridisLite]; }; bioacoustics = derive2 { name="bioacoustics"; version="0.2.4"; sha256="003z6vd19a62mdfzkkpvhfn42c7lws2863nxvfl9hbqcx0zbq7gn"; depends=[htmltools moments Rcpp stringr tuneR]; }; - bioassays = derive2 { name="bioassays"; version="0.1.0"; sha256="0vsh079hh9w571aki90bhj0clkjknv4zm795hcwgh9grn6h45qrl"; depends=[dplyr ggplot2 magrittr nplr reshape2 rlang]; }; - biocompute = derive2 { name="biocompute"; version="1.0.3"; sha256="1c23yd0vhar1hvzskr7h6g3a78mcrwminm2pkdmc9qlpy8s8smvv"; depends=[cli crayon curl digest httr jsonlite jsonvalidate magrittr rmarkdown stringr uuid yaml]; }; + bioassays = derive2 { name="bioassays"; version="1.0.1"; sha256="1y32wxkv14l7r0f35y4hxxxh3zpw2gd4hsjmkajhmzmnvg5jdw78"; depends=[dplyr ggplot2 magrittr nplr reshape2 rlang]; }; + biocompute = derive2 { name="biocompute"; version="1.0.4"; sha256="18k8qrc5zy48zmkxxzv7yfsi7z3hpy8fcw7hs61a8fykwl5793ba"; depends=[cli crayon curl digest httr jsonlite jsonvalidate magrittr rmarkdown stringr uuid yaml]; }; biogas = derive2 { name="biogas"; version="1.23.2"; sha256="05g6nyi872skvr34kw5c71ggnnjc3fv95imc327yjqhmqmwx3m19"; depends=[]; }; biogeo = derive2 { name="biogeo"; version="1.0"; sha256="14sqgg8b06gp5dajxvyj9s3ndsk7jpkfr0mkyl2l61kgp6qx53rh"; depends=[maptools raster sp stringr vegan]; }; biogram = derive2 { name="biogram"; version="1.6.3"; sha256="1y7yaa6xwv11b6a4qf4qb3d7rsz0yiiq1k5mb0dbm3avydnl9c4b"; depends=[combinat entropy partitions slam]; }; + biogrowth = derive2 { name="biogrowth"; version="0.1.2"; sha256="1ipk9pvl05f365adqqcvdf7h16z9l9mbb2s0k6sy705714fv5wdb"; depends=[cowplot deSolve dplyr FME ggplot2 lamW MASS purrr rlang tibble tidyr]; }; bioimagetools = derive2 { name="bioimagetools"; version="1.1.5"; sha256="1qscyfm7mx9v9ag3hdyyvn7vwnfvms9dc1qffbyby9fr9rj3gs3q"; depends=[EBImage httr tiff]; }; bioinactivation = derive2 { name="bioinactivation"; version="1.2.3"; sha256="0gz1bbakf6b23jsbvrr8314yxajxcr1akm5srgm883lrf1p5ax13"; depends=[deSolve dplyr FME ggplot2 lazyeval MASS purrr rlang]; }; - biolink = derive2 { name="biolink"; version="0.1.6"; sha256="1szsplhzrn660aw442ad73rwhmyqjwqq6faaz4bw86khsvxh993y"; depends=[DBI glue memoise rentrez RMySQL xml2]; }; + biolink = derive2 { name="biolink"; version="0.1.7"; sha256="1i9aisvb3lvljird89fy9fx7h3s1wi6dpilycbynqyhz8xqnnszj"; depends=[DBI glue memoise rentrez RMySQL xml2]; }; biomartr = derive2 { name="biomartr"; version="0.9.2"; sha256="12bw15hvjg7fbrq1mwn2xgzbplydy8rlq982hs118mlwdrlqb06q"; depends=[biomaRt Biostrings curl data_table downloader dplyr fs httr jsonlite philentropy purrr R_utils RCurl readr stringr tibble XML]; }; biomod2 = derive2 { name="biomod2"; version="3.4.6"; sha256="0nvxg0a78ynydx3wd16vaildw9x4hiagmx4wkrwkzbyhyi2pgza1"; depends=[abind caret checkmate dismo doParallel dplyr earth ENMeval foreach gbm ggplot2 lattice MASS maxnet mda nnet PresenceAbsence pROC purrr randomForest raster rasterVis reshape rlang rpart sp tidyr]; }; bionetdata = derive2 { name="bionetdata"; version="1.0.1"; sha256="1l362zxgcvxln47b1vc46ad6ww8ibwhqr2myxnz1dnk2a8nj7r2q"; depends=[]; }; biorxivr = derive2 { name="biorxivr"; version="1.0.2"; sha256="10fwppflk2ri5qah1vp3q835g0299nkxz8x94xhfazbjikrxqan4"; depends=[RCurl XML]; }; bios2mds = derive2 { name="bios2mds"; version="1.2.3"; sha256="1k0r3fnkzfczx3wp3m8zpndk6gxca7idsp0z13rw84zjrgqaw6jm"; depends=[amap cluster e1071 rgl scales]; }; - bioseq = derive2 { name="bioseq"; version="0.1.1"; sha256="02dmb8c6izy27m5by2mps5wb85nnii0jzv4vpz63pays06qw9276"; depends=[ape crayon dplyr pillar readr rlang stringr tibble vctrs]; }; + bioseq = derive2 { name="bioseq"; version="0.1.2"; sha256="0njnf4dzan2bc3h69rpbpfqhj3w2msd41nkn9p2kvkik706sx50v"; depends=[ape crayon dplyr pillar readr rlang stringr tibble vctrs]; }; bioset = derive2 { name="bioset"; version="0.2.3"; sha256="15vchim8cim42j1if0jars696rh50vmbggr9748q321f6ngm1w1i"; depends=[dplyr magrittr rlang tibble tidyr]; }; biosignalEMG = derive2 { name="biosignalEMG"; version="2.1.0"; sha256="0bbkrfqkmks4z8c7rh0k43lvm71vn3fzrw3kpj012ym77whwkvay"; depends=[signal]; }; biospear = derive2 { name="biospear"; version="1.0.2"; sha256="10y4hbncwiqpxzqvzjrmfgp804zczdgvwpjcj0dzaa0sx1njdzja"; depends=[cobs corpcor devtools glmnet grplasso MASS Matrix mboost pkgconfig plsRcox pROC PRROC RCurl survAUC survival]; }; - biostat3 = derive2 { name="biostat3"; version="0.1.4"; sha256="12inmmy5xjd0c6vs2s00z13rm5ykndxpmmgi8h7pkw30rhq4snyc"; depends=[car MASS muhaz survival]; }; + biostat3 = derive2 { name="biostat3"; version="0.1.5"; sha256="1hnq2al27033zagxjd0r8nls6z8lznfqqiyrharq07s6bgbl5bv9"; depends=[car MASS muhaz survival]; }; biotic = derive2 { name="biotic"; version="0.1.2"; sha256="1p18jkdd263dgk90626n9awkj6m4zn1n7897596fzrzrahksa978"; depends=[]; }; - biotools = derive2 { name="biotools"; version="3.1"; sha256="15y3ccmj1gslzc0lp0gvc66hf0yigx3zkqnw46crgrizjm2kmjay"; depends=[boot lattice MASS rpanel SpatialEpi tkrplot]; }; + biotools = derive2 { name="biotools"; version="4.0"; sha256="0hbcpyfkx658my6k2fl1z597qmfmby0rkysflbz6g09r2yh8mm1k"; depends=[boot MASS]; }; bipartite = derive2 { name="bipartite"; version="2.15"; sha256="0gr1wm9bvvrvwv5gzzfic7yknp826ga44vjbil84x1kp0h0k1f46"; depends=[fields igraph MASS permute sna vegan]; }; bipartiteD3 = derive2 { name="bipartiteD3"; version="0.2.0"; sha256="1jvhlycmxii4vcm9qbj246qkwhd1bcggqq56b5rmbyqwd4vhqh8f"; depends=[downloader dplyr purrr r2d3 RColorBrewer stringr tibble tidyr]; }; biplotbootGUI = derive2 { name="biplotbootGUI"; version="1.2"; sha256="07lrs2n6s54h97vjriszszhksdbi14s2i234kwfhg7aq47k6l0jl"; depends=[cluster dendroextras MASS matlib rgl shapes tcltk2 tkrplot]; }; @@ -5783,14 +6007,14 @@ in with self; { bisectr = derive2 { name="bisectr"; version="0.1.0"; sha256="1vjsjshvzj66qqzg32rviklqswrb00jyq6vwrywg1hpqhf4kisv7"; depends=[devtools]; }; bisque = derive2 { name="bisque"; version="1.0.2"; sha256="0zp2r1vg29q2ds34hhyjv9pz761mi0qncx9p4ilwnfd5yj9pmzwq"; depends=[foreach itertools mvQuad Rcpp RcppArmadillo RcppEigen]; }; bit = derive2 { name="bit"; version="4.0.4"; sha256="0s7isadibxp2wr62r5cpbyh9z31sczzfz4j3rm7gxgjfpqgq8174"; depends=[]; }; - bit64 = derive2 { name="bit64"; version="4.0.2"; sha256="1yrwvgvxdlsa8y42l05vy173qndlqkwfk6mp2zrqwm8l7c7p79g9"; depends=[bit]; }; + bit64 = derive2 { name="bit64"; version="4.0.5"; sha256="0y0m7q1rwam1g88cjx7zyi07mj5dipxd9jkl90f294syx8k6ipr5"; depends=[bit]; }; bite = derive2 { name="bite"; version="0.3"; sha256="00sph3pdbb9p21s3263ni4by2ivvya1sbjm9wvwx1rwjr4f31jps"; depends=[ape coda MASS phytools sm vioplot xml2]; }; bitmexr = derive2 { name="bitmexr"; version="0.3.1"; sha256="1h4fdh88b8j1p6hxabwf2v1wm8wnqzpl67hh15pjky2hhczfds05"; depends=[attempt curl digest dplyr httr jsonlite lubridate magrittr progress purrr rlang stringr]; }; bitops = derive2 { name="bitops"; version="1.0-6"; sha256="176nr5wpnkavn5z0yy9f7d47l37ndnn2w3gv854xav8nnybi6wwv"; depends=[]; }; bitsqueezr = derive2 { name="bitsqueezr"; version="0.1.1"; sha256="0dy180r9cclq46mh0fzc68p5zm9x2z5pa8ajgsk7qycdkyw5v829"; depends=[]; }; biva = derive2 { name="biva"; version="0.1.0"; sha256="1vppvk2n60hhi7p8y8rdyckmh4yk70wqyhbg7rbgh833s66whypw"; depends=[corrgram rpivotTable shiny shinyAce]; }; bivarRIpower = derive2 { name="bivarRIpower"; version="1.2"; sha256="0vgi0476rwali6k8bkp317jawzq5pf04v75xmycpmadb7drnpzy0"; depends=[]; }; - bivariate = derive2 { name="bivariate"; version="0.5.0"; sha256="0b8wrzh51wqxiksja4jgjfqfqq3nlnx8vcvnmyhl1nzn9jyzdrfg"; depends=[barsurf intoo KernSmooth mvtnorm]; }; + bivariate = derive2 { name="bivariate"; version="0.6.0"; sha256="0llpgwwcals3r2dvk8bln448avmf5fd50dhrmirq92w7s3zkxmrp"; depends=[barsurf intoo KernSmooth mvtnorm]; }; bivgeom = derive2 { name="bivgeom"; version="1.0"; sha256="1cn8k7q011whr4f7zig85dsrkz04614z9ns2ky6k6i16s5n3glxy"; depends=[bbmle copula]; }; bivquant = derive2 { name="bivquant"; version="0.1"; sha256="05dn4qik2dvmgqc2613vddh312bqhza1vnf94an75888gxri5h03"; depends=[copula cubature lpSolve MASS mvtnorm regpro]; }; bivrp = derive2 { name="bivrp"; version="1.2-2"; sha256="0b38nh38vgqjllb1z9627dm86yp0s06ky1g829g8kkz7rffdp2za"; depends=[MASS]; }; @@ -5799,17 +6023,19 @@ in with self; { bizdays = derive2 { name="bizdays"; version="1.0.6"; sha256="1av96rj4fllfais9xwh1p8601xvsj0awfh9n2n1x5kzca966h8fq"; depends=[jsonlite]; }; bjscrapeR = derive2 { name="bjscrapeR"; version="0.1.0"; sha256="18chbgiwify272iqf0w4vsqh73wbk12d8m2awc5hbnfqblz3phwd"; depends=[dplyr glue readr tibble]; }; bkmr = derive2 { name="bkmr"; version="0.2.0"; sha256="0dk6dn73bqlvwinn3aginls4533931xcr3h59k0w60yxs3v8yakv"; depends=[dplyr fields magrittr MASS nlme tidyr tmvtnorm truncnorm]; }; + bkmrhat = derive2 { name="bkmrhat"; version="1.0.0"; sha256="170lj3287phywmn85qd18sy5kzxnrk2qqp1k8y2df13610d1m1gh"; depends=[bkmr coda future rstan]; }; blackbox = derive2 { name="blackbox"; version="1.1.32"; sha256="180y19ls0vdk98smhs9hxpcwg3hwpl62d19zdiml38bjlxmr0kav"; depends=[foreach geometry lattice MASS nloptr numDeriv pbapply proxy rcdd Rcpp RcppEigen spaMM]; }; blaise = derive2 { name="blaise"; version="1.3.4"; sha256="14jk62sw4xs0yip8gh1w2795l8p0ybv83c24ijizxymg16h7i9g7"; depends=[dplyr readr stringr tibble]; }; blandr = derive2 { name="blandr"; version="0.5.1"; sha256="1rqas71hlf000b3z824d8ljshf8bx91bbrzaxxnx5n3chv19w6z6"; depends=[ggplot2 jmvcore knitr R6 rmarkdown stringr]; }; - blapsr = derive2 { name="blapsr"; version="0.5.1"; sha256="0qlyc9k02w8csi9zjdm03ba2i54fc6g0qq0gammh93vdpg772ykx"; depends=[coda MASS Matrix RSpectra sn survival]; }; + blapsr = derive2 { name="blapsr"; version="0.5.5"; sha256="1h6bdlawb3wzfw0l62k8b440yvvdh2liylhlnf3jfhdh1fivxq95"; depends=[coda MASS Matrix RSpectra sn survival]; }; blastula = derive2 { name="blastula"; version="0.3.2"; sha256="084mk6xb8ivqrp8anvisfk8rvwi7qfrp5kmy66vpihmjmqh7dkyc"; depends=[base64enc commonmark curl digest dplyr fs getPass here htmltools httr jsonlite magrittr mime rlang rmarkdown stringr uuid]; }; - blavaan = derive2 { name="blavaan"; version="0.3-10"; sha256="0b96rm5w0n0dm2fk3vak8cw4lxzwysicfcrhw63y9xr1ab088zs5"; depends=[bayesplot BH coda future_apply lavaan loo MCMCpack mnormt nonnest2 Rcpp RcppEigen rstan rstantools StanHeaders]; }; + blatent = derive2 { name="blatent"; version="0.1.1"; sha256="1jnf3i7s3mn99ff8yzygxys0w8qf6vrfk16iqgxh7jbivbrczysk"; depends=[coda Matrix mnormt R6 Rcpp RcppArmadillo truncnorm]; }; + blavaan = derive2 { name="blavaan"; version="0.3-12"; sha256="01npki6jx19rzli193r57i8i495bqpnifcawqv8cxp718c9s4i4s"; depends=[bayesplot BH coda future_apply lavaan loo MCMCpack mnormt nonnest2 Rcpp RcppEigen RcppParallel rstan rstantools StanHeaders]; }; blendedLink = derive2 { name="blendedLink"; version="1.0"; sha256="19d1pnjag89jjvkl5a6wx531qjqp4cv5jk95md6jby27yr52r8vp"; depends=[]; }; blender = derive2 { name="blender"; version="0.1.2"; sha256="1qqkfgf7fzwcz88a43cqr8bw86qda33f18dg3rv1k77gpjqr999c"; depends=[vegan]; }; blin = derive2 { name="blin"; version="0.0.1"; sha256="1h94azm7gli9i4v3li5c1p36p3rkcj2p5j6rqzlzf0pcqs0bsc09"; depends=[abind glmnet MASS Matrix mvtnorm]; }; blindrecalc = derive2 { name="blindrecalc"; version="0.1.2"; sha256="0nph82l58kgq2dqvga262zh394zp1had85qb8k8rwgaq68lad2vy"; depends=[Rcpp]; }; - bliss = derive2 { name="bliss"; version="1.0.1"; sha256="1l3l7l9wq53if3w1j9l4d1pvlzhk8hx3pc3sly2h3nl2mds72hi2"; depends=[ggplot2 MASS RColorBrewer Rcpp RcppArmadillo rockchalk]; }; + blink = derive2 { name="blink"; version="1.1.0"; sha256="053nw592sglzh6fgz7hj8ra6q7lqs83hhv14kcgs67b56q8a3crb"; depends=[plyr stringdist]; }; blm = derive2 { name="blm"; version="2013.2.4.4"; sha256="1w6c30cq38j4i1q4hjg12l70mhy5viw886l1lsnxyvniy113in4i"; depends=[]; }; blme = derive2 { name="blme"; version="1.0-4"; sha256="1ca2b0248k0fj3lczn9shfjplz1sl4ay4v6djldizp2ch2vwdgy2"; depends=[lme4]; }; blmeco = derive2 { name="blmeco"; version="1.4"; sha256="1370djpy87816bfr0g8730x7q4d4xx9aa41iqm622q5b5zm2jzmp"; depends=[arm lme4 MASS]; }; @@ -5821,10 +6047,10 @@ in with self; { blockcluster = derive2 { name="blockcluster"; version="4.4.3"; sha256="0al1v4r26rh4fx4g8gyk8mxfagn75xb9n4lwh3s6xvk87x33p20c"; depends=[Rcpp rtkore]; }; blockmatrix = derive2 { name="blockmatrix"; version="1.0"; sha256="14k69ly4i8pb8z59005kaf5rpv611kk1mk96q6piyn1gz1s6sk6r"; depends=[]; }; blockmodeling = derive2 { name="blockmodeling"; version="1.0.0"; sha256="1z4w2kq0id0gb5d0lqcdaw3clplhzywarkpvvx3drivdypzl237i"; depends=[Matrix]; }; - blockmodels = derive2 { name="blockmodels"; version="1.1.1"; sha256="088629i4g63m8rnqmrv50dgpqbnxd1a4zl5wr3ga0pdpqhmd53wp"; depends=[digest Rcpp RcppArmadillo]; }; + blockmodels = derive2 { name="blockmodels"; version="1.1.4"; sha256="1kx6ryx0ma7j70nzby0wdagqkf1cjdhvw32rf7i1pp8f2rkfsg84"; depends=[digest Rcpp RcppArmadillo]; }; blockrand = derive2 { name="blockrand"; version="1.5"; sha256="0bic3b8l7mp2hpwd8k1diwy6a4lj92i7s5k20i2wy8kw0c74jwfh"; depends=[]; }; - blocksdesign = derive2 { name="blocksdesign"; version="4.3"; sha256="0g70ap2x3j3454xyvaqj80njzddq6z880b6w0pqxvwcgy4916k5b"; depends=[lme4 plyr PolynomF]; }; - blogdown = derive2 { name="blogdown"; version="0.20"; sha256="0iz4idfpzk4s13xhw1n8dpk117c0qkrh6qg2yvcfmrp0wdkwwr6d"; depends=[bookdown htmltools httpuv knitr rmarkdown servr xfun yaml]; }; + blocksdesign = derive2 { name="blocksdesign"; version="4.6"; sha256="1pgnp3ns8xv1991irxj8apvrnr3d2knbiansfcjiiykvvcpzgm3w"; depends=[plyr PolynomF]; }; + blogdown = derive2 { name="blogdown"; version="0.21"; sha256="0kbzyr1f9pvh4f3pydjhi9gdczbah9h0xpmic90cnadv8flasvd8"; depends=[bookdown htmltools httpuv knitr later rmarkdown servr xfun yaml]; }; blorr = derive2 { name="blorr"; version="0.3.0"; sha256="1ynvg6ar7c7p01225q9czy4gxks0p1vw3sx207l7vzqxw20wb1bn"; depends=[car data_table ggplot2 gridExtra lest Rcpp]; }; blrm = derive2 { name="blrm"; version="1.0-1"; sha256="0p0nmbxil4l89fcryrgsg9mxzb5fyg93p50aqkjy00ms05hwd0hx"; depends=[boot mvtnorm openxlsx reshape2 rjags]; }; blsAPI = derive2 { name="blsAPI"; version="0.2.1"; sha256="0p45g4qqaialh5m9bxgrvnc7nqmm0429syw0bml8h4h8vy4014a7"; depends=[httr rjson]; }; @@ -5832,17 +6058,20 @@ in with self; { bltm = derive2 { name="bltm"; version="0.1.0"; sha256="1sx4ii65ddvdw45za8j320v1s9d1pz5k2gx979yymhyxi8fmq69z"; depends=[mvnfast Rfast]; }; bmass = derive2 { name="bmass"; version="1.0.3"; sha256="0dafixd996lamn5kfbqpiawblalhyw1gi394j46n2sij2r209d76"; depends=[]; }; bmd = derive2 { name="bmd"; version="0.5"; sha256="0d4wxyymycb416sdn272292l70s1h2m5kv568vakx3rbvb8y6agy"; depends=[drc]; }; - bmem = derive2 { name="bmem"; version="1.7"; sha256="1g259j2jzmbbv98l0w6jc4k18ad0a7hvq2s9jgjdxk8n6ymbx67v"; depends=[Amelia lavaan MASS sem snowfall]; }; + bmem = derive2 { name="bmem"; version="1.8"; sha256="1nhybz8aarzlqjx4443hsflflgy2jcprz5dv6mwxacnyspm93vlq"; depends=[Amelia lavaan MASS sem snowfall]; }; bmeta = derive2 { name="bmeta"; version="0.1.2"; sha256="19pm60xpmlanngq4nbibp0n5m98xw24b2xghz92ly31i3mkg2n68"; depends=[forestplot R2jags]; }; + bmgarch = derive2 { name="bmgarch"; version="1.0.0"; sha256="1zivja09ci6kj5nymwhdzjjjqvkvbxcjk9v27kk7w25sqbyv9gvk"; depends=[BH forecast ggplot2 loo MASS Rcpp RcppEigen Rdpack rstan rstantools StanHeaders]; }; bmixture = derive2 { name="bmixture"; version="1.6"; sha256="12csg1nafhwhqrhg5rrzjsw06fbvgd8447a9ypbgs78ah81rmr8f"; depends=[BDgraph]; }; bmk = derive2 { name="bmk"; version="1.0"; sha256="1wxkrlrhmsxsiraj8nyiax9bqs834ln2swykmpf40wxspkykgfdq"; depends=[coda functional plyr]; }; bmlm = derive2 { name="bmlm"; version="1.3.11"; sha256="1nlwfrs6kk2jxq8vxwfj388cdf2p8h81lskkb9bp80fp8fx722qh"; depends=[BH ggplot2 Rcpp RcppEigen rstan StanHeaders]; }; bmmix = derive2 { name="bmmix"; version="0.1-2"; sha256="00php2pgpnm9n0mnamchi6a3dgaa97kdz2ynivrf38s0vca7fqx8"; depends=[ggplot2 reshape2]; }; + bmotif = derive2 { name="bmotif"; version="2.0.2"; sha256="1zy153z7kasfivj0mvrkyn96s0sgdp34w4pdjpcvfnym3lr02f0m"; depends=[gtools Rcpp reshape2 tensor]; }; bmp = derive2 { name="bmp"; version="0.3"; sha256="0jd67r11bn98hjwgyr6gas423787xy7ji2hq7ay80blkkcj91xxx"; depends=[]; }; bmrm = derive2 { name="bmrm"; version="4.1"; sha256="1brdd5mhr5282wkdc62lgsqcxw077p69rknjk7fjcs282ahcik2s"; depends=[LowRankQP lpSolve matrixStats Rcpp]; }; + bmscstan = derive2 { name="bmscstan"; version="1.1.0"; sha256="1mr56ry9jzsd2z0zffcysy01bh62cg13hi4swdhdvwmjcsb5gq97"; depends=[bayesplot coda ggplot2 LaplacesDemon logspline rstan]; }; bnclassify = derive2 { name="bnclassify"; version="0.4.5"; sha256="1ik3n0g6gw7504ryg5skwygyc545150r297gii4mr2zj252lf069"; depends=[assertthat BH entropy matrixStats Rcpp rpart]; }; - bnlearn = derive2 { name="bnlearn"; version="4.5"; sha256="0y452cw1dxm1cik4na1zq6g0zv5ybiwc1cq9sdashq1jacjpc158"; depends=[]; }; - bnma = derive2 { name="bnma"; version="1.2.0"; sha256="1h01f7f497fgm52nmxw451m8wd6y6gsvm5iprm1klblx7iqzdm6y"; depends=[coda ggplot2 igraph rjags]; }; + bnlearn = derive2 { name="bnlearn"; version="4.6.1"; sha256="1bxf1p10g40nci92m1nkw9xska45hm29q1vp8wzfac1kmxjl8m74"; depends=[]; }; + bnma = derive2 { name="bnma"; version="1.3.0"; sha256="1bq25kbll6g5lay3b86kif7i719khn597yfycz7zzayypk4ckiwv"; depends=[coda ggplot2 igraph rjags]; }; bnnSurvival = derive2 { name="bnnSurvival"; version="0.1.5"; sha256="1d9jmfx0id4lmw122zga7hb52vlfdfqn4amhzpsmhyck99rv92j4"; depends=[pec prodlim Rcpp]; }; bnormnlr = derive2 { name="bnormnlr"; version="1.0"; sha256="0l2r7vqikak47nr6spdzgjzhvmkr9dc61lfnxybmajvcyy6ymqs9"; depends=[mvtnorm numDeriv]; }; bnpa = derive2 { name="bnpa"; version="0.3.0"; sha256="0qsxk47i7q4d8hbs2xj5k5sf8bqyzhq7rbj4y7w8ljprznlydgl9"; depends=[bnlearn fastDummies lavaan Rgraphviz semPlot xlsx]; }; @@ -5850,18 +6079,19 @@ in with self; { bnpsd = derive2 { name="bnpsd"; version="1.2.1"; sha256="1jnv0pnq5fd5pyy1rx4cbrxl715ss2ci3p9k6zwz5s9x1kxhvgd9"; depends=[]; }; bnspatial = derive2 { name="bnspatial"; version="1.1.1"; sha256="1drm9ia4lr80wahbbn9xrw658ppmgxm4iadwv77jz1x786dda2n1"; depends=[doParallel foreach gRain gRbase raster rgdal sf]; }; bnstruct = derive2 { name="bnstruct"; version="1.0.8"; sha256="1a4x235mji9hkw3gp4br6yj351x0rdxi5nhyrqihna35y4a9429g"; depends=[bitops igraph Matrix]; }; - bnviewer = derive2 { name="bnviewer"; version="0.1.5"; sha256="10yabl761ci8w4afj1smx4m27s3bdvsrg79xfayfb8428zvwb3la"; depends=[bnlearn igraph shiny visNetwork]; }; + bnviewer = derive2 { name="bnviewer"; version="0.1.6"; sha256="036jmypxg2ciiz388f90vm73l9djhpi6gzp1ibn9l0x3d072r7zz"; depends=[assertthat bnlearn caret e1071 igraph shiny visNetwork]; }; boa = derive2 { name="boa"; version="1.1.8-2"; sha256="04lhqk5qfvaz1jk90glr2yi5vq7cdy0w8m6g2lnzk359l9y41zhp"; depends=[]; }; bodenmiller = derive2 { name="bodenmiller"; version="0.1"; sha256="0gqrjscgq4qgk7yl32w0965yscc1py9klr49s8q8hkzyihlwzim2"; depends=[]; }; boilerpipeR = derive2 { name="boilerpipeR"; version="1.3"; sha256="0467bjqhdmi3p02fp0r7rgm00x9ry464f2hniav990qzsw8i16q6"; depends=[rJava]; }; bold = derive2 { name="bold"; version="1.1.0"; sha256="06qxkmfzgq7427js13bddxq9iydq0dpa13wyzrbycl6xg83sha0z"; depends=[crul data_table jsonlite plyr reshape stringr tibble xml2]; }; - bomrang = derive2 { name="bomrang"; version="0.7.0"; sha256="0xlsivhnank7bc3y06wk5avlzlc24mfvn9c18rhgxxib8mzf8aak"; depends=[crayon curl data_table dplyr foreign hoardr httr janitor jsonlite lubridate magrittr raster readr rgdal rvest tidyr xml2]; }; - bookdown = derive2 { name="bookdown"; version="0.20"; sha256="0gnshkp1aj7f29sjkhzxn890hz39nwaqdln61x8apmrc658nacdg"; depends=[htmltools knitr rmarkdown tinytex xfun]; }; + bomrang = derive2 { name="bomrang"; version="0.7.3"; sha256="1if68q5jsmpyyqgvr9954gkwby8ddyl27wdda9510k6w91h893r9"; depends=[crayon curl data_table dplyr foreign hoardr httr janitor jsonlite lubridate magick magrittr readr rvest terra tidyr xml2]; }; + bookdown = derive2 { name="bookdown"; version="0.21"; sha256="0xms1srx9l2mn8xaxnpic0s21y8k56bhwpj45wy7b0yscmxgmh27"; depends=[htmltools knitr rmarkdown tinytex xfun yaml]; }; bookdownplus = derive2 { name="bookdownplus"; version="1.5.8"; sha256="1cdxz5c69cgdk7wxr0xwhzw361rpg7j8xjv9hjf1877qqmhxbrkd"; depends=[bookdown knitr magick xaringan]; }; - boostmtree = derive2 { name="boostmtree"; version="1.4.1"; sha256="16adb9akrdw1cfcarrv9l5cxhn1nzskir6nwl9nawl1r727s57z6"; depends=[nlme randomForestSRC]; }; + boostmtree = derive2 { name="boostmtree"; version="1.5.0"; sha256="18w5h8m6g4aszffyn0ixhzn2bgbrwrrcq2k54b70vbw00xqxmg1q"; depends=[nlme randomForestSRC]; }; boostr = derive2 { name="boostr"; version="1.0.0"; sha256="123ag8m042i1dhd4i5pqayqxbkfdj4z0kq2fyhxfy92a7550gib2"; depends=[foreach iterators stringr]; }; boot = derive2 { name="boot"; version="1.3-25"; sha256="1gpvi1h3nqhnnsfy96rlhakdpj84iqqsxr29rr3261sknky3aj26"; depends=[]; }; - boot_heterogeneity = derive2 { name="boot.heterogeneity"; version="0.1.0"; sha256="0rv4z1c3knny3z8ybpa8smib2fwxffr882jql3f2lxgswaapp6jj"; depends=[metafor pbmcapply]; }; + boot_heterogeneity = derive2 { name="boot.heterogeneity"; version="0.1.1"; sha256="124wya02l39rk61sqg5a69s0ly5ih5lsy4rkpslffvs43byjvkwn"; depends=[metafor pbmcapply]; }; + bootComb = derive2 { name="bootComb"; version="1.0.1"; sha256="1y1kszf5hhacyvkrr9x9b0pjqs4rrzkwy9p30di0vwky5fn0zpp9"; depends=[]; }; bootES = derive2 { name="bootES"; version="1.2"; sha256="0hcaw1v80zspdsy4wr464lmgq33807i2f6n2dc3r7qqwa80g4zz0"; depends=[boot]; }; bootImpute = derive2 { name="bootImpute"; version="1.1.0"; sha256="1dkm0l397jp23lcj4pbl03c2pjj027zjy08jq7qyr9s1bjmxrbnq"; depends=[mice smcfcs]; }; bootLR = derive2 { name="bootLR"; version="1.0.2"; sha256="1aj5l42d5y7czxzlg6r9ykdxyjf8m8bahl41xk4k6xpxckdnka14"; depends=[binom boot]; }; @@ -5869,21 +6099,22 @@ in with self; { bootSVD = derive2 { name="bootSVD"; version="0.5"; sha256="14xwbrpqj3j1xpsppgjxpn9ggsns2n1kmni9vn30vgy68zwvs2wy"; depends=[ff]; }; bootStepAIC = derive2 { name="bootStepAIC"; version="1.2-0"; sha256="0p6v4zjsaj1p6c678010fazdh40lpv0rvhczd1halj8aic98avdx"; depends=[MASS]; }; bootUR = derive2 { name="bootUR"; version="0.2.0"; sha256="01hlglks2lwp49g481hyrz645grf0zhpl508vbhbsvk1z2888cs5"; depends=[Rcpp RcppArmadillo RcppProgress]; }; - bootcluster = derive2 { name="bootcluster"; version="0.1.0"; sha256="1mx08p0csz06mq55bdg4vgnqa9khdgqrz4jnm48c24pg8rpaj98b"; depends=[cluster flexclust fpc mclust plyr sets]; }; + bootcluster = derive2 { name="bootcluster"; version="0.2.0"; sha256="0vvymj415i3bz9gc8q6jdbnmzrsq753h2jchvbsb7p5hhz3k777i"; depends=[cluster doParallel dplyr flexclust foreach fpc GGally ggplot2 gridExtra igraph intergraph mclust network plyr sets]; }; bootnet = derive2 { name="bootnet"; version="1.4.3"; sha256="0zmv6wibqkdhffs937xa1xjz6xn6wb4hajpdl36sfkmw3cqfc9sm"; depends=[abind BDgraph corpcor dplyr ggplot2 glasso graphicalVAR gtools huge igraph IsingFit IsingSampler lavaan Matrix mgm mvtnorm NetworkToolbox networktools pbapply psychTools qgraph relaimpo tidyr]; }; bootruin = derive2 { name="bootruin"; version="1.2-4"; sha256="1gbvh99snchipf13kjhymcx60s2kni23y7lv8lhzd3d402grp68h"; depends=[]; }; bootsPLS = derive2 { name="bootsPLS"; version="1.1.2"; sha256="19ikz3l0qds25hgcxvhsvqy6jyshcdvnxw6774ifl9ylngxvlfh0"; depends=[mixOmics]; }; bootspecdens = derive2 { name="bootspecdens"; version="3.0"; sha256="0hnxhfsc3ac4153lrjlxan8xi4sg1glwb5947ps6pkkyhixm0kc1"; depends=[MASS]; }; bootstrap = derive2 { name="bootstrap"; version="2019.6"; sha256="1546jqhhw5h177ii8jkdikyd26rv6gwkav816np1zks4p7zgsljj"; depends=[]; }; - bootstrapFP = derive2 { name="bootstrapFP"; version="0.4.3"; sha256="19bsahkxh6g2fjz5j1bdq47vnyy38xd0vr4ahkbjz61x0h8g4nli"; depends=[sampling]; }; + bootstrapFP = derive2 { name="bootstrapFP"; version="0.4.4"; sha256="1j9ag18s2n7cihs5hbjhibx8gikxf8fs5hx2ljfzcn0gv492qm02"; depends=[sampling]; }; boottol = derive2 { name="boottol"; version="2.0"; sha256="01dps9rifzrlfm4lvi7w99phfi87b7khx940kpsr4m9s168a2dzv"; depends=[boot plyr]; }; bor = derive2 { name="bor"; version="0.1.0"; sha256="1r5jacmin0cq9zipxa9nmp3jnh6wsddd4wnzw2n5sggnf24ryp8g"; depends=[]; }; boral = derive2 { name="boral"; version="1.9"; sha256="05s1bjfz8j17qqi1kszahw4yzczc18g71s44n7i7851kwy1xkcv4"; depends=[abind coda corpcor fishMod lifecycle MASS mvtnorm R2jags reshape2]; }; - borrowr = derive2 { name="borrowr"; version="0.1.1"; sha256="0q9lkdzf7v9rggrwcny551cx7lfqli60dxqgqx0d2x819d7h0k1d"; depends=[BART mvtnorm Rcpp]; }; + borrowr = derive2 { name="borrowr"; version="0.2.0"; sha256="0hq9rplb22dm8nikapxnvzq10y4xzi1y7k61ghw9x1fq4fdfyy2f"; depends=[BART mvtnorm Rcpp]; }; botor = derive2 { name="botor"; version="0.3.0"; sha256="1izhpc491f54p3hz32kcp2b2yxkg59ni1caglyllg22bckw228sg"; depends=[checkmate logger reticulate]; }; boundingbox = derive2 { name="boundingbox"; version="1.0.1"; sha256="0kgpsvnq8f0qyw55rldwqapys36y6lb4w2bw2azfl4nmrrnayxbc"; depends=[gplots imager]; }; boussinesq = derive2 { name="boussinesq"; version="1.0.3"; sha256="1j1jarc3j5rby1wvj1raj779c1ka5w68z7v3q8xhzjcaccrjhzxk"; depends=[]; }; - boxcoxmix = derive2 { name="boxcoxmix"; version="0.21"; sha256="0pav4nksh1zbic11l38jyyq8i58hfvwzkp88ra6nny3jn2axzipl"; depends=[npmlreg qicharts statmod]; }; + boutliers = derive2 { name="boutliers"; version="1.1-1"; sha256="01dp1w5lxmn6nixajg6dz0qincm0i1in03q7g284v37qnszyimqs"; depends=[metafor]; }; + boxcoxmix = derive2 { name="boxcoxmix"; version="0.28"; sha256="12f1lakfy9i1rq70cq0bffpdachsm58rcmbbhgnq1r31g028zrcc"; depends=[npmlreg qicharts statmod]; }; boxplotdbl = derive2 { name="boxplotdbl"; version="1.3.0"; sha256="1y1b45q69sxbszd83s8ch10z4i55h34ixm8q7yxr7byx3px8y65n"; depends=[]; }; boxr = derive2 { name="boxr"; version="0.3.5"; sha256="1mhw3val08l03y7c52kq6ln2l5gjn6x1mxg0hx7nr8b86skbrka4"; depends=[assertthat bit64 digest dplyr fs glue httpuv httr mime rio rlang stringr]; }; bpDir = derive2 { name="bpDir"; version="0.1.1"; sha256="1ia48ygnncv7msisrgqkbzbs8ld2d3lnmwpjr8myzzx4sbdafdk1"; depends=[circular MASS plotrix]; }; @@ -5891,74 +6122,78 @@ in with self; { bpbounds = derive2 { name="bpbounds"; version="0.1.4"; sha256="05knl0lmhbc399zwb35r8m1w5jvmwad8rg5m7m633pg7cfijayb9"; depends=[]; }; bpca = derive2 { name="bpca"; version="1.3-2"; sha256="0q3rx1wsa9y6c19kh77mvhkdb7qqywc031w6fl3sf0m0jj7skqab"; depends=[rgl scatterplot3d xtable]; }; bpcp = derive2 { name="bpcp"; version="1.4"; sha256="0jwz9vrz6ivz70qzgvpvksk94rw5m7vi6yijbg8dj6biq5rq01lv"; depends=[ggplot2 survival]; }; + bpcs = derive2 { name="bpcs"; version="1.0.0"; sha256="0jsy2l1qnzr8098614d6pj7rydf6b9s7kxrkahyzq82ivby9hj5m"; depends=[badger BH coda dplyr ggplot2 gtools HDInterval knitr loo magrittr Rcpp RcppEigen RcppParallel rlang rstan rstantools shinystan StanHeaders stringr tibble tidyr tidyselect]; }; bpgmm = derive2 { name="bpgmm"; version="1.0.7"; sha256="0abh6jjglims8hjm2fwh0dz2qsgxy0fglxl5fnfgkwc139rsrhgy"; depends=[fabMix gtools label_switching MASS mclust mcmcse mvtnorm pgmm Rcpp RcppArmadillo]; }; bpnreg = derive2 { name="bpnreg"; version="1.0.3"; sha256="0s1whwi12fs77lycngrm0394cp6cy3g1pikhf670n94y21pk2bvi"; depends=[BH haven MASS Rcpp RcppArmadillo]; }; bpp = derive2 { name="bpp"; version="1.0.0"; sha256="11fgn92vvl7kklv0xdisf8gnf2rbhq11qyckqsxvc5wa821lmnkm"; depends=[mvtnorm]; }; - bqror = derive2 { name="bqror"; version="0.1.1"; sha256="1r4g04p8pbk2xkk8ib49pws9hxdxzwq0rh1fmrprmmvy28p4rvic"; depends=[GIGrvg invgamma MASS NPflow pracma truncnorm]; }; + bqror = derive2 { name="bqror"; version="0.1.3"; sha256="04hxpg12a8iksvm5vahlps1dmirrbzv5rs51s34gqgqf9z072yjl"; depends=[GIGrvg invgamma MASS NPflow pracma truncnorm]; }; bqtl = derive2 { name="bqtl"; version="1.0-32"; sha256="0jjqgsm9fmvz5nkgz608xfljjpmaf4rs4f7kxvpqn4b1l9s5lhci"; depends=[]; }; - braQCA = derive2 { name="braQCA"; version="1.0.0.1"; sha256="1chyy8sk3iqs54sqg79dp1vjz3gcvnbzqbmgasdynir38b45scjh"; depends=[bootstrap dplyr QCA]; }; bracer = derive2 { name="bracer"; version="1.1.1"; sha256="1l722jg88i4898v8fwb9klwl9mbpaz1phypbpqc1j2kp2n2vq0vb"; depends=[stringr]; }; - braidReports = derive2 { name="braidReports"; version="0.5.3"; sha256="107c9lrzb55dw5pal8qqpn8is3nrh19vfngx3zcfpmc49f06kskq"; depends=[braidrm ggplot2]; }; braidrm = derive2 { name="braidrm"; version="0.71"; sha256="1cn0rdlw775pmzbjmhny7gkm901a3qgz7infqb5s9az606xg54d3"; depends=[]; }; - brainGraph = derive2 { name="brainGraph"; version="2.7.3"; sha256="1r39hxjix7vf3x8w46cgrpxfzsjkyw1k2r34xw73rvb75xx0aaay"; depends=[abind ade4 boot data_table expm foreach ggplot2 ggrepel gridExtra Hmisc igraph MASS Matrix oro_nifti permute RcppEigen scales]; }; + brainGraph = derive2 { name="brainGraph"; version="3.0.0"; sha256="0sr2rf5fs02m3c304wbya2rszxcivc3cypg978hwzzcf30r4fy7y"; depends=[abind data_table doParallel foreach igraph lattice MASS Matrix permute]; }; brainKCCA = derive2 { name="brainKCCA"; version="0.1.0"; sha256="1ag3qahlba4h4126873hg2bbi6sr729mhiw22gjgr4g4jg6lhh09"; depends=[brainR CCA elasticnet kernlab knitr misc3d oro_nifti rgl]; }; brainR = derive2 { name="brainR"; version="1.6.0"; sha256="1l5rm6grslc6mivwh2fv3pznhy2cw16fz5695pmyfamzvsjggir1"; depends=[misc3d oro_nifti rgl]; }; brandwatchR = derive2 { name="brandwatchR"; version="0.3.0"; sha256="10bccsaswsq06wdrxqg71amzx5rabmgfi4n074y651r2c1pyy98w"; depends=[data_table httr jsonlite]; }; - brant = derive2 { name="brant"; version="0.2-0"; sha256="1hdwdrdl6ad112zd7q248am3qk19alnj647nrk9xxxgd7s6a9pnb"; depends=[MASS Matrix]; }; + brant = derive2 { name="brant"; version="0.3-0"; sha256="0rcp0am4wjlkinvmv0n5bky84v31ds28v163p5mlp343cgma2b62"; depends=[MASS Matrix]; }; + bravo = derive2 { name="bravo"; version="1.0.3"; sha256="1q5xgxyjss12jpd0arlqk4va3arzvla597vg2v6f9jbqm07ffy7h"; depends=[Matrix Rcpp]; }; brea = derive2 { name="brea"; version="0.2.0"; sha256="0mb043fdhxrg9gyf4g55ydjx37j20394nvd4d0fmiym98lccyi04"; depends=[]; }; breakDown = derive2 { name="breakDown"; version="0.2.0"; sha256="1ywa7122id4infcb31rbazdd2w2hm0ff8p0a7insy3lvq0xmqd44"; depends=[ggplot2]; }; breakage = derive2 { name="breakage"; version="1.1-1"; sha256="0zjazyz92criiimpz4wyd4hd8ccspvh3hhqpd4qkfdzdf9wp3kns"; depends=[Imap]; }; - breakfast = derive2 { name="breakfast"; version="1.0.0"; sha256="0p0svsqphd5w99pf5c5jmak1xxl8md881lapa8aps9xr73m4x6lf"; depends=[plyr]; }; + breakfast = derive2 { name="breakfast"; version="2.1"; sha256="11i7lqzzkp7ipvi49cv448jz39mlchrpkw2cslhzzj2ha2j785nm"; depends=[plyr Rcpp]; }; breakpoint = derive2 { name="breakpoint"; version="1.2"; sha256="004vi1qr7iib8ykg6sp7xzv0bb841h4vsz2x0cyrhkdp41frglx9"; depends=[doParallel foreach ggplot2 MASS msm]; }; breathtestcore = derive2 { name="breathtestcore"; version="0.8.0"; sha256="08f3bdhpzrb1b2qj3yvf8zaq02vghhq54mzm5brlqw510hq2r6gz"; depends=[assertthat broom dplyr ggfittext ggplot2 MASS multcomp nlme purrr readr readxl signal stringr tibble tidyr xml2]; }; breathteststan = derive2 { name="breathteststan"; version="0.8.0"; sha256="1h05yqpsa1r6p0iybwh7rap0n10vr2wj2driq7qyq6wk6y14m8hc"; depends=[BH dplyr purrr Rcpp RcppEigen rstan rstantools StanHeaders stringr tibble tidyr]; }; brew = derive2 { name="brew"; version="1.0-6"; sha256="1vghazbcha8gvkwwcdagjvzx6yl8zm7kgr0i9wxr4jng06d1l3fp"; depends=[]; }; - brglm = derive2 { name="brglm"; version="0.6.2"; sha256="0c9ngscc6zlfm90fqyggnj04qfkhp5qgf5q3wnfpxwyc8cm47by2"; depends=[profileModel]; }; - brglm2 = derive2 { name="brglm2"; version="0.6.2"; sha256="13apd1p770slnbrqs44khgv7fsh6g3fzd3n04hq36zz308avns9z"; depends=[enrichwith lpSolveAPI MASS Matrix nnet numDeriv]; }; + brglm = derive2 { name="brglm"; version="0.7.1"; sha256="1v68ma1agwhxar76mfvdfkcnd5h4gmxiz8j491rhdsckg271j7sa"; depends=[profileModel]; }; + brglm2 = derive2 { name="brglm2"; version="0.7.0"; sha256="00dn50yv72dnkyggg5qkr7gyij1ghv984bjv2alza8qjmpc1ncyw"; depends=[enrichwith lpSolveAPI MASS Matrix nnet numDeriv]; }; brickr = derive2 { name="brickr"; version="0.3.5"; sha256="1a6yxhq2zly3i3gs4dd19xhyrin1qaxdr7x3a887j7zbcj0j4z9q"; depends=[colorspace dplyr farver ggplot2 magrittr purrr rgl scales tidyr]; }; bridgedist = derive2 { name="bridgedist"; version="0.1.0"; sha256="0hqkpwpi3nv6mfhljl65zcflf4wy72ag36hdam6s7kynfj41qz6w"; depends=[]; }; bridger2 = derive2 { name="bridger2"; version="0.1.0"; sha256="0clp42nnbvd01n65azdi2ghp0mfqwsipzdl2d30q04lcvfkdpxrf"; depends=[BSDA data_table ggplot2 outliers plotly shiny shinydashboard]; }; bridgesampling = derive2 { name="bridgesampling"; version="1.0-0"; sha256="1awhvv0v42w2q6llqi1wqpaiv5zx74cqzigdsvphy2jfp8ajw64y"; depends=[Brobdingnag coda Matrix mvtnorm scales stringr]; }; - brinton = derive2 { name="brinton"; version="0.2.0"; sha256="04g1mz5ivjljb6rk0s6gvqjagn28mk2ixqpmz4dzxwrj0lby2yhq"; depends=[forcats GGally ggplot2 glue gridExtra lubridate pander RColorBrewer rmarkdown sm tibble]; }; - brio = derive2 { name="brio"; version="1.0.0"; sha256="10gjg205vvdwbw3nr8bfrxy5fzqd27y1fsbyn17xnpk57c66igvc"; depends=[]; }; + brinton = derive2 { name="brinton"; version="0.2.1"; sha256="1v1kzhydxv3m8mg3wl7znrn8z3x4wk15p5a9jpq63qyqms1ld5ph"; depends=[forcats GGally ggplot2 glue gridExtra lubridate pander RColorBrewer rmarkdown sm tibble]; }; + brio = derive2 { name="brio"; version="1.1.0"; sha256="0f7amcd2cjm09aiq39209cz680l5d2gqpp6wwfhz24zagfsa7cvb"; depends=[]; }; briqr = derive2 { name="briqr"; version="0.1.0"; sha256="073pdk1094ng4kggzdjvihl791r2qlja1j2w3pfmh2027kn520r8"; depends=[dplyr httr jsonlite magrittr tibble]; }; - briskaR = derive2 { name="briskaR"; version="0.1.2"; sha256="1y9sabj7pfgyvv6s3bbvrb0xhjhwc4pcfsfx847kqdajid92qx8w"; depends=[deldir fftwtools fields MASS mvtnorm pracma raster rgdal rgeos sp]; }; brlrmr = derive2 { name="brlrmr"; version="0.1.7"; sha256="0s47qz8y416x0gz91pzdpr97pmlvddwkvll454vnlafxxk9p5lds"; depends=[boot brglm MASS profileModel Rcpp]; }; brm = derive2 { name="brm"; version="1.1.1"; sha256="0kyr8mxz5g3w41kp08d47f29cff8fqrfbm1ri7hgfg2lgr1151xy"; depends=[]; }; - brms = derive2 { name="brms"; version="2.13.5"; sha256="0a2m5wr134sxflmiq5jzvanzn81fv7xndy9gyvrq3bay9vakic69"; depends=[abind backports bayesplot bridgesampling coda future ggplot2 glue loo Matrix matrixStats mgcv nleqslv nlme Rcpp rstan rstantools shinystan]; }; + brms = derive2 { name="brms"; version="2.14.4"; sha256="0mzwihhgmn405l6zq11a180q4k3chggj9qj0j7q838b9vrszg59j"; depends=[abind backports bayesplot bridgesampling coda future ggplot2 glue loo Matrix matrixStats mgcv nleqslv nlme projpred Rcpp rstan rstantools shinystan]; }; brnn = derive2 { name="brnn"; version="0.8"; sha256="119lxm691ci2bf62jwmbhqsl39xy3jvsi988rr6sdslwaxqyx35b"; depends=[Formula truncnorm]; }; - broman = derive2 { name="broman"; version="0.70-4"; sha256="0xgzxrqqf5l6ydkpmsbcvba2mjggrh02r8vdkdd779vjhh8mqpkh"; depends=[assertthat ggplot2 jsonlite RPushbullet]; }; - broom = derive2 { name="broom"; version="0.7.0"; sha256="0bq8w1ckrladzck2g0mgiyjdrzi06kbqalk5q3pfvj1607fdv3d5"; depends=[backports dplyr ellipsis generics glue purrr rlang stringr tibble tidyr]; }; + brokenstick = derive2 { name="brokenstick"; version="1.1.0"; sha256="02n8fv84cfj32mg08ylpg19alf69kkpknpvd6mx86lclhaqa3cnf"; depends=[dplyr lme4 matrixsampling rlang tidyr]; }; + brolgar = derive2 { name="brolgar"; version="0.1.0"; sha256="1q7rcr59s482f2vg0wifjkwfbrnqq12lbfqfixr2m1njv2ps35vg"; depends=[dplyr fabletools ggplot2 glue magrittr purrr rlang tibble tidyr tsibble vctrs]; }; + broman = derive2 { name="broman"; version="0.71-6"; sha256="02ka3h1d2hl17bz3793yhglabswr6w3xr0x41dzxpn9ziw3w74n0"; depends=[assertthat ggplot2 jsonlite RPushbullet]; }; + broom = derive2 { name="broom"; version="0.7.3"; sha256="0bxwmqj37m06ci378xqlf7kar7pg5g903i1vnrv4i256dkj50mny"; depends=[backports dplyr ellipsis generics glue purrr rlang stringr tibble tidyr]; }; + broom_helpers = derive2 { name="broom.helpers"; version="1.1.0"; sha256="1h835wi6gah6hs11cdlgr9d7qnkq65n4qw5qdiqdkdcfsr27dv7v"; depends=[broom dplyr emmeans labelled lifecycle purrr rlang stringr tibble tidyr usethis]; }; broom_mixed = derive2 { name="broom.mixed"; version="0.2.6"; sha256="1858dninq16s8p00hapn9vb3i1r5alia50bi89a37zcnap31ibai"; depends=[broom coda cubelyr dplyr nlme plyr purrr reshape2 stringr tibble tidyr TMB]; }; - broomExtra = derive2 { name="broomExtra"; version="4.0.4"; sha256="00a445nlvs9qsgwpaf8ksc3xckdh059id0hcigl5h5m2y1ghld5g"; depends=[broom broom_mixed dplyr ipmisc parameters performance rlang]; }; + broomExtra = derive2 { name="broomExtra"; version="4.1.0"; sha256="0js4qm1y9pkhyaxk10yknq3bfvgnchbd80l01mb3ifxzplx6xb0z"; depends=[broom broom_mixed dplyr magrittr parameters performance rlang tibble]; }; brotli = derive2 { name="brotli"; version="1.2"; sha256="07rgdgxh9bvn0qavpclxmkglwyl6ndqasxcs6j12if698dkn976b"; depends=[]; }; brr = derive2 { name="brr"; version="1.0.0"; sha256="050ivnqcaxiyypd1sxfpy6ianhzzmvs6c77ga40g3440cvfigkgw"; depends=[gsl hypergeo pander stringr SuppDists TeachingDemos]; }; brranching = derive2 { name="brranching"; version="0.6.0"; sha256="032n5yp75bkzwb24zbad25f2059hqgdkv6mxsbb49pda34rm6y76"; depends=[ape conditionz crul curl phylocomr phytools taxize]; }; brt = derive2 { name="brt"; version="1.3.0"; sha256="13fn2mv66fys7w0xchh69sb6jggg5c2imk1psi3mlr1902m6ss5m"; depends=[ggplot2]; }; brunnermunzel = derive2 { name="brunnermunzel"; version="1.4.1"; sha256="1lba5cpiray65zg1pv3xv6yl1xg78rqlwxkcmhgizlh1rhpd430p"; depends=[]; }; + brxx = derive2 { name="brxx"; version="0.1.1"; sha256="00lk6h74f8r98is5lp9bhv56jypkx0vljv9k1cb6rj7j44iqjlc0"; depends=[blavaan blme MASS MCMCpack]; }; bs4Dash = derive2 { name="bs4Dash"; version="0.5.0"; sha256="1y75i6bsdy1bsbzwjblsnimw1zzk0zl3qnzqfq9zcnf6q2ghi3r2"; depends=[htmltools shiny]; }; - bsam = derive2 { name="bsam"; version="1.1.2"; sha256="1m2lpqm2i4i35hzr1iylrb8skx8rsys3w542xjyqw030bs7b1rdk"; depends=[coda dplyr ggplot2 gridExtra lubridate msm mvtnorm rjags rworldxtra sp tibble]; }; + bsam = derive2 { name="bsam"; version="1.1.3"; sha256="1yiplh4wcc711w59ir5hxlp3mmgsnfz01d6203vfgclzsi7ix5m9"; depends=[coda dplyr ggplot2 gridExtra lubridate msm mvtnorm rjags rworldxtra sp tibble]; }; bsamGP = derive2 { name="bsamGP"; version="1.2.3"; sha256="1wqs2y9f7fgdvshhzwpjp811h4xhdd1lplpadnpffa2lmyv7vh5s"; depends=[ggplot2 gridExtra MASS]; }; + bscaling = derive2 { name="bscaling"; version="1.0"; sha256="0v1l6ycf1fyxn79rnhlrfnliirbz9snh8rinfzf34yhlnl0chk1p"; depends=[]; }; bsearchtools = derive2 { name="bsearchtools"; version="0.0.61"; sha256="11fqz8kdhqpc3jq34vgv3frzawgsl5y0s83rb2p54yb5yhd3p68w"; depends=[Rcpp]; }; bsem = derive2 { name="bsem"; version="1.0.0"; sha256="1h4wsib6ppqj8nbvj4pzkm04bzrdkg9l7xfmzzmld9cswai4iw52"; depends=[BH coda DiagrammeR lattice magrittr Rcpp RcppEigen rstan rstantools shiny StanHeaders viridis visNetwork]; }; bshazard = derive2 { name="bshazard"; version="1.1"; sha256="1kidypyqlilf794mksjvhja8bmnd9hdhz91ywy0mcddgc6wbar4h"; depends=[Epi survival]; }; bspec = derive2 { name="bspec"; version="1.5"; sha256="0jynvir7z4q1vrvhdn6wijdrjfrkk4544nlawabw2fnfxss91a91"; depends=[]; }; bsplinePsd = derive2 { name="bsplinePsd"; version="0.6.0"; sha256="0f785l02hiq3f7anxqhm09f7lrqgkkqhly7f1x78cxm22hvrqyhg"; depends=[Rcpp]; }; bsplus = derive2 { name="bsplus"; version="0.1.2"; sha256="19vz8f9ln7kf3myx30lpcz8viv51bbl7n6nppys0zrzb6372cpn1"; depends=[glue htmltools jsonlite lubridate magrittr purrr rmarkdown stringr]; }; - bspm = derive2 { name="bspm"; version="0.3.4"; sha256="1kb0h6g3r6r0blmgvh3y23rzaz4k99qw3fgsmvsn2bna22ms2yfy"; depends=[]; }; + bspm = derive2 { name="bspm"; version="0.3.7"; sha256="0fll8kiqn7bcmf1cm4p9i4sny2b6ijk7ls77v5w0cvr8zsbfm8ly"; depends=[]; }; bspmma = derive2 { name="bspmma"; version="0.1-2"; sha256="1a3p1h7bks5yrxv791wfa680v4a6q10p59iz6wvfifhf3ndlaw49"; depends=[]; }; - bssm = derive2 { name="bssm"; version="1.0.0"; sha256="0c4yxhcrpcq4kx1n097p9yhy4aq7vgsl3m04d323k309ya7bg2mz"; depends=[coda diagis ramcmc Rcpp RcppArmadillo sitmo]; }; + bssm = derive2 { name="bssm"; version="1.0.1-1"; sha256="09pxpyh40fa7ljfn5xal8n2q3zxcdv73bfn91q2s0zfjbwpfijip"; depends=[coda diagis ramcmc Rcpp RcppArmadillo sitmo]; }; bssn = derive2 { name="bssn"; version="1.0"; sha256="1brxbvcvqy8n9xpvp5kz47x5ps8hdqgnh6s49051qaylp95qm432"; depends=[ClusterR mvtnorm sn ssmn]; }; - bst = derive2 { name="bst"; version="0.3-21"; sha256="006pria75zmlc1q8jn353wmb28hm4k1an1qffv9jnj0842md4c8q"; depends=[doParallel foreach gbm rpart]; }; + bst = derive2 { name="bst"; version="0.3-23"; sha256="1wx039cl8s1j1dwjg50ivn39fckkf8mzgrm953bg02w0p0fpz5bh"; depends=[doParallel foreach gbm rpart]; }; bsts = derive2 { name="bsts"; version="0.9.5"; sha256="17q82f57xgzgil06z47dgkll88iz6qng7nxw1gjn6sqi5zk72lxq"; depends=[Boom BoomSpikeSlab xts zoo]; }; - bsub = derive2 { name="bsub"; version="1.0.0"; sha256="1byw2wbbva6i0hsb4xz2f65n6ak7w7bpq9g8n25a1s3h9zvqk4pa"; depends=[clisymbols crayon digest GetoptLong GlobalOptions]; }; + bsub = derive2 { name="bsub"; version="1.0.2"; sha256="08ahmhg8fcrb5v14g3ij1qi3vpc92r9w02q9h64a7a1m64fib4lw"; depends=[clisymbols crayon digest GetoptLong GlobalOptions]; }; btb = derive2 { name="btb"; version="0.1.30.3"; sha256="00asbzjgcjd1cm5m1yndbgr60zpvnhbk5b7rhkhc2z1w513bwi8w"; depends=[BH Rcpp RcppArmadillo RcppParallel sf sp]; }; - btergm = derive2 { name="btergm"; version="1.9.9"; sha256="1z2acmh5k4bzhypr2856wwc3qfns4az058cxab6h24z9y2kr6ki5"; depends=[boot coda ergm ggplot2 igraph Matrix network ROCR RSiena sna speedglm statnet_common xergm_common]; }; + btergm = derive2 { name="btergm"; version="1.9.13"; sha256="1md5mxr5in9ag2ydgrkk9kk27zxjx5a9hfxm0mxp3xxcks9h7xk2"; depends=[boot coda ergm ggplot2 igraph Matrix network ROCR RSiena sna speedglm statnet_common xergm_common]; }; bubblyr = derive2 { name="bubblyr"; version="0.1.2"; sha256="04agfwk6rmbhlfblfw1irqnv3yrp00zfn4qwy2169b7ypg8r55v2"; depends=[glue htmltools]; }; bucky = derive2 { name="bucky"; version="1.0.6"; sha256="01rlx0m6h66y1p9k5llg17qpajjhk2vmhbpwc4i5igf5x5g4clgc"; depends=[lmtest sandwich]; }; - buildmer = derive2 { name="buildmer"; version="1.6"; sha256="135hz3nqmp6sbwhfj1l8cqh6nf5jclz6bmdhy9k2yjhg47j3snwq"; depends=[lme4 mgcv nlme plyr]; }; + buildmer = derive2 { name="buildmer"; version="1.7.1"; sha256="1439l4kr42ba5z6sh1yds9578zpi0v5c0hwwmb3yh2r5g4lxlrmd"; depends=[lme4 mgcv nlme plyr]; }; buildr = derive2 { name="buildr"; version="0.0.4"; sha256="1h678bfha02harq0gf35j6rhbwcvf9yzqqidm7131hki42xg2w2q"; depends=[]; }; - bujar = derive2 { name="bujar"; version="0.2-8"; sha256="13q2zv5q7jyj0vjcqqsf60snpqjpj788559jc1mmj3q11mmii0vv"; depends=[bst earth elasticnet gbm mboost mda modeltools mpath rms survival]; }; + bujar = derive2 { name="bujar"; version="0.2-9"; sha256="1hx9yrry1v3vl14y1wpfp1l3cymyqhnff86sv6b112b9cfjpwmvq"; depends=[bst earth elasticnet gbm mboost mda modeltools mpath rms survival]; }; bulletcp = derive2 { name="bulletcp"; version="1.0.0"; sha256="1k7lw8gflih47ncz8hgsj0sxbajnkhz1k7yb7rwbdnzcki3n3jln"; depends=[assertthat dplyr mvtnorm Rdpack]; }; bulletr = derive2 { name="bulletr"; version="0.1"; sha256="181rnrp62almf08gr41qnrnq8qnbqraqdvj4zixdh8fachsq2imp"; depends=[dplyr ggplot2 plotly plyr reshape2 robustbase smoother xml2 zoo]; }; bullwhipgame = derive2 { name="bullwhipgame"; version="0.1.0"; sha256="03nwf2v4zhgkxvkghpkbkxz0cnkqcwwl51ykrk25qciakfqkgfws"; depends=[shiny]; }; @@ -5972,62 +6207,63 @@ in with self; { busdater = derive2 { name="busdater"; version="0.2.0"; sha256="0hib73zay9r7rv49zv1lx0l15jzjyli9f1vrk414l8apggvx4c6s"; depends=[lubridate]; }; butcher = derive2 { name="butcher"; version="0.1.2"; sha256="0z3rpjvrr42j1qqzmadigcq2ivqd40dhz7yymjmbap9nbz26rb3l"; depends=[fs lobstr modeldata purrr rlang tibble usethis]; }; bvarsv = derive2 { name="bvarsv"; version="1.1"; sha256="1bv4fbbi8bn7sqqpjlf8w5jpgydjr15wv5v9940wc42yk792yjrx"; depends=[Rcpp RcppArmadillo]; }; - bvartools = derive2 { name="bvartools"; version="0.0.3"; sha256="1yxciyvzrzfllnmjspv5ivb9i160y7x2q0d5rn9fjy91wq8hvfag"; depends=[coda Matrix Rcpp RcppArmadillo]; }; + bvartools = derive2 { name="bvartools"; version="0.1.0"; sha256="1acwfapxz23d24w8f98wszc8j4db5mxhp1fpp06kzadi5cb2a6gg"; depends=[coda Rcpp RcppArmadillo]; }; bvenn = derive2 { name="bvenn"; version="0.1"; sha256="1xrya49w5bd2b7plfxpqla60b2828rkm0rjmc4qnqzvrahsbal0y"; depends=[]; }; bvls = derive2 { name="bvls"; version="1.4"; sha256="18aaf7kk5mks3a59wwqhm1ckpn6s704l9m5nzy0x5iw0s98ijbm2"; depends=[]; }; bvpSolve = derive2 { name="bvpSolve"; version="1.4.1"; sha256="0pxpnf19g085c1a4nb2j48nr611fg1sdl7jlv79nmy4b985yqvrw"; depends=[deSolve rootSolve]; }; bwd = derive2 { name="bwd"; version="0.1.0"; sha256="1ryd5cqbpns9dsis2a9vjg6fcg23284c3dr3j3l18krdshdksfr0"; depends=[]; }; bwimage = derive2 { name="bwimage"; version="1.3"; sha256="1r5l7z90q2qs92dzp78jj4gf1kg1gc85g6y5rn2z8vxjbvbc5vma"; depends=[jpeg png]; }; - bwsTools = derive2 { name="bwsTools"; version="1.1.1"; sha256="12ww4mb956jxs1329l1zvvc1cgxs69n3naq3502aj80g9giw6xnd"; depends=[crossdes dplyr ggplot2 igraph magrittr rlang tidyr]; }; + bwsTools = derive2 { name="bwsTools"; version="1.2.0"; sha256="181pm9pr0ykyd3mikn6z4z5m7jkv72sisixmilijh6q3393g9pqw"; depends=[crossdes dplyr igraph magrittr rlang tidyr]; }; bysykkel = derive2 { name="bysykkel"; version="0.3.1"; sha256="1lvqbax7dvli4265856f9667ckp9g5l4radz2cp0yk0slsjgsdpg"; depends=[glue httr jsonlite lubridate tibble]; }; bytescircle = derive2 { name="bytescircle"; version="1.1"; sha256="0c83d37kijcvr00pc4qqdci14cpbg6988izyjfjk1yliavyc6mwf"; depends=[]; }; bzinb = derive2 { name="bzinb"; version="1.0.4"; sha256="1424lwsm2ra124h0ahbl42szbx500fqkf9ccw9k1688iwxnfg7f2"; depends=[BH Rcpp]; }; c060 = derive2 { name="c060"; version="0.2-5"; sha256="1862lic0vvidbd7s63j65iz4rf70d5337l80vvrbgv8d7fhnxz0y"; depends=[glmnet lattice mlegp penalizedSVM peperr survival tgp]; }; - c14bazAAR = derive2 { name="c14bazAAR"; version="1.2.0"; sha256="0bgf7fa428zp55qnkzhgghrj4hyv2lkhzg8b6msbq3bz2bah7jlz"; depends=[crayon data_table dplyr httr magrittr pbapply rlang tibble tidyr]; }; - c212 = derive2 { name="c212"; version="0.95"; sha256="1cgmldy2ysz3934fxh0mmzrb2vw33j3pmws53ng7yxg79mb9ixja"; depends=[coda]; }; + c212 = derive2 { name="c212"; version="0.98"; sha256="0pzg239602iq56nhxfdvlk26z58lz6vvlbwsdpwhmich0by4gx4x"; depends=[coda]; }; c2c = derive2 { name="c2c"; version="0.1.0"; sha256="149np512wjnlr9glmqxpiamf6c31v0bh6ym95jpdhk0iw3ic9kvh"; depends=[]; }; c3 = derive2 { name="c3"; version="0.3.0"; sha256="1c2k7ml153bby749qi3a6nckhwwr71mvvps9dkbzkxkwnmlwpz1h"; depends=[data_table dplyr htmlwidgets jsonlite lazyeval viridis]; }; c3net = derive2 { name="c3net"; version="1.1.1"; sha256="0m4nvrs41kmlakc6m203zlncqwgj94wns8kzcb31xngjcacmcq42"; depends=[igraph]; }; cAIC4 = derive2 { name="cAIC4"; version="0.9"; sha256="0imy4kq09an9azqi3aahw3lsmby8km2am0w7fb314xq6ghzf9xmp"; depends=[lme4 Matrix mgcv mvtnorm nlme RLRsim]; }; cIRT = derive2 { name="cIRT"; version="1.3.1"; sha256="1x7cbawzzpzripzyg4yavc9s6kx06ff4q151kbvylr9wsf78s6qg"; depends=[Rcpp RcppArmadillo]; }; - cNORM = derive2 { name="cNORM"; version="1.2.3"; sha256="0ywx8cszyg9zk5pp86f0rigv2m04c93z3p6dqhf6nn8hm8pj41px"; depends=[lattice latticeExtra leaps]; }; + cNORM = derive2 { name="cNORM"; version="2.0.0"; sha256="1pj9mwkb1hq9wvhgngw3gayl0jri861j5dcf4k3albfw15qdxxx2"; depends=[lattice latticeExtra leaps]; }; cOde = derive2 { name="cOde"; version="1.0.0"; sha256="12222wlsk9l6m9y477mjl8x279xhs8c1l1wsq92khwycm1j06jfy"; depends=[]; }; cPCG = derive2 { name="cPCG"; version="1.0"; sha256="1pfbsv2rcjsryn6nr56a7i4yb7k0m3gdfn4q9l1kpzhmv9lic7m1"; depends=[Rcpp RcppArmadillo]; }; cRegulome = derive2 { name="cRegulome"; version="0.3.2"; sha256="0cvxad73l85zsgqmis5p24v71kkzi784b8v5z07f0dh9yp41p96q"; depends=[DBI ggplot2 ggridges httr igraph R_utils RSQLite UpSetR VennDiagram]; }; - cSEM = derive2 { name="cSEM"; version="0.2.0"; sha256="0ynqclr78vi97bd4wds0zws2iydziwzqsfjhpcpi87wca0chm4z8"; depends=[abind alabama cli crayon expm future future_apply lavaan magrittr MASS Matrix matrixcalc matrixStats polycor psych purrr Rdpack symmoments]; }; + cSEM = derive2 { name="cSEM"; version="0.3.0"; sha256="1fl486lm5mxr9pxmpjy0xbzq43gq3v2s6j6g9w7r7ck6mfd53ivb"; depends=[abind alabama cli crayon expm future future_apply lavaan lifecycle magrittr MASS Matrix matrixcalc matrixStats polycor progressr psych purrr Rdpack rlang symmoments]; }; ca = derive2 { name="ca"; version="0.71.1"; sha256="095lk7p2b9835hc3a03c4019wg0baf0dhz6c2vqpaq1m9k4jy304"; depends=[]; }; caMST = derive2 { name="caMST"; version="0.1.3"; sha256="1hhxyw7sbzm2v09xaxvq347gl8p5wkjxx43187mqbw0nzknlg5bg"; depends=[catR diagram mstR]; }; - caRamel = derive2 { name="caRamel"; version="1.1"; sha256="06nppjx66xwdqchna5j6xlhfzs5g36nv8srwivbnfixys29awabb"; depends=[geometry]; }; + caRamel = derive2 { name="caRamel"; version="1.2"; sha256="15w1p770cjsxs198rlc8fzs9m8a4pg5day2iya7xz0fkwb3xmm2z"; depends=[geometry]; }; caRpools = derive2 { name="caRpools"; version="0.83"; sha256="10m7fw1zfr9i6v2qg235diwf3fmfr88incxnqpvnhmqcn082mxrp"; depends=[biomaRt DESeq2 rmarkdown scatterplot3d seqinr sm VennDiagram xlsx]; }; caTools = derive2 { name="caTools"; version="1.18.0"; sha256="0y1kgyiy322yhb0phzwvf2zgjz9awp13lhzhk9v1ddg88656jhq3"; depends=[bitops]; }; - cabinets = derive2 { name="cabinets"; version="0.4.0"; sha256="1crxr1pxs4if86g405x47709zdyv8fqdmlm2wpilcl2bdcpia0y4"; depends=[crayon fs git2r glue here purrr R6 rjson rstudioapi stringr usethis withr]; }; + cabinets = derive2 { name="cabinets"; version="0.6.0"; sha256="1pypn29v91zqncv5kxinfz0f633qmic7n87rf4amjrq83iiid6md"; depends=[cli crayon fs git2r glue R6 renv rstudioapi stringr]; }; cabootcrs = derive2 { name="cabootcrs"; version="2.0"; sha256="1a473ca90306brhfrzf5hw6d6v252kd2vfwkvgblwy26jmrrr2km"; depends=[lpSolve]; }; cacIRT = derive2 { name="cacIRT"; version="1.4"; sha256="145j6isqa8yj2nvlqkxagd076zs10ng3n44khi5p4jj77fjc8gh6"; depends=[]; }; - caesar = derive2 { name="caesar"; version="1.0.0"; sha256="0z1bb5cmjr97l3h9svy4r4bj58jkmq6kdkip577cvy2xf5q9n410"; depends=[binhf]; }; + caesar = derive2 { name="caesar"; version="1.1.0"; sha256="17w19m1c4a8x68bfbll71r9d3d34xnqw7lkhvqbnajd0cdm9xpa2"; depends=[binhf]; }; caffsim = derive2 { name="caffsim"; version="0.2.2"; sha256="00bkgmmqrydpji2pvhcchgl2p8w5ksby4g80i3h76q0bm2325w9h"; depends=[dplyr ggplot2 markdown mgcv shiny tibble tidyr]; }; cairoDevice = derive2 { name="cairoDevice"; version="2.28.2"; sha256="0hd8lcps8s2nmbqgrxc19dslsvppn1fbwylczx6h3isiv9zmxapj"; depends=[]; }; calACS = derive2 { name="calACS"; version="2.2.2"; sha256="0a53k2rzyjksb0ypr5zrask4a6mgiyrqx0l2z3lm218y8pk2jf1w"; depends=[]; }; calcUnique = derive2 { name="calcUnique"; version="0.1.2"; sha256="012mjayj90m5gsd8mhm2ic00pa0bnrjiidq9mv4vxj8slwp641rz"; depends=[]; }; calcWOI = derive2 { name="calcWOI"; version="1.0.3"; sha256="1bxsn9b99hnb365qvlzr0ymwavamlyhs5sm9s2fdjh4zv3f32n3l"; depends=[dualtrees LS2W wavethresh]; }; calculus = derive2 { name="calculus"; version="0.2.1"; sha256="0hs7hzjl6xjza20v9zx9a1piywxa6w3h2rskr52d1dcbc0vwhinp"; depends=[Rcpp]; }; + calendR = derive2 { name="calendR"; version="1.1"; sha256="1gji7ns35swdgg7bzq3vrzi4hnb98c5iw6r1j0k7nn2fdx7kbffp"; depends=[dplyr forcats gggibbous ggimage ggplot2 suncalc]; }; calendar = derive2 { name="calendar"; version="0.0.1"; sha256="18ha6vpx2bpk8p08hajiq2d201fbqhzcycp8ks6wrr06fy04z689"; depends=[lubridate tibble]; }; calibrar = derive2 { name="calibrar"; version="0.2.0"; sha256="1544bc5rhhc6d1mky7ngza00wwh63q07dkbzlwfgyavly8m9cplb"; depends=[cmaes foreach optimx]; }; calibrate = derive2 { name="calibrate"; version="1.7.7"; sha256="19kgrnsyq67iqv1biyssqi30a6v2836ql20nabpy2m692ns0jfvi"; depends=[MASS]; }; calibrateBinary = derive2 { name="calibrateBinary"; version="0.1"; sha256="1k6sl4bg05piyczpk6wsva914gcmy8viyz4423gx9i6ddflb7xdb"; depends=[gelnet GPfit kernlab randtoolbox]; }; calibrator = derive2 { name="calibrator"; version="1.2-8"; sha256="1m9g1pmnr6d9jkg5ab0l0cbqfj7kmx7sdmcdqdhn9ifyhhn7812y"; depends=[cubature emulator mvtnorm]; }; - callr = derive2 { name="callr"; version="3.4.3"; sha256="1dc20gdawy9mhnc452qlshv2p4krs6c2gymvpv365mn141zjgdq1"; depends=[processx R6]; }; + callr = derive2 { name="callr"; version="3.5.1"; sha256="15l6ppsxdadlnl4fk0f8bvf327n8izk96px5d08m1ay9iij8qcyf"; depends=[processx R6]; }; calmate = derive2 { name="calmate"; version="0.12.1"; sha256="07sjbq7bcrhal52pdzsb5pfmk6a8a44wg8xn79sv4y5v74c5xaqz"; depends=[aroma_core MASS matrixStats R_filesets R_methodsS3 R_oo R_utils]; }; calpassapi = derive2 { name="calpassapi"; version="0.0.3"; sha256="1vhx5h7ah75cs1mlw25x7hal90m47596kr7fx2pd8fslq7il7p1b"; depends=[digest dplyr httr jsonlite stringr]; }; + campfin = derive2 { name="campfin"; version="1.0.4"; sha256="0c9hdg8ylw6m0drb87fcqj4pxkyg824xvp2554aw1qij4pk63f1q"; depends=[dplyr fs ggplot2 glue here httr lubridate magrittr purrr readr rlang scales stringdist stringr tibble]; }; camsRad = derive2 { name="camsRad"; version="0.3.0"; sha256="06gar6qan1ka01ngjvbpcv649yvfga697mplwn1x6qnfr4ngb7cs"; depends=[httr xml2]; }; camtrapR = derive2 { name="camtrapR"; version="2.0.3"; sha256="13zg8kx28il7rbyr2p3c1xdxx84b7shpcmgavzjqzh6wjm5bh5mh"; depends=[data_table overlap secr sp]; }; cancensus = derive2 { name="cancensus"; version="0.3.2"; sha256="17qi7kx23iyvxy5yy6g46avlh988a8l4r7p040waqhz4nd9zy31q"; depends=[digest dplyr httr jsonlite rlang]; }; cancerGI = derive2 { name="cancerGI"; version="1.0.0"; sha256="1chkcyf9m98gbn6b3vmb1baw7kii4g5vxvg2xfi7i6wwdn8sqr65"; depends=[igraph qvalue reshape2 survival systemfit]; }; cancerTiming = derive2 { name="cancerTiming"; version="3.1.8"; sha256="1sfi8q2f5ag7iak0sf9pmqncb89w3gnxdiwjwpivkwhr28ais4mq"; depends=[gplots LearnBayes]; }; candisc = derive2 { name="candisc"; version="0.8-3"; sha256="0bshi686sad31052glai1wmzxshvafp1vkar7zirds3x737gb0fp"; depends=[car heplots]; }; - canprot = derive2 { name="canprot"; version="1.0.0"; sha256="19dcknp6lrw7r3hs33lqn1iiwqgd34pb470ai8bvxhybx21hzjzi"; depends=[CHNOSZ knitr MASS rmarkdown xtable]; }; + canprot = derive2 { name="canprot"; version="1.1.0"; sha256="0y6azzs603bf7rrz8hfql754xsdywl35846hj70f6sn1dj5wbzlk"; depends=[MASS rmarkdown xtable]; }; cansim = derive2 { name="cansim"; version="0.3.5"; sha256="0lqkyq2n8v2y172ihyb9vh3mimrkg2yx2c42cxdaz4p7gqiq7z8r"; depends=[dplyr httr jsonlite purrr readr rlang rvest stringr tibble xml2]; }; - canvasXpress = derive2 { name="canvasXpress"; version="1.27.6-1"; sha256="0vk2iddcyc81qgvlw3k31sh2hsjbxsrcb77mxay3s32wkqr7knwa"; depends=[htmlwidgets httr]; }; - canvasXpress_data = derive2 { name="canvasXpress.data"; version="1.29.0"; sha256="12zlw950vjdjlh786c0l4wmhhzmzpgcsjfdyrmqnr1mb1mpx9vqz"; depends=[]; }; + canvasXpress = derive2 { name="canvasXpress"; version="1.29.6"; sha256="0xy85rj2zd972ziikycsfzghv3q54b2fw4nj29clj2liw4ksm5fq"; depends=[htmlwidgets httr]; }; + canvasXpress_data = derive2 { name="canvasXpress.data"; version="1.30.5"; sha256="1w6lyc02n2gd59y2q2wwmx8a0awwgv95y6pjcxbj8438djnlqkk7"; depends=[]; }; cap = derive2 { name="cap"; version="1.0"; sha256="1pv8hskxjbp589dn7rx80yaa1ld76x1w37bss2fyrys1p3qr78aa"; depends=[MASS multigroup]; }; caper = derive2 { name="caper"; version="1.0.1"; sha256="0md0sngj7wsv2d4d7fmyyz9qqismk3ps9l3qk1blqz1yi19pq124"; depends=[ape MASS mvtnorm]; }; capitalR = derive2 { name="capitalR"; version="1.3.0"; sha256="08lvncia9mdrnw84zydf1k7336xawiirh2swziqfwx3z1n172n52"; depends=[]; }; @@ -6037,13 +6273,14 @@ in with self; { captr = derive2 { name="captr"; version="0.3.0"; sha256="13j2nq9hm37g4h5fjdpz7kix0sqajdd7zssjfgil06ixfmnsijkx"; depends=[curl jsonlite]; }; capushe = derive2 { name="capushe"; version="1.1.1"; sha256="1aa76ir1kp67hiz7dr60azyc71yzslshyc640fjh0fpw0sp5kwbc"; depends=[MASS]; }; capwire = derive2 { name="capwire"; version="1.1.4"; sha256="18a3dnbgr55yjdk6pd7agmb48lsiqjpd7fm64dr1si6rpgpl4i9c"; depends=[]; }; - car = derive2 { name="car"; version="3.0-9"; sha256="1clh8c7mj87i4hz27l16w76dpw7k4mlnjbgm9mbrhrfkv0lpb63c"; depends=[abind carData lme4 maptools MASS mgcv nlme nnet pbkrtest quantreg rio]; }; + car = derive2 { name="car"; version="3.0-10"; sha256="1w95b7xm0bna3qm637pwyv4s7294ffz9dl153naprd79zv91dqqw"; depends=[abind carData lme4 maptools MASS mgcv nlme nnet pbkrtest quantreg rio]; }; carData = derive2 { name="carData"; version="3.0-4"; sha256="09270j39n4jpswxqps20b12zaj8dz4rrqpk2l2j5bnf1xzizb9nd"; depends=[]; }; carSurv = derive2 { name="carSurv"; version="1.0.0"; sha256="0wv7lp10i4sdfqyizg77ghblp3pcp7wzhs946sm0wl6w00krav9j"; depends=[corpcor fdrtool mboost Rcpp survival]; }; caracas = derive2 { name="caracas"; version="1.0.1"; sha256="157m594lyl9726cvyyw3vgbyphrmny01pd2c2yw464krfxxxv0i4"; depends=[reticulate]; }; - carat = derive2 { name="carat"; version="1.1"; sha256="0c4fbk13gra8vhqxfv0wswnfh72kjd7ppwsr3kw4w6g4xprxmnwp"; depends=[ggplot2 gridExtra Rcpp RcppArmadillo stringr]; }; + carat = derive2 { name="carat"; version="1.4"; sha256="1dlmmnsdy1vjiv0fw1k0h0xzd05hqryzc4vw9gbjj3ii6jyds8hk"; depends=[ggplot2 gridExtra Rcpp RcppArmadillo stringr]; }; carbonate = derive2 { name="carbonate"; version="0.1.3"; sha256="0y1wjrlh0rbfl1wz9028b637gs20giifp9ykg1yir2ak7fpwbq85"; depends=[clipr details httr magick R6 RSelenium rtweet wdman yaml]; }; carcass = derive2 { name="carcass"; version="1.6"; sha256="0nhp35nxjqqmy15rf9vc0qyymy7d0v8mc84570b9nc62g5xac8xy"; depends=[arm expm lme4 MASS survival]; }; + card = derive2 { name="card"; version="0.1.0"; sha256="1api0j06fp5av5a48vnnm1wvwdcskynf0xsj9pb41njxdh9v8daf"; depends=[broom data_table dplyr generics ggplot2 ggrepel hardhat Hmisc lubridate lutz magrittr purrr readr recipes rlang sf stringr survival tibble tidyr]; }; cardidates = derive2 { name="cardidates"; version="0.4.8"; sha256="1mfd5sgzswhs9rln2bgxx8c54z69xp8l5dfmx7jfh8jl43qkzpjf"; depends=[boot lattice pastecs]; }; cardioModel = derive2 { name="cardioModel"; version="1.4"; sha256="1a2nvn4a4zc89pb01m20pxqgbj0ypzzvx9w2vfzwly1kzkhvc9hr"; depends=[lubridate nlme]; }; care = derive2 { name="care"; version="1.1.10"; sha256="00h36by40v60mqzbf615a99sdfz0i42i57wybxrcm7y1y2la0da8"; depends=[corpcor]; }; @@ -6056,10 +6293,11 @@ in with self; { carpenter = derive2 { name="carpenter"; version="0.2.2"; sha256="13ahhdc6f5ngrhb7slqbxzfs3wswixh0argyr6l46cv4fdkaa80s"; depends=[dplyr lazyeval magrittr pander tibble tidyr]; }; carrier = derive2 { name="carrier"; version="0.1.0"; sha256="0bqnwnnjqjk9q0lxq6kkz9s75ss10lfyyywyyi24m8wppxpw1vqc"; depends=[pryr rlang]; }; cartograflow = derive2 { name="cartograflow"; version="1.0.3"; sha256="09n3pgm70frrx9li1djrwkf4lzcq9c1xjs037vmsb1as0xvd19a1"; depends=[dplyr ggplot2 igraph maptools plotly reshape2 rgeos rlang sf sp]; }; - cartogram = derive2 { name="cartogram"; version="0.2.0"; sha256="1b6jr6sf821xa2cbm09zmnvvai6azh7p9zhz78a4yqpiwdw122sc"; depends=[packcircles sf]; }; - cartography = derive2 { name="cartography"; version="2.4.1"; sha256="0pb914zbqvii95mfsqkxs2y22fj620ry2hdqbkbvh5pdq5ls549v"; depends=[classInt curl png raster Rcpp rgeos sf slippymath sp]; }; + cartogram = derive2 { name="cartogram"; version="0.2.2"; sha256="0kz8hwdr5n8llkylwaixnb66f4pzaxxniz57spxhqizmi6qay7yd"; depends=[packcircles sf]; }; + cartography = derive2 { name="cartography"; version="2.4.2"; sha256="04i1lwf4l420dcgkzr529883yyhfirfr2b0bnksrwili44nfj9ai"; depends=[classInt curl png raster Rcpp rgeos sf slippymath sp]; }; cartools = derive2 { name="cartools"; version="0.1.0"; sha256="0gc5502373f0c2m2rh6awvyfqrg1wx1f341dm2byk9znba887lgs"; depends=[animation devtools dplyr gapminder ggplot2 knitr rlist rmarkdown roxygen2 sde shiny tidyverse usethis]; }; carx = derive2 { name="carx"; version="0.7.1"; sha256="1qyqsj6pfzzqyaj6076zvgcimhl4cll6sxfb6aigm02rwfkq5gvh"; depends=[matrixStats mvtnorm nlme tmvtnorm xts zoo]; }; + cascadess = derive2 { name="cascadess"; version="0.1.0"; sha256="105m5w8rb8bkzmlc5nwb4g0wl8jgvz63jxq665x4jfq0z78qiwgd"; depends=[crayon htmltools magrittr rlang]; }; caschrono = derive2 { name="caschrono"; version="2.2"; sha256="0lbf7j6p5gzm4kk8sgzcmxwwzg59wp6g6l38m04609lpcsvxkd52"; depends=[Hmisc zoo]; }; cascsim = derive2 { name="cascsim"; version="0.4"; sha256="0n6frnbby1pjpx1z9lzxflmja2mg0dy99c5f7biakpaqi82x5xjb"; depends=[copula fitdistrplus moments R2HTML scatterplot3d]; }; caseMatch = derive2 { name="caseMatch"; version="1.0.8"; sha256="0bp2g0zzcspa6riinsa3bp1qwiip6z058hn2y5mw0w9xah8a685a"; depends=[]; }; @@ -6067,14 +6305,15 @@ in with self; { casen = derive2 { name="casen"; version="0.1.4"; sha256="19f52vqrzqd8mmnaf39jmsm5mhydv74gpnb4rxr3n9w07ppb77c9"; depends=[dplyr glue haven janitor labelled magrittr purrr rlang srvyr survey tibble tidyr]; }; casino = derive2 { name="casino"; version="0.1.0"; sha256="07fphn46718gr1zm0xr43mwv7yk697xrc40lxxin315cf3gm0cka"; depends=[crayon dplyr ggplot2 magrittr purrr R6 tibble tidyr]; }; cassandRa = derive2 { name="cassandRa"; version="0.1.0"; sha256="0rwqzxbflxn1iyggm3mq6pkbl61mhk4vdwqwzlwrhrvvr2ib236r"; depends=[bipartite boot dplyr ggplot2 magrittr purrr reshape2 tidyr vegan]; }; - castor = derive2 { name="castor"; version="1.6.2"; sha256="03i69yk5nwrrw7zhahxk597cs7iamwy966qks8yd9hzl5zj5fpy6"; depends=[naturalsort nloptr Rcpp]; }; + castor = derive2 { name="castor"; version="1.6.4"; sha256="0dl7j1ccbfr43c1jn2g956f12fvhwrf49w391s20d2q70fnmq7c7"; depends=[naturalsort nloptr Rcpp]; }; cat = derive2 { name="cat"; version="0.0-6.5"; sha256="1gv7chqp6kccipkrxjwhsa7yizizsmk4pj8672rgjmpfcc64pqfm"; depends=[]; }; cat_dt = derive2 { name="cat.dt"; version="0.2.0"; sha256="1g9058gqkk2ij29aicvvqx9yx7iwh4a58akp6qznppfln4zw9wcb"; depends=[ggplot2 Matrix Rglpk]; }; + cat2cat = derive2 { name="cat2cat"; version="0.2.0"; sha256="0rbzzf8yxi3d9c3xx91hhv8y5mmks40gb6azdd9la22gaywc5m75"; depends=[assertthat caret data_table dplyr MASS progress randomForest rlang tidyr]; }; catIrt = derive2 { name="catIrt"; version="0.5-0"; sha256="09010z1q96nbnpys6mybspaqy57lvgd2cvwgnfijzgx3kl87pwnl"; depends=[numDeriv]; }; catR = derive2 { name="catR"; version="3.16"; sha256="1w39dxfzqk065v64qzmfamx8p1njsv13a461s6clagbqmhysmzbx"; depends=[]; }; - catSurv = derive2 { name="catSurv"; version="1.2.0"; sha256="0z91643grmzgd1qn867c7nk3v38vyy6h7q0k082r6hgnfbl6vx6c"; depends=[BH jsonlite ltm plyr Rcpp RcppArmadillo RcppGSL RcppParallel]; }; + catSurv = derive2 { name="catSurv"; version="1.3.0"; sha256="1vj7cw6v94p4ma61wwyxzsh36cj6fp38pqfjmyqr0czwgz04db05"; depends=[BH jsonlite ltm plyr Rcpp RcppArmadillo RcppGSL RcppParallel]; }; catch = derive2 { name="catch"; version="1.0"; sha256="16gdjrmlsnpyc38fihggj6c7wpgpmf4phcwrimnncdhwlk038yn8"; depends=[MASS Matrix tensr]; }; - catchr = derive2 { name="catchr"; version="0.2.2"; sha256="02swyg21wd6793nk590lis5bh36lb2mjvv1k05szf22k08vsqv77"; depends=[purrr rlang]; }; + catchr = derive2 { name="catchr"; version="0.2.3"; sha256="1ix90lqx7m4rx0i6hzj1bph4yg9ch9w8qm3f9yigq1gm74zabzrl"; depends=[purrr rlang]; }; catcont = derive2 { name="catcont"; version="0.5.0"; sha256="0ix6ipm3nn9aq5vxirjga2kwwfnxn4v8ggfjlg5v9027v2r8rb96"; depends=[dplyr]; }; catdap = derive2 { name="catdap"; version="1.3.5"; sha256="0fyhl69z2lznymvpzxra9qvcg85ggzkfjy68c6mzdmf1ja44d2k5"; depends=[]; }; catdata = derive2 { name="catdata"; version="1.2.2"; sha256="14kx7yi0cv6dyh9wjasb8gn6cp1bhglgwql7dc2a7lqvdcp0d5vj"; depends=[MASS]; }; @@ -6083,51 +6322,53 @@ in with self; { catenary = derive2 { name="catenary"; version="1.1.2"; sha256="1n64kq3lkaf00a2mghs67hnxvi4dp6g12pwifyx0bd418wkw9wf3"; depends=[boot broom dplyr ggplot2 tidyverse]; }; catfun = derive2 { name="catfun"; version="0.1.4"; sha256="1482rll333fvy4h58f15flfs7qrck3vk9bzpdn3hayhnmc7svmma"; depends=[broom cli DescTools epitools Hmisc magrittr rlang]; }; cati = derive2 { name="cati"; version="0.99.3"; sha256="0hq6hdzriab380pc0mx6g8xqflqj5mznr4b7fqw2f51kx8ang8hg"; depends=[ade4 ape e1071 FD geometry hypervolume nlme rasterVis vegan]; }; - catlearn = derive2 { name="catlearn"; version="0.7.1"; sha256="194gqx94wkl4zr01ms5g684ma328q35cfqpwa63jv98scrybrbwj"; depends=[doParallel dplyr foreach Rcpp tidyr]; }; + catlearn = derive2 { name="catlearn"; version="0.8"; sha256="0vk4amvl6l4cxhfcr9z5glyb752vfsizlzqb14jv04am391xl4qd"; depends=[doParallel dplyr foreach Rcpp RcppArmadillo tidyr]; }; catmap = derive2 { name="catmap"; version="1.6.4"; sha256="18449qh10jxfi8p49gmbnib5y013nfdgdblbs4n0mfs0nnzb10sx"; depends=[forestplot metafor]; }; + catmaply = derive2 { name="catmaply"; version="0.9.0"; sha256="0x2pzvjjhbwnvj8q1882bvqg895nj2airgmcidkixjmbq267vajz"; depends=[dplyr lubridate magrittr plotly rlang tidyverse]; }; catnet = derive2 { name="catnet"; version="1.15.7"; sha256="015qh9k0jj5plp777j3kl20601qiwadkaqrdb0483h3gwqwy828g"; depends=[]; }; catseyes = derive2 { name="catseyes"; version="0.2.5"; sha256="11n2kxkqv4hqymkj6lkpcvhq6325q8f5w384xf8zb71jl8vx616l"; depends=[]; }; - catsim = derive2 { name="catsim"; version="0.2.1"; sha256="1ri57jm48ydxkrla46chys86yl4w7jyi1r5rzh4r7viwjp2mrgmz"; depends=[Rcpp testthat]; }; + catsim = derive2 { name="catsim"; version="0.2.3"; sha256="1gz38xrzbray5ciiimkzdass8bhmiqxh6bcngjm5i8dvafk5gf9g"; depends=[Rcpp testthat]; }; catspec = derive2 { name="catspec"; version="0.97"; sha256="1crry0vg2ijahkq9msbkqknljx6vnx2m88bmy34p9vb170g9dbs1"; depends=[]; }; cattonum = derive2 { name="cattonum"; version="0.0.5"; sha256="11h9nh2i2bmd0b562l5avhwpj9ppnfmzd9nsv94cymhwn5h6nmg6"; depends=[dplyr purrr Rcpp rlang tibble tidyselect]; }; causact = derive2 { name="causact"; version="0.3.3"; sha256="11dq6bsjbfk4zgipyhgapq2r2akh82nx3qf7wwaa38lbrrcpiy18"; depends=[coda cowplot DiagrammeR dplyr forcats ggplot2 greta htmlwidgets igraph magrittr purrr rlang rstudioapi stringr tidyr]; }; + causalCmprsk = derive2 { name="causalCmprsk"; version="1.0.0"; sha256="025p02fph5zirbccw1nxk29fdx53r5jd9asll7pwfnr45l8549pi"; depends=[data_table doParallel foreach inline purrr survival]; }; causaldrf = derive2 { name="causaldrf"; version="0.3"; sha256="16gqx8b8alwm8a4lm69qamnqr3bg2qbz0d6q4lyqyrwsk12grid6"; depends=[mgcv survey]; }; causaleffect = derive2 { name="causaleffect"; version="1.3.10"; sha256="0z7vdhm9g95s9nkyx4jdzqrap24nb63n8mr23b9gqm6s1m47sc0z"; depends=[ggm igraph XML]; }; causaloptim = derive2 { name="causaloptim"; version="0.7.1"; sha256="0i74plwzb69pvrqfwjf7nabvj57bid3ff3gm08hgvfincv1mh6xn"; depends=[igraph Rcpp shiny]; }; causalsens = derive2 { name="causalsens"; version="0.1.2"; sha256="1xy8nybflbw6hymc15mmz27ic6hcq89wryb8q6d4zi216lwv2nww"; depends=[]; }; - causalweight = derive2 { name="causalweight"; version="0.2.1"; sha256="0r0a0i9y1cfmv5kkic7rpqpk4ixs6xql2k4ssmcdnh2zl5q68m30"; depends=[e1071 glmnet hdm LARF mvtnorm np ranger SuperLearner xgboost]; }; + causalweight = derive2 { name="causalweight"; version="1.0.0"; sha256="1lbiwmpgs7aqa3z4xz3mfq6pwnxhy264cw0di43sa7b14fprvk20"; depends=[e1071 fastDummies glmnet hdm LARF mvtnorm np ranger SuperLearner xgboost]; }; cba = derive2 { name="cba"; version="0.2-21"; sha256="0j2hbp0xlfp28gqgnkcvmb4yp1kc5m2bp5x7pr4m1pz2b1s7h7m6"; depends=[proxy]; }; + cban = derive2 { name="cban"; version="1.0"; sha256="0y0mfb177r9k8j2clyrrs9hjy5kna1z6j23dnb50wkh7jf4496s2"; depends=[]; }; cbanalysis = derive2 { name="cbanalysis"; version="0.2.0"; sha256="0h0h8krlb6rckjpcw0jbbr8pcy3jm0cszimbm56l0ca668kiix06"; depends=[]; }; cbar = derive2 { name="cbar"; version="0.1.3"; sha256="1jy52qnpjvszdd8xviv3vr00ds6bah73q0mhd4kixf68jafnxd35"; depends=[Boom bsts dplyr ggplot2 magrittr]; }; - cbinom = derive2 { name="cbinom"; version="1.3"; sha256="0d9rsvs0zmm37pf1v9vbkkghi0pjlavzi5ar2cvsjapg9x4zg6wl"; depends=[Rcpp]; }; + cbinom = derive2 { name="cbinom"; version="1.5"; sha256="0zhsxhbg9v3p5v21lmj00qaag4j6b5qla9hd86zggsw24x2amg1y"; depends=[Rcpp]; }; cbird = derive2 { name="cbird"; version="1.0"; sha256="0kzylylk46swd7f0j6kjyrcs3plbx9799q9kb8hjxmgh0qcjk2p6"; depends=[]; }; cblasr = derive2 { name="cblasr"; version="1.0.0"; sha256="1bz8d4124qpja4bvzn6k1swi89cfyrcpwg2nwyj4r8y0m1hbpc71"; depends=[Rcpp]; }; - cbq = derive2 { name="cbq"; version="0.2.0.1"; sha256="0809l4qziybxhmkglj9763sjndzjl31c83ghhh2hdy93bcw75bsm"; depends=[BH Formula Rcpp RcppEigen rstan StanHeaders]; }; + cbq = derive2 { name="cbq"; version="0.2.0.2"; sha256="0vg1mhk147pib61v4im3ikc551c2nmmcfah9fjw9c978gf81g32n"; depends=[BH Formula Rcpp RcppEigen rstan rstantools StanHeaders]; }; cbsem = derive2 { name="cbsem"; version="1.0.0"; sha256="0gc14rhfy566yw2yqzq7yk0xanpzcz7zp3km483azgk816vakbn4"; depends=[]; }; - cbsodataR = derive2 { name="cbsodataR"; version="0.4.1"; sha256="1nrkh2505xkpdrvs1wlibp8md0qvlpknwiydiiqn216ipzjyp8p7"; depends=[jsonlite whisker]; }; + cbsodataR = derive2 { name="cbsodataR"; version="0.5.1"; sha256="02dalankaa4lfv9r7bc9cphmwb0mq6an7bs44rihipj8dsjd0v9y"; depends=[jsonlite whisker]; }; ccChooser = derive2 { name="ccChooser"; version="0.2.6"; sha256="1vgp4zhg46hcf9ma2cmwgnfrqkmq1arh0ahyzjpfk3817vh7disc"; depends=[cluster]; }; ccRemover = derive2 { name="ccRemover"; version="1.0.4"; sha256="1npd0vx2hyg7qbwd650987i49v5cxr6i1hlj5rw6fxc0b808s596"; depends=[]; }; ccaPP = derive2 { name="ccaPP"; version="0.3.3"; sha256="1p08gih67950khfkzhiksa8qw2f9mrmyqiiapsjpv6zc5g0lchhk"; depends=[pcaPP Rcpp RcppArmadillo robustbase]; }; - ccafs = derive2 { name="ccafs"; version="0.1.0"; sha256="1bb1127mfpz6s2hs43msjcxk56bsk6vhxznpnv0fb21r8xnx0g7m"; depends=[crul data_table httr jsonlite rappdirs raster tibble xml2]; }; cccd = derive2 { name="cccd"; version="1.5"; sha256="0m364zsrgr7mh1yhl2lqxpaf71gzq3y3pp9qgnj4spiy4iadyy7i"; depends=[deldir FNN igraph proxy]; }; - cccp = derive2 { name="cccp"; version="0.2-4"; sha256="1hw0xzfdycrnhkym5va430jk1b9ywf7wbm9qyj4a62n210hk4nzc"; depends=[Rcpp RcppArmadillo]; }; + cccp = derive2 { name="cccp"; version="0.2-7"; sha256="080rr1nsj465458yfawbcfgvdng42gzbzjzblvkdm5c1hkwnn7ij"; depends=[Rcpp RcppArmadillo]; }; cccrm = derive2 { name="cccrm"; version="2.0.1"; sha256="15v2d4im7ji7pbi94wagg010wdgf4ly24kyczx4akcq3qd4vihff"; depends=[Deriv dplyr nlme tidyselect]; }; ccda = derive2 { name="ccda"; version="1.1.1"; sha256="1kka4vmhpcnl4skdmijzsxrfj6dgax6hhlxvp7gkqlfaazq8pzf0"; depends=[MASS]; }; ccdrAlgorithm = derive2 { name="ccdrAlgorithm"; version="0.0.5"; sha256="171k70p4qyasr385ma3cvcga2b4nbz2dfry78wqx5yb1aa6wwcyc"; depends=[Rcpp sparsebnUtils]; }; - cchs = derive2 { name="cchs"; version="0.4.1"; sha256="1aq6mc3hyhp3g8yzk6y82zz8nriwmxms9lgpw06rf857im6bn5ls"; depends=[survival]; }; + cchs = derive2 { name="cchs"; version="0.4.2"; sha256="18zk50g7rw8cb09fczpcdgzjl1b06rgf6lwy99sg7nq4scnzgzm8"; depends=[survival]; }; cchsflow = derive2 { name="cchsflow"; version="1.6.0"; sha256="0fj27d4hz4yrs7crqi1zbn7xwbibkjr1nr6srj1zy8lkl7rhicy2"; depends=[dplyr haven magrittr sjlabelled stringr]; }; - cclust = derive2 { name="cclust"; version="0.6-21"; sha256="1n5hh0017bcq8ck52qq89jm9zgdfpmiksrypsnv2vvhk3nr0s91c"; depends=[]; }; + cclust = derive2 { name="cclust"; version="0.6-22"; sha256="1wyiwq16zyvc0vqbap1y4zfkvlgzwzjrx4vmrjhzlqxci8jryjbs"; depends=[]; }; ccmm = derive2 { name="ccmm"; version="1.0"; sha256="0855nr74xxpy7in2vrw15g8pv7nm1374irc1c5hikr5hadk5pf8v"; depends=[MASS]; }; ccostr = derive2 { name="ccostr"; version="0.1.0"; sha256="0yfmj8v7ip595v87w9dmlzl5rih2j0lsapswh9b9vvc20wnk48ld"; depends=[data_table dplyr forcats ggplot2 knitr msm Rdpack rlang survival tibble]; }; ccrs = derive2 { name="ccrs"; version="0.1.0"; sha256="1nyw4ip9v7y6yfbfdz3bwhy4r6hpp1hiip3ycldxlkl9wrxkxgrw"; depends=[cds colorspace dplyr limSolve lsbclust msm]; }; ccss = derive2 { name="ccss"; version="1.0"; sha256="0m2facn6kwxrjxg9a8z0pjnhp0rkgw6nxj6sac93ig24zygx4380"; depends=[]; }; cctools = derive2 { name="cctools"; version="0.1.2"; sha256="03lp9pa9qr2hi584ivvmswxmwjw1c3a6xqladpqldjhzvzpxvcwi"; depends=[qrng Rcpp RcppArmadillo]; }; - cdata = derive2 { name="cdata"; version="1.1.7"; sha256="0liwnq4hvgsprkbk9lb4aldr2s9zjy65myj0dpfr7kkjkzd9akxq"; depends=[rqdatatable rquery wrapr]; }; + cd = derive2 { name="cd"; version="0.1.0"; sha256="1zzhkrsidny5h6jvbip2a4i4klqdgw7s1w8h8hkc3mpbxjfr615r"; depends=[]; }; + cdata = derive2 { name="cdata"; version="1.1.9"; sha256="1hnc74psz6940v0yqw7zrp9a75g0bmq5a0qfpddxkcij3vm6qiya"; depends=[rqdatatable rquery wrapr]; }; cdb = derive2 { name="cdb"; version="0.0.1"; sha256="1rdb4lacjcw67apdyiv7cl1xvv9d1mrzck1qk605n6794k7wf2ys"; depends=[bitops]; }; - cdcatR = derive2 { name="cdcatR"; version="1.0.1"; sha256="117pw56k44qfz56nd659f6zrsxipk2kj5py96ql3bmds91f96j1h"; depends=[cowplot doSNOW foreach GDINA ggplot2 NPCD]; }; - cdcfluview = derive2 { name="cdcfluview"; version="0.9.1"; sha256="0j892zwg7y9gm057n1nk7r08wa8b611dzbanphfplh33j66rm4yg"; depends=[dplyr httr jsonlite MMWRweek purrr readr sf tibble units xml2]; }; + cdcatR = derive2 { name="cdcatR"; version="1.0.2"; sha256="12xrk4v8rlqkndw3pdzvzv7qi86y2xvvsnh36nmpib4qdf6b2jry"; depends=[cowplot doSNOW foreach GDINA ggplot2 NPCD]; }; + cdcfluview = derive2 { name="cdcfluview"; version="0.9.2"; sha256="05ah96blwkgdzayi7ay14vy9va0y4lxarxapnvw420jy1k40y27j"; depends=[dplyr httr jsonlite MMWRweek progress purrr readr sf tibble units xml2]; }; cdcsis = derive2 { name="cdcsis"; version="2.0.3"; sha256="0hv52valyig3zzywm3058c5nxb2n7y3j2vfibxdbfg8414wwapd9"; depends=[ks mvtnorm Rcpp]; }; - cde = derive2 { name="cde"; version="0.4.1"; sha256="19aifi2wh3hi929bf15v96z6gbzawgawjdipvx1v95krzij8fl2n"; depends=[data_table viridisLite]; }; cder = derive2 { name="cder"; version="0.2-2"; sha256="0aw2c170sqx2y4iz16avqijahwxlsaz590mxvsx4bicfd8nrcynk"; depends=[curl dplyr glue lubridate readr rlang stringr tibble]; }; cdfquantreg = derive2 { name="cdfquantreg"; version="1.2.2"; sha256="094mk2hvxww2lndx5wkw368ynqx6klbdwl30d1yv7kqmr2yy7388"; depends=[Formula MASS pracma]; }; cdlTools = derive2 { name="cdlTools"; version="0.15"; sha256="1p5d48v6nwlrgqqi0sg98zfhiycjcha6g12a7515xrvp6f5p28jn"; depends=[httr raster]; }; @@ -6142,31 +6383,33 @@ in with self; { celestial = derive2 { name="celestial"; version="1.4.6"; sha256="1gls0qvr8mxz79lsmk76v253f747g0cqys8p8wjmpijs8r0pyr4z"; depends=[NISTunits pracma RANN]; }; cellOrigins = derive2 { name="cellOrigins"; version="0.1.3"; sha256="0nxhyz9bz0f598wpr10hm1d0zx83450xf9jkrl279v46x8sx36n4"; depends=[iterpc]; }; cellVolumeDist = derive2 { name="cellVolumeDist"; version="1.3"; sha256="00hq3nbfbnmg2lhrqd0glkh5ld50fv54ll3q6v875d1lgs44sln1"; depends=[gplots minpack_lm]; }; - cellWise = derive2 { name="cellWise"; version="2.1.1"; sha256="10cx5nmqcxx6prwkcpv7av10qcl4qygra9sdnbavbvwgvf46l28z"; depends=[ggplot2 gridExtra matrixStats Rcpp RcppArmadillo reshape2 robustbase rrcov scales svd]; }; + cellWise = derive2 { name="cellWise"; version="2.2.3"; sha256="0b9m98mdp2zv4qzdh8l2bj4ipgbbg70k1rid272fvywh9xv2vvzc"; depends=[ggplot2 gridExtra matrixStats Rcpp RcppArmadillo reshape2 robustbase rrcov scales svd]; }; cellranger = derive2 { name="cellranger"; version="1.1.0"; sha256="16fgi3annn34c3cxi0pxf62mmmmxi21hp0zzlv7bkfsjqy4g4f2x"; depends=[rematch tibble]; }; celltrackR = derive2 { name="celltrackR"; version="0.3.1"; sha256="1mnqaklc3rkx5mm41n99ky11bjs4l0dppapkwfvkyg3a0h0xzsbb"; depends=[ellipse]; }; - cem = derive2 { name="cem"; version="1.1.20"; sha256="058yg297x5i8s9lzfljrn568a8mpx7dcnqhv3b02a6cpnqx0n4py"; depends=[combinat lattice MatchIt nlme randomForest]; }; + cem = derive2 { name="cem"; version="1.1.27"; sha256="096ilbrkxjsbyf3pk126y2dqc3hzbnfpagr96byagap01q24pyij"; depends=[combinat lattice MatchIt nlme randomForest]; }; cemco = derive2 { name="cemco"; version="0.1"; sha256="00x9313rlxjb1lrfgx394awyhn2ivkn291q6sb5rpmghsvwq0qpb"; depends=[clusteval doParallel foreach MASS mclust mvtnorm nnet rootSolve]; }; cenGAM = derive2 { name="cenGAM"; version="0.5.3"; sha256="0qic2g2bq24k9jimxdk8g7bsmi4br2r6159ipdhh5ym81ji3sf5p"; depends=[mgcv]; }; cenROC = derive2 { name="cenROC"; version="1.2.0"; sha256="07ja3yyqmb9cs76if32aksgcwki3y6nh13lvn9j0bdgbgqx65f3r"; depends=[condSURV icenReg Rcpp RcppEigen survival]; }; censCov = derive2 { name="censCov"; version="1.0-0"; sha256="0i9vmyi12f1m5xnrl4cxk3z9qv7ymzxsyf4gbnpg1ph63yfnhv3g"; depends=[survival]; }; censNID = derive2 { name="censNID"; version="0-0-1"; sha256="1ij5ci6nkqf0rq51vyh4jw5sr3y46yndfkjmwl78ppdj66axxir5"; depends=[]; }; censReg = derive2 { name="censReg"; version="0.5-32"; sha256="044f3a1vkr318drcipv9zz5qsx85ld95x7fsy0w6cpc6zlkwxsyb"; depends=[glmmML maxLik miscTools plm sandwich]; }; + censo2017 = derive2 { name="censo2017"; version="0.2"; sha256="1w09jlpy2zaqpn6ddny9sm7a5v2fjlis3d4lvnky0hx7x9w1wjw0"; depends=[cli crayon DBI httr purrr R_utils rappdirs RSQLite rstudioapi sf tibble]; }; censorcopula = derive2 { name="censorcopula"; version="2.0"; sha256="16pk4xlpliif02qznrhvl8qmrr6k4kknygqxcm83nsjxy6dcyga8"; depends=[copula]; }; censusGeography = derive2 { name="censusGeography"; version="0.1.0"; sha256="1ncgd05ml571g3vy1g4p5xxg2bm08hbb6d5r3hpz7frn7w3l8l1d"; depends=[qdapTools]; }; - censusapi = derive2 { name="censusapi"; version="0.6.0"; sha256="03h1np7v539mgnxlmwp1d5jv3nlm2fsylw53hqxd736q3h2rjz0s"; depends=[httr jsonlite]; }; + censusapi = derive2 { name="censusapi"; version="0.7.1"; sha256="1vvvbig4q9ix8qdl67y2chya2qimaawanh7vznylj1x7is0j49ia"; depends=[httr jsonlite]; }; censusr = derive2 { name="censusr"; version="0.0.4"; sha256="1n9571fyr46wj1dcxc2xgns9865655yzlq7yfz8im014wh0ycwqc"; depends=[dplyr httr stringr]; }; censusxy = derive2 { name="censusxy"; version="1.0.0"; sha256="0wvr109hv2injkg2kh6n82wik6pd25m4jx3yiqpy07dmh6ddd5xp"; depends=[httr]; }; censys = derive2 { name="censys"; version="0.1.0"; sha256="0r0yvaidn0qn96hx461415hywsjfgaz9wvvdssx7w97v2ndnk9sy"; depends=[httr jsonlite purrr stringi]; }; centiserve = derive2 { name="centiserve"; version="1.0.0"; sha256="1m6gqz2rk7023340laa5pc0ncbfka2qi9ajvh65fwijd7xvv3n5c"; depends=[igraph Matrix]; }; centralplot = derive2 { name="centralplot"; version="0.1.0"; sha256="1slzvbm1vvgj1gkcx9pb46fz8q55vfyqrxsvx4qzi5kp7d9h4dy2"; depends=[ggplot2]; }; - centrifugeR = derive2 { name="centrifugeR"; version="0.1.4"; sha256="1gky1j5glgigpj21hhm6mkc2xvvb9q8k3y1p4zn40r82lvggpnhz"; depends=[pracma]; }; - cents = derive2 { name="cents"; version="0.1-41"; sha256="03ycbd0c8b7danbblaixg6sm7msr9ixkanqswczqa8n2frhjfgj0"; depends=[]; }; - cepR = derive2 { name="cepR"; version="0.1.1"; sha256="0ds3hv1va3179i37n7fp4120bq7rmj2hpxrbnslyjgw44hr4p900"; depends=[httr magrittr purrr tibble]; }; + centrifugeR = derive2 { name="centrifugeR"; version="0.1.5"; sha256="11xqsrm3q2wl10ncn5l50grqybc1b5fs7iy150dx94whll2sw96z"; depends=[pracma]; }; + cepR = derive2 { name="cepR"; version="0.1.2"; sha256="02dj6vyfgc0lsgclbsmzpms1hnnwb3yjdayim7b7vpciym2c8ww3"; depends=[dplyr httr magrittr purrr tibble]; }; + cepiigeodist = derive2 { name="cepiigeodist"; version="0.1"; sha256="0i1i8hyl4bkcyxrrfqs3m9yny33w0i33409f4kx83wfnablc54sv"; depends=[]; }; cepp = derive2 { name="cepp"; version="1.7"; sha256="01hvm6586xnb1crvk7brqh3dm2j44ia5lrl5swnf6pb682yskbq0"; depends=[randtoolbox trust]; }; cepreader = derive2 { name="cepreader"; version="1.1-3"; sha256="0jqmz3gm6fprfjjzw22qdk055csvy1np7vm0mjjsnpim7js5xvc2"; depends=[]; }; ceramic = derive2 { name="ceramic"; version="0.6.0"; sha256="0n0l1b7gb05kqjrh696faq868q3nbwlg34y6wgr0w205kdq6qs17"; depends=[curl dplyr fs glue jpeg magrittr png purrr rappdirs raster reproj rlang slippymath sp spex tibble]; }; cernn = derive2 { name="cernn"; version="0.1"; sha256="0gz2x20pgsiq85hwkkpg4s1cdlw9plygx0446djc7qsymp469p2w"; depends=[]; }; + ceser = derive2 { name="ceser"; version="1.0.0"; sha256="1k2k2gykyajlahl7xvpxdla0ghapdxl24yi575pgq2421fpxq2i4"; depends=[dplyr lmtest magrittr purrr tibble]; }; cetcolor = derive2 { name="cetcolor"; version="0.2.0"; sha256="0kygdcr9ldanr0z4qpygwh0padki7s2ad0j6myky601g4228z79q"; depends=[]; }; ceterisParibus = derive2 { name="ceterisParibus"; version="0.4.2"; sha256="0hxklydsqb69y5sv2hanp5ja9k0063swf5si1j6gcj15lp7phpif"; depends=[DALEX ggplot2 gower knitr]; }; cfa = derive2 { name="cfa"; version="0.10-0"; sha256="12z58y4ls9m58wpj1xa4ir2p2apzxaskps05sxy2946m24i71zfk"; depends=[]; }; @@ -6177,16 +6420,15 @@ in with self; { cg = derive2 { name="cg"; version="1.0-3"; sha256="1kbyal1sicbr10yvxpwgcij710kqpi23vmndp9kyfzn3k8zfird3"; depends=[Hmisc lattice MASS multcomp nlme rms survival VGAM]; }; cgAUC = derive2 { name="cgAUC"; version="1.2.1"; sha256="172f9rkfhv4xzwpw8izsnsdbcw9p3hvxhh0fd8hzlkil7vskr3k8"; depends=[Rcpp]; }; cgal4h = derive2 { name="cgal4h"; version="0.1.0"; sha256="0ghcwjfqlhqysnl8mgz6zp7dyqh8pvnpvphwjwk6zqi24n3nhac2"; depends=[]; }; - cgam = derive2 { name="cgam"; version="1.15"; sha256="0bgvsjhafhhkhdq2b1dvji72913wrhi05adzrsnhrk7vwf8xxjki"; depends=[coneproj lme4 Matrix svDialogs]; }; + cgam = derive2 { name="cgam"; version="1.16"; sha256="02kbn44jv455vn5f64dsa739y5262xkb34i6azyrib2gg3dhvq8j"; depends=[coneproj lme4 Matrix svDialogs]; }; cgdsr = derive2 { name="cgdsr"; version="1.3.0"; sha256="07yc819hkabpzzh0g0cbqza6bcfy67b2marrzz1lj97f9iba78ja"; depends=[httr R_methodsS3 R_oo]; }; - cgh = derive2 { name="cgh"; version="1.0-7.1"; sha256="1fgjz43bgnswlyvrm669x697lybq3jyzz4l8ppgxqwxp4p4d2yqn"; depends=[]; }; cghRA = derive2 { name="cghRA"; version="1.6.0"; sha256="16dlw27s8wckc75xcwc2g74pw6bar0y0ii3h53w1hql05d4f7sb8"; depends=[DNAcopy Rgb]; }; cglasso = derive2 { name="cglasso"; version="1.1.2"; sha256="1z7scwbcn63iah9aih565rd4lyi6n2y5k2593w885dh1n6j5ss0i"; depends=[igraph MASS]; }; cglm = derive2 { name="cglm"; version="1.1"; sha256="1r3wrds5lbirzzqsi12prwykxa5361jb95pq7j95nlp6y8kcb94j"; depends=[data_table nleqslv Rcpp RcppArmadillo]; }; cgmanalysis = derive2 { name="cgmanalysis"; version="2.7"; sha256="0gwlkk0s3xvzy1kgl0hn163rg387y592h6p3f9bgmc24mznwadd4"; depends=[ggplot2 lubridate pastecs pracma readr readxl XML zoo]; }; cgraph = derive2 { name="cgraph"; version="6.0.1"; sha256="0hmp07iz7ya3j8jaghm4pa0b84lsinc48rsibbh47sd3i6pkxfik"; depends=[]; }; - cgwtools = derive2 { name="cgwtools"; version="3.0.1"; sha256="15qllfcgls6hpj51xa7mklr5ppxrs2avbiwq3y4bqbb20fld78w3"; depends=[]; }; - chandwich = derive2 { name="chandwich"; version="1.1.2"; sha256="196k13qg9kl94yki989ncx2mrvvj82vv8mi453s8lqmv9s875841"; depends=[numDeriv]; }; + cgwtools = derive2 { name="cgwtools"; version="3.2"; sha256="003d9yw8d0as15glshvx1vsiqz91r5xkhy8ryhxk28hlpwfvp160"; depends=[]; }; + chandwich = derive2 { name="chandwich"; version="1.1.3"; sha256="00lry1y4m1m1q5wrcscxcg9k6caznl58nznzn7n7njp6n1xzmwdw"; depends=[numDeriv]; }; changedetection = derive2 { name="changedetection"; version="0.2.0"; sha256="0j8x7qyna7qgjhx56yxav1g3wj3r47zvx2hivybsjis2gqbl82hr"; depends=[glmnet L1pack Rdpack]; }; changepoint = derive2 { name="changepoint"; version="2.2.2"; sha256="1jbki95pck10phpxna0b4i79hhl912zqi5ii9mjqb673y64dszkj"; depends=[zoo]; }; changepoint_geo = derive2 { name="changepoint.geo"; version="1.0.1"; sha256="1jlixdrq97n6bh09jq3hamlwkqfqbmqs14kr8swx20f8fvfr3fj2"; depends=[changepoint changepoint_np ggplot2 Rdpack]; }; @@ -6202,33 +6444,34 @@ in with self; { chebpol = derive2 { name="chebpol"; version="2.1-2"; sha256="126cgqnl9jy332q0ywg9dr11d4q1aichwwakb1xcrxrqw2j26zzi"; depends=[geometry]; }; checkLuhn = derive2 { name="checkLuhn"; version="1.1.0"; sha256="1s1ix5n98bcbzcvrz5h19sk9pchdvrhpy3ppmw96ys8vylzm58mv"; depends=[dplyr stringr]; }; checkarg = derive2 { name="checkarg"; version="0.1.0"; sha256="0rkdjs2c4yx9laqgayxz57bwxhwgdh6ndrr4i3b1kh31lcmk1xc6"; depends=[]; }; - checkdown = derive2 { name="checkdown"; version="0.0.5"; sha256="1xd4czhgczjc78wcx8mz9g35ba9q6askda4d9m95sjq0j8pwlkis"; depends=[knitr markdown]; }; + checkdown = derive2 { name="checkdown"; version="0.0.7"; sha256="1bjij565vss2x8xbgq5qxx1d1snfw9wnphj0jhbm6vxxh2hg6g46"; depends=[knitr markdown]; }; checkmate = derive2 { name="checkmate"; version="2.0.0"; sha256="193gkifr9spp0x0rwnjq1spdhjkfkh4mv27iklskcj604075phhd"; depends=[backports]; }; - checkpoint = derive2 { name="checkpoint"; version="0.4.9"; sha256="0kwbfkk3zm60w993gvwxxrikbxjdw4sgjrs9h18v3yw19kw1q9m5"; depends=[]; }; + checkpoint = derive2 { name="checkpoint"; version="0.4.10"; sha256="0shj9pgpr3fhf1cwzr8q583nyl6f2gcjqn8b5mjy8gvn0fbswqkk"; depends=[]; }; checkr = derive2 { name="checkr"; version="0.5.0"; sha256="14hkpfbw5ibdwz2jygir2f2bb2qgrj62gn3449n4dif31nswaj2f"; depends=[err]; }; cheddar = derive2 { name="cheddar"; version="0.1-636"; sha256="1lf39v0p583jgiyb02vx0rgbwzmmhgkfpwjib2fzh9ffbs8bfk66"; depends=[]; }; - cheese = derive2 { name="cheese"; version="0.1.0"; sha256="11nhfbif5hcfv3389fl74ggyw73xwh013zsin57azrp5mbj1wml5"; depends=[dplyr forcats kableExtra knitr magrittr purrr rlang stringr tibble tidyr tidyselect]; }; + cheese = derive2 { name="cheese"; version="0.1.1"; sha256="1r4n9li33am0bsyl57kzg1m9g4w0pzbw6garcdp3qk7lwqxy2y26"; depends=[dplyr forcats kableExtra knitr magrittr purrr rlang stringr tibble tidyr tidyselect]; }; chemCal = derive2 { name="chemCal"; version="0.2.1"; sha256="1kq82x57qm68im6lyqjqmh4p34s4y7fn5v6ymclxjr47mdv8npb5"; depends=[]; }; - chemmodlab = derive2 { name="chemmodlab"; version="1.0.0"; sha256="0lzibshhfz52m61xldf0xq4cc1xx64fjlw18hlkiv65dj3gcj2mh"; depends=[caret class e1071 elasticnet foreach lars MASS nnet pls pROC randomForest rpart tree]; }; + chemmodlab = derive2 { name="chemmodlab"; version="1.1.0"; sha256="0b7qwysqzvhhyxdvvr6lb65aqwhrh1a2wk3p5xplnfjxpy9gh7lm"; depends=[caret class e1071 elasticnet fingerprint lars MASS MSQC nnet pls pROC randomForest rcdk rpart tree]; }; chemometrics = derive2 { name="chemometrics"; version="1.4.2"; sha256="0shqns0n964pfwnd0q5sadglrlpgs4g5fbv45fsj9p37l4pq61dp"; depends=[class e1071 lars MASS mclust nnet pcaPP pls robustbase rpart som]; }; cherry = derive2 { name="cherry"; version="0.6-13"; sha256="1bpahdymkc2w6mc5pjyq4q59iwzskw37swx3sw4rnbmnhzhwaf8n"; depends=[bitops hommel lpSolve Matrix]; }; cherryblossom = derive2 { name="cherryblossom"; version="0.1.0"; sha256="1fn0xi65y0w1gmyrjlh8lb2is34r2dc5bym0ynrgjv8h595nzhwp"; depends=[]; }; - chest = derive2 { name="chest"; version="0.3.3"; sha256="09xk6nj8wx7h56mkb9qsl1gar0q5z0qd9r0kpnm237l6pca3qrbx"; depends=[broom dplyr forestplot ggplot2 MASS speedglm survival tibble]; }; + chess = derive2 { name="chess"; version="1.0.1"; sha256="0b0lz8r48bvksjnh385p1ni22hw1yvs6255pjbpj49ga9dwziin0"; depends=[cli magrittr purrr reticulate rsvg]; }; + chest = derive2 { name="chest"; version="0.3.4"; sha256="1mkds228d00anmx35120gdkl5wxx1mfbfys41gzsm202z1mp05bj"; depends=[broom dplyr forestplot ggplot2 MASS speedglm survival tibble]; }; chi = derive2 { name="chi"; version="0.1"; sha256="1y91mwahj4j2wz0y5k5vdpq7ygq834h8jkn37n74lqnwvv1968rr"; depends=[]; }; chi2x3way = derive2 { name="chi2x3way"; version="1.1"; sha256="13qc8sigiw4gcxk8y50q7yfgzbssjyl41fizzjqzcp3p14kpsmzw"; depends=[]; }; chicane = derive2 { name="chicane"; version="0.1.2"; sha256="080saqwhw54g9frrqr2z8s55d9asq3xjfy95w4y4npvd16a79nil"; depends=[bedr data_table doParallel foreach gamlss gamlss_tr iterators knitr MASS rmarkdown]; }; - childesr = derive2 { name="childesr"; version="0.1.2"; sha256="170xjsk0sjwlw3w3nf9jmq4yd6ivbznmjhqq2np5grn1rwlswawb"; depends=[DBI dbplyr dplyr jsonlite magrittr purrr RMySQL]; }; + chickn = derive2 { name="chickn"; version="1.2.3"; sha256="1d3xl2pigan6vb29nk2ks04dsl5vy16cv9z7miskmhcqcx2wm1qb"; depends=[bigstatsr doParallel doRNG foreach MASS mvnfast nloptr pracma Rcpp RcppArmadillo RcppParallel Rdpack rmio zipfR]; }; + childesr = derive2 { name="childesr"; version="0.2.1"; sha256="0dy2qkxyc1hl2v3ssvq7vynj2k7h1lky0ig7ph42pqsjqwfpk06d"; depends=[DBI dbplyr dplyr jsonlite magrittr purrr RMySQL]; }; childhoodmortality = derive2 { name="childhoodmortality"; version="0.3.0"; sha256="1ixd10jyzgr1ssnjas35kngpsqyjzl73wwpvcspv06cn12sv2b8d"; depends=[dplyr matrixStats plyr]; }; - childsds = derive2 { name="childsds"; version="0.7.4"; sha256="1dyzidmbr7608y65kymf7x5s19qjsz9hxzfv51ml1kaymml1hbf3"; depends=[boot class dplyr gamlss gamlss_dist magrittr purrr purrrlyr reshape2 tibble tidyr VGAM]; }; + childsds = derive2 { name="childsds"; version="0.7.6"; sha256="1h3p80byfma8zhivlq9jmdszm793chggnhb93qjnbl3vmnmnxgg7"; depends=[boot class dplyr gamlss gamlss_dist magrittr purrr purrrlyr reshape2 tibble tidyr VGAM]; }; chilemapas = derive2 { name="chilemapas"; version="0.2"; sha256="0s2f5bhr7d64rlk4x7cv6zjrbnf5g86lgg026svgrdxvs1vqa4as"; depends=[dplyr magrittr rlang rmapshaper sf stringr]; }; - chillR = derive2 { name="chillR"; version="0.70.24"; sha256="1a99hxf89yyhcma5002xhp1nvcsgbsz52zg1a5vhhgwlzpkr50s0"; depends=[assertthat dplyr fields ggplot2 httr jsonlite Kendall pls plyr R_utils raster RCurl readxl reshape2 rlang RMAWGEN sp XML]; }; - chinese_misc = derive2 { name="chinese.misc"; version="0.2.2"; sha256="1r0sg0pfnlpa3q6czjvlh04xdwl6gfw54ykacnxznzzzr528r3mi"; depends=[jiebaR Matrix NLP purrr slam stringi tm]; }; - chipPCR = derive2 { name="chipPCR"; version="0.0.8-10"; sha256="1mff7n7ga4sfwvcq7zkjkrl68nybnm2zkn37hmxvnw9yl3ls9lnw"; depends=[lmtest MASS outliers ptw quantreg Rfit robustbase shiny signal]; }; + chillR = derive2 { name="chillR"; version="0.72"; sha256="1qa01zsm1xvdd41dd317ng8xj4wzmbdmay4zdzz49xzi95y6vy5n"; depends=[assertthat dplyr fields GenSA ggplot2 httr jsonlite Kendall pls plyr R_utils raster Rcpp RCurl readxl reshape2 rlang RMAWGEN sp XML]; }; + chinese_misc = derive2 { name="chinese.misc"; version="0.2.3"; sha256="0hlna52g00nh3908wgpb9ldgghff3gfjx24vmk5gikkazdqk9zrh"; depends=[jiebaR Matrix NLP purrr slam stringi tm]; }; chirps = derive2 { name="chirps"; version="0.1.2"; sha256="0lvrlpsvncyyzli84ivzmknk0g5g3lhciwl35wmrgyxf08bs4bqb"; depends=[crul jsonlite sf]; }; chisq_posthoc_test = derive2 { name="chisq.posthoc.test"; version="0.1.2"; sha256="0lvj3jqhaj1ijjpzvpq3fn3a1y3fgv69pxh91j6k958pn6vmp40i"; depends=[]; }; chk = derive2 { name="chk"; version="0.5.1"; sha256="09qw8i97mbfgymx5nf6iw4s46hqyaa7434y3bwkzmqjh9f18xfmh"; depends=[lifecycle rlang]; }; chlorpromazineR = derive2 { name="chlorpromazineR"; version="0.1.2"; sha256="0zg3xjq67na98n4amsm5v4cn9ba1k7c0lb7k2lvxa3n1w7rndpw3"; depends=[]; }; - chngpt = derive2 { name="chngpt"; version="2020.5-21"; sha256="0lh2jznkiv74a88kyqxvxl424chgwghd9jl9z1kx76gkjg8ggr0x"; depends=[boot kyotil MASS survival]; }; + chngpt = derive2 { name="chngpt"; version="2020.10-12"; sha256="0i8vzqycqd6sinnpb8f88b7pv76d54x09l3iw2s8c6hs46rybqch"; depends=[boot kyotil lme4 MASS survival]; }; choiceDes = derive2 { name="choiceDes"; version="0.9-3"; sha256="1nsc8p4svfc6z7ckffl24c0acnaxi6cnpz7jq03vzn6spxvpjcmw"; depends=[AlgDesign]; }; cholera = derive2 { name="cholera"; version="0.7.0"; sha256="0ja013k431vd0sjy74y2mlrii46rbwb5x886jaza4ihb48mgz7ah"; depends=[deldir ggplot2 HistData igraph KernSmooth pracma RColorBrewer sp threejs TSP]; }; choplump = derive2 { name="choplump"; version="1.0-0.4"; sha256="0fn6m3n81jb7wjdji4v04m53gakjfsj3ksm546xxz5zm7prk237s"; depends=[]; }; @@ -6241,21 +6484,23 @@ in with self; { christmas = derive2 { name="christmas"; version="1.0.0"; sha256="06a2r56vh7m6j0kfbf3b3aapn52x693fzdn29sxfvyackdk5dhj3"; depends=[animation]; }; chromer = derive2 { name="chromer"; version="0.1"; sha256="0fzl2ahvzyylrh4247w9yjmwib42q96iyhdlldchj97sld66c817"; depends=[data_table dplyr httr]; }; chromoMap = derive2 { name="chromoMap"; version="0.2"; sha256="1ljjwkv7rdy1mcrkb8dd5lfkg54gxzclsjvla4qnc8j5hmfp0p8g"; depends=[htmltools htmlwidgets]; }; - chromoR = derive2 { name="chromoR"; version="1.0"; sha256="1x11byr6i89sdk405h6jd2rbvgwrcvqvb112bndv2rh9jnrvcw4z"; depends=[gdata haarfisz]; }; chromseq = derive2 { name="chromseq"; version="0.1.3"; sha256="0m9dnm50iw176ffn6syd3538hxmjhkrxfzaf13210q100wk0lgz2"; depends=[]; }; chron = derive2 { name="chron"; version="2.3-56"; sha256="0p9zz96jfyf139924hdwkzhr8knkjvx6547ac53rknm3a6wwngl6"; depends=[]; }; - chronosphere = derive2 { name="chronosphere"; version="0.3.1"; sha256="0n6xqnlwcraxdr9d37nnllr8rjq6awng60zmy0skjmsj7xp6x71v"; depends=[raster sp]; }; + chronosphere = derive2 { name="chronosphere"; version="0.4.0"; sha256="034845mvh873db3i8hm7kz05c1n30gp5m4acjryb80303086k3ih"; depends=[raster sp]; }; chunkR = derive2 { name="chunkR"; version="1.1.1"; sha256="1kw3hsx5k4cdicx0hc1v0mf2nzvqg95shx2xv05vb2pass48qw48"; depends=[Rcpp]; }; - chunked = derive2 { name="chunked"; version="0.5.0"; sha256="1b28hqngdkkn4wnkd3b8vcaf3md6jan73nbx240v6s2nj2anlnc8"; depends=[DBI dplyr LaF progress rlang]; }; + chunked = derive2 { name="chunked"; version="0.5.1"; sha256="08gw05bng4p35kfd9zcxz1l73jhlxlymw55vrsl6f2771l1r4bz5"; depends=[DBI dplyr LaF progress rlang]; }; chunkhooks = derive2 { name="chunkhooks"; version="0.0.1"; sha256="1kps7widb9ql01njy8xl03lplrybl2ci5fvx5vzzwnwps6s4y3fm"; depends=[knitr measurements prettyunits]; }; - ciTools = derive2 { name="ciTools"; version="0.5.2"; sha256="1q0kh8fsi14dvqr646hn6j9sfjq5b7m89i4r8br5p33wfgqpwlq4"; depends=[arm boot dplyr lme4 magrittr MASS survival tibble]; }; + ciTools = derive2 { name="ciTools"; version="0.6.1"; sha256="0d6aq4wcxi1q59g4kfx49x1li41rfwx2z2v4xzz2xkldn6h1794z"; depends=[arm boot dplyr lme4 MASS survival]; }; + ciccr = derive2 { name="ciccr"; version="0.2.0"; sha256="0xmjqwlw2xq332pyagrn8ay6ipyvmxw1q7zf4cza4ly2mz9mf1ws"; depends=[]; }; cicerone = derive2 { name="cicerone"; version="1.0.3"; sha256="01swq28pj3p34b1k1gp05wvzdzsivj10fl7rwq0bg4rpawxfgs55"; depends=[assertthat R6 shiny]; }; cifti = derive2 { name="cifti"; version="0.4.5"; sha256="092334lcpkzv52bg53hzx64dnrwq67f3p9fzwchmafx1l46xrqx9"; depends=[gifti oro_nifti R_utils xml2]; }; + ciftiTools = derive2 { name="ciftiTools"; version="0.1.6.0"; sha256="1fk9cc2jnfa177dg9wjy6gkrhyf3rbmgi98vx65jknwpsg9m5ydn"; depends=[gifti oro_nifti RColorBrewer RNifti xml2]; }; cimir = derive2 { name="cimir"; version="0.4-0"; sha256="0sp8hd354hnrmbyn3gm2sgvkf32n7kqpg9bc56583ibyfc8s4gwm"; depends=[curl dplyr glue jsonlite purrr rlang stringr tidyr]; }; cin = derive2 { name="cin"; version="0.1"; sha256="1pwvy5nh5nrnysfqrzllb9fcrpddqg02c7iw3w9fij2h8s2v6kq5"; depends=[]; }; + cinaR = derive2 { name="cinaR"; version="0.1.0"; sha256="13pcxxlx2k1dd2ac7irsjkqq7y6nds5v9y8awbnrfyfr0w5b5zsn"; depends=[ChIPseeker DESeq2 dplyr edgeR fgsea GenomicRanges ggplot2 ggrepel limma pheatmap preprocessCore RColorBrewer sva TxDb_Hsapiens_UCSC_hg19_knownGene TxDb_Hsapiens_UCSC_hg38_knownGene TxDb_Mmusculus_UCSC_mm10_knownGene writexl]; }; cinterpolate = derive2 { name="cinterpolate"; version="1.0.0"; sha256="1aw6hs41xin2hhgmi4pr5510v4sn6x735lachpc5gpbxch5h3f82"; depends=[]; }; - cir = derive2 { name="cir"; version="2.0.0"; sha256="0ycjnbikpyhcfdik7c5knw4s9gl8y5h4219c4fhs4axs04np004v"; depends=[]; }; - circlize = derive2 { name="circlize"; version="0.4.10"; sha256="1xb1jq3mg4kw1513zv1i09vhn7rj7f8vp0bnms2qml74s47wxsgk"; depends=[colorspace GlobalOptions shape]; }; + cir = derive2 { name="cir"; version="2.1.0"; sha256="1gw0wawla5lfpbyh5hb3mbv5137jgc923g4jshylvjr22bvjqrdm"; depends=[]; }; + circlize = derive2 { name="circlize"; version="0.4.11"; sha256="1s84xl7kv3qc1261xxaq4aqh64gwywhacsf5nh6yf8djw0d1w42d"; depends=[colorspace GlobalOptions shape]; }; circular = derive2 { name="circular"; version="0.4-93"; sha256="0hki85rs8wc5950pjaw28q54rly2napfbcrx3pchlfap6wwy5kkn"; depends=[boot mvtnorm]; }; circumplex = derive2 { name="circumplex"; version="0.3.6"; sha256="1b5brqhya8jzxhr4zjmr6660w9mzfyncpdknzpvkdhc149s1ksjd"; depends=[assertthat boot dplyr ggforce ggplot2 glue htmlTable magrittr purrr Rcpp RcppArmadillo rlang tibble tidyr]; }; cit = derive2 { name="cit"; version="2.2"; sha256="1lf8r3r4zwvs08vl4byhw6rvf54nb7vg83558pi0b5866m7in4sc"; depends=[]; }; @@ -6263,43 +6508,44 @@ in with self; { citbcmst = derive2 { name="citbcmst"; version="1.0.4"; sha256="1zkd117h9nahwbg5z6byw2grg5n3l0kyvv2ifrkww7ar30a2yikl"; depends=[]; }; citccmst = derive2 { name="citccmst"; version="1.0.2"; sha256="1b7awn1hjckxisfdi4ck697hwd4a5sqklwi7xzh6kgqhk9pv7vjn"; depends=[]; }; citecorp = derive2 { name="citecorp"; version="0.3.0"; sha256="0lqxa6qfysrk3rpg9fnsxhrfsd0qsbfxhc3b43090fhlxq9gk3wm"; depends=[crul data_table fauxpas jsonlite]; }; - citr = derive2 { name="citr"; version="0.3.2"; sha256="1qbarvafjb8jgkrnrhh6jw7mcglmjwf7dpdiibxf39jkmlhf7las"; depends=[assertthat curl httr miniUI RefManageR rstudioapi shiny shinyjs yaml]; }; + ciu = derive2 { name="ciu"; version="0.1.0"; sha256="04fshss0klib74dr997p8kmv9mgbxnkanl8x24x6aild2nv25lz4"; depends=[ggplot2 Rcpp]; }; ciuupi = derive2 { name="ciuupi"; version="1.1.0"; sha256="0czfmmf62p1vml24s87pdwv52spqycchpkqzwk8vyd4n1z27r5s2"; depends=[functional nloptr pracma statmod]; }; civis = derive2 { name="civis"; version="3.0.0"; sha256="12q96bj21832zqqbisfxmnpqw7w72v350lyf7cpjgr7cq7b51brd"; depends=[future httr jsonlite memoise]; }; cjoint = derive2 { name="cjoint"; version="2.1.0"; sha256="1bs380ji9vsc1d77wqhl0ij9xblww3g9x3hiwpcpz26wihqcx7ac"; depends=[DT ggplot2 lmtest Matrix sandwich shiny shinyBS shinyjs survey]; }; ckanr = derive2 { name="ckanr"; version="0.5.0"; sha256="15ww7svf40j7pd76s93kw8snql0hycliyga4p22bqvm95xy9pmq0"; depends=[crul DBI dbplyr dplyr jsonlite magrittr]; }; clValid = derive2 { name="clValid"; version="0.6-9"; sha256="0j5vgh1ccfxf2yax08p9zswan2rxnfs85ny88xlqbndkm3gmy80b"; depends=[class cluster]; }; cladoRcpp = derive2 { name="cladoRcpp"; version="0.15.1"; sha256="0msay6yvm6wc964gwrz31ky5w4mizakji3j6rpkydz0zlrl52v1j"; depends=[Rcpp RcppArmadillo]; }; - clam = derive2 { name="clam"; version="2.3.5"; sha256="19kaf1s1m8cz3cj5faprmi11lhmbgdmkspjf8l0xgrx4vas49xw8"; depends=[]; }; - clampSeg = derive2 { name="clampSeg"; version="1.0-5"; sha256="05922fddvi7s4imdnr9fb27aqskgd489amw9h86g5vw4l494lnl9"; depends=[Rcpp stepR]; }; + clam = derive2 { name="clam"; version="2.3.7"; sha256="0yd6grq0vyf46bc59fgqvwdbrsb9wd4m8vwjpqxfmkag2wr2a8f3"; depends=[IntCal]; }; + clampSeg = derive2 { name="clampSeg"; version="1.1-0"; sha256="1138wphhmf5hn5yh8p1fwix4lf2yncbc7xxcnnv2xz1z8b041qhs"; depends=[lowpassFilter stepR]; }; clarifai = derive2 { name="clarifai"; version="0.4.2"; sha256="0igi4xl27nz0r85hpws2zfc2gn5z2nmywp3saxgp74mh2y99lg6s"; depends=[curl jsonlite]; }; clarkeTest = derive2 { name="clarkeTest"; version="0.1.0"; sha256="0vbb3j9rnh42qyp78a4jykp7p560d0ryfp28xgvxax8h8hr80457"; depends=[]; }; class = derive2 { name="class"; version="7.3-17"; sha256="04qk8qia0qr8893fizmkbd5hsqn6m8383c0cyn9xnmkmvyv8a7xy"; depends=[MASS]; }; classGraph = derive2 { name="classGraph"; version="0.7-5"; sha256="19jb9jr1gfg4karymrbilh0zjrlsczhy2q03x5b0jxnh4ykhxfj8"; depends=[graph Rgraphviz]; }; classInt = derive2 { name="classInt"; version="0.4-3"; sha256="1b1lqhpzxm6b8pza8l3s0cxy74mm9y45lcd3354i2v3bg8m7mply"; depends=[class e1071 KernSmooth]; }; - classifierplots = derive2 { name="classifierplots"; version="1.3.3"; sha256="01rvn0jwliyxj7q4cmyv8an5g7fzn6y3sccp8mj6bcqjyblfcfaa"; depends=[caret data_table ggplot2 gridExtra png Rcpp ROCR]; }; + classifierplots = derive2 { name="classifierplots"; version="1.4.0"; sha256="0agxm3vrbs8lqhk1xvfc3wzf0q0hxhgyp23j5qi5mi1drgnw1jj1"; depends=[caret data_table ggplot2 gridExtra png Rcpp ROCR]; }; classifly = derive2 { name="classifly"; version="0.4"; sha256="0mw1vcas0gr1r4yvh0j02zhk7kp5342r0bhhg776hqgqdczgh5zj"; depends=[class plyr]; }; - classyfireR = derive2 { name="classyfireR"; version="0.3.3"; sha256="17h9xx5ap77ry50rbpl9gi1hbp1vahdwl99kkqsra79b8aixs2kj"; depends=[cli clisymbols crayon dplyr httr jsonlite magrittr purrr stringr tibble]; }; - cld2 = derive2 { name="cld2"; version="1.2"; sha256="03ffg1nxdlmg66sgg0w2jdx2s5jzdp8qhja24z0il2qy3qsa915k"; depends=[Rcpp]; }; + classyfireR = derive2 { name="classyfireR"; version="0.3.6"; sha256="1xys40pbai7b6xbvc2nip8n6vw2zvg0gm373w3izxzrb62whwd8p"; depends=[cli clisymbols crayon dplyr httr jsonlite magrittr purrr rjson stringr tibble tidyjson tidyr]; }; + cld2 = derive2 { name="cld2"; version="1.2.1"; sha256="01p64r2ij1i0xm3835vfnpxmmbnnaigp0md9x1hrq8gfsdwnzv3x"; depends=[Rcpp]; }; cld3 = derive2 { name="cld3"; version="1.3"; sha256="1xaac0phck00i2pm81m2xphy7r3lvbvj9z14y6asfz0cfjm7acx3"; depends=[Rcpp]; }; clda = derive2 { name="clda"; version="0.1"; sha256="03zfanvpz1h42h2z38a63fck1p5hqig4w2svknzpw7mryji5q9b1"; depends=[MASS]; }; clean = derive2 { name="clean"; version="2.0.0"; sha256="0zvk3a5yz54g2mn7y1d91z6ljglbyq1hkh4iip1dfyi15chrqv7y"; depends=[cleaner]; }; - cleanNLP = derive2 { name="cleanNLP"; version="3.0.2"; sha256="0fwi717mmw6nb81x4wlq6pfcgv0jizrw2fkiaxz0wnhvkh3i82y6"; depends=[Matrix reticulate stringi udpipe]; }; + cleanNLP = derive2 { name="cleanNLP"; version="3.0.3"; sha256="0bc0ya36yhknqhqc76yf9clgiacyb6zypzirzg6i0213bqw2ihdp"; depends=[Matrix reticulate stringi udpipe]; }; cleancall = derive2 { name="cleancall"; version="0.1.1"; sha256="1gq7bjywgslybfk97k3fxglp6j78a0cklaammccvffs3b94i4zh4"; depends=[]; }; cleandata = derive2 { name="cleandata"; version="0.3.0"; sha256="1lm7k25j16p888xvd7rzzd3sb3namzjlpjn22xmmpzlzyl0h7dhk"; depends=[]; }; - cleaner = derive2 { name="cleaner"; version="1.5.0"; sha256="0ci21fjcl3slyxf66w7w76vg3dvk6928qhpbgsj7qah2z5c184g6"; depends=[crayon knitr pillar rlang vctrs]; }; + cleaner = derive2 { name="cleaner"; version="1.5.1"; sha256="0qmg9c299bcrwl1r1hhl56rf0sm6sbqgssrk72him4090j6gslyr"; depends=[backports crayon knitr pillar rlang vctrs]; }; cleanerR = derive2 { name="cleanerR"; version="0.1.1"; sha256="0rghn8rx7dj5clmc1dqvqwfm9kiva04k9gxsjjga3109l4jcpg63"; depends=[data_table plyr]; }; cleangeo = derive2 { name="cleangeo"; version="0.2-3"; sha256="02py25pir16yklffpdicljxhwdf7bqchqllgdk069f5gikfc8yrr"; depends=[maptools rgeos sp]; }; - cleanr = derive2 { name="cleanr"; version="1.3.0"; sha256="15icq6p2sxaz5jsdwqlqg7mgal4310vk96w53wzv3dzpzxndz7s4"; depends=[checkmate pkgload rprojroot]; }; + cleanr = derive2 { name="cleanr"; version="1.3.1"; sha256="00h6kqsz9f6k2ngcpqzfqpp14c5a6x5f7ghmdnvi2nwyqipzk6xi"; depends=[checkmate pkgload rprojroot]; }; clere = derive2 { name="clere"; version="1.2.0"; sha256="0qc26ycycxphrbksk7jb1m6vh66a2zsnw8k4jnazs23sqdg24im9"; depends=[Rcpp RcppEigen]; }; clespr = derive2 { name="clespr"; version="1.1.2"; sha256="1993kd70w48a110im47vcpll0c6nfrm7m33r6l8rzgwnpsmcls8g"; depends=[AER clordr doParallel foreach magic MASS pbivnorm survival]; }; + clevr = derive2 { name="clevr"; version="0.1.1"; sha256="077qhqfzcy1ciar70df7q98ms003b9mnqgji1nxkx5ncw9hdkzd4"; depends=[BH Matrix Rcpp]; }; clhs = derive2 { name="clhs"; version="0.7-3"; sha256="19v617dayirbzb5w6mz79lsjinvr2jjlwdm61pd2pppk099fxgqr"; depends=[cluster ggplot2 plyr raster reshape2 scales sp]; }; - cli = derive2 { name="cli"; version="2.0.2"; sha256="1dhkah6jvr96k4h4agcc2rfls75bpjb0j58fzaz3dc0fp3jk8229"; depends=[assertthat crayon fansi glue]; }; - cliapp = derive2 { name="cliapp"; version="0.1.0"; sha256="152hllp4iiva2qib79700v1mx1biy8bg4sy496vwq6mi4afvswjy"; depends=[cli crayon fansi glue prettycode progress R6 selectr withr xml2]; }; - clickR = derive2 { name="clickR"; version="0.4.47"; sha256="1fs0zh9djgvy8cicvab9i6dji85l1z8wlr6wpfypnwvnblc64qam"; depends=[beeswarm boot flextable lme4 lmerTest officer xtable]; }; + cli = derive2 { name="cli"; version="2.2.0"; sha256="1f20mk9pb9kqn0ni2z0sqsx8qj1apcbiw08pa4gwry142zv7m9rr"; depends=[assertthat crayon fansi glue]; }; + cliapp = derive2 { name="cliapp"; version="0.1.1"; sha256="0v62lbcsja0xmlpqcps370n5c7bk4j2n8pwh9xyif5s4wpf82qz1"; depends=[cli crayon fansi glue prettycode progress R6 selectr withr xml2]; }; + clickR = derive2 { name="clickR"; version="0.5.27"; sha256="023vcax25kdp42z7nlb635zwdiz4fspxiz8zj679d8g4g897g9fz"; depends=[beeswarm boot flextable lme4 lmerTest officer xtable]; }; clickstream = derive2 { name="clickstream"; version="1.3.1"; sha256="0z1yy5lr9m5x9ybimjy3f6kn490abdi038xi0qw7ny80f1ca6ry7"; depends=[arules ClickClust data_table ggplot2 igraph linprog MASS plyr reshape2 Rsolnp]; }; clifford = derive2 { name="clifford"; version="1.0-2"; sha256="17br7p4zj1cjf1nbwbk0a2jjxj589qgvlnzi6yp4dqlf2g0w01z6"; depends=[BH Rcpp]; }; - clifro = derive2 { name="clifro"; version="3.2-2"; sha256="11bfvaf1b1wv83dw8ggj7ldsc6fs8s3gl7jdzyq7l1w7innihp9s"; depends=[ggplot2 lubridate magrittr RColorBrewer RCurl reshape2 scales xml2]; }; + clifro = derive2 { name="clifro"; version="3.2-3"; sha256="151j8v6d0wr5np5i8wb7b1k398cg2fz6yndpz8r0rh2d3yx5544l"; depends=[ggplot2 lubridate magrittr RColorBrewer RCurl reshape2 rvest scales xml2]; }; clikcorr = derive2 { name="clikcorr"; version="1.0"; sha256="0zdnbcl5q293mmm6pbn4ri7p1q6z6sff74axsb3nyd153v2xamr5"; depends=[mvtnorm]; }; climaemet = derive2 { name="climaemet"; version="0.2.0"; sha256="0jhyf0wrq5scs8jcn2bpl8fhlimhdkd39pxzdc26zwwya5683cas"; depends=[climatol dplyr gganimate ggplot2 ggpubr ggthemes gtable httr jpeg jsonlite lubridate magrittr RColorBrewer rlang scales stringr tibble tidyr]; }; climate = derive2 { name="climate"; version="0.9.8"; sha256="0fyj0zmyavsip921axwcqm54jd9dqyzir0761vczn51pw7kqk6y0"; depends=[curl httr XML]; }; @@ -6308,38 +6554,40 @@ in with self; { climatrends = derive2 { name="climatrends"; version="0.1.7"; sha256="0dj095jafl571hvf2bp21mdbp2pln0li9bgpymzjbpnbkvn8309j"; depends=[]; }; climdex_pcic = derive2 { name="climdex.pcic"; version="1.1-11"; sha256="01ax0kas43g3h21ixzc80f9gl4m9846gmk8v48rr0gkhcmbcc6jx"; depends=[PCICt Rcpp]; }; clime = derive2 { name="clime"; version="0.4.1"; sha256="0qs9i7cprxddg1cmxhnmcfhl7v7g1r519ff2zfipxbs59m5xk9sf"; depends=[lpSolve]; }; - climextRemes = derive2 { name="climextRemes"; version="0.2.1"; sha256="1ii79zfdz90agirh3kbq80qk8nib9ks8f42f6y664j4pwk9550w3"; depends=[boot extRemes]; }; + climextRemes = derive2 { name="climextRemes"; version="0.2.2"; sha256="04ra2xqkf9zg7hbmb5ycfql9nwkabxy8412d05ajshld4cr0gi45"; depends=[boot extRemes]; }; climwin = derive2 { name="climwin"; version="1.2.3"; sha256="1r2x5941k8l9z3517389y120sfhrskdpchc0pkibznza8aa95r85"; depends=[evd ggplot2 gridExtra lme4 lubridate Matrix MuMIn nlme numDeriv RcppRoll reshape]; }; clinDR = derive2 { name="clinDR"; version="2.3"; sha256="1bmbbcf5ikima868l2cn9r8xja3zw4zw799i7nb8jb0hhv6fxh80"; depends=[doParallel DoseFinding foreach ggplot2 rstan]; }; clinPK = derive2 { name="clinPK"; version="0.9.0"; sha256="1n1m8szd8mxdshwz8l3hfdxi7zrmsah46kxkv7jiffwnfhijfhsm"; depends=[curl testit]; }; clinUtiDNA = derive2 { name="clinUtiDNA"; version="1.0"; sha256="0x3hb09073gkh60fc8ia0sfk948sm6z6j8sqkz275k4m8ryrabas"; depends=[]; }; clinfun = derive2 { name="clinfun"; version="1.0.15"; sha256="0cv1kdxj911scri82ms21lk9frsdp4251fawdsbqinby7k6hhmkc"; depends=[mvtnorm]; }; + clinmon = derive2 { name="clinmon"; version="0.2.0"; sha256="01gj33kmbg6z9qln9la6ph0rsdk10j18jbigjykhjcfpjnfs1inn"; depends=[]; }; clinsig = derive2 { name="clinsig"; version="1.2"; sha256="1wgfl9kks57yizrf8z6x7dhmbl3a80q8nnj3a5n2hpc9yr8l9ijf"; depends=[]; }; clipp = derive2 { name="clipp"; version="0.1.0"; sha256="0phh2nbpfb5p80ijll4h9j2hy4syl8802a2lhlm5grirws1iif84"; depends=[]; }; - clipr = derive2 { name="clipr"; version="0.7.0"; sha256="1qn2p13d0c1bpqss6mv9hk60980rzhznfqpyaf5x0fy65svy9903"; depends=[]; }; + clipr = derive2 { name="clipr"; version="0.7.1"; sha256="1ywa4kipwc2d7na6iiz3wzdah99h6aynnh74yxl3nzl40xxlgbgz"; depends=[]; }; clisymbols = derive2 { name="clisymbols"; version="1.2.0"; sha256="1q7gi2zmykhzas9v8fdnbpdq7pzdcpbhim1yxvd2062l777g4j86"; depends=[]; }; clogitL1 = derive2 { name="clogitL1"; version="1.5"; sha256="0y6a6s5l98i0vrj66biwr17g6pzpmm5kfz4c57af0yhv7c4s4was"; depends=[Rcpp]; }; clogitLasso = derive2 { name="clogitLasso"; version="1.1"; sha256="1j2kscd6d1jham6yqx5rp78x5vfj2faylkxkbcjaqbynlnqbbxd0"; depends=[foreach lassoshooting]; }; clogitboost = derive2 { name="clogitboost"; version="1.1"; sha256="19wcb7229amlxn6xahxj6pf9rwfm02s7qkxz2yvyhnq95y0clxkm"; depends=[Rcpp]; }; - clordr = derive2 { name="clordr"; version="1.5.0"; sha256="0yzkkzp60gnap96hlfpjncxfkfvvma15yxpwf5pv5fgffacb8281"; depends=[doParallel foreach MASS pbivnorm rootSolve tmvmixnorm ttutils]; }; + clordr = derive2 { name="clordr"; version="1.6.0"; sha256="1w9km87wndr4fssfn7c9g2sy5lnk1ik0sqqwqyas7qc2h48la4di"; depends=[doParallel foreach MASS pbivnorm rootSolve tmvmixnorm ttutils]; }; cloudUtil = derive2 { name="cloudUtil"; version="0.1.12"; sha256="18g946j00anlk20d0fh01w0xyj1kwyy7jhlgz5a85wmp6s2gkz74"; depends=[]; }; cloudml = derive2 { name="cloudml"; version="0.6.1"; sha256="1j15q9yb2rc4fbjxfh21fiq6is8dnb8nfyi7g8iazgfwb3p9ahpx"; depends=[config jsonlite packrat processx rprojroot rstudioapi tfruns withr yaml]; }; clpAPI = derive2 { name="clpAPI"; version="1.3.0"; sha256="1ivrvipnvnqf1mnvvqnv2jgf69i0h84f46n8x41bx89lag0161bv"; depends=[]; }; clr = derive2 { name="clr"; version="0.1.2"; sha256="088ks9lrhlyvg3yvlfmb0091yp6qp5bzg9h5r6ryv3bk6y56sajx"; depends=[dplyr lubridate magrittr]; }; clttools = derive2 { name="clttools"; version="1.3"; sha256="0va9k1b4xsb2sgpxzvid6sa8m6b8i3r4kgghclmb78nnrs480cwi"; depends=[]; }; - clue = derive2 { name="clue"; version="0.3-57"; sha256="05rdcahawxlxci3fjxihjvvh33wqpxw50sx015165ab4nh3rsdkf"; depends=[cluster]; }; + clubSandwich = derive2 { name="clubSandwich"; version="0.5.2"; sha256="051943yji30r3mwx9dmy63rfjq3dr2zkfg852cpnysyq15f6vpbq"; depends=[mathjaxr sandwich]; }; + clue = derive2 { name="clue"; version="0.3-58"; sha256="1rwwxlnpl1k0n4k96vxc9zajw9kb4syqwzj76fvaf0qim8p6ddia"; depends=[cluster]; }; cluscov = derive2 { name="cluscov"; version="1.1.0"; sha256="0345v5r6b53243h5bir29v0w77pmwjqjkqfrjnk5j5r1wbh98q1w"; depends=[MASS quantreg]; }; - clusrank = derive2 { name="clusrank"; version="0.6-2"; sha256="1hjxks8cb1mp1d93rcpwqjrxqavspmzjrxvflhv6nqx41ar9dpxv"; depends=[MASS Rcpp]; }; + clusrank = derive2 { name="clusrank"; version="1.0-0"; sha256="1ph7rn5cqv67nspadlm8j2vlwvn9c8n0h9qr90003jn0kwz8dic4"; depends=[MASS Rcpp]; }; clust_bin_pair = derive2 { name="clust.bin.pair"; version="0.1.2"; sha256="11lqd3vmx4kg08n6iv9na8rra49dkldx4f8jyf43hppbjrbvfinm"; depends=[]; }; clustDRM = derive2 { name="clustDRM"; version="0.1-0"; sha256="1c5z08a15scp3nrwyh0c03pdaawvm3ivbygqpbglwxim7zf73rd2"; depends=[caret doParallel DoseFinding DT foreach IsoGene MCPMod multcomp ORCME ORIClust pheatmap RColorBrewer readr shiny]; }; clustEff = derive2 { name="clustEff"; version="0.2.0"; sha256="0kh3jzzqnchkgp0w1pz2sjxr215lyjh62v5857g94h91h5kn70y6"; depends=[cluster fda ggplot2 ggpubr qrcm]; }; clustMD = derive2 { name="clustMD"; version="1.2.1"; sha256="0w4s9dab2mm5x0xibyl6s101c64if945a2cmwin9psd95p76mcny"; depends=[ggplot2 MASS mclust msm mvtnorm reshape2 truncnorm viridis]; }; - clustMixType = derive2 { name="clustMixType"; version="0.2-5"; sha256="0i3n8w2lsaiak7nz5ypnwnjkr5qq0slklcdpykmaikfmzahihvla"; depends=[RColorBrewer]; }; + clustMixType = derive2 { name="clustMixType"; version="0.2-9"; sha256="08qfmchj0dk4knw5fd4c1ydsg8qi3vjslwk4q6jlk2f8i2vafb1g"; depends=[RColorBrewer tibble]; }; clustcurv = derive2 { name="clustcurv"; version="2.0.0"; sha256="1zjyf81ifd2sgkgs548iy1awjhjmb541rrrw2pb92cn8ph7z7nc1"; depends=[data_table doParallel doRNG foreach ggfortify ggplot2 Gmedian KernSmooth npregfast RColorBrewer survival tidyr wesanderson]; }; cluster = derive2 { name="cluster"; version="2.1.0"; sha256="055af3yz2biqbsbwm4arwr1yqnj4gicpzv2i6dbfl5pnz2z5byga"; depends=[]; }; cluster_datasets = derive2 { name="cluster.datasets"; version="1.0-1"; sha256="0i68s9305q08fhynpq24qnlw03gg4hbk4184z3q3ycbi8njpr4il"; depends=[]; }; clusterCrit = derive2 { name="clusterCrit"; version="1.2.8"; sha256="10pz1bikdbkm2ky3xnagp0qv60whalavp6j39b4p7d75jj5xcxgk"; depends=[]; }; - clusterGeneration = derive2 { name="clusterGeneration"; version="1.3.4"; sha256="1ak8p2sxz3y9scyva7niywyadmppg3yhvn6mwjq7z7cabbcilnbw"; depends=[MASS]; }; + clusterGeneration = derive2 { name="clusterGeneration"; version="1.3.7"; sha256="0p1dwl08bf20h7pnspnsycrp3v48nm2miwcnlklyc4gdyzc2jksk"; depends=[MASS]; }; clusterGenomics = derive2 { name="clusterGenomics"; version="1.0"; sha256="127hvpg06is4x486g1d5x7dfkrbk7dj35qkds0pggnqxkq3wsc1c"; depends=[]; }; clusterPower = derive2 { name="clusterPower"; version="0.6.111"; sha256="1mwq188x9d495my75cdcahfjm3w46cas9jqxks5c0j63395cw9g3"; depends=[lme4]; }; clusterRepro = derive2 { name="clusterRepro"; version="0.9"; sha256="0s7qqvaf5yxxwhw6qyzfmk65c49yz405gljarwav6aglkx9883cl"; depends=[]; }; @@ -6359,53 +6607,59 @@ in with self; { clustree = derive2 { name="clustree"; version="0.4.3"; sha256="0lxydy2f83qqd5dhlp2l546jax759l43b29j6g82079yzg1szwsz"; depends=[checkmate dplyr ggplot2 ggraph ggrepel igraph rlang tidygraph viridis]; }; clustringr = derive2 { name="clustringr"; version="1.0"; sha256="07f0ywpkf8igic7ijvvrjlngq3smjcv9nqnah41fp6wfgvh49ifq"; depends=[assertthat dplyr forcats ggplot2 ggraph igraph magrittr rlang stringdist stringi stringr tidygraph]; }; clustsig = derive2 { name="clustsig"; version="1.1"; sha256="0n5nf712vsa8zb0c2lv4gjqsgva62678vjngr9idgswb73shxm8v"; depends=[]; }; - clustvarsel = derive2 { name="clustvarsel"; version="2.3.3"; sha256="1dw9iniy2vw4yz1jip4jja6fsp03kbr86mm5knbhhyc0l24i0wrz"; depends=[BMA foreach iterators Matrix mclust]; }; + clustvarsel = derive2 { name="clustvarsel"; version="2.3.4"; sha256="0hzvfcjs1k13j695jx6m0fgmcxy284gp4d59b7zmnvqib153x89x"; depends=[BMA foreach iterators Matrix mclust]; }; clv = derive2 { name="clv"; version="0.3-2.2"; sha256="072jn3xh6ii7vfp0gx03k1hiafnla1lkyn5hpj17nmqc0jvzp683"; depends=[class cluster]; }; cmaes = derive2 { name="cmaes"; version="1.0-11"; sha256="1hwf49d1m660jdngqak9pqasysmpc4jcgr8m04szwbyzyy6xrm5k"; depends=[]; }; cmaesr = derive2 { name="cmaesr"; version="1.0.3"; sha256="03zx2nrw24wmmjjpyh8pswasjjq0amf0g375fm2b3s111dx8fbj9"; depends=[BBmisc checkmate ggplot2 ParamHelpers smoof]; }; + cmcR = derive2 { name="cmcR"; version="0.1.3"; sha256="06337d039ycv6li4hl3dl710xsdcpzp257i4niy853qx3grjlr8z"; depends=[assertthat dplyr ggnewscale ggplot2 imager magrittr purrr quantreg rlang scales stringr tibble tidyr x3ptools zoo]; }; cmce = derive2 { name="cmce"; version="0.1.0"; sha256="0d52ci906zbd4q43qylcyw93acxh7f20jn3r0k74ynyy47131dnd"; depends=[]; }; + cmdfun = derive2 { name="cmdfun"; version="1.0.2"; sha256="1pbcq7hi2lcmqnghmy3q2fsk0c9fy5m0637acyzmc096fxbx723j"; depends=[magrittr purrr R_utils rlang testthat usethis]; }; cmenet = derive2 { name="cmenet"; version="0.1.1"; sha256="0f7bci6nn63q243i7wvhr9mqlf64gw8w042nc1lqb986p7zfxihk"; depends=[glmnet hierNet MASS Rcpp RcppArmadillo sparsenet]; }; + cmfrec = derive2 { name="cmfrec"; version="2.3.2"; sha256="192xlmylidq8rlscf5sg1ly6zl8lwpi7pfqcqb207lxl9s25mhw9"; depends=[]; }; cmm = derive2 { name="cmm"; version="0.12"; sha256="0q6hs56hhi9vaanx7i7gg7ncv0h29lndla66g9chzmh3lchq3r20"; depends=[]; }; cmmr = derive2 { name="cmmr"; version="0.1.2"; sha256="0nik1pzd1rckalvn7xh6s699kkdjnra3q3bn5x16c1lmpz5bp2s4"; depends=[httr progress RJSONIO]; }; cmna = derive2 { name="cmna"; version="1.0.3"; sha256="07wjjbhpd8g2gsmxh9cq2ij81qvd6y7x8zabspk9jilmxhycpxy6"; depends=[]; }; - cmocean = derive2 { name="cmocean"; version="0.2"; sha256="0v1bm2qgvjb82ynakglr61swx5jy41ngn6vml5gllv3r7skqr1is"; depends=[]; }; + cmocean = derive2 { name="cmocean"; version="0.3-1"; sha256="0y6yd3x2swx88r7kv6f9lrbf3zzawhf2x8izszgg4zb21pkal6k8"; depends=[]; }; cmprsk = derive2 { name="cmprsk"; version="2.2-10"; sha256="1xnx2zanw548prxsw2zw5cddkkg6kj97jgyzw67achq5mnsvfbg8"; depends=[survival]; }; cmprskQR = derive2 { name="cmprskQR"; version="0.9.2"; sha256="1b3di5fsgglriv00fxydpc4p8lh0xcgi6jc04awq2vmp6s8kvjmw"; depends=[quantreg survival]; }; cmrutils = derive2 { name="cmrutils"; version="1.3.1"; sha256="0nrq84bkd23lvvg8ls2smkjcnfnydhbcni3n6s8w0579i9xga8dv"; depends=[chron]; }; - cmsaf = derive2 { name="cmsaf"; version="2.0.1"; sha256="0ampq493i8x40jk8p8acgizy1vlhm05i5nllk5a0xk81vywf7ifi"; depends=[fields FNN ncdf4 rainfarmr raster sp]; }; - cmstatr = derive2 { name="cmstatr"; version="0.7.0"; sha256="0mah4kd677gj3yifphkd9v5nnfahwn7m4lsqcrhdqi49bgsd61mm"; depends=[generics ggplot2 kSamples MASS rlang tibble]; }; + cms = derive2 { name="cms"; version="0.1.0"; sha256="0m3cxvw40nyr1jpdkhg5nbms16hkzj0mrx5nl39x1l42cx2hcjrl"; depends=[assertthat dplyr magrittr readr rlang rvest xml2]; }; + cmsaf = derive2 { name="cmsaf"; version="3.0.0"; sha256="0lq3xr537x9h2j8dajmb3lqpc2yas2lk5f7fql0v914ibhffg8pd"; depends=[cmsafops cmsafvis colorspace colourpicker fields FNN mapproj maps maptools ncdf4 R_utils raster rworldxtra shiny shinyFiles shinyjs shinythemes sp]; }; + cmsafops = derive2 { name="cmsafops"; version="1.0.0"; sha256="1gjqc9xsiv0n3rc67jhmdz47l0di3cr3k27ah46gxy17glb1mlc3"; depends=[assertthat fields FNN ncdf4 rainfarmr raster sp]; }; + cmsafvis = derive2 { name="cmsafvis"; version="1.0.1"; sha256="02mhmrcid8npcq5gzsjwp88gqwgzqwx2015mfq6y1i60gizsa6zf"; depends=[animation assertthat cmsafops colorspace countrycode fields mapproj maps maptools ncdf4 png progress raster rworldxtra sp yaml]; }; + cmstatr = derive2 { name="cmstatr"; version="0.7.1"; sha256="0fi5lv3zaxylxm8qi0msj76k4qgld5gchqlmd4gqv52hscp20cgb"; depends=[dplyr generics ggplot2 kSamples MASS rlang tibble]; }; cmvnorm = derive2 { name="cmvnorm"; version="1.0-6"; sha256="1wf23w9gxrrgw7j740r381xrss09inzd7mrg6g7wz883c9madbfn"; depends=[elliptic emulator]; }; - cna = derive2 { name="cna"; version="2.2.3"; sha256="0ffz95yqj435bwzjih9xh1qbcz5zivz1g7fqf1k097z87d2j7qp3"; depends=[matrixStats Rcpp]; }; - cnaOpt = derive2 { name="cnaOpt"; version="0.1.1"; sha256="179ixxl7lp446ps6nlslnnywxh2yba9ypx2zrya505k1ybryxhc2"; depends=[cna dplyr ggplot2 matrixStats Rcpp]; }; + cna = derive2 { name="cna"; version="3.0.1"; sha256="0hhx3gzd8sjy3l6fx9ylbz171w5xg381al0ccrsp31q2l67d5ls5"; depends=[car Matrix matrixStats Rcpp]; }; + cnaOpt = derive2 { name="cnaOpt"; version="0.2.0"; sha256="0zm442nbbnnz47rzh57f0al21kcq0bd81g57q5b9dszf4s64japl"; depends=[cna dplyr ggplot2 matrixStats Rcpp]; }; cnbdistr = derive2 { name="cnbdistr"; version="1.0.1"; sha256="05qi41jimslbngjgbwzfda0q25hb28ax79v9yckvrbpgjc8dk990"; depends=[hypergeo]; }; cncaGUI = derive2 { name="cncaGUI"; version="1.0"; sha256="1v55kvrc05bsm1qdyfw3r3h64wlv3s6clxbr8k512lfk99ry42kn"; depends=[MASS plotrix rgl shapes tcltk2 tkrplot]; }; cnum = derive2 { name="cnum"; version="0.1.2"; sha256="0xf8fna91pb7xqgz43a9h32x4gkyak5bqvc01wz2sm02f2rj06cx"; depends=[BH Rcpp stringr]; }; coRanking = derive2 { name="coRanking"; version="0.2.1"; sha256="10489vbd917mzz5lw7ygi6q8q5qa7sp5d8xgv1ykn4lfx0avch69"; depends=[]; }; coala = derive2 { name="coala"; version="0.6.0"; sha256="0h7kc12yc90y5i733l6sfd9h12h0a2c7wv9wscjslj18sl3w3ccv"; depends=[assertthat digest R6 Rcpp RcppArmadillo rehh scrm]; }; coalescentMCMC = derive2 { name="coalescentMCMC"; version="0.4-1"; sha256="0xxv1sw5byf84wdypg5sfazrmj75h4xpv7wh4x5cr9k0vgf80b3s"; depends=[ape coda lattice Matrix phangorn]; }; - coalitions = derive2 { name="coalitions"; version="0.6.12"; sha256="11844sz65axj23xwv505jxck37xv3a5n36jpdr9ywvmb19gshar7"; depends=[checkmate dplyr ggplot2 gtools jsonlite lubridate magrittr purrr RCurl rlang rvest stringr tidyr xml2]; }; + coalitions = derive2 { name="coalitions"; version="0.6.15"; sha256="0i9nsbr8z3glxvx1ddm51l98q5xakalmqyvgmy7kmcjm6fb6xdx4"; depends=[checkmate dplyr ggplot2 gtools jsonlite lubridate magrittr purrr RCurl rlang rvest stringr tibble tidyr xml2]; }; coarseDataTools = derive2 { name="coarseDataTools"; version="0.6-5"; sha256="1k42vl49kfbllc5d66yn7y9f4jgbkfibmd85nl7hwm0gkgkssg36"; depends=[MCMCpack]; }; - cobalt = derive2 { name="cobalt"; version="4.2.2"; sha256="13ks10lg5c1hvbh8dmzp3mqz7frqk6bq3cxkm3wf31hb6086fbqa"; depends=[backports crayon ggplot2 gridExtra gtable rlang]; }; + cobalt = derive2 { name="cobalt"; version="4.2.4"; sha256="18aqhxvkmf7vwja4a4y9jaqys9gy84sx5bq5rh3fszhhs17i3954"; depends=[backports crayon ggplot2 gridExtra gtable rlang]; }; cobiclust = derive2 { name="cobiclust"; version="0.1.0"; sha256="068cqrhx7lxsvcjb62rgrca7y20cybz4445bl1qc6k16ca4bh0m9"; depends=[cluster]; }; cobs = derive2 { name="cobs"; version="1.3-4"; sha256="0hiw5smk6kgk0gb9840kcqkhkybl7n30s77xhjc395x09izbgix1"; depends=[quantreg SparseM]; }; coca = derive2 { name="coca"; version="1.1.0"; sha256="1lh7q3ip1jaz5zj5zcnd5whwpjw6zcrxs6j0j8mnmjsnw2kr4m5n"; depends=[caret cluster fpc glmnet Matrix nnet pheatmap RColorBrewer sparcl]; }; cocktailApp = derive2 { name="cocktailApp"; version="0.2.1"; sha256="1aq7m3qb4s5v59ym8p5vh7lr5s1xfp8b04x64a014k47gakgiw1d"; depends=[dplyr DT forcats ggplot2 ggtern magrittr shiny shinythemes tibble tidyr]; }; cocor = derive2 { name="cocor"; version="1.1-3"; sha256="106zyrrypil8jyg0pva5zj4hgb53z81nca3d0mh2q3j55zq3wl12"; depends=[]; }; - cocoreg = derive2 { name="cocoreg"; version="0.1.1"; sha256="0jrrkak964pl1vih592jgqgl6bw08j0fa1rh3j85x64bqq4m7278"; depends=[abind CCAGFA combinat e1071 ggplot2 glmnet gridExtra MASS multiway pls reshape RGCCA]; }; cocorresp = derive2 { name="cocorresp"; version="0.4-1"; sha256="10prxmc80yk0l5v1gcy92clmjvjywimypqpzjb6gh5pipsqr4swr"; depends=[vegan]; }; cocron = derive2 { name="cocron"; version="1.0-1"; sha256="0dl14y9v9kndy5gzhhbhq3f31ja724y1hra40givy6bij7h2cj30"; depends=[]; }; - coda = derive2 { name="coda"; version="0.19-3"; sha256="1mn50bshky968gn4nf6vnkaa768fnvm1xmhkms7szwdw9341zpyk"; depends=[lattice]; }; + coda = derive2 { name="coda"; version="0.19-4"; sha256="13z5dwfpnyyhpsbpg4xr9g5c1685jhqj90f4x4qkcykr6kykqba2"; depends=[lattice]; }; coda_base = derive2 { name="coda.base"; version="0.3.1"; sha256="0rz0hlhww9ja1y40yi4fah468apwp1xcnbbl1qmfggil863l5fqa"; depends=[Rcpp RcppArmadillo]; }; codadiags = derive2 { name="codadiags"; version="1.0"; sha256="1x243pn6qnkjyxs31h1hxy8x852r0fc952ww77g40qnrk8qw79xg"; depends=[coda]; }; codalm = derive2 { name="codalm"; version="0.1.0"; sha256="0gfvq6pyqm1slj2bcla65dliffk0fc99hc7ga5142bqxmmr9bx35"; depends=[future future_apply SQUAREM]; }; codebook = derive2 { name="codebook"; version="0.9.2"; sha256="0hxyzwpjbvfzad8h2428q94m961mmwvv28nagw2d36qxd10awh16"; depends=[dplyr forcats ggplot2 glue haven htmltools jsonlite knitr labeling labelled likert purrr rlang rmdpartials skimr stringr tibble tidyr tidyselect vctrs]; }; + codebreaker = derive2 { name="codebreaker"; version="0.0.2"; sha256="12gjaziwzzisx4j70z8k17k6i5wdsdyk542yfx04rin4ks829f34"; depends=[beepr cli]; }; codemetar = derive2 { name="codemetar"; version="0.1.9"; sha256="096habmcncyfadly4zflydjayifklifjr4iqfpfg4hl43yq9a5q2"; depends=[cli commonmark crul desc gert gh jsonlite magrittr memoise pingr pkgbuild purrr remotes sessioninfo urltools xml2]; }; codep = derive2 { name="codep"; version="0.9-1"; sha256="17jziwm56icswa4ngp51ah8w1ma7ij3cksbdaipk0ikqvb5kinkb"; depends=[]; }; - codetools = derive2 { name="codetools"; version="0.2-16"; sha256="00bmhzqprqfn3w6ghx7sakai6s7il8gbksfiawj8in5mbhbncypn"; depends=[]; }; + codetools = derive2 { name="codetools"; version="0.2-18"; sha256="0a2c115glq8jxixwfigrpvjabhxchn9r4mc40y41dg9dg6wsd7hs"; depends=[]; }; codexcopd = derive2 { name="codexcopd"; version="0.1.0"; sha256="0pkl29fybflnj42xj8agyw6s3xif9vr5690vlkv5n3dxs8ji582h"; depends=[]; }; codified = derive2 { name="codified"; version="0.2.0"; sha256="1hmw7yrw4qx8v9rkqqvqf4013s9whq5qlgwz7v882j4slpvm6gb1"; depends=[checkmate dplyr kableExtra knitr magrittr readr rlang tibble tidyr]; }; codingMatrices = derive2 { name="codingMatrices"; version="0.3.2"; sha256="0kldx2h3mksw4644d0ask6ij7i63rrwk0njlsvkbdjz3bf7pdv1b"; depends=[fractional Matrix]; }; - codyn = derive2 { name="codyn"; version="2.0.4"; sha256="0riq4v9pc8fbclzz2zx06264sa4k0lpfzv8cp2ng75a4qp63chwv"; depends=[assertthat permute vegan]; }; + codyn = derive2 { name="codyn"; version="2.0.5"; sha256="1iqlh3ydnqi7s2b3fa2zgb05j763qgxriys4piawwmgrdrvd3d9q"; depends=[assertthat permute vegan]; }; coefficientalpha = derive2 { name="coefficientalpha"; version="0.7"; sha256="0li1js501sa8m0ba76ymn4lz5y4np7kf96gnxz9kypg50kd58yis"; depends=[lavaan rsem]; }; coefplot = derive2 { name="coefplot"; version="1.2.6"; sha256="036njf2xwmjvyamanb7nfn2n09ps2rdgk3zrxn6khwp8ly245nps"; depends=[dplyr dygraphs ggplot2 magrittr plyr purrr reshape2 tibble useful]; }; coenocliner = derive2 { name="coenocliner"; version="0.2-2"; sha256="0r4h0r3av2d1cxmjpwaabjn807626pzqnra2x542wdnnf7h8nmdf"; depends=[]; }; @@ -6415,54 +6669,56 @@ in with self; { cofeatureR = derive2 { name="cofeatureR"; version="1.1.1"; sha256="1awfrlnbpw9ivfvaahznx6dx5jp8ln0154vh2pznp520q59h1mbs"; depends=[dplyr ggplot2 lazyeval tibble]; }; coga = derive2 { name="coga"; version="1.1.0"; sha256="0p2mdia89gj7w0j33qxil1l2zg6civj18i3pqym7aijzz1fgwnzp"; depends=[cubature Rcpp RcppGSL]; }; cogmapr = derive2 { name="cogmapr"; version="0.9.1"; sha256="1iz776avw05a0lcna78fycixacby4bjf8ar1jazsf34yss6zka23"; depends=[car dplyr ggplot2 graph magrittr Rgraphviz tidyr]; }; - cognitoR = derive2 { name="cognitoR"; version="1.0.1"; sha256="1qd3hsblciqnjysx3hqdkwmzpl2zf72jiwywicjpbpv1i703c4wx"; depends=[base64enc config dplyr httr jsonlite shiny shinyjs yaml]; }; - cohorttools = derive2 { name="cohorttools"; version="0.1.2"; sha256="0hfpl2dm5ykagwmmdmk0hpbkzzd0zqmf9andm510safjp4mlbcy0"; depends=[cmprsk DiagrammeR DiagrammeRsvg Epi ggplot2 rsvg survival]; }; - coil = derive2 { name="coil"; version="1.2.1"; sha256="0s11v1hcksljpxnlkmrlnnamx4mlsck45hsjm4xlhc1zb7x9kqf5"; depends=[ape aphid seqinr]; }; + cognitoR = derive2 { name="cognitoR"; version="1.0.2"; sha256="1pz4wk7vdc1nhm76kz912hyyc9c408qsldfr9dygqvran4xvqm9g"; depends=[base64enc config dplyr httr jsonlite paws shiny shinyjs yaml]; }; + cohorttools = derive2 { name="cohorttools"; version="0.1.4"; sha256="1zpf3qgzkn34wc36r89ymzfx4fvlgl7x1yiwdwzzd20xv3nx2b5h"; depends=[cmprsk DiagrammeR DiagrammeRsvg Epi ggplot2 rsvg survival]; }; + coil = derive2 { name="coil"; version="1.2.2"; sha256="0shnvk886q9mp2z0cl87s01k5fpkx5ccncx3882wvnk4iyjnaxw9"; depends=[ape aphid seqinr]; }; coin = derive2 { name="coin"; version="1.3-1"; sha256="0qi03fyqw42a2vnqcia5l2m1mzyarj2q1iblknx9n19bdsd53qjx"; depends=[libcoin matrixStats modeltools multcomp mvtnorm survival]; }; - coindeskr = derive2 { name="coindeskr"; version="0.1.0"; sha256="0iwkg9qx5gymzjxw3w1zlwq9336kbqp4z8a9wf9a1p2gp9727qcm"; depends=[httr jsonlite]; }; coinmarketcapr = derive2 { name="coinmarketcapr"; version="0.3.2"; sha256="0n62kcw7yxpvxd2bzki432cis5rvfw8b8syfvgv5wpq53bavq3px"; depends=[cli crayon curl data_table ggplot2 jsonlite]; }; cointReg = derive2 { name="cointReg"; version="0.2.0"; sha256="0n4s809avhlrmrjdqzc2s752m7x96c4432gnjd4qv77r2nns7dw4"; depends=[checkmate MASS matrixStats]; }; cointmonitoR = derive2 { name="cointmonitoR"; version="0.1.0"; sha256="0rsacvib9prgb199m5ndi0zlgfsvf1giqc5s41wp0yvxdxjdq5lw"; depends=[cointReg matrixStats]; }; cold = derive2 { name="cold"; version="2.0-1"; sha256="143zmccaiijz4cfiwh1a48h95bqa0ypa9ivv43qkx9y55911a05x"; depends=[cubature MASS]; }; colf = derive2 { name="colf"; version="0.1.3"; sha256="1av82yrp6csw7700ymipd02j73cmzn0apv7ykachjw09nzk86kvj"; depends=[nlsr]; }; collUtils = derive2 { name="collUtils"; version="1.0.5"; sha256="0gbk3lrb2lwq2ixrpcngng6qz6axjb4iyqy5606x1zmjm71c060p"; depends=[Rcpp rJava]; }; - collapse = derive2 { name="collapse"; version="1.3.0"; sha256="0vpqiqqqcyr017cvapwyhmzv2yd65yn6l77q2i0d7bf06rgmw1yn"; depends=[lfe Rcpp]; }; collapsibleTree = derive2 { name="collapsibleTree"; version="0.1.7"; sha256="0b65pbp1wnpsrayqi630ds4r98jvcvynnlp6wxdqrnnr9nzw5343"; depends=[data_tree htmlwidgets]; }; collectArgs = derive2 { name="collectArgs"; version="0.4.0"; sha256="0fz5w1xsxiddzrwahrg50px4igyhd4plq655jaix6grancs7kvix"; depends=[magrittr]; }; collections = derive2 { name="collections"; version="0.3.5"; sha256="053ig88pva78wxxwya3v7cz853k563dkpgxrf2xvd0l0d9fanxmz"; depends=[]; }; collector = derive2 { name="collector"; version="0.1.3"; sha256="1yn6gzccdbp7n4qnwqpv66617qldjabzrlww41v6wqn9b7qyr0ii"; depends=[dplyr EnvStats evaluator flextable ggplot2 ggpubr magrittr officer purrr quanteda readr rlang rmarkdown stringr tibble tidyr xaringan]; }; - collidr = derive2 { name="collidr"; version="0.1.2"; sha256="1b8yy0p1r4gs6azcl1aqkny3hws5hhl9bvsrkrhgk2r2xni9sk6f"; depends=[dplyr jsonlite stringr]; }; + collidr = derive2 { name="collidr"; version="0.1.3"; sha256="18ki8mwf5ihbgfbhdbbk9ljs44js3rqgl1g6g3ch6dynz61sr6hn"; depends=[dplyr jsonlite stringr]; }; collpcm = derive2 { name="collpcm"; version="1.1"; sha256="14rlipdww5sm1ijp2ggpnd23m14qh10zm99cfq1w0kky9jfl0fkn"; depends=[latentnet network vegan]; }; colmozzie = derive2 { name="colmozzie"; version="1.1.1"; sha256="0sn7dqg7rnddnmdb10c6scws6kgi1lz4lw8nc698x63z431ah1p8"; depends=[]; }; coloc = derive2 { name="coloc"; version="3.2-1"; sha256="0sm2mji8bihvcshkh9g18sgbwznhh8j4hip50rk7ckac3vc8y75h"; depends=[BMA data_table ggplot2 reshape snpStats]; }; + colocalization = derive2 { name="colocalization"; version="1.0.2"; sha256="0jrrh9nxjl3261rp1fnjfnydpxwpi7v0d20kzd0xc6awf52gydbb"; depends=[ggplot2]; }; colocalized = derive2 { name="colocalized"; version="0.2.0"; sha256="1q98wfqk0p9p92jgjf8liamz6grzwy6h57k7681fm07wfnyr268g"; depends=[doParallel foreach purrr]; }; colocr = derive2 { name="colocr"; version="0.1.1"; sha256="0ijykza6fdmwbr5zbyfjf382anrxh0lb9hlallyawfi6z076fv7j"; depends=[imager magick magrittr scales shiny]; }; colorBlindness = derive2 { name="colorBlindness"; version="0.1.6"; sha256="18922caddz7c5dj5mbyl7qihgsnk384w31k17rwngm5hckz2d5yi"; depends=[colorspace cowplot ggplot2 gridGraphics gtable]; }; - colorDF = derive2 { name="colorDF"; version="0.1.2"; sha256="1rag13z0h7jyzdq3cm40vxjvm29jk1jim907rsphnasybrf8wa48"; depends=[crayon purrr]; }; + colorDF = derive2 { name="colorDF"; version="0.1.4"; sha256="1q1xfa0h7mbihbv1bpw94rsh6mp4l2v2d2spqwh6r3iy0hf9yk1c"; depends=[crayon purrr]; }; colorRamps = derive2 { name="colorRamps"; version="2.3"; sha256="0shbjh83x1axv4drm5r3dwgbyv70idih8z4wlzjs4hiac2qfl41z"; depends=[]; }; colorSpec = derive2 { name="colorSpec"; version="1.2-1"; sha256="1y6wq4g4rf2carqi387v94502nb5jmw7f6f7grbdzbkixs77bkg2"; depends=[MASS spacesXYZ]; }; - colordistance = derive2 { name="colordistance"; version="1.1.0"; sha256="0aiqvx0mlraczkcfhzfcaavmqqmxiffnghhw266f84bphxw6b5q2"; depends=[abind ape clue emdist gplots jpeg magrittr mgcv plotly png scales scatterplot3d spatstat]; }; + colordistance = derive2 { name="colordistance"; version="1.1.1"; sha256="00bckfwr3kzq91cpd9k2rk2d0wmqjkr05nlfs9937c0wvn7s2xgw"; depends=[abind ape clue emdist gplots jpeg magrittr mgcv plotly png qpdf scales scatterplot3d spatstat]; }; coloredICA = derive2 { name="coloredICA"; version="1.0.0"; sha256="1xj4dsrwgqzm2644nk3y8nj47m036b4ylh6v60jccj3707spb32r"; depends=[MASS]; }; colorednoise = derive2 { name="colorednoise"; version="1.1.0"; sha256="0x6l9civgqr6lbvdxnhzm30ykx9i6k1q3n6skhnq9b6b52zwrcx4"; depends=[data_table purrr Rcpp RcppArmadillo]; }; colorfindr = derive2 { name="colorfindr"; version="0.1.4"; sha256="175h476dzq1f2x25vdd268xj4ja4lv8fhfj9vld85waqi0sq515g"; depends=[bmp dplyr jpeg magrittr pixmap plotly plotwidgets png purrr rsvg stringr tibble tiff treemap]; }; colorfulVennPlot = derive2 { name="colorfulVennPlot"; version="2.4"; sha256="01b3c060fbnap78h9kh21v3zav547ak2crdkvraynpd2096yk51w"; depends=[]; }; colorhcplot = derive2 { name="colorhcplot"; version="1.3.1"; sha256="009pyyb30kwshldd7v7zfy5rxys6i0dhlc5w8ail61acbg4rlrmz"; depends=[]; }; - colorist = derive2 { name="colorist"; version="0.1.1"; sha256="1f7hdwivpg76dwns58jabdv4ybavd2pxpx43aqh7lp9whi7jqgk0"; depends=[colorspace ggplot2 magrittr raster scales tidyr]; }; + colorist = derive2 { name="colorist"; version="0.1.2"; sha256="0vakfv8rq0l55qzb8cj78zbyvcrh9j7ixjap95d144g3b617h6x3"; depends=[colorspace ggplot2 magrittr raster scales tidyr]; }; + colorizer = derive2 { name="colorizer"; version="0.1.0"; sha256="1c0rgjxzjwkaxdnkmcgn9f0mmcxna724cq60q79hzjindbl4r6bk"; depends=[dplyr httr magick magrittr purrr stringr tibble]; }; colormap = derive2 { name="colormap"; version="0.1.4"; sha256="0032ji9n8pivl70jppq989fgg781wil8zag7pfl1hs9xrpin8asy"; depends=[ggplot2 stringr V8]; }; colorpatch = derive2 { name="colorpatch"; version="0.1.2"; sha256="18p9hgccp37pbdf437xffkv6z500896v08fsw2jm8zcl9ladygaf"; depends=[colorspace ggplot2 gridExtra TSP]; }; colorr = derive2 { name="colorr"; version="1.0.0"; sha256="1wwrgb9fc9gzxxwxrdrkwwrmhqqllv29wr4q8y1shj9d3nzcpwmh"; depends=[]; }; colorscience = derive2 { name="colorscience"; version="1.0.8"; sha256="11fy8545g93b8dn2imihsb031lnf5g5z17km8q07q4y6g96xdbdv"; depends=[Hmisc pracma sp]; }; - colorspace = derive2 { name="colorspace"; version="1.4-1"; sha256="0wyny3ah2d74hqv80s6imrarpna09gq3j9rjnz6zx2qg0lx72gb9"; depends=[]; }; + colorspace = derive2 { name="colorspace"; version="2.0-0"; sha256="13h1hara0s6xn16bgkrbd0flszah1yiylwfwxwn2inqqk6pm6sjf"; depends=[]; }; colortools = derive2 { name="colortools"; version="0.1.5"; sha256="0z9sx0xzfyb5ii6bzhpii10vmmd2vy9vk4wr7cj9a3mkadlyjl63"; depends=[]; }; - colourlovers = derive2 { name="colourlovers"; version="0.3.5"; sha256="172ny0w9n2ys8pa7zxkfjsl7lv6fa59bmmbkzlwfx59wamxahmky"; depends=[httr jsonlite png XML]; }; - colourpicker = derive2 { name="colourpicker"; version="1.0"; sha256="0z3v2083g7kwdp21x9s2n1crfh24agpdq3yxkcdzc2awn2pwpnpi"; depends=[ggplot2 htmltools htmlwidgets jsonlite miniUI shiny shinyjs]; }; - colourvalues = derive2 { name="colourvalues"; version="0.3.5"; sha256="1mj3pc00fc7ifn6w6jhk5yda6iq5jmx92ypl2qxaad6n4s18s6nr"; depends=[BH Rcpp]; }; + colourlovers = derive2 { name="colourlovers"; version="0.3.6"; sha256="13fqn6hbqjk3d8krpqb3hmsq06qrbks8a9ia5441hd6m7m8wjjkc"; depends=[httr jsonlite png XML]; }; + colourpicker = derive2 { name="colourpicker"; version="1.1.0"; sha256="1qjispj7i12m02js5cm5xlgn5lyff0kc5ybz6lbknz8q5lkbdyrd"; depends=[ggplot2 htmltools htmlwidgets jsonlite miniUI shiny shinyjs]; }; + colourvalues = derive2 { name="colourvalues"; version="0.3.7"; sha256="1xpdxqx328l6rjmys7gqrq9pyla7sfmb3xzjrhyksx7i4ncmndpr"; depends=[BH Rcpp]; }; colourvision = derive2 { name="colourvision"; version="2.0.2"; sha256="15ndhqpp5fi9jgiri9ysl68nf4rdamh9c25svf5nvh2wvv8shrd9"; depends=[Matrix rgl]; }; colr = derive2 { name="colr"; version="0.1.900"; sha256="0ilz1y0jd2vgyh81g3dwx2l64sir6z6sgmqx7lnvr1hafsqnwfc8"; depends=[]; }; colt = derive2 { name="colt"; version="0.1.1"; sha256="028jqvgr14ig8jxp8h2lrf7mainzppgqh6v1479qfv4l9is3bnwy"; depends=[crayon]; }; - comat = derive2 { name="comat"; version="0.8.2"; sha256="0yhldgbz992pplxpsmkyhw54b35yr3x9fdd05iprnnq1r04hsr09"; depends=[Rcpp RcppArmadillo]; }; + comFuncs = derive2 { name="comFuncs"; version="0.0.5"; sha256="1n17s28rf6jbii8cffzxylp5dr47x4my7chvf2j1zh4vrkml0n1n"; depends=[rstudioapi shiny]; }; + comat = derive2 { name="comat"; version="0.9.0"; sha256="1s9ca06wdwars0manjknl8mpsylcj89zap77plng5k8yzlyshjm1"; depends=[Rcpp RcppArmadillo]; }; comato = derive2 { name="comato"; version="1.1"; sha256="0lidwr5vw10655p7q0iqzq3phq5y1i86w3bjdv87cwx3m6333bz6"; depends=[cluster clusterSim gdata igraph lattice Matrix XML]; }; combinat = derive2 { name="combinat"; version="0.0-8"; sha256="1h9hr88gigihc4na7lb5i7rn4az1xa7sb34zvnznaj6pdrmwy4qm"; depends=[]; }; + combinedevents = derive2 { name="combinedevents"; version="0.1.0"; sha256="0y840y5051a9i8jivw1vanigg762axj6disjghq1skpkhkx70178"; depends=[lubridate magrittr rlang stringr]; }; combiter = derive2 { name="combiter"; version="1.0.3"; sha256="11pcvrpbvkzkjwks2z6ww7s9d5fkh8zl0jw52a5ya3y1wkqcs3n6"; depends=[iterators itertools Rcpp]; }; comclim = derive2 { name="comclim"; version="0.9.5"; sha256="1s6zh16j0q2n7gkvhd4bym9w3hyg4b9n5lpgspqp2nlygdl6jxxb"; depends=[]; }; cometExactTest = derive2 { name="cometExactTest"; version="0.1.5"; sha256="0ar9axm9cd1wd937xcmsmd7xqilnfyab8gsrpkiqpc3fjh86qyrp"; depends=[dplyr]; }; @@ -6475,10 +6731,11 @@ in with self; { comorbidity = derive2 { name="comorbidity"; version="0.5.3"; sha256="10zlq1586abngdrw5hgba78ridn3xj4q68f34slxpk0gxwa94n7p"; depends=[checkmate data_table]; }; compHclust = derive2 { name="compHclust"; version="1.0-3"; sha256="0agay7rn5mrw07imz4l547b7m9pfcg3rhz4krfxrvg1q2z2kryvj"; depends=[]; }; compactr = derive2 { name="compactr"; version="0.1"; sha256="0f2yds6inmx0lixj08ibqyd2i61l2cbg1ckgpb8dl2q7kcyyd6mx"; depends=[]; }; + comparator = derive2 { name="comparator"; version="0.1.1"; sha256="02j36dm9vg53v224djy6v7jicd1d5sdx148r8qh096zb942wpvp6"; depends=[clue proxy Rcpp]; }; compare = derive2 { name="compare"; version="0.2-6"; sha256="0k9zms930b5dz9gy8414li21wy0zg9x9vp7301v5cvyfi0g7xzgw"; depends=[]; }; compareC = derive2 { name="compareC"; version="1.3.1"; sha256="0dachfr23lps2jj1y5gc958k54vskmww84gdgk4amihsdgjsnphg"; depends=[]; }; - compareDF = derive2 { name="compareDF"; version="2.2.0"; sha256="039s75dzm9dwy31svvvqvbxdh58j2ph00fngshnidxis8l3fn47i"; depends=[dplyr htmlTable magrittr openxlsx stringr tibble tidyr]; }; - compareGroups = derive2 { name="compareGroups"; version="4.4.3"; sha256="1y2gpakqizv8inqaf4a8dcpy35wkhggjik804sm9k9fq1m189xwi"; depends=[chron flextable HardyWeinberg kableExtra knitr officer rmarkdown SNPassoc survival writexl]; }; + compareDF = derive2 { name="compareDF"; version="2.3.0"; sha256="1phpw7zw6yh4r3b792rpja3bww6niblaqgcmpnfm0aqapmazr4k5"; depends=[data_table dplyr htmlTable magrittr openxlsx stringr tibble tidyr]; }; + compareGroups = derive2 { name="compareGroups"; version="4.4.6"; sha256="0ywj7jgj6shkmjb309k38hzzp23gvrwrhq7mbk6bq0s919fcp8wi"; depends=[chron flextable HardyWeinberg kableExtra knitr officer rmarkdown survival writexl]; }; compareODM = derive2 { name="compareODM"; version="1.2"; sha256="019hq8j56asjvh4x1p65785mf38xr05j3by0749gl9k9yl8645da"; depends=[XML]; }; comparer = derive2 { name="comparer"; version="0.2.1"; sha256="1ric6niwx9718qrdkiclmjbrx4vjbg7jwvd6917hihzyjgbsi9fj"; depends=[R6]; }; comparison = derive2 { name="comparison"; version="1.0-5"; sha256="0vg8s9j2xjzv7bidd59givxgcqzhdd29q84dj4ww2a6vkmq269r7"; depends=[isotone]; }; @@ -6486,17 +6743,19 @@ in with self; { compboost = derive2 { name="compboost"; version="0.1.0"; sha256="0q7jfj5yc2jvddyyhnzv8fnlmngjfws7cg2blxai76s2fw6bmgxp"; depends=[checkmate glue R6 Rcpp RcppArmadillo]; }; compendiumdb = derive2 { name="compendiumdb"; version="1.0.3"; sha256="0glaqlzz5wr14yfhka1y7yw5ha6yc4waw61msbz0vkwj5z2hd2hk"; depends=[Biobase GEOquery RMySQL]; }; comperank = derive2 { name="comperank"; version="0.1.1"; sha256="0wz46rkpx1cjjng3i03pms2x27cik9wbx7al5r289ym3664zb83m"; depends=[comperes dplyr Rcpp rlang tibble]; }; - comperes = derive2 { name="comperes"; version="0.2.4"; sha256="051fn21pzizhv1wlf9nk59cyirvv3jxdnq8mrp9l81zvxlwb7qf5"; depends=[dplyr magrittr rlang tibble tidyr]; }; + comperes = derive2 { name="comperes"; version="0.2.5"; sha256="0pfpbnbnpln3srn2m248v0n72mw72fh0rvqpvswi1qmjcpkfkd7v"; depends=[dplyr magrittr rlang tibble tidyr]; }; competitiontoolbox = derive2 { name="competitiontoolbox"; version="0.1.3"; sha256="0yqrnbg2chyh9idqpiq5v6wc2708a6r4z7vvlwkpnxp19saa8s06"; depends=[antitrust ggplot2 rhandsontable shiny trade]; }; completejourney = derive2 { name="completejourney"; version="1.1.0"; sha256="0ysbpmd7rglz3diy2cpcgvmmcnysradb4ddiwix7kbhzrhvhrdrs"; depends=[curl dplyr progress stringr tibble zeallot]; }; complexity = derive2 { name="complexity"; version="1.1.1"; sha256="1lpsvry88jpqfw0wkdlwjzkqjl17f4adjcqvq0dwk483mi54xnfk"; depends=[combinat shiny]; }; complexplus = derive2 { name="complexplus"; version="2.1"; sha256="16w9v7d1ckavqmr86l34frr37pkvdn0iqnb17ssb8xaggns5lgqx"; depends=[expm Matrix]; }; complmrob = derive2 { name="complmrob"; version="0.7.0"; sha256="0dvkc5y53041agkjz3rl898hkq686pxzr6flf2qx1g3jbza3pk1y"; depends=[boot ggplot2 robustbase scales]; }; compositions = derive2 { name="compositions"; version="2.0-0"; sha256="0xsx4n699q2r4pk2jrvifi3wi49lih7d1j3j6qgqqd31brg53jqr"; depends=[bayesm MASS robustbase tensorA]; }; + composits = derive2 { name="composits"; version="0.1.0"; sha256="1j2bbl0p7dhlf18n1164qdbch2qa5nzk66qh4xlrrhr36zip88y4"; depends=[anomalize dobin dplyr fastICA forecast ggplot2 gridExtra ICS kableExtra otsad pracma rlang tibble tidyr tsoutliers]; }; compound_Cox = derive2 { name="compound.Cox"; version="3.20"; sha256="18fgc58jqrjls1rkzrpy338m3yyxaqkv7dfv31a2sf551ynajcfy"; depends=[numDeriv survival]; }; comprehenr = derive2 { name="comprehenr"; version="0.6.8"; sha256="18gw9ni9cqlkxf6hhgnwankwa09lv8jmzgk7xxs3n0gqd6kbbgw3"; depends=[]; }; compstatr = derive2 { name="compstatr"; version="0.2.1"; sha256="0pg8yacfb7jvg9xr0gmis8a4g339isd77h6wr8dd6w900q47xac0"; depends=[dplyr fs httr janitor lubridate purrr readr rlang rvest sf stringr tibble tidyr xml2]; }; compute_es = derive2 { name="compute.es"; version="0.2-5"; sha256="00133s3l3g70xrfnxgxhvbjr8izvaj9h0c73iaiyjmlgj84x69m8"; depends=[]; }; + comsimitv = derive2 { name="comsimitv"; version="0.1.4"; sha256="1b7yh9rnp7h4642sk0yngqy68iwl2kjzfcidmpy6l8lakfnmshin"; depends=[MASS vegan]; }; comtradr = derive2 { name="comtradr"; version="0.2.2"; sha256="177gnmgwqns65z5y9nw4xp8qmw5z70454zb54jw1879xrgfsrciz"; depends=[httr jsonlite magrittr purrr]; }; con2aqi = derive2 { name="con2aqi"; version="0.1.0"; sha256="1gdd1y6xg26fz199hvryzsnp16qbsz13chqqxyxnkgrai1l72mhf"; depends=[]; }; conStruct = derive2 { name="conStruct"; version="1.0.4"; sha256="1klhzsxrkbz16dnm3r2qxyq2z02zqrps9kij2jy6241ni9qmnn2f"; depends=[BH caroline doParallel foreach gtools Rcpp RcppEigen rstan rstantools StanHeaders]; }; @@ -6504,27 +6763,28 @@ in with self; { concaveman = derive2 { name="concaveman"; version="1.1.0"; sha256="0b3fx3y60ibb73pqx5591jq1n86242qajfxbz3vzz6rxxspddlcz"; depends=[dplyr jsonlite magrittr sf V8]; }; conclust = derive2 { name="conclust"; version="1.1"; sha256="1k9y1mniy7s51dmm5ia693k72s2vxk5bznxxf74s7mx9n3mg2i8r"; depends=[]; }; concor = derive2 { name="concor"; version="1.0-0.1"; sha256="0hjyvi6p16cyrmq0bq7fph1r5f3adp7zpf123wkm5bkjnc5122k0"; depends=[]; }; - concorR = derive2 { name="concorR"; version="0.2.0"; sha256="1rgsindjz2mysqzafq4r6gwzwpqcqr461al4bc5dyf05ypqvf9fz"; depends=[igraph sna]; }; + concorR = derive2 { name="concorR"; version="0.2.1"; sha256="15pi24xka83p3hm33rfs9vnfkzywmvpz3hpncgqmc9ifwag0zgra"; depends=[igraph sna]; }; concordance = derive2 { name="concordance"; version="2.0.0"; sha256="1xlm0c91bsbij8dr23fh781c6bg8l74kma6x7nnapkpm7jim279x"; depends=[dplyr purrr rlang stringr tibble tidyr]; }; - concreg = derive2 { name="concreg"; version="0.6"; sha256="1ncs9cpviv5kd49hahlhi7wn2yk70msi22qv8fw91hf81ccimlp2"; depends=[survival]; }; - concurve = derive2 { name="concurve"; version="2.5.0"; sha256="1zmm3y1abm6gjvl9vjmsi2rn2vxgy4qp9crmlrhx3yzij58m15sq"; depends=[bcaboot boot cowplot dplyr flextable ggplot2 knitr lme4 MASS metafor officer patchwork pbmcapply ProfileLikelihood scales survival survminer tibble tidyr]; }; + concreg = derive2 { name="concreg"; version="0.7"; sha256="0g4my3ra9p797vcky5hsgcicsdbmczgd8fklxrkw2jrgwc0xrkaf"; depends=[survival]; }; + concurve = derive2 { name="concurve"; version="2.7.7"; sha256="185jwz7a33sc9gbkfbcxwzgzd39xn5x72d0nk6p045mq3xssk3j9"; depends=[bcaboot boot colorspace dplyr flextable ggplot2 knitr metafor officer pbmcapply ProfileLikelihood scales survival survminer tibble tidyr]; }; cond = derive2 { name="cond"; version="1.2-3.1"; sha256="1j0gf28mg2j6ahs83nk662bix1lb2c9184vn8sblw433zxqaa2ny"; depends=[statmod survival]; }; condGEE = derive2 { name="condGEE"; version="0.1-4"; sha256="0mqj2pc91n8h3arpd4b9f7ndbcnai21c67is22qg22wj7vhhs87h"; depends=[numDeriv rootSolve]; }; condMVNorm = derive2 { name="condMVNorm"; version="2020.1"; sha256="115pxnff2ckdxx0avbs0hfdhh1sljiz1y6h7ggd5hidrxd3559m4"; depends=[mvtnorm]; }; condSURV = derive2 { name="condSURV"; version="2.0.1"; sha256="0xjpypc4fzrnfjcznyc2bslkkza4fib8nx8ff2j7xh2nf84lk3f1"; depends=[doParallel doRNG foreach KernSmooth np survival]; }; + condTruncMVN = derive2 { name="condTruncMVN"; version="0.0.2"; sha256="1dicfa82yg8k83lnb5c17jnqwgkazpb8404kfzdf6ikmndwjn0zg"; depends=[condMVNorm matrixNormal tmvmixnorm tmvtnorm truncnorm]; }; condformat = derive2 { name="condformat"; version="0.9.0"; sha256="151rpnrnbj5ilckf99m6k3c26r1sr94496kws9w91faxilvl180b"; depends=[dplyr gridExtra gtable htmlTable htmltools knitr magrittr openxlsx rlang rmarkdown scales tibble tidyselect]; }; - condir = derive2 { name="condir"; version="0.1.2"; sha256="1vd3nw2hhldy7igpx58p6if6q2h99d7ypb2ldxkssq6y79n8hq99"; depends=[BayesFactor effsize knitr psych shiny xtable]; }; + condir = derive2 { name="condir"; version="0.1.3"; sha256="09b0nfdi39mq0531bjzmk8wnmzkyvcd2q5fyk8lnam3n6fz3dg2y"; depends=[BayesFactor effsize knitr psych shiny xtable]; }; conditionz = derive2 { name="conditionz"; version="0.1.0"; sha256="0ijnsg6n3p3y8y9il012xg5if57hdzvrgxjcykfrrlil4m7ixn6c"; depends=[R6 uuid]; }; condmixt = derive2 { name="condmixt"; version="1.1"; sha256="1x6n3ylaa9ywvz7v63i2pvd2lxm95wq19xy741g9hy73ld7hd7zn"; depends=[evd]; }; condusco = derive2 { name="condusco"; version="0.1.0"; sha256="0zydinzlksynkz4r712rzv9qqdx8dkdz3h1ygi9cfmd6hya3580s"; depends=[assertthat bigrquery DBI jsonlite]; }; condvis = derive2 { name="condvis"; version="0.5-1"; sha256="1ngxqfa0mr86cv610da4ljypxpdvx0n5pfgj3zfksnwxlwc0dvbj"; depends=[MASS]; }; - condvis2 = derive2 { name="condvis2"; version="0.1.0"; sha256="1xvxqr311wwi8ns31zqnxxb7bji3vl296j3qfq7vh0alxlhd4n4r"; depends=[cluster DendSer ggplot2 kmed plyr RColorBrewer scales shiny]; }; + condvis2 = derive2 { name="condvis2"; version="0.1.1"; sha256="1al7dx1x4028m3aggblwxn9qsb69swh9nil9bx7d0z32cqakka04"; depends=[cluster colorspace DendSer ggplot2 gower plyr RColorBrewer scales shiny]; }; coneproj = derive2 { name="coneproj"; version="1.14"; sha256="0km7njsxjgrv4d8bx709nci59ngm00jg1r55702yapyjl0f2zg93"; depends=[Rcpp RcppArmadillo]; }; - conf = derive2 { name="conf"; version="1.6.3"; sha256="0i8ayn47jli06d76y5a7n087zj7ag6hhjwq5xi109jbfynzxv1h0"; depends=[fitdistrplus pracma STAR statmod]; }; + conf = derive2 { name="conf"; version="1.7.0"; sha256="1h9lc2k2h7h592a7gzr2jwvc4ifjsr41pygad2k7xy8ah3cnv7c1"; depends=[fitdistrplus pracma rootSolve STAR statmod]; }; conf_design = derive2 { name="conf.design"; version="2.0.0"; sha256="06vdxljkjq1x56xkg041l271an1xv9wq79swxvzzk64dqqnmay51"; depends=[]; }; confSAM = derive2 { name="confSAM"; version="0.2"; sha256="1l67ndya07hh0yqfbabfhsvp3hryklx0022grpr0cb7ff88d1zam"; depends=[]; }; confidence = derive2 { name="confidence"; version="1.1-2"; sha256="0m6iz59n5jpi0ig3za3nir4d4bdsysf5g47d2nakfmaz03wk520z"; depends=[ggplot2 knitr markdown plyr xtable]; }; - config = derive2 { name="config"; version="0.3"; sha256="0l67nfpm42ssnk0bl4jmq6bibz8hawgfgh2s14s5c8mnimv6mpjs"; depends=[yaml]; }; + config = derive2 { name="config"; version="0.3.1"; sha256="0l2zp7v6qaz72dclcbjrlis633zlwp8rsi5azr7iw127iyz7i26l"; depends=[yaml]; }; configr = derive2 { name="configr"; version="0.3.5"; sha256="1qlfza9fwqdhw37gxhgxgp4x2dg1qlvdw0rf9fn6a8hgjaj9z8a3"; depends=[glue ini jsonlite RcppTOML stringr yaml]; }; configural = derive2 { name="configural"; version="0.1.1"; sha256="0xn52lg0fzd0m0k9sw90lv8vzhlp6knaya4crzl6rhfihyv9bq3m"; depends=[cli crayon dplyr stringr]; }; confinterpret = derive2 { name="confinterpret"; version="1.0.0"; sha256="0qldaqpx7kpk71zfwv465jrscwzc9w3xfv52i4h01k9aw3q6m8ja"; depends=[]; }; @@ -6533,32 +6793,32 @@ in with self; { conflr = derive2 { name="conflr"; version="0.1.1"; sha256="1bjdmvi0n8746g7dxwgzh3fi33sq4bgfr0nd3nqd2caj8ryi2gv9"; depends=[askpass commonmark curl glue httr knitr miniUI purrr R6 rlang rmarkdown rstudioapi shiny stringi xml2]; }; conformalClassification = derive2 { name="conformalClassification"; version="1.0.0"; sha256="03v6xbgipb97byarqj0d38z9yb2g54mkkw343jxmi2j058z26yw7"; depends=[doParallel foreach mlbench randomForest]; }; confoundr = derive2 { name="confoundr"; version="1.2"; sha256="000vf828qv04pplx8yc8q3mafxf4g0axip6z5zbsj2581yxv9jjh"; depends=[dplyr ggplot2 gridExtra magrittr purrr rlang Rmpfr scales stringr tidyr]; }; - confreq = derive2 { name="confreq"; version="1.5.5-1"; sha256="0hbr2vi5ala6w2igcyqp1nv573l9mragvjv2k1bymjksjb8b8nha"; depends=[gmp]; }; + confreq = derive2 { name="confreq"; version="1.5.5-2"; sha256="0r6icz35vaxgl2jia1r5hmg0vp3aig417b3420zasjwd6k755i8f"; depends=[gmp]; }; conicfit = derive2 { name="conicfit"; version="1.0.4"; sha256="1d704xgiyqmbwfxnsmhqg885x10q8yqxmrk4khqpg3lh696bw97d"; depends=[geigen pracma]; }; conics = derive2 { name="conics"; version="0.3"; sha256="06p6dj5dkkcy7hg1aa7spi9py45296dk0m6n8s2n3bzh3aal5nzq"; depends=[]; }; conjoint = derive2 { name="conjoint"; version="1.41"; sha256="1iq3226a6fn1gddmh2nxlzvjcvbj7502r9520g9d4xdmk8smfx33"; depends=[AlgDesign broom cluster fpc ggfortify ggplot2]; }; - conjurer = derive2 { name="conjurer"; version="1.1.1"; sha256="0rxbmr2s270sy7rbyb876sidbcjzv0g99s1n0w6pd6aymmf0715c"; depends=[]; }; + conjurer = derive2 { name="conjurer"; version="1.2.0"; sha256="05j5y5d7zkv1aq0vcnfxl5l9lgg2z8avfqz8a4fmmgrq29mlblq2"; depends=[]; }; connections = derive2 { name="connections"; version="0.1.1"; sha256="08fbyzyp26nh1a46p0zi3q0wzgl0cd9bjp4lhw2bwv1bv7yayamp"; depends=[DBI dbplyr dplyr pins rscontract uuid]; }; conogive = derive2 { name="conogive"; version="1.0.0"; sha256="0a8v7v0fds0psfnbx9x45way8z1f1xn2ncgbrn5rb6fjq0a1zs4x"; depends=[assertthat checkmate mvtnorm psych]; }; conover_test = derive2 { name="conover.test"; version="1.1.5"; sha256="0f1p10klidk1xic1wd48j9rjh2fb3z6pfjx4y021lglx1w3av68k"; depends=[]; }; - conquer = derive2 { name="conquer"; version="1.0.1"; sha256="1c7id7wgspma5bdcirrhw7f9fp709zxpj31klivasdbvd4jgi4vb"; depends=[Matrix matrixStats Rcpp RcppArmadillo]; }; + conquer = derive2 { name="conquer"; version="1.0.2"; sha256="1zvlsrbmrij011mcdi3qngs1al2lhrdiyknxnk0w1zhzrra62bsl"; depends=[Matrix matrixStats Rcpp RcppArmadillo]; }; conquestr = derive2 { name="conquestr"; version="0.8.5"; sha256="1xh09a379g1msib5fvf72llvf2gwqb7ciacw7j7iqrkb2ddpaglk"; depends=[ggplot2 ggrepel Rcpp reshape rlang stringr]; }; - constants = derive2 { name="constants"; version="0.0.2"; sha256="1j9d52riwx7v1ppfdw0x517j7xh92qgskd4mj5yk9qa233brcwyy"; depends=[]; }; + constants = derive2 { name="constants"; version="1.0.0"; sha256="1j9nj6nbcdi0j278mb49k8jlsb29a7gssdn2pz9vbcrixy9xh5m7"; depends=[]; }; constellation = derive2 { name="constellation"; version="0.2.0"; sha256="1d49rnyf2z3bvx158nsmgmb0x7xcgxl9f8y98pwg5wlqck7af99q"; depends=[data_table]; }; constrainedKriging = derive2 { name="constrainedKriging"; version="0.2.4"; sha256="1a91s0b7yka37fb5pm172fmlqrhm6da370cqb9knvkg5n8vi4hys"; depends=[RandomFields rgeos sp spatialCovariance]; }; - contact = derive2 { name="contact"; version="1.2.4"; sha256="1xs234k1pszbjh00dpnj93ygmmrmpv86lnrsrhn4cn801s83yw2f"; depends=[ape data_table doParallel foreach igraph lubridate raster rgdal rgeos sp]; }; + contact = derive2 { name="contact"; version="1.2.5"; sha256="05a6pwrmjlivglq837w4j8nsmadb4qz0mfhnam34r0z0iqyns334"; depends=[ape data_table doParallel foreach igraph lubridate raster rgdal rgeos sp]; }; + contactdata = derive2 { name="contactdata"; version="0.1"; sha256="1rbq6k6m6lvwakxc472wxbsrl6wqm61b81fax7hnmjsrp2grqcnn"; depends=[]; }; container = derive2 { name="container"; version="0.3.0"; sha256="128fj97mx52kap299fmhn3whnaismsd4cq3zqpbfvwxx2ii4fd33"; depends=[R6]; }; - contentid = derive2 { name="contentid"; version="0.0.4"; sha256="19ypac76gf8ajfaqr265411jhvr7wy4fa9zswfc5f2p7d3qxlhqn"; depends=[curl fs httr openssl rappdirs]; }; + contentid = derive2 { name="contentid"; version="0.0.8"; sha256="1xyp77d7yml5i997xakwcl9r2s4l1ip3fnrzv6mmas0nhdpsvlml"; depends=[curl fs httr openssl rappdirs]; }; contextual = derive2 { name="contextual"; version="0.9.8.4"; sha256="0lww36nymg2cla83jdvl7a42cwn0il20apciz0ddplq8rw2i0a91"; depends=[data_table doParallel foreach Formula iterators itertools R_devices R6 rjson]; }; contfrac = derive2 { name="contfrac"; version="1.1-12"; sha256="0sq5c7ny235yrkv2xc4insgxby6rvzc1qsj8h301cd2if3lwbgwm"; depends=[]; }; conting = derive2 { name="conting"; version="1.7"; sha256="08f271j3gxcp4shda08kkv0v9ayaadvxgcglfsn6hjmw4hn298zg"; depends=[BMS coda gtools mvtnorm tseries]; }; - contourPlot = derive2 { name="contourPlot"; version="0.1.4"; sha256="0m96y1nwnsk0xd05lgv553z9gagzzjf64z8zyyxvjlj53c6gmph1"; depends=[interp RColorBrewer]; }; + contourPlot = derive2 { name="contourPlot"; version="0.2.0"; sha256="0bjwq3p57d6hadln8vwjkh7c9sbb466h3zcq9kpx7kd31z6x8gnz"; depends=[interp RColorBrewer]; }; contoureR = derive2 { name="contoureR"; version="1.0.5"; sha256="1izq1alkf24zd2sf2ir2adyrkwhdj7n89cv6z0dfh5mfqld5bkdn"; depends=[geometry plyr Rcpp reshape]; }; contrast = derive2 { name="contrast"; version="0.22"; sha256="11zz59dn63gpn455ryp0cmrx32li30yylf6ldrmw1wnn0zq702ww"; depends=[nlme rms sandwich]; }; - contribution = derive2 { name="contribution"; version="0.1.0"; sha256="06y6qa7c0zifg6fqfpwry4z367ckiyk9v09n8cqc6q98c3ddkwj3"; depends=[dplyr ggplot2 gh magrittr rlang tidyr]; }; + contribution = derive2 { name="contribution"; version="0.2.0"; sha256="0di6jhljdfvzpifnb3pvyn2la5h5r1dw03dx4zhpn4y10dg6898p"; depends=[dplyr ggplot2 gh magrittr rlang tidyr]; }; control = derive2 { name="control"; version="0.2.5"; sha256="02s8h5kwpzfrivx3ign84gwlybkcs03ibawyxdny9zz5yhb7x3bs"; depends=[expm Matrix pracma signal]; }; controlTest = derive2 { name="controlTest"; version="1.1.0"; sha256="19r8nvi35ldzgayifskjj706fv76hv6sj68yvggybp27rgyqbjfl"; depends=[survival]; }; - convergEU = derive2 { name="convergEU"; version="0.4.7"; sha256="05jagjfh2hy3khf8zfyyngfhm83s48pvhma2h7c99jhwa22vsw5n"; depends=[broom caTools dplyr eurostat ggplot2 ggpubr purrr rlang rmarkdown stringr tibble tidyr]; }; convertGraph = derive2 { name="convertGraph"; version="0.1"; sha256="1jsrygj6ydzc0nzyzaq95j4blqavj7dqz182vgm1ckv8an3if0jx"; depends=[]; }; convertr = derive2 { name="convertr"; version="0.1"; sha256="1y9aq5in2qv1323amblmq3g22flpqvpkgkrw12kahg56mqf2b3iq"; depends=[DT miniUI rstudioapi shiny]; }; convevol = derive2 { name="convevol"; version="1.3"; sha256="1b0lygbrdm6rqascck5iwjnm248lklc4cxr71qlgand5jsblpcnn"; depends=[ape cluster geiger MASS phytools]; }; @@ -6577,12 +6837,13 @@ in with self; { coppeCosenzaR = derive2 { name="coppeCosenzaR"; version="0.1.3"; sha256="1chwsfyaf5rmlsypr43n7px8b2220dfa5mzcriq1swylgbx4181l"; depends=[]; }; coprimary = derive2 { name="coprimary"; version="1.0"; sha256="0pjln9p5lzv6wl5xrz0kb90hnjlnp7ch2kvh054nxdbmlxv5akc3"; depends=[digest gsDesign plyr proto]; }; cops = derive2 { name="cops"; version="1.0-2"; sha256="0ifp3cai490lw6dnyyjj4822x8g2mswhaamnw5ljwnxdbmjwhhrw"; depends=[cmaes cordillera crs dfoptim GenSA MASS minqa NlcOptim nloptr pso rgenoud rgl Rsolnp scatterplot3d smacof subplex]; }; - copula = derive2 { name="copula"; version="1.0-0"; sha256="1hk25qixg0wwnaz4bh2dz275apkdjqahdxixzq6al9k9gi5cr8si"; depends=[ADGofTest colorspace gsl lattice Matrix mvtnorm numDeriv pcaPP pspline stabledist]; }; + copula = derive2 { name="copula"; version="1.0-1"; sha256="0hlpj1xiv21zx52cqmdgxgz05xdsharacalm025y8ybkzk7jr6yh"; depends=[ADGofTest colorspace gsl lattice Matrix mvtnorm numDeriv pcaPP pspline stabledist]; }; copulaData = derive2 { name="copulaData"; version="0.0-1"; sha256="1s917g8wasxndg1xq4b4fjaq29nyzzigpflgqcy4rxdb7r54dl0z"; depends=[]; }; copulaedas = derive2 { name="copulaedas"; version="1.4.3"; sha256="01wp8jnz7kndknj7lh9ia7mm41k1vbaksalyy9v19bb77yhgzmba"; depends=[copula mvtnorm truncnorm vines]; }; - corHMM = derive2 { name="corHMM"; version="2.3"; sha256="11mxwxm1lgkiq1v0bynk51b7s8hndp1a6cn6hidjprck4v205im5"; depends=[ape corpcor expm GenSA igraph MASS nloptr nnet numDeriv phangorn phytools Rmpfr viridis]; }; - corTest = derive2 { name="corTest"; version="1.0.4"; sha256="15mipyd7lv9l596h6gk7mywdnc9xw2kaz35bj9pw5q8rh91dfpsr"; depends=[MASS]; }; + corHMM = derive2 { name="corHMM"; version="2.5"; sha256="04xr9s6950fcgxa0syzvk6dfsj44mf9msnkvd6mw99kfs13gbavw"; depends=[ape corpcor expm GenSA igraph MASS nloptr nnet numDeriv phangorn phytools Rmpfr viridis]; }; + corTest = derive2 { name="corTest"; version="1.0.7"; sha256="1gip8rxvbhrckwmjwmxbmycndg4jrl75x8qda9l35znfv9r7p0nq"; depends=[Biobase clusterGeneration ggplot2 igraph MASS Matrix]; }; corTools = derive2 { name="corTools"; version="1.0"; sha256="0arvqk2xp19ap73zmdk0kb1fycb3v2mf65b4bhanvcqwr4kg4vdk"; depends=[]; }; + cora = derive2 { name="cora"; version="0.1.0"; sha256="0mx7dn05js8hqr3xgrbp2kv25y6qjlm86y6asy17hwbbvbsmama9"; depends=[]; }; corazon = derive2 { name="corazon"; version="0.1.0"; sha256="1advzmbmnpq18ym2k8rcxhsdzfscl68jss8wbqcir68951x2aqi3"; depends=[htmltools]; }; corclass = derive2 { name="corclass"; version="0.2"; sha256="0hsbbzzadj8yc4zmb88ncx90sfxpyfd9xmdwhb08m1z1jw96zhxp"; depends=[igraph]; }; cord = derive2 { name="cord"; version="0.1.1"; sha256="18xj6cwmx1a7p3vqx5img8qf8s75nc6pcv78v15j081pgn786ma5"; depends=[Rcpp RcppArmadillo]; }; @@ -6596,29 +6857,32 @@ in with self; { corkscrew = derive2 { name="corkscrew"; version="1.1"; sha256="1nb81r4lsrajcj3xz3f7p6xznnb38yg3rnnh44rd3kabca4d8r1s"; depends=[ggplot2 gplots igraph RColorBrewer]; }; corlink = derive2 { name="corlink"; version="1.0.0"; sha256="06n9pcvbn8y9gy0mn9c0sw05424ss8smpaw3ly6a785cmj3d9b6m"; depends=[]; }; cornet = derive2 { name="cornet"; version="0.0.4"; sha256="0chp7ifcc0a9dz6ang4wjiwj7q309g9nsgyql6qmml985d8bazcy"; depends=[glmnet palasso]; }; + coro = derive2 { name="coro"; version="1.0.1"; sha256="0r7id3dcf5rlksspsck2vv8jnisvrcc1vnkv6zpr8xh214794n3f"; depends=[rlang]; }; coroICA = derive2 { name="coroICA"; version="1.0.2"; sha256="0pcz2256liczrn2gik8b5331rgzlxjrm7rzn1ialhifkiinifnva"; depends=[MASS]; }; + corona = derive2 { name="corona"; version="0.3.0"; sha256="1hggsmvmbim7f6bybmdhxznmqib0k2plm370mjs7dp85i564sjkm"; depends=[gganimate ggplot2 gridExtra plyr qicharts2 reshape2]; }; coronavirus = derive2 { name="coronavirus"; version="0.3.0"; sha256="0xcyl5b36hj522rgf7469aklrw6ld17jbbf1w3w9cl7x09bhmbck"; depends=[devtools]; }; corpcor = derive2 { name="corpcor"; version="1.6.9"; sha256="1hi3i9d3841snppq1ks5pd8cliq1b4rm4dpsczmfqvwksg8snkrf"; depends=[]; }; corpora = derive2 { name="corpora"; version="0.5"; sha256="0b4yw37msx9h8hf5mjs4h10gdmc1qc2gv5bzyj1r90n4gcli042d"; depends=[]; }; - corporaexplorer = derive2 { name="corporaexplorer"; version="0.8.2"; sha256="14l64mcqfa2ayyl6d48s9fc2qh485wk02s23cy4nssn7sg1b3a5z"; depends=[data_table dplyr ggplot2 lubridate magrittr padr plyr RColorBrewer rlang rmarkdown scales shiny shinydashboard shinyjs shinyWidgets stringi stringr tibble tidyr]; }; + corporaexplorer = derive2 { name="corporaexplorer"; version="0.8.3"; sha256="0371svq3y92ysnwnlprs1fjfzgy0sm52y2w3wl9ajas1fjnzmi0h"; depends=[data_table dplyr ggplot2 lubridate magrittr padr plyr RColorBrewer rlang rmarkdown scales shiny shinydashboard shinyjs shinyWidgets stringi stringr tibble tidyr]; }; corpus = derive2 { name="corpus"; version="0.10.1"; sha256="1mcjn6jsrvyxwcf8kx86fy7z0zsarvq6ccja3r27v7b8fjrb8mng"; depends=[utf8]; }; corpustools = derive2 { name="corpustools"; version="0.4.2"; sha256="00v61i4c43s69mchy5zkbxgvxjx8kqlzm2vcb7snjblmd84w4id5"; depends=[data_table digest igraph Matrix quanteda R6 Rcpp RcppProgress RNewsflow SnowballC stringi tokenbrowser udpipe wordcloud]; }; corr2D = derive2 { name="corr2D"; version="1.0.0"; sha256="12k6vbqyb33kfj2xdg8rbydnp2yk15kv4b0m4lid4gf2lqmy3jwz"; depends=[colorspace doParallel fields foreach mmand profr rgl xtable]; }; corrDNA = derive2 { name="corrDNA"; version="1.0.1"; sha256="1mfjrzpcb63ydyj1yxa0wd3vh4z0rdwsqv09w0a0l4l7mhb5jz2k"; depends=[mvtnorm]; }; + corrarray = derive2 { name="corrarray"; version="1.2.0"; sha256="1hsk425xjz9p3wwvia7h78dg24qsr5r977xm2ap5z40ah1bw7bzi"; depends=[Hmisc]; }; corrcoverage = derive2 { name="corrcoverage"; version="1.2.1"; sha256="0r5n2g341jlinwrxxwxkav9i6qsf097pmfi07aiq663b13r3864x"; depends=[data_table magrittr matrixStats Rcpp RcppArmadillo]; }; correctedAUC = derive2 { name="correctedAUC"; version="0.0.3"; sha256="0c2kq7asq5mp48p8niqb84wnw4q2q2985wxbrywrhsszm9p3xspb"; depends=[ICC mnormt]; }; corregp = derive2 { name="corregp"; version="2.0.2"; sha256="1v048dibn2x3y5mi2damcsr9i5kdig5n53g5j9gf31lqkzzjmnh3"; depends=[data_table diagram ellipse gplots rgl]; }; - correlation = derive2 { name="correlation"; version="0.3.0"; sha256="0ai1accmjw8kqwnp5hx4zn4a115yzppcnczmvmhhr63dslff4rqv"; depends=[bayestestR effectsize insight parameters]; }; + correlation = derive2 { name="correlation"; version="0.5.0"; sha256="1261kcanamk80ai2zlmjsg7mwzk6r3snivhwxcf9hil8d0sr0j1v"; depends=[bayestestR effectsize insight parameters]; }; correlationfunnel = derive2 { name="correlationfunnel"; version="0.2.0"; sha256="0xil7cihqk7gzpy0q97sg5sw5z0gy7zqvx0f0bizcfks9gwp43cv"; depends=[cli crayon dplyr forcats ggplot2 ggrepel magrittr plotly purrr recipes rlang rstudioapi stringr tibble tidyr]; }; correlbinom = derive2 { name="correlbinom"; version="0.0.1"; sha256="1ix3ccxzr7vqblbda5awsva3h95b69v7kc6adz622bbi8r36xxcq"; depends=[Rmpfr]; }; corrgram = derive2 { name="corrgram"; version="1.13"; sha256="1g5159vihsz5a2cfmg4g4i1lildn2x2wzck5sd0vml5810rxjpma"; depends=[seriation]; }; - corrgrapher = derive2 { name="corrgrapher"; version="1.0.2"; sha256="0298wbkfs9kbiq3ilnqlcmd9qmk4ivhrdgdqcmfafymlja8376dc"; depends=[DALEX ggplot2 htmltools ingredients jsonlite knitr visNetwork]; }; + corrgrapher = derive2 { name="corrgrapher"; version="1.0.4"; sha256="0s10n2av6dyjz6x4wvznpcbvpp63v6k3r9whkqsg7fiy9m3d4dr9"; depends=[ggplot2 htmltools ingredients knitr visNetwork]; }; corrplot = derive2 { name="corrplot"; version="0.84"; sha256="1k03qd8db7pwg1v318xapx5mpiypiz2n07qr19c4b45diri5xkhd"; depends=[]; }; - corrr = derive2 { name="corrr"; version="0.4.2"; sha256="1mk6vvsmankrc6m5rm3y58wblsbyqar6js36c73x5g3fs95s58fj"; depends=[dplyr ggplot2 ggrepel purrr rlang seriation tibble]; }; + corrr = derive2 { name="corrr"; version="0.4.3"; sha256="096j9y1i1g7wgvn15vpil63cnb24mm0fgklbsgygwwgnlx2j0rgg"; depends=[dplyr ggplot2 ggrepel purrr rlang seriation tibble]; }; corrsieve = derive2 { name="corrsieve"; version="1.6-8"; sha256="0ak3j9khcwv5rxbicck2sr260wpmd3xj254y7pdavx2fk0b72yxs"; depends=[]; }; corset = derive2 { name="corset"; version="0.1-4"; sha256="0ladyqvkys4cldvbhkii9jwn1k5p1ym2g5bgdlz1hq1sv30ixn2f"; depends=[]; }; - cort = derive2 { name="cort"; version="0.3.1"; sha256="0gjvy426sn503kpxs4106ih02q7x0q5fygn0xwh3n2zj3pqlmyrn"; depends=[furrr nloptr osqp purrr Rcpp Rdpack]; }; - corto = derive2 { name="corto"; version="1.1.0"; sha256="0kww1ij6km4qjgnp9xlg3q8wszcamdxd7ysdyhx6bskhr154g35w"; depends=[dplyr knitr pbapply plotrix rmarkdown]; }; + cort = derive2 { name="cort"; version="0.3.2"; sha256="1iayvgwjmpmb96w5841jxhwivca7s4v5bpsdy0lrbk121saqq5z1"; depends=[furrr nloptr osqp purrr Rcpp Rdpack]; }; + corto = derive2 { name="corto"; version="1.1.3"; sha256="03fvh33qpvkx1pcdjlsjs6dpm8qxajilj3s5q2gxr14nx6f6vzhy"; depends=[dplyr gplots knitr pbapply plotrix rmarkdown]; }; corx = derive2 { name="corx"; version="1.0.6.1"; sha256="179fxjagbq33549zyk234kz9ajbifl7qpmdy0lrw9vzjc8aqbycf"; depends=[clipr crayon ggcorrplot ggplot2 ggpubr glue magrittr moments ppcor psych tidyselect]; }; cosa = derive2 { name="cosa"; version="2.0.0"; sha256="1ra1m75ay829xlhjax82px4ffflnfgh2mrmzzj4i8ml545d9hmgr"; depends=[msm nloptr]; }; cosinor = derive2 { name="cosinor"; version="1.1"; sha256="02nnqg51vq48lzk667cyarnmhcf5mifnsdij7dlgqvz2k4fdq4pl"; depends=[ggplot2 shiny]; }; @@ -6634,7 +6898,7 @@ in with self; { countToFPKM = derive2 { name="countToFPKM"; version="1.0"; sha256="0h89knii8zkbq0lw7yn3qzak30s7bifq53ga4vy6za6hqwc53x2j"; depends=[circlize ComplexHeatmap]; }; countTransformers = derive2 { name="countTransformers"; version="0.0.6"; sha256="14n2sv7wqzslrzg0ag473ljj9mvha94161p5yh2h9l1vx7xliimf"; depends=[Biobase limma MASS]; }; countcolors = derive2 { name="countcolors"; version="0.9.1"; sha256="1gnwmw3inh8asbk6qba34vzx1k2cnh4m9d1346gxhzhlxvl6xiza"; depends=[colordistance jpeg png]; }; - countfitteR = derive2 { name="countfitteR"; version="1.2"; sha256="020jmhrkinzk1zv92my16jsqrq1s9iql9881nnly1nbb8a1iwf11"; depends=[ggplot2 MASS pscl shiny]; }; + countfitteR = derive2 { name="countfitteR"; version="1.4"; sha256="1aq7v2fy24pf3r6fkmcwvs18r2xc2l1bqablp53xfc7b6kxq3vqn"; depends=[ggplot2 MASS pscl shiny]; }; countgmifs = derive2 { name="countgmifs"; version="0.0.2"; sha256="0k6fjg0v9n7vi89wd025gdjh1q3l6nnc5yn8i2bfw0i5vmv8rhi3"; depends=[MASS]; }; countrycode = derive2 { name="countrycode"; version="1.2.0"; sha256="0h6x578pci8rch52zan8sxzgwj0c9qpw254zz4pm2gf3vh15giij"; depends=[]; }; countyfloods = derive2 { name="countyfloods"; version="0.1.0"; sha256="0ld8p8dfk9khvwffbn8sad0j3an25s7cvbi6jxljgx4zc6ldh699"; depends=[dataRetrieval dplyr ggplot2 lubridate maps plyr R_utils tidyr]; }; @@ -6646,32 +6910,35 @@ in with self; { covTestR = derive2 { name="covTestR"; version="0.1.4"; sha256="0j9kay8lwkhpdyg0fbfars1m58v0i58v1v5sm7m72s7kz8qh2yfs"; depends=[purrr Rcpp RcppArmadillo rlang]; }; covafillr = derive2 { name="covafillr"; version="0.4.4"; sha256="1vsay0qlqcw3l6xp18rxrkhwsadsv9rpxwpj9f4d3vlr8inkiv4h"; depends=[Rcpp RcppEigen]; }; covatest = derive2 { name="covatest"; version="1.1.3"; sha256="1vhdm8xhzy6mnd81lqqmv4zxwh3x7pc8nrnimcwgdgprlw2fhs0b"; depends=[gstat lubridate matrixcalc sp spacetime zoo]; }; - coveffectsplot = derive2 { name="coveffectsplot"; version="0.0.9"; sha256="1nz7r2fqmfgfg37dcnifljm22ifipjydfcvf2dl03d10av67c0cn"; depends=[colourpicker data_table dplyr egg ggplot2 ggstance markdown shiny shinyjs table1 tidyr]; }; + coveffectsplot = derive2 { name="coveffectsplot"; version="0.0.9.1"; sha256="0yklw2bnaz9abi92rgr14415s5lr23y3qnkj89q08hrkxj61jxmj"; depends=[colourpicker data_table dplyr egg ggplot2 markdown shiny shinyjs table1 tidyr]; }; covequal = derive2 { name="covequal"; version="0.1.0"; sha256="1qj6djqf1rnjmnaz1nryj9dc104082w258dzjjp5q18gg1ck8v0c"; depends=[corpcor RMTstat]; }; covfefe = derive2 { name="covfefe"; version="0.1.0"; sha256="178qc77y4bn04qad3g70wr8y4v0ggyg807w67m8wvhbcxqr8yq7c"; depends=[tokenizers]; }; covglasso = derive2 { name="covglasso"; version="1.0.2"; sha256="1aq6x6bq24v1398kzw3ai4arjmma09y2p49wp6k77xsl32nkbhkz"; depends=[Rcpp RcppArmadillo]; }; - covid19_analytics = derive2 { name="covid19.analytics"; version="1.1.1"; sha256="0qxvf2x8fb11hnb5ivyhi8isf7hax94qa9vm42b073vskdz85q9l"; depends=[ape deSolve gplots htmlwidgets pheatmap plotly readxl]; }; - covid19dbcand = derive2 { name="covid19dbcand"; version="0.1.0"; sha256="0dqi2qgwrvv83c19gxabz857hai571bwnpyb8v2ygr9m1srz26y6"; depends=[]; }; + covid19_analytics = derive2 { name="covid19.analytics"; version="2.0"; sha256="06clhgx2i235s7zy6v0hiq2qnc9r9sn7b118h4xbcvjfw8wk4z6f"; depends=[ape collapsibleTree deSolve dplyr DT gplots htmlwidgets pheatmap plotly readxl rentrez shiny shinycssloaders shinydashboard]; }; + covid19br = derive2 { name="covid19br"; version="0.1.1"; sha256="1rv4phvqndmjkrgm9q4kink42id95llwcvyimc8jcxdyz7xbs93c"; depends=[data_table dplyr httr lubridate rio rlang tidyr]; }; + covid19dbcand = derive2 { name="covid19dbcand"; version="0.1.1"; sha256="0864xixdxzaj697al0c2gq3nk05q1pn0pc9lc2dyki71g5r67i7h"; depends=[]; }; covid19france = derive2 { name="covid19france"; version="0.1.0"; sha256="11072mc794l0m84k2b08zhyfvxf6n6ym91i7kkm3cbirxp6bhnqy"; depends=[dplyr glue lubridate magrittr readr stringr tidyr]; }; covid19italy = derive2 { name="covid19italy"; version="0.3.0"; sha256="1kqvpiy6ib3amx2cpkj99wm5m9y96b5snzyzhhd7qn31mn2l6hnf"; depends=[devtools]; }; covid19mobility = derive2 { name="covid19mobility"; version="0.1.1"; sha256="1n8w1gkyz98r3svnwksl10ldmmfscyycl81xq9w8497cq6vj4gz1"; depends=[dplyr glue janitor jsonlite lubridate magrittr readr stringi tidyr tigris]; }; covid19nytimes = derive2 { name="covid19nytimes"; version="0.1.3"; sha256="1j7frjl052pjping5s7cacvfi62i8hdfcmfmvmb02ijhl4gh5dnm"; depends=[dplyr magrittr readr rlang tibble tidyr]; }; - covid19us = derive2 { name="covid19us"; version="0.1.6"; sha256="0zgz1iaj7g9aysklmb0fgv3ack7f134jhf4903vdfz5194w2p25l"; depends=[curl dplyr glue httr lubridate magrittr purrr snakecase stringr tibble tidyr]; }; - covidregionaldata = derive2 { name="covidregionaldata"; version="0.5.0"; sha256="0cgq9xzs8zcxzz22cm5gs8l6ymjf19my4568zfl6ca65s5g9c8w7"; depends=[countrycode dplyr httr jsonlite lubridate magrittr memoise purrr readr readxl rvest stringr tibble tidyr xml2 yaml]; }; - covr = derive2 { name="covr"; version="3.5.0"; sha256="1pvr95h7jg9hqq1qq1cccy323pkxldrwafl08151cc410499k4fb"; depends=[crayon digest httr jsonlite rex withr yaml]; }; + covid19sf = derive2 { name="covid19sf"; version="0.1.0"; sha256="02n7v4qv2gw9dnc94hz58nzbfiq1ihf1r3g7vlv8sc826v8qw4bs"; depends=[devtools dplyr lubridate magrittr mapview plotly sf]; }; + covid19swiss = derive2 { name="covid19swiss"; version="0.1.0"; sha256="083j4568j7yk7l4qj6097zp0ijq70ycvwvmbfqp3dwazmibamy34"; depends=[devtools]; }; + covid19us = derive2 { name="covid19us"; version="0.1.7"; sha256="1gy3cbfq89mg0465n4vwqnknnv988i9l2fv6dara8hr1jysic2n3"; depends=[curl dplyr glue httr lubridate magrittr purrr snakecase stringr tibble tidyr]; }; + covidregionaldata = derive2 { name="covidregionaldata"; version="0.8.2"; sha256="0c5jh2ap95h5snl5yfhg9d3xc75wzw9f2cmll8xp4dbva9hff433"; depends=[countrycode dplyr httr jsonlite lubridate magrittr memoise purrr readr readxl rvest stringr tibble tidyr xml2 yaml]; }; + covr = derive2 { name="covr"; version="3.5.1"; sha256="0v5cv3cw2kpdr6wxmkbd3wclavr17zipypdcb10hhmpa4cvgqk55"; depends=[crayon digest httr jsonlite rex withr yaml]; }; covreg = derive2 { name="covreg"; version="1.0"; sha256="0v19yhknklmgl58zhvg4szznb374cdh65i7s8pcj2nwrarycwzaq"; depends=[]; }; covsep = derive2 { name="covsep"; version="1.1.0"; sha256="19dvwhl85yx9ddwxvnq5sdd534s6llcw61gckrav48hq49x1bqld"; depends=[mvtnorm]; }; covsim = derive2 { name="covsim"; version="0.1.0"; sha256="1012fgxn7z85bk1a23v5zswa29njlbdnd9llikp1qy0mrraqlx2h"; depends=[gsl lavaan MASS nleqslv PearsonDS Rcpp rvinecopulib]; }; cowbell = derive2 { name="cowbell"; version="0.1.0"; sha256="1zz0g30zvqfk5lh09y90iq3s7x2wwbs852i3d56mfp926gxdxc2y"; depends=[ggplot2 misc3d rgl]; }; - cowplot = derive2 { name="cowplot"; version="1.0.0"; sha256="19cqdhgfyr1wj0fz0c5ly8f0aiy9sfgzq6lzb78hkx0hdp2agybh"; depends=[ggplot2 gtable rlang scales]; }; + cowplot = derive2 { name="cowplot"; version="1.1.1"; sha256="0j7d5vhzdxn1blrsfafx5z8lhq122rp8230hp9czrpsnnhjydp67"; depends=[ggplot2 gtable rlang scales]; }; cowsay = derive2 { name="cowsay"; version="0.8.0"; sha256="12hximrdpikkczpwqjmah11nbwzyf7j1x7zcxa7igqwq8nfgv2yv"; depends=[crayon fortunes rmsfact]; }; coxed = derive2 { name="coxed"; version="0.3.3"; sha256="09jnqza8wp2palayb0vsz43qmh8470gxil1l7g3b65lmxa7wpmnh"; depends=[dplyr ggplot2 gridExtra mediation mgcv PermAlgo rms survival tidyr]; }; coxinterval = derive2 { name="coxinterval"; version="1.2"; sha256="0vb7vmzbb2dsihx04jbp2yvzcr033g435mywmwimqhfqdrmjx3fi"; depends=[Matrix survival timereg]; }; coxme = derive2 { name="coxme"; version="2.2-16"; sha256="04aid8v0y2afwwbfm39np1pgdla4jw427gy2wazsphf495b4pkm0"; depends=[bdsmatrix Matrix nlme survival]; }; - coxmeg = derive2 { name="coxmeg"; version="1.0.11"; sha256="03a0arzgh12ah62dxfdp3yb25xp0h1ia5hqb3gf3ywrdr78zp8fa"; depends=[coxme MASS Matrix matrixcalc microbenchmark nloptr rARPACK Rcpp RcppEigen SNPRelate]; }; + coxmeg = derive2 { name="coxmeg"; version="1.0.12"; sha256="18h3isgj7p5qvxdqnbjgdsykyy5lvml27rgkzx398571f0m6qrx1"; depends=[coxme MASS Matrix matrixcalc microbenchmark nloptr rARPACK Rcpp RcppEigen SNPRelate]; }; coxphMIC = derive2 { name="coxphMIC"; version="0.1.0"; sha256="0lmma5wzcczr762xqa4yamvwvyviqxk8gdrps3sydg3n14hckp6d"; depends=[numDeriv survival]; }; coxphSGD = derive2 { name="coxphSGD"; version="0.2.1"; sha256="17ga33v7a89dsygk5yypkz03x7dvjhibnwlvwfvgb2p7djd8w465"; depends=[survival]; }; - coxphf = derive2 { name="coxphf"; version="1.13"; sha256="16bman8xv5xx7gg8s54sj3hc4isqxk4h3q93h4q3h3j0bdvww2yy"; depends=[survival]; }; + coxphf = derive2 { name="coxphf"; version="1.13.1"; sha256="06c83v3lrpzm81aclnl1pyqq2kfflbbmcg911blpr7dgynzk0zk5"; depends=[survival]; }; coxphw = derive2 { name="coxphw"; version="4.0.2"; sha256="08bfl21608i5jkk993qjpnh36xbfsm2xx22rpff0v6ipalj9vmj2"; depends=[survival]; }; coxrobust = derive2 { name="coxrobust"; version="1.0"; sha256="08hp0fz5gfxgs3ipglj6qfr6v63kzxkrzg650bmzabq8dvrxd97q"; depends=[survival]; }; coxrt = derive2 { name="coxrt"; version="1.0.3"; sha256="1xggczjx5psl4m4m83vh4y6swnh3pf9rngnzx3268iznfz1g43h2"; depends=[BB ggplot2 gss inline Rcpp RcppArmadillo survival]; }; @@ -6679,26 +6946,27 @@ in with self; { cp4p = derive2 { name="cp4p"; version="0.3.6"; sha256="1zddkkj0ynvfck3kw1682wffbxw0d3dc4flmxxp03lclq70fc8bd"; depends=[limma MESS multtest qvalue]; }; cpa = derive2 { name="cpa"; version="1.0"; sha256="14kcxayw4cdbjfa6bvfzqp8flwc0sr3hmh2dnr1dfax0hnccd71m"; depends=[]; }; cpca = derive2 { name="cpca"; version="0.1.2"; sha256="1pccsjahb1qynnxa0akhfpcmhfmdg4rd1s6pfqrdl7bwbcmq4lqf"; depends=[]; }; - cpcens = derive2 { name="cpcens"; version="0.1.0"; sha256="18hv659021wmw4v69xf0k5bq4dvyjkz9gmad0a8fr1ym1qr0ip8i"; depends=[cents Rdpack tbart]; }; cpd = derive2 { name="cpd"; version="0.1.0"; sha256="1qcyb7n69ppa0py7w31msim7gf2wdh94hmsilsdk8ivxljc1gv8n"; depends=[fAsianOptions Rdpack]; }; cpk = derive2 { name="cpk"; version="1.3-1"; sha256="1njmk2w6zbp6j373v5nd1b6b8ni4slgzpf9qxn5wnqlws8801n73"; depends=[]; }; - cplexAPI = derive2 { name="cplexAPI"; version="1.3.6"; sha256="1yj0ighr64v1wdz40ml8dmypa01r6r9lr59fc0mfq4n1l0df62gw"; depends=[]; }; - cplm = derive2 { name="cplm"; version="0.7-8"; sha256="0gvl3xwqbyqgqd42l97ryy8qsf23njqfgvc16w21124s77wsixaw"; depends=[biglm coda ggplot2 Matrix minqa nlme reshape2 statmod tweedie]; }; - cpm = derive2 { name="cpm"; version="2.2"; sha256="1n1iqhalp99mbh8jha0pv759fb97sqxdiiq9bxy3wm6aqmssvdb1"; depends=[]; }; - cpp11 = derive2 { name="cpp11"; version="0.2.1"; sha256="1113y61lj4cg1d2yjavdx9zih5rzb4pnxmj5v3sr4bhzlxz2scda"; depends=[]; }; + cplexAPI = derive2 { name="cplexAPI"; version="1.4.0"; sha256="00h2zir1ffzjiglfyq8bsfmgq9z155jr0k0fxv8fsbfyw2x9dg10"; depends=[]; }; + cplm = derive2 { name="cplm"; version="0.7-9"; sha256="057m61rq2hzb55imj3922zmc9kjxh053k3kgy54a4l0jlxb90lyj"; depends=[biglm coda ggplot2 Matrix minqa nlme reshape2 statmod tweedie]; }; + cpm = derive2 { name="cpm"; version="2.3"; sha256="07zbvc5jkwv76lkzby6r073fxjsqgnrdl2w9lcph577knnip89jx"; depends=[]; }; + cpp11 = derive2 { name="cpp11"; version="0.2.4"; sha256="08lrmpfkwh1w290a5ikhs9yn1vn32wbgvbzb4n3zb2indb8s5g69"; depends=[]; }; cppRouting = derive2 { name="cppRouting"; version="2.0"; sha256="0yfiyg1clnl85lk5ah8dcchv71drk6r093vpl82xnczyan5z94sr"; depends=[data_table Rcpp RcppParallel RcppProgress]; }; cpr = derive2 { name="cpr"; version="0.2.3"; sha256="1a2lza1bw74xzrs17a9gr9mnpvnnrykhwd73yqi63wp3k4sm42rb"; depends=[dplyr ggplot2 lazyeval lme4 magrittr plot3D Rcpp RcppArmadillo rgl tibble tidyr]; }; cprobit = derive2 { name="cprobit"; version="1.0.2"; sha256="16fnndpkd226paahmadsddakj4yhybw7lp3csr73fwv78zfl2fj9"; depends=[car ggplot2 gridExtra nortest]; }; cprr = derive2 { name="cprr"; version="0.2.0"; sha256="049xnma0rdnya7zp05iraq15nwjgmdmli9g7xxprab822047vld7"; depends=[]; }; + cpss = derive2 { name="cpss"; version="0.0.2"; sha256="1a6nphzf9y1p1ic51f0zll6g3j3flr7szrvzac1w4a023fj7301r"; depends=[dplyr ggplot2 gridExtra magrittr mvtnorm Rcpp RcppArmadillo Rfast rlang tibble tidyr]; }; cpsurvsim = derive2 { name="cpsurvsim"; version="1.2.0"; sha256="1fn88cqryji1syzhnx726m5svxnrlyynxk4jhp5ny8g3knai6nnk"; depends=[Hmisc knitr plyr]; }; + cpsvote = derive2 { name="cpsvote"; version="0.1.0"; sha256="0nmg79isqwvxyg7zkfbshndfjb2fnc2ffg32hxvjvsy714lpljf6"; depends=[dplyr forcats magrittr readr rlang stringr]; }; cpt = derive2 { name="cpt"; version="1.0.2"; sha256="0j9ns8qhcvwxnzl9rc59vmh5jdahnni5dxpmi38gxvvj5k9hd8p7"; depends=[glmnet MASS nnet randomForest]; }; - cptcity = derive2 { name="cptcity"; version="1.0.4"; sha256="1agknys80m16xq0x285sdf1452a6dmghysrhy7s6zfcb59acb1nf"; depends=[]; }; + cptcity = derive2 { name="cptcity"; version="1.0.6"; sha256="03g10pjpz7gb6daalinki7smfjhbadrsmnxf6qgygqdaxm3ah400"; depends=[]; }; cptec = derive2 { name="cptec"; version="0.1.0"; sha256="1sh6vs9qfxxlhlg6y2qchikjg8sh64zg3j8x5b9dpba9lhbhzzqj"; depends=[magrittr rvest xml2]; }; cqcr = derive2 { name="cqcr"; version="0.1.2"; sha256="11bcqr4bw11vjqdgddpfjb4dsk0dxdasddkp1g310l71vw7zaryg"; depends=[anytime dplyr httr jsonlite purrr rlang snakecase]; }; cqrReg = derive2 { name="cqrReg"; version="1.2"; sha256="1sn8pkbqb058lbysdf2y1s734351a91kwbanplyzv3makbbdm4ca"; depends=[quantreg Rcpp RcppArmadillo]; }; - cquad = derive2 { name="cquad"; version="2.1"; sha256="1cq57qd33cbzhgnnw4fk36xch0prwr9a404sxi7b4ijwgzw84d0h"; depends=[MASS plm]; }; + cquad = derive2 { name="cquad"; version="2.2"; sha256="18r779w1c5ggm6qigkmwzk7rwm32fvd82zxw82xvzqj1c2akmfpj"; depends=[MASS plm]; }; cramer = derive2 { name="cramer"; version="0.9-3"; sha256="1kdad8nndhics4282gfy9ncllk2kpawdy8ybq71vcd7hc7kf0zq5"; depends=[boot]; }; - crandep = derive2 { name="crandep"; version="0.1.0"; sha256="1dfm4vf3x67q9l10dh4bw6d75argqfhmfd0j3bjr7bv9bhn1m1a7"; depends=[dplyr igraph Rcpp RcppArmadillo RcppGSL rvest stringr xml2]; }; + crandep = derive2 { name="crandep"; version="0.1.1"; sha256="1czv2n4zqmkryvb56pfzczj8m1qan6kq3q4hlm17a8kp3s9kvlcd"; depends=[dplyr igraph Rcpp RcppArmadillo RcppGSL rvest stringr xml2]; }; crank = derive2 { name="crank"; version="1.1-2"; sha256="0wwbdh5sfi2bg13nrlkxxij4k053kjx9afm4gjpgs6iir6pml711"; depends=[]; }; cranlike = derive2 { name="cranlike"; version="1.0.2"; sha256="06xgxgwpmfrwmcd0gnr9prjjbhd1y0ky1zb8yh09v0bvsf6ixnyx"; depends=[DBI debugme desc RSQLite]; }; cranlogs = derive2 { name="cranlogs"; version="2.1.1"; sha256="02d9qrqyjj33naq3g7ykaw9dzzl1dq8qf13id6h7kfx1fvx9b7zd"; depends=[httr jsonlite]; }; @@ -6707,33 +6975,34 @@ in with self; { crassmat = derive2 { name="crassmat"; version="0.0.6"; sha256="1c4ii34vh8y5b3z2maby4cafb3n2m9bnxv3762cy0z12mbg7zk1s"; depends=[svMisc]; }; crawl = derive2 { name="crawl"; version="2.2.1"; sha256="18mr7vp72jj5msj9mbq45jy3f6qhn45azsmkq07i2d30gwdj0c3a"; depends=[dplyr gdistance lubridate magrittr mvtnorm purrr raster Rcpp RcppArmadillo rmapshaper sf shiny sp tibble]; }; crayon = derive2 { name="crayon"; version="1.3.4"; sha256="0s7s6vc3ww8pzanpjisym4jjvwcc5pi2qg8srx7jqlz9j3wrnvpw"; depends=[]; }; - crblocks = derive2 { name="crblocks"; version="1.0-0"; sha256="0y101kgi7ryjv18fyjp0ralp4qj7kgshmbd4mf7n3hdjay0znss5"; depends=[]; }; crch = derive2 { name="crch"; version="1.0-4"; sha256="18qjvh1lkw1f6rrhnb21f30xxrcq8whbs3x1jgkw6q14rf1483ri"; depends=[Formula ordinal sandwich scoringRules]; }; credentials = derive2 { name="credentials"; version="1.3.0"; sha256="1w9zj34xdwz9bszsvhv2cbgq96y5sgxbh7ndn31pgfcpzlkfq6f1"; depends=[askpass curl jsonlite openssl sys]; }; - creditmodel = derive2 { name="creditmodel"; version="1.2.4"; sha256="0qp1z8bmr6pa2zsl28p5587y0kljadqsq9camkiplwg3rp4sg0ip"; depends=[cli data_table doParallel dplyr foreach ggplot2 glmnet rpart xgboost]; }; - credsubs = derive2 { name="credsubs"; version="1.1.0"; sha256="0zbn6ifx48cf5b54lpp560vvvhxsa23xl815yvwi8n5xpy1ls13h"; depends=[]; }; + creditmodel = derive2 { name="creditmodel"; version="1.2.7"; sha256="1cskm854ncbh1lxsv6idkilxrhx5gsffkz0jxbk8ppik0q45gpfm"; depends=[cli data_table doParallel dplyr foreach ggplot2 glmnet rpart xgboost]; }; + credsubs = derive2 { name="credsubs"; version="1.1.1"; sha256="19l3vsjxd9lvaf67l61x9l0j4y124p93dfqzw7rl1ya5sxbdzs7a"; depends=[]; }; credule = derive2 { name="credule"; version="0.1.4"; sha256="0kwjjkavch21grx845kdcansaj0g407v7z3wmhy4whra9ic12y76"; depends=[]; }; cregg = derive2 { name="cregg"; version="0.4.0"; sha256="1a34jhdk4r9ywsrc5dc8wq5am3059cli60f6n2n8j04ls13fvlkd"; depends=[ggplot2 ggstance lmtest sandwich scales survey]; }; - crfsuite = derive2 { name="crfsuite"; version="0.3.2"; sha256="049hd6rh32315lhn5sjylx8k33r95ar04l3j7fs92cw6z16vva6n"; depends=[data_table Rcpp]; }; + crfsuite = derive2 { name="crfsuite"; version="0.3.4"; sha256="1003y435hn30wws0ynlla1rz21kh3dp2ggkbyy9vhxgvjzii94n7"; depends=[data_table Rcpp]; }; cricketr = derive2 { name="cricketr"; version="0.0.23"; sha256="0daxw2rdx4j1b4h557zhqlbbqbzdai5vzy3fal4mp6hgv350d5ks"; depends=[dplyr forecast ggplot2 httr lubridate plotrix scatterplot3d XML]; }; crimCV = derive2 { name="crimCV"; version="0.9.6"; sha256="14ckk88i7jk8a7kl51d7qfdis44jng6zz9zd72cdp80a57dvrvzq"; depends=[]; }; crimedata = derive2 { name="crimedata"; version="0.2.0"; sha256="073zlk9b4saz72d33z73mc9qzfk49bxwjhph6zbw27nl38k74j7d"; depends=[digest dplyr httr magrittr purrr readr sf stringr tibble]; }; crimelinkage = derive2 { name="crimelinkage"; version="0.0.4"; sha256="1zzk50kyccvnp51vzp28c9yi23hsp25arrgdn88lwfwa0m43rlar"; depends=[geosphere igraph]; }; + crimeutils = derive2 { name="crimeutils"; version="0.2.0"; sha256="0hhghk4k3j72fxlz9wl9m2yqia9a24y61zp60d1ah0wk29n8blv4"; depends=[dplyr ggplot2 gridExtra gt magrittr scales tidyr]; }; crisp = derive2 { name="crisp"; version="1.0.0"; sha256="1gs8jnd9y9pd55w6kwv9mvmg3wd8hjiw3lwx7k242pxccsxklfxq"; depends=[MASS Matrix]; }; crispRdesignR = derive2 { name="crispRdesignR"; version="1.1.5"; sha256="1q2717xnmgq3937skwg8gvj7g4zdld9jyvckmih2b0aazrdhxr9p"; depends=[BiocGenerics Biostrings DT gbm GenomeInfoDb GenomicRanges IRanges rtracklayer S4Vectors shiny stringr vtreat]; }; crmPack = derive2 { name="crmPack"; version="1.0.0"; sha256="11zy1ci9d0zjbmc0gws9j9qrnfcqvky1ws9p41wjn0zifcckc5gi"; depends=[GenSA ggplot2 gridExtra MASS mvtnorm rjags]; }; - crmReg = derive2 { name="crmReg"; version="1.0.1"; sha256="1i3i4pd1ff7cmyd268p5kmncrk0lrq4q4cjhkhxbp2pah041q4wk"; depends=[FNN ggplot2 gplots pcaPP plyr robustbase rrcov]; }; + crmReg = derive2 { name="crmReg"; version="1.0.2"; sha256="0y6xb0sxhsqcmcwbkwvk70snwqhxgzl513ld9dp53cm88qdwaj1r"; depends=[FNN ggplot2 gplots pcaPP plyr robustbase rrcov]; }; crminer = derive2 { name="crminer"; version="0.4.0"; sha256="0yaaj6fxx7rhzcgr6l220qc0n3lf1zlw98m3liq7qw0bcwpnpcrg"; depends=[crul hoardr jsonlite pdftools xml2]; }; crmn = derive2 { name="crmn"; version="0.0.21"; sha256="0wp99fsw7y859gp1x22f77r9rv1m0xspbzhzgshzf7hi86xb57k5"; depends=[Biobase pcaMethods]; }; crn = derive2 { name="crn"; version="1.1"; sha256="1fw0cwx478bs6hxidisykz444jj5g136zld1i8cv859lf44fvx2d"; depends=[chron RCurl]; }; crochet = derive2 { name="crochet"; version="2.3.0"; sha256="0zvjaf6cv0nrjb4l4llkr0mmgha7ig31p4ri2rlnqyjlxi5l8hyq"; depends=[]; }; cromwellDashboard = derive2 { name="cromwellDashboard"; version="0.5.1"; sha256="0d57c1wdd1ds9fr7p256la63qbv8mirljgrvl1k8fp5gcnkps5wb"; depends=[dplyr DT httr shiny shinydashboard stringr]; }; - cronR = derive2 { name="cronR"; version="0.4.0"; sha256="0ydlwhlzb57vbr8ya6hdsw2mhsjkb01jspn0jw081anrxfy5m2jw"; depends=[digest]; }; + cronR = derive2 { name="cronR"; version="0.4.2"; sha256="0yydm8whwzb3iclg9a8xq0xh4l7vgi6d84r20yvkh6fqzl7vy2nm"; depends=[digest]; }; crone = derive2 { name="crone"; version="0.1.1"; sha256="03qznxml940rl3kfxy4jkg9nsx9ss0gf2ck0ry000xglw6rm2s42"; depends=[]; }; crop = derive2 { name="crop"; version="0.0-2"; sha256="1yjpk7584wrz9hjqs21irjnrlnahjg8lajra9yfdp6r927iimg1l"; depends=[]; }; cropdatape = derive2 { name="cropdatape"; version="1.0.0"; sha256="19bn0apx4p8hnz388zg7sq59qv89vv8k5php317kcv7ai2k2gh34"; depends=[]; }; crossReg = derive2 { name="crossReg"; version="1.0"; sha256="1866jhfnksv9rk89vw7w4gaxi76bxfjvqxx7cfa8nlrcsmaqd7rf"; depends=[]; }; crossdes = derive2 { name="crossdes"; version="1.1-1"; sha256="1d7lv3ibq1rwxx8kc3ia6l9dbz2dxdd5pnf2vhhjmwm448iamcfd"; depends=[AlgDesign gtools]; }; + crossmap = derive2 { name="crossmap"; version="0.2.0"; sha256="1ml48vwk2kff7397135sl19blicc4bn1yh90bsyrhn3vd4wlhzvs"; depends=[purrr rlang]; }; crossmatch = derive2 { name="crossmatch"; version="1.3-1"; sha256="082lrv2129mfhwlh99z3g8id3a29s8854skl152bl3ig8pk2gbjz"; depends=[nbpMatching survival]; }; crossrun = derive2 { name="crossrun"; version="0.1.0"; sha256="0br57nraqhs5f1cpidc8kd31izm82wvhiw9pxcdj9v51l9vifbmx"; depends=[Rmpfr]; }; crosstalk = derive2 { name="crosstalk"; version="1.1.0.1"; sha256="03ihj7cimkklrbad9zic78xsrfcisygmgy859hqnx0hiph80p9rn"; depends=[htmltools jsonlite lazyeval R6]; }; @@ -6742,20 +7011,19 @@ in with self; { crossword_r = derive2 { name="crossword.r"; version="0.3.6"; sha256="1s31613s4qxxspka9bhgq3rq8xraf48mwfv6phvz6v06gijh64lr"; depends=[dplyr jsonlite magrittr R6 r6extended stringr]; }; crov = derive2 { name="crov"; version="0.2.0"; sha256="1i3a5nagzinsla6p3wjyj3x12gyfqs6vapaqxgr3dh6m727jw5i5"; depends=[gtools VGAM]; }; crplyr = derive2 { name="crplyr"; version="0.3.6"; sha256="0np4wy1wwkbzn2rq9mpirxzp5idrm2813mmqhflywa5wwlbckwy8"; depends=[crunch dplyr ggplot2 lazyeval lifecycle purrr rlang scales stringr tibble tidyselect viridisLite]; }; - crqa = derive2 { name="crqa"; version="2.0"; sha256="1iivknva8xfcjhm43468ndli16gqwh13zm2apqp7vqb2xp3mrgw6"; depends=[gplots Matrix plot3D pracma rdist tseriesChaos]; }; + crqa = derive2 { name="crqa"; version="2.0.1"; sha256="04qzg4i3w5wqk1mp9gi90149hfjc7mpqpdwljrafnrv5jfgpjmyi"; depends=[FSA gplots Matrix plot3D pracma rdist tseriesChaos]; }; crrSC = derive2 { name="crrSC"; version="1.1"; sha256="171cw56q2yv1vb4qd0va75i2q89jcw1126q8pcbv0235g7p2a86z"; depends=[survival]; }; crrp = derive2 { name="crrp"; version="1.0"; sha256="1fq54jr6avrli91a4z1hp5img4kghyw1yvjr5xyccsanf9i35x8r"; depends=[cmprsk Matrix survival]; }; crrstep = derive2 { name="crrstep"; version="2015-2.1"; sha256="03vd97prws9gxc7iv3jfzffvlrzhjh0g6kyvclrf87gdnwifyn1z"; depends=[cmprsk]; }; crs = derive2 { name="crs"; version="0.15-31.1"; sha256="1p16nnxskjf3fdrdm5y1n5zj0acyrmc73ff75rgry1b1fd4yk61x"; depends=[boot np quantreg rgl]; }; crseEventStudy = derive2 { name="crseEventStudy"; version="1.2"; sha256="1fgjj78p54fk0bkvx0fq1h7c5j4c64g10cdjzmmqhhxlyjwp5z7y"; depends=[sandwich]; }; - crskdiag = derive2 { name="crskdiag"; version="1.0.1"; sha256="0100wbyvchx6jwlrwc6rwhdjanips5c0f5zqzs2c0dgwygpqw30w"; depends=[cmprsk]; }; crsmeta = derive2 { name="crsmeta"; version="0.3.0"; sha256="19v0bq80cma74jjl0k42pmlpd5jfv6b0hr7j2iq0d47h50pvrd02"; depends=[]; }; crsnls = derive2 { name="crsnls"; version="0.2"; sha256="0rv0xrdl9ix6bhaf554gma8zf923w47f8j1dkbs8g6xjqjr1c40a"; depends=[]; }; crso = derive2 { name="crso"; version="0.1.1"; sha256="1r10vz8z5y52a5v5phw22fhqwv9p7g66xfsx0906bcx74dn3f2b3"; depends=[foreach]; }; crsra = derive2 { name="crsra"; version="0.2.3"; sha256="1rkqm88zmvp9gw442cby6qpvfw4pfw65wz0gyl2h37w87c3wwvrw"; depends=[digest dplyr knitr purrr rcorpora readr tibble tidytext]; }; crtests = derive2 { name="crtests"; version="0.2.1"; sha256="0z8idz37dgwvi1q2vryldii7fn9yxd32gds77ml76jfplxbkikpd"; depends=[caret plyr stringr]; }; crul = derive2 { name="crul"; version="1.0.0"; sha256="09qhvcn67f7sv48avj9m5a06yzckz56qsss9m062v6zqdh7m1pia"; depends=[curl httpcode jsonlite mime R6 urltools]; }; - crunch = derive2 { name="crunch"; version="1.27.0"; sha256="0r78nncr4pd6gir4pwxb4vwkw7i7s75fk8628xm0qy0lv9qhhi7n"; depends=[crayon curl httpcache httr jsonlite]; }; + crunch = derive2 { name="crunch"; version="1.27.5"; sha256="1vklp4wkk04k945rd2s9in8w0g3y02jqb2m85nv5ks903bmswzg8"; depends=[crayon curl httpcache httr jsonlite]; }; crunchy = derive2 { name="crunchy"; version="0.3.2"; sha256="1igrfjrvp60hxcsjf1hzfsnbm7ji478p2zfp8nzqi0ybpirrrcz3"; depends=[crunch httpcache miniUI rstudioapi shiny]; }; cruts = derive2 { name="cruts"; version="1.1"; sha256="1ih6h9qk4yflzars00d61smjqj7s4bfvc2ikp6vlki9f6k012xcx"; depends=[lubridate ncdf4 raster sp stringr]; }; cryst = derive2 { name="cryst"; version="0.1.0"; sha256="04da19dy3mkngd3ma44cd8cdkb5acjy9lbhfipa9flp339j1pp57"; depends=[flux pracma]; }; @@ -6763,11 +7031,14 @@ in with self; { csa = derive2 { name="csa"; version="0.7.0"; sha256="0cmabcvfxfplnzx7mdsfas3jhgz44y86411amaphm75zmv8khcif"; depends=[data_table doParallel foreach ggplot2 ggpubr Lmoments moments raster reshape2 scales]; }; csabounds = derive2 { name="csabounds"; version="1.0.0"; sha256="15l7i15w5jk4h3148dlk8v2i4awns5vxvv6m59qcv0hzns6jhx9j"; depends=[BMisc ggplot2 pbapply progress qte]; }; csampling = derive2 { name="csampling"; version="1.2-2.1"; sha256="0kqx7j96yafsqi9cz551fqpwkbcabxl8zpwa2jms862z41xbgsv3"; depends=[marg statmod survival]; }; + csci = derive2 { name="csci"; version="0.9.3"; sha256="00s1gx5h141w1vjw8j3k7bn71c4dy80m6wakd1c1z7rmx1jbfp6m"; depends=[exactci]; }; cshapes = derive2 { name="cshapes"; version="0.6"; sha256="0mp6grkibmqk4k1yi4w2sglpp9ari5cfw4iip49a0z58qa98npw7"; depends=[maptools plyr sp]; }; csn = derive2 { name="csn"; version="1.1.3"; sha256="102w1qh9hgz4j9lh5hnbw1z3b7p034si73q4pkk564a2mhzlksw4"; depends=[mvtnorm]; }; - csodata = derive2 { name="csodata"; version="1.0.2"; sha256="0xwc9dn6zvq09z78x595kpbch985n4zpzaccl1wpdlr2pydqfmz2"; depends=[dplyr httr jsonlite R_cache reshape2 rjstat sf]; }; + csodata = derive2 { name="csodata"; version="1.1.1"; sha256="0h43psxas3js43p0qpvw225cxxfr444d91y282jvi7d9cs8mkxfg"; depends=[dplyr httr jsonlite R_cache reshape2 rjstat sf]; }; csp = derive2 { name="csp"; version="0.1.0"; sha256="1pc5mcn9difpp4cmfb0a8pqhbpkfakxjkbr7bpqmfiwcfk8rzr1h"; depends=[]; }; cspec = derive2 { name="cspec"; version="0.1.2"; sha256="049vynbffxyd5zwxwyz1jv05zgq7zrx1ypzv5j62ph64gl42m13p"; depends=[]; }; + cspp = derive2 { name="cspp"; version="0.3.0"; sha256="06cn3x7m48kqs9av9m8rsifrl00q764bb63szfsxqwcng29p08x5"; depends=[dplyr ggplot2 haven mapproj purrr readr rlang stringr tidyselect]; }; + csppData = derive2 { name="csppData"; version="0.1.1"; sha256="0qj109r1f9phxkcw7zcsmz9d20zr86mdmiqkyb2g2pg7ywwd4lgw"; depends=[]; }; csrplus = derive2 { name="csrplus"; version="1.03-0"; sha256="0kljndmiwblsvvdnxfywida9k0dmdwjq63d934l5yl6z7k4zd0xa"; depends=[sp]; }; cssTools = derive2 { name="cssTools"; version="1.0"; sha256="1p8c21c1hilmd9ibqyz493fy1x95hb2pidybsyicch53gkb542br"; depends=[sna]; }; cstab = derive2 { name="cstab"; version="0.2-2"; sha256="1lr401fvi88f4jv8jh4brx95ymncfw8clripz1r6a46inj80nj4j"; depends=[cluster fastcluster Rcpp]; }; @@ -6775,7 +7046,6 @@ in with self; { csv = derive2 { name="csv"; version="0.5.9"; sha256="1x2z1blb8rwnhl8nvx9y0c1qqca9402xpqc2wkbkz47lppgmvzfw"; depends=[data_table stringi]; }; csvread = derive2 { name="csvread"; version="1.2.1"; sha256="1r9jvf7nbkxgl6dycdnb89yh39vacrzy8z04g8qz225rklg5b288"; depends=[]; }; csvy = derive2 { name="csvy"; version="0.3.0"; sha256="0id015szw1c63vd1h0515jsqdhyn32sxpxm89f3sb1qkgq3yynmy"; depends=[data_table jsonlite yaml]; }; - ctDNAtools = derive2 { name="ctDNAtools"; version="0.4.0"; sha256="0apdz3dv6snlshiq314clkpqycppd3mmyq4skyd1bdrbycnm5s96"; depends=[assertthat BiocGenerics Biostrings BSgenome dplyr ellipsis furrr GenomeInfoDb GenomicAlignments GenomicRanges IRanges magrittr purrr rlang Rsamtools tidyr VariantAnnotation]; }; ctgdist = derive2 { name="ctgdist"; version="0.1.0"; sha256="1m3ryppfvd984n5xfphjqhi9i1sigl17v897mqaichj21dzaq62f"; depends=[mirt]; }; ctgt = derive2 { name="ctgt"; version="1.0"; sha256="0iznqskyi80xs8xn2hrrlal9qz9cwq6m9ml6wfwyynbzgn7vmvvh"; depends=[BH Rcpp]; }; cthreshER = derive2 { name="cthreshER"; version="1.1.0"; sha256="18b66d08dq8pvnixmm4ir4r800b37z5yillaa88l317mdilbci9s"; depends=[Matrix]; }; @@ -6785,14 +7055,14 @@ in with self; { ctmle = derive2 { name="ctmle"; version="0.1.2"; sha256="0qc1ji8fjpr88dn6mrpijfcx1ij4zkrxsbcw405hxal7rli0gyp3"; depends=[glmnet SuperLearner tmle]; }; ctmm = derive2 { name="ctmm"; version="0.5.10"; sha256="0rxcq3nb3b5p21wjbcranxjj4zas31lm293lv6bb26av2mlhc8xj"; depends=[data_table digest expm fasttime Gmedian gsl manipulate MASS numDeriv pbivnorm pracma raster rgdal shape sp]; }; ctqr = derive2 { name="ctqr"; version="1.1"; sha256="1iv6mms7p0xca91mpj61cj8kxv2bwqrpvwdsbx2lk6hgys8g70y2"; depends=[pch survival]; }; - ctrdata = derive2 { name="ctrdata"; version="1.3.1"; sha256="06xayav8mk5v0y42isg84pqb0d2w204p7rqz45vhsfcqdf918nng"; depends=[clipr curl httr jsonlite nodbi rvest xml2]; }; + ctrdata = derive2 { name="ctrdata"; version="1.4.1"; sha256="1aijks80gaz5s4h5b32izk6n38payhypichy3k3pzc6zx388hl79"; depends=[clipr curl httr jsonlite nodbi rvest xml2]; }; ctrlGene = derive2 { name="ctrlGene"; version="1.0.1"; sha256="0x7j11v7jj4k1jml6lrnjq79awhrvsm3pig1yxsd337jlfml3ra9"; depends=[psych]; }; - ctsem = derive2 { name="ctsem"; version="3.3.8"; sha256="1j0ibld37c34dhpi3gz3d90z0xpakabqf5rxwq5f0nnib6pwghfx"; depends=[BH cOde data_table Deriv expm ggplot2 MASS Matrix mize mvtnorm pkgbuild plyr Rcpp RcppEigen RcppParallel rstan StanHeaders tibble]; }; + ctsem = derive2 { name="ctsem"; version="3.4.1"; sha256="06awy3dr7cwkd25fgxwd68pyvqfsz888fgia5kp2y0m34rhj0isi"; depends=[BH cOde data_table Deriv expm ggplot2 MASS Matrix mize mvtnorm pkgbuild plyr Rcpp RcppEigen RcppParallel rstan StanHeaders tibble]; }; ctsemOMX = derive2 { name="ctsemOMX"; version="1.0.2"; sha256="1ln0ns2ff054m0zak0f6gbpa1q2zq2vpsf0zpd99m4m26ws1gzyw"; depends=[ctsem Matrix OpenMx plyr]; }; ctv = derive2 { name="ctv"; version="0.8-5"; sha256="0kl6z8dbbjgm29q0c5xy6lihjgf5cdihrllm27x0zbcvy8lyl51p"; depends=[]; }; cuRe = derive2 { name="cuRe"; version="1.0.1"; sha256="0vw2iv9inz8md7lz6f1p456wxjc07kap1mvqf58hixqxbrb23dgi"; depends=[date numDeriv relsurv rstpm2 statmod survival]; }; cubature = derive2 { name="cubature"; version="2.0.4.1"; sha256="006la36gxdikvmdnq4ny7ik7r30id4z3b3fqsl57dpqwkpsbsgrq"; depends=[Rcpp]; }; - cubelyr = derive2 { name="cubelyr"; version="1.0.0"; sha256="0h9s5j9q05bdzdv7dbghzfbhqf96kyxyrxx1mqf8phzc77w4yh25"; depends=[dplyr glue pillar purrr rlang tibble tidyselect]; }; + cubelyr = derive2 { name="cubelyr"; version="1.0.1"; sha256="1g3pvam1fkqh63snibqcfaazvj7lrkfip8w9pjvwdclj0l8382kl"; depends=[dplyr glue pillar purrr rlang tibble tidyselect]; }; cubeview = derive2 { name="cubeview"; version="0.2.0"; sha256="1352hi2j9x9rx4iy3xvsca86nsh39x1vnymd17f5qc8c3plfm8db"; depends=[base64enc htmltools htmlwidgets lattice raster stars viridisLite]; }; cubfits = derive2 { name="cubfits"; version="0.1-3"; sha256="0i2iybm9vpyqnahzka66yms1namdd36bz1i1yjy74qsc1h995rga"; depends=[coda foreach]; }; cubing = derive2 { name="cubing"; version="1.0-5"; sha256="1q23fplvklaaldicqic0zpnh301m08zb9k21l47zj47g9m9pj4bc"; depends=[rgl]; }; @@ -6801,6 +7071,7 @@ in with self; { cumplyr = derive2 { name="cumplyr"; version="0.1-1"; sha256="07sz1wryl3kxbk67qyvnkrkdrp4virlsaia0y6rf9bqdw7rc6vi2"; depends=[]; }; cumstats = derive2 { name="cumstats"; version="1.0"; sha256="119w751z9dg6pjyk389pbl8ab8pirf9sqndi4nxi89ix2bby4xz8"; depends=[]; }; cumulocityr = derive2 { name="cumulocityr"; version="0.1.0"; sha256="0ybvh5args3s1f3nra58bnfwgrlrdpw40by68az84s90v88bbz2q"; depends=[httr jsonlite]; }; + curephEM = derive2 { name="curephEM"; version="0.1.6"; sha256="18lr4fq7nim9axxg9kvivgs3hvmkqnp15sn30vqdbl545a4h78yy"; depends=[Matrix survival]; }; curl = derive2 { name="curl"; version="4.3"; sha256="1nrf6md41b37j424y6rvifdj9zb3j14f60fj7q71k9jhpf2x81kl"; depends=[]; }; currentSurvival = derive2 { name="currentSurvival"; version="1.0"; sha256="0bqpfwf4v4pb024a98qwg81m6zd7ljg1ps42ifhxpqx7b9gdyi6c"; depends=[cmprsk survival]; }; curry = derive2 { name="curry"; version="0.1.1"; sha256="1ps9hvbnb02m0b8hlw4admwbziyjvswj08ldi2dk3ymnrpawcc29"; depends=[]; }; @@ -6826,20 +7097,19 @@ in with self; { cvequality = derive2 { name="cvequality"; version="0.2.0"; sha256="1im839vzfqylphp2vr20avnzkyl02n88fngbs63d4ik7c72d9992"; depends=[]; }; cvmdisc = derive2 { name="cvmdisc"; version="0.1.0"; sha256="19b9kxqgbk1d631l3jph87pzhk4zf3xd5q5j2xsrbqz8zmm96sn9"; depends=[CompQuadForm]; }; cvmgof = derive2 { name="cvmgof"; version="1.0.0"; sha256="0rnd7icqjprhbpmn383ah4fi5nz0hmg88fa612fmivkvnpn79v6j"; depends=[lattice]; }; - cvms = derive2 { name="cvms"; version="1.0.2"; sha256="1swx67ns0wamh9k2fybk86ywqp4pbg3vqwk2h5jphca2zpnmq5pw"; depends=[broom checkmate data_table dplyr ggplot2 lifecycle lme4 MuMIn plyr pROC purrr recipes rlang stringr tibble tidyr]; }; + cvms = derive2 { name="cvms"; version="1.2.0"; sha256="1axc2gjscsi2mf6dqdwii7b9p46viq4jyv2vghdb3fs5vx7jqy4a"; depends=[broom broom_mixed checkmate data_table dplyr ggplot2 lifecycle lme4 MuMIn plyr pROC purrr recipes rlang stringr tibble tidyr]; }; cvq2 = derive2 { name="cvq2"; version="1.2.0"; sha256="19k95xg2y3wd4mx3wvbrc1invybd446g13vsp3dv05nw2kx4f6w8"; depends=[]; }; cvxbiclustr = derive2 { name="cvxbiclustr"; version="0.0.1"; sha256="00k75zy8v6qd5fg0h258i5z8ljjkfgkxz45cspysl1ap89d5n7df"; depends=[igraph Matrix]; }; - cvxclustr = derive2 { name="cvxclustr"; version="1.1.1"; sha256="0idmx4wgz4d0b1xzmlq5bsk2f2q38lpf9c117hg97xsfndzn7vqj"; depends=[igraph Matrix]; }; cwbtools = derive2 { name="cwbtools"; version="0.3.1"; sha256="1q8mim1k5fbf23d506wg82f9i578jy99kzkhvydibb5apri77d7n"; depends=[cli curl data_table jsonlite pbapply R6 RcppCWB RCurl rstudioapi stringi xml2 zen4R]; }; cwhmisc = derive2 { name="cwhmisc"; version="6.6"; sha256="1pf365g4f51cfrhlff9mqw2ddvkps0abax17zcn3vw1ba2djalnp"; depends=[lattice]; }; cwm = derive2 { name="cwm"; version="0.0.3"; sha256="1ln2l12whjhc2gx38hkf3xx26w5vz7m377kv67irh6rrywqqsyxn"; depends=[MASS matlab permute]; }; cxhull = derive2 { name="cxhull"; version="0.2.0"; sha256="1m03ym83ghgmb0j14aihfj6divmnr13f5s9jwknicjsxz3p3divk"; depends=[]; }; cxxfunplus = derive2 { name="cxxfunplus"; version="1.0"; sha256="0kyy5shgkn7wikjdqrxlbpfl3zkkv4v1p8a1vv0xkncwarjs4n8d"; depends=[inline]; }; - cyanoFilter = derive2 { name="cyanoFilter"; version="0.1.3"; sha256="01qws6lqh14rl0mwsmgsimssvzjlnvzir56pd9xyx9p2k8s19f56"; depends=[Biobase flowCore flowDensity RColorBrewer Rdpack stringr]; }; cycleRtools = derive2 { name="cycleRtools"; version="1.1.1"; sha256="1l7w2lm4s149ndd85v41pkdrdig6l3nmhl14bdx56aw8q57fxmb0"; depends=[Rcpp xml2]; }; - cyclestreets = derive2 { name="cyclestreets"; version="0.1.5"; sha256="1wvg43wrnh0lz2pkkrbidzdsrkypdl2r4ccs9jhdsj8ixm158dvf"; depends=[httr jsonlite magrittr sf stringr]; }; + cyclestreets = derive2 { name="cyclestreets"; version="0.3.0"; sha256="1hkmibl8dv99q6dl6xvzvjm96g4b9v364mbdffrxm6ncvzg6rfri"; depends=[geodist httr jsonlite magrittr sf stringr]; }; cyclocomp = derive2 { name="cyclocomp"; version="1.1.0"; sha256="0gky3svk02wiajw7nfjh30684h3qxili4bvsab0m7b6cggw6bgyd"; depends=[callr crayon desc remotes withr]; }; cycloids = derive2 { name="cycloids"; version="1.0"; sha256="00pdxny11mhfi8hf76bfyhd1d53557wcbl2bqwjzlpw5x3vdnsan"; depends=[]; }; + cyclomort = derive2 { name="cyclomort"; version="1.0.2"; sha256="0qmfwhrp7bq7av0yc95xnz2sd1jxfaiys9smrk1kpclnynnra9rr"; depends=[flexsurv lubridate magrittr mvtnorm plyr scales survival]; }; cymruservices = derive2 { name="cymruservices"; version="0.5.0"; sha256="1xhdvijybdy7312qdbp50881yix587pmym0hchnwb3h0vhjv553v"; depends=[memoise pingr stringi]; }; cyphid = derive2 { name="cyphid"; version="1.1"; sha256="0ya9w8aw27n0mvvjvni4hxsr4xc8dd08pjxx7zkfl1ynfn5b08am"; depends=[fda]; }; cyphr = derive2 { name="cyphr"; version="1.1.0"; sha256="03w26b5vvy9zwzp001g0lpwcndwqdsfsz80x11kik0cih1g8apsw"; depends=[getPass openssl sodium]; }; @@ -6848,41 +7118,44 @@ in with self; { cytofan = derive2 { name="cytofan"; version="0.1.0"; sha256="0gqs98mnwiawnyfb9hs5nlin8d1fj64bszn4b40gs8ajyh36r9pp"; depends=[ggplot2 RColorBrewer]; }; cytometree = derive2 { name="cytometree"; version="2.0.2"; sha256="18g7av73lmnyga1kk24bf8jy599zn9n6qhr13mxsqgi0zdinicfa"; depends=[cowplot ggplot2 GoFKernel igraph mclust Rcpp RcppArmadillo]; }; cytominer = derive2 { name="cytominer"; version="0.2.2"; sha256="1n9yimjhdziv1vzjyni6ssi38nxcnfr5jpmzgxcn6vysffh5s9pz"; depends=[caret doParallel dplyr foreach futile_logger magrittr Matrix purrr rlang tibble tidyr]; }; - czechrates = derive2 { name="czechrates"; version="0.1.8"; sha256="00zp6kwi6mgyr4dchkc8f7nz5hvyin7hcjbda8v94h220win1zxz"; depends=[curl dplyr httr magrittr readr tibble]; }; - czso = derive2 { name="czso"; version="0.2.3"; sha256="1gaflfi1sq49vjaah8mnbydvyqwwkl1ca2ay399dn9gw1kjcq0fd"; depends=[curl dplyr httr jsonlite lifecycle magrittr readr rlang stringi stringr tibble usethis]; }; + czechrates = derive2 { name="czechrates"; version="0.1.10"; sha256="0xxp61bgb2knc0cnab0c3iq92i251iic9awih557phyljb1f2z8p"; depends=[curl dplyr httr magrittr readr tibble]; }; + czso = derive2 { name="czso"; version="0.3.2"; sha256="0f47b8xgkm0w35xxzkwb708ql6rx6ay99njyc6yjvhqfcgybxq30"; depends=[curl dplyr httr jsonlite lifecycle magrittr readr rlang stringi stringr tibble usethis]; }; d3Network = derive2 { name="d3Network"; version="0.5.2.1"; sha256="1gh979z9wksyxxxdzlfzibn0ysvf6h1ij7vwpd55fvbwr308syaw"; depends=[plyr rjson whisker]; }; - d3Tree = derive2 { name="d3Tree"; version="0.2.0"; sha256="0xjr36hdd00dy8s8z1a1s44dn2wg0nm6yqc1rri2l0dqrbh4nrbn"; depends=[dplyr htmlwidgets magrittr plyr stringr]; }; + d3Tree = derive2 { name="d3Tree"; version="0.2.2"; sha256="142bc6gdmhzaikdfyxb1pq9nlybgkrgi2kjgk40w4wbxzx5mwkbh"; depends=[dplyr htmlwidgets magrittr plyr stringr]; }; d3plus = derive2 { name="d3plus"; version="0.1.0"; sha256="0kadz83pals03n0v3zqhmhf6visigk52yn58xckhb57fid4xzj5w"; depends=[htmlwidgets magrittr]; }; - d3r = derive2 { name="d3r"; version="0.9.0"; sha256="0vd1qk8yr18xdfkv5ybhqvf0mmccpi721wqa7c881nzm9nnlzc4y"; depends=[dplyr htmltools rlang tidyr]; }; + d3r = derive2 { name="d3r"; version="0.9.1"; sha256="0kc82vvyfxhxvqfalngn36prn3sxdiinsx04rn99ha6zdc27zp5k"; depends=[dplyr htmltools rlang tidyr]; }; dBlockmodeling = derive2 { name="dBlockmodeling"; version="0.2.0"; sha256="0c1hvawb9gw6vckims3g8kzn2c4f0as5x1vw39sdvkwc92xy26lv"; depends=[]; }; + dCUR = derive2 { name="dCUR"; version="1.0.0"; sha256="12i2qcjq9i1ycs6z6g3yr1imv7v4g19kdhf1vg9xkvh43pagb6h7"; depends=[dplyr ggplot2 magrittr MASS mclust ppcor Rdpack stackoverflow]; }; dChipIO = derive2 { name="dChipIO"; version="0.1.5"; sha256="1xrafw5h071d8rfqaic3gifc80jpiddjz5x6l2cr8kgjvph60gqh"; depends=[]; }; dCovTS = derive2 { name="dCovTS"; version="1.1"; sha256="1pd50nfmfcqpi8zj20ngl0hc23qa4rabqhc1xci3ivyhs0valhsl"; depends=[doParallel energy foreach]; }; dGAselID = derive2 { name="dGAselID"; version="1.2"; sha256="0da7fi872i3ycb3j5v4isr4x2z39a68w4mdq859zslmqhiqd43b6"; depends=[ALL Biobase genefilter MLInterfaces]; }; dHSIC = derive2 { name="dHSIC"; version="2.1"; sha256="1c1xz1f1fp937w4rlylvqv3ii0p9dafvmn4fqq8rzxhcg5rn9j4l"; depends=[Rcpp]; }; dLagM = derive2 { name="dLagM"; version="1.1.4"; sha256="1qc8l6971khz76n9i3wvn6j9mkd9lp35qvnxw1chhprbl1ps4h4w"; depends=[AER dynlm formula_tools lmtest MASS nardl plyr roll sandwich strucchange wavethresh]; }; dMod = derive2 { name="dMod"; version="1.0.1"; sha256="1xw52kliyiv9vrw0m9y7baqdcpqz4706625if8b63nfr70i77a9p"; depends=[cOde deSolve doParallel dplyr foreach ggplot2 plyr rootSolve stringr]; }; + dPCP = derive2 { name="dPCP"; version="1.0.3"; sha256="1gqd6a1kbzp1433k99l11gvxx11c475f33cpg7138yiiik2lp5s6"; depends=[dbscan e1071 exactci ggplot2 ggpubr raster rlist scales shiny shinyjs stringr]; }; dSVA = derive2 { name="dSVA"; version="1.0"; sha256="0vy0flyg82x0n9vw6jf9f76qy84sp0wnis91faj37ac5hdv3pvsb"; depends=[sva]; }; daarem = derive2 { name="daarem"; version="0.5"; sha256="167sqp7fnyhwgk7crl3b6m6i8mpn3hmsaqzi4v5ggi48fg19bis7"; depends=[]; }; dabestr = derive2 { name="dabestr"; version="0.3.0"; sha256="0i4k8h46cw5ds1cammxxli8kpc82ill81xw3izi33lja7wl9vmnw"; depends=[boot cowplot dplyr effsize ellipsis forcats ggbeeswarm ggforce ggplot2 magrittr plyr RColorBrewer rlang simpleboot stringr tibble tidyr]; }; + dabr = derive2 { name="dabr"; version="0.0.2"; sha256="0j6mmr2qvz51g7jjmysqy7sdshnm8y2q4k2zarl6ja6mvi9i65jv"; depends=[knitr RMariaDB]; }; dad = derive2 { name="dad"; version="3.4.3"; sha256="0gcz1lbrjs6pjjlbxmfpq45drlqkghdqfswl2kcnpiqybl79wzb3"; depends=[DescTools e1071 ggplot2]; }; - dae = derive2 { name="dae"; version="3.1-27"; sha256="14q3cxhcz0zqjdkas0dl71k2bp5qwvb60gha47s78hdr38r46kml"; depends=[ggplot2 plyr]; }; + dadjoke = derive2 { name="dadjoke"; version="1.0"; sha256="118pacwc2qb3c5zbhr71zf4zj1ab2g4rs5h6bvrscjyd7a71jc3f"; depends=[]; }; + dae = derive2 { name="dae"; version="3.1-32"; sha256="126w1lb9pz8mb2ajl2vz5dj798nbifp0dypnzfgcwixif5g5bpqi"; depends=[ggplot2 plyr]; }; daewr = derive2 { name="daewr"; version="1.2-5"; sha256="0cfak3kmw8da7rh04d9qkqypxshj6wanac3318jbc5gvk0injbvd"; depends=[FrF2 lattice stringi]; }; daff = derive2 { name="daff"; version="0.3.5"; sha256="00zcdf215m7p3xm9yv571v09znhdqacxg69hb5b5j749mp4wdsyj"; depends=[jsonlite V8]; }; dafs = derive2 { name="dafs"; version="1.0-37"; sha256="1vdi57qaqdn39yf1ih2gzry02l289q4bffpksglsl4shs6bg2206"; depends=[s20x]; }; dagR = derive2 { name="dagR"; version="1.1.3"; sha256="13jyhwjvvrjjja18rqzfdcw9ck90qm5yjwd25nygxgdf1894y03b"; depends=[]; }; dagitty = derive2 { name="dagitty"; version="0.3-0"; sha256="0b1y81f019lhib2bsbs0rn0i7y0ah8ablsx73rynprrpxrp0fgnk"; depends=[boot jsonlite MASS V8]; }; - dalmatian = derive2 { name="dalmatian"; version="0.3.0"; sha256="06j7ampp0hwjqgw2agplfc8mngxnb6g4yv3l08plg35769jxxz7f"; depends=[coda dglm gdata ggmcmc rjags]; }; dam = derive2 { name="dam"; version="0.0.1"; sha256="1b0fi3l8jxgpr9fwvi03giq7wm39msbh0c82ffgkh54a3bbf5blc"; depends=[]; }; - damr = derive2 { name="damr"; version="0.3.4"; sha256="19rffdrgx9c03f66qgj1gwp5vra89n3jrrb54i9xl2rxsf28ry3h"; depends=[behavr data_table readr]; }; + damr = derive2 { name="damr"; version="0.3.7"; sha256="12vr630m2az8xb8wndk8cyh7r8mwg3lvr7i3fcgqqxcq9rsgqm4r"; depends=[behavr data_table readr]; }; dams = derive2 { name="dams"; version="0.3.0"; sha256="1jlx1b4cir1vwq75jnmk0pc6j95syfpi0hlnkx82g7pwfxwrdrib"; depends=[crul fauxpas janitor readxl]; }; - dang = derive2 { name="dang"; version="0.0.11"; sha256="14bxzbkrqzs0ic7n4rlaa429lwdgldlcx97h8l7ma6jh8c0fx3qr"; depends=[]; }; + dang = derive2 { name="dang"; version="0.0.12"; sha256="0vsj9ii6nnj419bk6vdc0czysb0liq244jnvfb13sk930b5h4j9j"; depends=[tidyCpp]; }; dani = derive2 { name="dani"; version="0.1-1"; sha256="0ff0hcb5r8k6m6kv1zhjrpvl7gr1al3q0zlk4yjj89qd2j5byqp8"; depends=[Epi]; }; - dann = derive2 { name="dann"; version="0.2.0"; sha256="18c9rx7qg76pnmg2h4zazqq7k0vxgqh70j85cb7cc8lf0qsj6l8i"; depends=[fpc ggplot2 MASS purrr Rcpp RcppArmadillo rlang stringr tibble]; }; + dann = derive2 { name="dann"; version="0.2.1"; sha256="1bafd3qkzqgaji6ihhzp95qyzy9gjv75666qp6j6cxw75vp6x9ml"; depends=[fpc ggplot2 MASS purrr Rcpp RcppArmadillo rlang stringr tibble]; }; danstat = derive2 { name="danstat"; version="0.1.0"; sha256="1wb4v4s9qc7qna7jgd1kk0xvyaqmxhnmjvr5wlk5jjl355lhjxbc"; depends=[httr jsonlite readr]; }; dapr = derive2 { name="dapr"; version="0.0.3"; sha256="136chxijyxrl5sbiggxf56zga26zqds647z1z2igwn5mdff1wxyb"; depends=[]; }; - daqapo = derive2 { name="daqapo"; version="0.3.0"; sha256="1fyl95y57grqckyx1vp4x4f2mq8rk0l2vxh4cyr75cw23j6p4lsc"; depends=[bupaR dplyr edeaR glue lubridate magrittr miniUI purrr readr rlang shiny stringdist stringr tidyr xesreadR]; }; + daqapo = derive2 { name="daqapo"; version="0.3.1"; sha256="09fmnpp4nl6n1z834dxzs2v56ba9sfb4mrmc1nrrixxhfsxshmb7"; depends=[bupaR dplyr edeaR glue lubridate magrittr miniUI purrr readr rlang shiny stringdist stringr tidyr xesreadR]; }; darksky = derive2 { name="darksky"; version="1.3.0"; sha256="1740cw5qifgvqa0nafd6lmllxi32n1zm45zlify1yn3h1qdcszhb"; depends=[ggplot2 gridExtra gtable httr plyr]; }; - dartR = derive2 { name="dartR"; version="1.1.11"; sha256="0k768ppm4iw4fi72dp8f1684kizqp1spfb4cnnqxq1dy6w0qz5i8"; depends=[adegenet ape data_table directlabels dismo doParallel foreach gdistance ggplot2 hierfstat igraph leaflet MASS mmod pca3d pegas plyr PopGenReport qvalue reshape2 rgdal rrBLUP seqinr SNPassoc SNPRelate sp StAMPP stringr tidyr vegan]; }; + dartR = derive2 { name="dartR"; version="1.8.3"; sha256="0rc4ipwy7xpnf9qih48clm2jva05rfdrjfzkpv25m2p44r1hnh19"; depends=[adegenet ape foreach ggplot2 gridExtra HardyWeinberg hierfstat MASS mmod plyr PopGenReport raster robustbase SNPRelate sp StAMPP stringr tidyr vegan]; }; darts = derive2 { name="darts"; version="1.0"; sha256="07i5349s335jaags352mdx8chf47ay41q7b0mh2xjwn2h9kzgqib"; depends=[]; }; dash = derive2 { name="dash"; version="0.5.0"; sha256="1hzyxplq0fclyr8ahh0mhrx1ibf49y43889p8fi8kmvg0x24i1iz"; depends=[assertthat base64enc brotli crayon dashCoreComponents dashHtmlComponents dashTable digest fiery htmltools jsonlite mime plotly R6 reqres routr]; }; dashCoreComponents = derive2 { name="dashCoreComponents"; version="1.10.0"; sha256="11jrlls6k6qlvi81741ga908aw22m05fhhr9jpzli982s611jrwl"; depends=[]; }; @@ -6890,44 +7163,44 @@ in with self; { dashPivottable = derive2 { name="dashPivottable"; version="0.0.2-1"; sha256="1fv5pnvimf7w1k1lsijh9y2zk4z1z00m6m640jxvqla5i1rqy8cq"; depends=[]; }; dashTable = derive2 { name="dashTable"; version="4.7.0"; sha256="0iy07dxa90vsp3rfk8ij78j9ajz1mpxywmclxzkfj7axjyydxh5w"; depends=[]; }; dashboard = derive2 { name="dashboard"; version="0.1.0"; sha256="1znqwvz49r47lp6q48qaas0s63wclgybav82a247qvcavzns3kip"; depends=[Rook]; }; - dashboardthemes = derive2 { name="dashboardthemes"; version="1.1.1"; sha256="134xn8xbfg2j32m85dagjp18s1qx5pl6799a015fbc4zvzd9irmh"; depends=[htmltools]; }; + dashboardthemes = derive2 { name="dashboardthemes"; version="1.1.3"; sha256="0z2ar5q0ys5zbny2hfda0sxp29v76sc8xar1ah5hi5jlnas0iccz"; depends=[htmltools]; }; dat = derive2 { name="dat"; version="0.5.0"; sha256="1d3q4bang6pm06rfzh6h947xy3wwqn3l6ri0h4hzklg5pzwpsajd"; depends=[aoos data_table Formula magrittr progress]; }; - data_table = derive2 { name="data.table"; version="1.13.0"; sha256="0wihpg1syjxzsij2fmhwh30vvf2cghw2b2qi79w36qwil2s8w2gn"; depends=[]; }; + data_table = derive2 { name="data.table"; version="1.13.6"; sha256="16ryrpzl86krww5nx7a97i09y5xqld4lw4d9pa1vzjl99x6ds36m"; depends=[]; }; data_tree = derive2 { name="data.tree"; version="1.0.0"; sha256="0pizmx2312zsym4m42b97q2184bg3hibvbdrblcga05xln84qrs0"; depends=[R6 stringi]; }; data360r = derive2 { name="data360r"; version="1.0.8"; sha256="0g3prfaqy7d5fdla4l31cj87vhzi945g22zr7pi2c2whlk4q4n09"; depends=[curl data_table jsonlite reshape2]; }; dataCompareR = derive2 { name="dataCompareR"; version="0.1.3"; sha256="178293hk21qjczi7hyffhlwn0lxrz2k9nxsy7jykjdbsqalyxwli"; depends=[dplyr knitr markdown stringi]; }; dataMaid = derive2 { name="dataMaid"; version="1.4.0"; sha256="133ipl06sc8iicvkbgjxfs0qia76r2p1qhi693vacgfdbd7cmak5"; depends=[ggplot2 gridExtra haven htmltools magrittr pander rmarkdown robustbase stringi whoami]; }; dataMeta = derive2 { name="dataMeta"; version="0.1.1"; sha256="13xxayqxbps07h0xr5b7sb7q30gy5zm7jzzaq4k20fskkjrzhzcm"; depends=[dplyr]; }; - dataPreparation = derive2 { name="dataPreparation"; version="0.4.3"; sha256="1fchr68siq6vxz4qzlkrm2p6zld3s8mw7izmyzqffvrlqmrh0bdm"; depends=[data_table lubridate Matrix progress stringr]; }; + dataPreparation = derive2 { name="dataPreparation"; version="1.0.1"; sha256="040k83pknzgq9nn0bhw9p960pdnd8nkcc5hdr4h6193axzp54dh7"; depends=[data_table lubridate Matrix progress stringr]; }; dataQualityR = derive2 { name="dataQualityR"; version="1.0"; sha256="0f2410sd6kldv7zkqsmbz1js0p5iq7zwlnfwmmnlbrd303p35p3j"; depends=[]; }; + dataReporter = derive2 { name="dataReporter"; version="1.0.0"; sha256="12rwjd46h35cydvfx5qhb4rssqpm94b628zr06gy9nhwydnajn5x"; depends=[ggplot2 gridExtra haven htmltools magrittr pander rmarkdown robustbase stringi whoami]; }; dataRetrieval = derive2 { name="dataRetrieval"; version="2.7.6"; sha256="0375gqpj7xhbj7b2445984swcqhp6389w1jy3llvkdwzrf3pfvnc"; depends=[curl httr jsonlite lubridate readr xml2]; }; - datacheck = derive2 { name="datacheck"; version="1.2.2"; sha256="1i3n5g1b6ix8gpn4c74s7ll1dbrllrzgpb1f3hk449d6p4kmisq6"; depends=[Hmisc shiny stringr]; }; + datacleanr = derive2 { name="datacleanr"; version="1.0.0"; sha256="0vjzj6s6cj5r1hjnnyzqvb186jmvjxlvfgv9mkvsivapd3xb8bhi"; depends=[clipr dplyr DT formatR fs glue htmltools htmlwidgets lubridate magrittr plotly purrr RColorBrewer rlang rstudioapi shiny shinyFiles shinyWidgets summarytools]; }; datadigest = derive2 { name="datadigest"; version="1.0.2"; sha256="1v4nwflrgjhwkrdlrjnqyq1spv1jkgxn1kmapml0zrvnvwf0r1a1"; depends=[haven Hmisc htmltools htmlwidgets jsonlite miniUI shiny tibble]; }; datadogr = derive2 { name="datadogr"; version="0.1.2"; sha256="10zbxb9gkymw78ras9y4wrifz7cxh3y630yzjcf9ds2p557vcjzp"; depends=[anytime dplyr glue httr lubridate purrr stringr tibble tidyr]; }; - dataframeexplorer = derive2 { name="dataframeexplorer"; version="0.1.7"; sha256="0zbcaii21pic30x0b2i16qnmb2wh7br6g7jk4czs4mciclxldp4q"; depends=[data_table dplyr magrittr openxlsx plyr stringr tibble tidyr]; }; + dataframeexplorer = derive2 { name="dataframeexplorer"; version="1.0.0"; sha256="1bl24z9hqhrs3k459b5hprwc7j639myvkx0qbfcyv3hmi7mbsd0q"; depends=[data_table dplyr magrittr openxlsx plyr stringr tibble tidyr]; }; dataframes2xls = derive2 { name="dataframes2xls"; version="0.4.7"; sha256="10krlv0l5w021z0qd7rj93pzfjjmcjlda4xz4vq470bxbjmn1bss"; depends=[]; }; datafsm = derive2 { name="datafsm"; version="0.2.3"; sha256="18q6s8sz8bm2xlfvhj0x5sagpn363s3k21s428wd0bqzqlppwbmb"; depends=[caret GA Rcpp]; }; datagovsgR = derive2 { name="datagovsgR"; version="0.3.2"; sha256="09bjcdalv7957kjzcv5ssjljgz437lk7bllmsbp49bv2riswh1fy"; depends=[curl data_table dplyr httr purrr stringr]; }; datamap = derive2 { name="datamap"; version="0.1-1"; sha256="0qm4zb9ldg4wz1a7paj5ilr1dhyagq81rk9l2v43hmkv52sssgkv"; depends=[DBI]; }; - datamaps = derive2 { name="datamaps"; version="0.0.3"; sha256="00pvns98miq56z3prbb5qg608d5ns9wbp0711x3mmqg0bld1xwmp"; depends=[htmlwidgets magrittr]; }; datamart = derive2 { name="datamart"; version="0.5.2"; sha256="0c0l157fzkcp30ch4ymaalcx18zhz6sa5srr50w9izhbx3pmldxp"; depends=[base64 gsubfn markdown RCurl RJSONIO XML]; }; datanugget = derive2 { name="datanugget"; version="1.0.0"; sha256="1ki4kgz6y9a313f07jml39pdxhadgs287rkpnlwvcw6kgj5qxala"; depends=[doSNOW foreach]; }; dataonderivatives = derive2 { name="dataonderivatives"; version="0.3.1"; sha256="0q1zd1l7l0hmbs1bx469d706rmprjbz2f2dgcnfp9wxfgqpfxkz1"; depends=[assertthat httr lubridate readr tibble]; }; - dataone = derive2 { name="dataone"; version="2.1.4"; sha256="19v5c2xbdsz06dcx7xz4jld3dgp98k66cps2hnxpd33wbm8n7x6h"; depends=[base64enc datapack hash httr jsonlite parsedate plyr stringr uuid XML]; }; - datapack = derive2 { name="datapack"; version="1.3.2"; sha256="0v9m7fbzi1w5p3arb0ywl4yglyw87civc59ndqsdm8rp84gbvnbl"; depends=[digest hash redland uuid XML]; }; + dataone = derive2 { name="dataone"; version="2.2.1"; sha256="1gnzyjiwppx5mjwf38nm146vvmy6vlpqy9ibd2rc5f744pdvifxb"; depends=[base64enc datapack hash httr jsonlite parsedate plyr stringi stringr uuid XML]; }; + datapack = derive2 { name="datapack"; version="1.4.0"; sha256="1n69ycca7f7igl9n6spdhn2s431vrljmd0v80q3s5jnyb4mf4xyd"; depends=[digest hash redland uuid XML]; }; datapackage_r = derive2 { name="datapackage.r"; version="1.3.1"; sha256="0ch4d77pz5xjyl2ypbz0hjgl63259cnk5py79dc3ksalgxhrx9yj"; depends=[config future httr iterators jsonlite jsonvalidate purrr R_utils R6 readr rlist stringr tableschema_r urltools V8]; }; datapasta = derive2 { name="datapasta"; version="3.1.0"; sha256="0sqv29iv2rv50rbw1601rn8p7gv7rsw00djhl7h1znr0igzi5b82"; depends=[clipr readr rstudioapi]; }; - dataresqc = derive2 { name="dataresqc"; version="1.0.3"; sha256="1b04lzb479p95iv7gzb5ds6c48l8kcps857qjy3wqkhr67jhd0dc"; depends=[]; }; + dataresqc = derive2 { name="dataresqc"; version="1.1.0"; sha256="1m7c93yk3dp1l5ysgscjvmv7z0xnmgaz4bkci4ljmmmn5a9v6r3c"; depends=[]; }; datarium = derive2 { name="datarium"; version="0.1.0"; sha256="1v98yxsxhfqlalz5qy3x5axb7fy067vf3y0qg7ngixphmy9qybym"; depends=[]; }; datarobot = derive2 { name="datarobot"; version="2.17.1"; sha256="1kfd4xfpwglh05xj67gi14j1c4fwfcrf4kj0w077wk1vzyvz3n37"; depends=[httr jsonlite yaml]; }; - datasailr = derive2 { name="datasailr"; version="0.8.5"; sha256="083d06gk03kwknanflxr66rbahjna4ycdj8p0n7xcancgikky9sq"; depends=[Rcpp]; }; + datasailr = derive2 { name="datasailr"; version="0.8.7"; sha256="1qkq7qdsw7rzl6bk8h9l1nhcbi0j57n8hby4wj9p16y7cw4knxvc"; depends=[Rcpp]; }; datasauRus = derive2 { name="datasauRus"; version="0.1.4"; sha256="1w1yhwwrmh95bklacz44wjwynxd8cj3z8b9zvsnzmk18m5a4k0fl"; depends=[]; }; dataseries = derive2 { name="dataseries"; version="0.2.0"; sha256="11wc2p5m8qbdmkpbd21lpwl28a1dpab88c3gqyrhsn0298lpnip4"; depends=[]; }; datasets_load = derive2 { name="datasets.load"; version="1.4.0"; sha256="1gs7dvd6r7h3n55b33mdhf0kcvsrddbvl2f3f65k274ygza2j3r7"; depends=[DT miniUI shiny]; }; datasetsICR = derive2 { name="datasetsICR"; version="1.0"; sha256="1iw8am7y6r6j21rp6r6iw1ri4c2yrgza7aw3ams4xbx6mcz3746y"; depends=[]; }; + dataspice = derive2 { name="dataspice"; version="1.0.0"; sha256="1r97wsm32rqscjcaq9bbixhpddnx6j2ghi7l4vgx17gcfka29sj6"; depends=[dplyr EML fs ggplot2 jsonlite magrittr purrr readr rhandsontable shiny stringr tibble tidyr whisker]; }; datastepr = derive2 { name="datastepr"; version="0.0.2"; sha256="039yggdj8jdici7hwmkjwgix45lvwjl7rw5h2rfzsm9xaq6vw1z2"; depends=[dplyr lazyeval magrittr R6 tibble]; }; datastructures = derive2 { name="datastructures"; version="0.2.9"; sha256="0prw24iy1af02g1nzw588dv085bdnl6pzvizpxspmwzj6vrfbaav"; depends=[BH purrr Rcpp]; }; - datasus = derive2 { name="datasus"; version="0.4.1.1"; sha256="1vcyn0iia71c58959d3wcdqlh6336p3lsxbvwsj0fd9sll0a605s"; depends=[dplyr httr magrittr RCurl readr rvest stringi stringr xml2]; }; dataverse = derive2 { name="dataverse"; version="0.2.0"; sha256="0lyga8rdsir2yr1n9nr10iiaf6a7dxp1nb04bx8mq8ljrvpkgr8n"; depends=[httr jsonlite xml2]; }; date = derive2 { name="date"; version="1.2-39"; sha256="0mwp1619rxqyyyyxk224fh0x6g4rgyvr97q0kj076cxp71b97cdm"; depends=[]; }; daterangepicker = derive2 { name="daterangepicker"; version="0.1.0"; sha256="1605ch84ad3nmmad0yy3id0izv0nz536lxwib6rkdkjik5761gqk"; depends=[htmltools jsonify shiny]; }; @@ -6946,15 +7219,15 @@ in with self; { dbflobr = derive2 { name="dbflobr"; version="0.1.0"; sha256="0sh14lf6qnj3z4lwkw27vv1s57jf5lfmw9lmz0hvd6nbfgmcr9rg"; depends=[chk clisymbols crayon DBI flobr glue rlang RSQLite]; }; dblcens = derive2 { name="dblcens"; version="1.1.7"; sha256="02639vyaqg7jpxih8cljc8snijb78bb084f4j3ns6byd09xbdwcw"; depends=[]; }; dblr = derive2 { name="dblr"; version="0.1.0"; sha256="0wzmhmp706mw0pkh81nsb7qzclwyhm6f2mjvpvz043ng5xrxwvvw"; depends=[CatEncoders data_table Metrics xgboost]; }; - dbmss = derive2 { name="dbmss"; version="2.7-1"; sha256="0gasvpgmmpq8x776qmfrv4xiniz2fi1zxywzi7rm8xgmwr5q9kp3"; depends=[cubature ggplot2 Rcpp RcppParallel reshape2 spatstat spatstat_utils tibble]; }; - dbnR = derive2 { name="dbnR"; version="0.4.5"; sha256="1kq5c4n69zr7srp4jfyif061sc1da4zbvnj8c1fdr65nm6c2dgzz"; depends=[bnlearn data_table magrittr Rcpp]; }; + dbmss = derive2 { name="dbmss"; version="2.7-3"; sha256="1cby9gx502j4bpvbwa7fan4cypxhj9wbwm7asvrmnh85yr7jsdzr"; depends=[cubature ggplot2 Rcpp RcppParallel reshape2 spatstat spatstat_utils tibble]; }; + dbnR = derive2 { name="dbnR"; version="0.5.3"; sha256="0ypdzd1idkzwm9yawx576mcf5b2rq7m0q71zmmkjygks8g7a0jz6"; depends=[bnlearn data_table magrittr R6 Rcpp]; }; dbnlearn = derive2 { name="dbnlearn"; version="0.1.0"; sha256="0kmyiad7v96mnfi24d2pn3dqmk3g82sx348m1vhhqwijfnj53brb"; depends=[bnlearn bnviewer ggplot2]; }; - dbparser = derive2 { name="dbparser"; version="1.1.2"; sha256="0hfvlfi5w7i0ylgfa4vv84j5mc8z4xjfaxl2ky8n1688mimx9lrb"; depends=[DBI dplyr odbc purrr readr RMariaDB RSQLite tibble XML]; }; + dbparser = derive2 { name="dbparser"; version="1.2.0"; sha256="06yk6i80xlvrjgi8lpzz82rhhmkbj980vpmpil57acjkfvaznwj6"; depends=[DBI dplyr odbc progress purrr readr RMariaDB RSQLite tibble XML]; }; dbplot = derive2 { name="dbplot"; version="0.3.3"; sha256="1svizj9hcd417yii8ll9s3mnvdqpa5awy9xl71kbwpfcnpdzqf1r"; depends=[dplyr ggplot2 magrittr purrr rlang]; }; - dbplyr = derive2 { name="dbplyr"; version="1.4.4"; sha256="1v0p0557n6bz84nq9jc4182k00mdd1hvz7h4w3bbg81z0fmpj0d8"; depends=[assertthat blob DBI dplyr glue lifecycle magrittr purrr R6 rlang tibble tidyselect]; }; + dbplyr = derive2 { name="dbplyr"; version="2.0.0"; sha256="0sa0ggirvfn8j9y4cvhj04z93h6979jm4knjzahdvyzyxhv1kmzc"; depends=[assertthat blob DBI dplyr glue lifecycle magrittr purrr R6 rlang tibble tidyselect withr]; }; dbscan = derive2 { name="dbscan"; version="1.1-5"; sha256="1vh29nmmana2755zcy15i1mhj3amwc2r84cq9d71wqr7ygzynphk"; depends=[Rcpp]; }; dbstats = derive2 { name="dbstats"; version="1.0.5"; sha256="0pr80mx8y87l96hhg0rp3ajxl7yx2f8qr0y1zrjkbzxavjmp9k34"; depends=[cluster pls]; }; - dbx = derive2 { name="dbx"; version="0.2.6"; sha256="0bc1pbyarfhr5v41msk9kdzj608nijmpj9lyp03ya6z6rbfnvbkd"; depends=[DBI]; }; + dbx = derive2 { name="dbx"; version="0.2.7"; sha256="1qv28fkvpvjhpsar33r2h2yzybsqwwzs91bimg17lww2058zv1p6"; depends=[DBI]; }; dc3net = derive2 { name="dc3net"; version="1.2.0"; sha256="19ibsvbnq6y88vqvgkm31zrqwjhpml59d792bz0zkk50r1q5bnyr"; depends=[c3net igraph RedeR]; }; dcGOR = derive2 { name="dcGOR"; version="1.0.6"; sha256="0rvwa25r23yayx1i6xhkfaw2z85d2iyfx3slg3aq1m0fa7kj380p"; depends=[dnet igraph Matrix]; }; dccvalidator = derive2 { name="dccvalidator"; version="0.3.0"; sha256="1l74pqvac0n7dyfzkz2m0m6j19c8icymbwcifp2g5qvrpznfhxjb"; depends=[config ggplot2 glue golem htmltools knitr markdown purrr reactable readr readxl reticulate rlang shiny shinyBS shinydashboard shinyjs skimr tibble visdat]; }; @@ -6964,7 +7237,7 @@ in with self; { dcmle = derive2 { name="dcmle"; version="0.3-1"; sha256="1d6zk9413h30wcw8q1gnjzk67vshmjcpnh8zjxrsh1h69i1z6rpy"; depends=[coda dclone lattice]; }; dcmodify = derive2 { name="dcmodify"; version="0.1.2"; sha256="093rh3r3n0wjdpx861xiqd1zqd5v1v9rzxgcynz4awr7jbm5xszi"; depends=[settings validate yaml]; }; dcov = derive2 { name="dcov"; version="0.1.1"; sha256="0c3a5dzpizsxlsh723pcd0d7n0mgfc9y35vrfhmskp3c1x639mh3"; depends=[Rcpp RcppArmadillo]; }; - dcurver = derive2 { name="dcurver"; version="0.9.1"; sha256="1cfy0j3rmi3laszrgd3i59cfy4xfs2p6h9dcwbkwq6wnshrpypfn"; depends=[Rcpp RcppArmadillo]; }; + dcurver = derive2 { name="dcurver"; version="0.9.2"; sha256="1v4h480lff1cyjjwb80dksiffh0y4b3s07lq2l2r21rn1l4mav6c"; depends=[Rcpp RcppArmadillo]; }; dcv = derive2 { name="dcv"; version="0.1.1"; sha256="12c716x8dnxnqksibpmyysqp2axggvy9dpd55s9bhnsvqvi6dshj"; depends=[lmtest]; }; ddalpha = derive2 { name="ddalpha"; version="1.3.11"; sha256="1sdnb47r534nh138zk3a6b2mgi74nvshc7p5m304vjs9jlx4l2y3"; depends=[BH class geometry MASS Rcpp robustbase sfsmisc]; }; dde = derive2 { name="dde"; version="1.0.1"; sha256="0qgnxb27a2wnrbfk5v22i985mqhjp4hp05vl1ccsapbxkpf0gqcv"; depends=[ring]; }; @@ -6980,7 +7253,7 @@ in with self; { deSolve = derive2 { name="deSolve"; version="1.28"; sha256="0jasvdzig0pzhzspmy20089az19r91xjfb9q6h8gj7c4mr6fymac"; depends=[]; }; deTS = derive2 { name="deTS"; version="1.0"; sha256="08yq7vfcd8fv8qw2w0f1rnj3rzys9kslmkqspmiz6prmzqvj1zf1"; depends=[pheatmap RColorBrewer]; }; deTestSet = derive2 { name="deTestSet"; version="1.1.7.2"; sha256="0ra7686zkyaj61fd6s2mm6blzpqhplw9icwzfczk9aagg8nc4s72"; depends=[deSolve]; }; - deaR = derive2 { name="deaR"; version="1.2.1"; sha256="16rhpdw3fyc2fyrm0yfmq0im5r4svhs4v52gjh9y6lx4n8pmncph"; depends=[dplyr ggplot2 gridExtra igraph lpSolve plotly tidyr writexl]; }; + deaR = derive2 { name="deaR"; version="1.2.2"; sha256="0bagm10ia525vyghf55kygb237ldbql9cwsywxl5nj910w8w64fm"; depends=[dplyr ggplot2 gridExtra igraph lpSolve plotly tidyr writexl]; }; deadband = derive2 { name="deadband"; version="0.1.0"; sha256="02pq3d0l0wy8bdlyfir3zf46j1ascx4qajyq5cf28yl62q6ngq5d"; depends=[TTR]; }; deal = derive2 { name="deal"; version="1.2-39"; sha256="0sw0v1mm004ky1gjw3dmvf2vb7nf2j9s9386bhqxijw63j7xnjd3"; depends=[]; }; deamer = derive2 { name="deamer"; version="1.0"; sha256="1xbxr78n6s1yhf192ab4syi1naqlwl9z4cxzchrkw80q7bxqfiz8"; depends=[]; }; @@ -6997,7 +7270,7 @@ in with self; { decompr = derive2 { name="decompr"; version="4.5.0"; sha256="1kbk4z1pr1j4i1sgfkjxzjy2j2fcmrf3vacnrpv1fba2ib10619k"; depends=[]; }; decon = derive2 { name="decon"; version="1.2-4"; sha256="1v4l0xq29rm8mks354g40g9jxn0didzlxg3g7z08m0gvj29zdj7s"; depends=[]; }; deconstructSigs = derive2 { name="deconstructSigs"; version="1.8.0"; sha256="014x0nb23jb98666kaav2phkvmkr38pi38jv0dqd4jv7zp0gdf1a"; depends=[BSgenome BSgenome_Hsapiens_UCSC_hg19 GenomeInfoDb reshape2]; }; - deconvolveR = derive2 { name="deconvolveR"; version="1.1"; sha256="0iz8phshbzr0xpp3i305dyz75l95w4lh547lvw2fdvjqg6i0c6sv"; depends=[]; }; + deconvolveR = derive2 { name="deconvolveR"; version="1.2-1"; sha256="191bgncgwjhb13i27bf8072a0z3mkpjbbp06ys3nri0ggsv5r108"; depends=[]; }; decor = derive2 { name="decor"; version="1.0.0"; sha256="1vk1szw267mcs9q7saffkrlnlncnw9k70g9lhj81iwkwfx8ir962"; depends=[tibble vctrs]; }; deducorrect = derive2 { name="deducorrect"; version="1.3.7"; sha256="10lvhdnnc6xiy20hy6s5rpqcvilj8x0y6sn92rfjkdbfsl00sslp"; depends=[editrules]; }; deductive = derive2 { name="deductive"; version="0.1.3"; sha256="19h41a20c27gmky9xrgqkf0n2s8fzn2hiivs5dg71kl9gc4m1jhn"; depends=[lintools stringdist validate]; }; @@ -7006,8 +7279,10 @@ in with self; { deepboost = derive2 { name="deepboost"; version="0.1.6"; sha256="1nf9gjk9gjl2dz7cr3vh5lg8nxkbqwr82a132nw853axbdgbs9ga"; depends=[Rcpp]; }; deepdep = derive2 { name="deepdep"; version="0.2.1"; sha256="08v2pxbk1w5ajf3zfnkksbwgc29fj7j2znrrix83nyaxmyz8yajn"; depends=[cranlogs ggforce ggplot2 ggraph graphlayouts httr igraph jsonlite scales]; }; deepdive = derive2 { name="deepdive"; version="1.0.1"; sha256="1385pxkcdaf3rs2br1dghm7d7zd94mfgmqjns4z09mryv72n7cl0"; depends=[data_table fastDummies plyr rpart stringr treeClust]; }; - deepgmm = derive2 { name="deepgmm"; version="0.1.59"; sha256="1kmvk0vmfzs49n67j2cd1d46fi9gvmxklcqghgmwfw25k4xmpgkb"; depends=[corpcor mvtnorm]; }; + deepgmm = derive2 { name="deepgmm"; version="0.1.62"; sha256="1cllbq87xxzgba3a1prkjg7hdfkxjnmi8fgizqrlsvbxdhpg61yh"; depends=[corpcor mclust mvtnorm]; }; + deepgp = derive2 { name="deepgp"; version="0.2.0"; sha256="0svbgng854qw8ar18ypd94jx38gjk9j33dqq0wxdjg7flqm8bi7w"; depends=[doParallel foreach]; }; deepnet = derive2 { name="deepnet"; version="0.2"; sha256="09crwiq12wzwvdp3yxhc40vdh7hsnm4smqamnk4i6hli11ca90h4"; depends=[]; }; + deepredeff = derive2 { name="deepredeff"; version="0.1.0"; sha256="0bfjkq46nds4xhbqvjd1ng36s3x41hv90w6lvdh04m7kbx5yx9sz"; depends=[Biostrings dplyr ggplot2 ggthemes keras magrittr purrr reticulate rlang seqinr tensorflow]; }; default = derive2 { name="default"; version="1.0.0"; sha256="0hzxgp9la9kll5cw3m4gd02rii571xsn1v53kz407k7k6rfg5mda"; depends=[]; }; define = derive2 { name="define"; version="0.2.9"; sha256="0sq7ryiz1py0yw7g2bncd834zsdiy1y7rck8k4grrx2ips5gv2jy"; depends=[encode Hmisc latexpdf SASxport spec]; }; deflateBR = derive2 { name="deflateBR"; version="1.1.2"; sha256="17zsy10k12gmffbk7nagi60xj347q0bf7wr885fiylqz2xiy9fl9"; depends=[dplyr httr lubridate]; }; @@ -7015,7 +7290,7 @@ in with self; { degreenet = derive2 { name="degreenet"; version="1.3-3"; sha256="07mkj2sdp09624mmb1x3djjypnrzn43qn2j4m93blli51j6zchm3"; depends=[igraph network]; }; deisotoper = derive2 { name="deisotoper"; version="0.0.7"; sha256="0lpmx3qy44xjlil4nsbvcbczxq22vr8xn6v9a5bdx7cd31qwm2l3"; depends=[rJava]; }; delayed = derive2 { name="delayed"; version="0.3.0"; sha256="04f4k683jzb763sb9knb81lw8df56y1378g4i3c1x8m83bvj1mhs"; depends=[assertthat BBmisc data_table future igraph progress R6 rlang rstackdeque uuid visNetwork]; }; - deldir = derive2 { name="deldir"; version="0.1-28"; sha256="12ys8jdcrgzhf9m2yirlqfars397qb0q0pbypahmfa66lgr6wdx5"; depends=[]; }; + deldir = derive2 { name="deldir"; version="0.2-3"; sha256="0kin1hsd6dj36kkg7n328mzp21wwn9jm69lvgg2rvbf6bq7q091d"; depends=[]; }; delt = derive2 { name="delt"; version="0.8.2"; sha256="06g03wy9r2qvly0lnv5fv4k366mhlk56qkvak0xaxy99p1i34kmv"; depends=[denpro]; }; deltaPlotR = derive2 { name="deltaPlotR"; version="1.6"; sha256="15vjg3viyfrxvvh34p8i7j8p0vpg5628g8198adhi0i2ri3ygz9a"; depends=[MASS]; }; deltar = derive2 { name="deltar"; version="1.0.0"; sha256="1ki89ysz4qlq5z094ybg3aqfcb6g633ccvpj1cg6nri9z5qjwpm1"; depends=[Bchron]; }; @@ -7027,8 +7302,8 @@ in with self; { demography = derive2 { name="demography"; version="1.22"; sha256="1m15capbfknr4rqxmfgj1vb7rmgambk6r9ic37149525sg7wn3j6"; depends=[cobs forecast ftsa mgcv rainbow RCurl strucchange]; }; demu = derive2 { name="demu"; version="0.3.0"; sha256="1mp5iz8mg0d6cyqi3f6fdhk6x5xxvng5bi13b7jnlp60wpjrq0il"; depends=[ClusterR fields Matrix Rcpp RcppArmadillo spam]; }; dendRoAnalyst = derive2 { name="dendRoAnalyst"; version="0.1.1"; sha256="0pdhd89kn9ndc9xdqwpjb1h49zwgya8whjfhpjvlc7cwb3112xj1"; depends=[boot pspline zoo]; }; - dendextend = derive2 { name="dendextend"; version="1.13.4"; sha256="1pjbz6sb4pgh3d5pm53vmf3q8y6lq3hrgjd6547xxs3m63sb8mn4"; depends=[ggplot2 magrittr viridis]; }; - dendroTools = derive2 { name="dendroTools"; version="1.0.7"; sha256="052957wbrwgnm5lab3ynwlziih4d0hhm7agaa907zfbrz2xl6nr0"; depends=[boot brnn Cubist dplyr ggplot2 gridExtra knitr lubridate magrittr MLmetrics oce plotly psych randomForest reshape2 scales viridis]; }; + dendextend = derive2 { name="dendextend"; version="1.14.0"; sha256="0n3qg76apgbqbvxv2yp5qwpy6nx03xmmc9mdfyq4dqblqhdld29p"; depends=[ggplot2 magrittr viridis]; }; + dendroTools = derive2 { name="dendroTools"; version="1.1.1"; sha256="0wcl5jsyvj12id6khdrlzxb23bhs7bxqdaf0gfry927zdbzjvmpa"; depends=[boot brnn Cubist dplyr ggplot2 gridExtra knitr lubridate magrittr MLmetrics oce plotly psych randomForest reshape2 scales viridis]; }; dendroextras = derive2 { name="dendroextras"; version="0.2.3"; sha256="0hb7crbgsnbcwvbk05iz5ik45n7zgysmwjj6xc46131yd8l0i1qx"; depends=[]; }; dendrometeR = derive2 { name="dendrometeR"; version="1.0.0"; sha256="1par27ipgbfbrmdlwvkf82i5dgnfrcawmavakrf8lplin2hhb7gs"; depends=[forecast pspline zoo]; }; dendsort = derive2 { name="dendsort"; version="0.3.3"; sha256="1m4qh79ppfvipmbi8m8vwq0hqmwwipbg5izihz5j6x8a4g5i6iym"; depends=[]; }; @@ -7036,6 +7311,7 @@ in with self; { denoiseR = derive2 { name="denoiseR"; version="1.0.2"; sha256="1q5kxiwfkrf2k0gpidzhl4hyzyjcm33rwlw4dan9nkx1181naw9l"; depends=[FactoMineR irlba Matrix]; }; denovolyzeR = derive2 { name="denovolyzeR"; version="0.2.0"; sha256="03ya5clzqp12lfhw073ri0pwgxn53a6pvnais317a8bv1yinxspb"; depends=[dplyr reshape2]; }; denpro = derive2 { name="denpro"; version="0.9.2"; sha256="19hrpfd44jaavq81dbyj3frris4aflfc8lig0471whv0pc6jci2k"; depends=[]; }; + densEstBayes = derive2 { name="densEstBayes"; version="1.0-1"; sha256="16dk5fibfcflkjafhard11i1lhnxsh61m65gdbsa2jzan8kb6r21"; depends=[BH MASS nlme Rcpp RcppArmadillo RcppEigen RcppParallel rstan StanHeaders]; }; denseFLMM = derive2 { name="denseFLMM"; version="0.1.2"; sha256="1lfhd73zvvz6glq41lb2a9x63fjwjfp53zmy9g78fg6gz5lbnbpm"; depends=[MASS Matrix mgcv mvtnorm]; }; densitr = derive2 { name="densitr"; version="0.1.0"; sha256="1vqdvfka6wdfxqfy2qcacss0h6wxykmwyijr5blpvlpafjdmngaq"; depends=[changepoint]; }; densityClust = derive2 { name="densityClust"; version="0.3"; sha256="1zry0vafajzmr37aylglxfvwplhdygbkb9cvzvh8cy0xgnjrnx13"; depends=[FNN ggplot2 ggrepel gridExtra RColorBrewer Rcpp Rtsne]; }; @@ -7044,12 +7320,12 @@ in with self; { denvax = derive2 { name="denvax"; version="0.1.2"; sha256="0a8x7z7jagshc5h6xy24xrvqv0gm08f78ik6y8ki4i0mhl8c5fyx"; depends=[]; }; depcoeff = derive2 { name="depcoeff"; version="0.0.1"; sha256="08vs0yzfvd4ahcs5rz4i4spp8l6fg45bm0m22gn5rzxc4759mzac"; depends=[copula Rcpp]; }; depend_truncation = derive2 { name="depend.truncation"; version="3.0"; sha256="1jym52qxx8v4kbq2578d03q2593q96jccr85if47djikw0aaxmcr"; depends=[mvtnorm]; }; - depigner = derive2 { name="depigner"; version="0.8.1"; sha256="0cw4biz8p1bavni59djsfrbv59wnw256ikykjmlpjpf1xcwr1g9r"; depends=[broom desc dplyr fs ggplot2 Hmisc magrittr progress purrr rlang rprojroot stringr telegram_bot tibble tidyr usethis]; }; + depigner = derive2 { name="depigner"; version="0.8.3"; sha256="1bx4z5xfh0hrx38dj10gl6jq2rv2rabc18xm2sj98bv7b16fzvpq"; depends=[desc dplyr fs ggplot2 Hmisc magrittr progress purrr rlang rprojroot stringr telegram_bot tibble tidyr usethis]; }; depmix = derive2 { name="depmix"; version="0.9.16"; sha256="1vi9fi131ni34z9p3x6pdp6y9v0y0nx71zg1q8898frhqwbwhd9c"; depends=[MASS]; }; depmixS4 = derive2 { name="depmixS4"; version="1.4-2"; sha256="07d4fxwnbl3jqczrylbvdch9q87az37jrjsmvilhl9h98z31wzaq"; depends=[MASS nlme nnet Rsolnp]; }; depth = derive2 { name="depth"; version="2.1-1.1"; sha256="0szy0027nh4ps1z919i740i50app5q7cfyg1fj7pdyl45nbl8k6m"; depends=[abind circular rgl]; }; depth_plot = derive2 { name="depth.plot"; version="0.1"; sha256="0zjg9iyqmcnkvwc9w2j7lmk3k9nsg6n8m6vq5x44d1bp4g2gr6jv"; depends=[mvtnorm]; }; - depthTools = derive2 { name="depthTools"; version="0.4"; sha256="1699r0h1ksgrlz9xafw2jnqfsc7xs0yaw97fc6dv3r11x6gxk00y"; depends=[]; }; + depthTools = derive2 { name="depthTools"; version="0.5"; sha256="0980w80vc25dwrkrsfyx84g8dxz94hwzx0j7x4y2jx4k3nflbmqv"; depends=[]; }; dequer = derive2 { name="dequer"; version="2.0-1"; sha256="04kzlff8xa733qkkx0gacgig7d4l7yvgqmzva0mj8di12byh214p"; depends=[]; }; derivmkts = derive2 { name="derivmkts"; version="0.2.4"; sha256="1ncqhi6f69jv75dad1l9wsrfxi5m2wizywikkbg7i9qmh42xkh8w"; depends=[mnormt]; }; desc = derive2 { name="desc"; version="1.2.0"; sha256="1s6s13fk6sxwcj8wzkwxl9vr33153xx11p5wi9avqx3rzkabavz6"; depends=[assertthat crayon R6 rprojroot]; }; @@ -7057,9 +7333,10 @@ in with self; { descr = derive2 { name="descr"; version="1.1.4"; sha256="05maviw8l8qhmy7p80gs3dlyy6pqk5k1686ny4xla4psj8mr7lbk"; depends=[xtable]; }; describedata = derive2 { name="describedata"; version="0.1.0"; sha256="10ryy886jr2gwi6h90girl82ivwrmhz1vcwi4f6khmmpwsy95hav"; depends=[broom dplyr forcats ggplot2 haven lmtest purrr rlang stringr tibble tidyr]; }; describer = derive2 { name="describer"; version="0.2.0"; sha256="1pjyihmn4gkaamixsc3qwynsc02pwv9bgn6s7z7acmmsybhhs6xn"; depends=[]; }; - descriptr = derive2 { name="descriptr"; version="0.5.1"; sha256="0s4zjh5vw73sj5pxq6v4nnrprbdxz470hnw8m2hzx6n04abbkzd1"; depends=[cli dplyr ggplot2 gridExtra magrittr purrr rlang scales tibble tidyr vistributions xplorerr]; }; + descriptr = derive2 { name="descriptr"; version="0.5.2"; sha256="1shqcykp8ahgarsam56zv4gcbj0mmfm7jy1i9fgbmy5ddksnific"; depends=[dplyr ggplot2 magrittr rlang scales tibble tidyr]; }; + descstat = derive2 { name="descstat"; version="0.1-0"; sha256="0whggzbh8wwbhvv26hzkc7kdh609b7ziln3px4rdxwbzdrdf70nz"; depends=[dplyr purrr rlang tidyr]; }; descstatsr = derive2 { name="descstatsr"; version="0.1.0"; sha256="1pz5lww1dkkqvsq6h0vkch39bj76qffmmag3zlag5in75s4wj0wl"; depends=[moments zoo]; }; - desctable = derive2 { name="desctable"; version="0.1.7"; sha256="12axy5knsvzh2pxzax9k9zl69vasvabchcspy6ssirfbln660z1f"; depends=[dplyr DT htmltools pander purrr]; }; + desctable = derive2 { name="desctable"; version="0.1.9"; sha256="0ixakd5rs9csq7rm6h8id44qkdg2gn0cg6hwdcwvbvshflbg4jxx"; depends=[dplyr DT htmltools pander]; }; deseasonalize = derive2 { name="deseasonalize"; version="1.35"; sha256="1fjsa7g34dckjs6mx9b10m99byxagggm0p9pw2f1vmpjqlasin0l"; depends=[FitAR lattice]; }; desiR = derive2 { name="desiR"; version="1.2.1"; sha256="0ghcv96bbwn74mka4dpf2lkpnlikjn3q6lx2sl8bbw77nriap0n6"; depends=[]; }; designGG = derive2 { name="designGG"; version="1.1"; sha256="1x043j36llwd7kd4skbpl2smz2ybsxjqf5yd1xwqmardq60gdv2w"; depends=[]; }; @@ -7067,7 +7344,7 @@ in with self; { designr = derive2 { name="designr"; version="0.1.10"; sha256="1x7aixhz5cgjh44m2w2zgz5gmilbs2vj78hyg1sqjb483g36x224"; depends=[crossdes dplyr MASS tibble]; }; desirability = derive2 { name="desirability"; version="2.1"; sha256="094gxvp6a60lfcc0a0gk9rv1p6ajnzq9m58sy8cvhcj5337g4fmk"; depends=[]; }; desire = derive2 { name="desire"; version="1.0.7"; sha256="0jmj644nj6ck0gsk7c30af9wbg3asf0pqv1fny98irndqv508kf6"; depends=[loglognorm]; }; - desplot = derive2 { name="desplot"; version="1.7"; sha256="0fb3scmclqmgnjxhmvgbd2zszw9ywis9vhwmfizhwrrz8klxiily"; depends=[ggplot2 lattice reshape2]; }; + desplot = derive2 { name="desplot"; version="1.8"; sha256="0i3vwg0v3snan6rvgc2v3i01fdi3xbw3k407zrxdai27i0mjanx8"; depends=[ggplot2 lattice reshape2]; }; details = derive2 { name="details"; version="0.2.1"; sha256="03fw3jbf1a34w9c205wwjkqnw6ic1gylsf36qw33mx4ba252s2hy"; depends=[clipr desc httr knitr magrittr png withr xml2]; }; detect = derive2 { name="detect"; version="0.4-4"; sha256="1gzd98b4kg5rw0kpgznrb1wmr3iavdq5983n6wqx33lga1lqq9d6"; depends=[Formula Matrix pbapply]; }; detectRUNS = derive2 { name="detectRUNS"; version="0.9.6"; sha256="0yl1x0jz66hingbl094picsiyrxzxvnz0grq63rva6nwn7pv1c0b"; depends=[data_table ggplot2 gridExtra iterators itertools plyr Rcpp reshape2]; }; @@ -7075,14 +7352,14 @@ in with self; { detectseparation = derive2 { name="detectseparation"; version="0.1"; sha256="0y0d1irw3pzvyvc7smii0ikx7dv376s2cdixjcs5c3jsw0iqxyim"; depends=[lpSolveAPI pkgload ROI ROI_plugin_lpsolve]; }; detpack = derive2 { name="detpack"; version="1.1.3"; sha256="1mk2k9akagz7knd4n5p8nxkmnm2mdv9izk4i5yl2v9nv5v39mc4h"; depends=[]; }; detrendeR = derive2 { name="detrendeR"; version="1.0.4"; sha256="1z10gf6mgqybb9ml6z3drq65n7g28h2pqpilc2h84l6y76sy909c"; depends=[dplR]; }; - detrendr = derive2 { name="detrendr"; version="0.6.8"; sha256="00arl6jzgz6m6dgivxmsqwhp2mw5rvmz5z94mai80gi0vr36drwa"; depends=[arrayhelpers autothresholdr checkmate doParallel dplyr filesstrings foreach ijtiff iterators magrittr plyr purrr Rcpp RcppParallel rlang stringr withr]; }; + detrendr = derive2 { name="detrendr"; version="0.6.9"; sha256="0wajxgcw348pd78apa3fx2b8qvc9lzga5ld975b1h0dxb9iqkc1a"; depends=[arrayhelpers autothresholdr checkmate doParallel dplyr filesstrings foreach ijtiff iterators magrittr plyr purrr Rcpp RcppParallel rlang stringr withr]; }; detzrcr = derive2 { name="detzrcr"; version="0.3.1"; sha256="0afi1ir8il5xmzkpmbc2m5mvmgzlqw8qdn04gbnwl74a03yaxxmj"; depends=[DT ggplot2 MASS shiny]; }; - devEMF = derive2 { name="devEMF"; version="3.8"; sha256="1dw1zz0dichkcmyav7ibi6rviamfnsqf2am23n53zz2yjgikvhpj"; depends=[]; }; + devEMF = derive2 { name="devEMF"; version="4.0-2"; sha256="1wpziix6g1lr7qq728dfxvd0dyynnliilk029pl861mzx2dgdr6l"; depends=[]; }; devFunc = derive2 { name="devFunc"; version="0.1"; sha256="0f2s5gssk9napmah7zcss1rnh7pzlq90gzwcnvyr9rrq6k118n8q"; depends=[plyr stringr]; }; - devRate = derive2 { name="devRate"; version="0.1.10"; sha256="0c5hg98w83d02lvb7rbgx8c24li58vpxjy71if337p7cyzzd1lqg"; depends=[]; }; + devRate = derive2 { name="devRate"; version="0.2.1"; sha256="1wq32igzc0xk0vmddrn1zk8m7zxy0gpvpswlgjjmxflslp3yszjf"; depends=[]; }; devoid = derive2 { name="devoid"; version="0.1.1"; sha256="14cf75wih7401vmrfmswc9cihgmbyn90wg2vjkzv628mm5fgg01h"; depends=[]; }; - devtools = derive2 { name="devtools"; version="2.3.1"; sha256="100mgighf6vqsfwv2qw5rlnd5sfvcji9l9jrmx9ii28r9fd2gyas"; depends=[callr cli covr desc DT ellipsis httr jsonlite memoise pkgbuild pkgload rcmdcheck remotes rlang roxygen2 rstudioapi rversions sessioninfo testthat usethis withr]; }; - dexter = derive2 { name="dexter"; version="1.0.8"; sha256="1jnizhcv284nmp6rc2dgy26b2iwb0hbjy9c1i0ky7k78g24r5679"; depends=[DBI dplyr MASS Rcpp RcppArmadillo rlang RSQLite tidyr]; }; + devtools = derive2 { name="devtools"; version="2.3.2"; sha256="0vcqs4c5dfjs2ddkclv3z7zzix2zrnrxvzax8hjvjszgp8362275"; depends=[callr cli covr desc DT ellipsis httr jsonlite memoise pkgbuild pkgload rcmdcheck remotes rlang roxygen2 rstudioapi rversions sessioninfo testthat usethis withr]; }; + dexter = derive2 { name="dexter"; version="1.1.1"; sha256="0crm9vwjr5hidagn45ndd478b56622rmqryy4cj5ayh2177d6n64"; depends=[DBI dplyr MASS Rcpp RcppArmadillo rlang RSQLite tidyr]; }; dexterMST = derive2 { name="dexterMST"; version="0.9.0"; sha256="0lawpqz7jrfshc16fjx6f44z6mqy3b9nl56h1nzm4jkp4kv9lizr"; depends=[crayon DBI dexter dplyr igraph Rcpp RcppArmadillo rlang RSQLite tidyr]; }; dextergui = derive2 { name="dextergui"; version="0.2.2"; sha256="1g6qxjmxkrna10lahsdfilpjw587kk6zh8vs1saw9l27i3izpbi9"; depends=[Cairo DBI dexter dplyr DT ggExtra ggplot2 ggridges htmltools htmlwidgets jsonlite networkD3 RCurl readODS readxl rlang shiny shinyBS shinyFiles shinyjs tibble tidyr writexl]; }; dfCompare = derive2 { name="dfCompare"; version="1.0.0"; sha256="1lhx69j0bkjbnp5jz23hrbxjcf04vf3big4k593ixz003xs2077f"; depends=[]; }; @@ -7094,17 +7371,17 @@ in with self; { dfidx = derive2 { name="dfidx"; version="0.0-3"; sha256="01dgd0nbx9gs4l45lmlkilw8l4pympyh3xrsjfds3610417zgmw1"; depends=[dplyr Formula]; }; dfmeta = derive2 { name="dfmeta"; version="1.0.0"; sha256="0ca48adfhaxac33jmxbynlyg3ak9l5mmjhlr69n4hnz6325gn9vb"; depends=[data_table ggplot2 lme4 plyr]; }; dfmta = derive2 { name="dfmta"; version="1.7-1"; sha256="13i4ck32z2p4plmy7lz2y4zakc1w915f5h6d9s6vj71212rrg9qm"; depends=[BH Rcpp RcppArmadillo RcppProgress]; }; - dfoliatR = derive2 { name="dfoliatR"; version="0.1.0"; sha256="1vgcz763fvapwh98453040yddyka83p9bhgqssx9c0n69z20ylix"; depends=[dplR dplyr forcats ggplot2 ggpubr MASS plyr reshape2 rlang]; }; - dfoptim = derive2 { name="dfoptim"; version="2018.2-1"; sha256="1gya0sx8ajy04kscds06d6m9prxdwr1dmyfc6awsm6r1jwbibzb3"; depends=[]; }; + dfoliatR = derive2 { name="dfoliatR"; version="0.2.0"; sha256="0z78nbb2m6qn2xj09j4wgpmid5va1jppdkknhl2l7v3yx8fmmk9i"; depends=[dplR dplyr forcats ggplot2 ggpubr magrittr MASS plyr purrr rlang tidyr]; }; + dfoptim = derive2 { name="dfoptim"; version="2020.10-1"; sha256="0gy3wnvwvi9sydcbix226jds88n43r5nchvzrhqdag0j1bwpr9gy"; depends=[]; }; dformula = derive2 { name="dformula"; version="0.1"; sha256="0028qm3wsfpjbkpza5nb87pcm8cg0075jclcy6s4wfflizgfs6n4"; depends=[formula_tools]; }; dfped = derive2 { name="dfped"; version="1.1"; sha256="11ffsah14igba276m9d3cla0kgb3isizm5d7j1iqcd0wq23il7hq"; depends=[ggplot2 rstan]; }; dfphase1 = derive2 { name="dfphase1"; version="1.1.1"; sha256="0bk4bl5lqd7m4mzk6kg71fmh918wcy85zghr3lyayxlk30fl4ppc"; depends=[lattice Rcpp robustbase]; }; dfpk = derive2 { name="dfpk"; version="3.5.1"; sha256="010rlxj66ar3y61fnm7ys3p6aimlr8ylqq4q4flzr9m88klz8701"; depends=[BH dfcrm ggplot2 PK Rcpp RcppEigen rstan StanHeaders]; }; + dfrr = derive2 { name="dfrr"; version="0.1.4"; sha256="02hldg31pgicpqffvh61j83d0vcg84mjicirzqhn988wi8gps42r"; depends=[fda ggplot2 MASS plotly tmvtnorm]; }; dfvad = derive2 { name="dfvad"; version="0.3.0"; sha256="1n6hwpgnpd8vlv187ajl6js8z3yvl60h87q3kzgi9hvn9v73ip5z"; depends=[]; }; dga = derive2 { name="dga"; version="1.2"; sha256="13mfampnghcs5xplzq69bw948lqhw561pn54j3gb0ydsg5bm5vmr"; depends=[chron]; }; - dggridR = derive2 { name="dggridR"; version="2.0.4"; sha256="11n07k3fpk6yysy72az68pnkaf6pf8msfzgllsx54hcvgkmg5ac3"; depends=[dplyr ggplot2 Rcpp rgdal sp]; }; dglars = derive2 { name="dglars"; version="2.1.6"; sha256="13bnvinqgpmkisjri0sjsyzsh9nqplpry3n3galkv8dqhgpncq4w"; depends=[Matrix]; }; - dglm = derive2 { name="dglm"; version="1.8.3"; sha256="0vj4vddqcrjzgqsi6zsxm22gj5pa5dm50wcxip4vi8kbwxaahnaj"; depends=[statmod]; }; + dglm = derive2 { name="dglm"; version="1.8.4"; sha256="09b74s7xdqv6y2qrlk67c7nfi7sw6azmpyvnan2rpbvxqlky9xgd"; depends=[statmod]; }; dgmb = derive2 { name="dgmb"; version="1.2"; sha256="1r5md917wipx78n63x87fpvsc3h87c68cpacrrs9dhss199p1a5k"; depends=[abind MASS]; }; dgodata = derive2 { name="dgodata"; version="0.0.2"; sha256="03cyiig8pn7fdkrkrd29cwy5g63bp57bpl9jmdxfi03smngzbz0m"; depends=[]; }; dgof = derive2 { name="dgof"; version="1.2"; sha256="02qnb3i131hx05k8l5n3xbl5sqmmc2fh19bsgcacgj8ixs4wyjvi"; depends=[]; }; @@ -7117,34 +7394,36 @@ in with self; { diagis = derive2 { name="diagis"; version="0.1.5"; sha256="1vjj27nn1fjx7wpqpn5x7pir4kd7b4pz9y6mz8a4jby9imc5ypnk"; depends=[coda ggplot2 gridExtra Rcpp RcppArmadillo]; }; diagmeta = derive2 { name="diagmeta"; version="0.4-0"; sha256="1z7h1sxcqn53121m33d2w196lyzkrgj1afc8i8h9iab99fgqvpk7"; depends=[lme4 meta]; }; diagonals = derive2 { name="diagonals"; version="5.2.0"; sha256="0la1w9frnz5znljzcs9np4cn32rhb6zw6bc1cbnfq8n8nnrviy10"; depends=[]; }; - diagram = derive2 { name="diagram"; version="1.6.4"; sha256="0f6ffprn5k0ir1s7m9s7izc64aa17r3gnygagz5bihrlsvawaavw"; depends=[shape]; }; + diagram = derive2 { name="diagram"; version="1.6.5"; sha256="1r3lyl0h7mk9cfg8smr3jydfkjdawaphnxibkxfjqa7029vkxh79"; depends=[shape]; }; dialr = derive2 { name="dialr"; version="0.3.2"; sha256="0b0dbk25j5ixwn8gxf651bj2akjcy1rjr3c191h8wddn9y99ip06"; depends=[dialrjars rJava]; }; dialrjars = derive2 { name="dialrjars"; version="8.12.6"; sha256="10sbhm8n48d2d0php3cm6yx5cssr2gk34pplvi9adv662214pmhx"; depends=[rJava]; }; - dials = derive2 { name="dials"; version="0.0.8"; sha256="0jxmlcy20y57chflx91fqz6c4pbdckzr7jirq4s72vp723avrr4p"; depends=[DiceDesign dplyr glue purrr rlang scales tibble vctrs withr]; }; + dials = derive2 { name="dials"; version="0.0.9"; sha256="0g9wj2py4wz703rh4p7hk8qxqnkm7zyrypv4qz4vaqziazjsmxks"; depends=[DiceDesign dplyr glue purrr rlang scales tibble vctrs withr]; }; diaplt = derive2 { name="diaplt"; version="1.3.0"; sha256="1kkqhkv3s8rrpqd05jidjdnqmlnb3s9f8rr34rfqj7k4nh0qzzcz"; depends=[]; }; + diathor = derive2 { name="diathor"; version="0.0.1"; sha256="1p9mx2ckz1l0fc9wman6m5mxn2inbv4qvqb4i0ab4j7a5nchz4l4"; depends=[ggplot2 stringdist tidyr vegan]; }; dice = derive2 { name="dice"; version="1.2"; sha256="0gic7lqnsdmwv3dbzwwmcwdfyfqlq8kpr2pciqphd1j2ligzwl3s"; depends=[gtools]; }; diceR = derive2 { name="diceR"; version="1.0.0"; sha256="0x0ck76qx0w35pmbbalm8xqrscc4nhvcnzwk9viczn8qh9km7xq6"; depends=[abind assertthat class clue clusterCrit clValid dplyr ggplot2 infotheo klaR magrittr mclust NMF purrr RankAggreg Rcpp stringr tibble tidyr yardstick]; }; dichromat = derive2 { name="dichromat"; version="2.0-0"; sha256="1l8db1nk29ccqg3mkbafvfiw0775iq4gapysf88xq2zp6spiw59i"; depends=[]; }; dicionariosIBGE = derive2 { name="dicionariosIBGE"; version="1.6"; sha256="1rss1ydhcn6sma2lmlpq6s0h3dglwc20w499x1jzkcjnzc1rc7gl"; depends=[]; }; - did = derive2 { name="did"; version="1.2.3"; sha256="05xc41491mq0v9gm841m8l3cdjhjip3z1aqjqaqpaz05rwp3bngx"; depends=[BMisc ggplot2 gridExtra knitr MASS pbapply]; }; + did = derive2 { name="did"; version="2.0.0"; sha256="11jfdh2c31dynajahrs0rncl8s8gb3lcdah0a0jvrsj5dh5m4yms"; depends=[BMisc DRDID ggplot2 ggpubr knitr Matrix pbapply]; }; didrooRFM = derive2 { name="didrooRFM"; version="1.0.0"; sha256="12clfnbm56jwldw0afb0nb0argnd97mx7369jiywhxy0p4xqibqq"; depends=[dplyr]; }; dief = derive2 { name="dief"; version="1.2"; sha256="1i4icdfqvw7imaj1fh392zmzfyz8aqlv9s5naqxm1pm0lqfxl6ca"; depends=[flux fmsb ggplot2 plyr]; }; dielectric = derive2 { name="dielectric"; version="0.2.3"; sha256="1p1c0w7a67zxp1cb99yinylk5r1v89mmpfybcy94ydydhydbhivk"; depends=[]; }; dietr = derive2 { name="dietr"; version="1.1.0"; sha256="0mfp1zqmx34q09k5nbx3nlra06jpd9sym4avafxkaqsxd92avrcm"; depends=[rfishbase]; }; diezeit = derive2 { name="diezeit"; version="0.1-0"; sha256="0rq1k08byvqn99wpql7drnrcxlzcqrcxixh7bczbc8dv1hhsgk9i"; depends=[brew httr jsonlite]; }; - difNLR = derive2 { name="difNLR"; version="1.3.3"; sha256="0r6h0rm0g1719qv2xjmynkvgb1vd3zcbrbkjjd1x8ry5gc58gxk2"; depends=[CTT ggplot2 msm nnet plyr reshape2 VGAM]; }; + difNLR = derive2 { name="difNLR"; version="1.3.5"; sha256="0yhxgz3gdksxmi24l2jqg0kbjpi3rxwxi42aga38l7hhxzxjjxyd"; depends=[CTT ggplot2 msm nnet plyr reshape2 VGAM]; }; difR = derive2 { name="difR"; version="5.1"; sha256="1cd5kaal5mjrbj1l9ki2wbqasdxphgc2yhaf4xwgbh1nr2zkhr02"; depends=[deltaPlotR lme4 ltm mirt]; }; difconet = derive2 { name="difconet"; version="1.0-4"; sha256="0cjadi4mnpfmy18vyp0dw55mnhs0zddf51w59gvq6gszk145z3bq"; depends=[data_table gplots mvtnorm stringr]; }; diffEnrich = derive2 { name="diffEnrich"; version="0.1.1"; sha256="19bq2frd2h8gh6mdy3pcwd54zzv170c0m1m3wnp5c4gadb9424qf"; depends=[dplyr ggnewscale ggplot2 here reshape2 rlang stringr]; }; diffIRT = derive2 { name="diffIRT"; version="1.5"; sha256="0kip6wz9l9q80qsqwf32pwz7d9vqin6dgfwf0nxlrlzf8xjsxgim"; depends=[statmod]; }; diffMeshGP = derive2 { name="diffMeshGP"; version="0.1.0"; sha256="1dc37hxh3fi27gw11kij57j78p87bza77s82niagdv6dqhldj5a4"; depends=[]; }; + diffcor = derive2 { name="diffcor"; version="0.6.2"; sha256="0p56p7740f8dnnb60zmh94pmq2pcgp70m88hz0029ai4wwsd4llr"; depends=[]; }; diffdepprop = derive2 { name="diffdepprop"; version="0.1-9"; sha256="0mgrm1isr26v2mcm6fkzc7443ji00vpnqmw4zngx81n7442b3cl2"; depends=[gee PropCIs rootSolve]; }; diffdf = derive2 { name="diffdf"; version="1.0.4"; sha256="03cr0gvspchdj49kiggsm6i9h5d9z07aswggj4n46lnyz52ihivj"; depends=[tibble]; }; diffeR = derive2 { name="diffeR"; version="0.0-6"; sha256="0ivdcfirs3jbd6m3rryq590szkhplm2kr9chjgcgd88ar5nrqfg7"; depends=[ggplot2 raster reshape2 rgdal]; }; diffee = derive2 { name="diffee"; version="1.1.0"; sha256="01lb1prz70mxgymhhsvx48kbfy69xyyaabsmfhf28af9wfb89662"; depends=[igraph pcaPP]; }; - diffeqr = derive2 { name="diffeqr"; version="0.1.3"; sha256="1696bxh916688zlfxbm6jaqk245xw51ar7rqz7m2nla0ibka86sj"; depends=[JuliaCall stringr]; }; + diffeqr = derive2 { name="diffeqr"; version="1.0.0"; sha256="13ingj2afi2ckgqslk3jqgnqas5crwwdbmkv811ap2ys4cxka26p"; depends=[JuliaCall stringr]; }; diffman = derive2 { name="diffman"; version="0.1.1"; sha256="08b4kqxfg8pmyl2xg8flb581s9wnkdcy5rrmrxp8a89y265qmirx"; depends=[data_table dplyr igraph Matrix progress Rcpp sf tidyverse]; }; - diffobj = derive2 { name="diffobj"; version="0.3.0"; sha256="12kij8qjr3qv6fagyn35vrrmc5hy3g11r6gmgkgi58971cylrj6m"; depends=[crayon]; }; + diffobj = derive2 { name="diffobj"; version="0.3.2"; sha256="0v18zz14g8ppzmj1d997rdmsfh327ml4wvpmfx168lravdsk5ym2"; depends=[crayon]; }; diffpriv = derive2 { name="diffpriv"; version="0.4.2"; sha256="12q2v93369bshid83rsy1csbr9ay6rfpd8zdxm12zi7py3f9sjs8"; depends=[gsl]; }; diffr = derive2 { name="diffr"; version="0.1"; sha256="0ydwnpyzirynffsnvip667y0jqzy7yfqlfpqhb38xvmd9rmwfbp8"; depends=[htmlwidgets]; }; diffrprojects = derive2 { name="diffrprojects"; version="0.1.14"; sha256="1mnqf5zs1w8dx9y5iwn4blyzb9j60ayzc04zxj5l8804nd527n25"; depends=[dplyr hellno magrittr R6 Rcpp RSQLite rtext stringb stringdist]; }; @@ -7152,24 +7431,28 @@ in with self; { diffusion = derive2 { name="diffusion"; version="0.2.7"; sha256="1j9s9vw5sc4k956bk4yp3bf4fnp7lhhkwcvlzvsh1w4dyaj8l35h"; depends=[dfoptim nloptr systemfit]; }; diffusionMap = derive2 { name="diffusionMap"; version="1.2.0"; sha256="1rvk7069brlm1s9kqj4c31mwwr3mw4hmhay95cjjjfmw5xclff2j"; depends=[igraph Matrix scatterplot3d]; }; diffusr = derive2 { name="diffusr"; version="0.1.4"; sha256="1f3h387kblw1xzdnxphwgfl1n7f6i07kk7kfslvbfxkalbish6ii"; depends=[igraph Rcpp RcppEigen]; }; - digest = derive2 { name="digest"; version="0.6.25"; sha256="1r9dkq0kxkps54gkmgcdngsd068p054va2vhnqhs5jmwp2vsvk0m"; depends=[]; }; + diffviewer = derive2 { name="diffviewer"; version="0.1.0"; sha256="1z6ri24sjqkm2rvih9ysx019pwpd1hv15rs96k4qqdspl0fms5a7"; depends=[htmlwidgets jsonlite]; }; + digest = derive2 { name="digest"; version="0.6.27"; sha256="0gr503pinailfglpfbzxprqw7w1jla8jr9nl856a4zch498zg1gl"; depends=[]; }; digitalPCR = derive2 { name="digitalPCR"; version="1.1.0"; sha256="0hwqq84yr1hnvf4bygc5425887dhqjjjyy1ils71iavcal04s8pb"; depends=[]; }; digitize = derive2 { name="digitize"; version="0.0.4"; sha256="1qw4x4z9vrs79sd9b2daw668nc6nvjl4qhayfqmd87yxa2ydv6x0"; depends=[readbitmap]; }; dils = derive2 { name="dils"; version="0.8.1"; sha256="1q6ba9j14hzf7xy895mzxc6n9yjgind55jf350iqscwzxf7ynp33"; depends=[igraph Rcpp]; }; dimRed = derive2 { name="dimRed"; version="0.2.3"; sha256="110d6y83ib1nfpxzmvkvb3fn3brskwkdbsk4dqrdrswrd4znxrg6"; depends=[DRR magrittr]; }; - dimensionsR = derive2 { name="dimensionsR"; version="0.0.1"; sha256="1g0jwf3lvv3zaarrcvqh3a8fgzm4p8d7g73hqg29lgmb6q8shb8d"; depends=[httr jsonlite]; }; + dimensionsR = derive2 { name="dimensionsR"; version="0.0.2"; sha256="1g9yjrq7xnqh427kzmhhmdavykzxidv51i2wx2w0kwhl6fqdd2fk"; depends=[httr jsonlite]; }; dina = derive2 { name="dina"; version="2.0.0"; sha256="1sq7998xc5qhvd8clc8r32ch7axinh2a2dc7i1w2p148wv130yhd"; depends=[Rcpp RcppArmadillo rgen simcdm]; }; dinamic = derive2 { name="dinamic"; version="1.0"; sha256="0mx72q83bbwm10ayr3f1dzwr5wgz7gclw7rh39yyh95slg237nzr"; depends=[]; }; dineq = derive2 { name="dineq"; version="0.1.0"; sha256="1xrhrdc970f7hm9xng9z7xmshnmmz89cn3gmnyabzprx44ccr9sl"; depends=[boot Hmisc]; }; dint = derive2 { name="dint"; version="2.1.3"; sha256="0nxppn7gx4sjwn7jns5bwbqfid3jkbsx2lxi0rjdkbsawy77fc85"; depends=[]; }; - dipsaus = derive2 { name="dipsaus"; version="0.1.0"; sha256="0rf8sjwarmyv39awviswj9mqjmb4h2a39lm55zcwfm0in10hrmnr"; depends=[base64enc base64url cli digest fastmap future future_apply jsonlite progressr R6 Rcpp RcppParallel rlang rstudioapi shiny startup stringr synchronicity]; }; + diproperm = derive2 { name="diproperm"; version="0.1.0"; sha256="0vk4c64nfp5km6xnpbw0x4mxnlkqa1hi80pa5lcmimgjymqm56sa"; depends=[dplyr DWDLargeR ggplot2 gridExtra lemon Matrix sampling SparseM usethis]; }; + dipsaus = derive2 { name="dipsaus"; version="0.1.1"; sha256="174fkbv22ncb806f7jhyrxc70issly3xma80gzqf2ghp9jsk41n0"; depends=[base64enc base64url cli digest fastmap future future_apply jsonlite progressr R6 Rcpp RcppParallel rlang rstudioapi shiny startup stringr synchronicity]; }; diptest = derive2 { name="diptest"; version="0.75-7"; sha256="0rcgycgp0bf8vhga1wwgfcz3pqs5l26hgzsgf2f97dwfna40i1p1"; depends=[]; }; - directPA = derive2 { name="directPA"; version="1.4"; sha256="0rbdygdslr2gvg4mvnp09lc9rv0sg9jwdf5a5ks50v67n25x6y5d"; depends=[calibrate rgl]; }; + dipw = derive2 { name="dipw"; version="0.1.0"; sha256="0nxjwiffi1ivafzha3c35kjk36ai7na0nbfl6x3gpsi2km7b84nd"; depends=[glmnet Matrix Rmosek]; }; + directPA = derive2 { name="directPA"; version="1.5"; sha256="0k66x64fi26zlm82v59ya7x6l7ba3hpa5v9dq2ykb20a8zl6spla"; depends=[calibrate plotly]; }; directlabels = derive2 { name="directlabels"; version="2020.6.17"; sha256="1b6v206kizz5rjw03chjvn40a7cqihjpk80h1h79z2x27hp1qi3f"; depends=[quadprog]; }; directotree = derive2 { name="directotree"; version="1.0.0"; sha256="1yv703mb3fnvjxr2rrxvb8x869hbbjx4l94qbbsmy0ssknayq60y"; depends=[collapsibleTree data_tree]; }; dirichletprocess = derive2 { name="dirichletprocess"; version="0.4.0"; sha256="1gspaynxq5czvnpni57swcqqy17lryjlh3cn9x0mghl527rkbpna"; depends=[ggplot2 gtools mvtnorm]; }; dirmcmc = derive2 { name="dirmcmc"; version="1.3.3"; sha256="117p3jvinmha7a2phcpzq38ig05kcranp15xbxqvv0cgh3c95fjr"; depends=[mcmcse]; }; dirmult = derive2 { name="dirmult"; version="0.1.3-4"; sha256="1r9bhw1z0c1cgfv7jc0pvdx3fpnwplkxwz8j8jjvw14zyx803rnz"; depends=[]; }; + disaggR = derive2 { name="disaggR"; version="0.1.11"; sha256="1gcckjjbhi83hrx8y5r5nqlh93hakpq6friiz8p5gsngvsnb1k3l"; depends=[ggplot2 Rcpp]; }; disaggregation = derive2 { name="disaggregation"; version="0.1.3"; sha256="04wmwwhmcgi1cdr8iyhilsphpzb7r5xs04vhqx5z01y7cgardivx"; depends=[cowplot doParallel dplyr foreach ggplot2 maptools Matrix raster RcppEigen rgdal rgeos sp sparseMVN splancs TMB]; }; discSurv = derive2 { name="discSurv"; version="1.4.1"; sha256="0xi016ah8xc8bv92qvyslvx30anncrki49ccg3qw79yh5vzns1wk"; depends=[data_table functional mgcv mvtnorm]; }; discfrail = derive2 { name="discfrail"; version="0.1"; sha256="1ll8c0fwwmz2yw8w582422r8bk9lr1570d7m7w2n1flrnqpqmk8j"; depends=[Matrix numDeriv survival]; }; @@ -7179,19 +7462,22 @@ in with self; { disclapmix = derive2 { name="disclapmix"; version="1.7.3"; sha256="0hh20ff3szh9s9r1hdymk73ysn0v5lh2gfzgqpvfvdhcc5z8xjk7"; depends=[cluster disclap MASS Rcpp RcppProgress]; }; discnorm = derive2 { name="discnorm"; version="0.1.0"; sha256="00dkdxvj0fmlmr9l34ajvfv1jzlnyr9sdnnpgik8lhcj5a7h8l6f"; depends=[arules lavaan MASS pbivnorm psych sirt]; }; disco = derive2 { name="disco"; version="0.6"; sha256="1abvhf0yb4mw02j1krjb7q68jpwdnl2narcalf3vkjcbflcp76z3"; depends=[ggplot2 RColorBrewer tmod]; }; - discord = derive2 { name="discord"; version="0.1"; sha256="0nrjpl7l9lzkn92fwzaj3vh8zv2b6706gnh5c4zalkld0xac3c23"; depends=[dplyr]; }; - discourseGT = derive2 { name="discourseGT"; version="1.0.0"; sha256="1faq344prjmya13jxpxfdq1vh1gqkssjmsq62i8lhmk8kwkp6nax"; depends=[GGally ggplot2 ggpubr igraph network]; }; + discord = derive2 { name="discord"; version="1.0.0"; sha256="1rxmc8jzifdyn8gf5z3xg5bfk9jv961dx0fcjf3axmzbw54h5s09"; depends=[broom dplyr janitor magrittr purrr rlang]; }; + discourseGT = derive2 { name="discourseGT"; version="1.1.2"; sha256="01f24n2ndjcjigxd61yhgrwq4c4ydlma45vviymavmpmyj0s9c48"; depends=[dplyr GGally ggplot2 ggpubr ggrepel igraph network]; }; discoveR = derive2 { name="discoveR"; version="1.2.9"; sha256="0zvhg9vc5bawkfsf7sxky4zddyyjqrl741sjhlqzzmlwid7481p5"; depends=[colourpicker DT factoextra ggplot2 rmarkdown rstudioapi shiny shinyAce shinydashboard shinydashboardPlus shinyjs stringi zip]; }; + discoverableresearch = derive2 { name="discoverableresearch"; version="0.0.1"; sha256="0gw9fpmsqj1cj2qr7hqr86j28kjn3qfykdkkxrazj3dnv981xhhy"; depends=[dplyr magrittr ngram readr stopwords stringdist stringi synthesisr tm]; }; discreteMTP = derive2 { name="discreteMTP"; version="0.1-2"; sha256="13qsf1kc3rph0kkdkz31qj072www5dwjyk73lfpy141rzhcn1v1x"; depends=[]; }; discreteRV = derive2 { name="discreteRV"; version="1.2.2"; sha256="1lhf67cccr96zl3j1sysh2bv0pbgvkbgjdzm35fvrdm7k74ypjsi"; depends=[MASS plyr]; }; discretecdAlgorithm = derive2 { name="discretecdAlgorithm"; version="0.0.7"; sha256="01x3qfjj7dwv0m9q8zdhfrpbj9ys9y5p7d3z8ywjrqy4jw88svjs"; depends=[igraph Rcpp RcppEigen sparsebnUtils]; }; discretization = derive2 { name="discretization"; version="1.0-1"; sha256="00vq2qsssnvgpx7ihbi9wcafpb29rgv01r06fwqf9nmv5hpwqbmp"; depends=[]; }; - discrim = derive2 { name="discrim"; version="0.1.0"; sha256="16mmx499jb9ys3qn9qzg58w0v6rj2ndsgr62qv5i5jxl31sdj58w"; depends=[dials parsnip purrr rlang tibble withr]; }; + discrim = derive2 { name="discrim"; version="0.1.1"; sha256="1la96y8wy04p414njnzjsk5zx199qdix5hqbb0pv5k74mr1g2cqv"; depends=[dials parsnip purrr rlang tibble withr]; }; + disdat = derive2 { name="disdat"; version="1.0-0"; sha256="1q8v40m0vjni3kx0f04qb99adxcx783p9lfixvvq6viz13v1ygcw"; depends=[]; }; diseasemapping = derive2 { name="diseasemapping"; version="1.4.9"; sha256="0mhi3v52s57pd85li27cb5krvy40icghkayalhihg5k7zxqkgssv"; depends=[sp]; }; + diseq = derive2 { name="diseq"; version="0.0.14"; sha256="1h54crj6w0q9zwwrf7rgr6d9blmy3i9agq03dwzvzmpymgd5m1j7"; depends=[bbmle dplyr magrittr MASS rlang systemfit tibble tidyr]; }; disk_frame = derive2 { name="disk.frame"; version="0.3.7"; sha256="12g9anjy04km8iyypf56nsq6v8mqfp99j0gfi9v8pc3sd6k9vnfn"; depends=[benchmarkme bigreadr bit64 crayon data_table dplyr fs fst furrr future future_apply globals glue jsonlite pryr purrr Rcpp rlang stringr]; }; diskImageR = derive2 { name="diskImageR"; version="1.0.0"; sha256="1r19k5fdjn6vkn11p5df77fnxfqaz3nciiaai0f3pr2bgpfppzka"; depends=[subplex zoo]; }; - dismo = derive2 { name="dismo"; version="1.1-4"; sha256="1j4pzbyvn8msi3k2y79nc6pqlrald46168ibznjwrr6rdiqhy4gj"; depends=[raster sp]; }; - dispRity = derive2 { name="dispRity"; version="1.4.1"; sha256="17q8w25dm7rmnh42rwpiygbpsqqpz462snc28zrabakjm16gdd4d"; depends=[ade4 ape castor Claddis geiger geometry geoscale mnormt phangorn phyclust vegan]; }; + dismo = derive2 { name="dismo"; version="1.3-3"; sha256="1jj9d78f251bxgrwbv1ycn677qnhvl40bfan12x8fhlaq4d36rgx"; depends=[raster Rcpp sp]; }; + dispRity = derive2 { name="dispRity"; version="1.5.0"; sha256="0synpjy8n7kzmv9drszj31067smi5s8672lvf07k02qkdhavhqgh"; depends=[ade4 ape castor Claddis geiger geometry geoscale mnormt phangorn phyclust scales vegan]; }; disparityfilter = derive2 { name="disparityfilter"; version="2.2.3"; sha256="0dkk3qws631mf0g02di5rsrvh5954cykysyri0g8aqgik0j9dg06"; depends=[igraph]; }; displayHTS = derive2 { name="displayHTS"; version="1.0"; sha256="0mqfdyvn2c5c3204ykyq29ydldsq0kb3a1d7mrzqr7cvrj1ahlqa"; depends=[]; }; dispmod = derive2 { name="dispmod"; version="1.2"; sha256="16r6is0pchzc9mxpz0c44f72j76vsh3j9damalcxajrha06dkdq4"; depends=[]; }; @@ -7207,12 +7493,12 @@ in with self; { distdichoR = derive2 { name="distdichoR"; version="0.1-1"; sha256="0v19m3n1jgipg65yrv75rm4v27b5aq58cbsmbp7lxvfxmj5ra328"; depends=[boot emmeans nlme sn]; }; distdrawr = derive2 { name="distdrawr"; version="0.1.3"; sha256="1c8wznfml8k5gwyanfg7rqr22a96xx8rgm7f4z3bv5gsgsbps49y"; depends=[]; }; distfree_cr = derive2 { name="distfree.cr"; version="1.5.1"; sha256="0h7cywxnasxmqnl9f2f9wp4viwvv72hjx2drr78prqy3nn3lvqwx"; depends=[]; }; - distill = derive2 { name="distill"; version="0.8"; sha256="0crih4x2745aq0w2fqrzcnbw82yi2pxcx8j2hv0fi5yfvgjjsi86"; depends=[base64enc bookdown digest downloader htmltools jsonlite knitr lubridate mime openssl png progress rmarkdown rprojroot rstudioapi stringr whisker xfun xml2 yaml]; }; - distillery = derive2 { name="distillery"; version="1.1"; sha256="15qhvhg6wmvlxrvvw70sk8pv76z5pd04vyasgczvxa0599ih7bzh"; depends=[]; }; + distill = derive2 { name="distill"; version="1.1"; sha256="14j08i960kkj03p6qv0q6x68fm4zahzj7l88ada257n1ywxvbawa"; depends=[base64enc bookdown digest downlit htmltools jsonlite knitr lubridate mime openssl png rmarkdown rprojroot rstudioapi stringr whisker xfun xml2 yaml]; }; + distillery = derive2 { name="distillery"; version="1.2"; sha256="10nhh9p0hp294pp4aav0y0zsmir2qbn05sf3k52rmzmm36q2kc8y"; depends=[]; }; disto = derive2 { name="disto"; version="0.2.0"; sha256="09pafy8y1ifgglqmal32dy34acx06ypsq2bgwsn6fjiqr9kw401j"; depends=[assertthat broom dplyr factoextra fastcluster fastmatch ggplot2 pbapply proxy tidyr]; }; distory = derive2 { name="distory"; version="1.4.4"; sha256="1ljrs91h4v1h5lb295hjki8bmra2lg3d1bn5x731pnv43pf3ck06"; depends=[ape]; }; distr = derive2 { name="distr"; version="2.8.0"; sha256="1dyff4m33xmw6hxb3jxzr8vvajg3qz3rfcrfxjxwsswlddfz0zdv"; depends=[MASS sfsmisc startupmsg]; }; - distr6 = derive2 { name="distr6"; version="1.4.2"; sha256="13l7rg1c2lj1yrnzm813cma1c7hj23dbmlf0cv7bmwh48m3xjdck"; depends=[checkmate data_table R6 R62S3 Rcpp set6]; }; + distr6 = derive2 { name="distr6"; version="1.4.8"; sha256="1rkr7cb7mgyykvkr12mkq4j5ipx7sjfjfwfic0l20xzw8p5x1gfy"; depends=[checkmate data_table R6 R62S3 Rcpp set6]; }; distrDoc = derive2 { name="distrDoc"; version="2.8.0"; sha256="1iq2gbfbsf3h279yh3fnqsi39gdw15vc6r1g33xcb8kgmmqmvf0p"; depends=[distr distrEx distrMod distrSim distrTeach distrTEst MASS RandVar startupmsg]; }; distrEllipse = derive2 { name="distrEllipse"; version="2.8.0"; sha256="1ymfa8xpgs8zjp4psiwmll5z0vji496fivxmcavspzxy31cw70wx"; depends=[distr distrEx distrSim mvtnorm setRNG startupmsg]; }; distrEx = derive2 { name="distrEx"; version="2.8.0"; sha256="1gwhsnlrnzyp2x97d9wfdy5pa9z3q5il934wjv4kxs9wsvkwsr5h"; depends=[distr startupmsg]; }; @@ -7222,64 +7508,64 @@ in with self; { distrTEst = derive2 { name="distrTEst"; version="2.8.0"; sha256="06rdcwfgbhc81zqisg414nj0kji59xvhm782b63hk54a8b2zwhh5"; depends=[distrSim setRNG startupmsg]; }; distrTeach = derive2 { name="distrTeach"; version="2.8.0"; sha256="1qgkd4yipk29q8k334fz97n6dxlxnsback7v5a05m6ragc37wzag"; depends=[distr distrEx startupmsg]; }; distreg_vis = derive2 { name="distreg.vis"; version="1.7.0"; sha256="1rfv4ifhai6ig0x2xwca1pjin8vqp8k8jvbmj45rxdzg8b384zly"; depends=[bamlss betareg formatR gamlss gamlss_dist ggplot2 magrittr rhandsontable shiny]; }; - distributional = derive2 { name="distributional"; version="0.2.0"; sha256="1l192mc7fwyzvm6ykbbnv0rvk6b29wxsgnshv4zfi9dgz5hwgj4l"; depends=[digest ellipsis farver generics ggplot2 lifecycle numDeriv rlang scales vctrs]; }; + distributional = derive2 { name="distributional"; version="0.2.1"; sha256="0nxiiyr2nk80ac9x0fz2p3b8izrrmah708k9gmkihbi4bnspqhqx"; depends=[digest ellipsis farver generics ggplot2 lifecycle numDeriv rlang scales vctrs]; }; distributions3 = derive2 { name="distributions3"; version="0.1.1"; sha256="06wfyn37x2r00szfzgjpcxy5fhx72p2pf44llpymcsjyp8k790na"; depends=[ellipsis glue]; }; distributionsrd = derive2 { name="distributionsrd"; version="0.0.6"; sha256="0ykzxcxh5l9l5z3546iqlllryw2xyixz1hiynx19k8bsn8k7dxyp"; depends=[flexmix modeltools Rdpack]; }; + distro = derive2 { name="distro"; version="0.1.0"; sha256="03b8mkjhxxh93675mmj443a83mgfwhkdar7dfbf3agf6aqnadn2g"; depends=[]; }; distrom = derive2 { name="distrom"; version="1.0"; sha256="0wylw7yaylf5j8cy8g45jrw91mwx6w0i7vf9ysnj5kxyznq1gl6y"; depends=[gamlr Matrix]; }; distrr = derive2 { name="distrr"; version="0.0.6"; sha256="04lhrc92y6dqnfpqlmynjvn2dndzkknnvwsr5pf73dfpgv7n3s1f"; depends=[dplyr magrittr rlang tidyr]; }; disttools = derive2 { name="disttools"; version="0.1.7"; sha256="1wdcggphyxy58zyqdsyz2z3q4rb69wady63l79s1ivjwzgjrsxmi"; depends=[]; }; - dittodb = derive2 { name="dittodb"; version="0.1.1"; sha256="16lp6h6612lk8cp65wm9ajbmr441xn7qhp9cff9kpy223zkdxfsf"; depends=[DBI digest glue testthat]; }; + dittodb = derive2 { name="dittodb"; version="0.1.3"; sha256="0wkiy3vgqrpmc34hxw30rfgg01d941gxz8fr2h9i9gvddnxnywdc"; depends=[DBI digest glue lifecycle testthat]; }; divDyn = derive2 { name="divDyn"; version="0.8.0"; sha256="11crhrcx38kn5d8ap2ijrn305369adg73iz5i7a4a7gmgizmmwyd"; depends=[Rcpp]; }; divagis = derive2 { name="divagis"; version="1.0.0"; sha256="1kcz7i3h9xxpqhlq0rl08pgcwd16ygjjmm0jjv9knn2ggc3j1jzz"; depends=[rgdal sp]; }; - diveMove = derive2 { name="diveMove"; version="1.4.6"; sha256="1208syawp3g4w7jn17zlhqbmpcgbni1b8xpsjh6ml0b1dmb40blj"; depends=[geosphere KernSmooth quantreg uniReg]; }; + diveMove = derive2 { name="diveMove"; version="1.5.2"; sha256="10dj4ipd2yq1yg1x80vqrhzsgcn612jly85ciilyxl77479xj0x5"; depends=[geosphere KernSmooth plotly quantreg uniReg]; }; diveRsity = derive2 { name="diveRsity"; version="1.9.90"; sha256="11pfq3syvjmfwfimjc2jnlprcnynvargr4yjd8h0aa6qzgdrrx5q"; depends=[ggplot2 qgraph Rcpp shiny]; }; diverge = derive2 { name="diverge"; version="1.0.4"; sha256="18abm3348rkd4k2hyf8nykpis1m0ga16d4nprdc5xjj2ciaf2xa5"; depends=[truncnorm]; }; diverse = derive2 { name="diverse"; version="0.1.5"; sha256="10kmx3qv58xhqs1icsxqq0y0cm8y2hx9ysb65brd3hhg33alzvk3"; depends=[foreign proxy reshape2]; }; - diversitree = derive2 { name="diversitree"; version="0.9-13"; sha256="00vi4klywi35hd170ksjv3xja3hqqbkcidcnrrlpgv4179k0azix"; depends=[ape deSolve Rcpp subplex]; }; + diversitree = derive2 { name="diversitree"; version="0.9-15"; sha256="1sk3sgn5hi04978s5s7gy6pzp28g3v9rglmiamlgs96c9wyyyff7"; depends=[ape deSolve Rcpp subplex]; }; diversityForest = derive2 { name="diversityForest"; version="0.2.0"; sha256="16qwmz6fmh7jxypp5myj55fx6fwzzm2mq59v30spp2c2zd89aya7"; depends=[Matrix Rcpp RcppEigen]; }; - divest = derive2 { name="divest"; version="0.8.2"; sha256="0kzl3niscd88kzlpnx75xx6mk1jkwxwn7gm2a6vnhpvniyyk6rs8"; depends=[Rcpp RNifti]; }; + divest = derive2 { name="divest"; version="0.9.0"; sha256="0cx47xdh8g6b3kbpn22qhs07cak27dc5mjr7d45xjn5qs3xddjh5"; depends=[Rcpp RNifti]; }; divo = derive2 { name="divo"; version="1.0.1"; sha256="06c4kjl6llvvdr2gk480jcmj2abmqwph7x4vk5nflxm7piimvg7v"; depends=[cluster]; }; dixon = derive2 { name="dixon"; version="0.0-6"; sha256="1prvr16a9n7qyaznir2bl7mg6nlvbdv9pk75p3xipzjg36hwyam8"; depends=[spatstat splancs]; }; dixonTest = derive2 { name="dixonTest"; version="1.0.2"; sha256="04d66nf47mllk5madqn6k36vc1gq2syp7kbif8cnf6imxr98xx50"; depends=[]; }; - diyar = derive2 { name="diyar"; version="0.1.0"; sha256="0cpxilixbdqzmq8lyh4iilccsjg07x7bl6x93cria0rivm9aqb92"; depends=[dplyr]; }; + diyar = derive2 { name="diyar"; version="0.2.0"; sha256="1vabx0vxb08ybpkidw4fch5sb79b9lhjpxm9sc6x7lywdfj3345w"; depends=[Rfast]; }; dkDNA = derive2 { name="dkDNA"; version="0.1.1"; sha256="0ycyzn5bmhjl5idp0lndffkninpm9n23wrkrzi59ac8z8ghsnhf4"; depends=[]; }; dkanr = derive2 { name="dkanr"; version="0.1.3"; sha256="1zic7qhwq3s9w70zi1f6qyf7pzm69k5a1p5fd4n3z4nbga54njxd"; depends=[assertthat dplyr httr jsonlite purrr stringr tibble]; }; dlbayes = derive2 { name="dlbayes"; version="0.1.0"; sha256="058kkh67npai2ffrjdpjn4pzj8f233znl16nj6yx8wz8lkb17cb0"; depends=[expm GIGrvg glmnet LaplacesDemon MASS]; }; - dlib = derive2 { name="dlib"; version="1.0.3"; sha256="1is8j1gwf22n7yixg40rb6p4mrnbzijwfjl6vsniq8qkyy7z8k32"; depends=[Rcpp]; }; + dlib = derive2 { name="dlib"; version="1.0.3.1"; sha256="1rchl4f3zj0azz8d4n139daba2gz6vnm60jq45vgc9gphk2mrnnb"; depends=[Rcpp]; }; dlm = derive2 { name="dlm"; version="1.1-5"; sha256="1aksm66sfa7ipl5xgs4j5giac7q2m744wjl40mva56xn6i674h4r"; depends=[]; }; - dlmap = derive2 { name="dlmap"; version="1.13"; sha256="0s6wlkggkm3qndwyvw72xv1n0mcjb7ss3ajbq2ll6rv30splq0db"; depends=[ibdreg mgcv nlme qtl wgaim]; }; dlnm = derive2 { name="dlnm"; version="2.4.2"; sha256="1phn8xci456zx3jcjvy99ycki3gkzc4id0c45c37mdddxvk1bwmg"; depends=[mgcv nlme tsModel]; }; - dlookr = derive2 { name="dlookr"; version="0.3.13"; sha256="1i1aiy4v3bvlrz0w0hc5qlv5flqgzbgavqmaql6bc8nz5s9p071s"; depends=[classInt corrplot DMwR dplyr ggplot2 gridExtra kableExtra knitr magrittr mice moments prettydoc purrr RcmdrMisc RColorBrewer rlang rmarkdown rpart smbinning tibble tidyr tidyselect tinytex xtable]; }; + dlookr = derive2 { name="dlookr"; version="0.3.14"; sha256="19aiwky40yj0xv3pwlbndw04d03hzw56zv60lxmzrm3bw1359fx2"; depends=[broom car classInt cli corrplot DMwR dplyr forcats ggplot2 gridExtra kableExtra knitr magrittr mice prettydoc purrr RcmdrMisc RColorBrewer reshape2 rlang rmarkdown rpart smbinning tibble tidyr tidyselect tinytex xtable]; }; dlsem = derive2 { name="dlsem"; version="2.4.6"; sha256="1h3bwqqpfjkl41b2mbfhsj0pi9kri0h0i28wiid6arjrmm87nsf8"; depends=[graph Rgraphviz]; }; dlstats = derive2 { name="dlstats"; version="0.1.3"; sha256="0inij1rzw8i683lyzvnjhfzrng7zx727y9wcijv6ny2fw64cdd6n"; depends=[ggplot2 jsonlite magrittr RColorBrewer scales]; }; - dm = derive2 { name="dm"; version="0.1.6"; sha256="0cc153d5kl9qx2nazc0k85xj5kww63xjkppkj0nj0gag22bsscg7"; depends=[backports cli DBI dplyr ellipsis glue igraph lifecycle magrittr memoise pillar purrr rlang tibble tidyr tidyselect vctrs]; }; + dm = derive2 { name="dm"; version="0.1.9"; sha256="0wla1rccs75igmqakkj9rsb3v0j1v2rax4rxvg9jr6vcrs4dzz7d"; depends=[backports cli DBI dplyr ellipsis glue igraph lifecycle magrittr memoise pillar purrr rlang tibble tidyr tidyselect vctrs]; }; dma = derive2 { name="dma"; version="1.4-0"; sha256="003snr09hazszwqnvjrbv8vyz6ihgcfcfhrlshg451dddn920615"; depends=[MASS]; }; dmacs = derive2 { name="dmacs"; version="0.1.0"; sha256="1prw6h8sj6fcpajg6xwqhi8v5jfl74mbjdjrdy524miw56fh9h0r"; depends=[lavaan MplusAutomation]; }; dmai = derive2 { name="dmai"; version="0.4.0"; sha256="0ma89jl0l598sffpikvjj40f2djjcnjq29k6y1bav4dm2g51qgmq"; depends=[dplyr ggplot2 magrittr stringr tibble tidyr]; }; dmbc = derive2 { name="dmbc"; version="0.4.0"; sha256="1m8zwy18phlxpmlp8rf07d615fjg15gqs5wdfm78d49266032jay"; depends=[abind bayesplot coda ggplot2 ggrepel MCMCpack modeltools pcaPP Rcpp RcppArmadillo RcppProgress robustbase]; }; - dmdScheme = derive2 { name="dmdScheme"; version="1.2"; sha256="13yfpjl6qmvrwvyvymkcp1yppicghwcw1lddz68w6l9ncsjr4fbi"; depends=[digest EML knitr magrittr openxlsx rappdirs readxl rlang rmarkdown stringr writexl xml2 yaml]; }; + dmdScheme = derive2 { name="dmdScheme"; version="1.2.6"; sha256="093v2ypqmk6p23a8arl49c4fd60c8mgg6ns0daikjmp9qdm880aa"; depends=[digest EML knitr magrittr rappdirs readxl rlang rmarkdown stringr writexl xml2 yaml]; }; dml = derive2 { name="dml"; version="1.1.0"; sha256="0z1dalgxh5nhrac49vh60d5awzjylc8b8mn5fk379c324milm59l"; depends=[lfda MASS]; }; dmm = derive2 { name="dmm"; version="2.1-6"; sha256="0y955dlfdpr6shfjwa96p4f9i9z9bq5jahp3k75fzyzyl7d9lvsj"; depends=[MASS Matrix nadiv pls robustbase]; }; dmt = derive2 { name="dmt"; version="0.8.20"; sha256="0rwc8l9k2y46hslsb3y8a1g2yjxalcvp1l3v7jix0c5kz2q7917w"; depends=[MASS Matrix mvtnorm]; }; - dmtools = derive2 { name="dmtools"; version="0.2.4"; sha256="0dyyl5lx4m2nwcvj2xzx12bl6sclsxmkas70k2s9zx4z1zrmsfh0"; depends=[dplyr lubridate magrittr purrr readxl]; }; + dmtools = derive2 { name="dmtools"; version="0.2.6"; sha256="0z77whal18sxmfqalv39w85vnc84c838yh3dp144v7w198n095fy"; depends=[dplyr httr lubridate magrittr progress purrr readxl tibble tidyr]; }; dmutate = derive2 { name="dmutate"; version="0.1.2"; sha256="06gr49j5jz6ns1zydwsqysgkigi2sbm4hdd2jbb82f05rd9spyf3"; depends=[dplyr MASS]; }; dna = derive2 { name="dna"; version="2.1-2"; sha256="0l7i9640yd25cbxd3vbmlsqgk3pi2f7v6g5q0lrgycxl7jla9v1k"; depends=[]; }; - dnapath = derive2 { name="dnapath"; version="0.6.4"; sha256="0vhqpy8ps8id6vv6bdhc80kwnqzwffq1hbc5vxnxr9iqf1a1rg39"; depends=[biomaRt corpcor curl dplyr ggplot2 igraph Rcpp RcppArmadillo Rdpack reactome_db SeqNet tibble]; }; dnet = derive2 { name="dnet"; version="1.1.7"; sha256="05mqgp8x2h6vjf8j9466kpng7bbga134c2y808qgdmjdnv9fcaxc"; depends=[graph igraph Matrix Rgraphviz supraHex]; }; dng = derive2 { name="dng"; version="0.2.1"; sha256="0yi1fs4yvlsy3j128l7s5kwq8mhdd5fr74y2bzj7cjrxi7wgz2hg"; depends=[Rcpp]; }; - dnr = derive2 { name="dnr"; version="0.3.4"; sha256="0hzaa308pppq2cqpb067f3y3nyv1p2xdmgy3dykf90psnn5v011p"; depends=[arm ergm glmnet igraph network sna]; }; - do = derive2 { name="do"; version="1.4.0.0"; sha256="0hcwv8vrn7a1k8f7i9izyc84150jp5rndbzfa1fa8fnn34nb8vb3"; depends=[data_table plyr tmcn]; }; - doBy = derive2 { name="doBy"; version="4.6.7"; sha256="16vg1aa272sfzyqxfb63fyis9hv6g5m3nmxxa6mk1gy0irqnl3jk"; depends=[broom Deriv dplyr ggplot2 magrittr MASS Matrix pbkrtest tibble]; }; - doFuture = derive2 { name="doFuture"; version="0.9.0"; sha256="1sfymhgjph1xrw49dxyc2slxxgal7v4yanklr4zql7r4vqinhk19"; depends=[foreach future globals iterators]; }; - doMC = derive2 { name="doMC"; version="1.3.6"; sha256="1cn9gxavhvjswip8pwvkpi7q6wpzdllcsdjabga8akf55nggqxr9"; depends=[foreach iterators]; }; + dnr = derive2 { name="dnr"; version="0.3.5"; sha256="16s06jvwmvhxgvrmfav1xfszjrn7j2cm4jw5xyx6w5lb5434kzcq"; depends=[arm ergm glmnet igraph network sna]; }; + do = derive2 { name="do"; version="1.6.0.0"; sha256="0iv69vkdcs7mppmq5l0yxn2bq63j479gzya8bg7yhpqyr76lzyfv"; depends=[data_table plyr reshape2 tidyr tidyselect tmcn]; }; + doBy = derive2 { name="doBy"; version="4.6.8"; sha256="0r97kwsj6g87m7shgnjc5c9y71jkhiq4xd9q0s2bxl0vl92qqwvg"; depends=[broom Deriv dplyr ggplot2 magrittr MASS Matrix pbkrtest tibble]; }; + doFuture = derive2 { name="doFuture"; version="0.11.0"; sha256="1r1mdrrrjaj733rgminic4ihkmrn93mx2km26i684dszs3mx32f1"; depends=[foreach future globals iterators]; }; + doMC = derive2 { name="doMC"; version="1.3.7"; sha256="0kdmfhp5m1wisjbfyl9d040jrmjmhcgjb0vdi536g2i9vixb5yny"; depends=[foreach iterators]; }; doMPI = derive2 { name="doMPI"; version="0.2.2"; sha256="0ahwm17p3gq1yvc8v6sr6sb8z7i6zws8d1pf46qynl0gd4amg938"; depends=[foreach iterators Rmpi]; }; - doParallel = derive2 { name="doParallel"; version="1.0.15"; sha256="0vnqbha3gig3awbfvsfx3ni5jir398md1n7xmsb8jihnjsk7xbbi"; depends=[foreach iterators]; }; + doParallel = derive2 { name="doParallel"; version="1.0.16"; sha256="1cjf0mxrxgls5pl7aj22fv9j488craib1wkc9np4f3gkckwjdfzi"; depends=[foreach iterators]; }; doRNG = derive2 { name="doRNG"; version="1.8.2"; sha256="1jff27zzrvd1fd61x2m9468h8xn3s1c9f6wibviy5zdhj5dx9s9k"; depends=[foreach iterators rngtools]; }; doRedis = derive2 { name="doRedis"; version="2.0.0"; sha256="0lw8j339az2dgcrahmkhp7k5dpvy1dalk1sfsjp2hzfhm3xqabc8"; depends=[foreach iterators redux]; }; - doSNOW = derive2 { name="doSNOW"; version="1.0.18"; sha256="0rj72z5505cprh6wykhhiz08l9bmd966srqh2qypwivf321bvrvh"; depends=[foreach iterators snow]; }; + doSNOW = derive2 { name="doSNOW"; version="1.0.19"; sha256="0f07b38cl7s61vwzkyqkzzsic9g4sw9k6ndbxk3g90l4ca0d1ljc"; depends=[foreach iterators snow]; }; dobin = derive2 { name="dobin"; version="1.0.2"; sha256="1vhvwdl7a8bf4q64jz8a6afm3smdn3jgxvs17jjlilarpdazl3p5"; depends=[pracma RANN]; }; dobson = derive2 { name="dobson"; version="0.4"; sha256="0xfn7s3wzrv1md40bdjrnjfiqyxg5c6lrcpnvayjdgrhxq161hhq"; depends=[]; }; - doc2concrete = derive2 { name="doc2concrete"; version="0.4.6"; sha256="1a3j8bm9n40jiahc60wviblw1yry2rgc34jpr5qp54gfpjr1bigm"; depends=[dplyr english ggplot2 glmnet quanteda SnowballC stringr textclean textstem tm]; }; + doc2concrete = derive2 { name="doc2concrete"; version="0.5.0"; sha256="0lcqqvzmab6s30crfvz9y67qx9lw7gywx2nrbbzpksvcz2y3ir7a"; depends=[dplyr english ggplot2 glmnet quanteda SnowballC stringr textclean textstem tm]; }; + doc2vec = derive2 { name="doc2vec"; version="0.1.0"; sha256="03m2ys16n45iz88iw1rva6jc4yxp381bjg8k69f81a71fg013473"; depends=[Rcpp]; }; docdescriptR = derive2 { name="docdescriptR"; version="2020.1.0"; sha256="02sgbzhvjayf39r5lrx3krihzm263fnvwpjqm0jsqrq4d8pps3hb"; depends=[broom DescTools dplyr flextable magrittr nortest officer plotrix Rdpack tictoc]; }; docinfeR = derive2 { name="docinfeR"; version="2020.1.0"; sha256="08xa3f27giad3fikk8jywpm2p843zlb8a9znq3x47x6ivwybfllp"; depends=[broom flextable nortest officer Rdpack tictoc]; }; dockerfiler = derive2 { name="dockerfiler"; version="0.1.3"; sha256="128648s9lj96p3nlxwy4gs108w5kjcg6w48nfx3r52gb8w2z7948"; depends=[attempt glue R6]; }; @@ -7289,30 +7575,31 @@ in with self; { docstring = derive2 { name="docstring"; version="1.0.0"; sha256="19z5frhxbdc5c4vrkckgqbh9mx4d9w1icw8szsw9yadvbg48nlhl"; depends=[roxygen2]; }; docuSignr = derive2 { name="docuSignr"; version="0.0.3"; sha256="0q90z31svbdnvylfr0yj2f0gahvpi089c1d5llvwqy8qc5p9fbqw"; depends=[httr jsonlite magrittr]; }; documair = derive2 { name="documair"; version="0.6-0"; sha256="1pphcbx90n9xn8a7gvfrwzfapwqgpbl3gg2grm7chfxgcp7i99i2"; depends=[]; }; - document = derive2 { name="document"; version="3.2.0"; sha256="0k1sqh9sn9lvv8r05byicrhg07jfnas8h9pyij42pgdvy93rinvy"; depends=[callr checkmate desc rcmdcheck roxygen2 rstudioapi withr]; }; + document = derive2 { name="document"; version="3.3.0"; sha256="13m61a2q044q6iqcg0zjh2xjy530f7igjd3z0832iwks747s9rii"; depends=[callr checkmate desc rcmdcheck roxygen2 rstudioapi withr]; }; documenter = derive2 { name="documenter"; version="0.1.1"; sha256="0y6zrvmb9bhc1ni4v89h9pq5ara8p2v4b35ylasia5s9x1y93mcp"; depends=[htmltools magrittr officer xml2 yaml]; }; docxtools = derive2 { name="docxtools"; version="0.2.2"; sha256="0ds8qy21x7cq9qmnn6gggzf8kxdphq7nf2mx5gqx829zgkripsfq"; depends=[dplyr ggplot2 lubridate purrr rlang stringr tidyr]; }; docxtractr = derive2 { name="docxtractr"; version="0.6.5"; sha256="1kki49g0sfhbx2d4swrkv21akws8ayrsd4h3v148xmzdlsrvhhiw"; depends=[dplyr httr magrittr purrr xml2]; }; dodgr = derive2 { name="dodgr"; version="0.2.7"; sha256="0484bcbgzciwhb5afpcnygqr2pmf7wq9kxm73y137gjwgijqgg0g"; depends=[callr digest magrittr osmdata Rcpp RcppParallel RcppThread]; }; doebioresearch = derive2 { name="doebioresearch"; version="0.1.0"; sha256="1rmvb6pa71frvjszpsjaw3ahm70kyykrq6zfjqk8smgcg397k9pi"; depends=[agricolae]; }; doex = derive2 { name="doex"; version="1.2"; sha256="1r999z30ipa04pgck0hfalqxihb1bj8sdhlkkhf4plb7maaz3qm3"; depends=[]; }; - dominanceanalysis = derive2 { name="dominanceanalysis"; version="1.3.0"; sha256="0850z2ppdgbfwbv8l40ngl00n4mdj4ciky1g918zazd3jrg88s38"; depends=[]; }; + dominanceanalysis = derive2 { name="dominanceanalysis"; version="2.0.0"; sha256="0qxldvlgbysy9j17kb0a9p132a04a4j12h4m0r70zv2752fj24c0"; depends=[]; }; domino = derive2 { name="domino"; version="0.3.1"; sha256="0f67w0z5jy82kgm3l1rji430ayigw30vmmwp3i1nz0xibsx7jxv4"; depends=[]; }; donut = derive2 { name="donut"; version="1.0.1"; sha256="17qiy9j0qm2q2gcysd5717bdl9nmkd7pd5z22pcj3icvxcpssval"; depends=[]; }; - doremi = derive2 { name="doremi"; version="0.1.1"; sha256="1h36sj60l5sd5ybbdyrv0wkr9p18j7iwg111khq0znb71xi5nzp7"; depends=[data_table ggplot2 lme4 lmerTest zoo]; }; - dosearch = derive2 { name="dosearch"; version="1.0.4"; sha256="1hq85jym0plf8hj77bfd623nhyjgfqqzm1w92n3lii3j5lv9vrwg"; depends=[Rcpp]; }; + dosearch = derive2 { name="dosearch"; version="1.0.6"; sha256="0ba3yrnysj29yrk9yah2xms56kg1qnkgajm74waixp8d3qazdfvg"; depends=[dagitty igraph Rcpp]; }; dosedesignR = derive2 { name="dosedesignR"; version="0.2.4"; sha256="0c8rilx4afih457f9gafgijm569g366lp4wms0vhc0f9kgr1z8h3"; depends=[DoseFinding DT ggplot2 lattice latticeExtra shiny shinyjs]; }; dosresmeta = derive2 { name="dosresmeta"; version="2.0.1"; sha256="0qdalzdk7q4wx3vl5f3i64m8cb7vhi4pqzghar32j0a7l6gla04z"; depends=[mvmeta]; }; dostats = derive2 { name="dostats"; version="1.3.2"; sha256="15j9sik9j5pic5wrp0w26xkrhi337xkbikw0k7sa4yfimw6f84w5"; depends=[]; }; dotCall64 = derive2 { name="dotCall64"; version="1.0-0"; sha256="1b8p7m3w0m7bp977c6jz74xkd611cxg11j49yza59k5fp338scb9"; depends=[]; }; dotdot = derive2 { name="dotdot"; version="0.1.0"; sha256="0d8inv2m7pkk6dnv9j9zai4lhghcg656l46d00rhp604rbhzlmw9"; depends=[]; }; dotenv = derive2 { name="dotenv"; version="1.0.2"; sha256="13i8dimrgq9nxmmrxr42pacsiylj6dilwpa8ldnrfp4cl9zgrqas"; depends=[]; }; + dotgen = derive2 { name="dotgen"; version="0.1.0"; sha256="12dvn52ggmkj2q6whi8s2hh9fpg7jcg20bgx32jxzh4cb1zxnksz"; depends=[mvtnorm]; }; dotwhisker = derive2 { name="dotwhisker"; version="0.5.0"; sha256="034pvkc59jdjl27wirgb2cv84ajw5y2if20njzzp87nd4f9bb6br"; depends=[broom dplyr ggplot2 ggstance gtable purrr rlang stringr]; }; doubcens = derive2 { name="doubcens"; version="1.1"; sha256="1hn65n67by3xqbcnaf5jja5pli0g6wpbbz2sfzd7i2nms7kiywhp"; depends=[]; }; - double_truncation = derive2 { name="double.truncation"; version="1.5"; sha256="09r3f11fi8c9kc9fzgzq6k4kjc82r3s0sgzp3ffdqrc47jhyl279"; depends=[]; }; + double_truncation = derive2 { name="double.truncation"; version="1.7"; sha256="0hrb1qli7i4jhc705rb02zbq2nyk0i406bb8gpy4jrzygjjbq3g0"; depends=[]; }; doubt = derive2 { name="doubt"; version="0.1.0"; sha256="16avp0f7ks2zd4ckakvfm57zng2jk0fg3fz6vbm05lzhqymh6y30"; depends=[unglue]; }; + downlit = derive2 { name="downlit"; version="0.2.1"; sha256="0z4fz7c9kyd9v72wl3iqs2wxspi975d6b0rgjr9lvg8a18maa9z6"; depends=[brio digest evaluate fansi rlang vctrs yaml]; }; downloader = derive2 { name="downloader"; version="0.4"; sha256="1axggnsc27zzgr7snf41j3zd1vp3nfpmq4zj4d01axc709dyg40q"; depends=[digest]; }; - downloadthis = derive2 { name="downloadthis"; version="0.2.0"; sha256="0xvkznvk21gpycsnrra9af31apiv36g4s6c9r0c9vdsq4c93dpxd"; depends=[base64enc bsplus fs htmltools magrittr mime readr writexl zip]; }; + downloadthis = derive2 { name="downloadthis"; version="0.2.1"; sha256="12df3cxg1x84f3sibllykd5wqs11mr4nlyv8hj8bh9d6wjvwj2li"; depends=[base64enc bsplus fs ggplot2 htmltools magrittr mime readr writexl zip]; }; downscaledl = derive2 { name="downscaledl"; version="1.0"; sha256="0lqxngzpxj65b48j5w0n8dg6fp4lgg5zpgxc2wj6d9wh5f97l71b"; depends=[dplyr keras magrittr raster Rcpp RcppArmadillo rgdal rstack sp tensorflow]; }; downsize = derive2 { name="downsize"; version="0.2.2"; sha256="18b9shd79z0bsdnp0apqqwv6c73j4wnfiv41ywqz761nmxbldxbn"; depends=[magrittr R_utils]; }; dpa = derive2 { name="dpa"; version="1.0-3"; sha256="0dmwi68riddi1q4b10c12wx6n7pqfmv30ix5x72zpdbgm72v343h"; depends=[igraph sem]; }; @@ -7321,7 +7608,7 @@ in with self; { dplR = derive2 { name="dplR"; version="1.7.1"; sha256="1df4g9zz47h0flx5ww6bvlm364q81l2c5flzpa985sv87rq6cz4j"; depends=[digest lattice Matrix matrixStats plyr png R_utils signal stringi stringr XML]; }; dplRCon = derive2 { name="dplRCon"; version="1.0"; sha256="10xnawgnhxp5y949fxs1vvadc1qz2ldy0s9w9w7kf6iqh59d35sw"; depends=[]; }; dplyr = derive2 { name="dplyr"; version="1.0.2"; sha256="0jnw18nw20gw3jvq3kvkf9mqn6b7mvgmys8g6350k5jwpygk5cbw"; depends=[ellipsis generics glue lifecycle magrittr R6 rlang tibble tidyselect vctrs]; }; - dplyr_teradata = derive2 { name="dplyr.teradata"; version="0.3.2"; sha256="1pq630hlvpfrhaxqn6yh0kgapgibrnbic78g130d40visak60j1p"; depends=[bit64 DBI dbplyr dplyr odbc rstudioapi]; }; + dplyr_teradata = derive2 { name="dplyr.teradata"; version="0.4.1"; sha256="0ygn8cq4dnmzzxfskcir7g0bksgby5sw2j135gvrk599z3v6avg1"; depends=[bit64 DBI dbplyr dplyr odbc]; }; dplyrAssist = derive2 { name="dplyrAssist"; version="0.1.0"; sha256="1lqizh70b1apyr4578917gv6s0i7p84ak96a57kvwipmh36a4ywn"; depends=[DT magrittr miniUI plyr rstudioapi shiny shinyAce shinyWidgets stringr tidyr tidyverse]; }; dpmr = derive2 { name="dpmr"; version="0.1.9"; sha256="1cnjywkvjb4fhbf4shjmsrq47f1fg2x21hcm1q5512bm0wg9i6jd"; depends=[digest httr jsonlite magrittr rio]; }; dppmix = derive2 { name="dppmix"; version="0.1.1"; sha256="1gq51kix0jln25gr6bffzdy24fhn6cd3gmyl3jlmvqvni4vwswy7"; depends=[mvtnorm]; }; @@ -7330,35 +7617,41 @@ in with self; { dqrng = derive2 { name="dqrng"; version="0.2.1"; sha256="0rp8q5zijlvaqmpnkwr314w9w40sj4fz7sqsdgsffcfvn42w2jg1"; depends=[BH Rcpp sitmo]; }; dr = derive2 { name="dr"; version="3.0.10"; sha256="0dmz4h7biwrn480i66f6jm3c6p4pjvfv24pw1aixvab2vcdkqlnf"; depends=[MASS]; }; dr4pl = derive2 { name="dr4pl"; version="1.1.11"; sha256="0vv3h4sxw38grhr70s28sxkca20adnqdmpp8qqwlbr3dw950yaa3"; depends=[ggplot2 Matrix matrixcalc Rdpack tensor]; }; - dracor = derive2 { name="dracor"; version="0.2.2"; sha256="1l3972q7blif2jgya1lmppzg5nrs78wghqqj857mzgdw4k8pizs5"; depends=[Rcpp]; }; - dragon = derive2 { name="dragon"; version="1.0.1"; sha256="1y5ymnc5aacbf69zayxzwdvkw8gxi08rai4mgdrvmqnr5mkxw1c6"; depends=[broom colorspace colourpicker config cowplot curl dplyr DT future ggforce ggplot2 golem htmltools igraph lubridate magrittr openxlsx promises purrr RColorBrewer readr rvest shiny shinydashboard shinyWidgets stringr tibble tidyr tidyselect visNetwork xml2]; }; + dracor = derive2 { name="dracor"; version="0.2.4"; sha256="0q7kwv60q32gj1b48r3ha0d539ddhw9jz3n62wvc8jr1na1v52lh"; depends=[Rcpp]; }; + dragon = derive2 { name="dragon"; version="1.1.0"; sha256="1cb5k0k4mimndy5xlfq813lg4acrl0lrv0q2hakll61lrqqxbykd"; depends=[broom colorspace colourpicker config cowplot curl dplyr DT future ggforce ggplot2 golem htmltools igraph lubridate magrittr openxlsx promises purrr RColorBrewer readr rlang rvest shiny shinydashboard shinyWidgets stringr tibble tidyr tidyselect visNetwork xml2]; }; dragonking = derive2 { name="dragonking"; version="0.1.0"; sha256="01b01wd1s2b8sa9f0kfbf2pbzhaqra7xxskigqh3vlj389xqm1id"; depends=[]; }; + dragracer = derive2 { name="dragracer"; version="0.1.5"; sha256="19qvr01wxzw5ihgpy7lz13f3hylnmprziwnr50gkwj6p3zhc0swa"; depends=[]; }; dragulaR = derive2 { name="dragulaR"; version="0.3.1"; sha256="1cw5v7m1b4pxsizsjb3zdzhydxj577p6q5fcjklsvpzmiixzlyav"; depends=[htmlwidgets shiny shinyjs]; }; - drake = derive2 { name="drake"; version="7.12.4"; sha256="02pq2xy0s8kdhd018rwvpgpaq839y7zhzrv6fp64h3cnrc00xcym"; depends=[base64url digest igraph rlang storr tidyselect txtq vctrs]; }; + drake = derive2 { name="drake"; version="7.12.7"; sha256="0ajvzw8j4pg5c8wji0d5jsdpk49mv7m4fh278mhdh2v972nfvkji"; depends=[base64url digest igraph rlang storr tidyselect txtq vctrs]; }; drat = derive2 { name="drat"; version="0.1.8"; sha256="0dl52xxfy07ha3c945da1cna9m5cnidm9y4n46h6ysvcrq75wsyk"; depends=[]; }; draw = derive2 { name="draw"; version="1.0.0"; sha256="0kbz8rcgygl4fhmljzaan5jl7wjvfljcaykm7q9lw9s6m78p06gz"; depends=[]; }; + drawsample = derive2 { name="drawsample"; version="0.1.1"; sha256="0kynj8wcaxpni39fn172f0wk1p65ilj3x0a949sgq4v3zzw3zqxb"; depends=[dplyr lattice psych tibble]; }; drc = derive2 { name="drc"; version="3.0-1"; sha256="0c8xn8ripzq270hy8d16fcnx02l02alddznd7fqwk3jyi6113h1y"; depends=[car gtools MASS multcomp plotrix scales]; }; - dreamerr = derive2 { name="dreamerr"; version="1.2.0"; sha256="00p8vq3zhqdwk3pyg7vx848c9k8rby2v2j7jkv445gj9wjy6ylbd"; depends=[Formula]; }; + dreamerr = derive2 { name="dreamerr"; version="1.2.3"; sha256="0g3gl4nzfw02alhyjw9flylfr2awyijjim50j1jdnp677zqlxkmf"; depends=[Formula]; }; drf = derive2 { name="drf"; version="1.0.0"; sha256="1ja9f1g5afijcdp480zj6l0ffmixfsrcvxgdy5vrk6342hr229ks"; depends=[fastDummies Matrix Rcpp RcppEigen spatstat]; }; drfit = derive2 { name="drfit"; version="0.7.2"; sha256="03ahzmjzrkdrv36yj6vfg3g5bwn6lb7mlxmli68sixag5h83xq7f"; depends=[DBI drc MASS odbc qcc reshape2]; }; drgee = derive2 { name="drgee"; version="1.1.10"; sha256="0hy7887mvlxh73zk2yzp46bqakq924n940j21lw25jgygmzz1176"; depends=[data_table nleqslv Rcpp RcppArmadillo survival]; }; + drhur = derive2 { name="drhur"; version="0.1.0"; sha256="1a13fpczvq0a93q2ldh2h42hk7firmcbr478vkli8y6d1bwlj567"; depends=[arm car dotwhisker gapminder ggeffects ggthemes gt interplot kableExtra knitr learnr likert modelsummary moments nnet ordinal performance scales summarytools tibble tidyverse]; }; drifter = derive2 { name="drifter"; version="0.2.1"; sha256="1xsp8cm02wd8zink0jqrdaii7s2dh0rw96rs6k8zr2g0341wmfba"; depends=[DALEX dplyr ingredients tidyr]; }; + driveR = derive2 { name="driveR"; version="0.2.1"; sha256="1zc14j7aarxbw11p5gardqkwrab71b8wfrpd1q2g6r9dg98w146i"; depends=[caret GenomeInfoDb GenomicFeatures GenomicRanges org_Hs_eg_db randomForest rlang S4Vectors TxDb_Hsapiens_UCSC_hg19_knownGene]; }; drmdel = derive2 { name="drmdel"; version="1.3.1"; sha256="1bpm9jj9dxk2daxp1yb7pn9jd750p27qa84vdfxpacm5r0mggnys"; depends=[]; }; dropR = derive2 { name="dropR"; version="0.1"; sha256="0sw5lqlfdn64dbykxdhk1pz18f83if871vkapa2nxgcfiy79b0vs"; depends=[plyr shiny]; }; droptest = derive2 { name="droptest"; version="0.1.3"; sha256="1wlfhj6c4pb5mcybyd2bcn55y3azk7dv7d7il97qwbhl8kf59csl"; depends=[data_table]; }; + drord = derive2 { name="drord"; version="1.0.0"; sha256="1mkawx21dyj5vgiba598ilpas0vmi5qypi0aa9489yrsl40ls7xn"; depends=[ggplot2 MASS ordinal VGAM]; }; + drought = derive2 { name="drought"; version="1.0"; sha256="1rj3aycvkb0f85p12l356rlhid4zfzqkhks20x2hhwvpk8nhri8h"; depends=[copula]; }; drtmle = derive2 { name="drtmle"; version="1.0.5"; sha256="1gnzprdjs4aws5q92a0dmlfzpwi3in3rsylbwr0r6cnghymgs69s"; depends=[doFuture future future_apply future_batchtools np SuperLearner]; }; drugCombo = derive2 { name="drugCombo"; version="1.1.1"; sha256="0f4akxmj5jd89jm7kzkmqksxmb6fqj7jawvm3hpw6limyry3mp4z"; depends=[BIGL Deriv ggplot2 minpack_lm nlme rgl]; }; drumr = derive2 { name="drumr"; version="0.1.0"; sha256="09xi3sf424bpq10fq25j209dylfbi1lfd911r44ffadkxzvp5p1s"; depends=[audio stringr]; }; ds = derive2 { name="ds"; version="4.0"; sha256="1iic5fb27cnhsa83zg28hydrhzc01i9z0711xvk95c3gv7mbfp2p"; depends=[]; }; - ds4psy = derive2 { name="ds4psy"; version="0.4.0"; sha256="10w6hwkc6f63ri2hkck53w5nxp9qxr24r1w6ir9zql3a84sbvgva"; depends=[cowplot ggplot2 unikn]; }; + ds4psy = derive2 { name="ds4psy"; version="0.5.0"; sha256="0a8x3kji1divizl5wqidsy6wx8viyqx2gsi1s686dh4zdqfcw5rh"; depends=[cowplot ggplot2 unikn]; }; dsa = derive2 { name="dsa"; version="0.74.18"; sha256="17pyr5jn6mjcch5cl22z8mg31anirmgdjs6k9vjmz5ar35fcb1vi"; depends=[dygraphs extrafont forecast ggplot2 gridExtra htmlwidgets R2HTML reshape2 rJava timeDate tsoutliers xtable xts zoo]; }; dsample = derive2 { name="dsample"; version="0.91.2.2"; sha256="18c0zxaqwgbn9kmkwlnicwd74ljy2sxj0b9ksif13pdlj3zn57h1"; depends=[MASS]; }; - dscore = derive2 { name="dscore"; version="1.3.0"; sha256="04msklbnbxzzvyky4k91l1mp0nws1j36basrp3yalld3da7dzvdb"; depends=[dplyr Rcpp RcppArmadillo stringr tidyr tidyselect]; }; + dscore = derive2 { name="dscore"; version="1.4.0"; sha256="0vjrxdgss79pmd8vkarvgqqm465byz17r7r93k5i3923xm02kavr"; depends=[dplyr Rcpp RcppArmadillo stringr tidyr tidyselect]; }; dse = derive2 { name="dse"; version="2020.2-1"; sha256="170rxrniszs8h59ah4mn4mz8d7kzix4g3vlz4icd8w6bl40c6ykc"; depends=[setRNG tfplot tframe]; }; dslabs = derive2 { name="dslabs"; version="0.7.3"; sha256="0fhd6zwa4lmgrrybywvj1vxd98a483yca605dj2pwipqifh1x6ka"; depends=[ggplot2]; }; dslice = derive2 { name="dslice"; version="1.2.0"; sha256="1k9hxpmr563p8bpd9m991lx5ig366mzk9j1lzldci9pq4jiayin1"; depends=[ggplot2 Rcpp scales]; }; dsm = derive2 { name="dsm"; version="2.3.0"; sha256="0b7jdhfrpkyjhxxlkgxsnnidmmpbb3jkx41iqmp08bxipbjyw4kr"; depends=[ggplot2 mgcv mrds nlme numDeriv plyr statmod]; }; - dsr = derive2 { name="dsr"; version="0.2.2"; sha256="0bs5aspi2khs9n60q7d2ah6zv4rzhbyk2bafd17c12jzjqlh1228"; depends=[dplyr frailtypack rlang]; }; + dsmisc = derive2 { name="dsmisc"; version="0.3.3"; sha256="19760hcb5154rayhj72r48r7glh2qyaf178zkxplywmsw338kws4"; depends=[Rcpp stringr]; }; dsrTest = derive2 { name="dsrTest"; version="0.2.1"; sha256="1kljlfi7jf6fa8b5f3wxjsa9rlmzcp4qix3m2qyapz2lqd85mbb7"; depends=[asht exactci loglognorm]; }; dssd = derive2 { name="dssd"; version="0.2.1"; sha256="0lfr3bb3nba6pkg13d3kiblbp4naqxcdkvdqsa0y1zlhak74cgcj"; depends=[plot3D rgdal sf]; }; dst = derive2 { name="dst"; version="1.4.1"; sha256="1cz1fcyxpyv0ywmwlqdhgj3nzidnzcaxc1nkh8y5mph9wm612c25"; depends=[]; }; @@ -7369,16 +7662,18 @@ in with self; { dtp = derive2 { name="dtp"; version="0.1.0"; sha256="0qy8nrbq22bfbajkxq6blkq7583pc5mb392gmqb3c9daxmqn42vb"; depends=[Formula gtools plyr]; }; dtpcrm = derive2 { name="dtpcrm"; version="0.1.1"; sha256="0k25fm0z3snpx1v2kwd50svgnkjhn5c0hy1gnlw2lif6rjz1fzd9"; depends=[dfcrm diagram]; }; dtplyr = derive2 { name="dtplyr"; version="1.0.1"; sha256="0jgisglpaj1n6jhwqwsa1583i4ifazqdd9hh581w5akx5p0f05mp"; depends=[crayon data_table dplyr rlang tibble tidyselect]; }; + dtrSurv = derive2 { name="dtrSurv"; version="1.1"; sha256="1wklfgzlvwv8c3rpff29w2liy4ahds61zrcig8bzjbifi6inqnq0"; depends=[survival]; }; dtree = derive2 { name="dtree"; version="0.4.2"; sha256="1cpv0pyf515610djxzfw1c83p3alk5a93clg4x9gk7a7qy4cyhr1"; depends=[caret evtree party partykit rpart]; }; dtt = derive2 { name="dtt"; version="0.1-2"; sha256="0n8gj5iylfagdbaqirpykb01a9difsy4zl6qq55f0ghvazxqdvmn"; depends=[]; }; dttr2 = derive2 { name="dttr2"; version="0.3.0"; sha256="1irr0cpkls2fkck07az24yqc8llgw7q1nh7km0cm31dr4zxnj0hf"; depends=[chk hms lifecycle]; }; - dtw = derive2 { name="dtw"; version="1.21-3"; sha256="02hyhx1sy5h3vzh9zixy18a7d47df4k5d0wyflcvlcbsbcl6p90s"; depends=[proxy]; }; + dtw = derive2 { name="dtw"; version="1.22-3"; sha256="004gm4mzgdzdj807j3bwqsv5lizmnmz5jq514bdjshhkysnzjz6z"; depends=[proxy]; }; dtwSat = derive2 { name="dtwSat"; version="0.2.6"; sha256="1mx3xxhf2ywi6cia47sn77wzxd8rg9wir7r8dx92k5dvawr425ki"; depends=[caret data_table dtw ggplot2 lubridate mgcv plyr proxy raster RColorBrewer Rdpack reshape2 rgdal scales snow sp xtable zoo]; }; dtwclust = derive2 { name="dtwclust"; version="5.5.6"; sha256="05dszmj89id2hk9apxa7721737s6292w2l7vazj7aqwk1jyghjpm"; depends=[bigmemory clue cluster dplyr dtw flexclust foreach ggplot2 ggrepel Matrix nloptr proxy Rcpp RcppArmadillo RcppParallel RcppThread reshape2 RSpectra shiny shinyjs]; }; dual = derive2 { name="dual"; version="0.0.3"; sha256="1alxh9mj610m7wgr6a97mpzy5ia9vzckhz6wmxyix7xh9mzbn1gw"; depends=[]; }; dualtrees = derive2 { name="dualtrees"; version="0.1.4"; sha256="05mxwiwnv48jf6ya5qmfc7g2w8wkzhk56k9g0gr2m4cpfab7d5h2"; depends=[]; }; duawranglr = derive2 { name="duawranglr"; version="0.6.5"; sha256="04w8ll6p8m0ljcp96sfp028afgxddk4wyncfdwiywi0ps34zh084"; depends=[digest dplyr haven readr readxl]; }; dub = derive2 { name="dub"; version="0.2.0"; sha256="066lzyk44380mf17vx4db4a3a4rs7zl85mj5hjg172khjbqnbixw"; depends=[]; }; + duckdb = derive2 { name="duckdb"; version="0.2.3"; sha256="0nks1916kan1gpkk85gfcm7zklk100msfb83620j4i8szsbmz42d"; depends=[DBI]; }; duckduckr = derive2 { name="duckduckr"; version="1.0.0"; sha256="1wki8xvqp5hr27iafd9jbryl9faywfkdkpn0pa0afywbic39k2cm"; depends=[crul jsonlite]; }; dummies = derive2 { name="dummies"; version="1.5.6"; sha256="01f84crqx17xd6xy55qxlvsj3knm8lhw7jl26p2rh2w3y0nvqlbm"; depends=[]; }; dummy = derive2 { name="dummy"; version="0.1.3"; sha256="081a5h33gw6ym4isy91h6mcf247c2vsdygv9ll07a3mgjcjnk79p"; depends=[]; }; @@ -7391,26 +7686,25 @@ in with self; { dvqcc = derive2 { name="dvqcc"; version="0.1.0"; sha256="011mwdwh046wninfjdy00wxn312ykzn90nz9fz3l7c5cw9gzzfkg"; depends=[ggplot2 tsDyn]; }; dwdradar = derive2 { name="dwdradar"; version="0.2.3"; sha256="01xk058d5sfgknyplg65xplkhqi79mn3p5p5fjrv4vis0mq0dsvq"; depends=[]; }; dwlm = derive2 { name="dwlm"; version="0.1.0"; sha256="0n5dil9qvyy4gish3wnv8bzq0ci1p0dr2vmbbadl29jl7rd1v0rc"; depends=[]; }; - dyads = derive2 { name="dyads"; version="1.1.2"; sha256="014gphxkn0wkdq5zgd71vv9dmzyswgpari59w5mf2070c0rr56n5"; depends=[MASS mvtnorm]; }; + dyads = derive2 { name="dyads"; version="1.1.3"; sha256="1spkypcm92pipz36rqswca50gihj3vpv0y34rjyaqwfx88b3dwp6"; depends=[CholWishart MASS mvtnorm RcppZiggurat Rfast]; }; + dycdtools = derive2 { name="dycdtools"; version="0.2.0"; sha256="16aiv0f6rsrpl8vym490w67had3isn9xbcyfiaa8vpgy8p80ymyr"; depends=[dplyr ggplot2 hydroGOF lubridate ncdf4 R_utils RColorBrewer tidyr]; }; dydea = derive2 { name="dydea"; version="0.1.0"; sha256="15alr3f6wkkpjd5wmcjazi58yc8gwcqr662mjwlfg15r94fzqrlg"; depends=[Chaos01]; }; dygraphs = derive2 { name="dygraphs"; version="1.1.1.6"; sha256="022j007mzfa9k2n31yg4aizcsf571vv3jip092h23rqj03rk3ly3"; depends=[htmltools htmlwidgets magrittr xts zoo]; }; dyn = derive2 { name="dyn"; version="0.2-9.6"; sha256="16fqv9k7yxdgybwzafjkyqm16qpgqz13lcjpi6a1nc8xbzlzh0gb"; depends=[zoo]; }; - dynBiplotGUI = derive2 { name="dynBiplotGUI"; version="1.1.5"; sha256="0fvyn33mzjcc3sis05phc6412y25m406il2wzdfw8caa8dafj0yw"; depends=[tcltk2 tkrplot]; }; + dynBiplotGUI = derive2 { name="dynBiplotGUI"; version="1.1.6"; sha256="04026jz4vdyj2a2kry5kk5k84cy4vqqrcn328hxwnwh7r8i7klvn"; depends=[tcltk2]; }; dynCorr = derive2 { name="dynCorr"; version="1.1.0"; sha256="0l5k764j1zhsqpgp0ndihah63hsk3zv9hviixfmh4h3i0sr0q52p"; depends=[lpridge]; }; - dynOmics = derive2 { name="dynOmics"; version="1.2"; sha256="0fsck5wx4rcfckjr6xg0s3a6cvh4881cqzy0af91icqg0p3zjj2l"; depends=[ggplot2 gplots]; }; dynRB = derive2 { name="dynRB"; version="0.15"; sha256="0fa6g4aj2cncg6mi0yc2yn6321qi7fz9d9cvqrnxhcnbbghdyzq9"; depends=[corrplot dplyr foreign ggplot2 RColorBrewer reshape2 vegan]; }; dynaSpec = derive2 { name="dynaSpec"; version="1.0.0"; sha256="153pwzznkj0cm2kfh4s7k4k6yqj4rp0lvbrcb81rvqv2kvxg6i7m"; depends=[ggplot2 NatureSounds pbapply png seewave tuneR]; }; dynaTree = derive2 { name="dynaTree"; version="1.2-10"; sha256="1ng672mlv98xnsbd4xq70hxc8j158la4n63y46rw74granaz29ya"; depends=[]; }; dynamac = derive2 { name="dynamac"; version="0.1.11"; sha256="0dzw4h128z53vwdpkikhxqil0xjrcjrp1zmz0fy2qhq0n74sdyar"; depends=[lmtest MASS]; }; dynamicGraph = derive2 { name="dynamicGraph"; version="0.2.2.6"; sha256="1xnsp8mr3is4yyn0pyrvqhl893gdx2y1zv8d2d55aah2xbfk0fjj"; depends=[ggm]; }; dynamicTreeCut = derive2 { name="dynamicTreeCut"; version="1.63-1"; sha256="1fadbql7g5r2vvlkr89nlrjxwp4yx4xrdqmv077qvmnx9vv0f4w3"; depends=[]; }; - dynamichazard = derive2 { name="dynamichazard"; version="0.6.6"; sha256="1ad4ymi28yx6vh3x8p4pm4ph81fb9fkhk4zfhbl60522d4kjbsjq"; depends=[boot Rcpp RcppArmadillo survival]; }; - dynamo = derive2 { name="dynamo"; version="1.0"; sha256="0arsv686ix7xpca57ayqgifim1q35dl4w2mx7fw8bc0lidapilyp"; depends=[abind glamlasso MortalitySmooth Rcpp RcppArmadillo]; }; + dynamichazard = derive2 { name="dynamichazard"; version="0.6.7"; sha256="17zsn11b7gf8hx13f8sy88hdkbdzc1a1hszhbwfllpipd9pwzsyb"; depends=[boot Rcpp RcppArmadillo survival]; }; dynatopmodel = derive2 { name="dynatopmodel"; version="1.2.1"; sha256="0lpfhj69bvagqzzg2kjqvn9xx8f93ii34flrrns20z3bxla6gds9"; depends=[deSolve lubridate maptools raster rgdal rgeos sp topmodel xts zoo]; }; dyncomp = derive2 { name="dyncomp"; version="0.0.2-1"; sha256="13wp2k8nbgrbrqng2dmgy0ixgidk51wq9y7mv5pdbvdajxdsyh11"; depends=[zoo]; }; dyndimred = derive2 { name="dyndimred"; version="1.0.3"; sha256="03znghb5nygggwfmy9id07fn1wfkhwyzyzahdrlx68pg03dhlbg5"; depends=[dynutils irlba lmds]; }; dynetNLAResistance = derive2 { name="dynetNLAResistance"; version="0.1.0"; sha256="018y3m648ni31rlisjfnrx1d10mm48wpxanlnnxxpnqxjcywg2x8"; depends=[doParallel foreach igraph]; }; - dynfrail = derive2 { name="dynfrail"; version="0.5.2"; sha256="1q7ml24j0ycy2bwpa14vl96315ni7x9rfp0qmf36w00mylgc3ry6"; depends=[dplyr magrittr Rcpp RcppArmadillo survival tibble tidyr]; }; + dyngen = derive2 { name="dyngen"; version="0.4.0"; sha256="1qc701m52852xmbpldpxljbfjsljnba4dwap80ibqil4cl8l66px"; depends=[assertthat dplyr dynutils furrr ggplot2 ggraph ggrepel GillespieSSA2 igraph lmds Matrix patchwork pbapply purrr rlang tibble tidygraph tidyr viridis]; }; dynia = derive2 { name="dynia"; version="0.2"; sha256="1swip4kqjln3wsa9xl0g92zklqafarva923nw7s44g4pjdy73d5l"; depends=[]; }; dynlm = derive2 { name="dynlm"; version="0.3-6"; sha256="1g8qsb5m69yn35sm0shd97vbnbpqfkjkd7lbkwch1gpfxkld53zq"; depends=[car lmtest zoo]; }; dynmix = derive2 { name="dynmix"; version="1.0"; sha256="0rv787yn264dsp6hpyzwfrgc3p0rp2vhklkdszs9fwy3s4x5177w"; depends=[MASS Rcpp RcppArmadillo zoo]; }; @@ -7421,32 +7715,32 @@ in with self; { dynr = derive2 { name="dynr"; version="0.1.15-25"; sha256="1kwrx1wg7hwgwkdgws8pvdv2yj5m77xp7fnpxlj50c7xm3chjm78"; depends=[car deSolve fda ggplot2 latex2exp magrittr MASS Matrix mice numDeriv plyr Rdpack reshape2 stringi tibble xtable]; }; dynsbm = derive2 { name="dynsbm"; version="0.7"; sha256="169yk539vynjbn89q6vs3l3fx7hk8n3i1msa4jws5vypgljc2rir"; depends=[RColorBrewer Rcpp riverplot]; }; dynsim = derive2 { name="dynsim"; version="1.2.1"; sha256="0nkxn9v4f353fhcn1vsdrh29mrms10zid63b84flg3c6hvc0x4qr"; depends=[ggplot2 gridExtra MASS]; }; - dynsurv = derive2 { name="dynsurv"; version="0.3-7"; sha256="0ar8n84fpfy68cx321syg8hvjxjnh00mw0a9sid9dw58f956phf8"; depends=[BH ggplot2 nleqslv plyr reshape survival]; }; + dynsurv = derive2 { name="dynsurv"; version="0.4-2"; sha256="0gy9q7l7k37bxm3d37adpvqa45lvr048a309jqc052f179v38mlb"; depends=[BH data_table ggplot2 nleqslv splines2 survival]; }; dynutils = derive2 { name="dynutils"; version="1.0.5"; sha256="1vcnz0yrss64i8pw459z2kp17b0fqgw41rpxbzpixhsqsz9sy22x"; depends=[assertthat crayon desc dplyr magrittr Matrix proxyC purrr Rcpp remotes stringr tibble]; }; dynwrap = derive2 { name="dynwrap"; version="1.2.1"; sha256="1hcc2svsw52nvhyp9zw4iwrn88rpvjk424ckin0g6fyp5afdyfsk"; depends=[assertthat babelwhale crayon dplyr dynparam dynutils glue igraph magrittr Matrix processx purrr readr reshape2 stringr testthat tibble tidyr yaml]; }; - e1071 = derive2 { name="e1071"; version="1.7-3"; sha256="0pf2pjb590z0jikgv1037xcp7dq06mg3dzmyffjw6gk7dd9blbdv"; depends=[class]; }; + e1071 = derive2 { name="e1071"; version="1.7-4"; sha256="02935xcscjhb0jmnvh44hxlpjcgladrcr0gpz1jxq07m0qdqgaz6"; depends=[class]; }; eAnalytics = derive2 { name="eAnalytics"; version="0.1.4"; sha256="15hhd4q2yxzq3a3awvk81ixa43hk519ym8ap7v1ahghyr0njnyyf"; depends=[dplyr DT energyr googleVis leaflet plotly shiny shinydashboard shinytest shinyWidgets]; }; + eBsc = derive2 { name="eBsc"; version="4.12"; sha256="0mvvw9z9qivzwkk6gwblavj175jc2a96zsplcifil2rgsr165ni8"; depends=[Brobdingnag MASS Matrix nlme Rcpp RcppArmadillo]; }; eChem = derive2 { name="eChem"; version="1.0.0"; sha256="0wmf204hqd4s5har5l9bkcbrbmbqbb8m11w2aivi2gs98f3hy51p"; depends=[animation plot3D]; }; eDMA = derive2 { name="eDMA"; version="1.5-3"; sha256="0wyp81si6lcispqng4c7lii22qbyblvijgnlxvcsnkcxj5hpm76j"; depends=[Rcpp RcppArmadillo xts zoo]; }; eGST = derive2 { name="eGST"; version="1.0.0"; sha256="0qi4vg0pwy55js9ww1cw85ssim3x7s2p98cjijxvlrvid8sns5bq"; depends=[MASS matrixStats mvtnorm purrr]; }; eHOF = derive2 { name="eHOF"; version="1.9"; sha256="13m64vdbcr6ify7p6zj0dh5rsy87c9r7m4sslmgh0afbglszzrcs"; depends=[lattice mgcv]; }; eMLEloglin = derive2 { name="eMLEloglin"; version="1.0.1"; sha256="087zw48lykls2jcsmpqd5jkrlpr0j423snp00liszjhdpdh59saq"; depends=[lpSolveAPI]; }; eNchange = derive2 { name="eNchange"; version="1.0"; sha256="07vdi05fr6mynb86haas21izdcjiagw14p1h8n0qr1hb3klvs8n5"; depends=[ACDm doParallel foreach hawkes iterators Rcpp]; }; - eNetXplorer = derive2 { name="eNetXplorer"; version="1.1.1"; sha256="0z1k8dhvvzbhdmvj754hxmgc0g1fv5df7fv2hq8sil0yv9v1rvny"; depends=[calibrate expm glmnet gplots Matrix progress RColorBrewer survcomp survival survivalROC]; }; ePCR = derive2 { name="ePCR"; version="0.9.9-11"; sha256="0bkvjvygdnzcc23sslgkcrx11mzwgsqss37lwnbr7rq0jp1sw46s"; depends=[Bolstad2 glmnet hamlet impute pracma survival timeROC]; }; eRTG3D = derive2 { name="eRTG3D"; version="0.6.3"; sha256="1fa2wcipjym3vz53zxb6dz2i52b963yxrq5h1k7wydpj53xwk5jm"; depends=[CircStats ggplot2 pbapply plotly raster rasterVis tiff]; }; eRm = derive2 { name="eRm"; version="1.0-1"; sha256="0njqzznnhnkvalmhiq5yq1w7gwp2myki5cv61w42ydvd27hdyyg9"; depends=[colorspace lattice MASS Matrix psych]; }; - eSDM = derive2 { name="eSDM"; version="0.3.4"; sha256="169kxw1krrsqkrwm9zg9h0sczhc6r0y1rsw39m60kfbzqdhk57vk"; depends=[dplyr magrittr purrr rlang ROCR sf shiny units]; }; + eSDM = derive2 { name="eSDM"; version="0.3.5"; sha256="1x0w47jmcdqx4i8vm3pbmqjilzbgjp0qvp2qx2k7plczwb824shb"; depends=[dplyr magrittr purrr rlang ROCR sf shiny units]; }; eadrm = derive2 { name="eadrm"; version="0.1.3"; sha256="0bb9glwqkzr1px03l4dxvgzm7zkrp3349l5fwfmw6jp0fxdl98ij"; depends=[]; }; eaf = derive2 { name="eaf"; version="1.9-1"; sha256="0h7nilqa11s4casalilmk4ssgcl1lqn1w4033zxgc20y7f9rxhsg"; depends=[modeltools]; }; - earlyR = derive2 { name="earlyR"; version="0.0.1"; sha256="14davqhh3n5dfsddnfd79ni56bssrpwhvkqkdb77a8x9fn8w32pv"; depends=[distcrete EpiEstim epitrix]; }; + earlyR = derive2 { name="earlyR"; version="0.0.5"; sha256="0978vv48sj1hs61rdb3xv02s8qz03jcm1c8q1mbb3d033x1q7k22"; depends=[distcrete EpiEstim epitrix ggplot2]; }; earlygating = derive2 { name="earlygating"; version="1.0"; sha256="0y6xjkh9p8bvanc9p5sycah8v81k85xr8i7vyvjb9g4a64srwhd7"; depends=[betareg doParallel foreach]; }; earlywarnings = derive2 { name="earlywarnings"; version="1.0.59"; sha256="06j5g5lrzl4p5pb1pp79h00iqpbwralzhpzxmaiymv7j8kz87nr0"; depends=[fields ggplot2 Kendall KernSmooth lmtest moments nortest quadprog som spam tgp tseries]; }; - earth = derive2 { name="earth"; version="5.1.2"; sha256="13a8qfv94bqnjkacnr0nz1g8yd99cnyz4k2qslyclrckqbl9hvrj"; depends=[Formula plotmo TeachingDemos]; }; + earth = derive2 { name="earth"; version="5.3.0"; sha256="0dr4w2jvvh3rh1zxissrhq55ba72gwir72kiz3fv6x0s4w3fib05"; depends=[Formula plotmo TeachingDemos]; }; earthtide = derive2 { name="earthtide"; version="0.0.10"; sha256="09cd4vwkl33zgdwvhvi9jl6za9w61zjj9fyq3x2cxz4hgj346fbm"; depends=[BH R6 Rcpp RcppArmadillo RcppParallel]; }; earthtones = derive2 { name="earthtones"; version="0.1.1"; sha256="17biiw0ig8i8ihc2f8csp0bqryygg27ic2v1vrf81ax3qzhngy4l"; depends=[ggmap]; }; easyAHP = derive2 { name="easyAHP"; version="0.1.1"; sha256="161mn90j9ph1p9277mj61hch8ndcv7k9izs32q93y5wp474gzynd"; depends=[]; }; - easyCODA = derive2 { name="easyCODA"; version="0.31.1"; sha256="1g3k8a06zsif5a7xma4dz5zcdbxyc6i58jf5rnnyypxhj6xm5abc"; depends=[ca ellipse vegan]; }; + easyCODA = derive2 { name="easyCODA"; version="0.34.3"; sha256="1s1zjjvswl3444m84n6c5sznva4y19kcm171xkcy1zdx3wqmd2m3"; depends=[ca ellipse vegan]; }; easyDes = derive2 { name="easyDes"; version="5.0"; sha256="1msybgv4b7xlvp93lk64mdrqprr5qqc9ma1bz7glchhlkyyl8c21"; depends=[multcomp PMCMRplus]; }; easyNCDF = derive2 { name="easyNCDF"; version="0.1.0"; sha256="1p6b1lcbw2ix6hqqghgfid5yd58yqg1cqnj99r5svli3ivr7x6js"; depends=[abind ClimProjDiags ncdf4]; }; easyPSID = derive2 { name="easyPSID"; version="0.1.1"; sha256="07m560j8bpzifik305ix33b26xg7w4xjn7lz9g9gp120cqs765dx"; depends=[foreign LaF stringr]; }; @@ -7460,47 +7754,56 @@ in with self; { easynls = derive2 { name="easynls"; version="5.0"; sha256="1ma2q4y5dxk6q99v880vqfsgy1fha96j7pi8ch699l0pi6bx0d6c"; depends=[]; }; easypackages = derive2 { name="easypackages"; version="0.1.0"; sha256="00paxdwz4bw3imqhcsw6hj1h0gmnpishlxcj79n826vhdy23jc4y"; depends=[assertthat devtools]; }; easypower = derive2 { name="easypower"; version="1.0.1"; sha256="1vf0zv55yf96wjxja6ifdjvgc9nw0jl0hnc1ygyjd8pmwbgdz9bl"; depends=[pwr]; }; - easyr = derive2 { name="easyr"; version="0.5-0"; sha256="0b10l1qw0hjqz7mn7wrhzk5kj09j16p2yd5znlh59v85hsdvn21l"; depends=[data_table digest dplyr foreign glue Hmisc lubridate openssl readxl rlang rprojroot stringr XML]; }; + easyr = derive2 { name="easyr"; version="0.5-2"; sha256="0payiz7ai6wf5pr0v983bnm7fmnjxcj1r4dhw3bnh6ic43kdd386"; depends=[data_table digest dplyr foreign glue Hmisc lubridate openssl readxl rlang rprojroot stringr XML]; }; easyreg = derive2 { name="easyreg"; version="4.0"; sha256="1w4wlhziyhdyldm0zgnm73fnxrh0fv8hwcw5j8ircxb4npx7bcgg"; depends=[nlme]; }; + eatATA = derive2 { name="eatATA"; version="0.9.1"; sha256="0p94wg3y466mna6aqsgljv2rm7gix3zx4jpb1z8jw5zfy2r0xn1y"; depends=[lpSolve Matrix Rglpk]; }; eatDB = derive2 { name="eatDB"; version="0.4.1"; sha256="1p0dfdfa8409mdpr10ifj9vwskrypda9k02f7j6axcdnsfff6nha"; depends=[DBI RSQLite]; }; + eatGADS = derive2 { name="eatGADS"; version="0.15.2"; sha256="163wq5dsj6w3ax3fhz8y267vk77i8dknbsg9l08mw4dlh7bdyrm2"; depends=[data_table eatDB eatTools haven hms plyr tibble]; }; + eatTools = derive2 { name="eatTools"; version="0.3.8"; sha256="044pd0h8fvah2g8kdvja5c2j9qxw7r0203k2n80yfafc84k6k1ix"; depends=[data_table]; }; ebGenotyping = derive2 { name="ebGenotyping"; version="2.0.1"; sha256="1jllzc7kvvckrws8qhgvwy626llyb68sp1davp7swx48sf7rwcxc"; depends=[]; }; ebSNP = derive2 { name="ebSNP"; version="1.0"; sha256="0x3ijwg4yycsfy6jch1zvakzfvdgpiq8i7sqdp5assb8z1823w0b"; depends=[]; }; - eba = derive2 { name="eba"; version="1.9-0"; sha256="1xbjd7n895wzzybpjf634a1jpbwqxwh7l17phz6zv7h6dfw19nx4"; depends=[nlme psychotools]; }; + eba = derive2 { name="eba"; version="1.10-0"; sha256="03jr54xq109x9bf8kcs8mi7am17l9ya3xdkdppd8imwd2paqrssk"; depends=[nlme psychotools]; }; ebal = derive2 { name="ebal"; version="0.1-6"; sha256="1cpinmbrgxxv0fzi9qi2inv4hw2lz7iq4b0ggp316rdqqb5bj9r0"; depends=[]; }; ebdbNet = derive2 { name="ebdbNet"; version="1.2.5"; sha256="0kal4sqx12y04696ilwnwkmss4rn16dkbnalgqimz6i4jhz8n23h"; depends=[igraph]; }; ebirdst = derive2 { name="ebirdst"; version="0.2.1"; sha256="1cmi0hdh6363hcbqwglald3bn22rlvl4yqg4l3by6005mirjgx2i"; depends=[car data_table dplyr ggplot2 gridExtra magrittr mgcv PresenceAbsence rappdirs raster rgdal rlang scales sf stringr tidyr viridisLite xml2]; }; ebmc = derive2 { name="ebmc"; version="1.0.0"; sha256="0v9hkzy8ljddmi6wdjd1jga4ib566ikr1vgrvxba67ka524r6bbp"; depends=[C50 DMwR e1071 pROC randomForest rpart]; }; + ebmstate = derive2 { name="ebmstate"; version="0.1.1"; sha256="02vg0iha3sr5wil3ngpyrm084mz7xrm11h7y9blwd3p2fbzm9rpv"; depends=[HDInterval mstate Rcpp survival]; }; ebreg = derive2 { name="ebreg"; version="0.1.2"; sha256="1azs6dh2c7qacmql9kyssxp3gdk7i3fyaq9k8jnagzlmmkzmxddf"; depends=[lars Rdpack]; }; + ec50estimator = derive2 { name="ec50estimator"; version="0.1.0"; sha256="1zg4p1734q2jzifzfi2lf9wz3687s3cdn0yzkiwbc6w49mgdw877"; depends=[dplyr drc magrittr tibble tidyr]; }; ecap = derive2 { name="ecap"; version="0.1.2"; sha256="0d260y4phh1a7zlj2lgvdf7xd2z14l9djv7nrwa84pwqqyijc7rl"; depends=[ggplot2 quadprog]; }; ecb = derive2 { name="ecb"; version="0.2"; sha256="17hj4d48j6rran64ajzlgkgz17mab51fa3lz8rm3mw0qhahkjlmc"; depends=[curl httr rsdmx xml2]; }; ecce = derive2 { name="ecce"; version="1.0.7"; sha256="03p64l9krnpzdgqyj1fygqq36llsv4jc4bal1qvvgaf652w8fqwy"; depends=[RCurl rjson stringr]; }; ecd = derive2 { name="ecd"; version="0.9.1"; sha256="0d8mf5q6n7k5qj6kxvrb3habl0qmn2rxv814kydkrz2bg0scvm1q"; depends=[digest ggplot2 gridExtra gsl moments optimx polynom RcppFaddeeva Rmpfr RSQLite stabledist xtable xts yaml zoo]; }; ecdfHT = derive2 { name="ecdfHT"; version="0.1.1"; sha256="1n3n9n86pj8c54l3xvp7knvi0ajbnjmz9pi79p7wfq92a90fqx48"; depends=[rgl]; }; - ecespa = derive2 { name="ecespa"; version="1.1-11"; sha256="154zny4ny5cbba9wpm2wmgvsi7wl77aiagc660xpwfvpiwmbxsmk"; depends=[spatstat]; }; - echarts4r = derive2 { name="echarts4r"; version="0.3.2"; sha256="0ifjwxydi2an8m5jfp0l9bd34cm9572b2j4w1wka3i1jc7q1r3ff"; depends=[broom corrplot countrycode d3r data_tree dplyr htmltools htmlwidgets jsonlite magrittr purrr rstudioapi scales shiny]; }; + ecespa = derive2 { name="ecespa"; version="1.1-12"; sha256="09af1331y147lrfn1zks7lv93vfwfzc1r7zy82336jqx2idh6hvb"; depends=[spatstat]; }; + echarts4r = derive2 { name="echarts4r"; version="0.3.3"; sha256="0k12j804a4qv0my7dvypi5s9nr249cpfl6arfbaz7a6rbpxb8zam"; depends=[broom corrplot countrycode dplyr htmltools htmlwidgets jsonlite magrittr purrr rstudioapi scales shiny]; }; echelon = derive2 { name="echelon"; version="0.1.0"; sha256="0dw15igx8jwgfr1f7p5pspxjiqhqmfp7shdhq8g07f4bj76irzm4"; depends=[]; }; echo_find = derive2 { name="echo.find"; version="4.0.1"; sha256="1nadqqpxgx2ck16nzjp5ajm6714452qzllg5cq1jpisv1yb31db2"; depends=[boot minpack_lm]; }; echogram = derive2 { name="echogram"; version="0.1.2"; sha256="0kir7x32fk3fc63kr3b2j0hfkmivs2pwrlxyjvdg7xqc59hjp3ma"; depends=[geosphere readHAC]; }; echor = derive2 { name="echor"; version="0.1.5"; sha256="0knvvrpw5icyb02jrj8jhlj8ql1j145gxg6wagb458j7kjchqnan"; depends=[dplyr geojsonsf httr plyr purrr readr rlang tibble tidyr]; }; ecipex = derive2 { name="ecipex"; version="1.1"; sha256="16iyi6n0pnyfmy47b0ranjbh3spvq8cgkmcamzhgjfj7qn0ix184"; depends=[CHNOSZ]; }; eclust = derive2 { name="eclust"; version="0.1.0"; sha256="01x327w02m357lngmgv3drni2s67sass25xk9vni1z434n8i4428"; depends=[caret data_table dynamicTreeCut magrittr pacman pander stringr WGCNA]; }; - ecm = derive2 { name="ecm"; version="4.5.0"; sha256="1h24c0g0r8rwz76yx4hzazdbzbrjv5yqlaxpjbm3zsxp624mrsim"; depends=[car]; }; + ecm = derive2 { name="ecm"; version="5.0.0"; sha256="0vf6wcw0flqhngn712qf9ahaprizzv46af5qlrixqwgwn4q4kp9m"; depends=[car]; }; ecmwfr = derive2 { name="ecmwfr"; version="1.3.0"; sha256="0xwbcgd590vk4civa4s039avvvxsazzh9y05lw591mpm79lz19mj"; depends=[curl getPass httr keyring memoise]; }; - ecodist = derive2 { name="ecodist"; version="2.0.5"; sha256="1kijyik0fnjhl69j230mkkdnkknmrbzj43mcj3xv7jy61i2sy0by"; depends=[]; }; + ecoCopula = derive2 { name="ecoCopula"; version="1.0.1"; sha256="18gkib3m4p7vi9jgzyrnznl9kcjizlh77icqrv8xjpi40ksw9m2r"; depends=[betareg doParallel foreach glasso glm2 igraph MASS mgcv mvabund ordinal plyr sna tweedie]; }; + ecochange = derive2 { name="ecochange"; version="1.3"; sha256="16dpp887nv7afpvcgmpli0iv4jaz060vj0w63asfz04ix95jmcnl"; depends=[curl dplyr forcats gdalUtils getPass ggplot2 httr landscapemetrics lattice R_utils raster rasterVis readr rgdal rgeos rlang rvest sf sp tibble viridis xml2]; }; + ecodist = derive2 { name="ecodist"; version="2.0.7"; sha256="1dkf2m6glry5wzwfjiyw6sac89v6g0frbagr9cyfp2hcp0y5g4n2"; depends=[]; }; ecolMod = derive2 { name="ecolMod"; version="1.2.6"; sha256="1n30faldfhpm2jkaw793vr220kgn3bmn8hxhw32rax294krmwn4v"; depends=[deSolve diagram rootSolve shape]; }; ecolottery = derive2 { name="ecolottery"; version="1.0.0"; sha256="0w5aq1aaqzz74vlj8hgnmn60l8rdrchx022dpspqnpvpzdlh65z5"; depends=[abc ggplot2]; }; - econet = derive2 { name="econet"; version="0.1.81"; sha256="0hm1v4fjzyzdaxiw6lar7fxnqsckis3n7nrsravhbllhcf0aqq7w"; depends=[bbmle dplyr igraph intergraph MASS Matrix minpack_lm plyr sna spatstat_utils tnet]; }; - economiccomplexity = derive2 { name="economiccomplexity"; version="1.0"; sha256="1bqayzpfz26lb985l66j27qybyqx0148fiikb8diamq0mbx3picc"; depends=[igraph Matrix]; }; + econet = derive2 { name="econet"; version="0.1.92"; sha256="1csnsl9n5wvij9ach13m40cd92y60algj10fsljla6z3pv9vg0cg"; depends=[bbmle doParallel dplyr foreach igraph intergraph MASS Matrix minpack_lm plyr progressr sna spatstat_utils]; }; + econetwork = derive2 { name="econetwork"; version="0.4.1"; sha256="15x5x75y30zyk2k4bjbn44diwvxkl8j5dnzg6ln6czvzd1hy191w"; depends=[bipartite blockmodels igraph Matrix_utils rdiversity]; }; + economiccomplexity = derive2 { name="economiccomplexity"; version="1.1"; sha256="0ms5jr3d0hgch4di26wcaxrbl7q6iq2k53m2xwk0lxv6s1p373mp"; depends=[igraph Matrix Rdpack]; }; ecoreg = derive2 { name="ecoreg"; version="0.2.3"; sha256="1bhh4bnvrvgz49wim5r0b4awfsn9l23wvl4kl0vny0s4hm7cgahc"; depends=[]; }; ecorest = derive2 { name="ecorest"; version="1.0.0"; sha256="13x95z99yqld1fvfgzbm6ahrnvfvcqwlb23yjr187yg83iynh79v"; depends=[viridis]; }; ecoseries = derive2 { name="ecoseries"; version="0.1.5"; sha256="1q35hp5hl6z28hns5rnp3mjn6hqp5qh714pagw7fw4d4a6wnvacy"; depends=[magrittr RCurl readr rjson rvest tibble xml2 zoo]; }; ecosim = derive2 { name="ecosim"; version="1.3-1"; sha256="0gpgjswqmibnz9lpcidvw3y1wmd38l4lyha4fbs0agiz6yyfiyjn"; depends=[deSolve stoichcalc]; }; ecospace = derive2 { name="ecospace"; version="1.4.2"; sha256="0vfaf27bv687ypxg5apzv63rl495rxyflqw33j17i4h0s7cjkgrm"; depends=[FD]; }; ecospat = derive2 { name="ecospat"; version="3.1"; sha256="17mxny0m0pl0b4vn7slc2qqabjp3i91nz0yjwfvrd827s2hhcra9"; depends=[ade4 adehabitatHR adehabitatMA ape biomod2 classInt dismo doParallel ecodist foreach gbm gtools iterators maps maptools matrixStats poibin PresenceAbsence randomForest raster rms snowfall sp spatstat vegan]; }; + ecostats = derive2 { name="ecostats"; version="0.1.4"; sha256="0xkhkcc6psgvvwhys9azhxisnqw0azd7brp0rg60d725jqvwhbyp"; depends=[GET mgcv mvtnorm]; }; ecotox = derive2 { name="ecotox"; version="1.4.2"; sha256="0i4wjarg8gj4hfr0d4fqk74ymhkzrq3vkklpv5v1511ci19hpv16"; depends=[tibble]; }; ecotoxicology = derive2 { name="ecotoxicology"; version="1.0.1"; sha256="084xkr59d7x9zxmsnsyym2x8jshz6ag6rvnmhd1i6fzar8ypwccb"; depends=[]; }; ecoval = derive2 { name="ecoval"; version="1.2.7"; sha256="1hnryk9y3074iy7hv40jr00lpg2w99l7halwv6bj14v6ygddj2k7"; depends=[jpeg rivernet utility]; }; - ecp = derive2 { name="ecp"; version="3.1.2"; sha256="11f9p869xr0zg779i46gmflxlq4xclk9wxbab0nj2fan26pn4sfy"; depends=[Rcpp]; }; + ecp = derive2 { name="ecp"; version="3.1.3"; sha256="0n602jssl6rf596nwm6hbl7s9vdlqi20w8mrhxicj373mw5v22m8"; depends=[Rcpp]; }; ecr = derive2 { name="ecr"; version="2.1.0"; sha256="0vvkdxlcqaim9mkgwgdxrx1xhw3lshi1nxfw3kqllq14p3l6xss4"; depends=[BBmisc checkmate ggplot2 parallelMap ParamHelpers reshape2 smoof]; }; ectotemp = derive2 { name="ectotemp"; version="0.2.0"; sha256="172rij0mmk7dd10lpbsxm4yy7072nz1fh7jfiyqmagzs5hwa31jv"; depends=[dplyr psych]; }; ed50 = derive2 { name="ed50"; version="0.1.1"; sha256="058p1750ba5hp4rczi26grgwjia2ny1880v1vfp6wxad13r459pq"; depends=[boot]; }; @@ -7513,11 +7816,12 @@ in with self; { eddi = derive2 { name="eddi"; version="0.0.1"; sha256="19cgrqdcji509igb6rmlwb75xyyvrh34nv6zyjjfcsc31p5nvf95"; depends=[raster rgdal]; }; eddington = derive2 { name="eddington"; version="2.1.1"; sha256="0v88v2xmvirnj661jsg2qh7n8afaw71mqks9csnmmz3c16agp7b6"; depends=[Rcpp]; }; edeR = derive2 { name="edeR"; version="1.0.0"; sha256="1dg0aqm5c4zyf015hz1hhn3m4lfvybc4gc1s7sp8jcsk46rxz0cc"; depends=[rJava rjson rJython]; }; - edeaR = derive2 { name="edeaR"; version="0.8.5"; sha256="0f9isfcpzc4r6z06hagnvrxfv1wizwv2ab59bv86df4c1l7sxz2c"; depends=[bupaR data_table dplyr forcats ggplot2 ggthemes glue hms lubridate miniUI purrr rlang shiny shinyTime stringr tibble tidyr zoo]; }; + edeaR = derive2 { name="edeaR"; version="0.8.6"; sha256="13hzb7m2rb6crxsia3d5szyz59kyd3506j8avbr51a7cps1bqaj0"; depends=[bupaR data_table dplyr forcats ggplot2 ggthemes glue hms lubridate miniUI purrr rlang shiny shinyTime stringr tibble tidyr zoo]; }; edf = derive2 { name="edf"; version="1.0.0"; sha256="14ikm6j0ndxrk7c7lh5mbd2aci46d4j9a30mvcgnxy3kq6046a7b"; depends=[]; }; edfReader = derive2 { name="edfReader"; version="1.2.1"; sha256="076far4fhd6rpa6fwffad4cgchjvar135yblvlrm33s9pd5bf0hn"; depends=[]; }; edfun = derive2 { name="edfun"; version="0.2.0"; sha256="1wxx6bgy03z7c1d6556bbjl1cb49n2vn734fw2d5c1jk0zsh3fmz"; depends=[]; }; edgar = derive2 { name="edgar"; version="2.0.3"; sha256="129q32bnpcx0l2ffnids87692hc7nbg4hw3r117aamp835i12gri"; depends=[qdapRegex R_utils stringi stringr tm XML]; }; + edgarWebR = derive2 { name="edgarWebR"; version="1.0.3"; sha256="00whhcb57b23id2gsvfijschjdwvk0fjhh8pv4jhgfiadsjljkfx"; depends=[httr xml2]; }; edgeCorr = derive2 { name="edgeCorr"; version="1.0"; sha256="19n67yc58ksin7xydrnfsyyw7fqawm5xli67cz4lv4wb62w6r6ld"; depends=[]; }; edgeRun = derive2 { name="edgeRun"; version="1.0.9"; sha256="0d5nc8fwlm61dbi00dwszj1zqlij4gfds3w1mpcqnnfilr2g3di1"; depends=[data_table edgeR]; }; edgebundleR = derive2 { name="edgebundleR"; version="0.1.4"; sha256="0pajr95qqppk2m4l7rfi46rll32z8a7lmq0vmb3p8n0aks5ajn1n"; depends=[htmlwidgets igraph rjson shiny]; }; @@ -7531,19 +7835,21 @@ in with self; { educineq = derive2 { name="educineq"; version="0.1.0"; sha256="0qd6kvcy280glv3q6lcrawmnsfvp90as95chgi3hav0yj2dpakn6"; depends=[flexsurv ineq]; }; edwards97 = derive2 { name="edwards97"; version="0.1.0"; sha256="1ybksvrp7pd78ncmzdn67q9w3baxx6kf886214cqa5yfbi8jsc4z"; depends=[broom cli glue rlang tibble withr]; }; eechidna = derive2 { name="eechidna"; version="1.4.0"; sha256="07537brbdinkrmygbd2galyl6acbcbg2pkjafkdhxdgklpxv7j9m"; depends=[colourpicker dplyr ggplot2 ggthemes magrittr plotly purrr rgdal rgeos shiny sp stringi tibble tidyr tidyselect]; }; + eefAnalytics = derive2 { name="eefAnalytics"; version="1.0.8"; sha256="14wxba97nd64xh6lnpdbap3zcrj5iblrqc75izblcvl4sligc0sx"; depends=[lme4 metafor mvtnorm rstanarm]; }; eegkit = derive2 { name="eegkit"; version="1.0-4"; sha256="1r1lack4ps9hwqq56rq37431rcxf3x79zgvda6vrmh4s0ziy6v4x"; depends=[bigsplines eegkitdata ica rgl signal]; }; eegkitdata = derive2 { name="eegkitdata"; version="1.0"; sha256="1krsadhamv1m8im8sa1yfl7injvrc4vv3p88ps1mpn8hibk5g51m"; depends=[]; }; eel = derive2 { name="eel"; version="1.1"; sha256="0cv6dhw57yy140g73z94g9x1s42fpyfliv9cm2z1alm7xwap1l0x"; depends=[emplik rootSolve]; }; eemR = derive2 { name="eemR"; version="1.0.1"; sha256="1w3nwlrbxm7z4c3acx991zk5drgs67qys7kgl0qakh5vrdsrxw3v"; depends=[assertthat dplyr pracma purrr R_matlab rlist stringr viridis]; }; eeptools = derive2 { name="eeptools"; version="1.2.4"; sha256="048gz26dqgfsnxhp4r99j7p4s4d5pxsjci5zw8wjvv35lizij573"; depends=[arm data_table ggplot2 maptools vcd]; }; eesim = derive2 { name="eesim"; version="0.1.0"; sha256="0ljj1jp9cl0im8k7sfjd28ggj4q9a14df3554kwxkssr1vsn1wbc"; depends=[dplyr lubridate purrr viridis]; }; + ef = derive2 { name="ef"; version="1.2.0"; sha256="1ic26mwjv221yyjj16v9xcdxsg3pl6wsp82iaprihdcndswccvzi"; depends=[dplyr Matrix mgcv RcppEigen TMB]; }; effectFusion = derive2 { name="effectFusion"; version="1.1.2"; sha256="0m392wrkmgvys7a2bk2w1swfkjikkllng8sy8wb8s2j9y6c3wanp"; depends=[bayesm cluster ggplot2 GreedyEPL gridExtra MASS Matrix mcclust]; }; effectR = derive2 { name="effectR"; version="1.0.2"; sha256="1icr1sx98x3h8rbky1agdh809arhjqcypyajl7y50yis8a5pkycb"; depends=[ggplot2 reshape2 rmarkdown seqinr shiny viridis]; }; effects = derive2 { name="effects"; version="4.2-0"; sha256="0iks79rd4knrd81x4kvcpgpclr69l0m0v6sfla8k3wzkcnydycv8"; depends=[carData colorspace estimability insight lattice lme4 nnet survey]; }; - effectsize = derive2 { name="effectsize"; version="0.3.2"; sha256="0h9f260gb8707pcssf8dq7dakpq1ggkxr5kpbrbl8sn8h3qbvws9"; depends=[bayestestR insight parameters]; }; + effectsize = derive2 { name="effectsize"; version="0.4.1"; sha256="1rbl63b1c7z9llznnwvclqrcgdd4hfmc7y66v7raqqf2a4nadqa5"; depends=[bayestestR insight parameters]; }; effectsizescr = derive2 { name="effectsizescr"; version="0.1.0"; sha256="0shfjk6r3bz04jakrn5nwgymjx60lk83i0akcx7zqfxp3k8yncs5"; depends=[Kendall]; }; efflog = derive2 { name="efflog"; version="1.0"; sha256="1sfmq7xrr6psa6hwi05m44prjcpixnrl7la03k33n0bksj8r1w6b"; depends=[]; }; - effsize = derive2 { name="effsize"; version="0.8.0"; sha256="129g9nv6qmbh6z7gazx4vxs5myvcgdhszi28396gsvzrlzi0ik8b"; depends=[]; }; + effsize = derive2 { name="effsize"; version="0.8.1"; sha256="1m5ch2g77f4ldbxhzp2ls1pga8hq7ggkz1xs8a90h0s09rj0gd7w"; depends=[]; }; efreadr = derive2 { name="efreadr"; version="0.2.2"; sha256="1h27by1m451wrnw017005avs5yj3fjzrm2lq5153aqm1mbbxxwvs"; depends=[dplyr ensurer magrittr readr]; }; efts = derive2 { name="efts"; version="0.9-0"; sha256="1cdn37sij3q73z9gal6x3nnnds55whfj5ywyww119hx092xcb2h4"; depends=[lubridate magrittr ncdf4 plyr stringr udunits2 xts]; }; ega = derive2 { name="ega"; version="2.0.0"; sha256="04kwh24aap22yclmcrix3vi553qb30hd43mgfzpdl0cw3ibrh7xg"; depends=[ggplot2 mgcv]; }; @@ -7551,23 +7857,24 @@ in with self; { egg = derive2 { name="egg"; version="0.4.5"; sha256="1fy7srpiavfn8kyrr1m84an7acgwi6ydzrg71m3b0vk7y9ybmj0m"; depends=[ggplot2 gridExtra gtable]; }; eggCounts = derive2 { name="eggCounts"; version="2.3"; sha256="0y74dd8s406yz6nhwlb09hgarw90a68wji2vykxpqcrfll814g7q"; depends=[BH boot coda lattice numbers Rcpp RcppEigen rootSolve rstan StanHeaders]; }; egor = derive2 { name="egor"; version="0.20.06"; sha256="1fpx5bf0cqkclk91d45hglr2bmksbf2sf5g3mc7l0n872z2xdhjp"; depends=[dplyr igraph network purrr rlang shiny srvyr tibble tidygraph tidyr]; }; - eha = derive2 { name="eha"; version="2.8.1"; sha256="00sny5wm415drcsvvzq6gk9r4fc4z7f7y9lix61hnf8ibqfv7bb1"; depends=[survival]; }; + eha = derive2 { name="eha"; version="2.8.4"; sha256="03yg2pkypjksq6jh30ji4665j40r69d0bjff35kngy8kdfby5dr8"; depends=[survival]; }; ehaGoF = derive2 { name="ehaGoF"; version="0.1.1"; sha256="15hpzj3ridl6w3pd5z86d88cc88jw09qpqhsdwkar4dby8lgxhi0"; depends=[]; }; ehelp = derive2 { name="ehelp"; version="1.2"; sha256="0264nx4bidrbwhlxx9llarvh4zb3xnzln8km14823q1hclkpm2fq"; depends=[]; }; ei = derive2 { name="ei"; version="1.3-3"; sha256="0i8pvpal23zwsqldhmm3iis4vw9s08mlydpshaig2dsd9549gn11"; depends=[cubature eiPack ellipse foreach MASS mnormt msm mvtnorm plotrix sp tmvtnorm ucminf]; }; + eiCompare = derive2 { name="eiCompare"; version="3.0.0"; sha256="0cpllc4aq52mga2cc8ms1q4qf633r13i5j6267vnvqyb6zq0r47y"; depends=[bayestestR censusxy coda data_table doParallel dplyr ei eiPack foreach ggplot2 leaflet magrittr mcmcse overlapping purrr rlang sf stringr tidyr tidyselect wru]; }; eiPack = derive2 { name="eiPack"; version="0.2-1"; sha256="0xcgl9pr6d960zhp8fd944ba5p5ybp520lp2a4jgsj1lcvqf8xbn"; depends=[coda MASS msm]; }; eia = derive2 { name="eia"; version="0.3.6"; sha256="1fyvm2j53m0mq53ld6kgr8nmf020vcp9jcafsbk7xaymgxncvmqr"; depends=[dplyr httr jsonlite lubridate magrittr memoise purrr readxl tibble]; }; - eicm = derive2 { name="eicm"; version="1.0.0"; sha256="1xa4rfwq64zf5zkdxqslzmph3qc99mfrb8gvf00mqx6qvdzj3475"; depends=[doSNOW foreach GA iterators pso snow ucminf]; }; + eicm = derive2 { name="eicm"; version="1.0.1"; sha256="0gil445xrsd1hhi5l6i3mn7kf4mbfwwhfkgmyja62dj68m4akwfz"; depends=[doSNOW foreach GA iterators optimParallel pso snow ucminf]; }; eigeninv = derive2 { name="eigeninv"; version="2011.8-1"; sha256="18dh29js824d7mrvmq3a33gl05fyldzvgi8mmmr477573iy9r30g"; depends=[]; }; eigenmodel = derive2 { name="eigenmodel"; version="1.11"; sha256="1l3n0z736xf3x6cyxzmmq1jb2glxi2b75z7v39y4471knh6nbb4d"; depends=[]; }; eigenprcomp = derive2 { name="eigenprcomp"; version="1.0"; sha256="156qyv7sl8nng55n3ay6dnpayyfrqv27ndz40xf4w92is9zmymy0"; depends=[]; }; eikosograms = derive2 { name="eikosograms"; version="0.1.1"; sha256="13s5wqcc8iwnhn3msrh9dfrvq9bwlby93p9v5wcnrm8m9iskax1s"; depends=[plyr]; }; eimpute = derive2 { name="eimpute"; version="0.1.1"; sha256="1ipm6v4irk4d4qxld09h8r0kknjmbikvn27y68wq7r02qhcvj4nv"; depends=[Rcpp RcppEigen]; }; einet = derive2 { name="einet"; version="0.1.0"; sha256="02v4k6031q2bcjkhbypzkgdj1lyvqbsi1nb0y40zb26bk2381ycq"; depends=[assertthat entropy igraph magrittr shiny]; }; + eirm = derive2 { name="eirm"; version="0.2.0"; sha256="1cd5ig79lr3zwydf89bhpqj86b757z74m3w7ca2yw7n6zhxy8qy5"; depends=[lme4 optimx reshape2]; }; eive = derive2 { name="eive"; version="2.3"; sha256="073hwx944db7zxq6yib6yvciaic11k49zl1iqphippcd5ygkad80"; depends=[Rcpp]; }; eivtools = derive2 { name="eivtools"; version="0.1-8"; sha256="0ynmrql6dv10m7cwba5mzwlbvp6ab53nzqqvk3ihwyiqzmnnmpk4"; depends=[R2jags]; }; - eixport = derive2 { name="eixport"; version="0.4.7"; sha256="10jfyagwc0g2qaxw1asyw906m0g9llyfjsn457hb8h06p31gbi89"; depends=[cptcity ncdf4 raster sf sfheaders silicate sp tidyr]; }; - elaborator = derive2 { name="elaborator"; version="1.0"; sha256="1jhs1hiwlww0sr3yacg5amr1mhwjwa10b374klrkkvzzw2y20p1x"; depends=[bsplus dendextend dplyr forcats gclus haven plotly purrr RColorBrewer reshape2 rlang seriation shape shiny shinyBS shinycssloaders shinydashboard shinyjs shinyWidgets tidyr V8]; }; + eixport = derive2 { name="eixport"; version="0.5.0"; sha256="1k5p9v5jmw5cs31sn69fjdfhh5yyzk85828aljsmsyx1ycibnwmg"; depends=[cptcity data_table ncdf4 raster sf sp]; }; elasso = derive2 { name="elasso"; version="1.1"; sha256="0nz3vw803dvk4s45zc9swyrkjwna94z84dn4vfj3j17h74a0cij2"; depends=[glmnet SiZer]; }; elastic = derive2 { name="elastic"; version="1.1.0"; sha256="1xg8gqa0maasx85fbff4vid2r8s0fgzj4iswyayybzik99zb26ly"; depends=[crul curl jsonlite R6]; }; elasticIsing = derive2 { name="elasticIsing"; version="0.2"; sha256="1zjgvz7w5j06x2cd1fzjl85di95ah67m1lanw01kic2bvhfwfbn6"; depends=[cvTools glmnet magrittr qgraph reshape2]; }; @@ -7580,8 +7887,8 @@ in with self; { electionsBR = derive2 { name="electionsBR"; version="0.3.1"; sha256="0yxaxd84d13mb6xbixgm9rd56alrh5qnrmh54n1h94mna89jb103"; depends=[data_table dplyr haven magrittr readr]; }; electivity = derive2 { name="electivity"; version="1.0.2"; sha256="0clxsn9zkpdlq9jgq029ag310ji0hd0l23wfyqh8gkkj0091ip5a"; depends=[]; }; electoral = derive2 { name="electoral"; version="0.1.2"; sha256="1kf5ix0bmrh7zwgg87zf10s8pvq32fpqlmyw2dq1kf9gv3s91p04"; depends=[dplyr ineq tibble]; }; - elementR = derive2 { name="elementR"; version="1.3.6"; sha256="12gg2x6xzms2ni80qdm04bfajg55ff6zkki0y2cz47kq70wzfkmg"; depends=[abind colourpicker devtools EnvStats gdata gnumeric httpuv lmtest outliers R6 reader readODS readxl shiny shinydashboard shinyjs stringr tcltk2 zoo]; }; - elevatr = derive2 { name="elevatr"; version="0.2.0"; sha256="0721w28pb07ndw24k4zssh5r90fd4mf33yxigricnz23z29ql120"; depends=[httr jsonlite progress raster sf sp]; }; + elementR = derive2 { name="elementR"; version="1.3.7"; sha256="01xbqargzc0bp1l5rcvxikr95ghj9w7w5byhrjbgwbia6y7zhxa2"; depends=[abind colourpicker devtools EnvStats gdata gnumeric httpuv lmtest outliers R6 reader readODS readxl shiny shinydashboard shinyjs stringr tcltk2 zoo]; }; + elevatr = derive2 { name="elevatr"; version="0.3.1"; sha256="0sjmzcbq5445fcxzwhcxni2wdajhaa4p56yyr034bphkmbissq6i"; depends=[httr jsonlite progress raster sf sp]; }; elexr = derive2 { name="elexr"; version="1.0"; sha256="1xmrzlp55z6k3psdg4a3x3rsilvq3k37v9r7ydfn80ahvqjz0fqh"; depends=[]; }; elfDistr = derive2 { name="elfDistr"; version="1.0.0"; sha256="11h91mwiw2pr0c8zvyzqql275falpiajv784n2rd5xs9azprqdd0"; depends=[Rcpp]; }; elhmc = derive2 { name="elhmc"; version="1.1.0"; sha256="0ngva7rnfj75fq93ycsv929m9ykijp48r7cvd6sfmi0sqsjinax5"; depends=[emplik MASS plyr]; }; @@ -7590,23 +7897,24 @@ in with self; { ellipse = derive2 { name="ellipse"; version="0.4.2"; sha256="1wm5v7zdv2drgdba7z96jwsx74mqhlq80qgrvdb4vb5r02dcw68p"; depends=[]; }; ellipsis = derive2 { name="ellipsis"; version="0.3.1"; sha256="1nvmkcca57d9067rcggw1gby80ibx5hplk2myz0cs9zwilaib2jg"; depends=[rlang]; }; elliptic = derive2 { name="elliptic"; version="1.4-0"; sha256="1dhba0yfxjd5rlqsxp5a7s2hclfkla9wigsr39dlma67l6qjjmxn"; depends=[MASS]; }; + ellipticalsymmetry = derive2 { name="ellipticalsymmetry"; version="0.1"; sha256="10i656dg4ld7i5b21g528knirkl0lqk96rx5v32lm5zzf4axsl76"; depends=[ICSNP]; }; elmNNRcpp = derive2 { name="elmNNRcpp"; version="1.0.2"; sha256="1labr1a9r563wg2m3insrpf98wcq5fdkql5fi58c9k8lg5b1knl3"; depends=[KernelKnn Rcpp RcppArmadillo]; }; elo = derive2 { name="elo"; version="2.1.1"; sha256="1i6qcw2plw12v065142kx58d911zr1gcsd1xic152zxvh89nmhxx"; depends=[pROC Rcpp]; }; elsa = derive2 { name="elsa"; version="1.1-28"; sha256="01sj2a4yhv5m6qj6ih26zw4yzd8s27lll7yp0yysjjrwz79a0fbq"; depends=[raster sp]; }; emIRT = derive2 { name="emIRT"; version="0.0.11"; sha256="1h91q9vi9cv14bmkaakyynw2z9sx51w0c2kw2in0x91wx7scmd0p"; depends=[pscl Rcpp RcppArmadillo]; }; - emayili = derive2 { name="emayili"; version="0.4.0"; sha256="087h50pzk0nsj7y639yb5rsar26x0rc722m1ryrjfsn21xap82x1"; depends=[base64enc curl glue httr magrittr mime stringi]; }; - emba = derive2 { name="emba"; version="0.1.6"; sha256="175r1gxaqcvdqr1jil95f6kcl28rsvai9yb4z5hbg2jh68hfxr0b"; depends=[Ckmeans_1d_dp dplyr igraph purrr readr rje stringr tibble tidyr tidyselect usefun visNetwork]; }; - embed = derive2 { name="embed"; version="0.1.1"; sha256="0prwm787d0l48hzdwwfsn4ly6mkjxls4vrpbh44lrmym6dl4kvcq"; depends=[dplyr generics keras lme4 purrr recipes rlang rsample rstanarm tensorflow tibble tidyr uwot withr]; }; - embryogrowth = derive2 { name="embryogrowth"; version="7.6"; sha256="0bsg904jikb1dqichkinpgm0difg17sfczw6q4zab6r02s7yb53s"; depends=[deSolve HelpersMG numDeriv optimx]; }; + emayili = derive2 { name="emayili"; version="0.4.4"; sha256="181zdr7wj7r4z8crd81dncgil2dka0cnwqmhw5cpwyrgczl1fmkf"; depends=[base64enc curl glue httr magrittr mime stringi]; }; + emba = derive2 { name="emba"; version="0.1.7"; sha256="1pc72xfjsl4x63k7dw8f4pp8as6jlqdpwkgdw27znc9n4ffvmdpm"; depends=[Ckmeans_1d_dp dplyr igraph purrr readr rje stringr tibble tidyr tidyselect usefun visNetwork]; }; + embed = derive2 { name="embed"; version="0.1.3"; sha256="0mhk992mq3lpwc6xrhx080lr4ljqkx5vpf674gzbyxwkk26gyivy"; depends=[dplyr generics keras lme4 purrr recipes rlang rsample rstanarm tensorflow tibble tidyr uwot withr]; }; + embryogrowth = derive2 { name="embryogrowth"; version="8.0"; sha256="0nz4zw3qr9a93cq1aliqa7m01xll8qg00m7rqgy85j905wmv8i1c"; depends=[deSolve HelpersMG numDeriv optimx]; }; emdbook = derive2 { name="emdbook"; version="1.3.12"; sha256="0ls3zxxlwmdv7zn1v9i1y9zc2sn0hbgmyjvsj7zn3ajsw7wwlih6"; depends=[bbmle coda lattice MASS plyr]; }; emdi = derive2 { name="emdi"; version="2.0.1"; sha256="1yvfw06c569lwb6z54xa1j7fm6fqkxw0cdxi9g6hnf9qf1f2xw9z"; depends=[boot formula_tools ggplot2 gridExtra HLMdiag maptools MASS moments MuMIn nlme openxlsx parallelMap readODS reshape2 rgeos saeRobust spdep]; }; emdist = derive2 { name="emdist"; version="0.3-1"; sha256="1z14pb9z9nkd0f2c8pln4hzkfqa9dk9n3vg8czc8jiv0ndnqi7rq"; depends=[]; }; emg = derive2 { name="emg"; version="1.0.9"; sha256="04sm05xnjns7wcvpk35ywkxy6g0mm84r060mkmzh64wq58c2q06l"; depends=[moments]; }; emhawkes = derive2 { name="emhawkes"; version="0.9.0"; sha256="1h6map6w66q91s6g1qr9wfk589cbvva1banqrxzzf29g7ihl15vh"; depends=[maxLik]; }; - emld = derive2 { name="emld"; version="0.5.0"; sha256="0b1jr69qafn3jn7yvngiyqfzmfqc7pn67p3dxwypi9dl3ygqv24s"; depends=[jsonld jsonlite xml2 yaml]; }; + emld = derive2 { name="emld"; version="0.5.1"; sha256="0cvnfvzskvpcqzs6fwrpjcqrc6yrfciliy9jj0c9h4iyag0g0b9b"; depends=[jsonld jsonlite xml2 yaml]; }; emma = derive2 { name="emma"; version="0.1-0"; sha256="0psd8lrbcqla8mkhp0wlassaaimgwlmqy5yv2wwcq59mc5k1v27f"; depends=[clusterSim earth]; }; emme2 = derive2 { name="emme2"; version="0.9"; sha256="035s4h95ychqb14wib0dqbg4sjy9q01fsryr0ri25g1hsi5f8lpm"; depends=[reshape]; }; - emmeans = derive2 { name="emmeans"; version="1.5.0"; sha256="09nap4aazpbsswqzk0d4kjngwd8sib222s31yd08sd1sqw432c6k"; depends=[estimability mvtnorm numDeriv plyr xtable]; }; + emmeans = derive2 { name="emmeans"; version="1.5.3"; sha256="11x7bn260v91gb7qri1pq54l339zm4msa5frc8saqb9ykbg4dby5"; depends=[estimability mvtnorm numDeriv plyr xtable]; }; emoa = derive2 { name="emoa"; version="0.5-0.1"; sha256="0rkr4d4fyqxmsrlbzar27z97qkw4cl1dkvfnhbdwpgg9fi1cixmz"; depends=[]; }; emojifont = derive2 { name="emojifont"; version="0.5.3"; sha256="1cdrrl3hvrs8rskyy6zgr7q2mmg8yb9k8sld1m64zsp7y009g19k"; depends=[ggplot2 proto showtext sysfonts]; }; emon = derive2 { name="emon"; version="1.3.2"; sha256="19khjjpyxvzhzihqq15w02l5v5ryyvxlklz1ch2gkmqcpnvyga32"; depends=[MASS mgcv]; }; @@ -7616,13 +7924,13 @@ in with self; { emplik = derive2 { name="emplik"; version="1.1-1"; sha256="1kw8g8j075bsicdvgkjf4870rfv5c30gvmw6qkkaz3ki22x74w77"; depends=[quantreg]; }; emplik2 = derive2 { name="emplik2"; version="1.21"; sha256="1980bwc4fc4rwzlwya030n5rv8rq0s82hnw955mvaxrbmicnqlla"; depends=[]; }; ems = derive2 { name="ems"; version="1.3.2"; sha256="1ambmd183f9959kwms71q3ks187y2ngpab45xlclpm2108n5j3pb"; depends=[boot rms survival]; }; - emstreeR = derive2 { name="emstreeR"; version="2.2.0"; sha256="1qbv61j2ya6zvyp8494xi8dhjlb58jmqil9cm5z0pr7p2sr6l32r"; depends=[BBmisc BH ggplot2 Rcpp RcppArmadillo RcppMLPACK scatterplot3d]; }; - emuR = derive2 { name="emuR"; version="2.1.0"; sha256="12virgawhgbmpg37w64ncwghfiarj9zr7njy5az6klgny422fj87"; depends=[base64enc DBI dplyr git2r httpuv httr jsonlite mime purrr readr rlang RSQLite rstudioapi shiny stringr tibble tidyr uuid wrassp]; }; + emstreeR = derive2 { name="emstreeR"; version="2.2.2"; sha256="0lchkkn6s265xnk25bprijlc6nl62nwcp0l9nwplyw7q492ysg0q"; depends=[BBmisc BH ggplot2 Rcpp RcppArmadillo RcppMLPACK scatterplot3d]; }; + emuR = derive2 { name="emuR"; version="2.1.1"; sha256="1b6fzipnlx17ycy4nvprjk2lqmnjpi07v02bz86kas9j750xlnd2"; depends=[base64enc DBI dplyr git2r httpuv httr jsonlite mime purrr readr rlang RSQLite rstudioapi shiny stringr tibble tidyr uuid wrassp]; }; emulator = derive2 { name="emulator"; version="1.2-20"; sha256="11z25iqyzck0s4hw0i86i9jsi52w9bjxx3zdpafssyfqfk7z5avw"; depends=[mvtnorm]; }; enRich = derive2 { name="enRich"; version="3.1"; sha256="0xl9rhz6mflzp1g5d51xz74dsm8qp16jbkflhzrha3vfirn2jh8q"; depends=[]; }; enc = derive2 { name="enc"; version="0.2.2"; sha256="16x8cckw0ah2yfczvv4j1jy4f8m23fkac38fz068964sv4l8z645"; depends=[]; }; encode = derive2 { name="encode"; version="0.3.6"; sha256="04zwclmqasbx54m77wqfr9jg4axhkkqnykaxv3if8lnr46fl3zyc"; depends=[]; }; - encryptedRmd = derive2 { name="encryptedRmd"; version="0.2.0"; sha256="0fvh2fs7az02gxl169cvfx4i9cl8hk4vc8fz2v21pym7nq8c8y3k"; depends=[readr rmarkdown sodium]; }; + encryptedRmd = derive2 { name="encryptedRmd"; version="0.2.1"; sha256="0agd5lqrmdi50r9fl25njwsvg91nqsvj4h6c639vfhxx7p9y9nfk"; depends=[readr rmarkdown sodium]; }; encryptr = derive2 { name="encryptr"; version="0.1.3"; sha256="01gsimhrb9c7k5d9h5dbvm4h9i7fc9vzi8wgqb5f191ki27fsw9w"; depends=[dplyr knitr openssl purrr readr rlang]; }; endoSwitch = derive2 { name="endoSwitch"; version="1.0.0"; sha256="1cj4skk317ppnayk1ph63vll49vs74fljc25cn1iviwgjq64ly0k"; depends=[data_table maxLik msm]; }; endogMNP = derive2 { name="endogMNP"; version="0.2-1"; sha256="0maxcp321ngbxrg0i23nlwhj849v771xahh53367x928ss4f8v7i"; depends=[]; }; @@ -7634,6 +7942,7 @@ in with self; { enetLTS = derive2 { name="enetLTS"; version="0.1.0"; sha256="0lqnhrsg9fnkn8z5crdrajpgavk1knr9z4sbdffpa6q9n8s5pmhr"; depends=[cvTools ggplot2 glmnet reshape robustHD]; }; english = derive2 { name="english"; version="1.2-5"; sha256="0d6rin40wy2y6k75x8d5qvf03rfy139f309wrl8xwbdb1h8fjkd1"; depends=[]; }; engsoccerdata = derive2 { name="engsoccerdata"; version="0.1.5"; sha256="06fdgjgnk4lwshrkd0jad411x5nz9sxlri9fdhxrf2dr2hik4l8q"; depends=[dplyr magrittr tidyr]; }; + ennet = derive2 { name="ennet"; version="0.1.0"; sha256="07kcf3lz4jjikl94q5mgrs95xbiqiaa35kh1cc4nfk79l1fvydkg"; depends=[dplyr lubridate magrittr rvest stringr tibble xml2]; }; enpls = derive2 { name="enpls"; version="6.1"; sha256="12088v9xnj5b3dlakqz1hbzxz4mdai7xi7s2fpx8lj3y3lx7znmb"; depends=[doParallel foreach ggplot2 plotly pls reshape2 spls]; }; enrichR = derive2 { name="enrichR"; version="2.1"; sha256="0ymhzs9d2wl0s9rvbqc1hqb78mlzwhlc7mmijpfqkm5r720pf6m1"; depends=[httr rjson]; }; enrichwith = derive2 { name="enrichwith"; version="0.3.1"; sha256="05fhx323ani86wdxbjp8dgw4d1iq4kr1887646w072a6iq93bwhm"; depends=[]; }; @@ -7644,21 +7953,23 @@ in with self; { ensr = derive2 { name="ensr"; version="0.1.0"; sha256="18b81iswvby7k5akbfdyc6a8j1621d4d35hxmgjip5kyvf5cb3p8"; depends=[data_table ggplot2 glmnet]; }; ensurer = derive2 { name="ensurer"; version="1.1"; sha256="1gbbni73ayzcmzhxb88pz6xx418lqjbp37sdkggbrxcyhsxpdkid"; depends=[]; }; entcn = derive2 { name="entcn"; version="0.1.0"; sha256="0wpa1293d1bdlx8pikzfh4vqhw7p45bi140aj3x4m8p21h5b4gd6"; depends=[bitops RCurl rjson RYoudaoTranslate stringr]; }; - entropart = derive2 { name="entropart"; version="1.6-4"; sha256="1wr3pkn786crklsjzg1kq3dm1ks230jp391g31cgf5hfm537c3qb"; depends=[ade4 ape EntropyEstimation ggplot2 ggpubr reshape2 SPECIES vegan]; }; + entropart = derive2 { name="entropart"; version="1.6-6"; sha256="0i1zmzhvjb070frc37mw13w1cq3n78j62a98yw0s12fd9vz5c6yc"; depends=[ade4 ape EntropyEstimation ggplot2 ggpubr reshape2 SPECIES vegan]; }; entropy = derive2 { name="entropy"; version="1.2.1"; sha256="10vg4818q5g54pv2nn9x5i7pvky5nsv96syy47pz2mgqp1273cpd"; depends=[]; }; entrymodels = derive2 { name="entrymodels"; version="0.2.1"; sha256="0fz7jzax12pzw47iry4amgg9z4z3z94kig6r5dhcqa84kq02294v"; depends=[dplyr magrittr readr]; }; envDocument = derive2 { name="envDocument"; version="2.4.1"; sha256="074m7adnasvys28kjdgj9071fi90vsl4yv5zvpxik4crlx098dlw"; depends=[]; }; envalysis = derive2 { name="envalysis"; version="0.4"; sha256="1qfg8z63qc6n8agv0g7n3qjcwid32axwkyyjjxa271by335aplha"; depends=[drc ggplot2]; }; enveomics_R = derive2 { name="enveomics.R"; version="1.8.0"; sha256="00akdhqs7jabk7g33rwmxs92jcr39shy9s456nqxk6x4244d2vb3"; depends=[fitdistrplus investr sn]; }; + envi = derive2 { name="envi"; version="0.1.3"; sha256="09w5733gnicmylxp7asac2f0597js0yh657fzcp0rxf1p29gwcm9"; depends=[concaveman cvAUC doParallel fields foreach maptools pls raster rgeos ROCR sp sparr spatstat]; }; enviGCMS = derive2 { name="enviGCMS"; version="0.6.6"; sha256="01y3qqh99aclarglpdg8mb9iikzkm1w62mv93m22lm8ami25a372"; depends=[animation BiocParallel data_table mixtools RColorBrewer Rdisop]; }; enviPat = derive2 { name="enviPat"; version="2.4"; sha256="1gvb7jmwwh4l44b50xmrq3bysr2iv6442yh9pdk6n81g3bgpz1d0"; depends=[]; }; enviPick = derive2 { name="enviPick"; version="1.5"; sha256="04q6zwqq2ip8b8h2n1jpgx1bzcvi7lazljs0806wiakbc79x232p"; depends=[readMzXmlData shiny]; }; + envir = derive2 { name="envir"; version="0.1.0"; sha256="1mxjccqgak0x1kq2vb8g6avjxnar8n5jyckk4r5qbn7fhvmnrrhc"; depends=[]; }; envirem = derive2 { name="envirem"; version="2.2"; sha256="061p76w76hhs201p3l4wvbfbrcd9h8bigkn5xpsz5pmvhd2hrdkn"; depends=[knitr palinsol raster RSAGA sf]; }; envlpaster = derive2 { name="envlpaster"; version="0.1-2"; sha256="11a5n40k1ln5gxxvwq1vh4dhmhifhlm89hkhf36qnhj4bjh3v3y0"; depends=[aster aster2 caTools MASS]; }; - envnames = derive2 { name="envnames"; version="0.4.0"; sha256="12mfbcksrp733jycasaiavlsmx138xmjpywly1wha4ds6bfw93hr"; depends=[]; }; + envnames = derive2 { name="envnames"; version="0.4.1"; sha256="1fkbid2x60m63dnrxrdq7im49spn8m70g1gd8nqjq3xlv642ianm"; depends=[]; }; envoutliers = derive2 { name="envoutliers"; version="1.1.0"; sha256="1wgrrkkpkmf300qb56mq6nxigwnpq551sjxlk05lk3ckawx66srf"; depends=[car changepoint ecp ismev lokern MASS robustbase]; }; eoR = derive2 { name="eoR"; version="0.4.0"; sha256="0vn4s4af94n9h6x7z14qwpz94rgsd5m3mv55wva7x3h99ryhm83s"; depends=[data_table]; }; - eoffice = derive2 { name="eoffice"; version="0.1.9"; sha256="019z09jml67ymc2y8y853nflcsvibkligvnngar8f9qv3k2j5k7j"; depends=[broom devEMF dplyr flextable ggplot2 ggplotify htmlwidgets magick magrittr officer plotly R_devices rvg]; }; + eoffice = derive2 { name="eoffice"; version="0.2.1"; sha256="03g8r3xnsnnlyj7y07jm3qjhlv3pkf8v2lxpqzd24ncncxmbcxmi"; depends=[broom devEMF dplyr flextable ggplot2 ggplotify htmlwidgets magick magrittr officer plotly R_devices rvg]; }; epade = derive2 { name="epade"; version="0.3.8"; sha256="1alvsifc6i71ilm1xxs1d7sqlapb48bqd6z2n4wi6pqcjvwp7bif"; depends=[plotrix]; }; epandist = derive2 { name="epandist"; version="1.1.1"; sha256="0hxgbjns5bk82rgcmykxifnnxcnqdzmkimkkmpdif64zr5g3gjdg"; depends=[]; }; epanetReader = derive2 { name="epanetReader"; version="0.7.3"; sha256="05pwa6z03qsjwr9pxpbxycsd21p7mf5j5ajyg4yaas5g100s1k8c"; depends=[]; }; @@ -7666,14 +7977,17 @@ in with self; { eph = derive2 { name="eph"; version="0.4.0"; sha256="0yznfhsp6sgymq02m4g477pnqlmmbdvwv32sidaa2giaf3nr4izj"; depends=[assertthat attempt curl dplyr expss glue htmltools janitor leaflet magrittr purrr questionr readr readxl rlang rvest stringr tibble tidyr tidyverse xml2 zoo]; }; epiDisplay = derive2 { name="epiDisplay"; version="3.5.0.1"; sha256="08ym6hcbmajzr4rasdb35fxk79vgpzfc16rmcm34f7f3zzz09dyl"; depends=[foreign MASS nnet survival]; }; epiGWAS = derive2 { name="epiGWAS"; version="1.0.2"; sha256="0jqblfmz02za3b2pgi15379bzgh98yv5kyv8kh0lkzhrmpgph2zj"; depends=[DescTools glmnet matrixStats SNPknock]; }; - epiR = derive2 { name="epiR"; version="1.0-15"; sha256="0hbnqrkrrdn7v661gh088fsnx18ljbg0jgr649lij3w14xqvv6bi"; depends=[BiasedUrn survival]; }; + epiR = derive2 { name="epiR"; version="2.0.17"; sha256="0ssf56z81abdwkznyx73imh86k98mz69hv78agpc4wbqsq6pazmh"; depends=[BiasedUrn lubridate pander survival]; }; epibasix = derive2 { name="epibasix"; version="1.5"; sha256="0ivr51x37cbdryli9b4p4iq9v2c90zwmywrwdmg7ryq5vprvvbp0"; depends=[]; }; epicontacts = derive2 { name="epicontacts"; version="1.1.0"; sha256="0f4a1y311z3fxw7ygj6fgsq6d2qn0ivxsjlh742pkmg3jb63s0f3"; depends=[colorspace dplyr igraph magrittr threejs visNetwork]; }; - epidata = derive2 { name="epidata"; version="0.3.0"; sha256="1b00k086wiwhhrlh4348wqqza1v0whakwy5h7q95rmgxz7lppiim"; depends=[dplyr httr jsonlite purrr readr rvest stringi tidyr xml2]; }; + epidata = derive2 { name="epidata"; version="0.4.0"; sha256="0v3s1vrf2iqh03rkkwrlz6mhpbsbjxkayrqdx04vrnja4i9ljshk"; depends=[dplyr httr jsonlite purrr readr rvest stringi tidyr tinytest xml2]; }; + epifitter = derive2 { name="epifitter"; version="0.2.0"; sha256="158llnpbqrmgg238ax1ciyfa30rq4mxyjyg61gs82d0d36rhb93i"; depends=[DescTools deSolve dplyr ggplot2 knitr magrittr minpack_lm tibble tidyr]; }; epiflows = derive2 { name="epiflows"; version="0.2.0"; sha256="09ri1p73ih0i08irc06ff169hi5vcl8bdi63b056kzxgmv17yqkp"; depends=[epicontacts geosphere ggmap ggplot2 htmltools htmlwidgets leaflet sp tibble visNetwork]; }; - epikit = derive2 { name="epikit"; version="0.1.1"; sha256="0wa7lfkkwygqmbyfjmwr4si2cdi7s1hd1bwsk1jaip1d3r0hyyrb"; depends=[binom dplyr forcats glue rlang scales tibble tidyr tidyselect]; }; + epigraphdb = derive2 { name="epigraphdb"; version="0.2.1"; sha256="0c8qpnf9rbhxzwvphci37dfxi9vbc5vlh31ckvwp12y9kwyxylvc"; depends=[glue httr jsonlite magrittr purrr tibble]; }; + epikit = derive2 { name="epikit"; version="0.1.2"; sha256="0b9kc7qr7nkafmak60pyj7hln19w4zp33pk5y48qmfsxgarl6pv3"; depends=[binom dplyr forcats glue rlang scales tibble tidyr tidyselect]; }; epimdr = derive2 { name="epimdr"; version="0.6-5"; sha256="1nxdlz7gl9vrha9iw92y0s9dmm101gkz0rsqxqg1rdxanr6hs6sh"; depends=[deSolve polspline shiny]; }; epinet = derive2 { name="epinet"; version="2.1.8"; sha256="10bgq66n99kkz0nhmsz508aypxk57zk19p5l3xrb28n72k4rfgrf"; depends=[network]; }; + epinetr = derive2 { name="epinetr"; version="0.93"; sha256="05q6mdgl1c24i3cfjh5bgb7x75yhg4ll45p7kzl77q8lsp26z8b6"; depends=[GA ggplot2 igraph Rcpp RcppAlgos reshape2 vcfR]; }; epiphy = derive2 { name="epiphy"; version="0.3.4"; sha256="04wsppjycnrzrml3zxrpr0xdxxas3hj8rskiivx5vfmfjpwipq4r"; depends=[ggplot2 msm pbapply Rcpp transport]; }; episcan = derive2 { name="episcan"; version="0.0.1"; sha256="02687f8gpc2czn19lapvazd6mnm8902ay0lhgi3wdrzfhir42m4r"; depends=[]; }; episensr = derive2 { name="episensr"; version="0.9.6"; sha256="193abdngrvxriv1dxjv0panf0whczli637xfs2fr05p588lljpr6"; depends=[actuar boot ggplot2 gridExtra magrittr plyr reshape trapezoid triangle]; }; @@ -7682,26 +7996,26 @@ in with self; { epitab = derive2 { name="epitab"; version="0.2.2"; sha256="0yi65bblsikwsa9i7wys1mqf6pp6j01kyc8xkyrhs5n62y1k68nc"; depends=[kableExtra knitr MASS survival xml2]; }; epitools = derive2 { name="epitools"; version="0.5-10.1"; sha256="0jqn3pas4lsans50jwakmvpyc7m7x0kxq6dzyckd3vgww56qa65l"; depends=[]; }; epitrix = derive2 { name="epitrix"; version="0.2.2"; sha256="1rqpvdky002h6mz636b77l4kd0im16pww62l6vnwh83si1m9pkki"; depends=[distcrete sodium stringi]; }; - eplusr = derive2 { name="eplusr"; version="0.12.0"; sha256="1h8adyh1cjy3giqc3vj5gdx77h5fqfx44abw816k640h758lkjmp"; depends=[callr cli crayon data_table lubridate processx progress R6 RSQLite stringi units]; }; + epitweetr = derive2 { name="epitweetr"; version="0.1.24"; sha256="0x80av928kcf9n0ipbyy1ww7rlknc5y2j79cgha11f998xbcxv3q"; depends=[bit64 dplyr DT emayili ggplot2 httpuv httr jsonlite keyring magrittr plotly plyr readxl rgdal rgeos rmarkdown rnaturalearthdata rtweet shiny sp stringr tidytext tidyverse tokenizers xml2 xtable]; }; + eplusr = derive2 { name="eplusr"; version="0.13.0"; sha256="011il56agqv4d9xd3qgh1pkxfvxr10knx5h3q8s13237x3f42241"; depends=[callr checkmate cli crayon data_table decido hms lubridate processx progress R6 rgl RSQLite stringi units]; }; eply = derive2 { name="eply"; version="0.1.2"; sha256="0al44pvqf6ls3dh129vlv3g56hk1nbql09rj0qsb04d9kaz9anrp"; depends=[magrittr]; }; epoc = derive2 { name="epoc"; version="0.2.6-1.1"; sha256="1qlj4cl7mh5k52v2ippfs3cish5iadnix5w46p25hjqiriksclna"; depends=[elasticnet irr lassoshooting Matrix survival]; }; eponge = derive2 { name="eponge"; version="0.1.0"; sha256="19wd80l35acij793spxglcwz346i2iivk6n0q2304wjcca6qzds7"; depends=[rlang]; }; - epos = derive2 { name="epos"; version="0.1.1"; sha256="0spaf6v9mmi9rmxip3aa2d1s31as973nc7ai3nlcp4qxgnp965dm"; depends=[dplyr ggplot2 gridExtra hash stringr testthat tidyr TopKLists xtable]; }; + epos = derive2 { name="epos"; version="0.1.3"; sha256="0b1i7v1h253viawgv789ch5hi6xmwg7svwrlk9l1mpwzvig9r27a"; depends=[ggplot2 gridExtra hash mongolite stringr testthat TopKLists xtable]; }; epr = derive2 { name="epr"; version="3.0"; sha256="0czfz6qkcpa2qqs3pqii27hgpdvdzfrvxl0ip67v58hamq7kvjfv"; depends=[car lme4]; }; epsiwal = derive2 { name="epsiwal"; version="0.1.0"; sha256="0lmcmiqcc1pjj1d0zyn0hc23if1lkm85p6vcjqbddpnv9ags2mbh"; depends=[]; }; - epuR = derive2 { name="epuR"; version="0.1"; sha256="0dx808dq78c1s78fv0my79ar7h20fyxa0gpfdv85zi80v9g82g4z"; depends=[data_table lubridate openxlsx stringr xts zoo]; }; epubr = derive2 { name="epubr"; version="0.6.1"; sha256="0rp9q6hriilps5h6nc1226w5dvzws1g78pg3ldrq2r4dakpvsmjj"; depends=[dplyr magrittr tibble tidyr xml2 xslt]; }; epwshiftr = derive2 { name="epwshiftr"; version="0.1.1"; sha256="1cyb46i3kml6zzn12hs9lpcsgxkwp5pslfy0nw8i4wydl2bgk0sa"; depends=[checkmate data_table eplusr fst future_apply jsonlite progressr psychrolib rappdirs RNetCDF units]; }; epxToR = derive2 { name="epxToR"; version="0.4-1"; sha256="00m64ham9fd9dsw37ic2m62fy4pvmwfwmjx8cg6n4rwbgq9q49sg"; depends=[httr XML]; }; - eq5d = derive2 { name="eq5d"; version="0.7.2"; sha256="0nnvs8ashxwam5r8v2lyrwmxdr55n17whc6sxxlaj7v08dz3ndmk"; depends=[]; }; + eq5d = derive2 { name="eq5d"; version="0.8.0"; sha256="0cx5v4wmqyqwkyinblcgxkp59fx7laiqzw2d5h7c0cagah1iq7a4"; depends=[]; }; eqs2lavaan = derive2 { name="eqs2lavaan"; version="3.0"; sha256="1lj6jwkfd84h9ldb6l74lrx2pnsl1c0d7mnrcrjkska87djb2nzd"; depends=[lavaan stringr]; }; eqtl = derive2 { name="eqtl"; version="1.1-7"; sha256="0xfr8344irhzyxs9flnqn4avk3iv1scqhzac5c2ppmzqhb398azr"; depends=[qtl]; }; - equSA = derive2 { name="equSA"; version="1.2.1"; sha256="0gbv7jvjivnril3cmvknzmqlmpb4mv0rhqwk1i87wqxsvrgplik1"; depends=[bnlearn doParallel foreach huge igraph mvtnorm ncvreg SIS speedglm survival XMRF ZIM]; }; equalCovs = derive2 { name="equalCovs"; version="1.0"; sha256="18w7panyd6mhdr3x1iz9fkrw7min22rishs4xhkxgxs3nnyglkrn"; depends=[]; }; equaltestMI = derive2 { name="equaltestMI"; version="0.6.0"; sha256="1qlm28144fidc56czvd0kg4i9wrmb8x1ll0sb1m4lvdxvh4gh66m"; depends=[lavaan]; }; equate = derive2 { name="equate"; version="2.0.7"; sha256="07cji0z139fk70d4wvrpk5m34fq1pfnqrsw336lgnp5a7zp3jz7n"; depends=[]; }; equateIRT = derive2 { name="equateIRT"; version="2.1.0"; sha256="1g8gs00ralh5zw1fv3xd4c2xrb8gxgb7srcp0hgbpr0f7hw53fjm"; depends=[mirt statmod]; }; - equateMultiple = derive2 { name="equateMultiple"; version="0.0.0"; sha256="0q29bv8bb0c3sprhnkbbpn31phw37dwgk23v5ny4abzvlcgwncdb"; depends=[equateIRT numDeriv Rcpp RcppArmadillo statmod]; }; + equateMultiple = derive2 { name="equateMultiple"; version="0.0.1"; sha256="1bs0svnipfbix5zrjb59i2kzzfah8267yyw2mh9bxfzli7gbwfha"; depends=[equateIRT numDeriv Rcpp RcppArmadillo statmod]; }; + equatiomatic = derive2 { name="equatiomatic"; version="0.1.0"; sha256="1w5v1l9807d5hgxm0yj5lfgb7k7w8jbzkii5bla42x9fvjycqfzh"; depends=[broom]; }; equivUMP = derive2 { name="equivUMP"; version="0.1.1"; sha256="05ihbr6dd9qv89ll90ynk4g3d3xy2w5q0m696djfa63f1x92c01w"; depends=[]; }; equivalence = derive2 { name="equivalence"; version="0.7.2"; sha256="170l5gnk0dkjkfsx7qyrw56ircwsjzz9cvhakgyrqh7bj5734i79"; depends=[boot lattice PairedData]; }; equivalenceTest = derive2 { name="equivalenceTest"; version="0.0.1.1"; sha256="1lr1qc4mv8f9hwqidj1rwhxqm1fb8cf1hnb1k32xpdqwzsxbfa47"; depends=[cubature polynom Rdpack rootSolve]; }; @@ -7709,10 +8023,9 @@ in with self; { erboost = derive2 { name="erboost"; version="1.3"; sha256="09hlpn6mqsmxfrrf7j3iy8ibb2lc4aw7rxy21g3pgqdmd9sbprim"; depends=[lattice]; }; ercv = derive2 { name="ercv"; version="1.0.1"; sha256="0rs4yhm9sjnqkrgqqy6b8wj9fgk910hxc8d7zi4qwql0v1gid27l"; depends=[]; }; erer = derive2 { name="erer"; version="3.0"; sha256="143ygibzjsxlmf3p5ldcc4dpr3mcm873g4rwgb55q912bdhsn725"; depends=[lmtest systemfit tseries urca]; }; - ergMargins = derive2 { name="ergMargins"; version="0.1.1"; sha256="090j5l23qvmvwbk6dqyby78vn4myhidqfy3ac1pfwwj73jf6c7p2"; depends=[btergm ergm Matrix network numDeriv sna statnet xergm_common]; }; - ergm = derive2 { name="ergm"; version="3.10.4"; sha256="08hzhc06sfchbq8kq5yvs7gxz0v6nvx0qdb2g6ac38n54cd0npw8"; depends=[coda dplyr lpSolve MASS Matrix network purrr rlang robustbase statnet_common tibble trust]; }; + ergm = derive2 { name="ergm"; version="3.11.0"; sha256="1wp93y0sjw2ybaflkzw7q7blf6x5pkrcnyk5wcxk9hmd9fs0cmaf"; depends=[coda lpSolve MASS Matrix network purrr rlang rle robustbase statnet_common tibble trust]; }; ergm_count = derive2 { name="ergm.count"; version="3.4.0"; sha256="1bvbqckssqj91q56nz17mrvadk1i2mm301z9rj8qkh8116fwf93w"; depends=[ergm network statnet_common]; }; - ergm_ego = derive2 { name="ergm.ego"; version="0.5"; sha256="1vvyfjvkddc1qr189wqbp8sbqmd317y71ml9jjjjns3znahriqv3"; depends=[coda ergm network purrr RColorBrewer rlang statnet_common tibble]; }; + ergm_ego = derive2 { name="ergm.ego"; version="0.6.1"; sha256="1khmlx0s8v5dhl38b1bqdb6lpfp7adrfs7r0lcg5hrczlxsy293f"; depends=[coda ergm network purrr RColorBrewer statnet_common tibble]; }; ergm_rank = derive2 { name="ergm.rank"; version="1.2.0"; sha256="1vc96rjsqvs6ybnzkpv12h0hsrx2s96k4hjilzjpjnhbazh5vynz"; depends=[ergm network statnet_common]; }; ergm_userterms = derive2 { name="ergm.userterms"; version="3.10.0"; sha256="1aqrgdayh73dkr71gf8vawlj6qgv66pxr4klxgqb6ffan66b5p8g"; depends=[ergm network statnet_common]; }; ergmharris = derive2 { name="ergmharris"; version="1.0"; sha256="1bfijhsljlykb94wi25lbpv35zkmgqpmgzmxcq98gjvzbn5j9pdq"; depends=[]; }; @@ -7720,11 +8033,12 @@ in with self; { erp_easy = derive2 { name="erp.easy"; version="1.1.0"; sha256="193n45w0rq3cy0nmxvv0h6s3yr8kfjlg90nd4dnqlsq85zlsizij"; depends=[gtools plyr signal]; }; erpR = derive2 { name="erpR"; version="0.2.0"; sha256="1y6abc5fkcyyjh36maj1zbxppqzwd5wkvzvqahyvzsz5fqpjkcdx"; depends=[rpanel]; }; err = derive2 { name="err"; version="0.2.0"; sha256="1915b0vmqdd8whwdrqjphld1jaxawh5b7di6wf7q3sx779lblsrs"; depends=[]; }; + erratum = derive2 { name="erratum"; version="2.0.0"; sha256="0640igaixqmfg5y8af6rn6gq92sh1mq0wyjqh2rhihnbgf6y0wic"; depends=[R6 rlang]; }; errint = derive2 { name="errint"; version="1.0"; sha256="1ya7fsvwhmgxw87r32m4345n8pw2pbpv026xvml03s1kiam8qwbw"; depends=[rootSolve VGAM]; }; errorist = derive2 { name="errorist"; version="0.1.0"; sha256="0zq5h2wffn9d3f3blzh736478k91smlvz5hxy55hcjqffpxcp4ah"; depends=[searcher]; }; errorizer = derive2 { name="errorizer"; version="0.2.1"; sha256="10p7ydm81x2gls0wn692llgj2rxhg4s96rv7gvihmgi5dflraypq"; depends=[]; }; - errorlocate = derive2 { name="errorlocate"; version="0.3.0"; sha256="04vr2ll3mdy1znm11lv739drckv82n45qbpda3qyjyzlffvgkmhg"; depends=[lpSolveAPI validate]; }; - errors = derive2 { name="errors"; version="0.3.4"; sha256="1f43pn900nvaqbxfgq30zxq0y1cxywxxcziv20yhj4hvgbn0527r"; depends=[]; }; + errorlocate = derive2 { name="errorlocate"; version="0.5.1"; sha256="057v19917dqcw3qfcw2mwwsxcahl4dhid3252bhvl5qgbnj1dxfs"; depends=[lpSolveAPI validate]; }; + errors = derive2 { name="errors"; version="0.3.6"; sha256="1404314glbqnicrwnfzmxxf7l97pgrb2gjkgkwn100p0sj83kjdg"; depends=[]; }; errum = derive2 { name="errum"; version="0.0.3"; sha256="18frrfnhnmg4fjlpfwj8aklzfwafpwqvagm0aschkqc8mz6wnjbz"; depends=[Rcpp RcppArmadillo]; }; es_dif = derive2 { name="es.dif"; version="1.0.2"; sha256="1swxg8mdp9jj9f0x0cawhhbx8gmmpsgqlbifx2v04a2vkgdkigqf"; depends=[]; }; esDesign = derive2 { name="esDesign"; version="1.0.2"; sha256="16dhddw4gp210bb1mmx5df1ziffadiz06s4i3znnzac8rv5564hp"; depends=[]; }; @@ -7733,19 +8047,19 @@ in with self; { esaps = derive2 { name="esaps"; version="0.1.0"; sha256="1rchs4i7n221gyhj9kbka4zmi2lf72q3ak2pdxkr7w6pcx6803yz"; depends=[plyr readODS readxl]; }; esback = derive2 { name="esback"; version="0.3.0"; sha256="09k895028hqa62m8fhbg5b33ry0in6kbrw0lnphn0rgjhlifxp4z"; depends=[esreg]; }; esc = derive2 { name="esc"; version="0.5.1"; sha256="0gns7gz55p6pha05413r3hlvd7f2v1amxkg13d197mab1ypqic7q"; depends=[]; }; - escalation = derive2 { name="escalation"; version="0.1.3"; sha256="0ch5888p4zvpr8wny74pajmk4m0smvp901v3jzhhrqvadwg04wgy"; depends=[BOIN dfcrm DiagrammeR dplyr gtools magrittr purrr RColorBrewer stringr tibble tidyr tidyselect viridis]; }; + escalation = derive2 { name="escalation"; version="0.1.4"; sha256="1iyjp20rzz3lrgn183jvjcf7vvmk66f3rgyv22s2ja4b98598ha4"; depends=[binom BOIN dfcrm DiagrammeR dplyr gtools magrittr purrr RColorBrewer stringr tibble tidyr tidyselect trialr viridis]; }; eseis = derive2 { name="eseis"; version="0.5.0"; sha256="03pjcms3aj7sm2wrld64v1dw53bqn9pmsayndma03abjh66rblii"; depends=[caTools fftw IRISSeismic matrixStats multitaper raster Rcpp reticulate rgdal rmarkdown shiny signal sp XML]; }; - eshrink = derive2 { name="eshrink"; version="0.1.0"; sha256="0s1jl652za7qwv70kmc1h3vbwlijl49527pwpm0z347lz2jdcigj"; depends=[glmnet MASS]; }; + eshrink = derive2 { name="eshrink"; version="0.1.2"; sha256="0min4j1dyd08i0fyn9a4iasjlhq08bn74bjz8vj1gq9l114v795k"; depends=[glmnet MASS]; }; esmisc = derive2 { name="esmisc"; version="0.0.3"; sha256="1d6xrdxwn85c8s60s7vzaymh7wa9f7fzd79hq5spzd12fr3zisvj"; depends=[ggplot2 raster readr]; }; esmprep = derive2 { name="esmprep"; version="0.2.0"; sha256="076sm26mkkvig2g04k32z2dlp2h9gnqgzckhirl4pqm01siknl61"; depends=[lubridate]; }; - esquisse = derive2 { name="esquisse"; version="0.3.0"; sha256="1cb30qmsxpkx62rjaasly13l00bvz03i9jq5apsr4fk26vw7gfrk"; depends=[ggplot2 htmltools jsonlite miniUI rlang rstudioapi scales shiny shinyWidgets stringi]; }; + esquisse = derive2 { name="esquisse"; version="0.3.1"; sha256="1fkh3zmhx4g9sl7ykmrqvghjjz66g2mg0646sdvhq8yyb63fpir3"; depends=[ggplot2 htmltools jsonlite miniUI rlang rstudioapi scales shiny shinyWidgets stringi]; }; esreg = derive2 { name="esreg"; version="0.5.0"; sha256="1njwqm3hrcxwl6y7gwa4zq0q5139293qk503ahw23dxwzdsiy2z5"; depends=[Formula quantreg Rcpp RcppArmadillo]; }; ess = derive2 { name="ess"; version="1.0"; sha256="0nqmpih9iyny4ss6llhjq08lfc8n0znz0fdmsjn1js48r85rcqxb"; depends=[igraph Matrix Rcpp]; }; essHist = derive2 { name="essHist"; version="1.2.2"; sha256="0rvlxfcl42h4pjqf37mx7bc4k21iwvnys6l5rf2jsl7yk1b9hmbn"; depends=[Rcpp]; }; essurvey = derive2 { name="essurvey"; version="1.0.5"; sha256="078bm5knrhij4rdv7hqv5ci0dfdci7lw4yrqbikp8miapivv88vp"; depends=[haven httr rvest tibble xml2]; }; estatapi = derive2 { name="estatapi"; version="0.4.0"; sha256="0wp5w9w0b832fnl7kchjqmychnf5896q50grw8hwdc1km14dfzkg"; depends=[dplyr httr purrr readr rlang tibble]; }; estimability = derive2 { name="estimability"; version="1.3"; sha256="0cifdaa71spkcxl4db4z884jrya865sg3dhcv4isd8fnzg2pjcd3"; depends=[]; }; - estimatr = derive2 { name="estimatr"; version="0.22.0"; sha256="1kfih2fak7w9zqbhjgfrysdzrk4lpcx9p23x0gys4f9hxl9j1pm2"; depends=[Formula generics Rcpp RcppEigen rlang]; }; + estimatr = derive2 { name="estimatr"; version="0.28.0"; sha256="1gv5k21xw4id4r4aylhg9ym5isn3v2yrzrd4slwz9a9mf7gxc2ij"; depends=[Formula generics Rcpp RcppEigen rlang]; }; estimraw = derive2 { name="estimraw"; version="1.0.0"; sha256="0z591mblbzc3qv9pyv8zn0r5r3d8f1l02sxdc649gl1lb40kalz0"; depends=[dplyr]; }; estmeansd = derive2 { name="estmeansd"; version="0.2.1"; sha256="053mf9yq095dvlz2cj5haav6yabvgj78qpp411xd9nr1ac17jxz9"; depends=[metaBLUE]; }; estout = derive2 { name="estout"; version="1.2"; sha256="0whrwlh4kzyip45s4zifj64mgsbnrllpvphs6i5csb7hi3mdb3i5"; depends=[]; }; @@ -7757,17 +8071,20 @@ in with self; { ether = derive2 { name="ether"; version="0.1.6"; sha256="1f3phh5vdfvlxqrpzsn6ysz0q3mbhr862fzsd3sp8m8qhry86cbx"; depends=[dplyr httr jsonlite Rmpfr]; }; ethnobotanyR = derive2 { name="ethnobotanyR"; version="0.1.7"; sha256="13xbiywrw6ixby9s1ipwb45p9c96d75vw906fpzy6axdv2c4pp70"; depends=[circlize cowplot dplyr ggplot2 ggridges magrittr reshape]; }; etl = derive2 { name="etl"; version="0.3.9"; sha256="133kas3pf863dlgxjhl2x61xkjl5vndsav69zskj9ngz875avjm2"; depends=[DBI downloader dplyr fs janitor lubridate readr rlang rvest stringr tibble usethis xml2]; }; - etm = derive2 { name="etm"; version="1.1"; sha256="02yvh473l5qajaymhsxwb235a9r7q3nsig9a9mrfca68xih8yvgd"; depends=[data_table lattice Rcpp RcppArmadillo survival]; }; + etm = derive2 { name="etm"; version="1.1.1"; sha256="1hvrplmdpjjpjji663rw0vjbbrzj2nvr04d1nkc8bf46p4ixyxgy"; depends=[data_table lattice Rcpp RcppArmadillo survival]; }; etma = derive2 { name="etma"; version="1.1-1"; sha256="0g9244yx50y1gw0f37hskbcgyv4nldmzr86v3rmf3afabmjbyzjj"; depends=[]; }; + etrader = derive2 { name="etrader"; version="0.1.2"; sha256="1ynwhcyzba4v1vyhgws1fiyzkaiqgv7bhzjf4kszc0x7jh2sbdn5"; depends=[dplyr httr jsonlite magrittr purrr rvest urltools]; }; etrunct = derive2 { name="etrunct"; version="0.1"; sha256="0ayazgyqlc8jcqr03cwfmfhm4pck6xri1r6vkgqy4arqkrrnrcqr"; depends=[]; }; eudract = derive2 { name="eudract"; version="0.9.2"; sha256="1yl72vhfaqq005h00bxafdqxpbm0qf9349gd9fq80h5vy20qrm3q"; depends=[dplyr magrittr tidyr xml2 xslt]; }; eulerian = derive2 { name="eulerian"; version="1.0"; sha256="0yhpnx9vnfly14vn1c2z009m7yipv0j59j3s826vgpczax6b48m0"; depends=[graph]; }; eulerr = derive2 { name="eulerr"; version="6.1.0"; sha256="1r7y01vj293r1lhxk4anqqq6k2gnflzx2a2sfsyf7ccqmw95w0cj"; depends=[GenSA polyclip polylabelr Rcpp RcppArmadillo]; }; + eurlex = derive2 { name="eurlex"; version="0.3.4"; sha256="067kfjsmagmsjcmzg8lg5f324ngclb6d8i8d16wjsn6kah82nfak"; depends=[antiword dplyr httr magrittr pdftools readr rlang rvest stringr tidyr xml2]; }; europepmc = derive2 { name="europepmc"; version="0.4"; sha256="174nnyc2mbgqxb5kgqabn1vf71c2mps7ig2bclq4is0f7nb64pym"; depends=[dplyr httr jsonlite plyr progress purrr rlang tibble tidyr urltools xml2]; }; europop = derive2 { name="europop"; version="0.3.1"; sha256="1ym257bxr4a0dmln1j8x3pf87wrryzgqyzhvk61whc6n2bj62x1s"; depends=[]; }; - eurostat = derive2 { name="eurostat"; version="3.6.1"; sha256="1l2j9fdq33ivb3wns5bdr1dccaf494vwbyya3f2gz2g8mc2qpn0a"; depends=[broom classInt countrycode curl dplyr httr jsonlite lubridate RColorBrewer readr RefManageR sf sp stringi stringr tibble tidyr tidyselect]; }; + eurostat = derive2 { name="eurostat"; version="3.6.84"; sha256="03mfjjc3jjdrg4plb31dm4s4fv8cfmwpa3vkbcjjzz7jy8zyn7yq"; depends=[broom classInt countrycode curl dplyr httr jsonlite lubridate RColorBrewer readr RefManageR sf sp stringi stringr tibble tidyr tidyselect]; }; + eva = derive2 { name="eva"; version="0.2.6"; sha256="1b5hrwgdbw19c63ywhkvxlz3843c0mgvsxlmab6zv6r2lrrdkf62"; depends=[EnvStats Matrix]; }; evabic = derive2 { name="evabic"; version="0.0.3"; sha256="0wd5wjsj9gbvbncaa97g1sp0211aq3nn5jc91lvhka6h34wxkcgc"; depends=[]; }; - evalITR = derive2 { name="evalITR"; version="0.1.0"; sha256="05nqcy9x3f2ks9xvzd3cd000q2kybdycgrlvz5pv7ipw1dlysgg2"; depends=[]; }; + evalITR = derive2 { name="evalITR"; version="0.2.0"; sha256="0kkvkbq8w4d04sgb0x0wbrq4ilc5p4cwywrsv7dlzyjb4a59rczl"; depends=[]; }; evaluate = derive2 { name="evaluate"; version="0.14"; sha256="0a2y7j534gbgixkwj9r1z76l2vssw4g1hznzbpclc076wkdqpj58"; depends=[]; }; evaluator = derive2 { name="evaluator"; version="0.4.2"; sha256="0k2fwim023lbnxq67hhv03cds824x8n374pnqsk67ajgahxwh3by"; depends=[cli crayon dplyr extrafont ggplot2 magrittr mc2d purrr readr readxl rlang rstudioapi scales stringi tibble tidyr vctrs viridis]; }; evclass = derive2 { name="evclass"; version="1.1.1"; sha256="00lbhcgswpv0amz0mb93kx9p91sf0d7zvxfw9i8x1zpmpfd6nhcj"; depends=[FNN]; }; @@ -7777,11 +8094,12 @@ in with self; { event = derive2 { name="event"; version="1.1.1"; sha256="0w3v8j61y7vr0cjl8a1rkvi4pyjlfhmzzn1n4dgkivac4iafzqjj"; depends=[rmutil]; }; eventInterval = derive2 { name="eventInterval"; version="1.3"; sha256="0nybzy2mpmazcvz06mkv7l9741mjm3i2q2sindq0777vb2k4504v"; depends=[MASS]; }; eventdataR = derive2 { name="eventdataR"; version="0.2.0"; sha256="11apbbj68x1kxpwvihf4ng7wxy54jl1aw7r9hyq6gn7h8sk6lpjn"; depends=[]; }; + eventglm = derive2 { name="eventglm"; version="1.0.2"; sha256="1bpr5xjziwh20xvmmh5rch6pqd2pfiirmzffp4lhkfz43ll278nr"; depends=[sandwich survival]; }; eventr = derive2 { name="eventr"; version="1.0.0"; sha256="08ljjvfrnfmi49b9bgizvvswxydln8ny901grn5j288pq0djjqyk"; depends=[dplyr magrittr purrr]; }; events = derive2 { name="events"; version="0.5"; sha256="1zka4ygymifs8snd7cabl11b5lg3f8g8370dkm9ybl40bn8vvqq2"; depends=[]; }; eventstream = derive2 { name="eventstream"; version="0.1.0"; sha256="0imrs872b6fjvw74smniiiicvizyign6wmwwybljk704cshzcy2f"; depends=[abind AtmRay changepoint dbscan glmnet MASS tensorA]; }; eventstudies = derive2 { name="eventstudies"; version="1.2.2"; sha256="01vpd0gnxaibxn3nq6618rxlwapm86idz86n0wj5kfz4a9kj7lsx"; depends=[boot sandwich testthat xts zoo]; }; - evgam = derive2 { name="evgam"; version="0.1.2"; sha256="0wnyrvfg1pj1adwmsvqwpnz31pfhj6vdsivj2mmdzqh4milf9l22"; depends=[mgcv Rcpp RcppArmadillo]; }; + evgam = derive2 { name="evgam"; version="0.1.4"; sha256="0xdmqhg77dbb47pwzgj2hxs83a9yscknz9pmh9a33snaba9llc6r"; depends=[mgcv Rcpp RcppArmadillo]; }; evian = derive2 { name="evian"; version="2.1.0"; sha256="1slnzq55gg3p16fs22v69mafiggiy5f70sj8fh65lc0hphybh6w2"; depends=[doParallel foreach ProfileLikelihood sandwich]; }; evidence = derive2 { name="evidence"; version="0.8.10"; sha256="02kqk95kx4nv13fg6z55a5rv6sq6lv8azg0jjxbkg1j6hg15p7ai"; depends=[LaplacesDemon lattice LearnBayes loo rstan rstanarm]; }; evidenceFactors = derive2 { name="evidenceFactors"; version="1.8"; sha256="0g9w1q8ir6qmvk5vvbpipiyias7nj74ks2h94ja7al8sz68gralx"; depends=[sensitivitymv]; }; @@ -7789,7 +8107,7 @@ in with self; { evir = derive2 { name="evir"; version="1.7-4"; sha256="1h7a7z7v5k33y5hsdfczsri3vpbwspfgazhv4saknv2h11rgfpki"; depends=[]; }; evmix = derive2 { name="evmix"; version="2.12"; sha256="02rabc9snci00s1x7h0svfr66lmw1wjcdg0149wc52mnccsdaivf"; depends=[gsl MASS SparseM]; }; evobiR = derive2 { name="evobiR"; version="1.1"; sha256="0502xj1gv2g943vfqyllz4sr5z4mixf5vqlqi2v96mymnv9iwsr8"; depends=[ape geiger phytools seqinr shiny]; }; - evolqg = derive2 { name="evolqg"; version="0.2-7"; sha256="1ib39whfx1hpjgy8g9pfcix1ki7w6bf2ka8z15avcmj32jl8ns6f"; depends=[ape coda expm ggplot2 igraph Matrix matrixcalc MCMCpack mvtnorm plyr Rcpp RcppArmadillo reshape2 vegan]; }; + evolqg = derive2 { name="evolqg"; version="0.2-8"; sha256="1zcpm7bpw5zpafbj7lv7kfpaqknqyhlss5343ps14lqc73kq70wc"; depends=[ape coda expm ggplot2 igraph Matrix matrixcalc MCMCpack mvtnorm plyr Rcpp RcppArmadillo reshape2 vegan]; }; evolvability = derive2 { name="evolvability"; version="1.1.0"; sha256="0lbyidb86yzvcfw86jfwnzbpijn64jr8fasycqq4h3r9c0x2by3j"; depends=[coda]; }; evoper = derive2 { name="evoper"; version="0.5.0"; sha256="064fcpd04ws8v6sl0bakiw34jmmfpg1w5pkq94y2gh1c576x4vwz"; depends=[boot data_table deSolve futile_logger ggplot2 plot3D plyr reshape RNetLogo rrepast]; }; evt0 = derive2 { name="evt0"; version="1.1-3"; sha256="08sbyvx49kp3jsyki60gbbnci26d6yk0yj2zcl4bhfac8c3mm6ya"; depends=[evd]; }; @@ -7797,16 +8115,15 @@ in with self; { evtree = derive2 { name="evtree"; version="1.0-8"; sha256="1dmzbsyrg8wwzzqcxzqmgm7yai37lh9lkjhizhr2h0k03s5xdv1k"; depends=[partykit]; }; ewoc = derive2 { name="ewoc"; version="0.3.0"; sha256="0r8b5vq0qzp3f0dasxmrngldqlymca90sj019rzs1a0qf28wlgbr"; depends=[coda doParallel doRNG foreach Formula ggplot2 rjags]; }; exCon = derive2 { name="exCon"; version="0.2.5"; sha256="0gqnv01dw4ncf3x3p74pc6f14a1ixq7icl2p18hsmvxdqqg7kgy7"; depends=[jsonlite]; }; - exPrior = derive2 { name="exPrior"; version="1.0.1"; sha256="05z7dx1qfwcagadlw8wrf30071ssawv8njm2q6jaa4r4in0i5l1s"; depends=[coda ggplot2 gtable nimble plyr reshape2]; }; exact2x2 = derive2 { name="exact2x2"; version="1.6.5"; sha256="05xkzyyk1dfxq2f6aczwiyinznaxfd6ipd680zsbcd0iq44n7wd1"; depends=[exactci ssanv]; }; exactLoglinTest = derive2 { name="exactLoglinTest"; version="1.4.2"; sha256="0j146ih9szzks9r45vq1jf47hrwjq081q1nsja5h1gpllks8217h"; depends=[]; }; exactRankTests = derive2 { name="exactRankTests"; version="0.8-31"; sha256="1154dkcid3njhamdp87qs9bnx7l8bdqkcjsds9q9f2xmizs9x8gw"; depends=[]; }; exactci = derive2 { name="exactci"; version="1.3-3"; sha256="03r35f6dyrck5pf43ypb1sjwfnvkhjkm1mbms3wh67ayfs2ypn0s"; depends=[ssanv]; }; - exactextractr = derive2 { name="exactextractr"; version="0.4.0"; sha256="0r4276f95cxpy1df5m8z99nqmp1kpa7yps2g2yjnhawnajg6bcxn"; depends=[raster Rcpp sf]; }; + exactextractr = derive2 { name="exactextractr"; version="0.5.1"; sha256="0vb142gwh6ry0nmd6bnipv2dfy3rcmfp871vw1bnks22kr5zppa7"; depends=[raster Rcpp sf]; }; exactmeta = derive2 { name="exactmeta"; version="1.0-2"; sha256="1v807ns799qajffky4k18iah0s3qh2ava6sz5i85hwx9dhkz19h4"; depends=[]; }; - exampletestr = derive2 { name="exampletestr"; version="1.6.1"; sha256="1szkx35wn24yi6iw6hkl85hzwqd8glvjq69hsypsxg1k4r1i99wg"; depends=[checkmate filesstrings fs magrittr ore purrr readr rlang roxygen2 rstudioapi stringr styler usethis withr]; }; + exampletestr = derive2 { name="exampletestr"; version="1.6.2"; sha256="0mzxllh73lzqmkvv7ib8j472k4ppi3kw8flmzha5jw92dn9yql8p"; depends=[checkmate fs magrittr ore purrr readr rlang roxygen2 rstudioapi strex stringr styler usethis withr]; }; exams = derive2 { name="exams"; version="2.3-6"; sha256="1cn0gmaayv857zl7l7zmnblmpx84qkjxqrigrymy578y04qjc4zx"; depends=[]; }; - exams_mylearn = derive2 { name="exams.mylearn"; version="1.1"; sha256="0smsa22sm4xdjwsdyzicbznkhx980n72syihx04gxhn50w9495ky"; depends=[exams glue stringi stringr xml2]; }; + exams_mylearn = derive2 { name="exams.mylearn"; version="1.2"; sha256="1vc2rqabavxfrr18ifjjd9am646rvbhxcjrkiq71i0y2idpppg9y"; depends=[exams glue stringi stringr xml2]; }; exceedProb = derive2 { name="exceedProb"; version="0.0.1"; sha256="02pb8b0rxygbv6501rcr2hb0bhz1r78k5znav161kk25fb9bxs5v"; depends=[BH Rcpp]; }; excelR = derive2 { name="excelR"; version="0.4.0"; sha256="1pb4sy54zjv5vrh7gjjv7qlpab74km6mfsmfyl0yhmr0jx01hrw0"; depends=[htmlwidgets jsonlite]; }; excerptr = derive2 { name="excerptr"; version="2.0.0"; sha256="1xglpg9i45dd103ahj46lin42x9c8lgff2b5c4k3799gaki9sjzz"; depends=[checkmate reticulate]; }; @@ -7814,28 +8131,30 @@ in with self; { exdex = derive2 { name="exdex"; version="1.0.1"; sha256="15wdi24fq8q4ja4527k1adv6lkzyhylp8nwlsrb91q0sbmmprrqs"; depends=[chandwich Rcpp RcppArmadillo RcppRoll]; }; exif = derive2 { name="exif"; version="0.1.0"; sha256="12phqn5x1x0xs2xczl3064q983dalm261vqpyafhdcndm1y3gwbc"; depends=[Rcpp]; }; exifr = derive2 { name="exifr"; version="0.3.1"; sha256="0394f04wq5dnqbnbaq7gxv4ggis4kf3b8dhhjzlybsbip6nmv54x"; depends=[curl jsonlite plyr rappdirs tibble]; }; - exiftoolr = derive2 { name="exiftoolr"; version="0.1.3"; sha256="1gjdw9bdk3f9s29wd0657pmlv2mhblqmvxqq79q4s470abh0bbin"; depends=[curl jsonlite zip]; }; + exiftoolr = derive2 { name="exiftoolr"; version="0.1.5"; sha256="0amfv2avnyvlz8mhmzmklpqykshdxrcxivans6j9hnimj0ygw6ad"; depends=[curl data_table jsonlite zip]; }; exp2flux = derive2 { name="exp2flux"; version="0.1"; sha256="1b3ychb4wcf6dbccx2ddms5xygdgc296cnw4474fm81yrfjznplv"; depends=[gage igraph sybil]; }; expSBM = derive2 { name="expSBM"; version="1.3.5"; sha256="0k8nkwqrcmmhv0x8a2np1rm5cyc9glyvndwdbnp03v0wrg8121sw"; depends=[blockmodels gtools mclust Rcpp RcppArmadillo]; }; expandFunctions = derive2 { name="expandFunctions"; version="0.1.0"; sha256="0661l4ab0xhjidmh8ycvymhp3wgxafm7nd1c59bfpxhyhz76n1p4"; depends=[glmnet orthopolynom plyr polynom]; }; expands = derive2 { name="expands"; version="2.1.2"; sha256="15r5wld63kwk3kcl5x09dj0n1mgcl076lcjsmf0vbh10x4n0avrk"; depends=[ape commonsMath flexclust flexmix gplots matlab moments NbClust plyr RColorBrewer rJava]; }; + experDesign = derive2 { name="experDesign"; version="0.0.4"; sha256="1hdr0hj55lgzs88m26qijhh3sx8m1zv0lb10hhgwb00dmij5s3rh"; depends=[]; }; experiment = derive2 { name="experiment"; version="1.2.0"; sha256="0f8h4pj2y7cd2s1q44q4mrg9cirnpz0bkn4xm04hz1rpjxb4xlv1"; depends=[boot MASS]; }; expert = derive2 { name="expert"; version="1.0-0"; sha256="0y9vcigvzhymalpv31b9nvmr86z1dz7x29yj838vks0dsv23rgrf"; depends=[]; }; expint = derive2 { name="expint"; version="0.1-6"; sha256="0iai25cglcdnf44d2d1fz1xpw4q600my4zq4493fk4cs5673mlf7"; depends=[]; }; - explor = derive2 { name="explor"; version="0.3.6"; sha256="02kqma7qi6jabmbcp4fmplrh0xix3r729qc299rghcxvd4s9cplv"; depends=[dplyr DT formatR ggplot2 highr RColorBrewer scatterD3 shiny tidyr]; }; - explore = derive2 { name="explore"; version="0.5.5"; sha256="0xivjnbic4jnbr21l1rvs2799qhkk3jrwsgdlgnmr6s6ddnqiif7"; depends=[assertthat broom DBI dplyr DT forcats ggplot2 gridExtra magrittr MASS odbc rlang rmarkdown rpart rpart_plot shiny stringr tibble]; }; + explor = derive2 { name="explor"; version="0.3.7"; sha256="0g3a1x3nf4m5pvc46j77jkqqm7z2radcswmy2kvspwj0l6dg6z04"; depends=[dplyr DT formatR ggplot2 highr RColorBrewer scatterD3 shiny tidyr]; }; + explore = derive2 { name="explore"; version="0.6.2"; sha256="0bn49pcidxsnypcb70j81by4lq0lypzbvb16qpkcxyiyfhapxakh"; depends=[assertthat broom DBI dplyr DT forcats ggplot2 gridExtra magrittr MASS odbc rlang rmarkdown rpart rpart_plot shiny stringr tibble tidyr]; }; exploreR = derive2 { name="exploreR"; version="0.1"; sha256="154j5wiiy9vqdvh1qvdkz2fdp2phcygbbjl7nj5nkn07xwxbsc77"; depends=[ggplot2]; }; expm = derive2 { name="expm"; version="0.999-5"; sha256="0y98ya8rhy891nysjlzzy7kcm13dsz8gvxwzvbkmcp1xx0vicxc7"; depends=[Matrix]; }; expose = derive2 { name="expose"; version="0.0.3"; sha256="0dlxlxm3g9d8vmgp13i1825z1jzah94ih1vyif46s43xq0nf9anj"; depends=[e1071 foreach gam ggplot2 glmnet Matrix nnet polspline RColorBrewer Rcpp repmis SuperLearner xgboost]; }; expp = derive2 { name="expp"; version="1.2.4"; sha256="00r5f80wnz91n0ksp1dvrxpd6zyfis2v3rizsnm7qqnnwj3d4q1c"; depends=[deldir rgeos sp spatstat spdep]; }; expperm = derive2 { name="expperm"; version="1.6"; sha256="0cybna0q3qn3slyc4lv5rby4pr0xkwq0h6n7hl1zhsaqv4c2zc5b"; depends=[Rcpp]; }; expsmooth = derive2 { name="expsmooth"; version="2.3"; sha256="0alqg777g7zzbjbg86f00p2jzzlp4zyswpbif7ndd0zr8xis6zdc"; depends=[forecast]; }; - expss = derive2 { name="expss"; version="0.10.6"; sha256="03182c9ispbk52akczcm9h5fkgmvxk7d8166dpmdgamzb2s55fyr"; depends=[data_table foreign htmlTable magrittr matrixStats]; }; + expss = derive2 { name="expss"; version="0.10.7"; sha256="0br10ydhv7xz297nzz3qql3cvs1950g1szshywcnxnf58limsw1y"; depends=[data_table foreign htmlTable magrittr matrixStats]; }; exptest = derive2 { name="exptest"; version="1.2"; sha256="0wgjg62rjhnr206hkg5h2923q8dq151wyv54pi369hzy3lp8qrvq"; depends=[]; }; exreport = derive2 { name="exreport"; version="0.4.1"; sha256="0vj60rchhrc5q6x1kv7b95fcmh2a5qynli2w54rrrw1nx54xm8c2"; depends=[ggplot2 reshape2]; }; exsic = derive2 { name="exsic"; version="1.1.1"; sha256="1k6nqs9i4iivxnk4nkimp6zvdly274wibkmx9n0wz01gnzxqil0p"; depends=[markdown stringr]; }; - extRC = derive2 { name="extRC"; version="1.1"; sha256="1zjm1wxd51r10q324xbjmmyk4rhhih9ajmvgnjsc7glfcpzr0rp5"; depends=[MASS]; }; - extRemes = derive2 { name="extRemes"; version="2.0-12"; sha256="0wldzvj1h93jksq31dw9zgnr1wrqwmfr9qwmg7qk7nznsn2yy1h2"; depends=[distillery Lmoments]; }; + extRC = derive2 { name="extRC"; version="1.2"; sha256="0mkvic9nr0asd0g04nlfiy81d7am9a3i65ibxyvbdwsxnf92p8ya"; depends=[MASS]; }; + extRatum = derive2 { name="extRatum"; version="1.0.0"; sha256="1ng27a2rl0yd41mbq70f0p1a2jg82n623b7hhdlnla3pd893ywk5"; depends=[dplyr sf tidyr]; }; + extRemes = derive2 { name="extRemes"; version="2.1"; sha256="1b69r3mzl6hp3g3rqxyc77m8r40jyq7c2d87q85af7xqkn6hnxid"; depends=[distillery Lmoments]; }; extWeibQuant = derive2 { name="extWeibQuant"; version="1.1"; sha256="08dzw5xfgqx0c7ac632c5mg5jmjjw7wwpcr4c9lvz5rv72ykh2rh"; depends=[]; }; extdplyr = derive2 { name="extdplyr"; version="0.1.5"; sha256="1zbnp0h0lv1dr40dhdw6ii8rmc5lxcq4wjsm83xpd3y8x9xpglnl"; depends=[dplyr lazyeval tidyr]; }; extendedFamily = derive2 { name="extendedFamily"; version="0.1.1"; sha256="02cl7i3hvk9r5aq0ahj59lghmlbh28avh4fama9ixhz5zb95l3w1"; depends=[assertthat]; }; @@ -7843,37 +8162,39 @@ in with self; { extfunnel = derive2 { name="extfunnel"; version="1.3"; sha256="162w5b2wjs3yqy8jisamsapav6swa8sskf1b6x5hglnrv3i4qyyy"; depends=[rmeta]; }; extlasso = derive2 { name="extlasso"; version="0.2"; sha256="05774y0i01lrbyws6zx5ymhcglllv1wc7gzrnyx8i5d1lxdinsyd"; depends=[]; }; extraBinomial = derive2 { name="extraBinomial"; version="2.1"; sha256="0qmvl35f7n78kghszwyaz4wzbswqy4p98c3b6alzrc2ldsq6pq5z"; depends=[]; }; - extraDistr = derive2 { name="extraDistr"; version="1.8.11"; sha256="1vvqv1d4hxa025gmm8cbiph63qsqy87l3ri5idd524gyz3chbcl3"; depends=[Rcpp]; }; + extraDistr = derive2 { name="extraDistr"; version="1.9.1"; sha256="1gypnbvdzczl0mvznvy8r7hzsvc5gvdvi2mmzj21cqdw9n63944r"; depends=[Rcpp]; }; extraTrees = derive2 { name="extraTrees"; version="1.0.5"; sha256="1rvvp2p9j8ih8fid1n17606pa23bjg3i2659w1l6w0jkb1p23zcx"; depends=[rJava]; }; extrafont = derive2 { name="extrafont"; version="0.17"; sha256="0b9k2n9sk23bh45hjgnkxpjyvpdrz1hx7kmxvmb4nhlhm1wpsv9g"; depends=[extrafontdb Rttf2pt1]; }; extrafontdb = derive2 { name="extrafontdb"; version="1.0"; sha256="115n42hfvv5h4nn4cfkfmkmn968py4lpy8zd0d6w5yylwpzbm8gs"; depends=[]; }; extraoperators = derive2 { name="extraoperators"; version="0.1.1"; sha256="1clyp97ssmdq9ggbv3w5yskx7khnlm4ji7ym3k3b4bx1pazcw4q4"; depends=[]; }; - extras = derive2 { name="extras"; version="0.0.1"; sha256="0pzb8mfi0x82apxmz1ncx3dmn0bc5bdklvgcfsxcab9k7q1xl6fa"; depends=[chk]; }; + extras = derive2 { name="extras"; version="0.1.0"; sha256="05cr9k1cfc2j08lwpnhhc6i9nymmbbcd0l861430qqf146lksx5g"; depends=[chk]; }; extraterrestrial = derive2 { name="extraterrestrial"; version="0.1.0"; sha256="0clss1zwgw1497n2xif82kplr1w1ajs4xs02041ads3l8craj7y1"; depends=[]; }; extremeIndex = derive2 { name="extremeIndex"; version="0.0.2"; sha256="1zdw6ik2jh1fir01ay3ynw1l756ba05d5vqqcphnawvg0jkvhxvk"; depends=[boot evd evir gmm goftest]; }; extremeStat = derive2 { name="extremeStat"; version="1.4.0"; sha256="0fvkvlm47ri05w9h5qa937ijsc5lg51jc825wq9pmn7aiv58yxzm"; depends=[berryFunctions evd evir extRemes fExtremes ismev lmomco pbapply RColorBrewer Renext]; }; extremefit = derive2 { name="extremefit"; version="1.0.2"; sha256="07gx6dp0kz4y1jn90hsfvkhn6k7i4flh7ghdz9v5nwda86f55q2s"; depends=[]; }; extremevalues = derive2 { name="extremevalues"; version="2.3.3"; sha256="0ijha5zzmv3qr0czm4qxk28kg3ql5jh3nk9fr0flzl8d9n3z0jx6"; depends=[gWidgets2 gWidgets2tcltk]; }; - extremis = derive2 { name="extremis"; version="0.90"; sha256="1cnwn70d9swks5b2y915l18gky9v23vaqlaaggshi0ghn3snb4sm"; depends=[emplik]; }; + extremis = derive2 { name="extremis"; version="1.2"; sha256="1gvizxv1ay788a21qjslrmi7qdbr8s2ryibyri6sp7xdkaqiixsn"; depends=[emplik evd MASS]; }; extremogram = derive2 { name="extremogram"; version="1.0.2"; sha256="13k869v6j4ik9p8w0gf1absvb45xbd3nnwghsz0ix7y0vyvry358"; depends=[boot MASS]; }; - exuber = derive2 { name="exuber"; version="0.4.1"; sha256="1k55mx595v0alvwm7fi5vhw3kf0rhqjaf7431pnjcqc4n050zwx8"; depends=[cli doRNG doSNOW dplyr foreach generics ggplot2 glue lubridate purrr Rcpp RcppArmadillo rlang tibble tidyr vctrs]; }; + exuber = derive2 { name="exuber"; version="0.4.2"; sha256="1kd06x4j9aibmf1arh652rcvdyhz4p0p3j1l241j78z7jrk417cj"; depends=[cli doRNG doSNOW dplyr foreach generics ggplot2 glue lubridate progress purrr Rcpp RcppArmadillo rlang tibble tidyr vctrs]; }; eye = derive2 { name="eye"; version="0.1.0"; sha256="08kvjbr6lmhawd8zxipyz0js4r6mnbknr8cgz6951d8zynfg0426"; depends=[cli dplyr english lubridate magrittr purrr rlang stringr tibble tidyr tidyselect]; }; eyeRead = derive2 { name="eyeRead"; version="0.0.4"; sha256="0f6knzr4fdipbrvcsk0q9yjvkjjyc4wc252lq2s41gdvj3hv575d"; depends=[data_table tibble tidyr]; }; eyeTrackR = derive2 { name="eyeTrackR"; version="1.0.1"; sha256="14m7l8v0ry1ami1jl0xjp743m1ycklgfwi06vk5amppdp5w3w3qr"; depends=[data_table plyr stringr]; }; + eyedata = derive2 { name="eyedata"; version="0.1.0"; sha256="1xnll3x1sm0rv6hq2w22wa9n5qm8r827m7sr3dj54xb1i8j75gj3"; depends=[dplyr]; }; eyelinker = derive2 { name="eyelinker"; version="0.2.0"; sha256="14rfcdxad9iazwd46q6bm8gg1ryh6s8kf7arj00hhb7xz3gvk9c2"; depends=[intervals readr stringi stringr tibble]; }; eyetracking = derive2 { name="eyetracking"; version="1.1"; sha256="0ajas96s25hjp3yrg42hp78qjhl1aih04mjirkskx32qsyq5hfpv"; depends=[]; }; ez = derive2 { name="ez"; version="4.4-0"; sha256="0a58s94x576dfz7wcbivrr2hmdh5x1vy16zwkqp9fmdzqx38pagq"; depends=[car ggplot2 lme4 MASS Matrix mgcv plyr reshape2 scales stringr]; }; ezCutoffs = derive2 { name="ezCutoffs"; version="1.0.1"; sha256="04ah9dbfwl89xi0di0dslaf8a39nynxymm8lbacgd88al5dg7y1n"; depends=[doSNOW foreach ggplot2 lavaan moments progress]; }; ezEDA = derive2 { name="ezEDA"; version="0.1.0"; sha256="1qxifszjfjm1smvl9igpjjjfncb690mim3bwfak5wp0yzjxcrvab"; depends=[dplyr GGally ggplot2 magrittr purrr rlang scales tidyr]; }; - ezcox = derive2 { name="ezcox"; version="0.7.0"; sha256="0z6605gz79pxax08z3s66gkzvdgpcl6c0q4ds0a6ar1afcmhn4ja"; depends=[dplyr forestmodel ggplot2 magrittr purrr rlang survival]; }; + ezcox = derive2 { name="ezcox"; version="0.8.0"; sha256="0zk6pq9b1jdgjjknhpynap7cnigimvpzgi8hdx79v39h334bmwfp"; depends=[dplyr forestmodel ggplot2 magrittr purrr rlang survival]; }; ezec = derive2 { name="ezec"; version="1.0.1"; sha256="0lpx55a8fhy6fqdv3zvzx9mh75q34r71v5kp96hkm9jzl4yvrpd2"; depends=[dplyr drc]; }; ezglm = derive2 { name="ezglm"; version="1.0"; sha256="0x7ffk3ipzbdr9ddqzv0skmpj5zwazkabibhs74faxnld7pcxhps"; depends=[]; }; ezknitr = derive2 { name="ezknitr"; version="0.6"; sha256="060a2175zh1nhzmqgz1mpj2c6721n5w5bv695jj4rbl2s2b2h4qj"; depends=[knitr markdown R_utils]; }; - ezmmek = derive2 { name="ezmmek"; version="0.2.1"; sha256="06cjp0hbq4blg7jj0jzp372xi1vgd1nwp27nzfsbchszn3j85lgf"; depends=[assertable dplyr ggplot2 magrittr nls2 purrr scales tidyr]; }; - ezpickr = derive2 { name="ezpickr"; version="2.0.0"; sha256="1x7v7zsr8hjrwi48dkryqryp607550gs77b058qcdgcdznlqwzp2"; depends=[haven jsonlite magrittr mboxr purrr readxl rmarkdown stringr textreadr tibble vroom writexl]; }; - ezplot = derive2 { name="ezplot"; version="0.6.2"; sha256="078iyzs3qlc6g1hn72ikcz209cr07y11pf43w5x6hiaa7ppmszg7"; depends=[dplyr forcats ggplot2 lubridate rlang tsibble]; }; + ezmmek = derive2 { name="ezmmek"; version="0.2.4"; sha256="0x62nzs1kayv95a6ldav732v79gahrri2khy1w678rxbzfx5wkqy"; depends=[assertable dplyr ggplot2 magrittr nls2 purrr rlang tidyr]; }; + ezpickr = derive2 { name="ezpickr"; version="2.1.0"; sha256="0jcbmd2bsrq8h6z1zmscph5zvv99gj4n2k1ddrl18wj7cx5mzsii"; depends=[haven jsonlite magrittr mboxr purrr readxl rmarkdown stringr textreadr tibble tidyr vroom writexl]; }; + ezplot = derive2 { name="ezplot"; version="0.6.6"; sha256="1mzhf3sp0ynwnzaalip22m0kpjl7g89y9x6lx5bvqw43manxpywy"; depends=[dplyr forcats ggplot2 lubridate rlang tsibble]; }; + ezr = derive2 { name="ezr"; version="0.1.5"; sha256="0r4zq0864xpnmczg1zpaasi348j1fllrn0rqfa5fmjh245chcpd4"; depends=[data_table DT ggplot2 ggridges moments shiny shinydashboard weights]; }; ezsim = derive2 { name="ezsim"; version="0.5.5"; sha256="03x75vmf75qsmk4zb09j7xrb11w31rpfwd3dvv12nwjgndh9bnld"; depends=[digest foreach ggplot2 Jmisc plyr reshape]; }; - fANCOVA = derive2 { name="fANCOVA"; version="0.5-1"; sha256="034m2mmm6wmsjd41sg82m9ppqjf4b1kgw5vl2w7kzqfx0lypaiwv"; depends=[]; }; + fANCOVA = derive2 { name="fANCOVA"; version="0.6-1"; sha256="04mw0blgpwdk6wdg8llrig43psgc0vb42cbimvzbnym8v503dsn3"; depends=[]; }; fAsianOptions = derive2 { name="fAsianOptions"; version="3042.82"; sha256="13p1r93rgnf03wj0kkfpw4w4dlzd1ypkam50xqpjfm38qm4zvkds"; depends=[fBasics fOptions timeDate timeSeries]; }; fAssets = derive2 { name="fAssets"; version="3042.84"; sha256="0aj3gjd54ajviikwh075bympw7dx2dcsgj5p8j96vx2qbbwjmgvb"; depends=[ecodist energy fBasics fMultivar MASS mvnormtest robustbase sn timeDate timeSeries]; }; fBasics = derive2 { name="fBasics"; version="3042.89.1"; sha256="1m8x1f9kvsbdcn3ys24hw0vgbxrzdrcp11ai0s3pilp7q91j095d"; depends=[gss MASS spatial stabledist timeDate timeSeries]; }; @@ -7893,13 +8214,13 @@ in with self; { fPortfolio = derive2 { name="fPortfolio"; version="3042.83.1"; sha256="1knyrjgfzwf4ppvnb5n325p5f6sidr6q53ss0zw8binhj22gli4y"; depends=[fAssets fBasics fCopulae kernlab MASS quadprog Rglpk rneos robustbase Rsolnp slam timeDate timeSeries]; }; fRLR = derive2 { name="fRLR"; version="1.1"; sha256="005bmljxgvx8v87nz4l3ycg09sahyd34pg8arjz5gdc17d4mjjfc"; depends=[Rcpp]; }; fRegression = derive2 { name="fRegression"; version="3042.82"; sha256="0pi777xfk101g0r2qpcd0qxqqfnvck3sii990d946ljw6366mamc"; depends=[fBasics lmtest mgcv nnet polspline timeDate timeSeries]; }; - fSRM = derive2 { name="fSRM"; version="0.6.4"; sha256="1n91gzjx9r3r3xl400w38miva0b69c0f23h2056kq9p1bax2nm86"; depends=[foreign ggplot2 gridExtra lavaan plyr reshape2 scales tcltk2]; }; fTrading = derive2 { name="fTrading"; version="3042.79"; sha256="0xnfg4npfdrvmp1n6vbsm7if16n5j83b7y1i2m5b34cqnlz9d69y"; depends=[fBasics timeDate timeSeries]; }; fUnitRoots = derive2 { name="fUnitRoots"; version="3042.79"; sha256="1hsv47dm0hx3s04g9h0bjdgi79zbfihnfxxdc2jskqp94yl7azsy"; depends=[fBasics timeDate timeSeries urca]; }; fabCI = derive2 { name="fabCI"; version="0.1"; sha256="123bc56nnx6hcj257imsd8sc6d0pggw08lf4m0lr90631gcm1mkn"; depends=[]; }; fabMix = derive2 { name="fabMix"; version="5.0"; sha256="1gii3mdii9nw423xxn9mhv1pjbw967wdarn828w04zm9dkdcwm48"; depends=[coda corrplot doParallel foreach ggplot2 label_switching MASS mclust mvtnorm RColorBrewer Rcpp RcppArmadillo]; }; fable = derive2 { name="fable"; version="0.2.1"; sha256="1gbzi0g71vdp5yp70msg4qxs45fp8wa2x4byfa8jw67v4gl4xx8y"; depends=[distributional dplyr fabletools Rcpp rlang tibble tidyr tsibble]; }; - fabletools = derive2 { name="fabletools"; version="0.2.0"; sha256="0zgvq3fg6dnj9jv2ksm2zlk0zw1wyna8rww1arz92pnmhgmprwvn"; depends=[distributional dplyr generics ggplot2 lifecycle progressr R6 rlang tibble tidyr tidyselect tsibble vctrs]; }; + fable_prophet = derive2 { name="fable.prophet"; version="0.1.0"; sha256="12y2k05plg6d6lgqk6617q6z5m6xz33zdsjh56k86h230qqw68rp"; depends=[distributional dplyr fabletools lubridate prophet Rcpp rlang tsibble]; }; + fabletools = derive2 { name="fabletools"; version="0.2.1"; sha256="014avk78nrihp83zqfwb73nrl3bgpa4rzzx9azp2h0jca8klyy4b"; depends=[distributional dplyr generics ggplot2 lifecycle progressr R6 rlang tibble tidyr tidyselect tsibble vctrs]; }; fabricatr = derive2 { name="fabricatr"; version="0.10.0"; sha256="0kh2mfgyqz3fpilc4wycxj3vihhbdnjzsjrsp88nmsk0p5mjmljj"; depends=[rlang]; }; fabricerin = derive2 { name="fabricerin"; version="0.1.2"; sha256="0ynvnxzxx1iybyy5pvwfsj5y9jjixyrpji9vcl5fq5mjnpg8mpqk"; depends=[glue htmltools]; }; face = derive2 { name="face"; version="0.1-5"; sha256="0n7vlq29krsdcp8r32irhvf7xbcxy5g7663qncmbhj5x45sviqh6"; depends=[Matrix matrixcalc mgcv]; }; @@ -7914,7 +8235,7 @@ in with self; { factorcpt = derive2 { name="factorcpt"; version="0.1.2"; sha256="17hwlsrj0fx4x05p6xvs6kl43a24icmnrzyvpf2vam5imwvmpvmm"; depends=[doParallel fields foreach iterators Rcpp RcppArmadillo]; }; factorial2x2 = derive2 { name="factorial2x2"; version="0.2.0"; sha256="045887hwknwm92wlrp0jlvxj5aal50vpnc7ddbh7c8smawmrdwfd"; depends=[mvtnorm survival]; }; factorplot = derive2 { name="factorplot"; version="1.1-2"; sha256="025lfk122w66yxym3njcpzwnbhg40xi7p1c9vnxczcb8kz31745s"; depends=[multcomp nnet]; }; - factorstochvol = derive2 { name="factorstochvol"; version="0.9.3"; sha256="15gamzznss9vfmbvbk61sgabxfsra2i49bs142jl1ahk7wchiskw"; depends=[corrplot GIGrvg Rcpp RcppArmadillo stochvol]; }; + factorstochvol = derive2 { name="factorstochvol"; version="0.10.1"; sha256="1cd2dw26bvgy0qxbva5hmpxki6qxql71bgir58yjgp7fjzfbw0b7"; depends=[corrplot GIGrvg Rcpp RcppArmadillo stochvol]; }; factory = derive2 { name="factory"; version="0.1.0"; sha256="1715bx2rn8kk5qd196jnrv5f95l54n4y0aqqdzfkgrmqihcy8ahx"; depends=[purrr rlang]; }; factset_analyticsapi_engines = derive2 { name="factset.analyticsapi.engines"; version="3.0.1"; sha256="0v96z837dii1q7mbpd48zwpl2qjzqnhignb80g0xkc4iygsnrrms"; depends=[caTools httr jsonlite R6 rlang]; }; factset_protobuf_stach = derive2 { name="factset.protobuf.stach"; version="1.0.2"; sha256="0qdvgq0w58pb0bn4x5v25i8pvij3lc8l9x9bj68s9zb29ankl3ss"; depends=[R6 RProtoBuf]; }; @@ -7922,11 +8243,13 @@ in with self; { fad = derive2 { name="fad"; version="0.2-1"; sha256="09lbakil37fyji3bwydspzvrnwm0992x8783zyyv2jk37y0wr1ip"; depends=[Matrix Rcpp RSpectra]; }; fail = derive2 { name="fail"; version="1.3"; sha256="0vfm6kmpmgsamda5p0sl771kbnsscan31l2chzssyw93kwmams7d"; depends=[BBmisc checkmate]; }; fairadapt = derive2 { name="fairadapt"; version="0.1.0"; sha256="01ing7mm1asfgh4w8cc7f7fpv13lja97vv5skk5bri00zycwcqfd"; depends=[ranger]; }; - fairml = derive2 { name="fairml"; version="0.2"; sha256="07b1gxzxpjc36pic0ayjmdizpkcnrv9rra1h5r75hy8lkf554qqd"; depends=[optiSolve]; }; - fairness = derive2 { name="fairness"; version="1.1.1"; sha256="05fimbxikippgad3h0glvlwy6745gyakv2hnhp4v58jbzy79yz7q"; depends=[caret devtools e1071 ggplot2 pROC]; }; + fairml = derive2 { name="fairml"; version="0.3"; sha256="0513x52caw6sa3jizi66fhfksdigla72bxj45jakyai2xgvwq28b"; depends=[optiSolve]; }; + fairmodels = derive2 { name="fairmodels"; version="0.2.4"; sha256="0zqflf2zmpg9nx2lvigdr3vy62sxxmif3d6h7r0iqzhf9i1ix8wq"; depends=[DALEX ggdendro ggplot2 ggrepel patchwork scales]; }; + fairness = derive2 { name="fairness"; version="1.2.0"; sha256="12inr7jhlc6rvfa2klzbgi5a1ch5cdqsa93kzdcjrijw8y1pfpzn"; depends=[caret devtools e1071 ggplot2 pROC]; }; + fairsubset = derive2 { name="fairsubset"; version="1.0"; sha256="0iw16fs2mb9p14vr34izw3sirbndyy8w07df3scy7gkkcx2nz2bz"; depends=[matrixStats]; }; faisalconjoint = derive2 { name="faisalconjoint"; version="1.15"; sha256="08sb4za8qyadvigq2z7b0r44qk2lpahpnz9nv16xfjb1zhdkz5w3"; depends=[]; }; fakeR = derive2 { name="fakeR"; version="1.0"; sha256="0f4ngnd8s34j1327zp3aqnsiw0gfxkp1i24ng20hrmfl13s1qmxp"; depends=[mvtnorm polycor pscl VGAM]; }; - fakemake = derive2 { name="fakemake"; version="1.7.1"; sha256="0mckcgc12yxmpsgkcnmaf1pa634rz8x1zc97h023pnsd1cdwsp4l"; depends=[callr igraph MakefileR withr]; }; + fakemake = derive2 { name="fakemake"; version="1.9.0"; sha256="0lwh9zb7jh10p30r0ajhvgh7a1airfw6kxn54620xc1b71f4116q"; depends=[igraph MakefileR]; }; falcon = derive2 { name="falcon"; version="0.2"; sha256="09hlvwwj3k3nhcsxijjvv8x74a9m200ayjjplrp4baxvczwyq341"; depends=[]; }; falconx = derive2 { name="falconx"; version="0.2"; sha256="0648mvbc7ga7vr2xqzyln3dgd11h5s4bqhv3p55mj7smr4qv7hv9"; depends=[]; }; fam_recrisk = derive2 { name="fam.recrisk"; version="0.1"; sha256="1lyrq7bq7p7ijc2vf545nazw4akncz08548ya1dv3lsc5jmkgfzj"; depends=[]; }; @@ -7935,6 +8258,7 @@ in with self; { fame = derive2 { name="fame"; version="2.21"; sha256="15pcgc67qcg6qkgssbfissicic317v60jsybp86ryqvzqg70cqx3"; depends=[tis]; }; fanc = derive2 { name="fanc"; version="2.2"; sha256="1gdkxb2ay0lyldjpg4s2fbavjxl4q1bf9q438csqa4vzl5ywv2w8"; depends=[Matrix]; }; fancycut = derive2 { name="fancycut"; version="0.1.2"; sha256="1xg5qjxf77g10h07x6rvb8c3klc9gbr77bkw352qpas268pkswl2"; depends=[]; }; + fanovaGraph = derive2 { name="fanovaGraph"; version="1.5"; sha256="1hffda52yk24slbgsfdgkpg3vsryfnhlw09r39cbyz483i7xd8d0"; depends=[DiceKriging igraph sensitivity]; }; fanplot = derive2 { name="fanplot"; version="3.4.2"; sha256="169n9ghm4x6fhd97xz1mqjj0f5hldjkrp926iqk2qqanchnhfvh6"; depends=[]; }; fansi = derive2 { name="fansi"; version="0.4.1"; sha256="028ywjy538psnmdnddvy5jr3idzffr4hikzr4x97x0m30g4fws9w"; depends=[]; }; faoutlier = derive2 { name="faoutlier"; version="0.7.4"; sha256="07nnnyj0j5g72a0sa3v7hrnx900i8a1yhlp0wmiwabskikz36iw7"; depends=[lattice lavaan MASS mirt mvtnorm pbapply sem]; }; @@ -7942,26 +8266,26 @@ in with self; { far = derive2 { name="far"; version="0.6-5"; sha256="18lj2mgnn9s59ypkr19zzv0sffwpx9mgk975xmpvw4kkl84dykis"; depends=[nlme]; }; faraway = derive2 { name="faraway"; version="1.0.7"; sha256="0lalf52y9rb4zdb4kpscwddb4zy0af7r5sm7lx8s9jaqykrwrfq6"; depends=[lme4 nlme]; }; farff = derive2 { name="farff"; version="1.1"; sha256="0d3d343jjjwsb132ph12h3r044j3bc4jp94ayikjyq1lmwwsfr4k"; depends=[BBmisc checkmate readr stringi]; }; - farrell = derive2 { name="farrell"; version="0.2.0"; sha256="00scn4qmk8gc8m45bfl45swvz00fckwv53wxdynr3bxqcmyqgpkb"; depends=[Benchmarking data_table dplyr DT magrittr miniUI readr rlang shiny shinycssloaders shinyWidgets tibble]; }; + farrell = derive2 { name="farrell"; version="0.2.1"; sha256="0i546w5p40j9wqiq7qvbxw0426msavbdpnh258jcg6bagc6bywh8"; depends=[Benchmarking data_table dplyr DT magrittr miniUI readr rlang shiny shinycssloaders shinyWidgets tibble]; }; farver = derive2 { name="farver"; version="2.0.3"; sha256="1k75v07dsfkjra2gsgxg9s55cw3b46b1nh960kqphq7cg7gr058f"; depends=[]; }; fasjem = derive2 { name="fasjem"; version="1.1.2"; sha256="1bbrcyyg96hakgla3604byrkn9034197vy2is048kdq20yr2y11n"; depends=[igraph]; }; - fasstr = derive2 { name="fasstr"; version="0.3.1"; sha256="1msafxyx2xwgjw87yfbqqfn5ajfc6gla2nf41s6g4wjzg245n5zn"; depends=[dplyr e1071 fitdistrplus ggplot2 lubridate openxlsx PearsonDS plyr purrr RcppRoll scales tidyhydat tidyr zyp]; }; - fast = derive2 { name="fast"; version="0.64"; sha256="098rk6kszdx3szcwvwzcv7zlcd6qvqvbqch7q8ilas6vbki81ba4"; depends=[zoo]; }; + fasstr = derive2 { name="fasstr"; version="0.3.2"; sha256="0krd6h9vz4y3kzz13w2lq5b59v6ajr61ngcpnnk71ijn7hhmaanh"; depends=[dplyr e1071 fitdistrplus ggplot2 lubridate openxlsx PearsonDS plyr purrr RcppRoll scales tidyhydat tidyr zyp]; }; fastAdaboost = derive2 { name="fastAdaboost"; version="1.0.0"; sha256="1pv1y6znvc37pgwk99v4r0hljhipq8v6r3r5cb5vhgyl0bfi8g38"; depends=[Rcpp rpart]; }; - fastDummies = derive2 { name="fastDummies"; version="1.6.1"; sha256="1vqpzrrahwabvpcfzzkgw98yxclsmjqrjzfa7jvd5dsz0bgil4r7"; depends=[data_table stringi tibble]; }; + fastDummies = derive2 { name="fastDummies"; version="1.6.3"; sha256="1pw1bpp69sbs8yc1s5ffz11q249ljfwbgfrq6irg5pyp37z38fdx"; depends=[data_table stringr tibble]; }; fastGHQuad = derive2 { name="fastGHQuad"; version="1.0"; sha256="1rjia8wggadr9xwxcmzmal0rc4g6pa3dr5888fbbnb6abl8b2lrj"; depends=[Rcpp]; }; fastGraph = derive2 { name="fastGraph"; version="2.1"; sha256="0lz199607hqpwxzhff4jzhmjq6cbakd335iyclmlscllgfzgnhql"; depends=[]; }; fastHICA = derive2 { name="fastHICA"; version="1.0.2"; sha256="1h794ybbii0k7v3x0r1499zxdqa1i1dpi3i7idzqdrffnb5kmwlv"; depends=[energy fastICA]; }; fastICA = derive2 { name="fastICA"; version="1.2-2"; sha256="1zpijqcipm0aa3rxj0mys06lskqy4dbppjpxr1aby0j16y9ka8ij"; depends=[]; }; - fastJT = derive2 { name="fastJT"; version="1.0.5"; sha256="1knk4zjrkkv1i3a8n68vdrpxkwdkf19zw75p93hygfmbbz6r88v4"; depends=[Rcpp]; }; + fastJT = derive2 { name="fastJT"; version="1.0.6"; sha256="1vw9x00gslqgjfz55a60kizz8y02jifgf3fw7dv9lxm207vd2wxq"; depends=[Rcpp]; }; fastLink = derive2 { name="fastLink"; version="0.6.0"; sha256="0xysif0v7l7iwnwpf5ydk7ns9azsgja5sm672wxybfqwrh6nx9xk"; depends=[adagio data_table doParallel dplyr FactoClass foreach gtools Matrix plotrix Rcpp RcppArmadillo RcppEigen stringdist stringi stringr]; }; fastM = derive2 { name="fastM"; version="0.0-4"; sha256="1n9a431w0hl4kr3pa32kcyd1d73acz4vb9vhfkckk3099mg46d9m"; depends=[Rcpp RcppArmadillo]; }; fastNaiveBayes = derive2 { name="fastNaiveBayes"; version="2.2.1"; sha256="04hv4jdhan1vbsixzbifa7hpmc531gv7c2dd1fx5700c2wlkja1n"; depends=[Matrix]; }; fastR2 = derive2 { name="fastR2"; version="1.2.1"; sha256="15mqsdy79zvd4srrszdjp0kh9lfcq3yxp7j5d4xcqbjbwsgy68il"; depends=[dplyr ggplot2 lattice maxLik miscTools mosaic numDeriv]; }; fastSOM = derive2 { name="fastSOM"; version="1.0.1"; sha256="1fzy7lfx1fn9993h0qh6vbwq0w4gfgbdrprmzb1z3aqq6nqvmngm"; depends=[]; }; - fastStat = derive2 { name="fastStat"; version="1.3"; sha256="1f4554p487l7cig2xihfbgl55x7w04xbazd01pic0l8819mgmy5n"; depends=[car do e1071 ggplot2 ggrepel plyr reshape2 set survival tseries]; }; - fastTextR = derive2 { name="fastTextR"; version="1.0"; sha256="0l0f9jvsa68a3vd6mwbhsqd12729nd6nwsnlzrhsg9wj9rx8kpmi"; depends=[Rcpp]; }; + fastStat = derive2 { name="fastStat"; version="1.4"; sha256="1sgk41v07rjh6dq52mxbiryjcwmyl71cmm51r8gwf8k14zgl500s"; depends=[car do e1071 ggplot2 ggrepel plyr PredictABEL reshape2 set survC1 survIDINRI survival tseries]; }; + fastTextR = derive2 { name="fastTextR"; version="2.0.0"; sha256="1ggmwsw2qnq8v3s8iaxi8q66c898pc15wfgpsp6h0mc761qih5lf"; depends=[Rcpp slam]; }; fasta = derive2 { name="fasta"; version="0.1.0"; sha256="0wnppxn3039dj58xm0b66fsyq537bk8k8m56im11xj1iwc3zc6vw"; depends=[]; }; + fastai = derive2 { name="fastai"; version="2.0.2"; sha256="0m6wj2zdc1gjyf6dqpmci2yn0ps2gzx65dk02cb9qr8yzcc7bdgk"; depends=[generics ggplot2 ggpubr glue png reticulate]; }; fastclime = derive2 { name="fastclime"; version="1.4.1"; sha256="0zcir8r11b2hxr9vvkmvxlzmhfcaxbr0wbjy86ysr912mp8fs9i3"; depends=[igraph lattice MASS Matrix]; }; fastcluster = derive2 { name="fastcluster"; version="1.1.25"; sha256="01a2xnhhvv1swd4g8p4lzyn7ww7kg49jlnzc7kfz60jqjzpisrpk"; depends=[]; }; fastcmh = derive2 { name="fastcmh"; version="0.2.7"; sha256="0hib3r3pkfdi67bdy4pf1pw6869vq4b3pg1pq1zwpyy76nbnq9vl"; depends=[bindata Rcpp]; }; @@ -7972,92 +8296,93 @@ in with self; { fasteraster = derive2 { name="fasteraster"; version="1.1.1"; sha256="1ycr2h046jds2758xvxn00rhglx3zarbzn3r38j66j5pnz2iiq4f"; depends=[Rcpp]; }; fasterize = derive2 { name="fasterize"; version="1.0.3"; sha256="10bzl77c1b9jhcn1xp467qzp2n8c7s3wpxn53qjh1nwvbri5kd32"; depends=[raster Rcpp RcppArmadillo sp]; }; fastglm = derive2 { name="fastglm"; version="0.0.1"; sha256="1vqw02j4y28mngki87r42f1mhlkvajqp2gpbvk0l2adrkz70l0bn"; depends=[Rcpp RcppEigen]; }; + fastlogitME = derive2 { name="fastlogitME"; version="0.1.0"; sha256="1wpbcjb3ncxl904492alikslnqg53zgx6psxx7qllspd43s8ymv7"; depends=[]; }; fastlogranktest = derive2 { name="fastlogranktest"; version="0.2.1"; sha256="1j5mgvi3nwnlarj31cknx2cikypql370qds2h0877vmm80942z25"; depends=[BH Rcpp]; }; fastmaRching = derive2 { name="fastmaRching"; version="1.1.0"; sha256="085xr5i6h6vwl1flzbkwqsm8d815s0p02p0mir60jqjvy0s7haip"; depends=[raster rgdal sp]; }; fastmap = derive2 { name="fastmap"; version="1.0.1"; sha256="1v7sp56xiha0bh78g3w92k52p9vkp7ryzpw0z66nyddxzrfv0y27"; depends=[]; }; fastmatch = derive2 { name="fastmatch"; version="1.1-0"; sha256="0z80jxkygmzn11sq0c2iz357s9bpki548lg926g85gldhfj1md90"; depends=[]; }; - fastmatrix = derive2 { name="fastmatrix"; version="0.2"; sha256="00az0mhzwh1wxx5r1ivx4irgx95nh9r5ll6lpwp16zg50l2fhd66"; depends=[]; }; + fastmatrix = derive2 { name="fastmatrix"; version="0.3"; sha256="08bw3qrsdfb5y9x44rxi6kzmagaz4k9f08svdxgxnad1aja7hbnr"; depends=[]; }; fastmit = derive2 { name="fastmit"; version="0.1.1"; sha256="13hczsfbzssd272kpbq8l2l64lqrkmi2j6f3xyp9jvvxdd506kq0"; depends=[Rcpp RcppArmadillo]; }; - fastnet = derive2 { name="fastnet"; version="0.1.6"; sha256="16jdwvk1xhl6bn9fx5s8pzvbizx6c0jmg6arqf201a7ghw2wi4xh"; depends=[doParallel foreach igraph tidygraph]; }; - fastpos = derive2 { name="fastpos"; version="0.4.0"; sha256="0j27xbjjz5d9892vgy3ph9xmfnn7gjgjdiy9zh2cl3hsq31w06fd"; depends=[future MASS plyr Rcpp RcppArmadillo RcppProgress]; }; + fastnet = derive2 { name="fastnet"; version="1.0.0"; sha256="1c07msypxj8ilpa1il9jjbgylwpdxv8j8gak362xdmbm4b1bwlm6"; depends=[doParallel foreach igraph tidygraph]; }; + fastpos = derive2 { name="fastpos"; version="0.4.1"; sha256="0h6drzzc3f1dc5ydi5x9c7wday18sgzi8zn4pf5wxlzsc4qj0pzf"; depends=[future MASS plyr Rcpp RcppArmadillo RcppProgress]; }; fastpseudo = derive2 { name="fastpseudo"; version="0.1"; sha256="0paag4pjh3gs270j663bsl65sfrq43gk2zzqmalr03fmcckp6aaj"; depends=[]; }; fastqcr = derive2 { name="fastqcr"; version="0.1.2"; sha256="12x3lkg5zc4ckyg4x3xxqb779yhrr0fys7asf5b8shz49f86fmm9"; depends=[dplyr ggplot2 gridExtra magrittr readr rmarkdown rvest scales tibble tidyr xml2]; }; - fastquant = derive2 { name="fastquant"; version="0.1.2"; sha256="0s6ylf3mjbd1w3mjmlw6fxmsj87yi339g439nf5alx87zm5f04v3"; depends=[assertthat dplyr httr lubridate magrittr purrr quantmod stringr tibble tidyr]; }; fastshap = derive2 { name="fastshap"; version="0.0.5"; sha256="08f25ib5mry6h8lvj0g3clc9kfl5g2wdd8x8bw455wwmbcm6x5vg"; depends=[abind ggplot2 gridExtra matrixStats plyr Rcpp RcppArmadillo tibble]; }; fasttime = derive2 { name="fasttime"; version="1.0-2"; sha256="11i4c0zrkvvqsax0az1fvmc0jxfsjyx28434k1qgzhj9g2j9m9cf"; depends=[]; }; fat2Lpoly = derive2 { name="fat2Lpoly"; version="1.2.4"; sha256="01a9d6b2f6g858vg64kr0w0qmv2jqhk9kk3hb6jdr2rly4j8p14x"; depends=[kinship2 multgee]; }; - fauxnaif = derive2 { name="fauxnaif"; version="0.6.0"; sha256="0c7fx3kyiqp63p64j0bssbw96h21cwg42qz4nab85wrmn1va7fs4"; depends=[dplyr glue lifecycle magrittr rlang]; }; + faux = derive2 { name="faux"; version="0.0.1.5"; sha256="1fkl2zmsfqc5rjbfik94pywy6rbvmkwk192m8xbihmgirdwjg726"; depends=[dplyr ggplot2 jsonlite lme4 truncnorm]; }; + fauxnaif = derive2 { name="fauxnaif"; version="0.6.1"; sha256="1hw6lkxvxd65wajr0mpmbg8lvx0sd84py1apzqfnr7xpb4r1hi85"; depends=[glue lifecycle rlang]; }; fauxpas = derive2 { name="fauxpas"; version="0.5.0"; sha256="129fzqb7wsskbn50s8x0marr4wm8jrns6hiycqcsk166k3dnyyy8"; depends=[httpcode R6 whisker]; }; favnums = derive2 { name="favnums"; version="1.0.0"; sha256="0siax7gjr25lpf1li3hawx6nviggs68c0lap2d9i38azlhvj891w"; depends=[]; }; fbRads = derive2 { name="fbRads"; version="0.2"; sha256="1a65gfvizzm6psspcvlhkxligdf9j1whrgzkg7ww520lk3z8lnnd"; depends=[bit64 data_table digest futile_logger jsonlite plyr RCurl]; }; fbRanks = derive2 { name="fbRanks"; version="2.0"; sha256="17kbmdpgqkj2n951c6mdsrgfga6kiij1gqiw1wpi0q3fq4dlfrzx"; depends=[igraph stringr]; }; - fbar = derive2 { name="fbar"; version="0.5.2"; sha256="0scfcr5k71fl0b0sibxchhcwpwk7ll68ks4nrpvsqgv5z48hlvsl"; depends=[assertthat dplyr magrittr Matrix purrr rlang ROI ROI_plugin_ecos stringr tibble tidyr]; }; + fbar = derive2 { name="fbar"; version="0.6.0"; sha256="005725xiz6k868hrj12ryq3xlyin2r94n0yychimjzhfsppx2zba"; depends=[assertthat dplyr magrittr Matrix purrr rlang ROI ROI_plugin_ecos stringr tibble tidyr]; }; fbati = derive2 { name="fbati"; version="1.0-4"; sha256="0vqn73zcqgg89zkfgf0ika0s87f4gb6nxds1dmliiq36p28dhv2c"; depends=[fgui pbatR rootSolve]; }; fbroc = derive2 { name="fbroc"; version="0.4.1"; sha256="1v73wl3yckcqx43fz1lzcsy6v08vmbmi7yi623yhgqywixxv2bx3"; depends=[ggplot2 Rcpp]; }; - fbst = derive2 { name="fbst"; version="1.0"; sha256="06bdsmmw5kbzrz5vgs6n572c8l9p62p7mi12gs4l1zncmh99qc1b"; depends=[bayestestR coda Matrix]; }; + fbst = derive2 { name="fbst"; version="1.3"; sha256="13qc2mcjncw1iginyrlbzw0l7r426730apkwvh6yf0cqby1z9ad9"; depends=[bayestestR]; }; fc = derive2 { name="fc"; version="0.1.0"; sha256="0x41xfchy499kz0qi7fp12vpkbcddprv19mmk48lxzavv4f5avfh"; depends=[codetools]; }; - fcaR = derive2 { name="fcaR"; version="1.0.4"; sha256="0kbhmbr4skr6xfhaamrk8v015ac8qf9i8a1ssjdjqrzq5s50pfch"; depends=[arules fractional hasseDiagram knitr Matrix RColorBrewer Rcpp scales stringr tictoc tikzDevice]; }; + fcaR = derive2 { name="fcaR"; version="1.0.7"; sha256="0hvwd8gpx7akci96c78cw8v4qlh46zabbcxv9bl5dlgp5spxppng"; depends=[fractional magrittr Matrix R6 Rcpp registry stringr tictoc tikzDevice]; }; fcd = derive2 { name="fcd"; version="0.1"; sha256="091wbf5iskcgyr7jv58wrf590qijb0qcpninmvm3xrwxi34r37xr"; depends=[combinat glmnet MASS]; }; fclust = derive2 { name="fclust"; version="2.1.1"; sha256="11dsf7mb075m1m1ilqsacc0s4907wq6alvdfh6nizsyr01wiqw3b"; depends=[MASS Rcpp RcppArmadillo]; }; fcm = derive2 { name="fcm"; version="0.1.3"; sha256="1mqk6szczsixdvw0inkypij4cw2syng5l5ccw0xk55kc21l1lzn0"; depends=[ggplot2 reshape2]; }; fcr = derive2 { name="fcr"; version="1.0"; sha256="17jrz5zp1msd2khl1lwnb5sgxcigagni556rhn7qm9g0aykbh8yj"; depends=[face fields mgcv]; }; fcros = derive2 { name="fcros"; version="1.6.1"; sha256="04yr6lqs38lczsmdvdm78qn63836qj7xwspgh3h3n3gh8cssd83x"; depends=[]; }; + fctbases = derive2 { name="fctbases"; version="1.0.0"; sha256="01nwnlvaq7qna166d5s71p3pvx1gnlhpz0macwfqd8ryg6ccid7x"; depends=[Rcpp RcppArmadillo]; }; fcuk = derive2 { name="fcuk"; version="0.1.21"; sha256="1sb7p1m5qb88028mrw95lhh8l7dxj696hjh88nfsdpnscryknfpv"; depends=[magrittr purrr stringdist tibble]; }; fdANOVA = derive2 { name="fdANOVA"; version="0.1.2"; sha256="1pycq5a4czqzi8wcfmlc9ncg827j7n0qxyj90wcv39nbcrnl3da1"; depends=[doBy doParallel fda foreach ggplot2 magic MASS]; }; - fda = derive2 { name="fda"; version="5.1.5.1"; sha256="0zi001cw5536x6rgr4l0skva7fk53663zf6ggnsa8znml090sihm"; depends=[Matrix]; }; + fda = derive2 { name="fda"; version="5.1.9"; sha256="0yjrjsv55bcwqn2yxjgj3hn17wfvjvgngfw9xv3w802i52yz9gf8"; depends=[fds Matrix]; }; fda_usc = derive2 { name="fda.usc"; version="2.0.2"; sha256="0z44vkzjm2h6r5af0k1iic1szvw82rbwjrm541zlwn2jycj4q96a"; depends=[doParallel fda foreach iterators MASS mgcv nlme]; }; - fdaACF = derive2 { name="fdaACF"; version="0.2.0"; sha256="1kpvd2hkmszfrdwbcm1a586pv1kpy162263bcq371hv5mx450lhj"; depends=[CompQuadForm fda Matrix pracma vars]; }; + fdaACF = derive2 { name="fdaACF"; version="1.0.0"; sha256="0qrsj25p6h2xg25v0ayk8x31d4whyy0mpf2xdpw3hcwhb71mbfhn"; depends=[CompQuadForm fda pracma vars]; }; fdaMixed = derive2 { name="fdaMixed"; version="0.6"; sha256="0hyhb67qvvhyq68k5h4ffvsl4lmw66nfy5l14kwxnn42h3b810sc"; depends=[Formula Rcpp RcppArmadillo]; }; fdaPDE = derive2 { name="fdaPDE"; version="1.0-9"; sha256="06hm1f30rpy37xz9ybvhk759y10p8ijy7slnl9cvp4gqwzy2i8b7"; depends=[geometry Matrix plot3D plot3Drgl RcppEigen rgl]; }; fdadensity = derive2 { name="fdadensity"; version="0.1.2"; sha256="1i2xzchlsixgjzyfmbv547sy6mq90xrnyc2kpd11wwfgfrpj1ix3"; depends=[fdapace Rcpp]; }; fdakma = derive2 { name="fdakma"; version="1.2.1"; sha256="0j9qgblrl7v4586dd6v0hjicli6jh8pkk5lzn8afpl75xfs24six"; depends=[]; }; + fdaoutlier = derive2 { name="fdaoutlier"; version="0.1.1"; sha256="05n22xp2v90f73h1zdjb3fzw3gx6cw9x19lxcw8873xza43ywvg3"; depends=[MASS]; }; fdapace = derive2 { name="fdapace"; version="0.5.5"; sha256="1icc4wxglqr7qyyv2bh94j9jzcf8l03a701y69703rq9pzylq91s"; depends=[Hmisc MASS Matrix numDeriv pracma Rcpp RcppEigen]; }; - fdasrvf = derive2 { name="fdasrvf"; version="1.9.3"; sha256="148rkidnflrdjmid9p2m08qz0li21mibyr0ahqzhry14dcw24g01"; depends=[coda doParallel fields foreach matrixcalc mvtnorm Rcpp RcppArmadillo testthat tolerance viridisLite]; }; + fdasrvf = derive2 { name="fdasrvf"; version="1.9.4"; sha256="0psqxmznb2qimci2g8p0qy5fc5mal8gilwbmshlmb57ws71c3pkc"; depends=[coda doParallel fields foreach matrixcalc mvtnorm Rcpp RcppArmadillo testthat tolerance viridisLite]; }; fdatest = derive2 { name="fdatest"; version="2.1"; sha256="0zdnmssir5jz2kbfz4f4xshjfv4pivqx7cbh2arlx6ypkjrjws8n"; depends=[fda]; }; fdcov = derive2 { name="fdcov"; version="1.1.0"; sha256="0savsgcifcjjqrmbpn6m30gncq5iigqxpb19l710wlx8nm98svjh"; depends=[corrplot matlab]; }; - fddm = derive2 { name="fddm"; version="0.1-1"; sha256="12cm2ffjmsii1271k011yi2rn9qrjfqhqz1g75hywgr8vgl90g70"; depends=[Rcpp]; }; + fddm = derive2 { name="fddm"; version="0.2-2"; sha256="1kaqnk6z0f1m3sp2dfw1nl0wpdm0xj4grip62zaqwisi0vjk91w9"; depends=[Rcpp]; }; fdistr = derive2 { name="fdistr"; version="0.1.0"; sha256="1i9nq4jmszbmwk4m6jfn7rifsn7aay40cj6kz23b9ihj3phqffi8"; depends=[dplyr ggplot2 magrittr usethis]; }; - fdm2id = derive2 { name="fdm2id"; version="0.9.3"; sha256="0ylr8843hdilzj2c38csxw98pvib9pgw25j7kbgw8531931xqls0"; depends=[arules car caret class cluster e1071 FactoMineR flexclust fpc glmnet ibr irr kohonen leaps MASS mclust mda meanShiftR nnet pls questionr randomForest ROCR rpart Rtsne SnowballC stopwords text2vec wordcloud xgboost]; }; fdq = derive2 { name="fdq"; version="0.11"; sha256="1lzv1pmzjixp8wpap0w3lad1ns9z2hjbxkfpyp9jy9mxprj1w3q9"; depends=[data_table Fgmutils ggplot2 plyr randomcoloR sqldf]; }; fdrDiscreteNull = derive2 { name="fdrDiscreteNull"; version="1.4"; sha256="1lwznpwfnhhv0h7qwy9jc7li752bq7hgmkh86qzyqz7k18zgx4iw"; depends=[MCMCpack qvalue]; }; fdrci = derive2 { name="fdrci"; version="2.1"; sha256="1sgrsmlz7sbr1maw3qnpzqz3z75fh5nyiibpsq8j0y12xac8d0x3"; depends=[]; }; fdrtool = derive2 { name="fdrtool"; version="1.2.15"; sha256="1h46frlk7d9f4qx0bg6p55nrm9wwwz2sv6d1nz7061wdfsm69yb5"; depends=[]; }; fds = derive2 { name="fds"; version="1.8"; sha256="1284vncixrzrz9x6b52gslrbrbia07sd0xac7nwdqhp5f5v5wfi0"; depends=[rainbow RCurl]; }; fdth = derive2 { name="fdth"; version="1.2-5"; sha256="01phrn8x245kplljjajqlsma7847j058spbxajnklamywf002qzr"; depends=[xtable]; }; - feasts = derive2 { name="feasts"; version="0.1.4"; sha256="11ldjnqikwnrlj279hm27fidmkjvf8z1rr0kypjd7vl6h5g5c0gx"; depends=[dplyr fabletools ggplot2 lubridate rlang scales slider tibble tidyr tsibble vctrs]; }; + feasts = derive2 { name="feasts"; version="0.1.6"; sha256="18d9x9arbzv8b6c38fw0snvklgyzh8qr26vhayf4kxd06j5bbd6n"; depends=[dplyr fabletools ggplot2 lifecycle lubridate rlang scales slider tibble tidyr tsibble vctrs]; }; feather = derive2 { name="feather"; version="0.3.5"; sha256="1gxd0h2m56sjjlzn4dry6s13nddxc4l5i11gsvavaf2dwbahdzsh"; depends=[hms Rcpp tibble]; }; - feature = derive2 { name="feature"; version="1.2.13"; sha256="07hkw0bv38naj2hdsx4xxrm2dngi6w3rbvgr7s50bjic8hlgy1ra"; depends=[ks misc3d rgl]; }; + feature = derive2 { name="feature"; version="1.2.14"; sha256="1c12rny9nx8dynzxbcf49h76a7wlmsk1m131wh0jiyqx3c3y41y1"; depends=[ks]; }; featureCorMatrix = derive2 { name="featureCorMatrix"; version="0.4.0"; sha256="1gq3g351z3fbrx6ys28iymv9j07p2siav8jr3k07r06w314dk1q6"; depends=[]; }; featurefinder = derive2 { name="featurefinder"; version="1.1"; sha256="024g3adhxx1ynl9wnc2yl3illj4347ak6wkfmvqxfwd6llsa79ld"; depends=[plyr rpart rpart_plot]; }; features = derive2 { name="features"; version="2015.12-1"; sha256="0rd8r1dxzddb6718hcm8ck7531c9wdrjfy8n67875bbxgzcvds61"; depends=[lokern]; }; featuretoolsR = derive2 { name="featuretoolsR"; version="0.4.4"; sha256="0zrb3hb9axcfqc1b5cyhasm3p6jvgh7hd3085w7zag66pizqjwws"; depends=[caret cli dplyr magrittr purrr reticulate rstudioapi stringr testthat tibble]; }; featurizer = derive2 { name="featurizer"; version="0.2"; sha256="05jvwsvpbdj94q3wl7ld6xmfc9p7ff9zsmryd3mmxz0hzbq2cnkc"; depends=[]; }; - febr = derive2 { name="febr"; version="1.1.0"; sha256="12580kbssixrgpr147vw52h88i0wvvpj44pp1n0ivxzmmzbvpqrv"; depends=[dplyr glue pedometrics sf stringr]; }; - fec16 = derive2 { name="fec16"; version="0.1.0"; sha256="0jmyf35ypniicpam3yihgpsnp4bbhrw0mdgbkkchcbvm9ncngrn4"; depends=[dplyr readr]; }; + fec16 = derive2 { name="fec16"; version="0.1.3"; sha256="0azvrg98li535mqa2awhmfisfyfr4d8dw0ynikxmp0z1w9l3dx1p"; depends=[dplyr readr vroom]; }; fechner = derive2 { name="fechner"; version="1.0-3"; sha256="0bassigcipwlr2g8cdjh8jyhmb903k3hla9gnigcbz7qwzlfwa86"; depends=[]; }; federalregister = derive2 { name="federalregister"; version="0.2.0"; sha256="0qr8nd3ylnwcv1wxspw5i7ray5sh30zr648spg0lpqq8dp2b8p7b"; depends=[curl httr jsonlite]; }; fedregs = derive2 { name="fedregs"; version="1.0.0"; sha256="171j6r6qxnx9gk9x9gpdyh51ssrgmf7sczc4889qr3qqw15sm4bn"; depends=[dplyr httr magrittr purrr rvest stringi tidyr tidytext xml2]; }; - fedreporter = derive2 { name="fedreporter"; version="0.2.1"; sha256="18hs358iyxmbh28jy9f65zvanpr6bk4gq75qbj255y1zzdsjr9x1"; depends=[httr jsonlite]; }; - feedeR = derive2 { name="feedeR"; version="0.0.8"; sha256="15fl3xb7mp7as2hl97l2vvl2k8cp48dnzy17jgrw5g1hg4yk1wgh"; depends=[digest dplyr lubridate readr stringr tibble xml2]; }; + feedeR = derive2 { name="feedeR"; version="0.0.10"; sha256="1p64c7ibwn6k5k3vsjxrcjr84czild7g8bqw0yv4axk52vk5jfkx"; depends=[digest dplyr lubridate readr stringr tibble xml2]; }; feisr = derive2 { name="feisr"; version="1.1.1"; sha256="0kbmivia8mfn3l3g45aliz2hid28gx7mka06m2kb6kpkf77kjrbd"; depends=[aod dplyr Formula plm Rdpack]; }; fellov = derive2 { name="fellov"; version="0.1"; sha256="0z4b08ykajzwa5852dknqz5qqlmhklbwdq8x5zhyfmwba5zfbjav"; depends=[]; }; - felp = derive2 { name="felp"; version="0.2.2"; sha256="1kd2619cj8697l1zpigz78vshc5gd8yvrg7zmw3mik7pjafz1k32"; depends=[prettycode]; }; + felp = derive2 { name="felp"; version="0.2.3"; sha256="05380225n0l2p8x4yr41frgvfzfl8x5b18v7qn8a4j9afki9y1g5"; depends=[curl prettycode]; }; fence = derive2 { name="fence"; version="1.0"; sha256="18l3fliww60d9n9hbfdny5vr9mi78krwpjj5sypdsb77d6332h9q"; depends=[fields ggplot2 lme4 MASS sae snow snowfall]; }; fergm = derive2 { name="fergm"; version="1.1.4"; sha256="1d979z2m5f13i1w9d8kh9rnaafavsap169w0nycpd5j2f3dfhyn7"; depends=[ergm extrafont ggplot2 matrixStats network reshape2 rstan]; }; fermicatsR = derive2 { name="fermicatsR"; version="1.4"; sha256="1587f67fypj22rdi1319zq765lcc9z518bzl1jr4lz6c8lrzfm9i"; depends=[]; }; - ff = derive2 { name="ff"; version="4.0.2"; sha256="1qbfmhk4v76q145yalqaiaffklvkfs615b5m0imxyjyjcvx1nbn0"; depends=[bit]; }; - ffbase = derive2 { name="ffbase"; version="0.12.8"; sha256="0mjk7dkq1ginqqfvngzny747ggf9a8fd7kblq96n5ys1jrwjyqhq"; depends=[bit fastmatch ff]; }; + ff = derive2 { name="ff"; version="4.0.4"; sha256="1rfj2ff5cxzdp9nvfnbgmswc1jvxz5vkxqgpv6gprwk32a0z3v12"; depends=[bit]; }; + ffbase = derive2 { name="ffbase"; version="0.13.1"; sha256="0knl0vnh8w4q3ry24gp4fd55ipnaj9hb1rwm31fs119kgmh3gd8x"; depends=[bit fastmatch ff]; }; + fflr = derive2 { name="fflr"; version="0.3.13"; sha256="0kvbrc02iybb416mg6vz4ci1qq31v48jgynklh6xbcxyj8369j0f"; depends=[httr jsonlite tibble]; }; ffmanova = derive2 { name="ffmanova"; version="1.1.0"; sha256="0019m9vxnh5yxr5k7zflzyhd533a842cjjkcpqyannshnrbfndvy"; depends=[]; }; ffmetadata = derive2 { name="ffmetadata"; version="1.0.0"; sha256="0gjv5fl3p0kz28c91l4qf34a2685a24l5841ixdg7wivfs5v9npv"; depends=[httr jsonlite]; }; - ffscrapr = derive2 { name="ffscrapr"; version="1.0.0"; sha256="0nn07dpvcy5p5kyhjmy1jiypbjn5x6dfimkp0lxqpwvm4arvskkx"; depends=[dplyr glue httr jsonlite lubridate magrittr memoise purrr ratelimitr rlang stringr tibble tidyr]; }; + ffscrapr = derive2 { name="ffscrapr"; version="1.2.1"; sha256="06gv309729xf5qp2k5y58v9wk8w19ldqpm0zxsbv2i6aq6lc40va"; depends=[dplyr glue httr jsonlite lubridate magrittr memoise purrr rappdirs ratelimitr rlang stringr tibble tidyr]; }; ffstream = derive2 { name="ffstream"; version="0.1.6"; sha256="036ikhah4y85khgfmvxwsn3vavvw1is8i9k2lw474wxlh4cxa3kd"; depends=[Rcpp]; }; fftw = derive2 { name="fftw"; version="1.0-6"; sha256="1kkhn79x3akp2v28aqmif0dd2fn1pw145fjgyy29i4ab6pngazir"; depends=[]; }; - fftwtools = derive2 { name="fftwtools"; version="0.9-8"; sha256="1nqvpzda281rxi1cmwajxxsn3sc3gz7scv8bvs5jm34kf36whha6"; depends=[]; }; + fftwtools = derive2 { name="fftwtools"; version="0.9-9"; sha256="0h8lyl2i6zq16ir7xnfj9dhyivxvwikm8lml19s8s8jx95z3n9x9"; depends=[]; }; fgac = derive2 { name="fgac"; version="0.6-1"; sha256="0paddf5a4w0g2i0ay7my0bppwh534d8ghy6csfxl5jj034xjgwkk"; depends=[]; }; - fgdr = derive2 { name="fgdr"; version="1.0.1"; sha256="1413aghmyzlpm6zz974ynfinvj3ic4zx6b262n78n51flgrvym3p"; depends=[jpmesh magrittr purrr raster readr rlang sf sp stars stringr tibble xml2]; }; + fgdr = derive2 { name="fgdr"; version="1.1.0"; sha256="0xllws7z3crbwibyhm3w06zagvlbmn3rcy8ccgkdhl0am3q7dz0a"; depends=[data_table jpmesh magrittr purrr raster readr rlang sf stars stringr terra tibble units xml2]; }; fgeo = derive2 { name="fgeo"; version="1.1.4"; sha256="0axglmk05li3plb79rccskhddjzq3pdx3mgxr8yqysymf1nscrq6"; depends=[cli crayon dplyr fgeo_analyze fgeo_plot fgeo_tool fgeo_x glue magrittr purrr rlang rstudioapi]; }; - fgeo_analyze = derive2 { name="fgeo.analyze"; version="1.1.13"; sha256="1cj4bazggpic0i5sq9iqq0y0j2xvp01i9ccv0pchg82xlgis33gw"; depends=[dplyr fgeo_tool glue lubridate magrittr MASS purrr rlang tibble tidyr withr]; }; - fgeo_plot = derive2 { name="fgeo.plot"; version="1.1.9"; sha256="18zw4bsqdqdpy103kdyl40162mii6s1lp2w4cpi50svx7g7xhgh5"; depends=[dplyr fgeo_tool ggplot2 ggrepel glue magrittr purrr rlang stringr]; }; + fgeo_analyze = derive2 { name="fgeo.analyze"; version="1.1.14"; sha256="0pnmvq6imnffvr4qlmygmmw18g33s81f5jrrs7n4ahwi0qmf5qaj"; depends=[dplyr fgeo_tool glue lubridate magrittr MASS purrr rlang tibble tidyr withr]; }; + fgeo_plot = derive2 { name="fgeo.plot"; version="1.1.10"; sha256="0lg74ckdm3nn91526cg6gly3lpsv315n2kfmf4bsmprj8k0zj31s"; depends=[dplyr fgeo_tool ggplot2 ggrepel glue magrittr purrr rlang stringr]; }; fgeo_tool = derive2 { name="fgeo.tool"; version="1.2.6"; sha256="0di1alxmxh47akbhy75b7vpix674xg4iynac4ga859nia56fisz1"; depends=[dplyr glue magrittr purrr readr rlang tibble tidyselect]; }; fgeo_x = derive2 { name="fgeo.x"; version="1.1.4"; sha256="0swps9rli74fmfb2j4kf55kw39gxz0q49m74ad4vcs0ylyp0sxrb"; depends=[memoise]; }; fgm = derive2 { name="fgm"; version="1.0"; sha256="0i6lbqxxjq78dql14qwqs7slnn0kyls2g3a9biabny2narwf6n3m"; depends=[fdapace JGL]; }; @@ -8065,31 +8390,31 @@ in with self; { fgpt = derive2 { name="fgpt"; version="2.3"; sha256="1d0qzsn4b68jhk07k97iv765jpmzzh1gwqpid0r76vg4cwqfs3n7"; depends=[]; }; fgui = derive2 { name="fgui"; version="1.0-8"; sha256="024fzd1c7iwqprn26hwjb9l2qlvvyzl449d7iixy0x69djwsrysv"; depends=[]; }; fhidata = derive2 { name="fhidata"; version="2019.8.27"; sha256="0cm8ixpr3gjzprjcv43zdnysw8qhv72pf3fd2vckql01mlk16p42"; depends=[data_table]; }; - fhircrackr = derive2 { name="fhircrackr"; version="0.1.1"; sha256="14jbyx3hr4bgyyny51b222afsirskfpc6vbdpnrpaqvz82ifbv3c"; depends=[dplyr httr stringr xml2]; }; + fhircrackr = derive2 { name="fhircrackr"; version="0.2.1"; sha256="04a4rnv2r5q4069xv6wcfslw3rnacxjcgy1k258xkjx39bwsjzwa"; depends=[data_table dplyr httr plyr stringr xml2]; }; fiberLD = derive2 { name="fiberLD"; version="0.1-6"; sha256="1i3bl2qsc77m81l11an9ihl4vy86s8jd5x6pasib77rl2877ad4x"; depends=[doParallel foreach Matrix VGAM]; }; fic = derive2 { name="fic"; version="1.0.0"; sha256="18xz94w1ab17jfi61bdg9z3pm63g488v17ns2ivizkza4gg07pv8"; depends=[abind ggplot2 mvtnorm numDeriv scales survival tensor]; }; fieldRS = derive2 { name="fieldRS"; version="0.2.3"; sha256="0jr2l5cnrawd6wibmb6r0sngd851z9mbz4mwprnbbqbv3hzzrpm9"; depends=[caret concaveman geosphere ggplot2 raster rgeos sp stringdist vegan]; }; - fields = derive2 { name="fields"; version="10.3"; sha256="12k97vfjlz5h8vynirnvik1nyj1iw25n8xl7awmx9mpd6wvgy2s9"; depends=[maps spam]; }; - fiery = derive2 { name="fiery"; version="1.1.2"; sha256="01ahdvcag8ifpp6jl6cgjjrchwxbr9fzvzqysj77kg3n5dcqm6cl"; depends=[assertthat crayon future glue httpuv later R6 reqres stringi uuid]; }; + fields = derive2 { name="fields"; version="11.6"; sha256="1nsrgkw9w3mwd3sajyzc06h49gg1s0bkq6xh5b66h1n4jbcx2046"; depends=[maps spam]; }; + fiery = derive2 { name="fiery"; version="1.1.3"; sha256="1rwnmm4n59wdsvb57bj8mx1qhz93jbvfb73sl111nwqazphrhid1"; depends=[assertthat crayon future glue httpuv later R6 reqres stringi uuid]; }; filehash = derive2 { name="filehash"; version="2.4-2"; sha256="14zv7h5195dmfksgk8qvjgc2qq8253vga6267aa1bqs5bpvmdl5n"; depends=[]; }; filehashSQLite = derive2 { name="filehashSQLite"; version="0.2-4"; sha256="1higvkmj4wvnwpvayqinzaygiksij20d77dx118q0gffsczadamh"; depends=[DBI filehash RSQLite]; }; filelock = derive2 { name="filelock"; version="1.0.2"; sha256="00ql5fw1hidpfnm0szaavf43ahmsnvdbi8i5lr1nrcc90yaiaadc"; depends=[]; }; filematrix = derive2 { name="filematrix"; version="1.3"; sha256="1v3aj1ng742msb0sfdnjsbqb508mqjf8jlq2v33vxldhradw5w0b"; depends=[]; }; filenamer = derive2 { name="filenamer"; version="0.2.3"; sha256="19gavhh5q7dziv0yc000w06qp58wk2cm52cxjl33p1q4cjk6gg3m"; depends=[]; }; files = derive2 { name="files"; version="0.0.1"; sha256="1vhhawqjjbb6fadkn3l10mvz63w3vmcwvl93fk0q9mhkifzlj9kc"; depends=[]; }; - filesstrings = derive2 { name="filesstrings"; version="3.1.5"; sha256="072alawp6j08mwlw1pz50g3lfi726kpsc744x5fvy71d7w4gqn6l"; depends=[checkmate magrittr matrixStats ore rlang strex stringi stringr tibble withr]; }; + filesstrings = derive2 { name="filesstrings"; version="3.2.1"; sha256="03vy2dnsqfaljxdb3qv2xih83qz7ck64pb6pcp887kmr6ca3iw3w"; depends=[checkmate magrittr purrr rlang strex stringi stringr withr]; }; filling = derive2 { name="filling"; version="0.2.2"; sha256="02s2q8wsnxrl3914516r6z0vksbsfmcv7y8hqjl92h4cqqr7023w"; depends=[CVXR nabor Rcpp RcppArmadillo Rdpack ROptSpace RSpectra]; }; fillr = derive2 { name="fillr"; version="1.0.0"; sha256="1gx1ihp8j90ywmm6mmmfq4jd6apxawk9s5dfw3jq0wm1c290zqpv"; depends=[]; }; finalfit = derive2 { name="finalfit"; version="1.0.2"; sha256="118ja2san73341m4vn9xmsazak4w6z6290rai4fl1jwf9amk2jnq"; depends=[bdsmatrix boot broom dplyr forcats GGally ggplot2 gridExtra lme4 magrittr mice pillar pROC purrr scales stringr survival tidyr]; }; - finbif = derive2 { name="finbif"; version="0.3.0"; sha256="0f5mkwinnfqhv0kgywbzi1lhfdhnh5mhhh8kj5pyxfwncbg109z4"; depends=[digest httr jsonlite lubridate lutz]; }; + finbif = derive2 { name="finbif"; version="0.4.0"; sha256="1p29b2vvlk0nqblhqzgxi60kaz0k0agr3dgr08801qhqha8jd5jx"; depends=[digest httr jsonlite lubridate lutz]; }; finch = derive2 { name="finch"; version="0.4.0"; sha256="0q7riaxms460c6z2gb8i0q4pb348bnvry46bjd7pb9mh8fnl1i8b"; depends=[data_table digest EML hoardr xml2]; }; + findInFiles = derive2 { name="findInFiles"; version="0.1.2"; sha256="0ihvk7ml4ry8pahvh1ikldvnsa3h6rs8lq0cc4z85r2n71p982mk"; depends=[htmlwidgets]; }; findR = derive2 { name="findR"; version="0.2.1"; sha256="1a7cf6kd7i2l4ffr2b17nb9xnpsjhf6fcwpjy06r0qgcapnfp54b"; depends=[pdftools stringr]; }; findpython = derive2 { name="findpython"; version="1.0.5"; sha256="0icifm4z6hhpmcjrg75a875iph0ci890ss02kdv3725pijc236iy"; depends=[]; }; findviews = derive2 { name="findviews"; version="0.1.3"; sha256="1l1yhw5hvrn0rpkdsch8m69d2q5284jwccvv7r4ia4m0iqjfipj7"; depends=[ggplot2 gridExtra scales shiny]; }; + finetune = derive2 { name="finetune"; version="0.0.1"; sha256="0gxsm8axq15pkbsq6cnxnh3cpmqfy4jx8hk54yyx27r0x342fl0g"; depends=[cli dials dplyr ggplot2 purrr rlang tibble tidyr tidyselect tune workflows yardstick]; }; fingerPro = derive2 { name="fingerPro"; version="1.1"; sha256="1a1lj8gyrbgcg8hr03cj2bjzlaafddspri7abc83ys1raqwd4j68"; depends=[car GGally ggplot2 gridExtra klaR MASS plyr Rcmdr Rcpp RcppGSL RcppProgress reshape rgl scales]; }; fingerprint = derive2 { name="fingerprint"; version="3.5.7"; sha256="04jcwkydjrs31pia6kq8z2n9s54im950q08hs2ay15xjxxkmb8ic"; depends=[]; }; - fingertipsR = derive2 { name="fingertipsR"; version="1.0.4"; sha256="1li5l273nw5v9gld4g5i4xsfv2rndsnfrg9cw01q20k3kba4jngj"; depends=[curl dplyr DT httr jsonlite miniUI readr rlang shiny shinycssloaders]; }; - fingertipscharts = derive2 { name="fingertipscharts"; version="0.0.11"; sha256="1xni93m9d3r08crgbk1g660g6mr9d01cjvqcca5mpm8n2cbhq634"; depends=[dplyr geojsonio ggplot2 httr leaflet purrr rlang scales sf stringr tibble tidyr]; }; finiteruinprob = derive2 { name="finiteruinprob"; version="0.6"; sha256="0z4l0crymh58chxniqq70fqmvi6f5jkgvz72vbc7s3l9lrrapgr3"; depends=[numDeriv sdprisk]; }; finity = derive2 { name="finity"; version="0.1.4.1"; sha256="0xs3vx0vj165hj4dq8ivrdf6fcvj23zhp2ai79rgpyb5rr5ndkvc"; depends=[BH Rcpp RcppArmadillo stabledist]; }; finreportr = derive2 { name="finreportr"; version="1.0.2"; sha256="0xkkrgmwkasxgaf3lvvxl5azwbphk83fpa2asgva86qml7vwznlc"; depends=[curl dplyr httr rvest XBRL xml2]; }; @@ -8097,14 +8422,14 @@ in with self; { firebase = derive2 { name="firebase"; version="0.1.0"; sha256="154a386ga9bjgam9rxp0y9033hx55p7f3294z52r6dz2y87h3lz2"; depends=[cli R6 shiny]; }; firebehavioR = derive2 { name="firebehavioR"; version="0.1.2"; sha256="10krny60dkpgwjjnriap91qmrnfq1rl5ck4ynf4h6x016bv0m374"; depends=[ggplot2]; }; fishMod = derive2 { name="fishMod"; version="0.29"; sha256="0pbs4z27vwa3c42xdw3mr6l2i581bgvn2pk52kawbcnnlsff92ar"; depends=[]; }; - fishbc = derive2 { name="fishbc"; version="0.0.1"; sha256="041yq17s9my4fn15mn01bjjp6n1sxkdg1jzdnf5y68vc7ysynmwx"; depends=[]; }; + fishbc = derive2 { name="fishbc"; version="0.1.0"; sha256="1hfm8w6wyzci2hmgzlji9c3d6qjlm8ka2srkn3aigrlx2ll1lnx3"; depends=[]; }; fishdata = derive2 { name="fishdata"; version="0.1.3"; sha256="04162m1j570cdwhffkwjs1x1qlsc20djj1jwx2hl2cqmbp584ppq"; depends=[]; }; fisheyeR = derive2 { name="fisheyeR"; version="0.9"; sha256="1w6va7gakqq2q8hsvdszpn8s2ysdfc648bk5p5v3wbl5s403bci8"; depends=[tkrplot]; }; - fishflux = derive2 { name="fishflux"; version="0.0.1.1"; sha256="06f0w0g2kmqwjhaj631a242qp2c0m4xiv5xxfbv4wbjl7ffh4qn3"; depends=[BH dplyr fishualize ggplot2 plyr Rcpp RcppEigen RcppParallel rfishbase rstan rstantools StanHeaders tidybayes tidyr]; }; + fishflux = derive2 { name="fishflux"; version="0.0.1.3"; sha256="0l1drcjkvamw4849n2d8jk4ay3mfwqaya2vabm80hglfy4wqkca4"; depends=[BH curl dplyr fishualize ggplot2 httr plyr Rcpp RcppEigen RcppParallel rfishbase rstan rstantools StanHeaders tidybayes tidyr]; }; fishkirkko2015 = derive2 { name="fishkirkko2015"; version="1.0.0"; sha256="1s8vsf604rc6qk0gahn61p3q8p9dhsbq14wsmrin7icq2xgl3y81"; depends=[]; }; fishmethods = derive2 { name="fishmethods"; version="1.11-1"; sha256="049a25rwxqy6a8jfm0irjka3bl7vkask32f9h7fsr5ddlyzvg5pz"; depends=[boot bootstrap data_table lme4 MASS numDeriv]; }; fishmove = derive2 { name="fishmove"; version="0.3-3"; sha256="1knbv087cg0czjcgdbrlpg69pp1dxb57b7ak5j1mcy7ay3a41a9h"; depends=[boot ggplot2 MASS plyr]; }; - fishtree = derive2 { name="fishtree"; version="0.3.2"; sha256="19kq38l4cm7g2frvf2zdlk1j636k2f5k0bf6v7wn2zcmivy0xzsw"; depends=[ape jsonlite memoise rlang]; }; + fishtree = derive2 { name="fishtree"; version="0.3.3"; sha256="0wrns88zzwvmnw22268638ddllr4mn0dnvim5nmb7h1fsmx0ic3m"; depends=[ape jsonlite memoise rlang]; }; fishualize = derive2 { name="fishualize"; version="0.2.0"; sha256="13z6n62fpans1fxjxlpz2xqqpq0ng5via67vk4nkvp0nxmlrlhky"; depends=[downloader dplyr ggplot2 gridExtra httr magrittr png rlang scales stringr tidyr]; }; fit_models = derive2 { name="fit.models"; version="0.64"; sha256="1nk4x2q8cv79zcls61saf627ac0fci6jcrd6lmzk61asm2zhc27p"; depends=[lattice]; }; fitConic = derive2 { name="fitConic"; version="1.1"; sha256="0xlyv60r4fqvg3qhy4s9zkm2w65y4pg5nzl7a3k2z3fdpfcvkinz"; depends=[pracma]; }; @@ -8115,7 +8440,7 @@ in with self; { fitTetra = derive2 { name="fitTetra"; version="1.0"; sha256="0ia6wk4gicpmn6kclsd28p7v1npwfv2blagiz0cxzwfw3njv103g"; depends=[]; }; fitbitScraper = derive2 { name="fitbitScraper"; version="0.1.8"; sha256="0b4d7xw6inp6l1dkfwyrzxwg4vspp4vzlwrhv14ajxrqz6irj8a0"; depends=[httr jsonlite stringr]; }; fitdc = derive2 { name="fitdc"; version="0.0.1"; sha256="1b1abib7jkl7a6r686r53qjw2ywb9q2h67is8691kkaqxpawg30p"; depends=[]; }; - fitdistrplus = derive2 { name="fitdistrplus"; version="1.1-1"; sha256="1rnfnwmxa495fql7q0h9018cnwygwhj8gfh6ryz1vbf474570vjl"; depends=[MASS survival]; }; + fitdistrplus = derive2 { name="fitdistrplus"; version="1.1-3"; sha256="1pjnqx0j26dai2fa4ip56wspmfsrcm9dpmxkg15y9623w5b58vbp"; depends=[MASS survival]; }; fitplc = derive2 { name="fitplc"; version="1.2-3"; sha256="1yg3ch907c4gk7q8hxgwqxgngkmy125j3ni917nkzi7hn59krd1n"; depends=[car nlme]; }; fitteR = derive2 { name="fitteR"; version="0.1.0"; sha256="1kgnyl7am966vkfap8gmvchlpankrcj5dv5aj7ws8ix9shr76db6"; depends=[dplyr DT maxLik R_utils shiny]; }; fitur = derive2 { name="fitur"; version="0.6.1"; sha256="04lr717lsbb4731nlzgscraj30knik4q68jzrl4i5f27912159r9"; depends=[actuar DT e1071 fitdistrplus ggplot2 goftest miniUI rstudioapi shiny]; }; @@ -8123,7 +8448,7 @@ in with self; { fivethirtyeight = derive2 { name="fivethirtyeight"; version="0.6.1"; sha256="1c59jaj2jz498mw2by6yss3nqmhxwn25j9ah89x2540pq4r1zifx"; depends=[]; }; fixedTimeEvents = derive2 { name="fixedTimeEvents"; version="1.0"; sha256="0z7ji8yzp4pj76ad64l7ivknkbi82ijx6abd3a18wicqhrh433sj"; depends=[]; }; fixerapi = derive2 { name="fixerapi"; version="0.1.6"; sha256="0ikf8dn0l9c9gshp4bph3wasl0bh6lfybinc8n1rvb202231hmgb"; depends=[jsonlite tibble tidyr]; }; - fixest = derive2 { name="fixest"; version="0.6.0"; sha256="1g1xcg51sjrq6i8q5il4njg3238g5ky7k4yav3rk25fyx9xxqrf2"; depends=[dreamerr Formula nlme numDeriv Rcpp sandwich]; }; + fixest = derive2 { name="fixest"; version="0.8.0"; sha256="1w8vdipg54q5mks3z91l2f0sycnw0rh91icljwb3d367pz6gbblp"; depends=[dreamerr nlme numDeriv Rcpp sandwich]; }; fizzbuzzR = derive2 { name="fizzbuzzR"; version="0.1.1"; sha256="119gbi9y4n8r52hk9vj7zf795dv9xnk7lnngljjcd7ydnhygwd4h"; depends=[]; }; flacco = derive2 { name="flacco"; version="1.8"; sha256="15h2q9xgddy7gw6r52c2nk618f3z1mjn4xz9pzdvhm1d3kqggwa4"; depends=[BBmisc checkmate mlr]; }; flagr = derive2 { name="flagr"; version="0.3.2"; sha256="195c78cml2pjzfvpkaxbzcg1dfdqxi76138p0v3x3zzva9d8nlji"; depends=[]; }; @@ -8131,40 +8456,41 @@ in with self; { flam = derive2 { name="flam"; version="3.2"; sha256="0v6kcl4n7wq052p7jdgbzlh9fpk8bzlrqw12i6pib1wd3slj0asa"; depends=[MASS Rcpp]; }; flamingos = derive2 { name="flamingos"; version="0.1.0"; sha256="0gic6y8wpxffpyi3zy0wh7apy4z6argxbz284n80k2mzh6lh029k"; depends=[Rcpp RcppArmadillo]; }; flan = derive2 { name="flan"; version="0.8"; sha256="0v7xjx72zaa5g9xn82x694r9k35vc1n36dv5nbnxz46px0pczsd6"; depends=[Rcpp RcppArmadillo RcppGSL]; }; + flare = derive2 { name="flare"; version="1.7.0"; sha256="0f992dmgnr6s8g3386i9bjfyf08q8srgw7sjz2yx7snj8znq7251"; depends=[igraph lattice MASS Matrix]; }; flars = derive2 { name="flars"; version="1.0"; sha256="06qma1ar1nj7n6g9alk1qydm5bkj6lsjx0pqkikxpb41d91civqk"; depends=[fda MASS Matrix Rcpp RcppEigen]; }; flashCard = derive2 { name="flashCard"; version="0.1.0"; sha256="1l1g3hy0gchsmdj04d065rl71hkvxydyqsmav5qwxyz2mdkknkhi"; depends=[htmlwidgets jsonlite]; }; flashClust = derive2 { name="flashClust"; version="1.01-2"; sha256="0l4lpz451ll7f7lfxmb7ds24ppzhfg1c3ypvydglcc35p2dq99s8"; depends=[]; }; flashlight = derive2 { name="flashlight"; version="0.7.3"; sha256="0mkza0q5w87ayp6yhkb53xw4vfbbbryzsl4bs0s063390qwhn7sp"; depends=[dplyr ggplot2 ggpubr MetricsWeighted rpart rpart_plot tidyr tidyselect]; }; flatr = derive2 { name="flatr"; version="0.1.1"; sha256="10l98a3f57wahfpdqxj70r25zfhk4vzzd014pdnriy458yrfd7rw"; depends=[dplyr magrittr tibble]; }; - flattabler = derive2 { name="flattabler"; version="1.1.0"; sha256="007pk1qjd4qf70008jlfvvvlczgyhwncglyzs5mw7j5kxca4hnis"; depends=[dplyr stringr tibble tidyr xlsx]; }; - flatxml = derive2 { name="flatxml"; version="0.1.0"; sha256="0nc44g6ghk8wh2cdlszkj52js2glakmd20dnisp8wsb6immix9gg"; depends=[httr RCurl xml2]; }; + flattabler = derive2 { name="flattabler"; version="1.2.0"; sha256="156q3af7bmqcaxvl35634ph8dzs6gdjxqqkgwi214kj2pywpqg2a"; depends=[dplyr readxl stringr tibble tidyr]; }; + flatxml = derive2 { name="flatxml"; version="0.1.1"; sha256="1qsiqi8aszk9djlhysf6lcm41dq4pcw5jv6mdvb1mgxni7g3sgfv"; depends=[crayon httr RCurl xml2]; }; flexCWM = derive2 { name="flexCWM"; version="1.92"; sha256="1fxwq12mki10ikf5lyh1pb58svfzs4llg68v4d9iznia8aa0grhq"; depends=[ContaminatedMixt mclust numDeriv statmod]; }; flexclust = derive2 { name="flexclust"; version="1.4-0"; sha256="0x7wxk8y46ndyz6fdacym0rd6p9wh3pcfr28chjcg5d7fm849zl2"; depends=[class lattice modeltools]; }; flexdashboard = derive2 { name="flexdashboard"; version="0.5.2"; sha256="1bh759llp15fxrx2rwvxd8p3w84vjmkid32ism7zg49a127fjib4"; depends=[htmltools htmlwidgets jsonlite knitr rmarkdown shiny]; }; + flexiblas = derive2 { name="flexiblas"; version="3.0.0"; sha256="1nlddwqnqkq5lv0bnsg0rbci6sjwkplqp71zdxn6pqyysyq036gb"; depends=[]; }; flexmet = derive2 { name="flexmet"; version="1.0.0.0"; sha256="0xhr4i46s3k7a4yz2sd1sphn8wz27xcl580s2kqkr1ifg8941kv8"; depends=[]; }; - flexmix = derive2 { name="flexmix"; version="2.3-15"; sha256="0hrz2axp2c9548b1r0bmrl57219nn030qndb83a8garkzq5lqi5s"; depends=[lattice modeltools nnet]; }; + flexmix = derive2 { name="flexmix"; version="2.3-17"; sha256="0jangf89174p0idh9afbicfiln2sz8jxc3bjc6n0j9036dw9n09n"; depends=[lattice modeltools nnet]; }; flexmixNL = derive2 { name="flexmixNL"; version="0.0.1"; sha256="0bk5v0cnsn1qkd1b86vj0bnpr4l9d6523kpkgzb1l1sqyscawfmm"; depends=[flexmix gnm]; }; - flexpolyline = derive2 { name="flexpolyline"; version="0.1.1"; sha256="1yi9h8zdi2hmk1zn06sl4krzxfnr0vbpz3xphh1n3l5smd88n1vb"; depends=[Rcpp sf]; }; + flexpolyline = derive2 { name="flexpolyline"; version="0.2.0"; sha256="1drnyad83267z80k73min3kxcf2casvlwb1kciz07ck8qnndvdkv"; depends=[Rcpp sf]; }; flexrsurv = derive2 { name="flexrsurv"; version="1.4.5"; sha256="1xwh6fj854hr5j1mdh4cbp3hbrbdl4nb2ili876rq08wb9wq5pkf"; depends=[Epi formula_tools matrixcalc orthogonalsplinebasis statmod survival]; }; flexsurv = derive2 { name="flexsurv"; version="1.1.1"; sha256="0x7p1rv51pplfyyzcg63ssb8z56mig7y0363hkr0219w3cvyq9nr"; depends=[deSolve mstate muhaz mvtnorm quadprog Rcpp survival tibble tidyr]; }; - flexsurvcure = derive2 { name="flexsurvcure"; version="1.1.0"; sha256="0q77cc2l4xa7jkmx5sl9qwsxsdaf688ckp7j6pprv0nkzv8js16r"; depends=[flexsurv gtools survival]; }; - flextable = derive2 { name="flextable"; version="0.5.10"; sha256="1j7yvjiavar21ywck6nyz0p6bd66fnj99bq8lljdz4rrl3314yb8"; depends=[base64enc data_table gdtools htmltools knitr officer rlang rmarkdown uuid xml2]; }; + flexsurvcure = derive2 { name="flexsurvcure"; version="1.2.0"; sha256="06qppcjml380drd6brc60j1swasqrmdx82h6x69xpb65zn9wpa3c"; depends=[flexsurv gtools survival]; }; + flextable = derive2 { name="flextable"; version="0.6.1"; sha256="06nzyd2a9yaf9hmn740xrgxw0448z5dvlplcj3kizz9sm23aw9li"; depends=[base64enc data_table gdtools htmltools knitr officer rlang rmarkdown uuid xml2]; }; flifo = derive2 { name="flifo"; version="0.1.5"; sha256="03x66l3ryrjvwbxxd0ncjrb5w9kc7fswmp5psb1cb7r87f395gm3"; depends=[bazar pryr]; }; - flightplanning = derive2 { name="flightplanning"; version="0.8.0"; sha256="0q5xdjgjj9j73djpvzc34ig2gk43xan5jg9pn195m1x8lz41yvk9"; depends=[rgdal rgeos sp]; }; + flightplanning = derive2 { name="flightplanning"; version="0.8.3"; sha256="18w28z2asb8jv7jpw6qzwcw9fm06h3z814xl8vssfd1p7bq5nfx8"; depends=[rgdal rgeos sp]; }; flightplot = derive2 { name="flightplot"; version="0.1.0"; sha256="1276lsahr9kdsvp1ismm3b5syvhfr7ifizzd79f8w1h2rjblva8x"; depends=[dplyr geosphere ggplot2 ggrepel magrittr rlang sf tibble]; }; flip = derive2 { name="flip"; version="2.5.0"; sha256="08x5hwxaxbgc745gblja7gcy0b5wbp7jf90lkha75zl5cc9iyksl"; depends=[cherry e1071 plyr someMTP]; }; + flipdownr = derive2 { name="flipdownr"; version="0.1.1"; sha256="18z6y9anwg264gwqpxvm8mmv7xvc4m323mkg9db424vd1ji560f3"; depends=[checkmate glue htmltools jsonlite]; }; flipscores = derive2 { name="flipscores"; version="1.1.0"; sha256="0pznbv8gq6jx0hd9dq6yjxyz4p75h8x0jznfa02yh4xdzjmamiw6"; depends=[car flip MASS plyr]; }; float = derive2 { name="float"; version="0.2-4"; sha256="1wf1dfybgbhvh9sa5z41xkh8liwp5n9gyydfq2mpg6bag0r457z1"; depends=[]; }; flobr = derive2 { name="flobr"; version="0.2.1"; sha256="16qxsvpdznw0wlmcxc6jwf550hx7yx1rifds00lq0kxly1pc4aak"; depends=[blob chk lifecycle]; }; flock = derive2 { name="flock"; version="0.7"; sha256="1zg93p74icj4bhxnmnssj2xp6vw4yaksyavq03497v33xfpdxss7"; depends=[Rcpp]; }; flood = derive2 { name="flood"; version="0.1.1"; sha256="0nlmjh2l7dij1aqd70hhj0m550knlin3am14azqkx4pacs1kir3p"; depends=[copula evd magrittr TLMoments]; }; flora = derive2 { name="flora"; version="0.3.4"; sha256="17drlfvvrndal4cf5nw20xb9viybagvb4vll1kxdrhvsvfz5yap6"; depends=[dplyr httr jsonlite stringdist]; }; - florestal = derive2 { name="florestal"; version="0.1.1"; sha256="0a86m2d8d9g5hw1pyx8hin3j52prq2x1yf1jfwn6g5rvjwbd91xx"; depends=[BiodiversityR cowplot data_table dplyr flextable ggplot2 officer tidyr]; }; - flowDiv = derive2 { name="flowDiv"; version="2.0"; sha256="1p89l8q1i610bl1bvx6lmkygb094pvydgbmd8kx0640a11rblx8v"; depends=[flowCore flowWorkspace ggplot2 gridExtra vegan]; }; + florestal = derive2 { name="florestal"; version="0.1.3"; sha256="12d3mfcix0rbkdn25c6fi0g91dlf92fv58g7bzal3118shrdgyjg"; depends=[BiodiversityR cowplot data_table dplyr flextable ggplot2 officer tidyr]; }; flower = derive2 { name="flower"; version="1.0"; sha256="1h2fvpjrvpbyrqb8hd51sslr1ibpwa7h9fiqy9anvf2yim5j11yq"; depends=[]; }; flowfield = derive2 { name="flowfield"; version="1.0"; sha256="1cx3i0w3xq781mmms4x20fshlf1i9bwxw9bxx562crix3fq3m50j"; depends=[]; }; flowr = derive2 { name="flowr"; version="0.9.10"; sha256="18mjshfg3827b26b8nz52pl04ph7n887vw0ym5fybjm8gy5wwpdg"; depends=[diagram params whisker]; }; - flows = derive2 { name="flows"; version="1.1.1"; sha256="0l152p17plkrbnrlis8rfr9ij406agckdxvnjsciilv6qwcync29"; depends=[igraph reshape2 sp]; }; flsa = derive2 { name="flsa"; version="1.5.2"; sha256="0c6cdf3hkl3s5yqwbn1qhqhyaw5pgd83a5bc30wbzq03hk7rh9ks"; depends=[]; }; fluoSurv = derive2 { name="fluoSurv"; version="1.0.0"; sha256="1dv4lf7k28bih2qqkpy15f7d14ibxk48p3z6sj3dj5yvh25mhv81"; depends=[]; }; fluspect = derive2 { name="fluspect"; version="1.0.0"; sha256="0j80wx00s8ljqg1qaqw66rj7kxhhk438hb0syv0lr9vld03cxy2w"; depends=[pracma]; }; @@ -8173,15 +8499,16 @@ in with self; { flying = derive2 { name="flying"; version="0.1.3"; sha256="04wfcsbq8icvk1nnczvic5cp4nb40hxj3g6lasyb1dvhsh0svg0q"; depends=[kableExtra knitr Rcpp rmarkdown]; }; fma = derive2 { name="fma"; version="2.4"; sha256="1x175mhljvplm7b2iwcvkzalv3a79p8gqj9d4f06l5v4shxlrab9"; depends=[forecast]; }; fmbasics = derive2 { name="fmbasics"; version="0.3.0"; sha256="1dnf09rgwpc7n7ydlp7r5cwy2fa4vh1h9mbjqzfhk0208kz6jpl0"; depends=[assertthat fmdates lubridate tibble]; }; - fmcmc = derive2 { name="fmcmc"; version="0.3-0"; sha256="1r019pzk5h00s6ki897gbzsyhlnwljxklzqnfz87gbg1n5dvhqp4"; depends=[coda MASS]; }; + fmcmc = derive2 { name="fmcmc"; version="0.4-0"; sha256="10dr9zm92a7av43i3d03ni44f71c6vh6v5pznny8f47p8bzfhzih"; depends=[coda MASS Matrix]; }; fmdates = derive2 { name="fmdates"; version="0.1.4"; sha256="1bbcwkh65nf2gak9b81zgg32c5ihwhmai3nc43ayf6ivhqsxw8x0"; depends=[assertthat lubridate]; }; + fmf = derive2 { name="fmf"; version="1.1.1"; sha256="0b26040a39jys1z3h9mq9k7rjr0iyiialq442ir8vgzvmrh383cs"; depends=[C50 caret dplyr e1071 factoextra FactoMineR ggplot2 kernlab Rcpp RcppArmadillo solitude]; }; + fmpcloudr = derive2 { name="fmpcloudr"; version="0.1.1"; sha256="0w7fki96pzp8lvjmy3hy0qh1rvkds6sajig7bmy0a55pd36bcgvj"; depends=[dplyr httr jsonlite lubridate magrittr tidyr]; }; fmri = derive2 { name="fmri"; version="1.9.3"; sha256="0is9lgp27g8dv3rmxn4mlf9m53izx5j7h974cy3ls3lq0pdp99va"; depends=[aws metafor nlme]; }; fmriqa = derive2 { name="fmriqa"; version="0.3.0"; sha256="1z09nf1c305a78c129jvs21b9z91wyhazz41wrn4bimmhfhx7szv"; depends=[ggplot2 gridExtra imager optparse pracma RcppEigen reshape2 RNifti tidyr viridisLite]; }; fmsb = derive2 { name="fmsb"; version="0.7.0"; sha256="0x1wkzfdvv4s5xmr0whcwjz4aac71gacwymj2c3mzj2bbswwlw45"; depends=[]; }; - fmtr = derive2 { name="fmtr"; version="1.0.1"; sha256="1kb0i3llg2jdals31awgv5frxbflf1h4mghblkl32spjilad48mk"; depends=[tibble]; }; - foba = derive2 { name="foba"; version="0.1"; sha256="1af8whgl66v0vwzdf03b6141k3dysdc0svymlgifcga5gqkwzsl0"; depends=[]; }; + fmtr = derive2 { name="fmtr"; version="1.3.0"; sha256="17ns21xn0kc12y2vj8whkih71415sb4pgj50s6x8f4pv8zqrc1kg"; depends=[crayon tibble]; }; focusedMDS = derive2 { name="focusedMDS"; version="1.3.3"; sha256="18s86dbbpyajscqr9frprf2vp1zif7vh4lw5m0cjskfc6gmsdp2p"; depends=[htmlwidgets]; }; - foghorn = derive2 { name="foghorn"; version="1.2.3"; sha256="0rm03566b7vcjphddihq32fy127cc458b8pm0rgw2h190czpgkr3"; depends=[clisymbols crayon curl httr jsonlite rlang rvest tibble xml2]; }; + foghorn = derive2 { name="foghorn"; version="1.3.2"; sha256="0rnrwd94ym893fqrfxw8lkyj3zn72kqnxk9yvzxgv8w0c4hn1pj3"; depends=[clisymbols crayon curl httr jsonlite rlang rvest tibble xml2]; }; foieGras = derive2 { name="foieGras"; version="0.6-9"; sha256="19jjq71bxjrc2mx6wjx6z00dcwrhcslcdx383bg02h9g48z7046k"; depends=[assertthat dplyr furrr future ggplot2 lubridate patchwork purrr RcppEigen rworldmap sf stringr tibble tidyr TMB trip wesanderson]; }; folderfun = derive2 { name="folderfun"; version="0.1.4"; sha256="0rns8590r1897lj0gyrlj0zbaxjw2gjaxwnwdxiiw2kvyq7mjkis"; depends=[]; }; fontBitstreamVera = derive2 { name="fontBitstreamVera"; version="0.1.1"; sha256="0nipdlmhjv1wr3aidcl97nk6mppdkd65krgwqnhdsnv0jpfv761j"; depends=[]; }; @@ -8195,17 +8522,16 @@ in with self; { foolbox = derive2 { name="foolbox"; version="0.1.1"; sha256="06lcr5v6bcqqxskrwdm16b46zq4h67x8bwqya88jxs5bgi5w0hj3"; depends=[magrittr rlang]; }; forams = derive2 { name="forams"; version="2.0-5"; sha256="1fh3m9896ksv1h7b027yb955bzyv70yafhqvn5crkzalzk3jpb0s"; depends=[vegan]; }; forcats = derive2 { name="forcats"; version="0.5.0"; sha256="1i4hblsjgwkrcwgvgsb5yj33pw1hwdj3lr9dvxymkv1kjdw0x5lg"; depends=[ellipsis magrittr rlang tibble]; }; - foreSIGHT = derive2 { name="foreSIGHT"; version="0.9.81"; sha256="1p3w5cs52ph79p2l78apvibr82w7sfbwf8436jfbb4gcahjhmrnk"; depends=[cowplot directlabels doParallel GA ggplot2 moments zoo]; }; - foreach = derive2 { name="foreach"; version="1.5.0"; sha256="0584nv49x8d8m1cak5drb54sxs3y594gd521kjsdwk4c849sgy8s"; depends=[codetools iterators]; }; + foreSIGHT = derive2 { name="foreSIGHT"; version="1.0.0"; sha256="0f1wy7iy3189890qi0gfqwbif3qlp9bfnzzqlg1yvwxi5pw55ikm"; depends=[cowplot directlabels doParallel fields GA ggplot2 jsonlite moments progress RColorBrewer rcorpora Rcpp rlang scales viridisLite zoo]; }; + foreach = derive2 { name="foreach"; version="1.5.1"; sha256="1qb83b1jvpmk8d6kfibkm5q2hiki0x5gipy758mwa62n56gdcnpv"; depends=[codetools iterators]; }; forecTheta = derive2 { name="forecTheta"; version="2.2"; sha256="1a7ip3czm8k82kb8dx95m8q47kjhifdj51gzavd1zj9ni3vwbhfn"; depends=[forecast tseries]; }; - forecast = derive2 { name="forecast"; version="8.12"; sha256="1ycj5z4wd5a16nlcjy07dqm8jkih240xa02cn4wvysnnhkapyq7b"; depends=[colorspace fracdiff ggplot2 lmtest magrittr nnet Rcpp RcppArmadillo timeDate tseries urca zoo]; }; - forecastHybrid = derive2 { name="forecastHybrid"; version="5.0.18"; sha256="0sgz50dl2939jl3azkxpv8kd00jcbkcgd5s6cng3kivrbrfslahp"; depends=[doParallel foreach forecast ggplot2 purrr thief zoo]; }; + forecast = derive2 { name="forecast"; version="8.13"; sha256="0vrql5d4v28890np2m6ws1nr1fcl6frs1bz74vfkihkixcmkl3j9"; depends=[colorspace fracdiff ggplot2 lmtest magrittr nnet Rcpp RcppArmadillo timeDate tseries urca zoo]; }; + forecastHybrid = derive2 { name="forecastHybrid"; version="5.0.19"; sha256="1pg3wbmlagr01j3nikfh4dvh5lvbdfp7069wx9h9xsl7d4481ly1"; depends=[doParallel foreach forecast ggplot2 purrr thief zoo]; }; forecastML = derive2 { name="forecastML"; version="0.9.0"; sha256="01lqbmdmd6sk5xka19i9d466bzihxgp652v0kr13r82b591f67vq"; depends=[data_table dplyr dtplyr future_apply ggplot2 lubridate magrittr purrr rlang tibble tidyr]; }; forecastSNSTS = derive2 { name="forecastSNSTS"; version="1.3-0"; sha256="0p47x7ic2ib7znqbp8br4b2ci75f5w8x413z9g4n30m002p7irp1"; depends=[Rcpp]; }; - foreign = derive2 { name="foreign"; version="0.8-80"; sha256="0wjdi3qn9famsxmpdyyahidaid0yhxlpx4ad9k8vrxhxd6xspasp"; depends=[]; }; + foreign = derive2 { name="foreign"; version="0.8-81"; sha256="0b4rca1bl8xxna05057hchbwfmgjgx0n140szabpc0raizqzks0s"; depends=[]; }; forensic = derive2 { name="forensic"; version="0.2"; sha256="0kn8wn6p3fm67w88fbarg467vfnb42pc2cdgibs0vlgzw8l2dmig"; depends=[combinat genetics]; }; forensim = derive2 { name="forensim"; version="4.3"; sha256="1jhlv9jv832qxxw39zsfgsf4gbkpyvywg11djldlr9vav7dlh3iw"; depends=[tcltk2 tkrplot]; }; - forestChange = derive2 { name="forestChange"; version="1.0"; sha256="1d9qza1f16sz8pyafn3q7cyg9hw0ix4nqcgb9ipcnvmkyrc00f1a"; depends=[curl dplyr gdalUtils ggplot2 landscapemetrics raster rgdal rvest sp tibble xml2]; }; forestControl = derive2 { name="forestControl"; version="0.2.1"; sha256="1m75s98bs8n3qad8gp6a333dh3mbi0rbbic9iwnsqyklzkhmx1nr"; depends=[dplyr magrittr purrr Rcpp tibble]; }; forestError = derive2 { name="forestError"; version="0.2.0"; sha256="093qf50b4isiba4dcv06c1h0fy4db06605fiazwqd2cyd2gar46p"; depends=[data_table purrr]; }; forestHES = derive2 { name="forestHES"; version="1.0-1"; sha256="05l04ly3l8xkdz3rnnrfa4y0wfmh1am2ixbz1vfarnqkc0zppwpj"; depends=[]; }; @@ -8214,7 +8540,7 @@ in with self; { forestinventory = derive2 { name="forestinventory"; version="0.3.1"; sha256="0brbg0q8j9ymvm527db7063kgs6i6flja7mxqk7yvaf3dh8wsi46"; depends=[ggplot2 plyr tidyr]; }; forestmangr = derive2 { name="forestmangr"; version="0.9.2"; sha256="0f65yb4kixbvr8jp6063rgd8hxd5pycsx1dx9477222rmhp6f723"; depends=[broom car dplyr FinCal forcats formattable ggdendro ggplot2 ggpmisc ggthemes gridExtra magrittr minpack_lm plyr purrr rlang scales systemfit tibble tidyr tidyselect]; }; forestmodel = derive2 { name="forestmodel"; version="0.6.2"; sha256="0pl9r8j2qd00b9kl585b4k54kic5fvzc56i8cn3hm5yp2hrrwyws"; depends=[broom dplyr ggplot2 rlang tibble]; }; - forestplot = derive2 { name="forestplot"; version="1.10"; sha256="0sv86yn8fs912yaigi9ig43vnyrqkx1jpy5qhpnjl3kqiviqzr6s"; depends=[checkmate magrittr]; }; + forestplot = derive2 { name="forestplot"; version="1.10.1"; sha256="1vibb1vwf0fhnwbjlfc64b5q84vibpmgpylzjvdpykrrvsk26w1n"; depends=[checkmate magrittr]; }; forestr = derive2 { name="forestr"; version="2.0.2"; sha256="1kz8f3x2dmsprj2r23gz61fpwg7n14nbjxr16x4cpixvnk427p94"; depends=[dplyr ggplot2 moments plyr tibble tidyr viridis]; }; forestry = derive2 { name="forestry"; version="0.1.0"; sha256="0q7m0mrig8z2b2z2fng58qlqa6g58xlhfzchil2dvjh6xf3qvsh8"; depends=[data_tree]; }; foretell = derive2 { name="foretell"; version="0.2.0"; sha256="18vi438n480gizfhnciw67gngvbjnmky19186b1wy75av7fgc1gp"; depends=[nloptr]; }; @@ -8224,17 +8550,18 @@ in with self; { formula_tools = derive2 { name="formula.tools"; version="1.7.1"; sha256="15d3ikfmsh9zszfgfkrxb3jkipl41inm7n6bhs73kwlnklnygq2g"; depends=[operator_tools]; }; formulaic = derive2 { name="formulaic"; version="0.0.7"; sha256="1nyqxkjp21ygzqybp770863gn1h1s20bc4yakl7q9wnd4j8xkp57"; depends=[data_table]; }; formulops = derive2 { name="formulops"; version="0.5.0"; sha256="1mkpv5xjykrhgknq0gh4yg2a3j4xb8q2d6dh0wv8zd9h59hvrzda"; depends=[]; }; - forrel = derive2 { name="forrel"; version="1.0.1"; sha256="0apx62cwg3xb64gmflgq500h8vclqbwazd9aj0s6c7ix0j0phs73"; depends=[glue maxLik pedmut pedprobr pedtools]; }; + forrel = derive2 { name="forrel"; version="1.2.0"; sha256="0h2d73i28fzr4v2hxiq1gk03jhvm612rzp4zj18sy56z464pj9bn"; depends=[glue maxLik pedmut pedprobr pedtools ribd]; }; fortunes = derive2 { name="fortunes"; version="1.5-4"; sha256="109ly9kpfn6hy294ava8795wy5z9l1bnl98hhhv8kn9naf4camdg"; depends=[]; }; forward = derive2 { name="forward"; version="1.0.5"; sha256="0cc0s534s32b9ark2zazwqhgy0zsxb2p63r6503v82784rpqv2yv"; depends=[MASS]; }; forwards = derive2 { name="forwards"; version="0.1.3"; sha256="07374a1ak5h8q3diqyvsw3q1grqi3679w9sshf1jkhlrj7wn0dmv"; depends=[]; }; fossil = derive2 { name="fossil"; version="0.4.0"; sha256="1hbls9m8yapnfzpv9s850ixakmnan8min1ynk7dqkbpb2px85h1p"; depends=[maps shapefiles sp]; }; + foster = derive2 { name="foster"; version="0.1.0"; sha256="0b6ys2y3d2yj07q1q7wbgh7ichg617yza53jrpaqwh3190nm9s5r"; depends=[caret data_table dplyr randomForest raster reshape2 rgdal RStoolbox sp spatstat trend yaImpute]; }; foto = derive2 { name="foto"; version="1.0.0"; sha256="10mfxgg5f1r85cwr0jjnsa4csp1afcrjvyjvp31060nm638clcgh"; depends=[raster]; }; fourPNO = derive2 { name="fourPNO"; version="1.1.0"; sha256="0a0z2403kdh3fjb0ypjjk3m6fg77bg6m7hwb5jhlymcy2rwkay7w"; depends=[Rcpp RcppArmadillo]; }; fourierin = derive2 { name="fourierin"; version="0.2.4"; sha256="140721p4h5mjr7r25ckv8wfhbj88xw6v47b613r5bpalg8gw650l"; depends=[Rcpp RcppArmadillo]; }; fpCompare = derive2 { name="fpCompare"; version="0.2.3"; sha256="1pyv52rvbqd5v6ns86pc119q019ps070bd819x7a98s4hmbf76zq"; depends=[]; }; fpa = derive2 { name="fpa"; version="1.0"; sha256="0kgpl9qq0l10h0vdd2f8vnir0kdylh1jvvv5z4d9ygj1pl9qywhk"; depends=[fields reshape]; }; - fpc = derive2 { name="fpc"; version="2.2-7"; sha256="1xnp3j36hggfg675v39mnr6rgvp7i11pfng7nmyy3k2ldgklz0j9"; depends=[class cluster diptest flexmix kernlab MASS mclust prabclus robustbase]; }; + fpc = derive2 { name="fpc"; version="2.2-9"; sha256="0f7sfmpcycr9y7cy5gasyjm2ardxa62kglqms92mcr68jrp01c19"; depends=[class cluster diptest flexmix kernlab MASS mclust prabclus robustbase]; }; fpca = derive2 { name="fpca"; version="0.2-1"; sha256="13b102026xlfb7c2rb3xsqsymm7xpmaxppaafjkb5dx0b1lz0jrc"; depends=[sm]; }; fpeek = derive2 { name="fpeek"; version="0.1.1"; sha256="0x7q5rl02ih0zmjfzvsc1vmn7s7yzdkf2gbmzc3mh7qadwpnf89p"; depends=[Rcpp]; }; fpest = derive2 { name="fpest"; version="0.1.1"; sha256="013r8295spm02j558aqvnrnbkg2g73gl5vi4lqzngbw8yr8qlkri"; depends=[]; }; @@ -8244,28 +8571,31 @@ in with self; { fpop = derive2 { name="fpop"; version="2019.08.26"; sha256="1gz5db9hlkvzkp5y7zzn9h57qz7ilpdyxyf05vy9kxbj36kgc19n"; depends=[]; }; fpow = derive2 { name="fpow"; version="0.0-2"; sha256="0am3nczimcfrm9hi02vl2xxsh703qjmr2j11y014mll3f2v1l8cy"; depends=[]; }; fpp = derive2 { name="fpp"; version="0.5"; sha256="1jqnx6bgpvnbbj2fa2b6m6aj8jd5cb9kz877r8kp7a5qj62xv1ww"; depends=[expsmooth fma forecast lmtest tseries]; }; - fpp2 = derive2 { name="fpp2"; version="2.3"; sha256="1krrvwg25qjfpfjdwd3n0d87ihl4zf7y1bnh6gbi92sdja3ljq48"; depends=[expsmooth fma forecast ggplot2]; }; + fpp2 = derive2 { name="fpp2"; version="2.4"; sha256="15s4isc1l8759868n228r3wb1aw0psicas1ggsf1md2rjq0hq7n5"; depends=[cli crayon expsmooth fma forecast ggplot2 magrittr purrr rstudioapi]; }; fpp3 = derive2 { name="fpp3"; version="0.3"; sha256="0nwjr3hi3ijf44iqwx769hcfzp1kccw7w0lqakdv499k6gybky1b"; depends=[cli crayon dplyr fable fabletools feasts ggplot2 lubridate magrittr purrr rstudioapi tibble tidyr tsibble tsibbledata urca]; }; fptdApprox = derive2 { name="fptdApprox"; version="2.2"; sha256="10f9n6cx5n6djblj97a2zw4khaj3phchmq4l8gk2fy535jjqaqlr"; depends=[]; }; fracdiff = derive2 { name="fracdiff"; version="1.5-1"; sha256="1dhfjlhr9sb38qgpsx0sm73l9lgc13d0fk32l7fmjfnalhr3n45q"; depends=[]; }; fracprolif = derive2 { name="fracprolif"; version="1.0.7"; sha256="124p5x59smqf8ba0xwhlq69w77zga2bv9plzwkadf700lzvaj2wx"; depends=[emg numDeriv]; }; fractaldim = derive2 { name="fractaldim"; version="0.8-4"; sha256="0fln4qn0d79agnnlzi8b9g9qn90zynq1cg9v5isiyi71345v45nr"; depends=[abind]; }; fractional = derive2 { name="fractional"; version="0.1.3"; sha256="1jz83y53s0xdphh1z3v3z7xhcmhx7rp0iiazw2vdsx2747r3rirn"; depends=[Rcpp]; }; + fracture = derive2 { name="fracture"; version="0.1.2"; sha256="1ankyzasm73ijniq9f70ca9j5my60rhkp5hy9mzf64rxnll1mpsi"; depends=[Rcpp]; }; fragility = derive2 { name="fragility"; version="1.1"; sha256="0gjxc4bykqjmj54mxjh27bzkbf8ydrzzzlb7xnq9jljmr139zhyk"; depends=[metafor netmeta plotrix]; }; frailtyEM = derive2 { name="frailtyEM"; version="1.0.1"; sha256="0ajqmn8353va8k3idsl90xsrhpdqarfmvg84d4kwayxlqy6dmbb0"; depends=[expint ggplot2 magrittr Matrix msm numDeriv Rcpp survival tibble]; }; frailtyHL = derive2 { name="frailtyHL"; version="2.3"; sha256="115iv1d2c9mvviick8b24bn6kdbsvnf21nvfjm9a8dk0x07hrv5g"; depends=[cmprsk Matrix survival]; }; frailtySurv = derive2 { name="frailtySurv"; version="1.3.6"; sha256="0k41a5x7qzrajk2l59q5b8kjj084vids4ailr8r7r2lnf6r9xrav"; depends=[ggplot2 nleqslv numDeriv Rcpp reshape2 survival]; }; - frailtypack = derive2 { name="frailtypack"; version="3.3.0"; sha256="15930514k9mq6v43lk4bzbrp7n1n7kn0fpsi6qch0379kzl3lba3"; depends=[boot doBy jsonlite MASS nlme rhandsontable rootSolve shiny shinyBS shinydashboard shinyjs shinythemes statmod survC1 survival]; }; + frailtypack = derive2 { name="frailtypack"; version="3.3.2"; sha256="1prj0y4skavzjh3w9zxf3vcmcdlkvg2ysshgr65ln9hzn281zqn0"; depends=[boot doBy MASS nlme rootSolve shiny statmod survC1 survival]; }; frair = derive2 { name="frair"; version="0.5.100"; sha256="1j557dqvc5xiz7xbl4h7vp55pc3hly8ci01qy36p02vlxhzf4hj3"; depends=[bbmle boot lamW]; }; frambgrowth = derive2 { name="frambgrowth"; version="0.1.0"; sha256="1xmy1zxp7aa2n8frlxhn1bl41zda1jldvvxb3q41yam3pslc8m1q"; depends=[]; }; franc = derive2 { name="franc"; version="1.1.2"; sha256="1bhszr0g0blx0jmdwxkicn1zz1fhfgyhzsncgy3181i987429gdg"; depends=[jsonlite]; }; frapplot = derive2 { name="frapplot"; version="0.1.3"; sha256="12924szk2p0582nv97gi8pxrbv41zqpjryc6jqgg4llhp7ydz7xf"; depends=[]; }; frbs = derive2 { name="frbs"; version="3.2-0"; sha256="0biv6j31qi0f4i063ygmbp6v6ws1nxijn5kyhg5sz1rnbr0msl28"; depends=[]; }; - frechet = derive2 { name="frechet"; version="0.1.0"; sha256="1x5wmq704pxvsp22y6k12c2s46hhrd6finiy2q8hgvd9ss10r1b7"; depends=[corrplot fdadensity fdapace Matrix pracma rosqp]; }; + frechet = derive2 { name="frechet"; version="0.2.0"; sha256="1006mgy9avwkwy0666maac59xp4j27wq5yy3pwc3h1r05myxw379"; depends=[corrplot fdadensity fdapace Matrix osqp pracma]; }; + fredr = derive2 { name="fredr"; version="2.0.0"; sha256="1x5bw5zpippcxbxn2nv5925fbx5992hkmmzg8bcdxs2vff3mrpag"; depends=[httr jsonlite rlang tibble]; }; freealg = derive2 { name="freealg"; version="1.0-0"; sha256="0a3s89379lxr0dw068wfwzlqjq70zbaxil1vwwa4bf2i7s46mcgl"; depends=[Rcpp]; }; + freedom = derive2 { name="freedom"; version="1.0.1"; sha256="1mrdl2cqdm2c68lx7lyixgiqw6xzwnx9c8j5q4annhiz107i9i22"; depends=[]; }; freegroup = derive2 { name="freegroup"; version="1.1-0"; sha256="0ssshs2d6l2ip1xx9x581w0cdnd2459a1mh360ybwajkjgak2ci6"; depends=[magic magrittr plyr]; }; - freesurfer = derive2 { name="freesurfer"; version="1.6.7"; sha256="1wk0xjx0a99zm7gdn7i5z92wmqnlzng6n6g8w9whxvmy0rq6i19j"; depends=[neurobase R_utils reshape2]; }; - freesurferformats = derive2 { name="freesurferformats"; version="0.1.11"; sha256="0n5spc021dr15qz1prg76xfn814x9bgfczxc69qdpjz8q4f0cacg"; depends=[pkgfilecache xml2]; }; + freesurfer = derive2 { name="freesurfer"; version="1.6.8"; sha256="0ks6ms5vp38pykcg66w960nmfgq383iprrbbzw5dlx9xnrx4yhbh"; depends=[neurobase R_utils reshape2]; }; + freesurferformats = derive2 { name="freesurferformats"; version="0.1.13"; sha256="17lfrcjfbw3v2n04q0xxrpp17fy4iqhm469vd89j8j7cnbsnk5yl"; depends=[pkgfilecache xml2]; }; freetypeharfbuzz = derive2 { name="freetypeharfbuzz"; version="0.2.5"; sha256="11agmqdp6sy32jk2840cj8wmgywq0yjar18zsnsn56qfvn4b1k1c"; depends=[fontquiver]; }; frenchCurve = derive2 { name="frenchCurve"; version="0.1.0"; sha256="1b8lkmhydz4jq8h5p117fwaygbsillzcfx0p7w0ljj8b8v57r6l9"; depends=[sp]; }; freqdist = derive2 { name="freqdist"; version="0.1"; sha256="1pb45jabv9s3qa7v1isd5wm9b0g9p04q5h18spcaax8397s0d2fv"; depends=[]; }; @@ -8274,9 +8604,10 @@ in with self; { freqparcoord = derive2 { name="freqparcoord"; version="1.0.1"; sha256="011p8xh0i0x0w5rv5qz5a7fxwdhxd8l2bqi9bxv5almxd0y7ajqx"; depends=[FNN GGally ggplot2 mvtnorm]; }; freqtables = derive2 { name="freqtables"; version="0.1.0"; sha256="0d2yibb8689786icfladxfm51sqng909wigvqmwij9lkqq14rd80"; depends=[dplyr rlang stringr]; }; frequency = derive2 { name="frequency"; version="0.4.0"; sha256="1m3hrbkspnmcl956f7m4fpfd980qdxmyagsm5kd79dzh3qka2xly"; depends=[DT ggplot2 gtools knitr rmarkdown]; }; - frequencyConnectedness = derive2 { name="frequencyConnectedness"; version="0.2.2"; sha256="1mn20isy146ya4i33xxszmhvdwqkkg0cd18002mq8bvnkb65fxd2"; depends=[knitr pbapply urca vars]; }; + frequencyConnectedness = derive2 { name="frequencyConnectedness"; version="0.2.3"; sha256="1yzpgflldcdsd5kj0jpyj0vwx25f3l0x344glbrwvlwgdax9dkg8"; depends=[knitr pbapply urca vars]; }; frequentdirections = derive2 { name="frequentdirections"; version="0.1.0"; sha256="0rmifh221c8z3cqyqg0bfxnih9f64hvv98jz44i6grnlablfwwgw"; depends=[ggplot2]; }; fresh = derive2 { name="fresh"; version="0.2.0"; sha256="1787mm6w2s5x9scxy7r9cb77rgpmy4ngwkn4z8g3gs48mrab4bd9"; depends=[htmltools rstudioapi sass shiny]; }; + friends = derive2 { name="friends"; version="0.1.0"; sha256="164p9g07vq3xs2lgg250yvzca4b0mp81pqbnjfdkzcqh5hmahsan"; depends=[tibble]; }; frm = derive2 { name="frm"; version="1.2.2"; sha256="1dl0vca9r2dams99sc13pfpi0b3yb02x59f4c1jz07zz005c8l23"; depends=[]; }; frmhet = derive2 { name="frmhet"; version="1.1.3"; sha256="07sgsfhzrci8g1b0gicjfca1mgd8ppfqpkpp4q9bdxnjvdvlf45s"; depends=[]; }; frmpd = derive2 { name="frmpd"; version="1.1.0"; sha256="0irgqdr0vr8k408lsxcrjkjbjvqvmy5mnjw9c1ghs86isrp5mciz"; depends=[]; }; @@ -8287,62 +8618,67 @@ in with self; { frost = derive2 { name="frost"; version="0.0.4"; sha256="03snjlq4b9j84v0yimc3xzgjvryzzi76b9n53k0s2lvv1yzrri7x"; depends=[]; }; frostr = derive2 { name="frostr"; version="0.2.0"; sha256="1bsgdskdbyryq7jvhnb4z4xb1m5vadqv00qjlkgp41xh71wp2brs"; depends=[httr jsonlite tibble tidyr]; }; frt = derive2 { name="frt"; version="0.1"; sha256="1qy76a1wkznaqzlyj1nq74mf1pnyly1s8gnff8q30zfccqk68cxv"; depends=[]; }; + fruclimadapt = derive2 { name="fruclimadapt"; version="0.4.4"; sha256="19siwjjcjh0kh2wpbabgzjwrfgg2al0g7d4z91wdcp3spwx308vk"; depends=[data_table lubridate tidyverse zoo]; }; fs = derive2 { name="fs"; version="1.5.0"; sha256="15rqc3ljmcmgfvadj1j1kq7kvibagxic8sgplhlcdqqxax9idprn"; depends=[]; }; fsMTS = derive2 { name="fsMTS"; version="0.1.5"; sha256="1vxj9wkzpbk44hby4fdyhj72748c65by612kpphs6vmgzmw4y471"; depends=[freqdom glasso lars mpmi randomForestSRC]; }; - fsbrain = derive2 { name="fsbrain"; version="0.3.0"; sha256="01jvlml8id64c7n4zr3ggkknv0nky8fap4cd3xi54rvdknhqsjwa"; depends=[data_table fields freesurferformats pkgfilecache reshape rgl squash]; }; + fsbrain = derive2 { name="fsbrain"; version="0.4.0"; sha256="1cq9hq7q11di3a967bsdj43mkmywvzxsacv4ndqm1dz6gn9dww5q"; depends=[data_table fields freesurferformats pkgfilecache reshape rgl squash]; }; fscaret = derive2 { name="fscaret"; version="0.9.4.4"; sha256="18fhyfl3f8syyc3g937qx87dmwbv7dray6b97p1s6lnssiv61gsw"; depends=[caret gsubfn hmeasure]; }; fsdaR = derive2 { name="fsdaR"; version="0.4-9"; sha256="1iaqqdwhh29fhq4r64adfrjmsyzq4v60bz9111vkazj4kr45wxxv"; depends=[ggplot2 rJava rrcov]; }; fsia = derive2 { name="fsia"; version="1.1.1"; sha256="0id7cnswrqylgpwjil1zfn89ryrdpl20fim8x1srl8s1hm5bg35r"; depends=[]; }; fslr = derive2 { name="fslr"; version="2.24.1"; sha256="1psjqvjv8krlkj7dcfwygz563a4cpn7h21z330hxh5q10rwhabi8"; depends=[neurobase oro_nifti R_utils]; }; + fsn = derive2 { name="fsn"; version="0.1"; sha256="1a5vsrk9l19rh46kxrfmgcv07l0pr4zn1q2f0chivq43pwmfm194"; depends=[Rfast]; }; fso = derive2 { name="fso"; version="2.1-1"; sha256="0hn2ypm0nwfbmnh9il78pi30x7gfmayfangqyh0d63ngyz40bvma"; depends=[labdsv]; }; fssemR = derive2 { name="fssemR"; version="0.1.6"; sha256="1l80anvlf21kvwb95w5mn0i2q773z0vbznx1lqvgsawprhcdiv20"; depends=[glmnet igraph MASS Matrix mvtnorm qtl Rcpp RcppEigen stringr]; }; - fst = derive2 { name="fst"; version="0.9.2"; sha256="11r35v8irv6a4gnbw06wrlipsrqq2m86dmcfijp5k07n59hgipi3"; depends=[Rcpp]; }; + fst = derive2 { name="fst"; version="0.9.4"; sha256="0vwclzxww8mw9nnpyj29bn71mrr8jjg7ka03979h9rbzw6d9bjrr"; depends=[Rcpp]; }; fstcore = derive2 { name="fstcore"; version="0.9.4"; sha256="1gdjwkq7i3hrnazsj8sqsalkfiz35397azlprngmn2n704ql0vch"; depends=[Rcpp]; }; fsthet = derive2 { name="fsthet"; version="1.0.1"; sha256="0z6az1jcvdahgn97r6cpj1s6fn0lvr7j12gcw2r7wbpajrvyl5j6"; depends=[]; }; ftDK = derive2 { name="ftDK"; version="1.0"; sha256="1xs2rr2afjza97kpym5zkas3k78pilxjlh7lp1gc66banldr71g2"; depends=[dplyr httr pbapply purrr tibble]; }; - ftExtra = derive2 { name="ftExtra"; version="0.0.1"; sha256="0zgz4sjxx6ls27afb9djmxvwq46pp5jwxxbb87wnjc9fn5vvnnxy"; depends=[dplyr flextable jsonlite magrittr purrr rlang rmarkdown stringr tidyr tidyselect]; }; + ftExtra = derive2 { name="ftExtra"; version="0.1.0"; sha256="00kldzc0r41hsd3s8403l3z1r7frnl09y7q33wjzwkq4s89h5q48"; depends=[dplyr flextable jsonlite magrittr purrr rlang rmarkdown stringr tibble tidyr tidyselect xfun yaml]; }; ftnonpar = derive2 { name="ftnonpar"; version="0.1-88"; sha256="0df9zxwjpfc939ccnm1iipwhpf76b34v0x74nsi1mm1g927dfl0i"; depends=[]; }; + ftrCOOL = derive2 { name="ftrCOOL"; version="1.1.0"; sha256="0agl01djp1zkzgiqlpnmrpd7qgysabbmclw2vv5a52x0hgk9iqgy"; depends=[]; }; fts = derive2 { name="fts"; version="0.9.9.2"; sha256="08pwhi19db173d4nsk5rl8xa8qmaddj4bn3cjxb8ql4kny59i57q"; depends=[BH zoo]; }; - ftsa = derive2 { name="ftsa"; version="5.8"; sha256="1mzhzc2x8xqlzf3qchjf94dwhnig0y23900iyh2bzjpy5wi8c58d"; depends=[colorspace e1071 ecp fda forecast MASS pcaPP pdfCluster rainbow sde strucchange]; }; + ftsa = derive2 { name="ftsa"; version="6.0"; sha256="06g6qmz7qagm0izvq5d85h0hy851idpk7wi1hapw8xcl596irgf6"; depends=[colorspace e1071 ecp fda forecast MASS pcaPP pdfCluster rainbow sde strucchange]; }; ftsspec = derive2 { name="ftsspec"; version="1.0.0"; sha256="12f9yws1r26i240ijq0xqprl3pgbw50wv68jsm75ycplbs2jsyhs"; depends=[sna]; }; fuel = derive2 { name="fuel"; version="1.2.0"; sha256="0pzb77g6l8cz5p7y6czck23kp7hs5zp78k87b5yh0avjlr7ads74"; depends=[]; }; fueleconomy = derive2 { name="fueleconomy"; version="1.0.0"; sha256="16a8wyliiidi6rw14ksimygfkl4a7yhxvss7l9bcvr1wfiplrn65"; depends=[]; }; fugeR = derive2 { name="fugeR"; version="0.1.2"; sha256="0kd90s91vzv0g3v9ii733h10d8y6i05lk21p5npb3csizqbdx94l"; depends=[Rcpp snowfall]; }; fugue = derive2 { name="fugue"; version="0.1.7"; sha256="1myvi9cizxvahb6wn2k26v3x958xsrm2p414ar05injmfjdfnsmi"; depends=[]; }; fullfact = derive2 { name="fullfact"; version="1.3"; sha256="1dy5ppa22i9axqcwx2184qv2vjcbml0yh5b89zx9rg2zsnv4ygym"; depends=[afex lme4]; }; - fulltext = derive2 { name="fulltext"; version="1.5.0"; sha256="0yxy37c7xpp86jqpa9k8i23pa0hqww5q10jd3k1gn2m0va702yz7"; depends=[aRxiv crminer crul data_table digest hoardr jsonlite magrittr microdemic pdftools rcrossref rentrez rplos storr tibble xml2]; }; - fun = derive2 { name="fun"; version="0.2"; sha256="0944m10nym4rsb6rhdwqn04c7l3bz43jcw3q8hv4vljdf5kyg9ar"; depends=[]; }; + fulltext = derive2 { name="fulltext"; version="1.6.0"; sha256="1zbfzyr5icwrgrb6zpng16z46ain6rf91j9sxw99p2ha4mkj200r"; depends=[aRxiv crminer crul data_table digest fauxpas hoardr jsonlite magrittr microdemic pdftools rcrossref rentrez rplos storr tibble xml2]; }; + fun = derive2 { name="fun"; version="0.3"; sha256="09601ma4irmpkgjspq6zmr383m1pbgyfdkf7gw8w8gp0q7ab89aq"; depends=[]; }; funData = derive2 { name="funData"; version="1.3-5"; sha256="0qz6kywd6xp292yvzf5znpw0qd02zadmp29jd1kchnydbf3sk0mh"; depends=[abind fields foreach]; }; funFEM = derive2 { name="funFEM"; version="1.1"; sha256="08798lvryykrxfvp2297anzl4gi81gwvc1qyyzq16nafjf65kwfy"; depends=[elasticnet fda MASS]; }; - funGp = derive2 { name="funGp"; version="0.1.0"; sha256="03khkwdq2kc7wxr7jr50kms4w63w6iz90431d960dg4s0gff29h8"; depends=[doFuture foreach future knitr microbenchmark progressr qdapRegex scales]; }; + funGp = derive2 { name="funGp"; version="0.2.1"; sha256="0rby13vna776ffkdsc5pnci54k7g4493lz7f0d66g72siylxxy9c"; depends=[doFuture foreach future knitr microbenchmark progressr qdapRegex scales]; }; funHDDC = derive2 { name="funHDDC"; version="2.3.0"; sha256="1dym1bzywng5yjfzpppxx043pwcbvrxxq0bn1d6xqqkqcpzn2zhp"; depends=[fda MASS]; }; funLBM = derive2 { name="funLBM"; version="2.1"; sha256="1phxqjri4pb65lfx6nbldvqq61cw1n0gjq5pckry3sjzylsmz5bi"; depends=[abind fda funFEM ggplot2]; }; funModeling = derive2 { name="funModeling"; version="1.9.4"; sha256="1zhmazw77phcdwj9wwxpwjfhwd8wyjc538acqiwq9f6sz8fw1cbb"; depends=[cli dplyr entropy ggplot2 gridExtra Hmisc lazyeval moments pander RColorBrewer reshape2 ROCR scales stringr]; }; - funbarRF = derive2 { name="funbarRF"; version="1.0.2"; sha256="14xfhwp4vffl215fqdxdxpmjblyw75ylxqjzja794adywm06sz19"; depends=[BioSeqClass Biostrings randomForest]; }; func2vis = derive2 { name="func2vis"; version="1.0-1"; sha256="1d2dy7icrgp47szmizhk9x5azsynsv1qp6igxia2mlzkfbk27ffz"; depends=[devtools ggplot2 ggrepel igraph]; }; funchir = derive2 { name="funchir"; version="0.2.0"; sha256="1rj5khv1xcaaip5xh8kcsp2jgmbmnc9q5kwr46l4mxvxyndndi1k"; depends=[data_table]; }; + functClust = derive2 { name="functClust"; version="0.1.6"; sha256="0mdfxvrx3wk497a9bbkwnzbm6hm2s4wqs3h09m3hj48ybpqmhz9i"; depends=[clusterCrit multcompView]; }; functional = derive2 { name="functional"; version="0.6"; sha256="120qq9apg6bf39n9vnp68db5rdhwvnj2vi12a8j8243vq8kqxdqr"; depends=[]; }; + functiondepends = derive2 { name="functiondepends"; version="0.2.1"; sha256="0i6ppm5xz1m3m29lvz4nqm31k33w18j8af160lalgc01i1n4n11c"; depends=[dplyr magrittr purrr stringr tibble tidyr tidyselect]; }; functools = derive2 { name="functools"; version="0.2.0"; sha256="0g62jdia3n09vq8mx1m2r4nl3jfcadzpym0wkldzzzjcfs90vl6b"; depends=[]; }; funest = derive2 { name="funest"; version="0.0.1.3"; sha256="1pi556klfnbmrsx5c0f3v4hdn5m4dxxm71ijivanpwfqnfls8xh3"; depends=[funData MFPCA pec prodlim purrr ranger Rdpack survival tdROC]; }; fungible = derive2 { name="fungible"; version="1.96.3"; sha256="1c8yc7mazvir42vq27f5bascbaswqx84qhf1r7kwkm72cxg4m1j2"; depends=[clue GPArotation lattice MASS mvtnorm nleqslv Rcsdp RSpectra]; }; funique = derive2 { name="funique"; version="0.0.1"; sha256="0p9k4nxjns1xid9vmslkaap0hm6yq6pbyvylgygd808if4q1z8k6"; depends=[]; }; funnelR = derive2 { name="funnelR"; version="0.1.0"; sha256="143lb048krgh8rkkz6sm8h464kdy62w29fvvyar795vqi10bb5fy"; depends=[ggplot2]; }; funneljoin = derive2 { name="funneljoin"; version="0.1.0"; sha256="17g1mvq9z5m29r0v2r2nn8980j515jamnpwvvnzj83vk84bz94rq"; depends=[broom dplyr glue magrittr purrr rlang tibble tidyr]; }; - funprog = derive2 { name="funprog"; version="0.2.0"; sha256="1gs0mahvzgnv5pfvz32acq0jk3rnssg6bxqzlqpyqg0r3g4m80mf"; depends=[]; }; + funprog = derive2 { name="funprog"; version="0.3.0"; sha256="1n064gf03z70iapwscrrzhl71qh7cgnb3ch1r04h3b944b4yiain"; depends=[]; }; funr = derive2 { name="funr"; version="0.3.2"; sha256="11mjd1ba9kwawh7k5py54mkq4g1df79d7qivan8fj11qfwfzm679"; depends=[]; }; funrar = derive2 { name="funrar"; version="1.4.1"; sha256="0xqccch59f8cz4a7ybjdr6k625bir5nsjrp4iyfirrb877d17m5z"; depends=[cluster]; }; funreg = derive2 { name="funreg"; version="1.2"; sha256="199zvqali0sb0z4yp20rm5da0kd7z3rgv47g1cb1apsbcw0cq51n"; depends=[MASS mgcv mvtnorm]; }; - funtimes = derive2 { name="funtimes"; version="6.1"; sha256="1qr0z0nn3dv2yxq4sacsm0xs4pnda31zc10rz427rdyjrps85838"; depends=[dbscan Jmisc Kendall Rdpack]; }; + funtimes = derive2 { name="funtimes"; version="7.0"; sha256="0p0j9xsxz8fl4n0y6dchm0xr2gwc6v657wqx9qhbvb0r2wljizc6"; depends=[dbscan Jmisc Kendall Rdpack]; }; furniture = derive2 { name="furniture"; version="1.9.7"; sha256="1czc1ayfpqf6h7n5fjzx1vwkzm9vg1dr62hl5k511b9kdc8lfsfh"; depends=[dplyr knitr magrittr]; }; - furrr = derive2 { name="furrr"; version="0.1.0"; sha256="1ld9aa9hydna94hgm6p91zjbfv1dz1vsgchjlpknkg6irbvkfafx"; depends=[future globals purrr rlang]; }; + furrr = derive2 { name="furrr"; version="0.2.1"; sha256="16s6sgfgh1ayzhf3kvpy9vhsd5h6p57waj1xgbksgdmf4j1wkcq7"; depends=[ellipsis future globals lifecycle purrr rlang vctrs]; }; fusedest = derive2 { name="fusedest"; version="1.3.1"; sha256="1nz5bkvn8y9f8h0ya6wblryg7bwj1vnz1vyqmd1hfr85bxfgl83c"; depends=[igraph Matrix Rcpp RcppEigen]; }; fuser = derive2 { name="fuser"; version="1.0.1"; sha256="17lsfpd9hdichj3wflac896zyjbq7a8w2gmlgj8nbgg80f646fgr"; depends=[glmnet irlba Matrix Rcpp RcppEigen RSpectra]; }; + fusionchartsR = derive2 { name="fusionchartsR"; version="0.0.1"; sha256="1dfn4c1fyrzyi9pn30ha41sybabcr9ss5z2s3jgg4gs4kn2s6bak"; depends=[htmlwidgets jsonlite magrittr]; }; fusionclust = derive2 { name="fusionclust"; version="1.0.0"; sha256="1h03nlk4gnz4j5h2h5bxazkka2qq983h7nglm1ghzqvbqjk6sv37"; depends=[bbmle]; }; futile_logger = derive2 { name="futile.logger"; version="1.4.3"; sha256="1r3nayk0z9n1svbf8640vw90dal5q07nkn0gv4bnva3pbzb352sy"; depends=[futile_options lambda_r]; }; futile_options = derive2 { name="futile.options"; version="1.0.1"; sha256="0w15agpi88y3qkv6fl72zy2pzyplzgvnj41a4ixhg64mw1sck73s"; depends=[]; }; futile_paradigm = derive2 { name="futile.paradigm"; version="2.0.4"; sha256="14xsp1mgwhsawwmswqq81bv6jfz2z6ilr6pmnkx8cblyrl2nwh0v"; depends=[futile_options RUnit]; }; futility = derive2 { name="futility"; version="0.4"; sha256="0zjb87brz7pkx3nq3q30y69cmcxpqqsra447p60qh7005kgr9vx4"; depends=[]; }; - future = derive2 { name="future"; version="1.18.0"; sha256="01fp8kgjf0k6c83q1w3dy9z90g72cc9d0004d1qw6n1j65nwxg4f"; depends=[digest globals listenv]; }; + future = derive2 { name="future"; version="1.21.0"; sha256="0bfiy17n5rghxw0702k0vgpjkk13268lniifdlx59flf0q16d7lh"; depends=[digest globals listenv parallelly]; }; future_BatchJobs = derive2 { name="future.BatchJobs"; version="0.16.2"; sha256="08lh1sp0v1vagi34s218a1ygj63whkf3s9w0kyf25v64gsdavkzc"; depends=[BatchJobs future R_utils]; }; future_apply = derive2 { name="future.apply"; version="1.6.0"; sha256="1zbfycjfvxnrigm6l2fd2zgnw96g0apiw426c73gkv3xv7bdy6ms"; depends=[future globals]; }; future_batchtools = derive2 { name="future.batchtools"; version="0.9.0"; sha256="1srcc4vv9nm49nq8llxik9ys4f45lz2shwlc4l9wp0zmxinzi3sr"; depends=[batchtools future]; }; @@ -8359,20 +8695,20 @@ in with self; { fuzzywuzzyR = derive2 { name="fuzzywuzzyR"; version="1.0.3"; sha256="1kbli1m44317m95a0r34vza9p27vd9ala05jrbrdkadninwdynal"; depends=[R6 reticulate]; }; fwi_fbp = derive2 { name="fwi.fbp"; version="1.7"; sha256="1wk9cr0kk6zkbf111bv87n7b1wwx1qrsbjxydvbjvy8bgz0nfa62"; depends=[]; }; fwsim = derive2 { name="fwsim"; version="0.3.4"; sha256="0fy87c1x5hihfcppv1pvk3b0pwl6ygqpka40x55gbpkgssdigb1l"; depends=[Rcpp]; }; + fxTWAPLS = derive2 { name="fxTWAPLS"; version="0.0.4"; sha256="1rf16rl3g71i8fr5gvv7nizvhbafw4ip8x4b2i6m3vxgf10wl293"; depends=[doParallel foreach geosphere ggplot2 MASS tictoc]; }; fxregime = derive2 { name="fxregime"; version="1.0-4"; sha256="0ml1q0xp90jfng6a60pfkp6j7wajk6pz4p4wm08rfqikgsdvp0m4"; depends=[car sandwich strucchange zoo]; }; fxtract = derive2 { name="fxtract"; version="0.9.4"; sha256="0nhgk68rbk05sz8knyy6f2rj7bnbiq8mfchl5j8jin36nvxbzls9"; depends=[checkmate data_table dplyr future_apply magrittr R6]; }; - fy = derive2 { name="fy"; version="0.2.0"; sha256="0s8wqzzdd3sw5nfzap482382p252h5l0fx2bm6vi48zhg4pkgkc1"; depends=[data_table fastmatch hutils]; }; + fy = derive2 { name="fy"; version="0.3.0"; sha256="13803ld4b59ly5h3zlianag9901jyw6p70bsyz5dj7k62hg7ha3s"; depends=[data_table fastmatch hutils]; }; g_data = derive2 { name="g.data"; version="2.4"; sha256="14a4m0v38p3j1k1kymkxwydlgm8b73hlx9m80sg1l4aj38fvflzl"; depends=[]; }; g2f = derive2 { name="g2f"; version="0.2"; sha256="1jsmiv6v8ilpxg1k1npcgqa467hpyw7mzh5m8dp7bxar4j5npsp4"; depends=[KEGGREST minval sybil]; }; - g3viz = derive2 { name="g3viz"; version="1.1.2"; sha256="1rra2n8b6mimwpsdpjnvpfl3hh0nv1xyzmggpz9xydilv7lybinz"; depends=[cgdsr htmlwidgets jsonlite stringr]; }; + g3viz = derive2 { name="g3viz"; version="1.1.3"; sha256="0nng2534kr8qpqxlyji093fc7929f1ra9gib8hjvh5y6xdgjzavm"; depends=[cgdsr htmlwidgets jsonlite stringr]; }; gCat = derive2 { name="gCat"; version="0.1"; sha256="10990ilsjk52kqkcdngj4nq0kcbn4w1syxl1mqjq2n5g1l002yjy"; depends=[]; }; - gDefrag = derive2 { name="gDefrag"; version="0.2"; sha256="0z2jbb53x0knxajap1f2w25s732xqy1fyayxh2mzlbhm0zf3pjjw"; depends=[igraph maptools rgdal rgeos sp]; }; + gDefrag = derive2 { name="gDefrag"; version="0.3"; sha256="016vpj03drygxsa06jin225rfgjvjm938x65990ms15xcwrgv8nb"; depends=[igraph maptools rgdal rgeos sp]; }; gIPFrm = derive2 { name="gIPFrm"; version="3.1"; sha256="08rfdac442picbw1r3xyxjzf2dc57svg44am0714z4r72mshvj04"; depends=[]; }; gLRTH = derive2 { name="gLRTH"; version="0.2.0"; sha256="1drmmr576n3pbr0q1cnnx4k7r4iz061n2cizv1kpr3wcc1g291pn"; depends=[]; }; gMCP = derive2 { name="gMCP"; version="0.8-15"; sha256="01048j9489rrhv9syqrbw4c5i5gsll41ysm27awxw6l1rshbqsqn"; depends=[CommonJavaJars JavaGD MASS Matrix multcomp mvtnorm PolynomF rJava xlsxjars]; }; gMOIP = derive2 { name="gMOIP"; version="1.4.3"; sha256="0zk2m81kbsb40bjgvv29cl7azr2kfa528ph1lhrp88zsiv3hv3py"; depends=[dplyr geometry ggplot2 ggrepel MASS Matrix plyr purrr Rfast rgl rlang]; }; gMWT = derive2 { name="gMWT"; version="1.1.1"; sha256="1vbw548fyrf012ry54p3gybdsil8c9llg2r9njhsiy7rb0gz2613"; depends=[clinfun Rcpp RcppArmadillo]; }; - gPCA = derive2 { name="gPCA"; version="1.0"; sha256="1ylb1d24dxnzpws9bbanwhyizjr3ljky2bhrph4c5yaq0zwwbrkw"; depends=[]; }; gPdtest = derive2 { name="gPdtest"; version="0.4"; sha256="00dlhnklfg2yp4hp7yjgr2nfswv22c007xq1mxdbkll62zgd94mq"; depends=[]; }; gProfileR = derive2 { name="gProfileR"; version="0.7.0"; sha256="1h1v0kgpsn04ald2izznh7fr2riwisj5hcgz4k7h3qc931rf0r4k"; depends=[plyr RCurl]; }; gRain = derive2 { name="gRain"; version="1.3-6"; sha256="0l95yvv3ig11k71xkvh0ivvkan4hvpmjsa12yg1laaaqiaqzzxnm"; depends=[graph gRbase igraph magrittr Rcpp RcppArmadillo RcppEigen Rgraphviz]; }; @@ -8381,14 +8717,14 @@ in with self; { gRc = derive2 { name="gRc"; version="0.4-3.2"; sha256="0f8m83wqhmsn6p0v0msdzyy9vl900nc9ddr8y78181jxcd9mqd0d"; depends=[gRbase MASS]; }; gRim = derive2 { name="gRim"; version="0.2.5"; sha256="0m3lc42r6qd6kps3y7jz11ry4886cc87ld1s1phypna98qjy6gky"; depends=[gRain graph gRbase igraph magrittr Rcpp RcppArmadillo RcppEigen Rgraphviz]; }; gSEM = derive2 { name="gSEM"; version="0.4.3.4"; sha256="18kh41ibvfflz59gykiq7j2c6a72i8b0w8c2mcprd1nzhnyhvmhy"; depends=[DiagrammeR htmlwidgets knitr MASS]; }; - gSeg = derive2 { name="gSeg"; version="0.7"; sha256="0np15vsnnksd59gzwk64fyjcawmrjq1n0rbjiw56zhsn19gkjx25"; depends=[]; }; + gSeg = derive2 { name="gSeg"; version="1.0"; sha256="0lixlirisnxk29zlrragi3l8j1abb5cl7zh6vhx7l5hjdvh8ldq9"; depends=[]; }; gStream = derive2 { name="gStream"; version="0.2.0"; sha256="1f4xnbavm99yhjmaahazigps41mqlfvvl29kf4fs1yjqr531y36b"; depends=[]; }; gTests = derive2 { name="gTests"; version="0.2"; sha256="1h1sd8mrzcniq7rx7frdlxwpnsn8lifng1x99fqq703hs3znl1yq"; depends=[ade4]; }; - gWQS = derive2 { name="gWQS"; version="3.0.0"; sha256="0q7kr564jm1sv8kcp9mx2q5v7083zp25fsbndmdpkd1pw2jxhgd3"; depends=[broom cowplot dplyr future future_apply ggplot2 ggrepel kableExtra knitr MASS nnet plotROC pscl reshape2 rlist]; }; + gWQS = derive2 { name="gWQS"; version="3.0.1"; sha256="0nmzd17yqsazkszsz3nqmc8minvq1myw5rxal45rhgdh71l8iwrn"; depends=[broom cowplot dplyr future future_apply ggplot2 ggrepel kableExtra knitr MASS nnet plotROC pscl reshape2 rlist]; }; gWidgets2 = derive2 { name="gWidgets2"; version="1.0-8"; sha256="0p6lav6lrwgsw29sl8vshzgi8j2smcavx047qq31s9bsn2dcw58n"; depends=[digest]; }; gWidgets2RGtk2 = derive2 { name="gWidgets2RGtk2"; version="1.0-7"; sha256="14c933j0wj3lb5da75zxg3w3mfqh0nqk8rczbi4dnqd8sna6jks9"; depends=[gWidgets2 memoise RGtk2]; }; gWidgets2tcltk = derive2 { name="gWidgets2tcltk"; version="1.0-6"; sha256="0arh0yxx63m4df1ccrv0q3vkjncwv3ink8vkalp6ashi2932yfma"; depends=[digest gWidgets2 memoise]; }; - gadget2 = derive2 { name="gadget2"; version="2.3.5"; sha256="1v1qg6rj3q09vkwhj5l3ijzyrgdp36fxkpv55q7l22b47b2krv17"; depends=[]; }; + gadget2 = derive2 { name="gadget2"; version="2.3.7"; sha256="1p7jpwy65gdl6kli1h2m9yi5p5ah1vm23xs03sm9l42fcbn7ffdw"; depends=[]; }; gafit = derive2 { name="gafit"; version="0.5.1"; sha256="160z3cv22prf7118447dla9g1gimwkfad8zdil3fg8n4l22rk51a"; depends=[]; }; gaiah = derive2 { name="gaiah"; version="0.0.4"; sha256="1ibsbmmpagr7ix1c3bszrglqx95w44qyfy80vcq3w2dprs8vrrw6"; depends=[dplyr geosphere magrittr maptools raster rlang sp]; }; gainML = derive2 { name="gainML"; version="0.1.0"; sha256="1mqhrdjdmc2n7dxilxkqn6xq7z0qnxpigw5bbffnjvvsmdamah0n"; depends=[fields FNN]; }; @@ -8402,11 +8738,12 @@ in with self; { gambin = derive2 { name="gambin"; version="2.4.4"; sha256="1kxxc17hva0r9wibh14w1r7g67q1nj71vrpdx4vkbsjz0lj67nzm"; depends=[doParallel foreach gtools]; }; gamboostLSS = derive2 { name="gamboostLSS"; version="2.0-1.1"; sha256="1zrmn2r9814q37nmc29p9lyvpgrz6q7pwby5h37ldsxzzwxqz1ig"; depends=[mboost stabs]; }; gamboostMSM = derive2 { name="gamboostMSM"; version="1.1.87"; sha256="0if0x92lch57ksll8d5i3jzk0kh40593b20c17g3hvc33920c7r0"; depends=[mboost]; }; + gamclass = derive2 { name="gamclass"; version="0.62.3"; sha256="0i2nynl4b46rdl8f2zashcg0dvlhcq9paq8hx5y40xpxm8iljqab"; depends=[lattice latticeExtra randomForest rpart]; }; gameofthrones = derive2 { name="gameofthrones"; version="1.0.2"; sha256="10ns4yl1s8adlf334gl8yararj1fpxbg3gy7h69s554m4h878awk"; depends=[ggplot2 gridExtra MASS]; }; games = derive2 { name="games"; version="1.1.2"; sha256="01hbbr2hsxi5j9axpdl0jihpd55pa9hacjxmab8p7cixk3xqqqbf"; depends=[Formula MASS maxLik stringr]; }; gamesGA = derive2 { name="gamesGA"; version="1.1.3.7"; sha256="0km0z2haqgykl01xkzsbkpwibavgqfjygx7cg08ni68gw501689l"; depends=[shiny]; }; gamlr = derive2 { name="gamlr"; version="1.13-6"; sha256="1b2vpqwr63nh3slpm3ha8w2mxnzhg5yv8f5afja58k9db77kciad"; depends=[Matrix]; }; - gamlss = derive2 { name="gamlss"; version="5.1-7"; sha256="0ywqwsp4k6jgnicp1gdsglji61l5cnackl52700v8kmkk83bq4c8"; depends=[gamlss_data gamlss_dist MASS nlme survival]; }; + gamlss = derive2 { name="gamlss"; version="5.2-0"; sha256="1q82md0439si0n7vqbbbdk45sjr0ad7i8mgrn3kwnr4h213pb4nk"; depends=[gamlss_data gamlss_dist MASS nlme survival]; }; gamlss_add = derive2 { name="gamlss.add"; version="5.1-6"; sha256="0g80bn0nszs2nmka6dypyvqnsgxp7mzhf5nd82n5x4jm3ca3dbdj"; depends=[gamlss gamlss_dist mgcv nnet rpart]; }; gamlss_cens = derive2 { name="gamlss.cens"; version="5.0-1"; sha256="1s83dgifidvc6cbrqirwlvwfzg08mlhmxxiqkbmnsy09i5j9fzd3"; depends=[gamlss gamlss_dist survival]; }; gamlss_countKinf = derive2 { name="gamlss.countKinf"; version="3.5.1"; sha256="1xalp909gxxhyhh4chlr1ssyfhydhw1w3szzbynajji98576zaqv"; depends=[gamlss gamlss_dist]; }; @@ -8414,15 +8751,15 @@ in with self; { gamlss_demo = derive2 { name="gamlss.demo"; version="4.3-3"; sha256="01p6abppwbnh2a2ks1g08z4iwq2fxf125y9s4qzssybsn76a3gf3"; depends=[gamlss_dist gamlss_tr rpanel]; }; gamlss_dist = derive2 { name="gamlss.dist"; version="5.1-7"; sha256="0nzgq3rnziy0i2zxn88hqy3pakpyin2m2csk9j3zg39si66c6wcq"; depends=[MASS]; }; gamlss_inf = derive2 { name="gamlss.inf"; version="1.0-1"; sha256="0m091zxjm5wvhm6mzbpzkr275n3qnlb3v4099k0a1jymahk4w7vr"; depends=[gamlss gamlss_dist]; }; - gamlss_mx = derive2 { name="gamlss.mx"; version="4.3-5"; sha256="1jfs3ib2imwgazf8v23fa12iaflv0pm944bkqklx8qcljxp1lcs7"; depends=[gamlss gamlss_dist nnet]; }; + gamlss_mx = derive2 { name="gamlss.mx"; version="6.0-0"; sha256="0b06nb6nq36ay0p5z57j5d4hrly5917wcsal7986mp1270iwnpip"; depends=[gamlss gamlss_dist nnet]; }; gamlss_nl = derive2 { name="gamlss.nl"; version="4.1-0"; sha256="083l5lsb0csxcp4vffvdv2nr7jk3s2gkcavx66m8inzw16j7xilz"; depends=[gamlss survival]; }; gamlss_spatial = derive2 { name="gamlss.spatial"; version="2.0.0"; sha256="1pgmlc6i7p5mjb1pc7b861yjl2gwr37bbzj3j2dl0qzybrs742mx"; depends=[gamlss gamlss_add gamlss_dist mgcv spam]; }; gamlss_tr = derive2 { name="gamlss.tr"; version="5.1-7"; sha256="0drimqfy22v3lbb6wclia9dkij2r1r4syz9i74fhn07qxay7b6cg"; depends=[gamlss gamlss_dist]; }; - gamlss_util = derive2 { name="gamlss.util"; version="4.3-4"; sha256="0p8lnwrn7cx97qnxls1x532f3ywszdyib2qiwx5qc7sam59h9c8j"; depends=[gamlss gamlss_dist zoo]; }; gamlssbssn = derive2 { name="gamlssbssn"; version="0.1.0"; sha256="1l8d4qwmq9dklm9imb3cvlncwa6jygf8kg2j1599h1nfhyyhj2vv"; depends=[gamlss gamlss_dist MASS]; }; gamm4 = derive2 { name="gamm4"; version="0.2-6"; sha256="128c725y9s07c1m9cvd9hgi9hldrymcs5divd8pw7bdjh9jvdiap"; depends=[lme4 Matrix mgcv]; }; gamm4_test = derive2 { name="gamm4.test"; version="0.1.0"; sha256="0ab6rksr88fsv6whp6cxyshpv5ixmf9lw51cl3rzk870r8q326wg"; depends=[doParallel foreach gamm4 Matrix mgcv plotly RColorBrewer]; }; gammSlice = derive2 { name="gammSlice"; version="2.0-2"; sha256="1klxg1yhmfaz1zjnw1kxl1lm5plkakqh014rpkak2lj8zgf8qnyy"; depends=[KernSmooth lattice mgcv]; }; + gamma = derive2 { name="gamma"; version="1.0.0"; sha256="19cqg8c3x89xydkf91vk3k13mi9nw82xhv6zc4naiwjxnvrwfi16"; depends=[ggplot2 IsoplotR rlang rxylib]; }; gamreg = derive2 { name="gamreg"; version="0.3"; sha256="1svrgbb8qdy2hzpq1g38v2lzmlbrn7qljix827biqzwgiajy69gg"; depends=[doParallel foreach glmnet Rcpp RcppArmadillo robustHD]; }; gamsel = derive2 { name="gamsel"; version="1.8-1"; sha256="107hbshi36dcyykhy6w1i1ih84xwdqv1q3nad73d3krf7bhvhg5f"; depends=[foreach mda]; }; ganalytics = derive2 { name="ganalytics"; version="0.10.7"; sha256="03jf7325cgg5p6lzcrzzzx0b40vf3l5vhw95lih098kpmlr1zadf"; depends=[assertthat googleAnalyticsR httpuv httr jsonlite lazyeval lubridate plyr R6 rvest scales selectr stringr tibble XML xml2]; }; @@ -8432,22 +8769,27 @@ in with self; { gapminder = derive2 { name="gapminder"; version="0.3.0"; sha256="067cra1ca4ngwjx8d1y9pyzwcpsfi1wcal0glzyy6ghd1k6jflpv"; depends=[tibble]; }; garchx = derive2 { name="garchx"; version="1.1"; sha256="1pw8igjimralggkcfynnp4fcc0wqb5rhkk7x3ymj9ysgif8fnfgj"; depends=[zoo]; }; gargle = derive2 { name="gargle"; version="0.5.0"; sha256="1fykmiv3x8c9ai31r9wr7qcca51h6kqn9cgwbxvxfj15fhwskh4n"; depends=[fs glue httr jsonlite rlang withr]; }; - garma = derive2 { name="garma"; version="0.9.2"; sha256="0mln1v0qz588jv8k0v3jy0b5lw3pz7mysdcnmkihqs7zd1f7vkgs"; depends=[assertthat FKF forecast ggplot2 lubridate nloptr pracma Rdpack Rsolnp signal zoo]; }; + garma = derive2 { name="garma"; version="0.9.6"; sha256="03nf6nncikva8yw8hmmrsh9wy2ncr2v2dq1pr4xb360sqds5d028"; depends=[crayon FKF forecast ggplot2 lubridate nloptr pracma Rsolnp signal zoo]; }; garray = derive2 { name="garray"; version="1.1.2"; sha256="0s2dgi556x9jnhafvzz4qkxdbq9dm12gsvsqd2g9iy3468fx9flq"; depends=[]; }; gaselect = derive2 { name="gaselect"; version="1.0.9"; sha256="089gyllcmq5rgf5yffclifc7rc8rmq4wk1dhznigxkij4zap67hx"; depends=[Rcpp RcppArmadillo]; }; gasfluxes = derive2 { name="gasfluxes"; version="0.4-4"; sha256="0gi0zk0h5rw75n6znada0cwa9qzy8higsiiqwgdm3q827j1x8iva"; depends=[AICcmodavg data_table MASS sfsmisc]; }; gasper = derive2 { name="gasper"; version="1.0.1"; sha256="1dyrf1i1algzaafjs374xi3j787id6nqx7f0ha2wmisd2ax92jw0"; depends=[ggplot2 Rcpp RcppArmadillo rwavelet scatterplot3d]; }; gastempt = derive2 { name="gastempt"; version="0.5.1"; sha256="1ycyk1a643vd4cdxinjvb194mxjp5p1hwmlda6x8qy0yhky0ibhw"; depends=[assertthat BH dplyr ggplot2 nlme Rcpp RcppEigen rstan shiny StanHeaders stringr tibble]; }; - gaston = derive2 { name="gaston"; version="1.5.6"; sha256="1bx6iqfjb9lf3vn0z7v8wjv9m7issvqsnymm4qsgl3622s6qz6rg"; depends=[Rcpp RcppEigen RcppParallel]; }; + gaston = derive2 { name="gaston"; version="1.5.7"; sha256="14z94dpln4dvgrv2w7w9ik7h6rpvbf02qhq1hqzx8c2cndzxr21i"; depends=[Rcpp RcppEigen RcppParallel]; }; + gateR = derive2 { name="gateR"; version="0.1.4"; sha256="1ify8baw5n10bbb66q7lz60m036p846msrh2hiysg6xs7fvxdayf"; depends=[fields maptools pgirmess raster sp sparr spatstat tibble]; }; gatepoints = derive2 { name="gatepoints"; version="0.1.3"; sha256="02qxxf4a6rl3l0jdgqxmzxfnqd9lh5i0q2knaxxsiz0nd74c1jg5"; depends=[]; }; + gauseR = derive2 { name="gauseR"; version="1.0"; sha256="125jjd7s9wkx93isgrr3d6bkdmdf1x7000pbj9y634wd1jx8akgd"; depends=[deSolve]; }; gaussDiff = derive2 { name="gaussDiff"; version="1.1"; sha256="0fqjdxp2ibbami75ba16d02dz4rz5sk8mni45di9anydx44g9d45"; depends=[]; }; - gausscov = derive2 { name="gausscov"; version="0.0.4"; sha256="1fq2r7ibhnq26xa3hqyshr0m85a7gzkfagi6lsr36di26ixipwh8"; depends=[]; }; + gausscov = derive2 { name="gausscov"; version="0.0.10"; sha256="05xs8wj9yak6mrp1381z0safwlm1p84dc36dc0mjbranmisxf675"; depends=[]; }; gaussfacts = derive2 { name="gaussfacts"; version="0.0.2"; sha256="095x7k7m7sy1gqkbm6wiqn26252dclz62sbnkv6cjvmbdxajl7m9"; depends=[]; }; + gaussplotR = derive2 { name="gaussplotR"; version="0.2.0"; sha256="12kz9qb78wss1lfijd3vw54i0fr8k2smsidmm2hw2d5vwzrf0bwi"; depends=[ggplot2 metR]; }; gaussquad = derive2 { name="gaussquad"; version="1.0-2"; sha256="0bcvkssmwwngcd4cnv924n9h3c8z1w3x9c9bkwn5jbz9zyv1lfms"; depends=[orthopolynom polynom]; }; + gawdis = derive2 { name="gawdis"; version="0.1.2"; sha256="0x9g8949ik4065l46k3lssnyadk0wyw816skpfqg0nv8z4hq77cz"; depends=[FD GA]; }; gazepath = derive2 { name="gazepath"; version="1.3"; sha256="1sv0vdwzmvpnj2k8lphnf4y12fi5md0j2725fjkv1n7a3dkd6faa"; depends=[jpeg scales shiny sp zoo]; }; gb = derive2 { name="gb"; version="2.3.3"; sha256="0gkdkbwr168vi7lgccla49l43rkmjcfrwlqdr65mg5syzcxrh7nh"; depends=[boot KernSmooth]; }; gbRd = derive2 { name="gbRd"; version="0.4-11"; sha256="06x97rw5i6v6cgjxkfhxnw4dn7lghn5q6ra7ri5ag1x9dkfzcl82"; depends=[]; }; - gbfs = derive2 { name="gbfs"; version="1.3.3"; sha256="14xpsbk9lcmpwf5dmwkcjdd07y2c7jb1m9c031scrzhw4p4gd71h"; depends=[curl dplyr httr jsonlite lubridate purrr readr stringr]; }; + gbeta = derive2 { name="gbeta"; version="0.1.0"; sha256="0611rynyybmiq6pj5jvwijdgx3hnr6mscv20lrqzlfplbmvmz0bj"; depends=[gsl Rcpp RcppEigen RcppNumerical Runuran]; }; + gbfs = derive2 { name="gbfs"; version="1.3.5"; sha256="0n8wjzq2ip4skipvca1sxh8wxag5fm2gd70dsjbz73gik06fdx70"; depends=[curl dplyr httr jsonlite lubridate purrr readr stringr]; }; gbm = derive2 { name="gbm"; version="2.1.8"; sha256="1h9f4ww9yc3nsvghgr2q7jjrlz29ibabxjbax1sk5wmqh2wy6pbx"; depends=[lattice survival]; }; gbm2sas = derive2 { name="gbm2sas"; version="2.1"; sha256="0ssjlv849vssmncn01ccpp2myqib5f3g88g0d4rqma2z0ivdpk23"; depends=[gbm]; }; gbp = derive2 { name="gbp"; version="0.1.0.4"; sha256="0awg724gsfwlb0fjcvw0450qdsk4m8x8is16pj5c8fx6nc8rn8bv"; depends=[data_table magrittr Rcpp RcppArmadillo rgl]; }; @@ -8464,13 +8806,14 @@ in with self; { gclus = derive2 { name="gclus"; version="1.3.2"; sha256="1cz0g0i972955hhaji30rx8448x7f3as7z1sww9i5h86ybgirilw"; depends=[cluster]; }; gcmr = derive2 { name="gcmr"; version="1.0.2"; sha256="0mh542na2byb4aha548lfkzllfnk4rmzcm23jm6642pndvxpnfmj"; depends=[betareg car Formula lmtest nlme sandwich sp]; }; gconcord = derive2 { name="gconcord"; version="0.41"; sha256="1n3pfwk6vip19q1zhbz1n164f9vi7mig8pcd07c4wxnm5ir9dagy"; depends=[]; }; + gconsensus = derive2 { name="gconsensus"; version="0.3.0"; sha256="19xfxmnxqlxbziblpr318zix0i3h84498i5vgzz5ynwdi89xyjxl"; depends=[coda MASS rjags]; }; gcookbook = derive2 { name="gcookbook"; version="2.0"; sha256="11g1q187l4j31b6cdzdx5z3s14z3s09l7ynl36pzzn9j19l8cmrc"; depends=[]; }; gdalUtilities = derive2 { name="gdalUtilities"; version="1.1.1"; sha256="11i97ahbqggd5zgr4w57ys3xmwhymbbfmd2w2yrg4riwhsbpxwyy"; depends=[raster sf]; }; gdalUtils = derive2 { name="gdalUtils"; version="2.0.3.2"; sha256="0krapdy50nd5dvcdflz39dzxpig3zklng3hgxavqg2nvwazalvsc"; depends=[foreach R_utils raster rgdal sp]; }; - gdalcubes = derive2 { name="gdalcubes"; version="0.3.0"; sha256="0qwn6hdd2f84n10vgawgfv4lkpb91ywqmzi2b945r3nbfh8d5pbl"; depends=[jsonlite ncdf4 Rcpp RcppProgress]; }; + gdalcubes = derive2 { name="gdalcubes"; version="0.3.1"; sha256="0yng7ixfwyry8f6v6zdkd1f1z8ac35n7mxwyb8ngrkb5jd6h2mcc"; depends=[jsonlite ncdf4 Rcpp RcppProgress]; }; gdata = derive2 { name="gdata"; version="2.18.0"; sha256="0zwdj7lscgxr8r62ii8hbdh4mb7sa9w4f5nv32zzrxdvymcpya2b"; depends=[gtools]; }; + gde = derive2 { name="gde"; version="0.1.4"; sha256="1ypax1gwi8f9fkfmbm5qb845b70ch44m19rw8spi34fn3yrbb17l"; depends=[data_table DBI dplyr DT ggplot2 httr jsonlite leaflet odbc progress R_utils readr rgbif shiny shinycssloaders shinyWidgets stringr XML]; }; gdiff = derive2 { name="gdiff"; version="0.2-1"; sha256="11p3xx0gmqfjyl08znmnganhif0zi1c5kbbv9qkqayjbi3j79z86"; depends=[magick pdftools]; }; - gdimap = derive2 { name="gdimap"; version="0.1-9"; sha256="0ksbpcy739bvsiwis0pzd03zb4cvbd8d5wdf8whfn9k6mkj4x9rs"; depends=[abind colorspace geometry gridExtra gsl movMF oro_nifti rgl]; }; gdistance = derive2 { name="gdistance"; version="1.3-6"; sha256="093a29yb544gxldwxgkyfc9bhmz3by0pknnj1c666i6gz2rbxjic"; depends=[igraph Matrix raster sp]; }; gdm = derive2 { name="gdm"; version="1.4.2"; sha256="1q2bmqrxlac72jdmaldf4m6cwv60aaxxqws518dcn83bs788mbcm"; depends=[doParallel foreach raster Rcpp reshape2 vegan]; }; gdmp = derive2 { name="gdmp"; version="0.2.0"; sha256="0fy8x9l6swrb78apwq9d9msz2y8dkfd2fkyp1pkmzxwdb85lmcdm"; depends=[]; }; @@ -8482,23 +8825,23 @@ in with self; { gear = derive2 { name="gear"; version="0.3.4"; sha256="0ibn2kr0rjj546cbcqhr6x69s25xh7si5fri59055j42g62mdnxy"; depends=[autoimage optimx Rcpp]; }; gee = derive2 { name="gee"; version="4.13-20"; sha256="167pzgnmj4cjc41ykps1mfwi6s7y32zxyycn5z17vn4v0pp4q0ak"; depends=[]; }; gee4 = derive2 { name="gee4"; version="0.1.0.0"; sha256="1vvzb9sc69g292zmh9djd15jgc7falypd5p7mzw6ps7mirpbnicf"; depends=[Formula Rcpp RcppArmadillo]; }; + geeCRT = derive2 { name="geeCRT"; version="0.0.1"; sha256="1ldmpc3hakk1lcikrd45v7y7a7iaf7bbnqsrp4jc80pkw7y739vi"; depends=[MASS mvtnorm rootSolve]; }; geeM = derive2 { name="geeM"; version="0.10.1"; sha256="1r9zyjv7r7r7avdqi54dvczf971frz8pgrs1a04kan5mh4ls6xpy"; depends=[Matrix]; }; geecure = derive2 { name="geecure"; version="1.0-6"; sha256="0nmnrkfgblv38qvk66bdk8933icr59mayqwljkvmpy59sm6br2k5"; depends=[geepack MASS Matrix survival]; }; - geepack = derive2 { name="geepack"; version="1.3-1"; sha256="1pyn50pn18ffnraqjb6ncgh3a70c91wq4xyy8n5bva7153556cc2"; depends=[broom magrittr MASS]; }; + geepack = derive2 { name="geepack"; version="1.3-2"; sha256="19kh0rvc961y836rfjmh1j42ygji2vp6yghl5d1agzg5yx03xdcr"; depends=[broom magrittr MASS]; }; geesmv = derive2 { name="geesmv"; version="1.3"; sha256="0gm953z8q5cc1adl3d6vj5djg2inc880zfcdl5gd56fnb5gl6h1w"; depends=[gee MASS matrixcalc nlme]; }; geex = derive2 { name="geex"; version="1.0.12"; sha256="0zqfd416wl6inr423xzxrnc0as0yrxfqy7fdjyc39i60kghfqyh3"; depends=[lme4 Matrix numDeriv rootSolve]; }; geigen = derive2 { name="geigen"; version="2.3"; sha256="0blg4w9wjprbax8z6md3285v12ajcjmcrpca52l3kd5qmxlvizy7"; depends=[]; }; geiger = derive2 { name="geiger"; version="2.0.7"; sha256="15lmgr1slak9sh35gka5wa4fszywdl9d1rqkbb2lpvfp99n7606j"; depends=[ape coda colorspace deSolve digest MASS mvtnorm ncbit phytools Rcpp subplex]; }; gelnet = derive2 { name="gelnet"; version="1.2.1"; sha256="10ygdfz9f5xhahlqb2divwvaljhiz8jhsd12wvq0qalx0v1h5j0p"; depends=[]; }; gemlog = derive2 { name="gemlog"; version="0.41"; sha256="16pdhpx21avxjrawj7i47dxzz2wfhabzz5x3nln2pwaz5b147syz"; depends=[signal]; }; - gemma2 = derive2 { name="gemma2"; version="0.1.1"; sha256="1kbjb5cjgrbdf695nz916w40a78zy5xjmr99l835iy27k3i2p61i"; depends=[Matrix readr]; }; + gemma2 = derive2 { name="gemma2"; version="0.1.3"; sha256="1l5axji33abrkm2b32ziilhfqssbq4ypv7kimd16fak6xjz50m0k"; depends=[Matrix]; }; gems = derive2 { name="gems"; version="1.1.1"; sha256="174mjnpldb0rwjvwdgpcg1acm526gs0pjf9gi5mn9d3x9yz4r5jx"; depends=[data_table MASS msm plyr]; }; - gemtc = derive2 { name="gemtc"; version="0.8-7"; sha256="1lwafhn99ndvs9skjwn8j910fjphl6pbhmbw1ni37aikgfnsdzpl"; depends=[coda forcats igraph meta plyr Rglpk rjags truncnorm]; }; + gemtc = derive2 { name="gemtc"; version="0.8-8"; sha256="1bklrfpb6aqpk9rzlzfz8gx0hfvxpdqc5xb26pw0d6vcng9vmq2v"; depends=[coda forcats igraph meta plyr Rglpk rjags truncnorm]; }; gen2stage = derive2 { name="gen2stage"; version="1.0"; sha256="16xbzgkjskzm1wik3dznvwhqddrpmcgsgd372n4a67rbb46jgx6r"; depends=[clinfun]; }; - gen3sis = derive2 { name="gen3sis"; version="1.0"; sha256="0sfdk8sr12br4r5jw4dx5biv3ss3bgnwlin9a34zx007d0dk1b03"; depends=[BH gdistance Matrix raster Rcpp sp stringr]; }; + gen3sis = derive2 { name="gen3sis"; version="1.2"; sha256="0fkcgicyr1ahsgpnmfz6pwppbxzx5yaiswgb5nk4djxla3qf10k2"; depends=[BH gdistance Matrix raster Rcpp sp stringr]; }; gen5helper = derive2 { name="gen5helper"; version="1.0.1"; sha256="0z7hisn57md18vcfb6f44hy6zzp9dirrjyxi4x1id3mqa3mligb6"; depends=[dplyr ggplot2 minpack_lm naturalsort plyr pracma rlang tidyr]; }; - genBaRcode = derive2 { name="genBaRcode"; version="1.2.3"; sha256="0vhbf0hm9b414afwvdg5w4c1x8skz3idmz9hs45hqixabkqkkfpa"; depends=[ape Biostrings dplyr futile_logger future future_apply ggnetwork ggplot2 ggraph ggseqlogo ggtree igraph network phangorn RColorBrewer reshape2 S4Vectors shiny ShortRead stringdist VennDiagram visNetwork]; }; - genBart = derive2 { name="genBart"; version="1.0.1"; sha256="12z5vj41npwawz954zqkjfmg9inh063ilh7m82pn73asrxif0ay3"; depends=[clValid data_table fastcluster ggplot2 gtools limma NMF pca3d psych qusage RColorBrewer reshape2 rmarkdown scales shiny shinydashboard shinyjs statmod stringr VennDiagram]; }; + genBaRcode = derive2 { name="genBaRcode"; version="1.2.4"; sha256="1y7rq2fvv2s7x054ribp2x6vsp8dh49dm43rhn9cp2fn4qf05f7r"; depends=[ape Biostrings dplyr futile_logger future future_apply ggnetwork ggplot2 ggraph ggseqlogo ggtree igraph network phangorn RColorBrewer reshape2 S4Vectors shiny ShortRead stringdist VennDiagram visNetwork]; }; genSurv = derive2 { name="genSurv"; version="1.0.3"; sha256="0k5rfpq603szjb76gxffvsbqcav8182h8zwvg4kar68k72yfw1xs"; depends=[]; }; genTS = derive2 { name="genTS"; version="0.1.3"; sha256="1ky8h8yzqfkb91ny9z08gr7irzvjqr1b42k89ahcrmk458hjwgqr"; depends=[shiny]; }; genalg = derive2 { name="genalg"; version="0.2.0"; sha256="1wzfamq8k5yhwbdx0wy1w5bks93brj0p890xxc4yqrja4w38ja3s"; depends=[]; }; @@ -8508,6 +8851,7 @@ in with self; { gender = derive2 { name="gender"; version="0.5.4"; sha256="0z8in0hgzkqngv2x3630lbbdw9in1qgirr01kag35bdqrdffh3d4"; depends=[dplyr httr jsonlite]; }; genderBR = derive2 { name="genderBR"; version="1.1.0"; sha256="0j5wsbv797wc48lc65yhaqhpwqyr662460vj59x7r9p7d7m1ncd0"; depends=[dplyr httr jsonlite]; }; gendist = derive2 { name="gendist"; version="2.0"; sha256="0rs0sn1sb6j3pk2xncix04a093awlm2nw70g0rjhr7dlzmigspgb"; depends=[]; }; + geneExpressionFromGEO = derive2 { name="geneExpressionFromGEO"; version="0.3"; sha256="010149xrnaxkmsxh44gjlmhrgg0b41nj10fzgqi21q1w98cks9kw"; depends=[annotate Biobase GEOquery]; }; geneHummus = derive2 { name="geneHummus"; version="1.0.11"; sha256="1m6yyjsvmn3w87cw4da8js5vi74k5y739gxdx1yscx1n50bc3m34"; depends=[curl dplyr httr rentrez stringr]; }; geneListPie = derive2 { name="geneListPie"; version="1.0"; sha256="0z2gawfzhm05dafj4zlj6ifmf0dy7p1hrpa59lzxrnrc0wr6laji"; depends=[]; }; geneNetBP = derive2 { name="geneNetBP"; version="2.0.1"; sha256="0sp1chyln5k2zsq7cdhvrqxwr2nhrll1pdl1l5g6fd4gjl2m1nwk"; depends=[bnlearn ggm gRain graph igraph Rgraphviz scales]; }; @@ -8515,10 +8859,10 @@ in with self; { genemodel = derive2 { name="genemodel"; version="1.1.0"; sha256="1x6n6k9ifv2swhyrghvm6fsz5vh85cdik8225175i9msvmkh928n"; depends=[stringr]; }; genepi = derive2 { name="genepi"; version="1.0.1"; sha256="1whhdlq9p8gmygv7464hvfz6dhm65gqq1dqls6hgpmw822zxgbd5"; depends=[]; }; genepop = derive2 { name="genepop"; version="1.1.7"; sha256="0b36nspq3kkad52k0viw1pdsf7h9h5ivi0ix7zg8i0z7vkhnm0cy"; depends=[Rcpp RcppProgress stringr]; }; - generalCorr = derive2 { name="generalCorr"; version="1.1.5"; sha256="1kjmg9paxhpd6csia69k169qgm8s388iysrjnm4bqv9zxn21zwwg"; depends=[lattice meboot np psych xtable]; }; + generalCorr = derive2 { name="generalCorr"; version="1.1.8"; sha256="008r2jrcbcm11g4klcz3qjcfqhp6grzl8l2p8kfivyygkp29h7zh"; depends=[lattice meboot np psych xtable]; }; generalhoslem = derive2 { name="generalhoslem"; version="1.3.4"; sha256="0fmfhmdb16gf3v9h50vif4f3f6bm03qq7wplnmzyxa80jb60fcc0"; depends=[MASS reshape]; }; generator = derive2 { name="generator"; version="0.1.0"; sha256="0xjvnmnpdms8rrxxcz6pd8w4rnbv3ghzqv4m63zxia2l98x7z4rf"; depends=[]; }; - generics = derive2 { name="generics"; version="0.0.2"; sha256="0xk1xhpy7gpv3pvaygzhpfdxj72zmb38pb4nscfyg2ff36vx3cvi"; depends=[]; }; + generics = derive2 { name="generics"; version="0.1.0"; sha256="0qw7r0d2qvlj1pvrlpv30d6akml624ydxkk19hv85iv6pfyx2wdb"; depends=[]; }; genero = derive2 { name="genero"; version="0.1.0"; sha256="0akwwy5xbh7s40v8dr1zr7jfglv0iyh4zn0sb0rnz4r57qr6nh8w"; depends=[]; }; genesysr = derive2 { name="genesysr"; version="1.0.0"; sha256="05jp8z7313r5wi9a5yw7fh198l7nd2ywzwg4f23yp4kfrkkgawn5"; depends=[dplyr httr jsonlite]; }; genetics = derive2 { name="genetics"; version="1.3.8.1.2"; sha256="1v0ylnia6c44v356dsmnkx6054vcxazpzsrdh3yph5ch5vg6gjrh"; depends=[combinat gdata gtools MASS mvtnorm]; }; @@ -8530,52 +8874,58 @@ in with self; { genlasso = derive2 { name="genlasso"; version="1.5"; sha256="07f0gqvngiyd3x01qxbqz7xrz10ck1cbypp51ldg8lg8ln1zw76y"; depends=[igraph Matrix]; }; genlogis = derive2 { name="genlogis"; version="1.0.0"; sha256="01av5invhviii7adqihh10ib47rjzwfsqdgw3lfg1c72kzrqywgr"; depends=[distr doParallel foreach ggplot2 manipulate]; }; geno2proteo = derive2 { name="geno2proteo"; version="0.0.3"; sha256="1q054ai42f5gmrj791abj02f663zs7ymdh3pfs3b2lq6i4w9s2fb"; depends=[BiocGenerics GenomicRanges IRanges R_utils RUnit S4Vectors]; }; - genoPlotR = derive2 { name="genoPlotR"; version="0.8.9"; sha256="07901qv2lzzflda0p8qxmla6syvq2c9y230xipvn1i0p4izdqk5s"; depends=[ade4]; }; + genoPlotR = derive2 { name="genoPlotR"; version="0.8.10"; sha256="17vlzp84vas7m9fcrjp5z6ys782kgvdljbfk559war8sgbbn4hb1"; depends=[ade4]; }; genodds = derive2 { name="genodds"; version="1.0.0"; sha256="00sh561qcabcz5igcfvkjjila0qi2i5imj8cn0msa1gvqf27ps4d"; depends=[Rcpp]; }; genogeographer = derive2 { name="genogeographer"; version="0.1.19"; sha256="0q56ysv5333i27iv1gmd9ilbgn3rw8sb9yq7z76gmn1fak5aqci8"; depends=[dplyr DT forcats ggplot2 knitr leaflet magrittr maps purrr readr rio rlang rmarkdown shiny shinycssloaders shinyjs shinyWidgets tibble tidyr]; }; genomeplot = derive2 { name="genomeplot"; version="1.0"; sha256="15v01ngxq7kxav1bhw1mvqradrmvwsad5xh9l5skivb5smh9795w"; depends=[ggplot2]; }; genomic_autocorr = derive2 { name="genomic.autocorr"; version="1.0-1"; sha256="1lidrjz1flxw4jvhqdi8y813m7ss4kkvm7bxsdpz60dxxw3204gm"; depends=[data_table magrittr reshape]; }; genomicper = derive2 { name="genomicper"; version="1.6"; sha256="12msl6syw5a3dvxg9fr1yprcpb9qwn8v2dvkpxgagal11p9q1kx7"; depends=[DBI]; }; genotypeR = derive2 { name="genotypeR"; version="0.0.1.8"; sha256="1kwzjn6hrnfizs44cz4a8qa4mdhdzqssc4axx0s6vngmkmsrffig"; depends=[colorspace doBy plyr reshape2 zoo]; }; - genpathmox = derive2 { name="genpathmox"; version="0.4"; sha256="1d5mwci52qdnkfg9pxccc5fijzpc0q80zw76sjdfsf9lixxhwk4h"; depends=[diagram mice quantreg]; }; + genpathmox = derive2 { name="genpathmox"; version="0.5"; sha256="06h8bwx2jzwc4jr4jvsjcph2svfg3s78vjmwjrliq3jynychd9mh"; depends=[diagram quantreg]; }; genpwr = derive2 { name="genpwr"; version="1.0.2"; sha256="0k05l0d2qk2g3ic6f46xkhgy8ziwalrfx4nc0qi2k7i44kz720mg"; depends=[ggplot2 MASS nleqslv]; }; genridge = derive2 { name="genridge"; version="0.6.7"; sha256="07mdkkq4j8i5x8d4yfsp2rfpf7gkcgdcsw9b2ng5f7gdnblrw0dr"; depends=[car]; }; genscore = derive2 { name="genscore"; version="1.0.2"; sha256="0i1wg65cpyc7x1h8dbq0i6q8979lw15zhmn7zn1r8gj3nxl7my0b"; depends=[mvtnorm Rdpack stringr tmvtnorm]; }; - gensemble = derive2 { name="gensemble"; version="1.0.1"; sha256="03ql1qxrxixr70hs9mwiqw92qyrg9pj4046pb42g435yncw321ad"; depends=[]; }; + genset = derive2 { name="genset"; version="0.1.0"; sha256="02zldi136sfnq1i8pwb3b97zd44pjdgnfadk4bqp36wm8x95phwi"; depends=[]; }; gensphere = derive2 { name="gensphere"; version="1.1"; sha256="1xzli40fw94n89cv2qyb321csad1w9zidqc226wlifl2m44cw6f7"; depends=[geometry mvmesh rgl SimplicialCubature SphericalCubature]; }; - gensvm = derive2 { name="gensvm"; version="0.1.3"; sha256="1r9vd6h3divmjd73p3541mngv452v1dkxc41q7mbkd5qhy34km74"; depends=[]; }; + gensvm = derive2 { name="gensvm"; version="0.1.5"; sha256="1r0f3l6df1sn3vx5sjssx8p35lw100q0qz6v1fckdfw04z53g4im"; depends=[]; }; geoBayes = derive2 { name="geoBayes"; version="0.6.3"; sha256="153a7kp73wxm5hzzq038p3mnykhakv0c9qa8fpbjijccmbi89970"; depends=[coda optimr sp]; }; + geoFKF = derive2 { name="geoFKF"; version="0.1.0"; sha256="0fapxfckyhgs1lzaviicnrhmjzdlkxfg2ccn46zcrybqq995g9js"; depends=[numDeriv Rcpp RcppArmadillo]; }; geoGAM = derive2 { name="geoGAM"; version="0.1-2"; sha256="0q09pk2npn4hjymklwfrhz2ybmjpcb6kvqkpn9l3a6cdjgk6bkmj"; depends=[grpreg MASS mboost mgcv]; }; geoR = derive2 { name="geoR"; version="1.8-1"; sha256="1lvgkpvv4a05lsb1dgphpv733lxbpcj7p2bj1yjjbfch8n04f1lr"; depends=[MASS RandomFields sp splancs]; }; geoSpectral = derive2 { name="geoSpectral"; version="0.17.5"; sha256="0bw8mv1kq27hql37zcalz3zjj57bhs7g724wfpvzav2rlzvs8n7f"; depends=[dplyr leaflet maps plotly rbokeh rgdal sp spacetime xts]; }; geoTS = derive2 { name="geoTS"; version="0.1.3"; sha256="12v50r2ym3nb21sskq7h4xsk6nzci06l9iync2ny91iwl7c9nrjc"; depends=[doParallel ff foreach iterators raster sp]; }; geoaxe = derive2 { name="geoaxe"; version="0.1.0"; sha256="043y7kb24hp66j7pnpqsdixvdmppwp72y8i4f8q7xrkhaqlfb93v"; depends=[jsonlite rgeos sp]; }; - geobr = derive2 { name="geobr"; version="1.3"; sha256="0xgjlpxpdkh46gv4pz91hq1q6hxz1ikbfqh5g3xrzwf58hw6mz7h"; depends=[httr readr sf]; }; + geobr = derive2 { name="geobr"; version="1.4"; sha256="0507p6iy8jry6yic4ijiqymk92har6585z6qd7lp6g8rr48r94ws"; depends=[httr readr sf]; }; geocacheR = derive2 { name="geocacheR"; version="0.1.0"; sha256="04ckxmird6n179xvsx50cjdz046igjxxqdnz5pfxi8pdklnky20c"; depends=[dplyr magrittr stringr threewords tibble]; }; geodaData = derive2 { name="geodaData"; version="0.1.0"; sha256="003m5wff0q4fdlg64qispmhj2aw83isxg3ijxwkwhvi33bpwpq4z"; depends=[]; }; geodetector = derive2 { name="geodetector"; version="1.0-4"; sha256="00zyx68jjl4mldah8mxfvwvv5yfkd4f1s2rlx6fsw6h8y2cwzj3l"; depends=[maptools rgdal rgeos sp]; }; - geodist = derive2 { name="geodist"; version="0.0.4"; sha256="1hgc5dhb8knharx1v09rw1cppkvc1sc0w8wjf4d17b6nw3b3j9gq"; depends=[]; }; - geodiv = derive2 { name="geodiv"; version="0.1.1"; sha256="0vww273947isk9ds6hjg9k47k8kbsbgyjap6iqgqyd9bl9437yrm"; depends=[dplyr e1071 phonTools pracma raster Rcpp RcppArmadillo rgdal rgeos sf sp spatial tibble zoo]; }; - geodrawr = derive2 { name="geodrawr"; version="1.0.1"; sha256="1kbhbdmzp6gc861592xs9kbi1qrsfwq9lk2hbmlavajvil8zv445"; depends=[leaflet sf shiny shinydashboard]; }; + geodimension = derive2 { name="geodimension"; version="1.0.0"; sha256="0mh16cdac7vi8zv98g3s06109fpadan441zd80x9yfsypx75sdz0"; depends=[dplyr generics magrittr pander readr rlang sf tibble tidyr tidyselect]; }; + geodist = derive2 { name="geodist"; version="0.0.6"; sha256="1fc5gi8076j0hylcbbcwgf7syqgnqsj1p9sn655paixjsipm5ixq"; depends=[]; }; + geodiv = derive2 { name="geodiv"; version="0.2.0"; sha256="173vi6zix358i06dimj8p16ph3jq0ddzi1ls4pv9qh0lk7x3a9ky"; depends=[dplyr e1071 phonTools pracma raster Rcpp RcppArmadillo rgdal rgeos sf sp spatial tibble zoo]; }; + geodrawr = derive2 { name="geodrawr"; version="2.0.0"; sha256="05irfyfpk5lgsh0wax8dqdyfw4prynxz1bhs9k1nrz8yn2dd0imn"; depends=[leaflet sf shiny shinydashboard]; }; geoelectrics = derive2 { name="geoelectrics"; version="0.2.0"; sha256="1dmpaf16750ni4yr36cglfz9pv9jax8jxb3kwn47kxgnx3l8qq98"; depends=[fields lattice rgl]; }; + geofabrik = derive2 { name="geofabrik"; version="0.1.0"; sha256="0k92gmivccw3kbgkb9bjw7pxc4zc3zdj35x0cbzmjq0k3qxq8ad0"; depends=[]; }; geofacet = derive2 { name="geofacet"; version="0.2.0"; sha256="1aylx2hwqk75y73az1zf0s5mjww77d7i9kafbkzw383f0i5qx42w"; depends=[geogrid ggplot2 ggrepel gridExtra gtable imguR rnaturalearth sf sp]; }; geofd = derive2 { name="geofd"; version="2.0"; sha256="1rsgy4nxfp1gi4vwh8zfzksr6sr2ga31kmd56q5m56gw530570ra"; depends=[fda]; }; + geogenr = derive2 { name="geogenr"; version="1.0.0"; sha256="1qik37ns50pq4dvlj6irmls0pwgsw1dl54azdwfkqybkx95g0n7m"; depends=[data_table dplyr generics geomultistar httr magrittr pander purrr readr rlang sf snakecase starschemar stringr tibble tidyr tidyselect tm]; }; geogrid = derive2 { name="geogrid"; version="0.1.1"; sha256="0b8afwgj9x56z6zh525y7qkiwbv77mjcw3v19kfba0426jn4vi87"; depends=[Rcpp RcppArmadillo rgeos sf sp]; }; geohashTools = derive2 { name="geohashTools"; version="0.3.1"; sha256="0ks6ga1vsp5z7sy0xcq9nacffmfsx6yqdlnhqflsb8zb9qbygazf"; depends=[]; }; geojson = derive2 { name="geojson"; version="0.3.4"; sha256="0fvlw06hjb7z0mfsf8vhv1dchdjlvklyzjqlaydjzbwb1kvbhpq7"; depends=[jqr jsonlite lazyeval magrittr protolite sp]; }; geojsonR = derive2 { name="geojsonR"; version="1.0.8"; sha256="015g1xpvbwgng5vh79q8gx6900skv3p7s2v3xbka08qllvsg5by1"; depends=[R6 Rcpp RcppArmadillo]; }; geojsonio = derive2 { name="geojsonio"; version="0.9.2"; sha256="1m315vr0vw60g6j5i7x293szhji3d4p7f54hxmz1aqw4y7fkr8f6"; depends=[crul geojson jqr jsonlite magrittr maptools readr rgeos sf sp V8]; }; geojsonlint = derive2 { name="geojsonlint"; version="0.4.0"; sha256="0l6xlf6l9shyvdd2ghkhcgbkxpmycapfpxakzbvd92j1x8dmr9az"; depends=[crul jsonlite jsonvalidate V8]; }; - geojsonsf = derive2 { name="geojsonsf"; version="2.0.0"; sha256="12b3kj63ah9hq4h69qky53iajj3i28h8b9gsw7dz7ykpli275bml"; depends=[jsonify rapidjsonr Rcpp sfheaders]; }; + geojsonsf = derive2 { name="geojsonsf"; version="2.0.1"; sha256="1gxzi0wqmrif6bkw7z21aa2j8i0bd7a5nyyrkjiybv7v7d1l1ps2"; depends=[geometries jsonify rapidjsonr Rcpp sfheaders]; }; geoknife = derive2 { name="geoknife"; version="1.6.4"; sha256="026lgxklrf73zfc9j4x4as8f0dbyq5j2prnkg2r570i6xic70bsy"; depends=[curl httr progress sp whisker xml2]; }; geomapdata = derive2 { name="geomapdata"; version="1.0-4"; sha256="1g89msnav87kim32xxbayqcx1v4439x4fsmc8xhlvq4jwlhd5xxw"; depends=[]; }; geomedb = derive2 { name="geomedb"; version="2.0.1"; sha256="1l35c9x1mhqd7z5ragd7w3ay8v2fdnbmbfx9grwi622j8yz1fbmq"; depends=[ape httr jsonlite]; }; geomerge = derive2 { name="geomerge"; version="0.3.2"; sha256="1i6n88k8icwihr9w7ipjb50f68zad602dipb3hd887y4kyf14wni"; depends=[geosphere ggplot2 gridExtra inlmisc lubridate raster scales sp spdep]; }; geometa = derive2 { name="geometa"; version="0.6-3"; sha256="0bj1yg1wfcvq24w85cim6hx8qpi2hj7frdz1fwzhlnxnwkwyk8ip"; depends=[httr jsonlite R6 XML]; }; geometr = derive2 { name="geometr"; version="0.2.5"; sha256="1rsymlszy452bips1rfpr8crsbw4wlm7m83j68n1f5i3m70qp1d1"; depends=[checkmate crayon deldir dplyr raster Rcpp readr rgdal rlang sf sp spatstat tibble]; }; - geometries = derive2 { name="geometries"; version="0.1.0"; sha256="07gkr4ajbvhgf2b4smcm4aqngprsfqmpb2zqgpw18627q1bwx5z6"; depends=[Rcpp]; }; + geometries = derive2 { name="geometries"; version="0.2.0"; sha256="05036q4dccmmd955g4n2s5ncc9zxd9v9qyamszszwn147i7hkxcc"; depends=[Rcpp]; }; geometry = derive2 { name="geometry"; version="0.4.5"; sha256="1n10l8ax3783v3lgaacb15qsn8b3f0wpmhg3k39j31s6ciyd3vcg"; depends=[linprog lpSolve magic Rcpp RcppProgress]; }; + geomnet = derive2 { name="geomnet"; version="0.3.1"; sha256="0m5qkbxbrx39v9pwh74c01g8abqwbmphk38h3yxgslyqsrpnpn4l"; depends=[dplyr ggplot2 network plotly readr sna tidyr]; }; geomorph = derive2 { name="geomorph"; version="3.3.1"; sha256="1pj67f329j4zaan4paa9xp0d3cfd00bvs1al8356niz9sc373l4l"; depends=[ape jpeg rgl RRPP]; }; + geomultistar = derive2 { name="geomultistar"; version="1.1.0"; sha256="1cgka5gx5hkj0y6mdkl2hn13x508nn8xkw2jn5d41nr6xii3axp0"; depends=[dplyr magrittr pander rgdal rlang RSQLite sf snakecase starschemar stringr tibble tidyr tidyselect]; }; geonames = derive2 { name="geonames"; version="0.999"; sha256="0yz1b7y3vwa4izrhpry4n3iwzb7y67s5p3kgnd7d29cl5pcbpmqx"; depends=[rjson]; }; geonapi = derive2 { name="geonapi"; version="0.4"; sha256="045lrj5qmd3m2ja8i9446d7vz8lmdz8wvm4f3a72cm18xaan1m2p"; depends=[geometa httr keyring openssl R6 XML]; }; geonetwork = derive2 { name="geonetwork"; version="0.3"; sha256="0qjnv91rcxzw44fmbgm4qpcrbj5qgz1lgmyw53imyhxgyv55awxv"; depends=[geosphere igraph rgdal sf sp]; }; @@ -8595,40 +8945,49 @@ in with self; { geotools = derive2 { name="geotools"; version="0.1"; sha256="0d0vf9dvrrv68ivssp58qzaj8vra26ms33my097jmzmgagwy1spd"; depends=[]; }; geotoolsR = derive2 { name="geotoolsR"; version="1.1"; sha256="162s37j7wh14h91b6acn453bvgpk3cakfi7mgrdvr5bjdqqn7j7v"; depends=[dplyr geoR ggplot2 tidyr]; }; geotopbricks = derive2 { name="geotopbricks"; version="1.5.4"; sha256="1mn15mchxkv9qqjrcsyx0pf56sdz0ba7i5jd1ci1ilr6rig81ckz"; depends=[raster rgdal stringr zoo]; }; - geouy = derive2 { name="geouy"; version="0.2.2"; sha256="1wpa6sc4xgf6lwq5a7804fb07fgpx6d5k323dqkaj1nyaaf7mq5c"; depends=[assertthat dplyr fs ggplot2 ggspatial ggthemes glue magrittr RCurl rlang sf stringr testthat viridis]; }; + geouy = derive2 { name="geouy"; version="0.2.3"; sha256="11jxy73f53wlwnnzhm3d3yfvf3kbh6lnpl5c94amfqvf79k9m9vi"; depends=[assertthat dplyr fs ggplot2 ggspatial ggthemes glue magrittr RCurl rlang sf stringr testthat viridis]; }; geoviz = derive2 { name="geoviz"; version="0.2.2"; sha256="1wx1p72532xpg6y3rlrvaiwx57xad3d9fvy9mbadvj418xwxnmim"; depends=[abind chron curl dplyr ggplot2 glue magrittr png progress purrr raster readr rgdal rgeos rgl rlang sf slippymath sp stringr tibble tidyr]; }; geozoning = derive2 { name="geozoning"; version="1.0.0"; sha256="0cqdi2jgqrxc339qkr57dp11jp40x99f9inwamnh7ymg2q7kq14s"; depends=[deldir fields ggplot2 gstat maptools RandomFields raster rgeos sp]; }; geozoo = derive2 { name="geozoo"; version="0.5.1"; sha256="0g91yhg7zw1bp0lxxblr2irckjg2rl4pg1vgglccnmxkzn0ji2qi"; depends=[bitops]; }; gepaf = derive2 { name="gepaf"; version="0.1.1"; sha256="0n36w40jrq3qkgmhz9wrnhp6fczw7bm96g950sa4nq33872xhfgm"; depends=[bitops]; }; germanpolls = derive2 { name="germanpolls"; version="0.3"; sha256="1ck3klc8925mpnrplxpvz376avivil1w0jzcrrlgssawyvfbhgc8"; depends=[dplyr magrittr purrr RCurl readr xml2]; }; germinationmetrics = derive2 { name="germinationmetrics"; version="0.1.4"; sha256="17183i7nylvrh8rz916q7xg1k9c8z7z03knpisnrcasa49s07mqq"; depends=[broom data_table ggplot2 ggrepel mathjaxr minpack_lm plyr Rdpack]; }; - gert = derive2 { name="gert"; version="0.3"; sha256="0caxjcdc2karsxasivkh5sasjkzlif25pw0whdjyq6zh3bvmdlkp"; depends=[askpass credentials openssl]; }; + gert = derive2 { name="gert"; version="1.0.2"; sha256="1lq4hgv2727lwcv8vha5af26nslj99rjxjrgflshmmcihawpls1n"; depends=[askpass credentials openssl rstudioapi zip]; }; gesca = derive2 { name="gesca"; version="1.0.4"; sha256="1ndn8wgp22pr017x6v7jw8jy4gd06x8110qa860hw8i6pn47wfwv"; depends=[]; }; gesisdata = derive2 { name="gesisdata"; version="0.1.0"; sha256="02xjpw41gm3778lj01kcwjx0lr1i95a0wlrfvs0r5xlajq13jr67"; depends=[dplyr magrittr rio RSelenium stringr]; }; gestalt = derive2 { name="gestalt"; version="0.1.8"; sha256="1cb04rd3yvkd47byynrn0pq6brlsi2z2iavh4gfrwmqyvks34k51"; depends=[rlang]; }; gestate = derive2 { name="gestate"; version="1.4.0"; sha256="1ybwi1733w8z97sdj38l66mb8ynhqhl68ijns6rvwqxphac6v5x8"; depends=[doParallel foreach shiny shinythemes survival]; }; - getCRUCLdata = derive2 { name="getCRUCLdata"; version="0.3.1"; sha256="1961w8vpgamna5a9m367mc9szl3vlv8wgmbhfjc0yxp818p07g3a"; depends=[curl data_table hoardr raster tibble]; }; + gesttools = derive2 { name="gesttools"; version="1.0.1"; sha256="1kyhmzdzviyx2d52342xnblikvpv04q71fjix9mx2ysb1xbb4yxa"; depends=[DataCombine geeM magrittr nnet rsample tibble tidyr tidyselect]; }; + getCRUCLdata = derive2 { name="getCRUCLdata"; version="0.3.2"; sha256="1z7j4zypxlj17q0qjpzhmrcg6qv848nbbfz1m0rhv1b1bd3qwgsq"; depends=[curl data_table hoardr raster tibble]; }; + getDTeval = derive2 { name="getDTeval"; version="0.0.1"; sha256="0viifs5n6hrns313ihgdbxcmsnl666bqbd0x30i4y6qmc2wqn2fs"; depends=[data_table microbenchmark]; }; getLattes = derive2 { name="getLattes"; version="0.1.1"; sha256="0c6sbvpk3gy0x9d3pxk1z98q6jid5xdylp8zg2f6ba7nw6yyv5cm"; depends=[dplyr pipeR rlang rlist stringi stringr tibble XML]; }; getMet = derive2 { name="getMet"; version="0.3.2"; sha256="0j1h1vy8rd7czpnb4msdb9k560pnh7kjkmpqqwzwin2ms1c0mggb"; depends=[EcoHydRology jsonlite]; }; getPass = derive2 { name="getPass"; version="0.2-2"; sha256="03ydafhh0sk3rcnpr3paajyji64x2ddp6p814p9mvbmyrblcgzcc"; depends=[rstudioapi]; }; getProxy = derive2 { name="getProxy"; version="1.12"; sha256="0qcxihgwy3h2b98z2hwjszwqbz117d89xjys7fy0f8m9hv7rf6ph"; depends=[bitops data_table dplyr httr jsonlite RCurl]; }; - getTBinR = derive2 { name="getTBinR"; version="0.7.1"; sha256="0hmqx6cqkp8k6i2mvky6i1iqxgflyr0mdf8lnl9ss4m15h38l5w3"; depends=[data_table dplyr ggplot2 ggthemes magrittr plotly purrr rlang scales tibble tidyr viridis]; }; + getable = derive2 { name="getable"; version="1.0.3"; sha256="0v45nqpx55vbj68gj4wxr0bdlrl897ayac78rxjd2lkkjx49hlyh"; depends=[knitr]; }; gethr = derive2 { name="gethr"; version="0.1.0"; sha256="0kpi9b9yg2nh332zkml24pmj6vgjfh8mrfjjg5a636s2rg98g5g7"; depends=[httr jsonlite]; }; getlandsat = derive2 { name="getlandsat"; version="0.2.0"; sha256="15450v93lc4i2qda0zlb5vplwbarkmf3f6sb4rlrdpv9vlj85hff"; depends=[crul data_table rappdirs readr tibble xml2]; }; getmstatistic = derive2 { name="getmstatistic"; version="0.2.1"; sha256="0jbg668kwkvnzgk6678w000mijch28ni9rr5b9c1l9icwcsphmlc"; depends=[ggplot2 gridExtra gtable metafor psych stargazer]; }; getopt = derive2 { name="getopt"; version="1.20.3"; sha256="0zzmzgwl9a4y3s34600vmih22d6y32294f9bvxrnmffnvkgmy7sk"; depends=[]; }; - gets = derive2 { name="gets"; version="0.25"; sha256="1l4girvj3f0m9d1f06m4rrfh2ysyjcibhhi7yqv5jj60mbyplf0d"; depends=[zoo]; }; + gets = derive2 { name="gets"; version="0.26"; sha256="1y24d2div0nky53qprac1aq4y0i1bnvn16wqslam1r04lzzjcg21"; depends=[zoo]; }; getspres = derive2 { name="getspres"; version="0.1.1"; sha256="1k69b7by1398pc9knp97r3k6pv8hixzianqal71ggdrwsb3n1gis"; depends=[colorRamps colorspace dplyr metafor plotrix RColorBrewer]; }; gettz = derive2 { name="gettz"; version="0.0.4"; sha256="1j83pdny3phfflkdjwiflyfvighn73pysw5bac4hx079dda8k25g"; depends=[]; }; gexp = derive2 { name="gexp"; version="1.0-1"; sha256="1i3sarsawax1landjbm8gxrcrimwzdgrbybzipqwxdrmlgvxslqk"; depends=[jpeg mvtnorm png]; }; + gfboost = derive2 { name="gfboost"; version="0.1.0"; sha256="07rdgf2i908ihqzq0gjp414gwvikbxfyj6j4nvz8l4krs32avl87"; depends=[mboost mvtnorm pcaPP]; }; gfcanalysis = derive2 { name="gfcanalysis"; version="1.6.0"; sha256="0w0r4w570dp7n5ixm7qv3x1pw478dghqbyfvfxfi99f5453jdma1"; depends=[animation geosphere ggplot2 plyr raster rasterVis RCurl rgdal rgeos sp stringr]; }; gfer = derive2 { name="gfer"; version="0.1.10"; sha256="1y0ra8k7zka43ibiii16vbwnc3m1i77yc9zj8rhzhmvhajjwad3l"; depends=[circlize data_table ggplot2 ggrepel googlesheets gsheet httr jsonlite rvest scatterpie stringi tidyr V8 xml2]; }; + gfiExtremes = derive2 { name="gfiExtremes"; version="1.0.0"; sha256="1ys7vrd5kpyqj42m384r2b91w53rlx6hcznpb0a0mnniqj4wc61r"; depends=[BH coda doParallel foreach Rcpp RcppArmadillo]; }; + gfiUltra = derive2 { name="gfiUltra"; version="1.0.0"; sha256="1n6sp7h0ys92mqixznrs2j8kmban3mx8swrwdpxgxc6vxycky8d8"; depends=[lazyeval mvtnorm SIS]; }; + gfilinreg = derive2 { name="gfilinreg"; version="1.0.0"; sha256="18mmnaj8x2l0qy4b4gy2ia56532qpz34b5g21sraz1jg6q07xrfq"; depends=[arrangements BH data_table EigenR lazyeval Rcpp RcppEigen spatstat]; }; + gfilmm = derive2 { name="gfilmm"; version="2.0.2"; sha256="1zjm2cfbc103k7hk2q3cdv8xsdpgad7byd24zqlxj9h60pjrwhcb"; depends=[forcats lazyeval Matrix Rcpp RcppEigen rgr spatstat]; }; gfmR = derive2 { name="gfmR"; version="1.1-0"; sha256="0qzzbcra1fnbp0h31b1as20yhmqmi7p62xrhikj64an9avg9b277"; depends=[faraway nnet]; }; gfoRmula = derive2 { name="gfoRmula"; version="0.3.1"; sha256="1y1k5zwv06kc6qk7ki7x7c1618irvwd6iw26gs5n8lv8z3cifqmy"; depends=[data_table ggplot2 ggpubr nnet progress stringr survival truncnorm truncreg]; }; gfonts = derive2 { name="gfonts"; version="0.1.1"; sha256="1nkg4mfmgysk0ibzyb4h3qqxwhb5m84n8ykk6v5hz087yarac32x"; depends=[crul glue htmltools jsonlite shiny usethis]; }; + gfpop = derive2 { name="gfpop"; version="1.0.2"; sha256="1qypzrgfpwh4wbk3x1l8jv64i684v5y0dbwjg8f3kbd0xmhjb4aw"; depends=[Rcpp]; }; gg_gap = derive2 { name="gg.gap"; version="1.3"; sha256="0m66050ryn31xmsmmikjsssllasvjdmp9yjbwfdwfpwdv106zn9h"; depends=[cowplot ggplot2]; }; ggBubbles = derive2 { name="ggBubbles"; version="0.1.4"; sha256="116rl8j0s9xwhh9jl5yj9fspkhv2zrirbx9247hhns9ngrdn4i3x"; depends=[dplyr ggplot2]; }; ggChernoff = derive2 { name="ggChernoff"; version="0.2.0"; sha256="09bh9isvx3hwwvg72fv6z3fvp8dimpbhvbp328z8amq8jjhph4vf"; depends=[ggplot2 scales]; }; + ggDCA = derive2 { name="ggDCA"; version="1.1"; sha256="0jpg7n6nk2jgq668ff0l9zk26zk39abc74f6w5x8gf4zsb8y0zp9"; depends=[base_rms do ggplot2 rms set survival]; }; ggExtra = derive2 { name="ggExtra"; version="0.9"; sha256="18mbi6gblqmrsciad1d2c9ngllk6mayaqj43k40hjq9ydqnvjbgj"; depends=[colourpicker ggplot2 gtable miniUI R6 scales shiny shinyjs]; }; ggPMX = derive2 { name="ggPMX"; version="1.1.2"; sha256="1lcfjj6k4y69zs0zr3xf3l2hz8mdjw0wqbw5p8mqjm24qkynqb9a"; depends=[assertthat data_table GGally ggplot2 gtable knitr magrittr R6 rmarkdown stringr yaml zoo]; }; ggQC = derive2 { name="ggQC"; version="0.0.31"; sha256="1j9cs97hcj5zmqvn5rjr3gl0b9748s3pv2nb7v66dsyjdwvj7wyy"; depends=[dplyr ggplot2 tidyr]; }; @@ -8640,10 +8999,10 @@ in with self; { ggTimeSeries = derive2 { name="ggTimeSeries"; version="1.0.1"; sha256="12gi0zfl8g3x78skpkhska8b3z1pp636shrbx33rkq0iacsipqga"; depends=[data_table ggplot2]; }; ggVennDiagram = derive2 { name="ggVennDiagram"; version="0.3"; sha256="1jgxzb3iffhx6xyn14nldljkaangdvzrxzfkibsb6g787fgv8ng9"; depends=[dplyr ggplot2 sf VennDiagram]; }; ggallin = derive2 { name="ggallin"; version="0.1.1"; sha256="0hrxa7m07ppvnndivxcgxksdyblb6fw17aw46maqavlvcrz3fjgm"; depends=[ggplot2 scales]; }; - ggalluvial = derive2 { name="ggalluvial"; version="0.12.1"; sha256="0i3bbv841rpad1n45jd34n4vgh7w70m2njhcyx136y1r72z7nz0n"; depends=[dplyr ggplot2 lazyeval rlang tidyr tidyselect]; }; + ggalluvial = derive2 { name="ggalluvial"; version="0.12.3"; sha256="0mkan9gxg3yxjism22yxbhvlh2lh7wpbrqpb355za790prcmjbh3"; depends=[dplyr ggplot2 lazyeval rlang tidyr tidyselect]; }; ggalt = derive2 { name="ggalt"; version="0.4.0"; sha256="0ssa274d41vhd6crzjz7jqzbwgnjimxwxl23p2cx35aqs5wdfjpc"; depends=[ash dplyr extrafont ggplot2 gtable KernSmooth maps MASS plotly proj4 RColorBrewer scales tibble]; }; ggamma = derive2 { name="ggamma"; version="1.0.1"; sha256="1zc4p2bz4pxqycrzgb9wwl53lxqcikxsihna6ff8pmw1n623j85z"; depends=[]; }; - gganimate = derive2 { name="gganimate"; version="1.0.6"; sha256="0xpa18k7v5k284g7hcpyc1hi2q6962i1j7i3j4g4b5c259gz4crn"; depends=[ggplot2 glue plyr progress rlang scales stringi tweenr]; }; + gganimate = derive2 { name="gganimate"; version="1.0.7"; sha256="046v6j92xxgaghsnh88dy5h8x040qsfa8csvhp4dmsfmrrf0dz0f"; depends=[ggplot2 glue plyr progress rlang scales stringi tweenr]; }; ggasym = derive2 { name="ggasym"; version="0.1.5"; sha256="1fc0vrkg57h9qqyrfwwippq7yy172g1w79cdb672myjxfjpnxwp4"; depends=[dplyr ggplot2 magrittr purrr rlang scales stringr tibble tidyr]; }; ggbeeswarm = derive2 { name="ggbeeswarm"; version="0.6.0"; sha256="0crk29p5vi1r3a988kms4y7r0iqwgwzsikgvh18r9wbzyr98bb5v"; depends=[beeswarm ggplot2 vipor]; }; ggbuildr = derive2 { name="ggbuildr"; version="0.1.0"; sha256="0pld635v6fv46ky7s4icwxlcnr7z6bp5ikf20adpkljwhy0wwxak"; depends=[ggplot2 purrr readr]; }; @@ -8653,14 +9012,14 @@ in with self; { ggcorrplot = derive2 { name="ggcorrplot"; version="0.1.3"; sha256="0hi9lz121ya1l2lbm7rqlxg6fs6bvxck396dngnidrhl5fvqb41b"; depends=[ggplot2 reshape2]; }; ggdag = derive2 { name="ggdag"; version="0.2.2"; sha256="0gv7gf2bbrd0m1hjvk6j39ckyvxn5lj749q4fzlzzc5mxr3qdfyz"; depends=[dagitty dplyr forcats ggplot2 ggraph ggrepel igraph magrittr pillar purrr stringr tibble tidygraph]; }; ggdark = derive2 { name="ggdark"; version="0.2.1"; sha256="1w93g2j4g45x9s841v9zi18lxzda81ipa13fajqc6p9xk8frvgrf"; depends=[ggplot2]; }; - ggdemetra = derive2 { name="ggdemetra"; version="0.2.1"; sha256="1d5adnamv2gnnj3q8779brl827d2zbqpkgfz2r097jndy5ng1021"; depends=[ggplot2 ggrepel gridExtra RJDemetra]; }; - ggdendro = derive2 { name="ggdendro"; version="0.1.21"; sha256="0jcjdkhd3wirjgv4v3gb9rw8idyymwhwnxplg3wi8wa3mwr9rhq2"; depends=[ggplot2 MASS]; }; - ggdist = derive2 { name="ggdist"; version="2.2.0"; sha256="1crncf4zi00c42n8f83psqz4avrw83madq5z0gxc8014nm069183"; depends=[distributional dplyr forcats ggplot2 HDInterval purrr rlang scales tibble tidyr vctrs]; }; + ggdemetra = derive2 { name="ggdemetra"; version="0.2.2"; sha256="1j0nwmv2acyrkpn230jj6yf5nnl40kpqdqaglrnrfqw5rp357krp"; depends=[ggplot2 ggrepel gridExtra RJDemetra]; }; + ggdendro = derive2 { name="ggdendro"; version="0.1.22"; sha256="0skbj487b6f6pj2iz4yq2b9gbgb39cv5dyzhdl3w7ay1k0s5z9ph"; depends=[ggplot2 MASS]; }; + ggdist = derive2 { name="ggdist"; version="2.3.0"; sha256="1lsmja1plrwf1wl87wj8czjr2217mzvs6amd9pxgagrbw8qrqf0h"; depends=[distributional dplyr fda forcats ggplot2 HDInterval purrr rlang scales tibble tidyr tidyselect vctrs]; }; ggdmc = derive2 { name="ggdmc"; version="0.2.6.0"; sha256="1gncv7npl548k3zd41x2gwg5qywn5rp6zb4i7ga78sy77mvi3x92"; depends=[coda data_table ggplot2 matrixStats Rcpp RcppArmadillo]; }; - gge = derive2 { name="gge"; version="1.5"; sha256="19jh769yy8dm0z2gw6kqi08rpbbdc4rsb2l9lfh5g3ma7yk0ija9"; depends=[nipals reshape2 rgl]; }; + gge = derive2 { name="gge"; version="1.6"; sha256="0l5xhbn3wdvsmr8gavj8r3yn8mcfw21pmzdfy4wygqa6jamcsr59"; depends=[nipals reshape2]; }; ggeasy = derive2 { name="ggeasy"; version="0.1.2"; sha256="06rynzv6vqngay5cjrig550dfada66075qs69l4rpfqci0vh05km"; depends=[ggplot2 rlang]; }; ggedit = derive2 { name="ggedit"; version="0.3.1"; sha256="10fbjqq6l7wfibi65mq423w7v8gymr541if749qhsnd9b2jyhaj5"; depends=[colourpicker dplyr ggplot2 magrittr miniUI plyr purrr rlang rstudioapi scales shiny shinyAce shinyBS tidyr]; }; - ggeffects = derive2 { name="ggeffects"; version="0.15.1"; sha256="12z58casz0yl1w7nfs64bz4miz0mmc300ap3rz4d2cc4z0rg0r47"; depends=[insight MASS sjlabelled]; }; + ggeffects = derive2 { name="ggeffects"; version="1.0.1"; sha256="1c5rvycaqp7zp1j6j17c84v8nlpi0w7bhfxmcha4n37m0snk1kgy"; depends=[insight MASS sjlabelled]; }; ggenealogy = derive2 { name="ggenealogy"; version="1.0.1"; sha256="19six9ln1yaqv268abm9qvb61nl8zdz3gghwr8hmwsa94xwhzhkq"; depends=[ggplot2 igraph plotly plyr reshape2 tibble]; }; ggetho = derive2 { name="ggetho"; version="0.3.6"; sha256="1iv0vad8y85bvz8rx0flqyrb38d79j9fhmd6ay5siyccigi88clj"; depends=[behavr data_table ggplot2 labeling rlang scales stringr]; }; ggfan = derive2 { name="ggfan"; version="0.1.3"; sha256="1p3hbznpsaznlk0lnjyazc130www0p5919qplg3kspng7qh8p22w"; depends=[colorspace dplyr ggplot2 rstan]; }; @@ -8668,35 +9027,38 @@ in with self; { ggfocus = derive2 { name="ggfocus"; version="1.0.0"; sha256="03q0rz7flm8sc8hrlkcm5fz66qiyxb8z8q4bh9dglhw0jc8q1fvb"; depends=[dplyr ggplot2 magrittr RColorBrewer rlang]; }; ggforce = derive2 { name="ggforce"; version="0.3.2"; sha256="1lplxyq5bgx90dgaimhynpcywag1gp6vlsy7q52ay1nfc35qmkjc"; depends=[ggplot2 gtable MASS polyclip Rcpp RcppEigen rlang scales tidyselect tweenr withr]; }; ggformula = derive2 { name="ggformula"; version="0.9.4"; sha256="04vdhg1bbc1psrx9ggaphz7cx4fw5xsmhkqpqfcg2w4ba2bjy46f"; depends=[ggforce ggplot2 ggstance magrittr mosaicCore rlang stringr tibble]; }; - ggfortify = derive2 { name="ggfortify"; version="0.4.10"; sha256="0wmcwp63h90v3f00ixszvis4z28im621jickvc0wgi6qvjvnayq0"; depends=[dplyr ggplot2 gridExtra scales stringr tibble tidyr]; }; - gggenes = derive2 { name="gggenes"; version="0.4.0"; sha256="13hrjh80rlri8vm736p85v2jwwpck8gc5jfps1qrqcq86kv2xgkn"; depends=[ggfittext ggplot2 rlang]; }; + ggfortify = derive2 { name="ggfortify"; version="0.4.11"; sha256="1wfm7l9bz6msh7rflgfv9dgbxh1ikz2ay0v7sgk9nkc24y6lhbpk"; depends=[dplyr ggplot2 gridExtra scales stringr tibble tidyr]; }; + gggap = derive2 { name="gggap"; version="1.0.1"; sha256="1iidxm7qcrg0isw2q27cmjbfb3pkfj5jcg1nj8lgy6xmydw3vrw3"; depends=[cowplot ggplot2]; }; + gggenes = derive2 { name="gggenes"; version="0.4.1"; sha256="1s4knz2g06w46jbi037l9ii0kkxvl7gnljp54s4z36hnswsrv8jk"; depends=[ggfittext ggplot2 rlang]; }; ggghost = derive2 { name="ggghost"; version="0.2.1"; sha256="0kvsjadxxdf6yvzk4a6yqkg02q1ysslvf3m0a369bdim396z4hnv"; depends=[animation ggplot2]; }; gggibbous = derive2 { name="gggibbous"; version="0.1.0"; sha256="1g6igmj2nh4b516p1wcs1cwgzdnawvf3snxzwxjkmdc4yqbzyz24"; depends=[ggplot2 scales]; }; ggguitar = derive2 { name="ggguitar"; version="0.1.1"; sha256="1lmfs54h91gzcxin37v4flkywbq3fs648mm1h9ak03xlj5nagzsi"; depends=[dplyr ggplot2 gridExtra lazyeval readr tibble]; }; gghalfnorm = derive2 { name="gghalfnorm"; version="1.1.2"; sha256="1sy0m6pqmnjbqv60rljyblhis0dxwkhw751jhlad5arcgrcwf4k8"; depends=[ggplot2 ggrepel]; }; - gghalves = derive2 { name="gghalves"; version="0.1.0"; sha256="17adlc7p8visbjn2camia6z4mnxxkiij16lbqrjbkrxb8j8m3b78"; depends=[ggplot2 gtable]; }; - gghighlight = derive2 { name="gghighlight"; version="0.3.0"; sha256="13zs3wy1zm1h1zdh0lpp19fw54giswnqbxxcimz9iyzbpg3da9va"; depends=[dplyr ggplot2 ggrepel lifecycle purrr rlang tibble]; }; + gghalves = derive2 { name="gghalves"; version="0.1.1"; sha256="1w4j8grir1i8ar7fdsk4f6czkl5j2wwn67y746mis2diwnzhcil3"; depends=[ggplot2 gtable]; }; + gghighlight = derive2 { name="gghighlight"; version="0.3.1"; sha256="1w15g67bh5cz0y12lb115bppmff9ayyrk76alxd6aznz534sbc5i"; depends=[dplyr ggplot2 ggrepel lifecycle purrr rlang tibble]; }; ggimage = derive2 { name="ggimage"; version="0.2.8"; sha256="0p2bbcw1fwzpfnmdq2h9h18xka9jrzfd2v705rbniv8nas0ga14d"; depends=[ggplot2 ggplotify jsonlite magick rvcheck scales tibble]; }; ggimg = derive2 { name="ggimg"; version="0.1.0"; sha256="0lgak04690xvy0j1g8rgbj9x81ychkx6hp1f8d92piz432wb1z71"; depends=[abind ggplot2 jpeg png]; }; - gginference = derive2 { name="gginference"; version="0.1.1"; sha256="1nla93arkq68j6w56y4p6mj4i8j6rg8rpl0p2yhdzcq8bgzkqym8"; depends=[ggplot2 rlang]; }; + gginference = derive2 { name="gginference"; version="0.1.3"; sha256="1r960cglnkii8xih4r1r7wd857jqn53f08zi9dnj54bpqrs374zx"; depends=[ggplot2 rlang]; }; gginnards = derive2 { name="gginnards"; version="0.0.3"; sha256="15ly88wjsd2fqvp483376rm2fczcbmj1s1vagb70z9z7968407xy"; depends=[ggplot2 magrittr rlang stringr tibble]; }; + ggip = derive2 { name="ggip"; version="0.2.0"; sha256="0jfh6sr34nbqwqypx6qdjggl2q6qbmpl17cmy45v6zdr5phrzhrx"; depends=[dplyr ggplot2 glue ipaddress Rcpp rlang tidyr vctrs]; }; ggiraph = derive2 { name="ggiraph"; version="0.7.8"; sha256="0iz2v73m8sm80k2vb62ajrirsh00g680938gp6haybq4s61imdki"; depends=[gdtools ggplot2 htmltools htmlwidgets purrr Rcpp rlang uuid]; }; - ggiraphExtra = derive2 { name="ggiraphExtra"; version="0.2.9"; sha256="1qmw7z10h1x6xnlpq7shafg6w2bal8ni02c07fyy9f7hm02xfnzs"; depends=[dplyr ggforce ggiraph ggplot2 magrittr mgcv mycor plyr ppcor purrr RColorBrewer reshape2 scales sjlabelled sjmisc stringr tidyr webshot ztable]; }; + ggiraphExtra = derive2 { name="ggiraphExtra"; version="0.3.0"; sha256="0q8ppixw5i1hpphmswpw6lvq7gx8rx4gfs2b8d31wbn32ziiv2rk"; depends=[dplyr ggiraph ggplot2 magrittr mgcv mycor plyr ppcor purrr RColorBrewer reshape2 scales sjlabelled sjmisc stringr tidyr]; }; ggjoy = derive2 { name="ggjoy"; version="0.4.1"; sha256="012md2m0jqfcccb933j423m3ck31v3p0pd41gjxpyg9082y7ixyj"; depends=[ggplot2 ggridges]; }; gglasso = derive2 { name="gglasso"; version="1.5"; sha256="12l0ac1n54z41yw7c00fm6q2mjmhp9blk4f8vp7q2my2xxwh1fmj"; depends=[]; }; + gglm = derive2 { name="gglm"; version="0.1.0"; sha256="12bqqh9614v0cv45czqh6w0in4hbhwmicvcw8l07zdhrn9aq7y9m"; depends=[ggplot2 patchwork rlang]; }; gglogo = derive2 { name="gglogo"; version="0.1.5"; sha256="08wg0svcksdzchp6bdllmsnklxia3d0ygqwzgmqb2sga8nbkf5hl"; depends=[dplyr ggplot2 jpeg knitr magrittr plyr purrr reshape2 rlang tidyr]; }; ggloop = derive2 { name="ggloop"; version="0.1.0"; sha256="0jpbgb16jfsv557zvishln98y7nd6p1ryp6hxkrkmhp9p35vzvc0"; depends=[assertthat ggplot2 lazyeval magrittr plyr]; }; gglorenz = derive2 { name="gglorenz"; version="0.0.2"; sha256="1kag8p2chd0sbn8affpxzi4aawpm71ls97dwdgx7mxxfwkdb2q0y"; depends=[ggplot2 ineq]; }; ggm = derive2 { name="ggm"; version="2.5"; sha256="11wc6k2kj2ydy0dyks5mbvbhxm1r43id87anl1jg6dn0yv4m78di"; depends=[graph igraph]; }; ggmap = derive2 { name="ggmap"; version="3.0.0"; sha256="13dmzl6z62pzjiffilarkji46vy0sacxa8a7mhrhc3biq3ylzhln"; depends=[bitops digest dplyr ggplot2 glue httr jpeg magrittr plyr png purrr RgoogleMaps rjson scales stringr tibble tidyr]; }; - ggmcmc = derive2 { name="ggmcmc"; version="1.4.1"; sha256="05dsxp5694hljbjz13gpb4f9sxv5jphsihza101ck08yzgn6kpvf"; depends=[dplyr GGally ggplot2 tidyr]; }; + ggmcmc = derive2 { name="ggmcmc"; version="1.5.0"; sha256="0ywh7bzva5b5svgqgxq2ni59g3xcbvcm2rlgs1plsi1djx2jwsn5"; depends=[dplyr GGally ggplot2 tidyr]; }; ggmix = derive2 { name="ggmix"; version="0.0.1"; sha256="19dp4ic3mxrqdzr0hi44fm2axfi2b693k4xfs28h664123c9kyvn"; depends=[glmnet MASS Matrix]; }; ggmosaic = derive2 { name="ggmosaic"; version="0.2.0"; sha256="0byhp7125r015wbbnv6fq13bx38krf11r39jx9dzbr0ci6kqzkdb"; depends=[dplyr ggplot2 plotly productplots purrr rlang tidyr]; }; ggmr = derive2 { name="ggmr"; version="0.1.1"; sha256="0941rvh7m5knlhp0m0mhm4j8spmch0pyvwhzs3bycq3vzlvzv1w7"; depends=[MASS]; }; ggmsa = derive2 { name="ggmsa"; version="0.0.4"; sha256="1sxnzr39ns6r1h5xr5mwnqbksva156cyx3gc1yq5g3568l2kmx3j"; depends=[Biostrings ggplot2 magrittr stringr tidyr]; }; ggmuller = derive2 { name="ggmuller"; version="0.5.4"; sha256="0y7bm9fm5i8acpy6fa903ca2r9yasky7kg2hicm4xz5ni09jm20x"; depends=[ape dplyr ggplot2]; }; ggnetwork = derive2 { name="ggnetwork"; version="0.5.8"; sha256="1gdvywx2n4ph0dr8q1c5gfsmv4jjy0g41cnhjn68kkmg5fdc3ix8"; depends=[ggplot2 ggrepel igraph network sna]; }; - ggnewscale = derive2 { name="ggnewscale"; version="0.4.2"; sha256="15555xh0iahczxhp85ki45qvrp7nrnpv1hag4dy55ja4rcbfzb36"; depends=[ggplot2]; }; + ggnewscale = derive2 { name="ggnewscale"; version="0.4.4"; sha256="0dazwhq1yjv3vdc0b0blzqfkic905w7fq8gnrixc9nwid9xc9cfg"; depends=[ggplot2]; }; ggnormalviolin = derive2 { name="ggnormalviolin"; version="0.1.2"; sha256="1gbv2b86nznw5bs05c4ns96b8hsxkhikhcf8syl2qbbafzy8vx6y"; depends=[dplyr ggplot2 magrittr scales]; }; ggnuplot = derive2 { name="ggnuplot"; version="0.1.0"; sha256="0i09ybmxdjyr15z1a651k3bkbqskri4ipcyjap93020zbfv05r9c"; depends=[ggplot2]; }; ggpacman = derive2 { name="ggpacman"; version="0.1.0"; sha256="1040d6aciyllrpszh7l7y55fw4dx8cya2yvj0x4i2fibvygz83p6"; depends=[dplyr gganimate ggforce ggplot2 magrittr purrr rlang tidyr]; }; @@ -8704,27 +9066,27 @@ in with self; { ggparallel = derive2 { name="ggparallel"; version="0.2.0"; sha256="0zxaff0jbqkbavsmh1yyp3vdrxsam6a66hjw8lamv9pksdw1s2wf"; depends=[ggplot2 plyr reshape2]; }; ggparliament = derive2 { name="ggparliament"; version="2.0.0"; sha256="04za4lm3lir95bgda1rzlsyil2fkac3j5f5f1pjw2samy6pjz80r"; depends=[dplyr ggplot2 rlang]; }; ggparty = derive2 { name="ggparty"; version="1.0.0"; sha256="0s6hr5p930kl3pj6ajwgwqz6yikc3l9hhzy1yn0nqc0r8pp2jyqf"; depends=[checkmate ggplot2 gtable partykit rlang survival]; }; - ggperiodic = derive2 { name="ggperiodic"; version="1.0.0"; sha256="1cig715qy1kjjrn89cf505njdl2xccvjc5l0fwbqh86xgjayslxb"; depends=[data_table dplyr ggplot2 sticky tidyselect]; }; + ggperiodic = derive2 { name="ggperiodic"; version="1.0.1"; sha256="084n37jwldnhqx61ayq9b55bi4dp2iqyrj2qbp67w0ps1xn5jm6b"; depends=[data_table dplyr ggplot2 sticky tidyselect]; }; ggplot_multistats = derive2 { name="ggplot.multistats"; version="1.0.0"; sha256="1afzfa86vc484bcwpg7m1ky03jpax584rigzgai8w06pifkmz0il"; depends=[ggplot2 hexbin rlang scales]; }; - ggplot2 = derive2 { name="ggplot2"; version="3.3.2"; sha256="0wsib5qpzn4d0w1ss3x158xmrawkms8vvsfvr3mh40pvd8g2ibad"; depends=[digest glue gtable isoband MASS mgcv rlang scales tibble withr]; }; + ggplot2 = derive2 { name="ggplot2"; version="3.3.3"; sha256="1k136k1sr6dq1xvx6gs6gzji6hbnnwnsb5qivsxrblfv90irxhj5"; depends=[digest glue gtable isoband MASS mgcv rlang scales tibble withr]; }; ggplot2movies = derive2 { name="ggplot2movies"; version="0.0.1"; sha256="067ld6djxcpbliv70r2c1pp4z50rvwmn1xbvxfcqdi9s3k9a2v8q"; depends=[]; }; ggplotAssist = derive2 { name="ggplotAssist"; version="0.1.3"; sha256="1g0s1dkbrxmwqjqppagdbnx24s0nbjn09xwxix3dkfssz6drhala"; depends=[dplyr editData gcookbook ggplot2 ggthemes magrittr miniUI moonBook rstudioapi scales shiny shinyAce shinyWidgets stringr tibble tidyverse]; }; ggplotgui = derive2 { name="ggplotgui"; version="1.0.0"; sha256="1yfglg5438mwyml845isimzma5q6824x19jka509ng49bzmf1za0"; depends=[ggplot2 haven plotly RColorBrewer readr readxl shiny stringr]; }; ggplotify = derive2 { name="ggplotify"; version="0.0.5"; sha256="0pfnp4lrissf21z7867kdm6slr979kchyva8iaf83i1302kscph3"; depends=[ggplot2 gridGraphics rvcheck]; }; ggplotlyExtra = derive2 { name="ggplotlyExtra"; version="0.0.1"; sha256="1m2rhylpzj934gb50lxjp47rxz0kwl9i1p3n7w1rz4qi96pr5p1c"; depends=[ggplot2 plotly rlang]; }; - ggpmisc = derive2 { name="ggpmisc"; version="0.3.5"; sha256="0ma2d3a3v8n85sghxr9anl6vgbs8gi82i1dllw99n81gsm59wgin"; depends=[broom dplyr ggplot2 gridExtra lubridate magrittr MASS plyr polynom rlang scales splus2R stringr tibble xts zoo]; }; + ggpmisc = derive2 { name="ggpmisc"; version="0.3.7"; sha256="121s6c9k4fn3rcz2myc1kxczllq2826c8zllaii58q8lica7dsyn"; depends=[broom dplyr ggplot2 glue gridExtra lubridate magrittr MASS plyr polynom rlang scales splus2R stringr tibble xts zoo]; }; ggpointdensity = derive2 { name="ggpointdensity"; version="0.1.0"; sha256="0c9a14j3b0hvamqylhzldw2hjdxmfbllwahjkf3gg2rw337ld9iy"; depends=[ggplot2]; }; - ggpol = derive2 { name="ggpol"; version="0.0.6"; sha256="1316g0y0i4nm4nsa422pbrv4w3g0rv1jxy6m7qasarq2mml9lxjs"; depends=[dplyr ggplot2 glue gtable plyr rlang tibble]; }; + ggpol = derive2 { name="ggpol"; version="0.0.7"; sha256="11xr26kwmkjjb51wm44ydv0vcinc6k6faqwx4s2faj4iwidlys1m"; depends=[dplyr ggplot2 glue gtable plyr rlang tibble]; }; ggpolypath = derive2 { name="ggpolypath"; version="0.1.0"; sha256="0g9zfal3vqcx16fi4abxm6l5sam475lk1f6bdik487wc2v0dkq83"; depends=[ggplot2]; }; ggpubr = derive2 { name="ggpubr"; version="0.4.0"; sha256="0x86lmghr25k8w90yrp360dn42dhp5cjvjpdiv2s2gxfn701xcmb"; depends=[cowplot dplyr ggplot2 ggrepel ggsci ggsignif glue gridExtra magrittr polynom purrr rlang rstatix scales tibble tidyr]; }; - ggpval = derive2 { name="ggpval"; version="0.2.3"; sha256="04s0pwi0pljdd8r6wnjyb3i3php6qgvpc1mdvhywcx2i2zqip2qx"; depends=[data_table ggplot2]; }; - ggquickeda = derive2 { name="ggquickeda"; version="0.1.7"; sha256="1vzxqd9djfbipsals5h6h64hxr4qcmv8j562ycbm0q566bm8ff2i"; depends=[colourpicker dplyr DT Formula GGally ggplot2 ggpmisc ggpubr ggrepel ggstance gridExtra Hmisc lazyeval markdown plotly quantreg rlang scales shiny shinyjqui shinyjs stringr survival survminer table1 tidyr]; }; + ggpval = derive2 { name="ggpval"; version="0.2.4"; sha256="0zi3k79iy8pwnrgi9r9l4r9ghv1db9cxsagif8wsrlak4nr8akza"; depends=[data_table ggplot2]; }; + ggquickeda = derive2 { name="ggquickeda"; version="0.1.9"; sha256="1z9dmiyxmbryr4hzndanz72k57z469fbsxpfaaqzfrc3wx5yp30a"; depends=[colourpicker dplyr DT Formula GGally ggplot2 ggpmisc ggpubr ggrepel ggstance gridExtra Hmisc lazyeval markdown plotly quantreg rlang RPostgres scales shiny shinyFiles shinyjqui shinyjs stringr survival survminer table1 tidyr]; }; ggquiver = derive2 { name="ggquiver"; version="0.2.0"; sha256="1hsayqxf4brck1rx97yyprw1axc83lksgf7mn3rh8hqx4h1f5f0f"; depends=[dplyr ggplot2]; }; - ggraph = derive2 { name="ggraph"; version="2.0.3"; sha256="1pz06j0za4p6dc3fqjzcw8bpym70bmnfcvpv1q34r74rnwzjdyvq"; depends=[digest dplyr ggforce ggplot2 ggrepel graphlayouts gtable igraph MASS Rcpp rlang scales tidygraph viridis]; }; + ggraph = derive2 { name="ggraph"; version="2.0.4"; sha256="1j3xf4fsv0i0gbppdrw4yprfyk53wx6s8nvnkipi2ywbm7cr4q4w"; depends=[digest dplyr ggforce ggplot2 ggrepel graphlayouts gtable igraph MASS Rcpp rlang scales tidygraph viridis withr]; }; ggraptR = derive2 { name="ggraptR"; version="1.3"; sha256="1i6jp0n1sz5b4sv3d4h5624zhlknih2qp6p2m2ri6s3gsh1pl9zz"; depends=[dplyr ggplot2 pacman purrr shiny]; }; ggrasp = derive2 { name="ggrasp"; version="1.0"; sha256="0lini89mcxl30kx38vny9896hdf4afrz5dgivbbikkb2yyfh2cq1"; depends=[ape bgmm colorspace ggplot2 mixtools]; }; - ggrastr = derive2 { name="ggrastr"; version="0.1.9"; sha256="12iam75hg5mgqi9wbpyyvr6arj7jxy0g5s5niz70j8zy06jji6rn"; depends=[Cairo ggbeeswarm ggplot2]; }; - ggrepel = derive2 { name="ggrepel"; version="0.8.2"; sha256="1qaifn3dazdqbqlii210xhw7yf142iw7g9p2axmmxbz90p0by08d"; depends=[ggplot2 Rcpp scales]; }; + ggrastr = derive2 { name="ggrastr"; version="0.2.1"; sha256="0dip813s2ba706qwr2xxz4grj67a7g2cn9h6i1nv70yp7258jp30"; depends=[Cairo ggbeeswarm ggplot2 png ragg]; }; + ggrepel = derive2 { name="ggrepel"; version="0.9.0"; sha256="1nigyj05ag7z0gilrk5b60y2c5imyjg5674ngi4052f0gpda6z2g"; depends=[ggplot2 Rcpp rlang scales]; }; ggridges = derive2 { name="ggridges"; version="0.5.2"; sha256="03pz257aw0mkh5k75rby9givkc1ky3n5scvhjhjiz9vry9fpffmh"; depends=[ggplot2 plyr scales withr]; }; ggrisk = derive2 { name="ggrisk"; version="1.2"; sha256="1zcqpddv02hr77s8gw17gr7yww7h9yma0279rxnckxhxlfi88ym5"; depends=[cutoff do egg fastStat ggplot2 nomogramFormula rms set survival]; }; ggroups = derive2 { name="ggroups"; version="2.0.3"; sha256="1qlx1jfmmpygswwbrqs7pxm426zggxgvd4q3jp9abfaq9aczs10p"; depends=[]; }; @@ -8737,48 +9099,52 @@ in with self; { ggsolvencyii = derive2 { name="ggsolvencyii"; version="0.1.2"; sha256="0jzj4iglgzwp6pfs5zr7mirdiqrrmbwdvl245b1fwf42rnxbqrq6"; depends=[dplyr ggplot2 magrittr tidyr]; }; ggsom = derive2 { name="ggsom"; version="0.4.0"; sha256="0qsih00rm3ng2zh6p2s7a35rh1qlvbkn82s53v765w60fjmhwkwf"; depends=[assertthat data_table dplyr entropy ggplot2 kohonen magrittr tibble tidyr]; }; ggspatial = derive2 { name="ggspatial"; version="1.1.4"; sha256="0l77c6h845if5hfsjzvbdpysk04qbnpbb19g6zggrg3fxrqp1wh8"; depends=[abind ggplot2 glue rlang rosm scales sf tibble tidyr]; }; - ggspectra = derive2 { name="ggspectra"; version="0.3.6"; sha256="0zxw8fc8kaadklyyhm1j6qajgq79hjskj1c0chlinkvsg417c5hl"; depends=[dplyr ggplot2 ggrepel lubridate photobiology photobiologyWavebands scales tidyr]; }; - ggstance = derive2 { name="ggstance"; version="0.3.4"; sha256="0aqz3dn02cgij018a4sglqwrwr9dzzj12l8xr1064q7hfd4f64m1"; depends=[ggplot2 plyr rlang withr]; }; + ggspectra = derive2 { name="ggspectra"; version="0.3.7"; sha256="0xd8g2m73qa5bd4wk1a81ayy48agqm4h9nadafs3qrcg8wszk8nm"; depends=[dplyr ggplot2 ggrepel lubridate photobiology photobiologyWavebands scales tibble tidyr]; }; + ggstance = derive2 { name="ggstance"; version="0.3.5"; sha256="0jz9vvnmcc6a38n8nzr458r65sna23bgn5r8mxdhzdlyqibihr7d"; depends=[ggplot2 plyr rlang withr]; }; ggstar = derive2 { name="ggstar"; version="0.0.9"; sha256="1yixq9384h7m8xqkl8gcr0iai8f3a3yfa0yd34ahjzjs893x34vy"; depends=[ggplot2 gridExtra scales]; }; - ggstatsplot = derive2 { name="ggstatsplot"; version="0.5.0"; sha256="06zl57pbd3szbkbx6qpp4cwl9r5xbq73vvhnckf6c2dy5f8i1m29"; depends=[broomExtra correlation cowplot dplyr ggcorrplot ggExtra ggplot2 ggrepel ggsignif groupedstats insight ipmisc pairwiseComparisons paletteer parameters purrr rlang statsExpressions tidyr]; }; + ggstatsplot = derive2 { name="ggstatsplot"; version="0.6.6"; sha256="0kii730q1hljiqvi8zm5m4c0vwdjh30wwc0hv85b00jr4i83vk00"; depends=[cowplot dplyr ggcorrplot ggExtra ggplot2 ggrepel ggsignif insight ipmisc pairwiseComparisons paletteer parameters performance purrr rlang statsExpressions tidyr]; }; ggstudent = derive2 { name="ggstudent"; version="0.1.1-1"; sha256="0qs27b4lksaaaspavkycbzf8cfjxjli7xrfjby71sl0lca3fwm1g"; depends=[dplyr ggplot2]; }; ggswissmaps = derive2 { name="ggswissmaps"; version="0.1.1"; sha256="0is48x6k2p5dgj9q4km0dv33a9pcpfhlai9vz295y3acpyrkmnn4"; depends=[ggplot2]; }; ggtern = derive2 { name="ggtern"; version="3.3.0"; sha256="12lxmql9zspglp0baqp419l0vgilrf8lyxsza142bfyvmdbhh6d3"; depends=[compositions ggplot2 gridExtra gtable hexbin latex2exp lattice MASS plyr proto scales]; }; - ggtext = derive2 { name="ggtext"; version="0.1.0"; sha256="1jwj1kp5v78xij3mh0q96mvrccdkv81fzcfb9xdp3yysdz2pr2vr"; depends=[ggplot2 gridtext rlang scales]; }; + ggtext = derive2 { name="ggtext"; version="0.1.1"; sha256="0n19dlcys8v7myfyckr6dnq0kx79k3sbh8nwx1jsx8pgzfbi8a2b"; depends=[ggplot2 gridtext rlang scales]; }; ggthemes = derive2 { name="ggthemes"; version="4.2.0"; sha256="0rrkzfggc1nlda1w1lbqdycx6nawxbkac1szhvkwrqlzh6agxcsv"; depends=[ggplot2 purrr scales stringr tibble]; }; ggupset = derive2 { name="ggupset"; version="0.3.0"; sha256="079a1fghhbxhkx42ac0n5chmh07i60m2pkdk76frqbbmwrw7inx4"; depends=[ggplot2 gtable rlang scales tibble]; }; ggversa = derive2 { name="ggversa"; version="0.0.1"; sha256="0xqn8iznrm8q30pxwka88wi1z7lndi6lm12rq6ngcaxf294fbz01"; depends=[]; }; - ggvis = derive2 { name="ggvis"; version="0.4.5"; sha256="091i9f17912j8qcyxppjgwzjnyqj7769ixs9d2gjg6f2clskqdw2"; depends=[assertthat dplyr htmltools jsonlite lazyeval magrittr shiny]; }; + ggvis = derive2 { name="ggvis"; version="0.4.7"; sha256="1qv512pd4x5vmx15y9nvqmabbbw14h75fmi1sjbcg5yl25z0cswy"; depends=[assertthat dplyr htmltools jsonlite magrittr rlang shiny]; }; ggvoronoi = derive2 { name="ggvoronoi"; version="0.8.3"; sha256="04dv33vnip0rrli1diq43v7vhr86bmxjdyxjbxz5x4371kbb312j"; depends=[deldir ggplot2 raster rgeos sp]; }; ggwordcloud = derive2 { name="ggwordcloud"; version="0.5.0"; sha256="0mr92738s3j9wm6mkr5hd2flqsqw3vfjifv3fajsygysbwrl8dn8"; depends=[colorspace ggplot2 png Rcpp scales]; }; - gh = derive2 { name="gh"; version="1.1.0"; sha256="1bc9bn1078s664hc806dh0y1ncxif77q479rfmxfir9z7hwaz7yy"; depends=[cli httr ini jsonlite]; }; + gh = derive2 { name="gh"; version="1.2.0"; sha256="1zvy3ylxvni10lhvmbm9h14mg4wlsbdbzbzviwf28jxss8749219"; depends=[cli gitcreds httr ini jsonlite]; }; ghibli = derive2 { name="ghibli"; version="0.3.2"; sha256="0762dy3x7w0q1swag2lh33cpqdr9bbqw0963ymdpnchawdh5m50z"; depends=[prismatic]; }; ghql = derive2 { name="ghql"; version="0.1.0"; sha256="19awg98r2hwwwwrwh0166y8ij1clf58vrf02i8fhhfzddx3an6bz"; depends=[crul graphql jsonlite R6]; }; ghyp = derive2 { name="ghyp"; version="1.6.1"; sha256="02xiznl1v0fksqwyvjg8075qbiy29y1h1q8cr3lsbr95h8iyzqfh"; depends=[MASS numDeriv]; }; - ghypernet = derive2 { name="ghypernet"; version="1.0.0"; sha256="1c2zphpyrjhvzsqnqshj1z955h69k4qpd7a3x174r72y47pqw5yx"; depends=[dplyr extraDistr numbers plyr purrr reshape2 rlang rootSolve]; }; + ghypernet = derive2 { name="ghypernet"; version="1.0.1"; sha256="0pzgmpnvgskfk0z7if4a4ifinbrw60fgaz8ksbfzqx5snym6qrf7"; depends=[dplyr extraDistr numbers pbmcapply plyr purrr reshape2 rlang rootSolve texreg]; }; gibble = derive2 { name="gibble"; version="0.4.0"; sha256="19il4si7ch5jr7plr8qwv7jrc5kfkxmh5jrcdvbn688gxcnv7bs0"; depends=[dplyr rlang tibble]; }; gibbs_met = derive2 { name="gibbs.met"; version="1.1-3"; sha256="1yb5n8rkphsnxqn8rv8i54pgycv9p7x1xhinx4l5wzrds3xhf2dc"; depends=[]; }; gif = derive2 { name="gif"; version="0.1.0"; sha256="119d7q9xs6xpncv1r2w008kld9z07ckyj1kja9b8n2lnlb8532pk"; depends=[MASS Matrix Rcpp RcppEigen]; }; gifski = derive2 { name="gifski"; version="0.8.6"; sha256="00w4bzp0rrp4isy1rnxs6g1q07r3wndadk3mqdrxk2wxi7jmghna"; depends=[]; }; - gifti = derive2 { name="gifti"; version="0.7.5"; sha256="1y64bc33b5f64a4khp916s9zb7kbb24xgdg3pdlh0f8m6zrbmp4a"; depends=[base64enc R_utils xml2]; }; + gifti = derive2 { name="gifti"; version="0.8.0"; sha256="1gb3x4rln9vayjd9fgzb434mm3dwcqgrvlv6rmh4b39mjfm73sly"; depends=[base64enc R_utils xml2]; }; + giftwrap = derive2 { name="giftwrap"; version="0.0.4"; sha256="1zsw529h69x9yaq2csfws4iqn3mm39z34kwzj0b2y850wzbn2dvp"; depends=[namespace processx readr tibble]; }; gim = derive2 { name="gim"; version="0.33.1"; sha256="1km8pyr1qfzffm33ihhlgvc0qxgxxfi161vkrz77d1b7jkpdyxjj"; depends=[numDeriv]; }; - gimme = derive2 { name="gimme"; version="0.7-1"; sha256="117157nyyyzb102cs2in7s44dl3v6d0aqbfyybq4rqb5cqqmfsvj"; depends=[data_tree igraph imputeTS lavaan MIIVsem nloptr qgraph]; }; + gimme = derive2 { name="gimme"; version="0.7-4"; sha256="113g71g7pnjg3bcpviiyxqfmhwqihxi9kmrs28mg77p0rd9gjhg6"; depends=[data_tree igraph imputeTS lavaan MIIVsem nloptr qgraph]; }; gimmeTools = derive2 { name="gimmeTools"; version="0.1"; sha256="1g170rz3c3qx27yy67f7xab4gkm0pbbvwlwkcsczfxphad609ryl"; depends=[easycsv magrittr miniUI rhandsontable rintrojs rstudioapi shiny shinyjs shinyWidgets]; }; gimms = derive2 { name="gimms"; version="1.1.3"; sha256="0ij252zz75nfngh5idzznrdi4jn1ymbn24s6qilpf2qf8zilh89i"; depends=[curl Kendall ncdf4 raster zyp]; }; giphyr = derive2 { name="giphyr"; version="0.2.0"; sha256="0273f7lama8bhaalafs66m6ksp32vx0j6rmh1qr4484i7wkmdfqn"; depends=[dplyr httr miniUI purrr rstudioapi shiny tibble]; }; + giscoR = derive2 { name="giscoR"; version="0.2.2"; sha256="1nqqq6zpi6f1bn3vx1666fsz7jgf0ijn8d28j97ld8qsvaaaw6k9"; depends=[countrycode geojsonsf sf]; }; gistr = derive2 { name="gistr"; version="0.9.0"; sha256="0ac9ikrdg6i8xvlma0gizvsdva46408lk7hvsgkqirhy2ljy02hp"; depends=[assertthat crul dplyr httr jsonlite knitr magrittr rmarkdown]; }; git2r = derive2 { name="git2r"; version="0.27.1"; sha256="1h1vfzym6hi1fqs9p5z5v0f4xldggr425frw8k6dsidah3qhg4h9"; depends=[]; }; git2rdata = derive2 { name="git2rdata"; version="0.2.1"; sha256="11mdalfgarqscb6yg0p9g4mwzwnbkq40migpv5sk0i3vdz0xpapp"; depends=[assertthat git2r yaml]; }; - gitgadget = derive2 { name="gitgadget"; version="0.5.2"; sha256="0la0x3p50wk5wv2p4vkf3rh72psz3k18lcymxn354nqb7m1xdggs"; depends=[callr curl dplyr jsonlite markdown miniUI rstudioapi shiny shinyFiles usethis]; }; + gitcreds = derive2 { name="gitcreds"; version="0.1.1"; sha256="1snzn7nxy0rwz0bzjsg6k04c0n811dgn8gn9cmn2v78aj57ayjmi"; depends=[]; }; + gitear = derive2 { name="gitear"; version="1.0.0"; sha256="139h19yyi7bpkps2vskdnga43ggpgb9fg8jdr7n8vgadxjamv98p"; depends=[dplyr httr jsonlite magrittr mockery Rcpp stringr tibble tidyr]; }; + gitgadget = derive2 { name="gitgadget"; version="0.6.0"; sha256="1rqjzlfnwqqvad8q73akdir0rd48219mvh30yg9k7lp7rnm2wpmz"; depends=[callr curl dplyr jsonlite markdown miniUI rstudioapi shiny shinyFiles usethis]; }; githubinstall = derive2 { name="githubinstall"; version="0.2.2"; sha256="0hqh86r2007hzdbm8rr0fwqhhsna7ji8sdgmdnrxkxraa5f2pfz3"; depends=[curl data_table devtools httr jsonlite mockery]; }; - gitignore = derive2 { name="gitignore"; version="0.1.3"; sha256="0ckvl5i99k9sjvlk3cfjyclhmchrlqdz4379nmlckh4jpmnckzk0"; depends=[clipr clisymbols crayon curl glue here jsonlite purrr xfun]; }; + gitignore = derive2 { name="gitignore"; version="0.1.4"; sha256="15rpzb3szx6k5xwf89p3fyzdbk44ahyxgx35jza4ln3pl16hldz1"; depends=[clipr clisymbols crayon curl glue here jsonlite purrr xfun]; }; gitlabr = derive2 { name="gitlabr"; version="1.1.6"; sha256="1p68w0q8mjpz2hr6ys1qbfw1y4b35hgs27kzfkzv9hfi1vxqfd1h"; depends=[arpr base64enc dplyr httr magrittr purrr stringr tibble yaml]; }; gitlink = derive2 { name="gitlink"; version="0.1.3"; sha256="1g34cyx35wlpq42alsayk69x708zxqgvbdndb7j6n1q0rm4vncvd"; depends=[htmltools rlang]; }; givitiR = derive2 { name="givitiR"; version="1.3"; sha256="0y2slhxhj7k413kjaydin9hq3x2xgx4cgjshdplwnmg3x2nakn31"; depends=[alabama rootSolve]; }; gjam = derive2 { name="gjam"; version="2.3.2"; sha256="0zlx4q4w09c4gcjjw3niy61nrfdrqb4h9f3x2sg33lqnhwkdddwk"; depends=[MASS RANN Rcpp RcppArmadillo]; }; gk = derive2 { name="gk"; version="0.5.1"; sha256="1hgxb1lp78pbnj22i7ryf46im301j05y7hh75z2fxvv5nqgg2v75"; depends=[Ecdat lubridate progress]; }; gkgraphR = derive2 { name="gkgraphR"; version="1.0.1"; sha256="05bwcsg5w4231h4y0p4grkswgjnd3ygcnfsj72y2cxcjsnladylx"; depends=[httr ISOcodes jsonlite]; }; - gkmSVM = derive2 { name="gkmSVM"; version="0.80.0"; sha256="0ljcga246ad0ql8x3drvrdsyp0f20mgp3p6lnl79xb76qgfdnm0p"; depends=[kernlab Rcpp ROCR seqinr]; }; + gkmSVM = derive2 { name="gkmSVM"; version="0.81.0"; sha256="119g5rhc7ffyviz04r04aj5z1g6abnj3ddd01g7db505sdr6lapj"; depends=[kernlab Rcpp ROCR seqinr]; }; glacierSMBM = derive2 { name="glacierSMBM"; version="0.1"; sha256="0117fzz2b1lccs0kkwz59w2yysi72j54yvz7373pz11w7rjds84f"; depends=[raster sp udunits2]; }; glamlasso = derive2 { name="glamlasso"; version="3.0"; sha256="1ynhl868kh25l8m04ln6ix31z9r26lrbr5ajprpq9yfhqs4l9ddc"; depends=[Rcpp RcppArmadillo]; }; glancedata = derive2 { name="glancedata"; version="1.0.1"; sha256="01j7syjn33pc7hq032nmyak38wn35yv3n7is9g2ggs14kj3xqb0c"; depends=[dplyr forcats GGally ggplot2 gridExtra openxlsx purrr tibble tidyr]; }; @@ -8787,21 +9153,21 @@ in with self; { glasso = derive2 { name="glasso"; version="1.11"; sha256="02p3612rpydk195n2qr77lp1j2w8zsw1ckkk98c8angm4r5q8dsc"; depends=[]; }; glassoFast = derive2 { name="glassoFast"; version="1.0"; sha256="1sgmh4l06q7mrmgnimphpqgix4k4jzaj2l30kpmnf92caa2v7ngw"; depends=[]; }; glba = derive2 { name="glba"; version="0.2"; sha256="0ckcz6v6mfbv34s8sp086czhb5l58sky79k84332rrz6wj47p3md"; depends=[]; }; - glca = derive2 { name="glca"; version="0.1.1"; sha256="0xm67c0rizhm0rhhllr3jawzgsngvzgkcagankpklf035hk5wgrv"; depends=[MASS Rcpp]; }; + glca = derive2 { name="glca"; version="1.1.0"; sha256="0digyha69l02h9bgapvnfxxa8q97z3amq8qc93nm3a3acw5cq4ig"; depends=[MASS Rcpp]; }; glcm = derive2 { name="glcm"; version="1.6.5"; sha256="13my6y9jqd86cg5n74p4b8mqbdgwnanxx4qf1rrhm5jxf6sa31qm"; depends=[raster Rcpp RcppArmadillo]; }; gld = derive2 { name="gld"; version="2.6.2"; sha256="1wrw7i5bq7rb2ahadm57y9fmr697r7lp9ln7ajcd592b0nn60n4i"; depends=[e1071 lmom]; }; gldrm = derive2 { name="gldrm"; version="1.5"; sha256="1mbdxqjw6sa47kigwrjq1gn6vi36zhg9j2lck144iwa10ms0y9xp"; depends=[]; }; - glinternet = derive2 { name="glinternet"; version="1.0.10"; sha256="15dikazmhs7md7j8p45f67h3947br18hsrjl74cjk10vazd0ihng"; depends=[]; }; + glinternet = derive2 { name="glinternet"; version="1.0.11"; sha256="1lqph2hj0h826gcfyk290ahkfalpnrd6jzymm60xi2qxia14lzk5"; depends=[]; }; gllm = derive2 { name="gllm"; version="0.37"; sha256="169y3yz947d8qdphqv2a6yrdash6v2h9jfvj2fk7rcpmz0r45kl6"; depends=[]; }; - gllvm = derive2 { name="gllvm"; version="1.2.2"; sha256="194rm0zfrk8klgbpiv4rcfn57rvnwg6dafq91w9wy1vljp69xyjy"; depends=[fishMod MASS Matrix mgcv mvabund mvtnorm RcppEigen statmod TMB]; }; + gllvm = derive2 { name="gllvm"; version="1.2.3"; sha256="0jqfijmkz2rzwfzg03q4cdd9cr4nz0m7yaka0d0nh62jakkgfjqm"; depends=[fishMod MASS Matrix mgcv mvabund mvtnorm RcppEigen statmod TMB]; }; glm_deploy = derive2 { name="glm.deploy"; version="1.0.4"; sha256="1akklvbhz2pp0sv1hax1jq0s9ajbfv1597z643gh5l9hwizj2h9m"; depends=[Rcpp]; }; - glm_predict = derive2 { name="glm.predict"; version="3.1-0"; sha256="16ahl6jvydmx48hzixv8whsr55w527k0a1xbic20crinblx0ncb4"; depends=[MASS nnet]; }; + glm_predict = derive2 { name="glm.predict"; version="4.0-0"; sha256="12k8rrjvcb5nss5bh1wrh1pfcpcsj635xgksz7lsi3xbryk007ci"; depends=[AER MASS nnet survival]; }; glm2 = derive2 { name="glm2"; version="1.2.1"; sha256="1byqlvpls23gzy7xlbs1kgfr4bsrmsrpc8rzzacf9czap1nlw39y"; depends=[]; }; glmBfp = derive2 { name="glmBfp"; version="0.0-60"; sha256="1yv6db80k8lbchd35lqpf7jjn2ss9x6rrw4r04j3xz9y246lfvxz"; depends=[coda Rcpp RcppArmadillo rms Runuran statmod survival]; }; glmaag = derive2 { name="glmaag"; version="0.0.6"; sha256="1yk5bx1gyj97b5qjy30q1gsjlp9amklwf070i0129f8dj7vjyaf0"; depends=[data_table foreach ggplot2 gridExtra huge Matrix maxstat OptimalCutpoints plotROC pROC Rcpp RcppArmadillo shiny survival survminer]; }; - glmbb = derive2 { name="glmbb"; version="0.4"; sha256="15w80lj3kdgbkp6k6g0jgxgg2q0i5sd57n0d3v56sm43cd2kcgqf"; depends=[digest]; }; + glmbb = derive2 { name="glmbb"; version="0.5-1"; sha256="1jy77z5fr781rm5mx6kszwi2zlvnpfwi24fn9vw1kza4jzcw9pjw"; depends=[digest]; }; glmc = derive2 { name="glmc"; version="0.3-1"; sha256="0x6jk2l5rpjkp5x815gpiwv8maa7mhmy6m8gaxbv1cbn3zyccynn"; depends=[emplik]; }; - glmdisc = derive2 { name="glmdisc"; version="0.5"; sha256="0985j4gh4069pwcf3spsi8czq6xn9vhajliprxjwlv3xbisjcf8s"; depends=[caret gam MASS nnet Rcpp RcppEigen RcppNumerical]; }; + glmdisc = derive2 { name="glmdisc"; version="0.6"; sha256="031rz3s5d7hz9fzmsj7aqhzwrn05rnfvk9292k2r0qpr6k02mk3b"; depends=[caret dplyr gam magrittr MASS nnet Rcpp RcppEigen RcppNumerical]; }; glmdm = derive2 { name="glmdm"; version="2.60"; sha256="09vljki24fccqkvxkmg2i6a8pxqhfwm155b41m2q51lqaq29bfw7"; depends=[]; }; glmertree = derive2 { name="glmertree"; version="0.2-0"; sha256="0lfn6dap38i6cnfy4gdap13aq81h9cm3bip7ci57q9br9b00x7ib"; depends=[Formula lme4 partykit]; }; glmglrt = derive2 { name="glmglrt"; version="0.2.2"; sha256="1954ywshnqzr7h77wshf63y3zx3ra8mrfabg5dqjhkgv4rsk3h1y"; depends=[MASS parameters]; }; @@ -8816,48 +9182,53 @@ in with self; { glmmfields = derive2 { name="glmmfields"; version="0.1.4"; sha256="0gnb2s34xz7cjyaa2w2wq7n6c5016a14mc03kalvwdv3f7b98zan"; depends=[assertthat BH broom broom_mixed cluster dplyr forcats ggplot2 loo mvtnorm nlme Rcpp RcppEigen reshape2 rstan rstantools StanHeaders tibble]; }; glmmsr = derive2 { name="glmmsr"; version="0.2.3"; sha256="1fbg5zji0xjr9q1yc6phsp37nsrj7nfs8yiri0j9s84wzgwjili1"; depends=[BH lme4 Matrix numDeriv R6 Rcpp RcppEigen]; }; glmnet = derive2 { name="glmnet"; version="4.0-2"; sha256="0qdswxvdwjcnw0by15p9yfzw8laq4f2j0ivpma6q8c5zywldpxxc"; depends=[foreach Matrix shape survival]; }; - glmnetUtils = derive2 { name="glmnetUtils"; version="1.1.5"; sha256="0q8h3pniblcgvghffsiz0qqipq8cpln4dg8nwg0k4m1j2n6h582h"; depends=[glmnet Matrix]; }; + glmnetUtils = derive2 { name="glmnetUtils"; version="1.1.6"; sha256="1an9vg8kih1fq73av2yw21zamsnly9h47bcajbpblhpljrixh1ic"; depends=[glmnet Matrix]; }; glmnetcr = derive2 { name="glmnetcr"; version="1.0.6"; sha256="0cs0yj2js0920iggcw2vci5y9hnsm3hd7wpd7mwnx8mszwrklawg"; depends=[glmnet]; }; glmpath = derive2 { name="glmpath"; version="0.98"; sha256="1jbiqqd1s93i941dhyyx50zlgwavhyjfw8bx13z4gz05rdvi4gn8"; depends=[survival]; }; glmpathcr = derive2 { name="glmpathcr"; version="1.0.8"; sha256="00hbgp1kdbvihqvx03vv6gq32whrkcfq3n32bbj3cda85dnivlwq"; depends=[glmpath]; }; glmpca = derive2 { name="glmpca"; version="0.2.0"; sha256="02xjf0gg52925hw9nw2j0znfmzfzfwbv0fxjl9d2fy9j63drr2h4"; depends=[MASS]; }; glmtlp = derive2 { name="glmtlp"; version="1.1"; sha256="01kyw0xipyr9z7x9z41wz7rqargzqd8s8ri34ffdvd3ggrdznl0p"; depends=[glmnet]; }; - glmtree = derive2 { name="glmtree"; version="0.1"; sha256="03baxmabfpyl89a5dqk16fhvcgw58daji3fkqc35yy6hzsiwg04q"; depends=[caret dplyr magrittr partykit]; }; + glmtree = derive2 { name="glmtree"; version="0.2"; sha256="07b7ma38r5cjv6c33q1n2f8xvzn3lj004i8v947pqdhg3fi9wlc6"; depends=[caret dplyr magrittr partykit]; }; glmulti = derive2 { name="glmulti"; version="1.0.8"; sha256="0zviahj99645s1xs2f9z7rnv95x4rdz7mfwzy3qjfw46yqpfj5cn"; depends=[leaps rJava]; }; glmvsd = derive2 { name="glmvsd"; version="1.4"; sha256="03axsn85axs4d6fdlr3wcdwq6qa4991svkqc7k9r52kk1ar0w5zz"; depends=[brglm glmnet MASS ncvreg]; }; glmx = derive2 { name="glmx"; version="0.1-1"; sha256="06v2qxgr16w0qnfhjr9vdqcad5v475pwg2yhw0i236yzqbnsssh6"; depends=[Formula lmtest MASS sandwich]; }; globalGSA = derive2 { name="globalGSA"; version="1.0"; sha256="1f3xv03m6g2p725ff0xjhvn2xcfm7r7flyrba080i4ldy6fd8jg8"; depends=[]; }; + globalKinhom = derive2 { name="globalKinhom"; version="0.1.2"; sha256="1hvl2lhaxpzgdii5jcays2yvpxvrid5njninfn8px4ymf7h597zw"; depends=[spatstat]; }; globalOptTests = derive2 { name="globalOptTests"; version="1.1"; sha256="0yf4p82dpjh36ddpfrby7m3fnj2blf5s76lncflch917sq251h4f"; depends=[]; }; globalboosttest = derive2 { name="globalboosttest"; version="1.1-0"; sha256="1k7kgnday27sn6s1agzlj94asww81655d2zprx6qg7liv677bxvf"; depends=[mboost survival]; }; - globals = derive2 { name="globals"; version="0.12.5"; sha256="1ha8iasgijp4q3v2b0b17y1wh7cd3nvzd9b03w49qm2bidkaf68m"; depends=[codetools]; }; + globals = derive2 { name="globals"; version="0.14.0"; sha256="1wrjiiif6rpc268zz79pvpw33si6n6ffgxdnxmmcracwhb5vqg90"; depends=[codetools]; }; globe = derive2 { name="globe"; version="1.2-0"; sha256="0xa0q5dac0g7xdlr679f3km8nqxlm7gi4msp9fbfivfvy0rmri96"; depends=[]; }; glogis = derive2 { name="glogis"; version="1.0-1"; sha256="1sbvcg5slvd2c7fasvbj534x36rh11zq3mxv5z0jwpqd6h1xadmd"; depends=[sandwich zoo]; }; + glow = derive2 { name="glow"; version="0.10.1"; sha256="1br29hy5j30k5q4xk1dglxlhqalhm76hnx8xg73v6whcg5j11392"; depends=[ggplot2 R6 Rcpp RcppEigen RcppParallel scales]; }; glpkAPI = derive2 { name="glpkAPI"; version="1.3.2"; sha256="1qwq6vbx1symly6k72xgj5qzqw7j6wdsgiflm649pdxnisfgzh00"; depends=[]; }; glrt = derive2 { name="glrt"; version="2.0"; sha256="0p2b0digndvnn396ynv56cdg436n3ll7pxkb81rs3dhwbyqyc948"; depends=[survival]; }; - glue = derive2 { name="glue"; version="1.4.1"; sha256="1j1va4vi3g9sl0cyjdwxvh5lvh10x8k9qvnsr9zyxddcbk9qgdpq"; depends=[]; }; + glue = derive2 { name="glue"; version="1.4.2"; sha256="1bgpirdvjrf0da734clrixawvpdap4lpda4g89vais96589m8wwz"; depends=[]; }; gluedown = derive2 { name="gluedown"; version="1.0.2"; sha256="1vq5zgwlwj5rzdwj7z9ypnvj2fw9m653bdbivb2hx2z2hl8qwfp9"; depends=[glue]; }; gluvarpro = derive2 { name="gluvarpro"; version="4.0"; sha256="09l9yincr1k5j9wnj3zvfzsffjh3r54aa8fn0ik8vhlbq13ag8kp"; depends=[ggplot2 gridExtra pracma scales tidyr zoo]; }; + glvmfit = derive2 { name="glvmfit"; version="0.0.0"; sha256="1mdxscvpc0cfmzpmswpml28b7kl254awl86mgv0nkgrs8rgrb05k"; depends=[]; }; gmDatabase = derive2 { name="gmDatabase"; version="0.5.0"; sha256="0prap4a8pvylmvakd2ii87jz9bqf0vvfsxdi4iwa40nx444hqhx2"; depends=[DBI digest foreach RMySQL shiny]; }; + gmGeostats = derive2 { name="gmGeostats"; version="0.10-7"; sha256="19rpv7dac7gqal7fxk79xa74ifrqqf1wxpzky11ham3pck242rhw"; depends=[boot compositions foreach gstat RColorBrewer sp]; }; gma = derive2 { name="gma"; version="1.0"; sha256="08hxbs9z4vq5zjis0lgdcvlysaj1k7i0icdk3wsyqf3wd9znsibi"; depends=[car MASS nlme]; }; gmailr = derive2 { name="gmailr"; version="1.0.0"; sha256="0wgh428qrwn6rxkcv9xmpya4ygrmc5pblxp0fw0ddgwbl99dhhi5"; depends=[base64enc crayon gargle httr jsonlite lifecycle magrittr mime rematch2]; }; gmapsdistance = derive2 { name="gmapsdistance"; version="3.4"; sha256="1hazf6xb4ja6h2lrl63kbd78wzny9sljiid9rq1r3szn3l1mc7dn"; depends=[RCurl XML]; }; - gmat = derive2 { name="gmat"; version="0.2.1"; sha256="035x8b982qk3ik9qhxa9jhkczmafix6nbpbz0r5smby6q6bhj6jz"; depends=[gRbase igraph]; }; + gmat = derive2 { name="gmat"; version="0.2.2"; sha256="0iq2b3s60fyam45ykk67xyi2yhr8ma1s2vw4059357j1948525p2"; depends=[gRbase igraph]; }; gmfd = derive2 { name="gmfd"; version="1.0.1"; sha256="03sag09x7pjyzsp6w1z06108ig068krmw75064cnl3pqfvfyjfgr"; depends=[]; }; + gmgm = derive2 { name="gmgm"; version="1.0.1"; sha256="0pkv4q4w2bxkf9pqqllzjbbyqvax3w97rlmgaf5d6pwjq4lvk9hf"; depends=[dplyr ggplot2 purrr rlang stringr tidyr visNetwork]; }; gmm = derive2 { name="gmm"; version="1.6-5"; sha256="12lzgrrir2hlnqlq42s2ddj8yvra78br3icmz03ngyk14a4r0w5i"; depends=[sandwich]; }; gmnl = derive2 { name="gmnl"; version="1.1-3.2"; sha256="01pviab3gyvjdlv5jy7wzp33909znhpn47kar55bwkm6gm3bdlg8"; depends=[Formula maxLik mlogit msm plotrix truncnorm]; }; gmodels = derive2 { name="gmodels"; version="2.18.1"; sha256="0s8kd8krqk4kwv2zqxpsfy3w8qdwf5naf4b5l383vidq9sil0qb2"; depends=[gdata MASS]; }; - gmp = derive2 { name="gmp"; version="0.6-0"; sha256="1c9vpr6j6h5f6dm9l535nscl66rvr8sba5az2kswjhmzwb9xpjxc"; depends=[]; }; + gmp = derive2 { name="gmp"; version="0.6-1"; sha256="11rl7qmfrpp1974f0vzsi3zjyx147wlb82ydxak2b60khfvhrn90"; depends=[]; }; gms = derive2 { name="gms"; version="0.4.0"; sha256="1m7bhy4vsz6l09pal9ibjlskmbyjmc29hqwjim1x8yansd5bxpzv"; depends=[dplyr rlang stringr yaml]; }; - gmt = derive2 { name="gmt"; version="2.0-1"; sha256="1g1sj9gq3h3s0pdcfvzg7iifkns5azn3pa83if0d3yzc28cjf0yz"; depends=[]; }; - gmvarkit = derive2 { name="gmvarkit"; version="1.1.3"; sha256="08vfyad8fs6zpwgvxs2qrvnbii824fx4yxghrvcqx25x1j71vvnl"; depends=[Brobdingnag mvnfast pbapply]; }; + gmt = derive2 { name="gmt"; version="2.0.2"; sha256="0z5abh0kw97y90nxkkxxg2xgv1avxijf71v88lwhy25jgv8r7b38"; depends=[]; }; + gmvarkit = derive2 { name="gmvarkit"; version="1.3.1"; sha256="0zz68prwi3whfclz6av9d8spb7c17zcadx0wpwp1vll4zxxlx08c"; depends=[Brobdingnag mvnfast pbapply]; }; gnFit = derive2 { name="gnFit"; version="0.2.0"; sha256="0cji4zjslh18dfj0l827r6br4hx2f0akiaxrg7fhhyyyhgdcjnsm"; depends=[ismev rmutil]; }; gnlm = derive2 { name="gnlm"; version="1.1.1"; sha256="1krbz791l5qc06sh6my0bkq420b5afncw87lhyx1yiml2yg46zrk"; depends=[rmutil]; }; gnm = derive2 { name="gnm"; version="1.1-1"; sha256="1lddsdsg43wpg681s906i4xqqfbjdd1qb9ml5dfprb02i1806aa2"; depends=[MASS Matrix nnet qvcalc relimp]; }; gnn = derive2 { name="gnn"; version="0.0-2"; sha256="0sh9b6d0zvrml7d1bnirxld2lwrgrd7ma3ky7xl71kis0x3fjdq9"; depends=[keras qrng tensorflow]; }; + gnomonicM = derive2 { name="gnomonicM"; version="1.0.0"; sha256="1g4849rbqbc9ybip2qwmjajxsd4ayd3jv9hgfv60dygqdnscl166"; depends=[minqa triangle]; }; gnorm = derive2 { name="gnorm"; version="1.0.0"; sha256="17h43qwb07wk5hiif89k6dgn6bbdsqfy2jy3k5blbdhhp3b9jcqp"; depends=[]; }; gnumeric = derive2 { name="gnumeric"; version="0.7-8"; sha256="0iwl00mzsg8h8q67bjp6485idjlmj24362b1rbmkifckss8hrc98"; depends=[XML]; }; goeveg = derive2 { name="goeveg"; version="0.4.2"; sha256="0k9pyph065x8wp452x8kz28ikhsbrm80ln4yssmcgqm7085dyyya"; depends=[cluster fields Hmisc mgcv vegan]; }; - gof = derive2 { name="gof"; version="1.0.1"; sha256="0m9g3g5aw8wiz6am56ms2a5ipyk68gxd00bgs840lprgfdd4iw1n"; depends=[lava mets Rcpp RcppArmadillo]; }; gofCopula = derive2 { name="gofCopula"; version="0.3-3"; sha256="1hqna4m9b2kcksfc7r0rmi1wqw6p4a1miinm2548gpbiz5ai7ni2"; depends=[copula crayon doSNOW foreach MASS numDeriv progress R_utils SparseGrid VineCopula yarrr]; }; gofastr = derive2 { name="gofastr"; version="0.3.0"; sha256="02jn4xbbafl7siwvkqns1818wmw813x9cvqfcnpnmcippiqhrb0b"; depends=[data_table quanteda slam SnowballC tm]; }; goffda = derive2 { name="goffda"; version="0.0.7"; sha256="183hz0x0d9qh8v2k2qa5ii1g8hpmgl9bpd3dvb9f5v58zmxhgl8h"; depends=[fda_usc glmnet ks Rcpp RcppArmadillo]; }; @@ -8868,42 +9239,45 @@ in with self; { goldi = derive2 { name="goldi"; version="1.0.1"; sha256="191ac02bwrxr3khq6qirhxzfhv7pqfhqyg7jb473p5vwygpvc53l"; depends=[dplyr futile_logger magrittr Rcpp RcppArmadillo SnowballC tm]; }; golem = derive2 { name="golem"; version="0.2.1"; sha256="07g5sagdq1n5i24bc8pnx9y303adraqppq1j9lyd4n5q0phbgh2y"; depends=[attempt cli config crayon desc dockerfiler fs here htmltools jsonlite pkgload remotes rlang roxygen2 rstudioapi shiny testthat usethis yaml]; }; gomms = derive2 { name="gomms"; version="1.0"; sha256="1i9d5y28wrhal990x7xxy99v3z9y2pzlakj7wnynd3dpx5pqr0jj"; depends=[]; }; + gontr = derive2 { name="gontr"; version="1.1.0"; sha256="0asvpc3nizcn7cqdxr1j9hvhprmrazd8c7a2svhmln4vg9x1zzkp"; depends=[]; }; goodpractice = derive2 { name="goodpractice"; version="1.0.2"; sha256="08rnm8z0pry5mwpc7p37r6f2rd56dry9djpcvvs9yl170w56psx0"; depends=[clisymbols covr crayon cyclocomp desc jsonlite lintr praise rcmdcheck rstudioapi whoami withr xml2 xmlparsedata]; }; googleAnalyticsR = derive2 { name="googleAnalyticsR"; version="0.8.0"; sha256="0zpnix2ql7p9l57iyv43yz1z4y5v7d5zi7yvs0z4i4yi5zgwqh60"; depends=[assertthat cli dplyr googleAuthR httr jsonlite magrittr memoise purrr rlang tibble tidyr]; }; - googleAuthR = derive2 { name="googleAuthR"; version="1.3.0"; sha256="0csycg3d8pk01rsnpvxjs7as7dwapladfjj4v170gwzskhjmfbg9"; depends=[assertthat cli digest gargle httr jsonlite memoise rlang]; }; - googleCloudRunner = derive2 { name="googleCloudRunner"; version="0.2.0"; sha256="00m1kwm4qr2xw7p8y3qal1si6yvlmhin0xsn9s0c8spjsrppb94l"; depends=[assertthat cli googleAuthR googleCloudStorageR httr jsonlite openssl usethis yaml]; }; + googleAuthR = derive2 { name="googleAuthR"; version="1.3.1"; sha256="0mm591z5zqsy6cdzr8s24msghpr1sia7n75h21axnh59m2m7md95"; depends=[assertthat cli digest gargle httr jsonlite memoise rlang]; }; + googleCloudRunner = derive2 { name="googleCloudRunner"; version="0.3.0"; sha256="1q2q449dkkwck1asi4a0gqxa1l3by6dqk73aj1lsn7299b9p7c9z"; depends=[assertthat cli googleAuthR googleCloudStorageR httr jsonlite openssl progress usethis yaml]; }; googleCloudStorageR = derive2 { name="googleCloudStorageR"; version="0.5.1"; sha256="0sd6ca1ksv22avr5rcvkf5089f9igb8gqa83kidlc4xklaj6g92m"; depends=[assertthat curl googleAuthR httr jsonlite openssl yaml zip]; }; googleCloudVisionR = derive2 { name="googleCloudVisionR"; version="0.2.0"; sha256="1n4gkmnwp9wadxz1izggxnpcpm4bz3imhq5y3i2szr8zwafcqqjv"; depends=[data_table glue googleAuthR jsonlite purrr]; }; googleComputeEngineR = derive2 { name="googleComputeEngineR"; version="0.3.0"; sha256="1s0qvnijzkja645lim373swk815n3s1292q6sk3q36ss70q42cfg"; depends=[assertthat future googleAuthR httr jsonlite]; }; googleLanguageR = derive2 { name="googleLanguageR"; version="0.3.0"; sha256="0lm50g3gshp18nvygi6is2rayzhcx0rw2rvb4lvm0jlx5m96xgxb"; depends=[assertthat base64enc googleAuthR jsonlite magrittr purrr tibble]; }; - googlePolylines = derive2 { name="googlePolylines"; version="0.7.2"; sha256="0czfsmf8gv38g950l9xkk67q9v53pk9xk9yr2flbdpm8nlrdpjz7"; depends=[BH Rcpp]; }; + googlePolylines = derive2 { name="googlePolylines"; version="0.8.2"; sha256="1z8ml0xiyqy1ygairgs9w10q4a7msd6gkzjv7kf6r8xv4bpc02pd"; depends=[BH Rcpp]; }; googlePrintr = derive2 { name="googlePrintr"; version="0.0.1"; sha256="19rm78x8qd61ilc6h1kn3dw63m6dfsckqkd3n76krvi0akgl72w5"; depends=[googleAuthR httr jsonlite]; }; googlePublicData = derive2 { name="googlePublicData"; version="0.16.1"; sha256="15hyslpqvncg21q581h061rfyg99y8lavqw1x8hzl7xzd49bn9r5"; depends=[readxl XML]; }; - googleVis = derive2 { name="googleVis"; version="0.6.6"; sha256="0zp21zj7mpdshvh5ah60nqdys2iapqk58ib93zpr8155fshwdxqn"; depends=[jsonlite]; }; + googleTagManageR = derive2 { name="googleTagManageR"; version="0.1.6"; sha256="1y2avhgvzrpmpyx341di8ml2pdj10y8sdhn7zwjpxgzrxkmf4xxi"; depends=[assertthat dplyr future googleAuthR httr jsonlite purrr]; }; + googleVis = derive2 { name="googleVis"; version="0.6.9"; sha256="1smp85xjs0pda705m1d5kmfd138r57inz6pznljahwra72ix0f87"; depends=[jsonlite]; }; googledrive = derive2 { name="googledrive"; version="1.0.1"; sha256="0qbyl0wyrxmwn9jg0d2s7c1kmmvmx61qbyx3qby4js8dks70f1ls"; depends=[curl gargle glue httr jsonlite magrittr purrr rlang tibble uuid]; }; googleformr = derive2 { name="googleformr"; version="0.0.3"; sha256="0smykcjyqmk61ws5jk462l8x5hg0h9nwq55q5pqfgcq1j3yfniqh"; depends=[httr rvest xml2]; }; googlenlp = derive2 { name="googlenlp"; version="0.2.0"; sha256="0d0g18i3im2s5f14k69ym3vwf9a7zkaval3nwrip97xcl6kf4x9h"; depends=[dplyr httr jsonlite purrr readr rlang]; }; googler = derive2 { name="googler"; version="0.0.1"; sha256="1aayji3ncqxl58k29d93dbx05s9rp9bc63fl2cpl1cys7gilblxx"; depends=[jsonlite tibble]; }; googlesheets = derive2 { name="googlesheets"; version="0.3.0"; sha256="11q07nxys72wkxx9mawmjyf20gvwvrb7h3gpa73h6lgh2vgrwnv8"; depends=[cellranger dplyr httr jsonlite purrr readr stringr tibble tidyr xml2]; }; googlesheets4 = derive2 { name="googlesheets4"; version="0.2.0"; sha256="0nkhhh4jg03f2d0iy1lmy6c8mfc3a7k6ixd8h3ngmcxw1g4pagbj"; depends=[cellranger curl gargle glue googledrive httr ids lifecycle magrittr purrr rematch2 rlang tibble vctrs]; }; - googleway = derive2 { name="googleway"; version="2.7.1"; sha256="0axpr81p3gdp1nmfn000lk288sdn8z5qmzjvagdxqn5j44hq6sj1"; depends=[curl googlePolylines htmltools htmlwidgets jpeg jqr jsonlite magrittr scales shiny viridisLite]; }; + googleway = derive2 { name="googleway"; version="2.7.3"; sha256="0n2ybkjwwhq7kpyv0ryz4mp5w06psbcm2gyfwk0d3wp1i43ajsn4"; depends=[curl googlePolylines htmltools htmlwidgets jpeg jqr jsonlite magrittr scales shiny viridisLite]; }; goric = derive2 { name="goric"; version="1.1-1"; sha256="0cqgcgsh3hc2zzyrczw66bbb4gg5xfkjslmrszwxbbn4zl9rkhpn"; depends=[MASS Matrix mvtnorm nlme quadprog]; }; gorica = derive2 { name="gorica"; version="0.1.0"; sha256="09b5i6r2s449gvk0vagvf7kd6y0pgr4cz7hdwplq01x246bhjs6q"; depends=[bain lavaan lme4 MASS mvtnorm quadprog]; }; - gotop = derive2 { name="gotop"; version="0.1.1"; sha256="0jlybfhxjdv92mxm6r47yplnjy6h19sikbgr9n3nsiymcnz8q7ss"; depends=[htmltools jsonlite]; }; + gotop = derive2 { name="gotop"; version="0.1.2"; sha256="1dvcgz7ha637ixjqmgcwhvl3f9kpx4fdq8im40iz8xwnxqwmrlgx"; depends=[htmltools jsonlite]; }; govStatJPN = derive2 { name="govStatJPN"; version="0.1"; sha256="03sywa7rl5rblvv370mfszz5ngp850qf32yydy1fdx10lv5amrfl"; depends=[]; }; govdown = derive2 { name="govdown"; version="0.10.0"; sha256="0zkalxbalbaakyrxwd29yyfmzvdmpb9nfaqyqwj52v64nxgz1v4m"; depends=[rmarkdown]; }; gower = derive2 { name="gower"; version="0.2.2"; sha256="0c9n921wn4hhlvjq96r4nkk96s5788376cbldr7y7bwz348200iz"; depends=[]; }; goxygen = derive2 { name="goxygen"; version="1.0.3"; sha256="0825zl16ap0k3jqhrjw4hfsw97ils77jmf4yqq347k3bb8i3dm79"; depends=[citation gms pander stringi yaml]; }; gpairs = derive2 { name="gpairs"; version="1.3.3"; sha256="08m1ydrr239vnhjbl47mng3i2w9bqmd8fijrwsraq5ysvn826n27"; depends=[barcode colorspace lattice MASS vcd]; }; + gpbStat = derive2 { name="gpbStat"; version="0.3.0"; sha256="1mnmhjcnikjsxdvcb5kkh91zhlvj0h40ypazlkafd1z0yfmv52s4"; depends=[]; }; gpclib = derive2 { name="gpclib"; version="1.5-6"; sha256="11jjgg74l8hy9jz4jylhriqnzv8jcf12y1bkx22v29z3fhgkwkps"; depends=[]; }; gpg = derive2 { name="gpg"; version="1.2.2"; sha256="1qc7w4d6frp0j4yk0q7slkj1mps80bv78lixcpw1shgx48rp41kh"; depends=[askpass curl]; }; - gpindex = derive2 { name="gpindex"; version="0.1.2"; sha256="072f0l40j54b15wxla577rbg6basjzck5qmvmcbvbqfd2jmsm3cw"; depends=[]; }; + gpindex = derive2 { name="gpindex"; version="0.2.3"; sha256="14glwrlkka9izg43wi82q8acsw2fii5i5iw81nyigzkycrix5yj2"; depends=[]; }; gpk = derive2 { name="gpk"; version="1.0"; sha256="1zfhkqyypb24mhbj2zi9qy3gw0kqxvlp8j5ni3zm7k5rz1bnrygg"; depends=[]; }; gplm = derive2 { name="gplm"; version="0.7-4"; sha256="0apvj14nl5qbi4dhhdx5nih5lvjwfcipvr8cyk6xsz4r5gfr2iw4"; depends=[AER]; }; - gplots = derive2 { name="gplots"; version="3.0.4"; sha256="15ip3v4xiqzbanf8bc5fj90cbwdgixr72aj5jrp34jfdzdx0gxwg"; depends=[caTools gdata gtools KernSmooth]; }; + gplots = derive2 { name="gplots"; version="3.1.1"; sha256="0f8khaymz383w2ksnk80d4kpnvgmdk37pbycpsnl2vabaz11kbpr"; depends=[caTools gtools KernSmooth]; }; gpmap = derive2 { name="gpmap"; version="0.1.1"; sha256="00jhslbxbp6dgq7bw346hfpw0gans048vsn7chyzjhyr7ah5xrfg"; depends=[foreach ggplot2 isotone plyr]; }; gppm = derive2 { name="gppm"; version="0.2.0"; sha256="1n9is3xj52lsck2fiy9j320p2ca6ib36s251i7g3iz99a77b0ahh"; depends=[ggplot2 ggthemes MASS mvtnorm Rcpp rstan]; }; - gprofiler2 = derive2 { name="gprofiler2"; version="0.1.9"; sha256="112hmmvdwg8xz90w1bsbzc55y4xi9jj4dqy0q4bsgp49x58r92rb"; depends=[crosstalk dplyr ggplot2 gridExtra jsonlite plotly RCurl tidyr viridisLite]; }; + gprofiler2 = derive2 { name="gprofiler2"; version="0.2.0"; sha256="0q8hl3gdxy34c0181ql405fdklz82nfvmwdcafd5mzf935rjpyjg"; depends=[crosstalk dplyr ggplot2 gridExtra jsonlite plotly RCurl tidyr viridisLite]; }; gptk = derive2 { name="gptk"; version="1.08"; sha256="0fk6c8f8fni4y2n2cbfwywlfyz74xlb8lx25wajsxr2v4x74pa7l"; depends=[fields Matrix]; }; gqlr = derive2 { name="gqlr"; version="0.0.2"; sha256="0gzhqyrbnz3qjzkr4slryrlfhlaxm474y9fahlj0sb0hvcx68pxj"; depends=[graphql jsonlite magrittr pryr R6]; }; gquad = derive2 { name="gquad"; version="2.1-1"; sha256="19k7cqp2j5vb6m9hxdm951wfjh6nsswb64pdz9g93ypcqrg02wa4"; depends=[ape seqinr]; }; @@ -8912,30 +9286,31 @@ in with self; { grabsampling = derive2 { name="grabsampling"; version="1.0.0"; sha256="031a4ak84k2mbhrmjbai3q8qnf2z3d9rp0xra67x74a99av9lzs9"; depends=[extraDistr ggplot2 ggthemes plyr reshape2]; }; gradDescent = derive2 { name="gradDescent"; version="3.0"; sha256="1jxgvnjw9qk5bkb0fw4kyks4vb9d1933jn79ry0w6956mq2xbb79"; depends=[]; }; grade = derive2 { name="grade"; version="0.2-1"; sha256="085hfvqn880yk19axdjv3z9jr33kls212vs172a8mzhnkallph1r"; depends=[]; }; - gradeR = derive2 { name="gradeR"; version="1.0.7"; sha256="063l3wipfzdmh5mphs09f070pif36xp1ma1jvvn83385w3y2b9vd"; depends=[jsonlite testthat]; }; + gradeR = derive2 { name="gradeR"; version="1.0.9"; sha256="052ficcrflplvm79v47hbqlh3z5b4kjq7zjms7i6hv2c3mmvbarr"; depends=[callr jsonlite testthat]; }; gradientPickerD3 = derive2 { name="gradientPickerD3"; version="0.1.0.0"; sha256="0b20iqfipr7migwk1fl4lvdf4ghprqivcgmchfshhr8q82hyd1q0"; depends=[htmlwidgets jsonlite shiny]; }; - grainscape = derive2 { name="grainscape"; version="0.4.2"; sha256="0njwhjg1xz6cbibcdc00qpvii97rri0bm12g1cqf5yvrnax1wyh5"; depends=[ggplot2 igraph raster Rcpp rgdal sp]; }; + grainscape = derive2 { name="grainscape"; version="0.4.3"; sha256="0mc9mgc70ysqal8pjslmr7dzig3d08jcdpba348hmgyh0w9b6s07"; depends=[ggplot2 igraph raster Rcpp rgdal sp]; }; gramEvol = derive2 { name="gramEvol"; version="2.1-4"; sha256="1am5nlnyawi4lybi10ag4fdhddvbwsdzrmr6f66bzspdpl4s26g9"; depends=[]; }; grangers = derive2 { name="grangers"; version="0.1.0"; sha256="15q8hv7p5g5m7v6lx6nq5394fa6p05xgawnsrn1v5aslmmbbzyvl"; depends=[tseries vars]; }; granova = derive2 { name="granova"; version="2.1"; sha256="161fznqlnwmw53abmg2n62lhxxda7400ljnadvcdvsm8f6kcjf80"; depends=[car]; }; granovaGG = derive2 { name="granovaGG"; version="1.4.0"; sha256="0khqlqc6jg9cpdq06g6jlpfjcw3m6rj40ipljfai8g1630ril6q4"; depends=[ggplot2 gridExtra plyr RColorBrewer reshape2]; }; grapes = derive2 { name="grapes"; version="1.0.0"; sha256="079b7w2xhb0a481s7qihhka0l9ydkjdph0865wjjkcbpr4775p26"; depends=[magrittr]; }; - graph3d = derive2 { name="graph3d"; version="0.1.0"; sha256="0l0a8zrjync34zjxp84ng8vmhlmfcirygqd2n4ydpxj690wravps"; depends=[htmlwidgets lazyeval]; }; - graph4lg = derive2 { name="graph4lg"; version="1.0.0"; sha256="0xc7g8b58wgz219g7fhy3jf0glb41vws9lx8bg21jqndzjmrql8h"; depends=[adegenet diveRsity ecodist foreign gdistance ggplot2 igraph MASS Matrix pegas rappdirs raster sf sp spatstat stringr tidyr vegan]; }; + graph3d = derive2 { name="graph3d"; version="0.2.0"; sha256="1c4pmx37nf4nm6svrn9dqr50gb2fckx8635zg0n4gnzgdca1iyv4"; depends=[htmlwidgets lazyeval]; }; + graph4lg = derive2 { name="graph4lg"; version="1.0.1"; sha256="1nx2wws6rxb3rqjzfk0jim1kfgidfvghal51rjrbfknk585k1iaj"; depends=[adegenet diveRsity ecodist foreign gdistance ggplot2 igraph knitr MASS Matrix pegas rappdirs raster Rdpack rmarkdown sf sp spatstat stringr tidyr vegan]; }; graphTweets = derive2 { name="graphTweets"; version="0.5.3"; sha256="0jf52lclwvqgybdj6fknzx046bh6jgwxvqs4c5g1ii8f2lsz9y07"; depends=[combinat dplyr igraph magrittr purrr rlang tidyr zeallot]; }; grapherator = derive2 { name="grapherator"; version="1.0.0"; sha256="071by9b8figbsf4g0f8a8mgcdksjksc57mnlgggilw7py1yjnjlh"; depends=[BBmisc checkmate deldir ggplot2 lhs reshape2 vegan]; }; graphframes = derive2 { name="graphframes"; version="0.1.2"; sha256="1bv7d0sggwab4rd486ayw9gkb5ja5p5fin5pn92xnrmz8cgwsfxq"; depends=[forge sparklyr tibble]; }; + graphhopper = derive2 { name="graphhopper"; version="0.1.1"; sha256="192m008kj1nw6jwank709icgswx316pdwiv4jcffx744kjhxkgh8"; depends=[dplyr googlePolylines httr jsonlite magrittr tibble]; }; graphicalExtremes = derive2 { name="graphicalExtremes"; version="0.1.0"; sha256="1cc4xcb72yci2gq2zn3g1nh3ba802anpymm0hajdbz3kb0wz1gyn"; depends=[igraph matrixcalc mvtnorm Rdpack]; }; - graphicalVAR = derive2 { name="graphicalVAR"; version="0.2.3"; sha256="1xd98irbh67a7vbj6a4arl51dnkj5c0c1mcmh1c1hsac8mdj29w0"; depends=[dplyr glasso glmnet igraph Matrix mvtnorm qgraph Rcpp RcppArmadillo]; }; + graphicalVAR = derive2 { name="graphicalVAR"; version="0.2.4"; sha256="0hfldvw60cac0qdjfdpmx1kbdhhyqw2k0yscyyh886fwr4rvj800"; depends=[dplyr glasso glmnet igraph Matrix mvtnorm qgraph Rcpp RcppArmadillo]; }; graphkernels = derive2 { name="graphkernels"; version="1.6"; sha256="1gn3ihqz7m0rdvvc2fp7hsgq583wh5cnz7200a2ff89xc04zs3dc"; depends=[igraph Rcpp RcppEigen]; }; - graphlayouts = derive2 { name="graphlayouts"; version="0.7.0"; sha256="17lc75k8i3c696hfj44zj7j1a5sb0nap8spc5r98v7vd6xh4nii0"; depends=[igraph Rcpp RcppArmadillo]; }; + graphlayouts = derive2 { name="graphlayouts"; version="0.7.1"; sha256="05v7ss18bflhqa4ipsca8iw2ln8ddbaiyrizx2a5cwq81g5qq3rq"; depends=[igraph Rcpp RcppArmadillo]; }; graphon = derive2 { name="graphon"; version="0.3.4"; sha256="06y8hz0z6rx6ii4p36js8f85vya3v2834pnghng8adk2ibdlsc1s"; depends=[Rdpack ROptSpace]; }; graphql = derive2 { name="graphql"; version="1.5"; sha256="0zi1l93yk5rlgdy4j2nph14w0h8kgvnbzk9fi2jfys8s3fz54ksr"; depends=[jsonlite Rcpp]; }; graphscan = derive2 { name="graphscan"; version="1.1.1"; sha256="1dgjb0grdymhimdgwnddjcivgy2i9r1i1nni4v9mx0447skcahk9"; depends=[ape rgl snowfall sp]; }; graphsim = derive2 { name="graphsim"; version="1.0.1"; sha256="05v5jhb3fpd5vpb12b203mvs9lx25yhwfg5qavw6rc7pgj5z974i"; depends=[gplots igraph Matrix matrixcalc mvtnorm]; }; gratia = derive2 { name="gratia"; version="0.4.1"; sha256="0gxqmnmcz1nlmmlhshfsz7cwjxcp2ha73bjgkb9s5wgwlflpng43"; depends=[cowplot dplyr ggplot2 mgcv mvnfast patchwork purrr rlang tibble tidyr vctrs]; }; graticule = derive2 { name="graticule"; version="0.1.2"; sha256="1yvrijvyjilfql72dxj32b3sczqv065zj61729wrrzn63xcifvmb"; depends=[raster sp]; }; - gratis = derive2 { name="gratis"; version="0.2.0"; sha256="1bbj1b9kamhbd3v8nxwipv5iz7vlhziqn77pzkzndm68dgkdi3bj"; depends=[doRNG dplyr foreach forecast GA magrittr mvtnorm polynom purrr rlang shiny shinydashboard tibble tsfeatures]; }; + gratis = derive2 { name="gratis"; version="0.2.1"; sha256="035jk2nc8xs0n3ak6k6i42h5gw2n57rrrarb1xwb17khg05dzk25"; depends=[doRNG dplyr foreach forecast GA magrittr mvtnorm polynom purrr shiny tibble tsfeatures tsibble]; }; grattan = derive2 { name="grattan"; version="1.9.0.0"; sha256="12vjqlmnymidkapa9zzbk1hcq6cac9669sdsrcaaqn3si0hq0i7l"; depends=[assertthat data_table fastmatch forecast fy hutils ineq magrittr Rcpp zoo]; }; gravitas = derive2 { name="gravitas"; version="0.1.3"; sha256="11n85bdmigqasbq8c1amj1k7manfvs3gnax2ihsf2vp56s9c463p"; depends=[dplyr ggplot2 ggridges ineq lubridate lvplot magrittr RColorBrewer rlang shiny stringr tibble tidyr tsibble]; }; gravity = derive2 { name="gravity"; version="0.9.9"; sha256="1x912mg7cnday7lji48mw9f5drd732qlnrq4d6d75s5pgfps91p6"; depends=[censReg dplyr glm2 lmtest magrittr MASS multiwayvcov purrr Rdpack rlang sandwich survival tibble tidyr]; }; @@ -8949,7 +9324,7 @@ in with self; { gretel = derive2 { name="gretel"; version="0.0.1"; sha256="1yyj4aing56f2vy0gshxwb623g9idg8k4701v3s53lqn4m2ybazk"; depends=[Rcpp ResistorArray]; }; gretlR = derive2 { name="gretlR"; version="0.1.0"; sha256="0lpznicpjlvp5kkhmlfr4as7px545k416i3f54900jnc7xa7fm8p"; depends=[knitr]; }; grex = derive2 { name="grex"; version="1.9"; sha256="0s6nan76rrmh3yhgvzb7pqdrzx2w9px8ay4v9yiib4bamy9wmhpb"; depends=[]; }; - greybox = derive2 { name="greybox"; version="0.6.1"; sha256="0k50fa0s9bs763qk367sl5a4q524dwim8vvj4zxrqa805rqf561r"; depends=[forecast gnorm lamW Matrix nloptr pracma Rcpp statmod zoo]; }; + greybox = derive2 { name="greybox"; version="0.6.4"; sha256="0h9m7xzaknfkbgykj9xrb778pa86yaawh99a0m7fvzbspgig65dw"; depends=[forecast lamW Matrix nloptr pracma Rcpp statmod texreg zoo]; }; greyzoneSurv = derive2 { name="greyzoneSurv"; version="1.0"; sha256="115i0d4fy4p4g4vd419hj9f23hi8cbiyfilgpgmag91ilr1xpcdp"; depends=[Hmisc survAUC survival]; }; grf = derive2 { name="grf"; version="1.2.0"; sha256="1i12a5sa1kg0jh50y0r77qy4fca3j1vqrnlblbh8ldpjy07sln47"; depends=[DiceKriging lmtest Matrix Rcpp RcppEigen sandwich]; }; gridBase = derive2 { name="gridBase"; version="0.4-7"; sha256="09jzw4rzwf2y5lcz7b16mb68pn0fqigv34ff7lr6w3yi9k91i1xy"; depends=[]; }; @@ -8957,32 +9332,36 @@ in with self; { gridDebug = derive2 { name="gridDebug"; version="0.5-1"; sha256="1x1bbyfbyyn13sw5pvnzns6mq57fyq2fywj8hx5k9rhqclzjqxyr"; depends=[graph gridGraphviz gridSVG]; }; gridExtra = derive2 { name="gridExtra"; version="2.3"; sha256="0fwfk3cdwxxim7nd55pn7m31bcaqj48y06j7an2k1v1pybk0rdl1"; depends=[gtable]; }; gridGeometry = derive2 { name="gridGeometry"; version="0.2-0"; sha256="0y7y1ld03cqpibmjssid6n3n8gf98hi9ngcfbkh6acyzck812bc7"; depends=[polyclip]; }; - gridGraphics = derive2 { name="gridGraphics"; version="0.5-0"; sha256="0rlyc3xk8kfrfzbfd8n4javq3yxqd7lsfmi4q5n6s61srnrl6c1r"; depends=[]; }; + gridGraphics = derive2 { name="gridGraphics"; version="0.5-1"; sha256="12yswy02j3h5wir7m5jnkhpjmb0sa4snn61vjd68i49qwsa6w219"; depends=[]; }; gridGraphviz = derive2 { name="gridGraphviz"; version="0.3"; sha256="1jz0d6kc8ci55ffm6dns8bhak9xnaq7mg5mpv3fk53lircn7mwl5"; depends=[graph Rgraphviz]; }; gridSVG = derive2 { name="gridSVG"; version="1.7-2"; sha256="0vxhdz6a759q6q9lpmyjwkvrjr52dfz609jbwrd0pnfyffmmpzh0"; depends=[jsonlite XML]; }; gridsampler = derive2 { name="gridsampler"; version="0.6"; sha256="0wqpqg9c372sv8zqks6v93gawiyfghw58hn7m8q45dxpqm16ss3k"; depends=[BiasedUrn ggplot2 plyr reshape2 shiny shinyBS shinythemes]; }; - gridtext = derive2 { name="gridtext"; version="0.1.1"; sha256="06rb3xn8zf9m1v8kam39a7cp6iaw4xpirwjvp0y99gx3q5ijf5d7"; depends=[jpeg markdown png Rcpp RCurl rlang stringr testthat xml2]; }; + gridtext = derive2 { name="gridtext"; version="0.1.4"; sha256="131kw7nkfwksviwfifd2kk7lyvhxzzzv1nnj8rahkr3dik3akk61"; depends=[jpeg markdown png Rcpp RCurl rlang stringr xml2]; }; gripp = derive2 { name="gripp"; version="0.2.20"; sha256="0rshipm8rdynl19a4dsvvvlhkd0n4vjfkidwnv5iilc5ini7c4qr"; depends=[GA GenSA usethis]; }; - grizbayr = derive2 { name="grizbayr"; version="1.3.0"; sha256="13gwah8s47cybc8pm9vkxm35sbdblmi2p49qw0kr56mk2sfrglf8"; depends=[dplyr magrittr purrr rlang tibble tidyr]; }; + grizbayr = derive2 { name="grizbayr"; version="1.3.1"; sha256="1bsvk52r1zba553x20xkfdjyasyd6r3xrssqb6hrrmkaw6h2qg2m"; depends=[dplyr magrittr purrr rlang tibble tidyr]; }; grnn = derive2 { name="grnn"; version="0.1.0"; sha256="1dxcmar42g9hz4zlyszlmmnnsnja0gxfggav5jxv0gkp32rkd0wh"; depends=[]; }; - grobblR = derive2 { name="grobblR"; version="0.1.0"; sha256="186sawp9yd5idzs4wsk66szy0v6h5dc5kpq72539dck23isb6dsa"; depends=[dplyr ggplot2 glue gridExtra magrittr png purrr RCurl stringr tibble]; }; - groc = derive2 { name="groc"; version="1.0.7"; sha256="1qi16br426z90d58130n47riy7q1lcq19zl585a001av4lrmmqzv"; depends=[MASS mgcv pls robustbase rrcov]; }; + grobblR = derive2 { name="grobblR"; version="0.2.0"; sha256="0zx2lj7m873v5lkvv521q3vsrdqhzkw0zha63qiicqk896gy7isj"; depends=[dplyr ggplot2 glue gridExtra magrittr png purrr RCurl stringr tibble]; }; + groc = derive2 { name="groc"; version="1.0.8"; sha256="0zxwq3ha3sa58v8fhb2s41nqqpsgr3q9j7arlww1zz295mrlrs5i"; depends=[MASS mgcv pls robustbase rrcov]; }; gromovlab = derive2 { name="gromovlab"; version="0.7-6"; sha256="02s7x23610dbpmrqh7pimspa10v3fnmj48fwmh0a6igd74rmj2mg"; depends=[ape cluster glpkAPI igraph quadprog]; }; + groundhog = derive2 { name="groundhog"; version="1.0.0"; sha256="0laxdm52fbii50h3s01kk1frkprq24rn0z03ss54lriq6q4a9swr"; depends=[]; }; groupICA = derive2 { name="groupICA"; version="0.1.1"; sha256="1wl828ligvvw55xic383gdn7aq4mbwsnkl4ym6f71jn5g3p36d0i"; depends=[MASS]; }; groupRemMap = derive2 { name="groupRemMap"; version="0.1-0"; sha256="1bfp746j0dx7kk44nyjqmimvgw14par9ayvqxnzldc05qsazjdwx"; depends=[]; }; groupWQS = derive2 { name="groupWQS"; version="0.0.3"; sha256="1c5yrsfgkhbg1fcjbrilfmf0phjry5z34536yfizc8wbc7mmmj0c"; depends=[glm2 MASS rjags Rsolnp]; }; groupdata2 = derive2 { name="groupdata2"; version="1.3.0"; sha256="01bp7y78vzli178cikkaj48yvik690irxgni77if9dg3rz63gxg5"; depends=[checkmate dplyr lifecycle numbers plyr purrr rlang tibble]; }; grouped = derive2 { name="grouped"; version="0.6-0"; sha256="1glxgacpwk7yjbkwg5ci6bmb2il6hf5zhydwi5bbq6hc032m9976"; depends=[MASS]; }; - groupedSurv = derive2 { name="groupedSurv"; version="1.0.4.1"; sha256="1kapz07hswpcvm9mmgc06l71f7ymx7aq816mzwca6cvccvqnrl5n"; depends=[BH doParallel foreach qvalue Rcpp RcppEigen]; }; - groupedstats = derive2 { name="groupedstats"; version="1.0.1"; sha256="1sry6ccvygx6whg1ls2bx4aqc056z1lil2f5hn5rh20hlsryv186"; depends=[broomExtra dplyr effectsize glue haven ipmisc lme4 parameters purrr rlang skimr tibble tidyr]; }; + groupedSurv = derive2 { name="groupedSurv"; version="1.0.4.2"; sha256="015av2087i0vxh3axl91crwvparhpc4w2p2j9fq7wylg1gsarraa"; depends=[BH doParallel foreach qvalue Rcpp RcppEigen]; }; + groupedstats = derive2 { name="groupedstats"; version="2.0.0"; sha256="1n8g5nhk71yq96hkb9159zmcizby4gcvi875jj745fyf3l01xwd1"; depends=[broomExtra dplyr effectsize glue lme4 magrittr parameters purrr rlang skimr tibble tidyr]; }; + groupr = derive2 { name="groupr"; version="0.1.0"; sha256="1gych92dpyxg2vfm3h6djw61d9z2n6q2kvbz1xpq1p0zcyiw16gy"; depends=[dplyr purrr rlang tibble tidyr vctrs]; }; groupsubsetselection = derive2 { name="groupsubsetselection"; version="1.0.3"; sha256="118cj5xc8nbq4fs2gbzg1nhynixaflbl0si77gyy4ybw0drsz4nj"; depends=[]; }; grove = derive2 { name="grove"; version="1.1"; sha256="0fqsj5dx7py7cin3hvfkxglh8v3x0dwj6cxy4h5vbddjl687db5x"; depends=[Rcpp RcppArmadillo wavethresh]; }; growfunctions = derive2 { name="growfunctions"; version="0.14"; sha256="1pvyiw20fxm3l4giyq4iizc67yy36i6wq4ch2qyqg4mfd4bki2g4"; depends=[ggplot2 mvtnorm Rcpp RcppArmadillo reshape2 spam]; }; growth = derive2 { name="growth"; version="1.1.1"; sha256="05yxjlbv1i4ly8yp3aqbxzq1z2mp7sfx7xyqw48qsdv0acqai7jy"; depends=[rmutil]; }; - growthPheno = derive2 { name="growthPheno"; version="1.0-26"; sha256="1niwlwrzz3d0r274nlk0fyx3hx6i7n7xg3ibd8s7cl2q4d2f8ic9"; depends=[dae GGally ggplot2 Hmisc RColorBrewer readxl reshape stringi]; }; + growthPheno = derive2 { name="growthPheno"; version="1.0-30"; sha256="1bvhrnams0x8p9ck1cfm9a1c7m9x80xhw9y24mafzparc2wljyxx"; depends=[dae GGally ggplot2 Hmisc RColorBrewer readxl reshape stringi]; }; + growthcurver = derive2 { name="growthcurver"; version="0.3.1"; sha256="1l3dqcl395nh406s7d5554r5ynk1a7v5ba5kmnv9r7lj7h9nfdjj"; depends=[minpack_lm]; }; growthmodels = derive2 { name="growthmodels"; version="1.2.0"; sha256="1wy5z77819s3daa0mifafcjfkggsq0ac522yagj86ml3vf7yqppj"; depends=[]; }; growthrate = derive2 { name="growthrate"; version="1.3"; sha256="1ak3yqlm7dnkdjlmikwa57qnf7yd9n1ixz36gv3shr252750x9cd"; depends=[clime Matrix mvtnorm]; }; - growthrates = derive2 { name="growthrates"; version="0.8.1"; sha256="1ivids4qfyhi3k5l6mvi6bhajnbxhiqmm4qdcmmfrmzs8c59cvvm"; depends=[deSolve FME lattice]; }; + growthrates = derive2 { name="growthrates"; version="0.8.2"; sha256="0skhjmqkl456l325346qi5vc7h4dmk3mqk4z1cm33ycynnnacsc2"; depends=[deSolve FME lattice]; }; + grpCox = derive2 { name="grpCox"; version="1.0.1"; sha256="07l0gv8yc5yqp7zwqawc71kkdab6fsfrb25mp2gynlb7vabh8isy"; depends=[colorspace MASS Matrix Rcpp RcppEigen]; }; grpSLOPE = derive2 { name="grpSLOPE"; version="0.3.0"; sha256="0v20v3rdjmz517rl86nkrsaa1dl2p49kdkgk7ynv92p2ib37wwga"; depends=[Rcpp]; }; grplasso = derive2 { name="grplasso"; version="0.4-7"; sha256="0jf48ahc6d6biwx235dlvbk1papxkqbcnvxsr93p5047pjm02y3a"; depends=[]; }; grplassocat = derive2 { name="grplassocat"; version="1.0"; sha256="0pi5vq7yqg0ha91y6296ckshxyq3135cg6zcs9x6xba5m5024k4p"; depends=[grplasso]; }; @@ -8992,14 +9371,14 @@ in with self; { gsDesign = derive2 { name="gsDesign"; version="3.1.1"; sha256="17sm1rqvp39apjxb35mhq7rjv70nanqsihv4h5m7cyx8nkxmviyj"; depends=[dplyr ggplot2 mvtnorm plyr rlang tibble xtable]; }; gsEasy = derive2 { name="gsEasy"; version="1.3"; sha256="00471kfjb6zw3n4nbx3a91xjn748hw3xpl9pq5sgbrf6xg9gcf7c"; depends=[ontologyIndex Rcpp]; }; gsalib = derive2 { name="gsalib"; version="2.1"; sha256="1k3zjdydzb0dfh1ihih08d4cw6rdamgb97cdqna9mf0qdjc3pcp1"; depends=[]; }; - gsarima = derive2 { name="gsarima"; version="0.1-4"; sha256="1ay3iamnvg7mbnl1xaxxcyic559bdnfspy883w2bwgy20yhr34yg"; depends=[MASS]; }; + gsarima = derive2 { name="gsarima"; version="0.1-5"; sha256="0nmn4hlvhl8dw7pkpf010x9qjd6w8drdlcj47qv0sap8wngrwhzg"; depends=[MASS]; }; gsbDesign = derive2 { name="gsbDesign"; version="1.0-1"; sha256="0wb62y4fcca1qq27kgk59qxm1nx5njcs94cr8x1bsnk88z945p9p"; depends=[gsDesign lattice]; }; - gsbm = derive2 { name="gsbm"; version="0.1.1"; sha256="1d8hg4xb5siy4x5vkl6ijblzm1lghhypd2mpg0msf5g0ximqsnpk"; depends=[RSpectra softImpute]; }; + gsbm = derive2 { name="gsbm"; version="0.2.1"; sha256="16j4g0wl9phmx85dbrzxsdjcv0nnipgj214fvbz9m6n66khr5pkp"; depends=[doParallel foreach Matrix RSpectra softImpute]; }; gscaLCA = derive2 { name="gscaLCA"; version="0.0.5"; sha256="12zksjp0wh95qg7vxh22z652hk35r9sp0qxrms4y1laixa8vr71x"; depends=[devtools doSNOW fastDummies fclust foreach ggplot2 gridExtra MASS nnet progress psych stringr]; }; gscounts = derive2 { name="gscounts"; version="0.1-3"; sha256="1xcsvnam858l9am30mmqb6m0vcflijhli22ix8g56rcvfsh208q1"; depends=[Rcpp]; }; gset = derive2 { name="gset"; version="1.1.0"; sha256="1gingqw6la8n7mnl47wpz9sicxca4zi2m8p35n6cnihrniibhajc"; depends=[Hmisc MCMCpack mvtnorm]; }; gsheet = derive2 { name="gsheet"; version="0.4.5"; sha256="0b8q44cqkjfy6vnffm94czq4ag8xfbxik52026ahq95kcf9v2j91"; depends=[httr stringr]; }; - gskat = derive2 { name="gskat"; version="1.0"; sha256="19mbif7wr88vk5wlc7m2l4xghjmfj2qd3s8yvjlkawbnjk8x6ib0"; depends=[CompQuadForm e1071 gee geepack Matrix]; }; + gsisdecoder = derive2 { name="gsisdecoder"; version="0.0.1"; sha256="1h7a9j4gsdk8nasfkzfizlarx335ra0j0yz98a2000v2qzm2a5qy"; depends=[Rcpp]; }; gsl = derive2 { name="gsl"; version="2.1-6"; sha256="0p4rh7npp6qbfc5sxjq86xjn7c9ivf3pd60qf1hldwckjqin7m7m"; depends=[]; }; gsloid = derive2 { name="gsloid"; version="0.1.0"; sha256="1ma5si86ynfsis0pnw8hyv6xc4frbkhy5ks03mr0z16gasffkycg"; depends=[]; }; gsmoothr = derive2 { name="gsmoothr"; version="0.1.7"; sha256="00z9852vn5pj04dhl3w36yk0xjawniay6iifw1i7fd8g98mgspxp"; depends=[]; }; @@ -9016,13 +9395,13 @@ in with self; { gtable = derive2 { name="gtable"; version="0.3.0"; sha256="1lyncxf2dqdjgw1071cn9c8zwzkz6sldnd5cgmicf70bc726qf7x"; depends=[]; }; gtcorr = derive2 { name="gtcorr"; version="0.2-1"; sha256="1n56zmyv58jwr95p453jb86j82pdnq57gfc8m15jndjc9p31zl0m"; depends=[]; }; gte = derive2 { name="gte"; version="1.2-2"; sha256="1x528iakyjhh4j92cgm6fr49a3rdi4cqy28qhsfr2dwvxzxchl6h"; depends=[survival]; }; - gtfs2gps = derive2 { name="gtfs2gps"; version="1.2-1"; sha256="1b3l81898yqgr6x0lcc7anw35yvmy5c08qfv9n0445yfyazjwczm"; depends=[data_table furrr future lwgeom magrittr pbapply raster Rcpp rgdal rgeos sf sfheaders sp units]; }; - gtfsrouter = derive2 { name="gtfsrouter"; version="0.0.1"; sha256="0znr0hw6f8wxy3vj944lrlsb0a70w2p20gw50jr2ij9xikawh2ih"; depends=[data_table Rcpp]; }; + gtfs2gps = derive2 { name="gtfs2gps"; version="1.3-2"; sha256="0vw4ccvszwiwklj9z50cjmvv1yaw2mm3npfgw2gvi2w10bv6z3fv"; depends=[data_table furrr future lwgeom magrittr pbapply progressr raster Rcpp rgdal rgeos sf sfheaders sp units zip]; }; + gtfsrouter = derive2 { name="gtfsrouter"; version="0.0.4"; sha256="1hzln0a8lmsk5ia37w75dcbcfc61ykf39qd5b0xyfzhkm3fih0cv"; depends=[cli data_table Rcpp]; }; gtheory = derive2 { name="gtheory"; version="0.1.2"; sha256="1xc1jl69z5csalqk3hx83s53awcl1fjq6p0x2pczhs7dsvwd6lks"; depends=[lme4]; }; gtools = derive2 { name="gtools"; version="3.8.2"; sha256="1pnwy412wvhhvnnx8qg6s9hrgcnsfhnfcpf2560ipipk845acfsh"; depends=[]; }; gtop = derive2 { name="gtop"; version="0.2.0"; sha256="1nvvbf181x0miw3q0r2g0nklz29ljdsd07cazaajfls7pmhi0xw9"; depends=[hts lassoshooting quadprog]; }; - gtrendsR = derive2 { name="gtrendsR"; version="1.4.6"; sha256="0v46j1k7yzqhl6x6axq96rv4icwfvvscdzkd6wpl3si8qy3m4dp9"; depends=[anytime curl ggplot2 jsonlite]; }; - gtsummary = derive2 { name="gtsummary"; version="1.3.3"; sha256="1c3fzvb0y9jfzkaq86fjlm2kfdxin8ny1xc2hi88cy720bimaldq"; depends=[broom broom_mixed dplyr forcats glue gt knitr lifecycle magrittr purrr rlang stringr tibble tidyr tidyselect usethis]; }; + gtrendsR = derive2 { name="gtrendsR"; version="1.4.7"; sha256="1w0b8xcnkx8lnn2a9cc6z7jxbpyfk3lrysf0rz299yykgb6iczc6"; depends=[anytime curl ggplot2 jsonlite]; }; + gtsummary = derive2 { name="gtsummary"; version="1.3.5"; sha256="01yzv1n1l60q1p8psxxwwbmszh9q691h1nkyv0kaqmni6y9jk8gy"; depends=[broom broom_mixed dplyr forcats glue gt knitr lifecycle magrittr purrr rlang stringr tibble tidyr tidyselect usethis]; }; guaguas = derive2 { name="guaguas"; version="0.1.0"; sha256="10f5kbd03szx2pmmcm2zjjv8zkm0hdf0lk3s91yk40x80s2bxccs"; depends=[tibble]; }; guardianapi = derive2 { name="guardianapi"; version="0.1.1"; sha256="17xmmr6pfzhdnmf45jzvk84gbfnmlw1qfv1gqjaw85vgm8b6jn6l"; depends=[dplyr httr jsonlite rlang tibble]; }; guess = derive2 { name="guess"; version="0.1"; sha256="198pxi0yipgm9wccpj3y4a0gkibhyxcmb7v5dz7ipzrk44ha5g6j"; depends=[Rsolnp]; }; @@ -9032,57 +9411,57 @@ in with self; { gunit = derive2 { name="gunit"; version="1.0.0"; sha256="0vmm47f21n9f334aj38gzrmv1c4sp76njk95ld9gv6fcfxgsipyh"; depends=[magrittr stringr tibble units]; }; gunsales = derive2 { name="gunsales"; version="0.1.2"; sha256="02vz16lhym72vvf48yai1g371wygdlmi63a6ylc147l0b69jgw31"; depends=[data_table dplyr ggplot2 seasonal x13binary zoo]; }; gustave = derive2 { name="gustave"; version="0.4.1"; sha256="1sdfx3zmnamdwgnyvs3rn38wmwiyww1a620jyfc984b9r2zqvd1w"; depends=[Matrix]; }; - gutenbergr = derive2 { name="gutenbergr"; version="0.1.5"; sha256="1c6n2vj38srqmlcl0d2yp749rhn9n5mmz31x98fij4x55km53sci"; depends=[dplyr lazyeval purrr readr stringr urltools]; }; + gutenbergr = derive2 { name="gutenbergr"; version="0.2.0"; sha256="0m7j68zcm0aikjpavmw1yfdph68jqhm1665bl64n276675m98i3w"; depends=[dplyr lazyeval purrr readr stringr urltools]; }; gvc = derive2 { name="gvc"; version="5.2.0"; sha256="15z4r8xkz0alabh3z278hylz042f2r5cqdllc5n3hfx5q3ch19xx"; depends=[decompr diagonals]; }; gvcR = derive2 { name="gvcR"; version="0.1.0"; sha256="0r54924b9a65k11p8y3p7jxbvmpb7s7vs87v65hhl98gxacj5hk8"; depends=[dplyr eda4treeR lme4 magrittr]; }; gvcm_cat = derive2 { name="gvcm.cat"; version="1.9"; sha256="1kwfcmnl1ivv1lh3zxccwls2xfyx3l8v71ngc0bg6441i81d4xp5"; depends=[MASS Matrix mgcv]; }; gvlma = derive2 { name="gvlma"; version="1.0.0.3"; sha256="16dhd407bwjs91c3p9kk43646197s7n9vbyghxb4ckrpv3fsaxp0"; depends=[]; }; + gwasforest = derive2 { name="gwasforest"; version="1.0.0"; sha256="122fg4pc409lvw4yvrc8ijm6d6j29b4aacd319a16caxkkydgwlb"; depends=[colorspace data_table dplyr ggplot2 ggrepel glue]; }; gwdegree = derive2 { name="gwdegree"; version="0.1.1"; sha256="0p06hjp7vay83kbpqsgfr1d8z3ayv483rxbv86fdka94gvi1sjyc"; depends=[dplyr ergm ggplot2 gtools magrittr network scales shiny shinydashboard sna tidyr]; }; - gwer = derive2 { name="gwer"; version="2.0"; sha256="05wz3ayhplmjwbdb6mg8m5mj6gw0n8rh55lw208wbdm6c8jmjywc"; depends=[assertthat glogis maptools Matrix sp spData spdep spgwr]; }; + gwer = derive2 { name="gwer"; version="2.1"; sha256="0vhqw12qk5a21nzs4x2cvl2hzwcbmbzghnxajda9pz5r3vcvl8v2"; depends=[assertthat glogis maptools Matrix sp spData spdep spgwr]; }; gwerAM = derive2 { name="gwerAM"; version="1.0"; sha256="1c3rzd1jf52a4dn63hh43m9s9xnjvqn67amlm9z1ndrnn6fwfg1b"; depends=[MASS Matrix]; }; gwfa = derive2 { name="gwfa"; version="0.0.4"; sha256="0jz82d9lfyd07z0jjlfqzsg7a3vnyz0s1j0rrb5sg9pnvcfjk9qy"; depends=[Rcpp sp]; }; gwrpvr = derive2 { name="gwrpvr"; version="1.0"; sha256="0x15nv2pfv99c04lgs6q6hgczarld34xc4aqw9bn179m7j02v6m3"; depends=[]; }; gwrr = derive2 { name="gwrr"; version="0.2-1"; sha256="1fjk217pimnmxsimqp9sn02nr1mwy3hw3vsr95skbfsd6vdda14d"; depends=[fields lars]; }; - gwsem = derive2 { name="gwsem"; version="2.0.5"; sha256="104inkhim42wrnrbx9kbg0cbdlwj07k9j5m8xd9nhkrbyn4lnyzn"; depends=[BH data_table lifecycle OpenMx qqman Rcpp]; }; + gwsem = derive2 { name="gwsem"; version="2.0.7"; sha256="0pzg0fzxkf2i8br57yfdz05xjkb3cvag7whya1skhnxgi4w4wkhz"; depends=[BH data_table lifecycle OpenMx qqman Rcpp]; }; gym = derive2 { name="gym"; version="0.1.0"; sha256="0vcwzgawqwjsf65hr1mbjkz3px8zsibfkn42jpsg39n13jpfjq8v"; depends=[httr jsonlite]; }; - h2o = derive2 { name="h2o"; version="3.30.0.1"; sha256="1xdhd0h0hncg7s5nsrb97arqiyd9r3cxv1in36lx7pyplxcfy4fb"; depends=[jsonlite RCurl]; }; + h2o = derive2 { name="h2o"; version="3.32.0.1"; sha256="0rmba0yn1ghh9201rn8q948bkx3wi0gwvavwn51h5kxfwj0in5l6"; depends=[jsonlite RCurl]; }; h2o4gpu = derive2 { name="h2o4gpu"; version="0.2.0"; sha256="06d2rrr27xvnsai6zjiaiw0jjfzdza1cc39c03d6pjkvnh0mqh2c"; depends=[magrittr reticulate]; }; hBayesDM = derive2 { name="hBayesDM"; version="1.0.2"; sha256="04p4d0hy2l6bmxyh2k5q0g19b7fbpsl9frmcvrf5rxkaasxyxwn6"; depends=[BH data_table ggplot2 loo Rcpp RcppEigen rstan StanHeaders]; }; hIRT = derive2 { name="hIRT"; version="0.3.0"; sha256="0s0i6p9iv0yv0l15dnwkpcmc91751jyjs1y1nz671lz6jpb8rz5c"; depends=[ltm Matrix pryr rms]; }; hJAM = derive2 { name="hJAM"; version="1.0.0"; sha256="1pnjcn54zi4d7h9zc9wr1gv51dzb0vasfcrw4c1kqymhxsq2yfh3"; depends=[dplyr ggplot2 ggpubr reshape2]; }; - hNMF = derive2 { name="hNMF"; version="0.9"; sha256="0qavavgiqah4dv0gz8v5ssz637sd341n9s0pyc232n2jhqpzl0cz"; depends=[MASS NMF nnls oro_nifti R_matlab rasterImage spatialfil]; }; - hR = derive2 { name="hR"; version="0.2.2"; sha256="01yrhxy6jw97fsvw4g0r2nz5112gpi62zcazxzi2576hvbwafpdv"; depends=[data_table data_tree knitr rhandsontable shiny]; }; + hNMF = derive2 { name="hNMF"; version="1.0"; sha256="08xn9i24dcykvbcsqzmk33li5fm1alkvcmq2fp0a2ysw4lvwfwqs"; depends=[MASS NMF nnls oro_nifti rasterImage]; }; + hR = derive2 { name="hR"; version="0.2.41"; sha256="0xy4m6dibdmjvh81amp81cq6aa0ffsry9gjrkpm476mchsym2ip7"; depends=[data_table knitr rhandsontable shiny]; }; hSDM = derive2 { name="hSDM"; version="1.4.1"; sha256="1jwqjzr0zpckzh2jpqh17v6ypq4mzn5khlv6p37y59zz8bh9mvxp"; depends=[coda]; }; haarfisz = derive2 { name="haarfisz"; version="4.5"; sha256="1qmh4glwzqwqx3pvxc71rlcimp1l0plgdf380v9hk0b4gj7g3pkf"; depends=[wavethresh]; }; hablar = derive2 { name="hablar"; version="0.3.0"; sha256="12gm5n3p2kmjwhkf60n4bjn3lrj7lrs5sgmvads9sfp2ckhaiysk"; depends=[dplyr lubridate purrr]; }; hackeRnews = derive2 { name="hackeRnews"; version="0.1.0"; sha256="0vrdbk4dxbykb3hs35nxkl3s2ds92gs5qz66p85w8j5zjmwbw2x6"; depends=[future_apply httr jsonlite tibble]; }; - hacksaw = derive2 { name="hacksaw"; version="0.0.1"; sha256="0w00kws8gwwmqbrrhhavh3n011dhicz7fz9qmnj74016srzzvddw"; depends=[dplyr magrittr purrr rlang tibble tidyselect zeallot]; }; - hadron = derive2 { name="hadron"; version="3.1.0"; sha256="0fcl7mgw61jcpyn1m4l1n4hm01addza9pnb7l7xbhq6kx524kzcs"; depends=[abind boot R6 Rcpp stringr]; }; - hagis = derive2 { name="hagis"; version="3.0.1"; sha256="1bljpva3j7x87hdmy8s9sh37r5vd8wkjzjqbk57akl654x6b0gfv"; depends=[data_table ggplot2 pander]; }; + hacksaw = derive2 { name="hacksaw"; version="0.0.2"; sha256="1ls4l53bsaxyd6lwka9z9sb6ypa2ymbxpfxhsj9k966031jv2vk3"; depends=[dplyr magrittr purrr rlang tibble tidyselect zeallot]; }; + hadron = derive2 { name="hadron"; version="3.1.2"; sha256="04qd3lb6im5shf24ss88jkskab1rwn7m2d94x0ybbmfcg3l5dhm0"; depends=[abind boot dplyr R6 Rcpp stringr]; }; + hagis = derive2 { name="hagis"; version="3.1.1"; sha256="15hv1ib516i4bkjr5d6xqagzjs9vd8hv7nylq29h57kxms0mddzl"; depends=[data_table ggplot2 pander]; }; hail = derive2 { name="hail"; version="0.1.1"; sha256="1nrc9msqyy5iq2i6p8875anbqswxl2z6vdd4hvihnl22qh5fnbvh"; depends=[]; }; hal9001 = derive2 { name="hal9001"; version="0.2.6"; sha256="1yzxskv4bvawss4vlcb2gh2v43jcnx799xnqrx37zhjd34wpm2w4"; depends=[assertthat glmnet Matrix origami Rcpp RcppEigen]; }; - haldensify = derive2 { name="haldensify"; version="0.0.5"; sha256="02bmch7impx5cyv7nifhqln2ppk1qyyzr8w6my77p18wx52h1d4l"; depends=[assertthat data_table future_apply ggplot2 hal9001 origami Rdpack]; }; + haldensify = derive2 { name="haldensify"; version="0.0.6"; sha256="086p3an0m3mccf14p6bl6s01xvh24wkb4p39vgdyrsf83318d0h8"; depends=[assertthat data_table future_apply ggplot2 hal9001 matrixStats origami Rdpack]; }; halfcircle = derive2 { name="halfcircle"; version="0.1.0"; sha256="1gbqbv3cn8w09i3f2ji3qq0snb4fy9243y12agw686fx46dfmhxs"; depends=[scales]; }; hamlet = derive2 { name="hamlet"; version="0.9.6"; sha256="076fh28grlrv38qywshi79m84jsz1ck9k4n0rg4svvr3gqkdbcn2"; depends=[]; }; - handlr = derive2 { name="handlr"; version="0.2.0"; sha256="1p14q9swvy8yvd52wcms777vfcb9vandi0pd4cmqmyz1hpsi31d8"; depends=[crul jsonlite mime RefManageR urltools xml2]; }; + handlr = derive2 { name="handlr"; version="0.3.0"; sha256="0l0jwlslz2pyg7q447k56acfhgmx5njsriqdrwd02zzbsc3g6wm5"; depends=[crul jsonlite mime urltools xml2 yaml]; }; handyplots = derive2 { name="handyplots"; version="1.1.3"; sha256="0pcl0iichdw2lkv8y00mv6n6c0rvrnsk75ka5lwm2g7b64pphsvk"; depends=[]; }; hans = derive2 { name="hans"; version="0.1"; sha256="0hh2nlzxs2kj93yb7yfm873m6nymjw5qmkin3qqn3acza6dr0k6q"; depends=[Rcpp]; }; hansard = derive2 { name="hansard"; version="0.8.0"; sha256="00mcy58nhlphb0v0wchbaw1qamm0435s09nxxw6rr5z872rhyf5a"; depends=[dplyr jsonlite lubridate snakecase tibble tidyr]; }; hapassoc = derive2 { name="hapassoc"; version="1.2-8"; sha256="0qs5jl0snzfchgpp6pabncwywxcmi743g91jvjiyyzw0lw85yv4s"; depends=[]; }; - haplo_stats = derive2 { name="haplo.stats"; version="1.8.2"; sha256="13gc980jk1pas7mz9b4nmwqd64qhh2c0xhq1z06z67jgv7k8n7dc"; depends=[arsenal rms]; }; - haploR = derive2 { name="haploR"; version="4.0.1"; sha256="0qaykwlid1q03ba2qlvg51y1lghwqqwrv8glsqg5wfyqk34n2gs0"; depends=[DT httr plyr RCurl RJSONIO RUnit tibble XML]; }; + haplo_stats = derive2 { name="haplo.stats"; version="1.8.6"; sha256="1imz4gs0n57vixwwbirrihpgvn2pyj5da4rgjcjk14n2xkk0nay7"; depends=[arsenal rms]; }; + haploR = derive2 { name="haploR"; version="4.0.2"; sha256="1s9019683fgp6sxxjigr5rkpkdj3lxn576a8w067sh6k66138w31"; depends=[DT httr plyr RCurl RJSONIO RUnit tibble XML]; }; haploReconstruct = derive2 { name="haploReconstruct"; version="0.1.2"; sha256="17zdl9c3yy6jdzv1wp0ailbga456pmmybzxh3dldymhj8qf32cx0"; depends=[data_table dbscan foreach gplots igraph matrixStats stringi zoo]; }; haplotyper = derive2 { name="haplotyper"; version="0.1"; sha256="0pcshlh29c4zazhkcq4371kqh9inrbx494y5a1qb1k2c92fkax31"; depends=[]; }; haplotypes = derive2 { name="haplotypes"; version="1.1.2"; sha256="07grdwli0kxnnnf7mg8z7gjpny88h71vf867g50f08yybgb46y70"; depends=[ape network phangorn plotrix sna]; }; happybiRthday = derive2 { name="happybiRthday"; version="0.0.1"; sha256="0rrvi5kx09p74xwxvqcwibbh4qjlk4jxb89grx74chjxk9ak2yv8"; depends=[data_table dplyr gh lubridate tidyr]; }; happytime = derive2 { name="happytime"; version="0.1.0"; sha256="03iblwb6w2dh9sibfi4nlswidck13hzsn7123838zp4sxfnrp041"; depends=[]; }; hapsim = derive2 { name="hapsim"; version="0.31"; sha256="0jw6iw89d4y8wjy58biv40szp123ql7frz1mmdjdxljmwaby963h"; depends=[MASS]; }; - hardhat = derive2 { name="hardhat"; version="0.1.4"; sha256="0gaj4hr4dj27jaasp7v0hzaivipplvq746ajsyz4yd1in03hfjvs"; depends=[glue rlang tibble vctrs]; }; + hardhat = derive2 { name="hardhat"; version="0.1.5"; sha256="1b7f9i9fy39j9n03g40vd6nzgq9fgq914xg3svf84najlknvjzly"; depends=[glue rlang tibble vctrs]; }; harmonicmeanp = derive2 { name="harmonicmeanp"; version="3.0"; sha256="17irfw8788yhh36698p9w8wab6wcin1yzfinlbs3gdg70d42zcnd"; depends=[FMStable]; }; harrietr = derive2 { name="harrietr"; version="0.2.3"; sha256="0n6vsqysj4ijh06z6nqmj8x1z4w9711dxhbfp8p8fwi0l75pj0cj"; depends=[ape dplyr ggtree lazyeval magrittr rlang tidyr]; }; harrypotter = derive2 { name="harrypotter"; version="2.1.1"; sha256="1j3sv0rpp4lcrf09j4a3an4lkwi2x1z18iv62fk6c2kpp9b14b8r"; depends=[ggplot2 gridExtra]; }; hash = derive2 { name="hash"; version="2.2.6.1"; sha256="0b3fl0rvgwb992knl81vm99lsldg5clvaqjh6mamm6zqmb6dz056"; depends=[]; }; - hashFunction = derive2 { name="hashFunction"; version="1.0"; sha256="1v57xj8xwv6xhxvgp0zxgvs5vcjw8z5k2ciwbn0jxf4ilyd66cgj"; depends=[]; }; hashids = derive2 { name="hashids"; version="0.9.0"; sha256="0233qly4rb1g4znxm9h9h8gskzrjyav6nd26xkdl7990m5hcbcwh"; depends=[]; }; hashr = derive2 { name="hashr"; version="0.1.3"; sha256="0xbwzhvg77ch4na9ylb8y8nghmpy38dxcvn4g6g6adarm3lbm4ck"; depends=[]; }; hasseDiagram = derive2 { name="hasseDiagram"; version="0.1.3"; sha256="1r9z6jc9lbdj2xc81gpnbswrl8rhs8zrlsnypfrny40g3j402iap"; depends=[graph Rgraphviz]; }; @@ -9110,25 +9489,30 @@ in with self; { hdf5r = derive2 { name="hdf5r"; version="1.3.3"; sha256="0i8m4yjxggrs05slq2afvz2ckl1yc9wq7gd1s7dq2gjn46zkry50"; depends=[bit64 R6]; }; hdfqlr = derive2 { name="hdfqlr"; version="0.6-1"; sha256="1z8sylaaki8ab9k7m4hp3530rnkxjh39zvw4n962fw5fb9a11dx3"; depends=[]; }; hdi = derive2 { name="hdi"; version="0.1-7"; sha256="1q58bvlqh59hv3vb3dw92r0w1nwyifnqm5ccss54fzmf2gjsj1cj"; depends=[glmnet linprog MASS scalreg]; }; + hdiVAR = derive2 { name="hdiVAR"; version="1.0.1"; sha256="0rq5vsi0s3y9rkkzijkicrlg55vjqklniizmx4dqs3ib18jbh94l"; depends=[abind lpSolve]; }; hdlm = derive2 { name="hdlm"; version="1.3.1"; sha256="1zl6bksw0apkmn5shf8qjpxjyx6vb40dc4m4db76hhn5nhcp10ic"; depends=[foreach glmnet iterators MASS Matrix]; }; hdm = derive2 { name="hdm"; version="0.3.1"; sha256="1kibfc1fc94y1vk06nn0yfvpdzcm30a1jn89lqqfma70x5jpa25s"; depends=[checkmate Formula ggplot2 glmnet MASS]; }; hdme = derive2 { name="hdme"; version="0.3.3"; sha256="1i6ixzl8kkj7jlj5q40xhbblw5a64fq0gfy6z6174fn2h8f4dqkj"; depends=[ggplot2 glmnet Rcpp RcppArmadillo Rdpack Rglpk]; }; hdnom = derive2 { name="hdnom"; version="6.0.0"; sha256="0wszxxfz5xkyqd3xgc9g3d5iwwsfkq9517bgp416h6l31ynxxrwn"; depends=[foreach ggplot2 glmnet gridExtra ncvreg penalized survAUC survival]; }; + hdpGLM = derive2 { name="hdpGLM"; version="1.0.0"; sha256="04mn0cbbx66218rsd273yh29h28f1xl8k0whwlyn6hrg035mlk0x"; depends=[coda data_table dplyr formula_tools ggjoy ggplot2 ggpubr ggridges Hmisc isotone LaplacesDemon magrittr MASS MCMCpack mvtnorm purrr questionr Rcpp RcppArmadillo rprojroot stringr tibble tidyr tidyverse]; }; hdpca = derive2 { name="hdpca"; version="1.1.3"; sha256="09h96wm6r6w1imkm4k9bg5l0vcq2yvbp6iqx786x99ds8jzppsb9"; depends=[boot lpSolve]; }; hdrcde = derive2 { name="hdrcde"; version="3.3"; sha256="0c2qbw4c3mq1cb068kjs72rxlbibz8svwcrx853jyr8ybs23z7ab"; depends=[ash ggplot2 KernSmooth ks locfit RColorBrewer]; }; hds = derive2 { name="hds"; version="0.8.1"; sha256="1smg5ixrl7f2x3wn7s5i26dyadn5sigpf4jsk236z1bhnz617ax4"; depends=[survival tensor]; }; healthcareai = derive2 { name="healthcareai"; version="2.5.0"; sha256="05qsmgrnaagnavlrs9c6j01j9c3lcc9j7cmbrx3y6lb6pf4zs195"; depends=[caret cowplot data_table dplyr e1071 generics ggplot2 glmnet lubridate MLmetrics purrr ranger recipes rlang ROCR stringr tibble tidyr xgboost]; }; + healthfinance = derive2 { name="healthfinance"; version="0.1.0"; sha256="163zhdd5mqp0q872dmr3xzw2ppapnwp46rr7vkkfnglz635nxvpz"; depends=[ggplot2 lubridate readr scales shiny tibble]; }; healthforum = derive2 { name="healthforum"; version="0.1.0"; sha256="13ih00amv9hrpngm6pxc8vzqzhx8c0yqgaprxdcp5li90lg5r3av"; depends=[magrittr purrr rvest stringr tokenizers xml2]; }; + healthyR = derive2 { name="healthyR"; version="0.1.1"; sha256="18id31pb0ja0d41fklzv4zbbly2rk4yfwx8r5mb1g270dccadr6s"; depends=[cowplot dplyr ggplot2 lubridate magrittr purrr rlang scales stringr tibble timetk writexl]; }; + healthyR_data = derive2 { name="healthyR.data"; version="1.0.0"; sha256="1xsbvv21s01wrkag4njbh428019nl47pp7722b6gazqd9a855yhp"; depends=[]; }; heatex = derive2 { name="heatex"; version="1.0"; sha256="0c7bxblq24m80yi24gmrqqlcw8jh0lb749adsh51yr6nzpap6i9n"; depends=[]; }; heatmap_plus = derive2 { name="heatmap.plus"; version="1.3"; sha256="0rzffm15a51b7l55k0krk6w7v8czy3vpwz1qmbybr7av0pln7wn3"; depends=[]; }; heatmap3 = derive2 { name="heatmap3"; version="1.1.7"; sha256="1gdjc5b4f4nf5zpfdl0ch352p3bwbcw5hkd5vlarxvb2qkf9pcxs"; depends=[fastcluster]; }; heatmapFit = derive2 { name="heatmapFit"; version="2.0.4"; sha256="1rswp1wp58f21fpyjybcvvmnn53kr54ij83hp05qbvl7yn1fsnrb"; depends=[]; }; - heatmaply = derive2 { name="heatmaply"; version="1.1.0"; sha256="133q8ir45vhfxs2lnd96k97g21ihg2arfhp349kmk339pk32fcxz"; depends=[assertthat colorspace dendextend egg ggplot2 htmlwidgets magrittr plotly RColorBrewer reshape2 scales seriation viridis webshot]; }; + heatmaply = derive2 { name="heatmaply"; version="1.1.1"; sha256="02fv66h61y55bn5wrnlvhj7v6xwqs3pddyp3jgk554s1zv4qs2fr"; depends=[assertthat colorspace dendextend egg ggplot2 htmlwidgets magrittr plotly RColorBrewer reshape2 scales seriation viridis webshot]; }; heatwaveR = derive2 { name="heatwaveR"; version="0.4.4"; sha256="0d2j2qmfm5q0g57hrfkmd5mf5n4cinldh5l234nfk1ykf8s2aak3"; depends=[data_table dplyr ggplot2 lubridate plotly plyr Rcpp RcppArmadillo RcppRoll tibble zoo]; }; heavy = derive2 { name="heavy"; version="0.38.196"; sha256="05k788ynw9fhhmjydzp8dbk1vhl44j2rz2shqwn02i40jmwdvwrk"; depends=[]; }; heddlr = derive2 { name="heddlr"; version="0.6.0"; sha256="0ixmcgvfbq4hi3wv1fyzpwacmxmixsw5yq6mq5xygk6ji03m1v23"; depends=[rlang utf8 yaml]; }; hedgehog = derive2 { name="hedgehog"; version="0.1"; sha256="1mvjnm2zlc4pvw9vnhxr0dj1g1sfqvlrnnhcipzfbvr147yan9l5"; depends=[rlang testthat]; }; - heemod = derive2 { name="heemod"; version="0.13.0"; sha256="0jig4ba1szgn8x6fivjlr9ns2lryip2nr68q64bsdvvhjsmv1k4s"; depends=[dplyr ggplot2 lazyeval memoise mvnfast plyr pryr purrr rlang tibble]; }; + heemod = derive2 { name="heemod"; version="0.14.0"; sha256="0b520v7lgmj0vvp42997dknjvn7sa9zkbgkc634b859pbsc0h192"; depends=[dplyr ggplot2 lazyeval memoise mvnfast plyr pryr purrr rlang tibble]; }; heims = derive2 { name="heims"; version="0.4.0"; sha256="0vnq31jwn09grni4gdhf1hzd87b62as4f65b2qw7ky6mi38ahr5d"; depends=[bit64 data_table fastmatch hutils lubridate magrittr]; }; helda = derive2 { name="helda"; version="1.1.3"; sha256="0ffy1cy6p98r23gz0avqbwpr7q3b76mmgic6y8dipfkbs7zqcdv6"; depends=[dplyr ggplot2 rlang sqldf stringr]; }; helixvis = derive2 { name="helixvis"; version="1.0.1"; sha256="113rnpnrcnw18ks78fgq79zdrw3kmpzpimlc45gvj0za2fbyci3p"; depends=[ggforce ggplot2 rlang]; }; @@ -9136,22 +9520,24 @@ in with self; { helloJavaWorld = derive2 { name="helloJavaWorld"; version="0.0-9"; sha256="1a8yxja54iqdy2k8bicrcx1y3rkgslas03is4v78yhbz42c9fi8s"; depends=[rJava]; }; helminthR = derive2 { name="helminthR"; version="1.0.7"; sha256="16dkmxs94h48d07c73jznjgg368j9291m98xi7fbbjn4d4cqm7mm"; depends=[httr knitr magrittr plyr rmarkdown rvest xml2]; }; helsinki = derive2 { name="helsinki"; version="0.9.29"; sha256="0bn5iyxjn9qs6f0dmhv51ssayywbx1rayh80zbzk0gsm94nhs0d9"; depends=[maptools RCurl rjson sp]; }; - heplots = derive2 { name="heplots"; version="1.3-5"; sha256="1vyhfkp66gi17jni3gsbv9kn1s0n00qigr13q8xbzbgylz5jjiln"; depends=[car MASS]; }; - here = derive2 { name="here"; version="0.1"; sha256="1vb5dxqdpimy51q1gjsypyq14p2hhvj7wsvh6g35pj1g03cyg9av"; depends=[rprojroot]; }; - hereR = derive2 { name="hereR"; version="0.4.0"; sha256="0plyxjs2lbniw8dc0agfga9lzx5czd0g9mxhllkajshmk3502fja"; depends=[curl data_table flexpolyline jsonlite sf stringr]; }; + heplots = derive2 { name="heplots"; version="1.3-7"; sha256="1p98gvp3q71qphd3hgr79y7l4mgq2kyyqwrbykcnckjz2a9xsfmy"; depends=[car MASS]; }; + here = derive2 { name="here"; version="1.0.1"; sha256="0srlr8h8qmr0wrmp7gs4g2ry5dni2hx8n947bik3s3a26f091v88"; depends=[rprojroot]; }; + hereR = derive2 { name="hereR"; version="0.5.2"; sha256="1sb0v3qyd6s4kibsq8by4fy291px6zg10hnzg6dqs9xm5h94yhhg"; depends=[curl data_table flexpolyline jsonlite sf stringr]; }; heritEWAS = derive2 { name="heritEWAS"; version="0.2.0"; sha256="0yss9vf2m9szq8xi5i2nhf85mfvzvhv6c1f4kvvb2z9lmaicjni5"; depends=[]; }; heritability = derive2 { name="heritability"; version="1.3"; sha256="0a0pw8hppkgypl4jaa38hks9nxfwz2zbsd4w6w40j1hxlyy4km8m"; depends=[MASS]; }; hermite = derive2 { name="hermite"; version="1.1.2"; sha256="0j9s7ayvbvmgwybrvf703b72qbn8gskb105pis19ig2sslllzda3"; depends=[maxLik]; }; + hermiter = derive2 { name="hermiter"; version="2.0.0"; sha256="0dnk3n9cd4s14iwvgdj68qq0kqsfsspj1zbimv1v90prm42nb6b4"; depends=[BH Rcpp]; }; hero = derive2 { name="hero"; version="0.4.7"; sha256="129v2pjbxm5aalr5lfx0kh20rhwksnb80pc459pxg0xkwxvy1l3d"; depends=[fields Matrix optimx pbapply rgeos sp]; }; - hesim = derive2 { name="hesim"; version="0.3.1"; sha256="1jp703b4xn8s0maja1vmb5ca4fw96g83f3nfm6i2qd250d3sx705"; depends=[data_table flexsurv MASS R6 Rcpp RcppArmadillo survival]; }; + hesim = derive2 { name="hesim"; version="0.4.2"; sha256="14m0svdrgdcmm9vwnhmwiavzz9m1hi52s627mk456a9zjns07041"; depends=[data_table flexsurv MASS msm R6 Rcpp RcppArmadillo survival]; }; het_test = derive2 { name="het.test"; version="0.1"; sha256="08kxp81dx32anh0k5b65x7w7madwnn9hiabdrk6ck6b6mx37x26v"; depends=[vars]; }; hetGP = derive2 { name="hetGP"; version="1.1.2"; sha256="0r7hzw6ccyrqpq51adljd2ljv9dl00c0dr8frjrhibpzpc68z3sz"; depends=[DiceDesign MASS Rcpp]; }; - hett = derive2 { name="hett"; version="0.3-2"; sha256="1kmspw0738pdall5scmllsa79dynliai2glk1h5rzm4030r5rd6j"; depends=[lattice MASS]; }; + hett = derive2 { name="hett"; version="0.3-3"; sha256="0i7q28nc67m62vi1ipfg035yqjh691fb1mp33dp1b68g5wjysphh"; depends=[lattice MASS]; }; hettreatreg = derive2 { name="hettreatreg"; version="0.1.0"; sha256="092xd2yndg5n5shxmcyn2gh6a6w1i1497cvj009ih3ax8hk3crf0"; depends=[]; }; hettx = derive2 { name="hettx"; version="0.1.1"; sha256="0zfxg88l83pzj37c5khpv4vi0v28fdnp0p8yz39scm8d8lya1dkm"; depends=[doParallel dplyr foreach formula_tools MASS moments mvtnorm plyr purrr quantreg tidyverse]; }; + hetu = derive2 { name="hetu"; version="1.0.1"; sha256="1blxfvi3cy6w8m72lrgz81s90aw3h01visgi2ghg3abyh1qq4an2"; depends=[]; }; heuristica = derive2 { name="heuristica"; version="1.0.2"; sha256="1wqdwggnma6p667ivr0xja4vvn3jgzbkc5whkkijmdmxpjzg1wz6"; depends=[Hmisc]; }; heuristicsmineR = derive2 { name="heuristicsmineR"; version="0.2.4"; sha256="0dp85yvn0fr22l174ff34pv9xfxh3d7na9dxim2z7f4ialdnialw"; depends=[BH bupaR data_table DiagrammeR dplyr ggplot2 ggthemes magrittr petrinetR processmapR purrr Rcpp rlang scales stringr tidyr]; }; - hexSticker = derive2 { name="hexSticker"; version="0.4.7"; sha256="17qrprl0y6p4yp38rv9ndy7s8205jy3zjfwsjzxlk42pk504ifp1"; depends=[ggimage ggplot2 hexbin showtext sysfonts]; }; + hexSticker = derive2 { name="hexSticker"; version="0.4.9"; sha256="0d9sz2cshn4lq18kd9fkgvjm3v29h0k22b6228rq2q3zhxi97ra0"; depends=[ggimage ggplot2 hexbin showtext sysfonts]; }; hexView = derive2 { name="hexView"; version="0.3-4"; sha256="01hiqyibsd4as7jcklzg09pl12la341mg561vn16z4jzdarfvkfc"; depends=[]; }; hexbin = derive2 { name="hexbin"; version="1.28.1"; sha256="1ry6jm3lqz3mj0s5rzbs6mpkz2hxpnvbw8c1vwc4pj7b173r5l22"; depends=[lattice]; }; hextri = derive2 { name="hextri"; version="0.6"; sha256="05rvigi225npncbr1brc6apc7gsg9a5jzcbmhvflwp3hbcg3hn02"; depends=[FNN hexbin]; }; @@ -9179,7 +9565,7 @@ in with self; { highSCREEN = derive2 { name="highSCREEN"; version="0.3"; sha256="179l82n7l7dfn40k6zgigw56ggwqyi34gllc2wvcw3yvfnd3l7s4"; depends=[gplots]; }; highTtest = derive2 { name="highTtest"; version="1.1"; sha256="18hgxlr0y8y1d4ldqmfcg4536lhyn5p6w88sq1vj74qr5wzydga1"; depends=[]; }; highcharter = derive2 { name="highcharter"; version="0.8.2"; sha256="1hwiifpm60kqgxlvp8zd6mhgbzc4mkcz9s9yc6byrm9i6daiqs8r"; depends=[assertthat broom dplyr htmltools htmlwidgets igraph jsonlite lubridate magrittr purrr quantmod rjson rlang rlist stringr tibble tidyr xts yaml zoo]; }; - highfrequency = derive2 { name="highfrequency"; version="0.6.5"; sha256="1j7wn75xql6pw7inmvh9729l320wd3ss68jhz7y8cp4c60w2mkww"; depends=[cubature data_table lubridate mvtnorm Rcpp RcppArmadillo RcppRoll readr robustbase xts zoo]; }; + highfrequency = derive2 { name="highfrequency"; version="0.7.0.1"; sha256="13avypm8pq73zizrqknb060s2cj31bbhywz8z8x9vxlckhs393r2"; depends=[cubature data_table mvtnorm quantmod Rcpp RcppArmadillo RcppRoll robustbase sandwich xts zoo]; }; highlight = derive2 { name="highlight"; version="0.5.0"; sha256="1shar4y07wyixg0ichdrn2xhgwkl3mv2pxkalqzisc69w605b3hf"; depends=[]; }; highlightHTML = derive2 { name="highlightHTML"; version="0.2.5"; sha256="0j3zrvil7k5wfsbgfj2b4nbx77qsj3b4makv5angcf8s59p7q80r"; depends=[]; }; highmean = derive2 { name="highmean"; version="3.0"; sha256="1lq7z0l1737j4wvsy7951405afylyywp7vf2i7girzh459fdfzpc"; depends=[MASS mnormt mvtnorm]; }; @@ -9188,15 +9574,16 @@ in with self; { higlasso = derive2 { name="higlasso"; version="0.9.0"; sha256="09d500jsxlrv658i90xnb2wj1ad89v1iwb6y7vascyvg3cff104h"; depends=[gcdnet gglasso purrr Rcpp RcppArmadillo]; }; higrad = derive2 { name="higrad"; version="0.1.0"; sha256="0q9av8qyvmvgy6a3l7svcmbkjjgnp4iny1cld4g3qsbaz3yp3jaj"; depends=[Matrix]; }; hilbertSimilarity = derive2 { name="hilbertSimilarity"; version="0.4.3"; sha256="1251df3q7c7c69f8q9y9bxj210bk2dh80c8ca4s58isf0hr2x7zp"; depends=[entropy Rcpp]; }; - hildareadR = derive2 { name="hildareadR"; version="0.1.0"; sha256="0xvwpp9cb2bvy91081v0pvk778bbcginlnlq3dfv2cg7xnrhy0cn"; depends=[dplyr haven]; }; + hildareadR = derive2 { name="hildareadR"; version="0.2.0"; sha256="0hay1r6lxnyzjp97456d9wra7myrmifyx8cywzc85wclm355yc9b"; depends=[dplyr haven]; }; hillR = derive2 { name="hillR"; version="0.5.0"; sha256="00ms1clypd52w921l9ny73kqwim80chjfmbxjsxxgyj9pfardl2d"; depends=[ade4 ape FD geiger plyr tibble]; }; hilldiv = derive2 { name="hilldiv"; version="1.5.1"; sha256="1jp4xvrpqd575y2x0i73s0bq708bzi6gdhqgz85bia6d5kf05lq9"; depends=[ape data_table FSA geiger ggplot2 ggpubr qgraph RColorBrewer scales vegan]; }; hillmakeR = derive2 { name="hillmakeR"; version="0.2"; sha256="1baynibgn4xqmpsxna8irggxvdc484mq5nza00rwg58vh1bc7wzq"; depends=[]; }; hindex = derive2 { name="hindex"; version="0.2.0"; sha256="01mcd2br33qqkfcyxl584f3l6kyb2cgzpd207p0mynzdaallgxgc"; depends=[foreach ggplot2 purrr]; }; hindexcalculator = derive2 { name="hindexcalculator"; version="1.0.0"; sha256="06b4dn629avmnyqxb0l39m00wz9cg9dddmm6qhgwgnzlxh14ifgk"; depends=[]; }; hint = derive2 { name="hint"; version="0.1-1"; sha256="1n18j2hcb1qynhsln10nzryi20l5aqhr7i1aanww10y5dz573zi3"; depends=[]; }; + hiphop = derive2 { name="hiphop"; version="0.0.1"; sha256="0k071kxf04b95f3z5y2h9dhnqrvzwgyhi3q26ghn3s76c155f1k1"; depends=[]; }; hipread = derive2 { name="hipread"; version="0.2.2"; sha256="1y51yif2spl6brqjvb20k9r6xwkr5f6brv08qcl4g9xg561yngff"; depends=[BH R6 Rcpp rlang tibble]; }; - hisse = derive2 { name="hisse"; version="1.9.8"; sha256="07b199jijfvssg9r22nknp0zhhr11k0lf2kaqi2xws27j1b2cw0h"; depends=[ape data_table deSolve diversitree GenSA nloptr phytools plotrix subplex]; }; + hisse = derive2 { name="hisse"; version="1.9.10"; sha256="0sic9f0h4wdyai8vcl6lpkz4ris02xf64f0lw77zcmfmn29cp139"; depends=[ape data_table deSolve diversitree GenSA nloptr phytools plotrix subplex]; }; histmdl = derive2 { name="histmdl"; version="0.7-1"; sha256="0k6l3pfjzlgpxv55vy8dg4sl8zhh0460xcfszwp2k9sbzanwaamp"; depends=[]; }; histogram = derive2 { name="histogram"; version="0.0-25"; sha256="0yymc7fw4qkbigr8jiw2nzjyrw0ikkipz62pdn3bpz1f7nb7mi93"; depends=[]; }; historydata = derive2 { name="historydata"; version="0.1"; sha256="1h69x3iig542d43p9zm8x83p4dq48iwsw606j4fndnqhx99vzkw6"; depends=[]; }; @@ -9205,12 +9592,13 @@ in with self; { hitandrun = derive2 { name="hitandrun"; version="0.5-5"; sha256="18zbyv7y7sv7g075swwbx6gmxf468vyl41d2cvq3am5c1rwhw1d4"; depends=[rcdd]; }; hive = derive2 { name="hive"; version="0.2-2"; sha256="0ihghpfsk73lndrfrk5907kdsih9s0a7xq23zcyfaa05nk98510n"; depends=[rJava XML]; }; hkclustering = derive2 { name="hkclustering"; version="1.0.1"; sha256="19syq06y5dl0mcwyaxr7w1hj8ffp5s140j72djcz0lljhskzmp6f"; depends=[cluster]; }; + hkdatasets = derive2 { name="hkdatasets"; version="0.0.3"; sha256="0sfgqr6g9nk3v6df9hssavk4pn7ax837xflg1kgyxpvqssn8iiyl"; depends=[]; }; hkevp = derive2 { name="hkevp"; version="1.1.4"; sha256="01m5yywi4vjnwhdayaqaqcp5lz70mllj5ifnwdb4c60wm9aby9pm"; depends=[Rcpp RcppArmadillo]; }; hkex_api = derive2 { name="hkex.api"; version="0.1"; sha256="0hqwihlrppchpaz2yaq92gf779yi5k8n7sxy1kbpjxs2qc18xvj2"; depends=[httr RCurl XML]; }; - hmclearn = derive2 { name="hmclearn"; version="0.0.4"; sha256="04q0lhi619zlm1j4cq6jfj0zj6f6vdsk3659h4r2963hk2rs95qk"; depends=[bayesplot MASS mvtnorm]; }; + hmclearn = derive2 { name="hmclearn"; version="0.0.5"; sha256="0zalvgnibd1kygryqcah5d008y6a0nxpy61yyiqsriw89r01jyjk"; depends=[bayesplot MASS mvtnorm]; }; hmeasure = derive2 { name="hmeasure"; version="1.0-2"; sha256="0l4nlny532kddiaa1nmgd37971whhwzb54mb1pvbwax7fsg6hmhw"; depends=[]; }; - hmgm = derive2 { name="hmgm"; version="1.0.2"; sha256="1sln43c8f40kxa9gx0iykgv434km7gsldn748ilsdcxg566ayvzj"; depends=[binaryLogic glmnet MASS Matrix nat Rcpp rgl]; }; - hmi = derive2 { name="hmi"; version="0.9.19"; sha256="03bshnql53isqjdzv8qkvdyxy9i9av92g0vfbkx06x4bbc4a8msf"; depends=[boot broom_mixed coda linLIR lme4 MASS Matrix MCMCglmm mice msm mvtnorm nlme nnet ordinal pbivnorm rlang tmvtnorm]; }; + hmgm = derive2 { name="hmgm"; version="1.0.3"; sha256="12gaz2pi9ny7y772yzrfvl02p3n89cq1l5dzmcksd172gv9ayyz1"; depends=[binaryLogic glmnet MASS Matrix nat Rcpp rgl]; }; + hmi = derive2 { name="hmi"; version="1.0.0"; sha256="0fjcw13mkxza6nkq3fhp188ga1sjspq1sc6wjm4hy13xh7vdjpqq"; depends=[boot broom_mixed coda linLIR lme4 MASS Matrix MCMCglmm mice msm mvtnorm nlme nnet ordinal pbivnorm rlang tmvtnorm]; }; hmlasso = derive2 { name="hmlasso"; version="0.0.1"; sha256="0ydcyz9pw30ji8ghrvkgcbmp27d661vajl97b8cwis52605a3gfx"; depends=[BH MASS Matrix Rcpp RSpectra]; }; hmm_discnp = derive2 { name="hmm.discnp"; version="3.0-6"; sha256="0jb4ga50d0qy9kz13qjsbwbvyhn8qiqsjsai2m6kvxb7qzd33g26"; depends=[nnet]; }; hmma = derive2 { name="hmma"; version="1.1.0"; sha256="1qsvczqq44h46z0nfblv4rarbg64imz8m0jhxdhva27kbzdvqf97"; depends=[bnlearn graph MCMCpack mhsmm Rgraphviz]; }; @@ -9235,12 +9623,14 @@ in with self; { hornpa = derive2 { name="hornpa"; version="1.0"; sha256="0pfvk2jkrwgvshgq9g55qijgpjh0677rpbya0r8759n92v3axbp4"; depends=[]; }; horserule = derive2 { name="horserule"; version="1.0.0"; sha256="0d348pn0ld7lr9lfl1z05905l9kl296j0xic1pib6r5l1c5600r9"; depends=[gbm ggplot2 inTrees MASS mvnfast randomForest RColorBrewer Rdpack]; }; horseshoe = derive2 { name="horseshoe"; version="0.2.0"; sha256="1qhkw6agkhpmgf27429c3kqqhbvpg61l0dvfxg7n564y2ha76r3c"; depends=[]; }; + horseshoenlm = derive2 { name="horseshoenlm"; version="0.0.6"; sha256="1m3n12wgmb1wnxc40bzpna261das8hy47l7hmvhfbzhmp7v803v5"; depends=[msm survival]; }; hot_deck = derive2 { name="hot.deck"; version="1.1-2"; sha256="089sfkpl9m1xxpxxxa9kpc99lcswsz90dhq1k7iji2f7wby5i905"; depends=[mice]; }; hotspot = derive2 { name="hotspot"; version="1.0"; sha256="0a4w5d6rg324hd06lfwr1hxf6bwr10n55s3ynz5bpkh9c61yik3n"; depends=[]; }; hotspots = derive2 { name="hotspots"; version="1.0.3"; sha256="12v88k3yz1bsxx9p5dx8y54ccqcglwknm2jr7ybygdj2yasjr5l0"; depends=[ineq lattice]; }; housingData = derive2 { name="housingData"; version="0.3.0"; sha256="0ngfx2vjx705xixzpz0rgx1481cr2szj4yfi5g7ma1hhivddl7d1"; depends=[]; }; + hover = derive2 { name="hover"; version="0.1.0"; sha256="04jq9rpj7ni6l7qfxxvv5pm5dadcd711q08dvjhngcksrxzx2zi2"; depends=[htmltools shiny]; }; howmany = derive2 { name="howmany"; version="0.3-1"; sha256="045ck8qahfg2swbgyf7dpl32ryq1m4sbalhr7m5qdgpm62vz8h7f"; depends=[]; }; - hpa = derive2 { name="hpa"; version="1.1.1"; sha256="00121j701cyinakicy991nknaydhdpw6fm7knxq1vrmm2mc358vv"; depends=[Rcpp RcppArmadillo RcppParallel]; }; + hpa = derive2 { name="hpa"; version="1.1.3"; sha256="1dq7jvgr3i0k43fzy2bd16ld0k9ficm2ypkbzj25pii95nx0rr6n"; depends=[Rcpp RcppArmadillo RcppParallel]; }; hpackedbubble = derive2 { name="hpackedbubble"; version="0.1.0"; sha256="1br7q4958f1zgvisglsaf41nz2ahnqi3bzazvlfnmk3nq03cb1ri"; depends=[htmlwidgets]; }; hpcwld = derive2 { name="hpcwld"; version="0.5"; sha256="17k4mw41gygwgvh7h78m0jgzh1bivrvrsr8lgxxw3sbkw88lwb40"; depends=[multicool partitions]; }; hpiR = derive2 { name="hpiR"; version="0.3.2"; sha256="0gz9ngnjgys7hzijsma2iyywwiv7vjar5gls28ds11wq8pmsv96n"; depends=[dplyr forecast ggplot2 gridExtra imputeTS lubridate magrittr MASS pdp plyr purrr ranger rlang robustbase zoo]; }; @@ -9252,23 +9642,27 @@ in with self; { hrcomprisk = derive2 { name="hrcomprisk"; version="0.1.1"; sha256="0w0ij2yqgg6gkn3pdaism1xqw3dfnm670j2pmsd85qk1ybxzq9l5"; depends=[survival]; }; hscovar = derive2 { name="hscovar"; version="0.4.0"; sha256="087q3mx6zb5rpycq86v6g3d4x8m24r2ma2s1f4532frl3pg8xcj5"; depends=[foreach Matrix pwr rlist]; }; hsdar = derive2 { name="hsdar"; version="1.0.3"; sha256="1slb2m62j86hn1kvpv72fvp48sxl7zb2znrr70jqqbrah8n1ynnl"; depends=[Boruta caret raster rgdal signal]; }; + hse = derive2 { name="hse"; version="0.0-14"; sha256="0m0lk3a6f3vbvmdnallmzr85rap0hh9qvkx7x21jidn94sah9mbd"; depends=[]; }; hsicCCA = derive2 { name="hsicCCA"; version="1.0"; sha256="1d4lkjrihwhl3jrsj7250ccd90nfwpllyavc3mp15fhcy2jnjci8"; depends=[]; }; hsm = derive2 { name="hsm"; version="0.2.0"; sha256="066shjikqrrkxpnra4zknax1a0sk5nx9ms1br58vwqqvqq479rym"; depends=[]; }; hsmm = derive2 { name="hsmm"; version="0.4"; sha256="1fh8c5kfv4brygdq6bfkrhrhkm99mxl4ljb1mhp9nf2bjlla11mc"; depends=[mvtnorm]; }; hsphase = derive2 { name="hsphase"; version="2.0.2"; sha256="1b62k9sc6604djy37anslvqjpbrj9wsc9mvnfbrnmhqf4g0nnpdq"; depends=[Rcpp RcppArmadillo snowfall]; }; - hsrecombi = derive2 { name="hsrecombi"; version="0.3.0"; sha256="0k4cb4b054gr7cr38v6h0l0m4rbafvls2qq425b167zjf99l567v"; depends=[data_table dplyr hsphase quadprog Rcpp rlist]; }; + hsrecombi = derive2 { name="hsrecombi"; version="0.3.2"; sha256="132wmgr910d0gr9pd3pc9fm0wdzks085f32k5wag61xyfkpnjhvc"; depends=[data_table dplyr hsphase quadprog Rcpp rlist]; }; hsstan = derive2 { name="hsstan"; version="0.8"; sha256="1milwygwn3djd5rv7x03wp6l02gdvaxnm4zhm56fwm64jbk5z3yg"; depends=[BH ggplot2 loo pROC Rcpp RcppEigen rstan rstantools StanHeaders]; }; htdp = derive2 { name="htdp"; version="0.1.4"; sha256="0w579qp0p544xryb5r08m1nhqf7rmgv9q0lyx6my4av62l70ka5w"; depends=[Rcpp]; }; htestClust = derive2 { name="htestClust"; version="0.2.0"; sha256="1nwj74w5hyz929jz2qci12x1zpk9gva75gn68k70l6xc5vya60qn"; depends=[bootstrap MASS]; }; htm2txt = derive2 { name="htm2txt"; version="2.1.1"; sha256="09q026yy8qm1fb3a4bf9vsp4j09kayl7xmk0p58ikar5l3bmfdjv"; depends=[]; }; - htmlTable = derive2 { name="htmlTable"; version="2.0.1"; sha256="0ma52kajzxfg9w811d6ldhghzn9xhyr8bh7k5v265k82bzx7rac6"; depends=[checkmate htmltools htmlwidgets knitr magrittr rstudioapi stringr]; }; + html2R = derive2 { name="html2R"; version="0.1.0"; sha256="1zdnwbqlpjh8r2xcl83da9pzh9cb8h908krnrs61vqhka7zb82ng"; depends=[glue shiny shinyAce shinyjqui shinythemes]; }; + htmlTable = derive2 { name="htmlTable"; version="2.1.0"; sha256="1gzh0bdxi55p1ckxv4k0a41b1j0grwv2w3lkqz4c3gkw66dk6ja0"; depends=[checkmate htmltools htmlwidgets knitr magrittr rstudioapi stringr]; }; + htmldf = derive2 { name="htmldf"; version="0.1.0"; sha256="0slsmb1cjbmn7m43xdvdjsvlr8qhqf5g72b5yml0yyh4hlw11cf1"; depends=[cld3 dplyr httr lubridate magrittr progress R_utils ranger rvest stringr tibble tidyr urltools xml2]; }; htmltab = derive2 { name="htmltab"; version="0.7.1.1"; sha256="0nmb8zq6n13zj4rzgg74xpc6y8vkkwn8cqnyszq5h23gnn61inyl"; depends=[httr XML]; }; htmltidy = derive2 { name="htmltidy"; version="0.5.0"; sha256="1djkjff3750fm1sp54kf9cjvsqz2x7ia1ns12h5vqqcvwzfd0701"; depends=[htmltools htmlwidgets Rcpp XML xml2]; }; htmltools = derive2 { name="htmltools"; version="0.5.0"; sha256="07fjznax5sin563ddnzlb7iwc8b39wzf7ymjn66pbmxgskijq2pz"; depends=[base64enc digest rlang]; }; - htmlwidgets = derive2 { name="htmlwidgets"; version="1.5.1"; sha256="10fp306l1nybkah6jrlrqwwdb6zvklbddp8i3w9v9naj8la5jbnl"; depends=[htmltools jsonlite yaml]; }; + htmlwidgets = derive2 { name="htmlwidgets"; version="1.5.3"; sha256="0a8g7wqd3qxnhwkm9c9bkzg29db7gvjiaa5y038ln8nch8qq7981"; depends=[htmltools jsonlite yaml]; }; htree = derive2 { name="htree"; version="2.0.0"; sha256="15bi5c2p4aghihp3k12s78447j2x9hbsaq56b5lc8jmd1vf0jdwb"; depends=[]; }; hts = derive2 { name="hts"; version="6.0.1"; sha256="0bbg7p9iqi3azl7m2vh9ggfdi90c9hy31fm5p0w9ixmvvavwhny6"; depends=[forecast Matrix matrixcalc Rcpp RcppEigen SparseM]; }; - httk = derive2 { name="httk"; version="2.0.2"; sha256="1j48swmnmsjsza31k7b55bakhy7j6sbf3gsv7qn5apxs0j9jdjki"; depends=[data_table deSolve magrittr msm mvtnorm purrr survey truncnorm]; }; + htsr = derive2 { name="htsr"; version="1.1.0"; sha256="0dndsdd8k5jfqgq1h9s58iw7ddqw09g9liyc06ahgykx8pfj9lcy"; depends=[DBI directlabels dplyr editData ggplot2 lubridate openair purrr raster RColorBrewer readr readxl RODBC RSQLite shiny stringr tibble WriteXLS zoo]; }; + httk = derive2 { name="httk"; version="2.0.3"; sha256="1lkwlxrq9gj3m65il2jib3sh4dvl2xf276h9j6nlyg69mpz8i591"; depends=[data_table deSolve magrittr msm mvtnorm purrr survey truncnorm]; }; httpRequest = derive2 { name="httpRequest"; version="0.0.10"; sha256="0f6mksy38p9nklsr44ki7a79df1f28jwn2jfyb6f9kbjzh98746j"; depends=[]; }; httpcache = derive2 { name="httpcache"; version="1.1.0"; sha256="11hdc1jj2jbgvsps1h55azq0cr2fl556k631ns9k0747sjfmy2k9"; depends=[digest httr]; }; httpcode = derive2 { name="httpcode"; version="0.3.0"; sha256="0xig0rvc81hg7mw0iq9s0an1nw24fg0kfs2p2n6dzhwl9w506fjr"; depends=[]; }; @@ -9283,12 +9677,12 @@ in with self; { humanize = derive2 { name="humanize"; version="0.2.0"; sha256="0hhhd640n77s8xaa2gbd9fckdk2yjg68gdb7wjy56a2khzqfssxr"; depends=[assertthat glue lubridate]; }; humanleague = derive2 { name="humanleague"; version="2.1.2"; sha256="181gz1plz9g8bbjaf67ndhfd2qz5ksnd2l212wm1a383ddc58pmr"; depends=[Rcpp]; }; humidity = derive2 { name="humidity"; version="0.1.5"; sha256="143pn8jjinlda76b94qh5zw2sfajw0ifcx774x6adr2il5a5wm99"; depends=[]; }; - hunspell = derive2 { name="hunspell"; version="3.0"; sha256="0mwqw5p0ph083plm2hr2hqr50bjg2dw862dpsfm4l2fgyy3rryq1"; depends=[digest Rcpp]; }; + hunspell = derive2 { name="hunspell"; version="3.0.1"; sha256="0ql6y05d4xxpm468rslb0wxdp1x9l3flxzmb5w6pjg617f8vpv8z"; depends=[digest Rcpp]; }; hurdlr = derive2 { name="hurdlr"; version="0.1"; sha256="1ryrqsxa07isxv2zx156bcn36d4yjvwpirb8jqcmqm97q7rmihmq"; depends=[]; }; hurricaneexposure = derive2 { name="hurricaneexposure"; version="0.1.1"; sha256="0a8xy71dkq2bzdnc90irxmbcxhi0anh87ic22x7b22c3m5605w6s"; depends=[data_table dplyr ggmap ggplot2 lazyeval lubridate mapproj maps purrr RColorBrewer rlang stringr tidyr]; }; - hutils = derive2 { name="hutils"; version="1.5.1"; sha256="1x2x8gg2hdwxj1gz81pjls4y3yilssksirsbjnjd665rjs3jx7fj"; depends=[data_table fastmatch magrittr]; }; - hutilscpp = derive2 { name="hutilscpp"; version="0.3.0"; sha256="1x7h1fq6qyylda8k3a1v6s0cx7pf169k86akb6ccwgiikqqsp51h"; depends=[data_table hutils Rcpp]; }; - huxtable = derive2 { name="huxtable"; version="5.0.0"; sha256="0b9aznqnf3jmyxqgc23v2pp4sixikqrpiqnmaxvn1rhn2l8n7bh1"; depends=[assertthat commonmark generics glue memoise rlang stringr tidyselect]; }; + hutils = derive2 { name="hutils"; version="1.6.0"; sha256="17q9ndsb11k66y0c0sz0qq9nm9b4xl6ijjwlim7qbm6z69qv2krc"; depends=[data_table fastmatch magrittr]; }; + hutilscpp = derive2 { name="hutilscpp"; version="0.5.2"; sha256="1d25csrn9mrnvzdjamn7zrmsz8mc3qp8841n7kjrifdav42s4y32"; depends=[data_table glue hutils magrittr Rcpp]; }; + huxtable = derive2 { name="huxtable"; version="5.1.1"; sha256="09wwmz0yhxdb8d2qd56i2bbwn8mpfsxb9hfad5gkp5n29kchass1"; depends=[assertthat commonmark generics glue memoise R6 rlang stringr tidyselect xml2]; }; hwde = derive2 { name="hwde"; version="0.67"; sha256="0wb2f9i5qi7w77ygh8bvydfpr7j5x8dyvnnhdkajaz0wdcpkyaqy"; depends=[]; }; hwordcloud = derive2 { name="hwordcloud"; version="0.1.0"; sha256="0civbwv276lcwvfs4qzz14r8rk14kg1ml4zzhi3msnkkh29v70y2"; depends=[colourpicker htmlwidgets shiny wordcloud2]; }; hwriter = derive2 { name="hwriter"; version="1.3.2"; sha256="0arjsz854rfkfqhgvpqbm9lfni97dcjs66isdsfvwfd2wz932dbb"; depends=[]; }; @@ -9297,7 +9691,7 @@ in with self; { hybridEnsemble = derive2 { name="hybridEnsemble"; version="1.0.0"; sha256="08y11cmlhnl456wxsvh3ll1f9ywkmgqjwlwr3v3qhm54nlanwvkr"; depends=[ada AUC e1071 FNN genalg GenSA glmnet kernelFactory NMOF nnet nnls pso quadprog randomForest reportr Rmalschains ROCR rotationForest rpart soma tabuSearch]; }; hybridModels = derive2 { name="hybridModels"; version="0.3.7"; sha256="0fj3dvv7s1hlicvlb077pkhbj894brzgdxhp67jck9zpy2qymzxq"; depends=[doParallel doRNG foreach ggplot2 GillespieSSA reshape2 stringr]; }; hydra = derive2 { name="hydra"; version="0.1.0"; sha256="0r3r8cds4h15narawxhzkrvgnf00vlgrgqdgnmbzjyyb1dmry8wn"; depends=[]; }; - hydraulics = derive2 { name="hydraulics"; version="0.2.1"; sha256="08xqq9f0rzl64n61l7xjcm1s096vgvqb5s7hj1lds6rzww8gbljg"; depends=[ggplot2 reshape2]; }; + hydraulics = derive2 { name="hydraulics"; version="0.2.3"; sha256="1ci81831ypbax7n661s3w2ad89ijv816khkg9kxlidyynhrg78fl"; depends=[ggplot2 reshape2 units]; }; hydroApps = derive2 { name="hydroApps"; version="0.1-1"; sha256="1ycv7l2ywwnx2mgklg6rry7n24jyhi4spvp1xl345yvyn9kf15dz"; depends=[nsRFA]; }; hydroGOF = derive2 { name="hydroGOF"; version="0.4-0"; sha256="0fw8b66k7gdkdjxgmdpp3lk9d8p0wmlvhq2rkcvajjb5wd09f43a"; depends=[hydroTSM xts zoo]; }; hydroPSO = derive2 { name="hydroPSO"; version="0.5-1"; sha256="16gdv19yqla80s9fjmvahfn21jv62zivirzs5ch4zm9db54g6bry"; depends=[data_table Hmisc hydroGOF hydroTSM lattice lhs scatterplot3d sp vioplot zoo]; }; @@ -9307,32 +9701,34 @@ in with self; { hydrolinks = derive2 { name="hydrolinks"; version="0.10.0"; sha256="0004a03bx9l9wq6zdz5az41rjxv1ka4qmnxk6ksy8i7365wsay88"; depends=[dbplyr dplyr httr rappdirs RSQLite sf units]; }; hydroscoper = derive2 { name="hydroscoper"; version="1.3"; sha256="03g841a1sbhp2kcdl39b9577lyd9i1241smn41578dcyrxshc2in"; depends=[jsonlite pingr readr stringi stringr tibble]; }; hydrostats = derive2 { name="hydrostats"; version="0.2.7"; sha256="16xrl94289kk1fb6pj0j8q8b40rmsm86fz2msmrmxh7mdp6hmxx9"; depends=[]; }; - hyfo = derive2 { name="hyfo"; version="1.4.2"; sha256="1wpncjrp6ks5s939csf2grcndgg8gkhh9513s1bsqkymf3nq57rk"; depends=[data_table ggplot2 lmom maps maptools MASS moments ncdf4 plyr reshape2 rgdal rgeos zoo]; }; + hyfo = derive2 { name="hyfo"; version="1.4.3"; sha256="012akh96qwafhgjba1gjwy0r14a6shcsk5b7n1hvw230s07zxd8r"; depends=[data_table ggplot2 lmom maps maptools MASS moments ncdf4 plyr reshape2 rgdal rgeos zoo]; }; hyper_fit = derive2 { name="hyper.fit"; version="1.1.1"; sha256="1xibiydfkhzsw0yqfc0xfzj4yz8xyxqlvnfpyxg33v5fwp9wap3v"; depends=[LaplacesDemon magicaxis MASS rgl]; }; hyper2 = derive2 { name="hyper2"; version="1.0-7"; sha256="155ycb26mgk0ic899ji1pv1k2mmwfzwaa0zj38a9v6fwdgw87rpl"; depends=[cubature magrittr partitions Rcpp]; }; hyperSMURF = derive2 { name="hyperSMURF"; version="2.0"; sha256="1aczsph6ax5xfd5rfvsd9bmgaq3j2f5f82fx8whrgbin0hxz19d8"; depends=[randomForest unbalanced]; }; - hyperSpec = derive2 { name="hyperSpec"; version="0.99-20200527"; sha256="0j3k8akb1v4sxjjhws2yd50jjg36k1yxb9vvvy2wabdba9v6y9r9"; depends=[dplyr ggplot2 lattice latticeExtra lazyeval testthat xml2]; }; + hyperSpec = derive2 { name="hyperSpec"; version="0.99-20201127"; sha256="1mflkygqz2x63d7bwiyfkdc1bndz73bfzmbdjh2fg8x15kbpm2r6"; depends=[dplyr ggplot2 lattice latticeExtra lazyeval testthat xml2]; }; hypercube = derive2 { name="hypercube"; version="0.2.1"; sha256="0m0n64rl5fnhvhfdknrza8a0h5lw8vbgakaqbyfx77ixhwqhjn1l"; depends=[dplyr plotly stringr]; }; hypergate = derive2 { name="hypergate"; version="0.8.3"; sha256="0h36wi4bdxinv7p9alyb7jv1902vdanxx7yvyaw2dcqkdjlzzj49"; depends=[]; }; - hypergea = derive2 { name="hypergea"; version="1.3.6"; sha256="1k1525bkkj83j2nn9ixidb8vjvdmc4l9jvfarzgg532gg7wn3841"; depends=[]; }; hypergeo = derive2 { name="hypergeo"; version="1.2-13"; sha256="13jdiy216znwhr91iqnh03mvkmyscw439syb3h4i67dd78sphnvd"; depends=[contfrac deSolve elliptic]; }; + hyperoverlap = derive2 { name="hyperoverlap"; version="1.0"; sha256="0ak7z4dxdbh85mliqbykiiv6j31skmrxy0xirdn19gsgkfcws90f"; depends=[e1071 ggplot2 MASS matlib misc3d rgl]; }; hypersampleplan = derive2 { name="hypersampleplan"; version="0.1.1"; sha256="1sk3s1jm46ac4i7p433s3kyngj86kq2821zzhp30a3y8vi1j2psq"; depends=[]; }; hypervolume = derive2 { name="hypervolume"; version="2.0.12"; sha256="0jd49jncmg23vm9rkcy6sd4zjwlw75hwps7wahpb36zs9kb63ssq"; depends=[data_table e1071 fastcluster geometry hitandrun ks maps MASS mvtnorm pdist progress raster Rcpp RcppArmadillo rgeos rgl sp]; }; hypothesestest = derive2 { name="hypothesestest"; version="1.0"; sha256="0g8sm386m1zm9i3900r62x83wb600cy8hqk7dlvbx6wcgrxg82sm"; depends=[]; }; hypothesisr = derive2 { name="hypothesisr"; version="0.1.1"; sha256="0z06risagphhvqiw4lrxy52q6q2yr10w2yxsm8iz1wh9ik097pcv"; depends=[dplyr httr jsonlite]; }; - hypr = derive2 { name="hypr"; version="0.1.9"; sha256="0sai8bbrxll8sbmgp3jxzk543gcr9clvxga7bzrfsp5kxkclsjak"; depends=[MASS pracma]; }; + hypr = derive2 { name="hypr"; version="0.1.11"; sha256="1bhdxnj1h2whq33hw3cxdi4bhrhx48nifqfbcyaqimr8ips4hpwr"; depends=[MASS pracma]; }; hystReet = derive2 { name="hystReet"; version="0.0.2"; sha256="01nrbk48r1hf1yc953yf1pzryzrjjckwdqhb3pbnwfza8q0aqsfq"; depends=[httr jsonlite lubridate]; }; hysteresis = derive2 { name="hysteresis"; version="2.6"; sha256="00v19m52bg2i3zg8p7yj56axzj9sm64qr61226p5h7sn0zrpws3b"; depends=[car MASS msm]; }; hzar = derive2 { name="hzar"; version="0.2-5"; sha256="000l4ki3hvznnhkxc5j422h5ifnsfqalv666j48yby1hsf1lc3kg"; depends=[coda foreach MCMCpack]; }; - i2dash = derive2 { name="i2dash"; version="0.2.1"; sha256="0hb0ggwm8q0w01isvayb1q4bdl3dvdxixsfjzhqcwh6jp2rn8yaa"; depends=[assertive_sets assertive_types flexdashboard glue knitr magrittr rmarkdown stringi stringr yaml ymlthis]; }; - iAdapt = derive2 { name="iAdapt"; version="0.1.0"; sha256="0ykcvqm1aswc4iypapml22194nxi6mxvxipy6wj7l9g4cazfa8j8"; depends=[shiny shinydashboard]; }; - iBATCGH = derive2 { name="iBATCGH"; version="1.3"; sha256="0pnkkabzi57czcwd9i15nwv8ggwvyxmvn1wam7yrrrbvmi17lmrm"; depends=[msm Rcpp RcppArmadillo]; }; + i2dash = derive2 { name="i2dash"; version="0.2.2"; sha256="16f9snbp3ann303x41yg52mfs9rgzsn5kibhddyxqh61g3l0w60n"; depends=[assertive_sets assertive_types flexdashboard glue knitr magrittr rmarkdown stringi stringr yaml ymlthis]; }; + i2extras = derive2 { name="i2extras"; version="0.0.2"; sha256="005ydg4p8sb7l2s2g520ky9n7pissai9isvxzbbiajqxajbk41h6"; depends=[dplyr ellipsis ggplot2 incidence2 MASS rlang tibble tidyr trending vctrs]; }; + iAdapt = derive2 { name="iAdapt"; version="2.0.0"; sha256="1c49dc6hny034fgkdpvry99mz4z2n2daih32sh5jmk2xpqk1zzmw"; depends=[Matrix shiny shinydashboard]; }; + iBATCGH = derive2 { name="iBATCGH"; version="1.3.1"; sha256="0xq4q4kc2f0whrxz1vmi2gca9pxqix2qm4sfkwbch85if2k8l8fj"; depends=[msm Rcpp RcppArmadillo]; }; iBST = derive2 { name="iBST"; version="1.0"; sha256="02p7lcr1wrf21v4568jc8hmjcijy3fnbv77s8nlhv2s4p0pgzh5x"; depends=[Rcpp rpart survival]; }; iBreakDown = derive2 { name="iBreakDown"; version="1.3.1"; sha256="1bfl5bh0x6z5a0cmdmx68sap9zdxa3kwdnyk57csxapc362yz108"; depends=[ggplot2]; }; iC10 = derive2 { name="iC10"; version="1.5"; sha256="1xq6xv582wxdb0nc2nia3q38155gx8z26idiqyx7h1rjb20hhwdl"; depends=[iC10TrainingData impute pamr]; }; iC10TrainingData = derive2 { name="iC10TrainingData"; version="1.3.1"; sha256="175ymib3h359296hk36psryksisipx63ybvacz8hys21irzx58j1"; depends=[]; }; - iCARH = derive2 { name="iCARH"; version="2.0.2.0"; sha256="04wwdkxql104k223hvmhs0if062ryzcf4w4dciz1pd2d4dnljpxf"; depends=[abind ggplot2 glue igraph KEGGgraph MASS Matrix mc2d RCurl reshape2 rstan]; }; - iCellR = derive2 { name="iCellR"; version="1.5.5"; sha256="0y801yjzwcrmf8arndbwqw3fkbmbgwx4kla6pdy1lvnz693h7s67"; depends=[ape data_table ggdendro ggplot2 ggpubr ggrepel gridExtra hdf5r Hmisc htmlwidgets igraph knitr Matrix NbClust pheatmap plotly plyr progress RANN RColorBrewer Rcpp reshape Rtsne scatterplot3d shiny uwot]; }; + iCAMP = derive2 { name="iCAMP"; version="1.2.9"; sha256="05j8n5bl8gzb978m5l930k12sh4fwnskbk6y4hhnl0j528l7ilb7"; depends=[ape bigmemory Hmisc minpack_lm nortest permute vegan]; }; + iCARH = derive2 { name="iCARH"; version="2.0.2.1"; sha256="1x703ydssmgb7j0hgqn3d5sh9457jgj7s2m8i12x2b9wvkh0fz8j"; depends=[abind ggplot2 glue igraph KEGGgraph MASS Matrix mc2d RCurl reshape2 rstan]; }; + iCellR = derive2 { name="iCellR"; version="1.5.8"; sha256="0nsb4yhgva779gs1ifavxcp3jy400y0q9nsh07hw5ppirfbnvrk0"; depends=[ape data_table ggdendro ggplot2 ggpubr ggrepel gridExtra hdf5r Hmisc htmlwidgets igraph knitr Matrix NbClust pheatmap plotly plyr progress RANN RColorBrewer Rcpp reshape Rtsne scatterplot3d shiny uwot]; }; iCiteR = derive2 { name="iCiteR"; version="0.2.1"; sha256="0hbps2q5i7yj6zvqawlayhqqr5iv39yqc0xnk7fvra7rimzc1qid"; depends=[httr]; }; iClick = derive2 { name="iClick"; version="1.5"; sha256="0yq0r9nz1mf9ci6l30ylqxbgl8mf1ahyqzr7m6nks0ygxabipdnd"; depends=[boot car coefplot fBasics forecast lattice lmtest lubridate openair papeR rugarch sandwich timeDate timeSeries xts zoo]; }; iCluster = derive2 { name="iCluster"; version="2.1.0"; sha256="09j36xv87d382m5ijkhmp2mxaajc4k97cf9k1hb11ksk7fxdqz6r"; depends=[caTools gdata gplots gtools lattice]; }; @@ -9340,6 +9736,7 @@ in with self; { iDOS = derive2 { name="iDOS"; version="1.0.0"; sha256="1jj98ikzvfp6qbnh2j6msi0m89sbmjjafgry43rq7qmczzs81hl8"; depends=[VennDiagram]; }; iDynoR = derive2 { name="iDynoR"; version="1.0"; sha256="01702vl10191mbq2wby1m0y6h8i6y6ic4pa83d27cg3yccsrhziz"; depends=[vegan XML]; }; iFad = derive2 { name="iFad"; version="3.0"; sha256="0jrl9bayihp3wb4k5w9kc71qlsdxk7vl83ydfibx2bg79c4hf3cs"; depends=[coda MASS Rlab ROCR]; }; + iForecast = derive2 { name="iForecast"; version="1.0.1"; sha256="0fqa2sb8kna16vwb73va00q3rzd5s3gd2h862wqpi24wj1d50dww"; depends=[caret magrittr zoo]; }; iGSEA = derive2 { name="iGSEA"; version="1.2"; sha256="1xlz8mbxqnrwyqj7jwma7vmvjlaccajbfxf3hi4wp5qs2pch8806"; depends=[]; }; iGasso = derive2 { name="iGasso"; version="1.4"; sha256="17xxqncl5xcphdqclghcazygcgibf8ijdf4kkl3ga11xf70sahj2"; depends=[CompQuadForm lattice]; }; iIneq = derive2 { name="iIneq"; version="1.0.1"; sha256="1mcr084ik1dc5fndj6ci7px4l1y8jz9kr59riqkf0bm6hras5rfg"; depends=[doParallel foreach]; }; @@ -9347,8 +9744,10 @@ in with self; { iMediate = derive2 { name="iMediate"; version="0.5.5"; sha256="1lwhrzm4g2fcazh782g7p11v5pyx165ig1dzgkmdmjffpwk0w8b4"; depends=[MBESS mvtnorm plotly]; }; iNEXT = derive2 { name="iNEXT"; version="2.0.20"; sha256="14bagsb0ja3j53i0g4a2ax2gj7lyc6sjcc7isdjx94clbnc2zcsg"; depends=[ggplot2 reshape2]; }; iNZightMR = derive2 { name="iNZightMR"; version="2.2.5"; sha256="1zxvlz0wyf4n2kpyk82grlww71agvfqp3apswbrimpvi13c9nzhl"; depends=[]; }; - iNZightTS = derive2 { name="iNZightTS"; version="1.5.2"; sha256="08c79rs1iigdbkbkcfaffs92ci27igd0rbh3z4472811819dyg9x"; depends=[dplyr egg forcats ggplot2 gridExtra magrittr rlang tidyr]; }; - iNZightTools = derive2 { name="iNZightTools"; version="1.9.0"; sha256="0wyywxsyig50g3k6jragiv9zqzdsiqwybc997w3ah1bmv6vds7rz"; depends=[chron dplyr forcats haven lubridate magrittr readr readxl stringr survey tibble tidyr validate zoo]; }; + iNZightPlots = derive2 { name="iNZightPlots"; version="2.12.4"; sha256="1zrx961danqhymk81mlfj29hd26iq5224k8zyjg6scgj71z1vjaz"; depends=[boot chron colorspace dichromat hexbin iNZightMR iNZightTools lubridate magrittr quantreg rlang s20x scales survey]; }; + iNZightRegression = derive2 { name="iNZightRegression"; version="1.3.0"; sha256="0q4w935ckqciw46vvqqwn50bq30qgzq8g4pag8zf00vs4v4rzmxm"; depends=[car dplyr ggplot2 ggrepel ggtext iNZightPlots iNZightTools magrittr multcomp patchwork]; }; + iNZightTS = derive2 { name="iNZightTS"; version="1.5.7"; sha256="0x11ar2smm3am55k0pzxdx8q64l7vfbm6bbp4zs9q64q7069yrr1"; depends=[colorspace dplyr egg forcats ggplot2 ggtext glue gridExtra magrittr patchwork rlang tidyr]; }; + iNZightTools = derive2 { name="iNZightTools"; version="1.10"; sha256="1383004794jk4kvzz7k3c0ndz8fjf6chhck4ha2cadr8hqay80if"; depends=[chron dplyr forcats glue haven lubridate magrittr RcppTOML readr readxl stringr survey tibble tidyr validate zoo]; }; iRF = derive2 { name="iRF"; version="2.0.0"; sha256="1ll4lxg743p2zipxcq13yjsc7j7dk766dcyixwxilllbisg0dh8y"; depends=[AUC data_table doParallel dplyr foreach Matrix RColorBrewer Rcpp]; }; iRafNet = derive2 { name="iRafNet"; version="1.1-1"; sha256="0w9bry49apkrrrabglnv5w9l47jakmc30jh8q22a8gazwss293fb"; depends=[ROCR]; }; iRegression = derive2 { name="iRegression"; version="1.2.1"; sha256="1kwsrmsflmqan96aj0dczlszfww1dlg6rwycyid52f7ghg9810rn"; depends=[mgcv]; }; @@ -9360,16 +9759,18 @@ in with self; { iWeigReg = derive2 { name="iWeigReg"; version="1.0"; sha256="09ajbqllr4ajmpk8qs6qw019fx8a7vsabm37867zycssn77z9nc8"; depends=[MASS trust]; }; iZID = derive2 { name="iZID"; version="0.0.1"; sha256="1jaqdh6i5xyfw4y2wd9qivzjklf4j2xxnya8ssn7rv5bz6misgcz"; depends=[doParallel extraDistr foreach rootSolve]; }; iadf = derive2 { name="iadf"; version="0.1.1"; sha256="0ys8rd05s0j6cs7snmp1car7lp7k4awvs8gnlqaw9zcd7w7k9r06"; depends=[dplR dplyr manipulate rlang tibble tidyr tidyselect]; }; - iai = derive2 { name="iai"; version="1.3.0"; sha256="0xp3j3w7aazcqnrix1qh5iwjsias61fxw5bhhsm2d93arfnd27d5"; depends=[JuliaCall lifecycle rlang stringr]; }; - iarm = derive2 { name="iarm"; version="0.4.1"; sha256="1z0k970sk8qliknfsz88yij1aigf0dxk43h92iwg17xi64hvjs11"; depends=[eRm ggplot2 gridExtra Hmisc PP psychotools vcdExtra]; }; + iai = derive2 { name="iai"; version="1.4.0"; sha256="0a4dvx440glynl74xiviq8frb6khr1fp9xcb1ckf0dx5p16vbpsp"; depends=[JuliaCall lifecycle rlang stringr]; }; + ialiquor = derive2 { name="ialiquor"; version="0.1.0"; sha256="0nrp75lzb49lhkxspvaq6wx5c48ny6fq9m3r1bz0v5f2fd5ilrdx"; depends=[]; }; + iarm = derive2 { name="iarm"; version="0.4.2"; sha256="0scf1ad87sn4s7ki6hpgk4isy1k3qkdvs18bkwdflsarcx437ms2"; depends=[eRm ggplot2 gridExtra Hmisc PP psychotools vcdExtra]; }; + ib = derive2 { name="ib"; version="0.1.0"; sha256="1rzgpgmg7bzg60dyxmmprcsri5wdbarqgp4ya5h418hnnmh8hg0n"; depends=[lme4 MASS Matrix Rdpack VGAM]; }; ibb = derive2 { name="ibb"; version="0.0.1"; sha256="0k2k2qsf11jcn12qm6823hv5ilnf70r0mdskgzjww4mi66kr5lzx"; depends=[dplyr httr jsonlite xml2]; }; ibd = derive2 { name="ibd"; version="1.5"; sha256="0rxvy4hn4fpbv6y214ggkmgfvzwns5mkanp4h8201rjk3v84mk2r"; depends=[car emmeans lpSolve multcomp]; }; ibdreg = derive2 { name="ibdreg"; version="0.3.1"; sha256="0kgx9iavgm6d6njhki7bm82d6lw2c7kcch2pryd339js2hm0l5gq"; depends=[]; }; - ibdsim2 = derive2 { name="ibdsim2"; version="1.2"; sha256="15780iz0pijlmx0pzwkvwkyqd0nkgyxqlsm9wiln45fdwz6gbj32"; depends=[ggplot2 glue pedtools Rcpp ribd]; }; + ibdsim2 = derive2 { name="ibdsim2"; version="1.3.0"; sha256="00i2aakrs5rjp1vjlrg9khjfj9haw07v4yi54m49nkmvnjfyfixg"; depends=[ggplot2 glue pedtools Rcpp ribd]; }; ibeemd = derive2 { name="ibeemd"; version="1.0.1"; sha256="115z13q02gzixziknix2l53mi12zzg30ra9h35pv6qzrr11ra1ic"; depends=[deldir fields rgeos sp spdep]; }; ibelief = derive2 { name="ibelief"; version="1.3"; sha256="15jafk5b954hsl5kkbiyr8pi385c92il05jls33lyf4i25q5aqk3"; depends=[]; }; ibm = derive2 { name="ibm"; version="0.1.0"; sha256="0g6wg2qpa4q142xw2vq5pca4ll6pb8hyll5g0c93kk8crddk51s7"; depends=[Rcpp]; }; - ibmAcousticR = derive2 { name="ibmAcousticR"; version="0.1.2"; sha256="06b7p6bqr5clbwghkqlz669nj6slblx4wqxhjpnr4rb690wbcy16"; depends=[httr jsonlite XML]; }; + ibmAcousticR = derive2 { name="ibmAcousticR"; version="0.2.1"; sha256="1hrd2273n9fgi3hgjissjn4syw914mxm4wr98ij819yahsi9aj42"; depends=[httr jsonlite XML]; }; ibmcraftr = derive2 { name="ibmcraftr"; version="1.0.0"; sha256="0zm5j0a1wjj5agibp38h73qxpq0njvrhfq3077xhhfizcb3v24sb"; depends=[Rcpp]; }; ibmdbR = derive2 { name="ibmdbR"; version="1.50.0"; sha256="151gg05gcy5wpyvyflr4mc0jq1npxzq9pc4spjc81x2igd14c370"; depends=[arules ggplot2 MASS Matrix RODBC rpart rpart_plot]; }; ibmsunburst = derive2 { name="ibmsunburst"; version="0.1.1"; sha256="0dxsdsimqgs7lbbfx7h8l2r6xpwgy2r7cf2y1v8hkgapf6n5kjnk"; depends=[htmlwidgets jsonlite]; }; @@ -9383,16 +9784,16 @@ in with self; { icapca = derive2 { name="icapca"; version="1.1"; sha256="131gdrk8vsbac0krmsryvsp21bn9hzxqxq847zn16cxjf6y5i3xb"; depends=[]; }; icarus = derive2 { name="icarus"; version="0.3.1"; sha256="0ipbhzvwdn1cnzgdw33cwv901768srxfi588bimjx2ssl80mqn3a"; depends=[]; }; iccbeta = derive2 { name="iccbeta"; version="1.2.0"; sha256="03ms1c8qpbgxabj3hh4n0gwcazw6cd0cvixck5rz8fkvj04xzjak"; depends=[lme4 Rcpp RcppArmadillo]; }; - icd = derive2 { name="icd"; version="4.0.9"; sha256="177wwya4fcb2jc33j9xd838ayyqwxgd77a9fi2hd9h8afxz3g12c"; depends=[Rcpp RcppEigen]; }; + iccde = derive2 { name="iccde"; version="0.2.0"; sha256="13b5hq7h1x87g4dwk50xczyiwrdk3ksr51cll9a2j2ak1cyaf3g4"; depends=[]; }; icd_data = derive2 { name="icd.data"; version="1.0"; sha256="0cynr9327wfg88661w4hali48mb6ghyvlqgybsa38k9bbf57v8aa"; depends=[]; }; icdGLM = derive2 { name="icdGLM"; version="1.0.0"; sha256="1mh9kwn21n19v4lrmj33ghpna7dl66fx19gi6lcjanmrpzrkwdnz"; depends=[Matrix]; }; icemelt = derive2 { name="icemelt"; version="1.0"; sha256="13pjbyh2ggns36m8s43m2cb0kvisjlfxq75gqscldp75zjli2wi8"; depends=[survival]; }; - icenReg = derive2 { name="icenReg"; version="2.0.14"; sha256="0xszlq8kqb2bf5mv7kxrm5s7wla89ns3gizs3x5cyq710aqdla26"; depends=[coda foreach MLEcens Rcpp RcppEigen survival]; }; + icenReg = derive2 { name="icenReg"; version="2.0.15"; sha256="1cjlvj4i5bir5769a22w8bb9477h04d8rpxk9ks72jp6zjjkq5qa"; depends=[coda foreach MLEcens Rcpp RcppEigen survival]; }; icensBKL = derive2 { name="icensBKL"; version="1.2"; sha256="1zzv80jnn8ilnc1gv4nj24l2fl8805rjhqjgkb0xx4y9zhpg1jkp"; depends=[gtools Icens MASS mvtnorm smoothSurv survival TeachingDemos]; }; - icensmis = derive2 { name="icensmis"; version="1.3.1"; sha256="1c0j43wffb5h99chlj8j45lpan7dpn2i0r4rr6b2kq16p1zabfjw"; depends=[Rcpp]; }; + icensmis = derive2 { name="icensmis"; version="1.4.0"; sha256="1rfsciac7lj6649a0lrmipjnhdlz615bd9hsvcy8mis0yv8k5y93"; depends=[Rcpp]; }; icesAdvice = derive2 { name="icesAdvice"; version="2.0-0"; sha256="0sx93fsx2srmynnvs3bjb525m9a5w70qr9lghmkqa07crd991vfr"; depends=[]; }; icesDatras = derive2 { name="icesDatras"; version="1.3-0"; sha256="0yaqlximxa3rcjxgrd0mii02mm9gpcxgw3i8pymp00bk8zixvj30"; depends=[]; }; - icesTAF = derive2 { name="icesTAF"; version="3.5-0"; sha256="1rirpwnr0z6y3yswb3v2w280a2lj2rn4xln0jxakxbrkjg87sin2"; depends=[bibtex lattice]; }; + icesTAF = derive2 { name="icesTAF"; version="3.6.0"; sha256="1g2qlpbi94731vvzdnc16f1gpgn49sxzlsljzzapfgk14dcm96b1"; depends=[glue jsonlite lattice purrr roxygen2]; }; icmm = derive2 { name="icmm"; version="1.1"; sha256="1w9f1rniz67rrvq0akc64s5433ddmr2cgbcljil4c58yyz8hinx8"; depends=[EbayesThresh]; }; icosa = derive2 { name="icosa"; version="0.10.0"; sha256="1vd1qn1070rml7mygj9k13b96zrc77bw90g8f44s7wmhabn6214q"; depends=[igraph Rcpp sp]; }; icpsrdata = derive2 { name="icpsrdata"; version="0.5.0"; sha256="024lda7619j8nxcj0d0myaqjsmyl9mqdyghd6imr29jxa2qhcm8y"; depends=[httr purrr rvest]; }; @@ -9403,13 +9804,12 @@ in with self; { idbg = derive2 { name="idbg"; version="1.0"; sha256="1rxmj04hswxybrg7dfib3mjy8v8mdiv13zwbscp2q55z55hhf1m5"; depends=[]; }; idbr = derive2 { name="idbr"; version="0.3"; sha256="02syk7fmif0xnddl8189vnl329r8mwl3iwv2rsf6cw7mwg30fhyw"; depends=[countrycode dplyr httr jsonlite]; }; ideamdb = derive2 { name="ideamdb"; version="0.0.9"; sha256="1f4dcv6c8ny7pik547f4840vhll26mzfcijnfsiqx31xhn0gsizd"; depends=[dplyr ggplot2 stringr tidyr]; }; - idefix = derive2 { name="idefix"; version="0.4.3"; sha256="1kpan1499n9paibrr5gc0n5s05ls64fx8raiwckc7hfzsnh1fb26"; depends=[dplyr MASS mlogit Rcpp RcppArmadillo Rdpack scales shiny tmvtnorm]; }; - idem = derive2 { name="idem"; version="5.0"; sha256="083vhr61ivr2a5xyrr1l1b52vlpm6fkjm3b6rbpkrn7qw6b4mv8c"; depends=[BH mice Rcpp RcppEigen rstan rstantools sqldf StanHeaders survival]; }; + idefix = derive2 { name="idefix"; version="1.0.1"; sha256="1hqq9w0hssczmy8kvpp438fz0r5wdrxzxpkhrljz50rqazr61asy"; depends=[dplyr MASS mlogit Rcpp RcppArmadillo Rdpack scales shiny tmvtnorm]; }; idendr0 = derive2 { name="idendr0"; version="1.5.3"; sha256="11c12d166bp2i498d8y6ipg5jhz1xsdsrmnhjqnrqqzp9avvrsjp"; depends=[tkrplot]; }; identity = derive2 { name="identity"; version="0.2-1"; sha256="1j5wb5cj5j49in2g6r1shdm4ri4cfzj22hpqazvcmq4dm291sdi9"; depends=[]; }; ideq = derive2 { name="ideq"; version="0.1.4"; sha256="06xk9ghvh3fb79lbkmbqsk07xj06qaigiw41rzbi3bji3fjq1prw"; depends=[matrixcalc mvtnorm pdist Rcpp RcppArmadillo rgen]; }; ider = derive2 { name="ider"; version="0.1.0"; sha256="021s4fybki7a6mdsr6gkjrzfhaqdcg0m2a6r24y91jklxlxqxmws"; depends=[FNN]; }; - idiogramFISH = derive2 { name="idiogramFISH"; version="1.16.1"; sha256="0qg27v8c26fz3dkzddc7fc1dpgc2csh7vh6rj5lc2kk4m3mjd3k4"; depends=[crayon dplyr tidyr]; }; + idiogramFISH = derive2 { name="idiogramFISH"; version="1.16.8"; sha256="1mla0djkzqx1r2587niy800ar96qx14d8fxi6q156jr7049whn0w"; depends=[crayon dplyr tidyr]; }; idm = derive2 { name="idm"; version="1.8.2"; sha256="04f0i0kwdxywmj2i184knx5a5v9svx0lbam6wpz49hghg7qpy0w5"; depends=[animation ca corpcor dummies ggplot2 ggrepel]; }; idmTPreg = derive2 { name="idmTPreg"; version="1.1"; sha256="1329sjb4dnw3yiyg16whbj4l2v0kg8phg1x4ysvyp2kqkmw14yq6"; depends=[doParallel foreach survival]; }; idmodelr = derive2 { name="idmodelr"; version="0.3.2"; sha256="02hvlmk38rs0iavwz0qa3ryvyw1ixhjf9bksmadlhxl5pd18016j"; depends=[deSolve dplyr furrr future ggplot2 magrittr purrr rlang stringr tibble tidyr viridis]; }; @@ -9422,21 +9822,21 @@ in with self; { iemiscdata = derive2 { name="iemiscdata"; version="0.6.1"; sha256="0a9x90kisgmrka0frk9myb1qdq3nl092n78wrif31b42arifa8h9"; depends=[]; }; iemisctext = derive2 { name="iemisctext"; version="0.9.99"; sha256="02rr7sjjbrvfxwjl87f2ki245a8cw5fvx7z2z4rl8ixxlyxj9p5v"; depends=[]; }; ifa = derive2 { name="ifa"; version="7.0"; sha256="1cxafd7iwvyidzy27lyk1b9m27vk785ipj9ydkyx9z1v0zna2wnl"; depends=[mvtnorm]; }; - ifaTools = derive2 { name="ifaTools"; version="0.21"; sha256="1vnrf67d0b83nmvk91sw1w2lgjlldp7dslxnrxh7lb94h3z6jigd"; depends=[ggplot2 OpenMx reshape2 rpf shiny]; }; + ifaTools = derive2 { name="ifaTools"; version="0.22"; sha256="16wgq7b4xffgrmy10f58kwqd3m3p3lwa4ck92jb6gb8gml1n9g82"; depends=[ggplot2 OpenMx reshape2 rpf shiny]; }; ifctools = derive2 { name="ifctools"; version="0.3.2"; sha256="18g0l0vh9z4nvl6jil32983c4z1dvawrivi4kz4g562q3habm279"; depends=[]; }; ifs = derive2 { name="ifs"; version="0.1.5"; sha256="03g9cgs0zp89b1d7rpcn5clkvmg0spnariwrifd8hha476ldvfcy"; depends=[]; }; + ifultools = derive2 { name="ifultools"; version="2.0-22"; sha256="0f95vqc47dgssqngznk0rclr72ndbyxc7gdq2cmbksvq7qpn3gg1"; depends=[MASS splus2R]; }; ig_vancouver_2014_topcolour = derive2 { name="ig.vancouver.2014.topcolour"; version="0.1.2.0"; sha256="0yclvm6xppf4w1qf25nf82hg1pliah68z7h3f683svv0j62q748h"; depends=[]; }; igate = derive2 { name="igate"; version="0.3.3"; sha256="0b8dk976z0764cmxwcq6w2f3akv7iivivharinq029p90b600qza"; depends=[dplyr ggplot2 kableExtra knitr rmarkdown stringr xtable]; }; - iglu = derive2 { name="iglu"; version="1.0.2"; sha256="1xs0qw0msqiajz1gpdv7q49iwbwyf3wrqjrs82mwidwpcdgzlkry"; depends=[caTools dplyr ggplot2 lubridate magrittr scales shiny tibble tidyr]; }; - igraph = derive2 { name="igraph"; version="1.2.5"; sha256="126z1ygbmi3g7hk97snf22rnx680dyi30idssm5zacba5rdngp8c"; depends=[magrittr Matrix pkgconfig]; }; + iglu = derive2 { name="iglu"; version="2.0.1"; sha256="0vc1n3a00116dg4wnd38rnxragif98jvhj23192jxxmgnvcv43sg"; depends=[caTools dplyr ggplot2 lubridate magrittr scales shiny tibble tidyr]; }; + igraph = derive2 { name="igraph"; version="1.2.6"; sha256="0vf7wrx77cdiav8724cw8gchrn0y9wvywphf5km4pa7xcqhsf3b4"; depends=[magrittr Matrix pkgconfig]; }; igraphdata = derive2 { name="igraphdata"; version="1.0.1"; sha256="19w5npa4b8c054v94xlr7nmhhg2fhq4m8jbds86skp8zvipl4rkl"; depends=[]; }; igraphinshiny = derive2 { name="igraphinshiny"; version="0.1"; sha256="1ww5s4jfihzcx4k35lbhzsf54z720xh7b2p5alzk843m6rx77986"; depends=[igraph shiny]; }; igraphtosonia = derive2 { name="igraphtosonia"; version="1.0"; sha256="0vy9jnpjp68l8s0hi1l57j9p41c543h3iqv16pwl550f38zqp8j6"; depends=[igraph]; }; - iheatmapr = derive2 { name="iheatmapr"; version="0.5.0"; sha256="0s2lc088rq2siy2wzmg1y6nss68rs33mf7w2izqqmg6kbx6d7y9h"; depends=[fastcluster ggdendro htmlwidgets jsonlite knitr magrittr RColorBrewer scales]; }; + iheatmapr = derive2 { name="iheatmapr"; version="0.5.1"; sha256="1pwkwh7ljlpr6zyz6j8knpz3iw60xzkw8amc98x4pc2mw148jvzx"; depends=[fastcluster ggdendro htmlwidgets jsonlite knitr magrittr RColorBrewer scales]; }; ihpdr = derive2 { name="ihpdr"; version="1.2.1"; sha256="1qa9ndb5aqbmlqbl0ivh10ddah2rbhsc6928dml20fjgz7lggdww"; depends=[curl dplyr httr lubridate magrittr purrr readxl rlang rvest tidyr xml2]; }; - ihs = derive2 { name="ihs"; version="1.0"; sha256="1c5c9l6kdalympb19nlgz1r9zq17575ivp3zrayb9p6w3fn2i06h"; depends=[maxLik]; }; iilasso = derive2 { name="iilasso"; version="0.0.2"; sha256="043m1n5840459zsknkb54801apb0a2cqfprncmj2wp235rbqj832"; depends=[BH Matrix Rcpp]; }; - ijtiff = derive2 { name="ijtiff"; version="2.2.0"; sha256="13ahpbrfn1jla7v38wxlmhy617m2dipzipsf5b8f6zyajl5mywjz"; depends=[checkmate cli dplyr filesstrings fs magrittr purrr readr rlang stringr withr zeallot]; }; + ijtiff = derive2 { name="ijtiff"; version="2.2.4"; sha256="1v0gv9z4rbyn80swmka0jdbyz26q0fbzwwfjghmcxm542ijcm98g"; depends=[checkmate cli dplyr fs magrittr purrr readr rlang strex stringr withr zeallot]; }; ilc = derive2 { name="ilc"; version="1.0"; sha256="0hs0nxv7cd300mfxscgvcjag9f2igispcskfknb7sn7p8qvwr5ki"; depends=[date demography forecast rainbow survival]; }; image_CannyEdges = derive2 { name="image.CannyEdges"; version="0.1.0"; sha256="0c8pvk91xyys6d2i03yy88kylb3jli5jkpq2s069n7p0yl3z7rr1"; depends=[Rcpp]; }; image_ContourDetector = derive2 { name="image.ContourDetector"; version="0.1.0"; sha256="1z3713paqw86yq45sq1b4gi3nq3y21wcg3pxh7vsciqs669lpv1q"; depends=[Rcpp sp]; }; @@ -9447,6 +9847,7 @@ in with self; { image_binarization = derive2 { name="image.binarization"; version="0.1.1"; sha256="1dajmffxali1kj54lfvapgb0vv5bbxxy7wxdsr4p5dv29gjwbl7i"; depends=[magick Rcpp]; }; image_dlib = derive2 { name="image.dlib"; version="0.1.0"; sha256="118zwalpxcnn2fgjv8xsp763yvbqcyv81p6fblxizlnimyrjva71"; depends=[Rcpp]; }; image_libfacedetection = derive2 { name="image.libfacedetection"; version="0.1"; sha256="0mr7zrqd73mhvs918615lwsf2bgg63x3wh16wdpwhb2zd7ybm87a"; depends=[Rcpp]; }; + image_textlinedetector = derive2 { name="image.textlinedetector"; version="0.1.2"; sha256="15w0mfr2qby6plpgwz7vhj7bn9szzcyp7cmfd7z60477yp8bx1ld"; depends=[magick Rcpp]; }; imageData = derive2 { name="imageData"; version="0.1-60"; sha256="1ry4l45az9az8wk1k16jxbszxwh0m9s3g838w7dad0midr2hs8qr"; depends=[dae GGally ggplot2 Hmisc RColorBrewer readxl reshape]; }; imagefluency = derive2 { name="imagefluency"; version="0.2.3"; sha256="0f4kizxc86q6pgx5dbp14y6866b1ldyf7zgpfikd2iqhvxbs7qwa"; depends=[magick OpenImageR pracma R_utils readbitmap]; }; imagefx = derive2 { name="imagefx"; version="0.4.1"; sha256="1mxd33y8zbq8kig6m6xihb5w8wrjppgmpyjspvaxjwk7si9a09k1"; depends=[moments signal]; }; @@ -9455,13 +9856,14 @@ in with self; { imageviewer = derive2 { name="imageviewer"; version="0.1.0"; sha256="1rsrwy5v0gnsmbay1zqijhvll2l1bs844m52w65588j9nlx4fci9"; depends=[htmlwidgets]; }; imagine = derive2 { name="imagine"; version="1.5.3"; sha256="1ss0gm769s8cmma3hnah15vmc2c5wxn0l3s4vas7jbvkwi62am6h"; depends=[Rcpp]; }; imbalance = derive2 { name="imbalance"; version="1.0.2.1"; sha256="14f7p3x8818b1asfynp3w4sxdacsd14dzs7r166s1jdadwwfwi1s"; depends=[bnlearn C50 FNN ggplot2 KernelKnn mvtnorm Rcpp RcppArmadillo smotefamily]; }; + imbibe = derive2 { name="imbibe"; version="0.1.0"; sha256="0l7wn7vcbb466a4i3w302ficdy0jvy2jh5qizfn7ahpcs7lpx6hr"; depends=[magrittr Rcpp RNifti]; }; imdbapi = derive2 { name="imdbapi"; version="0.1.0"; sha256="11v7c0s7qqf02b186md5lhgkgmywkn8lmmanlz3gfcxca26g047y"; depends=[dplyr httr stringr]; }; - imfr = derive2 { name="imfr"; version="0.1.8"; sha256="1kdchi0lzr9qgmz3d1f5rcr9cgz19m2k5bchbyknx7055d09yh1q"; depends=[dplyr httr jsonlite]; }; + imfr = derive2 { name="imfr"; version="0.1.9.1"; sha256="1l1lvzvz9hsqwk60k2w8ry8mvgzj7wrd6ycfhgwv39xid9vk70g7"; depends=[dplyr httr jsonlite]; }; imgpalr = derive2 { name="imgpalr"; version="0.3.0"; sha256="1kb1ggrlkrh086nwq47sf2y20r7ydk4ww2j3gq0s4iz00aa34pxg"; depends=[downloader dplyr farver jpeg magrittr tibble]; }; imgrec = derive2 { name="imgrec"; version="0.1.0"; sha256="1v4q2hxil7f0jnj4nql44d9dssh8kz1mnj8ah5slndnn1fbymy8f"; depends=[base64enc dplyr httr jsonlite knitr rlang]; }; imguR = derive2 { name="imguR"; version="1.0.3"; sha256="14f7ghgc8rbrpqb21rinfbrj1wh80i6ii0awwi814152v5qzj4b3"; depends=[httr jpeg png]; }; - iml = derive2 { name="iml"; version="0.10.0"; sha256="0xm3q42qahq798ilgg050df0mahhbdfd3fx3i7cpx606h38si0x7"; depends=[checkmate data_table Formula future future_apply ggplot2 gridExtra Metrics prediction R6]; }; - immcp = derive2 { name="immcp"; version="0.9.1"; sha256="0pvb62ac1c48cklgcv10f6x986a14x8mz3gpsnfg1di21jk1xbcc"; depends=[Boruta clusterProfiler corrr ggplot2 GSEABase GSVA igraph magrittr Matrix pbapply proxyC reshape2 RobustRankAggreg visNetwork]; }; + iml = derive2 { name="iml"; version="0.10.1"; sha256="1wz6xqhvqkzj723nw7qrlwb1171wvvpxhv3pa8cq7vcbkiflq37r"; depends=[checkmate data_table Formula future future_apply ggplot2 keras Metrics prediction R6]; }; + immcp = derive2 { name="immcp"; version="0.9.2"; sha256="07q5dhz12pvy631jxans6q62kzqx9pil3ra72pgqlcxpndvv6f4w"; depends=[Boruta clusterProfiler corrr ggplot2 GSEABase GSVA igraph limma magrittr Matrix pbapply proxyC reshape2 RobustRankAggreg visNetwork]; }; immer = derive2 { name="immer"; version="1.1-35"; sha256="1nmf9wxxyq3p8b5kikpsr8b0v4s84zjpahg1rxvcrhc8blg26hjq"; depends=[CDM coda MASS psychotools Rcpp RcppArmadillo sirt TAM]; }; immunarch = derive2 { name="immunarch"; version="0.6.5"; sha256="0vy1m4333k4v24qgcb0ra154hf35mp1f8m10hqnmy2qk00ksd01c"; depends=[airr circlize data_table dbplyr dplyr dtplyr factoextra fpc ggalluvial ggplot2 ggpubr ggrepel ggseqlogo magrittr MASS patchwork pheatmap plyr Rcpp readr readxl reshape2 rlang Rtsne scales shiny shinythemes stringr tibble UpSetR]; }; immuneSIM = derive2 { name="immuneSIM"; version="0.8.7"; sha256="0brj12xnkzmn3n91vb39fq3q68wmzmwx9l38dl38yypp0l8pknjl"; depends=[Biostrings data_table ggplot2 ggthemes igraph Metrics plyr poweRlaw RColorBrewer repmis reshape2 stringdist stringr]; }; @@ -9471,7 +9873,7 @@ in with self; { implicitMeasures = derive2 { name="implicitMeasures"; version="0.2.0"; sha256="0w0dwnzfhw5v5j7q3zpfsca4ydmq7b9fzspvyf9sibyh587isb9c"; depends=[ggplot2 stringr tidyr xtable]; }; implied = derive2 { name="implied"; version="0.3.1"; sha256="11mrvpsh9qc5a5s5mpbsksri6vx36ij1gvpli6lyz6dkg48a9kdn"; depends=[]; }; implyr = derive2 { name="implyr"; version="0.3.0"; sha256="1i0m95azyi46wnh59dcs52l78i1yqy677rlr4b6c0r945m67advn"; depends=[assertthat DBI dbplyr dplyr rlang tidyselect]; }; - r_import = derive2 { name="r_import"; version="1.1.0"; sha256="0blf9539rbfwcmw8zsb4k58slb4pdnc075v34vmyjw752fznhcji"; depends=[]; }; + r_import = derive2 { name="r_import"; version="1.2.0"; sha256="018s0x224gqnv4cjfh0fwliyfg6ma9vslmwybrlizfsmqcc5wp37"; depends=[]; }; importar = derive2 { name="importar"; version="0.1.1"; sha256="0xv445fmjhsbdlsq03k2rlycnggn3rcyq5a49zrg4jvjamzr0rgr"; depends=[]; }; importinegi = derive2 { name="importinegi"; version="1.1.2"; sha256="11mr3kw7y015w6892cz73qm77rhcsm86b4hlb34aqcbcqqqxlxrv"; depends=[data_table dplyr foreign haven rgdal]; }; impressionist_colors = derive2 { name="impressionist.colors"; version="1.0"; sha256="03z5w7y7vbvlnn30r9y3ip93h364f87nhwdb9hcki26csiq2bnlv"; depends=[]; }; @@ -9494,10 +9896,14 @@ in with self; { incR = derive2 { name="incR"; version="1.1.0"; sha256="0q41bs7pf6hqyfwvcwc2sxq44jq95qq3qsddz53f8gphwjsyf1v7"; depends=[dplyr ggplot2 lubridate maptools rgeos]; }; inca = derive2 { name="inca"; version="0.0.4"; sha256="1r3niibd6pja59am8in9gpyvxi2g5bh8bqqhdixzwaj3xzyyipii"; depends=[Matrix Rcpp RcppArmadillo]; }; incadata = derive2 { name="incadata"; version="0.9.1"; sha256="0987zazkp3cxvk88i3yqb70s2i1cg108vc8wyhh2867s3rqdrpgh"; depends=[decoder rvest sweidnumbr xml2]; }; + incase = derive2 { name="incase"; version="0.2.0"; sha256="0ja00xhiq92sm00gmfkgziqkqhqb3pkf2vkf2c1mggfxp3pa9aqf"; depends=[magrittr plu rlang]; }; incgraph = derive2 { name="incgraph"; version="1.0.1"; sha256="0zjvxk2krdlm5bcr0m80nxy46f69a1xadfjw5sjw249b28wdclml"; depends=[BH dplyr orca purrr Rcpp testthat tibble]; }; - incidence = derive2 { name="incidence"; version="1.7.2"; sha256="02q672fb5wji4wnlk3fjsgz2hy5hx0nn9xq5hlw7aqb24lh4fifm"; depends=[aweek ggplot2]; }; + incidence = derive2 { name="incidence"; version="1.7.3"; sha256="1wdxh2p7scm419fqki0i7vsz45rd7557h5n3zf9fshb8x1fdf2z7"; depends=[aweek ggplot2]; }; + incidence2 = derive2 { name="incidence2"; version="0.2.2"; sha256="1rmz0v091x90m8q834qnfifbyc6bmn8f538y1qv7scx043f5rb1s"; depends=[aweek data_table dplyr ellipsis ggplot2 magrittr pillar tibble vctrs]; }; + incidental = derive2 { name="incidental"; version="0.1"; sha256="012pdwrkzlbnrrkvy67l6nvs1lrjgrzhfh3v4rqzk2ypdvfm3wmx"; depends=[dlnm ggplot2 MASS matrixStats numDeriv]; }; inctools = derive2 { name="inctools"; version="1.0.15"; sha256="0ikldiwgizs2p9vcalk5729dr6krysnyr4ni0ybg9gljw7iafdlf"; depends=[binom cubature doParallel dplyr foreach ggplot2 glm2 magrittr plyr pracma rlang tibble tmvtnorm]; }; indelmiss = derive2 { name="indelmiss"; version="1.0.9"; sha256="0i4qnvc0xb3ngnk8xdscmx7qnicfs7s6czawf6schb1nh2pjpzyq"; depends=[ape numDeriv phangorn Rcpp]; }; + independence = derive2 { name="independence"; version="1.0.1"; sha256="0yln5wd8m5fgh4h7k80vq22byf06k4d6574zxyqcig63hls7v568"; depends=[Rcpp]; }; indicspecies = derive2 { name="indicspecies"; version="1.7.9"; sha256="1xza0ha42frz5wizf268j49y3201vpsm4kgj0czsw9wygzjl008f"; depends=[permute]; }; indirect = derive2 { name="indirect"; version="0.2.0"; sha256="1k7xwsx655nzl43s1mkaysyn5gydq973gynmqip67lssnm7cnch4"; depends=[gplots MASS]; }; inegiR = derive2 { name="inegiR"; version="3.0.0"; sha256="1rhkdmpz7mxi7ddyygss5rlh3c8hgxhzdk3fnvnlizc1l55cc6c0"; depends=[jsonlite lubridate plyr tibbletime XML zoo]; }; @@ -9514,7 +9920,7 @@ in with self; { influence_SEM = derive2 { name="influence.SEM"; version="2.2"; sha256="1cabl6486mlrmk0418s18wii3n6nl1ckv6w9281wdk4fy27y9qk2"; depends=[lavaan]; }; influenceAUC = derive2 { name="influenceAUC"; version="0.1.2"; sha256="0pscwfxs2y780lzd5sxldnnkzzs2lsjdwz71z44kn7884wqmikpm"; depends=[dplyr geigen ggplot2 ggrepel ROCR]; }; influenceR = derive2 { name="influenceR"; version="0.1.0"; sha256="12p9362hkndlnz1rd8j2rykg57kbm6l7ks60by3rd25xg50k5jag"; depends=[igraph Matrix]; }; - influential = derive2 { name="influential"; version="1.1.2"; sha256="195219khnphz7z15za82l1pdh8c2qbn81jwkrsr2q0pax8xjbc5z"; depends=[coop igraph ranger reshape2]; }; + influential = derive2 { name="influential"; version="2.0.1"; sha256="1ry439k88i59znvssv0x831ixlhblsqxnwd7pwdsr15yj2xqc28q"; depends=[coop ggplot2 igraph ranger reshape2]; }; influxdbr = derive2 { name="influxdbr"; version="0.14.2"; sha256="03dzw86mvbc8w38q9skjki1z17vc04k9q8dx7sd3xg6xbr10f9d9"; depends=[dplyr httr jsonlite magrittr purrr rlang tibble tidyr xts zoo]; }; infoDecompuTE = derive2 { name="infoDecompuTE"; version="0.6.2"; sha256="0r1capiv4zr31dsy0sqly9zb00i86zq2ihbgsmb5g4cy0f04xlqz"; depends=[MASS]; }; informR = derive2 { name="informR"; version="1.0-5"; sha256="16pz47wlr1gr8z5hdnrjpczm967khqiqgdfiw15a0bby6qdvni2y"; depends=[abind relevent]; }; @@ -9522,62 +9928,63 @@ in with self; { infra = derive2 { name="infra"; version="0.1.2"; sha256="0jycnnmrrjq37lv67xbvh6p63d6l4vbgf3i1z9y7r75d6asspzn1"; depends=[]; }; infraFDTD_assist = derive2 { name="infraFDTD.assist"; version="0.6"; sha256="04j5nl5vxk79iciz6s9bpiyn319c2dbh7fdahgwira2r30w2fxv9"; depends=[fields]; }; infutil = derive2 { name="infutil"; version="1.0"; sha256="02d0hfbkdqjj0lm1fzwwxy60831kbcjn2m4rfblpib0krkbpz72n"; depends=[ltm]; }; - ingredients = derive2 { name="ingredients"; version="1.3.1"; sha256="0l0dqrm9am6wk8jcf8cdhc6xnrna9cqr5wz6lsnczq2gf6ybhjg1"; depends=[ggplot2 gridExtra scales]; }; + ingredients = derive2 { name="ingredients"; version="2.0"; sha256="084ywbq0dwnf075bazz40n23wh7r1fwl6zs7xqkcg07kfzqkzb2w"; depends=[ggplot2 gridExtra scales]; }; ini = derive2 { name="ini"; version="0.3.1"; sha256="04yqij344dwm0xqgara8xia42mlmij3i8711qbb5534w05a1l6bv"; depends=[]; }; injectoR = derive2 { name="injectoR"; version="0.2.4"; sha256="0sa32cspp6y3m04yfmd02kxx55mk7l9jxf4r9pk1a6k3sqnj6fl8"; depends=[]; }; inlabru = derive2 { name="inlabru"; version="2.1.13"; sha256="1khsfhays6xna060f4h0rc7yjsq89xl42d36fy33ixgk0rh9vlnc"; depends=[ggplot2 Matrix rgdal rgeos sp]; }; - inline = derive2 { name="inline"; version="0.3.15"; sha256="0s4wssvpan189fijahknxq5s22ww9bzmdlmyhnra748r7khky17z"; depends=[]; }; + inldata = derive2 { name="inldata"; version="1.0.3"; sha256="0iz3dlmaw6p81lj406nq4sg4qvl289mn95by10r3zrikf39l0jq2"; depends=[raster sp]; }; + inline = derive2 { name="inline"; version="0.3.17"; sha256="1wslsn60q959yrr27cwanba43qlpfaxzdli46i9dc26lxfr5fa3r"; depends=[]; }; inlinedocs = derive2 { name="inlinedocs"; version="2019.12.5"; sha256="11d8cnrzgq95w7hn234rcwrr1mmrv63f69807pnzxizxbgnp7wz3"; depends=[]; }; - inlmisc = derive2 { name="inlmisc"; version="0.5.0"; sha256="061gd6mcabi5ydwzdcl5wiw3nfkzlh00i1vf60x81jgzi6d2rclb"; depends=[checkmate data_table GA htmltools htmlwidgets igraph knitr leaflet raster rgdal rgeos rmarkdown scales sp tinytex xtable yaml]; }; + inlmisc = derive2 { name="inlmisc"; version="0.5.2"; sha256="1jg92fy9dg9rv0sdzzcc7vylkx6z3l0b2q7rba63dpkdb1vqrwls"; depends=[checkmate data_table GA htmltools htmlwidgets igraph knitr leaflet raster rgdal rgeos rmarkdown scales sp tinytex webshot wordcloud2 xtable yaml]; }; inops = derive2 { name="inops"; version="0.0.1"; sha256="1y402a9r542hpwd1nfdc07mbgnf9alpnykl9di1v8fy0qly8s0an"; depends=[]; }; inpdfr = derive2 { name="inpdfr"; version="0.1.11"; sha256="1wnz73ggc7xcgynvdlvgz26qkfjmxxy0xg8gkf1far5346g4qd9y"; depends=[ca cluster entropart metacom R_devices RColorBrewer SnowballC stringi tm wordcloud]; }; - inplace = derive2 { name="inplace"; version="0.1.1"; sha256="0baiwpd92aa2v3h9srqc2ri0b6ys7hqfb5wxax7whrmdad0dy7hf"; depends=[Rcpp]; }; + inplace = derive2 { name="inplace"; version="0.1.2"; sha256="06jb8xzjqywdww8j2i59c8663dfbrhnvj0lh3xm73j39sig6vh7l"; depends=[Rcpp]; }; + insane = derive2 { name="insane"; version="0.1.0"; sha256="144fq1lys6wy78vnmz1vd4ghs8agraj1hgg0vwlxcnbykmf50i95"; depends=[broom dplyr DT ggbeeswarm ggplot2 ggpubr ggthemes glue patchwork purrr readxl shiny tidyr]; }; insect = derive2 { name="insect"; version="1.2.0"; sha256="0lbck8jbhymzkhm1iqd2y2xg8a26yjizw7x31b1l1kqc1l0p3kmv"; depends=[ape aphid kmer openssl phylogram RANN seqinr xml2]; }; - insee = derive2 { name="insee"; version="0.8.0"; sha256="09gymkvf8zmbiiyb1f38w5ckajz07050nhq2vim3kyvljkl2yrw4"; depends=[dplyr httr lubridate rlang rsdmx stringr tibble tidyr tidyselect xml2]; }; + insee = derive2 { name="insee"; version="0.9.0"; sha256="16dx6d8k78v89443q7pq63zj9cr8856mq1qs7lg945ha2c8k75sn"; depends=[crayon dplyr httr lubridate openssl readsdmx rlang stringr tibble tidyselect xml2]; }; insideRODE = derive2 { name="insideRODE"; version="2.0"; sha256="1ffndk8761cpkririb3g1qsq9nwmh82lcrpql9i5fksdprvdjzcw"; depends=[deSolve lattice nlme]; }; - insight = derive2 { name="insight"; version="0.9.0"; sha256="1ajc8c5mi3ma5411lmlqp2ihkk5n0h8a1c0r3j07wk33p31c1qvl"; depends=[]; }; + insight = derive2 { name="insight"; version="0.11.1"; sha256="1m95xfvai1kbzqxdggjvdbk6ax2dg4v2lrfpqn7v607g2n77n2k0"; depends=[]; }; insol = derive2 { name="insol"; version="1.2.1"; sha256="1d2vqmbp94ff80mfkmq4a8y12r6ryym8hh1568ip9qbn7snc64v1"; depends=[raster]; }; - inspectdf = derive2 { name="inspectdf"; version="0.0.8"; sha256="1ixdsxmclcpjn3ipvk9h9k7fdif9835ayhbd24nsaadby5ymmsfh"; depends=[dplyr ggfittext ggplot2 magrittr progress Rcpp tibble tidyr]; }; + inspectdf = derive2 { name="inspectdf"; version="0.0.9"; sha256="1hf7xha6nbb3ysj9y7vp7x6pcyvnlq67di7ns0pxgjgb7b9qipdd"; depends=[dplyr ggfittext ggplot2 magrittr progress Rcpp tibble tidyr]; }; + inspector = derive2 { name="inspector"; version="1.0.2"; sha256="08dx800dikssljjvwzv6fji6pp7k7lkzjl7y1y6r1j5qxpn7z5mw"; depends=[Rdpack]; }; instaR = derive2 { name="instaR"; version="0.2.4"; sha256="0c4m471ragkpksr0h21cdgnjxcknf01xqz543dahxgzjg9ncjwhg"; depends=[httr jsonlite]; }; install_load = derive2 { name="install.load"; version="1.2.3"; sha256="0z4klcpwdlmhwvk41z9q4c4382z8glad27h0gai93zyciy44sdyx"; depends=[assertthat checkmate fastmatch]; }; insuranceData = derive2 { name="insuranceData"; version="1.0"; sha256="0wryh8i1v3bnpbqn6d6dpxr9bwwl6mnh5cb5igz0yanh4m1rx96w"; depends=[]; }; - insurancerating = derive2 { name="insurancerating"; version="0.6.2"; sha256="165zl1qchd23yq520hipc4ckdihbv0clfnm1jzqis6lla5k2pi56"; depends=[ciTools classInt data_table DHARMa dplyr evtree ggplot2 insight lubridate magrittr mgcv patchwork stringr tidyr]; }; + insurancerating = derive2 { name="insurancerating"; version="0.6.3"; sha256="076xpgxqc9m5chd3wjr0k7xhcx8zffynz89yqjqrw9yv8cx0lhk6"; depends=[ciTools classInt data_table DHARMa dplyr evtree ggplot2 insight lubridate magrittr mgcv patchwork stringr tidyr]; }; intRegGOF = derive2 { name="intRegGOF"; version="0.85-5"; sha256="0xjq8vdlgqlzrvp752gd4qfrpnpapx7k6xzfsvfril8ngvm9a162"; depends=[]; }; intRvals = derive2 { name="intRvals"; version="1.0.0"; sha256="0391raj5wq6issvzqm8bfnv1ap2hh5nfsqi9r1x5ss37fvcq5fjm"; depends=[lme4 plyr]; }; intamap = derive2 { name="intamap"; version="1.4-9"; sha256="060sghkqsdrxpa340rvjskh2wafdkffa5q8nlbg1msnsmk639lkn"; depends=[automap doParallel evd foreach gstat MASS mvtnorm rgdal sp]; }; intamapInteractive = derive2 { name="intamapInteractive"; version="1.1-12"; sha256="1h8kzinfpp2rwal11xqs9g99rmigs0jlsr5h0qh0zsill73minid"; depends=[automap gstat intamap rgdal sp spatstat spcosa]; }; intccr = derive2 { name="intccr"; version="3.0.2"; sha256="1v2zhyap414w41dgy2jjz3fnrvk0vawf02dvb1nprrid7fqsnf9i"; depends=[alabama doParallel foreach MASS]; }; - intcensROC = derive2 { name="intcensROC"; version="0.1.1"; sha256="0qkgp6iw2s772zk2533jsar64f5mqgy4874swgarnfgd4jvkwy2k"; depends=[pracma Rcpp RcppEigen]; }; - intcure = derive2 { name="intcure"; version="2.1"; sha256="13p9z5ar0hn6m4b7rz6qg20blfyk9h9bq55rkj1g736iky6vn7q2"; depends=[cubature mvtnorm survival]; }; + intcensROC = derive2 { name="intcensROC"; version="0.1.2"; sha256="0f1yf7wn0qd0xa9x2lsdicwjisy39bvyrbayjl8m6hb7h0ng0v2m"; depends=[pracma Rcpp RcppEigen]; }; intdag = derive2 { name="intdag"; version="1.0.1"; sha256="0mb0a1ccc67clfa75b4hl901zdmx7fxw713c4ybx3i5wc2ldl8ph"; depends=[]; }; - intePareto = derive2 { name="intePareto"; version="0.0.1"; sha256="0mynqvmdb39zqx1z2y6bscfjkwf880b7pd149xsdbc6f49hlnfw6"; depends=[apeglm biomaRt DESeq2 GenomeInfoDb GenomicAlignments GenomicRanges IRanges rPref Rsamtools]; }; integIRTy = derive2 { name="integIRTy"; version="1.0.6"; sha256="0nyp9nixwyz1n2nydkh64lmd5z4qjcabwa1pyzv69rgw5gx60020"; depends=[abind doParallel foreach ltm MASS mclust]; }; integr = derive2 { name="integr"; version="1.0.0"; sha256="172vj29bdk42ibgwj7dl06wslpg2dccp1i8iscbz1yd0j5kw36sq"; depends=[DiagrammeR DiagrammeRsvg dplyr gtools rsvg]; }; + intensegRid = derive2 { name="intensegRid"; version="0.1.0"; sha256="0frdrkfpqd8zbl8zawr1xrgs4ylsdir88mqb8w502zf7ishg624m"; depends=[dplyr httr jsonlite lubridate magrittr purrr rlang tibble tidyr]; }; intensity_analysis = derive2 { name="intensity.analysis"; version="0.1.6"; sha256="1ydmn7njqk6i2667zaha8mvfndss4im39czadg1f3z6sndp2lsji"; depends=[diffeR ggplot2 raster reshape2 rgdal]; }; - interAdapt = derive2 { name="interAdapt"; version="0.1"; sha256="06ki36l1mrnd9lbm696a6gapr488dz8na4wvl9y1fif9hfv4zk25"; depends=[knitcitations knitr mvtnorm RCurl shiny]; }; interactionR = derive2 { name="interactionR"; version="0.1.1"; sha256="1gw1kvv76rrfsq67dyhm5ydpb1y5fxp6jqfcqdw50f4k0m76z55k"; depends=[car flextable msm officer]; }; interactionTest = derive2 { name="interactionTest"; version="1.2"; sha256="0ycr839l07xahakr4r2jvlmd0fcxfm4qi3g8agnyh24c2kwl3ck2"; depends=[]; }; interactions = derive2 { name="interactions"; version="1.1.3"; sha256="11nn3w4qsnh0idf7cwnrclg9h8vdjfl9rbvfk1c4l65pm4f61xrv"; depends=[cli crayon generics ggplot2 jtools rlang tibble]; }; interep = derive2 { name="interep"; version="0.3.1"; sha256="0j5mpbx0h1p7si3n532fpzsq5d2ris77vmvqabz1vdzlv4dzlmk8"; depends=[MASS Rcpp RcppArmadillo]; }; interferenceCI = derive2 { name="interferenceCI"; version="1.1"; sha256="19ky10nn6ygma6yy5h1krxx61aikh3yx5y39p68a944mz8f72vsn"; depends=[gtools]; }; - interflex = derive2 { name="interflex"; version="1.1.3"; sha256="1ga6m3f3dr70db5xkpbdx2vmv09cd2da8ky785dpl69chmxrcmhp"; depends=[caret doParallel foreach ggplot2 ggplotify gridExtra gtable lfe Lmoments lmtest mgcv pcse RColorBrewer Rcpp RcppArmadillo sandwich]; }; interfr = derive2 { name="interfr"; version="0.1.0"; sha256="1wn7i8dsll1qq3v39hgpbqnkjc8f4wlffy73453rw9lpq61y2fgj"; depends=[CircStats colorSpec plotrix]; }; intergraph = derive2 { name="intergraph"; version="2.0-2"; sha256="1ipxdrfxhcxhcbqvrzqh3impwk4xryqlqlgjl7f2mwrf365zs6ph"; depends=[igraph network]; }; interim = derive2 { name="interim"; version="0.8.0"; sha256="1hcq1cx6fv4ivvyd3ww3gsbw12g6rw83qqqbrcgzlnjl1q0jh3nf"; depends=[]; }; interimApp = derive2 { name="interimApp"; version="0.0.1"; sha256="1g2f1plsgzqf277jy2afhchjlcamr9znm02rj4rvky7nnp63gph0"; depends=[interim shiny shinyBS]; }; + interleave = derive2 { name="interleave"; version="0.1.0"; sha256="1ppbryy3awymkg9fhwddfzfygvda3wmrw5lff3rjsirk7q1wimlx"; depends=[geometries Rcpp]; }; interlineaR = derive2 { name="interlineaR"; version="1.0"; sha256="0y1ym6iwly8sv94pdzwv2qy1g7z4hpqlrbcrpb1ds5a62a6axqj5"; depends=[reshape2 xml2]; }; - internetarchive = derive2 { name="internetarchive"; version="0.1.6"; sha256="1cx9dxlrdz1xak4jrrjs2wsq6ml8n2xl0n0s6n9h3g247j4lfvnm"; depends=[dplyr httr]; }; interp = derive2 { name="interp"; version="1.0-33"; sha256="115yz7vvlga24m5dz3kirr2vzh59ki3gypvxwvaab8zy2mqr47v6"; depends=[deldir Rcpp RcppEigen]; }; interplot = derive2 { name="interplot"; version="0.2.2"; sha256="10licnz1x97ky7plq3j5gf23lg14jcx7bavv9mwib7p39ls5lagq"; depends=[abind arm dplyr ggplot2 gridExtra interactionTest purrr]; }; - interpret = derive2 { name="interpret"; version="0.1.24"; sha256="0nhxxcdw21qi356nxs0abp2fv87izs3667rw774251r9sbpq5vn1"; depends=[]; }; + interpret = derive2 { name="interpret"; version="0.1.26"; sha256="0f7bhz5gj0f5dxjcc9xlrx4y474akn6q0d7z71yypyw6bawvqkbn"; depends=[]; }; interpretR = derive2 { name="interpretR"; version="0.2.4"; sha256="0nfh3pyr7nn0r41xk0mfb4fs5rjkbh43lbw14x7pdmbgzpgsc22c"; depends=[AUC randomForest]; }; - interval = derive2 { name="interval"; version="1.1-0.1"; sha256="1lln9jkli28i4wivwzqrsxvv2n15560f7msjy5gssrm45vxrxms8"; depends=[Icens MLEcens perm survival]; }; + interval = derive2 { name="interval"; version="1.1-0.7"; sha256="1b31lh0sv7lzy76230djipahxa10lblbr37kdiigr6hp3dd1xmz9"; depends=[Icens MLEcens perm survival]; }; intervalaverage = derive2 { name="intervalaverage"; version="0.8.0"; sha256="07p9r358q3jxm8n7nypxmvpfnh61njivcwaplgzzxrlcbway6fq9"; depends=[data_table Rcpp]; }; intervals = derive2 { name="intervals"; version="0.15.2"; sha256="0mvwfwc03ifb30a3dzbmkv9adwqb8ajxhcw24d8xip8px063plhb"; depends=[]; }; intervcomp = derive2 { name="intervcomp"; version="0.1.2"; sha256="1l6x1fl84li6is3b92b96q3fbv0rpgqy2lvw9cbi2cq8nh9imnyx"; depends=[]; }; interventionalDBN = derive2 { name="interventionalDBN"; version="1.2.2"; sha256="0wpp4bfi22ncvl0vdivniwwvcqgnpifpgxb4g5jbyvr0z735cd9w"; depends=[]; }; + inti = derive2 { name="inti"; version="0.1.2"; sha256="09v91nvd9gq5i5dy4xi9jm4vgd0zr6ydk5fhs200x1nqlhxyfzp5"; depends=[agricolae dplyr DT emmeans FactoMineR ggplot2 lme4 purrr shiny stringr tibble tidyr]; }; intkrige = derive2 { name="intkrige"; version="1.0.1"; sha256="1p3fn5nzn1iliy025187k590qrsw3z3d47p67gzwwd6h050yrl86"; depends=[gstat raster Rcpp RcppArmadillo Rdpack sp]; }; - intmed = derive2 { name="intmed"; version="0.1.1"; sha256="1y9ryz7sxhal4s35cbplfs67596dh57kqy10wyg49x8aq80gpgnr"; depends=[doParallel dplyr EValue foreach MASS mice stringr tibble tidyverse]; }; + intmed = derive2 { name="intmed"; version="0.1.2"; sha256="0amcqzinj35yvb9nfy808bz098dqmnds13z335lgqm6sykriyjpl"; depends=[doParallel dplyr foreach MASS mice stringr tibble]; }; intoo = derive2 { name="intoo"; version="0.4.0"; sha256="0s4jii34cgvyi573z569l1827yf90vj4ih9krsgvpbvk7lfdbagg"; depends=[]; }; intrinsicDimension = derive2 { name="intrinsicDimension"; version="1.2.0"; sha256="0cka20ifxx9njnvp18bzhrvmh3cwjnxkc0a23qzi43dahc51ijbc"; depends=[yaImpute]; }; introgress = derive2 { name="introgress"; version="1.2.3"; sha256="1j527gf7pmfy5365p2j2jbxq0fb0xh2992hj4d7dxapn4psgmvsk"; depends=[genetics nnet RColorBrewer]; }; @@ -9589,24 +9996,25 @@ in with self; { inum = derive2 { name="inum"; version="1.0-1"; sha256="16d09391l65w557dkzhhx1aqn1ljamcmjj3yh42pwq037k0r8brw"; depends=[libcoin]; }; invGauss = derive2 { name="invGauss"; version="1.1"; sha256="0l93pk2sh74dd6a6f3970nval5p29sz47ynzqnphx0wl3yfmmg9c"; depends=[optimx survival]; }; invLT = derive2 { name="invLT"; version="0.2.1"; sha256="0dcr2cclgzkvsw1lysmjrkwgahas96rjc328yc7a1a56pf62kw2v"; depends=[]; }; + invacost = derive2 { name="invacost"; version="1.0"; sha256="1qy7a59ml1bxfsg161qhhz5iw5kcml4l31la44ippyiail32vn3m"; depends=[dplyr earth ggplot2 lmtest mgcv quantreg robustbase sandwich scales]; }; invctr = derive2 { name="invctr"; version="0.1.0"; sha256="0jrbr53kvwrf800z18vz9df9bk7swpd4avnyf59ggz2bc0z2ijwk"; depends=[plyr rlang]; }; inventorize = derive2 { name="inventorize"; version="1.0.6"; sha256="01rwqqljmlk5bwnvlx0qy6n67q2swjcxp90fp2wipyvl1f46h3m1"; depends=[dplyr ggplot2 magrittr plotly plyr tidyr]; }; inverseRegex = derive2 { name="inverseRegex"; version="0.1.0"; sha256="1wk3ac2rfy0m8442sa2m75s6l3wadx4d4cwas6c8n2xqkrphci87"; depends=[]; }; investr = derive2 { name="investr"; version="1.4.0"; sha256="0l47bfwxssfr3maprkpwnmgxnxccl3ch4grc7f968iiqk83mcxw9"; depends=[nlme]; }; invgamma = derive2 { name="invgamma"; version="1.1"; sha256="12ga2y4wc9bc5zz6vimvxwgjpsx3ys3209nq63gscbw559ydxa5a"; depends=[]; }; io = derive2 { name="io"; version="0.3.2"; sha256="1cyl8wvbngdrdkkckng1bs699rjp737j99kbd8r155fjj0370nx4"; depends=[filenamer stringr]; }; - ioanalysis = derive2 { name="ioanalysis"; version="0.3.3"; sha256="11nrvqnwj51cfc1gxf6wsmiwmqrcd4h1q6ya9qqvkrf3fwfg7mi7"; depends=[ggplot2 lpSolve plot3D]; }; + ioanalysis = derive2 { name="ioanalysis"; version="0.3.4"; sha256="0nprfqhwy5j11f5xgzaz8iw991cvgdcdmfca8sdvw8mci0cwkh5m"; depends=[ggplot2 lpSolve plot3D]; }; ioncopy = derive2 { name="ioncopy"; version="2.2.2"; sha256="133ay7xvdigs4q9yx5bcwdgsgrgzk2n6xn412dkq3bg95pp1angr"; depends=[shiny zip]; }; ionflows = derive2 { name="ionflows"; version="1.1"; sha256="1k9yz82hbjwljyg4cmi675ppykrc2yq9md8x1hhkfxmp070whcxl"; depends=[Biostrings]; }; ionr = derive2 { name="ionr"; version="0.3.0"; sha256="18rv5n5gihb6pz36s45yj17sdjsbj4485k4lnggdjj1gbbjkz2ni"; depends=[gplots psych]; }; iopsych = derive2 { name="iopsych"; version="0.90.1"; sha256="0adxwxnb1zdlld3icdggx7cq6cp8z4h1jf105485w322a8c6s9ik"; depends=[mco mvtnorm]; }; iosmooth = derive2 { name="iosmooth"; version="0.94"; sha256="06xgzhjgb6pznjzfli193q7kn8sh5jmqsssgymwj98bw7iwn4q3z"; depends=[]; }; - iotables = derive2 { name="iotables"; version="0.4.3"; sha256="1dmp7bwrwz7l33vnfmqqp5mfzikp3gif3rr8gq2fgnzmlw05wwc3"; depends=[dplyr eurostat forcats kableExtra knitr lubridate magrittr plyr purrr readxl tibble tidyr tidyselect]; }; iotools = derive2 { name="iotools"; version="0.3-1"; sha256="0x24s38shvgqvxpx57qjf86g6f9p9y201yymdl61n5yw439pg88f"; depends=[]; }; ip2location = derive2 { name="ip2location"; version="8.0.0"; sha256="1rhy3jlcl4hcynhjgy3gjx9g9kyn30gq1jwfpll23jixvmrx64by"; depends=[jsonlite reticulate stringr]; }; + ip2proxy = derive2 { name="ip2proxy"; version="1.0.0"; sha256="1l27v616qrz0n9i4s1vjbffwqy12cq4jklck83cd0503c86621d5"; depends=[jsonlite reticulate stringr]; }; ipADMIXTURE = derive2 { name="ipADMIXTURE"; version="0.1.0"; sha256="1fl7nyxg7gakjdggdc311wf037zaxwpqsw3ax7liq1pvw6flb9h7"; depends=[ape treemap]; }; ipa = derive2 { name="ipa"; version="0.1.0"; sha256="029vz7pb37vnqm7x6h53p0y7z0nx2s36yklyfn9sz21gknsi983j"; depends=[stringi]; }; - ipaddress = derive2 { name="ipaddress"; version="0.4.0"; sha256="105z02lmlvlf9rxb1ki0izdg687imjzs4wfz8v5vbqb1dp66mzss"; depends=[AsioHeaders BH blob Rcpp rlang vctrs]; }; + ipaddress = derive2 { name="ipaddress"; version="0.5.1"; sha256="128r4nbqrmmnxb85hvs32xybp32svn4c5096p3s052jhc30bj273"; depends=[AsioHeaders BH Rcpp rlang vctrs]; }; ipc = derive2 { name="ipc"; version="0.1.3"; sha256="10h54j83l7khk1lkpdwn6hwaz31i3v6svg4q1lxzvr2aqdsj7hy0"; depends=[R6 shiny txtq]; }; ipcwswitch = derive2 { name="ipcwswitch"; version="1.0.3"; sha256="1pqlfkglgsahzsw7z9wsx7k0i9n0kx77g9p1j7i9dz7j74s6g09r"; depends=[survival]; }; ipdmeta = derive2 { name="ipdmeta"; version="2.4"; sha256="0k9wqpmrvqdh73brmdzv86a2dbyddjyyyqzqgp1vqb3k48k009s2"; depends=[nlme]; }; @@ -9618,7 +10026,7 @@ in with self; { ipft = derive2 { name="ipft"; version="0.7.2"; sha256="0jifmkwac5yfl110200ljm3pas3321j068af9xqzqs0av20m8hps"; depends=[apcluster cluster dplyr ggplot2 Rcpp]; }; ipify = derive2 { name="ipify"; version="0.2.0"; sha256="05mi8i839iadpz4apkxpxx86zphkgv748mwvdgjxnz82c7s10q9k"; depends=[httr]; }; iplots = derive2 { name="iplots"; version="1.1-7.1"; sha256="1bz8n9cnx6zy3wsr49h55r0l5ikfl0xjg4r76fi4giid2a3ba4lf"; depends=[png rJava]; }; - ipmisc = derive2 { name="ipmisc"; version="3.1.0"; sha256="10a1qyjv1zzjhjirycq4y3zxp78dki1gafbh0zpjkw4ynfbzxgz2"; depends=[crayon dplyr magrittr rlang rstudioapi tibble tidyr zeallot]; }; + ipmisc = derive2 { name="ipmisc"; version="5.0.1"; sha256="1fwhahhbpclr0xvnrb6hb78n9afv36jacgbsk3jfpvs10bf2np0f"; depends=[crayon dplyr magrittr rlang tibble tidyr zeallot]; }; ipptoolbox = derive2 { name="ipptoolbox"; version="1.2"; sha256="0scbny4crgr23qcp0vgsxhwmj5g5q5c1c4mb5mmb5njyvc34s01l"; depends=[AlgDesign copula evd kolmim triangle]; }; ipr = derive2 { name="ipr"; version="0.1.0"; sha256="1db06r784c6jga0anp6p5b3k47yfhr84nzxyjn52pc9zkg3yifjm"; depends=[]; }; ipred = derive2 { name="ipred"; version="0.9-9"; sha256="0vs1hqfx7yd0xdbmfsf2gim7spkni0845cj6gswn0nhdfdq7ma0d"; depends=[class MASS nnet prodlim rpart survival]; }; @@ -9635,40 +10043,42 @@ in with self; { irace = derive2 { name="irace"; version="3.4.1"; sha256="1dhlspv1gqg7cm7j95zhl0k2zr0s159krjmxm07k5fp68ax95sky"; depends=[R6]; }; ircor = derive2 { name="ircor"; version="1.0"; sha256="07apa4l4ib11xw25d44b403s3la29sqlid13q41hjrlfxafm91ld"; depends=[]; }; irg = derive2 { name="irg"; version="0.1.1"; sha256="0g5rhahiq2k269n8ip4yj6ncra07j7flraphzxmis931sfpdsvam"; depends=[data_table RcppRoll]; }; + iriR = derive2 { name="iriR"; version="0.1.0"; sha256="07f7xdyssjbrlkvy33v8764hfn8jh1d3byvmky2wpmpa8qn1xmkw"; depends=[dplyr ggplot2 ggsci gsheet reshape2 scales WDI]; }; irlba = derive2 { name="irlba"; version="2.3.3"; sha256="1h7mzrqdjc41814cf6c93sbyl7nxwvsf3x8apl9rhmydgdlk7qkf"; depends=[Matrix]; }; irr = derive2 { name="irr"; version="0.84.1"; sha256="1hs4ylqm51smrmgsph7z9arwkz5px2a320acar324fkjdd3yifp7"; depends=[lpSolve]; }; irrCAC = derive2 { name="irrCAC"; version="1.0"; sha256="1j9z8vz5zcl51a8qq6maf9sw0dqaknkrai7gp31mzag7b6vwms06"; depends=[]; }; irrICC = derive2 { name="irrICC"; version="1.0"; sha256="0vi5g97kbyhwxz242d1hpqf11izd3kmlzh3997v07md1llcsp6s3"; depends=[]; }; irrNA = derive2 { name="irrNA"; version="0.1.4"; sha256="1i7s4c285dw1s2kiq01a81cfpd2v40y26yklr06xlmqp28iwslbr"; depends=[irr]; }; - irregulAR1 = derive2 { name="irregulAR1"; version="1.0.0"; sha256="0pccasqcya99j4n0qdcjjnvmigj53axji9ddxbpmrgvzsyamb8ja"; depends=[Matrix Rcpp RcppArmadillo]; }; + irt = derive2 { name="irt"; version="0.1.3"; sha256="01hr3c9by13cif55xn6z4b9zi3k99lx8pf5qzrwj0hard0a6m936"; depends=[ggplot2 Rcpp]; }; irtDemo = derive2 { name="irtDemo"; version="0.1.4"; sha256="0rpwryybnj7b4bxn0mn1m496y85s2fpqdd78lmdl6jg1ck4j4pb3"; depends=[fGarch shiny]; }; irtProb = derive2 { name="irtProb"; version="1.2"; sha256="12wnvbzkh0mx9i3iyh1v2n2f2wjsjj7ad3dgv9xj949x4nbz16j0"; depends=[lattice moments]; }; irtoys = derive2 { name="irtoys"; version="0.2.1"; sha256="0h6iiaxikhbxhbyksbjnb09qdxinlkwr2v9yzs5wslbni14paq5q"; depends=[ltm sm]; }; - irtplay = derive2 { name="irtplay"; version="1.6.1"; sha256="0j44czx46whqvp9a61wisxa6sy6qqm9i2fjhvjq3k8l7i4dz9hy3"; depends=[dplyr ggplot2 gridExtra Matrix pbapply purrr reshape2 rlang statmod tidyr]; }; + irtplay = derive2 { name="irtplay"; version="1.6.2"; sha256="05jqghz30lfbl4ac5p2dnqd3aphkzyy1j382qjyvcw629gahybbp"; depends=[dplyr ggplot2 gridExtra Matrix pbapply purrr reshape2 rlang statmod tidyr]; }; irtrees = derive2 { name="irtrees"; version="0.1.0"; sha256="03jmfyx1ia987zhi74fmmcdz70wnm8c7z5z30rwzd1cs11dijjwv"; depends=[]; }; irtreliability = derive2 { name="irtreliability"; version="0.1-1"; sha256="15qs8bvgrwajj5kfd57rd34l1p2805ilyd7w60ngrqc14d6az9d2"; depends=[fastGHQuad ltm mirt]; }; isa2 = derive2 { name="isa2"; version="0.3.5"; sha256="17vm0906szhrh2k5x694vwcfijbzmd1v3axpszfybc0lgds437cv"; depends=[lattice]; }; isdals = derive2 { name="isdals"; version="2.0-4"; sha256="15p432fskdz2r8523cw122mfhvrq8vdsdsrd0kz9yfin4b5z3zfh"; depends=[]; }; isdparser = derive2 { name="isdparser"; version="0.4.0"; sha256="05xkffmiiyhas5hzdjdylbrvh6fjc2fjh7s00iwjxkp4ba7rwq3g"; depends=[data_table lubridate tibble]; }; isingLenzMC = derive2 { name="isingLenzMC"; version="0.2.5"; sha256="1pd1s3a1rv7vlxd5db1pgwdjps8w5im4zz2h3qzal9cwbis0hb51"; depends=[]; }; - island = derive2 { name="island"; version="0.2.5"; sha256="0kmrdxpfybmc9l3rqr1b7r1k0js2ri8r2rlg0zk1nd5m14p7c4l2"; depends=[]; }; + island = derive2 { name="island"; version="0.2.6"; sha256="06y2a9d6qqzkh5p205k1wc2i0qcmkqgabhpk76d63pkz0ilsha6q"; depends=[]; }; islasso = derive2 { name="islasso"; version="1.1.1"; sha256="1jqshk18g6fj51ppz8fxi2a2hydcqf469ff0h9k7lha7a46h26ff"; depends=[glmnet Matrix]; }; ismev = derive2 { name="ismev"; version="1.42"; sha256="19giigxwf62cdkf7mglsca649n2ignb9bxyg9zl7im1vm3ngnmqd"; depends=[mgcv]; }; isni = derive2 { name="isni"; version="1.2"; sha256="1nw7i20fli3sg1g1dl17g8rz5bpx49gcmlyw4nvfyhdxqr38nb0r"; depends=[Formula lme4 matrixcalc mixor mvtnorm nlme nnet]; }; isnullptr = derive2 { name="isnullptr"; version="1.0.1"; sha256="0kwjxq59n3qncdw63vsdvz7v5mzbl5lmckdfgiiw35pzmahnxzh9"; depends=[]; }; isoSurv = derive2 { name="isoSurv"; version="0.1.0"; sha256="00dbrblqdylh2z636hwxr79lk2f8sa15wqcm7m6vd5m2jdhw4xay"; depends=[Iso survival]; }; - isoband = derive2 { name="isoband"; version="0.2.2"; sha256="044fg014gb6v6v11gm7ivfipz45iqw9cpahjhaacw6kyahyb66zx"; depends=[testthat]; }; + isoband = derive2 { name="isoband"; version="0.2.3"; sha256="1zkzdc39dpw2z59bjck27nimz9a2vskmw0f7wb17s53dvy7k3lzr"; depends=[testthat]; }; isoboost = derive2 { name="isoboost"; version="1.0.0"; sha256="0arah62y2gyjhrwjyf4hbzlzyvnx3594436pvk8jjcjyfk7bzr6c"; depends=[Iso isotone rpart]; }; isocat = derive2 { name="isocat"; version="0.2.6"; sha256="1d6pi2l1lfi4226890lsfa02v0df1mc8gi214icsbk4fid4jygsx"; depends=[foreach magrittr plyr raster sp]; }; isocir = derive2 { name="isocir"; version="2.0-6"; sha256="0dkxdx2g1c579q97r45shws2gylkwqlvrhmc14ddmzi45xhxlql6"; depends=[circular combinat TSP]; }; isopam = derive2 { name="isopam"; version="0.9-13"; sha256="0y1yy0922kq5jxyc40gz8sk9vlzwfkfg5swmc6lk4007g9mgc8fm"; depends=[cluster vegan]; }; isopat = derive2 { name="isopat"; version="1.0"; sha256="0fznvgycyd35dh7pbq1xhp667gsficlmycn5pcrqcbs89069xr1s"; depends=[]; }; + isoreader = derive2 { name="isoreader"; version="1.2.7"; sha256="0nk63hylm0dkisi7mpq3k5zf8bxmh8wfx3wqlxcm5dscx0k76qnd"; depends=[dplyr feather future glue lubridate magrittr openxlsx progress purrr R_utils readr rhdf5 rlang stringr tibble tidyr tidyselect UNF vctrs xml2]; }; isotone = derive2 { name="isotone"; version="1.1-0"; sha256="0alk0cma5h3yn4w2nqcahprijsm89b0gby9najbngzi5vnxr6nvn"; depends=[nnls]; }; isotonic_pen = derive2 { name="isotonic.pen"; version="1.0"; sha256="1lgw15df08f4dhrjjfr0jqkcvxwad92kflj2px526pcxwkj7cj3i"; depends=[coneproj Matrix]; }; - isotree = derive2 { name="isotree"; version="0.1.18"; sha256="1821hs6xxim1jx2akpvs9vk157zc0iq88i5zw5wka1kip041b8x0"; depends=[Rcereal Rcpp]; }; + isotree = derive2 { name="isotree"; version="0.1.24"; sha256="0ggx7ydiyrcng21k44pjfgsikdmmaqgk28xdi25sbp2fa0b5qbds"; depends=[Rcereal Rcpp]; }; ispd = derive2 { name="ispd"; version="0.2"; sha256="06h4z342d17rkpr2wwck4sq79kprdq6fgqf10jg8cs1f52q6pq0h"; depends=[ibd]; }; isqg = derive2 { name="isqg"; version="1.3"; sha256="1988bc5n4b5mgxrfl1774vfgaw7rxm9vlaxnkx26phjzhlr1ix9h"; depends=[BH R6 Rcpp Rdpack]; }; - istacr = derive2 { name="istacr"; version="0.1.1"; sha256="0mpsy9pc0hi1mpyc3jx2wzpijzrzlla5yxhi6vciwlfibdgi8dhk"; depends=[curl jsonlite]; }; + istacr = derive2 { name="istacr"; version="0.1.3"; sha256="14nhd3v8l827mb1fxfhsxklzxbf4316ijp2qkc99qp7ydmxbk0rd"; depends=[curl jsonlite]; }; isva = derive2 { name="isva"; version="1.9"; sha256="05qx9q0kg4ma23v4abhihw0vz017nq6hv2jzsiqx4d20ngh1dl4z"; depends=[fastICA JADE qvalue]; }; italy = derive2 { name="italy"; version="0.1.0"; sha256="0is90xp6980ja12jzi3816jq1y90ifcw6cvfmybb7invj6rr1cks"; depends=[]; }; itan = derive2 { name="itan"; version="1.0"; sha256="082vh5gvh8hgyhk8nswll16ldhnp0pfpxnz1yx05zsc4nzvm92cf"; depends=[ggplot2 reshape]; }; @@ -9676,7 +10086,7 @@ in with self; { iteRates = derive2 { name="iteRates"; version="3.1"; sha256="1dycmlm3vldc60wz2jjdfbla14383911zfahgal5mx8whxwq95c5"; depends=[ape apTreeshape geiger gtools MASS partitions VGAM]; }; itemanalysis = derive2 { name="itemanalysis"; version="1.0"; sha256="1ksbd69mca45jlr2gpars87cf4jfm5rx6sz009sv6a83x831x5rq"; depends=[car ggplot2 polycor]; }; iterLap = derive2 { name="iterLap"; version="1.1-3"; sha256="079d4hxf1ha8pgibzb4r1yk7xqpzndd7hjbp8294qb26jvvcnd8q"; depends=[quadprog randtoolbox]; }; - iterators = derive2 { name="iterators"; version="1.0.12"; sha256="0jwzxaa3jm1xzgfv5pn0xqkk7rhm0xwvgn85w7xaw8xx1vb33gwn"; depends=[]; }; + iterators = derive2 { name="iterators"; version="1.0.13"; sha256="190i1y2493v5c9z8978rb3idlwsjymy67k1assa9znljqbj313kp"; depends=[]; }; iterpc = derive2 { name="iterpc"; version="0.4.2"; sha256="06q7l8mz8ws4nn6gb0whnlqs8my2n8z2d2g8fvv3cxd28904dg9q"; depends=[arrangements gmp iterators]; }; itertools = derive2 { name="itertools"; version="0.1-3"; sha256="1ls5biiva10pb1dj3ph4griykb9vam02hkrdmlr5a5wf660hg6xn"; depends=[iterators]; }; itertools2 = derive2 { name="itertools2"; version="0.1.1"; sha256="0yra3x9ddvn5pp3jibm69205zazv81bz0cflw4mdvxpqadaf9f96"; depends=[iterators]; }; @@ -9688,14 +10098,17 @@ in with self; { ivdesign = derive2 { name="ivdesign"; version="0.1.0"; sha256="02v2cnljz3gk7mb8q3p1i54rj6l02r4pirznnrshy092zvrvr26m"; depends=[]; }; ivdoctr = derive2 { name="ivdoctr"; version="1.0.0"; sha256="18pca08cww4x13j3ks0mr84c3jkigf09s7wrh5y8pc11ypyxbgp1"; depends=[AER coda data_table MASS Rcpp RcppArmadillo rgl sandwich]; }; ivfixed = derive2 { name="ivfixed"; version="1.0"; sha256="0a26zrkvz0ffq4zxdx5vhr1nvsi9c15s6gvc1zy2pddjz31x2xi5"; depends=[Formula]; }; + ivitr = derive2 { name="ivitr"; version="0.1.0"; sha256="0fc5svmkxv0s20ipwbvkvmmh1w5gb1g6va496fa9qbf99wifnmrx"; depends=[dplyr nnet randomForest rlang]; }; ivmodel = derive2 { name="ivmodel"; version="1.8.1"; sha256="0c0lzjvp9dzj92p65v5lqmr701ksklx06lf6fcylj2w9hczf5klw"; depends=[Formula ggplot2 Matrix reshape2]; }; ivmte = derive2 { name="ivmte"; version="1.2.0"; sha256="19jcydb5n950av2c9j89sakjkq1jbwnarrl0hwmdy573jqh4d8a5"; depends=[Formula]; }; ivpack = derive2 { name="ivpack"; version="1.2"; sha256="0cr5acjrn41d3q0b77hlg2jmsbf1msvys9gcavm1blsryg2bc03c"; depends=[AER lmtest sandwich]; }; ivpanel = derive2 { name="ivpanel"; version="1.0"; sha256="0irjmkw3nnd8ssidvj23lr0hihlhd9acsbaznh88lknx53ijc2qv"; depends=[Formula]; }; ivprobit = derive2 { name="ivprobit"; version="1.1"; sha256="05b5gf5gmi2yrkg61n7w12qlgpnjakd1z8hhqxy6py8hahsf84gm"; depends=[Formula]; }; + ivreg = derive2 { name="ivreg"; version="0.5-0"; sha256="168ra48blb4wi9f9jqnaz6914s8sz8c147mkhqvim155bd0h4s00"; depends=[car Formula lmtest]; }; ivregEX = derive2 { name="ivregEX"; version="1.0"; sha256="0zh3rqvhn8ald6lxv9kywy2v1p0nr9ijv6plhpbxc6k51zzsgyl8"; depends=[AER Formula lmtest sandwich]; }; + ivsacim = derive2 { name="ivsacim"; version="1.0"; sha256="1ay2x91vam0iv62vyl2ygx7lyh52jl9mixy6hya19hjbdshh7m5j"; depends=[lava Rcpp survival timereg]; }; ivtools = derive2 { name="ivtools"; version="2.3.0"; sha256="1wv0r9dy893hafbbrjcjrphb8dgql71ya4zfbkl5dfp7d4ncfxl0"; depends=[ahaz data_table nleqslv numDeriv Rcpp survival]; }; - ivx = derive2 { name="ivx"; version="1.0.0"; sha256="0gxq0w9cmgg17y7kdjxfzaq8nr4knashfav0vjpq6ba9jh5grk9l"; depends=[magrittr Rcpp RcppArmadillo tibble]; }; + ivx = derive2 { name="ivx"; version="1.1.0"; sha256="1dg09aajk9rqmrlwq4xw7qd5ra1z8wjxipy5l85sl1nzii250drq"; depends=[Rcpp RcppArmadillo]; }; jSDM = derive2 { name="jSDM"; version="0.1.0"; sha256="0lkapg6v5lh53vnsg5hcr9qis8qimb6ilds23dqcyhi6w3dys9nb"; depends=[coda corrplot Rcpp RcppArmadillo RcppGSL]; }; jSonarR = derive2 { name="jSonarR"; version="1.1.1"; sha256="054q3ly471xa64yyz2as6vkr440ip1y8n5wl6s3zbhqy3bqkdqif"; depends=[jsonlite RCurl]; }; jaatha = derive2 { name="jaatha"; version="3.2.1"; sha256="0zqvylknvymggw5jl40cfyahfjy64wb25f0qymh78xbamv1hc85w"; depends=[assertthat R6]; }; @@ -9712,19 +10125,19 @@ in with self; { james_analysis = derive2 { name="james.analysis"; version="1.0.1"; sha256="1b2n4ds4ivfk564z87s2rxjl9j0y4drd3cmyv8jqpccmdvx1137d"; depends=[naturalsort rjson]; }; janeaustenr = derive2 { name="janeaustenr"; version="0.1.5"; sha256="1wyn4qc28a3sval8shmyi2d7s4nl3jh96s8pzq871brxcmrncbwr"; depends=[]; }; janitor = derive2 { name="janitor"; version="2.0.1"; sha256="1dy8dlvnxg057qxpd5lk30wcxa15vw95888ccd99sqra789llm3n"; depends=[dplyr lifecycle lubridate magrittr purrr rlang snakecase stringi stringr tidyr tidyselect]; }; - jaod = derive2 { name="jaod"; version="0.2.0"; sha256="0cphwfmv5pbkf9hvz9w25gncldycgdfxmg6ajbvj9mdl46z3jddw"; depends=[crul jsonlite tibble]; }; + jaod = derive2 { name="jaod"; version="0.3.0"; sha256="071j3xqk7gzsic1sk8v0pwmqv6pav0nj9vvbskss3l1gczy80dfr"; depends=[crul jsonlite tibble]; }; jarbes = derive2 { name="jarbes"; version="1.7.2"; sha256="0qjnx0m65f6a8r6y5mwplaq518lrsf73k8zbf728v857nbjlhf2l"; depends=[ggExtra ggplot2 gridExtra MASS mcmcplots R2jags rjags]; }; jcext = derive2 { name="jcext"; version="0.1.1"; sha256="02zppiyq3gy551zi1g00gam1w4y1wgzn5zi9wrcz8yw915dla0ix"; depends=[ggplot2 maps RColorBrewer rworldmap sp stringr]; }; jcolors = derive2 { name="jcolors"; version="0.0.4"; sha256="18dmjcrci0z1xy2kglrarzm0idr9g3nhbbw7f1ijls3i0piqdri6"; depends=[ggplot2 scales]; }; - jcp = derive2 { name="jcp"; version="1.0"; sha256="1p3bjn3m7mw8rxcmd79ss23v9sb1ad28qcirj5czpj274glnj26k"; depends=[]; }; + jcp = derive2 { name="jcp"; version="1.1"; sha256="1b4z1h4ygf39cg870q08ahzi4ccrlrxp6g97y1qiff5pf9xyp1jc"; depends=[]; }; jdx = derive2 { name="jdx"; version="0.1.4"; sha256="0jqf0nkdyv9g4rifzlkls0n64fdcma2yphwl478772jlgfmxm2jb"; depends=[rJava]; }; jeek = derive2 { name="jeek"; version="1.1.1"; sha256="15n0k0i1wwp72g8zqrjmglnckab3p65q3rnpg6d6h8hjcpv82i7g"; depends=[igraph lpSolve pcaPP]; }; jetpack = derive2 { name="jetpack"; version="0.4.3"; sha256="16l4wkrkf4ihhhpwzd62gvz30n8lxyvail70vmcg41gzdyw76hbl"; depends=[crayon desc docopt packrat remotes]; }; jetset = derive2 { name="jetset"; version="3.4.0"; sha256="0c99h5npsv2gf5d59s4qhkaqmjhbwa3prcykk24wzhnpfq6y6xhp"; depends=[AnnotationDbi org_Hs_eg_db]; }; - jfa = derive2 { name="jfa"; version="0.2.0"; sha256="13s55nxs5yq9y034h4cbacbchfa855wcbq67ajiihmy10aj4smlp"; depends=[]; }; + jfa = derive2 { name="jfa"; version="0.4.0"; sha256="17k77jvlvyk5dkf6r1srzggm1gcayrzmds62v99hb43a7iq83i41"; depends=[]; }; jiebaR = derive2 { name="jiebaR"; version="0.11"; sha256="08v64xwr9jp4vh88x7y935khh4cmj8rwsjaxfd2c67n0445qppmd"; depends=[jiebaRD Rcpp]; }; jiebaRD = derive2 { name="jiebaRD"; version="0.1"; sha256="1wadpcdca4pm56r8q22y4axmqdbb2dazsh2vlhjy73rpymqfcph4"; depends=[]; }; - jipApprox = derive2 { name="jipApprox"; version="0.1.2"; sha256="09xvcf9sjf5xzrwpzicgln57ldv6kh1algsiq4kc0hnshmfvk56g"; depends=[sampling]; }; + jipApprox = derive2 { name="jipApprox"; version="0.1.3"; sha256="1dgawgvkpswv1mxjlqz4ip7vy2856fqvs24hkfl338jgap60grhp"; depends=[sampling]; }; jjb = derive2 { name="jjb"; version="0.1.1"; sha256="0y9yvnzg6xngz1fvzl5jm4yb1pg6wrp3id0gysv214wcznf3gna9"; depends=[]; }; jlctree = derive2 { name="jlctree"; version="0.0.1"; sha256="17n39jc7cwv6hiayy7h1859prdwy2j3pz1vhi6jqnzm4wy6p8a9a"; depends=[lme4 rpart survival]; }; jmcm = derive2 { name="jmcm"; version="0.2.2"; sha256="0bpvvnb7lgf6lfhhshq31yyvyhacfh208b70brm0cdvizj962mvz"; depends=[Formula lattice Rcpp RcppArmadillo roptim]; }; @@ -9734,6 +10147,7 @@ in with self; { jmotif = derive2 { name="jmotif"; version="1.1.1"; sha256="0b2qllpfgs6q5fwfhxl5b4xdyzbvnja7ld766akf0xxznxvglkrg"; depends=[Rcpp RcppArmadillo]; }; jmuOutlier = derive2 { name="jmuOutlier"; version="2.2"; sha256="1vj9n1hsf780f7l0a22kmi3qm84j4dzjybjkh5zwh6bhwfjnjws3"; depends=[]; }; jmv = derive2 { name="jmv"; version="1.2.23"; sha256="01c8wln3g9fx0pp4jx2wg6g5qzvs13y8n89rhm6s9yfczq7ljc0p"; depends=[afex BayesFactor car emmeans GGally ggplot2 ggridges GPArotation jmvcore lavaan MASS multcomp mvnormtest nnet PMCMR psych R6 ROCR vcd vcdExtra]; }; + jmvReadWrite = derive2 { name="jmvReadWrite"; version="0.1.0"; sha256="016qc1dgw21223r8bszh6800lw2srckdvnnzlica9vlj673428h0"; depends=[rjson]; }; jmvconnect = derive2 { name="jmvconnect"; version="1.2.18"; sha256="1lc9jb98rfrn3rq65l2zgd72qjgg0f6jmk3nxxwd3birkg8mjf9j"; depends=[BH evaluate httr jmvcore rappdirs Rcpp]; }; jmvcore = derive2 { name="jmvcore"; version="1.2.23"; sha256="1bms2fbcvnacwg4vahj20iz3b6w22xcjz6zyzdihr5ai0318cjz8"; depends=[base64enc jsonlite R6 rlang stringi]; }; jocre = derive2 { name="jocre"; version="0.3.3"; sha256="1i9n3r16pq6r4sy3fc1rxpil5ws8v2is0xdxafinvwr1hzkv1gz6"; depends=[boot KernSmooth plyr TSP]; }; @@ -9741,9 +10155,9 @@ in with self; { joineR = derive2 { name="joineR"; version="1.2.5"; sha256="07rsxqvy62w2z48fkgbhfk5b3q9qwkmz11n8j8qkhipqs0h1zwwq"; depends=[lattice MASS nlme statmod survival]; }; joineRML = derive2 { name="joineRML"; version="0.4.4"; sha256="1h4js01zp627b5z5c5daz2a2cz38f3m2a1bijcpmbg17qskv6wp0"; depends=[cobs doParallel foreach generics ggplot2 lme4 MASS Matrix mvtnorm nlme randtoolbox Rcpp RcppArmadillo survival tibble]; }; joineRmeta = derive2 { name="joineRmeta"; version="0.1.2"; sha256="0lkj3rry8kvdcl3dxrkvnql8rl3fsgc4lk5qdifhl41aws2q7ccs"; depends=[ggplot2 gridExtra gtools JM joineR lme4 MASS Matrix meta msm statmod survival]; }; - joinet = derive2 { name="joinet"; version="0.0.3"; sha256="01rql7nidmzhrz6agy5kphsln5nl4lpyrqdrfmf5w98zjr8yqkpr"; depends=[cornet glmnet palasso]; }; - joint_Cox = derive2 { name="joint.Cox"; version="3.8"; sha256="15l37a3ds5mp68812bq60xpacw4k2ndf1fh9ygdjd2dsp4rv6s3q"; depends=[survival]; }; - jointDiag = derive2 { name="jointDiag"; version="0.3"; sha256="0pra70jcnkqkzrxz5vc6lzi637rp5w8n9wbv9ix718vnd0j3fm3n"; depends=[]; }; + joinet = derive2 { name="joinet"; version="0.0.6"; sha256="0xhn12mkylpn5330qmrlqg29vn89ia03h31472hp9av370mqvzbn"; depends=[cornet glmnet palasso]; }; + joint_Cox = derive2 { name="joint.Cox"; version="3.10"; sha256="08dx2f36drx81sf6fk29zncv9176nh48f7wfihxx28cn49zr5cxa"; depends=[survival]; }; + jointDiag = derive2 { name="jointDiag"; version="0.4"; sha256="18x6rxaxhz9hcp6rfmjlanbfsc5q61p6xcxixnc8ayyxbdq7q6rf"; depends=[]; }; jointMeanCov = derive2 { name="jointMeanCov"; version="0.1.0"; sha256="1cai5g63n11dirn9fldzkqxcnkxc20ndr9ygrr9rk0s1qz8x63pb"; depends=[glasso]; }; jointNmix = derive2 { name="jointNmix"; version="1.0"; sha256="0ibh7hqkpzlfk3bk4d2dd64jhr8cvw563k082vwnljiam7k5nj4b"; depends=[]; }; jointPm = derive2 { name="jointPm"; version="2.3.1"; sha256="1c2cn9sqwfyv9ksd63w8rrz0kh18jm2wv2sfdkgncjb7vfs4hbv9"; depends=[]; }; @@ -9753,42 +10167,42 @@ in with self; { jose = derive2 { name="jose"; version="1.0"; sha256="1yna3x4hi0vn23dqi605nn1y313brwh2wcv527bm3mdbscgsi2jf"; depends=[jsonlite openssl]; }; journalabbr = derive2 { name="journalabbr"; version="0.2.2"; sha256="0r88cxqd2w1gqc5l5i140sjw56ry554p9n2vjvb3a969dfv510wh"; depends=[dplyr httr purrr rlang shiny stringi stringr tibble usethis]; }; jpeg = derive2 { name="jpeg"; version="0.1-8.1"; sha256="1a8mi70x79a691r40yiw684jkg1mr9n8agkxlcksxcnrdybs9c0x"; depends=[]; }; - jpmesh = derive2 { name="jpmesh"; version="1.2.1"; sha256="138ysjc2swz2vph6i0h14l6bnii2zg3sfhms2186wmvl9lhlxca6"; depends=[leaflet magrittr miniUI purrr rlang sf shiny tibble units]; }; - jpndistrict = derive2 { name="jpndistrict"; version="0.3.7"; sha256="0qzjcnq0c4d2hh4qxglkaq2qmnqk790ibmr00j5f9x494q74ccfr"; depends=[curl dplyr googlePolylines jpmesh leaflet magrittr miniUI purrr rlang sf shiny tibble tidyr tidyselect]; }; - jqr = derive2 { name="jqr"; version="1.1.0"; sha256="00x5a61bsn2ywzc2haz19f6h0sqhlx7z3k1n9y0729dwm4id89ms"; depends=[lazyeval magrittr]; }; - jquerylib = derive2 { name="jquerylib"; version="0.1.1"; sha256="1yix68mv2y2gl6vq2da6mhn264zn5cd8mlmqf9kzdvr81pdm0gnp"; depends=[htmltools]; }; - jrc = derive2 { name="jrc"; version="0.3.1"; sha256="0vzmmzblwx055jvd90bz6s5iy901kqanbrs64c3wpaxvjigwf87z"; depends=[httpuv jsonlite mime R6 stringi stringr]; }; + jpmesh = derive2 { name="jpmesh"; version="2.0.0"; sha256="1fawpcxz31rb3vv9x6dxhcgx1xz758xfsxrc8wa59a6qbrdxqzqh"; depends=[leaflet magrittr memoise miniUI purrr rlang sf shiny tibble units vctrs]; }; + jqr = derive2 { name="jqr"; version="1.2.0"; sha256="0c5wbi6hv50q6bvbvnzwwj42lm67isi66iwdha4fc9a6w0c9h5vi"; depends=[lazyeval magrittr]; }; + jquerylib = derive2 { name="jquerylib"; version="0.1.3"; sha256="1s0d6mws13hwkx07jqmry7vp30a05b2p9w7ir68bmkhasidwkzdq"; depends=[htmltools]; }; + jrc = derive2 { name="jrc"; version="0.4.0"; sha256="0jmwjh5zia1q1kma09ngxg2c198a0vy6qhnymcbw8n44lfab25gp"; depends=[httpuv jsonlite mime R_utils R6 stringi stringr]; }; jrich = derive2 { name="jrich"; version="0.60-35"; sha256="1y486bfqmfg3f22wm0lfk3lh20ljgi8qrgn5jji0f417wh48nf0x"; depends=[ape]; }; jrt = derive2 { name="jrt"; version="1.0.1"; sha256="023i0xqz8mhnjnii92vjw64mjnnlf8jaji99i4c2vxcr7m83jm0r"; depends=[directlabels dplyr ggplot2 ggsci irr mirt psych tidyr]; }; jrvFinance = derive2 { name="jrvFinance"; version="1.4.1"; sha256="1gkivmvc0njm32w7yhbh02h9p212xa3m4cvrwcy7yray8g6phdxp"; depends=[]; }; js = derive2 { name="js"; version="1.2"; sha256="0s5rj845255a4fzv4h76gcnnqyl5cg3c03r2ay3f00jxnxvvigcg"; depends=[V8]; }; - jsTree = derive2 { name="jsTree"; version="1.0.1"; sha256="0n754illyw29bprll676k9qm5vk5h8qss6gb8lls57kdzj51x2jz"; depends=[data_table htmlwidgets jsonlite]; }; - jskm = derive2 { name="jskm"; version="0.3.9"; sha256="1v49ibwxdw7kcabqngnsvgjpwh97qdsm1ab8vnr4mzznfyfyngyv"; depends=[ggplot2 gridExtra plyr scales survey survival]; }; - jsmodule = derive2 { name="jsmodule"; version="1.1.0"; sha256="0yhzij4m3n3zwxna9cb9gixnjvpdjmj5dy1yz88jwrcx415vnb5w"; depends=[Cairo data_table devEMF DT epiDisplay geepack GGally ggplot2 haven Hmisc jskm jstable labelled MatchIt maxstat pROC purrr RColorBrewer readr readxl rstudioapi see shiny shinycustomloader shinyWidgets survC1 survey survIDINRI survival tableone timeROC]; }; + jsTree = derive2 { name="jsTree"; version="1.2"; sha256="06mmz55brm6w19vnlk1w8qaz0n3czlyl4fs62nzgdlsdjn8pad1h"; depends=[data_table htmltools htmlwidgets jsonlite]; }; + jsTreeR = derive2 { name="jsTreeR"; version="1.1.0"; sha256="0517jm8ql9ml4n4gdcp0hwzqax7nl0xpwplgi6dbvd6lfbhrqrcf"; depends=[base64enc htmltools htmlwidgets miniUI R_utils rstudioapi shiny shinyAce]; }; + jskm = derive2 { name="jskm"; version="0.4.2"; sha256="0yn81fyz8ij2jkys7c5qhfkakqw5nmb458rmd879ns7j7m31nvf0"; depends=[ggplot2 gridExtra scales survey survival]; }; + jsmodule = derive2 { name="jsmodule"; version="1.1.4"; sha256="00jmrsbx52hzfk7nk107lzgxd5d1hl0crvvvibaimm5ldfsz45kn"; depends=[Cairo data_table devEMF DT epiDisplay geepack GGally ggplot2 haven Hmisc jskm jstable labelled MatchIt maxstat pROC purrr RColorBrewer readr readxl rstudioapi see shiny shinycustomloader shinyWidgets survC1 survey survIDINRI survival tableone timeROC]; }; json64 = derive2 { name="json64"; version="0.1.3"; sha256="19q8qgf4wnd3np12ajy180klpjy0g2csw5micwb4sl7qfzl6wc7j"; depends=[jsonlite]; }; jsonify = derive2 { name="jsonify"; version="1.2.1"; sha256="1kpv6whi6bggi0ij7krzfr0fly6c2j9y54fr5ahgcjp36amr34cj"; depends=[rapidjsonr Rcpp]; }; jsonld = derive2 { name="jsonld"; version="2.2"; sha256="0bplz2s97wl9yp383jazykh5647iw6kbr1zanqai2s0sxp1xbwn8"; depends=[curl jsonlite V8]; }; - jsonlite = derive2 { name="jsonlite"; version="1.7.0"; sha256="1izfrk5yahsz6s69wanfspn72qdffjglbr5305akj72ig9fnladq"; depends=[]; }; + jsonlite = derive2 { name="jsonlite"; version="1.7.2"; sha256="1lhzcpz9clwq04i5m6jzkvw9x03pwlqrixv4l9xzchjr8d84nd86"; depends=[]; }; jsonstat = derive2 { name="jsonstat"; version="0.0.2"; sha256="0p0d3snl1971p5ikrkmwqrjjh4fy0b89qk3rnd1dayfb0r80xnnj"; depends=[cli dplyr jsonlite rlang]; }; jsonvalidate = derive2 { name="jsonvalidate"; version="1.1.0"; sha256="1vxklvkva547mzbgi7hll46sfx274c6j4m70algygphz783x3dsx"; depends=[V8]; }; jsr223 = derive2 { name="jsr223"; version="0.3.4"; sha256="0rir9v0qhnbl2rgkx1qz2ydj68ba9ccbdzsg6y1acczdhpl03j51"; depends=[curl jdx R6 rJava]; }; - jstable = derive2 { name="jstable"; version="0.9.5"; sha256="0mqq7a9l3jmcvkxfpyxip6i13zkib8ggg0ci8fpwzrxv8lk0n628"; depends=[car coxme data_table dplyr geepack labelled lme4 magrittr purrr survey survival tableone tibble]; }; + jstable = derive2 { name="jstable"; version="1.0.1"; sha256="1p2wkkcsnm143b39q30wl9kjs8k9774szynham33wdd2ckigqk1f"; depends=[car coxme data_table dplyr geepack labelled lme4 magrittr purrr survey survival tableone tibble]; }; jstor = derive2 { name="jstor"; version="0.3.9"; sha256="1rfi02i9j5v2zaz1sganp4rn2bm7yadlq0s4fragyy2jpgs0mnnv"; depends=[cli crayon dplyr furrr magrittr pryr purrr readr rlang stringr tibble tidyr xml2]; }; - jtGWAS = derive2 { name="jtGWAS"; version="1.5.1"; sha256="06cgsncgrqslxcc7s0lb3zwa85bhzkmjzz3f04716xpzwa186vxq"; depends=[Rcpp]; }; - jtools = derive2 { name="jtools"; version="2.1.0"; sha256="00ssbpqvzymi264lcig4rv152kffw544d2ccgsyxkhkaq114g0kq"; depends=[crayon generics ggplot2 magrittr pander pkgconfig rlang tibble]; }; + jti = derive2 { name="jti"; version="0.6.0"; sha256="1bx241f6bmq1jx1r6a8vkr9yryhhgg83d4ya83z45rjwqdz4y4sd"; depends=[igraph Rcpp RcppArmadillo sparta]; }; + jtools = derive2 { name="jtools"; version="2.1.1"; sha256="06xm6mz4n9c4b62kzqghavj80amivjq41mhmcnz94lp4ci648f9k"; depends=[crayon generics ggplot2 magrittr pander pkgconfig rlang tibble]; }; jtrans = derive2 { name="jtrans"; version="0.2.1"; sha256="18zggqdjzjhjwmsmdhl6kf35w9rdajpc2nffag4rs6134gn81i3m"; depends=[]; }; jubilee = derive2 { name="jubilee"; version="0.3.3"; sha256="1j2y44pfx9z2k169lh42b4dnfrrnk8jqsjn3wz4l9iscr6r91lx7"; depends=[data_table dplyr readxl xts yaml zoo]; }; junctions = derive2 { name="junctions"; version="1.1"; sha256="1v5jx4mw6x4q3fivsvidd49b8czzbvv5icj39h6jrpmqvrnc8w32"; depends=[Rcpp]; }; justifier = derive2 { name="justifier"; version="0.1.0"; sha256="14795pf94bzcnnaf5w0xqzy06vqvs76gdvr1rn4ihqh2az00l6n7"; depends=[data_tree DiagrammeR purrr ufs yum]; }; jvcoords = derive2 { name="jvcoords"; version="1.0.2"; sha256="1mlamzg0qz5l23v2w08imrlbnzc3b3amr6yz5hbaf8vc3k3cff5f"; depends=[]; }; jvnVaR = derive2 { name="jvnVaR"; version="1.0"; sha256="0zh0dc6wqlrxn5r2yv9vkpyfb8xsbdidkjv9g6qr94fyxlbs4yci"; depends=[]; }; - jwutil = derive2 { name="jwutil"; version="1.2.3"; sha256="1cqqbz6n26gmv9jbsf8d2lmzcbyppc8hs882ms56d8fkv3ism4zl"; depends=[Rcpp testthat]; }; kSamples = derive2 { name="kSamples"; version="1.2-9"; sha256="1zs22p68d6320kcylisnk0b5wmpapxkyz15py09czxzw7npw8gms"; depends=[SuppDists]; }; kStatistics = derive2 { name="kStatistics"; version="2.0"; sha256="1mmj8mighaxmh0a2naimyv66iffjfhxh0mzbva7y3cx6bwvsfm83"; depends=[]; }; - kableExtra = derive2 { name="kableExtra"; version="1.1.0"; sha256="1nicvw06xsf3a1f5c10mih07b76m2v5s5h165vmz0qx6n1a3492i"; depends=[digest glue htmltools knitr magrittr readr rmarkdown rstudioapi rvest scales stringr viridisLite webshot xml2]; }; + kableExtra = derive2 { name="kableExtra"; version="1.3.1"; sha256="1zixccpgy9x95fgzfgxc43pm020c80c21flch71klc3zzzsq53gf"; depends=[digest glue htmltools knitr magrittr rmarkdown rstudioapi rvest scales stringr viridisLite webshot xml2]; }; kader = derive2 { name="kader"; version="0.0.8"; sha256="15f2swgngw5rdjdsh5kd55wm2nivlfs8pv4mdn0b75qihwgg1zkk"; depends=[]; }; kamila = derive2 { name="kamila"; version="0.1.2"; sha256="01rwalv2qigxl3j3jyhrdbxlarwf0xdc8xa6c42sgcl6qpna5vn7"; depends=[abind gtools KernSmooth plyr Rcpp]; }; kangar00 = derive2 { name="kangar00"; version="1.4"; sha256="0cgyxvgk6bxvh77y9vl0p024dya9ffr9fhmwlcxbysbr4p3kyiaj"; depends=[bigmemory biomaRt CompQuadForm data_table igraph KEGGgraph lattice sqldf]; }; + kantorovich = derive2 { name="kantorovich"; version="3.0.0"; sha256="1iwbxj2c1085pc57zkb5lklkd0bvx0i27a94r526zv7bxaf0kgrd"; depends=[CVXR gmp lpSolve rcdd Rglpk slam]; }; kaos = derive2 { name="kaos"; version="0.1.2"; sha256="0hzzb8ldydl4g3cl1579q8jv835q4cdmn8agafp6qqdhwi1xxw8k"; depends=[ggplot2 reshape2]; }; kaphom = derive2 { name="kaphom"; version="0.3"; sha256="081drgckirc0wv2viyhhnabrlfzi0nkpq6pffw2rxfjyxdsyvnwa"; depends=[]; }; kappaSize = derive2 { name="kappaSize"; version="1.2"; sha256="0lrcyj85zcl73m6bhbzl6rkprrfpfwmm4amyjkg1xsasy5zlwk67"; depends=[]; }; @@ -9800,9 +10214,9 @@ in with self; { kcirt = derive2 { name="kcirt"; version="0.6.0"; sha256="1gm3c89i5dq7lj8khc12v30j1c0l1gwb4kv24cyy1yw6wg40sjig"; depends=[corpcor mvtnorm snowfall]; }; kcopula = derive2 { name="kcopula"; version="0.1.0"; sha256="07ddrq4lxp8i6n7c7ac7x9mdg9gfmlh7bv3n34qalwv0a6fa061w"; depends=[pracma]; }; kcpRS = derive2 { name="kcpRS"; version="1.0.0"; sha256="067j91rhw56kf15h7hxpm9qr6i59fvy5fh9ycfdqcps83wjgx62x"; depends=[doParallel foreach RColorBrewer Rcpp roll]; }; - kde1d = derive2 { name="kde1d"; version="1.0.2"; sha256="0m6y1anzl5agb8xpywn2pv6hx4l7k0352bxnzxcs23iksbimxx13"; depends=[BH randtoolbox Rcpp RcppEigen]; }; + kde1d = derive2 { name="kde1d"; version="1.0.3"; sha256="03h5xd0mwpj8gs5bwf6xhlc1kfd99l1l3w79gfrix67i14nnaifn"; depends=[BH randtoolbox Rcpp RcppEigen]; }; kdecopula = derive2 { name="kdecopula"; version="0.9.2"; sha256="0g5c12wm3byd4chd8i9mxv599gsf4ip4qghx83j3mmhsmn05zf4y"; depends=[lattice locfit qrng quadprog Rcpp RcppArmadillo]; }; - kdensity = derive2 { name="kdensity"; version="1.0.1"; sha256="1iinwbyn3d10gsh7i43sm9hf93baqla3gd5s10kiik76r7d97pdc"; depends=[assertthat]; }; + kdensity = derive2 { name="kdensity"; version="1.1.0"; sha256="07d1p3ysdm66a9sf0gih5xjb3wfab44c3sr8aaraz22s2a9q9b55"; depends=[assertthat EQL univariateML]; }; kdetrees = derive2 { name="kdetrees"; version="0.1.5"; sha256="1plf2yp2vl3r5znp5j92l6hx1kgj0pzs7ffqgvz2nap5nf1c6rdg"; depends=[ape distory ggplot2]; }; kdevine = derive2 { name="kdevine"; version="0.4.2"; sha256="15hw27y4rlifz3kyirm7yacca38xqdwr42k21gg67dhmbdplbnz0"; depends=[cctools doParallel foreach kdecopula KernSmooth MASS qrng Rcpp VineCopula]; }; kdist = derive2 { name="kdist"; version="0.2"; sha256="18q7njvsb9sbm412c6ms4b4nxg768z9qahws5rnin06gvb25nfcx"; depends=[]; }; @@ -9813,11 +10227,13 @@ in with self; { kelvin = derive2 { name="kelvin"; version="2.0-2"; sha256="0hjycqga3yjrzpgc911nk64nsjrpim4v7219f7iwi1snx0ydhqzf"; depends=[Bessel]; }; kendallRandomWalks = derive2 { name="kendallRandomWalks"; version="0.9.4"; sha256="1mfqblvsn9p6gdcnbypfpzk0xzn6bz1ajbrkz2dap5w35dia3kxa"; depends=[actuar dplyr ggplot2 tibble]; }; kequate = derive2 { name="kequate"; version="1.6.3"; sha256="1ii3wlypm2qqkfxr3z1sdnmgc43h2zzlw6v4h2xxjdlznzxkp3mr"; depends=[equateIRT ltm mirt]; }; + kerTests = derive2 { name="kerTests"; version="0.1.2"; sha256="0gn0wjybaixwv8fkpn6wqz0cywzyscvv2dgnnl3idai1zr1fzjn1"; depends=[]; }; keras = derive2 { name="keras"; version="2.3.0.0"; sha256="0byzg6qpcfj852qlbav8cwhrqvkpkg0zig9brhw2sibljwy8x5ik"; depends=[generics magrittr R6 reticulate tensorflow tfruns zeallot]; }; kerasR = derive2 { name="kerasR"; version="0.6.1"; sha256="1yi7710vgcwz0jhishbga41sc6qyk83a0avmq01dvqjsz3cdfsfc"; depends=[reticulate]; }; - kerastuneR = derive2 { name="kerastuneR"; version="0.1.0.2"; sha256="0qfagzyid7g89hy8w7hgccp6pm78b5d8857q2zn2ixq6s9rp16kj"; depends=[crayon data_table dplyr echarts4r keras magick plotly reticulate rjson RJSONIO rstudioapi tensorflow tidyjson]; }; + kerastuneR = derive2 { name="kerastuneR"; version="0.1.0.3"; sha256="1lky84mgppsbn2wn0livx2j18x5vg92mskhb3pyf4ig9qyfxgjkk"; depends=[crayon data_table dplyr echarts4r keras magick plotly reticulate rjson RJSONIO rstudioapi tensorflow tidyjson]; }; kerdiest = derive2 { name="kerdiest"; version="1.2"; sha256="16xj2br520ls8vw5qksxq9hqlpxlwmxccfk5balwgk5n2yhjs6r3"; depends=[chron date evir]; }; kergp = derive2 { name="kergp"; version="0.5.1"; sha256="16zb7gsbp3bg4kpn7lszw8rn24i40f6jmxcf751vca1f7pfn38pj"; depends=[doFuture doParallel lattice MASS nloptr numDeriv Rcpp testthat]; }; + kerndwd = derive2 { name="kerndwd"; version="2.0.3"; sha256="0lvm007wzhyagyafmq47819hn66riwdcpymn56clc1sgch9i933m"; depends=[]; }; kernelFactory = derive2 { name="kernelFactory"; version="0.3.0"; sha256="001kw9k3ivd4drd4mwqapkkk3f4jgljiaprhg2630hmll064s89j"; depends=[AUC genalg kernlab randomForest]; }; kernelPSI = derive2 { name="kernelPSI"; version="1.1.1"; sha256="1gnp3ixqmijy6xanlc4l8255biwxmlfyhd3y68arry9rzfjkmxpz"; depends=[CompQuadForm kernlab lmtest pracma Rcpp RcppArmadillo]; }; kernelTDA = derive2 { name="kernelTDA"; version="1.0.0"; sha256="0nzb2z10c3pqj8p47w663mrnmk3g8x61zz99ka8fwcspw1wq3g8m"; depends=[BH mvtnorm Rcpp RcppEigen Rdpack]; }; @@ -9827,17 +10243,21 @@ in with self; { kernplus = derive2 { name="kernplus"; version="0.1.2"; sha256="0z5zpj89nw7cdphg6frmjwqjxsl6g95xsa8zgsxmw2q75wwj1saz"; depends=[circular KernSmooth mixtools]; }; kernscr = derive2 { name="kernscr"; version="1.0.5"; sha256="1kcj710q8jbc34g6fcv2nk07hpsb81mfx8hvivgxq8x58028gjzs"; depends=[MASS mvtnorm]; }; keyATM = derive2 { name="keyATM"; version="0.3.1"; sha256="1bi7hs1d70y5xpf3rh3g0vnn558y6fvxknyl491h737ps87rd77i"; depends=[dplyr fastmap ggplot2 ggrepel magrittr Matrix purrr quanteda Rcpp RcppEigen RcppProgress rlang stringr tibble tidyr]; }; + keyToEnglish = derive2 { name="keyToEnglish"; version="0.2.0"; sha256="169iclygyk3qxzl8gii5lndwfzz8a7fir2kf7vrasxbknvkvlfij"; depends=[jsonlite openssl stringr]; }; keyholder = derive2 { name="keyholder"; version="0.1.5"; sha256="0sr0rcchvwflqf2xj9j8j35ng52ichgvp1ix57v4ah91dlpj9i5s"; depends=[dplyr rlang tibble]; }; keyplayer = derive2 { name="keyplayer"; version="1.0.3"; sha256="0j4n46r9ivkbzqz8g22dq2bpmx7bs05yb5qp27p9jnfh5x19v2ds"; depends=[igraph matpow sna]; }; keypress = derive2 { name="keypress"; version="1.2.0"; sha256="19l33519f726i3q20y34v1aavrn4fpj3zn5caij3l9q2asw2kqk2"; depends=[]; }; keyring = derive2 { name="keyring"; version="1.1.0"; sha256="1hpfd4hbx43i39l995rg86kfxi7wlyla1gv8mwcdr4xx7z122zzq"; depends=[assertthat filelock getPass openssl R6 rappdirs sodium yaml]; }; keyringr = derive2 { name="keyringr"; version="0.4.0"; sha256="04f0z6mqj75l5qhiab0zvjsvz3jz1bp6dfazkpgihjmls5k11dnh"; depends=[stringr]; }; + keys = derive2 { name="keys"; version="0.1.0"; sha256="0r4qrd9xbc1pwl6dqr89inrlwwfhayymga1mf1nwb47203fbz02l"; depends=[htmltools jsonlite shiny]; }; kfda = derive2 { name="kfda"; version="1.0.0"; sha256="0861hzry55gj8ykdd8cwil1wb7234pkmipp4v1749fpmzggq1xgi"; depends=[kernlab MASS]; }; kfigr = derive2 { name="kfigr"; version="1.2"; sha256="0hmfh4a95883p1a63lnziw8l9f2g0fn0xzxzh36x9qd9nm7ypmkw"; depends=[knitr]; }; kgc = derive2 { name="kgc"; version="1.0.0.2"; sha256="14zbcimnglh5jj07dcaxp1dfjaz8syswy29nf8z39qmslv1hg9kk"; depends=[plyr shiny shinythemes]; }; kgschart = derive2 { name="kgschart"; version="1.3.5"; sha256="1gdsrmnv8z99cldvig7grlq8gsbv3wpx7zdamw85lz563n4ln94d"; depends=[abind deepnet ggplot2 gridExtra magrittr matrixStats nnet png shiny stringr]; }; - khroma = derive2 { name="khroma"; version="1.3.0"; sha256="1bpap5ljnsjwj0d6r90zhxvgs87j6v2pwxxd6ny14jzn402f1zp8"; depends=[]; }; + khroma = derive2 { name="khroma"; version="1.4.0"; sha256="116c39f3vf9pb018wavdc8n1hcysmgbc0w058fv11mzlb4g68xrp"; depends=[ggplot2 scales spacesXYZ]; }; + kibior = derive2 { name="kibior"; version="0.1.0"; sha256="06ff9iqhvl7wvxjy45s526dr30wq0n6jh417073gj94zi0wmv7n4"; depends=[Biostrings data_table dplyr elastic jsonlite magrittr purrr R6 rio Rsamtools rtracklayer stringr tibble tidyr]; }; kidney_epi = derive2 { name="kidney.epi"; version="1.2.0"; sha256="1hd6w7kxim5slmmqalf5sfjg8jcvhyzn5g4gf6h0lmaprsfszhja"; depends=[]; }; + kim = derive2 { name="kim"; version="0.2.20"; sha256="15z8vwrj8rvq0l2ycpxazns3w3mxn0x7458w9d20fgfj5898wzdx"; depends=[boot car data_table devtools dplyr effsize ggplot2 ggridges lm_beta mediation moments paran rstudioapi weights WRS2]; }; kimisc = derive2 { name="kimisc"; version="0.4"; sha256="0nbjspbq9akhmamfdn192p5b6ki7xqhp422ih6v77xsnrhl5m24z"; depends=[memoise plyr pryr]; }; kin_cohort = derive2 { name="kin.cohort"; version="0.7"; sha256="0wijsjz0piz5j9rm2nr3d5dfpiyba740mbfbkmfll9pz72s58wz8"; depends=[survival]; }; kineticF = derive2 { name="kineticF"; version="1.0"; sha256="1k54zikgva9fw9c4vhkc9b0kv8sq5pmc962s8wxr6qv97liv9p46"; depends=[circular lqmm MASS plotrix sp splancs]; }; @@ -9846,19 +10266,19 @@ in with self; { kirby21_fmri = derive2 { name="kirby21.fmri"; version="1.7.0"; sha256="1z2l6bn53mwkll9ki4169lqlz6wcfp29xzdrqyw606j2xrs4wc22"; depends=[kirby21_base]; }; kirby21_t1 = derive2 { name="kirby21.t1"; version="1.7.0"; sha256="0bv8rrk9jh02h3gill1g2w246j4zv98cjchz7i2c092lvqps8szs"; depends=[kirby21_base]; }; kissmig = derive2 { name="kissmig"; version="1.0-3"; sha256="1pi1x3gdbqrhr1km1hqj15k8wyrgs697fnxgjgxga1irbn8bi482"; depends=[raster]; }; - kit = derive2 { name="kit"; version="0.0.4"; sha256="1gjp8r1qhmwf65c5mr94fx5v2h7hgczn47b2glrahzfyh6g5796s"; depends=[]; }; + kit = derive2 { name="kit"; version="0.0.5"; sha256="0zwa7fk9v3gxl91hqf6jb85pcbf83mjbnzv80wlgwq13mwa9ifax"; depends=[]; }; kitagawa = derive2 { name="kitagawa"; version="3.1.0"; sha256="190xi88zc3vybpyawayh8m78sgcn951n3axmc2fc67sic458r02s"; depends=[Bessel kelvin psd]; }; kiwisR = derive2 { name="kiwisR"; version="0.2.0"; sha256="14fzf72swy221jcbiplss9dh7g03idrpbbyvbxp4bcqpxwr6hbsa"; depends=[dplyr httr jsonlite lubridate purrr tibble]; }; kknn = derive2 { name="kknn"; version="1.3.1"; sha256="1nzkg3dxaiqp87p56wm895qx5xn86hv5hjr73qvl1yiaxiq0x112"; depends=[igraph Matrix]; }; klaR = derive2 { name="klaR"; version="0.6-15"; sha256="1bhgkq6spjawy5lsh663rnby4fzrx4k2qwqp4ci4p9pq8g35pzjv"; depends=[combinat MASS questionr]; }; - klassR = derive2 { name="klassR"; version="0.1.2"; sha256="1wfgqy4pfbaikm0qqf6dirjw0imbl6si9i0nwn8l17i7c8g8g55s"; depends=[httr jsonlite tm]; }; + klassR = derive2 { name="klassR"; version="0.1.3"; sha256="0njsmmcrx57v084kcgm1x99cqzzjpjpzli1b0vsv02hmv7n3rxn4"; depends=[httr jsonlite tm]; }; klausuR = derive2 { name="klausuR"; version="0.12-10"; sha256="12fjs4dnwaki8sz718xgsg8qrqhsgf87cs0bylf0p3f5k8hrmk4b"; depends=[polycor psychometric xtable]; }; - klexdatr = derive2 { name="klexdatr"; version="0.1.0"; sha256="1ffcpiy1h92rn9nbysq6cca75varnam95s7li4dp7f58ibbhmxqc"; depends=[]; }; + klexdatr = derive2 { name="klexdatr"; version="0.1.1"; sha256="0y951lsafh80x7ya17jw8hmhrcxvqh4qwzik7w42bvams3sbf75k"; depends=[]; }; klic = derive2 { name="klic"; version="1.0.4"; sha256="1ggsdq8xcg6hi12rq356myhngx3j475gpwlvpynm1581r4z0lkbk"; depends=[cluster coca Matrix pheatmap RColorBrewer]; }; + klsh = derive2 { name="klsh"; version="0.1.0"; sha256="1r354fd5da6mp7v3048ii09hnghhfwdg6pvmx2ib0cr88ql431sy"; depends=[blink plyr Rcpp SnowballC stringi]; }; klustR = derive2 { name="klustR"; version="0.1.0"; sha256="1g2q6h3cbm8v3gqz0f6v8bl5na9972k38d94czjfxmx4cv7wfgx8"; depends=[htmlwidgets jsonlite]; }; km_ci = derive2 { name="km.ci"; version="0.5-2"; sha256="1l6kw8jppaa1802yc5pbfwwgac56nhwc9p076ivylhms4w7cdf8v"; depends=[survival]; }; kmc = derive2 { name="kmc"; version="0.2-4"; sha256="0y8bdgdxsz53fiqc2yr39agndxs4zxj7mmplj273map9k0slnnqk"; depends=[emplik Rcpp rootSolve]; }; - kmconfband = derive2 { name="kmconfband"; version="0.1"; sha256="10n5w8k57faqcclwshs4m66i2i5b70i6f3xq5nqlgsi2ldkysbc9"; depends=[survival]; }; kmcudaR = derive2 { name="kmcudaR"; version="1.1.0"; sha256="16dkv9ag5375zc23nqakbg7v6knxvh1pips9rjsls0d7rw2bg1bs"; depends=[Rcpp RcppEigen]; }; kmeRs = derive2 { name="kmeRs"; version="1.1.0"; sha256="1wafa9wgqlwrk6jwmbn34n3rmvbc9s6s235z8mscbqgw67snwcq6"; depends=[Biostrings rDNAse tcR]; }; kmed = derive2 { name="kmed"; version="0.3.0"; sha256="0d32pcczkyx3dw4bnqrzd36lvw5xf2ilr8f1h32z3rq092m53mrx"; depends=[ggplot2]; }; @@ -9870,11 +10290,10 @@ in with self; { kmlcov = derive2 { name="kmlcov"; version="1.0.1"; sha256="09s9ganfsnwp22msha78g6pjr45ppyfyqjf6ci64w3w15q5qlcd9"; depends=[]; }; kmodR = derive2 { name="kmodR"; version="0.1.0"; sha256="1y1pqrrralklflyb1dw8bslfcyqrw8ryijfbhkwba7ykpxcf9fda"; depends=[]; }; knitLatex = derive2 { name="knitLatex"; version="0.9.0"; sha256="1igacc2sx8897wmnhh8kngd0fq6zqbi30chy5c8jw60zc38mi3wi"; depends=[knitr]; }; - knitcitations = derive2 { name="knitcitations"; version="1.0.10"; sha256="0d73qr1zhkx0255vzzf7fs8vpmfnzl91ni4zp5y0l42h8p98vdn5"; depends=[digest httr RefManageR]; }; - knitr = derive2 { name="knitr"; version="1.29"; sha256="00rcwiq8znmk5h4qgrwd0639xyb38iwbjykqjk3disz3kvrcvbn1"; depends=[evaluate highr markdown stringr xfun yaml]; }; + knitr = derive2 { name="knitr"; version="1.30"; sha256="0gn9qwc5762a6j0iywfwhalni52g228dcy4bl4di6d52cqsv3ars"; depends=[evaluate highr markdown stringr xfun yaml]; }; knitrBootstrap = derive2 { name="knitrBootstrap"; version="1.0.2"; sha256="1aj60j7f0gcs120fdrnfbnb7vk7lfn1phil0mghg6a5zldz4cqs3"; depends=[knitr markdown rmarkdown]; }; knitrProgressBar = derive2 { name="knitrProgressBar"; version="1.1.0"; sha256="18v5jrscfrin3mcs63bpj0q1drxk3zkhlbw93sqh0qrq04d4x02v"; depends=[R_oo R6]; }; - knitrdata = derive2 { name="knitrdata"; version="0.5.0"; sha256="1p7bfs7k6dd18mly4l830flrw1fbn6y8wigpvs2phl585jf4c7av"; depends=[base64enc knitr]; }; + knitrdata = derive2 { name="knitrdata"; version="0.6.1"; sha256="1am79r4rkrw7vjmyzc0cq4p52l2ypdw99rfhrvdsaq11yllx08mx"; depends=[knitr xfun]; }; knn_covertree = derive2 { name="knn.covertree"; version="1.0"; sha256="0msfcmwydws7q7m5jdb0dxab0nkbl7mq5llg6v3r4qrnlvrdggvz"; depends=[Matrix Rcpp RcppEigen]; }; knnIndep = derive2 { name="knnIndep"; version="2.0"; sha256="1fwkldgs2994svf3sj90pwsfx6r22cwwa22b30hdmd24l8v9kzn7"; depends=[]; }; knnp = derive2 { name="knnp"; version="2.0.0"; sha256="0qgq8la3zndlb1wwqv9b2kw52y9ns36pi4ds68pkm81bhzq5nqis"; depends=[doParallel foreach forecast parallelDist plyr]; }; @@ -9882,22 +10301,22 @@ in with self; { knor = derive2 { name="knor"; version="0.0-7"; sha256="1xxv210sjj9w06pf36q7haz9fkqdc17jyqdsiqsxj3q8zj585qfc"; depends=[Rcpp]; }; knotR = derive2 { name="knotR"; version="1.0-2"; sha256="0kd1b9wibpwyaanz9ny61qgfvcg4d3rzpy05sfshlpp0b1y8d3xj"; depends=[]; }; kntnr = derive2 { name="kntnr"; version="0.4.4"; sha256="1af5qhj82dixf1qcbz3sfj52pzgy8gnafzifwxnhrp7vpn4rnv6m"; depends=[base64enc dplyr httr jsonlite lubridate purrr rlang rstudioapi stringr tibble tidyr]; }; - koRpus = derive2 { name="koRpus"; version="0.11-5"; sha256="053882fnz6c7yjiz72jg6sawd9q57h110nd4yjay65piadi9mci5"; depends=[data_table sylly]; }; - koRpus_lang_en = derive2 { name="koRpus.lang.en"; version="0.1-3"; sha256="013zxm5x5hwdx1hqgb7mh3zmn8dri3fhq1brmzg936gddhxap6is"; depends=[koRpus sylly_en]; }; - kofdata = derive2 { name="kofdata"; version="0.1.3.4"; sha256="036d3mvhdlpaisms3vg6v35lvy48w8yld7mz3rdd3dw6bszzrg5k"; depends=[httr jsonlite xts zoo]; }; + koRpus = derive2 { name="koRpus"; version="0.13-4"; sha256="1bg8q67hp3rs9373zmw0jxg9vclfdj0z7cnks6g8fwdnrimk6p6w"; depends=[data_table Matrix sylly]; }; + koRpus_lang_en = derive2 { name="koRpus.lang.en"; version="0.1-4"; sha256="1faj065wjj7a68i57y7zmrrj4ckp01gvq8qknf6a56idi8kzr732"; depends=[koRpus sylly_en]; }; + kofdata = derive2 { name="kofdata"; version="0.1.4"; sha256="1vqixanprlfmqjcj3543m4mhq37imd9qnnif2mbh6wr1rcrs1zs9"; depends=[httr jsonlite xts zoo]; }; kofnGA = derive2 { name="kofnGA"; version="1.3"; sha256="0w0881ydnqdah04sifi25ypzxdwnsiqxfq1xam4yhr670bdak1vm"; depends=[bigmemory]; }; kohonen = derive2 { name="kohonen"; version="3.0.10"; sha256="1ck7j13x701g67bx81x7plszz804jfhl1yg42krcj9x88vm5cscr"; depends=[Rcpp]; }; kokudosuuchi = derive2 { name="kokudosuuchi"; version="0.4.2"; sha256="1nwydfyr9waa5h8h8nrmwxy0jx7i4893g5khfv6b4g09z6g5cyly"; depends=[curl dplyr glue httr purrr rlang sf shiny stringr tibble xml2]; }; kolmim = derive2 { name="kolmim"; version="1.0"; sha256="0g1i0cazi4nhfwdd3ywqrar1sn7bw77w38qjii045w5vqg05srkp"; depends=[]; }; komaletter = derive2 { name="komaletter"; version="0.4"; sha256="0l9xd28vsy5xs27s8mxvj24fpx6s0c36cka9z3x09rdzdp6gwqn8"; depends=[rmarkdown]; }; - konfound = derive2 { name="konfound"; version="0.2.2"; sha256="0nz09wg0ia11q7hrnjxgvw8xzv25z7hi1sa35cwl7xa8rz5yi1gk"; depends=[broom broom_mixed crayon dplyr ggplot2 mice purrr rlang tidyr]; }; + konfound = derive2 { name="konfound"; version="0.3.0"; sha256="0ggckxmq63wl1578mv090bdzzbbnhl3dvffrj8xz2p0852rcb6pb"; depends=[broom broom_mixed crayon dplyr ggplot2 mice purrr rlang tibble tidyr]; }; kosel = derive2 { name="kosel"; version="0.0.1"; sha256="1gdsy4i58byqxddpsm5nk1r3hlgik5gs2b8jqcm8n1r4ib6pg0ay"; depends=[glmnet ordinalNet]; }; kpcalg = derive2 { name="kpcalg"; version="1.0.1"; sha256="1gd5bisyfwb12l9jmwhi2arlxrabc01vgv4m1qqs23vybsd6yh52"; depends=[energy graph kernlab mgcv pcalg RSpectra]; }; kpeaks = derive2 { name="kpeaks"; version="1.1.0"; sha256="057xfqn08lqczgrj1r63d7vbncg24x9va9lnk8c47nwzl1x8aphd"; depends=[]; }; kpmt = derive2 { name="kpmt"; version="0.1.0"; sha256="15d26khc0v3kc1c7l1avqp48pfqmc6xj32029mv7myivr41ashk3"; depends=[matrixStats]; }; kpodclustr = derive2 { name="kpodclustr"; version="1.1"; sha256="1gwy59sh4gp06hr3il3hz0iiwdrzrlya5b026qxvz5q62msf6q5a"; depends=[]; }; kriens = derive2 { name="kriens"; version="0.1"; sha256="1qi65k9fsbbkbw0w40rv60p5ygrvr10rmlyxdaqa5bdpcmrbly5z"; depends=[]; }; - krige = derive2 { name="krige"; version="0.5.6"; sha256="04y9am0jj0crybpr7p4qzdh158r1imllvy6697iakgzjlcqm5xd2"; depends=[Rcpp]; }; + krige = derive2 { name="krige"; version="0.6.1"; sha256="0xcx7glarqjb25bchs3wflw5lyy9xrbksirrdm35vdsxgif62ydz"; depends=[coda Rcpp]; }; kriging = derive2 { name="kriging"; version="1.1"; sha256="04bxr34grf2nlrwvgrlh84pz7yi0r8y7dc2wk0v5h5z6yf5a085w"; depends=[]; }; krippendorffsalpha = derive2 { name="krippendorffsalpha"; version="1.0"; sha256="137x6y7ks9pan2zwqcpyap5f7d1pwa580aq29cynfimxacmgb5si"; depends=[]; }; krm = derive2 { name="krm"; version="2020.5-20"; sha256="1b6477cjv5k30djvrlbmwn91ghgwk24cfd58cb0q80xqhgiqvrzb"; depends=[kyotil]; }; @@ -9911,7 +10330,6 @@ in with self; { kstMatrix = derive2 { name="kstMatrix"; version="0.1-2"; sha256="1z5gs0x80dq549mba2sy1nfhsphrpkrydalj2jiwqb7fmwqknm3r"; depends=[]; }; ktaucenters = derive2 { name="ktaucenters"; version="0.1.0"; sha256="15ddjr4c90b5hc4977gk35zb2kswrcvai3xighy7qj6g9lgiszgf"; depends=[dbscan dplyr GSE MASS]; }; ktsolve = derive2 { name="ktsolve"; version="1.3"; sha256="0brxqb60m1lyqhsmds1c3c6cmbcxlzk2nwvi0fhkc8ziwzlfmd09"; depends=[BB nleqslv]; }; - ktspair = derive2 { name="ktspair"; version="1.0"; sha256="1v63982jidxlcf2syahcb29myv34kc790l7lwyfxx9l50ssb812n"; depends=[Biobase]; }; kubik = derive2 { name="kubik"; version="0.2.0"; sha256="1f5v88pfm9szkshbnkkd0pdphqwrbblfmmys7j8k60y919lwgv0z"; depends=[]; }; kuiper_2samp = derive2 { name="kuiper.2samp"; version="1.0"; sha256="0gcgayh7qdic9zprdvs6r8qvpqs467zrm0qzp2acb7alcp01jhpi"; depends=[]; }; kulife = derive2 { name="kulife"; version="0.1-14"; sha256="070ayy6fr9nsncjjljikn2i5sp2cx3xjjqyc64y2992yx74jgvvd"; depends=[]; }; @@ -9919,7 +10337,7 @@ in with self; { kutils = derive2 { name="kutils"; version="1.70"; sha256="06jk66wbq3jmdf2jdhqns6r3yk36l2x7c907x977zv80sqxa1l37"; depends=[foreign openxlsx plyr RUnit xtable]; }; kvh = derive2 { name="kvh"; version="1.4.1"; sha256="0hnqlybphx8qnx98ynykxpz4ys4prp9zbmkak02qlvmnxwc2cqg0"; depends=[Rcpp]; }; kwb_hantush = derive2 { name="kwb.hantush"; version="0.3.0"; sha256="1rlm7i95yw66asgkag93phig2y9lic4xl2fv3cbnr3v751f6a59m"; depends=[hydroGOF lattice]; }; - kyotil = derive2 { name="kyotil"; version="2019.11-22"; sha256="13ihijshgzi3lg07p24yzyxjsrfy9nsf6r5vcssz19y9w26scaj2"; depends=[]; }; + kyotil = derive2 { name="kyotil"; version="2020.10-12"; sha256="1dqh753fcjdrj81rpaf1jc4wgd0svm7y9j5yq76iyd2q8pp1q2y1"; depends=[]; }; kza = derive2 { name="kza"; version="4.1.0.1"; sha256="1vx7wc8iwmr9d6ff2kcy6y3nyfj6jfzv4hxkv1fsas0rbjgfick4"; depends=[]; }; kzfs = derive2 { name="kzfs"; version="1.5.0.2"; sha256="0x0fc807p0pwsjkhjq51ymwr9nhs6cb0m82029cz8bbn3yf6cymq"; depends=[digest kzft]; }; kzft = derive2 { name="kzft"; version="0.17"; sha256="1y6almhs1x21cr4bbf5fj3mnhp65ivzs869660cyg70sva853sv7"; depends=[polynom]; }; @@ -9933,17 +10351,18 @@ in with self; { label_switching = derive2 { name="label.switching"; version="1.8"; sha256="0xwwhn249aibip12yxjwlrpyqj6zvc95zc7n9jf2vjjpashyc3yk"; depends=[combinat lpSolve]; }; labelVector = derive2 { name="labelVector"; version="0.1.1"; sha256="156066jbsmqal1q4xwwkyrqfzq0as6r2add0x240y21zak6i8x9q"; depends=[]; }; labeledLoop = derive2 { name="labeledLoop"; version="0.1"; sha256="0gq392h0sab8k7k8bzx6m7z5xpdsflldhwbpdf92zbmkbzxsz00m"; depends=[]; }; - labeling = derive2 { name="labeling"; version="0.3"; sha256="13sk7zrrrzry6ky1bp8mmnzcl9jhvkig8j4id9nny7z993mnk00d"; depends=[]; }; - labelled = derive2 { name="labelled"; version="2.5.0"; sha256="0hxkig9y12rclzhk7ly7bdmysnxz0jymbbwz1apwb61frdswgb5h"; depends=[dplyr haven]; }; + labeling = derive2 { name="labeling"; version="0.4.2"; sha256="0rfikd9gy70b8qz87q9axcwv8nmn9mbxfdwypxi0sghpfs9df8p0"; depends=[]; }; + labelled = derive2 { name="labelled"; version="2.7.0"; sha256="1nsb0mh0jg7gggc41b6v55nmfq07g0qn9fy55x4jws5dscs6pdmi"; depends=[dplyr haven lifecycle pillar rlang tidyr vctrs]; }; labelmachine = derive2 { name="labelmachine"; version="1.0.0"; sha256="18l7argmf7d60cv34w7acjg4bk08nhi2cc5p61sx2zmq28v8nndr"; depends=[yaml]; }; labelrank = derive2 { name="labelrank"; version="0.1"; sha256="03pmpkjdhgw80473kdzdz4s4828pa8f5bja2zqicxrhvyvicvz6f"; depends=[pdist]; }; labourR = derive2 { name="labourR"; version="1.0.0"; sha256="0skr8qr1m849l3gpcsn5bjxyjczlzzmsm2j6xcmxv33lf95qg6gi"; depends=[cld2 data_table magrittr stopwords stringdist]; }; labsimplex = derive2 { name="labsimplex"; version="0.1.2"; sha256="07is5vi1y7qw9fjhhjf65z6fm77v26qgy908zhhp2581qqyn0b5s"; depends=[ggplot2 scatterplot3d]; }; - labstatR = derive2 { name="labstatR"; version="1.0.9"; sha256="1ysk23dwan1lsfwnf9v86yqyzc8wsgzmy18ycz34s4d9biq6y1zd"; depends=[]; }; + labstatR = derive2 { name="labstatR"; version="1.0.11"; sha256="0blyx2k4za0af72javswmpag2nks1cvgpyp1zabx8vzk38k0si1n"; depends=[]; }; labstats = derive2 { name="labstats"; version="1.0.1"; sha256="1780slp9l1rqwr5ika6hv606jzbaa3g1ywzkjkd3ff2gb0cby3ni"; depends=[]; }; lacm = derive2 { name="lacm"; version="0.1.1"; sha256="01zd4zsas60kzxx4wsnxs6qqc72i4djwj8m7ryjyx5nrxgpjaixc"; depends=[numDeriv statmod]; }; + lacrmr = derive2 { name="lacrmr"; version="1.0.3"; sha256="0zpfc4a7krwkwbf31idpmdzks4qassqnhxk1f9fcq1qjzqzhjkvi"; depends=[dplyr httr janitor jsonlite magrittr sjmisc stringr]; }; lactcurves = derive2 { name="lactcurves"; version="1.0.0"; sha256="06dj8ajg6ndnyakywy16wbqjjr2jkidvnjv33vxcacwijympaqqy"; depends=[orthopolynom]; }; - lacunaritycovariance = derive2 { name="lacunaritycovariance"; version="1.0-13"; sha256="041vldak0s24hci4fm2k1vwm5nvv1nxld94psiaz1v1fh4k781jm"; depends=[RcppRoll spatstat]; }; + lacunaritycovariance = derive2 { name="lacunaritycovariance"; version="1.1-0"; sha256="059khrvjiirwd0p61lb1xjy1hz0hfazs9fqv9arpiq1q5cksx9hg"; depends=[RcppRoll spatstat]; }; laeken = derive2 { name="laeken"; version="0.5.1"; sha256="199rjkhjjygpr6cjzab87as46acb5npi44m4yycvk7lnd0blma8s"; depends=[boot MASS]; }; laercio = derive2 { name="laercio"; version="1.0-1"; sha256="0la6fxv5k9zq4pyn8dxjiayx3vs9ksm9c6qg4mnyr9vs12z53imm"; depends=[]; }; lagged = derive2 { name="lagged"; version="0.3-0"; sha256="0bm3d6pgb25rw1njarki60j4d7mx7rni25a21iw1l650slg7sscm"; depends=[]; }; @@ -9954,37 +10373,39 @@ in with self; { lambda_r = derive2 { name="lambda.r"; version="1.2.4"; sha256="1mh1g0gsd58gng0hb29vww2yqb2jfs07kba5kxnnqck5j3izwlnj"; depends=[formatR]; }; lamme = derive2 { name="lamme"; version="0.0.1"; sha256="1x9jl79iqikpjixajly1k8w2nkzskns2m0v242giknl0ikw298h1"; depends=[]; }; landest = derive2 { name="landest"; version="1.0"; sha256="1lp5sfqk0n7i23fmwjgzsabml1fsji1h9xq5khxzaz1bzqv1s08g"; depends=[survival]; }; + landmap = derive2 { name="landmap"; version="0.0.6"; sha256="05g9q64ia6gycdld10hl4aplfgdm2qiwp16w5k8q14izm1q2pwld"; depends=[gdalUtils glmnet matrixStats mlr parallelMap ranger raster rgdal sp]; }; landpred = derive2 { name="landpred"; version="1.0"; sha256="1bl17xkx18i8i7arccnjmxvhjn4yiy7w64hg4n0xmhk8pg0l3mrg"; depends=[survival]; }; landsat = derive2 { name="landsat"; version="1.1.0"; sha256="15ymmwhkgw0lqyy2sryss3nsmkrjf4cc0bzlsr41vh5c2636srfd"; depends=[lmodel2 mgcv rgdal sp]; }; landsat8 = derive2 { name="landsat8"; version="0.1-10"; sha256="169b5ka98ka9chbmksz6syaygc9wgl8i2gz1h2xkxj3lk9jcg01r"; depends=[rgdal sp]; }; landscapeR = derive2 { name="landscapeR"; version="1.2"; sha256="1zm5mj861ycbc2m28yjqnkifx8grc4l718mf8r422m78jfakvcjy"; depends=[raster Rcpp]; }; - landscapemetrics = derive2 { name="landscapemetrics"; version="1.4.6"; sha256="1ggczpxkm94x2b0vgjnnlmqykmqbin8w0m6bkffp1bmcwsx7pdl2"; depends=[cli ggplot2 raster Rcpp RcppArmadillo sp tibble]; }; + landscapemetrics = derive2 { name="landscapemetrics"; version="1.5.1"; sha256="0mw7wivxg9vmx4qj3adwagm49ibrmckbibw58l70irwvcy8fp68p"; depends=[cli ggplot2 raster Rcpp RcppArmadillo sp tibble]; }; landscapetools = derive2 { name="landscapetools"; version="0.5.0"; sha256="11zp6r414nkj8vhsbryzhkxmpal2bva8msaxf1v69xax70ilxyf1"; depends=[ggplot2 raster Rcpp tibble]; }; - landsepi = derive2 { name="landsepi"; version="1.0.1"; sha256="1g6f7sa87jdkg5fi0jk58pwrv764ajm18jblymjjky5laczv5acf"; depends=[DBI doParallel fields foreach Matrix mvtnorm Rcpp RSQLite sf sp splancs testthat]; }; + landsepi = derive2 { name="landsepi"; version="1.0.2"; sha256="0pyajgl9zy5s3yb7lvj0dmjbk2li4bacidqv7m1jdgfgqwdjrs0n"; depends=[DBI doParallel fields foreach Matrix mvtnorm Rcpp RSQLite sf sp splancs testthat]; }; languageR = derive2 { name="languageR"; version="1.5.0"; sha256="1iipnr2b4hd2w718prbh075j56m5xnchlcb2vg26m16qpydp6afn"; depends=[]; }; languagelayeR = derive2 { name="languagelayeR"; version="1.2.4"; sha256="1q82shdcdd84nr6bnfwgyyb81z8dycvj1i3vhwvdg710s15rgiyk"; depends=[attempt curl httr jsonlite]; }; - languageserver = derive2 { name="languageserver"; version="0.3.6"; sha256="0kmpjz1f4lji477l40qjii889z4vy4z837ryc01p1i957ca0gyr2"; depends=[callr collections desc fs jsonlite lintr R6 repr stringi styler xml2 xmlparsedata]; }; + languageserver = derive2 { name="languageserver"; version="0.3.9"; sha256="1acjzc8ar3y0g8prwnsp7k3mgvg01h73mnyb4q2s3r7wkb4aqhrv"; depends=[callr collections desc fs jsonlite lintr R6 repr roxygen2 stringi styler xml2 xmlparsedata]; }; languageserversetup = derive2 { name="languageserversetup"; version="0.1.2"; sha256="05i8kcp1zpbkrqpq5vxxvxk9p7phyngxl0q6v76va0i7qnmy1v7a"; depends=[]; }; lans2r = derive2 { name="lans2r"; version="1.1.0"; sha256="0svqaz1j8vhfnm31bfp4gqshdj73wmljva4kxcv2qajmcdiqbd2s"; depends=[dplyr ggplot2 R_matlab reshape2 rlang tidyr]; }; lar = derive2 { name="lar"; version="0.1-2"; sha256="0qda0y4ag10kg83wxs3z754kc8c1dg2rwciy64klk7an4ln43i5b"; depends=[data_table treemap xlsx]; }; largeList = derive2 { name="largeList"; version="0.3.1"; sha256="0csijzlxajj0rh24w5n7fs6ss301zr6zfv5khyq4a9g437bwhc2i"; depends=[]; }; lars = derive2 { name="lars"; version="1.2"; sha256="0blj44wqrx6lmym1m9v6wkz8zxzbjax2zl6swgdczci0ixb5nx34"; depends=[]; }; lass0 = derive2 { name="lass0"; version="1.1.0"; sha256="01fafgyhi3fw8ldjw2gf0z9w1si7il3ailwm197fxmw4wqgys9fl"; depends=[doRNG foreach ismev lpSolve]; }; - lasso2 = derive2 { name="lasso2"; version="1.2-20"; sha256="0wgby86i5jphl1nxhzf6733lknry843qrqiyp4km10s2nlpbls0c"; depends=[]; }; + lasso2 = derive2 { name="lasso2"; version="1.2-21.1"; sha256="0pp92n6db21q7ifykqjy19pcscrbbwgz5p57zdk2acrnsjf49j47"; depends=[]; }; lassopv = derive2 { name="lassopv"; version="0.2.0"; sha256="0yawnjw063jypk3riy9xab9cmliv6c9dnabi18670khd3gzb2r9z"; depends=[lars]; }; lassoscore = derive2 { name="lassoscore"; version="0.6"; sha256="1i3i07da8sw9w47rcflhylz8zxvzkyycbc1a4gf6hbcpp21rqd7d"; depends=[glasso glmnet Matrix]; }; lassoshooting = derive2 { name="lassoshooting"; version="0.1.5-1"; sha256="0ixjw8akplcfbzwyry9p4bhbcm128yghz2bjf9yr8np6qrn5ym22"; depends=[]; }; latdiag = derive2 { name="latdiag"; version="0.3"; sha256="13wk8vhiwr9drcx5f4wlgbin6hc83zv54yr4h3qhjagm3hxcxbw0"; depends=[Rdpack]; }; + latentgraph = derive2 { name="latentgraph"; version="1.1"; sha256="11h7nrd81licvdikiwwfkz4x9i7drz09w5ns672b7fw0pj4qqgsr"; depends=[glmnet MASS pracma Rcpp RcppArmadillo]; }; latentnet = derive2 { name="latentnet"; version="2.10.5"; sha256="05yjf7a16imv1p2lg5dmfk183xll49crnkg0mbz4c4b39nksy85v"; depends=[abind coda ergm MASS mvtnorm network sna statnet_common]; }; later = derive2 { name="later"; version="1.1.0.1"; sha256="1k9n2j7zxw9gfclnx8zfqp6w64c5d6apn7g02yhkajkpmszagfki"; depends=[BH Rcpp rlang]; }; latex2exp = derive2 { name="latex2exp"; version="0.4.0"; sha256="12nbcgfmv13k6sc6m326ras9bcvy380b7rxcxphn06r3cfkby0zw"; depends=[magrittr stringr]; }; latexpdf = derive2 { name="latexpdf"; version="0.1.6"; sha256="07g33z5lyxinlrzpk6pd41m4c4bbfql611yqcqxasf8wra9bb0jr"; depends=[]; }; + latrend = derive2 { name="latrend"; version="1.0.1"; sha256="01m9zwp3gnl9msmsn5bxic29n36vgvhxxf8b8q9i233n1m772jh9"; depends=[assertthat caret clusterCrit data_table foreach ggplot2 lme4 longitudinalData magrittr matrixStats mclust mclustcomp plyr R_utils scales stackoverflow]; }; latte = derive2 { name="latte"; version="0.2.1"; sha256="1dcwxxj3yran5a3a8vvdfmx4ap69ql2jncxvmci4p4vcw4ki9j9g"; depends=[dplyr ggplot2 glue magrittr memoise mpoly stringr usethis]; }; lattice = derive2 { name="lattice"; version="0.20-41"; sha256="1dapkmh4jlb9sxfrpvapvlfhczl4s8p3r20bn47gcgdk1izmbjjl"; depends=[]; }; latticeDensity = derive2 { name="latticeDensity"; version="1.1.6"; sha256="1s93zhdmncaa5c42wjmrar2f95rxjsdf1qphgdzb7g4f61vijxy9"; depends=[sp spam spatialreg spatstat spdep splancs]; }; latticeExtra = derive2 { name="latticeExtra"; version="0.6-29"; sha256="04fzwcqs594rk5qp98yilh3kdh3sw4xf8wld5rp94ggpaqfw7bbc"; depends=[jpeg lattice png RColorBrewer]; }; - lava = derive2 { name="lava"; version="1.6.7"; sha256="0ffzxbb8pvfh1m6j61az4ga37snyhylq2941fyc76w7w9i2sixv3"; depends=[numDeriv SQUAREM survival]; }; - lava_tobit = derive2 { name="lava.tobit"; version="0.5"; sha256="15dlcjgnvrpdxymcwf4rvk72ssr650dy1ayp50zlrp2va0p6h4kw"; depends=[lava mets mvtnorm survival]; }; + lava = derive2 { name="lava"; version="1.6.8.1"; sha256="1yiz8y3jhxkszgz9m9fialp9r27hy97xh0imfvs8ziv7dk43y93d"; depends=[numDeriv SQUAREM survival]; }; lavaSearch2 = derive2 { name="lavaSearch2"; version="1.5.6"; sha256="0m5dwfmpcmicrpasx2raac2zylss416bxxgb3mg3abpll89iw9fx"; depends=[doParallel ggplot2 lava MASS Matrix multcomp mvtnorm nlme Rcpp RcppArmadillo reshape2 sandwich]; }; lavaan = derive2 { name="lavaan"; version="0.6-7"; sha256="0ks62wrwghbm1brzmqvr92h5n1295dpc87m1g3xrfx0mkdaqdcdk"; depends=[MASS mnormt numDeriv pbivnorm]; }; lavaan_shiny = derive2 { name="lavaan.shiny"; version="1.2"; sha256="0qgswdpxb5af0l3v70sg0jrgsdwr88gz6zzwbk3pw5x6qnvnwb6r"; depends=[lavaan psych semPlot shiny shinyAce]; }; @@ -9999,16 +10420,18 @@ in with self; { lazyarray = derive2 { name="lazyarray"; version="1.1.0"; sha256="1bj1a8ab2479cl3d15h9f1fr1hh5d1p3sxpq8y84yzw0rrsxcldd"; depends=[fstcore R6 Rcpp yaml]; }; lazybar = derive2 { name="lazybar"; version="0.1.0"; sha256="1hv9ciznbxv7xnaijfjqisq3lx8nd4vkdkj9clxpdsspi3inlf53"; depends=[R6]; }; lazyeval = derive2 { name="lazyeval"; version="0.2.2"; sha256="1m10i059csrcqkcn59a8wspn784alxsq3symzhn24mhhl894346n"; depends=[]; }; + lazygreedy = derive2 { name="lazygreedy"; version="1.0"; sha256="18q4hsls0yrmdcyd6ws4gcvvjdmipcaxprfk65j17jfxqgyzp2yf"; depends=[Rcpp RcppArmadillo]; }; lazyraster = derive2 { name="lazyraster"; version="0.5.0"; sha256="0zf9xlxyzmgxy1nl2kg7fvpfamjz04gf4yxjn3r9j7fjkik35cnp"; depends=[quadmesh raster vapour]; }; + lazysf = derive2 { name="lazysf"; version="0.1.0"; sha256="19g0qzm0dxsa8m4dj4zmz8r674dw43pqs5gg6n3xfgm5dl9772jb"; depends=[DBI dbplyr dplyr magrittr sf tibble]; }; lazysql = derive2 { name="lazysql"; version="0.1.3"; sha256="18vff80rl8ckjwfqi9dhzs1q35a1wrxvynidji6dy2kvvk38xnpa"; depends=[checkmate magrittr plyr]; }; - lazytrade = derive2 { name="lazytrade"; version="0.3.11"; sha256="153rfx7725azbaa5i68dhzpqgzyshzv4w4fqqi5faymnwk2ncf2l"; depends=[dplyr ggplot2 h2o lubridate openssl readr ReinforcementLearning stringr]; }; + lazytrade = derive2 { name="lazytrade"; version="0.4.3"; sha256="02qmfqgzdprc6cxm21zq46p5ybwrwyndb4ysf2fj55y7wi73vzmj"; depends=[dplyr ggplot2 h2o lubridate openssl readr ReinforcementLearning stringr]; }; lba = derive2 { name="lba"; version="2.4.4"; sha256="0izqndm992zv3sg8v5lpnxbdbxhpxl6hq3bf6xgq3pnw8vl3f6nb"; depends=[alabama MASS plotrix rgl scatterplot3d]; }; lbfgs = derive2 { name="lbfgs"; version="1.2.1"; sha256="0p99g4f3f63vhsw0s1m0y241is9lfqma86p26pvja1szlapz3jf5"; depends=[Rcpp]; }; lbfgsb3c = derive2 { name="lbfgsb3c"; version="2020-3.2"; sha256="07mhiaxhjjma5c65z3pz7wchgsqn4b19labzyq25ncnmj319fxrg"; depends=[numDeriv Rcpp RcppArmadillo]; }; lbiassurv = derive2 { name="lbiassurv"; version="1.1"; sha256="1i6l3y4rasqpqka7j39qjx22wjbilgc9pkp05an52aysfvfxy193"; depends=[actuar]; }; lbreg = derive2 { name="lbreg"; version="1.3"; sha256="1z9vixf6sl0k9lizngc3859lk32srkk1d8y133sl6s37ppmqb4s2"; depends=[MASS]; }; - lcars = derive2 { name="lcars"; version="0.3.1"; sha256="14h6p4cbvx586zmaw480cy8gnjc6w7081dps9imvmf5lwcag66mb"; depends=[ggplot2 shiny trekcolors]; }; - lcc = derive2 { name="lcc"; version="1.1.0"; sha256="1wdxzmrsnrw7x4sfm95292i1q4v6xafzak2w46lf8d6s4qh1drsj"; depends=[doRNG doSNOW foreach gdata ggplot2 gridExtra hnp nlme]; }; + lcars = derive2 { name="lcars"; version="0.3.6"; sha256="008dw30x4la3l2lq520c55sxfr4pflx3ii4xrkafrq17pndx3hmy"; depends=[ggplot2 shiny trekcolors]; }; + lcc = derive2 { name="lcc"; version="1.1.1"; sha256="0353k1ah0pwvvfqf9jlk0n6iw88rndm01r19l4q23ajg24n67jr4"; depends=[doRNG doSNOW foreach ggplot2 hnp nlme]; }; lcda = derive2 { name="lcda"; version="0.3"; sha256="1ximsyn6qw2gfn7b1hdpbjs6h6nk7hrignlii0np1lbf0k8l4xxl"; depends=[poLCA]; }; lchemix = derive2 { name="lchemix"; version="0.1.0"; sha256="1g2w57fi6kvsyir14hnxh0v6xwjdnbisafvjxvn1g6a4h55dg9i0"; depends=[MCMCpack mvtnorm]; }; lclGWAS = derive2 { name="lclGWAS"; version="1.0.3"; sha256="03b6ijqvyirv96hc3dsqf4f0zzqlmq5451mcb14d2mw3s6xy1vmq"; depends=[BH Rcpp]; }; @@ -10021,7 +10444,7 @@ in with self; { lctools = derive2 { name="lctools"; version="0.2-8"; sha256="03k6d78lzc8jxndnwh39h6fagr6ibhr9354vzvsw873912sxs8c9"; depends=[MASS pscl reshape sp weights]; }; lcyanalysis = derive2 { name="lcyanalysis"; version="1.0.4"; sha256="0pwr6r8nbvmppqwd9gxap6v49l7iaq5syaq11spxp5yc2h3pa2rg"; depends=[quantmod TTR xts zoo]; }; lda = derive2 { name="lda"; version="1.4.2"; sha256="03r4h5kgr8mfy44p66mfj5bp4k00g8zh4a1mhn46jw14pkhs21jn"; depends=[]; }; - ldaPrototype = derive2 { name="ldaPrototype"; version="0.2.0"; sha256="19ls6ilirqdk4wbk8nf1jw6bd152z5ydchlp28wx5yrrjr694q9n"; depends=[batchtools checkmate colorspace data_table dendextend fs future lda parallelMap progress]; }; + ldaPrototype = derive2 { name="ldaPrototype"; version="0.3.0"; sha256="1789wvl3c7h4as3sy1lkraqbhvnzcmcncyva7mjjh4p3vsgi1zdd"; depends=[batchtools checkmate colorspace data_table dendextend fs future lda parallelMap progress]; }; ldamatch = derive2 { name="ldamatch"; version="1.0.1"; sha256="1dmmjw7h0rrgwga7235bryzzvmx68gmkpy5v1pwvnkk4rxp8xamh"; depends=[car data_table entropy foreach gmp iterators iterpc kSamples MASS RUnit]; }; ldat = derive2 { name="ldat"; version="0.3.3"; sha256="1n8v4nzfv3ayr46ahrz60vasam8mx1phb4vss05d9xh7sxlkx7gv"; depends=[BH lvec Rcpp]; }; ldatuning = derive2 { name="ldatuning"; version="1.0.2"; sha256="0367y6k5i4sccwfcm89xyc62qblrlwnm6hsa2jf346rnrfz9hkkc"; depends=[ggplot2 reshape2 Rmpfr scales slam topicmodels]; }; @@ -10029,7 +10452,7 @@ in with self; { ldbounds = derive2 { name="ldbounds"; version="1.1-1.1"; sha256="10rmkidvvhwnrkc62c5ld44xhbvx1k8mch28h1yryakn8gznp3p8"; depends=[lattice]; }; ldhmm = derive2 { name="ldhmm"; version="0.5.1"; sha256="1jwgxwzz56n6hhpp1qks1x0jsfbrjgfsl6h5sp7498l4d2f279ij"; depends=[ecd ggplot2 moments optimx scales xts zoo]; }; ldr = derive2 { name="ldr"; version="1.3.3"; sha256="1c48qm388zlya186qmsbxxdcg1mdv3nc3i96lqb40yhcx2yshbip"; depends=[GrassmannOptim Matrix]; }; - ldsep = derive2 { name="ldsep"; version="1.0.0"; sha256="0h3gwjylmi0fx3gf7hqwjd58n9grmnv1phwqcj8dr0x6bn56bqy3"; depends=[ashr corrplot doParallel foreach lpSolve Rcpp RcppArmadillo]; }; + ldsep = derive2 { name="ldsep"; version="1.1.0"; sha256="172iyx08kf5gq8ynbd9pkc4xyw0z2dyr8sjrpp9as0qb0y50kih1"; depends=[ashr corrplot doParallel foreach lpSolve Rcpp RcppArmadillo]; }; ldsr = derive2 { name="ldsr"; version="0.0.2"; sha256="0wmxpglad1mk2c1gi9kxmh149r8ad0l8i2xlfs1hdjb6a4wxsklr"; depends=[data_table foreach MASS Rcpp RcppArmadillo]; }; leabRa = derive2 { name="leabRa"; version="0.1.0"; sha256="08yiwyfg9bp4i9w5yyw9p63wyvgj39kd64y3h21j2jmpw8zxncdq"; depends=[plyr R6]; }; leaderCluster = derive2 { name="leaderCluster"; version="1.2"; sha256="1lqhckarqffm2l3ynji53a4hrfn0x7zab7znddia76r2h6nr02zb"; depends=[]; }; @@ -10040,14 +10463,15 @@ in with self; { leaflet = derive2 { name="leaflet"; version="2.0.3"; sha256="053kn4a2lbhzq2c68c4q782yrbyx4a7zw7j1s6p7k2d75chk1aja"; depends=[base64enc crosstalk htmltools htmlwidgets leaflet_providers magrittr markdown png raster RColorBrewer scales sp viridis]; }; leaflet_esri = derive2 { name="leaflet.esri"; version="1.0.0"; sha256="01bwzxh2rdhpvvazaxsji8axl765q1ix1fdxla6i61nvqkpw3dz1"; depends=[htmltools leaflet leaflet_extras]; }; leaflet_extras = derive2 { name="leaflet.extras"; version="1.0.0"; sha256="0li7651cwlz7sg04xdrmvhkrf0n6amaydck7gqz0wkb6wq8hcyzw"; depends=[htmltools htmlwidgets leaflet magrittr stringr]; }; - leaflet_extras2 = derive2 { name="leaflet.extras2"; version="1.0.0"; sha256="1g75n6rz7zbr2jyh5qc1a3418l8jcm25d6av9yc9jf2yagbqlh28"; depends=[htmltools htmlwidgets leaflet magrittr]; }; + leaflet_extras2 = derive2 { name="leaflet.extras2"; version="1.1.0"; sha256="138d2ajma3fkz7nsh50z4gw5zaflas39gsy7k5l120hxr7nmzgfk"; depends=[htmltools leaflet magrittr]; }; leaflet_minicharts = derive2 { name="leaflet.minicharts"; version="0.6.0"; sha256="175zxyvgjbhhp5fl8fz8nr7n9y34ldhs9pnz602x1hk7vpyf3cjc"; depends=[htmltools leaflet]; }; + leaflet_multiopacity = derive2 { name="leaflet.multiopacity"; version="0.1.1"; sha256="0ynbqjs4gdnjsygzwlczrirhazpq2gl9grzyxvnyl4jcpb3yg7y2"; depends=[htmltools htmlwidgets]; }; leaflet_opacity = derive2 { name="leaflet.opacity"; version="0.1.0"; sha256="19dkl105sf7c9wrpl8kzwsjwwc7r9qb4c1g85w2lavpj0pbyazxw"; depends=[htmltools htmlwidgets]; }; leaflet_providers = derive2 { name="leaflet.providers"; version="1.9.0"; sha256="0yynrwv4xd5cdh49cwvfxm4ranarah9iiry2cd3b4fiihdfcg3wy"; depends=[]; }; leafletCN = derive2 { name="leafletCN"; version="0.2.1"; sha256="1rg39n4bjacwss9nbdnz8y2zh8hxlc7a5ygndhjbmzajnbxfh09b"; depends=[htmltools jsonlite leaflet magrittr rgeos sp]; }; leafletR = derive2 { name="leafletR"; version="0.4-0"; sha256="0j1i971dl3smq8rcsa5s4rfmmk936k2q6xa4hppfzwhrxs3xkkkx"; depends=[brew jsonlite]; }; leafpm = derive2 { name="leafpm"; version="0.1.0"; sha256="06d2k5x6bnv7bf4aw2bayi8sh5bw8z6akwnp7da5s7454hyqn0vv"; depends=[dplyr htmltools htmlwidgets jsonlite leaflet sf]; }; - leafpop = derive2 { name="leafpop"; version="0.0.5"; sha256="0mv04inb7glv69baq6xwdm2rnk9mihjz0rgd4zw6qyxnf03lhh06"; depends=[base64enc brew htmltools htmlwidgets sf svglite uuid]; }; + leafpop = derive2 { name="leafpop"; version="0.0.6"; sha256="0bvj9s3wf8v6l99qqq5g8csq6pyy1f28c1vrhw559s0w10fs771x"; depends=[base64enc brew htmltools htmlwidgets sf svglite uuid]; }; leafsync = derive2 { name="leafsync"; version="0.1.0"; sha256="0p6pb7w5yz2wj33kdh7ixii9f6b8zv018psp6b7ifr7npgdxi3vx"; depends=[htmltools htmlwidgets leaflet]; }; leaftime = derive2 { name="leaftime"; version="0.2.0"; sha256="10ij06rq7kmfnzfa629l2kskwj96lh87m00wi9b1aq15b5h7bxls"; depends=[htmltools htmlwidgets leaflet]; }; leanpubr = derive2 { name="leanpubr"; version="0.3.1"; sha256="0c8pmzn25cwv0wccf30zrrqrs5amlk8iqyyva9vp9976wzwgbxrx"; depends=[httr jsonlite xml2]; }; @@ -10057,50 +10481,52 @@ in with self; { learnPopGen = derive2 { name="learnPopGen"; version="1.0.4"; sha256="04wxina3n2bspxdp3d4bgqrwyxqxx46pfp8zgzr3rsj89ml8if9l"; depends=[gtools phytools]; }; learningr = derive2 { name="learningr"; version="0.29.1"; sha256="0z3rs7y9yd81f14sbk3dwq1ifr4vca2s3kl1gnkqlns3dycgyp08"; depends=[plyr]; }; learnr = derive2 { name="learnr"; version="0.10.1"; sha256="08xwmms6x58y3dsfbl9c6d03145hb4ij97nqr1cc9dxxilmr6x31"; depends=[checkmate ellipsis evaluate htmltools htmlwidgets jsonlite knitr markdown rappdirs renv rmarkdown rprojroot shiny withr]; }; - learnrbook = derive2 { name="learnrbook"; version="0.0.2"; sha256="1k17dk8ahn1ifwid1hhx0k7fpgc62zg82y66bbf6nhd4dgdbbv2p"; depends=[]; }; + learnrbook = derive2 { name="learnrbook"; version="1.0.1"; sha256="1yijkwy2v0qh1r3irx7bwyasw938lclsawdam2dkap76qavfrli9"; depends=[]; }; learnstats = derive2 { name="learnstats"; version="0.1.1"; sha256="1sa064cr7ykl4s1ssdfmb3v1sjrnkbwdh04hmwwd9b3x0llsi9vv"; depends=[ggplot2 Rcmdr shiny]; }; leastcostpath = derive2 { name="leastcostpath"; version="1.7.4"; sha256="1m8n8pliwm2bp03fqyrhwlq4ij90hvq1hg44mi6dc9m4qz36vfls"; depends=[gdistance pbapply raster rgdal rgeos sp]; }; ledger = derive2 { name="ledger"; version="2.0.7"; sha256="07shnvawahm9bvwz37fynkp7sd69y9gc1mjhn7x8883jz8k4mjic"; depends=[dplyr rio rlang stringr tibble tidyr tidyselect]; }; leerSIECyL = derive2 { name="leerSIECyL"; version="1.0.2"; sha256="1zx28gpnys9mmhq7wwljfnq92wj1h1vxgqiirnfmn36z942nvmxl"; depends=[RCurl]; }; - lefko3 = derive2 { name="lefko3"; version="2.2.2"; sha256="1wzlz9f4admhy4ps72gc89zjrjbn5z8ld9y6y95kcx41mr258r26"; depends=[glmmTMB lme4 MASS MuMIn Rcpp RcppArmadillo RSpectra stringr]; }; + lefko3 = derive2 { name="lefko3"; version="3.1.2"; sha256="1bfbiiwq4sjv44gr20i0anazgsf6g9sla0iif8g36xr8km9mjaf4"; depends=[glmmTMB lme4 MASS MuMIn pscl Rcpp RcppArmadillo stringr]; }; legco = derive2 { name="legco"; version="0.1.3"; sha256="1615whdqihpzfhp5ll3x3jg4py04l52dc87kbdmgln4ygxyy5sqh"; depends=[httr jsonlite]; }; legislatoR = derive2 { name="legislatoR"; version="1.0"; sha256="1553hpb2cmv3hw6v4c7qwgg8n18jwx101yaqnmaaiv8gfyh6j43m"; depends=[curl dplyr]; }; legocolors = derive2 { name="legocolors"; version="0.2.0"; sha256="06jbq12jzga1p5jajhnnkk11s9gjw5ngmnrvhmbvirhsbafp0fjv"; depends=[]; }; - leiden = derive2 { name="leiden"; version="0.3.3"; sha256="1hh6bmbz6cpqwl4i94gxylgv9x92zbqdg81r8r4ymfy8c70f3df2"; depends=[igraph Matrix reticulate]; }; + leiden = derive2 { name="leiden"; version="0.3.6"; sha256="1k1250bjgf2cb1whp2sl1r6b88156qwi2zkamw5iy2q1qhw6w2d7"; depends=[igraph Matrix reticulate]; }; + leidenAlg = derive2 { name="leidenAlg"; version="0.1.0"; sha256="0i6vfd4sa6bb3v47zz0mj90kppkzngbf180qczka99pyfhzfy4a2"; depends=[igraph Matrix Matrix_utils Rcpp RcppArmadillo RcppEigen sccore]; }; leiv = derive2 { name="leiv"; version="2.0-7"; sha256="15ay50886xx9k298npyksfpva8pck7fhqa40h9n3d7fzvqm5h1jp"; depends=[]; }; lemon = derive2 { name="lemon"; version="0.4.5"; sha256="1y3ljidhqdakxlya2npj2w0az820g8kw6gl1cfm4f0cxvzgd1ly4"; depends=[ggplot2 gridExtra gtable knitr lattice plyr rlang scales]; }; lenses = derive2 { name="lenses"; version="0.0.3"; sha256="08akwzlc5gk2rxbh9xp67n5ahdcld60932ascczjv0accrkxizhk"; depends=[magrittr rlang tidyselect]; }; + leontief = derive2 { name="leontief"; version="0.2"; sha256="1gy23047c6gci9m83yrb662d5685x1kky6m94w68swms59gdc6yp"; depends=[Rcpp RcppArmadillo]; }; leri = derive2 { name="leri"; version="0.0.1"; sha256="1309v58xdw3p6y2wpnl64vgsds5kvfiary2a3fa041kz23jzbp3c"; depends=[ncdf4 raster]; }; lero_lero = derive2 { name="lero.lero"; version="0.2"; sha256="03ll7jzcay0swwpmxyf0y9k2h8mxx4p5v3ggm9dgdz4j99934l70"; depends=[]; }; - lessR = derive2 { name="lessR"; version="3.9.6"; sha256="0987s8r4z62cgvc4sixnyxsr5yaf1j0s532ini77f18zxxzn7g3h"; depends=[colorspace ellipse knitr lattice latticeExtra leaps openxlsx robustbase triangle viridisLite]; }; + lessR = derive2 { name="lessR"; version="3.9.8"; sha256="10gh0bbpyzf33vz00mzhw7zk7ha9njwif7xdasczk0lghdacwy8d"; depends=[colorspace ellipse knitr lattice latticeExtra leaps openxlsx robustbase triangle viridisLite]; }; lest = derive2 { name="lest"; version="1.1.0"; sha256="1d69kvdl31crv4ik8bwylq3s3f4skzrjc4x49c79w443g64n2jp9"; depends=[]; }; lestat = derive2 { name="lestat"; version="1.9"; sha256="1skxymdf3ncmdbskh7711xxgwsmwxfxnl52gcgw06jscx6s6wrsd"; depends=[MASS]; }; - letsR = derive2 { name="letsR"; version="3.2"; sha256="1ahmm290vgmdqnm7wz1fif1g31nsvqszkf921dpddv291xqmbksp"; depends=[fields geosphere maps maptools raster rgdal rgeos sp XML]; }; + letsR = derive2 { name="letsR"; version="4.0"; sha256="07l1wgwnkqnvh47ssg62vj88vgml52n0934w00pjxdk90kk3c5zs"; depends=[fields geosphere maps maptools raster rgdal rgeos sp XML]; }; lexRankr = derive2 { name="lexRankr"; version="0.5.2"; sha256="0vb4m4g88k05yhjla1gwp8ck08356r9dzwal6cq7lb6xm6pl5gvi"; depends=[igraph Rcpp SnowballC]; }; lexicon = derive2 { name="lexicon"; version="1.2.1"; sha256="0x7rscsh6par2lj11sby7bmz41cxn63iiw51lgh29z09cg8j606c"; depends=[data_table syuzhet]; }; lexiconPT = derive2 { name="lexiconPT"; version="0.1.0"; sha256="0w53gnr29nzc1ib54rnxdycs0c5f7vpv586qmvxxzy4ar16kisaq"; depends=[]; }; lfactors = derive2 { name="lfactors"; version="1.0.4"; sha256="1r8qlwj3zsm233jfx9ag0q5g1knvjmbwl3785pwcd12zi6f68dcc"; depends=[]; }; lfda = derive2 { name="lfda"; version="1.1.3"; sha256="0sk409jx4chs2wzhpfw7rlg9pwpdqg32ncfl3w243ypq73jq0qv3"; depends=[plyr rARPACK]; }; - lfe = derive2 { name="lfe"; version="2.8-5.1"; sha256="14yjgwjpz6rdj9pf345wxs2n0419gjwzl2gi87b4nvirjh5431wy"; depends=[Formula Matrix sandwich xtable]; }; - lfl = derive2 { name="lfl"; version="2.0.1"; sha256="1pbrm8zlpz1d057q5mgcz8kf3br925zsfsxir37l6raz83679q9i"; depends=[e1071 foreach forecast plyr Rcpp tseries zoo]; }; + lfl = derive2 { name="lfl"; version="2.1.1"; sha256="1xark6il5986vsp24vzc6668g0hb177d5wh45gw102644jnq64y9"; depends=[e1071 foreach forecast plyr Rcpp tseries zoo]; }; lfmm = derive2 { name="lfmm"; version="1.0"; sha256="0n7whmqxybv02k7nc0w5g2ncs43dyq3zdcnnn27vanq9mfxvhbjc"; depends=[foreach ggplot2 knitr MASS purrr Rcpp RcppEigen readr rmarkdown RSpectra]; }; lfstat = derive2 { name="lfstat"; version="0.9.4"; sha256="0lm9fyw45kdkkjldkmagykn9p3l3jlw2ky3h00f7j6rqkizjm6r0"; depends=[dygraphs lattice latticeExtra lmom lmomRFA plyr xts zoo]; }; lg = derive2 { name="lg"; version="0.4.1"; sha256="1srlklq6hkb4yd3lbbazswj866i3wzk2524hhj1v45yr7d5qhxv0"; depends=[ggplot2 ks localgauss logspline mvtnorm np tseries]; }; lgarch = derive2 { name="lgarch"; version="0.6-2"; sha256="05xksc4d6dbf5ls4lf2gpk9xyi99fikr7dva88b84rfgads1yhrh"; depends=[zoo]; }; lgcp = derive2 { name="lgcp"; version="1.6"; sha256="1bsf69l81w7182ay4lrq1miqdr4f4jv5ppcalrqhqjcwhkq1nlkb"; depends=[fields iterators maptools Matrix ncdf4 RandomFields raster rgeos rpanel sp spatstat spatstat_utils]; }; - lgr = derive2 { name="lgr"; version="0.3.4"; sha256="14qq2q526iv2wxdssddv0sqqaz8vj7xgw1rrqspjvqnl8l6bckab"; depends=[R6]; }; + lgr = derive2 { name="lgr"; version="0.4.1"; sha256="196553hmni1ha9y6494f4g3ds0lwcl81v7k4r8wwap4a6acdrgd9"; depends=[R6]; }; lgrdata = derive2 { name="lgrdata"; version="0.1.1"; sha256="0h1crdhqfp6hzx30lp0w015scf2566hhrl2i7mkxy868rkl3aig9"; depends=[]; }; lgtdl = derive2 { name="lgtdl"; version="1.1.5"; sha256="1sixq56d2px36q0xq3kl0zwj2yzm3q8fhgqjvmajcdd5jl8l7130"; depends=[]; }; lhmixr = derive2 { name="lhmixr"; version="0.1.0"; sha256="1c4ydgq1z2y0xk8xqdsim6xvgxdbl3gglfk5kcr9k4m01arvv0rf"; depends=[]; }; - lhs = derive2 { name="lhs"; version="1.0.2"; sha256="0n0i1hr9gmc0hfcs2cvpjvdfgm6k26rhcq3q22r8ic0gfj953572"; depends=[Rcpp]; }; + lhs = derive2 { name="lhs"; version="1.1.1"; sha256="1p4h03qlijs2a59wfd4rlvdlb9i87pw2zm8xsjd6yzz8vlm9yglh"; depends=[Rcpp]; }; liayson = derive2 { name="liayson"; version="1.0.3"; sha256="10xkzy4vlszcdclrdv0d6nyzgh3ldr5rk59ml8bxx06dbh5c0h99"; depends=[ape arules biomaRt distances e1071 gplots matlab phangorn plyr proxy RColorBrewer]; }; libcoin = derive2 { name="libcoin"; version="1.0-6"; sha256="0njfdbz4mkyasxm80p0fb0qibvzz7kdzddn8ybj2k6y8bx0w3bs8"; depends=[mvtnorm]; }; libgeos = derive2 { name="libgeos"; version="3.8.1-3"; sha256="159mx1dlimfajpv8r34bc6pv1lxagi4b5jk08csy7qpbgvr8hg3c"; depends=[]; }; + libr = derive2 { name="libr"; version="1.0.1"; sha256="1nqwiifrsw242yyqwaq80zl2ykz50is2yrssyp35jd1mf39r35lm"; depends=[crayon dplyr haven openxlsx readr readxl tibble]; }; librarian = derive2 { name="librarian"; version="1.7.0"; sha256="0n3q2ppa3p0w8ypgx9s738pmprfbqi9qg8n58xzplp809p903dj9"; depends=[BiocManager remotes]; }; librarysnapshot = derive2 { name="librarysnapshot"; version="0.1.2"; sha256="0v4x564zpm58kxs5n84bi6mcjhbzjg6a2lc30vsc8kbm3qy0nq38"; depends=[]; }; libsoc = derive2 { name="libsoc"; version="0.7"; sha256="1r548rvj98wl0yp6jx5d2qhvy1y4883qp0w3jjk97vp07a1cywn8"; depends=[]; }; libstableR = derive2 { name="libstableR"; version="1.0.2"; sha256="1gkcgbc8a7ks9x8mqmlz98hk55q3qy62izam7csz1s0r5dzsyqcr"; depends=[Rcpp RcppGSL]; }; - lidR = derive2 { name="lidR"; version="3.0.3"; sha256="0y1dh3s71y6g4289zprvxq9b1klayak9swiwnbp1rlylk89da8bs"; depends=[BH data_table future gdalUtils geometry glue lazyeval raster Rcpp RcppArmadillo RCSF rgdal rgeos rgl rlas sf sp]; }; + lidR = derive2 { name="lidR"; version="3.0.4"; sha256="0d0r381kxbj9cswjpgyhh1ggzyv25fqp5qq676cggxmxqy74znki"; depends=[BH data_table future gdalUtils geometry glue lazyeval raster Rcpp RcppArmadillo RCSF rgdal rgeos rgl rlas sf sp]; }; lifecontingencies = derive2 { name="lifecontingencies"; version="1.3.6"; sha256="0v8xrnmviq938x779f3h55iq8bhvbkwgz35v1dxgzbxwclj7jycl"; depends=[markovchain Rcpp]; }; lifecourse = derive2 { name="lifecourse"; version="2.0"; sha256="1m8ihqvzhzpq2m2pdvh37bpq9pdbj23r3y0jkl3q8farh3qj473d"; depends=[TraMineR]; }; lifecycle = derive2 { name="lifecycle"; version="0.2.0"; sha256="0912865c6675fsblrfdk6s568krsj1x8qbk1kipy7m05xs6nwx19"; depends=[glue rlang]; }; @@ -10110,6 +10536,7 @@ in with self; { liftr = derive2 { name="liftr"; version="0.9.2"; sha256="0azi831c4f0vcq27a3q86vj90zvwrzcy4plhj9hqkk4qz8xw113x"; depends=[knitr rmarkdown rstudioapi stringr yaml]; }; lifx = derive2 { name="lifx"; version="0.2.0"; sha256="0p9ljd3s3lc1rkhzpp801izy9y52f0yc1dsrsxwx5gi89cnib596"; depends=[assertthat crayon curl httr jsonlite]; }; liger = derive2 { name="liger"; version="1.1.2"; sha256="0jfjvqg5bk7hlk58c0ywq2i4dvn3jv8fnrq4nzsv2hkb77hl45vh"; depends=[matrixStats Rcpp RcppArmadillo]; }; + lightgbm = derive2 { name="lightgbm"; version="3.1.1"; sha256="1pwsh6j9ksahh58b15j5ij56bsc6syy3z4k4a5zhy5n7829rz555"; depends=[data_table jsonlite Matrix R6]; }; lightr = derive2 { name="lightr"; version="1.3"; sha256="11z1n88cs0knpicpxfkzmh20p49g07syfv32sizjap2cnn7l4q3a"; depends=[future_apply progressr xml2]; }; lightsout = derive2 { name="lightsout"; version="0.3"; sha256="0ypniqf9wk35dd9j57wd7gxchr5hy25fwhmkndz2z8b9ajhm3c9b"; depends=[magrittr shiny shinyjs]; }; likeLTD = derive2 { name="likeLTD"; version="6.3.0"; sha256="1mjf4667xd9pf2684d7vqaj54l5s9pgljn4vkfp32wzbfknq6y8r"; depends=[DEoptim gdata ggplot2 gtools rtf]; }; @@ -10117,7 +10544,8 @@ in with self; { likelihoodAsy = derive2 { name="likelihoodAsy"; version="0.51"; sha256="0qxwdf6npyj926zd2pbfscgz1z01hwgm6099h882d2l1sim2j9g7"; depends=[alabama cond digest nleqslv pracma Rsolnp]; }; likelihoodExplore = derive2 { name="likelihoodExplore"; version="0.1.0"; sha256="13cnql7pbx8qq1j3cfb3lkzzf2k55shpfa0jd00z30ys6imxzcfn"; depends=[lazyeval plyr]; }; likert = derive2 { name="likert"; version="1.3.5"; sha256="0c4irxs7pp1z8nj4s8cq23daw4h94n3h7x4f6q1d85614qcl9l3p"; depends=[ggplot2 gridExtra plyr psych reshape2 xtable]; }; - lillies = derive2 { name="lillies"; version="0.2.7"; sha256="167hlqj9ivsjxhlfv3z1c017iqbj08aig86ncrk9inpqj3zvkyxy"; depends=[ddpcr dplyr knitr pracma progress rlang survival tidyr]; }; + lilikoi = derive2 { name="lilikoi"; version="2.0.3"; sha256="1sk98bmwdh9a4c07b3sbmyqrgcsgnz13x6id6irv47dr298qs07a"; depends=[car caret dplyr gbm ggplot2 glmnet h2o impute infotheo limma M3C Metrics MLmetrics pathifier pathview plyr preprocessCore pROC RCy3 reshape reticulate RWeka scales stringr survival survminer]; }; + lillies = derive2 { name="lillies"; version="0.2.8"; sha256="154xjnd64icgjjlp68h6fv8fx8z15kdp2frgdqw5cxpchh3jw6pp"; depends=[ddpcr dplyr knitr pracma progress rlang survival tidyr]; }; limSolve = derive2 { name="limSolve"; version="1.5.6"; sha256="1829rd2cnd8qj80z9a7sgc7gx4sf3kvl5g6d2a0lqqw30f9sjzmr"; depends=[lpSolve MASS quadprog]; }; lime = derive2 { name="lime"; version="0.5.1"; sha256="021wz43dfc3f2k275c98hcnnx7dyyjj18dm2zf8vh7rbk9bnf0sj"; depends=[assertthat ggplot2 glmnet gower htmlwidgets Matrix Rcpp RcppEigen shiny shinythemes stringi]; }; limitplot = derive2 { name="limitplot"; version="1.2"; sha256="0wj1xalm80fa5pvjwh2zf5hpvxa3r1hnkh2z9z285wkbrcl0qfl2"; depends=[]; }; @@ -10132,16 +10560,17 @@ in with self; { lineartestr = derive2 { name="lineartestr"; version="1.0.0"; sha256="0bzsywk97j2mmsi7pj9267za1q2601crynh9kszwj6xjbg08nvsm"; depends=[dplyr forecast ggplot2 Matrix readr sandwich tidyr viridis]; }; linemap = derive2 { name="linemap"; version="0.1.0"; sha256="0qkbmpfr742xbs3xn5ppx6q0prwrr9mk1c1mv050cm47dm7jcs6l"; depends=[sf]; }; lineqGPR = derive2 { name="lineqGPR"; version="0.1.1"; sha256="180rvmpasdw8r3w5lw6dxg5jkj875dklvifi2msyp0vaq1nbpbwp"; depends=[broom ggplot2 MASS Matrix mvtnorm nloptr plot3D purrr quadprog tmg TruncatedNormal]; }; - lineup = derive2 { name="lineup"; version="0.37-11"; sha256="0lk2wm8wsaaxw3j7yvmg6qif0r0s1jlwqyg73d3xjnjhxgy03zp4"; depends=[class qtl]; }; - lingtypology = derive2 { name="lingtypology"; version="1.1.3"; sha256="15l9c51xikhkykcmbnkaahlcpmd9gzyjwvnpz6dg75sh5lgpx5lp"; depends=[leaflet leaflet_minicharts stringdist]; }; + lineup = derive2 { name="lineup"; version="0.38-3"; sha256="15m90cg700lq1w54adkmld876fpr41nhv1y0vqwbhwwfjgfxj700"; depends=[class qtl]; }; + lineup2 = derive2 { name="lineup2"; version="0.2-5"; sha256="0yb7nh86gzjwr44prsg50zgdh9sac2zcnf6fiksdisqsc7v21b5q"; depends=[Rcpp]; }; + lingtypology = derive2 { name="lingtypology"; version="1.1.4"; sha256="04pfgnwfywfwzw3xgi0xd5mi9dgjgj65i32hm5b8zjj5pamk9hcv"; depends=[leaflet leaflet_minicharts stringdist]; }; linguisticsdown = derive2 { name="linguisticsdown"; version="1.2.0"; sha256="1y2g8h0p4q4mjrawzyprsdw8ynqcbpnjypyhdaf03pcwqglcirkl"; depends=[DT knitr magrittr miniUI rstudioapi shiny stringr]; }; - link2GI = derive2 { name="link2GI"; version="0.4.3"; sha256="1f6pp8cw2cgg669dwgbsmcbq870y5v5qjbdkrrxzfxbyk4j24fqx"; depends=[devtools R_utils raster roxygen2 sf stringr]; }; - linkR = derive2 { name="linkR"; version="1.1.1"; sha256="1748r7s5g0gvsmghrb7l5lmdbzb9f4vkbgj51v308jr64r1k7l93"; depends=[svgViewR]; }; - linkcomm = derive2 { name="linkcomm"; version="1.0-12"; sha256="04725prwikkzqjq8say8b7f1k5z2c5qzsmsflynp1my893dlal0j"; depends=[dynamicTreeCut igraph RColorBrewer]; }; + link2GI = derive2 { name="link2GI"; version="0.4-5"; sha256="0vmmhalxazny0j871fwbh0z21b63wang69l2wkpw3awkn3fsaqz4"; depends=[devtools R_utils raster roxygen2 sf stringr]; }; + linkcomm = derive2 { name="linkcomm"; version="1.0-13"; sha256="1247pjx7dnlghhgm5jj1ck2hp44z1i0syfk62h8dslx19pwaznb3"; depends=[dynamicTreeCut igraph RColorBrewer]; }; linkim = derive2 { name="linkim"; version="0.1"; sha256="0yvyid9x59ias8h436a202hd2kmqvn8k1zcrgja2l4z2pzcvfn91"; depends=[]; }; linkprediction = derive2 { name="linkprediction"; version="1.0-0"; sha256="0p2abdq6ad689236w2d0khlycpjgy6j7xrlb96ngl6csgxwm07bl"; depends=[igraph intergraph]; }; linkspotter = derive2 { name="linkspotter"; version="1.3.0"; sha256="0fwkbz84vq0v5n5xgv1n99ph7qdz08hjj46ac4q293zarg1xk328"; depends=[dplyr energy ggplot2 infotheo mclust minerva pbapply rAmCharts shiny shinybusy tidyr visNetwork]; }; linl = derive2 { name="linl"; version="0.0.4"; sha256="1wq0wm3k12sfvg0nzdsdxb4qc79kny7qvckxplfgaj6y62vcjxxl"; depends=[knitr rmarkdown]; }; + linne = derive2 { name="linne"; version="0.0.2"; sha256="19x13hf3skvxihlpa8wy05vlc94yv7nfs8b1pr8br76wk1xdkjvx"; depends=[cli magrittr purrr R6 rlang shiny]; }; linpk = derive2 { name="linpk"; version="1.0"; sha256="14l3vv507z7x63ziynp07902599syah0icvzq4rxfjf48bf96l63"; depends=[mvtnorm]; }; linprog = derive2 { name="linprog"; version="0.9-2"; sha256="1ki14an0pmhs2mnmfjjvdzd76pshiyvi659zf7hqvqwj0viv4dw9"; depends=[lpSolve]; }; lintools = derive2 { name="lintools"; version="0.1.3"; sha256="1wv94j0j89zq15b80x0cylfxar5ajrdrcdn62mkgjij3m8zqs7fa"; depends=[]; }; @@ -10150,24 +10579,25 @@ in with self; { liqueueR = derive2 { name="liqueueR"; version="0.0.1"; sha256="0rpjib0dz39la63gy9bw9gmdfq2fcx40y4y4wcb6ky41qcjdp1nd"; depends=[itertools]; }; liquidSVM = derive2 { name="liquidSVM"; version="1.2.4"; sha256="1fka0jbc200n0il1qbp5nb9819afi11b1ndwqpsd6bhfjgrcga8m"; depends=[]; }; lira = derive2 { name="lira"; version="2.0.1"; sha256="10bjmapnlw5z5cnbdpkwisvjkmk7zi9xqrvgmb5psj317zcxfc2p"; depends=[coda rjags]; }; - lisa = derive2 { name="lisa"; version="0.1.1"; sha256="1i5fbcac24rp8s7z2v23aqy7xv0p610zj5xfb6vscsvhdlvg4w1a"; depends=[]; }; + lisa = derive2 { name="lisa"; version="0.1.2"; sha256="05hijs66jfyr68yvmm1dn262p1k6y4q7f2zvqkfagcb483rhwi53"; depends=[tibble]; }; lisp = derive2 { name="lisp"; version="0.1"; sha256="025sq46277q9i21189cbmx5dnrh5wfshc5k6la1wjilhr1iqf6nj"; depends=[]; }; lisrelToR = derive2 { name="lisrelToR"; version="0.1.4"; sha256="0zicq0z3hhixan1p1apybnf3v5s6v6ysll4pcz8ivygwr2swv3p5"; depends=[]; }; list = derive2 { name="list"; version="9.2"; sha256="1gn0g4qq9rr6vwnwq6525hx7iy3q3vmy3g2v3ba69v4jcdc0a0mx"; depends=[arm coda corpcor gamlss_dist magic MASS mvtnorm quadprog sandwich VGAM]; }; + listArray = derive2 { name="listArray"; version="0.1.1"; sha256="0j8hdsda7p6m1q06mi32yh3wqsdjr77kb8js42nm63dgpfy7mvv5"; depends=[]; }; listWithDefaults = derive2 { name="listWithDefaults"; version="1.2.0"; sha256="1rv9jq9zlr5dm08mimba6ni2p5vkfybrgrqk1alm7y6mqpx56byp"; depends=[assertthat]; }; listarrays = derive2 { name="listarrays"; version="0.3.1"; sha256="0nfpqywq9pl9yj566y0jw0h89g0ppsc614538ns1jc3l5r2myils"; depends=[]; }; listcomp = derive2 { name="listcomp"; version="0.3.0"; sha256="09dazc1s06f2pk696jc64lnhs007hqrjjx6z2m6rrswp8yq1p2p2"; depends=[digest rlang]; }; - listdown = derive2 { name="listdown"; version="0.2.21"; sha256="0cv8vf4v35xkcsj3r8h6vx8y292qs3pjndhbgbb4lx78mfapcw1b"; depends=[crayon yaml]; }; + listdown = derive2 { name="listdown"; version="0.4.1"; sha256="1i7vx71nc3vig73kxwaccdgjr91pa3sbl886qppqz4i3ns3z5vgr"; depends=[crayon yaml]; }; listdtr = derive2 { name="listdtr"; version="1.0"; sha256="08drps03nndpdxswyv8bjm1bcckjav5pjj7fdx3dzyn0v4dfy619"; depends=[ggplot2]; }; listenv = derive2 { name="listenv"; version="0.8.0"; sha256="0ps8bk7zlhbviawrw7vw25skjq81hkk3ijyi6g74dmfqy8zsyapx"; depends=[]; }; listviewer = derive2 { name="listviewer"; version="3.0.0"; sha256="0zirxdj58h43062f68h6nqcgmpnvdglxx3kjbs4i4k0z9wvqhx8r"; depends=[htmltools htmlwidgets shiny]; }; liteq = derive2 { name="liteq"; version="1.1.0"; sha256="0w3w9f6374qwvlrqknavqh9b38n5q1r6aw5zmz5lahvadalwdbwi"; depends=[assertthat DBI rappdirs RSQLite]; }; - litteR = derive2 { name="litteR"; version="0.8.1"; sha256="1q10v7gpnpk6g35rw5sd50fj3syg0hmipv7cgmq456h48by5ffrx"; depends=[dplyr fs ggplot2 purrr readr rlang rmarkdown stringr tidyr tidyselect yaml]; }; - littler = derive2 { name="littler"; version="0.3.11"; sha256="1n3qps9hs9a00z0gksxskbl7ii678wpgjf348gb39a6y7rp4qdk7"; depends=[]; }; + litteR = derive2 { name="litteR"; version="0.8.2"; sha256="07ap8nw703d260n559p455lrxgrkp2j7wy03alxhxm60mni82183"; depends=[dplyr fs ggplot2 purrr readr rlang rmarkdown stringr tidyr tidyselect yaml]; }; + littler = derive2 { name="littler"; version="0.3.12"; sha256="1vyppxfk7wi9ncv7ms1pcmwi8l1h4panqkbkmyc1q5vv47jq6fai"; depends=[]; }; liureg = derive2 { name="liureg"; version="1.1.2"; sha256="1zhc5fs47whjvvwwiivykxfchzbjbldyvdmqh9rp7ccwba2q3956"; depends=[]; }; live = derive2 { name="live"; version="1.5.13"; sha256="1s6yrbwlc4wqszl2yvy1x6d93my18ba8sm8pwfy547cd1x055vig"; depends=[breakDown data_table dplyr e1071 forestmodel ggplot2 gower MASS mlr shiny]; }; livechatR = derive2 { name="livechatR"; version="0.1.0"; sha256="1k0z6q3s9iw962m1lwlx45p95flzl5jg1xh6ng426v9jh1yyrbb2"; depends=[data_table dplyr jsonlite magrittr purrr]; }; - liver = derive2 { name="liver"; version="1.0"; sha256="1czya4rn4bcvdzy7jajzgg765xzskmib9cvis2llk9ca9agwg4hg"; depends=[]; }; + liver = derive2 { name="liver"; version="1.3"; sha256="0xf5r3yknxk7xwjxc9izif0ah6j5kqvn3jghx839h3zh08ral9fg"; depends=[class]; }; ljr = derive2 { name="ljr"; version="1.4-0"; sha256="0jby94ml8w6pwnxbmv6qfjww2myvvnn9vrmlqpdh71dhgp3z35py"; depends=[]; }; llama = derive2 { name="llama"; version="0.9.3"; sha256="1jfypycivih5rps7gik6wk3zqlz2rl14kdib7j513ahs4l261hbx"; depends=[BBmisc checkmate ggplot2 mlr parallelMap plyr rJava]; }; llbayesireg = derive2 { name="llbayesireg"; version="1.0.0"; sha256="0jhkmrjkqfm1flwsbpv6060j6g7cj4ngm0drvrlvsiqpni0k96mh"; depends=[coda ggplot2 llogistic MASS MCMCpack Rcpp rstan StanHeaders]; }; @@ -10181,22 +10611,22 @@ in with self; { lmSupport = derive2 { name="lmSupport"; version="2.9.13"; sha256="0ln5c91mbxkymgnv2nw5m3nrm5bwckpikgb9x1qhmjc55m98wkb8"; depends=[AICcmodavg car gplots gvlma lme4 pbkrtest psych pwr]; }; lmboot = derive2 { name="lmboot"; version="0.0.1"; sha256="1v7a3vlv0187mpg3y3pj7f3pbk1v5n6amw732chy10vdw5nmfkwd"; depends=[evd]; }; lmds = derive2 { name="lmds"; version="0.1.0"; sha256="130azb0nc2wwxv0qi8v5s4rd02p9lc92zwn634pv7b8awbw81i65"; depends=[assertthat dynutils irlba Matrix]; }; - lme4 = derive2 { name="lme4"; version="1.1-23"; sha256="0qh29kqli0l3naylgb6jha6jllx4nwryr3hv9yk37blgyyql5mcr"; depends=[boot lattice MASS Matrix minqa nlme nloptr Rcpp RcppEigen statmod]; }; - lmeInfo = derive2 { name="lmeInfo"; version="0.1.1"; sha256="0d6r7vgsm603xg3bf8jwdbwk6kypkzyzlgzwkpif92m0nd4378bi"; depends=[nlme]; }; + lme4 = derive2 { name="lme4"; version="1.1-26"; sha256="0ls2krph4pfjn45vf9fn3ln3x98s85wxrkvm5pnxyx55n1pnsjrn"; depends=[boot lattice MASS Matrix minqa nlme nloptr Rcpp RcppEigen statmod]; }; + lmeInfo = derive2 { name="lmeInfo"; version="0.1.2"; sha256="0f9q2wqp0qxmrnh3whx4dcb4wd7lj275jx7yb0f5wcv0n0sksfpp"; depends=[nlme]; }; lmeNB = derive2 { name="lmeNB"; version="1.3"; sha256="03khn9wgjbz34sx0p5b9wd3mhbknw8qyvyd5pvllmjipnir63d3q"; depends=[lmeNBBayes numDeriv statmod]; }; lmeNBBayes = derive2 { name="lmeNBBayes"; version="1.3.1"; sha256="13shfsh9x6151xy8gicb25sind90imrwclnmfj96b76p5dvhzabm"; depends=[]; }; lmeSplines = derive2 { name="lmeSplines"; version="1.1-10"; sha256="0fy6hspk7rqqkzv0czvvs8r4ishvs7zsf4ykvia65nj26w7yhyia"; depends=[nlme]; }; lmeVarComp = derive2 { name="lmeVarComp"; version="1.1"; sha256="0m6syydy89c52hhi0w503l5vkgya2d5ps70z5wmdd39nm4jna68w"; depends=[]; }; lmec = derive2 { name="lmec"; version="1.0"; sha256="09shj01h2dl5lh7ch0wayr7qyhlmk0prv3p1vfgy91sn0wpbqlxr"; depends=[mvtnorm]; }; lmem_qtler = derive2 { name="lmem.qtler"; version="0.1.1"; sha256="0qbllj66y294n1m8dsyrnwyvzscbzg8mb2dmjyghcrfaz925vkin"; depends=[lattice lme4 pastecs qtl stringr]; }; - lmerTest = derive2 { name="lmerTest"; version="3.1-2"; sha256="1qkdxx5sri65zgpb9gw4nkfkdam51kgy4hxclk5c40yk7y3p0n1q"; depends=[ggplot2 lme4 MASS numDeriv]; }; + lmerTest = derive2 { name="lmerTest"; version="3.1-3"; sha256="1zd8gqjkazhxgpnnr484xwsq30p62fq8592nzyc171zjyplpbaim"; depends=[ggplot2 lme4 MASS numDeriv]; }; lmeresampler = derive2 { name="lmeresampler"; version="0.1.1"; sha256="13i0crk6agw5pcj3znvxj60jfsmncnir7ahwdczgm7kh08hk0f6l"; depends=[boot dplyr Matrix nlmeU plyr RLRsim]; }; lmf = derive2 { name="lmf"; version="1.2"; sha256="1xqlqmjl7wf5b2s2a1k1ara21v74b3wvwl4mhbj9dkdb0jcrgfva"; depends=[]; }; lmfor = derive2 { name="lmfor"; version="1.5"; sha256="1r301ajcp9ag23n0nw1rgwg8ss5cvinwqargbdg0jpqbhdrgaq7y"; depends=[magic nlme spatstat]; }; + lmkCHK = derive2 { name="lmkCHK"; version="1.0.0"; sha256="0ipz8xvwrw285cdwjpqd1ax7hq180l5npdfarr2qc394jb2rgb1w"; depends=[geomorph Morpho rgl shiny]; }; lmm = derive2 { name="lmm"; version="1.3"; sha256="13b5rvdbzljir1fn4zxv2lshbga64vwzn6884izif9v5dkd5b29j"; depends=[]; }; lmmot = derive2 { name="lmmot"; version="0.1.4"; sha256="1a8msh9yvvd7cv1zxlxdv8arlfvxqghxzcxls23v6ifl5jf4d1p3"; depends=[MASS maxLik]; }; lmmpar = derive2 { name="lmmpar"; version="0.1.0"; sha256="1l3zjmlfjfn2wv4yayqzv6qrwaxk2sgx3hjx371b5fs54zspdj20"; depends=[bigmemory doParallel MASS matrixcalc mnormt plyr]; }; - lmms = derive2 { name="lmms"; version="1.3.3"; sha256="1gralhk9plmpmdya7cfzgzwzr8ab47pz4f76kvlp03sp5gcy4063"; depends=[gdata ggplot2 gplots gridExtra lmeSplines nlme reshape2]; }; lmodel2 = derive2 { name="lmodel2"; version="1.7-3"; sha256="1fiin2nkffbihz1s8ixmw9lgf8mn3j9krr8iiflizk10mdv54hnb"; depends=[]; }; lmom = derive2 { name="lmom"; version="2.8"; sha256="1lnj41gynaar5isyijg5nbll64qdxa12dnqvz7lxhaclqcjskqna"; depends=[]; }; lmomPi = derive2 { name="lmomPi"; version="0.5.0"; sha256="07ggfzgvhc6kkqs8bbs6z01rbhgb0ki2y4li6r0nkiby1wcpx0py"; depends=[lmom stringr]; }; @@ -10204,20 +10634,22 @@ in with self; { lmomco = derive2 { name="lmomco"; version="2.3.6"; sha256="18qpkx601gzy33d9kfrpf6mxxb9z6rkz030cx3drb4w5n6langjb"; depends=[goftest Lmoments MASS]; }; lmreg = derive2 { name="lmreg"; version="1.2"; sha256="02a4nqqcfkjlq21mpk8abd4lj4ib2nps3ndf7zgmzygkd1z0df18"; depends=[MASS]; }; lmridge = derive2 { name="lmridge"; version="1.2"; sha256="091rznzh77bmsv7sw9xmsq6s9pnljyq7qyl74kgcxss718134jr3"; depends=[]; }; - lmtest = derive2 { name="lmtest"; version="0.9-37"; sha256="02nasm0j2vwkhz11dxqixs23msy1s3yj0jps6949fmgh9gwjkjfx"; depends=[zoo]; }; + lmtest = derive2 { name="lmtest"; version="0.9-38"; sha256="0sr19bmw2cpagfvwg772m79wvl1i2hww1xfr69bzr3rr8pm2r8ij"; depends=[zoo]; }; lmtp = derive2 { name="lmtp"; version="0.0.5"; sha256="1bw6sr9hg770w3v26in4hhayi1ghqpxk7za005h65dy6krwkrfhn"; depends=[cli future generics nnls origami progressr R6 slider]; }; lmvar = derive2 { name="lmvar"; version="1.5.2"; sha256="0wrny8yzk5y4mzpri6xv5wibbnbaxm0195lcbk5jrl5l5gs99bn6"; depends=[Matrix matrixcalc maxLik]; }; - lmviz = derive2 { name="lmviz"; version="0.1.2"; sha256="06pl0gzsbpk6l7l5np2c2rv37d2b3mr7qhxd7z4yiqiaffdrmrpz"; depends=[lmtest mgcv shiny shinyjs]; }; + lmviz = derive2 { name="lmviz"; version="0.2.0"; sha256="0sl2k02m5bxkb4jg8y666ln0xxhr4dhsfz9hlp55p9smlhycl5s2"; depends=[car lmtest MASS mgcv rgl scatterplot3d shiny shinyjs]; }; lncDIFF = derive2 { name="lncDIFF"; version="1.0.0"; sha256="012dwrcp0pny59hvzj7mnyyc3nijcjgxc0dyx7ab2fknp9bhs5w8"; depends=[]; }; loa = derive2 { name="loa"; version="0.2.45.4"; sha256="0dcpadv453885a2s8l064zn1xswi2v819154j822jr22kd7bj57v"; depends=[lattice MASS mgcv plyr png RColorBrewer rgdal RgoogleMaps sp]; }; loadr = derive2 { name="loadr"; version="0.1.2"; sha256="1zqg90hxw6c3k3gd0caj8fh5ym3f97gsr9cvi6ndlzqh4957cd5n"; depends=[]; }; lobstr = derive2 { name="lobstr"; version="1.1.1"; sha256="0vkif17825x33cz8r89j0qph4wj5l8fzfgl8nh2g7m2v140cxjdq"; depends=[crayon Rcpp rlang]; }; - locStra = derive2 { name="locStra"; version="1.4"; sha256="0a9470cf78w0js7i93zgrih0vcb0kxf2vjj0a0p87zpr0h0xd9p6"; depends=[Matrix Rcpp RcppEigen Rdpack]; }; + locStra = derive2 { name="locStra"; version="1.6"; sha256="1jwxhfghis2k9pckqdnaffm10y9nv80ns7jpbfmhgmcava16ilsf"; depends=[Matrix Rcpp RcppEigen Rdpack RSpectra]; }; + localFDA = derive2 { name="localFDA"; version="1.0.0"; sha256="099hqnd0q4ylg03qi7icc6a9w1x7p76vlv5wxk8f53l7y9pp27b3"; depends=[]; }; localICE = derive2 { name="localICE"; version="0.1.1"; sha256="1pyq6kdahsy9qa0jzmring48r0i9h4rkp8lxpf9afksgm1qn0c5z"; depends=[checkmate ggplot2]; }; localIV = derive2 { name="localIV"; version="0.3.1"; sha256="1z3q5hk6qfc1pzqdrxwm8y3am27648lfz66lm84bf8abifw4kk60"; depends=[KernSmooth mgcv rlang sampleSelection]; }; localModel = derive2 { name="localModel"; version="0.3.12"; sha256="1yg61zia8gqgzbg33k6q43ni04cj6y9l3k8vdcw8j1qzasnhz0b2"; depends=[ggplot2 glmnet ingredients partykit]; }; localgauss = derive2 { name="localgauss"; version="0.40"; sha256="0y0pcg2i7lr4wipxawn06hy0q11znhcn2ah6rqwnlyy8pab70pyq"; depends=[foreach MASS matrixStats]; }; localsolver = derive2 { name="localsolver"; version="2.3"; sha256="1d18rihzqf1f5j9agfp8jysll7lqk1ai23hkdqkn6wwxj442llv4"; depends=[]; }; + locationgamer = derive2 { name="locationgamer"; version="0.1.0"; sha256="0y99m003s177x57m4ynxd8jd2xzl5zb4bj7jnbc04h22ffdl6m6f"; depends=[]; }; locfdr = derive2 { name="locfdr"; version="1.1-8"; sha256="1falkbp2xz07am8jlhwlvyqvxnli4nwl188kd0g58vdfjcjy3mj2"; depends=[]; }; locfit = derive2 { name="locfit"; version="1.5-9.4"; sha256="1vcw16qww4v4547w0gfvhqg60l051bsdlxa6zfcgcj9xbxf6dlyr"; depends=[lattice]; }; locits = derive2 { name="locits"; version="1.7.3"; sha256="0sjnwqiqwzdkglvbdxbkg17gjp0vyqvywsy0qq7adxj5hh0yah05"; depends=[igraph wavethresh]; }; @@ -10241,16 +10673,17 @@ in with self; { logging = derive2 { name="logging"; version="0.10-108"; sha256="13gd40ygx586vs6xcp6clg69a92aj8zxlk1rn3xzkx8klfjimjc5"; depends=[]; }; loggit = derive2 { name="loggit"; version="2.1.0"; sha256="1ikzrzqsmn8436dimr88mdmvpqmq5wxfjdiy4hj5939wjnx4jnnm"; depends=[]; }; logiBin = derive2 { name="logiBin"; version="0.3"; sha256="06y5bqm3j6xdr1cd607v2sqkghnd2bv6bvxc6cz8dvp8jabqa0zm"; depends=[data_table doParallel foreach iterators partykit]; }; + logib = derive2 { name="logib"; version="0.1.0"; sha256="0n15rsqlnqnwx9wc5wr78c6qpzwwnp8xcdlyffjqv56gjdqa1420"; depends=[lubridate readxl]; }; logihist = derive2 { name="logihist"; version="1.0"; sha256="1q3322rh3g31c5i80aw54pln0m1jgxmbx30cn31nlh3ijkvnpq9a"; depends=[ggplot2]; }; - logistf = derive2 { name="logistf"; version="1.23"; sha256="0f1qn7q3h0qg2qdiz69ab03qvl4xhizqg304vjak72390nj25nss"; depends=[mgcv mice]; }; + logistf = derive2 { name="logistf"; version="1.24"; sha256="0syrg4v1cik0vn2h7452n84nbpdbhs5h0g5k9jaqkdr1zq8x6qb5"; depends=[formula_tools mgcv mice]; }; logistic4p = derive2 { name="logistic4p"; version="1.5"; sha256="0h0dxyklqc95ykyril1a3d2bdnszj5l9dqbxzh2wbfmk06prvh8b"; depends=[MASS]; }; logisticPCA = derive2 { name="logisticPCA"; version="0.2"; sha256="07ikyn127ld0fjdw7x911wrswqwqpw4lbcz0iffvh6jfjkgyk341"; depends=[ggplot2]; }; logisticRR = derive2 { name="logisticRR"; version="0.3.0"; sha256="0i9x7rynxcybdnjqbjsny8jsl96mivzdazdgmcg72qrv8qfwpszl"; depends=[nnet]; }; logitnorm = derive2 { name="logitnorm"; version="0.8.37"; sha256="1a9plxsxy29j9xpvwsznbbj150h9daay5zfzlmkh5y0f7f15w3a9"; depends=[]; }; loglognorm = derive2 { name="loglognorm"; version="1.0.1"; sha256="0rhx769a5nmidpbpngs2vglsbkpgw9badz3kj3jfmpj873jfnbln"; depends=[]; }; - logmult = derive2 { name="logmult"; version="0.7.1"; sha256="0y9z5l93hm8p3r1rd6g11miqg1a02b9hy5mgcxv2q0hm1pg2vh0q"; depends=[gnm qvcalc]; }; + logmult = derive2 { name="logmult"; version="0.7.3"; sha256="10dmvvwlaw8dn6h0343d8apn7rlc2b8nys3f38x9wlvd9xhhlwxm"; depends=[gnm qvcalc]; }; lognorm = derive2 { name="lognorm"; version="0.1.6"; sha256="05a6djz06jblnx51x2r5gwb57l4wq6giz6kknsslzsl64xj275z1"; depends=[Matrix]; }; - logr = derive2 { name="logr"; version="1.1.0"; sha256="1cbh73yfmdb2mg3y111ranb9p9ac30xlril3fspj2i2nv3svjivm"; depends=[]; }; + logr = derive2 { name="logr"; version="1.1.1"; sha256="0a0hpcs26byj3fgssk4v06na066jqfrdgr7zwamxj3z243106y8h"; depends=[]; }; logspline = derive2 { name="logspline"; version="2.1.16"; sha256="12hkdi77vkic05p2vhap025xdcg1n53ywm239v18713pihdlj63l"; depends=[]; }; lokern = derive2 { name="lokern"; version="1.1-8.1"; sha256="1z9bg10ppj0gpsazdh2mcbbd374075bm30p9dmr71mb87vxrk2r3"; depends=[sfsmisc]; }; lolR = derive2 { name="lolR"; version="2.1"; sha256="0lrmn9lzyyfr1y0i7qp6xfpdxyisbkajwg0jkrqkiw687psnh2rc"; depends=[abind ggplot2 irlba MASS pls robust robustbase]; }; @@ -10266,18 +10699,18 @@ in with self; { longmemo = derive2 { name="longmemo"; version="1.1-2"; sha256="01rj5x9cgscsrakbx9155mbvs35fd3j484cfz5cds9vl521fjr3r"; depends=[]; }; longpower = derive2 { name="longpower"; version="1.0-21"; sha256="0095jml46lchyp17gsqpjabq80xjddlvd4ir8y2jsg8sgd3pc8vs"; depends=[lme4 nlme]; }; longurl = derive2 { name="longurl"; version="0.3.3"; sha256="16r6gzyfy7aq8sqdzvc6wqinfp0yj46bsz4yg8n3jf0jdyx0zrc8"; depends=[httr]; }; - loo = derive2 { name="loo"; version="2.3.1"; sha256="12z0k8lhz0rxygs5lc7076nw6qhk0pda8nxf65hkinfrf4dy53fr"; depends=[checkmate matrixStats]; }; + loo = derive2 { name="loo"; version="2.4.1"; sha256="0l2v8zpashqbnck3qx5lp1gqjcfphzky8mxyw5gfk9wk99mzn8dw"; depends=[checkmate matrixStats]; }; lookupTable = derive2 { name="lookupTable"; version="0.1"; sha256="0ipy0glrad2gfr75kd8p3999xnfw4pgpbg6p064qa8ljqg0n1s49"; depends=[data_table dplyr]; }; loon = derive2 { name="loon"; version="1.3.1"; sha256="0l9cz4cw8i329rajz9vlm54ajxwx899h9jp9yqjr92ijh2x3il6d"; depends=[gridExtra]; }; - loon_data = derive2 { name="loon.data"; version="0.1.0"; sha256="197lmwmlkmmhyn16himc3cdpiqznqr2sg5vz1a00ipypxnhax1pl"; depends=[]; }; + loon_data = derive2 { name="loon.data"; version="0.1.1"; sha256="0gcplk8qx6qm36cnxvvka1rfsjd38bhlnjvx405h0z9ivwlidsc5"; depends=[]; }; loon_ggplot = derive2 { name="loon.ggplot"; version="1.0.1"; sha256="161i99nm5csfq7wvr941a4dr544b1qwma0zlnrlcsbsnixyk3a0w"; depends=[dplyr GGally ggplot2 gridExtra loon magrittr rlang stringr]; }; loop = derive2 { name="loop"; version="1.1"; sha256="1gr257fm92rfh1sdhsb4hy0fzwjkwvwm3v85302gzn02f86qr5dm"; depends=[MASS]; }; - loopr = derive2 { name="loopr"; version="1.0.1"; sha256="1qzfjv15ymk8mnvb556g2bfk64jpl0qcvh4bm3wihplr1whrwq6y"; depends=[dplyr lazyeval magrittr plyr R6]; }; loose_rock = derive2 { name="loose.rock"; version="1.0.16"; sha256="0vk9zmiy730c1d397v5p7v8ywjv1wv9vabmhdjyrfdx7bijfy57m"; depends=[digest dplyr futile_options ggplot2 MASS reshape2]; }; lordif = derive2 { name="lordif"; version="0.3-3"; sha256="1yby9fvzdi1dzvzp6d6h144k1p9nfacd8l5bd66dmhnc8sp2nlx5"; depends=[mirt rms]; }; lorec = derive2 { name="lorec"; version="0.6.1"; sha256="0mgypd8awixh1lzbh5559br4k7vi3pfmwniqhgh68wc06sc6bn65"; depends=[]; }; - lorentz = derive2 { name="lorentz"; version="1.0-2"; sha256="0napn1j6gwilskjnv2hjrxzrbcbh7cvfj578h0la9bpkm1xhi7di"; depends=[emulator magrittr tensor]; }; - lori = derive2 { name="lori"; version="2.2.0"; sha256="1jsnfrkn6zn20gs8qhw5znfzaqp9j274yfqajcgfvy916j50acac"; depends=[data_table rARPACK svd]; }; + lorentz = derive2 { name="lorentz"; version="1.0-5"; sha256="1py2s4x6vnlyyf5fnwbhws00dmf5qyzmx8wza337w3nzxkr6ns6b"; depends=[emulator magic magrittr tensor]; }; + lorenz = derive2 { name="lorenz"; version="0.1.0"; sha256="1zclxjr1ya4rc48hm8a1s6ayr4yvjydgwwsi4fwg3qqf4mspa2dl"; depends=[dineq magrittr]; }; + lori = derive2 { name="lori"; version="2.2.2"; sha256="1153ilp1i849rwbbms4vfc6c1mxgpav04zfqm2sdj7s63nvknx6r"; depends=[data_table rARPACK svd]; }; lotri = derive2 { name="lotri"; version="0.2.2"; sha256="069by47cw38pwa70fjy7p1pi1pany04p1idjkifdyblmqqdhw0rh"; depends=[]; }; lowmemtkmeans = derive2 { name="lowmemtkmeans"; version="0.1.2"; sha256="08zhdw48rzw47yzhg4s37bkliyngxs46cyb57dvng1s3m0w0dhvi"; depends=[Rcpp RcppArmadillo]; }; lowpassFilter = derive2 { name="lowpassFilter"; version="1.0-0"; sha256="1f05z18nn3184rksmsarfz79bxn3gj760f1z9h5h3agqc180krm3"; depends=[Rcpp]; }; @@ -10285,7 +10718,7 @@ in with self; { lpSolveAPI = derive2 { name="lpSolveAPI"; version="5.5.2.0-17.7"; sha256="1fsmipb97gglihrf424mz063fn67bf55jjahnbh53svkmm2qxg4y"; depends=[]; }; lpbrim = derive2 { name="lpbrim"; version="1.0.0"; sha256="1cbkzl23vgs9hf83ggkcnkmxvvj8867k5b9vhfdrznpqyqv1f2gp"; depends=[Matrix plyr RColorBrewer]; }; lpc = derive2 { name="lpc"; version="1.0.2.1"; sha256="1g1dzm7pcrbrdk1dmhbdhj58j69dzar41al3i8q4gysf3adqzsvv"; depends=[]; }; - lpdensity = derive2 { name="lpdensity"; version="2.0"; sha256="0zqrpps909x00sm9bhg1xh4sqy4lamn5qmad37v6zn0hw1hjvcpi"; depends=[ggplot2 MASS]; }; + lpdensity = derive2 { name="lpdensity"; version="2.1"; sha256="1i3b2c64kfn3k0cflygfnahwr31g0095s5x5zyw8afj7pnmnl94f"; depends=[ggplot2 MASS]; }; lpint = derive2 { name="lpint"; version="2.0"; sha256="0p1np8wlfbax0c7ysc5fs9dai8s00h1v0gan89dbd6bx06307w2r"; depends=[]; }; lpirfs = derive2 { name="lpirfs"; version="0.1.9"; sha256="102r6avaliw1a8cj8zjn74i40gqfbxwjizplqlp2y9ik5q32g2yg"; depends=[doParallel dplyr foreach ggplot2 ggpubr gridExtra lmtest plm Rcpp RcppArmadillo sandwich]; }; lplyr = derive2 { name="lplyr"; version="0.1.12"; sha256="1wcab8wwdzpgb61q83gfn2d34vsrd3qa4xyb9sqna6krss1ii1in"; depends=[bazar dplyr lazyeval magrittr]; }; @@ -10293,16 +10726,17 @@ in with self; { lpmodeler = derive2 { name="lpmodeler"; version="0.2-1"; sha256="17k67l03dkjx61p4hwswghjm6awk0zx173x9xafxrfd8jrgsf6kf"; depends=[slam]; }; lpridge = derive2 { name="lpridge"; version="1.0-8"; sha256="0jk4l95z9rcdqkc8lpp4sf1mg2dqj67rhqw1iafrxy5lx4jfaqqx"; depends=[]; }; lqmm = derive2 { name="lqmm"; version="1.5.5"; sha256="15kyfpbvdgyxl6gjqinx79zq03axg36qgaqfc6zq4blyjlhj6i3c"; depends=[nlme SparseGrid]; }; - lqr = derive2 { name="lqr"; version="2.11"; sha256="1h82031cq4h4syjx33zk2a2fixqa2bmrcnmh28knhm8agvb9yyxv"; depends=[numDeriv spatstat]; }; + lqr = derive2 { name="lqr"; version="3.31"; sha256="0c7ah2sacgyinzpsffng47zfg27izgjcmvdw4qvbllxgk5kb3jfm"; depends=[MomTrunc numDeriv quantreg spatstat]; }; lrequire = derive2 { name="lrequire"; version="0.1.3"; sha256="03c8h9v2xhlv7bj5jv117a27gaqaly2kdxs9zyihsm9yh9rg3d79"; depends=[]; }; lrgs = derive2 { name="lrgs"; version="0.5.4"; sha256="0mf6wqlv21z68w81hvpmhgngvdsklf3x2678d9c9lxfmqmpv4a7y"; depends=[mvtnorm]; }; lrmest = derive2 { name="lrmest"; version="3.0"; sha256="1yddkgza672z9y0ipgl92pg9prhmr387zsqf0qbi9k2yzfz2vvs6"; depends=[MASS psych]; }; lsa = derive2 { name="lsa"; version="0.73.2"; sha256="1a33irqa6qvbc02z12rgbgv8kxq2gmahy7j5bg8b23lvvaxif06b"; depends=[SnowballC]; }; - lsasim = derive2 { name="lsasim"; version="2.0.1"; sha256="0nbffcgn8wkz07qs8ai3xwx11wfq6qcf95hjqmy4kdkf2k603mm5"; depends=[mvtnorm]; }; + lsasim = derive2 { name="lsasim"; version="2.0.2"; sha256="12v5g7nhip46647al5l1k968yxp474988ja90v0s3p0rrh02l1rq"; depends=[mvtnorm]; }; lsbclust = derive2 { name="lsbclust"; version="1.1"; sha256="1pbai58pfvhfcrd0nj13d54vrn9wrx2xapqhgqa1pkrjwbk5amj7"; depends=[clue doParallel foreach ggplot2 gridExtra mvtnorm plyr Rcpp reshape2]; }; lsbs = derive2 { name="lsbs"; version="0.1"; sha256="14aq80zg89lq7hffv1v1m4n7hbzqzxkazcga4y2fq40ij3v7kv6n"; depends=[ks Matrix numDeriv]; }; lsdbc = derive2 { name="lsdbc"; version="0.1.0"; sha256="1dk07zlvwwfhlll21ql264gx94v3jvgidy3yvxidwmhnyc1vx80x"; depends=[]; }; lsdv = derive2 { name="lsdv"; version="1.1"; sha256="0rl1xszr9r8v71j98gjpav30n2ncsci19hjlc9flzs1s20sb1xpr"; depends=[]; }; + lsei = derive2 { name="lsei"; version="1.3-0"; sha256="1dka0rigfw4vj809qma2dkiwjb3nw5635ynnba5cm299cn7hb2b2"; depends=[]; }; lshorth = derive2 { name="lshorth"; version="0.1-6"; sha256="0nbjakx0zx4fg09fv26pr9dlrbvb7ybi6swg84m2kwjky8399vvx"; depends=[]; }; lsl = derive2 { name="lsl"; version="0.5.6"; sha256="1hwzklx1qp5ljc059j2hridg3caw4cgn7rbqs8xh2arzcvqdw3rb"; depends=[ggplot2 lavaan reshape2]; }; lslx = derive2 { name="lslx"; version="0.6.10"; sha256="189gpp1ikcp5ld4avipwckdz997v1cx2zas5a8b54nv246kb5hmd"; depends=[ggplot2 lavaan R6 Rcpp RcppEigen]; }; @@ -10324,7 +10758,8 @@ in with self; { ltsk = derive2 { name="ltsk"; version="1.0.8"; sha256="1ykgz5cas924kmq9ak2j8vhr7gg9s458qarqkmyg9wdfj1srqi7p"; depends=[fields gstat sp]; }; ltsspca = derive2 { name="ltsspca"; version="0.1.0"; sha256="0hgl2zd8y01z8mhnqg1hlv1l7klpwhwk7q8b99pw9vgnh1f2gnfs"; depends=[pracma Rcpp RcppArmadillo]; }; ltxsparklines = derive2 { name="ltxsparklines"; version="1.1.2"; sha256="1jnygg7wm2768lrrzball8rn8f60xy4nc3a18h4d32jpnbhifj13"; depends=[]; }; - lubridate = derive2 { name="lubridate"; version="1.7.9"; sha256="0wnjzvfkrgp2hkr8g5r5vcgcxmsq8bhdmkzkk0m93wr3fgh5xyfb"; depends=[generics Rcpp]; }; + lubridate = derive2 { name="lubridate"; version="1.7.9.2"; sha256="0yfvlgksasmia7rsp83lsipjpgvlly5qkldcfxj68lfaz9l2sspf"; depends=[generics Rcpp]; }; + lucas = derive2 { name="lucas"; version="1.0"; sha256="1ws35f2pq2y7nnik40nj4qpz1d499gfc5isr1409pwy6r5knb78q"; depends=[DBI plyr rpostgis RPostgreSQL]; }; lucid = derive2 { name="lucid"; version="1.7"; sha256="0hrb8qlm8g4h1ziwxq7m53pf7g8fxhcb2xryavm6rniqpcx8yb7g"; depends=[nlme]; }; ludic = derive2 { name="ludic"; version="0.1.8"; sha256="1yvv3h7arm8hp89j9nr5vdl8ahxcpggi2qq431l7xbw9jka41qdp"; depends=[fGarch landpred Matrix Rcpp RcppArmadillo]; }; lue = derive2 { name="lue"; version="0.2.1"; sha256="0is5rd1dz91bzphmfbbzi3s6rgc5g9qza2r26k70xs67dgn0qbjq"; depends=[ncdf4 raster]; }; @@ -10355,18 +10790,19 @@ in with self; { mMPA = derive2 { name="mMPA"; version="1.2.0"; sha256="0g4zjknz52fpk7f436j95aw93aa8q2jwcrb1pqkm294kr276nnd9"; depends=[]; }; mQTL = derive2 { name="mQTL"; version="1.0"; sha256="0k80xvkr0b0mp3bj2s558fjxi2zf4k7ggnw6hsjm8lr84i108dks"; depends=[MASS outliers qtl]; }; mRMRe = derive2 { name="mRMRe"; version="2.1.0"; sha256="1m41859sa0nd4hdnsq3ir337834cpmgg564f6ph57dmmwz0wa8zy"; depends=[igraph survival]; }; - mRpostman = derive2 { name="mRpostman"; version="0.3.1"; sha256="0jghbqszf56xp3kvx9rcf11bj0j46hh3xgzvaihbpb67lcj8mvyw"; depends=[assertthat base64enc curl magrittr stringr]; }; + mRpostman = derive2 { name="mRpostman"; version="1.0.0"; sha256="1zcfkzsqfhlxmqyvz3n4lssvi2pg3q7x84y6khqlgwncg3bhp56x"; depends=[assertthat base64enc curl magrittr R6 rvest stringi stringr xml2]; }; mSTEM = derive2 { name="mSTEM"; version="1.0-1"; sha256="0mh09mqqpq9k8jrxs9d39009idld3b4y98ik75czdy580jmdg7mm"; depends=[doParallel foreach latex2exp]; }; mSimCC = derive2 { name="mSimCC"; version="0.0.1"; sha256="1f15r214srcdb4yacmy4hq890a674iqd2s7bry5dk20k46qdl026"; depends=[doParallel foreach]; }; - mStats = derive2 { name="mStats"; version="3.2.2"; sha256="0bvv2133813qfqbqx45x7g3h82jkz8b322ldjj89x2wxc7alwmhs"; depends=[]; }; - maGUI = derive2 { name="maGUI"; version="2.4"; sha256="0wzg6fsig51q0mh5cd3kkshz45sqn8qcw0zf3pnq58x9ml9hc59l"; depends=[affy amap annotate beadarray Biobase BiocManager Biostrings cairoDevice Category convert genefilter GEOmetadb GEOquery globaltest GO_db GOstats graph gWidgets2 gWidgets2RGtk2 impute KEGGgraph KEGGREST limma lumi marray oligo pdInfoBuilder RBGL Rgraphviz RGtk2 RSQLite simpleaffy ssize WGCNA]; }; - maSAE = derive2 { name="maSAE"; version="2.0.1"; sha256="0c7vs0pc4yva726g2vly07r1dnf4ahdkdkq6y6ni0d1hgz296w87"; depends=[]; }; + mStats = derive2 { name="mStats"; version="3.4.0"; sha256="196fjnld26dmirga4mghlvsrj4fgnw08wdg77masxm15kpvm1x1d"; depends=[]; }; + maGUI = derive2 { name="maGUI"; version="3.0"; sha256="1ak2sa6y766v5zh54bf7j9hklmkia40nsdchyw834ybb9ijjyjsm"; depends=[Biobase gWidgets2 gWidgets2RGtk2 impute limma Rgraphviz RGtk2 ssize]; }; + maSAE = derive2 { name="maSAE"; version="2.0.2"; sha256="0vdbcifg0ilhrayamf7khdfmxzpns8rx5a3i8dsa2iwhsn7kwg5m"; depends=[]; }; mable = derive2 { name="mable"; version="2.1.1"; sha256="14bjyij9m86bha1g79aay6x127aq6pqw3hgdklf943inggqb3ava"; depends=[aftgee icenReg survival]; }; maboost = derive2 { name="maboost"; version="1.0-0"; sha256="18d36cgvn8p75nidfr6al458jbzwc1i7x77y1ks50y9phrz3wf65"; depends=[C50 rpart]; }; macc = derive2 { name="macc"; version="1.0.1"; sha256="1qj4mlikbqrxa6m46527xmxdbk7b3l95z6jdgpmi0ifywjiv52a4"; depends=[car lme4 MASS nlme optimx]; }; machQA = derive2 { name="machQA"; version="0.1.4"; sha256="1rdrjy9sxql2c9y691a1jrmgsv7m1ihsschixxb6wc7aahf7mav6"; depends=[machina plyr]; }; machina = derive2 { name="machina"; version="0.1.6"; sha256="009mzqb5jgnilj9b5ldmm5600008bljlqacm8jjxvqsfnfdfg8zv"; depends=[DT httr jsonlite lubridate rhandsontable xts]; }; macleish = derive2 { name="macleish"; version="0.3.6"; sha256="0n33di2f42b2gn8qhs49j8f99l8qgxzb9lqnv50hc9zxgli5ds1v"; depends=[dplyr etl lubridate readr sf]; }; + maczic = derive2 { name="maczic"; version="0.1.0"; sha256="1wa63j718jd4k11x5fhgbnn9f2wayvpvg5670r8911qmciy5n5lw"; depends=[BB emplik MASS mathjaxr mediation pscl sandwich survival]; }; mada = derive2 { name="mada"; version="0.5.10"; sha256="1hllv371dm307nkpld0aszjyxfgnajr7gb9zwh40pyzw4q4a2rqb"; depends=[ellipse mvmeta mvtnorm]; }; maddison = derive2 { name="maddison"; version="0.1"; sha256="1ji51wnj0ybjd30b4bwn5npyswrmcfrbxcmdlngwzvca1knh8g1c"; depends=[]; }; maditr = derive2 { name="maditr"; version="0.7.4"; sha256="1b7vvg03xfcmizahlnjbxk67xmmgqi96bvp16d135jqgfijmg35f"; depends=[data_table magrittr]; }; @@ -10375,16 +10811,15 @@ in with self; { madrat = derive2 { name="madrat"; version="1.64.5"; sha256="1gccfpzbm5cq9q288k86mq0madh8x9nhw06hrrcfjj5waqhi30lj"; depends=[assertthat digest magclass rlang spam stringr]; }; mads = derive2 { name="mads"; version="0.1.6"; sha256="0nz1fg3gyj72k6dpkjnwqjvps0inv1qgk5vlc8ycj3k720qcsd81"; depends=[mrds]; }; madsim = derive2 { name="madsim"; version="1.2.1"; sha256="11gfyimbz363p5xy1x6rsz5fcgzcr55myc5aaz5lazjkcnfn17aq"; depends=[]; }; - mafs = derive2 { name="mafs"; version="0.0.3"; sha256="1apacrk8y5b5ids62vd1kn2k28bya9pydxxmdw2dhjyzkgrakdhn"; depends=[cmprsk colorspace CombMSC Epi etm forecast forecastHybrid fracdiff ggplot2 ggseas gtable munsell numDeriv plyr quadprog Rcpp scales tictoc tidyr timeDate tseries zoo]; }; - magclass = derive2 { name="magclass"; version="5.7.3"; sha256="072hcp9m80c1r2vdhk6xp9gpbmiljpslalzh1i9hh7h7hgvp0bj7"; depends=[abind maptools reshape2 sp]; }; + magclass = derive2 { name="magclass"; version="5.15.6"; sha256="020m4782f0an10d16qqzv1wmh4gz6cnfhcs7k0qlvflhbij25jw5"; depends=[abind data_table forcats maptools sp]; }; magic = derive2 { name="magic"; version="1.5-9"; sha256="0snmdh6vk0p6ar1swsihisinxrx7l8371dri5lk0z24ysgr5w7gs"; depends=[abind]; }; magicLamp = derive2 { name="magicLamp"; version="0.1.0"; sha256="1nfcnbqd6vawz8l3vgkbhmm462xdvaa4pn6axzmz8hl05xv2k3cv"; depends=[httr tibble]; }; - magicaxis = derive2 { name="magicaxis"; version="2.0.10"; sha256="053l455si22mddc5cgihhnpkmxr2anfqvbzsa89djjpw5ah2vg1x"; depends=[celestial mapproj MASS plotrix RColorBrewer sm]; }; + magicaxis = derive2 { name="magicaxis"; version="2.2.1"; sha256="1ba8psg3ja8b69s1afywsjz5sfljryhk5vvq1n4dzm1gsz6c772l"; depends=[celestial mapproj MASS plotrix RANN RColorBrewer sm]; }; magicfor = derive2 { name="magicfor"; version="0.1.0"; sha256="07l33fczr1x42sfxrsqq4q6r65sdflin6l8f5cgclnvx1858jdip"; depends=[]; }; - magick = derive2 { name="magick"; version="2.4.0"; sha256="1y1p2blkg0h6061ay7mdwssxbswgrc25raffp6d8d9cqhdmsa72s"; depends=[curl magrittr Rcpp]; }; + magick = derive2 { name="magick"; version="2.5.2"; sha256="0myvryya7b4bbw0hs4jqflrbdffmg78kz28gbybw3yc7zwc7sqxx"; depends=[curl magrittr Rcpp]; }; magickGUI = derive2 { name="magickGUI"; version="1.2.0"; sha256="0mwfdh7jgi2apcdvrp7mmfr85i8qrx7n9dqymz09x0pl120kfy11"; depends=[magick]; }; - magree = derive2 { name="magree"; version="1.0"; sha256="1qkd6p5g3aigcb0f4d08gc5323alvahzmazm3bzsmz1w033xd1hh"; depends=[]; }; - magrittr = derive2 { name="magrittr"; version="1.5"; sha256="1s1ar6rag8m277qcqmdp02gn4awn9bdj9ax0r8s32i59mm1mki05"; depends=[]; }; + magree = derive2 { name="magree"; version="1.1"; sha256="0q0v1mx4k1hry0l21611z9jx967l89xpjddvw2v1v9c3kl11kfi6"; depends=[]; }; + magrittr = derive2 { name="magrittr"; version="2.0.1"; sha256="0pxd99fvg406whqsk9wh756rayrwh84xn3h44zmlpcy23kanbhkm"; depends=[]; }; maic = derive2 { name="maic"; version="0.1.2"; sha256="0cvb3s67skzkqkh1hm007wvzgx9zg27bwwzw39sq4z0kyafjvg28"; depends=[Hmisc matrixStats weights]; }; mail = derive2 { name="mail"; version="1.0"; sha256="1m89cvw5ba4d87kp2dj3f8bvd6sgj9k56prqmw761q919xwprgw6"; depends=[]; }; mailR = derive2 { name="mailR"; version="0.4.1"; sha256="1bfh3fxdqx9f9y3fgklxyslpcvhr9gcj7wsamaxzgrcsaxm8fdlw"; depends=[R_utils rJava stringr]; }; @@ -10393,7 +10828,7 @@ in with self; { makeFlow = derive2 { name="makeFlow"; version="1.0.2"; sha256="0r7a0klgx144rnks0fhjflnf8vfyyx2544n86nnxkp6cdvw0b4pw"; depends=[dplyr RColorBrewer]; }; makeProject = derive2 { name="makeProject"; version="1.0"; sha256="09q8xa5j4s5spgzzr3y06l3xis93lqxlx0q66s2nczrhd8nrz3ca"; depends=[]; }; makedummies = derive2 { name="makedummies"; version="1.2.1"; sha256="062rvijhy2dybpgxzp44cg46bfyb8lp9yasv3mhskhf3yg717sqp"; depends=[tibble]; }; - maketools = derive2 { name="maketools"; version="1.0.0"; sha256="1yrqmn42hachq1zbagyqbhxn88fbnq5iix23pliinp0i50yrjgj5"; depends=[sys]; }; + maketools = derive2 { name="maketools"; version="1.2.0"; sha256="1i2s48s0qfk9nwkkbx5hr0q7b0c8xziyrsg1klianmk9jqfngg36"; depends=[sys]; }; malan = derive2 { name="malan"; version="1.0.2"; sha256="0qwf0r2gwpb93gzvyp8vaw7j6rhghr6nbrfp8xw876n5j5b9jhj3"; depends=[dplyr igraph magrittr Rcpp RcppArmadillo RcppProgress tibble tidygraph]; }; malani = derive2 { name="malani"; version="1.0"; sha256="1jps28gfkiysr356ackxf1my5xz6rpx3a2bv68pziy2614hrqbs9"; depends=[e1071]; }; malariaAtlas = derive2 { name="malariaAtlas"; version="1.0.1"; sha256="0k0406pn65ars4d6zlirfdd7z3rl2z82vsx5p97gmxnjjp6gjdpa"; depends=[curl dplyr ggplot2 gridExtra httr raster rgdal rlang sp stringi tidyr xml2]; }; @@ -10405,33 +10840,39 @@ in with self; { mangoTraining = derive2 { name="mangoTraining"; version="1.1"; sha256="128ysvyqkddl035v3w2zm98y1ykly3pwjpyas7vhqi953by98hyk"; depends=[tibble]; }; manhattanly = derive2 { name="manhattanly"; version="0.2.0"; sha256="185fkakx4v35n4gmlpk2kfm2bm8p320q4khkw936m09zx3aqz398"; depends=[ggplot2 magrittr plotly]; }; manhplot = derive2 { name="manhplot"; version="1.1"; sha256="17yw10gpfp6bqmilb09v61jd2amz6cv1z38si4nqnhbvmac065qd"; depends=[ggplot2 ggrepel gridExtra reshape2]; }; - manifestoR = derive2 { name="manifestoR"; version="1.4.0"; sha256="1rnqm9s91q6kff951402zxl3cmnl8j19ybg9vmcmcm7bjbv5w2l0"; depends=[base64enc dplyr DT functional htmltools htmlwidgets httr jsonlite magrittr NLP psych tibble tm zoo]; }; + manifestoR = derive2 { name="manifestoR"; version="1.5.0"; sha256="0b4x4ampzmxcmlcyvl683rwynzwjg1cyx5zpamgy8027fh376zcp"; depends=[base64enc dplyr DT functional htmltools htmlwidgets httr jsonlite magrittr NLP psych purrr readr tibble tidyselect tm zoo]; }; manipulate = derive2 { name="manipulate"; version="1.0.1"; sha256="1klknqdfppi5lf6zbda3r2aqzsghabcsaxmvd3vw3cy3aa984zky"; depends=[]; }; manipulateWidget = derive2 { name="manipulateWidget"; version="0.10.1"; sha256="1vi71sjh7z1a880wffk8qqw7iysvk42q78giqxmm2sqz2a912qlx"; depends=[base64enc codetools htmltools htmlwidgets knitr miniUI shiny webshot]; }; manymodelr = derive2 { name="manymodelr"; version="0.3.2"; sha256="1z1ds6h7g3vq8jg1vlv4n7gkpy7bka0b2mzmr46nzjr71cffr8dv"; depends=[caret dplyr e1071 ggplot2 lme4 Metrics]; }; - maotai = derive2 { name="maotai"; version="0.1.6"; sha256="1rw2qx6p7wawwhznqrq195v76w381qg33rfhsm1wc5sazg8bzvly"; depends=[cluster labdsv Matrix nabor Rcpp RcppArmadillo RcppDist Rdpack RSpectra Rtsne shapes]; }; + maotai = derive2 { name="maotai"; version="0.1.8"; sha256="03p5y6k4dgbb7kqhrrdi0k1pgxrk27jinrdbchszb7zd8z9v4qkl"; depends=[cluster dbscan fastcluster labdsv Matrix nabor Rcpp RcppArmadillo RcppDist Rdpack reticulate RSpectra Rtsne shapes]; }; mapReasy = derive2 { name="mapReasy"; version="1.0"; sha256="13va0z967ckwxnnianki5aj66km0x6r37nj4mz9qd3b0bps4g2kj"; depends=[Hmisc rgdal sp]; }; + mapSpain = derive2 { name="mapSpain"; version="0.1.1"; sha256="1dcf3nvxc0msczcgv8kvxnvzzifb0xh5a6057qmwq7q5zwx6gmad"; depends=[countrycode giscoR leaflet png raster sf slippymath]; }; mapStats = derive2 { name="mapStats"; version="2.4"; sha256="18pp1sb9p4p300ffvmzjrg5bv1i7f78mhpggq83myc26c3a593na"; depends=[classInt colorspace Hmisc lattice maptools RColorBrewer reshape2 sp survey]; }; + mapboxapi = derive2 { name="mapboxapi"; version="0.2"; sha256="0rqpynin27vvwyjjv0c22mhrpsq4cgkkvhfhf24aqbkzfay92905"; depends=[aws_s3 curl dplyr geojsonsf httr jsonlite leaflet magick protolite purrr rlang sf slippymath stringi tidyr]; }; + mapboxer = derive2 { name="mapboxer"; version="0.4.0"; sha256="0f873js87dgk8nqnhpxh88svvsbnk81vkm7gycb62mkr4xqsgqs7"; depends=[geojsonsf htmltools htmlwidgets magrittr purrr yaml]; }; mapcan = derive2 { name="mapcan"; version="0.0.1"; sha256="1a4135wc1h4nzcv6xq0bg75i744wyq8p7q0ix7y2x2gb6s35w46k"; depends=[dplyr ggplot2 magrittr]; }; + mapchina = derive2 { name="mapchina"; version="0.1.0"; sha256="0f6ayq4izqxcj0hi2vfg0pc239hxgg7abb5476v5mfjjyi156mni"; depends=[sf]; }; mapdata = derive2 { name="mapdata"; version="2.3.0"; sha256="0xnxh73rgcq55zrw81a2bq8yd67bxc2rafp4shf6nyrqj04iip0y"; depends=[maps]; }; - mapdeck = derive2 { name="mapdeck"; version="0.3.3"; sha256="0mkrqsc8jhand6d70gz9y17j43cs2dikdl2x2rv2sla353yyh8a8"; depends=[BH colourvalues geojsonsf googlePolylines htmlwidgets jsonify magrittr rapidjsonr Rcpp sfheaders shiny spatialwidget]; }; + mapdeck = derive2 { name="mapdeck"; version="0.3.4"; sha256="0agbf6bs3z7gwx1dj9jqlq6cllq5b65x89lkplm5mwhr20lzwvhr"; depends=[BH colourvalues geojsonsf geometries googlePolylines htmlwidgets jsonify magrittr rapidjsonr Rcpp sfheaders shiny spatialwidget]; }; mapedit = derive2 { name="mapedit"; version="0.6.0"; sha256="1ix0sjsqb6646xyi73am9ic97plw9y9p4pl8mrkpzvqzm0pxdhxx"; depends=[dplyr htmltools htmlwidgets jsonlite leafem leaflet leaflet_extras leafpm mapview miniUI raster scales sf shiny sp]; }; mapfit = derive2 { name="mapfit"; version="0.9.7"; sha256="16a318bz3my27qj0xzf40g0q4bh9alg2bm6c8jbwgswf1paq1xmx"; depends=[Matrix]; }; mapi = derive2 { name="mapi"; version="1.0.1"; sha256="0qfwxrd0ya5amw7f96pfxf3f8m97s7vhaz62clqn083mw8ddaz2l"; depends=[data_table pbapply Rcpp sf]; }; mapmisc = derive2 { name="mapmisc"; version="1.7.9"; sha256="0dq360jdhbaq3i0vylvxcgrvw9pmp2k5as72lahyvl7v7bv4079d"; depends=[raster sp]; }; mapplots = derive2 { name="mapplots"; version="1.5.1"; sha256="18s2y66f8vi8g2r8a25zbgp2xm079r8v8qxv0w71h8krycs6vs9p"; depends=[]; }; + mappoly = derive2 { name="mappoly"; version="0.2.1"; sha256="168g79qb1f26yvnnfb931pvk1m919rq371aksdby9nrai6fbi91d"; depends=[cli crayon dendextend dplyr fields ggplot2 ggpubr ggsci magrittr plotly princurve Rcpp RCurl reshape2 rstudioapi scatterplot3d smacof vcfR zoo]; }; mapproj = derive2 { name="mapproj"; version="1.2.7"; sha256="0nscsfq8md6ri9258xz57c3dj81wdl6kdwf4a9qcrwwbn20i427h"; depends=[maps]; }; - mapr = derive2 { name="mapr"; version="0.5.0"; sha256="1dxvnkb4a2i5afqjjc94xdzc18znhdrgsj9a4wjsggrzwvy94215"; depends=[data_table ggplot2 gistr jsonlite leaflet maps RColorBrewer sp spocc]; }; + mapr = derive2 { name="mapr"; version="0.5.2"; sha256="0qc1zqa2yqgy777wbm6lj37vzaaxaz0gdimr62wv9fyddkbkshk4"; depends=[data_table ggplot2 gistr jsonlite leaflet maps RColorBrewer sp spocc]; }; maps = derive2 { name="maps"; version="3.3.0"; sha256="05i2ppl5z4p8rawgqmy3z4ia05fcblpq1vvrmrkgkkpdlhczx6hr"; depends=[]; }; mapsFinland = derive2 { name="mapsFinland"; version="0.1.1"; sha256="0kx9r28lvc6bbl478i9gyy58kbp5hi7akysyld87fxk5x0601j19"; depends=[]; }; - mapsRinteractive = derive2 { name="mapsRinteractive"; version="1.0.0"; sha256="0lpmizhaan7zp201wjaq544wadizwpswch7sn6m3sjwn8rswg6av"; depends=[gstat raster rgdal rgeos sp]; }; - mapsapi = derive2 { name="mapsapi"; version="0.4.6"; sha256="0s66ws50jp5fgl3c0lgilnzqm4chyn73wm7c29873bxr2p40gfr9"; depends=[bitops magrittr RgoogleMaps sf stars xml2]; }; - maptools = derive2 { name="maptools"; version="1.0-1"; sha256="0fs1y3cbymcq4f76wd27h5a7ihdmxii3ca8x29x32xgxhmasni4l"; depends=[foreign lattice sp]; }; + mapsRinteractive = derive2 { name="mapsRinteractive"; version="1.0.1"; sha256="03x5mza9y5kdqshma0k7bynmd3fffayy1j243m5bhw7ln85ws73x"; depends=[gstat raster rgdal rgeos sp]; }; + mapsapi = derive2 { name="mapsapi"; version="0.4.8"; sha256="13v2hgngbxs6v7cxb8nnsa3i96a0rldvcx9xrx5l6l584vvs8j9f"; depends=[bitops magrittr RgoogleMaps sf stars xml2]; }; + maptiles = derive2 { name="maptiles"; version="0.1.1"; sha256="0ppg74r0ccl97aqh2w9mzvpqqg3v873k0k0pig3fac02vgdsfsgh"; depends=[curl png sf slippymath terra]; }; + maptools = derive2 { name="maptools"; version="1.0-2"; sha256="0jgf3wg47jdnznxb3ncv4is9ackwviy4lzcyggqwzw3wh6jnvb6s"; depends=[foreign lattice sp]; }; maptpx = derive2 { name="maptpx"; version="1.9-7"; sha256="0f85i3vwr5rvz261z6j7x15gsahxrq4qqddfb0qyhypgihvwh857"; depends=[slam]; }; maptree = derive2 { name="maptree"; version="1.4-7"; sha256="1k7v84wvy6wz6g0dyiwvd3lvf78rlfidk60ll4fz7chvr2nrqdp4"; depends=[cluster rpart]; }; mapview = derive2 { name="mapview"; version="2.9.0"; sha256="145n1shc8bjvm2awvnxd8884mi5bxjqymlkvz1vv3gkwwssv430p"; depends=[base64enc htmltools htmlwidgets lattice leafem leaflet leafpop png raster satellite scales sf sp webshot]; }; mar1s = derive2 { name="mar1s"; version="2.1.1"; sha256="1ljkvgxrramfx1rnp2rg6516mjxaa6s96amrnmqymnyjz7wlf37l"; depends=[cmrutils fda zoo]; }; - march = derive2 { name="march"; version="3.1"; sha256="1y3ndnkxrqxavp7b5dwhn1mijhhn06k5b6iickzjr4bfmpfnk340"; depends=[]; }; + march = derive2 { name="march"; version="3.3.2"; sha256="1qdjajb5mkq2r7p224kbxhf01s75hry5c5hx1cnsb48dfzd2s5xg"; depends=[]; }; marcher = derive2 { name="marcher"; version="0.0-2"; sha256="0hcxbfrwniih4kvx5sxhlffz1pc87kf52v8hvaf193rhhdykis5q"; depends=[magrittr Matrix minpack_lm mvtnorm numDeriv plyr RColorBrewer scales zoo]; }; marelac = derive2 { name="marelac"; version="2.1.10"; sha256="08phsghzvi0z78pkb5lkamni83fsw0bqfri99j6bjf6y14aygif9"; depends=[seacarb shape]; }; marg = derive2 { name="marg"; version="1.2-2.1"; sha256="1r6rl7dhvm8dghm7pm4hfw3924qja65hczl6d47v9ixnv4rxyzr9"; depends=[statmod survival]; }; @@ -10441,51 +10882,52 @@ in with self; { markdown = derive2 { name="markdown"; version="1.1"; sha256="06zwbrp14bri3470anadd7dvgmw06xf8df6v2pk64wx3f9sd934d"; depends=[mime xfun]; }; markdownInput = derive2 { name="markdownInput"; version="0.1.2"; sha256="1qxil2liikbbn6w8niyc03fwqvwvdv6wiy98ip8j77729i7g2hln"; depends=[markdown shiny shinyAce]; }; marked = derive2 { name="marked"; version="1.2.6"; sha256="0k367sjyac1w894rndz5m0drmbd56nzyx5mr7mvhsqzq3gnv4dw5"; depends=[bookdown coda data_table expm kableExtra knitr lme4 Matrix numDeriv optimx R2admb Rcpp TMB truncnorm]; }; - marketr = derive2 { name="marketr"; version="0.0.1"; sha256="0pchyfhim18m88r9m9dhihj89isvjwgmka9bdi64n0hnmv0qv8ds"; depends=[dplyr magrittr rlang tibble tidyr]; }; - markmyassignment = derive2 { name="markmyassignment"; version="0.8.2"; sha256="1jrx72k3glwv5nci3h3qbqbs0x9mqld92v4irw2sfjzcmb7qyma3"; depends=[checkmate codetools httr lazyeval rlang testthat yaml]; }; + marketr = derive2 { name="marketr"; version="0.0.2"; sha256="12nhlz40n80i6zg7y5w9zknq9qpk9qwd3wbvvya1ff8gq195147w"; depends=[dplyr magrittr tibble tidyr]; }; + markmyassignment = derive2 { name="markmyassignment"; version="0.8.3"; sha256="1fslp5fzs79gbw9ydbzxldpclrbdj3qrzmm1b61xji3qzif6r4la"; depends=[checkmate codetools httr lazyeval rlang testthat yaml]; }; markophylo = derive2 { name="markophylo"; version="1.0.8"; sha256="05hfykjzx4wf2p1d6dvyx5lizfxmq3zprvnfg74r7l1izp7wpl38"; depends=[ape numDeriv phangorn Rcpp RcppArmadillo]; }; - markovchain = derive2 { name="markovchain"; version="0.8.5"; sha256="1bsvp2cpqc70rlxnpjk938yscl8hn1phpsvc8nc9g9166x4mqy17"; depends=[expm igraph matlab Matrix Rcpp RcppArmadillo RcppParallel]; }; + markovchain = derive2 { name="markovchain"; version="0.8.5-3"; sha256="14yrhxnfrq9rhsy6vhiq933g7a39vfmfzsai9jdy6pzykjxmrmf5"; depends=[expm igraph matlab Matrix Rcpp RcppArmadillo RcppParallel]; }; marl = derive2 { name="marl"; version="1.0"; sha256="0rndnf3rbcibv3gsrw1kfp5zhg37cw9wwlz0b7dbwprd0m71l3pm"; depends=[]; }; - marmap = derive2 { name="marmap"; version="1.0.4"; sha256="1yhnh311wzy6klyds6l0rldk6kw89rylxnwqrj5y6bpws9sac0za"; depends=[adehabitatMA DBI gdistance geosphere ggplot2 ncdf4 plotrix raster reshape2 RSQLite shape sp]; }; - marqLevAlg = derive2 { name="marqLevAlg"; version="2.0.2"; sha256="0q3whfhi17qa8dfd5hjyqxc7a7p8hdfkkmvccdigfbqvksf24fxs"; depends=[doParallel foreach]; }; + marmap = derive2 { name="marmap"; version="1.0.5"; sha256="0aqir3daf154n6qqmy48snsgiz9ixdkrfck67x4pmasxj9w5wgl9"; depends=[adehabitatMA DBI gdistance geosphere ggplot2 ncdf4 plotrix raster reshape2 RSQLite shape sp]; }; + marqLevAlg = derive2 { name="marqLevAlg"; version="2.0.4"; sha256="0jizmnd2g1vgy48wbqn112ip8vygnx17fmidynrgi8q99ia21mbp"; depends=[doParallel foreach]; }; mase = derive2 { name="mase"; version="0.1.2"; sha256="1023xvv6yngbc183hb13057spjildywqd0jw2w9jway3zv4dbw9v"; depends=[boot dplyr foreach glmnet magrittr Matrix Rdpack rpms survey]; }; mashr = derive2 { name="mashr"; version="0.2.38"; sha256="1w1ipkwixq8mr25v7w8vdyi6rwbkgsd0a69w05l0r6bms7dviki8"; depends=[abind ashr assertthat mvtnorm plyr Rcpp RcppArmadillo RcppGSL rmeta]; }; mason = derive2 { name="mason"; version="0.3.0"; sha256="1x5wiagb1sy5gkp0xkbr1jzhrjg1c2bqdh4hy6igwcnws2cbhxyr"; depends=[broom dplyr magrittr purrr rlang tibble tidyr tidyselect]; }; + mastif = derive2 { name="mastif"; version="1.0.1"; sha256="1jw7dz4qxyj848qm7lwg0klcw028260nizdi5gdwf7wd5a2nis9c"; depends=[corrplot RANN Rcpp RcppArmadillo repmis xtable]; }; matR = derive2 { name="matR"; version="0.9.1"; sha256="1qw2vqmpq7gc3dmr9r000ccjj7xa0h82waxnvryz3l17ggryyjjm"; depends=[BIOM_utils MGRASTer]; }; matahari = derive2 { name="matahari"; version="0.1.3"; sha256="03mhn4qh1vcz2hr0mxp6gijwgrzvbpfb8dq7lqhchbk5gq5g3fnh"; depends=[clipr jsonlite purrr readr rlang rstudioapi tibble]; }; match2C = derive2 { name="match2C"; version="0.1.0"; sha256="04sbsnbp2qmklfify7a2bdrx7y8r836qhwvklxi4nns5ivj51hqv"; depends=[mvnfast rcbalance Rcpp]; }; matchMulti = derive2 { name="matchMulti"; version="1.1.7"; sha256="0k5psmjzcyr7pm603vni7w2hvslck05r81cngm26pql2prdrv5yk"; depends=[coin Hmisc MASS mvtnorm plyr rcbsubset weights]; }; matchbook = derive2 { name="matchbook"; version="1.0.7"; sha256="0xfqg8z2zkn215kqmjjkqdwrgsk7cn4jdpxfgd6razhcbvflg48j"; depends=[]; }; matchingMarkets = derive2 { name="matchingMarkets"; version="1.0-2"; sha256="1jj5hzxiivqinkpddmkqdxgi83jm6blann9wgv4g8prn3lvp0i85"; depends=[lattice lpSolve partitions Rcpp RcppArmadillo RcppProgress rJava]; }; - matchingR = derive2 { name="matchingR"; version="1.3.0"; sha256="1rpw5a52alh5diiqr7f87vhpgp3w3f8lg8wkaqvr5idid9fkll1i"; depends=[Rcpp RcppArmadillo]; }; + matchingR = derive2 { name="matchingR"; version="1.3.2"; sha256="03imvgasiahcnzmc8kr2ywwv93fhg50qrqmvm6ifiz0g9d3xh8rr"; depends=[Rcpp RcppArmadillo]; }; matchmaker = derive2 { name="matchmaker"; version="0.1.1"; sha256="1sa2cah8gjvg0159rv1sfw9p0aljg66xmij31mz2vfk5683r4b00"; depends=[cli forcats rlang]; }; matconv = derive2 { name="matconv"; version="0.4.0"; sha256="0kl0647m45mrk13fyr0mkx1x9v3im66ciky8k8nmy4ahkffyasi4"; depends=[]; }; - mateable = derive2 { name="mateable"; version="0.3.1"; sha256="1ka9xxicibpfg6k3njq5f5576jwj734r1mb46a2cmiyq676ks7pp"; depends=[FNN Rcpp sn]; }; - mathgraph = derive2 { name="mathgraph"; version="0.9-14"; sha256="11wcnjligjc0m0ibi7v5f9w4j2g0fmw33za8407d9fqdb0i5pf60"; depends=[]; }; mathjaxr = derive2 { name="mathjaxr"; version="1.0-1"; sha256="0j1124f7sb6r7fjfhrlara2402qpa2pf1m21amnpqz0c9l63fg8d"; depends=[]; }; mathpix = derive2 { name="mathpix"; version="0.4.0"; sha256="0wwagf8v7awgiyi8vrfay5m2pbl1czn62g5bkg037wwy0c68n8va"; depends=[base64enc httr magick purrr rstudioapi texPreview]; }; matie = derive2 { name="matie"; version="1.2"; sha256="1ymx49cyvz63imqw5n48grilphiqvvdirwsrv82p7jgxdyav2xv0"; depends=[cba dfoptim gplots igraph mvtnorm seriation]; }; matlab = derive2 { name="matlab"; version="1.0.2"; sha256="0m21k2vzbc5d3c93p2hk4208xyd2av2slg55q5j1ibjidiryqgd2"; depends=[]; }; matlabr = derive2 { name="matlabr"; version="1.5.2"; sha256="1ba6cajnzldb1gmn7rf0b198h6mdh58r3frm0z0cmvbinspwz3x7"; depends=[stringr]; }; - matlib = derive2 { name="matlib"; version="0.9.3"; sha256="09fndv9dpc48s1i263amhgk7bjhz0wzksbhkzkl392v85r84bj6x"; depends=[car MASS rgl xtable]; }; - matman = derive2 { name="matman"; version="1.1.0"; sha256="0ky10i2qbsd6vqsxrcbdimpwbn1yjz56lxmpsa48450r2dbmijwm"; depends=[data_table dplyr DT forecast ISOweek plotly shiny shinydashboard shinyWidgets tidyr tidyverse]; }; + matlib = derive2 { name="matlib"; version="0.9.4"; sha256="1myc00mggfxm0p2h2blyn3qa399dldbbq4x6hv7a486gmf03lnrn"; depends=[car MASS rgl xtable]; }; + matman = derive2 { name="matman"; version="1.1.2"; sha256="08qafqz566d03zaxlxi32ir73rl0kxag257vi15kmw61sd57rrgm"; depends=[data_table dplyr DT forecast ISOweek plotly shiny shinydashboard shinyWidgets tidyr tidyverse]; }; matpow = derive2 { name="matpow"; version="0.1.1"; sha256="1a6q21ba16qfdpykmjwgmrb1kkvvyx48qg8cbgpdmch0vhibcgcp"; depends=[]; }; matricks = derive2 { name="matricks"; version="0.8.2"; sha256="0ik61jxd4hpw149dbbmis3wsfsim60mw9d0qjwh047qfg6sm1vsc"; depends=[ggplot2 Rcpp reshape2 rlang]; }; matrixLaplacian = derive2 { name="matrixLaplacian"; version="1.0"; sha256="1ixqdv3sz3sc79wn3vqhlq79j7x7cvl878m5hgvbcg6klfvlmmci"; depends=[scatterplot3d]; }; - matrixNormal = derive2 { name="matrixNormal"; version="0.0.1"; sha256="1nvsgcp8x691pa2rjz2fgknybwpni6fppm16l5bjkrg47ka0pbcd"; depends=[mvtnorm]; }; + matrixNormal = derive2 { name="matrixNormal"; version="0.0.4"; sha256="1x59n907d9846m5iwzdghs9s4nndrsf75spfs8b1zl21jpa7i2nv"; depends=[mvtnorm]; }; matrixProfile = derive2 { name="matrixProfile"; version="0.5.0"; sha256="0nd54k878xf7hzwxawh03c3na4jfvb68afarkwrmmffjlp3i8a9g"; depends=[fftw signal TTR zoo]; }; - matrixStats = derive2 { name="matrixStats"; version="0.56.0"; sha256="09qgfv9x32x6ncgf19iy7yjp26fwy6p5wm8spc2xzfc0qhylmqrr"; depends=[]; }; + matrixStats = derive2 { name="matrixStats"; version="0.57.0"; sha256="0hzkx7yi9ira476izsgw7r2bhv72ra4z2m9zr1i1f4ivrn3ihs7r"; depends=[]; }; matrixStrucTest = derive2 { name="matrixStrucTest"; version="1.0.0"; sha256="06la9xmpi1viyjml4m1akbna3lwkz5lnq95v1nnf73i9zpfwz03k"; depends=[]; }; matrixTests = derive2 { name="matrixTests"; version="0.1.9"; sha256="128h8krc7n6lrh6njyj650ma5gr549p8cyps6dxij6bm0p3n7r62"; depends=[matrixStats]; }; matrixcalc = derive2 { name="matrixcalc"; version="1.0-3"; sha256="1c4w9dhi5w98qj1wwh9bbpnfk39rhiwjbanalr8bi5nmxkpcmrhp"; depends=[]; }; matrixsampling = derive2 { name="matrixsampling"; version="2.0.0"; sha256="05dbn7rj07jx1hj7i6k3akf11hysxg6v32kav9fvsqmiy2zkippa"; depends=[keep]; }; - matsbyname = derive2 { name="matsbyname"; version="0.4.15"; sha256="0hkzfagmrws7vz0sn0fn0a14vmlpfr77clhrqms9cbijx7da3wz3"; depends=[assertthat dplyr Hmisc magrittr purrr rlang stringi tibble]; }; - matsindf = derive2 { name="matsindf"; version="0.3.4"; sha256="0r8hs53c4xv7lldz8mzh3hy5jq64c3cza9yifjjzpwvlw42y631l"; depends=[dplyr magrittr matsbyname purrr rlang rlist tibble tidyr]; }; + matsbyname = derive2 { name="matsbyname"; version="0.4.16"; sha256="13gl1jkpw3dpv93fvgg84sv4kbg4qv5hzz5z35fsxhqj5m5qrgl3"; depends=[assertthat dplyr Hmisc magrittr purrr rlang stringi tibble]; }; + matsindf = derive2 { name="matsindf"; version="0.3.6"; sha256="1h0hlr2vvqj1jfkn6i7x137xlxsawnnhkg88kl7fga4wfznzyms3"; depends=[dplyr magrittr matsbyname purrr rlang tibble tidyr]; }; + matuR = derive2 { name="matuR"; version="0.0.1.0"; sha256="01nxs4czzs1kcxk63nwr2gnvffmlnx3yfllrhi8khdkj498s6sx1"; depends=[dplyr ggplot2 ggrepel lubridate magrittr tidyr]; }; mau = derive2 { name="mau"; version="0.1.2"; sha256="1wgiai8f1kbjh9hfwv4m0kavd44ib5xb33p8m16zpawnw14m7sj5"; depends=[data_table ggplot2 gtools igraph RColorBrewer Rdpack stringr]; }; - mauricer = derive2 { name="mauricer"; version="2.1"; sha256="1llqcz6iimb96cfkpjkwwdplfv6s36c634rczxpzrid6vizls0sh"; depends=[beastier curl stringr]; }; - maxLik = derive2 { name="maxLik"; version="1.4-0"; sha256="0glbd19icibl24pqgn1247s8gqbgb72bppvs9k7r8z2hcqws0005"; depends=[miscTools sandwich]; }; + mauricer = derive2 { name="mauricer"; version="2.3"; sha256="0cbrxvlpw89rrdnnsxbl1jmmkn4gccp2xaipnarhk5qd9wp6zm6c"; depends=[beastier curl stringr]; }; + maxLik = derive2 { name="maxLik"; version="1.4-6"; sha256="1syskb0zfqqnhb2g1dcf28lnfccgnjqbm93x5zxxf9x4wwh3liq6"; depends=[miscTools sandwich]; }; maxTPR = derive2 { name="maxTPR"; version="0.1.0"; sha256="13x5rz0mfha5pzahkk4x67ncz9v77sa690cyl6wigwsldsrvzr3h"; depends=[aucm Rsolnp]; }; maxadjAUC = derive2 { name="maxadjAUC"; version="0.1.0"; sha256="04zdaqmavhhrj63s2k5pqncvlzbfnxan7r0fagfka9dypwwcl5qm"; depends=[aucm Hmisc Rsolnp survival]; }; + maxcombo = derive2 { name="maxcombo"; version="1.0"; sha256="1hwv38a07ry5fv53r2vizifj83xf98znix8nx4zshqyk38vblgp5"; depends=[dplyr magrittr MCMCpack mstate mvtnorm purrr rlang survival]; }; maximin = derive2 { name="maximin"; version="1.0-3"; sha256="1wfhpgk149aw6gkdlr8g29icj0l0xa8fczxkz4hbdr91dqmnxvp3"; depends=[plgp]; }; maxlike = derive2 { name="maxlike"; version="0.1-8"; sha256="0lbj212dbx8lbkw808xlhniw5864bh86xs8zwvxcnngj0abapalh"; depends=[raster]; }; maxmatching = derive2 { name="maxmatching"; version="0.1.0"; sha256="1xbwrhmr8gzvlcprib7nzvqrcd355bhx7wkqxrvfk4g7dvskf9ka"; depends=[igraph]; }; @@ -10495,24 +10937,25 @@ in with self; { mazeGen = derive2 { name="mazeGen"; version="0.1.3"; sha256="192xygg3l4rpqp49sgd5hpp4h3f8wjhyldn0l8abxhsks7jd2kfb"; depends=[igraph]; }; mazealls = derive2 { name="mazealls"; version="0.2.0"; sha256="14j6syw1zkgs4cnmxzqpm6klmgvck2gg97wkzmy9al6n0biy8gmb"; depends=[TurtleGraphics]; }; mazeinda = derive2 { name="mazeinda"; version="0.0.1"; sha256="0ns4ib73y4fghf7p1wg0a05js4mqr66dpp49p1h039pqrb0f1vwd"; depends=[foreach]; }; - mbbefd = derive2 { name="mbbefd"; version="0.8.8.5"; sha256="1bnbavhii2wm9944l4j5x21y9b3kp0sdshz32r1k7cy1y569zd6r"; depends=[actuar alabama fitdistrplus gsl MASS Rcpp]; }; + mbbefd = derive2 { name="mbbefd"; version="0.8.9.1"; sha256="0902dhfjrnkd9wmy2nglrycnjmn4sh0qbsmh91cd3g1wh673rpak"; depends=[actuar alabama fitdistrplus gsl MASS Rcpp]; }; mbclusterwise = derive2 { name="mbclusterwise"; version="1.0"; sha256="1ilqaxcxf1k3ck910s0xqwnp88w8ag5rn1dpvaa1i7jlcldsbnhp"; depends=[ade4 doParallel foreach kknn]; }; - mbend = derive2 { name="mbend"; version="1.3.0"; sha256="011csf2zigv0778d1mkwq13dayj4zkpnlsy2a0s8n71hbyhra0v6"; depends=[]; }; + mbend = derive2 { name="mbend"; version="1.3.1"; sha256="0g7hqjdhaj99rd2jqfb6x7k7gsfcvhdibai3093qcvhv6grb3v7m"; depends=[]; }; mbest = derive2 { name="mbest"; version="0.6"; sha256="1x0f7y5hj6a35wq1xn6g7jyjn9c4zryahwlf07qrypgrcnj2m8vx"; depends=[abind bigmemory foreach lme4 logging nlme]; }; mbir = derive2 { name="mbir"; version="1.3.5"; sha256="10sd5gk2k94cmi49nbpywqvh9bxj9q3psa3d00zmw1a7d6c0jjpd"; depends=[effsize psych]; }; mblm = derive2 { name="mblm"; version="0.12.1"; sha256="1fipb3bryaimr30lcxsxrn0ymv24z39swca7s4z7p9xcfg3ban1b"; depends=[]; }; - mboost = derive2 { name="mboost"; version="2.9-3"; sha256="1qp5c43kc0939sss5w3hhn794lbi69wgfsa31sq4c8vzh35pjqmf"; depends=[lattice Matrix nnls partykit quadprog stabs survival]; }; + mbmixture = derive2 { name="mbmixture"; version="0.2-5"; sha256="0w6a77lavdsrg9sf6jmi3xyxgx4d0v2nf85fh9bnrjdp51g6d0zi"; depends=[numDeriv]; }; + mboost = derive2 { name="mboost"; version="2.9-4"; sha256="1dgyc38axfk2a430wsdnnk76xikizkyxf5r0l1kbp6cacrx6idz0"; depends=[lattice Matrix nnls partykit quadprog stabs survival]; }; mboxr = derive2 { name="mboxr"; version="0.2.0"; sha256="1d11fpz17k65dzw9sjc7zfs1jpajzrh2pvr2s435p83g3mpf40vz"; depends=[dplyr lubridate magrittr purrr reticulate stringr tibble tidyr]; }; mbrglm = derive2 { name="mbrglm"; version="0.0.1"; sha256="0yxq1xk8qy5hpiqqldyrs78lp4ggdp5lj2lmh8rqq1xvsfr6nrh4"; depends=[enrichwith nleqslv]; }; mbsts = derive2 { name="mbsts"; version="1.0"; sha256="0wkglh1g0kdlgw4afqxvwb26difnqhf6g5jsbf8y39mpipxla365"; depends=[KFAS MASS Matrix MCMCpack pscl]; }; - mc_heterogeneity = derive2 { name="mc.heterogeneity"; version="0.1.1"; sha256="076naz0p2kqn9dlbzllcqv7rki3vxybzhpq8fsw9wslsznmm9r1w"; depends=[boot_heterogeneity metafor]; }; + mc_heterogeneity = derive2 { name="mc.heterogeneity"; version="0.1.2"; sha256="1nsqbc4cqyg6g3s6ish3fbhqygy1kay68smbv0rhivp0x0dv7can"; depends=[boot_heterogeneity metafor]; }; mc2d = derive2 { name="mc2d"; version="0.1-18"; sha256="1ljw8ms661bsdqbfpjvvrif9n0c2i6lzxyqj4rxhxsp3dj18w3g3"; depends=[mvtnorm]; }; mcBFtest = derive2 { name="mcBFtest"; version="0.1.0"; sha256="1fmn9pzbvk508ljspksppqxdvggx5bvipgs54nz9605y6p8zzmi5"; depends=[MASS]; }; mcGlobaloptim = derive2 { name="mcGlobaloptim"; version="0.1"; sha256="1p8841y9a4yq51prv6iirgw9ln8jznx8nk547sc5xlznksjy1g9n"; depends=[randtoolbox snow]; }; mcMST = derive2 { name="mcMST"; version="1.0.1"; sha256="18ka76g9pgpycaw0hl8vxpabd8584q1l5d3xmrzy1zwincsg7vgs"; depends=[BBmisc checkmate ecr ggplot2 gtools lhs parallelMap reshape2 vegan]; }; - mcPAFit = derive2 { name="mcPAFit"; version="0.1.4"; sha256="1h5kiry8bvdrgyqf7cqsag0b7rscwc7phayzf6h4css1667bvm0g"; depends=[PAFit RColorBrewer Rcpp]; }; mcStats = derive2 { name="mcStats"; version="0.1.2"; sha256="1r8dxdfcvznl2968xr6fbany1rh7wq5z1p7fhdf5g4b5l28j8pf9"; depends=[dplyr ggplot2 ggthemes gridExtra magrittr rlang tidyr]; }; mcb = derive2 { name="mcb"; version="0.1.15"; sha256="0k986m2vyvfqxw3jmlyvf6r5bq68y92fymy03lffq5lmiqhypixj"; depends=[ggplot2 glmnet lars leaps MASS ncvreg reshape2 smoothmest]; }; + mcbette = derive2 { name="mcbette"; version="1.13"; sha256="1f5kfbyla4qmx3zin6dgcq6fhzd8rwaqg5jfv39bdp6g3srf2805"; depends=[babette beastier beautier curl devtools mauricer Rmpfr testit txtplot]; }; mcbiopi = derive2 { name="mcbiopi"; version="1.1.6"; sha256="1caw2sy15hw2zw0bdynwnsa7hn4rly34hlxp06nwm5lssz8l2597"; depends=[]; }; mcc = derive2 { name="mcc"; version="1.0"; sha256="0p661a870bvh3xhcahqqq85azn9rjl3vacjy96jsdn86irj4s0vi"; depends=[]; }; mcca = derive2 { name="mcca"; version="0.7.0"; sha256="01nm0plgkik241qhd06v1vs84lf7agc0vkxa27cpr5qlfl4cm4zb"; depends=[caret e1071 MASS nnet pROC rgl rpart]; }; @@ -10523,22 +10966,23 @@ in with self; { mcemGLM = derive2 { name="mcemGLM"; version="1.1.1"; sha256="0p6z32c69ik8wjjn50vzjmr4plsfbxr2p0hr50wknkwwb7i20hp6"; depends=[Rcpp RcppArmadillo trust]; }; mcen = derive2 { name="mcen"; version="1.2"; sha256="1j0fy0ccbx85znvsxpd72pcgk3qg6r1ngpjjgr04mg9bwlfzpxm2"; depends=[faraway flexclust glmnet Matrix]; }; mcga = derive2 { name="mcga"; version="3.0.3"; sha256="109m01mab5awjf8zjzwl9j7hzac15dyq3x6zba9hsy5i02k5d5w4"; depends=[GA Rcpp]; }; - mcgfa = derive2 { name="mcgfa"; version="2.2.1"; sha256="19z5008274pwlwv47imixnfd4nxwnrhdhsq2m3grjzndxp41i4xz"; depends=[]; }; mcgibbsit = derive2 { name="mcgibbsit"; version="1.1.0"; sha256="09ydcbjz3abmh46966v01dh26fy79dfklk3zjf262zp3c62ld9yf"; depends=[coda]; }; mcglm = derive2 { name="mcglm"; version="0.6.0"; sha256="0p06bibckkq7aynhp8livsyvvy3abwswwvwl5ps4fxqsgncfng5f"; depends=[assertthat Matrix Rcpp RcppArmadillo]; }; mcheatmaps = derive2 { name="mcheatmaps"; version="1.0.0"; sha256="1gglm32xpmim38m7fziczgqfbpcq2899lxardsrzg6j1vhmf765y"; depends=[gridBase]; }; mclcar = derive2 { name="mclcar"; version="0.1-9"; sha256="0bwnivmajsrvmwskhk44qhz4nnc0irxq83g0kzbj4wshhivnwryp"; depends=[fields maxLik nleqslv rsm spam spdep]; }; mcll = derive2 { name="mcll"; version="1.2"; sha256="0i9zqbh0l9a9mv4558gbdq9mh52chanykyfwmiymmxygxhp809sz"; depends=[locfit statmod]; }; - mclogit = derive2 { name="mclogit"; version="0.8.5.1"; sha256="19lhymixycm1xyj7k9ywswvvsl6pbqyhrzjsayrcjkcsdv58cf44"; depends=[Matrix memisc]; }; - mclust = derive2 { name="mclust"; version="5.4.6"; sha256="1z46qask09x3xpv0wzvhn09218vwyrip4f5jrhnx96khpwvczzyl"; depends=[]; }; + mclogit = derive2 { name="mclogit"; version="0.8.6.4"; sha256="09n5kn3ylcml73pkyw2b97wp3xay75qjsfb588hs5j4rls0wj1qc"; depends=[Matrix memisc]; }; + mclust = derive2 { name="mclust"; version="5.4.7"; sha256="08scl72llpinfijiyx14yqvmx8lma9jvh8h92v9ynnzfr9kadxa5"; depends=[]; }; mclustcomp = derive2 { name="mclustcomp"; version="0.3.1"; sha256="0jdfdmgd46w7b38nbpd0lj9vqzi2nnf8fv0crj08lfin5ng7jvaa"; depends=[Rcpp RcppArmadillo Rdpack]; }; mcmc = derive2 { name="mcmc"; version="0.9-7"; sha256="0q42m8ab7b6bxhns494ksjdss5f3c5m2jjfdlfj6fk1nz7ax7i5p"; depends=[]; }; mcmcOutput = derive2 { name="mcmcOutput"; version="0.1.1"; sha256="0nw33xb7x695g8i91hfj2apgywbyzf2k587drzridqnfmbm26pni"; depends=[coda HDInterval MASS]; }; mcmcderive = derive2 { name="mcmcderive"; version="0.1.0"; sha256="1q26fnkm8ysfgbn1f0i2qajm1jrfslplx6jdg76bdc83iqwblpd6"; depends=[abind chk extras mcmcr nlist purrr term universals]; }; + mcmcensemble = derive2 { name="mcmcensemble"; version="2.0"; sha256="06aw2l94pxihv80rrs7dq2b2kvdpy0zpxxzvp7jlp3aky1n30vih"; depends=[]; }; mcmcplots = derive2 { name="mcmcplots"; version="0.4.3"; sha256="0187z79gmvcrwqybxh3ckhcrqi0nqhvcvlczgxfkpq95y5czprdq"; depends=[coda colorspace denstrip sfsmisc]; }; - mcmcr = derive2 { name="mcmcr"; version="0.3.0"; sha256="1jk1hdrbxfh0dqhvjxm8ml6mxrdg1qjhm6b3q745qnn03psp4qgy"; depends=[abind chk coda extras lifecycle nlist purrr term universals]; }; + mcmcr = derive2 { name="mcmcr"; version="0.4.0"; sha256="1g839n1x359rqf6p521s0ipzdnc5wg4wdxhjs9r879vmmv8xf766"; depends=[abind chk coda extras lifecycle nlist purrr term universals]; }; + mcmcsae = derive2 { name="mcmcsae"; version="0.5.0"; sha256="0ai1m2kxspk5c5pcn5vxca26dyvrhiaaqmq6h56qy18q4lrq700h"; depends=[GIGrvg loo Matrix matrixStats Rcpp RcppEigen]; }; mcmcse = derive2 { name="mcmcse"; version="1.4-1"; sha256="05sxz2bjb1y389vrmykcn6hwhgpykzpnh94aq34mbpqdsrb1y63b"; depends=[ellipse Rcpp RcppArmadillo]; }; - mco = derive2 { name="mco"; version="1.0-15.1"; sha256="14y10zprpiflqsv5c979fsc2brgxay69kcwm7y7s3gziq74fn4rw"; depends=[]; }; + mco = derive2 { name="mco"; version="1.15.6"; sha256="10h5d2lw6ybyva44nn5wml6v3ljpnv9m1b2lh36vg2cwrdwy5sqp"; depends=[]; }; mcompanion = derive2 { name="mcompanion"; version="0.5-3"; sha256="0051agyzbhrsxi9wpfpqcq98h7y25627s2czf30qxcq80m7xbhj0"; depends=[gbutils MASS Matrix Rdpack]; }; mcp = derive2 { name="mcp"; version="0.3.0"; sha256="1dgdhspbqc6w7rcplryjy9jjzdpm480rwngn6ri7kjl8bk70hll2"; depends=[bayesplot coda dplyr future future_apply ggplot2 loo magrittr patchwork rjags rlang stringr tibble tidybayes tidyr tidyselect]; }; mcparallelDo = derive2 { name="mcparallelDo"; version="1.1.0"; sha256="1ivh0d4f7ks6xwcjywk62h1zhr7h5bbhzpisky7973wi4g8vipbn"; depends=[checkmate R_utils R6]; }; @@ -10547,12 +10991,13 @@ in with self; { mcsm = derive2 { name="mcsm"; version="1.0"; sha256="13sx7s3ywis5n4a70ld2szld9fb8jkfsc82dy6iskhy17vy8pml0"; depends=[coda MASS]; }; mctest = derive2 { name="mctest"; version="1.3.1"; sha256="1d248r9ifwl1xhvka6z69l943rvbq7s7ag6vqp9lljkcybvg75f2"; depends=[]; }; mcunit = derive2 { name="mcunit"; version="0.3.1"; sha256="12zlm14gcfid7h9szrggwmhy54d0wk57r8w8l3p3x3yp49144v67"; depends=[Rdpack rlang simctest testthat]; }; - mcvis = derive2 { name="mcvis"; version="1.0.4"; sha256="0r95pnl3ar7w046wyrc39mr8mf6z5rnzqqfhgz2cpn3bgli0v9sj"; depends=[assertthat dplyr ggplot2 igraph magrittr psych purrr reshape2 rlang shiny]; }; + mcvis = derive2 { name="mcvis"; version="1.0.6"; sha256="14vx9nrdsggkwp3c1jamhxx20h3byamhb8bamf04fvycvwsgibf3"; depends=[assertthat dplyr ggplot2 igraph magrittr psych purrr reshape2 rlang shiny]; }; md = derive2 { name="md"; version="1.0.4"; sha256="13z8f3p84kivk6j58fb1qpzrmml41mq9pgv9nv2gvxrhyhanzi46"; depends=[]; }; md_log = derive2 { name="md.log"; version="0.1.1"; sha256="0ix5nz38xzlhrga40hfhlfss938mrfbni2wysvz2qbpm59qxrhg0"; depends=[futile_logger]; }; mda = derive2 { name="mda"; version="0.5-2"; sha256="1hq0zhhz9klmp4zcr1w8hyn7s1h9kfg57d2l2mfm7psx459j0krl"; depends=[class]; }; mdapack = derive2 { name="mdapack"; version="0.0.2"; sha256="1dfcjh8yax06m890ql0kc2rn539z4xbhw7bq9a8cbrm7jnkq03iq"; depends=[covr curl devtools FactoMineR ggplot2 gh git2r httr knitr mice openssl pkgbuild reshape2 rlang rmarkdown roxygen2 spelling testthat VIM]; }; - mdatools = derive2 { name="mdatools"; version="0.11.1"; sha256="1wp2rpfh11zlxq06yb3n6p5ig6arw8iladb08qnv472ddza14707"; depends=[Matrix]; }; + mdatools = derive2 { name="mdatools"; version="0.11.2"; sha256="0nggnhp191hyjva8bkr8ixxwn32chgbshl8g6ak1vqnijr9jrrlp"; depends=[Matrix]; }; + mdbr = derive2 { name="mdbr"; version="0.1.2"; sha256="1c33v2dqz1jjh730p486bi07h9m9clpcfrbvhbvwb8fslqxg76qd"; depends=[readr]; }; mde = derive2 { name="mde"; version="0.2.1"; sha256="0d28nhj36v6v40ylg575cjw5qqizfn9ch1yc4hffd6gzk35q441q"; depends=[dplyr tidyr]; }; mded = derive2 { name="mded"; version="0.1-2"; sha256="1j8fcz5yc70p9qd9l010xj1b625scdps8z1pqh75b45p2hiqbhlc"; depends=[]; }; mdendro = derive2 { name="mdendro"; version="1.0.1"; sha256="0pk7b7zn9afc947parkj1qa4d85gq16lalg07fjfripxjnmvjahw"; depends=[rJava]; }; @@ -10565,7 +11010,7 @@ in with self; { mdsOpt = derive2 { name="mdsOpt"; version="0.5-1"; sha256="01gcrlmcgi1phz4952bkbf2xzd2j06lq1d6cn3nf3jz9sy5xy7f8"; depends=[animation clusterSim plotrix smacof smds spdep symbolicDA]; }; mdscore = derive2 { name="mdscore"; version="0.1-3"; sha256="10cl5r6kd9chdik5v0q91x40xpw2cjvvyi220z4bvngpb0989x8j"; depends=[MASS]; }; mdsdt = derive2 { name="mdsdt"; version="1.2"; sha256="0nbzc54jac4wmfyrs821ycxh749cb1zfxcws0nbpk35rydqkc627"; depends=[ellipse mnormt polycor]; }; - mdsr = derive2 { name="mdsr"; version="0.1.7"; sha256="1angy75nyhzwfhmb4axs14yl0jsxjaiqh5nz2jpmi5j890y32zda"; depends=[babynames DBI dbplyr downloader dplyr fs ggplot2 mosaic RMySQL]; }; + mdsr = derive2 { name="mdsr"; version="0.2.3"; sha256="0hwv4jgxd3pjczd7zppp16k0pc0z5ifdfk5gx73f0x21gpcf3k0n"; depends=[babynames DBI dbplyr downloader dplyr fs ggplot2 htmlwidgets kableExtra RMySQL skimr stringr tibble webshot]; }; mdthemes = derive2 { name="mdthemes"; version="0.1.0"; sha256="1k0fylg8jz0xdfwq85wap6lgrb9zi219vhmry4lysqssx2szkngk"; depends=[cowplot ggplot2 ggtext ggthemes hrbrthemes tvthemes]; }; mdw = derive2 { name="mdw"; version="2020.6-17"; sha256="0jjajgb1w3vx7vqn2z90xq39hvbcrrd2ky8p31g5absqwwm7lwpa"; depends=[kyotil MASS Matrix]; }; meaRtools = derive2 { name="meaRtools"; version="1.0.4"; sha256="1nxyvdq4670696mhg0svxxlvk9hnr8szai8b18pw6754kmw1bjvn"; depends=[emdist ggplot2 gridExtra gtools lattice plyr Rcpp reshape2]; }; @@ -10578,7 +11023,7 @@ in with self; { meboot = derive2 { name="meboot"; version="1.4-8"; sha256="10kii09v1nm7m3sqn1wsszc5m0zn0bkip9zjpvn84xdf3nz9kp8b"; depends=[dynlm nlme tdigest]; }; medExtractR = derive2 { name="medExtractR"; version="0.2"; sha256="17fc54w1jizqji27xsyiq6v31q8r86sps1nl6mgqsi5h7mzni98g"; depends=[stringr]; }; mederrRank = derive2 { name="mederrRank"; version="0.0.8"; sha256="1fvvik3bhjm6c0mhi2ma915986k2nj3lr2839k5hfrr7dg3lw3f4"; depends=[BB numDeriv]; }; - medfate = derive2 { name="medfate"; version="1.0.0"; sha256="1rm1m3skma21d0r7pg5bk7v9cywpb2hjlib8xyrir6bi505lkfbq"; depends=[ggplot2 meteoland Rcpp sp spdep]; }; + medfate = derive2 { name="medfate"; version="1.1.0"; sha256="1cq83phvbirw7q8ik9jiv7y1jk59yjjs2r09qcj7jqsy7gb5qa6j"; depends=[ggplot2 httr jsonlite meteoland Rcpp sp spdep]; }; medflex = derive2 { name="medflex"; version="0.6-7"; sha256="171vp0wmmmbz42xcwjy065vhvig49s4ac2hzawfww2mvpfj0g0fj"; depends=[boot car Matrix multcomp sandwich]; }; mediacloudr = derive2 { name="mediacloudr"; version="0.1.0"; sha256="1r11mpz44msla71lqw45r9s8z7rwvbnqi026l0ljx6crby183h0w"; depends=[httr jsonlite rvest xml2]; }; mediation = derive2 { name="mediation"; version="4.5.0"; sha256="0i88wvqqw8cmxmh9i78rqzp4s16zhf12dgl9fsk9bhw7hxhhc0i1"; depends=[boot Hmisc lme4 lpSolve MASS Matrix mvtnorm sandwich]; }; @@ -10588,25 +11033,26 @@ in with self; { meditate = derive2 { name="meditate"; version="0.1.3"; sha256="02mgnbxlvi73zpnghlcx89jvri8144cf0bzq0hrbhh2nq2c1sdjg"; depends=[audio checkmate deldir wesanderson]; }; meditations = derive2 { name="meditations"; version="1.0.1"; sha256="0wnx3zadpngfch0sb0ifqvsmzl613639f1yazwsgvhk29mycx4ss"; depends=[]; }; medmod = derive2 { name="medmod"; version="1.0.0"; sha256="1f7bzdcjnbz9izlfblxcaa85qxx8kzn62qgjd3qlb7jl7mdy5q54"; depends=[ggplot2 jmvcore lavaan R6]; }; + medrxivr = derive2 { name="medrxivr"; version="0.0.4"; sha256="0jsfak1kp06j8n4d6y3d3dhnj25kxwns1l38an6gkm3dgmc5a30r"; depends=[bib2df curl dplyr httr jsonlite lubridate progress rlang stringr tibble vroom]; }; meetupapi = derive2 { name="meetupapi"; version="0.1.0"; sha256="1iaxpfzgn478np9cjwz0zalfy1p7jwabnwpfv31svw052i8bs9yl"; depends=[dplyr httr magrittr purrr]; }; mefa = derive2 { name="mefa"; version="3.2-7"; sha256="1qrf6d3y38q7yy6bg3bxg7514d9paz1f8y6sr7lbksi30qn92fmj"; depends=[]; }; mefa4 = derive2 { name="mefa4"; version="0.3-7"; sha256="0iq3n77gbl3zbplaqp1nwb72y9w797m938albx27727pkzyanxf1"; depends=[Matrix]; }; meifly = derive2 { name="meifly"; version="0.3"; sha256="1x3lhy7fmasss0rq60z5qp74ni32sahw62s8cnp2j431sp95pczc"; depends=[leaps MASS plyr]; }; mekko = derive2 { name="mekko"; version="0.1.0"; sha256="09y50k4r4mnx351a5zhkqg9s2xyl3d149dhmfy2z6hzm5yg2ajyi"; depends=[ggplot2]; }; meltt = derive2 { name="meltt"; version="0.4.1"; sha256="1113rdw0jglwkcd3g31llhgzqmwpxfz2bp60m3x2zdbdrvwc1z9n"; depends=[dplyr ggplot2 leaflet plyr Rcpp RcppArmadillo reticulate shiny shinyjs tibble tidyr]; }; - mem = derive2 { name="mem"; version="2.15"; sha256="1q8h6mbpzybg1vzi2pgp8fpxfrp4d729n5ghh0a54wjdwdjgkpq1"; depends=[boot dplyr EnvStats ggplot2 mclust RColorBrewer RcppRoll sm tidyr]; }; - memapp = derive2 { name="memapp"; version="2.13"; sha256="0n4awpxsz34rrz53bp4dyfgs9zssrxd4f8zyj6zw89j6ahkz85w6"; depends=[dplyr DT foreign formattable ggplot2 haven mem openxlsx plotly RColorBrewer readxl RODBC shiny shinyBS shinydashboard shinyjs shinythemes shinyWidgets stringi stringr tidyr]; }; + mem = derive2 { name="mem"; version="2.16"; sha256="16xm9hai1aqhrbpxln6az4qbwz3kk2izmq39nzpzjc3ardpq1ljr"; depends=[boot dplyr EnvStats ggplot2 mclust purrr RColorBrewer RcppRoll sm tidyr]; }; + memapp = derive2 { name="memapp"; version="2.14"; sha256="0w2lbypz0bc50s6yrvidz96wpz53cxpk5a9yhbq7rp8chr9r8cm3"; depends=[dplyr DT foreign formattable ggplot2 haven mem openxlsx plotly RColorBrewer readxl RODBC shiny shinyBS shinydashboard shinyjs shinythemes shinyWidgets stringi stringr tidyr]; }; meme = derive2 { name="meme"; version="0.2.2"; sha256="1q78q8080vvqni8ncqp326pidfjfia0f2b6pis08m7fr1q1gcqca"; depends=[ggplot2 gridGraphics magick showtext sysfonts]; }; memery = derive2 { name="memery"; version="0.5.2"; sha256="1hr52g69lr2n84yczm8i8yxh7rys5nr8jk1hcmv548p5y79l8k9s"; depends=[Cairo colourpicker cowplot ggplot2 jpeg magrittr png purrr shiny shinyBS shinycssloaders showtext sysfonts]; }; memgene = derive2 { name="memgene"; version="1.0.1"; sha256="1x3vf2f1yh40xw5vqcjlrn07zn9zh3sx4kc9dijxzygd9crl5a29"; depends=[ade4 gdistance raster vegan]; }; - memisc = derive2 { name="memisc"; version="0.99.25.6"; sha256="1cb74gl205f6rhlj5hk433glba89ljrn5fzypgb5fngks7jsxawl"; depends=[data_table lattice MASS repr]; }; + memisc = derive2 { name="memisc"; version="0.99.27.3"; sha256="0cv8pv1852p2mkxxzyzfqp9l2yr2nyrzzqbj22rxk01za1gjcg32"; depends=[data_table lattice MASS repr]; }; memo = derive2 { name="memo"; version="1.0.1"; sha256="14nvqi1qsin45ksd0wp9cigjk1gghr4jijdqkaqh177dwa244r9j"; depends=[digest]; }; memochange = derive2 { name="memochange"; version="1.1.1"; sha256="144134kpchb7ps8b2g7pyga5add0iqphzcwygf11aybmbzmp90x7"; depends=[forecast fracdiff longmemo LongMemoryTS sandwich strucchange urca]; }; memoise = derive2 { name="memoise"; version="1.1.0"; sha256="034qfc2xlh30x1q2vya239w34a3ir3y2fwnx2agbgbi6592zjxmj"; depends=[digest]; }; memor = derive2 { name="memor"; version="0.2.2"; sha256="0b386l4aclj86rhzzhmi8dmkkbcd1pwaj3as0lc11q0nj2gjrs7i"; depends=[knitr rmarkdown yaml]; }; memoria = derive2 { name="memoria"; version="1.0.0"; sha256="05nx6xkgf1mkn1ajjizwp66xhn7ddbvgdnmkdbcl4s7sq456vczw"; depends=[cowplot ggplot2 HH ranger stringr tidyr viridis viridisLite zoo]; }; memuse = derive2 { name="memuse"; version="4.1-0"; sha256="1bbjp8y0ji71956fbaxiil7ynq2nkmmgz7i9xps83m3bbp5d3mjq"; depends=[]; }; - merDeriv = derive2 { name="merDeriv"; version="0.1-9"; sha256="1zp9w79pm3n8673h3h7ic9zx6p5i0cd6kpmbyfs365flgvcbdmsg"; depends=[lavaan lme4 Matrix matrixcalc nonnest2 numDeriv sandwich]; }; + merDeriv = derive2 { name="merDeriv"; version="0.2-2"; sha256="0n4crlxgjp58w5jb8fm01k4b9i8yflr875xajr4dayc6764wiism"; depends=[lavaan lme4 Matrix nonnest2 numDeriv sandwich]; }; merTools = derive2 { name="merTools"; version="0.5.2"; sha256="1ka9aa3fgs1kqfqhi1sz6v6g5mbbbzxyb7c0n8s981g8d04vsi00"; depends=[abind arm blme broom_mixed dplyr foreach ggplot2 lme4 mvtnorm shiny]; }; mergeTrees = derive2 { name="mergeTrees"; version="0.1.3"; sha256="17aqgfd1ky5zq6i9s1djvdqjdd8lzkblf0cdw82i9mpzfhcz1fav"; depends=[Rcpp]; }; mergedblocks = derive2 { name="mergedblocks"; version="1.0.0"; sha256="0g209f9vr5gjgsljnb6i8jr48azv982dbfc1anggfip82qivicqn"; depends=[randomizeR]; }; @@ -10614,23 +11060,25 @@ in with self; { merror = derive2 { name="merror"; version="2.0.2"; sha256="13d9r5r83zai8jnzxaz1ak40876aw20zbpr244gs55rvj5j7f87q"; depends=[]; }; messaging = derive2 { name="messaging"; version="0.1.0"; sha256="0q19cqp1zgh0yhk1ql0jqf414bhx6jwhkairq6wx2cmkli2g7k1y"; depends=[dplyr glue magrittr rlang stringr]; }; met = derive2 { name="met"; version="0.1.0"; sha256="0714103xzc4n178307czxmcv7ygjiigjr9b6xnj240ljp7qmln19"; depends=[DiPs]; }; - metR = derive2 { name="metR"; version="0.7.0"; sha256="0zdnsggvmkyxq0a6n7rhzp82n4hciayzajs4svw504i30ij5q5db"; depends=[checkmate data_table digest fields Formula formula_tools ggplot2 gtable lubridate memoise plyr purrr RCurl scales sp stringr]; }; + metR = derive2 { name="metR"; version="0.9.0"; sha256="0s8gnjlc9h0y4dlkj9jk4z4d182spf37mlzykiz4gqxl19sfbbri"; depends=[checkmate data_table digest fields Formula formula_tools ggplot2 gtable isoband lubridate memoise plyr purrr RCurl scales sp stringr]; }; metRology = derive2 { name="metRology"; version="0.9-28-1"; sha256="1syjwblyd18myxrs0hx4m91fgb6zs3r4g7w701j2f2pw6j9mvz0y"; depends=[MASS numDeriv robustbase]; }; metScanR = derive2 { name="metScanR"; version="1.2.3"; sha256="1v7zrxj3wspx6f5n5s75skcygbf3r85rn4p0z9iwbrbrgxwi4qgs"; depends=[geosphere leaflet matlab plyr RCurl]; }; - meta = derive2 { name="meta"; version="4.13-0"; sha256="1aiazqirgz7mnpwg0g0m9x5rbdpvdpmbx6q7hpqjih66qjn2hlfh"; depends=[CompQuadForm lme4 metafor]; }; + meta = derive2 { name="meta"; version="4.15-1"; sha256="1hggaw1nlyvsz5w8rhj305b2qm2jc183bmv76nimcdsbk7hvcsqb"; depends=[CompQuadForm lme4 metafor xml2]; }; meta4diag = derive2 { name="meta4diag"; version="2.0.8"; sha256="1ila8x9r1rdmlwfpzfx1zj5yx1m4yrbhyb74db4wqbh1dswn7zsm"; depends=[caTools shiny shinyBS sp]; }; metaBLUE = derive2 { name="metaBLUE"; version="1.0.0"; sha256="0ppn4bvr10z32pghmv4wjv86k6n5y5bkfxc6h5mvb556v6jnl6d8"; depends=[Matrix]; }; - metaBMA = derive2 { name="metaBMA"; version="0.6.3"; sha256="1q9mb72p4bccl79hpj01fa3bs3n9hbcf63nzpni3ba9limiizb82"; depends=[BH bridgesampling coda LaplacesDemon logspline mvtnorm Rcpp RcppEigen rstan rstantools StanHeaders]; }; + metaBMA = derive2 { name="metaBMA"; version="0.6.5"; sha256="1fx5xn2in4zbjrjakgfhmf298xz7z0afyl9arfzf0ii777mkc453"; depends=[BH bridgesampling coda LaplacesDemon logspline mvtnorm Rcpp RcppEigen rstan rstantools StanHeaders]; }; metaDigitise = derive2 { name="metaDigitise"; version="1.0.1"; sha256="1cwvb6b4a1pfixbknbjjylsmpkccgi163h0kbf7zfjaqjg2y9mzh"; depends=[magick purrr]; }; + metaEnsembleR = derive2 { name="metaEnsembleR"; version="0.1.0"; sha256="1vxrzdm4j3h91h0fvps36a8xhs1b8cylw2cw2mhvg20lpcjjdsdv"; depends=[caret e1071 gbm ggplot2 gridExtra randomForest]; }; metaLik = derive2 { name="metaLik"; version="0.43.0"; sha256="1li40pgd9z00nrph9njwn6wysb1i9dkpqzcp6fzds6asvcxlqqfl"; depends=[]; }; metaMA = derive2 { name="metaMA"; version="3.1.2"; sha256="1mjyz06q1kc8lhfixpym4ndpnisi1r849fj3da6riwfd6ab1v181"; depends=[limma SMVar]; }; metaMix = derive2 { name="metaMix"; version="0.3"; sha256="17qkwg9iz5v63ybyvqppbf044l0pi0ym5pw283174dlx8lfac60q"; depends=[data_table ggplot2 gtools Matrix Rmpi]; }; metaRMST = derive2 { name="metaRMST"; version="1.0.0"; sha256="1mq9j7iczjh7d3cps9g1bh0f8k388bdn8d5lkjs2s8y9fq1kxzmx"; depends=[meta mvmeta rstpm2 survival survRM2]; }; - metaRNASeq = derive2 { name="metaRNASeq"; version="1.0.2"; sha256="1xz7df7ypq4326yg429pgxd6aldp14c3h3qi20j5nqr5xgsdgzqa"; depends=[]; }; - metaSDTreg = derive2 { name="metaSDTreg"; version="0.2.0"; sha256="08q2llzqakrrxab73a63s4bpqq461m4q1dl60za9826yxl3g86b8"; depends=[Matrix maxLik ordinal truncnorm]; }; - metaSEM = derive2 { name="metaSEM"; version="1.2.4"; sha256="0dhdp9wm5idblf6z18a192c4zz0r993y6nqgs22icmmc4ags73q6"; depends=[ellipse lavaan MASS Matrix mvtnorm numDeriv OpenMx]; }; - metaboGSE = derive2 { name="metaboGSE"; version="1.2.4"; sha256="1blgadhlvc6bsy6dj0lw8gp7j5gbbv2rqwzav1bmcgvn4fv6asw8"; depends=[AnnotationDbi ape Matrix sybil]; }; - metabolighteR = derive2 { name="metabolighteR"; version="0.1.0"; sha256="1kbwxwcx5f836bhwx32a41c6753832wigx0b6gi9zblc4qsnqvlq"; depends=[dplyr httr magrittr purrr]; }; + metaRNASeq = derive2 { name="metaRNASeq"; version="1.0.3"; sha256="1zby60kw1kdsc06g3xx5ck20nfm1yavvg5w7gq0m2d2hd1nhlim6"; depends=[]; }; + metaSDTreg = derive2 { name="metaSDTreg"; version="0.2.1"; sha256="0nqnb0isjz2czvih6zr4jglrwfmf9ahm9a3nwkvr2cwbmdh5clq2"; depends=[Matrix maxLik ordinal truncnorm]; }; + metaSEM = derive2 { name="metaSEM"; version="1.2.5"; sha256="05lmangh8fggyfiad2qnrfh1mw3za3xjac5d5dcffimqlbm8hmb3"; depends=[ellipse lavaan MASS Matrix mvtnorm numDeriv OpenMx]; }; + metaSurvival = derive2 { name="metaSurvival"; version="0.1.0"; sha256="05f103fi287y64gys73a55snw54bnph69q8dykfii10dykd44g0y"; depends=[mvtnorm survival]; }; + metabolic = derive2 { name="metabolic"; version="0.1.0"; sha256="1bk8d0sxlgc17d7x02zmx23fdqz39c9zpin16bzhcj602kjcq0y8"; depends=[cli dplyr forcats ggfittext ggimage ggplot2 glue magrittr meta patchwork purrr rmarkdown scales stringr tibble tidyr usethis]; }; + metabolighteR = derive2 { name="metabolighteR"; version="0.1.1"; sha256="0mldfmkq1600h17qxfwy7llpijwdgal8n8nf4ya1ria3nvyvjl3k"; depends=[crayon dplyr httr magrittr purrr]; }; metacart = derive2 { name="metacart"; version="2.0-3"; sha256="1wim72fvhx6cyc16c9gl8cwzbhlpzilk7q8gi4jnzzazqmc1kb5n"; depends=[ggplot2 gridExtra Rcpp rpart]; }; metacoder = derive2 { name="metacoder"; version="0.3.4"; sha256="0qnsn6zpk9vf5p4jj0pdkldi0p7a1rjccdrk68qswy04dlsq15vg"; depends=[ape biomformat cowplot crayon dplyr GA ggfittext ggplot2 ggrepel igraph lazyeval magrittr phylotate RColorBrewer Rcpp RCurl readr reshape reshape2 rlang scales seqinr stringr svglite taxa taxize tibble traits vegan viridisLite zoo]; }; metacom = derive2 { name="metacom"; version="1.5.3"; sha256="0c0gzn28cl2sl52wx2n36jm9c18d9s3yqjyx88kgbmd9069z1nvk"; depends=[vegan]; }; @@ -10641,25 +11089,27 @@ in with self; { metafor = derive2 { name="metafor"; version="2.4-0"; sha256="1b599fxk7s0brkchmx698fr5k4g1kzkia2rnlvhg349ffs5nfjmn"; depends=[Matrix nlme]; }; metaforest = derive2 { name="metaforest"; version="0.1.3"; sha256="1q6m60cd7gl7y0gdjd10ky25hwv5jc4x5g5sr5w61xc3j2hnw8in"; depends=[data_table ggplot2 gtable metafor ranger]; }; metafuse = derive2 { name="metafuse"; version="2.0-1"; sha256="1zdw22f5kzvy2xr3c2csy873hcags60as567brc2sw17d0apfy8j"; depends=[evd glmnet MASS Matrix]; }; - metagam = derive2 { name="metagam"; version="0.1.2"; sha256="0vh78fzj7c6f4xca5wx2q9x33046wajriia103nwbdacrp48hpki"; depends=[dplyr furrr ggplot2 knitr metafor metap purrr rlang stringr tidyr]; }; + metagam = derive2 { name="metagam"; version="0.2.0"; sha256="0il5m02v3fv5gl9pf3ggkv0kwaycmvvaxzxda20rg30cbhma27vy"; depends=[dplyr furrr ggplot2 knitr metafor metap purrr rlang stringr tidyr]; }; metagear = derive2 { name="metagear"; version="0.6"; sha256="1xfpjqawnwsg2djnygzyg6ak7gylj60wlhfkkipnrpy8bbpvc8j2"; depends=[EBImage hexView MASS Matrix metafor RCurl stringr]; }; metaheuristicOpt = derive2 { name="metaheuristicOpt"; version="2.0.0"; sha256="0ra4hl9l1jlzymj218m2i6xrxfacyx4aaln5pk7q4di2ks0nq11m"; depends=[]; }; + metajam = derive2 { name="metajam"; version="0.2.3"; sha256="0ryzsnwfhapsyz40ckjj6gn2chf37m62z3l7xv703878bghpdqwc"; depends=[dataone dplyr EML emld lubridate purrr readr rlang stringr tibble tidyr]; }; metamedian = derive2 { name="metamedian"; version="0.1.5"; sha256="1v2nha2qc9vs2s9nfvbia033ppprkwxj5fadlrpy20fj2lr8z7z6"; depends=[estmeansd Hmisc metafor]; }; metamer = derive2 { name="metamer"; version="0.2.0"; sha256="0wdhr83mph9v7vb9mfhf7lcwmp0smz72sniass7kxcbj6j9hga4g"; depends=[FNN progress]; }; - metamisc = derive2 { name="metamisc"; version="0.2.2"; sha256="0ll245a3f442n7jyjshcn87l725mgk132ri73kynrwh0z8g2r7i5"; depends=[ggplot2 lme4 metafor mvtnorm plyr pROC]; }; - metan = derive2 { name="metan"; version="1.7.0"; sha256="1lk9x83c7v8njv71dr0lvcz6376w6q5wc0wphndvy364lg8c7i37"; depends=[ade4 cowplot dplyr FWDselect GGally ggforce ggplot2 ggrepel lme4 lmerTest magrittr progress purrr rlang tibble tidyr tidyselect]; }; + metamicrobiomeR = derive2 { name="metamicrobiomeR"; version="1.2"; sha256="0fgdjy2s47pqmb9x79a4sf0kn4hbc49rd41jnzw0d3ll1l9kwy7f"; depends=[compositions dplyr gamlss gdata ggplot2 gridExtra lme4 lmerTest matrixStats meta plyr tidyr zCompositions]; }; + metamisc = derive2 { name="metamisc"; version="0.2.3"; sha256="13hcjl0z22dfl12nip0ni5fd9jqgr2569l5300g7mhsnd45k6ijp"; depends=[ggplot2 lme4 metafor mvtnorm plyr pROC]; }; + metan = derive2 { name="metan"; version="1.11.0"; sha256="0rkaanwdjg11q4k3qw5indxpbpdisb6hx87awjsxb2360zqqxd2k"; depends=[dplyr GGally ggforce ggplot2 ggrepel lme4 lmerTest magrittr mathjaxr patchwork progress purrr rlang tibble tidyr tidyselect]; }; metansue = derive2 { name="metansue"; version="2.4"; sha256="1ja7a3z4d764a1rcf256kmzf8xc6d8x7mqq12vzznw5ks8r2p9hk"; depends=[]; }; metap = derive2 { name="metap"; version="1.4"; sha256="19c51fa5kh4yq3v7jd8cilgv9xr59qv20xprqgmlxbfh4gc27b2z"; depends=[lattice mathjaxr mutoss Rdpack TFisher]; }; metaplot = derive2 { name="metaplot"; version="0.8.3"; sha256="1zw8bq2fy9m15dfc92ag0dz2k9dqrf5jbvfaycizcgsgaqd79s1c"; depends=[dplyr encode ggplot2 gridExtra gtable lattice magrittr rlang scales tidyr]; }; metaplotr = derive2 { name="metaplotr"; version="0.0.3"; sha256="01iala6cxsxv30fnlh80md5mpy3ksd2piw90zcls8f68g1c6v1jy"; depends=[ggplot2 gridExtra]; }; metaplus = derive2 { name="metaplus"; version="0.7-11"; sha256="05pkgw0zlq3q9mvdw2yxz9mxzqwq3c8q6cwvh87cigw1pf8y9an7"; depends=[bbmle boot fastGHQuad lme4 MASS metafor numDeriv]; }; metapost = derive2 { name="metapost"; version="1.0-6"; sha256="098f7sifg814mc4sb1nb4d6dlr1xms5hwyp08ksxg0i4ayf9jf3c"; depends=[gridBezier]; }; - metapower = derive2 { name="metapower"; version="0.1.0"; sha256="0y1s7szljpx763dm38nnm5q54x7paq0hn7l47c3vyjha99fpzzjw"; depends=[cowplot dplyr ggplot2 knitr magrittr rlang rmarkdown testthat tidyr]; }; + metapower = derive2 { name="metapower"; version="0.2.1"; sha256="04hkv1v2wh92rg8izpw0g99cbhln110zdh6cijacf0lgflh2gza0"; depends=[cowplot dplyr ggplot2 knitr magrittr rlang testthat tidyr]; }; metapro = derive2 { name="metapro"; version="1.5.8"; sha256="0ymbqzm317fiywzxaizddhvjzwp2wyx9y7zgbg4nrz11l3r2bp2n"; depends=[metap rSymPy]; }; metarep = derive2 { name="metarep"; version="1.0.1"; sha256="0jnxx11jxj63ry0bkjlh9g2x2pr2qi24nql99iibz2ckbx8344p3"; depends=[meta]; }; - metasens = derive2 { name="metasens"; version="0.4-1"; sha256="158lv7knybfhavnfra9f6dyhc7zska70rv06aq5mvzzj1mw4m4mj"; depends=[meta]; }; + metasens = derive2 { name="metasens"; version="0.5-0"; sha256="1kyfhhwxfyrkr93jbzy73g0rscymdyi1a58knaw5cm7lb7gxqg1s"; depends=[meta]; }; metatest = derive2 { name="metatest"; version="1.0-5"; sha256="1h3dcs1m7606b3a41yw2lak3lrqmsbpnx67qv24wvq003apz1sfd"; depends=[]; }; - metathis = derive2 { name="metathis"; version="1.0.2"; sha256="07aha4j401zlm6abfmq70vqc215bpsi5hqi50npz33rpb1m3r9rq"; depends=[htmltools knitr magrittr purrr]; }; + metathis = derive2 { name="metathis"; version="1.0.3"; sha256="12vn0b5mmf3i5cn44zh901i6dlgd95xa09vray644lz5nmllh7l8"; depends=[htmltools knitr magrittr purrr]; }; metavcov = derive2 { name="metavcov"; version="1.1"; sha256="1x87knvypkfg0x223aiak7fy7zdlfn74crmvnqzhxf2vmxljnvnh"; depends=[corpcor]; }; metaviz = derive2 { name="metaviz"; version="0.3.1"; sha256="0jvv49rw66v7saj2y1q88rp6fyzq7473af5d3k77ymvjbpqyrbyz"; depends=[dplyr ggplot2 ggpubr gridExtra metafor nullabor RColorBrewer]; }; metawho = derive2 { name="metawho"; version="0.2.0"; sha256="1mflkrlnb1wk9vbbj621cy64s78q677d8fcnsi1ybh49k7sqmw20"; depends=[dplyr forestmodel magrittr metafor purrr rlang]; }; @@ -10667,18 +11117,18 @@ in with self; { meteo = derive2 { name="meteo"; version="0.1-5"; sha256="0n37plka9vsxwd03lca3h6m8dcz3f1bi46jn3bz7vyilnkq9hcdk"; depends=[gstat plyr raster rgdal snowfall sp spacetime]; }; meteoForecast = derive2 { name="meteoForecast"; version="0.53"; sha256="15bjhkcn4zcll3cfgpzcdj0zv753x29qsjndy3h2zzqn83qywx9s"; depends=[ncdf4 raster sp XML zoo]; }; meteogRam = derive2 { name="meteogRam"; version="1.0"; sha256="167gyxjnl4dyfqs3znv8sdpkvpqdxzdqi1g730s30gycrm9snap9"; depends=[ggplot2 RadioSonde]; }; - meteoland = derive2 { name="meteoland"; version="0.9.3"; sha256="1zij805zrakdyf3yy52fsgz28ww5c5a7yip7w9xn2vf6d9w70k5m"; depends=[httr jsonlite ncdf4 Rcpp rgdal sp spdep]; }; + meteoland = derive2 { name="meteoland"; version="0.9.7"; sha256="0m2q451zgvimd3xx3h66c3blzp7r5waj8ddb9p8hg5aj3drq2l8p"; depends=[httr jsonlite ncdf4 Rcpp rgdal sp spdep]; }; meteor = derive2 { name="meteor"; version="0.3-4"; sha256="01009d9wpxybig4n82m48hqqg1k4x4shcjxfy8y0kk7cgfdb4naw"; depends=[Rcpp]; }; meteorits = derive2 { name="meteorits"; version="0.1.1"; sha256="1vk8pbhfc5mbkbpw7ml81gx9i8187xp3vx36pbyyhjbrpy6gqabx"; depends=[MASS pracma Rcpp RcppArmadillo]; }; methcon5 = derive2 { name="methcon5"; version="0.1.0"; sha256="08xsi6j65izxqcrlh37f2d7m3pwna1v6zvdv96mqylsjqgqmbk5x"; depends=[dplyr magrittr purrr rlang]; }; metools = derive2 { name="metools"; version="1.0.0"; sha256="05l49ifx2nnlbdxh2qhdb0islf95fc67720rm5in7mrlida4khnq"; depends=[ggplot2 lubridate scales stringr tibble tidyr]; }; metricsgraphics = derive2 { name="metricsgraphics"; version="0.9.0"; sha256="1zbx82b34y0rr4w7rzvyc1nzk95w6cdkg0j1kkshbmkvplq6v9i4"; depends=[htmltools htmlwidgets magrittr]; }; - metropolis = derive2 { name="metropolis"; version="0.1.5"; sha256="0nhkzy1miycqa2jqh9gh1l48n03nig99q19f46dm8qqci7a90vlp"; depends=[coda]; }; - mets = derive2 { name="mets"; version="1.2.7.1"; sha256="1b3bsxdwzl5rilnsga9cgzb7dafcfk2q39582rif34wim8xxzzv7"; depends=[lava mvtnorm numDeriv Rcpp RcppArmadillo survival timereg]; }; + metropolis = derive2 { name="metropolis"; version="0.1.8"; sha256="031fcy0v13bvy7gg26988fvpqdsfndx2rynkhb1jvirnrf0fngy4"; depends=[coda]; }; + mets = derive2 { name="mets"; version="1.2.8.1"; sha256="0prhnjqgrvw650f89sy7wj52wsd7h7gc4iqinv17j54ag8xrnhcq"; depends=[lava mvtnorm numDeriv Rcpp RcppArmadillo survival timereg]; }; metsyn = derive2 { name="metsyn"; version="0.1.2"; sha256="0iwp0nz07yd33qd93fjblmvik1l1xkv6rkccn3054zs2bkrzjq4f"; depends=[foreach readr stringr tibble]; }; mev = derive2 { name="mev"; version="1.13.1"; sha256="1zbr5f8w56c9z0lp4ak47fxnnfrdm74liqcjvij0n4ajqs6glaak"; depends=[alabama boot evd nleqslv nloptr Rcpp RcppArmadillo TruncatedNormal]; }; mewAvg = derive2 { name="mewAvg"; version="0.3.0"; sha256="16gc78ccjffp9qgc7rs622jql54ij83ygvph3hz19wpk22m96glm"; depends=[]; }; - mexhaz = derive2 { name="mexhaz"; version="1.8"; sha256="1lgv626a6b2k0ccprzfr671ldyqprn17fi5bsaj63vsi10gdd503"; depends=[lamW MASS numDeriv statmod survival]; }; + mexhaz = derive2 { name="mexhaz"; version="1.10"; sha256="0bgnixbl3birn1xdbxdahs9204manr64afwy8wxhz3b2qpa3fhyi"; depends=[lamW MASS numDeriv statmod survival]; }; mfGARCH = derive2 { name="mfGARCH"; version="0.2.0"; sha256="19v0kqn70h42vsyg4ldi5qivhwh97zk8shvahdzxbcqjjig6lylh"; depends=[maxLik numDeriv Rcpp zoo]; }; mfbvar = derive2 { name="mfbvar"; version="0.5.4"; sha256="1rarmlfb8fpc8zwydzf198w8z5wrw7gnr4j93rnbr9y5c0z0pmh5"; depends=[dplyr ggplot2 GIGrvg lubridate magrittr Rcpp RcppArmadillo RcppParallel RcppProgress stochvol tibble zoo]; }; mfdb = derive2 { name="mfdb"; version="6.2-0"; sha256="11xi915plc90awasmny9ynwmz0yw18frfp1q2xv7bqk4v96fcxgp"; depends=[DBI getPass logging RPostgreSQL]; }; @@ -10688,21 +11138,24 @@ in with self; { mgarchBEKK = derive2 { name="mgarchBEKK"; version="0.0.2"; sha256="1k4c34srnckbh5kchzmm44l91ma9sw0gi4y225igs3cl79212q9c"; depends=[mvtnorm tseries]; }; mgc = derive2 { name="mgc"; version="2.0.2"; sha256="1l9qs4nz1rn56qp569nh26yz3c7i4zh3r43c209zh7kvizpagx0i"; depends=[abind boot energy MASS raster]; }; mgcViz = derive2 { name="mgcViz"; version="0.1.6"; sha256="12isaqpbhdg2qhw76wj6hqi233dw3md061bbirkgzr5clrb8kxlk"; depends=[gamm4 GGally ggplot2 gridExtra KernSmooth matrixStats mgcv miniUI plyr qgam rgl shiny viridis]; }; - mgcv = derive2 { name="mgcv"; version="1.8-31"; sha256="1if34mqsn9r7g0l82lxvvx0wjhi9paqdymyd73nschxcl1if8vbk"; depends=[Matrix nlme]; }; + mgcv = derive2 { name="mgcv"; version="1.8-33"; sha256="1x1bdzz2b2f05626xygwqp30b4rhblgg76hs15j9ab4fjan7pjwq"; depends=[Matrix nlme]; }; + mgee2 = derive2 { name="mgee2"; version="0.1"; sha256="1j5s5b00pm49ds6zps0cysxmv76zvjimyr6p631awvdww84az00g"; depends=[ggplot2 MASS Matrix]; }; mglmn = derive2 { name="mglmn"; version="0.1.0"; sha256="1g642hhs28q6x34xgrfrmmsb2jsn9zy4jxad0x5ai3px48zzdb4r"; depends=[mvabund snowfall]; }; mgm = derive2 { name="mgm"; version="1.2-10"; sha256="1paiarr7g1p214k7x19njpf5xkhfpcsm5ds28l4y7qrj0jdvb5i6"; depends=[glmnet gtools Hmisc matrixcalc qgraph stringr]; }; mgpd = derive2 { name="mgpd"; version="1.99"; sha256="0cxpgza9i0hjm5w1i5crzlgh740v143120zwjn95cav8pk8n2wyb"; depends=[corpcor evd fields numDeriv]; }; mgsub = derive2 { name="mgsub"; version="1.7.2"; sha256="02l1b96zv36ia0c97wgcwfhi037mbn3wy9c64hcw0n0w67yj77rr"; depends=[]; }; mgwrsar = derive2 { name="mgwrsar"; version="0.1"; sha256="13h56fgq3fs28fqh19hwbcza622xd921qnjwcgw2rjwaabqz70w5"; depends=[doParallel foreach htmltools leaflet Matrix nabor Rcpp RcppEigen sp spgwr]; }; mhazard = derive2 { name="mhazard"; version="0.1.2"; sha256="0axapk7rw8vhgmkkr4q9avmlmwi1cdyy0q70447hdp6hx9xg1fd6"; depends=[boot plot3D Rcpp RcppArmadillo rootSolve survival]; }; + mhcnuggetsr = derive2 { name="mhcnuggetsr"; version="1.1"; sha256="0fq0niigf4lb6jqcy0w4mkfy65pxrw4brf3pg2nvmgnv3c91lgsb"; depends=[rappdirs reticulate stringr tibble]; }; mhsmm = derive2 { name="mhsmm"; version="0.4.16"; sha256="009dj0zkj1zry7jr9hf4cknb686z50a2l967if64xm0dvjmp7dgs"; depends=[mvtnorm]; }; mhtboot = derive2 { name="mhtboot"; version="1.3.3"; sha256="1z0p8ny9lpnrshgas7cad2lv7j0blw0n6ihiimw600n70h73jwrn"; depends=[ggplot2 reshape2]; }; mhurdle = derive2 { name="mhurdle"; version="1.1-8"; sha256="0nnzhcp9ghx2ifaj8lvhvv1acb3dpwi8m9n1al8zjvfg35wmxwwm"; depends=[Formula maxLik survival texreg truncreg]; }; mi = derive2 { name="mi"; version="1.0"; sha256="1h47k5mpbvhid83277dvvj2di493bgzz9iarpyv3r30y219l7x1l"; depends=[arm Matrix]; }; - miCoPTCM = derive2 { name="miCoPTCM"; version="1.0"; sha256="1lmf6zahfp59ylhdp2cbr7y3vayhim72zazimg4qfld4r9d6kygc"; depends=[distr MASS nleqslv survival]; }; + miCoPTCM = derive2 { name="miCoPTCM"; version="1.1"; sha256="0bmb06rb53fq8ylcvz693akmz7nkjj50c6ypxsjbfp4crllpi5v9"; depends=[distr MASS nleqslv survival]; }; miLineage = derive2 { name="miLineage"; version="2.1"; sha256="0660vk44ywmj0q2cw7pa2z1r039ncw693dnz7zlgc0ipwak3b0ry"; depends=[data_table geepack MASS]; }; - miRNAss = derive2 { name="miRNAss"; version="1.4"; sha256="0p852vyn44g84i4hzm7b02m5cxyqajnczx0s9x9373rn7fi6r98c"; depends=[CORElearn Matrix Rcpp RSpectra]; }; + miRNAss = derive2 { name="miRNAss"; version="1.5"; sha256="0j4yvd0j7r98m2msllszlzkzrx67a2z4xpx00zpq90hbr5jykxc4"; depends=[CORElearn Matrix Rcpp RSpectra]; }; miRada = derive2 { name="miRada"; version="1.13.8-8"; sha256="1m6rm65pv4r16r0s5ih69nr3v2rnpsvpdpk07pi7k4f7v9wck71v"; depends=[]; }; + miRecSurv = derive2 { name="miRecSurv"; version="0.0.1"; sha256="0i6ac566ldlmzrk91lv7is24fvbcxzc4pgcjfq3vazap01x9xv2k"; depends=[COMPoissonReg matrixStats stringi survival]; }; miRtest = derive2 { name="miRtest"; version="1.8"; sha256="0i66s1sz7vf8p8ihfrxmag7wbkw8mlkldcp1w2figlzyhs74c85p"; depends=[corpcor GlobalAncova globaltest limma MASS RepeatedHighDim]; }; miWQS = derive2 { name="miWQS"; version="0.2.0"; sha256="1api75d3jr4hh8b049jllnfb3kxlllziwbvvgxjhcbcr5kv2k4j8"; depends=[coda ggplot2 glm2 Hmisc invgamma MASS matrixNormal purrr rlist Rsolnp survival tidyr truncnorm]; }; micEcon = derive2 { name="micEcon"; version="0.6-14"; sha256="1d3cdg36ighyhly5by9gl6lxkdvx2agb5cv2mf77pwwd7rpq35h3"; depends=[miscTools plm]; }; @@ -10711,8 +11164,8 @@ in with self; { micEconIndex = derive2 { name="micEconIndex"; version="0.1-6"; sha256="1ihly6qpyg1pms4nkvs6khxxqwr3fwg57i8pg0yhyy1apqxyj2xl"; depends=[miscTools]; }; micEconSNQP = derive2 { name="micEconSNQP"; version="0.6-8"; sha256="183hg4iap97is8cdaqxmnj9z8yybvpfnhg2kf85nfy1nl7b30xl2"; depends=[MASS miscTools systemfit]; }; micar = derive2 { name="micar"; version="1.1.1"; sha256="09vpijva39fwpvdpfglwr3xmz469pnmz371ms7z5av6w2193ls5n"; depends=[httr jsonlite]; }; - mice = derive2 { name="mice"; version="3.11.0"; sha256="1gawccw32l00rcriyxys0mzbxh44x04rziy0cbycc3i1qm39d4fq"; depends=[broom dplyr generics lattice Rcpp tidyr]; }; - miceFast = derive2 { name="miceFast"; version="0.6.2"; sha256="109j98gs3b08zrg4ndc142360ilk0l2gp1b4g0vgg7143dgg2dia"; depends=[data_table dplyr lifecycle magrittr Rcpp RcppArmadillo]; }; + mice = derive2 { name="mice"; version="3.12.0"; sha256="0i7i9r0ipn7fypzp5xv1dnr54l30b7kg38mmq1kcvj2z1mjrwpap"; depends=[broom cpp11 dplyr generics lattice Rcpp rlang tidyr]; }; + miceFast = derive2 { name="miceFast"; version="0.6.9"; sha256="1qk9l6fk8b3wq855ai616bdzfbc6kc2jf4kns0g1p22zv7185dgm"; depends=[assertthat data_table dplyr ggplot2 magrittr Rcpp RcppArmadillo tidyr UpSetR]; }; miceMNAR = derive2 { name="miceMNAR"; version="1.0.2"; sha256="1s607icaf3c25mn8xdi3zkzmm8m7qd9a6vjdlz5j7ig2gc9f2y2d"; depends=[GJRM mice mvtnorm pbivnorm sampleSelection]; }; miceRanger = derive2 { name="miceRanger"; version="1.3.5"; sha256="07h3ah2z2nnwcs63mhlxvli9a9fsv9pnjbl5d0khgwpn7w4gmyxj"; depends=[corrplot crayon data_table DescTools FNN foreach ggplot2 ggpubr ranger]; }; miceadds = derive2 { name="miceadds"; version="3.10-28"; sha256="099kadyaj57hk1zfkzgs4ncdc5waa2lp7pq8mjm20zgmjrqrx73h"; depends=[mice mitools Rcpp RcppArmadillo]; }; @@ -10722,13 +11175,17 @@ in with self; { microPop = derive2 { name="microPop"; version="1.5"; sha256="1gikp20n2b50fkybbg2hmlfjdcm0imjwygjsjnyv3wrjzypm2i78"; depends=[deSolve]; }; microbats = derive2 { name="microbats"; version="0.1-1"; sha256="1mahvblaiwg1xk2s34wd1ic8ddc9lh6g0azik2pd97bsf0krkyw8"; depends=[]; }; microbenchmark = derive2 { name="microbenchmark"; version="1.4-7"; sha256="1xl4m4yl4h2zcjiz8wsa7f3sh55qg2xr3sgpvz18rlix6b3173r6"; depends=[]; }; + microbial = derive2 { name="microbial"; version="0.0.17"; sha256="1wxzsy2gpk0ykhp5hkx4k69jy3mc49rx4x6i694w6z6ghix2z45w"; depends=[Biostrings broom dada2 DECIPHER DESeq2 dplyr edgeR ggplot2 ggpubr knitr magrittr MASS phangorn phyloseq plyr randomForest rlang rstatix S4Vectors SummarizedExperiment tidyr vegan]; }; + microclass = derive2 { name="microclass"; version="1.2"; sha256="0q6mn1hbi6nk29x2x5a1wcdqp06mjggbrpglk5i8pp4gkqlzhl8q"; depends=[dplyr microcontax microseq Rcpp RcppEigen RcppParallel rlang stringr tibble]; }; + microclustr = derive2 { name="microclustr"; version="0.1.0"; sha256="04xn8p4wgmxq1jbxawq0rhx6l7y1kddlbdfid8zsi4x4arkz7hvp"; depends=[Rcpp]; }; microcontax = derive2 { name="microcontax"; version="1.2"; sha256="004g979hyg0asbah7hxr445fidil4ibw1b8pqpjdbgmpm1qgvw7y"; depends=[microseq]; }; - microdemic = derive2 { name="microdemic"; version="0.5.0"; sha256="1i89vq3b7gq0pdh8hf92jzh0fyghhhxf8hmb72naz0vpl6xa301a"; depends=[crul data_table httpcode jsonlite tibble]; }; + microdemic = derive2 { name="microdemic"; version="0.6.0"; sha256="1w4zh0vagnar95l5b8cgmcvp8q7vk2iba5g8d8g2ywynqiqcx5fc"; depends=[crul data_table httpcode jsonlite tibble]; }; + microeco = derive2 { name="microeco"; version="0.3.1"; sha256="1a3fb6n2wp4pkvjgkaxq42za2k9vvnf6im7dzwfak8x40l19s1l4"; depends=[ape data_table dplyr ggplot2 magrittr R6 RColorBrewer rlang scales tibble vegan]; }; microhaplot = derive2 { name="microhaplot"; version="1.0.1"; sha256="0g15g7d19yz11nn2g0h8h2m8k1cvmpryz72pnalgv5yi58md5l5i"; depends=[dplyr DT ggiraph ggplot2 gtools magrittr scales shiny shinyBS shinyWidgets tidyr]; }; - micromap = derive2 { name="micromap"; version="1.9.3"; sha256="1iciwy0kcg4qa0xc4gkqcilq33ac1s184vw13cbbkv0d1b5cgkgv"; depends=[ggplot2 maptools RColorBrewer rgdal sp]; }; + micromap = derive2 { name="micromap"; version="1.9.4"; sha256="0j3g6fbb6838k8p90x5krq7h82xsafid9yzpqgbdvzg1z3gpvjyq"; depends=[ggplot2 maptools RColorBrewer rgdal sp]; }; micromapST = derive2 { name="micromapST"; version="1.1.1"; sha256="15ch132x3wnpf7rmy25nah7iyfxfk90p7lvavqjhrnavhjsfxbxx"; depends=[labeling RColorBrewer stringr]; }; micropan = derive2 { name="micropan"; version="2.1"; sha256="16zs6sqi2c5lwzhd5gbyddp8q4gx5r5sg0pbpk7924i8x4hh081h"; depends=[dplyr igraph microseq rlang stringr tibble]; }; - microplot = derive2 { name="microplot"; version="1.0-42"; sha256="062dd4k6ryyl44lwbc2qgdsfcs1fiv9j2n6lx9driw6vng533b6q"; depends=[cowplot flextable ggplot2 HH Hmisc htmltools lattice officer]; }; + microplot = derive2 { name="microplot"; version="1.0-44"; sha256="1sx3544yvv5dxpgqw1582574z1vcxh9rc82x1z37ad7ayzxyyb1v"; depends=[cowplot flextable ggplot2 HH Hmisc htmltools lattice officer]; }; microsamplingDesign = derive2 { name="microsamplingDesign"; version="1.0.7"; sha256="1cd9h331gvapa6p72mlyddrixb0jzka7q10i78fmpc2mcdl7alw0"; depends=[abind deSolve devtools ggplot2 gridExtra gtools knitr MASS matrixcalc matrixStats plyr Rcpp RcppArmadillo readr reshape2 shiny stringr]; }; microseq = derive2 { name="microseq"; version="2.1.2"; sha256="04xsvwwbpxsqdg31w2kgydrnyxbw611blgwgly8cqvny74jgkkcg"; depends=[data_table dplyr Rcpp rlang stringr tibble]; }; microsynth = derive2 { name="microsynth"; version="2.0.13"; sha256="1ijv7kbxl087m0wzdbzl9p74116dfwid03dlamy4b1l308azc4ag"; depends=[boot kernlab LowRankQP MASS nleqslv pracma survey]; }; @@ -10736,13 +11193,15 @@ in with self; { midasml = derive2 { name="midasml"; version="0.0.5"; sha256="1y591m0h1872i3bg40fzy5vgqv92v42sshb5pq0rbddp94kb4fm8"; depends=[doSNOW foreach lubridate optimx quantreg Rcpp RcppArmadillo]; }; midasr = derive2 { name="midasr"; version="0.7"; sha256="02kjyzbznmy0362ambnnh8vc7ywbgikk3n7705sww9p0k0pywrrx"; depends=[forecast Formula MASS Matrix numDeriv optimx quantreg sandwich texreg zoo]; }; midastouch = derive2 { name="midastouch"; version="1.3"; sha256="1pjzcf0hjfhr5p0la8pz1njw7bhfrcrzpqfsdqk2z5c6dbh4awzq"; depends=[]; }; - midrangeMCP = derive2 { name="midrangeMCP"; version="3.1"; sha256="1d5x86xzs3b0g7ibg6i9dwg4w5kgjas3i2llrhvjk6h3w9knm0m4"; depends=[SMR tkrplot writexl xtable]; }; - migest = derive2 { name="migest"; version="1.8.2"; sha256="19rsh2hff003rpql1fxhykhdmsmkdyx28y9ld8p1686spy6m4n74"; depends=[dplyr magrittr purrr stringr tibble tidyr]; }; + midrangeMCP = derive2 { name="midrangeMCP"; version="3.1.1"; sha256="1yfwyglyxxk4i914m8n148cjydlcg7r16zl8acb1w8h963svirk9"; depends=[SMR writexl xtable]; }; + migrate = derive2 { name="migrate"; version="0.3.0"; sha256="064f2bmhl0f841pkgdzpcn9k50192vmbfngdy7wg9a0h0jb40ga4"; depends=[crayon dplyr magrittr rlang stringr tibble tidyr]; }; migration_indices = derive2 { name="migration.indices"; version="0.3.0"; sha256="0h0yjcj70wzpgrv3wl1f2h2wangh1klsllq0i0935plgzw736mwd"; depends=[calibrate]; }; migrbc = derive2 { name="migrbc"; version="2.0.9"; sha256="1nbxdm70a9lvbp4sw78719hdpbqnziw1y7r4xk8i390q2c195am1"; depends=[dplyr futile_logger lubridate Rcpp stringr]; }; migui = derive2 { name="migui"; version="1.1"; sha256="1qchjsc7ff2b6s9w6ncj9knjv6pyp90jd4jxljn2rr1ix1gc45za"; depends=[arm gWidgets2 mi]; }; + miic = derive2 { name="miic"; version="1.5.3"; sha256="1wrvgzi91jirn5n5fvvbhhpcga7l75h149sz1g1r1wbci181l3bg"; depends=[ppcor Rcpp scales]; }; + mikropml = derive2 { name="mikropml"; version="0.0.2"; sha256="0qgycgk0rw2bp3kbv4n42nidgkhjgd2114cc23lk178qm28r17nd"; depends=[caret dplyr e1071 glmnet kernlab MLmetrics randomForest rlang rpart xgboost]; }; milorGWAS = derive2 { name="milorGWAS"; version="0.3"; sha256="1z44sbs3lmrx32wagk5rr3rc2k8iqq860fz0bi983llmgmhaqdxn"; depends=[gaston Rcpp RcppEigen]; }; - milr = derive2 { name="milr"; version="0.3.0"; sha256="0z4d22fd6gd3zbi973vws9jqyh4c4m4i4ajcpxv934vxmbj0cma9"; depends=[glmnet numDeriv pipeR Rcpp RcppArmadillo RcppParallel]; }; + milr = derive2 { name="milr"; version="0.3.1"; sha256="03hihr1w5j0mlvi5vm9m5vb9i6nyb6lsji3xmv0chpczabd85mzy"; depends=[glmnet numDeriv pipeR Rcpp RcppArmadillo RcppParallel]; }; mime = derive2 { name="mime"; version="0.9"; sha256="107sqarmyhxlch5nrg796i5z03p9mshskisiq2fm628ajk99gkrc"; depends=[]; }; mimi = derive2 { name="mimi"; version="0.2.0"; sha256="1ig34qd37my74nmlv3jcfrj7cnd55alxpf2flf2sssk2ws1y56xh"; depends=[data_table doParallel FactoMineR foreach glmnet rARPACK softImpute]; }; mimsy = derive2 { name="mimsy"; version="0.6.2"; sha256="01dy1fryrgq07jdfnxcnks97h0gq632dvqk7hnfs0f5fnx0k0vvf"; depends=[dplyr lubridate magrittr openxlsx]; }; @@ -10752,15 +11211,14 @@ in with self; { mineCitrus = derive2 { name="mineCitrus"; version="1.0.0"; sha256="031nfhrsc5rlqls3vyrk18lx0pd4ssdk96cmfr4ifaciz0rgv8h2"; depends=[ggplot2]; }; mined = derive2 { name="mined"; version="1.0-2"; sha256="1py6gylya8dhmxcyfrcwbwc5q226m041rs3cmj4q0dhqy8iy2zsw"; depends=[Rcpp RcppEigen]; }; minerva = derive2 { name="minerva"; version="1.5.8"; sha256="0k4ww3qfqrsnkccxk9dyq39xrc42g8gvj5g8drglg4fyci7jfs9h"; depends=[Rcpp RcppArmadillo]; }; - miniCRAN = derive2 { name="miniCRAN"; version="0.2.13"; sha256="1pi474kphicflr45rbvy4dha7wjiq9zy39dyagf9xmwp6y5qivsi"; depends=[assertthat httr igraph]; }; + miniCRAN = derive2 { name="miniCRAN"; version="0.2.14"; sha256="1i1rf97m7c8x65rfy8c26l0kbl4zq7ha1f9yi413fk9jlngxajj3"; depends=[assertthat httr igraph]; }; miniGUI = derive2 { name="miniGUI"; version="0.8-1"; sha256="0qb2fbkjwzn909yrk89d4951bwf8n05i0s265l8v2d4lpns9hc2i"; depends=[]; }; miniMeta = derive2 { name="miniMeta"; version="0.2"; sha256="03r6xwcgchw42irqr8jy5hsbv8brk6f77h4zi9qhhz3zmkryjbw2"; depends=[colourpicker jsonlite markdown meta metafor readxl rhandsontable shiny shinyjs shinyWidgets WriteXLS]; }; miniUI = derive2 { name="miniUI"; version="0.1.1.1"; sha256="1h5h2sc57h95d6bsgs95l26911g38hvjc1v50bc31xl9689l2as5"; depends=[htmltools shiny]; }; - minidown = derive2 { name="minidown"; version="0.0.1"; sha256="13f2liyq3yqc6n066dkbjc08viiirn4ksnpjcs1crmn8pkdmbl3s"; depends=[htmltools rmarkdown]; }; + minidown = derive2 { name="minidown"; version="0.0.2"; sha256="1id4fnnxhaiva5jb44cmabdz376sy4322y81lrimp2n9q34r0yfh"; depends=[htmltools knitr rmarkdown xfun]; }; minimalRSD = derive2 { name="minimalRSD"; version="1.0.0"; sha256="1p1jpi8lnv952k4c1wjgbgpb0hv4zg0f9qrd43cx0caibkqvhzf7"; depends=[]; }; minimap = derive2 { name="minimap"; version="0.1.0"; sha256="0y5yzic9pwpzs01gnl82syankijcjp85n22jn5zda0bp3y01r53r"; depends=[]; }; minimax = derive2 { name="minimax"; version="1.0"; sha256="1g0d9q5h1avbb0yg7ajw5330820i3n5cgkpsif754l4j3ikya8p3"; depends=[]; }; - minimaxdesign = derive2 { name="minimaxdesign"; version="0.1.4"; sha256="0ylr3i0c5d9apk6ggpy1jjfjkk8qlqm0s4qxiq56r2mf3p44yzl6"; depends=[conf_design DiceDesign DoE_base doParallel doSNOW foreach FrF2 gmp gtools jpeg MaxPro nloptr pdist randtoolbox Rcpp RcppArmadillo]; }; minimist = derive2 { name="minimist"; version="0.1"; sha256="007y829d766b1v6wkrhk7pkg99r38bvmhc8bwvs8rs13dr7444ln"; depends=[V8]; }; minpack_lm = derive2 { name="minpack.lm"; version="1.2-1"; sha256="18ym2pdql5vzngc7q5gn66d153hrfrnd8ilv8yh6vd7j7sx7vjql"; depends=[]; }; minqa = derive2 { name="minqa"; version="1.2.4"; sha256="036drja6xz7awja9iwb76x91415p26fb0jmg7y7v0p65m6j978fg"; depends=[Rcpp]; }; @@ -10770,11 +11228,11 @@ in with self; { mipfp = derive2 { name="mipfp"; version="3.2.1"; sha256="1gxazpg81vj5dywpb6jb29188jw28qil6pfygawa7znnjn3k5ca6"; depends=[cmm numDeriv Rsolnp]; }; mipred = derive2 { name="mipred"; version="0.0.1"; sha256="0kijn2xj0dh28rm2sjgd8j1a3c5avc3fjfvvcmzfasvxqdjflv6j"; depends=[mice]; }; miraculix = derive2 { name="miraculix"; version="0.9.20"; sha256="0s5r7ikym3s85706wznfc3lh3ap95pv1p2796bi1n19ivd671myc"; depends=[RandomFieldsUtils]; }; - mirt = derive2 { name="mirt"; version="1.32.1"; sha256="023mik3s61f452v6kk639jxp53pzg1qg2aar7azfd3jx4szppz3m"; depends=[dcurver Deriv GPArotation lattice mgcv Rcpp RcppArmadillo vegan]; }; + mirt = derive2 { name="mirt"; version="1.33.2"; sha256="06m76xcfyffhfxk8wjyfaqnhb56bxhr19brm3556kfds2v75wnlm"; depends=[dcurver Deriv GPArotation lattice mgcv Rcpp RcppArmadillo vegan]; }; mirtCAT = derive2 { name="mirtCAT"; version="1.10"; sha256="1wf4m4m3lyd57hy0v5jsci2k8cgzl087svpccmhxvp1chfjn7iw2"; depends=[lattice lpSolve markdown mirt pbapply Rcpp RcppArmadillo shiny]; }; mirtjml = derive2 { name="mirtjml"; version="1.4.0"; sha256="1zvm8acywpzi87lz0hpxmr8c9kyqkbx0490q3vlwxd90ffcdp9ml"; depends=[GPArotation Rcpp RcppArmadillo]; }; - misaem = derive2 { name="misaem"; version="1.0.0"; sha256="0vylcfqwngbyli88ba63nxf2gqlcbfmjyrghkz34zdch7cdz75rk"; depends=[MASS mice mvtnorm norm]; }; - misc3d = derive2 { name="misc3d"; version="0.8-4"; sha256="0qjzpw3h09qi2gfz52b7nhzd95p7yyxsd03fldc9wzzn6wi3vpkm"; depends=[]; }; + mirtsvd = derive2 { name="mirtsvd"; version="1.0"; sha256="0c06dpg0jr15hmk03s96fyp2rb6z4svihjzfs316nkl3dd03ami1"; depends=[GPArotation mirtjml]; }; + misc3d = derive2 { name="misc3d"; version="0.9-0"; sha256="10jf5r1x588vi54bzaqgi9mgcqlkiga2c3jvmqmk3lavc8fjksd1"; depends=[]; }; miscF = derive2 { name="miscF"; version="0.1-5"; sha256="0g6wk2zxqq6j949hnbvwmfd72y25zjfbrfrfxsj21q84w41fgjkb"; depends=[MASS MCMCpack mvtnorm R2jags]; }; miscFuncs = derive2 { name="miscFuncs"; version="1.3"; sha256="0wn7i9656km53wlml360qgpzqxlv1jsjnh4swhqgf5dyjva8i141"; depends=[mvtnorm roxygen2]; }; miscIC = derive2 { name="miscIC"; version="0.1.0"; sha256="0pnwc3b318xxnmb7scrj4qkqlvqfyczspdg496kl0ixsiaafr1ad"; depends=[nnls]; }; @@ -10786,24 +11244,27 @@ in with self; { miselect = derive2 { name="miselect"; version="0.9.0"; sha256="0dfqni7r5zwdvwmrmvqhycmxhazivz6vnz2ccjy0hyfad29g0v7s"; depends=[]; }; mispr = derive2 { name="mispr"; version="1.0.0"; sha256="166piax3f7di8h0i07fbdx45lxz1p47j378v6yl6zdc3525adpjx"; depends=[e1071 MASS penalized]; }; misreport = derive2 { name="misreport"; version="0.1.1"; sha256="1f78zcw4cg51mjvflhwd64hip2gj8x9ng1mhh4w43yv3x8hmbd6h"; depends=[mvtnorm numDeriv VGAM]; }; - missDeaths = derive2 { name="missDeaths"; version="2.6"; sha256="0biynl5n04yz0dr5r4py4a3f5l9faaxfb1bhy2pk6k8l2ayl060q"; depends=[cmprsk MASS mitools Rcpp relsurv rms survival]; }; + missCompare = derive2 { name="missCompare"; version="1.0.3"; sha256="03j69xw54d076znx19dplw4xznvgky90hxh3wgypg0g5pjg63y53"; depends=[Amelia data_table dplyr ggdendro ggplot2 Hmisc ltm magrittr MASS Matrix mi mice missForest missMDA pcaMethods plyr rlang tidyr VIM]; }; + missDeaths = derive2 { name="missDeaths"; version="2.7"; sha256="1c8vbc7r1g4dkngmal6iqg7piw656h1vc6cmpkv16vjn4j0w2n2c"; depends=[cmprsk MASS mitools Rcpp relsurv rms survival]; }; missForest = derive2 { name="missForest"; version="1.4"; sha256="0y02dhrbcx10hfkakg5ysr3kpyrsh2d9i5b0qzhj9x5x0d5q11gp"; depends=[foreach itertools randomForest]; }; - missMDA = derive2 { name="missMDA"; version="1.17"; sha256="1bpl55kwkwnq4d5dy6q2ckr9074viirmc2x9k9mf83nky8z0pmz6"; depends=[doParallel FactoMineR foreach ggplot2 mice mvtnorm]; }; + missMDA = derive2 { name="missMDA"; version="1.18"; sha256="1s7ph89y0mrksdi73nnjnxl2354401ny8ziijzf036rcsiyvl8m5"; depends=[doParallel FactoMineR foreach ggplot2 mice mvtnorm]; }; missMethods = derive2 { name="missMethods"; version="0.2.0"; sha256="0rsx7fdg0k8ajpj81ybl2jc9s8sprc2si6zx7mkvcqgw9iacrdik"; depends=[]; }; missRanger = derive2 { name="missRanger"; version="2.1.0"; sha256="06ic99zg91ikzvmwbj05ma46rc4ayfwylv8cnj21sbr5nxw0qpz9"; depends=[FNN ranger]; }; - missSBM = derive2 { name="missSBM"; version="0.2.1"; sha256="00jxj1f7hr78srlm49finf9j2q14y1cl66rwdkm1i81l8db5fvcp"; depends=[ape corrplot ggplot2 igraph magrittr nloptr R6 Rcpp RcppArmadillo]; }; + missSBM = derive2 { name="missSBM"; version="0.3.0"; sha256="0dmmci35nriy0rxkrcn2rz93nndz836dbil9yfpdz3zvp1pyihdj"; depends=[ape corrplot ggplot2 igraph magrittr nloptr R6 Rcpp RcppArmadillo rlang sbm]; }; missingHE = derive2 { name="missingHE"; version="1.4.1"; sha256="1bxpp88rwnv4fc9lm606cczj1dx63p507sqsr71dblgsfw3aw7xy"; depends=[bayesplot BCEA coda ggmcmc ggplot2 ggpubr ggthemes gridExtra loo mcmcplots mcmcr R2jags]; }; mistat = derive2 { name="mistat"; version="1.0-5"; sha256="1vyx918b7iv1wcnk23bnlxljwy0hglpdx5drhrs5qcd45f6jrghc"; depends=[]; }; - mistr = derive2 { name="mistr"; version="0.0.3"; sha256="00pq56zlp27wsa88830pwqx1s2m3x7klzaw96jan8mp3r7hwskr4"; depends=[bbmle]; }; + mistr = derive2 { name="mistr"; version="0.0.4"; sha256="0jb0qmraghn8gy1bxmfh0jnbfp0b38bxidl0cxkxg9lbfmi0irlq"; depends=[bbmle]; }; mistral = derive2 { name="mistral"; version="2.1.0"; sha256="1cr79p8q82lpj9d0y6q24xmfkxmnlqv8ivkd0baj7fxfb1nb8sak"; depends=[DiceKriging doParallel e1071 emoa foreach ggplot2 iterators Matrix mvtnorm quadprog]; }; misty = derive2 { name="misty"; version="0.3.2"; sha256="17fqkxl9kmkjzl6axgrgk17j5ah8l1f29mf399ak3vhaccvblaqi"; depends=[haven lavaan lme4 readxl]; }; mitml = derive2 { name="mitml"; version="0.3-7"; sha256="0yqyxkyi1kmv5k63wxj5kkg5g8igk1axk2csb4xhj6wz0p89dxy6"; depends=[haven jomo pan]; }; mitools = derive2 { name="mitools"; version="2.4"; sha256="0c2x2n1p53lcw0vx4vmy5j7m2f95i7g2iwbryl89imr99rvz617j"; depends=[DBI]; }; + mitre = derive2 { name="mitre"; version="0.1.1"; sha256="1vcagpj1pibnzl66x4hppx9lhawssv869pfdgsm43sspvg63z3gr"; depends=[curl dplyr jsonlite plyr visNetwork]; }; mix = derive2 { name="mix"; version="1.0-10"; sha256="0z16ddbh79kqxi64bl1h2sd8anpgc48n9d1nyr2zlln39nhv8w8g"; depends=[]; }; mixAK = derive2 { name="mixAK"; version="5.3"; sha256="12vhg3qaz39hcc581gn0wfmcxj1yhggcsqic4ngy4gpmrg27yls0"; depends=[coda colorspace fastGHQuad lme4 mnormt]; }; mixAR = derive2 { name="mixAR"; version="0.22.4"; sha256="1pd6885113i9d2vwxmcvls6q8lpcjbajm88s5zvdrm0rqri5kahk"; depends=[BB combinat e1071 fGarch gbutils MCMCpack mvtnorm permute Rdpack timeDate]; }; + mixComp = derive2 { name="mixComp"; version="0.1-1"; sha256="1mcpjsvdzklzlvnnw9gi0vzz0awmahgvda0vf90v4ixggy64mncg"; depends=[boot cluster expm kdensity matrixcalc Rsolnp]; }; mixEMM = derive2 { name="mixEMM"; version="1.0"; sha256="0344ay1avi37kvh5w9bknayx67yh7rflj6zhw68d2888v7cbghjy"; depends=[]; }; - mixIndependR = derive2 { name="mixIndependR"; version="0.2.1"; sha256="0m858jjspkacfyxikisqij4d5ipz6fklgcczxzh7i4kv248p43w3"; depends=[stringr]; }; + mixIndependR = derive2 { name="mixIndependR"; version="0.4.3"; sha256="0kx7fh0gmxcvq27c6c40s5k2wsg84fxckqnw5aknr7v2mj8rbpcg"; depends=[data_table]; }; mixKernel = derive2 { name="mixKernel"; version="0.4"; sha256="0bqa4inim7819pl3dr2kfzdvv7phqkjqfx3zal8mmxcjpkpxs4mf"; depends=[corrplot ggplot2 LDRTools Matrix mixOmics phyloseq psych quadprog reticulate vegan]; }; mixPHM = derive2 { name="mixPHM"; version="0.7-2"; sha256="1wvkdb9zj2j8dpppnyins05rg877zbydqsl3qaan62wznkknxcac"; depends=[lattice survival]; }; mixR = derive2 { name="mixR"; version="0.1.1"; sha256="1xd3v5rk59380zh7r6l5blmcy4gib9xp44j5dcrk6ivs6fgycsxh"; depends=[ggplot2 Rcpp]; }; @@ -10812,30 +11273,31 @@ in with self; { mixSPE = derive2 { name="mixSPE"; version="0.1.1"; sha256="103lr74wryrk7sakss9cn774fjwy5xqc4hrcr7ig6m0dzyx4gqzl"; depends=[mvtnorm]; }; mixcat = derive2 { name="mixcat"; version="1.0-4"; sha256="19v6y981js18xz9q49slclkhcf6w53iar55ynjs0lvhn1y1b2517"; depends=[statmod]; }; mixchar = derive2 { name="mixchar"; version="0.1.0"; sha256="1az2gggwipkzg86pvn9w2csgfgrpdc88kca51f5qcw0zk4wx5hlx"; depends=[minpack_lm nloptr tmvtnorm zoo]; }; + mixcure = derive2 { name="mixcure"; version="2.0"; sha256="0jjbamn53iqrrx658wk3cz43grsbn1275p81256h4lia35s7cww3"; depends=[boot flexsurv gam survey survival timereg]; }; mixdir = derive2 { name="mixdir"; version="0.3.0"; sha256="1vgxxzsrl660agk4cjw4q4gx28fv5mkzpjy4qanq5c9mqpcxbxkc"; depends=[extraDistr Rcpp]; }; mixdist = derive2 { name="mixdist"; version="0.5-5"; sha256="1wchhysd33xz395hq4wgd3zv1qc92pbiqxqd7g2v6m1pb0j8ma9g"; depends=[]; }; - mixedClust = derive2 { name="mixedClust"; version="1.0.1"; sha256="1izbij6l3rnq8gvv5b53jcvdpi42kwwybdqak43y0nlb2rhvdq95"; depends=[fda Rcpp RcppArmadillo RcppProgress]; }; - mixedMem = derive2 { name="mixedMem"; version="1.1.0"; sha256="0j8w3qfhanyrkkxipdxfdajv15qba8r2rm06iiv3kywficzgkxgv"; depends=[BH gtools Rcpp RcppArmadillo]; }; + mixedCCA = derive2 { name="mixedCCA"; version="1.4.3"; sha256="0gpnds4rngl02q709igz1nh2zsfw2rnjflanrh0850ncidjld1zq"; depends=[chebpol fMultivar irlba MASS Matrix mnormt pcaPP Rcpp RcppArmadillo]; }; + mixedMem = derive2 { name="mixedMem"; version="1.1.2"; sha256="1p0gplfcn663xp40dk0yg70qffn1fwa9gxv7bppflgm9wkn8g3l5"; depends=[BH gtools Rcpp RcppArmadillo]; }; mixedsde = derive2 { name="mixedsde"; version="5.0"; sha256="0ss1ng4nx91gxj85wxxfyh9ljxsj3ag6lsj1a5d2815p9jzl7dsv"; depends=[MASS moments plot3D sde]; }; mixexp = derive2 { name="mixexp"; version="1.2.5"; sha256="0nbf10xhrr51rb1b2apcj4p3ci8xbi7flgz500ar3mxh8h8l74sq"; depends=[daewr gdata lattice]; }; mixggm = derive2 { name="mixggm"; version="1.0"; sha256="1wiiayld7rwp3mwz93zizrv0dzw02mqrzprc4z6c4jj25c8pypw5"; depends=[foreach GA mclust memoise network Rcpp RcppArmadillo]; }; - mixl = derive2 { name="mixl"; version="1.2.2"; sha256="05xljpr09dmqbp6rm9bj84677sh8n7v718xq0g16d2z1lazll3ri"; depends=[maxLik numDeriv randtoolbox Rcpp readr sandwich stringr]; }; + mixl = derive2 { name="mixl"; version="1.2.3"; sha256="1wy88lxkxd7fhchfqbciccj3ag5sks0iwhlfpqk2ddqviibar3nd"; depends=[maxLik numDeriv randtoolbox Rcpp readr sandwich stringr]; }; mixlink = derive2 { name="mixlink"; version="0.1.5"; sha256="0ywgrcplhspc0x5fniw52xqz20y7j9mwgy4ky8lv3vii659mr52m"; depends=[mvtnorm numDeriv Rcpp RcppGSL]; }; mixlm = derive2 { name="mixlm"; version="1.2.4"; sha256="0jwz918qnz1p71y82ayrgir9rpij8zk3jgmn63nq5xrlf0jbjcdd"; depends=[car leaps multcomp pls pracma]; }; - mixmeta = derive2 { name="mixmeta"; version="1.0.8"; sha256="1wx95pgd096d359n5mrl98hpwc2c1r2jw3pzvilkawx0y8lw68na"; depends=[]; }; + mixmeta = derive2 { name="mixmeta"; version="1.1.0"; sha256="08llrd7pj8grz2hhvsyjf8r0qw9534bg327ls27g2kzm475b5kny"; depends=[]; }; mixor = derive2 { name="mixor"; version="1.0.4"; sha256="1l296z0a3kamb1m94pfx3vczp36pa0np101fy5c23kh45s59pbs7"; depends=[survival]; }; mixreg = derive2 { name="mixreg"; version="0.0-6"; sha256="04g863yxrlj0wqsmzzxph5110g3gjk094r59zzk0b9r89m8vhpsl"; depends=[]; }; mixsep = derive2 { name="mixsep"; version="0.2.1-2"; sha256="1ywwag02wbx3pkd7h0j9aab44bdmwsaaz0p2pcqn1fs3cpw35wa2"; depends=[MASS RODBC tcltk2]; }; - mixsmsn = derive2 { name="mixsmsn"; version="1.1-7"; sha256="1xw8bxkivp50ax0ygsravmzmksdqqg9fdm3hwpl39ikhj0cpa7zr"; depends=[mvtnorm]; }; + mixsmsn = derive2 { name="mixsmsn"; version="1.1-8"; sha256="102lsr55bqfvv389wd07k3jqc5kpzvfmm5rpx23rb8rqw42wkffh"; depends=[mvtnorm]; }; mixsqp = derive2 { name="mixsqp"; version="0.3-43"; sha256="1qics04w0swyp216d6g8dmsph8q2kpadpacp66h2qih3521js12q"; depends=[irlba Rcpp RcppArmadillo]; }; mixtNB = derive2 { name="mixtNB"; version="1.0"; sha256="0lqbm1yl54zfs0xcmf3f2vcg78rsqyzlgvpydhmhg7x6dkissb22"; depends=[]; }; mixtools = derive2 { name="mixtools"; version="1.2.0"; sha256="08whic8hmmzi55b7azwj11l2x5r9s5qbyrv7s9jr08156vqkw0zg"; depends=[kernlab MASS segmented survival]; }; mixtox = derive2 { name="mixtox"; version="1.3.2"; sha256="0mdnp1yrcxvan5l7jj91s41vq5y1kdnkhhinqrklmg4ph5f29dmq"; depends=[minpack_lm]; }; - mixture = derive2 { name="mixture"; version="1.5"; sha256="1ahr8jw93xnd5hmy3h4sr209ql7gmkwbvnnfmiplbpc17czqgcn4"; depends=[]; }; - mize = derive2 { name="mize"; version="0.2.3"; sha256="1rc3mhcwidmfbkfyxwldm9hg25lh7a81jlj2zv45vsj5hbrmvk6c"; depends=[]; }; - mizer = derive2 { name="mizer"; version="2.0.3"; sha256="1m7gh9gi0y0492dlcyr283r6ccw5v0yfikbby8jlmg0d6lq9jj2s"; depends=[assertthat deSolve dplyr ggplot2 plotly plyr progress Rcpp reshape2]; }; + mixture = derive2 { name="mixture"; version="1.5.1"; sha256="11b2a5kik70g9v4hx9v8j90crjfqhlxghgc12isnk79jh86v3myk"; depends=[]; }; + mize = derive2 { name="mize"; version="0.2.4"; sha256="1dfhldxsm1il9avfxvaiir9r878dp7swyc9c8ilm6llx208sd5d5"; depends=[]; }; + mizer = derive2 { name="mizer"; version="2.0.4"; sha256="0wkysh21a2msi3z1vl9fbrnvvad3jqhjyc7jgb438vqcqdrsszr0"; depends=[assertthat deSolve dplyr ggplot2 plotly plyr progress Rcpp reshape2]; }; mkde = derive2 { name="mkde"; version="0.1"; sha256="04v84arpnmjrkk88ffphnhkz32x7y0dypk75jfmbbgcgv59xlglv"; depends=[raster Rcpp sp]; }; - mkin = derive2 { name="mkin"; version="0.9.50.2"; sha256="10c729r9q896ryjbjv2lccsajlrz4nyf28ahpzgkagl9rcwwwhiz"; depends=[deSolve inline lmtest nlme numDeriv pkgbuild purrr R6]; }; + mkin = derive2 { name="mkin"; version="0.9.50.3"; sha256="0vycbky2gyqpyf6avk47l8lcmc8pfzjimd6iprh3lnl0j7p133lg"; depends=[deSolve inline lmtest nlme numDeriv pkgbuild purrr R6]; }; mknapsack = derive2 { name="mknapsack"; version="0.1.0"; sha256="1kzmx7d512681a4hjirfgcd7a8rvndb4da66p16gms5nnxzsby9c"; depends=[assertthat data_table lpSolve]; }; mkssd = derive2 { name="mkssd"; version="1.1"; sha256="1qqzy6fn6sc3lxahc19hzzf1hzxsyvxqi7npynw0vkknlrvh2ijp"; depends=[]; }; mlPhaser = derive2 { name="mlPhaser"; version="0.01"; sha256="1s2mqlnbcjdkx0ghvr2sw9rzggqa4jy2vzi9vbyqkh6795lgck6n"; depends=[]; }; @@ -10848,55 +11310,63 @@ in with self; { mle_tools = derive2 { name="mle.tools"; version="1.0.0"; sha256="02yndj1if31zr9y805mq5km5n8jz4w9jz1bmaz9nnqsqimrnigrb"; depends=[]; }; mleap = derive2 { name="mleap"; version="1.0.0"; sha256="1abdab96wgybfgfbcai657hrbkn3kprxqw3ww415vpg2xhi8p905"; depends=[digest fs jsonlite purrr rJava sparklyr tibble]; }; mlearning = derive2 { name="mlearning"; version="1.0-0"; sha256="0r8xfaxw83s2r27b8x5qd0k4r5ayxpkafzn9b1a0jvsr87i6520r"; depends=[class e1071 ipred MASS nnet randomForest]; }; - mlegp = derive2 { name="mlegp"; version="3.1.7"; sha256="1q0mxvr23qcxvf8k2cgs4m8yfp1gbkmprp964w8viy30japmx16l"; depends=[]; }; - mlergm = derive2 { name="mlergm"; version="0.6"; sha256="10pg2jbh4g764hl2wzscml5lrnw1hxbsj6ggyj2dnf6igz7naaxh"; depends=[cowplot ergm GGally ggplot2 lpSolve Matrix network plyr reshape2 sna stringr]; }; + mlegp = derive2 { name="mlegp"; version="3.1.8"; sha256="1sbdk3pybzhv2jycl56s6m86pp3qbfh8q0kmhn153130b84dzhga"; depends=[]; }; + mlergm = derive2 { name="mlergm"; version="0.7"; sha256="1z757h5n8npl57c0wvh8njqbn0qdbwlc4c4gi03wzrn94vklb9ql"; depends=[cowplot ergm GGally ggplot2 lpSolve Matrix network plyr reshape2 sna stringr]; }; mleur = derive2 { name="mleur"; version="1.0-6"; sha256="0mddphq3b6y2jaafaa9y41842kcaqdl3dh7j4pva55q2vcjcclj7"; depends=[fGarch lattice stabledist urca]; }; mlf = derive2 { name="mlf"; version="1.2.1"; sha256="09ihnibpknpp26hdlbxyr99yz7z0n8qpsjs5aq3zngng0yh3wdn9"; depends=[]; }; - mlflow = derive2 { name="mlflow"; version="1.10.0"; sha256="028ckirgv8ncqgfyvydyz2llhlgdlidm5xz326akqxiq44j7j55m"; depends=[base64enc forge fs git2r glue httpuv httr ini jsonlite openssl processx purrr reticulate rlang swagger tibble withr xml2 yaml zeallot]; }; + mlflow = derive2 { name="mlflow"; version="1.12.1"; sha256="1pj27zpfhac7cf7hi313az1ygfpnhffc4424f8ncdfb721i57chr"; depends=[base64enc forge fs git2r glue httpuv httr ini jsonlite openssl processx purrr reticulate rlang swagger tibble withr xml2 yaml zeallot]; }; mlgt = derive2 { name="mlgt"; version="0.16"; sha256="1nvdq6mvgr39ikkf73aggsb6pmbw132injj8fdkr8hgcmwm6lgd9"; depends=[seqinr]; }; mlica2 = derive2 { name="mlica2"; version="2.1"; sha256="0c3m1zd9x99n6lw12hfzmd59355z51xa8rhg1h7qwfn9p86r826f"; depends=[]; }; mlmRev = derive2 { name="mlmRev"; version="1.0-8"; sha256="0ln4nazhc1prnlmvhfzhx268vx3klb0xnz1nsiwh0pwyskskyzym"; depends=[lme4]; }; - mlma = derive2 { name="mlma"; version="5.1-0"; sha256="0y1xyjxr8gx67096sifam4ls5qrgvxvnh1rrg6myyrdzgxf9c0sa"; depends=[abind car gplots lme4]; }; + mlma = derive2 { name="mlma"; version="6.0-0"; sha256="1hgfdlrk19ywdz36k55mmb8km185rnl96wykbb19gahgyp4bny1p"; depends=[abind car coxme gplots lme4 survival]; }; mlmc = derive2 { name="mlmc"; version="1.0.0"; sha256="01h7w0ajyg3bccynlpbi3yjpy089wczbfbajpg6yw5v4dppw7k7a"; depends=[ggplot2 Rcpp]; }; mlmi = derive2 { name="mlmi"; version="1.0.0"; sha256="08sm836y40af3jd5gcl5pnyv1gqpx4ngkkw4xfp82h1j4yk47sy5"; depends=[cat gsl MASS Matrix mix norm]; }; mlmm_gwas = derive2 { name="mlmm.gwas"; version="1.0.6"; sha256="14xp8k7sww1skyw5l2006gpaw2c6yrri5nmfx4yav4vqdlhcj2k1"; depends=[coxme Matrix multcomp multcompView sommer]; }; mlmmm = derive2 { name="mlmmm"; version="0.3-1.2"; sha256="1m5ziiqs3ll1xjm1yf7x4sdc910jypn3kjnbadf95xxkvqmfrsqq"; depends=[]; }; - mlogit = derive2 { name="mlogit"; version="1.1-0"; sha256="19ibklkjc1cqi7fyi8hsmzb317c8pxmh9689zpyfgwc39cwb48j6"; depends=[dfidx Formula lmtest MASS Rdpack statmod zoo]; }; + mlogit = derive2 { name="mlogit"; version="1.1-1"; sha256="0hyi6gi03n895iydrfr1ba2ifbsd6lyjyhkq62d95ghhniysjgkg"; depends=[dfidx Formula lmtest MASS Rdpack statmod zoo]; }; mlogitBMA = derive2 { name="mlogitBMA"; version="0.1-6"; sha256="1wl8ljh6rr1wx7dxmd1rq5wjbpz3426z8dpg7pkf1x9wr94a2q25"; depends=[abind BMA maxLik]; }; - mlr = derive2 { name="mlr"; version="2.17.1"; sha256="0fwjl5dy516vrh2lx5rgps85q0jz8ka5dx61bz7lfxk21k8bjw8b"; depends=[backports BBmisc checkmate data_table ggplot2 parallelMap ParamHelpers stringi survival XML]; }; - mlr3 = derive2 { name="mlr3"; version="0.5.0"; sha256="0prrc8v60wf4493srshwj87ll6c2g582k6v6ax3mir1dsgrrphyf"; depends=[backports checkmate data_table digest future_apply lgr mlbench mlr3measures mlr3misc paradox R6 uuid]; }; - mlr3data = derive2 { name="mlr3data"; version="0.2.0"; sha256="01bgbzszplay0miphlfxw6xbr0kgj2919zgfnd1zq21fm5b7qzi5"; depends=[]; }; - mlr3db = derive2 { name="mlr3db"; version="0.1.5"; sha256="09hins00pc569vz26mkyg3736vhl01szl8hbwp2vyrh3mdn21c9m"; depends=[backports checkmate data_table digest dplyr mlr3 R6]; }; - mlr3filters = derive2 { name="mlr3filters"; version="0.3.0"; sha256="1yr3mdjv9yg9xgf3hq0p2ymhrphfckjxmgda9cyv3d0p6hgvx9ll"; depends=[backports checkmate data_table mlr3 mlr3misc paradox R6]; }; - mlr3learners = derive2 { name="mlr3learners"; version="0.2.0"; sha256="1r9f31wlhqwpslb2sgj6x3akggqdmnglb3s44zfhy6mqi1fwdgxn"; depends=[data_table mlr3 mlr3misc paradox R6]; }; - mlr3measures = derive2 { name="mlr3measures"; version="0.2.0"; sha256="1dw8w1g92zq66daf1argl27983yfl6ijdl4dy2ihc05nld8n860s"; depends=[checkmate]; }; - mlr3misc = derive2 { name="mlr3misc"; version="0.5.0"; sha256="0pyk3hgmrrkgza840pwi2yfk06xs0qqp481wwf62knzjs8jbbc16"; depends=[backports checkmate data_table R6]; }; - mlr3oml = derive2 { name="mlr3oml"; version="0.1.0"; sha256="1k694ilgp09cxcs69rc6lg9i5pss7vskb400fjyakbxl7isb8xy2"; depends=[backports checkmate curl data_table jsonlite lgr mlr3 mlr3misc R6 stringi]; }; - mlr3pipelines = derive2 { name="mlr3pipelines"; version="0.2.1"; sha256="1dzq6yb6amk1xhg4345inkcl253pwdr5zs2l0kpycw3qv5kr00n7"; depends=[backports checkmate data_table digest lgr mlr3 mlr3misc paradox R6 withr]; }; - mlr3proba = derive2 { name="mlr3proba"; version="0.2.0"; sha256="1mync64qzqqndyvzfqz3llhp39dmphx5xa6j8zv2yzh4w5dmxwjw"; depends=[checkmate data_table distr6 mlr3 mlr3misc mlr3pipelines paradox R6 Rcpp survival]; }; + mlpack = derive2 { name="mlpack"; version="3.4.2.1"; sha256="0fqpajcmqn9rijzjg7qj0zd2lik4xmhp5dmhbm3mdc9ssdg0axbr"; depends=[BH Rcpp RcppArmadillo RcppEnsmallen]; }; + mlquantify = derive2 { name="mlquantify"; version="0.1.4"; sha256="1k2f8h3rcjrmk8y1zaxjh0kvcvcvqjjyn1m6mabsya2jiqhgcxmi"; depends=[caret randomForest]; }; + mlr = derive2 { name="mlr"; version="2.18.0"; sha256="1lzqqypzbl6sim0ds4igvf3qss2i41sa228cpd65ybnk1vlp9zn2"; depends=[backports BBmisc checkmate data_table ggplot2 parallelMap ParamHelpers stringi survival XML]; }; + mlr3 = derive2 { name="mlr3"; version="0.9.0"; sha256="0gg7rrzxwrnpg6sgm0aa6bmfwmqv3d3za0ghnqrnibg33p9ynpgb"; depends=[backports checkmate data_table digest future_apply lgr mlbench mlr3measures mlr3misc paradox R6 uuid]; }; + mlr3benchmark = derive2 { name="mlr3benchmark"; version="0.1.1"; sha256="05jwjf8l157kbhgyajzllbwjf7869gr4ncvzvqz834j5iymkwwx8"; depends=[checkmate data_table ggplot2 mlr3misc R6]; }; + mlr3cluster = derive2 { name="mlr3cluster"; version="0.1.1"; sha256="15jaydpsdwpz6mmqqilx9vzz7ycs8h6cyw18i2hz8ikhwwp9nsbi"; depends=[backports checkmate clue clusterCrit data_table mlr3 mlr3misc paradox R6]; }; + mlr3data = derive2 { name="mlr3data"; version="0.3.0"; sha256="0r62h0a1hlbgvm2y0dghh978n28b0ydj4az26hixmy5m7dv00b66"; depends=[]; }; + mlr3db = derive2 { name="mlr3db"; version="0.3.0"; sha256="15ksnln8lvrfbs9k3apvczsvlq727x7q4f7r6ajl0590w8ka2ms4"; depends=[backports checkmate data_table digest mlr3 mlr3misc R6]; }; + mlr3filters = derive2 { name="mlr3filters"; version="0.4.0"; sha256="05j35hlc2w4x3cv59qw35qcamp7smvki898nhhryiybwyyv4d464"; depends=[backports checkmate data_table mlr3 mlr3misc paradox R6]; }; + mlr3fselect = derive2 { name="mlr3fselect"; version="0.4.1"; sha256="15zxkfp95f6yjzcw4gvp0jbzc9fncrxbzj3g5i1ivr7c9wzhjmwq"; depends=[bbotk checkmate data_table lgr mlr3 mlr3misc mlr3pipelines paradox R6]; }; + mlr3hyperband = derive2 { name="mlr3hyperband"; version="0.1.1"; sha256="0h0mxfnibpc3ch7x0nqyirh994nmjs150mmmxdkmwiqzks9snc94"; depends=[bbotk checkmate data_table lgr mlr3 mlr3misc mlr3tuning paradox R6]; }; + mlr3learners = derive2 { name="mlr3learners"; version="0.4.3"; sha256="1wxlpzz3hpkn77n4ag1v868dmp140j1pmrhynsv5xfgk9fg0w7ri"; depends=[data_table mlr3 mlr3misc paradox R6]; }; + mlr3measures = derive2 { name="mlr3measures"; version="0.3.0"; sha256="106lfaxphz0kh96ddq14hic7wvxjqp871zdp9kkkfk1kwfg35abw"; depends=[checkmate PRROC]; }; + mlr3misc = derive2 { name="mlr3misc"; version="0.6.0"; sha256="1q63i2059bf7cf61kwm0dqnk5vd60i0j4flziswwdk07fjxqh8xr"; depends=[backports checkmate data_table R6]; }; + mlr3oml = derive2 { name="mlr3oml"; version="0.4.0"; sha256="1z5hn7a7sg7xs4d155rn3ikb7h9d6z0zj1j3c3kmnx7qp2mlcvgq"; depends=[backports checkmate curl data_table jsonlite lgr mlr3 mlr3misc R6 stringi]; }; + mlr3pipelines = derive2 { name="mlr3pipelines"; version="0.3.2"; sha256="1x738b312mcvb0dif88sv4nlh3y6i47q0wagc5ggyh1hnqjiz71y"; depends=[backports checkmate data_table digest lgr mlr3 mlr3misc paradox R6 withr]; }; + mlr3proba = derive2 { name="mlr3proba"; version="0.2.6"; sha256="1ig6vr8iq0cnx4jx9v7dnvzyr68cxw0vwf97g86m09psxda6pzss"; depends=[checkmate data_table distr6 mlr3 mlr3misc paradox R6 Rcpp survival]; }; mlr3shiny = derive2 { name="mlr3shiny"; version="0.1.1"; sha256="0jn5n6k1dq59g5m6pvpp964pcjv1mjbdbdz7dag7gs26g8c215jb"; depends=[data_table DT e1071 mlr3 mlr3learners mlr3measures plyr purrr ranger readxl shiny shinyalert shinydashboard shinyjs shinythemes shinyWidgets stringr]; }; - mlr3tuning = derive2 { name="mlr3tuning"; version="0.2.0"; sha256="1pm7glhc8a8syifa850hpac836ks3bi2kfcbw3d8zhmjk1g31l53"; depends=[bbotk checkmate data_table lgr mlr3 mlr3misc paradox R6]; }; + mlr3spatiotempcv = derive2 { name="mlr3spatiotempcv"; version="0.1.0"; sha256="0pj9ch76ljg4bsqsmd7gs1smldf38zv978vh8yiqljc3fbj8p40p"; depends=[checkmate data_table ggplot2 mlr3 mlr3misc paradox R6 testthat]; }; + mlr3tuning = derive2 { name="mlr3tuning"; version="0.5.0"; sha256="1pn80qjxzj2pivgs6qgairci6yh1bdnl2zbgl9ykdip2rqzv6r6m"; depends=[bbotk checkmate data_table lgr mlr3 mlr3misc paradox R6]; }; mlr3verse = derive2 { name="mlr3verse"; version="0.1.3"; sha256="0hbzfcr1xwdyyf1jrxdrj4r1rzx15bj9s0pw5386zjwkvmdhp5c1"; depends=[mlr3 mlr3data mlr3filters mlr3learners mlr3misc mlr3pipelines mlr3tuning mlr3viz paradox]; }; - mlr3viz = derive2 { name="mlr3viz"; version="0.2.0"; sha256="168q8lrjgwk51bxcc5njcvca3nkcn7q1yhfjx99zcnlbsd1zi4rr"; depends=[checkmate data_table ggplot2 mlr3misc]; }; - mlrCPO = derive2 { name="mlrCPO"; version="0.3.6"; sha256="1z9s52y318wp43q7n28h89m5s58bcfawzj9zx03ji1adf68sk9ah"; depends=[backports BBmisc checkmate mlr ParamHelpers stringi]; }; - mlrMBO = derive2 { name="mlrMBO"; version="1.1.4"; sha256="007944cb6hz7rah0bk66mpfa22jinz9i224wljgnj0w51lpipbjv"; depends=[backports BBmisc checkmate data_table lhs mlr parallelMap ParamHelpers smoof]; }; + mlr3viz = derive2 { name="mlr3viz"; version="0.5.0"; sha256="15yqzqk0wrd3vxv2m6rbv74j65nsl6xf46axi6ldcwzb2f25v6ml"; depends=[checkmate data_table ggplot2 mlr3misc]; }; + mlrCPO = derive2 { name="mlrCPO"; version="0.3.7"; sha256="08gn57nvj6zvqqs4l686x8pc55dbp9i60shaq74y2br9diavaf9z"; depends=[backports BBmisc checkmate mlr ParamHelpers stringi]; }; + mlrMBO = derive2 { name="mlrMBO"; version="1.1.5"; sha256="1f2ryd0mrlnnwxgwiria2sxqkb09kskfqjzsh32cbxh6ml4d3fbs"; depends=[backports BBmisc checkmate data_table lhs mlr parallelMap ParamHelpers smoof]; }; mlsjunkgen = derive2 { name="mlsjunkgen"; version="0.1.1"; sha256="109ag52x4y3rzx8yccilrnl24mz4ximzx6v4lrbak7dpiclqrw7a"; depends=[]; }; mlt = derive2 { name="mlt"; version="1.2-0"; sha256="0mjbnxkmv2pzwmwn249x21nfqb1v1ls3jah9a0vh6ndhz8c4gz7x"; depends=[alabama basefun BB coneproj nloptr numDeriv sandwich survival variables]; }; - mlt_docreg = derive2 { name="mlt.docreg"; version="1.0-5"; sha256="1dp5h86bcga9lkc1hy5sbc3as0piyzxlz6z5iwli2a33ssyihxql"; depends=[mlt numDeriv]; }; + mlt_docreg = derive2 { name="mlt.docreg"; version="1.0-9"; sha256="0jm6g4rk505ki3lasrrsq8lczb8wlyyd1phap3mqdh169rlacmah"; depends=[eha flexsurv lattice mlt multcomp np numDeriv survival truncreg]; }; mltest = derive2 { name="mltest"; version="1.0.1"; sha256="14gyssfph088v936mpywmd4y8z9vdv0zk8638vlg23j8cf5j4al2"; depends=[]; }; mltools = derive2 { name="mltools"; version="0.3.5"; sha256="045v28w7vz1zjxim8vfc6ncvg2mavr1q332x0hzlqpfzrk7gz4vh"; depends=[data_table Matrix]; }; mlxR = derive2 { name="mlxR"; version="4.1.3"; sha256="1ma4kw4db9iyylly8y7kkz4bv2qfmqyy9ychv4yhra6123n4001x"; depends=[ggplot2]; }; - mma = derive2 { name="mma"; version="10.3-2"; sha256="1r04x1dykq305d83xvxx5lbgvqfkspx0r4krqsg78av0njf4knqk"; depends=[car gbm gplots lattice plotrix survival]; }; + mma = derive2 { name="mma"; version="10.5-0"; sha256="1n4p67s8vyaz3vj8f24lccg2mr4lmbqka6aj862bnzai9vljrjvq"; depends=[car gbm gplots lattice plotrix survival]; }; + mmabig = derive2 { name="mmabig"; version="3.0-0"; sha256="032xphcrcwp9n3i8rcn4ipvvjmgh9qwmkdml40rx9fhg43qr31n1"; depends=[car glmnet gplots mma survival]; }; mmand = derive2 { name="mmand"; version="1.6.1"; sha256="19s6v083iry95akhc2ccj617sjcddalb6dp87j3lqjlgybxws62q"; depends=[Rcpp]; }; mmap = derive2 { name="mmap"; version="0.6-19"; sha256="0s3vlwdcwifl2a2byr0f2cc4vmbdparc55x889a3h115ga7k91w2"; depends=[]; }; mmapcharr = derive2 { name="mmapcharr"; version="0.3.0"; sha256="175qb6ay6zlcdcxzc86lmlddfzjc8j8i1b8cvi2q0j6nbl2kl50r"; depends=[Rcpp rmio]; }; mmaqshiny = derive2 { name="mmaqshiny"; version="1.0.0"; sha256="0v44hd7h9d8hdd2avwwwwc0a8rzm5ij3yhryxkrw7bwvr12zsp17"; depends=[Cairo caTools data_table dplyr DT ggplot2 htmltools leaflet lubridate plotly shiny shinyjs stringr XML xts zoo]; }; + mmb = derive2 { name="mmb"; version="0.13.3"; sha256="07nni04fb0gprma368axzz303db12hp22fz1a0xwh3bbh6n7zb9g"; depends=[doParallel foreach Rdpack]; }; mmc = derive2 { name="mmc"; version="0.0.3"; sha256="03nhfhiiadga8mcp33kj20g33v9n5i62fdqgi20h5p80g849k719"; depends=[MASS survival]; }; mmcm = derive2 { name="mmcm"; version="1.2-8"; sha256="09xcvgzgg5x890jibmmbcd3rr8q8vmwxwk6s8zgn9a8hfdwqny9a"; depends=[mvtnorm]; }; mme = derive2 { name="mme"; version="0.1-6"; sha256="1k60y1yrf7fv939v32kf3il7r3cws0kih4bpm0ap28fvbx3vr3yb"; depends=[MASS Matrix]; }; mmeln = derive2 { name="mmeln"; version="1.4"; sha256="0q5w3ajc1v798dyvryny2a0c52hzhxrjm4md08mqvww65pdzhqc4"; depends=[]; }; mmeta = derive2 { name="mmeta"; version="2.3"; sha256="0hyxpph2hfjwiy95r0n3h64aab5ziqp2a8gmmpp6nyc77h638czb"; depends=[aod]; }; - mmm = derive2 { name="mmm"; version="1.4"; sha256="1nydian004nldqhyw3x15w6qfml2gkjc0x8ii54faz563byjv3d8"; depends=[gee]; }; mmm2 = derive2 { name="mmm2"; version="1.2"; sha256="1h9pn5s3jjs4bydrr1qysjb4hv7vs4h3m7mvi22ggs2dzyz3b298"; depends=[gee]; }; mmmgee = derive2 { name="mmmgee"; version="1.20"; sha256="0y3pwnc9h7y2l9cvgfl62nl1vnnkla2y8082jhdvxsb3mk88rgad"; depends=[Matrix mvtnorm]; }; mmod = derive2 { name="mmod"; version="1.3.3"; sha256="1dz6887mlqbagjj98wcabmxj9hvsz8pgsizy1fqkwjhhs44c62y4"; depends=[adegenet pegas]; }; @@ -10913,16 +11383,18 @@ in with self; { mnlogit = derive2 { name="mnlogit"; version="1.2.6"; sha256="0dfwpkl8g7ap5xr48smiv8vdbamd2r1liy9nwpsn0kcsr9cj65n9"; depends=[Formula lmtest mlogit]; }; mnonr = derive2 { name="mnonr"; version="1.0.0"; sha256="143qkn3bx37a6r7kgmspqh55l2r8k9f93jgxr6qpg51w411k5ilb"; depends=[]; }; mnormpow = derive2 { name="mnormpow"; version="0.1.1"; sha256="0z53vwhkhkkr6zrjhd3yr14mb02vh7lr63frf0ivajndxiap0s9v"; depends=[]; }; - mnormt = derive2 { name="mnormt"; version="2.0.1"; sha256="00nn0b6nksn2jbpg0np5wphryp4f9v95vqxf5v628yysnawgkcwq"; depends=[tmvnsim]; }; + mnormt = derive2 { name="mnormt"; version="2.0.2"; sha256="0d7ka4l4fl1wi77r2r81dc91n6cbj2xrb3lsizz5y0ziscva0sjw"; depends=[tmvnsim]; }; mnreadR = derive2 { name="mnreadR"; version="2.1.4"; sha256="11mfpf12pjpgvcih6q8l9fwspj2gy78fcirimzv7gn061nr4v7sg"; depends=[dplyr ggplot2 nlme tibble tidyr]; }; mnt = derive2 { name="mnt"; version="1.3"; sha256="1wf2mq4zdhznv589j7snw0gpnfrlvq6lhfihi2n20qlwm3lb9naa"; depends=[MASS pracma]; }; - mob = derive2 { name="mob"; version="0.2.1"; sha256="12nzdp1d8qfisc5jqahb83jgif4zzbh9i0sblzs2knb87w886q95"; depends=[gbm Rborist]; }; + mob = derive2 { name="mob"; version="0.3"; sha256="1hy7sj1qs6x6y066c1dpzqhs78bwf9dj7miiihvmkp5m4bd1h4wm"; depends=[gbm Rborist]; }; mobForest = derive2 { name="mobForest"; version="1.3.1"; sha256="1g5yfs70abl7pacprijlwdq3l72aqkbqs09z1pmw64wv4wa1vm25"; depends=[modeltools party sandwich strucchange zoo]; }; + mobr = derive2 { name="mobr"; version="2.0.0"; sha256="09an5xwqkk95xn4fd1jpx0808y411rk6w05ni1w9l0n1zj407a45"; depends=[dplyr egg geosphere ggplot2 pbapply plotrix purrr rlang scales tibble tidyr vctrs]; }; mobsim = derive2 { name="mobsim"; version="0.1.0"; sha256="077hw1162giwc90y5dvj9052i5hxdf2ii29m9q8ky028375dsd0f"; depends=[Rcpp sads vegan]; }; moc = derive2 { name="moc"; version="2.0"; sha256="0fgp8dg9qf7aw1qawmszlxs4bcccqmd87y4kkzdqggm807c2k5gh"; depends=[]; }; moc_gapbk = derive2 { name="moc.gapbk"; version="0.1.0"; sha256="0gg64srdb17dx712hilnlrii9i5vi9vjrk17acaynaz307akdw08"; depends=[amap doMPI doParallel doSNOW fields foreach matrixStats mco miscTools nsga2R plyr reshape2 Rmisc]; }; mockery = derive2 { name="mockery"; version="0.4.2"; sha256="16zayzi2qdmiy513hvlci9f4p8jwry24006yfzrgmrvf6sf293lq"; depends=[testthat]; }; mockr = derive2 { name="mockr"; version="0.1"; sha256="0340v6189ivlzzriwk7yhf3v2k651x05fd1xrqfxxjgwhysaqj6z"; depends=[lazyeval]; }; + mockthat = derive2 { name="mockthat"; version="0.2.4"; sha256="1x0zvg8i9ryaj5g4cjh87l4w0d2a8gvskrzp2y382xy0lpq353m5"; depends=[]; }; mod = derive2 { name="mod"; version="0.1.3"; sha256="0z5a6ps2m0cbw0n9kn44767m5jnbf1dl077i2p40fipv8xali9fb"; depends=[]; }; mod09nrt = derive2 { name="mod09nrt"; version="0.14"; sha256="1wn1y33bj9r712l0f063j5gcl423anjzmvgfy0ddihcrbpz4l7a0"; depends=[]; }; modEvA = derive2 { name="modEvA"; version="2.0"; sha256="1vkg7x48k0xl1ngqwk6waggidva924j8mv7wfbzfcyj36yv8ggdw"; depends=[]; }; @@ -10934,21 +11406,24 @@ in with self; { modeLLtest = derive2 { name="modeLLtest"; version="1.0.3"; sha256="0hf7y78yp3jb0af9df3df6n1z66y2iyhhmgyfz12c4iadly0v6x1"; depends=[coxrobust MASS quantreg Rcpp RcppArmadillo survival]; }; modeest = derive2 { name="modeest"; version="2.4.0"; sha256="087dw0013y4m7fcl06mxylh9lnp6acysl80d80r9srv4pw4r950s"; depends=[fBasics stable stabledist statip]; }; modehunt = derive2 { name="modehunt"; version="1.0.7"; sha256="0qz9kmf1qfs2dr7kzm9l7ac0h5rvi3b9j9896p991sk4bcalsl0b"; depends=[]; }; - model4you = derive2 { name="model4you"; version="0.9-5"; sha256="1l94196x594ff61f8iaywpmw9ra3g27bnlchjl14hb9h0l21vbgm"; depends=[Formula ggplot2 gridExtra partykit sandwich survival]; }; + model4you = derive2 { name="model4you"; version="0.9-6"; sha256="1bz01hnk8lh1vsa6wnhzfhpznz3znzyljz7xp28x638s01l2fw4y"; depends=[Formula ggplot2 gridExtra partykit sandwich survival]; }; modelDown = derive2 { name="modelDown"; version="1.1"; sha256="1l0aggkh0ykpqrp59bdz1cyl1ai397cw4hya80b7fm7s49imwczg"; depends=[archivist auditor breakDown DALEX devtools drifter DT ggplot2 kableExtra psych svglite whisker]; }; modelObj = derive2 { name="modelObj"; version="4.0"; sha256="1py2y80x37mmnl2y0pxdbhqkjrln6x210hg0g224d34lxk71m172"; depends=[]; }; - modelStudio = derive2 { name="modelStudio"; version="1.2.0"; sha256="1r13c145g4jki1jspnab1jcaqxflkad376w5bd15q25r69n7svb2"; depends=[digest iBreakDown ingredients jsonlite progress r2d3]; }; - modelbased = derive2 { name="modelbased"; version="0.1.2"; sha256="0440pckpw9vfbvvhxsikayb0b6k479icr2m9ps0yr0xph240x9hw"; depends=[bayestestR emmeans insight parameters]; }; + modelStudio = derive2 { name="modelStudio"; version="2.1.0"; sha256="0cvr09av1c4z2j1qdic49j6cygrfcdahppdfr7d2avxmhswx1mhk"; depends=[DALEX digest iBreakDown ingredients jsonlite progress r2d3]; }; + modelbased = derive2 { name="modelbased"; version="0.4.0"; sha256="1ihhg2xi94rzzvrlfzymf0q5hzxgd58s37jy7syqcv1yjrdpsawh"; depends=[bayestestR emmeans insight parameters]; }; modelc = derive2 { name="modelc"; version="1.0.0.0"; sha256="0xz1zgv5yyvq0yfnhm1kvb4wvlyn4ccd0lkwji55vq8hndvjvk98"; depends=[]; }; - modeldata = derive2 { name="modeldata"; version="0.0.2"; sha256="13q6hhbwqbwnjvg8bz6iwwfx96p1saqq3r34cjrbnpgzmr1nn11l"; depends=[]; }; + modeldata = derive2 { name="modeldata"; version="0.1.0"; sha256="0lbvmicvhw560jn9qk5dywrl6mgj1rf7zh7p86lf97c6bmz0zp2r"; depends=[]; }; modeldb = derive2 { name="modeldb"; version="0.2.2"; sha256="14s8xh05qxv414xcnww1b3s0jqwnjb3l1dqf7q1qbw33ilwcmsfb"; depends=[dplyr ggplot2 progress purrr rlang tibble tidypredict]; }; modelfree = derive2 { name="modelfree"; version="1.1-1"; sha256="0ammka2wxx90z31zfzypw9dk5n118l0vxhykxbx6srfig2vdyn82"; depends=[PolynomF SparseM]; }; modelgrid = derive2 { name="modelgrid"; version="1.1.1.0"; sha256="1z6g0akczry7vldkk6anfq572zbsfzbd6qnyllgjpbxhy3rrrq0r"; depends=[caret dplyr ggplot2 lattice magrittr purrr]; }; - modelplotr = derive2 { name="modelplotr"; version="1.0.0"; sha256="1b1pcah28b2fsr5l7v3lwxgvl03jr2cyxk5x5plnc3vwy5g0bnpm"; depends=[dplyr ggfittext ggplot2 gridExtra magrittr RColorBrewer rlang scales]; }; + modelplotr = derive2 { name="modelplotr"; version="1.1.0"; sha256="0i1ssfcyl97zaxc9khdngrmsq9ydrmgv2nd7c6kc6i9z93jbkk4k"; depends=[dplyr ggfittext ggplot2 gridExtra magrittr RColorBrewer rlang scales]; }; modelr = derive2 { name="modelr"; version="0.1.8"; sha256="1i31nff7bqibk6r4hhd4j1vzwbyaf8493v0bjaagn36njmysfnw2"; depends=[broom magrittr purrr rlang tibble tidyr tidyselect vctrs]; }; - modelsummary = derive2 { name="modelsummary"; version="0.5.1"; sha256="16d4626sr9xyhvs8pbls336drccy18sl8pa33f9gh0hqw9iwxcij"; depends=[broom checkmate dplyr generics ggplot2 gt Hmisc kableExtra knitr magrittr purrr rmarkdown stringr tables tibble tidyr]; }; - modeltests = derive2 { name="modeltests"; version="0.1.2"; sha256="0m56awji87v710gx0rwgd2cgmnq78slfxarr05qy0piq4q9h7pqr"; depends=[dplyr generics purrr testthat tibble]; }; - modeltime = derive2 { name="modeltime"; version="0.0.2"; sha256="0y52v5n0cv9x3ck25kgdf8sad02v2gida982ahrcm0vjxqxqm5ma"; depends=[dials dplyr forcats forecast ggplot2 glue gt hardhat janitor magrittr parsnip plotly progressr prophet purrr reactable rlang scales stringr tibble tidyr timetk workflows xgboost yardstick]; }; + modelsummary = derive2 { name="modelsummary"; version="0.6.4"; sha256="1m8ab6fnq400vrf1mw96ry9d0bg34z3495f4z6blykpr49a5d2ng"; depends=[broom checkmate generics glue insight kableExtra parameters performance tables]; }; + modeltests = derive2 { name="modeltests"; version="0.1.3"; sha256="1d5d53rp9aw426lhc10w6r60jmw6kdc66im6lmkps214pdy5crib"; depends=[dplyr generics purrr testthat tibble]; }; + modeltime = derive2 { name="modeltime"; version="0.4.0"; sha256="1wxx5vf3x2las1pyq0pbfifcv6zf0b5gv6z3a7j0bj9cg9pb8mgm"; depends=[cli dials dplyr forcats forecast ggplot2 glue gt hardhat janitor magrittr parsnip plotly progressr prophet purrr reactable rlang scales slider StanHeaders stringr tibble tidyr timetk workflows xgboost yardstick]; }; + modeltime_ensemble = derive2 { name="modeltime.ensemble"; version="0.3.0"; sha256="0masfnv1yi61aqlrgamwdrglgnqqd955fr4lpyjbrv9qvdiklm90"; depends=[cli crayon dials dplyr generics glmnet glue magrittr modeltime modeltime_resample parsnip progressr purrr recipes rlang rsample stringr tibble tictoc tidyr timetk tune workflows yardstick]; }; + modeltime_gluonts = derive2 { name="modeltime.gluonts"; version="0.1.0"; sha256="1nivqpdyr2s6q70bixna0a18gbhrf1r20vm0gj8b51idjignwpp7"; depends=[dplyr forcats fs glue magrittr modeltime parsnip purrr reticulate rlang stringr tibble tidyr timetk]; }; + modeltime_resample = derive2 { name="modeltime.resample"; version="0.1.0"; sha256="0qj6s0a2q6627vjfrh8k9fb4xq8dylvdnc4zyqdgpplrgypjqf9k"; depends=[cli crayon dials dplyr forcats ggplot2 glue magrittr modeltime parsnip plotly progressr purrr recipes rlang rsample stringr tibble tictoc tidyr timetk tune workflows yardstick]; }; modeltools = derive2 { name="modeltools"; version="0.2-23"; sha256="1vqh69256h344sbj5affm0kmc77dakrxp6442xfdnfd0y5d8sgkb"; depends=[]; }; modelwordcloud = derive2 { name="modelwordcloud"; version="0.1"; sha256="0ardib0h923i7jk8bgcq6pn2zazx9acf9sdggifsk46hdz8hvqnm"; depends=[]; }; modernVA = derive2 { name="modernVA"; version="0.1.1"; sha256="1kjfgr7fcf0w27gx1wwapxcw5wisfv75mq9qc5hjnaivmsnkwsv3"; depends=[]; }; @@ -10959,28 +11434,30 @@ in with self; { modi = derive2 { name="modi"; version="0.1.0"; sha256="0v78vzb22v2h2qlfhsyi0d2j3c2gj3wgv67p6gv74269kiaglf92"; depends=[MASS norm]; }; modifiedmk = derive2 { name="modifiedmk"; version="1.5.0"; sha256="171l3ls7icaanqf6jb64jabwq0mis2g1fswr0jfkpkrw5iw1c66q"; depends=[boot]; }; modiscloud = derive2 { name="modiscloud"; version="0.14"; sha256="0vwhfp50yb21xkanvzk983vk0laflv60kj1ybx3fydfljwqx0rwj"; depends=[date raster rgdal sfsmisc sp]; }; + modmarg = derive2 { name="modmarg"; version="0.9.6"; sha256="1l57sqhv1xm5g3z9rdlhkkq6gpbn7a3z8bk4dhvzm44xcfv8hi3i"; depends=[]; }; modopt_matlab = derive2 { name="modopt.matlab"; version="1.0-2"; sha256="0g5mswalv4y7p1k3n8a6qf7wb072m4bjq2ml2j83dz2j2bmvygsd"; depends=[ROI ROI_plugin_glpk ROI_plugin_quadprog]; }; moduleColor = derive2 { name="moduleColor"; version="1.08-3"; sha256="183l968l49b7jbmvsjjnmk1xd36cpjkp777c00gw1f73h6nb2na8"; depends=[dynamicTreeCut impute]; }; modules = derive2 { name="modules"; version="0.8.0"; sha256="1xzlnnl4ka9h4qwq4gg65pzhacq9ip6v347yrhms14c86a851k8k"; depends=[]; }; modygliani = derive2 { name="modygliani"; version="1.0"; sha256="01g96cdm4hgbsh6xsdfjg7vp7zb138sxwgv0msrlm27a6p4fcnlx"; depends=[]; }; moezipfR = derive2 { name="moezipfR"; version="1.0.2"; sha256="0sfl1c7cvm1milcglcvz9lyvgricsdm7shx0jxyn50y7xz0padww"; depends=[tolerance VGAM]; }; mogavs = derive2 { name="mogavs"; version="1.1.0"; sha256="0lhmwdv991bv7j8k066jr7ii94w60ydjpf5pzmv8jlblf3w2pr02"; depends=[cvTools]; }; - mokken = derive2 { name="mokken"; version="3.0.2"; sha256="16rgjnwvq397zxypacllpyhwz76i4b0m3jg6kzhr3zgsag1g62z3"; depends=[poLCA Rcpp]; }; + mokken = derive2 { name="mokken"; version="3.0.4"; sha256="11j8zvb3l5fvp42kal4yn3rgm71r2jf9h8fr7aapbpd7j3j73pg0"; depends=[poLCA Rcpp]; }; moko = derive2 { name="moko"; version="1.0.3"; sha256="1igrz0k9gfs4lmwh20bvmx8176d22g8gha7iv36mrpqgcynfdzh0"; depends=[DiceKriging emoa GenSA GPareto mco]; }; molaR = derive2 { name="molaR"; version="4.5"; sha256="1mfb05cfg0jh60yxnmwhja6m38185r58kbz2ak0ikgaqd9lls07s"; depends=[alphahull rgl Rvcg]; }; molic = derive2 { name="molic"; version="2.0.1"; sha256="0ling6rbccp0r3y3g8mlxd39hx8qgb3z1y82rjzsaamqwbzx7biz"; depends=[doParallel ess foreach ggplot2 ggridges Rcpp]; }; - mombf = derive2 { name="mombf"; version="2.2.9"; sha256="0z7crgvl1c15s0pn6isa9i4phfsbhl6msc1jdbk88ckh09ilx0z7"; depends=[mclust mgcv mvtnorm ncvreg Rcpp RcppArmadillo survival]; }; + mombf = derive2 { name="mombf"; version="3.0.1"; sha256="1a6rhjr8r0h80dp90q0vdmaszvl2wr6yid8yx9af4sxymh33lspr"; depends=[mclust mgcv mvtnorm ncvreg Rcpp RcppArmadillo survival]; }; momentchi2 = derive2 { name="momentchi2"; version="0.1.5"; sha256="1fv0jmwws4mkl9dsaybfpj29ncvqx2idsijgwz2qjblcg309a6k9"; depends=[]; }; - momentfit = derive2 { name="momentfit"; version="0.1-1"; sha256="0nyfb8hg2akd0arla6qrz1f1lnlm0b30j945kfvbi8jjkbh2rpa2"; depends=[sandwich]; }; + momentfit = derive2 { name="momentfit"; version="0.2"; sha256="1xh3w3bwr2k4a79vma5cmz0l995nwbih0j7sgv3bjqdv4fn463d1"; depends=[sandwich]; }; moments = derive2 { name="moments"; version="0.14"; sha256="0f9y58w1hxcz4bqivirx25ywlmc80gbi6dfx5cnhkpdg1pk82fra"; depends=[]; }; momentuHMM = derive2 { name="momentuHMM"; version="1.5.1"; sha256="01s0nv37w7nzg4jpm94sxi2m9kxlswcr00l1fm1y1c6x1asx4hpq"; depends=[argosfilter Brobdingnag car CircStats conicfit crawl data_tree doParallel doRNG dplyr extraDistr foreach geosphere ggmap ggplot2 lubridate magrittr MASS mitools moveHMM mvtnorm nleqslv numDeriv prodlim qdapRegex raster Rcpp RcppArmadillo rlang scatterplot3d sp survival]; }; momr = derive2 { name="momr"; version="1.1"; sha256="091vzaw8dm29q89lg2iys25rbg2aslgdn9sk06x038nngxdrn95r"; depends=[gplots Hmisc nortest]; }; + monaco = derive2 { name="monaco"; version="0.2.0"; sha256="0b49g5vn3g0i1c9h9yswnydp6lw4pl80q0c2mncca2n6rwr4wzxk"; depends=[htmltools htmlwidgets rstudioapi shiny]; }; mondate = derive2 { name="mondate"; version="0.10.01.02"; sha256="18v15y7fkll47q6kg7xzmj5777bz0yw4c7qfiw2bjp0f3b11qrd2"; depends=[]; }; - mongolite = derive2 { name="mongolite"; version="2.2.0"; sha256="1q9vj5jhvwvzjjcaanyj6zhmplyk7rmibp4hvyabp9lpig2clnsm"; depends=[jsonlite mime openssl]; }; + mongolite = derive2 { name="mongolite"; version="2.2.1"; sha256="05qshdd9f5kpsas84khnawbin89k6xi54mayynqjgdy7xcy5wx8b"; depends=[jsonlite mime openssl]; }; monitoR = derive2 { name="monitoR"; version="1.0.7"; sha256="1h1g0m1j13mz37xxwck4s7a0bfqvi0nrzfw60j7bkzaah8zxcc9n"; depends=[tuneR]; }; - monkeylearn = derive2 { name="monkeylearn"; version="0.2.0"; sha256="18lpfs64h0hy4vkdjlnmxwgagvf54kn8a1c866vv00ckyp85fvn2"; depends=[cowsay digest dplyr httr jsonlite magrittr purrr ratelimitr tibble tidyr]; }; monmlp = derive2 { name="monmlp"; version="1.1.5"; sha256="19cx60csm8mnf6ksg64vlhi8wi1c7bmv9l55y9zmaljblr0kmzxf"; depends=[optimx]; }; - monographaR = derive2 { name="monographaR"; version="1.2.0"; sha256="0sis2kw07ifq54w6p56zspmlnvxvq6ajb0sdvc9fk480sfxg9806"; depends=[circular maptools png raster rmarkdown sp]; }; + monoClust = derive2 { name="monoClust"; version="1.2.0"; sha256="01gg2ppqy0pfdnl20lkkmiiz4k34r3nwr5zzcl3gq2vci887777l"; depends=[cluster doParallel dplyr foreach ggplot2 permute purrr rlang stringr tibble tidyr]; }; + monographaR = derive2 { name="monographaR"; version="1.2.1"; sha256="09fkcw13h7dx7j5vyp48fk6yzv9n64568zf2zvmm2c008jw3gkbm"; depends=[circular maptools png raster rmarkdown sp]; }; monomvn = derive2 { name="monomvn"; version="1.9-13"; sha256="1hm5qf28bh0q7f4zcjqx1qxw3l8hzkx349c1y3nwyfg7436vff6a"; depends=[lars MASS mvtnorm pls quadprog]; }; monoreg = derive2 { name="monoreg"; version="1.2"; sha256="16n622j1j998a5fhn1c1qbzk5bfa5h09d95ry89gsd00p40hqg0a"; depends=[]; }; monotonicity = derive2 { name="monotonicity"; version="1.3.1"; sha256="0bb6sl8yykry25a86qfggi36ggr1xrxcqsnzp6rb6na228hbwa2z"; depends=[lmtest MASS sandwich]; }; @@ -10990,38 +11467,38 @@ in with self; { moreparty = derive2 { name="moreparty"; version="0.2.0"; sha256="0wds0223aqpflzmid9mdzszh1yrylqq68cqw5fj4yz0c1vwvfixh"; depends=[foreach ggplot2 iml MASS measures party partykit pdp plyr rlang varImp vip]; }; morgenstemning = derive2 { name="morgenstemning"; version="1.0"; sha256="17y90cf8ajmkfwla0hm4jgkbkd1mxnym63ph2468sfxkhn0r3v88"; depends=[]; }; morpheus = derive2 { name="morpheus"; version="1.0-1"; sha256="1zfx24ndlky0b6vg6an9vcjw955ms749dwb51x9gsj2m8vgrbpnn"; depends=[jointDiag MASS pracma]; }; - morphomap = derive2 { name="morphomap"; version="1.2"; sha256="1c01vs0jd171cbs0s6x67cjdla49bzhjbb704slbqili413wlxfm"; depends=[Arothron colorRamps DescTools geometry lattice mgcv Morpho oce raster rgdal rgl Rvcg sp]; }; - morse = derive2 { name="morse"; version="3.2.5"; sha256="1y3daw8ccn0n61kj6lj6m3m4pfj936k786d385lyq05211rkdgqr"; depends=[coda deSolve dplyr epitools ggplot2 gridExtra magrittr reshape2 rjags tibble tidyr zoo]; }; - mortAAR = derive2 { name="mortAAR"; version="1.0.2"; sha256="047xagjmqj6sla0zlz0ljdivggkv04i45yn7637a33ni1pmb83al"; depends=[magrittr Rdpack reshape2]; }; - mosaic = derive2 { name="mosaic"; version="1.7.0"; sha256="19v5z0sd9zilzhzx6vqzfav3s743h93f13cz06qrafyvdgl2ic93"; depends=[broom dplyr ggdendro ggformula ggplot2 ggrepel glue gridExtra lattice latticeExtra leaflet MASS Matrix mosaicCore mosaicData readr rlang tidyr]; }; - mosaic_find = derive2 { name="mosaic.find"; version="0.1.1"; sha256="03ls5kd6f02rrj44kmdf4a70zflxz27m7hcxgh8lzhkp8dn0sgkn"; depends=[minpack_lm]; }; + morphomap = derive2 { name="morphomap"; version="1.3"; sha256="12jqrabx8vgkrfwcv4845jbf79ibg5iqzzzr4x4vybb4b2p2wd2i"; depends=[Arothron colorRamps DescTools geometry lattice mgcv Morpho oce raster rgdal rgl Rvcg sp]; }; + morse = derive2 { name="morse"; version="3.2.7"; sha256="1dqh5wjjdi0mskrig755dsfmcabd95zmck4d18g3ir07jq7w4zh8"; depends=[coda deSolve dplyr epitools ggplot2 gridExtra magrittr reshape2 rjags tibble tidyr zoo]; }; + mortAAR = derive2 { name="mortAAR"; version="1.1.0"; sha256="0xdiipxyfninknagn19xm1p4aqmwrz9c5zkxi49bbgrvv0742cfq"; depends=[crayon magrittr Rdpack reshape2 tibble]; }; + mosaic = derive2 { name="mosaic"; version="1.8.2"; sha256="08jrdi8y2xk5fjp2zdwfbj2cymd0m70kjjyyx57dsdgzppqajhcf"; depends=[broom dplyr ggdendro ggformula ggplot2 ggrepel ggridges ggstance glue gridExtra lattice latticeExtra leaflet MASS Matrix mosaicCore mosaicData readr rlang tidyr]; }; + mosaic_find = derive2 { name="mosaic.find"; version="0.1.2"; sha256="1fzgksh8sp701qjfrvjl2bg967qjkjpilxsfkrazhw71cgmzjgjl"; depends=[minpack_lm]; }; mosaicCalc = derive2 { name="mosaicCalc"; version="0.5.1"; sha256="0w5j7q314hzfzaw24ych2dhn255lnn3w0x4xr47qc1zclbmbny91"; depends=[ggformula magrittr MASS mosaic mosaicCore rlang]; }; - mosaicCore = derive2 { name="mosaicCore"; version="0.6.0"; sha256="1klw97h6lchw1cpcl8s637ikcl428cckmjq0czi7mibh9q9mw72z"; depends=[dplyr lazyeval MASS rlang tidyr]; }; - mosaicData = derive2 { name="mosaicData"; version="0.18.0"; sha256="0cx5dg26ha7nzkdyghkbbd6ikncj60qv1538az77lfgn2jylvkbz"; depends=[]; }; + mosaicCore = derive2 { name="mosaicCore"; version="0.8.0"; sha256="00va6x1i8d3wkm1bgsms9dsjfn5a1l43prpl9pqirgq3zm85hrqj"; depends=[dplyr MASS rlang tidyr]; }; + mosaicData = derive2 { name="mosaicData"; version="0.20.1"; sha256="05mrwvs7awhpv2gvk0jjva74gndfgh2cl17slxcjhwlpga8nmxji"; depends=[]; }; mosaicModel = derive2 { name="mosaicModel"; version="0.3.0"; sha256="1gx4rzh0h922gyb50vz6q5vqqp5ry5hf2mq95948q2gcady91k5w"; depends=[caret dplyr ggformula ggplot2 knitr lazyeval MASS mosaicCore testthat tibble tidyr tidyverse]; }; mosmafs = derive2 { name="mosmafs"; version="0.1.2"; sha256="04syr5qr91hyv1m5hfrjsriq0qgidaln06m7f3jgc1qyrni930rw"; depends=[BBmisc checkmate ecr MASS mlr mlrCPO parallelMap ParamHelpers smoof]; }; mosqcontrol = derive2 { name="mosqcontrol"; version="0.1.0"; sha256="199rkfisagr4kfx358f8yrbls00fng0kq8siyrbfwwf8qrba9fla"; depends=[assertthat magrittr NlcOptim nloptr pracma sfsmisc]; }; mosum = derive2 { name="mosum"; version="1.2.3"; sha256="1xrrx0gaby5gbqssvhwracm8wny31lqzd64hkmr81s41z8srkxx9"; depends=[plot3D RColorBrewer Rcpp]; }; motifcluster = derive2 { name="motifcluster"; version="0.1.1"; sha256="1a123djc476hf528h68f1l1sh47ljxh23hmp8j22fypiaci1a3av"; depends=[igraph LICORS Matrix RSpectra]; }; + motifr = derive2 { name="motifr"; version="1.0.0"; sha256="01synariq39mzhx12jbcpwn982piakakl97sgs33xa8xrbwzcxgm"; depends=[dplyr ggplot2 ggraph igraph intergraph network purrr RColorBrewer reshape2 reticulate rlang scales tibble tidygraph]; }; motmot = derive2 { name="motmot"; version="2.1.3"; sha256="09qsyc4ifdl316kjqqkarmflpjcd0ivkhx5fzi3502anj6dxpjnq"; depends=[ape caper coda ks mvtnorm Rcpp]; }; motoRneuron = derive2 { name="motoRneuron"; version="1.0.0"; sha256="1hdsf4c1v5hfaqpi5y1v60zqq5fdmlqdvzpsq77diclp9vzdshja"; depends=[dygraphs ggplot2]; }; moult = derive2 { name="moult"; version="2.1.0"; sha256="0k0969fwy648x25xw42w5ncimyw2cbq305rzf4m77p3pf0k50m9b"; depends=[Formula Matrix]; }; mountainplot = derive2 { name="mountainplot"; version="1.2"; sha256="1bbgkps1yhfa0lmapqkhhl5mc63p0gzszxw2g910dbi1cjc0pphx"; depends=[lattice]; }; mousetrack = derive2 { name="mousetrack"; version="1.0.0"; sha256="0lf0xh0c3xl27nh5w8wwyrm2jfzfajm2f73xjdgf746dp365qc8n"; depends=[pracma]; }; - mousetrap = derive2 { name="mousetrap"; version="3.1.4"; sha256="1iizlcq6ak9hfqwaz8d0zmijfnw2v7fwgksxng9mxiqiva98is8a"; depends=[cstab diptest dplyr fastcluster fields ggplot2 magrittr pracma psych RColorBrewer Rcpp scales tidyr]; }; - movMF = derive2 { name="movMF"; version="0.2-4"; sha256="0j5gp1l374479lsijw1hz00pxs09zzh7hapljv80lsvr24vfscpa"; depends=[clue skmeans slam]; }; - move = derive2 { name="move"; version="4.0.2"; sha256="131s66vmlpfkmcp0s68m8ckaagh157pnhz76q5n9b2asznmi5fd0"; depends=[geosphere httr memoise raster Rcpp rgdal sp xml2]; }; + mousetrap = derive2 { name="mousetrap"; version="3.1.5"; sha256="0q89k4hb6lv65b71qivvahpblpcgnd5jmmq9z5m8jvp1ksp49vqz"; depends=[cstab diptest dplyr fastcluster fields ggplot2 magrittr pracma psych RColorBrewer Rcpp rlang scales tidyr]; }; + movMF = derive2 { name="movMF"; version="0.2-5"; sha256="1k790g1h17vv4ails4jhdnqiwj3b2zpas13x8wzkabwf4k0n1g91"; depends=[clue skmeans slam]; }; + move = derive2 { name="move"; version="4.0.6"; sha256="0fjq9msscxpkyzvd7vnz9g8r8f8sv0clnps2bkk9jhk8jscwvjhp"; depends=[geosphere httr memoise raster Rcpp rgdal sp xml2]; }; moveHMM = derive2 { name="moveHMM"; version="1.7"; sha256="031msh427hgjyr37imalr7smd79yqscw9xq5rjrixxc2w5qly9jj"; depends=[boot CircStats geosphere ggmap ggplot2 MASS numDeriv Rcpp RcppArmadillo sp]; }; moveVis = derive2 { name="moveVis"; version="0.10.5"; sha256="1lj22yr6v3vg795r72gkbhyabycppxbjsaldqiqgckhkdfh3lziw"; depends=[av cowplot curl ggplot2 gifski lubridate lwgeom magick magrittr move pbapply raster sf slippymath]; }; moveWindSpeed = derive2 { name="moveWindSpeed"; version="0.2.3"; sha256="14a2iymn4j831xlh42z5qxmhnh7xpp5bxasgpkhnb3v0b5ldyilh"; depends=[move Rcpp]; }; movecost = derive2 { name="movecost"; version="0.5"; sha256="1rhmm2xk4f9kjanyaxpn0h6p7ka5pn7z6wlax6d6yhi9w9km75sp"; depends=[gdistance raster rgdal rgeos sp]; }; mozzie = derive2 { name="mozzie"; version="0.1.0"; sha256="09dwrv4r0hi19gzi1vpif3q4wlbny9h22430g1hhv0wkqs86mhmw"; depends=[]; }; mp = derive2 { name="mp"; version="0.4.1"; sha256="0awvwqwb25q47j14b450k1k5mh2yzwhn7gizjv5j7lyiamk30iwq"; depends=[Rcpp RcppArmadillo]; }; - mpMap2 = derive2 { name="mpMap2"; version="1.0.3"; sha256="0fa89sbqd22h4px9lizmsl7f5xmd1g56i6n1x0x418qvlmgrnn6j"; depends=[car fastcluster ggplot2 igraph jsonlite Matrix nnls progress pryr qtl RColorBrewer Rcpp sn]; }; mpa = derive2 { name="mpa"; version="0.7.3"; sha256="0mhnsbgr77fkn957zfiw8skyvgd084rja1y4wk5zf08q5xjs2zvn"; depends=[network]; }; - mpath = derive2 { name="mpath"; version="0.3-26"; sha256="0yigcf9zdlr9nqdwb8bxcgfqs3l4xzzw65hj8ba3sybwzlwva7xw"; depends=[bst doParallel foreach MASS numDeriv pscl]; }; + mpath = derive2 { name="mpath"; version="0.4-2.17"; sha256="0zs6551g8blzp3dj06k34vbp8gw5jv5h9hkys3n9mrc767nfs9sf"; depends=[bst doParallel foreach glmnet MASS numDeriv pamr pscl WeightSVM]; }; mpbart = derive2 { name="mpbart"; version="0.2"; sha256="1145n0lxmm0kjm2lc358d79hqws48crj17pjvmchl1pbfd7zi4r8"; depends=[bayesm cvTools mlbench mlogit]; }; - mpcmp = derive2 { name="mpcmp"; version="0.1.3"; sha256="11j12ns04g2xdw5r34x86bacwacf3618rzpqz8wvfs1l192l001c"; depends=[]; }; + mpcmp = derive2 { name="mpcmp"; version="0.3.6"; sha256="1jzrmaxm133zy4wi5pzjlj6gnh89nx4j69dnwm4s4y3i7ixch908"; depends=[dplyr generics ggplot2 ggpubr purrr Rcpp rlang stringr tibble]; }; mpcv = derive2 { name="mpcv"; version="1.1"; sha256="0vwycspiw9saj811f6alkbijivy7szpahf35bxn2rpn2bdhbn21i"; depends=[lpSolve]; }; mpe = derive2 { name="mpe"; version="1.0"; sha256="17bgdbg1zrf78djd3mwycidwibxvsis7pwkrcynvghcc8l2zfci9"; depends=[mvtnorm]; }; mplot = derive2 { name="mplot"; version="1.0.4"; sha256="1f3llh1599q8259la02nvdigrs4p4j1l4qsp5bxi19my6gff0l10"; depends=[bestglm doParallel doRNG dplyr foreach ggplot2 glmnet googleVis leaps plyr reshape2 scales shiny shinydashboard tidyr]; }; @@ -11036,59 +11513,63 @@ in with self; { mpt = derive2 { name="mpt"; version="0.6-2"; sha256="19nkkpxd250xzk0il60psvhcikxfn9yqvfv9d21wilc9n2h79ad2"; depends=[]; }; mptools = derive2 { name="mptools"; version="1.0.1"; sha256="1g4fbfwxv9hir0jn22nh9854blgkh0b5jan3lv0888izj4isa1hc"; depends=[animation lattice latticeExtra raster rasterVis sp viridis zoo]; }; mr_raps = derive2 { name="mr.raps"; version="0.2"; sha256="069vyvsdgc5m7n2fd0h7jrllz789zvsxka7h5wiy36dc7lagd6f8"; depends=[nortest]; }; - mrMLM = derive2 { name="mrMLM"; version="4.0"; sha256="03y8gsnz1xwjb5imzgs0iv7hfyajfxag2fjyg1s8qwbvl1s6w04c"; depends=[coin data_table doParallel foreach ggplot2 lars ncvreg qqman sampling sbl]; }; - mrMLM_GUI = derive2 { name="mrMLM.GUI"; version="4.0"; sha256="0jl61rc642mqg9gmil6vdfc9296srvs2vmfm43ds0f46ysbh8wpx"; depends=[bigmemory coin data_table doParallel foreach ggplot2 lars mrMLM ncvreg openxlsx qqman sampling sbl shiny shinyjs]; }; + mrMLM = derive2 { name="mrMLM"; version="4.0.2"; sha256="0v2vmzylaqk836xqpyjy5cccnpsacyy2b334cay3pdlr8qdmrqky"; depends=[coin data_table doParallel foreach lars ncvreg Rcpp RcppEigen sampling sbl]; }; + mrMLM_GUI = derive2 { name="mrMLM.GUI"; version="4.0.2"; sha256="0ywxaw164czfgbnqfkh5zw06006clisbc780w2h4z71wfvj56dsi"; depends=[bigmemory coin data_table doParallel foreach lars mrMLM ncvreg Rcpp RcppEigen sampling sbl shiny shinyjs]; }; mra = derive2 { name="mra"; version="2.16.11"; sha256="0268msdy4cs2ifpagmwiabi6aav54ckn214ai18aqv2h97hmixw0"; depends=[]; }; mratios = derive2 { name="mratios"; version="1.4.2"; sha256="18pi0dks0qmw0gv76yqm4gvxdqrcvr25j1vb8k4mkp5p35kzkzff"; depends=[multcomp mvtnorm survival survPresmooth]; }; mrbayes = derive2 { name="mrbayes"; version="0.2.0"; sha256="1g5p2w65kkvhcsxzx59zqlc1f26zajmcbprf2bznvcl200qbypg5"; depends=[BH Rcpp RcppEigen rstan rstantools StanHeaders]; }; - mrbin = derive2 { name="mrbin"; version="1.4.2"; sha256="05rfqpx26j7j2ncmskvk1q9950rf38gwkw7li4qjrilq13301mq7"; depends=[]; }; + mrbin = derive2 { name="mrbin"; version="1.4.4"; sha256="1n793xhjvwkxm4jg0fr81laznbbhay6dhl3dcsi9h5nj8rax4bza"; depends=[]; }; mrbsizeR = derive2 { name="mrbsizeR"; version="1.2.1.1"; sha256="0v06sd5sh7ghlr8lgrv6l4glmv7chj3951pw4ssxrly4hz2rh6i0"; depends=[fields maps Rcpp]; }; - mrds = derive2 { name="mrds"; version="2.2.3"; sha256="0bfkxl3y61abqyzlsm32222kp4zld2h7nkhpvzlsriqwp0pff20c"; depends=[mgcv numDeriv optimx Rsolnp]; }; + mrds = derive2 { name="mrds"; version="2.2.4"; sha256="0c432vi2b82078nzmwkchrazjaf6bjs4hgvndn03s2ja76sxnd1m"; depends=[mgcv numDeriv optimx Rsolnp]; }; mreg = derive2 { name="mreg"; version="1.1"; sha256="06la0yy2yys161jhlzlcm5lcv0664wm6sa8gjdnpd1s1nx52jkqf"; depends=[]; }; mregions = derive2 { name="mregions"; version="0.1.6"; sha256="0ix77hqcllhcpldchlnvciiflm6ysylynnnqvczpf8vx7gwa3lrk"; depends=[data_table httr jsonlite rappdirs sp tibble wellknown xml2]; }; - mrf2d = derive2 { name="mrf2d"; version="0.4.0"; sha256="19ldfcfw779ksi7byfz5dk0lyhkjg67zhxj3nhw9kim41wmkrk4h"; depends=[dplyr ggplot2 Rcpp RcppArmadillo Rdpack reshape2 tidyr]; }; - mrfDepth = derive2 { name="mrfDepth"; version="1.0.12"; sha256="14kc0rjrdgh1zyiibiq79gd1npdxydml6lcxyf4pwdzipaa1yrg4"; depends=[abind geometry ggplot2 matrixStats Rcpp RcppArmadillo RcppEigen reshape2]; }; + mrf2d = derive2 { name="mrf2d"; version="0.5"; sha256="0vp5rcmrsyfsnh5rmv130081yzrxf7g0pdvydrlvfabsx9his6pl"; depends=[dplyr ggplot2 Rcpp RcppArmadillo Rdpack tidyr]; }; + mrfDepth = derive2 { name="mrfDepth"; version="1.0.13"; sha256="177331j30n707mcl1ghxjc53xjs9qsal15kccc71b0rabkjdq2wv"; depends=[abind geometry ggplot2 matrixStats Rcpp RcppArmadillo RcppEigen reshape2]; }; mrfse = derive2 { name="mrfse"; version="0.2"; sha256="1dx21m54jsprlngj20q1bgvbw1bbm0sm8i01xanj68bx796ng14j"; depends=[]; }; mrgsim_parallel = derive2 { name="mrgsim.parallel"; version="0.1.1"; sha256="0xsq7538z8rw4b5q3bcrspgfjw965yr5v7f8k3za04ksx775nfy2"; depends=[dplyr future_apply mrgsolve]; }; - mrgsolve = derive2 { name="mrgsolve"; version="0.10.4"; sha256="1zz1nw87y1h9rp715zvlsd4phdnr4lp6mk4wd149cnvzc10wk6f8"; depends=[BH dplyr glue lifecycle magrittr Rcpp RcppArmadillo rlang tibble tidyselect]; }; + mrgsim_sa = derive2 { name="mrgsim.sa"; version="0.1.0"; sha256="199m6ygwnw6fbld5fqsw1j5jz9x6l1ayrpsc0r51q4fr7nmmpfj2"; depends=[assertthat dplyr ggplot2 mrgsolve patchwork purrr rlang tibble tidyr tidyselect withr]; }; + mrgsolve = derive2 { name="mrgsolve"; version="0.10.7"; sha256="1b9yyqnwq7asbvmb19ddn0lhdglv1xcpxrgvmbdafzlngjx767n7"; depends=[BH dplyr glue lifecycle magrittr Rcpp RcppArmadillo rlang tibble tidyselect]; }; mri = derive2 { name="mri"; version="1.0.1"; sha256="1dssq556kid6c3djp0s6v853cranv2wjs2c9521l5ykg5g33hfmv"; depends=[]; }; mritc = derive2 { name="mritc"; version="0.5-2"; sha256="07b1b2k1ka43ikj2mhwnazw3ig7w10bf759fimxpksvk5k6wanx2"; depends=[lattice misc3d oro_nifti]; }; mro = derive2 { name="mro"; version="0.1.1"; sha256="00gc2hd8q5hb2xrswclcqqw1gxl83zmpma6bhsggg3kppsw1dpjv"; depends=[MASS matrixcalc]; }; + mrregression = derive2 { name="mrregression"; version="1.0.0"; sha256="1yy2sjs0b67bqyggzypp2g7x4fdmi86jx2nbcp2n7hcf9cdacysi"; depends=[data_table Rcpp]; }; ms_sev = derive2 { name="ms.sev"; version="1.0.4"; sha256="1sr2rgiskgwjhwif70qj6ga8i8kg4bh342hff66b2a54rxrchmw5"; depends=[]; }; msBP = derive2 { name="msBP"; version="1.4"; sha256="17hsnfipb6mgwhbc9rxzx5azc57ravz7zfnbc8r73sn1b270ydpb"; depends=[]; }; + msSPChelpR = derive2 { name="msSPChelpR"; version="0.8.6"; sha256="0254riap3lxp929c7isj2665wvziiy2lskhhyzw50kyd768bvb60"; depends=[data_table dplyr lubridate magrittr progress purrr rlang sjlabelled stringr tidyr tidyselect tidytable]; }; msSurv = derive2 { name="msSurv"; version="1.2-2"; sha256="02qm3mq17d2yj5mbz6gapd3zfi1wmiad5hpyimcb39impk43n2hf"; depends=[class graph lattice]; }; msaFACE = derive2 { name="msaFACE"; version="0.1.0"; sha256="1lh8crz507nlddm946lmn73xbnsh4cs0kg238ysnsvxs726c83fs"; depends=[]; }; msaR = derive2 { name="msaR"; version="0.3.0"; sha256="0lj9yhsissr4rgavyhgdxi2nrkq2088darzraisx9jsirjr49jf8"; depends=[ape htmlwidgets]; }; msae = derive2 { name="msae"; version="0.1.2"; sha256="0xdyym4zmm9znr89qgy1sl7bw84nddn1jv3wh66igkxbczf542ih"; depends=[magic]; }; msaenet = derive2 { name="msaenet"; version="3.1"; sha256="067p97z54dwhxy0w4ihi8dddcbvglh8ssynbh29fl9jyxfwjr1ms"; depends=[foreach glmnet Matrix mvtnorm ncvreg survival]; }; msap = derive2 { name="msap"; version="1.1.8"; sha256="0z5lm782jjb9w1h5vgz8bmxjdcrq9zb3xp1w5cb479jjc7krlgg3"; depends=[ade4 ape]; }; + msce = derive2 { name="msce"; version="1.0.1"; sha256="1x9ivc2bjp07pdn15p3qds00m1m00amcg2dfcdjsgbkx9x1kkfab"; depends=[Rcpp RcppParallel]; }; mschart = derive2 { name="mschart"; version="0.2.5"; sha256="08j342slv4ca6qkd12hh7jmmv5wv6kfxamw34dr6sd89kzrfdj0p"; depends=[cellranger data_table htmltools officer R6 writexl xml2]; }; mscstexta4r = derive2 { name="mscstexta4r"; version="0.1.2"; sha256="1hjcasmn33xav2mw085lcndv0432l6sz327aikf63491wj1sj7mw"; depends=[dplyr httr jsonlite pander stringi]; }; - mscstts = derive2 { name="mscstts"; version="0.5.6"; sha256="1kqja12v00s9fwh9skx9p7pyk2nbyb76cvqp00g7qgi0w5d5gq8j"; depends=[httr jsonlite tuneR]; }; + mscstts = derive2 { name="mscstts"; version="0.6.2"; sha256="0mf3hs150gz39s0lh2fqbpg632n7rmmb8ns5swgx2wi3svhrk5lm"; depends=[httr jsonlite tuneR]; }; mscsweblm4r = derive2 { name="mscsweblm4r"; version="0.1.2"; sha256="031s00wpr9zfjpii56m67q1phn05vqlhb8cfzhyf6fbrxvpb8k7n"; depends=[httr jsonlite pander]; }; - msd = derive2 { name="msd"; version="0.2.0"; sha256="13g4ykzn5ny05js0msmax12yx3lchs8qnfdw8bw76gd8hlvibhlq"; depends=[]; }; + msd = derive2 { name="msd"; version="0.3.0"; sha256="0wk1llhl70hwgd900vfzj5a4w71ynca01vqlvv2yds5zy0bplalx"; depends=[]; }; msda = derive2 { name="msda"; version="1.0.2"; sha256="05khpa5qasnngn6yvk87gv5262plqpw4knb6hzgy52w401k0y80r"; depends=[MASS Matrix]; }; msde = derive2 { name="msde"; version="1.0.4"; sha256="1jyvsadkha4976vdf8nn2dbrsymr4n932cqrkmhawmy6pxa2c45g"; depends=[Rcpp RcppArmadillo RcppProgress]; }; msgl = derive2 { name="msgl"; version="2.3.9"; sha256="0793d12cd1mcnr97byhfwpnvm329w78f56n7dcs4116hlizp8l9h"; depends=[BH Matrix Rcpp RcppArmadillo RcppProgress sglOptim]; }; msgpackR = derive2 { name="msgpackR"; version="1.1"; sha256="0a6vm4q1zfy8wlvhl9wfy09ig1iag9fvjasz5w9bll7idky4ldx5"; depends=[]; }; msgps = derive2 { name="msgps"; version="1.3.1"; sha256="0r8i0sw412jr148bid8sfpjcfbkf5589dqcqyvf5cm84cj7axnpz"; depends=[]; }; msgr = derive2 { name="msgr"; version="1.1.2"; sha256="15s3d77xqczjydgcfx4jlsq408hgsm8yzqk5248v58vm6zy36mh0"; depends=[purrr rlang]; }; - msigdbr = derive2 { name="msigdbr"; version="7.1.1"; sha256="0jvi49qa7616s58p0rx66pcw7h12rc8kgcg9225jk7pc3934hnzh"; depends=[dplyr magrittr rlang tibble]; }; - msir = derive2 { name="msir"; version="1.3.2"; sha256="0pvc3q162vqq3k39nni732x05zzfz4y9y2zf56d83185ypszv9kb"; depends=[mclust]; }; + msigdbr = derive2 { name="msigdbr"; version="7.2.1"; sha256="1rc2p9vw57pn4prmfgay4w18qd53ggq7wxfsi9kp7w25ciip1dq1"; depends=[dplyr magrittr rlang tibble tidyselect]; }; + msir = derive2 { name="msir"; version="1.3.3"; sha256="1wm83m3cqd6llxb9p2jwim0wb81v84pgdmgcznygzaaq6kbn3n84"; depends=[mclust]; }; msltrend = derive2 { name="msltrend"; version="1.0"; sha256="1rwy77ijf3hzq2zp47cijwvqcq34rdlfxwhrd9l56bvmlmzr1dqx"; depends=[changepoint forecast plyr Rssa tseries zoo]; }; msm = derive2 { name="msm"; version="1.6.8"; sha256="1d32y8f0vb2dfv3999liigpns788j145nrvd1xpxb9i2lsg8mwgk"; depends=[expm mvtnorm survival]; }; msma = derive2 { name="msma"; version="2.1"; sha256="1k1xfbwyapwjs7bp9v0vrdfrz54hsyxh562xni1n8m61l4gwkvzx"; depends=[mvtnorm]; }; msme = derive2 { name="msme"; version="0.5.3"; sha256="0mq57zdas1s87nblnvbif9lisgahfhvmabglvp9imr1mvpwybpbh"; depends=[lattice MASS]; }; msmtools = derive2 { name="msmtools"; version="1.3"; sha256="0p7xpj78cjc1s015ma7vc38kqiy6wvpyixrdinx4ngig1pqfrq4p"; depends=[data_table msm survival]; }; - msos = derive2 { name="msos"; version="1.1.1"; sha256="0jp4xw03iwc6dkk93kkky9k6xd285ylzp1x7jxkl3h0884jvyjyf"; depends=[mclust tree]; }; - mssm = derive2 { name="mssm"; version="0.1.3"; sha256="1d1iksvm97g42p4y3jfzrk0xf4bbw8n237dcmy9jjyaw9vlxw61h"; depends=[nloptr Rcpp RcppArmadillo testthat]; }; + msos = derive2 { name="msos"; version="1.2.0"; sha256="1fg9q6269cckn4g6isv22k22mzglxhjxjg5npqsikmisribmr9kb"; depends=[mclust tree]; }; + mssm = derive2 { name="mssm"; version="0.1.4"; sha256="10qv0dylh1q1jlk6j28bsp819h0pjzvaynhrbsnl0d0yha657yrp"; depends=[nloptr Rcpp RcppArmadillo testthat]; }; mssqlR = derive2 { name="mssqlR"; version="1.0.0"; sha256="0qdnm7cx9cg14vfcnkmcjqr1jpxsw8xlrbnxldvzz44mzv2n878l"; depends=[magrittr RODBC]; }; mstDIF = derive2 { name="mstDIF"; version="0.1.6"; sha256="0zhslqzvvk8wbgqvcipmzhy94awwfmkv5yfl812m8wmwgpkcqzpb"; depends=[eRm expm Matrix mirt PP scDIFtest]; }; mstR = derive2 { name="mstR"; version="1.2"; sha256="0v8cv9pswkvw0lva6jx5vavsb20dawgq83gn4rgydyhvigcl5szd"; depends=[]; }; - mstate = derive2 { name="mstate"; version="0.2.12"; sha256="0qnhivbibzss8yfsg44cvbf73n4jj4i28rbdysl88g14ig5sabgv"; depends=[RColorBrewer survival]; }; + mstate = derive2 { name="mstate"; version="0.3.1"; sha256="11i3p7fph8nbnfis1m7rdrq32qryaajv2wrkxk1x6k17zkh4rq6i"; depends=[data_table lattice magrittr RColorBrewer rlang survival viridis]; }; mstherm = derive2 { name="mstherm"; version="0.4.7"; sha256="04jrp0w17svwmrvx356jmh04npbwhk9nvfy3r39vqr82yrvn6jip"; depends=[doParallel foreach nls2 plotrix RColorBrewer]; }; - mstknnclust = derive2 { name="mstknnclust"; version="0.3.0"; sha256="0ym5v36kjw7s6ff3yxlxbkd0764jgv5a1pabx6acwp7pv80l4vl1"; depends=[igraph]; }; - mstrio = derive2 { name="mstrio"; version="11.2.2.1"; sha256="02xcrpgywnhnx9bqpcxb5yc352765s26jnyrqfm5x269w8lalx6z"; depends=[crul data_table httr jsonlite openssl R6 rstudioapi shiny shinyjs]; }; + mstknnclust = derive2 { name="mstknnclust"; version="0.3.1"; sha256="0bg38gnaf2jjva8l2wk862ch2cpqvw7szvvvpb2bnz02fp795p3g"; depends=[igraph]; }; + mstrio = derive2 { name="mstrio"; version="11.3.0.1"; sha256="1qjqxrgy2amm0ikfixkqjix3d6jzh1y3abnbzq41ibl5qiz8pjxy"; depends=[crul data_table httr jsonlite openssl R6 rstudioapi shiny shinyjs]; }; msu = derive2 { name="msu"; version="0.0.1"; sha256="1vhh9725dbywmzihnmsq1jircpn91r8227j2f76fvma9rwss90p7"; depends=[entropy]; }; mtconnectR = derive2 { name="mtconnectR"; version="1.2.1"; sha256="0hl46h535mjqwgrhmxlixhfsych3blzcynffp55nr1ynrra4dn06"; depends=[data_table dplyr dtw ggplot2 lubridate magrittr plyr proxy stringr tidyr XML]; }; mthapower = derive2 { name="mthapower"; version="0.1.1"; sha256="0g6dn0qn7z6qc1gbzspy1n7b803427bc9fv5yqk7j8i1is1p8h94"; depends=[]; }; @@ -11105,10 +11586,11 @@ in with self; { mueRelativeRisk = derive2 { name="mueRelativeRisk"; version="0.1.1"; sha256="16yclfmgxc32pv00vyb9fjdh4syax8ynizr8a29haiq22q5fqclh"; depends=[]; }; muhaz = derive2 { name="muhaz"; version="1.2.6.1"; sha256="08qh43zx6h3yby44q2vxphfvmfdmqxpgyp0734yn341sy9n8pkkk"; depends=[survival]; }; muir = derive2 { name="muir"; version="0.1.0"; sha256="0h3qaqf549v40ms7c851sspaxzidmdpcj89ycdmfp94b2q3bmz98"; depends=[DiagrammeR dplyr stringr]; }; + mully = derive2 { name="mully"; version="2.1.30"; sha256="0ifi4i4y8rgn1mfzaggibq9wkaf8xl3qk6l5sgjxxfcymmq4vzf0"; depends=[igraph randomcoloR rgl shape]; }; mulset = derive2 { name="mulset"; version="1.0.0"; sha256="0pigiy6hfiqh6x4zx6zqn3ykk36s3abzzyb67jdlf4jzc5zhrl9g"; depends=[digest gtools]; }; multDM = derive2 { name="multDM"; version="1.1.3"; sha256="16bvr62lxmrq79z856iigwz5cjhk327x4hhd0cg3adgabqcz04yp"; depends=[MTS]; }; multbxxc = derive2 { name="multbxxc"; version="1.0.1"; sha256="1ip5awjc2ljpy6nsr4y42x0yg4n7lyaxp9kzfjvwp41k9lriz4gm"; depends=[Rcpp RcppArmadillo rmumps]; }; - multcomp = derive2 { name="multcomp"; version="1.4-13"; sha256="1nszi22rcc551yc75h9cdfkdqsxw1rz30vadazmpyzihp1bh63yk"; depends=[codetools mvtnorm sandwich survival TH_data]; }; + multcomp = derive2 { name="multcomp"; version="1.4-15"; sha256="1klvn4a1rlrzwhy1cjrkbbh6jspgzbrdm0jxsb1lmf1yzdz609wr"; depends=[codetools mvtnorm sandwich survival TH_data]; }; multcompView = derive2 { name="multcompView"; version="0.1-8"; sha256="1rfq9wvvrghq0542ff40wy8vdmsyd8spzz6ihcywcvxdfa8m6g8j"; depends=[]; }; multdyn = derive2 { name="multdyn"; version="1.6"; sha256="06yab2lmxp7lc7zjk8n194mn5vza0yjbp276iair3ry35my4h3v8"; depends=[data_table ggplot2 Rcpp RcppArmadillo reshape2]; }; multfisher = derive2 { name="multfisher"; version="1.1"; sha256="0vzvq7v2xz35fx8pg25c9xqkic09k6fcg9zh81j7pgqmzi2wwrp8"; depends=[]; }; @@ -11118,7 +11600,7 @@ in with self; { multiCA = derive2 { name="multiCA"; version="1.1"; sha256="1vgb13cfq10g8hxykgi3is3mrlbm76vh40cznapl7xxmw226ccrl"; depends=[bitops multcomp]; }; multiColl = derive2 { name="multiColl"; version="1.0"; sha256="01csf5gjk2wrv6d0m1j23gk6dcixck318ywfq1a1a0j1dl9wmvx4"; depends=[]; }; multiDimBio = derive2 { name="multiDimBio"; version="1.2.2"; sha256="0xadpvnyghpqh2q1gp1fqwv591sm3icmx60x4g8gn1vybi51k5rx"; depends=[ggplot2 gridGraphics lme4 MASS misc3d pcaMethods RColorBrewer]; }; - multiMarker = derive2 { name="multiMarker"; version="1.0"; sha256="1qay05mqacdy0psqrmd2a0sgy6az1a27k8204yh51b69p8zckym4"; depends=[ordinalNet truncnorm]; }; + multiMarker = derive2 { name="multiMarker"; version="1.0.1"; sha256="1kj29m1bzqmsj63drad4gvq9glwbnyca68df8sycpi7h4b8zirgq"; depends=[ordinalNet truncnorm]; }; multiPIM = derive2 { name="multiPIM"; version="1.4-3"; sha256="0j7d0cgs8zcyiyibzmfhcandad76sf4gm57wkcv98bf96wkls58l"; depends=[lars penalized polspline rpart]; }; multiRDPG = derive2 { name="multiRDPG"; version="1.0.1"; sha256="0r6n148pakixw4caj0zwib8zirgl98lm0mxqmhvmqjh389icskxc"; depends=[]; }; multiROC = derive2 { name="multiROC"; version="1.1.1"; sha256="15ydbxpkdyvsc55di13jvwh9p6dzxc1yj93w1cwsd8jp2y10wsd3"; depends=[boot magrittr zoo]; }; @@ -11126,6 +11608,7 @@ in with self; { multibiplotGUI = derive2 { name="multibiplotGUI"; version="1.0"; sha256="0ig7r4p8mq594cjwclbqwjk8saqkvjqjbbnnxj1hc1sdj7qdlcpf"; depends=[cluster dendroextras Matrix rgl shapes tcltk2 tkrplot]; }; multicastR = derive2 { name="multicastR"; version="1.3.0"; sha256="07y3a7apk6pjnfqki52jc5vbzb1w53fla7wcpc184f4zpqfc783q"; depends=[curl data_table gsubfn stringi XML xml2 xtable]; }; multichull = derive2 { name="multichull"; version="1.0.0"; sha256="1gc7kxxlbanc6rmmbf6h85jf7kj0a78h23m5vwwqqliv018qsv2n"; depends=[igraph plotly shiny shinythemes]; }; + multiclassPairs = derive2 { name="multiclassPairs"; version="0.4.0"; sha256="0s1c0bkzrg8viv152ylqjighbqbrpcwsg51w7l9gn7mjjdshavny"; depends=[Boruta caret dunn_test e1071 ranger rdist]; }; multicmp = derive2 { name="multicmp"; version="1.1"; sha256="0mz7ksc5h6dy95l3kbsamm191372blhlrj573krc57bj93lmp1a5"; depends=[numDeriv]; }; multicolor = derive2 { name="multicolor"; version="0.1.4"; sha256="1yswpqm62cvpfj6zxrprbvamjah3zxhsvn19qgpqmha0098lx5g2"; depends=[cowsay crayon dplyr glue magrittr purrr stringi stringr tibble tidyr]; }; multicon = derive2 { name="multicon"; version="1.6"; sha256="16glkgnm4vlpxkhf1xw1gl1q10yavx9479i21v29lldag35z8pqx"; depends=[abind foreach mvtnorm psych sciplot]; }; @@ -11145,7 +11628,7 @@ in with self; { multinbmod = derive2 { name="multinbmod"; version="1.0"; sha256="1c4jyzlcjkqdafj9b6hrqp6zs33q6qnp3wb3d7ldlij7ns9fhg71"; depends=[]; }; multinet = derive2 { name="multinet"; version="3.3.1"; sha256="0sbzaadcln3ml4lsdd2ry0il6cppaxz48q5vj8g41rns2ifjspna"; depends=[igraph RColorBrewer Rcpp]; }; multinets = derive2 { name="multinets"; version="0.2.2"; sha256="1i5jsq1xy0g0l5d1z3hz4gj6inj4rhd6lf2s5xzd5k8ccp5aba8c"; depends=[igraph Rcpp]; }; - multinma = derive2 { name="multinma"; version="0.1.3"; sha256="1pg49gz7cq8cjhqg8pvs17lv0z46bgrn897xpdc6cjlp9qdgmzg5"; depends=[bayesplot BH copula dplyr forcats ggdist ggplot2 ggraph glue igraph Matrix purrr randtoolbox Rcpp RcppEigen Rdpack rlang rstan rstantools StanHeaders stringr tibble tidyr truncdist]; }; + multinma = derive2 { name="multinma"; version="0.2.0"; sha256="0lnhbgcb5dn0h6vjbkg86cklq5k1nfwc71fp0azm7vmkzgiqya1i"; depends=[bayesplot BH copula dplyr forcats ggdist ggplot2 ggraph glue igraph Matrix purrr randtoolbox Rcpp RcppEigen RcppParallel Rdpack rlang rstan rstantools StanHeaders stringr tibble tidyr truncdist]; }; multinomRob = derive2 { name="multinomRob"; version="1.8-6.1"; sha256="1fdjfk77a79fy7jczhpd2jlbyj6dyscl1w95g64jwxiq4hsix9s6"; depends=[MASS mvtnorm rgenoud]; }; multinomineq = derive2 { name="multinomineq"; version="0.2.1"; sha256="09h5nccfcrnl78rdxwsw5cqirfq40a6x4dmpkibc475z3xndk2rm"; depends=[coda quadprog Rcpp RcppArmadillo RcppProgress RcppXPtrUtils Rglpk]; }; multipanelfigure = derive2 { name="multipanelfigure"; version="2.1.2"; sha256="0cm5bd7k0fx6d3gybcll6vvh14byanyk6dj4civqij7psa48iagc"; depends=[assertive_base assertive_files assertive_numbers assertive_properties assertive_types ggplot2 gridGraphics gtable magick magrittr stringi]; }; @@ -11157,9 +11640,9 @@ in with self; { multisensi = derive2 { name="multisensi"; version="2.1-1"; sha256="0f8i1jvrnmdsws5w7fz9k5pb5yfl5b9hnfd8aq4zj1r6m90kb6sz"; depends=[knitr sensitivity]; }; multisom = derive2 { name="multisom"; version="1.3"; sha256="0msxmrj4iawxg4vf4r7kj26zalxz4di2w4nxgxiakiig4g4ggy9z"; depends=[class kohonen]; }; multispatialCCM = derive2 { name="multispatialCCM"; version="1.0"; sha256="1fzd91w10iln8qb81z240lq3fi4gq22l4rh9npkav6fiq6g6rlp8"; depends=[]; }; - multitaper = derive2 { name="multitaper"; version="1.0-14"; sha256="04wd9bbhyx7697pfy0fpj02v1csr48hkpqj62h9p8a6w84ji4k68"; depends=[]; }; + multitaper = derive2 { name="multitaper"; version="1.0-15"; sha256="1gm3wr8xqpqiby7q1dr3zxim77v0bvvrqi0hlazf5g3gnkrp2zc3"; depends=[]; }; multivar = derive2 { name="multivar"; version="0.0.2"; sha256="0ijv7zsznqsf8g6lgnaccfi76j04ycxd0zgjw5wbf03in5vxzlpc"; depends=[MASS Rcpp RcppArmadillo]; }; - multivariance = derive2 { name="multivariance"; version="2.3.0"; sha256="00hvsia4xcs2r2lj9qqnlj4klivvpx58fmhr4dgy3waq8pp5a0dv"; depends=[igraph microbenchmark Rcpp]; }; + multivariance = derive2 { name="multivariance"; version="2.4.0"; sha256="0bnhcmpkavac8m2bdn8yb4nimxna2480inqxw3jm0j5j2fpdgfh9"; depends=[igraph microbenchmark Rcpp]; }; multivator = derive2 { name="multivator"; version="1.1-9"; sha256="0vbqvhmym46zjr1h4s53sjrddfjpv8wi0sq4lrh2rmqarq068416"; depends=[emulator mvtnorm]; }; multiviewtest = derive2 { name="multiviewtest"; version="2.0.0"; sha256="09svd9jbvn92vkaifr33vg5scyh6311kpkr0lgsdj6lycz9cb4q7"; depends=[doParallel foreach irlba Matrix matrixStats mclust randnet]; }; multiwave = derive2 { name="multiwave"; version="1.4"; sha256="19581kjcyw86cnzhvhhpn997fixm811ggmvb8jkb3dsxg8vp60jc"; depends=[]; }; @@ -11177,18 +11660,19 @@ in with self; { musica = derive2 { name="musica"; version="0.1.3"; sha256="0cfzfar706l0xdb0n11m18mayj5rrplvf4qry36vgxsiaxcba90r"; depends=[data_table lubridate magrittr qmap]; }; mustashe = derive2 { name="mustashe"; version="0.1.2"; sha256="0ihngnjay9zg8570za2rja0m2hxjy1ygc4zaif862sqflza68kdp"; depends=[digest formatR qs tibble]; }; mut = derive2 { name="mut"; version="1.1"; sha256="0v0vviarsmaiap3fa82ia01cblana65fd3cbj7jkd3aral6pm6yz"; depends=[expm Familias IBDsim paramlink]; }; - mutSignatures = derive2 { name="mutSignatures"; version="2.0.1"; sha256="1rpg1ms33kc5dvcrjldd6fbg4rlnyp0lb0g7c1yxr42zndc613yh"; depends=[cluster doParallel foreach ggplot2 pracma proxy]; }; + mutSignatures = derive2 { name="mutSignatures"; version="2.1.1"; sha256="0skw92633mwckkkgkncfv09wvnr910nf4wdbqz0a61cl7mxlsr25"; depends=[cluster doParallel foreach ggplot2 pracma proxy]; }; mutoss = derive2 { name="mutoss"; version="0.1-12"; sha256="1yk7p7pb2xm38d3j19ysgwmix48lvimbhkhjjwk5jmr1a0ysx298"; depends=[multcomp multtest mvtnorm plotrix]; }; mutossGUI = derive2 { name="mutossGUI"; version="0.1-11"; sha256="08pcca9gzns83az6jbjzv4xhm1wgmchhzz4f54x1aq0nmvsz3qq1"; depends=[CommonJavaJars JavaGD JGR multcomp mutoss plotrix rJava]; }; + mvGPS = derive2 { name="mvGPS"; version="1.0.2"; sha256="0ym940q2spqjcvkrm58mm3mcxkj2zz7l9giz2filq5r0xikvqir7"; depends=[CBPS cobalt gbm geometry MASS matrixNormal Rdpack sp WeightIt]; }; mvLSW = derive2 { name="mvLSW"; version="1.2.3"; sha256="05g6v4jbg1km2215lxbwzx8frr4in7xal9pai3y6l23d66lvh1iz"; depends=[fields wavethresh xts zoo]; }; mvMISE = derive2 { name="mvMISE"; version="1.0"; sha256="0lnc5g3ksl5cvwylh8p8baxyvq3z32a2i337q7lhg00j031ccy5c"; depends=[lme4 MASS]; }; mvMORPH = derive2 { name="mvMORPH"; version="1.1.3"; sha256="0ilfq67vl4kjn3qz2wmyqsiymb4x9bry56hii4whw3an23r25plc"; depends=[ape corpcor glassoFast pbmcapply phytools spam subplex]; }; mvMonitoring = derive2 { name="mvMonitoring"; version="0.1.0"; sha256="03nvq8nmrmrpzyxlsqzww5ghk640115l1jgmgwfahhjxkdpkzfxx"; depends=[BMS dplyr lazyeval plyr rlang robustbase xts zoo]; }; mvPot = derive2 { name="mvPot"; version="0.1.4"; sha256="04l9dn8amwp366b6lic5fkl4kck0x2m3xcsqz6as4c3h772nhq1w"; depends=[evd gmp MASS numbers]; }; mvQuad = derive2 { name="mvQuad"; version="1.0-6"; sha256="016477dhjdkqiadc631vzpbp967mn4yli6by3s1k348mlfirwsi3"; depends=[data_table statmod]; }; - mvSLOUCH = derive2 { name="mvSLOUCH"; version="2.5"; sha256="0ysmns0vcraak53a0lf8g4sl36g2nhvk8pp45nx8qbjbbj8w6ib6"; depends=[abind ape Matrix matrixcalc mvtnorm ouch PCMBase TreeSim]; }; + mvSLOUCH = derive2 { name="mvSLOUCH"; version="2.6.1"; sha256="1sm7yyvqjj9wljd0wz1qjw59n271fbvanzly82sflm28ikq5xdm9"; depends=[abind ape Matrix matrixcalc mvtnorm ouch PCMBase TreeSim]; }; mvShapiroTest = derive2 { name="mvShapiroTest"; version="1.0"; sha256="0zcv5l28gwipkmymk12l4wcj9v047pr8k8q5avljdrs2a37f74v1"; depends=[]; }; - mvabund = derive2 { name="mvabund"; version="4.1.3"; sha256="1z58h4dk3mc2hfnfvc7pghk471cbp7ah2s1z2ria5igw4s80962b"; depends=[MASS Rcpp RcppGSL statmod tweedie]; }; + mvabund = derive2 { name="mvabund"; version="4.1.6"; sha256="0aisvax9d7bk6aykrcdcn1ji618r520mcrkr1i3jnck1qs31z41f"; depends=[MASS Rcpp RcppGSL statmod tweedie]; }; mvbutils = derive2 { name="mvbutils"; version="2.8.232"; sha256="0awd0jy492ha321c20kmmgl20kqphdmrmswakc0rq6h8z9d55kdg"; depends=[]; }; mvc = derive2 { name="mvc"; version="1.3"; sha256="0kmh6vp7c2y9jf71f4a29b0fxcl0h7m4p8wig4dk3fi7alhjf7ym"; depends=[rattle]; }; mvcluster = derive2 { name="mvcluster"; version="1.0"; sha256="0yfl31scdgsiljvpv1yxc5bwwzr6kbhpjwqh2kql7xf0m0hc1pr4"; depends=[Rcpp RcppArmadillo]; }; @@ -11200,23 +11684,23 @@ in with self; { mvmeta = derive2 { name="mvmeta"; version="1.0.3"; sha256="08zki4bxd7l5hpa9dly9jw796kn4rfv6v6gmx21yvfppyryrvmvd"; depends=[mixmeta]; }; mvnTest = derive2 { name="mvnTest"; version="1.1-0"; sha256="0p37skzpljzz19x1hwh2hbxqins19zkbz7nlgfws5pgp9apazafq"; depends=[MASS mvtnorm]; }; mvna = derive2 { name="mvna"; version="2.0.1"; sha256="10i42hjm5bk62c20pmxhya283yzw1902ivkflmyqy79jri266dxf"; depends=[lattice]; }; - mvnfast = derive2 { name="mvnfast"; version="0.2.5"; sha256="122zjzr0v4943cax10lp6flwfv479mncvalaj09kb173s5rgmf91"; depends=[BH Rcpp RcppArmadillo]; }; + mvnfast = derive2 { name="mvnfast"; version="0.2.5.1"; sha256="193hi0vwc3p7dpac0y4ynm0c5sc3kcq20lwp6gbc4zpnqg9g94v3"; depends=[BH Rcpp RcppArmadillo]; }; mvngGrAd = derive2 { name="mvngGrAd"; version="0.1.5"; sha256="0ir4pakfb2jq84rbfqix6rph8q6cgadjdn49rrdl4439b8hlsg8k"; depends=[]; }; mvnormalTest = derive2 { name="mvnormalTest"; version="1.0.0"; sha256="1hbapcmj1rzrdzlbkay94f3r2388sk60zizh48vbbkc83qlm7xbr"; depends=[copula moments nortest]; }; mvnormtest = derive2 { name="mvnormtest"; version="0.1-9"; sha256="1iaxjwp7bgxhaa4xqvgqb61316mq2fb0452d0pabhmbxkvmvdnj6"; depends=[]; }; mvnpermute = derive2 { name="mvnpermute"; version="1.0.0"; sha256="0mbyj5i5vysrnl3pgypl0cjf3sylsvzfl1pcxkn0q16560vqh2ba"; depends=[]; }; - mvord = derive2 { name="mvord"; version="1.0.1"; sha256="0gca25zaxbkmqa444bh16p1qc1np80882b5w3jg0w0ss5p4zhxyc"; depends=[BB dfoptim MASS Matrix minqa mnormt numDeriv optimx pbivnorm ucminf]; }; + mvord = derive2 { name="mvord"; version="1.1.0"; sha256="1jgm2z6ad10xnihw30syw4rcxbgv849z898mj2n65bmncn147rqp"; depends=[BB dfoptim MASS Matrix minqa mnormt numDeriv optimx pbivnorm ucminf]; }; mvoutlier = derive2 { name="mvoutlier"; version="2.0.9"; sha256="1d562h3xicq962h27fi95qhrz9vkwxk0p8axhps1cy4b49w4bygi"; depends=[robCompositions robustbase sgeostat]; }; mvp = derive2 { name="mvp"; version="1.0-8"; sha256="0i2fd9s0dlpaa4vwkiq5is2d4vxc90hkdl0yk57gl651i8nxwnha"; depends=[magic magrittr mpoly partitions Rcpp]; }; mvprpb = derive2 { name="mvprpb"; version="1.0.4"; sha256="1kcjynz9s7vrvcgjb9sbqv7g50yiymbpkpg6ci34wznd33f7nrxm"; depends=[]; }; - mvrsquared = derive2 { name="mvrsquared"; version="0.1.0"; sha256="0k0jrwqmlmy7sdxpaziri0vmy1mvxsx6mmvhy1gr86x5rp4r3nsl"; depends=[Matrix Rcpp RcppArmadillo RcppThread]; }; + mvrsquared = derive2 { name="mvrsquared"; version="0.1.1"; sha256="1bvq5m33ff4igvg7b1wdp8g393qxswlhbpr3gm05fnbsxzlna10p"; depends=[Matrix Rcpp RcppArmadillo RcppThread]; }; mvrtn = derive2 { name="mvrtn"; version="1.0"; sha256="0k0k76wk5zq0cjydncsrb60rdhmb58mlf7zhclhaqmli1cy697k8"; depends=[]; }; mvsf = derive2 { name="mvsf"; version="1.0"; sha256="1krvsxvj38c5ndvnsd1m18fkqld748kn5j2jbgdr3ca9m3i5nlwf"; depends=[mvnormtest nortest]; }; mvst = derive2 { name="mvst"; version="1.1.0"; sha256="03q0kdychsmn4wcn50b6dqhxn4f2mjvrr5rac942xdv75w8qklc9"; depends=[MCMCpack mnormt mvtnorm]; }; mvtmeta = derive2 { name="mvtmeta"; version="1.1"; sha256="0s0s5922c5rs8cqk100nci3akqnhbvibm2n2gn8049v3qcyfajyb"; depends=[gtools]; }; mvtnorm = derive2 { name="mvtnorm"; version="1.1-1"; sha256="1pj51mi0g6ip7a2nhzc93yv9289kaayvspjvsbgbgarvx7axlrg9"; depends=[]; }; mvtsplot = derive2 { name="mvtsplot"; version="1.0-1"; sha256="0g5grrha77rsnkfasw5pxnpmkl7vgb728ms8apyg8xnbmgilg9vv"; depends=[RColorBrewer]; }; - mwa = derive2 { name="mwa"; version="0.4.2"; sha256="18qrj3v99y1rykz82xmkbhzfjrm54dr620p8hm1s1pxjmlysyyc8"; depends=[cem MASS rJava]; }; + mwa = derive2 { name="mwa"; version="0.4.3"; sha256="100d3c1070ir64iv848kws5fna141gcq5p66ip873cr632a042qs"; depends=[cem MASS rJava]; }; mwaved = derive2 { name="mwaved"; version="1.1.7"; sha256="0g0yddsgdfyvqaj59qi6k3sknpbppdmgvq0rgnil5q8ki5skvgis"; depends=[Rcpp shiny]; }; mwshiny = derive2 { name="mwshiny"; version="2.1.0"; sha256="0c1a0d9qnaszffhzanmk31mdxqi7j3rn6bk7a3dwg4bq1da3rlgl"; depends=[htmltools shiny]; }; mxkssd = derive2 { name="mxkssd"; version="1.1"; sha256="0m9763dqrk8qkrvp18bsv96jv0xhc2m8sbxdk6x3w6kdjcl663p2"; depends=[]; }; @@ -11226,9 +11710,9 @@ in with self; { mycor = derive2 { name="mycor"; version="0.1.1"; sha256="00hqmvga22bv43833s974s7ky7lbry3r2bb5kza7kvkn1p6773rg"; depends=[lattice]; }; myepisodes = derive2 { name="myepisodes"; version="1.1.1"; sha256="0xk9bwgpl630nhc8qa2pc0rwqbqk3haxnp78gfxq6sn6z7i44k1p"; depends=[XML]; }; mztwinreg = derive2 { name="mztwinreg"; version="1.0-1"; sha256="1rg6ikaqdrc7q44s3r3km8h45prnvcpzpxd7nxbmh209iz9j19ai"; depends=[mclogit rms]; }; - n1qn1 = derive2 { name="n1qn1"; version="6.0.1-9"; sha256="11kp80nlxcg6vl5afnm8c0fgr2pha25p65gh7cjwlkbxs58iqm50"; depends=[Rcpp RcppArmadillo]; }; + n1qn1 = derive2 { name="n1qn1"; version="6.0.1-10"; sha256="1diwhw636cnwjlw291vfp1z53xaxhmhafbqfzk2m0yqs0ih0pm09"; depends=[Rcpp RcppArmadillo]; }; nCDunnett = derive2 { name="nCDunnett"; version="1.1.0"; sha256="0q2db1pixqr0wbx4bd05c98i1p0vgaqsfa1iwjxr08c62a5xhkks"; depends=[]; }; - nCal = derive2 { name="nCal"; version="2020.5-21"; sha256="1gg0dkpsqw1nwi27iccn8d0c768gjlj0p6fr4260pvg5l03sz80n"; depends=[drc gdata gWidgets2 kyotil]; }; + nCal = derive2 { name="nCal"; version="2020.9-10"; sha256="1m3d2fskd1vlmwwrhdqs9040fjnjc7jsdsxs0y3m9db7kd1n84iw"; depends=[drc gdata gWidgets2 kyotil]; }; nCopula = derive2 { name="nCopula"; version="0.1.1"; sha256="03qbfvx0lg9prg52fk1jxar2bng2x6scac4g2c64kvp6vmf6x4mv"; depends=[copula Deriv stringi stringr]; }; nFCA = derive2 { name="nFCA"; version="0.3"; sha256="1jyyzagmppm3i7vh3ia4ic0zql1w04f66z81v0zpdihd4cbl5ra7"; depends=[]; }; nFactors = derive2 { name="nFactors"; version="2.4.1"; sha256="1diybai7pwaj9adn60b7nhvvpjjkwg3jimwp2ahgca9askmv93h2"; depends=[lattice MASS psych]; }; @@ -11239,29 +11723,29 @@ in with self; { naaccr = derive2 { name="naaccr"; version="1.0.0"; sha256="1hw74a2gjm3gxq0s0qlndhqw0vij6p31walz1ic741z7hqsffqq7"; depends=[data_table stringi]; }; nabor = derive2 { name="nabor"; version="0.5.0"; sha256="1nj39cdfwrmhgsi3cq8imxv3n6xzc1v6dzdb2cf2hybjk368v4s7"; depends=[BH Rcpp RcppEigen]; }; nadiv = derive2 { name="nadiv"; version="2.16.2.0"; sha256="0gvpl8jrczk9afc7qg6w8w0gn28nia5mh3vanlsp7j0kj3vzqqc5"; depends=[Matrix]; }; - naijR = derive2 { name="naijR"; version="0.1.3"; sha256="1zdifi0wf5v7gjfg7vp64i34fmlh7mg6bw71sli38cz3p52pmksr"; depends=[lifecycle magrittr mapdata maps RColorBrewer rgdal rlang]; }; + naijR = derive2 { name="naijR"; version="0.1.4"; sha256="0yb5g2qp7ascri7sq0pbfg4ii27w5js75s64y5515cv57x2fwfwp"; depends=[lifecycle magrittr mapdata maps RColorBrewer rgdal rlang]; }; naivebayes = derive2 { name="naivebayes"; version="0.9.7"; sha256="070m78d8hsbqfbapb6g8vvh91gyznqfdpqsaq6z3raps8zlybsag"; depends=[]; }; naivereg = derive2 { name="naivereg"; version="1.0.5"; sha256="1cxfl419pp7xh1xrad29gvpn6hm0rhk40vylj97ypndh6gmnynzz"; depends=[glmnet gmm grpreg ncvreg]; }; nakagami = derive2 { name="nakagami"; version="1.0.0"; sha256="1i9m1nlqfdk9k3bzf8qlfc11spzfqly49n1pk7phvykzjgd1c1s4"; depends=[assertthat]; }; namedCapture = derive2 { name="namedCapture"; version="2020.4.1"; sha256="0zdw3h3n4qjv9cpidb3g523ld6rrh49l2c1yhfqhk5wb7vddrs46"; depends=[]; }; namer = derive2 { name="namer"; version="0.1.5"; sha256="1687x6rc46bp2bmqkixzry5cc7lxjqwjk8ngrbg2fk7mzb4pwvnq"; depends=[dplyr fs glue magrittr purrr rstudioapi tibble]; }; namespace = derive2 { name="namespace"; version="0.9.1"; sha256="1bsx5q19l7m3q2qys87izvq06zgb22b7hqblx0spkvzgiiwlq236"; depends=[]; }; - nametagger = derive2 { name="nametagger"; version="0.1.0"; sha256="0n7nskl2nk3j9zh8l2xqq026rwnk278n6ldcij0vb1nxxzcgdzf7"; depends=[Rcpp udpipe]; }; + nametagger = derive2 { name="nametagger"; version="0.1.1"; sha256="17g8y7x83p1pkgj5hgildndchxsp70va25h93p7r1yjllm56zqv8"; depends=[Rcpp]; }; nandb = derive2 { name="nandb"; version="2.0.7"; sha256="0l71dj1v6skqq2ir2sgfrvrq2bijzgac9s220g2zacijsisn2j4v"; depends=[assertthat autothresholdr BBmisc checkmate detrendr dplyr filesstrings ggplot2 glue ijtiff magrittr purrr Rcpp reshape2 rlang stringr viridis withr]; }; - naniar = derive2 { name="naniar"; version="0.5.2"; sha256="02b4mmb69k2scbr7lq83ymv782x1kd5i1z3b2863c2c6zwgilngb"; depends=[dplyr forcats ggplot2 glue magrittr purrr rlang tibble tidyr UpSetR viridis visdat]; }; + naniar = derive2 { name="naniar"; version="0.6.0"; sha256="0m3y9rh3qx8k66h8by0jvg4927k5azppdhihr413136xa57wd4ww"; depends=[dplyr forcats ggplot2 glue magrittr purrr rlang tibble tidyr UpSetR viridis visdat]; }; nanny = derive2 { name="nanny"; version="0.1.8"; sha256="0pfh4vs81z1bcjgjnsdwz62qn66ag9fgqw87imsbs0naw7niyi67"; depends=[dplyr gtools knitr lifecycle lme4 magrittr purrr rlang Rtsne tibble tidyr tidyselect widyr]; }; nanop = derive2 { name="nanop"; version="2.0-6"; sha256="007gdc93pk0vpfmsw7zgfma2k1045n2cxwwsyy276smy0ys9fdhp"; depends=[distrEx rgl]; }; nanostringr = derive2 { name="nanostringr"; version="0.1.4"; sha256="1g1hm5kz2bl3qqs2cz4nhvmak7mbh5pry34lp6lwnbxrgi97i1iz"; depends=[assertthat ccaPP dplyr epiR magrittr purrr rlang]; }; - nanotime = derive2 { name="nanotime"; version="0.3.1"; sha256="1spdvr0vg9af5i2qka6947iyby6rqkm75shylv0h4dx1wgv5g5bb"; depends=[bit64 Rcpp RcppCCTZ RcppDate zoo]; }; + nanotime = derive2 { name="nanotime"; version="0.3.2"; sha256="079bybkizlq51g4hfw1jclwfcw71i1wi344ia6lhbdh1r8xkrxcy"; depends=[bit64 Rcpp RcppCCTZ RcppDate zoo]; }; naptime = derive2 { name="naptime"; version="1.3.0"; sha256="1cadfv5sdsmz61kf96hf2gbnghf24q40g5c3h9b8prvkxslap691"; depends=[lubridate]; }; nardl = derive2 { name="nardl"; version="0.1.5"; sha256="1xi1fkwgkfc1b8qsgi4lrjx419778qk0vxzl23azcziwa6fha5p8"; depends=[Formula gtools strucchange tseries]; }; narray = derive2 { name="narray"; version="0.4.1"; sha256="09n50shk2gy1m85kmvq8g3zh2nrikpllv8gph9x2id1p62rbqf1y"; depends=[progress stringr]; }; nasadata = derive2 { name="nasadata"; version="0.9.0"; sha256="0y88qdy8c1y0prsajxic5vdqfixv9knjsbhw3vbfac8wv3a69bjl"; depends=[dplyr jsonlite plyr png]; }; - nasapower = derive2 { name="nasapower"; version="1.1.3"; sha256="1grfbj68vxsy50a0zylgfddwgr3ilrk2v60755vra9ckpmnf31zi"; depends=[APSIM crul curl jsonlite lubridate readr tibble]; }; + nasapower = derive2 { name="nasapower"; version="3.0.1"; sha256="012z2q3fzb7834g3axnw9ivwyq073kll14gds64ks0nlj2z3gcgl"; depends=[crul curl jsonlite lubridate readr tibble]; }; nasaweather = derive2 { name="nasaweather"; version="0.1"; sha256="05pqrsf2vmkzc7l4jvvqbi8wf9f46854y73q2gilag62s85vm9xb"; depends=[]; }; - nat = derive2 { name="nat"; version="1.8.14"; sha256="02v1hvxsp3z7rday2mr5f52kkyszcl3ind3p8vllyl705s3ci2ll"; depends=[digest filehash igraph nabor nat_utils plyr rgl yaml]; }; + nat = derive2 { name="nat"; version="1.8.16"; sha256="0m60ysh02f7mg8rfjxn3vbyir4hnl3wpz56pnkjqq9clrnl145a9"; depends=[digest filehash igraph nabor nat_utils plyr rgl yaml]; }; nat_nblast = derive2 { name="nat.nblast"; version="1.6.5"; sha256="0fp01rrvz7n84sdmfhi0wzd9mvg7wi682l4qg5dj82cm98v80l3p"; depends=[dendroextras nabor nat plyr rgl spam]; }; - nat_templatebrains = derive2 { name="nat.templatebrains"; version="0.9"; sha256="0r0ydhxnax4x4gwp60bgarhgp59g4sis7msa3rq4kddv8qdi3gix"; depends=[digest igraph memoise nat rappdirs rgl]; }; + nat_templatebrains = derive2 { name="nat.templatebrains"; version="1.0"; sha256="0bjib2brsq389b1rlznhwd81y9awk9qz57s4z5ai45gnsc7cfcgw"; depends=[digest igraph memoise nat rappdirs rgl]; }; nat_utils = derive2 { name="nat.utils"; version="0.5.1"; sha256="12g87ar795xfbz7wljksb24x9hqvcirjr50y4mbpx1427r0l7clv"; depends=[]; }; nationwider = derive2 { name="nationwider"; version="1.1.1"; sha256="1crflv2wvrsyrhl612f7awvm0yfhl381q7pq190n3ydg093y32r6"; depends=[dplyr httr lubridate magrittr readxl rvest stringr tidyr xml2 zoo]; }; natmanager = derive2 { name="natmanager"; version="0.4.6"; sha256="0vd8aipjk0dd8924g4sm3b33pf4af71d0vkm7vnwasmcgb15ki0v"; depends=[curl gh remotes usethis withr]; }; @@ -11282,7 +11766,7 @@ in with self; { ncdump = derive2 { name="ncdump"; version="0.0.3"; sha256="09g98mzpky32z41jf23ahzhyv34l34y1gqq99j2hl4pqlvvhxs9i"; depends=[dplyr ncdf4]; }; ncf = derive2 { name="ncf"; version="1.2-9"; sha256="0wxn004jn4wba2zqnfrd513pw4mjxkmk4n1xj829nxadn1zbkcax"; depends=[]; }; ncg = derive2 { name="ncg"; version="0.1.1"; sha256="1jzkzp61cc5jxmdnl867lcrjjm7y2iw9imzprbd098p1j3w8fvj7"; depends=[]; }; - ncmeta = derive2 { name="ncmeta"; version="0.2.5"; sha256="09vw94q9lxwi4iq74xy3jll7h97rmr9ppf4dv1hwqc9w1ad6fk7d"; depends=[dplyr rlang RNetCDF tibble tidyr]; }; + ncmeta = derive2 { name="ncmeta"; version="0.3.0"; sha256="0rip0lb1sccwy94jcr84pimnz5a55gnqf0xwvxyyibmzlwkzsd2b"; depends=[dplyr rlang RNetCDF tibble tidyr]; }; ncodeR = derive2 { name="ncodeR"; version="0.2.0.1"; sha256="1pxiqxhq2rxs8rxxhw1hbds7z2qkf7ws26a8wsbw815yn6jm10n8"; depends=[cli R6 rhoR]; }; ncpen = derive2 { name="ncpen"; version="1.0.0"; sha256="0vl4cbrsifr5s1691gacmp0lk3aqyq0yfafafzv6g3zygi4igrsa"; depends=[Rcpp RcppArmadillo]; }; ncvreg = derive2 { name="ncvreg"; version="3.12.0"; sha256="1xy2jbb4q9wdahwffjl6lmmlhg2x7s7d0vbv4d50ddq92gd528mv"; depends=[]; }; @@ -11291,9 +11775,9 @@ in with self; { ndtv = derive2 { name="ndtv"; version="0.13.0"; sha256="1qfjvq5wch256gmg7pw9jwda33r4963a8p8jmp27cmpzdwycvnzy"; depends=[animation base64 jsonlite MASS network networkDynamic sna statnet_common]; }; nearfar = derive2 { name="nearfar"; version="1.2"; sha256="116rq797a5fascirz8xg465fywjf40j1k5czryvqzpik0if0w00r"; depends=[car GenSA MASS nbpMatching]; }; neariso = derive2 { name="neariso"; version="1.0.1"; sha256="1b2gnws75kkqsi8mg9n0zzdaawx57a6zz47cswabj5m6nb09ikh8"; depends=[]; }; - neat = derive2 { name="neat"; version="1.2.1"; sha256="0ifx2qbr8g6myz380rwayas26vg13wkblssvma4kbgfksw7cccgj"; depends=[igraph]; }; + neat = derive2 { name="neat"; version="1.2.2"; sha256="17nwdmx5l87cxljl1h8iksc2f8fp5a5xnf6xrnla7v19c1wjmw0p"; depends=[igraph]; }; neatRanges = derive2 { name="neatRanges"; version="0.1.3"; sha256="1zfp6f1q7m0bks0shvzr120nd5jxba28xhi7vrd55qfy7g72167g"; depends=[data_table Rcpp]; }; - neatStats = derive2 { name="neatStats"; version="1.4.2"; sha256="0x7013lfcxk1agxkxw8ap3wwk9ziwaick817q5460ig3j0pq4r3q"; depends=[BayesFactor bayestestR Exact ez ggplot2 logspline MBESS pROC]; }; + neatStats = derive2 { name="neatStats"; version="1.5.1"; sha256="1cyfm9mq691iyi0890gp1kszc98544fhjl35mn3varjbddm64a5p"; depends=[BayesFactor bayestestR car Exact ez ggplot2 ggpubr logspline MBESS plyr PoweR pROC]; }; neatmaps = derive2 { name="neatmaps"; version="2.1.0"; sha256="1kz1na3fzpd8vkxmpp5rz8ksyf8q2wk456csiii82winv9a2zxc9"; depends=[ConsensusClusterPlus dplyr ggplot2 heatmaply igraph]; }; needmining = derive2 { name="needmining"; version="0.1.1"; sha256="0qsj0ihjchrnl4s44rpsizbcz033z00dmzvic2y1msv0bnfawl6p"; depends=[randomForest rtweet SnowballC SparseM stringr tau tm]; }; needs = derive2 { name="needs"; version="0.0.3"; sha256="16dkjpijz3rz7kd5ggxsdg55iwd42nll1vk6g5ix4xdbqrx6cp9x"; depends=[]; }; @@ -11304,15 +11788,15 @@ in with self; { neo2R = derive2 { name="neo2R"; version="2.1.0"; sha256="1fhi74d4730pxrmv1p2gz8ylvnilxn4l837nha6ndyhy00xfgkk6"; depends=[base64enc jsonlite RCurl]; }; neo4jshell = derive2 { name="neo4jshell"; version="0.1.1"; sha256="03qnv5xf7dvlzq259brfwk7vfr05q7labakv9mj27x70yhxq1z7m"; depends=[fs magrittr R_utils ssh sys]; }; neo4r = derive2 { name="neo4r"; version="0.1.1"; sha256="0s4rjhn2mc8ca4p8p474a83dc277vrf7l968xwxkiac0d4fgbra7"; depends=[attempt data_table glue httr igraph jsonlite magrittr purrr R6 rlang rstudioapi shiny tibble tidyr tidyselect]; }; - neonUtilities = derive2 { name="neonUtilities"; version="1.3.6"; sha256="15vkgc1mr1qarcy0f11a962iz0v6bds497b0qdcyw2smzdm4i0in"; depends=[curl data_table downloader dplyr gdata httr jsonlite lubridate pbapply plyr readr stringr tidyr]; }; - neonstore = derive2 { name="neonstore"; version="0.2.0"; sha256="1ndf26f278li5gs7c7vk0020pfgffcnf9i00xhb4ic582kw666xx"; depends=[curl digest httr jsonlite openssl progress rappdirs tibble vroom zip]; }; + neonUtilities = derive2 { name="neonUtilities"; version="1.3.8"; sha256="0a52pjxf528s70nn0fzpyvp4aj1591mrp8gy4vafjhlbywrxxv4x"; depends=[curl data_table downloader dplyr httr jsonlite lubridate pbapply plyr R_utils readr stringr tidyr]; }; + neonstore = derive2 { name="neonstore"; version="0.3.3"; sha256="098xnkjfwk02vz2jgdbabjn6vw91rvha8vrc87lw91sqadhijva4"; depends=[curl DBI digest duckdb httr jsonlite openssl progress R_utils rappdirs tibble vroom zip]; }; neotoma = derive2 { name="neotoma"; version="1.7.4"; sha256="1fknzp7qg5l5lkfvqfld0x67zj3xmi8vivsg70m47mbpcs92hmcf"; depends=[analogue dplyr httr jsonlite leaflet plyr reshape2 xml2]; }; nephro = derive2 { name="nephro"; version="1.2"; sha256="1izmzx8lah322xzb42asfnrvr2c9yqd0zf7fmrhwd3p4rr1rqa7d"; depends=[]; }; neptune = derive2 { name="neptune"; version="0.1.0"; sha256="0nynxvkzcdsmznyviw18gqky1kw7dxgc13nrsbf6999lr3s3shkj"; depends=[reticulate]; }; nesRdata = derive2 { name="nesRdata"; version="0.3.1"; sha256="1lxvg11g8nizfn8sghirq2749fs9i4w1wiaz3v1djqbkzqcqfrcj"; depends=[dataone dplyr purrr rappdirs readr]; }; nestfs = derive2 { name="nestfs"; version="1.0"; sha256="0lzbjj287s5kmw9635gfyl3jdgfh5mxbwxqxmnwynbwccixk0akc"; depends=[dgof pROC]; }; netClust = derive2 { name="netClust"; version="1.0.1"; sha256="1h58ispdx8ddsnqrrmcxn2rbqb0hb89gpjg4p14mr7vhxw5c9zva"; depends=[Rcpp RcppArmadillo]; }; - netCoin = derive2 { name="netCoin"; version="1.1.25"; sha256="0l0sqzx369h3d7x4w4irl6zvmn0n1acayc4ih6vcpq6lyzvysyc7"; depends=[haven igraph Matrix]; }; + netCoin = derive2 { name="netCoin"; version="1.1.26"; sha256="1ripd7d8jb4wn59kgbwng3mzd3lla8013y5v59qk074mwl4pa75r"; depends=[haven igraph Matrix]; }; netSEM = derive2 { name="netSEM"; version="0.5.1"; sha256="0k4ngl4p1v2rp1sf2x65m7p0cd6ha98fyx21b73ki0531q0d9fil"; depends=[DiagrammeR DiagrammeRsvg gtools htmlwidgets knitr magrittr MASS png rsvg segmented svglite]; }; netassoc = derive2 { name="netassoc"; version="0.6.3"; sha256="1hyshnbpq60a3y13b4sh1c2rk78x09q01b7q6xrgv10w7bn9r2sg"; depends=[corpcor huge igraph infotheo vegan]; }; netchain = derive2 { name="netchain"; version="0.2.0"; sha256="1skpf1n6a17mjkcxqpl6vrskk04yvqa0v4n2zw9x5r1h46q9m6qk"; depends=[gtools igraph Matrix Rcpp stringr]; }; @@ -11322,14 +11806,15 @@ in with self; { netdiffuseR = derive2 { name="netdiffuseR"; version="1.22.0"; sha256="1cmnrqsgxh391pm2jz4yg20hpsbhjrfx8w1qnydk5lyj44kzf4fc"; depends=[boot igraph MASS MatchIt Matrix network networkDynamic Rcpp RcppArmadillo sna SparseM viridisLite]; }; netgen = derive2 { name="netgen"; version="1.3.2"; sha256="1yqi4rb6w9ipxgbl1j1s2s81cg7nzrn65irn5gs82hsq94d6vv2j"; depends=[BBmisc checkmate ggplot2 igraph lhs mvtnorm stringr]; }; netgsa = derive2 { name="netgsa"; version="3.1.0"; sha256="0mn4dnvckdskigdfbszjnfmb3m6yfbz4qc26qwh1wznwx5wmcbf0"; depends=[corpcor dplyr glassoFast glmnet graph graphite igraph magrittr Matrix msigdbr quadprog rlang]; }; - netgwas = derive2 { name="netgwas"; version="1.11"; sha256="13d889ji6x0v5pmqlr1gs9yskm3262fzb5i2l9lw6y6bc72q3l06"; depends=[glasso huge igraph MASS Matrix qtl RBGL tmvtnorm]; }; + netgwas = derive2 { name="netgwas"; version="1.13"; sha256="156axkl61z0s3zm8plkcc3s46x0881mqnk94azl3p0nphblhmhcv"; depends=[glasso huge igraph MASS Matrix qtl RBGL tmvtnorm]; }; netjack = derive2 { name="netjack"; version="1.2.0"; sha256="060ygb0kxi0gx1ya38cmf5hhyy6jkwq5519azdqhq5i324cwzzm7"; depends=[brainGraph ggplot2 igraph Rdpack]; }; netmeta = derive2 { name="netmeta"; version="1.2-1"; sha256="11yigmk11a9gi3qg3gcszmnp11729qap8yv5pvsss5qfhahfs4qa"; depends=[ggplot2 magic MASS meta]; }; - netrankr = derive2 { name="netrankr"; version="0.2.1"; sha256="0csgi09ijp7ygwk7x057l9xjrzyhr7sav8hamh0p6i72l6719ssl"; depends=[igraph Rcpp RcppArmadillo]; }; + netmhc2pan = derive2 { name="netmhc2pan"; version="1.3.1"; sha256="0q98rar7iglwxmf1274wrjcr7kp544ayrjhd286x68jmf51cqyrg"; depends=[assertive devtools dplyr rappdirs readr seqinr stringr testit tibble]; }; + netrankr = derive2 { name="netrankr"; version="0.3.0"; sha256="0siyvd4psr2mh1bd1gr33q569f814bfd8sbnkhvq50h6lj4n51p9"; depends=[igraph Rcpp RcppArmadillo]; }; netregR = derive2 { name="netregR"; version="1.0.1"; sha256="0n5absjra0imddz1spy1piij5rdz76wi4g568yby3rbhkm1896rs"; depends=[Matrix]; }; - nets = derive2 { name="nets"; version="0.9"; sha256="1wcr0fj50w3rqxw0k9cb81c2psdkb0dwwwzrjvxv50hksbhyi8kn"; depends=[igraph]; }; + nets = derive2 { name="nets"; version="0.9.1"; sha256="00adkyd2hm8aynpnk4avzss8fxkbaai74n5cf03vpwyc306jq0d7"; depends=[igraph]; }; netstat = derive2 { name="netstat"; version="0.1.1"; sha256="1h87cl3ry5hwwqxza3n24zpvwn89hhclsa2400sw4ijdy2ivpn2j"; depends=[]; }; - network = derive2 { name="network"; version="1.16.0"; sha256="0dnf1wl3za2lhx2lwd8smhlijl1cfhckgr8zz9piiirrfi2m2kx2"; depends=[magrittr tibble]; }; + network = derive2 { name="network"; version="1.16.1"; sha256="1cgy7vlbinyndl0zkzvnpcmi240wry6iwfb42sz1mj5c9iwkar7b"; depends=[magrittr tibble]; }; networkABC = derive2 { name="networkABC"; version="0.7-0"; sha256="0vn5hgry4i1dzgp34vdfa6wifsz54jh05avs9xrbzg6zmf1y2cif"; depends=[network RColorBrewer sna]; }; networkD3 = derive2 { name="networkD3"; version="0.4"; sha256="02wxki67drppgfka1is1ykg1f2rxf0x0657c0crj7ipfy62jbf1k"; depends=[htmlwidgets igraph magrittr]; }; networkDynamic = derive2 { name="networkDynamic"; version="0.10.1"; sha256="183cnxbcly887vmxcvyvwcn19i8s7yyb57k1q5vhimx8vvcxivi2"; depends=[network statnet_common]; }; @@ -11340,14 +11825,14 @@ in with self; { networkreporting = derive2 { name="networkreporting"; version="0.1.1"; sha256="1ssbz8lw4mlwcblwfbyffvayvb2gmihq4qlz5q9222fn4aa3raxd"; depends=[dplyr functional ggplot2 lazyeval plyr reshape2 stringr surveybootstrap]; }; networksis = derive2 { name="networksis"; version="2.1-3"; sha256="1kvil3qs7xd94ak9jgvj1nss55gjg0y7d35zmass9h1hjkcrq7bg"; depends=[network]; }; networktools = derive2 { name="networktools"; version="1.2.3"; sha256="0jj5cbp036vjjfj10i1lxzj4yi06xbdy1j20j6a035s8l2wc57pl"; depends=[cocor eigenmodel ggplot2 gridExtra igraph IsingFit NetworkComparisonTest nnet psych qgraph R_utils RColorBrewer reshape2 smacof wordcloud]; }; - networktree = derive2 { name="networktree"; version="0.2.2"; sha256="0dlci3sqdh6f3w82h0p6c2pn15d170m9ls8zllgscd1sbyry4k4x"; depends=[Formula gridBase Matrix mvtnorm partykit qgraph reshape2]; }; + networktree = derive2 { name="networktree"; version="1.0.0"; sha256="0yabs2fzbcvmizr659zpr3mzf69jai3kfz67qcr2lgrkavprzw86"; depends=[Formula gridBase Matrix mvtnorm partykit qgraph reshape2]; }; neuRosim = derive2 { name="neuRosim"; version="0.2-12"; sha256="1hsnw9xipdr74fydq9013252ycbi9igh28s0j4dbdx52pv3iixzl"; depends=[deSolve]; }; neural = derive2 { name="neural"; version="1.4.2.2"; sha256="05hrqgppgwp38rdzw86naglxj0bz3wqv04akq7f0jxbbjc6kwy4j"; depends=[]; }; neuralnet = derive2 { name="neuralnet"; version="1.44.2"; sha256="09l808vgjh059a3f94vgsprfyp5c1hrbjn6i1cn34cxnbljwsrjz"; depends=[Deriv MASS]; }; neurobase = derive2 { name="neurobase"; version="1.29.0"; sha256="16y1d4qg4d57l43080vlpn5jnh462qnv9z0w6dv0zwlk74psm9ha"; depends=[abind matrixStats oro_nifti R_utils RNifti]; }; neuroblastoma = derive2 { name="neuroblastoma"; version="1.0"; sha256="0hs87fvwaq53xxbh2dw3hjsmf1zkyqli9qyacxf72fnkyhhl8b45"; depends=[]; }; neurocInstall = derive2 { name="neurocInstall"; version="0.12.0"; sha256="1fkb6ji9gigqdjl50hbgdgfidqpjgqlh1aidf6vn4qnfr92bsvqf"; depends=[devtools]; }; - neurohcp = derive2 { name="neurohcp"; version="0.8.1"; sha256="01q9dkrpmwfj4r7is97f3lsmn84vm5qpvf44zfm1a6hhpxa0n7z0"; depends=[base64enc digest httr xml2]; }; + neurohcp = derive2 { name="neurohcp"; version="0.9.0"; sha256="02z0lhmw2mr2fk8d8wp7nfcrfl8izds68zskm5j0xfabfb4dwkbx"; depends=[aws_s3 base64enc digest httr xml2]; }; neuroim = derive2 { name="neuroim"; version="0.0.6"; sha256="00cjr6pkip6zi2d0q3qbn3lb3k0z82v6c19qslvgpa9n0g63dr5p"; depends=[abind assertthat hash iterators Matrix Rcpp readr rgl stringr yaImpute]; }; neuromplex = derive2 { name="neuromplex"; version="0.0-8"; sha256="1bc1kasyibpbfjjy19pmvb9lj61yqx536rgaadkislsxrnisxggs"; depends=[BayesLogit dplyr ggplot2 gridExtra magrittr tidyr]; }; neutralitytestr = derive2 { name="neutralitytestr"; version="0.0.2"; sha256="1p1zjc3fiphkxflsyzrxx8af98aa0gp9pvby63mmrsjb0z7ps948"; depends=[cowplot dplyr ggplot2 ggpmisc pracma scales]; }; @@ -11356,27 +11841,34 @@ in with self; { newTestSurvRec = derive2 { name="newTestSurvRec"; version="1.0.2"; sha256="06p782md33wqh5wa1735yg5i01d42p74kl7h5qhqs9cd732ls6pz"; depends=[]; }; newsanchor = derive2 { name="newsanchor"; version="0.1.1"; sha256="1s8qhq9jk5gnsimnvy7kdayya0ks0ly309l7zxm5rafj5x7k5vwn"; depends=[askpass devtools httr jsonlite lubridate tidyr xml2]; }; newscatcheR = derive2 { name="newscatcheR"; version="0.1.0"; sha256="0rm91dfzfjhi51gk65gvq2z7aywg6y8ay3hrjnp6frlmyvh661sp"; depends=[tidyRSS]; }; - newsmap = derive2 { name="newsmap"; version="0.7.2"; sha256="109zljiz69l4kjld9xlhs05bkbbpazx3a1whl6nmx75zaljhhbs0"; depends=[Matrix quanteda stringi]; }; + newsmap = derive2 { name="newsmap"; version="0.7.3"; sha256="0189vw51sdz981fy3k7rns61imgil3vcjyrw3bhr5lyqp00zaicf"; depends=[Matrix quanteda quanteda_textstats stringi]; }; + nflfastR = derive2 { name="nflfastR"; version="3.2.0"; sha256="0hpmji2di826q1hkfjjk9ihcbdss3qhq3mmirjv16v6wa5w0clqm"; depends=[cli crayon dplyr glue gsisdecoder httr janitor jsonlite lubridate magrittr mgcv progressr purrr rlang stringr tibble tidyr tidyselect usethis xgboost]; }; ngram = derive2 { name="ngram"; version="3.0.4"; sha256="1q4y64dy7vcjikbfx20fpdiy1kwvxay4y90xr5j8d8zkqnva0way"; depends=[]; }; + ngramr = derive2 { name="ngramr"; version="1.7.2"; sha256="10jm8gjr2fjyr1xvgn6g5w2l7p7xn33jgvy53hhkdlhksfsmlfis"; depends=[cli dplyr ggplot2 httr lifecycle RCurl rjson rlang scales stringr textutils tibble tidyr xml2]; }; ngramrr = derive2 { name="ngramrr"; version="0.2.0"; sha256="1p8s4p3h27g647rxx9qjfad5dzbngjbmvhw4gz0jbsmfqrsf72by"; depends=[tau tm]; }; ngspatial = derive2 { name="ngspatial"; version="1.2-2"; sha256="09hdvmbna4m62zv18k5kj9718wzw7p43wnal2j6aa0m5sd2rx9rz"; depends=[batchmeans Rcpp RcppArmadillo]; }; nhanesA = derive2 { name="nhanesA"; version="0.6.5"; sha256="0bb53s379qrm8xqp4bsi5vgk6v6hvwadzjv09pvdp1n45z7rqj86"; depends=[Hmisc magrittr plyr rvest stringr xml2]; }; nhdR = derive2 { name="nhdR"; version="0.5.3"; sha256="0zd10zy9kn97nm2i0y8h5wjdmzxblv5azybycwf08aqr0x6axh3n"; depends=[curl dplyr foreign gdalUtils ggplot2 httr maps memoise purrr rappdirs rgdal rlang rvest sf stringr units xml2]; }; - nhdplusTools = derive2 { name="nhdplusTools"; version="0.3.14"; sha256="127bk97rlnh46gdns0s7rpk3s9nbqkb12znf8ddrfbrbbzz2cjb7"; depends=[dplyr httr igraph jsonlite magrittr prettymapr R_utils RANN rosm sf tidyr units xml2]; }; + nhdplusTools = derive2 { name="nhdplusTools"; version="0.3.16"; sha256="12vyqk341gy6bprln62lf3w2y1rbl24gf132005p8h2j3lmnjg3i"; depends=[dplyr httr igraph jsonlite magrittr prettymapr R_utils RANN rosm sf tidyr units xml2]; }; nhds = derive2 { name="nhds"; version="1.0.3"; sha256="1cgw3hmsik3vlnb1lgalhvhrqzwdv08dp80vwpw1nwbf8whcbxjn"; depends=[]; }; nhlapi = derive2 { name="nhlapi"; version="0.1.2"; sha256="13zzy0z2vw8f3q2jy67690w9p71y3rf34xccy5ir49iaflmy4i89"; depends=[jsonlite]; }; nhlscrape = derive2 { name="nhlscrape"; version="0.1.3"; sha256="0x6y747j6lha3jw4v2wavgd12xw5nx4m8biv9rmq9z0qy53vncjc"; depends=[DBI httr jsonlite RSQLite rvest xml2]; }; nhm = derive2 { name="nhm"; version="0.1.0"; sha256="1yf9hnbmfb7xj8mbhnq40wvd0pd88x9qspy1jr3x0n8nb75i3jlp"; depends=[deSolve maxLik mvtnorm]; }; - nhs_predict = derive2 { name="nhs.predict"; version="1.2.0"; sha256="0p5ab9jkwpd6m28jmgx68lpny4mlid71kjxh2sasp2qghq6sxaj4"; depends=[]; }; + nhs_predict = derive2 { name="nhs.predict"; version="1.4.0"; sha256="0lgyi1v940pjqfpwligw5ml6vagiz8wwsxbr9kfd1j70b5i0kjwd"; depends=[]; }; + nhsnumber = derive2 { name="nhsnumber"; version="0.1.1"; sha256="1dprhla2wwpgapsrmzjfr131gjpxl0nqri4qibaij0ndpqyfzxmg"; depends=[]; }; nhstplot = derive2 { name="nhstplot"; version="1.1.0"; sha256="1yk7q731a4y9mhngdsb8xdw2id6m1q78329ja19hdpi6nnd7nhgn"; depends=[ggplot2]; }; nice = derive2 { name="nice"; version="0.4-1"; sha256="1p8vmimiq9sbjvbx6c2wqwwkpnzw4kkdvjry6qyadmm3frwhj5qb"; depends=[]; }; nicheROVER = derive2 { name="nicheROVER"; version="1.0"; sha256="0sa7wfpzkin78vz48vwa5iac82v5l1s3zczdxz8sc2kyg22fj0aw"; depends=[mvtnorm]; }; nichevol = derive2 { name="nichevol"; version="0.1.19"; sha256="0qj5cb0fyw0x1bczl6l0kl6jqir4yg8sb9fsfkd3h64d0ls2arl5"; depends=[ape castor concaveman geiger raster rgdal rgeos sf sp stringr]; }; + nightmares = derive2 { name="nightmares"; version="0.0.2"; sha256="1dmqrb17ncwazy1nb0zzfy7fq51ah7rz0xmhmmx6d30paaix2vc7"; depends=[raster rgdal sp]; }; nilde = derive2 { name="nilde"; version="1.1-3"; sha256="0h88if7dh16inyy5zh0yjqmc0c57k99la038p5vlwkj62vvjscmm"; depends=[]; }; nima = derive2 { name="nima"; version="0.6.2"; sha256="0n8r8h1m0v0ssbpv6p32jby49f45qbicwr0awm7x054p48qk49cy"; depends=[assertthat dplyr ggplot2 ggthemes gridExtra gtools scales]; }; - nimble = derive2 { name="nimble"; version="0.9.1"; sha256="0msp6f633iy5s4d10l51670lab23ji7irxlbwrr03jwk24bqlpmd"; depends=[coda igraph R6]; }; - nimbleEcology = derive2 { name="nimbleEcology"; version="0.3.0"; sha256="10jkvwbfqg605svfay7f3vcp0k3rp450kgsfggwd3j21y415g3rl"; depends=[nimble]; }; + nimble = derive2 { name="nimble"; version="0.10.1"; sha256="00p7f0xv079rld2wwvdndwp4p6qw73cyyh06b71k7wj2lkyliqhi"; depends=[coda igraph R6]; }; + nimbleEcology = derive2 { name="nimbleEcology"; version="0.3.1"; sha256="1bny7srs1cixvqpmqw3wdcc41d88y3yiiy6mmxa2hsmjzcryw3bs"; depends=[nimble]; }; + nimbleSCR = derive2 { name="nimbleSCR"; version="0.1.0"; sha256="0bnbg774ncmdyclgskywwrbnyj99gk57p0v1cms1b2bgv8ww03wj"; depends=[nimble]; }; + nimbleSMC = derive2 { name="nimbleSMC"; version="0.10.0"; sha256="15abjhgq8mi8c079hfzwjyl5glchx606hciq2lsirkrbyvc7b23n"; depends=[nimble]; }; nipals = derive2 { name="nipals"; version="0.7"; sha256="14rq54qy4gc4l9f5h48vrsrh7sb0wzzxbvjn0zax82pz2fw6nybx"; depends=[]; }; + nipnTK = derive2 { name="nipnTK"; version="0.1.0"; sha256="0imy2x1h9d842ssw7hmmh21c4mj7s6y05mmjin1270skbnrk2zmr"; depends=[bbw withr]; }; nitrcbot = derive2 { name="nitrcbot"; version="1.2"; sha256="0lainbw9j5aj9s824afpxdjl3q2f728jfpdfji7kpi9hdg8jixhx"; depends=[dplyr httr jsonlite RCurl]; }; nivm = derive2 { name="nivm"; version="0.3"; sha256="111jkgirgsl1j36xgwi81wzwxial3vdw8mqzi1faldxxd9a2cixm"; depends=[bpcp ssanv]; }; nixmass = derive2 { name="nixmass"; version="1.0-1"; sha256="0yiqmgps9zi46059l0vrqmxp27mv3nn5agand51v3b3x1xz2sq1p"; depends=[lubridate zoo]; }; @@ -11387,20 +11879,20 @@ in with self; { nleqslv = derive2 { name="nleqslv"; version="3.3.2"; sha256="1v9znvncyigw9r25wx2ma0b7ib179b488dl0qsrhp5zrcz7mcjgm"; depends=[]; }; nlgeocoder = derive2 { name="nlgeocoder"; version="0.1.3"; sha256="13d30kfgfsny5gnn3yjfnclky6yixaa8sg0m689rszqxrvbrj79x"; depends=[jsonlite]; }; nlirms = derive2 { name="nlirms"; version="3.4.4"; sha256="1njyfip377a0f6hf9y32s077b4jv4h8ydbjgnl68yfypxbfn2xyx"; depends=[gridExtra gtable]; }; - nlist = derive2 { name="nlist"; version="0.2.0"; sha256="1ahs0gwxxg9lqxwhy19jmqmhsvpk116mp779sg4sqirsqkf0x1zl"; depends=[abind chk coda extras generics lifecycle purrr term tibble universals]; }; - nlme = derive2 { name="nlme"; version="3.1-148"; sha256="1cmf43r82kar1hpj9dhqfi3rbjka0z5s6cbdy7fklwh99xj3phkp"; depends=[lattice]; }; + nlist = derive2 { name="nlist"; version="0.3.0"; sha256="0kfd6nw4lyhd6qsq4pwk1sysh1p00ikzygrz5ywwgnwdqjwcj3dw"; depends=[abind chk coda extras generics lifecycle purrr term tibble universals]; }; + nlme = derive2 { name="nlme"; version="3.1-151"; sha256="1jl6x0glpyszy6bkbcggm3f10jl4kldhs5q561k85xcbssx2dim2"; depends=[lattice]; }; nlmeODE = derive2 { name="nlmeODE"; version="1.1"; sha256="1zp1p98mzbfxidl87yrj2i9m21zlfp622dfnmyg8f2pyijhhn0y2"; depends=[deSolve lattice nlme]; }; nlmeU = derive2 { name="nlmeU"; version="0.70-3"; sha256="05kxymgybziiijpb17bhcd9aq4awmp5km67l2py9ypakivi0hc6l"; depends=[nlme]; }; - nlmixr = derive2 { name="nlmixr"; version="1.1.1-9"; sha256="1ykhaww5fyx8vzbw2qpsfazanjw8icb2yf0259gx548lp71jqd7c"; depends=[BH brew cli dparser fastGHQuad flextable generics ggplot2 lbfgsb3c magrittr Matrix memoise n1qn1 nlme Rcpp RcppArmadillo RcppEigen RxODE StanHeaders stringr tidyr yaml]; }; nlmm = derive2 { name="nlmm"; version="1.0.1"; sha256="0q5vz4xqdb510i26zbcq4djcribn7h477akh8f56nzjgq231vhcq"; depends=[BH HI lqmm MASS Matrix mvtnorm nlme numDeriv Qtools Rcpp RcppArmadillo statmod]; }; nlmrt = derive2 { name="nlmrt"; version="2016.3.2"; sha256="1g0qq0a933ay65gkp04qgn2wqk6vw79pj2a228c2ski4rcmkjxyn"; depends=[]; }; + nlnet = derive2 { name="nlnet"; version="1.4"; sha256="13lv4b6chsjrhimny3wc1y9ljgbxmm1byj4j04n4vj8icn87gyfd"; depends=[coin e1071 earth fdrtool igraph randomForest ROCR TSP]; }; nloptr = derive2 { name="nloptr"; version="1.2.2.2"; sha256="0whkilb85k4wixvr3k7rygfw1rcs1fs9h8c18kz4p3y1k9hsj3p8"; depends=[]; }; nlpred = derive2 { name="nlpred"; version="1.0.1"; sha256="05jna8hzd5v36a0dwag6zr8ms1pkryas3qarwb946bkxlslffp27"; depends=[assertthat bde cvAUC data_table np Rdpack ROCR SuperLearner]; }; - nlraa = derive2 { name="nlraa"; version="0.73"; sha256="0dbjs0wd0rvnh8nzzy5b4kl83x5b0b1n5maxn0wx0i60xcykxhy0"; depends=[boot knitr MASS Matrix mgcv nlme]; }; + nlraa = derive2 { name="nlraa"; version="0.76"; sha256="0pyyi7w5xm17rq4zzs9pj9bvn0rwvxlfx3wvqcs7nmmmiasimbcz"; depends=[boot knitr MASS Matrix mgcv nlme]; }; nlreg = derive2 { name="nlreg"; version="1.2-2.2"; sha256="0gkcxg5m287axhvkl00xy26vidawhhb1ii1s13rh49v0yccwvvqh"; depends=[statmod survival]; }; nlrr = derive2 { name="nlrr"; version="0.1"; sha256="09wm8s5sadkhkq9pb3fjk66cb2xn8py46w1d7yp7fjhczh31bjsq"; depends=[Hmisc rms]; }; - nlrx = derive2 { name="nlrx"; version="0.4.1"; sha256="1p29x6ayf3daahn8addh6xfrwl45rsllf4vx1k8l7hqwgxfa73rl"; depends=[crayon dplyr EasyABC furrr genalg GenSA igraph lhs magrittr purrr raster readr rstudioapi sensitivity sf stringr tibble tidyr XML]; }; - nls_multstart = derive2 { name="nls.multstart"; version="1.1.0"; sha256="1xm2jq1k1s3f403mddfrgx1h5120a49gwkqwfphbfa09qjwvlpjw"; depends=[dplyr minpack_lm purrr tibble tidyr]; }; + nlrx = derive2 { name="nlrx"; version="0.4.2"; sha256="1knaf7ba8r8va0i8w1r3qqrzvc1zb42sv7j5hbk2jraydbxpbmd6"; depends=[crayon dplyr EasyABC furrr genalg GenSA igraph lhs magrittr progressr purrr raster readr rstudioapi sensitivity sf stringr tibble tidyr XML]; }; + nls_multstart = derive2 { name="nls.multstart"; version="1.2.0"; sha256="1aichzwg54jhw1y3csv2bx40cszbgzfa60hr17jb5133nxb99gwh"; depends=[dplyr minpack_lm purrr tibble tidyr]; }; nls2 = derive2 { name="nls2"; version="0.2"; sha256="0k46i865p6jk0jchy03jiq131pc20h9crn3hygzy305rdnqvaccq"; depends=[proto]; }; nlsMicrobio = derive2 { name="nlsMicrobio"; version="0.0-1"; sha256="0676n78265z00dacmq593c9l2239ii574djm9s7i7w8jk1kdhzx2"; depends=[nlstools]; }; nlsem = derive2 { name="nlsem"; version="0.8"; sha256="0q3wk7x67mh2447ah807djyklia2x2d45krsskffynazm83msnj9"; depends=[gaussquad lavaan mvtnorm nlme orthopolynom]; }; @@ -11409,14 +11901,16 @@ in with self; { nlsmsn = derive2 { name="nlsmsn"; version="0.0-5"; sha256="1awslzwvv4d3kqw01p7qcqkq5shby29gprzbzxfwnvb5v86dn6ka"; depends=[]; }; nlsr = derive2 { name="nlsr"; version="2019.9.7"; sha256="1zhfnv09khd2k236jzka9znc0nlps452gwl7db0grb0ylfyxbqg4"; depends=[digest]; }; nlsrk = derive2 { name="nlsrk"; version="1.1"; sha256="0yqcsz5pdhqsrd86g0yx8bdac13fbmvg89phj3v4qvla2jfznjba"; depends=[]; }; + nlstac = derive2 { name="nlstac"; version="0.1.0"; sha256="0ag9zzzcadgwa43j16ff30r7g8jfihkwi76shv43igp52a11jr72"; depends=[Deriv doParallel foreach stringr]; }; + nlstimedist = derive2 { name="nlstimedist"; version="2.0.0"; sha256="0mlg8b6qg3yas828wsjbnwj2dksvsq6pdkyzh31r9mjkj9a4vvrf"; depends=[ggplot2 minpack_lm nlstools poorman]; }; nlstools = derive2 { name="nlstools"; version="1.0-2"; sha256="0mjn1j9fqqgr3qgdr0ki4lfbd0yrkanvya4y2483q3wklqa6qvjc"; depends=[]; }; nlt = derive2 { name="nlt"; version="2.2-1"; sha256="10wf00qzf28dxjfvv12wsqxlfn6xz15wk8njrzgsgm9px1g6s21f"; depends=[adlift EbayesThresh]; }; nltm = derive2 { name="nltm"; version="1.4.2"; sha256="02f3rn5l1hfvjpymy7vljmh6iq9w1w96016kx75qw563zwhmp5kx"; depends=[survival]; }; nlts = derive2 { name="nlts"; version="1.0-2"; sha256="0s49qjwavl9ns2746nn4zy4h4dh0njfcvznm3qd61qhs7np9w1db"; depends=[acepack locfit]; }; nmaINLA = derive2 { name="nmaINLA"; version="0.2.0"; sha256="0z3iln81dj0sg64hi7dxypcslff5yl6nlx0hkra1kc24rhxfzhh2"; depends=[]; }; nmadb = derive2 { name="nmadb"; version="1.2.0"; sha256="17r5vc57ilhy6cfcqpfyp9nzzjaa5gc8qkgfn3y8sppqh1g1mi40"; depends=[devtools jsonlite RCurl readxl]; }; + nmaplateplot = derive2 { name="nmaplateplot"; version="1.0.0"; sha256="00cs2c5qryd04y5qc0fb3pmv6fz017jvp3cbxacjy1rl93iyfpwh"; depends=[ggplot2]; }; nmathresh = derive2 { name="nmathresh"; version="0.1.6"; sha256="1jrf7k7an5y867k40aj28ib7vrjyqky2cslwzmfx28snp8ns1vd3"; depends=[ggplot2 gridExtra gtable Matrix nnls]; }; - nmfgpu4R = derive2 { name="nmfgpu4R"; version="0.2.5.2"; sha256="05066rgbbp6kj2d67nzf3d1pf32gypz9ammz4ba88yxblydb3cwk"; depends=[Matrix Rcpp SparseM stringr]; }; nmixgof = derive2 { name="nmixgof"; version="0.1.0"; sha256="0cbwrsxrcf8pn4ycn6r0z8jdidw5l6kdvwyrks69fq4pjzx988d6"; depends=[Rcpp unmarked]; }; nmslibR = derive2 { name="nmslibR"; version="1.0.4"; sha256="1fw565n4128nswl2qx248ab60is98iqijq5blwskxc9hjddf95a4"; depends=[KernelKnn Matrix R6 Rcpp RcppArmadillo reticulate]; }; nmw = derive2 { name="nmw"; version="0.1.4"; sha256="1vj7b2p40x0h3xp45qzar86i9439mj8y3r5hnlbwa025jqdf2g0q"; depends=[numDeriv]; }; @@ -11426,7 +11920,7 @@ in with self; { nnet = derive2 { name="nnet"; version="7.3-14"; sha256="1bzl62p5awva5kxcncs6lrdrkqp9ljd993zia731ckfpcjbrw6sx"; depends=[]; }; nnetpredint = derive2 { name="nnetpredint"; version="1.2"; sha256="1c6s9wm6vhylwv4xhp2hkllw18zj8hdr17ls9vlxm9qs3wx1v48w"; depends=[RSNNS]; }; nnfor = derive2 { name="nnfor"; version="0.9.6"; sha256="0bciy6k79g7abvj3pmmdc4wzg5mp11zgmdbx17x4by993p2clhw9"; depends=[forecast glmnet MASS neuralnet plotrix tsutils uroot]; }; - nngeo = derive2 { name="nngeo"; version="0.3.9"; sha256="1dq3gwz0bhvxvfzcnnw4jcjs8zvg9jf5f7k89cz2vd9waw6s6w1d"; depends=[lwgeom RANN s2 sf units]; }; + nngeo = derive2 { name="nngeo"; version="0.4.0"; sha256="08yrgdpxf47ag1c8jmvgg5gl8gz0glplrdn7h1bipwywbsqjl4yi"; depends=[lwgeom nabor s2 sf units]; }; nnlasso = derive2 { name="nnlasso"; version="0.3"; sha256="1n7karlmgq61z9ywfx9xb5wvmxx40ydpnzzazj1xr70qlv5m0qk4"; depends=[]; }; nnlib2Rcpp = derive2 { name="nnlib2Rcpp"; version="0.1.4"; sha256="0cg2sh0pvkfcmsp76c2biz84lqh4zrspshrvhlsxgziavhcmr4wc"; depends=[Rcpp]; }; nnls = derive2 { name="nnls"; version="1.4"; sha256="07vcrrxvswrvfiha6f3ikn640yg0m2b4yd9lkmim1g0jmsmpfp8f"; depends=[]; }; @@ -11434,18 +11928,19 @@ in with self; { nntrf = derive2 { name="nntrf"; version="0.1.3"; sha256="1b9610wy7s1gnvi9x34nm50ijkgfa98xfrdymww019gq2nib7q2g"; depends=[FNN NeuralNetTools nnet pracma]; }; noaaoceans = derive2 { name="noaaoceans"; version="0.2.0"; sha256="1hvjkma14kl8f69ichk27ddxlg9cqnzif8x43ckxyny6h341bbkf"; depends=[httr jsonlite rvest xml2]; }; noaastormevents = derive2 { name="noaastormevents"; version="0.1.1"; sha256="1ra852r5hw1ng3f4jk866jx0z2dszwvbidmfrdjchv9bfrjwmlmx"; depends=[choroplethr choroplethrMaps data_table dplyr forcats ggplot2 htmltab hurricaneexposure lubridate maps plyr RColorBrewer rlang stringr tidyr viridis XML]; }; - noctua = derive2 { name="noctua"; version="1.8.0"; sha256="0md9yhqgikaqhack9b72hds68a0x647y7phkn4mgirzf2cihakly"; depends=[data_table DBI paws]; }; + noctua = derive2 { name="noctua"; version="1.9.1"; sha256="0in6abza87z68ndlcci7gywfq1z4v5izd8vx0gbm5mgp8a7h828k"; depends=[data_table DBI paws uuid]; }; nodbi = derive2 { name="nodbi"; version="0.4.0"; sha256="1jlqzj9lv9wnsb8hwy8y91369i6ykp8av35abakfpxg0302svay9"; depends=[data_table jsonlite]; }; nodeHarvest = derive2 { name="nodeHarvest"; version="0.7-3"; sha256="0nh3g50rk9qzrarpf29kijwkz9v60682i0ag77j2ipyvhhbpwpkc"; depends=[quadprog randomForest]; }; nodiv = derive2 { name="nodiv"; version="1.4.0"; sha256="1k7pr9d1mgxw3szxcmnkkz498x7629wf2z65qlclywka3xgzpkxc"; depends=[ape picante raster sp vegan]; }; nofrills = derive2 { name="nofrills"; version="0.3.0"; sha256="18hryq6clywlr2f45az6ryslkkarly45nacln4bwk6ip0yfl5s98"; depends=[rlang]; }; noia = derive2 { name="noia"; version="0.97.1"; sha256="0yldfmnb4ads4s9v9cj1js8zf1w1hxasqq6qjyzwknmvmp7kh62h"; depends=[]; }; noise = derive2 { name="noise"; version="1.0"; sha256="1a48s9vpz3nc058966lad8hydmg7z0vbzfwcf6nxc9g3c8mw4nig"; depends=[preprocessCore]; }; - noisyCE2 = derive2 { name="noisyCE2"; version="1.0.0"; sha256="11cf7b472i6lsb4kh04rhp5mhj7l8ig0kxmkz05kazkr6cs41s6i"; depends=[magrittr]; }; - nombre = derive2 { name="nombre"; version="0.2.0"; sha256="1ybrd052mvgx3pwf7kknvx9hvxa5y26hy44cgcjdqq35kxl50xlp"; depends=[]; }; - nomclust = derive2 { name="nomclust"; version="2.1.6"; sha256="1jgb2bd9wc7hvvnkzh9jfcw3biiqfx9mi6qrw2qslab4r48binzs"; depends=[cluster plyr]; }; + noisyCE2 = derive2 { name="noisyCE2"; version="1.1.0"; sha256="02zkkyys9qknwm39gz4j4pvlvkd5qlvxqaprklzsd40dgz39cwq4"; depends=[magrittr]; }; + noisySBM = derive2 { name="noisySBM"; version="0.1.4"; sha256="1zdkxr48kvpqs49figxxznq3d45nalja92lyal71m066s1blc6dg"; depends=[ggplot2 gtools RColorBrewer]; }; + nombre = derive2 { name="nombre"; version="0.3.0"; sha256="0ssi0xk3f327zs7zvyhcm20v537y6ikjnfjarjsz22dvn05dblma"; depends=[fracture pkgconfig]; }; + nomclust = derive2 { name="nomclust"; version="2.2.1"; sha256="1034j5y7dppm4xkap1h3ywl77fz3dsm3g15njjgzcszr3p0z4vxn"; depends=[cluster plyr]; }; nomisr = derive2 { name="nomisr"; version="0.4.3"; sha256="0p1vc6qzs7lyflw9jndimylv614dny27nz18xkmay2419vwh463f"; depends=[dplyr httr jsonlite readr rlang rsdmx snakecase tibble]; }; - nomnoml = derive2 { name="nomnoml"; version="0.2.0"; sha256="10xy9738jqx45qx27lzlqairirs122c5n3dx7kbsq1b6ilmalqbp"; depends=[htmlwidgets png webshot]; }; + nomnoml = derive2 { name="nomnoml"; version="0.2.3"; sha256="08zraip0v4jc51zv2zsvka6k8d1ry2ac9d70xpavfggbgmrmz987"; depends=[htmlwidgets lifecycle png rlang webshot]; }; nomogramEx = derive2 { name="nomogramEx"; version="3.0"; sha256="16235rwblnzn8k53817llwy2pzhnpifh6ij159nxymjm8ar9qpbp"; depends=[pracma rms]; }; nomogramFormula = derive2 { name="nomogramFormula"; version="1.2.0.0"; sha256="1j6g5kndl0n2g8acwq8pn09sk0bjcsphbcd77ha1j5dnwdmy73c0"; depends=[do Hmisc rms]; }; noncompliance = derive2 { name="noncompliance"; version="0.2.2"; sha256="1lcybgj95z7lz7p26xbsdiv0vvms4ab4f8kad0pclacf1l43v0j6"; depends=[data_table Rcpp]; }; @@ -11453,8 +11948,8 @@ in with self; { nonet = derive2 { name="nonet"; version="0.4.0"; sha256="1043vplj8libbzll172h82dfwnz2lsdba5na2g9liryg8p08h4v8"; depends=[caret dplyr e1071 ggplot2 glmnet pROC purrr randomForest rlang rlist tidyverse]; }; nonlinearICP = derive2 { name="nonlinearICP"; version="0.1.2.1"; sha256="1m9a1f0yrbjl0nx2l7r76pyi78b2bxj8v4jx92yga91f975mw6np"; depends=[caTools CondIndTests data_tree randomForest]; }; nonlinearTseries = derive2 { name="nonlinearTseries"; version="0.2.10"; sha256="1zhp06az5pz7133253h18wwy77vpky4g0gi636v42p9dh0dzzvbm"; depends=[Matrix Rcpp RcppArmadillo rgl tseries zoo]; }; - nonmem2R = derive2 { name="nonmem2R"; version="0.2.1"; sha256="0a7h9wb8dqjgzyk4hd9ivhy90n80wrrp4zkrxnvgfvza1619qd52"; depends=[ggplot2 gridExtra lattice latticeExtra MASS mvtnorm reshape2 splines2]; }; - nonmemica = derive2 { name="nonmemica"; version="0.9.1"; sha256="0hhrg29wjqhb5pk13scg2zgqzzhf5azvfbph0rrfdb5qkj585awd"; depends=[csv dplyr encode lazyeval magrittr metaplot rlang spec tidyr xml2]; }; + nonmem2R = derive2 { name="nonmem2R"; version="0.2.2"; sha256="07ycldcbjap1ay9msmlf9jz4sk1p02di108zsz5x45yxd3fb6r93"; depends=[ggplot2 gridExtra lattice latticeExtra MASS mvtnorm reshape2 splines2]; }; + nonmemica = derive2 { name="nonmemica"; version="0.9.7"; sha256="12760lvbifzakzq7wjzqavqicrp2pzyq333glmafm9v73lx97pa7"; depends=[csv dplyr encode lazyeval magrittr metaplot rlang spec tidyr xml2]; }; nonneg_cg = derive2 { name="nonneg.cg"; version="0.1.6"; sha256="15361k0kjy1465s8pr9jb5jy22mibi37zcnza7mbfh5l66hr29kh"; depends=[Rcpp]; }; nonnest2 = derive2 { name="nonnest2"; version="0.5-5"; sha256="1ddaqwx8i3ygwvxf11mc8xhgk4nkvnail99nr5szq8i168752zq2"; depends=[CompQuadForm lavaan mvtnorm sandwich]; }; nonpar = derive2 { name="nonpar"; version="1.0.2"; sha256="0gflldd3kjbpdlvbwi073igj6shcqr9g5x6zcp5gfa12404qpflq"; depends=[]; }; @@ -11471,7 +11966,6 @@ in with self; { normalr = derive2 { name="normalr"; version="1.0.0"; sha256="1ahrg188vbhnrnwag0zi6lcb3g0y1mbz06sl3j1wyllq5l918cc7"; depends=[magrittr MASS purrr rlang shiny]; }; normtest = derive2 { name="normtest"; version="1.1"; sha256="073r2mwfs6c4vqh8921nlyygl0f20nhv997s0iwf00d3jckkc4pp"; depends=[]; }; normwhn_test = derive2 { name="normwhn.test"; version="1.0"; sha256="1kr45bfydk40hgdg24i2f28cdaw65hg9gmsgv4lsvvr2m3r74vi6"; depends=[]; }; - norris = derive2 { name="norris"; version="0.1.1"; sha256="07pflm5nc9rxi5zvi394c9y8h9hmhsvn4ya4ghlr9y6yxzwrz0l1"; depends=[dplyr httr jsonlite stringr]; }; nortest = derive2 { name="nortest"; version="1.0-4"; sha256="17r0wpz72z9312c70nwi1i1kp1v9fm1h6jg7q5cx1mc1h420m1d3"; depends=[]; }; nortestARMA = derive2 { name="nortestARMA"; version="1.0.2"; sha256="11ala9z0snsbn1xmj9yzs4kyh9js1w19x0dnnmh5cbr9bi7aag50"; depends=[astsa]; }; nortsTest = derive2 { name="nortsTest"; version="1.0.0"; sha256="15s7shl7gxhfyi5qc86wbwggkk3axhglbc15ba1wk8r40fwhjv2s"; depends=[forecast ggplot2 gridExtra MASS nortest tseries uroot zoo]; }; @@ -11504,21 +11998,21 @@ in with self; { npmr = derive2 { name="npmr"; version="1.2"; sha256="073i9zcnyp8l5fxblx2sfyn0b4lr6i595q6kl6ispvzmylwqj8na"; depends=[]; }; npmv = derive2 { name="npmv"; version="2.4.0"; sha256="04lfks2rlax59gxdnbgkpmk2vaax718z6hkgsvmyxf52iby6rvlr"; depends=[Formula]; }; npordtests = derive2 { name="npordtests"; version="1.2"; sha256="1axzcyy45h3rs67m0i3cvwbmza1mnmraxan9j4zlpxdd5x9nz4h8"; depends=[]; }; - nppbib = derive2 { name="nppbib"; version="1.1-0"; sha256="1dcqcf2jhlz3n4d2kjix8wray9c7yaawfdbdg9lcrih1m7b8gmsy"; depends=[]; }; + nppbib = derive2 { name="nppbib"; version="1.2-0"; sha256="1nn6wf89jhr3gy4rcd6px0cd5b1bsr7pbaxng4adba8n3yrss7vs"; depends=[]; }; npphen = derive2 { name="npphen"; version="1.1-0"; sha256="0pbf9sqdapl5q09g1hj5hi4j2wigrd0b6s0gbv1gx4wn68alrals"; depends=[ks lubridate raster rgdal rts snow]; }; nprcgenekeepr = derive2 { name="nprcgenekeepr"; version="1.0.3"; sha256="148fq935x7dmw754qgkkgka5hd2xdmh2cn1d5g2azzgx974zndzv"; depends=[anytime futile_logger htmlTable lubridate Matrix plotrix readxl Rlabkey shiny shinyBS stringi WriteXLS]; }; - npreg = derive2 { name="npreg"; version="1.0-4"; sha256="1fa2lna6l49x08f61d7y4qxv9bw0vml19zilfnl253djsqf7q37s"; depends=[]; }; + npreg = derive2 { name="npreg"; version="1.0-5"; sha256="1ddr3iapx1zzl72bygjy3gf50cr8pkf1ap5hzr5ci4rg4bmdjznw"; depends=[]; }; npregderiv = derive2 { name="npregderiv"; version="1.0"; sha256="1k873cs3rs15l13z8017n4anacandx7di6yk1zlamcc5p3vlh59n"; depends=[]; }; npregfast = derive2 { name="npregfast"; version="1.5.1"; sha256="0s9ci3nybzwykrgi9z2rqp6l15mqbxf759ks0clvkbm7wxv3whk5"; depends=[doParallel foreach ggplot2 mgcv sfsmisc shiny shinyjs wesanderson]; }; - nprobust = derive2 { name="nprobust"; version="0.3.0"; sha256="0nb2ca6ljg1c2jmjhxrpfynrvmjzp5zr8dxwyhdhzl0smrkjybj4"; depends=[ggplot2 Rcpp RcppArmadillo]; }; + nprobust = derive2 { name="nprobust"; version="0.4.0"; sha256="1vry64r3xms6xls6bqq918prjyhs5svhl2yjvq0jxycaaqw2sgyp"; depends=[ggplot2 Rcpp RcppArmadillo]; }; nproc = derive2 { name="nproc"; version="2.1.5"; sha256="1p5wjz0rafg27fsl48l9pmki3px1k0pav3ignz4swik5i1nhnc8w"; depends=[ada e1071 glmnet MASS naivebayes randomForest ROCR tree]; }; nprotreg = derive2 { name="nprotreg"; version="1.0.1"; sha256="1bjrnbfzs7h3q424d1kxlvb29ppnxf0dw7hsx2gn5bygz1zgm54h"; depends=[]; }; - npsf = derive2 { name="npsf"; version="0.7.1"; sha256="03rfcnkfk1magcjvrjc96qxngw840sgiasl5yklhgiigz4nnqvi5"; depends=[Formula Rcpp]; }; - npsm = derive2 { name="npsm"; version="0.5.1"; sha256="00xh3x731lqb5vbzmfmlldrvc8s4s88dc394iifsn2g7r5naxks0"; depends=[plyr Rfit]; }; + npsf = derive2 { name="npsf"; version="0.8.0"; sha256="011y8k3sdhhgzf4yn0wdxx55yv4kdpgyhj0bbm6krjdpphnr9557"; depends=[Formula Rcpp]; }; npsr = derive2 { name="npsr"; version="0.1.1"; sha256="1fzvilzjg9z05991sr1s1bdp17kfl6d1580qdllk8is9ac06np0v"; depends=[gmp infotheo MASS]; }; npst = derive2 { name="npst"; version="2.0"; sha256="1y5ij3nmh9pj6p97jpx75g26sk508mznr0l67cwj381zfb77hj1n"; depends=[]; }; + npsurv = derive2 { name="npsurv"; version="0.5-0"; sha256="1ihxhb42cga1hssj2jv4ah0f4hlwsky899ij5261fzh1wxvdp1xw"; depends=[lsei]; }; npsurvSS = derive2 { name="npsurvSS"; version="1.0.1"; sha256="0k9xvxii5527vynf7yy50j7z4jhxgk5ydhdcaaygm9ynx5yq14ip"; depends=[]; }; - nptest = derive2 { name="nptest"; version="1.0-0"; sha256="13h93sx5fsbfiy3q88j4bl0p3hwqzi8l4ab0r0qha78dzd6skq2v"; depends=[]; }; + nptest = derive2 { name="nptest"; version="1.0-2"; sha256="1h1bmv7yj2nzwivk1z11a67z3xkamh0ljfr0nlimyr6qx32hr5s9"; depends=[]; }; nricens = derive2 { name="nricens"; version="1.6"; sha256="0fpgp6k3mhb0qxbx6248k9bscnmlzwj70mqh631a1nc4cpdjvw3q"; depends=[survival]; }; nsRFA = derive2 { name="nsRFA"; version="0.7-15"; sha256="004dm143v032b80knpz7pj3z71lci7vgd6hz1zz22rpfg27ghgdd"; depends=[]; }; nsROC = derive2 { name="nsROC"; version="1.1"; sha256="1fi7k61fja98kpn528jprjdycwz01rnqm368m82anxh21k7q4s1m"; depends=[sde survival]; }; @@ -11526,13 +12020,15 @@ in with self; { nsarfima = derive2 { name="nsarfima"; version="0.2.0.0"; sha256="0sv63anrsh0ajfvvkb44zsvc7sxws3xpsgwxqa951gy98w8h58g5"; depends=[]; }; nscancor = derive2 { name="nscancor"; version="0.6.1-25"; sha256="183kvzlln5lhmi51dm0skq1165c3hhy1yz5h2g7nxwqk2b4p23xj"; depends=[]; }; nse = derive2 { name="nse"; version="1.19"; sha256="107ri9325ga4kgvs5a3j3698dc3m4v28cb02ypc4dan6f3fa9h8i"; depends=[coda mcmc mcmcse np Rcpp sandwich]; }; - nse2r = derive2 { name="nse2r"; version="0.1.2"; sha256="1rbcqz8zighy0vqi04lh93f2ggwlqhjvvn7f0627m5gp6ph2bdyh"; depends=[jsonlite magrittr rvest xml2]; }; + nse2r = derive2 { name="nse2r"; version="0.1.3"; sha256="18zchh830b546lmy64l94l4lq89bk6jb49x2asw9f07i60plbwyi"; depends=[jsonlite magrittr rvest xml2]; }; nseval = derive2 { name="nseval"; version="0.4"; sha256="18avir5zllvm2sbi9616k7dlb8yxhvnbji7xshr4kcfvy1fvn2ia"; depends=[]; }; nsga2R = derive2 { name="nsga2R"; version="1.0"; sha256="04jj0a3isfc348vg46il5x9l33cr7xawz5w0mm4pwr6djhd8nfhx"; depends=[mco]; }; nsga3 = derive2 { name="nsga3"; version="0.0.3"; sha256="1jv3kw22jw24n7lnwhq3857mygr2yfv8c5xp3lbqqgz5840cdfa1"; depends=[mlr parallelMap rPref xgboost]; }; nsgp = derive2 { name="nsgp"; version="1.0.5"; sha256="0piajjz3r71dnjw7lwpjhbaygxcrbbxfvhf8p3n2izyr2pw5fml9"; depends=[MASS]; }; + nspmix = derive2 { name="nspmix"; version="1.5-0"; sha256="1jaaw5ibn614yhlid0csnzj31npdx5zivm2nhnvyghzcmvyxavr8"; depends=[lsei]; }; nsprcomp = derive2 { name="nsprcomp"; version="0.5.1-2"; sha256="1zlc1ximx96f235c0l8qfs6vbp1kpnbf943wxsfahnnlnxvwi59f"; depends=[]; }; nsrr = derive2 { name="nsrr"; version="0.2.0"; sha256="1x1c7pvyfvzmaymxcz6ghr5002wz48796c3hsihwbx6951w623sq"; depends=[digest httr jsonlite]; }; + nsyllable = derive2 { name="nsyllable"; version="1.0"; sha256="004qb43j8ygr9ay63b38w0fwm24bhlzd206sxg88hh5ia69fw8ms"; depends=[]; }; nucim = derive2 { name="nucim"; version="1.0.9"; sha256="19vj1xkzw1b02lyfsf7c9s37jcv95bs30larlzj3074jdf4jznsm"; depends=[bioimagetools EBImage fields stringr]; }; nullabor = derive2 { name="nullabor"; version="0.3.9"; sha256="19nfmsnzndg9pdjg7m9w4vm4c3209ny52cpjdhmmhggvf7dxaiyg"; depends=[dplyr forecast fpc ggplot2 magrittr MASS moments purrr rlang tibble tidyr tsibble viridis]; }; numDeriv = derive2 { name="numDeriv"; version="2016.8-1.1"; sha256="0idk02pqkziik932bd8k72d1q775g1is3m4bc861pcxfz6gx3i6q"; depends=[]; }; @@ -11541,24 +12037,24 @@ in with self; { numOSL = derive2 { name="numOSL"; version="2.6"; sha256="03h1p56650x4my5vq5jlmjsz5xj0w2j75qfr08rh7nr38dwgp1k8"; depends=[]; }; numbers = derive2 { name="numbers"; version="0.7-5"; sha256="1dz23rmjzdns4av28kk8bc9psj71q2bpcgm1m7sxnyzcxpm8hczc"; depends=[]; }; numbersBR = derive2 { name="numbersBR"; version="0.0.2"; sha256="0ihxlny745gpz1ngq862rydn1zwn8zni1xw9mmgw8hkylsrnjfq8"; depends=[stringr]; }; - numform = derive2 { name="numform"; version="0.6.0"; sha256="0v19dcr5xwi0bf4s0qwipxpmxbw42l2li1h9i73kdrigznhlqq8h"; depends=[glue]; }; + numform = derive2 { name="numform"; version="0.6.4"; sha256="034dmrhp3d0r4hspy8490wjpknc83dsiyjhl3nha0b4w8vbcalsz"; depends=[glue]; }; nutriNetwork = derive2 { name="nutriNetwork"; version="0.1.1"; sha256="0ya95h88jkiwc7cg7ic8bmyd7b0lgnhxrywwqvi2j6m6nbvvaxzy"; depends=[glasso huge igraph Matrix tmvtnorm]; }; - nvctr = derive2 { name="nvctr"; version="0.1.1"; sha256="0hjrimg0hvwgkx2hbln6k8z0f2bp9kln7mxxh623qjp0hg4mcvcn"; depends=[magrittr pracma]; }; - nvmix = derive2 { name="nvmix"; version="0.0-4"; sha256="0srgf7zczy2bp8qqhr15mrccd6v0bksx2nkgizdh4ipr17vqzgrp"; depends=[Matrix qrng]; }; + nvctr = derive2 { name="nvctr"; version="0.1.4"; sha256="1r7q9snr9ya1586fwbyvnk8rlb9yikl4yp3bn9kni0sw820npk1d"; depends=[magrittr pracma]; }; + nvmix = derive2 { name="nvmix"; version="0.0-5"; sha256="15nipvfb92r1dx4shvix8hhjg0mzvrwprgzgdzkdmhvxk9d8rswd"; depends=[copula Matrix pcaPP qrng]; }; nws = derive2 { name="nws"; version="1.7.0.1"; sha256="1fn92n6brjhh8hpvhax7211cphx2cn0rl99kjqksig6z7242c316"; depends=[]; }; nycflights13 = derive2 { name="nycflights13"; version="1.0.1"; sha256="0h4jzg4q5qpvjp5b2wlk3a2mh0jhyz9c1acdjcmg70pap7fyh0fj"; depends=[tibble]; }; nzelect = derive2 { name="nzelect"; version="0.4.0"; sha256="19kcbq454yg9g76ix7v3nibgw2203d7vv6f2d6d2zkcc0h08bjm7"; depends=[]; }; - nzilbb_labbcat = derive2 { name="nzilbb.labbcat"; version="0.5-1"; sha256="0rshf4d0xi0cfwnpvb73d39f7zcw4ilh065lzm8gbx1ri7v64rgn"; depends=[httr jsonlite rstudioapi stringr]; }; + nzilbb_labbcat = derive2 { name="nzilbb.labbcat"; version="0.6-3"; sha256="19ys3l40xmqmkhhpq3l7hz8ni4wqn1j8h23hqic8r1arf4ci9b89"; depends=[httr jsonlite rstudioapi stringr]; }; nzpullover = derive2 { name="nzpullover"; version="0.3.0"; sha256="0b3mz5i58m48fa1x7gv4l3gqj0gvrar201ph2l1gkbcnfmazwjp8"; depends=[]; }; + o2geosocial = derive2 { name="o2geosocial"; version="1.0.1"; sha256="1q4y606cpyfjik56zw019xscrshm4s9n0y0g37izmd02cv17a4ik"; depends=[data_table geosphere ggplot2 outbreaker2 Rcpp visNetwork]; }; oRus = derive2 { name="oRus"; version="1.0.0"; sha256="0q6hgiidcpm95pyisndihxjg78v6k1zycdqd72309aankdk0g5h4"; depends=[dplyr knitr rmarkdown stringr tibble tidytext tm topicmodels xlsx]; }; oaColors = derive2 { name="oaColors"; version="0.0.4"; sha256="040sdqrk9dciylnnrrshlj06s9qhvngii9shx1p8412ip7mk8r1m"; depends=[MASS RColorBrewer]; }; oaPlots = derive2 { name="oaPlots"; version="0.0.25"; sha256="0c5ig1ar02vg38pjjmp3gd53ij1j7pzajs0zrlfajz141qkv2ysr"; depends=[ggplot2 oaColors]; }; oai = derive2 { name="oai"; version="0.3.0"; sha256="1ipw9bq3ra66d1ddj1rylyyd20mlcb2i7phzhywra53s1fdifq1g"; depends=[httr plyr stringr tibble xml2]; }; oaqc = derive2 { name="oaqc"; version="1.0"; sha256="1rc0l79xygmr2rp5sjadzigbj65a13z5xlvrxzy26cl0wsxwhmjf"; depends=[]; }; - oasis = derive2 { name="oasis"; version="3.0.4"; sha256="1h1w46rbkbsjvh3fjniy3v7y30r2vf1kiqs807kavf0bpb6a1202"; depends=[fslr mmand neurobase oro_nifti]; }; oaxaca = derive2 { name="oaxaca"; version="0.1.4"; sha256="12w5l2a8i2964rxy9km2srlycx35y7ia8p07ra7gsxr4h8156z3c"; depends=[Formula ggplot2 reshape2]; }; obAnalytics = derive2 { name="obAnalytics"; version="0.1.1"; sha256="1l4ld120qk0adycmvqrkzada10kb7z03lj2njzqagmacl1z8598f"; depends=[ggplot2 reshape2 zoo]; }; - obfuscatoR = derive2 { name="obfuscatoR"; version="0.2.0"; sha256="01j3bvmnqlajkwqz01f5zfmwgfbnmhcxa41gqnzq7k41xzm7q8vk"; depends=[crayon matrixStats readr Rfast stringr tibble]; }; + obfuscatoR = derive2 { name="obfuscatoR"; version="0.2.1"; sha256="1pnlbfsp5fjvhwn2yl495v38g1wjg5l4ry79i1a2jznq2l91hn4p"; depends=[crayon matrixStats readr Rfast stringr tibble]; }; objectProperties = derive2 { name="objectProperties"; version="0.6.5"; sha256="0wn19byb1ia5gsfmdi6cj05pnlxbr3zcrjabjg3g1d7b58nz7wlh"; depends=[objectSignals]; }; objectSignals = derive2 { name="objectSignals"; version="0.10.2"; sha256="1rcgfq1i3nz2q93vv4l069f3mli1c6fd5dhhhw1p7cc4sy81008w"; depends=[]; }; objectremover = derive2 { name="objectremover"; version="0.7.0"; sha256="0mspnnks04s8w6q2g0nffd0675g07hkaql44kz6zrc5329qx7jpi"; depends=[miniUI shiny shinyalert]; }; @@ -11569,7 +12065,8 @@ in with self; { observer = derive2 { name="observer"; version="0.1.2"; sha256="1027827k57qb4xppx0xxxffd1s3n7pz754irdx3v1v3piix8xi8m"; depends=[bazar bit dplyr lazyeval magrittr tibble]; }; oc = derive2 { name="oc"; version="1.2"; sha256="0cw1gvz6gk8j718zmywqp03h9cnzn132nwbv45gr00xg2s9h7dk7"; depends=[pscl]; }; occ = derive2 { name="occ"; version="1.1"; sha256="1aka29qqwbd494kvi15yyyqkb9hks4ky2gcvykxhx2drm2fnsn4g"; depends=[]; }; - ocd = derive2 { name="ocd"; version="1.0"; sha256="0r14w09wzyxp685jbzqj3dirnhsq106d23igl1jd5xpwbj2192n5"; depends=[]; }; + occCite = derive2 { name="occCite"; version="0.4.5"; sha256="1409mzhkgw9m6nfdj3q7cz95js3db1whad8ns2pkwmg5i9nl8h4n"; depends=[ape bib2df BIEN bit64 DBI dplyr ggplot2 htmltools knitr leaflet lubridate magrittr rgbif rlang RPostgreSQL stringr taxize tidyr waffle]; }; + ocd = derive2 { name="ocd"; version="1.1"; sha256="06pyc352pvn85k76z9797gwk0ksbb3snvh6krysp68k3lcygq872"; depends=[]; }; oce = derive2 { name="oce"; version="1.2-0"; sha256="18ls8c8ia00dn9f9lxk01mvwqmxd1ilx1d7y59d1nixd40mjy1wr"; depends=[gsw Rcpp testthat]; }; oceanis = derive2 { name="oceanis"; version="1.7.5"; sha256="1mb9jrrgbkawiwa20xqy7im56gjcn0nmq4vi9mnrzrgizfid25dx"; depends=[classInt dplyr DT ggplot2 leaflet leaflet_extras lwgeom mapview sf shiny shinyBS shinyjs shinythemes stringr units]; }; oceanmap = derive2 { name="oceanmap"; version="0.1.1"; sha256="06h4yxqcn3rjr3m2n82w128z110a4k5rg6msrbd0gcqksxc4vd2v"; depends=[abind extrafont fields lubridate mapdata maps maptools ncdf4 plotrix raster sp]; }; @@ -11580,27 +12077,28 @@ in with self; { ocomposition = derive2 { name="ocomposition"; version="1.1"; sha256="0fk8ia95yjlvyvmjw7qg72piqa40kcqq9wlb3flc6a81pys1ycb5"; depends=[bayesm coda]; }; ocp = derive2 { name="ocp"; version="0.1.1"; sha256="0q52s8j3z3xwnma3sxx6019qxid66bf0a43w4g8xjagplwps57dx"; depends=[]; }; ocs4R = derive2 { name="ocs4R"; version="0.1"; sha256="1sm2fl503ky4pxv9873zykidb56f7dygq1xckjsh0d7m78n4gzx5"; depends=[curl httr jsonlite openssl R6 XML]; }; - odbc = derive2 { name="odbc"; version="1.2.3"; sha256="04b9qlpycr771xip11wd2zhb1yiz7x1bl3jhqj6p4daq553snvhy"; depends=[bit64 blob DBI hms Rcpp rlang]; }; + od = derive2 { name="od"; version="0.0.1"; sha256="1w65jynv28vfbgp4ln6mrhgymis2098mcfy6mpax3sx4a5s7yyaq"; depends=[sfheaders]; }; + odbc = derive2 { name="odbc"; version="1.3.0"; sha256="1m2ljaw44gl78i34c52jiyzzskqak9p5zddai5ijjfc2afkvldfg"; depends=[bit64 blob DBI hms Rcpp rlang]; }; odds_converter = derive2 { name="odds.converter"; version="1.4.8"; sha256="09s8pg55gpsxmrbimzg5rsr1n07la93781sar6vab5p9zn9zxgx4"; depends=[]; }; odds_n_ends = derive2 { name="odds.n.ends"; version="0.1.1"; sha256="0kgdv4m14h4a16b0k2s2qjyjn0kxk5sf4qkbi6ikm6kqdh5ashp4"; depends=[MASS]; }; oddsratio = derive2 { name="oddsratio"; version="2.0.1"; sha256="1db0pxi5j18rvi8dyc2xx1im3l269775vpjjavapjcv2pylfg5r0"; depends=[ggplot2 mgcv]; }; oddstream = derive2 { name="oddstream"; version="0.5.0"; sha256="1nwjw7fq6b4jdq4m2w0a7xgmzjg5a6pbma1d3r9msiz8rnhb0c54"; depends=[dplyr ggplot2 kernlab ks magrittr MASS mgcv moments mvtsplot pcaPP RColorBrewer RcppRoll reshape tibble tidyr]; }; odeintr = derive2 { name="odeintr"; version="1.7.1"; sha256="0wfb5lgv10p0qyfbn9hdg14bda37v43lpgbwv6nbw63zzbsbazqi"; depends=[BH Rcpp]; }; - odin = derive2 { name="odin"; version="1.0.1"; sha256="1m1rqlh9z6hpna6qhyxhavqph3j66hbd2b5md5ha2hrbjq93yynm"; depends=[cinterpolate crayon deSolve digest jsonlite R6 ring]; }; + odin = derive2 { name="odin"; version="1.0.8"; sha256="1wpkyaig81kwbq08cbn02kf6c8sfcq49kd7d66ibrd93ai239f26"; depends=[cinterpolate crayon deSolve digest jsonlite R6 ring]; }; odk = derive2 { name="odk"; version="1.5"; sha256="0fcnr4c1clwx1sk6fgg4cx506gdi90n2h05g0i47p4s5bra0qwwl"; depends=[gsheet openxlsx]; }; - odpc = derive2 { name="odpc"; version="2.0.3"; sha256="1lv8kn4dvwibnhzhq0safgmm6abffmjw1279acawzf3ik308m3cm"; depends=[doParallel foreach forecast Rcpp RcppArmadillo]; }; + odpc = derive2 { name="odpc"; version="2.0.4"; sha256="1525apa5x4jqf8ijdc9xl60fgxsi5xsirhd35cmnc362sd7k2jjd"; depends=[doParallel foreach forecast MASS Rcpp RcppArmadillo]; }; odr = derive2 { name="odr"; version="1.0.2"; sha256="0dj5piyd6h92q6agv8yvzky3qpxjn6zpgvf502hf0n6k9gx6kdpl"; depends=[]; }; oem = derive2 { name="oem"; version="2.0.10"; sha256="1nf9ja4l7b9gnnvv216dz9siy02432qgyg930vcrqq3l8g05r6zc"; depends=[BH bigmemory foreach Matrix Rcpp RcppArmadillo RcppEigen]; }; oenb = derive2 { name="oenb"; version="0.0.1"; sha256="1x1jlqp6r27c4gb7wafzpmh5rq6yq61a2d395r5lsmv2g5jb4biz"; depends=[dplyr XML]; }; ofGEM = derive2 { name="ofGEM"; version="1.0"; sha256="0xdkl8k12an9pdy6i5nay4m2iakrwsp0lr3zl8gphii75j0ywz7k"; depends=[CompQuadForm forestplot MASS]; }; officedown = derive2 { name="officedown"; version="0.2.0"; sha256="0v7bhcgfk8xra3w9fjrcm7vra2hjq9wm1wj2mbsa3xdknicv9yrs"; depends=[knitr memoise officer rlang rmarkdown rvg uuid xml2 yaml]; }; - officer = derive2 { name="officer"; version="0.3.12"; sha256="1wk9h6bz77s5j6lgksmlrmi1vyaa35c766gq6hgb1dp0dz0x342x"; depends=[magrittr R6 uuid xml2 zip]; }; + officer = derive2 { name="officer"; version="0.3.15"; sha256="1s9hrkdx105c1plpxywv68bmp8hvvxbdizhwx81fxr79fhj62x5j"; depends=[magrittr R6 uuid xml2 zip]; }; offlineChange = derive2 { name="offlineChange"; version="0.0.4"; sha256="005afrm4ki4zz3zkgrf8c1v9gf5cjhc5g50mjkqya3r8npaccwq2"; depends=[Rcpp]; }; oglmx = derive2 { name="oglmx"; version="3.0.0.0"; sha256="13axmhbqhv4kkcdsdmp9r7p0d0kyqlsaqgyyllbkxlxb4hfz79b6"; depends=[maxLik]; }; ohenery = derive2 { name="ohenery"; version="0.1.1"; sha256="0i7cc110c30y7dm86srh2xkikkmlr28mvy0kkjxywxmiwnrsmzjq"; depends=[dplyr magrittr maxLik Rcpp]; }; ohtadstats = derive2 { name="ohtadstats"; version="2.1.1"; sha256="0hkjs322vii1dsminlkwpwi12sc9pd88jag7p4dmy6nfw2hh2d69"; depends=[lattice]; }; oii = derive2 { name="oii"; version="1.0.2.1"; sha256="1n41hikn53ikyynsravg127cw5csa8s0s1l63w5hym7c6j625ya5"; depends=[Deducer gmodels rapportools]; }; - ojsr = derive2 { name="ojsr"; version="0.1.1"; sha256="0bf0bmnqwfd7x2ggx8mkq4zkfgv9j0l2fb3k728cwg2h5nfqn9c9"; depends=[dplyr magrittr oai purrr rlang rvest stringr tidyr urltools xml2]; }; + ojsr = derive2 { name="ojsr"; version="0.1.2"; sha256="0nwdws9kqnya9qjc939b7ksrf7ri6d25zzcdxhyhabirhnrqdg7m"; depends=[dplyr magrittr purrr rlang rvest tidyr urltools xml2]; }; okcupiddata = derive2 { name="okcupiddata"; version="0.1.0"; sha256="1l04rr4yr73a6q2am9ylyr5prf347hkf2jx735w78rsb6472kbaq"; depends=[]; }; okmesonet = derive2 { name="okmesonet"; version="0.1.5"; sha256="1kzyzmg702ayzphn9jsk64m51mlnz37ylxiwq5gsr23vaiida680"; depends=[plyr]; }; olctools = derive2 { name="olctools"; version="0.3.0"; sha256="1gbchwynvmryarz32f24v56kj57h7x6nrrm878fkjkpq140cqwzz"; depends=[Rcpp]; }; @@ -11609,13 +12107,14 @@ in with self; { olsrr = derive2 { name="olsrr"; version="0.5.3"; sha256="0rh1jb0z0ypspzcp4vbpzjz960yj76myk2j4zb1vi9gnnj3clw8y"; depends=[car data_table ggplot2 goftest gridExtra nortest Rcpp]; }; omd = derive2 { name="omd"; version="1.0"; sha256="0s1wcgivqapbkzjammga8m12gqgw113729kzfzgn02nsfzmsxspv"; depends=[]; }; omics = derive2 { name="omics"; version="0.1-5"; sha256="1y2x33mfgq98nglhvpr1wq1v6nfiq4njy2yac47x72rpwxsj9vb1"; depends=[lme4 pheatmap]; }; - omicwas = derive2 { name="omicwas"; version="0.7.0"; sha256="0i3d6qkcv6xsmb2fq0sf9dn7mqh4rzq01326zbzf5p5y2f5gfipp"; depends=[broom data_table dplyr ff glmnet magrittr MASS matrixStats PCDimension rlang sva tidyr]; }; + omicwas = derive2 { name="omicwas"; version="0.8.0"; sha256="03l53vbsard0hpaffcaa9l1aa3nh3w16j00k2jz2jqrrg02z0d7h"; depends=[broom data_table dplyr ff glmnet magrittr MASS matrixStats purrr rlang tidyr]; }; omopr = derive2 { name="omopr"; version="0.2"; sha256="1ng94jnarj7pszxzvdlnrr2dbcvv5p5yrscjw6ihqkskpraw9f7w"; depends=[DBI dbplyr dplyr RSQLite]; }; - ompr = derive2 { name="ompr"; version="0.8.0"; sha256="1nmd5wa1g2xzmwqfqf882bxcrmkxbb5b414cbbzvmqzfs34yk6bl"; depends=[data_table lazyeval Matrix progress Rcpp rlang]; }; + ompr = derive2 { name="ompr"; version="0.8.1"; sha256="10q6p1j7y22w82b73806ixcwvmpf5cffn1d84p7zqlgxcj6sk24w"; depends=[data_table lazyeval Matrix progress Rcpp rlang]; }; ompr_roi = derive2 { name="ompr.roi"; version="0.8.0"; sha256="1cbrchvpd31lxpxvw2l3q9k5jmffarb1shca8kwm76y5a6zxxq63"; depends=[Matrix ompr ROI slam]; }; omu = derive2 { name="omu"; version="1.0.4"; sha256="03dvbgxf5d181wka0gpf3sr008fzzva57xvdniynbgqskgcn4qi3"; depends=[dplyr ggfortify ggplot2 KEGGREST magrittr plyr reshape2 stringr tidyr]; }; oncomodel = derive2 { name="oncomodel"; version="1.0"; sha256="1jyyq9znffiv7rg26mjldbwc5yi2f4f8npsd2ykhxyacb3g96fp1"; depends=[ade4]; }; oncrawlR = derive2 { name="oncrawlR"; version="0.2.0"; sha256="0cm26diaf3jlzfrpgh13q0hakakmj6vy41wk9z0w81az4jcg9sn9"; depends=[caret DALEX dplyr e1071 formattable fs ggplot2 htmltools jsonlite pdp pROC RCurl readr rjson rlang rlist scales sparkline tidyr webshot xgboost]; }; + oneclust = derive2 { name="oneclust"; version="0.2.1"; sha256="04nafy0bv3g5vjd5k7858lvs9rc141kzpblsdcb7sl4kfw76s11z"; depends=[magrittr Rcpp]; }; onehot = derive2 { name="onehot"; version="0.1.1"; sha256="1cdsz007wr054k5phvihhg4qx0fc039k2s6484m92kws8mb2ziix"; depends=[]; }; onelogin = derive2 { name="onelogin"; version="0.2.0"; sha256="06p3a8kaxmvsj8nn7dy8w6wv1jjw67is991hqg9q0fa20ifym3dl"; depends=[glue jsonlite magrittr R6 safer tibble]; }; onemap = derive2 { name="onemap"; version="2.1.3"; sha256="0fwkr845zz0j8ccrwpksb28lly1rsgj3603ak1aqqgmlx6481p08"; depends=[ggplot2 MDSMap plotly Rcpp reshape2]; }; @@ -11625,36 +12124,40 @@ in with self; { onlineCOV = derive2 { name="onlineCOV"; version="1.3"; sha256="04ikvsd76f6xhja7djyv433m88lfj2vf0y9qi6x1s4i9kh8xkbz9"; depends=[]; }; onlinePCA = derive2 { name="onlinePCA"; version="1.3.1"; sha256="08qivsfnwz5vp089lv9czsaz3nfi42kn9yhgzf27dji18y2xscic"; depends=[Rcpp RcppArmadillo RSpectra]; }; onlineVAR = derive2 { name="onlineVAR"; version="0.1-1"; sha256="01z2d91mbdjvwwiqjq1dbqp50jbc9v6d7nw4gs7d1abhsqyiqa13"; depends=[lattice]; }; + onlineforecast = derive2 { name="onlineforecast"; version="0.9.3"; sha256="1bsdw4z651ld3p6k2ajahql0ixv65vppqyn6kd9xmcvw6xqys4m1"; depends=[digest pbs R6 Rcpp RcppArmadillo]; }; + onlineretail = derive2 { name="onlineretail"; version="0.1.0"; sha256="0br4az2s4s7wh32cx324wpwhh7xfa9y1skyga349pbyhbgqwiq50"; depends=[]; }; onls = derive2 { name="onls"; version="0.1-1"; sha256="0m7pnlzkqwzi6jncjzxzfvznipd4wg03zd9fc0ymwm9jvhm4p14g"; depends=[minpack_lm]; }; onnx = derive2 { name="onnx"; version="0.0.2"; sha256="0gyyaplq20cb0bilnmx0k2cm7yzrfvwsawdzs0bha1p5b83l003v"; depends=[reticulate]; }; ontologyIndex = derive2 { name="ontologyIndex"; version="2.5"; sha256="127hlf0z5fmbgnq4p9h8nvn6p72d2fpcn846zzb99s213421jnry"; depends=[]; }; ontologyPlot = derive2 { name="ontologyPlot"; version="1.4"; sha256="0sj1jg9lr1w3ahzw7fj86vp2bnvf4nq0x3hiqb3hzngwyj9bykpn"; depends=[ontologyIndex paintmap Rgraphviz]; }; ontologySimilarity = derive2 { name="ontologySimilarity"; version="2.3"; sha256="1rh3cpj3r82xp4gqvspvgwwi3a29gyi0azrf4r1nshhi8qdx9avw"; depends=[ontologyIndex Rcpp]; }; - oolong = derive2 { name="oolong"; version="0.3.4"; sha256="1zhgk9y1iy90kn6kwx2r80jy6fymgkd59c03xx936sijk0wnpwrq"; depends=[cowplot digest dplyr ggplot2 irr miniUI purrr quanteda R6 shiny stm text2vec tibble]; }; + oolong = derive2 { name="oolong"; version="0.3.11"; sha256="0yv3xqzyyl81d1xii2b66akmibn1l35lxcv8yr2nflz4b89qcyhd"; depends=[cowplot digest dplyr ggplot2 irr miniUI purrr quanteda R6 shiny stm text2vec tibble]; }; oompaBase = derive2 { name="oompaBase"; version="3.2.9"; sha256="1cmw2s5dznmv675484jgvkzgvi6vhg0zbxsq6zhpqsisf672pjhl"; depends=[cluster]; }; oompaData = derive2 { name="oompaData"; version="3.1.1"; sha256="0by9qfxlx6fdmp12qnphlli5hdn5balvx4ckg64fw6vwa291g7b0"; depends=[]; }; - opalr = derive2 { name="opalr"; version="1.4.1"; sha256="0rvk36mpgpw9lmx0jiyvzg04mrmdhv7v88akjihj0dfr23wf48gp"; depends=[httr jsonlite mime progress xml2]; }; - openCR = derive2 { name="openCR"; version="1.4.1"; sha256="046ijw5ss8nb0m11p7r682zi7242m0ljydnsrr3gwrnmc4ayk6xv"; depends=[abind MASS nlme plyr Rcpp RcppParallel secr stringr]; }; + opalr = derive2 { name="opalr"; version="1.5.1"; sha256="0vma7iyb3zj6kq8w7ggr5xhpxfddqd8mx8yfnp0hjbd5nw7a10c7"; depends=[httr jsonlite mime progress]; }; + openCR = derive2 { name="openCR"; version="1.5.0"; sha256="0im2r9f6n0a7wxzdrrmzydiwy5c55bxhr4f9pxxccgz1k596q5yq"; depends=[abind MASS nlme plyr Rcpp RcppParallel secr stringr]; }; openEBGM = derive2 { name="openEBGM"; version="0.8.3"; sha256="120lp7fy6abj6f8g6naq4018d0dfzz6bq3dlh0xdhd4iclb7pplv"; depends=[data_table ggplot2]; }; openNLP = derive2 { name="openNLP"; version="0.2-7"; sha256="15yl74wv6w1d2wwpn1xlkkpam3c62977gnqal651fv623v29gg35"; depends=[NLP openNLPdata rJava]; }; openNLPdata = derive2 { name="openNLPdata"; version="1.5.3-4"; sha256="0j45rh9qki8r5wavaysrfsvb3wc3x8jjicqff2yi0r34j58xvlv8"; depends=[rJava]; }; - openSTARS = derive2 { name="openSTARS"; version="1.2.0"; sha256="1pyxllnzwfn9x5lz07inknl56jhmwliai8bmacfzcv3ksn19ndic"; depends=[data_table progress raster rgdal rgrass7 sp SSN]; }; + openSTARS = derive2 { name="openSTARS"; version="1.2.2"; sha256="0f3nv6b33r3m7xlh2adbi0wlzr2dw6jfsrmz8fjrlh0l7xakf1hz"; depends=[data_table progress raster rgdal rgrass7 sp SSN]; }; + openSkies = derive2 { name="openSkies"; version="0.99.8"; sha256="1s1821yykhc182wkncw0afhysmv46ihp2as0ynznkl74ijms0qyv"; depends=[httr xml2]; }; openVA = derive2 { name="openVA"; version="1.0.11"; sha256="0yzq462rf4vfr2xmczb6mks8xp7n3mli95ld8mf1xkj6a2sz584q"; depends=[cli crayon ggplot2 InSilicoVA InterVA4 InterVA5 Tariff]; }; openadds = derive2 { name="openadds"; version="0.2.0"; sha256="1jb8zd3rpxfkjkg895iab6m4cfi53p5vy3nnpjkgq7ym6499qjcv"; depends=[crul dplyr jsonlite maptools rappdirs readr tibble xml2]; }; - openair = derive2 { name="openair"; version="2.7-4"; sha256="1d5ylsj8spslrv8pflvblzkdfdbv4iz8c5qh73zs4d70k5ma9nwy"; depends=[cluster dplyr hexbin lattice latticeExtra lubridate mapproj MASS mgcv purrr Rcpp readr rlang tidyr]; }; + openair = derive2 { name="openair"; version="2.8-1"; sha256="02jw0zcf9sms341f3bylhqbdyz3whgwyqij951dvznayix91bn1k"; depends=[cluster dplyr hexbin lattice latticeExtra lubridate mapproj MASS mgcv purrr Rcpp readr rlang tidyr]; }; openblender = derive2 { name="openblender"; version="0.5.81"; sha256="01akixxj04kgrxhv04icrivfpnipnpg9j62i3y19q3jkl9846lh1"; depends=[httr jsonlite]; }; opencage = derive2 { name="opencage"; version="0.1.4"; sha256="1lqs38lml73axsjlsjkmcsb2irgs40mjrx2cn3k0bjb63qyb9hf5"; depends=[dplyr httr jsonlite memoise]; }; opencastR = derive2 { name="opencastR"; version="0.1.3"; sha256="1ljn7bzrqc2sgah1a6q2g9hi38nm8davhdc2vyzx7d40z7ysfpas"; depends=[httr jsonlite]; }; - opencpu = derive2 { name="opencpu"; version="2.2.0"; sha256="1isbl9szkh1vax29czvg8b8nyw0l6f3zyj24vhkm3y7ppavj5xdw"; depends=[brew curl evaluate httpuv jsonlite knitr mime openssl protolite rappdirs remotes sys webutils zip]; }; - opencv = derive2 { name="opencv"; version="0.1"; sha256="0m649g6k6cgxnljjx8czypjawbyzx7xjcg32wddxkrgi2b236lwh"; depends=[magrittr Rcpp]; }; - opendatatoronto = derive2 { name="opendatatoronto"; version="0.1.3"; sha256="1rcdv2zk3ckrp2fig71lgzw5i06767qqlrdj80r4b522nxx7npyn"; depends=[ckanr curl magrittr readxl sf tibble xml2]; }; + opencpu = derive2 { name="opencpu"; version="2.2.1"; sha256="0qv0w52xrvq5i819lrd6yf1bzjz95xi697yzsszh563dvwksxnhs"; depends=[brew curl evaluate httpuv jsonlite knitr mime openssl protolite rappdirs remotes sys webutils zip]; }; + opencv = derive2 { name="opencv"; version="0.2.0"; sha256="0lilsw46sp217vybn793md1kcc09z426qf9dc9rmkmvfb86q8k8v"; depends=[magrittr Rcpp]; }; + opendatatoronto = derive2 { name="opendatatoronto"; version="0.1.4"; sha256="0ggf25ry31xz69fl95cglg45ld8w7rc83wci609fmb63bhj8dzlg"; depends=[ckanr curl magrittr readxl sf tibble xml2]; }; opendotaR = derive2 { name="opendotaR"; version="0.1.4"; sha256="17cygsw3nkg6zincfrcdh1509rlz3n5zrv9wvv7mjngm61sn79nf"; depends=[dplyr jsonlite lubridate]; }; openintro = derive2 { name="openintro"; version="2.0.0"; sha256="1pr24cph9vxp0d0k1pmyk3kwzbj5jb96nkvsm6n1ky79msiax9fm"; depends=[airports cherryblossom ggplot2 rmarkdown tibble usdata]; }; - openmetrics = derive2 { name="openmetrics"; version="0.2.0"; sha256="0ia33f0p7k1zl22b9kqsggaakdr3npfm0q0jabk0s1ih9bxpv15h"; depends=[R6]; }; - openssl = derive2 { name="openssl"; version="1.4.2"; sha256="17fkc6pr8w5z3rpadg692a689p1v4j7xl5ak0y64is7c74cxgljx"; depends=[askpass]; }; + openmetrics = derive2 { name="openmetrics"; version="0.3.0"; sha256="0bcljsirlkxn0h87j2g2jb6spcik84h7nms06mcj40ckx188yr82"; depends=[R6]; }; + openssl = derive2 { name="openssl"; version="1.4.3"; sha256="0sc2skh1nz7jj65p0pq4a6bl8jza6lyi4zvmvwndzxfgivgh281l"; depends=[askpass]; }; + opentimsr = derive2 { name="opentimsr"; version="1.0.2"; sha256="07z36a1avrz31dhlg7pzfbazwdp0dqhxr7kk2i9mrw26qcwkl095"; depends=[DBI Rcpp RSQLite]; }; opentraj = derive2 { name="opentraj"; version="1.0"; sha256="13nqal96199l8vkgmkvl542ksnappkscb6rbdmdapxyi977qrgxk"; depends=[doParallel foreach maptools openair plyr raster reshape rgdal sp]; }; - opentripplanner = derive2 { name="opentripplanner"; version="0.2.3.0"; sha256="10vhwpsvn6470878r3xp80pw8rx8mxjznbfrh0c0s3f11wnkdmdn"; depends=[checkmate dplyr geodist googlePolylines httr jsonlite pbapply sf vctrs]; }; - openxlsx = derive2 { name="openxlsx"; version="4.1.5"; sha256="0wkpa3wsd8rs0pib7cp67iv0s6jn99frcrw7clypqxmvvdwyb9kq"; depends=[Rcpp stringi zip]; }; + opentripplanner = derive2 { name="opentripplanner"; version="0.3.1"; sha256="1bavs7k27zicsjvz65va45cpmmviddxsgqir0hvpl9z40ml1gnp0"; depends=[checkmate curl data_table geodist googlePolylines lubridate pbapply rjson sf sfheaders tibble]; }; + openxlsx = derive2 { name="openxlsx"; version="4.2.3"; sha256="0vz4nlrwgsiifrgza8kfd9i1c0ya6plymrgk59vyy2z54vc8kvyd"; depends=[Rcpp stringi zip]; }; opera = derive2 { name="opera"; version="1.1"; sha256="1nvm7a1g0pzzlpyk7g5plys1byl4xq2wz59hqys5gxiq0y5sgqwm"; depends=[]; }; operator_tools = derive2 { name="operator.tools"; version="1.6.3"; sha256="1v4dg7xhz24dnp0zxn815x1405ig64ibii6y40la1gvmzcc41dz5"; depends=[]; }; operators = derive2 { name="operators"; version="0.1-8"; sha256="0zgcv2q46qyqv4dhbd33s4044zjw38w8dqfpzs0c1lxjpkil3dnx"; depends=[]; }; @@ -11678,7 +12181,7 @@ in with self; { optim_functions = derive2 { name="optim.functions"; version="0.1"; sha256="1la3v8yd9cdichp3mka4x86hr9lynh6qfg7h9ab6cwijw6kzkn6g"; depends=[lhs randtoolbox stringr]; }; optimCheck = derive2 { name="optimCheck"; version="1.0"; sha256="1qjkv1mfyn7sw0dkxxcdaqj85vl71cgffpf3k3mvzy0s8yhxjb4n"; depends=[]; }; optimParallel = derive2 { name="optimParallel"; version="1.0-1"; sha256="0ck6a1lv5as98hzww7cjkzwrggq7bzmdhd0djkzvkwmx8h35chy6"; depends=[]; }; - optimStrat = derive2 { name="optimStrat"; version="2.1"; sha256="0splvrnrs8ayiycyxs02vcs5m0s2r68sblmcdlbi49fmxgw48di9"; depends=[cubature mvtnorm shiny]; }; + optimStrat = derive2 { name="optimStrat"; version="2.3"; sha256="1jkwhgpw7nknd7h8c01z25x566bw2qb388i6g5nwcygxsshdgpri"; depends=[cubature mvtnorm shiny]; }; optimalThreshold = derive2 { name="optimalThreshold"; version="1.0"; sha256="1m39q36p7i7z31b90awriq5jf9rfybyw5lj3m1w33v2ssipkzp1n"; depends=[ars coda HDInterval mgcv rjags]; }; optimbase = derive2 { name="optimbase"; version="1.0-9"; sha256="0ivz24kf3yacgq5bl3s3az1pcyhsz0cza5f8vdksy5gchwqplm8n"; depends=[Matrix]; }; optimization = derive2 { name="optimization"; version="1.0-7"; sha256="09s62ax3w8zijfp2cmh2lvdqbl3nijbjkwq4n3icasi53lzg2179"; depends=[colorspace Rcpp]; }; @@ -11710,12 +12213,12 @@ in with self; { orderbook = derive2 { name="orderbook"; version="1.03"; sha256="0dlvjrzdhhh8js4g1lvxs46q7fdxfxavxnb4nj6xlwca75i51675"; depends=[hash lattice]; }; ordering = derive2 { name="ordering"; version="0.7.0"; sha256="0sgwgcjg6sazmi11c9qvxfrzg671kcp18i2q20xbmbj4v3yqhwbh"; depends=[]; }; orderly = derive2 { name="orderly"; version="1.0.4"; sha256="0z83aha45nhi7mym1mygp60jim8znyknmc254gd2cvmg7cmifzb7"; depends=[DBI digest docopt fs ids R6 RSQLite withr yaml zip]; }; - orders = derive2 { name="orders"; version="0.1.3"; sha256="14p0wk7y9hbhxwifr4fjp3h9dll0sin8q88an6a536d4f2045j7c"; depends=[Newdistns]; }; + orders = derive2 { name="orders"; version="0.1.4"; sha256="1ixm3w3kbzaas3is3gdw5hx6vp4a9azaly2zd35rgpqrxk9zb2kk"; depends=[gamlss_dist Newdistns]; }; orderstats = derive2 { name="orderstats"; version="0.1.0"; sha256="0a3ga0cjryvbininspsx5wzc96s3fza06s3d5fhbllbixz0rap4a"; depends=[]; }; ordiBreadth = derive2 { name="ordiBreadth"; version="1.0"; sha256="04faqhas1p9lxhghd4xq07yq1nxv7ns18avhvkql7sy5a9g7bfs1"; depends=[vegan]; }; ordinal = derive2 { name="ordinal"; version="2019.12-10"; sha256="09bpmjmbf4x82kgf6bm4bkncq2apdv9mk20zj4zgma2jx2vyfhbs"; depends=[MASS Matrix numDeriv ucminf]; }; - ordinalClust = derive2 { name="ordinalClust"; version="1.3.4"; sha256="0r1g23ddhsszl7a52pdw3wnwipk4pikkg7p256jxls777wcyla3f"; depends=[BH Rcpp RcppArmadillo RcppProgress]; }; - ordinalCont = derive2 { name="ordinalCont"; version="2.0.1"; sha256="18li100drg54sfsp1qzxpfk7dqkdslrg6q4v7lqpysw9p7q0wpfp"; depends=[boot Deriv]; }; + ordinalClust = derive2 { name="ordinalClust"; version="1.3.5"; sha256="0hmqvhrmijgzanh08z5v82a07zl7xm69wl8zzj99fksahyrgxjdc"; depends=[BH Rcpp RcppArmadillo RcppProgress]; }; + ordinalCont = derive2 { name="ordinalCont"; version="2.0.2"; sha256="1azwcr1si3b8dxf2y59d3rxw4msfq79khzg7zgqd0kbzyka4ygl8"; depends=[boot Deriv]; }; ordinalForest = derive2 { name="ordinalForest"; version="2.4-1"; sha256="00w8jiz0260z4min2xxbg9dx2jiw99wyhgcxa11zhzzh91qvlf78"; depends=[combinat nnet Rcpp verification]; }; ordinalLBM = derive2 { name="ordinalLBM"; version="1.0"; sha256="1sfzkm3f9s5nbalakgk5v919wr7hdlr5p280rw2p8dy4wxr3xk3s"; depends=[RColorBrewer reshape2]; }; ordinalNet = derive2 { name="ordinalNet"; version="2.9"; sha256="0jnyhm6appggywva2jx39xhk4967qkzc2q71fikm9c78p9znw2an"; depends=[]; }; @@ -11723,7 +12226,7 @@ in with self; { ordinalgmifs = derive2 { name="ordinalgmifs"; version="1.0.6"; sha256="0axpndyyns649mwifq8f16l8n8x9nic8cv8l71ljyr2gwlm0nqz0"; depends=[survival]; }; ordinalpattern = derive2 { name="ordinalpattern"; version="0.2.0"; sha256="0nf7323wd8wm4qxlhr6cvm1l87rwfdr5c4qivhncy0m2n5vknc1c"; depends=[gtools mvtnorm]; }; ore = derive2 { name="ore"; version="1.6.3"; sha256="1vh6w3arrhgkfjjjw7ci91xmz4wpfr3cmwd5zkqch89dgn07skkv"; depends=[]; }; - ores = derive2 { name="ores"; version="0.3.1"; sha256="12war455cfcn2llig7pkx05b70dp5y7warjq03ayqq6i7c945mhb"; depends=[httr]; }; + ores = derive2 { name="ores"; version="0.3.2"; sha256="0xzc0d38z7h5ghab3kqsv0r2cl3888j7vn94p51xlwcbhnq10kip"; depends=[httr]; }; orf = derive2 { name="orf"; version="0.1.3"; sha256="19drrxvnh9y33p0g8pv9bhl6i8jpsdc7nkcpbpxbrsc5hs96dycp"; depends=[ggplot2 ranger Rcpp xtable]; }; org = derive2 { name="org"; version="2019.4.2"; sha256="0jrnr22slgzwsdb4a1jb1l878smhvfb680cgmgb3a88jqj4jfscl"; depends=[]; }; orgR = derive2 { name="orgR"; version="0.9.0"; sha256="1q4qbwnbhmja8rqiph7g7m4wxhzhk9mh91x1jgbnky8bs4ljdgrx"; depends=[data_table ggplot2 ggthemes lubridate stringr]; }; @@ -11731,60 +12234,63 @@ in with self; { orientlib = derive2 { name="orientlib"; version="0.10.4"; sha256="0lds3y05byag466asi8hmv1yfllsdx7z5i8hq21r6dx3w4n4f46x"; depends=[]; }; origami = derive2 { name="origami"; version="1.0.3"; sha256="034h9dnllzllqd0pzx2if69x17gaxfjrfi4ini6gh23asr3krls3"; depends=[abind assertthat data_table future future_apply listenv]; }; originr = derive2 { name="originr"; version="0.4.0"; sha256="0r5aqy5vc3d5r3ln07qs6jbyiglcn4wymljmmrlxflpjw8arw9sn"; depends=[crul data_table jsonlite taxize xml2]; }; - orloca = derive2 { name="orloca"; version="4.9"; sha256="02fqak8s68q522kgvrqqz9rfhpzby0ln032cisjwgk7nlcx4wbjk"; depends=[knitr png rmarkdown ucminf]; }; + orloca = derive2 { name="orloca"; version="4.10"; sha256="113y76gyhslpfyq7n1nnbgnxhxgr213f28vnc3n3b9pghkkr0p4z"; depends=[knitr png rmarkdown ucminf]; }; orloca_es = derive2 { name="orloca.es"; version="4.9"; sha256="00zb08dqcsh1ljl4f2djm1pwbrfbaddgapn3v8nascmwxlhb2hkw"; depends=[orloca]; }; - ormPlot = derive2 { name="ormPlot"; version="0.3.2"; sha256="0sdn7vrc35pl763snfrrcn0fa6i3agr57sjayjz93friijddkcp6"; depends=[ggplot2 gtable rms]; }; + ormPlot = derive2 { name="ormPlot"; version="0.3.4"; sha256="1s38alb602javkizxp3gqkmsq6zvl983gv4bcgd8752fvvddbf4s"; depends=[ggplot2 gtable rms]; }; oro_dicom = derive2 { name="oro.dicom"; version="0.5.3"; sha256="1ar70xk2bqk7jgckfivgp4np3dxaynmgdg41n8x0sg9cpxl2lc38"; depends=[oro_nifti]; }; - oro_nifti = derive2 { name="oro.nifti"; version="0.10.3"; sha256="1w8b7pib0mziz5wpfr9a30aki37b1v5alqmlkxd3fmbhiaygv9cx"; depends=[abind bitops RNifti rticles]; }; + oro_nifti = derive2 { name="oro.nifti"; version="0.11.0"; sha256="1kmlc82gp02v4p62kaxvv55rizbs6znphr0dpka8fl4addgld4si"; depends=[abind bitops RNifti]; }; oro_pet = derive2 { name="oro.pet"; version="0.2.6"; sha256="1dczii7knh9241ksswxk9zg1d69mhk2ilrk4kjv7cj9nfm8fgmja"; depends=[minpack_lm msm oro_dicom oro_nifti]; }; orsifronts = derive2 { name="orsifronts"; version="0.1.1"; sha256="1js4q2s1mn263x8szl5q47ajfxv9lsjd5zyphwyhbkqrnd8ijd3w"; depends=[sp]; }; orsk = derive2 { name="orsk"; version="1.0-5"; sha256="19bpvsdjwjm62a2kfh3xjpqnn39kls656kh832frkqa08bdd7zjk"; depends=[BB BHH2]; }; orthoDr = derive2 { name="orthoDr"; version="0.6.4"; sha256="1h2djq1s67yx1mkc5hl81471q4qwv8z71hmyl5rvbwy8kfyxfc6b"; depends=[dr MASS plot3D pracma Rcpp RcppArmadillo rgl survival]; }; orthogonalsplinebasis = derive2 { name="orthogonalsplinebasis"; version="0.1.6"; sha256="07rbd0fhs2gsk7wj41y2h7wf6pfg324vzv2al753d8kqyx5ns2dj"; depends=[]; }; orthopolynom = derive2 { name="orthopolynom"; version="1.0-5"; sha256="1gvhqx6jlh06hjmkmbsl83gri0gncrm3rkliyzyzmj75m8vz993d"; depends=[polynom]; }; - osDesign = derive2 { name="osDesign"; version="1.7"; sha256="0y68pnsmq4nlmfsn28306q2kxab200pirr6ha0w4himzpnw1sil3"; depends=[]; }; + osDesign = derive2 { name="osDesign"; version="1.8"; sha256="0l5dq8rj4rg4v324610kj2j5nv7py6z1jcplhb6br1gvldj7ng1d"; depends=[]; }; osc = derive2 { name="osc"; version="1.0.5"; sha256="00a0ys5ni0hg5zxi0sr5ak3n4c252vhvd6gynnx1b0lqna7bz9qi"; depends=[raster]; }; osd = derive2 { name="osd"; version="0.1"; sha256="1py9p15nrcydr8w9ilxkxabiz9zlqnls8xn9avjkxd8x6602jx6p"; depends=[JADE nnls]; }; osfr = derive2 { name="osfr"; version="0.2.8"; sha256="1yzi8k6ddr8kfgsliigbwzaiqapqa65ismbvxn30ny6raa4rf2xx"; depends=[crul fs httr jsonlite memoise purrr rlang stringi tibble]; }; oshka = derive2 { name="oshka"; version="0.1.2"; sha256="02hglpq5lknq93zbcf219lhnhppzgygkhxqixb15f89rxf9fczgs"; depends=[]; }; + oskeyring = derive2 { name="oskeyring"; version="0.1.1"; sha256="04i5nbgwwwsi0g94kyyhh29jsfn9jzjn6ihpj0ah8vj6yama152b"; depends=[]; }; osmar = derive2 { name="osmar"; version="1.1-7"; sha256="0q6d8nw7d580bnx66mjc282dx45zw9srczz90b520hjcli4w3i3r"; depends=[geosphere RCurl XML]; }; - osmdata = derive2 { name="osmdata"; version="0.1.3"; sha256="1a57fg8j7ski050l17hv137mlb5ir7qx7212y9d49arbwlh9bpcq"; depends=[curl httr jsonlite lubridate magrittr Rcpp rvest sp tibble xml2]; }; + osmdata = derive2 { name="osmdata"; version="0.1.4"; sha256="019d8yb83w8r67ryd0zi02w0rppm4mv0a8z3wb4vkl58n2xs777m"; depends=[curl httr jsonlite lubridate magrittr Rcpp rvest sp tibble xml2]; }; osmose = derive2 { name="osmose"; version="3.3.4"; sha256="144mklbish59amzz7j95qmn98yqlz3bqzd2rp03wg9f5s69bxjj6"; depends=[fields knitr mgcv ncdf4 rlist rmarkdown stringr]; }; osmplotr = derive2 { name="osmplotr"; version="0.3.2"; sha256="0k5rjxsi1sfcxcl6lf8zcncqnshz2jaz7hcwn2ifg4yhvxvkfma8"; depends=[curl e1071 ggm ggplot2 httr mapproj osmdata rgeos sp spatstat]; }; osqp = derive2 { name="osqp"; version="0.6.0.3"; sha256="1266n04c8zsv4ixf7y25jkccv9lx3rvmd7bnkxynbwga9psd3l0j"; depends=[Matrix R6 Rcpp]; }; - osrm = derive2 { name="osrm"; version="3.3.3"; sha256="1kiy3ij2fkvaxsgbhwn1lvhqav6prsqfi5ipzkihi2piw2gfns2r"; depends=[gepaf isoband jsonlite RCurl sf sp]; }; + osrm = derive2 { name="osrm"; version="3.4.0"; sha256="15gfbjc3iz8vk03i3vqlk0yqvg75vfgjvhw8w561k0s0vx9677l7"; depends=[gepaf isoband jsonlite RCurl sf sp]; }; osrmr = derive2 { name="osrmr"; version="0.1.35"; sha256="1pmsybyqkgpqz0yhfmwrsa2smgmclxzk9mlzcqmm8ph6dcd1x0s8"; depends=[assertthat bitops R_utils rjson stringr]; }; ot = derive2 { name="ot"; version="0.2.0"; sha256="0lym92hsxhfjdkh738rxlpkq084454055vgxm2b4wdhqw00jwf5y"; depends=[]; }; otinference = derive2 { name="otinference"; version="0.1.0"; sha256="1l75jjnkyk8yzaw9zyk45jq9ys304i6pzm2xd5apxrb1jk75a3li"; depends=[MASS Rglpk sm transport]; }; otp = derive2 { name="otp"; version="0.1.0"; sha256="0l0r56kn8jmjxhzz646fimi91blpgpynrrgfd03rh3dbifd5xhdz"; depends=[base64url openssl R6]; }; - otpr = derive2 { name="otpr"; version="0.4.1"; sha256="1b91c83f3061vd2j6ld7pkqdwzdk8hbmrc3lp8f9xjxyfj0krc9n"; depends=[checkmate geojsonsf httr janitor jsonlite sf]; }; - otrimle = derive2 { name="otrimle"; version="1.3"; sha256="1vq2sm3g32cr8x0nzxq9g3zk0qhcd2syzrcvrfx5ncf3i3f9gq5n"; depends=[doParallel foreach mclust]; }; + otpr = derive2 { name="otpr"; version="0.4.2"; sha256="1j4phnx64526ql0wj0lv2jypqs9xx8h3x7xgrlwwn59xhshmghq9"; depends=[checkmate geojsonsf httr janitor jsonlite sf urltools]; }; + otrimle = derive2 { name="otrimle"; version="1.6"; sha256="08s46d5mjkrr2wc91hyrjymay34283vi6pz9lrr09dn0870vrhmw"; depends=[doParallel foreach mclust]; }; otsad = derive2 { name="otsad"; version="0.2.0"; sha256="1jb6raxm70aywbgs7bdyw8vccy1nj924f4hkpjrlgnvzmy0hyhvs"; depends=[ggplot2 plotly reticulate sigmoid]; }; otuSummary = derive2 { name="otuSummary"; version="0.1.1"; sha256="04l667qmp7wqkbdsk87j92gf89s13090kzs8cjlmxsp6i69r34z2"; depends=[reshape2 vegan]; }; otvPlots = derive2 { name="otvPlots"; version="0.2.1"; sha256="0fjx0kl9y77mazwy7lg4mxc9sg8ysvvbl4h3k6bvfpnjm5x62hff"; depends=[data_table ggplot2 gridExtra Hmisc moments quantreg scales stringi]; }; ouch = derive2 { name="ouch"; version="2.14-1"; sha256="0ddf9bw5lhj8vb0ja78jf99i0smq4rgmm842k4a4ygap41vdyn2b"; depends=[subplex]; }; outForest = derive2 { name="outForest"; version="0.1.0"; sha256="0wkji836xrf7izx3ibrf1ylcm4ph766ih3qd7wqjsjfx2cz5bpjr"; depends=[FNN missRanger ranger]; }; outbreaker2 = derive2 { name="outbreaker2"; version="1.1.1"; sha256="01i8abwg3g352nbrpaf8iahsjc4cbpph993x867yyvgj12nvsgs3"; depends=[ape ggplot2 magrittr Rcpp visNetwork]; }; - outbreaks = derive2 { name="outbreaks"; version="1.5.0"; sha256="00369lnh65nfkcbjd5i39irdv2hcwy5cinb2dvv2x4c2q2ax9f0d"; depends=[]; }; + outbreaks = derive2 { name="outbreaks"; version="1.9.0"; sha256="0x6r4rzcvd1rp8j4brq9c0zl2xsl5jfi18dny20an7aqk310p11v"; depends=[]; }; outcomerate = derive2 { name="outcomerate"; version="1.0.1"; sha256="07mwml7r98qjgvrp938sqf7klyspz110583j0zwb72j69n4whmrj"; depends=[Rdpack]; }; outliers = derive2 { name="outliers"; version="0.14"; sha256="0vcqfqmmv4yblyp3s6bd25r49pxb7hjzipiic5a82924nqfqzkmn"; depends=[]; }; - outliertree = derive2 { name="outliertree"; version="1.3.0"; sha256="03wj3fv3ar8yhgh79jlm83psiqbjgc491fslgmh8a23ic3s2q51i"; depends=[Rcereal Rcpp]; }; + outliertree = derive2 { name="outliertree"; version="1.3.1"; sha256="00pllbw9qr15bsv2dbzdx4iqy8yknilwy374il8ygyhx4j7wbgas"; depends=[Rcereal Rcpp]; }; outreg = derive2 { name="outreg"; version="0.2.2"; sha256="04f1x7mxq4swbd7bfwjjgx4838jm6qj4piaighmhcscwrdkxa1cp"; depends=[magrittr reshape2 sandwich stringr tidyr]; }; + outsider = derive2 { name="outsider"; version="0.1.1"; sha256="082yygvjs31clz8b3p59gkc26249gqp8hl1071gm6zi4vi2ng43x"; depends=[crayon curl jsonlite outsider_base remotes tibble yaml]; }; outsider_base = derive2 { name="outsider.base"; version="0.1.3"; sha256="1ai7rm3y2zamg03l7mrhbpa93l5y33g70k5vqyqbhmgx3h3ayj6c"; depends=[callr cli crayon devtools jsonlite praise sys tibble withr yaml]; }; ouxy = derive2 { name="ouxy"; version="2.1"; sha256="0mdjxg7wm68882hbwl0gg15dld6f90xyf0s6hk2z90r34bvyky0i"; depends=[abc adephylo ape coda EasyABC geiger maps MCMCpack nlme phytools Sim_DiffProc TreeSim]; }; - overdisp = derive2 { name="overdisp"; version="0.1.0"; sha256="0j1rr9grzhlma9hgljxhn70ia268pc6f3gbinrlqky3pg73xjg2k"; depends=[]; }; + overdisp = derive2 { name="overdisp"; version="0.1.1"; sha256="0gncmirpiqyxsgpsdrv875i6a9bagpz76vcbqxsaql537m1fd99r"; depends=[]; }; overlap = derive2 { name="overlap"; version="0.3.3"; sha256="17cnr4qin1qy0df4k491267acna12gpbbps6w3gi8nccqxfrb1pd"; depends=[]; }; overlapping = derive2 { name="overlapping"; version="1.6"; sha256="0qy5jw4nn4l6rb36sxd9waz7x4g18q42dsk12hvsnan5jyzcdwfn"; depends=[ggplot2 testthat]; }; overlapptest = derive2 { name="overlapptest"; version="1.1"; sha256="0r732za6lm7dk5r237nhadgbpinaz5dmb6f7pn3mbg0plkdy3mff"; depends=[spatstat]; }; overture = derive2 { name="overture"; version="0.4-0"; sha256="1s16x5kn0apb0w1f7hqzcsqvw3x621y5n6yr1qn7yb7431pdw3cz"; depends=[bigmemory]; }; - overviewR = derive2 { name="overviewR"; version="0.0.4"; sha256="0ccs0zc7bhz1i29f6fv5i32zxl5yrmazyknf7h4i9r0l1xkiixxy"; depends=[dplyr]; }; + overviewR = derive2 { name="overviewR"; version="0.0.7"; sha256="1y8iqgyhppl2w9z59azi3h1kgzrw5a1zqw09zyjp0ghlvpjbn9cn"; depends=[dplyr ggplot2 tibble]; }; owd = derive2 { name="owd"; version="1.0.6"; sha256="08f1zzlnkfdzm5rlw14qm6yvn68j2yas21zjsy31pc59rh3lzkyh"; depends=[]; }; owdbr = derive2 { name="owdbr"; version="1.0.1.1"; sha256="0q4654zr5aw04sssy7127vafry72b7p3d8i44fqvqg3055awin0i"; depends=[data_table dplyr httr jsonlite magrittr tibble]; }; owmr = derive2 { name="owmr"; version="0.8.2"; sha256="0qlb5aw6n06yf8y2gd2fjp8kp3w0xgqh3fka7rxqndgvaqmin1a6"; depends=[httr jsonlite magrittr plyr tibble tidyr]; }; ows4R = derive2 { name="ows4R"; version="0.1-5"; sha256="0zl6nvcrzjcaz43ji2a6ym3mvfzfvf8lyb29hg8sidribr6js3nk"; depends=[geometa httr openssl R6 rgdal sf XML]; }; oxcAAR = derive2 { name="oxcAAR"; version="1.0.0"; sha256="19inf2bcpfj4jzfym1v5f1w5fkmcycz5jrfc2hf0wsvixy53lfxa"; depends=[jsonlite stringr]; }; - oxcovid19 = derive2 { name="oxcovid19"; version="0.1.1"; sha256="13l500giwpzkfv4dss7glzmpkk8iv8dzn0znjmrkplvfq7bv8bqz"; depends=[DBI dbplyr dplyr RPostgres sf]; }; - oysteR = derive2 { name="oysteR"; version="0.0.3"; sha256="1a701jpylk1f55dwrgribf598z1nlk7c0axhx683wjzq50mvgyfm"; depends=[cli dplyr glue httr purrr rjson tibble tidyr]; }; + oxcgrt = derive2 { name="oxcgrt"; version="0.1.0"; sha256="006kdggqdy7nkllln5p7fsapmmn5wlampyw2ifc4ls9jbz0p5h16"; depends=[countrycode dplyr jsonlite magrittr stringr tibble tidyr]; }; + oxcovid19 = derive2 { name="oxcovid19"; version="0.1.2"; sha256="0ax6vg1mcgj03zy47d8pcmlbn538lxhx0l4n9cpqknd7g76l018i"; depends=[countrycode DBI dbplyr dplyr lubridate magrittr RPostgres sf]; }; + oysteR = derive2 { name="oysteR"; version="0.1.0"; sha256="1az9z5daf525bw4hk9qri5n1qfsgnbbm2m2apgpcv479iqgdd4zr"; depends=[cli dplyr glue httr jsonlite purrr rjson rlang stringr tibble tidyr yaml]; }; oz = derive2 { name="oz"; version="1.0-21"; sha256="0p4r8qbpv7q6vad940540pd3lk79pyfj41h2cn22hsy1j0va1qbv"; depends=[]; }; ozmaps = derive2 { name="ozmaps"; version="0.3.6"; sha256="17lh5lgblyryvgk2cman1xwqz5hc0v4s58f3xz36z5qjrcs1599r"; depends=[oz sf tibble]; }; p2distance = derive2 { name="p2distance"; version="1.0.1"; sha256="1ims8i5z5k97kjpdysgx8g7lgvnvf7amahcrssw7bk38bvbxawni"; depends=[]; }; @@ -11797,32 +12303,35 @@ in with self; { pGMGM = derive2 { name="pGMGM"; version="1.0"; sha256="1hkczz38g8a8253jm8vhm8948fs91g6b2rfzkz47srkkby9ksa4x"; depends=[JGL MASS mvtnorm]; }; pGPx = derive2 { name="pGPx"; version="0.1.1"; sha256="0b3pjrk7496nlw1cv5m6yfp02c663452z67y21yhhm26b17nrldv"; depends=[DiceKriging KrigInv pbivnorm pracma randtoolbox Rcpp RcppArmadillo rgenoud]; }; pKSEA = derive2 { name="pKSEA"; version="0.0.1"; sha256="1k9javxbhx28hf5k3i66ggqwlws2w9qwp01g8f7jmyp92pxr3qqd"; depends=[]; }; - pMineR = derive2 { name="pMineR"; version="0.31"; sha256="1j71dcldzmk4kzspx4v5s3vqqkllgwkckfm1g145qgg26c1gyc6l"; depends=[cluster DiagrammeR stringr XML]; }; pRF = derive2 { name="pRF"; version="1.2"; sha256="17srabk7mam16rdzc5g9ggdrhjjk8wibny40gxvgzkv7qgq7m80x"; depends=[dplyr ggplot2 multtest permute randomForest reshape2]; }; pROC = derive2 { name="pROC"; version="1.16.2"; sha256="0apwa5zzqh74pjnvf5a1s5qf6i9r5h44jdllfrwymkd2v479d2xn"; depends=[plyr Rcpp]; }; pRSR = derive2 { name="pRSR"; version="3.1.1"; sha256="1irx95b7cwvx3gpn9brjjn4k947m8frz542r18nilc9f1159mb3s"; depends=[]; }; - pSI = derive2 { name="pSI"; version="1.1"; sha256="0cvw38dqqlyx7cpl27hq33f5xns2d0019lyr98pwndcnbp09mx0b"; depends=[gdata]; }; pa = derive2 { name="pa"; version="1.2-1"; sha256="1pfgzxirkb0p8f6smjlrbp1qpsh0vsvqf306cvldaj9zx8cw0q9f"; depends=[ggplot2]; }; pacbpred = derive2 { name="pacbpred"; version="0.92.2"; sha256="13p405vh9rf1r5idxl5payc85vwlzcd87wm15163vc9gmil1ncsf"; depends=[]; }; pack = derive2 { name="pack"; version="0.1-1"; sha256="0x4p8clwp49s2y67y7in530xwhjngnqwagf9xnyb1jp0z3myd3r7"; depends=[]; }; packClassic = derive2 { name="packClassic"; version="0.5.2"; sha256="04a1sg9vx3r0sq54q9kj0kpahp6my246jy3bivgy09g5fjk0dmkj"; depends=[]; }; + packDAMipd = derive2 { name="packDAMipd"; version="0.1.2"; sha256="0fqpkwajxr4fl484c3yxjb0rzy41rxgz8lnvbcgybvm7alm9ysj9"; depends=[broom car data_table effects flexsurv ggplot2 gvlma IPDFileCheck lme4 lmtest MASS nlme relaimpo reshape2 rlang stringr survival survminer SurvRegCensCov systemfit tm valueEQ5D]; }; packHV = derive2 { name="packHV"; version="2.2"; sha256="0bj7zhlz2283y1hfdqdn7xil4wscwri1f5hszarwjwczx4n5sv81"; depends=[survival WriteXLS]; }; packMBPLSDA = derive2 { name="packMBPLSDA"; version="0.8.0"; sha256="0jn47zhcfssa2rwjh8jc2zc93g766pslxx8vjm0bsnzyzjl2yqb9"; depends=[ade4 DiscriMiner doParallel FactoMineR foreach MASS pROC]; }; packS4 = derive2 { name="packS4"; version="0.9.3"; sha256="0kkh4lfdbr2ydyfpymwrdkms1d4mj8430p6vxvj5wrgl4vh85gwd"; depends=[codetools]; }; packageDiff = derive2 { name="packageDiff"; version="0.1"; sha256="0qxgx2ac0x7p9j9clj7hgjahf7xwzcjkcw0d2n6w0r9c4g0mw9w2"; depends=[diffr htmlwidgets]; }; packageRank = derive2 { name="packageRank"; version="0.3.5"; sha256="03yixgi5xj288fpjdgkywlpxl8d6llry0ppgavxrmm3w3nazwx5h"; depends=[cranlogs data_table ggplot2 memoise pkgsearch R_utils RCurl rversions]; }; - packagefinder = derive2 { name="packagefinder"; version="0.2.1"; sha256="01nfh9han9k6gg59c6qhahfkwl9bi45ncs7mhrp0fkmxw6z21fyh"; depends=[crayon formattable htmlTable httr jsonlite lubridate pander stringr textutils tidyr]; }; + packagefinder = derive2 { name="packagefinder"; version="0.3.2"; sha256="1jskq7w26bjpam1hvyjcmmw08wz2qfzbyhxi5cdkfiiwqy15xkc1"; depends=[clipr crayon formattable htmlTable httr jsonlite lubridate pander reactable rstudioapi shiny shinybusy shinyjs stringr textutils tidyr]; }; + packager = derive2 { name="packager"; version="1.8.0"; sha256="0q93pv6sy9s852mnkzlp96dfpgxf1kbbm2yifq62ldifbmbncfaf"; depends=[callr checkmate codetools crayon cyclocomp desc fakemake git2r httr pkgbuild pkgload rcmdcheck remotes rhub rprojroot usethis whisker whoami withr]; }; packagetrackr = derive2 { name="packagetrackr"; version="0.1.1"; sha256="0xjq27j7bd7lps0vp9gdinxn19wl10k2cp9wb2xjih7p6l0wd57g"; depends=[dplyr httr magrittr rappdirs]; }; - packcircles = derive2 { name="packcircles"; version="0.3.3"; sha256="0gik0splf48zfl40297nh7lbgvd2qqlci99wv841mfy7858ai933"; depends=[Rcpp]; }; + packcircles = derive2 { name="packcircles"; version="0.3.4"; sha256="05pv5c4k4njkr0xw6i6ksiy34hcyx2lbiqpv5gxw81yrkm0rxfyk"; depends=[Rcpp]; }; + packer = derive2 { name="packer"; version="0.0.6"; sha256="0kskfkvpb5x6k3xjljlxjgzymarjsld8gmxq1pxkzmqwydxm1jx8"; depends=[assertthat cli fs htmlwidgets jsonlite rprojroot rstudioapi usethis]; }; packrat = derive2 { name="packrat"; version="0.5.0"; sha256="1xy5dd2hrpqa07jfl4s7dsrya05mf36ms74j833scdz0zf89586n"; depends=[]; }; pacman = derive2 { name="pacman"; version="0.5.1"; sha256="0z7gngd6h83cpjhq1vg75wvzhdjbgjh7gj5d4zvvi9gd2lmagjcy"; depends=[remotes]; }; - paco = derive2 { name="paco"; version="0.4.1"; sha256="0vlvvmkx2yhm28vly68gapzi2rjf7zilnl96hvysip9n8hq4w71d"; depends=[ape plyr vegan]; }; - pacotest = derive2 { name="pacotest"; version="0.3.1"; sha256="0mpdgd8pr7clh5ickz245kqlhh197cnmm8kzxp84fddjb3i1m011"; depends=[ggplot2 gridExtra numDeriv Rcpp RcppArmadillo VineCopula]; }; + paco = derive2 { name="paco"; version="0.4.2"; sha256="0p02fdc5f7d7sbdvxill8jln76p1ndiw95k6s9j41slfriq647vd"; depends=[ape plyr vegan]; }; + pacotest = derive2 { name="pacotest"; version="0.4.0"; sha256="1m52spl856agk5y00s6d7n07sjv775calgpksajdsn1ipjfxs5nk"; depends=[ggplot2 gridExtra numDeriv Rcpp RcppArmadillo VineCopula]; }; pact = derive2 { name="pact"; version="0.5.0"; sha256="043hbydj5f6889xrfsrn8jrgid2nnbsz6d7jpn4hywwa97snw4ny"; depends=[glmnet survival]; }; - padr = derive2 { name="padr"; version="0.5.2"; sha256="0cnsycwd9zpz4apk7rizgyjrg072kqyk4p4q5grdlfzv73ivr7ab"; depends=[dplyr lubridate Rcpp rlang]; }; + padr = derive2 { name="padr"; version="0.5.3"; sha256="1kf457yrdwyl3vkc1y6bzlg8ag11pfzsrjqjnbp3v1vlx2ib4vz7"; depends=[dplyr lubridate Rcpp rlang]; }; paf = derive2 { name="paf"; version="1.0"; sha256="0wrqn67jfrjjxwcrkka6dljgi3mdk00vfjkzzcv2v7c97gx1zvwn"; depends=[survival]; }; pafdR = derive2 { name="pafdR"; version="1.0"; sha256="1yimsd4h23hcf752p5flda3dqk8hgn6qm9k0pmbapxj4jbsw14w5"; depends=[curl exams stringr]; }; - pagedown = derive2 { name="pagedown"; version="0.10"; sha256="15szz0lr5sj8fnxw9pc091m09szdrd4a89vriv07wyblkp6ndpgi"; depends=[bookdown htmltools httpuv jsonlite later processx rmarkdown servr websocket xfun]; }; + pafr = derive2 { name="pafr"; version="0.0.2"; sha256="0ali4m1pv73y88x1dk5rvmg1ysy48janjnc1hnqfcndszfz2b0wm"; depends=[dplyr ggplot2 rlang stringr tibble]; }; + pagedown = derive2 { name="pagedown"; version="0.13"; sha256="0vr6bd2zbghn1v8fflwby59zc1rkya58g86jdrhy4vgpjcqf2wy0"; depends=[bookdown htmltools httpuv jsonlite later processx rmarkdown servr websocket xfun]; }; + pagemap = derive2 { name="pagemap"; version="0.1.1"; sha256="1lf1ppifnnr7j63ii8ihi0x1rw1h7ls8nzxqnkmwnzha3dkhs4nz"; depends=[htmlwidgets]; }; pagenum = derive2 { name="pagenum"; version="1.1"; sha256="0908rlr9sd1a2qwz0idw8ccxhji73sk24gyrdl071lpnd1rs2wl7"; depends=[]; }; pageviews = derive2 { name="pageviews"; version="0.5.0"; sha256="1fhlm2y288wx625y0glxybjb0xv9sqvvln35jqlwqq38h3grcpqd"; depends=[curl httr jsonlite]; }; painter = derive2 { name="painter"; version="0.1.0"; sha256="0qr6p13h50rlavcsamxmijfr4dfrbv1k088m28qf8a4gam3ap85b"; depends=[]; }; @@ -11830,10 +12339,10 @@ in with self; { pairedCI = derive2 { name="pairedCI"; version="0.5-4"; sha256="03wf526n3bbr2ai44zwrdhbfx99pxq1nbng9wsbndrdg2ji4dar2"; depends=[]; }; pairheatmap = derive2 { name="pairheatmap"; version="1.0.1"; sha256="1awmqr5n9gbqxadkblpxwcjl9hm73019bwwfwy1f006jpn050d6l"; depends=[]; }; pairsD3 = derive2 { name="pairsD3"; version="0.1.0"; sha256="0ql6pqijf24pfyid52hmf5fmh4w1ca3sm47z9vknqpnjbn47v8q2"; depends=[htmlwidgets shiny]; }; - pairwise = derive2 { name="pairwise"; version="0.4.5-1"; sha256="01gyr1jiz1v7g1a3gjxsydfr0ff53j5miw8cxj2rdv5yyyy4nvkm"; depends=[]; }; + pairwise = derive2 { name="pairwise"; version="0.5.0-1"; sha256="09knyw09qxccjjrywrk7bvqds4xpim77gsl9hs1hbfa641g82z1c"; depends=[]; }; pairwiseCI = derive2 { name="pairwiseCI"; version="0.1-27"; sha256="0yp9nibdrsddjqq6vdlfbpvmfgm209h99b6qqqd6wgfzng327822"; depends=[boot coin MASS MCPAN mcprofile]; }; - pairwiseComparisons = derive2 { name="pairwiseComparisons"; version="1.1.2"; sha256="1p9i7kzsc0n98yii8sar5jl8jywy66555fghhxs9hh45gxrkbfgr"; depends=[broomExtra dplyr dunn_test forcats ipmisc PMCMRplus purrr rlang tidyBF tidyr WRS2]; }; - pak = derive2 { name="pak"; version="0.1.2"; sha256="05s8rg84w4xhpbaa98p3lgvsnbjrxfbcz5izgkamqa1dw4gdxml4"; depends=[assertthat base64enc callr cli cliapp crayon curl desc filelock glue jsonlite lpSolve pkgbuild pkgcache prettyunits processx ps R6 rematch2 rprojroot tibble]; }; + pairwiseComparisons = derive2 { name="pairwiseComparisons"; version="3.1.1"; sha256="13x870ld98s9dsbzi39y4yc9h550a1nhmh2qcz82a4iqi6x1v14n"; depends=[BayesFactor dplyr ipmisc parameters PMCMRplus purrr rlang WRS2]; }; + pak = derive2 { name="pak"; version="0.1.2.1"; sha256="07x5wa7mkhlzyl6hih9wv91ykjanhh35ng3p439wmxgz6dcdv6sp"; depends=[assertthat base64enc callr cli cliapp crayon curl desc filelock glue jsonlite lpSolve pkgbuild pkgcache prettyunits processx ps R6 rematch2 rprojroot tibble]; }; palaeoSig = derive2 { name="palaeoSig"; version="2.0-3"; sha256="1sn2nbiq037l81qvrqbg7gf1312g8vy574hsfng07qk1jpx7vwkk"; depends=[assertr dplyr forcats ggplot2 ggrepel magrittr MASS mgcv purrr rioja rlang TeachingDemos tibble tidyr vegan]; }; palasso = derive2 { name="palasso"; version="0.0.7"; sha256="1r7kcx0i1xqvqpqwvh5khsv3g0hj3j8f56q9jbya18scywk2ivzg"; depends=[glmnet Matrix survival]; }; paleoMAS = derive2 { name="paleoMAS"; version="2.0-1"; sha256="1hhb5wbj4m3ch8wnvd1zkl5bk6wa9nl6jl1dhm4z6yqkh29yn9z6"; depends=[lattice MASS vegan]; }; @@ -11846,14 +12355,14 @@ in with self; { palettesForR = derive2 { name="palettesForR"; version="0.1.2"; sha256="0nkb0dszj3a9ba7w6kfyn8lxacqsjw60i87p3g2gyl098kjwv7qv"; depends=[]; }; palettetown = derive2 { name="palettetown"; version="0.1.1"; sha256="1kjj1sqib1ns7895plp8c7h317pxwbyxi2shjkcgadkcsv2yjsxn"; depends=[]; }; palinsol = derive2 { name="palinsol"; version="0.93"; sha256="0k29sl2j7yf4yc0dhb047rxwg9np9l6pdwv6wyb4j80yc07vc9am"; depends=[gsl]; }; - palm = derive2 { name="palm"; version="1.1.3"; sha256="1w13a1517h9dqfkc0863fsb08mapx8cafypk3b61djh69hcpbl0v"; depends=[gsl minqa mvtnorm R6 Rcpp spatstat]; }; + palm = derive2 { name="palm"; version="1.1.4"; sha256="1h323py9dgdymih9j2wk4r1kib767z7z84h2c3albxxf9b2hvq4f"; depends=[gsl minqa mvtnorm R6 Rcpp]; }; palmerpenguins = derive2 { name="palmerpenguins"; version="0.1.0"; sha256="0q1k3cdkliq7kwrg1n0vs9b6cjwyfarhlgdijhp9c6riy6y5ik7x"; depends=[]; }; palmtree = derive2 { name="palmtree"; version="0.9-1"; sha256="06438wla5zm2s8vgip15lfy5gmhwh3wkiak8hsylc8zzkvn698cn"; depends=[Formula partykit]; }; palr = derive2 { name="palr"; version="0.2.0"; sha256="0c9fg3kbl2n6m01ck2pmavgxbk953vdxqsc3cw6phnnav93kr5cf"; depends=[]; }; pals = derive2 { name="pals"; version="1.6"; sha256="18bl15figc9mhlvxz71da6s2mzyja6rdb2cpm6h5vya1lpv3snmk"; depends=[colorspace dichromat mapproj maps]; }; pamctdp = derive2 { name="pamctdp"; version="0.3.2"; sha256="0qs8lj5g2fx5rfd0afv76x9x7wqm333qmjv6zzip6pf11dzkghyj"; depends=[ade4 FactoClass xtable]; }; pamm = derive2 { name="pamm"; version="1.121"; sha256="191f0g90s1m3w68mszmdsdv5yw7xd1vsdbwsfvmyydgxn4261pwk"; depends=[lattice lme4 lmerTest mvtnorm]; }; - pammtools = derive2 { name="pammtools"; version="0.2.4"; sha256="1i1pa2p0n3n2lp5bp75i5z9cs05gh2p83hshcp21j76ji6mrdfc5"; depends=[checkmate dplyr Formula ggplot2 lazyeval magrittr mgcv mvtnorm pec purrr rlang survival tibble tidyr vctrs]; }; + pammtools = derive2 { name="pammtools"; version="0.5.4"; sha256="013flafl4h7j52jmp0l9sf6s3bp149xfa1r302ywgclxfkknif9w"; depends=[checkmate dplyr Formula ggplot2 lazyeval magrittr mgcv mvtnorm pec purrr rlang survival tibble tidyr vctrs]; }; pampe = derive2 { name="pampe"; version="1.1.2"; sha256="092n04nrp886kd163v32f5vhp9r7gnayxzqb6pj57ilm5w1yrcsk"; depends=[leaps]; }; pamr = derive2 { name="pamr"; version="1.56.1"; sha256="0ycpgkk23y3zzkb42n2skcyl35ps1n7jmyzfj7pbxr3f6gr2grfh"; depends=[cluster survival]; }; pan = derive2 { name="pan"; version="1.6"; sha256="1dk3jjj826p7xrz10qz04vyc068xnypg7bp0pj4c32z3da0xzh5d"; depends=[]; }; @@ -11863,7 +12372,6 @@ in with self; { panelView = derive2 { name="panelView"; version="1.1.2"; sha256="0kbh2g8yynv2mvvndy89lkm5yhy2hr04z52i2ccv9yfrkyignlfp"; depends=[ggplot2 gridExtra]; }; panelWranglR = derive2 { name="panelWranglR"; version="1.2.13"; sha256="0zj0m08518zi6xsa7qik61ys1qqa2lqiar4l7acclkw58w5zrmbc"; depends=[caret data_table Hmisc]; }; panelaggregation = derive2 { name="panelaggregation"; version="0.1.1"; sha256="0x8ldqb9216pclfvs4ymdpian43v2ydkyflpf0k6lcn35r04xfr6"; depends=[data_table]; }; - panelr = derive2 { name="panelr"; version="0.7.3"; sha256="00ark2hcwvjijm6hyy78lz9992v4i0a8jr0zj336qz8g1nbpsk17"; depends=[crayon dplyr Formula ggplot2 jtools lme4 lmerTest magrittr purrr rlang stringr tibble]; }; panelvar = derive2 { name="panelvar"; version="0.5.2"; sha256="1rr7d0cyz6afxhwqslvcnbfb03cizpfldzwsfnkzxqmxpqasbw80"; depends=[ggplot2 knitr MASS Matrix matrixcalc progress reshape2 texreg]; }; pangaear = derive2 { name="pangaear"; version="1.0.0"; sha256="0i7k1sdhslw33dzpnrmajynq52svg8ri4mxz6aww2cah9y8vxlzl"; depends=[crul hoardr jsonlite oai png tibble xml2]; }; papayar = derive2 { name="papayar"; version="1.0"; sha256="11vkjhazfwfixsr6dba5jrcsr3r3mqgvj5s070b4gp70d6k1z8s5"; depends=[htmltools neurobase oro_nifti servr]; }; @@ -11871,20 +12379,21 @@ in with self; { paperplanes = derive2 { name="paperplanes"; version="0.0.1.9"; sha256="1d9grc95xqxn91lvk8v7w3z90bhl8savkhihwshyjp8ij2xpzfkl"; depends=[]; }; parSim = derive2 { name="parSim"; version="0.1.4"; sha256="0iswcw52skx1hxb9bv9ihhwwyybprsk2615pmijsxp0bkzgsjc88"; depends=[dplyr pbapply snow]; }; parade = derive2 { name="parade"; version="0.1"; sha256="07x02j9jlldz4p0cyhw292041l3pziv56bhbzp4f0qpxhcbn5zn4"; depends=[]; }; - paradox = derive2 { name="paradox"; version="0.4.0"; sha256="1k6xd97781ybldrm0zpnrdg8dal98k5w9psv4vn1s53sla83k1lz"; depends=[backports checkmate data_table mlr3misc R6]; }; + paradox = derive2 { name="paradox"; version="0.6.0"; sha256="1zv0q411wcwigkf4yggs3w2gz48lvv3jhnrddrv40qih8b70ywi3"; depends=[backports checkmate data_table mlr3misc R6]; }; parallelDist = derive2 { name="parallelDist"; version="0.2.4"; sha256="0gqf9vi9hlbflxj941jv7hli8jiy2sqg8b312h401f8rkfqa9ckv"; depends=[Rcpp RcppArmadillo RcppParallel]; }; parallelML = derive2 { name="parallelML"; version="1.2"; sha256="05j0rb81i8342m8drwgmgi1w30q96yf501d83cdq4zhjbchphbl1"; depends=[doParallel foreach]; }; parallelMap = derive2 { name="parallelMap"; version="1.5.0"; sha256="0kjyskwvkqvsyjq55rhypif6z92r33llb7krrhc9f9w68xzp5yja"; depends=[BBmisc checkmate]; }; parallelSVM = derive2 { name="parallelSVM"; version="0.1-9"; sha256="0nhxkllpjc3775gpivj8c5a9ssl42zgvswwaw1sdhwg3cxcib99h"; depends=[doParallel e1071 foreach]; }; + parallelly = derive2 { name="parallelly"; version="1.22.0"; sha256="1nms5zaa83274qz98g03s0w6qch7ibjzz8h7b2p5irbqw61cwwgd"; depends=[]; }; paramGUI = derive2 { name="paramGUI"; version="2.1.4"; sha256="0k2wkl99ji3w7xmd9k7zzvrr3dbf3237q7lxm527dnrq331pmxmi"; depends=[colorspace fields shiny shinydashboard TIMP]; }; - parameters = derive2 { name="parameters"; version="0.8.2"; sha256="0kamszscywvdh4gikl5mmma7s5p7spmhirq3wrgf7x7f4gppbbmh"; depends=[bayestestR insight]; }; + parameters = derive2 { name="parameters"; version="0.10.1"; sha256="1xvjvsdd0hql209f7v2l1nw7gy8jkj5qp0699p5m2h55a01jl778"; depends=[bayestestR insight]; }; paramhetero = derive2 { name="paramhetero"; version="0.2.0"; sha256="16gvs8328bnqvhx47f0xwnmbmlakxmp4ivnjxk2b13z6qjs70ij4"; depends=[ggplot2 ggpubr lme4 survey]; }; paramlink = derive2 { name="paramlink"; version="1.1-2"; sha256="0y6wsrxwyavipmrjjznr2n920w0p6qlwapxc9mnkh9c6w3yznka2"; depends=[assertthat kinship2 maxLik]; }; params = derive2 { name="params"; version="0.6.1"; sha256="0w7k8k7z8p1y2w0dhpfssa868xaikfzfdjw2vlj1yl299k5yisax"; depends=[whisker]; }; paramtest = derive2 { name="paramtest"; version="0.1.0"; sha256="0yn1s1qkgby8x0qn7cy1zhxzc0wyi7bm30pkvijhn5h5afjpylsy"; depends=[boot]; }; paran = derive2 { name="paran"; version="1.5.2"; sha256="0d9la83mxfpfgdfrqa40ck5fcp3j2b70d8c8nl9wmdsgvgqrl23s"; depends=[MASS]; }; parboost = derive2 { name="parboost"; version="0.1.4"; sha256="087b4as0w8bckwqpisq9mllvm523vlxmld3irrms13la23z6rjvf"; depends=[caret doParallel glmnet iterators mboost party plyr]; }; - parcats = derive2 { name="parcats"; version="0.0.1"; sha256="0bf1kqg3954z47cb4n4wv6pf55f1801qlsj1523ac0j3l3i39xn5"; depends=[dplyr easyalluvial forcats htmlwidgets magrittr purrr stringr tibble tidyr]; }; + parcats = derive2 { name="parcats"; version="0.0.2"; sha256="0qh0644a97rvxlz6xlj4210y55m98v6047bp1bmhxsn8m1n21c80"; depends=[dplyr easyalluvial forcats htmlwidgets magrittr purrr stringr tibble tidyr]; }; parcoords = derive2 { name="parcoords"; version="1.0.0"; sha256="15w0g789a2igagfrgv1978ib4ipxpfkid5jpj4q344mpdvgp6ip2"; depends=[crosstalk htmlwidgets]; }; parfm = derive2 { name="parfm"; version="2.7.6"; sha256="1n548gaf62m56n8rlcz1mhpqxikd33vydjwl4wps441drp1dbvs0"; depends=[msm optimx sn survival]; }; parglm = derive2 { name="parglm"; version="0.1.6"; sha256="1264ai64hm3sx3prmy6m24llml3za271w7vrcn7a0xcn1lwmp562"; depends=[Matrix Rcpp RcppArmadillo]; }; @@ -11895,9 +12404,8 @@ in with self; { paropt = derive2 { name="paropt"; version="0.1"; sha256="0934apc1paxsdahf7zywj4aaii7zmgfff7crpjvlmjg4x0pq390v"; depends=[Rcpp RcppArmadillo]; }; parsec = derive2 { name="parsec"; version="1.2.3"; sha256="142zxj34qsf0s537bcabf04yi2qfmy65bgczpkvbyv5vkajxl10v"; depends=[igraph netrankr]; }; parsedate = derive2 { name="parsedate"; version="1.2.0"; sha256="0gb3w6hmwxayhijpf36p5dk4h6bbdps57x3cgikwvvxkgi83rarr"; depends=[rematch2]; }; - parsemsf = derive2 { name="parsemsf"; version="0.1.1"; sha256="0ks4503k06ib5lq4ar2rg0sdni99rjcqxj76b0mclasxbi07kjsa"; depends=[DBI dbplyr dplyr lazyeval RSQLite stringr tidyr]; }; parsetools = derive2 { name="parsetools"; version="0.1.3"; sha256="1d18cdaw90g3362218d5i1j8n30p46drjygfri79sqgxhidb25sz"; depends=[]; }; - parsnip = derive2 { name="parsnip"; version="0.1.3"; sha256="12121qj1800i7g3km5kqzlb7hms55crmp6il575c2i475h5qx8d3"; depends=[dplyr generics globals glue magrittr prettyunits purrr rlang tibble tidyr vctrs]; }; + parsnip = derive2 { name="parsnip"; version="0.1.4"; sha256="1134840xisvkkrbkh5kvx24vxp7sx06124svy573a9m4h8c492sr"; depends=[dplyr generics globals glue magrittr prettyunits purrr rlang tibble tidyr vctrs]; }; partDSA = derive2 { name="partDSA"; version="0.9.14"; sha256="1kp0cdsdjiay349jz22iqfzvspny8s343cfan8xahgf931k9h8p6"; depends=[survival]; }; partialAR = derive2 { name="partialAR"; version="1.0.12"; sha256="0fv1ffgqdbl04b4cmfmvzwah8ms9cxx3dsdralkk92bxxhybcjsl"; depends=[data_table ggplot2 KFAS MASS plot3D Rcpp tseries urca zoo]; }; partialCI = derive2 { name="partialCI"; version="1.2.0"; sha256="0hi936yg4g5bg61ix2i68f8q4c5nvvshl2728ynz1rl970qfcrp7"; depends=[data_table ggplot2 glmnet KFAS MASS partialAR Rcpp TTR zoo]; }; @@ -11910,13 +12418,13 @@ in with self; { partitionMetric = derive2 { name="partitionMetric"; version="1.1"; sha256="1wry9d3s814yp79ayab7rzf8z5l2mwpgnrc5j7d2sac24vp4pd48"; depends=[]; }; partitions = derive2 { name="partitions"; version="1.9-22"; sha256="1qqy4df28wy4q0g572azrj171jlhvrnzbh7x0wr2g7v6gr20y0ns"; depends=[gmp polynom sets]; }; partools = derive2 { name="partools"; version="1.1.6"; sha256="0w7p88y4ab4v14k16k95cyb5f3yl2g6ban11775rmi2h9xqkfxk8"; depends=[data_table pdist regtools]; }; - partsm = derive2 { name="partsm"; version="1.1-2"; sha256="0cv3lgkdkn97bc85iwlv9w5pmqwwwsgb717zxnbgb5mzf4xn3f3g"; depends=[]; }; + partsm = derive2 { name="partsm"; version="1.1-3"; sha256="17md3j41knscllckiqnvkqvf2v0fgsig101vgg6z5ic1yzvzfxgs"; depends=[]; }; party = derive2 { name="party"; version="1.3-5"; sha256="0r0kslgynfzir7rpc6zsm0a1qmi64gg84drbaihq6janzv9kafhw"; depends=[coin modeltools mvtnorm sandwich strucchange survival zoo]; }; - partykit = derive2 { name="partykit"; version="1.2-9"; sha256="18nc6vvj1cy8ly2hqixg544sbg8vbpzwsr1cdlzrqfykd0pzgkvf"; depends=[Formula inum libcoin mvtnorm rpart survival]; }; + partykit = derive2 { name="partykit"; version="1.2-11"; sha256="00n6a74x257m2jk7jadjfxaclihxqpqwh356bgxmq8rag0nk70rs"; depends=[Formula inum libcoin mvtnorm rpart survival]; }; parviol = derive2 { name="parviol"; version="1.1"; sha256="1sfgic86ssd5wjf9ydss9kjd3m4jmm2d1v896sjsv8bydwymbpx3"; depends=[vioplot]; }; - parzer = derive2 { name="parzer"; version="0.1.4"; sha256="09rlqz4vhlg6zl48y2xpm6hdmwc74lcpid3qyha9bvy0gnimz5f4"; depends=[Rcpp]; }; + parzer = derive2 { name="parzer"; version="0.3.0"; sha256="1rqig00a98dg1sn0h133js345hpcxbg93p6drc16a15an39rkkjr"; depends=[Rcpp]; }; pass_lme = derive2 { name="pass.lme"; version="0.9.0"; sha256="1rxm509vnkdvdxii4jwniirdb2pv90rjkf6wjc9zrjh88jrl678k"; depends=[]; }; - passport = derive2 { name="passport"; version="0.2.0"; sha256="1jiwivrz7781zmwxmw13rxl80cr9r5pinnk5bvqz8nhfmlx0zmgd"; depends=[]; }; + passport = derive2 { name="passport"; version="0.3.0"; sha256="176pkc7x76339bawdwywdcmiynzzlrwr91fgf5q0rq7asd9nc7d1"; depends=[]; }; passt = derive2 { name="passt"; version="0.1.1"; sha256="03ymx1bvbz2qwlkxb5iis6k3d3d5fivhcz1w23fwqhgq976zrdj2"; depends=[dplyr magrittr rlang tidyr]; }; password = derive2 { name="password"; version="1.0-0"; sha256="1ijzqdw54l8wvpy6ys28njvhplzjxzzi5i9y41vjnrr88n13977v"; depends=[]; }; pastecs = derive2 { name="pastecs"; version="1.3.21"; sha256="0z4dic94ar646w7zc2ggi5hgvf2qnznsani94c5pyql8zspz47lc"; depends=[boot]; }; @@ -11924,26 +12432,27 @@ in with self; { patPRO = derive2 { name="patPRO"; version="1.1.0"; sha256="1l6q6glklmfgivs4gw0v8q4qa57wr2bna477sn2v401hcwmgnfyn"; depends=[ggplot2 gridExtra plyr RColorBrewer reshape2]; }; patchDVI = derive2 { name="patchDVI"; version="1.10.1"; sha256="14zhl2skj20gc09ycrycdq2slqrpbh6nf0lcsxf55kvshnwnmknc"; depends=[]; }; patchSynctex = derive2 { name="patchSynctex"; version="0.1-4"; sha256="1li3kw7a77sx6dss8pnxzb0p0sdy1kfm1zdnmhhj043zihrryd5p"; depends=[stringr]; }; - patchwork = derive2 { name="patchwork"; version="1.0.1"; sha256="0wm93a40idrkzn5hpnykhznvh7hdbfqw0dkzzn0zk83qlwyc9g02"; depends=[ggplot2 gtable]; }; + patchwork = derive2 { name="patchwork"; version="1.1.1"; sha256="10glgkf58lcykcwda1hj6xdps02m3i247qynk6s2jmwljagps3fg"; depends=[ggplot2 gtable]; }; patentsview = derive2 { name="patentsview"; version="0.2.2"; sha256="003pcddz6adsh893xvlb9d72r316z14nlp3fwm1vbc50hpa24w6z"; depends=[httr jsonlite]; }; + path_chain = derive2 { name="path.chain"; version="0.2.0"; sha256="1p28mcar4krgvkgn02xrlwcpzchnppn2l2k2iwh511c3qrfpy653"; depends=[logger rlang stringi]; }; pathdiagram = derive2 { name="pathdiagram"; version="0.1.9.1"; sha256="018frv1n3x0bf1682jibnm5k2dlkg85xa9mps28l22a0z8bplbv5"; depends=[shape]; }; - pathfindR = derive2 { name="pathfindR"; version="1.5.0"; sha256="1wiqhzqcygd6qy1wpjfnbpbczis4y0bf91r2rgbwxs26cysd5zrb"; depends=[AnnotationDbi DBI doParallel foreach fpc ggplot2 ggraph ggupset igraph KEGGgraph KEGGREST knitr magick msigdbr org_Hs_eg_db pathfindR_data R_utils rmarkdown]; }; - pathfindR_data = derive2 { name="pathfindR.data"; version="1.0.0"; sha256="0yh96rsx6ra5n4mmll3jfshvr3jm91pvlvc4k2igj0ij9xgzsfyy"; depends=[]; }; + pathfindR = derive2 { name="pathfindR"; version="1.6.0"; sha256="0v3474dq26f9nax1mdcqhdka9g7wn5qb8frpdn4lp5mgbwhki9i1"; depends=[AnnotationDbi DBI doParallel foreach fpc ggplot2 ggraph ggupset igraph KEGGgraph KEGGREST knitr magick msigdbr org_Hs_eg_db pathfindR_data R_utils rmarkdown]; }; + pathfindR_data = derive2 { name="pathfindR.data"; version="1.1.1"; sha256="1f4lp3m4c92dks14nxj5h8z609jgx5fhnyy1ng9n842rxry4s9ks"; depends=[]; }; pathlibr = derive2 { name="pathlibr"; version="0.1.0"; sha256="0z8iz765fi1s2770p7dwwv2anihfw86kb5dwg081wb6474wiq6v8"; depends=[glue logging magrittr purrr R6 rlang]; }; pathmapping = derive2 { name="pathmapping"; version="1.0.2"; sha256="0kx4wxf6lhi58sif8fzr5w4wa0i5253fq4v0ynp721fv1hkvmhvz"; depends=[]; }; - pathmodelfit = derive2 { name="pathmodelfit"; version="1.0.4"; sha256="1g791z33289ggwa0dwirdwwl16qddlnm2riijwbcfabfkl7shg6x"; depends=[lavaan]; }; + pathmodelfit = derive2 { name="pathmodelfit"; version="1.0.5"; sha256="1nxcnmz9r99znqmwibvvix7h3acp22cs6wp1jmp21p862ncabll8"; depends=[lavaan]; }; paths = derive2 { name="paths"; version="0.1.0"; sha256="0yyllrcq7p22xj9b60l7pgjsvwqqz9k5mfsa1nmm745sqh3fbahr"; depends=[BART boot gbm ggplot2 metR pryr tidyr twang]; }; - patrick = derive2 { name="patrick"; version="0.0.1"; sha256="16r0q3d9bq06393v46gabn9y9w2w7nqjcl65b7y2ryp35nv0aqsi"; depends=[dplyr purrr rlang testthat tibble]; }; + patrick = derive2 { name="patrick"; version="0.0.3"; sha256="10mmjzn1vi23lcdz3ss0m5yhgln58gbzvq9jzs6lqn9dwy9m3gi0"; depends=[dplyr purrr rlang testthat tibble]; }; patternator = derive2 { name="patternator"; version="0.1.0"; sha256="0s4vrhdfblllnhpz2awhhrkwm8d4170xg7fpsp7kvvqy8z8biwvi"; depends=[data_table]; }; patternize = derive2 { name="patternize"; version="0.0.2"; sha256="0hd6l66ybrjjndad5m2li9qqsjd0k2blhvjm469j6ab95073zq9f"; depends=[abind dplyr imager magrittr Morpho purrr raster rgdal RNiftyReg sp vegan]; }; patternplot = derive2 { name="patternplot"; version="1.0.0"; sha256="0n4y23g894amwi62lx10k15i28rsmiaw52bds8dzmvkykkp9mm8q"; depends=[dplyr ggplot2 gridExtra gtable jpeg png R6 Rcpp RcppParallel]; }; pauwels2014 = derive2 { name="pauwels2014"; version="1.0"; sha256="1b7whn13lgydc69kg1fhnwkxirw0nqq75cfvii0yg0j4p8r1lw42"; depends=[deSolve ggplot2]; }; - pavo = derive2 { name="pavo"; version="2.4.0"; sha256="1f71plrm5j5k66lw0za1a16rfjbl1gq4cwczybrc9rpzz6a0i6li"; depends=[cluster future_apply geometry lightr magick plot3D progressr sp viridisLite]; }; + pavo = derive2 { name="pavo"; version="2.6.1"; sha256="1qpdgj0jn64rp9z7hhki52zs6309lpxdibbciwwnx77fys91l3v6"; depends=[cluster future_apply geometry lightr magick plot3D progressr sp viridisLite]; }; pawacc = derive2 { name="pawacc"; version="1.2.2"; sha256="0d5k0bq8zmb7sjvba3ljp97mba2iycnw44rnsnn2aajs02l1c2xg"; depends=[SparseM]; }; paws = derive2 { name="paws"; version="0.1.9"; sha256="1z7brgfja55ahn9wlsbj2lyb1x12x9ac7j4w81gmkwrm1pmjqldw"; depends=[paws_analytics paws_application_integration paws_compute paws_cost_management paws_customer_engagement paws_database paws_machine_learning paws_management paws_networking paws_security_identity paws_storage]; }; paws_analytics = derive2 { name="paws.analytics"; version="0.1.9"; sha256="03pjswa2xxm693wm2q2gqyl57i2hs8vzvklwd0qxac1mz3hylsg0"; depends=[paws_common]; }; paws_application_integration = derive2 { name="paws.application.integration"; version="0.1.9"; sha256="1y9q4sswl8c3amj2rvgzc3xbvyjfd9b9n7ixmkig078bvi4rg4gw"; depends=[paws_common]; }; - paws_common = derive2 { name="paws.common"; version="0.3.3"; sha256="0yjg6rilm11j2d5x3zyq9nq9x5mpxr4yj4vr4lmv8v3wbjirb6cl"; depends=[base64enc digest httr ini jsonlite xml2]; }; + paws_common = derive2 { name="paws.common"; version="0.3.6"; sha256="08hib48lrk5siv5drrc8c3pah9vcajv75nfmzcv69q28vng8h1yk"; depends=[base64enc digest httr ini jsonlite xml2]; }; paws_compute = derive2 { name="paws.compute"; version="0.1.9"; sha256="1ha8jbz13vzr6qgz28sazfnm0f34wgllmns97zzm2wi4z6x8dqr6"; depends=[paws_common]; }; paws_cost_management = derive2 { name="paws.cost.management"; version="0.1.9"; sha256="0dwk73i1xg0i0kn6vyzl880c18imwj57jhhjwklfa95x4p5cf0mr"; depends=[paws_common]; }; paws_customer_engagement = derive2 { name="paws.customer.engagement"; version="0.1.9"; sha256="0vljkfj133q5mdvmq9dm8yvk8f4mgxhs8pz7shc9ym2bvd7nlffn"; depends=[paws_common]; }; @@ -11957,28 +12466,29 @@ in with self; { pbatR = derive2 { name="pbatR"; version="2.2-13"; sha256="01ra1ggdpxdl1xqjdh86qynr5gkgzw01ww6j9bwgx4mj20i6j1ha"; depends=[rootSolve survival]; }; pbdBASE = derive2 { name="pbdBASE"; version="0.5-3"; sha256="1f90bk1mp1s03177b9g5w5ni77jzrzc1pl3bjx0w0fjbjs1myn79"; depends=[pbdMPI pbdSLAP]; }; pbdMPI = derive2 { name="pbdMPI"; version="0.4-3"; sha256="1mxikhr0qfqksr62v5dxvzgqx07391p7ikjk9g2w4xzrzmxs8fc3"; depends=[float rlecuyer]; }; - pbdNCDF4 = derive2 { name="pbdNCDF4"; version="0.1-4"; sha256="0fd29mnbns30ck09kkh53dgj24ddrqzks4xrrk2hh1wiy7ap1h95"; depends=[]; }; pbdPROF = derive2 { name="pbdPROF"; version="0.4-0"; sha256="174jwrkvw5qz1430y6id01w1czlw45j1yw8a8dyw36knrmvmdz10"; depends=[]; }; pbdRPC = derive2 { name="pbdRPC"; version="0.2-1"; sha256="1pz71zfs9qw96dj3h5mrm734vbbi4drlv9hrw91dbzm3a7jsxg4q"; depends=[]; }; pbdSLAP = derive2 { name="pbdSLAP"; version="0.3-0"; sha256="1jxpgsxkzi3s1qf3g01xma9mqwgi1b22x5lh5xnr78wa0764dyd3"; depends=[pbdMPI rlecuyer]; }; - pbdZMQ = derive2 { name="pbdZMQ"; version="0.3-3"; sha256="1jkfcfhspvqra7vbllrvkz3jx8j7d0ang6zzcdjgpb7200sc29mf"; depends=[]; }; + pbdZMQ = derive2 { name="pbdZMQ"; version="0.3-4"; sha256="0adiac53yq305ymhrds1gas4jm0rn1ddv7c7df5ky2cfhpb4ny87"; depends=[]; }; pbivnorm = derive2 { name="pbivnorm"; version="0.6.0"; sha256="05jzrjqxzbcf6z245hlk7sjxiszv9paadaaimvcx5y5qgi87vhq7"; depends=[]; }; - pbixr = derive2 { name="pbixr"; version="0.1.3"; sha256="01nzi44l1n29sgc19zj33ki7lbrw0zw7ckvap1w0v27h2byg670x"; depends=[dplyr formatR jsonlite stringr textclean xml2 zip]; }; - pbkrtest = derive2 { name="pbkrtest"; version="0.4-8.6"; sha256="0s5xhhrhv5i9680lw6af9lj2x4jc3fygmzzk0jjpxnb8g4b3p1jz"; depends=[lme4 magrittr MASS Matrix]; }; + pbixr = derive2 { name="pbixr"; version="0.1.4"; sha256="098fwmar56l8w5r58grirqypdmc2c4hil7bi11z18llja62fncnw"; depends=[dplyr formatR jsonlite stringr textclean xml2 zip]; }; + pbkrtest = derive2 { name="pbkrtest"; version="0.5-0.1"; sha256="0sgl8r74cknmp8lnq5jvc1w181274ylgk6w4pxf4mzkfii42argm"; depends=[broom dplyr knitr lme4 magrittr MASS Matrix numDeriv]; }; pbm = derive2 { name="pbm"; version="1.1.0"; sha256="054navz4fmn25nq3lsfnsnm35shj9wq4qz69d4ajw0q09gnb1cy8"; depends=[]; }; pbmcapply = derive2 { name="pbmcapply"; version="1.5.0"; sha256="0i58gcqpnbyvc448qfgm45b7rpbmrnagsvk1h1hsqchbbicfslnz"; depends=[]; }; pbo = derive2 { name="pbo"; version="1.3.4"; sha256="0v522z36q48k4mx5gym564kgvhmf08fsadp8qs6amzbgkdx40yc4"; depends=[lattice]; }; pbs = derive2 { name="pbs"; version="1.1"; sha256="0cpgs6k5h8y2cia01zs1p4ri8r7ljg2z4x8xcbx73s680dvnxa2w"; depends=[]; }; pbv = derive2 { name="pbv"; version="0.4-22"; sha256="0658k8ql78y756l15wx0i6gpicgkbczwc6g7dg15i81xy1hg49qb"; depends=[Rcpp RcppArmadillo]; }; - pcFactorStan = derive2 { name="pcFactorStan"; version="1.5.1"; sha256="1g2cxzpq2hqf6mpg4fdzkn009rj4i7r7kkbnabbbmwiay0kvaxg8"; depends=[BH igraph lifecycle loo mvtnorm Rcpp RcppEigen reshape2 rstan StanHeaders]; }; + pcFactorStan = derive2 { name="pcFactorStan"; version="1.5.2"; sha256="0hd042bli63mvgxalagxzhxh5z1gd9vblvih4zx9jcc7jk00g6y9"; depends=[BH igraph lifecycle loo mvtnorm Rcpp RcppEigen reshape2 rstan StanHeaders]; }; pcIRT = derive2 { name="pcIRT"; version="0.2.4"; sha256="0crll51s14nisnaxjln7bc3b1a181v358nfkh1p5iiyn98clacl6"; depends=[combinat Rcpp]; }; - pca3d = derive2 { name="pca3d"; version="0.10.1"; sha256="1fz7p95hhvgzlh1vxlifyzbqccv4rsm7yldzca5p0dwm4rgsdkd4"; depends=[ellipse rgl]; }; + pcLasso = derive2 { name="pcLasso"; version="1.2"; sha256="1gkr1kvm4lrd63jcarv9b7gjjcyyny6z49gvy2rcqg17zfqdxysv"; depends=[svd]; }; + pcSteiner = derive2 { name="pcSteiner"; version="1.0.0"; sha256="14rw7xb6n46ddiyara4i0296p4c16bljrj0j7g3rlnspb95vzvwr"; depends=[igraph]; }; + pca3d = derive2 { name="pca3d"; version="0.10.2"; sha256="0xpln78zdh6q7xff6pj2jaq2kafrijmlikmpnsfar2fzgkaw7jx6"; depends=[ellipse rgl]; }; pcaBootPlot = derive2 { name="pcaBootPlot"; version="0.2.0"; sha256="1320d969znk9xvm1ylhc3a31nynhzyjpbg1fsryq72nhf8jxijaa"; depends=[FactoMineR RColorBrewer]; }; pcaL1 = derive2 { name="pcaL1"; version="1.5.4"; sha256="1myl12537bxwmyicm8v891rflq8g6bhz9j0gcjcqgf9z80y52ayc"; depends=[]; }; pcaPP = derive2 { name="pcaPP"; version="1.9-73"; sha256="1z2kdf9gfp965xbcd4rg6vf20d1bl443na0qjkpq7gmzpaq6cifa"; depends=[mvtnorm]; }; pcadapt = derive2 { name="pcadapt"; version="4.3.3"; sha256="01wvcflfsnlsq23vq03n870fxsab3ab29k26nqlqxw82lbvx99s3"; depends=[bigutilsr data_table ggplot2 magrittr mmapcharr Rcpp rmio RSpectra]; }; pcal = derive2 { name="pcal"; version="1.0.0"; sha256="07119k5f4h9jc48bicl4q5i7bdrkha3rz22r6g44c8ilnkvjhw6j"; depends=[Rdpack]; }; - pcalg = derive2 { name="pcalg"; version="2.6-11"; sha256="1ljwwwrvv3m3qbg33fizr6ykhnfsmdn25xrr4w0rgb4i7l53kgak"; depends=[abind bdsmatrix BH clue corpcor fastICA ggm graph igraph RBGL Rcpp RcppArmadillo robustbase sfsmisc vcd]; }; + pcalg = derive2 { name="pcalg"; version="2.7-0"; sha256="0n2876jbp4ivrjrv15j31f0rd83xn6g7wfnszzq3q011s0vx5hxs"; depends=[abind bdsmatrix BH clue corpcor fastICA ggm graph igraph RBGL Rcpp RcppArmadillo robustbase sfsmisc vcd]; }; pcalls = derive2 { name="pcalls"; version="1.0"; sha256="1vdgvrzfv69p3p5zc9i6gxq53f36s0mia4idzrbsda661f1bhmxk"; depends=[]; }; pccc = derive2 { name="pccc"; version="1.0.5"; sha256="0jh8yadks76ip9jmgvld9nycdm74f5gllkyhfmnrir8vi6xwvbad"; depends=[dplyr Rcpp]; }; pcdpca = derive2 { name="pcdpca"; version="0.4"; sha256="0ys4hrin0w3f87d1d986wvrfkfwapzj9hz7d7v92r60ns74g7r5m"; depends=[fda freqdom]; }; @@ -11988,16 +12498,17 @@ in with self; { pcg = derive2 { name="pcg"; version="1.1"; sha256="194j72hcp7ywq1q3dd493pwkn1fmdg647gmhxcd1jm6xgijhvv87"; depends=[]; }; pcgen = derive2 { name="pcgen"; version="0.2.0"; sha256="1v2fmxbj9gz5sg0hizw03ad8cfm9v25708h7fvnf6gb42b2mmyb3"; depends=[ggm graph Hmisc lme4 MASS Matrix pcalg sommer]; }; pch = derive2 { name="pch"; version="1.4"; sha256="0vfx0jirmfcy47l6xw1yvss68624605378cpqc58ygllwddcqz1y"; depends=[survival]; }; - pchc = derive2 { name="pchc"; version="0.1"; sha256="02q5vlj7qrv76ja92kdg0cl47vdfdda3r8d2qz86d2vvpz4qnfv8"; depends=[bnlearn Rfast robustbase]; }; + pchc = derive2 { name="pchc"; version="0.3"; sha256="14vlj4y996nakl830sr932lrlbj32a6abk25d3snv5gfagqjjbx2"; depends=[bigmemory bigstatsr bnlearn Rfast Rfast2 robustbase]; }; pcmabc = derive2 { name="pcmabc"; version="1.1"; sha256="1x4qvs5v134z93j1r3zg08kynqyhgd2yc3y2vk0vif8mabvx3zv4"; depends=[ape mvSLOUCH phangorn TreeSim yuima]; }; - pcnetmeta = derive2 { name="pcnetmeta"; version="2.6"; sha256="0rpd1bgg932xhj03fnskhbg7ni9nfd8qrvxvix8qmbgw8bwdsbgd"; depends=[coda rjags]; }; + pcnetmeta = derive2 { name="pcnetmeta"; version="2.7"; sha256="0jibi4wylxkisgj740xbibjqs60d5xg9my4sx7vshgfl941y9wcv"; depends=[coda rjags]; }; pco = derive2 { name="pco"; version="1.0.1"; sha256="0k1m450wfmlym976g7p9g8arqrvnsxgdpcazk5kh3m3jsrvrcchf"; depends=[]; }; pcr = derive2 { name="pcr"; version="1.2.2"; sha256="1lmgm8k3s7780ivrdj0zk1ninx7b5jffir6q5p2p47h62qqjmp5d"; depends=[ggplot2]; }; pcse = derive2 { name="pcse"; version="1.9.1.1"; sha256="1rb9146vjkf36vc5v3frykmsff7kp6qp1hhmj8pak583in4rz8f8"; depends=[]; }; - pct = derive2 { name="pct"; version="0.4.1"; sha256="0j554xrb8pd1lsxc10d75k21q5yvfr3l9xawl4vzj1gw3cs2axpx"; depends=[boot readr sf stplanr]; }; - pcts = derive2 { name="pcts"; version="0.14-4"; sha256="0c5r71d6c08g5v5cwvy93fwp1lhmqh99azq8nn1ikfxadi7kndln"; depends=[BB gbutils lagged ltsa lubridate Matrix mcompanion PolynomF Rdpack sarima zoo]; }; + pct = derive2 { name="pct"; version="0.7.0"; sha256="1q4y4zyz6z1rq43b92f1nbaq54kr15bzi29wxp3xq07w9kfvc3p4"; depends=[boot readr sf stplanr]; }; + pcts = derive2 { name="pcts"; version="0.15"; sha256="1wl3hgj0sn9128vwcqin37jn5ww3na4g7r1isj39j6m2v76s3ndk"; depends=[BB gbutils lagged lubridate Matrix mcompanion PolynomF Rdpack sarima xts zoo]; }; pdR = derive2 { name="pdR"; version="1.7"; sha256="05rnyb9znb71ilr9kf62x30knby1rm0p4ain220wvb62vkz054d7"; depends=[boot car coefplot lmtest papeR plm sandwich]; }; pdSpecEst = derive2 { name="pdSpecEst"; version="1.2.4"; sha256="1sf2d7vh7a1qc0cq230an8pzg9qi9g640z0ql8x2pp9wfawfzn1f"; depends=[ddalpha multitaper Rcpp RcppArmadillo Rdpack]; }; + pda = derive2 { name="pda"; version="1.0-2"; sha256="1y067d3v9qlirawy01nmsh4fdynfh80mvg9r55kkban2z7xhql9j"; depends=[data_table httr jsonlite Rcpp RcppArmadillo rvest survival]; }; pdc = derive2 { name="pdc"; version="1.0.3"; sha256="0503n7aiy0qrl790yfjvpm7bbyz1i4818rlg96q0fvzb58zqmyvc"; depends=[]; }; pder = derive2 { name="pder"; version="1.0-1"; sha256="147fc5swmh0qrg7k3q3gpnvl9f7hhjjzwi8f5dc4fkyj14qi5bm5"; depends=[]; }; pdfCluster = derive2 { name="pdfCluster"; version="1.0-3"; sha256="13m7b2wivvf58vyqbysj4r04w0nj2b5x0xnaxip712a6c66x1h7l"; depends=[geometry]; }; @@ -12006,21 +12517,22 @@ in with self; { pdfsearch = derive2 { name="pdfsearch"; version="0.3.0"; sha256="0mk1s8b7cdz025xn9kg5xnw388sndhjm80ckf71daxviknrzcscf"; depends=[pdftools stringi tibble tokenizers]; }; pdftables = derive2 { name="pdftables"; version="0.1"; sha256="1gnwjijr89cczchc7yi4w5xiw0dalbymvj23rymm8cfra34iwn5p"; depends=[httr]; }; pdftools = derive2 { name="pdftools"; version="2.3.1"; sha256="01i5g2mjkshis0zlm7lrvi7kkzl4dn3if1hzwkgzf9n2mi33ndsx"; depends=[qpdf Rcpp]; }; + pdi = derive2 { name="pdi"; version="0.4.1"; sha256="1az6q407x9src6j0ax9q228s764knrlv5rnllvl8s3z9q071315q"; depends=[dplyr magrittr purrr randomForest readxl stringr tibble tidyr tidyselect]; }; pdist = derive2 { name="pdist"; version="1.2"; sha256="18nd3mgad11f2zmwcp0w3sxlch4a9y6wp8dfdyzvjn7y4b4bq0dd"; depends=[]; }; pdmod = derive2 { name="pdmod"; version="1.0.1"; sha256="04bk9gjg2c55hk6k1hy0m29927s8a5ig6mr4xb89npam68g0pcms"; depends=[mco]; }; pdp = derive2 { name="pdp"; version="0.7.0"; sha256="0wcszaq4c14f9a2r1gd32mzhs035jlg2w8mkfklzigcj7fv9xmi8"; depends=[ggplot2 gridExtra lattice magrittr mgcv plyr viridis]; }; pdqr = derive2 { name="pdqr"; version="0.2.1"; sha256="1444r51lh66kmhvkp8ivr95zlnxfgv28whl0axwb56hf5vi44lp9"; depends=[]; }; pds3 = derive2 { name="pds3"; version="0.5.0"; sha256="1hipi4ygk30khrrslxq3m9qdichazhrl34k444shs7gi6wjx9ilr"; depends=[rly]; }; pdxTrees = derive2 { name="pdxTrees"; version="0.4.0"; sha256="0cw1zrkawc2wnbd2pif8732kl92qvklxvx6hnikx3siz22psvbl8"; depends=[dplyr magrittr rlang]; }; - pdynmc = derive2 { name="pdynmc"; version="0.9.1"; sha256="168kicv1h93qhyzvbr681pbnysz1b42sj2ivzsfnfg711w0bp935"; depends=[data_table MASS Matrix optimx qlcMatrix Rdpack]; }; + pdynmc = derive2 { name="pdynmc"; version="0.9.3"; sha256="07376gf5i98sf4k8dmd1yrw0h7nhdd39qdjbrz1916dwm45psmga"; depends=[data_table MASS Matrix optimx qlcMatrix Rdpack]; }; peRiodiCS = derive2 { name="peRiodiCS"; version="0.5.0"; sha256="1366gmn6qfciwcjsfnbl3hfa16ffn11g00fm0kv74ilvm3nnawk3"; depends=[Hmisc rms]; }; peRspective = derive2 { name="peRspective"; version="0.1.0"; sha256="1zz3znzaa80k60jddys5fhxwx4c8lyqymx5fw2zvj654rnk0mmzc"; depends=[crayon dplyr glue httr jsonlite magrittr purrr rlang rlist stringr tibble]; }; + peacesciencer = derive2 { name="peacesciencer"; version="0.1.0"; sha256="12sqpqcljhls899d7mnlma1iqbqhg815nkjxb9zwjhjljynxh1i9"; depends=[countrycode dplyr geosphere lubridate magrittr rlang stringr tibble tidyr]; }; peacots = derive2 { name="peacots"; version="1.3"; sha256="128qpz06b0giz80lp9yq9l6pxcjglfr97yickg7z64vzzl2jilmq"; depends=[]; }; peakPick = derive2 { name="peakPick"; version="0.11"; sha256="1zf7ff9arm4hkdxrfhb0p8p7npd51icy773g2raaqsfys825xwhm"; depends=[matrixStats]; }; peakRAM = derive2 { name="peakRAM"; version="1.0.2"; sha256="0mj7f8jqkfky61xag2km0svbgvfmif3c1d8ccav6pv1963cg3cvv"; depends=[]; }; - pear = derive2 { name="pear"; version="1.2"; sha256="1ixmyzm72s18qrfv2m8xzh5503k1q90lhddq4sp46m0q7qyxb192"; depends=[]; }; pearson7 = derive2 { name="pearson7"; version="1.0-3"; sha256="0vdhhds1lngaff7dkx4b1az3syqw8b22w2jskcrw0m49wp1dbbha"; depends=[]; }; - pec = derive2 { name="pec"; version="2019.11.03"; sha256="1h6fk3k9w61a9xqhvkm1zdv75nsl06n78036qvcxkcf0bkfxl360"; depends=[foreach prodlim rms survival timereg]; }; + pec = derive2 { name="pec"; version="2020.11.17"; sha256="1g2mmnw4i5bm4r1krn7fmjbijx8fawmxmzcjh1l8qd8f79bxzh42"; depends=[foreach lava prodlim riskRegression rms survival timereg]; }; pedSimulate = derive2 { name="pedSimulate"; version="0.0.4"; sha256="0dz92cwnkb6vwkr18rkxil6cizfib522wxs1agbhz6dx0kv9xbhn"; depends=[]; }; pedgene = derive2 { name="pedgene"; version="3.3"; sha256="0y6kr5ad4fmxljsj0czs9h1dkz63wvqiira9ibgsf0707xb0vh7f"; depends=[CompQuadForm kinship2 Matrix survey]; }; pedigree = derive2 { name="pedigree"; version="1.4"; sha256="1dqfvzcl6f15n4d4anjkd0h8vwsbxjg1lmlj33px8rpp3y8xzdgw"; depends=[HaploSim Matrix reshape]; }; @@ -12028,10 +12540,10 @@ in with self; { pedigreemm = derive2 { name="pedigreemm"; version="0.3-3"; sha256="1bpkba9nxbaxnivrjarf1p2p9dcz6smf9k2djawis1wq9dhylvsb"; depends=[lme4 Matrix]; }; pedmut = derive2 { name="pedmut"; version="0.2.0"; sha256="0851r4yl5n1mf8pk3nik5kcnv12ffxc1hl1wxp6b81qz5lbfwxaf"; depends=[]; }; pedometrics = derive2 { name="pedometrics"; version="0.7.0"; sha256="0rqldc67yrcg16i5q9wrmfmh3lw3qrfdxwdb4mxkjxx18v4fv737"; depends=[lattice latticeExtra Rcpp]; }; - pedprobr = derive2 { name="pedprobr"; version="0.3"; sha256="0inxlspq2khcv7r60rgavjh6ajyxbafddmwdgpn39klwp7h6yzcb"; depends=[pedmut pedtools]; }; - pedquant = derive2 { name="pedquant"; version="0.1.5"; sha256="01kmagaapx5qlvar0l862rl8s1caqzdld3qjygxi9zl232042x89"; depends=[curl data_table ggplot2 gridExtra httr jsonlite readr readxl rvest scales stringi TTR xml2 zoo]; }; - pedtools = derive2 { name="pedtools"; version="0.9.5"; sha256="1h43jpxxyzmjh8acqcqfx7m2xdxnwqy92ph93hqwng4fqvfpva39"; depends=[kinship2]; }; - pegas = derive2 { name="pegas"; version="0.13"; sha256="002i7s4g0nhnq0v05gs0yssqiyhpq2f7rw2rhn31hsbgxc86frvy"; depends=[adegenet ape]; }; + pedprobr = derive2 { name="pedprobr"; version="0.4.0"; sha256="0hsz7pdj6hkr91m5x5as0dyv6gn2swf2ld3rangk55z58pngcbr0"; depends=[pedmut pedtools]; }; + pedquant = derive2 { name="pedquant"; version="0.1.6"; sha256="1hjiqsbdcca4pk36rapndpa3awcv2jlql0g1qk66vplnlg5d6zwl"; depends=[curl data_table ggplot2 gridExtra httr jsonlite plotly readr readxl rvest scales stringi TTR xml2 zoo]; }; + pedtools = derive2 { name="pedtools"; version="0.9.6"; sha256="0rjr2d1qml7y5sl3mppy40ncx5hzf0kazrxcflssv922vxb4h565"; depends=[kinship2]; }; + pegas = derive2 { name="pegas"; version="0.14"; sha256="0lr06gajzdanj8ax91kgpxsj863m367v2s1z5gnxps3999n0xybx"; depends=[adegenet ape]; }; pems_utils = derive2 { name="pems.utils"; version="0.2.26.4"; sha256="13d5cg2wdz84inby017bra6xzwhkp5qcy1b213r387fq771h2xrx"; depends=[baseline dplyr ggplot2 lattice latticeExtra loa RColorBrewer Rcpp rlang]; }; penDvine = derive2 { name="penDvine"; version="0.2.4"; sha256="0znpvsr7zy2wgy7znha1qiajcrz1z6mypi3f5hpims33z7npa7dl"; depends=[doParallel fda foreach lattice latticeExtra Matrix quadprog TSP]; }; penMSM = derive2 { name="penMSM"; version="0.99"; sha256="1xdcxnagvjdpgnfa5914gb41v5y4lsvh63lbz1d2l8bl9mpff3lm"; depends=[Rcpp]; }; @@ -12040,23 +12552,24 @@ in with self; { penalizedLDA = derive2 { name="penalizedLDA"; version="1.1"; sha256="1bw5wiixmmg1vr3v0d59vh67f0gy2rvr30bi58skvrkb25qcjq6l"; depends=[flsa]; }; penalizedSVM = derive2 { name="penalizedSVM"; version="1.1.2"; sha256="03zw95bc6svbnzak9x72s3b8l9gh581mxn2di1fl89gxlh864amd"; depends=[corpcor e1071 lhs MASS mlegp statmod tgp]; }; penaltyLearning = derive2 { name="penaltyLearning"; version="2020.5.13"; sha256="0297rp5zn6d0axl44i3baq2vqvhrx6s8irrysvqdcx1rkishf4j0"; depends=[data_table ggplot2]; }; + pencal = derive2 { name="pencal"; version="0.1.2"; sha256="03z3yz5n8ds6lhx8qh4mxy34hxv3csv1iwwv214lrg92dpzz9ns4"; depends=[doParallel dplyr foreach glmnet MASS nlme ptmixed survcomp survival survivalROC]; }; pencopulaCond = derive2 { name="pencopulaCond"; version="0.2"; sha256="18hjjxnd0l2ms20ddqkghfbd4as5kq2rgwqzpz4y38k6nw76x511"; depends=[doParallel fda foreach igraph lattice latticeExtra pacotest quadprog TSP]; }; pendensity = derive2 { name="pendensity"; version="0.2.13"; sha256="1wcsib7m2161nqqrmgdvrj7lr8zq6njc9xr935hwfh3qbbgkmfjb"; depends=[fda lattice]; }; - pense = derive2 { name="pense"; version="1.2.9"; sha256="0ls573kx3z09v848fi5pvidc5l2dhmqv9vvyjspzzfiff3z6w09i"; depends=[Matrix Rcpp RcppArmadillo robustbase]; }; + pense = derive2 { name="pense"; version="2.0.2"; sha256="0xfpb23wzjiqzcn391y9h5f9jlzi8jfpps5y77sy689lkcazmm3r"; depends=[lifecycle Matrix Rcpp RcppArmadillo rlang]; }; pensim = derive2 { name="pensim"; version="1.3.2"; sha256="12rh9n6jjnlzjsdjjw60ams7l0n05skwkbql5d0jqrmpbxrca6rp"; depends=[MASS penalized]; }; peperr = derive2 { name="peperr"; version="1.1-7.1"; sha256="12k9crhsv3p4zrcbyr85cfwp68z3r1w2kb62g7jb7h311c7zykjx"; depends=[snowfall survival]; }; peppm = derive2 { name="peppm"; version="0.0.1"; sha256="1lvk1rjsx39mb93s9pclriw4fmf1sx05s59qqx5m3aqb4q8ffxkg"; depends=[Rcpp]; }; - pepr = derive2 { name="pepr"; version="0.3.2"; sha256="1mfs31d050z6yq3gm5gnh3z3pngjm9nin16629s96wj5h0q9q58k"; depends=[data_table pryr stringr yaml]; }; + pepr = derive2 { name="pepr"; version="0.4.0"; sha256="0mnigx4lpl397k526sxp7ckrnp59hfrnm9gqcq0nx6j5d7379sp9"; depends=[data_table pryr stringr yaml]; }; peptider = derive2 { name="peptider"; version="0.2.2"; sha256="109z81x6jcsx2651lclff7ak55zb1i89pyi58rxri40aamx4b1x2"; depends=[discreteRV dplyr plyr]; }; pequod = derive2 { name="pequod"; version="0.0-5"; sha256="0mwrgyrxgiifpnpy15qxpdrdmd7dxqihccrnj5nh8fq9fvwymamg"; depends=[car ggplot2]; }; perARMA = derive2 { name="perARMA"; version="1.6"; sha256="0k70lcqhiiffrwzvh51asnhx68qxpnjnxadarvgpgbc7kfy7lv9x"; depends=[corpcor gnm matlab Matrix signal]; }; perccal = derive2 { name="perccal"; version="1.0"; sha256="1akak068d0g70amj5sbvnqbywzy21l4wz11mhp71b7cp4xmr9n12"; depends=[Rcpp RcppArmadillo RcppEigen]; }; perccalc = derive2 { name="perccalc"; version="1.0.5"; sha256="14557k7khc3l5m0vlam0fvbsb6p78v9gfcnx5ksxcvrab28xj7p3"; depends=[multcomp tibble]; }; perfectphyloR = derive2 { name="perfectphyloR"; version="0.2.0"; sha256="00gvmn66lb9hfli7yc3l5913xpngib1vksg5zjnxqxiwdibjfqx8"; depends=[ape phytools Rcpp RcppArmadillo]; }; - performance = derive2 { name="performance"; version="0.4.8"; sha256="1gl3m1pw0wrj9m9cgd0vzbj9swfwjg4aa40gpliplb9y7dcmgi4l"; depends=[bayestestR insight]; }; + performance = derive2 { name="performance"; version="0.6.1"; sha256="0wz2zc98r99pg6r4l09qxxzv1fwxwp1md6wmhay401568kd8h5zn"; depends=[bayestestR insight]; }; performanceEstimation = derive2 { name="performanceEstimation"; version="1.1.0"; sha256="08jx2zl6xh0rp54xa70gb717wbfdzfrx9b47i3b3ly41qaf85vrc"; depends=[dplyr ggplot2 parallelMap tidyr]; }; pergola = derive2 { name="pergola"; version="1.0"; sha256="1650ipp2b455xdkznwm7bnxvimad7nbyr9i1lg2vdh64j1qfh7gl"; depends=[seriation]; }; - periscope = derive2 { name="periscope"; version="0.5.1"; sha256="1l9ryvj7spvl63c99flwj8k1mf4jksg7030hr3cv8xvr7830lf41"; depends=[DT ggplot2 lubridate openxlsx shiny shinyBS shinydashboard shinydashboardPlus]; }; + periscope = derive2 { name="periscope"; version="0.5.2"; sha256="0w8yjmvmfp9pakcbc3cjjgszy13py50fadpzslrjfwzmdx7d5vvl"; depends=[DT ggplot2 lubridate shiny shinyBS shinydashboard shinydashboardPlus writexl]; }; perm = derive2 { name="perm"; version="1.0-0.0"; sha256="0075awl66ynv10vypg63fcxk33qzvxddrp8mi4w08ysvimcyxijk"; depends=[]; }; permGPU = derive2 { name="permGPU"; version="0.14.9"; sha256="10r2qxbvzjxv3520lrn6cwi5akhhwgkhz7yaqxi5vh2f5l0s49wy"; depends=[Biobase foreach RUnit survival]; }; permGS = derive2 { name="permGS"; version="0.2.5"; sha256="0d2kp3c1fmnjjmsvc2qwh6m66yqvy2vrrxgv1fj2i4clsbavfa0y"; depends=[coin survival]; }; @@ -12064,25 +12577,29 @@ in with self; { permimp = derive2 { name="permimp"; version="1.0-0"; sha256="0nkl5xga2w79mb7p2zyvznhkmjai1k5zsf1kpfjz1p44xd8ypn13"; depends=[ipred party randomForest survival]; }; permubiome = derive2 { name="permubiome"; version="1.3.1"; sha256="0a4swfkmqqr8a1psc6rlnxnpm43fj42gjkikcqy8d84wrfz2wrr9"; depends=[dabestr ggplot2 gridExtra Matrix rlang]; }; permuco = derive2 { name="permuco"; version="1.1.0"; sha256="1mp3yp4p1b382c31a3jcmq1n90zvb1lggacb3zdblpmz1yrj4v1c"; depends=[Matrix permute]; }; - permutations = derive2 { name="permutations"; version="1.0-6"; sha256="1bygr2fa2qjka4bbx9i6l1iiy15anz427y3zh8hdq0r21aygmi7v"; depends=[magic numbers partitions]; }; + permutations = derive2 { name="permutations"; version="1.0-9"; sha256="1701jah8i9frw3cbqlri2l56lansw54l3pp9h1fy36a8ahhcllkg"; depends=[magic numbers partitions]; }; permute = derive2 { name="permute"; version="0.9-5"; sha256="0ra8p5mf2590azrkas8z2ry7mif77xqxd29n4zgyi5vll225726j"; depends=[]; }; permutes = derive2 { name="permutes"; version="1.0"; sha256="1lrhlqwv1y2vgklgwp16jw90vmgifnp4rlxw55hhj8gs97agv5y8"; depends=[ggplot2 lmPerm plyr viridis]; }; perry = derive2 { name="perry"; version="0.2.0"; sha256="1lfmcq2xsxmfs7cxvhgxcsggslgjicbaks4wcjw1yjh67n559j46"; depends=[ggplot2 robustbase]; }; persiandictionary = derive2 { name="persiandictionary"; version="1.0"; sha256="0rgi36ngpiax3p5zk4cdgf3463vgx7zg5wxscs2j7834yh37jwax"; depends=[]; }; personalized = derive2 { name="personalized"; version="0.2.5"; sha256="073mi3g0khba1s8wz01h1xc0zxq0yr05nflf15nss2rv7lh2qazb"; depends=[foreach gbm ggplot2 glmnet kernlab mgcv plotly survival]; }; + personalized2part = derive2 { name="personalized2part"; version="0.0.1"; sha256="104flqjyf0x0619msyc0vlkg61znvhf0v86fsdpksdxkgwb7wv7j"; depends=[foreach HDtweedie personalized Rcpp RcppEigen]; }; + personalr = derive2 { name="personalr"; version="1.0.1"; sha256="119askhfcb7jb5zvckk4vq51jsnzrqxrang7i2lgvszqwd9s35f1"; depends=[desc devtools fs glue magrittr purrr rprojroot rstudioapi usethis withr xfun]; }; personograph = derive2 { name="personograph"; version="0.1.3"; sha256="07lrlbw4222l1d5rwn0hfqliyk8sqjf6ipz4n2zwcbk113bb8sy7"; depends=[grImport]; }; personr = derive2 { name="personr"; version="1.0.0"; sha256="12iyzdc2kksy74npzdgy19lnhm9l9c7f4lkwshmsp6by09kb2dm3"; depends=[ggplot2 rlang rmarkdown shiny whisker]; }; perspectev = derive2 { name="perspectev"; version="1.1"; sha256="175s1nq5z4gfs5qb39lq230g6n0v8fxzs5hr9j2rgx0knpbjfq03"; depends=[ape boot doParallel foreach ggplot2 mapproj sp]; }; - perturb = derive2 { name="perturb"; version="2.10"; sha256="07c84x67hzyr70zkmd00f4gxqzcrpizc7w7h2hs22xy6p719a5i2"; depends=[gdata]; }; perturbR = derive2 { name="perturbR"; version="0.1.3"; sha256="1sdk5ls8x66lds4cy40xbl383px4xmrh21cw4bgy83rzbjjzwp2h"; depends=[ggplot2 igraph]; }; + peruse = derive2 { name="peruse"; version="0.1.0"; sha256="04bg6pcljqcm4y8yv9yans99rl02ij2ffk7zk5gpfykcwdzrdrmc"; depends=[magrittr purrr R6 rlang]; }; pesel = derive2 { name="pesel"; version="0.7.3"; sha256="125rgbar1aiw7x3ywfb09s3gh3k0zal0p44h4928d854mn4m986s"; depends=[]; }; petitr = derive2 { name="petitr"; version="1.0"; sha256="0i13zhdrdka0ij0khdzj6ylvvcn4wxvplb8a368i1s64cpgak30c"; depends=[]; }; petrinetR = derive2 { name="petrinetR"; version="0.2.1"; sha256="0h9nsjsj87b6qvvkg81kn0j2c4xkzq89sddp9l6pjh636bdqwf8i"; depends=[DiagrammeR dplyr purrr visNetwork xml2]; }; petro_One = derive2 { name="petro.One"; version="0.2.3"; sha256="1xky85vfk2mpj8xxdqggismzirm3rx2wr51g12zr80i1dx5wak4i"; depends=[cluster data_table dplyr ggplot2 graph magrittr RColorBrewer Rgraphviz rvest RWeka SnowballC tibble tm urltools wordcloud xml2]; }; pewdata = derive2 { name="pewdata"; version="0.3.1"; sha256="1dn6v41kwrs8dj66063y7l6vryih2q49qcfvmhaiaxzvbpzymiyc"; depends=[foreign magrittr purrr rio RSelenium stringr]; }; pexm = derive2 { name="pexm"; version="1.0.0"; sha256="1043pqn4irpmjv2ywqfpmp45lmx6ad2rr15cnr5sizxg9bjl1vjv"; depends=[coda msm rjags]; }; - pez = derive2 { name="pez"; version="1.2-1"; sha256="1wnnyxxg1b8ay96wfb5dfq3kbikgcmxa48pgidj8cb54mjlw8nyg"; depends=[ade4 animation ape apTreeshape caper FD Matrix mvtnorm phytools picante quantreg vegan]; }; + pez = derive2 { name="pez"; version="1.2-2"; sha256="1c9gicg1g85x29y5kh2fkp0c2r923wc00hdw1b9rzfv0hgscbcxb"; depends=[ade4 animation ape caper FD Matrix mvtnorm phytools picante quantreg vegan]; }; pfa = derive2 { name="pfa"; version="1.1"; sha256="0ikdd7ps8wnjp9nm66w447m06hqxnnk553jglxikl2w5d9vk6b31"; depends=[lars POET quantreg]; }; + pfica = derive2 { name="pfica"; version="0.1.1"; sha256="04gq5zwsqf33gv73k4mh74cn149jqzk1qq922zv2bpd2dva1xdn2"; depends=[corpcor fda moments]; }; + pflamelet = derive2 { name="pflamelet"; version="0.1.1"; sha256="0yprydhz30r2ysp7i4n3g3vriln3094c7yablnfwb8dkiz3032fl"; depends=[abind pbapply plotly TDA viridis]; }; pgam = derive2 { name="pgam"; version="0.4.15"; sha256="12llflsb32dfvxl3nbyb9bsl9bmd35g5g163hd3axzmg1bgi21ls"; depends=[]; }; pgdraw = derive2 { name="pgdraw"; version="1.1"; sha256="1s1b1izpgryrqsjkdh3yvr137054sipj3kwdkzlx2af8xjr53f85"; depends=[Rcpp]; }; pgee_mixed = derive2 { name="pgee.mixed"; version="0.1.0"; sha256="115vvpv54q80486i3xs2yhmfyx476cf4g1v43q6l7wj3jwzcrvbg"; depends=[copula mvtnorm Rcpp RcppArmadillo]; }; @@ -12110,35 +12627,33 @@ in with self; { phenmod = derive2 { name="phenmod"; version="1.2-3"; sha256="0dxwx8c7zka29fq7svrvn8bghj8jh8grbrgsw4pvavx2439cldak"; depends=[gstat lattice pheno RColorBrewer]; }; pheno = derive2 { name="pheno"; version="1.6"; sha256="0xdya1g1ap7h12c6zn3apbkxr725rjhcp4gbdchkvcnwz4y9vw8c"; depends=[nlme quantreg SparseM]; }; phenoCDM = derive2 { name="phenoCDM"; version="0.1.3"; sha256="1cyqwc36zwa2a4ljy0xnqz0hhw0r98qk2an5y002lrchkqydplwp"; depends=[rjags]; }; - phenocamapi = derive2 { name="phenocamapi"; version="0.1.5"; sha256="1kvb7lsixhh2sqdd5r9si0wbnrzfg3fbs29pb2nvl3086hnshl9i"; depends=[data_table RCurl rjson]; }; phenocamr = derive2 { name="phenocamr"; version="1.1.4"; sha256="1abcwbds406m1dncn188n8y3fqwxx2h7g7xrca8j6bw2ld69jswd"; depends=[changepoint daymetr httr jsonlite memoise MODISTools zoo]; }; phenofit = derive2 { name="phenofit"; version="0.2.7"; sha256="0159jn606hm9mzrfhfnjl9dab9k8118x8g6pg3y86l31mwri6skv"; depends=[data_table dplyr foreach ggplot2 gridExtra iterators jsonlite JuliaCall lubridate magrittr numDeriv optimx plyr purrr Rcpp RcppArmadillo reshape2 shiny spam stringr tibble tidyr ucminf zoo]; }; - phenology = derive2 { name="phenology"; version="7.3"; sha256="0hklk5k0i6vv733dm3npphg0zrhlb14ps6j6wwvsx50sqr3xl9jg"; depends=[HelpersMG lmf numDeriv optimx]; }; + phenology = derive2 { name="phenology"; version="7.6"; sha256="0i2w2xkfp0c8r3wjrh5rr8a92dmpw7nvq4fvcacp9glap9qj4pcr"; depends=[HelpersMG lmf numDeriv optimx]; }; phenomap = derive2 { name="phenomap"; version="1.2.1"; sha256="0kpngxqrbahild5nblfvgx2kna43hqqldx5q3b127dnqwzbhfvbb"; depends=[doParallel dplyr phenex plyr raster rgdal stringr]; }; - phenopix = derive2 { name="phenopix"; version="2.4.1"; sha256="1h4yr54mg8xj31dp7p6sxj8ra55dqw4a5ksw6ka53id6vnl964lk"; depends=[bcp doParallel foreach gtools iterators jpeg plyr raster sp stringr strucchange zoo]; }; + phenopix = derive2 { name="phenopix"; version="2.4.2"; sha256="0rrp4ch32hzlm727xpwsvfsw7d4qypv7iiq8hrg9az6nb39pbvp7"; depends=[bcp doParallel foreach gtools iterators jpeg plyr raster sp stringr strucchange zoo]; }; phiDelta = derive2 { name="phiDelta"; version="1.0.1"; sha256="0g1g5516p8i1gfpvsy75rdirib8sx1ki2mbf1cvgsnzh70h72gbv"; depends=[]; }; phia = derive2 { name="phia"; version="0.2-1"; sha256="0rv2akl5a488vax4sd9wnx765mch4vvcmg3iyxyljzl5kpqh5r00"; depends=[car Matrix]; }; philentropy = derive2 { name="philentropy"; version="0.4.0"; sha256="09vi6mfcig397226kq2fgymwg5ng8iysi6b2f616masscgshplxz"; depends=[dplyr KernSmooth Rcpp]; }; + phillydaodata = derive2 { name="phillydaodata"; version="1.0.0"; sha256="000qc9222ww083v2gkrvhr52y2gg9c0f1zslbagy7nya64yrckvj"; depends=[data_table janitor]; }; phm = derive2 { name="phm"; version="0.1.2"; sha256="0jm4w2rj80jz24134y8sj6w7f2icdizs644zfbiq77vzfj1mg8i6"; depends=[data_table shiny slam tm]; }; phonR = derive2 { name="phonR"; version="1.0-7"; sha256="0al2cbynnbvmd90lk1w1g1ppslqq0ng8vbb6bl7m4kqwd2lgv056"; depends=[deldir plotrix splancs]; }; phonTools = derive2 { name="phonTools"; version="0.2-2.1"; sha256="01i481mhswsys3gpasw9gn6nxkfmi7bz46g5c84m13pg0cv8hxc7"; depends=[]; }; phonenumber = derive2 { name="phonenumber"; version="0.2.2"; sha256="1m5idp538lvynmfp8m7l89js6hk5lpp26k419bdvj3hd3ap0n9lg"; depends=[]; }; - phonfieldwork = derive2 { name="phonfieldwork"; version="0.0.7"; sha256="18279656226c3pgyz2i5jn8ibvh6m6jzkcqq3cl4ivjfldabc3h7"; depends=[phonTools rmarkdown tuneR xml2]; }; - phonics = derive2 { name="phonics"; version="1.3.6"; sha256="1vyflc7v65z4mxpzz5mxych1hhi0j6v4dy19azkwgyapvhbisdxq"; depends=[BH data_table Rcpp]; }; - photobiology = derive2 { name="photobiology"; version="0.10.4"; sha256="0vbv499g39xbcqd904226hz189favbfn5fzknp9bl2dcnnzd3fq3"; depends=[dplyr lubridate plyr polynom rlang splus2R stringr tibble zoo]; }; - photobiologyFilters = derive2 { name="photobiologyFilters"; version="0.5.1"; sha256="02xknpq8bv55zp7njd7pdi9gg1gmd4l6j6jlxi94a8nwpnfm2cxv"; depends=[photobiology]; }; + phonfieldwork = derive2 { name="phonfieldwork"; version="0.0.10"; sha256="11hxmshcmwjrvncqj1i37iqsddqah1q23jqzcvq4dqb97vw4z5p3"; depends=[phonTools rmarkdown tuneR uchardet xml2]; }; + phonics = derive2 { name="phonics"; version="1.3.9"; sha256="1625jysaf1r06bicz5zyzq6lawr8b0yylaj9v314b0mcgkvn8i12"; depends=[BH data_table Rcpp]; }; + photobiology = derive2 { name="photobiology"; version="0.10.5"; sha256="0nh1bqzwlajmdgd1ckhai5ky3zhlgvhp4l1hzlkihl5w480qpl4p"; depends=[dplyr lubridate plyr polynom rlang splus2R stringr tibble tidyr zoo]; }; + photobiologyFilters = derive2 { name="photobiologyFilters"; version="0.5.2"; sha256="0n987klwyj06xikmvg9cvsjzrxll1d7p358jw4ls0j46byki98s5"; depends=[photobiology]; }; photobiologyInOut = derive2 { name="photobiologyInOut"; version="0.4.22-1"; sha256="1dqjlcra3vqydxjf6rwha6y1bykkpqwf8bqjkljs4kb89642qbv1"; depends=[colorSpec dplyr lazyeval lubridate photobiology readr readxl stringr tibble tidyr]; }; photobiologyLEDs = derive2 { name="photobiologyLEDs"; version="0.4.3-1"; sha256="0inhl6ba1fzkak4752m60hkm6fzapzyz5kchvz18yv33dmm13v1c"; depends=[photobiology]; }; photobiologyLamps = derive2 { name="photobiologyLamps"; version="0.4.3"; sha256="1df7ngcyrmvhab80w1ggyv1p9srsvwr9f6pm8yl7hvkpkv6jbdsk"; depends=[photobiology]; }; photobiologyPlants = derive2 { name="photobiologyPlants"; version="0.4.2"; sha256="0ab5ks72mb5x03xc0ww9fcl0h13ja8402b1s670lqmmhyvp6fj3s"; depends=[photobiology photobiologyWavebands]; }; - photobiologySensors = derive2 { name="photobiologySensors"; version="0.4.0"; sha256="1d0rphlx6k2hqvmhndbw143djsfr4fmwjih3s37bhksc2dn7nh2v"; depends=[photobiology]; }; + photobiologySensors = derive2 { name="photobiologySensors"; version="0.5.0"; sha256="122cfy6nsxngd8hnbq5frkgnzrb9fxw83l7mfwk0wy6gx7zsfx5s"; depends=[photobiology]; }; photobiologySun = derive2 { name="photobiologySun"; version="0.4.1"; sha256="15wp8q29m5c4qplind9098ikxmm1r60lw8cm0pa48lmh33638ia3"; depends=[photobiology]; }; photobiologyWavebands = derive2 { name="photobiologyWavebands"; version="0.4.4"; sha256="04bl72jaxm7vfvzss3wxjqf7p4l6rrqv11a7gqyfg0xqy18clnhx"; depends=[photobiology]; }; - photosynthesis = derive2 { name="photosynthesis"; version="1.0.2"; sha256="0804a91fv99qmsjj8km65cqqvk807mscd915aafchr27xwirfh9b"; depends=[checkmate crayon dplyr furrr future glue gunit magrittr purrr rlang stringr tealeaves tidyselect units]; }; + photosynthesis = derive2 { name="photosynthesis"; version="2.0.0"; sha256="1q6wcl2fl7mwf27v5yljk8alrz4jvbhybxxrqgi1c41qbs6581yz"; depends=[checkmate crayon dplyr furrr future ggplot2 glue gunit magrittr minpack_lm nlme pkgnet purrr rlang stringr tealeaves tidyselect units]; }; phreeqc = derive2 { name="phreeqc"; version="3.6.3"; sha256="0z20gj1kqhnbvx33sswz5ivj7nk2p4hia4gr2npscs94nc50b5j4"; depends=[]; }; phuassess = derive2 { name="phuassess"; version="1.1"; sha256="0jplj9gih32dllx2hw5aqvc9b94sbrbv66s3a5r8mdbpjh93rhng"; depends=[]; }; - phuse = derive2 { name="phuse"; version="0.2.2"; sha256="0aihiz0gkvs7bq9f9fmfxsv7wk5yifcnmgnjl3y9qf2dzl5787bb"; depends=[git2r httr jsonlite RCurl rlist SASxport shiny stringr yaml]; }; - phybreak = derive2 { name="phybreak"; version="0.2.0"; sha256="0vapc0w308wv1cd72p2xbj3q7jfnxwp08g5g8855a38pcn3njbfg"; depends=[ape phangorn Rcpp stringr]; }; phyclust = derive2 { name="phyclust"; version="0.1-29"; sha256="0jy2ylz6znsn5fsxrlv7fasmbfw3drbvvf68vd1cf5hz50p7i543"; depends=[ape]; }; phyext2 = derive2 { name="phyext2"; version="0.0.4"; sha256="0j871kgqm9fll0vdgh071z77ib51y8pxxm0ssjszljvvpx1mb8rb"; depends=[ape phylobase]; }; phylin = derive2 { name="phylin"; version="2.0.2"; sha256="0v6fyk2prja448vdi7ipwzws28fjfi188pfncjf9mhn8jrgpfxl6"; depends=[]; }; @@ -12157,19 +12672,19 @@ in with self; { phylosignal = derive2 { name="phylosignal"; version="1.3"; sha256="1h73wwczwak5v89mybq16lmmfr0fxfv5mx347ffipy6q9vgvwqx5"; depends=[adephylo ape boot DBI igraph phylobase Rcpp RcppArmadillo]; }; phylotate = derive2 { name="phylotate"; version="1.3"; sha256="092kvn32j06vm8ilwjkgidcz11r3qhsmi0cb0g0nnykw0a0vii4p"; depends=[]; }; phylotools = derive2 { name="phylotools"; version="0.2.2"; sha256="1dhk1ncp5zi4zl1xfnjz64v983dm7bq7iimfjin80j0bdcpps44w"; depends=[ape]; }; - phyr = derive2 { name="phyr"; version="1.0.2"; sha256="1qk4mbchi5dcz6vsmwb93gj5ihp2ygvm1ya63mkw11vkyy2nv67c"; depends=[ape dplyr gridExtra latticeExtra lme4 Matrix mvtnorm nloptr Rcpp RcppArmadillo]; }; + phyr = derive2 { name="phyr"; version="1.1.0"; sha256="0jvjxvxx2nz9ra9vp00bmm3dxr2am4zs8cvxij8w4jjyskznxc96"; depends=[ape dplyr gridExtra latticeExtra lme4 Matrix mvtnorm nloptr Rcpp RcppArmadillo tidyr]; }; phyreg = derive2 { name="phyreg"; version="1.0.2"; sha256="0m1psq79zl7h8791pl8g6i0ybda7vgddza8r9mwqhg4sw1q4bzcp"; depends=[]; }; physiology = derive2 { name="physiology"; version="1.2.1"; sha256="1z7xymwgj7bqn0yvcz3q8pvwhpr5vx5qd0x8sayal1vgpqc0nccb"; depends=[Rcpp]; }; - phytools = derive2 { name="phytools"; version="0.7-47"; sha256="18scm5p9g4ivkg108r21lxhaailc3h91nblxrfwjfah88bqb1cgy"; depends=[animation ape clusterGeneration coda combinat expm gtools maps MASS mnormt nlme numDeriv phangorn plotrix scatterplot3d]; }; + phytools = derive2 { name="phytools"; version="0.7-70"; sha256="1lzhk7mkixwp6ixd5hsn3zglw110phgdisrb57qwcp3f00xjqhz3"; depends=[ape clusterGeneration coda combinat expm gtools maps MASS mnormt nlme numDeriv phangorn plotrix scatterplot3d]; }; phytotools = derive2 { name="phytotools"; version="1.0"; sha256="049znviv2vvzv23biy1l28axm7bc7biwmq4bnn0cnjqgkk48ysz3"; depends=[FME insol]; }; piRF = derive2 { name="piRF"; version="0.1.0"; sha256="04k09ylc6hqw57dlv7sfnisn1167dr550y1j9xl7prvlf3jksg06"; depends=[Rdpack]; }; picante = derive2 { name="picante"; version="1.8.2"; sha256="19savjzj44b7ifdxcp02ynj22z4n4ikq2aipc74ljzy3yykmqmjn"; depends=[ape nlme vegan]; }; picasso = derive2 { name="picasso"; version="1.3.1"; sha256="1z7zm88wjp7fia7054l7i55f152iddrjj9wbcpcskhc8s6kfg53c"; depends=[MASS Matrix]; }; pid = derive2 { name="pid"; version="0.50"; sha256="05s3xqf95d4avh7gkr49jsm8jzacbv694c3wgppkkc40zip6vkc7"; depends=[DoE_base FrF2 FrF2_catlg128 ggplot2 png]; }; - piecepackr = derive2 { name="piecepackr"; version="1.5.1"; sha256="03dk1y195q0qzg9apkx1nvaj2db0cd6drqlm9y41z2vhhjnxijav"; depends=[gridGeometry grImport2 jpeg png purrr R6 stringr tibble]; }; - piecewiseSEM = derive2 { name="piecewiseSEM"; version="2.1.0"; sha256="1dpl3kyph0ry9g9321cknznjdizh03klg0s6hx56g6h8ygb0ar6h"; depends=[car DiagrammeR emmeans igraph lme4 MASS nlme]; }; + piecepackr = derive2 { name="piecepackr"; version="1.6.3"; sha256="1h0f3n85ayk44dqldcw6in39vl1gcldvv3w3nks7jn8cmr16h9b8"; depends=[backports gridGeometry grImport2 jpeg png purrr R6 stringr tibble]; }; + piecewiseSEM = derive2 { name="piecewiseSEM"; version="2.1.2"; sha256="1qxwc1drx26p4cgymrfjmg5i7ypl7gddv40virkpmc0qaag9pq36"; depends=[car DiagrammeR emmeans igraph lme4 MASS multcomp nlme]; }; piggyback = derive2 { name="piggyback"; version="0.0.11"; sha256="17cmkzp4g5gcapab3g5jxpabsmw4s3zsizqd99bh36xyw76v1jds"; depends=[clisymbols crayon fs gh git2r httr jsonlite lubridate magrittr memoise usethis]; }; - pillar = derive2 { name="pillar"; version="1.4.6"; sha256="01ck8ziqzjc9ibbj3g88siz1iw263dgl8jx6ryw2v50rjrr3y7fj"; depends=[cli crayon ellipsis fansi lifecycle rlang utf8 vctrs]; }; + pillar = derive2 { name="pillar"; version="1.4.7"; sha256="167ji21fx04s2niw5pjq9vzxgagxzsg3gimh8dzr2kl5ljrb5vfd"; depends=[cli crayon ellipsis fansi lifecycle rlang utf8 vctrs]; }; pim = derive2 { name="pim"; version="2.0.2"; sha256="0kwlm6n23ccs0jz4plsqprg6inj3qv74zhvg9gpxyj3ksvdxp58i"; depends=[BB nleqslv]; }; pimeta = derive2 { name="pimeta"; version="1.1.3"; sha256="1mx0m438db4n041bns6sm8sr8vrj6w8b2kvpmrkkp0bly2vpv40q"; depends=[ggplot2 Rcpp RcppEigen scales]; }; pinbasic = derive2 { name="pinbasic"; version="1.2.2"; sha256="0mcw68wrixz2jf62nfifdgg8bnp4h1p3byivz28wi61blj8iaa75"; depends=[fastcluster ggplot2 lubridate Rcpp reshape2 scales]; }; @@ -12179,8 +12694,8 @@ in with self; { pinnacle_API = derive2 { name="pinnacle.API"; version="2.3.3"; sha256="1b6adns1xr3cgcj2mdjvl16cm2vjjgsj2l8m2c47plyc5jh05qmb"; depends=[data_table httr jsonlite magrittr openssl purrr rjson uuid]; }; pinnacle_data = derive2 { name="pinnacle.data"; version="0.1.4"; sha256="1sl36i2857b3xwx7iwgy8mkgjvz7nfa74ch1n8kcxbj59ib7mp8p"; depends=[tibble]; }; pinochet = derive2 { name="pinochet"; version="0.1.0"; sha256="0qy18mlw34cv9p7b3qb5bidxyq44k0hzj91hm5vp6wkjhik4knvi"; depends=[]; }; - pinp = derive2 { name="pinp"; version="0.0.9"; sha256="1hdj0mqwz0hwl6jsh5zknbgg10bj49giqnr4y3lavfbk8d7qmmvs"; depends=[knitr rmarkdown]; }; - pins = derive2 { name="pins"; version="0.4.3"; sha256="0bzfj7nxc7ll43ws2r3f7fm55pjn9nf7nmx7w40kvn9h5cafsays"; depends=[backports base64enc crayon digest filelock httr jsonlite magrittr mime openssl rappdirs withr yaml zip]; }; + pinp = derive2 { name="pinp"; version="0.0.10"; sha256="1qah1b9chn237pfxisjsn6rr4h9h9zdqrk323c0k1qds7vm0xpra"; depends=[knitr rmarkdown]; }; + pins = derive2 { name="pins"; version="0.4.4"; sha256="19fd7i88f8wg6c8bn3n4s8jfjgbnpbraw0qxqks5ssg9xc8m0cdz"; depends=[backports base64enc crayon digest filelock fs httr jsonlite magrittr mime openssl rappdirs withr yaml zip]; }; pinyin = derive2 { name="pinyin"; version="1.1.6"; sha256="0rw9qd5hbcmpi30vdqs31ijy37d8jlpqv0xif2nndb8cwj8x5bw2"; depends=[data_table splitstackshape]; }; pipe_design = derive2 { name="pipe.design"; version="0.5.1"; sha256="0r0szkdzifxmnnbr6675w8ij4zwqgxj3gwahc7a74mxr51f7qh8j"; depends=[ggplot2 gtools xtable]; }; pipeGS = derive2 { name="pipeGS"; version="0.4"; sha256="0ki4i70r5f195b4jfv3hxlxz3zj57mhy2yf4984bwr11impilz5w"; depends=[]; }; @@ -12189,28 +12704,29 @@ in with self; { pipeliner = derive2 { name="pipeliner"; version="0.1.1"; sha256="1cyyd1bin89dh0zrhic3i541bj8nnaphg6jq2jqkhnxn2nvax11g"; depends=[]; }; pirate = derive2 { name="pirate"; version="1.0.0"; sha256="160mmyqdwbc4g7n7q9i4xcqp6h9bcpcz7vavsgdcpvs2mjfhfpjx"; depends=[ggplot2 MASS plyr Rcpp RcppArmadillo]; }; piratings = derive2 { name="piratings"; version="0.1.9"; sha256="0krrcf2bwicdf9fn657vkcjg5zliwi82hw3xmaqi46mdix8896gh"; depends=[ggplot2]; }; - pisaRT = derive2 { name="pisaRT"; version="1.0.0"; sha256="02r9xgh57scc6j9cp8aaw3c3r8cpr91xvcmkzkag5i4nxjzq9lbd"; depends=[]; }; + pisaRT = derive2 { name="pisaRT"; version="2.0.1"; sha256="0g4z4ixg7bsig1rjhsymncmzpl135r6mr3pqlb60gmz11851bw9w"; depends=[]; }; pitchRx = derive2 { name="pitchRx"; version="1.8.2"; sha256="0lg0xab40r8wzrww986l5q9jkg1m83g4bhsbh0kr7f2rv90av662"; depends=[ggplot2 hexbin MASS mgcv plyr XML2R]; }; - piton = derive2 { name="piton"; version="0.1.1"; sha256="1265y4lv2m5nwrh25sahjkxwmivpxgh9shrdidlmaman7zs6cclr"; depends=[Rcpp]; }; + piton = derive2 { name="piton"; version="1.0.0"; sha256="1krf6zi238m275nxjlpyayv8y2drbgs2kg19dpkqm0lmlz5y5ar8"; depends=[Rcpp]; }; pivmet = derive2 { name="pivmet"; version="0.3.0"; sha256="04awr5sj3x79hwzqd4hv43gfy7w6lpl2hbbny72vvjwc6g0z574p"; depends=[bayesmix bayesplot cluster corpcor MASS mclust mvtnorm RcmdrMisc rjags rstan runjags]; }; pivotaltrackR = derive2 { name="pivotaltrackR"; version="0.1.0"; sha256="024srncm288mn3bz6hv7ljzkchmnljk4yc2d4z7i05vsn7dzd2c6"; depends=[curl httr]; }; pivottabler = derive2 { name="pivottabler"; version="1.5.0"; sha256="0b3zh7qwvwvy0d2svnvpdbqwc8w2mb1s9g3acf883dhy3cnxq4ly"; depends=[data_table dplyr htmltools htmlwidgets R6]; }; - pixels = derive2 { name="pixels"; version="0.1.0"; sha256="0lna0z2shs49kh48ipjnyigaa22wb9gm4mq970ldhh9msb7wcv55"; depends=[htmlwidgets miniUI shiny]; }; + pixels = derive2 { name="pixels"; version="0.1.1"; sha256="1vvahrajm8ys5vgfc0iyzj2a6vzvgaakkj6i0m2sy40l2w44dn0q"; depends=[htmlwidgets miniUI shiny]; }; pixiedust = derive2 { name="pixiedust"; version="0.9.0"; sha256="01qcd8rsph3i65p9w4asqb1x6a671vbihzsby19ravp22lqzfmxg"; depends=[broom checkmate htmltools knitr labelVector magrittr reshape2 scales]; }; pixmap = derive2 { name="pixmap"; version="0.4-11"; sha256="04klxp6jndw1bp6z40v20fbmdmdpfca2g0czmmmgbkark9s1183g"; depends=[]; }; - pkgKitten = derive2 { name="pkgKitten"; version="0.1.5"; sha256="0nnib0gv9g22b9p01xigsgj04jv29fv7f444invfphfh9cc866m4"; depends=[]; }; - pkgbuild = derive2 { name="pkgbuild"; version="1.1.0"; sha256="1gdbrjq4kiwm45c6pb23mp327qyjvslhyf72ca4zhlzwc5vgp6xk"; depends=[callr cli crayon desc prettyunits R6 rprojroot withr]; }; - pkgcache = derive2 { name="pkgcache"; version="1.1.0"; sha256="1fqrb2bfx4l3vwkvrfbadzamiknn62cyn8bj8q8np83klc926fkb"; depends=[assertthat callr cli curl digest filelock glue prettyunits processx R6 rappdirs rlang tibble uuid]; }; + pkdata = derive2 { name="pkdata"; version="0.1.0"; sha256="1kmcalidw2zidd6i8ds0k057b3187by2k8z6764va43d5garbbcv"; depends=[lubridate]; }; + pkgKitten = derive2 { name="pkgKitten"; version="0.2.0"; sha256="1pp7143d1kxv9rn544xavlsjx334kb0b315s0y18vrnf6mzn7vlp"; depends=[]; }; + pkgbuild = derive2 { name="pkgbuild"; version="1.2.0"; sha256="0qx920h2viwjg10va81nj0xja495d8ni6vcc25ggvzki6a6k069f"; depends=[callr cli crayon desc prettyunits R6 rprojroot withr]; }; + pkgcache = derive2 { name="pkgcache"; version="1.1.1"; sha256="11hvd43bg78alpb5ipvwh9s8qzvvqr0ss7x24zq10i7754mfs9iy"; depends=[assertthat callr cli curl digest filelock glue prettyunits processx R6 rappdirs rlang tibble uuid]; }; pkgcond = derive2 { name="pkgcond"; version="0.1.0"; sha256="0pxj798042g23cf19r67nbgdyhpd868n2pkqjvjgrgr8ivwnkf1h"; depends=[]; }; pkgconfig = derive2 { name="pkgconfig"; version="2.0.3"; sha256="0l1qph8zyi2sic3k2qcd7vlfl7rzfh1q7z7zvjkl5f7y1x2fy3rk"; depends=[]; }; - pkgdown = derive2 { name="pkgdown"; version="1.5.1"; sha256="0sy7f4bzbdzh2z8m30hq2i5yx9vrpmridrg4l85qpvwm5j7yhd88"; depends=[callr cli crayon desc digest evaluate fansi fs highlight httr magrittr MASS memoise openssl processx purrr rematch2 rlang rmarkdown rstudioapi tibble whisker withr xml2 yaml]; }; + pkgdown = derive2 { name="pkgdown"; version="1.6.1"; sha256="1k31biyvxkv3xjc1yy3nzb9wfza3vbx97fv17nly5a6vlv7zqbs4"; depends=[callr crayon desc digest downlit fs httr magrittr memoise openssl purrr ragg rematch2 rlang rmarkdown tibble whisker withr xml2 yaml]; }; pkgfilecache = derive2 { name="pkgfilecache"; version="0.1.2"; sha256="07x63w19fg7sl547501r2dx2ds5sfdfb29xvqrvjibf8265x25fw"; depends=[downloader rappdirs]; }; pkggraph = derive2 { name="pkggraph"; version="0.2.3"; sha256="1isiywgm20rypc5qr03p0k7lis76zzd96x5ncbvia644d2n13brm"; depends=[curl data_table dplyr ggnetwork ggplot2 htmltools igraph intergraph Matrix network networkD3 plyr RColorBrewer tibble]; }; pkgload = derive2 { name="pkgload"; version="1.1.0"; sha256="03bv8xq4s6s7m34y1kjs99jzlb95vwrfi76mbnhmzcx2pc6ld78q"; depends=[cli crayon desc pkgbuild rlang rprojroot rstudioapi withr]; }; - pkgmaker = derive2 { name="pkgmaker"; version="0.31.1"; sha256="0r0ga20dy25v9y5gjbds4y6kaa5a7qknh503qdkzllcpzbibh0hp"; depends=[assertthat bibtex codetools digest magrittr registry stringi stringr withr xtable]; }; - pkgndep = derive2 { name="pkgndep"; version="1.0.0"; sha256="0icqvka2yssz9ri9yncb725fm8vfcaf602bqz8l25mgk2hh6zamf"; depends=[callr ComplexHeatmap crayon GetoptLong]; }; + pkgmaker = derive2 { name="pkgmaker"; version="0.32.2"; sha256="14ggsd24n5g5rvn0wl4w90ipxzmywqikh28llj89q6kpxwnv4iff"; depends=[assertthat codetools digest registry stringr withr xtable]; }; + pkgndep = derive2 { name="pkgndep"; version="1.0.1"; sha256="18j8yrbzk80yamqqcyhbl6y7dla684hvqffv6l83d5fvhzadscz6"; depends=[callr ComplexHeatmap crayon GetoptLong]; }; pkgnet = derive2 { name="pkgnet"; version="0.4.1"; sha256="194ynbhq6k7gp8l4ccq6m37qhhf791ynbppjh77cc0q50w2jz387"; depends=[assertthat covr data_table DT futile_logger glue igraph knitr magrittr R6 rlang rmarkdown visNetwork]; }; - pkgsearch = derive2 { name="pkgsearch"; version="3.0.2"; sha256="1dvlqav7hp43x30rmwr8h3dscc0hc01i6mfc7hxvf7ny1rzckfv0"; depends=[assertthat httr jsonlite parsedate prettyunits tibble]; }; + pkgsearch = derive2 { name="pkgsearch"; version="3.0.3"; sha256="1icn8qw6jpcgbmidqpml4ifpv1i5z2i4hp6b0gpb1xk9dlf6mnl2"; depends=[assertthat curl jsonlite parsedate prettyunits tibble]; }; pkgverse = derive2 { name="pkgverse"; version="0.0.1"; sha256="0lsv7s9vsjvfpy19nxbdlbm363j01wwqqnrp0nlrik590hfq4w83"; depends=[devtools usethis]; }; pkmon = derive2 { name="pkmon"; version="1.0"; sha256="0j2v4zlf7vgy5gld29xiii15m9i85cpiwc25rmzjm02cz2p32c72"; depends=[]; }; pkr = derive2 { name="pkr"; version="0.1.2"; sha256="0m045dlcq3rls1w0smy4jvk3c57ckpqdv8xnz261k1gnnyjmz1k2"; depends=[binr foreign forestplot rtf]; }; @@ -12229,36 +12745,37 @@ in with self; { plater = derive2 { name="plater"; version="1.0.2"; sha256="0z3s33xpfkd1ln37bpsgycbb35hgjq23yi151imdxyv80493vy4w"; depends=[dplyr]; }; platetools = derive2 { name="platetools"; version="0.1.3"; sha256="1c0bxgfa31sgb6mg8nnqx6pp18262walar1lxcg2dpjhzqlgzn0c"; depends=[ggplot2 RColorBrewer]; }; plde = derive2 { name="plde"; version="0.1.2"; sha256="1g1b1sgyfxgfkjcr3sdkan8jd6r7yyi0izc83vyj11bdk08jx22h"; depends=[]; }; - pleiades = derive2 { name="pleiades"; version="0.2.0"; sha256="1h3q4yf0w0al7n8l7ca4vgx2bhrrz8clli15svlds7n402s8rzp5"; depends=[crul DBI dbplyr dplyr gistr jsonlite rappdirs RSQLite]; }; + pleiades = derive2 { name="pleiades"; version="0.3.0"; sha256="17lg0yr5mfz5wky7lia1gkq15805p3zsy444cf477spz2rb06zgc"; depends=[crul DBI dbplyr dplyr gistr jsonlite rappdirs RSQLite]; }; pleio = derive2 { name="pleio"; version="1.6"; sha256="0av1sl0fdn2ia7ddalbvidhcnsvs36iq618s1bknjw29y5yyq020"; depends=[Matrix rms]; }; - plethem = derive2 { name="plethem"; version="1.0.1"; sha256="14yphprg34szwhwg7ksh1zmyskrcx8qqd4ycqxl4fy6l8cr3y0fg"; depends=[data_table deSolve devtools doParallel dplyr DT foreach formatR gdata ggplot2 httk magrittr miniUI NonCompart plotly pracma readxl reshape2 rhandsontable RSQLite rstudioapi shiny shinyBS shinybusy shinydashboard shinyjs shinythemes shinyWidgets sqldf stringr truncdist V8]; }; + plethem = derive2 { name="plethem"; version="1.1.0"; sha256="03pa7vsiah5sic0gzb61ipc3166qfjrx0yjzwd448l1qvm2vl1qa"; depends=[data_table deSolve devEMF devtools DiagrammeR DiagrammeRsvg doParallel dplyr DT foreach formatR gdata ggplot2 httk magrittr miniUI NonCompart officer plotly pracma readxl reshape2 rhandsontable RSQLite rstudioapi rsvg shiny shinyalert shinyBS shinybusy shinydashboard shinyFiles shinyjs shinythemes shinyWidgets sqldf stringr tidyr truncdist V8]; }; + plfMA = derive2 { name="plfMA"; version="1.0.5"; sha256="13hs06n4b28vlik9bzqdx6j85q05bsd6hb10cr39581a3m33rv5m"; depends=[cairoDevice gWidgets2 gWidgets2RGtk2 limma RGtk2]; }; plfm = derive2 { name="plfm"; version="2.2.2"; sha256="1jgf3jrkdpsf77i4lf68s6sxax95c9is4nryhnzanq9i5f23j24v"; depends=[abind sfsmisc]; }; plgp = derive2 { name="plgp"; version="1.1-7"; sha256="02g6saabrsd8pra0szbwcbilf6w5ywg2gxqb5zdvbxds2vw36hn0"; depends=[mvtnorm tgp]; }; plink = derive2 { name="plink"; version="1.5-1"; sha256="0rn2i9i8af9aq0xgxhpcdchs2952lq2d2sg8x3js0zi3vcml76k0"; depends=[lattice MASS statmod]; }; plinkFile = derive2 { name="plinkFile"; version="0.1.0"; sha256="0803hp822v9rqh4h437q2nmab19yamc4dbyi6iimm67ykp0d5xss"; depends=[]; }; plinkQC = derive2 { name="plinkQC"; version="0.3.2"; sha256="1dmx2r5d77nhma5xdy4i7jj2hjqhaz0hxj5ym70v0ac907vpy9zb"; depends=[cowplot data_table dplyr ggforce ggplot2 ggrepel igraph optparse R_utils sys UpSetR]; }; - plm = derive2 { name="plm"; version="2.2-3"; sha256="10bwd5xpim12038bxs8bmlaf33smlqy5f0cn7p3j6ipfygdwryld"; depends=[bdsmatrix Formula lattice lmtest MASS maxLik nlme Rdpack sandwich zoo]; }; + plm = derive2 { name="plm"; version="2.2-5"; sha256="00s4jhida9chzbnl6fdbaw29w7xyc7hnm5wkqm0hlrhdjkqp2g8m"; depends=[bdsmatrix Formula lattice lmtest MASS maxLik nlme Rdpack sandwich zoo]; }; plmm = derive2 { name="plmm"; version="0.1-1"; sha256="1dfxd1mqqjy2mf7qc6mh4wx5ya9q8fkqgrf01apisb66xxx5zya7"; depends=[Formula nlme sm]; }; pln = derive2 { name="pln"; version="0.2-2"; sha256="03jjmfr1dwz6p652y917g9rv2alyam9ws6xh9ig02d3w78b0rsv9"; depends=[]; }; plogr = derive2 { name="plogr"; version="0.2.0"; sha256="0a8dhzlna79ggyhfr0nncgh15a9n6r0dsz664pz0ah323wpblqqf"; depends=[]; }; - plot_matrix = derive2 { name="plot.matrix"; version="1.4"; sha256="0szrh83fc7x9kcz9caj3pwqrgrlq718v28j63j2mi2bvxbc8406l"; depends=[]; }; + plot_matrix = derive2 { name="plot.matrix"; version="1.5.2"; sha256="02srx9a3xyfdm66305s9nafpzcah2ixaiw8hzw86bw2jd5d4rzrl"; depends=[]; }; plot3D = derive2 { name="plot3D"; version="1.3"; sha256="1jfzndnlci9a975qbcv66jiy2l46hs3f2049654x4jp3i4kyrr5r"; depends=[misc3d]; }; plot3Drgl = derive2 { name="plot3Drgl"; version="1.0.1"; sha256="12p4qc9vmhr86ssx6xnz3cmx84q5jgd28bw9dp4wjrn04n6l4va6"; depends=[plot3D rgl]; }; - plot3logit = derive2 { name="plot3logit"; version="2.2.0"; sha256="079pandh3kcw2fp5ih1rmksfs64aznw080s86ida8l4jfb0rvb6l"; depends=[dplyr ellipse forcats generics ggplot2 ggtern lifecycle magrittr purrr Rdpack Ternary tibble tidyr tidyselect]; }; + plot3logit = derive2 { name="plot3logit"; version="3.0.0"; sha256="1g8q32lff1cghjsfkcv8rmahilwy9amrlyn7xwzq5lcxpmzkvmq9"; depends=[dplyr ellipse forcats generics ggplot2 ggtern lifecycle magrittr purrr Rdpack stringr Ternary tibble tidyr tidyselect]; }; plotGMM = derive2 { name="plotGMM"; version="0.2.2"; sha256="1cgjajw3dprdlq9ri0gllbxcy33x311mbp9xdds8fgq6cs42ggyb"; depends=[amerika ggplot2 wesanderson]; }; plotKML = derive2 { name="plotKML"; version="0.6-1"; sha256="1k5bfajgzcj912ja8s3ashsvfqz0sx10746x4ggyknyp17qrlbzw"; depends=[aqp classInt colorRamps colorspace dismo gstat pixmap plotrix plyr raster RColorBrewer rgdal RSAGA scales sp spacetime stringr XML zoo]; }; - plotMCMC = derive2 { name="plotMCMC"; version="2.0-0"; sha256="0i4kcx6cpqjd6i16w3i8s34siw44qigca2jbk98b9ligbi65qnqb"; depends=[coda gplots lattice]; }; + plotMCMC = derive2 { name="plotMCMC"; version="2.0.1"; sha256="0vxw6kbs1xvzi3sklxac9q1j4cbr8alr9c8fwifwyvpzpdk48ihf"; depends=[coda gplots lattice]; }; plotMElm = derive2 { name="plotMElm"; version="0.1.5"; sha256="0wwqzrpkmq9gzazdzlk62qig6vz43niada6fxh1wcsjqjwkcccgp"; depends=[ggplot2 interactionTest]; }; plotROC = derive2 { name="plotROC"; version="2.2.1"; sha256="0bk8j2lp80zcz4kkig1y5a1ig8vbjh7b4inzc46bn07ns1rdjgzg"; depends=[ggplot2 gridSVG plyr rlang shiny]; }; plotSEMM = derive2 { name="plotSEMM"; version="2.4"; sha256="0fircrayhz92zvkigkyb1zpn07bvssqs1ip15p926zj3rl77fqgy"; depends=[MplusAutomation plotrix plyr Rcpp shiny]; }; - plotdap = derive2 { name="plotdap"; version="0.0.7"; sha256="1zwf4s2myw20klbc0jnfrbg0hll9528m8vcxnc419nsgm3m2nskb"; depends=[cmocean dplyr gganimate ggnewscale ggplot2 lazyeval lubridate magrittr maps raster rerddap rgeos scales sf tidyr viridis]; }; + plotdap = derive2 { name="plotdap"; version="0.0.9"; sha256="1jzdlklnl1q32iyspky8k94rgm15nsm4p270q829ljqzq0c7z8z1"; depends=[cmocean dplyr gganimate ggnewscale ggplot2 lazyeval lubridate magrittr maps raster rerddap rgeos scales sf tidyr viridis]; }; plotfunctions = derive2 { name="plotfunctions"; version="1.4"; sha256="0asmxw8283fpvl83h478j5nyg59xqifqaa8f2f6l199gvvswhhg2"; depends=[]; }; plothelper = derive2 { name="plothelper"; version="0.1.9"; sha256="1ibznjqs4gpbq1vx79gg0fkm842xfqgpmmgqji2m6s712j3bdn5k"; depends=[farver ggfittext ggplot2 gridExtra magick plyr scales]; }; plotluck = derive2 { name="plotluck"; version="1.1.1"; sha256="16wqj4xfa8b7kal6v8mp2zlhwf9l3y6y5n44qbpvy652gzb2rw2z"; depends=[ggplot2 hexbin Hmisc plyr quantreg RColorBrewer scales]; }; - plotly = derive2 { name="plotly"; version="4.9.2.1"; sha256="1f0x83a2s7200iqi6gpngijks06fcvcbm6701d5r5rxpb8rawppl"; depends=[base64enc crosstalk data_table digest dplyr ggplot2 hexbin htmltools htmlwidgets httr jsonlite lazyeval magrittr promises purrr RColorBrewer rlang scales tibble tidyr viridisLite]; }; + plotly = derive2 { name="plotly"; version="4.9.2.2"; sha256="09zl4i8q917x4hwgyjcxpwmj11dc6zlq3dz0268lzl33jvjw94lw"; depends=[base64enc crosstalk data_table digest dplyr ggplot2 hexbin htmltools htmlwidgets httr jsonlite lazyeval magrittr promises purrr RColorBrewer rlang scales tibble tidyr viridisLite]; }; plotlyGeoAssets = derive2 { name="plotlyGeoAssets"; version="0.0.2"; sha256="1c6i4dz5qmym1pcddgffcqgb76jz84252xldprg2caylrqvzv6b7"; depends=[]; }; plotmm = derive2 { name="plotmm"; version="0.1.0"; sha256="01mi9znl471myq1yhfr8kdxpy0l67wgb3fid8gf2rzj5ph72b8hp"; depends=[amerika dplyr ggplot2 patchwork wesanderson]; }; - plotmo = derive2 { name="plotmo"; version="3.5.7"; sha256="135k643vf2np0y20zrhfy4id1bjg7bi285csg5fzvarwlr4nldma"; depends=[Formula plotrix TeachingDemos]; }; + plotmo = derive2 { name="plotmo"; version="3.6.0"; sha256="1qs1q98cfaqy59dp4hhwnvwlkc4kzd03qp7aprl2hm7r8b2gqnn0"; depends=[Formula plotrix TeachingDemos]; }; plotpc = derive2 { name="plotpc"; version="1.0.4"; sha256="1sf7n7mfyaijldm24bc8r8pfm8pp9cyaja7am14z2wpj2j9f9vyq"; depends=[]; }; plotprotein = derive2 { name="plotprotein"; version="1.0"; sha256="14kfb4xxpfp8klz31kb7cpc39636ax2cx2483vqqkciccb28f0ks"; depends=[ade4 plotrix plyr seqinr XML]; }; plotrix = derive2 { name="plotrix"; version="3.7-8"; sha256="104llmr6dvlcnfpmd8zbdlv63k79djc4qqgadjavj4v4cmz1zkcc"; depends=[]; }; @@ -12274,13 +12791,13 @@ in with self; { plsdepot = derive2 { name="plsdepot"; version="0.1.17"; sha256="1i00wxr451xpfy6dnvcm11aqf9106jsh5hj7gpds22ysgm4iq5w4"; depends=[]; }; plsdof = derive2 { name="plsdof"; version="0.2-9"; sha256="1g41nbycgzjwrackbdf08q1phqpyy6zihm5ak2728683vd88fxzv"; depends=[MASS]; }; plsgenomics = derive2 { name="plsgenomics"; version="1.5-2"; sha256="1pvb50nv6jc99bm2hsxpzazg26y49yi24wwwim5xcjj6j1szbip4"; depends=[boot fields MASS plyr reshape2 RhpcBLASctl]; }; - plsmod = derive2 { name="plsmod"; version="0.0.1"; sha256="16yc8ydkc054is0f17nly4kwakfh410i3hqwas0479v1qywcszxb"; depends=[dplyr generics magrittr mixOmics parsnip purrr rlang tibble tidyr]; }; + plsmod = derive2 { name="plsmod"; version="0.1.1"; sha256="0jkwmr6lgy2kdxpypzks6fcqxgrgzji5navmbip2qrgnk2c0vfjk"; depends=[dplyr generics magrittr mixOmics parsnip purrr rlang tibble tidyr]; }; plsmselect = derive2 { name="plsmselect"; version="0.2.0"; sha256="044mwdqv5vw0apmx3yhn6xkdmw6baalvb8c6hhmawcs279kwi1m9"; depends=[dplyr glmnet mgcv survival]; }; plsr = derive2 { name="plsr"; version="0.0.1"; sha256="0l413m49zjpb35v0zw8dlxn53nh7fghinbmwfmldl3jgdvay2s7x"; depends=[boot ggplot2 reshape2 shiny]; }; pltesim = derive2 { name="pltesim"; version="1.0"; sha256="0mvqp8di2gwhd9wc9kvnnpxd3hkr9b9lj6g5qlkqcbrgkq6fjahs"; depends=[coreSim ggplot2]; }; - plu = derive2 { name="plu"; version="0.1.0"; sha256="0k46in8x70dxipcll0mjadqbzgg30s6x8xg4kb6ldh2lqbkqpgss"; depends=[]; }; + plu = derive2 { name="plu"; version="0.1.1"; sha256="1ri3665kvflpfnjnx8zicjyw1aliy4kdfv97xj5g041j3bii88lh"; depends=[]; }; plugdensity = derive2 { name="plugdensity"; version="0.8-3"; sha256="1jdmq4kbs8yzgkf9f5dc7c8c52ia68fgavw7nsnc2hnz5ylw1qy9"; depends=[]; }; - plumber = derive2 { name="plumber"; version="0.4.6"; sha256="1c5pryslly2ibbfc65qlavbnnaksp3p18xr1cghwbw00kz4ig147"; depends=[crayon httpuv jsonlite R6 stringi]; }; + plumber = derive2 { name="plumber"; version="1.0.0"; sha256="07hz7qm74p6703qm4xqr239ndbv9xyms13h1rsag2d853kki0r8h"; depends=[crayon httpuv jsonlite lifecycle magrittr mime promises R6 sodium stringi swagger webutils]; }; plumbr = derive2 { name="plumbr"; version="0.6.9"; sha256="1avbclblqfy57pd72ximvj3zq92q1w8vszvyf6fw75j5rfwdaibk"; depends=[objectSignals]; }; pluralize = derive2 { name="pluralize"; version="0.2.0"; sha256="1s3jp41j8c03qb5zisj6m12ky7cz3n71d6p5apz0r0yn35inrhah"; depends=[V8]; }; plus = derive2 { name="plus"; version="1.0"; sha256="1l7lvnq7vahj8m7knmr4q3wj00ar7iq89j45a2dqn2bh0qyj68ls"; depends=[]; }; @@ -12292,50 +12809,55 @@ in with self; { pmcgd = derive2 { name="pmcgd"; version="1.1"; sha256="1pybzvyjmzpcnxrjsas06diy3x83i1r5491s6ccyr63l56hs55d5"; depends=[mixture mnormt]; }; pmd = derive2 { name="pmd"; version="0.1.9"; sha256="1bwanvxlh4jayr86rs3kpif9m7zqj09w11h7j0pl2mgzxglb4fms"; depends=[enviGCMS igraph RColorBrewer]; }; pmdplyr = derive2 { name="pmdplyr"; version="0.3.3"; sha256="1grnqqydi84hnig1522lv4xbh9ds32wnq7sha7jn1q4186wlz1qa"; depends=[dplyr lubridate magrittr pillar rlang tibble tidyr tidyselect vctrs]; }; + pmetar = derive2 { name="pmetar"; version="0.2.7.0"; sha256="1madn5bw4cxsjrz2v39jyp3vj5y7fyi5i6rzgxwp6fg4ydfn233n"; depends=[dplyr lubridate magrittr RCurl stringr tidyr]; }; pmhtutorial = derive2 { name="pmhtutorial"; version="1.5"; sha256="1hcw8hwpsivbhz86lnzy08q9n8vahnq8f7rmi4xkmg6b44582cqx"; depends=[mvtnorm Quandl]; }; + pmlbr = derive2 { name="pmlbr"; version="0.2.0"; sha256="1f0i52ws8ywkz4c0s3ax3qa3qinqhv1k9qlghkama3b027zkl9zn"; depends=[FNN]; }; pmml = derive2 { name="pmml"; version="2.3.1"; sha256="1qsrpbmwgmq9s45f30657cpfzkrvva8h1hqq1g3fd69p5g735rwp"; depends=[stringr XML]; }; pmmlTransformations = derive2 { name="pmmlTransformations"; version="1.3.3"; sha256="0315kb5x04pidpzr04yaxyynp0mz4ilzp7vkspq4agjkds5hyc88"; depends=[]; }; pmpp = derive2 { name="pmpp"; version="0.1.1"; sha256="1srmkih6zsyf8yf1f045xy1afcz0if6nf1ncslgrq6rgm7330lkw"; depends=[data_table dplyr ggplot2 magrittr MASS Matrix minqa moments plm pracma]; }; pmr = derive2 { name="pmr"; version="1.2.5"; sha256="0dq97dfjmgxlhr3a2n20vyyzfmamcicw878hdxpw31lw02xs6yls"; depends=[]; }; pmsampsize = derive2 { name="pmsampsize"; version="1.0.3"; sha256="0i6yqxdrjlwdaghh9lzivqrszy6zfs06kjdfn88yyizy5d7z2k4s"; depends=[]; }; pmultinom = derive2 { name="pmultinom"; version="1.0.0"; sha256="0p2amb3y4jl24r21fii1qpmdbn5pfgywrx8k7x1jxpg49rk7k0rp"; depends=[fftw]; }; - pmxTools = derive2 { name="pmxTools"; version="1.0"; sha256="02qv455jysnf218zsa494x1hwlsymil9p1ysdmhx26wdja6dwb6m"; depends=[chron ggplot2 ggrepel gridExtra MASS stringr XML]; }; + pmwg = derive2 { name="pmwg"; version="0.1.9"; sha256="0ilv7spwd4l44aa66yc346swns9aprmxxx9p3zpgr6kdn8p0ncaz"; depends=[coda condMVNorm MASS MCMCpack mvtnorm]; }; + pmxTools = derive2 { name="pmxTools"; version="1.2.1"; sha256="0r5y09ab6k31d7fbd5pn8lzaafq1ix2lrjci1bsvg0wwcxmdipw6"; depends=[chron data_tree DiagrammeR dplyr ggplot2 ggrepel gridExtra magrittr MASS stringr xml2]; }; png = derive2 { name="png"; version="0.1-7"; sha256="0g2mcp55lvvpx4kd3mn225mpbxqcq73wy5qx8b4lyf04iybgysg2"; depends=[]; }; pnmtrem = derive2 { name="pnmtrem"; version="1.3"; sha256="0053gg368sdpcw2qzydpq0c5v2cxdlwgf5k68cbw0yx41csjgvz0"; depends=[MASS]; }; pnn = derive2 { name="pnn"; version="1.0.1"; sha256="1s6ib60sbdas4720hrsr5lsszsa474kfblqcalsb56c84gkl42ka"; depends=[]; }; poLCA = derive2 { name="poLCA"; version="1.4.1"; sha256="0bknnndcxsnlq6z9k1vbhqiib1mlzlx4badz85kc7a3xbrdrfs9f"; depends=[MASS scatterplot3d]; }; + pocketapi = derive2 { name="pocketapi"; version="0.1"; sha256="0n4fyx4ldm14zy3pz7gygwhahi3p25misvxlmy8l9kqqr51fg26a"; depends=[dplyr glue httr jsonlite magrittr purrr tibble usethis]; }; pocrm = derive2 { name="pocrm"; version="0.12"; sha256="0ilh19vqy3lqnb4j6jw61az39swmca8za3ig3k1cjc9gwdyn1f8r"; depends=[dfcrm nnet]; }; + podr = derive2 { name="podr"; version="0.0.5"; sha256="135nq0dw1x6ngf6mxy3yds3xsxhaf5rnv1cmhavlrklhdfygc0a4"; depends=[assertthat DBI dplyr lubridate magrittr odbc plogr RPostgres rstudioapi shiny stringr tibble]; }; pogit = derive2 { name="pogit"; version="1.2.0"; sha256="1kap1cpfp0k2vm7w4kjfja37n9z3j7ppiwvsdxl6bgpkf7kcnkp2"; depends=[ggplot2 logistf plyr]; }; poibin = derive2 { name="poibin"; version="1.5"; sha256="1sxryvwwz6ldsnkzdy56p8c895s5yvpcai9ndyjv1x5q3l05wf9v"; depends=[]; }; poilog = derive2 { name="poilog"; version="0.4"; sha256="0bg03rd5rn4rbdpiv87i8lamhs5m7n7cj8qf48wpnirg6jpdxggs"; depends=[]; }; pointRes = derive2 { name="pointRes"; version="1.1.3"; sha256="0yfzidc93ghpf116lxbx4fr0d71wl79y3nz6mkirx4pli6gb8x8d"; depends=[ggplot2 gridExtra plyr TripleR]; }; - pointblank = derive2 { name="pointblank"; version="0.5.0"; sha256="1h6qmzglpxa7qy5vwdjysmjizszg6nqscq7ps4gb5808k7r0xb5b"; depends=[base64enc blastula cli DBI dbplyr digest dplyr fs ggforce ggplot2 glue gt htmltools knitr log4r magrittr rlang scales testthat tibble tidyselect yaml]; }; - pointdensityP = derive2 { name="pointdensityP"; version="0.3.4"; sha256="0vv8j1yz8n2vmmp6bg2i8w3dchdbybsdxn3sk5d1ync2knih8l2s"; depends=[data_table]; }; + pointblank = derive2 { name="pointblank"; version="0.6.0"; sha256="07hafgzyfg9r5xp9pilc9zdnk214db8ixv1ghspmrsprb9cr6qv8"; depends=[base64enc blastula cli DBI dbplyr digest dplyr fs ggforce ggplot2 glue gt htmltools knitr log4r magrittr rlang scales testthat tibble tidyselect yaml]; }; + pointdensityP = derive2 { name="pointdensityP"; version="0.3.5"; sha256="0n7p3b77m47avbr7n85knf31m9rlp43mdl3748ysj6wvxvhnivx4"; depends=[data_table]; }; pointr = derive2 { name="pointr"; version="0.1.0"; sha256="0gdzm80r7jdwg1lv8qh902kqpqbz5b38w8lg3b9qr9k9wbir1cl9"; depends=[stringr]; }; poio = derive2 { name="poio"; version="0.0-4"; sha256="12d47hn9rsx2n0fl107dpswfklnh8nkm0kspcxf7yfljayvxr474"; depends=[assertive_base assertive_files assertive_properties assertive_sets assertive_strings assertive_types devtools digest dplyr magrittr purrr R6 stringi tibble whoami]; }; poisDoubleSamp = derive2 { name="poisDoubleSamp"; version="1.1"; sha256="13wyj9jf161218y4zjv2haavlmanihp9l59cvh7x8pfr9dh2dwr8"; depends=[Rcpp]; }; poisFErobust = derive2 { name="poisFErobust"; version="2.0.0"; sha256="1i6y3745i385y3r45i0xk7ciw1k6brmn709k5qhx8xphq0k4an5n"; depends=[data_table glmmML]; }; poisbinom = derive2 { name="poisbinom"; version="1.0.1"; sha256="0mjxg0s3nck7qrmq4bbrhwxfwr6fqml54s9k8q1mkfzlifa7qyf7"; depends=[Rcpp]; }; - poismf = derive2 { name="poismf"; version="0.2.3"; sha256="1jkds8ywvph4v27b2jxid2z5100bps6vjxa6w91w3342b8x9s293"; depends=[Matrix]; }; + poismf = derive2 { name="poismf"; version="0.2.6"; sha256="04fs4yl7zl3hr8qjzmn7kldkfgqak38x2ryjx1byxv0q5rf5m27f"; depends=[Matrix]; }; poisson = derive2 { name="poisson"; version="1.0"; sha256="1diyf1b84sr6iai3ghd3kcp6fc6w7fan49wzs1lzvxxsmp15ag2d"; depends=[]; }; poisson_glm_mix = derive2 { name="poisson.glm.mix"; version="1.2"; sha256="0328m279jfa1fasi9ha304k4wcybzr7hldww7wn0cl7anfxykbv8"; depends=[]; }; poissonMT = derive2 { name="poissonMT"; version="0.3-5"; sha256="14qkc8qz3423b13gp6gsp8cbb1nv9wwjjfa4i9zc15qy5i99ha26"; depends=[checkmate MASS robcbi robustbase]; }; - poissonreg = derive2 { name="poissonreg"; version="0.0.1"; sha256="04qika4k0hak8kp6z4jqdzslymy7wklw4bx6kcmz3932avlwyym9"; depends=[dplyr glue parsnip purrr rlang tibble tidyr]; }; + poissonreg = derive2 { name="poissonreg"; version="0.1.0"; sha256="0s907j8s1s78944ik2r0qpppj1q58crkz73c9jyalkbd169578fx"; depends=[dplyr glue parsnip purrr rlang tibble tidyr]; }; poistweedie = derive2 { name="poistweedie"; version="1.0"; sha256="18992fafypds3qsb52c09fasm3hzlyh5zya6cw32wnhipmda643m"; depends=[]; }; poker = derive2 { name="poker"; version="0.8.8"; sha256="14ik77440z22k4kwq0p1fn7adzi0p8mh8j8hd7ayinvrab4b5r85"; depends=[]; }; - polAr = derive2 { name="polAr"; version="0.1.3"; sha256="1m32kylb8klv8znfkzdapjvwn7p73mc18q0r7xc21vqbbjqaad8f"; depends=[assertthat attempt curl dplyr DT forcats formattable geofacet ggplot2 ggthemes glue gt magrittr purrr RColorBrewer readr rlang rvest scales stringr tibble tidyr xml2]; }; + polAr = derive2 { name="polAr"; version="0.2.0"; sha256="0xk8bnb381k3x93wp29rfzb4iwvp3bkn9zfw82cbwynkfc0vyv4c"; depends=[assertthat attempt cowplot curl dplyr DT forcats formattable geofacet ggparliament ggplot2 ggtext ggthemes glue gt jsonlite lubridate magrittr purrr RColorBrewer readr rlang rvest scales sf stringr tibble tidyr wordcloud2 xml2]; }; polaroid = derive2 { name="polaroid"; version="0.0.1"; sha256="0m3jbiz4n7mgbbdkd28m6dqsclyjcgshpxd6ws8df7zchx7fch07"; depends=[argonDash argonR colourpicker ggplot2 hexSticker png shiny shinyWidgets]; }; - policytree = derive2 { name="policytree"; version="1.0.1"; sha256="0nsfspy0pvw0yfwkhd5c5wz7jr2iv12d6m3bw5ff9v2sbhd93piw"; depends=[BH grf Rcpp]; }; + policytree = derive2 { name="policytree"; version="1.0.3"; sha256="1vwsimk3kirk7wlwc7b885fflbg9czzjxr4f8h20vhcm8mcz8ay8"; depends=[BH grf Rcpp]; }; poliscidata = derive2 { name="poliscidata"; version="2.3.0"; sha256="1ywfhksc6gcc2xk5lp6s8nn4wib92sv7p3wq92dzabf75q6mscix"; depends=[abind car descr gplots Hmisc plotrix plyr survey weights xtable]; }; - polished = derive2 { name="polished"; version="0.1.0"; sha256="0sibgvhws0z9jlaxvdsfgc8yz6b8p83fcf4aj1ysa2ghjf7pw9c9"; depends=[apexcharter digest dplyr DT htmltools htmlwidgets httr jose jsonlite lubridate purrr R6 rlang shiny shinycssloaders shinydashboard shinydashboardPlus shinyFeedback shinyjs shinyWidgets stringr tibble tidyr uuid xts]; }; + polished = derive2 { name="polished"; version="0.2.0"; sha256="1850is9rv08wad5rh8i0pqiwdaqx82pmificmzrk8ysirddildpn"; depends=[digest dplyr DT htmltools httr jose jsonlite lubridate purrr R6 rlang shiny shinycssloaders shinydashboard shinydashboardPlus shinyFeedback shinyjs shinyWidgets stringr tibble tidyr uuid]; }; polite = derive2 { name="polite"; version="0.1.1"; sha256="15hiifaf63hx0xn453lr0xhdnxqifrgyrgrymp0a9k3j7qja59jk"; depends=[here httr magrittr memoise ratelimitr robotstxt rvest usethis]; }; - politeness = derive2 { name="politeness"; version="0.6.1"; sha256="06nq7pibz4q8pfg6lmrjyx5hfq8g9lmnjnqin9dpkag8wwm71b8y"; depends=[data_table ggplot2 glmnet quanteda spacyr stringr textclean textir tm]; }; + politeness = derive2 { name="politeness"; version="0.7.5"; sha256="0j9rnms23gqymv6q1il7d2d7pmglj0g3i4dbq7d6jdwxh8y5dp11"; depends=[data_table ggplot2 glmnet quanteda spacyr stringr textclean textir tm]; }; politicaldata = derive2 { name="politicaldata"; version="0.1.3"; sha256="1n25k53mmlmmg9p9a36jh4z6xhl1yyv9v1c56mav873105h359wi"; depends=[]; }; pollen = derive2 { name="pollen"; version="0.72.0"; sha256="0plxc7rys5q4c1dwammv3b2pnys1hdh5ic0b2ndmv5cbyspf2h0y"; depends=[dplyr lubridate purrr]; }; pollimetry = derive2 { name="pollimetry"; version="1.0.1"; sha256="09zmcwlgzl4fnkdg2m424ibv3izzrm595c7pi4mc3bd1g8sa2ypn"; depends=[brms repmis]; }; pollstR = derive2 { name="pollstR"; version="2.0.1"; sha256="13g5z1hix1bmsxznq5qx82yf445rvvyn67ch9bihxm1hr4cr4sbl"; depends=[httr lubridate purrr stringr]; }; - pollster = derive2 { name="pollster"; version="0.1.2"; sha256="03wfd9j8cyfbpjp9nphyvkn0csriymcidllb6s8744bb1s7vb9hv"; depends=[dplyr forcats labelled rlang stringr tidyr]; }; - polmineR = derive2 { name="polmineR"; version="0.8.4"; sha256="0b72m381flrdjfdc3qk9kkf1yfxpnr15qqn7ghl930n4457qanm1"; depends=[data_table DT jsonlite knitr magrittr Matrix pbapply RcppCWB slam stringi tm xml2]; }; + pollster = derive2 { name="pollster"; version="0.1.3"; sha256="1b5m5g9v8xbs3zz6as4xvzwaqr39477adi4vzxmjvxjsaij6ih5h"; depends=[dplyr forcats labelled rlang stringr tidyr]; }; + polmineR = derive2 { name="polmineR"; version="0.8.5"; sha256="1jb6j0rmcwzszympzfia8vml55fw2rybj2qcv3f54v3cr9hw13ga"; depends=[data_table DT jsonlite knitr magrittr Matrix pbapply RcppCWB slam stringi tm xml2]; }; polspline = derive2 { name="polspline"; version="1.1.19"; sha256="0rhzf735hmbqfn2xbgcln4sqx7m9far72g5gq9mghgkw016kqglm"; depends=[]; }; polyCub = derive2 { name="polyCub"; version="0.7.1"; sha256="0ln1n5w64vgq63gm4mm9wzl9lbp7ppgaxg0ba0yw0xsr5cmkyp37"; depends=[sp]; }; polyMatrix = derive2 { name="polyMatrix"; version="0.3.1"; sha256="0k62cidsmryg64vbs1ar24m1dknxpddzqvdxbyk3n85r9cx3sqcv"; depends=[MTS polynom]; }; @@ -12350,23 +12872,24 @@ in with self; { polyfreqs = derive2 { name="polyfreqs"; version="1.0.2"; sha256="13859vbpys5yj1qiapyzv9wlvi6x6k0rm335bsi1v07ch3x2bh3b"; depends=[Rcpp]; }; polyglot = derive2 { name="polyglot"; version="0.3.0"; sha256="1mmmdqaq882qys41lmm009ncg9s9h5x1q8psv0v3pwpar0d7vgff"; depends=[magick pins]; }; polylabelr = derive2 { name="polylabelr"; version="0.2.0"; sha256="01b2v0l5g8nxwbd6nwqv8ahypgh6gfhd4qabg75brlj7z1iyfzf2"; depends=[Rcpp]; }; - polymapR = derive2 { name="polymapR"; version="1.1.0"; sha256="01yvp5xsbwya63rjrcirplfvryk14yzap6nxf24qfcw93hm3rl81"; depends=[doParallel foreach igraph knitr MDSMap]; }; + polymapR = derive2 { name="polymapR"; version="1.1.1"; sha256="058xx8h660kckd7xcwv6i60dfjbhcid6kqhbckq5s37d549givbx"; depends=[doParallel foreach igraph knitr MDSMap]; }; polynom = derive2 { name="polynom"; version="1.4-0"; sha256="1pflscwc0qzdf0y60j7s0dkglgmz18xajywfbn6s263idyr8idy5"; depends=[]; }; polypoly = derive2 { name="polypoly"; version="0.0.2"; sha256="00c1hrnf575awvh0rlsnf6nkgi9p3fnqhd1knamkgb4icwi5s46d"; depends=[ggplot2 reshape2 rlang tibble]; }; + polyqtlR = derive2 { name="polyqtlR"; version="0.0.4"; sha256="1ac1pr11b5aaa2f1kw7qxh4ikx2wwb477sm20rpppjqzkfzsi6hj"; depends=[abind doParallel foreach Hmisc knitr nlme RColorBrewer Rcpp RcppArmadillo reshape2 rmarkdown]; }; polyreg = derive2 { name="polyreg"; version="0.6.7"; sha256="1znl46m4zfd0f4qwg3r2anz3nyn8hk607772pzxiwj5w3xc96g56"; depends=[dummies nnet partools regtools RSpectra]; }; polysat = derive2 { name="polysat"; version="1.7-4"; sha256="08jmkik4s2171znp3w4i0v0g0k2s0di3xqwr9sf9hyd0sf8af8dp"; depends=[Rcpp]; }; polywog = derive2 { name="polywog"; version="0.4-1"; sha256="02qk1cyvkd77mwlvhj1zzzi0bmy7qxz29j2v730wp7rz4w7h5x5n"; depends=[foreach Formula glmnet iterators Matrix miscTools ncvreg Rcpp stringr]; }; pom = derive2 { name="pom"; version="1.1"; sha256="02jv19apn0kmp1ric2cxajlaad2fmsz4nm4izd2c3691vzas7l83"; depends=[matrixcalc]; }; pomdp = derive2 { name="pomdp"; version="0.99.0"; sha256="0plqmxzq46vgyg7365rp1m36ih5lll1kmj195iycwvsa1qaadw92"; depends=[igraph Ternary visNetwork]; }; - pomp = derive2 { name="pomp"; version="3.1"; sha256="07811rg0ixp7b7wqrhw6bm670s4s84cf7i43l5icfjqnq4xjldib"; depends=[coda deSolve digest magrittr mvtnorm plyr reshape2]; }; + pomp = derive2 { name="pomp"; version="3.2"; sha256="0lnw7i35z5k0p5r4nm8xx2iszvrv21q7cp3wav45r6vg7via708j"; depends=[coda deSolve digest magrittr mvtnorm plyr reshape2]; }; pompom = derive2 { name="pompom"; version="0.2.0"; sha256="1alz3lrj7m16vhymsvvrcmf0kmgx88q2f3v4j6wiciqv77bnyai1"; depends=[ggplot2 lavaan qgraph reshape2]; }; pooh = derive2 { name="pooh"; version="0.3-2"; sha256="0qwa5j91aypasvsf4xcfbl6lz7llawdr38jiflzmfak2ad72rv7j"; depends=[]; }; - pool = derive2 { name="pool"; version="0.1.4.3"; sha256="065pbvhgvvgv00df4kj4zn7mlbrv2iqa1583k0hlgavn15gfm6d2"; depends=[DBI dbplyr dplyr later R6]; }; + pool = derive2 { name="pool"; version="0.1.5"; sha256="0h3mnz6211q16jw8bv8w9948x45wy12w1dsxn97cc4y841qa5hp5"; depends=[DBI later R6]; }; poolVIM = derive2 { name="poolVIM"; version="1.0.0"; sha256="19yw6pp5l3jmla4wjbvpjq132f645yks49pzsdv123f3qfr8f0m6"; depends=[EmpiricalBrownsMethod Hmisc ranger]; }; - poolfstat = derive2 { name="poolfstat"; version="1.1.1"; sha256="12iwhfj1a87mbis7whgp4z3qg97xkj90rw8b9jsqnfmzhz6fn0yp"; depends=[doParallel foreach]; }; + poolfstat = derive2 { name="poolfstat"; version="1.2.0"; sha256="064arw174kn919qv5bvfyiva0gc21rx163yabrrnli3fkpvaf57q"; depends=[doParallel foreach Rcpp]; }; pooling = derive2 { name="pooling"; version="1.1.2"; sha256="19mrzax3k35fhgjpnlrigf0nscsdl3xb7k82s5q472k4bcz7ya5b"; depends=[cubature data_table dplyr dvmisc ggplot2 ggrepel mvtnorm numDeriv]; }; poolr = derive2 { name="poolr"; version="0.8-2"; sha256="1rkfnrz5x7f9kqpivj0gvs3fxfb9agnm8sybb7wmvvcsmshzrpkf"; depends=[Matrix]; }; - poorman = derive2 { name="poorman"; version="0.2.1"; sha256="0amrhjxld49p3mhlp10ym5pljw8gxamw2drvq8qrpwdzd3687z4w"; depends=[]; }; + poorman = derive2 { name="poorman"; version="0.2.4"; sha256="12s1pw1cy60hha3cspzxra8xw70wfwa2827yg2sy4jpn81xnacc8"; depends=[]; }; pop = derive2 { name="pop"; version="0.1"; sha256="0hbxdrkasb69x7ipddvyrzl5vvc7dd6rzj1vy7v3chg3rzgq89cj"; depends=[igraph MASS]; }; popEpi = derive2 { name="popEpi"; version="0.4.8"; sha256="1gc7kyik0209pc8mvl6c69lzb3dnkif0mby4l4pq8zfdz73lmi06"; depends=[data_table Epi survival]; }; popKorn = derive2 { name="popKorn"; version="0.3-0"; sha256="1zcl6ms7ghbcjyjgfg35h37ma8nspg15rk2ik82yalqlzxjf7kxw"; depends=[boot]; }; @@ -12375,34 +12898,38 @@ in with self; { popdemo = derive2 { name="popdemo"; version="1.3-0"; sha256="0760ajqaq822m0j092gdqzhgw1mk413k09mmmwyzb0jzj6bd15q3"; depends=[expm MCMCpack]; }; popgenr = derive2 { name="popgenr"; version="0.1"; sha256="1lidddf8p1z4bja9dabzmak6rzfyqwch046h79yc96c11rv36l4j"; depends=[]; }; popkin = derive2 { name="popkin"; version="1.3.0"; sha256="1gr2glyavvf2r89zwiama3qhmq32rdzjsqkhv70afmsapk6f4dhr"; depends=[RColorBrewer Rcpp RcppEigen]; }; - poplite = derive2 { name="poplite"; version="0.99.23"; sha256="0kf5k4iz4cvzd3avq753jn1gkpnhzi9m4148lq7rgv7h433qydwn"; depends=[DBI dbplyr dplyr igraph lazyeval RSQLite]; }; poppr = derive2 { name="poppr"; version="2.8.6"; sha256="0c1blca4bcimqpsfl9xrdwhmyxrasg8yb7xgrwl4hk8f3av3i25l"; depends=[ade4 adegenet ape boot dplyr ggplot2 igraph magrittr pegas phangorn polysat progressr rlang shiny vegan]; }; popprxl = derive2 { name="popprxl"; version="0.1.4"; sha256="076aia4qbq5yw2nxafq2ys5n5c7wv77i8k1nmzb3all193vjf203"; depends=[poppr readxl]; }; - popsom = derive2 { name="popsom"; version="4.3.0"; sha256="144h04mrj86z7cb7bbk4zg7bg1l4vvpi1sc0f6968lgcr8swfips"; depends=[class fields ggplot2 som]; }; + popsom = derive2 { name="popsom"; version="5.0"; sha256="0598qzqn1yws96628azn3q56804vlwq6b28ydfrr3pf5nds71krd"; depends=[fields ggplot2 hash]; }; poptrend = derive2 { name="poptrend"; version="0.1.0"; sha256="0hypxpb18azg6q1mqrphbx3x262h9ybwhlkb8fyd6vr7jjb5wn3h"; depends=[mgcv]; }; populationPDXdesign = derive2 { name="populationPDXdesign"; version="1.0.3"; sha256="0p73ddv3j1s1vs4j3axnsf39n626qjv0w1qlq9p7km4s6729bhgv"; depends=[devtools ggplot2 plyr roxygen2 shiny shinycssloaders]; }; porridge = derive2 { name="porridge"; version="0.1.0"; sha256="1c71bgq868gw4a8xsfj0qbvcw9bnm6vvbrsbzr31r30fbixjy2j6"; depends=[MASS mvtnorm Rcpp RcppArmadillo]; }; + portalr = derive2 { name="portalr"; version="0.3.6"; sha256="1zvhnwayib78sjvldl1ydafj0f9k0nzhq1gamfaki45vhn7hpasf"; depends=[clipr clisymbols crayon dplyr forecast gh httr lubridate lunar magrittr rlang tidyr tidyselect zoo]; }; + portes = derive2 { name="portes"; version="5.0"; sha256="1iarvgz23979lipqyyvh8h0nd978p1nzbbjf020q11yqpl863502"; depends=[forecast]; }; portfolio_optimization = derive2 { name="portfolio.optimization"; version="1.0-0"; sha256="1rdhwffsjc1pa1qq7rqy6dwk8yrcblkmijz94p2w7sf2v4jmwxxr"; depends=[magrittr MASS modopt_matlab xts]; }; portfolioBacktest = derive2 { name="portfolioBacktest"; version="0.2.2"; sha256="095f84d448dwh9ycp64ngn1pfm72n2b8d61w2vyd6mk3gh24361i"; depends=[digest doSNOW evaluate foreach ggplot2 PerformanceAnalytics quadprog quantmod R_utils rlang snow xts zoo]; }; portsort = derive2 { name="portsort"; version="0.1.0"; sha256="0swl39dn7lzwvps18bva4l64a441gkf6lbwcwrhlf93f1ardvxji"; depends=[xts zoo]; }; postDoubleR = derive2 { name="postDoubleR"; version="1.4.12"; sha256="19z8wisi16g7a78gw16r72dkxh3x5qh888qz260ih5naq0p8vy71"; depends=[doParallel ggplot2 glmnet grf neuralnet progress]; }; postGIStools = derive2 { name="postGIStools"; version="0.2.4"; sha256="04d6iqnk7j2lgv1h5c94j6y89jk75pmv26sxa51s5iwkjq7rchym"; depends=[DBI jsonlite rgdal rgeos RPostgreSQL sp stringr]; }; postHoc = derive2 { name="postHoc"; version="0.1.3"; sha256="1l7r9md9iyav5vvjykpsnqv9whspzcmnppfpqm6qy5s5vk6b8zfd"; depends=[igraph multcomp]; }; + postcards = derive2 { name="postcards"; version="0.1.0"; sha256="0y1hvjwf85hiaffqwv8pk9yyazn01ch311c84nd5qr5f39cm4l4v"; depends=[rmarkdown]; }; posterdown = derive2 { name="posterdown"; version="1.0"; sha256="13plrrnylw3yldm0md1gr5drccfjk9f2wwlhz6lrmb3px7w5nqs0"; depends=[pagedown rmarkdown yaml]; }; postinfectious = derive2 { name="postinfectious"; version="0.1.0"; sha256="1v327zxxiwc1cdksk6s39lkkgck5dxg169pp3jiqmm7xs35dcl6y"; depends=[]; }; postlightmercury = derive2 { name="postlightmercury"; version="1.2"; sha256="1345ckp50jplcdqp3a250c6mhapqh9322jzpxj5dyqmbg2nmgp9i"; depends=[crul jsonlite purrr rvest tibble xml2]; }; postlogic = derive2 { name="postlogic"; version="0.1.0.1"; sha256="11bpmfn375zpyg90dh44h86cvppzri1smmkn26jyydqjz74f4q9w"; depends=[]; }; + postpack = derive2 { name="postpack"; version="0.5.2"; sha256="1iwy7yx60aqpm5jjvjsx15kcc44mzx5qij3gwx8kb1hc4bys4wka"; depends=[abind coda matrixcalc mcmcse stringr]; }; + potential = derive2 { name="potential"; version="0.1.0"; sha256="0j7l60j8x59l28223f3m3cdifd9hvcpsmfz6aharcygmpha77i8p"; depends=[doParallel foreach isoband sf]; }; potts = derive2 { name="potts"; version="0.5-9"; sha256="1kiha209w9nyyx4qqsdp51q2y7ny67nzqkdanlrh2106lcab3hj8"; depends=[]; }; - pould = derive2 { name="pould"; version="1.0.0"; sha256="03338c61njhrb1dyxndyci1kdalzc38h0l7a1majv8nf82k40l62"; depends=[BIGDAWG gap ggplot2 haplo_stats reshape2]; }; + pould = derive2 { name="pould"; version="1.0.1"; sha256="0hr6j08whbc1jydz20rg0cphfiwx4pyrav49w9qs9dkcaqrpid7l"; depends=[BIGDAWG gap ggplot2 haplo_stats reshape2]; }; povcalnetR = derive2 { name="povcalnetR"; version="0.1.1"; sha256="0ah6n3wpjiwyh0mancqqpvyknx25dxr13p0nqnrfzmhfwyaywar0"; depends=[dplyr httr js jsonlite memoise naniar purrr readr stringr tibble tidyr]; }; - powdR = derive2 { name="powdR"; version="1.2.2"; sha256="16zcywsqi25fjw01khqsx2lsm3zrgqi0jyc38b6n3yaw7p0x7n31"; depends=[baseline DT ggplot2 ggpubr nnls plotly plyr reshape shiny shinyWidgets tidyr]; }; + powdR = derive2 { name="powdR"; version="1.2.4"; sha256="177gzp60fvx0sk4a2vhpi37785qwn8gb6s2h9i8abys6z2qmlmg0"; depends=[baseline DT ggplot2 ggpubr nnls plotly plyr reshape shiny shinyWidgets tidyr]; }; powdist = derive2 { name="powdist"; version="0.1.4"; sha256="1my88ag5q9hwkn2wy79jl9008gpvg0bsrnyc81gkdfi7pjh2mp1z"; depends=[gamlss_dist normalp rmutil]; }; poweRlaw = derive2 { name="poweRlaw"; version="0.70.6"; sha256="14d1myxllvm1grnfiszzzxaiqpb2jpmsi19wq70r8r2wki293h7g"; depends=[pracma]; }; powerAnalysis = derive2 { name="powerAnalysis"; version="0.2.1"; sha256="0cma4v402n6wcb2gy9g1ymydzh8vimy9nfrrn8xhnjsf7x6jh215"; depends=[]; }; powerCompRisk = derive2 { name="powerCompRisk"; version="1.0.1"; sha256="11xprjn9hzi8gxrsi7wivwgchg9h2apgxa63fp466ngjfy5ybxf4"; depends=[mvtnorm]; }; - powerEQTL = derive2 { name="powerEQTL"; version="0.1.7"; sha256="1hbj1s02cybcshxlflv0icx6g4528i40kk106cd3id0g6hmdmvrz"; depends=[powerMediation]; }; + powerEQTL = derive2 { name="powerEQTL"; version="0.2.2"; sha256="0n36hclwqphc5fjyj9adah25w2x0mc1fg2k7480xwmrcx5d6h47y"; depends=[]; }; powerGWASinteraction = derive2 { name="powerGWASinteraction"; version="1.1.3"; sha256="1i8gfsk9qzx54yn661i4x9k7n7b6r1jd808wv1hcq7870mzyb27k"; depends=[mvtnorm pwr]; }; - powerLATE = derive2 { name="powerLATE"; version="0.1.0"; sha256="16hllyrigsp2zfiklx8lnh63kbidlyycza19iz94y5f8gwx3hrg2"; depends=[]; }; + powerLATE = derive2 { name="powerLATE"; version="0.1.1"; sha256="1dmvvh7ynvr8krl5p1qbg8ib1s595vqci2r80zmwsm28jhv8ka4w"; depends=[]; }; powerMediation = derive2 { name="powerMediation"; version="0.3.2"; sha256="06liw58hwvd5n55axwldrngwfqckmi5yh2i9b2c75cghqdnihvby"; depends=[]; }; powerSurvEpi = derive2 { name="powerSurvEpi"; version="0.1.0"; sha256="1xxicvw113mc2y889rklws3xml5z64sgjpn4wg95gbw6nadch7zz"; depends=[survival]; }; powerbydesign = derive2 { name="powerbydesign"; version="1.0.4"; sha256="0xd4hylx7jl4ksycz5gfjcgy92mh5c9d4r34ap1g81ybmyk7yrsj"; depends=[gdata ggplot2 lme4 MASS plyr reshape2 stringr]; }; @@ -12416,13 +12943,15 @@ in with self; { ppcor = derive2 { name="ppcor"; version="1.1"; sha256="1x9b2kb8s0bp92b17gby0jwzzr3i4cf3ap9c4nq7m8fav72g0y3a"; depends=[MASS]; }; ppgam = derive2 { name="ppgam"; version="1.0.1"; sha256="0w2jci5k0y8m7rapj8w6xq849y59m7y4fp9n3f5l6q954mbc6bv0"; depends=[evgam MASS mgcv]; }; ppgmmga = derive2 { name="ppgmmga"; version="1.2"; sha256="1dq0p3xna5r1kiyhiziz3wc78dfqh362qhna5hmkjzhljawr9jg0"; depends=[cli crayon GA ggplot2 ggthemes mclust Rcpp RcppArmadillo]; }; - ppitables = derive2 { name="ppitables"; version="0.5.2"; sha256="1fwl2mscnfkbdpdjb0vkyv6xrbi73rfkxlbpri35hfqscaxlzk98"; depends=[tibble tidyr]; }; + ppitables = derive2 { name="ppitables"; version="0.5.4"; sha256="0hssk8yf8f15x7m03x71v9yrshrzgkww8xfacbbsw5mpqcghc9zl"; depends=[tibble tidyr]; }; ppmHR = derive2 { name="ppmHR"; version="1.0"; sha256="1fc9rrk3ir3dq5d518ih67dvknhz1ln6668wy2mzsdndaysgm12g"; depends=[nleqslv]; }; + ppmSuite = derive2 { name="ppmSuite"; version="0.1.1"; sha256="0n26nfx5wkyrqvrdl4swvxb3pp4cr8kci7inkikwq7pssxgzlfpj"; depends=[]; }; ppmlasso = derive2 { name="ppmlasso"; version="1.1"; sha256="1w13p1wjl1csds1xfc79m44rlym9id9gwnp3q0bzw05f35zbfryg"; depends=[spatstat]; }; pps = derive2 { name="pps"; version="0.94"; sha256="0sirxpagqc2ghc01zc6q4dk691six9wkgknfbwaqxbxvda3hcmyq"; depends=[]; }; ppsbm = derive2 { name="ppsbm"; version="0.2.2"; sha256="0y4whxv14jqx7mqxj7n427vpbxb5rkwj8xvx0mj4knnwy9v437z4"; depends=[clue gtools Rfast]; }; pqantimalarials = derive2 { name="pqantimalarials"; version="0.2"; sha256="0azxkf1rvk9cyzr4gbp4y2vcxrxw3d4f002d5gjkvv1f4kx8faw1"; depends=[plyr RColorBrewer reshape2 shiny]; }; prLogistic = derive2 { name="prLogistic"; version="1.2"; sha256="1abwz7nqkz2qbyqyr603kl9a3rkad3f4vxhck6a9kl80xrmfrj9s"; depends=[boot Hmisc lme4]; }; + prWarp = derive2 { name="prWarp"; version="1.0.0"; sha256="1rx9yby7xwa2bgqa6a1zllan6qfchgfrg2waadmwfmjhcp8qb1mj"; depends=[Morpho]; }; prabclus = derive2 { name="prabclus"; version="2.3-2"; sha256="0hg4d7y1w18jpgvw10z8833bbbcnlkwiasx0wh6iwa2pnnybq8gl"; depends=[MASS mclust]; }; pracma = derive2 { name="pracma"; version="2.2.9"; sha256="07mzhzz73wsjjw1q05l024gcd13hwnzsxf873q9dyhw6x3shzshc"; depends=[]; }; pragma = derive2 { name="pragma"; version="0.1.3"; sha256="1n30a346pph4d8cj4p4qx2l6fnwhkxa8yxdisx47pix376ljpjfx"; depends=[]; }; @@ -12430,15 +12959,14 @@ in with self; { praise = derive2 { name="praise"; version="1.0.0"; sha256="1gfyypnvmih97p2r0php9qa39grzqpsdbq5g0fdsbpq5zms5w0sw"; depends=[]; }; praktikum = derive2 { name="praktikum"; version="0.1"; sha256="0kkydgglvqw371fxh46fi86fmdndhwq1n8qj0ynbh2gz1cn86aw1"; depends=[]; }; praznik = derive2 { name="praznik"; version="8.0.0"; sha256="037lcic87b6136b5fi9g557idd3rvglw995b94xadcdaqcpy906z"; depends=[]; }; - prc = derive2 { name="prc"; version="2019.1-23"; sha256="1aw02sj7kkzzkrxs1jpm2skfz2jrd7fyqlfc1mvkqwac39c6a9ma"; depends=[kyotil nlme]; }; prcbench = derive2 { name="prcbench"; version="0.8.2"; sha256="1b8dmahkymbnf3xxaprzkpizpibnyhjynv352qf4c7l5gvg0d7nq"; depends=[assertthat ggplot2 gridExtra memoise precrec PRROC R6 rJava ROCR]; }; prclust = derive2 { name="prclust"; version="1.3"; sha256="0p0sf8248aigs99py8mpzz743jnrf7n1nv5shag15arxz9yx7zn3"; depends=[Rcpp]; }; prcr = derive2 { name="prcr"; version="0.2.1"; sha256="0k5vl14akqf8qvak6h7a19qxn4wzpyxq7lyvdhxfh8l4gs4ca2l6"; depends=[class dplyr forcats ggplot2 irr lpSolve magrittr purrr tibble tidyr]; }; pre = derive2 { name="pre"; version="1.0.0"; sha256="07iai8vkxmx0dhnqy28gwh1hwc2iqg7bb0mwm8c68qpp8ffxwplm"; depends=[earth Formula glmnet Matrix MatrixModels partykit rpart stringr survival]; }; - precautionary = derive2 { name="precautionary"; version="0.1-2"; sha256="0fn8wapkvv5az0khj8gifs4b2hdvznsajqqnbisj2scdbk6p03hr"; depends=[data_table dplyr escalation kableExtra knitr magrittr rlang stringr]; }; + precautionary = derive2 { name="precautionary"; version="0.2-0"; sha256="13gh1h6inqzhxz3jzq4fha1g4xpyljjk6a2ng5l1jbv3jrqhm53p"; depends=[data_table dplyr escalation kableExtra knitr magrittr rlang stringr]; }; precintcon = derive2 { name="precintcon"; version="2.3.0"; sha256="1sf0mfqa77aqhbx3hg8pv582ibmfnv6vigqcd3xqsbq7nigy2ms9"; depends=[ggplot2 scales]; }; precisely = derive2 { name="precisely"; version="0.1.0"; sha256="0c44qwk1w1qic6iqkjv7sxd47x9x1ikjnvd2870izzklwv2yq2ly"; depends=[dplyr ggplot2 magrittr purrr rlang shiny shinycssloaders shinythemes tidyr]; }; - precommit = derive2 { name="precommit"; version="0.1.2"; sha256="1p00f0mn9vgij9y4bf3ryd80wirf9brmxdv1njz19cv5vgcvgz0z"; depends=[docopt fs here magrittr purrr R_cache rlang rprojroot rstudioapi usethis withr yaml]; }; + precommit = derive2 { name="precommit"; version="0.1.3"; sha256="1rmzz99wvjk0wv5csi4xmf2rc23dh3y3h3jwrd13mzs2ss5kjsq3"; depends=[docopt fs here magrittr purrr R_cache rlang rprojroot rstudioapi usethis withr yaml]; }; precrec = derive2 { name="precrec"; version="0.11.2"; sha256="1j8k48sg49qrw7ib2sv96961nmyvc4a732x20qrvs3y65d8zl1m1"; depends=[assertthat data_table ggplot2 gridExtra Rcpp]; }; predReliability = derive2 { name="predReliability"; version="0.1.0"; sha256="18s9ijg3fcg6qb0y6pnwngmv69ajm93z0xjdzkq3fp5bxk1qylyb"; depends=[cluster rpart]; }; predhy = derive2 { name="predhy"; version="0.2.0"; sha256="0l3x9ivrlb43x3qbrpw5gjyfc3n3b4bbsav1r4hl96znypwi7j9f"; depends=[]; }; @@ -12446,23 +12974,25 @@ in with self; { prediction = derive2 { name="prediction"; version="0.3.14"; sha256="0awlq5lxfia6m2b91w73rksp93rbwv5gwqb36wbji4rgq41rzbrx"; depends=[data_table]; }; predictionInterval = derive2 { name="predictionInterval"; version="1.0.0"; sha256="029hc57cblfcbqckrghf95l2rkn7acgb4yr36da01bx8bmpww0bn"; depends=[ggplot2 MASS MBESS pbapply]; }; predictmeans = derive2 { name="predictmeans"; version="1.0.4"; sha256="11282jzmlkbawsh1k4582a7yh4xxfh01sn6zp5nbdsr9c9p6vqfz"; depends=[ggplot2 lme4 Matrix nlme numDeriv pbkrtest plyr]; }; - predictoR = derive2 { name="predictoR"; version="1.1.3"; sha256="18abvns6yi9vyrcgb1dfcnb4p1qvk7q3rg0vqc95fvhq604fcxj6"; depends=[ada colourpicker corrplot DT e1071 flexdashboard glmnet kknn neuralnet plyr randomForest rattle ROCR rpart shiny shinyAce shinydashboardPlus shinyjs shinyWidgets tidyverse xgboost zip]; }; - predictrace = derive2 { name="predictrace"; version="1.1.1"; sha256="1bcjp3y7n0ycnw9cfgkxzc0zmdv9zdadwi6i16hbnc52jrc0kfpk"; depends=[dplyr here tidyr]; }; + predictoR = derive2 { name="predictoR"; version="1.1.4"; sha256="1ar1qv4w4a0sw9q1n27x8lqx4n2ipfrhsz9pnd90jxk8rgx7p4jg"; depends=[ada colourpicker corrplot DT e1071 flexdashboard glmnet kknn neuralnet plyr randomForest rattle ROCR rpart shiny shinyAce shinydashboardPlus shinyjs shinyWidgets tidyverse xgboost zip]; }; + predictrace = derive2 { name="predictrace"; version="1.2.1"; sha256="1lbqyhhc3bkbfypjaxl0a96rhb596xkbmlm0ip0f3z9g6jyxcl0a"; depends=[dplyr here tidyr]; }; predkmeans = derive2 { name="predkmeans"; version="0.1.1"; sha256="0352c50zlyzn8fczrkinayllj9jp978njjl7dazzkzypx0p20va5"; depends=[e1071 maxLik mgcv Rcpp RcppArmadillo]; }; predmixcor = derive2 { name="predmixcor"; version="1.1-1"; sha256="0v99as0dzn0lqnbbzycq9j885rgsa1cy4qgbya37bbjd01b3pykd"; depends=[]; }; predtoolsTS = derive2 { name="predtoolsTS"; version="0.1.1"; sha256="0f9fapw9yjdzj6pwcskbyfwjsvg09ahn20vrv4bgi0dx8am291rl"; depends=[caret forecast Metrics tseries TSPred]; }; prefeR = derive2 { name="prefeR"; version="0.1.1"; sha256="1wgbwbmghsnc2cargwndda0xhcdswvzd0nkjq5g895kl8zcwgpyf"; depends=[entropy mcmc]; }; - preference = derive2 { name="preference"; version="1.1.3"; sha256="1m28hj0524mp08fqbrir1bm93i2slpc0rc6frkgvydrkr4sm7vzw"; depends=[ggplot2 tidyr]; }; + preference = derive2 { name="preference"; version="1.1.6"; sha256="12gpiwd69ik4r2l67fvad0jmp78w919nhly4drxhfiizl3mw4jdn"; depends=[ggplot2 tidyr]; }; prefmod = derive2 { name="prefmod"; version="0.8-34"; sha256="1fkqp75w3im6b0l4sfs1yr2id8ffp2xbpb6lkgnv833cri787d5x"; depends=[colorspace gnm]; }; prepdat = derive2 { name="prepdat"; version="1.0.8"; sha256="19rxyss96cmjhzm69f6l1cd3vkw3wskzhxnbmrz4546x00gf9g5v"; depends=[dplyr psych reshape2]; }; prepplot = derive2 { name="prepplot"; version="0.7"; sha256="1yqiq78iqsk49ky913x4h8f3638blyamrwdhhcmzfgy4n7dnk11x"; depends=[plotrix shape]; }; preputils = derive2 { name="preputils"; version="1.0.3"; sha256="1ryrxmcm9vxhblk9r1vaay8ihff6nnd87dzd3375lfcla2fr9jzv"; depends=[data_table]; }; - prereg = derive2 { name="prereg"; version="0.4.0"; sha256="1jhlgp7ajq6mx7gn4kf3b7wqzs3v0678pa1r6p4mgvvynic8rnqj"; depends=[rmarkdown]; }; + prereg = derive2 { name="prereg"; version="0.5.0"; sha256="0bck13iiaxwpqh0rd45mp1s5d8z62ggg0wa7rmyi8a65aywiypsi"; depends=[rmarkdown]; }; presens = derive2 { name="presens"; version="2.1.0"; sha256="175nr9pqn3m6kh9bcc1gxqmqv05xdsqdw9lx385lmm1g947d2159"; depends=[marelac measurements]; }; presentes = derive2 { name="presentes"; version="0.1.0"; sha256="0d6zhishc7wxcvvglgw44pc6c172qpxb8i4iw3lqbmji7ash5zpx"; depends=[]; }; preseqR = derive2 { name="preseqR"; version="4.0.0"; sha256="1g2rnnmi45649vpy6z45v5i3wxm54s138ajqrzwi3a5r7x3xnhq1"; depends=[polynom]; }; + presize = derive2 { name="presize"; version="0.1.3"; sha256="0sqaivllmiwn8qhii03xv1rnh7ddbvb1psif5ixdyfrc1z2ws0yv"; depends=[ggplot2 kappaSize shiny shinydashboard]; }; presmTP = derive2 { name="presmTP"; version="1.1.0"; sha256="134p58zzk8i0whscvl5qdfn4niksypyxavq1m15cvw4zzk4dk6fw"; depends=[mgcv survPresmooth]; }; presser = derive2 { name="presser"; version="1.1.0"; sha256="1slkdfh0wq242adp6a60612sjz117bii3pbahn00bfmnpa9g1wya"; depends=[]; }; + prettifyAddins = derive2 { name="prettifyAddins"; version="2.0.3"; sha256="0kyvc1z5dykkrb4cnvlscjnm6xzzzsc2lg1bs012zw5x1qg5gp01"; depends=[httr rstudioapi shiny webdriver xml2 XRJulia]; }; prettyB = derive2 { name="prettyB"; version="0.2.1"; sha256="1qpqr490bpvmj1ybjbh4lhiznqa0n3chn09m7bhn9wfm3ic56s0p"; depends=[]; }; prettyGraphs = derive2 { name="prettyGraphs"; version="2.1.6"; sha256="0yjpwxdy9mkj2k33zvd5klyv4ava46i19yls87n0bvf79y90ikpy"; depends=[]; }; prettyR = derive2 { name="prettyR"; version="2.2-3"; sha256="1rs90cmr5dyry724php90mp41qwzzk1z3gxfwcj1k157qawacyhr"; depends=[]; }; @@ -12470,26 +13000,26 @@ in with self; { prettydoc = derive2 { name="prettydoc"; version="0.4.0"; sha256="0c2kxc60z9mz1wk04mdz64j3bfk0s7n6h9fjf82f31vyfmh74ikz"; depends=[rmarkdown]; }; prettymapr = derive2 { name="prettymapr"; version="0.2.2"; sha256="151jp0l728krmxcyzwjh01mvd1zhqijq0nsgjaqsh0q8n3jmndi0"; depends=[digest httr plyr rjson]; }; prettyunits = derive2 { name="prettyunits"; version="1.1.1"; sha256="1ibmzgknw5896q2i6r59jz2izblxwgb29ivvjzx50pkd1jl9l6cs"; depends=[]; }; - prevR = derive2 { name="prevR"; version="3.4.0"; sha256="1y61ggqjf3b2a5f9zprbp9ylfkcfk0jiqfymkyqci9figsnahdy1"; depends=[directlabels fields foreign GenKern ggplot2 gstat maptools rgdal sp]; }; + prevR = derive2 { name="prevR"; version="3.4.1"; sha256="02qfyc5j7rgvwl7a5pr1l41jmgjxxsrc674xfm08hcydwda5clq1"; depends=[directlabels fields foreign GenKern ggplot2 gstat maptools rgdal sp]; }; prevalence = derive2 { name="prevalence"; version="0.4.0"; sha256="0vnmglxj1p66sgkw4ffc4wgn0w4s281fk2yifx5cn4svwijv30q0"; depends=[coda rjags]; }; prevederer = derive2 { name="prevederer"; version="0.0.1"; sha256="0vkx9nrlgp36xbl95lrb5sb5yivxlcw4yvbs8hgbm31kh0vbz32f"; depends=[httr]; }; prevtoinc = derive2 { name="prevtoinc"; version="0.12.0"; sha256="0ypdxcx9gh87a7ih3cw3yai47rzv41qwh4kpk6007ai8jkjv4n9w"; depends=[dplyr purrr rlang tibble]; }; - priceR = derive2 { name="priceR"; version="0.1.4"; sha256="1c0692gahf6zhyvj3wjjcw6ffl4w7cx3kbqgv6vj2wncrjdl4548"; depends=[curl dplyr gsubfn jsonlite lubridate purrr stringi stringr]; }; + priceR = derive2 { name="priceR"; version="0.1.5"; sha256="0cky3l0ycyq42dmmipvd8dbnfcblnhnywbb8dvpma96jq76b4czv"; depends=[curl dplyr gsubfn jsonlite lubridate purrr stringi stringr]; }; pricesensitivitymeter = derive2 { name="pricesensitivitymeter"; version="1.1.1"; sha256="0zlvrzrqndnrwawwzqwpj7c7r86mb80njhv7dcm8l5qygnc4xz3b"; depends=[survey]; }; - prim = derive2 { name="prim"; version="1.0.17"; sha256="037gfs6ibkk7rjv21vi2k5jx24plss0jsxkn12arvfg5p6xan08k"; depends=[misc3d rgl]; }; + prim = derive2 { name="prim"; version="1.0.19"; sha256="1y09w4rad2x2lm6xzwb89cc2y3b274fl3d4l8w22dq3yphnaqsnx"; depends=[misc3d rgl scales]; }; primePCA = derive2 { name="primePCA"; version="1.0"; sha256="0kpyqv3l58xcyd98a7c7ggsna30j6k62aliidlyxgv2ya0g0dshv"; depends=[MASS Matrix softImpute]; }; primefactr = derive2 { name="primefactr"; version="0.1.1"; sha256="11hi75jwjxrl9p5m8yjwjb20pc9y9vkhi8sjrnisdq2hm53m483w"; depends=[]; }; primer = derive2 { name="primer"; version="1.1.1"; sha256="1hw7qd0xq3bvzk5ms9q568a3nkj3ws4jnzbmlypy8c5x3ly6pl1d"; depends=[deSolve lattice]; }; primerTree = derive2 { name="primerTree"; version="1.0.5"; sha256="1ymj4y0a8pd0r15bsqilm03b2n0a633ibzzp2h0qkv880xqbikz4"; depends=[ape directlabels foreach ggplot2 gridExtra httr lubridate plyr RCurl reshape2 scales stringr XML]; }; - primes = derive2 { name="primes"; version="1.0.0"; sha256="130awf214lwhjb4jpi05by35z2w18x4f6pzn3ics1scz82jvfm56"; depends=[Rcpp]; }; - princurve = derive2 { name="princurve"; version="2.1.4"; sha256="1b3grra328wkfsmqkkwp3lwdzhbdiwyq380qi5pl9r2jc6arnppj"; depends=[Rcpp]; }; + primes = derive2 { name="primes"; version="1.1.0"; sha256="0dy0pir88mblcm8g8mrgxs6fynayqgkcr4g40ghqincwzjd97xlv"; depends=[Rcpp]; }; + princurve = derive2 { name="princurve"; version="2.1.5"; sha256="0ifjwdpvydhn60aya84f5j0ymsq427j89j9a3g8pbigk6qnxj0g5"; depends=[Rcpp]; }; prinsimp = derive2 { name="prinsimp"; version="0.8-8"; sha256="074a27ml0x0m23hlznv6qz6wvfqkv08qxh3v1sbkl9nxrc7ak4vn"; depends=[]; }; printr = derive2 { name="printr"; version="0.1"; sha256="13yqqcwfqnbhvcxwrr6j45qhnbxng3qwn2ygkr809gibg9grw471"; depends=[knitr]; }; prioGene = derive2 { name="prioGene"; version="1.0.1"; sha256="0k1rlvmfhj1m2zp5zaac8wcwjypd6f4dd8fxxsyrzsafp9aw189l"; depends=[AnnotationDbi org_Hs_eg_db]; }; - prioritizr = derive2 { name="prioritizr"; version="5.0.2"; sha256="1m7f974h0fi9xigf551wgwrb09p6laddhqxsllb72vqhjkp5bw5k"; depends=[ape assertthat BH data_table doParallel exactextractr fasterize igraph magrittr Matrix plyr proto raster Rcpp RcppArmadillo rgeos sf sp tibble uuid]; }; + prioritizr = derive2 { name="prioritizr"; version="5.0.3"; sha256="1syp4mk1jnsyx9qlygl6pnqwxz3lhq8gk18jk8hpfdqha7as9lcb"; depends=[ape assertthat BH data_table doParallel exactextractr fasterize igraph magrittr Matrix plyr proto raster Rcpp RcppArmadillo rgeos sf sp tibble uuid withr]; }; prioritizrdata = derive2 { name="prioritizrdata"; version="0.2.4"; sha256="0027nbkvp8b2w4cciabiqjdyxhjwh47k7dc36p79mkqfarh04rgv"; depends=[raster sp]; }; - prioritylasso = derive2 { name="prioritylasso"; version="0.2.3"; sha256="1hmf81vcri0sfaphc0221skpvb2gz0zvxlmlhv7k8rhs1pvnqi8g"; depends=[glmnet survival]; }; - prism = derive2 { name="prism"; version="0.1.0"; sha256="0d2llrpw5y0svrdzbk52pjrfp76lknrw4r8ciqq0cq3l6kbynh9r"; depends=[dplyr ggplot2 httr lubridate magrittr purrr raster readr stringr]; }; + prioritylasso = derive2 { name="prioritylasso"; version="0.2.5"; sha256="1myci7akab1fg7p72q1hrchkixs7q5lagdsfpmdbvd13yy4q3h5z"; depends=[glmnet survival]; }; + prism = derive2 { name="prism"; version="0.2.0"; sha256="0gl6qmpgfdxn90aw10z4xj4ijcwj9mr0s9ahm28niinr9y89gzxk"; depends=[dplyr ggplot2 httr lubridate magrittr purrr raster readr stringr]; }; prismadiagramR = derive2 { name="prismadiagramR"; version="1.0.0"; sha256="13x3y4rv9b2d013jd6853zkq8rbxq88wlffmdnjs1rca0fnfrn4f"; depends=[DiagrammeR dplyr]; }; prismatic = derive2 { name="prismatic"; version="0.2.0"; sha256="0j077khvagzs9lxrryi4q1czk1129r93cqf1i1hiz0b3wij2bwsg"; depends=[farver]; }; prisonbrief = derive2 { name="prisonbrief"; version="0.1.0"; sha256="1fnhg6vqdabdnhvgd19vnkfrdgz8a53snfrx6m6mmdwb6cvavb8m"; depends=[data_table dplyr httr magrittr passport rlang rnaturalearth rnaturalearthdata rvest stringr tibble tidyr xml2]; }; @@ -12509,7 +13039,8 @@ in with self; { processcheckR = derive2 { name="processcheckR"; version="0.1.3"; sha256="14d8148zcnyh9ycqy5nyszrafq3mgck87w80kx2apg52gkdaq18g"; depends=[bupaR dplyr edeaR glue rlang stringr]; }; processmapR = derive2 { name="processmapR"; version="0.3.4"; sha256="0kq940j8frmbal1nqxwv7wshkyv7y3vhax6zr0ngkf18xv73y76z"; depends=[BH bupaR data_table DiagrammeR dplyr edeaR forcats ggplot2 ggthemes glue hms htmltools miniUI plotly purrr RColorBrewer Rcpp rlang scales shiny stringr tidyr]; }; processmonitR = derive2 { name="processmonitR"; version="0.1.0"; sha256="1ckr438yifpsh095j6bb65dq3rdm7cfm8k7qsjmcqwjkww4j74z8"; depends=[bupaR dplyr edeaR ggplot2 magrittr miniUI shiny]; }; - processx = derive2 { name="processx"; version="3.4.3"; sha256="07dhzijqnj2zkm3qrk4ppsv8wscn8ysdsjbidlg9zrbj1wcg4izj"; depends=[ps R6]; }; + processx = derive2 { name="processx"; version="3.4.5"; sha256="055v2gdrgqsfy8s672wsq79bqr44b4jjmcbqivx4p2d6lqx10s73"; depends=[ps R6]; }; + procmaps = derive2 { name="procmaps"; version="0.0.3"; sha256="14vbrsj37hjraskqpagr56r3rax20zszs58yag2gwiib6da1wkpj"; depends=[]; }; prodest = derive2 { name="prodest"; version="1.0.1"; sha256="16nqgd9wrjfxymwbxrnlak54cagbv3fxgbql0w5bxnmyrbbqy509"; depends=[AER DEoptim dplyr Matrix Rsolnp]; }; prodigenr = derive2 { name="prodigenr"; version="0.5.0"; sha256="1h15fwd4rclja0q80y119sah1qbyjlbaqxg360ywq9ig151lxsjq"; depends=[fs git2r rmarkdown rprojroot usethis withr]; }; prodlim = derive2 { name="prodlim"; version="2019.11.13"; sha256="03wvh3kirp1prac5nky6a5whs97rvaf4hc27x0fnh51sa17r42b8"; depends=[KernSmooth lava Rcpp survival]; }; @@ -12521,19 +13052,20 @@ in with self; { profile = derive2 { name="profile"; version="1.0.2"; sha256="0yaxc846bvc29qx0q8jag7llsgiwhzx59nhnrad1v5sqyp3slk5r"; depends=[rlang tibble withr]; }; profileModel = derive2 { name="profileModel"; version="0.6.0"; sha256="0yq8hy43h62hlz8bbf9ila4a3xcwizi1if27b78xc5y857ncwad8"; depends=[]; }; profileR = derive2 { name="profileR"; version="0.3-5"; sha256="0fgc7585a7194c67irafjnx8g2j6mn3qhcfn76c6dh28clp20qp9"; depends=[ggplot2 lavaan RColorBrewer reshape]; }; - profmem = derive2 { name="profmem"; version="0.5.0"; sha256="152dka39p9i17ydlhc92y6x6i8girn3wab1ycbqb9kva07j9d2h8"; depends=[]; }; + profmem = derive2 { name="profmem"; version="0.6.0"; sha256="0gg6ja0ifwn9jj42rw1gnyil55sl9r2y5rjb6yjcvqwd5arajp3l"; depends=[]; }; profr = derive2 { name="profr"; version="0.3.3"; sha256="00bv1q0qn46nz4zjfs0l2yfh3hk71rajlp2rrlwg442z11k79ap9"; depends=[plyr stringr]; }; proftools = derive2 { name="proftools"; version="0.99-3"; sha256="095pxyyv6k818qwcjygbz1h24k0xkqi1agns8cqh2m5g64aynd70"; depends=[]; }; - profvis = derive2 { name="profvis"; version="0.3.6"; sha256="0fbgd65b5n7bnvn2hab1w2hfzgj3ilxmpjnhrw2lj6g873x1m9b0"; depends=[htmlwidgets stringr]; }; + profvis = derive2 { name="profvis"; version="0.3.7"; sha256="1f86m426pcf90l29hf4hkirzf8f38dihk52bxbdq2gvrrdili5s3"; depends=[htmlwidgets stringr]; }; progenyClust = derive2 { name="progenyClust"; version="1.2"; sha256="0azp5pvk316s8xbawcqwqfd80fxb4xn8hc6aq87xwksc6fhwp94l"; depends=[Hmisc]; }; prognosticROC = derive2 { name="prognosticROC"; version="0.7"; sha256="0lscsyll41hpfzihdavygdzqw9xxjp48dmy4i17qsx5h01jl1h4i"; depends=[survival]; }; progress = derive2 { name="progress"; version="1.2.2"; sha256="0dgzb362641aqm8xd88iqa8jmpdm43xs0aba0d5kk6fvapnxi95l"; depends=[crayon hms prettyunits R6]; }; - progressr = derive2 { name="progressr"; version="0.6.0"; sha256="1cvb1llxz7ys4535dfl6hl3j07g24mcvkg0kl46v4nnl7ka4jx67"; depends=[digest]; }; + progressr = derive2 { name="progressr"; version="0.7.0"; sha256="0drbb5zrk5yiypbkwrz3yqiwaik77d6w7qgqzv684ycdwc3nar4h"; depends=[digest]; }; proj4 = derive2 { name="proj4"; version="1.0-10"; sha256="1l6i4735ki6y2qhmg1gmrj93rzrvgpzi23rr3a1akkqp58bnyfaz"; depends=[]; }; - projections = derive2 { name="projections"; version="0.5.1"; sha256="1wfsrrqfqi9hhxs2v4ahlb208wrs7xmvz7r6yqkd28msk0yfhmrg"; depends=[ggplot2 incidence]; }; + projections = derive2 { name="projections"; version="0.5.2"; sha256="04jblb98smn5z4jfkyqiasvii5shfa4pp69d73l20jkbfkm7bs1m"; depends=[ggplot2 incidence]; }; projects = derive2 { name="projects"; version="2.1.1"; sha256="04jlvvb8hln9i7b52yqj3f4qcdkzfrhsvjy7j2q7i60wlpdfy1in"; depends=[dplyr fs lubridate magrittr purrr readr rlang rstudioapi sessioninfo stringr tibble vctrs zip]; }; projmgr = derive2 { name="projmgr"; version="0.1.0"; sha256="1iysxcl6awvp7zbm04zyq4d9659fcz3sy711jnycsxhsk8hsvmc2"; depends=[gh magrittr]; }; - projpred = derive2 { name="projpred"; version="1.1.6"; sha256="07bixjpnvj9i5hsr9bfycnxryzsw2vg27z1lw86aj7948wdjgar1"; depends=[ggplot2 loo Rcpp RcppArmadillo]; }; + projpred = derive2 { name="projpred"; version="2.0.2"; sha256="0nx514mrfh3gv854pr71w5x3zgdnn0kinf5nh7z90q3h7ysry2mg"; depends=[dplyr gamm4 ggplot2 lme4 loo magrittr MASS mgcv optimx Rcpp RcppArmadillo rngtools rstantools tidyverse]; }; + promethee123 = derive2 { name="promethee123"; version="0.1.0"; sha256="0s1wkcrvm32dpqg9ahn10kni1xv3ll7akqz4y6yn1d36km81bf21"; depends=[cowplot ggplot2]; }; promises = derive2 { name="promises"; version="1.1.1"; sha256="002qkhcn3ri6a3w5fizjvdvrjgvqiw8i7rl9jglcnqik5kmwc61p"; depends=[later magrittr R6 Rcpp rlang]; }; promote = derive2 { name="promote"; version="1.1.1"; sha256="1cdz4xqinyzpbbgkxxd4f86n1h8zj88vp5z6w01cxd5ykyjf5411"; depends=[httr jsonlite stringr]; }; promotionImpact = derive2 { name="promotionImpact"; version="0.1.4"; sha256="0v0qk9rifhv6xkc0iqhriswnm2lwlpgrk3gqhvd4pkkn2gx4cn3s"; depends=[crayon data_table dplyr ggplot2 ggpubr KernSmooth lmtest prophet Rcpp reshape2 scales stringr strucchange]; }; @@ -12544,7 +13076,7 @@ in with self; { prophet = derive2 { name="prophet"; version="0.6.1"; sha256="08b5h4c83143q33slsa7x46bxa98rm5dg251zsb7ixvn2v0zkhk1"; depends=[BH dplyr dygraphs extraDistr ggplot2 Rcpp RcppEigen rlang rstan rstantools scales StanHeaders tidyr xts]; }; proportion = derive2 { name="proportion"; version="2.0.0"; sha256="0a71f6hz6blb7550m9x0di84vp51yjhnn952301rwlrh3axf6dbr"; depends=[ggplot2 TeachingDemos]; }; propr = derive2 { name="propr"; version="4.2.6"; sha256="16ghgzpwz6q9zlaa0pc8wqv0wpz81c75n7zwjyr1lv9y19qwlkfg"; depends=[fastcluster ggplot2 igraph Rcpp]; }; - prospectr = derive2 { name="prospectr"; version="0.2.0"; sha256="16ba2dmg1v2gsd66s25c28s413vg5xcbhicb75qwpijlgmjvfpgi"; depends=[foreach iterators Rcpp RcppArmadillo]; }; + prospectr = derive2 { name="prospectr"; version="0.2.1"; sha256="0yg2ip33548mily51hgpiiasp67pcc3x1ksmbaxcg1mpp48algyz"; depends=[foreach iterators lifecycle mathjaxr Rcpp RcppArmadillo]; }; protViz = derive2 { name="protViz"; version="0.6.8"; sha256="0rn8fjg7791a4j2k1kk1jwx40xz20bfaavvflmhyzpl398vmmy3a"; depends=[Rcpp]; }; protag = derive2 { name="protag"; version="1.0.0"; sha256="1iaw2w1d7hdvlg5vplpqc49wq08dgmm0ifvp2v0ggqb8invvdnw8"; depends=[dplyr ggplot2 RColorBrewer]; }; proteomicdesign = derive2 { name="proteomicdesign"; version="2.0"; sha256="01s47pgwxy4xx10f3qmbfv59gbaj0qw017kpkpsn33s8w7ad63r0"; depends=[MASS]; }; @@ -12557,6 +13089,7 @@ in with self; { prototest = derive2 { name="prototest"; version="1.2"; sha256="07g58hq2qdpczqhjsv6dq1bya9rs958r103n91icw5yc19bvyhi2"; depends=[glmnet intervals MASS Rcpp RcppArmadillo]; }; protr = derive2 { name="protr"; version="1.6-2"; sha256="13vgiqkqqq1w2yj5f6i6scag0mr189zmisyvi6fgaw8g9dgxpxan"; depends=[]; }; proustr = derive2 { name="proustr"; version="0.4.0"; sha256="1qp4v4vb1qh137qn7zi1d2g999z17kq6kpyxy9355mj8c49iy8pn"; depends=[attempt rlang SnowballC stringr tidyr tokenizers]; }; + provExplainR = derive2 { name="provExplainR"; version="1.0"; sha256="0vzab23q2847q1qljgjxfdg3q7s8z1szfbmgg7sksc10zk4450d3"; depends=[diffobj digest dplyr provParseR stringr]; }; provGraphR = derive2 { name="provGraphR"; version="1.0"; sha256="0s2hj8j3rjig37wpjlr2fgw2klwr6a26mxrnk1lq5d9262x6v3aa"; depends=[igraph Matrix provParseR]; }; provParseR = derive2 { name="provParseR"; version="0.3"; sha256="0cmyb6da9l0822xrzni19r1ha6zzya385hk2ym9rmchvb34lax53"; depends=[jsonlite]; }; provSummarizeR = derive2 { name="provSummarizeR"; version="1.4.2"; sha256="1pfnrvgqzpdhrsyh0y75idwj13zgcdj7ql6frpjmc0f5cggv7q1q"; depends=[dplyr provParseR]; }; @@ -12567,9 +13100,9 @@ in with self; { proxyC = derive2 { name="proxyC"; version="0.1.5"; sha256="159bc42x4shm6n3rh9fc8ziv3ivq0ipmpbasrh279hhn1prc8gg6"; depends=[Matrix Rcpp RcppArmadillo RcppParallel]; }; prozor = derive2 { name="prozor"; version="0.2.11"; sha256="1a2k69fvgi6vxgczk81kh8r2jxc6nirc51w6ac239rqjzb1zyhjm"; depends=[AhoCorasickTrie doParallel dplyr foreach Matrix plyr readr seqinr stringr]; }; prrd = derive2 { name="prrd"; version="0.0.3"; sha256="1j1hcs5h6h9nz3pdjnw9p2y837706k9yxxjgiv0mgnwyh8pmz425"; depends=[config crayon data_table DBI liteq RSQLite]; }; - prt = derive2 { name="prt"; version="0.1.0"; sha256="11idf3x5a1lv7wqfyayknvqy7crcy8w62ysziw0idwjhh0hr13kr"; depends=[assertthat backports cli crayon data_table fansi fst knitr pillar rlang tibble vctrs]; }; + prt = derive2 { name="prt"; version="0.1.2"; sha256="010y3hwjlrja24xwkwvigcf8sq9ic7ykq1q9h9nhc5cxn3768w3w"; depends=[assertthat backports cli crayon data_table fansi fst knitr pillar rlang tibble vctrs]; }; pryr = derive2 { name="pryr"; version="0.1.4"; sha256="06vj5xl9x37kbd3l5bw7sbgfdnp37spvrjrn976rxi04clqk966k"; depends=[codetools Rcpp stringr]; }; - ps = derive2 { name="ps"; version="1.3.4"; sha256="1cxfhnff22fbsr9vynhql0rhhrqfxvkb6kv11h2m740r9scwcs44"; depends=[]; }; + ps = derive2 { name="ps"; version="1.5.0"; sha256="15pyz94b0z6ibrjp25np5nd4z20whnnr35wsavdgwmsmynba2qbl"; depends=[]; }; psData = derive2 { name="psData"; version="0.2.2"; sha256="013hb6lk9rm2w08m5jbw90ndrcd4wyy2h125jx07c9bs60wh4mp4"; depends=[countrycode DataCombine reshape2 rio xlsx]; }; psSubpathway = derive2 { name="psSubpathway"; version="0.1.1"; sha256="1jzymhh1dy5w735fppqza7ilspsvyidkrdpq2yd3j5xfjckzfh5w"; depends=[GSVA igraph mpmi pheatmap]; }; psbcGroup = derive2 { name="psbcGroup"; version="1.4"; sha256="0l1hmgw4sislryws8hv7r2nglhcs6g9khg0372a70djvhz2l6gfi"; depends=[LearnBayes mvtnorm SuppDists]; }; @@ -12579,9 +13112,9 @@ in with self; { psda = derive2 { name="psda"; version="1.4.0"; sha256="0if42szf0gkgdl7d02x43i0fdb6hp47j918vx06aw7qcw6a8j3k2"; depends=[ggplot2 plyr raster rgeos sp]; }; pse = derive2 { name="pse"; version="0.4.7"; sha256="0kigfzsvx3gw7jwym4f19dydwwarwxgmha7hpy54gg0zzi4k9icl"; depends=[boot Hmisc]; }; pseudo = derive2 { name="pseudo"; version="1.4.3"; sha256="0ccf3gz2g7g5y4acpj2qnb39hrghhdganizlddg6rx7al869fffs"; depends=[geepack KMsurv]; }; - pseudorank = derive2 { name="pseudorank"; version="0.3.8"; sha256="1nj2cq8v8gj8wg23yrn8v21jwgd572gbz1wplpaxhk5v2ckhf1p0"; depends=[doBy Rcpp]; }; + pseudorank = derive2 { name="pseudorank"; version="1.0.1"; sha256="1hjcvl38di1digkqg7nysd7bkljz1v7y54z2rz10fyk9lyp9mpmy"; depends=[doBy Rcpp]; }; pseval = derive2 { name="pseval"; version="1.3.1"; sha256="1jgnv1l9adhwrmkmp6wkzz7jf7w1hyqy47ajr29l21p4g037py45"; depends=[survival]; }; - psfmi = derive2 { name="psfmi"; version="0.2.0"; sha256="11gmc48frayyn9w5hnjfis1v92mg1v640s69dzkdvqxdkrzh50bg"; depends=[car dplyr foreign ggplot2 lme4 magrittr mice miceadds mitml mitools norm pROC purrr ResourceSelection rms rsample survival tibble tidyr]; }; + psfmi = derive2 { name="psfmi"; version="0.5.0"; sha256="06v2wdrsinp721nm8qqhjs2xzqnv22yw0365x1y9gx3mahwjzk6r"; depends=[car cvAUC dplyr ggplot2 lme4 magrittr mice miceadds mitml mitools norm pROC purrr ResourceSelection rms rsample stringr survival tibble tidyr]; }; psgp = derive2 { name="psgp"; version="0.3-19"; sha256="0yaf69zk4zkpgx5zyksdxb2g4az0ci8v6r23phzcis9fd21y70ds"; depends=[automap doParallel foreach gstat intamap Rcpp RcppArmadillo rgdal sp]; }; psica = derive2 { name="psica"; version="1.0.2"; sha256="1cnrd1p8ikv0hl97jwypw8np1ypa0d8k2mizwd1clkv7inbb264g"; depends=[BayesTree gridBase party partykit randomForest Rdpack rpart]; }; psidR = derive2 { name="psidR"; version="2.0"; sha256="033bi61l9jslz4xhii19i23c10n4irqbzsfm5n54nzznwg85i6d9"; depends=[data_table foreign futile_logger openxlsx RCurl SAScii]; }; @@ -12590,82 +13123,89 @@ in with self; { pspearman = derive2 { name="pspearman"; version="0.3-0"; sha256="1l5mqga7b5nvm6v9gbl1xsspdqsjqyhhdn4gc4qlz6ld7fqfq6cx"; depends=[]; }; pspline = derive2 { name="pspline"; version="1.0-18"; sha256="1iwsw52miil1v1yl99mzl28qi8gdjr56rlasmh8faqjlpn9z477p"; depends=[]; }; pspline_inference = derive2 { name="pspline.inference"; version="1.0.2"; sha256="0va16flm7ls2ypkbyamxz9qcdwn3wj62f5s12rci5i3x34hmmxg8"; depends=[assertthat dplyr magrittr mgcv plotrix plyr reshape2 rlang]; }; + psqn = derive2 { name="psqn"; version="0.1.4"; sha256="0pvyd2w99jssqil3rli5gml6paq6nad9jaxh6qxvyggk10g16843"; depends=[Rcpp testthat]; }; + psrwe = derive2 { name="psrwe"; version="1.2"; sha256="0p0462jmr0d992fbmj8f5xsmmwb5nx6x44a4sjq5zfs0rpi31g4l"; depends=[BH cowplot dplyr ggplot2 randomForest Rcpp RcppEigen rstan StanHeaders]; }; pssm = derive2 { name="pssm"; version="1.1"; sha256="0r3d1mzc7bcz238lqq4y518400m2dqm5a1fb9gkfiari1ax099lv"; depends=[abind MASS MHadaptive numDeriv]; }; - pssmooth = derive2 { name="pssmooth"; version="1.0.2"; sha256="09x5dhwx40j1fy7bzj0z0lj7sbjlwrqn2b8ph0387prbbp9q2lxs"; depends=[chngpt MASS np osDesign]; }; + pssmooth = derive2 { name="pssmooth"; version="1.0.3"; sha256="08syh52gjaf72kq01v6b5dljmwi29nvmjmkkgmjb97zsi15z1wd3"; depends=[chngpt MASS np osDesign]; }; pstest = derive2 { name="pstest"; version="0.1.3.900"; sha256="1rhd4vgqpr9yq0pc3xql3nfgl30v20ldywapp9n967ky2dja4k0z"; depends=[glmx MASS]; }; psy = derive2 { name="psy"; version="1.1"; sha256="027whr670w65pf8f7x0vfk9wmadl6nn2idyi6z971069lf01wdlk"; depends=[]; }; - psych = derive2 { name="psych"; version="2.0.7"; sha256="13z26yk9nrgviyakkij3jc7mja8wy7al9ripab07mvy21kli79bc"; depends=[lattice mnormt nlme]; }; - psychReport = derive2 { name="psychReport"; version="1.1.0"; sha256="1vwx4qyk74zxddfhyzhi0fzp0ya9278891c8k3asp49lhy8889d0"; depends=[broom cli dplyr ez xtable]; }; + psych = derive2 { name="psych"; version="2.0.12"; sha256="0k5dw5nb7kx7f21b0z01dry99qcpnk7iaicv7xq9d35wv2hx8wca"; depends=[lattice mnormt nlme]; }; + psychReport = derive2 { name="psychReport"; version="2.0.0"; sha256="0xz401c931js3rk2c346f15im82lgahdkh3f6ls6lnb2s6q33z8p"; depends=[broom cli dplyr ez xtable]; }; psychTools = derive2 { name="psychTools"; version="2.0.8"; sha256="1g7c8mrwsy0wi0zdqy6l74mvpwlbsigyqnic5fqbx5yfvgd8b645"; depends=[foreign psych]; }; - psychmeta = derive2 { name="psychmeta"; version="2.4.0"; sha256="1l1sl7gbn370pchahwf89b97y1ylj4b2ml9vj386gla7dm0lsv2s"; depends=[boot curl data_table dplyr ggplot2 metafor progress purrr reshape2 rlang stringi stringr tibble tidyr]; }; + psychmeta = derive2 { name="psychmeta"; version="2.4.2"; sha256="0qrr4s9anap4xn8hrsz06h3k7x6hxpn8k7h5yic3mkq46qbwlg7x"; depends=[boot curl data_table dplyr ggplot2 metafor progress purrr reshape2 rlang stringi stringr tibble tidyr]; }; psycho = derive2 { name="psycho"; version="0.5.0"; sha256="0vcabk9j1yf7nz8fh3xg5rr2ia97mfkka23vbv9jya75dhgd84h2"; depends=[bayestestR dplyr effectsize ggplot2 insight parameters performance scales stringr tidyr]; }; psychometric = derive2 { name="psychometric"; version="2.2"; sha256="1b7cx6icixh8k3bv60fqxjjks23qn09vlcimqfv2x3m3nkf8p1s9"; depends=[multilevel nlme]; }; psychomix = derive2 { name="psychomix"; version="1.1-8"; sha256="0lfhfcmrk65gkr1yp317b515vmadbcf0vjcnc76d07yp6yfkz5qw"; depends=[flexmix Formula lattice modeltools psychotools]; }; - psychonetrics = derive2 { name="psychonetrics"; version="0.7.2"; sha256="0kq445bwnv89vrlgwxaakija1hd60d4iy80ws334fjm7hci9793p"; depends=[abind combinat corpcor dplyr GA ggplot2 glasso IsingSampler lavaan magrittr Matrix matrixcalc mgcv mvtnorm numDeriv optimx pbapply pbv psych qgraph Rcpp RcppArmadillo roptim tidyr ucminf VCA]; }; - psychotools = derive2 { name="psychotools"; version="0.5-1"; sha256="0nm5ngdkyskkj5akbqavdz8njsa8mr61kzknnn1kkdz6bn6zy6lq"; depends=[]; }; + psychonetrics = derive2 { name="psychonetrics"; version="0.8"; sha256="1xnjkbg3vqwn32q6qqk7kam34f0w6pghxanxr1qjp2sk7hd15hg2"; depends=[abind combinat corpcor dplyr GA ggplot2 glasso IsingSampler lavaan magrittr Matrix matrixcalc mgcv mvtnorm numDeriv optimx pbapply pbv psych qgraph Rcpp RcppArmadillo roptim tidyr ucminf VCA]; }; + psychotools = derive2 { name="psychotools"; version="0.6-0"; sha256="1qw5nfw3ww4y283rwqm0v4p2vyan4xjvjhjg8f3j6d7xprx5z8aj"; depends=[]; }; psychotree = derive2 { name="psychotree"; version="0.15-3"; sha256="18lr9dlv5l5fw88n61ch251ddgy1cv6klcj7ba3fg109b86p3bgf"; depends=[Formula partykit psychotools]; }; psychrolib = derive2 { name="psychrolib"; version="2.5.0"; sha256="154bv16fyyyp5zgcrl2ncyqy15ybjnhqmim75pba11sbww7jdfbw"; depends=[Rcpp]; }; psymonitor = derive2 { name="psymonitor"; version="0.0.2"; sha256="09288w2bk5jhnbyj516jqn5qb33yqqg5kqbg6ylqk7anlq2yg2sl"; depends=[doParallel foreach magrittr]; }; psyosphere = derive2 { name="psyosphere"; version="0.1.6"; sha256="1hcas3jk2n11lyw1ysmci0sysxf7qg9h2msqqg7q9nqp5gbf90np"; depends=[geosphere ggplot2 Hmisc lubridate plyr rgdal RgoogleMaps sp]; }; - psyphy = derive2 { name="psyphy"; version="0.1-9"; sha256="1ndc6sy662wj2qfx7r97crlqjd8fdkfvfy59qmf34bcbzbg33riz"; depends=[]; }; + psyphy = derive2 { name="psyphy"; version="0.2-2"; sha256="1i9fayfbndn65hk16mlgxrnpw18gwa46rp0iqsj1m1ggq6pscjp1"; depends=[]; }; psyverse = derive2 { name="psyverse"; version="0.1.0"; sha256="0q402z884fwnd812bs44xqbsank89risli13v3njhjc337lj29wx"; depends=[yaml yum]; }; pterrace = derive2 { name="pterrace"; version="1.0"; sha256="15k5149jqjy20cck5121zsv2mk63amn5b8qgdlacivri9dpxjns1"; depends=[doParallel foreach plotly TDA viridis]; }; ptest = derive2 { name="ptest"; version="1.0-8"; sha256="1d30a23yknf7xgqj8adgr36pnh9dpffl1v5fq682f26fk3ss30qp"; depends=[quantreg]; }; ptinpoly = derive2 { name="ptinpoly"; version="2.8"; sha256="126chp92ha48agx5i819bzdij79zbgj32msijvaid3zhxjx7qy1j"; depends=[misc3d]; }; - ptmixed = derive2 { name="ptmixed"; version="0.5.4"; sha256="1qr53wn6c3ha8zp51arm7vky35cppr188f345nddgma2m7b06j9x"; depends=[aod GLMMadaptive lme4 matrixcalc moments mvtnorm numDeriv rstudioapi tweeDEseq]; }; + ptm = derive2 { name="ptm"; version="0.2.2"; sha256="16ldvgndijp55s698053psxdin3lmsqi2ah5zs46g5s8szzhixwk"; depends=[bio3d Biostrings httr igraph jsonlite muscle RCurl seqinr XML xml2]; }; + ptmixed = derive2 { name="ptmixed"; version="1.0.1"; sha256="05k17sczzy7w13v43699bm74nyqz1y9vzylrqbwbdlm8926fjz69"; depends=[aod GLMMadaptive lme4 matrixcalc moments mvtnorm numDeriv tweeDEseq]; }; pts2polys = derive2 { name="pts2polys"; version="0.1.3"; sha256="0rmgryv0vds20npvaqvvwrhrx0grfcz9qwdy2w3bx945r0chhw39"; depends=[Rcpp]; }; ptsuite = derive2 { name="ptsuite"; version="1.0.0"; sha256="1df273p8v6zvhy2jj6imhjigwj77grx6sxqmg0sidxwqny5d1d9c"; depends=[Rcpp]; }; - ptvapi = derive2 { name="ptvapi"; version="1.1.2"; sha256="16qb1avn3hb7yrmn2nal2l47xrq4i01rn6xa2w26h18x6mfrsw9y"; depends=[assertthat digest glue httr jsonlite purrr tibble]; }; + ptvapi = derive2 { name="ptvapi"; version="1.1.3"; sha256="1wd6801vv5xpg5nglzwsr06lcsml1kr863bibpz8dp9rds7zgbzk"; depends=[assertthat digest glue httr jsonlite purrr tibble]; }; ptw = derive2 { name="ptw"; version="1.9-15"; sha256="0ikvzc5vfcs50jl5n49mhk39pcijyfdxd26adgs01h0b50zh1yi2"; depends=[nloptr]; }; ptwikiwords = derive2 { name="ptwikiwords"; version="0.0.3"; sha256="129dad1vy52sf97dqrkwa49vjhv2kvs4pmd5zvq8pxd51hqm6wy9"; depends=[]; }; ptycho = derive2 { name="ptycho"; version="1.1-4"; sha256="1llk3rpk0lf80vwvs23d6dqhgyic3a6sfjc393csj69hh01nrdvc"; depends=[coda plyr reshape2]; }; - pubchunks = derive2 { name="pubchunks"; version="0.2.2"; sha256="0mbyyx8c5pz1z8lj22sk82c5khcp8b536g6qsqqlm772fd28zwc5"; depends=[data_table rcrossref xml2]; }; - pubh = derive2 { name="pubh"; version="1.1.16"; sha256="1ic3qkrr6z22gvyv7xd8f7ji50asb2pmnc9y4c5qd79pzhphd7vx"; depends=[car dplyr emmeans Epi epiR epitools ggformula ggplot2 Hmisc huxtable lmtest magrittr moonBook sandwich sjlabelled sjmisc sjPlot survival tibble tidyselect]; }; + pubchunks = derive2 { name="pubchunks"; version="0.3.0"; sha256="14jzl0ra0d68s246a9jhfgp1wyy9g7d0rzahvl97crkklld1crvx"; depends=[data_table rcrossref xml2]; }; + pubh = derive2 { name="pubh"; version="1.1.19"; sha256="08zckmic0ysfcf16phz2dcwqj6nnh2aahl5y762xri5fb6pfdxwa"; depends=[car dplyr emmeans Epi epiR epitools ggformula ggplot2 Hmisc huxtable lmtest magrittr moonBook sandwich sjlabelled sjmisc sjPlot survival tibble tidyselect]; }; publipha = derive2 { name="publipha"; version="0.1.1"; sha256="0ssmkz4bbrp5yvqb2da0i6shzm59ydw2sqkmqkid039782sibjch"; depends=[BH loo Rcpp RcppEigen rstan rstantools StanHeaders truncnorm]; }; pubmed_mineR = derive2 { name="pubmed.mineR"; version="1.0.16"; sha256="1dcviy347lypbzwwz506d37wy5swla2vjgyqijwc37daic71bnih"; depends=[boot R2HTML RCurl XML]; }; pubmedR = derive2 { name="pubmedR"; version="0.0.3"; sha256="153br94iqayrvvgzrzx0r3ilcrmnznfdnzk8yaii01s8i1g1wxcd"; depends=[rentrez XML]; }; pubtatordb = derive2 { name="pubtatordb"; version="0.1.4"; sha256="0i5azbf75bwxxzpsr5fc2hh22pbwix00hz9dcdpn5jgp2957f7wx"; depends=[assertthat DBI dplyr R_utils readr RSQLite]; }; pullword = derive2 { name="pullword"; version="0.2"; sha256="14rln0nbd4k2cvf18iwvc56776b9g3m3cs67i7fgzabfrgj8y6db"; depends=[RCurl]; }; + puls = derive2 { name="puls"; version="0.1.1"; sha256="1mx8m3h4wlggjp12dlwbn9qhxlyy9hi70kpkn3v707wnlxqsl9vb"; depends=[cluster dplyr fda fda_usc ggplot2 monoClust purrr rlang tibble tidyr]; }; pulsar = derive2 { name="pulsar"; version="0.3.7"; sha256="0gafp8mcp34c1j93sixy3413c32vn0xy8vhxm0b8v2mznbizgjbq"; depends=[Matrix]; }; pulseTD = derive2 { name="pulseTD"; version="0.1.0"; sha256="0sdnswinpnm0vvplrh5gl9gx4p03dx175mqxzg5r52rkzd3rfbsr"; depends=[AnnotationDbi Biobase GenomicAlignments GenomicFeatures ggplot2 Rsamtools S4Vectors SummarizedExperiment]; }; pumilioR = derive2 { name="pumilioR"; version="1.3.1"; sha256="1791r5lkr6hafd2rz9f9nfy5vc03c4833f292khvd2cg43sb0bfc"; depends=[RCurl XML]; }; - puniform = derive2 { name="puniform"; version="0.2.2"; sha256="05bh66k6za5ch9x7k5hvsix88wwciabljx7har7a38y39kzavx6p"; depends=[ADGofTest metafor Rcpp RcppArmadillo]; }; + puniform = derive2 { name="puniform"; version="0.2.3"; sha256="1y47y6s76pjvp10m8rvdh7y1iidjw96a4wrr920w0js3rn4fi1fz"; depends=[ADGofTest metafor Rcpp RcppArmadillo]; }; pureseqtmr = derive2 { name="pureseqtmr"; version="1.2"; sha256="1c2pcci3s949hi8hh0h03mr3m6qw3kvihfglwavx578kjm2qw0xz"; depends=[ggplot2 plyr rappdirs stringr tibble]; }; purge = derive2 { name="purge"; version="0.2.1"; sha256="1faf8mkaxsnj63wnig5rs50hd3j6vzaj0xkdz8kn0j7y2vvshp9p"; depends=[]; }; purging = derive2 { name="purging"; version="1.0.0"; sha256="1b8f87jn6wyh4fp6b1660bd484wcf7xiajdg9dz2594aj1r94qsr"; depends=[MASS]; }; purrr = derive2 { name="purrr"; version="0.3.4"; sha256="1cj091rsjdj2xz16qhynyw72gh5cyhznifcfbrbygndfr4xwksr3"; depends=[magrittr rlang]; }; - purrrlyr = derive2 { name="purrrlyr"; version="0.0.6"; sha256="0simzpzm3w9sclg7spnyk4h1r9bxi76z3hmw7m9wv3yiwlp5f6pq"; depends=[BH dplyr magrittr purrr Rcpp]; }; + purrrlyr = derive2 { name="purrrlyr"; version="0.0.7"; sha256="03472xz0q30vjg45xv24zkd9b1w8ggi33vchxrimfnppdiqi3x0m"; depends=[BH dplyr magrittr purrr Rcpp]; }; pushbar = derive2 { name="pushbar"; version="0.1.0"; sha256="1gxarv6x32y6ssrhsq3pyihzcvpnnj7bg0jf2cpcr99da78n1d9b"; depends=[jsonlite shiny]; }; pushoverr = derive2 { name="pushoverr"; version="1.0.0"; sha256="1zazrx0szx21ymn7zlkfqkhid0ar8jblnpnf5nycj0p7dbh6d0bd"; depends=[assertthat httr]; }; puzzle = derive2 { name="puzzle"; version="0.0.1"; sha256="073n074irsvn4w1jy5xmr6l24a209kn0ypvf1d2zn3p6yd93wzss"; depends=[dplyr kableExtra lubridate plyr readr readxl reshape reshape2 sqldf tidyverse]; }; - pvaluefunctions = derive2 { name="pvaluefunctions"; version="1.6.0"; sha256="15hv2vgcgz79mbca17px15n5qy22fsrm5dirdp7s0sv6w03k03sk"; depends=[ggplot2 pracma scales zipfR]; }; + pvaluefunctions = derive2 { name="pvaluefunctions"; version="1.6.1"; sha256="0p1hgrab8yallxri1z2q3cv26q6nydzykcvc6bcv9r00wjjfh966"; depends=[ggplot2 pracma scales zipfR]; }; pvar = derive2 { name="pvar"; version="2.2.5"; sha256="1a5dxhki5nd5s1d5wwnc1dkg7mdib2s8w1i0l8mdg3f1g3l00klz"; depends=[Rcpp]; }; pvclass = derive2 { name="pvclass"; version="1.4"; sha256="1g6x75qz3xybq1xnik0hzi7mcs0gzzqd3f0iwfkzi5d1zcddnw13"; depends=[Matrix]; }; pvclust = derive2 { name="pvclust"; version="2.2-0"; sha256="0082icm54k2yq60k06qpr92a626k39j2jr0046lva4ylmhxqb4kq"; depends=[]; }; + pvldcurve = derive2 { name="pvldcurve"; version="1.2.6"; sha256="0vyrrgbj955jkir25svq59h8darvaf33m985mcy1dx6836zqwgap"; depends=[ggplot2]; }; pvsR = derive2 { name="pvsR"; version="0.3"; sha256="1ijmqlcsc8z0aphdd3j37ci8yqsy50wnr2fwn7h8fxbyd12ax2nj"; depends=[httr nnet XML]; }; pwr = derive2 { name="pwr"; version="1.3-0"; sha256="1kfzy73v3z6ipc3kdfkcjrp4b4p5k54nwk796gqi36srm93hgc2v"; depends=[]; }; pwr2 = derive2 { name="pwr2"; version="1.0"; sha256="0zfv7z5yymw310r1sqm8ivsc2pv6dgk2k4b1axmm92gsaj53cn7p"; depends=[]; }; pwr2ppl = derive2 { name="pwr2ppl"; version="0.1.2"; sha256="1d6rlgmwpnbnxjjpfxrxp0iwaqh1vgp8jpnd7iwf76xw30d3gv0v"; depends=[afex car dplyr ez lavaan MASS MBESS nlme phia tidyr]; }; pwrAB = derive2 { name="pwrAB"; version="0.1.0"; sha256="0ifyw40m9gsijw3vm9qb8qk4yydmdixfdpdp45x2hk93j8v61jm1"; depends=[]; }; - pwrFDR = derive2 { name="pwrFDR"; version="1.95"; sha256="0xphr4zrn7cav66kw6g52nhc8vvxacvmflvzy32gqy5l7jc89f4q"; depends=[]; }; + pwrFDR = derive2 { name="pwrFDR"; version="2.8.6"; sha256="1k4r9mca35ddfj2dpcrz4k8wfsf15p084iwmk75s18akrin2lzmp"; depends=[]; }; pwrRasch = derive2 { name="pwrRasch"; version="0.1-2"; sha256="13fr4yfk8aky1vv36pllx673l4lg9q7i661vbyn2zabyizd2rw3b"; depends=[]; }; pwt = derive2 { name="pwt"; version="7.1-1"; sha256="0926viwmwldmzlzbnjfijh00wrhgb0h4h0mlrls71pi5pjfldifa"; depends=[]; }; pwt8 = derive2 { name="pwt8"; version="8.1-1"; sha256="1iig0x90ilzh3hdki0h33qgrra8r94rw4bk1x8y7i6c1may8y0v6"; depends=[]; }; pwt9 = derive2 { name="pwt9"; version="9.1-0"; sha256="0m2df89lali9945avcv4gdjpxch9in7vdd042nx0q8nv0alb4ijd"; depends=[]; }; pxR = derive2 { name="pxR"; version="0.42.4"; sha256="1r0ffr5wxf67i1jh67v06vcmifw4hhhasd4aivic94bkvq4sqmn5"; depends=[plyr reshape2 RJSONIO stringr]; }; pxweb = derive2 { name="pxweb"; version="0.9.1"; sha256="00xp7idhsirmpl970yxnxp6xn128jm5kwsmdwhys32wlbd9kzspc"; depends=[checkmate httr jsonlite]; }; - pyMTurkR = derive2 { name="pyMTurkR"; version="1.1.4"; sha256="1dv8v01gd79jvqr54rb7k9x8i7v279f82slbmpvsd5r0k9zg2bfq"; depends=[curl reticulate XML]; }; pycno = derive2 { name="pycno"; version="1.2"; sha256="0ha5css95xb98dq6qk98gnp1al32gy6w5fkz74255vs4hmkwfzw2"; depends=[maptools rgeos sp]; }; - pyinit = derive2 { name="pyinit"; version="1.0.3"; sha256="0sj7r52a53x57ff8b34s6p2y638b85fin0cxrndhpsk392sds0ki"; depends=[robustbase]; }; + pyinit = derive2 { name="pyinit"; version="1.1.1"; sha256="122cgww99icdchr20qyn62q8pv1r817iyrfd6bj7zsq900x9gkxs"; depends=[robustbase]; }; pyramid = derive2 { name="pyramid"; version="1.5"; sha256="0lakn9knmhqvhrp98sc3hhwd4bilpplxbr5j9bv8w6li0qd3d04a"; depends=[]; }; pysd2r = derive2 { name="pysd2r"; version="0.1.0"; sha256="1dqvgdxj6m683wkjyjhv685xnhl9328bm921zphm1i9p70fahs0n"; depends=[knitr reticulate tibble]; }; pzfx = derive2 { name="pzfx"; version="0.3.0"; sha256="0f8bvwnk44wq8j58rw80b9bclknrh4a3iqdl3p4y26q100cpisgr"; depends=[xml2]; }; + qCBA = derive2 { name="qCBA"; version="0.5.1"; sha256="1r9khpmdxjcnlbx4ccg26vsyp3wdc06bvlx9yl9zm4kwfi68aj9y"; depends=[arc arules rJava]; }; qGaussian = derive2 { name="qGaussian"; version="0.1.8"; sha256="02xy35xg4swr1ldnsbywnz2h0ga1pbsivnj0aqmpll7kvwl9qz4c"; depends=[Rcpp robustbase zipfR]; }; qLearn = derive2 { name="qLearn"; version="1.0"; sha256="1ilxmgazm8gjz8c1hhbp4fccibnvnalxrag8b0rn081zsqmhf094"; depends=[]; }; qMRI = derive2 { name="qMRI"; version="1.2"; sha256="10x59g8awxjib5j5mc1yd5wsibk3z6ki6zifxsg8azl0zblxbscf"; depends=[adimpro aws awsMethods oro_nifti stringr]; }; qad = derive2 { name="qad"; version="0.2.0"; sha256="13yz1aw394n4l4ys5bmmynm821ph4ggxdviv6ky3hq45y494rdvh"; depends=[copula data_table doParallel dplyr foreach ggExtra ggplot2 viridis]; }; qap = derive2 { name="qap"; version="0.1-1"; sha256="0d2d1ni1camixyi45lfy00f4pn3p063k7bsi8gj5scp6n15mdgb0"; depends=[]; }; + qape = derive2 { name="qape"; version="1.0"; sha256="15zw02wx9cyn3m9kz64wl0vl9573lml3wr6f1gf949ll2jidhd7c"; depends=[dplyr lme4 Matrix mvtnorm plyr]; }; qat = derive2 { name="qat"; version="0.74"; sha256="04n1jnbkf9dzafjh1n5d4q9p7hvyhnr63nmgl51jqxcf3nan5rlx"; depends=[boot fields gdata gplots moments ncdf4 XML]; }; + qbld = derive2 { name="qbld"; version="1.0.1"; sha256="0agx32f2pf1hzs3and40zd7kfkjml7qjbnn0im4dr2v10h1jz6c0"; depends=[knitr mcmcse Rcpp RcppArmadillo RcppDist rmarkdown stableGR]; }; qboxplot = derive2 { name="qboxplot"; version="0.2"; sha256="07f05n7zxgwyxg2r5fz691ra64m218w9v874xfzjx6671c40y1q2"; depends=[]; }; qcQpcr = derive2 { name="qcQpcr"; version="1.5"; sha256="1298zla8z5w9z4idc07v3ca9rc1afx853y7iz3jmqnqnv8mr0s48"; depends=[ggplot2]; }; qcapower = derive2 { name="qcapower"; version="0.1.0"; sha256="14vszidjvyi8namwv5k0hpgdw1dpns5ilvxfwa920ivdg35709ki"; depends=[devtools ggforce ggplot2]; }; @@ -12673,21 +13213,21 @@ in with self; { qccrs = derive2 { name="qccrs"; version="0.1.0"; sha256="0lwrmf2809zzdj5f25bb1psh57ibyw90ra41fy2i9vjmgph9wgiq"; depends=[dplyr magrittr purrr tibble]; }; qcr = derive2 { name="qcr"; version="1.2"; sha256="10770a1rijhl2mhri8vgcdp9k17vbn93z0kiv1fsdd8z48ywbwx4"; depends=[fda_usc MASS mvtnorm qcc qualityTools]; }; qcv = derive2 { name="qcv"; version="1.0"; sha256="0hf02l9c1cpzs02mfn9swfc8l635qsvh6xrhj21g19h5rxaf8jwg"; depends=[]; }; - qdap = derive2 { name="qdap"; version="2.4.1"; sha256="136vmcsnclcc1bgvfrsxq5f7vqpsf3590bx8j9770xfw9gx27ynw"; depends=[chron dplyr gdata gender ggplot2 gridExtra igraph NLP openNLP plotrix qdapDictionaries qdapRegex qdapTools RColorBrewer RCurl reshape2 scales stringdist tidyr tm venneuler wordcloud xlsx XML]; }; + qdap = derive2 { name="qdap"; version="2.4.3"; sha256="1fadzq7afavxfhcd8q6xy3g8d7jwy24zz1da2ig9bd8vrk5zjmnx"; depends=[chron dplyr gender ggplot2 gridExtra igraph NLP openNLP openxlsx plotrix qdapDictionaries qdapRegex qdapTools RColorBrewer RCurl reshape2 scales stringdist tidyr tm venneuler wordcloud XML]; }; qdapDictionaries = derive2 { name="qdapDictionaries"; version="1.0.7"; sha256="0jdx7bxmvc4p41jb4fhaagg5jsbsi7gva870cmyia72li52grhyn"; depends=[]; }; qdapRegex = derive2 { name="qdapRegex"; version="0.7.2"; sha256="1xa8q1way3gjadrjh3mv3xr4c6b4h16nd2c6lgl969difplpfz9p"; depends=[stringi]; }; qdapTools = derive2 { name="qdapTools"; version="1.3.5"; sha256="09byvv39qmdcavlykpcvk248l2f7sw0pq64ynq2xffmnga3ji24c"; depends=[chron data_table RCurl XML]; }; qdm = derive2 { name="qdm"; version="0.1-0"; sha256="0cfxyy8s5zfb7867f9xv9scq9blq2qnw68x66m7y7nqlrrff5xdr"; depends=[]; }; qfasar = derive2 { name="qfasar"; version="1.2.1"; sha256="14370bmq4qx5j02va13wz52m2lgl4vb992p9587z9v2sxl1v4jjg"; depends=[Rsolnp]; }; qgam = derive2 { name="qgam"; version="1.3.2"; sha256="0lks2cj0p7irp1i01756v1l7i26d7alax1fbkc20qd6wpz840fi7"; depends=[doParallel mgcv plyr shiny]; }; - qgcomp = derive2 { name="qgcomp"; version="2.4.0"; sha256="0ddivv3y8y1984pkiw8346qy6ca90vazir3rvrmzvl88xz6ydvg1"; depends=[arm future future_apply generics ggplot2 gridExtra markdown pscl survival tibble]; }; + qgcomp = derive2 { name="qgcomp"; version="2.6.0"; sha256="0cvjic0xjhling8411s559ph27ss379ywrf70qyj9acskfhy5p8s"; depends=[arm future future_apply generics ggplot2 gridExtra pscl survival tibble]; }; qgg = derive2 { name="qgg"; version="1.0.4"; sha256="1xyviy73jl76bpv5izlkgf171qrypgv2wm5mi3s06cb7md8psrkb"; depends=[data_table MASS MCMCpack statmod]; }; qgraph = derive2 { name="qgraph"; version="1.6.5"; sha256="0pwys9irxvp0ap158drplyypkplbmwqinv0fmlsblk7q875cr592"; depends=[abind BDgraph colorspace corpcor d3Network dplyr fdrtool ggplot2 ggraph glasso gtools Hmisc huge igraph jpeg lavaan Matrix pbapply plyr png psych Rcpp reshape2 tidygraph]; }; qgshiny = derive2 { name="qgshiny"; version="0.1.0"; sha256="0ydhwg4abn8n9pwnjnwf1n1k854zw31z8f2splzdm5j279lsjg3r"; depends=[rmarkdown shiny]; }; qgtools = derive2 { name="qgtools"; version="2.0"; sha256="1gj7vbam53yr2rnxzfxng1p107bjcyjmyj47cxyzaiv19pznkbmw"; depends=[]; }; qha = derive2 { name="qha"; version="0.0.8"; sha256="0sdf6g6884wn73i237xkwszg2mq8xddhvyy225qzpplh5za4pnhl"; depends=[ade4 FactoClass FactoMineR]; }; qicharts = derive2 { name="qicharts"; version="0.5.5"; sha256="0bl1f64b5n8q9jhzh3rqfyh9613qiy9mhcy2xsn16jyrj4hmj0jd"; depends=[ggplot2 lattice latticeExtra scales]; }; - qicharts2 = derive2 { name="qicharts2"; version="0.6.1"; sha256="14s8fji9hmsi3675n6nsy0mh1myj54bm18fssax2h0s96742lz79"; depends=[ggplot2 scales]; }; + qicharts2 = derive2 { name="qicharts2"; version="0.7.1"; sha256="1n6a5v6i3cqh3lib875rlc612a1h21zn39lsnn4kgfxsp2chcz62"; depends=[ggplot2 scales]; }; qif = derive2 { name="qif"; version="1.5"; sha256="12azs7c0anpd71d5663y1jrhirry6cr78wislp4fk64hmsbx7sx4"; depends=[MASS]; }; qiitr = derive2 { name="qiitr"; version="0.1.1"; sha256="0qbqx7g4np2ygyxiqmq5cww1az6ijjx6na6b1mp4ywmyxkjg3k29"; depends=[httr jsonlite purrr rstudioapi]; }; qkerntool = derive2 { name="qkerntool"; version="1.19"; sha256="14inry2hqvkmy0y2y3cl75ri4vri0hirv98gw2rymny69lia5x0s"; depends=[class]; }; @@ -12702,12 +13242,13 @@ in with self; { qpmadr = derive2 { name="qpmadr"; version="0.1.0"; sha256="19q9xwkaklkvxvwmnhn3dm2rzcpwl9swygmzlcqa8008m019film"; depends=[checkmate Rcpp RcppEigen]; }; qqman = derive2 { name="qqman"; version="0.1.4"; sha256="1v9s9ag1hfb47py87wb2nad4mbsfx35832hdmrh5kxrb2f11zl1s"; depends=[calibrate]; }; qqplotr = derive2 { name="qqplotr"; version="0.0.4"; sha256="1zy7mlnll0infr2las5c28vi5da04rm869dpccwcws1467mhys3k"; depends=[dplyr ggplot2 knitr MASS robustbase]; }; + qqr = derive2 { name="qqr"; version="0.0.1"; sha256="1vi4nbm356vahm4hnvy686nysbn4n63p9cjd4i9dm73lhsf9ilmn"; depends=[dplyr rvest stringr tidyverse xml2]; }; qqtest = derive2 { name="qqtest"; version="1.2.0"; sha256="1v0qbbp2dpqflpg7yif7hipwdbz27isfyfwcia1ln7z0nnvkjm8c"; depends=[]; }; qqvases = derive2 { name="qqvases"; version="1.0.0"; sha256="1fli4v1slmnwcmzmmfw84sa4mx3xzv3im1q0plb8811sbsgmwdvl"; depends=[shiny shinythemes]; }; qrLMM = derive2 { name="qrLMM"; version="2.1"; sha256="1viyllsd08dwgd5z930ml1nrcc9saaa18i5sx0bska8b0s7qh414"; depends=[ald lqr mvtnorm psych quantreg]; }; qrNLMM = derive2 { name="qrNLMM"; version="2.0"; sha256="0j69zhs1v4546xrkwra9c2q3kmhf593vi05yjn3b3s5nzh2k0i1x"; depends=[ald lqr mvtnorm psych quantreg]; }; qrage = derive2 { name="qrage"; version="1.0"; sha256="00j74bnkcpp0h8v44jwzj67q9aaw47ajc2fvgr6dckj9rymydinl"; depends=[htmlwidgets]; }; - qrandom = derive2 { name="qrandom"; version="1.2.2"; sha256="1s0frb3qjaraigx79g0sm60dj216jrmp1lgzcvjk3rh7xdjhjrkn"; depends=[curl jsonlite Rmpfr]; }; + qrandom = derive2 { name="qrandom"; version="1.2.3"; sha256="0ddk1841viqbyzn292i30a73nswdkhq032lxsphh0j6hp7zsppz4"; depends=[curl jsonlite Rmpfr]; }; qrcm = derive2 { name="qrcm"; version="2.2"; sha256="04cd78vqqp7pprrfpcza03g4pcffgl42qsax1285fbmxjqhb3yks"; depends=[pch survival]; }; qrcode = derive2 { name="qrcode"; version="0.1.1"; sha256="12j0db8vidlgkp0dcjyrw5mhhvazl7v7gpn9wsf2m0qnz1rm4igq"; depends=[R_utils stringr]; }; qrencoder = derive2 { name="qrencoder"; version="0.1.0"; sha256="1lg60lg2fiqdw0m228i8pln2p0kqp9f21qmrx6r6rwxifvwlfhv8"; depends=[base64enc png raster Rcpp]; }; @@ -12715,21 +13256,23 @@ in with self; { qrmdata = derive2 { name="qrmdata"; version="2019-12-03-1"; sha256="0738wiac0dgani0yy61kvpra7zj8qj5ak627i8cjd42zf1yjziz5"; depends=[xts]; }; qrmix = derive2 { name="qrmix"; version="0.9.0"; sha256="1r695d9bmmngvblh9jj0rnjymdaln9w0jywz51wla0bdssssf845"; depends=[MASS quantreg]; }; qrmtools = derive2 { name="qrmtools"; version="0.0-13"; sha256="1pr0q0wh3xjy3y59nkbpqfkakagbank3b31150rlxy72hkf52g1y"; depends=[ADGofTest lattice Quandl quantmod rugarch xts zoo]; }; - qrng = derive2 { name="qrng"; version="0.0-7"; sha256="1dw1qqajxavlnfyh6xn58069fpfza28x1xjzd3diqlcxxlb4hjaf"; depends=[copula randtoolbox]; }; + qrng = derive2 { name="qrng"; version="0.0-8"; sha256="1yagh7llrg208mdmwyq7gy4c7h20hj4s5ikp6nc3q8pl7avmq3jc"; depends=[copula randtoolbox]; }; qrnn = derive2 { name="qrnn"; version="2.0.5"; sha256="0ligz67kbfg5cmvacnb7y0ms1v0c7mbvbcfsxyfiz543ppl3xn1v"; depends=[]; }; - qs = derive2 { name="qs"; version="0.23.2"; sha256="06cc9qnnsdc5w76ip3326zcmny4sli7n10yc4pkcv7x5l6r96ddz"; depends=[RApiSerialize Rcpp stringfish]; }; + qs = derive2 { name="qs"; version="0.23.4"; sha256="0rvklaawyg4d48x559zj59sk34afhms7ajn90dqdvvrqhj7fbbq6"; depends=[RApiSerialize Rcpp stringfish]; }; + qsimulatR = derive2 { name="qsimulatR"; version="1.0"; sha256="0d2al6rnsyj58jhwczn2rx09b007s2yjihpk7i65law7v8dmxiaf"; depends=[]; }; qsort = derive2 { name="qsort"; version="0.2.3"; sha256="1xvp29dijfa2207wyw3z09rmffn61fngfy0f00qjk284n1jnnvrg"; depends=[cowplot ggplot2 gridExtra purrr]; }; + qst = derive2 { name="qst"; version="0.1.2"; sha256="0f5c4088y9c5fxyy2dyfkp049lnzvys3zyizazxsa82xwkwsbc8a"; depends=[DBI dbplyr dplyr magrittr RSQLite tibble]; }; qsub = derive2 { name="qsub"; version="1.1.0"; sha256="0i52bibc782k09f5hp3ic9ll14fsrwjnkdxlb0mhkjvsqm7m5hc5"; depends=[dplyr glue pbapply processx purrr random readr ssh stringr tidyr]; }; qte = derive2 { name="qte"; version="1.3.0"; sha256="0x65n2qyq1py0nrachxkqd273mywkw433ai5x6ni3ak4ckbp3g66"; depends=[BMisc formula_tools ggplot2 Hmisc knitr msm pbapply quantreg texreg]; }; qtl = derive2 { name="qtl"; version="1.46-2"; sha256="0rbwcnvyy96gq1dsgpxx03pv423qya26h6ws5y0blj3blfdmj83a"; depends=[]; }; - qtl2 = derive2 { name="qtl2"; version="0.22-11"; sha256="0dfdzjylqzc92dcszawc8cyinxccjm3p36v9vcq9ma818pqcanmr"; depends=[data_table jsonlite Rcpp RcppEigen RSQLite yaml]; }; + qtl2 = derive2 { name="qtl2"; version="0.24"; sha256="1558khh0zkwm0rdk87krv9836krvwv5h7ymlz9bsrgcvypyr9186"; depends=[data_table jsonlite Rcpp RcppEigen RSQLite yaml]; }; qtl2convert = derive2 { name="qtl2convert"; version="0.22-7"; sha256="0i2s4hsab5fvxdjapgwchs1shi658ir06i1dqlqi79q0avdjw4l0"; depends=[qtl qtl2 Rcpp]; }; qtl2fst = derive2 { name="qtl2fst"; version="0.22-7"; sha256="121rf6bqva7rk6ab3fxlil131fb7p0bffq6yq4vgs50qjlayxyd2"; depends=[fst qtl2]; }; - qtl2pleio = derive2 { name="qtl2pleio"; version="1.3.0"; sha256="07dx8fslsl6x5841dxnmhmi9ra806gnjr4inc7n13hpy8iwpcsrb"; depends=[dplyr furrr gemma2 ggplot2 magrittr MASS Matrix Rcpp RcppEigen rlang testthat tibble]; }; + qtl2pleio = derive2 { name="qtl2pleio"; version="1.4.3"; sha256="0az71vgj1gv7rfz0hnc9rysh49ak2pnkvmih5mwmymr4an84c34k"; depends=[dplyr gemma2 ggplot2 magrittr MASS Rcpp RcppEigen rlang tibble]; }; qtlDesign = derive2 { name="qtlDesign"; version="0.941"; sha256="138yi85i5xiaqrns4v2hw46b731bdgnb301wg2h4cfrxvrw4l0d5"; depends=[]; }; qtlbook = derive2 { name="qtlbook"; version="0.18-8"; sha256="1c849xy2ki7niddajv5wnsm0zdp5381w8zm9lc8rvkdbs2v6rhf4"; depends=[]; }; qtlc = derive2 { name="qtlc"; version="1.0"; sha256="17ij4alx4qg556b5kq7qsjygj5jf8iyx1f0v52pvx1z2sm6nppww"; depends=[plot3D rgl tiff]; }; - qtlcharts = derive2 { name="qtlcharts"; version="0.11-6"; sha256="114h19d741abyz7c0w0lir7m7816hw92lnd4shb3d9m94a9dwxqp"; depends=[htmlwidgets qtl]; }; + qtlcharts = derive2 { name="qtlcharts"; version="0.12-10"; sha256="1s7kbjiacjqi6sm5jaxmip3vp8hmqqypllgsidbxnhi6ycr19804"; depends=[htmlwidgets qtl]; }; qtlhot = derive2 { name="qtlhot"; version="1.0.4"; sha256="0gf0fsq91g830vqg5kz01zznm40qpjncy964ccvmms3i6d3hxd9m"; depends=[corpcor mnormt qtl]; }; qtlmt = derive2 { name="qtlmt"; version="0.1-6"; sha256="023h60z8d05832l2g7mg776hfjb0i7xpvhz3i899rc3h5pgjd94c"; depends=[]; }; qtlnet = derive2 { name="qtlnet"; version="1.5.4"; sha256="0jdf3hyzas0lyv2v4gqai9mhh7218a1mvm0nlwv9hfdbij0hi84v"; depends=[graph igraph pcalg qtl sem]; }; @@ -12739,7 +13282,7 @@ in with self; { quadmesh = derive2 { name="quadmesh"; version="0.4.5"; sha256="0wppxi8g3dq7x4f6dsv7843fhdb43rx45lky4aanqa2im81qa7l8"; depends=[geometry gridBase png raster reproj scales sp viridis]; }; quadprog = derive2 { name="quadprog"; version="1.5-8"; sha256="1ka9g8zak8sg4y2xbz93dfrldznlk9qpd4pq9z21cdcdn3b8s4i2"; depends=[]; }; quadprogXT = derive2 { name="quadprogXT"; version="0.0.5"; sha256="1yna2kx9pr58vyy6f4mwx4a6avjz84wwhcary88v1k0ihhv9swcz"; depends=[quadprog]; }; - quadrupen = derive2 { name="quadrupen"; version="0.2-7"; sha256="05yn9cnnc1481k8yqc6dg5hcv0ll4v3h2yw3qyaarwhgyxiips11"; depends=[ggplot2 Matrix Rcpp RcppArmadillo reshape2 scales]; }; + quadrupen = derive2 { name="quadrupen"; version="0.2-8"; sha256="1n3wqbdfwkrajhdkng6f8ixdz94znpqdfss872wrk0rz9bhpa03l"; depends=[ggplot2 Matrix Rcpp RcppArmadillo reshape2 scales]; }; qualCI = derive2 { name="qualCI"; version="0.1"; sha256="09mzsy5ryyrn1gz9ahrh95cpfk7g09pmjjy0m82fh4xc7j5w6kpf"; depends=[combinat]; }; qualV = derive2 { name="qualV"; version="0.3-3"; sha256="1yyqk223ydcc0125gsn33a4mcdp8bd76fpn8kj9bfz9g78b8dqmx"; depends=[KernSmooth]; }; qualityTools = derive2 { name="qualityTools"; version="1.55"; sha256="1c2p78dhwqvzb2k01dvwb41a6hlr2iwpw6fv91036x30rphjzb88"; depends=[MASS Rsolnp]; }; @@ -12750,16 +13293,19 @@ in with self; { qualypsoss = derive2 { name="qualypsoss"; version="1.0.0"; sha256="1pvf9b9yw8317wnh1x1jkmwl4cl0r9q7npfw0xzgbs8mfpl9j2ah"; depends=[doParallel foreach MASS mvtnorm]; }; quantable = derive2 { name="quantable"; version="0.3.6"; sha256="15q4phc2j7aihl8f4qzpdwxcvshq2cfzkfcxc8k4qypsxk9a00sb"; depends=[caret dplyr e1071 ggplot2 ggrepel gplots Matrix plyr pROC RColorBrewer readr reshape2 rlang scales stringr tibble tidyr]; }; quantdates = derive2 { name="quantdates"; version="1.0"; sha256="1hyds8rwr1yg740aq4w5fqjrwdf3dl4phf8mj8qsgbb7i0wbbf3q"; depends=[lubridate]; }; - quanteda = derive2 { name="quanteda"; version="2.1.1"; sha256="1wlrd7g2b459pnkqhihxhn74f37py1c9pxrdzp5xzp4mnbdxcsj8"; depends=[data_table digest extrafont fastmatch ggplot2 ggrepel jsonlite magrittr Matrix network proxyC Rcpp RcppArmadillo RcppParallel sna SnowballC stopwords stringi xml2 yaml]; }; - quanteda_textmodels = derive2 { name="quanteda.textmodels"; version="0.9.1"; sha256="04c43hk6yx06m11s01aw0sqjd2yip7l7wzlbif600hvwxgs74knn"; depends=[ggplot2 LiblineaR Matrix quanteda Rcpp RcppArmadillo RcppParallel RSpectra RSSL SparseM stringi]; }; + quantdr = derive2 { name="quantdr"; version="1.1.0"; sha256="0ziqms7xdyrkxddniq1h7p2zb1ppi1mxqj78ml8bdpzw5f7yn6ml"; depends=[dr KernSmooth MTS mvtnorm quantreg]; }; + quanteda = derive2 { name="quanteda"; version="2.1.2"; sha256="13rjwgmg5v1dbryrs9ifyy76s5ib6wrbrm2y5af44vhf1h6p9cvy"; depends=[data_table digest extrafont fastmatch ggplot2 ggrepel jsonlite magrittr Matrix network proxyC Rcpp RcppArmadillo RcppParallel sna SnowballC stopwords stringi xml2 yaml]; }; + quanteda_textmodels = derive2 { name="quanteda.textmodels"; version="0.9.2"; sha256="0wf5gvq9lndhl5z70qknqs7svxs60c1na584siv5pvm1a4irz60d"; depends=[ggplot2 glmnet LiblineaR Matrix quanteda Rcpp RcppArmadillo RcppParallel RSpectra SparseM stringi]; }; + quanteda_textplots = derive2 { name="quanteda.textplots"; version="0.90"; sha256="1adbyfnhmxx8p0xi962nha6g4n1kqs0z0zbkhva3c8frw669l5mg"; depends=[data_table extrafont ggplot2 ggrepel igraph Matrix network quanteda quanteda_textmodels quanteda_textstats RColorBrewer Rcpp sna stringi]; }; + quanteda_textstats = derive2 { name="quanteda.textstats"; version="0.91"; sha256="12k7ahzijsxgbqrxzdfqfhj0m6xxrf8j7n04ln01c2m2mvnrm03z"; depends=[data_table digest Matrix nsyllable proxyC quanteda Rcpp RcppArmadillo RcppParallel stringi]; }; quantification = derive2 { name="quantification"; version="0.2.0"; sha256="116cp88q9cmizxc2a8lsysa1vwyp1y86457fx5qkq5dcm4g721g8"; depends=[car]; }; quantileDA = derive2 { name="quantileDA"; version="1.1"; sha256="0jbklxsy33j7clcw97qq4ijwkrb94v2m11gjcfa38vplfxm9913q"; depends=[]; }; quantilogram = derive2 { name="quantilogram"; version="2.1.1"; sha256="07mvgbk5qhkaihk2dn5c8cfac2xd9hfglh284sg4jkrkq0cfgrl8"; depends=[np quantreg SparseM]; }; quantities = derive2 { name="quantities"; version="0.1.5"; sha256="1ic44xm7mqj428nd3hqv80nhdzsda87yp9ifxayf46yrxi8p6khf"; depends=[errors Rcpp units]; }; quantkriging = derive2 { name="quantkriging"; version="0.1.0"; sha256="0v6kckgzhgsn3158sc06xszdhmk8sfny10j1qyppxsl2hk89n8jf"; depends=[ggplot2 hetGP Matrix reshape2]; }; - quantmod = derive2 { name="quantmod"; version="0.4.17"; sha256="1ss441rwlr88kz212m0wgx0hwgwi41rhy1jncg2lgqzqfvr5dzqa"; depends=[curl TTR xts zoo]; }; + quantmod = derive2 { name="quantmod"; version="0.4.18"; sha256="0dbcrncv06iqcbkky95dd7l32xq0hhbnkb0kj8wwzym1jf748h5a"; depends=[curl TTR xts zoo]; }; quantoptr = derive2 { name="quantoptr"; version="0.1.3"; sha256="0f9vy9yhya4wpya8n345s6n7a5sb29chdkl5fz6dwa31lp1mvvj3"; depends=[quantreg Rdpack rgenoud stringr]; }; - quantreg = derive2 { name="quantreg"; version="5.61"; sha256="0kby1crnzkdg5sczwqapfpkr58apyzrrx85khigcqggmhhwl44wk"; depends=[conquer Matrix MatrixModels SparseM]; }; + quantreg = derive2 { name="quantreg"; version="5.75"; sha256="05mb1qmwah5sdgg2z7m36lqkh479phvb1cx4sjnv1ykvmi9alxv5"; depends=[conquer Matrix MatrixModels SparseM]; }; quantreg_nonpar = derive2 { name="quantreg.nonpar"; version="1.0"; sha256="1f9120awnkwsgdiqg98lg7xs5l4y80930869x6k9q76595r5m92k"; depends=[fda mnormt quantreg Rearrangement]; }; quantregForest = derive2 { name="quantregForest"; version="1.3-7"; sha256="0lk7r02i6zpx9sdl2rp0r7fc3a84s8qhg49nh2x7k3vxwa095pjz"; depends=[randomForest RColorBrewer]; }; quantregGrowth = derive2 { name="quantregGrowth"; version="0.4-3"; sha256="0q2yk51hcn7jnvh14nxa7szfj4pr9grh5rdfwazaziilbwqdmw4f"; depends=[quantreg]; }; @@ -12767,13 +13313,14 @@ in with self; { quantspec = derive2 { name="quantspec"; version="1.2-3"; sha256="0ifwq2jmvxhpijz9yd9hffkff6ixcliaqkp9ispp9k1b8icwi8zn"; depends=[abind quantreg Rcpp snowfall zoo]; }; quarrint = derive2 { name="quarrint"; version="1.0.0"; sha256="13fdmmrgn23xd9vpywmcl7pf729gmcxjfl1wxs30axsbp4h1s6rk"; depends=[neuralnet]; }; queryparser = derive2 { name="queryparser"; version="0.3.0"; sha256="10p81cr1zzq4bna8x302280v5n8ddm454zybzh8mi2jd3sh4rmbz"; depends=[]; }; - questionr = derive2 { name="questionr"; version="0.7.1"; sha256="1rhb4kj6x6ngryqyj68zglcb7nmrmsq9ikndyxqpbmqx2s67b22c"; depends=[classInt haven highr htmltools labelled miniUI rstudioapi shiny styler]; }; - queuecomputer = derive2 { name="queuecomputer"; version="0.8.3"; sha256="0ravk2bxzq3zhk6mmh6iv11ql3bkpp2318vvrl39ghm5bh6pp6mg"; depends=[dplyr Rcpp RcppArmadillo tidyr]; }; + questionr = derive2 { name="questionr"; version="0.7.4"; sha256="0p2mshhmm4kk629rm38w6im7xxxphsg9qqrsdd3bwzma4dvxi2l1"; depends=[classInt highr htmltools labelled miniUI rstudioapi shiny styler]; }; + queuecomputer = derive2 { name="queuecomputer"; version="1.0.0"; sha256="004apzgd58agl5w0nn3nba0idhb13hpvcw6aw4h2nmbp2r1bm32y"; depends=[dplyr Rcpp RcppArmadillo tidyr]; }; queueing = derive2 { name="queueing"; version="0.2.12"; sha256="0hw1ykm24cjpfwh7ac7fjf7mhc59mq8wy2g07aacpy5ibwi8bbsf"; depends=[]; }; quhomology = derive2 { name="quhomology"; version="1.1.1"; sha256="0wiih00zk4682wy1r4nyifh76h5bnvl3f785wjzmrwylnfy951l3"; depends=[MASS numbers]; }; quickPlot = derive2 { name="quickPlot"; version="0.1.6"; sha256="0mffialxdim8f5s0bw9bb7p8dbrfdgq1wqih441x27lnmrvhlsa8"; depends=[backports data_table fpCompare ggplot2 gridBase igraph raster RColorBrewer rgdal rgeos sp]; }; quickReg = derive2 { name="quickReg"; version="1.5.0"; sha256="1l1v3k8albxlaz18l2b2x2ryifq4pbdq6n4q7555hnfcik9rqmw5"; depends=[dplyr ggplot2 nortest psych rlang survival]; }; quickblock = derive2 { name="quickblock"; version="0.2.0"; sha256="0ij4ivpnkjzdixbq7pg4g1xkb031qawadr22qhzp0q210qhmhc0m"; depends=[distances scclust]; }; + quickerstats = derive2 { name="quickerstats"; version="0.0.1"; sha256="0jlczz042701p6j4m60k425m9x3q88m27mmf62ngz80dylcl2fdx"; depends=[curl httr readr tibble]; }; quickmapr = derive2 { name="quickmapr"; version="0.3.0"; sha256="0962qm8ak0wpqld8nrb8rvvb78743zfrfsq2xrwdlql681j2nv8c"; depends=[httr raster rgdal rgeos sf sp]; }; quickmatch = derive2 { name="quickmatch"; version="0.2.1"; sha256="1qfslhjlbjpzigz8n6b7w41g8pwdiwri091ivd5igp1xy5pv8a3w"; depends=[distances sandwich scclust]; }; quickpsy = derive2 { name="quickpsy"; version="0.1.5.1"; sha256="0dfqlpghnw79idw3ir03cxx9n88sqs5p14jz7jgpkdwvjpw1y4q9"; depends=[DEoptim dplyr ggplot2 MPDiR]; }; @@ -12784,52 +13331,58 @@ in with self; { quokar = derive2 { name="quokar"; version="0.1.0"; sha256="1qnl3x1aa665xpyb3ac07xrnnjdwbmj645p103144k5is5b8likc"; depends=[ald ALDqr bayesQR dplyr ggplot2 GIGrvg gridExtra knitr magrittr MCMCpack purrr quantreg robustbase tidyr]; }; quotedargs = derive2 { name="quotedargs"; version="0.1.3"; sha256="11cswg9bmddsl1axxcdz11flq46p1zkpv022526f2vgl4qsprwbm"; depends=[]; }; qvcalc = derive2 { name="qvcalc"; version="1.0.2"; sha256="0banzv78kb53ybfbh1hmgx7kxvpbbdxzg4dsn7vrwhmxs72srkch"; depends=[]; }; - qwraps2 = derive2 { name="qwraps2"; version="0.4.2"; sha256="14h9xwv6x5lci17hg048a6n0cp3d2rif4v0g7dr05w504h157kw9"; depends=[dplyr ggplot2 knitr magrittr Rcpp RcppArmadillo rlang tidyr]; }; + qwraps2 = derive2 { name="qwraps2"; version="0.5.0"; sha256="1gsn7k8dxv48wszlvakzanndj402c5nbz3rj1mg0zrin3q2r3jik"; depends=[dplyr ggplot2 knitr Rcpp RcppArmadillo rlang xfun]; }; r_blip = derive2 { name="r.blip"; version="1.1"; sha256="1p33g6i6fq9c27d5ix9nd8prv90i4hrf91x34bldlw8041sjqxm0"; depends=[bnlearn foreign]; }; + r_jive = derive2 { name="r.jive"; version="2.4"; sha256="12zjzjjy1dwhr1gxb5029p5l3wjhwaysja4zf6insdnx1fd0ybxd"; depends=[abind gplots]; }; r2d2 = derive2 { name="r2d2"; version="1.0-0"; sha256="1zl0b36kx49ymfks8rm33hh0z460y3cz6189zqaf0kblg3a32nsi"; depends=[KernSmooth MASS sp]; }; - r2d3 = derive2 { name="r2d3"; version="0.2.3"; sha256="0v612mbzdjr8cq1ffall9hagbwxfv7fh963x8f0w5r84v1m3y2bl"; depends=[htmltools htmlwidgets jsonlite rstudioapi]; }; + r2d3 = derive2 { name="r2d3"; version="0.2.5"; sha256="1wfr5qnywrvps25z9iwn04n6wwvam4340jwpszxbbawby48kjppn"; depends=[htmltools htmlwidgets jsonlite rstudioapi]; }; r2dRue = derive2 { name="r2dRue"; version="1.0.4"; sha256="1apdq7zj5fhs349wm9g6y06nn33x24pg3gdp4z1frd18qlacf8z5"; depends=[matrixStats rgdal sp]; }; r2dictionary = derive2 { name="r2dictionary"; version="0.1"; sha256="0assylz2ih96l4jily76hp524h5xbnc27ln8yjvk9c4q88yr8xfy"; depends=[rstudioapi stringr]; }; - r2dii_analysis = derive2 { name="r2dii.analysis"; version="0.0.1"; sha256="03czv6rql2id74qawjcvc4b9wj3bxci6hg5lq4r37w6xn7y7ls19"; depends=[dplyr magrittr rlang tidyr]; }; - r2dii_data = derive2 { name="r2dii.data"; version="0.1.2"; sha256="0qrpvjf1brf2am2bjddnlvhwc9kj3vwphg5nmal29m1pfc59z36g"; depends=[]; }; - r2dii_match = derive2 { name="r2dii.match"; version="0.0.4"; sha256="01h65la79cqcpmwkwm2sb1kivqz7qy200zagd8g5ajy6vk8dy2ch"; depends=[data_table dplyr glue magrittr purrr r2dii_data rlang stringdist stringi tibble tidyr tidyselect]; }; + r2dii_analysis = derive2 { name="r2dii.analysis"; version="0.1.3"; sha256="12d0kcgk7yais27aggi5x901yrnvpz0dndswr5akkg8yzny7xq96"; depends=[dplyr glue magrittr r2dii_data rlang tidyr tidyselect zoo]; }; + r2dii_data = derive2 { name="r2dii.data"; version="0.1.6"; sha256="1bsa65wvs1by9h5zmi0v2silpxp497qsqnx4bji1vp1f2g46kj5p"; depends=[]; }; + r2dii_match = derive2 { name="r2dii.match"; version="0.0.7"; sha256="0halwyak97csjpyfwyz1zhjlrqmcq8fi9d9jgxnh2rj4if3qc0s9"; depends=[data_table dplyr glue magrittr purrr r2dii_data rlang stringdist stringi tibble tidyr tidyselect]; }; r2glmm = derive2 { name="r2glmm"; version="0.1.2"; sha256="0iim92blpa59vgz97c2pi05yhbjjmaffdbkbmk5kplfb2vmazgiy"; depends=[afex data_table dplyr ggplot2 gridExtra lmerTest MASS Matrix mgcv pbkrtest]; }; + r2mlm = derive2 { name="r2mlm"; version="0.2.0"; sha256="0c6qhjhxfapqx5aiq54msbhda5c8pazpdp2wxdqh8l2gjffvwc4p"; depends=[broomExtra dplyr lme4 magrittr nlme rlang stringr tidyselect]; }; r2pmml = derive2 { name="r2pmml"; version="0.24.0"; sha256="0fl2kh1b7rvghschadsdp12za0r16xpak29f0w7dh38i5sw5scrk"; depends=[]; }; - r2rtf = derive2 { name="r2rtf"; version="0.1.1"; sha256="04612jnmqrdl3ps66zxj515fbnvaxzcw8bl9dg2gjqh7lr23a0dj"; depends=[stringr]; }; + r2rtf = derive2 { name="r2rtf"; version="0.2.0"; sha256="1bp37kz5alcc5ddf8kdyprn6srn4cwj1xf7lqa6x2a0kc3f7hp71"; depends=[]; }; r2shortcode = derive2 { name="r2shortcode"; version="0.1"; sha256="03djy8m146k31xgvwcbrd1nzwj4wdlvvwzgviv80kskgr6ld9jrj"; depends=[magrittr stringr]; }; r2sundials = derive2 { name="r2sundials"; version="5.0.0-7"; sha256="11l8z7h0gm71yqns2blrd26p084gcdc4x1xwv0knp8830xqjdsmw"; depends=[Rcpp RcppArmadillo rmumps]; }; + r2symbols = derive2 { name="r2symbols"; version="0.1"; sha256="1i4sd015dgkv5i89d0cphp3jmn4jn4wqfazklfglysf85b2cm4iw"; depends=[]; }; r3PG = derive2 { name="r3PG"; version="0.1.2"; sha256="1awmxs0173x09rrqbn7h4ni068kxzb09jr70zyh0659jnf4zx4dd"; depends=[]; }; + r3dmol = derive2 { name="r3dmol"; version="0.1.0"; sha256="059ya67jrqfcvmp295rynxxsbnyxhlr84cqlvwqzylyzi5hkgmz3"; depends=[htmlwidgets magrittr]; }; r4lineups = derive2 { name="r4lineups"; version="0.1.1"; sha256="1p0dnrp21zx1l9lqx01jnq54d5ppb8siibv47i4gsp7c7db9ymxc"; depends=[boot dplyr ggplot2 ggrepel here magick magrittr pROC psych purrr]; }; r4ss = derive2 { name="r4ss"; version="1.36.1"; sha256="03xin7avdbg5ayrcdbw5rx9sh6ingjq2kv3405h01vqf1jhkfsxk"; depends=[coda corpcor gdata gplots gtools kableExtra pso truncnorm]; }; r511 = derive2 { name="r511"; version="0.1.1"; sha256="1njsnjf0746cv6x7fznq4cg556fczqcfawwb869r3w9zv0zj1iy9"; depends=[assertthat dplyr httr tibble xml2]; }; + r5r = derive2 { name="r5r"; version="0.2-1"; sha256="1f6plxidvsj989hmr7gw8crvlmynxbcj1362hidw3zfixx9yjbvf"; depends=[checkmate data_table jdx rJava sf sfheaders]; }; r6extended = derive2 { name="r6extended"; version="0.1.2"; sha256="1kq1j5rx57053mslj8jx1s0wjvhis7x3y264zw44q4k2x48q9wxs"; depends=[digest hellno magrittr R6]; }; rARPACK = derive2 { name="rARPACK"; version="0.11-0"; sha256="12h2y46xcfldhjdmm960swgn9b23zvkj5vg2bi42s9qxwgi02d63"; depends=[RSpectra]; }; rAltmetric = derive2 { name="rAltmetric"; version="0.7.0"; sha256="1vbvjv273vg3pi30vxxa2bivlajfsbqrzflk3payp6ym9myi27mg"; depends=[httr jsonlite rlist]; }; rAmCharts = derive2 { name="rAmCharts"; version="2.1.13"; sha256="1c9gz7jmkh8gfaq8lmcb66kavdldnlc3x1mc1c72di8zxcpgzprc"; depends=[data_table htmltools htmlwidgets knitr pipeR yaml zoo]; }; + rAmCharts4 = derive2 { name="rAmCharts4"; version="1.2.0"; sha256="1jp70sdgr5jsdvha2l4n5msdqkcl2f4y5prd2kddfh1dnr58qni4"; depends=[base64enc htmltools htmlwidgets jsonlite lubridate minpack_lm reactR shiny stringr xml2]; }; rAverage = derive2 { name="rAverage"; version="0.5-8"; sha256="09yap3qv02k5nidi6a4png9xa5yy7cb8hg8s2dq99wnc88s42d26"; depends=[]; }; rAvis = derive2 { name="rAvis"; version="0.1.4"; sha256="0svplnrn8rrr59v04nr1pz7d5r4dr1kdl0bd3kg8c3azxv47mxbp"; depends=[gdata maptools raster RCurl rgdal scales scrapeR sp stringr XML]; }; rBMF = derive2 { name="rBMF"; version="1.0"; sha256="10dg47yzn696aqx4192nrs5m92z8kkkpk0z1j8pak33c6s2swc51"; depends=[Matrix Rcpp]; }; rBayesianOptimization = derive2 { name="rBayesianOptimization"; version="1.1.0"; sha256="194j445nirvvkz880ax0zw2q1mkiy0khdfjl7bwiwj8knhhvkrhw"; depends=[data_table foreach GPfit magrittr]; }; rBeta2009 = derive2 { name="rBeta2009"; version="1.0"; sha256="0ljzxlndn9ba36lh7s3k4biim2qkh2mw9c0kj22a507qbzw1vgnq"; depends=[]; }; - rBiasCorrection = derive2 { name="rBiasCorrection"; version="0.2.1"; sha256="1408fiiv9q807yarm40dzybq8p8y1fhkfs8hpimszkcljp2h8hqg"; depends=[data_table future future_apply ggplot2 ggpubr magrittr nls2 polynom]; }; + rBiasCorrection = derive2 { name="rBiasCorrection"; version="0.2.5"; sha256="02jg5fw4glg3hnms7r52s3b9syss5g9ynqz125k5830zaz1q4px3"; depends=[data_table future future_apply ggplot2 ggpubr magrittr nls2 polynom]; }; rCAT = derive2 { name="rCAT"; version="0.1.6"; sha256="09jyjjbhpm44wrism3zgg56m01yimlcm3xks8g0cq36lsrclcigp"; depends=[pracma rgdal sp]; }; rCBA = derive2 { name="rCBA"; version="0.4.3"; sha256="10rc08gwsf15f4lci8bbgwpwj8n7k1m23hxk633v68g9amla5nvx"; depends=[arules R_utils rJava TunePareto]; }; rCMA = derive2 { name="rCMA"; version="1.1"; sha256="0dswshg80hbgcib5x9w791sh71q5s4435q8sm9dh170v4ngbax0w"; depends=[]; }; - rCRM = derive2 { name="rCRM"; version="0.1"; sha256="01xxkrwd0iwhmq8dshgbn84qi6kky757y01alqrk0pkq2n8ghms4"; depends=[Rcpp RcppEigen]; }; + rCRM = derive2 { name="rCRM"; version="0.1.1"; sha256="03p2v1wb7hsvfhdcgawaz8vd2i8kh30dj8mjydlaywxyks6i5caz"; depends=[Rcpp RcppEigen]; }; rChoiceDialogs = derive2 { name="rChoiceDialogs"; version="1.0.6"; sha256="0lp8amdalirpsba44aa3r31xnhmi36qb9qf8f8gdxxbarpgprsbi"; depends=[rJava]; }; rClinicalCodes = derive2 { name="rClinicalCodes"; version="1.0.1"; sha256="1p4p8r2n0k8h9xdzbngb95rshjp3376f5lsx228biqmswhpkhvlf"; depends=[RCurl rjson stringr tm XML]; }; rDEA = derive2 { name="rDEA"; version="1.2-6"; sha256="0045crn7azsy3ggzr28vw5jd4f5aw5nj16cjnjxy2md3skfbc3zw"; depends=[maxLik slam truncnorm truncreg]; }; rDNAse = derive2 { name="rDNAse"; version="1.1-1"; sha256="0cl51q61kwvdsm5f49cjjbzggqam1fnr6gp15cmy6m2yahyxg1lk"; depends=[]; }; rDecode = derive2 { name="rDecode"; version="0.1.0"; sha256="1d0rrhycw9anhvx6czz7axkzhzqprdgi9sqfglmc962zf1x3hmn2"; depends=[]; }; rDotNet = derive2 { name="rDotNet"; version="0.9.1"; sha256="18cd5373pdfi1x958llb4cgjqdi1fb7h7m5nkdwcd4xw9hxhinzd"; depends=[Rcpp testthat]; }; - rEDM = derive2 { name="rEDM"; version="1.5.0"; sha256="0mrmh4c95p0h8rf8npc4cs3q5dkcsw5wziwz3mkcynbkvnn8v2n1"; depends=[Rcpp RcppThread]; }; + rEDM = derive2 { name="rEDM"; version="1.7.1"; sha256="0x89sybm9q47iwfncph0s213cypkpvrjivxdl496s9ys22j9fdnh"; depends=[Rcpp RcppThread]; }; rEMM = derive2 { name="rEMM"; version="1.0-11"; sha256="0ynjn10gcmxs8qnh6idb34ppmki91l8sl720x70xkzcqpahy0nic"; depends=[cluster clusterGeneration igraph MASS proxy]; }; - rENA = derive2 { name="rENA"; version="0.2.0.1"; sha256="0sljnrhc710xbcdbsjx1rqrivbklgcnh7l4nqpnxdknvrxz6ky5y"; depends=[data_table doParallel foreach magrittr plotly R6 Rcpp RcppArmadillo scales]; }; + rENA = derive2 { name="rENA"; version="0.2.1.2"; sha256="1achyvdc658la2fhdsjb2jbhcgsv8zgdiis7wkg9nlpchfwlgma9"; depends=[concatenate data_table doParallel foreach magrittr plotly R6 Rcpp RcppArmadillo scales]; }; rFDSN = derive2 { name="rFDSN"; version="0.0.0"; sha256="1ffiqpdzy4ipy2aci22zkih4373ifkjkpvsrza8awhyf9fwqwdsl"; depends=[XML]; }; - rFIA = derive2 { name="rFIA"; version="0.2.3"; sha256="1y9bl9bsljlx2bmxp5z1hzr534r4igx1i3xgbap7y39xvsv9ihml"; depends=[bit64 data_table dplyr gganimate ggplot2 progress purrr sf sp stringr tidyr tidyselect]; }; + rFIA = derive2 { name="rFIA"; version="0.3.0"; sha256="126kgwnaf6x2wj732rzxm6v07ysgj5ys5yq4q6xmr0kiqmbcr7lh"; depends=[bit64 data_table dplyr dtplyr ggplot2 lifecycle rlang sf stringr tidyr tidyselect]; }; rFSA = derive2 { name="rFSA"; version="0.9.6"; sha256="1fxd194iq8jnlsnj76mjq2f6db7ln641qwfsf5v63kx3qqhn8x5s"; depends=[hash rPref tibble tidyr]; }; rFerns = derive2 { name="rFerns"; version="4.0.0"; sha256="0a4i918xb3r602lxrgk8gm9jjvxzsm49gxdh1zdza2rrjc4fm36c"; depends=[]; }; - rGEDI = derive2 { name="rGEDI"; version="0.1.8"; sha256="0smxzws730sjn8kxnmhgc0lg8v4qig53cv8nbwqhig7dlw6djfml"; depends=[bit64 curl data_table fs getPass ggplot2 hdf5r jsonlite lazyeval raster RColorBrewer sp]; }; + rGEDI = derive2 { name="rGEDI"; version="0.1.9"; sha256="0alr9vnl6qbhy5gsj9chg7igpbr6czzgamqmhjxcxiwb3f7abcz9"; depends=[bit64 curl data_table fs getPass ggplot2 hdf5r jsonlite lazyeval raster RColorBrewer sp]; }; rGammaGamma = derive2 { name="rGammaGamma"; version="1.0.12"; sha256="1051ah6q11qkxj1my4xybbzc8xcqkxfmps8mv2his5cyfllwidbs"; depends=[gsl]; }; rGoodData = derive2 { name="rGoodData"; version="0.1.1"; sha256="092sgy6y3dkyr32hrir4jvjwh7n6gfvv9z7i631fipg59255g0zy"; depends=[data_table httr jsonlite]; }; rGroovy = derive2 { name="rGroovy"; version="1.3"; sha256="172vm4diygzi4ipmw8bl03k0x3aps0h1vkvwvw539kamy7xb5w98"; depends=[rJava]; }; @@ -12842,22 +13395,22 @@ in with self; { rJava = derive2 { name="rJava"; version="0.9-13"; sha256="1x3mihyqzr61j52rwaqciw43mkjzmhib4s6qf57v6xj40ksqh5jv"; depends=[]; }; rJython = derive2 { name="rJython"; version="0.0-4"; sha256="13fpcw37cca738v9idqgi3gv9avfkfwfacxj54p2c4wyg46ghnah"; depends=[rJava rjson]; }; rKIN = derive2 { name="rKIN"; version="0.1"; sha256="1j6fdi5h869q4d1hq6ha6qyhisa0zk2qmhjrc4ahl9991d680dyn"; depends=[ggplot2 maptools MASS rgeos sp]; }; - rKolada = derive2 { name="rKolada"; version="0.1.3"; sha256="1ay9zm5gxs09dwpp1lwx76j432rfk7a7ly6zwqk31clyi2ldi6mn"; depends=[dplyr ggplot2 glue httr jsonlite magrittr purrr rlang stringi stringr tibble tidyr]; }; rLDCP = derive2 { name="rLDCP"; version="1.0.2"; sha256="0k7zc1xyqmcl7070hhpqw1d2k1ij6bd4wjym8cw263pds2n7nx21"; depends=[XML]; }; rLFT = derive2 { name="rLFT"; version="1.0.0"; sha256="0r5zyzwb9lzcbwllsblwhmzs4891jvpvzbifv93m75zm6bd5w69p"; depends=[Rcpp sf]; }; rLTP = derive2 { name="rLTP"; version="0.1.4"; sha256="04w432m03xwh0szshsrfw5h7wy43q4lj8z0y07k8w6gsf27cy5bx"; depends=[RCurl]; }; rLakeAnalyzer = derive2 { name="rLakeAnalyzer"; version="1.11.4.1"; sha256="1bwg8mzddsc39km85b41bxp2hwqmb4g5a3010f6yp1qlgcb9rmj1"; depends=[plyr]; }; rLiDAR = derive2 { name="rLiDAR"; version="0.1.1"; sha256="1w0yi4ygw0l9ydbllqjylp30d401bsf7b6fng6qg3pssbi9v3kln"; depends=[bitops deldir geometry plyr raster rgl sp spatstat]; }; - rLindo = derive2 { name="rLindo"; version="8.0.1"; sha256="05qyc4wvpjgw8jxmwn2nwybi695fjn0cdilkprwmjg07c82f0q5n"; depends=[]; }; rMEA = derive2 { name="rMEA"; version="1.2.0"; sha256="1h5flmysyxv668si4ycfkkgairy7balk3nm0dsm91gns9xhvjqs0"; depends=[]; }; + rMIDAS = derive2 { name="rMIDAS"; version="0.2.0"; sha256="0pgjbzxai6m7jarr07vfibwd9sk0rlihrj2hycp99vblnfyxcay4"; depends=[data_table mltools reticulate]; }; rMR = derive2 { name="rMR"; version="1.1.0"; sha256="0da1hclfnnlkp9by6zf2p079643p8nimplr9p3ipbjdy739j344z"; depends=[biglm]; }; - rMVP = derive2 { name="rMVP"; version="1.0.3"; sha256="02ll7mwxix96jas1xp7gb7nm29fdq2ym6b3wmy7246ral2j11pwf"; depends=[BH bigmemory MASS Rcpp RcppArmadillo RcppEigen RcppProgress]; }; + rMVP = derive2 { name="rMVP"; version="1.0.4"; sha256="172zcimqh824xapm9gri81c275wp4fn35nibl31api3yldqpp4hn"; depends=[BH bigmemory MASS Rcpp RcppArmadillo RcppEigen RcppProgress]; }; + rMisbeta = derive2 { name="rMisbeta"; version="1.0"; sha256="1h4vilnndl0gnz9z0sgbywp4zy44718zpiqcqigbjbd4lymi0y61"; depends=[ROC]; }; rModeling = derive2 { name="rModeling"; version="0.0.3"; sha256="0xrjxayp59f31wwcqqkzs5my2j2lpbv1f4pp709fmqxz02vbdzhv"; depends=[caret e1071 MASS]; }; rMorningStar = derive2 { name="rMorningStar"; version="1.0.6"; sha256="1xa68yqzyg3szk1g3hhyvi6bxz83nr18wzk5z75g77ndw3k8jyji"; depends=[dplyr ggplot2 PerformanceAnalytics purrr quantmod readr rvest stringi stringr tidyr xml2 xts]; }; rNMF = derive2 { name="rNMF"; version="0.5.0"; sha256="1nz6h0j5ywdh48m0swmhp34hbkycd7n13rclrxaw85qi9wc42597"; depends=[knitr nnls]; }; - rNOMADS = derive2 { name="rNOMADS"; version="2.4.2"; sha256="0mir7b2693s27gll5j6fsgy7wq0fg48ddx6h78j7cgg7md75756f"; depends=[fields GEOmap MBA RCurl rvest stringr uuid XML]; }; - rNeighborGWAS = derive2 { name="rNeighborGWAS"; version="1.2.1"; sha256="1dsl8zspndy13yykxrjh4dflp7hl45dw3mggkhz15ap6knvv8hdz"; depends=[gaston Matrix RcppParallel]; }; - rNeighborQTL = derive2 { name="rNeighborQTL"; version="1.1.0"; sha256="01c535q09cnmlb41cjh4907wp60v2pvi4vagc1ichbmqgfw7xp8r"; depends=[gaston Matrix qtl]; }; + rNOMADS = derive2 { name="rNOMADS"; version="2.5.0"; sha256="1symwz83v5lwl651lcyky2v4a13am4hhr1wmvliyvd9zyifkxsnq"; depends=[fields GEOmap MBA RCurl rvest stringr uuid XML]; }; + rNeighborGWAS = derive2 { name="rNeighborGWAS"; version="1.2.2"; sha256="14w75p1x41gfcapn7xnyml8dh0lif14z4y950hw9a41ikbrn62r7"; depends=[gaston Matrix RcppParallel]; }; + rNeighborQTL = derive2 { name="rNeighborQTL"; version="1.1.1"; sha256="0h5xw3pndm964rvd3723s9cmzmxdqlq9kfzlzpd1w9z7izmw9wxg"; depends=[gaston Matrix qtl]; }; rODE = derive2 { name="rODE"; version="0.99.6"; sha256="0l518ghfw6283kckqcbh45a35vd73njy05v3dwghhhjdj7v3km8b"; depends=[data_table]; }; rPACI = derive2 { name="rPACI"; version="0.1.2"; sha256="1lk2971590ivw5g65kj99qjn6zdsz9jb7zk0hggf82jmz4rfa175"; depends=[bnlearn]; }; rPAex = derive2 { name="rPAex"; version="1.0.1"; sha256="1v85qy8fg6vf1fqqqawzw4i9sfaihdqzbs0h91hpqbzkc4v7n2bb"; depends=[agricolae raster]; }; @@ -12872,7 +13425,7 @@ in with self; { rSEA = derive2 { name="rSEA"; version="2.1.1"; sha256="18108ds65ykxygbw1s4i5rb1ngzwymv1x3dhcv1lcwkmqplnaar9"; depends=[ggplot2 hommel]; }; rSFA = derive2 { name="rSFA"; version="1.04"; sha256="0gd6ji1ynbb04rfv8jfdmp7dqnyz8pxcl5636fypd9a81fggl0gs"; depends=[MASS]; }; rSHAPE = derive2 { name="rSHAPE"; version="0.3.2"; sha256="0z6dizsxlkmaymbd24b1m1i8kmndcf21nxxnyfzq6gvdii7bal4h"; depends=[abind DBI doParallel evd foreach RSQLite sn VGAM]; }; - rSPARCS = derive2 { name="rSPARCS"; version="0.0.9"; sha256="0dk9xs1b9zhsbdqva1wc0gs1rvcc3wvclwnxvc0r4i7fbfn2an8i"; depends=[data_table geosphere plyr raster sp spatialEco tigris]; }; + rSPARCS = derive2 { name="rSPARCS"; version="0.1.0"; sha256="0k46nhkdn68c7h7bbbdfwl02bldi1m3m62zbp20kh8np9bxy1rnk"; depends=[data_table geosphere plyr raster sp spatialEco tigris]; }; rSPDE = derive2 { name="rSPDE"; version="0.4.8"; sha256="1m8ys6k3f1jy9iiby36sw0gvz282bhpzgnwa801hv59k411wrh2g"; depends=[Matrix]; }; rSQM = derive2 { name="rSQM"; version="1.3.14"; sha256="0m69n2pnfv2085dln6p149a5gw0gif9xk00xmad5s9j68hwjdmym"; depends=[dplyr EcoHydRology ggplot2 gsubfn mise ncdf4 qmap reshape2 stringr yaml zoo]; }; rSymPy = derive2 { name="rSymPy"; version="0.2-1.2"; sha256="0jdl8ss3dbgjqrmmppb0ix1gqk9g28pbh6w5sybil046ic83s13i"; depends=[rJython]; }; @@ -12880,7 +13433,7 @@ in with self; { rTableICC = derive2 { name="rTableICC"; version="1.0.7"; sha256="1z896675kmm9p5dnmcnsz2205ynf05laqcxvlc9y0g5i0x8rf8v6"; depends=[aster partitions]; }; rTensor = derive2 { name="rTensor"; version="1.4.1"; sha256="1ir2zqs3bvcfi9xwhj1l29qhnh5qvagz9cpw99lb2w73i28x47vz"; depends=[]; }; rTephra = derive2 { name="rTephra"; version="0.1"; sha256="045f2sp2j4hiwa9k1vs6cxr59x1yr34jq1z2crasxflsxbwa3xz8"; depends=[]; }; - rTorch = derive2 { name="rTorch"; version="0.0.3"; sha256="1v7zvjkbllcjria7slv958bpwv1r0p3li2i8wq55hgm7g7iyfz1j"; depends=[data_table jsonlite logging R6 reticulate rstudioapi]; }; + rTorch = derive2 { name="rTorch"; version="0.4.2"; sha256="03a9vls09mgd77xm1q1h1pqw4q026rdibbjr218706h4iqphrqm7"; depends=[jsonlite reticulate rstudioapi]; }; rUnemploymentData = derive2 { name="rUnemploymentData"; version="1.1.0"; sha256="0p5hba8iv060szp23s05hvpmwan518ykakm6vqzdcki0inxw0hyv"; depends=[choroplethr rvest stringr]; }; rWBclimate = derive2 { name="rWBclimate"; version="0.1.3"; sha256="0vs56hx7a85pw4jx8nb8bdlr9dbkl4zdhzhqsm0505xc3qz18vxh"; depends=[ggplot2 httr jsonlite plyr reshape2 rgdal sp]; }; rWind = derive2 { name="rWind"; version="1.1.5"; sha256="1fdnbh6yprgbysv6j6i108q9z6b7r17kb2hg4i4sa97c2jlcb39s"; depends=[gdistance lubridate Matrix raster]; }; @@ -12888,26 +13441,27 @@ in with self; { rYoutheria = derive2 { name="rYoutheria"; version="1.0.3"; sha256="1r63ggy4knwzxnpjkmsn7zwmwfaznm8mmxl7r9ph10wz4sblgygl"; depends=[plyr RCurl reshape2 RJSONIO]; }; rabhit = derive2 { name="rabhit"; version="0.1.5"; sha256="0dqzcv241g2b2slygq87w4qkdxalr58zs61k7485b8745xansxmv"; depends=[alakazam cowplot data_table dendextend dplyr fastmatch ggdendro ggplot2 gridExtra gtable gtools htmlwidgets plotly plyr RColorBrewer reshape2 rlang splitstackshape stringi tidyr tigger]; }; rabi = derive2 { name="rabi"; version="1.0.2"; sha256="0jndx1gvsnsv1xrx3ismgvjp7d4kj3436zcawvw32c5klvxx0y4j"; depends=[numbers polynom shiny stringdist]; }; - raceland = derive2 { name="raceland"; version="1.1.0"; sha256="1bhgzr8wq693c9djyvramc9cljzdhgkbga6p9785azpvn7hc6gd5"; depends=[comat fasterize plotwidgets raster Rcpp RcppArmadillo rgdal sf]; }; + raceland = derive2 { name="raceland"; version="1.1.1"; sha256="1sb56id7h1nm34a7kf6abfxwh4kmnnzc51x23cijq6fd3jm4ggnr"; depends=[comat fasterize plotwidgets raster Rcpp RcppArmadillo rgdal sf]; }; racir = derive2 { name="racir"; version="2.0.0"; sha256="0qpjnaifx4z1jvyrc8p5jny0ci20w2ri1rs68sv9b93nkaiixnps"; depends=[]; }; radar = derive2 { name="radar"; version="1.0.0"; sha256="1wh5j3cfbj01jx2kbm9ca5cqhbb0vw7ifjn426bllm4lbbd8l273"; depends=[]; }; radarBoxplot = derive2 { name="radarBoxplot"; version="1.0.0"; sha256="16s38yy984mb1hmsdw17z4nk2z4xg03xi0yrp7445yqv3fs1fghl"; depends=[]; }; radarchart = derive2 { name="radarchart"; version="0.3.1"; sha256="0gcxnbgj8ja1m4wzhbjy67m6zphf0c5ni9yx7sr7f0abm03ry753"; depends=[htmltools htmlwidgets]; }; radiant = derive2 { name="radiant"; version="1.3.2"; sha256="02qc7s64ryfn0l88kfj61kdnrg8gl6dmrxzscgqh85fc1yaipjcf"; depends=[r_import radiant_basics radiant_data radiant_design radiant_model radiant_multivariate shiny]; }; radiant_basics = derive2 { name="radiant.basics"; version="1.3.4"; sha256="0y4s3zhphkaxlgwmiz96nwxq1s87i2i1mnph062xghlm7x92bwc3"; depends=[dplyr ggplot2 lubridate magrittr patchwork polycor psych r_import radiant_data scales shiny tidyr]; }; - radiant_data = derive2 { name="radiant.data"; version="1.3.10"; sha256="09a3wn3gl1zjq5zsc5zaxyq71dg5qnpk57bmwd6qy8w99g2clm8c"; depends=[base64enc broom car curl dplyr DT ggplot2 glue jsonlite knitr lubridate magrittr markdown MASS patchwork plotly psych r_import randomizr readr readxl rlang rmarkdown rstudioapi scales shiny shinyAce shinyFiles stringi tibble tidyr writexl]; }; + radiant_data = derive2 { name="radiant.data"; version="1.3.12"; sha256="08bqqrfvpgyf613ikihwfnzb23l23f5nfs7zynnxbjxc1zfhbpny"; depends=[base64enc broom car curl dplyr DT ggplot2 glue jsonlite knitr lubridate magrittr markdown MASS patchwork plotly psych r_import randomizr readr readxl rlang rmarkdown rstudioapi scales shiny shinyAce shinyFiles stringi tibble tidyr writexl]; }; radiant_design = derive2 { name="radiant.design"; version="1.3.5"; sha256="1514s21jybyvpi2sx06xsxfrzgg07x7xxhwsazc61v3w1mllj2xw"; depends=[AlgDesign dplyr magrittr mvtnorm polycor pwr r_import radiant_data randomizr shiny]; }; - radiant_model = derive2 { name="radiant.model"; version="1.3.13"; sha256="18j6yyrqf8yiix6nhx89n4s78vs0559b3j58srdkpcncd99s6451"; depends=[broom car data_tree DiagrammeR dplyr e1071 ggplot2 ggrepel lubridate magrittr NeuralNetTools nnet patchwork pdp psych r_import radiant_basics radiant_data ranger rlang rpart sandwich shiny stringr tidyr xgboost yaml]; }; + radiant_model = derive2 { name="radiant.model"; version="1.3.14"; sha256="1z44p1bd1s7pfyx63sfy4akmcbs9wxkq297hpixpy4yy0ba3llpz"; depends=[broom car data_tree DiagrammeR dplyr e1071 ggplot2 ggrepel lubridate magrittr NeuralNetTools nnet patchwork pdp psych r_import radiant_basics radiant_data ranger rlang rpart sandwich shiny stringr tidyr xgboost yaml]; }; radiant_multivariate = derive2 { name="radiant.multivariate"; version="1.3.5"; sha256="1khgy3zj0q155dyky1bd2wfdj6r8jgw8aa6a2nj0rbnwa5zam913"; depends=[car clustMixType dplyr ggplot2 ggrepel gower GPArotation lubridate magrittr MASS patchwork polycor psych r_import radiant_data radiant_model rlang scales shiny]; }; radiomics = derive2 { name="radiomics"; version="0.1.3"; sha256="1ra94yaqw88slznhyv70kbfricxi44m4pnx1zh4ijghm491rphr5"; depends=[Rcpp reshape2 spatstat]; }; radir = derive2 { name="radir"; version="1.0.4"; sha256="12a99ig3n6kp5wa5rjp2w1nal4qqjs6vq05d3lrqcyl3bind6lqb"; depends=[hermite]; }; radix = derive2 { name="radix"; version="0.6"; sha256="0290n0yax8649srdjbq4439h0d9f6jsmxayyhp86igcnszcxilnb"; depends=[base64enc bookdown digest downloader htmltools jsonlite knitr lubridate mime png progress rmarkdown rprojroot rstudioapi stringr whisker xfun xml2 yaml]; }; radlibs = derive2 { name="radlibs"; version="0.2.0"; sha256="1xl7pacqgiv68ay7mkr6bkx3rqqr7z8b9yh42n4zm7ybqfxbx6dr"; depends=[data_table lexicon stringr]; }; radmixture = derive2 { name="radmixture"; version="0.0.1"; sha256="0rs60xjd43lg5c9972qhpg6bsqfg2578qvrz7gz3bdip10jb1ryj"; depends=[magrittr MCMCpack plyr quadprog]; }; - radsafer = derive2 { name="radsafer"; version="2.2.2"; sha256="1i0qbj8bx6gqr70c178lsaihaiapcmnij7clqci57g304ig59afr"; depends=[dplyr ggplot2 ggthemes magrittr RadData readr rlang scatterplot3d stringr]; }; + radous = derive2 { name="radous"; version="0.1.0"; sha256="0vny1dw67xqp9wsrmqr4l7nphjf3jnzrhwx5qwjb16bnsfzcnjfd"; depends=[glue httr janitor readr]; }; + radsafer = derive2 { name="radsafer"; version="2.2.3"; sha256="0cb5s6wgx5yp8500vn42b5ryv8vwax7pq9x1wipn6p6lkn4c573z"; depends=[dplyr ggplot2 ggthemes magrittr RadData readr rlang scatterplot3d stringr]; }; rafalib = derive2 { name="rafalib"; version="1.0.0"; sha256="1dmxjl66bfdgrybhwyaa8d4i460liqcdw8b29a6w7shgksh29m0k"; depends=[RColorBrewer]; }; - ragg = derive2 { name="ragg"; version="0.3.1"; sha256="1ww1fwzzpj5zdzldrlydll89nlmqr13angdak6fzjin16sfmvhhj"; depends=[systemfonts]; }; - rags2ridges = derive2 { name="rags2ridges"; version="2.2.2"; sha256="1xayfj9ac1czl6pipfnr3a3r0jrdfvsqiksf9w4blavpp9xv9dbp"; depends=[expm fdrtool ggplot2 graph gRbase Hmisc igraph RBGL Rcpp RcppArmadillo reshape RSpectra sfsmisc snowfall]; }; + ragg = derive2 { name="ragg"; version="0.4.0"; sha256="01513bxcf77qiivzjg13z7j2yigcrl4w0hb6ss8dmhm3fjbd631q"; depends=[systemfonts textshaping]; }; + rags2ridges = derive2 { name="rags2ridges"; version="2.2.4"; sha256="1xdk39jk357g6i2aav4c236xpcm7i7836y0zfm68gyw00jrbl6hq"; depends=[expm fdrtool ggplot2 graph gRbase Hmisc igraph RBGL Rcpp RcppArmadillo reshape RSpectra sfsmisc snowfall]; }; ragt2ridges = derive2 { name="ragt2ridges"; version="0.3.4"; sha256="17i3z0p3a4dqa0bch5l1r830w5nlxhdg71y82jipp6cfiwli588z"; depends=[abind Biobase CGHbase expm fdrtool igraph MASS Matrix mvtnorm rags2ridges Rcpp RcppArmadillo]; }; ragtop = derive2 { name="ragtop"; version="1.1.1"; sha256="0vgc2q71g8ysccq19kbk9a4swxgd5qj91xm4bshfgdg5chxqnb50"; depends=[futile_logger limSolve]; }; rai = derive2 { name="rai"; version="1.0.0"; sha256="0qimfzchbrarkwmv3mxxbdgvqzk16sc8m1h140zm0cnfgr2pvi5p"; depends=[dplyr ggplot2 readr rlang]; }; @@ -12917,9 +13471,10 @@ in with self; { rainette = derive2 { name="rainette"; version="0.1.1"; sha256="1s9xwc5mw5m3ax3wyjnwjgh18glbhr1wzsp867fpk7s9bdzfxl9s"; depends=[dendextend dplyr formatR future future_apply ggplot2 ggwordcloud gridExtra highr miniUI progressr purrr quanteda RColorBrewer Rcpp rlang RSpectra shiny stringr tidyr]; }; rainfarmr = derive2 { name="rainfarmr"; version="0.1"; sha256="1gasnmyjnis6vv0krx6299ck2a6v9v1fgqajzqdpjaz2fsxn245i"; depends=[]; }; rakeR = derive2 { name="rakeR"; version="0.2.1"; sha256="0cd89q6k0y9z1qk9k06iw56lhj4c52ckr0g4qv6q95lkyrbi3qg8"; depends=[ipfp wrswoR]; }; - ralger = derive2 { name="ralger"; version="2.0.1"; sha256="1y6zrd1r331fpwdx0hghqn2d389fpdxj2fny58n415knvzc2g1gw"; depends=[crayon dplyr magrittr purrr robotstxt rvest stringr testthat tidyr xml2]; }; + ralger = derive2 { name="ralger"; version="2.2.0"; sha256="1gcs1yqdk0814q48sfjnhm409n86iliz4fkjg70d57a79gqrldfc"; depends=[crayon curl dplyr magrittr purrr robotstxt rvest stringr testthat tidyr xml2]; }; ramchoice = derive2 { name="ramchoice"; version="1.1"; sha256="1im9r95109919hfmici6avdqxh3a375wmg2lfy75z1gjivvcygbr"; depends=[MASS]; }; - ramcmc = derive2 { name="ramcmc"; version="0.1.0-1"; sha256="0x8q0bah8fcyqlwap9iw52xhl6b989va5c144kgmfimh2b4yinc7"; depends=[Rcpp RcppArmadillo]; }; + ramcmc = derive2 { name="ramcmc"; version="0.1.0-1.1"; sha256="15bgjr2m4zx95bkwak1v87rjzcybsaa9hr21bjrpdn2zxw3jp3pk"; depends=[Rcpp RcppArmadillo]; }; + rameritrade = derive2 { name="rameritrade"; version="0.1.4"; sha256="1znm0cifc8rp696l45zgqd8qwkam0br2j6fqnr642ciciyrl8lk7"; depends=[dplyr httr jsonlite lubridate magrittr urltools]; }; ramify = derive2 { name="ramify"; version="0.3.3"; sha256="0cxmkxhshg0vrcxai2gbm4iih04f44liv5nh5jiq85hjz8qbhdi2"; depends=[]; }; ramlegacy = derive2 { name="ramlegacy"; version="0.2.0"; sha256="0q8qks8qapar12dzlkxlbvw4rj7qxmfw64cph834ckm4z7sis873"; depends=[cli crayon httr rappdirs readxl]; }; ramps = derive2 { name="ramps"; version="0.6.16"; sha256="1az2wp1jrf4yszcgq9l18g4b9bi2hkg0q6nymdaksbn20jkhwg32"; depends=[coda fields maps Matrix nlme]; }; @@ -12961,27 +13516,28 @@ in with self; { rappdirs = derive2 { name="rappdirs"; version="0.3.1"; sha256="0ji6sg3bdn5gazkq14xmmcq7jnbsyxw4lzmmbgv6526j2vn93n1g"; depends=[]; }; rapport = derive2 { name="rapport"; version="1.0"; sha256="1i1zawar5yxw23km74mrvaxnc9hr06kqjvbm046c09cqi6pw0hjh"; depends=[pander rapportools stringr yaml]; }; rapportools = derive2 { name="rapportools"; version="1.0"; sha256="1sgv4sc737i12arh5dc3263kjsz3dzg06qihfmrqyax94mv2d01b"; depends=[pander plyr reshape]; }; + rapsimng = derive2 { name="rapsimng"; version="0.1.0"; sha256="087qjx5p0z4gv6zp52k4k49gnyxl1b6m0iy5337is5fv6r6rknsl"; depends=[dplyr jsonlite magrittr rlang tibble tidyr xml2]; }; raptr = derive2 { name="raptr"; version="0.1.7"; sha256="1gm99nnvn3b9xz6216masv7ji8j8vrkprzprkba5y1h22gzwxd3n"; depends=[adehabitatHR assertthat BH boot doParallel ggplot2 hypervolume ks Matrix mvtnorm PBSmapping plyr RandomFields raster RColorBrewer Rcpp RcppEigen rgdal rgeos RgoogleMaps scales shape sp]; }; rare = derive2 { name="rare"; version="0.1.1"; sha256="0j78ilswiaxdp9107psiw8ibxncd7i81z2njhfqf0n7532pbvjss"; depends=[glmnet Matrix Rcpp RcppArmadillo]; }; rareGE = derive2 { name="rareGE"; version="0.1"; sha256="0v3a2wns77q923ilddicqzg0108f8kmfdnsff1n65icin7cfzsny"; depends=[MASS nlme survey]; }; rareNMtests = derive2 { name="rareNMtests"; version="1.1"; sha256="13r2hipqsf8z9k48ha5bh53n3plw1whb7crpy8zqqkcac8444b2z"; depends=[vegan]; }; rarms = derive2 { name="rarms"; version="1.0.0"; sha256="11wjxd3pxvjv1j2nz26l8f0kykk9w6lf08izhivfngp63dk2akns"; depends=[jsonlite]; }; - rasciidoc = derive2 { name="rasciidoc"; version="2.1.3"; sha256="12ylvzjfxrqy3yv8nw95z0mx9v9gv94v4ifiblss5r73kdgdbgs5"; depends=[document git2r highr knitr xfun]; }; + rasciidoc = derive2 { name="rasciidoc"; version="3.0.0"; sha256="17k812ly2iagdy29c29iqn9yxg60zvsq330vcbwxqilgnm3h9kkc"; depends=[checkmate document git2r highr knitr reticulate xfun]; }; rasclass = derive2 { name="rasclass"; version="0.2.2"; sha256="1lsmv8kh519mz3szb4k9s17fz1480cw0i4qk12givhhm2rpzjy50"; depends=[car e1071 nnet randomForest RSNNS]; }; - rase = derive2 { name="rase"; version="0.3-3"; sha256="03jqf5y5vj354m9psp81wzw6d7dfqr76bfjqv9kannsakkj587sy"; depends=[ape mvtnorm polyCub rgl sm spatstat]; }; - raster = derive2 { name="raster"; version="3.3-13"; sha256="1s6457rq94qvm3s2lqscs2c2gn5kzcpxa13i8nhlgb1klx5kams7"; depends=[Rcpp sp]; }; + raster = derive2 { name="raster"; version="3.4-5"; sha256="19g4chd0nyhnz6hc2j0v9ahjcgz64vvja4y3mrj1pfis1dwhsqn6"; depends=[Rcpp sp]; }; rasterDT = derive2 { name="rasterDT"; version="0.3.1"; sha256="1dl083jm4x0shl7lq4in2alksgi63hp1p7j2cnsvkmwjaxygzm9v"; depends=[data_table fasterize raster sf]; }; rasterImage = derive2 { name="rasterImage"; version="0.4.0"; sha256="191m5k1rbbwziznmxbsq4g55afkw8gb5011i70f3wx3dscr3phxz"; depends=[plotrix]; }; rasterKernelEstimates = derive2 { name="rasterKernelEstimates"; version="1.0.1"; sha256="1733ic1hxym3gyibk2ysy5zzq7s9rbf6jx63x7irnrcavq151f8s"; depends=[raster]; }; rasterList = derive2 { name="rasterList"; version="0.5.8"; sha256="0q7apglxzpah04463z07cpkzyd6l6dbbdhm601brzh6yk75z20vh"; depends=[raster]; }; - rasterVis = derive2 { name="rasterVis"; version="0.48"; sha256="09mcdvhz3x5vsazd8xvm2z4jy69272ia0gsc8r94rnchcxl415wj"; depends=[hexbin lattice latticeExtra raster RColorBrewer sp viridisLite zoo]; }; - rasterdiv = derive2 { name="rasterdiv"; version="0.2-1"; sha256="0zd5phvkrx5hhl77kyisrqy5in8psjanpp1yw39a79kcs0dyqk2y"; depends=[doParallel foreach pbapply pbmcapply proxy raster svMisc]; }; + rasterVis = derive2 { name="rasterVis"; version="0.49"; sha256="0d12h7xqcwy1wps6yya9nzfppbnsxpmbkqmy3a8pvxpg81l632kk"; depends=[hexbin lattice latticeExtra raster RColorBrewer sp viridisLite zoo]; }; + rasterdiv = derive2 { name="rasterdiv"; version="0.2-2"; sha256="1sqsxjpjwv20nphga8bbjc904bl4j7fiwfrz5q3b1m81xjnkj7rv"; depends=[foreach progress proxy raster svMisc]; }; rasterize = derive2 { name="rasterize"; version="0.1"; sha256="18nrhmq1qmi05rkyr86xsyc8nz0fbdpf2d45h62bbfzbfynqd4qy"; depends=[png]; }; rasterly = derive2 { name="rasterly"; version="0.2.0"; sha256="1fv0ayh8r78qss7ikcwnj0i5x8iyz4c3icsfb554zji9bw30x7qr"; depends=[data_table ggplot2 magrittr plotly Rcpp rlang]; }; rasterpdf = derive2 { name="rasterpdf"; version="0.1.1"; sha256="0zi54nifbb4dzb29i8rskynblw3z42vzaykwbq30ia5zs9q1bvm5"; depends=[png]; }; ratPASTA = derive2 { name="ratPASTA"; version="0.1.2"; sha256="1ddxryccsq0v3lvnjyl8x4z1yxw59zq5g4lwh5pnn1cykl0z7q1f"; depends=[dplyr ggplot2 ggpubr ggsci hms lubridate magrittr plyr rjson stringr tidyr]; }; ratelimitr = derive2 { name="ratelimitr"; version="0.4.1"; sha256="06x759jxr5zcnvg9q120n5bpipkb16piw15kxrpk7i918mby889b"; depends=[assertthat]; }; ratematrix = derive2 { name="ratematrix"; version="1.2.2"; sha256="08zc3yacgmd7y50nykbdqwq655jn3gz4x1ywrhvz8fymsdhdd39g"; depends=[ape coda corpcor ellipse geiger MASS mvMORPH phylolm Rcpp RcppArmadillo readr]; }; + rater = derive2 { name="rater"; version="1.0.0"; sha256="1z0da2x85gb5qizgqaki55yyvilcbcwz5f5lmap1iv6l3qs3475n"; depends=[BH ggplot2 Rcpp RcppEigen RcppParallel rlang rstan rstantools StanHeaders]; }; rateratio_test = derive2 { name="rateratio.test"; version="1.0-2"; sha256="1a2v12z2dr893ha80fhada1820z5ih53w4pnsss9r9xw3hi0m6k5"; depends=[]; }; raters = derive2 { name="raters"; version="2.0.1"; sha256="16jnx6vv39k4niqkdlj4yhqx8qbrdi99bwzxjahsxr12ab5npbp1"; depends=[]; }; ratesci = derive2 { name="ratesci"; version="0.3-0"; sha256="1mdx47xpgjrjbb3lybajdmxb87dqr6cvv3fsvwfx0n629mjbih4z"; depends=[]; }; @@ -12998,15 +13554,18 @@ in with self; { rayimage = derive2 { name="rayimage"; version="0.3.1"; sha256="0xqasgyk4ws79325p6gxdkr0mf3lzd097bmzhizsxdp1gjma0r52"; depends=[jpeg magrittr png progress raster Rcpp RcppArmadillo]; }; rayrender = derive2 { name="rayrender"; version="0.14.0"; sha256="0vikd5ahap7aahsv66xwkysj82hnhqgwf4dqfjrk82akagyznzg3"; depends=[assertthat decido magrittr png progress purrr raster rayimage Rcpp RcppThread tibble]; }; rayshader = derive2 { name="rayshader"; version="0.19.2"; sha256="0qhv1wxgkkgksmfq19c894lgiiw4i22w7cwjs2x1r8n2b7xgb178"; depends=[doParallel foreach magrittr png progress raster rayimage Rcpp RcppArmadillo rgl scales terrainmeshr]; }; - rbacon = derive2 { name="rbacon"; version="2.4.3"; sha256="124iraj28ydjwky6j77h1sj5640l09gwwnr1xdz7fjjp8w0yhhiv"; depends=[coda Rcpp]; }; + raytracing = derive2 { name="raytracing"; version="0.1.0"; sha256="052j053l4104pk7cbkkqrj3kkiip9lv2lf0xl2xsray62n6p07m4"; depends=[ncdf4 sf units]; }; + rbace = derive2 { name="rbace"; version="0.2.2"; sha256="04jcbrcp0l1v2q8hhwr5w72spdja8r0fw71v68kx39yigy7m1sgp"; depends=[crul data_table tibble xml2]; }; + rbacon = derive2 { name="rbacon"; version="2.5.0"; sha256="1ivxa71gc7hxb8qqlf84afq0a4yzwb3ya77lifssplhfdajrn58a"; depends=[coda IntCal Rcpp]; }; rbart = derive2 { name="rbart"; version="1.0"; sha256="1byfm1ycw9nfhdblqklyn8pxn6b9q5fa3inbgfpynqpsid97ig35"; depends=[Rcpp]; }; rbefdata = derive2 { name="rbefdata"; version="0.3.5"; sha256="12mcqz0pqgwfw5fmma0gwddj4zk0hpwmrsb74dvzqvgcvpfjnv98"; depends=[RColorBrewer RCurl rjson rtematres wordcloud XML]; }; rbenchmark = derive2 { name="rbenchmark"; version="1.0.0"; sha256="010fn3qwnk2k411cbqyvra1d12c3bhhl3spzm8kxffmirj4p2al9"; depends=[]; }; + rbenvo = derive2 { name="rbenvo"; version="1.0.5"; sha256="0clg2cxyi60yz2mdp95v0hd5gqhk8h2xgmx68852jcpbjf76xasa"; depends=[dplyr forcats ggplot2 lme4 lubridate magrittr Matrix purrr rlang sf stringr tidyr]; }; rbgm = derive2 { name="rbgm"; version="0.1.0"; sha256="0jw7p6l0il0fz5rq7ra731xzj06aqqvm9s1r0hwa4rd74lkg198n"; depends=[dplyr geosphere raster reproj rlang sfheaders sp]; }; rbhl = derive2 { name="rbhl"; version="0.9.0"; sha256="0n9jxyrpq1s0yq13ylkhm0qcjlm8b25p19vpxv2s4wxan758zypd"; depends=[crul jsonlite plyr tibble xml2]; }; rbi = derive2 { name="rbi"; version="0.10.3"; sha256="09hqv235fry60nqvd1is8n7szkq96w160xpw2pdxqdxvlh52cf2r"; depends=[data_table ncdf4 processx reshape2]; }; rbi_helpers = derive2 { name="rbi.helpers"; version="0.3.2"; sha256="1inbf3kpl4y46m7v36akrr24112y4sd3d8yqia16i32wxf53wql5"; depends=[data_table lubridate Matrix rbi reshape2]; }; - rbibutils = derive2 { name="rbibutils"; version="1.0.3"; sha256="04q43sjysy4f946d6zw303m7aqywl7x2s6xfljvw7p4i4za9vn4n"; depends=[xml2]; }; + rbibutils = derive2 { name="rbibutils"; version="2.0"; sha256="1vfg2188i4dyhrmvnwpsh2la8qkd4wkryz2fpj4cppi1wfz3ml83"; depends=[]; }; rbin = derive2 { name="rbin"; version="0.2.0"; sha256="18g6s4m0yc1bzrymk8km553kcwi4vj16b6mxw2lmv48z7243iq87"; depends=[data_table ggplot2]; }; rbiom = derive2 { name="rbiom"; version="1.0.2"; sha256="0zg1ibxz3h9mmb4s2gwlliahni6dgqqn849pcxcyhpzyc81av85y"; depends=[magrittr openxlsx plyr R_utils Rcpp RcppParallel rjson slam]; }; rbiorxiv = derive2 { name="rbiorxiv"; version="0.2.0"; sha256="1xb0ndwfnk26qifnc7fy6jy6sm30p5264w1lk8mayj90nf9b1aks"; depends=[httr jsonlite]; }; @@ -13018,7 +13577,6 @@ in with self; { rbmn = derive2 { name="rbmn"; version="0.9-3"; sha256="08rcxvxi1wav2ysnp5ydkyinykcjw3vwb56g8zdx9ziqbd7cwkgv"; depends=[MASS]; }; rbokeh = derive2 { name="rbokeh"; version="0.5.1"; sha256="122slyj1a4v7ph1zdcradzkr4hjncg34i2ld82mbk8nf72ra7ss8"; depends=[digest ggplot2 gistr hexbin htmlwidgets jsonlite lazyeval magrittr maps pryr scales]; }; rbounds = derive2 { name="rbounds"; version="2.1"; sha256="1h334bc37r1vbwz1b08jazsdrf6qgzpzkil9axnq5q04jf4rixs3"; depends=[Matching]; }; - rbraries = derive2 { name="rbraries"; version="0.2.0"; sha256="00fl1vr8m1lalib1j35d7g0ybm4wv6qvy0gzl37ij2cc844ij6jd"; depends=[crul data_table fauxpas jsonlite tibble]; }; rbridge = derive2 { name="rbridge"; version="1.0.2"; sha256="0m4c61rdrhq1jw3rwq2ld29g5dchbk4sfpnq0wmwbvzhdjq76plc"; depends=[dplyr Matrix Rcpp RcppArmadillo]; }; rbscCI = derive2 { name="rbscCI"; version="0.1.0"; sha256="12r1f4yy5hx0sx1q77yzq3wxhbx8zgj9d1jfpa1hagvwcyd8bdxb"; depends=[BH Rcpp]; }; rbtc = derive2 { name="rbtc"; version="0.1-6"; sha256="1z5p1jn5b0hzwcbdpiwj224h45x01bbsgkskllir5j13l416561p"; depends=[gmp httr openssl rjson]; }; @@ -13028,7 +13586,7 @@ in with self; { rbw = derive2 { name="rbw"; version="0.2.0"; sha256="01y33gbljb6bvbdsr42vgfi75sywhwn313y5jv1y4kkc4iqzag1r"; depends=[rlang]; }; rcane = derive2 { name="rcane"; version="1.0"; sha256="0p2mgkq6fh0n289n2h19c52lnqxl05wvpmd6nwvgnjqwa4wwpa7r"; depends=[]; }; rcanvec = derive2 { name="rcanvec"; version="0.2.1"; sha256="0gsk2cfiysxjw2lrnpl2l524lvhh9nhnyyh79n8p7vykyqj711yn"; depends=[rgdal sp]; }; - rcarbon = derive2 { name="rcarbon"; version="1.3.3"; sha256="11qdqzxjjawxxkkamamb82wf6kdqgfvxcjbbmbzhg948dj4rfccv"; depends=[doSNOW foreach iterators knitr snow sp spatstat]; }; + rcarbon = derive2 { name="rcarbon"; version="1.4.1"; sha256="1l73ki1vziglin814dxp32n3pd1agbgs7h4b6mm3a9s98a32k2hf"; depends=[doSNOW foreach iterators knitr snow sp spatstat]; }; rcartocolor = derive2 { name="rcartocolor"; version="2.0.0"; sha256="08ljaag2mnhz2671zvwji1sp003z94lz30vjidmybm9fp8piqw5g"; depends=[ggplot2 scales]; }; rcbalance = derive2 { name="rcbalance"; version="1.8.5"; sha256="15qlk3cqwsvixl17l1fxcajrabmz4y7q5gz0a1pd66f6i1xskcqq"; depends=[MASS plyr]; }; rcbsubset = derive2 { name="rcbsubset"; version="1.1.4"; sha256="0sfsmnxs4c8blzg0bb2ffb2xcsjv7pp39arnda988f7b2aas59wj"; depends=[MASS plyr]; }; @@ -13039,7 +13597,7 @@ in with self; { rcdk = derive2 { name="rcdk"; version="3.5.0"; sha256="05bz2pnvfci8sd9l4i0jay8rwvfnw87r9xqzvq5306mfbhik20fy"; depends=[fingerprint iterators itertools png rcdklibs rJava]; }; rcdklibs = derive2 { name="rcdklibs"; version="2.3"; sha256="16ijvzsc1irpz1z2xd82i2saafsvpn0x5lr54c5gx9bfb35gacyp"; depends=[rJava]; }; rchallenge = derive2 { name="rchallenge"; version="1.3.2"; sha256="1qib09vlajw62zdhx8gkmmhlgc8k0dqdxx8ai8zdwxhfff253glc"; depends=[knitr rmarkdown]; }; - rcheology = derive2 { name="rcheology"; version="4.0.2.0"; sha256="08345syv8cca5fhxcs8g0vifrvz1ii5pb5djlklcyqnw7ly52i9h"; depends=[]; }; + rcheology = derive2 { name="rcheology"; version="4.0.3.0"; sha256="00qv9778k4w8ciz9kgycnkmamp91qbz1bsv835qshnvi0p54rkmw"; depends=[]; }; rchess = derive2 { name="rchess"; version="0.1"; sha256="0qnvvvwcl02rmqra9m7qnhy40cbavswbq6i0jm47x6njmr1gpfhy"; depends=[assertthat dplyr ggplot2 htmlwidgets plyr R6 V8]; }; rchie = derive2 { name="rchie"; version="1.0.2"; sha256="1m89mwq5f81yr2vc3wvnxkpm04bad11sx5fllcd3yy8ilghmbfp6"; depends=[jsonlite V8]; }; rcicr = derive2 { name="rcicr"; version="0.3.4.1"; sha256="1sa13sbhx64cf8szr2811iq4a1asb8d3k0igxw6fbssij2lwbxzp"; depends=[aspace dplyr jpeg matlab scales]; }; @@ -13048,40 +13606,39 @@ in with self; { rclipboard = derive2 { name="rclipboard"; version="0.1.2"; sha256="04vkxz2wqb3q3igjqgaaim3sb71h046c2b8rhvg51hkp1win8s5w"; depends=[shiny]; }; rcmdcheck = derive2 { name="rcmdcheck"; version="1.3.3"; sha256="1d4kzgfqy72r6b7bn1j4znyksrycgypx1jjvpv9lrmvn37mpkdhs"; depends=[callr cli crayon desc digest pkgbuild prettyunits R6 rprojroot sessioninfo withr xopen]; }; rco = derive2 { name="rco"; version="1.0.1"; sha256="0sjfgblvrnd1jmvqgxc9xm94c46kmr9syxynx9zdd9gsqcwc6hza"; depends=[]; }; - rcompanion = derive2 { name="rcompanion"; version="2.3.25"; sha256="10x2ps110a849qgr7pggdz5436a2bzzfv774xic34fnpki32zvzs"; depends=[boot coin DescTools EMT lmtest multcompView nortest plyr]; }; + rcompanion = derive2 { name="rcompanion"; version="2.3.26"; sha256="1ic2rmp00kf3sr04jmvlx602jkqgvj46xfjdi45f4z201vli9ihd"; depends=[boot coin DescTools EMT lmtest multcompView nortest plyr]; }; rcoreoa = derive2 { name="rcoreoa"; version="0.4.0"; sha256="0q5dprz0ag04w265bk7isd2lr61nahf223qza47m0izd9nyi9h8a"; depends=[crul hoardr jsonlite pdftools]; }; rcorpora = derive2 { name="rcorpora"; version="2.0.0"; sha256="1b8xa81mn3afadz77576vda9b0d99f1k096drxrpqd989g993aqy"; depends=[jsonlite]; }; rcosmo = derive2 { name="rcosmo"; version="1.1.2"; sha256="01a8g81ld0dy2bn0mqmpdz2bpd7g52jn67136hhvpxndnnlh384k"; depends=[cli entropy FITSio geoR mmap nnls Rcpp rgl tibble]; }; - rcreds = derive2 { name="rcreds"; version="0.6.6"; sha256="1sdrdgn53kgcdnxfjs8jh0h538vb3b9ixz74lbnp54yp09jpqsri"; depends=[collectArgs digest jsonlite magrittr]; }; rcrimeanalysis = derive2 { name="rcrimeanalysis"; version="0.4.2"; sha256="1b41f636bkr0mr72klyad4fyx5zf129c9h1523rkfkyxrlf527yx"; depends=[dplyr forecast ggmap htmltools igraph KernSmooth leaflet leafsync lubridate pals raster Rcpp rgdal sp]; }; - rcrossref = derive2 { name="rcrossref"; version="1.0.0"; sha256="1743qy5q0n2ij7x88nkk99w59vnl7g9fwpkwgb3a3s235f6lb4df"; depends=[bibtex crul dplyr DT jsonlite miniUI plyr R6 shiny stringr xml2]; }; - rcrtan = derive2 { name="rcrtan"; version="0.1.1"; sha256="0kcp3gnjmp00i1hsjagpp0dlr6zgpc4y5ihpx93hm4m3fnzcmn7x"; depends=[dplyr magrittr purrrlyr tibble tidyr]; }; + rcrossref = derive2 { name="rcrossref"; version="1.1.0"; sha256="1n33skb3mwcn9xfd49p8m72z3kqz8n6dj48d286xdpd0zlcahqbh"; depends=[crul dplyr DT jsonlite miniUI plyr R6 shiny stringr tibble xml2]; }; rcrypt = derive2 { name="rcrypt"; version="0.1.1"; sha256="002r5wr0bmqbj014iz8wacj883j6gqcxc786m6p9a7zdrjpx2pqi"; depends=[]; }; + rct3 = derive2 { name="rct3"; version="1.0.4"; sha256="1xm5kni2mnpzby8basmwbm1abg615i4mlf6fn9jr5il94q1bdgly"; depends=[]; }; rcube = derive2 { name="rcube"; version="0.5"; sha256="1162y7fs3fsbb5jj66g9kvxxhggprlifrabqbb9lqm8rrdwhz3r9"; depends=[magrittr]; }; + rdacca_hp = derive2 { name="rdacca.hp"; version="0.1.0"; sha256="0cnf46xs7q0bgwi4s3qdyqsq21nas2sas9vkn8i555h39snpp41v"; depends=[vegan]; }; rdatacite = derive2 { name="rdatacite"; version="0.5.2"; sha256="07zbxr89fxx9nlp5w7n60rjm3prck08h0fjrq0pnpkbnnkx9cv9a"; depends=[crul jsonlite tibble]; }; - rdataretriever = derive2 { name="rdataretriever"; version="2.0.0"; sha256="0gnvvxvlfh6j887y5w83q5kg6lqqcb0c54lfcx9qp3r28hpdlxkz"; depends=[reticulate]; }; - rdbnomics = derive2 { name="rdbnomics"; version="0.6.2"; sha256="1a63nghiy2hlxx12fr5lnmv7zjqpb1bbl4iq89p66k42cpyn8v9l"; depends=[curl data_table jsonlite]; }; + rdataretriever = derive2 { name="rdataretriever"; version="3.0.0"; sha256="1a01lrzn7gcxid01r0l8nnbpbryvs07z9nf43l1143w2n9bvgn24"; depends=[reticulate semver]; }; + rdbnomics = derive2 { name="rdbnomics"; version="0.6.4"; sha256="1h32wxjykz9y3k48rx31cvy485gsx8ix3194r2zgxlwdza3rl3lb"; depends=[curl data_table jsonlite]; }; rdd = derive2 { name="rdd"; version="0.57"; sha256="1lpkzcjd18x51wzr4d1prdjfsw5978z6zap65psfs02nszy69nqp"; depends=[AER Formula lmtest sandwich]; }; - rddensity = derive2 { name="rddensity"; version="2.0"; sha256="1fsc3b6h09y3648p8dwdbdlncj1vii7ljvgrdjb4mkq3bl1x137j"; depends=[ggplot2 lpdensity]; }; - rddtools = derive2 { name="rddtools"; version="1.4.0"; sha256="04xxrhfxhamzjprbr5g538h4yb0n10mm48pi8ak4m6y7b1gd5a7s"; depends=[AER Formula ggplot2 KernSmooth lmtest locpol np rdd rdrobust rmarkdown sandwich]; }; + rddensity = derive2 { name="rddensity"; version="2.1"; sha256="1zdzsz5xca3y05h4jd3z30s0521xxz6z96ns887pdi96xxsgdila"; depends=[ggplot2 lpdensity]; }; rde = derive2 { name="rde"; version="0.1.0"; sha256="1zw9gdh90hl0wc5c0xwl5x7566r611wk73sbqdmpzpswjyyl9aqm"; depends=[clipr]; }; rdefra = derive2 { name="rdefra"; version="0.3.8"; sha256="00wgcc0mzjvinvj767mzrx8idq8w7b7bi4d82hvldbki9hadjh7d"; depends=[dplyr httr lubridate rgdal sp tibble xml2]; }; rdetools = derive2 { name="rdetools"; version="1.0"; sha256="0pkl990viv7ifr7ihgdcsww93sk2wlzp2cg931wywagfp8dijd02"; depends=[]; }; rdflib = derive2 { name="rdflib"; version="0.2.3"; sha256="1hc6a0spmbd42lf7zjkwjv4glagfzsdilv5hm8c76cj36incg6qg"; depends=[dplyr jsonld readr redland stringi tidyr]; }; rdfp = derive2 { name="rdfp"; version="0.1.4"; sha256="1490227hhfjjscfmd8p897v1ijs61pk5sc0a2vr9yjnfmsnxpqrl"; depends=[curl data_table dplyr httr lubridate plyr purrr readr XML xml2]; }; - rdhs = derive2 { name="rdhs"; version="0.6.3"; sha256="01pjb9wjad22rv85z0rxrh06wyzksy0xgd656xd3lck0ixpr88hx"; depends=[digest foreign getPass haven httr iotools jsonlite magrittr qdapRegex R6 rappdirs rgdal storr xml2]; }; + rdhs = derive2 { name="rdhs"; version="0.7.1"; sha256="1np8d78rwfcylplbjzj4vhd3acganarllabgbiyk6wby04g0qdd7"; depends=[brio digest foreign getPass haven httr iotools jsonlite magrittr qdapRegex R6 rappdirs rgdal storr xml2]; }; rdi = derive2 { name="rdi"; version="1.0.0"; sha256="1c49mkxfyxhqz8fc155kgy1k5by0y2c1ahy8k6pn9k8l1j4m4m2q"; depends=[beanplot gplots pdist stringr]; }; rdian = derive2 { name="rdian"; version="0.1.1"; sha256="0i4ljcqhmrwrqbhi321iffypxj4kndx47ssljnixr3fx2lmqh0q1"; depends=[curl httr]; }; rdist = derive2 { name="rdist"; version="0.0.5"; sha256="1jb6dgp1f3307h96v20pjxpkxfz08ij98w0yj5cdx1g2kwfl0h0w"; depends=[Rcpp RcppArmadillo]; }; rdiversity = derive2 { name="rdiversity"; version="2.0"; sha256="1x9500iq9dkqpq79m1fzl2f1c7bbhrq2v0kqz8wx6dd6dlkgkpqn"; depends=[binaryLogic reshape2]; }; - rdlocrand = derive2 { name="rdlocrand"; version="0.7"; sha256="0sbb5ba1w6qc5m33kpb5mgskvp8wz82zr1w58qfazs90pvksv13z"; depends=[AER sandwich]; }; - rdmulti = derive2 { name="rdmulti"; version="0.5"; sha256="138ikxs1jg6w0h0xha60h7c0k1aj40f8qix3qhbyhk3dxgqi11dz"; depends=[ggplot2 rdrobust]; }; + rdlocrand = derive2 { name="rdlocrand"; version="0.7.1"; sha256="0qgah3izq9zcqk945ambfm79n5zxb9p9ykpqnsi68d50xyy1qs8k"; depends=[AER sandwich]; }; + rdmulti = derive2 { name="rdmulti"; version="0.6"; sha256="09jk9a4dkzrmibg48qa2m2dd2a5aq18biqck9smxyrwpcibin2n8"; depends=[ggplot2 rdrobust]; }; rdnb = derive2 { name="rdnb"; version="0.1-3"; sha256="0g85masa1a2c26l12i6ck1hdjvm2saqdlqnwb2p29rm9spmc04qg"; depends=[brew httr stringr xml2]; }; rdoc = derive2 { name="rdoc"; version="0.1.0"; sha256="0ac6413jyrr7m25z30n3bpiafsvjx38ik6rrjzsiqxrfp41j6l9x"; depends=[cli crayon prettycode R6]; }; rdomains = derive2 { name="rdomains"; version="0.1.9"; sha256="0pfz438qiz8mqh391nlhz2q2r8830y5i0sg1ajhppj1hq2cgqqbg"; depends=[aws_alexa curl devtools glmnet httr jsonlite Matrix rlang urltools virustotal XML xml2]; }; rdoxygen = derive2 { name="rdoxygen"; version="1.0.0"; sha256="16907969w66xvy62k45rw10qfv4x8z6jkkc6i97vppkgnlvf4d4b"; depends=[devtools]; }; - rdpower = derive2 { name="rdpower"; version="0.5"; sha256="1kqfxh2g9dar130d0wld64iyd6iq51s2zrsjrprg1s3ssgi9xmb6"; depends=[rdrobust]; }; - rdrobust = derive2 { name="rdrobust"; version="0.99.8"; sha256="0ihaz24xqky78jl5w17x71bbndh2ldhhqkk2cifhil4m4hn2cs38"; depends=[ggplot2]; }; + rdpower = derive2 { name="rdpower"; version="2.0"; sha256="1yw563nz7dc24ba7vh0w85gp3rhr2ddx3qkpfdr1iwq8a8g1hg01"; depends=[rdrobust]; }; + rdrobust = derive2 { name="rdrobust"; version="0.99.9"; sha256="1sx1mqjk3927kpn0567ia1rch4kmg9zwrc7mgcpds60nbfb8wcl7"; depends=[ggplot2]; }; rdrop2 = derive2 { name="rdrop2"; version="0.8.2.1"; sha256="02rhcq1vn349ddjkqamxb0wjb3z3m4wzkvin1mprcz4fzrjxgbdr"; depends=[assertive digest dplyr httr jsonlite magrittr purrr]; }; rdryad = derive2 { name="rdryad"; version="1.0.0"; sha256="00f1qwsbwg5jggm5b83nhk1lxyw272rv2kg77bcwqvlf3074c3mz"; depends=[crul curl hoardr jsonlite mime tibble zip]; }; rdtLite = derive2 { name="rdtLite"; version="1.3"; sha256="1njn6x2k03qxmb96d5sl7jz0xq5wabbixn9xy55ypw8g1k0cgmd1"; depends=[curl digest gtools jsonlite knitr provSummarizeR provViz rlang rmarkdown sessioninfo stringi XML]; }; @@ -13089,8 +13646,8 @@ in with self; { rdwplus = derive2 { name="rdwplus"; version="0.1.0"; sha256="1y4dnm2bb0w6pim4h79mv2km88s78vhsn5fhs7z45m0564hgk0x2"; depends=[raster rgrass7]; }; reReg = derive2 { name="reReg"; version="1.3.0"; sha256="0nj1zvl3hyh5g1ql9d8afax84dsdfc340j1b74wsknriyx4izzvg"; depends=[BB ggplot2 MASS nleqslv Rcpp RcppArmadillo reda rootSolve scam SQUAREM survival]; }; reactR = derive2 { name="reactR"; version="0.4.3"; sha256="0wwqyvgvzp6q3zzd4l6s0jz6z7jm3khlcxp0ahhv5xm07z3ygk2w"; depends=[htmltools]; }; - reactable = derive2 { name="reactable"; version="0.2.0"; sha256="037d3za9r9pa5isn7aqi4jzw43ki6i8aq9vir3fmhzwn6lja3z72"; depends=[digest htmltools htmlwidgets jsonlite reactR]; }; - reactlog = derive2 { name="reactlog"; version="1.0.0"; sha256="1pajxd9k208s06sava2gqip22pzwlyslnfvkbkfw47mp4wb7zmk9"; depends=[jsonlite]; }; + reactable = derive2 { name="reactable"; version="0.2.3"; sha256="17wl75cblm0rgq3chl96vj7wmbcmszss1zjppfccz1hcimfmlrpx"; depends=[digest htmltools htmlwidgets jsonlite reactR]; }; + reactlog = derive2 { name="reactlog"; version="1.1.0"; sha256="0vngy7fixiighhaa0db8xfr6962jmrfn3675qrn3hj7rfh7siagz"; depends=[jsonlite]; }; read_dbc = derive2 { name="read.dbc"; version="1.0.5"; sha256="1vrvxkcrk3iw5am9rsadxzf0wsr7z2mdpa5wb0v9jbhda710b4yf"; depends=[foreign]; }; read_gb = derive2 { name="read.gb"; version="2.0.1"; sha256="049515v9pyxmarzy51m5wpbxdzp7iq5m5m20ilmywfrig7hz8jpl"; depends=[]; }; readABF = derive2 { name="readABF"; version="1.0.2"; sha256="1lyjl3j62nrsml9vmgwbach9qm8mh2d2pxjj8sfbkkw79krvdnsd"; depends=[]; }; @@ -13101,25 +13658,28 @@ in with self; { readMzXmlData = derive2 { name="readMzXmlData"; version="2.8.1"; sha256="03lnhajj75i3imy95n2npr5qpm4birbli922kphj0w3458nq8g8w"; depends=[base64enc digest XML]; }; readODS = derive2 { name="readODS"; version="1.7.0"; sha256="1hi217ab7hp15jsbzi5ak57cqf8jn2rv78bnn74q72gn9mrfra7n"; depends=[cellranger readr stringi xml2]; }; readOffice = derive2 { name="readOffice"; version="0.2.2"; sha256="0dg7fwxdl41nrjqnxvh9rpz0la99iid0wy51gncjwrh3s85fj2ks"; depends=[magrittr purrr rvest xml2]; }; - readabs = derive2 { name="readabs"; version="0.4.3"; sha256="11v34683d1c8dxkd3v4h67bxpzjkgp9xw06fa6ijhw1z8hsgmmy6"; depends=[curl dplyr fst hutils purrr readxl rsdmx stringi stringr tibble tidyr XML]; }; + readabs = derive2 { name="readabs"; version="0.4.6.900"; sha256="12hhm5cdjh3rmzfq78r274mfxqmkbrdb3lk4c8992iic74a1ylr0"; depends=[curl dplyr fst glue httr hutils purrr readxl rlang rsdmx rvest stringi tidyr xml2]; }; readbitmap = derive2 { name="readbitmap"; version="0.1.5"; sha256="14825906l326w59g6apy00j55jg3h5kx2r6s031f4gdkbrc7szbk"; depends=[bmp jpeg png tiff]; }; - readbulk = derive2 { name="readbulk"; version="1.1.2"; sha256="0341sp9jqqci62zx6my4r50dwrysgjppjasx2lf1dj8w5bv559rd"; depends=[jsonlite plyr]; }; + readbulk = derive2 { name="readbulk"; version="1.1.3"; sha256="0rqz0r5ygwgfqkzv2130sciz3j2p888c2005wsk1m5403syi78an"; depends=[jsonlite plyr]; }; reader = derive2 { name="reader"; version="1.0.6"; sha256="1x489q3ljap4zpny68mx83mgxaqiwlkglcy57whwhnh33dd7qp4h"; depends=[NCmisc]; }; readit = derive2 { name="readit"; version="1.0.0"; sha256="1sq2spjgdc9rq8cr5i9qjmqd4vcf7cknpx5dndwjdqrv112y8bk9"; depends=[crayon haven jsonlite readr readxl]; }; readmnist = derive2 { name="readmnist"; version="1.0.6"; sha256="0f2kp5r04k47gpvbj8x13c47zsis3bw3y8f5f37sh6jggblqr004"; depends=[]; }; readobj = derive2 { name="readobj"; version="0.3.2"; sha256="0n25n02f5kn8zv90n2xzdasjnrqisl4n5szb667jw57v40b726cw"; depends=[Rcpp]; }; - readr = derive2 { name="readr"; version="1.3.1"; sha256="1wz496rw0ah433p755n3xac8gh7yzid4xgdjzd1a7wmpkgilvy9k"; depends=[BH clipr crayon hms R6 Rcpp tibble]; }; + readr = derive2 { name="readr"; version="1.4.0"; sha256="1fa67h4l9d30ig460xizgzl115i9pm3bk9dvsbrw6awbmf51ic82"; depends=[BH cli clipr cpp11 crayon hms lifecycle R6 rlang tibble]; }; + readrba = derive2 { name="readrba"; version="0.1.0"; sha256="1bf7mnvswdyf62ip6xsl87kmgzz79y29p520spf374y75iclpb50"; depends=[curl dplyr httr lubridate purrr readxl rlang rvest stringr tidyr xml2]; }; readroper = derive2 { name="readroper"; version="0.9.3"; sha256="00l731hryx0igj0x7knljs9xq4gaczmsgw2hh05ngrl9y5s528dc"; depends=[readr]; }; readsdmx = derive2 { name="readsdmx"; version="0.3.0"; sha256="188yzkjblbjly032312w0fazj7k7j4ynqfc69xpblnw4gs708sx0"; depends=[Rcpp]; }; readsdr = derive2 { name="readsdr"; version="0.1.0"; sha256="0qwjndbhpww3xlmppc9lmvmj2w4qd0yihj053fcp7ch81dimyins"; depends=[deSolve dplyr magrittr purrr rlang stringi stringr xml2]; }; readstata13 = derive2 { name="readstata13"; version="0.9.2"; sha256="02mqwpzn7n3pqjxivnd1vlfc47xkyiywfz594x0f6vd2dym8rdwd"; depends=[Rcpp]; }; - readtext = derive2 { name="readtext"; version="0.76"; sha256="1k79db2aay15gdb52cqd87wnwk0pn27y45c65741rk8rgddk7lwj"; depends=[antiword data_table digest httr jsonlite pdftools readODS readxl streamR stringi striprtf tibble xml2]; }; + readtext = derive2 { name="readtext"; version="0.80"; sha256="0q8ajnp99fwvh14ppkm2z3gqwdwmjrvxvsfb4q7ad0dhkqric05y"; depends=[antiword data_table digest httr jsonlite pdftools readODS readxl streamR stringi striprtf tibble xml2]; }; readtextgrid = derive2 { name="readtextgrid"; version="0.1.1"; sha256="03qrbmlpbjwx4ia0ydv6m9lwzalsas9pdhds82mg5f8ir0cd0qi6"; depends=[magrittr plyr purrr readr stringr tibble]; }; readthat = derive2 { name="readthat"; version="0.0.1"; sha256="04vnpvfa8in3gxi6nv3si59hr8hj17wq3a5n8rnpiaczg46qr1dr"; depends=[curl Rcpp]; }; readwritesqlite = derive2 { name="readwritesqlite"; version="0.1.2"; sha256="1nnakxj4jsh8wcwzciksa2s1pxjwa407lzmjy4fk82f68ir9jh51"; depends=[chk DBI hms lifecycle RSQLite tibble]; }; readxl = derive2 { name="readxl"; version="1.3.1"; sha256="15mambxr8c7k2ikdfsl1w3vxvm54dsnk0cl1qvks6iig7rql3d14"; depends=[cellranger progress Rcpp tibble]; }; - readxlsb = derive2 { name="readxlsb"; version="0.1.3"; sha256="1n3j2g18n908z7n275mjjha9l358z1dvyg3p8gpymb66vaz55ims"; depends=[cellranger Rcpp xml2]; }; + readxlsb = derive2 { name="readxlsb"; version="0.1.4"; sha256="1qnfijspx8zwsmr1i6qb7vgaxazmvshq5mcxn79y0r2spszq419i"; depends=[cellranger Rcpp xml2]; }; reams = derive2 { name="reams"; version="0.1"; sha256="07hqi0y59kv5lg0nl75xy8n48zw03y5m71zx58aiig94bf3yl95c"; depends=[leaps mgcv]; }; + rearrr = derive2 { name="rearrr"; version="0.2.0"; sha256="0vgwmapngfibdfc0xyg93q63iijicay8yfvp3fi0yqjdzr4as1lq"; depends=[checkmate dplyr lifecycle plyr purrr rlang tibble]; }; + reasonabletools = derive2 { name="reasonabletools"; version="0.1"; sha256="08i7wy4jic5v9ka7j716lj6p9r55sv46sqrxsy7ad6sgjvrzn0ss"; depends=[]; }; rebird = derive2 { name="rebird"; version="1.1.0"; sha256="0l1wignhs4hsy0yshr9gh9mwy8h794injkl5f7flkl1m4c39rz8w"; depends=[assertthat dplyr httr jsonlite]; }; rebmix = derive2 { name="rebmix"; version="2.12.0"; sha256="173b11183hlpazzs70c3zzsg3qakswkvhq63d2bihmy2qbn680zz"; depends=[mvtnorm]; }; rebus = derive2 { name="rebus"; version="0.1-3"; sha256="0ms3dm6g0fq3jycpgjl7q7kyljxc97cczy2jj0lyviwmipdgjg9d"; depends=[rebus_base rebus_datetimes rebus_numbers rebus_unicode]; }; @@ -13130,7 +13690,7 @@ in with self; { recapr = derive2 { name="recapr"; version="0.4.3"; sha256="1ypmjm92mzcmn29cl4zhp1vrgan6sdqqsl3x6dbr4nypfd1dx4f9"; depends=[MASS]; }; recexcavAAR = derive2 { name="recexcavAAR"; version="0.3.0"; sha256="0b91jbgqzkgzvk658ckk639yyz1daa0xql3qgl0kzgqg68d53x20"; depends=[kriging Rcpp]; }; rechonest = derive2 { name="rechonest"; version="1.2"; sha256="0vpff8q5p6in7vjyl62bx3wmksravcg4mpx20qlgy5ia47vyhqp2"; depends=[httr jsonlite RCurl]; }; - recipes = derive2 { name="recipes"; version="0.1.13"; sha256="1d3pmprkiz60w7lq5q4lpl5zlwf7fg7qghf7sq6xs1294w54gzbs"; depends=[dplyr generics glue gower ipred lifecycle lubridate magrittr Matrix purrr rlang tibble tidyr tidyselect timeDate withr]; }; + recipes = derive2 { name="recipes"; version="0.1.15"; sha256="0xif0ak3w90xmfzlxvb5pnzc3scpfl1pyhrjffi3mq4asvsd52l0"; depends=[dplyr generics glue gower ipred lifecycle lubridate magrittr Matrix purrr rlang tibble tidyr tidyselect timeDate withr]; }; reclin = derive2 { name="reclin"; version="0.1.1"; sha256="15qrdgjmclffivnljgmmipws9ks41fj4q40wnq0fk14mbv2045g2"; depends=[dplyr ldat lpSolve lvec Rcpp stringdist]; }; recluster = derive2 { name="recluster"; version="2.9"; sha256="1nz5w4v5hhb3qjwxixc526gqsmr1imw582l9gj2acwar4z9mixjp"; depends=[ape cluster phangorn phytools picante plotrix vegan]; }; recmap = derive2 { name="recmap"; version="1.0.7"; sha256="14mqc6kzwhcsbnkpl4hy2592rxgwpcpxwawq4x0kakbdjcskbfv8"; depends=[GA Rcpp sp]; }; @@ -13139,6 +13699,7 @@ in with self; { recommenderlab = derive2 { name="recommenderlab"; version="0.2-6"; sha256="19v3f0iggvwdmi8jw2k50w9b68wnzvdcwi0d727aqlhp3w760hfj"; depends=[arules irlba Matrix proxy recosystem registry]; }; recommenderlabBX = derive2 { name="recommenderlabBX"; version="0.1-1"; sha256="042yh0h8qxj7n9hysrfdxnpb3g0zb6s5b683s7hn5mjc55q7nn4g"; depends=[recommenderlab]; }; recommenderlabJester = derive2 { name="recommenderlabJester"; version="0.1-2"; sha256="0kr9xc2gih2myn1a8h8dxxmdhibv1sjwjsvlrj9d5hvd1mgfhks5"; depends=[recommenderlab]; }; + reconstructKM = derive2 { name="reconstructKM"; version="0.3.0"; sha256="0fxdmvkm68g114nx2r2r8gy2lwqc5wkfcls7fpdfdfg0aazqqxwq"; depends=[dplyr magrittr rlang survival survminer]; }; reconstructr = derive2 { name="reconstructr"; version="2.0.2"; sha256="0pzpd2l1b6y1b1lnd95lpc5s8niz7p56vkmxgyi6g6b25vh9c2vi"; depends=[openssl Rcpp]; }; recorder = derive2 { name="recorder"; version="0.8.2"; sha256="1j3fqqp5vi8z3hxqgb887v9r8x0cl5jikiyx3c7arwna7k89215a"; depends=[crayon data_table]; }; recosystem = derive2 { name="recosystem"; version="0.4.3"; sha256="122z5vd9yrbysyf4akkk9kfm0mcqv97g7zrp66mg47fkz8v6ak20"; depends=[Rcpp RcppProgress]; }; @@ -13148,8 +13709,8 @@ in with self; { reda = derive2 { name="reda"; version="0.5.2"; sha256="0anaxiskqq0lmdjaa8ac3nh772gwl6iwwzawdqpaiv571wj10s5h"; depends=[ggplot2 Rcpp RcppArmadillo splines2]; }; redcapAPI = derive2 { name="redcapAPI"; version="2.3"; sha256="1myycwdrlw1405fxc82zd8ps8bhdvf2ffsb91pia5ijf6952v8pf"; depends=[checkmate chron DBI httr labelVector lubridate readr stringr tidyr]; }; reddPrec = derive2 { name="reddPrec"; version="0.4.0"; sha256="0zmkaiivvjq8mcaz310zgjjc7y0wgsqv29bf8nhli5qawaczvb9a"; depends=[fields snowfall]; }; - redist = derive2 { name="redist"; version="1.3-3"; sha256="18asjam8hvayvnfysyjzbazjn27ds7163qhdq0p9aqlx03v89aa9"; depends=[coda doParallel foreach Rcpp RcppArmadillo sp spdep]; }; - redland = derive2 { name="redland"; version="1.0.17-11"; sha256="1xbzz6iv4yal1gwplnb9d4z0xzrv25hnqmr6ima2aq9mirwr1l5b"; depends=[roxygen2]; }; + redist = derive2 { name="redist"; version="2.0.2"; sha256="0qmhywm8yqa9myrm8h4w96nr5hdp13njca5mi3dg3fx5l6l74wz3"; depends=[BH coda doParallel dplyr foreach ggplot2 lwgeom magrittr Rcpp RcppArmadillo RcppEigen readr servr sf sp spdep stringr sys tibble]; }; + redland = derive2 { name="redland"; version="1.0.17-14"; sha256="1fd79clxkn85ywvdsyy0j6mw057ir9202qw2962j8iqbvqai99qk"; depends=[roxygen2]; }; redlistr = derive2 { name="redlistr"; version="1.0.3"; sha256="003jxfmj1gryw77vnrvaxmpvjbshlq53wgcrj02mcywfcqzg4jcr"; depends=[plyr raster rgeos sp]; }; redux = derive2 { name="redux"; version="1.1.0"; sha256="0a551w7fph338mqzxda6y21lsad19dway7w18jw9cv1rgvcp9nvc"; depends=[R6 storr]; }; ref_ICAR = derive2 { name="ref.ICAR"; version="1.0"; sha256="0k6czsbjclgmi7vp5hl50jghkzm573s50993iz3dcv55mv662251"; depends=[coda MCMCglmm mvtnorm Rdpack rgdal spdep]; }; @@ -13158,20 +13719,19 @@ in with self; { refnr = derive2 { name="refnr"; version="0.1.0"; sha256="1gjjzxpyxm1kf1pqk99bd7f2j85rzmww3r1268bccivf19rs881i"; depends=[]; }; refset = derive2 { name="refset"; version="0.1.1"; sha256="1xbwvm9066g3f7pd34z5jh04vph4ddy2lkcgmf4kiwa1k5czpwg1"; depends=[]; }; refuge = derive2 { name="refuge"; version="0.3.2"; sha256="0ksznc72yvcscviqq6iysjkbkklqxff04q0rsh2l8gyy7g7m9415"; depends=[dplyr httr jsonlite tibble]; }; - refund = derive2 { name="refund"; version="0.1-21"; sha256="09lbiyr642c3mgdgcy0j5j64s8k7nai4x7grzlh93apkaj8yrm44"; depends=[boot fda gamm4 ggplot2 grpreg lattice lme4 magic MASS Matrix mgcv nlme pbs RLRsim]; }; - refund_shiny = derive2 { name="refund.shiny"; version="0.3.0"; sha256="0r2xrm4wz35wn9zg4vvw2ysl7zzbz9i080vnbrlp4yrhhlkhpkm1"; depends=[dplyr ggplot2 gridExtra lme4 plotly refund reshape2 shiny tidyr]; }; + refund = derive2 { name="refund"; version="0.1-23"; sha256="1vax9dqaypjs7hdbdwadr7i275wqij115fdv81cjz3rfm8s9qiks"; depends=[boot fda gamm4 ggplot2 grpreg lattice lme4 magic MASS Matrix mgcv nlme pbs RLRsim]; }; regRSM = derive2 { name="regRSM"; version="0.5"; sha256="0nbp3yjk9r7qvwm7wla39155rmqnvpdb720iq3b0hcy1bbsxbk9s"; depends=[doParallel foreach Rmpi]; }; regclass = derive2 { name="regclass"; version="1.6"; sha256="0m974k3yhf0dgv5f1qjs8c53mam0cll3cjn35ywfrmlfla0wlhf5"; depends=[bestglm leaps randomForest rpart rpart_plot VGAM]; }; regexPipes = derive2 { name="regexPipes"; version="0.0.1"; sha256="1hk0rhvmgzcyf5cyl8hjznl3ll25kpasqikfr6nxd6ian2slvmmb"; depends=[]; }; regexSelect = derive2 { name="regexSelect"; version="1.0.0"; sha256="0xnb9qa8l63ang4r40ky4qhlrs5mbzvmj98dgij26j3mq1ys1pa7"; depends=[shiny shinyjs]; }; regexTestR = derive2 { name="regexTestR"; version="0.1.0"; sha256="1nfzzifqvhz3cjdr93pd4iyz5hb8v42v94r89b2ikc8ycc48k75g"; depends=[config data_table DT golem htmltools pkgload processx purrr RColorBrewer rvest shiny shinyBS shinythemes stringr tidyr xml2]; }; - reghelper = derive2 { name="reghelper"; version="0.3.6"; sha256="0m90q6iq2y5fjdwwplvpjymzhc8kr2cdfb2gghfrzfzxnd3m4fg7"; depends=[ggplot2 lme4 nlme]; }; + reghelper = derive2 { name="reghelper"; version="1.0.1"; sha256="16q3f1my5r2s7v4l7mpql86vmsw6w364zn8g97ccp2brqlpzfhd5"; depends=[ggplot2 lme4 nlme]; }; regions = derive2 { name="regions"; version="0.1.5"; sha256="007pgqyphl5nq0ym1bgz89li2pnps2kcfn7h8jkvpi36pmig5zpn"; depends=[countrycode dplyr glue magrittr purrr readxl rlang stringr testthat tidyr tidyselect]; }; registr = derive2 { name="registr"; version="1.0.0"; sha256="1ysj2ab69w6g71d1kpcwyq0py71w6h7lfhk4nzgn2dhh6k8whwbn"; depends=[dplyr ggplot2 gridExtra magrittr Rcpp RcppArmadillo tidyr]; }; registry = derive2 { name="registry"; version="0.5-1"; sha256="1k3j6dx350awamr0dwwgkhfs46vsnj4nf08iw5byq0x7n3nkdsnz"; depends=[]; }; reglogit = derive2 { name="reglogit"; version="1.2-6"; sha256="1nnn8n5sqhbd3nzmwnpmcsmaxxxaqwbna7xm7q9vk4cqz9cm9b9s"; depends=[boot Matrix mvtnorm]; }; regmed = derive2 { name="regmed"; version="1.1.0"; sha256="17s6q36l5jnp1klpw7qb4ab80zhc31jfccr96sy2vx6qx9rr9zw9"; depends=[glasso knitr Rcpp RcppArmadillo]; }; - regmedint = derive2 { name="regmedint"; version="0.1.0"; sha256="0bd5ml9y8cxcrkkihy20n2h0g4b64w4kdzyb9caxwagvw6307sav"; depends=[assertthat Deriv MASS Matrix sandwich survival]; }; + regmedint = derive2 { name="regmedint"; version="0.2.0"; sha256="1l9f6biqjc59lpcvmmvg5rikcqs0liaj0y3ivqgv3wldq0yzl5pg"; depends=[assertthat Deriv MASS Matrix sandwich survival]; }; regnet = derive2 { name="regnet"; version="0.4.0"; sha256="0qb7sp464fyxn0bslkapjni3pzk7l6fdgabfbzja08flsr63r4mh"; depends=[glmnet Rcpp RcppArmadillo]; }; regplot = derive2 { name="regplot"; version="1.1"; sha256="048w0hnd2y8k27msjhw2g4ygck6i09698qk24sz7563z82gvj52w"; depends=[beanplot lme4 sm survival vioplot]; }; regpro = derive2 { name="regpro"; version="0.1.1"; sha256="02axbq63hsqwg3q2ixr0lpsdai9q6wj57s5k1343q9m0pw90vr73"; depends=[denpro]; }; @@ -13179,20 +13739,19 @@ in with self; { regress = derive2 { name="regress"; version="1.3-21"; sha256="0mkf1dyg0r09ifdvmc3g6b0q0h819j0kfh1cb33r1vsr8yfjvgbz"; depends=[]; }; regressoR = derive2 { name="regressoR"; version="1.1.9"; sha256="021ld511hazlqycgp5jyrcdabk5m5n6m4jx85h91agnrm7j2n9lm"; depends=[colourpicker corrplot dplyr DT e1071 flexdashboard gbm ggplot2 glmnet htmltools kknn neuralnet pls randomForest rattle ROCR rpart shiny shinyAce shinydashboardPlus shinyjs shinyWidgets xgboost zip]; }; regrrr = derive2 { name="regrrr"; version="0.1.1"; sha256="1ibmfxw0akkrz4r0fipfqbbw4153cghj8k2xsy73lgw799ybylfk"; depends=[dplyr ggplot2 lspline magrittr MuMIn purrr robustbase scales stringr tidyr usdm]; }; - regsem = derive2 { name="regsem"; version="1.5.2"; sha256="0ch057010xfsw0nqcsarzakdbiplvxaldyqlbbacspqs65ax1yk7"; depends=[lavaan Rcpp RcppArmadillo Rsolnp]; }; + regsem = derive2 { name="regsem"; version="1.6.2"; sha256="14nrzyrkrijdrr4jwkri5zra2wh36w68wy6xs600l2z1633h2lmn"; depends=[lavaan Rcpp RcppArmadillo Rsolnp]; }; regspec = derive2 { name="regspec"; version="2.4"; sha256="18i6k2wqaddrc0dz7v8x3s9205dcfwanqhpnxa9hkpyqzbb17pd3"; depends=[]; }; regsubseq = derive2 { name="regsubseq"; version="0.12"; sha256="0879r4r8kpr8jd6a3fa9cifm7cv0sqzz8z1alkm1b2fr1625md3g"; depends=[]; }; regtest = derive2 { name="regtest"; version="0.05"; sha256="1wrrpp2hvkas0yc512gya3pvd0v97pn4v51k5jxkwyd1pp68zd1q"; depends=[]; }; regtools = derive2 { name="regtools"; version="1.1.0"; sha256="1kia4h4bwjjfq7jm57ihdgspbqfn683ssbzngp5r069ki931h3nb"; depends=[dummies FNN mvtnorm sandwich]; }; - rehh = derive2 { name="rehh"; version="3.1.2"; sha256="1bkfgsf2y3hrcbvpllyrri420mqg3r6n6fy2jhh7whi7vpz83zw9"; depends=[rehh_data]; }; + rehh = derive2 { name="rehh"; version="3.2.1"; sha256="10187p0qyqxplj5kh1ngnc56ajhfl2fgszs9qghfc43f7m00qwsh"; depends=[rehh_data]; }; rehh_data = derive2 { name="rehh.data"; version="1.0.0"; sha256="1jkvwmnnmfa7iyvrabgcfzw3vfzx0dlgq47s6yf4zayi437v4di0"; depends=[]; }; rehydratoR = derive2 { name="rehydratoR"; version="0.5.2"; sha256="1d94m9hv1l72l9lph2vzbq4qqbfcgyhv2qk82p9vb8l2ckavjzvv"; depends=[dplyr jsonlite rtweet tibble]; }; - reinforcedPred = derive2 { name="reinforcedPred"; version="0.1.1"; sha256="0lf3lznzvckqg04446pvq35p31fv9ix93rxwv51zq9azk0sx42vs"; depends=[glmnet MASS refund]; }; reinforcelearn = derive2 { name="reinforcelearn"; version="0.2.1"; sha256="176z2q69p24i29a8sh19xxn2zl3h1z2ixdssr5i6m4yvkvdrvv3b"; depends=[checkmate nnet purrr R6]; }; reinstallr = derive2 { name="reinstallr"; version="0.1.4"; sha256="1fcmy2cyqy4zwh815j2jbmziaiq6kypwsnj5bx0f10dlq3522m5q"; depends=[]; }; reinsureR = derive2 { name="reinsureR"; version="0.1.0"; sha256="19ayikzcq6z4i7xrlby76yy2nwvrsv6xdfrmvzyr7rz934flh8kd"; depends=[data_table dplyr ggplot2 viridis viridisLite]; }; rel = derive2 { name="rel"; version="1.4.2"; sha256="0h0146b8pnd7ai17y58agsk9kaym7fhiagl34gggaak0j1qa32wh"; depends=[]; }; - relMix = derive2 { name="relMix"; version="1.3.1"; sha256="1grapx5ayjncxxnjjxwi971g34hlvx0d06xnpn72b4f235sh4alq"; depends=[Familias gWidgets2 gWidgets2tcltk tkrplot]; }; + relMix = derive2 { name="relMix"; version="1.3.3"; sha256="03zzmsx2i7ib1mhdfk5igvr1winl9g2dfjqz2kzvcx3rl7l6hjym"; depends=[Familias gWidgets2 gWidgets2tcltk]; }; relSim = derive2 { name="relSim"; version="0.3-1"; sha256="1d6yihapfyjlfw87l370wyfyby7ivvykx04qljffdv3hi801gn7f"; depends=[multicool Rcpp rvest stringr xml2 xtable]; }; rela = derive2 { name="rela"; version="4.1"; sha256="00ksm7zh1mpd2d5c5d823id3sxj0h3x0ccg6a40fadibvr1ay3ny"; depends=[]; }; relabeLoadings = derive2 { name="relabeLoadings"; version="1.0"; sha256="16gxdrhkaaa33hypnsacn4vd1g3lbqdl3j8p8va54v777c561g81"; depends=[]; }; @@ -13205,6 +13764,7 @@ in with self; { relevent = derive2 { name="relevent"; version="1.0-4"; sha256="10bf1s7jmas8ck1izqibqcaqg4z55ciwdpd9pm2697y8z0jhr2rj"; depends=[coda sna trust]; }; relgam = derive2 { name="relgam"; version="1.0"; sha256="0bfsk2pc3vdk8wgdfpz80x0f9p0z37sq114swqn6z11p298hwf2x"; depends=[foreach glmnet]; }; reliaR = derive2 { name="reliaR"; version="0.01"; sha256="000nafjp386nzd0n57hshmjzippiha6s6c4nfrcwl059dzmi088i"; depends=[]; }; + reliabilitydiag = derive2 { name="reliabilitydiag"; version="0.1.3"; sha256="06g2p7a47yc8kcd3g2jg08jf9x3xa0byp56w7jgfknv80m4d9mk0"; depends=[bde dplyr ggExtra ggplot2 magrittr purrr rlang tibble tidyr vctrs]; }; relimp = derive2 { name="relimp"; version="1.0-5"; sha256="0ydn82g8xdqzhf34187080bbpcpw1zdjbj2i3dv1d6d35vvprb5c"; depends=[]; }; relsurv = derive2 { name="relsurv"; version="2.2-3"; sha256="0jiky939n8vi44n8xg9kag67xjvf1dpywyjrn4bpdfrvfmkrr0l9"; depends=[date survival]; }; rem = derive2 { name="rem"; version="1.3.1"; sha256="1q4p26irhhl1lvc0ydv9wmng1y635zm16szpl7gwq1kyn2p90rai"; depends=[doParallel foreach Rcpp]; }; @@ -13218,10 +13778,11 @@ in with self; { remotes = derive2 { name="remotes"; version="2.2.0"; sha256="1f1kdw9j1wald3fs8b3n68x1kljy07j60g3aw1aarx26ikyk9whj"; depends=[]; }; remss = derive2 { name="remss"; version="1.0.0"; sha256="0dl7iqg65qgafq7s1srcymqzvplkpzplpn6g68lb1mqirqzvgpqw"; depends=[survival]; }; renpow = derive2 { name="renpow"; version="0.1-1"; sha256="0kbfpzr17fvf5zzxpzdhvfmrqmlkba2w3rzxl5q5ac1w3h75gfhc"; depends=[]; }; - rentrez = derive2 { name="rentrez"; version="1.2.2"; sha256="0ghrvh1czf2kbz7p5fh5c20wiwppg6x6fdns247fvlh6zmjl5jz5"; depends=[httr jsonlite XML]; }; - renv = derive2 { name="renv"; version="0.11.0"; sha256="0dd63jr240pg95a6p058s5kcclfmscihdy89v212msihmwvylwh3"; depends=[]; }; + rentrez = derive2 { name="rentrez"; version="1.2.3"; sha256="0x1g2f6hvkqqlb39z8m5qxhcvsizddic5i7rpqw0wy77xfbna9gv"; depends=[httr jsonlite XML]; }; + renv = derive2 { name="renv"; version="0.12.3"; sha256="0k31x19gzpffb701c76p840cip10c0dh8yv3wcs30gqi0ag1g77l"; depends=[]; }; repeated = derive2 { name="repeated"; version="1.1.2"; sha256="19kcsj96i1zpnwfan3gz5vrzc2gqlah0wrdr9vb4vvacz45wcdfq"; depends=[rmutil]; }; repec = derive2 { name="repec"; version="0.1.0"; sha256="0alr9fbmfxmnnnn1qymy65crcycynwz435jj0vangbb4p0qhv8pm"; depends=[jsonlite]; }; + repello = derive2 { name="repello"; version="1.0.0"; sha256="0mn6dbv582akw5mkbznjmfn8prdd4r9wkm4c4d2amnssmv7554nx"; depends=[dplyr httr stringr]; }; repfdr = derive2 { name="repfdr"; version="1.2.3"; sha256="0jpk44arg1jib0h2w90h851bs5cd1ss32fab9bfvf9iir2jk8985"; depends=[Rcpp]; }; replicateBE = derive2 { name="replicateBE"; version="1.0.15"; sha256="0al23s1mb3l7z3jypan3v34bs09hlspjxwb672na6p60nmz2mfm5"; depends=[lmerTest nlme pbkrtest PowerTOST readxl]; }; replicatedpp2w = derive2 { name="replicatedpp2w"; version="0.1-2"; sha256="0nskwkqm9z2aphpim6pvykhc3fphlsbap3r49nghkwjpngd0qzj8"; depends=[spatstat spatstat_utils]; }; @@ -13231,137 +13792,146 @@ in with self; { repolr = derive2 { name="repolr"; version="3.4"; sha256="13kmy09c7lk8p1mkdss0krcsfb6d7zcnqpwnl38zkanvh8q3fqhm"; depends=[Matrix Rcpp RcppArmadillo]; }; reportROC = derive2 { name="reportROC"; version="3.5"; sha256="1f3vdxz45bhks1pm3b41pmh8g8vr2czfr1pn4ddy4kgw5h1x3n8n"; depends=[pROC]; }; reportReg = derive2 { name="reportReg"; version="0.3.0"; sha256="0qwrpn61x69hmgln5fpc58dqfa3pba0lgjjyj0f3fh96wc9jyhq1"; depends=[nlme]; }; + reporter = derive2 { name="reporter"; version="1.0.6"; sha256="0m4kix8s02csgxf85bk1q6bpi2p7rdrbv49ypwcf6fi644x11rs8"; depends=[crayon fmtr stringi]; }; reportr = derive2 { name="reportr"; version="1.3.0"; sha256="0zynplxqvbmf23cm2rsz3wz2jx6mv55z94mn1k44ny3lx625cnpw"; depends=[ore]; }; reporttools = derive2 { name="reporttools"; version="1.1.2"; sha256="1i87xmp7zchcb8w8g7nypid06l2439qyrvpwsjz6qny954w6fa2b"; depends=[xtable]; }; repr = derive2 { name="repr"; version="1.1.0"; sha256="15jz780w4nd9qjd1g3gq8f5lkh60p2v3ig3hm5kl1rg3z4cf0gvl"; depends=[base64enc htmltools jsonlite pillar]; }; represent = derive2 { name="represent"; version="1.0"; sha256="0jvb40i6r1bh9ysfqwsj7s1g933d7z5fq9d618yjrqr6hbbqsvac"; depends=[]; }; + representr = derive2 { name="representr"; version="0.1.1"; sha256="0ni8kw6bklphflrnynmsbjzx2zr4nc20qqhiivn7dyny95ij2m85"; depends=[doParallel dplyr foreach]; }; represtools = derive2 { name="represtools"; version="0.1.3"; sha256="00hnvzkkcl9d3k115i5l9gs0wah5d11amn7q62m1j158lkqlcfza"; depends=[whisker]; }; reprex = derive2 { name="reprex"; version="0.3.0"; sha256="0v7vxzs8alwz8y1cjicpimp5yimf1g9gb8x5wy3zhvrz6kk2lg10"; depends=[callr clipr fs rlang rmarkdown whisker withr]; }; - reproducer = derive2 { name="reproducer"; version="0.3.1"; sha256="0clgbwfv24fjx6hj0km1nwy508dqbga8q8lyzqg801yrr8gidizd"; depends=[dplyr GetoptLong ggplot2 gridExtra httr jsonlite lme4 MASS metafor openxlsx readr reshape stringr tibble tidyr xtable]; }; - reproducible = derive2 { name="reproducible"; version="1.2.1"; sha256="060f2b2rkmmscg7l0m6mzzgy6z245f97msvxphwkw9q4dh0ghiji"; depends=[data_table DBI digest fpCompare glue magrittr raster Require rlang RSQLite sp]; }; + reproducer = derive2 { name="reproducer"; version="0.4.0"; sha256="1hyfx9ynq0xw4mm36alm1dq8vgdpayfncdnlphy7d46sghwzzbsc"; depends=[dplyr GetoptLong ggplot2 gridExtra httr jsonlite lme4 MASS metafor openxlsx readr reshape stringr tibble tidyr xtable]; }; + reproducible = derive2 { name="reproducible"; version="1.2.4"; sha256="0jgi28s8bd03cn30ivzjxcmkbmk2kx9gr2ysw8zkqwd0lvpxw985"; depends=[data_table DBI digest fpCompare glue magrittr raster Require rlang RSQLite sp]; }; reproj = derive2 { name="reproj"; version="0.4.2"; sha256="0lxd1vsxcf0r96jkl5jrh3kyklf90wcs4a27cs6ck93x1cxjnnni"; depends=[crsmeta PROJ proj4]; }; repurrrsive = derive2 { name="repurrrsive"; version="1.0.0"; sha256="1nmy88h2bfv2bad282kbrmnkjx9d8klgzv4mm8nspm049s09ydmz"; depends=[tibble]; }; reqres = derive2 { name="reqres"; version="0.2.3"; sha256="0dly09h8dpjlmvrd1wfg1gqcqhm03ax97qr0nd1p0fg9y0pdapya"; depends=[assertthat brotli jsonlite R6 stringi urltools webutils xml2]; }; request = derive2 { name="request"; version="0.1.0"; sha256="1q7zd6q00gdqmgq7s7nq1ixmns8zn2amr5zah9rwnsn8dkllj9yh"; depends=[curl httr jsonlite lazyeval magrittr R6 whisker]; }; requireR = derive2 { name="requireR"; version="1.0.0.1"; sha256="192l7i3q7s2a6n737an3fn258agjsdzh0q2w0vc8jbz7v4f3i92d"; depends=[]; }; - rerddap = derive2 { name="rerddap"; version="0.6.5"; sha256="1pmpf9jdgp71ganzslwlp5qhkxhy7snaxgbrrym7swx6v2jnwhmv"; depends=[crul data_table digest dplyr hoardr jsonlite ncdf4 tibble xml2]; }; - rerddapXtracto = derive2 { name="rerddapXtracto"; version="1.0.0"; sha256="1xngmdhv5qf6idag6pb04p8snbrsxbrpydzqsc6lgg5035zhw96m"; depends=[abind dplyr ggplot2 httr maps ncdf4 parsedate plotdap readr rerddap sf sp]; }; - rerf = derive2 { name="rerf"; version="2.0.4"; sha256="0ykgxdmkqapdpk5zwi8h1cbsvjv6jpscqpr5cjmdzdan22m09l6k"; depends=[dummies mclust Rcpp RcppArmadillo RcppZiggurat]; }; + rerddap = derive2 { name="rerddap"; version="0.7.0"; sha256="0dszvpxg1mmvcwki194nijzd8xbs910syplf993zgx9idcn0lz2n"; depends=[crul data_table digest dplyr hoardr jsonlite ncdf4 tibble xml2]; }; + rerddapXtracto = derive2 { name="rerddapXtracto"; version="1.0.2"; sha256="0jbkaq6wd4k0j3x2jmkd0v0c1lgn3b6b27m0pbvhhi2k24wqwbcx"; depends=[abind dplyr ggplot2 httr maps ncdf4 parsedate plotdap readr rerddap sf sp]; }; resample = derive2 { name="resample"; version="0.4"; sha256="1rckzm2p0rkf42isc47x72j17xqrg8b7jpc440kn24mqw4szgmgh"; depends=[]; }; resampledata = derive2 { name="resampledata"; version="0.3.1"; sha256="1nxjqvxxvycccmh1n7lpc4k8zmwnciicfr5rzfid1icij5fzw3ak"; depends=[]; }; rescue = derive2 { name="rescue"; version="1.0.3"; sha256="0wq4ka1a7yhbjwr99ngykhn2r3czn3rqi63r6jn46pz15vnicwad"; depends=[data_table dbscan igraph irlba Matrix reticulate]; }; + resemble = derive2 { name="resemble"; version="2.0.0"; sha256="1vr4aydwyipspkw662qw50219r30ms05i567j66yv1ccs574dw6a"; depends=[data_table foreach iterators lifecycle magrittr mathjaxr Rcpp RcppArmadillo]; }; reservoir = derive2 { name="reservoir"; version="1.1.5"; sha256="1qvjq8j2gxp6b8m3k3822f9na8a1kbwzzsmq70m763dcq293rgiz"; depends=[gtools]; }; reshape = derive2 { name="reshape"; version="0.8.8"; sha256="0s6i0sqxg1vldxs6miv8mi0zydxbqzgpmzfiwkj8y7jix3yrfmad"; depends=[plyr]; }; reshape2 = derive2 { name="reshape2"; version="1.4.4"; sha256="1n0jrajpvc8hjkh9z4g8bwq63qy5vy5cgl2pzjardyih4ngcz3fq"; depends=[plyr Rcpp stringr]; }; - resourcer = derive2 { name="resourcer"; version="1.0.1"; sha256="1bq5shdnwlg7j3z43ji7qj2ax598zmszaf2cp5374rir4ggvjdni"; depends=[httr R6]; }; - respirometry = derive2 { name="respirometry"; version="1.1.0"; sha256="16p7hx1rwwc0yr35yv8padq2a8f70mzha6jam2h4c6g90hxll3x0"; depends=[birk lubridate marelac measurements minpack_lm PKNCA seacarb segmented]; }; - restatapi = derive2 { name="restatapi"; version="0.8.6"; sha256="0350p58wbpkwp86hc6akvxmq3w5bd3qlmb7dhfh8ygiah2f8ziil"; depends=[data_table rjson xml2]; }; + resourcer = derive2 { name="resourcer"; version="1.1.0"; sha256="1mdmwi0yfvsjsny2amwk34ry6vmaw3kqf2l39w49bd7yi4n2hjxr"; depends=[httr R6]; }; + respirometry = derive2 { name="respirometry"; version="1.2.1"; sha256="1lhgynij6akn5fkrl5112avhj0w3p9qmbgww7xvawp8hyk16f1x2"; depends=[birk lubridate marelac measurements minpack_lm PKNCA seacarb segmented]; }; + restatapi = derive2 { name="restatapi"; version="0.8.10"; sha256="0sczzxnzwlgb6jyby0x05kips1svsapj4qzflswd94n811fwrz21"; depends=[data_table rjson xml2]; }; + restaurant = derive2 { name="restaurant"; version="0.1.0"; sha256="1dr9nw5xkll1wnra2xi8dg2yiv85nibdg1i9lsn44v7cgr9vb32j"; depends=[]; }; restfulr = derive2 { name="restfulr"; version="0.0.13"; sha256="1dk45mzrr6ka92yjz7hfhkj12kpx1wg4szv1h1mg80mgga4ganbv"; depends=[RCurl rjson S4Vectors XML yaml]; }; restimizeapi = derive2 { name="restimizeapi"; version="1.0.0"; sha256="1ss6fng5pmqg6cafc256g9ddz8f660c68ysxfan6mn4gdaigz7lb"; depends=[RCurl RJSONIO]; }; - restlos = derive2 { name="restlos"; version="0.2-2"; sha256="083w1ldax8bnf3w4119damma2nz75c3ki187b0275i1mqxqrixp7"; depends=[geometry igraph limSolve rgl som]; }; restorepoint = derive2 { name="restorepoint"; version="0.2"; sha256="0pjp5dvycvfg75hhj8lrr2lrjn6n6bqj0ziwyd87lyi15b9j8w4s"; depends=[]; }; restrictedMVN = derive2 { name="restrictedMVN"; version="1.0"; sha256="0qynkg244gzq0yjb0716w7g1sxdq66i11ss8jij86h2mz3ykj137"; depends=[MASS]; }; restriktor = derive2 { name="restriktor"; version="0.2-800"; sha256="0v7304912xhjz5bsngndvwi0y1qnk55xk9ariw2wi9msah1nm4d9"; depends=[boot ic_infer lavaan MASS mvtnorm quadprog]; }; - resumer = derive2 { name="resumer"; version="0.0.3"; sha256="0ilya3v75989zqm16x69w4599ax2s5j2n6f16bmhwydrmzxs1g48"; depends=[dplyr rmarkdown useful]; }; rethinker = derive2 { name="rethinker"; version="1.1.0"; sha256="02zfx08s5xisv1v4y16iqbddi9kb3fcr249b3414fzvs4nm5as94"; depends=[rjson]; }; - reticulate = derive2 { name="reticulate"; version="1.16"; sha256="0ddx3xrlw55d8d3w7pxap618w2c5pd1n2jw4xsa185s8mf1zifkl"; depends=[jsonlite Matrix rappdirs Rcpp]; }; + reticulate = derive2 { name="reticulate"; version="1.18"; sha256="04w5c9jfxakb4rr2qjynxgagb42khsja3y4dwgxywiplb1d8agxk"; depends=[jsonlite Matrix rappdirs Rcpp]; }; retimes = derive2 { name="retimes"; version="0.1-2"; sha256="019sllyfahlqnqry2gqw4w5cy4cavrqnwpwrbb25cgjpdb19raja"; depends=[]; }; retistruct = derive2 { name="retistruct"; version="0.6.3"; sha256="1zij37n2ja3yx6n1agdkb3lj42p01parcg6djv60bng9c2qq0wsl"; depends=[foreign geometry png R_matlab R6 rgl RImageJROI RTriangle sp ttutils]; }; retractcheck = derive2 { name="retractcheck"; version="1.0.0"; sha256="1c4p8afh9g359s560sswcys3manc0lqvk0aqgvd09p4rpzls2dm7"; depends=[httr plyr textreadr]; }; retrodesign = derive2 { name="retrodesign"; version="0.1.0"; sha256="173jrpzasimplv8vbm8gzpl8aibnsjkgvhz1hd75is0b2l8gnbxy"; depends=[]; }; - retrosheet = derive2 { name="retrosheet"; version="1.1.2"; sha256="05i7p59w9rjnbw8rdfsm4vjg6c0k9hhgl1iz4r5ksfdpablwb4xb"; depends=[httr lubridate purrr readr rvest stringi stringr tibble xml2]; }; + retroharmonize = derive2 { name="retroharmonize"; version="0.1.13"; sha256="0zc60vkkzhdm8bp1ivxgbn7z910jh6xgv10n0agfq0hq08ca5cxr"; depends=[assertthat dplyr fs haven here labelled magrittr pillar purrr rlang snakecase tibble tidyr tidyselect vctrs]; }; + retrosheet = derive2 { name="retrosheet"; version="1.1.3"; sha256="0zqwqv1j56116n9j4gg23j5dv88gfx7df6czj1idns1apxjqr283"; depends=[httr rvest stringi stringr xml2]; }; retry = derive2 { name="retry"; version="0.1.0"; sha256="1yfcfvszfjnvvnjcywgchyiyj3jk9nmvk3h40g6bc24xapfkfl2p"; depends=[later rlang]; }; reutils = derive2 { name="reutils"; version="0.2.3"; sha256="09dhf4s7wz3anrkzqi16abx64gk8ck2142kfd8pv71mjy3x548l7"; depends=[assertthat jsonlite RCurl tibble XML]; }; reval = derive2 { name="reval"; version="2.0.0"; sha256="1yxkyc6wdp5h3cp8i42a9cf0b1cwr4nmpd7svlp7bpfxlcnqqa0d"; depends=[doParallel foreach]; }; - revdbayes = derive2 { name="revdbayes"; version="1.3.7"; sha256="1p86xw7mv0jkl5wgkvpnh21nvx62cyr963iv94sc56mgkx4g8pac"; depends=[bayesplot Rcpp RcppArmadillo rust]; }; + revdbayes = derive2 { name="revdbayes"; version="1.3.9"; sha256="0j29hp21dab2fnsb6d41ykvyhfkfz1hf0qjpsz4lypc2rnbc3mpm"; depends=[bayesplot Rcpp RcppArmadillo rust]; }; revealedPrefs = derive2 { name="revealedPrefs"; version="0.4.1"; sha256="1m8y1mj39bnf9q0n9mi0ashvb79lksx5dfkxb04qj2h5kkyxg49g"; depends=[pso Rcpp RcppArmadillo]; }; revealjs = derive2 { name="revealjs"; version="0.9"; sha256="0h4csxrcl1rzmj3g01nf0mr990zc8swrf4jvmxwqsyzx9v2cqbnc"; depends=[rmarkdown]; }; revengc = derive2 { name="revengc"; version="1.0.4"; sha256="1nipkff9zmkdi509qfdrmvsq5c643xd7bzzw5bchxd8nmfqb412i"; depends=[dplyr mipfp stringr truncdist]; }; reverseR = derive2 { name="reverseR"; version="0.1"; sha256="0pzk97q1zs5g1v4ngqd6bkwwxcp89j890nycpc99ipycbgm2r9yw"; depends=[DT knitr markdown shiny]; }; revgeo = derive2 { name="revgeo"; version="0.15"; sha256="1ns7d1817475lriss6wwgvdm6lj760p40yxqaifla13c2xb73a55"; depends=[RCurl RJSONIO]; }; - revss = derive2 { name="revss"; version="0.0.2"; sha256="1fymqmv546hs6bkcx6vjhxxywzbsccir6b6n1h3la41zskz0a6w2"; depends=[]; }; + revss = derive2 { name="revss"; version="1.0.1"; sha256="02v39vvszzikscl8211l5xr0nyqwg28vdlg8vsyad6rnmgy8xd4f"; depends=[]; }; revtools = derive2 { name="revtools"; version="0.4.1"; sha256="0nms7rwpdzf3xq2incraxppha4c830gcygpbnhwjs92c836hh2f0"; depends=[ade4 modeltools ngram plotly shiny shinydashboard slam SnowballC stringdist tm topicmodels viridisLite]; }; - revulyticsR = derive2 { name="revulyticsR"; version="0.0.1"; sha256="19c911c81r6ny9c2x8va626wsfr021g58lx0iridhc3g10cd14xy"; depends=[dplyr httr jsonlite magrittr purrr tibble tidyr tidyselect]; }; + revulyticsR = derive2 { name="revulyticsR"; version="0.0.3"; sha256="0dz9c26qwasgpp6a5fqh1rgq0hp9dhsrcm1h2hbp0cisri8iwsjf"; depends=[dplyr httr jsonlite magrittr purrr tibble tidyr tidyselect]; }; reweight = derive2 { name="reweight"; version="1.2.1"; sha256="0fv7q1zb3f4vplg3b5ykb1ydwbzmiajgd1ihrxl732ll8rkkfa4v"; depends=[]; }; rewie = derive2 { name="rewie"; version="0.1.0"; sha256="1ysrpd2cqmz27sjj3dh0wpg86685d708kjwiqybwjlw9ap55jb06"; depends=[lme4 MASS plm rockchalk]; }; rex = derive2 { name="rex"; version="1.2.0"; sha256="0m7bq8db3m5dhf01rw7xc7xy1ciq3m7dfgsl80p8cy4h8vqr3d06"; depends=[lazyeval]; }; rexpokit = derive2 { name="rexpokit"; version="0.26.6.7"; sha256="13zrr5qj96vh50mknlc2pl7gq1kx5ahwk3n9ij4xr67734x3mx1r"; depends=[Rcpp]; }; rfPermute = derive2 { name="rfPermute"; version="2.1.81"; sha256="0mak4r3j5vbjjkcsbxj0yg2xrbipq4rz873b02drkb769nh3d16a"; depends=[abind dplyr ggplot2 gridExtra magrittr randomForest rlang scales swfscMisc tibble tidyr]; }; rfUtilities = derive2 { name="rfUtilities"; version="2.1-5"; sha256="1anwvmxn3xrc1aqxl75rzlk4wby8l54rmkp0bgi8dgbz2l223xr0"; depends=[cluster randomForest]; }; - rfVarImpOOB = derive2 { name="rfVarImpOOB"; version="1.0"; sha256="1341bicd65qw3pz1j8d6c9baj9d6s70ljdaaf87xvx8pjnajrfsw"; depends=[binaryLogic dplyr ggplot2 ggpubr magrittr prob randomForest titanic]; }; - rfacebookstat = derive2 { name="rfacebookstat"; version="2.1.1"; sha256="0cza2nlpggnx0kqlyn9n0nh1appgvggm6fv97nmm5v4kyanjan50"; depends=[dplyr httr jsonlite purrr stringr tidyr tidyselect]; }; + rfVarImpOOB = derive2 { name="rfVarImpOOB"; version="1.0.1"; sha256="16ivcnnzrgqzfzcbdyi10rwn8r8r0yyxyfpx25lxafb6pj3kxpvf"; depends=[binaryLogic dplyr ggplot2 ggpubr magrittr prob randomForest titanic]; }; + rfacebookstat = derive2 { name="rfacebookstat"; version="2.1.9"; sha256="15g56zxr15z48fzsqb57dij9ki70faaspc5ga5dyjshw0s79xcna"; depends=[dplyr httr jsonlite purrr stringr tidyr tidyselect]; }; + rfacts = derive2 { name="rfacts"; version="0.0.2"; sha256="0g19j0y2q63f0vyf3ijgvx2m514m9d5ainq706s6bfdhqqsd00ww"; depends=[tibble xml2]; }; + rfieldclimate = derive2 { name="rfieldclimate"; version="0.1.0"; sha256="1s7awczna9dxdq97sr5fsbs4qv7rx4wi2z3inwdp33md1bvyq4i7"; depends=[digest dplyr httr jsonlite lubridate magrittr purrr tidyr]; }; rfigshare = derive2 { name="rfigshare"; version="0.3.7"; sha256="1qgzn0mpjy4czy0pnbi395fxxx84arkg8r7rk8aidmd34584gjiq"; depends=[ggplot2 httpuv httr plyr RJSONIO XML yaml]; }; rfinterval = derive2 { name="rfinterval"; version="1.0.0"; sha256="1z7v0sbql6g2h3fr1268nj79rbx1d33hjfaraxhbikrjgb8mbp0w"; depends=[MASS ranger]; }; rfishbase = derive2 { name="rfishbase"; version="3.0.4"; sha256="1km3xjbf3l81sfmmjs55criq4xw6l3xa74f8g1rxsbr5bci9xlia"; depends=[dplyr gh magrittr memoise purrr readr rlang stringr]; }; rfisheries = derive2 { name="rfisheries"; version="0.2"; sha256="16j3hn1py8khqadmh81qsg76c62wzqkaq3fn39z0z5mgynmcm62j"; depends=[assertthat data_table ggplot2 httr rjson]; }; rfishnet2 = derive2 { name="rfishnet2"; version="0.2.0"; sha256="0g90h4353kp7szv3971kb4l5x3x08qx4f9ln85n5g3b3zdg77dkz"; depends=[dplyr ggplot2 pracma rworldmap sf]; }; - rflexscan = derive2 { name="rflexscan"; version="0.3.0"; sha256="12fgpfzx86sci9hmb4sa5ip0j3n63nv0xx4ylwcjx0rg1dx9366d"; depends=[igraph Rcpp rgdal sp]; }; + rflexscan = derive2 { name="rflexscan"; version="0.3.1"; sha256="0kfibdwgjjzl4pnw5kzchba624g5z8bca30jy3zfwhd6d9r8n07j"; depends=[igraph Rcpp rgdal sp]; }; rflights = derive2 { name="rflights"; version="0.1.103"; sha256="1gxfsc3dhlzy6bpqjdxk5x309jmjgvxr8d9amnhrjdygzj6icf18"; depends=[httr]; }; rfm = derive2 { name="rfm"; version="0.2.2"; sha256="1s8h9ll4l5xq3m7ib83zrab49p5q4wclk8qiy2hgjr2hq1sb7wak"; depends=[dplyr ggplot2 ggthemes lubridate magrittr RColorBrewer rlang tibble tidyr xplorerr]; }; rfml = derive2 { name="rfml"; version="0.1.0"; sha256="133adpfjpp14m47841k6ybq9lrvby9bxgr5zs4i3akjr2575nq1j"; depends=[httr jsonlite PKI XML]; }; rfoaas = derive2 { name="rfoaas"; version="2.1.0"; sha256="0w6m3lvfb60a2zfvyc0ksnfllb2ndy45b301vk9f3nr27lxdz6dm"; depends=[httr]; }; - rfordummies = derive2 { name="rfordummies"; version="0.1.4"; sha256="03y4kzf18xwk41dm1nzqqqk0aflwh1mcgfnh0lbr0r7hnsy3a77x"; depends=[openxlsx]; }; + rfordummies = derive2 { name="rfordummies"; version="0.1.5"; sha256="1glzc20sbv90fbazy3wh6drqd5dkh47s3fjqzgm78dkmj6gp9hdv"; depends=[openxlsx]; }; rforensicbatwing = derive2 { name="rforensicbatwing"; version="1.3.1"; sha256="1i521h2nmlkhcxfxqir8jfjv0llwr6cz0ck5w6hzplk48044bn16"; depends=[Rcpp]; }; rfviz = derive2 { name="rfviz"; version="1.0.0"; sha256="0rzyy7r2ybqjnp1g5bbkxydpa93h8q4r71kdaj77r475m2i4kb6b"; depends=[loon randomForest]; }; rgabriel = derive2 { name="rgabriel"; version="0.7"; sha256="1c6awfppm1gqg7rm3551k6wyhqvjpyidqikjisg2p2kkhmyfkyzx"; depends=[]; }; - rgbif = derive2 { name="rgbif"; version="3.2.0"; sha256="0k94yk6irrm4w99dlnr8hka09110b5b3kdxvw10vna3b5ca9pncc"; depends=[conditionz crul data_table geoaxe ggplot2 jsonlite lazyeval magrittr oai R6 tibble whisker wicket xml2]; }; - rgdal = derive2 { name="rgdal"; version="1.5-16"; sha256="0rwlsafqxgqflfid4ciaa9qz3f75fgw8hilhaqj558gdxg8bzigp"; depends=[sp]; }; + rgbif = derive2 { name="rgbif"; version="3.4.0"; sha256="0p08sbr5mgw8zdzvfiijcg78px4kgf21zdg5jr2y0qg797mbg6hk"; depends=[conditionz crul data_table geoaxe ggplot2 jsonlite lazyeval magrittr oai R6 tibble whisker wicket xml2]; }; + rgdal = derive2 { name="rgdal"; version="1.5-18"; sha256="1pr267sh0v6cympdg12yny51cmn4r20s5sjq2hqymn4kphcpqijk"; depends=[sp]; }; rgdax = derive2 { name="rgdax"; version="1.0.0"; sha256="16ph6n1nyl2v2w51ih6wzkpw0j0hfa3f60q1g6p9zis59j0rh7d9"; depends=[digest httr jsonlite RCurl]; }; rgen = derive2 { name="rgen"; version="0.0.1"; sha256="0gl82v09q1ha58wd1014s46wzkx1yf348bc7jkl6s4qdc6c4vsb8"; depends=[]; }; + rgenie = derive2 { name="rgenie"; version="1.0.0"; sha256="1gsq9pkah5fnhjsxbyidngcs0362p8jnpvxycpkb9jaf5ykpq56m"; depends=[cowplot dplyr egg FNN forcats ggdendro ggplot2 gridExtra IRanges magrittr readr Rsamtools stringr tibble tidyr variancePartition]; }; rgenius = derive2 { name="rgenius"; version="0.1.0"; sha256="1gpglnhicyv16ym224wzaw52w9xr63slm75wvidl3z14izzyy7ga"; depends=[doParallel dplyr foreach httr purrr rvest stringr tibble]; }; rgenoud = derive2 { name="rgenoud"; version="5.8-3.0"; sha256="0p93wf6ghgz2nifxbscb6bhahh5jd2ba7nh1c2mb6fmbxnsi3swv"; depends=[]; }; rgeolocate = derive2 { name="rgeolocate"; version="1.3.1"; sha256="1ikharp5f0ddh5wx1a8xf46fcwpz9xc4vl7s386h0jmkph1s0072"; depends=[httr Rcpp]; }; rgeopat2 = derive2 { name="rgeopat2"; version="0.3.9"; sha256="0l0sqkvjkzp4lmyk55l7zc02y04sa43cps47005gq8c38kyks45k"; depends=[readr sf stringr]; }; rgeoprofile = derive2 { name="rgeoprofile"; version="0.2.0"; sha256="1k5nxvdl46b77sshzvzqhgl0s38ng63z53z17jmfdyf4wwzrnhah"; depends=[aspace geosphere leaflet pals RANN raster sp spatstat splancs]; }; - rgeos = derive2 { name="rgeos"; version="0.5-3"; sha256="02v0d2dw4ra3c7f3imkdarqp8b8dcxyzspxgsmjsc6df23hm8x1m"; depends=[sp]; }; + rgeos = derive2 { name="rgeos"; version="0.5-5"; sha256="086l0qk3p4jq23bs91c4a65x4qz99z0hy0vsnvfqfvppdzz0vajb"; depends=[sp]; }; rgexf = derive2 { name="rgexf"; version="0.16.0"; sha256="1vj5ha1qx0xzflchxf25ycys6clfn9y32m1717afzkvhmkwisrra"; depends=[igraph servr XML]; }; - rgho = derive2 { name="rgho"; version="2.0.0"; sha256="18vsd40wrzm8h8xv7mngyndw18wasb5b868ihczvzrqfnf5bq758"; depends=[curl dplyr httr jsonlite lazyeval magrittr memoise readr tibble tidyr]; }; - rgl = derive2 { name="rgl"; version="0.100.54"; sha256="1mgs2d8igmcdzzymfwbqdrypmaidd4pra5n5gnhsn9pm6pqzidqp"; depends=[crosstalk htmltools htmlwidgets jsonlite knitr magrittr manipulateWidget shiny]; }; + rgho = derive2 { name="rgho"; version="2.0.1"; sha256="1byvq2swn2j9v0zy5smjklv7bkncrclhli62cf1f2wiah5qg8sv2"; depends=[curl dplyr httr jsonlite lazyeval magrittr memoise readr rlang tibble tidyr]; }; + rgl = derive2 { name="rgl"; version="0.103.5"; sha256="1vf3ggg4w6g870hkcf39qskh5pxyphv1lf2mdjdwx2j00gk8wwdy"; depends=[crosstalk htmltools htmlwidgets jsonlite knitr magrittr manipulateWidget mathjaxr shiny]; }; rglobi = derive2 { name="rglobi"; version="0.2.21"; sha256="12v6g1ja4rrw0vcrrzgd1llxfk64g9z4f0c90rkbd9cknvnn0id9"; depends=[curl RCurl readr rjson]; }; rglwidget = derive2 { name="rglwidget"; version="0.2.1"; sha256="0siqxn3gyl98i84p0yha821b4rdrp2i0942mkx819wnf7qwrpqcv"; depends=[rgl]; }; + rgnparser = derive2 { name="rgnparser"; version="0.1.0"; sha256="0gpwj1z1n5ckc4gh81zmpaibdg0frb776xq1v74v9vhc96vl9hjg"; depends=[jsonlite readr sys tibble]; }; rgoogleslides = derive2 { name="rgoogleslides"; version="0.3.2"; sha256="0h9gws1vcf0zdd21d8b65c2yz9kxppp3218h5lhd5iz879ajwa2i"; depends=[assertthat httr jsonlite R6]; }; rgr = derive2 { name="rgr"; version="1.1.15"; sha256="1mrnmbh2crhkwdi37q59hx76afvkhgzgaacg3688q7jp23d58z6x"; depends=[fastICA MASS]; }; - rgrass7 = derive2 { name="rgrass7"; version="0.2-1"; sha256="0rhizda58hmglgr4aq6sr5y11y615w0pwpgdk3mylm9pjgj5i5vn"; depends=[XML]; }; + rgrass7 = derive2 { name="rgrass7"; version="0.2-3"; sha256="0y9iydn6hxb0dhm050amhg72y7ygg4d3f7ryymkvl3hasa0md8nz"; depends=[XML]; }; rgsp = derive2 { name="rgsp"; version="0.2.0"; sha256="1fk0k479srfr0f4a5abyzcrzwy9hr1v5xf0jgs36fbim9bh7njlc"; depends=[dplyr magrittr tibble]; }; + rgugik = derive2 { name="rgugik"; version="0.2.1"; sha256="08kjz4mh9m9r3fw3sdvzfm1l0ar1zxl8my0v64g18mc9j1b3jsq3"; depends=[jsonlite openssl sf]; }; rgw = derive2 { name="rgw"; version="0.3.0"; sha256="0hzkajmvqkmv6c238rdgyc6g16h96d5a0lnajnn5m87j0gwsl6wa"; depends=[]; }; rhandsontable = derive2 { name="rhandsontable"; version="0.3.7"; sha256="1y6dlpzid5apjx0gphkym7gq3lhwp0bxan8ca274pg170xyb33h8"; depends=[htmlwidgets jsonlite magrittr]; }; + rhcoclust = derive2 { name="rhcoclust"; version="1.0.0"; sha256="1m2nvwjc8wpwc0dc06f83x91m3dmwm5mjinsrg4i0krlmrig75z9"; depends=[fields igraph tcR]; }; rhierbaps = derive2 { name="rhierbaps"; version="1.1.3"; sha256="0i4sr2wwzzl8vki5zihnd8v4ia2kji09cmf4ld07b6k099g5xprr"; depends=[ape ggplot2 matrixStats patchwork purrr]; }; rhli = derive2 { name="rhli"; version="0.0.2"; sha256="1mb6bizqkg7zd8nc5a81fw7d0y0vcv6zh6y28k9vikqmc5l1n21q"; depends=[]; }; rhmc = derive2 { name="rhmc"; version="1.0.0"; sha256="1m79f1hx404y0k8lk3n6jnzhr6wwrk83xiym68sq1zvj0wjqiqmw"; depends=[]; }; rhmmer = derive2 { name="rhmmer"; version="0.1.0"; sha256="0875b29i8rl9iypxp7vw514avq0ac4abdlfq3861cdd3kgycw8jh"; depends=[dplyr magrittr readr rlang tidyr]; }; rhnerm = derive2 { name="rhnerm"; version="1.1"; sha256="1fkh2pr4kzvqvagdyjlyab7p591s913104gyq05q170gmvlpmiww"; depends=[]; }; - rhoR = derive2 { name="rhoR"; version="1.3.0.2"; sha256="1hzykkvzwv2mb759m9rw32dd1wgmksizqyr6grqf6a2z77k7w197"; depends=[Rcpp RcppArmadillo]; }; + rhoR = derive2 { name="rhoR"; version="1.3.0.3"; sha256="0l387m6l2x3djn1liag4m49835m2mny006sjzqbravb1famrvawi"; depends=[Rcpp RcppArmadillo]; }; rhosa = derive2 { name="rhosa"; version="0.1.0"; sha256="0aygdp7xp5hvr4i1s0isgbbr3pd164aj1px9bns6vdh0svq533qg"; depends=[]; }; rhosp = derive2 { name="rhosp"; version="1.10"; sha256="1k0rb4fchjlzinky6ysdvyk0xjsx5986aqwn3yc6s7m3v7y9wb9m"; depends=[]; }; rhub = derive2 { name="rhub"; version="1.1.1"; sha256="05b4phrny85fshismspjbaz1h0klg1fpy4b309si94pnqffxaqx6"; depends=[assertthat callr cli crayon desc digest httr jsonlite parsedate pillar prettyunits processx R6 rappdirs rcmdcheck rematch tibble uuid whoami withr]; }; rhymer = derive2 { name="rhymer"; version="1.1.0"; sha256="00piml975chmmm3ipskzhfbbp5sq47yg5a78hsisssbzwwxsmbs0"; depends=[httr jsonlite]; }; ri = derive2 { name="ri"; version="0.9"; sha256="00y01n9cx95bjhdpnh7vi0xd5p6al3sxbjszbyxafn7m9mygmnhv"; depends=[]; }; - ri2 = derive2 { name="ri2"; version="0.1.2"; sha256="0z6mbhrda7fh7a4y2kx3mf1zc1p0k4d76phw3187w50kwvkpb737"; depends=[estimatr generics ggplot2 pbapply randomizr]; }; + ri2 = derive2 { name="ri2"; version="0.2.0"; sha256="0zadczx7awymn420hf15sci5z1hq5rpid866gpa1wmrhcyh177nh"; depends=[estimatr generics ggplot2 pbapply randomizr]; }; ribd = derive2 { name="ribd"; version="1.2.0"; sha256="0pqy2a4zb9idmib9is5xk1qavannrij3f6765nrlprr13w4x3vm4"; depends=[glue kinship2 pedtools slam]; }; - ribiosUtils = derive2 { name="ribiosUtils"; version="1.5-6"; sha256="1cfkzqbscj01pjqw7yjqf8gnvjacb13y8fc7nax4cb7gnk4fadc2"; depends=[]; }; ricegeneann = derive2 { name="ricegeneann"; version="1.0.2"; sha256="0wxqp4pfdhvq4mwzjrqi3m9jiayk5bp1ha222mpm4qz1pl41cy9w"; depends=[riceidconverter]; }; riceidconverter = derive2 { name="riceidconverter"; version="1.1.1"; sha256="143f76v3k2q9ddcxf2nzvd04pjgy7p120ln0zkmxpal20c81dwq6"; depends=[dplyr]; }; riceware = derive2 { name="riceware"; version="0.4"; sha256="0pky0bwf10qcdgg9fgysafr35xbmnr9q0jbh56fawj99nbyj3m70"; depends=[random]; }; rich = derive2 { name="rich"; version="1.0.1"; sha256="0kasr9gb85qhngfayqy3fvrsr0a066krwxsx21nsxcnss0mrqygr"; depends=[boot vegan]; }; - ridge = derive2 { name="ridge"; version="2.5"; sha256="0v84glz2436a1n6wqrc46x2lya2f3vn94b83cv0rqlvqygqhyz8r"; depends=[]; }; + ricu = derive2 { name="ricu"; version="0.1.2"; sha256="1x8hdmafd83zxnvzwci53hrd0nryym2zf8zx61hvx8pj50qfnw8p"; depends=[assertthat backports cli curl data_table fansi fst glue jsonlite prt readr rlang tibble vctrs]; }; + ridge = derive2 { name="ridge"; version="2.7"; sha256="1xqk574zw0wf4jzjrnycn2jmln5sg93ki02d70hwaidmbmsiii84"; depends=[]; }; ridigbio = derive2 { name="ridigbio"; version="0.3.5"; sha256="0526nscxynl3857zybpms1wr3230qby29kxglm919pcdvpjb5kz5"; depends=[httr jsonlite plyr]; }; ridittools = derive2 { name="ridittools"; version="0.1"; sha256="1m9xbwxb277l4cd85qxmpw66gyavpwamgwr8kyf8vqarzfbwiilr"; depends=[]; }; riem = derive2 { name="riem"; version="0.1.1"; sha256="0lwhsxb4pm26kb65hs8pa63bsbrgy0zchqm4i6pq9f2r9h8vsm1m"; depends=[httr jsonlite lubridate tibble]; }; - rif = derive2 { name="rif"; version="0.2.0"; sha256="0vk3dmg3qzw3i27wbpfih66rx8sdxq033l7h59h3hy960av4hawh"; depends=[crul data_table jsonlite tibble]; }; rifle = derive2 { name="rifle"; version="1.0"; sha256="1r0cfj3vzndgiarl9sb38zmpnpm4p8v9l5cm9c1m6g2q9kvpgpbs"; depends=[MASS]; }; - riingo = derive2 { name="riingo"; version="0.3.0"; sha256="1aw8w9s5bfd22fjhi7mrzcshpb5vrbakjc1fvcaq3qw2ssj383fp"; depends=[crayon glue httr jsonlite purrr rlang tibble vctrs]; }; + riingo = derive2 { name="riingo"; version="0.3.1"; sha256="1ww9ps0v1yga9dwb68crbhf56xw2svl7az95ifrdrswyyikj02vj"; depends=[crayon glue httr jsonlite purrr rlang tibble vctrs]; }; rijkspalette = derive2 { name="rijkspalette"; version="1.0.1"; sha256="0al5niymn6k6px6fh1pk3rvk3a3b2966bdfh0hprcjjl75a9mgvq"; depends=[crayon curl imager jsonlite]; }; + rinat = derive2 { name="rinat"; version="0.1.6"; sha256="089mjbpnp1b06qbxjh733brf9nz04rgh2spqngxs2kvd5d11jk9p"; depends=[ggplot2 httr jsonlite maps plyr sp]; }; ring = derive2 { name="ring"; version="1.0.0"; sha256="03sbgxwzms20gp0hkm5s0dihqkx3qf6bw0jrays7jjzrrwzl5657"; depends=[R6]; }; + rintimg = derive2 { name="rintimg"; version="0.1.0"; sha256="0jzs4mdwpzbpl0wchyhl3cpywk25ayaxalr12p4cnjl7vnmdm7dp"; depends=[glue htmltools]; }; rintrojs = derive2 { name="rintrojs"; version="0.2.2"; sha256="0vyqb3pyrh12saddar71ac9csn2vkd2j8ln6ygpqys8ky1lc3427"; depends=[jsonlite shiny]; }; rio = derive2 { name="rio"; version="0.5.16"; sha256="0rfl56fdawlhc98451a9lcb6a6m56kw0i7dvd5hx58z025d8vsyk"; depends=[curl data_table foreign haven openxlsx readxl tibble]; }; - rioja = derive2 { name="rioja"; version="0.9-21"; sha256="01vc7zfw13zdri0rx93adx86gprzcmw9d454848ach95hdkwipk5"; depends=[mgcv vegan]; }; - ripe = derive2 { name="ripe"; version="0.1.0"; sha256="0dmf8i8l9ja590fakpgi6lf128wd7cd49g4ihm02cbsn8h5ha27s"; depends=[magrittr]; }; + rioja = derive2 { name="rioja"; version="0.9-26"; sha256="02af6is38nakzr1hf9688n32m5glk1jyp2d9p4irn0mzk7r6r976"; depends=[mgcv vegan]; }; + ripserr = derive2 { name="ripserr"; version="0.1.1"; sha256="1rwsd1yi5vrzdscjgr27fw0d1a6nkc8g2w5hqgqijiwm25h4wl17"; depends=[Rcpp]; }; rise = derive2 { name="rise"; version="1.0.4"; sha256="12r7mbaxp9pjypbpjxlsbqg7spw80gjgm2w0lsvgvclffc50a6ni"; depends=[dplyr ggplot2]; }; riskCommunicator = derive2 { name="riskCommunicator"; version="0.1.0"; sha256="1f8nfha6sgn52f3qvb2bkawv6c8ivrm5n6sy1ggx9337xjl35baz"; depends=[boot dplyr ggplot2 gridExtra magrittr purrr rlang tidyr tidyselect tidyverse]; }; riskParityPortfolio = derive2 { name="riskParityPortfolio"; version="0.2.1"; sha256="0l51spflm7wwwz5yrkw1i5534d1840wyyh2w3mz8apaxac76l0xz"; depends=[alabama Matrix nloptr quadprog Rcpp RcppEigen]; }; riskPredictClustData = derive2 { name="riskPredictClustData"; version="0.2.6"; sha256="0mvy9299pg374gvvqs9lmj2j0f3bzyy279kjpz7jq35hkgz5wif3"; depends=[gee Hmisc MASS mvtnorm]; }; riskR = derive2 { name="riskR"; version="1.1"; sha256="1qadfyb07idfw0bs006kb3917rzda83di6jmsr22941gv78z1wyv"; depends=[]; }; - riskRegression = derive2 { name="riskRegression"; version="2020.02.05"; sha256="1m02aap91hn1gaaadc9qk3ij33l613b03biw52l79dp32yfwzdmm"; depends=[cmprsk data_table doParallel foreach ggplot2 lattice lava plotrix prodlim Publish ranger Rcpp RcppArmadillo rms survival timereg]; }; + riskRegression = derive2 { name="riskRegression"; version="2020.12.08"; sha256="0xa603fcpjd8kgcn1ldwzqpll7h6x738lknjjb5gbly84wbhv6aw"; depends=[cmprsk data_table doParallel foreach ggplot2 lattice lava mets mvtnorm plotrix prodlim Publish ranger Rcpp RcppArmadillo rms survival timereg]; }; riskSimul = derive2 { name="riskSimul"; version="0.1"; sha256="0s2a1mn6g11m96gqscb916caj2aykcs3rkacpqcdnlyzryk1gsnb"; depends=[Runuran]; }; riskclustr = derive2 { name="riskclustr"; version="0.3"; sha256="13fl00g0hzcl4vqvl8zl4m5bpp14948yvd4i4dbdrg1h8ym30ir5"; depends=[aod Matrix mlogit stringr]; }; risksetROC = derive2 { name="risksetROC"; version="1.0.4"; sha256="1fh0jf8v536qzf1v3awx3f73wykzicli4r54yg1z926ccqb4h80l"; depends=[MASS survival]; }; @@ -13376,28 +13946,30 @@ in with self; { rjade = derive2 { name="rjade"; version="0.1"; sha256="0f1jljj6m1almz0na984n0g314y0rl6a0mx04rbrpipgfgz1h37c"; depends=[V8]; }; rjags = derive2 { name="rjags"; version="4-10"; sha256="1nhaim84ww8fd6m8xlpmngqcnp2qpql29ahc38366fxja3ghngmx"; depends=[coda]; }; rjazz = derive2 { name="rjazz"; version="0.1.7"; sha256="0wmqlpgcr98dvapfmdcph5mdv202rzzsvb06iy5sqvpizpg7pbsz"; depends=[RCurl]; }; - rjdmarkdown = derive2 { name="rjdmarkdown"; version="0.1.0"; sha256="1zfb4w0z3wpv8c13rwkf6fzn4l1p6jkxvawkikv80xa8w3nab7iy"; depends=[kableExtra knitr magrittr RJDemetra]; }; + rjdmarkdown = derive2 { name="rjdmarkdown"; version="0.2.0"; sha256="14ndhhxxx7jb9ljhfjxmdrl3kgb1zsrv00kznl2k50fwxx4z66f2"; depends=[kableExtra knitr magrittr RJDemetra]; }; rjdqa = derive2 { name="rjdqa"; version="0.1.1"; sha256="0d7jv3a2a7p7h6jnr5znln06x6m4mksb6cy44xdxir1pwcd1z6br"; depends=[plotrix RJDemetra XLConnect]; }; rje = derive2 { name="rje"; version="1.10.16"; sha256="1a9lxikc5n4sb5fzlw8w8ys65npvlvqfail3mq5zi46smd1s9qp8"; depends=[knitr]; }; rjmcmc = derive2 { name="rjmcmc"; version="0.4.5"; sha256="14rzvp6z5avlcnmlmvb6w4gvlh6v4ncbcai3v4c4svnjv555vz45"; depends=[coda madness mvtnorm]; }; + rjpdmp = derive2 { name="rjpdmp"; version="0.1.0"; sha256="1amkvg75jp0pz39smhb60wryxhwzl0fv4870lhldlp8w6pv672kg"; depends=[data_table Rcpp RcppArmadillo]; }; + rjqpd = derive2 { name="rjqpd"; version="0.2.3"; sha256="14vbp9s2859h4n3m3bq830nvxvk58h3mvvdnb27qsalbcfwd94v5"; depends=[]; }; rjson = derive2 { name="rjson"; version="0.2.20"; sha256="0v1zvdd3svnavklh7y5xbwrrkbvx6053r4c5hgnk7hz7bqg7qa1s"; depends=[]; }; - rjsonapi = derive2 { name="rjsonapi"; version="0.1.0"; sha256="0qshll0y8b6lbfrqmp69w9kc9hgfrz94dk68nddshk9ilg14lx4d"; depends=[crul jsonlite plumber R6]; }; rjstat = derive2 { name="rjstat"; version="0.4.1"; sha256="0kqnl4wizmain70ady982aldhscf24870shvf3sviknplshhgk8j"; depends=[checkmate jsonlite]; }; rjwsacruncher = derive2 { name="rjwsacruncher"; version="0.1.0"; sha256="0pbf3yl7cnx8vv07x9nwgrglv5h8r135fc840pxvapi099nr7ijl"; depends=[XML]; }; rkafka = derive2 { name="rkafka"; version="1.1"; sha256="0c0hszsmmd876jcfamjcfb7bxw7869zgy99j4i6ksb8za232nmmw"; depends=[rJava rkafkajars RUnit]; }; rkafkajars = derive2 { name="rkafkajars"; version="1.1"; sha256="121qnzxhipgv145lhmr6h356jpdd6knsx7f21cv9a8r5r009d42z"; depends=[rJava RUnit]; }; - rkeops = derive2 { name="rkeops"; version="1.4.1"; sha256="1ihkrm3l3pvjp4k9zqrrgb5szma6hvw55rlnj0vpyff6ir18mzr4"; depends=[openssl Rcpp RcppEigen stringr]; }; + rkeops = derive2 { name="rkeops"; version="1.4.1.1"; sha256="1k5j7j0yxk3azvkafhmpzgk87iwmjir9l1mq6pk5sdvn9ykyj85g"; depends=[openssl Rcpp RcppEigen stringr]; }; rknn = derive2 { name="rknn"; version="1.2-1"; sha256="1x9r01314q0wgqwqzd7d13ycjzb4jzghzd3whgjvm2rsmnabai95"; depends=[gmp]; }; rkt = derive2 { name="rkt"; version="1.5"; sha256="1rgf7dnk4d1b46rns2mb2s1ilxq7hqrh057vrrl00324r4h8bs1k"; depends=[]; }; rkvo = derive2 { name="rkvo"; version="0.1"; sha256="0ci8jqf9nc8hb063nckxdnp0nlyr4ghby356lxm00anw44jlmw8v"; depends=[Rcpp]; }; - rlang = derive2 { name="rlang"; version="0.4.7"; sha256="0f4rhnhyhgrv874l0yzm80ij6vcqdykfd7bzmnqs0wbgyhkxk8vq"; depends=[]; }; - rlas = derive2 { name="rlas"; version="1.3.6"; sha256="141pq0bw27iplsyai90xnikba6anv14nx46grk0jp380cv5m6xd2"; depends=[BH data_table Rcpp]; }; - rlc = derive2 { name="rlc"; version="0.2.0"; sha256="083pkajxshckk3hqg7q87jdmiqg9a1jp5lwar6f5r4nqna4kf3xa"; depends=[hwriter jrc jsonlite plyr R6 stringr]; }; + rlang = derive2 { name="rlang"; version="0.4.10"; sha256="0ximv89f6zymnwms121k1jfvvflrdm3pmmf5xyvz56f1qiq04lq7"; depends=[]; }; + rlas = derive2 { name="rlas"; version="1.3.8"; sha256="0ry2khz6xjs6jr3j5jspmm0mvxbgp00f4klkangqspxzakgfw3k2"; depends=[BH data_table Rcpp]; }; + rlc = derive2 { name="rlc"; version="0.3.0"; sha256="187nm0hl71yhnsp9cp9s33sv8jhzrmy36s62fpd8kh8yrmh5dkz8"; depends=[hwriter jrc jsonlite plyr R6 stringr]; }; rld = derive2 { name="rld"; version="1.0"; sha256="1glv4q25z14hcwifwg623h77p4awpsn3nk843pnph4sb3p5qbmn3"; depends=[emdbook MASS survival]; }; + rle = derive2 { name="rle"; version="0.9.2"; sha256="0sagl0jggg40lihzy7pfq4593rfvc3b3f7g6ggi85s7n18qvwg40"; depends=[]; }; rleafmap = derive2 { name="rleafmap"; version="0.2"; sha256="1i2qczipg7lr6fl35lcl896r54jia7libxx83darrfzc1hd9sdcq"; depends=[knitr raster sp]; }; rlecuyer = derive2 { name="rlecuyer"; version="0.3-5"; sha256="09mniai7v8gapr6hd3zm8sm3vi1zcyhgym389904ykb2yx7l68s7"; depends=[]; }; rless = derive2 { name="rless"; version="0.1.1"; sha256="0ham8kf2hbswrcnc5i5b3svywdwq3kwp9n66n4k9sllahl4x9jdn"; depends=[V8]; }; - rlfsm = derive2 { name="rlfsm"; version="1.0.0"; sha256="06dar7hfxpah3dm8zlfq5g0n2gwr9wjch1dy08f8dj22600spbya"; depends=[doParallel foreach ggplot2 plyr Rdpack reshape2 stabledist]; }; + rlfsm = derive2 { name="rlfsm"; version="1.0.1"; sha256="114afkycgn6ny6npzgb2qx6wc8ikyymsgxxb4jb3h5makdz6bi27"; depends=[doParallel foreach ggplot2 plyr Rcpp Rdpack reshape2 stabledist]; }; rlist = derive2 { name="rlist"; version="0.4.6.1"; sha256="08awy2p7rykc272wvvya4ddszbr7b7s7qv4wr3hs8ylr4jqlh0dv"; depends=[data_table jsonlite XML yaml]; }; rlmDataDriven = derive2 { name="rlmDataDriven"; version="0.4.0"; sha256="1fhh2siafpqmvpxi2piccxvvn5n38s5d6as6iyn43rgpsslswc8g"; depends=[MASS tseries]; }; rlme = derive2 { name="rlme"; version="0.5"; sha256="0p26mw4g12l279lh80vqcjs3pvjr759ap2m622490k1i2ralxzif"; depends=[magic MASS mgcv nlme quantreg Rcpp robustbase stringr]; }; @@ -13406,33 +13978,34 @@ in with self; { rma_exact = derive2 { name="rma.exact"; version="0.1.0"; sha256="1igs92la79akyqj84ah23lpcay7i33k7zgzcwm7sii782fhirivx"; depends=[abind metafor]; }; rmaf = derive2 { name="rmaf"; version="3.0.1"; sha256="0w247mamwgibr5576p5c2lzaiz2lv2c25n7gw9q99s7rc4bps7j7"; depends=[]; }; rmake = derive2 { name="rmake"; version="1.1.0"; sha256="00qlki2vps505nxzmfykf1iyq4b0y20nb75hbfcj63ap46z7zk3c"; depends=[assertthat pryr rmarkdown visNetwork]; }; - rmangal = derive2 { name="rmangal"; version="2.0.0"; sha256="0vn5i6hwi64kzi481m3y696cqdxz6frv1n7xxm72a3vbz1jsqcrf"; depends=[httr igraph jsonlite memoise purrr]; }; rmapshaper = derive2 { name="rmapshaper"; version="0.4.4"; sha256="11diajgz8jkfa2d725n0iy0psiw3x4d7kbdvdrd1prwdjsyh7i5d"; depends=[geojsonio geojsonlint jsonlite readr sf sp V8]; }; rmapzen = derive2 { name="rmapzen"; version="0.4.2"; sha256="1vybg3lmrqghvd23jwpfmypvqz2b65bc0m2pwbpizwkkg35iza70"; depends=[assertthat digest dplyr geojsonio httr jsonlite maps maptools purrr rgdal sf sp tibble tidyr]; }; rmargint = derive2 { name="rmargint"; version="2.0.2"; sha256="0irq5114dd8pngl6k13r2rrsivijiqfldm6mby0q5a9wrj2vmwc9"; depends=[]; }; - rmarkdown = derive2 { name="rmarkdown"; version="2.3"; sha256="0vdjq4kcyxkr2m27588kk6yi5g53symjshj4jz4n0j18wz53shji"; depends=[base64enc evaluate htmltools jsonlite knitr mime stringr tinytex xfun yaml]; }; + rmarkdown = derive2 { name="rmarkdown"; version="2.6"; sha256="1c7nrpnv2v43msv7nia90rjh6s5x9m5wlb3mpiwy04fyfb29krz6"; depends=[evaluate htmltools jsonlite knitr stringr tinytex xfun yaml]; }; rmatio = derive2 { name="rmatio"; version="0.14.0"; sha256="072fxg81r4rsc71qrf5p6lr5s3gchbgvxhyzwlx3wxw7y2px6w7y"; depends=[Matrix]; }; rmcfs = derive2 { name="rmcfs"; version="1.3.1"; sha256="1y59r4n2ywinfpkb7zn7gygl97w6p0rvr90sjqy4vdhi60ka16kf"; depends=[data_table dplyr ggplot2 gridExtra igraph reshape2 rJava stringi yaml]; }; - rmcorr = derive2 { name="rmcorr"; version="0.4.0"; sha256="1iv3wr92w162mkxc1bxix36s542h63krbimx5lpcsl4jflralqhr"; depends=[psych RColorBrewer]; }; - rmd = derive2 { name="rmd"; version="0.1.5"; sha256="00fsssd4hnk00wsrials4lwxrjnr84ppnk7094bfswpfc0iawc3z"; depends=[blogdown bookdown bookdownplus citr cli crayon curl devtools dplyr DT magrittr mindr miniUI pagedown purrr rappdirs rmarkdown rstudioapi rticles rvest shiny shinyjs tibble tinytex xaringan xml2]; }; + rmcorr = derive2 { name="rmcorr"; version="0.4.1"; sha256="0mg9i9nb3qycl1q66y6lsvlqiri2n6v32f18js6z6n7z0wb6dgp3"; depends=[psych RColorBrewer]; }; rmdHelpers = derive2 { name="rmdHelpers"; version="1.2"; sha256="1ahzbs8z7wvh1dwbq1kq8wrjrknxi2gck63k70gj0swjvgk0ih5r"; depends=[dplyr knitr]; }; rmda = derive2 { name="rmda"; version="1.6"; sha256="1m7j79jwii9la47w34ka3yl1n7nql8pfn32if0aycn4yw5sy8dmc"; depends=[caret MASS pander reshape]; }; - rmdcev = derive2 { name="rmdcev"; version="1.2.0"; sha256="09ikc8nw60a8gcq45vhqzqf4wbqp0w65qalgkn212k70y0hvq3w6"; depends=[BH dplyr Formula purrr Rcpp RcppEigen RcppParallel rstan rstantools StanHeaders stringr tibble tidyr tidyselect]; }; - rmdfiltr = derive2 { name="rmdfiltr"; version="0.1.2"; sha256="1hj4lhwyz47hznyqjgghp852fkzhk5k7dfp7cxabg8h49qzswcgx"; depends=[assertthat rmarkdown]; }; - rmdformats = derive2 { name="rmdformats"; version="0.3.7"; sha256="1pwd4z175dmz4fpg094rba48gq6sir8ys7ln7pfdsnwmgf79sj9k"; depends=[bookdown htmltools knitr rmarkdown]; }; + rmdcev = derive2 { name="rmdcev"; version="1.2.4"; sha256="0pdw390fknivnfkrzlk1rcv34prgnang50rfgmfpm2g9l6kjckxp"; depends=[BH dplyr Formula purrr Rcpp RcppEigen RcppParallel rstan rstantools StanHeaders tibble tidyr]; }; + rmdfiltr = derive2 { name="rmdfiltr"; version="0.1.3"; sha256="0llnn4pdfznidalm4f7fpyxbhzsqv1096fkbsl1pgf4f7ll6w7a7"; depends=[assertthat rmarkdown]; }; + rmdformats = derive2 { name="rmdformats"; version="1.0.0"; sha256="1xpzs369wpwkv9mqh91v93s7l0pya4mrjycm3panwv65pdcy9698"; depends=[bookdown htmltools knitr rmarkdown]; }; rmdpartials = derive2 { name="rmdpartials"; version="0.5.8"; sha256="15dw0pk1hdif839k60swna4li04inf7fzsiq9bxbw2wk5pdkqirn"; depends=[digest knitr rlang]; }; rmdplugr = derive2 { name="rmdplugr"; version="0.4.1"; sha256="16wmrya8wdipqcrh34k4v4iq05aqd0jwf7rg6w1wsvx2i9211xg6"; depends=[bookdown rmarkdown]; }; rmdshower = derive2 { name="rmdshower"; version="2.1.1"; sha256="1sjpi5ils31adii51gaa8ly7x93l9ganp6in8rsln6si4jc2ppg9"; depends=[rmarkdown]; }; + rmdwc = derive2 { name="rmdwc"; version="0.1.1"; sha256="0qbh3i44l6zqcqcnqv5lyf3lqdr10sahpykvg8p0bry8nscgv2hv"; depends=[knitr]; }; rmeta = derive2 { name="rmeta"; version="3.0"; sha256="0vkbnxp579v8zmcv1isdbzj5swpr6fq17zwparxcvzswjc2x9ydr"; depends=[]; }; rmetalog = derive2 { name="rmetalog"; version="1.0.2"; sha256="00ln3wl23ybjgs44h9x388p56x8jymd54vbcfpzidbhz2im1ilbf"; depends=[ggplot2 lpSolve]; }; rmetasim = derive2 { name="rmetasim"; version="3.1.14"; sha256="0rdkhfgyr97r2d1kd9g8ipb2pn563qxm1y4m9z678q0kqan2ddl0"; depends=[ade4 adegenet gtools pegas]; }; rmgarch = derive2 { name="rmgarch"; version="1.3-7"; sha256="108wrbqj4c02c9cyv5m5xlswb1mlfdrhggb005sixr2dcqghb163"; depends=[Bessel corpcor ff MASS Matrix pcaPP Rcpp RcppArmadillo Rsolnp rugarch shape spd xts zoo]; }; rmi = derive2 { name="rmi"; version="0.1.1"; sha256="1y0395l9lhskdrk3x9ps2dmv0sznsba0n6a9fmma33dc9dhywgf9"; depends=[BH Rcpp RcppArmadillo]; }; - rminer = derive2 { name="rminer"; version="1.4.5"; sha256="0xwlayzmn4z6g9l93mj0vjsh31mhpxcmccvjm0dr802cjiv3phjj"; depends=[adabag Cubist e1071 glmnet kernlab kknn lattice MASS mda nnet party plotrix pls randomForest rpart xgboost]; }; + rminer = derive2 { name="rminer"; version="1.4.6"; sha256="1xydc43is756cy4vsm4k4micj88hhqgyrhb8cmvgv1y8zfrzg2qz"; depends=[adabag Cubist e1071 glmnet kernlab kknn lattice MASS mda nnet party plotrix pls randomForest rpart xgboost]; }; + rminizinc = derive2 { name="rminizinc"; version="0.0.2"; sha256="1hxzrzxixyl2440jgxy8sd3d0z6d04sxaxqx86pa79fv20wqri04"; depends=[checkmate R6 Rcpp rjson rlang rlist]; }; rmio = derive2 { name="rmio"; version="0.2.0"; sha256="0g1sb5av8mw1b4absd5ydxrh93cp5k5x31kl6ghamx8i8irr1ngk"; depends=[]; }; rmonad = derive2 { name="rmonad"; version="0.7.0"; sha256="1vjx8kk57xk7c2a05c6kn75n17842ya7j41hqj3wmgq8yvaxrngx"; depends=[digest glue igraph magrittr pryr]; }; + rmoo = derive2 { name="rmoo"; version="0.1.5"; sha256="0yy8vvwfwhc15lsz0b7zh4rk5s1qh1lvgl3k2fa9nk9arascb22w"; depends=[ecr rgl]; }; rmpw = derive2 { name="rmpw"; version="0.0.4"; sha256="1a49rvdwvmccv4gfir48fw0b9jyrpc2q9zfyk5j9b7nxsx6x7abl"; depends=[gtools MASS]; }; - rms = derive2 { name="rms"; version="6.0-1"; sha256="1zkcsqcvldfj4kyn0346vi51igq951qrnpxlv2pfvap6n2v5wbxq"; depends=[cluster digest ggplot2 Hmisc htmlTable htmltools lattice MASS multcomp nlme polspline quantreg rpart SparseM survival]; }; + rms = derive2 { name="rms"; version="6.1-0"; sha256="0llz519rgnc7v2jqhfrjgixkpkmmi5wi1a52hgz3n28s46ww77mq"; depends=[cluster digest ggplot2 Hmisc htmlTable htmltools lattice MASS multcomp nlme polspline quantreg rpart SparseM survival]; }; rms_gof = derive2 { name="rms.gof"; version="1.0"; sha256="1n0h3nrp11f2x70mfjxpk2f3g4vwjaf4476pjjwy49smxxlxwz82"; depends=[]; }; rmsb = derive2 { name="rmsb"; version="0.0.1"; sha256="16bgr9w92y7fjp418g2mvfgh0hn444in4q7pd94k5s1kmv6232h5"; depends=[BH cluster digest ggplot2 Hmisc knitr loo MASS Rcpp RcppEigen RcppParallel rms rstan rstantools StanHeaders survival]; }; rmsfact = derive2 { name="rmsfact"; version="0.0.3"; sha256="05s23rfs9prr2ia3h4h9y614xhv91lbgppgf3mrrssxkwz220kd5"; depends=[]; }; @@ -13441,7 +14014,6 @@ in with self; { rmutil = derive2 { name="rmutil"; version="1.1.5"; sha256="1xmjmzws4wb0ksg4z4srzyk6mk2l1cr2ina9rznsdsyssr1ycxv0"; depends=[]; }; rmweather = derive2 { name="rmweather"; version="0.1.51"; sha256="0qd49lr12hc39dwg348b021aqxw57pfcb9xxhp51fvnw6gw6bgqd"; depends=[dplyr ggplot2 lubridate magrittr pdp purrr ranger stringr strucchange tibble viridis]; }; rmytarget = derive2 { name="rmytarget"; version="2.1.8"; sha256="1sn1pncxnv2jgxhmbm4zlq6zyi8nsz90x8b7697qlqf2la837v96"; depends=[dplyr httr lubridate purrr stringr]; }; - rnaseqWrapper = derive2 { name="rnaseqWrapper"; version="1.0-1"; sha256="1fa3hmwrpccf09dlpginl31lcxpj5ypxspa0mlraynlfl5jrivch"; depends=[ecodist gplots gtools]; }; rnassqs = derive2 { name="rnassqs"; version="0.5.0"; sha256="1mbkv32zidax9i6km93bbi3m7xpnsy805cz4ikdrid84qg94an09"; depends=[httr jsonlite]; }; rnaturalearth = derive2 { name="rnaturalearth"; version="0.1.0"; sha256="193b31a7n9jhc607mhwxbpx5gr0fpj3qasm9dbi6kcc7vac3ilgm"; depends=[sf sp]; }; rnaturalearthdata = derive2 { name="rnaturalearthdata"; version="0.1.0"; sha256="1z32j5lz2lb8xgpkr73majw22k0b49iazj6jjc7j4w9k4zxxa102"; depends=[sp]; }; @@ -13454,12 +14026,13 @@ in with self; { rngtools = derive2 { name="rngtools"; version="1.5"; sha256="0xgmg3qb6insc157as47mcm9sdjdpy9jirh7w06bxb7pfcxqfx42"; depends=[digest]; }; rngwell19937 = derive2 { name="rngwell19937"; version="0.6-0"; sha256="0m6icqf7nckdxxvmqvwfkrpjs10hc7l8xisc65q8iqpnpwl5p2f6"; depends=[]; }; rnn = derive2 { name="rnn"; version="1.4.0"; sha256="0k960jylbvg8r453430d8dpdzydkk3yr5np8rxkay79533ikrcgy"; depends=[shiny sigmoid]; }; - rnoaa = derive2 { name="rnoaa"; version="1.1.0"; sha256="09cixjs25pkr4glww54yjdnkvpcm01v48fn4f6cy78sykk4cibnp"; depends=[crul data_table dplyr geonames ggplot2 gridExtra hoardr isdparser jsonlite lubridate rappdirs scales tibble tidyr tidyselect XML xml2]; }; - rnpn = derive2 { name="rnpn"; version="0.1.0"; sha256="10xx8fxgdknv71ks42xxvf38xsmjy6s87y67wi21673v0n07fxb5"; depends=[data_table httr jsonlite plyr]; }; + rnoaa = derive2 { name="rnoaa"; version="1.2.0"; sha256="19vdb0hs3vww2w9c7j7m7yy33h7cscrd143xiqkikwxmgwjlf2f1"; depends=[crul data_table dplyr geonames ggplot2 gridExtra hoardr isdparser jsonlite lubridate rappdirs scales tibble tidyr tidyselect XML xml2]; }; + rnpn = derive2 { name="rnpn"; version="1.1.1"; sha256="1wll9yn85nb43hq3ngycaznqai03akns47q9x806d7v95ln90x34"; depends=[curl data_table httr jsonlite magrittr plyr raster rgdal sp tibble XML]; }; rnr = derive2 { name="rnr"; version="0.2.1"; sha256="1z9bab3qmq8d79bcvjzldbxlah2w8mqp2ifd0cn1348dafwa0dhi"; depends=[assertthat purrr]; }; rnrfa = derive2 { name="rnrfa"; version="2.0.3"; sha256="0c7yrnj65dvfa1rc062y9w25k4nqfa0j8mnid7dz7fzf567x56k3"; depends=[curl dplyr ggmap ggplot2 httr jsonlite lubridate rgdal sp tibble zoo]; }; roadoi = derive2 { name="roadoi"; version="0.6"; sha256="1mlf63018qpgyqma51fas1nvags7qcrsw11hm6c1idnxjh0sz82z"; depends=[dplyr httr jsonlite miniUI plyr purrr shiny tibble tidyr]; }; - robCompositions = derive2 { name="robCompositions"; version="2.2.1"; sha256="18p0rb04fzmwqsxcap5mxhhmhav6qs05icdaq3msmbp0n9iwrpz6"; depends=[car cluster cvTools data_table e1071 fpc GGally ggplot2 kernlab MASS mclust pls Rcpp RcppEigen reshape2 robustbase rrcov sROC tidyr VIM zCompositions]; }; + roahd = derive2 { name="roahd"; version="1.4.2"; sha256="1lq4aafag5cd9h6jffk6gv4m7v4p4y7wkdyxazw6fdwiqy8g4wvn"; depends=[dplyr magrittr robustbase scales]; }; + robCompositions = derive2 { name="robCompositions"; version="2.3.0"; sha256="0pzvcshjjjfwlzfbqyw0i1wm4lj4s227wnb7nx3z9aa0g3iqd89d"; depends=[car cluster cvTools data_table e1071 fda fpc GGally ggplot2 kernlab MASS mclust pls Rcpp RcppEigen reshape2 robustbase rrcov sROC tidyr VIM zCompositions]; }; robFitConGraph = derive2 { name="robFitConGraph"; version="0.1.0"; sha256="092nc0xnjs2zxd9ij0dl1xggb8mwl8nly284yjhhygmwlwsvhzxm"; depends=[MASS mvtnorm Rcpp]; }; robcbi = derive2 { name="robcbi"; version="1.1-3"; sha256="0rj732qdd0wd9d9pxldnsw5rif5d7wz327iydvxcf5x8lgvk42jd"; depends=[robeth]; }; robcor = derive2 { name="robcor"; version="0.1-6"; sha256="1hw8simv93jq8a5y79hblhqz157wr8q9dzgm0xhvvv5nkzyqkpzf"; depends=[]; }; @@ -13468,18 +14041,20 @@ in with self; { robeth = derive2 { name="robeth"; version="2.7-6"; sha256="1x0hzgq7jwl83wwmy581ia8009v0j95aksnr5ywpflnqm76rj6v2"; depends=[]; }; robets = derive2 { name="robets"; version="1.4"; sha256="0lvzfpv6569pjysblhadd05sglx0qvyr9wipb9cpiya4a1992n61"; depends=[forecast Rcpp]; }; robfilter = derive2 { name="robfilter"; version="4.1.2"; sha256="0mvpaf6g694b7175bl3yr6lxbwla4pwp7g4y34qb4klgl5n3nw03"; depends=[lattice MASS robustbase]; }; - robin = derive2 { name="robin"; version="1.0.1"; sha256="0zbhv9vs5ccsz6xz0i8hps8431va1kk8jqpr66yiz8nb404z1813"; depends=[DescTools fdatest ggplot2 gprege igraph networkD3]; }; + robin = derive2 { name="robin"; version="1.0.2"; sha256="0jgy8rhwhgm2xim2aj4m671n0ld2q58kq4afbnn8db0g2l7gx7s9"; depends=[DescTools fdatest ggplot2 gprege gridExtra igraph networkD3 qpdf]; }; robis = derive2 { name="robis"; version="2.3.9"; sha256="1pz8904zhif1d02q6ar7winf313j3bjzxlaqsnbczxjjchs6j2g3"; depends=[dplyr ggplot2 httpcache httr jsonlite leaflet mapedit rlang sf tibble tidyr]; }; robmed = derive2 { name="robmed"; version="0.7.0"; sha256="0j868y52fx1c85pw5bng278ybbh3b7h2bvmdrlj9irwgdvqphv9x"; depends=[boot ggplot2 quantreg robustbase shiny sn]; }; - robmixglm = derive2 { name="robmixglm"; version="1.1-1"; sha256="0ri1jfq9017585447imvfqn4g9sgyya5p72ainzzx9i7k0hib3dw"; depends=[actuar bbmle boot doParallel doRNG fastGHQuad foreach MASS numDeriv Rcpp VGAM]; }; - robotstxt = derive2 { name="robotstxt"; version="0.7.8"; sha256="176jrgg1jiz6jrpvw3lafnm4b2dcf7gl8j0hvk7yn5xbsfzc9iac"; depends=[future future_apply httr magrittr spiderbar stringr]; }; + robmixglm = derive2 { name="robmixglm"; version="1.2-0"; sha256="10nlkllzwzbzzvddxa29gc21p9lzsmdxzwr2lzylz66m8j9cgbda"; depends=[actuar bbmle boot doParallel doRNG fastGHQuad foreach MASS numDeriv Rcpp VGAM]; }; + robomit = derive2 { name="robomit"; version="1.0.3"; sha256="1ri9x9c3dmib7si8anjg9k4sxzkjvlwpc5b6lw8ib9kp97frw32l"; depends=[broom dplyr ggplot2 plm tibble tidyr]; }; + robotstxt = derive2 { name="robotstxt"; version="0.7.13"; sha256="1x5sachf7g5c2aj1mg3z2lf60723k1ad80bdr89szkgi92jkfal7"; depends=[future future_apply httr magrittr spiderbar stringr]; }; robreg3S = derive2 { name="robreg3S"; version="0.3"; sha256="0rv8qh98wws1f40d1kmysyy9qin0ngsvwq63cnxbwi290wsnrvls"; depends=[GSE MASS robustbase]; }; robregcc = derive2 { name="robregcc"; version="1.1"; sha256="06fapmc3jfrfdqvz02jr12dk1d5iw6s3mcb13jz1nm2bybw6r04a"; depends=[magrittr MASS Rcpp RcppArmadillo]; }; + robservable = derive2 { name="robservable"; version="0.2.0"; sha256="05j65ds1yclsa3d7s632wcaylh5ig9w5pwz71ffz5h0f4wgf87jz"; depends=[htmlwidgets jsonlite]; }; robsurvey = derive2 { name="robsurvey"; version="0.1.1"; sha256="0rf2sd7maz565hlgpyhvkswqyck01hif4mg5isbnnky9n3nc98pi"; depends=[survey]; }; robumeta = derive2 { name="robumeta"; version="2.0"; sha256="1ynlfxlzh442jd1cf02j0f948m16d536a30gb4bf7208baqri1vg"; depends=[]; }; robust = derive2 { name="robust"; version="0.5-0.0"; sha256="1ks5scp8bnicl9j1r8yrmz668fjs6ifdmi540zw6d2ck500bbw42"; depends=[fit_models lattice MASS robustbase rrcov]; }; robustBLME = derive2 { name="robustBLME"; version="0.1.3"; sha256="18wx116l1riy4wn4083kxl637mkyyi9wbwnmvhkgqw3vb36s4vxd"; depends=[doParallel foreach iterators lme4 mvtnorm numDeriv Rcpp RcppArmadillo]; }; - robustDA = derive2 { name="robustDA"; version="1.1"; sha256="1yys6adkyms5r4sw887y78gnh97qqr7sbi5lxv5l9bnc4ggcfiz6"; depends=[MASS mclust Rsolnp]; }; + robustDA = derive2 { name="robustDA"; version="1.2"; sha256="0kxdqvv17dgnlqp0hkazwfqsg3h4g9gw1w57blwpay67xp4d1jyx"; depends=[MASS mclust Rsolnp]; }; robustETM = derive2 { name="robustETM"; version="1.0"; sha256="1dlj79v08bls500lb81rya6vwx58h97rpq1sy9zwd3mfl9b6awp9"; depends=[]; }; robustHD = derive2 { name="robustHD"; version="0.6.1"; sha256="0h2kdw8xkyflczwfq48cfdal0ccvil8dsq4xpnw7qfmjyvkycnxp"; depends=[ggplot2 MASS perry Rcpp RcppArmadillo robustbase]; }; robustMVMR = derive2 { name="robustMVMR"; version="0.1.0"; sha256="10cidj5q707xy2x2g0vynbdhz84k6amc3svk3x7rgx4jcv55yr6a"; depends=[ggplot2 lmtest robustbase]; }; @@ -13499,7 +14074,7 @@ in with self; { rocTree = derive2 { name="rocTree"; version="1.1.1"; sha256="1hd5v47gymffg5829swpd38xscm4vq75d46fibwkrr7jp9iy37ra"; depends=[data_tree DiagrammeR flexsurv ggplot2 MASS Rcpp RcppArmadillo survival]; }; rocc = derive2 { name="rocc"; version="1.3"; sha256="1j15l28c7kv7x850ycjprqi5gpbsl6wfv97h9lbrx11q5l4r9ivb"; depends=[ROCR]; }; roccv = derive2 { name="roccv"; version="1.2"; sha256="18kq2gzcbz97dw168xppql8k3slpkfl8yv1d8ac48damlhvipif1"; depends=[glmnet pROC]; }; - rock = derive2 { name="rock"; version="0.1.0"; sha256="0plyn9n3ngbdakdv98ywakr5xgkwqkwspla3pdmsi6w12zsvkak8"; depends=[data_tree DiagrammeR dplyr glue purrr yum]; }; + rock = derive2 { name="rock"; version="0.1.1"; sha256="04g831pjbcy2w7lhj0nhqf20ndhywhcafff3gd6inlfkxc3mw33m"; depends=[data_tree DiagrammeR dplyr glue purrr yum]; }; rockchalk = derive2 { name="rockchalk"; version="1.8.144"; sha256="07dp1n155b9gfvk8l30h6bhjbhbylsjxfzns08mryn4mxj3nqpnb"; depends=[carData kutils lme4 MASS]; }; rococo = derive2 { name="rococo"; version="1.1.7"; sha256="1fp3kk5j9kc0vyr50rlbsxjc9p3qz5137sifxsbd297p7zj1fcs2"; depends=[Rcpp]; }; rocsvm_path = derive2 { name="rocsvm.path"; version="0.1.0"; sha256="1pd59bzcz96sxpp725pqa7pjh2gdrfapbilp4wccjkf5290zw56v"; depends=[quadprog svmpath]; }; @@ -13519,8 +14094,8 @@ in with self; { rootWishart = derive2 { name="rootWishart"; version="0.4.1"; sha256="1l9pr3i20hi5k02qnlb3blxhlvp2j0njn74xslw3gcjvyzjlr12j"; depends=[BH Rcpp RcppEigen]; }; roots = derive2 { name="roots"; version="1.0"; sha256="1ssmmmrg18xmqxs6f7dqv07357iwcvk21j1gxsl8s9njbj2plxai"; depends=[animation igraph rARPACK]; }; rope = derive2 { name="rope"; version="1.0"; sha256="06qp6h8cjnz0yacm4r39k99hrw74iyq16h5mqfcki7sf3zqbfm7r"; depends=[]; }; - ropenaq = derive2 { name="ropenaq"; version="0.2.10"; sha256="0sjc5p3wp4x4k86dsxiz68xzyfj9xiz67qc5hsld6zy92vyc0pw2"; depends=[crul dplyr jsonlite lubridate magrittr rlang tidyr]; }; - ropenblas = derive2 { name="ropenblas"; version="0.2.7"; sha256="1d6zkgfsbai13697i14h1m6hbf859lmcl9n4x1wg517zrhh7iv1a"; depends=[cli fs getPass git2r glue magrittr pingr RCurl rlang rstudioapi stringr withr XML]; }; + ropenaq = derive2 { name="ropenaq"; version="0.2.11"; sha256="1zqj1bp0rm82znc92kjh1n427n8navjvsc30axay7bpk3gqbxn70"; depends=[crul dplyr jsonlite lubridate magrittr rlang tidyr]; }; + ropenblas = derive2 { name="ropenblas"; version="0.2.8"; sha256="19rnycan5wv6skjjy8dxxh5sn4ngrq9cicz5xzv787ms725nrcby"; depends=[cli fs getPass git2r glue magrittr pingr RCurl rlang rstudioapi stringr withr XML]; }; ropendata = derive2 { name="ropendata"; version="0.1.0"; sha256="1bv6y241abs6pb4wq5ybx9x4zh72kf8ffs3vlcgdsmhw4jwrsxdl"; depends=[httr jsonlite]; }; ropensecretsapi = derive2 { name="ropensecretsapi"; version="1.0.1"; sha256="0d4yl0h4am3blskdnzk119hk374c3vx0cg99r20w07yh8jfafrw7"; depends=[RCurl RJSONIO]; }; roperators = derive2 { name="roperators"; version="1.1.0"; sha256="0klmk1jmh1iysgf345qa6qyjmn1pkz072ha254k90flprgicg7c6"; depends=[]; }; @@ -13531,30 +14106,28 @@ in with self; { rorcid = derive2 { name="rorcid"; version="0.6.4"; sha256="0v8h1d5dwx5aafw1dq64b8clhzc0ksnqpy5pfbid9c1f290xk907"; depends=[crul data_table fauxpas httr jsonlite tibble xml2]; }; rorqual_morpho = derive2 { name="rorqual.morpho"; version="0.1.1"; sha256="1475yhb5qwj4zpsc4gqqpzs7qvyddxwc63i1f4rhnv6id2hi4msp"; depends=[dplyr magrittr]; }; rorutadis = derive2 { name="rorutadis"; version="0.4.2"; sha256="13a7xj4qw1nd8xgrqhrki3php960lgy9gy38sg4kpvs4j2rwijzc"; depends=[ggplot2 gridExtra hitandrun Rglpk]; }; - rosetta = derive2 { name="rosetta"; version="0.2.0"; sha256="0b5xcy9gzw8d71m2pyx1m71mnbdggckhd42c7pzhkivkl79n5wdz"; depends=[car ggplot2 ggrepel gridExtra lavaan lme4 multcompView pander plyr psych pwr rio ufs]; }; + rosetta = derive2 { name="rosetta"; version="0.3.1"; sha256="1vx9x5wqbm3mrw6qfb1ayqsx9qkk59mrx4f2y6s0xg0znqyczxfn"; depends=[car diptest ggplot2 ggrepel gridExtra kableExtra knitr lavaan lme4 multcompView pander plyr psych pwr rio rmdpartials ufs]; }; rosetteApi = derive2 { name="rosetteApi"; version="1.14.4"; sha256="166p3dvib0xpvhkb92b3imassv1b9mrblz2m05jai2nzlz0q7hzk"; depends=[httr jsonlite]; }; rosm = derive2 { name="rosm"; version="0.2.5"; sha256="10n3yzhk29i3mzbcg6nkjqgvwc9n53ax0d7imn9l4a9msa06as07"; depends=[abind curl jpeg plyr png prettymapr rgdal rjson sp]; }; rospca = derive2 { name="rospca"; version="1.0.4"; sha256="1pxm34xsc2610n0i6dwcm4rhn016yqb03f8vrm93r7285c04n4q7"; depends=[elasticnet mrfDepth mvtnorm pcaPP pracma robustbase rrcov rrcovHD]; }; - rosqp = derive2 { name="rosqp"; version="0.1.0"; sha256="0975g7p75bq238g7lr200svsqm9i11z7l331r0igm5ycahljrlsm"; depends=[Matrix R6 Rcpp]; }; - rosr = derive2 { name="rosr"; version="0.0.10"; sha256="0z0l9m4avif2v33a7rilibpcyj4yfqbrw857kbdzf9pa7xph0i7d"; depends=[blogdown bookdown bookdownplus clipr devtools htmlwidgets knitr mindr rmarkdown rstudioapi shiny tinytex]; }; - rotasym = derive2 { name="rotasym"; version="1.0.8"; sha256="098zf928h1iy5m599gdlyqd5xhk5ng2i1ng8vlyg19xa0aqrl7j0"; depends=[Rcpp RcppArmadillo]; }; + rotasym = derive2 { name="rotasym"; version="1.0.9"; sha256="06z8faj61ylb8x898yqx8g8n784hb26cgrwb7yscqc68wd042bwg"; depends=[Rcpp RcppArmadillo]; }; rotationForest = derive2 { name="rotationForest"; version="0.1.3"; sha256="1z2wk3mcs5hrahsxralidbc0dd8gxdbwjpr2f71g4g3isfx1ic8d"; depends=[rpart]; }; rotations = derive2 { name="rotations"; version="1.6.1"; sha256="175bbwj1bf58gwsw3721dsh8lsika5aqv787kfyjx041m4lar4zv"; depends=[ggplot2 gridExtra Rcpp RcppArmadillo rgl sphereplot]; }; - rotl = derive2 { name="rotl"; version="3.0.10"; sha256="0fh7fmaylv9490yhw6sknv03xmx5isp29mlr0xypyh6mwagngd1q"; depends=[ape assertthat httr jsonlite rentrez rncl]; }; - rotor = derive2 { name="rotor"; version="0.2.4"; sha256="0m947mihnxjzsb64p5dgi4v1y1g3c172xlhdg08nzb2z21qg4r73"; depends=[dint R6]; }; + rotl = derive2 { name="rotl"; version="3.0.11"; sha256="0b0wr795qicb8k1m4ng0kx9alc88davhdr3kar4ynjblaavz16rk"; depends=[ape assertthat httr jsonlite rentrez rncl]; }; + rotor = derive2 { name="rotor"; version="0.3.5"; sha256="0rpa24yh72r6sv5xxyia9p8f8c51cfblprb4srrjk2y0fgz5h33i"; depends=[dint R6]; }; round = derive2 { name="round"; version="0.12-2"; sha256="1kq06q2mbjid8icwahm02za2zp7519cwllx76ch76jyxhmrypcgg"; depends=[]; }; - roundhouse = derive2 { name="roundhouse"; version="0.0.1"; sha256="142dw9ky6fyp5n8zf5lymx083gi56q6wxj4jm0m8cjb0khiqw2lq"; depends=[httr jsonlite]; }; + roundhouse = derive2 { name="roundhouse"; version="0.0.2"; sha256="0xx2wai9pdq0g7x8xmwlf48wxv4v18c7ymzvzxpvw1gggppmbk69"; depends=[]; }; routr = derive2 { name="routr"; version="0.4.0"; sha256="1vswq7vm80nwb50grr4cs290kbq5lx9b19dq0c2wlp9d2dxk50si"; depends=[assertthat digest httpuv R6 reqres stringi uuid]; }; roxut = derive2 { name="roxut"; version="0.2.23"; sha256="1pn2invp7brmdvxzi21hi1pc5nss6d02k2nqps73i0yq7brzc7m2"; depends=[roxygen2]; }; roxygen2 = derive2 { name="roxygen2"; version="7.1.1"; sha256="0qc8akwfwmaqsjaza87f5fi0zk6sh3l6j3assbs6chvx0gnmvidx"; depends=[brew commonmark desc digest knitr pkgload purrr R6 Rcpp rlang stringi stringr xml2]; }; roxygen2md = derive2 { name="roxygen2md"; version="1.0.0"; sha256="1gvrfy0sk5qi8d93zxj5f7xgnnw0w38zyxdik4ckf0pkk0zdm27a"; depends=[desc devtools enc rex rlang tibble usethis withr]; }; roxytest = derive2 { name="roxytest"; version="0.0.1"; sha256="166m0pklgryh3vildg0bvzh9gs3p71sf61ivgkvkvyy9vhvnp3jf"; depends=[roxygen2]; }; royston = derive2 { name="royston"; version="1.2"; sha256="1rywc89qzx0hldbq10201bjdhz60pq2gmgd9b9j52mza3w4canjz"; depends=[moments nortest]; }; - rpact = derive2 { name="rpact"; version="2.0.6"; sha256="09ikjcvz6jisbl387j5idypwxqn2ir55cq8f19klwc0p0d113wg4"; depends=[Rcpp]; }; + rpact = derive2 { name="rpact"; version="3.0.3"; sha256="04hv2lzh0b49is9n2kwjbfh2jm6723n2lf132n0gijxc510mbdxi"; depends=[Rcpp]; }; rpanel = derive2 { name="rpanel"; version="1.1-4"; sha256="0yzasb4k5jcx3wfsll9k9alyrwc0l1x6pk91nj7cqrdiapw8j519"; depends=[]; }; rpart = derive2 { name="rpart"; version="4.1-15"; sha256="0p5frya963ppn476p5dxs2mnarsalksr6gw9zzmjsn8ikq7bx3ib"; depends=[]; }; rpart_LAD = derive2 { name="rpart.LAD"; version="0.1.2"; sha256="1v1arv5b02n0jvyifb5km9w3z3wxg9x9g3g4xck4s319z5g6lp7n"; depends=[Rcpp rpart]; }; - rpart_plot = derive2 { name="rpart.plot"; version="3.0.8"; sha256="0y8054jw44jkjg8ijp3p2grsqwrmsdfzk8vps9ksgm7mgfq5732d"; depends=[rpart]; }; + rpart_plot = derive2 { name="rpart.plot"; version="3.0.9"; sha256="190mh2ia78x7cj925sqs6v441lrskkcpqqb0f6qk2fwvi7lzal0i"; depends=[rpart]; }; rpart_utils = derive2 { name="rpart.utils"; version="0.5"; sha256="00ahvmly6cdf7qhhcic0dbjlljqq8kbhx15rc7vrkd3hzd55c0im"; depends=[rpart]; }; rpartScore = derive2 { name="rpartScore"; version="1.0-1"; sha256="15zamlzbf6avir8zfw88531zg5c0a6sc5r9v5cy9h08ypf34xf4y"; depends=[rpart]; }; rpartitions = derive2 { name="rpartitions"; version="0.1"; sha256="1gklsi4pqhk16xp9s49n1lr9ldm1vx61pvphjqsqkzrlxwcpx3j8"; depends=[hash]; }; @@ -13562,7 +14135,7 @@ in with self; { rpca = derive2 { name="rpca"; version="0.2.3"; sha256="135q3g8jmn9rwamrc9ss45cnbfyw8kxcbrf0kinw8asz70fihj9z"; depends=[]; }; rpcdsearch = derive2 { name="rpcdsearch"; version="1.0"; sha256="17g3x15qgv2hamlj451sb88i83n8svw5vnmjpijp5cnn5d1jx0d6"; depends=[assertthat combinat dplyr stringr xlsx]; }; rpdo = derive2 { name="rpdo"; version="0.3.1"; sha256="0yhg858i5a6s68000a74l4gldycbfmcwcvkk5zhjqzpxzdm7pqb2"; depends=[chk lifecycle]; }; - rpf = derive2 { name="rpf"; version="1.0.4"; sha256="17crcgsbcsh0c00n7bgdqfnd7n1vzz7drfxjs7d18253yl5x44pl"; depends=[lifecycle mvtnorm Rcpp RcppEigen]; }; + rpf = derive2 { name="rpf"; version="1.0.5"; sha256="0kz7i7g3l16irz6bxgnkxdmmd931m1fk6rl72dvs21ir5brr010l"; depends=[lifecycle mvtnorm Rcpp RcppEigen]; }; rpg = derive2 { name="rpg"; version="1.6"; sha256="1vn5cswrkmw98z1dr0f0yjkz3n8kwvjb4zknqg81fzqsagfc89yx"; depends=[getPass RApiSerialize Rcpp uuid]; }; rphylopic = derive2 { name="rphylopic"; version="0.3.0"; sha256="088aafylypsaxfl903qhi8kigkchmdzndibxic4sgiycry6xvxrz"; depends=[crul ggplot2 gridBase jsonlite png]; }; rpicosat = derive2 { name="rpicosat"; version="1.0.1"; sha256="1zj2d6jairmvya91vhv9kpkf34zmzl9vlha5yvfjj0j0apmqc0li"; depends=[]; }; @@ -13578,25 +14151,25 @@ in with self; { rportfolio = derive2 { name="rportfolio"; version="0.0.3"; sha256="1pj08qz1qmdcyxp629lyfggbgzr36wrjir0fj6hpgf5zm588bqiy"; depends=[xts zoo]; }; rportfolios = derive2 { name="rportfolios"; version="1.0-1"; sha256="00xxh85jpl0rw8fv84i7zmq0psc92pq7hharnr4szbmhgz8kbc35"; depends=[truncdist]; }; rpostgis = derive2 { name="rpostgis"; version="1.4.3"; sha256="04x5qdz0kznxnp9kygp0m2rjxyhqfz3mc81mcr4aw6cy5p4zp9aq"; depends=[DBI raster rgeos RPostgreSQL sp]; }; - rpostgisLT = derive2 { name="rpostgisLT"; version="0.6.0"; sha256="1adwpkfndm6n3s9xcx8zrwnj6bmgvq4nzs072fnl5i6kjy6ngjm6"; depends=[adehabitatLT DBI htmltools leaflet lubridate magrittr mapview rpostgis RPostgreSQL sf shiny shinyWidgets sp]; }; + rppo = derive2 { name="rppo"; version="1.0.1"; sha256="182na7mcvgjqbna3v5hw58z6q9k8n0987b8ipz0d138zxaq45474"; depends=[httr jsonlite plyr readr]; }; rpql = derive2 { name="rpql"; version="0.8"; sha256="0iljs08pjnk4b08mgryzn70rxva723bk1hi3wyizx05lls2n8ly7"; depends=[gamlss_dist lme4 MASS Matrix mvtnorm Rcpp RcppArmadillo]; }; rpredictit = derive2 { name="rpredictit"; version="0.0.2"; sha256="1gsfcs5l83p4x0glhnq5hidh5rxwipklsj0nzkxaim65w9kqgx30"; depends=[dplyr DT dygraphs httr jsonlite magrittr quantmod shiny stringr xts]; }; rprev = derive2 { name="rprev"; version="1.0.4"; sha256="1dzqbvfx3fcgfz3b18wwaaprvp0szjfshm8dgmj3r4vyzx71v9lv"; depends=[data_table dplyr ggplot2 lazyeval lubridate magrittr survival tidyr]; }; - rprime = derive2 { name="rprime"; version="0.1.0"; sha256="1v6n1qi0i7x8xgizbyvp1mnwc316lsan4rvam44fgjj45fcd79gd"; depends=[assertthat plyr stringi stringr]; }; + rprime = derive2 { name="rprime"; version="0.1.2"; sha256="1h54vclc800pir3vxqcq4cmmxy9fcar1fydqmba2dzpj8dvlad7v"; depends=[assertthat plyr stringi stringr]; }; rprintf = derive2 { name="rprintf"; version="0.2.1"; sha256="0rwqpln0igxb4m6d6jyp7h3shfb8sbp0kj7cgkffjp88hn9qm4h3"; depends=[stringi]; }; - rprojroot = derive2 { name="rprojroot"; version="1.3-2"; sha256="12r3fdxmi2pmwn6ic3rhg0b20ll5z420m0d8fziv1n21961namnz"; depends=[backports]; }; + rprojroot = derive2 { name="rprojroot"; version="2.0.2"; sha256="07wy07yhms8zln9qb0iwx69dq08h4lrdi8kavjcplfxcskq638az"; depends=[]; }; rpsftm = derive2 { name="rpsftm"; version="1.2.7"; sha256="0ncf9ci39pd7p048cgvhl6phhk975xwyjm4aqs1b4hjy1nml4iz2"; depends=[ggplot2 survival]; }; rpst = derive2 { name="rpst"; version="1.0.0"; sha256="10cbgj67lqgh5bawwa0nwj9kfl3jg4vdm121kc61q199v8dw7nrz"; depends=[plotrix survival]; }; rpsychi = derive2 { name="rpsychi"; version="0.8"; sha256="1h40kbqvvwwjkz5hrclj6j22zhav3yyfbbhqahs1whwjkksnam4w"; depends=[gtools]; }; rptR = derive2 { name="rptR"; version="0.9.22"; sha256="0vvjc6qiq71d5wckl77z606q1fp43mgrfzp1bxcab96n5whb2r9k"; depends=[lme4 pbapply]; }; rpubs = derive2 { name="rpubs"; version="0.2.2"; sha256="18cnzhcvm7gx4k01ysqay53smrf8xqlbaszq41mny5c7qqh1fvpz"; depends=[rvest xml2]; }; rqPen = derive2 { name="rqPen"; version="2.2.2"; sha256="077kdvfdyp5h8630k8jigbz8mfyby8vkjiqxpqv0wfi6cqcjlaf2"; depends=[quantreg regpro]; }; - rqdatatable = derive2 { name="rqdatatable"; version="1.2.8"; sha256="0xz56svv7aqikvk2jlbwf6qlawnv1ylxs5pr9yhmzfr671c85rqp"; depends=[data_table rquery wrapr]; }; - rquery = derive2 { name="rquery"; version="1.4.5"; sha256="0ha7v7h8f84ml4bsr5hcgghpjim332zlr3ng364qmxdif81z6v98"; depends=[wrapr]; }; + rqdatatable = derive2 { name="rqdatatable"; version="1.2.9"; sha256="0152df81bsqvbxz0g16bk3j2m0vjxli58yi3191mnlx7ff587ac6"; depends=[data_table rquery wrapr]; }; + rquery = derive2 { name="rquery"; version="1.4.6"; sha256="1a0rwhjcf93i48pg8zjnp3xwv0mawk2fcir03w9bqgqz290cq3n5"; depends=[wrapr]; }; rr = derive2 { name="rr"; version="1.4"; sha256="1c2h6ibjfwrjfqh1if3c90pdh0g2rf3p71j4p9w23xbbrx2l80pl"; depends=[arm coda magic MASS]; }; rr2 = derive2 { name="rr2"; version="1.0.2"; sha256="099vjg91ni2bnxlra18pvgsvzrl28zrj639cdjrh3wkpqv99d04q"; depends=[ape lme4 Matrix nlme phylolm]; }; rrBLUP = derive2 { name="rrBLUP"; version="4.6.1"; sha256="1ny48ra25rzx3k69pmzpd31ka2zhqyqiq1v7ann862j3ris0w8z9"; depends=[]; }; - rrapply = derive2 { name="rrapply"; version="1.1.0"; sha256="1h6bf7rf5s9smnj8gw7scaj60gnqwzwis1ak8r6pragzpgjkgiqm"; depends=[]; }; + rrapply = derive2 { name="rrapply"; version="1.2.1"; sha256="0f5b96bhisksdxiy7d1ph9ff7k85qdzd5xb2y6m19q0k14mkxini"; depends=[]; }; rrat = derive2 { name="rrat"; version="1.0.0"; sha256="1j1jd32pgggn5cqv66l63sw5p4hblgpznf33wd0zdbfapwy8rx4r"; depends=[quantreg]; }; rrcov = derive2 { name="rrcov"; version="1.5-5"; sha256="0ag6q16ajkqwj28dk9vp4xkvqw26fqqqdxnz38gpszilirahfzqz"; depends=[lattice mvtnorm pcaPP robustbase]; }; rrcov3way = derive2 { name="rrcov3way"; version="0.1-18"; sha256="1gpjmmdca2waqks0qykj59p50v6pf1zgl81m5lhbrhpcr4rdr63l"; depends=[nnls robustbase rrcov]; }; @@ -13605,8 +14178,8 @@ in with self; { rrd = derive2 { name="rrd"; version="0.2.2"; sha256="104iz2y49vzm92a8nrvgzrjyljxl467mp1hjnjmzl4rhf9kl809y"; depends=[assertthat tibble]; }; rrecsys = derive2 { name="rrecsys"; version="0.9.7.3.1"; sha256="1qnjriv1xq4gjjhzz8jxrbk88mw5xddl2l2i4bmfhnxhi51d2rk3"; depends=[ggplot2 knitr MASS Rcpp registry]; }; rredis = derive2 { name="rredis"; version="1.7.0"; sha256="0wzamwpmx20did8xj8x9dllri2ps83viyqjic18ari7i4h1bpixv"; depends=[]; }; - rredlist = derive2 { name="rredlist"; version="0.6.0"; sha256="0cl3wbhx96a118f7yld7jf2jq8wimqqvd1apglshyvz3yj03dlxy"; depends=[crul jsonlite]; }; - rrefine = derive2 { name="rrefine"; version="1.0"; sha256="1lh3vddrp5k9bhz5spv93w0qm9z5lskpdgxfksys0l3275hzx1lm"; depends=[httr readr rlist]; }; + rredlist = derive2 { name="rredlist"; version="0.7.0"; sha256="1w77cnfrybmqnadsmfkpjv5m49kkr7yc6kcqq165lmj3bijnprnj"; depends=[crul jsonlite]; }; + rrefine = derive2 { name="rrefine"; version="1.1.0"; sha256="0hbpblvabvv8z539dy2v93j3glnp3zsfzlg7m0k5b797l1z8xb46"; depends=[httr readr rlist]; }; rreg = derive2 { name="rreg"; version="0.2.1"; sha256="05c2yj58zn43zkmqp4iyblsixsq76hsjkchffl5rkqynvgxi0qzi"; depends=[directlabels ggplot2]; }; rrepast = derive2 { name="rrepast"; version="0.8.0"; sha256="1x8xda9cndxri2hhd2ihxmjjy0x74r0dh3953dfh7gvj4slaf0rl"; depends=[digest doSNOW foreach ggplot2 gridExtra lhs rJava sensitivity xlsx]; }; rres = derive2 { name="rres"; version="1.1"; sha256="138m26ya119805b1akwski0hf1ypiqsqjlkrm9p0l2x22zrv1n60"; depends=[kernlab Rcpp]; }; @@ -13620,40 +14193,44 @@ in with self; { rrtable = derive2 { name="rrtable"; version="0.2.1"; sha256="1hblrxn7vixcp32j3cij0xrkzvk31agi9dqgxrimcrzs7gjcd1j5"; depends=[devEMF editData flextable ggplot2 ggpubr magrittr moonBook officer purrr readr rlang rmarkdown rvg shiny shinyWidgets stringr ztable]; }; rrum = derive2 { name="rrum"; version="0.2.0"; sha256="0w0f2n14if2b8x7n6v8y8q2vghd8j7xm1xhpxnvy3z50flinwgm7"; depends=[Rcpp RcppArmadillo rgen simcdm]; }; rsae = derive2 { name="rsae"; version="0.1-5"; sha256="1f3ry3jwa6vg2vq2npx2pzzvfwadz8m48hjrqjk860nfjrymwgx5"; depends=[]; }; - rsample = derive2 { name="rsample"; version="0.0.7"; sha256="0s6hgq0rcv3ianyidq3n9z34y5ww51gaggqkwmwns9yyxmwfjcm8"; depends=[dplyr furrr generics purrr rlang tibble tidyr tidyselect vctrs]; }; + rsample = derive2 { name="rsample"; version="0.0.8"; sha256="1psmxk16d4bz1v05x0gb9hn4brkdjxw8hjbxmj62snichnix3q3i"; depends=[dplyr ellipsis furrr generics modeldata purrr rlang slider tibble tidyr tidyselect vctrs]; }; rsatscan = derive2 { name="rsatscan"; version="0.3.9200"; sha256="00vgby24jknq8nl7rnqcwg7gawcxhwq8b7m98vjx2hkqx39n4g21"; depends=[foreign]; }; + rsbp = derive2 { name="rsbp"; version="0.1.0"; sha256="0aardngvj9apn8q5vhfpv67rf7d5iqb7xdq7rh8xmgr8341fvbgc"; depends=[dplyr lubridate magrittr purrr reshape2 tibble tidyr xml2]; }; rscala = derive2 { name="rscala"; version="3.2.19"; sha256="1wq0wrdbh0gi0bx4m9526qlbjm7nxxqgc17ikdx5mrhcy2f61hjk"; depends=[]; }; rscimark = derive2 { name="rscimark"; version="1.0"; sha256="1jsjz4d5bnxb90qqzz42m4nyvm8d8w8bs0m1r5g2n78zmckqb8vy"; depends=[checkmate]; }; rsconnect = derive2 { name="rsconnect"; version="0.8.16"; sha256="05ii0p0p7xpf8z0c1594s5q7wpwcs7lmlddrd67s5p2ka5m8qwiz"; depends=[curl digest jsonlite openssl packrat rstudioapi yaml]; }; - rscontract = derive2 { name="rscontract"; version="0.1.1"; sha256="1s19p9cga0qm1diblqf3rmcbm3agiimq4lhfgk004cg7rhaa1lyh"; depends=[]; }; + rscontract = derive2 { name="rscontract"; version="0.1.2"; sha256="0gn0xcvg9nj6m97g4si6bgmgaj6hxpicz8yig7n84jnczh6w510x"; depends=[]; }; rscopus = derive2 { name="rscopus"; version="0.6.6"; sha256="0kl6rv0j2396b8izvy0lp1f588il6w3yhq6d4swv8x8z14rsgcpw"; depends=[dplyr glue httr jsonlite plyr tidyr]; }; - rscorecard = derive2 { name="rscorecard"; version="0.16.0"; sha256="0lnxwwf2km9y527k173c8jiy4ijlcj27ykwnnwzbjd3xvkjj0ldb"; depends=[dplyr httr jsonlite lazyeval magrittr purrr tidyr tidyselect]; }; + rscorecard = derive2 { name="rscorecard"; version="0.17.0"; sha256="0h574fvqfx3i23xh454xg6fk75m9pzpqhpk87c22qs3jvxv757sv"; depends=[dplyr httr jsonlite lazyeval magrittr purrr tidyr tidyselect]; }; rsdepth = derive2 { name="rsdepth"; version="0.1-5"; sha256="064jbb6gnx0sm41w3sbi6mvsbzsfkjqfici6frk8sfm9ybvm591j"; depends=[]; }; rsdmx = derive2 { name="rsdmx"; version="0.5-14"; sha256="1b4x87h8kfw8yhmfsjf9l1i0afr7bgvyp5a369m5gn6m07dvlbp9"; depends=[plyr RCurl XML]; }; rseedcalc = derive2 { name="rseedcalc"; version="1.3"; sha256="18zmpjv6g8f7pmvqlp6khxyys9kdnq5x4zxwb6gwybsh4jxrymkp"; depends=[]; }; rsem = derive2 { name="rsem"; version="0.5.0"; sha256="1xlk83ivmk8wm6mdmmwvv2z39r6scswgmsmy6dd4qbc3kiqn8cqm"; depends=[lavaan MASS]; }; + rsetse = derive2 { name="rsetse"; version="0.4.0"; sha256="1mas970p93r0jhxnm1q0sb080k2hh5sxq5q5vrwbj5csxg3c029a"; depends=[dplyr igraph magrittr Matrix minpack_lm purrr rlang tibble]; }; rsf = derive2 { name="rsf"; version="0.2.2"; sha256="016q6yly2vl6q9mkff2krri2rmzsm9gc9gippd8l38h5c8ri6cdl"; depends=[bookdown knitr magrittr rlang usethis yaml ymlthis]; }; - rsimsum = derive2 { name="rsimsum"; version="0.9.0"; sha256="02bnb6rr5dzvbywp88sp81lb6ibxlfqiba5vsgp5manx1zmbgjy0"; depends=[checkmate ggplot2 ggridges knitr rlang scales]; }; + rsimsum = derive2 { name="rsimsum"; version="0.9.1"; sha256="147qn67kwkzgrvg74rdjmck95p2pnq8xxd91f3m801r0gxlz2zr7"; depends=[checkmate ggplot2 ggridges knitr rlang scales]; }; rsinaica = derive2 { name="rsinaica"; version="0.6.1"; sha256="1ba19b2fgnnl50qp6hgjppgxbadghq68qap9f0m51k2k3ijgfiwn"; depends=[dplyr httr jsonlite lubridate stringr]; }; rskey = derive2 { name="rskey"; version="0.4.4"; sha256="1la3apypp1kk425r753vqwm3nk9zmynp9gix6db0ckkssw0fjxpw"; depends=[berryFunctions rstudioapi]; }; rsleep = derive2 { name="rsleep"; version="1.0.3"; sha256="11r32xxqdi0cvx67x8yrb4c36c73mgdy18sayg18cnsqb9qhxvyz"; depends=[edfReader ggplot2 jsonlite phonTools psd signal]; }; rslp = derive2 { name="rslp"; version="0.2.0"; sha256="186k1gngirqhvhii4ysq77wjf5gf75c7gya73minb0pfg9fn16l7"; depends=[magrittr plyr stringi stringr tokenizers]; }; rslurm = derive2 { name="rslurm"; version="0.5.0"; sha256="0dpxglcsqa2k0nak10515ga13c46rb4mrbpbr3gv7xckg6347zqg"; depends=[whisker]; }; - rsm = derive2 { name="rsm"; version="2.10"; sha256="0a6bxrb0qad40lnigqjv2pnwwzcwi1rcmh9gb1a1b00k1n3mnmlc"; depends=[estimability]; }; - rsnps = derive2 { name="rsnps"; version="0.3.0"; sha256="1ym58gqpvn708228pbkq1klvl60a60bwxwm0arzzad3wh1wansxj"; depends=[crul data_table jsonlite plyr stringr XML xml2]; }; + rsm = derive2 { name="rsm"; version="2.10.2"; sha256="0709jbhliajll3cw0g0dj368mxmpv0n1yv98pq3b7wcq8bxnqi36"; depends=[estimability]; }; + rsmatrix = derive2 { name="rsmatrix"; version="0.1.1"; sha256="1g3s1mbv3fvy42cszf33v9kjxl2zxcnjkrmdg5i55fl478x9jfpi"; depends=[Matrix]; }; + rsnps = derive2 { name="rsnps"; version="0.4.0"; sha256="0ppv64yj1nh13q4lks6djrjc37b32qj5pyddy1lfcy066ah63km6"; depends=[crul data_table httr jsonlite plyr RJSONIO stringr]; }; rsoi = derive2 { name="rsoi"; version="0.5.4"; sha256="1gchznfshp91i3if8077qph26flxzwa2xrw3q488ah50725d63hw"; depends=[curl memoise]; }; - rsolr = derive2 { name="rsolr"; version="0.0.9"; sha256="1mxvzb7wvm1agv35r82pr1hxa3fimixcwf36j98qjlxj9p7valrw"; depends=[BiocGenerics graph RCurl restfulr rjson S4Vectors XML]; }; + rsolr = derive2 { name="rsolr"; version="0.0.10"; sha256="0dmn35j3m7aw9x70x5ngs6jrb3d1jamlajr4wz46xgfdl1c3y7gz"; depends=[BiocGenerics graph RCurl restfulr rjson S4Vectors XML]; }; rspa = derive2 { name="rspa"; version="0.2.5"; sha256="0jvrr3jaw66zqi5pal9dycpac24dn9v7lf2m63q01wmd8m3mlnv9"; depends=[lintools validate]; }; rsparkling = derive2 { name="rsparkling"; version="0.2.19"; sha256="1rb43lslhlg8jpniirzch8gnl86x6d3shcfp9fpxm0qd3fqrlm6z"; depends=[h2o sparklyr]; }; rsparse = derive2 { name="rsparse"; version="0.4.0"; sha256="1blg59gsidh0sn6yy761pisz2phml0hzgqc24s5s8q9q903rddr9"; depends=[data_table float lgr Matrix Rcpp RcppArmadillo RhpcBLASctl]; }; rspiro = derive2 { name="rspiro"; version="0.2"; sha256="1gjil39ib9p86a7r3i03h01x2dsc9y283rnp65xvavrzmmgz87b4"; depends=[]; }; rsppfp = derive2 { name="rsppfp"; version="1.0.4"; sha256="123yv54i58xj4wx9n08qp50mm4l271fm1zhzimrxx22wn2bg8zy5"; depends=[doParallel dplyr foreach igraph stringr tidyr]; }; - rsq = derive2 { name="rsq"; version="2.0"; sha256="1sqajp7fhj918s8qzijijs3srf7qc3cixxwljr61715q4p6m7wzw"; depends=[lme4 MASS Matrix nlme numDeriv]; }; + rsq = derive2 { name="rsq"; version="2.1"; sha256="1k1p21p9511vxv5zxcv4j7dvrd8f7z7wlsv7zpn961i9d18z75y2"; depends=[Deriv lme4 MASS Matrix nlme]; }; + rstac = derive2 { name="rstac"; version="0.9.0"; sha256="1qz1pc054fc2adgl1ih0z6fs4wfnw8a9sycyrw4ag7990ibz606p"; depends=[crayon httr jsonlite magrittr]; }; rstack = derive2 { name="rstack"; version="1.0.0"; sha256="19vbfmkd6ymadah1y1w5rn52f4hviddccyc6qj2cv5viqwbwws2z"; depends=[R6]; }; rstackdeque = derive2 { name="rstackdeque"; version="1.1.1"; sha256="0i1qqbfj0yrqbkad8bqc1qlxmyxpn7zycbnq83cdmfbilcmi87ql"; depends=[]; }; rstan = derive2 { name="rstan"; version="2.21.2"; sha256="0jh58qfrksd2j9w2zy4bajryivgp36m3xdb9mjrjqbk1ib9h83p3"; depends=[BH ggplot2 gridExtra inline loo pkgbuild Rcpp RcppEigen RcppParallel StanHeaders V8 withr]; }; rstanarm = derive2 { name="rstanarm"; version="2.21.1"; sha256="04ggzak3f7jaxza3dxyrmxp5b48qcgyspy22ykbhr03g4hzp7jk8"; depends=[bayesplot BH ggplot2 lme4 loo Matrix nlme Rcpp RcppEigen RcppParallel rstan rstantools shinystan StanHeaders survival]; }; - rstanemax = derive2 { name="rstanemax"; version="0.1.2"; sha256="1k3ng4sh17q69iar03cg6lkw0mfpka9vlv5djih0n3wb2lfsz2k2"; depends=[BH dplyr ggplot2 magrittr purrr Rcpp RcppEigen rstan rstantools StanHeaders tidyr]; }; + rstanemax = derive2 { name="rstanemax"; version="0.1.3"; sha256="0myxcqwpk4zq5y1ri14rbsbb19kr8g7fd3mfdsn8vh2yi5xlcqk1"; depends=[BH dplyr ggplot2 magrittr purrr Rcpp RcppEigen rstan rstantools StanHeaders tidyr]; }; rstantools = derive2 { name="rstantools"; version="2.1.1"; sha256="0b9x8rzj3dr4m7yjx476nn42z22xd1xnw85m9frfwxy5ivg1any9"; depends=[desc Rcpp RcppParallel]; }; rstap = derive2 { name="rstap"; version="1.0.3"; sha256="176z39k54l5r60md6wziz828c46alv2pmqivvmhvb358crrb8x7n"; depends=[abind bayesplot BH dplyr ggplot2 lme4 loo Matrix nlme pracma Rcpp RcppEigen rstan rstantools StanHeaders]; }; rstatix = derive2 { name="rstatix"; version="0.6.0"; sha256="0nwwvxwr4z3j4n9z8cnvwghppc836g47n0ia98chk272qwh8xcpb"; depends=[broom car corrplot dplyr generics magrittr purrr rlang tibble tidyr tidyselect]; }; @@ -13661,28 +14238,28 @@ in with self; { rstiefel = derive2 { name="rstiefel"; version="1.0.0"; sha256="0g09fpp3432v78gqgn0hiva6zqr8yqn379wz4428wanmiskqr3f0"; depends=[]; }; rstpm2 = derive2 { name="rstpm2"; version="1.5.1"; sha256="0p1zqqjss8i5wca4qvr56d6p9ak20ki4cfbxja1wrhkp4kii29r6"; depends=[bbmle deSolve fastGHQuad mgcv Rcpp RcppArmadillo survival]; }; rstream = derive2 { name="rstream"; version="1.3.6"; sha256="1mr869hff5wdpw6a7x71366y8dxf9vljbb11fssfkhcf7hm2ipnj"; depends=[]; }; - rstudioapi = derive2 { name="rstudioapi"; version="0.11"; sha256="0srh0m4mw4k6s7spwb84l4cx4xnn04cp5cjxi0fwza7bwavpzq0k"; depends=[]; }; + rstudioapi = derive2 { name="rstudioapi"; version="0.13"; sha256="12vdfzzjc6mv4h105l8cp108j3hjk0mqmg23m6mqr3jarfymphxa"; depends=[]; }; rsubgroup = derive2 { name="rsubgroup"; version="1.0"; sha256="1151w8lzsj3w7k56gdry44g9a8a1iqh5m0srd6mydzdxaj90q2pc"; depends=[foreign rJava]; }; rsurface = derive2 { name="rsurface"; version="1.1.0"; sha256="1pymbgvr72nqd66wap5wrcizzx2k9bfr6vkxv6dkvjmi8q7jl2gv"; depends=[plotly rsm]; }; rsurfer = derive2 { name="rsurfer"; version="0.2"; sha256="14zd8fhak12yha6miwb84085722v5ipk8lagijhc6af291kp70i9"; depends=[gdata stringr]; }; rsvd = derive2 { name="rsvd"; version="1.0.3"; sha256="1fvrw46fl5xb2akaa4mp8nja4h7nn4bdhnjdrk22fsdfqc7hwmhk"; depends=[Matrix]; }; rsvg = derive2 { name="rsvg"; version="2.1"; sha256="0bxnwa9sbzx6jlxrzh3ymjq81vkxil2qx7kk7wp13a0cql7dhxcn"; depends=[]; }; rsyncrosim = derive2 { name="rsyncrosim"; version="1.2.4"; sha256="1m8nmw5jq69zgzgjvr7f03skvrry0w4lcf1yg64viaggvm9qyysf"; depends=[DBI raster RSQLite]; }; - rsyntax = derive2 { name="rsyntax"; version="0.1.0"; sha256="177f6hy3qzbr865ws3afs3ahg3h841ig06crbl0vdjcr02y71mwv"; depends=[base64enc data_table digest igraph magrittr png rlang stringi tidyselect tokenbrowser]; }; + rsyntax = derive2 { name="rsyntax"; version="0.1.1"; sha256="1z0wy1rfqdb9nfmrprqjsdjx1isn484r8ahp7x24ncql9snngia8"; depends=[base64enc data_table digest igraph magrittr png rlang stringi tidyselect tokenbrowser]; }; rsyslog = derive2 { name="rsyslog"; version="1.0.1"; sha256="1i33bpv894jk7cixsvn85h1g532zj39f8dfqq8cyzgsav9wba2y4"; depends=[]; }; - rt = derive2 { name="rt"; version="1.0.0"; sha256="1fhi3qnb2y3p96nksbsz49v0q38hg3zfjm7hyk3mpkxn24a188hp"; depends=[httr stringr]; }; + rt = derive2 { name="rt"; version="1.0.1"; sha256="1l04rx5cvg3sxff4i22bnckljq0rr6jld7dd3kpirdj8psak70id"; depends=[httr stringr]; }; rt_test = derive2 { name="rt.test"; version="1.18.7.9"; sha256="0ywkdjvfzmrmmsfkz4jbhwzbzv7wivx80xy8wr92dch1862h6ias"; depends=[]; }; rt3 = derive2 { name="rt3"; version="0.1.2"; sha256="1fqbymkz4csavkxrs26glzrh0kw3qy9x5smgddgda9a1dxh9ljkm"; depends=[]; }; rtape = derive2 { name="rtape"; version="2.2"; sha256="0q7rs7pc1k1kayr734lvh367j5qig2nnq5mgak1wbpimhl7z3wm7"; depends=[]; }; rtdists = derive2 { name="rtdists"; version="0.11-2"; sha256="0fap15bkxn2azd5a4j3q9mxpif5ff3y2vb8rm4xnh8l0sl1lw7cs"; depends=[evd gsl msm Rcpp]; }; rtematres = derive2 { name="rtematres"; version="0.2"; sha256="1d0vrprvnlk4hl2dbc6px9xn9kx9d1qvlqxd798hzda6qg5wwvf2"; depends=[gdata plyr RCurl XML]; }; - rtemps = derive2 { name="rtemps"; version="0.7.0"; sha256="0a7f4503zjcwl92xy59f82k6y3fwxkhm8dgpds8bh9x3154x7ryx"; depends=[bookdown DT ggplot2 knitr rmarkdown xfun]; }; + rtemps = derive2 { name="rtemps"; version="0.8.0"; sha256="1x64j13g1lv0s7yy1b4453l7xnscgf079hkgkp8dv9c38g0mfx98"; depends=[bookdown DT ggplot2 knitr rmarkdown xfun]; }; rtext = derive2 { name="rtext"; version="0.1.21"; sha256="0j2jfz0mz9552dwa78d527lxipmj5ql8q8np8qq5jw4ka6wj5lbs"; depends=[digest hellno magrittr R6 Rcpp RSQLite stringb]; }; rtf = derive2 { name="rtf"; version="0.4-14.1"; sha256="032ff0yavqmd2d9svgwkmvxwh0cxjbac6pj48v4cshi898f02rhh"; depends=[R_methodsS3 R_oo]; }; - rticles = derive2 { name="rticles"; version="0.14"; sha256="1377fib4asazhhki4aajvld0wa35vd3zjvyl3lf2hjm2qk3vyak7"; depends=[knitr rmarkdown tinytex xfun yaml]; }; + rticles = derive2 { name="rticles"; version="0.17"; sha256="1wbwva5n88dw3vvhcrlzkr58cv03hyx0dqgfmxj7d0dgf4ichr3c"; depends=[knitr rmarkdown tinytex xfun yaml]; }; rtide = derive2 { name="rtide"; version="0.0.8"; sha256="0q3fcxxlipj12128p25h5hg92snimlpan86q9bncp20sz1skrwzx"; depends=[abind chk dttr2 tibble]; }; rties = derive2 { name="rties"; version="5.0.0"; sha256="1mxgzrlf41hhawab2664az151fmmhm8ivnnimmzm538yliilc0b7"; depends=[DataCombine DescTools deSolve dplyr ggplot2 gridExtra interactions lattice lme4 MASS mclust nlme nnet plyr zoo]; }; - rtiff = derive2 { name="rtiff"; version="1.4.7"; sha256="0l0chjbn8kipnhi37zshphxmxga6id39rm5gzz5gjrv8bnaaxxqb"; depends=[pixmap]; }; + rtiff = derive2 { name="rtiff"; version="1.4.8"; sha256="1jphdq8j646gymgyz39cvm7byvcyg00z5b8nmndx3nb270dsl1gd"; depends=[pixmap]; }; rtika = derive2 { name="rtika"; version="1.24.1"; sha256="12r9br3pn3llaixa5dn6g5468nsy5adajgdnnvfyhhbkrr0jwpi5"; depends=[curl digest rappdirs sys]; }; rtimicropem = derive2 { name="rtimicropem"; version="1.4.0"; sha256="0z6bnzks8mcb871m3z5b3cd883hj1i17swjgly005hvwbvi9h61f"; depends=[changepoint dplyr fs ggplot2 knitr lazyeval lubridate R6 rbokeh readr stringr tibble tidyr]; }; rtip = derive2 { name="rtip"; version="1.1.1"; sha256="0lfny8nvgnf90xsmgmr32nzjbw8117m4vw7d0bc3xm4pzpnymjdq"; depends=[boot ggplot2 mvtnorm plyr rootSolve]; }; @@ -13692,7 +14269,7 @@ in with self; { rtmpt = derive2 { name="rtmpt"; version="0.1-19"; sha256="1cpakgy0rmy27b14krmgdrf1fi0mar4k5rklnvmphivid8150gzn"; depends=[coda data_table loo matrixcalc stringr truncnorm]; }; rtodoist = derive2 { name="rtodoist"; version="0.1.0"; sha256="12lh14ps4snlyykhc65nvn8ipic8is8ssmgcx73snmifhrzxgdyb"; depends=[digest dplyr getPass glue httr keyring magrittr purrr]; }; rtop = derive2 { name="rtop"; version="0.5-14"; sha256="1wwllckginnzisapbklpsizy47db24r83xahq4qsd8zhqvv9yj33"; depends=[gstat sp]; }; - rtrek = derive2 { name="rtrek"; version="0.3.0"; sha256="0nfkmcyrb1gbgjjy62ffjlg6x93zy4s4qg6ii98gjbn0jp6pcj1j"; depends=[downloader dplyr ggplot2 jpeg jsonlite magrittr memoise purrr rvest tibble tidyr xml2]; }; + rtrek = derive2 { name="rtrek"; version="0.3.2"; sha256="0yvl1l9ynvpd2p2qksb65fz4cvx36lwdvvh8gp0j280qs78cclq8"; depends=[downloader dplyr ggplot2 jpeg jsonlite magrittr memoise purrr rvest tibble tidyr xml2]; }; rtrends = derive2 { name="rtrends"; version="0.1.0"; sha256="04xdggf36m294drb9z8khdjr6fgsg4bwkb4mmbbvqfzjpq4mq4y1"; depends=[dplyr lubridate tidyr]; }; rtrim = derive2 { name="rtrim"; version="2.1.1"; sha256="1l2ijkm4p3nd7n4q1b4y9pdyafgyf76zizpi7hhzw1rr9zkxhff2"; depends=[]; }; rts = derive2 { name="rts"; version="1.0-49"; sha256="086zlmcjsv7a38k1jfzq2vhlmx7nivhffcz83i57hl6wbkjl7gv2"; depends=[raster RCurl sp xts zoo]; }; @@ -13701,15 +14278,16 @@ in with self; { rtsplot = derive2 { name="rtsplot"; version="0.1.3"; sha256="0va6ir0bmpnw4ibvfh2j4z01flg72dpxn7q10sdsdj304hb0g4in"; depends=[quantmod RColorBrewer xts zoo]; }; rtweet = derive2 { name="rtweet"; version="0.7.0"; sha256="05pbvxm2vmf6935b9s6663k3aifnkr3m52wh2jvnplmrwyrfpn9n"; depends=[httpuv httr jsonlite magrittr progress Rcpp tibble]; }; rtype = derive2 { name="rtype"; version="0.1-1"; sha256="0wjf359w7gb1nrhbxknzg7qdys0hdn6alv07rd9wm6zynnn1vwxy"; depends=[]; }; - rtypeform = derive2 { name="rtypeform"; version="2.0.1"; sha256="09lcfdkwk274zxkbvg4l1v62xcb9p98qix6rg8ksniz35230f6f0"; depends=[assertthat dplyr glue httr jsonlite lubridate purrr tibble tidyr]; }; + rtypeform = derive2 { name="rtypeform"; version="2.1.0"; sha256="02qnsw2nd3fnyr0gbmx3690b78k899dxf04g4bqpjlg9y38g1cnr"; depends=[assertthat dplyr glue httr jsonlite lubridate purrr rlang tibble tidyr]; }; rubias = derive2 { name="rubias"; version="0.3.1"; sha256="1x7h38lsdq03cd72ffawr8mpnf1c1a16sxgmz3c52fn3b9n28jxm"; depends=[dplyr gtools magrittr Rcpp RcppParallel readr rlang stringr tibble tidyr]; }; rucm = derive2 { name="rucm"; version="0.6"; sha256="1n6axmxss08f2jf5impvyamyhpbha13lvrk7pplxl0mrrrl5g0n8"; depends=[KFAS]; }; rucrdtw = derive2 { name="rucrdtw"; version="0.1.4"; sha256="0865x8i2n63xjbq0pzalm4gd6rpg72yrcsm4rw40a3kzy2svvnlm"; depends=[Rcpp]; }; rugarch = derive2 { name="rugarch"; version="1.4-4"; sha256="06zmii3wncxndd4hhdk7h4d4s2lj5clrrs10zzz4856g9zjzmbq6"; depends=[chron ks nloptr numDeriv Rcpp RcppArmadillo Rsolnp SkewHyperbolic spd xts zoo]; }; - ruimtehol = derive2 { name="ruimtehol"; version="0.2.3"; sha256="073qb7g9j6zkk6hxf78y7ymnmc1s4hbjxxlymjhxpvjfbg4xpslw"; depends=[BH Rcpp]; }; + ruimtehol = derive2 { name="ruimtehol"; version="0.3"; sha256="1qscaj28xrrqccav0y82mn5nzkc8zfgmx2axg7bxrrhqaibfpy5j"; depends=[BH Rcpp]; }; ruin = derive2 { name="ruin"; version="0.1.1"; sha256="124xs1c2mjfy6z0bp83rwkqw2y73g77xwn3q4yd2xw0v2frnpvpz"; depends=[ggplot2]; }; - ruler = derive2 { name="ruler"; version="0.2.3"; sha256="0ik9cbr0nc97xady1xm6y9yvms3ckckmjkb8sxxi2in1ip6rvzw2"; depends=[dplyr keyholder rlang tibble tidyr]; }; - rules = derive2 { name="rules"; version="0.0.2"; sha256="0sj8zfarm2az9zsbr6kg6fv7q76ll5ma3n4rfncsafw1z6n22iw7"; depends=[dials dplyr parsnip purrr rlang tibble tidyr]; }; + ruler = derive2 { name="ruler"; version="0.2.4"; sha256="159k7453jb37zgjg9rcgz566mz2827dpfq5gm40r6zgkia4z3apx"; depends=[dplyr keyholder magrittr rlang tibble tidyr]; }; + rules = derive2 { name="rules"; version="0.1.0"; sha256="12xqhay5ghg02yyqz8v6z2284sg9y7jin45v2b5d9s7a81ci2dq9"; depends=[dials dplyr parsnip purrr rlang tibble tidyr]; }; + rumidas = derive2 { name="rumidas"; version="0.1.0"; sha256="0lfc7d3z1ixgagwznq29spkz3xlzd6yq6q79rapcm4qcz3vljr0v"; depends=[highfrequency lubridate maxLik Rdpack roll tseries xts zoo]; }; runes = derive2 { name="runes"; version="0.1.0"; sha256="1s2vhwya434q70j4aq4qbds8wivscc5cyldr5pch7p41nqj0j7aw"; depends=[]; }; runjags = derive2 { name="runjags"; version="2.0.4-6"; sha256="0w97s1j5v05fn4nclqwg56hl9vz6vi2l6sp042r6iyh024fsyg22"; depends=[coda lattice]; }; runner = derive2 { name="runner"; version="0.3.7"; sha256="0480ndavxz9gldyvz8v9mxszfnysxf13vva2fw6qc49ikm88dry6"; depends=[Rcpp]; }; @@ -13717,7 +14295,7 @@ in with self; { runstats = derive2 { name="runstats"; version="1.1.0"; sha256="0n9348af60j8a2mwgbafabspb4nm45ry92zlzmynja06zyx8lb2d"; depends=[fftwtools]; }; rusda = derive2 { name="rusda"; version="1.0.8"; sha256="0xx72jjf1pyixwpnvvgx5n2vc5gl46bam1caav043iqki68wb338"; depends=[foreach httr plyr RCurl stringr taxize testthat XML]; }; rusk = derive2 { name="rusk"; version="0.1.1"; sha256="0a6vbcnfzlfq9fmibiy0cwcfix65qhxq4f7wc7d53riga82s00lk"; depends=[dplyr ggforce ggplot2 reshape2 shiny tidyr]; }; - rust = derive2 { name="rust"; version="1.3.9"; sha256="1p81gm6jj2ancx2xbfag4hw5hf4vqbsx2rn3rqcxb4213n1c5f0s"; depends=[Rcpp RcppArmadillo]; }; + rust = derive2 { name="rust"; version="1.3.10"; sha256="044945nyds1wyw1p4hfxdhhaj2yldjplc0zp1phxrq930s2fjhkv"; depends=[Rcpp RcppArmadillo]; }; ruta = derive2 { name="ruta"; version="1.1.0"; sha256="1qr2ryz55h2j3wlwg0535lhmk2ydm0idfxl07rlfxq1pi32cjms1"; depends=[keras purrr R_utils]; }; rutifier = derive2 { name="rutifier"; version="1.0.4"; sha256="045pr8apd105azs1glpwqrbamglqddxfpml9yrfrlaivz3fjd9l8"; depends=[R_utils]; }; ruv = derive2 { name="ruv"; version="0.9.7.1"; sha256="1n4q9mrp9f644spbns6bbnzmlabrg90hwkdfg3hnm3rxp9b4xid0"; depends=[ggplot2 gridExtra scales]; }; @@ -13730,17 +14308,17 @@ in with self; { rvertnet = derive2 { name="rvertnet"; version="0.8.0"; sha256="1j8kgyzcn14yl44lnxc8f83wpmgpdzx5aiw91zjbjkajj6bgzrpn"; depends=[crul dplyr ggplot2 jsonlite maps]; }; rvest = derive2 { name="rvest"; version="0.3.6"; sha256="1yh2p429a0zr8pqmlw5rzf6m797j20j5w6xwxlqq0wrdbnif6bka"; depends=[httr magrittr selectr xml2]; }; rvg = derive2 { name="rvg"; version="0.2.5"; sha256="1i0alsr9ahl54gwszvaqz5qgiqs85wwzs5d31z97x315sk3n994j"; depends=[gdtools officer Rcpp rlang xml2]; }; - rvgtest = derive2 { name="rvgtest"; version="0.7.4"; sha256="1lhha5nh8fk42pckg4ziha8sa6g20m0l4p078pjj51kz0k8929ng"; depends=[]; }; rviewgraph = derive2 { name="rviewgraph"; version="1.3.1"; sha256="1jv6ldvzi1av093nqbdivhm0l0q7j1ipmvi486zcbsnwrcj15m91"; depends=[rJava]; }; - rvinecopulib = derive2 { name="rvinecopulib"; version="0.5.3.1.0"; sha256="1pf2avxq2l8nd6vgp0b8xxy76ii0a3i6gdl895x8dgd6y5mi0z33"; depends=[assertthat BH kde1d lattice Rcpp RcppEigen RcppThread wdm]; }; + rvinecopulib = derive2 { name="rvinecopulib"; version="0.5.5.1.0"; sha256="1138w1jsqg0q9znzkln3d7iwnzvw3hbgykvw1gavlzxm627hglxv"; depends=[assertthat BH kde1d lattice Rcpp RcppEigen RcppThread wdm]; }; rvkstat = derive2 { name="rvkstat"; version="2.6.3"; sha256="0vh5gsvfs01f7mw0cl1wap1w1nsgr4fyv9fdays8b8ad3gc17a2r"; depends=[httr jsonlite RCurl tidyr]; }; rvmethod = derive2 { name="rvmethod"; version="0.1.2"; sha256="1g2d5pvz5s1sj2kalxaz7nb8874m4113ly809zbimngi1lhg8zi1"; depends=[assertthat locfit]; }; + rwa = derive2 { name="rwa"; version="0.0.3"; sha256="11irb6ayr1a1rbmhc9zqwyb1vjfc0fq7imji0lfa30zplwgf1mqh"; depends=[dplyr ggplot2 magrittr tidyr]; }; rwalkr = derive2 { name="rwalkr"; version="0.5.3"; sha256="156834rfqmlb3ibwg9ys11276zhhqghazrpnv82pvd83gn48f3vq"; depends=[dplyr hms httr tidyr]; }; - rwavelet = derive2 { name="rwavelet"; version="0.4.0"; sha256="0wb3kd97inyh985q1hspnzwxfawfdps43r3zzdpw0jd8sgd7zqxp"; depends=[signal]; }; + rwavelet = derive2 { name="rwavelet"; version="0.4.1"; sha256="092c1h1xyyi2fwg99dgbn1b22cgf8mliizjpc2z7dnravznprr94"; depends=[signal]; }; rwc = derive2 { name="rwc"; version="1.11"; sha256="1qhgkbkp4nz0wq5c4x8232xiszpiyzcdklfgvpnx4cbp3bbfdi4g"; depends=[MASS Matrix mvtnorm raster]; }; rwebstat = derive2 { name="rwebstat"; version="1.1.0"; sha256="106dkhlr33ii17q45c1hrmbslwsj1qlmx325skch2q71mv7ii0lj"; depends=[dplyr getPass htmltools httr jsonlite readr stringr]; }; rwfec = derive2 { name="rwfec"; version="0.2"; sha256="0wmalfms59zi8jdn2s2qbcdckfkifl9vg19hzx4389mm5gk6qsbh"; depends=[Rcpp]; }; - rwhatsapp = derive2 { name="rwhatsapp"; version="0.2.2"; sha256="00cgczgim3ls5jjaklpwfyf24794zhpdjj9pl9fkw20fxhz91bpd"; depends=[stringi tibble]; }; + rwhatsapp = derive2 { name="rwhatsapp"; version="0.2.3"; sha256="029zzlp4pssnvxfd0ggry37f2k3yn78pqh6ghpd164fdy778l33b"; depends=[stringi tibble]; }; rworldmap = derive2 { name="rworldmap"; version="1.3-6"; sha256="1q1h0n9qr0m5pdx10swrh9ddsvdj8kv5nqngrf3lnx9rg9iwivjk"; depends=[fields maptools sp]; }; rworldxtra = derive2 { name="rworldxtra"; version="1.01"; sha256="183z01h316wf1r4vjvjhbj7cg4xarn4b8qbmnn5y7nrrdndzi163"; depends=[sp]; }; rwstats = derive2 { name="rwstats"; version="0.1"; sha256="10jj2lkilysz7mmysblj6l4jjc560rqsps0ivkvyr7caj8gfhdlb"; depends=[]; }; @@ -13748,16 +14326,17 @@ in with self; { rwty = derive2 { name="rwty"; version="1.0.2"; sha256="0p0bpq5dk8vjqx8ry364xhaq3rgxa49planapggicg7by2mhaacc"; depends=[ape coda GGally ggdendro ggplot2 phangorn plyr reshape2 viridis]; }; rwunderground = derive2 { name="rwunderground"; version="0.1.8"; sha256="02p26gkicd5v511kb04p1h3wxj57r7j5vr97n3ibywc6ivz7nqxa"; depends=[countrycode dplyr httr lubridate tibble]; }; rxSeq = derive2 { name="rxSeq"; version="0.99.3"; sha256="0g0n2pzbssz61psghjp1vrlspgph4s39x1k1zhcz7ivdn5pjb2nx"; depends=[MASS numDeriv VGAM]; }; - rxylib = derive2 { name="rxylib"; version="0.2.4"; sha256="0va7kw40nycjn8gh9blzpbph4z319r5a16yim8lwx3hi6rs9myhr"; depends=[BH Rcpp]; }; + rxylib = derive2 { name="rxylib"; version="0.2.6"; sha256="0z0mfk5g7jdrw28f6jzifis2jsw35w7g1p0bv3b6a4rfmbnjhmwk"; depends=[BH Rcpp]; }; ryandexdirect = derive2 { name="ryandexdirect"; version="3.6.0"; sha256="0f1z8gp1pxfqx694alj435ihzxvd9ban04b1clzipgdq9la1hza8"; depends=[bitops data_table dplyr httr jsonlite magrittr purrr readr stringr tidyr xml2]; }; rym = derive2 { name="rym"; version="1.0.3"; sha256="0sxi9a4rx78kxcfvsmyzr138fhzb19pwvj29ryijlsfl7n2h4h16"; depends=[httr purrr stringr]; }; ryouready = derive2 { name="ryouready"; version="0.4"; sha256="1d9z3paxcrkwsgn5g83x57jwz2iqarks30x0bwg48i5ispw6xbr3"; depends=[car ggplot2 stringr]; }; rysgran = derive2 { name="rysgran"; version="2.1.0"; sha256="1l2mx297iyipap8cw2wcw5gm7jq4076bf4gvgvij4q35vp62m85z"; depends=[lattice soiltexture]; }; + rzentra = derive2 { name="rzentra"; version="0.1.0"; sha256="1knp1616ck64wgf3r80s1nywdnljc1r9fjvgg531j0fxir04aqkl"; depends=[data_table dplyr httr jsonlite lubridate magrittr purrr]; }; rzmq = derive2 { name="rzmq"; version="0.9.7"; sha256="0iasjaka3gx616l5bxyg2k0fi33hldaplvs0h03j6jpxfmxvcisz"; depends=[]; }; - s2 = derive2 { name="s2"; version="1.0.2"; sha256="0z4cg61l1b90z7dcbbl6a4ja3zfmgkfvdg456y02gg5aqw5qqcd6"; depends=[Rcpp wk]; }; - s20x = derive2 { name="s20x"; version="3.1-28"; sha256="1fx5206gy7cq4n0xrdxcvnd913i08yjjz39ldjm3a98sfz6xj636"; depends=[]; }; - s2dv = derive2 { name="s2dv"; version="0.0.1"; sha256="06jn9f8fpkpi1qz0g7pjyszdwckg6llb2lnf0micj8v1js7phym8"; depends=[abind bigmemory ClimProjDiags GEOmap geomapdata mapproj maps multiApply ncdf4 plyr]; }; - s2dverification = derive2 { name="s2dverification"; version="2.8.6"; sha256="1nvmc3mpdqrcnv17vk8rjd7mh55pj68y2ffiia09lc8h84r3zxil"; depends=[abind bigmemory GEOmap geomapdata mapproj maps NbClust ncdf4 plyr SpecsVerification]; }; + s2 = derive2 { name="s2"; version="1.0.3"; sha256="0vm2rch4msv6s4lqsclkdyfgnyj936bf9znx74hs3zf9jpp93bfx"; depends=[Rcpp wk]; }; + s20x = derive2 { name="s20x"; version="3.1-29"; sha256="12l0pygl0ca3dbxbsf2zfhhxwcbb5ci070ly3s8fz5hbzri3yyn4"; depends=[]; }; + s2dv = derive2 { name="s2dv"; version="0.1.1"; sha256="18vb90a9kmdk861r3w99gx4ijmpws2f5xbxdbyll5gjj9nr3vx6k"; depends=[abind bigmemory ClimProjDiags GEOmap geomapdata mapproj maps multiApply ncdf4 plyr]; }; + s2dverification = derive2 { name="s2dverification"; version="2.9.0"; sha256="0kynj8l39dswm2v6051ikgp0a0pi0c3gsdmhrxwjrxrpbgm7hrhn"; depends=[abind bigmemory GEOmap geomapdata mapproj maps NbClust ncdf4 plyr SpecsVerification]; }; s2net = derive2 { name="s2net"; version="1.0.1"; sha256="1f6lc8azx8lax7jc5ggzirwnp5d9ka2plimfkg70vx783xf56zaw"; depends=[MASS Rcpp RcppArmadillo]; }; s4vd = derive2 { name="s4vd"; version="1.1-1"; sha256="1rp3z42nxmrvb942h3c5cl544lngzx7nrnnr4zjw7dq495bym7yp"; depends=[biclust foreach irlba]; }; sAIC = derive2 { name="sAIC"; version="1.0"; sha256="1ih63cfs98kb61gwbmrx2yq7iacb5qa1qrh1a264041qd27r5pj5"; depends=[]; }; @@ -13765,7 +14344,7 @@ in with self; { sBIC = derive2 { name="sBIC"; version="0.2.0"; sha256="1fx17c9w7v6wi02i293vjdahwxx4b5a118r655cl12gsd5qwqj11"; depends=[combinat flexmix hash igraph mclust poLCA R_methodsS3 R_oo Rcpp]; }; sFFLHD = derive2 { name="sFFLHD"; version="0.1.2"; sha256="014gy3nj6gr740z4apw82jh4n7s57zmnr95bm3g9xxnwnb224npq"; depends=[conf_design DoE_base R6]; }; sGMRFmix = derive2 { name="sGMRFmix"; version="0.3.0"; sha256="183i3159k2cxpanm09zcy2y1vvjd6185gjjf81c3284prw3aky2c"; depends=[ggplot2 glasso mvtnorm tidyr zoo]; }; - sNPLS = derive2 { name="sNPLS"; version="0.3.31"; sha256="0ja2f4n000r7cvf0jj2qypa5mfkikig47hfpqwh4611sl70qgx2y"; depends=[car ggplot2 ks MASS Matrix pbapply plotrix rgl]; }; + sNPLS = derive2 { name="sNPLS"; version="1.0.27"; sha256="0h05crdmwmzax4pwmyxb2z1dagyqb3kybpxc064y1kl8m84kcyvv"; depends=[clickR future future_apply ggplot2 ggrepel ks MASS Matrix pbapply]; }; sRDA = derive2 { name="sRDA"; version="1.0.0"; sha256="0g11smn4adm3b79m9w7wzcragxggkf8rrrsgj2yzdhm1d7zzjwbk"; depends=[doParallel elasticnet foreach Matrix mvtnorm]; }; sROC = derive2 { name="sROC"; version="0.1-2"; sha256="0cp6frhk9ndffb454dqp8fzjrla76dbz0mn4y8zz1nbq1jzmz0d3"; depends=[]; }; sSDR = derive2 { name="sSDR"; version="1.2.0"; sha256="1fqsglqzsbzdvcdnwwf7mg6x20zfpw66x63r6avac3w1pz3n7kvx"; depends=[MASS Matrix]; }; @@ -13775,28 +14354,30 @@ in with self; { sabre = derive2 { name="sabre"; version="0.3.2"; sha256="14rvc8in8lfs9vg96jkqm3xg7bszwss5zd78vngp36x4yay007b6"; depends=[dplyr entropy raster rlang sf tibble tidyr]; }; sac = derive2 { name="sac"; version="1.0.1"; sha256="1rl5ayhg5y84fw9w3zf43dijjlw9x0g0w2z4haw5xmxfni72ms8w"; depends=[]; }; saccades = derive2 { name="saccades"; version="0.1-1"; sha256="138a6g3hjmcyvflpxx1lhgxnb8svrynplrjnvzij7c4bzkp8zip6"; depends=[zoom]; }; + sad = derive2 { name="sad"; version="0.1.3"; sha256="0wr4xdx68hrxaw5izy36gm10smk6s1gzrzwayhfp4lhvkn75qsww"; depends=[dualtrees emdist]; }; sadists = derive2 { name="sadists"; version="0.2.4"; sha256="00iqgwqfia4mybg4v66kb368gydr103zmr8ka9y4j8rmwkg5j9kq"; depends=[hypergeo orthopolynom PDQutils]; }; sads = derive2 { name="sads"; version="0.4.2"; sha256="1j6vdjvpnbqp4kwbvhcl8p51ln29mmk9n150718wsqlifb8d1lw9"; depends=[bbmle GUILDS MASS poilog VGAM]; }; sae = derive2 { name="sae"; version="1.3"; sha256="1ncrlzgnga9pfa2j8x1y6axl2665rp08aff98zrim6gq6n6yap8z"; depends=[lme4 MASS]; }; - saeME = derive2 { name="saeME"; version="1.0.1"; sha256="1w77ncha9xs5p3pzfd3y38q8kz2wjzh35zyn4cby0yp2cyw4xxd9"; depends=[expm MASS]; }; + saeME = derive2 { name="saeME"; version="1.2.4"; sha256="02yf5rf2kavwl3icfnsjg0kxmifrcc7v4j5jsfrfa8ssfbwcivhn"; depends=[ClusterR dplyr expm MASS]; }; saeRobust = derive2 { name="saeRobust"; version="0.2.0"; sha256="1bdfrsm59xwkga0kxl3r5n83mhhkyzj7gplrgx26gyflashyd1zc"; depends=[aoos assertthat ggplot2 magrittr MASS Matrix memoise modules pbapply Rcpp RcppArmadillo spdep]; }; saeSim = derive2 { name="saeSim"; version="0.10.0"; sha256="0nh8x2v0g8i0rjq4s5q0ayhyxhl5p0126plmd4vnnhaifm6pn0q3"; depends=[dplyr functional ggplot2 MASS parallelMap spdep]; }; saeeb = derive2 { name="saeeb"; version="0.1.0"; sha256="04vjxmnqcgqcamgjd9qq1dbx0msm40mnn94jjy9pzvsj2gsbws39"; depends=[COUNT MASS]; }; saemix = derive2 { name="saemix"; version="2.3"; sha256="08n1syv8wkf1nqz8i1n3ippyp63g56xf8xqgczxm630r6802yqab"; depends=[]; }; saery = derive2 { name="saery"; version="1.0"; sha256="09x1v627llqbpiwkh1wr0z7gsndfdrjzag2hprhq1adbzh05k47z"; depends=[]; }; safeBinaryRegression = derive2 { name="safeBinaryRegression"; version="0.1-3"; sha256="1g68r6pp5l41rbgyfqgcha1gpsisnl0ybdmdqr4ylr43f61dpgvd"; depends=[lpSolveAPI]; }; - safedata = derive2 { name="safedata"; version="1.0.7"; sha256="0f7wbcghi35fr85gl5qsbpbri0w50kv8axx65cmamqzfkmp0mfr0"; depends=[chron curl igraph jsonlite readxl sf]; }; + safedata = derive2 { name="safedata"; version="1.0.9"; sha256="0xcpgh4898rqdnnxx21vyxc8aqlwg26aywr591sllasrv1jzsmrc"; depends=[chron curl igraph jsonlite readxl sf]; }; safer = derive2 { name="safer"; version="0.2.1"; sha256="1lmhaj9y0hi4ybxfkllxl99vsagcg73sy4kkcmlvn3bs69jky1r9"; depends=[assertthat base64enc sodium]; }; safetyGraphics = derive2 { name="safetyGraphics"; version="1.1.0"; sha256="1s8xwx014nihn13v6rpwy11sb3yzfyj3alb88y47wp1kh39d7f0q"; depends=[dplyr DT haven htmlwidgets jsonlite magrittr purrr rlang rmarkdown shiny shinybusy shinyjs shinyWidgets stringr tibble tidyr]; }; sail = derive2 { name="sail"; version="0.1.0"; sha256="1wrh2dam5lblascqd8gl76jks72ys1amz84c6p08y8ykdmn2saq1"; depends=[gglasso glmnet]; }; - salesforcer = derive2 { name="salesforcer"; version="0.2.0"; sha256="154xyh04ldyz2l20v48ww5j965ylm55g1m8jsh6726ni1zp6x7kk"; depends=[base64enc curl dplyr httr jsonlite lifecycle lubridate mime purrr readr rlang rlist tibble vctrs XML xml2 zip]; }; - salso = derive2 { name="salso"; version="0.1.16"; sha256="1xvzvy0s1718n9p71a6gb4dzg281drzzmpyda5j3b729aijni6bh"; depends=[]; }; + salem = derive2 { name="salem"; version="0.2.0"; sha256="1pk27d57bmds0jvnvwai2scjy798lb7w6lb84yxl4ccgyn1ldh45"; depends=[]; }; + salesforcer = derive2 { name="salesforcer"; version="0.2.2"; sha256="12s2knfyq4h33n7mfs1xjbvs1fh52dyw19y759z7l2bvmv27b71h"; depends=[base64enc curl data_table dplyr httr jsonlite lifecycle lubridate mime purrr readr rlang rlist tibble vctrs XML xml2 zip]; }; + salso = derive2 { name="salso"; version="0.2.5"; sha256="0dc5bn78028yvfzffnfdl1m6jsb5ccc400ih5pwg5ikajf7mfs8v"; depends=[]; }; salty = derive2 { name="salty"; version="0.1.0"; sha256="1dxq62yrkv416fy09l03slc7ci6mnwiyvjlsxhbqnj8yjy3kbhr6"; depends=[assertthat purrr stringr]; }; sambia = derive2 { name="sambia"; version="0.1.0"; sha256="15yz5lrjav5bs8m52crg3l43xmi4gf7wydji76p181ssyg43z2ln"; depends=[dplyr e1071 FNN mvtnorm pROC ranger smotefamily]; }; - samc = derive2 { name="samc"; version="1.1.0"; sha256="124mbbhq9ypn1jxyqsx7i6lkzr8qxq5qz0fn3i5gk4aax1l5f92l"; depends=[gdistance Matrix raster Rcpp RcppEigen]; }; + samc = derive2 { name="samc"; version="1.2.1"; sha256="143dfslm4yrqrad8ddjq2fmv56zp11v2kjr5x01gnw6aic0c6ash"; depends=[gdistance Matrix raster Rcpp RcppEigen]; }; samon = derive2 { name="samon"; version="4.0.1"; sha256="1zhnv7kdpd2zhp6il5x56v4yh5703n1nsnkrysygns4i7xhvcf6z"; depends=[]; }; sampSurf = derive2 { name="sampSurf"; version="0.7-5"; sha256="0ks95d1w5dvxz4vb850hb5v0w8xg6sil0gvddmd1mrrjkjqkk96f"; depends=[boot lattice latticeExtra raster rasterVis sp]; }; - sampleSelection = derive2 { name="sampleSelection"; version="1.2-6"; sha256="1ph26v78sy8341d9iir6243vmvnrnan7gj5mr31913kpgkblcwfj"; depends=[Formula maxLik miscTools mvtnorm systemfit VGAM]; }; + sampleSelection = derive2 { name="sampleSelection"; version="1.2-12"; sha256="1am1w8c24f27gcdmrk3b4wp9j5awghnw9s9lphnkm10pl31881dy"; depends=[Formula maxLik miscTools mvtnorm systemfit VGAM]; }; sampler = derive2 { name="sampler"; version="0.2.4"; sha256="12jjx3ci1yss8dj64bjdmz73cyjfkwb7b9zk4zm48lqv78k6wlv7"; depends=[dplyr purrr reshape tidyr]; }; samplesize = derive2 { name="samplesize"; version="0.2-4"; sha256="0n6z7jmf665lbj3g1mjy87a9fh53z85546bhrkmkgsysb0r9q6iq"; depends=[]; }; samplesize4surveys = derive2 { name="samplesize4surveys"; version="4.1.1"; sha256="0v332xb4vkkjr3nwf3231aqgzsj7mqld9ffkla1nj52lxay2ji75"; depends=[dplyr magrittr TeachingSampling timeDate]; }; @@ -13808,52 +14389,61 @@ in with self; { samplingVarEst = derive2 { name="samplingVarEst"; version="1.4"; sha256="0gzz0qz67h3vpdsi5g1w7fkyacj8789qxmj353q7pd0jm20q60l1"; depends=[]; }; samplingbook = derive2 { name="samplingbook"; version="1.2.2"; sha256="1szx9bdlxxn2yhy9i362fcscn5cydvrkw9kggr7yqb715k5n1j6n"; depends=[pps sampling survey]; }; samr = derive2 { name="samr"; version="3.0"; sha256="01km0f7qgm73x19vbvsxl083hs1dq4dj8qm5h64cxbf20b08my15"; depends=[GSA impute matrixStats openxlsx shiny shinyFiles]; }; + sams = derive2 { name="sams"; version="0.4.0"; sha256="1h0sg2q8yklffllwddlnx4d18lkc8lab5zc3pkh6xiwr9xg1fqas"; depends=[]; }; samurais = derive2 { name="samurais"; version="0.1.0"; sha256="0s00hd3ax4r662n8iqmd9i56sgyjxbgc59la7qvh3jwcnzcvmgz9"; depends=[MASS Rcpp RcppArmadillo]; }; sand = derive2 { name="sand"; version="2.0.0"; sha256="0a8skj1wi1n9zlm7jb5cix1i4ssdzfpj4ym2854ala9jy6qj7g7n"; depends=[igraph igraphdata]; }; - sandwich = derive2 { name="sandwich"; version="2.5-1"; sha256="1mk685b9wq7k566pbml52rj96i5h6b3vf215k9picgmq296nzvyv"; depends=[zoo]; }; + sandwich = derive2 { name="sandwich"; version="3.0-0"; sha256="0afm6snak7r11dxyl3qirqdjah6d9pdv4afmxwam1nq9bqxyb3w2"; depends=[zoo]; }; + sanic = derive2 { name="sanic"; version="0.0.1"; sha256="05fd7jpi7cf9klfh6dqf8wklrjh5q1b3xqddxhdihcsqvcqhg48l"; depends=[Matrix Rcpp RcppEigen]; }; sanitizers = derive2 { name="sanitizers"; version="0.1.0"; sha256="1c1831fnv1nzpq8nw9krgf9fm8v54w0gvcn4443b6jghnnbhn2n6"; depends=[]; }; sanityTracker = derive2 { name="sanityTracker"; version="0.1.0"; sha256="0y041x840sg5c05ksljb1y4xag1cib19q5ygp443k13ryfbcgs9k"; depends=[checkmate data_table]; }; sankey = derive2 { name="sankey"; version="1.0.2"; sha256="0jvcr2bn69aklfbgj4hbsrc047mymrx0jmsg26m0g6w7n1igqvcw"; depends=[simplegraph]; }; sankeywheel = derive2 { name="sankeywheel"; version="0.1.0"; sha256="1sigj4jz13qj4s8vxk0dl2xsddqgyfxabj8yggkasawm7pryvbyy"; depends=[htmlwidgets]; }; sanon = derive2 { name="sanon"; version="1.6"; sha256="0h3l1dzgkddvb3vzg7pcgwrgidphy73jys2h49v84nbfvqr6l85z"; depends=[]; }; santaR = derive2 { name="santaR"; version="1.0"; sha256="10g4z951mpxw9d21s5f6zwfch5xs9vx812fb0wyrbw9s8drmlbkh"; depends=[doParallel foreach ggplot2 gridExtra iterators pcaMethods plyr reshape2 shiny shinythemes]; }; - santoku = derive2 { name="santoku"; version="0.4.1"; sha256="1szcnxy4q8yp06mb72cy40fqdn9pvi07wnfa6z3p9z32zxn6mq1k"; depends=[assertthat lifecycle Rcpp vctrs]; }; + santoku = derive2 { name="santoku"; version="0.5.0"; sha256="1l69jnlzcjkwr8wqmgf40nkf48a58m50c6cwn8sh0vd71bmi75qm"; depends=[assertthat lifecycle Rcpp vctrs]; }; sanzo = derive2 { name="sanzo"; version="0.1.0"; sha256="1fqsx2mgjsy6vjvsp2avi2i5cw7cjs2p53l1z6hb3bzid3067s87"; depends=[]; }; - sapfluxnetr = derive2 { name="sapfluxnetr"; version="0.1.0"; sha256="1alcqndj7sd4c70qzixcwaw8yrl40arp8765845wxr7bamw1j8g5"; depends=[assertthat dplyr furrr ggplot2 glue lubridate magrittr purrr rlang stringr tibble tidyr]; }; - saqgetr = derive2 { name="saqgetr"; version="0.2.0"; sha256="126wr1if6mqs1m17amjhx7iq5ypgdgphgl9rcb9iia29krlfcq00"; depends=[curl dplyr fs lubridate magrittr purrr readr stringr tidyr]; }; + sapevom = derive2 { name="sapevom"; version="0.1.0"; sha256="0xlx14wrv28nc8ggh6dr486slnbx10irwb2yrgnxg5viw4pswwys"; depends=[]; }; + sapfluxnetr = derive2 { name="sapfluxnetr"; version="0.1.1"; sha256="00dywrfi6321v5xac7wll5yfwr7ffqhbscgv4akaijpqf44b5m2m"; depends=[assertthat dplyr furrr ggplot2 glue lubridate magrittr purrr rlang stringr tibble tidyr]; }; + saqgetr = derive2 { name="saqgetr"; version="0.2.1"; sha256="014i3grbbvyndndm5qxqydkzfc2h2shzrvls1f4fm8l5vnx7yjc6"; depends=[curl dplyr fs lubridate magrittr purrr readr stringr tidyr]; }; sara4r = derive2 { name="sara4r"; version="0.0.7"; sha256="1la02rq16c3hvfg4dygz6himvs88nmry8616fzgnsbxzpddl5aw3"; depends=[raster rgdal RGtk2 sp]; }; - sarima = derive2 { name="sarima"; version="0.8.2"; sha256="0fyfba017p35g16b8xp9zvqp9dalhlgr7x5hpk10y29qh7k12z69"; depends=[dplyr FitAR FitARMA FKF Formula KFAS lagged ltsa numDeriv PolynomF Rcpp RcppArmadillo Rdpack]; }; + sarima = derive2 { name="sarima"; version="0.8.4"; sha256="0aysxgp34xn0gz9jxb2garprfzx61xmqnxlz2c2ay22llkc806dn"; depends=[dplyr FitAR FitARMA FKF Formula KFAS lagged ltsa numDeriv PolynomF Rcpp RcppArmadillo Rdpack]; }; sarp_snowprofile = derive2 { name="sarp.snowprofile"; version="1.0.0"; sha256="02g7d5kilfkhqxm02jkhkraqbamxaj1qzzi150k6m55d5bfy4wih"; depends=[data_table xml2]; }; - sars = derive2 { name="sars"; version="1.2.3"; sha256="04dllvmwgmd06f8p99vhw8svgymc7v8n1dg13xzxmm8bpi1ww1ys"; depends=[cli crayon dplyr nortest numDeriv]; }; - sarsop = derive2 { name="sarsop"; version="0.6.5"; sha256="1jvxx8l352slwaj6sn2344ivss27cvwnvc6k8i9dd7zmy1z85qn7"; depends=[BH digest Matrix processx xml2]; }; + sarp_snowprofile_alignment = derive2 { name="sarp.snowprofile.alignment"; version="1.0.2"; sha256="1yh4ybnscjzps28ncqd46xzv88fjcn4bhcx6rwz8kl1m253c4wpl"; depends=[dtw sarp_snowprofile shiny]; }; + sars = derive2 { name="sars"; version="1.3.0"; sha256="0zpwmyqjaxnx13n3vz10szl7iyvk40fpm8x2d6irmhbgfzhc2qvx"; depends=[cli crayon doParallel dplyr foreach nortest numDeriv]; }; + sarsop = derive2 { name="sarsop"; version="0.6.6"; sha256="01rlhjfry8yj42mavvdl7maggz6z4sv8zlz51mxcrsqhndm1ijvc"; depends=[BH digest Matrix processx xml2]; }; sas7bdat = derive2 { name="sas7bdat"; version="0.5"; sha256="0qxlapb6wdhzpwlmzlhscy3av7va3h6gkzsppn4sx5q960310an3"; depends=[]; }; - sasLM = derive2 { name="sasLM"; version="0.1.4"; sha256="07gpcw77hp80i1rvz8pf5npib447zywigqx7df7i7r1w0vjzz0nc"; depends=[]; }; + sasLM = derive2 { name="sasLM"; version="0.2.1"; sha256="19z842ayd6p5v2hpihmn1dhinyc14sh87ag5hiy56igi4rbb4iv5"; depends=[]; }; sasMap = derive2 { name="sasMap"; version="1.0.0"; sha256="11vhhxhakqm1gsb3p4s4966sapmrqfyw79zfppbx5lnqi3xr0ngn"; depends=[readr stringi stringr]; }; sass = derive2 { name="sass"; version="0.2.0"; sha256="0qzrncsnp0zd8jyp4whss92m7llqsfccmp9p9r3gdc7hlq1amp3z"; depends=[digest fs htmltools rlang]; }; sate = derive2 { name="sate"; version="1.1.0"; sha256="0d1b0gp5abh5g7a25ff40xdnncrl2afjnlcc56dbhqkk43gjah17"; depends=[MASS]; }; satellite = derive2 { name="satellite"; version="1.0.2"; sha256="1ib9g4cplksf9ymp8hcv843lv5bpar31w8h4wnmya5hjsdmlfiv4"; depends=[plyr raster Rcpp]; }; + satin = derive2 { name="satin"; version="1.0"; sha256="0ing5vhw8akrpy703fcwn5p0gadfabqb3abc9ircpgb6y2k5axzk"; depends=[geosphere lubridate maps maptools ncdf4 PBSmapping sp splancs]; }; satscanMapper = derive2 { name="satscanMapper"; version="1.0.1"; sha256="1qr7xz7qp39nylkrx3smzga7rvi2z9yws8kbpmfk13avixr4asvy"; depends=[foreign RColorBrewer SeerMapper sp stringr]; }; saturnin = derive2 { name="saturnin"; version="1.1.1"; sha256="0cjp4h1s9ivn17v8ar48mxflaj9vgv92c8p9l2k5bc9yqx9mcs36"; depends=[Rcpp RcppEigen]; }; saves = derive2 { name="saves"; version="0.5"; sha256="1b4mfi2851bwcp0frx079h5yl6y1bhc2s8ziigmr8kwy1y1cxw10"; depends=[]; }; + savonliquide = derive2 { name="savonliquide"; version="0.1.0"; sha256="0jrgd8yfvq73ackq3i6hb4dx78wbvs93q1psdkk7g884wigb4gn7"; depends=[crayon glue httr]; }; saws = derive2 { name="saws"; version="0.9-6.2"; sha256="1ikvky45inz65djv1c9v749a5lq4m0xlzhm4p12am25qyv08hgjz"; depends=[gee]; }; - sazedR = derive2 { name="sazedR"; version="2.0.1"; sha256="1y8vlffvw7ff6j6pqwd0r2zxx1an846znajgcl8mdcbjimvf7fg5"; depends=[bspec dplyr fftwtools pracma zoo]; }; + sazedR = derive2 { name="sazedR"; version="2.0.2"; sha256="0v8ap9ivwj5h4w2iwhww16v1jm6jpkkphvkh5vq06mv1a72p0inz"; depends=[bspec dplyr fftwtools pracma zoo]; }; sbfc = derive2 { name="sbfc"; version="1.0.2"; sha256="1bwwy4yw8wfvmisiqwswd78dy4bjgmhcv0aki1x2sslzazmdy23y"; depends=[DiagrammeR discretization Matrix Rcpp RcppArmadillo]; }; sbgcop = derive2 { name="sbgcop"; version="0.980"; sha256="0vmg8b4462qghlyx6hq0raf9xqvygzgwi5y0cbqcljhmbmqjrwxs"; depends=[]; }; sbioPN = derive2 { name="sbioPN"; version="1.1.0"; sha256="0yvg55xnkhm35hfl7rldy2grb26hm4a68jr4x9n45fs7hhdylxri"; depends=[]; }; sbl = derive2 { name="sbl"; version="0.1.0"; sha256="1wxzscii0kp55sngmjccrqvc8zm1zamfh406r12irrz2wbxwqnkw"; depends=[]; }; - sbm = derive2 { name="sbm"; version="0.2.1"; sha256="0x79gpl703icn7cd11z39f23kmk87ny47a5i24s7p3bm342s5mhg"; depends=[blockmodels ggplot2 magrittr R6 Rcpp RcppArmadillo]; }; + sbm = derive2 { name="sbm"; version="0.2.2"; sha256="165c9032zy2ddzidqbaayx9ibf3njcwmv82rfdqg9nmrpcqrzblw"; depends=[blockmodels ggplot2 magrittr R6 Rcpp RcppArmadillo]; }; sbmSDP = derive2 { name="sbmSDP"; version="0.2"; sha256="1sl46lqi6w0s7ghv4bywhic56cm2vib3kawprga760m6igargx4y"; depends=[Rcpp RcppArmadillo]; }; + sbo = derive2 { name="sbo"; version="0.5.0"; sha256="00pnvpcl6441gf8npf6b6cvzxh0kq4qbfxggjiqdny6lq2nl0d47"; depends=[dplyr Rcpp rlang testthat tidyr]; }; sboost = derive2 { name="sboost"; version="0.1.1"; sha256="126rqvpqwvwjxvsg1v04nkmd6af55j7sgx43jg2vnggyrlli9j9q"; depends=[dplyr Rcpp rlang]; }; - sbpiper = derive2 { name="sbpiper"; version="1.9.0"; sha256="0pjq88ixk494wlz4nh5anbsn59mmh9wg564qh3vzwwqgxf1k61cg"; depends=[colorRamps data_table factoextra FactoMineR ggplot2 Hmisc reshape2 scales stringr]; }; - sbtools = derive2 { name="sbtools"; version="1.1.11"; sha256="06b27cxrfqps0lfgjcwxcal36dkf05y2lcmwrzjrm333zgnvcy6g"; depends=[curl httr jsonlite stringr]; }; + sbtools = derive2 { name="sbtools"; version="1.1.12"; sha256="140xfs39s3x1zrwqpsh4fqswjpli6l1wz2v989vm9z6w4785hdq6"; depends=[curl httr jsonlite stringr]; }; sbw = derive2 { name="sbw"; version="1.1.1"; sha256="1wlyhqwb07bb3g2ar16wk1wv541m7v4hfyncxgqd0fxsnb955pi8"; depends=[MASS Matrix quadprog slam spatstat]; }; scBio = derive2 { name="scBio"; version="0.1.6"; sha256="1bpizxm9fbxd4sfapi1ayfg5csacb4dvqbvappd79jkq4mrsk12q"; depends=[doSNOW fields foreach LiblineaR limma raster sp]; }; scDIFtest = derive2 { name="scDIFtest"; version="0.1.1"; sha256="1hq68g7zf7372cach2qfc7l1l8gh5aqkp66k0cxjnrhmvvb1qcax"; depends=[mirt sandwich strucchange zoo]; }; - scMappR = derive2 { name="scMappR"; version="0.1.3"; sha256="0rnpl6l4cipsx93swkci8pv59f9pwy4p596hg59vj6v57d5xga7s"; depends=[downloader ggplot2 gProfileR gprofiler2 GSVA limSolve pbapply pcaMethods pheatmap Seurat]; }; + scLink = derive2 { name="scLink"; version="1.0.1"; sha256="0gcwx8kfik1lv949r9d9rqqnvrfkr4bj5cj2i9h1r7l1b76kna74"; depends=[glasso]; }; + scMappR = derive2 { name="scMappR"; version="0.1.5"; sha256="0l429nzwflaa50jlpr8rd7av2gnr8fhg59pbrbvziczf6r1jb5z8"; depends=[ADAPTS downloader ggplot2 gProfileR gprofiler2 GSVA limSolve pbapply pcaMethods pheatmap reshape Seurat]; }; scModels = derive2 { name="scModels"; version="1.0.1"; sha256="0n2sc2l3wy08i0xq7jwigkr42wz9gyhlirmjmma9plnmkbrx0rp4"; depends=[Rcpp]; }; scPDSI = derive2 { name="scPDSI"; version="0.1.3"; sha256="00z5qk14c1ndrd63rhvknkp3dn3ad8z8mf00p9sb8wbsi908md44"; depends=[Rcpp]; }; scRNAtools = derive2 { name="scRNAtools"; version="1.0"; sha256="0x0lniqhq6q87y08kkkyvmk1g5b8i73hm3h86ba8rcv0v0n7ap9a"; depends=[ALL ConsensusClusterPlus corrplot edgeR foreach ggplot2 ggthemes Hmisc igraph lattice limma PerformanceAnalytics plyr reshape2 Rmisc Rtsne scatterplot3d survival TPEA]; }; - scTenifoldNet = derive2 { name="scTenifoldNet"; version="1.2.2"; sha256="0shs8m98szr97s30byv4drd11nm3102s76yn501f9a91v0clp6wl"; depends=[MASS Matrix pbapply RSpectra]; }; + scSorter = derive2 { name="scSorter"; version="0.0.1"; sha256="02zkq37zmi0rsr7m50xqpys56snazhzbp77hwld9jrav6jix4jjm"; depends=[]; }; + scTenifoldKnk = derive2 { name="scTenifoldKnk"; version="1.0.0"; sha256="1p166fmpymyb2669n6npriz6kpsf66q398rjqdcr8zq4bvf4qswj"; depends=[MASS Matrix pbapply RSpectra scTenifoldNet]; }; + scTenifoldNet = derive2 { name="scTenifoldNet"; version="1.2.4"; sha256="1gnikgfaf74d4sjdjjl34lwy9lcws4haff6x59x8bnjj7k7q219q"; depends=[MASS Matrix pbapply RSpectra]; }; scUtils = derive2 { name="scUtils"; version="0.1.0"; sha256="09c4vwrjj4r0nfcwb8q0a243m0v5wa3qisdlcy7ik58gyxp02zv8"; depends=[assertthat dplyr ggplot2 Matrix scales viridis viridisLite]; }; scaRabee = derive2 { name="scaRabee"; version="1.1-3"; sha256="1yap3hi36f8hk93jn59nxrbgq8iw0xwkkm3pc2gb50cpcpaq41pd"; depends=[deSolve lattice neldermead]; }; scaffolder = derive2 { name="scaffolder"; version="0.0.1"; sha256="1va1mlhqv5qn0hm81ypdir9llr68222qxjp3jink69zpaskfbdib"; depends=[reticulate]; }; @@ -13863,47 +14453,47 @@ in with self; { scales = derive2 { name="scales"; version="1.1.1"; sha256="019ps0njjc0rzrjygqiyn8b9vp0c3c0jd56h1yi19wzi49jvdcj0"; depends=[farver labeling lifecycle munsell R6 RColorBrewer viridisLite]; }; scalpel = derive2 { name="scalpel"; version="1.0.2"; sha256="1rwa1h24b0bzsiasjgj84rd5k5wpw6pnp463qaj624sra9wp9pw9"; depends=[gam igraph Matrix protoclust R_matlab]; }; scalreg = derive2 { name="scalreg"; version="1.0.1"; sha256="0kfcgl9cpp6g1qx23s1yrjzn0hi74vmrw567vy9wpsmhk04a5bkx"; depends=[lars]; }; - scam = derive2 { name="scam"; version="1.2-6"; sha256="1b57w583dx1dl437yrzap257kyfa5zipc4n57rbfn2laraqjw7dh"; depends=[Matrix mgcv]; }; + scam = derive2 { name="scam"; version="1.2-9"; sha256="0y60qvm82x2gwxpqx1r976dxxdipzh4zcvjk4sj8kjv2i5q95z5c"; depends=[Matrix mgcv]; }; scan = derive2 { name="scan"; version="0.40"; sha256="1khmg05dzs1va66bm26wxx440nlkl0r70wbh814fdlmij3py7m54"; depends=[car kableExtra knitr MASS mblm nlme readxl]; }; - scanstatistics = derive2 { name="scanstatistics"; version="1.0.1"; sha256="147fhq34vqkq50bw0g3a112048s5jaxxcwm3iv5wykp8zl45msmz"; depends=[dplyr emdbook ismev magrittr plyr purrr Rcpp RcppArmadillo reliaR sets tibble tidyr]; }; - scape = derive2 { name="scape"; version="2.3-2"; sha256="1i3k37r7lisrj1pblni5xn76kf6py52s4yd51fm78c3286yfaasf"; depends=[coda Hmisc lattice]; }; + scape = derive2 { name="scape"; version="2.3.3"; sha256="1jb5c335qsbrpsgngs8c1qlibyb7zvvx6mwydfhm1plx4pkcq0n1"; depends=[coda Hmisc lattice]; }; scar = derive2 { name="scar"; version="0.2-1"; sha256="04x42414qxrz8c7xrnmpr00r46png2jy5giwicdx6gx8jwrkzhzs"; depends=[]; }; scatr = derive2 { name="scatr"; version="1.0.1"; sha256="1c2z722i7d7qflh4mzb8kkix5i22wph98kwz2p98x2mhaml8802d"; depends=[cowplot ggplot2 ggridges ggstance jmvcore R6]; }; - scatterD3 = derive2 { name="scatterD3"; version="0.9.1"; sha256="0nlsy4z9m4kzm5m577nhysc17z9f3hc5anmig992x7mq4vnjnwxh"; depends=[digest ellipse htmlwidgets]; }; - scattermore = derive2 { name="scattermore"; version="0.6"; sha256="0wa7vnw935320333ivr1k5kr1qxbxppy9ncsf2hp2a2gw885scn8"; depends=[ggplot2]; }; - scatterpie = derive2 { name="scatterpie"; version="0.1.4"; sha256="0g5sn0iv6c1q7y51j4gbbbnil5089dgk1w4q94c7h5y3x7wfrzqb"; depends=[ggforce ggplot2 rlang rvcheck tidyr]; }; + scatterD3 = derive2 { name="scatterD3"; version="0.9.2"; sha256="1w4rr1v6capg4jkb1fj3ijvk6aj8nbw79kg731bcff1vjp8n04hy"; depends=[digest ellipse htmlwidgets]; }; + scattermore = derive2 { name="scattermore"; version="0.7"; sha256="18nzlprmphkvjg946h10h2qq0wbkmv2526p8di6k2xl4gccq0qpk"; depends=[ggplot2 scales]; }; + scatterpie = derive2 { name="scatterpie"; version="0.1.5"; sha256="0h48l0699lpfagv09f53yismir84945m56qwzk52lc7wxyvkfcp1"; depends=[ggforce ggplot2 rlang rvcheck tidyr]; }; scatterplot3d = derive2 { name="scatterplot3d"; version="0.3-41"; sha256="152xqz9c70qab86mpgng049gxsg5f4fpf1m8dh93fb9v1avjd0sc"; depends=[]; }; scbursts = derive2 { name="scbursts"; version="1.6"; sha256="09yxnq6m35xmp0priavjnh0bdcwkr5hhy7j33cz13xwkrd1cgw5j"; depends=[readxl tibble]; }; scclust = derive2 { name="scclust"; version="0.2.2"; sha256="0w0qwz8wfdprs2bgv1cjvd2yb6g12jylad21a9rr3w5bkgxprcrp"; depends=[distances]; }; - sccr = derive2 { name="sccr"; version="2.0"; sha256="1r5hmkij73l0z19smq080gr66nnlqk4v5sq0wcmidbxxsjpzwb45"; depends=[dplyr]; }; + sccore = derive2 { name="sccore"; version="0.1.1"; sha256="0jc0cmz3vwbam2mxhj4768982g2bxnimx5j2kk27q8c75yl9pcyn"; depends=[dplyr ggplot2 ggrepel igraph magrittr Matrix pROC Rcpp RcppArmadillo RcppEigen RcppProgress rlang scales tibble uwot withr]; }; + sccr = derive2 { name="sccr"; version="2.1"; sha256="0cjlzv92b5qrs43d3ry33zcggiqvsqaf8wq4k19ws9lvgh59b62v"; depends=[dplyr]; }; scdensity = derive2 { name="scdensity"; version="1.0.2"; sha256="173xm3bf8vxl30zk4n451al7m003byg9q4d1l1pfyfa4xnv8qdg9"; depends=[lpSolve quadprog]; }; - scdhlm = derive2 { name="scdhlm"; version="0.3.2"; sha256="1im2z8bfslvrk3y8hqk4snf42fb2iw6yh6nrhijih8qx3jmpwlmb"; depends=[nlme]; }; + scdhlm = derive2 { name="scdhlm"; version="0.5.1"; sha256="134qwjikh58arw34298w9vd30i5madyqiqh8hs19jsv3h79g2f80"; depends=[lmeInfo nlme readxl]; }; scenario = derive2 { name="scenario"; version="1.0"; sha256="0v1b00kiny21yx4qkk2x51cy1zqibdnd68z76qia7h5py28yhxsi"; depends=[]; }; scgwr = derive2 { name="scgwr"; version="0.1.2-1"; sha256="1dv6lsdpv6gdgjkww3ljqqkwdy9ir82dzwiqrclbfp9vlzay4ybf"; depends=[dplyr FNN optimParallel spData]; }; - schoRsch = derive2 { name="schoRsch"; version="1.7"; sha256="19h721v4a7rb1dlkbpb9s24x87fvz3q449ndi0rn0yc0m6mhmcvi"; depends=[]; }; + schoRsch = derive2 { name="schoRsch"; version="1.9.1"; sha256="0f823z48s50jhcphqqivchrmkiwqg25nc01c17kjpzzryd2fi5zs"; depends=[]; }; schoenberg = derive2 { name="schoenberg"; version="2.0.2"; sha256="17pbw9266r9lv9blygmvq9285kcrcy07jaqrj3zfa2pg0zyvhjvm"; depends=[crayon]; }; scholar = derive2 { name="scholar"; version="0.1.7"; sha256="142iwrips1589fa0g1178a6s1cz4dfcv9b0qs570q6b6ccfjxi6r"; depends=[dplyr ggplot2 ggraph httr R_cache rvest stringr tidygraph xml2]; }; schoolmath = derive2 { name="schoolmath"; version="0.4"; sha256="06gcmm294d0bs5whvknrq48sk7li961lzy4bcncjg052zbbpn67x"; depends=[]; }; schrute = derive2 { name="schrute"; version="0.2.2"; sha256="1j1bb7inhxq355kvqmp45zgxz41d3rpbh2rxk9wkahsbiy0cdybn"; depends=[dplyr ggplot2 magrittr stringi stringr tibble tidyr tidytext]; }; schumaker = derive2 { name="schumaker"; version="1.2"; sha256="1whfmnjmib7lh72src7cnbw3mswzaxq8vd50x5x9cv0031n0y6l7"; depends=[]; }; scico = derive2 { name="scico"; version="1.2.0"; sha256="1l7vin8zjnv3zhgv81v6qrx6nysd2kx10na1pfn6mmxvr1bsj9jp"; depends=[]; }; - scidb = derive2 { name="scidb"; version="3.0.0"; sha256="1shaw6g9s1z3vwclj7gfsp14vzqd8wvwkm5jsmmbif0bcrh43pfh"; depends=[bit64 curl data_table digest openssl]; }; scientoText = derive2 { name="scientoText"; version="0.1"; sha256="0f18hg9s50lbbgl0fqjv45yhynpnsxj8wwm07g126snzr68gbd21"; depends=[stringr tm]; }; scifigure = derive2 { name="scifigure"; version="0.2"; sha256="1zc88r1lnb0cws130hq4rjc34rrp6zkmi8yhkwsm3vkznbhi4iba"; depends=[]; }; sciplot = derive2 { name="sciplot"; version="1.2-0"; sha256="097zcgjsv54f6wd8fjwh2xb406j6yrw94v9pcxa0zln1q7fs93vk"; depends=[]; }; - scipub = derive2 { name="scipub"; version="1.1.0"; sha256="0mnjnnd3bpiqi38x3mhl4isc4j1lln5hrjp2cx544h2abr8iw83b"; depends=[dplyr forcats purrr stringr tibble tidyr tidyselect]; }; + scipub = derive2 { name="scipub"; version="1.2.1"; sha256="1hb4wwpyyx9np75q2d1vg86c0c29h8pyx2s3ffipkdgjaf9b6mjv"; depends=[dplyr forcats gghalves ggplot2 purrr stringr tibble tidyr tidyselect]; }; sclero = derive2 { name="sclero"; version="0.2"; sha256="1vqysby822s958msnwcqmz78193vrgmpf6si1jnfb9cj90hh7wgg"; depends=[plyr RImageJROI spatstat]; }; sclr = derive2 { name="sclr"; version="0.3.1"; sha256="10pihx35889w509ijbyq5hzslk9n7kakjnfscg7p0dq198nbpyca"; depends=[broom dplyr purrr rlang tibble]; }; scmamp = derive2 { name="scmamp"; version="0.2.55"; sha256="17qhj9l1akxachaimy9d5rls8adph8aalj3qr6ckip29a8ma9gf7"; depends=[ggplot2 graph reshape2 Rgraphviz]; }; scoper = derive2 { name="scoper"; version="1.1.0"; sha256="0ls1c4h7l5wk6y4yw8278rg3kyk96508pc9cd4k68kncj302xj26"; depends=[alakazam data_table doParallel dplyr foreach ggplot2 Rcpp rlang scales shazam stringi tidyr]; }; scopr = derive2 { name="scopr"; version="0.3.3"; sha256="1j45l5zcrpc4dnb6ik1v0jlqizpkijl0p656s869jhhvv55r6v2i"; depends=[behavr data_table memoise readr RSQLite stringr]; }; score = derive2 { name="score"; version="1.0.2"; sha256="1p289k1vmc7qg70rv15x05dyb92r7s6315whr1ibi40sqln62a5s"; depends=[msm]; }; - scorecard = derive2 { name="scorecard"; version="0.3.0"; sha256="08zf99xxvl27lin5xqf781l3lr4cjlr8gyw5vw4ps1fnsn844c63"; depends=[data_table doParallel foreach ggplot2 gridExtra openxlsx stringi]; }; + scorecard = derive2 { name="scorecard"; version="0.3.1"; sha256="08xzgf8lbc1y44hsd3461n4pd3kc78nfr0vzlzx7ghfi4i7jh2c8"; depends=[data_table doParallel foreach ggplot2 gridExtra openxlsx stringi]; }; scorecardModelUtils = derive2 { name="scorecardModelUtils"; version="0.0.1.0"; sha256="09znaxrv14m58hsk5pac458xbpcsidc6ygcsw4q9j0p4yd80qbvl"; depends=[car e1071 gbm ggplot2 partykit randomForest reshape2 sqldf stringr]; }; scorepeak = derive2 { name="scorepeak"; version="0.1.2"; sha256="1g9n7kjqb9qk5b7hw8ysrc069w9dzc4z29ay6z1kbm0v4kkzp7bi"; depends=[checkmate Rcpp]; }; scoring = derive2 { name="scoring"; version="0.6"; sha256="114jlpbnm15fdan5lr40adxdzwajy3yhdw6dm4kvkvky6qhcx7q5"; depends=[]; }; - scoringRules = derive2 { name="scoringRules"; version="1.0.0"; sha256="1jksv22hy8kazqwy6yjdjl32k7i558vcn7i13wc7fmary7v500km"; depends=[knitr MASS Rcpp RcppArmadillo]; }; - scoringutils = derive2 { name="scoringutils"; version="0.1.0"; sha256="1mqr2c1lgzmdcmv8lpk66xklln5d6p594q53c5pxh8akgg085i99"; depends=[data_table goftest scoringRules]; }; + scoringRules = derive2 { name="scoringRules"; version="1.0.1"; sha256="0rc8nz68h56mzsr7hyga77n0i05rq3hjkzaqx78bihzcwqd9vji7"; depends=[knitr MASS Rcpp RcppArmadillo]; }; + scoringTools = derive2 { name="scoringTools"; version="0.1.1"; sha256="0vd5d7qmkd5kyai70c0d46wp1qhgx267wrw3bdjhajz2ry05cir1"; depends=[discretization dplyr magrittr sqldf]; }; + scoringutils = derive2 { name="scoringutils"; version="0.1.4"; sha256="0rm618rs395v5n5cbnkqb7l903c7hyxpy5hg55b8kfmzmv891liv"; depends=[data_table forcats ggplot2 goftest scoringRules]; }; scout = derive2 { name="scout"; version="1.0.4"; sha256="0vr497g7g1xhf75cwjbjsns2fvdzy86iibbf5w0g2xylw82s4lh2"; depends=[glasso]; }; scpm = derive2 { name="scpm"; version="2.0.0"; sha256="1ib46m3i50annp90n2ih4qdxabxik4ngg9j0a5hgspsvk1i4hrvp"; depends=[interp lattice MASS Matrix mvtnorm RandomFields rgl]; }; scraEP = derive2 { name="scraEP"; version="1.1"; sha256="0dimvdjlgaymjmd3gf60hxcavpr58bpffrfhlksnrfzbb7an65dd"; depends=[data_table RCurl XML]; }; @@ -13915,11 +14505,11 @@ in with self; { scriptuRs = derive2 { name="scriptuRs"; version="0.1.0"; sha256="1wbvfqcc0raazhdc6pyp93q859ilxfz9rz338p3sb7fjyxvparbl"; depends=[]; }; scrm = derive2 { name="scrm"; version="1.7.3-1"; sha256="090gsa23l9s4x92q4n7ggp491fc8ghgnjw5p7j67gd1i1iwr55n8"; depends=[Rcpp]; }; scrobbler = derive2 { name="scrobbler"; version="0.2.15"; sha256="079ms94q2h8ciqi9b4w9i1md57x844jz464hk7rr564n9wcfp4gj"; depends=[httr jsonlite]; }; - scrollrevealR = derive2 { name="scrollrevealR"; version="0.1.0"; sha256="052yicg9qbybyp74w4mavh9vbacyrv8im8l1a0qxcvlafhi1gjy8"; depends=[glue htmltools]; }; + scrollrevealR = derive2 { name="scrollrevealR"; version="0.2.0"; sha256="0k8ffapwxpb25wphm76arma095hrh3wf0gpkx1z6g4rplahf4jxa"; depends=[glue htmltools]; }; scrubr = derive2 { name="scrubr"; version="0.3.2"; sha256="1grh6gljxad2iig6vldv2j0wk83cj6v1pdqsldb6gp4kqyzbikq9"; depends=[crul curl data_table fastmatch hoardr jsonlite lazyeval magrittr Matrix qlcMatrix tibble]; }; scrypt = derive2 { name="scrypt"; version="0.1.3"; sha256="14iblgbp9v2by8fjbrpsd59iknp5babcz7j3yv1yxxzcwyb6wrrm"; depends=[Rcpp]; }; scs = derive2 { name="scs"; version="1.3-2"; sha256="10z5619gbnnygk8pkdx2qji56jlv1q6c1z4581pdkd9sfnhg1yp3"; depends=[]; }; - sctransform = derive2 { name="sctransform"; version="0.2.1"; sha256="07v3lzccsrkh1glfxd1q20r8f8gl9ls5az0s1dvxm4vcls0hlhyn"; depends=[future_apply ggplot2 gridExtra MASS Matrix Rcpp RcppEigen reshape2]; }; + sctransform = derive2 { name="sctransform"; version="0.3.2"; sha256="1p3m6i28nlxh6r609syn88cwlbdpl3dw44dy3gsijk2ibq20mfsx"; depends=[future future_apply ggplot2 gridExtra MASS Matrix matrixStats Rcpp RcppArmadillo reshape2]; }; scuba = derive2 { name="scuba"; version="1.10-0"; sha256="1ckq8lc92wpb6rimi5n70qnxngvdl38nrwfwayn7c7jh40ywn9fk"; depends=[]; }; sdPrior = derive2 { name="sdPrior"; version="1.0-0"; sha256="0g4crlasnvxz752n3az5jc681jvvj2g87c3a8s2h1i2vh64p5h37"; depends=[doParallel GB2 MASS mgcv mvtnorm pscl]; }; sdStaf = derive2 { name="sdStaf"; version="1.0.2"; sha256="0r7lqj30r3f0b18kpahi63zsdizcw2zjf1vvvs04s4cg1djjbcp3"; depends=[dismo dplyr ggplot2 raster rasterVis rgdal rgeos sp tidyr]; }; @@ -13927,6 +14517,7 @@ in with self; { sdafilter = derive2 { name="sdafilter"; version="1.0.0"; sha256="0y692j25pln46dp6xvaq17fkym0461yqfa6rv5avfw2b240k8jiq"; depends=[glasso glmnet huge POET]; }; sdat = derive2 { name="sdat"; version="1.1"; sha256="1mxijw2yfblqjvqqb2xrzhfn9c872i1q9ggw24xicvr2fk4lvjw6"; depends=[]; }; sdcHierarchies = derive2 { name="sdcHierarchies"; version="0.18.3"; sha256="0snsl790ivx21dynryscy9arc8bmfh4pigh6j9m3b8lls8alcpqz"; depends=[cli data_table jsonlite rlang shiny shinyjs shinythemes shinyTree]; }; + sdcLog = derive2 { name="sdcLog"; version="0.1.0"; sha256="0pz461jcfgcahsyaacd953gqgniwxsm664a8pnsbdj6d04mrn56w"; depends=[broom checkmate crayon data_table]; }; sdcMicro = derive2 { name="sdcMicro"; version="5.5.1"; sha256="1jabihj878w9wk7lmbnjh9v14jdb14w6ir10ram2bprlxah0bn07"; depends=[car carData cluster data_table DT e1071 ggplot2 haven knitr MASS prettydoc Rcpp rhandsontable rmarkdown robustbase shiny shinyBS VIM xtable]; }; sdcSpatial = derive2 { name="sdcSpatial"; version="0.1.1"; sha256="1szv2nb758k3x5scxml2ns11fi99rlmd11r3fhzy3dgylf0m0xnm"; depends=[raster]; }; sdcTable = derive2 { name="sdcTable"; version="0.31"; sha256="064aippj8p4mc1zazvkzcjz59hlfybsz6wz1ppwj6d9638ha1a96"; depends=[data_table knitr lpSolveAPI Rcpp Rglpk rlang sdcHierarchies slam stringr]; }; @@ -13934,40 +14525,43 @@ in with self; { sddpack = derive2 { name="sddpack"; version="0.9"; sha256="1963l8jbfwrqhqcpif73di9i5mb996r4f8smjyil6l7sdir7cg9l"; depends=[]; }; sde = derive2 { name="sde"; version="2.0.15"; sha256="0gxyhq9lafd62y68h7fd746a3jz3jdsm0shgwm2ylmp4a2f5cdmm"; depends=[fda MASS zoo]; }; sdef = derive2 { name="sdef"; version="1.7"; sha256="0x2b8shp02ik0dd11wi3jcrl9h9m963fnkfy47fwwhav9x6jg0jf"; depends=[]; }; + sdetorus = derive2 { name="sdetorus"; version="0.1.7"; sha256="1ip9wi44m64qhyl5mcvpm5kk0j7qmkrh3fq572jkq8w0csg59p4b"; depends=[colorRamps mvtnorm Rcpp RcppArmadillo]; }; sdglinkage = derive2 { name="sdglinkage"; version="0.1.0"; sha256="102li274s9jjxqabk8ggv9mrdd4014d5hp0hqsna4swly8zvdcyn"; depends=[arsenal bnlearn ggplot2 reshape synthpop visNetwork]; }; sdm = derive2 { name="sdm"; version="1.0-89"; sha256="1qi2hc06wnyz9apfpbypngvs8w20r1jq3mr6l6xpjdyg6ks1m0rc"; depends=[raster sp]; }; - sdmpredictors = derive2 { name="sdmpredictors"; version="0.2.8"; sha256="18374f2bnhh3nb62xf1h6fbqgpimlnkc2vbx5xkg5gyfylydz0v9"; depends=[R_utils raster rgdal]; }; + sdmpredictors = derive2 { name="sdmpredictors"; version="0.2.9"; sha256="1hpypfzfn0vppwkfrd1bcf2qzwl81603sf3l8xg8md25f3x9gw91"; depends=[R_utils raster RCurl rgdal]; }; sdmvspecies = derive2 { name="sdmvspecies"; version="0.3.2"; sha256="19avkag13ij1k65vqhmvcy8j50j8vrgw4mjc49x8i63w3d4z1wxh"; depends=[psych raster]; }; - sdols = derive2 { name="sdols"; version="2.0.0"; sha256="0rwdfb34g1l58ad02jf7wxidgqlccqvijdsvdxqdq8f5p15cl30m"; depends=[salso]; }; + sdols = derive2 { name="sdols"; version="3.0.0"; sha256="1c96fsf807qf1ah4adi5agj87gmajv2hyxnzvcz53mpr2qc72g5y"; depends=[salso]; }; sdprisk = derive2 { name="sdprisk"; version="1.1-6"; sha256="061x78irryc5phd8bv9cs2mfgiajgwmr85ryp1r47anadydb2haa"; depends=[numDeriv PolynomF rootSolve]; }; sdpt3r = derive2 { name="sdpt3r"; version="0.3"; sha256="02qv889mkzcilxzszzqcqgn9z5zmki0093mdriradbl1y8a27bp5"; depends=[Matrix]; }; sdtoolkit = derive2 { name="sdtoolkit"; version="2.33-1"; sha256="0pirgzcn8b87hjb35bmg082qp14idc5pfvm6dikpgkswag23hwh8"; depends=[]; }; - seacarb = derive2 { name="seacarb"; version="3.2.13"; sha256="0ahnjz02px41q2xz3azqfs17wj5dx7ncnzsrlc89wvqngmyn2k1n"; depends=[gsw oce]; }; + sdwd = derive2 { name="sdwd"; version="1.0.5"; sha256="14x5hjdbkr5lsh8x3wninxg88acqh6q50famf6qjlfm7727rdysc"; depends=[Matrix]; }; + seacarb = derive2 { name="seacarb"; version="3.2.14"; sha256="0yal25d3n8m7p216rzg59g9a518zaf554yff3h806m88fiahlfxy"; depends=[gsw oce]; }; seagull = derive2 { name="seagull"; version="1.0.6"; sha256="0bmmlxk2v82zhlxm8hj6p67capj4f4v6pdwlh09j75ca63jx36ry"; depends=[Rcpp RcppArmadillo]; }; sealasso = derive2 { name="sealasso"; version="0.1-2"; sha256="0cjy3fj170p5wa41c2hwscmhqxwkjq22vhg9kbajnq7df2s20jcp"; depends=[lars]; }; searchConsoleR = derive2 { name="searchConsoleR"; version="0.4.0"; sha256="1ffg5359pbwylw265wbahwl3hy1b0qqv4al71v5r8lgfircibn0j"; depends=[googleAuthR stringr]; }; - searchable = derive2 { name="searchable"; version="0.3.3.1"; sha256="0xc87i2q42j7dviv9nj4hkgjvpfiprkkjpgzwsy47vp7q8024dv0"; depends=[magrittr stringi]; }; searcher = derive2 { name="searcher"; version="0.0.5"; sha256="1q12il35pfy34n669jzkjciln1ca8by7l1d8zkzv4297547i1qln"; depends=[]; }; seas = derive2 { name="seas"; version="0.5-2"; sha256="0hn4d5dc01zyycd7l3vj1sx6bq668n7fzffw9ypaa5l20fizs0ay"; depends=[MASS]; }; - season = derive2 { name="season"; version="0.3.11"; sha256="19awxbjcp1zb6y7b2ka4hcq21lv7y76akry53hbmmk9k5f30naj1"; depends=[ggplot2 MASS survival]; }; + season = derive2 { name="season"; version="0.3.12"; sha256="0hv4qcparkfyvwqd583lqwy7djziwi0cyaycg9ds3jjsfypwp31a"; depends=[ggplot2 MASS survival]; }; seasonal = derive2 { name="seasonal"; version="1.7.1"; sha256="09ydl0hi4zmxdm254m7kibfll1z5bqxs0y2lrqngb08rl33xgs19"; depends=[x13binary]; }; seasonalview = derive2 { name="seasonalview"; version="0.3"; sha256="1l705yc7ssldsfckbgnvd95sh3zzhpkmf1rr6ar2s60s3wsyly4n"; depends=[dygraphs htmlwidgets openxlsx seasonal shiny shinydashboard xtable xts zoo]; }; seastests = derive2 { name="seastests"; version="0.14.2"; sha256="04kx4sijnpsarq4iaclxvckgr5y0gmz5a0fmkkqjmfi3hm1kvw3d"; depends=[forecast xts zoo]; }; - seawaveQ = derive2 { name="seawaveQ"; version="2.0.1"; sha256="0p7yb4hha2xw96nwk342grmfc1721dqcbssx7ww7lqd29r9d0dzf"; depends=[lubridate plyr reshape2 rms survival]; }; - secr = derive2 { name="secr"; version="4.3.0"; sha256="13p7v539zifan6n89al1b5hmfimj4n2dv2kaxb8kwrn23kwr6ywd"; depends=[abind MASS mgcv nlme raster Rcpp RcppEigen RcppNumerical RcppParallel sp stringr]; }; + seawaveQ = derive2 { name="seawaveQ"; version="2.0.2"; sha256="1x4vvassal1lwb9xnwisrhlx2maaqxl84h7klfy8yg9x80fdrhsw"; depends=[lubridate plyr reshape2 rms survival]; }; + secr = derive2 { name="secr"; version="4.3.3"; sha256="10m3gxjw976rc4h72aw6d0z2k7spcq14rlp5h5g1d3b06r5xpyxk"; depends=[abind MASS mgcv nlme raster Rcpp RcppEigen RcppNumerical RcppParallel sp stringr]; }; secrdesign = derive2 { name="secrdesign"; version="2.5.11"; sha256="02fysbx6w1iw2ig54f9sgr74c40wfjwiwpdmxdjymsaynqnm9anl"; depends=[abind openCR secr]; }; secret = derive2 { name="secret"; version="1.1.0"; sha256="063gpyc2s2l6zw1j8b8ppzsv9kjsf0s77s5wcn7ipmwkj8qr2g4b"; depends=[assertthat curl jsonlite openssl rprojroot]; }; secrettext = derive2 { name="secrettext"; version="0.1.0"; sha256="129v524yyb464mcij7hvzv05cxliaz5nm7v30g9g9ppskcdqhsx2"; depends=[dplyr magrittr rlang stringr testthat tidyr]; }; secrlinear = derive2 { name="secrlinear"; version="1.1.1"; sha256="0jcvraypkss1gphh4cjb0b4v9460fj4dw80yd057ah11p9942ggs"; depends=[igraph maptools MASS rgdal secr sp]; }; secsse = derive2 { name="secsse"; version="2.0.0"; sha256="0qsbn56vc6y19hmc94bimv1mf86ayxa8rj38qvvsxjfm9czmw2ac"; depends=[ape apTreeshape DDD deSolve doParallel foreach geiger phylobase]; }; - secuTrialR = derive2 { name="secuTrialR"; version="1.0.3"; sha256="06lmm3hpspi3vd5wvzpj9skay823z4km5jbxg11sv4xqh16sh4qh"; depends=[dplyr haven igraph lubridate magrittr purrr readr readxl rlang stringr tibble tidyr]; }; - secure = derive2 { name="secure"; version="0.5"; sha256="16pv5m7rrcs8hcjj3kylq7smyzf2qk8rkg9m1b421w0ac7lg04x1"; depends=[MASS Rcpp RcppArmadillo]; }; + secuTrialR = derive2 { name="secuTrialR"; version="1.0.8"; sha256="0dlgm8v2k8b6smn84zmgscxcipw1yi18ksgdxg8zp3ckjiq7gdfn"; depends=[dplyr haven lubridate magrittr purrr readr readxl rlang stringr tibble tidyr]; }; securitytxt = derive2 { name="securitytxt"; version="0.1.1"; sha256="0yrydcc68qcsq5wrdfgwfi347pdd0zc8hp2ikmw3iz31anm3b4yw"; depends=[Rcpp]; }; - see = derive2 { name="see"; version="0.5.2"; sha256="1wxbiipd5aqvw0ac0a1s8mg8ycghvakkc0wjnsdlrn9bjc82aik4"; depends=[bayestestR dplyr effectsize ggplot2 ggridges insight magrittr parameters rlang]; }; + see = derive2 { name="see"; version="0.6.1"; sha256="0apdz66vax3n69a3vigmhy4p71ysg0yl2qh3ws69fbnhc7xs9s40"; depends=[bayestestR dplyr effectsize ggplot2 ggridges insight magrittr parameters rlang]; }; seeclickfixr = derive2 { name="seeclickfixr"; version="1.1.0"; sha256="1agsqq2msrqrssffc6liyjjs6nqm90xy2inlcjbkdac5dhinjc4n"; depends=[jsonlite RCurl]; }; + seecolor = derive2 { name="seecolor"; version="0.1.0"; sha256="1ijxyys8pwlm99ynmv86cgn8pzz1ivaxzh3rq1akzv17nz93jv61"; depends=[crayon dplyr fansi ggplot2 magrittr purrr rstudioapi stringr]; }; seedCCA = derive2 { name="seedCCA"; version="3.0"; sha256="076pkv083dp71m6ifjzx9spfwmc1625r9d72spf0vhf8pwwsha4v"; depends=[CCA corpcor]; }; + seededlda = derive2 { name="seededlda"; version="0.5.1"; sha256="18fidm7jz1vsa9as7grj3g7wnkvj50izah3yajwiap44bq45hpd6"; depends=[Matrix quanteda Rcpp RcppArmadillo RcppParallel]; }; + seedr = derive2 { name="seedr"; version="0.3.0"; sha256="15drbc0iplb97a2sym6jnrwij7ak5qckcw98n3m65x45apjwdmhq"; depends=[binom data_table]; }; seeds = derive2 { name="seeds"; version="0.9.1"; sha256="0adk7y5ripg78bwkdgnlfwq9w9h6mlpdrikgbnn5z8az2qahc0in"; depends=[callr coda Deriv deSolve dplyr ggplot2 Hmisc MASS matrixStats mvtnorm pracma R_utils Ryacas statmod tidyr]; }; - seedwater = derive2 { name="seedwater"; version="1.0"; sha256="0qqhjax16lnyriv6q9n89g93bs1zy8xwx9jp0xbilba7djzjh33g"; depends=[rpanel tkrplot]; }; + seedwater = derive2 { name="seedwater"; version="2.0"; sha256="1q6q612245hqqx89jzlp77f73vj2baxi0bghd9l8kpjz4ydh6rv8"; depends=[rpanel]; }; seer = derive2 { name="seer"; version="1.1.5"; sha256="19p6gvi3g1fjzi3rb1xm4svff7nb0bcmbf4fzijvqpzkz0gpi10k"; depends=[dplyr forecast forecTheta furrr future magrittr MASS purrr randomForest stringr tibble tsfeatures urca]; }; seewave = derive2 { name="seewave"; version="2.1.6"; sha256="123h3q0gps0vy9sikr7gjphnv9m3l4h4mykiydjllmrpaw1s1844"; depends=[tuneR]; }; seg = derive2 { name="seg"; version="0.5-7"; sha256="165hl55vzyf3jqlykqji37p2syzhc8dxdjxd4wwr562qnlymzszx"; depends=[sp splancs]; }; @@ -13976,7 +14570,7 @@ in with self; { segclust2d = derive2 { name="segclust2d"; version="0.2.0"; sha256="1n5h92dza7wgfpfyzlfb7hbrqb0a8dhc38vml9645gym3a1riwn5"; depends=[dplyr ggplot2 magrittr plyr RColorBrewer Rcpp RcppArmadillo reshape2 scales zoo]; }; segmag = derive2 { name="segmag"; version="1.2.4"; sha256="1i717xg1z7s35pkwzywgjf9wx7zj9xksv0k87h7p1q62y073qbqm"; depends=[plyr Rcpp]; }; segmenTier = derive2 { name="segmenTier"; version="0.1.2"; sha256="01xbcddinjbkbqkwq2lnsxd3gw8fxys58p498dc2lw8psz3g2wgc"; depends=[Rcpp]; }; - segmented = derive2 { name="segmented"; version="1.2-0"; sha256="0r83p36l6m5sy4lxfjbfajn4gcqb0wv9zh7arny02s6c7fb4756y"; depends=[]; }; + segmented = derive2 { name="segmented"; version="1.3-1"; sha256="0g8l1i31zfqamvwc5j537k3ld6dr5z81p84grdlqq41gywmyidmr"; depends=[]; }; segmentr = derive2 { name="segmentr"; version="0.2.0"; sha256="0q5kxxiw0akpk7w2a2l9zp7v4pvqblzdvrld5fjyl5f6h8hsb40z"; depends=[foreach glue Rcpp]; }; segregation = derive2 { name="segregation"; version="0.3.0"; sha256="0bx3w2dhbikx7vk5gs0b2jc4q4zvwlrj4crv6agmc2pn3ap7i88k"; depends=[data_table]; }; seismic = derive2 { name="seismic"; version="1.0"; sha256="02d11c3filzghi8cvryikaidmk40d4z3qxsqs7bjdhxyf814caw8"; depends=[]; }; @@ -13993,13 +14587,13 @@ in with self; { selfea = derive2 { name="selfea"; version="1.0.1"; sha256="0zyxbd5vg8nhigill3ndcvavzbb9sbh5bz6yrdsvzy8i5gzpspvx"; depends=[ggplot2 MASS plyr pwr]; }; selfingTree = derive2 { name="selfingTree"; version="0.2"; sha256="18ylxmg2ms4ccgm4ahzfl65x614wiq5id7zazjjz5y75h8gs7gzj"; depends=[foreach]; }; sem = derive2 { name="sem"; version="3.1-11"; sha256="03j3ig6fy34pi6nwfq9w8f5m555lilw5skr1vn6ay4yvjmvavc9k"; depends=[boot MASS matrixcalc mi]; }; - semEff = derive2 { name="semEff"; version="0.3.0"; sha256="18wmxkk0wmk7y3g1r7fwif7f6mhcgrsb60iv20d8f7bkhwkvfnx4"; depends=[boot lme4]; }; + semEff = derive2 { name="semEff"; version="0.4.0"; sha256="0czlsz6kfkka75radz4v30jsk7jg7rif8l0fi4zdmyzrls4fm35k"; depends=[boot lme4]; }; semPLS = derive2 { name="semPLS"; version="1.0-10"; sha256="0q5linjyv5npkw4grx3vq58iq2q1grf06ikivhkg8w7rvb7pqn6b"; depends=[lattice]; }; semPlot = derive2 { name="semPlot"; version="1.1.2"; sha256="0l1v9yi1pv59iwfknw4dh9qskk5y8r347jq1vq13gnfd3bmd71xr"; depends=[colorspace corpcor igraph lavaan lisrelToR OpenMx plyr qgraph regsem rockchalk sem XML]; }; - semPower = derive2 { name="semPower"; version="1.0.1"; sha256="0z7lrbl76ff8imldv6ibripdchg4f559lg2aw41zbqz9w3g2lpm4"; depends=[]; }; + semPower = derive2 { name="semPower"; version="1.1.0"; sha256="091695q9s5hymnziz9sjbn0magxqb21m9z2yj97w1laaflc3m3z3"; depends=[]; }; semTable = derive2 { name="semTable"; version="1.8"; sha256="0qr420rnz59q8arf6x05iy1zyh7pv31ldi2rsw1j2a00fbpp4ndf"; depends=[kutils lavaan plyr stationery xtable]; }; semTools = derive2 { name="semTools"; version="0.5-3"; sha256="0k3w10fnq0l89inhxvnypyrfhlrm921mfn0kwyyfpndvbqizky1d"; depends=[lavaan]; }; - semantic_dashboard = derive2 { name="semantic.dashboard"; version="0.1.5"; sha256="0bazaznmxmks11zgb9npvkblhy0ym554fnvgqsa02rlxxzzzljib"; depends=[glue htmltools shiny shiny_semantic]; }; + semantic_dashboard = derive2 { name="semantic.dashboard"; version="0.1.8"; sha256="1d53947pfs30mdmidqpywii29i91nxqvrbjvy0qcfyd7r7al1q99"; depends=[glue htmltools shiny shiny_semantic]; }; semdiag = derive2 { name="semdiag"; version="0.1.2"; sha256="0kjcflw7dn907zx6790w7hnf5db6bf549whfsc0c2r173kf13irp"; depends=[sem]; }; semdrw = derive2 { name="semdrw"; version="0.1.0"; sha256="16hm1ifgspnxnlf3rfg5ylmql2fq91ig8nc5953ggyhfrjwbqx15"; depends=[dplyr lavaan psych semPlot semTools shiny shinyAce]; }; semds = derive2 { name="semds"; version="0.9-6"; sha256="10kvcmcy6qa2r5sram6azqgzl528rghfxgw2f2bq2fvhhq127dzq"; depends=[minpack_lm pracma]; }; @@ -14011,14 +14605,14 @@ in with self; { semtree = derive2 { name="semtree"; version="0.9.14"; sha256="1gyjrvqvqmm0dcbddjq90v3gsniiz9rl66nxiayvfbkhs4pih39z"; depends=[bitops cluster digest expm ggplot2 MASS matrixcalc matrixStats mvtnorm OpenMx plotrix rpart rpart_plot sets stringr tidyr]; }; semver = derive2 { name="semver"; version="0.2.0"; sha256="10wpkyms2cix3bsin2q0qhkbl445pwwpa5gm2s4jjw1989namkxy"; depends=[assertthat Rcpp]; }; semverutils = derive2 { name="semverutils"; version="0.1.0"; sha256="0y3zh8n8bgs3ag8yy9cnp0i0xrn0iqflcbrya70glyb40148w9sw"; depends=[foreach R6]; }; - sen2r = derive2 { name="sen2r"; version="1.3.7"; sha256="1w57hac7mn7447fifvmhk2fkrdvlczglq9nk317dh0pb2fzqlnvn"; depends=[data_table doParallel foreach geojsonio httr jsonlite raster RcppTOML rgdal sf stars XML]; }; + sen2r = derive2 { name="sen2r"; version="1.3.9"; sha256="1p2zqm4m8r9cs4dlh4m1fznlxa5wf7rdgpkll106xhs3qkckkcdc"; depends=[data_table doParallel foreach geojsonio httr jsonlite raster RcppTOML rgdal sf stars XML]; }; sendmailR = derive2 { name="sendmailR"; version="1.2-1"; sha256="0z7ipywnzgkhfvl4zb2fjwl1xq7b5wib296vn9c9qgbndj6b1zh4"; depends=[base64enc]; }; sendplot = derive2 { name="sendplot"; version="4.0.0"; sha256="0ia2xck94nwirwxi38nv0viz5wb8291yiak6f0wgwh84irsrfp1h"; depends=[rtiff]; }; sensR = derive2 { name="sensR"; version="1.5-2"; sha256="073za0z6dawba2nd45hs20m0143kckxn3iglkyqz9vdfqwyv7wlq"; depends=[MASS multcomp numDeriv]; }; sensemakr = derive2 { name="sensemakr"; version="0.1.3"; sha256="1pgzmv72jsl359lni9z0fc7szyy9aiqyi2lwkmvnc8kmqd5dmk1f"; depends=[]; }; sensiPhy = derive2 { name="sensiPhy"; version="0.8.5"; sha256="1kjkdklva5wzmw071gbn1v9g5cf0wzmvwgy5y0dgi530v6byaw8j"; depends=[ape caper geiger ggplot2 phylolm phytools]; }; sensibo_sky = derive2 { name="sensibo.sky"; version="1.0.0"; sha256="0s8gbj7qrcbcnflp7v0s93ykh2xgk7jwpyvzndj1f90hjy20x3bc"; depends=[glue httr jsonlite]; }; - sensitivity = derive2 { name="sensitivity"; version="1.22.1"; sha256="15g4bxdi128x0yb81h225c8frcvbp99xf8qvncmycyzziz2cbdqi"; depends=[boot ggplot2 numbers Rcpp RcppArmadillo]; }; + sensitivity = derive2 { name="sensitivity"; version="1.23.1"; sha256="0sdk5d94nq81xkawlkrv0kq4qixhlbn81wnf25c5ak4kzakfh3jy"; depends=[boot ggplot2 numbers Rcpp RcppArmadillo]; }; sensitivity2x2xk = derive2 { name="sensitivity2x2xk"; version="1.01"; sha256="1r829k939zzmi0j4chdaniajchcflmmjrl3a9hwnkg0wkfnjbvdl"; depends=[BiasedUrn mvtnorm]; }; sensitivityCalibration = derive2 { name="sensitivityCalibration"; version="0.0.1"; sha256="1fn07dra7dhpsg6f1yn1ayfpmvwaxma8cps94070nrpfwmdvi04g"; depends=[ggplot2 ggrepel plotly relaimpo splitstackshape stringi]; }; sensitivityPStrat = derive2 { name="sensitivityPStrat"; version="1.0-6"; sha256="0rfzvkpz7dll3173gll6np65dyb40zms63fkvaiwn0lk4aryinlh"; depends=[survival]; }; @@ -14035,7 +14629,7 @@ in with self; { sentometrics = derive2 { name="sentometrics"; version="0.8.2"; sha256="1yrcm3wqnlcd5r4h1zwiz2wv6xl751p9h0537z8x5npf8c4clxp8"; depends=[caret data_table foreach ggplot2 glmnet ISOweek quanteda Rcpp RcppArmadillo RcppParallel RcppRoll stringi]; }; sentryR = derive2 { name="sentryR"; version="1.1.0"; sha256="0kz81dbxg4zyns829cjhjm2g88pxzaaxdk7c8qabvl0zgqys2chy"; depends=[httr jsonlite stringr tibble uuid]; }; separationplot = derive2 { name="separationplot"; version="1.3"; sha256="0ggyr4asp86hvdp4bwdkljz9b2gzdxm2y9nbz2srlgh3m4hlz2cs"; depends=[foreign Hmisc MASS RColorBrewer]; }; - seplyr = derive2 { name="seplyr"; version="1.0.0"; sha256="0m6dyg48npyw9dafqlffm1haivcs0qlpg81m3b99sjiwswxvx2lh"; depends=[dplyr rlang tidyr wrapr]; }; + seplyr = derive2 { name="seplyr"; version="1.0.1"; sha256="0r40z0m1ixm1l6w6alhbfzkiyvayrvwwmn0ybcshrn8rqys56q21"; depends=[dplyr rlang tidyr wrapr]; }; seqCBS = derive2 { name="seqCBS"; version="1.2.1"; sha256="176ggpdcgmpsjixmz0ldknyd0vw120kjyrid3bq2bn4cgkwzb74z"; depends=[clue]; }; seqDesign = derive2 { name="seqDesign"; version="1.2"; sha256="10p8ldj83mvhpcz1yas4xns5qh8zbs533na8nv87phngi8dsb76m"; depends=[survival]; }; seqHMM = derive2 { name="seqHMM"; version="1.0.14"; sha256="0ybdp5364jddakkd7rawrfk87hn30fgjpsirlz2440w600m69ydr"; depends=[gridBase igraph Matrix nloptr numDeriv Rcpp RcppArmadillo TraMineR]; }; @@ -14044,10 +14638,10 @@ in with self; { seqest = derive2 { name="seqest"; version="1.0.1"; sha256="06zk87n26305m0hy6lg7v3bpxmsqvinwkvw3dvmzkqp5jdkhwikb"; depends=[foreach geepack MASS mvtnorm nnet Rcpp RcppArmadillo VGAM]; }; seqgendiff = derive2 { name="seqgendiff"; version="1.2.2"; sha256="0vrmh4h2g4hvx8ix5jyc4bhp8vpr00fcqsfbf9r0808jqnlwgcnr"; depends=[assertthat cate clue irlba matchingR pdist sva]; }; seqhandbook = derive2 { name="seqhandbook"; version="0.1.0"; sha256="0zncpjabazci92wzw126i491669gidkyiw7zjp7iw23m6jaf71l4"; depends=[TraMineR]; }; - seqinr = derive2 { name="seqinr"; version="3.6-1"; sha256="0j30za6kji6y3v09cvcydiacnp65pv6ig8aw7cydl47l5s9chky4"; depends=[ade4 segmented]; }; - seqmagick = derive2 { name="seqmagick"; version="0.1.3"; sha256="0983k7fbcv4ai42cxxi4f854b9mqx68rgyvy0mjhpb6md7ba59jy"; depends=[Biostrings magrittr]; }; + seqinr = derive2 { name="seqinr"; version="4.2-5"; sha256="1z1jipgrn9nrnxlx7bcf8c2chwpa3kfva0zgyb12xbr3kisn166y"; depends=[ade4 segmented]; }; + seqmagick = derive2 { name="seqmagick"; version="0.1.4"; sha256="1m3j52mxam7kz9iqg4i43g8k2wmpbjfn06bz8bf1c98aj6zqal5s"; depends=[Biostrings magrittr]; }; seqminer = derive2 { name="seqminer"; version="8.0"; sha256="00jzj8mwb0zaiwlifd41b26mrq9mzigj18nc29dydi0r42hxg16i"; depends=[]; }; - seqmon = derive2 { name="seqmon"; version="2.3"; sha256="0lvjb3mx1h5nbbn3kmjwviy9gzsv9k1bs57jdfc09kid7kisaqmn"; depends=[]; }; + seqmon = derive2 { name="seqmon"; version="2.4"; sha256="1aqrg9aqvsabg5mm9jfj5vaxxaapfs1qw3yyzbx7vsspcgjdhyca"; depends=[]; }; seqtest = derive2 { name="seqtest"; version="0.1-0"; sha256="1bdfww9szh7h278id5xpfc39mxkcix3yvsdwc68wx3q3x0wxhqhq"; depends=[]; }; sequence = derive2 { name="sequence"; version="2.0"; sha256="0r5h96gcp18lwgrl2pjlr71xqspkf6qmm1m0xjq5vadalfa7y294"; depends=[]; }; sequences = derive2 { name="sequences"; version="0.5.9"; sha256="17571m525b6a3k4f0m936wfq401181gx1fpb7x4v0fhaldzdmk3a"; depends=[Rcpp]; }; @@ -14055,139 +14649,151 @@ in with self; { sequoia = derive2 { name="sequoia"; version="2.0.7"; sha256="1lyzvxj7vdlb7p9df6lp67qn8zqn3sv5r2absrxikmxfbfdj3s09"; depends=[plyr]; }; sergeant = derive2 { name="sergeant"; version="0.9.0"; sha256="1iyb0191hkkhhsr4507b1c6j7c7z7lz1v0m2y7flc50yfxicb1fb"; depends=[bit64 DBI dbplyr dplyr htmltools httr jsonlite magrittr purrr readr scales tibble]; }; serial = derive2 { name="serial"; version="3.0"; sha256="1y1gj0lcdn5apiv6c6arks6pqhsbvnrfym6n2izjarx2c27ijrjj"; depends=[]; }; - seriation = derive2 { name="seriation"; version="1.2-8"; sha256="1zbdxq0s5rc5v307b69fw9k52m0654ls7pf22lh35ggirig6lwsk"; depends=[cluster colorspace dendextend gclus gplots MASS qap registry TSP]; }; + seriation = derive2 { name="seriation"; version="1.2-9"; sha256="1glxn098ar1v96xlwp85kjxzfd1nyfzp2f82x5z3fm87yv57k4lb"; depends=[cluster colorspace dendextend gclus gplots MASS qap registry TSP]; }; serieslcb = derive2 { name="serieslcb"; version="0.4.0"; sha256="1ip4k2xzg06hwsni62ai1whs1zzhwlf94507inpfpqz3jmmafrhq"; depends=[gplots shiny]; }; seroincidence = derive2 { name="seroincidence"; version="2.0.0"; sha256="0sam4y7w6prswz0izkm1a9v2k5rv7z22g1ajy15n9xix9aml5ms4"; depends=[]; }; serpstatr = derive2 { name="serpstatr"; version="0.0.2"; sha256="1qjaws8df157qz66x1389aacpddyawgc10fm8flx9kb0kvfp3ybb"; depends=[httr]; }; serrsBayes = derive2 { name="serrsBayes"; version="0.4-1"; sha256="0618415n2izdgv85cnmlnpwy0lz7rnimspq8986w5w1ywhw2xpbm"; depends=[Matrix Rcpp RcppEigen truncnorm]; }; servosphereR = derive2 { name="servosphereR"; version="0.1.1"; sha256="0m1fjd3f1s2ss54xmcrm3p0c33hhi2dj0vim790g4y0mw2aicc8l"; depends=[data_table dplyr magrittr purrr rlang]; }; - servr = derive2 { name="servr"; version="0.18"; sha256="0xfbf1a1w34hbsx4jrdr4rqf22v7gf1p37ngknglv1dyxih7ipja"; depends=[httpuv jsonlite mime xfun]; }; + servr = derive2 { name="servr"; version="0.21"; sha256="12fk585hmz735v4hra8da9wld1fmd67byqnf95m7jjyh7l3dmh1z"; depends=[httpuv jsonlite mime xfun]; }; sesem = derive2 { name="sesem"; version="1.0.2"; sha256="0b1xzv38wpkhhlq87xrvlh45b8ksbi8bg4ar5hrf8gxa19r9rmi5"; depends=[gplots lavaan mgcv]; }; session = derive2 { name="session"; version="1.0.3"; sha256="04mcy1ac75fd33bg70c47nxqxrmqh665m9r8b1zsz5jij1sbl8q5"; depends=[]; }; sessioninfo = derive2 { name="sessioninfo"; version="1.1.1"; sha256="0j5f3l58fynxx3v0w62vqpii7miabszgljpja36xx9s8hikh8sqn"; depends=[cli withr]; }; set = derive2 { name="set"; version="1.1"; sha256="0b6qzy3mqf2gfc5gjrn1k6k7ymprjzs2i948zsgcqdkgr8acasbm"; depends=[do]; }; - set6 = derive2 { name="set6"; version="0.1.8"; sha256="03hmnqcj38aiqcnqrqjx4wpgar1z5pj5w5yc74153qm6vm076637"; depends=[checkmate R6 Rcpp]; }; + set6 = derive2 { name="set6"; version="0.2.0"; sha256="1y8gs5nyjm5vm4kq9fx9xndwjp7n2xabxa1vdnzm77srlmhxdc7r"; depends=[checkmate R6 Rcpp]; }; setRNG = derive2 { name="setRNG"; version="2013.9-1"; sha256="02198cikj769yc32v8m2qrv5c01l2fxmx61l77m5ysm0hab3j6hs"; depends=[]; }; sets = derive2 { name="sets"; version="1.0-18"; sha256="16v7650p47khqrbbw0z98llmwmmhswqmhri0n7nrfhdqwmby1lbl"; depends=[]; }; setter = derive2 { name="setter"; version="0.0-1"; sha256="10fwrx8yysp99rrkbnn3rbz79vyzr2h3p7zxxlqapw1k2lllp0r5"; depends=[assertive_base]; }; settings = derive2 { name="settings"; version="0.2.4"; sha256="092sv6nccm6p2d695l9w0zfi2xgymk12c8p8lhl9nb86mxrb3nry"; depends=[]; }; - sever = derive2 { name="sever"; version="0.0.4"; sha256="1wqmpn1i4kln0wcyxs8wcbary246fax0j454b22m07hi1fwr4mn8"; depends=[cli shiny]; }; + sever = derive2 { name="sever"; version="0.0.6"; sha256="0za9xdzmp2hbiq83wp0gjrzb2k180mgmvjzh1jldhrjpz7cvdbnk"; depends=[cli shiny]; }; severity = derive2 { name="severity"; version="2.0"; sha256="1mp19y2pn7nl9m8xfljc515kk5dirv0r2kypazpmd956lcivziqq"; depends=[]; }; - sf = derive2 { name="sf"; version="0.9-5"; sha256="0c58asqrvz1pkdkb0lkzwz8cwb43pmxd39z0jp217hk7p7q3ngwf"; depends=[classInt DBI magrittr Rcpp units]; }; + sf = derive2 { name="sf"; version="0.9-6"; sha256="01yqlnx9v7lzb6g4ywjlncz67cnkizszarnf2dmd4fi8abhw4zs9"; depends=[classInt DBI magrittr Rcpp units]; }; sfa = derive2 { name="sfa"; version="1.0-1"; sha256="1acqxgydf8j5csdkx0yf169x3yaa31r0ccdrqarh6vj1hacm89ad"; depends=[]; }; sfadv = derive2 { name="sfadv"; version="1.0.1"; sha256="1rfpm6km5pckwhqgpvidm6qsj5sjdaqqj5b0sgvpslivfa4c80cr"; depends=[gmm minpack_lm]; }; sfc = derive2 { name="sfc"; version="0.1.0"; sha256="0cm4mfcfd9bhf2j5fppsihzrfipnldb6q3xradd88z9pwgrkfx2a"; depends=[dplyr sna tidyr triangle zoo]; }; sfdct = derive2 { name="sfdct"; version="0.0.6"; sha256="0ilh89mfwp1yqn44yn80vz1a6g65hryk6w87ngzvak3pd6jxq6aa"; depends=[dplyr RTriangle sf sp tibble]; }; - sfheaders = derive2 { name="sfheaders"; version="0.2.2"; sha256="0dcpq5d2m49izwq9fnsd25gm95swmw2bns8ha9mq36c2s2x2nq0s"; depends=[Rcpp]; }; + sfheaders = derive2 { name="sfheaders"; version="0.4.0"; sha256="0ig02nszrs6fkjkrkqibp23n4a8qr4i09yz7l741yjd0308ddg46"; depends=[geometries Rcpp]; }; sfinx = derive2 { name="sfinx"; version="1.7.99"; sha256="14v47y00qwvc2s0vzjw19hwn85nzj8lna539c75qq6zkn6kir6va"; depends=[]; }; + sfo = derive2 { name="sfo"; version="0.1.0"; sha256="11d1h30zak494szxpi851k30bv7s38dic4ndh39q4k03lhl35bxz"; depends=[]; }; sfsmisc = derive2 { name="sfsmisc"; version="1.1-7"; sha256="12g6m8sf17q3qmm133nm4fa296w5n5d9ly3fvb2nvc0w4llkif3l"; depends=[]; }; sft = derive2 { name="sft"; version="2.2-1"; sha256="0fxz64ba58n6ghfqsgq64n1c7qkvi8c3lsa86732mil9w71yxw33"; depends=[fda SuppDists]; }; + sftrack = derive2 { name="sftrack"; version="0.5.2"; sha256="1mh4m4z18wnhar88f5amkdwvfsbdx1qjyylf9jp4hm371a76sawg"; depends=[sf]; }; sgPLS = derive2 { name="sgPLS"; version="1.7"; sha256="1jk2j1zn5vq82rcjflnk7g6y2q0v5jl14k804dmigqg013gbykql"; depends=[mixOmics mvtnorm]; }; sgd = derive2 { name="sgd"; version="1.1.1"; sha256="055khw3jr7kr8la3jpzq1q25gk0qcclkv7g0q1sylhyqq2qdriwb"; depends=[BH bigmemory ggplot2 MASS Rcpp RcppArmadillo]; }; sgee = derive2 { name="sgee"; version="0.6-0"; sha256="055iydainzywb1s5id5rl9i94dj5arr9b6qz15p8wps49vm2mlp3"; depends=[copula mvtnorm]; }; sgeostat = derive2 { name="sgeostat"; version="1.0-27"; sha256="1iq9p2jk8bpv1h853a1l91d5c5dxnhkk3cmkd01siqqvj04hv4vb"; depends=[]; }; sglOptim = derive2 { name="sglOptim"; version="1.3.8"; sha256="15bkkvgp9v9vsp65wps48g3c2fa0fj1025hbrziywq14j7wayyjr"; depends=[BH doParallel foreach Matrix Rcpp RcppArmadillo RcppProgress]; }; sglasso = derive2 { name="sglasso"; version="1.2.4"; sha256="0sdarn39857405ndmqyka5ksvwczb5ifl5aap96wpm625iz2a1pi"; depends=[igraph Matrix]; }; - sglg = derive2 { name="sglg"; version="0.1.6"; sha256="1cm6s32bvs0ysh9q3b1da438q0asa7a10zd3nbj0v1ycg8k7ghcm"; depends=[AdequacyModel Formula ggplot2 gridExtra moments pracma ssym survival]; }; + sglg = derive2 { name="sglg"; version="0.1.8"; sha256="0dh55164kbd83bd5k7qlla041s5wl7y33csdsp5vmrjwxs357hb2"; depends=[AdequacyModel Formula ggplot2 gridExtra moments pracma survival]; }; sglr = derive2 { name="sglr"; version="0.7"; sha256="11gjbvq51xq7xbmpziyzwqfzf4avyxj2wpiz0kp4vfdj3v7p4fp9"; depends=[ggplot2 shiny]; }; sgmcmc = derive2 { name="sgmcmc"; version="0.2.5"; sha256="0lq79c7i6bklh8c63wx3k6h9mk8s1abbr0hc41drcm96bbbg0aal"; depends=[reticulate tensorflow]; }; sgmodel = derive2 { name="sgmodel"; version="0.1.1"; sha256="1i13vp91i8s61ylsyg0iij1sfclwif7v91slr2srl8ddz6lm23nx"; depends=[ggplot2 ramify Rtauchen]; }; sgof = derive2 { name="sgof"; version="2.3.2"; sha256="020kc6h9iw4qhb9pdi7wk8vcy54dp10x0z3nlq3gwwbj1l9izc44"; depends=[poibin]; }; - sgpv = derive2 { name="sgpv"; version="1.0.0"; sha256="14zcny43zz5ai63091pvc31x45nfjbps5p0vv2l1b5pjiwds2164"; depends=[]; }; + sgpv = derive2 { name="sgpv"; version="1.1.0"; sha256="0w0slnnw239a34c0h7xr76c4m0rfwl0hq61g9n12vzxd6lfh3gqz"; depends=[]; }; sgr = derive2 { name="sgr"; version="1.3"; sha256="0zxmrbv3fyb686hcgfy2w1w2jffxf41ab8yc90dsgf931s9c55wn"; depends=[MASS]; }; sgt = derive2 { name="sgt"; version="2.0"; sha256="0qb3maj5idwafs40fpdfrwzkadnh5yg8fvfzfs51p9yy69kbmlkx"; depends=[numDeriv optimx]; }; shades = derive2 { name="shades"; version="1.4.0"; sha256="1zg95sjhrfvbdlfc387g9p0vnb8nb6agdk1mb3wq3kwkm2da0bqj"; depends=[]; }; - shadow = derive2 { name="shadow"; version="0.6.7"; sha256="062yp600a15pnc8r5b7bx0lbb2g3nyfjn07ayn189jl5jnhxip38"; depends=[raster rgeos sp]; }; + shadow = derive2 { name="shadow"; version="0.7.0"; sha256="04lgl6np880i564sabz9s9sykijk0q0na0pnhgbnw1zqxznxl42i"; depends=[raster rgeos sp]; }; shadowtext = derive2 { name="shadowtext"; version="0.0.7"; sha256="1s1ip8zfr684a3ld7hvf524bhn2j31k6d1wbhh1ni0flsggv2ckf"; depends=[ggplot2 scales]; }; - shallot = derive2 { name="shallot"; version="0.4.9"; sha256="0zmai0h3xgdi1fmmfh7jcvzl5ibmj5c86p9rzfh3wdlyqrc3hz1a"; depends=[commonsMath rscala salso]; }; - shape = derive2 { name="shape"; version="1.4.4"; sha256="0hadk3mapkhbh8xjkiz52vxdagmmgvm15xwpzb90ikw4giyipjzl"; depends=[]; }; + shallot = derive2 { name="shallot"; version="0.4.10"; sha256="05ciafpahcrsh9kwg1yqwbmanvkbv1i1cjjpvq3w4cdqkhn4fam7"; depends=[commonsMath rscala]; }; + shape = derive2 { name="shape"; version="1.4.5"; sha256="17qqhjyfhxv9la07ykaslb50c8g4d0cgfypx4y91h9i2yjw7jjh9"; depends=[]; }; shapeR = derive2 { name="shapeR"; version="0.1-5"; sha256="17fq4gsdvyniq7n4x1xdvb5kk50184i7why3pdf1djjhknym087j"; depends=[gplots jpeg MASS pixmap vegan wavethresh]; }; shapefiles = derive2 { name="shapefiles"; version="0.7"; sha256="08ghndihs45kylbzd9wnxffn8ixvxjhjnjldjyd526ai2sj8xcgf"; depends=[foreign]; }; shapes = derive2 { name="shapes"; version="1.2.5"; sha256="0gfpdydfysp5mwg7qmkn73s67gvh2szb40mzqrx97h41ijgcgd8s"; depends=[MASS minpack_lm rgl scatterplot3d]; }; - shapper = derive2 { name="shapper"; version="0.1.2"; sha256="0z2ad0hk1gwxbr4kqbk26lzl25hrcifcp92i3am5j6y0ys71dwsx"; depends=[ggplot2 reticulate]; }; + shapper = derive2 { name="shapper"; version="0.1.3"; sha256="1jaj9j894md45611gdrz05n0kfakawf7vlcc3zxhwdh3f7kwz4lp"; depends=[DALEX ggplot2 reticulate]; }; + shapr = derive2 { name="shapr"; version="0.1.3"; sha256="1v0zwmlycrq89g9i8pwa37m200pc2rmscvgqv1lkkigcy1i09h0g"; depends=[condMVNorm data_table Matrix mvnfast Rcpp RcppArmadillo]; }; shar = derive2 { name="shar"; version="1.1"; sha256="157b1pia21qygb7pqb97v8b3bklnfq40xf8y7wg6p2ixkab0ws6c"; depends=[classInt raster Rcpp spatstat]; }; sharpData = derive2 { name="sharpData"; version="1.2"; sha256="0pvaq8i1vrra3d0wf6yyqkbin0zgsd1kvdzh4bfnyps6pzn5k789"; depends=[KernSmooth quadprog]; }; sharpeRratio = derive2 { name="sharpeRratio"; version="1.4.1"; sha256="1sh4lrgj3hmw0pfw5xvvfs2jd8f694vy3ad5krwz4rh76ywja7q0"; depends=[ghyp Rcpp]; }; sharpr2 = derive2 { name="sharpr2"; version="1.1.1.0"; sha256="1r7anfr296l5sbhgry6rb15hlca6mpcm24qssdzz9bckavyfvqgi"; depends=[Matrix mvtnorm]; }; - sharpshootR = derive2 { name="sharpshootR"; version="1.6"; sha256="1kzgxg1w5ajirsif6pgdqyal4aidj6y0q29zhikds4pr9x5sqcs4"; depends=[ape aqp circular cluster curl digest e1071 Hmisc igraph lattice plyr RColorBrewer reshape2 scales soilDB sp stringi vegan]; }; + sharpshootR = derive2 { name="sharpshootR"; version="1.6.5"; sha256="00xwrkls4qlcxdzb6l7a268n6i96xp3ipn96nbc2y7n4cj2635xy"; depends=[ape aqp circular cluster curl digest e1071 Hmisc igraph lattice plyr RColorBrewer reshape2 scales soilDB sp stringi vegan]; }; sharx = derive2 { name="sharx"; version="1.0-5"; sha256="10sfjg6946jfk4051da0w1v89503av40wckqaabr12syf8kn0aw8"; depends=[dclone dcmle Formula]; }; + shattering = derive2 { name="shattering"; version="1.0.4"; sha256="1wafbmmx1xgiqb7zwm67z4868gmsyi1rg1mxlrgszvxalypqb6g7"; depends=[FNN pdist pracma rmarkdown Ryacas slam]; }; shazam = derive2 { name="shazam"; version="1.0.2"; sha256="0v4a2i4fgdj6r2hlrnnn53xm22w9py4psf75i8iyx6nlbbbfbn4q"; depends=[alakazam ape diptest doParallel dplyr foreach ggplot2 igraph iterators kedd KernSmooth lazyeval MASS progress rlang scales seqinr stringi tidyr tidyselect]; }; shelltrace = derive2 { name="shelltrace"; version="3.5.1"; sha256="1xgbavaa26185i6q3907ds3bzq4xrw027x1sw5vsybqrxdz04jiz"; depends=[bmp tiff xlsx]; }; shiftR = derive2 { name="shiftR"; version="1.5"; sha256="18y2qzqx8hd6yph1wnsq4ygm16pcdszynh174xsrxrhvx2h9mi4x"; depends=[]; }; shinipsum = derive2 { name="shinipsum"; version="0.1.0"; sha256="0d94189hmg0bl8x0s8fpba5gcvb95sr9k9lbp3kk8482fc5h147n"; depends=[attempt DT dygraphs ggplot2 magrittr plotly]; }; shiny = derive2 { name="shiny"; version="1.5.0"; sha256="17lf56s2ycnz0amw8r32wrfhxy9zimz5xdysxxbc52c38kx8pjr3"; depends=[commonmark crayon digest fastmap glue htmltools httpuv jsonlite later mime promises R6 rlang sourcetools withr xtable]; }; - shiny_i18n = derive2 { name="shiny.i18n"; version="0.1.0"; sha256="15llwr4yrx6rlk32b92wcq3dn360y5cvy4mh2aqkza9ikcvlhcvv"; depends=[jsonlite yaml]; }; + shiny_i18n = derive2 { name="shiny.i18n"; version="0.2.0"; sha256="0gwdrbdsibffq314pzws2gr74fp701kb3rwdiwxbzzg0pgqpiwp3"; depends=[glue jsonlite R6 rstudioapi shiny stringr yaml]; }; shiny_info = derive2 { name="shiny.info"; version="0.2.0"; sha256="162wvb02z5h1y7xgsyl6wv88zlfmbm1jlnz48f56fyybs54baw41"; depends=[git2r glue shiny]; }; - shiny_router = derive2 { name="shiny.router"; version="0.1.1"; sha256="0biwni6bk39qafvsh8w32crlgm4hf8r9kwkmnlc3w5za2x2fja4c"; depends=[magrittr shiny]; }; - shiny_semantic = derive2 { name="shiny.semantic"; version="0.3.0"; sha256="0kcwkl0rjll8b73g43hk2fclwchr6pl71p632b302zz44vbnvg15"; depends=[htmltools htmlwidgets jsonlite magrittr purrr shiny]; }; + shiny_pwa = derive2 { name="shiny.pwa"; version="0.2.0"; sha256="01nsvz40zazhycpj9kg0pvxink4p0j8iqcw1dzz8zbj54lw3sjk8"; depends=[htmltools readr shiny urltools]; }; + shiny_router = derive2 { name="shiny.router"; version="0.2.0"; sha256="1gy1hk2v1b2zj0aql4f2wy4d3hy2zghd70v04iq9kig5n3qddj2d"; depends=[htmltools magrittr shiny]; }; + shiny_semantic = derive2 { name="shiny.semantic"; version="0.4.0"; sha256="0lwmj0wg4fh92yk0zqjz60da6z5wbn2rxz6vaql3g8yx5djvmbc3"; depends=[glue htmltools htmlwidgets jsonlite magrittr purrr R6 shiny]; }; shinyAce = derive2 { name="shinyAce"; version="0.4.1"; sha256="1m33dfm2kjirvgix7ybv1kbzgjkicdpv411g9c0q3fw6rnyhfxxn"; depends=[jsonlite shiny]; }; shinyBS = derive2 { name="shinyBS"; version="0.61"; sha256="0rhim4mbp4x9vvm7xkmpl7mhb9qd1gr96cr4dv330v863ra2kgji"; depends=[htmltools shiny]; }; + shinyChakraSlider = derive2 { name="shinyChakraSlider"; version="0.1.0"; sha256="1vsbw9dm8ai2w6mfdaksxh13ryh2awajqgkcwcxb99l47h17rvpy"; depends=[htmltools reactR shiny]; }; shinyCyJS = derive2 { name="shinyCyJS"; version="0.0.11"; sha256="1wvrv5hdr74d2a68iwy76ffawmy4mpw0swrngw41zqpjd6hjiyxd"; depends=[htmlwidgets]; }; shinyDND = derive2 { name="shinyDND"; version="0.1.0"; sha256="0nkvz4hmjzmxlzj4vkjrdy8xlbxapg1amk180irgvwicqldi4jpm"; depends=[htmltools shiny]; }; shinyEffects = derive2 { name="shinyEffects"; version="0.1.0"; sha256="03fm2i1ydlp90w299nvz7dqs9724g0m2f0bc44ni8m2gz9cfpccs"; depends=[htmltools shiny shinydashboard]; }; - shinyEventLogger = derive2 { name="shinyEventLogger"; version="0.1.1"; sha256="1piycfg9j0dg3fgq9f88gs7zvhldmrzn7ggy2ijbh6r7iwipwgdm"; depends=[bupaR jsonlite mongolite purrr R_utils shiny stringr]; }; - shinyFeedback = derive2 { name="shinyFeedback"; version="0.2.0"; sha256="1sg7nrcf55vjkh289x10ln9xbjv5ybhf8g5j6b9vybgcm4blvwyr"; depends=[htmltools jsonlite shiny]; }; - shinyFiles = derive2 { name="shinyFiles"; version="0.8.0"; sha256="0gwyx37f2r86cldsyknws9pafpj8g5mg3mchlyl9ymgnk5f4b88w"; depends=[fs htmltools jsonlite shiny tibble]; }; + shinyFeedback = derive2 { name="shinyFeedback"; version="0.3.0"; sha256="0cqp3a2nngbvrr04ajavnmpbr366zb11iwni4fs8v6ymx8v1wmd7"; depends=[htmltools jsonlite shiny]; }; + shinyFiles = derive2 { name="shinyFiles"; version="0.9.0"; sha256="0rsijlx16vd74r7bd8s9zipy71kgpw19v9s85kxj5bmwc6njmbai"; depends=[fs htmltools jsonlite shiny tibble]; }; shinyHeatmaply = derive2 { name="shinyHeatmaply"; version="0.2.0"; sha256="1n7c7dvvb9kqay2phcf0bkwi990x1cjl7js6pq05xx7rli5bc5h4"; depends=[dplyr heatmaply htmltools plotly readxl rmarkdown shiny xtable]; }; shinyKGode = derive2 { name="shinyKGode"; version="1.0.5"; sha256="004zwz4kqfijzvvwkq8v1gi25w1wrdlg8230g93w36gbi6cl2vk1"; depends=[ggplot2 gridExtra KGode mvtnorm pracma pspline reshape2 shiny shinyjs XML]; }; shinyKnobs = derive2 { name="shinyKnobs"; version="0.1.3"; sha256="1rxlvq4vr87krf7d6mpx0y53hyz8q1jnx6nv7mlhc1ck13q6fgac"; depends=[htmltools shiny]; }; shinyLP = derive2 { name="shinyLP"; version="1.1.2"; sha256="1sjcll10ciq6pj9h8c6ybjqp8763wc423hddlalcblxxpajf6avz"; depends=[shiny]; }; - shinyML = derive2 { name="shinyML"; version="0.2.0"; sha256="1x7fshfq85cbaydhhqx1lcfybv6qlrc6rmajsbcvvnbnbp1m5ysb"; depends=[data_table dplyr DT dygraphs ggplot2 h2o plotly shiny shinycssloaders shinydashboard shinyWidgets sparklyr tidyr]; }; - shinyMatrix = derive2 { name="shinyMatrix"; version="0.3.0"; sha256="0gakbwfrqyxbm946rgxk3xc4qh4i3631hg8q37058ji63bxqzadc"; depends=[jsonlite shiny]; }; + shinyML = derive2 { name="shinyML"; version="1.0.0"; sha256="157p75ba3xhgid5kbdph1fclvk0691n98rad4nwr5hdp8ahq7rcv"; depends=[argonDash argonR data_table dplyr DT dygraphs ggplot2 h2o lifecycle lubridate plotly shiny shinycssloaders shinydashboard shinyjs shinyWidgets sparklyr tidyr]; }; + shinyMatrix = derive2 { name="shinyMatrix"; version="0.4.0"; sha256="1fyrh25d8x61dkgbxlgm70nlr77far34kf8af3phqnhmdxjjrpdj"; depends=[jsonlite shiny]; }; + shinyMergely = derive2 { name="shinyMergely"; version="0.1.0"; sha256="04bzrg4n0s3izm3aa2jb141ikvf7gn3qmbjajqcms1i9zyw12y4s"; depends=[shiny]; }; shinyMobile = derive2 { name="shinyMobile"; version="0.7.0"; sha256="1yrqwrz8ml6wssk0zi8wr4cpmff2d1g3msx0sv8k6mzyknl9d489"; depends=[htmltools jsonlite magrittr shiny]; }; shinyMolBio = derive2 { name="shinyMolBio"; version="0.2"; sha256="09lq5pvis450il1agcq5n9cilnq84rfv08w2dz1d0bbq1qgrgnvg"; depends=[checkmate dplyr plotly purrr RColorBrewer RDML shiny stringr whisker]; }; + shinyMonacoEditor = derive2 { name="shinyMonacoEditor"; version="1.1.0"; sha256="12inzz9vrxi1465l82fafjva198qxyzwailx1s0fm58cqzhnqxr6"; depends=[shiny]; }; shinyNotes = derive2 { name="shinyNotes"; version="0.0.1"; sha256="1l0nw6xac410109jrr88a62a5fhv6h6xaql19bp0h8qxyc2fppjh"; depends=[DBI dbplyr dplyr magrittr RSQLite shiny shinyjs shinyWidgets stringr]; }; shinyRGL = derive2 { name="shinyRGL"; version="0.1.0"; sha256="07llg1yg5vmsp89jk60ly695zvxky6n06ar77mjxzlyc294akwmy"; depends=[rgl shiny]; }; - shinySIR = derive2 { name="shinySIR"; version="0.1.1"; sha256="0m8ff5535hy5b363l4xkrdsm3m7mnfdb23h2wgqmysdv4af1gm2i"; depends=[deSolve dplyr ggplot2 shiny tidyr]; }; + shinySIR = derive2 { name="shinySIR"; version="0.1.2"; sha256="1g2xcm0n7chswrnw9zq3wz6mimzzf6avhkp1rcd24ga809346jcd"; depends=[deSolve dplyr ggplot2 shiny tidyr]; }; shinySearchbar = derive2 { name="shinySearchbar"; version="1.0.0"; sha256="1v80380vym31aw0i1ghwlbdi2xkf3n59w2as62ywqi79025x3w6y"; depends=[jsonlite shiny]; }; shinyShortcut = derive2 { name="shinyShortcut"; version="0.1.0"; sha256="101wz9s4rk7fbaqgm0r2v3v8za20vdxwq4vhkz8xr7y5pr65sxiq"; depends=[]; }; shinyTime = derive2 { name="shinyTime"; version="1.0.1"; sha256="1d830wf7d5ki7frbr1vgy9d0vllyfcylq7pfkspjkz64b2xfhah3"; depends=[htmltools shiny]; }; shinyTree = derive2 { name="shinyTree"; version="0.2.7"; sha256="0jfx2capckv7hf2yx3fn8i4rcmhi222ah91jnmhg497x8wgz31s3"; depends=[htmlwidgets jsonlite promises shiny stringr]; }; - shinyWidgets = derive2 { name="shinyWidgets"; version="0.5.3"; sha256="16nbmyr1pz6splv7z56ampmxilg5qizzagg853pwh10ykdj8bczv"; depends=[htmltools jsonlite shiny]; }; + shinyWidgets = derive2 { name="shinyWidgets"; version="0.5.4"; sha256="107gqf5ijwyma7np736imkv1hg82n2hv9mnrfd2j08rhpgjny3q2"; depends=[htmltools jsonlite shiny]; }; shinyaframe = derive2 { name="shinyaframe"; version="1.0.1"; sha256="1flhgsm4q7p5acb41v73pf8ni92y9dwdppxjb9czlz1sxwf03p1s"; depends=[htmltools htmlwidgets shiny]; }; - shinyalert = derive2 { name="shinyalert"; version="1.1"; sha256="1pnvdwxpx05srll61l8af4b1l5kpcw4wmvjiiz14gsx3baflnwxm"; depends=[digest shiny]; }; + shinyalert = derive2 { name="shinyalert"; version="2.0.0"; sha256="0b392nb6vknbc88dqbkymxs7gcjd5cm2312dw7jwvmmwh8949wm7"; depends=[htmltools shiny uuid]; }; shinyanimate = derive2 { name="shinyanimate"; version="0.3.0"; sha256="0vshid5mfq006cprjj61d0g7ajyc3plc66x55c5jjmijwbp6pw7a"; depends=[shiny]; }; shinybootstrap2 = derive2 { name="shinybootstrap2"; version="0.2.1"; sha256="17634l3swlvgj1sv56nvrpgd6rqv7y7qjq0gygljbrgpwmfj198c"; depends=[htmltools jsonlite shiny]; }; - shinybrms = derive2 { name="shinybrms"; version="1.3.0"; sha256="1jkwwfls85n10hrsx6nlif8zbnxvvs4hmd6lr82gcqk4qclxy24k"; depends=[brms rstan shiny]; }; - shinybusy = derive2 { name="shinybusy"; version="0.2.0"; sha256="1zhi4nfnwwxn25r47fa8c5dq0wfvxmmdzrr8vfiq3qjj46bi1alf"; depends=[htmltools htmlwidgets jsonlite shiny]; }; + shinybrms = derive2 { name="shinybrms"; version="1.5.0"; sha256="0lyaqzlmg7msf72kpywjzpj7pqs6fnxklnl219csv47jy7wm1lk7"; depends=[brms rstan shiny]; }; + shinybusy = derive2 { name="shinybusy"; version="0.2.2"; sha256="06vfkv382xcpjh30i7d4ym4vyravadp5vjsvrnw4npy0302pdmzl"; depends=[htmltools htmlwidgets jsonlite shiny]; }; shinycssloaders = derive2 { name="shinycssloaders"; version="1.0.0"; sha256="0r3xm273lhdhzbs2mkgw1m2kwb7z1dh1pzya8yxy5vacda1l2ikl"; depends=[digest glue shiny]; }; shinycustomloader = derive2 { name="shinycustomloader"; version="0.9.0"; sha256="1klx71vr26g0gjf6hbiia1qidqii5d467i1sdjvlrg1hxdcggqff"; depends=[glue shiny]; }; shinydashboard = derive2 { name="shinydashboard"; version="0.7.1"; sha256="0khac8b27q3swdw07kl609hm0fjfjsjv591b388q99mqqr2rk92i"; depends=[htmltools promises shiny]; }; shinydashboardPlus = derive2 { name="shinydashboardPlus"; version="0.7.5"; sha256="0g0cw07z7dlpc7q2abis0cdgwk6vlya0im5lxai82v21r60i5biy"; depends=[htmltools shiny shinydashboard]; }; shinydisconnect = derive2 { name="shinydisconnect"; version="0.1.0"; sha256="14m83y1iv7qvs1hilc0d18q46qnsciflypgm4dsj7vlvh7ilpdvm"; depends=[checkmate glue htmltools shiny]; }; + shinydlplot = derive2 { name="shinydlplot"; version="0.1.3"; sha256="1mvhx8f5800d33vl9kgs5mib003aqshb8vgfy9h4qlgxyx35zssk"; depends=[htmltools htmlwidgets plotly shiny shinyBS shinyjs]; }; + shinyfilter = derive2 { name="shinyfilter"; version="0.1.0"; sha256="0gsyfx13lc6a27jwxq3fkvl5szla4hs1rwjiwj13mz0rcc6ly836"; depends=[reactable shiny shinyBS shinyjs stringr]; }; + shinyfullscreen = derive2 { name="shinyfullscreen"; version="1.0.0"; sha256="107np0i617ldw0iayw7wqcnrh7szva7zxl915qmj75kh8i7q1fn1"; depends=[jsonlite shiny]; }; shinyglide = derive2 { name="shinyglide"; version="0.1.2"; sha256="0i98k3gl83kfzp3vs1his05idhwj1n0bw98ik7d62cgn4rqi6ar4"; depends=[htmltools shiny]; }; shinyhelper = derive2 { name="shinyhelper"; version="0.3.2"; sha256="1c4hvf19j3yyh8r12nx85ldkxs89g98q74csnqs5ml5l79a65vgp"; depends=[markdown shiny]; }; shinyhttr = derive2 { name="shinyhttr"; version="1.1.0"; sha256="1snrl7bg1bc5jxqs1c5a2ir6qnf1nq576aigk19k0ms4gb9hh66m"; depends=[httr shinyWidgets]; }; shinyjqui = derive2 { name="shinyjqui"; version="0.3.3"; sha256="0n4ijxmkp8x6dwrsxwvx0zgd8b5129cmn6q6rrav38v1q5k8889x"; depends=[htmltools htmlwidgets jsonlite shiny]; }; - shinyjs = derive2 { name="shinyjs"; version="1.1"; sha256="14k8y313ppj23m9rhlk8jc94x6sbn3qrsnx6xrijiyv8m8dii1l9"; depends=[digest htmltools jsonlite shiny]; }; + shinyjs = derive2 { name="shinyjs"; version="2.0.0"; sha256="1zzq356dvd8ciajy6r5n4ybgx9xk7ydwv25j86xlcsqznkxdkkf2"; depends=[digest htmltools jsonlite shiny]; }; shinyloadtest = derive2 { name="shinyloadtest"; version="1.0.1"; sha256="0k9b57wm2cv78qf9qryqr1s0p7gsncn8axd285f6rrayg4czb40l"; depends=[curl dplyr getPass ggplot2 glue gtable htmltools httpuv jsonlite lubridate magrittr progress R6 readr rlang rmarkdown scales stringr svglite tibble websocket xml2]; }; shinylogs = derive2 { name="shinylogs"; version="0.1.7"; sha256="1b4p0g1vf9wn643rybf382mw6mrrl49qsykh7npa3agcarwznmgr"; depends=[anytime bit64 data_table DBI digest htmltools jsonlite nanotime RSQLite shiny]; }; - shinymanager = derive2 { name="shinymanager"; version="1.0.200"; sha256="00dvzcpba4awmdgy8wcn8h7qdc8mdrfaq3kp28h509xn3gax02wn"; depends=[billboarder DBI DT htmltools openssl R_utils R6 RSQLite shiny]; }; - shinymaterial = derive2 { name="shinymaterial"; version="1.1.0"; sha256="1xrbwrw3h1lqqgbfpan6ijddglknc9akxi11yvviz29lxlfphjj8"; depends=[jsonlite sass shiny]; }; + shinymanager = derive2 { name="shinymanager"; version="1.0.300"; sha256="1zv8rrplp3cknyk51m5cfmkr992k9cbjh89pmrbb8c24izqilq2a"; depends=[billboarder DBI DT htmltools openssl R_utils R6 RSQLite scrypt shiny]; }; + shinymaterial = derive2 { name="shinymaterial"; version="1.2.0"; sha256="0nqakim0cx722sydbv12kgva1nis7h2i0lrvi9c0h54733x7lbza"; depends=[jsonlite sass shiny]; }; shinyobjects = derive2 { name="shinyobjects"; version="0.2.0"; sha256="0fg5gyssia2fqar635vrqgfwpfrk4pqachsgg10y13ljp09lcdm3"; depends=[dplyr glue knitr magrittr pander purrr readr rlang rstudioapi shiny stringr styler tibble tidyr]; }; + shinypanel = derive2 { name="shinypanel"; version="0.1.2"; sha256="09wfn46z4n96696n7zlbvm5ai2ii2vyvmsjfswqv33sp8f3c4p95"; depends=[htmltools jsonlite shiny shinyBS shinyjs]; }; shinypanels = derive2 { name="shinypanels"; version="0.5.0"; sha256="1rslz9wl3gx11dm6il77j4k5swxvcfy5mf0zffbs4zk8xjgpzzj6"; depends=[glue htmltools shiny shinyjs]; }; shinyr = derive2 { name="shinyr"; version="0.2.6"; sha256="16bknhab23by0h1b6c9q6rzyzyqnrcjhpsgw0gv427jycap9b0vv"; depends=[caret corrplot DMwR dplyr e1071 knitr nnet plotly randomForest RColorBrewer shiny shinydashboard tm wordcloud]; }; shinyrecap = derive2 { name="shinyrecap"; version="0.1.0"; sha256="1mic7azxz2in67g3a2ir550w8psh6kc75p6hja6m62a0yy7j2n92"; depends=[CARE1 coda conting dga future ggplot2 ipc LCMCR promises Rcapture reshape shiny shinycssloaders testthat]; }; shinyrecipes = derive2 { name="shinyrecipes"; version="0.1.0"; sha256="1b4l27qsl1lpssh3jv1pqmw2mq8hanfj0m269yp5618nd5nxd2ck"; depends=[dplyr DT esquisse miniUI purrr recipes rstudioapi shiny shinyglide shinyWidgets sortable stringr tidyr]; }; shinyreforms = derive2 { name="shinyreforms"; version="0.0.1"; sha256="1g1blc57c6zkca0m52bqkw8jwgpplabns07x1cwkk46dmv6sgqci"; depends=[htmltools R6 shiny]; }; + shinyscreenshot = derive2 { name="shinyscreenshot"; version="0.1.0"; sha256="0s0rq6v6dkh6n5dvjzayjmh9jzjndf4d3zixaya9skv22z5gcj0y"; depends=[jsonlite shiny uuid]; }; shinyservicebot = derive2 { name="shinyservicebot"; version="0.1.0"; sha256="18xbggiai6ssyl3q0nqhnszxb7zlbffaw0iy3r7vbzswzqx522la"; depends=[digest htmltools htmlwidgets shiny]; }; shinystan = derive2 { name="shinystan"; version="2.5.0"; sha256="18alf5kiqw7y2l6m5nxxizwc2znsf9frxfsqhvgcad8hld9cbya5"; depends=[bayesplot colourpicker DT dygraphs ggplot2 gridExtra gtools markdown reshape2 rsconnect rstan shiny shinyjs shinythemes threejs xtable xts]; }; shinytest = derive2 { name="shinytest"; version="1.4.0"; sha256="1kgj6izhj385vlw59agdgq1knvjyaawpghsnfmbixsmlzfr3jpzn"; depends=[assertthat callr crayon debugme digest htmlwidgets httpuv httr jsonlite parsedate pingr R6 rematch rstudioapi shiny testthat webdriver withr]; }; shinythemes = derive2 { name="shinythemes"; version="1.1.2"; sha256="12miz44n2zxfswnia7p8dirxj3miw0aqn4pkx2111ikz67ax84rf"; depends=[shiny]; }; shinytoastr = derive2 { name="shinytoastr"; version="2.1.1"; sha256="01j2z4gf1wxblrjayykwxdr2s8394i7k930x8g4hmrj7c9pv264n"; depends=[shiny]; }; shinyypr = derive2 { name="shinyypr"; version="0.0.2"; sha256="1k6jsw6gnpwk90hkpa9grki0b68cab57vbd0h6ldjqr11giwcz8z"; depends=[bsplus chk dplyr DT ggplot2 lifecycle magrittr purrr readr shiny shinyjs waiter ypr]; }; - shipunov = derive2 { name="shipunov"; version="1.11"; sha256="00kd971ip0j7ind53qsm3vbdd6lffz8zwa4jfnivn24z9asrkama"; depends=[PBSmapping]; }; + shipunov = derive2 { name="shipunov"; version="1.12"; sha256="13gzp3l06a3ayly4qrfjn70669vlm8rxsgx6iwhcm5qnmz3vi2xn"; depends=[PBSmapping]; }; shock = derive2 { name="shock"; version="1.0"; sha256="11m52al591xjznl62q1waxsg5m1a1afmd0yqcc5zsjlrplykg4lp"; depends=[capushe GGMselect glasso igraph mvtnorm]; }; shopifyr = derive2 { name="shopifyr"; version="1.0.0"; sha256="05hih1v5vvr7vmwarizsdx8517g74s96fdsz3klcz3g12idx1nqn"; depends=[curl jsonlite R6]; }; shortcuts = derive2 { name="shortcuts"; version="1.4.0"; sha256="0y77napfz1v3s667cmyn8357xg5lncbw1hc3hm5kra6nalhq1jps"; depends=[rstudioapi]; }; - shorts = derive2 { name="shorts"; version="1.1.0"; sha256="1nnzi4im8qv45zyrsdp8la68rm98fmvral57kvpkbbs8kasa9mda"; depends=[LambertW nlme]; }; - shotGroups = derive2 { name="shotGroups"; version="0.7.5.1"; sha256="0il6hlv2hnfx5rmj3vk3q9p24xqii77z6hdz5fsgyh4i3kgcyrjy"; depends=[boot coin CompQuadForm KernSmooth robustbase]; }; + shorts = derive2 { name="shorts"; version="1.1.4"; sha256="17wb6awfcvfx76cbrj67v7lklkf1dbwivy55cl83vy6xnbxiw4j1"; depends=[ggplot2 LambertW nlme tidyr]; }; + shotGroups = derive2 { name="shotGroups"; version="0.7.5.2"; sha256="11l71difk2vyjb4ypp8y2yvfqxx57p0lvbxxzr6r3qwyr70aivln"; depends=[boot coin CompQuadForm KernSmooth robustbase]; }; showimage = derive2 { name="showimage"; version="1.0.0"; sha256="1c0x3iqjdjsz3cdhc02b3qm2pwxjr1q2k87jwvxj9lnzzw81f1pl"; depends=[png]; }; - showtext = derive2 { name="showtext"; version="0.9"; sha256="11fx2vv8jlvcnybh18y7v4bn2c67aqsqwfq7y8dpywbwr4zg8jid"; depends=[showtextdb sysfonts]; }; + showtext = derive2 { name="showtext"; version="0.9-1"; sha256="1hq346k2lm7rv49hw7srn3ab5gcp6b0r4zc1kgsdmswyh3q1asra"; depends=[showtextdb sysfonts]; }; showtextdb = derive2 { name="showtextdb"; version="3.0"; sha256="0hlnc3fhgrdkd46n7hb6id0gg1v0bf8s4679nrr7rchyp455szq2"; depends=[sysfonts]; }; shp2graph = derive2 { name="shp2graph"; version="0-5"; sha256="1l9mg98hkb0bvr5dzd2p26g8mw5hqjxrym2gmbm10kyapvccfk56"; depends=[igraph maptools sp]; }; shrink = derive2 { name="shrink"; version="1.2.1"; sha256="0pd967wsys8fd7gyvr9y08km118yamfk5c1a1i2k8nr2ifpqmy0w"; depends=[MASS mfp rms survival]; }; - shrinkTVP = derive2 { name="shrinkTVP"; version="1.1.1"; sha256="0dl6dpbjq6ykh813344qs3n6kp8xgif354wjz7lzv1ik4kl3a71s"; depends=[coda GIGrvg Rcpp RcppArmadillo RcppProgress stochvol zoo]; }; + shrinkTVP = derive2 { name="shrinkTVP"; version="2.0.1"; sha256="114b59lgn048sg5zs1shwgzh7q55dcgnhs3y1cd1wl77r3kpy3vs"; depends=[coda GIGrvg Rcpp RcppArmadillo RcppProgress stochvol zoo]; }; shuffle = derive2 { name="shuffle"; version="1.0.1"; sha256="0aqb11h340picx7z2jg3k46l3pr6fkknlpyzc0z89hhrc90pss48"; depends=[]; }; shuffleCI = derive2 { name="shuffleCI"; version="0.1.0"; sha256="1n9k28m1fcnw1my9a7v0gy9waygd48lab45vj9k2wwijbc325zai"; depends=[plotrix]; }; shutterstock = derive2 { name="shutterstock"; version="0.1.0"; sha256="1vqbrjbwl2gdcf607f51cdzkjbkmk11n08mzx01j7bwcd278ny8r"; depends=[httr jsonlite]; }; @@ -14205,17 +14811,17 @@ in with self; { sigclust = derive2 { name="sigclust"; version="1.1.0"; sha256="0151v7lr4n4yyn93j0s06gzc9jh9xhdgvfw6kvpfy24jl6wdii7g"; depends=[]; }; sigmaNet = derive2 { name="sigmaNet"; version="1.1.0"; sha256="1i0xikwad9kiyrqxi1klkc4h4hyqfkxr388sw4mrx9pswfpbv3xr"; depends=[htmlwidgets igraph jsonlite RColorBrewer]; }; sigmajs = derive2 { name="sigmajs"; version="0.1.5"; sha256="1d26llpgnj687b8rwgbyhw88zakp334n4a9gabf72qwrg4awm1v5"; depends=[crosstalk dplyr htmltools htmlwidgets igraph jsonlite magrittr purrr scales shiny]; }; - sigminer = derive2 { name="sigminer"; version="1.0.7"; sha256="0ncxlj4z8hds7h4rj0nw6rvgjacgkqkhxh6y8m39rwalmdny6mlx"; depends=[cli cowplot data_table dplyr foreach furrr future ggplot2 ggpubr maftools magrittr NMF purrr rlang tidyr]; }; + sigminer = derive2 { name="sigminer"; version="1.1.0"; sha256="1jw40x5bq2ra7jypid82hsf087vi7hdanc5pagl8y4ginhy929l1"; depends=[cli cowplot data_table dplyr foreach furrr future ggplot2 ggpubr maftools magrittr NMF purrr Rcpp rlang tidyr]; }; sigmoid = derive2 { name="sigmoid"; version="0.3.0"; sha256="1sa6nmip3fizdk3r47pvx0h3qldn267arpmid0wa1pb7k5j2g682"; depends=[]; }; signal = derive2 { name="signal"; version="0.7-6"; sha256="1vsxramz5qd9q9s3vlqzmfdpmwl2rhlb2n904zw6f0fg0xxjfq3b"; depends=[MASS]; }; signalHsmm = derive2 { name="signalHsmm"; version="1.5"; sha256="1d4v6cbvcbi8pb5zmn58s01h3jb0kv7yr7qvcnx4p2v82knvhik7"; depends=[Rcpp seqinr shiny]; }; signmedian_test = derive2 { name="signmedian.test"; version="1.5.1"; sha256="05n7a4h2bibv2r64cqschzhjnm204m2lm1yrwxvx17cwdp847hkm"; depends=[]; }; - signnet = derive2 { name="signnet"; version="0.6.0"; sha256="0bwa58svkgf2z06m8kg4g37px57l1kmhx84ps5qshl4699a3v1gx"; depends=[igraph Matrix Rcpp RcppArmadillo]; }; + signnet = derive2 { name="signnet"; version="0.7.0"; sha256="145wfpgxrx81rrx20nakf43wvhy3gzcshlr532y1idgba2kdw2fr"; depends=[igraph Matrix Rcpp RcppArmadillo]; }; signs = derive2 { name="signs"; version="0.1.2"; sha256="0dzf5pydvs93rvj6idw9l2asv1bxwz20df7qis2db84hfww2kc6m"; depends=[rlang scales]; }; sigora = derive2 { name="sigora"; version="3.0.5"; sha256="1240q42kpb4l1idanywzal7c85kp3ncdl5m2irh8qs5xrs02gdc7"; depends=[]; }; - sigr = derive2 { name="sigr"; version="1.0.8"; sha256="04a68rd5ywxbl4dca026criqr314y367lh6i7k7qnrbsgzhgsb4l"; depends=[wrapr]; }; - siland = derive2 { name="siland"; version="2.0"; sha256="0g06adzydvrw7vq2a78m4lw1vc2k28mp2pj5q20629yknpv54ffr"; depends=[fasterize ggforce ggplot2 lme4 raster reshape2 sf sp]; }; - silicate = derive2 { name="silicate"; version="0.6.1"; sha256="17jrnbh578l5dlp9ndxlxa7q91x3cwk3czix4613vgkrkdjjqwld"; depends=[crsmeta decido dplyr gibble gridBase magrittr purrr rlang tibble unjoin]; }; + sigr = derive2 { name="sigr"; version="1.1.3"; sha256="19hcxk6iksfjyc4qch4sw0rgn54salirw7a0bap9c53nxzrj8bl4"; depends=[wrapr]; }; + siland = derive2 { name="siland"; version="2.0.4"; sha256="02cj3hw755253p28sxzh92qj7jwl7dffs3kibis1ij52h7wlaw38"; depends=[fasterize ggforce ggplot2 lme4 raster reshape2 sf sp]; }; + silicate = derive2 { name="silicate"; version="0.7.0"; sha256="1x8l6wvymx3scwzym9h6b5wgprjinzp6m2cs6r7xn9aqcr39499a"; depends=[crsmeta decido dplyr gibble gridBase magrittr purrr rlang tibble unjoin]; }; sim1000G = derive2 { name="sim1000G"; version="1.40"; sha256="1avq6xfc34izavvp9vb5ccc2b9nc4m7cwr06ygnsmpgwi5nswbb8"; depends=[hapsim MASS readr stringr]; }; sim2Dpredictr = derive2 { name="sim2Dpredictr"; version="0.1.0"; sha256="0q1l75h1dcxnd60lcmf4sny1ywidfmm0yv9ylkb3yc13v469167i"; depends=[car dplyr ggplot2 magrittr MASS matrixcalc Rdpack spam tibble tidyverse]; }; simEd = derive2 { name="simEd"; version="1.0.3"; sha256="1yq0qblrz0zddx682rzwdaa0k0r223i123la7wbp73spnn38g4br"; depends=[rstream]; }; @@ -14227,14 +14833,14 @@ in with self; { simMP = derive2 { name="simMP"; version="0.17.3"; sha256="1pzg79dd08ds3pfzxnk9h95gaibicv00mnm0jb4i8v5is4gzrdhr"; depends=[Biostrings BSgenome doParallel foreach GenomeInfoDb GenomicRanges IRanges XVector]; }; simMSM = derive2 { name="simMSM"; version="1.1.41"; sha256="04icijrdc269b4hwbdl3qz2lyxcxx6z63y2wbak1884spn6bzbs8"; depends=[mvna survival]; }; simPATHy = derive2 { name="simPATHy"; version="0.4"; sha256="1blvgaadp7iz0mcgax2xc8wa7aa9f82q09qym1wl8xdv01m29b80"; depends=[ggm graph gRbase htmlwidgets igraph mvtnorm qpgraph R_utils shiny shinydashboard]; }; - simPH = derive2 { name="simPH"; version="1.3.12"; sha256="08hyv1v197cdysrdxi9x9944hmypvw7zxw2f7qdd870sibsdxjda"; depends=[data_table dplyr ggplot2 gridExtra lazyeval MASS mgcv quadprog stringr survival]; }; - simPop = derive2 { name="simPop"; version="1.2.0"; sha256="05f1azdz202bap4pkqxiacj7wqkbmw3naw6p7xgmvx8nlh5xl40h"; depends=[colorspace data_table doParallel e1071 EnvStats fitdistrplus foreach laeken lattice MASS nnet party plyr ranger Rcpp RcppArmadillo vcd VIM wrswoR]; }; + simPop = derive2 { name="simPop"; version="1.2.1"; sha256="1rpjyffs7s40wlyv77ha6r282p08kp7x252nfiasbgxp5c7x17i0"; depends=[colorspace data_table doParallel e1071 EnvStats fitdistrplus foreach laeken lattice MASS nnet party plyr ranger Rcpp RcppArmadillo vcd VIM wrswoR]; }; simSummary = derive2 { name="simSummary"; version="0.1.0"; sha256="1ay2aq6ajf1rf6d0ag3qghxpwj0f8b3fhpr2k0imzmpbyag1i3gj"; depends=[abind gdata svUnit]; }; simTargetCov = derive2 { name="simTargetCov"; version="1.0.1"; sha256="0gdqqwg9i2hga6l4s5x7wbbsm20b3sgwrci1g6hc04x1h9aawiw2"; depends=[MASS]; }; - simTool = derive2 { name="simTool"; version="1.1.6"; sha256="141bxad531s76pqlqxyzncaxf1z874vn5fl1263yg9qszi1cblzs"; depends=[dplyr purrr tibble tidyr vctrs]; }; + simTool = derive2 { name="simTool"; version="1.1.7"; sha256="0q093dlfj23zq3w4schn1ycff79vgzr2s3wgbz2qz4s3b7fddk70"; depends=[dplyr purrr tibble tidyr vctrs]; }; simba = derive2 { name="simba"; version="0.3-5"; sha256="14kqxqavacckl5s1518iiwzrmlgbxz1lxy33y8c9qq7xaln41g9h"; depends=[vegan]; }; simboot = derive2 { name="simboot"; version="0.2-6"; sha256="0bgibrqb9j62p1chldi1lvdsgc6sgsr7afyq4lvyrc2h861f3j9d"; depends=[boot mvtnorm]; }; simcdm = derive2 { name="simcdm"; version="0.1.1"; sha256="1qzxxpz3nvqf9801k6zgphv6vd8alf2sf6cvzggk7cz6x5jc3w1r"; depends=[Rcpp RcppArmadillo]; }; + simcross = derive2 { name="simcross"; version="0.3-6"; sha256="1h0j28ah8dxylqjzwv6lfrisw8qm82a5mc5c7lp274fgvj8kr6jq"; depends=[Rcpp]; }; simctest = derive2 { name="simctest"; version="2.6"; sha256="0igwn82zfx6ajv42gpyx6969aldygldkpdc9ik6601511sscvf2a"; depends=[]; }; simdistr = derive2 { name="simdistr"; version="1.0.1"; sha256="16fsj42zr627i57q1q72l1nhin7g6rxq9hfy487hf1ywd6rvns18"; depends=[]; }; simecol = derive2 { name="simecol"; version="0.8-13"; sha256="0641qh5ih1mkbdr0a5qg9i280qkzdvdjyzw56awlv66zqbjqvqq8"; depends=[deSolve minqa]; }; @@ -14242,6 +14848,7 @@ in with self; { simex = derive2 { name="simex"; version="1.8"; sha256="1849wayygyqv0fh1i2qva7ggh2yah2nn0sgbcy9pldxrjq8q9iw0"; depends=[]; }; simexaft = derive2 { name="simexaft"; version="1.0.7.1"; sha256="0n3n2g07pnpcqhbrjf78lbvqvc136g7jxlx6q27vnk96kwizh3f1"; depends=[mvtnorm survival]; }; simfinR = derive2 { name="simfinR"; version="0.2.2"; sha256="16ran6br8n7b7f74a7ayzhkmnhak5z1cwli3s1b1mzdii937k8bb"; depends=[crayon dplyr jsonlite lubridate magrittr memoise purrr]; }; + simfinapi = derive2 { name="simfinapi"; version="0.1.0"; sha256="1g6zi4nj2rkwcd8wnnxc4riqdmf5aarry2jwwsm44i0s4s14z8s8"; depends=[checkmate data_table future_apply httr memoise RcppSimdJson]; }; simglm = derive2 { name="simglm"; version="0.8.0"; sha256="18phhsq5i9xsx4m0qml8jls9zlcnf3nifn24a7mdbr8l7z1ykf04"; depends=[broom dplyr future_apply Matrix purrr rlang]; }; simhelpers = derive2 { name="simhelpers"; version="0.1.0"; sha256="0imrp8zqdpyl466fywkjr4g3h9jzxfk96xrw8prlsvw1xlg6qrmm"; depends=[dplyr furrr future magrittr purrr Rdpack rlang rstudioapi tibble tidyr]; }; simmer = derive2 { name="simmer"; version="4.4.2"; sha256="1zffksln9d77h59lbbqk8lbrjlhvic7ianw1912vj6bsvh5k6jjy"; depends=[BH codetools magrittr Rcpp]; }; @@ -14250,86 +14857,92 @@ in with self; { simml = derive2 { name="simml"; version="0.1.0"; sha256="0j3vv3kp8rl4an6r0vzzn6syzi9h058v9040pshz0hldkhi21pby"; depends=[mgcv plyr]; }; simmr = derive2 { name="simmr"; version="0.4.2"; sha256="0mvckg5jz3fhjrpr97zn4jrcv3pxay53f5cpqy0d92h2lqpsgaff"; depends=[bayesplot boot compositions ggplot2 MASS R2jags reshape2 viridis]; }; simode = derive2 { name="simode"; version="1.2.0"; sha256="0wlnd01xfdqvjfvmkhkj6nvkrnv5ghjv4md5nhaqsjc8bycawyl0"; depends=[deSolve pracma quadprog]; }; - simone = derive2 { name="simone"; version="1.0-4"; sha256="09d8kdg2wxpmjgcn4dk6yqr6nmf7mzqqi6x1rz3fv7qknja6l1xi"; depends=[blockmodels]; }; simpleCache = derive2 { name="simpleCache"; version="0.4.1"; sha256="1prhahphyb4dg9qv813ahpwfngmr9blirb97pvypc5npzvahj5lv"; depends=[]; }; simpleNeural = derive2 { name="simpleNeural"; version="0.1.3"; sha256="01q04807qws870x1qhvlr3bp0dawy8q4bh00psakhln9j9dl1ljm"; depends=[]; }; simplePHENOTYPES = derive2 { name="simplePHENOTYPES"; version="1.2.4"; sha256="08pkz6959zhfg7yd5qyfcwi4p4rzbq8gbm0jmkf15ynpica4kknj"; depends=[data_table gdsfmt lqmm mvtnorm SNPRelate]; }; simpleRCache = derive2 { name="simpleRCache"; version="0.3.2"; sha256="0ldmxa5rw1kcb24swnk8s471ww11jfbscynaahnnsi0zzqmhwirk"; depends=[digest]; }; simpleSetup = derive2 { name="simpleSetup"; version="0.1.0"; sha256="0rbzmixk76b3lgi9m7ijhcl6dha7wbbxfgwdhnp2y338zny6c6rm"; depends=[]; }; simpleboot = derive2 { name="simpleboot"; version="1.1-7"; sha256="0769dmrk8rw5v9598p7xlpawybwsdxnrqkxhavqpzy1vwg885575"; depends=[boot]; }; - simplecolors = derive2 { name="simplecolors"; version="0.1.0"; sha256="08xsha7v9k55fqi9f49j2sh2yz8dm5g99rqcjfd1yrlw2mkcrq6a"; depends=[colorspace dplyr forcats ggplot2 magrittr stringr]; }; + simplecolors = derive2 { name="simplecolors"; version="0.1.1"; sha256="1m0lrvkjqjqq7kynjl8j1cn7kqzfjx6gzgjpjk1gvar2g4ip0a8h"; depends=[colorspace dplyr forcats ggplot2 magrittr stringr]; }; simplegraph = derive2 { name="simplegraph"; version="1.0.0"; sha256="1gcpbljp1fgaprxnmq23izf1h2x3p5dnxlylwqsnlcj50bvm46gq"; depends=[]; }; - simplevis = derive2 { name="simplevis"; version="1.5.0"; sha256="05217g6y59xw53ncy7040jg45h0i0i8yjsv72fkpibc56lc5cn0q"; depends=[dplyr DT forcats ggplot2 htmltools janitor leaflet leaflet_extras leafpop lubridate magrittr plotly readr rgdal rlang rmarkdown scales sf shiny shinycssloaders stars stringr tibble tidyr viridis]; }; + simplevis = derive2 { name="simplevis"; version="2.0.0"; sha256="00nyc9ql3c2072nfc4ai5g0grxnch2yb54m1qr7xvphjb4sdrr4k"; depends=[dplyr DT forcats ggplot2 htmltools janitor jsonlite leaflet leaflet_extras leafpop lubridate magrittr plotly readr rgdal rlang rmarkdown scales sf shiny shinycssloaders stars stringr tibble tidyr viridis]; }; simplexreg = derive2 { name="simplexreg"; version="1.3"; sha256="1zkh00xbddhgz0qn0a5pj12n0hpx4f5kihpfj71x92pmxpzglcxh"; depends=[Formula plotrix]; }; + simplextree = derive2 { name="simplextree"; version="1.0.1"; sha256="18jvzcz4fdsi17j7qdqpjvx6zygvlcvpziikb8qxskaib5180l08"; depends=[magrittr Rcpp]; }; simputation = derive2 { name="simputation"; version="0.2.4"; sha256="16adh97hfszvf934lf8mvwxvx71s7gwhzzhsbqz24zqik20pd6fq"; depends=[gower MASS rpart]; }; simr = derive2 { name="simr"; version="1.0.5"; sha256="1j5w93iliykfnpxl9kzh1rp6d3iy26ksj3j7yjl348yvplh0iyjl"; depends=[binom car iterators lme4 pbkrtest plotrix plyr RLRsim stringr]; }; + simrec = derive2 { name="simrec"; version="1.0.0"; sha256="17zzbzgdisp5qh0vlbmkjf6a3axnpwj2kw03wymfbb3z557pbxlr"; depends=[]; }; simrel = derive2 { name="simrel"; version="2.0.2"; sha256="192yp6njvq9l6yznjhf69da5z1vxl0q3398laimndwnvrpx73pcj"; depends=[FrF2 ggplot2 gridExtra jsonlite magrittr miniUI purrr reshape2 rlang rstudioapi scales sfsmisc shiny testthat tibble tidyr]; }; simsalapar = derive2 { name="simsalapar"; version="1.0-10"; sha256="1q7kh44xl7q48vpqbyrp85my6x97l4fqq36bry8vg3k5riihirzf"; depends=[colorspace gridBase sfsmisc]; }; simsem = derive2 { name="simsem"; version="0.5-15"; sha256="183l6pysssxyhgw3s5gd0319snmvh439cy4xwfdjdwpavb8rrj06"; depends=[lavaan]; }; simsl = derive2 { name="simsl"; version="0.1.0"; sha256="09d6k61c2m0n03xpqvig7310bpgddxl8vzfjgn6wbr21s73b9xis"; depends=[mgcv]; }; - simstandard = derive2 { name="simstandard"; version="0.3.0"; sha256="0fg5y6n5ydn6qxbd5sdbxh3aqj4i7qk7h9c28i3s5z4s9rxgycdj"; depends=[lavaan magrittr mvtnorm purrr rlang tibble]; }; - simstudy = derive2 { name="simstudy"; version="0.1.16"; sha256="0ykwkkhnywqhpnsw4vggxcaqmg2zk8m521p00az7vyavwjgw9289"; depends=[data_table mvnfast mvtnorm Rcpp]; }; + simstandard = derive2 { name="simstandard"; version="0.6.0"; sha256="1kx7mxg2vc4g4grw5pg436haamj7kphqjaqhchrska9rfazqgmni"; depends=[lavaan magrittr mvtnorm purrr rlang tibble]; }; + simstudy = derive2 { name="simstudy"; version="0.2.1"; sha256="0cczfby7l8s0kmb7jzn2bl67i55nwgc4h3vixg9gsfgds32pisfc"; depends=[backports data_table glue mvnfast mvtnorm Rcpp]; }; simsurv = derive2 { name="simsurv"; version="0.2.3"; sha256="0jlacjgrnnlmcl6k83clfkdfb1kr2xbyz2zcmq1f3xg2z0zwypjq"; depends=[]; }; simtimer = derive2 { name="simtimer"; version="4.0.0"; sha256="1c5017xmh4767d75k4rs1pssyn7p5w41bcsjjmwk4c9g6w1jgx1w"; depends=[]; }; simts = derive2 { name="simts"; version="0.1.1"; sha256="1b76grf7c14pgyhphplnil4lkzbwn3dih4pv4xdy721ih9n9llby"; depends=[broom dplyr magrittr purrr Rcpp RcppArmadillo robcor scales tidyr]; }; - simukde = derive2 { name="simukde"; version="1.1.0"; sha256="0g4qb57q1g9ixl70zwiw8y934gcr421xmz4dl515lxzfzk0605fc"; depends=[ks MASS mvtnorm]; }; + simukde = derive2 { name="simukde"; version="1.2.0"; sha256="0rjxamspq1csa08blfmif3lknnrwfcpszwzijp465vz1107si8ac"; depends=[ks MASS mvtnorm]; }; simulator = derive2 { name="simulator"; version="0.2.0"; sha256="18x0c9bf9anbykq9f46fxnnx7g36bh01s4cdmrn7mdygs6ac9c8z"; depends=[magrittr]; }; simule = derive2 { name="simule"; version="1.3.0"; sha256="0jzyk1r2jfs7qivmy9x44c5bagy55jpy3hf0xpl9xnk409c3y2wd"; depends=[igraph lpSolve pcaPP]; }; sinaplot = derive2 { name="sinaplot"; version="1.1.0"; sha256="0zfq6l8wjvdj7rndsfyh0a2xjlxmn2ij1q50hg3xjfpwrjxcsck8"; depends=[plyr]; }; + sinar = derive2 { name="sinar"; version="0.1.0"; sha256="0dywgqmvbrsygyvnln2mc5p6gaxvphr5byx7hkf0nkil54f2jzdf"; depends=[MASS numDeriv]; }; sindyr = derive2 { name="sindyr"; version="0.2.3"; sha256="0dk7zwj5hdr7fcxhdj9klml11sciyaj0v59dfgvnhhkxndwwdbrr"; depends=[arrangements crqa igraph matrixStats plot3D pracma]; }; sinew = derive2 { name="sinew"; version="0.3.8"; sha256="1ggx7wgmgnsv69nnc55mg9g7rzjv5m23sygz7x8q68pybmjr7fc1"; depends=[cli crayon miniUI rematch2 rstudioapi shiny sos stringi yaml]; }; - singleCellHaystack = derive2 { name="singleCellHaystack"; version="0.3.2"; sha256="1nzq7kz1vb3gra80hilmvdlyjy0qda60izrkqprr5bxn1iw8rdx0"; depends=[ggplot2 reshape2]; }; + singcar = derive2 { name="singcar"; version="0.1.1"; sha256="0n3nv9v5nxb26a5idsdh7gyhy7yjw58ki2615d4j80nxx0a780bn"; depends=[CholWishart MASS withr]; }; + singleCellHaystack = derive2 { name="singleCellHaystack"; version="0.3.3"; sha256="0rfs7a3xy70zkqfijy2cyvn16i8kkh2djp48nh7ifr51dkmkgjg1"; depends=[ggplot2 Matrix reshape2]; }; sinib = derive2 { name="sinib"; version="1.0.0"; sha256="08x2a5hn41vcsai3r36w1kgzka4ks53pkp6dxn90bsqh40ydb0db"; depends=[]; }; - sinx = derive2 { name="sinx"; version="0.0.13"; sha256="0699fy1jbi9a7xjmwph4cj833750bw0xg3zvdpn8dwvh6y42m552"; depends=[bookdownplus clipr cowsay crayon jsonlite multicolor pagedown rmsfact rosr xaringan]; }; - siplab = derive2 { name="siplab"; version="1.4"; sha256="1kayskawq9dqwwmk17akl68xw9kwllkmh4i251gdqkfcz61j3bb4"; depends=[spatstat]; }; + siplab = derive2 { name="siplab"; version="1.5"; sha256="1gfncsqgwj7ljm7cik6kmcqynzppqlqlq1f9qpmvzfpf6fd1ccxp"; depends=[spatstat]; }; sirad = derive2 { name="sirad"; version="2.3-3"; sha256="0vhmk2fmq4797gj6c8803zw1ipmdxfvdfgi2bygzxbn5bqd4da2n"; depends=[raster zoo]; }; sirt = derive2 { name="sirt"; version="3.9-4"; sha256="1myj1dpmqzcyxhkyyvva3xwy1aq5d6l37zg9vhfnc3q4h1psc5hm"; depends=[CDM pbv Rcpp RcppArmadillo TAM]; }; - sirus = derive2 { name="sirus"; version="0.2.1"; sha256="04ln1i017qb94gz22in9w36b808a0gxbdildwyfzchf2c92wp5cp"; depends=[ggplot2 glmnet Matrix Rcpp ROCR]; }; + sirus = derive2 { name="sirus"; version="0.3.1"; sha256="1rh36f8pd9kzsp499895jfcsfnrnzp3187y40djd67r2b4ibkd78"; depends=[ggplot2 glmnet Matrix Rcpp RcppEigen ROCR]; }; sisVIVE = derive2 { name="sisVIVE"; version="1.4"; sha256="1vh53irxgk8ahw52cdqbbm89dvmzyf54izg4lm8a3v92k5p6nzwz"; depends=[lars]; }; sisal = derive2 { name="sisal"; version="0.48"; sha256="1fh35ndra58dryw222ng7ys3gx1izyk5789k30lyd4n8wqy6sjjd"; depends=[boot digest lattice mgcv R_matlab R_methodsS3]; }; sismonr = derive2 { name="sismonr"; version="2.1.0"; sha256="1v4vfz6zc4f70fay8r9vaxj62pcp8gqnh4aczbqpym9874330vi9"; depends=[dplyr ggplot2 ggpubr igraph jsonlite magrittr rlang scales stringr tictoc tidyr truncnorm XR XRJulia]; }; - sistec = derive2 { name="sistec"; version="0.1.0"; sha256="1prxqfyngfi21mnrx1s648vk80wk2ivia0kq5kqywdrrdxa3zpam"; depends=[dplyr openxlsx rlang shiny stringr]; }; + sistec = derive2 { name="sistec"; version="0.2.0"; sha256="0y43anin9vybiivf3jrxg19i9z4smmhhjvp52gci6icpn839kr8x"; depends=[dplyr openxlsx rlang shiny stringi stringr]; }; sitar = derive2 { name="sitar"; version="1.1.2"; sha256="0njnsamb9mrds3rjlwwv6sn980jl744mdp0b9d36sqws7wgnxrfq"; depends=[dplyr glue nlme purrr rlang rsample tibble tidyr]; }; siteymlgen = derive2 { name="siteymlgen"; version="1.0.0"; sha256="1176fnf39ars5cdjvy5w2k6b92qv51hy86s71sl8ghr0lwdq9f59"; depends=[data_table dplyr lubridate magrittr purrr rlist rmarkdown stringr yaml ymlthis]; }; sitmo = derive2 { name="sitmo"; version="2.0.1"; sha256="0apdhwy3kxs39agsbvx5vn3xsgb22bf3jrwmr2cmqk9kmxbx740c"; depends=[Rcpp]; }; sitools = derive2 { name="sitools"; version="1.4"; sha256="0c0qnvsv06g6v7hxad96fkp9j641v8472mbphvaxa60k3xc7ackb"; depends=[]; }; sitree = derive2 { name="sitree"; version="0.1-7"; sha256="08yamivn2vxgrizh5gvvr9cn3cn1657r0p2nrkwbqljqrhmzi7qd"; depends=[data_table lattice latticeExtra]; }; sitreeE = derive2 { name="sitreeE"; version="0.0-5"; sha256="16m8w0rxb40pimzd06znqskz74jk4rrki4gjy8nk24r1zih2cjq1"; depends=[data_table sitree]; }; + sivs = derive2 { name="sivs"; version="0.2.4"; sha256="0qks0kgagahm4mgd7nd5qqwihrlivlc8q4dk4pcdjb7f15z073j8"; depends=[doParallel foreach glmnet pROC varhandle]; }; sizeMat = derive2 { name="sizeMat"; version="1.1.2"; sha256="1vbndadsn80ddrg471vp1qxf0gan38w6dkjk1p2npvfb47wdjj2h"; depends=[MASS matrixStats MCMCpack]; }; - sjPlot = derive2 { name="sjPlot"; version="2.8.4"; sha256="0b7k0mshkk8k26w11xbxkb5v0klhq279zn2xdz83cn8k791xkqyd"; depends=[bayestestR dplyr effectsize ggeffects ggplot2 insight knitr MASS parameters performance purrr rlang scales sjlabelled sjmisc sjstats tidyr]; }; + sjPlot = derive2 { name="sjPlot"; version="2.8.6"; sha256="1dn9nvvp4jd45kwr4rpp2abf7xdpdmiv41rr3fkdb32a136bzx4b"; depends=[bayestestR dplyr effectsize ggeffects ggplot2 insight knitr MASS parameters performance purrr rlang scales sjlabelled sjmisc sjstats tidyr]; }; sjdbc = derive2 { name="sjdbc"; version="1.6.0"; sha256="17ncgj2s2pjn3w3c1dgxv8g7y17h4p78iic86gsj2ahn0xpsmkcc"; depends=[rJava]; }; - sjlabelled = derive2 { name="sjlabelled"; version="1.1.6"; sha256="0xvb0yi7c7wiiqjbnbisyb2cjinm11i373jacfv1yzyc9cznzyzq"; depends=[insight]; }; + sjlabelled = derive2 { name="sjlabelled"; version="1.1.7"; sha256="0d3fsjd2gxchv8mlx9l5pf8xvkmx4pgvizam83f3qss07bmvpzwg"; depends=[insight]; }; sjmisc = derive2 { name="sjmisc"; version="2.8.5"; sha256="0xl0s56d13bia89ai619rcr0fzbvc2k8f7hjxik4qp0g4v87zzlk"; depends=[dplyr insight magrittr purrr rlang sjlabelled tidyselect]; }; sjstats = derive2 { name="sjstats"; version="0.18.0"; sha256="17b1fcrhgjw66qa8zk2jj1bvz3vp5bnjn3p4y1wsg5ng5nxq8jz0"; depends=[bayestestR broom dplyr effectsize emmeans insight lme4 magrittr MASS modelr parameters performance purrr rlang sjlabelled sjmisc tidyr]; }; skda = derive2 { name="skda"; version="0.1"; sha256="0a6mksr1d0j3pd0kz4jb6yh466gvl4fkrvgvnlmvivpv6b2gqs3q"; depends=[]; }; - skedastic = derive2 { name="skedastic"; version="1.0.0"; sha256="11bz8ds8dgfn5dmr7psyszylhnz0why8ika327yk1v1j9z841k1q"; depends=[arrangements bazar berryFunctions boot broom CompQuadForm cubature data_table expm gmp magrittr MASS mvtnorm plm pracma qpdf quantreg Rdpack Rmpfr shiny tibble]; }; + skedastic = derive2 { name="skedastic"; version="1.0.1"; sha256="04s5cvv2zcdwmkv06w79va8aaxb0vx6c8bmz8sjpblvsrgc9c7nv"; depends=[arrangements bazar berryFunctions boot broom CompQuadForm cubature data_table dplyr expm gmp MASS mvtnorm pracma qpdf quantreg Rdpack Rmpfr]; }; skeletor = derive2 { name="skeletor"; version="1.0.4"; sha256="1jfbfbkjx8mdwamsrkhvcnyn470in702vgcyw3g2dbgs84gl29q8"; depends=[]; }; skellam = derive2 { name="skellam"; version="0.2.0"; sha256="0r5wbs5h7xc3k2vjxd4axwnxr9cmwm008fcyj1vyixkg8fa680gx"; depends=[]; }; + sketch = derive2 { name="sketch"; version="1.0.3"; sha256="0d2kcf6q2xpvxzf0js8qbw0apkj8lbx1znzqcnidsgwn5p7ni20a"; depends=[base64enc glue htmltools jsonlite magrittr purrr rlang rstudioapi shiny]; }; sketcher = derive2 { name="sketcher"; version="0.1.3"; sha256="011lx15whrdj5q5h33h9brkzbn2fnpm1nx9ip1v9xl5xfkbj7952"; depends=[downloader dplyr imager jpeg magrittr png readbitmap stringr]; }; skewlmm = derive2 { name="skewlmm"; version="0.2.2"; sha256="12lcim5k4q1g9n3nf1cyb1zyis2596jvwim286mifmwrxji0m20p"; depends=[dplyr ggplot2 moments mvtnorm nlme numDeriv purrr]; }; skewt = derive2 { name="skewt"; version="0.1"; sha256="1xm00zfzjv53cq9drfcx7w2ri5dwsq7kajrk2hc1mvw0b6s4x2ix"; depends=[]; }; skimr = derive2 { name="skimr"; version="2.1.2"; sha256="056cdf95hc1l19f5kjkyyxrnx6kl0lw0zzcin3xnblzbqvl0zrzh"; depends=[cli crayon dplyr knitr magrittr purrr repr rlang stringr tibble tidyr tidyselect withr]; }; sklarsomega = derive2 { name="sklarsomega"; version="2.0-1"; sha256="0pk3dk0bsbby4wnj8sad8yllix48hq3ayv3709kglc97d8bhjzha"; depends=[extraDistr hash LaplacesDemon Matrix mcmcse numDeriv spam]; }; skm = derive2 { name="skm"; version="0.1.5.4"; sha256="06g3bdncq2r56d8k3dr87gqnibypbsps0gj4jxkw9q1sq1yaff3v"; depends=[data_table magrittr plyr Rcpp RcppArmadillo RcppParallel]; }; - skmeans = derive2 { name="skmeans"; version="0.2-12"; sha256="0n6nvhpzhkrp5jg7d2yy6y95hsfi0sphg1792nr2ccxivqwgyy8l"; depends=[clue cluster slam]; }; + skmeans = derive2 { name="skmeans"; version="0.2-13"; sha256="1nks9k910fc0m07wpi9ridpyvgnnjlgw821mnvpv8skr4i75zy1w"; depends=[clue cluster slam]; }; skpr = derive2 { name="skpr"; version="0.64.2"; sha256="07fchgv0aqgw0hvcav08zzfzqg8nbw8ibbpd3bd11jx1fikx4vyr"; depends=[base64enc car crayon doParallel doRNG foreach future iterators kableExtra knitr lazyeval lme4 lmerTest magrittr nlme promises Rcpp RcppEigen rintrojs shiny shinyjs shinythemes survival viridis]; }; - skynet = derive2 { name="skynet"; version="1.3.8"; sha256="1aw4gkjziisq93cjzckb8hac24fmj30v78cln88hx2sydpgsbszg"; depends=[data_table dplyr geosphere ggplot2 ggrepel httr igraph leaflet maps stringr]; }; + skynet = derive2 { name="skynet"; version="1.4.0"; sha256="1ir8sw99fvdy8zp7ncgdnggr8hv1ph21kvdi9my42vlsh2fqi5ja"; depends=[data_table dplyr geosphere ggplot2 ggrepel httr igraph leaflet maps stringr]; }; slackr = derive2 { name="slackr"; version="1.4.2"; sha256="1vm2h5fzcss3xx1annx68wrvv6c0s6h2ci0bipxmdl9amdaqw85w"; depends=[dplyr ggplot2 httr jsonlite]; }; - slam = derive2 { name="slam"; version="0.1-47"; sha256="12fggw2c7hz3bpvsaqm24g3r6lbpq6jgli24g7x5j859iak5cqv9"; depends=[]; }; + slam = derive2 { name="slam"; version="0.1-48"; sha256="1ppsvkph4v1dffxgp12a4wnr9arj7pkmh4qv0and3f6nbz9k42qa"; depends=[]; }; + slanter = derive2 { name="slanter"; version="0.1-0"; sha256="161ldggjrd7sbp38fip92br5izcqbwfmxcmmg95dm13sviabxb7k"; depends=[Matrix pheatmap pracma]; }; sld = derive2 { name="sld"; version="0.3.3"; sha256="1ggvyx1nsfc1wwwzlqgvk6p5xxq6r6yx2rjv0290q7p06gc3i1ll"; depends=[lmom]; }; sleekts = derive2 { name="sleekts"; version="1.0.2"; sha256="0syk244xrsv8hz5sxm7wizk0kyn1nc6z4c63c8xn57fz130zj75k"; depends=[]; }; sleepr = derive2 { name="sleepr"; version="0.3.0"; sha256="1ka4pl6a09d1qga5svcirc5ywmzz9pcml09053745lz3p1v8fnn3"; depends=[behavr data_table]; }; - sleepwalk = derive2 { name="sleepwalk"; version="0.3.0"; sha256="00w5c7a1nzy6v0irpskkqyldknq9vdq97r9im1h042zm6lnxxrr6"; depends=[cowplot ggplot2 httpuv jrc jsonlite scales]; }; + sleepwalk = derive2 { name="sleepwalk"; version="0.3.1"; sha256="1dr6iaiq5ixh7daih1qnaxn4jyqlqvk326lnmynhw7if4z1hj9r6"; depends=[cowplot ggplot2 httpuv jrc jsonlite scales]; }; slfm = derive2 { name="slfm"; version="1.0.1"; sha256="0s7fdvr4fvsb4789f9ly2x820g4xvabl04wk7k6i8pd5ckj2xjhy"; depends=[coda lattice Rcpp RcppArmadillo]; }; slga = derive2 { name="slga"; version="1.1.1"; sha256="0l8jfqmpc51fq4xil03lvgxxyqv08a5m4drfvrihfd6f1jkv6xkf"; depends=[httr raster sf xml2]; }; - slickR = derive2 { name="slickR"; version="0.4.9"; sha256="1smlzl0gq01vhv4qqwgikzdwg0z9k5mjf956sf64ps8py1b8d5ry"; depends=[base64enc htmltools htmlwidgets lifecycle xml2]; }; + slickR = derive2 { name="slickR"; version="0.5.0"; sha256="1zxj6ivdhi9wvqcrl0p8clwk8nxqmg1bijqamp0lhq82dpyrdngp"; depends=[base64enc htmltools htmlwidgets lifecycle xml2]; }; slider = derive2 { name="slider"; version="0.1.5"; sha256="1x4jwfxam4czfkb1s5qds5krfw1h2p5a4rh6f5z4yvhsv0d81xck"; depends=[glue rlang vctrs warp]; }; slideview = derive2 { name="slideview"; version="0.1.0"; sha256="0zq5s6qdxn6ri88pp0wf2kg2k4byrrsfvwh0ai892p4szqbc3w4v"; depends=[htmltools htmlwidgets lattice raster viridisLite]; }; slim = derive2 { name="slim"; version="0.1.1"; sha256="0x9bk6w6lmw15s85gw9g8d1wlb57kkvnmx1wsyasn93x9llkjva1"; depends=[data_table MASS]; }; slimrec = derive2 { name="slimrec"; version="0.1.0"; sha256="1qzcvk7z8y11hwmybvppk1gf8di596zxy7qs22fclp6h6y18s377"; depends=[assertthat bigmemory glmnet Matrix pbapply]; }; slippymath = derive2 { name="slippymath"; version="0.3.1"; sha256="0dqnv089mcfxvpsc1px7mblim6m77n59xpcysz75jrvpc5q4lsrg"; depends=[png purrr raster]; }; - slm = derive2 { name="slm"; version="1.1.0"; sha256="1y9pw9lgxp2xz6smbhg0rayjszm83kxf2an9rk9pdhlmx6670bbf"; depends=[capushe expm ltsa sandwich]; }; + slm = derive2 { name="slm"; version="1.2.0"; sha256="1kzqipwmqdcnv04r69c6fq95kbjdbhk5qi1b1n06bdr7xnyzm56b"; depends=[capushe expm ltsa sandwich]; }; sloop = derive2 { name="sloop"; version="1.0.1"; sha256="00fk5fr5zsk2qxc1kfhmshhjxgnamm3401089sx8m2l529zd6r8j"; depends=[codetools crayon purrr rlang tibble]; }; + slopeOP = derive2 { name="slopeOP"; version="1.0.1"; sha256="0rcxa2wdj57aj7n17sxv05dvwchhfsnhssmc372xjfgi72gdnv58"; depends=[Rcpp]; }; slouch = derive2 { name="slouch"; version="2.1.4"; sha256="09ffx657hs913prv0rifhsz60h39lk0h4z28myx6yzxcfdk4f48d"; depends=[ape crayon memoise]; }; slowraker = derive2 { name="slowraker"; version="0.1.1"; sha256="0glc3ldvbqkvzfvhs4s5mzx1kfz05px4k7rx5jfp9dm9d0gfpvsx"; depends=[NLP openNLP SnowballC]; }; slp = derive2 { name="slp"; version="1.0-5"; sha256="0i9iv0s1wdp9cyzr8qixh6c7qvrj025vll13gyf8dfbidrp6hryl"; depends=[mgcv]; }; @@ -14339,7 +14952,7 @@ in with self; { smacof = derive2 { name="smacof"; version="2.1-1"; sha256="166acgllfwsdb28cjzb49f4b8gwcipqwzi9w45r4qmzyszf89xw3"; depends=[candisc colorspace doParallel e1071 ellipse foreach Hmisc MASS nnls plotrix polynom weights wordcloud]; }; smacpod = derive2 { name="smacpod"; version="2.1"; sha256="1fi8v69xkm182nyaryz83kw55cdgv99cqglphlw82n4k7w0lfrk3"; depends=[abind pbapply plotrix sp spatstat]; }; smallarea = derive2 { name="smallarea"; version="0.1"; sha256="0jcv0xbh8v4g6zxxs4yyd0divwzk9d2w7g01r4s65khxvy3av7yx"; depends=[MASS]; }; - smam = derive2 { name="smam"; version="0.5.3"; sha256="0hns3w6sm06fwxy3aybaz21j8bii5m5ps932ldilh0dj7rsqii6a"; depends=[doParallel doSNOW EnvStats foreach Matrix nloptr numDeriv Rcpp RcppGSL RcppParallel]; }; + smam = derive2 { name="smam"; version="0.5.4"; sha256="0v7wd1jkacfzjcg4g44dl1d7qxn6as6vicsyafkmrczgdzmrx1md"; depends=[doParallel doSNOW EnvStats foreach Matrix nloptr numDeriv Rcpp RcppGSL RcppParallel]; }; smapr = derive2 { name="smapr"; version="0.2.1"; sha256="1gcq66gs6968c5h303dqd2jyw2rcdwxv642ki1cmpdj6ix665dpr"; depends=[httr rappdirs raster rhdf5 rvest xml2]; }; smartR = derive2 { name="smartR"; version="0.62.3"; sha256="0ardb4arhr7qmr30b3ahf7hkwlys9i420bm8h2688phahgfkk0y8"; depends=[caret chron cluster foreign ggplot2 ggrepel ggthemes gridExtra gstat gsubfn gWidgets2 gWidgets2RGtk2 igraph jpeg jsonlite lattice mapdata mapproj maps maptools marmap mtsdi nnls PBSmapping plyr R6 RColorBrewer reshape2 rgdal rgeos rjags ROCR rpart scales shape sp spdep sqldf vegan]; }; smartdata = derive2 { name="smartdata"; version="1.0.3"; sha256="06hqpsr68dqm5544965g648267kkixf44bh0g5x6ik66vj6crkfm"; depends=[adaptiveGPCA Amelia Boruta checkmate class clusterSim denoiseR discretization DMwR FSelector functional imbalance infotheo lle magrittr mice missForest missMDA MVN NoiseFiltersR outliers RoughSets unbalanced VIM]; }; @@ -14347,25 +14960,27 @@ in with self; { smartsizer = derive2 { name="smartsizer"; version="1.0.2"; sha256="1w2vf6q3f7bywkvazgxn9gh7f2bqy4rg74mm4r6izw4gx7r81ls6"; depends=[MASS]; }; smatr = derive2 { name="smatr"; version="3.4-8"; sha256="0qqqbg65flxh48sw7x90zvgzbpcfzb1811h0pz3zlhdw9a7khs9n"; depends=[]; }; smbinning = derive2 { name="smbinning"; version="0.9"; sha256="1sr0nsqqzxdf402g9qx1ycigbh330idl9n2cyli4x4zxj1nqm3yv"; depends=[Formula gsubfn partykit sqldf]; }; - smcfcs = derive2 { name="smcfcs"; version="1.4.1"; sha256="0q5kg0yrmbw80097j66mp08pmqrw1s0wf8g377379s62p1f6sjwv"; depends=[MASS survival VGAM]; }; + smcfcs = derive2 { name="smcfcs"; version="1.4.2"; sha256="1gr10jy6a5d4zlprrxl5102814746vhzb3q6v13f40dyfxkljdfl"; depends=[MASS rlang survival VGAM]; }; smco = derive2 { name="smco"; version="0.1"; sha256="1sj3y1x6pc32cwzyhn9gaxs964xh5xl4vw08hsa8kfcxhh2r0s99"; depends=[]; }; smcure = derive2 { name="smcure"; version="2.0"; sha256="1j7fxnb0sx57a0l929c3haz4f1y829ymlq0cvdh0cia4qp6ydv60"; depends=[survival]; }; + smd = derive2 { name="smd"; version="0.6.6"; sha256="1nvlka2prqh1hcj4ngpj2c2gmfryziijqwjyfy9fmq78skiq0jij"; depends=[MASS]; }; smdata = derive2 { name="smdata"; version="1.2"; sha256="1p26b46kg4hmhs2fl9h9vchar00llqv58ylx438bjgzz4f229qvr"; depends=[]; }; smds = derive2 { name="smds"; version="1.0"; sha256="0aqf3wfn6mlsl8a32gaf9qdpyxwsx19g6mma8qzgaysdmk6vhbpd"; depends=[MASS]; }; - smerc = derive2 { name="smerc"; version="1.2"; sha256="0rl8pnpnrpvj49nb30i748yz7rkr6d4d1nkazyqj2lbp7sqdf51d"; depends=[pbapply randtoolbox sp]; }; + smerc = derive2 { name="smerc"; version="1.3.3"; sha256="1nzql8dv817ll86ba9798pw2fndx9zvcsxxixh85c7gzyfj72m9b"; depends=[pbapply randtoolbox Rcpp RcppProgress sp]; }; + smfishHmrf = derive2 { name="smfishHmrf"; version="0.1"; sha256="1k6mpyp11zv5rc3k98baymr903p2pf424nf9xng20q1li8s8y2ab"; depends=[fs pracma Rdpack]; }; smfsb = derive2 { name="smfsb"; version="1.3"; sha256="1328w7zpwd3nam6ha4bh14g919jjl87v323ijmbp1j71gc64nn2i"; depends=[abind]; }; smicd = derive2 { name="smicd"; version="1.1.1"; sha256="187ydw50py67ha0z3xyk9hk988gszd8jfzkgsv4hjlbx80fzb2nv"; depends=[formula_tools Hmisc ineq laeken lme4 MuMIn mvtnorm truncnorm weights]; }; smirnov = derive2 { name="smirnov"; version="1.0-1"; sha256="09mpb45wj8rfi6n6822h4c335xp2pl0xsyxgin1bkfw97yjcvrgk"; depends=[]; }; - smnet = derive2 { name="smnet"; version="2.1.1"; sha256="0fa47zgm7jxvs3jfai54wsc6qa9ycqw4f3yr941fvkczwzh4ch02"; depends=[DBI RSQLite spam SSN]; }; + smnet = derive2 { name="smnet"; version="2.1.2"; sha256="17zv02f1g86s55g81anhqrxfgy2biamsw606byxwh9kdc5l4vfv6"; depends=[RSQLite spam SSN]; }; smog = derive2 { name="smog"; version="2.1.0"; sha256="1mnnvp6crjwwiym16q4hmn9zwna1gblwqjlan4x9zyvgp1j70k26"; depends=[doParallel dplyr foreach ggplot2 magrittr Rcpp RcppArmadillo Rdpack rmarkdown tidyr]; }; smoke = derive2 { name="smoke"; version="2.0.0"; sha256="1jdl5swg66vqryd40rrqpsnkczmsiaf5x6vlfv774vbnrc6q2v2g"; depends=[Rdpack]; }; smoof = derive2 { name="smoof"; version="1.6.0.2"; sha256="14zwrsyhbrwggwiaq8vxps8cgkp6glb14b2cp2ph1ppa0abvlbfq"; depends=[BBmisc checkmate ggplot2 mco ParamHelpers plot3D plotly RColorBrewer Rcpp RcppArmadillo RJSONIO]; }; - smooth = derive2 { name="smooth"; version="2.6.0"; sha256="0q4bmyhf6qzqj4p340yrpqa0rbgdij38yg71yfajjzz9cbzf9nl0"; depends=[forecast greybox nloptr Rcpp RcppArmadillo zoo]; }; + smooth = derive2 { name="smooth"; version="3.0.0"; sha256="0gqmg0w2165fm0476lj0n1d9sb5p0f56v379vzj55s9313a94gf4"; depends=[forecast greybox MASS nloptr pracma Rcpp RcppArmadillo statmod zoo]; }; smoothAPC = derive2 { name="smoothAPC"; version="0.3"; sha256="11f34qqdm8m0hmy9jf29q439slchvmqgdfrmak7vcdhfnjcylr5r"; depends=[colorspace lmtest quantreg rgl SparseM]; }; smoothHR = derive2 { name="smoothHR"; version="1.0.2"; sha256="0l33xg3p9pyfrp4rhavz8m1jakk4wr8i14g6jjiizb03rpxdpzqy"; depends=[survival]; }; smoothROCtime = derive2 { name="smoothROCtime"; version="0.1.0"; sha256="03iihjxb5xdaf74cm9cajqqjli754mdmv5v1y4hla9vv23017ca1"; depends=[ks]; }; smoothSurv = derive2 { name="smoothSurv"; version="2.3"; sha256="0rxgps184hl49g8gpa7hjvdl2i01qkghmvlv8blwwr9rfk19aq1s"; depends=[survival]; }; - smoothedLasso = derive2 { name="smoothedLasso"; version="1.3"; sha256="0f11wdv0yn1nifrkq3k8amwdsf4j6acr0k9qc83awwkpil1z6x17"; depends=[Matrix Rdpack]; }; + smoothedLasso = derive2 { name="smoothedLasso"; version="1.5"; sha256="13g55axzicfl7plhaax1vj1x57pfasyzzrw968rm305mmpavhzx9"; depends=[Matrix Rdpack]; }; smoother = derive2 { name="smoother"; version="1.1"; sha256="0nqr1bvlr5bnasqg74zmknjjl4x28kla9h5cxpga3kq5z215pdci"; depends=[TTR]; }; smoothie = derive2 { name="smoothie"; version="1.0-1"; sha256="12p4ig8fbmlsby5jjd3d27njv8j7aiwx0m2n1nmgvjj0n330s1kj"; depends=[]; }; smoothmest = derive2 { name="smoothmest"; version="0.1-2"; sha256="14cri1b6ha8w4h8m26b3d7qip211wfv1sywgdxw3a6vqgc65hmk5"; depends=[MASS]; }; @@ -14373,14 +14988,14 @@ in with self; { smoothtail = derive2 { name="smoothtail"; version="2.0.5"; sha256="1sqkwniz9m03k23nba9ndmdm0g03mdshzm8risr6wz98jcqjilrk"; depends=[logcondens]; }; smoots = derive2 { name="smoots"; version="1.0.1"; sha256="1kk1hvfqxslg76gy8gzaidv3d55pflyvbv3ski6rkk0l9lwbb2q1"; depends=[]; }; smotefamily = derive2 { name="smotefamily"; version="1.3.1"; sha256="062yps71bqnyff1hzqb7yvigvqg2lnc24r9gfp8m3zhvmyprk3cp"; depends=[dbscan FNN igraph]; }; - smovie = derive2 { name="smovie"; version="1.1.2"; sha256="1z5mw8m67dqv2jfywgmnvvdac4qw89zj8nqzz9262jq8i5i9bfja"; depends=[rpanel]; }; + smovie = derive2 { name="smovie"; version="1.1.3"; sha256="0gani6ywckvp4p72drl87vlvwcszzn5n71iqrwdgnyyr6r69ax7b"; depends=[rpanel]; }; smpic = derive2 { name="smpic"; version="0.1.0"; sha256="0ff2146gjcrc6nvrbf4779jh076abhb843zzlk2zvqir13qfap61"; depends=[ggplot2 imager stringr]; }; sms = derive2 { name="sms"; version="2.3.1"; sha256="0vr5jy8bxbczaqr9kg0fnanxhv9nj51yzgacrb63k33cs85p981m"; depends=[doParallel foreach iterators]; }; smss = derive2 { name="smss"; version="1.0-2"; sha256="04lgfdcvnzpnpplyl62fy7slyiy8wkqpjjrzmclgqis3c9zkkncp"; depends=[]; }; - smurf = derive2 { name="smurf"; version="1.0.6"; sha256="0629qbzi2n1zyf5pmbxfnxivnk9ppclbw0vmqcdhjjcwkfxir7nm"; depends=[catdata glmnet MASS Matrix mgcv RColorBrewer Rcpp RcppArmadillo speedglm]; }; + smurf = derive2 { name="smurf"; version="1.0.7"; sha256="16iy9cs2ng16lwprbff67lw099qwlrh65hvsxbl67d5wbg43wg2l"; depends=[catdata glmnet MASS Matrix mgcv RColorBrewer Rcpp RcppArmadillo speedglm]; }; sn = derive2 { name="sn"; version="1.6-2"; sha256="179xb7yb8br99aa5awm2yxsy0v5w1kdhv6a7ifaliz2y64677m1g"; depends=[mnormt numDeriv quantreg]; }; - sna = derive2 { name="sna"; version="2.5"; sha256="1j3i6300m686qqfmyvadim377cd3mplzgj6mandygw8brg50id8k"; depends=[network statnet_common]; }; - snahelper = derive2 { name="snahelper"; version="1.1.0"; sha256="0fc1xilbc7dr5gsrhlp8zgbjppxi44lifsj79kh79783w8nyfqm1"; depends=[colourpicker DT formatR ggplot2 ggraph graphlayouts igraph miniUI rstudioapi shiny]; }; + sna = derive2 { name="sna"; version="2.6"; sha256="0ai0v4538d30m4wks5s3lch1yfmx1ml0nnrz7ihs097lv586a09s"; depends=[network statnet_common]; }; + snahelper = derive2 { name="snahelper"; version="1.2.0"; sha256="0pr4lb4606icxdvsraf5bcpaicwp1fvng9d5rymkwqizg4k5xqlk"; depends=[colourpicker DT formatR ggplot2 ggraph graphlayouts igraph miniUI rstudioapi shiny]; }; snakecase = derive2 { name="snakecase"; version="0.11.0"; sha256="1ky1x2cp5rd0ffd9m1fji9sq4z4jsrpxzg30brw8bb4ihfjj114r"; depends=[stringi stringr]; }; snappier = derive2 { name="snappier"; version="0.1.0"; sha256="0334zwhqdl3lfw7rg8ql7z10qj8jjrm17yi9mgdcxnzaf3f1p859"; depends=[]; }; snapshot = derive2 { name="snapshot"; version="0.1.2"; sha256="0cif1ybxxjpyp3spnh98qpyw1i5sgi1jlafcbcldbqhsdzfz4q10"; depends=[]; }; @@ -14389,7 +15004,6 @@ in with self; { snht = derive2 { name="snht"; version="1.0.5"; sha256="0k8w1118b2qrf5zfi902gm6zf7b1mwv7py7wg57vsibh2r2ra8ah"; depends=[ggplot2 gridExtra mgcv plyr reshape2 zoo]; }; snipEM = derive2 { name="snipEM"; version="1.0.1"; sha256="1ls3c9f47lgrnja8p34iz2md2mf5jva9rn5n1h3a43zs29g019v8"; depends=[MASS mvtnorm Rcpp RcppArmadillo]; }; snn = derive2 { name="snn"; version="1.1"; sha256="0yywn3v1iz9xizwli3gmzprkx66b5a813mbp8hq2vsj8n4lfj8r5"; depends=[]; }; - snnR = derive2 { name="snnR"; version="1.0"; sha256="0qrl5ivpmipibszx8k9fvd8g462zzdcmzbjj1hb8apv4z79gzima"; depends=[]; }; snotelr = derive2 { name="snotelr"; version="1.0.4"; sha256="0ni2hmlbxvhs9mwbf679yysd9gkj4fknfdwi7a6b32jsf0v6mg92"; depends=[httr magrittr memoise RSelenium rvest shiny wdman xml2]; }; snow = derive2 { name="snow"; version="0.4-3"; sha256="1n3n8pva9s34fvlw32yng0x416lmbv7q1fsd0ywa4kikmxym64l5"; depends=[]; }; snowFT = derive2 { name="snowFT"; version="1.6-0"; sha256="00rq2xibzhx7441v9jg138a4fkmx28hifs4yyj3pwi8najf0df4n"; depends=[rlecuyer snow]; }; @@ -14408,7 +15022,7 @@ in with self; { soc_ca = derive2 { name="soc.ca"; version="0.7.3"; sha256="0z3phmvgwd3s6swfaywq851my12a2n48i6k26vhggc6pf9d28phl"; depends=[ellipse ggplot2 ggrepel gridExtra reshape2 shiny]; }; socceR = derive2 { name="socceR"; version="0.1.1"; sha256="1vd0r3vixavg1br2q3kfn3nvl7dw854vkcfwcvyw411k84ivb13y"; depends=[Rcpp]; }; social = derive2 { name="social"; version="1.0"; sha256="0ny81bhj80rlwwa6cgbkdz2rxz6bp0f3nvjr1sqxr4s8l8rnf4ic"; depends=[Rcpp]; }; - socialmixr = derive2 { name="socialmixr"; version="0.1.7"; sha256="0j9bvl47m0j6fz6n6kxv3n76csd5bqg2vc3dp2wxl1h8afbpak6l"; depends=[countrycode curl data_table httr jsonlite lubridate oai stringr wpp2015 XML]; }; + socialmixr = derive2 { name="socialmixr"; version="0.1.8"; sha256="0zhinhjv1ablhdyz41a1ii1s3mzqg8f2ns7xcjnlwa9fx364x5a2"; depends=[countrycode curl data_table httr jsonlite lubridate oai stringr wpp2015 XML]; }; sociome = derive2 { name="sociome"; version="1.4.2"; sha256="14kcly2lningjpzf04xi59fb9nb7cahhbplqndsb34rzwbifa534"; depends=[censusapi dplyr magrittr mice psych purrr rlang stringr tidycensus tidyr]; }; socviz = derive2 { name="socviz"; version="1.2"; sha256="1294xwy26vshmaiw3pkx3f90j8g6fv64gygv88b7lnz6fhai1nq5"; depends=[dplyr fs magrittr rlang tibble]; }; sodavis = derive2 { name="sodavis"; version="1.2"; sha256="1jf5sml51qxlpgv5b1rvyig4dm4ijw2hpnk85zf790jp22xm64jw"; depends=[MASS mvtnorm nnet]; }; @@ -14416,49 +15030,49 @@ in with self; { sofa = derive2 { name="sofa"; version="0.4.0"; sha256="1w78f8pnx4vh6znpwwcy9k4j795zji4bv88mi6ihdv09ar7if7yv"; depends=[crul jsonlite mime R6]; }; softImpute = derive2 { name="softImpute"; version="1.4"; sha256="07cxbzkl08q58m1455i139952rmryjlic4s2f2hscl5zxxmfdxcq"; depends=[Matrix]; }; softclassval = derive2 { name="softclassval"; version="1.0-20160527"; sha256="1f5qj5sajy3dg0mgss6f9w6v5a2prcypld9jcv457bd4n4a409kr"; depends=[arrayhelpers svUnit]; }; - softmaxreg = derive2 { name="softmaxreg"; version="1.2"; sha256="0y1r4n83sv2744lpli65aip0c0cq823asb8gw9yy9yjjc9sbyr9s"; depends=[]; }; - soilDB = derive2 { name="soilDB"; version="2.5"; sha256="10jb49yiqvvcvl84r7xys5gyr710ypvai7fn5sp6nvcm1bqgrwkq"; depends=[aqp curl lattice plyr raster reshape2 sp xml2]; }; - soilassessment = derive2 { name="soilassessment"; version="0.1.1"; sha256="0vxw0wzc2fw1asasnkfc7mzz616l243dh27vn2fqm8sw7d3509ji"; depends=[arm caret Cubist e1071 FuzzyAHP Hmisc kernlab maptools nnet randomForest raster rgdal rpart soiltexture sp]; }; + soilDB = derive2 { name="soilDB"; version="2.5.8"; sha256="18kshc39rzh0lkmhhc062ww5pmi0wnr563647igvvk9bv2zrm8qy"; depends=[aqp curl data_table lattice plyr raster reshape2 sp xml2]; }; + soilassessment = derive2 { name="soilassessment"; version="0.2.1"; sha256="14hqwxpqb19g5r7abar40kprfilzxi24mg083gypvxzs48pb6gn8"; depends=[arm caret Cubist deSolve e1071 FuzzyAHP Hmisc kernlab maptools nnet qrnn quantregForest randomForest ranger raster rgdal rpart soiltexture sp]; }; soilcarbon = derive2 { name="soilcarbon"; version="1.2.0"; sha256="1gxq7np5xh3jcqbsf8xva4b82rv6rab2j23mbkc4pjs6nbnzvzba"; depends=[devtools ggplot2 openxlsx shiny]; }; - soilphysics = derive2 { name="soilphysics"; version="3.1"; sha256="11c094bqbwhggh0n3hdva1321gqzz2k1b7v3767wyyk1xpgzg98r"; depends=[boot MASS rpanel tkrplot]; }; + soilphysics = derive2 { name="soilphysics"; version="4.0"; sha256="0b4fkc1plmafjdlad7s4pvca6lafmrswwpfddvsh73734s7cslmq"; depends=[boot fields MASS shiny shinydashboard]; }; soiltexture = derive2 { name="soiltexture"; version="1.5.1"; sha256="1l9npvk910488qzd45ibc7ss557hnkb78lx1p6fs3nhl8sacgyxh"; depends=[MASS sp]; }; soilwater = derive2 { name="soilwater"; version="1.0.5"; sha256="11gal7hj73j82qx65krmzpmf0gpm41ph8hw70df46dbf4w23vvjn"; depends=[]; }; sokoban = derive2 { name="sokoban"; version="0.1.0"; sha256="07r2zv9rynvw06fpncrz3rsmkdy6z2pcvmm559bhs428kmnq2xib"; depends=[]; }; solaR = derive2 { name="solaR"; version="0.45"; sha256="1vxpwaizjxy27r54anhf48pf97lm4ck750m0p4kmh716irmhp319"; depends=[lattice latticeExtra RColorBrewer zoo]; }; solarPos = derive2 { name="solarPos"; version="1.0"; sha256="0004da7vqpq14q5lhs8vyvjl99j8gzxd5wrlw5d1vwfns3ica0q5"; depends=[]; }; solartime = derive2 { name="solartime"; version="0.0.1"; sha256="0q6la6d281zgf1kxhrdvi3b91na60szknq0fvldvlnszlqb5vkgs"; depends=[lubridate]; }; - solitude = derive2 { name="solitude"; version="1.0.1"; sha256="0vgc1djimk6xa21r31lrjvpfz9j7d4pwmb8k2z7aw2vfh7kifz6a"; depends=[data_table future_apply igraph lgr R6 ranger]; }; + solitude = derive2 { name="solitude"; version="1.1.1"; sha256="0cd3ppkydpak5sx49fd7wh1ha5lhphy51hfnsl480d88fx8cc6vf"; depends=[data_table future_apply igraph lgr R6 ranger]; }; solrad = derive2 { name="solrad"; version="1.0.0"; sha256="13ybllvmig1yqsy4md4kazs83hxb9lrlwy64yw1wwr1w6sxpbnp6"; depends=[]; }; solrium = derive2 { name="solrium"; version="1.1.4"; sha256="0x83s83r4sr4r9cgk9fgcw6xz778m4gg14fzwib3qja6ax2xpk2z"; depends=[crul dplyr jsonlite plyr R6 tibble xml2]; }; - solvebio = derive2 { name="solvebio"; version="2.8.0"; sha256="1561bx070wh4h1phkll8gwj45qi5xg047lanf8dn50w0ik60fwf8"; depends=[dplyr httr jsonlite mime]; }; + solvebio = derive2 { name="solvebio"; version="2.9.0"; sha256="0wl5xffgw2gy3496wvkg0pvy4apd43p9bw7gv4bjrflc4m0fh10q"; depends=[dplyr httr jsonlite mime]; }; som = derive2 { name="som"; version="0.3-5.1"; sha256="1fbza1jxvwrkf5x3inkj36vshhkn7mz0ajqlxalbfmk6ngjw1x56"; depends=[]; }; som_nn = derive2 { name="som.nn"; version="1.1.0"; sha256="0mw2c2lqvdq9bhndpjyawjy43l4x7clcsx2350j45g7fnchhy602"; depends=[class hexbin kohonen som]; }; soma = derive2 { name="soma"; version="1.1.1"; sha256="1mc1yr9sq9h2z60v40aqmil0xswj5hgxfdh4racq297qw3a97my4"; depends=[reportr]; }; someKfwer = derive2 { name="someKfwer"; version="1.2"; sha256="0widny5l04ja91fy16x4giwrabwqhx0fs3yl48pv9xh4zj6sx563"; depends=[]; }; someMTP = derive2 { name="someMTP"; version="1.4.1"; sha256="19bsn8rny1vv9343bvk8xzhh82sskl0zg0f5r59g9k812q5llchn"; depends=[]; }; somebm = derive2 { name="somebm"; version="0.1"; sha256="1iwwc94k6znh4d3bbjnvwp4chc4wg0iy4v2f99cs4jasrsimb4p8"; depends=[]; }; - sommer = derive2 { name="sommer"; version="4.1.0"; sha256="0a8bjljg408fxxkyhnz5ycj0rvw4jjfpcaibp0jjja0jyfkpdwn9"; depends=[crayon lattice MASS Matrix Rcpp RcppArmadillo]; }; + sommer = derive2 { name="sommer"; version="4.1.1"; sha256="029kkry7sfmzi6dqql297815x7vyh3zxswn50zypsbkn4ki3bnfy"; depends=[crayon lattice MASS Matrix Rcpp RcppArmadillo]; }; somplot = derive2 { name="somplot"; version="1.6.4"; sha256="06c8p2lqz3yxmxdl7ji8a3czvxnsbl7bwyiig76pkwc3a5qqfbb9"; depends=[hexbin]; }; sonar = derive2 { name="sonar"; version="1.0.2"; sha256="1f0f5iqi3y9vnxyym14nm8dqxw0vcpnxmvvkx4sm612i4fclg1f9"; depends=[]; }; sonicLength = derive2 { name="sonicLength"; version="1.4.6"; sha256="0jh9zk908afqxacccsph6477cc8sbcc1vxbv7jz8ppgc20imw932"; depends=[]; }; - sonicscrewdriver = derive2 { name="sonicscrewdriver"; version="0.0.1"; sha256="03v53blb8f67ybhqys4n0zxf7pk9g024ncq0g9rnj9qpr740zclb"; depends=[ggplot2 seewave tuneR]; }; + sonicscrewdriver = derive2 { name="sonicscrewdriver"; version="0.0.3"; sha256="1rdmpy0b3yng63r1nd0kgs75r8xf6f55prlzix9dhis8q1p0y6q1"; depends=[ggplot2 jsonlite seewave tuneR]; }; sonify = derive2 { name="sonify"; version="0.0-1"; sha256="1wkqqgf8fhhaz1dmri2zzr8cdwmx3cgrxbprrz3yily5r1m17d15"; depends=[tuneR]; }; soobench = derive2 { name="soobench"; version="1.9.18"; sha256="06wzlxdw0l6jc1zqsgkn120ibprfalwqd38xh7dpi30vdqiqskcc"; depends=[]; }; soptdmaeA = derive2 { name="soptdmaeA"; version="1.0.0"; sha256="03n1y82myq0rz14awjnx9nx1dz3dxqq58m13cw7a7ncap7fmw9r5"; depends=[igraph MASS Matrix]; }; soql = derive2 { name="soql"; version="0.1.1"; sha256="12wvbxy9xx140b7mga4ma7hkg4q6kv549gkq15fnf4dn8q43x8nf"; depends=[]; }; sorocs = derive2 { name="sorocs"; version="0.1.0"; sha256="0gy23rldhnlz6jmf9rdzl4mmfkn5gjcavq2jfcz6dgjafl3v9vgl"; depends=[MASS MCMCpack mvtnorm]; }; - sortable = derive2 { name="sortable"; version="0.4.2"; sha256="08v78r0vibr0lk09lxm0s0vfkzpp03asqnqpl8jqa6rxcb484fri"; depends=[assertthat ellipsis htmltools htmlwidgets jsonlite learnr shiny]; }; + sortable = derive2 { name="sortable"; version="0.4.4"; sha256="15wn8xnvzawqxb97dlzd5v2qrxxizply6ah2ry0h6wrywdz2xppl"; depends=[assertthat ellipsis htmltools htmlwidgets jsonlite learnr shiny]; }; sorvi = derive2 { name="sorvi"; version="0.7.26"; sha256="19lfrc4bdiljs437w3a2bpf7abnkv0934dh929bbj2w1w8rzghjn"; depends=[dplyr ggplot2 RColorBrewer reshape2]; }; - sos = derive2 { name="sos"; version="2.0-0"; sha256="0fwv76m0iihzy60kglsdjnlp6800qsll6h0v2435a50lcr53jj8g"; depends=[brew]; }; + sos = derive2 { name="sos"; version="2.0-2"; sha256="0x8hs950s05ydh7vjjbpzfj1if01h1z9dz32xszik6fz94na279l"; depends=[brew]; }; sotkanet = derive2 { name="sotkanet"; version="0.9.48"; sha256="1jw9agj92zzgad5kk9z6smjacimwinci6aaqlzmshivb8g8rv8zp"; depends=[RCurl rjson]; }; sotu = derive2 { name="sotu"; version="1.0.2"; sha256="0aqwkawaydsm91hz13msjg1a5llg7xmv6hxmfmsaganrl7iaym3c"; depends=[]; }; sound = derive2 { name="sound"; version="1.4.5"; sha256="1kbbb614d0fmj9l0yjiwf5yqnl7sby4xklp7qwp6rwjvq9bnm0ab"; depends=[]; }; - soundcorrs = derive2 { name="soundcorrs"; version="0.1.1"; sha256="06d57ici4538mfw804vnqaf59n2zglqlxhdlmn9694v9q1xw24p6"; depends=[]; }; + soundcorrs = derive2 { name="soundcorrs"; version="0.4.0"; sha256="1azvsv3bghlab8q24wbb6xwd5a4cydx1cagvhk8h0h5ib9957zab"; depends=[]; }; soundecology = derive2 { name="soundecology"; version="1.3.3"; sha256="16h6gbdlyav7wbfisdv1f2zsqhr45liidgj7qqk8giwjxgan8q97"; depends=[ineq oce pracma seewave tuneR vegan]; }; - soundgen = derive2 { name="soundgen"; version="1.8.0"; sha256="1z60f5r1gpp89jcib4sy5qvsk5w25s4jhvbwmxndna3hnny8003h"; depends=[dtw mvtnorm phonTools reshape2 seewave shiny shinyBS shinyjs tuneR zoo]; }; + soundgen = derive2 { name="soundgen"; version="1.8.2"; sha256="0ivx7039276x6nzpavynw4yr914r0cz1qsiqihfwm80pkpw6760q"; depends=[dtw mvtnorm phonTools reshape2 seewave shiny shinyBS shinyjs tuneR zoo]; }; source_gist = derive2 { name="source.gist"; version="1.0.0"; sha256="03bv0l4ccz9p41cjw18wlz081vbjxzfgq3imlhq3pgy9jdwcd8fp"; depends=[RCurl rjson]; }; + sourceR = derive2 { name="sourceR"; version="1.1.0"; sha256="09mikl6rkigx2bdnwqsgxwksz40lspq27hsrhlnfyz5yhs31ssda"; depends=[assertthat cluster dplyr gplots gtools R6 Rcpp reshape2 SPIn tensorA]; }; sourcetools = derive2 { name="sourcetools"; version="0.1.7"; sha256="1jnjir0q2dj724f1mjm6p5h77yzyx6xcqy9r2g7gmcxkxw349627"; depends=[]; }; - sp = derive2 { name="sp"; version="1.4-2"; sha256="02jxsd30apzjbdbssirysq70d4svdwzn931jhxr0ladl72g9bqvk"; depends=[lattice]; }; + sp = derive2 { name="sp"; version="1.4-4"; sha256="0zzw1gfic5b311vrbkmmmaap3yllgd192af067l5ymm885jqm1zs"; depends=[lattice]; }; sp23design = derive2 { name="sp23design"; version="0.9"; sha256="1ihvcld19cxflq2h93m9k9yaidhwixvbn46fqqc1p3wxzplmh8bs"; depends=[mvtnorm survival]; }; spANOVA = derive2 { name="spANOVA"; version="0.99.2"; sha256="0dlx9wwccq67g4yni3gbrv43f5pgm3mg715q2v8f09r1akhfg5by"; depends=[ape car DT geoR gtools knitr MASS Matrix multcomp multcompView mvtnorm rmarkdown ScottKnott shiny shinyBS shinycssloaders shinythemes spatialreg spdep xtable]; }; spAddins = derive2 { name="spAddins"; version="0.2.0"; sha256="19wbcghcf0f9qvqy92jhsdcpmd9b4lkhxndvr71cyhzga539lh1n"; depends=[magrittr purrr rstudioapi stringr]; }; @@ -14467,14 +15081,16 @@ in with self; { spBayesSurv = derive2 { name="spBayesSurv"; version="1.1.4"; sha256="0mf5ql9a45dkq0dw1l0h03gcnhm6if10faj72jrhgrlcrgzzdfyn"; depends=[coda fields MASS Rcpp RcppArmadillo survival]; }; spCP = derive2 { name="spCP"; version="1.2"; sha256="0y00k96p96jgp84wbdhqfwsq2fg8c68gc5310rnzpiv3clws27fb"; depends=[msm mvtnorm Rcpp RcppArmadillo]; }; spData = derive2 { name="spData"; version="0.3.8"; sha256="1mlsqy9cbilfc80cbdlbgsngvzdkrd9yjdkxnw2b1gzxnj6jcqbs"; depends=[raster sp]; }; + spDates = derive2 { name="spDates"; version="1.0"; sha256="0bf9bwi26h26ms0lczk1dld3cwgnx49y6g56sqwrkagn7w6blsrn"; depends=[data_table dplyr gdistance ggplot2 gstat magrittr raster rcarbon rlang smatr sp viridisLite]; }; spFSR = derive2 { name="spFSR"; version="1.0.0"; sha256="0094plnjlyhnnjqw3i4an5q95bw6hjy1gzc7zr6wy77faivqsbms"; depends=[class ggplot2 mlbench mlr parallelMap tictoc]; }; + spGARCH = derive2 { name="spGARCH"; version="0.2.2"; sha256="1wrmk2ybgysvibfy8vvp7pyqda5apqp0jxjfp3hlb416fza52966"; depends=[Matrix nleqslv Rcpp RcppEigen Rsolnp spdep truncnorm]; }; spMC = derive2 { name="spMC"; version="0.3.10"; sha256="0p0s6w7sif02b91b73a0zb2i4i95a8m86dkqmgx6w1jk9h2mgqaz"; depends=[]; }; spMaps = derive2 { name="spMaps"; version="0.4.0"; sha256="0n9693aam7gsclfhijq7cy61l0w4mm5vf3rjaz5w0jrz77lrkprh"; depends=[raster rgeos sp]; }; spNNGP = derive2 { name="spNNGP"; version="0.1.4"; sha256="14mz5cgxm9ka7q7f7qs80hqrgbk2mjphyc28ih73lkhcknl2v1lp"; depends=[coda Formula RANN]; }; spTDyn = derive2 { name="spTDyn"; version="2.0.1"; sha256="1wprn2adw4l5pkwkfzdpcr07jxgycx9kaf8w8mfv27nka5hacgqx"; depends=[coda sp spacetime spTimer]; }; spThin = derive2 { name="spThin"; version="0.2.0"; sha256="0j10j1cbbwp3baqm3b59rxlnd643mkx1mirlxpnr1ad2g7xpm69f"; depends=[fields knitr spam]; }; spTimer = derive2 { name="spTimer"; version="3.3.1"; sha256="0lf39n32ifsmbcf35h0g60xniw72mlrzvzax3k6kz5c5k1wszlba"; depends=[coda extraDistr sp spacetime]; }; - spaMM = derive2 { name="spaMM"; version="3.4.1"; sha256="0iflz3a4wxkf072cmy2h9vzn71xgizpafwwhpw7xcs657i2irpms"; depends=[boot crayon gmp MASS Matrix minqa nlme nloptr pbapply proxy Rcpp RcppEigen ROI]; }; + spaMM = derive2 { name="spaMM"; version="3.5.0"; sha256="0q3ajxiqzcc1nxydiapr55mxrcvmr7nidvlg51rhkxxh6zhn2ah4"; depends=[boot crayon gmp MASS Matrix minqa nlme nloptr pbapply proxy Rcpp RcppEigen ROI]; }; spaa = derive2 { name="spaa"; version="0.2.2"; sha256="163iipz1knxx1lzby9a3n1f014yqkf25z1wpwwy4gbx7sia499d5"; depends=[]; }; space = derive2 { name="space"; version="0.1-1.1"; sha256="09dpksbda4lg5hax47a9h9shjmggza6583slvdj0fldblykpyxck"; depends=[]; }; spaceNet = derive2 { name="spaceNet"; version="1.2"; sha256="1s2672icxs0qvdhl52xhllgvh1i9mjfrn5j3icyw6h61ljbnhy11"; depends=[MASS mclust permute RcppTN Rfast sna vegan]; }; @@ -14483,39 +15099,40 @@ in with self; { spacetime = derive2 { name="spacetime"; version="1.2-3"; sha256="0nxjp78vdnr8m2nn9czf1rp7b61md4fjfnyqdlgp982x5nb0nz6a"; depends=[intervals lattice sp xts zoo]; }; spacey = derive2 { name="spacey"; version="0.1.1"; sha256="1p8kx3d08q9kz1wb286m3d8ckwkhfm5n42m65m4w5gz5kpfx0xfz"; depends=[httr jsonlite magrittr png raster rayshader rgdal]; }; spacyr = derive2 { name="spacyr"; version="1.2.1"; sha256="1b2ccgwsiqkvp7w37x8k7699c676q16vfrybkrfvyczyhki4s6nw"; depends=[data_table reticulate]; }; - spaero = derive2 { name="spaero"; version="0.5.0"; sha256="1r3rgvmkcrkzm6ikbbmnm4rfdrnwgmn4wq21mxgjs2bzg2r72mw6"; depends=[]; }; + spaero = derive2 { name="spaero"; version="0.6.0"; sha256="0xigwi6w21y2fwicml0s2gylwnwp2qvrqskr0v8rd3bn01hg9ja3"; depends=[]; }; spagmix = derive2 { name="spagmix"; version="0.3-2"; sha256="18hffiknsx7z6w6p5dwqmg9fwghv1x6nzsxdlx0wjd6iixcf6a54"; depends=[abind mvtnorm RandomFields sparr spatstat]; }; - spam = derive2 { name="spam"; version="2.5-1"; sha256="0ry0a76cljlmilrzcriiizcidxyhq1i7i9bqhvl1qda81ld8hifi"; depends=[dotCall64]; }; - spam64 = derive2 { name="spam64"; version="2.5-1"; sha256="0fni9lwn51n0ax4qk1l1wslhbkfl44ryp5hgjprkql5a26nmv0nq"; depends=[]; }; + spam = derive2 { name="spam"; version="2.6-0"; sha256="0p5ycvpry955ldrgbbq3syy91wx9425mddpn8r5m9xwlirjxv3v3"; depends=[dotCall64]; }; + spam64 = derive2 { name="spam64"; version="2.6-0"; sha256="17i3s87hj3704al4shbjgp6fvai00xdx44wgfwgrfpbwya47q47n"; depends=[]; }; spanel = derive2 { name="spanel"; version="0.1"; sha256="1riyvvfij277mclgik41gyi01qv0k466wyk2wbqqhlvrlj79yzsc"; depends=[]; }; spanish = derive2 { name="spanish"; version="0.4.2"; sha256="15drc11lh0qxpww50p0smi8qxfbln82bx0yd74jqf71irhk5jxyp"; depends=[magrittr xml2]; }; - spant = derive2 { name="spant"; version="1.7.0"; sha256="06lixkgxy1r7i43k7nzsl8vidqgdg7gz5myj3zjr5n83ziz8ah6q"; depends=[abind complexplus fields foreach irlba jsonlite magrittr MASS matrixcalc miniUI minpack_lm mmand nloptr nnls numDeriv oro_dicom plyr pracma ptw readr RNifti RNiftyReg shiny signal smoother stringr tibble viridisLite]; }; + spant = derive2 { name="spant"; version="1.9.0"; sha256="0xzl6ay97sbmvr36pn7xb1r287a5cmdyf9g9inf2jl845xfh2g2b"; depends=[abind complexplus fields foreach irlba jsonlite magrittr MASS matrixcalc minpack_lm mmand nloptr nnls numDeriv plyr pracma ptw readr RNifti RNiftyReg signal smoother stringr tibble]; }; sparcl = derive2 { name="sparcl"; version="1.0.4"; sha256="138krflvfdlx4hlh90mswds51i8aw2vv00gm5lgkfsvxj4w324jg"; depends=[]; }; spark_sas7bdat = derive2 { name="spark.sas7bdat"; version="1.2"; sha256="1kvzfjhf1q5jzlq5d04s7d96j63vnvqqrh8s03rwkl79h1dhqhhp"; depends=[sparklyr]; }; sparkavro = derive2 { name="sparkavro"; version="0.3.0"; sha256="0g6ac9msfbx8f8j8rj0hvlxjsn317zyam207q7i8kf0hshs1r58f"; depends=[DBI dplyr sparklyr]; }; sparkbq = derive2 { name="sparkbq"; version="0.1.1"; sha256="0gccm8q5a45k9zm8f90r7fhcmriq8d038p022k7cikbr6rqsrmyh"; depends=[sparklyr]; }; sparkhail = derive2 { name="sparkhail"; version="0.1.1"; sha256="1a9p9i7fs6l9rx5ha6akjjl7qhfak01xsjg28ysv0imikmwp6hy7"; depends=[dplyr sparklyr sparklyr_nested]; }; sparkline = derive2 { name="sparkline"; version="2.0"; sha256="0lrr1lm7603di7x3mf53cp13d9ssjh9gmb43wa6z9yqapis2djm2"; depends=[htmltools htmlwidgets]; }; - sparklyr = derive2 { name="sparklyr"; version="1.3.1"; sha256="1fql2msrrfw3kk9kf0pz36lpsbnppbnipd5c90wbzpyhdp3ki6zd"; depends=[assertthat base64enc config DBI dbplyr digest dplyr ellipsis forge generics globals httr jsonlite openssl purrr r2d3 rappdirs rjson rlang rprojroot rstudioapi tibble tidyr uuid withr xml2]; }; + sparklyr = derive2 { name="sparklyr"; version="1.5.2"; sha256="09l4hnz5p665w5fj38h0bhf2j9cr1rgl7a65yyihn9d7jncrmfsy"; depends=[assertthat base64enc config DBI dbplyr digest dplyr ellipsis forge generics globals glue httr jsonlite lifecycle openssl purrr r2d3 rappdirs rlang rprojroot rstudioapi stringr tibble tidyr tidyselect uuid vctrs withr xml2]; }; + sparklyr_flint = derive2 { name="sparklyr.flint"; version="0.2.0"; sha256="1yzr89jza2ya4sym9ckmifg5q1cgix24x9x9pbkbiv3i29whi0pr"; depends=[dbplyr dplyr rlang sparklyr]; }; sparklyr_nested = derive2 { name="sparklyr.nested"; version="0.0.3"; sha256="0lva7fbjp253kxq3970h52cr8s52xycbi03d5shsyna8grhkbczj"; depends=[dplyr jsonlite listviewer purrr rlang sparklyr]; }; sparktex = derive2 { name="sparktex"; version="0.1"; sha256="0r6jnn9fj166pdhnjbsaqmfmnkq0qr1cjprihlnln9jad05mrkjx"; depends=[]; }; sparktf = derive2 { name="sparktf"; version="0.1.0"; sha256="0jd018n7553q0ldv6whxbj2s38myig0m8zq4fbp8fsv34q5wnsx4"; depends=[sparklyr]; }; - sparkwarc = derive2 { name="sparkwarc"; version="0.1.1"; sha256="07b66f12fz19042kj7d9p32j9sy3103zvil36xkf21hm9iyg6xph"; depends=[DBI sparklyr]; }; + sparkwarc = derive2 { name="sparkwarc"; version="0.1.5"; sha256="033clhl3pknjc7yzwa67l2l24sb2n61amc60zbvk2vc61yszl66f"; depends=[DBI Rcpp sparklyr]; }; sparkxgb = derive2 { name="sparkxgb"; version="0.1.0"; sha256="1gyvmsm7q6w55p62cysrnkn69kq5rr4vwkd5vrcgbwdy3fbpl9xq"; depends=[forge sparklyr]; }; sparr = derive2 { name="sparr"; version="2.2-13"; sha256="1cn8bzlfairfrxfwwdap0pnaa97rn9h13jz54il8cn9zacnzb8yc"; depends=[doParallel foreach misc3d spatstat spatstat_utils]; }; sparrpowR = derive2 { name="sparrpowR"; version="0.1.3"; sha256="18p8yym52cjb4pn7cw05f4ibzz1l9g48rq235g3wrmr552k839pi"; depends=[doParallel fields foreach raster sp sparr spatstat]; }; sparseBC = derive2 { name="sparseBC"; version="1.2"; sha256="0a1siyi9kc805qji4alnw3c21spf4iw4wpsbfl50zvs52p8vl8w2"; depends=[fields glasso]; }; sparseEigen = derive2 { name="sparseEigen"; version="0.1.0"; sha256="0vqcy61rarmp3liz8fr3vs3y40hkb3wfw89b5xsj1byaiap4772s"; depends=[]; }; - sparseFLMM = derive2 { name="sparseFLMM"; version="0.3.0"; sha256="0xl4zymdl9nxarn0nz8zhb1926lblb7jmyi7h1vp9cdl0hjwbiyy"; depends=[data_table MASS Matrix mgcv refund]; }; + sparseFLMM = derive2 { name="sparseFLMM"; version="0.3.1"; sha256="1v500lfzcxjz8xbwds1hlz449fm35nw4yv3gqcwklx51k31vpshv"; depends=[data_table MASS Matrix mgcv refund]; }; sparseHessianFD = derive2 { name="sparseHessianFD"; version="0.3.3.4"; sha256="1vm853x5vvk745mm68wx0bkimmgwnbrdhj2rwy1nmgpk1lzi8vq6"; depends=[Matrix Rcpp RcppEigen]; }; sparseIndexTracking = derive2 { name="sparseIndexTracking"; version="0.1.1"; sha256="0bgh29j22jm1yg2jp75xvv9jmqacb66vgv7ygf0xgnrwyrkxkm66"; depends=[]; }; sparseLDA = derive2 { name="sparseLDA"; version="0.1-9"; sha256="1k3sw9kc40yxnfss4vrsx34qxmv8ssddyhbfjhxrdldvblhbwchb"; depends=[elasticnet MASS mda]; }; - sparseLTSEigen = derive2 { name="sparseLTSEigen"; version="0.2.0"; sha256="11llmrkq0pnrdphgjvhmg269bq3xbbn4s7kd7xhvk62sigvspkcj"; depends=[Rcpp RcppEigen robustHD]; }; + sparseLTSEigen = derive2 { name="sparseLTSEigen"; version="0.2.0.1"; sha256="08xhpm9hp9x9rmiys4fvh9y4z2xsdkzckzw3lq0vlzvjcaynvidq"; depends=[Rcpp RcppEigen robustHD]; }; sparseMVN = derive2 { name="sparseMVN"; version="0.2.1.1"; sha256="0ikh1i4vid6r4sx9pdjqc5wbh4xdj966mr0b7jb1vjw18wrzad8q"; depends=[Matrix]; }; sparseMatEst = derive2 { name="sparseMatEst"; version="1.0.0"; sha256="06y061zl6id7cfw3cqzvwykzlijmala8hj61i04mgc491ngybimv"; depends=[glasso]; }; sparseSEM = derive2 { name="sparseSEM"; version="2.5"; sha256="0ig8apsi94kvbcq3i8nzmywbdizlss7c6r9bppcyl9lxgikc3cds"; depends=[]; }; sparseSVM = derive2 { name="sparseSVM"; version="1.1-6"; sha256="0b0qiikjyyh9qfd4jl69zqnlp7adxq63mwsxvgwvyc0pv5ccg8i0"; depends=[]; }; - sparsebn = derive2 { name="sparsebn"; version="0.1.0"; sha256="1f6b6wb5lg3avcgwcr2dbaikcrrvk0vb5ag5c1c30j0xckgl3n1v"; depends=[ccdrAlgorithm discretecdAlgorithm sparsebnUtils]; }; + sparsebn = derive2 { name="sparsebn"; version="0.1.2"; sha256="1b1601n3nmxck6a27xqxpsa79p4xnz7yyzdfqiddn9zd2b4v9wc5"; depends=[ccdrAlgorithm discretecdAlgorithm sparsebnUtils]; }; sparsebnUtils = derive2 { name="sparsebnUtils"; version="0.0.7"; sha256="1a810wrjvgzqmlgcx1lnvxz8j1v8ycfqwk9acnm84c4lmb8rkyx0"; depends=[Matrix nnet]; }; sparseinv = derive2 { name="sparseinv"; version="0.1.3"; sha256="06inzix9m7b5g7c97lyvyl2g7fdr4iz60791hl2w9mah7nd6bfja"; depends=[Matrix Rcpp spam]; }; sparsenet = derive2 { name="sparsenet"; version="1.4"; sha256="1r7xmpn3r8dq1zm6ghygks3l014kqlrpfgsl8q23w7rly8ksw3m9"; depends=[Matrix shape]; }; @@ -14526,14 +15143,15 @@ in with self; { sparsesvd = derive2 { name="sparsesvd"; version="0.2"; sha256="1xm969fjq3fv1p2sqza2apz8picibj4s2agpwf1sx9nwn3b587qs"; depends=[Matrix]; }; sparsevar = derive2 { name="sparsevar"; version="0.0.11"; sha256="18cylbi788ibpry6h9yphrwx2wwsaa25bq2s13h0dcfxyicl2f9p"; depends=[corpcor doParallel ggplot2 glmnet Matrix mvtnorm ncvreg picasso reshape2]; }; sparsio = derive2 { name="sparsio"; version="1.0.1"; sha256="181kzs9x3h497c7shfalbzrjz05bkj7mmjh9nyphxyi2jjrr6y1q"; depends=[Matrix Rcpp]; }; + sparta = derive2 { name="sparta"; version="0.7.0"; sha256="0x7lb6fng8xz1c53300aq62rpvksjmadk3pd0qz6n41yc68nmhwg"; depends=[Rcpp RcppArmadillo]; }; + spass = derive2 { name="spass"; version="1.3"; sha256="1c148z0i3d185hnf54xmgppjrblv3b2s3sm0lmj78gvav04mj5s4"; depends=[geepack MASS multcomp mvtnorm Rcpp]; }; spate = derive2 { name="spate"; version="1.7"; sha256="1cr5jjrycfj9larsqgzfakk4qgfz8m5djg4ddzk6s3lg2iw06y43"; depends=[mvtnorm truncnorm]; }; spatgraphs = derive2 { name="spatgraphs"; version="3.2-2"; sha256="09bbcqgmbg6a65mnxivr4pghsanj22x1j0l4hq8bzpwgbas7byhy"; depends=[Matrix Rcpp]; }; spathial = derive2 { name="spathial"; version="0.1.2"; sha256="1vwzcwpmx8kwv821vjf940qd5am3k0shf1s14jva71mgxs70ddmb"; depends=[class igraph irlba knitr MASS matrixStats pracma rmarkdown Rtsne]; }; spatial = derive2 { name="spatial"; version="7.3-12"; sha256="0qrdhzd5r78iwi46nk8jr56dzz5l5imkflxjw64d0ys0wyg06fbn"; depends=[]; }; spatialClust = derive2 { name="spatialClust"; version="1.1.1"; sha256="042yrmh1rb0hxynxlbdpcissgy9zazs5aqx7vj388ibynzijck3r"; depends=[ggplot2 maptools rgeos sp]; }; spatialCovariance = derive2 { name="spatialCovariance"; version="0.6-9"; sha256="1m86s9a059spp97y37dcirrgjshcqzpdj11cq92vji624w4nrhlb"; depends=[]; }; - spatialEco = derive2 { name="spatialEco"; version="1.3-2"; sha256="0yp5fp34gki858425xahs39klvhaqjhkjrrgb1ml84mix1z45ylx"; depends=[MASS raster rgeos sf sp spatstat spdep]; }; - spatialfil = derive2 { name="spatialfil"; version="0.15"; sha256="01fbn9zblz7rjsgqy3ikdqpf0p0idvb6m96mf7m7qi2ps5f48vzj"; depends=[abind fields]; }; + spatialEco = derive2 { name="spatialEco"; version="1.3-3"; sha256="0cddc69y90p9p6bdd82r3yi7ljjr1p813chvriqy2nahhg00yxia"; depends=[MASS raster rgeos sf sp spatstat spdep]; }; spatialfusion = derive2 { name="spatialfusion"; version="0.6-2"; sha256="1vqv4424m8rnmyg463mvnk26q7dis4wd47swyyc8f8r4qd85agnz"; depends=[fields Rcpp rstan SDraw sp]; }; spatialnbda = derive2 { name="spatialnbda"; version="1.0"; sha256="14mx5jybymasyia752f3vnr5vmswcavbz8bpqr69vlxphw27qkwk"; depends=[mvtnorm SocialNetworks]; }; spatialprobit = derive2 { name="spatialprobit"; version="0.9-11"; sha256="1cpxxylc0pm7h9m83m2cklrh4jni5x79r5m5gibxi6viahwxn9kc"; depends=[Matrix mvtnorm spdep tmvtnorm]; }; @@ -14541,17 +15159,17 @@ in with self; { spatialrisk = derive2 { name="spatialrisk"; version="0.6.7"; sha256="1vd90v55wy7b1aqhlr2b6x445nwghn94qyz39439pcmp5y9n8zb8"; depends=[automap classInt dplyr fs ggplot2 gstat lubridate mgcv Rcpp RcppProgress sf sp tmap viridis vroom]; }; spatialsegregation = derive2 { name="spatialsegregation"; version="2.45"; sha256="04ibvk6shs15b8piln2lcnlj8s5gy6r7wraz6591dbc31grzaa36"; depends=[spatstat]; }; spatialwarnings = derive2 { name="spatialwarnings"; version="2.0.0"; sha256="02dd4xyl3n6mfl201cmi0n2mq9j3p7mf0nn67nm6nnvgmkrpgxhg"; depends=[future future_apply ggplot2 gsl plyr Rcpp RcppArmadillo tidyr]; }; - spatialwidget = derive2 { name="spatialwidget"; version="0.2.2"; sha256="082w44i9is0cn4kgbqlnzclyp4fj2is0r5kla29nvm4m2y83bdjj"; depends=[BH colourvalues geojsonsf jsonify rapidjsonr Rcpp sfheaders]; }; - spatsoc = derive2 { name="spatsoc"; version="0.1.14"; sha256="0h9rrlansr2pk7n1jlq9pyn7d3q97q39c5zar4v9mdbyspfgbch1"; depends=[adehabitatHR data_table igraph rgeos sp]; }; + spatialwidget = derive2 { name="spatialwidget"; version="0.2.3"; sha256="0j0v0cyqndlg9p7g03gp1br9b2i3p50abzpw67k3cawm96a87crj"; depends=[BH colourvalues geojsonsf geometries jsonify rapidjsonr Rcpp sfheaders]; }; + spatsoc = derive2 { name="spatsoc"; version="0.1.15"; sha256="0w8bf2lh8p2823sx6mm8dyyhd3n2aiz1cn8f5bp3j26bg6q9gr2i"; depends=[adehabitatHR data_table igraph rgeos sp]; }; spatstat = derive2 { name="spatstat"; version="1.64-1"; sha256="06jmxfs9kz9qqi3ichfgn8dglwb87kq2nl578p83za5psv8cfgya"; depends=[abind deldir goftest Matrix mgcv nlme polyclip rpart spatstat_data spatstat_utils tensor]; }; spatstat_Knet = derive2 { name="spatstat.Knet"; version="1.12-2"; sha256="01h01nqb18vjvr50xfn3zl7nwbs62gzjxdj6mjs3lxz3y9ljsmh1"; depends=[Matrix spatstat spatstat_utils]; }; - spatstat_data = derive2 { name="spatstat.data"; version="1.4-3"; sha256="18lfj5vkwxgf5w9qz0g5al3zy8y2yi3bnd13w24hszfc82nbcmc9"; depends=[Matrix spatstat_utils]; }; + spatstat_data = derive2 { name="spatstat.data"; version="1.7-0"; sha256="0by10dx72jjn6rvgrdj4xwh4zg6vxi4cp536aq4b6drb7za95hdv"; depends=[Matrix spatstat_utils]; }; spatstat_gui = derive2 { name="spatstat.gui"; version="1.0-2"; sha256="07lk3xrg5cyvgvw2xwvi77s4ma8qbnmy4whsvm1wdfvw40c0mfrz"; depends=[rpanel spatstat spatstat_utils]; }; spatstat_local = derive2 { name="spatstat.local"; version="3.6-0"; sha256="19kv85smy8jp2bx1mgppav50k07xm8zvmf7snzj29rrspiws7sig"; depends=[spatstat spatstat_utils tensor]; }; spatstat_sparse = derive2 { name="spatstat.sparse"; version="1.1-0"; sha256="1iz6s1y765xi3n5x81n4fs52f4zr6r95mpg8263j0hjiqqg54vww"; depends=[abind Matrix spatstat_utils tensor]; }; spatstat_utils = derive2 { name="spatstat.utils"; version="1.17-0"; sha256="08h9kzkkxvlnngxnv5mdylfali5jj4yhgbr8kvf8l7glswz6ik9r"; depends=[]; }; spatsurv = derive2 { name="spatsurv"; version="1.5"; sha256="1l1yxh2ix13314z4mjpf9nz8ad8423v09vzwq95qlazc27hlhyyd"; depends=[fields iterators lubridate Matrix RandomFields raster RColorBrewer rgeos sp spatstat stringr survival]; }; - spbabel = derive2 { name="spbabel"; version="0.5.1"; sha256="1q4y5has7yrsn1hv5nzm4imciv5sw5ycsvy5mpikrs1i670rbp6b"; depends=[dplyr rlang sp tibble]; }; + spbabel = derive2 { name="spbabel"; version="0.5.5"; sha256="0yfkz28nfvl3rm0bxljb3y19zhnx7pabxy81d835pbfmjq5vvp51"; depends=[dplyr rlang sp tibble]; }; spc = derive2 { name="spc"; version="0.6.4"; sha256="0r2ydj4mckpmf41kwn74xbd408xd3mx017l24cikx304n95a9j7y"; depends=[]; }; spc4sts = derive2 { name="spc4sts"; version="0.5.2"; sha256="039z6dnry5c2brmh7jsnb6cvb7a8nig1rrf4d4i5bpifi2x1hf06"; depends=[gridExtra LS2Wstat rpart]; }; spcadjust = derive2 { name="spcadjust"; version="1.1"; sha256="016i3zaaq800x4niz4fixa57nfj1m10sz5xskff4vq4v9fjn2sl0"; depends=[]; }; @@ -14570,7 +15188,8 @@ in with self; { spec = derive2 { name="spec"; version="0.1.7"; sha256="0zgs9yki11wysvjnx88gl8iv0mcsbrasg29sbasp0855x5l8cg8k"; depends=[csv encode magrittr]; }; speccalt = derive2 { name="speccalt"; version="0.1.1"; sha256="0j7rbidmmx78vgwsqvqjbjjh92fnkf2sdx0q79xlpjl2dph7d6l6"; depends=[]; }; specklestar = derive2 { name="specklestar"; version="0.0.1.7"; sha256="04vm989yi31vqnf5rs6cdyikm4jzfd9njxh0ls3dvjrg19ipsnmn"; depends=[Rcpp]; }; - specmine = derive2 { name="specmine"; version="3.0.1"; sha256="0d6n94fsjzvrjad8br7878p857584my157rc6fbijqkwwrhfhp4x"; depends=[baseline caret compare e1071 ellipse gdata genefilter GGally ggplot2 hyperSpec impute MASS Metrics pcaPP pls RColorBrewer readJDX speaq]; }; + specmine = derive2 { name="specmine"; version="3.0.3"; sha256="1ysw0nrv91xdwmcz7w8ngdfp83jmjj4ay0dj7mwvivn7g5456agz"; depends=[baseline caret compare e1071 ellipse genefilter GGally ggplot2 impute imputeTS MASS Metrics pcaPP pls RColorBrewer readJDX speaq specmine_datasets]; }; + specmine_datasets = derive2 { name="specmine.datasets"; version="0.0.1"; sha256="1mr7cxr017lwxhdgw2kndjidxj4jj66ch6gxddjcplgq8wc158vx"; depends=[xcms]; }; specr = derive2 { name="specr"; version="0.2.1"; sha256="17bc7f644g40zsfxv3sw542piqgg09w3m3q14jgrifc8sw0ljvdf"; depends=[broom cowplot dplyr ggplot2 ggraph glue igraph lme4 magrittr purrr rlang tibble tidyr]; }; specs = derive2 { name="specs"; version="0.1.1"; sha256="0x5s7aikj5x1dgxygizh2mcni74hy6dm7084h1pqqbh5ans00c6n"; depends=[Rcpp RcppArmadillo]; }; spectacles = derive2 { name="spectacles"; version="0.5-2-2"; sha256="0nr2s6mnnir7jwrv80s2vk8wffqd7dl7xj82ss1idshqxk0dliz3"; depends=[baseline epiR ggplot2 plyr reshape2 signal stringr]; }; @@ -14578,23 +15197,25 @@ in with self; { spectralAnalysis = derive2 { name="spectralAnalysis"; version="3.12.0"; sha256="0mz01hx86qi65k6vzz9k1j9q7gi10dh14cqvrlfy93f3kmi52q0x"; depends=[baseline BiocGenerics data_table ggplot2 hNMF jsonlite magrittr NMF nnls plotly plyr RColorBrewer signal viridis]; }; spectralGP = derive2 { name="spectralGP"; version="1.3.3"; sha256="1jf09nsil4r90vdj7n1k6ma9dzzx3bwv0fa7svil9pxrd2zlbkbs"; depends=[]; }; spectralGraphTopology = derive2 { name="spectralGraphTopology"; version="0.2.0"; sha256="02j374zsz4ba8ldy52x43rih1p77b56cv5xlbycj5wmkzny2gzx1"; depends=[MASS Matrix progress Rcpp RcppArmadillo RcppEigen rlist]; }; - spectrolab = derive2 { name="spectrolab"; version="0.0.9"; sha256="085c7kpc142bx4ah9wnfc9isfs6y4960rs0cg6cw36179s31d17g"; depends=[devtools prospectr RColorBrewer shiny shinyjs usethis]; }; + spectrolab = derive2 { name="spectrolab"; version="0.0.10"; sha256="1hmz5a5x8xf2xw6qz6h21gzyswi0al4bnpygxf0rhg4i9wpfch9j"; depends=[prospectr RColorBrewer shiny shinyjs]; }; sped = derive2 { name="sped"; version="0.2-1"; sha256="05igpk8szdcs6kjhpmd9dmjvqdg199pz3hi0rwkhdjglxivvjzjn"; depends=[pooh]; }; speech = derive2 { name="speech"; version="0.1.0"; sha256="007s32w8qr45x1n40xdh85a329cgmm3809bi62ghnxzfny9vjb07"; depends=[dplyr lubridate magrittr pdftools purrr stringr tabulizer tibble tidyr tm]; }; speedglm = derive2 { name="speedglm"; version="0.3-2"; sha256="1b25zimk0z7ad62yacqdg0zk0qs0jja4i918ym942xfw4j1z3jjz"; depends=[MASS Matrix]; }; spef = derive2 { name="spef"; version="1.0.9"; sha256="115lmv2a21ws1mj22v1fbk72mqn3siqmw3frbg4nci96lnyr7qh6"; depends=[BB ggplot2 nleqslv plyr sm SQUAREM survival]; }; speff2trial = derive2 { name="speff2trial"; version="1.0.4"; sha256="0dj5mh2sdp6j4ijgv14hjr39rasab8g83lx1d9y50av11yhbf2pw"; depends=[leaps survival]; }; spellcheckr = derive2 { name="spellcheckr"; version="0.1.2"; sha256="09snc1ymzr4njnr3w502b84dqwjjd414higjxqi48jvh27br5k1l"; depends=[data_table dplyr stringr]; }; - spelling = derive2 { name="spelling"; version="2.1"; sha256="1j92brq29za3di1723xhmx240ya2v351dvcg0r1xr5yclw1kh3jp"; depends=[commonmark hunspell knitr xml2]; }; + spelling = derive2 { name="spelling"; version="2.2"; sha256="179nj9w1v27qq9q5240ddvggp0795998sxyqjvbqjvq9dmach3bl"; depends=[commonmark hunspell knitr xml2]; }; spemd = derive2 { name="spemd"; version="0.1-1"; sha256="1aw8dg2fm8qd95bgim2kjwp7ax4b2g78521llsxv7fhdj9hl7rgw"; depends=[MBA sp spdep]; }; sperich = derive2 { name="sperich"; version="1.5-8"; sha256="0v4mnv9nl0dvmmfx10w03k02pwjjnip9526m3j1kpgn6c4wk1h93"; depends=[foreach rgdal sp]; }; sperrorest = derive2 { name="sperrorest"; version="3.0.1"; sha256="0lj8iwl5x9krxw9ffbxxgi94imlhyc9zzl5p90xylk5dsn0gcb76"; depends=[future future_apply ROCR stringr]; }; spex = derive2 { name="spex"; version="0.7.1"; sha256="0lsmh1sywd4si0v10aix44hybwph3gan8w8cxz956dcgkz60p41v"; depends=[crsmeta quadmesh raster reproj sp]; }; + spfda = derive2 { name="spfda"; version="0.9.0"; sha256="156vs1f75x0wbf65fwzkhlbda649sryf58xixi7gbfjzn873w111"; depends=[mathjaxr]; }; + spfilteR = derive2 { name="spfilteR"; version="1.0.0"; sha256="0pldarr2kdf7fkkdpmpx5azqzgfwzqbd6qb4fg7xjsj78bza6fif"; depends=[]; }; spfrontier = derive2 { name="spfrontier"; version="0.2.5"; sha256="1vnvwcjbhvbmyn5rp4760amzy8k3y156q629fjymw9rw6zy45pbf"; depends=[ezsim moments mvtnorm numDeriv optimx spdep tmvtnorm]; }; spftir = derive2 { name="spftir"; version="0.1.0"; sha256="07vw8igy698jx671cj6hmf6ll9xvaq81fb6la7j95pqbd6jl284z"; depends=[pracma]; }; spgrass6 = derive2 { name="spgrass6"; version="0.8-9"; sha256="05xvdhisad0d7c69mvahzg6pvgvmb6dph50r34981palykic7qhn"; depends=[sp XML]; }; spgs = derive2 { name="spgs"; version="1.0-3"; sha256="0a7zqih8q4imi49in8d2j9wa82savp7d2g4xy4wlwblwf6f2ggsh"; depends=[]; }; - spgwr = derive2 { name="spgwr"; version="0.6-33"; sha256="1nbg4jacc4iimn79b60c6q9qf09j35yxa2nmlwwijmixa15gmqyd"; depends=[sp spData]; }; + spgwr = derive2 { name="spgwr"; version="0.6-34"; sha256="1zmd7zp1h98y0xnxacym29b8kcp79yrsss1c49b5rfnml9ksdaqx"; depends=[sp spData]; }; spherepc = derive2 { name="spherepc"; version="0.1.4"; sha256="0jyaanwb78gv3cb1ig86h8cjaw35pxwx7hq53kc9iwjfhkrmc2j3"; depends=[geosphere rgl sphereplot]; }; sphereplot = derive2 { name="sphereplot"; version="1.5"; sha256="1i1p20h95cgw5wqp9bwfs9nygm4dxzsggz08ncjs1xrsvhhq9air"; depends=[rgl]; }; sphet = derive2 { name="sphet"; version="1.7"; sha256="0savvqz3v5awsr7kcghg6yzkqdpm01kwp7jrg9ajfb3146gg8mlq"; depends=[Matrix nlme sp spdep]; }; @@ -14607,8 +15228,8 @@ in with self; { spikes = derive2 { name="spikes"; version="1.1"; sha256="080sna0sgii61kai5sirs6cijnvk1012djwfw705di9y2lvk1hqk"; depends=[emdbook]; }; spikeslab = derive2 { name="spikeslab"; version="1.1.5"; sha256="0dzkipbrpwki6fyk4hqlql3yhadwmclgbrx00bxahrmlaz1vjzh2"; depends=[lars randomForest]; }; spinBayes = derive2 { name="spinBayes"; version="0.1.0"; sha256="1qgqxxk4n17wj3q07irm2qj6lwc5188iwwbdkf588hvfy86lwpj8"; depends=[glmnet MASS Rcpp RcppArmadillo]; }; - spind = derive2 { name="spind"; version="2.2.0"; sha256="1qswvj8hcjds3mjffzlxq87g79gijsk3mw26lfr81vyf5zmwm4w4"; depends=[gee geepack ggplot2 lattice MASS RColorBrewer rje rlang splancs stringr waveslim]; }; - spinifex = derive2 { name="spinifex"; version="0.2.5"; sha256="0an9k3ygcq6pyryms6b04fzkl6wqh84g353apx07zr52qn32kycr"; depends=[gganimate ggplot2 plotly shiny tourr]; }; + spind = derive2 { name="spind"; version="2.2.1"; sha256="1yasqy086h4dv348krisc024mic0dvdsncqys95l85924djlfipp"; depends=[gee geepack ggplot2 lattice MASS RColorBrewer rje rlang splancs stringr waveslim]; }; + spinifex = derive2 { name="spinifex"; version="0.2.7"; sha256="1adgkadwqb3k75gc1l5wwdkvhlx54wviskzw2776ln914kh2in7h"; depends=[dplyr gganimate ggplot2 plotly RColorBrewer shiny tourr]; }; spinyReg = derive2 { name="spinyReg"; version="0.1-0"; sha256="0kbg7rncrrl5xdsaw9vj909x97mfp77mjnvghczplmnwmmanyn72"; depends=[]; }; spiritR = derive2 { name="spiritR"; version="0.1.1"; sha256="1fjr63rl9hwqxzgm4lkb9v74cxxpi4lrlcgjixdm7zgccm8ihdvh"; depends=[httr magrittr xml2]; }; splancs = derive2 { name="splancs"; version="2.01-40"; sha256="0qs3lwyllrkahnvqbm8bzrf03bm9zk4s7p1n19s638y4xf0l6x3r"; depends=[sp]; }; @@ -14616,13 +15237,14 @@ in with self; { splines2 = derive2 { name="splines2"; version="0.3.1"; sha256="03zh3v8z0030ivja4a08f0rrkn6k5g5kyaqnys81h3wja10gllyv"; depends=[Rcpp RcppArmadillo]; }; splinetree = derive2 { name="splinetree"; version="0.2.0"; sha256="0gqb3kwca42crrx6fj42ryl5pkxvankhp1chdlvi5lgg8mzmqsnl"; depends=[ggplot2 mclust mosaic nlme rpart treeClust]; }; splitFeas = derive2 { name="splitFeas"; version="0.1.0"; sha256="1cfiis32h5kkp8r1mndmj4xss9gw96vdzk7q68q3jhbwqiaxp9rp"; depends=[corpcor matrixStats]; }; - splitSelect = derive2 { name="splitSelect"; version="1.0.0"; sha256="044pmsdq1kvs3qjglrdpwq5kxvxfybpaqmqhnmwpw4xlql4afvyc"; depends=[caret doParallel foreach glmnet multicool mvnfast]; }; - splitTools = derive2 { name="splitTools"; version="0.2.1"; sha256="09dpkrdfkhh7hqgf0r4c5qx74aghs2gqy47dyakkb19fbx66glhl"; depends=[]; }; + splitSelect = derive2 { name="splitSelect"; version="1.0.1"; sha256="0pkiarjwjw8s3rspj2910lwrcy71qjx1i2fp1q98k05b39v8m5da"; depends=[caret doParallel foreach glmnet multicool]; }; + splitTools = derive2 { name="splitTools"; version="0.3.1"; sha256="015vk8awxfc3zmcm3h51b6fy7si31g8w7mg4ig5fvpgsnm97h7rw"; depends=[]; }; splitfngr = derive2 { name="splitfngr"; version="0.1.2"; sha256="0cf9y68m72j890a732m0n784nr12ydljr6s8i80f0in6q8lmw8ls"; depends=[lbfgs]; }; splithalf = derive2 { name="splithalf"; version="0.7.1"; sha256="0mpg6i6zh4s9sz10gs0h3y1cc1zva7vs805sb3qkghx857psgyw3"; depends=[dplyr ggplot2 patchwork plyr Rcpp robustbase tidyr]; }; splithalfr = derive2 { name="splithalfr"; version="2.0.12"; sha256="0xcd0zjm8nvj1vq241m2y9gdygiwi0mzvyh4znq7biviwfkya3ag"; depends=[bcaboot dplyr psych rlang tibble]; }; splitstackshape = derive2 { name="splitstackshape"; version="1.4.8"; sha256="0mpyf2kkfdl69pdc6brl1r6101vyc6pgr7z17s55ppg3y71k4q35"; depends=[data_table]; }; splm = derive2 { name="splm"; version="1.4-11"; sha256="15app94mxs6xlmqqhpa0q041skc4n4l2wfi6pmmhwinrgcqgncln"; depends=[bdsmatrix ibdreg MASS Matrix maxLik nlme plm spam spdep]; }; + splmm = derive2 { name="splmm"; version="1.1.2"; sha256="1ch9nm6h2l4s90dz0a8j6w77i1di5sf0glwayi84nanxad9q09i2"; depends=[emulator ggplot2 gridExtra MASS miscTools penalized plot3D Rcpp RcppArmadillo]; }; splot = derive2 { name="splot"; version="0.5.1"; sha256="0m2cx5rrwfyznzn12z9xkyrs9i6qkwyyymbk3z28gjxw31kszlc9"; depends=[]; }; spls = derive2 { name="spls"; version="2.2-3"; sha256="0bmb0ai5z80njhypd342i711x0bdkwcvlyn374lyyzj8h3d97mmv"; depends=[MASS nnet pls]; }; splus2R = derive2 { name="splus2R"; version="1.2-2"; sha256="0xrbj8vxy0pc6hl7m8abv71d3hjw47cl51s7j7priadyqczkq6sz"; depends=[]; }; @@ -14641,8 +15263,8 @@ in with self; { sport = derive2 { name="sport"; version="0.2.0"; sha256="1wb28iaa35naf5aczijb5g0l41yf098f7c20mjmkcd5w04l1mmks"; depends=[data_table ggplot2 Rcpp]; }; spotGUI = derive2 { name="spotGUI"; version="0.2.1"; sha256="1z664ricdsn8c29ks6hslm89f0qq6ls94pz4k256427cs95pk3ay"; depends=[gridExtra httpuv plotly rclipboard rhandsontable shiny shinyBS shinydashboard shinyjs smoof SPOT XML]; }; spp = derive2 { name="spp"; version="1.16.0"; sha256="08zxxgyp0h6733b08jmml7k4rhfd3mi5dda3jrzid0s184y0z29w"; depends=[BH caTools Rcpp Rsamtools]; }; - sppmix = derive2 { name="sppmix"; version="1.0.2"; sha256="1924lrxjlijlbvjbkkwb3pfa4klg49ph6hz66b7kyy1371wa2b9y"; depends=[fields ggplot2 mvtnorm Rcpp RcppArmadillo rgl spatstat]; }; - spray = derive2 { name="spray"; version="1.0-9"; sha256="06w97jd4sw2gyjw6m1gljx8mghyxvyrabhmai8ccjq1j9f28q8q3"; depends=[magic partitions Rcpp]; }; + sppmix = derive2 { name="sppmix"; version="1.0.2.1"; sha256="0rgxaw7xqlrcmyq772afs2ymgbsc296g6c3jx9bi8hlfygb3lk09"; depends=[fields ggplot2 mvtnorm Rcpp RcppArmadillo rgl spatstat]; }; + spray = derive2 { name="spray"; version="1.0-10"; sha256="1iz704ym09rn3fdjymdmbiifvw5qn2bm50rmzxa8igkn66cgm163"; depends=[magic mathjaxr partitions Rcpp]; }; spread = derive2 { name="spread"; version="2019.8.5"; sha256="1mc25abh1jxgis9p78pdy91a45kanr7y32xbqypyd514jjylnc52"; depends=[data_table fhidata Rcpp RcppProgress readxl stringr zoo]; }; spreadr = derive2 { name="spreadr"; version="0.1.0"; sha256="1azf1543ijlgmry0f2sxivpy4hk9mcwnn5kqggzwwzwla2ql3lhj"; depends=[extrafont ggplot2 igraph Rcpp]; }; sprex = derive2 { name="sprex"; version="1.4.1"; sha256="14idml4mipd4wyza7hqf49ww4dparmwaps35hxm8jg5h0w1pgh7j"; depends=[swfscMisc]; }; @@ -14654,9 +15276,9 @@ in with self; { spselect = derive2 { name="spselect"; version="0.0.1"; sha256="02aiml4dh40n6yl52ypramn4847ykdi4y5lhsmchnnp4nnnqycsn"; depends=[magic pracma tester]; }; spsh = derive2 { name="spsh"; version="1.1.0"; sha256="1rmsgp0mrb4153v5f5xby7r3izvgz1a0vi63g5p9q5jd6z0gd2i1"; depends=[DEoptim FME hypergeo lhs pracma Rdpack]; }; spsi = derive2 { name="spsi"; version="0.1"; sha256="0q995hdp7knic6nca0kf5yzkvv8rsskisbzpkh9pijxjmp1wnjrx"; depends=[plot3D]; }; - spsur = derive2 { name="spsur"; version="1.0.1.5"; sha256="04vpal54d9b4r6g9cwxqyxh3kk8lyq30x7ki48i399d4k4ffhgz7"; depends=[car Formula ggplot2 gmodels gridExtra lmtest MASS Matrix minqa numDeriv rlang sparseMVN spatialreg spdep]; }; + spsur = derive2 { name="spsur"; version="1.0.1.6"; sha256="1dllgnv2javrbmy4a5cg4n0rmr6igalr2xza39bqv3817p0mpaal"; depends=[car Formula ggplot2 gmodels gridExtra knitr lmtest MASS Matrix minqa numDeriv Rdpack rlang rmarkdown sparseMVN spatialreg spdep]; }; spsurv = derive2 { name="spsurv"; version="1.0.0"; sha256="11jlbzvzxv3d1d0nwpbii46ddvphglrxv25rw7pvxbybcx2i7k6x"; depends=[BH coda loo MASS Rcpp RcppEigen rstan rstantools StanHeaders survival]; }; - spsurvey = derive2 { name="spsurvey"; version="4.1.3"; sha256="1xpygn6wfkw9y5p1a9jmcky5asi1387bwh7wmlksn90zzn89wir2"; depends=[crossdes deldir foreign Hmisc MASS rgeos sf sp]; }; + spsurvey = derive2 { name="spsurvey"; version="4.1.4"; sha256="1dz6g0kb4gjsbkmj66926cxlfx7phx6mg483r0qz4wwmmba9qgbh"; depends=[crossdes deldir foreign Hmisc MASS rgeos sf sp]; }; spt = derive2 { name="spt"; version="2.5.1"; sha256="04j38d2b35p4798znnc49vqrg8r8bygwi07vybfj3nzimlp2mkrn"; depends=[]; }; sptm = derive2 { name="sptm"; version="2019.11-25"; sha256="1hdymzngdppmh56dqh0k88n9hg68pbx9rgmimbz4ihnfx2plvadh"; depends=[kyotil survey survival]; }; sptotal = derive2 { name="sptotal"; version="0.1.0"; sha256="0fr2czqfrk8n3iza2v5vpr00zs4s3dk4ar4xzfsriw5542glhykv"; depends=[ggplot2 matrixcalc mvtnorm sp tibble viridis]; }; @@ -14669,19 +15291,21 @@ in with self; { sqlutils = derive2 { name="sqlutils"; version="1.2"; sha256="0dq4idg8i4hv9xg8jllllizqf3s75pdfm1wgncdjj52xhxh169pf"; depends=[DBI roxygen2 stringr]; }; sqp = derive2 { name="sqp"; version="0.5"; sha256="0l01zwcryv5bmzmd98gj0m5ip8nvr8lziq1awvfif1bzwvvd2kzx"; depends=[Matrix Rcpp RcppArmadillo RcppEigen Rdpack]; }; squash = derive2 { name="squash"; version="1.0.9"; sha256="1x66iamj5pir6l9aqx4x7xylxxjpjrw8vcix9rbhfd0y0y2iqf7z"; depends=[]; }; - squashinformr = derive2 { name="squashinformr"; version="0.1.2"; sha256="0983acs4h4ksdax89hy97l37rdwzwn40m3vimkrsfc1d586hvnv1"; depends=[dplyr Hmisc janitor lubridate naniar plyr polite rlang rvest stringr tibble tidyr xml2]; }; + squashinformr = derive2 { name="squashinformr"; version="0.1.5"; sha256="0mj5xc9qsvzh08bxliipaj83wmxxgi6bgxl8x0bgink9s8s9g2ws"; depends=[dplyr Hmisc janitor lubridate naniar plyr polite rlang rvest stringr tibble tidyr xml2]; }; squid = derive2 { name="squid"; version="0.1.2"; sha256="1sf7q9pp68inr4ikaxm51f31gwxq9ixrsismrnnsby3agq6nsmkb"; depends=[arm data_table ggplot2 lme4 MASS shiny]; }; sra = derive2 { name="sra"; version="0.1.3"; sha256="0bdxgsz177szfqmvffidgkhl0lrdd7c1nzdvh7ijx99zmi5ww71n"; depends=[]; }; + srcr = derive2 { name="srcr"; version="1.0.0"; sha256="1wk18a1c0pf6mq3k78qi7fhivahx2q22rcs2ajsdj73b0993wnbm"; depends=[DBI dplyr jsonlite]; }; srm = derive2 { name="srm"; version="0.3-6"; sha256="0mc97pv1hsmia4v2wyb8yi37i3v1xypfv9xmhjb989xnnysf1lm3"; depends=[Rcpp RcppArmadillo]; }; srp = derive2 { name="srp"; version="1.2.0"; sha256="0xdzfvi7z78xmyxwd8fha3lr86jwmgjba1w8hhn4sv3v5gc9vlkh"; depends=[fda mgcv]; }; - srvyr = derive2 { name="srvyr"; version="0.4.0"; sha256="03r9swnsnfz401lvsa8951r6h8p2fvj7isd1gsh6dkkm9plvrqh8"; depends=[dplyr magrittr rlang survey tibble tidyselect]; }; + srt = derive2 { name="srt"; version="1.0.0"; sha256="0mxmg0j1acfks6gdmb08jlf03qwmx7s5p5li4z7zq35g1wml8icf"; depends=[]; }; + srvyr = derive2 { name="srvyr"; version="1.0.0"; sha256="1p0185svcc71s2c00ym2vkml4mk9blpki5z9s4c06nzm7ylb1dmq"; depends=[dplyr magrittr rlang survey tibble tidyr tidyselect]; }; ss3sim = derive2 { name="ss3sim"; version="1.0.3"; sha256="0s2yajlhi07fvqc0rr4msd9g2jrswb83dx55wsxnw925vikqa5kz"; depends=[bbmle foreach ggplot2 gtools r4ss]; }; ssMousetrack = derive2 { name="ssMousetrack"; version="1.1.5"; sha256="069jsp2l63jp4fv2hwadqxpkp89aqmbh439zy66rx55kws75b556"; depends=[BH CircStats cowplot dtw ggplot2 Rcpp RcppEigen rstan rstantools StanHeaders]; }; ssanv = derive2 { name="ssanv"; version="1.1"; sha256="17a4a5azxm5h2vxia16frcwdyd36phpfm7fi40q6mnnrwbpkzsjd"; depends=[]; }; ssc = derive2 { name="ssc"; version="2.1-0"; sha256="1lq71p8hbjfg4a52009810k5dmhak9ddk1dywvhy7v2gjmxqnadw"; depends=[proxy]; }; sscor = derive2 { name="sscor"; version="0.2"; sha256="1kcrr90cxg6k4qkc3pidhkwf4dsnlgbxczxigr2afwpd9cpf104c"; depends=[mvtnorm pcaPP robustbase]; }; ssd = derive2 { name="ssd"; version="0.3"; sha256="1z61n9m6vn0ijawyz924ak0zfl9z13jsb4k4575b7c424ci2p6gy"; depends=[]; }; - ssdtools = derive2 { name="ssdtools"; version="0.3.0"; sha256="0dq2asr9dlxyb0bfinzc91l10clg4kb7fgckfqz9pd1mhiz41as8"; depends=[abind actuar chk fitdistrplus ggplot2 lifecycle Rcpp scales tibble VGAM]; }; + ssdtools = derive2 { name="ssdtools"; version="0.3.2"; sha256="0m1qiba7byc5kvs4b57vkg6jr5ghllbpkg2pcybi9q3llhl4pxd3"; depends=[abind actuar chk fitdistrplus ggplot2 lifecycle Rcpp scales tibble VGAM]; }; sse = derive2 { name="sse"; version="0.7-16"; sha256="1kxdgbskw7v48jnif4dpmwxpsdznfx8d9q5nkf3ynw9xl38rzv23"; depends=[lattice]; }; ssev = derive2 { name="ssev"; version="0.1.0"; sha256="1iw07gw9vhg073s5kkxh5f1si6p998rc1i2zglnpk5c3pi3l55wp"; depends=[MESS pwr]; }; ssfa = derive2 { name="ssfa"; version="1.1"; sha256="0fkyalhsjmx2sf8xxkppf4vd272n99nbkxh1scidrsgp4jk6z7fx"; depends=[Matrix maxLik sp spdep]; }; @@ -14704,10 +15328,10 @@ in with self; { sstModel = derive2 { name="sstModel"; version="1.0.0"; sha256="04dvj6dbxidn1df2rslppl2pw2ql09rag39jrzdbnv6z20szbbd9"; depends=[data_table MASS openxlsx readxl shiny shinydashboard]; }; ssvd = derive2 { name="ssvd"; version="1.0"; sha256="1fdpr38qi59ijrz16jixn6ii1hvmxfjirjqfcp7dxrqz9nx8x0sk"; depends=[]; }; ssym = derive2 { name="ssym"; version="1.5.7"; sha256="0l5d921vlhd4qwddllrgcxpq3bhivvy5ikh3ixdy3s140rzpgwrv"; depends=[Formula GIGrvg normalp numDeriv sandwich survival]; }; - st = derive2 { name="st"; version="1.2.5"; sha256="0dnyfjcz37gjjv87nrabb11gw2dlkqhq3mrxdpkzahx0w0g0q0pb"; depends=[corpcor fdrtool sda]; }; + st = derive2 { name="st"; version="1.2.6"; sha256="0v2bii21c0dg25zbf2379q7jy6z4z93hpw3rd32gm77bvgr0fd40"; depends=[corpcor fdrtool sda]; }; stR = derive2 { name="stR"; version="0.4"; sha256="120k8k1l8cfy8x746808jym7lnaplgh4s3lycgyq2wia2c35r0rc"; depends=[foreach forecast Matrix quantreg rgl SparseM]; }; stUPscales = derive2 { name="stUPscales"; version="1.0.3.4"; sha256="0a6b38lhi1p0n2hjq2j8aw2vkasdv50cpgllxfxla7ddwbhbk3nk"; depends=[data_table doParallel EmiStatR foreach ggplot2 hydroGOF lattice lmom mAr moments msm xts zoo]; }; - staRdom = derive2 { name="staRdom"; version="1.1.14"; sha256="0byxkl6i3bbwk6h4g4z09aif87gmlvxy64jny4c5c5bdpf4k3zbc"; depends=[cdom data_table doParallel dplyr drc eemR foreach GGally ggplot2 gtools matrixStats MBA multiway pracma R_matlab readr stringr tibble tidyr zoo]; }; + staRdom = derive2 { name="staRdom"; version="1.1.18"; sha256="1ywc8mp0j8fl3ki18sqjh9x582wza3l0ydfpfbx3vyzwqb9gdl2s"; depends=[cdom data_table doParallel dplyr drc eemR foreach GGally ggplot2 gtools matrixStats MBA multiway pracma R_matlab readr stringr tibble tidyr zoo]; }; staTools = derive2 { name="staTools"; version="0.1.0"; sha256="1ksr0sjkhlwh0fkwcxjcxzbyxs1g78m4spkhrmgdpfzmk5zskqf9"; depends=[magicaxis Rcpp VGAM]; }; stability = derive2 { name="stability"; version="0.5.0"; sha256="0mz7ikfhpfbdcp72klq7fi4zfmx2w18gz46yhwywcc4dyi277m11"; depends=[dplyr ggfortify ggplot2 lme4 magrittr matrixStats reshape2 rlang scales tibble tidyr]; }; stable = derive2 { name="stable"; version="1.1.4"; sha256="01azqg4yi5wl6wfdpjq57w41x5z2b4dsp5n3vpkz24b9avk6rm8s"; depends=[rmutil stabledist]; }; @@ -14715,54 +15339,60 @@ in with self; { stabledist = derive2 { name="stabledist"; version="0.7-1"; sha256="0scar396wiq6wkbkvwp4qrxqc1m075y56p37i6iry5rw796p1i86"; depends=[]; }; stablelearner = derive2 { name="stablelearner"; version="0.1-2"; sha256="18yrx2h71b857j0xyh68pj80p2xk6yhbfzhd3mdhiqw0irmc5755"; depends=[e1071 MASS party partykit randomForest ranger]; }; stablespec = derive2 { name="stablespec"; version="0.3.0"; sha256="0m143cq0baj2lyakhr31mqk2lg78jzpdlpv2bhwz6bzzip7mqi22"; depends=[foreach ggm graph matrixcalc nsga2R polycor Rgraphviz sem]; }; - stabm = derive2 { name="stabm"; version="1.1.2"; sha256="01fg6zn6i710xfa9g15q4ca7vfgkfrk0iz6fvn8qp6y3dfrpm1sj"; depends=[BBmisc checkmate Matrix]; }; + stabm = derive2 { name="stabm"; version="1.1.4"; sha256="1nav5v36q7fsqzqx61n1pfixwhkh12jxl9pfd4ssmsglxk8py0is"; depends=[checkmate Matrix]; }; stabreg = derive2 { name="stabreg"; version="0.1.2"; sha256="1jrxyv0d33vd9vdlj1cv1a2qdz8iqgr726f54dgazwsz3cpyy2ia"; depends=[numDeriv]; }; stabs = derive2 { name="stabs"; version="0.6-3"; sha256="17sa0sjxf6h7gx1ga1pxhv17yrz3qisaivbf5cbc3asvshhswqg9"; depends=[]; }; stackoverflow = derive2 { name="stackoverflow"; version="0.7.0"; sha256="0zv8bxzw4pgaa5ra8wsb9p7g8bwffdhc6gqsfrcs61zva7v9izc2"; depends=[]; }; + stacks = derive2 { name="stacks"; version="0.1.0"; sha256="0ssc8l4cgwfz0h1aavak9gpy7g85pnwjdzvfr76hmnqn39k09cpi"; depends=[butcher cli dials digest dplyr foreach generics ggplot2 glmnet glue parsnip purrr recipes rlang rsample tibble tidyr tune workflows yardstick]; }; stacomirtools = derive2 { name="stacomirtools"; version="0.5.3"; sha256="00zpsfrw0gcjbjr3xdxf2wacrr1zfw6wq7a2ycq32pbh2smbkz4k"; depends=[RODBC xtable]; }; stagePop = derive2 { name="stagePop"; version="1.1-1"; sha256="0949r5ibl3sb10sr5xsswxap3wd824riglrylk7fx43ynsv5hzpy"; depends=[deSolve PBSddesolve]; }; - stagedtrees = derive2 { name="stagedtrees"; version="1.0.2"; sha256="11s09r4bp3fd9nbfqmwbdkvlgkryf3n9awbffyk2rsd9cdva2lch"; depends=[]; }; + stagedtrees = derive2 { name="stagedtrees"; version="2.0.1"; sha256="0mpcmmdq907zapk6swdqx0nak2ms292x85n634zilnqjysjiz8zx"; depends=[]; }; stam = derive2 { name="stam"; version="0.0-1"; sha256="1x1j45fir64kffny0nssb2hwn4rcp8gd2cjv6fw4yy0l4d0xi5iv"; depends=[np sp]; }; stampr = derive2 { name="stampr"; version="0.2"; sha256="10mc71kgnw5712q2gvzd4bmjaw1879r7s599hfsjap21idqb2k2m"; depends=[deldir maptools raster rgdal rgeos sp spdep]; }; standardize = derive2 { name="standardize"; version="0.2.1"; sha256="0ijyqy09fl478cvqnqwv7fpdmf2yvihw18abkkmgwdnm2v3xqphp"; depends=[lme4 MASS stringr]; }; stapler = derive2 { name="stapler"; version="0.7.1"; sha256="1bzhahn72fzm2bjpis76hphv8whnkp2jq8bm1qldadhng4z1nsak"; depends=[matrixStats RNifti]; }; + staplr = derive2 { name="staplr"; version="3.1.0"; sha256="1annzkyrps0z2d0z9zyf76d936g26ypwakwh9cshjvfa07fqgjvy"; depends=[assertthat glue rJava stringr XML]; }; stargazer = derive2 { name="stargazer"; version="5.2.2"; sha256="1pij76r60hkjlvxw6zw1v7gkib81smiqmjq7mwszn6xclq9lmsvh"; depends=[]; }; starm = derive2 { name="starm"; version="0.1.0"; sha256="0y580c6inmfix6agwd5nr340l3hjk2xxs95s468j5pghpjpb8rmv"; depends=[Matrix]; }; starma = derive2 { name="starma"; version="1.3"; sha256="07r0kyabhgbm2v39fcrw0qhxcxj9a9cb45g9chzcnn9qmvramcwx"; depends=[ggplot2 Rcpp RcppArmadillo scales]; }; - starnet = derive2 { name="starnet"; version="0.0.3"; sha256="1g43v35j9wy23gspahdhpwn7vzv4r8q9r7xgafar93yykx3s0gyl"; depends=[cornet glmnet joinet Matrix survival]; }; + starnet = derive2 { name="starnet"; version="0.0.6"; sha256="0gbg8svyj4nh846q7986ap7jjry599kb1348k9lifz19kvyr4rn4"; depends=[cornet glmnet Matrix survival]; }; stars = derive2 { name="stars"; version="0.4-3"; sha256="0yf2x8l3bybc91r9vih473qrsqf05p6gszsr41ms63hksig8vwx2"; depends=[abind classInt lwgeom rlang sf units]; }; - starsExtra = derive2 { name="starsExtra"; version="0.1.0"; sha256="19v63vpcb5ikhmmjzsgaca1pr4n5yai40ligm4q1f9jfv48xwpkk"; depends=[mgcv nngeo sf stars units]; }; - starschemar = derive2 { name="starschemar"; version="1.0.0"; sha256="04mg0d5zzdj1fnpsnjdy9ajh639vc47gpi1wf00v5j4s2x21x224"; depends=[dplyr pander purrr readr rlang snakecase tibble tidyr tidyselect]; }; - startR = derive2 { name="startR"; version="2.0.0"; sha256="199wb16mrslhxj7lbkc4216khnwvj9hydnymh11vhwviawb9557k"; depends=[abind bigmemory ClimProjDiags easyNCDF future multiApply s2dverification]; }; - startup = derive2 { name="startup"; version="0.14.1"; sha256="0nvmhfar53yi3wsvhv4idx849psdj46qhkvkxjn52fa7yflkrwz8"; depends=[]; }; + starsExtra = derive2 { name="starsExtra"; version="0.2.0"; sha256="07aw0f5jnhmz3zmcnyry1g2gxds7lghwzqfpmdzzid2wmdcd5raw"; depends=[mgcv nngeo sf stars units]; }; + starschemar = derive2 { name="starschemar"; version="1.2.0"; sha256="0jjaic1zwdc3lvdlgs0vzkjjivjs2dskmhx4qg469ban34az0591"; depends=[dplyr generics pander purrr readr rlang snakecase tibble tidyr tidyselect]; }; + startR = derive2 { name="startR"; version="2.1.0"; sha256="1cgn77jaiy7gfqbhh6w3x0bf57v32vzpp334mp50v827hgv439wy"; depends=[abind bigmemory ClimProjDiags easyNCDF future multiApply s2dverification]; }; + startup = derive2 { name="startup"; version="0.15.0"; sha256="05a5drjzmc969yn5y62gy1ja469nqrcbicycvjmlgrrfcj7918mi"; depends=[]; }; startupmsg = derive2 { name="startupmsg"; version="0.9.6"; sha256="0vkqxir4ady4dn9s70dfg1fxck2xg8vnmrmxjzvk01i6pc9zyq0x"; depends=[]; }; - starvars = derive2 { name="starvars"; version="0.1.8"; sha256="1dr8dw7mj57hhz9147fj0mkscmq26ymvcd0czgdaig7vf4lljz6m"; depends=[data_table fGarch highfrequency ks lessR lubridate MASS matrixcalc maxLik nloptr quantmod R_utils rlist vars xts zoo]; }; - stat_extend = derive2 { name="stat.extend"; version="0.1.1"; sha256="1jb8hqzs9jzbmksmc4aijv62sa5aylin73p9g1vgw6s513dx2bcl"; depends=[sets]; }; - statGraph = derive2 { name="statGraph"; version="0.3.0"; sha256="1xc10pkv3dq7x98xjqkg7ily89qj2r637y5qlnfvk08n6mzhn8w0"; depends=[igraph MASS]; }; + starvars = derive2 { name="starvars"; version="1.1.1"; sha256="0gam30mjppzq5pw7899ppc60ia47y0wh9y6j3p37511h691l45v5"; depends=[data_table fGarch ks lessR lubridate MASS matrixcalc maxLik quantmod rlist vars xts zoo]; }; + starvz = derive2 { name="starvz"; version="0.4.0"; sha256="1nzfpvdvfsi4a4x667k74l9c8nbsvwdgyn6ipsdr7n30k2sxlm6k"; depends=[arrow BH car data_tree dplyr ggplot2 gtools lpSolve magrittr patchwork purrr RColorBrewer Rcpp readr rlang stringr tibble tidyr yaml zoo]; }; + starwarsdb = derive2 { name="starwarsdb"; version="0.1.2"; sha256="00n9qqw4lbfk698qgvw8i42sy3dv5i5fiiqma3zks4rr9yspkldq"; depends=[DBI duckdb magrittr tibble]; }; + stat_extend = derive2 { name="stat.extend"; version="0.1.4"; sha256="1m3bjwgb0g0c445xy9b29yibnf8ldjfnyd0i519dxnh31b6k8vy9"; depends=[sets]; }; + statGraph = derive2 { name="statGraph"; version="0.4.1"; sha256="1svsjdh7w1gb37frn2y2rvkrldcm1nws6xhl18bxpx0g29z4915r"; depends=[cluster doParallel foreach igraph MASS rARPACK]; }; statVisual = derive2 { name="statVisual"; version="1.2.1"; sha256="1cc9p9g8lzn0lgh793r977yhqbk89l74m443gnznjlfml69bfb21"; depends=[Biobase dplyr factoextra forestplot gbm GGally ggdendro ggfortify ggplot2 ggrepel glmnet gridExtra knitr limma magrittr pheatmap pROC pvca randomForest RColorBrewer reshape2 rmarkdown rpart_plot tibble tidyverse]; }; - statar = derive2 { name="statar"; version="0.7.2"; sha256="16bbpwnfa0ds04zbw87ayxvl8bfk2gk52w7lq32h1ny8f42hx9aq"; depends=[data_table dplyr ggplot2 lazyeval matrixStats rlang stringr tidyr tidyselect]; }; + statar = derive2 { name="statar"; version="0.7.3"; sha256="17zg1g0ndsysrqj0alpx0sgmc69d3jkqr543l8m758mnm9bw83c9"; depends=[data_table dplyr ggplot2 lazyeval matrixStats rlang stringr tidyselect]; }; statcanR = derive2 { name="statcanR"; version="0.1.0"; sha256="1pyax5lixbpdg99n525w9z44s0zp5xda6ad605c3id0arki9c8xq"; depends=[curl data_table]; }; statcheck = derive2 { name="statcheck"; version="1.3.0"; sha256="0ivybdcrymlsfv6pg6p5bv70qdvgxf2vgp0kf4r0pf2fcvav1mcp"; depends=[ggplot2 plyr rmarkdown]; }; statcomp = derive2 { name="statcomp"; version="0.1.0"; sha256="0793k14rxiwq98zlrbsmbbkjn5z2ny5c90pia7cx3s77a3wdc96l"; depends=[Matrix zoo]; }; statebins = derive2 { name="statebins"; version="1.4.0"; sha256="1v67da939qg672aqni2i37w70pgasgx6r55b4fjjc3zzviq8gipx"; depends=[ggplot2 scales]; }; - states = derive2 { name="states"; version="0.2.2"; sha256="1lw1gljmkn8i8fd4ng5c3jpqrwr0gkiyazppy19dp8xl94m1xa4b"; depends=[dplyr]; }; - statespacer = derive2 { name="statespacer"; version="0.2.1"; sha256="02xfmwq89z5clh9w2c39vmi6h0lqkjdxgy6qlnz3fkj9lpv484i1"; depends=[Rcpp RcppArmadillo Rdpack]; }; - statgenGWAS = derive2 { name="statgenGWAS"; version="1.0.4"; sha256="0hmxjm6phgysdkv467nbdmkxfnz55ilaii4hmslsn5p6dl37mqp3"; depends=[data_table ggplot2 Rcpp RcppArmadillo sommer]; }; - statgenSTA = derive2 { name="statgenSTA"; version="1.0.5"; sha256="1mbq2h32qm0v102lx70qdif6pm6zdcpj78mlhm59cy98w0lwbbrx"; depends=[emmeans ggplot2 ggrepel gridExtra knitr lme4 mapproj maps qtl scales SpATS xtable]; }; + states = derive2 { name="states"; version="0.3.0"; sha256="1lajcp8y483kx6iaxydrjyi2ngvw91203901xs9ndqdwm1x2m5bd"; depends=[dplyr lifecycle rlang]; }; + statespacer = derive2 { name="statespacer"; version="0.4.0"; sha256="06qjbnp40mkbjxq14cwzpwcqymafm14cli1kmjfqwl4g1v9bvsx3"; depends=[Rcpp RcppArmadillo Rdpack]; }; + statgenGWAS = derive2 { name="statgenGWAS"; version="1.0.5"; sha256="1faxc4nd4ldslb47vsz8aw31c8f9fvmaacbq1zwc23dvqnrvzawn"; depends=[data_table ggplot2 Rcpp RcppArmadillo sommer]; }; + statgenGxE = derive2 { name="statgenGxE"; version="1.0.3"; sha256="05886glxnfmiqiz7aycjb9j20i6aqxam69nsamb3awy477cyjj3x"; depends=[emmeans ggplot2 gridExtra knitr lme4 statgenSTA xtable]; }; + statgenSTA = derive2 { name="statgenSTA"; version="1.0.6"; sha256="1hbhy4x5mfrm8wdvzm2fw5ii8yi0iw0nmsfk8wbdx1c40sfm5k15"; depends=[emmeans ggplot2 ggrepel gridExtra knitr lme4 mapproj maps qtl scales SpATS xtable]; }; stationaRy = derive2 { name="stationaRy"; version="0.5.1"; sha256="1620fdlybn3hr96yngnp802imr9b7n90835lyyd86r2wn6psdzvl"; depends=[downloader dplyr lubridate lutz magrittr progress readr stringr tidyr]; }; stationery = derive2 { name="stationery"; version="0.98.30"; sha256="0gr4nja8xsajrx34m6cxpw3jc59flh7n5d3x111znajfwbym1b5n"; depends=[knitr kutils rmarkdown]; }; statip = derive2 { name="statip"; version="0.2.3"; sha256="0kymc3ds1nx0h11ffmm3vmqr1w34gd0k788vf72x2v45h8c1ma2n"; depends=[clue rpart]; }; - statmod = derive2 { name="statmod"; version="1.4.34"; sha256="0yklg64aw5y8kfq5piafnrj1v3jv563iwzzl75g3kllrw23c508s"; depends=[]; }; + statmod = derive2 { name="statmod"; version="1.4.35"; sha256="1zpqnfslq5gi6hvqjqnsn5kf2m986s1yb6kvyjd881n3h67l4pny"; depends=[]; }; statnet = derive2 { name="statnet"; version="2019.6"; sha256="17dj6vjnjyqrfhzjq1lys5b29j942kd15zffb69jidni3slf20q9"; depends=[ergm ergm_count network networkDynamic sna statnet_common tergm tsna]; }; - statnet_common = derive2 { name="statnet.common"; version="4.3.0"; sha256="0ng90i0wm9wlyhjbnmnylc1bbqw396p1dr7f402dyry9x9ck6jl3"; depends=[coda]; }; + statnet_common = derive2 { name="statnet.common"; version="4.4.1"; sha256="1z89an46xcl1d7dacj4irhk6pkajdz7v85b2347vczwdf622pksf"; depends=[coda rle]; }; statnetWeb = derive2 { name="statnetWeb"; version="0.5.6"; sha256="1haf2kr1mwvaz4hlwla2ysbcy3sbfcg3i4hyiy9y6lcffvy4w9w0"; depends=[ergm lattice latticeExtra network RColorBrewer shiny sna]; }; - statnipokladna = derive2 { name="statnipokladna"; version="0.5.7"; sha256="0mj2dxianpd78127ggn0cml5nwwf6l26sds36qvfwbicaj7bk5jg"; depends=[curl dplyr httr jsonlite lifecycle lubridate magrittr purrr readr rlang stringi stringr tibble tidyr usethis xml2]; }; + statnipokladna = derive2 { name="statnipokladna"; version="0.6.0"; sha256="01rh2ihh0cc7fnda1h3bk75n0f4939480l6d6vhl6x8nrfk4hhw4"; depends=[curl dplyr httr jsonlite lifecycle lubridate magrittr purrr readr rlang stringi stringr tibble tidyr usethis xml2]; }; statprograms = derive2 { name="statprograms"; version="0.2.0"; sha256="0m7px7fmpz2zzlfdi7rbllcjvcjp8iy94f6fa1w4xinh7vz3y6vq"; depends=[]; }; statquotes = derive2 { name="statquotes"; version="0.2.2"; sha256="1xzc3ndddjrlyld0p4zcwwxkj7i3m3adj7c78x9l4lhlw9mxbbqg"; depends=[stringr tidytext wordcloud]; }; - stats19 = derive2 { name="stats19"; version="1.2.0"; sha256="0956s8z8qrkij52fq15ydl15zi3kg5czcx7kjcg20nmby5dqmd34"; depends=[readr sf]; }; - statsExpressions = derive2 { name="statsExpressions"; version="0.4.2"; sha256="1nhqxw9cmzhd4bk60fgg7nklhlk6j7r7naslaj8c3wbq7xn1lldl"; depends=[broomExtra correlation dplyr effectsize ez ipmisc metafor metaplus rcompanion rlang tidyBF tidyr WRS2]; }; + stats19 = derive2 { name="stats19"; version="1.3.0"; sha256="1h6sgbi23qq4shlbx7f4s2yk4hmwvnb1z198k02j9a3n6dbdz7r7"; depends=[readr sf]; }; + statsExpressions = derive2 { name="statsExpressions"; version="0.6.2"; sha256="1rs86ncp1k4568rl8bxz0wzr571l6kx3f2l31a4xfhbp6mgg1fzm"; depends=[correlation dplyr effectsize ez ipmisc metafor metaplus parameters performance rcompanion rlang tidyBF tidyr WRS2]; }; statsguRu = derive2 { name="statsguRu"; version="0.1.0"; sha256="0pqz0la86mk6zp65zzbfwhxyrqqx040p8mrm2j9wqb53r8fbnmqc"; depends=[devtools htmltab plotrix]; }; statsr = derive2 { name="statsr"; version="0.2.0"; sha256="0xqwg519vd06d541jl3k3d6svfd623xz1z2cnrczpm99ql20q83m"; depends=[broom cubature dplyr ggplot2 gridExtra knitr rmarkdown shiny tibble tidyr]; }; + statswalesr = derive2 { name="statswalesr"; version="0.1.1"; sha256="0nawvavmi2d8ag8s6jhkdyykvrs3w5xnjrhk8rnlwcl1ms7ciw08"; depends=[curl dplyr httr jsonlite rlang]; }; stcos = derive2 { name="stcos"; version="0.3.0"; sha256="0niy8inajs0vafbh47w5rajlp3bvgi9yakhyabjdrqhkjzs79lpx"; depends=[dplyr Matrix Rcpp RcppArmadillo sf]; }; stcov = derive2 { name="stcov"; version="0.1.0"; sha256="166w929sgd7nanw1zjhzwv50hd5vqhgsrgxnsga4dzrcvndalw70"; depends=[]; }; stdReg = derive2 { name="stdReg"; version="3.4.0"; sha256="003lp8yshjdql475hdpickwr0fngzn9qps1dzvx8zfy4x51xy8xl"; depends=[data_table drgee numDeriv survival]; }; @@ -14775,10 +15405,13 @@ in with self; { stemmatology = derive2 { name="stemmatology"; version="0.3.2"; sha256="1l2y4jlszz1dnafdl2wqqfgdjis07i3gzfnp1v1af32pvjy4zqhw"; depends=[cluster igraph xml2]; }; stepPenal = derive2 { name="stepPenal"; version="0.2"; sha256="08gizl6c606ibbv7x2rdvfw37rghkrprwszha79yngkzpajw8gql"; depends=[caret dfoptim glmnet mvtnorm pROC]; }; stepPlr = derive2 { name="stepPlr"; version="0.93"; sha256="1i54nyz8z5vq3mzfh6h2vd1q0hsdazc4mhrj9ad0zdvn0qnz61lv"; depends=[]; }; - stepR = derive2 { name="stepR"; version="2.1-0"; sha256="15ncr5j8bdzqfir08vpfz1cin4i3m78i6crpzwfra5fdsi49jfrk"; depends=[digest lowpassFilter R_cache Rcpp]; }; + stepR = derive2 { name="stepR"; version="2.1-1"; sha256="0mz88d7214g59nvr40c4gf4grq9skjqqlfgydbdzmc4l315nr4zv"; depends=[digest lowpassFilter R_cache Rcpp]; }; stepp = derive2 { name="stepp"; version="3.2.0.0"; sha256="0fnjqbncadscv6ryvqyqf8qqgpfzh2hka5ld2zvw39mjqzy5gadi"; depends=[car survival]; }; steps = derive2 { name="steps"; version="1.1.0"; sha256="1p01cmvh5rbgwaz0r73iry60jq0f8rp3z8ql57vhmnd9kyrzf53m"; depends=[future future_apply memuse raster rasterVis Rcpp viridisLite]; }; + stevedata = derive2 { name="stevedata"; version="0.2.0"; sha256="0w8p4w2dr7bz3253n6an7a5dzj8wkw31qw0si3j3bb1jz64d3p97"; depends=[]; }; stevedore = derive2 { name="stevedore"; version="0.9.3"; sha256="00zs2bl5h40rwbhnynjw2jbxlixjnk14rxn9chypqg5zgx9pqg2s"; depends=[crayon curl jsonlite yaml]; }; + stevetemplates = derive2 { name="stevetemplates"; version="0.2.0"; sha256="1mdcjvasz385chsg27nq96621c5hiaisypf24xpy3q693r0bs0nd"; depends=[rmarkdown]; }; + stfit = derive2 { name="stfit"; version="0.99.8"; sha256="0js09v04ik5m3d9iz9waq0yigvg2g6n75m4zm5dc0nz3yr1irb88"; depends=[abind doParallel fda foreach Matrix raster rasterVis RColorBrewer Rcpp]; }; stickr = derive2 { name="stickr"; version="0.3.1"; sha256="0krz123vz4bdcdi4p27r637pgz4rcj6kmyiqdf5x69riddvfxx8r"; depends=[base64enc fs gh stringr]; }; sticky = derive2 { name="sticky"; version="0.5.6.1"; sha256="1szfpay9cpdwq6v5fmnjyr00r4zhz6zd2rrl3h88v9l5xpfafi4w"; depends=[]; }; stilt = derive2 { name="stilt"; version="1.3.0"; sha256="0b1bs849hw2wcvaldybxk8h8wgwl6p7x4i7winncvngmhplgrvx4"; depends=[fields]; }; @@ -14787,7 +15420,7 @@ in with self; { stlcsb = derive2 { name="stlcsb"; version="0.1.2"; sha256="08pnj1yb4xcbhnrp2wny8lq9rvcvmsgaza07k4358csfksvmcira"; depends=[dplyr lubridate purrr readr readxl rlang rvest sf stringr tibble xml2]; }; stlnpp = derive2 { name="stlnpp"; version="0.3.6"; sha256="1h17bnkg9lnjs1dskxid3bddj0509f8jwnwn3z5h5qfblk2yf06q"; depends=[spatstat]; }; stlplus = derive2 { name="stlplus"; version="0.5.1"; sha256="14728xsm982z9sg4rbqg307pbwqlsiyzj8z3sr9wr6fi0dayf6z5"; depends=[lattice Rcpp yaImpute]; }; - stm = derive2 { name="stm"; version="1.3.5"; sha256="1yyfxaxqc6yq0yq68zhdnhpwpvsyp71dlmivn7zxixfmp932s6cn"; depends=[data_table glmnet lda Matrix matrixStats quadprog quanteda Rcpp RcppArmadillo slam stringr]; }; + stm = derive2 { name="stm"; version="1.3.6"; sha256="0qwq4nin2n9fjd06852r8k7arvcgh46kcfb3lm21swgx6j8bgrhb"; depends=[data_table glmnet lda Matrix matrixStats quadprog quanteda Rcpp RcppArmadillo slam stringr]; }; stmCorrViz = derive2 { name="stmCorrViz"; version="1.3"; sha256="1a4pckrbzsihyf1bqvw3cl0hxrc4yq1pnkgxgf4b8jday6zkxwcv"; depends=[jsonlite SnowballC stm tm]; }; stmgp = derive2 { name="stmgp"; version="1.0.3"; sha256="0yg2ffvaylhxfclkixk9n1wxigasvirdzdywqg016hjg7w166bp1"; depends=[MASS]; }; stmgui = derive2 { name="stmgui"; version="0.1.6"; sha256="1fn2m5l7y3p1riw39g6r3hpjxdccygih7yipp7dvc4msl9fm4h5c"; depends=[markdown shiny shinyBS shinyjs shinythemes stm tm]; }; @@ -14796,19 +15429,20 @@ in with self; { stocc = derive2 { name="stocc"; version="1.30"; sha256="0xpf9101094l5l75p9lr64gwh2b8jh4saw6z6m2nbn197la3acpw"; depends=[coda fields Matrix rARPACK truncnorm]; }; stochQN = derive2 { name="stochQN"; version="0.1.2"; sha256="1zwxw95jrpkqgbgwhwdy907v9gqmvn5as4v35a75wvy3nhawka9a"; depends=[]; }; stochprofML = derive2 { name="stochprofML"; version="2.0.3"; sha256="0j6m2byh7w9kcbp3mfvmg6fm6z0dq8k4qabj1yfkl0d1y2ifd1zd"; depends=[MASS numDeriv]; }; - stochvol = derive2 { name="stochvol"; version="2.0.4"; sha256="1hb2fgnyn8zxq1j74x00msq3j807y70yxx2s3fq4csrb1935vr85"; depends=[coda Rcpp RcppArmadillo]; }; + stochvol = derive2 { name="stochvol"; version="3.0.3"; sha256="0ci8a1g5a76s8xnccy38qali5p08yhbji7ab2qhzm5h2a5fj5k07"; depends=[coda Rcpp RcppArmadillo]; }; + stochvolTMB = derive2 { name="stochvolTMB"; version="0.1.2"; sha256="0m1b8jcrr8pxa2m9gzj7dljzr19j7n4w9i8m0p5mrb559ljbj0i0"; depends=[data_table ggplot2 RcppEigen sn TMB]; }; stockR = derive2 { name="stockR"; version="1.0.74"; sha256="002i0bhyskwyjjczfa752ghn19hvqhdyzdfkpvci3hb66rh94x65"; depends=[gtools RColorBrewer]; }; stocks = derive2 { name="stocks"; version="1.1.4"; sha256="0b6rl7pfkgzbpwnv7zzkr36hs5f1zb60d16ijslf7g9m25vvcyg6"; depends=[dvmisc Hmisc lubridate quantmod rbenchmark RColorBrewer Rcpp TTR zoo]; }; stoichcalc = derive2 { name="stoichcalc"; version="1.1-3"; sha256="0z9fnapibfp070jxg27k74fdxpgszl07xiqfj448dkydpg8ydkrb"; depends=[]; }; stokes = derive2 { name="stokes"; version="1.0-5"; sha256="0xbjkrm9g7r2xnj629i5cfmmqkw60iq4k6lk3skmkj3xh20lcd5x"; depends=[magrittr partitions permutations spray]; }; - stopwords = derive2 { name="stopwords"; version="2.0"; sha256="155g00ansyqfpp1mzd2q6mn0k214xinf78nww2368h24kz761jjw"; depends=[desc ISOcodes usethis]; }; + stopwords = derive2 { name="stopwords"; version="2.1"; sha256="1g2p8gsj7xjck7idcwczgc7fmv72lzwjw00qarrj0cv44kypmiq8"; depends=[desc ISOcodes usethis]; }; stormwindmodel = derive2 { name="stormwindmodel"; version="0.1.4"; sha256="1fwp5kazvx4q2yb9mjbbv36kkjli4prm7p4wihlq1pbw17q2mhrq"; depends=[dplyr ggplot2 lubridate maps plyr rlang stringr tidyr weathermetrics]; }; - storr = derive2 { name="storr"; version="1.2.1"; sha256="0409gb6wji3cjxkdcd0wc3jvsx61h3rxd8a3nr018y8rh1rpsaj6"; depends=[digest R6]; }; + storr = derive2 { name="storr"; version="1.2.5"; sha256="0qszdq16bf0dbss33zi63ciwmkgjsyc0c3akrr2kl14w3ncw6922"; depends=[digest R6]; }; stosim = derive2 { name="stosim"; version="0.0.14"; sha256="10k8j7manskjsrjc1l44yhy682b1qh0k2jx3cs5k69j2z42mnhmk"; depends=[Rcpp]; }; - stplanr = derive2 { name="stplanr"; version="0.6.2"; sha256="0cpxp5527ri55gxf7zf9k4c0qnkzjrkn2akzfdvngg3rdbhcf20g"; depends=[curl dplyr geosphere httr igraph jsonlite lwgeom magrittr maptools nabor raster Rcpp RcppArmadillo rgeos rlang sf sp stringr]; }; - stpm = derive2 { name="stpm"; version="1.7.7"; sha256="1l40zb9qwshg7saqmgi7c49a3jd93ycrbvmysgzs0q8pl94vgcfs"; depends=[knitcitations MASS nloptr Rcpp RcppArmadillo sas7bdat survival]; }; + stplanr = derive2 { name="stplanr"; version="0.8.0"; sha256="1cx1ywddpgy5hpm7c5frs4yrizf6xw4s0pkgp87rm8n6c47m9c26"; depends=[curl dplyr geosphere httr igraph jsonlite lwgeom magrittr maptools nabor raster Rcpp RcppArmadillo rgeos rlang sf sp stringr]; }; + stpm = derive2 { name="stpm"; version="1.7.9"; sha256="0adcagngk3f8avdwyzqkjm0vzdxdv8h6jvzljm9xdapna2m40pr3"; depends=[MASS nloptr Rcpp RcppArmadillo sas7bdat survival]; }; stpp = derive2 { name="stpp"; version="2.0-4"; sha256="0y6k33qaqycw01288w36q82iq73nlsc2vkkaiamr3v312ja6gbxg"; depends=[ggplot2 gridExtra KernSmooth plot3D rgl rpanel spatstat splancs]; }; - strand = derive2 { name="strand"; version="0.1.3"; sha256="1rnrrz54s16bw5ndhiw2dllzs8md263hgvf5mkx3jwm6vv5sd61x"; depends=[dplyr feather ggplot2 lubridate Matrix R6 Rglpk rlang tidyr yaml]; }; + strand = derive2 { name="strand"; version="0.2.0"; sha256="0gd9nnbdilvk4bszg77bxilan6qpg1np7c38w1b7j5sr3r30y5in"; depends=[arrow dplyr ggplot2 lubridate Matrix R6 Rglpk rlang tibble tidyr yaml]; }; strap = derive2 { name="strap"; version="1.4"; sha256="0gdvx02w0dv1cq9bb2yvap00lsssklfnqw0mwsgblcy2j6fln7b0"; depends=[ape geoscale]; }; strat = derive2 { name="strat"; version="0.1"; sha256="1axxrp750kjzcgxjdqfscjmryv1mkv4l23zk8k23z8l4ymhd2f5w"; depends=[Hmisc Rcpp RcppArmadillo]; }; stratEst = derive2 { name="stratEst"; version="1.0.1"; sha256="1khbhx7mmmaxwsk5lyya9qqi6hvvi5psz1jfb5zdpmyykj09aa95"; depends=[Rcpp RcppArmadillo]; }; @@ -14821,36 +15455,37 @@ in with self; { stratvns = derive2 { name="stratvns"; version="1.1"; sha256="01s3p9mml04pqfd7fydkmqdk0qf5jmzz3b3q3x5vavlma6fv8nwi"; depends=[MultAlloc partitions purrr]; }; straweib = derive2 { name="straweib"; version="1.1"; sha256="0hi59p580yg6rj72grq4jx6grv7lmpi2cimp0rbxhkjpj6i1hav9"; depends=[]; }; stray = derive2 { name="stray"; version="0.1.1"; sha256="1pjw1bdkqsp085lrwca1psma95ncapfz8a5iampxgghydkhh3dm8"; depends=[colorspace FNN ggplot2 ks pcaPP]; }; - stream = derive2 { name="stream"; version="1.3-2"; sha256="07fj3dzn8lhm7wkjgx2c6g2i7n6rkwl77issn14bh0v3c8a5q2hg"; depends=[BH clue cluster clusterGeneration dbscan fpc MASS mlbench proxy Rcpp]; }; + stream = derive2 { name="stream"; version="1.4-0"; sha256="0rn3xrsx9ysrh955k7jkjhrxsclr1iwwd7k4fsr6klshmjan9qcn"; depends=[BH clue cluster clusterGeneration dbscan fpc MASS mlbench proxy Rcpp]; }; streamDepletr = derive2 { name="streamDepletr"; version="0.1.1"; sha256="0x7663xz9az8lq852923hr7chaif1iml8drb6ljg83rg55plmwir"; depends=[dplyr magrittr Rmpfr sp]; }; - streamMOA = derive2 { name="streamMOA"; version="1.2-2"; sha256="1zm7bcdsyazqksizir5rqibgw6w1bz85gdga0ncirh2s1z0dhi79"; depends=[rJava stream]; }; + streamMOA = derive2 { name="streamMOA"; version="1.2-3"; sha256="1rh9xplmmwg60v19c7qfjs9w0cv4n9wvcn3narqqq4ky4m7g1ask"; depends=[rJava stream]; }; streamR = derive2 { name="streamR"; version="0.4.5"; sha256="1clx3b0j2515r1nmnl6ki7qw5n54q3x2jvqv3zrc00kq71mlj7ix"; depends=[ndjson RCurl rjson]; }; - streambugs = derive2 { name="streambugs"; version="1.1"; sha256="1r0fnvpmj2z34j3w2nbdvxlw9jnz8y3x1xx9ih3vxna50ldrg2z2"; depends=[deSolve]; }; - stressaddition = derive2 { name="stressaddition"; version="3.0.1"; sha256="0d4w7vj07dqn63lim6jqcnrnml8qirsw4fq0ayj290m2c5bkw510"; depends=[drc plotrix]; }; + streambugs = derive2 { name="streambugs"; version="1.2"; sha256="1363w0sf7lahcg3dhvl6l7hybgr71r21xbxs718a73zy5pnwm4s2"; depends=[deSolve]; }; + stressaddition = derive2 { name="stressaddition"; version="3.1.0"; sha256="14ggy4ka9kll723jdir22g5l5xkwdckvd08gg6rxsmxryhznqd4a"; depends=[drc plotrix]; }; stressr = derive2 { name="stressr"; version="1.0.0"; sha256="00b93gfh1jd5r7i3dhsfqjidrczf693kyqlsa1krdndg8f0jkyj7"; depends=[lattice latticeExtra XML xts]; }; - strex = derive2 { name="strex"; version="1.2.0"; sha256="1vshbq83szgig93ljhnwqwdsdskayszdzwk85n1n650clriv0b85"; depends=[checkmate glue magrittr matrixStats ore processx Rcpp rlang stringi stringr tibble]; }; + strex = derive2 { name="strex"; version="1.4.1"; sha256="0lngpf8pgvpf2d74rw9xw4bsxcg1n2dmn5zz6y492py8q674lfhh"; depends=[checkmate magrittr rlang stringi stringr]; }; strider = derive2 { name="strider"; version="1.3"; sha256="114j0qpdyg8rrhj68zq596pgc4h7ja39n0rfxf0x9qg7imhaj1h6"; depends=[BH Rcpp]; }; stringb = derive2 { name="stringb"; version="0.1.14"; sha256="0hhqqsc3fif14dy623h6y3gxjg8lhff9wlglkygccs5iyhdjyl12"; depends=[backports]; }; - stringdist = derive2 { name="stringdist"; version="0.9.6"; sha256="0nb3iwpl4f3xxirns1frwvarpyrl4i5f74h8r6h80cg0a4mpdgcb"; depends=[]; }; - stringfish = derive2 { name="stringfish"; version="0.13.3"; sha256="19qcd5xswr4fx2c4bx7vcawxg0s2k1x5b606asnnn26y35n20b8m"; depends=[Rcpp]; }; + stringdist = derive2 { name="stringdist"; version="0.9.6.3"; sha256="06rzbgw43vzg496xca82pydf3g2rz6iw6h50ai0prbp9hbwrhvfd"; depends=[]; }; + stringfish = derive2 { name="stringfish"; version="0.14.2"; sha256="1vaccbxr77si3siq5vy5v0crxrdqfxcl6y81s9zm58fd2p3wywwk"; depends=[Rcpp RcppParallel]; }; stringformattr = derive2 { name="stringformattr"; version="0.1.2"; sha256="0x56k30clj5ajk0qg5sr8b9l0asz6ldivwr1ddy1vp1djliih1fx"; depends=[stringr]; }; - stringi = derive2 { name="stringi"; version="1.4.6"; sha256="1mkgxzf000zdgbbbvg2vf4md4l501n5lfksffq8vdg6pbgd6fgv3"; depends=[]; }; + stringi = derive2 { name="stringi"; version="1.5.3"; sha256="0420f7zn5knyyvd3a3xa7059l4kadw0m67rfpivacqn9xn6iwkr2"; depends=[]; }; stringr = derive2 { name="stringr"; version="1.4.0"; sha256="1p9ip7p87gbbg4s6d3d392svvzz2b5dqdq2c8ilgvn4s78nlsq47"; depends=[glue magrittr stringi]; }; strip = derive2 { name="strip"; version="1.0.0"; sha256="1j3kq6w8k66z45rpd1cgxplpnldzbyqklgs4bnbv906pyd8wk9ak"; depends=[rlist]; }; stripless = derive2 { name="stripless"; version="1.0-3"; sha256="08mdp7kq6r5bk77j09477d1dnn7iwa346pr24b5bqsxwnbknyrsr"; depends=[lattice]; }; striprtf = derive2 { name="striprtf"; version="0.5.2"; sha256="1ra6aalalig6drsj26z9s24lmb10zssagqrvgqqi4358zbm8gwcd"; depends=[magrittr Rcpp stringr]; }; + strm = derive2 { name="strm"; version="0.1.1"; sha256="0agl9x5g2y16aasrs4qaid0is5p602yksdwqk2xl8br4xlxdr9yx"; depends=[dplyr knitr magrittr purrr rgdal rlang rmarkdown spatialreg testthat tidyr]; }; strucchange = derive2 { name="strucchange"; version="1.5-2"; sha256="1y022363a4pp0mnji91sjh1qiyspkh09sybqwj03r9pmwrd7q93x"; depends=[sandwich zoo]; }; structree = derive2 { name="structree"; version="1.1.7"; sha256="178x6maghjaw9lkyjr84pq916vbq0ldh5gqia0r0vqs8k8dvna9i"; depends=[lme4 mgcv penalized]; }; strvalidator = derive2 { name="strvalidator"; version="2.3.0"; sha256="0m1nxpvb7hbx9n00mc0ar7ay1sk8h819cmf0r0g323z23axq1kdx"; depends=[data_table ggplot2 gridExtra gtable gWidgets2 MASS plyr scales]; }; stsm = derive2 { name="stsm"; version="1.9"; sha256="18ypmkd7l7m7qkahb0nqf8f1m8g4irxlw48v2ms0dq1bsnhbzx7j"; depends=[KFKSDS]; }; stsm_class = derive2 { name="stsm.class"; version="1.3"; sha256="19jrja5ff31gh5k2zqhqsyd7w2ivr4s6bkliash6x8fmd22h5zs8"; depends=[]; }; - stuart = derive2 { name="stuart"; version="0.9.0"; sha256="1qb6ky321mj2jrmdp7xsvmcnsqa1vhn5l5p6a95fhan3xrhk9225"; depends=[]; }; + stuart = derive2 { name="stuart"; version="0.9.1"; sha256="1y58kxlcq4zynyb6fnpdv3ik9gza83kyaz73w033snhmj9dqihfm"; depends=[]; }; stubthat = derive2 { name="stubthat"; version="1.2.1"; sha256="130naxzvswcyadwcgldvwnxxdxbfwx5vljac7901vn3ahjp75d8z"; depends=[testthat]; }; - studentlife = derive2 { name="studentlife"; version="1.0.0"; sha256="1snrsaapjwvcifa91hg5xcbg7n70aqcdyyq69gg20168qg8abkws"; depends=[crayon dplyr ggplot2 jsonlite purrr R_utils readr skimr tibble tidyr visdat]; }; + studentlife = derive2 { name="studentlife"; version="1.1.0"; sha256="1xvlcwg7ckxsm5hb5ax8r3hzdqnx61ax59ini5xc5jrsmir13g67"; depends=[crayon dplyr ggplot2 jsonlite purrr R_utils readr skimr tibble tidyr visdat]; }; studyStrap = derive2 { name="studyStrap"; version="1.0.0"; sha256="0lvzqnq40j0xn74qrj0pqhr8zz34mbhfd7dg8bnadscsvj5ffm4c"; depends=[caret CCA dplyr MatrixCorrelation nnls pls tibble tidyverse]; }; styler = derive2 { name="styler"; version="1.3.2"; sha256="1waglhsy2c53qjgd2qhlzda3z0lbzbwx9fkrfhac41y6h91mgkrz"; depends=[backports cli magrittr purrr R_cache rematch2 rlang rprojroot tibble withr xfun]; }; stylest = derive2 { name="stylest"; version="0.1.0"; sha256="0dr7j9fh8kp6wsqql38s3rk596xl6m9nx0w1l5v25hv2bphidxzr"; depends=[corpus Matrix]; }; - stylo = derive2 { name="stylo"; version="0.7.3"; sha256="0d5k0l6k9c82i0imf28y4wc4dpmnf0w5vr2nghf4pfd76spli411"; depends=[ape class e1071 lattice pamr tcltk2 tsne]; }; + stylo = derive2 { name="stylo"; version="0.7.4"; sha256="0vjfpz4bpdrsax7a0gsj9cwddbsayb4n5fr5xskz63lfrjg2ppcb"; depends=[ape class e1071 lattice pamr tcltk2 tsne]; }; suRtex = derive2 { name="suRtex"; version="0.9"; sha256="0xcy3x1079v10bn3n3y6lxignb9n3h57w4hhrvzi5y14x05jjyda"; depends=[]; }; subcopem2D = derive2 { name="subcopem2D"; version="1.3"; sha256="06wwd847g9pxd0z2a8494h3nc9s280a3s1510bir24m3z7w1pqf3"; depends=[]; }; subdetect = derive2 { name="subdetect"; version="1.1"; sha256="1bcc13avs5w9vmwyf71cnjd2kwmcavmzpwyv8gvsn61n7b4j8wlk"; depends=[]; }; @@ -14864,41 +15499,46 @@ in with self; { subrank = derive2 { name="subrank"; version="0.9.9.1"; sha256="19lgw7248jq6b34i17c7vw208wsvmppni7njswd02i9xdgyjn95z"; depends=[]; }; subsamp = derive2 { name="subsamp"; version="0.1.0"; sha256="1bfz2z2qy1war3id8qr1asygwvwxgf2hhlh075hr6bjdkxz0j0nd"; depends=[]; }; subscore = derive2 { name="subscore"; version="3.1"; sha256="1hb4ci62hxffz09sz0i27jfw7xn0pca87kiq6damz5zi418csa4v"; depends=[boot cocor CTT irtoys ltm sirt]; }; - subscreen = derive2 { name="subscreen"; version="3.0.0"; sha256="1q87hshf97ipfyp7k2cdb4nk0rl1m2kl51pynlgvjxai2da8vmvv"; depends=[bsplus colourpicker data_table dplyr DT jsonlite plyr purrr randomForestSRC shiny shinyjs shinyWidgets V8]; }; + subscreen = derive2 { name="subscreen"; version="3.0.2"; sha256="0jmm6n06psi1f9pi3mdhxvfnhl3lpslv9r7sfcf9pjq9lhh7ich4"; depends=[bsplus colourpicker data_table dplyr DT jsonlite plyr purrr randomForestSRC shiny shinyjs shinyWidgets]; }; subselect = derive2 { name="subselect"; version="0.15.2"; sha256="0ggpm5bq4ncx4302855s8x1nj0afjizmi81cg6b7xc7rvpirw0fq"; depends=[corpcor ISwR MASS]; }; subspace = derive2 { name="subspace"; version="1.0.4"; sha256="0p2j0lnwj3ym1v4xla6r97zjikb8alnibdc690xn9c0z21hmv43v"; depends=[colorspace ggvis rJava stringr]; }; + subtee = derive2 { name="subtee"; version="0.3-6"; sha256="08mq1y2q4zpv07iaq27dh6d6by1b5z67na0gddn54ng9x0yqgihy"; depends=[ggplot2 MASS matrixStats survival]; }; subtype = derive2 { name="subtype"; version="1.0"; sha256="1094q46j0njkkqv09slliclp3jf8hkg4147hmisggy433xwd19xh"; depends=[penalized ROCR]; }; + sudachir = derive2 { name="sudachir"; version="0.1.0"; sha256="09ry00c3yhrz8fiyxdxgj9r3x7kldsl6fv35mmi5ysc2549kbcfb"; depends=[cli dplyr glue magrittr purrr reticulate rlang tibble tidyselect]; }; suddengains = derive2 { name="suddengains"; version="0.4.4"; sha256="160jna9imnpy91f6pa881w6wlrwy59db0nijrn1sf5ym1cmh5gz5"; depends=[dplyr forcats ggplot2 ggrepel magrittr naniar patchwork psych readr rlang scales stringr tibble tidyr]; }; sudoku = derive2 { name="sudoku"; version="2.6"; sha256="13j7m06m38s654wn75kbbrin5nqda4faiawlsharxgrljcibcbrk"; depends=[]; }; sudokuAlt = derive2 { name="sudokuAlt"; version="0.2-1"; sha256="1y3li64xqag2ia8dg7q49jmlb1awl92rz6xa9zsbf0s9jman9wj9"; depends=[magrittr]; }; - sugrrants = derive2 { name="sugrrants"; version="0.2.7"; sha256="1clad4pafj3cf9ra48zf4bm6vvgb3ys7jg4m4qp5k3w4v81qdrnj"; depends=[dplyr ggplot2 gtable lubridate rlang]; }; - sumFREGAT = derive2 { name="sumFREGAT"; version="1.1.0"; sha256="1ycdnf5ghrv3czi4lh5yc8n8690m3b8i85s46k7lya2k0rasvac4"; depends=[GBJ Matrix seqminer]; }; + sugarbag = derive2 { name="sugarbag"; version="0.1.3"; sha256="05j2b9vbhpkfr3xkam9wgm0w4k8blnm1ssf9cd6l5f1y2rrqizsv"; depends=[dplyr geosphere lwgeom progress purrr rlang rmapshaper sf tibble tidyr utf8]; }; + sugrrants = derive2 { name="sugrrants"; version="0.2.8"; sha256="08cs74afpkvjh32hlrwbl8sdsi3p0ga4ziw32r9pihs28a060fam"; depends=[dplyr ggplot2 gtable lubridate rlang]; }; + sumFREGAT = derive2 { name="sumFREGAT"; version="1.2.0"; sha256="07vf5fyxca9vci4v5akw55f4qif8cdw5g980vbcg43vkk3q4i5h3"; depends=[GBJ Matrix seqminer]; }; summariser = derive2 { name="summariser"; version="2.3.0"; sha256="0zliqy8dlcr2yy4ky8k68qn256xvpla8fcv7via19y40bmla37ic"; depends=[dplyr]; }; - summarytools = derive2 { name="summarytools"; version="0.9.6"; sha256="03pcb2ild1rb9f15yq8b68p9bg10z5wk2x7ahgyzkwdh5f81vbq2"; depends=[base64enc checkmate dplyr htmltools lubridate magick matrixStats pander pryr rapportools tibble tidyr]; }; - sunburstR = derive2 { name="sunburstR"; version="2.1.4"; sha256="1vnh2bylqzlp3av64x2b42ysw1s3i4jvk46wbc7231rapfl9aq41"; depends=[d3r dplyr htmltools htmlwidgets]; }; + summarytools = derive2 { name="summarytools"; version="0.9.8"; sha256="0n7rad6bkfn9cb99wbfzbwl5qzch48r0gafhddfcqvyh4fbn2k0j"; depends=[base64enc checkmate dplyr htmltools lubridate magick matrixStats pander pryr rapportools tibble tidyr]; }; + sunburstR = derive2 { name="sunburstR"; version="2.1.5"; sha256="133d5my4bazw5wkv31h3rsqw0d43nxw94bq2sg8c5n4bqkpsvrhm"; depends=[d3r dplyr htmltools htmlwidgets]; }; suncalc = derive2 { name="suncalc"; version="0.5.0"; sha256="1chkl297km313m89h9mbp7vnpz188fhzz5dn8x5cjkqy0mm6c0qc"; depends=[data_table lubridate magrittr]; }; sundialr = derive2 { name="sundialr"; version="0.1.4"; sha256="03gvcks5i8fh8x8p4zimn4xz3x8b0ai1wmjyx9zis82rdgaa0pg3"; depends=[Rcpp RcppArmadillo]; }; supc = derive2 { name="supc"; version="0.2.2"; sha256="0b7safpg766mzi2qiwyyf9wn5pcpcb9w7dn5qb3kjalijvcqz7mp"; depends=[BH Rcpp]; }; - supclust = derive2 { name="supclust"; version="1.0-7"; sha256="0437pccagvqv6ikdsgzpif9yyiv6p24lhn5frk6yqby2asj09727"; depends=[class rpart]; }; + supclust = derive2 { name="supclust"; version="1.1-0"; sha256="08pdd8azvd5c7cs62dh3wp7jvcwcwcjyy73r4ki2a0pw68fhkn9y"; depends=[class rpart]; }; supcluster = derive2 { name="supcluster"; version="1.0"; sha256="1rkd4bpzzvzbmqaj907pqv53hxcgic0jklbsf5iayf0ra768b5w6"; depends=[gtools mvtnorm]; }; superMDS = derive2 { name="superMDS"; version="1.0.2"; sha256="0jxbwm3izk7bc3bd01ygisn6ihnapg9k5lr6nbkr96d3blpikk04"; depends=[]; }; superbiclust = derive2 { name="superbiclust"; version="1.1"; sha256="1gzjbzbl8y1nzdfhyd6dlrwjq8mwj43a26qav84s1bdzwx6dra48"; depends=[biclust fabia Matrix]; }; - superdiag = derive2 { name="superdiag"; version="1.1"; sha256="0pa3mv74riabpm7j4587zww2364fszzlw48ijj1apcgz8y6pyqbw"; depends=[boa coda]; }; + superdiag = derive2 { name="superdiag"; version="2.0"; sha256="0zfy9ain6agh276av0p66mks3rap42n8yma0dr6qbc14z3nh8w0m"; depends=[coda]; }; superheat = derive2 { name="superheat"; version="0.1.0"; sha256="01v8s6px1k5fajlm6py3ksr1i853kwwlky1yryzhy3p1cxhwgg83"; depends=[dplyr ggdendro ggplot2 gtable magrittr plyr scales]; }; superml = derive2 { name="superml"; version="0.5.3"; sha256="1k0hcjspv0q6wg0yarvgjs7ql7d587nijicmz3lfhpph2n3hghvb"; depends=[assertthat BH data_table Metrics R6 Rcpp RcppArmadillo]; }; - supernova = derive2 { name="supernova"; version="2.1.1"; sha256="1vjx0mfnqksgvcgn8hfvpx8j3q8791yifdsaqjqkhc7h56r9gcc5"; depends=[magrittr stringr]; }; - superpc = derive2 { name="superpc"; version="1.09"; sha256="1p3xlg2n7p57n54g2w4frfrng5vjh97kp6ax4mrgvj3pqmd1m69z"; depends=[survival]; }; + supernova = derive2 { name="supernova"; version="2.2.3"; sha256="017dsmxk7a6szkgzmq9qfv5lzvxbkbz9dvhga5v0gmp2myiswji0"; depends=[lme4 magrittr purrr stringr vctrs]; }; + superpc = derive2 { name="superpc"; version="1.12"; sha256="0n68qafsww00q0wx37ms3rimrlhbp085ywvv2k5vw951j4z8ivfb"; depends=[survival]; }; supervisedPRIM = derive2 { name="supervisedPRIM"; version="2.0.0"; sha256="1j5gsy119pvrhkkg048lyk6hjvn9x1bhmfy5g824gj3k1w5slrib"; depends=[prim]; }; - suppdata = derive2 { name="suppdata"; version="1.1-3"; sha256="0nckhab2f5s4kv6n96l3z7cgsa9v423vl0jhlf1pakr25x9n1x8q"; depends=[httr jsonlite rcrossref xml2]; }; - support_BWS = derive2 { name="support.BWS"; version="0.4-1"; sha256="0lfjcwgq74zmgrzybrxj4prvdy2qjlflxsqli7kslymfc653g5qa"; depends=[]; }; + suppdata = derive2 { name="suppdata"; version="1.1-6"; sha256="0iq3rghynqxljrw2lqp102qs3w4wizj7j8pp5rf1bki7m6y8h19k"; depends=[httr jsonlite rcrossref xml2]; }; + support_BWS = derive2 { name="support.BWS"; version="0.4-2"; sha256="0kfl2ca8gd62k9ddiqf88c6g3a26g3mkf9kyk6bpgfck5lw7dpj8"; depends=[]; }; support_BWS2 = derive2 { name="support.BWS2"; version="0.3-0"; sha256="0k9yvg0n4lzsq43r53r9f70hq1q3zfljjafj9ds2p3c6qzgs9chi"; depends=[]; }; support_BWS3 = derive2 { name="support.BWS3"; version="0.2-0"; sha256="012kcvscz7m2is92r71731zc7xnp7pwyx30vivwjazrigp9bq1kl"; depends=[]; }; support_CEs = derive2 { name="support.CEs"; version="0.4-1"; sha256="1rbyl7v6m07dsp08kkk9020bh39rhx89q7d05rc5kxb6f7y66jyz"; depends=[DoE_base MASS RCurl simex XML]; }; supportInt = derive2 { name="supportInt"; version="1.1"; sha256="14fh75sds05c06xkcfbijd8my3sa9kpnczzh96xx0gwj1193yya9"; depends=[ProfileLikelihood]; }; supreme = derive2 { name="supreme"; version="1.1.0"; sha256="0y5kd911f7h754ppdpw94qw3r8vzz3yhyj5b99h3h96iifydlik6"; depends=[nomnoml shiny yaml]; }; - sur = derive2 { name="sur"; version="1.0.3"; sha256="1ndk2csh1k7h1ydjq4i1vc9lghqij1z1xnqqrs0p5fj0xz1ycims"; depends=[learnr]; }; - surbayes = derive2 { name="surbayes"; version="0.1.1"; sha256="0vkm8hfa3b7kwqasdy3v1kprr7j3pwv9cgn6bgdsswy110ly404r"; depends=[Matrix Rcpp RcppArmadillo rlist]; }; + sur = derive2 { name="sur"; version="1.0.4"; sha256="0rp5pwx3m6nzcy73wzmxpsxp9pc7swj2w5b82m0zdxq5kv9hsjsl"; depends=[learnr]; }; + surbayes = derive2 { name="surbayes"; version="0.1.2"; sha256="0n01g84cwq5aj4qafk1zf60ka7s9z3q2gkgzp5xw9dx5lgfh7dgb"; depends=[Matrix Rcpp RcppArmadillo rlist]; }; sure = derive2 { name="sure"; version="0.2.0"; sha256="0gwr2j321i2vq98rin5b1m4sl123dm1nih1ghcmj0zd1wd6x5x54"; depends=[ggplot2 goftest gridExtra]; }; + sureLDA = derive2 { name="sureLDA"; version="0.1.0-1"; sha256="09ls5gv9jip2pw38qw3v2ag91fgmmkq989pyr8c8j92nbwk6i3hr"; depends=[doParallel foreach glmnet MAP Matrix pROC Rcpp RcppArmadillo]; }; + surface = derive2 { name="surface"; version="0.5"; sha256="1fw75543aa6yafldffh9cnpm6m0rif0fpcihwj56d7nfnkbslawz"; depends=[ape geiger MASS ouch]; }; surrosurv = derive2 { name="surrosurv"; version="1.1.25"; sha256="05s1skjp1vzwai2nfw65ff4q2qhbj596lhfvzd1gdrbs39r90hxh"; depends=[copula eha lme4 MASS Matrix msm mvmeta optextras optimx parfm SurvCorr survival]; }; surrosurvROC = derive2 { name="surrosurvROC"; version="0.1.0"; sha256="1dpqr9dqzckgvdfrb2ndxazra0lbp6db9wbjch4vig3kyz6nyw4y"; depends=[survival]; }; surv2sampleComp = derive2 { name="surv2sampleComp"; version="1.0-5"; sha256="0pk70q33il9clz0ikzx1cypg5ygnsqp5hgk67xczzbidksjzs4dn"; depends=[flexsurv plotrix survival]; }; @@ -14908,37 +15548,40 @@ in with self; { survC1 = derive2 { name="survC1"; version="1.0-2"; sha256="1bidjhq3k5ab7gqj1b2afngip7pp6c9c7q0m6ww7h7i2vg505l7v"; depends=[survival]; }; survCurve = derive2 { name="survCurve"; version="1.0"; sha256="0zspyxzn99ljiqp1111202714rqs4vg6j2rv66qv8ilxajvdxxas"; depends=[survival]; }; survELtest = derive2 { name="survELtest"; version="2.0.1"; sha256="03jnj88z45iw9v1628bz99608q2jwbqw6cfsvqal2jj4392fz428"; depends=[Iso nloptr plyr survival]; }; - survHE = derive2 { name="survHE"; version="1.1"; sha256="0q8mjyms2bivxh59fgl86l3nzrgysysahfpiknqymhk32y80has6"; depends=[BH flexsurv Rcpp RcppEigen rms rstan StanHeaders xlsx]; }; + survHE = derive2 { name="survHE"; version="1.1.1"; sha256="19qp4mmg4agidxwfyqmxd9j01zi3r4qn3z2ph4l45svjvf5bkk27"; depends=[BH dplyr flexsurv ggplot2 Rcpp RcppEigen rms rstan StanHeaders tibble xlsx]; }; survIDINRI = derive2 { name="survIDINRI"; version="1.1-1"; sha256="03lsypx189zm28gv764gdq24a18jj3kpdk91ssa501qxj5jv7v29"; depends=[survC1 survival]; }; survJamda = derive2 { name="survJamda"; version="1.1.4"; sha256="14ly1g548ysm8jgsyrhj12zmd6i2lca7rsgby3jbwikyqyk1mx5q"; depends=[ecodist survcomp survival survivalROC survJamda_data]; }; survJamda_data = derive2 { name="survJamda.data"; version="1.0.2"; sha256="0a010v2ar48i5m0jiqjvdyqm93ckfgfmcmym9a02h0rclnizd75r"; depends=[]; }; survMisc = derive2 { name="survMisc"; version="0.5.5"; sha256="00nvvl8gz4477ab24rd0xvfksm8msv8h021b9ld5c9cizc41n2bm"; depends=[data_table ggplot2 gridExtra km_ci KMsurv knitr survival xtable zoo]; }; - survParamSim = derive2 { name="survParamSim"; version="0.1.2"; sha256="06x98085phmlf9vbpx0nh6b03h42hxcv0jqlbszz65pvzalgjqfh"; depends=[dplyr forcats ggplot2 magrittr mvtnorm purrr rlang survival tibble tidyr]; }; - survPen = derive2 { name="survPen"; version="1.5.0"; sha256="1cxjv0mf28dcv6zx0lj38gs7clkvmmd1h56jx0kmlrj9y62i6k7l"; depends=[Rcpp RcppEigen statmod]; }; + survParamSim = derive2 { name="survParamSim"; version="0.1.4"; sha256="07imxng38r1wg9zb72cl2g7vgvawy5r0z9shqa2h6nrvjknp2ssp"; depends=[dplyr forcats ggplot2 magrittr mvtnorm purrr rlang survival tibble tidyr]; }; + survPen = derive2 { name="survPen"; version="1.5.1"; sha256="0c1lnkl7sc1967y86g4y9an13bqiv62pxiwz496xdhbzvwliqh31"; depends=[Rcpp RcppEigen statmod]; }; survPresmooth = derive2 { name="survPresmooth"; version="1.1-10"; sha256="0m1037v857g140lypck5zq2zf52rkdxzaqlj9kjn7h7lp6gif6ia"; depends=[]; }; survRM2 = derive2 { name="survRM2"; version="1.0-3"; sha256="1x526ax39xx4zbhr6bdzphj4sljnl070vm0qh1479r1gj0vmmhif"; depends=[survival]; }; survRM2adapt = derive2 { name="survRM2adapt"; version="1.0-1"; sha256="1r3jvjbc2sb7b00s95b3sdx4d99rmrnd573fx1n4914ydiggi9nn"; depends=[survival]; }; survRM2perm = derive2 { name="survRM2perm"; version="0.1.0"; sha256="0js9sgslxzzs8k94k9kdmbmwp1ckk9mlr8sndk17dg24raks4zmz"; depends=[survival]; }; + survRatio = derive2 { name="survRatio"; version="0.1"; sha256="1xrqin3q3b7r8ga4i71ci97rsm4lj5ffd0720n7s563jkpnpyb9l"; depends=[ggplot2 ggpubr gridExtra survival]; }; survSNP = derive2 { name="survSNP"; version="0.24"; sha256="0mzwcp8zfqvsiapa446si9qb6wyymnw5zj6acj6f2cfjpyi76k4w"; depends=[foreach lattice Rcpp survival xtable]; }; survSens = derive2 { name="survSens"; version="0.1.0"; sha256="1s4s5l31yps93s2zdxpidkdg8kmmwj6vb3zfndmnxvc07arwhvbv"; depends=[directlabels ggplot2 survival]; }; surveillance = derive2 { name="surveillance"; version="1.18.0"; sha256="01iy6dlkd5w9191vr3agm3fgl3vbh2yaan5rsgn0ki741gf2zdag"; depends=[MASS Matrix nlme polyCub Rcpp sp spatstat xtable]; }; survexp_fr = derive2 { name="survexp.fr"; version="1.0"; sha256="12rjpnih0xld4dg5gl7gwxdxmrdmyzsymm7j05v98ynldd1jkjl8"; depends=[survival]; }; survey = derive2 { name="survey"; version="4.0"; sha256="1q9x0s86s72gl43zj49gypg6jj2b78xjvxr4lmy5147s9h7z8lxh"; depends=[lattice Matrix minqa mitools numDeriv survival]; }; surveybootstrap = derive2 { name="surveybootstrap"; version="0.0.1"; sha256="13rp6gj1dgdzcjbi2403pldygp1dyqx8zj0r1nvyghpi06x5gpb7"; depends=[dplyr functional plyr Rcpp RcppArmadillo stringr]; }; - surveydata = derive2 { name="surveydata"; version="0.2.5"; sha256="07k54282y69sl4z85v0in6v4f3dpk3i807n5ysyb54p6j1gy95al"; depends=[assertthat dplyr DT ggplot2 magrittr purrr rlang scales tidyr]; }; + surveydata = derive2 { name="surveydata"; version="0.2.6"; sha256="1z72l9dzdhg2r7wd284wa569f4bcnqhz6lha1lch1am7g2i3633d"; depends=[assertthat dplyr DT ggplot2 magrittr purrr rlang scales tidyr]; }; surveyeditor = derive2 { name="surveyeditor"; version="1.0"; sha256="073219bcn1hlxl9ql6gncfvgn0m37pz5sb7h94nq6lf35dymq5zq"; depends=[]; }; surveyoutliers = derive2 { name="surveyoutliers"; version="0.1"; sha256="03nqw0zir3x57gg23hgsr2s99pv958kfsygqfwly96rvfdhr5p3v"; depends=[]; }; surveyplanning = derive2 { name="surveyplanning"; version="4.0"; sha256="19ydgcwyvkhknf4qmlw7j25skcj9a4rd6s8j5n7bdqpljl60zync"; depends=[data_table laeken]; }; - surveysd = derive2 { name="surveysd"; version="1.2.0"; sha256="1w4cd52gdl65p16rza50n7pk2xfx3kxd1k16pr67j0pnyl7h2fqk"; depends=[data_table dplyr ggplot2 laeken matrixStats Rcpp]; }; + surveysd = derive2 { name="surveysd"; version="1.3.0"; sha256="0d5xjdlccqaa1h437rz5zq6a829rpz426m55jgprhfpcps1wfhbk"; depends=[data_table ggplot2 laeken Rcpp]; }; survidm = derive2 { name="survidm"; version="1.2.0"; sha256="0dgcxhf8x1aavr4n4aqanfc23zd62dyk3h05sa04611h6n9l8j9c"; depends=[doParallel doRNG foreach KernSmooth np survival TPmsm]; }; - survival = derive2 { name="survival"; version="3.2-3"; sha256="07h76r2y23w889257krlijcw4n4d7ssx92x7i5qb1xyv5gyvl3rx"; depends=[Matrix]; }; - survivalAnalysis = derive2 { name="survivalAnalysis"; version="0.1.3"; sha256="1jxlv0rcnrw4il17q632dsj1mxn71ql32cmcdhv4b7mywgcibqw5"; depends=[cowplot dplyr forcats ggplot2 gridExtra magrittr purrr rlang scales stringr survival survminer tibble tidyr tidytidbits]; }; + survival = derive2 { name="survival"; version="3.2-7"; sha256="0ila864g5b9yhjhk3jirgdpi06sksc0axa78890dmkvyv9rwsmjk"; depends=[Matrix]; }; survivalMPL = derive2 { name="survivalMPL"; version="0.2"; sha256="05bfa9fx841kh9g2jcs1dimsxkjnf4bxgamcnjpisx3a644c1gkn"; depends=[MASS survival]; }; + survivalMPLdc = derive2 { name="survivalMPLdc"; version="0.1.1"; sha256="1wqlzpwm1p7nq19l3d7c93zv6fnn0b1w24kak9zwsgyhar3f5lv9"; depends=[copula matrixcalc splines2 survival]; }; survivalROC = derive2 { name="survivalROC"; version="1.0.3"; sha256="0wnd65ff5w679hxa1zrpfrx9qg47q21pjxppsga6m3h4iq1yfj8l"; depends=[]; }; + survivalmodels = derive2 { name="survivalmodels"; version="0.1.4"; sha256="0zphifvdpvs58f4z6nxi1w9ry480q98wvx7as7v13240gb7djvrr"; depends=[Rcpp]; }; survivalsvm = derive2 { name="survivalsvm"; version="0.0.5"; sha256="1b4hrdrqq1z0kfn8vpdwg54388m25df2s6w9i574x3mkxkmkjkga"; depends=[Hmisc kernlab Matrix pracma quadprog survival]; }; survminer = derive2 { name="survminer"; version="0.4.8"; sha256="1niysd89mxb2a6ncvzm1s6xgfvq3psba65af0whh2p56r2hwrwff"; depends=[broom dplyr ggplot2 ggpubr gridExtra magrittr maxstat purrr rlang scales survival survMisc tibble tidyr]; }; survsim = derive2 { name="survsim"; version="1.1.5"; sha256="0194w1h3v4p546wibp3xyhy2r84w3p9r6ggzhlf11v8467mjy0l9"; depends=[eha statmod]; }; survtmle = derive2 { name="survtmle"; version="1.1.1"; sha256="1l13rvwq4915ij2a55fxdj3b3wkgjca1fbqzcgkjlpzkcn97k1nj"; depends=[dplyr ggplot2 ggsci Matrix plyr speedglm stringr SuperLearner tidyr]; }; + survxai = derive2 { name="survxai"; version="0.2.2"; sha256="09ig561754kjzpay2hy3n62zlk0bgwkjy8vnslrr428r8m1lj0qr"; depends=[breakDown ggplot2 pec prodlim scales survival survminer]; }; sutteForecastR = derive2 { name="sutteForecastR"; version="0.1"; sha256="13dd0v3l3s7xb1wnpf6qvnvclzab87831z8bsxsq53vpb26xcw1b"; depends=[forecast forecastHybrid fracdiff robets]; }; svDialogs = derive2 { name="svDialogs"; version="1.0.0"; sha256="0xqppydfawnwk84kb5qiybwbcmv38vn4imgz01mz2pnq4xb80p97"; depends=[rstudioapi svGUI]; }; svDialogstcltk = derive2 { name="svDialogstcltk"; version="0.9-4"; sha256="16166f8i6nsg7palqmnlp5b9s91d6ja9n0zm6rcvd2fwnw2ljkr4"; depends=[svDialogs svGUI]; }; @@ -14947,42 +15590,46 @@ in with self; { svIDE = derive2 { name="svIDE"; version="0.9-54"; sha256="1a03xpjx22xhxfqkgcm1pmal0dlp544hvnckj0p6sy4y56hmsfik"; depends=[svMisc XML]; }; svKomodo = derive2 { name="svKomodo"; version="0.9-63"; sha256="0x2774lhckhg8kw6plsn6dpks3b3fisb0psa03p7di7jx8vrkg5n"; depends=[svMisc]; }; svMisc = derive2 { name="svMisc"; version="1.1.0"; sha256="01r2a73wx2sh1njky961fxabx5wgddqqjqba6vjg0f3h8r3abmn2"; depends=[]; }; - svSocket = derive2 { name="svSocket"; version="1.0.0"; sha256="06zq5h3y0mln2gv51dk42kalf62fl6s9183zipq77r1b0yvyqv7w"; depends=[svMisc]; }; + svSocket = derive2 { name="svSocket"; version="1.0.1"; sha256="1d4kp095r2vpdji2wji5al5ff1lzky817qh4id9fdbi1kiif97jz"; depends=[svMisc]; }; svSweave = derive2 { name="svSweave"; version="0.9-8"; sha256="0zkng8lwdpjdbic9f6jnk2ndxbch2kjyz71ds1bksvd3kmk03lks"; depends=[knitr]; }; svTools = derive2 { name="svTools"; version="0.9-5"; sha256="040wr8cr2p35x6pr515bprmsw8ysajx4df5f2njz3ily61xf9szi"; depends=[codetools svMisc]; }; svUnit = derive2 { name="svUnit"; version="1.0.3"; sha256="0awz9ks0y1n98y9nq6rq65yj7y22z5q4a5w5qhkszkgc9669q1dw"; depends=[]; }; svWidgets = derive2 { name="svWidgets"; version="0.9-45"; sha256="08cpsy4abypjnv33arsgxk5i0gpdvdzj60wa1b22ca1n7d35mc80"; depends=[svMisc]; }; - svars = derive2 { name="svars"; version="1.3.3"; sha256="1npjnxbxpidcpifgh2k6xs7drhc075cnzd7mb7wnxi9yz0v10fmr"; depends=[clue copula DEoptim expm ggplot2 pbapply Rcpp RcppArmadillo reshape2 steadyICA strucchange vars zoo]; }; - svcm = derive2 { name="svcm"; version="0.1.2"; sha256="1lkik65md8xdxzkmi990dvmbkc6zwkyxv8maypv2vbi2x534jkhl"; depends=[Matrix]; }; + svars = derive2 { name="svars"; version="1.3.5"; sha256="0z6ii85q3bx8c6kbpz4k4apksmwnixzgn4s68d0py320il8sdaal"; depends=[clue copula DEoptim expm ggplot2 pbapply Rcpp RcppArmadillo reshape2 steadyICA strucchange vars zoo]; }; svd = derive2 { name="svd"; version="0.5"; sha256="18bi42pgml9i8jflfk29ws0bfblkj3f69z9p9mkd0m8kcx4d8hnh"; depends=[]; }; svdvisual = derive2 { name="svdvisual"; version="1.1"; sha256="02mzh2cy4jzb62fd4m1iyq499fzwar99p12pyanbdnmqlx206mc2"; depends=[lattice]; }; svenssonm = derive2 { name="svenssonm"; version="0.1.0"; sha256="0pvay9vfrcafaq270pq6glp2b74zdfgldksl13cwdb0wk7qx7731"; depends=[]; }; svgPanZoom = derive2 { name="svgPanZoom"; version="0.3.4"; sha256="1iglgwbyxf5q4716h9ba2cfmxh1qq16zwy54krnawg4580v8ydh2"; depends=[htmlwidgets]; }; - svgViewR = derive2 { name="svgViewR"; version="1.4"; sha256="00nm2sdgil2kw6f19sy03m8452zia47bv1bkynxw3q7vck3vb3vx"; depends=[Rcpp rjson Rook]; }; + svgViewR = derive2 { name="svgViewR"; version="1.4.1"; sha256="0xppvrfl7q3viahvwvmn498wli74ldwijapf6n432gvc4phmy7wi"; depends=[Rcpp rjson Rook]; }; svglite = derive2 { name="svglite"; version="1.2.3.2"; sha256="00n8bg4iligl0h24v42cka417w26zmcxrr4r6k8wdal1riwhgmi5"; depends=[BH gdtools Rcpp]; }; + svgtools = derive2 { name="svgtools"; version="1.0.0"; sha256="1d2vgczcp5q0ydhfvrq3sn6n21dr9gqh9bpiy35qbfhqvmahgwsp"; depends=[magick rsvg stringr xml2]; }; svmpath = derive2 { name="svmpath"; version="0.970"; sha256="19b5hfqqsh072l5mbkafm5pjd6qhyj20qd2vq6zl5jjmc45r72w1"; depends=[kernlab]; }; svmplus = derive2 { name="svmplus"; version="1.0.1"; sha256="08cfywrbaxyacqd3l75lysb23ahqbs80959iqkjbb125aafmhvni"; depends=[MASS Matrix quadprog]; }; svrpath = derive2 { name="svrpath"; version="0.1.2"; sha256="18h40555jmqpbsnhlwkvc5fl7d0r2bgscdv8amjvhjxmx9y952a2"; depends=[quadprog svmpath]; }; - svs = derive2 { name="svs"; version="2.0.0"; sha256="1kcrdgg0pw5ypjgl59wn66c3ipinamcnd4752hjnfrf62pkc6fgw"; depends=[gtools Matrix]; }; + svs = derive2 { name="svs"; version="3.0.0"; sha256="1jn3dbaqpgydkwf9y7hq97nva26vvrpl9zmw2bw4ky1qgzgz1ypb"; depends=[gtools Matrix]; }; svyPVpack = derive2 { name="svyPVpack"; version="0.1-1"; sha256="15k5ziy2ng853jxl66wjr27lzc90l6i5qr08q8xgcs359vn02pmp"; depends=[survey]; }; + svyVGAM = derive2 { name="svyVGAM"; version="0.222-2"; sha256="1lr1hydxxjqc0wkppyr9km2aaq65azvx5spjkxxx1z41a1cjapah"; depends=[survey VGAM]; }; svydiags = derive2 { name="svydiags"; version="0.3"; sha256="0xgizswdqs8cjac200sqv3ygvrnbcy74h92kgx4r6nv1fhlcljl3"; depends=[MASS Matrix survey]; }; swCRTdesign = derive2 { name="swCRTdesign"; version="3.1"; sha256="18ln02fnxkpjqi8a36wr2qr427hxrghkhfjx0384grmdg1mmkbf5"; depends=[]; }; swa = derive2 { name="swa"; version="0.8.1"; sha256="1zy1a6c17vmdkmkwp8vv3niww2zs1m0hylsa0b2cz68vfhnmpim4"; depends=[ggplot2 reshape ROCR]; }; - swagger = derive2 { name="swagger"; version="3.9.2"; sha256="13scbzv65qzxh7kfwlb2k47zgvv7fz085g5lki6zr5w6a33g45q9"; depends=[]; }; + swag = derive2 { name="swag"; version="0.1.0"; sha256="1w6schbj5gw7278krjzkcwafz3wv7vp7cfsvy17c0i1b5g3qqkpd"; depends=[caret Rdpack]; }; + swagger = derive2 { name="swagger"; version="3.33.1"; sha256="1ldgmy5vjzd11z5yl5a518wkw6y0l469b2zf0lp12hk19jq6k0sj"; depends=[]; }; swamp = derive2 { name="swamp"; version="1.5.1"; sha256="1mj6cqrc19p07v051fg6ikhhbccsg2lvz7wjiakaswqqm0269843"; depends=[amap gplots impute MASS]; }; swapClass = derive2 { name="swapClass"; version="1.0.1"; sha256="0wg6km261xdywakxi64dw4wwprbrkw217q4c6622z0mgm9sjgpym"; depends=[inline]; }; swatches = derive2 { name="swatches"; version="0.5.0"; sha256="1kivscgka8gn44rjj0s5sjan1s04znnyn0nd37a74zaik0hm8zs0"; depends=[colorspace httr pack stringr xml2]; }; swdft = derive2 { name="swdft"; version="1.0.0"; sha256="0529rw8nsl48hwiy741alvrzg5d5q1nhnjshrsfwchm5kdv0igva"; depends=[]; }; + swdpwr = derive2 { name="swdpwr"; version="1.4"; sha256="0qwpkvxhkv9jf7n312jixf058h3l5hlpygr9cy6l2p148y79gcid"; depends=[]; }; sweep = derive2 { name="sweep"; version="0.2.3"; sha256="1705mcp9p5h50ifqjjwx61z5wl5izv889nxcgdkx1i0dlcr61l2a"; depends=[broom dplyr forecast lubridate rlang tibble tidyr timetk]; }; sweidnumbr = derive2 { name="sweidnumbr"; version="1.4.2"; sha256="0zzjvwd60w9b5ybsb72aqa42sx6al4ymr591j3zryxgpl6rms5rh"; depends=[checkmate lubridate stringr]; }; swephR = derive2 { name="swephR"; version="0.3.0"; sha256="0fk5wih3i5vpkcc9y1n30xwc1hyqgfgnad9jkdgdx0m31pn1y9j5"; depends=[Rcpp]; }; + swfscAirDAS = derive2 { name="swfscAirDAS"; version="0.2.1"; sha256="0z85gb9vxl0fn90axhdzdpvl00w5fxwl7hw9iv50bi1pjjbm830b"; depends=[dplyr lubridate magrittr readr rlang stringr swfscDAS swfscMisc tidyr]; }; swfscDAS = derive2 { name="swfscDAS"; version="0.4.0"; sha256="0sjw3acf60yawmcwmql21im1q5lbn83jnblcxmj2az93abzbjqfl"; depends=[dplyr lubridate magrittr purrr readr rlang sf swfscMisc tidyr]; }; swfscMisc = derive2 { name="swfscMisc"; version="1.3"; sha256="03wzjricpgf55yfwmj4vjcvz59yxcipfp4bsjddzw65glasa9d1s"; depends=[dplyr ggplot2 ggrepel magrittr mapdata maps reshape2 rlang spatstat tibble tidyr]; }; swgee = derive2 { name="swgee"; version="1.4"; sha256="1a6zr4nkpj52b0rk01qbwzi8y0c798wlxzw69wyyv576k148rgfq"; depends=[gee geepack mvtnorm]; }; swirl = derive2 { name="swirl"; version="2.4.5"; sha256="0cqyn2rnqfkb2wza4zdr1kcms5l0igbq79xh5i7765agdday2z9w"; depends=[digest httr RCurl stringr testthat yaml]; }; swirlify = derive2 { name="swirlify"; version="0.5.3"; sha256="1bpg6yz2adgspjlwsf2q83j1bq0iyvp9938smgc41861nsclngwr"; depends=[base64enc readr rmarkdown shiny shinyAce stringr swirl whisker yaml]; }; swissMrP = derive2 { name="swissMrP"; version="0.62"; sha256="1vy6h6c4v49zlsli77ilj4df8cfh67rqmki71v6j1aqw6kf3b649"; depends=[arm blme lme4 maptools sp]; }; - swissdd = derive2 { name="swissdd"; version="1.0.3"; sha256="0kj466fp9i3yv8925wpy3vff8dnzdzhcjgk5ncp1vd13cxyfd38y"; depends=[curl dplyr jsonlite magrittr purrr tibble tidyr]; }; + swissdd = derive2 { name="swissdd"; version="1.0.4"; sha256="19wv1vydxkd29s8ma01kgpf3p7msn00179h73qrxd7b1j9sniy97"; depends=[curl dplyr jsonlite magrittr purrr tibble tidyr]; }; swissparl = derive2 { name="swissparl"; version="0.2.1"; sha256="0181ls1gw68kfz3yqf8m2nwhah87i9m164rlbycy1kxq9adi93cs"; depends=[crayon dplyr ggplot2 httr jsonlite lubridate magrittr purrr stringr tibble tidyr]; }; switchcase = derive2 { name="switchcase"; version="0.1.1"; sha256="0h31nzyf7dzalgl65cw0k1fxylbmx78l45r5id2wcqdym23dv9a9"; depends=[]; }; switchnpreg = derive2 { name="switchnpreg"; version="0.8-0"; sha256="1vaanz01vd62ds2g2xv4kjlnvp13h59n8yqikwx07293ixd4qhpw"; depends=[expm fda HiddenMarkov MASS]; }; @@ -14994,8 +15641,8 @@ in with self; { sybilccFBA = derive2 { name="sybilccFBA"; version="3.0.1"; sha256="1y94d6ajf0l492nrd8wsz3b6x724zcyhipasgyx65nx3sgha6yp8"; depends=[Matrix sybil]; }; sybilcycleFreeFlux = derive2 { name="sybilcycleFreeFlux"; version="2.0.1"; sha256="0j1qmf5apb6k0ga5ki7wxbbq1k8x7kv8wcnf85zcx0117fjkxfng"; depends=[MASS Matrix sybil]; }; sylcount = derive2 { name="sylcount"; version="0.2-2"; sha256="0cncj0nszfw98i94sb3sqdzdxdqjs523kmbqxz6cvvph1s77aama"; depends=[]; }; - syllabifyr = derive2 { name="syllabifyr"; version="0.1.0"; sha256="1pd5zjgcmpxg7xqhcljxck80pjs84ihhkr5bl4i8h2mc6xqmy1kf"; depends=[dplyr purrr stringr tibble tidyr]; }; - sylly = derive2 { name="sylly"; version="0.1-5"; sha256="01c7mpsk32kcsjyzzv52bn8bj28lqbmyhhfa1cwhphva5c5nkqwx"; depends=[]; }; + syllabifyr = derive2 { name="syllabifyr"; version="0.1.1"; sha256="1z61afxx2bm37hxvv1fl3x7ibhkp3h1ivl3k9prqzsaw4j592vfx"; depends=[dplyr purrr stringr tibble tidyr]; }; + sylly = derive2 { name="sylly"; version="0.1-6"; sha256="0f03k9d15fkym14y94jb7rkh228blc76jlm7pk229b44hcbh3mmm"; depends=[]; }; sylly_en = derive2 { name="sylly.en"; version="0.1-3"; sha256="0jw48qin172vv7skcpvcpi9wzgav5l9afzb09hhgcxvivbz6dl93"; depends=[sylly]; }; sym_arma = derive2 { name="sym.arma"; version="1.0"; sha256="13fhmgzd50mwlnz9m6nnn4arr4jdqf5h7dgli5lk08da9wx6cy69"; depends=[]; }; symDMatrix = derive2 { name="symDMatrix"; version="2.1.1"; sha256="0xmpw37qkbadqp1idv8qmazdmmv0sd4fwgihg1b97hxzqhsxw0fh"; depends=[bit ff LinkedMatrix]; }; @@ -15011,53 +15658,55 @@ in with self; { synchrony = derive2 { name="synchrony"; version="0.3.8"; sha256="1zpxg4dkxnvafiyp0j00wig5ymj10bzfg2376x56rzpnabhg57hi"; depends=[]; }; synfd = derive2 { name="synfd"; version="0.1.3"; sha256="1h8vfrfw00449vjbj6z4y7m5p7rxzvqjcykyxw5sb473f63gr5px"; depends=[L1pack Rdpack]; }; synlik = derive2 { name="synlik"; version="0.1.2"; sha256="1pscfqg5x7wpq3vp1i7fy29dwa7cw5g3kzxinanwrwbcznv9nyms"; depends=[Matrix Rcpp RcppArmadillo]; }; - synoptReg = derive2 { name="synoptReg"; version="1.0.1"; sha256="16ncbxdyqyd0jrsshllv14pgdlkli1ymwjkh4sijnhzk9yhrbb28"; depends=[dplyr ggplot2 lubridate magrittr metR raster RNCEP stringr tibble tidyr]; }; + synoptReg = derive2 { name="synoptReg"; version="1.1.0"; sha256="0sqkx0zzj2hk59bjf5ma12rqdxy2dyszybr47ii6qvsiyp63ywcr"; depends=[dplyr ggplot2 lubridate magrittr metR raster rnaturalearth rnaturalearthdata RNCEP sf stringr tibble tidyr]; }; syntaxr = derive2 { name="syntaxr"; version="0.8.0"; sha256="1iik9b3x9jx7w31j7hyi3sixg30l5a6w40svhqj1xlchsk60yykn"; depends=[magrittr]; }; synthACS = derive2 { name="synthACS"; version="1.6.0"; sha256="0dwcx2c284fa9d0y7kpai3jpby3drriw9bxbjld8v6lz7af6d9mw"; depends=[acs data_table Rcpp]; }; + synthesis = derive2 { name="synthesis"; version="1.2.0"; sha256="0jw10g1zrrzq2fmy2dvlfvk4sv3bhmv7czdsscqrp5ly7jkr2cca"; depends=[MASS]; }; synthesisr = derive2 { name="synthesisr"; version="0.3.0"; sha256="0b50d5hfkscggn2f6h8wyljkar08r8cbc0a4l12f809w5hdnjc63"; depends=[stringdist]; }; - synthpop = derive2 { name="synthpop"; version="1.5-1"; sha256="0cd9g0aa4598l3gyqpywalmkmvibhqkxhkm2qkln11rkwv12lcyv"; depends=[classInt foreign ggplot2 lattice MASS mipfp nnet party plyr polspline proto randomForest rpart]; }; + synthpop = derive2 { name="synthpop"; version="1.6-0"; sha256="0yknpisl81r87afijnjz5za0j6nn135mhrbpa9dva3c0dzamnhms"; depends=[classInt foreign ggplot2 lattice MASS mipfp nnet party plyr polspline proto randomForest ranger rpart]; }; sys = derive2 { name="sys"; version="3.4"; sha256="11q4zmx62w44p1j34frwmrsp23mc7l4n354i0zyziw92yax8zy0p"; depends=[]; }; - sysfonts = derive2 { name="sysfonts"; version="0.8.1"; sha256="1xp40hchjfif80a6jj210ghrjcvjjf66vqcssdy7a1j53nl1n994"; depends=[]; }; + sysfonts = derive2 { name="sysfonts"; version="0.8.2"; sha256="1gapsiva0vjd2myxgm1avav6my5x00rmy2hx0qll7dm7v1isznbv"; depends=[]; }; sysid = derive2 { name="sysid"; version="1.0.4"; sha256="0fr9gf5yjin3zvz850z4r4pqc1r4mwx8d46sl64i4csdm9qnqagy"; depends=[bitops ggplot2 polynom reshape2 signal tframe zoo]; }; syslognet = derive2 { name="syslognet"; version="0.1.2.1"; sha256="0nwni2mn7w43pfasqa2dwy1l6r0ymlkwlsyd5q47fajdr8v1ir0q"; depends=[]; }; systemfit = derive2 { name="systemfit"; version="1.1-24"; sha256="180ah91i98gjswpbkkdjgnc2c9rz3pl5bw035iks92nd5vl6w5wz"; depends=[car lmtest MASS Matrix sandwich]; }; - systemfonts = derive2 { name="systemfonts"; version="0.2.3"; sha256="0wf62mfam5zlrck0wrdbyi4hi7pn5j0739rihgp8sj2cjypm2lnb"; depends=[]; }; + systemfonts = derive2 { name="systemfonts"; version="0.3.2"; sha256="12hdvv66kkd3b4rs82blc3c4ifz2dw1048sqpkbz6vkk1zqpc53x"; depends=[cpp11]; }; systemicrisk = derive2 { name="systemicrisk"; version="0.4.2"; sha256="021ypw9fag5kmk2q041pj2jfzgfg640yda7wvh0yzdmg73p6fvsw"; depends=[lpSolve Rcpp]; }; syt = derive2 { name="syt"; version="0.1.0"; sha256="1qagd67wznyc6sfvs22lw2lwnwap1hlpf92i0ck5aif514ysi886"; depends=[Matrix partitions]; }; - syuzhet = derive2 { name="syuzhet"; version="1.0.4"; sha256="0wf4rls7v7h7zkq2k550d16aqvaij27iim85cwif7dkbinajfngi"; depends=[dplyr dtt NLP textshape tidyr zoo]; }; + syuzhet = derive2 { name="syuzhet"; version="1.0.6"; sha256="16iccqdbw02iw82nah6kwz3gwfghi864j2y698n4b9dyc386ijzv"; depends=[dplyr dtt NLP rlang textshape tidyr zoo]; }; tRophicPosition = derive2 { name="tRophicPosition"; version="0.7.7"; sha256="1j06rc5s6jpz8i116m98ygc75sx6lk8jd9gw6fb8q342mbbmqh8h"; depends=[coda data_table ggplot2 gridExtra hdrcde MCMCglmm plyr rjags]; }; tTOlr = derive2 { name="tTOlr"; version="0.2"; sha256="1fk33vp6y65mls1iczjf63wzj1rl1knbdcbd4rnqqfdcqhibb3p3"; depends=[lattice latticeExtra]; }; taRifx = derive2 { name="taRifx"; version="1.0.6.2"; sha256="05cvjsi65fvy9hg2v3fldzwn1yd2kfirl3ffg9yfajm903dk3l49"; depends=[plyr reshape2]; }; tab = derive2 { name="tab"; version="4.1.1"; sha256="0ds8n6gncidb66in7hlqkcmil5yfsf7ihqvmls789hrm2iz9xlfm"; depends=[dplyr gee knitr MASS survey survival xtable]; }; - taber = derive2 { name="taber"; version="0.1.0"; sha256="07a18kn65b4cxxf1z568n7adp6y3qx96nrff3a3714x241sd5p6i"; depends=[dplyr magrittr]; }; + taber = derive2 { name="taber"; version="0.1.2"; sha256="0cib8fsib4q8nf18vcpailvkplf57cm8fshb09clxm3zcp8j9c17"; depends=[dplyr magrittr]; }; tabit = derive2 { name="tabit"; version="0.2.1"; sha256="0jy95jpbzj4rgaxmm6ki9wr0cl1w13pygq3yavdccjr82mayfpvc"; depends=[]; }; - tablaxlsx = derive2 { name="tablaxlsx"; version="1.2.2"; sha256="1q7ap1dmymf3aj5g860794jfn9zrn3qiwwcdzl95lsbpkhgyspmz"; depends=[openxlsx]; }; + tablaxlsx = derive2 { name="tablaxlsx"; version="1.2.4"; sha256="19yg8m264f1hjsi8b7zxjpbvlaz2jrxj2bd9nv95g52dvlysg4nk"; depends=[openxlsx]; }; table_express = derive2 { name="table.express"; version="0.3.1"; sha256="00f5xi2dkx1h0mv8ld3ds15w30d9vgvmjrldg43z7zskprshqsxx"; depends=[data_table dplyr magrittr R6 rlang tidyselect]; }; - table1 = derive2 { name="table1"; version="1.2"; sha256="1ggf3qkm7zwfdn1y1mhf8ydbg41aiy26p6g9iskryrxg7hgs3ynb"; depends=[Formula htmltools knitr yaml]; }; + table_glue = derive2 { name="table.glue"; version="0.0.2"; sha256="01yskmc604jdy6givddm0nhr9ylf7p68v2xz1p2mqylhws1lszph"; depends=[glue stringi]; }; + table1 = derive2 { name="table1"; version="1.2.1"; sha256="0p671082fax91hcb063zvgm1r0xm82h0yb22z2y2s41wkha95y7v"; depends=[Formula htmltools knitr yaml]; }; table1xls = derive2 { name="table1xls"; version="0.4.0"; sha256="0ixbshbp9hkcg12hj32vgb5bp0pj4rbc3i6g1xdg2zhqp7zanics"; depends=[XLConnect]; }; tableHTML = derive2 { name="tableHTML"; version="2.0.0"; sha256="19sa5sda4v5dr449ip9z9ah5hdph9q6vb6zbs93jn4rpkvyijny3"; depends=[htmltools jpeg magrittr png shiny webshot]; }; tableMatrix = derive2 { name="tableMatrix"; version="0.82.0"; sha256="1sskijhbqakamrk2rv7v5zpjsdi8jw0jl2z96l0vhsvsiq0cz1c8"; depends=[data_table]; }; tableone = derive2 { name="tableone"; version="0.12.0"; sha256="0pjpsdizpvqn7anyg95d4i7sf6qyqh7svp4a5gsch0r3gmpw2p3a"; depends=[e1071 gmodels labelled MASS nlme survey zoo]; }; tableplot = derive2 { name="tableplot"; version="0.3-5"; sha256="1jkkl2jw7lwm5zkx2yaiwnq1s3li81vidjkyl393g1aqm9jf129l"; depends=[]; }; tablerDash = derive2 { name="tablerDash"; version="0.1.0"; sha256="1mnp6lxa7d669r325aynq1n3f35r9sy4v1fvdh4cymbf33s8mkmm"; depends=[htmltools knitr shiny]; }; - tables = derive2 { name="tables"; version="0.9.3"; sha256="0wfn0jlyych6q2vdd2ldidbvdmizvk5vpkgpy4s97f3p42jsjmv2"; depends=[htmltools knitr]; }; + tables = derive2 { name="tables"; version="0.9.6"; sha256="1y0gnqd2q0gn1dr2nxdlsvyl4g5jnj9y9lx18bhvhrfzb5038j5w"; depends=[htmltools knitr]; }; tableschema_r = derive2 { name="tableschema.r"; version="1.1.1"; sha256="14cnbijxdhf7qbsiqbk8p516mfh9bgdbcg32vn5pycsp30k78b2h"; depends=[config future httr iterators jsonlite jsonvalidate lubridate purrr R6 RCurl rlist stringr urltools]; }; - tabr = derive2 { name="tabr"; version="0.4.3"; sha256="1vya8g0ajh0qsix9vsx0hz796gzfkck1k1kwjy41yb98sz9rbcnf"; depends=[crayon dplyr ggplot2 magrittr purrr tibble tidyr]; }; + tablesgg = derive2 { name="tablesgg"; version="0.7-1"; sha256="0zzcml97a9q98a999sb9hjyrkickkymhsppkxhxax32yf1h5x2kr"; depends=[ggplot2 tables]; }; + tabr = derive2 { name="tabr"; version="0.4.4"; sha256="00fnvifq8r4brygdvaawsb3yn8akiqmcd0pwbr48c1141q1n4h9j"; depends=[crayon dplyr ggplot2 magrittr purrr tibble tidyr]; }; tabshiftr = derive2 { name="tabshiftr"; version="0.1.2"; sha256="1b5x9mmc0dcd1nl82wf45xvls685vbqz2qimhx23c4ra55kxpz8n"; depends=[checkmate crayon dplyr magrittr purrr rlang stringr testthat tibble tidyr tidyselect]; }; tabuSearch = derive2 { name="tabuSearch"; version="1.1.1"; sha256="0396a8hla508na1hmyyhfbl8w10dbg810cln2xyhhvxi7rr223dj"; depends=[]; }; - tabularaster = derive2 { name="tabularaster"; version="0.6.5"; sha256="1xx9y324kwyf3iw2r506wb5hpwvxj2z3i43lllqiy3d6ikz73496"; depends=[dplyr fasterize magrittr raster silicate spatstat tibble]; }; + tabularaster = derive2 { name="tabularaster"; version="0.6.6"; sha256="1kj86h358a578c2cv7raks0fzk5kfxwbv8hrgrvq0gb07y6m4qa7"; depends=[dplyr fasterize magrittr raster silicate spatstat tibble]; }; tabularmaps = derive2 { name="tabularmaps"; version="0.1.0"; sha256="07i76n2fpl2ma6jl3zdbay0zmmaaxrxhv1368xm2d575br42nri4"; depends=[ggforce ggplot2 purrr rlang]; }; tabulizer = derive2 { name="tabulizer"; version="0.2.2"; sha256="0zd5cfqwgirqchw1mvziscxvzl8pb1y6rbfywkn9i9pxfydkm5vi"; depends=[png rJava tabulizerjars]; }; tabulizerjars = derive2 { name="tabulizerjars"; version="1.0.1"; sha256="005n2gyzzmq8h0mpj8xs6ri6llzwag7nqzpm4vnzp81vwy8kmf92"; depends=[rJava]; }; tabulog = derive2 { name="tabulog"; version="0.1.1"; sha256="0n6qjd7kmvxx5na71f358pw3bbwa69vh8qjkrs5mkb3izxabcq67"; depends=[yaml]; }; - tacmagic = derive2 { name="tacmagic"; version="0.3.0"; sha256="114qxi2ks5v8p7lr2i7fn1wi5lwzw1dpvbbg515gc8yplccpxwny"; depends=[pracma R_matlab]; }; + tacmagic = derive2 { name="tacmagic"; version="0.3.1"; sha256="1rayyavjppi5dbcmb4yb2nf85ch2li766sdllfsirb19bb3d4c2d"; depends=[pracma R_matlab]; }; tactile = derive2 { name="tactile"; version="0.2.0"; sha256="0jjfbsadxbf9s6vzi82rw5qa6hdc8iz4jci9xpbzwrjkb90dzd08"; depends=[gridExtra lattice latticeExtra MASS RColorBrewer]; }; tadaatoolbox = derive2 { name="tadaatoolbox"; version="0.17.0"; sha256="1mf6mzv84da7f87xy301xpb3rrjrhx1kximqi0310y291v4si13b"; depends=[broom car DescTools ggplot2 magrittr pixiedust viridis]; }; tagcloud = derive2 { name="tagcloud"; version="0.6"; sha256="04zrh029n8pjlxlr6pdd7xhqqhavbrj3fhvhj6ygzlvi2jslxnwl"; depends=[RColorBrewer Rcpp]; }; tailloss = derive2 { name="tailloss"; version="1.0"; sha256="0lmjgjs6d94b70i10vx66fyvlxm5swwqbcjsnqa3lmldzz6m4jc1"; depends=[MASS]; }; - tailr = derive2 { name="tailr"; version="0.1.3"; sha256="0agm83zwj6f3bpicbn2pcwira05v2pbv0g7myc1x06jxbw1qbfwp"; depends=[foolbox glue rlang]; }; taipan = derive2 { name="taipan"; version="0.1.2"; sha256="192sy5pgq74vs31p7jfn6svdzf9mk9ybppzhp1rlki1bagmm5f1r"; depends=[shiny]; }; - takos = derive2 { name="takos"; version="0.1.0"; sha256="0a26jmxccpyk36sah9nz7pqpkc1rd9kbwrvwh0r0zp7lwvxbjb8w"; depends=[baseline broom colorRamps data_table devEMF MASS minpack_lm pracma segmented sfsmisc smoother]; }; + takos = derive2 { name="takos"; version="0.2.0"; sha256="09w9lkqhxdb26fvrsb8n16601kqpr2smplipx3lj6cdgbyhb1hqz"; depends=[baseline broom colorRamps data_table deSolve devEMF MASS minpack_lm pracma segmented sfsmisc smoother]; }; tanaka = derive2 { name="tanaka"; version="0.1.3"; sha256="1x5czib9vqpxbr61if1rnlyrld6gx2zf22jz5rcagb8x3bxmd5g6"; depends=[isoband raster sf]; }; tangles = derive2 { name="tangles"; version="0.8.1"; sha256="06a5hn5hkvgr6pcjz3n0vi1zwmv00wypi5f62agqh8mas80v44vh"; depends=[digest raster sp]; }; tangram = derive2 { name="tangram"; version="0.7.1"; sha256="0p0hrn3jv1l00nsjqa0j9yv4982r08fwgsj01pc06vmipg87kjiy"; depends=[base64enc digest htmltools knitr magrittr R6 stringi stringr]; }; @@ -15066,32 +15715,33 @@ in with self; { tashu = derive2 { name="tashu"; version="0.1.0"; sha256="04xvmbcwi84zg1pqw21nmrbnkyx184wc200vl1vhmwxggq1i60np"; depends=[dplyr drat ggplot2 lubridate plyr randomForest RColorBrewer reshape2]; }; tatest = derive2 { name="tatest"; version="1.0"; sha256="1yd9pdpdhxwpllnj5wxa7ly29qiw8qywx9lx0w3nizczlx35fgjy"; depends=[]; }; tatoo = derive2 { name="tatoo"; version="1.1.1"; sha256="0w9rm6cnc1mpfyklb8njzjwph2c38niinzxiflrqjqfdp7nd8281"; depends=[assertthat colt crayon data_table magrittr openxlsx stringi withr]; }; - tau = derive2 { name="tau"; version="0.0-21"; sha256="08wfl0pv865clpcvzmzb3rw3hl76f16n3j61fbmrzi50xf2diyx7"; depends=[]; }; + tau = derive2 { name="tau"; version="0.0-23"; sha256="05qwvwmx631w19sxaw7jw5dgrdnj134f70l6rmfh3rpblpdy8509"; depends=[]; }; tauturri = derive2 { name="tauturri"; version="0.3.0"; sha256="014301f5mzy6vblqzb61bxjv46kdynmmrxjpxyvk01w1k8wkwfcn"; depends=[httr magrittr plyr purrr tibble]; }; taxa = derive2 { name="taxa"; version="0.3.4"; sha256="09mnszr8pdjxv680pbyp12wwvfb2iqpnqh3hmds05nisl8g5307x"; depends=[crayon dplyr jsonlite knitr lazyeval magrittr R6 rlang stringr taxize tibble tidyr]; }; taxadb = derive2 { name="taxadb"; version="0.1.0"; sha256="0nns9jpjawla90f12gi90562llb2j0pdhwlvy62mgcg0ghr39fgr"; depends=[arkdb curl DBI dbplyr dplyr jsonlite magrittr memoise progress rappdirs readr rlang RSQLite stringi tibble]; }; - taxize = derive2 { name="taxize"; version="0.9.97"; sha256="0f1js5jr0zxi0zmdc9sd658yl1ddnznzcsy64prvjx0cprw26lkj"; depends=[ape bold cli conditionz crayon crul data_table foreach jsonlite natserv phangorn R6 ritis rotl rredlist tibble wikitaxa worrms xml2 zoo]; }; - taxizedb = derive2 { name="taxizedb"; version="0.2.0"; sha256="16cjmrjxswl2a29gq3ibjcf4zilwcymm93rvmvjjxkh9r0svgqaz"; depends=[curl DBI dbplyr dplyr hoardr magrittr readr rlang RSQLite tibble]; }; - taxlist = derive2 { name="taxlist"; version="0.1.9"; sha256="15h8c3x1hri7dzxrm04lajh97i0wz6xvvasz1byfy2iy8mcfwrnz"; depends=[foreign stringdist taxa taxize vegdata]; }; + taxize = derive2 { name="taxize"; version="0.9.99"; sha256="0738fzckbwkgf21vranxhcfjq487rp3kjdnz2gfvdd1dm21jfp8s"; depends=[ape bold cli conditionz crayon crul data_table foreach jsonlite natserv phangorn R6 ritis rotl rredlist tibble wikitaxa worrms xml2 zoo]; }; + taxizedb = derive2 { name="taxizedb"; version="0.2.2"; sha256="005z4chlhbi5kai7yhy00r3mvvsr0y8d462z4lj7fa6vzcbbd9vw"; depends=[curl DBI dbplyr dplyr hoardr magrittr readr rlang RSQLite tibble]; }; + taxlist = derive2 { name="taxlist"; version="0.2.0"; sha256="1x4s8b8x5jxx7h2ml06l8s7hsgr0jbqvjw4gbxkrczgg957nnrfz"; depends=[foreign stringdist taxa taxize vegdata]; }; taxonomizr = derive2 { name="taxonomizr"; version="0.5.3"; sha256="0hxvcbyr5b3sxqy5kw1q17qx7c2q90a6x79r9bmjn6c2lnrqn83i"; depends=[data_table R_utils RSQLite]; }; taxotools = derive2 { name="taxotools"; version="0.0.43"; sha256="0msaqkvyhb292bsv84bw55xxmxhs5nyk31ikjz229q3xhv0zmnzw"; depends=[plyr sqldf taxize wikitaxa]; }; tbart = derive2 { name="tbart"; version="1.0"; sha256="0m8l9ic7na70il6r9ha0pyrjwznbgjq7gk5xwa5k9px4ysws29k5"; depends=[Rcpp sp]; }; tbd = derive2 { name="tbd"; version="0.1.0"; sha256="1wmfy3p82gckhfsslxzapryfygmircii7x24j6ysfyx52gy8iwf5"; depends=[numDeriv]; }; tbdiag = derive2 { name="tbdiag"; version="0.1"; sha256="1wr2whgdk84426hb2pf8iiyradh9c61gyazvcrnbkgx2injkz65q"; depends=[]; }; tbl2xts = derive2 { name="tbl2xts"; version="1.0.2"; sha256="0pqsrrv5qdwfrz3dd1b3idbk39gijwmm7k2xrakzdisswfxwggyd"; depends=[dplyr rlang tibble xts zoo]; }; - tbm = derive2 { name="tbm"; version="0.3-2.1"; sha256="0srdcla6m5vlid27i793yynm3r2fg3nzr7zn6j923fcmnpdg2jcg"; depends=[basefun coneproj mboost mlt sandwich variables]; }; + tbm = derive2 { name="tbm"; version="0.3-3"; sha256="16yqvjq6gq1k165zb9ldvdqz9wn9p6gp4y44z67iivg0klfmwmfz"; depends=[basefun coneproj mboost mlt sandwich variables]; }; tbma = derive2 { name="tbma"; version="0.1.0"; sha256="066p3szfayyimwblghm1lipjf21xgscq1fzbzpqz16lqjpb99ni1"; depends=[data_table ranger RcppRoll zoo]; }; - tboot = derive2 { name="tboot"; version="0.2.0"; sha256="06yliy77vi3ql7pyzr5czqa5fpqx696lqszn911snx1i32hmq6rm"; depends=[kernlab quadprog]; }; + tboot = derive2 { name="tboot"; version="0.2.1"; sha256="0pijvs5k28ndnkyy4lwln6wlcag0pnbndg33c5djyaxhns77faz2"; depends=[kernlab quadprog]; }; tbrf = derive2 { name="tbrf"; version="0.1.5"; sha256="1mxfvgb18a62igdh3af4m8x6fl69s25j4x7isd70w744w6jvch3h"; depends=[boot dplyr lubridate purrr rlang tibble tidyr]; }; tcR = derive2 { name="tcR"; version="2.3.2"; sha256="0rsz6mbqjwin28p1pmal38v5jsgavbs0n362kng5zq8yg3l4z718"; depends=[data_table dplyr ggplot2 gridExtra gtable igraph Rcpp reshape2 scales stringdist]; }; tcensReg = derive2 { name="tcensReg"; version="0.1.7"; sha256="07wwn65c4q2ngafxhdd9vl0y1wambfy158mf38skxm295yidd05n"; depends=[maxLik Rdpack]; }; tcftt = derive2 { name="tcftt"; version="0.1.0"; sha256="0p5ln0sl0fasdn49252g4lvwgwajgl7lh33a4r073ib54hxbj7bk"; depends=[]; }; - tcgsaseq = derive2 { name="tcgsaseq"; version="1.8.1"; sha256="1v5b3qghygb81lqc2h1fijgw856b1778xndppq7r4b0zhhvb81ac"; depends=[CompQuadForm ggplot2 GSA KernSmooth statmod]; }; + tcgsaseq = derive2 { name="tcgsaseq"; version="2.0.5"; sha256="1hfs3ppva7hi6h7965jfpgjp76ygaibmymkhxihrs8ag2pxp4skv"; depends=[CompQuadForm ggplot2 GSA KernSmooth pbapply statmod]; }; tcl = derive2 { name="tcl"; version="0.1.0"; sha256="1ssqx50ii6j2y5n2nxn5ndp20nrjss0xf0fqp8aiwlgnm3d1zggn"; depends=[eRm lattice MASS Matrix numDeriv]; }; tcltk2 = derive2 { name="tcltk2"; version="1.2-11"; sha256="1ibxld379600xx7kiqq3fck083s8psry12859980218rnzikl65d"; depends=[]; }; - tclust = derive2 { name="tclust"; version="1.4-1"; sha256="17md6l9v9dl9b72l84df01b52h2xiynbcjm437mv9mzcr09fc2sb"; depends=[]; }; + tclust = derive2 { name="tclust"; version="1.4-2"; sha256="1nb5iky4kc832627jf28lzj19wrvgwg5da6fyl3kyf0npmyx1p4m"; depends=[]; }; tcpl = derive2 { name="tcpl"; version="2.0.2"; sha256="0xic4jy8ldawmkvvwckiyy57ai5wif9yn7hyfndbxr6mvjl3rbbc"; depends=[data_table DBI numDeriv RColorBrewer RMySQL sqldf]; }; tdROC = derive2 { name="tdROC"; version="1.0"; sha256="137j1m9pysjcz1gsfcym0438by3c7na21ccjlqf7xfccr1y8k2k6"; depends=[survival]; }; + tdaunif = derive2 { name="tdaunif"; version="0.1.0"; sha256="0a24lqiimp54fmj4zi7bakxral8ny60n25h9arwl6m00c7cn98pl"; depends=[]; }; tdigest = derive2 { name="tdigest"; version="0.3.0"; sha256="17axsir4xig3vm3sc2gziy9n0p80b14vg52nwys23bzkfp0n63bm"; depends=[magrittr]; }; tdr = derive2 { name="tdr"; version="0.13"; sha256="0i0hnb3fc4d1mbbxcpzmyfh1w2rahfjabg5iyxym3yjd6377al15"; depends=[ggplot2 lattice RColorBrewer]; }; tdsc = derive2 { name="tdsc"; version="1.0.3"; sha256="1h46cflxj27i9bkl7iqxn7kzccl9b8r3fa9f5ska3a9p57algfyv"; depends=[data_table moments]; }; @@ -15114,20 +15764,20 @@ in with self; { tempoR = derive2 { name="tempoR"; version="1.0.4.4"; sha256="0gn16j496833pvbjaf6wx26z9ilwssjp947mcyk6n2jb33x93rr2"; depends=[doParallel foreach pls]; }; tenispolaR = derive2 { name="tenispolaR"; version="0.1.4"; sha256="0xpp1hi3xnkg55aixgy2bp5476i503h8gsiss9x7f15274kx0d7s"; depends=[stringr]; }; tensor = derive2 { name="tensor"; version="1.5"; sha256="19mfsgr6vz4lgwidm80i4yw0y1dr3n8i6qz7g4n2xa0k74zc5pp1"; depends=[]; }; - tensorA = derive2 { name="tensorA"; version="0.36.1"; sha256="176hjy3bvg3in62r97wxbhq187sjz6c1gwy9x6spaxl6k4my3zy7"; depends=[]; }; + tensorA = derive2 { name="tensorA"; version="0.36.2"; sha256="19wwh654qlja4z1n7afjpzsrrm53p8ddysa2vra5mdnkddb4g2cf"; depends=[]; }; tensorBF = derive2 { name="tensorBF"; version="1.0.2"; sha256="1dw1a6xqcsl4isbzbfiplgqq5nak5n9ffzm23mzzmkh1r1a8kl1y"; depends=[tensor]; }; - tensorBSS = derive2 { name="tensorBSS"; version="0.3.6"; sha256="1ja4h5x1i4rqgq9k15zjy524ki2z2636fg0jcp352jzj87wl3443"; depends=[ggplot2 ICtest JADE Rcpp RcppArmadillo tensor tsBSS]; }; + tensorBSS = derive2 { name="tensorBSS"; version="0.3.7"; sha256="14c2c551k3x3lwjh4gf0pqqhjfb8v3f6chzq9kgjqrmy76ax185w"; depends=[fICA ggplot2 ICtest JADE Rcpp RcppArmadillo tensor tsBSS]; }; tensorflow = derive2 { name="tensorflow"; version="2.2.0"; sha256="0dz47npinbz198h1ps4wap7x9dvw2vrgiw867wj1h3xkjs2dfv5m"; depends=[config jsonlite processx reticulate rstudioapi tfruns yaml]; }; - tensorordinal = derive2 { name="tensorordinal"; version="0.1.0"; sha256="0c54ppnxgmr7m9a3dr1a9i3z2vh5nnqp361lhaf081iib8shrxxv"; depends=[MASS pracma rTensor]; }; + tensorordinal = derive2 { name="tensorordinal"; version="0.2.0"; sha256="03xnwq6v5vcvgxd9acsqplbh1qr261yc0hybfkzss4rfns0lc85l"; depends=[MASS pracma rTensor]; }; tensorr = derive2 { name="tensorr"; version="0.1.1"; sha256="18xdvp328h96jn8y1iayxh7cyz2s8j5nn43nq18pyaxq271hkfyh"; depends=[assertive_base assertive_properties assertive_types Matrix purrr]; }; - tensorregress = derive2 { name="tensorregress"; version="2.0"; sha256="0whw57rj2jfh4wh30lv7n05ddymzsnxv6137f03s8aa9dh89fiqy"; depends=[MASS pracma speedglm]; }; - tensorsparse = derive2 { name="tensorsparse"; version="2.0"; sha256="0midaw95q2gmk7hdlh6zdbm8nx0lm9m3y5liq6xrb3ajlq76ncqw"; depends=[fields glmnet HDCI mvtnorm RColorBrewer reshape rgl viridis]; }; + tensorregress = derive2 { name="tensorregress"; version="3.0"; sha256="1dlxdc5jgfqzs6jzgirxqdigmcr3yr20ikbvd2c9b3y41cpsl11d"; depends=[MASS pracma speedglm]; }; + tensorsparse = derive2 { name="tensorsparse"; version="3.0"; sha256="0xx003nh5bi87cbsqb7ikpcs4yhjhphh7pybzzas44qkwbn4fn1k"; depends=[]; }; tensr = derive2 { name="tensr"; version="1.0.1"; sha256="1z6b3ra7fgn88mxbhsq65x3frj5j7p17n119s9kbw7sg9y633vfx"; depends=[assertthat]; }; - tergm = derive2 { name="tergm"; version="3.6.1"; sha256="03yd4l317airz84jfjyczjx43wi6sraid58lmxivm29xjk52xpi1"; depends=[coda ergm MASS network networkDynamic nlme robustbase statnet_common]; }; + tergm = derive2 { name="tergm"; version="3.7.0"; sha256="1prmqrns5cikx3w25rki7v08qs0zysplqz65ixzi54d6pmhb3lmg"; depends=[coda ergm MASS network networkDynamic nlme robustbase statnet_common]; }; tergmLite = derive2 { name="tergmLite"; version="2.2.1"; sha256="1fi379vginmgry4yhzd43lzrkn6vh44hrfcgdzgyxrf16rj0v617"; depends=[ergm network Rcpp statnet_common tergm]; }; - term = derive2 { name="term"; version="0.2.0"; sha256="1a9208nzapa9av24hhpcl8mkxky8ynh0n7fvxg331r0pmw8h6aql"; depends=[chk extras lifecycle rlang universals vctrs]; }; + term = derive2 { name="term"; version="0.3.0"; sha256="1sbnx9bwrz27bmni44blpkh1qb7nhh5brj71g8xy4yxh47yzsw9f"; depends=[chk extras lifecycle purrr rlang universals vctrs]; }; ternvis = derive2 { name="ternvis"; version="1.2"; sha256="057i6i3ygxrin0npc18gsg3dpdldzafyb5sr6lix5mhy6b09lkxf"; depends=[dichromat maps quadprog]; }; - terra = derive2 { name="terra"; version="0.8-6"; sha256="1ndh95ln0k82n7mnxw7nak9id23ia2vakxdw98ggkp460safi4a6"; depends=[raster Rcpp]; }; + terra = derive2 { name="terra"; version="0.9-11"; sha256="0pkm09by7l8wlpgxzx6qj3jj2d2pmcdj1bl46f4f7459ydl3d51r"; depends=[raster Rcpp]; }; terrainmeshr = derive2 { name="terrainmeshr"; version="0.1.0"; sha256="1xab6wzq2izzdvsss1rlgp5m3cn45naxhymq6cglipj0fd792jbr"; depends=[Rcpp]; }; tesseract = derive2 { name="tesseract"; version="4.1"; sha256="1a7cf48n7hdd6inqz23ifqhq6kx6wxri34a79ns2vxaj6f4llxf0"; depends=[curl digest pdftools rappdirs Rcpp]; }; test2norm = derive2 { name="test2norm"; version="0.1.1"; sha256="11by5a1j6613akxj1nc16r07jfwxr1izkpvymr9yycnddiqyp42c"; depends=[mfp]; }; @@ -15138,18 +15788,20 @@ in with self; { tester = derive2 { name="tester"; version="0.1.7"; sha256="1x5m43abk3x3fvb2yrb1xwa7rb4jxl8wjrnkyd899ii1kh8lbimr"; depends=[]; }; testextra = derive2 { name="testextra"; version="0.1.0.1"; sha256="166lg012hgk5n4zp92dagx01bjhpkjgc5i40x9fc9nfjby0wrc0s"; depends=[assertthat parsetools pkgcond postlogic purrr rlang stringi testthat]; }; testforDEP = derive2 { name="testforDEP"; version="0.2.0"; sha256="1mgzhj8b35r5cm4bl0nnyxj0h7rwd28d17qvgvaky2kvm2r83cf9"; depends=[Hmisc minerva Rcpp]; }; - testit = derive2 { name="testit"; version="0.11"; sha256="13iq4p8xzng88miizf04yv6z8vk7zhg1c8kd2h6swcmhqzq29yqj"; depends=[]; }; - testthat = derive2 { name="testthat"; version="2.3.2"; sha256="0v70v2fs0f2ir962z9csbjlj8snrq9mbjfyhhb9dhz3zy26qs9hs"; depends=[cli crayon digest ellipsis evaluate magrittr pkgload praise R6 rlang withr]; }; + testit = derive2 { name="testit"; version="0.12"; sha256="12af6n3bbqnsxmsr1qyjdhypn062n3mxaikrd9dqm9p7y09gkkcs"; depends=[]; }; + testthat = derive2 { name="testthat"; version="3.0.1"; sha256="1l1s4jgmgbsf711ma5i58ssgkz98an7hijcxvwfz314nf5fc8zr9"; depends=[brio callr cli crayon desc digest ellipsis evaluate jsonlite lifecycle magrittr pkgload praise processx ps R6 rlang waldo withr]; }; testthis = derive2 { name="testthis"; version="1.1.1"; sha256="0csragn695698dpkr9d3md0g81bzpy5mybd0jik669q9cs8sdzh2"; depends=[assertthat devtools fs magrittr pkgload rprojroot stringi testthat usethis]; }; + testtwice = derive2 { name="testtwice"; version="1.0.3"; sha256="06fr13ww2wqk753p0cnl1ldn3nqrvdfnz0lgkpldcn0xwiwjh2x2"; depends=[mvtnorm]; }; tetraclasse = derive2 { name="tetraclasse"; version="0.1.21"; sha256="1cl2cah0xi6x3rvvdy56iszai6rkbxc1w3x13v0l1z1nryff7c6a"; depends=[dplyr FactoMineR ggplot2 ggrepel magrittr reshape2 tibble tidyr]; }; - texPreview = derive2 { name="texPreview"; version="1.4.4"; sha256="1a80ld5j7419nqxvg1nq0kiv7ls262n6bk6pkj3cyqjq6z2y01j0"; depends=[base64enc details fs htmltools knitr lifecycle magick magrittr rematch2 rstudioapi svgPanZoom whisker xml2]; }; - texmex = derive2 { name="texmex"; version="2.4.7"; sha256="1lx916lan9cd3gb6sahx5vyppflb08zslh1877c2d39q16dwshg7"; depends=[ggplot2 mvtnorm Rcpp]; }; + texPreview = derive2 { name="texPreview"; version="1.5"; sha256="11njmn29qq50iff30in9i0yfi6ypnpqsx3317smr9fiw3hgda3c5"; depends=[base64enc details fs htmltools knitr lifecycle magick magrittr rematch2 rstudioapi svgPanZoom whisker xml2]; }; + texmex = derive2 { name="texmex"; version="2.4.8"; sha256="115x7j2kvifzsrmh8zy6xymm1p01sxk4c26zdmi0p51bsgvs46ih"; depends=[ggplot2 mvtnorm Rcpp]; }; texreg = derive2 { name="texreg"; version="1.37.5"; sha256="0cb3kvxfi9k9g958fkb73cgqdxx3h9bz2cnaakic4wgrkv27mk2c"; depends=[httr]; }; - text_alignment = derive2 { name="text.alignment"; version="0.1.1"; sha256="0gf4rpk6l77v9fl7pbmyzq1jmb9kmzzdrpr8bsq05n9vv5lhaqqf"; depends=[Rcpp]; }; + text = derive2 { name="text"; version="0.9.10"; sha256="1ramsv2pbg57yyxp5qjkls82gl5icda6f5116hr0w5s0w3jpajmj"; depends=[cowplot dplyr furrr future ggplot2 ggrepel magrittr parsnip purrr recipes reticulate rlang rsample stringr tibble tidyr tokenizers tune workflows yardstick]; }; + text_alignment = derive2 { name="text.alignment"; version="0.1.2"; sha256="0qjnzdm7savn2jqmm23cd3rszyihnhb5rfnygc36ccfd15vav79j"; depends=[Rcpp]; }; text2speech = derive2 { name="text2speech"; version="0.2.13"; sha256="0c0h4yfp1gzaf4snav84iy5m0fx8az0pw1h2s33239dxkwcff893"; depends=[aws_signature dplyr googleAuthR googleLanguageR httr knitr magrittr mscstts tuneR]; }; text2vec = derive2 { name="text2vec"; version="0.6"; sha256="0r75cv77x2zm1z66s95hic71dpbqmybz39n48q6mz7gfd3m7312y"; depends=[data_table digest lgr Matrix mlapi R6 Rcpp rsparse stringi]; }; textTinyR = derive2 { name="textTinyR"; version="1.1.3"; sha256="0z9k978yk54zxrrjajcb0nanfhfpxm2bq2vbmk6w5s194da6y3xl"; depends=[BH data_table Matrix R6 Rcpp RcppArmadillo]; }; - textcat = derive2 { name="textcat"; version="1.0-6"; sha256="0639b1qbi8779lskk5ms0sbbnmy2s73b3w96abbr70mrh0s2f9rw"; depends=[slam tau]; }; + textcat = derive2 { name="textcat"; version="1.0-7"; sha256="1m31alkzy13acgf4ahnzpbyazflhpmry369vqdvn5f86wcsls833"; depends=[slam tau]; }; textclean = derive2 { name="textclean"; version="0.9.3"; sha256="0kgjh6c4f14qkjc4fds7q7rpf4nkma3p0igm54fplmm3p853nvrz"; depends=[data_table english glue lexicon mgsub qdapRegex stringi textshape]; }; textdata = derive2 { name="textdata"; version="0.4.1"; sha256="096gafbbh48yz4zbakv91cfd75kv8dg4p361s50rfqqjz57192fx"; depends=[fs rappdirs readr tibble]; }; texteffect = derive2 { name="texteffect"; version="0.3"; sha256="1qcbr18h3vakh6ymw4axzqcqrpss6z68a592xl879b82l2nlq8a7"; depends=[boot ggplot2 MASS]; }; @@ -15159,17 +15811,19 @@ in with self; { textir = derive2 { name="textir"; version="2.0-5"; sha256="0ban5qiinlxizqpcgafv4b5gwxlil6jdfarjd6l1m48awxh3mlnb"; depends=[distrom gamlr Matrix]; }; textmineR = derive2 { name="textmineR"; version="3.0.4"; sha256="1388blqxziqzjipys6icdifnnzgxvm0w3yr9jihl32ldd701rvvw"; depends=[gtools magrittr Matrix Rcpp RcppArmadillo RcppProgress RSpectra stopwords stringr text2vec]; }; textometry = derive2 { name="textometry"; version="0.1.4"; sha256="17k3v9r5d5yqgp25bz69pj6sw2j55dxdchq63wljxqkhcwxyy9lh"; depends=[]; }; - textplot = derive2 { name="textplot"; version="0.1.3"; sha256="1nvc92b688pdm4fvvl56pd9liiql68nrsl136jj60q3yi9kpl21d"; depends=[data_table lattice Matrix]; }; - textrank = derive2 { name="textrank"; version="0.3.0"; sha256="1sjzllz3ixxr043hbmbvwkwvj5wzh3m08x9z7h6hvy8ld8nzmn74"; depends=[data_table digest igraph]; }; + textplot = derive2 { name="textplot"; version="0.1.4"; sha256="1sgkndy2cxk8c76h8hwajn6f78w5jj2n8vsmaxh9kj931crzn8cy"; depends=[data_table lattice Matrix]; }; + textrank = derive2 { name="textrank"; version="0.3.1"; sha256="0a777wchiax0y8jprvz5xw8h1xh7yvad0wrqhkgbqy5p3cvlcih6"; depends=[data_table digest igraph]; }; textreadr = derive2 { name="textreadr"; version="1.0.2"; sha256="0rcdgcgdn1lnnpjkvcsyfwcbpdlhcx35sbr8zlyapgmfglbnpjg3"; depends=[antiword curl data_table pdftools readxl rvest striprtf textshape xml2]; }; - textrecipes = derive2 { name="textrecipes"; version="0.3.0"; sha256="0acgrh8smf2fcj43cj5x3qy493wwhn10cfsssrba3grcg62kir2x"; depends=[dplyr generics magrittr Matrix purrr Rcpp recipes rlang SnowballC stringr tibble tidyr tokenizers vctrs]; }; + textrecipes = derive2 { name="textrecipes"; version="0.4.0"; sha256="1krza6ym69xjj1zix4lb5d31lnik5pi43ycyvx2invhr9yqwyjd0"; depends=[dplyr generics magrittr Matrix purrr Rcpp recipes rlang SnowballC stringr tibble tidyr tokenizers vctrs]; }; textreg = derive2 { name="textreg"; version="0.1.5"; sha256="0h44z5hyndnvzd9axix7gpmhbdx347dfgxw9r8w38kyw6dklbjy6"; depends=[NLP Rcpp tm]; }; textreuse = derive2 { name="textreuse"; version="0.1.5"; sha256="1mva0f6pk0kpfw0vf90qw3a25f1i3imdhk2s7hxyzans0z2237jd"; depends=[assertthat BH digest dplyr NLP Rcpp RcppProgress stringr tibble tidyr]; }; textshape = derive2 { name="textshape"; version="1.7.1"; sha256="02111kj3kka84mpx7s19bjna9cas8diw5fxz51v5ggz0ldswa5pa"; depends=[data_table slam stringi]; }; + textshaping = derive2 { name="textshaping"; version="0.2.1"; sha256="0fv291fc97s0wjdzn126sbi7vcsp3yl0b501n2xlkgh5ijraxpq8"; depends=[cpp11 systemfonts]; }; textstem = derive2 { name="textstem"; version="0.1.4"; sha256="1pbhi5ia3w16vsix2x3if51zd2v9bcv0j4lj9hfikgq1yz9zxmw2"; depends=[dplyr hunspell koRpus koRpus_lang_en lexicon quanteda SnowballC stringi textclean textshape]; }; textutils = derive2 { name="textutils"; version="0.2-0"; sha256="06w0d12l7g4z3m278x5ap0jxm2y1h6ssj4igfcxk7j8k5hy89l80"; depends=[]; }; tfCox = derive2 { name="tfCox"; version="0.1.0"; sha256="06mbiz1jwp8mv5dbwyvdvy1wpp8s3xp9hhsm94vrbvjaxg680g28"; depends=[Rcpp survival]; }; tfaddons = derive2 { name="tfaddons"; version="0.10.0"; sha256="16adig97qmafval6i29pqdinsgbwjz2isajxdx1xvbf1mrawkmz0"; depends=[keras purrr reticulate rstudioapi tensorflow]; }; + tfarima = derive2 { name="tfarima"; version="0.1.1"; sha256="1hj8xablhmq7mhwx5xj6m8m5zl53big1cp08x808180ihif2zhlk"; depends=[numDeriv Rcpp RcppArmadillo zoo]; }; tfautograph = derive2 { name="tfautograph"; version="0.2.0"; sha256="1jpimmlsihr78v56v9mp51grmvwa198a1inahihk3yj02wzfqizj"; depends=[reticulate tensorflow]; }; tfdatasets = derive2 { name="tfdatasets"; version="2.2.0"; sha256="0d85fdji2ip0h76vhax9z910vib2nilmpjk9y9525f4hc0bm7kss"; depends=[generics magrittr reticulate rlang tensorflow tfestimators tidyselect]; }; tfdeploy = derive2 { name="tfdeploy"; version="0.6.1"; sha256="1vbxyvmzaafbwp1pmvzn16zyl4nz85787m79gn7iazh9zw9f7j34"; depends=[httpuv httr jsonlite magrittr reticulate swagger tensorflow]; }; @@ -15185,87 +15839,93 @@ in with self; { tfse = derive2 { name="tfse"; version="0.5.0"; sha256="05q75xsiy955xwgchagk7l7725y6mylp5lj5284xm7y2xh197zp3"; depends=[dapr magrittr]; }; tgcd = derive2 { name="tgcd"; version="2.5"; sha256="1zsmard9vai0m4gz5mf5b9qqv6i7h5xhv1mbs2sc0kcznk28jirn"; depends=[]; }; tggd = derive2 { name="tggd"; version="0.1.1"; sha256="1izar1b3w148vp2r8gv3vpwfndib8ilxcjxgbfzbxn7q5mr73mwa"; depends=[gsl]; }; - tgp = derive2 { name="tgp"; version="2.4-14"; sha256="1l3kssjkh5sbrh75qdpmynjfnidgz8vmzq1jml1qm1yfwval8ak1"; depends=[maptree]; }; + tgp = derive2 { name="tgp"; version="2.4-17"; sha256="0hl9nv2nayhq9jiy6lrgn702lb95allqiq8v221rj9pzxpc1230c"; depends=[maptree]; }; tgram = derive2 { name="tgram"; version="0.2-3"; sha256="0vlnry8drq3fqfy8dk50pcwcx9dj657kx6s19fs2b6acigkr4g7w"; depends=[zoo]; }; + tgstat = derive2 { name="tgstat"; version="2.3.16"; sha256="12apvcpdwfng0sp2v80xvpk7ynbadi2lvbfk14hlcsvw8h3rb268"; depends=[]; }; thankr = derive2 { name="thankr"; version="1.0.0"; sha256="089ikp85d5ia6a1qzmw8dkgcmz628cibmwfzcpk7m3ii8acxq91w"; depends=[]; }; thectar = derive2 { name="thectar"; version="1.0.0"; sha256="1qh0qzg0ybb38kzm56xxlvhm201pdjm16aky5f1fdflcsszgy8mx"; depends=[proxy smacof]; }; - theiaR = derive2 { name="theiaR"; version="0.3.0"; sha256="0z3i6dgf2mv954llb6vk6g09gdk1hi0fjygk09jp8p9cygn7r941"; depends=[askpass httr R6 raster XML]; }; + theiaR = derive2 { name="theiaR"; version="0.4.0"; sha256="07m532r67cil2ya2w9lfhycrm8n0ga0r3x7jwbp5jbd83hw4l1p6"; depends=[askpass httr R6 raster XML]; }; themetagenomics = derive2 { name="themetagenomics"; version="1.0.2"; sha256="14i81cd9cyzhi3j2d9ygwlairkimhx8ffvva3pg3xwwvpywb6mla"; depends=[ggplot2 lda lme4 Matrix plotly Rcpp rstan scales shiny stm]; }; - themis = derive2 { name="themis"; version="0.1.2"; sha256="00yl9dbngbzpsqds28ffxyvaw25yvbdrrdsylrzxhjmj7fd2p49i"; depends=[dplyr generics purrr RANN recipes rlang ROSE tibble unbalanced withr]; }; + themis = derive2 { name="themis"; version="0.1.3"; sha256="0vs5jraw0xsby0rkl474iliqa2hc9pgmgr7isygmmh455zrl4gsq"; depends=[dplyr generics purrr RANN recipes rlang ROSE tibble unbalanced withr]; }; thermocouple = derive2 { name="thermocouple"; version="1.0.2"; sha256="1rlvhw3i83iq1vibli84gj67d98whvgkxafwpmisva1m4s1bmij4"; depends=[]; }; thgenetics = derive2 { name="thgenetics"; version="0.4-2"; sha256="1314gry3xs9v4jy13g08q16qy4ax3s0bc7d74gi0wbpkgdrk3lql"; depends=[]; }; thickmatch = derive2 { name="thickmatch"; version="0.3.1"; sha256="0q7wpilbk8jm3q7m5hb114jpbv4ri1745v9sbdf222l6ymds6pia"; depends=[DiPs MASS plyr rcbalance]; }; thief = derive2 { name="thief"; version="0.3"; sha256="12ymkkisg5p0g1gmvlczhp4dc7mirjg55fqqmz2d90673vlg6rfq"; depends=[forecast ggplot2 hts]; }; thinkr = derive2 { name="thinkr"; version="0.15"; sha256="17mfw067advk8vxlz8x0w0vww3718zp2fcs00sca8ivlh8yh9fcg"; depends=[assertthat crayon devtools dplyr ggplot2 lazyeval lubridate magrittr officer purrr readr rvg stringi stringr tidyr]; }; + this_path = derive2 { name="this.path"; version="0.2.1"; sha256="002x6c351x4jzr2mw6idd4qczsx073flkv3h9zk04cqwr2n08p5a"; depends=[]; }; thor = derive2 { name="thor"; version="1.1.2"; sha256="0r4kgzbydjb7z0j808g5zdkx5wmbqncqg453bqm4ylafpj5z79kv"; depends=[R6 storr]; }; + thorn = derive2 { name="thorn"; version="0.2.0"; sha256="0sybjqwv9al5khkhhc7khbgr7n2vy6aggarh9n75mxpa8hn7j2qr"; depends=[htmlwidgets]; }; threeBrain = derive2 { name="threeBrain"; version="0.1.8"; sha256="0finv8hk2nj1d0h7hb51vpfjnrr7xyxnilnj8hsxl60nbf1a9byg"; depends=[base64enc crayon digest dipsaus freesurferformats gifti htmltools htmlwidgets jsonlite oro_nifti R6 shiny stringr]; }; threeboost = derive2 { name="threeboost"; version="1.1"; sha256="033vwn42ys81w6z90w5ii41xfihjilk61vdnsgap269l9l0c8gmn"; depends=[Matrix]; }; threejs = derive2 { name="threejs"; version="0.3.3"; sha256="1711h351nzxfkbbdwvfzyhciyvi9c6wx3jq1g97lzcqgnb45kivn"; depends=[base64enc crosstalk htmlwidgets igraph]; }; + threesixtygiving = derive2 { name="threesixtygiving"; version="0.2.2"; sha256="0fnysgyq4gf23vqxwnzwb3f1cv1v1b2cb6z0kywb17mr57cbg7pv"; depends=[anytime curl dplyr httr janitor jsonlite purrr readr readxl tibble tidyr tidyselect]; }; threewords = derive2 { name="threewords"; version="0.1.0"; sha256="083y5i4qyl1wj017wy5ywl2yx9wvrpjl9g9k9clvnrbwzbycx2cg"; depends=[httr]; }; threg = derive2 { name="threg"; version="1.0.3"; sha256="1ja0w4hhdkw3b1cipbpw8ym27k5lh2m7gibd74mj6gij7rpixrnb"; depends=[Formula survival]; }; thregI = derive2 { name="thregI"; version="1.0.4"; sha256="0zddd32fnfi98zwq08akkvhkg3c66sj3jii6ap8p1m9a0wg2k2k3"; depends=[Formula survival]; }; - threshr = derive2 { name="threshr"; version="1.0.1"; sha256="1v9aba5w1lrjy2ngx9kc2ih8sd4dhq45j8y6vn4mbs3y8f5dvhr0"; depends=[revdbayes rust]; }; + threshr = derive2 { name="threshr"; version="1.0.3"; sha256="1vs2jfvh1pjzyfz1s4w92sw13yz2nhc28gc3iyqz8a82rrdm4mdq"; depends=[revdbayes rust]; }; thriftr = derive2 { name="thriftr"; version="1.1.5"; sha256="1s8fn0imja6gh5bb0h2g1pmvkwk5v0dmpml9yvcd5dhz9lxy6vdj"; depends=[R6 rly stringi]; }; thsls = derive2 { name="thsls"; version="0.1"; sha256="18z7apskydkg7iqrs2hgnzby578qsvyd73wx8v4z3aa338lssdi7"; depends=[Formula]; }; thurstonianIRT = derive2 { name="thurstonianIRT"; version="0.11.1"; sha256="18xasg21w4sd32nhhs138fk70z9kpyv1l3jsrzzav2zwfb7246fk"; depends=[BH dplyr knitr lavaan magrittr MplusAutomation mvtnorm Rcpp RcppEigen rlang rstan rstantools StanHeaders tibble tidyr]; }; - tibble = derive2 { name="tibble"; version="3.0.3"; sha256="0f4yi87w6509lnaz1lhk9s8nm3bzx21ij3273s0zx7vpbp0qlxxz"; depends=[cli crayon ellipsis fansi lifecycle magrittr pillar pkgconfig rlang vctrs]; }; + tibble = derive2 { name="tibble"; version="3.0.4"; sha256="189yyl27mnswk1z51xw6gj3lyxgy6m332jq8xyvwskff57w2w692"; depends=[cli crayon ellipsis fansi lifecycle magrittr pillar pkgconfig rlang vctrs]; }; tibbletime = derive2 { name="tibbletime"; version="0.1.6"; sha256="0pfph4pyjxkxrir5ca1sh7xz07dylqnq40w0qyqiyaj5s23mbbmb"; depends=[assertthat dplyr glue hms lifecycle lubridate purrr Rcpp rlang tibble tidyselect vctrs zoo]; }; + tibblify = derive2 { name="tibblify"; version="0.1.0"; sha256="0mdi9x36nrlcbchl7b2rlf4j1k0y6c7657aznm7xa0396ciij5fk"; depends=[crayon purrr rlang tibble vctrs]; }; tibbrConnector = derive2 { name="tibbrConnector"; version="1.5.1"; sha256="1r58myi7x4hqqvyrphxy4ppa1lnad6x2ginfq2j52ax53zr07ajp"; depends=[RCurl rjson]; }; tictactoe = derive2 { name="tictactoe"; version="0.2.2"; sha256="1fx8plj5zr04xwk5hfj3zqhcknidxlzya2q14cf0m3y33a86lx42"; depends=[hash]; }; tictoc = derive2 { name="tictoc"; version="1.0"; sha256="1zp2n8k2ax2jjw89dsri268asmm5ry3ijf32wbca5ji231y0knj7"; depends=[]; }; - tidyBF = derive2 { name="tidyBF"; version="0.2.1"; sha256="1dp8v2dlskvr73c033h0ckrpfj7gav6l4rak29rmmzfn8pc1l5rj"; depends=[BayesFactor dplyr ipmisc metaBMA rlang tidyr]; }; - tidyHeatmap = derive2 { name="tidyHeatmap"; version="1.1.4"; sha256="16s3swxwf3yxqk1f6jzzdfbb03i0d7b83gnsrbyrni3c68pg2h5k"; depends=[circlize ComplexHeatmap dplyr lifecycle magrittr purrr RColorBrewer rlang tidyr viridis]; }; + tidyBF = derive2 { name="tidyBF"; version="0.4.2"; sha256="1j5q9yd4bzbda75bs2hkgm9vnr697kb73gz5wq5i0hjsi3xr9z1a"; depends=[BayesFactor dplyr effectsize insight ipmisc metaBMA parameters performance rlang tidyr]; }; + tidyCpp = derive2 { name="tidyCpp"; version="0.0.2"; sha256="178k2m0y5gv78l47x89ibra8gx81idmsi0fwn7rd3djna5fqld7l"; depends=[]; }; + tidyHeatmap = derive2 { name="tidyHeatmap"; version="1.1.5"; sha256="0knxhvccw7svnm63kahind7b0f00ri8qpriq5lk8g9nyhivzk55z"; depends=[circlize ComplexHeatmap dplyr lifecycle magrittr purrr RColorBrewer rlang tidyr viridis]; }; tidyLPA = derive2 { name="tidyLPA"; version="1.0.8"; sha256="0jrvd92q20kzz83lid9vvdh0l3l1kbc4m77cim261gzra1p7w5y0"; depends=[dplyr ggplot2 gtable mclust mix MplusAutomation tibble]; }; - tidyMicro = derive2 { name="tidyMicro"; version="1.43"; sha256="1y399khg85979lh9s528y5qab711qybd1vfw5kvyy7253ikmcb3p"; depends=[ade4 broom car cowplot dplyr Evomorph factoextra ggplot2 ggrepel gridExtra latex2exp lme4 lsr magrittr MASS Matrix plotly plyr png purrr rlang scales scatterplot3d shapes stringr ThreeWay tibble tidyr tidyverse vegan VGAM]; }; + tidyMicro = derive2 { name="tidyMicro"; version="1.47"; sha256="02pc6rh0l7xdrqhihi53zp17x0walc0mpm70spm7yrwzkbc486lv"; depends=[ade4 broom car cowplot dplyr Evomorph factoextra ggplot2 ggrepel gridExtra latex2exp lme4 lsr magrittr MASS Matrix plotly plyr png purrr rlang scales scatterplot3d shapes stringr ThreeWay tibble tidyr tidyverse vegan VGAM]; }; tidyREDCap = derive2 { name="tidyREDCap"; version="0.2.0"; sha256="03kx91avw6zbmrcxvhkb7i3syw3ajkv9ypvgn2iq3ki887vbiwzw"; depends=[dplyr janitor magrittr purrr rlang stringr tibble tidyr]; }; - tidyRSS = derive2 { name="tidyRSS"; version="2.0.2"; sha256="1w2nb1vngsgjv486w886r890zb85nhsjm9qy398kj5qyvh8gfr42"; depends=[anytime dplyr glue httr jsonlite magrittr purrr rlang tibble vctrs xml2]; }; - tidySEM = derive2 { name="tidySEM"; version="0.1.2"; sha256="1f66lc65905v88bdg95mwq5qp6367j0xik1rbfdw1s321cr6yvj1"; depends=[ggplot2 igraph lavaan MplusAutomation psych]; }; - tidyUSDA = derive2 { name="tidyUSDA"; version="0.2.9"; sha256="01h3bm7vfx8df7c6b83fd94f7i7d2i7w986sjfj78bl8pxs0k6gf"; depends=[crayon curl dplyr fuzzyjoin ggplot2 jsonlite keyring magrittr nlme rgdal sf stringi tigris usethis]; }; - tidybayes = derive2 { name="tidybayes"; version="2.1.1"; sha256="0wz7hf7a2c2x67rnlil4sqxzmiwy2rw2jma2hpwg025mnpasny3i"; depends=[arrayhelpers coda dplyr forcats ggdist ggplot2 HDInterval magrittr plyr purrr rlang scales tibble tidyr tidyselect]; }; + tidyRSS = derive2 { name="tidyRSS"; version="2.0.3"; sha256="0jyaa4b92cwf1vgrpy6ixq1jq46im8mr63z7ncjyx59j88v4pn84"; depends=[anytime dplyr glue httr jsonlite magrittr purrr rlang tibble tidyselect vctrs xml2]; }; + tidySEM = derive2 { name="tidySEM"; version="0.1.3"; sha256="0kh8hwskb5nw46cg5ia3m18a137g0gvgrmw30sfmvzjikq1air4p"; depends=[ggplot2 igraph lavaan MplusAutomation psych]; }; + tidyUSDA = derive2 { name="tidyUSDA"; version="0.3.0"; sha256="1wy329wy9spzm9zpgbv4h2qgk1cqp3471yknky5sfxsklmdjhdn8"; depends=[brio crayon curl diffobj dplyr fuzzyjoin ggplot2 gitcreds httr jsonlite keyring magrittr nlme rgdal sf stringi tigris usethis waldo]; }; + tidybayes = derive2 { name="tidybayes"; version="2.3.1"; sha256="055146k63b0dgkj6s6d9rwmdszxnjs4l6l4chavip9zwhrjsl93y"; depends=[arrayhelpers coda dplyr forcats ggdist ggplot2 magrittr plyr purrr rlang tibble tidyr tidyselect]; }; tidyboot = derive2 { name="tidyboot"; version="0.1.1"; sha256="0nss1ci763g9p5f33g163ppamx72axc8xhrils0cql3ka8439pmn"; depends=[dplyr modelr purrr rlang tidyr]; }; tidycat = derive2 { name="tidycat"; version="0.1.1"; sha256="04binzg0wijs173y8fr856935vdl80pid5d0zknb34fdaqa07kfh"; depends=[dplyr forcats magrittr stringr tibble tidyr]; }; - tidycensus = derive2 { name="tidycensus"; version="0.9.9.5"; sha256="1dv57daiy9139dicj738am58k2dg66x0vphkfz1vfryqc57l1px6"; depends=[dplyr httr jsonlite purrr rappdirs readr rvest sf stringr tidyr tigris units xml2]; }; + tidycensus = derive2 { name="tidycensus"; version="0.11"; sha256="0hyx3zbi785mygqsq6zk38bf5x04i3rxjr1gsbnmsqc7v56blbys"; depends=[dplyr httr jsonlite purrr rappdirs readr rlang rvest sf stringr tidyr tigris units xml2]; }; tidycode = derive2 { name="tidycode"; version="0.1.1"; sha256="0ahjhn1ar93xnd1snxnivdl43d1b6ica0pc30rgh8jpha87zbsay"; depends=[glue matahari pryr purrr rlang tibble]; }; tidycomm = derive2 { name="tidycomm"; version="0.1.0"; sha256="0xas6nr7fy612r0b5h8ncvirxhzy099zvhdzxbnskm3sa21046ni"; depends=[broom dplyr forcats glue magrittr MBESS purrr rlang stringr tibble tidyr]; }; - tidycwl = derive2 { name="tidycwl"; version="1.0.4"; sha256="1f3lrdl73lx0a0y6kz33i6s8nkcwdjdmc6mvnkqp3n8r851q46lg"; depends=[dplyr htmlwidgets jsonlite magrittr visNetwork webshot yaml]; }; + tidycwl = derive2 { name="tidycwl"; version="1.0.5"; sha256="1ii23iamqmplsmnjnr6x9a1wjrbk82r0ywbskfifv26i66wyjqc3"; depends=[dplyr htmlwidgets jsonlite magrittr visNetwork webshot yaml]; }; tidydice = derive2 { name="tidydice"; version="0.0.6"; sha256="1g0x426gri1s0fyn2srl7ni0zvrnx1wvg5zcr19fxgdw9m8rxxp2"; depends=[assertthat dplyr ggplot2 magrittr purrr tibble]; }; tidyfast = derive2 { name="tidyfast"; version="0.2.1"; sha256="1bfs2wma705nx1lpndq75ama5dr9kkg8hwpklb20csnccnfrlvf6"; depends=[data_table Rcpp]; }; - tidyfst = derive2 { name="tidyfst"; version="0.9.8"; sha256="1j5lwvd14jkg3dk4kajiq1sacdddmgj390q8118sh5gim8h2s5dq"; depends=[data_table fst stringr]; }; + tidyfst = derive2 { name="tidyfst"; version="0.9.9"; sha256="1f90wld3nxnr8jyjl7l1agk2m2sbzw70mybax56z99zz28i87bba"; depends=[data_table fst stringr]; }; tidyft = derive2 { name="tidyft"; version="0.4.5"; sha256="0l6ixaqj356q319ms0bf655f530cgiia9saqdx9lryaf0b6i2hxb"; depends=[data_table fst stringr]; }; tidygapminder = derive2 { name="tidygapminder"; version="0.1.1"; sha256="1m6bynwnw1msrzvdmy12w3ympinqpd8j3may3rwmg9941nndjv2d"; depends=[data_table dplyr readxl tidyr]; }; - tidygate = derive2 { name="tidygate"; version="0.2.7"; sha256="1djslp2080sc2fagmgw4z0qaxz46n0a9rc22h4xrfc2660369dj1"; depends=[dplyr gatepoints lifecycle lme4 magrittr purrr RColorBrewer rlang scales stringr tibble tidyr tidyselect viridis]; }; + tidygate = derive2 { name="tidygate"; version="0.3.2"; sha256="171mp31ac12j8i97rkl8wa35gaj22d926cibybq21kswf2904nf4"; depends=[dplyr gatepoints lifecycle lme4 magrittr purrr RColorBrewer rlang scales stringr tibble tidyr tidyselect viridis]; }; tidygenomics = derive2 { name="tidygenomics"; version="0.1.2"; sha256="1cnwmmmzp9kg4k7iy2kgb22bdllpnz257pv1ahy3l11zy6bl48fc"; depends=[dplyr fuzzyjoin IRanges purrr Rcpp rlang tidyr]; }; tidygeoRSS = derive2 { name="tidygeoRSS"; version="0.0.1"; sha256="0bppkwbxmm8ps1cnrhzxkzm2pbi3s5bfiwx8fcrp31x81jl61w1x"; depends=[anytime dplyr httr jsonlite magrittr purrr rlang sf strex stringr tidyRSS xml2]; }; tidygeocoder = derive2 { name="tidygeocoder"; version="1.0.1"; sha256="1djf7j3nzq6z2nnxxg9r495bx8sa7a1hd8bgkd7fw5pad8f83b7d"; depends=[dplyr httr jsonlite tibble]; }; tidygraph = derive2 { name="tidygraph"; version="1.2.0"; sha256="17qjns33zcj82jcsl7bn7i4zxcm7ric50zyf7agi0i01zi16qz85"; depends=[dplyr igraph magrittr pillar R6 Rcpp rlang tibble tidyr]; }; - tidyhydat = derive2 { name="tidyhydat"; version="0.5.0"; sha256="0bf8rnk0yhdjjs79d4s833z9j165cwvg3xdmqg3kc5yzc31m4hsg"; depends=[cli crayon DBI dbplyr dplyr httr lubridate rappdirs readr rlang RSQLite tidyr]; }; + tidyhydat = derive2 { name="tidyhydat"; version="0.5.2"; sha256="0yrd4x17918v8nkm1y9r334b0kvrklj313w8sjcx6402435nvmwj"; depends=[cli crayon DBI dbplyr dplyr httr lubridate rappdirs readr rlang RSQLite tidyr]; }; tidyjson = derive2 { name="tidyjson"; version="0.3.1"; sha256="1rx5ncp20j9mhcziyqb0vgfq9061qylgvfwz27dsyz58r8fygwnq"; depends=[assertthat dplyr jsonlite magrittr purrr rlang tibble tidyr]; }; tidylo = derive2 { name="tidylo"; version="0.1.0"; sha256="135aw7zqgxz7l3zgskhzy72lgm1xwl50566s0s45dq7h6ah0vi5d"; depends=[dplyr rlang]; }; tidylog = derive2 { name="tidylog"; version="1.0.2"; sha256="076am30ayc16wm3bilznxqzd5806yi7dx5m9yv4w7q90i7imsqk7"; depends=[clisymbols dplyr glue tidyr]; }; - tidymodels = derive2 { name="tidymodels"; version="0.1.1"; sha256="0w2xnr642klmqlflkw6rkvqcrgs01i8f34nk9wdax3fsl1yx2wi4"; depends=[broom cli crayon dials dplyr ggplot2 infer magrittr modeldata parsnip purrr recipes rlang rsample rstudioapi tibble tidyr tune workflows yardstick]; }; + tidymodels = derive2 { name="tidymodels"; version="0.1.2"; sha256="09njrl655sh82xrzckgg56a6ndfrjla5fy8675wj4jsj14jpv0fw"; depends=[broom cli dials dplyr ggplot2 infer magrittr modeldata parsnip purrr recipes rlang rsample rstudioapi tibble tidyr tune workflows yardstick]; }; tidymv = derive2 { name="tidymv"; version="3.0.0"; sha256="1ihgp9a0l2lrdcibglvsbcizqhq075lhxgsynjg2iqf03b47hqlg"; depends=[dplyr ggplot2 magrittr mgcv rlang tibble tidyr]; }; tidync = derive2 { name="tidync"; version="0.2.4"; sha256="1nm3021m3xnn4xkprkxd9sj9bwvfbwhrdhfdkfhsc9azqy3rgg9f"; depends=[dplyr forcats magrittr ncdf4 ncmeta purrr rlang RNetCDF tibble tidyr]; }; tidypmc = derive2 { name="tidypmc"; version="1.7"; sha256="1fijlvdiw4vwm34wizm4xlm0x10vvpkldzk7rrla44apq7y2w3yq"; depends=[dplyr readr stringr tibble tokenizers xml2]; }; tidyposterior = derive2 { name="tidyposterior"; version="0.0.3"; sha256="0wsv800w056ziqbnwal7ncmdy4li8cn5yrdx07w35b7j8kl4mwhg"; depends=[dplyr generics ggplot2 lifecycle purrr rlang rsample rstanarm tibble tidyr vctrs]; }; - tidypredict = derive2 { name="tidypredict"; version="0.4.6"; sha256="1fx1nr8fry3nwy2391g26zkqakdf8f3j7zyrihbc0qhscvbdskiy"; depends=[dplyr generics knitr purrr rlang tibble]; }; - tidyquant = derive2 { name="tidyquant"; version="1.0.1"; sha256="0dr8y0w5kjfwchdnpm4dp2si7bj5wdzvihvlbbj56r3wzvn80kpb"; depends=[alphavantager cli crayon dplyr ggplot2 httr lazyeval lubridate magrittr PerformanceAnalytics purrr Quandl quantmod riingo rlang rstudioapi stringr tibble tidyr tidyselect timeDate timetk TTR xts]; }; + tidypredict = derive2 { name="tidypredict"; version="0.4.8"; sha256="0fff349pkksss8h1k2qza78l81ha6avx63pxziv6dfa8h62qmrdy"; depends=[dplyr generics knitr purrr rlang stringr tibble tidyr]; }; + tidyquant = derive2 { name="tidyquant"; version="1.0.2"; sha256="0wlhc4xw321g3jn3473fj4s9pgff3wyh9wfmrbqlbsngjq565541"; depends=[alphavantager cli crayon curl dplyr ggplot2 httr janitor lazyeval lubridate magrittr PerformanceAnalytics purrr Quandl quantmod readr riingo rlang rstudioapi stringr tibble tidyr tidyselect timeDate timetk TTR xts]; }; tidyquery = derive2 { name="tidyquery"; version="0.2.1"; sha256="1fy3szbkc5ymswxx3xi1rzd4gvxzsi5imvzf05i7xrh96adzl2f8"; depends=[dplyr lubridate queryparser rlang stringr]; }; tidyqwi = derive2 { name="tidyqwi"; version="0.1.2"; sha256="16f0c2mdx6aiji6i7237kpc9awqdgrg6rhs408w6ag28dhxpgwlv"; depends=[dplyr furrr future httr jsonlite labelled magrittr purrr stringr tidyr xml2]; }; - tidyr = derive2 { name="tidyr"; version="1.1.1"; sha256="05bv4086axk21gsszx9rvzlz6jq4bcqm462nys8g91gqw003zljh"; depends=[cpp11 dplyr ellipsis glue lifecycle magrittr purrr rlang tibble tidyselect vctrs]; }; + tidyr = derive2 { name="tidyr"; version="1.1.2"; sha256="0v7x1pgmwmjypzdr4j2ig2klgrrgryi3qvw8hwqv65a5h9kwpz08"; depends=[cpp11 dplyr ellipsis glue lifecycle magrittr purrr rlang tibble tidyselect vctrs]; }; tidyrules = derive2 { name="tidyrules"; version="0.1.5"; sha256="04y6pnrp132sckjpp9g8yl0z7glcsx9dcfdpa8r27wsc2g491i63"; depends=[assertthat magrittr partykit purrr stringr tibble]; }; tidyselect = derive2 { name="tidyselect"; version="1.1.0"; sha256="14rqx4dq574hilmdwrr34wyjg8rlw4rvndpsqd9plgxm3wwfsdg6"; depends=[ellipsis glue purrr rlang vctrs]; }; - tidystats = derive2 { name="tidystats"; version="0.4.1"; sha256="0njb2wjbca7l5kknlvhdpm655vv76khxyzdb80ha4fi1k13a31ka"; depends=[dplyr jsonlite purrr readr stringr tibble tidyr]; }; + tidyseurat = derive2 { name="tidyseurat"; version="0.1.17"; sha256="0b5mm5wd0bzqqhi4kqn28wi3gnaw5zr8dp5w9mqsrsz3aw8j0kd2"; depends=[cli dplyr ellipsis fansi ggplot2 lifecycle magrittr pillar plotly purrr rlang Seurat stringr tibble tidyr tidyselect]; }; + tidystats = derive2 { name="tidystats"; version="0.5"; sha256="0shvrrqd5c89d4pncbqa80kzzf9v31drm170hiivjscldphkk43h"; depends=[dplyr jsonlite purrr readr stringr tibble tidyr]; }; tidystringdist = derive2 { name="tidystringdist"; version="0.1.4"; sha256="1srxh5gyspcghzvnmpyq36ky608ipf71vv0s1jg01mgf2i5pdkf4"; depends=[attempt rlang stringdist tibble]; }; - tidytable = derive2 { name="tidytable"; version="0.5.4"; sha256="02w5j0i44gad8yckiaavpnmy85l1x57vjhxqsvzx404f63mk56sy"; depends=[data_table glue lifecycle magrittr rlang tibble tidyselect vctrs]; }; - tidytext = derive2 { name="tidytext"; version="0.2.5"; sha256="0kwbpffdnqrb6hgrrmrfnx890imbzvp5bs6sj1k72if28qijarm5"; depends=[dplyr generics hunspell janeaustenr Matrix purrr rlang stringr tibble tokenizers]; }; - tidytidbits = derive2 { name="tidytidbits"; version="0.2.2"; sha256="1wy1bnfz7jkp357a2d916dmiw36jdqfnkvdg1fa19w8r7zzgrz7d"; depends=[dplyr extrafont forcats magrittr purrr rlang stringr tibble tidyr tidyselect]; }; - tidytransit = derive2 { name="tidytransit"; version="0.7.1"; sha256="1n1m67yvlk6fnls5hah43ycvwqvw3c4v6xhmmx06zr92r3lr7xql"; depends=[assertthat data_table digest dplyr hms httr lubridate readr rlang sf tibble tidyr zip]; }; + tidytable = derive2 { name="tidytable"; version="0.5.7"; sha256="0220gcf3968smirym0fb1zfs731xf0jyxvn2qm2677mak4limn22"; depends=[data_table glue lifecycle magrittr rlang tibble tidyselect vctrs]; }; + tidytext = derive2 { name="tidytext"; version="0.2.6"; sha256="0xmjkab7p13ncfglf3a9hvndf8fh96mmxw3l7hcpbnaq9qkiwk29"; depends=[dplyr generics hunspell janeaustenr Matrix purrr rlang stringr tibble tokenizers]; }; + tidytransit = derive2 { name="tidytransit"; version="0.7.2"; sha256="143xk1ipj7ar9ydqsq3b9ja427sjx0dzvkhsllk2cw5kkpgmpqfi"; depends=[assertthat data_table digest dplyr hms httr lubridate readr rlang sf tibble tidyr zip]; }; tidytree = derive2 { name="tidytree"; version="0.3.3"; sha256="05b53dap0f784kl6s1wgck6m7brwmy6ifqp7v5l06s1spfspagl6"; depends=[ape dplyr lazyeval magrittr rlang tibble]; }; tidytuesdayR = derive2 { name="tidytuesdayR"; version="1.0.1"; sha256="0slpfajv5cxqxfb1sh98574zrcgihiazscpr0zga2i6kiwn3kgpy"; depends=[httr jsonlite lubridate magrittr purrr readr readxl rstudioapi rvest usethis xml2]; }; tidyverse = derive2 { name="tidyverse"; version="1.3.0"; sha256="02gyys08qv2v4cl2d66gml4d31ipxay0iyfwwksvxyclx60wp2kd"; depends=[broom cli crayon dbplyr dplyr forcats ggplot2 haven hms httr jsonlite lubridate magrittr modelr pillar purrr readr readxl reprex rlang rstudioapi rvest stringr tibble tidyr xml2]; }; - tidyvpc = derive2 { name="tidyvpc"; version="1.0.0"; sha256="1f5ca0cbb3fwsdmb4zvgf8aglajmvks9jqidnx28ppy5w9qv1skc"; depends=[data_table magrittr quantreg rlang]; }; - tidyxl = derive2 { name="tidyxl"; version="1.0.6"; sha256="0cqagm6bm6bj735hl02qv2anj895j9gywv10igxxh0p8cb40bm6d"; depends=[piton Rcpp]; }; - tiff = derive2 { name="tiff"; version="0.1-5"; sha256="0asf2bws3x3yd3g3ixvk0f86b0mdf882pl8xrqlxrkbgjalyc54m"; depends=[]; }; + tidyvpc = derive2 { name="tidyvpc"; version="1.1.0"; sha256="09x684p2059by76b9ba9bxsyfjly0ykia43fhkpq63fbcbg7p8wg"; depends=[classInt data_table ggplot2 magrittr quantreg rlang]; }; + tidyxl = derive2 { name="tidyxl"; version="1.0.7"; sha256="1wg8h5fd2hd8ilshrbcs99q18p15687dx8j51v5pyd30pg5cab7b"; depends=[piton Rcpp]; }; + tiff = derive2 { name="tiff"; version="0.1-6"; sha256="1yy4im2lwzhjnnkfwxgkknsajvm83pcwaf370pkgfva2db0xjfv2"; depends=[]; }; tiger = derive2 { name="tiger"; version="0.2.3.1"; sha256="0xr56c46b956yiwkili6vp8rhk885pcmfyd3j0rr4h8sz085md6n"; depends=[e1071 hexbin klaR lattice qualV som]; }; tigerhitteR = derive2 { name="tigerhitteR"; version="1.1.0"; sha256="0inyi12lf8bn7nbklf2rjixk6wrgrjcp8njv7knai4dgvv7v0rfa"; depends=[Hmisc magrittr openxlsx zoo]; }; tigerstats = derive2 { name="tigerstats"; version="0.3.2"; sha256="0p5z4qh0aznj03rnhk4lpqfkwnsa5zgvj51rddkzligg9zx73xwl"; depends=[abd ggplot2 lattice manipulate MASS mosaic mosaicData rlang]; }; @@ -15274,86 +15934,92 @@ in with self; { tigreBrowserWriter = derive2 { name="tigreBrowserWriter"; version="0.1.5"; sha256="0izgx1khci6qc6pz85dxj75kzxvpr30l0vhcv9476jrcbwqs4k8m"; depends=[DBI RSQLite]; }; tigris = derive2 { name="tigris"; version="1.0"; sha256="00s4cl3zgc2cqg845sxr2lcqqsvz72sa08zrrfmia1ngqxl6biwp"; depends=[dplyr httr magrittr maptools rappdirs rgdal sf sp stringr uuid]; }; tikzDevice = derive2 { name="tikzDevice"; version="0.12.3.1"; sha256="040yz6wi05151m9nal97symv66a133kk0a8c1h6nz058zk081vav"; depends=[filehash png]; }; + tiledb = derive2 { name="tiledb"; version="0.8.2"; sha256="141wx8n8xmbh6mrr1hp1vvlcacsp8swwr38b6i3rdfzjckpq92fw"; depends=[nanotime Rcpp]; }; tilegramsR = derive2 { name="tilegramsR"; version="0.2.0"; sha256="11cnyvlghg8z7lr9ahzsjpyjrqnxqs77wdcydqvavrsqj745xvi2"; depends=[sf sp]; }; tilemaps = derive2 { name="tilemaps"; version="0.2.0"; sha256="06pwwlndb7nvw2b0h0fak3vnpbi11mxsby43qm9ng3k3sqwrqjz2"; depends=[clue ggplot2 igraph lwgeom sf smoothr]; }; tiler = derive2 { name="tiler"; version="0.2.4"; sha256="1j1952vp0gnx0pnhqydipj4qw3cm05im502jc77wb2r1vklwimgb"; depends=[png raster rgdal sp]; }; tilting = derive2 { name="tilting"; version="1.1.1"; sha256="0srvxjv3sg35n7f8pam45ny1z1dxwqjkrz9d91hf67a3fi34f5gk"; depends=[mvtnorm]; }; - time2event = derive2 { name="time2event"; version="0.1.0"; sha256="1xkvarw53lcn07wqq7ly5znr6vjq7x72xb0piq5igdmwqmg2y26g"; depends=[survival timereg]; }; timeDate = derive2 { name="timeDate"; version="3043.102"; sha256="0wvl5pq261rvbgly7vilk3x3m9xk3ly6il1i5scwdf6srl1vlz1p"; depends=[]; }; timeR = derive2 { name="timeR"; version="1.2.0"; sha256="0lkx2ilbzq29w1c9ssya4f0za0sj7y30y9ml4v3zc21c1la0b6vi"; depends=[lubridate R6]; }; timeROC = derive2 { name="timeROC"; version="0.4"; sha256="1qxijg7hazc8bifwj2254ig2p3cbrp9p0bsyhhh3aikf1rg113v1"; depends=[mvtnorm pec]; }; timeSeq = derive2 { name="timeSeq"; version="1.0.4"; sha256="0m59g12dmnwpmwjmyb9x6z53x3gjmxcaxqva2dlbazsqkbzgaayp"; depends=[gss lattice mgcv pheatmap reshape]; }; timeSeries = derive2 { name="timeSeries"; version="3062.100"; sha256="1ybm4jss8y3px172kfx3mhi68k32dmyb1f21kvgcz7992jpx590l"; depends=[timeDate]; }; - timechange = derive2 { name="timechange"; version="0.0.1"; sha256="054zh151am6asadj39nz3l4s37kip0bcjwg8mw59s78s5gyjbwds"; depends=[Rcpp]; }; + timechange = derive2 { name="timechange"; version="0.0.2"; sha256="15qyvhs96n2s5ply2dbs07i9mpvpvffd7ni5w668f10l3hixfhq8"; depends=[Rcpp]; }; timedelay = derive2 { name="timedelay"; version="1.0.11"; sha256="0hr5a2m621ybvl4qyx1xgwzviszj4ccvb149yclds9z87r5h2gm4"; depends=[MASS mvtnorm]; }; - timedeppar = derive2 { name="timedeppar"; version="1.0"; sha256="1ygaapc0fgivv69ycl7i13qd4qsjvvvpwdswvzv8hgbw6whjj6w8"; depends=[mvtnorm]; }; + timedeppar = derive2 { name="timedeppar"; version="1.0.1"; sha256="061y836slhjfngnb8qk36v3favi8mp36nw3s7c1m9msvgy2z3xm0"; depends=[mvtnorm]; }; timeline = derive2 { name="timeline"; version="0.9"; sha256="0zkanz3ac6cgsfl80sydgwnjrj9rm7pcfph7wzl3xkh4k0inyjq3"; depends=[ggplot2]; }; timelineR = derive2 { name="timelineR"; version="1.0.0"; sha256="01bb4201p18l1l5yp622ml9zd8spc978hvhw1s7j57qki5rw4kdf"; depends=[dplyr futile_logger ggplot2 gtable lubridate mtconnectR rlang stringr]; }; timelineS = derive2 { name="timelineS"; version="0.1.1"; sha256="076w8ckzzl59bc1gnwjgdwynnz86320hyfmzb0k26hl3k13jlmxs"; depends=[dplyr ggplot2 lubridate magrittr]; }; timeordered = derive2 { name="timeordered"; version="0.9.9"; sha256="0rfga5i6kckmlz2dzqb1pp634dl93wxp7v3kisxlbjl7mgnbck3k"; depends=[igraph plyr]; }; timeperiodsR = derive2 { name="timeperiodsR"; version="0.6.2"; sha256="09vwp04j7n176xs1lbdmbyi557byx6fdvqyjay1785hkb9ivws5q"; depends=[lubridate]; }; - timereg = derive2 { name="timereg"; version="1.9.6"; sha256="0d7ifm2kynwzgyq4n56jx713vsi6q12fah8i6hb3qdkmz0336gh4"; depends=[lava numDeriv survival]; }; + timereg = derive2 { name="timereg"; version="1.9.8"; sha256="065vlsgs5xm11w13837jdvi9jxfa6j2vxpcp2r6hgrs38xv01ch0"; depends=[lava numDeriv survival]; }; timesboot = derive2 { name="timesboot"; version="1.0"; sha256="1ixmcigi1bf42np93md8d3w464papg9hp85v0c3hg3vl4nsm2bji"; depends=[boot]; }; timeseriesdb = derive2 { name="timeseriesdb"; version="0.4.1"; sha256="1ghb3lg63fs9zx34l5qczv39mdccnmqzlc74l1zhb8qmsg8sm1g2"; depends=[data_table DBI jsonlite openxlsx RPostgreSQL shiny xtable xts zoo]; }; - timetk = derive2 { name="timetk"; version="2.2.0"; sha256="001k1619fhb656qrxlixwjyv3drs7cj1kmscw5rn6xwmlixgxvrp"; depends=[anytime assertthat dplyr forcats forecast ggplot2 hms lazyeval lubridate padr plotly purrr readr recipes rlang rsample slider stringi stringr tibble tidyr tidyselect timeDate xts zoo]; }; + timetk = derive2 { name="timetk"; version="2.6.0"; sha256="0qi6x3hw7yamjpwabzq9kwg6xpqrgddg1j0xclycyc355p5c740x"; depends=[anytime assertthat dplyr forcats forecast generics ggplot2 hms lazyeval lubridate padr plotly purrr readr recipes rlang rsample slider stringi stringr tibble tidyr tidyselect timeDate xts zoo]; }; timetools = derive2 { name="timetools"; version="1.14"; sha256="13jchgd9fc8hxj74wm1kg4rwcng4yxblkq04i33djsqghgb5f9mj"; depends=[]; }; timetree = derive2 { name="timetree"; version="1.0"; sha256="1fpdp6mkwm67svqvkfflvqxn52y2041zl09rxrms28ybbd5f84c0"; depends=[phangorn XML]; }; - timevis = derive2 { name="timevis"; version="0.5"; sha256="1psmnl6pkbizi2kjpaz9w32z2dkxlh4r229mfxsfqnjvf9sc34kj"; depends=[htmltools htmlwidgets jsonlite lubridate magrittr rmarkdown shiny]; }; + timevis = derive2 { name="timevis"; version="1.0.0"; sha256="003kizf974xibj90n60ipzwnrbdwjb659yxwi2xfnvh067aibwsp"; depends=[htmltools htmlwidgets jsonlite lubridate magrittr rmarkdown shiny]; }; timma = derive2 { name="timma"; version="1.2.1"; sha256="1pypk0pwkhyilh1hsn8hasia1hf6hbskj0xw6vas03k19b6fjnli"; depends=[QCA Rcpp RcppArmadillo reshape2]; }; timsac = derive2 { name="timsac"; version="1.3.6"; sha256="186919qka9j3kfpdw2gbh16n48d6xgz9lfqgk4b17f1d7l72iplg"; depends=[]; }; tinsel = derive2 { name="tinsel"; version="0.0.1"; sha256="0n1x0cf4x6cq1yks0444nxd9snga4m6inc5lfvb7k96fzjb3xgbp"; depends=[]; }; tint = derive2 { name="tint"; version="0.1.3"; sha256="00830n5nl6p73v9w0yzsak56phz4w1fh5lhf1c42gg1i81x7swnx"; depends=[htmltools knitr rmarkdown]; }; tinter = derive2 { name="tinter"; version="0.1.0"; sha256="02hfw2720qn70x0piahm8cy2ajsb5bqapr4vyvknm4v1yka1wmw3"; depends=[chk]; }; tinyProject = derive2 { name="tinyProject"; version="0.6.1"; sha256="0cflnfp5mib3j1y3n5yvi867h5a7z6xr6163gq9y9b6nrl2skxfk"; depends=[brew R_utils]; }; - tinytest = derive2 { name="tinytest"; version="1.2.2"; sha256="1gy4jkwv84xkp1kpanq4jnzg2na97n0a5dh5bv6zp5l440kggrn6"; depends=[]; }; - tinytex = derive2 { name="tinytex"; version="0.25"; sha256="0zbhzxxjlkdj9byxyab477p7cnws5y87nyg989lkzarxdc7dglza"; depends=[xfun]; }; + tinylabels = derive2 { name="tinylabels"; version="0.1.0"; sha256="0iqf8z03bmcvw3a01m001zmkzykn2w7y310dgws6dvzsnjl3i7f9"; depends=[]; }; + tinyscholar = derive2 { name="tinyscholar"; version="0.1.2"; sha256="0h21b35mxbpr7kn01994nlaxl7qag1ngiry1y7gd0i5q56vrl0zm"; depends=[curl dplyr ggplot2 gt jsonlite magrittr purrr R_utils rlang rvest stringr xml2]; }; + tinytest = derive2 { name="tinytest"; version="1.2.4"; sha256="1asryjrah3fj39gg0c6yxgpr142j5bg2n990v7q8r0a5pb8gcr45"; depends=[]; }; + tinytex = derive2 { name="tinytex"; version="0.28"; sha256="11pa1q7gl17ala74lz10qbghk2yqanl9pylwvi9b4kmhx856b83n"; depends=[xfun]; }; + tipitaka = derive2 { name="tipitaka"; version="0.1.1"; sha256="0hkxbsrsy75zcnpy6lg9aj535gff9pk5qlv9kd532b24fff6hdny"; depends=[cpp11 dplyr magrittr stringi stringr]; }; tipom = derive2 { name="tipom"; version="1.0.2-1"; sha256="1gdfv0g5dw742j6ycmi0baqh6xcchp3yf2n1g8vn7jmqgz5mlhdr"; depends=[]; }; tippy = derive2 { name="tippy"; version="0.0.1"; sha256="0kkyi4s4ffpyjyfl89cd5y788ab1p253rx179k422y3y1z6w1md7"; depends=[htmltools htmlwidgets jsonlite shiny]; }; - tipr = derive2 { name="tipr"; version="0.1.1"; sha256="138xmkfad0xjrmr9v3ladbwsyknyad27wxcav03n6f72plhxmxb6"; depends=[broom purrr tibble]; }; + tipr = derive2 { name="tipr"; version="0.2.0"; sha256="1gkdajyhpapfq531mdpc6jj12b1kmrzq5f6jlcm4lxinwf6jvsgq"; depends=[glue purrr tibble]; }; tis = derive2 { name="tis"; version="1.38"; sha256="0mqnvjfncfr8zc5rz1qq8jr1kv63p7sva7fvr3adbs7lgjza0yvm"; depends=[]; }; - titan = derive2 { name="titan"; version="1.0-16"; sha256="0x30a877vj99z3fh3cw9762j5ci56964j2466xfbwcywhn9njz5r"; depends=[boot lattice MASS]; }; titanic = derive2 { name="titanic"; version="0.1.0"; sha256="0mdmh0ciwfig00847bmvp50cyvj8pra6q4i4vdg7md19z5rjlx3j"; depends=[]; }; titeIR = derive2 { name="titeIR"; version="0.1.0"; sha256="047vidn3zydbjijwgz6qm2d9j2ny8ng2sv5jzm8zb300y7k2426c"; depends=[Iso]; }; titrationCurves = derive2 { name="titrationCurves"; version="0.1.0"; sha256="0z127sihd262mdik46sq9vcf05s7jsqmkpm3p4d779viw74bl768"; depends=[]; }; tkRplotR = derive2 { name="tkRplotR"; version="0.1.3"; sha256="0cx1vnsdy9d545dyrjni4diq58mz49sw36bxhn99c1rvflp4npzh"; depends=[]; }; - tkrgl = derive2 { name="tkrgl"; version="0.9"; sha256="00767mxsaqkp7wsazznx6pr9dw75xmnijjqncbpavqf67g0cjinp"; depends=[rgl]; }; tkrplot = derive2 { name="tkrplot"; version="0.0-24"; sha256="04gk48vm8ilj1n3b3ir66pcfv504ra4rlgc0ll4ixbnp6w566wr8"; depends=[]; }; + tktdjl2r = derive2 { name="tktdjl2r"; version="0.2.0"; sha256="0qp7qki9kgddiis64cm894kkk6770qjh8v1b2f91smmpk3m7l321"; depends=[JuliaCall stringr]; }; tlemix = derive2 { name="tlemix"; version="0.1.3"; sha256="0c4mvdxlhbmyxj070xyipx4c27hwxlb3c5ps65ipm6gi8v8r6spj"; depends=[]; }; tlm = derive2 { name="tlm"; version="0.1.5"; sha256="1iw08pa70nb25fnv64834s5c8vl456a2rcng7x6v9vs5q37610g6"; depends=[boot]; }; tlmec = derive2 { name="tlmec"; version="0.0-2"; sha256="1gak8vxmfjf05bhaj6lych7bm8hgav1x3h14k2ra7236v82rqbw7"; depends=[mvtnorm]; }; tlrmvnmvt = derive2 { name="tlrmvnmvt"; version="1.1.0"; sha256="0mi1261659qg0ym4nqk0w6gw68wx37fq43s899szyyx08dj46mbb"; depends=[BH Rcpp RcppEigen]; }; tls = derive2 { name="tls"; version="0.1.0"; sha256="183b5m70s2whlgp9s1gb4xnylhlp4hnh3lw6b8f2vx4kahaid763"; depends=[]; }; - tm = derive2 { name="tm"; version="0.7-7"; sha256="0pyics8j7a4wkh5gzin46l0qars5vgbb1886xqpdqjs1z0gy9nyh"; depends=[BH NLP Rcpp slam xml2]; }; + tlsh = derive2 { name="tlsh"; version="0.1.0"; sha256="0106y17cr3hq09ahy3rxhxqzgc0655w2jr0s3iyr8zvxsdv5ahb5"; depends=[bit64 blink igraph plyr]; }; + tm = derive2 { name="tm"; version="0.7-8"; sha256="0mk2lsplynms15nw92vbdgsafg4bw1m0ik31gch1mnsnv61idsxi"; depends=[BH NLP Rcpp slam xml2]; }; tm_plugin_alceste = derive2 { name="tm.plugin.alceste"; version="1.1"; sha256="0wid51bbbx01mjfhnaiv50vfyxxmjxw8alb73c1hq9wlsh3x3vjf"; depends=[NLP tm]; }; - tm_plugin_dc = derive2 { name="tm.plugin.dc"; version="0.2-8"; sha256="0z843i2wlmx75748p95jz3j45d9bzmlmqa3awgya24k7bdhpd6kd"; depends=[DSL NLP slam tm]; }; + tm_plugin_dc = derive2 { name="tm.plugin.dc"; version="0.2-10"; sha256="0v14fj3r438pvs88k4zwlzkgax8r0k6cx4mqjnzzad15frqficij"; depends=[DSL NLP slam tm]; }; tm_plugin_europresse = derive2 { name="tm.plugin.europresse"; version="1.4"; sha256="03qi9rkfwgjvir4cjpi9imc8zaldvan42v9lqfr5d6zhr0ajy6wx"; depends=[NLP tm XML]; }; tm_plugin_factiva = derive2 { name="tm.plugin.factiva"; version="1.8"; sha256="1gdkflz2g1vmqzv4p65w6zfynnx0fls7xyvhzg4li4kjg2xf6l75"; depends=[NLP rvest tm xml2]; }; + tm_plugin_koRpus = derive2 { name="tm.plugin.koRpus"; version="0.4-1"; sha256="09vp9qpdpfyq5z2qpx067a7ckygibbpwr79rn59664nflq3y01vi"; depends=[koRpus NLP sylly tm]; }; tm_plugin_lexisnexis = derive2 { name="tm.plugin.lexisnexis"; version="1.4.1"; sha256="0c094z83mcq8blc8w7kvy91d28qqcx6f6193p3frpviznlaq21xk"; depends=[ISOcodes NLP tm xml2]; }; tm_plugin_mail = derive2 { name="tm.plugin.mail"; version="0.2-1"; sha256="0rn8jqv622qmc0zkz534ka5qnbca2rlabxm3vjbqplr6fh1ahwb1"; depends=[NLP tm]; }; tm_plugin_webmining = derive2 { name="tm.plugin.webmining"; version="1.3"; sha256="1694jidf01ilyk286q43bjchh1gg2fk33a2cwsf5jxv7jky3gl7h"; depends=[boilerpipeR NLP RCurl RJSONIO tm XML]; }; - tm1r = derive2 { name="tm1r"; version="1.1.4"; sha256="165yn07nxywyxdd52g917rmzqyjpv6ai11fhl9g6dj163l4vcn5a"; depends=[httr jsonlite]; }; - tmap = derive2 { name="tmap"; version="3.1"; sha256="18gq79s0gi1cdiqx47cdm0vwwvz5jg5y5jccr0i7drmjqmvyk232"; depends=[classInt htmltools htmlwidgets leafem leaflet leafsync RColorBrewer rlang sf stars tmaptools units viridisLite widgetframe]; }; + tm1r = derive2 { name="tm1r"; version="1.1.8"; sha256="15w703rd7mfm32b62yv9mpms2fjq9ifmc1n460vsrpqz1dkiavb9"; depends=[httr jsonlite]; }; + tmap = derive2 { name="tmap"; version="3.2"; sha256="12dib30ifm4xmdii89g08c1h05q88823xsyjnbfh0bzzj4h3rhgl"; depends=[classInt htmltools htmlwidgets leafem leaflet leafsync RColorBrewer rlang sf stars tmaptools units viridisLite widgetframe]; }; tmaptools = derive2 { name="tmaptools"; version="3.1"; sha256="0hxcdgicy27jlnza4i0ckrlansjfc9z6wa17c2bfpdmdahbsnfj0"; depends=[classInt dichromat lwgeom magrittr RColorBrewer sf stars units viridisLite XML]; }; tmbstan = derive2 { name="tmbstan"; version="1.0.2"; sha256="1g4b415k36wij028xz15kwpv8hmx92kznsp231bnrprzw2vrninr"; depends=[BH Rcpp RcppEigen rstan StanHeaders TMB]; }; tmcn = derive2 { name="tmcn"; version="0.2-13"; sha256="0rf8mz6kdm83pm85kzfyzb8kd3iwaxv5bgphjpxlnq6z32m9yds7"; depends=[]; }; tmg = derive2 { name="tmg"; version="0.3"; sha256="0yqavibinzsdh85izzsx8b3bb9l36vzkp5a3bdwdbh410s62j68a"; depends=[Rcpp RcppEigen]; }; + tmhmm = derive2 { name="tmhmm"; version="1.3"; sha256="1grlwflfljwhanzc1cy2jw5wxrzl36x4zpr1mkm1bm44ilqryqx0"; depends=[ggplot2 rappdirs stringr tibble]; }; tmle = derive2 { name="tmle"; version="1.5.0-1"; sha256="14rxdsqrjqr1vl0qy4hjpp1mchyn58za673hjc9r3n20591zghcz"; depends=[glmnet SuperLearner]; }; tmle_npvi = derive2 { name="tmle.npvi"; version="0.10.0"; sha256="00jav1ql3lv18wh9msxnjvz36z2ds44fdi6lrp1pfphh1in4vdcl"; depends=[geometry MASS Matrix R_methodsS3 R_oo R_utils]; }; - tmod = derive2 { name="tmod"; version="0.44"; sha256="1xp0lhjqfaw3zgdd7binz3nd9pjmr1v7h6a76li8a4mhkwrls5yk"; depends=[beeswarm gplots plotwidgets RColorBrewer tagcloud XML]; }; + tmod = derive2 { name="tmod"; version="0.46.2"; sha256="139znivmsm7hr5hiiq7f9vab5hm0bzqf2qfs69n340gf1dgpyrd2"; depends=[beeswarm colorDF gplots plotwidgets RColorBrewer tagcloud XML]; }; tmpm = derive2 { name="tmpm"; version="1.0.3"; sha256="1fqk39zyc07gh0ygi7pfljlnj6ih37jsb7bcxm05zcd4796wil8j"; depends=[reshape2]; }; tmt = derive2 { name="tmt"; version="0.2.1-0"; sha256="1drb0z9jk76ixn3qw7xb5rirfc9h0frkhl1krs681aiaspqkgswj"; depends=[ggplot2 Rcpp]; }; tmuxr = derive2 { name="tmuxr"; version="0.2.4"; sha256="0wz33sgnmcsrd1z7nsskqjhngwjkyvqd7isxcrxzkwd33naa8144"; depends=[processx]; }; - tmvmixnorm = derive2 { name="tmvmixnorm"; version="1.1.0"; sha256="1vrdchj2h9dnia08i2184sqwj4rnppj6ya8qxb16hp6lfv5yblla"; depends=[MASS]; }; + tmvmixnorm = derive2 { name="tmvmixnorm"; version="1.1.1"; sha256="0i1g3598d43azyy1bsrvkjybqa5cd991fpmfqi5wv5703zaha2fj"; depends=[MASS]; }; tmvnsim = derive2 { name="tmvnsim"; version="1.0-2"; sha256="03xsvsg9bqvgl98ywid3h91mmlhax5s6wvmypp3hq91vmc5kvxlp"; depends=[]; }; tmvtnorm = derive2 { name="tmvtnorm"; version="1.4-10"; sha256="1w3kmpx25l7rb80vpclqq4pbbv12qgysyqxjq3lp55l9nklkb7qs"; depends=[gmm Matrix mvtnorm]; }; tnet = derive2 { name="tnet"; version="3.0.16"; sha256="0922y9zb64zazl2irwfxxbghkgcwi2q57gylpiaxgmj4q6lc62l9"; depends=[igraph survival]; }; toOrdinal = derive2 { name="toOrdinal"; version="1.1-0.0"; sha256="0zg4zk7jx8s57g8nb0jw7r7gss00349jmkglf6sz26p7jldpgmff"; depends=[crayon testthat]; }; todor = derive2 { name="todor"; version="0.1.1"; sha256="13idn5wq8r9m7yx4wnbazp5lnc3bpx4gh6chcq7abj53ms734pc3"; depends=[rex rstudioapi stringr]; }; togglr = derive2 { name="togglr"; version="0.1.33"; sha256="105c9vxa67bqccj31ksk5myfd0v7v0wbz6qqjhxqndlg7v6ggfzc"; depends=[assertthat dplyr getPass glue httr jsonlite keyring lubridate magrittr parsedate prettyunits purrr rstudioapi]; }; - tokenbrowser = derive2 { name="tokenbrowser"; version="0.1.4"; sha256="09bhwqqw2nr5c985ml8d6ik19r8jvxcj1l7v4xhb3y6n9k6dqxwr"; depends=[Rcpp stringi]; }; + tokenbrowser = derive2 { name="tokenbrowser"; version="0.1.5"; sha256="17hbkcan74j4fkk4j1xcgikaanp3xhs5njjxkapg2yjdhmf2dng6"; depends=[Rcpp stringi]; }; tokenizers = derive2 { name="tokenizers"; version="0.2.1"; sha256="006xf1vdrmp9skhpss9ldhmk4cwqk512cjp1pxm2gxfybpf7qq98"; depends=[Rcpp SnowballC stringi]; }; tokenizers_bpe = derive2 { name="tokenizers.bpe"; version="0.1.0"; sha256="1pwgjrzdcsafpv9rlyly6fckcjiymz0xcjm9byavj069kc4c69mi"; depends=[Rcpp]; }; tolerance = derive2 { name="tolerance"; version="2.0.0"; sha256="001snzr2ipag3zprynydlbi9prkjzrllc054qh7m0qwkb3r19jjd"; depends=[MASS rgl]; }; + tongfen = derive2 { name="tongfen"; version="0.3"; sha256="14f7bw67yvp2g0ll5g39fjq744calkj5hkbm9q8k0y07arg8jsf0"; depends=[dplyr geojsonsf lifecycle lwgeom purrr readr rlang sf stringr tibble tidyr]; }; toolmaRk = derive2 { name="toolmaRk"; version="0.0.1"; sha256="0pdr8lq4c11ia03v68lbfq38p3qp770mbj0nsbjsgbqi0pv9i1vx"; depends=[dplyr ggplot2 plyr reshape2]; }; tools4uplift = derive2 { name="tools4uplift"; version="0.1-1"; sha256="0difrjqgj8amc49mwh059ca9mr0z1fzy0g43vk43alsyl8lvajc4"; depends=[dplyr glmnet]; }; topicdoc = derive2 { name="topicdoc"; version="0.1.0"; sha256="0qliy6y8l09nblch1swlywam2awzwjl5xx0w8c3kiz48jxfysw0j"; depends=[slam topicmodels]; }; @@ -15361,16 +16027,18 @@ in with self; { topmodel = derive2 { name="topmodel"; version="0.7.3"; sha256="15w9id90d6l0i0ji3ln3sxnpispb6pgabk4waysqn0nh6y4lfdgb"; depends=[]; }; topoDistance = derive2 { name="topoDistance"; version="1.0.1"; sha256="055z3gvqlb8nyy58ix89w7miav9gj3h43a4wcfc3kagd97xc3222"; depends=[gdistance igraph plotly raster RColorBrewer scales sp]; }; topologyGSA = derive2 { name="topologyGSA"; version="1.4.6"; sha256="0vas7qab5a86jb277ql63qjvfvx7iqqbcrwky7iyr0s8p8p794ia"; depends=[fields graph gRbase qpgraph]; }; + topsa = derive2 { name="topsa"; version="0.1.0"; sha256="1cndv05glqagakli9f1v2nhv5ryxx0pwr6ryflnqyv82a7qim54h"; depends=[ggplot2 scales sf TDA]; }; topsis = derive2 { name="topsis"; version="1.0"; sha256="056cgi684qy2chh1rvhgkxwhfv9nnfd7dfzc05m24gy2wyypgxj3"; depends=[]; }; tor = derive2 { name="tor"; version="1.1.2"; sha256="1s34hzw3a4cm9gk85fcxgxwmn2xc7njs1iw1snd91id3gdl6vppx"; depends=[fs readr rlang tibble]; }; - torch = derive2 { name="torch"; version="0.0.1"; sha256="1fp362g6c4c7nc8gvcwsmrd8578kw1r3zk03wfaq9chr2858h4vh"; depends=[R6 Rcpp rlang withr]; }; + torch = derive2 { name="torch"; version="0.2.0"; sha256="105ha4hgdg5dr9w6sj3mm5qhq4mybd9lnf0w39cb3m1js8rpsdlh"; depends=[bit64 callr cli coro magrittr R6 Rcpp rlang withr]; }; + torchvision = derive2 { name="torchvision"; version="0.1.0"; sha256="1r3fydq71kpbxb5gz9ddv9cmnh8286zv23f8ziy8yncdc3kzlrbg"; depends=[abind fs jpeg png rappdirs rlang torch]; }; tosca = derive2 { name="tosca"; version="0.2-0"; sha256="0sq6libv2vi5q3738fksjxabfhv63zc7nldgb4nh6k57yxqzwf3z"; depends=[data_table htmltools lda lubridate quanteda RColorBrewer stringr tm WikipediR]; }; tosls = derive2 { name="tosls"; version="1.0"; sha256="03nqwahap504yvcksvxdhykplbzmf5wdwgpzm7svn8bymdc472v2"; depends=[Formula]; }; - totalcensus = derive2 { name="totalcensus"; version="0.6.3"; sha256="0489bzc8y4zgs4rpd52xbc2hm7g0y46j40f5bmqp5h56aq259jsa"; depends=[data_table magrittr purrr stringr]; }; + totalcensus = derive2 { name="totalcensus"; version="0.6.5"; sha256="1vddlx48fk4clw3hmax57nqwjccvaazv31nfr4kvrlmc3w4jxjpj"; depends=[data_table magrittr purrr stringr]; }; touch = derive2 { name="touch"; version="0.1-5"; sha256="0dan4mlvc5lg9v4zj9w6gk3c4cy64kaa984y495xpc1bzmv5c6jd"; depends=[Rcpp]; }; touchard = derive2 { name="touchard"; version="2.0.1"; sha256="06491r4x3ycmv3ddbqwig334wj9qvm395xlaifx4hjjyyi65xb3q"; depends=[MASS nleqslv numDeriv plotrix]; }; - tourr = derive2 { name="tourr"; version="0.5.6"; sha256="028pbprq1hjfbzvybpdkwi49arsg9r7ayjb52flw33szfqdpcimw"; depends=[MASS]; }; - toxEval = derive2 { name="toxEval"; version="1.1.0"; sha256="1zdgk91girmlxqq6zz3vzhj9m9q4r5ckn073cd7dpfdxl87444hh"; depends=[dplyr DT ggplot2 leaflet magrittr RColorBrewer readxl shiny shinyAce shinycssloaders shinydashboard tidyr]; }; + tourr = derive2 { name="tourr"; version="0.6.0"; sha256="0mci0y6s851gh1b157mhpvz0p7hkq2f1ccq9jj22p5k7ipxwn8dh"; depends=[dplyr MASS tibble]; }; + toxEval = derive2 { name="toxEval"; version="1.2.0"; sha256="11rw8vjnz3kzikd59vbyiv8vc7dijpi6znyxlc7c4rpi41gs6c0m"; depends=[dplyr DT ggplot2 leaflet magrittr RColorBrewer readxl shiny shinyAce shinycssloaders shinydashboard tidyr]; }; toxtestD = derive2 { name="toxtestD"; version="2.0"; sha256="0b7hmpfhwg626r8il12shni0kw94cqnbj49y4vfh8gn98x1s6m48"; depends=[]; }; tpAUC = derive2 { name="tpAUC"; version="2.1.1"; sha256="0wix9qwcidj7xfqhh7bmrpnadd9qlkvg3515gaamdxkjbz2kyydc"; depends=[pROC]; }; tpe = derive2 { name="tpe"; version="1.0.1"; sha256="0zsa8vb4qmln3sb4lplv43lh50yys9vfd3rxfp6qxqqjxivd0xsh"; depends=[]; }; @@ -15384,18 +16052,18 @@ in with self; { trackeR = derive2 { name="trackeR"; version="1.5.2"; sha256="1f3giz6naxxyicgy9v0391ang43srwhy9zbiv4zmlc8i9v05b57i"; depends=[fda foreach ggmap ggplot2 ggridges gridExtra gtable jsonlite leaflet raster RSQLite scam sp xml2 zoo]; }; trackeRapp = derive2 { name="trackeRapp"; version="1.1"; sha256="0pys5vw3268j90i2gg6b1sgbx917vvk0x9k2ryh3l3p96vkrqv87"; depends=[changepoint colorspace DT foreach mapdeck mgcv plotly sf shiny shinydashboard shinyjs shinyWidgets trackeR V8 zoo]; }; trackr = derive2 { name="trackr"; version="0.10.6"; sha256="0p7i4cj5z1qis2a1mqqz3wrgwhhbcggyyfwj3zycm3xcig9f6d9b"; depends=[CodeDepends fastdigest ggplot2 gridGraphics histry htmltools lattice miniUI RJSONIO rlang rmarkdown roprov rsolr shiny]; }; - tractor_base = derive2 { name="tractor.base"; version="3.3.2"; sha256="0y5gm0y4chl30f5qqq8qiiw4j8g32s4i9xrvyp3cwg902kf2p86i"; depends=[ore reportr RNifti shades]; }; + tractor_base = derive2 { name="tractor.base"; version="3.3.3.1"; sha256="0w5jw7pf77npkgig7667yikpbwv4dfk1dcq63qm88l409ga2f95p"; depends=[ore reportr RNifti shades]; }; trade = derive2 { name="trade"; version="0.5.5"; sha256="0brpvqj1zkic4ja6nbh2zxrlkmhj1ri4s04046pb9grycrxv93j1"; depends=[antitrust]; }; - tradestatistics = derive2 { name="tradestatistics"; version="1.0"; sha256="09zbgf971gb1m5d1jfwkdrj78ckj3gq5i03p9wfxbljb7rqby6la"; depends=[crul data_table digest jsonlite memoise]; }; + tradestatistics = derive2 { name="tradestatistics"; version="1.1"; sha256="0x2ikbkgsg4gridmsqwzb2mbsh5hc6gx1kq65pbh1s6zv1kx89rs"; depends=[crul data_table digest jsonlite memoise]; }; trafo = derive2 { name="trafo"; version="1.0.1"; sha256="0gq3snjpkw0ncny7pkfi686qkgdhd8id73jxjk3chhqf5mzrrsbc"; depends=[FNN lmtest moments pryr]; }; - traineR = derive2 { name="traineR"; version="1.0.0"; sha256="0m0k9hxdpx8dzxdy8i0k2rqmibm78fkw8fykkm5r56g7zjh3b7g0"; depends=[ada dplyr dummies e1071 kknn neuralnet nnet randomForest rpart stringr xgboost]; }; - traipse = derive2 { name="traipse"; version="0.1.0"; sha256="0174rxc3p3s848s9ynkkw32f33dq9gnq7zd14i3b9xnp8zr9jnph"; depends=[geodist geosphere magrittr]; }; - traitdataform = derive2 { name="traitdataform"; version="0.5.7"; sha256="1h01hkxx3xz1kaliq3arx8hb82k9jx19s755y6xbyji6jp6hwy3h"; depends=[data_table getPass plyr RCurl reshape2 taxize units XML]; }; - traits = derive2 { name="traits"; version="0.4.2"; sha256="1aiy7mdwji72rrmf8gwmnpkhfbqbqbblffxghniw5pfpv55j6mib"; depends=[crul data_table hoardr httr jsonlite readr rvest taxize tibble xml2]; }; + traineR = derive2 { name="traineR"; version="1.0.1"; sha256="122fhlmr2i6wlr65308fgcyhd8wvdqmp4cdyssxd57wq0dzsl3n5"; depends=[ada dplyr dummies e1071 kknn neuralnet nnet randomForest rpart stringr xgboost]; }; + traipse = derive2 { name="traipse"; version="0.2.0"; sha256="1g6xnk4iz4vakvv0qc6vqammr3jf0a2iisp4f439pcm9kwn64jcr"; depends=[geodist geosphere magrittr]; }; + traitdataform = derive2 { name="traitdataform"; version="0.6.1"; sha256="1lk1hrbjgdl14szwh1nn97vf30smfq34k797v0m6d72qckd6szcj"; depends=[data_table getPass plyr RCurl reshape2 taxize units XML]; }; + traits = derive2 { name="traits"; version="0.5.0"; sha256="04s2523wkbjqxpwllvcy7ikyfri5gldgnynjswsxdy0k945wacvz"; depends=[crul data_table hoardr httr jsonlite readr rvest taxize tibble xml2]; }; traj = derive2 { name="traj"; version="1.2"; sha256="0mq6xdbxjqjivxyy7cwaghwmnmb5pccrah44nmalssc6qfrgys4n"; depends=[cluster GPArotation NbClust pastecs psych]; }; trajectories = derive2 { name="trajectories"; version="0.2-2"; sha256="064hyk8v8my8kr05bi8grv3p04a5i97vdky5i7z3zka64l2f3kqr"; depends=[lattice sp spacetime zoo]; }; - trajr = derive2 { name="trajr"; version="1.3.0"; sha256="1p092kqvwg3ncbk9hh8dij2grl1hfs3j5j64cqn227nr5b3xn1rc"; depends=[plotrix signal]; }; - tram = derive2 { name="tram"; version="0.4-0"; sha256="0fjdwzvqm14kx2fjryf3by1m44f22nwfy0jk7kd6v4rhxh22dlw3"; depends=[basefun Formula Matrix mlt multcomp sandwich survival variables]; }; + trajr = derive2 { name="trajr"; version="1.4.0"; sha256="092hx27b6d0vy1pvmga1z3b245aa9gn9aw3hszbhhkkic5zfpgbq"; depends=[plotrix signal]; }; + tram = derive2 { name="tram"; version="0.5-2"; sha256="0dmszy6251zzqszpcj3cn651a39bdyl8x0vg2lah6dwz59zmk9s8"; depends=[basefun Formula Matrix mlt multcomp sandwich survival variables]; }; tramME = derive2 { name="tramME"; version="0.0.3"; sha256="1k7al49pgdr7bvsf8p6qrb1qz96lqfagvcnf59kxibi2rdixrqk1"; depends=[alabama basefun lme4 Matrix mlt nlme RcppEigen TMB tram variables]; }; tramnet = derive2 { name="tramnet"; version="0.0-3"; sha256="1mii4dw244glq7yy0zmaicr8gpqdh0m3jxjv4sm2vn7w5bj7w44n"; depends=[basefun CVXR lhs mlr mlrMBO mlt ParamHelpers sandwich smoof tram]; }; tranSurv = derive2 { name="tranSurv"; version="1.2.1"; sha256="0fpfzq00va05y6hp4yy5h8rdmfqjcnqp69lyic9mrxkma4nhd4nd"; depends=[rootSolve SQUAREM survival truncSP]; }; @@ -15408,49 +16076,56 @@ in with self; { transmem = derive2 { name="transmem"; version="0.1.1"; sha256="1a3c5ddmh9k4f80rbk363s7rkx30qhk9ssmf7xg7rr0lwxphahf3"; depends=[cmna ggformula ggplot2 plot3D]; }; transplantr = derive2 { name="transplantr"; version="0.2.0"; sha256="1kzi8rvswsmibxqnhqd1j42y848si6cxd8hpvwi55y8s4hcylw0y"; depends=[]; }; transport = derive2 { name="transport"; version="0.12-2"; sha256="1d49gm5lwih7b7rav3c42brcp6xi3y55xw11r9n8illjwjayfcxd"; depends=[data_table Rcpp RcppEigen]; }; + transx = derive2 { name="transx"; version="0.0.1"; sha256="1xx934w4fhk2nwm5h6lf4irj83wsfp8lbplzcha5rnc7aka8pn3v"; depends=[rlang]; }; trapezoid = derive2 { name="trapezoid"; version="2.0-0"; sha256="0f6rwmnn61bj97xxdgbydi94jizv1dbq0qycl60jb4dsxvif8l3n"; depends=[]; }; tree = derive2 { name="tree"; version="1.0-40"; sha256="1rr6ws62j9h36f3nl713f8h3ndkh95mv46l055jvgmby5lw1dazz"; depends=[]; }; tree_interpreter = derive2 { name="tree.interpreter"; version="0.1.1"; sha256="18p1x53q1hhhagglgsq2axnr9l5rpa08vxjayqqmb6rsjrkygn78"; depends=[Rcpp RcppArmadillo]; }; treeClust = derive2 { name="treeClust"; version="1.1-7"; sha256="1s7kh6q0bkixsygrip95zf1bi10ihddsa5lq9dfxd68yh8rsby6z"; depends=[cluster rpart]; }; treeDA = derive2 { name="treeDA"; version="0.0.4"; sha256="0zhzb21lvxk278ysl275g39y2r8dlgqdix5rfg2pwv3nzj2531rc"; depends=[ggplot2 gtable Matrix mvtnorm phyloseq reshape2 sparseLDA]; }; - treeHMM = derive2 { name="treeHMM"; version="0.1.1"; sha256="1chg1y26x4nm2wm2nsqw51lx2w8b89wdq8ywh1l03xhw8lgdsv47"; depends=[future gtools Matrix matrixStats PRROC]; }; treebase = derive2 { name="treebase"; version="0.1.4"; sha256="1bx31jahb0wy2g8wl1z71vy659lfi8fq1sbbaxvyixzcwymix1wq"; depends=[ape httr RCurl XML]; }; - treeclim = derive2 { name="treeclim"; version="2.0.3"; sha256="03d734zxz4vjrx7xw9r8y8lcsacn0p92q09n05vqfx4p7wvpwp26"; depends=[abind boot ggplot2 lmodel2 lmtest np plyr Rcpp RcppArmadillo]; }; + treeclim = derive2 { name="treeclim"; version="2.0.5.1"; sha256="1gwsprvr9yi67slrkxf34kbqvqkr4csaqkcdbdi1vwivn2nyb3py"; depends=[abind boot ggplot2 lmodel2 lmtest np plyr Rcpp RcppArmadillo]; }; treecm = derive2 { name="treecm"; version="1.2.2"; sha256="0vrawg4vvy270dn20gb2k99xi4q89l4mjz0mm7ikpz8wxqypzq2l"; depends=[plyr]; }; + treedata_table = derive2 { name="treedata.table"; version="0.1.0"; sha256="0dhnb8if5wq6hzhjg40cw80sacigqmlm7nplm1f1ay5cqx1ynfi7"; depends=[ape data_table geiger lazyeval]; }; treedater = derive2 { name="treedater"; version="0.5.0"; sha256="007rdrbv3v1z3qbyasla22rck105sqlqh93yfmxklihdydl7smfd"; depends=[ape limSolve]; }; + treeducken = derive2 { name="treeducken"; version="1.0.0"; sha256="0y6yz1iq8v8aa5xfc0fd5azmx4h5a73iscf15hgpcvsxcr50f0w6"; depends=[ape apTreeshape Rcpp RcppArmadillo]; }; treefit = derive2 { name="treefit"; version="1.0.0"; sha256="10yf4bm26vgiy3ra0c5lpflp0xdijw9zwl4aq9bz89qhszzji1fa"; depends=[ggplot2 igraph patchwork pracma]; }; - treeheatr = derive2 { name="treeheatr"; version="0.1.0"; sha256="08mvw4fw56y6vmzz0js7scbrac9w29b5rhfl0fnk8q00fn9vhy84"; depends=[cluster dplyr ggnewscale ggparty ggplot2 gtable partykit seriation tidyr yardstick]; }; + treeheatr = derive2 { name="treeheatr"; version="0.2.1"; sha256="0618j5rlq0xik9vl2l8ircnh98wzdzf9bxnfgmiqrpywgmc8r5nk"; depends=[cluster dplyr ggnewscale ggparty ggplot2 gtable partykit seriation tidyr yardstick]; }; treelet = derive2 { name="treelet"; version="1.1"; sha256="0k3qhxjg7ws6jfhcvvv9jmy26v2wzi4ghnxnwpjm8nh7b90lbysd"; depends=[]; }; treeman = derive2 { name="treeman"; version="1.1.4"; sha256="1rlq8sklvpj6an8x9wvs3501y6dpl2vhl5zfmz0yvmif04msf49v"; depends=[ape bigmemory plyr RJSONIO stringr]; }; treemap = derive2 { name="treemap"; version="2.4-2"; sha256="15bdgkdwryb55v82b3hpcx4ykfg5z7zf10h0wwknf6kl1kn34v90"; depends=[colorspace data_table ggplot2 gridBase igraph RColorBrewer shiny]; }; - treemapify = derive2 { name="treemapify"; version="2.5.3"; sha256="1y6fyzxk542fp4h975xfgajz7cjym3rjs6asal9arv94a9cqra33"; depends=[ggfittext ggplot2]; }; - treenomial = derive2 { name="treenomial"; version="1.1.2"; sha256="0nn5vd23nxfpk8wm68m6sxnx495nb6bkgx2w9lgjy4s66sbnddp0"; depends=[ape Rcpp RcppArmadillo RcppThread]; }; + treemapify = derive2 { name="treemapify"; version="2.5.4"; sha256="17z2xw6f93hzd1s0d9nmzmks5kzsjmn95nwhsrcw610djy2nxhxs"; depends=[ggfittext ggplot2]; }; + treenomial = derive2 { name="treenomial"; version="1.1.3"; sha256="1cw17dnayh5pgcgh5wghskq3i0zc7ww8kb8flyqyqrb4za2w47b6"; depends=[ape Rcpp RcppArmadillo RcppThread]; }; treeperm = derive2 { name="treeperm"; version="1.6"; sha256="0mz7p9khrsq4dbkijymfvlwr01y4fvs0x6si4x5xid16s2zsnmm4"; depends=[]; }; - treespace = derive2 { name="treespace"; version="1.1.3.2"; sha256="18xqvqpcknvwdvl84jskcwmsw3alcwns0d35a8paalwjkix03175"; depends=[ade4 adegenet adegraphics adephylo ape combinat distory fields htmlwidgets MASS phangorn phytools Rcpp rgl RLumShiny scatterD3 shiny shinyBS]; }; + treeplyr = derive2 { name="treeplyr"; version="0.1.10"; sha256="0k5hblnpbs8h2812blc6crx1j9w9r7lzkz3fraxkn4gdfpfi5100"; depends=[ape dplyr geiger lazyeval phytools Rcpp]; }; + treespace = derive2 { name="treespace"; version="1.1.4.0"; sha256="146g5jjgf2yx7vjkpsgi38ah6fccyn6xnsk6mgqjramgf490xgrh"; depends=[ade4 adegenet adegraphics adephylo ape combinat distory fields htmlwidgets MASS phangorn phytools Rcpp rgl RLumShiny scatterD3 shiny shinyBS]; }; treestartr = derive2 { name="treestartr"; version="0.1.0"; sha256="05rxy9lmb77ng4266871sd881mlp4rd5qalvsd7ps2x2j4plaqf4"; depends=[ape phytools]; }; treestructure = derive2 { name="treestructure"; version="0.1.0"; sha256="0514q53bdwv9fwd58srhr6lzw1j56fcd64hml8w4rv4wzcd6c01m"; depends=[ape Rcpp]; }; - trekcolors = derive2 { name="trekcolors"; version="0.1.1"; sha256="1fw2wgkkky79vy9sc3cn42vmfcdnsjsnhb81wvalwi6ww64fzrkh"; depends=[ggplot2]; }; - trekfont = derive2 { name="trekfont"; version="0.9.3"; sha256="15p1r5q36fbajhwidjhhvvldckvz5js08w4cnj47gqr4lpmmpbx7"; depends=[]; }; + trekcolors = derive2 { name="trekcolors"; version="0.1.2"; sha256="0rya2g27afjvi44w0si96cj0x4p5hc0ydqvjwigk4rwa1vc2ax2q"; depends=[ggplot2]; }; + trekfont = derive2 { name="trekfont"; version="0.9.4"; sha256="09r8hjh7xjagfp3cxjai0079gan5h0zxjgpcvs4cx83icj76axgh"; depends=[]; }; trelliscopejs = derive2 { name="trelliscopejs"; version="0.2.5"; sha256="12yanm6p9ygb7z1cg526f70i2a6179icyals69vkf8rjkd0n6si5"; depends=[autocogs base64enc digest DistributionUtils dplyr ggplot2 gtable htmltools htmlwidgets jsonlite knitr progress purrr rlang tidyr webshot]; }; trelloR = derive2 { name="trelloR"; version="0.1.0"; sha256="0d549yw9pfxs8a3q716z08fzg68bkm5l09cv5iqqkm4gyasrxsf4"; depends=[dplyr httr jsonlite]; }; - trend = derive2 { name="trend"; version="1.1.2"; sha256="09b6ycyfgs4xlhx6kn6qm5rl2acp58hzhv8qclzn3kb1wjjyvxy5"; depends=[extraDistr]; }; + trend = derive2 { name="trend"; version="1.1.4"; sha256="1mr5g5gaxiqj6x83ngcbwwh57vhrhcz0x9dh0rmvs9y2ivk29ccs"; depends=[extraDistr]; }; trendchange = derive2 { name="trendchange"; version="1.1"; sha256="19r0kmwsim78ynssyh6j0zd99cz96cacy3hmyrjabwwvz0f8sk3h"; depends=[]; }; + trendeval = derive2 { name="trendeval"; version="0.0.1"; sha256="1cpv7l26ia40s46wfi4jwhwzl0xxs0dgzv4ngg8frbv5l80fmvmr"; depends=[ellipsis rsample tibble tidyr trending yardstick]; }; + trending = derive2 { name="trending"; version="0.0.2"; sha256="1ab5gm5v9s732ld7582bz32ygy2d5bndmbdw8xqnagcm03ab3yrz"; depends=[dplyr MASS tibble vctrs]; }; trendsegmentR = derive2 { name="trendsegmentR"; version="1.0.0"; sha256="0zgm5nbm5azmz6x0xg4aphc80q6x1cvijry9pznyi0mg14743g86"; depends=[]; }; trendyy = derive2 { name="trendyy"; version="0.1.1"; sha256="03n7qdfc197hds8bdwl20b0nn62nqnz9r35v1q315nm3ccdifl1p"; depends=[crayon dplyr gtrendsR magrittr purrr stringr tibble]; }; - trialr = derive2 { name="trialr"; version="0.1.4"; sha256="1gd438j0r2x15xl8nbszz7kms20zw9s8j9nl1xf0vgkqwfcblkvg"; depends=[BH binom coda dplyr ggplot2 gtools magrittr MASS purrr Rcpp RcppEigen rlang rstan rstantools StanHeaders stringr tibble tidybayes tidyr]; }; + trialr = derive2 { name="trialr"; version="0.1.5"; sha256="11b5wmyq4ki2n0cr2hp2lf219i8q5yh6biyyl8wnvajiaa8560ja"; depends=[BH binom coda dplyr ggplot2 gtools magrittr MASS purrr Rcpp RcppEigen rlang rstan rstantools StanHeaders stringr tibble tidybayes]; }; triangle = derive2 { name="triangle"; version="0.12"; sha256="1cv3l97myhkyl0c4xjympqghlk0av8xfk00av8kj93ndgkv5bfj7"; depends=[]; }; triangulation = derive2 { name="triangulation"; version="0.5.0"; sha256="1zp09g0s0qpqgz2k6jx32pswh2zqyyd0b62lf1dx1p46m28dafkn"; depends=[]; }; + triangulr = derive2 { name="triangulr"; version="1.1.0"; sha256="0n3kccn5ki0cprrj581i5fpzpa45dw6lwp86kkhvqnhpdwk6h9mv"; depends=[dqrng Rcpp rlang vctrs]; }; tribe = derive2 { name="tribe"; version="0.1.8"; sha256="01z1b9k3j4xi5fp9pkpr991yr7x8vk8vysipy7iwdmdr7xg4w4p0"; depends=[dplyr lazyeval magrittr rlang rstudioapi]; }; tricolore = derive2 { name="tricolore"; version="1.2.2"; sha256="0pxahddc3dah4n4xk4i0dkiwvh4wf03gcx8q3nfrsk07zzap1zh1"; depends=[assertthat ggplot2 ggtern shiny]; }; triebeard = derive2 { name="triebeard"; version="0.3.0"; sha256="1hqyz57gph02c9fdc07lxz113bbklif3g18sw8jan6pakhhdc7dz"; depends=[Rcpp]; }; trigpoints = derive2 { name="trigpoints"; version="1.0.0"; sha256="1hckjh2gb0fvd2c8x6mj0idpk3im7b831y7mbli1hqhry6qqdw15"; depends=[sf tibble]; }; trimTrees = derive2 { name="trimTrees"; version="1.2"; sha256="0v75xf5186dy76332x4w7vdwcz7zpqga8mxrb5all2miq2v45fi8"; depends=[mlbench randomForest]; }; trimcluster = derive2 { name="trimcluster"; version="0.1-5"; sha256="12siv8yx8dcavsz8jk96lwscbj257ar8jpaxksl2zb06987g4fcj"; depends=[]; }; + trimetStops = derive2 { name="trimetStops"; version="0.1.0"; sha256="068mya6zqiacs3nznwmz17srn90ar6wjnpkgqsznzmigzy7c4idk"; depends=[]; }; trimmer = derive2 { name="trimmer"; version="0.8.1"; sha256="0hn5pignj5clg7wb3xd0mh9jqc480wqxxymzaas68lxzi6p5mng9"; depends=[cli crayon data_table pryr]; }; trimr = derive2 { name="trimr"; version="1.0.1"; sha256="0gcn18nwxmax9c35is0nldyh74cw8rg3gj60cixzs9qjnpb9xx3d"; depends=[]; }; trinROC = derive2 { name="trinROC"; version="0.4"; sha256="02civ3r14hr6gbw6bdh77y00kiki6cdcv85hxk5g6n2nfspdr67r"; depends=[ggplot2 gridExtra rgl]; }; trioGxE = derive2 { name="trioGxE"; version="0.1-1"; sha256="1ra86l3i7fhb6nsy8izixyvm6z23shv7fcjmnnpil54995j15ax4"; depends=[gtools mgcv msm]; }; - trip = derive2 { name="trip"; version="1.7.1"; sha256="0arw4x4f8ccp26qg8nmqfsadks2wqjbdwacy8wq9wnyqmk1jdff9"; depends=[crsmeta geodist glue maptools MASS raster reproj sp spatstat traipse viridis]; }; + trip = derive2 { name="trip"; version="1.8.0"; sha256="1fwvw2z1aig0w41lzdm7aqm5kghjfz4vyzpc6m398k5zsjqrdl8l"; depends=[crsmeta dplyr geodist glue maptools MASS raster reproj rlang sp spatstat traipse viridis]; }; tripEstimation = derive2 { name="tripEstimation"; version="0.0-44"; sha256="1ylpyzlqr6l5haxq4icnlxw6vgvc2lsfz5sm2wqqm4m6h3p0i6s6"; depends=[lattice mgcv rgdal sp zoo]; }; tripack = derive2 { name="tripack"; version="1.3-9.1"; sha256="1ghza4by6shalsnqybn5qgv076dxh59b6vycg9v6ii216zbgi0kz"; depends=[]; }; triplot = derive2 { name="triplot"; version="1.3.0"; sha256="1apmdpxdnnmjyi7gcrjrqw44iqphr84nbgw0nfxcspzjgxhc81l1"; depends=[DALEX ggdendro ggplot2 glmnet patchwork]; }; @@ -15471,32 +16146,35 @@ in with self; { trust = derive2 { name="trust"; version="0.1-8"; sha256="1b6wsx4vybr5952ii3ska6jbcb3654iibz83n645khxfca5k8blm"; depends=[]; }; trustOptim = derive2 { name="trustOptim"; version="0.8.6.2"; sha256="1nsl8jd6cna52b5dd92jw3sh84jqpg7gazskn7166bcjbph19bf7"; depends=[Matrix Rcpp RcppEigen]; }; trustedtimestamping = derive2 { name="trustedtimestamping"; version="0.2.6"; sha256="1rx7ypy331mq5ni5hxhqcfnicvwdgg9j2pm3aj097a5hhigibdrq"; depends=[digest httr jsonlite]; }; - tryCatchLog = derive2 { name="tryCatchLog"; version="1.1.6"; sha256="0ik2y2ac771z9r0wb4av2xhr3xv36n4wcv8cqx0vid3wcmbl6prc"; depends=[]; }; - tsBSS = derive2 { name="tsBSS"; version="0.5.5"; sha256="19i9raw3wiig66a84msqqwwxd9br4ayk108v7d9j78d0ynm6ki84"; depends=[boot forecast ICtest JADE Rcpp RcppArmadillo xts zoo]; }; + tryCatchLog = derive2 { name="tryCatchLog"; version="1.2.1"; sha256="13c8llyg48ll8hz4v6pfbng3ilipj86q20blwbvn0b0h3apb3v7p"; depends=[]; }; + ts_extend = derive2 { name="ts.extend"; version="0.1.1"; sha256="03b358nywx0zynb6006886mzvz1mbbaim6b5m641drklh6k0l6r1"; depends=[]; }; + tsBSS = derive2 { name="tsBSS"; version="0.5.6"; sha256="1rkr61ixi7xvx05yp65qp9j0j5vpr17cfw30gmx4hp9i212q1abr"; depends=[boot forecast ICtest JADE Rcpp RcppArmadillo xts zoo]; }; tsDyn = derive2 { name="tsDyn"; version="10-1.2"; sha256="0wwp18qaxljdy1zqww1qw9fa9ycvgwcf6j52cpx3v2f2177x7snc"; depends=[foreach forecast MASS Matrix mgcv mnormt nnet tseries tseriesChaos urca vars]; }; tsModel = derive2 { name="tsModel"; version="0.6"; sha256="0mkmhzj4g38ngzfcfx0zsiqpxs2qpw82kgmm1b8gl671s4rz00zs"; depends=[]; }; tsPI = derive2 { name="tsPI"; version="1.0.3"; sha256="00p7275iq8qn6c6dpqjr5s9fzc0a6njqqi9gvqnh5s9lfx9mbk1v"; depends=[KFAS]; }; tsSelect = derive2 { name="tsSelect"; version="0.1.8"; sha256="0ysijzhhwaj5n7h50jacshnla6d0h61q0f6lj19ic0lwvlz4yazy"; depends=[forecast]; }; tsallisqexp = derive2 { name="tsallisqexp"; version="0.9-3"; sha256="0mzqplsj2w4a7jnav43afyk8ymy6p444j7km6kc8c2g4aifpgxcb"; depends=[]; }; - tsapp = derive2 { name="tsapp"; version="1.0.0"; sha256="0dakmzm65y6w3idfynnigcmyw0n28scfgklmmg7lg8ycsxh0x76l"; depends=[fftwtools Matrix vars]; }; + tsapp = derive2 { name="tsapp"; version="1.0.3"; sha256="1k2r8nnqbkgrhgdqg45y0svzqj521wl6vbss23yypwh1gcbddzn9"; depends=[fftwtools Matrix vars]; }; tsbox = derive2 { name="tsbox"; version="0.2.1"; sha256="0k5azdn4af6mwcx1lf8ns83nim34kfsb9m26h3yjm9mk9qixr6k1"; depends=[anytime data_table]; }; tsc = derive2 { name="tsc"; version="1.0-3"; sha256="1acsdkxizlkix1sskwqv2a80rshw6f14zvcsjhrmmdfd4bmwh36y"; depends=[]; }; - tscount = derive2 { name="tscount"; version="1.4.2"; sha256="15lvrglv4lq17g425s9lkcb3f04bk0322yl32648ysf7gp7lmdx5"; depends=[ltsa]; }; - tsdb = derive2 { name="tsdb"; version="0.7-1"; sha256="0ngy897fmf48c7k54zq8lx2fyv45c0kzn3bxm5054ay2lkv02idz"; depends=[datetimeutils fastmatch zoo]; }; + tscount = derive2 { name="tscount"; version="1.4.3"; sha256="087ncxy1q91yc5rr15d5h6m7kaqhw8yy5fbm22rkzp9dg2fhbzi3"; depends=[ltsa]; }; + tsdb = derive2 { name="tsdb"; version="0.7-4"; sha256="0ya87a14g94whcmmng55pkr7ql4m2dgmw5izd5ggldm4k6z62jp0"; depends=[datetimeutils fastmatch zoo]; }; tsdecomp = derive2 { name="tsdecomp"; version="0.2"; sha256="1wy37gjp49dr60s4zhwv19iv3mzr1fjz5yilqmqgy78j5d45ns15"; depends=[]; }; tsdf = derive2 { name="tsdf"; version="1.1-8"; sha256="00s0aiis88611xsq9px61f9gwprp803wcvi5milvc7qckrh1kw0z"; depends=[]; }; tsdisagg2 = derive2 { name="tsdisagg2"; version="0.1.0"; sha256="1vjypf9d4rdprpgxfsgpccn412kvar59v341ridq2hcdp7hfb70s"; depends=[]; }; - tseries = derive2 { name="tseries"; version="0.10-47"; sha256="0yzvc9djp3angvxdxqi60wi726y76ablsb71q88ycvw0avgpf8r0"; depends=[quadprog quantmod zoo]; }; + tsensembler = derive2 { name="tsensembler"; version="0.1.0"; sha256="0amb3dn96hdgy5a0j6s43mf82cdjwbz8dhz3yrjlr07nknxzirzi"; depends=[Cubist doParallel earth foreach gbm glmnet kernlab monmlp pls ranger RcppRoll softImpute xgboost xts zoo]; }; + tseries = derive2 { name="tseries"; version="0.10-48"; sha256="0wa4rcf0igayi1yrwc6wak6d491560p0z89rz32haqlkiiq25gak"; depends=[quadprog quantmod zoo]; }; tseriesChaos = derive2 { name="tseriesChaos"; version="0.1-13.1"; sha256="0qfrrzd0h8n9zp7wj5fl88wkiv22fs5zy8x509g316j0avm5zjr3"; depends=[deSolve]; }; tseriesEntropy = derive2 { name="tseriesEntropy"; version="0.6-0"; sha256="04clfkpkiy5p5nxcq59c7f4v1llj1d95lvck23h1px50lvb993fv"; depends=[cubature ks]; }; tsfa = derive2 { name="tsfa"; version="2014.10-1"; sha256="0gkgl55v08dr288nf8r769f96qri7qbi5src7y6azrykb37nz6iz"; depends=[dse EvalEst GPArotation setRNG tfplot tframe]; }; tsfeatures = derive2 { name="tsfeatures"; version="1.0.2"; sha256="1zi7p7gdd9bg6rpdin88rq9qi43cpk663xmvffa7d5p1w45831kd"; depends=[forecast fracdiff furrr future purrr RcppRoll tibble tseries urca]; }; tsfgrnn = derive2 { name="tsfgrnn"; version="0.1.0"; sha256="1kx4q1a12yrngg1jps4jk2k5svnmsl1lhybb6ziypza20hmmzral"; depends=[ggplot2]; }; tsfknn = derive2 { name="tsfknn"; version="0.4.0"; sha256="1ji4y4khxzpk8k3m97p6j2li4khg17z9qzfgwjxijaxl4mwq54i2"; depends=[ggplot2 Rcpp]; }; - tsgui = derive2 { name="tsgui"; version="0.0.3"; sha256="16cx68gq2f63wx7mhbv0aq6pr71wfbc035kjbjjsfrbagaq4ib13"; depends=[RandomFieldsUtils tcltk2 tkrplot]; }; + tsgui = derive2 { name="tsgui"; version="0.2.1"; sha256="0crm2ripxpjaz1cqz9lkj3y9xj4ia0hlq4lvz1rff0wq6d5w79dn"; depends=[RandomFieldsUtils tcltk2 tkrplot]; }; tsiR = derive2 { name="tsiR"; version="0.4.2"; sha256="1yc9kcyj8yg7zsdkqsxkr7czv3i5gf2146z5h89qfqifrrzmjifa"; depends=[ggplot2 kernlab reshape2]; }; - tsibble = derive2 { name="tsibble"; version="0.9.2"; sha256="15bdhwzrppnq96jzj6lkn8jlrqwja6qvxznk5xkym3hillyi0jfh"; depends=[anytime dplyr ellipsis lifecycle lubridate purrr rlang tibble tidyselect vctrs]; }; + tsibble = derive2 { name="tsibble"; version="0.9.3"; sha256="065nnggd5m483pmn21pyyjbbgs2wdmzhrrq2bgnzv0ldlxkr2clj"; depends=[anytime dplyr ellipsis lifecycle lubridate purrr rlang tibble tidyselect vctrs]; }; tsibbledata = derive2 { name="tsibbledata"; version="0.2.0"; sha256="0lkpxhahyglh8h9pwwi57gqyqxirw4m1cr5cryxzs6gfsrx7dpbf"; depends=[tsibble]; }; + tsibbletalk = derive2 { name="tsibbletalk"; version="0.1.0"; sha256="14j1gpimvlz9cgxgl1n68ngkqx4w2ai92782ifrpvc57lqy9cs7v"; depends=[crosstalk dendextend dplyr glue lubridate plotly R6 rlang shiny tsibble vctrs]; }; tsintermittent = derive2 { name="tsintermittent"; version="1.9"; sha256="1mrb6yrsjwj6j40n97sgg42ddvwhjnaiq9k7ka249bbq01gf2975"; depends=[MAPA]; }; tsmp = derive2 { name="tsmp"; version="0.4.14"; sha256="1ahqdizygbs49xbgn35fdb5drxwyx2z9ima4fm83aqwaan7wrrja"; depends=[audio checkmate doSNOW foreach magrittr progress Rcpp RcppParallel RJSONIO]; }; tsna = derive2 { name="tsna"; version="0.3.1"; sha256="15dx5inmlk05asakjv3jzlycid307xjpy4x2h52phix69ghbb95v"; depends=[network networkDynamic statnet_common]; }; @@ -15505,6 +16183,7 @@ in with self; { tspmeta = derive2 { name="tspmeta"; version="1.2"; sha256="028jbbd0pwpbjq4r6jcc1h0p7c4djcb9d2mvgzw1rmpphaxjvrkd"; depends=[BBmisc checkmate fpc ggplot2 MASS splancs stringr TSP vegan]; }; tsqn = derive2 { name="tsqn"; version="1.0.0"; sha256="1iv1wwa6a9824dbgfk5a609szppc3a8j250z74hb8csjvwwx9qq9"; depends=[fracdiff MASS robustbase]; }; tsriadditive = derive2 { name="tsriadditive"; version="1.0.0"; sha256="1zk97vz5ag6j0r8w3b5kgl2cx628jmdy73spmwmsw7x5yc24901d"; depends=[survival]; }; + tsrobprep = derive2 { name="tsrobprep"; version="0.0.0.2"; sha256="1mk6km4n9s9fbc3xgla54fr7h76s8kpiwj1b6dsy8d4r63ix7xcb"; depends=[Matrix quantreg]; }; tstools = derive2 { name="tstools"; version="0.3.8"; sha256="0daxrp91hxc367hlzla0s7x5dddnx462239jcq0ickx6awkk753g"; depends=[data_table jsonlite xts zoo]; }; tsutils = derive2 { name="tsutils"; version="0.9.2"; sha256="0gp8f0a9dn3h4lv38xiw04j832igwhfralzc5vd74r952x7b6hbx"; depends=[forecast MAPA plotrix RColorBrewer]; }; tsviz = derive2 { name="tsviz"; version="0.1.0"; sha256="099ga750kr9hrkd8vaxhz6h4gha6zfr9jzqwrmgms2h2h1a7jxr7"; depends=[dplyr forecast ggplot2 lubridate magrittr miniUI plotly shiny shinyhelper]; }; @@ -15524,12 +16203,12 @@ in with self; { tuber = derive2 { name="tuber"; version="0.9.9"; sha256="1nnjwn3c0rr90jvkwlh9xs5vc2nl6qzjj958hbddfrkny0w88mnp"; depends=[dplyr httr jsonlite plyr purrr]; }; tubern = derive2 { name="tubern"; version="0.1.0"; sha256="0wpn4aig6r1kpncrgrqra4kr0f07rdq7z4p2k0h28f7kww6l52vv"; depends=[httr jsonlite]; }; tuckerR_mmgg = derive2 { name="tuckerR.mmgg"; version="1.5.1"; sha256="0lrylh0np0kbl4xx3gmlvid0g11fh0ad39wdwbz6hrmf5pzsjdjq"; depends=[]; }; - tufte = derive2 { name="tufte"; version="0.6"; sha256="1a0m5mii1hcr5w2jg3pv21c903042y96ippfqy4lsf0wsps77ywj"; depends=[htmltools knitr rmarkdown xfun]; }; + tufte = derive2 { name="tufte"; version="0.9"; sha256="0kylvxbw3wbb5p7f09wav20l8gxbpvkcd3k70dimnqhrfbzw05qd"; depends=[htmltools knitr rmarkdown xfun]; }; tufterhandout = derive2 { name="tufterhandout"; version="1.2.1"; sha256="04fvvbx69a28nk7i4wz5ynamz1yvsa2ibz542r1xaq1ikk0ywqbw"; depends=[knitr rmarkdown]; }; tukeytrend = derive2 { name="tukeytrend"; version="0.7"; sha256="15j7g0drb92rpxq7d0jl9h0hxpi9pbgpvfcxaicrcgypxap3721q"; depends=[lme4 Matrix mgcv multcomp nlme pbkrtest]; }; tumblR = derive2 { name="tumblR"; version="1.2"; sha256="1qili2c9wb6hpjjf7m0gyvdymzls5w4pghjkyi3sbp0q7ayhbh12"; depends=[httr RCurl RJSONIO stringr]; }; tumgr = derive2 { name="tumgr"; version="0.0.4"; sha256="1ylfmrsg177g75l2scjpgw6v4dpz62r7cy89pql9zd5zqy167xqj"; depends=[minpack_lm]; }; - tune = derive2 { name="tune"; version="0.1.1"; sha256="0293xkmv1nyvm72wxznnlm3qpf6475xzl2sf52mnrjxxr7i447p1"; depends=[cli crayon dials dplyr foreach ggplot2 glue GPfit hardhat lifecycle parsnip purrr recipes rlang rsample tibble tidyr vctrs workflows yardstick]; }; + tune = derive2 { name="tune"; version="0.1.2"; sha256="0ja7rjkjj88v3ngrc6izcz2qh9qv4s8abgcafmvx2ihgz99hds37"; depends=[cli dials dplyr foreach generics ggplot2 glue GPfit hardhat parsnip purrr recipes rlang rsample tibble tidyr vctrs workflows yardstick]; }; tuneR = derive2 { name="tuneR"; version="1.3.3"; sha256="0av978m4h2iqazyfq6n2cgkh4wpllihh7s29lah2nb8ngc0w5hxx"; depends=[signal]; }; tuneRanger = derive2 { name="tuneRanger"; version="0.5"; sha256="1xf78q8f7sq6w2jjwcw8vz88bmbp8yivydmqygjag58abnhd0356"; depends=[BBmisc DiceKriging lhs lubridate mlr mlrMBO ParamHelpers ranger smoof]; }; tuple = derive2 { name="tuple"; version="0.4-02"; sha256="0fm8fsdfiwknjpc20ivi5m5b19r9scdxhzij70l8qi3ixw1f0rnk"; depends=[]; }; @@ -15541,83 +16220,88 @@ in with self; { tvR = derive2 { name="tvR"; version="0.3.1"; sha256="056a241m3c1jhf8idly1bm4xja349cg5yzz19l45zyggml82snin"; depends=[Matrix Rcpp RcppArmadillo Rdpack]; }; tvReg = derive2 { name="tvReg"; version="0.5.3"; sha256="12ln2mkhxhp6i2x928cz2y7i1xsqrr3840rvp7k4c4skj2mrb898"; depends=[bvarsv MASS Matrix plm systemfit vars]; }; tvd = derive2 { name="tvd"; version="0.1.0"; sha256="07al7gpm81a16q5nppsyc5rhv6zzkcvw72isx955b1q189v073aw"; depends=[Rcpp]; }; + tvem = derive2 { name="tvem"; version="1.0-0"; sha256="128md4y65cvl6ks9g39w9d1jd2fyw1y6wx0c0cwx9sqhc3jssba9"; depends=[mgcv]; }; tvgeom = derive2 { name="tvgeom"; version="1.0.1"; sha256="1lr2vqgj5jfhzavwd43wcchhbicmf4dqjvyf66rvnjkw3jaig8dm"; depends=[]; }; tvm = derive2 { name="tvm"; version="0.4.0"; sha256="0v5b9s35q08a4z2ccph7g9q211w04x99sh72lrfby43fgl2jwyd1"; depends=[ggplot2 reshape2]; }; - tvthemes = derive2 { name="tvthemes"; version="1.1.0"; sha256="0bc9li8vgmm4r6dshm52ll2d69gcynv1xrv8n7jhbyn7xmx3q3kz"; depends=[extrafont ggplot2 glue magick scales]; }; + tvthemes = derive2 { name="tvthemes"; version="1.1.1"; sha256="0j24hhpjab1220bmspd6a0pa2295gpyyrcxs1rxjnsr5vgn90fcq"; depends=[extrafont ggplot2 glue magick scales]; }; twang = derive2 { name="twang"; version="1.6"; sha256="0d190420igm1ai3gv9fjqxw6z1g7zrc4q3yidkn083mj42asxn4v"; depends=[gbm lattice latticeExtra survey xtable]; }; tweedie = derive2 { name="tweedie"; version="2.3.2"; sha256="10fv998qjxsyx0h94fi0xbh6xbf24nwgh254n9zfnmix9vk2cqls"; depends=[]; }; tweenr = derive2 { name="tweenr"; version="1.0.1"; sha256="0sq90pbln6lkc2q3zflhkxxwpqdw5dd7igrxhdnlynkdrmi83mpg"; depends=[farver magrittr Rcpp rlang]; }; tweet2r = derive2 { name="tweet2r"; version="1.1"; sha256="1ivzc05af3fbdxn99lcphm74qs64lz8577zzi6r52r9xjpsqpqzi"; depends=[ggmap ggplot2 maptools plyr rgdal ROAuth RPostgreSQL RSQLite sp spacetime spatstat splancs streamR]; }; + twenty48 = derive2 { name="twenty48"; version="0.1.0"; sha256="1ydxy6rwlyjq1bb9clkcknwn89j1p064g6jdc7s7zl7rsxrll6v2"; depends=[crayon R6]; }; twfy = derive2 { name="twfy"; version="0.1.0"; sha256="14xxl9y8iagnn5jd06k6jyy4wk7crm64svz8h0zmzcvg47k8bwc7"; depends=[httr jsonlite]; }; twiddler = derive2 { name="twiddler"; version="0.5-0"; sha256="0r16nfk2afcw7w0j0n3g0sjs07dnafrp88abwcqg3jyvldp3kxnx"; depends=[]; }; twilio = derive2 { name="twilio"; version="0.1.0"; sha256="0b70vcc2bd5jpd2d82i2k828q90viah0b9abz2r627bbyxivpcnd"; depends=[httr jsonlite lubridate magrittr purrr]; }; twitteR = derive2 { name="twitteR"; version="1.1.9"; sha256="1hh055aqb8iddk9bdqw82r3df9rwjqsg5a0d2i0rs1bry8z4kzbr"; depends=[bit64 DBI httr rjson]; }; twitterwidget = derive2 { name="twitterwidget"; version="0.1.1"; sha256="1dlhydhy69284gg3jsxwa6h8cp1rlkg1j8h8z1fjz4fyy1p5xrpv"; depends=[htmlwidgets]; }; twl = derive2 { name="twl"; version="1.0"; sha256="0n2r40ddsr5zpzi92k7f0lvq78k5cmfbqzjxvr78hwq6j13dhar3"; depends=[corrplot data_table MCMCpack Rfast]; }; - twn = derive2 { name="twn"; version="0.1.0"; sha256="1mzd1563wq8j2kq1h3pgh04cgjg9lq3nn6zp3ka10aln012y0cxk"; depends=[crayon dplyr memoise rlang tibble]; }; + twn = derive2 { name="twn"; version="0.1.1"; sha256="13q8bw6r61zdaw60b9hnlahjand43vc7l868igikn0ny3pqz3plp"; depends=[crayon dplyr rlang tibble]; }; twosamples = derive2 { name="twosamples"; version="1.1.1"; sha256="0c2hk49zysjgkgm3pv9j1gnpg5hs5icdzn40ihyqj8aziynkripp"; depends=[Rcpp]; }; twostageTE = derive2 { name="twostageTE"; version="1.3"; sha256="0mkxs3lmzja51zdrf5himhwcdygpj6czhdd2bydakm26kvw7znwr"; depends=[isotone]; }; twoway = derive2 { name="twoway"; version="0.6.3"; sha256="02z2syb0g92d97gjxfkarpil9b2n25s128606h071jl0s88cr4ar"; depends=[]; }; + twowaytests = derive2 { name="twowaytests"; version="1.0"; sha256="1h8bypzfbv5ddam9zrqqb7abvv04n07hl459ippxbfk76qyp2rhg"; depends=[car ggplot2 nortest onewaytests]; }; + txshift = derive2 { name="txshift"; version="0.3.4"; sha256="19adi96xh35vlsfsg3m2lm4szwhdb1m38ja3agdzwgryzh6xgzyc"; depends=[assertthat data_table ggplot2 hal9001 haldensify latex2exp lspline mvtnorm Rdpack stringr tibble]; }; txtplot = derive2 { name="txtplot"; version="1.0-4"; sha256="00sriml48y70j18jz235dsfm5x3a81bnzskfp3hnv6cbjwwsmca4"; depends=[]; }; txtq = derive2 { name="txtq"; version="0.2.3"; sha256="03pa5mj5ijzvyzzjr9l84xrz4kdam4w90l7apgjwxgnag3p3c0p8"; depends=[base64url filelock R6]; }; types = derive2 { name="types"; version="1.0.0"; sha256="01shcin8wjbhbmzl979fj3008xqxssw90g3bjg42cnjxkmnaql59"; depends=[]; }; - tzupdater = derive2 { name="tzupdater"; version="0.1.1"; sha256="056ssg1hi5i4qypacpy1q08l8awn4hj34jfriwv6x97l7cssw3bx"; depends=[]; }; + tzupdater = derive2 { name="tzupdater"; version="0.1.2"; sha256="0s1simvn76m569iq24qb3w6xli0202cjf1jr3a4qy58fs4sda2kv"; depends=[]; }; uCAREChemSuiteCLI = derive2 { name="uCAREChemSuiteCLI"; version="0.2.0"; sha256="1nccgkxv57inhgvgmhwm4fr8cp28sj8n83za5gam9xx1f42mzsqk"; depends=[ChemmineR usethis]; }; uFTIR = derive2 { name="uFTIR"; version="0.1.2"; sha256="1ds2ip02f4jh2i0n9f22v4c62xr82cak69w7yjf1k014rzq1yp60"; depends=[raster Rcpp RcppArmadillo rgdal sp]; }; - uGMAR = derive2 { name="uGMAR"; version="3.2.5"; sha256="0dxi261qbnaqryqmbmja56wkj2h9nn5yk5pmz8axdyakbqgasfwp"; depends=[Brobdingnag pbapply]; }; + uGMAR = derive2 { name="uGMAR"; version="3.2.6"; sha256="09v6hijky5dbn9bam1gq5qi56wk4mv09jjyg0srf3jdjcq2d8w6w"; depends=[Brobdingnag pbapply]; }; uHMM = derive2 { name="uHMM"; version="1.0"; sha256="1516ipadxi7rc1dbinr5rva2fbcr5i2zg3rlli5wy7r6naf8fzzl"; depends=[chron class cluster clValid corrplot FactoMineR HMM tcltk2 tkrplot]; }; uaparserjs = derive2 { name="uaparserjs"; version="0.3.5"; sha256="0v24smgsz1p2wa23mc2llx7dycwmgf7zyxdhwxgwplabpmy3xzhl"; depends=[progress V8]; }; uavRmp = derive2 { name="uavRmp"; version="0.5.7"; sha256="04dv1a72b0v8lgdwl10n96953gfal6pmbbih45szdvk4zhks030j"; depends=[brew data_table exifr geosphere jsonlite link2GI log4r raster rgdal rgeos rlang rlist sf sp zoo]; }; - ubiquity = derive2 { name="ubiquity"; version="1.0.2"; sha256="1xlxiyzzhsaamwf42gv2h50rchapw81gkf1v08almd1s6ds4vpgf"; depends=[deSolve digest doParallel flextable foreach gdata ggplot2 gridExtra knitr MASS officer optimx PKNCA pso rhandsontable rmarkdown rstudioapi shiny stringr]; }; + ubiquity = derive2 { name="ubiquity"; version="1.0.3"; sha256="1k0l6ai8fgjqch1hic9nzmj8dnf91y83wfgw13q56r6lvnp3rhdi"; depends=[deSolve digest doParallel dplyr flextable foreach ggplot2 gridExtra knitr MASS officer optimx PKNCA pso readxl rhandsontable rmarkdown rstudioapi shiny stringr]; }; ucbthesis = derive2 { name="ucbthesis"; version="1.0"; sha256="0l855if3a7862lxlnkbx52qa617mby634sbb2gkprj21rwd7lcbp"; depends=[knitr stringr]; }; - uchardet = derive2 { name="uchardet"; version="1.0.6"; sha256="02ys3x5gc42c4c9acnxj7j54x1i7xr82341hp2jq5mn6q65gdnyi"; depends=[Rcpp]; }; + uchardet = derive2 { name="uchardet"; version="1.1.0"; sha256="1dnvi45npk7l7sqbv3c1mrg0m7vrrp7iya9kjndcg9x3h0iial9z"; depends=[]; }; uclust = derive2 { name="uclust"; version="0.2.0"; sha256="1hvyrkah0yfia5wwr42q6axja56qwnils84pg25znq39fjly6hjf"; depends=[dendextend robcor]; }; ucminf = derive2 { name="ucminf"; version="1.1-4"; sha256="01vggwg1w71k98qs6fhb0x1843vi322mf4g3hbclks94kcpkisx2"; depends=[]; }; udapi = derive2 { name="udapi"; version="0.1.3"; sha256="0qyn6fdh8ia913hn2dl0x99xsm20ps8zm52snswlyb00prinm668"; depends=[curl httr]; }; - udpipe = derive2 { name="udpipe"; version="0.8.3"; sha256="1ys4ss700h3xk4z72lsjavd6vic4ihm00b1mzidq41klrgpwzcb0"; depends=[data_table Matrix Rcpp]; }; + udpipe = derive2 { name="udpipe"; version="0.8.5"; sha256="021n28jncfiv7492dj1ik6ylkhb3s2hpgjpc0y2zv4cdnl362zcx"; depends=[data_table Matrix Rcpp]; }; udunits2 = derive2 { name="udunits2"; version="0.13"; sha256="0yav7rm2afcx67xqrknybxgz7x63w78zyxa0xifvc0k2gz0d6mfi"; depends=[]; }; - ufs = derive2 { name="ufs"; version="0.3.1"; sha256="079azpicvimjq7qw1790j5f0vq5jis67lv4r28x3390r9fh04m6l"; depends=[digest diptest dplyr GGally ggplot2 ggrepel ggridges gridExtra gtable knitr pander plyr scales SuppDists viridis]; }; + ufs = derive2 { name="ufs"; version="0.4.0"; sha256="07awbavaa07dph560q045hgimqwhs87a7bfqnlvgiqhbvjlb8wwm"; depends=[digest diptest dplyr ggplot2 ggrepel ggridges gridExtra gtable htmltools kableExtra knitr pander plyr rmdpartials scales SuppDists viridis]; }; ui = derive2 { name="ui"; version="0.1.1"; sha256="15hcdzaj75ip6j7yglx8rqhp4y3yf3aw5cpbjgk1mjr4cya7lvzi"; depends=[Matrix maxLik mvtnorm numDeriv]; }; uiucthemes = derive2 { name="uiucthemes"; version="0.3.1"; sha256="1faggg8hiqw4pblq5r3m9wi3x5m6kbjq0flf88mqa993v9rpdrf6"; depends=[rmarkdown xaringan]; }; ukbabynames = derive2 { name="ukbabynames"; version="0.1.1"; sha256="0vrwcf3hixd40ag6kb289anq2ys2k6vdhhsrjbizvndkyn8sr0r0"; depends=[]; }; ukbtools = derive2 { name="ukbtools"; version="0.11.3"; sha256="1j5p9ypn3s781582all64kvywih1ry0lqsh1zirr35g7r46fy783"; depends=[data_table doParallel dplyr foreach ggplot2 magrittr purrr readr scales stringr tibble tidyr XML]; }; - ukgasapi = derive2 { name="ukgasapi"; version="0.17"; sha256="1jly1bzisvvx8pcsw0fb35xxvjgq7ydpxianf3dbxa88msdjr02d"; depends=[RCurl XML]; }; + ukgasapi = derive2 { name="ukgasapi"; version="0.21"; sha256="1acl04bm8f2hgi26mpmzcwp44yv9zxarzw4r4k20b367k8g9rh8a"; depends=[httr XML]; }; uklr = derive2 { name="uklr"; version="1.0.1"; sha256="0pr0qyf8zr8z1hzv8wziw9wddajja5dggs9cc9dw91v0kq5g5ris"; depends=[curl httr jsonlite tibble]; }; ukpolice = derive2 { name="ukpolice"; version="0.2.2"; sha256="1dwwixhiarlpdss7rhiamzcsl1k2yphgmjzh7wn2my4vxj06817l"; depends=[httr jsonlite purrr snakecase tibble]; }; ulid = derive2 { name="ulid"; version="0.3.0"; sha256="0xxkqrnlz3pkb3s1gacfzqav54w97gc0w8rh0fn1qy5rkmg2bplv"; depends=[Rcpp]; }; - umap = derive2 { name="umap"; version="0.2.6.0"; sha256="0zajn2sk705sckljxl5vz4q2sxpsqim2grmjq2jwwc8ysr1h2s9f"; depends=[openssl Rcpp reticulate RSpectra]; }; + umap = derive2 { name="umap"; version="0.2.7.0"; sha256="191vpy84s0bar06y9z1qx43x2kc4qp7lmrcmd0cvz2pnzq722jab"; depends=[openssl Rcpp reticulate RSpectra]; }; ump = derive2 { name="ump"; version="0.5-8"; sha256="1sg226caq9y41cwl7wr5s9z3bpq2j5p6rj6fy2pasbzimgzw0byx"; depends=[]; }; - umx = derive2 { name="umx"; version="4.0.0"; sha256="171zk1ahwlk5arhqwl9kwif7l59w7a6hjlp08ywybvd43r8js9bg"; depends=[cowplot DiagrammeR ggplot2 knitr lavaan MASS Matrix MuMIn mvtnorm nlme OpenMx polycor R2HTML RCurl xtable]; }; + umx = derive2 { name="umx"; version="4.2.5"; sha256="0kr1csakxfk9jz55i1hw3vxck1h1xkbppvk33zdhx0szc10xpz1l"; depends=[cowplot DiagrammeR ggplot2 kableExtra knitr lavaan MASS Matrix MuMIn mvtnorm nlme OpenMx polycor R2HTML RCurl scales xtable]; }; unbalanced = derive2 { name="unbalanced"; version="2.0"; sha256="18hy9nnq42s1viij0a5i9wzrrfmmbf7y3yzjzymz2wnrx4f2pqwv"; depends=[doParallel FNN foreach mlr RANN]; }; unbalhaar = derive2 { name="unbalhaar"; version="2.0"; sha256="0v6bkin1cakwl9lmv49s0jnccl9d6vdslbi1a7kfvmr5dgy760hs"; depends=[]; }; uncertainty = derive2 { name="uncertainty"; version="0.2.0"; sha256="1mq14ny7l3gy3wjsqijnm37azavyapxszjnckd861h4hgcpdcdjz"; depends=[mvtnorm triangle]; }; uncmbb = derive2 { name="uncmbb"; version="0.2.1"; sha256="0ilbsl6hww613i6in9x4v8knx9vlv6hiycgl2879aiq456ghx91m"; depends=[dplyr rlang]; }; understandBPMN = derive2 { name="understandBPMN"; version="1.1.1"; sha256="04wnyxplrn5c6jb76dw25pawwcvvn5xq80lqn5imsf31nbwybpm5"; depends=[devtools dplyr purrr R_utils Rcpp tibble tidyr usethis XML]; }; unfoldr = derive2 { name="unfoldr"; version="0.7"; sha256="18qjsmlbqy9nhwyv288r9n3plv22fgb4g73jpyjyzy3hzfamcb17"; depends=[]; }; + unga = derive2 { name="unga"; version="0.1.0"; sha256="09ibmdaifzhb61nkjpgigr6mhp2d4gk00l0fyqwsz3njwy3sqw0f"; depends=[]; }; unglue = derive2 { name="unglue"; version="0.1.0"; sha256="0w8ld4xllx0lj1jz8i2sj92f8136hlwri1d8ldpg1ymxj7aw93vg"; depends=[]; }; - ungroup = derive2 { name="ungroup"; version="1.1.5"; sha256="0247mzicghdy2s41dsf1f2yx9j0j4qnahmh1bjaiwl4q1541k3l0"; depends=[MortalitySmooth pbapply Rcpp RcppEigen Rdpack rgl]; }; - unheadr = derive2 { name="unheadr"; version="0.2.1"; sha256="0pglf4sxq7f5rf1a87zz0nzjd4npdymazg4zpmmfiwc07lh8g7pr"; depends=[dplyr forcats magrittr readxl rlang stringr tibble tidyr tidyxl]; }; + unheadr = derive2 { name="unheadr"; version="0.3.0"; sha256="1wrrmxndlqzn18dnkwcm3bc4mmxminxag27wclhviscaycybhy43"; depends=[dplyr forcats magrittr readxl rlang stringr tibble tidyr tidyxl]; }; uniReg = derive2 { name="uniReg"; version="1.1"; sha256="0wjc7pgaisvk26j7grxp2ypsabb5my9wg6c9i5w9zhh5jdx1fdab"; depends=[DoseFinding MASS mvtnorm quadprog SEL]; }; uniah = derive2 { name="uniah"; version="1.0"; sha256="19zwy33gwa749i81mi9h05k8k3l4xbbln3k6q70fa7ic5lqbbdzj"; depends=[ahaz Iso survival]; }; unifDAG = derive2 { name="unifDAG"; version="1.0.3"; sha256="052qjrnj04imhj6i62k8jdx9rs8r70n0qrmd2z45x4fimn5py6j5"; depends=[gmp graph]; }; unifed = derive2 { name="unifed"; version="1.1.3"; sha256="0krxw4hy93a9qq78hwsc39rscbz6j8rr5qhplca0ska1xp36p09f"; depends=[]; }; uniformly = derive2 { name="uniformly"; version="0.1.0"; sha256="0n3s0x05v4d79jn51nwj06gm074rgy269f57y2q5z0bkwyp6yc7n"; depends=[pgnorm]; }; uniftest = derive2 { name="uniftest"; version="1.1"; sha256="0a37m7l3lc6rznx10w9h9krnn5paim2i2wvw47ckwag7bv0d4pm4"; depends=[orthopolynom]; }; - unikn = derive2 { name="unikn"; version="0.2.0"; sha256="1lw3wn93bb8y76phnqwhvgn14zrs68rq8xx9hl2wbngispvwpwn1"; depends=[ggplot2]; }; + unikn = derive2 { name="unikn"; version="0.3.0"; sha256="06pyabyjwdyzn4fh04jg4lafricl5877rwvf3fxdv0ldp6nymq8v"; depends=[ggplot2]; }; unine = derive2 { name="unine"; version="0.2.0"; sha256="051dk8fss19h4d9815a7994krr1s3n5q0pxq9gir6zns0vvn05pw"; depends=[Rcpp]; }; uniqtag = derive2 { name="uniqtag"; version="1.0"; sha256="025q71mzdv3n1jw1fa37bbw8116msnfzcia01p1864si04ch5358"; depends=[]; }; unisensR = derive2 { name="unisensR"; version="0.3.3"; sha256="1pqfb8i3rj64l9hh1bn9mm78wlfqphgrlp7zrydznqy88f4jwgvy"; depends=[hexView vroom XML]; }; unitedR = derive2 { name="unitedR"; version="0.4"; sha256="0h4i814awb8419693jz3x5cyhs2x6y5flmz339bg6ivmg13d9h3s"; depends=[plyr]; }; - unitizer = derive2 { name="unitizer"; version="1.4.10"; sha256="0xp6js2w0c0j0prahc7ndlhaiaw17n7r69k71v2r1cfkpmvm0ivf"; depends=[crayon diffobj]; }; + unitizer = derive2 { name="unitizer"; version="1.4.12"; sha256="0m8vyyr1gl33kvj20x0zvrr01qm1n5a2c2w6x58ndc3s2hsjlx3c"; depends=[crayon diffobj]; }; units = derive2 { name="units"; version="0.6-7"; sha256="1rdpbkiqcabz00fqzzs98v89v4cgvcd4pb00pwxzkq6vmwmscwrz"; depends=[Rcpp]; }; unittest = derive2 { name="unittest"; version="1.4-0"; sha256="1wyiikccnkw8fzrjrb2a80lw2xyiii4zb0hrbzfszy2bd6prqxx4"; depends=[]; }; univOutl = derive2 { name="univOutl"; version="0.2"; sha256="0rlc3w7cx2hfxacpjs9kmjzv5p8v9wxnlpxi3rh276wiy5zdr91v"; depends=[Hmisc robustbase]; }; unival = derive2 { name="unival"; version="1.0.2"; sha256="1sw0z7dmicmka3znrc1c5v0s9g8cpqapacdjzl5i4k5ak2qq35qp"; depends=[optimbase psych]; }; univariateML = derive2 { name="univariateML"; version="1.1.0"; sha256="1bnpb1g6hm8p3q73kyb4mxijzj53cfp38ns98bq12m9yvsjq1c4n"; depends=[actuar assertthat extraDistr fGarch logitnorm nakagami tibble]; }; - universals = derive2 { name="universals"; version="0.0.3"; sha256="0pf3hf3f46rj0h4054ha2cndwhcyv1zm52cmcqf95qy7r2kq8i5a"; depends=[]; }; - unix = derive2 { name="unix"; version="1.5.1"; sha256="0kb54lgzqnp1nwl8lw2531qj3858szsv7wz17g6lqxkfxsww5vv8"; depends=[]; }; + universals = derive2 { name="universals"; version="0.0.4"; sha256="1dx7xh5l2dkamskpwfc9qsjf7df1fj54ph6s3sxhnhdbppzckd4d"; depends=[]; }; + unix = derive2 { name="unix"; version="1.5.2"; sha256="0rilc0cslwnzl5fpx8zszxsf7wkd3s7c6yza3gysw8kxw0yp36qj"; depends=[]; }; unjoin = derive2 { name="unjoin"; version="0.1.0"; sha256="1hp9fxkb59z0cpnwxpaf5whglrljg2nrmsygdb98klxsama9gr5z"; depends=[dplyr rlang tibble]; }; unmarked = derive2 { name="unmarked"; version="1.0.1"; sha256="1r60rr2670fwnfsfx56ql0r26279nv5ziwrd90wflyaagbf9pfx3"; depends=[lattice MASS Matrix plyr raster Rcpp RcppArmadillo]; }; + unnest = derive2 { name="unnest"; version="0.0.2"; sha256="01cx2w68rgkkh927fipxj6r1cq5xxay1wif6m2a4q9nm970nysvx"; depends=[]; }; unpivotr = derive2 { name="unpivotr"; version="0.6.1"; sha256="1xh1m6f8gr37r14kbhnmb5a5dfammd4x9ci7p782b6r9ymnjq13p"; depends=[cellranger dplyr forcats magrittr pillar purrr rlang tibble tidyr tidyselect xml2]; }; unrepx = derive2 { name="unrepx"; version="1.0"; sha256="1dzvwpza60y9p7kz1f0bm20wid5jyxx9pma4w41az9shq5kkr0aj"; depends=[]; }; unrtf = derive2 { name="unrtf"; version="1.4"; sha256="0ri68vfhc0acizjsk62v4l1g6l773y955yhcbqgks0vbrk01yfxg"; depends=[sys]; }; @@ -15632,10 +16316,10 @@ in with self; { uptimeRobot = derive2 { name="uptimeRobot"; version="1.0.0"; sha256="1sbr0vs6jqcyxjbs7q45bsfdnp3bc59phw0h3fwajqq1cxjgzdww"; depends=[plyr RCurl rjson]; }; uqr = derive2 { name="uqr"; version="1.0.0"; sha256="0f7isjfb5almp1zypxzw3lfkygkcixmg0xdsw0zznf61r6qhbqyr"; depends=[gtools Hmisc]; }; urca = derive2 { name="urca"; version="1.3-0"; sha256="1akaqwf3fvvvx4sgfn641fd4sj51s0701pvfl6s5hnz2k0iwh732"; depends=[nlme]; }; - urlshorteneR = derive2 { name="urlshorteneR"; version="1.1.2"; sha256="1gxyc9a81lsn72x7c29lz6k9k5ylqd0j65yhy2qj8lslnmg869vz"; depends=[assertthat httr jsonlite lubridate stringr]; }; + urlshorteneR = derive2 { name="urlshorteneR"; version="1.4.3"; sha256="168y1mdxhn7lhhzmzw9a7h4g9xpwh294wl53aaqp23s486p46pdz"; depends=[assertthat cli clipr httr jsonlite lubridate miniUI shiny stringr]; }; urltools = derive2 { name="urltools"; version="1.7.3"; sha256="04x3my655dd287cbsszbnf75q0swmjlxxrblcsay7a8n3df3a830"; depends=[Rcpp triebeard]; }; - uroot = derive2 { name="uroot"; version="2.1-0"; sha256="1hhq7ns2pyiziwx6sx7sb6445p3nynv7l04rksjngai2vpdaj0iw"; depends=[]; }; - ursa = derive2 { name="ursa"; version="3.8.20"; sha256="1jsvmxk1jncyc480a2zbrhd6r8b3nkibsx474q7a9wbr09nq9mdi"; depends=[jpeg png rgdal]; }; + uroot = derive2 { name="uroot"; version="2.1-2"; sha256="0dsb1vdr2bwy64v889svhvkadg5jl9cl77mfiw79vl18b7ixjzxx"; depends=[]; }; + ursa = derive2 { name="ursa"; version="3.9.2"; sha256="0q6hnyw0gl6qipyi7s461w1i49akdvhi8ijyd8raxdizhcsqyxla"; depends=[jpeg png rgdal]; }; us_census_geoheader = derive2 { name="us.census.geoheader"; version="1.0.2"; sha256="17mss1ggaqkd0ac7g9chgqdrpi5xlbfkxsm1jvj48rp2jfwpp4jw"; depends=[tibble]; }; usa = derive2 { name="usa"; version="0.1.0"; sha256="0scdrd6b48n019f7qp77rrkqgmapnrknalq0hml1cy7m43llqf6d"; depends=[tibble]; }; usdampr = derive2 { name="usdampr"; version="1.0.0"; sha256="1kz4yaxhzpbyw1vjgfs4cps2s13w2m6fa0k81q8j89a3xl36wzhw"; depends=[dplyr httr jsonlite tidyr]; }; @@ -15644,14 +16328,15 @@ in with self; { usdm = derive2 { name="usdm"; version="1.1-18"; sha256="1sis47fri2lrbx2ll5ps7bvycjqhncnia800izf11szgayim5lrv"; depends=[raster sp]; }; usedist = derive2 { name="usedist"; version="0.4.0"; sha256="0ddf1zcalbrn293qmr9kdzz3x16fzc4k1bwb1pjmwnspisqfi8kj"; depends=[]; }; useful = derive2 { name="useful"; version="1.2.6"; sha256="0n50v1q75k518sq23id14jphwla35q4sasahrnrnllwrachl67v1"; depends=[assertthat dplyr ggplot2 magrittr Matrix plyr purrr scales]; }; - usefun = derive2 { name="usefun"; version="0.4.7"; sha256="0rklz4cdwgymis5ijlx9gzz01b9a35cg74clz42y1kbb86d8rcq4"; depends=[dplyr]; }; + usefun = derive2 { name="usefun"; version="0.4.8"; sha256="0jbwfr04y65rlc2aa6483w9qcdqa4bmcx76j4rp9fracfszjb1hg"; depends=[dplyr]; }; + usemodels = derive2 { name="usemodels"; version="0.1.0"; sha256="17cnjg7vw3f2jxkqlfvxh6kn891h49waf5k5a5vb4yaa2ay6nhp3"; depends=[cli dplyr purrr recipes rlang tidyr tune]; }; userfriendlyscience = derive2 { name="userfriendlyscience"; version="0.7.2"; sha256="17arxxha8qr876nrf9szpymgamxlvacj3lfbmpiv973kyi3hr7m4"; depends=[BiasedUrn car data_tree DiagrammeR digest diptest GGally ggplot2 ggrepel ggridges GPArotation gridExtra gtable knitr lavaan lme4 MASS MBESS minpack_lm pander plyr psych pwr RColorBrewer rio scales SCRT SuppDists ufs viridis XML xtable]; }; - usethis = derive2 { name="usethis"; version="1.6.1"; sha256="0vwxsnq615mwc706a4a71gyy0hmvnllbh249gzm7vl3ym5cr0cv0"; depends=[cli clipr crayon curl desc fs gh git2r glue purrr rematch2 rlang rprojroot rstudioapi whisker withr yaml]; }; + usethis = derive2 { name="usethis"; version="2.0.0"; sha256="0m4qnnkdiizsdvq33x502zwkn98hw2qcfm45cjj031vaydcjpai2"; depends=[cli clipr crayon curl desc fs gert gh glue jsonlite lifecycle purrr rappdirs rlang rprojroot rstudioapi whisker withr yaml]; }; usfertilizer = derive2 { name="usfertilizer"; version="0.1.5"; sha256="05zjn39hqjjzzp4v4b1zbqq59205s7k0kikms951h57kbyvjz6vk"; depends=[tidyverse]; }; ushr = derive2 { name="ushr"; version="0.2.3"; sha256="1ygyqgxw849165lpk81f114kgx9015b9a9dngavjy3ffqzrbb41k"; depends=[dplyr ggplot2 tidyr]; }; uskewFactors = derive2 { name="uskewFactors"; version="2.0"; sha256="0ndi5987ak8sa7krgiglsibfg0k7z9j8fg47hg1m8ar0sq4r1yj6"; depends=[MASS MCMCpack mvtnorm tmvtnorm]; }; usl = derive2 { name="usl"; version="3.0.0"; sha256="1ahry485kpzfc0pzi4zm039d5mpv1jycmhdpn0n0zn0drcrlhw0g"; depends=[nlsr]; }; - usmap = derive2 { name="usmap"; version="0.5.0"; sha256="0fjmmw8xhba31gv8mx9k55881yb94z518csbqas3bvssq5s7048f"; depends=[]; }; + usmap = derive2 { name="usmap"; version="0.5.1"; sha256="1vbariw50h1l2225101zzrvpn5n2ih4f06v8d3x5n98qrzv8xhyr"; depends=[]; }; ustyc = derive2 { name="ustyc"; version="1.0.0"; sha256="1267bng2dz3229cbbq47w22i2yq2ydpw26ngqa1nbi3ma6hwqsv4"; depends=[plyr XML]; }; utc = derive2 { name="utc"; version="0.1.5"; sha256="1lhm5rhr78cxp3cz5n6j2zkhjphj7csk026xvvhkjqdi39rrq6i4"; depends=[]; }; utf8 = derive2 { name="utf8"; version="1.1.4"; sha256="0m0ywg8k3blfiahxvh1i4zn9dksrlc937d2lbza5fc38zjnrrnpn"; depends=[]; }; @@ -15663,8 +16348,11 @@ in with self; { utilsIPEA = derive2 { name="utilsIPEA"; version="0.0.6"; sha256="07avc0j6qkzqmznbydn0zdg743g7g7kn2bcx5n03m3wg0fqyggr7"; depends=[data_table dplyr RCurl stringdist stringr]; }; utiml = derive2 { name="utiml"; version="0.1.6"; sha256="1djagxmsni685ps0nhbvwgncxj883qck0wfcwhrl5h714zq39a0j"; depends=[mldr ROCR]; }; uuid = derive2 { name="uuid"; version="0.1-4"; sha256="0gm9ii7ncvllxbvyk6srsiinjmqyj7lmh84w43x4nhqpvafj9q4q"; depends=[]; }; - uwot = derive2 { name="uwot"; version="0.1.8"; sha256="1jzh8r1h6f7pw7pb1fr32vn6ai9g10s56ahkq0vi77iznihy1rpd"; depends=[dqrng FNN irlba Matrix Rcpp RcppAnnoy RcppProgress RSpectra]; }; - vader = derive2 { name="vader"; version="0.1.1"; sha256="1fpz4mz5jvb46vfm3zaqrgxpi7r95wcmjlimm8zfqrblcmbva84r"; depends=[tm]; }; + uwo4419 = derive2 { name="uwo4419"; version="0.3.0"; sha256="0hk5qhyarjxz7ngj5ak37vx0rak6xv0hfb4sdrsbci3kv5fqijv7"; depends=[DescTools dplyr ggplot2 gmodels haven magrittr psych RColorBrewer rio tibble tidyr]; }; + uwot = derive2 { name="uwot"; version="0.1.10"; sha256="08vxh085wnrxgwy35ksb4cr7ccjvd98pyr2zlgarqryfgc1bdqbf"; depends=[dqrng FNN irlba Matrix Rcpp RcppAnnoy RcppProgress RSpectra]; }; + vICC = derive2 { name="vICC"; version="1.0.0"; sha256="13lcs7wwj1xfbjf3q7r8ssf00jg5hr1vjp2pyw0r42iz7mx47xjv"; depends=[coda ggplot2 nlme Rdpack rjags]; }; + vacuum = derive2 { name="vacuum"; version="0.1.0"; sha256="0cmlvlz83gyga05g71hrnq4kpck9flq0qlhjviqqz9zrmljzin0x"; depends=[dplyr magrittr]; }; + vader = derive2 { name="vader"; version="0.2.1"; sha256="1xjak5xlgpk0ds4l825kq90dg6kk5i5al5zmjqjqn8b7xdgix8mf"; depends=[tm]; }; vaersNDvax = derive2 { name="vaersNDvax"; version="1.0.4"; sha256="0hvw7vbxs87c9xkdv3617fkjwz2dbawscbd7dgaixhdhcr3k823a"; depends=[]; }; vaersvax = derive2 { name="vaersvax"; version="1.0.5"; sha256="0bfbpdjnykvb9r0p28bz8lrqxksy4jvwnd28y6gdlprpisiipiic"; depends=[]; }; vagalumeR = derive2 { name="vagalumeR"; version="0.1.6"; sha256="0zakpg5p9kif61d35as08f2dac3wncyvhpc83rqjp96g99wjf701"; depends=[dplyr httr jsonlite magrittr purrr stringr]; }; @@ -15672,13 +16360,13 @@ in with self; { valaddin = derive2 { name="valaddin"; version="1.0.0"; sha256="0dws2mcjpyw0jn0h6badhlnxg88c6mgzvcp2fjjrpr5mpcgps1c8"; depends=[lazyeval]; }; valection = derive2 { name="valection"; version="1.0.0"; sha256="0104zcg3cw57ksgmb321hnyv095mn3frxci9vikj1smwarpnrpzc"; depends=[testthat]; }; validann = derive2 { name="validann"; version="1.2.1"; sha256="00c0hkjiv8n7mksx6sknb4xkkivxr1ml31k697csv4imwrk09dy5"; depends=[moments]; }; - validate = derive2 { name="validate"; version="0.9.3"; sha256="0ckr4i75w503jxwghkmc7mi9b9z54gjipxl6limz4sry0py3lyl4"; depends=[settings yaml]; }; + validate = derive2 { name="validate"; version="1.0.1"; sha256="0x4ryrjlkbr776pam55a1j78qxw7djm9ly552ghsfcx7lqgcmgh4"; depends=[settings yaml]; }; validateRS = derive2 { name="validateRS"; version="1.0.0"; sha256="1ivw9ddr6z2wrsqvhbn87p5pikhkxlz8p45pb5nq13dvs359vkww"; depends=[data_table reshape2 triangle truncnorm]; }; validatetools = derive2 { name="validatetools"; version="0.5.0"; sha256="10wardp2c70zx5ii940sjql3xh5p3vqxv4ayyifhhlr8vzvr5cj0"; depends=[lpSolveAPI validate]; }; valorate = derive2 { name="valorate"; version="1.0-1"; sha256="06vczszpkipsxfs7h6ld33vvxb5ci62rwg3cglwy3lcfifhbnsfi"; depends=[survival]; }; valottery = derive2 { name="valottery"; version="0.0.1"; sha256="0rlv8agm9ng4jcb9ixqifh7kjczvkx7047brq8yf9kg7rb8mzgpz"; depends=[]; }; - valr = derive2 { name="valr"; version="0.6.1"; sha256="1qxw6h63i2vfb2w6q453zzwk0ypma3xdwwpj15i06669vzgyy3bb"; depends=[broom dplyr ggplot2 Rcpp readr rlang stringr tibble]; }; - valueEQ5D = derive2 { name="valueEQ5D"; version="0.5.2"; sha256="0k5jjia24xf9fpj6mfp9a1kh8lp9frqw6fp87wiixrxp0ggp088m"; depends=[rstudioapi testthat]; }; + valr = derive2 { name="valr"; version="0.6.2"; sha256="1vbp89zfylgih5acvw7lcx3a0dbbd7dhq7yhywr7kq02737qykdx"; depends=[broom dplyr ggplot2 Rcpp readr rlang stringr tibble]; }; + valueEQ5D = derive2 { name="valueEQ5D"; version="0.6.1"; sha256="1djsm30nfcz2si29yb44y5h8dlp5cxf61ippbrka5v8r56l9zpls"; depends=[rstudioapi testthat]; }; valuer = derive2 { name="valuer"; version="1.1.2"; sha256="0mbwzsvy34ppngyxdzpd9w1r4f00cik4maqab9kpiflrrv9xdp78"; depends=[ggplot2 orthopolynom R6 Rcpp RcppEigen timeDate yuima]; }; vamc = derive2 { name="vamc"; version="0.2.1"; sha256="04kkli4xzf3gzvs215lzch8bl877cdq3awh3mz1k321zhsa1d0jn"; depends=[Rdpack]; }; vampyr = derive2 { name="vampyr"; version="1.0.6"; sha256="1iqlb948wvwxf69588qz0hmc1fsmbqp058qbvrzx817w3mhjcs63"; depends=[corpcor EFA_MRFA fungible GPArotation lavaan moments optimbase PCovR psych semPlot]; }; @@ -15695,47 +16383,50 @@ in with self; { varbvs = derive2 { name="varbvs"; version="2.5-16"; sha256="0pji7vqpbih01y7n0q6zpxhfszznzig4z3hmmpr4jqpdplv13x8d"; depends=[lattice latticeExtra Matrix nor1mix Rcpp]; }; varclust = derive2 { name="varclust"; version="0.9.4"; sha256="0knmfq3pn38j8p29j6sqapdv3g5335si3gwiw932ml5z49a8ga5m"; depends=[doParallel doRNG foreach pesel RcppEigen]; }; vardiag = derive2 { name="vardiag"; version="0.2-1"; sha256="07i0wv84sw035bpjil3cfw69fdgbcf2j8wq4k22narkrz83iyi2z"; depends=[]; }; - vardpoor = derive2 { name="vardpoor"; version="0.20.0"; sha256="0yrbgfcv2j05g60ywsx4p963vjnf87079x4714q35sx8sacy6f7g"; depends=[data_table foreach laeken MASS stringr surveyplanning]; }; + vardpoor = derive2 { name="vardpoor"; version="0.20.1"; sha256="0jqls76xhhxc5hppy3pq5wkj9gjx3g3pzfbhnis7k10ysn76a1qj"; depends=[data_table foreach laeken MASS stringr surveyplanning]; }; varhandle = derive2 { name="varhandle"; version="2.0.5"; sha256="1l42d0s6fbjjc9l28a2m3myxkrx2c0p0b9yj8wjjjgilw19yc3lv"; depends=[]; }; + variability = derive2 { name="variability"; version="0.1.0"; sha256="1nwb6jlkgzmnhkfcfww3gci5p9g21wwg4z78n8xiq6r760byaz67"; depends=[]; }; variables = derive2 { name="variables"; version="1.0-3"; sha256="1x4w6pqrl6lw5dalii7kiq5f7jbfj1mlwdq2f6bvyfpx8byrvkqc"; depends=[]; }; varian = derive2 { name="varian"; version="0.2.2"; sha256="0jyw46qx2w19h02mrwv3w3n8qc1n4b3ckm38qly1y4a4w9ib6c2i"; depends=[Formula ggplot2 gridExtra MASS rstan]; }; variantspark = derive2 { name="variantspark"; version="0.1.1"; sha256="13hkp6l64hi7xlll09gin7kdlkqrkn0lggrw8147zy9ivhknhk59"; depends=[sparklyr]; }; variosig = derive2 { name="variosig"; version="0.3-1"; sha256="09cxigii0sj78yqd18p4mm9jjqvd1k2cgjy43pxpmqdhia0q2pmv"; depends=[gstat sp testthat]; }; + varitas = derive2 { name="varitas"; version="0.0.2"; sha256="16y0fcisdf4pypwqshy9c45v57axa25k8cpp1pr2ij95zycs3g1k"; depends=[assertthat doParallel dplyr foreach magrittr openxlsx stringr tidyr VennDiagram yaml]; }; varjmcm = derive2 { name="varjmcm"; version="0.1.1"; sha256="1xgy3n57pxhv6wrsw9h4dranxbw6hdpm1f9ra3kwlzrpz5c3289x"; depends=[expm jmcm MASS Matrix]; }; varrank = derive2 { name="varrank"; version="0.3"; sha256="0k7hz61ymxf7w2hh1v2yfb6qdjn68a8ckjfiw0jqqhjx4wh5crn7"; depends=[FNN]; }; vars = derive2 { name="vars"; version="1.5-3"; sha256="0zc6v827ll19n088n31afgjf65zqwvyzmmj4q3ab1xhqzxfsgbw6"; depends=[lmtest MASS sandwich strucchange urca]; }; varsExplore = derive2 { name="varsExplore"; version="0.3.0"; sha256="0d18wqq7fbs5ljdphsdgqmv8ab0wrzzykjhf4lqksi7n78s1fa2r"; depends=[dplyr DT glue magrittr purrr rio rstudioapi stringr tidyr]; }; varycoef = derive2 { name="varycoef"; version="0.2.12"; sha256="16wadla399zjbl8khvvwm60mrg6b0wixlmq6hanvyvaarw4zwa8d"; depends=[optimParallel RandomFields sp spam]; }; + vasicek = derive2 { name="vasicek"; version="0.0.3"; sha256="04g5dfn8zlm8n8sxmdq9xgkf0qbvvznqx27nyan268s5wlnnabd6"; depends=[mvtnorm]; }; vaultr = derive2 { name="vaultr"; version="1.0.2"; sha256="1b7g0jplp5dw1img7d6wm75gaycb3z8a8mzc6s0iwvhbfl8vf574"; depends=[getPass httr jsonlite R6]; }; vbdm = derive2 { name="vbdm"; version="0.0.4"; sha256="1rbff0whhbfcf6q5wpr3ws1n4n2kcr79yifcni12vxg69a3v6dd3"; depends=[]; }; vbsr = derive2 { name="vbsr"; version="0.0.5"; sha256="1avskbxxyinjjdga4rnghcfvd4sypv4m39ysfaij5avvmi89bx3b"; depends=[]; }; - vcd = derive2 { name="vcd"; version="1.4-7"; sha256="16aj688nhlcvdxzfsqh4s375v8f8vl8997dl8h1xg29b42nv52gc"; depends=[colorspace lmtest MASS]; }; + vcd = derive2 { name="vcd"; version="1.4-8"; sha256="030yyhpzsj4ivwrla7p9kgvmyjh6b8fr7czf678ykxjj64ccnvr3"; depends=[colorspace lmtest MASS]; }; vcdExtra = derive2 { name="vcdExtra"; version="0.7-1"; sha256="163x9hhvhgdmrqbcig7b120lk63svy0y652scbrcb11f85zrgb0c"; depends=[ca gnm MASS vcd]; }; + vcfR = derive2 { name="vcfR"; version="1.12.0"; sha256="0lhxb3ac4fafwik9q3cds46svzf0hyca8k54chw3dpk50c0zz1yx"; depends=[ape dplyr magrittr memuse pinfsc50 Rcpp stringr tibble vegan viridisLite]; }; vcov = derive2 { name="vcov"; version="0.0.1"; sha256="1w89mr8dk6436bxap28rszajgm9k7sjfqsr1i4p68dlhw8zk4yq1"; depends=[]; }; - vcpen = derive2 { name="vcpen"; version="1.7"; sha256="10z3zcz1g0csjdp072r48rkn4c9hpnb341xdljv5038z2nbx18fy"; depends=[knitr Rcpp RcppArmadillo]; }; - vcr = derive2 { name="vcr"; version="0.5.4"; sha256="1wilihibpvy9pvf50wi9r5sh1lfdz9ddfxxslcl3lz7g2b0hyxkv"; depends=[base64enc crul httr lazyeval R6 urltools webmockr yaml]; }; - vcrpart = derive2 { name="vcrpart"; version="1.0-3"; sha256="10898qp3sh2cjcfz4ac2q98f3z2wmwd3zvhhcdlxw7xy5a1x8gib"; depends=[formula_tools nlme numDeriv partykit rpart sandwich strucchange ucminf zoo]; }; - vctrs = derive2 { name="vctrs"; version="0.3.2"; sha256="05s8v3ms4jaim44c7m4y0dnv8mysj9b26cdfyrfgcjpllayrjib2"; depends=[digest ellipsis glue rlang]; }; - vcvComp = derive2 { name="vcvComp"; version="1.0.1"; sha256="1103hjzd29f8gpsfbagdryq52m6fkhhh9dbqhbmhixxlimc7sd03"; depends=[]; }; + vcpen = derive2 { name="vcpen"; version="1.8"; sha256="0ccbk9mki8lsxc6y327rg3yg0fbhlx44xkcv8jaxahhsg4dp8krd"; depends=[knitr Rcpp RcppArmadillo]; }; + vcr = derive2 { name="vcr"; version="0.6.0"; sha256="0gp9wxi8zmwixiq8agzhba3abmb7a8zyy2plpavn34pp6cnka0f7"; depends=[base64enc cpp11 crul httr R6 urltools webmockr yaml]; }; + vctrs = derive2 { name="vctrs"; version="0.3.6"; sha256="09ddxgzyah7lw42hn6n8fynsixf43s10jamsf94d2aidky63czfz"; depends=[digest ellipsis glue rlang]; }; + vcvComp = derive2 { name="vcvComp"; version="1.0.2"; sha256="0mip0v8gv358aadc3b4913dcz27kscx3dv15nwns20pan5jvyhv2"; depends=[]; }; vdar = derive2 { name="vdar"; version="0.1.3"; sha256="1nji97rcxp4v8pypx3z1265v85rb0yhw47i9cvacqmfxwk3hgpxj"; depends=[compositions]; }; - vdg = derive2 { name="vdg"; version="1.2.0"; sha256="1hi5d14nh9q784sbdk018awrawh9f1aix0wl26x7n0xb4707rcmy"; depends=[ggplot2 gridExtra proxy quantreg]; }; - vdiffr = derive2 { name="vdiffr"; version="0.3.2.2"; sha256="0yz6dcbvhh9n87b4a3nm085hf2xa4dqnch7liq5468dgldzjmg53"; depends=[BH devtools diffobj fontquiver freetypeharfbuzz gdtools glue htmltools htmlwidgets purrr R6 Rcpp rlang shiny testthat usethis xml2]; }; + vdg = derive2 { name="vdg"; version="1.2.1"; sha256="1jxqwg7k8ibzzdx8axhn2dx27j60qj0dlmczbfalll841ggigb45"; depends=[ggplot2 gridExtra proxy quantreg]; }; + vdiffr = derive2 { name="vdiffr"; version="0.3.3"; sha256="0i0xdr8dakbkkgrhp0zvlnv3rxhc8h5naqq416mr5zv9q8i4p8jc"; depends=[BH devtools diffobj fontquiver freetypeharfbuzz gdtools glue htmltools htmlwidgets purrr R6 Rcpp rlang shiny testthat usethis xml2]; }; vec2dtransf = derive2 { name="vec2dtransf"; version="1.1"; sha256="029xynay9f9rn0syphh2rhd3szv50ib4r0h0xfhhvbbb37h5dc9s"; depends=[sp]; }; veccompare = derive2 { name="veccompare"; version="0.1.0"; sha256="03nyyxvhhwfxxg5w6qflk7q234ipbhj9fd4abcp50sxz3diabch1"; depends=[corrplot gtools pander purrr qgraph reshape2 VennDiagram]; }; vecsets = derive2 { name="vecsets"; version="1.2.1"; sha256="086af6swjpbkd140yvb76affy5gn4p9xm41m3akm8axc3qk0hybg"; depends=[]; }; - vectools = derive2 { name="vectools"; version="0.1.1"; sha256="0aysld5pzs6z073zc3cli5xzv4w1kp6b06qi57gacz7g24pjrjl4"; depends=[]; }; + vectools = derive2 { name="vectools"; version="0.2.0"; sha256="005cgndfdzaglr02avmn2cgf3zrwxfkb280di738icriihn1nvg2"; depends=[]; }; vegalite = derive2 { name="vegalite"; version="0.6.1"; sha256="0dlzhvrg3nj6knyycdgg3d1vzq3dn9vxb34fjin9hzilszqmarbk"; depends=[base64 clipr digest htmltools htmlwidgets jsonlite magrittr webshot]; }; - vegan = derive2 { name="vegan"; version="2.5-6"; sha256="0g60rgn1i7wqf9pf5m1yki1m45gcp7i5hmjic0ci0f6vng70mh5k"; depends=[cluster lattice MASS mgcv permute]; }; + vegan = derive2 { name="vegan"; version="2.5-7"; sha256="0aj6m9l1vkh32sar6fyvq4p8j4h2f2f347w1300qnzgaa5lmhfz6"; depends=[cluster lattice MASS mgcv permute]; }; vegan3d = derive2 { name="vegan3d"; version="1.1-2"; sha256="01yyhrapdvs6rr5hw1ij4jnpz7mq005s35pn96snpy8ngn6ir386"; depends=[cluster rgl scatterplot3d vegan]; }; vegawidget = derive2 { name="vegawidget"; version="0.3.1"; sha256="154k5n3vg1fdjx6mbrlxvi9h17h651aqwr12wiknwmw0ikhcrnh0"; depends=[assertthat glue htmltools htmlwidgets jsonlite magrittr rlang]; }; vegclust = derive2 { name="vegclust"; version="1.7.7"; sha256="0f81jw429ib601lvbzi4q23kb5n6lvavlgw56wfqdmvvkl68vwlc"; depends=[circular Kendall MASS Rcpp sp vegan]; }; vegdata = derive2 { name="vegdata"; version="0.9.8"; sha256="05sgmas7hlhxx2j95b4r5y2m6hhxa2cswy80bhs8lmjmy3yqyig6"; depends=[foreign plyr xml2]; }; vegetarian = derive2 { name="vegetarian"; version="1.2"; sha256="15ys1m8p3067dfsjwz6ds837n6rqd19my23yj8vw78xli3qmn445"; depends=[]; }; - vegperiod = derive2 { name="vegperiod"; version="0.2.7"; sha256="0gvfgxg5dfx20h5fqvxxxk12imyn52p6p51wvkvbjnh7fwf7il7k"; depends=[]; }; + vegperiod = derive2 { name="vegperiod"; version="0.3.0"; sha256="06s53k99f6by39bi1lvi0y5jqbf5b364rri102d3qnzd2mq81ahs"; depends=[]; }; vegtable = derive2 { name="vegtable"; version="0.1.6"; sha256="04bil2v9krylnak9vbl4fahv75ca695a4sb4y82f99qlylzbdqm0"; depends=[foreign plotKML qdapRegex sp stringi taxlist vegdata]; }; - vein = derive2 { name="vein"; version="0.8.9"; sha256="1rrv4rayrx3y2y37mlacl9q3b63wbcnak3m7sbasp6bpjxhg57ag"; depends=[data_table sf units]; }; + vein = derive2 { name="vein"; version="0.9.0.1"; sha256="1al4bj6n7kramrvzyylqpz2xg93lanvkjv4cya4zqaq7f6v8w65w"; depends=[data_table sf units]; }; velociraptr = derive2 { name="velociraptr"; version="1.1.0"; sha256="0a67vmv05cxc9f27aqzr6nkgy2mj3fhykwj5nb23qwfqa669a5hi"; depends=[sf]; }; - vembedr = derive2 { name="vembedr"; version="0.1.3"; sha256="0zg6j0g9l7j36ifwabhxrin5z0dics66bqkc7x6rqijmizk1xpba"; depends=[htmltools httr magrittr stringr]; }; + vembedr = derive2 { name="vembedr"; version="0.1.4"; sha256="1dgzl67z0mjvd4l53zvqmcqfim6g7nrfmbh709a30f3nghkx059k"; depends=[assertthat glue htmltools httr magrittr rlang stringr]; }; venn = derive2 { name="venn"; version="1.9"; sha256="0d2vwjc932q8n9hww8krj7nixg1dfkmcw1k1cry2d0xdvbbnrj8r"; depends=[admisc]; }; vennLasso = derive2 { name="vennLasso"; version="0.1.6"; sha256="0maydvx0qhdn5alqzqxjn485y9hw9qdr1xvgkmgwnjq59vni6d31"; depends=[foreach igraph MASS Matrix Rcpp RcppEigen RcppNumerical survival VennDiagram visNetwork]; }; venneuler = derive2 { name="venneuler"; version="1.1-0"; sha256="10fviqv9vr7zkmqm6iy2l9bjxglf2ljb7sx423vi4s9vffcxjp17"; depends=[rJava]; }; @@ -15745,8 +16436,9 @@ in with self; { vertexenum = derive2 { name="vertexenum"; version="1.0.2"; sha256="16ywz3z1kzhb3knhhi2i5igm3djdaaxyyrw69wkc5saa7ayhdb4y"; depends=[numbers]; }; vesselr = derive2 { name="vesselr"; version="0.2.1"; sha256="1wzprnpiv04gxhqgki36gp1a0xj9l3mchllphwkfsdja4axq3prk"; depends=[oro_nifti pbapply pbmcapply]; }; vetools = derive2 { name="vetools"; version="1.3-28"; sha256="1470xgqdq9n5kj86gdfds15k3vqidk3h99zi3g76hhyfl8gyl1c0"; depends=[lubridate maptools plyr scales sp stringr tis xts]; }; - vetr = derive2 { name="vetr"; version="0.2.10"; sha256="0zfnfi29gkgy1yvwz1zdszxbb7mc5yrzqcic1s7wr76d67mdqzh3"; depends=[]; }; + vetr = derive2 { name="vetr"; version="0.2.12"; sha256="11xd8p945brj32lscfamvhc926rdx2jg9n2v5y4n0wdls8m3ljdl"; depends=[]; }; vfcp = derive2 { name="vfcp"; version="1.4.0"; sha256="0zj1ihqdx5x1695al1xyi8k001yw8x7gdss72myxlnh7b4flnp9m"; depends=[copula extraDistr stringr]; }; + vfinputs = derive2 { name="vfinputs"; version="0.1.0"; sha256="10fh6ybsqy9xm7gwl0kska0pgk810sgq9kvf86gmnm0pmrcqzsdh"; depends=[htmltools jsonlite scales shiny]; }; vfprogression = derive2 { name="vfprogression"; version="0.7.1"; sha256="0kgw1jx0rl9v8qy8qg7zjzdgvwqdi7k1lsvsx3lnpw4sfpkzsq23"; depends=[]; }; vhcub = derive2 { name="vhcub"; version="1.0.0"; sha256="04a8hdm4pxl8fzwy9q2wqc9q0dl5r49xwbid70yj9qlflh683id0"; depends=[Biostrings coRdon ggplot2 seqinr stringr]; }; vhica = derive2 { name="vhica"; version="0.2.7"; sha256="0zz4sffhrvh9raxygxma5a2jijq8nw8wqg8bc486sd2ahlv8g3s8"; depends=[]; }; @@ -15755,13 +16447,14 @@ in with self; { vietnamcode = derive2 { name="vietnamcode"; version="0.1.1"; sha256="0vc0c1fg30afar2dkch5h27b8jbglcd9ja6d5hcypnibqz4c68vz"; depends=[]; }; viewshed3d = derive2 { name="viewshed3d"; version="3.2.0"; sha256="1qs597wivvzkdlls9r2hm6rprm3ssvk81my2nj7acczdh07fxmsv"; depends=[data_table lidR nabor pracma raster rgl sp viridis]; }; vimp = derive2 { name="vimp"; version="2.1.0"; sha256="16dhvr1vcm5yca8rsscivdnk9yv9nhhfi1nbkal4gf3dy46anzb5"; depends=[dplyr magrittr MASS rlang ROCR SuperLearner tibble]; }; - vinereg = derive2 { name="vinereg"; version="0.7.0"; sha256="1fviqzs879n7rin3b0jks8dfvcxiay8jssqy7salslghpj7rkm84"; depends=[assertthat BH kde1d Rcpp RcppEigen RcppThread rvinecopulib wdm]; }; + vindecodr = derive2 { name="vindecodr"; version="0.1.1"; sha256="0yvchdf90l8lkzyba5wrpma6vjcgf19li159s8s79y8sgp5pyx7p"; depends=[httr]; }; + vinereg = derive2 { name="vinereg"; version="0.7.2"; sha256="00w4j20rcwvkvpnhqjhwfqdnxij4zgmfrjj191hagdg51bmczgvd"; depends=[assertthat BH kde1d Rcpp RcppEigen RcppThread rvinecopulib wdm]; }; vines = derive2 { name="vines"; version="1.1.5"; sha256="057d2fdh03cq9kh4vz94arqscahmz14xbr2g59l0vn205lnyilf1"; depends=[ADGofTest copula cubature TSP]; }; violinmplot = derive2 { name="violinmplot"; version="0.2.1"; sha256="1j3hb03y988xa704kp25v1z1pmpxw5k1502zfqjaf8cy4lr3kzsc"; depends=[lattice]; }; violinplotter = derive2 { name="violinplotter"; version="1.0.1"; sha256="16kcz99w9avx99y5cnc5rn3dx367v1fmc8mlavjvfp8sy7m9x3lp"; depends=[]; }; vioplot = derive2 { name="vioplot"; version="0.3.5"; sha256="0aiy615kn9lpr2cs757g3pklg81n01yhqh0wrwv111fn3cy86r0v"; depends=[sm zoo]; }; viopoints = derive2 { name="viopoints"; version="0.2-1"; sha256="0cpbkkzm1rxch8gnvlmmzy8g521f5ang3nhlcnin419gha0w6avf"; depends=[]; }; - vip = derive2 { name="vip"; version="0.2.2"; sha256="14wvadkpzismszqc4qi15jaky1qlf1l4g33cbvpnzdqxmhi61x4g"; depends=[ggplot2 gridExtra magrittr plyr tibble]; }; + vip = derive2 { name="vip"; version="0.3.2"; sha256="1qsvyfms79sn46jdmq7q5r0d6gwjqhr9pll1y776rx0bj7vx1ax5"; depends=[ggplot2 gridExtra magrittr plyr tibble]; }; vipor = derive2 { name="vipor"; version="0.4.5"; sha256="112gc0d7f8iavgf56pnzfxb7hy75yhd0zlyjzshdcfbnqcd2a6bx"; depends=[]; }; viridis = derive2 { name="viridis"; version="0.5.1"; sha256="060rf1jn29dq53y3nhb0hykvcap6rqsk04rq544ypiiqb18ngwnx"; depends=[ggplot2 gridExtra viridisLite]; }; viridisLite = derive2 { name="viridisLite"; version="0.3.0"; sha256="1by2l05f0yabwvv64lhnv7bbhx0w683s3wr9j2xda920ghpa23kq"; depends=[]; }; @@ -15769,9 +16462,11 @@ in with self; { virtualNicheR = derive2 { name="virtualNicheR"; version="1.0"; sha256="1ya1nd30vm7kjc4468ra8fjyxdwq2i1l1lmajhqjvw0nsj0mh1bl"; depends=[devtools diptest]; }; virtualPollen = derive2 { name="virtualPollen"; version="1.0.0"; sha256="16q1smwh3ryids3pa7lb4i4pxmjjyl449w6fikkrm9ybj1k8gfcf"; depends=[cowplot ggplot2 mgcv plyr tidyr viridis]; }; virtualspecies = derive2 { name="virtualspecies"; version="1.5.1"; sha256="0l86awcjq6i1lqax596xy5qfmzwiz3cwp2rczvgg37fdrym97cm3"; depends=[ade4 raster rworldmap sp]; }; + virtuoso = derive2 { name="virtuoso"; version="0.1.5"; sha256="188z5n4sxpda4slszvzmf62jc60bx3viyrqafii2fg02hqavgfpr"; depends=[curl DBI digest fs ini odbc processx ps rappdirs]; }; virustotal = derive2 { name="virustotal"; version="0.2.1"; sha256="0lky75al8zcvmfgx7a2s3bij8ya4avdsnv046lk7564zfd8rbymw"; depends=[httr plyr]; }; visNetwork = derive2 { name="visNetwork"; version="2.0.9"; sha256="0854r9znpjd9iy6j5bgrn20vj13dhp606gs3b6iy0rhym71ks2sy"; depends=[htmltools htmlwidgets jsonlite magrittr]; }; visTree = derive2 { name="visTree"; version="0.8.1"; sha256="1l07zfr2hagjpdxfw5290wa3ki4bl7iqxrrhda0d1bp3wmwfz0ai"; depends=[colorspace partykit rpart]; }; + viscomplexr = derive2 { name="viscomplexr"; version="1.1.0"; sha256="0r1lhvpbckcbfj60i7l4kflvhxdbimkany7y1ranj4h2pl79vx9x"; depends=[doParallel foreach plotrix Rcpp Rdpack scales]; }; visdat = derive2 { name="visdat"; version="0.5.3"; sha256="1ikqp29nncbw1xlwyb9dqqgcdk9q0bs3wxhnhnjpb11vcjv7cz2j"; depends=[dplyr ggplot2 glue magrittr purrr readr tibble tidyr]; }; visit = derive2 { name="visit"; version="2.1"; sha256="0kkspih7m18g5pqlwrxpgjdwqxpp23c3xyvcnvv247abl9aq81rd"; depends=[BH Rcpp RcppEigen rstan sqldf StanHeaders]; }; visreg = derive2 { name="visreg"; version="2.7.0"; sha256="070yhyxxh3w16i54k790n47bgcjn4b10b6g1z553x6afjc3l3a6d"; depends=[lattice]; }; @@ -15779,44 +16474,45 @@ in with self; { vistributions = derive2 { name="vistributions"; version="0.1.1"; sha256="1s68dpcy55v6yw7ivh2xpshz6qc0qaifjd15h7rjg3zl1cx81mh3"; depends=[ggplot2 magrittr shiny]; }; visualFields = derive2 { name="visualFields"; version="0.6"; sha256="1w6wkyzjakj6ss9nv4gzkgva4m21jbsz10c2jy660bjb25rf59ih"; depends=[deldir flip gtools Hmisc matrixStats spatstat]; }; visualize = derive2 { name="visualize"; version="4.4.0"; sha256="1k3jpvj1yysxc4g1a1w3m1y91104aqxqv8jh9qdd23gwy7a29525"; depends=[]; }; - visvow = derive2 { name="visvow"; version="0.9.0"; sha256="0vpigwjk11z5zg2vlajyddmg9dv31qhnihldb2d0xji0mba8s2sm"; depends=[Cairo DT formattable ggdendro ggplot2 ggrepel MASS PBSmapping plot3D plyr pracma psych Rdpack readxl Rtsne shiny shinyBS splitstackshape svglite tidyr WriteXLS]; }; + visualpred = derive2 { name="visualpred"; version="0.1.0"; sha256="19jq9h9kiv4vbzqz8zrv5gqb1bprq5jy7mcxvdwpfnna2rja6q4z"; depends=[data_table dplyr e1071 FactoMineR gbm ggplot2 ggrepel magrittr MASS MBA mltools nnet pROC randomForest]; }; + visvow = derive2 { name="visvow"; version="1.1.0"; sha256="1xrwa009v1chzp338jbcyf9bdlf3s1i829qj8zpshybwl0xz6gj1"; depends=[Cairo DT formattable ggdendro ggplot2 ggrepel MASS PBSmapping plot3D plyr pracma psych Rdpack readxl Rtsne shiny shinyBS splitstackshape svglite tidyr WriteXLS]; }; vita = derive2 { name="vita"; version="1.0.0"; sha256="114p2lzcr8rn68f0z4kmjdnragqlmi18axda9ma4sbqh8mrmjs9v"; depends=[randomForest Rcpp]; }; - vitae = derive2 { name="vitae"; version="0.2.2"; sha256="1flcrwww47w02rcaw7h1wi9dmdnvcw3zsiyvqp5mz9qz7ks3r0vx"; depends=[bookdown dplyr glue knitr RefManageR rlang rmarkdown xfun]; }; + vitae = derive2 { name="vitae"; version="0.3.0"; sha256="0z5frvhsf7mgj3pr25jk4w0jnlgry06359ammikdq20lwmcjvx5n"; depends=[dplyr glue knitr pillar rlang rmarkdown tibble vctrs xfun yaml]; }; vitality = derive2 { name="vitality"; version="1.3"; sha256="17micfmlksnw167vavvhlk431fm20k74y5ggs47pgz5fwpm854zp"; depends=[]; }; - vivo = derive2 { name="vivo"; version="0.2.0"; sha256="1633ffq3hf1jnzmyfzz9ww65f9394688rw69n33sk1hbmvnh9l2j"; depends=[DALEX ggplot2 ingredients]; }; + vivo = derive2 { name="vivo"; version="0.2.1"; sha256="1cfval06byviw7himr5nql34h4jaway9gb6dzya3v994p7v851cg"; depends=[DALEX ggplot2]; }; vizdraws = derive2 { name="vizdraws"; version="1.0.0"; sha256="0d97xmpz06h1g3rmnpamwnisyi5jrxa35r19i9z0glqxhla9l2d2"; depends=[dplyr glue htmlwidgets magrittr stringr tidyr]; }; - vkR = derive2 { name="vkR"; version="0.1"; sha256="0rb66am3y009wli8ykl58i02kzm6cdqz5v5d4vvzlbngz8crdkyy"; depends=[httr jsonlite XML]; }; - vlad = derive2 { name="vlad"; version="0.2.0"; sha256="0bq91n51f9cnvbqskk0vg6xn559z3a33csbvyhvcvhyjcws2yahp"; depends=[Rcpp RcppArmadillo]; }; + vkR = derive2 { name="vkR"; version="0.2"; sha256="1pk444fcw4yyv2dnfrw9vynbpc4gwr5yv9jd41djp9yipdf6d53l"; depends=[httr jsonlite purrr XML]; }; + vlad = derive2 { name="vlad"; version="0.2.1"; sha256="0rm8fasmrrk380v6mqn85gpsg4wml43qdlizq7lpnhs4qb50sr7f"; depends=[BH checkmate dplyr magrittr Rcpp RcppArmadillo tidyr]; }; vlda = derive2 { name="vlda"; version="1.1.5"; sha256="17xn8qqh043dm05ib3h4l1qx07wxncf5d06x9l1wl6jbkvnsm2nq"; depends=[dplyr ggiraph ggplot2 ggrepel ggsci]; }; vmd = derive2 { name="vmd"; version="0.1.0"; sha256="17c06a9l6i90ivpvf3rgv6yrsqv36qmywmmy92y5b81zqhgmh907"; depends=[ggplot2 magrittr R6 Rcpp reshape2 scales]; }; vmsbase = derive2 { name="vmsbase"; version="2.2.1"; sha256="1xxn0vm9r8kiix6whlc12r0wanf6acrl9a86h44nwm019xfmlfyp"; depends=[AMORE cairoDevice chron cluster DBI ecodist fields foreign ggmap ggplot2 gmt gsubfn gWidgets2 gWidgets2RGtk2 intervals mapdata maps maptools marmap outliers PBSmapping plotrix R6 RSQLite sp sqldf VennDiagram]; }; vocaldia = derive2 { name="vocaldia"; version="0.8.3"; sha256="1r28f2bwkkxjjv3qysdvp5v9gjrd4rz8l1zqd80qjnj552viy86z"; depends=[]; }; volcano3D = derive2 { name="volcano3D"; version="1.0.1"; sha256="1mk7fi72qp07wxffqkgn87r4ws3b3cy9xv52yds30q9h796l4f82"; depends=[ggplot2 ggpubr ggrepel plotly]; }; - volesti = derive2 { name="volesti"; version="1.1.1"; sha256="148b706licj0q7sai3xmyidr3f8mp68wm5kn10nclafjf4bcdxd8"; depends=[BH Rcpp RcppEigen]; }; + volesti = derive2 { name="volesti"; version="1.1.2"; sha256="1g8vi0yal1rd0swmjaalnnm0syjdw75p6bsa8n4j957zqa055pgc"; depends=[BH Rcpp RcppEigen]; }; volleystat = derive2 { name="volleystat"; version="0.2.0"; sha256="0n1r0bvvmba21cs3qgpnw9jxpgl2n82fhxa40sa1w2gav5rch5i6"; depends=[]; }; voronoiTreemap = derive2 { name="voronoiTreemap"; version="0.2.0"; sha256="1wvnqdrvba4ss4f3k8gzb720irdq2brv2aaq16ywifv8fnjf02r3"; depends=[data_tree DT htmlwidgets rlang shiny shinyjs]; }; vortexR = derive2 { name="vortexR"; version="1.1.7"; sha256="06i2rqbc3h2kv8jjrdlrg03xrzb3yiyzpnv2rvlkjcnn46f84bgf"; depends=[betareg data_table GGally ggplot2 glmulti gtools irr plyr R_utils stringr vortexRdata]; }; vortexRdata = derive2 { name="vortexRdata"; version="1.0.5"; sha256="0b47q3aslz4110a1bfaa103i098y2ngzrjh01rwasq3gd6xbif9n"; depends=[]; }; vosonSML = derive2 { name="vosonSML"; version="0.29.13"; sha256="0xajffifapn0sfnp39p8iv6hdxindzi7vywcwhla9h2hmvraad6w"; depends=[data_table dplyr Hmisc httpuv httr igraph jsonlite lubridate magrittr purrr RCurl rlang rtweet stringr textutils tibble]; }; - vote = derive2 { name="vote"; version="1.2-1"; sha256="14bqmamndq5l7mfij8kfzk2lyrn0b52jgafgy9qb93qvk1fr5raz"; depends=[formattable knitr]; }; + vote = derive2 { name="vote"; version="2.0-2"; sha256="0b2v62whnqnkf7s9bjwa2yfvw7hqv5vgzls681vrjpcwh51hv6rc"; depends=[data_table fields formattable knitr]; }; voteogram = derive2 { name="voteogram"; version="0.3.1"; sha256="12xv0c3g4vr23c8adkk8z7m7sx31w5mjvdg9h4qbvaimb99p2r7z"; depends=[dplyr ggplot2 jsonlite scales]; }; votesys = derive2 { name="votesys"; version="0.1.1"; sha256="1z7cx3rj3bfrkb6jkmf1m1wad5ff46zrab5vhk69wf3jbwd9h920"; depends=[data_table gtools Matrix]; }; vottrans = derive2 { name="vottrans"; version="1.0"; sha256="1fp7jrw072ws39bqsg88bm2qndcv68aa2vdqwgnza58p1dfq3x9f"; depends=[quadprog]; }; - vov = derive2 { name="vov"; version="0.1.1"; sha256="02bhm4fwaqqjz1vki7yzzg4ybw0w84a7wf7qyfyvigmdyrqrngy0"; depends=[glue htmltools shiny]; }; + vov = derive2 { name="vov"; version="0.1.2"; sha256="0hbb9zj33a98rv4grm644k650pq6kgmm6l01mkd4p0ic0mxa9fyh"; depends=[glue htmltools shiny]; }; vowels = derive2 { name="vowels"; version="1.2-2"; sha256="0xhfn3avx9h6kg3jwd47n2x7w8q8c9h13wsxd74hhbbn2gkjrs84"; depends=[]; }; vows = derive2 { name="vows"; version="0.5"; sha256="06akjdbab9v7r47di7syvcm7gf4k81djizg8maszs5l1ksyhmv6b"; depends=[fda gamm4 mgcv oro_nifti RLRsim shape stringr]; }; voxel = derive2 { name="voxel"; version="1.3.5"; sha256="1xlym8xc22dq67h0lylrr16z7b4zdidpgrkvbs7n9fnkh6vijw2j"; depends=[gamm4 ggplot2 lmerTest mgcv oro_nifti purrr]; }; vpc = derive2 { name="vpc"; version="1.2.1"; sha256="0w73p8i4yf3m9r13476w90303nr307dw2y78zq8ydrcqrhn2fm47"; depends=[classInt dplyr ggplot2 MASS readr stringr survival tidyr]; }; - vqtl = derive2 { name="vqtl"; version="2.0.5"; sha256="1sby1wi1lczs5cx97phq8dh15z68517rnw2zn5rzqa1399nmkkhf"; depends=[dglm doParallel dplyr evd foreach ggplot2 gtools iterators knitr lazyeval purrr qtl stringr testthat tidyr]; }; + vprr = derive2 { name="vprr"; version="0.1.0"; sha256="0wxcaw6r56wd8sxr5xc10xbhg9cbfz82z4cn4x0w8qhrzwl4v0zl"; depends=[dplyr ggplot2 gridExtra gsw interp lubridate magick metR oce stringr tidyr usethis]; }; vrcp = derive2 { name="vrcp"; version="0.1.1"; sha256="1wrch1dqy752gkj24h1dgi2x3kf1797xj4pf1s9mszf3x3ic905d"; depends=[ggplot2]; }; vrmlgen = derive2 { name="vrmlgen"; version="1.4.9"; sha256="0lifhhf41yml4k83wpkssl14jgn8jaw1lcknwbci1sd8s1c4478l"; depends=[]; }; - vroom = derive2 { name="vroom"; version="1.3.0"; sha256="18ndp453hfwvfxd6xzy0xbw9ll8s4q46dnr1biiqzh5rw70gwwzp"; depends=[bit64 cpp11 crayon glue hms lifecycle progress rlang tibble tidyselect vctrs withr]; }; + vroom = derive2 { name="vroom"; version="1.3.2"; sha256="1w42mvpfpwxqjb3i697gcwyvaz99kw5953x4a6vjcdb5j4fjdlnw"; depends=[bit64 cpp11 crayon glue hms lifecycle progress rlang tibble tidyselect vctrs withr]; }; vrtest = derive2 { name="vrtest"; version="0.97"; sha256="00hdgb0r18nwv3qay97b09kqqw9xqsbya06rrjyddqh9r6ggx1y0"; depends=[]; }; vscc = derive2 { name="vscc"; version="0.2"; sha256="1p14v8vd8kckd44g4dvzh51gdkd8jvsc4bkd2i4csx8vjiwrni5w"; depends=[mclust teigen]; }; - vsgoftest = derive2 { name="vsgoftest"; version="0.3-2"; sha256="020kghcfv8h0i7fzq3p2grhhbwvqmc9ya9r7lc1kiqg1bfgljg91"; depends=[fitdistrplus Rcpp]; }; + vsgoftest = derive2 { name="vsgoftest"; version="1.0-1"; sha256="0vypi4cf04bljmx3jwq3ixs86ivd6p7a825ik189y71fyqg9g70v"; depends=[fitdistrplus Rcpp]; }; vstsr = derive2 { name="vstsr"; version="1.0.0"; sha256="0flsw5yw1vmj5x866klxmjqz5aimkvjiwl1zdciz63p9zffmb4gz"; depends=[httr jsonlite magrittr R6 RCurl xml2]; }; - vtable = derive2 { name="vtable"; version="1.2.1"; sha256="1hdsm3qnahm2d38skv5qwzwxl5h6lbxak3wdi7ac9w846yfwlii1"; depends=[haven kableExtra knitr rstudioapi sjlabelled]; }; - vtreat = derive2 { name="vtreat"; version="1.6.1"; sha256="059g0w2dlh5axclnrr1j128ma0q406gkrqxwhb8jr45kqppbjcc8"; depends=[digest wrapr]; }; + vtable = derive2 { name="vtable"; version="1.2.6"; sha256="18ak1j98kbjxp3sy3nmn7avary3cn39xy1nh2xzm3lmhc8i5n3vw"; depends=[haven kableExtra knitr rstudioapi sjlabelled]; }; + vtreat = derive2 { name="vtreat"; version="1.6.2"; sha256="0vxwkrfbxfbqpjla96ksi9r96r4h381smh2w2jpp3hkdrw1j0k05"; depends=[digest wrapr]; }; vtree = derive2 { name="vtree"; version="5.0.0"; sha256="1sflc9zk6rllxrirdmzj5nlkmf8gax1fvnhqaggpjd3pyhhvi3y0"; depends=[DiagrammeR DiagrammeRsvg htmlwidgets rsvg shiny]; }; vudc = derive2 { name="vudc"; version="1.1"; sha256="0zxz6n3ixa3xjzcinky8ymqjx9w8y8z65mz8d84dl00mxzkmkz4h"; depends=[]; }; vwline = derive2 { name="vwline"; version="0.2-2"; sha256="1hilr996xn5wh8kfyab55w2i1c02a8x909h4ahag5q6s7603qng5"; depends=[gridBezier polyclip]; }; @@ -15832,54 +16528,59 @@ in with self; { wactor = derive2 { name="wactor"; version="0.0.1"; sha256="0dc7413jb3yz0nns2lc93w32wv6m4sg17j2ip63gc12vis0nf855"; depends=[ggplot2 Matrix R6 text2vec tibble tokenizers xgboost]; }; waffle = derive2 { name="waffle"; version="0.7.0"; sha256="1qjmai33p96cyavi9lgi6k30h6fj7db5sr569v9jf4kwx92c61df"; depends=[extrafont ggplot2 gridExtra gtable RColorBrewer]; }; wahc = derive2 { name="wahc"; version="1.0"; sha256="1324xhajgmxq6dxzpnkcvxdpm2m3g47drhyb2b3h227cn3aakxyg"; depends=[]; }; - waiter = derive2 { name="waiter"; version="0.1.2"; sha256="0pcqwlzvsjagfy8lz2dzjlynpxabaffh7hn1blmsbxnqirc5gc6d"; depends=[crayon htmltools magrittr R6 rstudioapi shiny]; }; - wakefield = derive2 { name="wakefield"; version="0.3.3"; sha256="05z9a6g1cdavalp50wss7klnlcdbv3y1jvz1v8ry1x2bziy216y2"; depends=[chron dplyr ggplot2 stringi]; }; - waldo = derive2 { name="waldo"; version="0.2.0"; sha256="1p4dvlvvh51n61sspxqzn7v03rgmzym0kas1wkvxx3nv9y4p8qhd"; depends=[cli diffobj fansi glue rematch2 rlang tibble]; }; - walker = derive2 { name="walker"; version="0.4.1-3"; sha256="114dfrz4say3j4i53fxs83px10dy1c2aian212aygjr9w3csmj38"; depends=[bayesplot BH coda dplyr ggplot2 Hmisc KFAS Rcpp RcppArmadillo RcppEigen rlang rstan rstantools StanHeaders]; }; + waiter = derive2 { name="waiter"; version="0.1.3"; sha256="18xfdlrgayf587big0gphvmw9nkg856bsh6k5rdjagq2y7dfipr3"; depends=[crayon htmltools magrittr R6 rstudioapi shiny]; }; + wakefield = derive2 { name="wakefield"; version="0.3.6"; sha256="1rssh6v8m6fim2pvm4cjw8cbni77bv5qp0rwi6vwdl3jhi5zws7n"; depends=[chron dplyr ggplot2 stringi]; }; + wal = derive2 { name="wal"; version="0.0.1"; sha256="1qg80879kffqb821lgsd5mxg2irgnhbszyr8dq06y2xz5aqyhbk7"; depends=[freesurferformats imager jpeg png spacesXYZ]; }; + waldo = derive2 { name="waldo"; version="0.2.3"; sha256="0lsw8p4wiggqm9fvh5vgmf0ms0npcg3hcwyzlg5ahv5yx4pv5fhz"; depends=[cli diffobj fansi glue rematch2 rlang tibble]; }; + walker = derive2 { name="walker"; version="0.5.0"; sha256="1nclwll3w6vak5fx7izlxrac5i5wsbgrxlr2a2gfcv70q009hk9i"; depends=[bayesplot BH coda dplyr ggplot2 Hmisc KFAS Rcpp RcppArmadillo RcppEigen rlang rstan rstantools StanHeaders]; }; walkscoreAPI = derive2 { name="walkscoreAPI"; version="1.2"; sha256="1c2gfkl5yl3mkviah8s8zjnqk6lnzma1yilxgfxckdh5wywi39fx"; depends=[]; }; - wallace = derive2 { name="wallace"; version="1.0.6.2"; sha256="0qhy1m9imwqmb6lzgx25xqqyrlja13g4l96c6q9mn008kmljpn0n"; depends=[dismo dplyr DT ENMeval leaflet leaflet_extras magrittr maptools raster RColorBrewer rgdal rgeos rmarkdown shiny shinyjs shinythemes spocc spThin testthat XML zip]; }; + wallace = derive2 { name="wallace"; version="1.0.6.3"; sha256="0qrgq1d7l75q5zz7chcdz379kpiqfh3jlqdw2pqdcs4vvpy5bnzc"; depends=[dismo dplyr DT ENMeval leaflet leaflet_extras magrittr maptools raster RColorBrewer rgbif rgdal rgeos rmarkdown shiny shinyjs shinythemes spocc spThin testthat XML zip]; }; wally = derive2 { name="wally"; version="1.0.10"; sha256="1d03vxn6q7v0nsrkd7dxkkv3siysgicv6c13fkvwmypln9vsl6sl"; depends=[data_table prodlim riskRegression]; }; walmartAPI = derive2 { name="walmartAPI"; version="0.1.5"; sha256="1nng8izncj2nmmpywn1ggpzvjh8q7y3q6260qhy9kbmvrrl26spf"; depends=[dplyr glue httr magrittr purrr stringr tibble]; }; walrus = derive2 { name="walrus"; version="1.0.3"; sha256="1nk2glcvy4hyksl5ipq2mz8jy4fss90hx6cq98m3w96kzjni6jjj"; depends=[ggplot2 jmvcore R6 WRS2]; }; wand = derive2 { name="wand"; version="0.5.0"; sha256="0y9xmh9a93lnadg83i223j2nf77jazz8m1ck1bmdf5jwj4vyzaqa"; depends=[]; }; warbleR = derive2 { name="warbleR"; version="1.1.24"; sha256="1hrp9yd1ny5krkv1bfvzhw0jm6r6qy52mzf0vb72cb62bay6rgfp"; depends=[dtw fftw monitoR NatureSounds pbapply RCurl rjson seewave tuneR]; }; - warp = derive2 { name="warp"; version="0.1.0"; sha256="16bmym91h0sbbh4iqasqs0f4kp3jqlm3sqgc356mznhxwnsm8dm2"; depends=[]; }; + warp = derive2 { name="warp"; version="0.2.0"; sha256="0s0acddc5h14245hi1faycxp0fyvw6nlgaz2df7da4fpyd2f638f"; depends=[]; }; warpMix = derive2 { name="warpMix"; version="0.1.0"; sha256="13zbl4aifhg7j5b3vpwgzgs09hr7yblz0rckmj5qh40s78j8cpfn"; depends=[fda fields lme4 MASS nlme reshape2]; }; - washdata = derive2 { name="washdata"; version="0.1.2"; sha256="01cnlhymh3qg9c7fda8s6lvm4j2vklmb72dfk17sn4p0kkikf9m8"; depends=[]; }; + washdata = derive2 { name="washdata"; version="0.1.3"; sha256="0m7rwwi189sbsv3144x14jqmfax30f6ri1pisy47yggmmjpdplps"; depends=[]; }; washeR = derive2 { name="washeR"; version="0.1.2"; sha256="0sb5sgwf7y9sd291qfj1az3x6h6gmznnnsdmqizkmv2xz9029rxz"; depends=[gplots]; }; - wasim = derive2 { name="wasim"; version="1.1.2"; sha256="1zydzw7cihhdwv0474fnc4lgaq5fwrv8jinz79vkbidbgcy7i2fd"; depends=[fast MASS qualV tiger]; }; waspr = derive2 { name="waspr"; version="1.0.0"; sha256="0rs7h9pjiqq7as5k7yrj3phn6lgdl7dzyirbmk2jjp7mw9iqhy9i"; depends=[BH Rcpp RcppArmadillo]; }; water = derive2 { name="water"; version="0.8"; sha256="0qglf922dlgi41jzz3sivq7ckmzl8axqjfg4klcgnddycmm3ha5j"; depends=[raster rgdal sp]; }; waterData = derive2 { name="waterData"; version="1.0.8"; sha256="0884agh876wf3qlbc75fbaa47x2iwvncz7r2l25qw34n8lxq1yr6"; depends=[dataRetrieval lattice latticeExtra lubridate xml2]; }; waterYearType = derive2 { name="waterYearType"; version="1.0.1"; sha256="09brbqcd41khycz9lhn84w68wpk8lsdnzb6lzc10gm5s5ambgj06"; depends=[]; }; waterfall = derive2 { name="waterfall"; version="1.0.2"; sha256="0jy6l9mx0dixwnkychdl18sf4xh73pm0qd1jyxp9rlnv1vcragjp"; depends=[lattice]; }; waterfalls = derive2 { name="waterfalls"; version="0.1.2"; sha256="01gby1mlhrwcalizpywxcakkx2zifswb0188nrl6z9dkkd1866lm"; depends=[ggplot2]; }; - waterquality = derive2 { name="waterquality"; version="0.2.2"; sha256="1hl0mndwbin026w9250llxmss5w9yykvrf1fgkslnyw1ln9pbqyn"; depends=[raster rgdal]; }; - wavScalogram = derive2 { name="wavScalogram"; version="1.0.0"; sha256="0j3dj32rxqsrc4gwssj7n224j7q4c4pahixw8b0p9xakx93q54id"; depends=[abind colorRamps fields Matrix zoo]; }; - waveband = derive2 { name="waveband"; version="4.7"; sha256="0b57g7jwvqgqjzd7x1pd4nqpx22rmiskvf8wjwrgplqzx4daxny2"; depends=[wavethresh]; }; + waterquality = derive2 { name="waterquality"; version="0.2.6"; sha256="0386sd772l6vm5pdjj21i5byc6673hwbdixm0av6nc82pqf524xr"; depends=[caret dplyr magrittr pingr purrr raster rgdal vctrs]; }; + wavScalogram = derive2 { name="wavScalogram"; version="1.1.0"; sha256="0gfzap17dzbqrilfdaphxzddpra5ss88vnl59s6jr55cg018d2xl"; depends=[abind colorRamps fields Matrix zoo]; }; + waveband = derive2 { name="waveband"; version="4.7.1"; sha256="1ja8jfvv790s6ih50iz6zykpq06dbzqi28cp8vyqcd1iz2bkdixp"; depends=[wavethresh]; }; waved = derive2 { name="waved"; version="1.2"; sha256="0zv4rgazk9s295pggzfa7sc062zv68dgds1ngxcz7vg1fx0qkgxg"; depends=[]; }; waveformlidar = derive2 { name="waveformlidar"; version="1.2.0"; sha256="1dq8f9vafby3ay5qc1fvrw8h8qjjydk7fz7s5nbkm1bdhvj6smw2"; depends=[caTools data_table flux minpack_lm raster reshape2 rgdal rgeos sp splitstackshape sqldf]; }; wavefunction = derive2 { name="wavefunction"; version="1.0.0"; sha256="1g0g9i0s93lcpcx7icqn15bvkmd79slkgimspvvwp2bxdsc5nnf2"; depends=[]; }; wavelets = derive2 { name="wavelets"; version="0.3-0.2"; sha256="07706rsjdmzj46ib2kfm5lfk4bnm2wfw7rby0ixs6x0myyzxdl92"; depends=[]; }; wavemulcor = derive2 { name="wavemulcor"; version="3.1.0"; sha256="1f7idj8vjnssh6s2h4vji1jlpf55hp4zvv5wsi2c9w7iyxwlhs5n"; depends=[plot3D RColorBrewer waveslim]; }; waver = derive2 { name="waver"; version="0.2.1"; sha256="1kl14cd96fwrqvk35sqbgi8bf31gc2ccxxy5d1v46scwyqkb0g5l"; depends=[geosphere rgdal rgeos sp]; }; + waves = derive2 { name="waves"; version="0.1.0"; sha256="1piv4qyfsms2y8rz9q4fffwci2fvhzqz151pa1w6avd78rrjbj2b"; depends=[caret dplyr ggplot2 magrittr pls prospectr randomForest rlang spectacles stringr tidyr tidyselect wesanderson]; }; waveslim = derive2 { name="waveslim"; version="1.8.2"; sha256="0ibivnhz0l06sss5rrrcvyiwg3qpbyk3qn4vx4pp90kj09x4yg0k"; depends=[]; }; wavethresh = derive2 { name="wavethresh"; version="4.6.8"; sha256="1nz74bm7pgck1i9c28svxnic8wkwkm5dhc8bhrxiih5wxb36kcwk"; depends=[MASS]; }; + wayback = derive2 { name="wayback"; version="0.2.4"; sha256="11h5bvalsdb3wwlybmplnd315y9jkb33pfhlc0231vhbcy9xkczz"; depends=[checkpoint]; }; wbs = derive2 { name="wbs"; version="1.4"; sha256="0ibrf30riavy6shaxgiznwh4gmnkx92260gsl0d74jkys98mlxdj"; depends=[]; }; wbsd = derive2 { name="wbsd"; version="1.0.0"; sha256="16jhimsq8symf6f2awczqkaqkdmlkzhmgk01iimhkvqlx8g2v219"; depends=[Rcpp RcppEigen]; }; - wbstats = derive2 { name="wbstats"; version="1.0.1"; sha256="15wcd3f7cjjgksa0ryzbj7wyzwifimxn5c3gnyrks8pwlmbyvqkx"; depends=[dplyr httr jsonlite lifecycle lubridate readr stringr tibble tidyr]; }; + wbstats = derive2 { name="wbstats"; version="1.0.4"; sha256="1va3lrksr5zg4k729xvbh176f8zcp9vfrvwxcp04znyh1rvmh6vz"; depends=[dplyr httr jsonlite lifecycle lubridate magrittr readr rlang stringr tibble tidyr]; }; wbsts = derive2 { name="wbsts"; version="2.1"; sha256="07h3wqmb9ya878fwdj49r0npks0pnd3jlnzri1cmf27c691hwka4"; depends=[mvtnorm Rcpp wavelets]; }; + wcep = derive2 { name="wcep"; version="1.0.0"; sha256="1hpakygvh3b64i5hwkriwq5g8vnvghvgdj0jn9m59j43050k32cy"; depends=[coin dplyr progress tidyr]; }; wdm = derive2 { name="wdm"; version="0.2.2"; sha256="1pidlfp67x3wnmkp0qgna4vz29qx09xsy7gfbqzrjqkdi7q1dihi"; depends=[Rcpp]; }; wdman = derive2 { name="wdman"; version="0.2.5"; sha256="1yf41lsrr9dbf5n4f5hv9mlmzl736fhnp9gxkm2g9apws6gsig02"; depends=[assertthat binman processx semver yaml]; }; - wdpar = derive2 { name="wdpar"; version="1.0.3"; sha256="1kig7adsvvnhkvrhc5ij79vapcn31hb06v6vs3y6n8265n2nq0ac"; depends=[assertthat cli countrycode curl httr lwgeom progress rappdirs RSelenium sf sp tibble wdman xml2]; }; + wdpar = derive2 { name="wdpar"; version="1.0.6"; sha256="1vsijgwr2ck304yldhw1n5szqfc26s4h072x6yk7nc1ivshfls5c"; depends=[assertthat cli countrycode curl httr lwgeom progress rappdirs RSelenium sf sp tibble wdman xml2]; }; + weathercan = derive2 { name="weathercan"; version="0.4.0"; sha256="1fgc4sqg82jqs2zn1nj0ihsqyf7lp99jnxzdymgd1mglwbnq4b5d"; depends=[dplyr httr lubridate memoise purrr readr rlang rvest stringi stringr tidyr tidyselect xml2]; }; weathermetrics = derive2 { name="weathermetrics"; version="1.2.2"; sha256="1hjhgsy3v8328hv4czxxz7kp68sxc10sy10f3dv5j8f6pka6qlsp"; depends=[]; }; weatherr = derive2 { name="weatherr"; version="0.1.3"; sha256="14w7kkja3a1zmdc7l084iprx1czqgdfjzjc29wdlwzmaiq02c4d3"; depends=[ggmap lubridate RJSONIO XML]; }; webTRISr = derive2 { name="webTRISr"; version="0.2.0"; sha256="10xj8qvibhnywsxd1yb4laz6b38qwn483a7bflizsndsgrbzdi5n"; depends=[dplyr httr jsonlite lubridate magrittr purrr readr sf stringr]; }; - webchem = derive2 { name="webchem"; version="1.0.0"; sha256="1c4n0kx8fxxrz5263lkkdmgz24akg28mjhc0cmaqbwm6mllz48r6"; depends=[data_tree dplyr httr jsonlite purrr RCurl rvest stringr tibble xml2]; }; + webchem = derive2 { name="webchem"; version="1.1.0"; sha256="1vaghhr9k9sq50882ga5dckgjspyqfsrp9n0dglm9cqdbk3gyl7i"; depends=[base64enc data_tree dplyr httr jsonlite purrr RCurl rlang rvest stringr tibble xml2]; }; webdriver = derive2 { name="webdriver"; version="1.0.5"; sha256="0l3nz7gf62jlkvkn5sfxfvn0prxz3ds7nlpfb1yhnmdljhbzrgzf"; depends=[base64enc callr curl debugme httr jsonlite R6 showimage withr]; }; webex = derive2 { name="webex"; version="0.9.1"; sha256="0z85cfnjicy3q1n77ilrh43h6xh6bpr1f1iinzfk1r64031h90yl"; depends=[jsonlite knitr rmarkdown]; }; - webglobe = derive2 { name="webglobe"; version="1.0.2"; sha256="1277d6fkgrgixlhikfwf0r6z8g5b7mah905xi219qsfycxmifgn9"; depends=[geojsonio httpuv jsonlite]; }; - webmockr = derive2 { name="webmockr"; version="0.6.2"; sha256="1mf0f1pb5dkk63m7a63k7pscax6dywz97d2ihsg10qkv0svn2sm6"; depends=[crul curl fauxpas jsonlite magrittr R6 urltools]; }; + webfakes = derive2 { name="webfakes"; version="1.1.1"; sha256="1d86aa5cgdbpj7vgvyghjsjjqjyfarnz0rh64i9r692j62yc45j0"; depends=[]; }; + webglobe = derive2 { name="webglobe"; version="1.0.3"; sha256="0gbg4pai4cn7hdc1943aqpx4bn3vgc82zp93a1wl6bmmajv1da4b"; depends=[geojsonio httpuv jsonlite]; }; + webmockr = derive2 { name="webmockr"; version="0.7.4"; sha256="0ya9j2c744glyx13vm2m86znlvwl0iy9zc5vhffr684b7wxw7y8g"; depends=[base64enc crul curl fauxpas jsonlite magrittr R6 urltools]; }; webp = derive2 { name="webp"; version="1.0"; sha256="1h17g2zaq6ipsb1w6ix9m68ddmp7dspmaqflqkskylh2n8jhk8cd"; depends=[]; }; webr = derive2 { name="webr"; version="0.1.5"; sha256="03yhlla74i71nphrfhr5sd57ykj7rjanh2a8nw3cq22rg9g668jk"; depends=[dplyr flextable ggforce ggplot2 magrittr moonBook psych purrr rlang rrtable scales shiny sjlabelled stringr tibble tidyr tidyselect vcd ztable]; }; webreadr = derive2 { name="webreadr"; version="0.4.0"; sha256="0l3l5g4zj5faxqi1kqwx9lq91gbj40z2q3csrsmpal08qnwkxs90"; depends=[Rcpp readr]; }; @@ -15890,7 +16591,7 @@ in with self; { webutils = derive2 { name="webutils"; version="1.1"; sha256="16a6ds0fnb6y8i1r9ba1hf1ydb53am57s070b3hi5jmrs84b9qik"; depends=[curl jsonlite]; }; wec = derive2 { name="wec"; version="0.4-1"; sha256="10lqh43536d44d6082rpp11q1323pmjbmgrgb8v9mrk9c1ysf50w"; depends=[dplyr]; }; weco = derive2 { name="weco"; version="1.2"; sha256="1prk8hn782pd8g2rbbaj7y10vjimqs9n8i4rab6aw6fc3k759d6b"; depends=[]; }; - wedge = derive2 { name="wedge"; version="1.0-3"; sha256="17w6987b8yh6gxsfn5vchzha8fznyganqp92zxc96h9iv7b40kkj"; depends=[magrittr partitions permutations spray]; }; + weibull4 = derive2 { name="weibull4"; version="0.1.0"; sha256="065rxwljgjfkxapin3yc1xvk102rl8hcwdqfnps1wbfmrb5yrgj4"; depends=[]; }; weibullness = derive2 { name="weibullness"; version="1.19.8"; sha256="19s44mxxcnhngifxshsyjr3a9zvbwywmqgby5dxd73yid1p2k9mr"; depends=[]; }; weibulltools = derive2 { name="weibulltools"; version="1.0.1"; sha256="06blip2dqaz2f3wnghp8yj0qj23s242k3r7bfcka1n52msc58xjz"; depends=[dplyr LearnBayes magrittr plotly Rcpp RcppArmadillo sandwich segmented SPREDA survival]; }; weightQuant = derive2 { name="weightQuant"; version="1.0"; sha256="1ngz51wr5qpnb98lfbddwvipcra86dq5whm6z8c4xd921anb15bx"; depends=[doParallel foreach quantreg]; }; @@ -15900,22 +16601,23 @@ in with self; { weights = derive2 { name="weights"; version="1.0.1"; sha256="1ka2kvzg464vn80qziqy4mrciy9wwd3jfasgq0d33wbiblhmxkj5"; depends=[gdata Hmisc mice]; }; weirs = derive2 { name="weirs"; version="0.25"; sha256="17a0ppi7ghikrwn39zvhg2cvhmnr3w0qi7r9lj22x65ii9nzadd7"; depends=[]; }; welchADF = derive2 { name="welchADF"; version="0.3.2"; sha256="02a8w1dhc2nd74hml4z3cdlx0d2a9rcx47v341kgav620i8bn88g"; depends=[lme4]; }; - wellknown = derive2 { name="wellknown"; version="0.6.0"; sha256="156kffa421d6k9wnab4pr22h4c9gnkw3i2fbk5jg03jl2rff090w"; depends=[jsonlite V8]; }; + wellknown = derive2 { name="wellknown"; version="0.7.0"; sha256="1y185mrp1jk6nhw4w0vvav1llqgp2alwsmdzai711x7v2hyb8jpm"; depends=[BH jsonlite Rcpp wk]; }; wesanderson = derive2 { name="wesanderson"; version="0.3.6"; sha256="09mr6p2jmqdjq27cz974w5hyxgn929zp9z3inhxqmmh1582fmdi2"; depends=[]; }; wevid = derive2 { name="wevid"; version="0.6.2"; sha256="1ranmqhgfkrky7r4qk563n9nlz2syn3vj85lmfajq01csadzjdpl"; depends=[ggplot2 mclust pROC reshape2 zoo]; }; wfe = derive2 { name="wfe"; version="1.9.1"; sha256="0lcg7hzdll1wqdwydkk96m4n715h8sjn3qwhabm245m0hqhdf7is"; depends=[arm MASS Matrix]; }; wfg = derive2 { name="wfg"; version="0.1"; sha256="1r6wb8v42mpapjfhmkmghm9fq21c3s4zmdxy8nlh31nsja71c37d"; depends=[igraph]; }; wfindr = derive2 { name="wfindr"; version="0.1.0"; sha256="0m5xj50hqdjj4lpbgx1kp3my4njr0nz09hd63rf4qf1ls8r7zil9"; depends=[dplyr magrittr]; }; - wflo = derive2 { name="wflo"; version="1.5"; sha256="1k9iyyr15hzbsram1246zb415hgwg8kr15zp78q9b6yf3yr46kmb"; depends=[]; }; + wflo = derive2 { name="wflo"; version="1.6"; sha256="04qxm1vvmgxbpj1wwj7n48klhsprkj774jnj4qfhqza33mhymydb"; depends=[emstreeR plotrix progress raster rgdal sp]; }; wgaim = derive2 { name="wgaim"; version="2.0-1"; sha256="1qiyfkpsbzjr9xsq5kqq6rlqpndngkn2irdfh3gyi45h6hn118j4"; depends=[ggplot2 qtl]; }; wgeesel = derive2 { name="wgeesel"; version="1.5"; sha256="0lybvsq5168cjybzv2dbyx2z8aakcx7i7ivm8zc90haiispm9n5x"; depends=[bindata CRTgeeDR geepack MASS PoisNor]; }; + whSample = derive2 { name="whSample"; version="0.9.2"; sha256="1xyb0fa7c2haa1gpfq0zgx65igy235pnd6lcvclczysf72fd4vy3"; depends=[data_table dplyr magrittr openxlsx purrr]; }; whatr = derive2 { name="whatr"; version="1.0.1"; sha256="1nnrirm0c5b053jk5l5gkrwmx4i7y2xgbwbs5qcba61s5w4n4h2x"; depends=[dplyr ggplot2 httr magrittr purrr rlang rvest scales stringr tibble tidyr xml2]; }; wheatmap = derive2 { name="wheatmap"; version="0.1.0"; sha256="1c1xvzy194vw3idkwkqp9kyrfldzczj30cl15jw1bbnw87zcwdzy"; depends=[colorspace RColorBrewer]; }; whereami = derive2 { name="whereami"; version="0.1.9"; sha256="0mjq9haacsf0zkgh7xxx8dr67hnw5ijjdhaz8c69mfjmd2zfzfwq"; depends=[cli jsonlite rstudioapi]; }; whereport = derive2 { name="whereport"; version="0.1"; sha256="1gdqzr2hrnpxbwl7cfps4m3xja8wkgwfs50i2nailybympvdnxm4"; depends=[dplyr]; }; whisker = derive2 { name="whisker"; version="0.4"; sha256="1a7vz0dk95xfjvi38wbpw8vmf5qn3g8p490msz2rw0piwidmk1ks"; depends=[]; }; whitechapelR = derive2 { name="whitechapelR"; version="0.3.0"; sha256="0mnq5m59mw8w5g1p0h2xzlz738j397b3444km59bm5yln3j0nsbi"; depends=[igraph plyr]; }; - whitening = derive2 { name="whitening"; version="1.1.1"; sha256="0madrdy2pvr7q4lhznw2kyhs7x927npwmpqwfwkv6v5c4zv7mbjp"; depends=[corpcor]; }; + whitening = derive2 { name="whitening"; version="1.2.0"; sha256="08j49kpbybw8j25ckzvbzqxigqzdxb56lryi06kbzcja0mlzrhvb"; depends=[corpcor]; }; whitestrap = derive2 { name="whitestrap"; version="0.0.1"; sha256="1jcnxqxvkhyz9j6jay5834ncv5fxb9qiyyyj3b8al75mqknmn8ra"; depends=[]; }; whoami = derive2 { name="whoami"; version="1.3.0"; sha256="19fwl7z55s4kl2xzwqwh8iwg13kdrv222vyl3kibxgwrjcjwj2y2"; depends=[httr jsonlite]; }; whoapi = derive2 { name="whoapi"; version="0.1.2"; sha256="0ib0an08xsxan24q8mb5ai375njmkdc61lh4321rzgr25iqvi682"; depends=[httr]; }; @@ -15925,25 +16627,25 @@ in with self; { widyr = derive2 { name="widyr"; version="0.1.3"; sha256="1mkgkn5lf3q9i3fhkz6v9lxl68kwhjn6bwxi3ks1v3njbsacnkay"; depends=[broom dplyr Matrix purrr reshape2 rlang tidyr tidytext]; }; wiesbaden = derive2 { name="wiesbaden"; version="1.2.3"; sha256="0bk73zfs97sk38c2wg83dp5n6ssy0fxzppvl16zb0fj798q8lvd7"; depends=[httr jsonlite keyring readr stringi stringr xml2]; }; wikibooks = derive2 { name="wikibooks"; version="0.2"; sha256="178lhri1b8if2j7y7l9kqgyvmkn4z0bxp5l4dmm97x3pav98c7ks"; depends=[]; }; - wikifacts = derive2 { name="wikifacts"; version="0.4"; sha256="1ln0ffrsxlqmhnqfwk6rkss3spx6svpndm6vgxyhgjfhgk1qh293"; depends=[curl magrittr rvest xml2]; }; + wikifacts = derive2 { name="wikifacts"; version="0.4.1"; sha256="0pj4fspcaamffkxmdv40xh6v1sfb2p5gds0mdi9dgw1xvclvh6lg"; depends=[curl magrittr rvest xml2]; }; wikilake = derive2 { name="wikilake"; version="0.4"; sha256="0pm0brzkf2k6aknwl4b3fba5ly7mhah8qfb0h94fckiaqbnpyx9v"; depends=[maps rvest selectr sp stringi stringr units WikipediR xml2]; }; wikipediatrend = derive2 { name="wikipediatrend"; version="2.1.6"; sha256="11ng7qsb4954mgsz55ix86z0ynh4xgflcp6dzl0y4zi6zdrj87i7"; depends=[ggplot2 glue hellno httr pageviews rvest stringr xml2]; }; - wikisourcer = derive2 { name="wikisourcer"; version="0.1.5"; sha256="0a69p17fq1iw55vn1rc76xb9q5s60a4x0i7lyx6abz7wxi7gzbvi"; depends=[curl httr magrittr purrr rvest tibble urltools xml2]; }; wikitaxa = derive2 { name="wikitaxa"; version="0.4.0"; sha256="1z7p7dwgl8x4ambwss5dqlp4zgz52mgj0vhx2bqwizarmx9ji1xs"; depends=[crul curl data_table jsonlite tibble WikidataR xml2]; }; wildcard = derive2 { name="wildcard"; version="1.1.0"; sha256="0qkzab84z95g5f4fv3v4wisccgd7k9m3210pz4nvm1x8rfaqfjf1"; depends=[magrittr stringi]; }; wildlifeDI = derive2 { name="wildlifeDI"; version="0.3.0"; sha256="1aqiazrr2sp76777m0isscainhdnn9qp87dwpr4cspk7grbsa53k"; depends=[adehabitatLT rgeos sp]; }; wildpoker = derive2 { name="wildpoker"; version="1.1"; sha256="1302ain55spz34irmq49sp9b1pvrn2nxmzmqs8m9wdk6g82h3s27"; depends=[]; }; wilson = derive2 { name="wilson"; version="2.4.0"; sha256="0cb9s7v2c0isp4z8rjxdyzn26k8h6h2z956lznl971hm786pq7z9"; depends=[circlize colourpicker ComplexHeatmap data_table DESeq2 DT factoextra FactoMineR ggplot2 ggrepel gplots heatmaply log4r openssl plotly plyr R6 RColorBrewer reshape rintrojs rje rjson RJSONIO scales shiny shinycssloaders shinydashboard shinyjs shinyWidgets viridis zip]; }; winRatioAnalysis = derive2 { name="winRatioAnalysis"; version="0.1.0"; sha256="1msvc06bfzw9clinxbvr5fdw38dff0c0xii46182nwnk5kj0libr"; depends=[data_table JM Matrix MLEcens mvtnorm nlme plyr pssm survival]; }; - windAC = derive2 { name="windAC"; version="1.2.2"; sha256="0z8d1zqmrfsfj57gsc5znj8pzxqzs6cs4ygrns3qx5j8z6fwbr32"; depends=[mvtnorm sf]; }; - windex = derive2 { name="windex"; version="1.0"; sha256="0ci10x6mm5i03j05fyadxa0ic0ngpyp5nsn05p9m7v1is5jhxci0"; depends=[ape geiger scatterplot3d]; }; - windfarmGA = derive2 { name="windfarmGA"; version="2.2.3"; sha256="13jdh0c8lkc3043mnqx23s06xxkf6dvk7w9kfvwhib58rlgy0p2n"; depends=[calibrate doParallel foreach ggplot2 gstat leaflet magrittr raster RColorBrewer Rcpp rgdal rworldmap sf sp spatstat]; }; + winch = derive2 { name="winch"; version="0.0.6"; sha256="1mjkbji4618f4sf4hj2lsc6r62pjlvzsvncql9ihcjj52mih9j29"; depends=[procmaps]; }; + windAC = derive2 { name="windAC"; version="1.2.4"; sha256="1b41jh1bl0kljr07pwg07cw6qxg5iawjhmj1001fl7jd7pxf90kn"; depends=[mvtnorm sf]; }; + windex = derive2 { name="windex"; version="2.0"; sha256="1w9z7jykac9kb0d5q77hq553bv1da676rsk8928bzls5fwmvbqr3"; depends=[ape geiger phangorn scatterplot3d]; }; + windfarmGA = derive2 { name="windfarmGA"; version="2.3.0"; sha256="0iw5r2q42i8lnjj92jwgpqlkspz82yh1rgkh2i11m3rpnddvkk22"; depends=[calibrate doParallel foreach ggplot2 gstat leaflet magrittr raster RColorBrewer Rcpp rgdal rworldmap sf sp spatstat]; }; winfapReader = derive2 { name="winfapReader"; version="0.1-1"; sha256="027jqnb91xdrp3aibhfbjx0wb5lcfzsxi8ychjifzja5f22qd6zw"; depends=[lubridate]; }; wingui = derive2 { name="wingui"; version="0.2"; sha256="0yf6k33qpcjzyb7ckwsxpdw3pcsja2wsf08vaca7qw27yxrbmaa3"; depends=[Rcpp]; }; wiqid = derive2 { name="wiqid"; version="0.3.0"; sha256="0jqnlyw5iljpm7135fgnkwjvxmbjbqiqq6lchwnjmhbb5xd3kbvr"; depends=[coda HDInterval MASS mcmcOutput plotrix truncnorm]; }; wiseR = derive2 { name="wiseR"; version="1.0.1"; sha256="187ylwhk06957x9zm5r0m6w9wg08im83myz3s4gr927ig8yv3b5f"; depends=[arules bnlearn DescTools dplyr DT graph HydeNet igraph linkcomm missRanger psych RBGL Rgraphviz rhandsontable rintrojs shiny shinyalert shinyBS shinycssloaders shinydashboard shinyWidgets visNetwork]; }; - withr = derive2 { name="withr"; version="2.2.0"; sha256="10mmfffjbnb2zq5x0kqhhb4z6va4micc6pjzvlfji34gyhffa8ac"; depends=[]; }; - wk = derive2 { name="wk"; version="0.3.2"; sha256="18zswapxi1fncjx33xg8awwi853z52m08c45hza10pbzi02rsnwr"; depends=[Rcpp]; }; + withr = derive2 { name="withr"; version="2.3.0"; sha256="1837vjp35npjrnis1im5xrwj1swpgnms00gkjiz7296l8yckrh1c"; depends=[]; }; + wk = derive2 { name="wk"; version="0.3.3"; sha256="0myyzab808r1i2cdj1zpyrml8xvywak8f589b1yi337wc2q9x9cd"; depends=[Rcpp]; }; wkNNMI = derive2 { name="wkNNMI"; version="1.0.0"; sha256="0qpl1b2134kz9mjl38w93lp3g6kpv9ygv9hygpssm845k02hkw7c"; depends=[foreach infotheo]; }; wkb = derive2 { name="wkb"; version="0.4-0"; sha256="0mah538345npkb06bcj18mb6qnnx8nn7bdqmvqqpbawallh546a9"; depends=[sp]; }; wktmo = derive2 { name="wktmo"; version="1.0.5"; sha256="05pjyk0xsdazbi1x7xfmg097ybybd60zmzzm7sch1ikp05hzn0wb"; depends=[]; }; @@ -15951,26 +16653,27 @@ in with self; { wmlf = derive2 { name="wmlf"; version="0.1.2"; sha256="0zxw84l5v12r15hpyd1kbajjz3cbkn5g884kmj72y7yi0yi1b6d6"; depends=[waveslim]; }; wmm = derive2 { name="wmm"; version="1.0.0"; sha256="0f46a69vcz1cb4qmz68gf8h0hq5amilsp9h4gmacmprad49n702g"; depends=[]; }; wmwpow = derive2 { name="wmwpow"; version="0.1.3"; sha256="03rd75r4wih1w7srhnwqxjkirisb43y1sd2f1wzixqj8lq0dmb25"; depends=[lamW MASS smoothmest]; }; - wnl = derive2 { name="wnl"; version="0.6.0"; sha256="0mlwl63dr5mhhri628phcrhbv776pdhf7h3ag5jcxy9mqsc0i4xg"; depends=[numDeriv]; }; + wnl = derive2 { name="wnl"; version="0.6.1"; sha256="0p9hhg6bd2q8li7npjyakl7sr74v9534cplqypp7jgy9pl3wi100"; depends=[numDeriv]; }; wnominate = derive2 { name="wnominate"; version="1.2.5"; sha256="0pvw36jzx90z7ah4f7cyf95csdn5x7n9rh3ddsppa61y1dmjsn5k"; depends=[pscl]; }; woe = derive2 { name="woe"; version="0.2"; sha256="15mvcmwnrqxpzn054lq85vyzq5rgxkiwbd40gnn4s3ny1xdrwgsm"; depends=[]; }; woeBinning = derive2 { name="woeBinning"; version="0.1.6"; sha256="0x890h5fh59n54587adyzphr956fkg3px8i7c378aq1fs7k35gxs"; depends=[]; }; - woeR = derive2 { name="woeR"; version="0.2.1"; sha256="1k918j19iiri22scg16hb28wymf2nsr8yyz7qfg6mfvnif7im2sm"; depends=[dplyr]; }; womblR = derive2 { name="womblR"; version="1.0.4"; sha256="0yjz4nymhqq6aqvxf0a90bw3hi1zqz1zp3mxbv2ns5v5ygh2a10p"; depends=[msm mvtnorm Rcpp RcppArmadillo]; }; wooldridge = derive2 { name="wooldridge"; version="1.3.1"; sha256="0471x3vszf1c4fj9pk5ix8bdmp2bnq1ghnqvwzad9chvvkpzmg3l"; depends=[]; }; - worcs = derive2 { name="worcs"; version="0.1.3"; sha256="0w9nxdf40vmkqw0l5c293kbypa4wwhbhfvif8h8nqnz9ryznphkv"; depends=[digest gert prereg ranger rmarkdown rticles yaml]; }; + worcs = derive2 { name="worcs"; version="0.1.6"; sha256="1d5qynq1g5qpnlcdlfiwda9sj7nvscc9ag4a5x0ndp1099a2zagv"; depends=[digest gert prereg ranger rmarkdown rticles yaml]; }; word_alignment = derive2 { name="word.alignment"; version="1.1"; sha256="0inlq96j4zkjncz2v66amz91l5y3b5lx49qi2jg6jbqdldw7aa02"; depends=[data_table openxlsx]; }; - word2vec = derive2 { name="word2vec"; version="0.2.1"; sha256="10kly2d6g0abxz8r81jah1bgbjigysmyyqhmwljkl1gkwkirrqf7"; depends=[Rcpp RcppProgress]; }; - wordbankr = derive2 { name="wordbankr"; version="0.3.0"; sha256="0aa1gz3fg7h9wnk93ialwj0wjyk8wxani8galwkrms4fp7d5lmf4"; depends=[assertthat DBI dbplyr dplyr purrr rlang RMySQL robustbase stringr tidyr]; }; + word2vec = derive2 { name="word2vec"; version="0.3.3"; sha256="0ljwxm825is91xkqk64p97xk61kzc8ahvsk31ycjim90rf77grlp"; depends=[Rcpp RcppProgress]; }; + wordbankr = derive2 { name="wordbankr"; version="0.3.1"; sha256="14ryaa25abm24wi2gyp0prxsnx1n5f4298zmzjlr08pj0sp7lgv7"; depends=[assertthat DBI dbplyr dplyr purrr quantregGrowth rlang RMySQL robustbase stringr tidyr]; }; wordcloud = derive2 { name="wordcloud"; version="2.6"; sha256="0j96yyvm6bcrrpbdx4w26piqx44a0vbsr3px9cb4zk8a8da6jwak"; depends=[RColorBrewer Rcpp]; }; wordcloud2 = derive2 { name="wordcloud2"; version="0.2.1"; sha256="1a2q42bn65q4idxq0vxysyam16q6c18inxv4dqhfy0x52j8z9x6k"; depends=[base64enc htmlwidgets]; }; wordgraph = derive2 { name="wordgraph"; version="0.1.0"; sha256="06q42sjdj7i680zqx66hsvrpmkrlcyxnvsk1lygnqhlv97ycl3vv"; depends=[dplyr ggplot2 ggraph plyr purrr tibble tidygraph]; }; wordmatch = derive2 { name="wordmatch"; version="1.0"; sha256="0zscp361qf79y1zsliga18hc7wj36cnydshrqb9pv67b65njrznz"; depends=[plyr reshape2]; }; - wordnet = derive2 { name="wordnet"; version="0.1-14"; sha256="12a21zlc7h973gi1632gngbk8b09vhp3sldh1mh9b5n6h18ga25p"; depends=[rJava]; }; + wordnet = derive2 { name="wordnet"; version="0.1-15"; sha256="158c5fps4kvfd9mj1im8jb9rv7ipfshyagrv0q3b55ywnkrkvjqb"; depends=[rJava]; }; + wordpressr = derive2 { name="wordpressr"; version="0.1.1"; sha256="1lfrlybakl1virrpb9za16pvadpjrqg2ch1wyw1b8blr165x83zx"; depends=[dplyr glue httr magrittr purrr tibble tidyr]; }; + wordsalad = derive2 { name="wordsalad"; version="0.2.0"; sha256="18kgwq6f9ymm1bmbvpmxq9gz5fx0qj64439scr21kk1cvsfl4y88"; depends=[fastTextR text2vec tibble word2vec]; }; wordspace = derive2 { name="wordspace"; version="0.2-6"; sha256="11y57mzd12klwd2xzr38nvlrxg9jsi33mxd8nnvc96hgrjsgwakl"; depends=[cluster iotools MASS Matrix Rcpp sparsesvd]; }; workflowr = derive2 { name="workflowr"; version="1.6.2"; sha256="0m3aq9xxbk4xmqsb59xil56610hgw53gm80z28mq594mhfdh0g3l"; depends=[callr fs getPass git2r glue httpuv httr knitr rmarkdown rprojroot rstudioapi stringr whisker xfun yaml]; }; - workflows = derive2 { name="workflows"; version="0.1.3"; sha256="1d5njd1xdl8kghlbar4acgl9hxq83p6k7yks592cvakmcz7f853m"; depends=[cli ellipsis generics glue hardhat parsnip rlang]; }; - worldmet = derive2 { name="worldmet"; version="0.9.0"; sha256="0wzp3c58kig5r1p2bb6c47z90ldyp18y6cjrsjbxs34i2v4nb6jc"; depends=[doParallel dplyr foreach leaflet openair readr tidyr zoo]; }; + workflows = derive2 { name="workflows"; version="0.2.1"; sha256="1mk0pnmpqlhf143mvj9rwvjrrshirz6s83s5hbfalhnyw7hzkfb9"; depends=[cli ellipsis generics glue hardhat parsnip rlang tidyselect]; }; + worldmet = derive2 { name="worldmet"; version="0.9.2"; sha256="13b0apxmd2j7w8rqgyn61c7hvzv2yyqhkyd63rmhzdvnbpkbwaw2"; depends=[doParallel dplyr foreach leaflet openair purrr readr tidyr zoo]; }; worms = derive2 { name="worms"; version="0.2.2"; sha256="183chjdi5qvsmdznvc9igcxaz769a37rwh5nzgvf5zf012a85wir"; depends=[httr plyr]; }; worrms = derive2 { name="worrms"; version="0.4.2"; sha256="1gpbyplfpcrapmci8axarrjjijsgh2dmhnsn79g1lhrafvm2ichs"; depends=[crul data_table jsonlite tibble]; }; wosr = derive2 { name="wosr"; version="0.3.0"; sha256="0fl9mizrjg3r7n7gslsxgaw3k2v63scqmvnv6341q8sq7018hzln"; depends=[httr jsonlite pbapply xml2]; }; @@ -15983,18 +16686,20 @@ in with self; { wppExplorer = derive2 { name="wppExplorer"; version="2.3-4"; sha256="1pbmjg6y543aih8mxf9njfwpm090virhgqf8w0a5yx0jdfjwmz04"; depends=[DT ggplot2 googleVis Hmisc plyr reshape2 shiny shinyjs shinythemes wpp2019]; }; wql = derive2 { name="wql"; version="0.4.9"; sha256="0m16l807mhcjkbqhlzhc24pw4hl78fjyykiszlg337x3qs803fg2"; depends=[ggplot2 reshape2 zoo]; }; wqs = derive2 { name="wqs"; version="0.0.1"; sha256="14qaa9g9v4nqrv897laflib3wwhflyfaf9wpllmbi5xfv9223rcg"; depends=[glm2 Rsolnp]; }; - wrGraph = derive2 { name="wrGraph"; version="1.0.2"; sha256="1agi16ybn1nh0y2k8sfi3ns5iy0w5mmrp60vpk1k47z0859yg724"; depends=[RColorBrewer wrMisc]; }; - wrMisc = derive2 { name="wrMisc"; version="1.3.0"; sha256="0fsrq7ypv2y637g7sqwg0xjdbqn97m71ff0h0b06wbpkr91z2wja"; depends=[MASS]; }; - wrProteo = derive2 { name="wrProteo"; version="1.1.3"; sha256="1lyq650770xfhb4jkn14qshy45fy9j3vmqdbdss1g9v7d33hl21n"; depends=[knitr limma rmarkdown wrMisc]; }; + wrGraph = derive2 { name="wrGraph"; version="1.1.1"; sha256="05zi0j1z30hrf8d2720x7qc87l50x3fyhy0admiz0gag1cv50ras"; depends=[RColorBrewer wrMisc]; }; + wrMisc = derive2 { name="wrMisc"; version="1.5.0"; sha256="1gy0v5silqfndv9myzxvx2gwxj8c3asnqvf65szjyihdfbn75m3k"; depends=[MASS]; }; + wrProteo = derive2 { name="wrProteo"; version="1.3.0"; sha256="1mcj2llkpph14z2kkl924hjs9rizf62fgzhbkd0s79kshhqcjq87"; depends=[knitr limma rmarkdown wrMisc]; }; + wrTopDownFrag = derive2 { name="wrTopDownFrag"; version="1.0.2"; sha256="1rdg6rzjz2h514i3c8z89mvj2j3h1s7rr5fry2mq3xvrwrgd3738"; depends=[wrMisc wrProteo]; }; wrangle = derive2 { name="wrangle"; version="0.5.2"; sha256="1b6qgwdjvwbrarp9ylgkb5ia1p5a5g7ws0jyqrwc6hii8z5yj2qb"; depends=[dplyr lazyeval magrittr rlang tidyr]; }; - wrapr = derive2 { name="wrapr"; version="2.0.2"; sha256="01yjrzz7nkp3a4w3171lpmyysl3apb5fmwy3dg98l1f03mkhk5za"; depends=[]; }; + wrapr = derive2 { name="wrapr"; version="2.0.6"; sha256="161lwmbcc38abayl249cbghss24j6dff0i044w83nsnnq3g9kzn5"; depends=[]; }; wrassp = derive2 { name="wrassp"; version="0.1.9"; sha256="09z8s0g6l9z4rwnf36w4bd734agd471swz3f24178b4j6m05kqhm"; depends=[tibble]; }; write_snns = derive2 { name="write.snns"; version="0.0-4.2"; sha256="0sxg7z8rnh4lssbivkrfxldv4ivy37wkndzzndpbvq2gbvbjnp4l"; depends=[]; }; - writexl = derive2 { name="writexl"; version="1.3"; sha256="0lah0r2pd996s0vdbi614j3h52dbxmifha6f19v53p2b7fr32wjd"; depends=[]; }; + writexl = derive2 { name="writexl"; version="1.3.1"; sha256="1njdhvh8605wd2j8glrbxfyc36p2n88prpq080jn44s9lgfmbgsb"; depends=[]; }; wrswoR = derive2 { name="wrswoR"; version="1.1.1"; sha256="1q0nc08q8f3kl9yvcivzylykk1ar5j5dw3ian2y9nrzgzri5l10i"; depends=[logging Rcpp]; }; wrswoR_benchmark = derive2 { name="wrswoR.benchmark"; version="0.2.1"; sha256="0zr6x8d69n72xlad7fw3sa9rqqpii9lylm1rlccrmalhgmzl68ii"; depends=[curl lazyeval]; }; - wru = derive2 { name="wru"; version="0.1-9"; sha256="0xrm3f1khggcvdzzk65mnbfcyji3kjz8hrk9d2n4y15nhpbw8p8h"; depends=[devtools]; }; + wru = derive2 { name="wru"; version="0.1-10"; sha256="1ss5h7fk69cxd7k8aiw53ysn88n0s287c89yzyqsgs05a1mr9lwv"; depends=[devtools]; }; wsbackfit = derive2 { name="wsbackfit"; version="1.0-3"; sha256="06y868c04sbcrfm6ba33j1y8yjri3yjblzl0cicjrkjk34mi9j4g"; depends=[]; }; + wsjplot = derive2 { name="wsjplot"; version="0.1.0"; sha256="1vgf823j3ychdnvg4nq59ah4rkv5lpwbg0r7sijir2b18sgxsrbi"; depends=[dplyr ggplot2 magrittr scales stringr]; }; wskm = derive2 { name="wskm"; version="1.4.40"; sha256="0x5nc3bwqawx0k95v088dsx83dm7lw5lkryjvq6bl57bgrcn7n0l"; depends=[fpc lattice latticeExtra]; }; wsrf = derive2 { name="wsrf"; version="1.7.17"; sha256="0gmlvfcy2iqa5sqhwps3hx0hl9fir8nf5xq62f25sn8i3llw752z"; depends=[Rcpp]; }; wsyn = derive2 { name="wsyn"; version="1.0.2"; sha256="0jl0wnw11yrbiygcpcnl1yi8xf5dd3sbh0c2yic8dc0p64k6iass"; depends=[fields MASS]; }; @@ -16008,7 +16713,7 @@ in with self; { wyz_code_rdoc = derive2 { name="wyz.code.rdoc"; version="1.1.16"; sha256="1f8yd1pkk9aamsx2x59jpa5jgq03hnbf9zrs1ah010sn3l51v1yr"; depends=[crayon data_table digest R6 stringr tidyr wyz_code_offensiveProgramming]; }; wyz_code_testthat = derive2 { name="wyz.code.testthat"; version="1.1.17"; sha256="1hl6gqxpxa3fyzc01i37g9il4vc6z339iir4228yz7ky1x85xjna"; depends=[data_table lubridate R6 tidyr wyz_code_offensiveProgramming]; }; x_ent = derive2 { name="x.ent"; version="1.1.7"; sha256="15qra77dqhj27g3qx92gram4mq4n9fdidygdpvxfmcx7ww3vc6yh"; depends=[ggplot2 jsonlite statmod stringr xtable]; }; - x12 = derive2 { name="x12"; version="1.9.0"; sha256="0hrcw1d52yp5rr4r120lcnfxw2rgs95njg37m28blcnfbq2flfc2"; depends=[stringr x13binary]; }; + x12 = derive2 { name="x12"; version="1.9.3"; sha256="05dzf38vlf73bmwdjs6w32d0b91cs6zgdmg7afw9gs36qfi5fahn"; depends=[stringr x13binary]; }; x12GUI = derive2 { name="x12GUI"; version="0.13.0"; sha256="1mga7g9gwb3nv2qs27lz4n9rp6j3svads28hql88sxaif6is3nk1"; depends=[cairoDevice Hmisc lattice RGtk2 stringr x12]; }; x13binary = derive2 { name="x13binary"; version="1.1.39-2"; sha256="1if8yayvn6rr98gwp0ypmlk3d9fjf0b9kxir2iwha506aslq70xp"; depends=[]; }; x3ptools = derive2 { name="x3ptools"; version="0.0.2"; sha256="1a3vdljd51kvd70mq9cr84r536zmby7vkd36a02z2sxabq03cl9s"; depends=[assertthat digest png rgl xml2 zoo]; }; @@ -16016,31 +16721,31 @@ in with self; { xROI = derive2 { name="xROI"; version="0.9.17"; sha256="1yidrfqgz4sd8jpq7a4hvcjh7npbg54xnzxjmn8pdgrlzv71dyib"; depends=[colourpicker data_table jpeg lubridate moments raster RCurl rgdal rjson shiny shinyjs sp stringr tiff]; }; xRing = derive2 { name="xRing"; version="0.1.0"; sha256="17f1jif8yw2508k86p8mjgw1h20ml5wzaff04ix9xq96plqzi8ma"; depends=[dplR imager tcltk2 tkRplotR]; }; xSub = derive2 { name="xSub"; version="3.0.1"; sha256="0c3jc801pn85wm17jj911spryg6p3gq19im1506zkv8lqwsy1nab"; depends=[countrycode haven RCurl]; }; - xVA = derive2 { name="xVA"; version="0.8.1"; sha256="0wr4i37sya5gg6v63ka16g9077gxbhvjqyqfaahhban8skzl2adf"; depends=[SACCR Trading]; }; - xaringan = derive2 { name="xaringan"; version="0.16"; sha256="1jdj8qkadb09x7kvf93h4mp8gxk6lda8aspldhdki9qqpdc78gc8"; depends=[htmltools knitr rmarkdown servr xfun]; }; + xVA = derive2 { name="xVA"; version="0.8.5"; sha256="1scn7acp69k80q9ksygj7ns9937yim8iwhpi54ygm28h20jnfllr"; depends=[SACCR Trading]; }; + xaringan = derive2 { name="xaringan"; version="0.19"; sha256="11jdr9iylxnq4gn9hp2i4zv0f89hkdhq3xdaw63a8pdg9znzn5ks"; depends=[htmltools knitr rmarkdown servr xfun]; }; xaringanthemer = derive2 { name="xaringanthemer"; version="0.3.0"; sha256="0vb4z4w90fpdxxq46z089g4dh7r8jk73mcd63rxwnqaaqr09pxr4"; depends=[colorspace glue purrr whisker]; }; xbreed = derive2 { name="xbreed"; version="1.0.1.1"; sha256="032i04ginyf9dyabfkygnhrkq7lqdvvyw7s41vjimy2kvjrnkkkx"; depends=[BGLR]; }; xdcclarge = derive2 { name="xdcclarge"; version="0.1.0"; sha256="1j8wsidwmfjygqlwavxinv4bqc6rddy42jdmlknsjfrrs49yj8kn"; depends=[nlshrink Rcpp RcppArmadillo]; }; xergm_common = derive2 { name="xergm.common"; version="1.7.8"; sha256="03mjpafwfkmyj5ba84jydap9rp0i602izjlbd511xbxcw6dx2k0b"; depends=[ergm network]; }; xesreadR = derive2 { name="xesreadR"; version="0.2.3"; sha256="1pvdx0mxg2f885bhy4hb3kqzcgva4q7hzzaipkfzyi5lnjdsbc81"; depends=[bupaR data_table dplyr lubridate purrr stringr tidyr XML xml2]; }; - xfun = derive2 { name="xfun"; version="0.16"; sha256="1x7b71xhbl44fyccz69l24nbgyxawm2km90s4h1l3zr5z2vly0sg"; depends=[]; }; + xfun = derive2 { name="xfun"; version="0.19"; sha256="15yyigkl1g9w9d7097hrm94dxn1af333ywr5xdw78qqrw6npn0iv"; depends=[]; }; xgb2sql = derive2 { name="xgb2sql"; version="0.1.2"; sha256="1gw5dw0ck5hip8mv347zaswrggk395bg2hgn02bvqs0d31jhmgvi"; depends=[data_table xgboost]; }; - xgboost = derive2 { name="xgboost"; version="1.1.1.1"; sha256="13njhcxljhbcs37ni6r5174fk8kx9b5p7rlw1an1ak3w92jn56cq"; depends=[data_table magrittr Matrix stringi]; }; + xgboost = derive2 { name="xgboost"; version="1.2.0.1"; sha256="16hpvv2hwdzcyg90z7c1g5d2hj011qk8mivy4l2nqd2g7rkjwis4"; depends=[data_table magrittr Matrix stringi]; }; xgobi = derive2 { name="xgobi"; version="1.2-15"; sha256="03ym5mm16rb1bdwrymr393r3xgprp0ign45ryym3g0x2zi8dy557"; depends=[]; }; xgxr = derive2 { name="xgxr"; version="1.0.9"; sha256="1hci16ly4wzrjyfa7chwn6nnwlfnq77ix2w3gwrvlgfcjisbcsq1"; depends=[assertthat binom dplyr ggplot2 labeling magrittr pander png scales tibble]; }; xkcd = derive2 { name="xkcd"; version="0.0.6"; sha256="1z2y0ihn68ppay7xkglhw7djki5654g6z4bbpyy41if57z9q554f"; depends=[extrafont ggplot2 Hmisc]; }; xkcdcolors = derive2 { name="xkcdcolors"; version="1.0"; sha256="07fnjv01r3b951dqca2zs9b9f6hsgbpbpsrggvb8rps53kpid0i7"; depends=[FNN]; }; xlink = derive2 { name="xlink"; version="1.0.1"; sha256="02ahgjampy92gcwhv269px5w8651a7j50dn1295zwqxj44lk4g9q"; depends=[survival]; }; xlsimple = derive2 { name="xlsimple"; version="1.0.5"; sha256="1snamzq6yljiqakqd6492ylznr9kfl8w0lnaayfn14fk3w03skck"; depends=[XLConnect]; }; - xlsx = derive2 { name="xlsx"; version="0.6.3"; sha256="0ph3bqngczm2h46s159s6cpxjkcrsi1di8a325x2wl5ls7mbiag5"; depends=[rJava xlsxjars]; }; + xlsx = derive2 { name="xlsx"; version="0.6.5"; sha256="01r1ngdm51w18bdan8h94r91m731knkf04zal4g67mx3fpa5x31p"; depends=[rJava xlsxjars]; }; xlsx2dfs = derive2 { name="xlsx2dfs"; version="0.1.0"; sha256="0bdawr80grks91sy221d33fsk75g20zh3wjg6gvd0zj0m1zvvwvd"; depends=[openxlsx]; }; xlsxjars = derive2 { name="xlsxjars"; version="0.6.1"; sha256="1rka5smm7yqnhhlblpihhciydfap4i6kjaa4a7isdg7qjmzm3h9p"; depends=[rJava]; }; - xltabr = derive2 { name="xltabr"; version="0.1.2"; sha256="0pwbpcdiqkhvzxsi6yxly4zza12bw7zc7ji8cvhldw4yl5sxkz1l"; depends=[magrittr openxlsx]; }; xlutils3 = derive2 { name="xlutils3"; version="0.1.0"; sha256="1cxishi62bd36zlsy5qhzix1p68akdf9kpjg9gfm9aqpcijzccb9"; depends=[magrittr readxl]; }; - xmeta = derive2 { name="xmeta"; version="1.1-5"; sha256="1r2mqrrcl7vmbyydw3kzpskinkiqr919bxgq69i1y6pbfim7jzag"; depends=[aod glmmML metafor mvmeta numDeriv]; }; + xmeta = derive2 { name="xmeta"; version="1.2-1"; sha256="1clyf4jscr23zvj81i8vvyqdkpx3rd35apwj2i2yc7yzmfvqw92w"; depends=[aod glmmML MASS metafor mvmeta numDeriv plotrix]; }; xml2 = derive2 { name="xml2"; version="1.3.2"; sha256="1kx400v62xkd5xal7rzz7jcarz94ac8g1sh4i2dqr78qwgkzj8nz"; depends=[]; }; xml2relational = derive2 { name="xml2relational"; version="0.1.0"; sha256="03blvks4z7n4wxz5zbrn6c3a3l4hy9clcjpb834pc07ssz3c2v3g"; depends=[fs lubridate rlang stringr tidyr xml2]; }; - xmlparsedata = derive2 { name="xmlparsedata"; version="1.0.3"; sha256="0gjr3l5z5dp276lchr2649as1rkj56d2mlvbr66yg393zzw50lsh"; depends=[]; }; + xmlconvert = derive2 { name="xmlconvert"; version="0.1.1"; sha256="18jr2666s7kjqrmvrwf82dkryzrw284cj993y3cgmxchb7w0fhir"; depends=[httr lubridate readr stringr tibble xml2]; }; + xmlparsedata = derive2 { name="xmlparsedata"; version="1.0.4"; sha256="177vfyjrqfi3wam8scpsradap1lv35yc25xq745dr7gabg116yrq"; depends=[]; }; xmlr = derive2 { name="xmlr"; version="0.1.2"; sha256="00mxdb4899sx5py0ngzh3dvhz1sqsar2hmsrkm4jf0b3q9psc86w"; depends=[]; }; xmlrpc2 = derive2 { name="xmlrpc2"; version="1.1"; sha256="13rfw0civp3hzi4hn31x1idliid1qb73495x4c31z5msd35lzxrs"; depends=[base64enc curl xml2]; }; xmrr = derive2 { name="xmrr"; version="1.1.1"; sha256="1kb4kzxb9rcx9fp1answln0sv9c3wdrk82gz79k0i9ypq7dls2ah"; depends=[dplyr ggplot2 purrr qpdf rlang tibble tidyr]; }; @@ -16051,12 +16756,11 @@ in with self; { xplain = derive2 { name="xplain"; version="0.2.2"; sha256="152a83ckmhns6yniy87mmjva5bkv5x3phv63l1kkcmrr9bclfgz0"; depends=[httr RCurl readr XML]; }; xplorerr = derive2 { name="xplorerr"; version="0.1.1"; sha256="17h8z9rmqkmm6lm9gipa33mr7zxpzd5xbjk251592mwr79lwsh8n"; depends=[magrittr shiny]; }; xpose = derive2 { name="xpose"; version="0.4.11"; sha256="1m5h7la7zr28q2610c7wadzwllyywya2vxa7pifjs3fml940lybj"; depends=[dplyr ggforce ggplot2 purrr readr rlang stringr tibble tidyr vpc]; }; - xpose4 = derive2 { name="xpose4"; version="4.7.0"; sha256="0lpbk85d17spg6vwf7acqaz7fv2l0rv6qkczbgm4fw28qiaykci6"; depends=[dplyr gam Hmisc lattice lazyeval readr survival]; }; + xpose4 = derive2 { name="xpose4"; version="4.7.1"; sha256="0y2ws8cq2waiikxw2y34s3qinaq5f832k5nglif3avd8gp2fpn3q"; depends=[dplyr gam Hmisc lattice lazyeval readr survival tibble]; }; xptr = derive2 { name="xptr"; version="1.1.3"; sha256="0352vs8dz61hgpwnf3r9r9haz3adg2wk9qxzrv313p1fcyfjz91v"; depends=[]; }; xray = derive2 { name="xray"; version="0.2"; sha256="1ibj92ljlj8a5rmbrci691yhpd4kwrfyl944nzl2dcbf58l01dzq"; depends=[dplyr foreach ggplot2 lubridate scales]; }; xrf = derive2 { name="xrf"; version="0.2.0"; sha256="0hzplp2rbsbnmqpvf7ycjzbyf59iabzsppf13xwypdjxyr7f910l"; depends=[dplyr fuzzyjoin glmnet Matrix rlang xgboost]; }; xrnet = derive2 { name="xrnet"; version="0.1.7"; sha256="136aadrvsdg9hizjg4q12h56ih0s3w88j3jpfb54ajgdmqw3pldi"; depends=[BH bigmemory foreach Rcpp RcppEigen]; }; - xseq = derive2 { name="xseq"; version="0.2.1"; sha256="0bsakbfvkfv39q2ch2g21b17g84470sq4v73355cljlshsi6404i"; depends=[e1071 gptk impute preprocessCore RColorBrewer sfsmisc]; }; xslt = derive2 { name="xslt"; version="1.4.2"; sha256="08iw0s1b8fcsw3hqzxc4mxfbw121c7ajf05nr6gbj996sr033qqr"; depends=[Rcpp xml2]; }; xsp = derive2 { name="xsp"; version="0.1.2"; sha256="1jbmxa234v52qji8sz4bkg24c2n65b0zh9py1wyyfzw9n1wx5w0r"; depends=[ggplot2 reshape2]; }; xspliner = derive2 { name="xspliner"; version="0.0.4"; sha256="1j3wlw39r3ahhdfq3rks1zhnlmz14f4wk7bl7gf94yffasqg6k2r"; depends=[dplyr ggplot2 magrittr mgcv pdp pROC purrr tidyr]; }; @@ -16065,7 +16769,7 @@ in with self; { xtensor = derive2 { name="xtensor"; version="0.11.1-0"; sha256="1l9216z46m45vnc69j4qx336ln82qgpagi5m9qa5pabvcpz9b23p"; depends=[Rcpp]; }; xtermStyle = derive2 { name="xtermStyle"; version="3.0.5"; sha256="1q4qq8w4sgxbbb1x0i4k5xndvwisvjszg830wspwb37wigxz8xvz"; depends=[]; }; xtreg2way = derive2 { name="xtreg2way"; version="1.0.0"; sha256="0wllz0frakmadavgpqhd2b8fiw6wgwh5wzd270czc6cm5bq9gfng"; depends=[MASS Matrix pracma]; }; - xts = derive2 { name="xts"; version="0.12-0"; sha256="0q4cc8ynp7ndmgll1jj3lxyl6wmgg89ad3wq09kjc2ngszdfc4fz"; depends=[zoo]; }; + xts = derive2 { name="xts"; version="0.12.1"; sha256="0b6a7mpyk9aw6axas7nz01gadczprwwfhii01fz31z26z555i06n"; depends=[zoo]; }; xtune = derive2 { name="xtune"; version="0.1.0"; sha256="0bpf1cx7v7q0a1jip04xd0bjg9ilagrf7wg7a9y0m6wgw7s2b9jn"; depends=[glmnet selectiveInference]; }; xwf = derive2 { name="xwf"; version="0.2-3"; sha256="1byj6vjk2abm9j919107xsa3nd40zbsvxaldvv4ml3c47k1fg3kc"; depends=[mgcv]; }; xxIRT = derive2 { name="xxIRT"; version="2.1.2"; sha256="0b8yv8ixmcjiv9hlvpfdknx815smy7df7f2ixifnvhxxafgf1fwq"; depends=[ggplot2 glpkAPI lpSolveAPI reshape2]; }; @@ -16073,11 +16777,12 @@ in with self; { xyz = derive2 { name="xyz"; version="0.2"; sha256="13w4sb4pvgciwr8wsz785dafj2k2kpx7znz46r5d32wx88vkycp4"; depends=[Rcpp]; }; yaImpute = derive2 { name="yaImpute"; version="1.0-32"; sha256="1zvkrmlj48ahg9jq0fkbn7j603fmmld57yc0gjfas2mqa7cfbvh8"; depends=[]; }; yacca = derive2 { name="yacca"; version="1.1.1"; sha256="1hxgkyxipk27p74vdkiy8a3wjymhcsc6ad3y9mf15qsl2xim6wwl"; depends=[]; }; - yager = derive2 { name="yager"; version="0.1.0"; sha256="01gxpaf4wvii056xn84m9gkq46m7hxqgg5f2frakhgnlpm3afgfb"; depends=[lhs MLmetrics randtoolbox]; }; + yager = derive2 { name="yager"; version="0.1.1"; sha256="178ypdr3f0w9rb4ci8q2hshr62b7993m8q6zxc4pf0msq175n1ml"; depends=[lhs MLmetrics randtoolbox]; }; yakmoR = derive2 { name="yakmoR"; version="0.1.1"; sha256="09aklz79s0911p2wnpd7gc6vrbr9lmiskhkahsc63pdigggmq9f7"; depends=[BBmisc checkmate Rcpp]; }; yaml = derive2 { name="yaml"; version="2.2.1"; sha256="10r7g26x73am45niigm3k466030nymnr3v3fjljafzrr5aybf58i"; depends=[]; }; - yamlet = derive2 { name="yamlet"; version="0.4.8"; sha256="1p6p20lpagm62xfkvhy1fya3ypxbpza29gmls63a3ry2nir8zadp"; depends=[csv dplyr encode ggplot2 rlang spork units xtable yaml]; }; - yap = derive2 { name="yap"; version="0.1.0"; sha256="12cagxisky7aq04ab9ycd4mp7xfs7z0v3rc2sczcngn2pc8pdjm7"; depends=[lhs randtoolbox]; }; + yamlet = derive2 { name="yamlet"; version="0.5.2"; sha256="0vm87jp44myg118sc9712imrz83nhfwxabnjkzi8a36hdiyhpq80"; depends=[csv dplyr encode ggplot2 rlang spork units xtable yaml]; }; + yamlme = derive2 { name="yamlme"; version="0.1.0"; sha256="0834rfc2d9awdvj9xirxywjhkh2nvp7fy68rd7l3yzz14rfv8c40"; depends=[knitr testthat]; }; + yap = derive2 { name="yap"; version="0.1.1"; sha256="0m126vpfvlmwkpy14i9wbzr51hb8r6s3wcdm3vp9izfccpnxfxl2"; depends=[lhs randtoolbox]; }; yardstick = derive2 { name="yardstick"; version="0.0.7"; sha256="1yrvlhn4gxyn9f20z5yv3xam0j0a8z362jwa32r33r0g0jk5z2fq"; depends=[dplyr generics pROC rlang tidyselect]; }; yarr = derive2 { name="yarr"; version="0.1.2"; sha256="16q109jrydckz7s1rkmr2sh8q92cgr1c534fvpbh3h0bc3fvvf8g"; depends=[]; }; yarrr = derive2 { name="yarrr"; version="0.1.5"; sha256="1258bj7x4icaxfabnnd3fgwydnqbzxkih7zw0sdlwdax3q8fw5c5"; depends=[BayesFactor circlize jpeg]; }; @@ -16091,7 +16796,8 @@ in with self; { yll = derive2 { name="yll"; version="1.0.0"; sha256="0lf3cd6pfzki29nk2iy0vd6v4dw6zlsbrjh2839zq5vlpiimsvck"; depends=[]; }; ymlthis = derive2 { name="ymlthis"; version="0.1.2"; sha256="01jfkf9ymj8p0gvcd491i7rfaw3mj101jqbkbxmwhv7rl4r2vmql"; depends=[crayon fs glue magrittr miniUI purrr rlang rmarkdown rstudioapi shiny shinyBS stringr usethis whoami withr yaml]; }; yonder = derive2 { name="yonder"; version="0.2.0"; sha256="1ilzn17w6skd0dhwxyrgnfzyazafp8hsi8q6pfxz6k16cd668mc0"; depends=[htmltools magrittr shiny]; }; - yorkr = derive2 { name="yorkr"; version="0.0.9"; sha256="1yl6snk2qw8in4bd1gc32qzk10baqnwzxyamnyj7p39vqi8vr12p"; depends=[dplyr ggplot2 gridExtra reshape2 rpart_plot yaml]; }; + yorkr = derive2 { name="yorkr"; version="0.0.12"; sha256="1kmwnhk2n8y2y7cynffkxl8ac4n4d4srwfsfblnyfn4r1g6l2wrl"; depends=[dplyr ggplot2 gridExtra reshape2 rpart_plot yaml]; }; + yotover = derive2 { name="yotover"; version="0.3.2"; sha256="1alfw005k17830xgqa18hvyc1q058d9znjcc6kp2f6d0hc9mwjzb"; depends=[broom cli crayon DBI dbplyr dplyr duckdb ggplot2 httr lmtest magrittr Matrix msm purrr rappdirs rstudioapi sandwich tibble tidyr]; }; youtubecaption = derive2 { name="youtubecaption"; version="1.0.0"; sha256="15cafl7b03xrql2y2ayy6ajf6v764wym3xqs4pbzlf6ncy8qwl5r"; depends=[dplyr magrittr purrr reticulate stringr tibble writexl]; }; ypr = derive2 { name="ypr"; version="0.5.1"; sha256="15544gyxzavbamjfjsiq662c9y2zkfxn14a481318358sdhln5vn"; depends=[chk ggplot2 lifecycle purrr scales yesno]; }; yuima = derive2 { name="yuima"; version="1.9.6"; sha256="1iqcv6m2lbdnpkcmgbmjhdn233pq3b2g6s9naiq3ks0fyv04zpar"; depends=[boot cubature expm glassoFast mvtnorm Rcpp RcppArmadillo zoo]; }; @@ -16099,40 +16805,41 @@ in with self; { yum = derive2 { name="yum"; version="0.0.1"; sha256="1q8yxn18nia7jh6g2016hxm81d2jak8pwylr6nai9kfynv9wri0g"; depends=[yaml]; }; yummlyr = derive2 { name="yummlyr"; version="0.1.1"; sha256="0xrk6g58laksz92d8mxck923sk4j92g55szrkxk123wjp5kg9vx6"; depends=[httr jsonlite]; }; zCompositions = derive2 { name="zCompositions"; version="1.3.4"; sha256="15cfqk1vzamz66y9idnrwxlrp2sirkp44gwkcmia4s13x5pwh8mf"; depends=[MASS NADA truncnorm]; }; - zFactor = derive2 { name="zFactor"; version="0.1.9"; sha256="1x0cfcmnmpb8dq6wn6538ghlz9cm00grv54dj91hvb09i96cp95x"; depends=[covr data_table dplyr ggplot2 knitcitations logging rootSolve tibble tidyr]; }; + zGPS_AO = derive2 { name="zGPS.AO"; version="0.1.0"; sha256="18dqssnj4gch1yg0qvrj4j2ry95sy6a9z8yz2zi8nzhhsj8dz1qq"; depends=[doParallel doRNG dplyr foreach ggplot2 hrbrthemes MASS plotly pscl questionr viridis]; }; zTree = derive2 { name="zTree"; version="1.0.6"; sha256="1mywxrx6bw7dzhrdwyxbjzc8ikgvw423zycyji0jjr69cfhpmywv"; depends=[plyr]; }; zalpha = derive2 { name="zalpha"; version="0.2.0"; sha256="0wyk4smrch5c0jnzi8z0in1hcbfsddgw4n28dljj917wyg5cnmqd"; depends=[]; }; zbank = derive2 { name="zbank"; version="0.1.0"; sha256="0vzvlri3sncvbz2cdg8wzlpskm1lq9ji0jrfy5cx4ib19m6gxhpc"; depends=[crul jsonlite tibble]; }; - zcurve = derive2 { name="zcurve"; version="1.0.0"; sha256="14a07yn4wjj29kx33g7mnlsky0jg8zj1hs9r9hn0i0yv4jfdl5jl"; depends=[evmix nleqslv Rcpp Rdpack]; }; + zcurve = derive2 { name="zcurve"; version="1.0.7"; sha256="0v3lk11my8a8y9zbjb2ii35i5vfhlhvsh597zqlvq4div1a81rh4"; depends=[evmix nleqslv Rcpp Rdpack]; }; + zdeskR = derive2 { name="zdeskR"; version="0.1.0"; sha256="1445bkngmv6zzw5vxd3jfwcp8hv5mjs6h9rignndznlax0szv80n"; depends=[dplyr httr jsonlite magrittr plyr purrr tibble tidyr tidyselect]; }; zeallot = derive2 { name="zeallot"; version="0.1.0"; sha256="1sd1igcfnv27pa3bqxlbyxchi562h7grnjg1l7wxx3bwr49i57s3"; depends=[]; }; - zebu = derive2 { name="zebu"; version="0.1.2"; sha256="0f9fsb4z8s7k5jnz2ayd52dzri0z46kjbm0gi5rfqjlmk13bhgk4"; depends=[foreach ggplot2 iterators plyr reshape2]; }; + zebu = derive2 { name="zebu"; version="0.1.3.0"; sha256="1rlcrvhic110h8r0mqwhkzq8w566jfymxpcwv63bvs7fd8j98vsv"; depends=[foreach ggplot2 iterators plyr reshape2]; }; zeitgebr = derive2 { name="zeitgebr"; version="0.3.5"; sha256="1h2zx3ah1xdyyag40ragrv7gvpnlzqmappbnjp971dn9khqdxfqs"; depends=[behavr data_table lomb pracma WaveletComp]; }; - zen4R = derive2 { name="zen4R"; version="0.3"; sha256="029wjw0bay9p4fgd4rnmqzhrpn5q2azx0w9fvlr4mcsnwzjk9kib"; depends=[httr jsonlite R6 rvest xml2]; }; + zen4R = derive2 { name="zen4R"; version="0.4-2"; sha256="0wbh12frr75rcb4rjk6jymrjr6jaixik5br61bhmnax1hhwkp3k3"; depends=[httr jsonlite keyring R6 xml2]; }; zendeskR = derive2 { name="zendeskR"; version="0.4"; sha256="06cjwk08w3x6dx717123psinid5bx6c563jnfn890373jw6xnfrk"; depends=[RCurl rjson]; }; + zenplots = derive2 { name="zenplots"; version="1.0.3"; sha256="0nazbivb3cz2ccswnffi31i8l32iqprpzrf5v7iazw9s40c6nxrq"; depends=[graph loon MASS PairViz]; }; zeroEQpart = derive2 { name="zeroEQpart"; version="0.1.0"; sha256="1n24nqyl0irpyspwx4b73xy228a84aa8zsn9fcf2lrlni5vyzmm0"; depends=[MASS ppcor]; }; zetadiv = derive2 { name="zetadiv"; version="1.2.0"; sha256="0068k5i0dvii3dckgis5424xb7sqqq9s670vgfavc0vncnlycxqk"; depends=[car glm2 Imap mgcv nnls scam vegan]; }; zfa = derive2 { name="zfa"; version="1.0"; sha256="0lddwpifkzggzvy56ans5pfknfr8laxcg264f3ph2z150gw1plsh"; depends=[SKAT]; }; zfit = derive2 { name="zfit"; version="0.1.0"; sha256="0r6qdygpqd06vmfvj68ksxm3bz0jgalczr6rngcr4xl2mkb1cn38"; depends=[magrittr]; }; zic = derive2 { name="zic"; version="0.9.1"; sha256="1vd64ljigf6iwgzlgdxgj65nlwir176h7ddznddpaz2abh6n6zwp"; depends=[coda Rcpp RcppArmadillo]; }; - zip = derive2 { name="zip"; version="2.1.0"; sha256="1dfsagb7bx35x4zx6f5xk2sk057fbyhskkpw3w72b805cjw920da"; depends=[]; }; + zip = derive2 { name="zip"; version="2.1.1"; sha256="0b3wmbx5v0i1scylgk4nli2ljg4p12wx7a1sqljklv9969wl3p8i"; depends=[]; }; zipR = derive2 { name="zipR"; version="0.1.1"; sha256="1aaw3dslhsw3zgxvkc1v60vsk44x64i4qmjwx0gq4f7dad1rbiqp"; depends=[]; }; zipangu = derive2 { name="zipangu"; version="0.2.1"; sha256="0jqr9byzdz6k0prdsr7d6yk0d8d412hplg9iclgfdx2cj1kk6w7r"; depends=[dplyr lifecycle lubridate magrittr purrr rlang stringi stringr tibble]; }; - zipfR = derive2 { name="zipfR"; version="0.6-66"; sha256="0fjqa9a4z2p21ywy8h3pg0gwq4gwzjnrl78kn1nswly3w637574h"; depends=[]; }; + zipcodeR = derive2 { name="zipcodeR"; version="0.2.0"; sha256="1zm5pikjdnw9n9dlxrnxkgn9j3ixpmbs46lf75ik98nck8ndkrr3"; depends=[dplyr rlang stringr]; }; + zipfR = derive2 { name="zipfR"; version="0.6-70"; sha256="15ng7rj7qbgxajx8jb9kv04xmbidg9wwzxr2xaskmlaxrxlqac8c"; depends=[]; }; zipfextR = derive2 { name="zipfextR"; version="1.0.2"; sha256="03rlvvw7rfbhsbwd5njmgkkkrxq1lgjdydmpkn6h1hi97pc0gbhh"; depends=[copula tolerance VGAM]; }; ziphsmm = derive2 { name="ziphsmm"; version="2.0.6"; sha256="0lm6m2g9jd1v7gxv4viych8c59phbvz1yly1ydgajl8q251d8n87"; depends=[pracma Rcpp RcppArmadillo]; }; - zoeppritz = derive2 { name="zoeppritz"; version="1.0-7"; sha256="14j9jl2g7gn94nzs96mwsgwlxnfbr1crjfmfwbi3rk367xi197jb"; depends=[]; }; + zoeppritz = derive2 { name="zoeppritz"; version="1.0-8"; sha256="1711szx9zz17q6pfinyzlyrw7m9772c8ywlixqar2l165bkjalgm"; depends=[]; }; zoib = derive2 { name="zoib"; version="1.5.4"; sha256="10hv5li1l9gm1bl3k3c9qcmzkqa4ri0kccrsgw1mn8ddn11g9m0a"; depends=[abind coda Formula matrixcalc rjags]; }; zoltr = derive2 { name="zoltr"; version="0.5.1"; sha256="12zh7y3pwidclscgvd0b0iaqq9j5y8mc8xd6pz4vs0jy5qs3ahar"; depends=[base64url dplyr httr jsonlite magrittr MMWRweek mockery readr rlang webmockr]; }; zonator = derive2 { name="zonator"; version="0.6.0"; sha256="1plxchpd4ypp36phl13pi9yvlrqi3lk83lv5rldrhdqynhcgfw2k"; depends=[ggplot2 raster RColorBrewer reshape2 rgdal]; }; zoo = derive2 { name="zoo"; version="1.8-8"; sha256="1rrw431jwaxd9xljp73f15rhcxvwc0xlyrmr0ghi5fj7a03c932f"; depends=[lattice]; }; zooaRch = derive2 { name="zooaRch"; version="1.2"; sha256="0grc378xppv0303sf4flfqz5002vq5a23nzbq4bsff41rww7dihc"; depends=[ggplot2]; }; - zooaRchGUI = derive2 { name="zooaRchGUI"; version="1.0.2"; sha256="0snggx0d69ajz6xxwnv03l12jpjrjkpy2dgf4lrpm2l8rspd27i4"; depends=[car coda foreign geomorph ggplot2 MASS pgirmess raster readxl rjags sp spdep splancs tcltk2 tkrplot vegan]; }; - zoocat = derive2 { name="zoocat"; version="0.2.0.1"; sha256="0rdjgf1gvnixqwxrnvzswb53yzcvjgvfkrms6d38bhfyw320kgdp"; depends=[plyr reshape2 scales zoo]; }; zooimage = derive2 { name="zooimage"; version="5.5.2"; sha256="0ck8w0zb9l1n9xvjwqshq9q9l8pigy3yslq2hnfbgcwk17kk9mp8"; depends=[digest DT filehash jpeg MASS mda mlearning png shiny svDialogs svMisc tiff]; }; zoom = derive2 { name="zoom"; version="2.0.4"; sha256="03f5rxfr6ncf1j6vpn7pip21q7ylj4bx0a5xphqb6x6i33lxf1g5"; depends=[]; }; zoon = derive2 { name="zoon"; version="0.6.5"; sha256="02y29vr2yn8al69km8faiqrwjrc1r3hsvw3dg8lwjr65cxw1krip"; depends=[dismo plyr randomForest raster RCurl rfigshare rgdal roxygen2 rworldmap sp testthat]; }; zscorer = derive2 { name="zscorer"; version="0.3.1"; sha256="0aijhs0fyird5gq68x4dxchb02mxa7ijk10k9zjhngghxbjj7iqn"; depends=[shiny]; }; - ztable = derive2 { name="ztable"; version="0.2.0"; sha256="0g7khk5ifsdh9p31wlwh2l5mn1hzxzpv6qcn1wh34vsfjdmijjwy"; depends=[flextable magrittr moonBook officer RColorBrewer scales stringr]; }; + ztable = derive2 { name="ztable"; version="0.2.2"; sha256="0wxcdb7yp2r6w5iznz1k49npp5sn4jiybfcj30s3198hkcnv0r8y"; depends=[flextable magrittr officer RColorBrewer rstudioapi scales stringr]; }; ztpln = derive2 { name="ztpln"; version="0.1.1"; sha256="18rbfdp22jaxg4nkqzj2393nhjdl1gzv4xhmr6aci76ymdixsfnl"; depends=[DistributionUtils mixtools Rcpp RcppEigen RcppNumerical]; }; ztype = derive2 { name="ztype"; version="0.1.0"; sha256="0brbq2rgkl4mhjbb70kkfv47lzs66k9ppfs2klavcbripirxn5fx"; depends=[assertthat dplyr ggplot2 lubridate magrittr rvest stringr]; }; zyp = derive2 { name="zyp"; version="0.10-1.1"; sha256="03cxpkfbhrx1fy8l0dl9a13ghz93cqq6877wa8rig09ksdiivaw9"; depends=[Kendall]; }; diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 292653d75e51..5492874efda1 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -283,7 +283,6 @@ let odbc = [ pkgs.unixODBC ]; pander = [ pkgs.pandoc pkgs.which ]; pbdMPI = [ pkgs.openmpi ]; - pbdNCDF4 = [ pkgs.netcdf ]; pbdPROF = [ pkgs.openmpi ]; pbdZMQ = lib.optionals stdenv.isDarwin [ pkgs.which ]; pdftools = [ pkgs.poppler.dev ]; @@ -380,6 +379,7 @@ let rmutil = lib.optionals stdenv.isDarwin [ pkgs.libiconv ]; robustbase = lib.optionals stdenv.isDarwin [ pkgs.libiconv ]; SparseM = lib.optionals stdenv.isDarwin [ pkgs.libiconv ]; + hexbin = lib.optionals stdenv.isDarwin [ pkgs.libiconv ]; svKomodo = [ pkgs.which ]; nat = [ pkgs.which ]; nat_templatebrains = [ pkgs.which ]; @@ -478,7 +478,6 @@ let "Demerelate" "detrendeR" "dgmb" - "DivMelt" "dpa" "DSpat" "dynamicGraph" @@ -498,14 +497,12 @@ let "forensim" "FreeSortR" "fscaret" - "fSRM" "gcmr" "geomorph" "geoR" "georob" "GGEBiplotGUI" "gnm" - "GPCSIV" "GrapheR" "GroupSeq" "gsubfn" @@ -580,7 +577,6 @@ let "RcmdrPlugin_orloca" "RcmdrPlugin_plotByGroup" "RcmdrPlugin_pointG" - "RcmdrPlugin_qual" "RcmdrPlugin_ROC" "RcmdrPlugin_sampling" "RcmdrPlugin_SCDA" @@ -606,7 +602,6 @@ let "soundecology" "spatsurv" "sqldf" - "SRRS" "SSDforR" "statcheck" "StatDA" @@ -623,8 +618,6 @@ let "tcltk2" "TestScorer" "TIMP" - "titan" - "tkrgl" "tkrplot" "tmap" "tspmeta" @@ -698,7 +691,6 @@ let data_table = old.data_table.overrideDerivation (attrs: { NIX_CFLAGS_COMPILE = attrs.NIX_CFLAGS_COMPILE + " -fopenmp"; patchPhase = "patchShebangs configure"; - postInstall = "mv $out/library/data.table/libs/{data.table,datatable}.so"; }); ModelMetrics = old.ModelMetrics.overrideDerivation (attrs: { diff --git a/pkgs/development/r-modules/generate-r-packages.R b/pkgs/development/r-modules/generate-r-packages.R index df489cdcacb5..510eccd3f40a 100755 --- a/pkgs/development/r-modules/generate-r-packages.R +++ b/pkgs/development/r-modules/generate-r-packages.R @@ -43,8 +43,12 @@ nixPrefetch <- function(name, version) { } +escapeName <- function(name) { + switch(name, "import" = "r_import", "assert" = "r_assert", name) +} + formatPackage <- function(name, version, sha256, depends, imports, linkingTo) { - name <- ifelse(name == "import", "r_import", name) + name <- escapeName(name) attr <- gsub(".", "_", name, fixed=TRUE) options(warn=5) depends <- paste( if (is.na(depends)) "" else gsub("[ \t\n]+", "", depends) @@ -56,7 +60,7 @@ formatPackage <- function(name, version, sha256, depends, imports, linkingTo) { depends <- lapply(depends, gsub, pattern="([^ \t\n(]+).*", replacement="\\1") depends <- lapply(depends, gsub, pattern=".", replacement="_", fixed=TRUE) depends <- depends[depends %in% knownPackages] - depends <- lapply(depends, function(d) ifelse(d == "import", "r_import", d)) + depends <- lapply(depends, escapeName) depends <- paste(depends) depends <- paste(sort(unique(depends)), collapse=" ") paste0(" ", attr, " = derive2 { name=\"", name, "\"; version=\"", version, "\"; sha256=\"", sha256, "\"; depends=[", depends, "]; };") diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 83749bd21a5d..ba2bb33b5a64 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -19,7 +19,7 @@ { lib, fetchurl, writeScript, ruby, kerberos, libxml2, libxslt, python, stdenv, which , libiconv, postgresql, v8, clang, sqlite, zlib, imagemagick -, pkgconfig , ncurses, xapian, gpgme, util-linux, tzdata, icu, libffi +, pkg-config , ncurses, xapian, gpgme, util-linux, tzdata, icu, libffi , cmake, libssh2, openssl, libmysqlclient, darwin, git, perl, pcre, gecode_3, curl , msgpack, libsodium, snappy, libossp_uuid, lxc, libpcap, xorg, gtk2, buildRubyGem , cairo, re2, rake, gobject-introspection, gdk-pixbuf, zeromq, czmq, graphicsmagick, libcxx @@ -41,7 +41,7 @@ in { atk = attrs: { dependencies = attrs.dependencies ++ [ "gobject-introspection" ]; - nativeBuildInputs = [ rake bundler pkgconfig ]; + nativeBuildInputs = [ rake bundler pkg-config ]; propagatedBuildInputs = [ gobject-introspection wrapGAppsHook atk ]; }; @@ -61,12 +61,12 @@ in }; cairo = attrs: { - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2 pcre xorg.libpthreadstubs xorg.libXdmcp]; }; cairo-gobject = attrs: { - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ cairo pcre xorg.libpthreadstubs xorg.libXdmcp ]; }; @@ -75,7 +75,7 @@ in }; cld3 = attrs: { - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ protobuf ]; }; @@ -180,12 +180,12 @@ in }; ffi = attrs: { - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libffi ]; }; gdk_pixbuf2 = attrs: { - nativeBuildInputs = [ pkgconfig bundler rake ]; + nativeBuildInputs = [ pkg-config bundler rake ]; propagatedBuildInputs = [ gobject-introspection wrapGAppsHook gdk-pixbuf ]; }; @@ -195,7 +195,7 @@ in }; gio2 = attrs: { - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2 pcre gobject-introspection ] ++ lib.optionals stdenv.isLinux [ util-linux libselinux libsepol ]; }; @@ -212,13 +212,13 @@ in }; glib2 = attrs: { - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2 pcre ]; }; gtk2 = attrs: { nativeBuildInputs = [ - binutils pkgconfig + binutils pkg-config ] ++ lib.optionals stdenv.isLinux [ util-linux libselinux libsepol ]; @@ -238,12 +238,12 @@ in }; gobject-introspection = attrs: { - nativeBuildInputs = [ pkgconfig pcre ]; + nativeBuildInputs = [ pkg-config pcre ]; propagatedBuildInputs = [ gobject-introspection wrapGAppsHook glib ]; }; grpc = attrs: { - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]; hardeningDisable = [ "format" ]; NIX_CFLAGS_COMPILE = toString [ @@ -320,7 +320,7 @@ in cmake bison flex - pkgconfig + pkg-config python3 ]; @@ -417,7 +417,7 @@ in pango = attrs: { nativeBuildInputs = [ - pkgconfig + pkg-config fribidi harfbuzz pcre @@ -475,7 +475,7 @@ in }; rmagick = attrs: { - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ imagemagick which ]; }; @@ -484,7 +484,7 @@ in }; ruby-libvirt = attrs: { - buildInputs = [ libvirt pkgconfig ]; + buildInputs = [ libvirt pkg-config ]; buildFlags = [ "--with-libvirt-include=${libvirt}/include" "--with-libvirt-lib=${libvirt}/lib" @@ -519,8 +519,8 @@ in }; rugged = attrs: { - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ which cmake openssl libssh2 zlib ]; + nativeBuildInputs = [ cmake pkg-config which ]; + buildInputs = [ openssl libssh2 zlib ]; dontUseCmakeConfigure = true; }; @@ -587,7 +587,7 @@ in }; tiny_tds = attrs: { - nativeBuildInputs = [ pkgconfig openssl ]; + nativeBuildInputs = [ pkg-config openssl ]; buildInputs = [ freetds ]; }; @@ -616,7 +616,7 @@ in xapian-ruby = attrs: { # use the system xapian dontBuild = false; - nativeBuildInputs = [ rake pkgconfig bundler ]; + nativeBuildInputs = [ rake pkg-config bundler ]; buildInputs = [ xapian zlib ]; postPatch = '' cp ${./xapian-Rakefile} Rakefile diff --git a/pkgs/development/ruby-modules/rbenv/default.nix b/pkgs/development/ruby-modules/rbenv/default.nix index dd6b1d95b4b6..c3c462332691 100644 --- a/pkgs/development/ruby-modules/rbenv/default.nix +++ b/pkgs/development/ruby-modules/rbenv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, bash, installShellFiles }: +{ lib, stdenv, fetchFromGitHub, bash, installShellFiles }: stdenv.mkDerivation rec { pname = "rbenv"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { installShellCompletion completions/rbenv.{bash,zsh} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Groom your app’s Ruby environment"; longDescription = '' Use rbenv to pick a Ruby version for your application and guarantee that your development environment matches production. diff --git a/pkgs/development/tools/ameba/default.nix b/pkgs/development/tools/ameba/default.nix index b46f6efd634c..f8cb74411161 100644 --- a/pkgs/development/tools/ameba/default.nix +++ b/pkgs/development/tools/ameba/default.nix @@ -11,7 +11,7 @@ crystal.buildCrystalPackage rec { sha256 = "0yhb8vfrfzsm3a45h2jmcrn1n7jy3zn2hwims3dikgq8kaggws9y"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A static code analysis tool for Crystal"; homepage = "https://crystal-ameba.github.io"; license = licenses.mit; diff --git a/pkgs/development/tools/analysis/hotspot/default.nix b/pkgs/development/tools/analysis/hotspot/default.nix index f04d060290f1..de29b29df311 100644 --- a/pkgs/development/tools/analysis/hotspot/default.nix +++ b/pkgs/development/tools/analysis/hotspot/default.nix @@ -27,8 +27,8 @@ mkDerivation rec { fetchSubmodules = true; }; + nativeBuildInputs = [ cmake ]; buildInputs = [ - cmake elfutils extra-cmake-modules kconfigwidgets @@ -50,8 +50,6 @@ mkDerivation rec { mkdir -p 3rdparty/perfparser/.git ''; - enableParallelBuilding = true; - meta = { description = "A GUI for Linux perf"; longDescription = '' diff --git a/pkgs/development/tools/analysis/ikos/default.nix b/pkgs/development/tools/analysis/ikos/default.nix index 7108e9311b82..26c7b6dd0b70 100644 --- a/pkgs/development/tools/analysis/ikos/default.nix +++ b/pkgs/development/tools/analysis/ikos/default.nix @@ -20,7 +20,8 @@ stdenv.mkDerivation rec { sha256 = "0k3kp1af0qx3l1x6a4sl4fm8qlwchjvwkvs2ck0fhfnc62q2im5f"; }; - buildInputs = [ cmake boost tbb gmp clang llvm sqlite python + nativeBuildInputs = [ cmake ]; + buildInputs = [ boost tbb gmp clang llvm sqlite python ocamlPackages.apron mpfr ppl doxygen graphviz ]; cmakeFlags = [ "-DAPRON_ROOT=${ocamlPackages.apron}" ]; diff --git a/pkgs/development/tools/analysis/include-what-you-use/default.nix b/pkgs/development/tools/analysis/include-what-you-use/default.nix index 8bda0ac2223f..671572181544 100644 --- a/pkgs/development/tools/analysis/include-what-you-use/default.nix +++ b/pkgs/development/tools/analysis/include-what-you-use/default.nix @@ -15,8 +15,6 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DIWYU_LLVM_ROOT_PATH=${llvmPackages.clang-unwrapped}" ]; - enableParallelBuilding = true; - postInstall = '' substituteInPlace $out/bin/iwyu_tool.py \ --replace "'include-what-you-use'" "'$out/bin/include-what-you-use'" diff --git a/pkgs/development/tools/analysis/kcov/default.nix b/pkgs/development/tools/analysis/kcov/default.nix index bbea8a1dd65d..8c75842d1b69 100644 --- a/pkgs/development/tools/analysis/kcov/default.nix +++ b/pkgs/development/tools/analysis/kcov/default.nix @@ -16,8 +16,6 @@ stdenv.mkDerivation rec { buildInputs = [ zlib curl elfutils python libiberty libopcodes ]; - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "Code coverage tester for compiled programs, Python scripts and shell scripts"; diff --git a/pkgs/development/tools/analysis/lcov/default.nix b/pkgs/development/tools/analysis/lcov/default.nix index 6ac778180b77..c6faeaa72f23 100644 --- a/pkgs/development/tools/analysis/lcov/default.nix +++ b/pkgs/development/tools/analysis/lcov/default.nix @@ -1,24 +1,16 @@ - {stdenv, fetchurl, fetchpatch, perl, perlPackages, makeWrapper }: + {stdenv, fetchFromGitHub, perl, perlPackages, makeWrapper }: stdenv.mkDerivation rec { - name = "lcov-1.14"; + pname = "lcov"; + version = "1.15"; - src = fetchurl { - url = "mirror://sourceforge/ltp/${name}.tar.gz"; - sha256 = "06h7ixyznf6vz1qvksjgy5f3q2nw9akf6zx59npf0h3l32cmd68l"; + src = fetchFromGitHub { + owner = "linux-test-project"; + repo = "lcov"; + rev = "v${version}"; + sha256 = "1kvc7fkp45w48f0bxwbxvxkicnjrrydki0hllg294n1wrp80zzyk"; }; - patches = - [ (fetchpatch { - url = "https://github.com/linux-test-project/lcov/commit/ebfeb3e179e450c69c3532f98cd5ea1fbf6ccba7.patch"; - sha256 = "0dalkqbjb6a4vp1lcsxd39dpn5fzdf7ihsjbiviq285s15nxdj1j"; - }) - (fetchpatch { - url = "https://github.com/linux-test-project/lcov/commit/75fbae1cfc5027f818a0bb865bf6f96fab3202da.patch"; - sha256 = "0v1hn0511dxqbf50ppwasc6vmg0m6rns7ydbdy2rdbn0j7gxw30x"; - }) - ]; - buildInputs = [ perl makeWrapper ]; preBuild = '' @@ -28,6 +20,7 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/lcov --set PERL5LIB ${perlPackages.makeFullPerlPath [ perlPackages.PerlIOgzip perlPackages.JSON ]} + wrapProgram $out/bin/genpng --set PERL5LIB ${perlPackages.makeFullPerlPath [ perlPackages.GD ]} ''; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix index e86ef2532498..a3c02503b379 100644 --- a/pkgs/development/tools/analysis/radare2/default.nix +++ b/pkgs/development/tools/analysis/radare2/default.nix @@ -56,11 +56,6 @@ let # radare 3.3 compat for radare2-cutter (cd shlr && ln -s ../capstone-${cs_ver} capstone) tar -czvf shlr/capstone-${cs_ver}.tar.gz capstone-${cs_ver} - # necessary because they broke the offline-build: - # https://github.com/radare/radare2/commit/6290e4ff4cc167e1f2c28ab924e9b99783fb1b38#diff-a44d840c10f1f1feaf401917ae4ccd54R258 - # https://github.com/radare/radare2/issues/13087#issuecomment-465159716 - curl() { true; } - export -f curl ''; postInstall = '' @@ -110,12 +105,12 @@ in { # # DO NOT EDIT! Automatically generated by ./update.py radare2 = generic { - version_commit = "24959"; - gittap = "4.5.1"; - gittip = "293cf5ae65ba4e28828095dcae212955593ba255"; - rev = "4.5.1"; - version = "4.5.1"; - sha256 = "0qigy1px0jy74c5ig73dc2fqjcy6vcy76i25dx9r3as6zfpkkaxj"; + version_commit = "25480"; + gittap = "5.0.0"; + gittip = "a476454c00f64acbb7425c178c98714ef76e26d7"; + rev = "5.0.0"; + version = "5.0.0"; + sha256 = "0aa7c27kd0l55fy5qfvxqmakp4pz6240v3hn84095qmqkzcbs420"; cs_ver = "4.0.2"; cs_sha256 = "0y5g74yjyliciawpn16zhdwya7bd3d7b1cccpcccc2wg8vni1k2w"; }; diff --git a/pkgs/development/tools/analysis/retdec/default.nix b/pkgs/development/tools/analysis/retdec/default.nix index b0e5319df2d6..1d2255027a4f 100644 --- a/pkgs/development/tools/analysis/retdec/default.nix +++ b/pkgs/development/tools/analysis/retdec/default.nix @@ -216,8 +216,6 @@ in stdenv.mkDerivation rec { substituteInPlace scripts/retdec-unpacker.py --replace "'upx'" "'${upx}/bin/upx'" ''; - enableParallelBuilding = true; - doInstallCheck = true; installCheckPhase = '' ${python3.interpreter} "$out/bin/retdec-tests-runner.py" diff --git a/pkgs/development/tools/analysis/rr/default.nix b/pkgs/development/tools/analysis/rr/default.nix index 5e80d5b096db..92f2494dbe28 100644 --- a/pkgs/development/tools/analysis/rr/default.nix +++ b/pkgs/development/tools/analysis/rr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, libpfm, zlib, pkgconfig, python3Packages, which, procps, gdb, capnproto }: +{ stdenv, fetchFromGitHub, cmake, libpfm, zlib, pkg-config, python3Packages, which, procps, gdb, capnproto }: stdenv.mkDerivation rec { version = "5.4.0"; @@ -21,9 +21,9 @@ stdenv.mkDerivation rec { # see https://github.com/mozilla/rr/issues/2269 preConfigure = ''substituteInPlace CMakeLists.txt --replace "std=c++11" "std=c++14"''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config which ]; buildInputs = [ - cmake libpfm zlib python3Packages.python python3Packages.pexpect which procps gdb capnproto + libpfm zlib python3Packages.python python3Packages.pexpect procps gdb capnproto ]; propagatedBuildInputs = [ gdb ]; # needs GDB to replay programs at runtime cmakeFlags = [ @@ -37,8 +37,6 @@ stdenv.mkDerivation rec { hardeningDisable = [ "fortify" ]; - enableParallelBuilding = true; - # FIXME #doCheck = true; diff --git a/pkgs/development/tools/analysis/snowman/default.nix b/pkgs/development/tools/analysis/snowman/default.nix index 2f7ff219081f..82eb58879f10 100644 --- a/pkgs/development/tools/analysis/snowman/default.nix +++ b/pkgs/development/tools/analysis/snowman/default.nix @@ -19,8 +19,6 @@ mkDerivation rec { export sourceRoot=$sourceRoot/src ''; - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "Native code to C/C++ decompiler"; homepage = "http://derevenets.com/"; diff --git a/pkgs/development/tools/analysis/tflint/default.nix b/pkgs/development/tools/analysis/tflint/default.nix index 1011bcb5cc0c..617d255d7e51 100644 --- a/pkgs/development/tools/analysis/tflint/default.nix +++ b/pkgs/development/tools/analysis/tflint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tflint"; - version = "0.22.0"; + version = "0.23.1"; src = fetchFromGitHub { owner = "terraform-linters"; repo = pname; rev = "v${version}"; - sha256 = "0wbxlh2lwgdhhw902lqy6p2vh8adfq4yaa507js8an3byy26ls3d"; + sha256 = "19vgan743xsnglwva93fs4sqcbpqbyrxbgn5qff809ns8hj8ir94"; }; - vendorSha256 = "0yk9xsb0s4kymfb3p14irks6b30b53r0mz7irgcmx9jxz8vyffqg"; + vendorSha256 = "1y6ra9bkp6wl0pikvyqywhg5w18v3glnyvwqrddkkkabspl05nqx"; doCheck = false; diff --git a/pkgs/development/tools/async/default.nix b/pkgs/development/tools/async/default.nix index e63f9a18a63a..54e16cb6faaf 100644 --- a/pkgs/development/tools/async/default.nix +++ b/pkgs/development/tools/async/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform }: +{ lib, stdenv, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { pname = "async"; @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1zgds5rjjikvaj0rxc7slyvkjn067s0v8vdnxn3vsv819q5yd707"; - meta = with stdenv.lib; { + meta = with lib; { description = "A tool to parallelize shell commands"; longDescription = '' `async` is a tool to run shell commands in parallel and is designed to be diff --git a/pkgs/development/tools/aws-sam-cli/default.nix b/pkgs/development/tools/aws-sam-cli/default.nix index 52b1a26d8143..8a48b43312eb 100644 --- a/pkgs/development/tools/aws-sam-cli/default.nix +++ b/pkgs/development/tools/aws-sam-cli/default.nix @@ -15,6 +15,22 @@ let }; }); + aws-sam-translator = super.aws-sam-translator.overridePythonAttrs (oldAttrs: rec { + version = "1.27.0"; + src = oldAttrs.src.override { + inherit version; + sha256 = "sha256-MlgSL0zWcbo9wUE4LdBBLBI9ufExe+2LJucin2NjRFQ="; + }; + }); + + dateparser = super.dateparser.overridePythonAttrs (oldAttrs: rec { + version = "0.7.0"; + src = oldAttrs.src.override { + inherit version; + sha256 = "sha256-lAgoGDyTe87FMHUyEbcPZzwKmquDHkMnNImzEFON/4Y="; + }; + }); + cookiecutter = super.cookiecutter.overridePythonAttrs (oldAttrs: rec { version = "1.6.0"; src = oldAttrs.src.override { @@ -68,7 +84,7 @@ buildPythonApplication rec { postPatch = '' substituteInPlace requirements/base.txt \ --replace "boto3~=1.14.0, >=1.14.23" "boto3~=1.14" \ - --replace "docker~=4.2.0" "docker~=4.3.1" \ + --replace "docker~=4.2.0" "docker~=4.3" \ --replace "jmespath~=0.9.5" "jmespath~=0.10.0" \ --replace "python-dateutil~=2.6, <2.8.1" "python-dateutil~=2.6" \ --replace "requests==2.23.0" "requests~=2.24" \ diff --git a/pkgs/development/tools/bloaty/default.nix b/pkgs/development/tools/bloaty/default.nix index 28df0aaa6963..fcab0fb198e2 100644 --- a/pkgs/development/tools/bloaty/default.nix +++ b/pkgs/development/tools/bloaty/default.nix @@ -16,8 +16,6 @@ stdenv.mkDerivation rec { buildInputs = [ zlib ]; - enableParallelBuilding = true; - doCheck = true; installPhase = '' diff --git a/pkgs/development/tools/boomerang/default.nix b/pkgs/development/tools/boomerang/default.nix index bec5357691f2..4ac9159520fb 100644 --- a/pkgs/development/tools/boomerang/default.nix +++ b/pkgs/development/tools/boomerang/default.nix @@ -14,8 +14,6 @@ mkDerivation rec { nativeBuildInputs = [ cmake bison flex ]; buildInputs = [ qtbase capstone ]; - enableParallelBuilding = true; - meta = with lib; { homepage = "https://github.com/BoomerangDecompiler/boomerang"; license = licenses.bsd3; diff --git a/pkgs/development/tools/build-managers/arpa2cm/default.nix b/pkgs/development/tools/build-managers/arpa2cm/default.nix index ef3062c6ca50..9ed9da0d268b 100644 --- a/pkgs/development/tools/build-managers/arpa2cm/default.nix +++ b/pkgs/development/tools/build-managers/arpa2cm/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "arpa2"; }; - buildInputs = [ cmake ]; + nativeBuildInputs = [ cmake ]; meta = with stdenv.lib; { description = "CMake Module library for the ARPA2 project"; diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index 385cb990c468..d38f42e4b338 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, fetchpatch +{ stdenv, lib, fetchurl, pkgconfig , bzip2, curl, expat, libarchive, xz, zlib, libuv, rhash , buildPackages # darwin attributes @@ -20,12 +20,12 @@ stdenv.mkDerivation rec { + lib.optionalString useNcurses "-cursesUI" + lib.optionalString withQt5 "-qt5UI" + lib.optionalString useQt4 "-qt4UI"; - version = "3.19.1"; + version = "3.19.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 = "1fisi9rlijw9wd0yjzk1c6j7ljnb2yiq5iqnrz6m1xkflyinw9hx"; + sha256 = "1w67w0ak6vf37501dlz9yhnzlvvpw1w10n2nm3hi7yxp4cxzvq73"; }; patches = [ @@ -38,12 +38,6 @@ stdenv.mkDerivation rec { # Derived from https://github.com/libuv/libuv/commit/1a5d4f08238dd532c3718e210078de1186a5920d ./libuv-application-services.patch - # Fix namelink failures, can be removed in 3.19.2+ - (fetchpatch { - url = "https://gitlab.kitware.com/cmake/cmake/-/commit/38bcb5c0a3accd2dd29fb7632c6b3bf31b990d82.patch"; - sha256 = "17yr66wrayhmavsz46b37zfwp2jcwab1zig2xqps39ysndf74qjc"; - }) - ] ++ lib.optional stdenv.isCygwin ./3.2.2-cygwin.patch; outputs = [ "out" ]; diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix index cd506b970f60..890c457da059 100644 --- a/pkgs/development/tools/build-managers/meson/default.nix +++ b/pkgs/development/tools/build-managers/meson/default.nix @@ -4,6 +4,7 @@ , writeTextDir , substituteAll , fetchpatch +, installShellFiles }: python3.pkgs.buildPythonApplication rec { @@ -77,6 +78,13 @@ python3.pkgs.buildPythonApplication rec { rm $out/nix-support/propagated-build-inputs ''; + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + installShellCompletion --zsh data/shell-completions/zsh/_meson + installShellCompletion --bash data/shell-completions/bash/meson + ''; + meta = with lib; { homepage = "https://mesonbuild.com"; description = "SCons-like build system that use python as a front-end language and Ninja as a building backend"; diff --git a/pkgs/development/tools/build-managers/wafHook/default.nix b/pkgs/development/tools/build-managers/wafHook/default.nix index 4184bd5fe8cd..2131caede3c8 100644 --- a/pkgs/development/tools/build-managers/wafHook/default.nix +++ b/pkgs/development/tools/build-managers/wafHook/default.nix @@ -1,7 +1,6 @@ -{ lib, stdenv, pkgs, python, makeSetupHook, waf }: +{ lib, stdenv, pkgs, makeSetupHook, waf }: makeSetupHook { - deps = [ python ]; substitutions = { inherit waf; crossFlags = lib.optionalString (stdenv.hostPlatform.system != stdenv.targetPlatform.system) diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix index e69e35442b3f..a680dd097fe6 100644 --- a/pkgs/development/tools/buildah/default.nix +++ b/pkgs/development/tools/buildah/default.nix @@ -14,13 +14,13 @@ buildGoModule rec { pname = "buildah"; - version = "1.18.0"; + version = "1.19.0"; src = fetchFromGitHub { owner = "containers"; repo = "buildah"; rev = "v${version}"; - sha256 = "0kn31y5g7269mjaw5ddfsiaan93s62i8zzxg4xl01dg3dkkadwc4"; + sha256 = "15ps4z41r8inyg0g1k8s9s3hkbnrl942w0n3957bv8g8gjihww0f"; }; outputs = [ "out" "man" ]; diff --git a/pkgs/development/tools/buildkit/default.nix b/pkgs/development/tools/buildkit/default.nix index 00a285c67d02..30a013dac11c 100644 --- a/pkgs/development/tools/buildkit/default.nix +++ b/pkgs/development/tools/buildkit/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "buildkit"; - version = "0.8.0"; + version = "0.8.1"; goPackagePath = "github.com/moby/buildkit"; subPackages = [ "cmd/buildctl" ] ++ stdenv.lib.optionals stdenv.isLinux [ "cmd/buildkitd" ]; @@ -11,7 +11,7 @@ buildGoPackage rec { owner = "moby"; repo = "buildkit"; rev = "v${version}"; - sha256 = "0qcgq93wj77i912xqhwrzkzaqz608ilczfn5kcsrf9jk2m1gnx7m"; + sha256 = "0lqfz097nyb6q6bn5mmfg6vl1nmgb6k4lmwxc8anza6zp8qh7wif"; }; buildFlagsArray = [ "-ldflags=-s -w -X ${goPackagePath}/version.Version=${version} -X ${goPackagePath}/version.Revision=${src.rev}" ]; diff --git a/pkgs/development/tools/cargo-flamegraph/default.nix b/pkgs/development/tools/cargo-flamegraph/default.nix index feaa3c312f48..3bdbb086d1dd 100644 --- a/pkgs/development/tools/cargo-flamegraph/default.nix +++ b/pkgs/development/tools/cargo-flamegraph/default.nix @@ -1,19 +1,19 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, makeWrapper, perf +{ lib, stdenv, fetchFromGitHub, rustPlatform, makeWrapper, perf, nix-update-script , Security }: rustPlatform.buildRustPackage rec { pname = "cargo-flamegraph"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "flamegraph-rs"; repo = "flamegraph"; rev = "v${version}"; - sha256 = "0d6k2qr76p93na39j4zbcpc9kaswd806wrqhcwisqxdrcxrjbwhk"; + sha256 = "sha256-IpmvFUWNaFQ1ls7u625vvj1TnRYXR+X1mAGdBcwRFLk="; }; - cargoSha256 = "1qz4a1b58j3bv3akqvc3bcgvqq4bi8cbm3gzws6a52dz7ycrgq46"; + cargoSha256 = "sha256-2YHkEQZqjKEvg4h9kIVhqmgq+SMF1c3r8UbSQivZh7w="; nativeBuildInputs = lib.optionals stdenv.isLinux [ makeWrapper ]; buildInputs = lib.optionals stdenv.isDarwin [ @@ -22,11 +22,15 @@ rustPlatform.buildRustPackage rec { postFixup = lib.optionalString stdenv.isLinux '' wrapProgram $out/bin/cargo-flamegraph \ - --suffix PATH ':' ${perf}/bin + --set-default PERF ${perf}/bin/perf wrapProgram $out/bin/flamegraph \ - --suffix PATH ':' ${perf}/bin + --set-default PERF ${perf}/bin/perf ''; + passthru.updateScript = nix-update-script { + attrPath = pname; + }; + meta = with lib; { description = "Easy flamegraphs for Rust projects and everything else, without Perl or pipes <3"; homepage = "https://github.com/ferrous-systems/flamegraph"; diff --git a/pkgs/development/tools/cask/default.nix b/pkgs/development/tools/cask/default.nix index 925d10b23b44..ab7a7c0fdff8 100644 --- a/pkgs/development/tools/cask/default.nix +++ b/pkgs/development/tools/cask/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchurl, python, emacsPackages }: +{ stdenv, fetchurl, python, emacs }: stdenv.mkDerivation rec { pname = "cask"; - inherit (emacsPackages.melpaStablePackages.cask) src version; + inherit (emacs.pkgs.melpaStablePackages.cask) src version; doCheck = true; - nativeBuildInputs = [ emacsPackages.emacs ]; - buildInputs = with emacsPackages; [ + nativeBuildInputs = [ emacs ]; + buildInputs = with emacs.pkgs; [ s f dash ansi ecukes servant ert-runner el-mock noflet ert-async shell-split-string git package-build ] ++ [ diff --git a/pkgs/development/tools/clpm/default.nix b/pkgs/development/tools/clpm/default.nix new file mode 100644 index 000000000000..e051dfef19b3 --- /dev/null +++ b/pkgs/development/tools/clpm/default.nix @@ -0,0 +1,44 @@ +{ stdenv +, fetchgit +, wrapLisp +, sbcl +, openssl +}: + +stdenv.mkDerivation rec { + pname = "clpm"; + version = "0.3.5"; + + src = fetchgit { + url = "https://gitlab.common-lisp.net/clpm/clpm"; + rev = "v${version}"; + fetchSubmodules = true; + sha256 = "0jivnnp3z148yf4c2nzzr5whz76w5kjhsb97z2vs5maiwf79y2if"; + }; + + buildInputs = [ + (wrapLisp sbcl) + openssl + ]; + + buildPhase = '' + ln -s ${openssl.out}/lib/libcrypto.so.* . + ln -s ${openssl.out}/lib/libssl.so.* . + common-lisp.sh --script scripts/build.lisp + ''; + + installPhase = '' + INSTALL_ROOT=$out sh install.sh + ''; + + # fixupPhase results in fatal error in SBCL, `Can't find sbcl.core` + dontFixup = true; + + meta = with stdenv.lib; { + description = "Common Lisp Package Manager"; + homepage = "https://www.clpm.dev/"; + license = licenses.bsd2; + maintainers = [ maintainers.petterstorvik ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/tools/cmake-language-server/default.nix b/pkgs/development/tools/cmake-language-server/default.nix index 628bb31fbe93..c5398f695d22 100644 --- a/pkgs/development/tools/cmake-language-server/default.nix +++ b/pkgs/development/tools/cmake-language-server/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonApplication, fetchFromGitHub +{ lib, stdenv, buildPythonApplication, fetchFromGitHub , poetry, pygls, pyparsing , cmake, pytest, pytest-datadir , fetchpatch @@ -34,7 +34,7 @@ buildPythonApplication rec { dontUseCmakeConfigure = true; checkPhase = "pytest"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/regen100/cmake-language-server"; description = "CMake LSP Implementation"; license = licenses.mit; diff --git a/pkgs/development/tools/conftest/default.nix b/pkgs/development/tools/conftest/default.nix index 1f12afe3f748..7f2e65fd9918 100644 --- a/pkgs/development/tools/conftest/default.nix +++ b/pkgs/development/tools/conftest/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "conftest"; - version = "0.22.0"; + version = "0.23.0"; src = fetchFromGitHub { owner = "open-policy-agent"; repo = "conftest"; rev = "v${version}"; - sha256 = "1mjfb39h6z8dbrqxlvrvnzid7la6wj709kx7dva4126i84cmpyf1"; + sha256 = "sha256-mSiZjpsFZfkM522f1WcJgBexiBS0o3uf1g94pjhgGVU="; }; - vendorSha256 = "08c4brwvjp9f7cpzywxns6dkhl3jzq9ckyvphm2jnm2kxmkawbbn"; + vendorSha256 = "sha256-iCIuEvwkbfBZ858yZZyVf5om6YLsGKRvzFmYzJBrRf4="; doCheck = false; diff --git a/pkgs/development/tools/dapr/cli/default.nix b/pkgs/development/tools/dapr/cli/default.nix index ef61edcbb8dd..7a8243ece25d 100644 --- a/pkgs/development/tools/dapr/cli/default.nix +++ b/pkgs/development/tools/dapr/cli/default.nix @@ -1,4 +1,4 @@ -{ buildGoModule, fetchFromGitHub, stdenv }: +{ buildGoModule, fetchFromGitHub, lib, stdenv }: let pname = "dapr"; @@ -22,7 +22,7 @@ in buildGoModule { mv $out/bin/cli $out/bin/dapr ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://dapr.io"; description = "A CLI for managing Dapr, the distributed application runtime"; license = licenses.mit; diff --git a/pkgs/development/tools/database/dbmate/deps.nix b/pkgs/development/tools/database/dbmate/deps.nix deleted file mode 100644 index 97bfc10b20af..000000000000 --- a/pkgs/development/tools/database/dbmate/deps.nix +++ /dev/null @@ -1,84 +0,0 @@ -# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) -[ - { - goPackagePath = "github.com/davecgh/go-spew"; - fetch = { - type = "git"; - url = "https://github.com/davecgh/go-spew"; - rev = "346938d642f2ec3594ed81d874461961cd0faa76"; - sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c"; - }; - } - { - goPackagePath = "github.com/go-sql-driver/mysql"; - fetch = { - type = "git"; - url = "https://github.com/go-sql-driver/mysql"; - rev = "2cc627ac8defc45d65066ae98f898166f580f9a4"; - sha256 = "0n589y9ak2m6glaqmqlggrfv2hghy5i2906r123svf92ci4r9sww"; - }; - } - { - goPackagePath = "github.com/joho/godotenv"; - fetch = { - type = "git"; - url = "https://github.com/joho/godotenv"; - rev = "a79fa1e548e2c689c241d10173efd51e5d689d5b"; - sha256 = "09610yqswxa02905mp9cqgsm50r76saagzddc55sqav4ad04j6qm"; - }; - } - { - goPackagePath = "github.com/lib/pq"; - fetch = { - type = "git"; - url = "https://github.com/lib/pq"; - rev = "19c8e9ad00952ce0c64489b60e8df88bb16dd514"; - sha256 = "0lm79ja5id7phf1jwf1vs987azaxis0q7qr69px0r6gqiva0q0vz"; - }; - } - { - goPackagePath = "github.com/mattn/go-sqlite3"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-sqlite3"; - rev = "6c771bb9887719704b210e87e934f08be014bdb1"; - sha256 = "0x6s7hy3ab3qw6dfl81y7ighjva5j4rrzvqhppf1qwz5alpfmpdm"; - }; - } - { - goPackagePath = "github.com/pmezard/go-difflib"; - fetch = { - type = "git"; - url = "https://github.com/pmezard/go-difflib"; - rev = "792786c7400a136282c1664665ae0a8db921c6c2"; - sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; - }; - } - { - goPackagePath = "github.com/stretchr/testify"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/testify"; - rev = "b91bfb9ebec76498946beb6af7c0230c7cc7ba6c"; - sha256 = "178xyfgsbs40jq406aqj0r67ik1b81gdc28z45nbcw6hfhz82rvl"; - }; - } - { - goPackagePath = "github.com/urfave/cli"; - fetch = { - type = "git"; - url = "https://github.com/urfave/cli"; - rev = "cfb38830724cc34fedffe9a2a29fb54fa9169cd1"; - sha256 = "0y6f4sbzkiiwrxbl15biivj8c7qwxnvm3zl2dd3mw4wzg4x10ygj"; - }; - } - { - goPackagePath = "google.golang.org/appengine"; - fetch = { - type = "git"; - url = "https://github.com/golang/appengine"; - rev = "150dc57a1b433e64154302bdc40b6bb8aefa313a"; - sha256 = "0w3knznv39k8bm85ri62f83czcrxknql7dv6p9hk1a5jx3xljgxq"; - }; - } -] diff --git a/pkgs/development/tools/database/timescaledb-tune/default.nix b/pkgs/development/tools/database/timescaledb-tune/default.nix index 2079925049dd..787c7c3131b2 100644 --- a/pkgs/development/tools/database/timescaledb-tune/default.nix +++ b/pkgs/development/tools/database/timescaledb-tune/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "timescaledb-tune"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "timescale"; repo = pname; rev = "v${version}"; - sha256 = "0vncwwvw7y6g3crd4n5vvd6jwdsa8vsvsmfwy5mad4j6lix09ajx"; + sha256 = "0vrbbswmg6z3n012mqd1jasqk01navypzv5m00r6c9bxj72hgcxl"; }; vendorSha256 = "0hbpprbxs19fcar7xcy42kn9yfzhal2zsv5pml9ghiv2s61yns4z"; diff --git a/pkgs/development/tools/dep2nix/default.nix b/pkgs/development/tools/dep2nix/default.nix index 9d14f7c1c1e3..daa68b1b9311 100644 --- a/pkgs/development/tools/dep2nix/default.nix +++ b/pkgs/development/tools/dep2nix/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildGoPackage +{ lib, stdenv, fetchFromGitHub, buildGoPackage , makeWrapper, nix-prefetch-scripts }: buildGoPackage rec { @@ -25,7 +25,7 @@ buildGoPackage rec { goDeps = ./deps.nix; - meta = with stdenv.lib; { + meta = with lib; { description = "Convert `Gopkg.lock` files from golang dep into `deps.nix`"; license = licenses.bsd3; homepage = "https://github.com/nixcloud/dep2nix"; diff --git a/pkgs/development/tools/documentation/gtk-doc/default.nix b/pkgs/development/tools/documentation/gtk-doc/default.nix index 4645c63e71da..10b48d511918 100644 --- a/pkgs/development/tools/documentation/gtk-doc/default.nix +++ b/pkgs/development/tools/documentation/gtk-doc/default.nix @@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec { pname = "gtk-doc"; - version = "1.33.0"; + version = "1.33.1"; format = "other"; @@ -23,7 +23,7 @@ python3.pkgs.buildPythonApplication rec { owner = "GNOME"; repo = pname; rev = version; - sha256 = "ahOTEWwVVwHt8TDWBnPKHIAUq0GXllEvMRmaKul1Tq0="; + sha256 = "L9CjhZ60F42xbo50x7cdKfJrav/9mf38pff8S4xkEVo="; }; patches = [ diff --git a/pkgs/development/tools/dot-http/default.nix b/pkgs/development/tools/dot-http/default.nix index 1c81a4145d29..9ff3001882ce 100644 --- a/pkgs/development/tools/dot-http/default.nix +++ b/pkgs/development/tools/dot-http/default.nix @@ -1,4 +1,4 @@ -{ stdenv, rustPlatform, fetchFromGitHub, pkg-config, openssl, libiconv, Security }: +{ lib, stdenv, rustPlatform, fetchFromGitHub, pkg-config, openssl, libiconv, Security }: rustPlatform.buildRustPackage rec { pname = "dot-http"; @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { libiconv Security ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Text-based scriptable HTTP client"; homepage = "https://github.com/bayne/dot-http"; license = licenses.asl20; diff --git a/pkgs/development/tools/eclipse-mat/default.nix b/pkgs/development/tools/eclipse-mat/default.nix index 600b2b0e56ce..e424c5ce70b7 100644 --- a/pkgs/development/tools/eclipse-mat/default.nix +++ b/pkgs/development/tools/eclipse-mat/default.nix @@ -100,7 +100,7 @@ stdenv.mkDerivation rec { dontBuild = true; dontConfigure = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Fast and feature-rich Java heap analyzer"; longDescription = '' The Eclipse Memory Analyzer is a tool that helps you find memory diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index 07953ea439f4..27e4eb88d46f 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -13,6 +13,7 @@ , libdrm , mesa , libxkbcommon +, libappindicator-gtk3 }@args: let @@ -93,12 +94,12 @@ rec { headers = "116h3b02da18w5mqgw6adgbzc9l02vl3c62syw4wsy6xww6i0mgr"; }; - electron_11 = mkElectron "11.1.0" { - x86_64-linux = "64f9c0864a12a9e0a435b967ed63209a9bb447456aafe8660edaaa2f6517c538"; - x86_64-darwin = "827b0b3e562535de25d3e4d2c4d7529338efae9197e8cf6702dda786b5870bd0"; - i686-linux = "aa424de2c480d0deb26aa53dc45622857521cb9876cf29a52d32a4da66cae3c6"; - armv7l-linux = "375bbea1ecf521ab95760052df5e0ad167e41f61cc79c7c441553ecc2f64d1dd"; - aarch64-linux = "caaf1f9a2e62c9dbbcb777e5c64640d8a1f60a0f5791a2c8f62ab44067c88777"; - headers = "1kafrz2rxryv7psgfn20qrkpcn83hi9fz7df2ra1nzkngfj7xdjr"; + electron_11 = mkElectron "11.2.0" { + x86_64-linux = "a2ed11a5ec9ad10302053e5e2bdf2abf0f9bac521e4f80a377308bffe8c24c00"; + x86_64-darwin = "c8485cc6cb754bccfb1a01db93f5f0f1ee1ed3017551f3d25a1191c7c7aea654"; + i686-linux = "508b9276f97c66418e530cbfa584701d4b0a42825fb2519b21ff161db1dc121f"; + armv7l-linux = "edf1ad6606eab5efc1c9a33ce16489dae1df21ce6e69166f4c8da27ca6fde2ca"; + aarch64-linux = "ed8e318ce0ba92058efdc667790bcbfce1c7f888f9d94038c1c76ed8678158fc"; + headers = "0mwv9vm2km6sawyds87fzy7m4pcmmwl9c2qihs1nc7cwmdz388lv"; }; } diff --git a/pkgs/development/tools/electron/generic.nix b/pkgs/development/tools/electron/generic.nix index ee3609783c29..6d0dbc8cace2 100644 --- a/pkgs/development/tools/electron/generic.nix +++ b/pkgs/development/tools/electron/generic.nix @@ -13,6 +13,7 @@ , libdrm , mesa , libxkbcommon +, libappindicator-gtk3 }: version: hashes: @@ -56,7 +57,7 @@ let }; electronLibPath = with stdenv.lib; makeLibraryPath ( - [ libuuid at-spi2-atk at-spi2-core ] + [ libuuid at-spi2-atk at-spi2-core libappindicator-gtk3 ] ++ optionals (! versionOlder version "9.0.0") [ libdrm mesa ] ++ optionals (! versionOlder version "11.0.0") [ libxkbcommon ] ); diff --git a/pkgs/development/tools/eliot-tree/default.nix b/pkgs/development/tools/eliot-tree/default.nix index 95108c21bb9c..e60642c5fe60 100644 --- a/pkgs/development/tools/eliot-tree/default.nix +++ b/pkgs/development/tools/eliot-tree/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python3Packages }: +{ lib, stdenv, python3Packages }: python3Packages.buildPythonApplication rec { pname = "eliot-tree"; @@ -29,7 +29,7 @@ python3Packages.buildPythonApplication rec { pytest ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/jonathanj/eliottree"; description = "Render Eliot logs as an ASCII tree"; license = licenses.mit; diff --git a/pkgs/development/tools/fedora-coreos-config-transpiler/default.nix b/pkgs/development/tools/fedora-coreos-config-transpiler/default.nix index b53b03d26e36..d50491692ef3 100644 --- a/pkgs/development/tools/fedora-coreos-config-transpiler/default.nix +++ b/pkgs/development/tools/fedora-coreos-config-transpiler/default.nix @@ -4,13 +4,13 @@ with lib; buildGoModule rec { pname = "fcct"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "coreos"; repo = "fcct"; rev = "v${version}"; - sha256 = "0w3vhfjpmpahb08fp6czixhlqhk6izglmwdpj2l19ksz8fc8aq54"; + sha256 = "0kdsnsp9nzkkfwakcx64md66yz2k7cpw8bkhdv798yirbrqprgp6"; }; vendorSha256 = null; diff --git a/pkgs/development/tools/flootty/default.nix b/pkgs/development/tools/flootty/default.nix index 1baddb52259c..2b8f174f763a 100644 --- a/pkgs/development/tools/flootty/default.nix +++ b/pkgs/development/tools/flootty/default.nix @@ -13,6 +13,6 @@ python3Packages.buildPythonApplication rec { description = "A collaborative terminal. In practice, it's similar to a shared screen or tmux session"; homepage = "https://floobits.com/help/flootty"; license = licenses.asl20; - maintainers = with maintainers; [ sellout enzime ]; + maintainers = with maintainers; [ sellout ]; }; } diff --git a/pkgs/development/tools/ginkgo/default.nix b/pkgs/development/tools/ginkgo/default.nix index 4670c13a63ab..b65e7c6a5eef 100644 --- a/pkgs/development/tools/ginkgo/default.nix +++ b/pkgs/development/tools/ginkgo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "ginkgo"; @@ -13,7 +13,7 @@ buildGoModule rec { vendorSha256 = "072amyw1ir18v9vk268j2y7dhw3lfwvxzvzsdqhnp50rxsa911bx"; doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "BDD Testing Framework for Go"; homepage = "https://github.com/onsi/ginkgo"; license = licenses.mit; diff --git a/pkgs/development/tools/gir/default.nix b/pkgs/development/tools/gir/default.nix index 02a3c13afb3d..8f38b41f7ae2 100644 --- a/pkgs/development/tools/gir/default.nix +++ b/pkgs/development/tools/gir/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform }: +{ lib, stdenv, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { pname = "gir"; @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "048qhlc4f5khxi7dnakgqkhgww44r6h3mlx2fm7y2wqivr3rj8p1"; - meta = with stdenv.lib; { + meta = with lib; { description = "Tool to generate rust bindings and user API for glib-based libraries"; homepage = "https://github.com/gtk-rs/gir/"; license = with licenses; [ mit ]; diff --git a/pkgs/development/tools/glade/default.nix b/pkgs/development/tools/glade/default.nix index 363e429b6baa..0e3cdf4bda1e 100644 --- a/pkgs/development/tools/glade/default.nix +++ b/pkgs/development/tools/glade/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , gettext , fetchurl , python3 @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://wiki.gnome.org/Apps/Glade"; description = "User interface designer for GTK applications"; maintainers = teams.gnome.members; diff --git a/pkgs/development/tools/global-platform-pro/default.nix b/pkgs/development/tools/global-platform-pro/default.nix index 2f125d3ea8a3..4d80010f71ea 100644 --- a/pkgs/development/tools/global-platform-pro/default.nix +++ b/pkgs/development/tools/global-platform-pro/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, jdk8, maven, makeWrapper, jre8_headless, pcsclite }: +{ lib, stdenv, fetchFromGitHub, jdk8, maven, makeWrapper, jre8_headless, pcsclite }: let jdk = jdk8; jre_headless = jre8_headless; in # TODO: This is quite a bit of duplicated logic with gephi. Factor it out? @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { --prefix LD_LIBRARY_PATH : "${pcsclite.out}/lib" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Command-line utility for managing applets and keys on Java Cards"; longDescription = '' This command-line utility can be used to manage applets and keys diff --git a/pkgs/development/tools/glpaper/default.nix b/pkgs/development/tools/glpaper/default.nix index 94d140552a10..9ad85e840bad 100644 --- a/pkgs/development/tools/glpaper/default.nix +++ b/pkgs/development/tools/glpaper/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchhg, meson, ninja, pkg-config, wlroots, wayland, wayland-protocols +{ lib, stdenv, fetchhg, meson, ninja, pkg-config, wlroots, wayland, wayland-protocols , libX11, libGL }: stdenv.mkDerivation { @@ -18,7 +18,7 @@ stdenv.mkDerivation { libGL ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Wallpaper program for wlroots based Wayland compositors such as sway that allows you to render glsl shaders as your wallpaper"; homepage = "https://hg.sr.ht/~scoopta/glpaper"; diff --git a/pkgs/development/tools/go-junit-report/default.nix b/pkgs/development/tools/go-junit-report/default.nix index 96ebce0eaca6..f1e822e3633f 100644 --- a/pkgs/development/tools/go-junit-report/default.nix +++ b/pkgs/development/tools/go-junit-report/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "go-junit-report-unstable"; @@ -14,7 +14,7 @@ buildGoPackage rec { sha256 = "109zs8wpdmc2ijc2khyqija8imay88ka6v50xvrpnnwnd3ywckxi"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Converts go test output to an xml report, suitable for applications that expect junit xml reports (e.g. Jenkins)"; homepage = "https://${goPackagePath}"; maintainers = with maintainers; [ cryptix ]; diff --git a/pkgs/development/tools/go-migrate/default.nix b/pkgs/development/tools/go-migrate/default.nix index 3a424014ec33..1786bfe5f0f9 100644 --- a/pkgs/development/tools/go-migrate/default.nix +++ b/pkgs/development/tools/go-migrate/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "go-migrate"; @@ -15,7 +15,7 @@ buildGoModule rec { subPackages = [ "cmd/migrate" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/golang-migrate/migrate"; description = "Database migrations. CLI and Golang library"; maintainers = with maintainers; [ offline ]; diff --git a/pkgs/development/tools/gofumpt/default.nix b/pkgs/development/tools/gofumpt/default.nix index 82ae3d4bb7b8..e55cea0895be 100644 --- a/pkgs/development/tools/gofumpt/default.nix +++ b/pkgs/development/tools/gofumpt/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gofumpt"; - version = "2020-10-27"; + version = "0.1.0"; src = fetchFromGitHub { owner = "mvdan"; repo = pname; - rev = "85d5401eb0f699d87b0d6c949dd4c0d5fb23f2e0"; - sha256 = "0n72d7p4y89kfilcdx3qb63qy6xm8dyp6q8s8954wrkm2wlhkwiy"; + rev = "v${version}"; + sha256 = "0xln0a5n8na3p6b7l8im3bh4ys5rr3k413ibzk8mnp471f5h1558"; }; - vendorSha256 = "1s546hp4ngzqvfx7dbd43k7b94z0mvndgdkndh4ypkkl3rpd9kkz"; + vendorSha256 = "05qdwz1icl8in0j94gx9pgplidm2v29hsn4kgg5gw35bsbn1c7id"; doCheck = false; diff --git a/pkgs/development/tools/gojsontoyaml/default.nix b/pkgs/development/tools/gojsontoyaml/default.nix index ed8cc3587c17..0f772134a0e2 100644 --- a/pkgs/development/tools/gojsontoyaml/default.nix +++ b/pkgs/development/tools/gojsontoyaml/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "gojsontoyaml"; @@ -13,7 +13,7 @@ buildGoModule rec { vendorSha256 = null; - meta = with stdenv.lib; { + meta = with lib; { description = "Simply tool to convert json to yaml written in Go"; homepage = "https://github.com/brancz/gojsontoyaml"; license = licenses.mit; diff --git a/pkgs/development/tools/golangci-lint/default.nix b/pkgs/development/tools/golangci-lint/default.nix index ddcbbb127585..e91f8cfeb769 100644 --- a/pkgs/development/tools/golangci-lint/default.nix +++ b/pkgs/development/tools/golangci-lint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "golangci-lint"; - version = "1.33.0"; + version = "1.35.0"; src = fetchFromGitHub { owner = "golangci"; repo = "golangci-lint"; rev = "v${version}"; - sha256 = "1yqq5jai0npkjzfk2h121nv3pgqfqi5c3vs22wyv6qwnlia97yin"; + sha256 = "03pg8qfysjdbpxzdcs4y5cn0gshr5k53p7rjqak7q8vdykva60s1"; }; - vendorSha256 = "1kmsfsa5z41mjxi15a4zra1qhskm5pjcfbk09c99xbv27pin5yrj"; + vendorSha256 = "18dgx087jixwcfcab546qhy5qq1n1ahrsr7i7d7d3v9vklslics8"; doCheck = false; diff --git a/pkgs/development/tools/gomplate/default.nix b/pkgs/development/tools/gomplate/default.nix index 2bef9d53ff9e..f8d6553f74d8 100644 --- a/pkgs/development/tools/gomplate/default.nix +++ b/pkgs/development/tools/gomplate/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "gomplate"; @@ -26,7 +26,7 @@ buildGoModule rec { "-X github.com/${owner}/${pname}/v3/version.Version=${rev}" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A flexible commandline tool for template rendering"; homepage = "https://gomplate.ca/"; maintainers = with maintainers; [ ris jlesquembre ]; diff --git a/pkgs/development/tools/gopls/default.nix b/pkgs/development/tools/gopls/default.nix index 49b8c8a3306f..7a7c98e28940 100644 --- a/pkgs/development/tools/gopls/default.nix +++ b/pkgs/development/tools/gopls/default.nix @@ -1,24 +1,24 @@ -{ stdenv, buildGoModule, fetchgit }: +{ lib, stdenv, buildGoModule, fetchgit }: buildGoModule rec { pname = "gopls"; - version = "0.5.3"; + version = "0.6.2"; src = fetchgit { rev = "gopls/v${version}"; url = "https://go.googlesource.com/tools"; - sha256 = "04dkrvk5190kyfa9swxpl0m3xq9g90qp8j7yxhi87wyb8giqbll2"; + sha256 = "0hbfxdsbfz044vw8zp223ni6m7gcwqpff4xpjiqmihhgga5849lf"; }; modRoot = "gopls"; - vendorSha256 = "0ml8n6qnq9nprn7kv138qy0i2q8qawzd0lhh3v2qw39j0aj5fb7z"; + vendorSha256 = "0r9bffgi9ainqrl4kraqy71rgwdfcbqmv3srs12h3xvj0w5ya5rz"; doCheck = false; # Only build gopls, and not the integration tests or documentation generator. subPackages = [ "." ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Official language server for the Go language"; homepage = "https://github.com/golang/tools/tree/master/gopls"; license = licenses.bsd3; diff --git a/pkgs/development/tools/gore/default.nix b/pkgs/development/tools/gore/default.nix index ca9c8d9eec0f..0e0264f1522d 100644 --- a/pkgs/development/tools/gore/default.nix +++ b/pkgs/development/tools/gore/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "gore"; @@ -15,7 +15,7 @@ buildGoModule rec { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Yet another Go REPL that works nicely"; homepage = "https://github.com/motemen/gore"; license = licenses.mit; diff --git a/pkgs/development/tools/gotestsum/default.nix b/pkgs/development/tools/gotestsum/default.nix index 8ccc1b593fd7..3e3ae19a382a 100644 --- a/pkgs/development/tools/gotestsum/default.nix +++ b/pkgs/development/tools/gotestsum/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildGoModule }: +{ lib, stdenv, fetchFromGitHub, buildGoModule }: buildGoModule rec { pname = "gotestsum"; @@ -19,7 +19,7 @@ buildGoModule rec { subPackages = [ "." ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/gotestyourself/gotestsum"; description = "A human friendly `go test` runner"; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/development/tools/gotools/default.nix b/pkgs/development/tools/gotools/default.nix index 606092e8cdcb..eabf41f86639 100644 --- a/pkgs/development/tools/gotools/default.nix +++ b/pkgs/development/tools/gotools/default.nix @@ -1,14 +1,14 @@ -{ stdenv, go, buildGoModule, fetchgit }: +{ stdenv, buildGoModule, fetchgit }: buildGoModule rec { pname = "gotools-unstable"; - version = "2020-10-27"; - rev = "eafbe7b904eb2418efc832e36ac634dc09084f10"; + version = "2021-01-13"; + rev = "8b4aab62c064010e8e875d2e5a8e63a96fefc87d"; src = fetchgit { inherit rev; url = "https://go.googlesource.com/tools"; - sha256 = "0884znfbm44f4ddjkm0g7qg2a257kwzv1ismd2m225f3c69n3mdg"; + sha256 = "1cmnm9fl2a6hiplj8s6x0l3czcw4xh3j3lvzbgccnp1l8kz8q2vm"; }; # The gopls folder contains a Go submodule which causes a build failure. @@ -40,7 +40,7 @@ buildGoModule rec { ''; excludedPackages = "\\(" - + stdenv.lib.concatStringsSep "\\|" ([ "testdata" ] ++ stdenv.lib.optionals (stdenv.lib.versionAtLeast go.meta.branch "1.5") [ "vet" "cover" ]) + + stdenv.lib.concatStringsSep "\\|" ([ "testdata" "vet" "cover" ]) + "\\)"; # Set GOTOOLDIR for derivations adding this to buildInputs diff --git a/pkgs/development/tools/haskell/haskell-language-server/default.nix b/pkgs/development/tools/haskell/haskell-language-server/default.nix index e33d731dae43..44cd234da722 100644 --- a/pkgs/development/tools/haskell/haskell-language-server/default.nix +++ b/pkgs/development/tools/haskell/haskell-language-server/default.nix @@ -2,21 +2,23 @@ , bytestring, containers, data-default, deepseq, directory, extra , fetchgit, filepath, floskell, fourmolu, ghc, ghc-boot-th , ghc-paths, ghcide, gitrev, hashable, haskell-lsp, hie-bios -, hls-explicit-imports-plugin, hls-hlint-plugin, hls-plugin-api -, hls-retrie-plugin, hls-tactics-plugin, hslogger, hspec -, hspec-core, lens, lsp-test, mtl, optparse-applicative +, hls-class-plugin, hls-eval-plugin, hls-explicit-imports-plugin +, hls-hlint-plugin, hls-plugin-api, hls-retrie-plugin +, hls-tactics-plugin, hslogger, hspec, hspec-core +, hspec-expectations, lens, lsp-test, mtl, optparse-applicative , optparse-simple, ormolu, process, regex-tdfa, safe-exceptions , shake, stdenv, stm, stylish-haskell, tasty, tasty-ant-xml , tasty-expected-failure, tasty-golden, tasty-hunit, tasty-rerun -, temporary, text, time, transformers, unordered-containers, yaml +, temporary, text, transformers, unordered-containers, with-utf8 +, yaml }: mkDerivation { pname = "haskell-language-server"; - version = "0.7.1.0"; + version = "0.8.0.0"; src = fetchgit { url = "https://github.com/haskell/haskell-language-server.git"; - sha256 = "0gkzvjx4dgf53yicinqjshlj80gznx5khb62i7g3kqjr85iy0raa"; - rev = "e4f677e1780fe85a02b99a09404a0a3c3ab5ce7c"; + sha256 = "0p6fqs07lajbi2g1wf4w3j5lvwknnk58n12vlg48cs4iz25gp588"; + rev = "eb58f13f7b8e4f9bc771af30ff9fd82dc4309ff5"; fetchSubmodules = true; }; isLibrary = true; @@ -29,19 +31,20 @@ mkDerivation { executableHaskellDepends = [ aeson base binary brittany bytestring containers deepseq directory extra filepath floskell fourmolu ghc ghc-boot-th ghc-paths ghcide - gitrev hashable haskell-lsp hie-bios hls-explicit-imports-plugin - hls-hlint-plugin hls-plugin-api hls-retrie-plugin - hls-tactics-plugin hslogger lens mtl optparse-applicative - optparse-simple ormolu process regex-tdfa safe-exceptions shake - stylish-haskell temporary text time transformers - unordered-containers + gitrev hashable haskell-lsp hie-bios hls-class-plugin + hls-eval-plugin hls-explicit-imports-plugin hls-hlint-plugin + hls-plugin-api hls-retrie-plugin hls-tactics-plugin hslogger lens + mtl optparse-applicative optparse-simple ormolu process regex-tdfa + safe-exceptions shake stylish-haskell temporary text transformers + unordered-containers with-utf8 ]; testHaskellDepends = [ aeson base blaze-markup bytestring containers data-default directory extra filepath haskell-lsp hie-bios hls-plugin-api - hslogger hspec hspec-core lens lsp-test process stm tasty - tasty-ant-xml tasty-expected-failure tasty-golden tasty-hunit - tasty-rerun temporary text transformers unordered-containers yaml + hslogger hspec hspec-core hspec-expectations lens lsp-test process + stm tasty tasty-ant-xml tasty-expected-failure tasty-golden + tasty-hunit tasty-rerun temporary text transformers + unordered-containers yaml ]; testToolDepends = [ ghcide ]; homepage = "https://github.com/haskell/haskell-language-server#readme"; diff --git a/pkgs/development/tools/haskell/haskell-language-server/hls-class-plugin.nix b/pkgs/development/tools/haskell/haskell-language-server/hls-class-plugin.nix new file mode 100644 index 000000000000..86c29c7be390 --- /dev/null +++ b/pkgs/development/tools/haskell/haskell-language-server/hls-class-plugin.nix @@ -0,0 +1,21 @@ +{ mkDerivation, aeson, base, containers, fetchgit, ghc +, ghc-exactprint, ghcide, haskell-lsp, hls-plugin-api, lens, shake +, stdenv, text, transformers, unordered-containers +}: +mkDerivation { + pname = "hls-class-plugin"; + version = "0.1.0.0"; + src = fetchgit { + url = "https://github.com/haskell/haskell-language-server.git"; + sha256 = "0p6fqs07lajbi2g1wf4w3j5lvwknnk58n12vlg48cs4iz25gp588"; + rev = "eb58f13f7b8e4f9bc771af30ff9fd82dc4309ff5"; + fetchSubmodules = true; + }; + postUnpack = "sourceRoot+=/plugins/hls-class-plugin; echo source root reset to $sourceRoot"; + libraryHaskellDepends = [ + aeson base containers ghc ghc-exactprint ghcide haskell-lsp + hls-plugin-api lens shake text transformers unordered-containers + ]; + description = "Explicit imports plugin for Haskell Language Server"; + license = stdenv.lib.licenses.asl20; +} diff --git a/pkgs/development/tools/haskell/haskell-language-server/hls-eval-plugin.nix b/pkgs/development/tools/haskell/haskell-language-server/hls-eval-plugin.nix new file mode 100644 index 000000000000..20ebc5f5e898 --- /dev/null +++ b/pkgs/development/tools/haskell/haskell-language-server/hls-eval-plugin.nix @@ -0,0 +1,27 @@ +{ mkDerivation, aeson, base, containers, deepseq, Diff, directory +, extra, fetchgit, filepath, ghc, ghc-boot-th, ghc-paths, ghcide +, hashable, haskell-lsp, haskell-lsp-types, hls-plugin-api +, parser-combinators, pretty-simple, QuickCheck, safe-exceptions +, shake, stdenv, temporary, text, time, transformers +, unordered-containers +}: +mkDerivation { + pname = "hls-eval-plugin"; + version = "0.1.0.0"; + src = fetchgit { + url = "https://github.com/haskell/haskell-language-server.git"; + sha256 = "0p6fqs07lajbi2g1wf4w3j5lvwknnk58n12vlg48cs4iz25gp588"; + rev = "eb58f13f7b8e4f9bc771af30ff9fd82dc4309ff5"; + fetchSubmodules = true; + }; + postUnpack = "sourceRoot+=/plugins/hls-eval-plugin; echo source root reset to $sourceRoot"; + libraryHaskellDepends = [ + aeson base containers deepseq Diff directory extra filepath ghc + ghc-boot-th ghc-paths ghcide hashable haskell-lsp haskell-lsp-types + hls-plugin-api parser-combinators pretty-simple QuickCheck + safe-exceptions shake temporary text time transformers + unordered-containers + ]; + description = "Eval plugin for Haskell Language Server"; + license = stdenv.lib.licenses.asl20; +} diff --git a/pkgs/development/tools/haskell/haskell-language-server/hls-explicit-imports-plugin.nix b/pkgs/development/tools/haskell/haskell-language-server/hls-explicit-imports-plugin.nix index 7c3b22cf1d0a..bad0e82194cd 100644 --- a/pkgs/development/tools/haskell/haskell-language-server/hls-explicit-imports-plugin.nix +++ b/pkgs/development/tools/haskell/haskell-language-server/hls-explicit-imports-plugin.nix @@ -7,8 +7,8 @@ mkDerivation { version = "0.1.0.0"; src = fetchgit { url = "https://github.com/haskell/haskell-language-server.git"; - sha256 = "0gkzvjx4dgf53yicinqjshlj80gznx5khb62i7g3kqjr85iy0raa"; - rev = "e4f677e1780fe85a02b99a09404a0a3c3ab5ce7c"; + sha256 = "0p6fqs07lajbi2g1wf4w3j5lvwknnk58n12vlg48cs4iz25gp588"; + rev = "eb58f13f7b8e4f9bc771af30ff9fd82dc4309ff5"; fetchSubmodules = true; }; postUnpack = "sourceRoot+=/plugins/hls-explicit-imports-plugin; echo source root reset to $sourceRoot"; diff --git a/pkgs/development/tools/haskell/haskell-language-server/hls-hlint-plugin.nix b/pkgs/development/tools/haskell/haskell-language-server/hls-hlint-plugin.nix index 8bfcf034bd2b..ecbe141fd724 100644 --- a/pkgs/development/tools/haskell/haskell-language-server/hls-hlint-plugin.nix +++ b/pkgs/development/tools/haskell/haskell-language-server/hls-hlint-plugin.nix @@ -10,8 +10,8 @@ mkDerivation { version = "0.1.0.0"; src = fetchgit { url = "https://github.com/haskell/haskell-language-server.git"; - sha256 = "0gkzvjx4dgf53yicinqjshlj80gznx5khb62i7g3kqjr85iy0raa"; - rev = "e4f677e1780fe85a02b99a09404a0a3c3ab5ce7c"; + sha256 = "0p6fqs07lajbi2g1wf4w3j5lvwknnk58n12vlg48cs4iz25gp588"; + rev = "eb58f13f7b8e4f9bc771af30ff9fd82dc4309ff5"; fetchSubmodules = true; }; postUnpack = "sourceRoot+=/plugins/hls-hlint-plugin; echo source root reset to $sourceRoot"; diff --git a/pkgs/development/tools/haskell/haskell-language-server/hls-retrie-plugin.nix b/pkgs/development/tools/haskell/haskell-language-server/hls-retrie-plugin.nix index 7a44903f9870..5a769e7a719b 100644 --- a/pkgs/development/tools/haskell/haskell-language-server/hls-retrie-plugin.nix +++ b/pkgs/development/tools/haskell/haskell-language-server/hls-retrie-plugin.nix @@ -8,8 +8,8 @@ mkDerivation { version = "0.1.0.0"; src = fetchgit { url = "https://github.com/haskell/haskell-language-server.git"; - sha256 = "0gkzvjx4dgf53yicinqjshlj80gznx5khb62i7g3kqjr85iy0raa"; - rev = "e4f677e1780fe85a02b99a09404a0a3c3ab5ce7c"; + sha256 = "0p6fqs07lajbi2g1wf4w3j5lvwknnk58n12vlg48cs4iz25gp588"; + rev = "eb58f13f7b8e4f9bc771af30ff9fd82dc4309ff5"; fetchSubmodules = true; }; postUnpack = "sourceRoot+=/plugins/hls-retrie-plugin; echo source root reset to $sourceRoot"; diff --git a/pkgs/development/tools/haskell/haskell-language-server/hls-tactics-plugin.nix b/pkgs/development/tools/haskell/haskell-language-server/hls-tactics-plugin.nix index 326e8ce0cdf9..b5819b705b62 100644 --- a/pkgs/development/tools/haskell/haskell-language-server/hls-tactics-plugin.nix +++ b/pkgs/development/tools/haskell/haskell-language-server/hls-tactics-plugin.nix @@ -10,8 +10,8 @@ mkDerivation { version = "0.5.1.0"; src = fetchgit { url = "https://github.com/haskell/haskell-language-server.git"; - sha256 = "0gkzvjx4dgf53yicinqjshlj80gznx5khb62i7g3kqjr85iy0raa"; - rev = "e4f677e1780fe85a02b99a09404a0a3c3ab5ce7c"; + sha256 = "0p6fqs07lajbi2g1wf4w3j5lvwknnk58n12vlg48cs4iz25gp588"; + rev = "eb58f13f7b8e4f9bc771af30ff9fd82dc4309ff5"; fetchSubmodules = true; }; postUnpack = "sourceRoot+=/plugins/tactics; echo source root reset to $sourceRoot"; diff --git a/pkgs/development/tools/haskell/haskell-language-server/update.sh b/pkgs/development/tools/haskell/haskell-language-server/update.sh index f14a97221ff8..aaccf8b9b9fe 100755 --- a/pkgs/development/tools/haskell/haskell-language-server/update.sh +++ b/pkgs/development/tools/haskell/haskell-language-server/update.sh @@ -41,11 +41,10 @@ hls_new_version=$hls_latest_release echo "Updating haskell-language-server from old version $hls_old_version to new version $hls_new_version." echo "Running cabal2nix and outputting to ${hls_derivation_file}..." - cabal2nix --revision "$hls_new_version" "https://github.com/haskell/haskell-language-server.git" > "$hls_derivation_file" cabal2nix --revision "$hls_new_version" --subpath plugins/tactics "https://github.com/haskell/haskell-language-server.git" > "${script_dir}/hls-tactics-plugin.nix" -cabal2nix --revision "$hls_new_version" --subpath plugins/hls-hlint-plugin "https://github.com/haskell/haskell-language-server.git" > "${script_dir}/hls-hlint-plugin.nix" -cabal2nix --revision "$hls_new_version" --subpath plugins/hls-explicit-imports-plugin "https://github.com/haskell/haskell-language-server.git" > "${script_dir}/hls-explicit-imports-plugin.nix" -cabal2nix --revision "$hls_new_version" --subpath plugins/hls-retrie-plugin "https://github.com/haskell/haskell-language-server.git" > "${script_dir}/hls-retrie-plugin.nix" +for plugin in "hls-hlint-plugin" "hls-explicit-imports-plugin" "hls-retrie-plugin" "hls-class-plugin" "hls-eval-plugin"; do + cabal2nix --revision "$hls_new_version" --subpath plugins/$plugin "https://github.com/haskell/haskell-language-server.git" > "${script_dir}/$plugin.nix" +done echo "Finished." diff --git a/pkgs/development/tools/hobbes/default.nix b/pkgs/development/tools/hobbes/default.nix index 5fd9d314c5e0..667997ddff4d 100644 --- a/pkgs/development/tools/hobbes/default.nix +++ b/pkgs/development/tools/hobbes/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, llvm_6, ncurses, readline, zlib }: +{ lib, stdenv, fetchFromGitHub, cmake, llvm_6, ncurses, readline, zlib }: stdenv.mkDerivation { name = "hobbes"; @@ -25,7 +25,7 @@ stdenv.mkDerivation { doCheck = false; # Running tests in NixOS hangs. See https://git.io/JvK7R. checkTarget = "test"; - meta = with stdenv.lib; { + meta = with lib; { description = "A language and an embedded JIT compiler"; longDescription = '' Hobbes is a a language, embedded compiler, and runtime for efficient diff --git a/pkgs/development/tools/hover/default.nix b/pkgs/development/tools/hover/default.nix index 7b50f473d8f6..cb638af43d69 100644 --- a/pkgs/development/tools/hover/default.nix +++ b/pkgs/development/tools/hover/default.nix @@ -1,10 +1,10 @@ { lib , buildGoModule , buildFHSUserEnv +, binutils , dejavu_fonts -, pkgconfig +, pkg-config , fetchFromGitHub -, stdenv , roboto , writeScript , xorg @@ -18,7 +18,7 @@ let pname = "hover"; - version = "0.43.0"; + version = "0.46.1"; libs = with xorg; [ libX11.dev @@ -36,23 +36,23 @@ let hover = buildGoModule rec { inherit pname version; - meta = with stdenv.lib; { + meta = with lib; { description = "A build tool to run Flutter applications on desktop"; homepage = "https://github.com/go-flutter-desktop/hover"; license = licenses.bsd3; - platforms = platforms.linux ++ platforms.darwin; + platforms = platforms.linux; maintainers = [ maintainers.ericdallo maintainers.thiagokokada]; }; subPackages = [ "." ]; - vendorSha256 = "1wr08phjm87dxim47i8449rmq5wfscvjyz65g3lxmv468x209pam"; + vendorSha256 = "1ixfmhp5g57hn23zyf85hy9jnyadayhdbalj4d0bx4q4p5c9qchi"; src = fetchFromGitHub { rev = "v${version}"; owner = "go-flutter-desktop"; repo = pname; - sha256 = "0iw6sxg86wfdbihl2hxzn43ppdzl1p7g5b9wl8ac3xa9ix8759ax"; + sha256 = "04f3dx2dcllfrw3ay1sbb72pj18ln7bxi9rrcaahqhsd7bn2ff9k"; }; nativeBuildInputs = [ addOpenGLRunpath makeWrapper ]; @@ -75,7 +75,7 @@ let chmod -R a+rx $out/share/assets wrapProgram "$out/bin/hover" \ - --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath libs} + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath libs} ''; postFixup = '' @@ -87,12 +87,13 @@ in buildFHSUserEnv rec { name = pname; targetPkgs = pkgs: [ + binutils dejavu_fonts flutter gcc go hover - pkgconfig + pkg-config roboto ] ++ libs; diff --git a/pkgs/development/tools/icestorm/default.nix b/pkgs/development/tools/icestorm/default.nix index 15ca059a8802..feaea18be18b 100644 --- a/pkgs/development/tools/icestorm/default.nix +++ b/pkgs/development/tools/icestorm/default.nix @@ -2,27 +2,31 @@ , pkgconfig, libftdi1 , python3, pypy3 -# PyPy yields large improvements in build time and runtime performance, -# and IceStorm isn't intended to be used as a library other than by the -# nextpnr build process (which is also sped up by using PyPy), so we -# use it by default. See 18839e1 for more details. +# PyPy yields large improvements in build time and runtime performance, and +# IceStorm isn't intended to be used as a library other than by the nextpnr +# build process (which is also sped up by using PyPy), so we use it by default. +# See 18839e1 for more details. +# +# FIXME(aseipp, 3/1/2021): pypy seems a bit busted since stdenv upgrade to gcc +# 10/binutils 2.34, so short-circuit this for now in passthru below (done so +# that downstream overrides can't re-enable pypy and break their build somehow) , usePyPy ? stdenv.hostPlatform.system == "x86_64-linux" }: stdenv.mkDerivation rec { pname = "icestorm"; - version = "2020.08.19"; + version = "2020.12.04"; passthru = rec { - pythonPkg = if usePyPy then pypy3 else python3; + pythonPkg = if (false && usePyPy) then pypy3 else python3; pythonInterp = pythonPkg.interpreter; }; src = fetchFromGitHub { owner = "YosysHQ"; repo = "icestorm"; - rev = "da52117ccd5b4147f64dc7345357ec5439cd7543"; - sha256 = "072bl3vmvb06ry0ci3b1sfjpm3iigb874khzja4azcai969ybp4k"; + rev = "7afc64b480212c9ac2ce7cb1622731a69a7d212c"; + sha256 = "0vxhqs2fampglg3xlfwb35229iv96kvlwp1gyxrdrmlpznhkqdrk"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/tools/jbang/default.nix b/pkgs/development/tools/jbang/default.nix new file mode 100644 index 000000000000..a9ba82e53f6c --- /dev/null +++ b/pkgs/development/tools/jbang/default.nix @@ -0,0 +1,40 @@ +{ stdenv, lib, fetchzip, jdk, makeWrapper, coreutils, curl }: + +stdenv.mkDerivation rec { + version = "0.58.0"; + pname = "jbang"; + + src = fetchzip { + url = "https://github.com/jbangdev/jbang/releases/download/v${version}/${pname}-${version}.tar"; + sha256 = "sha256:08haij8nzzf2759ddzx0i6808g2if0v2fc21mlz00kmggjc03xz3"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + runHook preInstall + rm bin/jbang.{cmd,ps1} + rmdir tmp + cp -r . $out + wrapProgram $out/bin/jbang \ + --set JAVA_HOME ${jdk} \ + --set PATH ${lib.makeBinPath [ coreutils jdk curl ]} + runHook postInstall + ''; + + installCheckPhase = '' + $out/bin/jbang --version 2>&1 | grep -q "${version}" + ''; + + meta = with stdenv.lib; { + description = "Run java as scripts anywhere"; + longDescription = '' + jbang uses the java language to build scripts similar to groovy scripts. Dependencies are automatically + downloaded and the java code runs. + ''; + homepage = "https://https://www.jbang.dev/"; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ moaxcp ]; + }; +} diff --git a/pkgs/development/tools/jpexs/default.nix b/pkgs/development/tools/jpexs/default.nix index 87bba3847b55..24aa43cdeba3 100644 --- a/pkgs/development/tools/jpexs/default.nix +++ b/pkgs/development/tools/jpexs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, makeWrapper, makeDesktopItem, jdk8 }: +{ lib, stdenv, fetchzip, makeWrapper, makeDesktopItem, jdk8 }: stdenv.mkDerivation rec { pname = "jpexs"; @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { ''; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Flash SWF decompiler and editor"; longDescription = '' Open-source Flash SWF decompiler and editor. Extract resources, diff --git a/pkgs/development/tools/jtc/default.nix b/pkgs/development/tools/jtc/default.nix index f0e708d58aa5..947dee9ee3c0 100644 --- a/pkgs/development/tools/jtc/default.nix +++ b/pkgs/development/tools/jtc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "jtc"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "JSON manipulation and transformation tool"; homepage = "https://github.com/ldn-softdev/jtc"; license = licenses.mit; diff --git a/pkgs/development/tools/kcli/default.nix b/pkgs/development/tools/kcli/default.nix index 3a0fff71dc79..6c9f62c6f72d 100644 --- a/pkgs/development/tools/kcli/default.nix +++ b/pkgs/development/tools/kcli/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "kcli"; @@ -17,7 +17,7 @@ buildGoModule rec { subPackages = [ "." ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A kafka command line browser"; homepage = "https://github.com/cswank/kcli"; license = licenses.mit; diff --git a/pkgs/development/tools/knightos/genkfs/default.nix b/pkgs/development/tools/knightos/genkfs/default.nix index b826c1a58b99..9f553aa6bae3 100644 --- a/pkgs/development/tools/knightos/genkfs/default.nix +++ b/pkgs/development/tools/knightos/genkfs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, asciidoc }: +{ lib, stdenv, fetchFromGitHub, cmake, asciidoc }: stdenv.mkDerivation rec { pname = "genkfs"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://knightos.org/"; description = "Utility to write a KFS filesystem into a ROM file"; license = licenses.mit; diff --git a/pkgs/development/tools/knightos/kcc/default.nix b/pkgs/development/tools/knightos/kcc/default.nix index 364d46de56d9..5f047d79a138 100644 --- a/pkgs/development/tools/knightos/kcc/default.nix +++ b/pkgs/development/tools/knightos/kcc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, bison, flex, boost }: +{ lib, stdenv, fetchFromGitHub, cmake, bison, flex, boost }: stdenv.mkDerivation rec { pname = "kcc"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ boost ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://knightos.org/"; description = "KnightOS C compiler"; license = licenses.gpl2Plus; diff --git a/pkgs/development/tools/knightos/kimg/default.nix b/pkgs/development/tools/knightos/kimg/default.nix index 3f3f698693df..33ec5b8bbb2a 100644 --- a/pkgs/development/tools/knightos/kimg/default.nix +++ b/pkgs/development/tools/knightos/kimg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, asciidoc }: +{ lib, stdenv, fetchFromGitHub, cmake, asciidoc }: stdenv.mkDerivation rec { pname = "kimg"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://knightos.org/"; description = "Converts image formats supported by stb_image to the KnightOS image format"; license = licenses.mit; diff --git a/pkgs/development/tools/knightos/kpack/default.nix b/pkgs/development/tools/knightos/kpack/default.nix index 657a1712ed24..43a8e4eddfa8 100644 --- a/pkgs/development/tools/knightos/kpack/default.nix +++ b/pkgs/development/tools/knightos/kpack/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, asciidoc, libxslt, docbook_xsl }: +{ lib, stdenv, fetchFromGitHub, cmake, asciidoc, libxslt, docbook_xsl }: stdenv.mkDerivation rec { pname = "kpack"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "fortify" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://knightos.org/"; description = "A tool to create or extract KnightOS packages"; license = licenses.lgpl2Only; diff --git a/pkgs/development/tools/knightos/mkrom/default.nix b/pkgs/development/tools/knightos/mkrom/default.nix index 46482a849134..b1ee36ac2dab 100644 --- a/pkgs/development/tools/knightos/mkrom/default.nix +++ b/pkgs/development/tools/knightos/mkrom/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, asciidoc }: +{ lib, stdenv, fetchFromGitHub, cmake, asciidoc }: stdenv.mkDerivation rec { pname = "mkrom"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://knightos.org/"; description = "Packages KnightOS distribution files into a ROM"; license = licenses.mit; diff --git a/pkgs/development/tools/knightos/mktiupgrade/default.nix b/pkgs/development/tools/knightos/mktiupgrade/default.nix index 171c1671b332..a91d1e5beda8 100644 --- a/pkgs/development/tools/knightos/mktiupgrade/default.nix +++ b/pkgs/development/tools/knightos/mktiupgrade/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, asciidoc }: +{ lib, stdenv, fetchFromGitHub, cmake, asciidoc }: stdenv.mkDerivation rec { pname = "mktiupgrade"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://knightos.org/"; description = "Makes TI calculator upgrade files from ROM dumps"; license = licenses.mit; diff --git a/pkgs/development/tools/knightos/patchrom/default.nix b/pkgs/development/tools/knightos/patchrom/default.nix index 9feab36ec822..33ed8d38c63d 100644 --- a/pkgs/development/tools/knightos/patchrom/default.nix +++ b/pkgs/development/tools/knightos/patchrom/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, asciidoc, libxslt, docbook_xsl }: +{ lib, stdenv, fetchFromGitHub, cmake, asciidoc, libxslt, docbook_xsl }: stdenv.mkDerivation rec { @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://knightos.org/"; description = "Patches jumptables into TI calculator ROM files and generates an include file"; license = licenses.mit; diff --git a/pkgs/development/tools/knightos/scas/default.nix b/pkgs/development/tools/knightos/scas/default.nix index b87650d5bf95..573d261306a6 100644 --- a/pkgs/development/tools/knightos/scas/default.nix +++ b/pkgs/development/tools/knightos/scas/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, stdenv, cmake }: +{ fetchFromGitHub, lib, stdenv, cmake }: stdenv.mkDerivation rec { pname = "scas"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://knightos.org/"; description = "Assembler and linker for the Z80"; license = licenses.mit; diff --git a/pkgs/development/tools/knightos/z80e/default.nix b/pkgs/development/tools/knightos/z80e/default.nix index d8f6a1274032..a089511fb684 100644 --- a/pkgs/development/tools/knightos/z80e/default.nix +++ b/pkgs/development/tools/knightos/z80e/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, knightos-scas, readline, SDL2 }: +{ lib, stdenv, fetchFromGitHub, cmake, knightos-scas, readline, SDL2 }: stdenv.mkDerivation rec { pname = "z80e"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-Denable-sdl=YES" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://knightos.org/"; description = "A Z80 calculator emulator and debugger"; license = licenses.mit; diff --git a/pkgs/development/tools/krew/default.nix b/pkgs/development/tools/krew/default.nix index b5fc91b62dda..8e5d9d76fc49 100644 --- a/pkgs/development/tools/krew/default.nix +++ b/pkgs/development/tools/krew/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "krew"; @@ -15,7 +15,7 @@ buildGoModule rec { subPackages = [ "cmd/krew" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Package manager for kubectl plugins"; homepage = "https://github.com/kubernetes-sigs/krew"; maintainers = with maintainers; [ vdemeester ]; diff --git a/pkgs/development/tools/kubeprompt/default.nix b/pkgs/development/tools/kubeprompt/default.nix index 51369bc1f91e..4fc8f3253429 100644 --- a/pkgs/development/tools/kubeprompt/default.nix +++ b/pkgs/development/tools/kubeprompt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "kubeprompt"; @@ -22,7 +22,7 @@ buildGoModule rec { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Kubernetes prompt"; homepage = "https://github.com/jlesquembre/kubeprompt"; license = licenses.epl20; diff --git a/pkgs/development/tools/kubie/default.nix b/pkgs/development/tools/kubie/default.nix index cae76669ab42..33d4ea0df1d2 100644 --- a/pkgs/development/tools/kubie/default.nix +++ b/pkgs/development/tools/kubie/default.nix @@ -1,4 +1,4 @@ -{ stdenv, rustPlatform, fetchFromGitHub, installShellFiles, Security }: +{ lib, stdenv, rustPlatform, fetchFromGitHub, installShellFiles, Security }: rustPlatform.buildRustPackage rec { pname = "kubie"; @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { installShellCompletion completion/kubie.bash ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Shell independent context and namespace switcher for kubectl"; homepage = "https://github.com/sbstp/kubie"; license = with licenses; [ zlib ]; diff --git a/pkgs/development/tools/kustomize/default.nix b/pkgs/development/tools/kustomize/default.nix index 79c484586111..4235912c24f0 100644 --- a/pkgs/development/tools/kustomize/default.nix +++ b/pkgs/development/tools/kustomize/default.nix @@ -2,9 +2,9 @@ buildGoModule rec { pname = "kustomize"; - version = "3.8.7"; + version = "3.9.1"; # rev is the 3.8.7 commit, mainly for kustomize version command output - rev = "ad092cc7a91c07fdf63a2e4b7f13fa588a39af4f"; + rev = "7439f1809e5ccd4677ed52be7f98f2ad75122a93"; buildFlagsArray = let t = "sigs.k8s.io/kustomize/api/provenance"; in '' @@ -17,13 +17,13 @@ buildGoModule rec { owner = "kubernetes-sigs"; repo = pname; rev = "kustomize/v${version}"; - sha256 = "1942cyaj6knf8mc3q2vcz6rqqc6lxdd6nikry9m0idk5l1b09x1m"; + sha256 = "1v8yfiwzg84bpdh3k3h5v2smxx0dymq717r2mh3pjz3nifkg3ilm"; }; # avoid finding test and development commands sourceRoot = "source/kustomize"; - vendorSha256 = "0y77ykfcbn4l0x85c3hb1lgjpy64kimx3s1qkn38gpmi4lphvkkl"; + vendorSha256 = "1nixkmyqzq7387rwam0bsa6qjd40k5p15npq0iz1z2k1ws8pvrg6"; meta = with lib; { description = "Customization of kubernetes YAML configurations"; @@ -34,6 +34,6 @@ buildGoModule rec { ''; homepage = "https://github.com/kubernetes-sigs/kustomize"; license = licenses.asl20; - maintainers = with maintainers; [ carlosdagos vdemeester periklis zaninime ]; + maintainers = with maintainers; [ carlosdagos vdemeester periklis zaninime Chili-Man]; }; } diff --git a/pkgs/development/tools/lc3tools/default.nix b/pkgs/development/tools/lc3tools/default.nix index 122271c34a4d..3e7f81bb4e7b 100644 --- a/pkgs/development/tools/lc3tools/default.nix +++ b/pkgs/development/tools/lc3tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, flex, tk, ncurses, readline }: +{ lib, stdenv, fetchurl, unzip, flex, tk, ncurses, readline }: stdenv.mkDerivation { pname = "lc3tools"; @@ -39,7 +39,7 @@ stdenv.mkDerivation { mv -t $out/bin $out/lc3* ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Toolchain and emulator for the LC-3 architecture"; license = licenses.gpl2; maintainers = with maintainers; [ anna328p ]; diff --git a/pkgs/development/tools/metals/default.nix b/pkgs/development/tools/metals/default.nix index 0d8911e5b213..0937ccb59871 100644 --- a/pkgs/development/tools/metals/default.nix +++ b/pkgs/development/tools/metals/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "metals"; - version = "0.9.7"; + version = "0.9.8"; deps = stdenv.mkDerivation { name = "${pname}-deps-${version}"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ''; outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "0aky4vbbm5hi6jnd2n1aimqznbbaya05c7vdgaqhy3630ks3w4k9"; + outputHash = "1gn7v1478sqhz4hv53pgvaw2nqziyiavvhn5q152lkzyvghq08wk"; }; nativeBuildInputs = [ makeWrapper ]; @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { --add-flags "${extraJavaOpts} -Dmetals.client=sublime -cp $CLASSPATH scala.meta.metals.Main" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://scalameta.org/metals/"; license = licenses.asl20; description = "Work-in-progress language server for Scala"; diff --git a/pkgs/development/tools/micronaut/default.nix b/pkgs/development/tools/micronaut/default.nix index 5d032d42108f..ddf9d84f3bf4 100644 --- a/pkgs/development/tools/micronaut/default.nix +++ b/pkgs/development/tools/micronaut/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, jdk, makeWrapper, installShellFiles }: +{ lib, stdenv, fetchzip, jdk, makeWrapper, installShellFiles }: stdenv.mkDerivation rec { pname = "micronaut"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Modern, JVM-based, full-stack framework for building microservice applications"; longDescription = '' Micronaut is a modern, JVM-based, full stack microservices framework diff --git a/pkgs/development/tools/minizinc/default.nix b/pkgs/development/tools/minizinc/default.nix index 1d01ef97f401..bcaa3e565071 100644 --- a/pkgs/development/tools/minizinc/default.nix +++ b/pkgs/development/tools/minizinc/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { pname = "minizinc"; inherit version; - buildInputs = [ cmake flex bison ]; + nativeBuildInputs = [ cmake flex bison ]; src = fetchFromGitHub { owner = "MiniZinc"; diff --git a/pkgs/development/tools/misc/autoconf/2.69.nix b/pkgs/development/tools/misc/autoconf/2.69.nix new file mode 100644 index 000000000000..500d80d4bb8f --- /dev/null +++ b/pkgs/development/tools/misc/autoconf/2.69.nix @@ -0,0 +1,52 @@ +{ stdenv, fetchurl, m4, perl }: + +stdenv.mkDerivation rec { + name = "autoconf-2.69"; + + src = fetchurl { + url = "mirror://gnu/autoconf/${name}.tar.xz"; + sha256 = "113nlmidxy9kjr45kg9x3ngar4951mvag1js2a3j8nxcz34wxsv4"; + }; + + nativeBuildInputs = [ m4 perl ]; + buildInputs = [ m4 ]; + + # Work around a known issue in Cygwin. See + # http://thread.gmane.org/gmane.comp.sysutils.autoconf.bugs/6822 for + # details. + # There are many test failures on `i386-pc-solaris2.11'. + #doCheck = ((!stdenv.isCygwin) && (!stdenv.isSunOS)); + doCheck = false; + + # Don't fixup "#! /bin/sh" in Autoconf, otherwise it will use the + # "fixed" path in generated files! + dontPatchShebangs = true; + + enableParallelBuilding = true; + + # Make the Autotest test suite run in parallel. + preCheck ='' + export TESTSUITEFLAGS="-j$NIX_BUILD_CORES" + ''; + + doInstallCheck = false; # fails + + meta = { + homepage = "https://www.gnu.org/software/autoconf/"; + description = "Part of the GNU Build System"; + + longDescription = '' + GNU Autoconf is an extensible package of M4 macros that produce + shell scripts to automatically configure software source code + packages. These scripts can adapt the packages to many kinds of + UNIX-like systems without manual user intervention. Autoconf + creates a configuration script for a package from a template + file that lists the operating system features that the package + can use, in the form of M4 macro calls. + ''; + + license = stdenv.lib.licenses.gpl2Plus; + + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/development/tools/misc/autoconf/default.nix b/pkgs/development/tools/misc/autoconf/default.nix index 93add837290b..57a92cee737b 100644 --- a/pkgs/development/tools/misc/autoconf/default.nix +++ b/pkgs/development/tools/misc/autoconf/default.nix @@ -6,11 +6,11 @@ # files. stdenv.mkDerivation rec { - name = "autoconf-2.69"; + name = "autoconf-2.70"; src = fetchurl { url = "mirror://gnu/autoconf/${name}.tar.xz"; - sha256 = "113nlmidxy9kjr45kg9x3ngar4951mvag1js2a3j8nxcz34wxsv4"; + sha256 = "1ipckz0wr2mvhj9n3ys54fmf2aksin6bhqvzl304bn6rc1w257ps"; }; nativeBuildInputs = [ m4 perl ]; @@ -20,8 +20,7 @@ stdenv.mkDerivation rec { # http://thread.gmane.org/gmane.comp.sysutils.autoconf.bugs/6822 for # details. # There are many test failures on `i386-pc-solaris2.11'. - #doCheck = ((!stdenv.isCygwin) && (!stdenv.isSunOS)); - doCheck = false; + doCheck = ((!stdenv.isCygwin) && (!stdenv.isSunOS)); # Don't fixup "#! /bin/sh" in Autoconf, otherwise it will use the # "fixed" path in generated files! @@ -34,8 +33,6 @@ stdenv.mkDerivation rec { export TESTSUITEFLAGS="-j$NIX_BUILD_CORES" ''; - doInstallCheck = false; # fails - meta = { homepage = "https://www.gnu.org/software/autoconf/"; description = "Part of the GNU Build System"; @@ -50,7 +47,7 @@ stdenv.mkDerivation rec { can use, in the form of M4 macro calls. ''; - license = stdenv.lib.licenses.gpl2Plus; + license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/tools/misc/automoc4/default.nix b/pkgs/development/tools/misc/automoc4/default.nix index 1cabb1f0223e..22942e2a658e 100644 --- a/pkgs/development/tools/misc/automoc4/default.nix +++ b/pkgs/development/tools/misc/automoc4/default.nix @@ -1,15 +1,17 @@ { stdenv, fetchurl, cmake, qt4 }: stdenv.mkDerivation rec { - name = "automoc4-0.9.88"; - + pname = "automoc4"; + version = "0.9.88"; + src = fetchurl { - url = "mirror://kde/stable/automoc4/0.9.88/${name}.tar.bz2"; + url = "mirror://kde/stable/automoc4/0.9.88/${pname}.tar.bz2"; sha256 = "0jackvg0bdjg797qlbbyf9syylm0qjs55mllhn11vqjsq3s1ch93"; }; - - buildInputs = [ cmake qt4 ]; - + + nativeBuildInputs = [ cmake ]; + buildInputs = [ qt4 ]; + meta = with stdenv.lib; { homepage = "https://techbase.kde.org/Development/Tools/Automoc4"; description = "KDE Meta Object Compiler"; diff --git a/pkgs/development/tools/misc/binutils/patches/2.31/always-search-rpath.patch b/pkgs/development/tools/misc/binutils/always-search-rpath.patch similarity index 100% rename from pkgs/development/tools/misc/binutils/patches/2.31/always-search-rpath.patch rename to pkgs/development/tools/misc/binutils/always-search-rpath.patch diff --git a/pkgs/development/tools/misc/binutils/patches/2.34/build-components-separately.patch b/pkgs/development/tools/misc/binutils/build-components-separately.patch similarity index 100% rename from pkgs/development/tools/misc/binutils/patches/2.34/build-components-separately.patch rename to pkgs/development/tools/misc/binutils/build-components-separately.patch diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index 978ec3f2f99f..559268521460 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub, fetchurl, zlib, autoreconfHook, gettext # Enabling all targets increases output size to a multiple. , withAllTargets ? false, libbfd, libopcodes -, enableShared ? true +, enableShared ? !stdenv.hostPlatform.isStatic , noSysDirs , gold ? !stdenv.buildPlatform.isDarwin || stdenv.hostPlatform == stdenv.targetPlatform , bison ? null @@ -19,13 +19,7 @@ let reuseLibs = enableShared && withAllTargets; - # Remove gold-symbol-visibility patch when updating, the proper fix - # is now upstream. - # https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commitdiff;h=330b90b5ffbbc20c5de6ae6c7f60c40fab2e7a4f;hp=99181ccac0fc7d82e7dabb05dc7466e91f1645d3 - version = "${minorVersion}${patchVersion}"; - minorVersion = if stdenv.targetPlatform.isOr1k then "2.34" else "2.31"; - patchVersion = if stdenv.targetPlatform.isOr1k then "" else ".1"; - + version = "2.34"; basename = "binutils"; # The targetPrefix prepended to binary names to allow multiple binuntils on the # PATH to both be usable. @@ -37,49 +31,33 @@ let rev = "708acc851880dbeda1dd18aca4fd0a95b2573b36"; sha256 = "1kdrz6fki55lm15rwwamn74fnqpy0zlafsida2zymk76n3656c63"; }; - - # binutils sources not part of the bootstrap. - non-boot-src = (fetchurl { - url = "mirror://gnu/binutils/${basename}-${version}.tar.bz2"; - sha256 = { - "2.31.1" = "1l34hn1zkmhr1wcrgf0d4z7r3najxnw3cx2y2fk7v55zjlk3ik7z"; - "2.34" = "1rin1f5c7wm4n3piky6xilcrpf2s0n3dd5vqq8irrxkcic3i1w49"; - }.${version}; - }); - # HACK to ensure that we preserve source from bootstrap binutils to not rebuild LLVM - normal-src = stdenv.__bootPackages.binutils-unwrapped.src or non-boot-src; - - # Platforms where we directly use the final source. - # Generally for cross-compiled platforms, where the boot source won't compile. - skipBootSrc = stdenv.targetPlatform.isOr1k; - - # Select the specific source according to the platform in use. - src = if stdenv.targetPlatform.isVc4 then vc4-binutils-src - else if skipBootSrc then non-boot-src - else normal-src; - - patchesDir = ./patches + "/${minorVersion}"; + normal-src = stdenv.__bootPackages.binutils-unwrapped.src or (fetchurl { + url = "mirror://gnu/binutils/${basename}-${version}.tar.bz2"; + sha256 = "1rin1f5c7wm4n3piky6xilcrpf2s0n3dd5vqq8irrxkcic3i1w49"; + }); in stdenv.mkDerivation { pname = targetPrefix + basename; - inherit src version; + inherit version; + + src = if stdenv.targetPlatform.isVc4 then vc4-binutils-src else normal-src; patches = [ # Make binutils output deterministic by default. - "${patchesDir}/deterministic.patch" + ./deterministic.patch # Bfd looks in BINDIR/../lib for some plugins that don't # exist. This is pointless (since users can't install plugins # there) and causes a cycle between the lib and bin outputs, so # get rid of it. - "${patchesDir}/no-plugins.patch" + ./no-plugins.patch # Help bfd choose between elf32-littlearm, elf32-littlearm-symbian, and # elf32-littlearm-vxworks in favor of the first. # https://github.com/NixOS/nixpkgs/pull/30484#issuecomment-345472766 - "${patchesDir}/disambiguate-arm-targets.patch" + ./disambiguate-arm-targets.patch # For some reason bfd ld doesn't search DT_RPATH when cross-compiling. It's # not clear why this behavior was decided upon but it has the unfortunate @@ -87,41 +65,28 @@ stdenv.mkDerivation { # shared objects when cross-compiling. Consequently, we are forced to # override this behavior, forcing ld to search DT_RPATH even when # cross-compiling. - "${patchesDir}/always-search-rpath.patch" - ] - # For version 2.31 exclusively - ++ lib.optionals (!stdenv.targetPlatform.isVc4 && minorVersion == "2.31") [ - # https://sourceware.org/bugzilla/show_bug.cgi?id=22868 - ./patches/2.31/gold-symbol-visibility.patch + ./always-search-rpath.patch - # https://sourceware.org/bugzilla/show_bug.cgi?id=23428 - # un-break features so linking against musl doesn't produce crash-only binaries - ./patches/2.31/0001-x86-Add-a-GNU_PROPERTY_X86_ISA_1_USED-note-if-needed.patch - ./patches/2.31/0001-x86-Properly-merge-GNU_PROPERTY_X86_ISA_1_USED.patch - ./patches/2.31/0001-x86-Properly-add-X86_ISA_1_NEEDED-property.patch - ] - ++ lib.optional stdenv.targetPlatform.isiOS ./support-ios.patch - ++ # This patch was suggested by Nick Clifton to fix - # https://sourceware.org/bugzilla/show_bug.cgi?id=16177 - # It can be removed when that 7-year-old bug is closed. - # This binutils bug causes GHC to emit broken binaries on armv7, and - # indeed GHC will refuse to compile with a binutils suffering from it. See - # this comment for more information: - # https://gitlab.haskell.org/ghc/ghc/issues/4210#note_78333 - lib.optional stdenv.targetPlatform.isAarch32 ./R_ARM_COPY.patch - ; + ] ++ lib.optional stdenv.targetPlatform.isiOS ./support-ios.patch + ++ # This patch was suggested by Nick Clifton to fix + # https://sourceware.org/bugzilla/show_bug.cgi?id=16177 + # It can be removed when that 7-year-old bug is closed. + # This binutils bug causes GHC to emit broken binaries on armv7, and + # indeed GHC will refuse to compile with a binutils suffering from it. See + # this comment for more information: + # https://gitlab.haskell.org/ghc/ghc/issues/4210#note_78333 + lib.optional stdenv.targetPlatform.isAarch32 ./R_ARM_COPY.patch; outputs = [ "out" "info" "man" ]; depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ bison - ] ++ lib.optionals (lib.versionAtLeast version "2.34") [ perl texinfo ] ++ (lib.optionals stdenv.targetPlatform.isiOS [ autoreconfHook - ]) ++ lib.optionals stdenv.targetPlatform.isVc4 [ texinfo flex ]; + ]) ++ lib.optionals stdenv.targetPlatform.isVc4 [ flex ]; buildInputs = [ zlib gettext ]; inherit noSysDirs; @@ -182,7 +147,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; passthru = { - inherit targetPrefix patchesDir; + inherit targetPrefix; }; meta = with lib; { diff --git a/pkgs/development/tools/misc/binutils/patches/2.31/deterministic.patch b/pkgs/development/tools/misc/binutils/deterministic.patch similarity index 100% rename from pkgs/development/tools/misc/binutils/patches/2.31/deterministic.patch rename to pkgs/development/tools/misc/binutils/deterministic.patch diff --git a/pkgs/development/tools/misc/binutils/patches/2.31/disambiguate-arm-targets.patch b/pkgs/development/tools/misc/binutils/disambiguate-arm-targets.patch similarity index 100% rename from pkgs/development/tools/misc/binutils/patches/2.31/disambiguate-arm-targets.patch rename to pkgs/development/tools/misc/binutils/disambiguate-arm-targets.patch diff --git a/pkgs/development/tools/misc/binutils/patches/2.34/no-plugins.patch b/pkgs/development/tools/misc/binutils/no-plugins.patch similarity index 100% rename from pkgs/development/tools/misc/binutils/patches/2.34/no-plugins.patch rename to pkgs/development/tools/misc/binutils/no-plugins.patch diff --git a/pkgs/development/tools/misc/binutils/patches/2.31/0001-x86-Add-a-GNU_PROPERTY_X86_ISA_1_USED-note-if-needed.patch b/pkgs/development/tools/misc/binutils/patches/2.31/0001-x86-Add-a-GNU_PROPERTY_X86_ISA_1_USED-note-if-needed.patch deleted file mode 100644 index 5a047b0f0703..000000000000 --- a/pkgs/development/tools/misc/binutils/patches/2.31/0001-x86-Add-a-GNU_PROPERTY_X86_ISA_1_USED-note-if-needed.patch +++ /dev/null @@ -1,517 +0,0 @@ -From 6737a6b34f4823deb7142f27b4074831a37ac1e1 Mon Sep 17 00:00:00 2001 -From: "H.J. Lu" -Date: Fri, 20 Jul 2018 09:18:47 -0700 -Subject: [PATCH] x86: Add a GNU_PROPERTY_X86_ISA_1_USED note if needed - -When -z separate-code, which is enabled by default for Linux/x86, is -used to create executable, ld won't place any data in the code-only -PT_LOAD segment. If there are no data sections placed before the -code-only PT_LOAD segment, the program headers won't be mapped into -any PT_LOAD segment. When the executable tries to access it (based -on the program header address passed in AT_PHDR), it will lead to -segfault. This patch inserts a GNU_PROPERTY_X86_ISA_1_USED note if -there may be no data sections before the text section so that the -first PT_LOAD segment won't be code-only and will contain the program -header. - -Testcases are adjusted to either pass "-z noseparate-code" to ld or -discard the .note.gnu.property section. A Linux/x86 run-time test is -added. - -bfd/ - - PR ld/23428 - * elfxx-x86.c (_bfd_x86_elf_link_setup_gnu_properties): If the - separate code program header is needed, make sure that the first - read-only PT_LOAD segment has no code by adding a - GNU_PROPERTY_X86_ISA_1_USED note. - -ld/ - - PR ld/23428 - * testsuite/ld-elf/linux-x86.S: New file. - * testsuite/ld-elf/linux-x86.exp: Likewise. - * testsuite/ld-elf/pr23428.c: Likewise. - * testsuite/ld-elf/sec64k.exp: Pass "-z noseparate-code" to ld - for Linux/x86 targets. - * testsuite/ld-i386/abs-iamcu.d: Likewise. - * testsuite/ld-i386/abs.d: Likewise. - * testsuite/ld-i386/pr12718.d: Likewise. - * testsuite/ld-i386/pr12921.d: Likewise. - * testsuite/ld-x86-64/abs-k1om.d: Likewise. - * testsuite/ld-x86-64/abs-l1om.d: Likewise. - * testsuite/ld-x86-64/abs.d: Likewise. - * testsuite/ld-x86-64/pr12718.d: Likewise. - * testsuite/ld-x86-64/pr12921.d: Likewise. - * testsuite/ld-linkonce/zeroeh.ld: Discard .note.gnu.property - section. - * testsuite/ld-scripts/print-memory-usage.t: Likewise. - * testsuite/ld-scripts/size-2.t: Likewise. - * testsuite/lib/ld-lib.exp (run_ld_link_exec_tests): Use ld - to create executable if language is "asm". - -(cherry picked from commit 241e64e3b42cd9eba514b8e0ad2ef39a337f10a5) ---- - bfd/elfxx-x86.c | 60 ++++++++++++++----- - ld/testsuite/ld-elf/linux-x86.S | 63 ++++++++++++++++++++ - ld/testsuite/ld-elf/linux-x86.exp | 46 ++++++++++++++ - ld/testsuite/ld-elf/pr23428.c | 43 +++++++++++++ - ld/testsuite/ld-elf/sec64k.exp | 2 + - ld/testsuite/ld-i386/abs-iamcu.d | 2 +- - ld/testsuite/ld-i386/abs.d | 2 +- - ld/testsuite/ld-i386/pr12718.d | 2 +- - ld/testsuite/ld-i386/pr12921.d | 2 +- - ld/testsuite/ld-linkonce/zeroeh.ld | 1 + - ld/testsuite/ld-scripts/print-memory-usage.t | 2 + - ld/testsuite/ld-scripts/size-2.t | 1 + - ld/testsuite/ld-x86-64/abs-k1om.d | 2 +- - ld/testsuite/ld-x86-64/abs-l1om.d | 2 +- - ld/testsuite/ld-x86-64/abs.d | 2 +- - ld/testsuite/ld-x86-64/pr12718.d | 2 +- - ld/testsuite/ld-x86-64/pr12921.d | 2 +- - ld/testsuite/lib/ld-lib.exp | 5 +- - 20 files changed, 248 insertions(+), 25 deletions(-) - create mode 100644 ld/testsuite/ld-elf/linux-x86.S - create mode 100644 ld/testsuite/ld-elf/linux-x86.exp - create mode 100644 ld/testsuite/ld-elf/pr23428.c - -diff --git a/bfd/elfxx-x86.c b/bfd/elfxx-x86.c -index a2497aab86..2e4ff88f1f 100644 ---- a/bfd/elfxx-x86.c -+++ b/bfd/elfxx-x86.c -@@ -2524,6 +2524,7 @@ _bfd_x86_elf_link_setup_gnu_properties - const struct elf_backend_data *bed; - unsigned int class_align = ABI_64_P (info->output_bfd) ? 3 : 2; - unsigned int got_align; -+ bfd_boolean has_text = FALSE; - - features = 0; - if (info->ibt) -@@ -2538,24 +2539,59 @@ _bfd_x86_elf_link_setup_gnu_properties - if (bfd_get_flavour (pbfd) == bfd_target_elf_flavour - && bfd_count_sections (pbfd) != 0) - { -+ if (!has_text) -+ { -+ /* Check if there is no non-empty text section. */ -+ sec = bfd_get_section_by_name (pbfd, ".text"); -+ if (sec != NULL && sec->size != 0) -+ has_text = TRUE; -+ } -+ - ebfd = pbfd; - - if (elf_properties (pbfd) != NULL) - break; - } - -- if (ebfd != NULL && features) -+ bed = get_elf_backend_data (info->output_bfd); -+ -+ htab = elf_x86_hash_table (info, bed->target_id); -+ if (htab == NULL) -+ return pbfd; -+ -+ if (ebfd != NULL) - { -- /* If features is set, add GNU_PROPERTY_X86_FEATURE_1_IBT and -- GNU_PROPERTY_X86_FEATURE_1_SHSTK. */ -- prop = _bfd_elf_get_property (ebfd, -- GNU_PROPERTY_X86_FEATURE_1_AND, -- 4); -- prop->u.number |= features; -- prop->pr_kind = property_number; -+ prop = NULL; -+ if (features) -+ { -+ /* If features is set, add GNU_PROPERTY_X86_FEATURE_1_IBT and -+ GNU_PROPERTY_X86_FEATURE_1_SHSTK. */ -+ prop = _bfd_elf_get_property (ebfd, -+ GNU_PROPERTY_X86_FEATURE_1_AND, -+ 4); -+ prop->u.number |= features; -+ prop->pr_kind = property_number; -+ } -+ else if (has_text -+ && elf_properties (ebfd) == NULL -+ && elf_tdata (info->output_bfd)->o->build_id.sec == NULL -+ && !htab->elf.dynamic_sections_created -+ && !info->traditional_format -+ && (info->output_bfd->flags & D_PAGED) != 0 -+ && info->separate_code) -+ { -+ /* If the separate code program header is needed, make sure -+ that the first read-only PT_LOAD segment has no code by -+ adding a GNU_PROPERTY_X86_ISA_1_USED note. */ -+ prop = _bfd_elf_get_property (ebfd, -+ GNU_PROPERTY_X86_ISA_1_USED, -+ 4); -+ prop->u.number = GNU_PROPERTY_X86_ISA_1_486; -+ prop->pr_kind = property_number; -+ } - - /* Create the GNU property note section if needed. */ -- if (pbfd == NULL) -+ if (prop != NULL && pbfd == NULL) - { - sec = bfd_make_section_with_flags (ebfd, - NOTE_GNU_PROPERTY_SECTION_NAME, -@@ -2581,12 +2617,6 @@ error_alignment: - - pbfd = _bfd_elf_link_setup_gnu_properties (info); - -- bed = get_elf_backend_data (info->output_bfd); -- -- htab = elf_x86_hash_table (info, bed->target_id); -- if (htab == NULL) -- return pbfd; -- - htab->r_info = init_table->r_info; - htab->r_sym = init_table->r_sym; - -diff --git a/ld/testsuite/ld-elf/linux-x86.S b/ld/testsuite/ld-elf/linux-x86.S -new file mode 100644 -index 0000000000..bdf40c6e01 ---- /dev/null -+++ b/ld/testsuite/ld-elf/linux-x86.S -@@ -0,0 +1,63 @@ -+ .text -+ .globl _start -+ .type _start,@function -+ .p2align 4 -+_start: -+ xorl %ebp, %ebp -+#ifdef __LP64__ -+ popq %rdi -+ movq %rsp, %rsi -+ andq $~15, %rsp -+#elif defined __x86_64__ -+ mov (%rsp),%edi -+ addl $4,%esp -+ movl %esp, %esi -+ andl $~15, %esp -+#else -+ popl %esi -+ movl %esp, %ecx -+ andl $~15, %esp -+ -+ subl $8,%esp -+ pushl %ecx -+ pushl %esi -+#endif -+ -+ call main -+ -+ hlt -+ -+ .type syscall, @function -+ .globl syscall -+ .p2align 4 -+syscall: -+#ifdef __x86_64__ -+ movq %rdi, %rax /* Syscall number -> rax. */ -+ movq %rsi, %rdi /* shift arg1 - arg5. */ -+ movq %rdx, %rsi -+ movq %rcx, %rdx -+ movq %r8, %r10 -+ movq %r9, %r8 -+ movq 8(%rsp),%r9 /* arg6 is on the stack. */ -+ syscall /* Do the system call. */ -+#else -+ push %ebp -+ push %edi -+ push %esi -+ push %ebx -+ mov 0x2c(%esp),%ebp -+ mov 0x28(%esp),%edi -+ mov 0x24(%esp),%esi -+ mov 0x20(%esp),%edx -+ mov 0x1c(%esp),%ecx -+ mov 0x18(%esp),%ebx -+ mov 0x14(%esp),%eax -+ int $0x80 -+ pop %ebx -+ pop %esi -+ pop %edi -+ pop %ebp -+#endif -+ ret /* Return to caller. */ -+ .size syscall, .-syscall -+ .section .note.GNU-stack,"",@progbits -diff --git a/ld/testsuite/ld-elf/linux-x86.exp b/ld/testsuite/ld-elf/linux-x86.exp -new file mode 100644 -index 0000000000..36217c6fb4 ---- /dev/null -+++ b/ld/testsuite/ld-elf/linux-x86.exp -@@ -0,0 +1,46 @@ -+# Expect script for simple native Linux/x86 tests. -+# Copyright (C) 2018 Free Software Foundation, Inc. -+# -+# This file is part of the GNU Binutils. -+# -+# This program is free software; you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 3 of the License, or -+# (at your option) any later version. -+# -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, -+# MA 02110-1301, USA. -+# -+ -+# Test very simple native Linux/x86 programs with linux-x86.S. -+if { ![isnative] || [which $CC] == 0 \ -+ || (![istarget "i?86-*-linux*"] \ -+ && ![istarget "x86_64-*-linux*"] \ -+ && ![istarget "amd64-*-linux*"]) } { -+ return -+} -+ -+# Add $PLT_CFLAGS if PLT is expected. -+global PLT_CFLAGS -+# Add $NOPIE_CFLAGS and $NOPIE_LDFLAGS if non-PIE is required. -+global NOPIE_CFLAGS NOPIE_LDFLAGS -+ -+run_ld_link_exec_tests [list \ -+ [list \ -+ "Run PR ld/23428 test" \ -+ "--no-dynamic-linker -z separate-code" \ -+ "" \ -+ { linux-x86.S pr23428.c } \ -+ "pr23428" \ -+ "pass.out" \ -+ "$NOPIE_CFLAGS -fno-asynchronous-unwind-tables" \ -+ "asm" \ -+ ] \ -+] -diff --git a/ld/testsuite/ld-elf/pr23428.c b/ld/testsuite/ld-elf/pr23428.c -new file mode 100644 -index 0000000000..3631ed7926 ---- /dev/null -+++ b/ld/testsuite/ld-elf/pr23428.c -@@ -0,0 +1,43 @@ -+#include -+#include -+#include -+ -+#define STRING_COMMA_LEN(STR) (STR), (sizeof (STR) - 1) -+ -+int -+main (int argc, char **argv) -+{ -+ char **ev = &argv[argc + 1]; -+ char **evp = ev; -+ ElfW(auxv_t) *av; -+ const ElfW(Phdr) *phdr = NULL; -+ size_t phnum = 0; -+ size_t loadnum = 0; -+ int fd = STDOUT_FILENO; -+ size_t i; -+ -+ while (*evp++ != NULL) -+ ; -+ -+ av = (ElfW(auxv_t) *) evp; -+ -+ for (; av->a_type != AT_NULL; ++av) -+ switch (av->a_type) -+ { -+ case AT_PHDR: -+ phdr = (const void *) av->a_un.a_val; -+ break; -+ case AT_PHNUM: -+ phnum = av->a_un.a_val; -+ break; -+ } -+ -+ for (i = 0; i < phnum; i++, phdr++) -+ if (phdr->p_type == PT_LOAD) -+ loadnum++; -+ -+ syscall (SYS_write, fd, STRING_COMMA_LEN ("PASS\n")); -+ -+ syscall (SYS_exit, !loadnum); -+ return 0; -+} -diff --git a/ld/testsuite/ld-elf/sec64k.exp b/ld/testsuite/ld-elf/sec64k.exp -index b58139e9dd..3909c0eaa1 100644 ---- a/ld/testsuite/ld-elf/sec64k.exp -+++ b/ld/testsuite/ld-elf/sec64k.exp -@@ -177,6 +177,8 @@ if { ![istarget "d10v-*-*"] - foreach sfile $sfiles { puts $ofd "#source: $sfile" } - if { [istarget spu*-*-*] } { - puts $ofd "#ld: --local-store 0:0" -+ } elseif { [istarget "i?86-*-linux*"] || [istarget "x86_64-*-linux*"] } { -+ puts $ofd "#ld: -z noseparate-code" - } else { - puts $ofd "#ld:" - } -diff --git a/ld/testsuite/ld-i386/abs-iamcu.d b/ld/testsuite/ld-i386/abs-iamcu.d -index ac9beff2e5..aba7d6b03f 100644 ---- a/ld/testsuite/ld-i386/abs-iamcu.d -+++ b/ld/testsuite/ld-i386/abs-iamcu.d -@@ -2,7 +2,7 @@ - #source: abs.s - #source: zero.s - #as: --32 -march=iamcu --#ld: -m elf_iamcu -+#ld: -m elf_iamcu -z noseparate-code - #objdump: -rs -j .text - - .*: file format .* -diff --git a/ld/testsuite/ld-i386/abs.d b/ld/testsuite/ld-i386/abs.d -index e660aca524..191ee4456a 100644 ---- a/ld/testsuite/ld-i386/abs.d -+++ b/ld/testsuite/ld-i386/abs.d -@@ -2,7 +2,7 @@ - #as: --32 - #source: abs.s - #source: zero.s --#ld: -melf_i386 -+#ld: -melf_i386 -z noseparate-code - #objdump: -rs - - .*: file format .* -diff --git a/ld/testsuite/ld-i386/pr12718.d b/ld/testsuite/ld-i386/pr12718.d -index ec51540a42..7eba52d95e 100644 ---- a/ld/testsuite/ld-i386/pr12718.d -+++ b/ld/testsuite/ld-i386/pr12718.d -@@ -1,6 +1,6 @@ - #name: PR ld/12718 - #as: --32 --#ld: -melf_i386 -+#ld: -melf_i386 -z noseparate-code - #readelf: -S - - There are 5 section headers, starting at offset 0x[0-9a-f]+: -diff --git a/ld/testsuite/ld-i386/pr12921.d b/ld/testsuite/ld-i386/pr12921.d -index e49079b3c8..ea2da3eb51 100644 ---- a/ld/testsuite/ld-i386/pr12921.d -+++ b/ld/testsuite/ld-i386/pr12921.d -@@ -1,6 +1,6 @@ - #name: PR ld/12921 - #as: --32 --#ld: -melf_i386 -+#ld: -melf_i386 -z noseparate-code - #readelf: -S --wide - - There are 7 section headers, starting at offset 0x[0-9a-f]+: -diff --git a/ld/testsuite/ld-linkonce/zeroeh.ld b/ld/testsuite/ld-linkonce/zeroeh.ld -index b22eaa12c9..f89855a08f 100644 ---- a/ld/testsuite/ld-linkonce/zeroeh.ld -+++ b/ld/testsuite/ld-linkonce/zeroeh.ld -@@ -2,4 +2,5 @@ SECTIONS { - .text 0xa00 : { *(.text); *(.gnu.linkonce.t.*) } - .gcc_except_table 0x2000 : { *(.gcc_except_table) } - .eh_frame 0x4000 : { *(.eh_frame) } -+ /DISCARD/ : { *(.note.gnu.property) } - } -diff --git a/ld/testsuite/ld-scripts/print-memory-usage.t b/ld/testsuite/ld-scripts/print-memory-usage.t -index 5ff057a5e3..6eda1d2dc4 100644 ---- a/ld/testsuite/ld-scripts/print-memory-usage.t -+++ b/ld/testsuite/ld-scripts/print-memory-usage.t -@@ -11,4 +11,6 @@ SECTIONS - *(.data) - *(.rw) - } -+ -+ /DISCARD/ : { *(.note.gnu.property) } - } -diff --git a/ld/testsuite/ld-scripts/size-2.t b/ld/testsuite/ld-scripts/size-2.t -index 723863995e..c3c4eddab4 100644 ---- a/ld/testsuite/ld-scripts/size-2.t -+++ b/ld/testsuite/ld-scripts/size-2.t -@@ -18,4 +18,5 @@ SECTIONS - LONG (SIZEOF (.tdata)) - LONG (SIZEOF (.tbss)) - } :image -+ /DISCARD/ : { *(.note.gnu.property) } - } -diff --git a/ld/testsuite/ld-x86-64/abs-k1om.d b/ld/testsuite/ld-x86-64/abs-k1om.d -index 2c26639fc0..6b0fde0eed 100644 ---- a/ld/testsuite/ld-x86-64/abs-k1om.d -+++ b/ld/testsuite/ld-x86-64/abs-k1om.d -@@ -2,7 +2,7 @@ - #source: ../ld-i386/abs.s - #source: ../ld-i386/zero.s - #as: --64 -march=k1om --#ld: -m elf_k1om -+#ld: -m elf_k1om -z noseparate-code - #objdump: -rs -j .text - - .*: file format .* -diff --git a/ld/testsuite/ld-x86-64/abs-l1om.d b/ld/testsuite/ld-x86-64/abs-l1om.d -index 1fb96d44b7..f87869f9d0 100644 ---- a/ld/testsuite/ld-x86-64/abs-l1om.d -+++ b/ld/testsuite/ld-x86-64/abs-l1om.d -@@ -2,7 +2,7 @@ - #source: ../ld-i386/abs.s - #source: ../ld-i386/zero.s - #as: --64 -march=l1om --#ld: -m elf_l1om -+#ld: -m elf_l1om -z noseparate-code - #objdump: -rs -j .text - #target: x86_64-*-linux* - -diff --git a/ld/testsuite/ld-x86-64/abs.d b/ld/testsuite/ld-x86-64/abs.d -index b24b018639..d99ab4685d 100644 ---- a/ld/testsuite/ld-x86-64/abs.d -+++ b/ld/testsuite/ld-x86-64/abs.d -@@ -1,7 +1,7 @@ - #name: Absolute non-overflowing relocs - #source: ../ld-i386/abs.s - #source: ../ld-i386/zero.s --#ld: -+#ld: -z noseparate-code - #objdump: -rs - - .*: file format .* -diff --git a/ld/testsuite/ld-x86-64/pr12718.d b/ld/testsuite/ld-x86-64/pr12718.d -index 07d17325d0..2c503ffbaa 100644 ---- a/ld/testsuite/ld-x86-64/pr12718.d -+++ b/ld/testsuite/ld-x86-64/pr12718.d -@@ -1,6 +1,6 @@ - #name: PR ld/12718 - #as: --64 --#ld: -melf_x86_64 -+#ld: -melf_x86_64 -z noseparate-code - #readelf: -S --wide - - There are 5 section headers, starting at offset 0x[0-9a-f]+: -diff --git a/ld/testsuite/ld-x86-64/pr12921.d b/ld/testsuite/ld-x86-64/pr12921.d -index 6fe6abee09..1162d55818 100644 ---- a/ld/testsuite/ld-x86-64/pr12921.d -+++ b/ld/testsuite/ld-x86-64/pr12921.d -@@ -1,6 +1,6 @@ - #name: PR ld/12921 - #as: --64 --#ld: -melf_x86_64 -+#ld: -melf_x86_64 -z noseparate-code - #readelf: -S --wide - - There are 7 section headers, starting at offset 0x[0-9a-f]+: -diff --git a/ld/testsuite/lib/ld-lib.exp b/ld/testsuite/lib/ld-lib.exp -index cfbefe9028..1095091882 100644 ---- a/ld/testsuite/lib/ld-lib.exp -+++ b/ld/testsuite/lib/ld-lib.exp -@@ -1482,7 +1482,10 @@ proc run_ld_link_exec_tests { ldtests args } { - continue - } - -- if { [ string match "c++" $lang ] } { -+ if { [ string match "asm" $lang ] } { -+ set link_proc ld_link -+ set link_cmd $ld -+ } elseif { [ string match "c++" $lang ] } { - set link_proc ld_link - set link_cmd $CXX - } else { --- -2.20.1 - diff --git a/pkgs/development/tools/misc/binutils/patches/2.31/0001-x86-Properly-add-X86_ISA_1_NEEDED-property.patch b/pkgs/development/tools/misc/binutils/patches/2.31/0001-x86-Properly-add-X86_ISA_1_NEEDED-property.patch deleted file mode 100644 index ca50d9a57cd1..000000000000 --- a/pkgs/development/tools/misc/binutils/patches/2.31/0001-x86-Properly-add-X86_ISA_1_NEEDED-property.patch +++ /dev/null @@ -1,137 +0,0 @@ -From 28a27bdbb9500797e6767f80c8128b09112aeed5 Mon Sep 17 00:00:00 2001 -From: "H.J. Lu" -Date: Sat, 11 Aug 2018 06:41:33 -0700 -Subject: [PATCH] x86: Properly add X86_ISA_1_NEEDED property - -Existing properties may be removed during property merging. We avoid -adding X86_ISA_1_NEEDED property only if existing properties won't be -removed. - -bfd/ - - PR ld/23428 - * elfxx-x86.c (_bfd_x86_elf_link_setup_gnu_properties): Don't - add X86_ISA_1_NEEDED property only if existing properties won't - be removed. - -ld/ - - PR ld/23428 - * testsuite/ld-elf/dummy.s: New file. - * testsuite/ld-elf/linux-x86.S: Add X86_FEATURE_1_AND property. - * testsuite/ld-elf/linux-x86.exp: Add dummy.s to pr23428. - -(cherry picked from commit ab9e342807d132182892de1be1a92d6e91a5c1da) ---- - bfd/elfxx-x86.c | 28 ++++++++++++++++++++++------ - ld/testsuite/ld-elf/dummy.s | 1 + - ld/testsuite/ld-elf/linux-x86.S | 28 ++++++++++++++++++++++++++++ - ld/testsuite/ld-elf/linux-x86.exp | 2 +- - 6 files changed, 66 insertions(+), 7 deletions(-) - create mode 100644 ld/testsuite/ld-elf/dummy.s - -diff --git a/bfd/elfxx-x86.c b/bfd/elfxx-x86.c -index 7ccfd25815..2d8f7b640b 100644 ---- a/bfd/elfxx-x86.c -+++ b/bfd/elfxx-x86.c -@@ -2588,7 +2588,6 @@ _bfd_x86_elf_link_setup_gnu_properties - prop->pr_kind = property_number; - } - else if (has_text -- && elf_properties (ebfd) == NULL - && elf_tdata (info->output_bfd)->o->build_id.sec == NULL - && !htab->elf.dynamic_sections_created - && !info->traditional_format -@@ -2598,11 +2597,28 @@ _bfd_x86_elf_link_setup_gnu_properties - /* If the separate code program header is needed, make sure - that the first read-only PT_LOAD segment has no code by - adding a GNU_PROPERTY_X86_ISA_1_NEEDED note. */ -- prop = _bfd_elf_get_property (ebfd, -- GNU_PROPERTY_X86_ISA_1_NEEDED, -- 4); -- prop->u.number = GNU_PROPERTY_X86_ISA_1_486; -- prop->pr_kind = property_number; -+ elf_property_list *list; -+ bfd_boolean need_property = TRUE; -+ -+ for (list = elf_properties (ebfd); list; list = list->next) -+ switch (list->property.pr_type) -+ { -+ case GNU_PROPERTY_STACK_SIZE: -+ case GNU_PROPERTY_NO_COPY_ON_PROTECTED: -+ case GNU_PROPERTY_X86_ISA_1_NEEDED: -+ /* These properties won't be removed during merging. */ -+ need_property = FALSE; -+ break; -+ } -+ -+ if (need_property) -+ { -+ prop = _bfd_elf_get_property (ebfd, -+ GNU_PROPERTY_X86_ISA_1_NEEDED, -+ 4); -+ prop->u.number = GNU_PROPERTY_X86_ISA_1_486; -+ prop->pr_kind = property_number; -+ } - } - - /* Create the GNU property note section if needed. */ -diff --git a/ld/testsuite/ld-elf/dummy.s b/ld/testsuite/ld-elf/dummy.s -new file mode 100644 -index 0000000000..403f98000d ---- /dev/null -+++ b/ld/testsuite/ld-elf/dummy.s -@@ -0,0 +1 @@ -+# Dummy -diff --git a/ld/testsuite/ld-elf/linux-x86.S b/ld/testsuite/ld-elf/linux-x86.S -index bdf40c6e01..d94abc1106 100644 ---- a/ld/testsuite/ld-elf/linux-x86.S -+++ b/ld/testsuite/ld-elf/linux-x86.S -@@ -61,3 +61,31 @@ syscall: - ret /* Return to caller. */ - .size syscall, .-syscall - .section .note.GNU-stack,"",@progbits -+ -+ .section ".note.gnu.property", "a" -+#ifdef __LP64__ -+ .p2align 3 -+#else -+ .p2align 2 -+#endif -+ .long 1f - 0f /* name length */ -+ .long 5f - 2f /* data length */ -+ .long 5 /* note type */ -+0: .asciz "GNU" /* vendor name */ -+1: -+#ifdef __LP64__ -+ .p2align 3 -+#else -+ .p2align 2 -+#endif -+2: .long 0xc0000002 /* pr_type. */ -+ .long 4f - 3f /* pr_datasz. */ -+3: -+ .long 0x2 -+4: -+#ifdef __LP64__ -+ .p2align 3 -+#else -+ .p2align 2 -+#endif -+5: -diff --git a/ld/testsuite/ld-elf/linux-x86.exp b/ld/testsuite/ld-elf/linux-x86.exp -index 36217c6fb4..f6f5a80853 100644 ---- a/ld/testsuite/ld-elf/linux-x86.exp -+++ b/ld/testsuite/ld-elf/linux-x86.exp -@@ -37,7 +37,7 @@ run_ld_link_exec_tests [list \ - "Run PR ld/23428 test" \ - "--no-dynamic-linker -z separate-code" \ - "" \ -- { linux-x86.S pr23428.c } \ -+ { linux-x86.S pr23428.c dummy.s } \ - "pr23428" \ - "pass.out" \ - "$NOPIE_CFLAGS -fno-asynchronous-unwind-tables" \ --- -2.20.1 - diff --git a/pkgs/development/tools/misc/binutils/patches/2.31/0001-x86-Properly-merge-GNU_PROPERTY_X86_ISA_1_USED.patch b/pkgs/development/tools/misc/binutils/patches/2.31/0001-x86-Properly-merge-GNU_PROPERTY_X86_ISA_1_USED.patch deleted file mode 100644 index 866d6db8ce24..000000000000 --- a/pkgs/development/tools/misc/binutils/patches/2.31/0001-x86-Properly-merge-GNU_PROPERTY_X86_ISA_1_USED.patch +++ /dev/null @@ -1,583 +0,0 @@ -From d55c3e36094f06bb1fb02f5eac19fdccf1d91f7e Mon Sep 17 00:00:00 2001 -From: "H.J. Lu" -Date: Wed, 8 Aug 2018 06:09:15 -0700 -Subject: [PATCH] x86: Properly merge GNU_PROPERTY_X86_ISA_1_USED -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Without the GNU_PROPERTY_X86_ISA_1_USED property, all ISAs may be used. -If a bit in the GNU_PROPERTY_X86_ISA_1_USED property is unset, the -corresponding x86 instruction set isn’t used. When merging properties -from 2 input files and one input file doesn't have the -GNU_PROPERTY_X86_ISA_1_USED property, the output file shouldn't have -it neither. This patch removes the GNU_PROPERTY_X86_ISA_1_USED -property if an input file doesn't have it. - -This patch replaces the GNU_PROPERTY_X86_ISA_1_USED property with the -GNU_PROPERTY_X86_ISA_1_NEEDED property which is the minimum ISA -requirement. - -bfd/ - - PR ld/23486 - * elfxx-x86.c (_bfd_x86_elf_merge_gnu_properties): Remove - GNU_PROPERTY_X86_ISA_1_USED if an input file doesn't have it. - (_bfd_x86_elf_link_setup_gnu_properties): Adding the - GNU_PROPERTY_X86_ISA_1_NEEDED, instead of - GNU_PROPERTY_X86_ISA_1_USED, property. - -ld/ - - PR ld/23486 - * testsuite/ld-i386/i386.exp: Run PR ld/23486 tests. - * testsuite/ld-x86-64/x86-64.exp: Likewise. - * testsuite/ld-i386/pr23486a.d: New file. - * testsuite/ld-i386/pr23486b.d: Likewise. - * testsuite/ld-x86-64/pr23486a-x32.d: Likewise. - * testsuite/ld-x86-64/pr23486a.d: Likewise. - * testsuite/ld-x86-64/pr23486a.s: Likewise. - * testsuite/ld-x86-64/pr23486b-x32.d: Likewise. - * testsuite/ld-x86-64/pr23486b.d: Likewise. - * testsuite/ld-x86-64/pr23486b.s: Likewise. - * testsuite/ld-i386/property-3.r: Remove "x86 ISA used". - * testsuite/ld-i386/property-4.r: Likewise. - * testsuite/ld-i386/property-5.r: Likewise. - * testsuite/ld-i386/property-x86-ibt3a.d: Likewise. - * testsuite/ld-i386/property-x86-ibt3b.d: Likewise. - * testsuite/ld-i386/property-x86-shstk3a.d: Likewise. - * testsuite/ld-i386/property-x86-shstk3b.d: Likewise. - * testsuite/ld-x86-64/property-3.r: Likewise. - * testsuite/ld-x86-64/property-4.r: Likewise. - * testsuite/ld-x86-64/property-5.r: Likewise. - * testsuite/ld-x86-64/property-x86-ibt3a-x32.d: Likewise. - * testsuite/ld-x86-64/property-x86-ibt3a.d: Likewise. - * testsuite/ld-x86-64/property-x86-ibt3b-x32.d: Likewise. - * testsuite/ld-x86-64/property-x86-ibt3b.d: Likewise. - * testsuite/ld-x86-64/property-x86-shstk3a-x32.d: Likewise. - * testsuite/ld-x86-64/property-x86-shstk3a.d: Likewise. - * testsuite/ld-x86-64/property-x86-shstk3b-x32.d: Likewise. - * testsuite/ld-x86-64/property-x86-shstk3b.d: Likewise. - -(cherry picked from commit f7309df20c4e787041cedc4a6aced89c15259e54) ---- - bfd/elfxx-x86.c | 25 ++++++++++++--- - ld/testsuite/ld-i386/i386.exp | 2 ++ - ld/testsuite/ld-i386/pr23486a.d | 10 ++++++ - ld/testsuite/ld-i386/pr23486b.d | 10 ++++++ - ld/testsuite/ld-i386/property-3.r | 1 - - ld/testsuite/ld-i386/property-4.r | 1 - - ld/testsuite/ld-i386/property-5.r | 1 - - ld/testsuite/ld-i386/property-x86-ibt3a.d | 5 ++- - ld/testsuite/ld-i386/property-x86-ibt3b.d | 5 ++- - ld/testsuite/ld-i386/property-x86-shstk3a.d | 5 ++- - ld/testsuite/ld-i386/property-x86-shstk3b.d | 5 ++- - ld/testsuite/ld-x86-64/pr23486a-x32.d | 10 ++++++ - ld/testsuite/ld-x86-64/pr23486a.d | 10 ++++++ - ld/testsuite/ld-x86-64/pr23486a.s | 30 +++++++++++++++++ - ld/testsuite/ld-x86-64/pr23486b-x32.d | 10 ++++++ - ld/testsuite/ld-x86-64/pr23486b.d | 10 ++++++ - ld/testsuite/ld-x86-64/pr23486b.s | 30 +++++++++++++++++ - ld/testsuite/ld-x86-64/property-3.r | 1 - - ld/testsuite/ld-x86-64/property-4.r | 1 - - ld/testsuite/ld-x86-64/property-5.r | 1 - - .../ld-x86-64/property-x86-ibt3a-x32.d | 5 ++- - ld/testsuite/ld-x86-64/property-x86-ibt3a.d | 5 ++- - .../ld-x86-64/property-x86-ibt3b-x32.d | 5 ++- - ld/testsuite/ld-x86-64/property-x86-ibt3b.d | 5 ++- - .../ld-x86-64/property-x86-shstk3a-x32.d | 5 ++- - ld/testsuite/ld-x86-64/property-x86-shstk3a.d | 5 ++- - .../ld-x86-64/property-x86-shstk3b-x32.d | 5 ++- - ld/testsuite/ld-x86-64/property-x86-shstk3b.d | 5 ++- - ld/testsuite/ld-x86-64/x86-64.exp | 4 +++ - 31 files changed, 211 insertions(+), 47 deletions(-) - create mode 100644 ld/testsuite/ld-i386/pr23486a.d - create mode 100644 ld/testsuite/ld-i386/pr23486b.d - create mode 100644 ld/testsuite/ld-x86-64/pr23486a-x32.d - create mode 100644 ld/testsuite/ld-x86-64/pr23486a.d - create mode 100644 ld/testsuite/ld-x86-64/pr23486a.s - create mode 100644 ld/testsuite/ld-x86-64/pr23486b-x32.d - create mode 100644 ld/testsuite/ld-x86-64/pr23486b.d - create mode 100644 ld/testsuite/ld-x86-64/pr23486b.s - ---- a/bfd/elfxx-x86.c -+++ b/bfd/elfxx-x86.c -@@ -2407,12 +2407,27 @@ _bfd_x86_elf_merge_gnu_properties (struct bfd_link_info *info, - switch (pr_type) - { - case GNU_PROPERTY_X86_ISA_1_USED: -+ if (aprop == NULL || bprop == NULL) -+ { -+ /* Only one of APROP and BPROP can be NULL. */ -+ if (aprop != NULL) -+ { -+ /* Remove this property since the other input file doesn't -+ have it. */ -+ aprop->pr_kind = property_remove; -+ updated = TRUE; -+ } -+ break; -+ } -+ goto or_property; -+ - case GNU_PROPERTY_X86_ISA_1_NEEDED: - if (aprop != NULL && bprop != NULL) - { -+or_property: - number = aprop->u.number; - aprop->u.number = number | bprop->u.number; -- /* Remove the property if ISA bits are empty. */ -+ /* Remove the property if all bits are empty. */ - if (aprop->u.number == 0) - { - aprop->pr_kind = property_remove; -@@ -2428,14 +2443,14 @@ _bfd_x86_elf_merge_gnu_properties (struct bfd_link_info *info, - { - if (aprop->u.number == 0) - { -- /* Remove APROP if ISA bits are empty. */ -+ /* Remove APROP if all bits are empty. */ - aprop->pr_kind = property_remove; - updated = TRUE; - } - } - else - { -- /* Return TRUE if APROP is NULL and ISA bits of BPROP -+ /* Return TRUE if APROP is NULL and all bits of BPROP - aren't empty to indicate that BPROP should be added - to ABFD. */ - updated = bprop->u.number != 0; -@@ -2582,9 +2597,9 @@ _bfd_x86_elf_link_setup_gnu_properties - { - /* If the separate code program header is needed, make sure - that the first read-only PT_LOAD segment has no code by -- adding a GNU_PROPERTY_X86_ISA_1_USED note. */ -+ adding a GNU_PROPERTY_X86_ISA_1_NEEDED note. */ - prop = _bfd_elf_get_property (ebfd, -- GNU_PROPERTY_X86_ISA_1_USED, -+ GNU_PROPERTY_X86_ISA_1_NEEDED, - 4); - prop->u.number = GNU_PROPERTY_X86_ISA_1_486; - prop->pr_kind = property_number; -diff --git a/ld/testsuite/ld-i386/i386.exp b/ld/testsuite/ld-i386/i386.exp -index 6d794fe653..78dad02579 100644 ---- a/ld/testsuite/ld-i386/i386.exp -+++ b/ld/testsuite/ld-i386/i386.exp -@@ -462,6 +462,8 @@ run_dump_test "pr23189" - run_dump_test "pr23194" - run_dump_test "pr23372a" - run_dump_test "pr23372b" -+run_dump_test "pr23486a" -+run_dump_test "pr23486b" - - if { !([istarget "i?86-*-linux*"] - || [istarget "i?86-*-gnu*"] -diff --git a/ld/testsuite/ld-i386/pr23486a.d b/ld/testsuite/ld-i386/pr23486a.d -new file mode 100644 -index 0000000000..41a6dcf7d5 ---- /dev/null -+++ b/ld/testsuite/ld-i386/pr23486a.d -@@ -0,0 +1,10 @@ -+#source: ../ld-x86-64/pr23486a.s -+#source: ../ld-x86-64/pr23486b.s -+#as: --32 -+#ld: -r -m elf_i386 -+#readelf: -n -+ -+Displaying notes found in: .note.gnu.property -+ Owner Data size Description -+ GNU 0x0000000c NT_GNU_PROPERTY_TYPE_0 -+ Properties: x86 ISA needed: i486, 586 -diff --git a/ld/testsuite/ld-i386/pr23486b.d b/ld/testsuite/ld-i386/pr23486b.d -new file mode 100644 -index 0000000000..08019b7274 ---- /dev/null -+++ b/ld/testsuite/ld-i386/pr23486b.d -@@ -0,0 +1,10 @@ -+#source: ../ld-x86-64/pr23486b.s -+#source: ../ld-x86-64/pr23486a.s -+#as: --32 -+#ld: -r -m elf_i386 -+#readelf: -n -+ -+Displaying notes found in: .note.gnu.property -+ Owner Data size Description -+ GNU 0x0000000c NT_GNU_PROPERTY_TYPE_0 -+ Properties: x86 ISA needed: i486, 586 -diff --git a/ld/testsuite/ld-i386/property-3.r b/ld/testsuite/ld-i386/property-3.r -index 0ed91f5922..d03203c1e5 100644 ---- a/ld/testsuite/ld-i386/property-3.r -+++ b/ld/testsuite/ld-i386/property-3.r -@@ -3,6 +3,5 @@ Displaying notes found in: .note.gnu.property - Owner Data size Description - GNU 0x[0-9a-f]+ NT_GNU_PROPERTY_TYPE_0 - Properties: stack size: 0x800000 -- x86 ISA used: 586, SSE - x86 ISA needed: i486, 586 - #pass -diff --git a/ld/testsuite/ld-i386/property-4.r b/ld/testsuite/ld-i386/property-4.r -index cb2bc15d9a..da295eb6c7 100644 ---- a/ld/testsuite/ld-i386/property-4.r -+++ b/ld/testsuite/ld-i386/property-4.r -@@ -3,6 +3,5 @@ Displaying notes found in: .note.gnu.property - Owner Data size Description - GNU 0x[0-9a-f]+ NT_GNU_PROPERTY_TYPE_0 - Properties: stack size: 0x800000 -- x86 ISA used: i486, 586, SSE - x86 ISA needed: i486, 586, SSE - #pass -diff --git a/ld/testsuite/ld-i386/property-5.r b/ld/testsuite/ld-i386/property-5.r -index 552965058c..e4141594b3 100644 ---- a/ld/testsuite/ld-i386/property-5.r -+++ b/ld/testsuite/ld-i386/property-5.r -@@ -3,6 +3,5 @@ Displaying notes found in: .note.gnu.property - Owner Data size Description - GNU 0x[0-9a-f]+ NT_GNU_PROPERTY_TYPE_0 - Properties: stack size: 0x900000 -- x86 ISA used: i486, 586, SSE - x86 ISA needed: i486, 586, SSE - #pass -diff --git a/ld/testsuite/ld-i386/property-x86-ibt3a.d b/ld/testsuite/ld-i386/property-x86-ibt3a.d -index 4bb35b00fb..0aedea1614 100644 ---- a/ld/testsuite/ld-i386/property-x86-ibt3a.d -+++ b/ld/testsuite/ld-i386/property-x86-ibt3a.d -@@ -6,6 +6,5 @@ - - Displaying notes found in: .note.gnu.property - Owner Data size Description -- GNU 0x00000018 NT_GNU_PROPERTY_TYPE_0 -- Properties: x86 ISA used: i486, 586, SSE2, SSE3 -- x86 ISA needed: 586, SSE, SSE3, SSE4_1 -+ GNU 0x0000000c NT_GNU_PROPERTY_TYPE_0 -+ Properties: x86 ISA needed: 586, SSE, SSE3, SSE4_1 -diff --git a/ld/testsuite/ld-i386/property-x86-ibt3b.d b/ld/testsuite/ld-i386/property-x86-ibt3b.d -index 418d58a8f7..bd69ac6478 100644 ---- a/ld/testsuite/ld-i386/property-x86-ibt3b.d -+++ b/ld/testsuite/ld-i386/property-x86-ibt3b.d -@@ -6,6 +6,5 @@ - - Displaying notes found in: .note.gnu.property - Owner Data size Description -- GNU 0x00000018 NT_GNU_PROPERTY_TYPE_0 -- Properties: x86 ISA used: i486, 586, SSE2, SSE3 -- x86 ISA needed: 586, SSE, SSE3, SSE4_1 -+ GNU 0x0000000c NT_GNU_PROPERTY_TYPE_0 -+ Properties: x86 ISA needed: 586, SSE, SSE3, SSE4_1 -diff --git a/ld/testsuite/ld-i386/property-x86-shstk3a.d b/ld/testsuite/ld-i386/property-x86-shstk3a.d -index e261038f60..76d2a39f2c 100644 ---- a/ld/testsuite/ld-i386/property-x86-shstk3a.d -+++ b/ld/testsuite/ld-i386/property-x86-shstk3a.d -@@ -6,6 +6,5 @@ - - Displaying notes found in: .note.gnu.property - Owner Data size Description -- GNU 0x00000018 NT_GNU_PROPERTY_TYPE_0 -- Properties: x86 ISA used: i486, 586, SSE2, SSE3 -- x86 ISA needed: 586, SSE, SSE3, SSE4_1 -+ GNU 0x0000000c NT_GNU_PROPERTY_TYPE_0 -+ Properties: x86 ISA needed: 586, SSE, SSE3, SSE4_1 -diff --git a/ld/testsuite/ld-i386/property-x86-shstk3b.d b/ld/testsuite/ld-i386/property-x86-shstk3b.d -index 25f3d2361e..e770ecffa5 100644 ---- a/ld/testsuite/ld-i386/property-x86-shstk3b.d -+++ b/ld/testsuite/ld-i386/property-x86-shstk3b.d -@@ -6,6 +6,5 @@ - - Displaying notes found in: .note.gnu.property - Owner Data size Description -- GNU 0x00000018 NT_GNU_PROPERTY_TYPE_0 -- Properties: x86 ISA used: i486, 586, SSE2, SSE3 -- x86 ISA needed: 586, SSE, SSE3, SSE4_1 -+ GNU 0x0000000c NT_GNU_PROPERTY_TYPE_0 -+ Properties: x86 ISA needed: 586, SSE, SSE3, SSE4_1 -diff --git a/ld/testsuite/ld-x86-64/pr23486a-x32.d b/ld/testsuite/ld-x86-64/pr23486a-x32.d -new file mode 100644 -index 0000000000..6d9fa68cdb ---- /dev/null -+++ b/ld/testsuite/ld-x86-64/pr23486a-x32.d -@@ -0,0 +1,10 @@ -+#source: pr23486a.s -+#source: pr23486b.s -+#as: --x32 -+#ld: -r -m elf32_x86_64 -+#readelf: -n -+ -+Displaying notes found in: .note.gnu.property -+ Owner Data size Description -+ GNU 0x0000000c NT_GNU_PROPERTY_TYPE_0 -+ Properties: x86 ISA needed: i486, 586 -diff --git a/ld/testsuite/ld-x86-64/pr23486a.d b/ld/testsuite/ld-x86-64/pr23486a.d -new file mode 100644 -index 0000000000..dc2b7bf760 ---- /dev/null -+++ b/ld/testsuite/ld-x86-64/pr23486a.d -@@ -0,0 +1,10 @@ -+#source: pr23486a.s -+#source: pr23486b.s -+#as: --64 -defsym __64_bit__=1 -+#ld: -r -m elf_x86_64 -+#readelf: -n -+ -+Displaying notes found in: .note.gnu.property -+ Owner Data size Description -+ GNU 0x00000010 NT_GNU_PROPERTY_TYPE_0 -+ Properties: x86 ISA needed: i486, 586 -diff --git a/ld/testsuite/ld-x86-64/pr23486a.s b/ld/testsuite/ld-x86-64/pr23486a.s -new file mode 100644 -index 0000000000..a07d0c7ced ---- /dev/null -+++ b/ld/testsuite/ld-x86-64/pr23486a.s -@@ -0,0 +1,30 @@ -+ .section ".note.gnu.property", "a" -+.ifdef __64_bit__ -+ .p2align 3 -+.else -+ .p2align 2 -+.endif -+ .long 1f - 0f /* name length. */ -+ .long 4f - 1f /* data length. */ -+ /* NT_GNU_PROPERTY_TYPE_0 */ -+ .long 5 /* note type. */ -+0: -+ .asciz "GNU" /* vendor name. */ -+1: -+.ifdef __64_bit__ -+ .p2align 3 -+.else -+ .p2align 2 -+.endif -+ /* GNU_PROPERTY_X86_ISA_1_USED */ -+ .long 0xc0000000 /* pr_type. */ -+ .long 3f - 2f /* pr_datasz. */ -+2: -+ .long 0xa -+3: -+.ifdef __64_bit__ -+ .p2align 3 -+.else -+ .p2align 2 -+.endif -+4: -diff --git a/ld/testsuite/ld-x86-64/pr23486b-x32.d b/ld/testsuite/ld-x86-64/pr23486b-x32.d -new file mode 100644 -index 0000000000..0445e69d82 ---- /dev/null -+++ b/ld/testsuite/ld-x86-64/pr23486b-x32.d -@@ -0,0 +1,10 @@ -+#source: pr23486b.s -+#source: pr23486a.s -+#as: --x32 -+#ld: -r -m elf32_x86_64 -+#readelf: -n -+ -+Displaying notes found in: .note.gnu.property -+ Owner Data size Description -+ GNU 0x0000000c NT_GNU_PROPERTY_TYPE_0 -+ Properties: x86 ISA needed: i486, 586 -diff --git a/ld/testsuite/ld-x86-64/pr23486b.d b/ld/testsuite/ld-x86-64/pr23486b.d -new file mode 100644 -index 0000000000..dc2b7bf760 ---- /dev/null -+++ b/ld/testsuite/ld-x86-64/pr23486b.d -@@ -0,0 +1,10 @@ -+#source: pr23486a.s -+#source: pr23486b.s -+#as: --64 -defsym __64_bit__=1 -+#ld: -r -m elf_x86_64 -+#readelf: -n -+ -+Displaying notes found in: .note.gnu.property -+ Owner Data size Description -+ GNU 0x00000010 NT_GNU_PROPERTY_TYPE_0 -+ Properties: x86 ISA needed: i486, 586 -diff --git a/ld/testsuite/ld-x86-64/pr23486b.s b/ld/testsuite/ld-x86-64/pr23486b.s -new file mode 100644 -index 0000000000..c5167eeb65 ---- /dev/null -+++ b/ld/testsuite/ld-x86-64/pr23486b.s -@@ -0,0 +1,30 @@ -+ .section ".note.gnu.property", "a" -+.ifdef __64_bit__ -+ .p2align 3 -+.else -+ .p2align 2 -+.endif -+ .long 1f - 0f /* name length. */ -+ .long 4f - 1f /* data length. */ -+ /* NT_GNU_PROPERTY_TYPE_0 */ -+ .long 5 /* note type. */ -+0: -+ .asciz "GNU" /* vendor name. */ -+1: -+.ifdef __64_bit__ -+ .p2align 3 -+.else -+ .p2align 2 -+.endif -+ /* GNU_PROPERTY_X86_ISA_1_NEEDED */ -+ .long 0xc0000001 /* pr_type. */ -+ .long 3f - 2f /* pr_datasz. */ -+2: -+ .long 0x3 -+3: -+.ifdef __64_bit__ -+ .p2align 3 -+.else -+ .p2align 2 -+.endif -+4: -diff --git a/ld/testsuite/ld-x86-64/property-3.r b/ld/testsuite/ld-x86-64/property-3.r -index 0ed91f5922..d03203c1e5 100644 ---- a/ld/testsuite/ld-x86-64/property-3.r -+++ b/ld/testsuite/ld-x86-64/property-3.r -@@ -3,6 +3,5 @@ Displaying notes found in: .note.gnu.property - Owner Data size Description - GNU 0x[0-9a-f]+ NT_GNU_PROPERTY_TYPE_0 - Properties: stack size: 0x800000 -- x86 ISA used: 586, SSE - x86 ISA needed: i486, 586 - #pass -diff --git a/ld/testsuite/ld-x86-64/property-4.r b/ld/testsuite/ld-x86-64/property-4.r -index cb2bc15d9a..da295eb6c7 100644 ---- a/ld/testsuite/ld-x86-64/property-4.r -+++ b/ld/testsuite/ld-x86-64/property-4.r -@@ -3,6 +3,5 @@ Displaying notes found in: .note.gnu.property - Owner Data size Description - GNU 0x[0-9a-f]+ NT_GNU_PROPERTY_TYPE_0 - Properties: stack size: 0x800000 -- x86 ISA used: i486, 586, SSE - x86 ISA needed: i486, 586, SSE - #pass -diff --git a/ld/testsuite/ld-x86-64/property-5.r b/ld/testsuite/ld-x86-64/property-5.r -index 552965058c..e4141594b3 100644 ---- a/ld/testsuite/ld-x86-64/property-5.r -+++ b/ld/testsuite/ld-x86-64/property-5.r -@@ -3,6 +3,5 @@ Displaying notes found in: .note.gnu.property - Owner Data size Description - GNU 0x[0-9a-f]+ NT_GNU_PROPERTY_TYPE_0 - Properties: stack size: 0x900000 -- x86 ISA used: i486, 586, SSE - x86 ISA needed: i486, 586, SSE - #pass -diff --git a/ld/testsuite/ld-x86-64/property-x86-ibt3a-x32.d b/ld/testsuite/ld-x86-64/property-x86-ibt3a-x32.d -index 011426f5a4..4cec728dc7 100644 ---- a/ld/testsuite/ld-x86-64/property-x86-ibt3a-x32.d -+++ b/ld/testsuite/ld-x86-64/property-x86-ibt3a-x32.d -@@ -6,6 +6,5 @@ - - Displaying notes found in: .note.gnu.property - Owner Data size Description -- GNU 0x00000018 NT_GNU_PROPERTY_TYPE_0 -- Properties: x86 ISA used: 586, SSE, SSE3, SSE4_1 -- x86 ISA needed: i486, 586, SSE2, SSE3 -+ GNU 0x0000000c NT_GNU_PROPERTY_TYPE_0 -+ Properties: x86 ISA needed: i486, 586, SSE2, SSE3 -diff --git a/ld/testsuite/ld-x86-64/property-x86-ibt3a.d b/ld/testsuite/ld-x86-64/property-x86-ibt3a.d -index 1b4229a037..a8df49a351 100644 ---- a/ld/testsuite/ld-x86-64/property-x86-ibt3a.d -+++ b/ld/testsuite/ld-x86-64/property-x86-ibt3a.d -@@ -6,6 +6,5 @@ - - Displaying notes found in: .note.gnu.property - Owner Data size Description -- GNU 0x00000020 NT_GNU_PROPERTY_TYPE_0 -- Properties: x86 ISA used: 586, SSE, SSE3, SSE4_1 -- x86 ISA needed: i486, 586, SSE2, SSE3 -+ GNU 0x00000010 NT_GNU_PROPERTY_TYPE_0 -+ Properties: x86 ISA needed: i486, 586, SSE2, SSE3 -diff --git a/ld/testsuite/ld-x86-64/property-x86-ibt3b-x32.d b/ld/testsuite/ld-x86-64/property-x86-ibt3b-x32.d -index 290ed6abf1..c112626711 100644 ---- a/ld/testsuite/ld-x86-64/property-x86-ibt3b-x32.d -+++ b/ld/testsuite/ld-x86-64/property-x86-ibt3b-x32.d -@@ -6,6 +6,5 @@ - - Displaying notes found in: .note.gnu.property - Owner Data size Description -- GNU 0x00000018 NT_GNU_PROPERTY_TYPE_0 -- Properties: x86 ISA used: 586, SSE, SSE3, SSE4_1 -- x86 ISA needed: i486, 586, SSE2, SSE3 -+ GNU 0x0000000c NT_GNU_PROPERTY_TYPE_0 -+ Properties: x86 ISA needed: i486, 586, SSE2, SSE3 -diff --git a/ld/testsuite/ld-x86-64/property-x86-ibt3b.d b/ld/testsuite/ld-x86-64/property-x86-ibt3b.d -index 1142e03272..f10dffdc2c 100644 ---- a/ld/testsuite/ld-x86-64/property-x86-ibt3b.d -+++ b/ld/testsuite/ld-x86-64/property-x86-ibt3b.d -@@ -6,6 +6,5 @@ - - Displaying notes found in: .note.gnu.property - Owner Data size Description -- GNU 0x00000020 NT_GNU_PROPERTY_TYPE_0 -- Properties: x86 ISA used: 586, SSE, SSE3, SSE4_1 -- x86 ISA needed: i486, 586, SSE2, SSE3 -+ GNU 0x00000010 NT_GNU_PROPERTY_TYPE_0 -+ Properties: x86 ISA needed: i486, 586, SSE2, SSE3 -diff --git a/ld/testsuite/ld-x86-64/property-x86-shstk3a-x32.d b/ld/testsuite/ld-x86-64/property-x86-shstk3a-x32.d -index 819542d181..0147a3c7b6 100644 ---- a/ld/testsuite/ld-x86-64/property-x86-shstk3a-x32.d -+++ b/ld/testsuite/ld-x86-64/property-x86-shstk3a-x32.d -@@ -6,6 +6,5 @@ - - Displaying notes found in: .note.gnu.property - Owner Data size Description -- GNU 0x00000018 NT_GNU_PROPERTY_TYPE_0 -- Properties: x86 ISA used: 586, SSE, SSE3, SSE4_1 -- x86 ISA needed: i486, 586, SSE2, SSE3 -+ GNU 0x0000000c NT_GNU_PROPERTY_TYPE_0 -+ Properties: x86 ISA needed: i486, 586, SSE2, SSE3 -diff --git a/ld/testsuite/ld-x86-64/property-x86-shstk3a.d b/ld/testsuite/ld-x86-64/property-x86-shstk3a.d -index 4c5d0e0a18..1f8c2dc929 100644 ---- a/ld/testsuite/ld-x86-64/property-x86-shstk3a.d -+++ b/ld/testsuite/ld-x86-64/property-x86-shstk3a.d -@@ -6,6 +6,5 @@ - - Displaying notes found in: .note.gnu.property - Owner Data size Description -- GNU 0x00000020 NT_GNU_PROPERTY_TYPE_0 -- Properties: x86 ISA used: 586, SSE, SSE3, SSE4_1 -- x86 ISA needed: i486, 586, SSE2, SSE3 -+ GNU 0x00000010 NT_GNU_PROPERTY_TYPE_0 -+ Properties: x86 ISA needed: i486, 586, SSE2, SSE3 -diff --git a/ld/testsuite/ld-x86-64/property-x86-shstk3b-x32.d b/ld/testsuite/ld-x86-64/property-x86-shstk3b-x32.d -index ba181e0bc5..7ca2539ca5 100644 ---- a/ld/testsuite/ld-x86-64/property-x86-shstk3b-x32.d -+++ b/ld/testsuite/ld-x86-64/property-x86-shstk3b-x32.d -@@ -6,6 +6,5 @@ - - Displaying notes found in: .note.gnu.property - Owner Data size Description -- GNU 0x00000018 NT_GNU_PROPERTY_TYPE_0 -- Properties: x86 ISA used: 586, SSE, SSE3, SSE4_1 -- x86 ISA needed: i486, 586, SSE2, SSE3 -+ GNU 0x0000000c NT_GNU_PROPERTY_TYPE_0 -+ Properties: x86 ISA needed: i486, 586, SSE2, SSE3 -diff --git a/ld/testsuite/ld-x86-64/property-x86-shstk3b.d b/ld/testsuite/ld-x86-64/property-x86-shstk3b.d -index 5216f385dd..f66a40e449 100644 ---- a/ld/testsuite/ld-x86-64/property-x86-shstk3b.d -+++ b/ld/testsuite/ld-x86-64/property-x86-shstk3b.d -@@ -6,6 +6,5 @@ - - Displaying notes found in: .note.gnu.property - Owner Data size Description -- GNU 0x00000020 NT_GNU_PROPERTY_TYPE_0 -- Properties: x86 ISA used: 586, SSE, SSE3, SSE4_1 -- x86 ISA needed: i486, 586, SSE2, SSE3 -+ GNU 0x00000010 NT_GNU_PROPERTY_TYPE_0 -+ Properties: x86 ISA needed: i486, 586, SSE2, SSE3 -diff --git a/ld/testsuite/ld-x86-64/x86-64.exp b/ld/testsuite/ld-x86-64/x86-64.exp -index 6edb9e86f4..ae21e554ad 100644 ---- a/ld/testsuite/ld-x86-64/x86-64.exp -+++ b/ld/testsuite/ld-x86-64/x86-64.exp -@@ -403,6 +403,10 @@ run_dump_test "pr23372a" - run_dump_test "pr23372a-x32" - run_dump_test "pr23372b" - run_dump_test "pr23372b-x32" -+run_dump_test "pr23486a" -+run_dump_test "pr23486a-x32" -+run_dump_test "pr23486b" -+run_dump_test "pr23486b-x32" - - if { ![istarget "x86_64-*-linux*"] && ![istarget "x86_64-*-nacl*"]} { - return --- -2.20.1 - diff --git a/pkgs/development/tools/misc/binutils/patches/2.31/build-components-separately.patch b/pkgs/development/tools/misc/binutils/patches/2.31/build-components-separately.patch deleted file mode 100644 index d3cd0d2131cc..000000000000 --- a/pkgs/development/tools/misc/binutils/patches/2.31/build-components-separately.patch +++ /dev/null @@ -1,178 +0,0 @@ -From bc09a9236f67e710d545ac11bcdac7b55dbcc1a0 Mon Sep 17 00:00:00 2001 -From: John Ericson -Date: Thu, 12 Oct 2017 11:16:57 -0400 -Subject: [PATCH] Build components separately - ---- - bfd/configure.ac | 18 +++--------------- - opcodes/Makefile.am | 17 +++++++++++++---- - opcodes/configure.ac | 45 ++++++--------------------------------------- - 3 files changed, 22 insertions(+), 58 deletions(-) - -diff --git a/bfd/configure.ac b/bfd/configure.ac -index 9a183c1628..8728837384 100644 ---- a/bfd/configure.ac -+++ b/bfd/configure.ac -@@ -241,31 +241,19 @@ AC_CACHE_CHECK(linker --as-needed support, bfd_cv_ld_as_needed, - - LT_LIB_M - --# When building a shared libbfd, link against the pic version of libiberty --# so that apps that use libbfd won't need libiberty just to satisfy any --# libbfd references. --# We can't do that if a pic libiberty is unavailable since including non-pic --# code would insert text relocations into libbfd. - SHARED_LIBADD= --SHARED_LDFLAGS= -+SHARED_LDFLAGS=-liberty - if test "$enable_shared" = "yes"; then --changequote(,)dnl -- x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'` --changequote([,])dnl -- if test -n "$x"; then -- SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty" -- fi -- - # More hacks to build DLLs on Windows. - case "${host}" in - *-*-cygwin*) - SHARED_LDFLAGS="-no-undefined" -- SHARED_LIBADD="-L`pwd`/../libiberty -liberty -L`pwd`/../intl -lintl -lcygwin -lkernel32" -+ SHARED_LIBADD="-liberty -lintl -lcygwin -lkernel32" - ;; - - # Hack to build or1k-src on OSX - or1k*-*-darwin*) -- SHARED_LIBADD="-L`pwd`/../libiberty/pic -L`pwd`/../intl -liberty -lintl" -+ SHARED_LIBADD="-liberty -lintl" - ;; - esac - -diff --git a/opcodes/Makefile.am b/opcodes/Makefile.am -index 925e7ff651..47b395c195 100644 ---- a/opcodes/Makefile.am -+++ b/opcodes/Makefile.am -@@ -52,7 +52,7 @@ libopcodes_la_LDFLAGS += -rpath $(rpath_bfdlibdir) - endif - - # This is where bfd.h lives. --BFD_H = ../bfd/bfd.h -+BFD_H = $(BFDDIR)/bfd.h - - BUILD_LIBS = @BUILD_LIBS@ - BUILD_LIB_DEPS = @BUILD_LIB_DEPS@ -@@ -303,7 +303,7 @@ OFILES = @BFD_MACHINES@ - # development.sh is used to determine -Werror default. - CONFIG_STATUS_DEPENDENCIES = $(BFDDIR)/development.sh - --AM_CPPFLAGS = -I. -I$(srcdir) -I../bfd -I$(INCDIR) -I$(BFDDIR) @HDEFINES@ @INCINTL@ -+AM_CPPFLAGS = -I. -I$(srcdir) -I$(INCDIR) -I$(BFDDIR) @HDEFINES@ @INCINTL@ - - disassemble.lo: disassemble.c - if am__fastdepCC -@@ -324,12 +324,21 @@ libopcodes_la_SOURCES = dis-buf.c disassemble.c dis-init.c - # old version of libbfd, or to pick up libbfd for the wrong architecture - # if host != build. So for building with shared libraries we use a - # hardcoded path to libbfd.so instead of relying on the entries in libbfd.la. --libopcodes_la_DEPENDENCIES = $(OFILES) @SHARED_DEPENDENCIES@ -+libopcodes_la_DEPENDENCIES = $(OFILES) @SHARED_DEPENDENCIES@ libtool-soversion - libopcodes_la_LIBADD = $(OFILES) @SHARED_LIBADD@ --libopcodes_la_LDFLAGS += -release `cat ../bfd/libtool-soversion` @SHARED_LDFLAGS@ -+libopcodes_la_LDFLAGS += -release `cat libtool-soversion` @SHARED_LDFLAGS@ - # Allow dependency tracking to work on all the source files. - EXTRA_libopcodes_la_SOURCES = $(LIBOPCODES_CFILES) - -+libtool-soversion: -+ @echo "creating $@" -+ bfd_soversion="$(VERSION)" ;\ -+ . $(BFDDIR)/development.sh ;\ -+ if test "$$development" = true ; then \ -+ bfd_soversion="$(VERSION).$${bfd_version_date}" ;\ -+ fi ;\ -+ echo "$${bfd_soversion}" > $@ -+ - # libtool will build .libs/libopcodes.a. We create libopcodes.a in - # the build directory so that we don't have to convert all the - # programs that use libopcodes.a simultaneously. This is a hack which -diff --git a/opcodes/configure.ac b/opcodes/configure.ac -index b9f5eb8a4f..ef2c2152b7 100644 ---- a/opcodes/configure.ac -+++ b/opcodes/configure.ac -@@ -89,6 +89,7 @@ AC_PROG_INSTALL - - AC_CHECK_HEADERS(string.h strings.h stdlib.h limits.h) - ACX_HEADER_STRING -+GCC_HEADER_STDINT(bfd_stdint.h) - - AC_CHECK_DECLS([basename, stpcpy]) - -@@ -134,61 +135,27 @@ AC_CACHE_CHECK(linker --as-needed support, bfd_cv_ld_as_needed, - - LT_LIB_M - --#Libs for generator progs --if test "x$cross_compiling" = "xno"; then -- BUILD_LIBS=../libiberty/libiberty.a -- BUILD_LIB_DEPS=$BUILD_LIBS --else -- # if cross-compiling, assume that the system provides -liberty -- # and that the version is compatible with new headers. -- BUILD_LIBS=-liberty -- BUILD_LIB_DEPS= --fi --BUILD_LIBS="$BUILD_LIBS $LIBINTL" --BUILD_LIB_DEPS="$BUILD_LIB_DEPS $LIBINTL_DEP" -+BUILD_LIBS="-liberty $LIBINTL" -+BUILD_LIB_DEPS="$LIBINTL_DEP" - - AC_SUBST(BUILD_LIBS) - AC_SUBST(BUILD_LIB_DEPS) - - # Horrible hacks to build DLLs on Windows and a shared library elsewhere. - SHARED_LDFLAGS= --SHARED_LIBADD= -+SHARED_LIBADD=-liberty - SHARED_DEPENDENCIES= - if test "$enable_shared" = "yes"; then --# When building a shared libopcodes, link against the pic version of libiberty --# so that apps that use libopcodes won't need libiberty just to satisfy any --# libopcodes references. --# We can't do that if a pic libiberty is unavailable since including non-pic --# code would insert text relocations into libopcodes. - # Note that linking against libbfd as we do here, which is itself linked - # against libiberty, may not satisfy all the libopcodes libiberty references - # since libbfd may not pull in the entirety of libiberty. --changequote(,)dnl -- x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'` --changequote([,])dnl -- if test -n "$x"; then -- SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty" -- fi -- - case "${host}" in - *-*-cygwin*) - SHARED_LDFLAGS="-no-undefined" -- SHARED_LIBADD="-L`pwd`/../bfd -lbfd -L`pwd`/../libiberty -liberty -L`pwd`/../intl -lintl -lcygwin" -+ SHARED_LIBADD="-lbfd -liberty -lintl -lcygwin" - ;; -- *-*-darwin*) -- SHARED_LIBADD="-Wl,`pwd`/../bfd/.libs/libbfd.dylib ${SHARED_LIBADD}" -- SHARED_DEPENDENCIES="../bfd/libbfd.la" -- ;; - *) -- case "$host_vendor" in -- hp) -- SHARED_LIBADD="-Wl,`pwd`/../bfd/.libs/libbfd.sl ${SHARED_LIBADD}" -- ;; -- *) -- SHARED_LIBADD="-Wl,`pwd`/../bfd/.libs/libbfd.so ${SHARED_LIBADD}" -- ;; -- esac -- SHARED_DEPENDENCIES="../bfd/libbfd.la" -+ SHARED_LIBADD="-lbfd ${SHARED_LIBADD}" - ;; - esac - --- -2.14.2 - diff --git a/pkgs/development/tools/misc/binutils/patches/2.31/gold-symbol-visibility.patch b/pkgs/development/tools/misc/binutils/patches/2.31/gold-symbol-visibility.patch deleted file mode 100644 index 0fb05a482d1c..000000000000 --- a/pkgs/development/tools/misc/binutils/patches/2.31/gold-symbol-visibility.patch +++ /dev/null @@ -1,79 +0,0 @@ -commit 8564af037f5c4c6d2744a89497691359205b2bbc -Author: Shea Levy -Date: Mon Mar 19 10:52:40 2018 -0400 - - Revert "Allow multiply-defined absolute symbols when they have the same value." - - This reverts commit 5dc824ed42cd173c1525f5abc76f4091f11a4dbc. - -diff --git a/gold/ChangeLog-2017 b/gold/ChangeLog-2017 -index b2a47710b5..d7ca1b48c0 100644 ---- a/gold/ChangeLog-2017 -+++ b/gold/ChangeLog-2017 -@@ -114,11 +114,6 @@ - (localedir): Define as @localedir@. - (gnulocaledir, gettextsrcdir): Use @datarootdir@. - --2017-11-28 Cary Coutant -- -- * resolve.cc (Symbol_table::resolve): Allow multiply-defined absolute -- symbols when they have the same value. -- - 2017-11-28 Cary Coutant - - * object.h (class Sized_relobj_file): Remove discarded_eh_frame_shndx_. -diff --git a/gold/resolve.cc b/gold/resolve.cc -index 4a5784cf8b..803576bfed 100644 ---- a/gold/resolve.cc -+++ b/gold/resolve.cc -@@ -247,28 +247,18 @@ Symbol_table::resolve(Sized_symbol* to, - Object* object, const char* version, - bool is_default_version) - { -- bool to_is_ordinary; -- const unsigned int to_shndx = to->shndx(&to_is_ordinary); -- - // It's possible for a symbol to be defined in an object file - // using .symver to give it a version, and for there to also be - // a linker script giving that symbol the same version. We - // don't want to give a multiple-definition error for this - // harmless redefinition. -+ bool to_is_ordinary; - if (to->source() == Symbol::FROM_OBJECT - && to->object() == object -- && to->is_defined() - && is_ordinary -+ && to->is_defined() -+ && to->shndx(&to_is_ordinary) == st_shndx - && to_is_ordinary -- && to_shndx == st_shndx -- && to->value() == sym.get_st_value()) -- return; -- -- // Likewise for an absolute symbol defined twice with the same value. -- if (!is_ordinary -- && st_shndx == elfcpp::SHN_ABS -- && !to_is_ordinary -- && to_shndx == elfcpp::SHN_ABS - && to->value() == sym.get_st_value()) - return; - -@@ -360,8 +350,8 @@ Symbol_table::resolve(Sized_symbol* to, - && (sym.get_st_bind() == elfcpp::STB_WEAK - || to->binding() == elfcpp::STB_WEAK) - && orig_st_shndx != elfcpp::SHN_UNDEF -+ && to->shndx(&to_is_ordinary) != elfcpp::SHN_UNDEF - && to_is_ordinary -- && to_shndx != elfcpp::SHN_UNDEF - && sym.get_st_size() != 0 // Ignore weird 0-sized symbols. - && to->symsize() != 0 - && (sym.get_st_type() != to->type() -@@ -372,7 +362,7 @@ Symbol_table::resolve(Sized_symbol* to, - { - Symbol_location fromloc - = { object, orig_st_shndx, static_cast(sym.get_st_value()) }; -- Symbol_location toloc = { to->object(), to_shndx, -+ Symbol_location toloc = { to->object(), to->shndx(&to_is_ordinary), - static_cast(to->value()) }; - this->candidate_odr_violations_[to->name()].insert(fromloc); - this->candidate_odr_violations_[to->name()].insert(toloc); diff --git a/pkgs/development/tools/misc/binutils/patches/2.31/no-plugins.patch b/pkgs/development/tools/misc/binutils/patches/2.31/no-plugins.patch deleted file mode 100644 index 9624b7976b70..000000000000 --- a/pkgs/development/tools/misc/binutils/patches/2.31/no-plugins.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -ru binutils-2.27-orig/bfd/plugin.c binutils-2.27/bfd/plugin.c ---- binutils-2.27-orig/bfd/plugin.c 2016-10-14 17:46:30.791315555 +0200 -+++ binutils-2.27/bfd/plugin.c 2016-10-14 17:46:38.583298765 +0200 -@@ -333,6 +333,7 @@ - if (plugin_program_name == NULL) - return found; - -+#if 0 - plugin_dir = concat (BINDIR, "/../lib/bfd-plugins", NULL); - p = make_relative_prefix (plugin_program_name, - BINDIR, -@@ -364,6 +365,7 @@ - free (p); - if (d) - closedir (d); -+#endif - - return found; - } diff --git a/pkgs/development/tools/misc/binutils/patches/2.34/always-search-rpath.patch b/pkgs/development/tools/misc/binutils/patches/2.34/always-search-rpath.patch deleted file mode 100644 index 2e9956e6b6e4..000000000000 --- a/pkgs/development/tools/misc/binutils/patches/2.34/always-search-rpath.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/ld/genscripts.sh b/ld/genscripts.sh -index b6940d376d..0feb1adfd0 100755 ---- a/ld/genscripts.sh -+++ b/ld/genscripts.sh -@@ -125,6 +125,9 @@ if test "x$NATIVE" = "xyes" ; then - USE_LIBPATH=yes - fi - -+# TODO: why is this needed? -+USE_LIBPATH=yes -+ - # Set the library search path, for libraries named by -lfoo. - # If LIB_PATH is defined (e.g., by Makefile) and non-empty, it is used. - # Otherwise, the default is set here. diff --git a/pkgs/development/tools/misc/binutils/patches/2.34/deterministic.patch b/pkgs/development/tools/misc/binutils/patches/2.34/deterministic.patch deleted file mode 100644 index 736e0aca6ce1..000000000000 --- a/pkgs/development/tools/misc/binutils/patches/2.34/deterministic.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur orig/binutils-2.23.1/ld/ldlang.c binutils-2.23.1/ld/ldlang.c ---- orig/ld/ldlang.c -+++ new/ld/ldlang.c -@@ -3095,6 +3095,8 @@ - ldfile_output_machine)) - einfo (_("%P%F:%s: can not set architecture: %E\n"), name); - -+ link_info.output_bfd->flags |= BFD_DETERMINISTIC_OUTPUT; -+ - link_info.hash = bfd_link_hash_table_create (link_info.output_bfd); - if (link_info.hash == NULL) - einfo (_("%P%F: can not create hash table: %E\n")); diff --git a/pkgs/development/tools/misc/binutils/patches/2.34/disambiguate-arm-targets.patch b/pkgs/development/tools/misc/binutils/patches/2.34/disambiguate-arm-targets.patch deleted file mode 100644 index abbfa73da05d..000000000000 --- a/pkgs/development/tools/misc/binutils/patches/2.34/disambiguate-arm-targets.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/bfd/elf32-arm.c b/bfd/elf32-arm.c -index 9f956d3..f5b61f1 100644 ---- a/bfd/elf32-arm.c -+++ b/bfd/elf32-arm.c -@@ -19585,7 +19585,10 @@ elf32_arm_vxworks_final_write_processing (bfd *abfd, bfd_boolean linker) - #undef ELF_MAXPAGESIZE - #define ELF_MAXPAGESIZE 0x1000 - -+/* Prioritize elf32-*arm (priority 1) over elf32-*arm-vxworks (priority 2) */ -+#define elf_match_priority 2 - #include "elf32-target.h" -+#undef elf_match_priority - - - /* Merge backend specific data from an object file to the output -@@ -19974,4 +19977,7 @@ elf32_arm_symbian_plt_sym_val (bfd_vma i, const asection *plt, - #undef ELF_MAXPAGESIZE - #define ELF_MAXPAGESIZE 0x8000 - -+/* Prioritize elf32-*arm (priority 1) over elf32-*arm-symbian (priority 2) */ -+#define elf_match_priority 2 - #include "elf32-target.h" -+#undef elf_match_priority diff --git a/pkgs/development/tools/misc/cflow/default.nix b/pkgs/development/tools/misc/cflow/default.nix index 1215c29c4776..8c271bd76732 100644 --- a/pkgs/development/tools/misc/cflow/default.nix +++ b/pkgs/development/tools/misc/cflow/default.nix @@ -45,13 +45,6 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.vrthra ]; - /* On Darwin, build fails with: - - Undefined symbols: - "_argp_program_version", referenced from: - _argp_program_version$non_lazy_ptr in libcflow.a(argp-parse.o) - ld: symbol(s) not found - */ - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/development/tools/misc/cli11/default.nix b/pkgs/development/tools/misc/cli11/default.nix index 5694693615dd..de01ab930900 100644 --- a/pkgs/development/tools/misc/cli11/default.nix +++ b/pkgs/development/tools/misc/cli11/default.nix @@ -30,8 +30,6 @@ stdenv.mkDerivation rec { sed -i '/TrueFalseTest/d' tests/CMakeLists.txt ''; - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "Command line parser for C++11"; homepage = "https://github.com/CLIUtils/CLI11"; diff --git a/pkgs/development/tools/misc/clojure-lsp/default.nix b/pkgs/development/tools/misc/clojure-lsp/default.nix index 7f6a4eddcab0..68140904aadf 100644 --- a/pkgs/development/tools/misc/clojure-lsp/default.nix +++ b/pkgs/development/tools/misc/clojure-lsp/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "clojure-lsp"; - version = "20201228T020543"; + version = "2021.01.03-00.42.23"; src = fetchurl { - url = "https://github.com/clojure-lsp/clojure-lsp/releases/download/release-${version}/${pname}.jar"; - sha256 = "0jkpw7dx7976p63c08bp43fiwk6f2h2nxj9vv1zr103hgywpplri"; + url = "https://github.com/clojure-lsp/clojure-lsp/releases/download/${version}/${pname}.jar"; + sha256 = "06h69hwm3kl1nr94l43j91pnvkzgnacsg6a6cly4abrg041qhbv3"; }; dontUnpack = true; @@ -16,9 +16,9 @@ stdenv.mkDerivation rec { installPhase = '' install -Dm644 $src $out/share/java/${pname}.jar makeWrapper ${jre}/bin/java $out/bin/${pname} \ - --add-flags "-jar $out/share/java/${pname}.jar" \ --add-flags "-Xmx2g" \ - --add-flags "-server" + --add-flags "-server" \ + --add-flags "-jar $out/share/java/${pname}.jar" ''; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/misc/creduce/default.nix b/pkgs/development/tools/misc/creduce/default.nix index fc6f7156a81b..7bc4aca3d9d6 100644 --- a/pkgs/development/tools/misc/creduce/default.nix +++ b/pkgs/development/tools/misc/creduce/default.nix @@ -32,9 +32,6 @@ stdenv.mkDerivation rec { lscpu ${util-linux}/bin/lscpu ''; - - enableParallelBuilding = true; - postInstall = '' wrapProgram $out/bin/creduce --prefix PERL5LIB : "$PERL5LIB" ''; diff --git a/pkgs/development/tools/misc/ctags/wrapped.nix b/pkgs/development/tools/misc/ctags/wrapped.nix index 08f8049aa8a1..f658e78d5db0 100644 --- a/pkgs/development/tools/misc/ctags/wrapped.nix +++ b/pkgs/development/tools/misc/ctags/wrapped.nix @@ -1,6 +1,6 @@ { pkgs, ctags }: -with pkgs.stdenv.lib; +with pkgs.lib; # define some ctags wrappers adding support for some not that common languages # customization: diff --git a/pkgs/development/tools/misc/dialog/default.nix b/pkgs/development/tools/misc/dialog/default.nix index ead105779788..c56620e3105e 100644 --- a/pkgs/development/tools/misc/dialog/default.nix +++ b/pkgs/development/tools/misc/dialog/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, ncurses +{ stdenv, fetchurl +, ncurses , withLibrary ? false, libtool , unicodeSupport ? true , enableShared ? !stdenv.isDarwin @@ -9,14 +10,14 @@ assert unicodeSupport -> ncurses.unicode && ncurses != null; stdenv.mkDerivation rec { pname = "dialog"; - version = "1.3-20190211"; + version = "1.3-20201126"; src = fetchurl { urls = [ "ftp://ftp.invisible-island.net/dialog/${pname}-${version}.tgz" "https://invisible-mirror.net/archives/dialog/${pname}-${version}.tgz" ]; - sha256 = "1lx0bvradzx1zl7znlrsnyljcs596r7wamkhyq37ikbxsy4y5h29"; + sha256 = "sha256-ySM6bI6jOlniN45RRq4r0TtRl0TP22R690IK2sWtOGY="; }; buildInputs = [ ncurses ]; @@ -30,11 +31,11 @@ stdenv.mkDerivation rec { installTargets = [ "install${stdenv.lib.optionalString withLibrary "-full"}" ]; - meta = { + meta = with stdenv.lib; { homepage = "https://invisible-island.net/dialog/dialog.html"; description = "Display dialog boxes from shell"; - license = stdenv.lib.licenses.lgpl21Plus; - maintainers = [ stdenv.lib.maintainers.spacefrogg ]; - platforms = stdenv.lib.platforms.all; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ AndersonTorres spacefrogg ]; + platforms = ncurses.meta.platforms; }; } diff --git a/pkgs/development/tools/misc/editorconfig-checker/default.nix b/pkgs/development/tools/misc/editorconfig-checker/default.nix index 401bbdbee6ef..5edbdba4141e 100644 --- a/pkgs/development/tools/misc/editorconfig-checker/default.nix +++ b/pkgs/development/tools/misc/editorconfig-checker/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "editorconfig-checker"; - version = "2.2.0"; + version = "2.3.1"; src = fetchFromGitHub { owner = "editorconfig-checker"; repo = "editorconfig-checker"; rev = version; - sha256 = "18gz94h2x1z6g6r7v9cdixkbcaigd7cl08af6smlkaa89j0aki32"; + sha256 = "0c7mainlwn3pd9q6i1f82m5znv8m6fs15zq7nrbm04fy554h0pzz"; }; vendorSha256 = "1z4j8vm9mnhjhhmhlj0ycs8b1wpm7lhsfqjnk7w8gfapvj3yfk6h"; diff --git a/pkgs/development/tools/misc/hydra/default.nix b/pkgs/development/tools/misc/hydra/default.nix index 7aa1e05a88e4..1636ad6dd71f 100644 --- a/pkgs/development/tools/misc/hydra/default.nix +++ b/pkgs/development/tools/misc/hydra/default.nix @@ -9,6 +9,9 @@ rev = "79d34ed7c93af2daf32cf44ee0e3e0768f13f97c"; sha256 = "1lql899430137l6ghnhyz0ivkayy83fdr087ck2wq3gf1jv8pccj"; }; + patches = [ + ./hydra-nix-receiveContents.patch + ]; nix = nixFlakes; tests = { diff --git a/pkgs/development/tools/misc/hydra/hydra-nix-receiveContents.patch b/pkgs/development/tools/misc/hydra/hydra-nix-receiveContents.patch new file mode 100644 index 000000000000..61957e2190cd --- /dev/null +++ b/pkgs/development/tools/misc/hydra/hydra-nix-receiveContents.patch @@ -0,0 +1,18 @@ +Update for https://github.com/NixOS/nix/commit/faa31f40 + +--- a/src/hydra-queue-runner/nar-extractor.cc ++++ b/src/hydra-queue-runner/nar-extractor.cc +@@ -48,9 +48,9 @@ +- void receiveContents(unsigned char * data, size_t len) override ++ void receiveContents(std::string_view data) override + { + assert(expectedSize); + assert(curMember); + assert(hashSink); +- *curMember->fileSize += len; +- (*hashSink)(data, len); ++ *curMember->fileSize += data.size(); ++ (*hashSink)(data); + if (curMember->contents) { +- curMember->contents->append((char *) data, len); ++ curMember->contents->append(data); diff --git a/pkgs/development/tools/misc/kdbg/default.nix b/pkgs/development/tools/misc/kdbg/default.nix index 6b7369a0558f..78acf8e17a74 100644 --- a/pkgs/development/tools/misc/kdbg/default.nix +++ b/pkgs/development/tools/misc/kdbg/default.nix @@ -14,9 +14,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake extra-cmake-modules makeWrapper ]; buildInputs = [ qt5.qtbase ki18n kconfig kiconthemes kxmlgui kwindowsystem ]; - enableParallelBuilding = true; - - postInstall = '' wrapProgram $out/bin/kdbg --prefix QT_PLUGIN_PATH : ${qtbase}/${qtbase.qtPluginPrefix} ''; diff --git a/pkgs/development/tools/misc/lttng-ust/default.nix b/pkgs/development/tools/misc/lttng-ust/default.nix index 1b59045c6fd2..ba3930642b19 100644 --- a/pkgs/development/tools/misc/lttng-ust/default.nix +++ b/pkgs/development/tools/misc/lttng-ust/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, liburcu, python }: +{ stdenv, fetchurl, liburcu, python3 }: # NOTE: # ./configure ... @@ -20,12 +20,12 @@ stdenv.mkDerivation rec { sha256 = "0ddwk0nl28bkv2xb78gz16a2bvlpfbjmzwfbgwf5p1cq46dyvy86"; }; - buildInputs = [ python ]; + buildInputs = [ python3 ]; preConfigure = '' patchShebangs . ''; - + propagatedBuildInputs = [ liburcu ]; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/misc/nimlsp/default.nix b/pkgs/development/tools/misc/nimlsp/default.nix new file mode 100644 index 000000000000..5795fca457d1 --- /dev/null +++ b/pkgs/development/tools/misc/nimlsp/default.nix @@ -0,0 +1,48 @@ +{ stdenv, fetchFromGitHub, srcOnly, nim }: +let + astpatternmatching = fetchFromGitHub { + owner = "krux02"; + repo = "ast-pattern-matching"; + rev = "87f7d163421af5a4f5e5cb6da7b93278e6897e96"; + sha256 = "19mb5bb6riia8380p5dpc3q0vwgrj958dd6p7vw8vkvwiqrzg6zq"; + }; + + jsonschema = fetchFromGitHub { + owner = "PMunch"; + repo = "jsonschema"; + rev = "7b41c03e3e1a487d5a8f6b940ca8e764dc2cbabf"; + sha256 = "1js64jqd854yjladxvnylij4rsz7212k31ks541pqrdzm6hpblbz"; + }; +in +stdenv.mkDerivation rec { + pname = "nimlsp"; + version = "0.2.6"; + + src = fetchFromGitHub { + owner = "PMunch"; + repo = "nimlsp"; + rev = "v${version}"; + sha256 = "13kw3zjh0iqymwqxwhyj8jz6hgswwahf1rjd6iad7c6gcwrrg6yl"; + }; + + nativeBuildInputs = [ nim ]; + + buildPhase = '' + export HOME=$TMPDIR + nim -d:release -p:${astpatternmatching}/src -p:${jsonschema}/src \ + c --threads:on -d:nimcore -d:nimsuggest -d:debugCommunication \ + -d:debugLogging -d:explicitSourcePath=${srcOnly nim.unwrapped} -d:tempDir=/tmp src/nimlsp + ''; + + installPhase = '' + install -Dt $out/bin src/nimlsp + ''; + + meta = with stdenv.lib; { + description = "Language Server Protocol implementation for Nim"; + homepage = "https://github.com/PMunch/nimlsp"; + license = licenses.mit; + platforms = nim.meta.platforms; + maintainers = [ maintainers.marsam ]; + }; +} diff --git a/pkgs/development/tools/misc/openocd/default.nix b/pkgs/development/tools/misc/openocd/default.nix index 5c8e95f7fd4b..bf50a380d1fc 100644 --- a/pkgs/development/tools/misc/openocd/default.nix +++ b/pkgs/development/tools/misc/openocd/default.nix @@ -10,12 +10,12 @@ stdenv.mkDerivation rec { pname = "openocd"; - version = "unstable-2020-11-11"; + version = "0.11.0-rc1"; src = fetchgit { url = "https://git.code.sf.net/p/openocd/code"; - rev = "06c7a53f1fff20bcc4be9e63f83ae98664777f34"; - sha256 = "0g0w7g94r88ylfpwswnhh8czlf5iqvd991ssn4gfcfd725lpdb01"; + rev = "v${version}"; + sha256 = "15g8qalyxhdp0imfrg8mxwnp0nimd836fc5laaavajw49gcm65m4"; fetchSubmodules = true; }; diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix index 6b797481799e..877aedc4e497 100644 --- a/pkgs/development/tools/misc/strace/default.nix +++ b/pkgs/development/tools/misc/strace/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { postPatch = "patchShebangs --host strace-graph"; - configureFlags = stdenv.lib.optional (!stdenv.hostPlatform.isx86) "--enable-mpers=check"; + configureFlags = [ "--enable-mpers=check" ]; meta = with stdenv.lib; { homepage = "https://strace.io/"; diff --git a/pkgs/development/tools/misc/terraform-ls/default.nix b/pkgs/development/tools/misc/terraform-ls/default.nix index 220042079fd4..498508d091fc 100644 --- a/pkgs/development/tools/misc/terraform-ls/default.nix +++ b/pkgs/development/tools/misc/terraform-ls/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "terraform-ls"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "hashicorp"; repo = pname; rev = "v${version}"; - sha256 = "XOKaNpYR31lKpA33+7WU2KYjgEx4g6gpp3IAjWtb3Zk="; + sha256 = "w9PLKLFjKehtub1LbVX9TbvKkj/S1t0MwZIZurF2x18="; }; - vendorSha256 = "8NdeCD558r0tV+ZR4MvLl5CzeNj8cUGtqwvJ2ZhS7mI="; + vendorSha256 = "J8ovcUeQsb58Bq/EM9mvYqtuDY1bXTEVCC9/AH+UttU="; # tests fail in sandbox mode because of trying to download stuff from releases.hashicorp.com doCheck = false; diff --git a/pkgs/development/tools/misc/texlab/default.nix b/pkgs/development/tools/misc/texlab/default.nix index 8b734bdd1c18..480c7cfd5561 100644 --- a/pkgs/development/tools/misc/texlab/default.nix +++ b/pkgs/development/tools/misc/texlab/default.nix @@ -1,4 +1,5 @@ -{ stdenv +{ lib +, stdenv , rustPlatform , fetchFromGitHub , installShellFiles @@ -7,28 +8,28 @@ rustPlatform.buildRustPackage rec { pname = "texlab"; - version = "2.2.0"; + version = "2.2.2"; src = fetchFromGitHub { owner = "latex-lsp"; repo = pname; rev = "v${version}"; - sha256 = "0iydkbmx9z7xpwaif0han5jvy9xh1afmfyldl7fcyy4r906dsmhx"; + sha256 = "06x7j4ppgw24xbsnyj1icaksngqbvq6mk8wfcqikzmvmifjspx9m"; }; - cargoSha256 = "0iibjh2ll181j69vld1awvjgyv3xwmq0abh10651la4k4jpppx46"; + cargoSha256 = "0gzxylpn2hps0kxczd6wwcqhnvm6ir971bfvpgjr6rxi12hs47ky"; nativeBuildInputs = [ installShellFiles ]; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = lib.optionals stdenv.isDarwin [ Security ]; postInstall = '' installManPage texlab.1 ''; - meta = with stdenv.lib; { + meta = with lib; { description = "An implementation of the Language Server Protocol for LaTeX"; - homepage = "https://texlab.netlify.com/"; + homepage = "https://texlab.netlify.app"; license = licenses.mit; maintainers = with maintainers; [ doronbehar metadark ]; }; diff --git a/pkgs/development/tools/misc/tokei/default.nix b/pkgs/development/tools/misc/tokei/default.nix index baf14b933dcb..32094d9303b8 100644 --- a/pkgs/development/tools/misc/tokei/default.nix +++ b/pkgs/development/tools/misc/tokei/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "tokei"; - version = "12.0.4"; + version = "12.1.2"; src = fetchFromGitHub { owner = "XAMPPRocky"; repo = pname; rev = "v${version}"; - sha256 = "0vj6xpp5ss82n1zxljy5893s8l1pdhar5xqay5vvglkp8bzblin6"; + sha256 = "sha256-jqDsxUAMD/MCCI0hamkGuCYa8rEXNZIR8S+84S8FbgI="; }; - cargoSha256 = "02c2pdjzd49qznm1yj3rnli48267ajjdklrb1cpj0rhpirw4rh1j"; + cargoSha256 = "sha256-iUDc54E8AiLMJw9h99kg/3VmaSi8GqfQyrPwa9nJ994="; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security diff --git a/pkgs/development/tools/misc/uncrustify/default.nix b/pkgs/development/tools/misc/uncrustify/default.nix index 587896fce680..526e71515aec 100644 --- a/pkgs/development/tools/misc/uncrustify/default.nix +++ b/pkgs/development/tools/misc/uncrustify/default.nix @@ -14,8 +14,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake python ]; - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "Source code beautifier for C, C++, C#, ObjectiveC, D, Java, Pawn and VALA"; homepage = "http://uncrustify.sourceforge.net/"; diff --git a/pkgs/development/tools/misc/xc3sprog/default.nix b/pkgs/development/tools/misc/xc3sprog/default.nix index 1ccd6c2ec4f2..e54dc7844e79 100644 --- a/pkgs/development/tools/misc/xc3sprog/default.nix +++ b/pkgs/development/tools/misc/xc3sprog/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { rev = version; }; - buildInputs = [ cmake libusb-compat-0_1 libftdi ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ libusb-compat-0_1 libftdi ]; meta = with stdenv.lib; { description = "Command-line tools for programming FPGAs, microcontrollers and PROMs via JTAG"; diff --git a/pkgs/development/tools/mmixware/default.nix b/pkgs/development/tools/mmixware/default.nix index 0b0d394b4e1e..b6d03f456712 100644 --- a/pkgs/development/tools/mmixware/default.nix +++ b/pkgs/development/tools/mmixware/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, tetex }: +{ lib, stdenv, fetchFromGitLab, tetex }: stdenv.mkDerivation { pname = "mmixware"; @@ -34,7 +34,7 @@ stdenv.mkDerivation { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "MMIX simulator and assembler"; homepage = "https://www-cs-faculty.stanford.edu/~knuth/mmix-news.html"; maintainers = with maintainers; [ siraben ]; diff --git a/pkgs/development/tools/mpfshell/default.nix b/pkgs/development/tools/mpfshell/default.nix index 69048acb5baf..efe2b397f952 100644 --- a/pkgs/development/tools/mpfshell/default.nix +++ b/pkgs/development/tools/mpfshell/default.nix @@ -1,20 +1,23 @@ { lib, python3Packages, fetchFromGitHub }: python3Packages.buildPythonPackage rec { - name = "mpfshell-${version}"; - version = "0.8.1"; + pname = "mpfshell-unstable"; + version = "2020-04-11"; src = fetchFromGitHub { owner = "wendlers"; repo = "mpfshell"; - rev = version; - sha256 = "1n4ap4yfii54y125f9n9krc0lc0drwg3hsq4z6g89xbswdx9sygr"; + rev = "429469fcccbda770fddf7a4277f5db92b1217664"; + sha256 = "0md6ih9vp65dacqy8gki3b2p4v76xb9ijqmxymk4b4f9z684x2m7"; }; propagatedBuildInputs = with python3Packages; [ pyserial colorama websocket_client ]; + doCheck = false; + pythonImportsCheck = [ "mp.mpfshell" ]; + meta = with lib; { homepage = "https://github.com/wendlers/mpfshell"; description = "A simple shell based file explorer for ESP8266 Micropython based devices"; diff --git a/pkgs/development/tools/msgpack-tools/default.nix b/pkgs/development/tools/msgpack-tools/default.nix index 65bc8feab6b4..a7b3c36d87b2 100644 --- a/pkgs/development/tools/msgpack-tools/default.nix +++ b/pkgs/development/tools/msgpack-tools/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, fetchFromGitHub, cmake, unzip }: +{ lib, stdenv, fetchurl, fetchFromGitHub, cmake }: + stdenv.mkDerivation rec { pname = "msgpack-tools"; version = "0.6"; @@ -32,10 +33,9 @@ stdenv.mkDerivation rec { cp ${mpack} $sourceRoot/contrib/mpack-df17e83f0fa8571b9cd0d8ccf38144fa90e244d1.tar.gz ''; + nativeBuildInputs = [ cmake ]; - buildInputs = [ cmake unzip ]; - - meta = with stdenv.lib; { + meta = with lib; { description = "Command-line tools for converting between MessagePack and JSON"; homepage = "https://github.com/ludocode/msgpack-tools"; license = licenses.mit; diff --git a/pkgs/development/tools/nailgun/default.nix b/pkgs/development/tools/nailgun/default.nix index 84e5a6b1d9fc..9832de15140a 100644 --- a/pkgs/development/tools/nailgun/default.nix +++ b/pkgs/development/tools/nailgun/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchMavenArtifact, fetchFromGitHub, jre, makeWrapper }: +{ lib, stdenv, fetchMavenArtifact, fetchFromGitHub, jre, makeWrapper }: let version = "1.0.0"; @@ -29,7 +29,7 @@ stdenv.mkDerivation { --add-flags '-classpath ${nailgun-server.jar}:$CLASSPATH com.facebook.nailgun.NGServer' ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Client, protocol, and server for running Java programs from the command line without incurring the JVM startup overhead"; homepage = "http://www.martiansoftware.com/nailgun/"; license = licenses.asl20; diff --git a/pkgs/development/tools/nemiver/default.nix b/pkgs/development/tools/nemiver/default.nix index 8890ceca9d39..191b17213495 100644 --- a/pkgs/development/tools/nemiver/default.nix +++ b/pkgs/development/tools/nemiver/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , fetchpatch , pkgconfig @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://wiki.gnome.org/Apps/Nemiver"; description = "Easy to use standalone C/C++ debugger"; license = licenses.gpl2; diff --git a/pkgs/development/tools/nsis/default.nix b/pkgs/development/tools/nsis/default.nix index 303ea6a00fe8..2d3f54bbf75b 100644 --- a/pkgs/development/tools/nsis/default.nix +++ b/pkgs/development/tools/nsis/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , fetchzip , sconsPackages @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { prefixKey = "PREFIX="; installTargets = [ "install-compiler" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A free scriptable win32 installer/uninstaller system that doesn't suck and isn't huge"; homepage = "https://nsis.sourceforge.io/"; license = licenses.zlib; diff --git a/pkgs/development/tools/ocaml/camlp5/default.nix b/pkgs/development/tools/ocaml/camlp5/default.nix index 5fb76a526016..6d68a320a910 100644 --- a/pkgs/development/tools/ocaml/camlp5/default.nix +++ b/pkgs/development/tools/ocaml/camlp5/default.nix @@ -1,20 +1,26 @@ -{ stdenv, fetchzip, ocaml }: +{ stdenv, fetchzip, ocaml, perl }: + +if stdenv.lib.versionOlder ocaml.version "4.02" +then throw "camlp5 is not available for OCaml ${ocaml.version}" +else stdenv.mkDerivation { - name = "camlp5-7.13"; + name = "camlp5-7.14"; src = fetchzip { - url = "https://github.com/camlp5/camlp5/archive/rel713.tar.gz"; - sha256 = "1d9spy3f5ahixm8nxxk086kpslzva669a5scn49am0s7vx4i71kp"; + url = "https://github.com/camlp5/camlp5/archive/rel714.tar.gz"; + sha256 = "1dd68bisbpqn5lq2pslm582hxglcxnbkgfkwhdz67z4w9d5nvr7w"; }; - buildInputs = [ ocaml ]; + buildInputs = [ ocaml perl ]; prefixKey = "-prefix "; - preConfigure = "configureFlagsArray=(--strict" + - " --libdir $out/lib/ocaml/${ocaml.version}/site-lib)"; + preConfigure = '' + configureFlagsArray=(--strict --libdir $out/lib/ocaml/${ocaml.version}/site-lib) + patchShebangs ./config/find_stuffversion.pl + ''; buildFlags = [ "world.opt" ]; diff --git a/pkgs/development/tools/ocaml/dune-release/default.nix b/pkgs/development/tools/ocaml/dune-release/default.nix index c267b2757a43..60a9bfba58fe 100644 --- a/pkgs/development/tools/ocaml/dune-release/default.nix +++ b/pkgs/development/tools/ocaml/dune-release/default.nix @@ -32,9 +32,14 @@ in buildDunePackage rec { # to have a fixed path to the binary in nix store sed -i '/must_exist (Cmd\.v "curl"/d' lib/github.ml - # set bogus user info in git so git commit doesn't fail - sed -i '/git init/ a \ $ git config user.name test; git config user.email "pseudo@pseudo.invalid"' \ - tests/bin/{delegate_info,errors,tag,no_doc,x-commit-hash}/run.t + # fix problems with git invocations in tests + for f in tests/bin/{delegate_info,errors,tag,no_doc,x-commit-hash}/run.t; do + # set bogus user info in git so git commit doesn't fail + sed -i '/git init/ a \ $ git config user.name test; git config user.email "pseudo@pseudo.invalid"' "$f" + # surpress hint to set default branch name + substituteInPlace "$f" --replace "git init" "git init -b main" + done + # ignore weird yes error message sed -i 's/yes |/yes 2>\/dev\/null |/' tests/bin/no_doc/run.t ''; diff --git a/pkgs/development/tools/ocaml/merlin/default.nix b/pkgs/development/tools/ocaml/merlin/default.nix index 34fcc9bb6c32..ce168084f2c6 100644 --- a/pkgs/development/tools/ocaml/merlin/default.nix +++ b/pkgs/development/tools/ocaml/merlin/default.nix @@ -4,7 +4,7 @@ buildDunePackage rec { pname = "merlin"; - inherit (dot-merlin-reader) src version; + inherit (dot-merlin-reader) src version useDune2; minimumOCamlVersion = "4.02.3"; diff --git a/pkgs/development/tools/ocaml/merlin/dot-merlin-reader.nix b/pkgs/development/tools/ocaml/merlin/dot-merlin-reader.nix index 7af1b4513a85..009998a3f851 100644 --- a/pkgs/development/tools/ocaml/merlin/dot-merlin-reader.nix +++ b/pkgs/development/tools/ocaml/merlin/dot-merlin-reader.nix @@ -4,13 +4,15 @@ with ocamlPackages; buildDunePackage rec { pname = "dot-merlin-reader"; - version = "3.4.0"; + version = "3.4.2"; + + useDune2 = true; minimumOCamlVersion = "4.02.1"; src = fetchurl { url = "https://github.com/ocaml/merlin/releases/download/v${version}/merlin-v${version}.tbz"; - sha256 = "048rkpbvayksv8mgmkgi17vv0y9xplv7v2ww4d1hs7bkm5zzsvg2"; + sha256 = "109ai1ggnkrwbzsl1wdalikvs1zx940m6n65jllxj68in6bvidz1"; }; buildInputs = [ yojson csexp result ]; diff --git a/pkgs/development/tools/ocaml/ocamlscript/default.nix b/pkgs/development/tools/ocaml/ocamlscript/default.nix index 2172c7f6161a..4518e7a22e41 100644 --- a/pkgs/development/tools/ocaml/ocamlscript/default.nix +++ b/pkgs/development/tools/ocaml/ocamlscript/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ocaml, findlib, camlp4}: +{lib, stdenv, fetchurl, ocaml, findlib, camlp4}: stdenv.mkDerivation { name = "ocamlscript-2.0.3"; src = fetchurl { @@ -16,7 +16,7 @@ stdenv.mkDerivation { preInstall = "mkdir $out/bin"; createFindlibDestdir = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://martin.jambon.free.fr/ocamlscript.html"; license = licenses.boost; platforms = ocaml.meta.platforms or []; diff --git a/pkgs/development/tools/ocaml/opam/opam.nix.pl b/pkgs/development/tools/ocaml/opam/opam.nix.pl index 828e209fac61..1cbad6f5f44e 100755 --- a/pkgs/development/tools/ocaml/opam/opam.nix.pl +++ b/pkgs/development/tools/ocaml/opam/opam.nix.pl @@ -120,7 +120,7 @@ print <<'EOF'; doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "A package manager for OCaml"; homepage = "https://opam.ocaml.org/"; maintainers = [ maintainers.henrytill maintainers.marsam ]; diff --git a/pkgs/development/tools/ocaml/utop/default.nix b/pkgs/development/tools/ocaml/utop/default.nix index ac7cd4f4dbbc..2c4c330b286d 100644 --- a/pkgs/development/tools/ocaml/utop/default.nix +++ b/pkgs/development/tools/ocaml/utop/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, dune +{ stdenv, fetchurl, ocaml, findlib , lambdaTerm, cppo, makeWrapper, buildDunePackage }: @@ -8,11 +8,13 @@ else buildDunePackage rec { pname = "utop"; - version = "2.4.3"; + version = "2.6.0"; + + useDune2 = true; src = fetchurl { url = "https://github.com/ocaml-community/utop/releases/download/${version}/utop-${version}.tbz"; - sha256 = "107al0l3x4a5kkjka7glmhsqlm7pwzzc6shspiv5gsjb49pblc2f"; + sha256 = "17n9igl74xcvj0mzdh2ybda29f2m48a5lj4yf8lrdqr7vg0982jd"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/ofono-phonesim/default.nix b/pkgs/development/tools/ofono-phonesim/default.nix index e651c7cfab50..086cd818a467 100644 --- a/pkgs/development/tools/ofono-phonesim/default.nix +++ b/pkgs/development/tools/ofono-phonesim/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , mkDerivation , fetchgit , autoreconfHook @@ -30,7 +30,7 @@ mkDerivation { "UIC=${qtbase.dev}/bin/uic" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Phone Simulator for modem testing"; homepage = "https://01.org/ofono"; license = licenses.gpl2; diff --git a/pkgs/development/tools/osslsigncode/default.nix b/pkgs/development/tools/osslsigncode/default.nix index ef673ed018f2..349a6b10104e 100644 --- a/pkgs/development/tools/osslsigncode/default.nix +++ b/pkgs/development/tools/osslsigncode/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , autoreconfHook , libgsf @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook libgsf pkgconfig openssl curl ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/mtrojnar/osslsigncode"; description = "OpenSSL based Authenticode signing for PE/MSI/Java CAB files"; license = licenses.gpl3Plus; diff --git a/pkgs/development/tools/out-of-tree/default.nix b/pkgs/development/tools/out-of-tree/default.nix index b902dd2cc406..757377642190 100644 --- a/pkgs/development/tools/out-of-tree/default.nix +++ b/pkgs/development/tools/out-of-tree/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchgit, qemu, docker, which, makeWrapper }: +{ lib, stdenv, buildGoModule, fetchgit, qemu, docker, which, makeWrapper }: buildGoModule rec { pname = "out-of-tree"; @@ -21,7 +21,7 @@ buildGoModule rec { --prefix PATH : "${stdenv.lib.makeBinPath [ qemu docker which ]}" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "kernel {module, exploit} development tool"; homepage = "https://out-of-tree.io"; maintainers = [ maintainers.dump_stack ]; diff --git a/pkgs/development/tools/packer/default.nix b/pkgs/development/tools/packer/default.nix index 8570e10a07c3..d4dd46cdcb5c 100644 --- a/pkgs/development/tools/packer/default.nix +++ b/pkgs/development/tools/packer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "packer"; version = "1.6.6"; @@ -14,7 +14,7 @@ buildGoPackage rec { sha256 = "sha256-kFDy8Zlx+D5JDyNlAmB/ICTe4K9s6KDbALP5pom5OQg="; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A tool for creating identical machine images for multiple platforms from a single source configuration"; homepage = "https://www.packer.io"; license = licenses.mpl20; diff --git a/pkgs/development/tools/packet-cli/default.nix b/pkgs/development/tools/packet-cli/default.nix index 4c4cb6a28d42..ec07e4b058ee 100644 --- a/pkgs/development/tools/packet-cli/default.nix +++ b/pkgs/development/tools/packet-cli/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "packet-cli"; @@ -19,7 +19,7 @@ buildGoModule rec { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Official Packet CLI"; homepage = "https://github.com/packethost/packet-cli"; license = licenses.mit; diff --git a/pkgs/development/tools/parinfer-rust/default.nix b/pkgs/development/tools/parinfer-rust/default.nix index f697e00b56a4..79c8f3791880 100644 --- a/pkgs/development/tools/parinfer-rust/default.nix +++ b/pkgs/development/tools/parinfer-rust/default.nix @@ -1,4 +1,4 @@ -{ stdenv, rustPlatform, fetchFromGitHub, llvmPackages }: +{ lib, stdenv, rustPlatform, fetchFromGitHub, llvmPackages }: rustPlatform.buildRustPackage rec { pname = "parinfer-rust"; @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec { plugin/parinfer.vim >$rtpPath/plugin/parinfer.vim ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Infer parentheses for Clojure, Lisp, and Scheme"; homepage = "https://github.com/eraserhd/parinfer-rust"; license = licenses.isc; diff --git a/pkgs/development/tools/parse-cli-bin/default.nix b/pkgs/development/tools/parse-cli-bin/default.nix index 0f8ead579d0a..7cda74db5ef6 100644 --- a/pkgs/development/tools/parse-cli-bin/default.nix +++ b/pkgs/development/tools/parse-cli-bin/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "parse-cli-bin"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1iyfizbbxmr87wjgqiwqds51irgw6l3vm9wn89pc3zpj2zkyvf5h"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Parse Command Line Interface"; homepage = "https://parse.com"; platforms = platforms.linux; diff --git a/pkgs/development/tools/parsing/antlr/2.7.7.nix b/pkgs/development/tools/parsing/antlr/2.7.7.nix index 55800a800984..fed96e954751 100644 --- a/pkgs/development/tools/parsing/antlr/2.7.7.nix +++ b/pkgs/development/tools/parsing/antlr/2.7.7.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jdk, python2 }: +{ lib, stdenv, fetchurl, jdk, python2 }: stdenv.mkDerivation { name = "antlr-2.7.7"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { buildInputs = [ jdk ]; nativeBuildInputs = [ python2 ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Powerful parser generator"; longDescription = '' ANTLR (ANother Tool for Language Recognition) is a powerful parser diff --git a/pkgs/development/tools/parsing/antlr/3.4.nix b/pkgs/development/tools/parsing/antlr/3.4.nix index 1263e7934be7..962cd079a8e9 100644 --- a/pkgs/development/tools/parsing/antlr/3.4.nix +++ b/pkgs/development/tools/parsing/antlr/3.4.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, jre}: +{lib, stdenv, fetchurl, jre}: stdenv.mkDerivation rec { pname = "antlr"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { inherit jre; - meta = with stdenv.lib; { + meta = with lib; { description = "Powerful parser generator"; longDescription = '' ANTLR (ANother Tool for Language Recognition) is a powerful parser diff --git a/pkgs/development/tools/parsing/antlr/3.5.nix b/pkgs/development/tools/parsing/antlr/3.5.nix index 6fa6323d3e87..39c022604d8f 100644 --- a/pkgs/development/tools/parsing/antlr/3.5.nix +++ b/pkgs/development/tools/parsing/antlr/3.5.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, fetchFromGitHub, jre}: +{lib, stdenv, fetchurl, fetchFromGitHub, jre}: stdenv.mkDerivation rec { pname = "antlr"; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { inherit jre; - meta = with stdenv.lib; { + meta = with lib; { description = "Powerful parser generator"; longDescription = '' ANTLR (ANother Tool for Language Recognition) is a powerful parser diff --git a/pkgs/development/tools/parsing/antlr/4.8.nix b/pkgs/development/tools/parsing/antlr/4.8.nix index 1c88c82e16ae..411364e203bf 100644 --- a/pkgs/development/tools/parsing/antlr/4.8.nix +++ b/pkgs/development/tools/parsing/antlr/4.8.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jre +{ lib, stdenv, fetchurl, jre , fetchFromGitHub, cmake, ninja, pkgconfig, libuuid, darwin }: let @@ -26,7 +26,7 @@ let export sourceRoot=$sourceRoot/runtime/Cpp ''; - meta = with stdenv.lib; { + meta = with lib; { description = "C++ target for ANTLR 4"; homepage = "https://www.antlr.org/"; license = licenses.bsd3; @@ -67,7 +67,7 @@ let jarLocation = "${antlr}/share/java/antlr-${version}-complete.jar"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Powerful parser generator"; longDescription = '' ANTLR (ANother Tool for Language Recognition) is a powerful parser diff --git a/pkgs/development/tools/parsing/bisonc++/default.nix b/pkgs/development/tools/parsing/bisonc++/default.nix index c6a4fc1a068d..5710500a18f7 100644 --- a/pkgs/development/tools/parsing/bisonc++/default.nix +++ b/pkgs/development/tools/parsing/bisonc++/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, fetchFromGitLab +{lib, stdenv, fetchurl, fetchFromGitLab , yodl, icmake, flexcpp, bobcat }: stdenv.mkDerivation rec { @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { ./build install x ''; - meta = with stdenv.lib; { + meta = with lib; { inherit version; description = "A parser generator like bison, but it generates C++ code"; license = licenses.gpl2Plus; diff --git a/pkgs/development/tools/parsing/byacc/default.nix b/pkgs/development/tools/parsing/byacc/default.nix index 60e6796850c2..4f6f00e968ef 100644 --- a/pkgs/development/tools/parsing/byacc/default.nix +++ b/pkgs/development/tools/parsing/byacc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "byacc"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ln -s $out/bin/byacc $out/bin/yacc ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Berkeley YACC"; homepage = "https://invisible-island.net/byacc/byacc.html"; license = licenses.publicDomain; diff --git a/pkgs/development/tools/parsing/flex/2.5.35.nix b/pkgs/development/tools/parsing/flex/2.5.35.nix index 504e5b090497..c352b5a38374 100644 --- a/pkgs/development/tools/parsing/flex/2.5.35.nix +++ b/pkgs/development/tools/parsing/flex/2.5.35.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, flex, bison, texinfo, help2man, m4 }: +{ lib, stdenv, fetchurl, autoreconfHook, flex, bison, texinfo, help2man, m4 }: stdenv.mkDerivation { name = "flex-2.5.35"; @@ -23,7 +23,7 @@ stdenv.mkDerivation { doCheck = false; # fails 2 out of 46 tests - meta = with stdenv.lib; { + meta = with lib; { branch = "2.5.35"; homepage = "http://flex.sourceforge.net/"; description = "A fast lexical analyser generator"; diff --git a/pkgs/development/tools/parsing/flex/2.6.1.nix b/pkgs/development/tools/parsing/flex/2.6.1.nix index 2562b3c26134..3a032e60c32f 100644 --- a/pkgs/development/tools/parsing/flex/2.6.1.nix +++ b/pkgs/development/tools/parsing/flex/2.6.1.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bison, m4 }: +{ lib, stdenv, fetchurl, bison, m4 }: stdenv.mkDerivation { name = "flex-2.6.1"; @@ -27,7 +27,7 @@ stdenv.mkDerivation { sed -i Makefile -e 's/-no-undefined//;' ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/westes/flex"; description = "A fast lexical analyser generator"; license = licenses.bsd2; diff --git a/pkgs/development/tools/parsing/flex/default.nix b/pkgs/development/tools/parsing/flex/default.nix index 51373f4a4fd7..c77c1f73c69e 100644 --- a/pkgs/development/tools/parsing/flex/default.nix +++ b/pkgs/development/tools/parsing/flex/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPackages, fetchurl, bison, m4 +{ lib, stdenv, buildPackages, fetchurl, bison, m4 , fetchpatch, autoreconfHook, help2man }: @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { dontDisableStatic = stdenv.buildPlatform != stdenv.hostPlatform; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/westes/flex"; description = "A fast lexical analyser generator"; license = licenses.bsd2; diff --git a/pkgs/development/tools/parsing/flexc++/default.nix b/pkgs/development/tools/parsing/flexc++/default.nix index a9482f9fd493..e4db5631e7fe 100644 --- a/pkgs/development/tools/parsing/flexc++/default.nix +++ b/pkgs/development/tools/parsing/flexc++/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, bobcat, icmake, yodl }: +{ lib, stdenv, fetchFromGitHub, bobcat, icmake, yodl }: stdenv.mkDerivation rec { pname = "flexc++"; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ./build install x ''; - meta = with stdenv.lib; { + meta = with lib; { description = "C++ tool for generating lexical scanners"; longDescription = '' Flexc++ was designed after `flex'. Flexc++ offers a cleaner class design diff --git a/pkgs/development/tools/parsing/hammer/default.nix b/pkgs/development/tools/parsing/hammer/default.nix index d36dfa9219d4..b6cb2447710c 100644 --- a/pkgs/development/tools/parsing/hammer/default.nix +++ b/pkgs/development/tools/parsing/hammer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, glib, pkgconfig, python, scons }: +{ lib, stdenv, fetchgit, glib, pkgconfig, python, scons }: stdenv.mkDerivation { pname = "hammer"; @@ -13,7 +13,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ glib python scons ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A bit-oriented parser combinator library"; longDescription = '' Hammer is a parsing library. Like many modern parsing libraries, diff --git a/pkgs/development/tools/parsing/jikespg/default.nix b/pkgs/development/tools/parsing/jikespg/default.nix index 18dd531e4b14..34e628866838 100644 --- a/pkgs/development/tools/parsing/jikespg/default.nix +++ b/pkgs/development/tools/parsing/jikespg/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation rec { name = "jikespg-1.3"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { cp jikespg $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://jikes.sourceforge.net/"; description = "The Jikes Parser Generator"; platforms = platforms.linux; diff --git a/pkgs/development/tools/parsing/lemon/default.nix b/pkgs/development/tools/parsing/lemon/default.nix index b10e98909517..3db9e0f6d9ed 100644 --- a/pkgs/development/tools/parsing/lemon/default.nix +++ b/pkgs/development/tools/parsing/lemon/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: let @@ -30,7 +30,7 @@ in stdenv.mkDerivation { install -Dvm644 ${srcs.lempar} $out/bin/lempar.c ''; - meta = with stdenv.lib; { + meta = with lib; { description = "An LALR(1) parser generator"; longDescription = '' The Lemon program is an LALR(1) parser generator that takes a diff --git a/pkgs/development/tools/parsing/peg/default.nix b/pkgs/development/tools/parsing/peg/default.nix index 458ddc007f5e..a7ffeb697459 100644 --- a/pkgs/development/tools/parsing/peg/default.nix +++ b/pkgs/development/tools/parsing/peg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "peg-0.1.18"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { preBuild="makeFlagsArray+=( PREFIX=$out )"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://piumarta.com/software/peg/"; description = "Tools for generating recursive-descent parsers: programs that perform pattern matching on text"; platforms = platforms.all; diff --git a/pkgs/development/tools/parsing/ragel/default.nix b/pkgs/development/tools/parsing/ragel/default.nix index dddddba129c9..fd7308097110 100644 --- a/pkgs/development/tools/parsing/ragel/default.nix +++ b/pkgs/development/tools/parsing/ragel/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, transfig, tex, ghostscript, colm +{ lib, stdenv, fetchurl, transfig, tex, ghostscript, colm , build-manual ? false }: @@ -25,7 +25,7 @@ let doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.colm.net/open-source/ragel/"; description = "State machine compiler"; inherit license; diff --git a/pkgs/development/tools/parsing/re2c/default.nix b/pkgs/development/tools/parsing/re2c/default.nix index 482beeff1221..665609fe90af 100644 --- a/pkgs/development/tools/parsing/re2c/default.nix +++ b/pkgs/development/tools/parsing/re2c/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook }: stdenv.mkDerivation rec { pname = "re2c"; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { patchShebangs run_tests.sh ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Tool for writing very fast and very flexible scanners"; homepage = "http://re2c.org"; license = licenses.publicDomain; diff --git a/pkgs/development/tools/parsing/tree-sitter/default.nix b/pkgs/development/tools/parsing/tree-sitter/default.nix index 72150b5ac0bf..78fb3b7f937f 100644 --- a/pkgs/development/tools/parsing/tree-sitter/default.nix +++ b/pkgs/development/tools/parsing/tree-sitter/default.nix @@ -5,8 +5,8 @@ , Security , callPackage -, enableShared ? true -, enableStatic ? false +, enableShared ? !stdenv.hostPlatform.isStatic +, enableStatic ? stdenv.hostPlatform.isStatic , webUISupport ? false }: diff --git a/pkgs/development/tools/pax-rs/default.nix b/pkgs/development/tools/pax-rs/default.nix index 6aa38104bcac..cda3ba5e8a8b 100644 --- a/pkgs/development/tools/pax-rs/default.nix +++ b/pkgs/development/tools/pax-rs/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchFromGitHub, fetchurl, rustPlatform, runCommand } : +{ lib, stdenv, fetchFromGitHub, fetchurl, rustPlatform, runCommand } : with rustPlatform; buildRustPackage rec { pname = "pax-rs"; version = "0.4.0"; - meta = with stdenv.lib; { + meta = with lib; { description = "The fastest JavaScript bundler in the galaxy"; longDescription = '' The fastest JavaScript bundler in the galaxy. Fully supports ECMAScript module syntax (import/export) in addition to CommonJS require(). diff --git a/pkgs/development/tools/pew/default.nix b/pkgs/development/tools/pew/default.nix index a7fabb783951..6ca94041bb50 100644 --- a/pkgs/development/tools/pew/default.nix +++ b/pkgs/development/tools/pew/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python3 }: +{ lib, stdenv, python3 }: with python3.pkgs; @@ -20,7 +20,7 @@ buildPythonApplication rec { pythonImportsCheck = [ "pew" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/berdario/pew"; description = "Tools to manage multiple virtualenvs written in pure python"; license = licenses.mit; diff --git a/pkgs/development/tools/pgformatter/default.nix b/pkgs/development/tools/pgformatter/default.nix index 1cd9f9ea17ba..0e3e1b7e9ca6 100644 --- a/pkgs/development/tools/pgformatter/default.nix +++ b/pkgs/development/tools/pgformatter/default.nix @@ -1,4 +1,4 @@ -{ stdenv, perlPackages, fetchFromGitHub, shortenPerlShebang }: +{ lib, stdenv, perlPackages, fetchFromGitHub, shortenPerlShebang }: perlPackages.buildPerlPackage rec { pname = "pgformatter"; @@ -31,7 +31,7 @@ perlPackages.buildPerlPackage rec { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "A PostgreSQL SQL syntax beautifier that can work as a console program or as a CGI"; homepage = "https://github.com/darold/pgFormatter"; changelog = "https://github.com/darold/pgFormatter/releases/tag/v${version}"; diff --git a/pkgs/development/tools/pgloader/default.nix b/pkgs/development/tools/pgloader/default.nix index 6d4bcaadd118..0e16726bb807 100644 --- a/pkgs/development/tools/pgloader/default.nix +++ b/pkgs/development/tools/pgloader/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, sbcl, sqlite, freetds, libzip, curl, git, cacert, openssl }: +{ lib, stdenv, fetchurl, makeWrapper, sbcl, sqlite, freetds, libzip, curl, git, cacert, openssl }: stdenv.mkDerivation rec { pname = "pgloader"; version = "3.6.2"; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/pgloader --prefix LD_LIBRARY_PATH : "${LD_LIBRARY_PATH}" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://pgloader.io/"; description = "Loads data into PostgreSQL and allows you to implement Continuous Migration from your current database to PostgreSQL"; maintainers = with maintainers; [ mguentner ]; diff --git a/pkgs/development/tools/phantomjs2/default.nix b/pkgs/development/tools/phantomjs2/default.nix index d565a70798ae..9fc2f416b767 100644 --- a/pkgs/development/tools/phantomjs2/default.nix +++ b/pkgs/development/tools/phantomjs2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch +{ lib, stdenv, fetchFromGitHub, fetchpatch , bison, flex, fontconfig, freetype, gperf, icu, openssl, libjpeg , libpng, perl, python, ruby, sqlite, qtwebkit, qmake, qtbase , darwin, writeScriptBin, cups, makeWrapper @@ -95,7 +95,7 @@ in stdenv.mkDerivation rec { --prefix PATH : ${stdenv.lib.makeBinPath [ qtbase ]} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Headless WebKit with JavaScript API"; longDescription = '' PhantomJS2 is a headless WebKit with JavaScript API. diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix b/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix index 16d66c48af8b..22627f3df1bc 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix @@ -407,7 +407,7 @@ self: super: export LLVM_CONFIG=${pkgs.llvm}/bin/llvm-config ''; - __impureHostDeps = pkgs.stdenv.lib.optionals pkgs.stdenv.isDarwin [ "/usr/lib/libm.dylib" ]; + __impureHostDeps = pkgs.lib.optionals pkgs.stdenv.isDarwin [ "/usr/lib/libm.dylib" ]; passthru = old.passthru // { llvm = pkgs.llvm; }; } diff --git a/pkgs/development/tools/postiats-utilities/default.nix b/pkgs/development/tools/postiats-utilities/default.nix index 4b6d230becd6..b9ca9ae57814 100644 --- a/pkgs/development/tools/postiats-utilities/default.nix +++ b/pkgs/development/tools/postiats-utilities/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python3, python3Packages }: +{ lib, stdenv, fetchurl, python3, python3Packages }: stdenv.mkDerivation { name = "postiats-utilities-2.0.1"; @@ -7,7 +7,7 @@ stdenv.mkDerivation { sha256 = "12jlzqigmaa9m37x0nq5v3gq8v61m73i5kzdnsm06chf0przpaix"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/Hibou57/PostiATS-Utilities"; license = licenses.bsd2; platforms = platforms.linux; diff --git a/pkgs/development/tools/profiling/pprof/default.nix b/pkgs/development/tools/profiling/pprof/default.nix index 2618dd3ef1ec..dd2345378d43 100644 --- a/pkgs/development/tools/profiling/pprof/default.nix +++ b/pkgs/development/tools/profiling/pprof/default.nix @@ -1,5 +1,5 @@ # This file was originally generated by https://github.com/kamilchm/go2nix v1.2.1 -{ stdenv, buildGoPackage, fetchgit }: +{ lib, stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { pname = "pprof-unstable"; @@ -16,7 +16,7 @@ buildGoPackage rec { goDeps = ./deps.nix; - meta = with stdenv.lib; { + meta = with lib; { description = "A tool for visualization and analysis of profiling data"; homepage = "https://github.com/google/pprof"; license = licenses.asl20; diff --git a/pkgs/development/tools/profiling/sysprof/default.nix b/pkgs/development/tools/profiling/sysprof/default.nix index 49b8e88486ca..6974800e87f8 100644 --- a/pkgs/development/tools/profiling/sysprof/default.nix +++ b/pkgs/development/tools/profiling/sysprof/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "System-wide profiler for Linux"; homepage = "https://wiki.gnome.org/Apps/Sysprof"; longDescription = '' diff --git a/pkgs/development/tools/pry/Gemfile.lock b/pkgs/development/tools/pry/Gemfile.lock index d76845bc05a7..87f7e81fbe3a 100644 --- a/pkgs/development/tools/pry/Gemfile.lock +++ b/pkgs/development/tools/pry/Gemfile.lock @@ -1,11 +1,11 @@ GEM remote: https://rubygems.org/ specs: - coderay (1.1.2) - method_source (0.9.2) - pry (0.12.2) - coderay (~> 1.1.0) - method_source (~> 0.9.0) + coderay (1.1.3) + method_source (1.0.0) + pry (0.13.1) + coderay (~> 1.1) + method_source (~> 1.0) PLATFORMS ruby diff --git a/pkgs/development/tools/pry/gemset.nix b/pkgs/development/tools/pry/gemset.nix index e779c48aebfc..05e5e1dcfb85 100644 --- a/pkgs/development/tools/pry/gemset.nix +++ b/pkgs/development/tools/pry/gemset.nix @@ -4,20 +4,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15vav4bhcc2x3jmi3izb11l4d9f3xv8hp2fszb7iqmpsccv1pz4y"; + sha256 = "0jvxqxzply1lwp7ysn94zjhh57vc14mcshw1ygw14ib8lhc00lyw"; type = "gem"; }; - version = "1.1.2"; + version = "1.1.3"; }; method_source = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pviwzvdqd90gn6y7illcdd9adapw8fczml933p5vl739dkvl3lq"; + sha256 = "1pnyh44qycnf9mzi1j6fywd5fkskv3x7nmsqrrws0rjn5dd4ayfp"; type = "gem"; }; - version = "0.9.2"; + version = "1.0.0"; }; pry = { dependencies = ["coderay" "method_source"]; @@ -25,9 +25,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00rm71x0r1jdycwbs83lf9l6p494m99asakbvqxh8rz7zwnlzg69"; + sha256 = "0iyw4q4an2wmk8v5rn2ghfy2jaz9vmw2nk8415nnpx2s866934qk"; type = "gem"; }; - version = "0.12.2"; + version = "0.13.1"; }; } \ No newline at end of file diff --git a/pkgs/development/tools/purescript/spago/spago.nix b/pkgs/development/tools/purescript/spago/spago.nix index 43f8e66d8704..ed0ce05843bb 100644 --- a/pkgs/development/tools/purescript/spago/spago.nix +++ b/pkgs/development/tools/purescript/spago/spago.nix @@ -1,35 +1,36 @@ { mkDerivation, aeson, aeson-pretty, ansi-terminal, async-pool -, base, bower-json, bytestring, Cabal, containers, dhall, directory -, either, exceptions, extra, fetchgit, file-embed, filepath, foldl -, fsnotify, generic-lens, github, Glob, hpack, hspec -, hspec-discover, hspec-megaparsec, http-client, http-conduit -, http-types, lens-family-core, megaparsec, mtl, network-uri -, open-browser, optparse-applicative, prettyprinter, process -, QuickCheck, retry, rio, rio-orphans, safe, semver-range, stdenv -, stm, stringsearch, tar, template-haskell, temporary, text, time -, transformers, turtle, unliftio, unordered-containers, utf8-string -, vector, versions, with-utf8, zlib +, base, bower-json, bytestring, Cabal, containers, cryptonite +, dhall, directory, either, exceptions, extra, fetchgit, file-embed +, filepath, foldl, fsnotify, generic-lens, github, Glob, hpack +, hspec, hspec-discover, hspec-megaparsec, http-client +, http-conduit, http-types, lens-family-core, megaparsec, mtl +, network-uri, open-browser, optparse-applicative, prettyprinter +, process, QuickCheck, retry, rio, rio-orphans, safe, semver-range +, stdenv, stm, stringsearch, tar, template-haskell, temporary, text +, time, transformers, turtle, unliftio, unordered-containers +, utf8-string, vector, versions, with-utf8, zlib }: mkDerivation { pname = "spago"; - version = "0.18.0"; + version = "0.19.0"; src = fetchgit { url = "https://github.com/purescript/spago.git"; - sha256 = "03ww7qhrggwsbm0kcnvcr3ifb8rm860ajimzr81isiw46ykwrl38"; - rev = "a4d39c21cae2f2c6d43fa204853c8e17c72904d2"; + sha256 = "182a9pkv64rbyqrig470cmql4ingf5vpxh11xkxqq2baxym3vwip"; + rev = "960a310d6efca3bb40009eb06d88382e4670ccef"; fetchSubmodules = true; }; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson aeson-pretty ansi-terminal async-pool base bower-json - bytestring Cabal containers dhall directory either exceptions - file-embed filepath foldl fsnotify generic-lens github Glob - http-client http-conduit http-types lens-family-core megaparsec mtl - network-uri open-browser optparse-applicative prettyprinter process - retry rio rio-orphans safe semver-range stm stringsearch tar - template-haskell temporary text time transformers turtle unliftio - unordered-containers utf8-string vector versions with-utf8 zlib + bytestring Cabal containers cryptonite dhall directory either + exceptions file-embed filepath foldl fsnotify generic-lens github + Glob http-client http-conduit http-types lens-family-core + megaparsec mtl network-uri open-browser optparse-applicative + prettyprinter process retry rio rio-orphans safe semver-range stm + stringsearch tar template-haskell temporary text time transformers + turtle unliftio unordered-containers utf8-string vector versions + with-utf8 zlib ]; libraryToolDepends = [ hpack ]; executableHaskellDepends = [ base text turtle with-utf8 ]; diff --git a/pkgs/development/tools/pxview/default.nix b/pkgs/development/tools/pxview/default.nix index 6b11071b6fa3..30d109beb970 100644 --- a/pkgs/development/tools/pxview/default.nix +++ b/pkgs/development/tools/pxview/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, perl, perlPackages, pxlib }: +{ lib, stdenv, fetchurl, pkgconfig, perl, perlPackages, pxlib }: stdenv.mkDerivation rec { pname = "pxview"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { LDFLAGS = "-lm"; hardeningDisable = [ "format" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Program to convert Paradox databases"; homepage = "http://pxlib.sourceforge.net/pxview/"; license = licenses.gpl2; diff --git a/pkgs/development/tools/py-spy/default.nix b/pkgs/development/tools/py-spy/default.nix index 5e1dcbfa6fce..5edd73eba950 100644 --- a/pkgs/development/tools/py-spy/default.nix +++ b/pkgs/development/tools/py-spy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgsBuildBuild, rustPlatform, fetchFromGitHub, pkgconfig, libunwind, python3 }: +{ lib, stdenv, pkgsBuildBuild, rustPlatform, fetchFromGitHub, pkgconfig, libunwind, python3 }: rustPlatform.buildRustPackage rec { pname = "py-spy"; @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0hrzmpwd2k4l8gjbry8ddrkv9q9qh8ag096md4q0fyn5bgnxhkah"; - meta = with stdenv.lib; { + meta = with lib; { description = "Sampling profiler for Python programs"; license = licenses.mit; maintainers = [ maintainers.lnl7 ]; diff --git a/pkgs/development/tools/quicktemplate/default.nix b/pkgs/development/tools/quicktemplate/default.nix index cb9b4f950c92..4edb60d11a15 100644 --- a/pkgs/development/tools/quicktemplate/default.nix +++ b/pkgs/development/tools/quicktemplate/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "quicktemplate"; @@ -13,7 +13,7 @@ buildGoModule rec { vendorSha256 = null; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/valyala/quicktemplate"; description = "Fast, powerful, yet easy to use template engine for Go"; license = licenses.mit; diff --git a/pkgs/development/tools/rdbtools/default.nix b/pkgs/development/tools/rdbtools/default.nix index 624434101d99..5674876daba6 100644 --- a/pkgs/development/tools/rdbtools/default.nix +++ b/pkgs/development/tools/rdbtools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python }: +{ lib, stdenv, python }: with python.pkgs; @@ -16,7 +16,7 @@ buildPythonApplication rec { # No tests in published package doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Parse Redis dump.rdb files, Analyze Memory, and Export Data to JSON"; homepage = "https://github.com/sripathikrishnan/redis-rdb-tools"; license = licenses.mit; diff --git a/pkgs/development/tools/rdocker/default.nix b/pkgs/development/tools/rdocker/default.nix index 60df0df10031..16e832a99b84 100644 --- a/pkgs/development/tools/rdocker/default.nix +++ b/pkgs/development/tools/rdocker/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, makeWrapper, openssh }: +{ lib, stdenv, fetchFromGitHub, makeWrapper, openssh }: stdenv.mkDerivation { pname = "rdocker"; @@ -22,7 +22,7 @@ stdenv.mkDerivation { --prefix PATH : ${stdenv.lib.makeBinPath [ openssh ]} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Securely control a remote docker daemon CLI using ssh forwarding, no SSL setup needed"; homepage = "https://github.com/dvddarias/rdocker"; maintainers = [ stdenv.lib.maintainers.pneumaticat ]; diff --git a/pkgs/development/tools/react-native-debugger/default.nix b/pkgs/development/tools/react-native-debugger/default.nix index 6ee5e884ea2d..f5174da13a1b 100644 --- a/pkgs/development/tools/react-native-debugger/default.nix +++ b/pkgs/development/tools/react-native-debugger/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, cairo, xorg, gdk-pixbuf, fontconfig, pango, gnome3, atk, at-spi2-atk, at-spi2-core +{ lib, stdenv, fetchurl, unzip, cairo, xorg, gdk-pixbuf, fontconfig, pango, gnome3, atk, at-spi2-atk, at-spi2-core , gtk3, glib, freetype, dbus, nss, nspr, alsaLib, cups, expat, udev, makeDesktopItem }: @@ -73,7 +73,7 @@ in stdenv.mkDerivation rec { categories = "Development;Debugger;"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/jhen0409/react-native-debugger"; license = licenses.mit; description = "The standalone app based on official debugger of React Native, and includes React Inspector / Redux DevTools"; diff --git a/pkgs/development/tools/remarshal/default.nix b/pkgs/development/tools/remarshal/default.nix index d28ca286f086..c37779a5293b 100644 --- a/pkgs/development/tools/remarshal/default.nix +++ b/pkgs/development/tools/remarshal/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python3Packages }: +{ lib, stdenv, python3Packages }: python3Packages.buildPythonApplication rec { pname = "remarshal"; @@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec { pyyaml cbor2 dateutil tomlkit u-msgpack-python ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Convert between TOML, YAML and JSON"; license = licenses.mit; homepage = "https://github.com/dbohdan/remarshal"; diff --git a/pkgs/development/tools/renderizer/default.nix b/pkgs/development/tools/renderizer/default.nix index 2b2c57135cb0..747e80adf4f2 100644 --- a/pkgs/development/tools/renderizer/default.nix +++ b/pkgs/development/tools/renderizer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "renderizer"; @@ -15,7 +15,7 @@ buildGoModule rec { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "CLI to render Go template text files"; inherit (src.meta) homepage; license = licenses.gpl3; diff --git a/pkgs/development/tools/reno/default.nix b/pkgs/development/tools/reno/default.nix index b05bb2cd26a3..17a334aba205 100644 --- a/pkgs/development/tools/reno/default.nix +++ b/pkgs/development/tools/reno/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , git , gnupg1 , python3Packages @@ -49,7 +49,7 @@ with python3Packages; buildPythonApplication rec { $out/bin/reno -h ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Release Notes Manager"; homepage = "https://docs.openstack.org/reno/latest"; license = licenses.asl20; diff --git a/pkgs/development/tools/rep/default.nix b/pkgs/development/tools/rep/default.nix index d24056f1d02b..bc73c3927771 100644 --- a/pkgs/development/tools/rep/default.nix +++ b/pkgs/development/tools/rep/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, asciidoc-full }: +{ lib, stdenv, fetchFromGitHub, asciidoc-full }: stdenv.mkDerivation rec { pname = "rep"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ''; makeFlags = [ "prefix=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Single-shot nREPL client"; homepage = "https://github.com/eraserhd/rep"; license = licenses.epl10; diff --git a/pkgs/development/tools/repository-managers/nexus/default.nix b/pkgs/development/tools/repository-managers/nexus/default.nix index 1b4509a4057b..ad83b0f30c7a 100644 --- a/pkgs/development/tools/repository-managers/nexus/default.nix +++ b/pkgs/development/tools/repository-managers/nexus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, jre_headless, gawk }: +{ lib, stdenv, fetchurl, makeWrapper, jre_headless, gawk }: stdenv.mkDerivation rec { pname = "nexus"; @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Repository manager for binary software components"; homepage = "http://www.sonatype.org/nexus"; license = licenses.epl10; diff --git a/pkgs/development/tools/richgo/default.nix b/pkgs/development/tools/richgo/default.nix index 441c0d8bdf1d..1013c4aa8b43 100644 --- a/pkgs/development/tools/richgo/default.nix +++ b/pkgs/development/tools/richgo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "richgo"; @@ -17,7 +17,7 @@ buildGoModule rec { subPackages = [ "." ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Enrich `go test` outputs with text decorations"; homepage = "https://github.com/kyoh86/richgo"; license = licenses.mit; diff --git a/pkgs/development/tools/rtags/default.nix b/pkgs/development/tools/rtags/default.nix index 0ebeab72df3f..464178a11d62 100644 --- a/pkgs/development/tools/rtags/default.nix +++ b/pkgs/development/tools/rtags/default.nix @@ -25,8 +25,6 @@ stdenv.mkDerivation rec { LIBCLANG_LIBDIR="${llvmPackages.clang.cc}/lib" ''; - enableParallelBuilding = true; - meta = { description = "C/C++ client-server indexer based on clang"; homepage = "https://github.com/andersbakken/rtags"; diff --git a/pkgs/development/tools/rubocop/Gemfile.lock b/pkgs/development/tools/rubocop/Gemfile.lock index 6b6a3a995918..74ae51427a95 100644 --- a/pkgs/development/tools/rubocop/Gemfile.lock +++ b/pkgs/development/tools/rubocop/Gemfile.lock @@ -2,25 +2,25 @@ GEM remote: https://rubygems.org/ specs: ast (2.4.1) - parallel (1.19.2) - parser (2.7.2.0) + parallel (1.20.1) + parser (3.0.0.0) ast (~> 2.4.1) rainbow (3.0.0) - regexp_parser (1.8.2) + regexp_parser (2.0.3) rexml (3.2.4) - rubocop (1.1.0) + rubocop (1.8.0) parallel (~> 1.10) - parser (>= 2.7.1.5) + parser (>= 3.0.0.0) rainbow (>= 2.2.2, < 4.0) - regexp_parser (>= 1.8) + regexp_parser (>= 1.8, < 3.0) rexml - rubocop-ast (>= 1.0.1) + rubocop-ast (>= 1.2.0, < 2.0) ruby-progressbar (~> 1.7) - unicode-display_width (>= 1.4.0, < 2.0) - rubocop-ast (1.1.0) + unicode-display_width (>= 1.4.0, < 3.0) + rubocop-ast (1.4.0) parser (>= 2.7.1.5) - ruby-progressbar (1.10.1) - unicode-display_width (1.7.0) + ruby-progressbar (1.11.0) + unicode-display_width (2.0.0) PLATFORMS ruby diff --git a/pkgs/development/tools/rubocop/gemset.nix b/pkgs/development/tools/rubocop/gemset.nix index c1f55f7aca27..e22424c1ae6b 100644 --- a/pkgs/development/tools/rubocop/gemset.nix +++ b/pkgs/development/tools/rubocop/gemset.nix @@ -14,10 +14,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17b127xxmm2yqdz146qwbs57046kn0js1h8synv01dwqz2z1kp2l"; + sha256 = "0055br0mibnqz0j8wvy20zry548dhkakws681bhj3ycb972awkzd"; type = "gem"; }; - version = "1.19.2"; + version = "1.20.1"; }; parser = { dependencies = ["ast"]; @@ -25,10 +25,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1f7gmm60yla325wlnd3qkxs59qm2y0aan8ljpg6k18rwzrrfil6z"; + sha256 = "1jixakyzmy0j5c1rb0fjrrdhgnyryvrr6vgcybs14jfw09akv5ml"; type = "gem"; }; - version = "2.7.2.0"; + version = "3.0.0.0"; }; rainbow = { groups = ["default"]; @@ -45,10 +45,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0x4s82lgf0l71y3xc9gp4qxkrgx1kv8f6avdqd68l46ijbyvicdm"; + sha256 = "0zm86k9q8m5jkcnpb1f93wsvc57saldfj8czxkx1aw031i95inip"; type = "gem"; }; - version = "1.8.2"; + version = "2.0.3"; }; rexml = { groups = ["default"]; @@ -66,10 +66,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nw87ngw4a9r3dpgykb872zcm640m7k0nk17qv537fmss2hl8shl"; + sha256 = "12arfnsj32126ps6mxbn7dwrw43cy70sq45rm0ib7qfrmhp5qyid"; type = "gem"; }; - version = "1.1.0"; + version = "1.8.0"; }; rubocop-ast = { dependencies = ["parser"]; @@ -77,29 +77,29 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ami6n3vnpm9y5z6wd4c6y2infijajizjjwv8fq0wrcjvr3zivzz"; + sha256 = "1qvfp567aprjgcwj757p55ynj0dx2b3c3hd76za9z3c43sphprcj"; type = "gem"; }; - version = "1.1.0"; + version = "1.4.0"; }; ruby-progressbar = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1k77i0d4wsn23ggdd2msrcwfy0i376cglfqypkk2q77r2l3408zf"; + sha256 = "02nmaw7yx9kl7rbaan5pl8x5nn0y4j5954mzrkzi9i3dhsrps4nc"; type = "gem"; }; - version = "1.10.1"; + version = "1.11.0"; }; unicode-display_width = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06i3id27s60141x6fdnjn5rar1cywdwy64ilc59cz937303q3mna"; + sha256 = "1bilbnc8j6jkb59lrf177i3p1pdyxll0n8400hzqr35vl3r3kv2m"; type = "gem"; }; - version = "1.7.0"; + version = "2.0.0"; }; } \ No newline at end of file diff --git a/pkgs/development/tools/rucksack/default.nix b/pkgs/development/tools/rucksack/default.nix index 2734cdd3596e..1aad7a5c8da1 100644 --- a/pkgs/development/tools/rucksack/default.nix +++ b/pkgs/development/tools/rucksack/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, liblaxjson, cmake, freeimage }: +{ lib, stdenv, fetchFromGitHub, liblaxjson, cmake, freeimage }: stdenv.mkDerivation rec { version = "3.1.0"; @@ -11,9 +11,10 @@ stdenv.mkDerivation rec { sha256 = "0bcm20hqxqnq1j0zghb9i7z9frri6bbf7rmrv5g8dd626sq07vyv"; }; - buildInputs = [ cmake liblaxjson freeimage ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ liblaxjson freeimage ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Texture packer and resource bundler"; platforms = [ "i686-linux" "x86_64-linux" ]; # fails on Darwin and AArch64 homepage = "https://github.com/andrewrk/rucksack"; diff --git a/pkgs/development/tools/run/default.nix b/pkgs/development/tools/run/default.nix index 7ec08d02020a..a0c169d84661 100644 --- a/pkgs/development/tools/run/default.nix +++ b/pkgs/development/tools/run/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "run"; version = "0.7.2"; @@ -14,7 +14,7 @@ buildGoModule rec { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Easily manage and invoke small scripts and wrappers"; homepage = "https://github.com/TekWizely/run"; license = licenses.mit; diff --git a/pkgs/development/tools/rund/default.nix b/pkgs/development/tools/rund/default.nix index 9a7ac0b63244..0752f803c3c9 100644 --- a/pkgs/development/tools/rund/default.nix +++ b/pkgs/development/tools/rund/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { mv $NIX_BUILD_TOP/rund $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A compiler-wrapper that runs and caches D programs"; homepage = "https://github.com/dragon-lang/rund"; license = lib.licenses.boost; diff --git a/pkgs/development/tools/rust/bindgen/default.nix b/pkgs/development/tools/rust/bindgen/default.nix index 01e29036dbc7..0330edb4804b 100644 --- a/pkgs/development/tools/rust/bindgen/default.nix +++ b/pkgs/development/tools/rust/bindgen/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform, clang, llvmPackages, rustfmt, writeScriptBin, +{ lib, stdenv, fetchFromGitHub, rustPlatform, clang, llvmPackages, rustfmt, writeScriptBin, runtimeShell }: rustPlatform.buildRustPackage rec { @@ -50,7 +50,7 @@ rustPlatform.buildRustPackage rec { patchShebangs . ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Automatically generates Rust FFI bindings to C (and some C++) libraries"; longDescription = '' Bindgen takes a c or c++ header file and turns them into diff --git a/pkgs/development/tools/rust/cargo-asm/default.nix b/pkgs/development/tools/rust/cargo-asm/default.nix index 76b49056a3f2..490fa9e09c37 100644 --- a/pkgs/development/tools/rust/cargo-asm/default.nix +++ b/pkgs/development/tools/rust/cargo-asm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform, Security }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, Security }: rustPlatform.buildRustPackage rec { pname = "cargo-asm"; @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { # LLVM/compiler versions. doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Display the assembly or LLVM-IR generated for Rust source code"; homepage = "https://github.com/gnzlbg/cargo-asm"; license = licenses.mit; diff --git a/pkgs/development/tools/rust/cargo-c/default.nix b/pkgs/development/tools/rust/cargo-c/default.nix index ee0074f7d839..ce57194bc49b 100644 --- a/pkgs/development/tools/rust/cargo-c/default.nix +++ b/pkgs/development/tools/rust/cargo-c/default.nix @@ -5,7 +5,7 @@ rustPlatform.buildRustPackage rec { pname = "cargo-c"; - version = "0.6.18"; + version = "0.7.0"; src = stdenv.mkDerivation rec { name = "${pname}-source-${version}"; @@ -14,11 +14,11 @@ rustPlatform.buildRustPackage rec { owner = "lu-zero"; repo = pname; rev = "v${version}"; - sha256 = "1dh5z210nl8grjxb8zxch8h7799w61bah7r2j0s07091rcpfsrsb"; + sha256 = "0pd1vnpy29fxmf47pvkyxd6bydar8cykfjx0f1bbw3gfk7vychbj"; }; cargoLock = fetchurl { url = "https://github.com/lu-zero/${pname}/releases/download/v${version}/Cargo.lock"; - sha256 = "1h5wmfmm2a2ilyw3ar88rqm7yvdc2vhyx4pgg781615ax52fhjli"; + sha256 = "10xhd5m63r928gfvr4djmis30mra8wdsx55kgin9kiig2kylx69h"; }; installPhase = '' @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoSha256 = "0ll9p2rbnw46zd9m2bmdmn99v9jjjf8i33xpkvd1rx42ki7sys62"; + cargoSha256 = "1axg0kr8xsb5fm3r8qgc7s3g70pa8g9vc68d6icm7ms77phczx4r"; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] diff --git a/pkgs/development/tools/rust/cargo-cache/default.nix b/pkgs/development/tools/rust/cargo-cache/default.nix index 3271e7951fac..ade568df6741 100644 --- a/pkgs/development/tools/rust/cargo-cache/default.nix +++ b/pkgs/development/tools/rust/cargo-cache/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform, libiconv, Security }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, libiconv, Security }: rustPlatform.buildRustPackage rec { pname = "cargo-cache"; @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { checkFlagsArray = [ "offline_tests" ]; - meta = with stdenv.lib; { + meta = with 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 ]; diff --git a/pkgs/development/tools/rust/cargo-crev/default.nix b/pkgs/development/tools/rust/cargo-crev/default.nix index 6c85a5238039..29d8dfdead54 100644 --- a/pkgs/development/tools/rust/cargo-crev/default.nix +++ b/pkgs/development/tools/rust/cargo-crev/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , rustPlatform , perl @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ Security libiconv curl ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A cryptographically verifiable code review system for the cargo (Rust) package manager"; homepage = "https://github.com/crev-dev/cargo-crev"; license = with licenses; [ asl20 mit mpl20 ]; diff --git a/pkgs/development/tools/rust/cargo-fund/default.nix b/pkgs/development/tools/rust/cargo-fund/default.nix index 06f99268d0b7..4e30ea48272d 100644 --- a/pkgs/development/tools/rust/cargo-fund/default.nix +++ b/pkgs/development/tools/rust/cargo-fund/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkg-config, rustPlatform, Security, curl, openssl, libiconv }: +{ lib, stdenv, fetchFromGitHub, pkg-config, rustPlatform, Security, curl, openssl, libiconv }: rustPlatform.buildRustPackage rec { pname = "cargo-fund"; @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ Security libiconv curl ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Discover funding links for your project's dependencies"; homepage = "https://github.com/acfoltzer/cargo-fund"; license = with licenses; [ mit /* or */ asl20 ]; diff --git a/pkgs/development/tools/rust/cargo-fuzz/default.nix b/pkgs/development/tools/rust/cargo-fuzz/default.nix index 14c849ac0afe..904ba6efb52b 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, rustPlatform }: +{ lib, stdenv, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { pname = "cargo-fuzz"; @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Command line helpers for fuzzing"; homepage = "https://github.com/rust-fuzz/cargo-fuzz"; license = with licenses; [ mit asl20 ]; diff --git a/pkgs/development/tools/rust/cargo-generate/default.nix b/pkgs/development/tools/rust/cargo-generate/default.nix index 5f803635dd2e..21b986f9a5da 100644 --- a/pkgs/development/tools/rust/cargo-generate/default.nix +++ b/pkgs/development/tools/rust/cargo-generate/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform, Security, openssl, pkgconfig, libiconv, curl }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, Security, openssl, pkgconfig, libiconv, curl }: rustPlatform.buildRustPackage rec { pname = "cargo-generate"; @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { git config --global user.email nixbld@localhost.localnet ''; - meta = with stdenv.lib; { + meta = with lib; { description = "cargo, make me a project"; homepage = "https://github.com/ashleygwilliams/cargo-generate"; license = licenses.asl20; diff --git a/pkgs/development/tools/rust/cargo-make/default.nix b/pkgs/development/tools/rust/cargo-make/default.nix index 881a53872c96..e10590f5e593 100644 --- a/pkgs/development/tools/rust/cargo-make/default.nix +++ b/pkgs/development/tools/rust/cargo-make/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, runCommand, fetchCrate, rustPlatform, Security, openssl, pkg-config +{ lib, stdenv, fetchurl, runCommand, fetchCrate, rustPlatform, Security, openssl, pkg-config , SystemConfiguration }: @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { # https://travis-ci.org/sagiegurari/cargo-make doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "A Rust task runner and build tool"; homepage = "https://github.com/sagiegurari/cargo-make"; license = licenses.asl20; diff --git a/pkgs/development/tools/rust/cargo-raze/default.nix b/pkgs/development/tools/rust/cargo-raze/default.nix index 8df03a4bd15c..6f06648a057a 100644 --- a/pkgs/development/tools/rust/cargo-raze/default.nix +++ b/pkgs/development/tools/rust/cargo-raze/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform +{ lib, stdenv, fetchFromGitHub, rustPlatform , pkgconfig, curl, libgit2, openssl, Security }: rustPlatform.buildRustPackage rec { @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Generate Bazel BUILD files from Cargo dependencies"; homepage = "https://github.com/google/cargo-raze"; license = licenses.asl20; diff --git a/pkgs/development/tools/rust/cargo-sweep/default.nix b/pkgs/development/tools/rust/cargo-sweep/default.nix index 72883ab4508e..210449a72300 100644 --- a/pkgs/development/tools/rust/cargo-sweep/default.nix +++ b/pkgs/development/tools/rust/cargo-sweep/default.nix @@ -1,4 +1,4 @@ -{ stdenv, rustPlatform, fetchFromGitHub }: +{ lib, stdenv, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "cargo-sweep"; @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1sxjc64g8h77a3dvzb99f1f72zrak1nh4jgfjfkw4yc4dhkpyrmz"; - meta = with stdenv.lib; { + meta = with lib; { description = "A Cargo subcommand for cleaning up unused build files generated by Cargo"; homepage = "https://github.com/holmgr/cargo-sweep"; license = licenses.mit; diff --git a/pkgs/development/tools/rust/cargo-sync-readme/default.nix b/pkgs/development/tools/rust/cargo-sync-readme/default.nix index f42868826d55..45ea6c430d15 100644 --- a/pkgs/development/tools/rust/cargo-sync-readme/default.nix +++ b/pkgs/development/tools/rust/cargo-sync-readme/default.nix @@ -1,4 +1,4 @@ -{ stdenv, rustPlatform, fetchFromGitHub }: +{ lib, stdenv, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "cargo-sync-readme"; @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1x15q6wv5278hm3ns2wmw4i8602g35y1jyv1b8wa5i4dnh52dj83"; - meta = with stdenv.lib; { + meta = with lib; { description = "A cargo plugin that generates a Markdown section in your README based on your Rust documentation"; homepage = "https://github.com/phaazon/cargo-sync-readme"; license = licenses.bsd3; diff --git a/pkgs/development/tools/rust/cargo-udeps/default.nix b/pkgs/development/tools/rust/cargo-udeps/default.nix index 840f2ae27c3c..df30ec5d3604 100644 --- a/pkgs/development/tools/rust/cargo-udeps/default.nix +++ b/pkgs/development/tools/rust/cargo-udeps/default.nix @@ -1,4 +1,4 @@ -{ stdenv, rustPlatform, fetchFromGitHub, pkgconfig, openssl, CoreServices, Security, libiconv }: +{ lib, stdenv, rustPlatform, fetchFromGitHub, pkgconfig, openssl, CoreServices, Security, libiconv }: rustPlatform.buildRustPackage rec { pname = "cargo-udeps"; @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { # Requires network access doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Find unused dependencies in Cargo.toml"; homepage = "https://github.com/est31/cargo-udeps"; license = licenses.mit; diff --git a/pkgs/development/tools/rust/cargo-wipe/default.nix b/pkgs/development/tools/rust/cargo-wipe/default.nix new file mode 100644 index 000000000000..7be91e69f9d7 --- /dev/null +++ b/pkgs/development/tools/rust/cargo-wipe/default.nix @@ -0,0 +1,32 @@ +{ lib, stdenv +, rustPlatform +, fetchFromGitHub +, nix-update-script +}: + +rustPlatform.buildRustPackage rec { + pname = "cargo-wipe"; + version = "0.3.0"; + + src = fetchFromGitHub { + owner = "mihai-dinculescu"; + repo = "cargo-wipe"; + rev = "v${version}"; + sha256 = "1kwkifdp98zsinh7xcsz2va252wxbw73xlrv0r7h3m0bn51d52vw"; + }; + + cargoSha256 = "15snr1b1pybwcjzwddxybvry3jyllcmrp8dyfm9yiagks3wrcfb4"; + + passthru = { + updateScript = nix-update-script { + attrPath = pname; + }; + }; + + meta = with lib; { + description = ''Cargo subcommand "wipe": recursively finds and optionally wipes all "target" or "node_modules" folders''; + homepage = "https://github.com/mihai-dinculescu/cargo-wipe"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ otavio ]; + }; +} diff --git a/pkgs/development/tools/rust/cargo-xbuild/default.nix b/pkgs/development/tools/rust/cargo-xbuild/default.nix index 477f26e8b819..2e800402c1dd 100644 --- a/pkgs/development/tools/rust/cargo-xbuild/default.nix +++ b/pkgs/development/tools/rust/cargo-xbuild/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform }: +{ lib, stdenv, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { pname = "cargo-xbuild"; @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1gcixzxca1yi4rvy55s986my6j0vx7n6fm1g5r4v4w0zgzlz4d89"; - meta = with stdenv.lib; { + meta = with lib; { description = "Automatically cross-compiles the sysroot crates core, compiler_builtins, and alloc"; homepage = "https://github.com/rust-osdev/cargo-xbuild"; license = with licenses; [ mit asl20 ]; diff --git a/pkgs/development/tools/rust/cbindgen/default.nix b/pkgs/development/tools/rust/cbindgen/default.nix index 0b557af42585..db2a1c4c6607 100644 --- a/pkgs/development/tools/rust/cbindgen/default.nix +++ b/pkgs/development/tools/rust/cbindgen/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform, Security }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, Security }: rustPlatform.buildRustPackage rec { pname = "rust-cbindgen"; @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { "--skip test_expand" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A project for generating C bindings from Rust code"; homepage = "https://github.com/eqrion/cbindgen"; license = licenses.mpl20; diff --git a/pkgs/development/tools/rust/maturin/default.nix b/pkgs/development/tools/rust/maturin/default.nix index 723ea94152ca..882622bff7b8 100644 --- a/pkgs/development/tools/rust/maturin/default.nix +++ b/pkgs/development/tools/rust/maturin/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform, dbus, gmp, openssl, pkgconfig +{ lib, stdenv, fetchFromGitHub, rustPlatform, dbus, gmp, openssl, pkgconfig , darwin }: let @@ -25,7 +25,7 @@ in rustPlatform.buildRustPackage rec { # Requires network access, fails in sandbox. doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Build and publish crates with pyo3 bindings as python packages"; homepage = "https://github.com/PyO3/maturin"; license = licenses.mit; diff --git a/pkgs/development/tools/rust/racer/default.nix b/pkgs/development/tools/rust/racer/default.nix index 86f1989729eb..d5482d58457c 100644 --- a/pkgs/development/tools/rust/racer/default.nix +++ b/pkgs/development/tools/rust/racer/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchFromGitHub, rustPlatform, makeWrapper, substituteAll, Security }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, makeWrapper, substituteAll, Security }: rustPlatform.buildRustPackage rec { pname = "racer"; - version = "2.1.35"; + version = "2.1.40"; src = fetchFromGitHub { owner = "racer-rust"; repo = "racer"; rev = "v${version}"; - sha256 = "0c00b81s7abnadjbf4i39lhdkipx7z44sr8p78jd1fl61yyrspli"; + sha256 = "sha256-8Is+RBfcXKbGSFzYoolLHs30rxlNI//xVGEOhxP2TV8="; }; - cargoSha256 = "1nbp2jp65fqwsq9i04iyi4pbszs035w6id50p5ypw234cqxznikm"; + cargoSha256 = "sha256-iUomr9viCdZk4nV75/OP8vHtJpMbmy+pq1IbaA2lLmE="; nativeBuildInputs = [ makeWrapper ]; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; @@ -19,28 +19,27 @@ rustPlatform.buildRustPackage rec { # a nightly compiler is required unless we use this cheat code. RUSTC_BOOTSTRAP = 1; - RUST_SRC_PATH = rustPlatform.rustcSrc; + RUST_SRC_PATH = rustPlatform.rustLibSrc; postInstall = '' - wrapProgram $out/bin/racer --set-default RUST_SRC_PATH ${rustPlatform.rustcSrc} + wrapProgram $out/bin/racer --set-default RUST_SRC_PATH ${rustPlatform.rustLibSrc} ''; - checkPhase = '' - cargo test -- \ - --skip nameres::test_do_file_search_std \ - --skip util::test_get_rust_src_path_rustup_ok \ - --skip util::test_get_rust_src_path_not_rust_source_tree \ - --skip extern --skip completes_pub_fn --skip find_crate_doc \ - --skip follows_use_local_package --skip follows_use_for_reexport \ - --skip follows_rand_crate --skip get_completion_in_example_dir \ - --skip test_resolve_global_path_in_modules - ''; + checkFlags = [ + "--skip nameres::test_do_file_search_std" + "--skip util::test_get_rust_src_path_rustup_ok" + "--skip util::test_get_rust_src_path_not_rust_source_tree" + "--skip extern --skip completes_pub_fn --skip find_crate_doc" + "--skip follows_use_local_package --skip follows_use_for_reexport" + "--skip follows_rand_crate --skip get_completion_in_example_dir" + "--skip test_resolve_global_path_in_modules" + ]; doInstallCheck = true; installCheckPhase = '' $out/bin/racer --version ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A utility intended to provide Rust code completion for editors and IDEs"; homepage = "https://github.com/racer-rust/racer"; license = licenses.mit; diff --git a/pkgs/development/tools/rust/racerd/default.nix b/pkgs/development/tools/rust/racerd/default.nix index 26e2a5ba50e3..19cc3fdf5804 100644 --- a/pkgs/development/tools/rust/racerd/default.nix +++ b/pkgs/development/tools/rust/racerd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, rustPlatform, makeWrapper, Security }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, rustPlatform, makeWrapper, Security }: rustPlatform.buildRustPackage rec { pname = "racerd"; @@ -36,7 +36,7 @@ rustPlatform.buildRustPackage rec { wrapProgram $out/bin/racerd --set-default RUST_SRC_PATH "$RUST_SRC_PATH" ''; - meta = with stdenv.lib; { + meta = with lib; { broken = true; description = "JSON/HTTP Server based on racer for adding Rust support to editors and IDEs"; homepage = "https://github.com/jwilm/racerd"; diff --git a/pkgs/development/tools/rust/rust-analyzer/default.nix b/pkgs/development/tools/rust/rust-analyzer/default.nix index a398b7e504df..a031d552253b 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-11-09"; + rev = "2021-01-04"; version = "unstable-${rev}"; - sha256 = "sha256-SX9dvx2JtYZBxA3+dHQKX/jrjbAMy37/SAybDjlYcSs="; - cargoSha256 = "sha256-+td+wMmI+MyGz9oPC+SPO2TmAV0+3lOORNY7xf6s3vI="; + sha256 = "sha256-VRnmx5SfmdMIVQjixWBSaMioqFUlo9VOIKsPvC5t3t4="; + cargoSha256 = "sha256-X63FjFpfwjvQayw4X6Sqfyh4FHsc3flE3OtQpzqowjc="; }; rust-analyzer = callPackage ./wrapper.nix {} { diff --git a/pkgs/development/tools/rust/rust-analyzer/generic.nix b/pkgs/development/tools/rust/rust-analyzer/generic.nix index 1bab5b951837..10f0c6b26ad7 100644 --- a/pkgs/development/tools/rust/rust-analyzer/generic.nix +++ b/pkgs/development/tools/rust/rust-analyzer/generic.nix @@ -41,7 +41,7 @@ rustPlatform.buildRustPackage { runHook postInstallCheck ''; - meta = with stdenv.lib; { + meta = with lib; { description = "An experimental modular compiler frontend for the Rust language"; homepage = "https://github.com/rust-analyzer/rust-analyzer"; license = with licenses; [ mit asl20 ]; diff --git a/pkgs/development/tools/rust/rust-analyzer/update.sh b/pkgs/development/tools/rust/rust-analyzer/update.sh index f08ea67cf22d..1bd46862692f 100755 --- a/pkgs/development/tools/rust/rust-analyzer/update.sh +++ b/pkgs/development/tools/rust/rust-analyzer/update.sh @@ -26,7 +26,7 @@ sha256=$(nix-prefetch -f "$nixpkgs" rust-analyzer-unwrapped.src --rev "$rev") # Clear cargoSha256 to avoid inconsistency. sed -e "s#rev = \".*\"#rev = \"$rev\"#" \ -e "s#sha256 = \".*\"#sha256 = \"$sha256\"#" \ - -e "s#cargoSha256 = \".*\"#cargoSha256 = \"\"#" \ + -e "s#cargoSha256 = \".*\"#cargoSha256 = \"sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\"#" \ --in-place ./default.nix node_src="$(nix-build "$nixpkgs" -A rust-analyzer.src --no-out-link)/editors/code" diff --git a/pkgs/development/tools/rust/rustup/default.nix b/pkgs/development/tools/rust/rustup/default.nix index f846ed5f02e1..dcb435d51403 100644 --- a/pkgs/development/tools/rust/rustup/default.nix +++ b/pkgs/development/tools/rust/rustup/default.nix @@ -70,7 +70,7 @@ rustPlatform.buildRustPackage rec { $out/bin/rustup completions zsh cargo > "$out/share/zsh/site-functions/_cargo" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "The Rust toolchain installer"; homepage = "https://www.rustup.rs/"; license = with licenses; [ asl20 /* or */ mit ]; diff --git a/pkgs/development/tools/rust/svd2rust/default.nix b/pkgs/development/tools/rust/svd2rust/default.nix index 348fe6d9c71f..97da80562905 100644 --- a/pkgs/development/tools/rust/svd2rust/default.nix +++ b/pkgs/development/tools/rust/svd2rust/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform }: +{ lib, stdenv, fetchFromGitHub, rustPlatform }: with rustPlatform; @@ -19,7 +19,7 @@ buildRustPackage rec { # doc tests fail due to missing dependency doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Generate Rust register maps (`struct`s) from SVD files"; homepage = "https://github.com/rust-embedded/svd2rust"; license = with licenses; [ mit asl20 ]; diff --git a/pkgs/development/tools/sassc/default.nix b/pkgs/development/tools/sassc/default.nix index 373a7ea66658..d9662cd7ddb9 100644 --- a/pkgs/development/tools/sassc/default.nix +++ b/pkgs/development/tools/sassc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, libsass }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, libsass }: stdenv.mkDerivation rec { pname = "sassc"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { buildInputs = [ libsass ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A front-end for libsass"; homepage = "https://github.com/sass/sassc/"; license = licenses.mit; diff --git a/pkgs/development/tools/scalafix/default.nix b/pkgs/development/tools/scalafix/default.nix index aa3a6cfb0dcf..00fda8bfc368 100644 --- a/pkgs/development/tools/scalafix/default.nix +++ b/pkgs/development/tools/scalafix/default.nix @@ -1,4 +1,4 @@ -{ stdenv, jdk, jre, coursier, makeWrapper }: +{ lib, stdenv, jdk, jre, coursier, makeWrapper }: let baseName = "scalafix"; @@ -34,7 +34,7 @@ stdenv.mkDerivation { $out/bin/${baseName} --version | grep -q "${version}" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Refactoring and linting tool for Scala"; homepage = "https://scalacenter.github.io/scalafix/"; license = licenses.bsd3; diff --git a/pkgs/development/tools/scalafmt/default.nix b/pkgs/development/tools/scalafmt/default.nix index 0f14f52295e8..45efd813a38b 100644 --- a/pkgs/development/tools/scalafmt/default.nix +++ b/pkgs/development/tools/scalafmt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, jdk, jre, coursier, makeWrapper }: +{ lib, stdenv, jdk, jre, coursier, makeWrapper }: let baseName = "scalafmt"; @@ -35,7 +35,7 @@ stdenv.mkDerivation { $out/bin/${baseName} --version | grep -q "${version}" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Opinionated code formatter for Scala"; homepage = "http://scalameta.org/scalafmt"; license = licenses.asl20; diff --git a/pkgs/development/tools/selenium/chromedriver/default.nix b/pkgs/development/tools/selenium/chromedriver/default.nix index de1c9c9c11aa..5f01b98e8d11 100644 --- a/pkgs/development/tools/selenium/chromedriver/default.nix +++ b/pkgs/development/tools/selenium/chromedriver/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, makeWrapper +{ lib, stdenv, fetchurl, unzip, makeWrapper , cairo, fontconfig, freetype, gdk-pixbuf, glib , glibc, gtk2, libX11, nspr, nss, pango, gconf , libxcb, libXi, libXrender, libXext @@ -49,7 +49,7 @@ in stdenv.mkDerivation rec { wrapProgram "$out/bin/chromedriver" --prefix LD_LIBRARY_PATH : "${libs}:\$LD_LIBRARY_PATH" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://chromedriver.chromium.org/"; description = "A WebDriver server for running Selenium tests on Chrome"; longDescription = '' diff --git a/pkgs/development/tools/sigrok-cli/default.nix b/pkgs/development/tools/sigrok-cli/default.nix index b71e9fb3a99c..79b4a6acdf63 100644 --- a/pkgs/development/tools/sigrok-cli/default.nix +++ b/pkgs/development/tools/sigrok-cli/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, libsigrok, libsigrokdecode }: +{ lib, stdenv, fetchurl, pkgconfig, glib, libsigrok, libsigrokdecode }: stdenv.mkDerivation rec { name = "sigrok-cli-0.7.1"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ glib libsigrok libsigrokdecode ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Command-line frontend for the sigrok signal analysis software suite"; homepage = "https://sigrok.org/"; license = licenses.gpl3Plus; diff --git a/pkgs/development/tools/simavr/default.nix b/pkgs/development/tools/simavr/default.nix index 83ae00ce7b66..5fd99f140748 100644 --- a/pkgs/development/tools/simavr/default.nix +++ b/pkgs/development/tools/simavr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libelf, which, pkgconfig, freeglut +{ lib, stdenv, fetchFromGitHub, libelf, which, pkgconfig, freeglut , avrgcc, avrlibc , libGLU, libGL , GLUT }: @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { doCheck = true; checkTarget = "-C tests run_tests"; - meta = with stdenv.lib; { + meta = with lib; { description = "A lean and mean Atmel AVR simulator"; homepage = "https://github.com/buserror/simavr"; license = licenses.gpl3; diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix index db5f392b2ce6..5b1d8b0794d8 100644 --- a/pkgs/development/tools/skopeo/default.nix +++ b/pkgs/development/tools/skopeo/default.nix @@ -1,4 +1,5 @@ -{ stdenv +{ lib +, stdenv , buildGoModule , fetchFromGitHub , gpgme @@ -13,13 +14,13 @@ buildGoModule rec { pname = "skopeo"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { rev = "v${version}"; owner = "containers"; repo = "skopeo"; - sha256 = "1v7k3ki10i6082r7zswblyirx6zck674y6bw3plssw4p1l2611rd"; + sha256 = "1y9pmijazbgxzriymrm7zrifmkd1x1wad9b3zjcj7zwr6c999dhg"; }; outputs = [ "out" "man" ]; @@ -31,7 +32,7 @@ buildGoModule rec { nativeBuildInputs = [ pkg-config go-md2man installShellFiles makeWrapper ]; buildInputs = [ gpgme ] - ++ stdenv.lib.optionals stdenv.isLinux [ lvm2 btrfs-progs ]; + ++ lib.optionals stdenv.isLinux [ lvm2 btrfs-progs ]; buildPhase = '' patchShebangs . @@ -42,12 +43,12 @@ buildGoModule rec { install -Dm755 bin/skopeo -t $out/bin installManPage docs/*.[1-9] installShellCompletion --bash completions/bash/skopeo - '' + stdenv.lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.isLinux '' wrapProgram $out/bin/skopeo \ - --prefix PATH : ${stdenv.lib.makeBinPath [ fuse-overlayfs ]} + --prefix PATH : ${lib.makeBinPath [ fuse-overlayfs ]} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A command line utility for various operations on container images and image repositories"; homepage = "https://github.com/containers/skopeo"; maintainers = with maintainers; [ lewo ] ++ teams.podman.members; diff --git a/pkgs/development/tools/so/default.nix b/pkgs/development/tools/so/default.nix index 0ee2359c8413..08481169dcdd 100644 --- a/pkgs/development/tools/so/default.nix +++ b/pkgs/development/tools/so/default.nix @@ -1,4 +1,4 @@ -{ stdenv, rustPlatform, fetchFromGitHub, openssl, pkg-config, libiconv, Security }: +{ lib, stdenv, rustPlatform, fetchFromGitHub, openssl, pkg-config, libiconv, Security }: rustPlatform.buildRustPackage rec { pname = "so"; @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { libiconv Security ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A TUI interface to the StackExchange network"; homepage = "https://github.com/samtay/so"; license = licenses.mit; diff --git a/pkgs/development/tools/solarus-quest-editor/default.nix b/pkgs/development/tools/solarus-quest-editor/default.nix index d44622e7e595..159fe3d99eb7 100644 --- a/pkgs/development/tools/solarus-quest-editor/default.nix +++ b/pkgs/development/tools/solarus-quest-editor/default.nix @@ -1,7 +1,7 @@ -{ lib, mkDerivation, fetchFromGitLab, cmake, luajit, - SDL2, SDL2_image, SDL2_ttf, physfs, - openal, libmodplug, libvorbis, solarus, - qtbase, qttools, glm }: +{ lib, mkDerivation, fetchFromGitLab, cmake, luajit +, SDL2, SDL2_image, SDL2_ttf, physfs, fetchpatch +, openal, libmodplug, libvorbis, solarus +, qtbase, qttools, glm }: mkDerivation rec { pname = "solarus-quest-editor"; @@ -13,11 +13,18 @@ mkDerivation rec { rev = "v${version}"; sha256 = "1qbc2j9kalk7xqk9j27s7wnm5zawiyjs47xqkqphw683idmzmjzn"; }; - - buildInputs = [ cmake luajit SDL2 - SDL2_image SDL2_ttf physfs - openal libmodplug libvorbis - solarus qtbase qttools glm ]; + + patches = [ + (fetchpatch { + url = "https://gitlab.com/solarus-games/solarus-quest-editor/-/commit/81d5c7f1602cf355684d70a5e3449fefccfc44b8.patch"; + sha256 = "tVUxkkDp2PcOHGy4dGvUcYj9gF7k4LN21VuxohCw9NE="; + }) + ]; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ luajit SDL2 SDL2_image SDL2_ttf physfs openal + libmodplug libvorbis solarus qtbase qttools glm ]; meta = with lib; { description = "The editor for the Zelda-like ARPG game engine, Solarus"; @@ -31,5 +38,5 @@ mkDerivation rec { maintainers = [ maintainers.Nate-Devv ]; platforms = platforms.linux; }; - + } diff --git a/pkgs/development/tools/sourcetrail/default.nix b/pkgs/development/tools/sourcetrail/default.nix index 91653d3773e1..d1e26662f0c2 100644 --- a/pkgs/development/tools/sourcetrail/default.nix +++ b/pkgs/development/tools/sourcetrail/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, callPackage, writeScript, cmake, wrapQtAppsHook +{ lib, stdenv, fetchFromGitHub, callPackage, writeScript, cmake, wrapQtAppsHook , boost, qt5, llvmPackages, gcc, jdk, pythonPackages, desktop-file-utils , shared-mime-info, imagemagick, which, coreutils, maven, fetchpatch }: @@ -203,7 +203,7 @@ stdenv.mkDerivation rec { # FIXME: some test cases are disabled in the patch phase doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.sourcetrail.com"; description = "A cross-platform source explorer for C/C++ and Java"; platforms = platforms.all; diff --git a/pkgs/development/tools/sourcetrail/jedi.nix b/pkgs/development/tools/sourcetrail/jedi.nix index 14a40a6e6db4..fa25604f9fc5 100644 --- a/pkgs/development/tools/sourcetrail/jedi.nix +++ b/pkgs/development/tools/sourcetrail/jedi.nix @@ -1,6 +1,6 @@ # Taken from a past commit of nixpkgs -{ stdenv, buildPythonPackage, fetchPypi, pytest, glibcLocales, tox, pytestcov, parso }: +{ lib, stdenv, buildPythonPackage, fetchPypi, pytest, glibcLocales, tox, pytestcov, parso }: buildPythonPackage rec { pname = "jedi"; @@ -28,7 +28,7 @@ buildPythonPackage rec { # tox required for tests: https://github.com/davidhalter/jedi/issues/808 doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/davidhalter/jedi"; description = "An autocompletion tool for Python that can be used for text editors"; license = licenses.lgpl3Plus; diff --git a/pkgs/development/tools/sourcetrail/python.nix b/pkgs/development/tools/sourcetrail/python.nix index 113abb77d61b..8ec9c9a2297f 100644 --- a/pkgs/development/tools/sourcetrail/python.nix +++ b/pkgs/development/tools/sourcetrail/python.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { owner = "CoatiSoftware"; repo = pname; rev = version; - sha256 = "05hlpd3am029pv1wi6mys3q0ggp64axmg8bdf1fabl9cl9jffscq"; + sha256 = "01jaigxigq6dvfwq018gn9qw7i6p4jm0y71lqzschfv9vwf6ga45"; fetchSubmodules = true; }; @@ -64,5 +64,7 @@ stdenv.mkDerivation rec { description = "Python indexer for Sourcetrail"; homepage = "https://github.com/CoatiSoftware/SourcetrailPythonIndexer"; license = licenses.gpl3; + broken = stdenv.isDarwin; + # https://github.com/NixOS/nixpkgs/pull/107533#issuecomment-751063675 }; } diff --git a/pkgs/development/tools/spirv-tools/default.nix b/pkgs/development/tools/spirv-tools/default.nix index bac10d244422..57f04b00c0d2 100644 --- a/pkgs/development/tools/spirv-tools/default.nix +++ b/pkgs/development/tools/spirv-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, python3, spirv-headers }: +{ lib, stdenv, fetchFromGitHub, cmake, python3, spirv-headers }: let # Update spirv-headers rev in lockstep according to DEPs file version = "2020.2"; @@ -14,13 +14,12 @@ stdenv.mkDerivation rec { rev = "v${version}"; sha256 = "00b7xgyrcb2qq63pp3cnw5q1xqx2d9rfn65lai6n6r89s1vh3vg6"; }; - enableParallelBuilding = true; nativeBuildInputs = [ cmake python3 ]; cmakeFlags = [ "-DSPIRV-Headers_SOURCE_DIR=${spirv-headers.src}" ]; - meta = with stdenv.lib; { + meta = with lib; { inherit (src.meta) homepage; description = "The SPIR-V Tools project provides an API and commands for processing SPIR-V modules"; license = licenses.asl20; diff --git a/pkgs/development/tools/spring-boot-cli/default.nix b/pkgs/development/tools/spring-boot-cli/default.nix index 38573e075146..5bc89e839e92 100644 --- a/pkgs/development/tools/spring-boot-cli/default.nix +++ b/pkgs/development/tools/spring-boot-cli/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, jdk, makeWrapper, installShellFiles, coreutils }: +{ lib, stdenv, fetchzip, jdk, makeWrapper, installShellFiles, coreutils }: stdenv.mkDerivation rec { pname = "spring-boot-cli"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = '' CLI which makes it easy to create spring-based applications ''; diff --git a/pkgs/development/tools/sqsh/default.nix b/pkgs/development/tools/sqsh/default.nix index d6087cd02244..6b408592a0d0 100644 --- a/pkgs/development/tools/sqsh/default.nix +++ b/pkgs/development/tools/sqsh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, freetds, readline, libiconv }: +{ lib, stdenv, fetchurl, autoreconfHook, freetds, readline, libiconv }: let mainVersion = "2.5"; @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Command line tool for querying Sybase/MSSQL databases"; longDescription = '' Sqsh (pronounced skwish) is short for SQshelL (pronounced s-q-shell), diff --git a/pkgs/development/tools/sslmate/default.nix b/pkgs/development/tools/sslmate/default.nix index a6d1ce55fdb7..cdf2242bdbaa 100644 --- a/pkgs/development/tools/sslmate/default.nix +++ b/pkgs/development/tools/sslmate/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perlPackages, makeWrapper, openssl }: +{ lib, stdenv, fetchurl, perlPackages, makeWrapper, openssl }: stdenv.mkDerivation rec { name = "sslmate-1.7.1"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { --prefix PATH : "${openssl.bin}/bin" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://sslmate.com"; maintainers = [ maintainers.domenkozar ]; description = "Easy to buy, deploy, and manage your SSL certs"; diff --git a/pkgs/development/tools/stagit/default.nix b/pkgs/development/tools/stagit/default.nix index dacee9aa78e1..1cabcfe044f3 100644 --- a/pkgs/development/tools/stagit/default.nix +++ b/pkgs/development/tools/stagit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, libgit2, fetchgit }: +{ lib, stdenv, libgit2, fetchgit }: stdenv.mkDerivation rec { pname = "stagit"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ libgit2 ]; - meta = with stdenv.lib; { + meta = with lib; { description = "git static site generator"; homepage = "https://git.codemadness.org/stagit/"; license = licenses.mit; diff --git a/pkgs/development/tools/sumneko-lua-language-server/default.nix b/pkgs/development/tools/sumneko-lua-language-server/default.nix new file mode 100644 index 000000000000..05281f1bb83c --- /dev/null +++ b/pkgs/development/tools/sumneko-lua-language-server/default.nix @@ -0,0 +1,52 @@ +{ stdenv, fetchFromGitHub, ninja, makeWrapper }: + +stdenv.mkDerivation rec { + pname = "sumneko-lua-language-server"; + version = "1.11.2"; + + src = fetchFromGitHub { + owner = "sumneko"; + repo = "lua-language-server"; + rev = version; + sha256 = "1cnzwfqmzlzi6797l37arhhx2l6wsvs3jjgxdxwdbgq3rfz1ncr8"; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ + ninja + makeWrapper + ]; + + preBuild = '' + cd 3rd/luamake + ''; + + ninjaFlags = [ + "-f ninja/linux.ninja" + ]; + + postBuild = '' + cd ../.. + ./3rd/luamake/luamake rebuild + ''; + + installPhase = '' + mkdir -p $out/bin $out/extras + cp -r ./{locale,meta,script,*.lua} $out/extras/ + cp ./bin/Linux/{bee.so,lpeglabel.so} $out/extras + cp ./bin/Linux/lua-language-server $out/extras/.lua-language-server-unwrapped + makeWrapper $out/extras/.lua-language-server-unwrapped \ + $out/bin/lua-language-server \ + --add-flags "-E $out/extras/main.lua \ + --logpath='~/.cache/sumneko_lua/log' \ + --metapath='~/.cache/sumneko_lua/meta'" + ''; + + meta = with stdenv.lib; { + description = "Lua Language Server coded by Lua "; + homepage = "https://github.com/sumneko/lua-language-server"; + license = licenses.mit; + maintainers = with maintainers; [ mjlbach ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/tools/sunxi-tools/default.nix b/pkgs/development/tools/sunxi-tools/default.nix index 5a530c6e9f18..009172d77251 100644 --- a/pkgs/development/tools/sunxi-tools/default.nix +++ b/pkgs/development/tools/sunxi-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, libusb1, zlib }: +{ lib, stdenv, fetchFromGitHub, pkgconfig, libusb1, zlib }: stdenv.mkDerivation { name = "sunxi-tools-20181113"; @@ -19,7 +19,7 @@ stdenv.mkDerivation { installTargets = [ "install-tools" "install-misc" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Tools for Allwinner SoC devices"; homepage = "http://linux-sunxi.org/"; license = licenses.gpl2Plus; diff --git a/pkgs/development/tools/tabnine/default.nix b/pkgs/development/tools/tabnine/default.nix index 6c54e8f3c405..f18be619f267 100644 --- a/pkgs/development/tools/tabnine/default.nix +++ b/pkgs/development/tools/tabnine/default.nix @@ -1,17 +1,17 @@ -{ stdenv, lib, fetchurl }: +{ stdenv, lib, fetchurl, unzip }: let - version = "3.1.1"; + version = "3.2.63"; src = if stdenv.hostPlatform.system == "x86_64-darwin" then fetchurl { - url = "https://update.tabnine.com/${version}/x86_64-apple-darwin/TabNine"; - sha256 = "w+Ufy4pICfQmseKCeohEQIP0VD6YrkYTEn41HX40Zlw="; + url = "https://update.tabnine.com/bundles/${version}/x86_64-apple-darwin/TabNine.zip"; + sha256 = "0y0wb3jdr2qk4k21c11w8c9a5fl0h2rm1wm7m8hqdywy4lz9ppgy"; } else if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { - url = "https://update.tabnine.com/${version}/x86_64-unknown-linux-musl/TabNine"; - sha256 = "hSltZWQz2BRFut0NDI4fS/N8XxFJaYGHRtV3llBVOY4="; + url = "https://update.tabnine.com/bundles/${version}/x86_64-unknown-linux-musl/TabNine.zip"; + sha256 = "0zzk2w5azk5f0svjxlj2774x01xdflb767xxvbglj4223dgyx2x5"; } else throw "Not supported on ${stdenv.hostPlatform.system}"; in stdenv.mkDerivation rec { @@ -20,10 +20,15 @@ in stdenv.mkDerivation rec { inherit version src; dontBuild = true; - dontUnpack = true; + + # Work around the "unpacker appears to have produced no directories" + # case that happens when the archive doesn't have a subdirectory. + setSourceRoot = "sourceRoot=`pwd`"; + + nativeBuildInputs = [ unzip ]; installPhase = '' - install -Dm755 $src $out/bin/TabNine + install -Dm755 TabNine $out/bin/TabNine ''; meta = with lib; { diff --git a/pkgs/development/tools/textql/default.nix b/pkgs/development/tools/textql/default.nix index 4cdb5b8dd163..7dc899c4fc46 100644 --- a/pkgs/development/tools/textql/default.nix +++ b/pkgs/development/tools/textql/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, sqlite }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub, sqlite }: buildGoPackage rec { pname = "textql"; @@ -24,7 +24,7 @@ buildGoPackage rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Execute SQL against structured text like CSV or TSV"; homepage = "https://github.com/dinedal/textql"; license = licenses.mit; diff --git a/pkgs/development/tools/the-way/default.nix b/pkgs/development/tools/the-way/default.nix index 5506201b7427..7eec364c47b1 100644 --- a/pkgs/development/tools/the-way/default.nix +++ b/pkgs/development/tools/the-way/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform, installShellFiles, AppKit, Security }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, installShellFiles, AppKit, Security }: rustPlatform.buildRustPackage rec { pname = "the-way"; @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Terminal code snippets manager"; homepage = "https://github.com/out-of-cheese-error/the-way"; license = with licenses; [ mit ]; diff --git a/pkgs/development/tools/thrust/default.nix b/pkgs/development/tools/thrust/default.nix index a0bc39f2816d..44dfa1a4ba11 100644 --- a/pkgs/development/tools/thrust/default.nix +++ b/pkgs/development/tools/thrust/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, buildEnv, makeWrapper, glib, alsaLib , dbus, gtk2, atk +{ lib, stdenv, fetchurl, buildEnv, makeWrapper, glib, alsaLib , dbus, gtk2, atk , pango, freetype, fontconfig, gdk-pixbuf , cairo, cups, expat, nspr, gconf, nss , xorg, libcap, unzip }: @@ -37,7 +37,7 @@ in stdenv.mkDerivation rec { ln -s $out/libexec/thrust/thrust_shell $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Chromium-based cross-platform / cross-language application framework"; homepage = "https://github.com/breach/thrust"; license = licenses.mit; diff --git a/pkgs/development/tools/toluapp/default.nix b/pkgs/development/tools/toluapp/default.nix index 8f4e66703478..5f938547cdd8 100644 --- a/pkgs/development/tools/toluapp/default.nix +++ b/pkgs/development/tools/toluapp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, sconsPackages, lua }: +{ lib, stdenv, fetchFromGitHub, sconsPackages, lua }: stdenv.mkDerivation rec { version = "1.0.93"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { --replace /usr/local $out ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A tool to integrate C/Cpp code with Lua"; homepage = "http://www.codenix.com/~tolua/"; license = licenses.mit; diff --git a/pkgs/development/tools/tracy/default.nix b/pkgs/development/tools/tracy/default.nix index 4efef71f6ad0..927b792b6ba4 100644 --- a/pkgs/development/tools/tracy/default.nix +++ b/pkgs/development/tools/tracy/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { install_name_tool -change libcapstone.4.dylib ${capstone}/lib/libcapstone.4.dylib $out/bin/Tracy ''; - meta = with stdenv.lib; { + meta = with 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; diff --git a/pkgs/development/tools/tradcpp/default.nix b/pkgs/development/tools/tradcpp/default.nix index ddcdc38a4fb9..dc7156febe98 100644 --- a/pkgs/development/tools/tradcpp/default.nix +++ b/pkgs/development/tools/tradcpp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoconf }: +{ lib, stdenv, fetchurl, autoconf }: stdenv.mkDerivation { name = "tradcpp-0.5.2"; @@ -16,7 +16,7 @@ stdenv.mkDerivation { ./aarch64.patch ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A traditional (K&R-style) C macro preprocessor"; platforms = platforms.all; license = licenses.bsd2; diff --git a/pkgs/development/tools/trellis/default.nix b/pkgs/development/tools/trellis/default.nix index c9884a8eacd8..003e3cec9cee 100644 --- a/pkgs/development/tools/trellis/default.nix +++ b/pkgs/development/tools/trellis/default.nix @@ -1,22 +1,22 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , python3, boost , cmake }: stdenv.mkDerivation rec { pname = "trellis"; - version = "2020.11.25"; + version = "2021.01.02"; # git describe --tags realVersion = with stdenv.lib; with builtins; - "1.0-476-g${substring 0 7 (elemAt srcs 0).rev}"; + "1.0-482-g${substring 0 7 (elemAt srcs 0).rev}"; srcs = [ (fetchFromGitHub { owner = "SymbiFlow"; repo = "prjtrellis"; - rev = "a441cd9d0390648e96bf27096626eb2c904096de"; - sha256 = "1rsck44n4mf9v3vfac51ksrhcs84s7q297nq1kjkzzvmsx09gd9k"; + rev = "60c05b3f4e71fd78d4fba5c31f9974694245199e"; + sha256 = "1k37mxwxv9fpm6xnrxlqqap7zqh2dvgqncphj3asi2rz0kh07ppf"; name = "trellis"; }) @@ -37,7 +37,6 @@ stdenv.mkDerivation rec { # TODO: should this be in stdenv instead? "-DCMAKE_INSTALL_DATADIR=${placeholder "out"}/share" ]; - enableParallelBuilding = true; preConfigure = with builtins; '' rmdir database && ln -sfv ${elemAt srcs 1} ./database @@ -46,7 +45,7 @@ stdenv.mkDerivation rec { cd libtrellis ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Documentation and bitstream tools for Lattice ECP5 FPGAs"; longDescription = '' Project Trellis documents the Lattice ECP5 architecture diff --git a/pkgs/development/tools/turbogit/default.nix b/pkgs/development/tools/turbogit/default.nix new file mode 100644 index 000000000000..68bd10683547 --- /dev/null +++ b/pkgs/development/tools/turbogit/default.nix @@ -0,0 +1,42 @@ +{ fetchFromGitHub, buildGoModule, lib, installShellFiles }: +buildGoModule rec { + pname = "turbogit"; + version = "1.2.0"; + + src = fetchFromGitHub { + owner = "b4nst"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-alVgXnsoC2nmUe6i/l0ttUjoXpKLHr0n/7p6WbIIGBU="; + }; + + vendorSha256 = "sha256-6fxbxpROYiNw5SYdQAIdy5NfqzOcFfAlJ+vTQyFtink="; + + subPackages = [ "." ]; + + nativeBuildInputs = [ installShellFiles ]; + postInstall = '' + # Move turbogit binary to tug + ln -s $out/bin/turbogit $out/bin/tug + + # Generate completion files + mkdir -p share/completions + $out/bin/tug completion bash > share/completions/tug.bash + $out/bin/tug completion fish > share/completions/tug.fish + $out/bin/tug completion zsh > share/completions/tug.zsh + + installShellCompletion share/completions/tug.{bash,fish,zsh} + ''; + + meta = with lib; { + description = "Keep your git workflow clean without headache."; + longDescription = '' + turbogit (tug) is a cli tool built to help you deal with your day-to-day git work. + turbogit enforces convention (e.g. The Conventional Commits) but tries to keep things simple and invisible for you. + turbogit is your friend. + ''; + homepage = "https://b4nst.github.io/turbogit"; + license = licenses.mit; + maintainers = [ maintainers.yusdacra ]; + }; +} diff --git a/pkgs/development/tools/udis86/default.nix b/pkgs/development/tools/udis86/default.nix index 6996d5bf13fa..22977d6ea954 100644 --- a/pkgs/development/tools/udis86/default.nix +++ b/pkgs/development/tools/udis86/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, python }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, python }: stdenv.mkDerivation rec { pname = "udis86"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { outputs = [ "bin" "out" "dev" "lib" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://udis86.sourceforge.net"; license = licenses.bsd2; maintainers = with maintainers; [ timor ]; diff --git a/pkgs/development/tools/unity3d/default.nix b/pkgs/development/tools/unity3d/default.nix index dfb5f6abf481..9441a3217b77 100644 --- a/pkgs/development/tools/unity3d/default.nix +++ b/pkgs/development/tools/unity3d/default.nix @@ -129,7 +129,7 @@ in stdenv.mkDerivation { dontStrip = true; dontPatchELF = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://unity3d.com/"; description = "Game development tool"; longDescription = '' diff --git a/pkgs/development/tools/unityhub/default.nix b/pkgs/development/tools/unityhub/default.nix index 85b7a704b9cc..baa89a33ad91 100644 --- a/pkgs/development/tools/unityhub/default.nix +++ b/pkgs/development/tools/unityhub/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, appimageTools, gsettings-desktop-schemas, gtk3 }: +{ lib, stdenv, fetchurl, appimageTools, gsettings-desktop-schemas, gtk3 }: let version = "2.3.2"; @@ -26,7 +26,7 @@ in appimageTools.wrapType2 rec { sha256 = "07nfyfp9apshqarc6pgshsczila6x4943hiyyizc55kp85aw0imn"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://unity3d.com/"; description = "Game development tool"; longDescription = '' diff --git a/pkgs/development/tools/vala-language-server/default.nix b/pkgs/development/tools/vala-language-server/default.nix index f26615e26b7a..696776a69720 100644 --- a/pkgs/development/tools/vala-language-server/default.nix +++ b/pkgs/development/tools/vala-language-server/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , nix-update-script , meson @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { vala ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Code Intelligence for Vala & Genie"; homepage = "https://github.com/benwaffle/vala-language-server"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/tools/vala-lint/default.nix b/pkgs/development/tools/vala-lint/default.nix index 378bc935e22a..73ab21716b7e 100644 --- a/pkgs/development/tools/vala-lint/default.nix +++ b/pkgs/development/tools/vala-lint/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , glib , meson @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { # See https://github.com/vala-lang/vala-lint/issues/133 doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/vala-lang/vala-lint"; description = "Check Vala code files for code-style errors"; longDescription = '' diff --git a/pkgs/development/tools/vcstool/default.nix b/pkgs/development/tools/vcstool/default.nix index e99f7dca9bf5..95ebfcf64b4c 100644 --- a/pkgs/development/tools/vcstool/default.nix +++ b/pkgs/development/tools/vcstool/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python3Packages +{ lib, stdenv, python3Packages , git, breezy, subversion }: with python3Packages; @@ -18,7 +18,7 @@ buildPythonApplication rec { doCheck = false; # requires network - meta = with stdenv.lib; { + meta = with lib; { description = "Provides a command line tool to invoke vcs commands on multiple repositories"; homepage = "https://github.com/dirk-thomas/vcstool"; license = licenses.asl20; diff --git a/pkgs/development/tools/vend/default.nix b/pkgs/development/tools/vend/default.nix index ef59ea8dd65c..cfadf694320e 100644 --- a/pkgs/development/tools/vend/default.nix +++ b/pkgs/development/tools/vend/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "vend"; @@ -28,7 +28,7 @@ buildGoModule rec { vendorSha256 = null; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/nomad-software/vend"; description = "A utility which vendors go code including c dependencies"; maintainers = with maintainers; [ c00w mic92 zowoq ]; diff --git a/pkgs/development/tools/vulkan-validation-layers/default.nix b/pkgs/development/tools/vulkan-validation-layers/default.nix index 6e89f03e5137..48e3b39b9557 100644 --- a/pkgs/development/tools/vulkan-validation-layers/default.nix +++ b/pkgs/development/tools/vulkan-validation-layers/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , cmake , writeText @@ -20,36 +20,37 @@ # https://github.com/KhronosGroup/Vulkan-ValidationLayers/blob/master/scripts/known_good.json let + localSpirvHeaders = spirv-headers.overrideAttrs (_: { + src = fetchFromGitHub { + owner = "KhronosGroup"; + repo = "SPIRV-Headers"; + rev = "f027d53ded7e230e008d37c8b47ede7cd308e19d"; + sha256 = "12gp2mqcar6jj57jw9isfr62yn72kmvdcl0zga4gvrlyfhnf582q"; + }; + }); localGlslang = (glslang.override { argSpirv-tools = spirv-tools.overrideAttrs (_: { src = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Tools"; - rev = "e128ab0d624ce7beb08eb9656bb260c597a46d0a"; - sha256 = "0jj8zrl3dh9fq71jc8msx3f3ifb2vjcb37nl0w4sa8sdhfff74pv"; - }; - }); - argSpirv-headers = spirv-headers.overrideAttrs (_: { - src = fetchFromGitHub { - owner = "KhronosGroup"; - repo = "SPIRV-Headers"; - rev = "ac638f1815425403e946d0ab78bac71d2bdbf3be"; - sha256 = "1lkhs7pxcrfkmiizcxl0w5ajx6swwjv7w3iq586ipgh571fc75gx"; + rev = "c9c1f54330d13a0bec1aa3f08d436249d8e35596"; + sha256 = "0r5whsw9x8j4199xwxv293ar2ga73pm2s7rngw732ylh6rw3bkly"; }; }); + argSpirv-headers = localSpirvHeaders; }).overrideAttrs (_: { src = fetchFromGitHub { owner = "KhronosGroup"; repo = "glslang"; - rev = "e00d27c6d65b7d3e72506a311d7f053da4051295"; - sha256 = "00lzvzk613gpm1vsdxffmx52z3c52ijwvzk4sfhh95p71kdydhgv"; + rev = "dd69df7f3dac26362e10b0f38efb9e47990f7537"; + sha256 = "1iafbh524avsjg4pjiq156b62pck2rwlfl2pjnml8sjy285506rk"; }; }); in stdenv.mkDerivation rec { pname = "vulkan-validation-layers"; - version = "1.2.141.0"; + version = "1.2.162.0"; # If we were to use "dev" here instead of headers, the setupHook would be # placed in that output instead of "out". @@ -60,7 +61,7 @@ stdenv.mkDerivation rec { owner = "KhronosGroup"; repo = "Vulkan-ValidationLayers"; rev = "sdk-${version}"; - sha256 = "1yfas7q122kx74nbjk3wxlyacysgncvlvq081a5dp238m88vkmbj"; + sha256 = "1mpqmxh9zm20jdar59lp4yjpqfzxn2pwds6bkvnzihfy0pymf15k"; }; nativeBuildInputs = [ @@ -79,10 +80,9 @@ stdenv.mkDerivation rec { wayland ]; - enableParallelBuilding = true; - cmakeFlags = [ "-DGLSLANG_INSTALL_DIR=${localGlslang}" + "-DSPIRV_HEADERS_INSTALL_DIR=${localSpirvHeaders}" "-DBUILD_LAYER_SUPPORT_FILES=ON" ]; @@ -97,9 +97,9 @@ stdenv.mkDerivation rec { sed "s|\([[:space:]]*set(INSTALL_DEFINES \''${INSTALL_DEFINES} -DRELATIVE_LAYER_BINARY=\"\)\(\$\")\)|\1$out/lib/\2|" -i layers/CMakeLists.txt ''; - meta = with stdenv.lib; { - description = "LunarG Vulkan loader"; - homepage = "https://www.lunarg.com"; + meta = with lib; { + description = "The official Khronos Vulkan validation layers"; + homepage = "https://github.com/KhronosGroup/Vulkan-ValidationLayers"; platforms = platforms.linux; license = licenses.asl20; maintainers = [ maintainers.ralith ]; diff --git a/pkgs/development/tools/vultr-cli/default.nix b/pkgs/development/tools/vultr-cli/default.nix index 58ee064ad552..23dda32b7232 100644 --- a/pkgs/development/tools/vultr-cli/default.nix +++ b/pkgs/development/tools/vultr-cli/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "vultr-cli"; @@ -15,7 +15,7 @@ buildGoModule rec { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Official command line tool for Vultr services"; homepage = "https://github.com/vultr/vultr-cli"; license = licenses.asl20; diff --git a/pkgs/development/tools/wabt/default.nix b/pkgs/development/tools/wabt/default.nix index b910a31e1552..27b11870a899 100644 --- a/pkgs/development/tools/wabt/default.nix +++ b/pkgs/development/tools/wabt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchpatch, fetchFromGitHub, cmake, python3, substituteAll }: +{ lib, stdenv, fetchpatch, fetchFromGitHub, cmake, python3, substituteAll }: stdenv.mkDerivation rec { pname = "wabt"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_TESTS=OFF" "-DCMAKE_PROJECT_VERSION=${version}" ]; buildInputs = [ python3 ]; - meta = with stdenv.lib; { + meta = with lib; { description = "The WebAssembly Binary Toolkit"; longDescription = '' WABT (pronounced "wabbit") is a suite of tools for WebAssembly, including: diff --git a/pkgs/development/tools/wasm-pack/default.nix b/pkgs/development/tools/wasm-pack/default.nix index 93bda0b81807..c5e5190feb37 100644 --- a/pkgs/development/tools/wasm-pack/default.nix +++ b/pkgs/development/tools/wasm-pack/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , rustPlatform , pkgconfig @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec { # Disabling check here to work with build sandboxing. doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "A utility that builds rust-generated WebAssembly package"; homepage = "https://github.com/rustwasm/wasm-pack"; license = with licenses; [ asl20 /* or */ mit ]; diff --git a/pkgs/development/tools/wiiload/default.nix b/pkgs/development/tools/wiiload/default.nix index 37d909461d07..2f2fe174d14e 100644 --- a/pkgs/development/tools/wiiload/default.nix +++ b/pkgs/development/tools/wiiload/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, zlib }: +{ lib, stdenv, fetchFromGitHub, autoconf, automake, zlib }: stdenv.mkDerivation rec { version = "0.5.1"; pname = "wiiload"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { preConfigure = "./autogen.sh"; - meta = with stdenv.lib; { + meta = with lib; { description = "Load homebrew apps over network/usbgecko to your Wii"; homepage = "https://wiibrew.org/wiki/Wiiload"; license = licenses.gpl2; diff --git a/pkgs/development/tools/winpdb/default.nix b/pkgs/development/tools/winpdb/default.nix index 8db0b719c67b..4730ff676d1b 100644 --- a/pkgs/development/tools/winpdb/default.nix +++ b/pkgs/development/tools/winpdb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pythonPackages, makeDesktopItem }: +{ lib, stdenv, fetchurl, pythonPackages, makeDesktopItem }: pythonPackages.buildPythonApplication rec { name = "winpdb-1.4.8"; @@ -36,7 +36,7 @@ pythonPackages.buildPythonApplication rec { cp artwork/winpdb-icon.svg "$out"/share/icons/winpdb.svg ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Platform independent Python debugger"; longDescription = '' Winpdb is a platform independent GPL Python debugger with support for diff --git a/pkgs/development/tools/wire/default.nix b/pkgs/development/tools/wire/default.nix new file mode 100644 index 000000000000..ff6d1e7ac5d0 --- /dev/null +++ b/pkgs/development/tools/wire/default.nix @@ -0,0 +1,24 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "wire"; + version = "0.4.0"; + + src = fetchFromGitHub { + owner = "google"; + repo = "wire"; + rev = "v${version}"; + sha256 = "0fYXo/LnxKV/qoaP59XCyEtLLAysZm/WhRdm3RnLdvw="; + }; + + vendorSha256 = "ZFUX4LgPte6oAf94D82Man/P9VMpx+CDNCTMBwiy9Fc="; + + subPackages = [ "cmd/wire" ]; + + meta = with lib; { + homepage = "https://github.com/google/wire"; + description = "A code generation tool that automates connecting components using dependency injection"; + license = licenses.asl20; + maintainers = with maintainers; [ svrana ]; + }; +} diff --git a/pkgs/development/tools/wllvm/default.nix b/pkgs/development/tools/wllvm/default.nix index cd002bd2ef61..a3702f2e3e65 100644 --- a/pkgs/development/tools/wllvm/default.nix +++ b/pkgs/development/tools/wllvm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python3Packages }: +{ lib, stdenv, python3Packages }: python3Packages.buildPythonApplication rec { version = "1.2.8"; @@ -10,7 +10,7 @@ python3Packages.buildPythonApplication rec { sha256 = "1d88fzg4ba4r3hwrinnv6agiyj3xxdy4yryb8wz2ml51nc6bi591"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/travitch/whole-program-llvm"; description = "A wrapper script to build whole-program LLVM bitcode files"; license = licenses.mit; diff --git a/pkgs/development/tools/wrangler/default.nix b/pkgs/development/tools/wrangler/default.nix index 6b85e20612bf..046905528940 100644 --- a/pkgs/development/tools/wrangler/default.nix +++ b/pkgs/development/tools/wrangler/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl, curl, darwin, perl }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl, curl, darwin, perl }: rustPlatform.buildRustPackage rec { pname = "wrangler"; @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { # tries to use "/homeless-shelter" and fails doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "A CLI tool designed for folks who are interested in using Cloudflare Workers"; homepage = "https://github.com/cloudflare/wrangler"; license = with licenses; [ asl20 /* or */ mit ]; diff --git a/pkgs/development/tools/ws/default.nix b/pkgs/development/tools/ws/default.nix index 4a6d8892208d..3026289fec1e 100644 --- a/pkgs/development/tools/ws/default.nix +++ b/pkgs/development/tools/ws/default.nix @@ -1,5 +1,5 @@ # This file was generated by https://github.com/kamilchm/go2nix v1.2.1 -{ stdenv, buildGoPackage, fetchgit }: +{ lib, stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { pname = "ws"; @@ -14,7 +14,7 @@ buildGoPackage rec { sha256 = "192slrz1cj1chzmfrl0d9ai8bq6s4w0iwpvxkhxb9krga7mkp9xb"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "websocket command line tool"; homepage = "https://github.com/hashrocket/ws"; license = licenses.mit; diff --git a/pkgs/development/tools/wxformbuilder/default.nix b/pkgs/development/tools/wxformbuilder/default.nix index a3f8196b124b..5c78d730d203 100644 --- a/pkgs/development/tools/wxformbuilder/default.nix +++ b/pkgs/development/tools/wxformbuilder/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , wxGTK31 , meson @@ -26,7 +26,7 @@ stdenv.mkDerivation { wxGTK31 ]; - meta = with stdenv.lib; { + meta = with lib; { description = "RAD tool for wxWidgets GUI design"; homepage = "https://github.com/wxFormBuilder/wxFormBuilder"; license = licenses.gpl2; diff --git a/pkgs/development/tools/xcbuild/default.nix b/pkgs/development/tools/xcbuild/default.nix index cb2e6edd0e10..abc48b41446e 100644 --- a/pkgs/development/tools/xcbuild/default.nix +++ b/pkgs/development/tools/xcbuild/default.nix @@ -1,4 +1,4 @@ -{ stdenv, cmake, fetchFromGitHub, zlib, libxml2, libpng +{ lib, stdenv, cmake, fetchFromGitHub, zlib, libxml2, libpng , CoreServices, CoreGraphics, ImageIO, ninja }: let @@ -47,8 +47,6 @@ in stdenv.mkDerivation { --replace "#if HAVE_LIBCOMPRESSION" "#if 0" ''; - enableParallelBuilding = true; - # TODO: instruct cmake not to put it in /usr, rather than cleaning up postInstall = '' mv $out/usr/* $out @@ -59,10 +57,11 @@ in stdenv.mkDerivation { cmakeFlags = [ "-GNinja" ]; - buildInputs = [ cmake zlib libxml2 libpng ninja ] + nativeBuildInputs = [ cmake ninja ]; + buildInputs = [ zlib libxml2 libpng ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices CoreGraphics ImageIO ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Xcode-compatible build tool"; homepage = "https://github.com/facebook/xcbuild"; platforms = platforms.unix; diff --git a/pkgs/development/tools/xib2nib/default.nix b/pkgs/development/tools/xib2nib/default.nix index 4d62f5b85714..67900dda1406 100644 --- a/pkgs/development/tools/xib2nib/default.nix +++ b/pkgs/development/tools/xib2nib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pugixml, boost, PlistCpp }: +{ lib, stdenv, fetchFromGitHub, pugixml, boost, PlistCpp }: stdenv.mkDerivation { name = "xib2nib-730e177"; @@ -13,7 +13,7 @@ stdenv.mkDerivation { buildInputs = [ PlistCpp pugixml boost ]; makeFlags = [ "PREFIX=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { maintainers = with maintainers; [ matthewbauer ]; description = "Compiles CocoaTouch .xib files into .nib"; license = licenses.mit; diff --git a/pkgs/development/tools/xqilla/default.nix b/pkgs/development/tools/xqilla/default.nix index e97a6f1cdb78..033d18608ac8 100644 --- a/pkgs/development/tools/xqilla/default.nix +++ b/pkgs/development/tools/xqilla/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, xercesc }: +{ lib, stdenv, fetchurl, xercesc }: stdenv.mkDerivation rec { pname = "xqilla"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-xerces=${xercesc}" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "An XQuery and XPath 2 library and command line utility written in C++, implemented on top of the Xerces-C library"; license = licenses.asl20 ; maintainers = with maintainers; [ obadz ]; diff --git a/pkgs/development/tools/yaml2json/default.nix b/pkgs/development/tools/yaml2json/default.nix index e1427476dd8c..d707caaec5a7 100644 --- a/pkgs/development/tools/yaml2json/default.nix +++ b/pkgs/development/tools/yaml2json/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage { @@ -15,7 +15,7 @@ buildGoPackage { sha256 = "16a2sqzbam5adbhfvilnpdabzwncs7kgpr0cn4gp09h2imzsprzw"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/bronze1man/yaml2json"; description = "Convert yaml to json"; license = with licenses; [ mit ]; diff --git a/pkgs/development/tools/yarn/default.nix b/pkgs/development/tools/yarn/default.nix index 7151c872e4d0..1868bdaf2c32 100644 --- a/pkgs/development/tools/yarn/default.nix +++ b/pkgs/development/tools/yarn/default.nix @@ -1,4 +1,4 @@ -{ stdenv, nodejs, fetchzip }: +{ lib, stdenv, nodejs, fetchzip }: stdenv.mkDerivation rec { pname = "yarn"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ln -s $out/libexec/yarn/bin/yarn.js $out/bin/yarnpkg ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://yarnpkg.com/"; description = "Fast, reliable, and secure dependency management for javascript"; license = licenses.bsd2; diff --git a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/lib/urlToName.js b/pkgs/development/tools/yarn2nix-moretea/yarn2nix/lib/urlToName.js index 81feaaf3a659..bd48b84f22d3 100644 --- a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/lib/urlToName.js +++ b/pkgs/development/tools/yarn2nix-moretea/yarn2nix/lib/urlToName.js @@ -7,9 +7,17 @@ const path = require('path') // - https://registry.npmjs.org/acorn-es7-plugin/-/acorn-es7-plugin-1.1.7.tgz // - git+https://github.com/srghma/node-shell-quote.git // - git+https://1234user:1234pass@git.graphile.com/git/users/1234user/postgraphile-supporter.git +// - https://codeload.github.com/Gargron/emoji-mart/tar.gz/934f314fd8322276765066e8a2a6be5bac61b1cf function urlToName(url) { - if (url.startsWith('git+')) { + + // Yarn generates `codeload.github.com` tarball URLs, where the final + // path component (file name) is the git hash. See #111. + // See also https://github.com/yarnpkg/yarn/blob/989a7406/src/resolvers/exotics/github-resolver.js#L24-L26 + let isCodeloadGitTarballUrl = + url.startsWith('https://codeload.github.com/') && url.includes('/tar.gz/') + + if (url.startsWith('git+') || isCodeloadGitTarballUrl) { return path.basename(url) } diff --git a/pkgs/development/tools/yj/default.nix b/pkgs/development/tools/yj/default.nix index 43771e4b6798..3244d7a0c848 100644 --- a/pkgs/development/tools/yj/default.nix +++ b/pkgs/development/tools/yj/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "yj"; @@ -15,7 +15,7 @@ buildGoModule rec { buildFlagsArray = [ "-ldflags=-s -w -X main.Version=${version}" ]; - meta = with stdenv.lib; { + meta = with lib; { description = ''Convert YAML <=> TOML <=> JSON <=> HCL''; license = licenses.asl20; maintainers = with maintainers; [ Profpatsch ]; diff --git a/pkgs/development/tools/yuicompressor/default.nix b/pkgs/development/tools/yuicompressor/default.nix index 70160c1ce664..549cc5046c4c 100644 --- a/pkgs/development/tools/yuicompressor/default.nix +++ b/pkgs/development/tools/yuicompressor/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, jre }: +{ lib, stdenv, fetchurl, makeWrapper, jre }: stdenv.mkDerivation rec { pname = "yuicompressor"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { "-cp $out/lib/yuicompressor.jar com.yahoo.platform.yui.compressor.YUICompressor" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A JavaScript and CSS minifier"; homepage = "http://yui.github.io/yuicompressor/"; license = licenses.bsd3; diff --git a/pkgs/development/web/csslint/default.nix b/pkgs/development/web/csslint/default.nix index a1c656fb766e..9a8169429791 100644 --- a/pkgs/development/web/csslint/default.nix +++ b/pkgs/development/web/csslint/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, nodejs }: +{ lib, stdenv, fetchurl, nodejs }: stdenv.mkDerivation rec { version = "0.10.0"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { mv $out/bin/cli.js $out/bin/csslint ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Checks CSS for syntax errors and other problems"; longDescription = '' CSSLint is a tool to help point out problems with your CSS diff --git a/pkgs/development/web/cypress/default.nix b/pkgs/development/web/cypress/default.nix index 7802bd6ebcbf..927414993231 100644 --- a/pkgs/development/web/cypress/default.nix +++ b/pkgs/development/web/cypress/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { ln -s $out/opt/cypress/Cypress $out/bin/Cypress ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Fast, easy and reliable testing for anything that runs in a browser"; homepage = "https://www.cypress.io"; license = licenses.mit; diff --git a/pkgs/development/web/deno/default.nix b/pkgs/development/web/deno/default.nix index 8f7452fc6d66..b669d34739e4 100644 --- a/pkgs/development/web/deno/default.nix +++ b/pkgs/development/web/deno/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , fetchFromGitHub , rust @@ -18,16 +18,16 @@ let in rustPlatform.buildRustPackage rec { pname = "deno"; - version = "1.5.3"; + version = "1.6.3"; src = fetchFromGitHub { owner = "denoland"; repo = pname; rev = "v${version}"; - sha256 = "0dxjcab10kqfkflq1x9np5wxlysq33swdwi2f28bi7q312sw5x2y"; + sha256 = "1wmkx458fpsfw57ysawxc0ghxag8v051hiyswm7nnb7gckrm6j8z"; fetchSubmodules = true; }; - cargoSha256 = "0lhdrsvmf5b4fq2yg9vc00q1sgc1fjk0fh5axs2zffcpsp73ay2k"; + cargoSha256 = "08vzsp53019gmxkn8lpa6l84w3fvbrnr11lzrfgf99nmii6l2hq5"; # Install completions post-install nativeBuildInputs = [ installShellFiles ]; @@ -64,7 +64,7 @@ rustPlatform.buildRustPackage rec { passthru.updateScript = ./update/update.ts; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://deno.land/"; changelog = "${src.meta.homepage}/releases/tag/v${version}"; description = "A secure runtime for JavaScript and TypeScript"; diff --git a/pkgs/development/web/deno/deps.nix b/pkgs/development/web/deno/deps.nix index 09c7b3973d9a..4426c600df75 100644 --- a/pkgs/development/web/deno/deps.nix +++ b/pkgs/development/web/deno/deps.nix @@ -2,11 +2,11 @@ {}: rec { rustyV8Lib = { - version = "0.12.0"; + version = "0.15.0"; sha256s = { - x86_64-linux = "18pim960fh18wrdkhirlj4hnnbxrk172r7yksdn2k5z9lgccighg"; - aarch64-linux = "0d1c8kcz44n1mqprspnshzbqlqw7mq7vryxpmd49gw3fvhcy66y7"; - x86_64-darwin = "1pc2dfq8p1a8dahkc4g8r6b9zwnvds60zc2lgbf8cj5n0ijd06y1"; + x86_64-linux = "1j789pvqh44vsffzl5wg3pp3awrlixjrhbnjx2klsml7jv0lp0mq"; + aarch64-linux = "13srja4vc275ygm806hcsr8mxjnd9qkzaqs58lxnp0702qs5xls6"; + x86_64-darwin = "0aij9yb5i1r3pz0pyl51qdbgfspfdngwbk1qgkp4gxzl3cbnysx1"; }; }; } diff --git a/pkgs/development/web/grails/default.nix b/pkgs/development/web/grails/default.nix index 55ec74eb1735..0668c5107b44 100644 --- a/pkgs/development/web/grails/default.nix +++ b/pkgs/development/web/grails/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip +{ lib, stdenv, fetchurl, unzip # If jdk is null, require JAVA_HOME in runtime environment, else store # JAVA_HOME=${jdk.home} into grails. , jdk ? null @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { preferLocalBuild = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Full stack, web application framework for the JVM"; longDescription = '' Grails is an Open Source, full stack, web application framework for the diff --git a/pkgs/development/web/insomnia/default.nix b/pkgs/development/web/insomnia/default.nix index 15dc040dc571..3311253e202d 100644 --- a/pkgs/development/web/insomnia/default.nix +++ b/pkgs/development/web/insomnia/default.nix @@ -1,4 +1,4 @@ -{ stdenv, makeWrapper, fetchurl, dpkg, alsaLib, atk, cairo, cups, dbus, expat +{ lib, stdenv, makeWrapper, fetchurl, dpkg, alsaLib, atk, cairo, cups, dbus, expat , fontconfig, freetype, gdk-pixbuf, glib, gnome2, pango, nspr, nss, gtk3, gtk2 , at-spi2-atk, gsettings-desktop-schemas, gobject-introspection, wrapGAppsHook , libX11, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext @@ -81,7 +81,7 @@ in stdenv.mkDerivation rec { wrapProgram "$out/bin/insomnia" --prefix LD_LIBRARY_PATH : ${runtimeLibs} ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://insomnia.rest/"; description = "The most intuitive cross-platform REST API Client"; license = licenses.mit; diff --git a/pkgs/development/web/kcgi/default.nix b/pkgs/development/web/kcgi/default.nix index 0ba764ddbfda..152094b4498b 100644 --- a/pkgs/development/web/kcgi/default.nix +++ b/pkgs/development/web/kcgi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgconfig, fetchFromGitHub, libbsd }: +{ lib, stdenv, pkgconfig, fetchFromGitHub, libbsd }: stdenv.mkDerivation rec { pname = "kcgi"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { installFlags = [ "DESTDIR=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://kristaps.bsd.lv/kcgi"; description = "Minimal CGI and FastCGI library for C/C++"; license = licenses.isc; diff --git a/pkgs/development/web/kore/default.nix b/pkgs/development/web/kore/default.nix index 5a6b9930d21e..d3efdc53ca46 100644 --- a/pkgs/development/web/kore/default.nix +++ b/pkgs/development/web/kore/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, openssl, curl, postgresql, yajl }: +{ lib, stdenv, fetchFromGitHub, openssl, curl, postgresql, yajl }: stdenv.mkDerivation rec { pname = "kore"; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "An easy to use web application framework for C"; homepage = "https://kore.io"; license = licenses.isc; diff --git a/pkgs/development/web/nodejs/v10.nix b/pkgs/development/web/nodejs/v10.nix index a1df5ddd741e..fa383e8f0c33 100644 --- a/pkgs/development/web/nodejs/v10.nix +++ b/pkgs/development/web/nodejs/v10.nix @@ -8,7 +8,7 @@ let in buildNodejs { inherit enableNpm; - version = "10.23.0"; - sha256 = "07vlqr0493a569i0npwgkxk5wa4vc7j68jsivchg08y2slwn0dgx"; + version = "10.23.1"; + sha256 = "1ypddif8jc8qrw9n1f8zbpknjcbnjc9xhpm57hc5nqbrmzsidal8"; patches = stdenv.lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff; } diff --git a/pkgs/development/web/nodejs/v12.nix b/pkgs/development/web/nodejs/v12.nix index 184585f12d43..ab082612c9d4 100644 --- a/pkgs/development/web/nodejs/v12.nix +++ b/pkgs/development/web/nodejs/v12.nix @@ -8,7 +8,7 @@ let in buildNodejs { inherit enableNpm; - version = "12.20.0"; - sha256 = "12s2vjrlhgap2r12s7rqf0r2wzh9q2r5dkh3ak9fhrgmk9fgvqv1"; + version = "12.20.1"; + sha256 = "0lqq6a2byw4qmig98j45gqnl0593xdhx1dr9k7x2nnvhblrfw3p0"; patches = stdenv.lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff; } diff --git a/pkgs/development/web/nodejs/v14.nix b/pkgs/development/web/nodejs/v14.nix index 14833bb042f4..64439688c166 100644 --- a/pkgs/development/web/nodejs/v14.nix +++ b/pkgs/development/web/nodejs/v14.nix @@ -8,7 +8,7 @@ let in buildNodejs { inherit enableNpm; - version = "14.15.3"; - sha256 = "1zplrfhsrqblvq2wxf5386wc9hf11k42jaw4mzgwy5dxx6dv3krj"; + version = "14.15.4"; + sha256 = "177cxp4fhmglyx035j8smiy1bp5fz6q2phlcl0a2mdbldkvfrdxd"; patches = stdenv.lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff; } diff --git a/pkgs/development/web/nodejs/v15.nix b/pkgs/development/web/nodejs/v15.nix index 3569ad3a1024..8687336c138d 100644 --- a/pkgs/development/web/nodejs/v15.nix +++ b/pkgs/development/web/nodejs/v15.nix @@ -8,6 +8,6 @@ let in buildNodejs { inherit enableNpm; - version = "15.5.0"; - sha256 = "1wzcypb1kawc6m5q36cd31qjg7ljby8py9qg555m4bqm5gpvvfjg"; + version = "15.5.1"; + sha256 = "0qbb4dwgsy1a82ihjxl6r8bj7mwjzb21s720y1rahisd5p69l8ic"; } diff --git a/pkgs/development/web/now-cli/default.nix b/pkgs/development/web/now-cli/default.nix index 3016ba4cb84b..3b1d2b4be4b5 100644 --- a/pkgs/development/web/now-cli/default.nix +++ b/pkgs/development/web/now-cli/default.nix @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://zeit.co/now"; description = "The Command Line Interface for Now - Global Serverless Deployments"; license = licenses.asl20; diff --git a/pkgs/development/web/postman/default.nix b/pkgs/development/web/postman/default.nix index 924f44936958..5ff4f7efb91e 100644 --- a/pkgs/development/web/postman/default.nix +++ b/pkgs/development/web/postman/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeDesktopItem, wrapGAppsHook +{ lib, stdenv, fetchurl, makeDesktopItem, wrapGAppsHook , atk, at-spi2-atk, at-spi2-core, alsaLib, cairo, cups, dbus, expat, gdk-pixbuf, glib, gtk3 , freetype, fontconfig, nss, nspr, pango, udev, libuuid, libX11, libxcb, libXi , libXcursor, libXdamage, libXrandr, libXcomposite, libXext, libXfixes @@ -93,7 +93,7 @@ stdenv.mkDerivation rec { popd ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.getpostman.com"; description = "API Development Environment"; license = licenses.postman; diff --git a/pkgs/development/web/shopify-themekit/default.nix b/pkgs/development/web/shopify-themekit/default.nix index a50140c15327..60a3d330ab82 100644 --- a/pkgs/development/web/shopify-themekit/default.nix +++ b/pkgs/development/web/shopify-themekit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "shopify-themekit"; @@ -15,7 +15,7 @@ buildGoPackage rec { sha256 = "1780h33mf2h2lv6mr4xx3shfvsabr7w138yb59vvdgvjng9wjkg0"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A command line tool for shopify themes"; homepage = "https://shopify.github.io/themekit/"; license = licenses.mit; diff --git a/pkgs/development/web/valum/default.nix b/pkgs/development/web/valum/default.nix index e4407b9f556b..59db90741d34 100644 --- a/pkgs/development/web/valum/default.nix +++ b/pkgs/development/web/valum/default.nix @@ -1,4 +1,4 @@ -{ stdenv, meson, ninja, pkgconfig, fetchFromGitHub, glib, vala, ctpl +{ lib, stdenv, meson, ninja, pkgconfig, fetchFromGitHub, glib, vala, ctpl , libgee, libsoup, fcgi }: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkgconfig ]; buildInputs = [ glib vala ctpl libgee libsoup fcgi ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/valum-framework/valum"; description = "Web micro-framework written in Vala"; license = licenses.lgpl3; diff --git a/pkgs/development/web/wml/default.nix b/pkgs/development/web/wml/default.nix index 6208bff15bc4..2b882ccc8418 100644 --- a/pkgs/development/web/wml/default.nix +++ b/pkgs/development/web/wml/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perlPackages, ncurses, lynx, makeWrapper }: +{ lib, stdenv, fetchurl, perlPackages, ncurses, lynx, makeWrapper }: perlPackages.buildPerlPackage { pname = "wml"; @@ -55,7 +55,7 @@ perlPackages.buildPerlPackage { installTargets = [ "install" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.shlomifish.org/open-source/projects/website-meta-language/"; description = "Off-line HTML generation toolkit for Unix"; license = licenses.gpl2; diff --git a/pkgs/development/web/woff2/default.nix b/pkgs/development/web/woff2/default.nix index d770fb627536..fd296d37f87e 100644 --- a/pkgs/development/web/woff2/default.nix +++ b/pkgs/development/web/woff2/default.nix @@ -1,4 +1,6 @@ -{ brotli, cmake, pkgconfig, fetchFromGitHub, stdenv, static ? false }: +{ brotli, cmake, pkgconfig, fetchFromGitHub, lib, stdenv +, static ? stdenv.hostPlatform.isStatic +}: stdenv.mkDerivation rec { pname = "woff2"; @@ -30,7 +32,7 @@ stdenv.mkDerivation rec { sed 's@^if (NOT BUILD_SHARED_LIBS)$@if (TRUE)@g' -i CMakeLists.txt ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Webfont compression reference code"; homepage = "https://github.com/google/woff2"; license = licenses.mit; diff --git a/pkgs/games/0ad/data.nix b/pkgs/games/0ad/data.nix index eeedae924405..1bebf922c48d 100644 --- a/pkgs/games/0ad/data.nix +++ b/pkgs/games/0ad/data.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, zeroad-unwrapped }: +{ lib, stdenv, fetchurl, zeroad-unwrapped }: stdenv.mkDerivation rec { pname = "0ad-data"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { cp -r binaries/data $out/share/0ad/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A free, open-source game of ancient warfare -- data files"; homepage = "https://play0ad.com/"; license = licenses.cc-by-sa-30; diff --git a/pkgs/games/0ad/game.nix b/pkgs/games/0ad/game.nix index 4c9ad7068878..558c69c14d6e 100644 --- a/pkgs/games/0ad/game.nix +++ b/pkgs/games/0ad/game.nix @@ -90,7 +90,7 @@ stdenv.mkDerivation rec { install -D build/resources/0ad.desktop $out/share/applications/0ad.desktop ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A free, open-source game of ancient warfare"; homepage = "https://play0ad.com/"; license = with licenses; [ diff --git a/pkgs/games/1oom/default.nix b/pkgs/games/1oom/default.nix index 70c21a3cc1d8..54bfb4d0b321 100644 --- a/pkgs/games/1oom/default.nix +++ b/pkgs/games/1oom/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, autoreconfHook, libsamplerate, SDL2, SDL2_mixer, readline }: +{ lib, stdenv, fetchFromGitLab, autoreconfHook, libsamplerate, SDL2, SDL2_mixer, readline }: stdenv.mkDerivation rec { pname = "1oom"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { HACKING NEWS PHILOSOPHY README doc/*.txt ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://kilgoretroutmaskreplicant.gitlab.io/plain-html/"; description = "Master of Orion (1993) game engine recreation"; license = licenses.gpl2Only; diff --git a/pkgs/games/2048-in-terminal/default.nix b/pkgs/games/2048-in-terminal/default.nix index 446252062fac..8ac72db65f5f 100644 --- a/pkgs/games/2048-in-terminal/default.nix +++ b/pkgs/games/2048-in-terminal/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ncurses }: +{ lib, stdenv, fetchFromGitHub, ncurses }: stdenv.mkDerivation rec { pname = "2048-in-terminal"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ''; installFlags = [ "DESTDIR=$(out)/bin" ]; - meta = with stdenv.lib; { + meta = with lib; { inherit (src.meta) homepage; description = "Animated console version of the 2048 game"; license = licenses.mit; diff --git a/pkgs/games/20kly/default.nix b/pkgs/games/20kly/default.nix index 8c81b8b2360e..e8778d7bebcf 100644 --- a/pkgs/games/20kly/default.nix +++ b/pkgs/games/20kly/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , python }: @@ -30,7 +30,7 @@ python.pkgs.buildPythonApplication rec { install -Dm755 lightyears "$out/bin/lightyears" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A steampunk-themed strategy game where you have to manage a steam supply network"; homepage = "http://jwhitham.org.uk/20kly/"; license = licenses.gpl2; diff --git a/pkgs/games/90secondportraits/default.nix b/pkgs/games/90secondportraits/default.nix index 334a7f873bb8..a5b504995f79 100644 --- a/pkgs/games/90secondportraits/default.nix +++ b/pkgs/games/90secondportraits/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, love, lua, makeWrapper, makeDesktopItem }: +{ lib, stdenv, fetchurl, love, lua, makeWrapper, makeDesktopItem }: let pname = "90secondportraits"; @@ -48,7 +48,7 @@ stdenv.mkDerivation { ln -s ${desktopItem}/share/applications/* $out/share/applications/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A silly speed painting game"; maintainers = with maintainers; [ leenaars ]; platforms = platforms.linux; diff --git a/pkgs/games/abbaye-des-morts/default.nix b/pkgs/games/abbaye-des-morts/default.nix index 103b67e99edf..5e536d2b18df 100644 --- a/pkgs/games/abbaye-des-morts/default.nix +++ b/pkgs/games/abbaye-des-morts/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, SDL2, SDL2_image, SDL2_mixer }: +{ lib, stdenv, fetchFromGitHub, SDL2, SDL2_image, SDL2_mixer }: stdenv.mkDerivation rec { pname = "abbaye-des-morts"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { mkdir -p $out/share/applications ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://locomalito.com/abbaye_des_morts.php"; description = "A retro arcade video game"; license = licenses.gpl3; diff --git a/pkgs/games/adom/default.nix b/pkgs/games/adom/default.nix index 055959fff2d0..c5ffe950983a 100644 --- a/pkgs/games/adom/default.nix +++ b/pkgs/games/adom/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, patchelf, zlib, libmad, libpng12, libcaca, libGLU, libGL, alsaLib, libpulseaudio +{ lib, stdenv, fetchurl, patchelf, zlib, libmad, libpng12, libcaca, libGLU, libGL, alsaLib, libpulseaudio , xorg }: let @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { chmod +x $out/bin/adom ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A rogue-like game with nice graphical interface"; homepage = "http://adom.de/"; license = licenses.unfreeRedistributable; diff --git a/pkgs/games/airstrike/default.nix b/pkgs/games/airstrike/default.nix index 10dfc7501fb7..f45ac2f01532 100644 --- a/pkgs/games/airstrike/default.nix +++ b/pkgs/games/airstrike/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, SDL, SDL_image }: +{ lib, stdenv, fetchurl, makeWrapper, SDL, SDL_image }: stdenv.mkDerivation rec { pname = "airstrike-pre"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { --run "cd $out/share" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A 2d dogfighting game"; homepage = "https://icculus.org/airstrike/"; license = licenses.gpl2; diff --git a/pkgs/games/alephone/default.nix b/pkgs/games/alephone/default.nix index 8dfef420a8d8..7691001edacf 100644 --- a/pkgs/games/alephone/default.nix +++ b/pkgs/games/alephone/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, boost, curl, ffmpeg, icoutils, libGLU, libmad, libogg +{ lib, stdenv, fetchurl, boost, curl, ffmpeg, icoutils, libGLU, libmad, libogg , libpng, libsndfile, libvorbis, lua, pkgconfig, SDL2, SDL2_image, SDL2_net , SDL2_ttf, smpeg, speex, zziplib, zlib, makeWrapper, makeDesktopItem, unzip , alephone }: @@ -52,7 +52,7 @@ let popd ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Aleph One is the open source continuation of Bungie’s Marathon 2 game engine"; homepage = "https://alephone.lhowon.org/"; diff --git a/pkgs/games/alienarena/default.nix b/pkgs/games/alienarena/default.nix index a28cf2508e28..5e9fd54e4ffd 100644 --- a/pkgs/games/alienarena/default.nix +++ b/pkgs/games/alienarena/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libjpeg, libX11, libXxf86vm, curl, libogg +{ lib, stdenv, fetchurl, pkgconfig, libjpeg, libX11, libXxf86vm, curl, libogg , libvorbis, freetype, openal, libGL }: stdenv.mkDerivation { @@ -19,7 +19,7 @@ stdenv.mkDerivation { --replace libGL.so.1 ${libGL}/lib/libGL.so.1 ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A free, stand-alone first-person shooter computer game"; longDescription = '' Do you like old school deathmatch with modern features? How diff --git a/pkgs/games/amoeba/data.nix b/pkgs/games/amoeba/data.nix index f86ee71aa424..193c710b31a1 100644 --- a/pkgs/games/amoeba/data.nix +++ b/pkgs/games/amoeba/data.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "amoeba-data"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { cp demo.dat $out/share/amoeba/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Fast-paced, polished OpenGL demonstration by Excess (data files)"; homepage = "https://packages.qa.debian.org/a/amoeba-data.html"; license = licenses.unfree; diff --git a/pkgs/games/amoeba/default.nix b/pkgs/games/amoeba/default.nix index 8c4d9ef10926..071a81bcb923 100644 --- a/pkgs/games/amoeba/default.nix +++ b/pkgs/games/amoeba/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, amoeba-data, alsaLib, expat, freetype, gtk2, libvorbis, libGLU, xorg, pkgconfig }: +{ lib, stdenv, fetchurl, amoeba-data, alsaLib, expat, freetype, gtk2, libvorbis, libGLU, xorg, pkgconfig }: stdenv.mkDerivation rec { name = "amoeba-${version}-${debver}"; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { cp ../debian/amoeba.1 $out/share/man/man1/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Fast-paced, polished OpenGL demonstration by Excess"; homepage = "https://packages.qa.debian.org/a/amoeba.html"; license = licenses.gpl2; # Engine is GPLv2, data files in amoeba-data nonfree diff --git a/pkgs/games/among-sus/default.nix b/pkgs/games/among-sus/default.nix index c422ed1c8e52..1ec0a42ea18e 100644 --- a/pkgs/games/among-sus/default.nix +++ b/pkgs/games/among-sus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, port ? "1234" }: +{ lib, stdenv, fetchgit, port ? "1234" }: stdenv.mkDerivation { pname = "among-sus-unstable"; @@ -19,7 +19,7 @@ stdenv.mkDerivation { install -Dm755 among-sus $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://git.sr.ht/~martijnbraam/among-sus"; description = "Among us, but it's a text adventure"; license = licenses.agpl3Plus; diff --git a/pkgs/games/angband/default.nix b/pkgs/games/angband/default.nix index 937fd30d405a..ddf3c62307d3 100644 --- a/pkgs/games/angband/default.nix +++ b/pkgs/games/angband/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, ncurses5 }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, ncurses5 }: stdenv.mkDerivation rec { pname = "angband"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses5 ]; installFlags = [ "bindir=$(out)/bin" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://rephial.org/"; description = "A single-player roguelike dungeon exploration game"; maintainers = [ maintainers.chattered ]; diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix index 0d713b1f71e1..14e9704a432d 100644 --- a/pkgs/games/anki/default.nix +++ b/pkgs/games/anki/default.nix @@ -128,6 +128,9 @@ buildPythonApplication rec { # UTF-8 locale needed for testing LC_ALL = "en_US.UTF-8"; + # tests fail with to many open files + doCheck = !stdenv.isDarwin; + # - Anki writes some files to $HOME during tests # - Skip tests using network checkPhase = '' @@ -196,6 +199,6 @@ buildPythonApplication rec { license = licenses.agpl3Plus; broken = stdenv.hostPlatform.isAarch64; platforms = platforms.mesaPlatforms; - maintainers = with maintainers; [ oxij Profpatsch enzime ]; + maintainers = with maintainers; [ oxij Profpatsch ]; }; } diff --git a/pkgs/games/armagetronad/default.nix b/pkgs/games/armagetronad/default.nix index d4d2cbef164d..e271db867340 100644 --- a/pkgs/games/armagetronad/default.nix +++ b/pkgs/games/armagetronad/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, SDL, libxml2, SDL_image, libjpeg, libpng, libGLU, libGL, zlib }: +{ lib, stdenv, fetchurl, SDL, libxml2, SDL_image, libjpeg, libpng, libGLU, libGL, zlib }: let versionMajor = "0.2.8"; @@ -21,7 +21,7 @@ stdenv.mkDerivation { configureFlags = [ "--disable-etc" ]; buildInputs = [ SDL SDL_image libxml2 libjpeg libpng libGLU libGL zlib ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://armagetronad.org"; description = "An multiplayer networked arcade racing game in 3D similar to Tron"; license = licenses.gpl2; diff --git a/pkgs/games/arx-libertatis/default.nix b/pkgs/games/arx-libertatis/default.nix index 52935c96cdb4..b82ee2a3a991 100644 --- a/pkgs/games/arx-libertatis/default.nix +++ b/pkgs/games/arx-libertatis/default.nix @@ -37,7 +37,6 @@ stdenv.mkDerivation { "-DImageMagick_mogrify_EXECUTABLE=${imagemagick.out}/bin/mogrify" ]; - enableParallelBuilding = true; dontWrapQtApps = true; postInstall = '' diff --git a/pkgs/games/asc/default.nix b/pkgs/games/asc/default.nix index 28b144a4e864..1b7feda4ebb7 100644 --- a/pkgs/games/asc/default.nix +++ b/pkgs/games/asc/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, SDL, SDL_image, SDL_mixer, SDL_sound, libsigcxx, physfs +{ fetchurl, lib, stdenv, SDL, SDL_image, SDL_mixer, SDL_sound, libsigcxx, physfs , boost, expat, freetype, libjpeg, wxGTK, lua, perl, pkgconfig, zlib, zip, bzip2 , libpng, libtiff, fluidsynth, libmikmod, libvorbis, flac, libogg }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { libtiff fluidsynth libmikmod flac libvorbis libogg ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Turn based strategy game"; longDescription = '' diff --git a/pkgs/games/astromenace/default.nix b/pkgs/games/astromenace/default.nix index 7f1ca325746f..1882f5a9b68d 100644 --- a/pkgs/games/astromenace/default.nix +++ b/pkgs/games/astromenace/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1rkz6lwjcd5mwv72kf07ghvx6z46kf3xs250mjbmnmjpn7r5sxwv"; }; - buildInputs = [ cmake xlibsWrapper libGLU libGL SDL openal freealut libogg libvorbis ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ xlibsWrapper libGLU libGL SDL openal freealut libogg libvorbis ]; buildPhase = '' cmake ./ diff --git a/pkgs/games/atanks/default.nix b/pkgs/games/atanks/default.nix index bb11acf38664..f92f2e19c33d 100644 --- a/pkgs/games/atanks/default.nix +++ b/pkgs/games/atanks/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, allegro }: +{ lib, stdenv, fetchurl, allegro }: stdenv.mkDerivation rec { pname = "atanks"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)/" "INSTALL=install" "CXX=g++" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Atomic Tanks ballistics game"; homepage = "http://atanks.sourceforge.net/"; maintainers = [ maintainers.raskin ]; diff --git a/pkgs/games/augustus/default.nix b/pkgs/games/augustus/default.nix index 18c8842e594e..b7c2a0b79792 100644 --- a/pkgs/games/augustus/default.nix +++ b/pkgs/games/augustus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, SDL2, SDL2_mixer, libpng }: +{ lib, stdenv, fetchFromGitHub, cmake, SDL2, SDL2_mixer, libpng }: stdenv.mkDerivation rec { pname = "augustus"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ SDL2 SDL2_mixer libpng ]; - meta = with stdenv.lib; { + meta = with lib; { description = "An open source re-implementation of Caesar III. Fork of Julius incorporating gameplay changes"; homepage = "https://github.com/Keriew/augustus"; license = licenses.agpl3Only; diff --git a/pkgs/games/banner/default.nix b/pkgs/games/banner/default.nix index e0f9ca41c6d0..084dd37d3224 100644 --- a/pkgs/games/banner/default.nix +++ b/pkgs/games/banner/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "banner"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "ISSnGzrFSzSj/+KxgeFtaw4H+4Ea5x5S5C8xjcjKWqQ="; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://software.cedar-solutions.com/utilities.html"; description = "Print large banners to ASCII terminals"; license = licenses.gpl2Only; diff --git a/pkgs/games/bastet/default.nix b/pkgs/games/bastet/default.nix index d68a05137b43..053eca57528b 100644 --- a/pkgs/games/bastet/default.nix +++ b/pkgs/games/bastet/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, ncurses, boost }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, ncurses, boost }: stdenv.mkDerivation rec { pname = "bastet"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { cp bastet.6 "$out"/share/man/man6 ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Tetris clone with 'bastard' block-choosing AI"; homepage = "http://fph.altervista.org/prog/bastet.html"; license = licenses.gpl3; diff --git a/pkgs/games/beret/default.nix b/pkgs/games/beret/default.nix index f640e2c6aefa..db9e6b96902a 100644 --- a/pkgs/games/beret/default.nix +++ b/pkgs/games/beret/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, SDL, SDL_image, SDL_ttf, SDL_mixer }: +{ lib, stdenv, fetchurl, SDL, SDL_image, SDL_ttf, SDL_mixer }: stdenv.mkDerivation { name = "beret-1.2.0"; @@ -29,7 +29,7 @@ stdenv.mkDerivation { cp -av tahoma.ttf images music rooms sfx $out/share ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A 2D puzzle-platformer game about a scientist with telekinetic abilities"; homepage = "http://kiwisauce.com/beret/"; license = licenses.lgpl2; diff --git a/pkgs/games/blobby/default.nix b/pkgs/games/blobby/default.nix index ea8bddfa16d4..98c31f4e9fe8 100644 --- a/pkgs/games/blobby/default.nix +++ b/pkgs/games/blobby/default.nix @@ -1,24 +1,21 @@ -{stdenv, fetchurl, SDL2, SDL2_image, libGLU, libGL, cmake, physfs, boost, zip, zlib -, pkgconfig, unzip}: +{ stdenv, fetchurl, SDL2, SDL2_image, libGLU, libGL, cmake, physfs, boost, zip, zlib, pkg-config }: + stdenv.mkDerivation rec { - version = "1.0"; pname = "blobby-volley"; + version = "1.0"; src = fetchurl { url = "mirror://sourceforge/blobby/Blobby%20Volley%202%20%28Linux%29/1.0/blobby2-linux-1.0.tar.gz"; sha256 = "1qpmbdlyhfbrdsq4vkb6cb3b8mh27fpizb71q4a21ala56g08yms"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [SDL2 SDL2_image libGLU libGL cmake physfs boost zip zlib - unzip]; + nativeBuildInputs = [ cmake pkg-config zip ]; + buildInputs = [ SDL2 SDL2_image libGLU libGL physfs boost zlib ]; preConfigure='' sed -e '1i#include ' -i src/NetworkMessage.cpp ''; - inherit unzip; - postInstall = '' cp ../data/Icon.bmp "$out/share/blobby/" mv "$out/bin"/blobby{,.bin} @@ -26,13 +23,12 @@ stdenv.mkDerivation rec { chmod a+x "$out/bin/blobby" ''; - meta = { + meta = with stdenv.lib; { description = ''A blobby volleyball game''; - license = stdenv.lib.licenses.bsd3; - platforms = with stdenv.lib.platforms; linux; - maintainers = with stdenv.lib.maintainers; [raskin]; + license = licenses.bsd3; + platforms = platforms.linux; + maintainers = with maintainers; [ raskin ]; homepage = "http://blobby.sourceforge.net/"; downloadPage = "https://sourceforge.net/projects/blobby/files/Blobby%20Volley%202%20%28Linux%29/"; - inherit version; }; } diff --git a/pkgs/games/boohu/default.nix b/pkgs/games/boohu/default.nix index 3ca8ee4693a3..9b46420d5fff 100644 --- a/pkgs/games/boohu/default.nix +++ b/pkgs/games/boohu/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, buildGoPackage}: +{lib, stdenv, fetchurl, buildGoPackage}: buildGoPackage rec { @@ -16,7 +16,7 @@ buildGoPackage rec { postInstall = "mv $out/bin/boohu.git $out/bin/boohu"; - meta = with stdenv.lib; { + meta = with lib; { description = "A new coffee-break roguelike game"; longDescription = '' Break Out Of Hareka's Underground (Boohu) is a roguelike game mainly diff --git a/pkgs/games/braincurses/default.nix b/pkgs/games/braincurses/default.nix index 86a8f865442b..f3f862b97ef9 100644 --- a/pkgs/games/braincurses/default.nix +++ b/pkgs/games/braincurses/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ncurses }: +{ lib, stdenv, fetchFromGitHub, ncurses }: stdenv.mkDerivation rec { pname = "braincurses"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { install -Dt $out/bin braincurses ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/bderrly/braincurses"; description = "A version of the classic game Mastermind"; license = licenses.gpl2; diff --git a/pkgs/games/brogue/default.nix b/pkgs/games/brogue/default.nix index 1662f847bfa9..77811e76e96d 100644 --- a/pkgs/games/brogue/default.nix +++ b/pkgs/games/brogue/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, SDL, ncurses, libtcod, makeDesktopItem }: +{ lib, stdenv, fetchurl, SDL, ncurses, libtcod, makeDesktopItem }: stdenv.mkDerivation rec { pname = "brogue"; @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { # fix crash; shouldn’t be a security risk because it’s an offline game hardeningDisable = [ "stackprotector" "fortify" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A roguelike game"; homepage = "https://sites.google.com/site/broguegame/"; license = licenses.agpl3; diff --git a/pkgs/games/btanks/default.nix b/pkgs/games/btanks/default.nix index 5bb7cfa215bc..cb6078026dc2 100644 --- a/pkgs/games/btanks/default.nix +++ b/pkgs/games/btanks/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, sconsPackages, pkgconfig, SDL, libGL, zlib, smpeg +{ lib, stdenv, fetchurl, fetchpatch, sconsPackages, pkgconfig, SDL, libGL, zlib, smpeg , SDL_image, libvorbis, expat, zip, lua }: stdenv.mkDerivation rec { @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { }) ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Fast 2d tank arcade game"; homepage = "https://sourceforge.net/projects/btanks/"; license = licenses.gpl2Plus; diff --git a/pkgs/games/cataclysm-dda/common.nix b/pkgs/games/cataclysm-dda/common.nix index 9ec73cdebe03..c41b0df5a80d 100644 --- a/pkgs/games/cataclysm-dda/common.nix +++ b/pkgs/games/cataclysm-dda/common.nix @@ -1,4 +1,4 @@ -{ stdenv, runtimeShell, pkgconfig, gettext, ncurses, CoreFoundation +{ lib, stdenv, runtimeShell, pkgconfig, gettext, ncurses, CoreFoundation , tiles, SDL2, SDL2_image, SDL2_mixer, SDL2_ttf, freetype, Cocoa , debug , useXdgDir @@ -79,7 +79,7 @@ stdenv.mkDerivation { isCurses = !tiles; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A free, post apocalyptic, zombie infested rogue-like"; longDescription = '' Cataclysm: Dark Days Ahead is a roguelike set in a post-apocalyptic world. diff --git a/pkgs/games/chessx/default.nix b/pkgs/games/chessx/default.nix index 5b3be969cf1e..9f8e4c6cc5ac 100644 --- a/pkgs/games/chessx/default.nix +++ b/pkgs/games/chessx/default.nix @@ -1,5 +1,5 @@ { mkDerivation -, stdenv +, lib, stdenv , pkgconfig , zlib , qtbase @@ -46,7 +46,7 @@ mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://chessx.sourceforge.net/"; description = "Browse and analyse chess games"; license = licenses.gpl2; diff --git a/pkgs/games/chiaki/default.nix b/pkgs/games/chiaki/default.nix index 27dde97ead7b..e3a2560ac101 100644 --- a/pkgs/games/chiaki/default.nix +++ b/pkgs/games/chiaki/default.nix @@ -1,30 +1,62 @@ -{ lib, mkDerivation, fetchFromGitHub -, cmake, ffmpeg, libopus, qtbase, qtmultimedia, qtsvg, pkgconfig, protobuf -, python3Packages, SDL2 }: +{ lib, stdenv +, fetchgit +, cmake +, pkg-config +, protobuf +, python3Packages +, ffmpeg +, libopus +, mkDerivation +, qtbase +, qtmultimedia +, qtsvg +, SDL2 +, libevdev +, udev +, qtmacextras +}: mkDerivation rec { pname = "chiaki"; - version = "1.3.0"; + version = "2.0.1"; - src = fetchFromGitHub { + src = fetchgit { + url = "https://git.sr.ht/~thestr4ng3r/chiaki"; rev = "v${version}"; - owner = "thestr4ng3r"; - repo = "chiaki"; fetchSubmodules = true; - sha256 = "07w7srxxr8zjp91p5n1sqf4j8lljfrm78lz1m15s2nzlm579015h"; + sha256 = "0l532i9j6wmzbxqx7fg69kgfd1zy1r1wlw6f756vpxpgswivi892"; }; nativeBuildInputs = [ - cmake pkgconfig protobuf python3Packages.python python3Packages.protobuf + cmake + pkg-config + protobuf + python3Packages.protobuf + python3Packages.python + ]; + + buildInputs = [ + ffmpeg + libopus + qtbase + qtmultimedia + qtsvg + protobuf + SDL2 + ] ++ stdenv.lib.optionals stdenv.isLinux [ + libevdev + udev + ] ++ stdenv.lib.optionals stdenv.isDarwin [ + qtmacextras ]; - buildInputs = [ ffmpeg libopus qtbase qtmultimedia qtsvg protobuf SDL2 ]; doCheck = true; + installCheckPhase = "$out/bin/chiaki --help"; meta = with lib; { - homepage = "https://github.com/thestr4ng3r/chiaki"; - description = "Free and Open Source PS4 Remote Play Client"; + homepage = "https://git.sr.ht/~thestr4ng3r/chiaki"; + description = "Free and Open Source PlayStation Remote Play Client"; license = licenses.gpl3Plus; maintainers = with maintainers; [ delroth ]; platforms = platforms.all; diff --git a/pkgs/games/ckan/default.nix b/pkgs/games/ckan/default.nix index a13ff8d66faf..b0a509ce4db1 100644 --- a/pkgs/games/ckan/default.nix +++ b/pkgs/games/ckan/default.nix @@ -1,44 +1,34 @@ -{ stdenv, fetchFromGitHub, makeWrapper, perl, mono, gtk2, curl }: +{ lib, stdenv, fetchurl, makeWrapper, mono, gtk2, curl }: stdenv.mkDerivation rec { pname = "ckan"; - version = "1.16.1"; + version = "1.29.2"; - src = fetchFromGitHub { - owner = "KSP-CKAN"; - repo = "CKAN"; - rev = "v${version}"; - sha256 = "0lfvl8w09lakz35szp5grfvhq8xx486f5igvj1m6azsql4n929lg"; + src = fetchurl { + url = "https://github.com/KSP-CKAN/CKAN/releases/download/v${version}/ckan.exe"; + sha256 = "10vd61mw2y7vmbnp6nd7b2sq22ixqd7zmd278z210w4njmvqn97h"; }; - buildInputs = [ makeWrapper perl mono ]; + dontUnpack = true; - postPatch = '' - substituteInPlace bin/build \ - --replace /usr/bin/perl ${perl}/bin/perl - ''; - - # Tests don't currently work, as they try to write into /var/empty. - doCheck = false; - checkTarget = "test"; + buildInputs = [ makeWrapper mono ]; libraries = stdenv.lib.makeLibraryPath [ gtk2 curl ]; + buildPhase = "true"; + installPhase = '' - mkdir -p $out/bin - for exe in *.exe; do - install -m 0644 $exe $out/bin - makeWrapper ${mono}/bin/mono $out/bin/$(basename $exe .exe) \ - --add-flags $out/bin/$exe \ - --set LD_LIBRARY_PATH $libraries - done + install -m 644 -D $src $out/bin/ckan.exe + makeWrapper ${mono}/bin/mono $out/bin/ckan \ + --add-flags $out/bin/ckan.exe \ + --set LD_LIBRARY_PATH $libraries ''; - meta = { + meta = with lib; { description = "Mod manager for Kerbal Space Program"; homepage = "https://github.com/KSP-CKAN/CKAN"; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.Baughn ]; - platforms = stdenv.lib.platforms.all; - }; + license = licenses.mit; + maintainers = with maintainers; [ Baughn ymarkus ]; + platforms = platforms.all; + }; } diff --git a/pkgs/games/clonehero/default.nix b/pkgs/games/clonehero/default.nix new file mode 100644 index 000000000000..504e4811432b --- /dev/null +++ b/pkgs/games/clonehero/default.nix @@ -0,0 +1,73 @@ +{ lib +, stdenv +, fetchurl +, autoPatchelfHook +, alsaLib +, gtk2 +, libXrandr +, libXScrnSaver +, udev +, zlib +}: + +let + name = "clonehero"; +in +stdenv.mkDerivation rec { + pname = "${name}-unwrapped"; + version = "0.23.2.2"; + + src = fetchurl { + url = "http://dl.clonehero.net/${name}-v${lib.removePrefix "0" version}/${name}-linux.tar.gz"; + sha256 = "0k9jcnd55yhr42gj8cmysd18yldp4k3cpk4z884p2ww03fyfq7mi"; + }; + + outputs = [ "out" "doc" ]; + + nativeBuildInputs = [ autoPatchelfHook ]; + + buildInputs = [ + # Load-time libraries (loaded from DT_NEEDED section in ELF binary) + gtk2 + stdenv.cc.cc.lib + zlib + + # Run-time libraries (loaded with dlopen) + alsaLib # ALSA sound + libXrandr # X11 resolution detection + libXScrnSaver # X11 screensaver prevention + udev # udev input drivers + ]; + + installPhase = '' + mkdir -p "$out/bin" "$out/share" + install -Dm755 ${name} "$out/bin" + cp -r clonehero_Data "$out/share" + + mkdir -p "$doc/share/${name}" + cp README.txt "$doc/share/${name}" + ''; + + # Patch required run-time libraries as load-time libraries + # + # Libraries found with: + # > strings clonehero | grep '\.so' + # and + # > strace clonehero 2>&1 | grep '\.so' + postFixup = '' + patchelf \ + --add-needed libasound.so.2 \ + --add-needed libudev.so.1 \ + --add-needed libXrandr.so.2 \ + --add-needed libXss.so.1 \ + "$out/bin/${name}" + ''; + + meta = with lib; { + description = "Clone of Guitar Hero and Rockband-style games"; + homepage = "https://clonehero.net"; + license = licenses.unfree; + maintainers = with maintainers; [ metadark ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/games/clonehero/fhs-wrapper.nix b/pkgs/games/clonehero/fhs-wrapper.nix new file mode 100644 index 000000000000..97758b2c1fab --- /dev/null +++ b/pkgs/games/clonehero/fhs-wrapper.nix @@ -0,0 +1,39 @@ +{ clonehero-unwrapped +, makeDesktopItem +, buildFHSUserEnv +, liberation_ttf +, callPackage +}: + +let + name = "clonehero"; + desktopName = "Clone Hero"; + desktopItem = makeDesktopItem { + inherit name desktopName; + comment = clonehero-unwrapped.meta.description; + exec = name; + icon = name; + categories = "Game;"; + }; +in +buildFHSUserEnv { + inherit name; + inherit (clonehero-unwrapped) meta; + + # Clone Hero has /usr/share/fonts hard-coded in its binary for looking up fonts. + # This workaround is necessary for rendering text on the keybinding screen (and possibly elsewhere) + # If a better solution is found, the FHS environment can be removed. + extraBuildCommands = '' + chmod +w usr/share + mkdir -p usr/share/fonts/truetype + ln -s ${liberation_ttf}/share/fonts/truetype/* usr/share/fonts/truetype + ''; + + extraInstallCommands = '' + mkdir -p "$out/share/applications" "$out/share/pixmaps" + cp ${desktopItem}/share/applications/* "$out/share/applications" + ln -s ${clonehero-unwrapped}/share/clonehero_Data/Resources/UnityPlayer.png "$out/share/pixmaps/${name}.png" + ''; + + runScript = callPackage ./xdg-wrapper.nix { }; +} diff --git a/pkgs/games/clonehero/xdg-wrapper.nix b/pkgs/games/clonehero/xdg-wrapper.nix new file mode 100644 index 000000000000..2890e469db05 --- /dev/null +++ b/pkgs/games/clonehero/xdg-wrapper.nix @@ -0,0 +1,21 @@ +{ stdenv, clonehero-unwrapped, writeScript }: + +# Clone Hero doesn't have an installer, so it just stores configuration & data relative to the binary. +# This wrapper works around that limitation, storing game configuration & data in XDG_CONFIG_HOME. +let + name = "clonehero"; + desktopName = "Clone Hero"; +in +writeScript "${name}-xdg-wrapper-${clonehero-unwrapped.version}" '' + #!${stdenv.shell} -e + configDir="''${XDG_CONFIG_HOME:-$HOME/.config}/unity3d/srylain Inc_/${desktopName}" + mkdir -p "$configDir" + + # Force link shipped clonehero_Data, unless directory already exists (to allow modding) + if [ ! -d "$configDir/clonehero_Data" ] || [ -L "$configDir/clonehero_Data" ]; then + ln -snf ${clonehero-unwrapped}/share/clonehero_Data "$configDir" + fi + + # Fake argv[0] to emulate running in the config directory + exec -a "$configDir/${name}" ${clonehero-unwrapped}/bin/${name} "$@" +'' diff --git a/pkgs/games/cockatrice/default.nix b/pkgs/games/cockatrice/default.nix index ac31de4e4c24..f8b90f87a723 100644 --- a/pkgs/games/cockatrice/default.nix +++ b/pkgs/games/cockatrice/default.nix @@ -14,10 +14,10 @@ mkDerivation rec { }; buildInputs = [ - cmake qtbase qtmultimedia protobuf qttools qtwebsockets + qtbase qtmultimedia protobuf qttools qtwebsockets ]; - nativeBuildInputs = [ wrapQtAppsHook ]; + nativeBuildInputs = [ cmake wrapQtAppsHook ]; meta = { homepage = "https://github.com/Cockatrice/Cockatrice"; diff --git a/pkgs/games/colobot/data.nix b/pkgs/games/colobot/data.nix index f1a4782fad6e..7ae9dbb2b5ed 100644 --- a/pkgs/games/colobot/data.nix +++ b/pkgs/games/colobot/data.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { cd localSrc ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://colobot.info/"; description = "Game data for colobot"; license = licenses.gpl3; diff --git a/pkgs/games/colobot/default.nix b/pkgs/games/colobot/default.nix index 9c0cbe7949c0..25b91d80f272 100644 --- a/pkgs/games/colobot/default.nix +++ b/pkgs/games/colobot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, boost, SDL2, SDL2_image, SDL2_ttf, libpng +{ lib, stdenv, fetchFromGitHub, cmake, boost, SDL2, SDL2_image, SDL2_ttf, libpng , glew, gettext, libsndfile, libvorbis, libogg, physfs, openal , xmlstarlet, doxygen, python3, callPackage }: @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://colobot.info/"; description = "Colobot: Gold Edition is a real-time strategy game, where you can program your bots"; license = licenses.gpl3; diff --git a/pkgs/games/commandergenius/default.nix b/pkgs/games/commandergenius/default.nix index 251ea852cf18..c375668c2221 100644 --- a/pkgs/games/commandergenius/default.nix +++ b/pkgs/games/commandergenius/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, SDL2, SDL2_image, pkgconfig +{ lib, stdenv, fetchFromGitLab, SDL2, SDL2_image, pkgconfig , libvorbis, libGL, boost, cmake, zlib, curl, SDL2_mixer, python3 }: @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { sed -i 's,APPDIR games,APPDIR bin,' src/install.cmake ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Modern Interpreter for the Commander Keen Games"; longDescription = '' Commander Genius is an open-source clone of diff --git a/pkgs/games/crawl/default.nix b/pkgs/games/crawl/default.nix index 20e31c979e6f..353a7b029cf3 100644 --- a/pkgs/games/crawl/default.nix +++ b/pkgs/games/crawl/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Open-source, single-player, role-playing roguelike game"; homepage = "http://crawl.develz.org/"; longDescription = '' diff --git a/pkgs/games/curseofwar/default.nix b/pkgs/games/curseofwar/default.nix index 9aff3798b6ba..6271a60f5b9c 100644 --- a/pkgs/games/curseofwar/default.nix +++ b/pkgs/games/curseofwar/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , ncurses , SDL @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { "CC=${stdenv.cc.targetPrefix}cc" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A fast-paced action strategy game"; homepage = "https://a-nikolaev.github.io/curseofwar/"; license = licenses.gpl3; diff --git a/pkgs/games/cutemaze/default.nix b/pkgs/games/cutemaze/default.nix index a293989d5e6a..89fdc7e9d870 100644 --- a/pkgs/games/cutemaze/default.nix +++ b/pkgs/games/cutemaze/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qmake, qttools, qtsvg, mkDerivation }: +{ lib, stdenv, fetchurl, qmake, qttools, qtsvg, mkDerivation }: mkDerivation rec { pname = "cutemaze"; @@ -18,7 +18,7 @@ mkDerivation rec { mv CuteMaze.app $out/Applications ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://gottcode.org/cutemaze/"; description = "Simple, top-down game in which mazes are randomly generated"; license = licenses.gpl3Plus; diff --git a/pkgs/games/devilutionx/default.nix b/pkgs/games/devilutionx/default.nix index 69d7e3ca6662..73968b515649 100644 --- a/pkgs/games/devilutionx/default.nix +++ b/pkgs/games/devilutionx/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, SDL2, SDL2_mixer, SDL2_ttf, libsodium, pkg-config }: +{ lib, stdenv, fetchFromGitHub, cmake, SDL2, SDL2_mixer, SDL2_ttf, libsodium, pkg-config }: stdenv.mkDerivation rec { version = "1.0.1"; pname = "devilutionx"; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/diasurgical/devilutionX"; description = "Diablo build for modern operating systems"; longDescription = "In order to play this game a copy of diabdat.mpq is required. Place a copy of diabdat.mpq in ~/.local/share/diasurgical/devilution before executing the game."; diff --git a/pkgs/games/dhewm3/default.nix b/pkgs/games/dhewm3/default.nix index 1735c4380f26..edec85a1c650 100644 --- a/pkgs/games/dhewm3/default.nix +++ b/pkgs/games/dhewm3/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, SDL2, libGLU, libGL, zlib, libjpeg, libogg, libvorbis +{ lib, stdenv, fetchFromGitHub, cmake, SDL2, libGLU, libGL, zlib, libjpeg, libogg, libvorbis , openal, curl }: stdenv.mkDerivation rec { @@ -24,11 +24,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ SDL2 libGLU libGL zlib libjpeg libogg libvorbis openal curl ]; - enableParallelBuilding = true; - hardeningDisable = [ "format" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/dhewm/dhewm3"; description = "Doom 3 port to SDL"; license = stdenv.lib.licenses.gpl3; diff --git a/pkgs/games/domination/default.nix b/pkgs/games/domination/default.nix new file mode 100644 index 000000000000..37c7d37741b8 --- /dev/null +++ b/pkgs/games/domination/default.nix @@ -0,0 +1,93 @@ +{ stdenv +, fetchsvn +# jdk8 is needed for building, but the game runs on newer jres as well +, jdk8 +, jre +, ant +, makeWrapper +, makeDesktopItem +}: + +let + desktopItem = makeDesktopItem { + type = "Application"; + name = "Domination"; + desktopName = "Domination"; + exec = "domination"; + icon = "domination"; + }; + editorDesktopItem = makeDesktopItem { + type = "Application"; + name = "Domination Map Editor"; + desktopName = "Domination Map Editor"; + exec = "domination-map-editor"; + icon = "domination"; + }; + +in stdenv.mkDerivation { + pname = "domination"; + version = "1.2.3"; + + # The .zip releases do not contain the build.xml file + src = fetchsvn { + url = "https://svn.code.sf.net/p/domination/code/Domination"; + # There are no tags in the repository. + # Look for commits like "new version x.y.z info on website" + # or "website update for x.y.z". + rev = "1964"; + sha256 = "0718gns8d69a1dfq3ywc9kddl1khnrmxqyal7brckbjgay8dq42f"; + }; + + nativeBuildInputs = [ + jdk8 + ant + makeWrapper + ]; + + buildPhase = "ant"; + + installPhase = '' + # Remove unnecessary files and launchers (they'd need to be wrapped anyway) + rm -r \ + build/game/src.zip \ + build/game/*.sh \ + build/game/*.cmd \ + build/game/*.exe \ + build/game/*.app + + mkdir -p $out/share/domination + cp -r build/game/* $out/share/domination/ + + # Reimplement the two launchers mentioned in Unix_shortcutSpec.xml with makeWrapper + mkdir -p $out/bin + makeWrapper ${jre}/bin/java $out/bin/domination \ + --run "cd $out/share/domination" \ + --add-flags "-jar $out/share/domination/Domination.jar" + makeWrapper ${jre}/bin/java $out/bin/domination-map-editor \ + --run "cd $out/share/domination" \ + --add-flags "-cp $out/share/domination/Domination.jar net.yura.domination.ui.swinggui.SwingGUIFrame" + + install -Dm644 \ + ${desktopItem}/share/applications/Domination.desktop \ + $out/share/applications/Domination.desktop + install -Dm644 \ + "${editorDesktopItem}/share/applications/Domination Map Editor.desktop" \ + "$out/share/applications/Domination Map Editor.desktop" + install -Dm644 build/game/resources/icon.png $out/share/pixmaps/domination.png + ''; + + meta = with stdenv.lib; { + homepage = "http://domination.sourceforge.net/"; + downloadPage = "http://domination.sourceforge.net/download.shtml"; + description = "A game that is a bit like the board game Risk or RisiKo"; + longDescription = '' + Domination is a game that is a bit like the well known board game of Risk + or RisiKo. It has many game options and includes many maps. + It includes a map editor, a simple map format, multiplayer network play, + single player, hotseat, 5 user interfaces and many more features. + ''; + license = licenses.gpl3; + maintainers = with maintainers; [ fgaz ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/games/duckmarines/default.nix b/pkgs/games/duckmarines/default.nix index 7af31c606a93..013ebcc7ec5f 100644 --- a/pkgs/games/duckmarines/default.nix +++ b/pkgs/games/duckmarines/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, love, lua, makeWrapper, makeDesktopItem }: +{ lib, stdenv, fetchurl, love, lua, makeWrapper, makeDesktopItem }: let pname = "duckmarines"; @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { ln -s ${desktopItem}/share/applications/* $out/share/applications/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Duck-themed action puzzle video game"; maintainers = with maintainers; [ leenaars ]; platforms = platforms.linux; diff --git a/pkgs/games/dwarf-fortress/dfhack/default.nix b/pkgs/games/dwarf-fortress/dfhack/default.nix index 11c21b82c29c..2e27d9493bd1 100644 --- a/pkgs/games/dwarf-fortress/dfhack/default.nix +++ b/pkgs/games/dwarf-fortress/dfhack/default.nix @@ -146,7 +146,6 @@ let ln -s ${ruby}/lib/libruby-*.so $out/hack/libruby.so ''; - enableParallelBuilding = true; }; in @@ -157,7 +156,7 @@ buildEnv { paths = [ dfhack ] ++ lib.optionals enableTWBT [ twbt.lib ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Memory hacking library for Dwarf Fortress and a set of tools that use it"; homepage = "https://github.com/DFHack/dfhack/"; license = licenses.zlib; diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix index f5c093e1f16c..83e181c85e65 100644 --- a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix +++ b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, qtbase +{ lib, stdenv, fetchFromGitHub, qtbase , qtdeclarative, cmake, texlive, ninja }: stdenv.mkDerivation rec { @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { cp -r DwarfTherapist.app $out/Applications '' else null; - meta = with stdenv.lib; { + meta = with lib; { description = "Tool to manage dwarves in a running game of Dwarf Fortress"; maintainers = with maintainers; [ abbradar bendlas numinit jonringer ]; license = licenses.mit; diff --git a/pkgs/games/dwarf-fortress/unfuck.nix b/pkgs/games/dwarf-fortress/unfuck.nix index 533649131f5a..0fb08aa7e87f 100644 --- a/pkgs/games/dwarf-fortress/unfuck.nix +++ b/pkgs/games/dwarf-fortress/unfuck.nix @@ -79,14 +79,12 @@ stdenv.mkDerivation { install -D -m755 ../build/libgraphics.so $out/lib/libgraphics.so ''; - enableParallelBuilding = true; - # Breaks dfhack because of inlining. hardeningDisable = [ "fortify" ]; passthru = { inherit dfVersion; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Unfucked multimedia layer for Dwarf Fortress"; homepage = "https://github.com/svenstaro/dwarf_fortress_unfuck"; license = licenses.free; diff --git a/pkgs/games/dxx-rebirth/assets.nix b/pkgs/games/dxx-rebirth/assets.nix index 47a8222cd6a9..b214d49659b6 100644 --- a/pkgs/games/dxx-rebirth/assets.nix +++ b/pkgs/games/dxx-rebirth/assets.nix @@ -1,4 +1,4 @@ -{ stdenv, requireFile, gogUnpackHook }: +{ lib, stdenv, requireFile, gogUnpackHook }: let generic = ver: source: let @@ -40,7 +40,7 @@ let runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Descent ${toString ver} assets from GOG"; homepage = "https://www.dxx-rebirth.com/"; license = licenses.unfree; diff --git a/pkgs/games/dxx-rebirth/default.nix b/pkgs/games/dxx-rebirth/default.nix index aa2563d4e4b9..43c3fd00a020 100644 --- a/pkgs/games/dxx-rebirth/default.nix +++ b/pkgs/games/dxx-rebirth/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , fetchurl , fetchpatch @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { install -Dm644 -t $out/share/doc/dxx-rebirth *.txt ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Source Port of the Descent 1 and 2 engines"; homepage = "https://www.dxx-rebirth.com/"; license = licenses.gpl3; diff --git a/pkgs/games/dxx-rebirth/full.nix b/pkgs/games/dxx-rebirth/full.nix index 782a2d21112c..f3349c114eed 100644 --- a/pkgs/games/dxx-rebirth/full.nix +++ b/pkgs/games/dxx-rebirth/full.nix @@ -1,4 +1,4 @@ -{ stdenv, makeWrapper +{ lib, stdenv, makeWrapper , dxx-rebirth, descent1-assets, descent2-assets }: let @@ -14,7 +14,7 @@ let --add-flags "-hogdir ${assets}/share/games/descent${toString ver}" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Descent ${toString ver} using the DXX-Rebirth project engine and game assets from GOG"; homepage = "https://www.dxx-rebirth.com/"; license = with licenses; [ free unfree ]; diff --git a/pkgs/games/easyrpg-player/default.nix b/pkgs/games/easyrpg-player/default.nix index f3f039fe78bb..7ebba6c3d72d 100644 --- a/pkgs/games/easyrpg-player/default.nix +++ b/pkgs/games/easyrpg-player/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, doxygen ? null, pkgconfig, freetype ? null, glib, harfbuzz ? null +{ lib, stdenv, fetchFromGitHub, cmake, doxygen ? null, pkgconfig, freetype ? null, glib, harfbuzz ? null , liblcf, libpng, libsndfile ? null, libvorbis ? null, libxmp ? null , libXcursor, libXext, libXi, libXinerama, libXrandr, libXScrnSaver, libXxf86vm , mpg123 ? null, opusfile ? null, pcre, pixman, SDL2_mixer, speexdsp ? null, wildmidi ? null, zlib }: @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { zlib ]; - meta = with stdenv.lib; { + meta = with lib; { description = "RPG Maker 2000/2003 and EasyRPG games interpreter"; homepage = "https://easyrpg.org/"; license = licenses.gpl3; diff --git a/pkgs/games/eduke32/default.nix b/pkgs/games/eduke32/default.nix index df0950eb9376..f264fd0b9e32 100644 --- a/pkgs/games/eduke32/default.nix +++ b/pkgs/games/eduke32/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, pkgconfig, nasm, makeDesktopItem +{ lib, stdenv, fetchurl, makeWrapper, pkgconfig, nasm, makeDesktopItem , alsaLib, flac, gtk2, libvorbis, libvpx, libGLU, libGL , SDL2, SDL2_mixer }: @@ -66,7 +66,7 @@ in stdenv.mkDerivation { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Enhanched port of Duke Nukem 3D for various platforms"; homepage = "http://eduke32.com"; license = licenses.gpl2Plus; diff --git a/pkgs/games/eidolon/default.nix b/pkgs/games/eidolon/default.nix index 4ae64df41437..bb7f7a68bcf0 100644 --- a/pkgs/games/eidolon/default.nix +++ b/pkgs/games/eidolon/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, rustPlatform, pkgconfig, openssl }: +{ lib, stdenv, fetchgit, rustPlatform, pkgconfig, openssl }: rustPlatform.buildRustPackage rec { pname = "eidolon"; @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ openssl ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A single TUI-based registry for drm-free, wine and steam games on linux, accessed through a rofi launch menu"; homepage = "https://github.com/nicohman/eidolon"; license = licenses.gpl3; diff --git a/pkgs/games/endless-sky/default.nix b/pkgs/games/endless-sky/default.nix index 76ab6542a7f3..010f90a049bd 100644 --- a/pkgs/games/endless-sky/default.nix +++ b/pkgs/games/endless-sky/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub, fetchpatch , SDL2, libpng, libjpeg, glew, openal, scons, libmad }: @@ -17,6 +17,15 @@ stdenv.mkDerivation { sha256 = "1hly68ljm7yv01jfxyr7g6jivhj0igg6xx7vi92zqymick0hlh7a"; }; + patches = [ + (fetchpatch { + name = "endless-sky-gcc10.patch"; + url = "https://github.com/endless-sky/endless-sky/commit/bc3cab5992694547f9c6c067b5579ef06224781b.patch"; + sha256 = "0v3913jyzhh1d81dxv738kcd3xhh7mrl06qnmj7a3ya2xd9pq4dk"; + }) + ./fixes.patch + ]; + enableParallelBuilding = true; buildInputs = [ @@ -25,11 +34,7 @@ stdenv.mkDerivation { prefixKey = "PREFIX="; - patches = [ - ./fixes.patch - ]; - - meta = with stdenv.lib; { + meta = with lib; { description = "A sandbox-style space exploration game similar to Elite, Escape Velocity, or Star Control"; homepage = "https://endless-sky.github.io/"; license = with licenses; [ diff --git a/pkgs/games/enyo-doom/default.nix b/pkgs/games/enyo-doom/default.nix index 0158dc2b5318..bcb98fc8cca9 100644 --- a/pkgs/games/enyo-doom/default.nix +++ b/pkgs/games/enyo-doom/default.nix @@ -15,12 +15,10 @@ mkDerivation rec { buildInputs = [ qtbase ]; - enableParallelBuilding = true; - meta = { homepage = "https://gitlab.com/sdcofer70/enyo-doom"; description = "Frontend for Doom engines"; - license = stdenv.lib.licenses.gpl2; + license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.tadfisher ]; }; diff --git a/pkgs/games/eternity-engine/default.nix b/pkgs/games/eternity-engine/default.nix index c170c0b9c189..72e2af9025d3 100644 --- a/pkgs/games/eternity-engine/default.nix +++ b/pkgs/games/eternity-engine/default.nix @@ -13,8 +13,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake makeWrapper ]; buildInputs = [ libGL SDL SDL_mixer SDL_net ]; - enableParallelBuilding = true; - installPhase = '' install -Dm755 source/eternity $out/lib/eternity/eternity cp -r $src/base $out/lib/eternity/base diff --git a/pkgs/games/ezquake/default.nix b/pkgs/games/ezquake/default.nix index 802125e3f8b1..143a7d94015a 100644 --- a/pkgs/games/ezquake/default.nix +++ b/pkgs/games/ezquake/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, curl, expat +{ lib, stdenv, fetchFromGitHub, curl, expat , jansson, libpng, libjpeg, libGLU, libGL, libXxf86vm, pcre , pkgconfig, SDL2, vim, speex }: @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://ezquake.github.io/"; description = "A modern QuakeWorld client focused on competitive online play"; license = licenses.gpl2; diff --git a/pkgs/games/factorio/versions.json b/pkgs/games/factorio/versions.json index b4c905450355..f484d3304cb5 100644 --- a/pkgs/games/factorio/versions.json +++ b/pkgs/games/factorio/versions.json @@ -2,12 +2,12 @@ "x86_64-linux": { "alpha": { "experimental": { - "name": "factorio_alpha_x64-1.1.5.tar.xz", + "name": "factorio_alpha_x64-1.1.8.tar.xz", "needsAuth": true, - "sha256": "17hm62mhldms41wv0vv2bzg8zg1mg7ga61h3yzw9dfvic661khmp", + "sha256": "1zvjmdmvp05yr8lln4hsa184hl115sv9xz1dwxa3cb827f5ndd6m", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.5/alpha/linux64", - "version": "1.1.5" + "url": "https://factorio.com/get-download/1.1.8/alpha/linux64", + "version": "1.1.8" }, "stable": { "name": "factorio_alpha_x64-1.0.0.tar.xz", @@ -38,12 +38,12 @@ }, "headless": { "experimental": { - "name": "factorio_headless_x64-1.1.5.tar.xz", + "name": "factorio_headless_x64-1.1.8.tar.xz", "needsAuth": false, - "sha256": "1s4ajj8kkz1q5rivv2q6c8ii73nxa11g4fs6hic3r43l52n89ml1", + "sha256": "1j2nmm61c99qis8fkc1gp5i3fj3vmc2mfds7lw4gfr9kr956cjhf", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.5/headless/linux64", - "version": "1.1.5" + "url": "https://factorio.com/get-download/1.1.8/headless/linux64", + "version": "1.1.8" }, "stable": { "name": "factorio_headless_x64-1.0.0.tar.xz", diff --git a/pkgs/games/fish-fillets-ng/default.nix b/pkgs/games/fish-fillets-ng/default.nix index 638bf59fc781..8870fe21ab9b 100644 --- a/pkgs/games/fish-fillets-ng/default.nix +++ b/pkgs/games/fish-fillets-ng/default.nix @@ -1,7 +1,9 @@ -{stdenv, fetchurl, SDL, lua5_1, pkgconfig, SDL_mixer, SDL_image, SDL_ttf}: +{ lib, stdenv, fetchurl, makeDesktopItem, copyDesktopItems, SDL, lua5_1, pkg-config, SDL_mixer, SDL_image, SDL_ttf }: + stdenv.mkDerivation rec { pname = "fish-fillets-ng"; version = "1.0.1"; + src = fetchurl { url = "mirror://sourceforge/fillets/fillets-ng-${version}.tar.gz"; sha256 = "1nljp75aqqb35qq3x7abhs2kp69vjcj0h1vxcpdyn2yn2nalv6ij"; @@ -10,18 +12,31 @@ stdenv.mkDerivation rec { url = "mirror://sourceforge/fillets/fillets-ng-data-${version}.tar.gz"; sha256 = "169p0yqh2gxvhdilvjc2ld8aap7lv2nhkhkg4i1hlmgc6pxpkjgh"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [SDL lua5_1 SDL_mixer SDL_image SDL_ttf]; - postInstall='' - mkdir -p "$out/share/games/fillets-ng/" - tar -xf ${data} -C "$out/share/games/fillets-ng/" --strip-components=1 + + nativeBuildInputs = [ pkg-config copyDesktopItems ]; + buildInputs = [ SDL lua5_1 SDL_mixer SDL_image SDL_ttf ]; + + desktopItems = [ (makeDesktopItem { + name = "fish-fillets-ng"; + exec = "fillets"; + icon = "fish-fillets-ng"; + desktopName = "Fish Fillets"; + comment = "Puzzle game about witty fish saving the world sokoban-style"; + categories = "Game;LogicGame;"; + }) ]; + + postInstall = '' + mkdir -p $out/share/games/fillets-ng + tar -xf ${data} -C $out/share/games/fillets-ng --strip-components=1 + install -Dm644 ${./icon.xpm} $out/share/pixmaps/fish-fillets-ng.xpm ''; - meta = { + + meta = with lib; { inherit version; description = ''A puzzle game''; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ raskin ]; + platforms = platforms.linux; homepage = "http://fillets.sourceforge.net/"; }; } diff --git a/pkgs/games/fish-fillets-ng/icon.xpm b/pkgs/games/fish-fillets-ng/icon.xpm new file mode 100644 index 000000000000..9947c54e7e55 --- /dev/null +++ b/pkgs/games/fish-fillets-ng/icon.xpm @@ -0,0 +1,39 @@ +/* XPM */ +static char * fillets_ng_xpm[] = { +"32 32 4 1", +" c None", +". c #000000", +"+ c #808000", +"@ c #FFFF00", +" .......... ", +" ...+@@@@@@+... ", +" ...@@@@@@@@@@@@... ", +" ..+@@@+......+@@@+.. ", +" ..@@@+..........+@@@.. ", +" ..@@@..............@@@.. ", +" ..@@@................@@@.. ", +" ..@@@..................@@@.. ", +" .+@@....................@@+. ", +" ..@@......................@@.. ", +" .@@+......................+@@. ", +"..@@.....@@@@@.........@@...@@..", +".+@+...@@@@@@@@@.....@@@@...+@+.", +".@@...@@@.....@@@...@@+@@....@@.", +".@@...@@.+@....+@@+@@+.@@....@@.", +".@@..@@..@@.....+@@@+..@@....@@.", +".@@..@@.........+@@@+..@@....@@.", +".@@...@@.......+@@+@@+.@@....@@.", +".@@...@@@.....@@@...@@+@@....@@.", +".+@+...@@@@@@@@@.....@@@@...+@+.", +"..@@.....@@@@@.........@@...@@..", +" .@@+......................+@@. ", +" ..@@......................@@.. ", +" .+@@....................@@+. ", +" ..@@@..................@@@.. ", +" ..@@@................@@@.. ", +" ..@@@..............@@@.. ", +" ..@@@+..........+@@@.. ", +" ..+@@@+......+@@@+.. ", +" ...@@@@@@@@@@@@... ", +" ...+@@@@@@+... ", +" .......... "}; diff --git a/pkgs/games/flare/engine.nix b/pkgs/games/flare/engine.nix index 74f983c64413..22a12fda0545 100644 --- a/pkgs/games/flare/engine.nix +++ b/pkgs/games/flare/engine.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, SDL2, SDL2_image, SDL2_mixer, SDL2_ttf, Cocoa }: +{ lib, stdenv, fetchFromGitHub, cmake, SDL2, SDL2_image, SDL2_mixer, SDL2_ttf, Cocoa }: stdenv.mkDerivation rec { pname = "flare-engine"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ SDL2 SDL2_image SDL2_mixer SDL2_ttf ] ++ stdenv.lib.optional stdenv.isDarwin Cocoa; - meta = with stdenv.lib; { + meta = with lib; { description = "Free/Libre Action Roleplaying Engine"; homepage = "https://github.com/flareteam/flare-engine"; maintainers = [ maintainers.aanderse ]; diff --git a/pkgs/games/flare/game.nix b/pkgs/games/flare/game.nix index 6a231a5ff7d7..6b7f15fd9ccb 100644 --- a/pkgs/games/flare/game.nix +++ b/pkgs/games/flare/game.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "flare-game"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Fantasy action RPG using the FLARE engine"; homepage = "https://github.com/flareteam/flare-game"; maintainers = [ maintainers.aanderse ]; diff --git a/pkgs/games/flightgear/default.nix b/pkgs/games/flightgear/default.nix index a8aef81523d8..3e65915ec1dc 100644 --- a/pkgs/games/flightgear/default.nix +++ b/pkgs/games/flightgear/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, wrapQtAppsHook +{ lib, stdenv, fetchurl, wrapQtAppsHook , freeglut, freealut, libGLU, libGL, libICE, libjpeg, openal, openscenegraph, plib , libSM, libunwind, libX11, xorgproto, libXext, libXi , libXmu, libXt, simgear, zlib, boost, cmake, libpng, udev, fltk13, apr @@ -69,9 +69,7 @@ stdenv.mkDerivation rec { "--set FG_ROOT ${data}/share/FlightGear" ]; - enableParallelBuilding = true; - - meta = with stdenv.lib; { + meta = with lib; { description = "Flight simulator"; maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; diff --git a/pkgs/games/fltrator/default.nix b/pkgs/games/fltrator/default.nix index e01a3f9fb9c0..9df7d9cccfd8 100644 --- a/pkgs/games/fltrator/default.nix +++ b/pkgs/games/fltrator/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, fltk, which, libjpeg }: +{ lib, stdenv, fetchurl, unzip, fltk, which, libjpeg }: stdenv.mkDerivation rec { pname = "fltrator"; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { cp rsc/fltrator-128.png $out/share/icons/hicolor/128x128/apps/fltrator2.png ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A simple retro style arcade side-scroller game"; longDescription = '' FLTrator is a simple retro style arcade side-scroller game in which you steer a spaceship through a landscape with hostile rockets and other obstacles. It has ten different levels and a level editor to create new levels or modify the existing.''; # from https://libregamewiki.org/FLTrator diff --git a/pkgs/games/freeciv/default.nix b/pkgs/games/freeciv/default.nix index c8f9c7908428..31532a6c2e29 100644 --- a/pkgs/games/freeciv/default.nix +++ b/pkgs/games/freeciv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, lua5_3, pkgconfig, python3 +{ lib, stdenv, fetchFromGitHub, autoreconfHook, lua5_3, pkgconfig, python3 , zlib, bzip2, curl, lzma, gettext, libiconv , sdlClient ? true, SDL, SDL_mixer, SDL_image, SDL_ttf, SDL_gfx, freetype, fluidsynth , gtkClient ? false, gtk3 @@ -49,7 +49,7 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Multiplayer (or single player), turn-based strategy game"; longDescription = '' diff --git a/pkgs/games/freedroidrpg/default.nix b/pkgs/games/freedroidrpg/default.nix index 443d60b9d672..aab2b748d1a1 100644 --- a/pkgs/games/freedroidrpg/default.nix +++ b/pkgs/games/freedroidrpg/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, gettext, python3, SDL, SDL_image, SDL_gfx, SDL_mixer, libogg, libvorbis, lua5_3, libjpeg, libpng, zlib, libiconv }: +{ fetchurl, lib, stdenv, pkgconfig, gettext, python3, SDL, SDL_image, SDL_gfx, SDL_mixer, libogg, libvorbis, lua5_3, libjpeg, libpng, zlib, libiconv }: let version = "0.16.1"; @@ -17,7 +17,7 @@ in stdenv.mkDerivation { SDL SDL_image SDL_gfx SDL_mixer libogg libvorbis lua5_3 libjpeg libpng zlib ] ++ stdenv.lib.optional stdenv.isDarwin libiconv; - meta = with stdenv.lib; { + meta = with lib; { description = "Isometric 3D RPG similar to game Diablo"; longDescription = '' diff --git a/pkgs/games/freenukum/default.nix b/pkgs/games/freenukum/default.nix new file mode 100644 index 000000000000..36639140702a --- /dev/null +++ b/pkgs/games/freenukum/default.nix @@ -0,0 +1,72 @@ +{ lib, stdenv +, rustPlatform +, fetchFromGitLab +, makeDesktopItem +, installShellFiles +, dejavu_fonts +, SDL2 +, SDL2_ttf +}: +let + pname = "freenukum"; + description = "Clone of the original Duke Nukum 1 Jump'n Run game"; + + desktopItem = makeDesktopItem { + desktopName = pname; + name = pname; + exec = pname; + icon = pname; + terminal = "false"; + comment = description; + type = "Application"; + categories = "Game;ArcadeGame;ActionGame"; + genericName = pname; + fileValidation = false; + }; + +in +rustPlatform.buildRustPackage rec { + inherit pname; + version = "0.3.5"; + + src = fetchFromGitLab { + owner = "silwol"; + repo = pname; + rev = "v${version}"; + sha256 = "0yqfzh0c8fqk92q9kmidy15dc5li0ak1gbn3v7p3xw5fkrzf99gy"; + }; + + cargoSha256 = "1mi98ccp4026gdc5x9jc6518zb7z4dplxl8vir78ivgdpifzz4pw"; + + nativeBuildInputs = [ + installShellFiles + ]; + + buildInputs = [ + SDL2 + SDL2_ttf + ]; + + postPatch = '' + substituteInPlace src/graphics.rs \ + --replace /usr $out + ''; + + postInstall = '' + mkdir -p $out/share/fonts/truetype/dejavu + ln -sf \ + ${dejavu_fonts}/share/fonts/truetype/DejaVuSans.ttf \ + $out/share/fonts/truetype/dejavu/DejaVuSans.ttf + mkdir -p $out/share/doc/freenukum + install -Dm644 README.md CHANGELOG.md COPYING $out/share/doc/freenukum/ + installManPage doc/freenukum.6 + install -Dm644 "${desktopItem}/share/applications/"* -t $out/share/applications/ + ''; + + meta = with lib; { + description = "Clone of the original Duke Nukum 1 Jump'n Run game"; + license = licenses.agpl3Plus; + maintainers = with maintainers; [ _0x4A6F ]; + broken = stdenv.isDarwin; + }; +} diff --git a/pkgs/games/freeorion/default.nix b/pkgs/games/freeorion/default.nix index 27be32071c18..de25fa691d51 100644 --- a/pkgs/games/freeorion/default.nix +++ b/pkgs/games/freeorion/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, doxygen, graphviz, makeWrapper +{ lib, stdenv, fetchFromGitHub, cmake, doxygen, graphviz, makeWrapper , boost168, SDL2, python2, freetype, openal, libogg, libvorbis, zlib, libpng, libtiff , libjpeg, libGLU, libGL, glew, libxslt }: @@ -15,16 +15,11 @@ stdenv.mkDerivation rec { }; buildInputs = [ - (boost168.override { enablePython = true; }) + (boost168.override { enablePython = true; }) SDL2 python2 freetype openal libogg libvorbis zlib libpng libtiff libjpeg libGLU libGL glew ]; nativeBuildInputs = [ cmake doxygen graphviz makeWrapper ]; - enableParallelBuilding = true; - - patches = [ - ]; - postInstall = '' mkdir -p $out/fixpaths # We need final slashes for XSLT replace to work properly @@ -42,7 +37,7 @@ stdenv.mkDerivation rec { --prefix LD_LIBRARY_PATH : $out/lib/freeorion ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A free, open source, turn-based space empire and galactic conquest (4X) computer game"; homepage = "http://www.freeorion.org"; license = with licenses; [ gpl2 cc-by-sa-30 ]; diff --git a/pkgs/games/freesweep/default.nix b/pkgs/games/freesweep/default.nix index fdaaadbe42f0..7c17877e9341 100644 --- a/pkgs/games/freesweep/default.nix +++ b/pkgs/games/freesweep/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, ncurses, stdenv, +{ fetchFromGitHub, ncurses, lib, stdenv, updateAutotoolsGnuConfigScriptsHook }: stdenv.mkDerivation rec { @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A console minesweeper-style game written in C for Unix-like systems"; homepage = "https://github.com/rwestlund/freesweep"; license = licenses.gpl2; diff --git a/pkgs/games/frogatto/data.nix b/pkgs/games/frogatto/data.nix index 3313f156ed28..a077d01f3b65 100644 --- a/pkgs/games/frogatto/data.nix +++ b/pkgs/games/frogatto/data.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation { pname = "frogatto-data"; @@ -17,7 +17,7 @@ stdenv.mkDerivation { cp -ar . $out/share/frogatto/modules/frogatto ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/frogatto/frogatto"; description = "Data files to the frogatto game"; license = with licenses; [ cc-by-30 unfree ]; diff --git a/pkgs/games/frogatto/default.nix b/pkgs/games/frogatto/default.nix index ee3803617dca..fb09847908da 100644 --- a/pkgs/games/frogatto/default.nix +++ b/pkgs/games/frogatto/default.nix @@ -1,4 +1,4 @@ -{ buildEnv, stdenv, callPackage, makeWrapper, makeDesktopItem }: +{ buildEnv, lib, stdenv, callPackage, makeWrapper, makeDesktopItem }: let description = "Action-adventure game, starring a certain quixotic frog"; @@ -33,7 +33,7 @@ in buildEnv { --run "cd $out/share/frogatto" ''; - meta = with stdenv.lib; { + meta = with lib; { broken = true; homepage = "https://frogatto.com"; description = description; diff --git a/pkgs/games/frogatto/engine.nix b/pkgs/games/frogatto/engine.nix index 94c2a038d920..744992636500 100644 --- a/pkgs/games/frogatto/engine.nix +++ b/pkgs/games/frogatto/engine.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, which +{ lib, stdenv, fetchFromGitHub, which , boost, SDL2, SDL2_image, SDL2_mixer, SDL2_ttf , glew, zlib, icu, pkgconfig, cairo, libvpx }: @@ -40,7 +40,7 @@ stdenv.mkDerivation { cp -a anura $out/bin/frogatto ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/anura-engine/anura"; description = "Game engine used by Frogatto"; license = licenses.zlib; diff --git a/pkgs/games/frotz/default.nix b/pkgs/games/frotz/default.nix index 6ff163105da8..58339e5d26f0 100644 --- a/pkgs/games/frotz/default.nix +++ b/pkgs/games/frotz/default.nix @@ -5,7 +5,7 @@ , libsndfile , libvorbis , ncurses -, stdenv }: +, lib, stdenv }: stdenv.mkDerivation rec { version = "2.52"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ''; installFlags = [ "PREFIX=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://davidgriffith.gitlab.io/frotz/"; changelog = "https://gitlab.com/DavidGriffith/frotz/-/raw/${version}/NEWS"; description = "A z-machine interpreter for Infocom games and other interactive fiction"; diff --git a/pkgs/games/gambatte/default.nix b/pkgs/games/gambatte/default.nix index b2a2f0a3f92d..4d6795070ca2 100644 --- a/pkgs/games/gambatte/default.nix +++ b/pkgs/games/gambatte/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, scons, qt4, alsaLib }: +{ lib, stdenv, fetchFromGitHub, scons, qt4, alsaLib }: stdenv.mkDerivation { pname = "gambatte"; @@ -24,7 +24,7 @@ stdenv.mkDerivation { cp gambatte_qt/bin/gambatte_qt $out/bin/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Portable, open-source Game Boy Color emulator"; homepage = "https://github.com/sinamas/gambatte"; license = licenses.gpl2; diff --git a/pkgs/games/garden-of-coloured-lights/default.nix b/pkgs/games/garden-of-coloured-lights/default.nix index fde573cecd85..d38d8936c1a9 100644 --- a/pkgs/games/garden-of-coloured-lights/default.nix +++ b/pkgs/games/garden-of-coloured-lights/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoconf, automake, allegro }: +{ lib, stdenv, fetchurl, autoconf, automake, allegro }: stdenv.mkDerivation rec { pname = "garden-of-coloured-lights"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sha256 = "1qsj4d7r22m5f9f5f6cyvam1y5q5pbqvy5058r7w0k4s48n77y6s"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Old-school vertical shoot-em-up / bullet hell"; homepage = "http://garden.sourceforge.net/drupal/"; maintainers = with maintainers; [ Profpatsch ]; diff --git a/pkgs/games/gargoyle/default.nix b/pkgs/games/gargoyle/default.nix index c4c512be2b89..78bffaf16af5 100644 --- a/pkgs/games/gargoyle/default.nix +++ b/pkgs/games/gargoyle/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, substituteAll, jam, cctools, pkgconfig +{ lib, stdenv, fetchFromGitHub, substituteAll, jam, cctools, pkgconfig , SDL, SDL_mixer, SDL_sound, gtk2, libvorbis, smpeg }: let @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://ccxvii.net/gargoyle/"; license = licenses.gpl2Plus; description = "Interactive fiction interpreter GUI"; diff --git a/pkgs/games/gcs/default.nix b/pkgs/games/gcs/default.nix index 9c0b479304a6..a471b425f0c6 100644 --- a/pkgs/games/gcs/default.nix +++ b/pkgs/games/gcs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, runCommand +{ lib, stdenv, fetchFromGitHub, runCommand , jdk8, ant , jre8, makeWrapper }: @@ -66,7 +66,7 @@ in stdenv.mkDerivation rec { --add-flags "-cp $out/share/java/gcs-${version}.jar com.trollworks.gcs.app.GCS" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A stand-alone, interactive, character sheet editor for the GURPS 4th Edition roleplaying game system"; homepage = "https://gurpscharactersheet.com/"; license = licenses.mpl20; diff --git a/pkgs/games/gemrb/default.nix b/pkgs/games/gemrb/default.nix index 5fa58c7c3565..fb49779eb535 100644 --- a/pkgs/games/gemrb/default.nix +++ b/pkgs/games/gemrb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake +{ lib, stdenv, fetchFromGitHub, cmake , freetype, SDL2, SDL2_mixer, openal, zlib, libpng, python, libvorbis , libiconv }: @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { # "-DOpenGL_GL_PREFERENCE=GLVND" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A reimplementation of the Infinity Engine, used by games such as Baldur's Gate"; longDescription = '' GemRB (Game engine made with pre-Rendered Background) is a portable diff --git a/pkgs/games/gl-117/default.nix b/pkgs/games/gl-117/default.nix index f76f761189c1..0acabb4a55f3 100644 --- a/pkgs/games/gl-117/default.nix +++ b/pkgs/games/gl-117/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , libGLU, libGL, SDL, freeglut, SDL_mixer, autoconf, automake, libtool }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ libGLU libGL SDL freeglut SDL_mixer autoconf automake libtool ]; - meta = with stdenv.lib; { + meta = with lib; { description = "An air combat simulator"; homepage = "https://sourceforge.net/projects/gl-117"; maintainers = with maintainers; [ raskin ]; diff --git a/pkgs/games/globulation/default.nix b/pkgs/games/globulation/default.nix index e0e4b876f3ec..f25b1084b852 100644 --- a/pkgs/games/globulation/default.nix +++ b/pkgs/games/globulation/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libGLU, libGL, SDL, sconsPackages, SDL_ttf, SDL_image, zlib, SDL_net +{ lib, stdenv, fetchurl, libGLU, libGL, SDL, sconsPackages, SDL_ttf, SDL_image, zlib, SDL_net , speex, libvorbis, libogg, boost, fribidi, bsdiff , fetchpatch }: @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = "-lboost_system"; - meta = with stdenv.lib; { + meta = with lib; { description = "RTS without micromanagement"; maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; diff --git a/pkgs/games/gnome-hexgl/default.nix b/pkgs/games/gnome-hexgl/default.nix index cfa9a0b81d02..8e2fa41f4200 100644 --- a/pkgs/games/gnome-hexgl/default.nix +++ b/pkgs/games/gnome-hexgl/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , ninja , meson @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { gtk3 ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Gthree port of HexGL"; homepage = "https://github.com/alexlarsson/gnome-hexgl"; license = licenses.mit; diff --git a/pkgs/games/gnujump/default.nix b/pkgs/games/gnujump/default.nix index 8af7b84db26e..240481b7bba0 100644 --- a/pkgs/games/gnujump/default.nix +++ b/pkgs/games/gnujump/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, SDL, SDL_image, SDL_mixer }: +{ lib, stdenv, fetchurl, SDL, SDL_image, SDL_mixer }: stdenv.mkDerivation rec { pname = "gnujump"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = "-lm"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://jump.gnu.sinusoid.es/index.php?title=Main_Page"; description = "A clone of the simple yet addictive game Xjump"; longDescription = '' diff --git a/pkgs/games/gnushogi/default.nix b/pkgs/games/gnushogi/default.nix index 01c08fbf3dcb..ef1950aaf40f 100644 --- a/pkgs/games/gnushogi/default.nix +++ b/pkgs/games/gnushogi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, zlib }: +{ lib, stdenv, fetchurl, zlib }: stdenv.mkDerivation rec { pname = "gnushogi"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0a9bsl2nbnb138lq0h14jfc5xvz7hpb2bcsj4mjn6g1hcsl4ik0y"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "GNU implementation of Shogi, also known as Japanese Chess"; homepage = "https://www.gnu.org/software/gnushogi/"; license = licenses.gpl3; diff --git a/pkgs/games/gscrabble/default.nix b/pkgs/games/gscrabble/default.nix index cab509a3e9a6..7d63510aa991 100644 --- a/pkgs/games/gscrabble/default.nix +++ b/pkgs/games/gscrabble/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonApplication, fetchFromGitHub +{ lib, stdenv, buildPythonApplication, fetchFromGitHub , gtk3, wrapGAppsHook, gst_all_1, gobject-introspection , python3Packages, gnome3 }: @@ -30,7 +30,7 @@ buildPythonApplication { ) ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Golden Scrabble crossword puzzle game"; homepage = "https://github.com/RaaH/gscrabble/"; license = licenses.gpl2Plus; diff --git a/pkgs/games/gshogi/default.nix b/pkgs/games/gshogi/default.nix index 9004bd3d0423..5ed4bf5a3763 100644 --- a/pkgs/games/gshogi/default.nix +++ b/pkgs/games/gshogi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonApplication, fetchFromGitHub +{ lib, stdenv, buildPythonApplication, fetchFromGitHub , gtk3, gobject-introspection , wrapGAppsHook, python3Packages }: @@ -27,7 +27,7 @@ buildPythonApplication rec { pycairo ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A graphical implementation of the Shogi board game, also known as Japanese Chess"; homepage = "http://johncheetham.com/projects/gshogi/"; license = licenses.gpl3; diff --git a/pkgs/games/gtypist/default.nix b/pkgs/games/gtypist/default.nix index ae12c325306b..52794ca3218b 100644 --- a/pkgs/games/gtypist/default.nix +++ b/pkgs/games/gtypist/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, makeWrapper, libiconv, ncurses, perl, fortune}: +{lib, stdenv, fetchurl, makeWrapper, libiconv, ncurses, perl, fortune}: stdenv.mkDerivation rec { pname = "gtypist"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { --prefix PATH : "${fortune}/bin" \ ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.gnu.org/software/gtypist"; description = "Universal typing tutor"; license = licenses.gpl3Plus; diff --git a/pkgs/games/gweled/default.nix b/pkgs/games/gweled/default.nix index fce5ec09c79c..faa6a225ed76 100644 --- a/pkgs/games/gweled/default.nix +++ b/pkgs/games/gweled/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchbzr, intltool +{ lib, stdenv, fetchbzr, intltool , gtk2, wrapGAppsHook, autoreconfHook, pkgconfig , libmikmod, librsvg, libcanberra-gtk2, hicolor-icon-theme }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-setgid" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Bejeweled clone game"; homepage = "https://gweled.org"; license = licenses.gpl2; diff --git a/pkgs/games/gzdoom/default.nix b/pkgs/games/gzdoom/default.nix index fdbdda2d313e..edfe13c98218 100644 --- a/pkgs/games/gzdoom/default.nix +++ b/pkgs/games/gzdoom/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, makeWrapper, openal, fluidsynth_1 +{ lib, stdenv, fetchFromGitHub, cmake, makeWrapper, openal, fluidsynth_1 , soundfont-fluid, libGL, SDL2, bzip2, zlib, libjpeg, libsndfile, mpg123 , game-music-emu, pkgconfig }: @@ -53,8 +53,6 @@ let zmusic ]; - enableParallelBuilding = true; - NIX_CFLAGS_LINK = "-lopenal -lfluidsynth"; installPhase = '' @@ -72,7 +70,7 @@ let makeWrapper $out/lib/gzdoom/gzdoom $out/bin/gzdoom ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/coelckers/gzdoom"; description = "A Doom source port based on ZDoom. It features an OpenGL renderer and lots of new features"; diff --git a/pkgs/games/harmonist/default.nix b/pkgs/games/harmonist/default.nix index fb9e1cf66176..0705da6bfe94 100644 --- a/pkgs/games/harmonist/default.nix +++ b/pkgs/games/harmonist/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, buildGoPackage}: +{lib, stdenv, fetchurl, buildGoPackage}: buildGoPackage rec { @@ -16,7 +16,7 @@ buildGoPackage rec { postInstall = "mv $out/bin/harmonist.git $out/bin/harmonist"; - meta = with stdenv.lib; { + meta = with lib; { description = "A stealth coffee-break roguelike game"; longDescription = '' Harmonist is a stealth coffee-break roguelike game. The game has a heavy diff --git a/pkgs/games/holdingnuts/default.nix b/pkgs/games/holdingnuts/default.nix index d0cee8d76cfe..2bda18209280 100644 --- a/pkgs/games/holdingnuts/default.nix +++ b/pkgs/games/holdingnuts/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, SDL, qt4 }: +{ lib, stdenv, fetchurl, cmake, SDL, qt4 }: let mirror = "http://download.holdingnuts.net"; in stdenv.mkDerivation rec { @@ -25,9 +25,10 @@ in stdenv.mkDerivation rec { substituteInPlace src/system/SysAccess.c --replace /usr/share $out/share ''; - buildInputs = [ cmake SDL qt4 ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ SDL qt4 ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.holdingnuts.net/"; description = "Open Source Poker client and server"; license = licenses.gpl3; diff --git a/pkgs/games/hyperrogue/default.nix b/pkgs/games/hyperrogue/default.nix index 32882f168945..08427bd29205 100644 --- a/pkgs/games/hyperrogue/default.nix +++ b/pkgs/games/hyperrogue/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, SDL, SDL_ttf, SDL_gfx, SDL_mixer, autoreconfHook, +{ lib, stdenv, fetchFromGitHub, SDL, SDL_ttf, SDL_gfx, SDL_mixer, autoreconfHook, libpng, glew, makeDesktopItem }: stdenv.mkDerivation rec { @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.roguetemple.com/z/hyper/"; description = "A roguelike game set in hyperbolic geometry"; maintainers = with maintainers; [ rardiol ]; diff --git a/pkgs/games/instead-launcher/default.nix b/pkgs/games/instead-launcher/default.nix index 84e3474225ad..1f03a72390eb 100644 --- a/pkgs/games/instead-launcher/default.nix +++ b/pkgs/games/instead-launcher/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, instead, qmake4Hook, zlib }: +{ lib, stdenv, fetchFromGitHub, instead, qmake4Hook, zlib }: stdenv.mkDerivation rec { pname = "instead-launcher"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ zlib ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://instead.syscall.ru/wiki/en/instead-launcher"; description = "Install and play games from INSTEAD repository"; license = licenses.gpl2; diff --git a/pkgs/games/instead/default.nix b/pkgs/games/instead/default.nix index 8672a7e44940..02a54dc7604c 100644 --- a/pkgs/games/instead/default.nix +++ b/pkgs/games/instead/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, SDL2, SDL2_ttf, SDL2_image, SDL2_mixer, pkgconfig, lua, zlib, unzip }: +{ lib, stdenv, fetchurl, SDL2, SDL2_ttf, SDL2_image, SDL2_mixer, pkgconfig, lua, zlib, unzip }: let version = "3.3.2"; @@ -62,7 +62,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Simple text adventure interpreter for Unix and Windows"; homepage = "https://instead.syscall.ru/"; license = stdenv.lib.licenses.gpl2; diff --git a/pkgs/games/iortcw/sp.nix b/pkgs/games/iortcw/sp.nix index 71144ad0eb85..fc1976b0fb17 100644 --- a/pkgs/games/iortcw/sp.nix +++ b/pkgs/games/iortcw/sp.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, opusfile, libogg, SDL2, openal, freetype +{ lib, stdenv, fetchFromGitHub, opusfile, libogg, SDL2, openal, freetype , libjpeg, curl, makeWrapper }: stdenv.mkDerivation rec { @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Single player version of game engine for Return to Castle Wolfenstein"; homepage = src.meta.homepage; license = licenses.gpl3; diff --git a/pkgs/games/ivan/default.nix b/pkgs/games/ivan/default.nix index c5a93939a0f9..459d1a69633a 100644 --- a/pkgs/games/ivan/default.nix +++ b/pkgs/games/ivan/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, SDL2, SDL2_mixer, alsaLib, libpng +{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, SDL2, SDL2_mixer, alsaLib, libpng , pcre, makeDesktopItem }: stdenv.mkDerivation rec { @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { cp ${ivanDesktop}/share/applications/* $out/share/applications ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Graphical roguelike game"; longDescription = '' Iter Vehemens ad Necem (IVAN) is a graphical roguelike game, which currently diff --git a/pkgs/games/ja2-stracciatella/default.nix b/pkgs/games/ja2-stracciatella/default.nix index 89d75dd837fa..4dfcc53d3397 100644 --- a/pkgs/games/ja2-stracciatella/default.nix +++ b/pkgs/games/ja2-stracciatella/default.nix @@ -30,7 +30,8 @@ stdenv.mkDerivation { inherit src; inherit version; - buildInputs = [ cmake SDL2 fltk boost ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ SDL2 fltk boost ]; patches = [ ./remove-rust-buildstep.patch @@ -41,8 +42,6 @@ stdenv.mkDerivation { cmakeFlagsArray+=("-DEXTRA_DATA_DIR=$out/share/ja2") ''; - enableParallelBuilding = true; - meta = { description = "Jagged Alliance 2, with community fixes"; license = "SFI Source Code license agreement"; diff --git a/pkgs/games/julius/default.nix b/pkgs/games/julius/default.nix index 435db5772ba0..c11e93670cf7 100644 --- a/pkgs/games/julius/default.nix +++ b/pkgs/games/julius/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, SDL2, SDL2_mixer, libpng }: +{ lib, stdenv, fetchFromGitHub, cmake, SDL2, SDL2_mixer, libpng }: stdenv.mkDerivation rec { pname = "julius"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ SDL2 SDL2_mixer libpng ]; - meta = with stdenv.lib; { + meta = with lib; { description = "An open source re-implementation of Caesar III"; homepage = "https://github.com/bvschaik/julius"; license = licenses.agpl3; diff --git a/pkgs/games/jumpnbump/default.nix b/pkgs/games/jumpnbump/default.nix new file mode 100644 index 000000000000..d81aece0e821 --- /dev/null +++ b/pkgs/games/jumpnbump/default.nix @@ -0,0 +1,55 @@ +{ stdenv +, fetchFromGitLab +, fetchzip +, SDL2, SDL2_mixer, SDL2_net +, gtk3, gobject-introspection +, python3Packages +, wrapGAppsHook +}: + +let data = fetchzip { + url = "https://mirandir.pagesperso-orange.fr/files/additional-levels.tar.xz"; + sha256 = "167hisscsbldrwrs54gq6446shl8h26qdqigmfg0lq3daynqycg2"; +}; in + +stdenv.mkDerivation rec { + pname = "jumpnbump"; + version = "1.70-dev"; + + # By targeting the development version, we can omit the patches Arch uses + src = fetchFromGitLab { + domain = "gitlab.com"; + owner = "LibreGames"; + repo = pname; + rev = "5744738211ca691444f779aafee3537fb3562516"; + sha256 = "0f1k26jicmb95bx19wgcdpwsbbl343i7mqqqc2z9lkb8drlsyqcy"; + }; + + makeFlags = [ "PREFIX=$(out)" ]; + + nativeBuildInputs = [ python3Packages.wrapPython wrapGAppsHook ]; + buildInputs = [ SDL2 SDL2_mixer SDL2_net gtk3 gobject-introspection ]; + + postInstall = '' + make -C menu PREFIX=$out all install + cp -r ${data}/* $out/share/jumpnbump/ + rm $out/share/applications/jumpnbump-menu.desktop + sed -ie 's+Exec=jumpnbump+Exec=jumpnbump-menu+' $out/share/applications/jumpnbump.desktop + ''; + + pythonPath = with python3Packages; [ pygobject3 pillow ]; + preFixup = '' + buildPythonPath "$out $pythonPath" + ''; + postFixup = '' + wrapPythonPrograms + ''; + + meta = with stdenv.lib; { + description = "cute, true multiplayer platform game with bunnies"; + homepage = "https://libregames.gitlab.io/jumpnbump/"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ iblech ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/games/katago/default.nix b/pkgs/games/katago/default.nix index 0f9e4b8d67a8..9499d47c42f3 100644 --- a/pkgs/games/katago/default.nix +++ b/pkgs/games/katago/default.nix @@ -14,11 +14,12 @@ , ocl-icd ? null , gperftools ? null , eigen ? null -, enableAVX2 ? false +, enableAVX2 ? stdenv.hostPlatform.avx2Support , enableBigBoards ? false , enableCuda ? false , enableGPU ? true -, enableTcmalloc ? true}: +, enableTcmalloc ? true +}: assert !enableGPU -> ( eigen != null && @@ -103,9 +104,7 @@ in env.mkDerivation rec { --prefix LD_LIBRARY_PATH : "/run/opengl-driver/lib" ''; - enableParallelBuilding = true; - - meta = with stdenv.lib; { + meta = with lib; { description = "Go engine modeled after AlphaGo Zero"; homepage = "https://github.com/lightvector/katago"; license = licenses.mit; diff --git a/pkgs/games/keeperrl/default.nix b/pkgs/games/keeperrl/default.nix index 68426a4aedfd..568a0449ac28 100644 --- a/pkgs/games/keeperrl/default.nix +++ b/pkgs/games/keeperrl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, requireFile +{ lib, stdenv, fetchFromGitHub, requireFile , openal, curl, libogg, libvorbis , SDL2, SDL2_image, zlib , unfree_assets ? false }: @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { ${stdenv.lib.optionalString unfree_assets "cp -r data $out/share"} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A dungeon management rogue-like"; homepage = "https://keeperrl.com/"; license = licenses.gpl2; diff --git a/pkgs/games/klavaro/default.nix b/pkgs/games/klavaro/default.nix index ac2c787d3ff2..a7e6eeef93ce 100644 --- a/pkgs/games/klavaro/default.nix +++ b/pkgs/games/klavaro/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , makeWrapper , curl @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { # Hack to avoid TMPDIR in RPATHs. preFixup = ''rm -rf "$(pwd)" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Free touch typing tutor program"; homepage = "http://klavaro.sourceforge.net/"; changelog = "https://sourceforge.net/p/klavaro/code/HEAD/tree/trunk/ChangeLog"; diff --git a/pkgs/games/lbreakout2/default.nix b/pkgs/games/lbreakout2/default.nix index ddd7e454efba..24797952d589 100644 --- a/pkgs/games/lbreakout2/default.nix +++ b/pkgs/games/lbreakout2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, SDL, SDL_mixer, zlib, libpng, libintl }: +{ lib, stdenv, fetchurl, SDL, SDL_mixer, zlib, libpng, libintl }: stdenv.mkDerivation rec { pname = "lbreakout2"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0vwdlyvh7c4y80q5vp7fyfpzbqk9lq3w8pvavi139njkalbxc14i"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Breakout clone from the LGames series"; homepage = "http://lgames.sourceforge.net/LBreakout2/"; license = licenses.gpl2; diff --git a/pkgs/games/leela-zero/default.nix b/pkgs/games/leela-zero/default.nix index 7ade06393bb6..4a71fc25c0f2 100644 --- a/pkgs/games/leela-zero/default.nix +++ b/pkgs/games/leela-zero/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, boost +{ lib, stdenv, fetchFromGitHub, cmake, boost , opencl-headers, ocl-icd, qtbase , zlib }: stdenv.mkDerivation rec { @@ -17,9 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - enableParallelBuilding = true; - - meta = with stdenv.lib; { + meta = with lib; { description = "Go engine modeled after AlphaGo Zero"; homepage = "https://github.com/gcp/leela-zero"; license = licenses.gpl3; diff --git a/pkgs/games/lgogdownloader/default.nix b/pkgs/games/lgogdownloader/default.nix index 6fba4da3a0e4..e19febe42f11 100644 --- a/pkgs/games/lgogdownloader/default.nix +++ b/pkgs/games/lgogdownloader/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , cmake , pkgconfig @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { buildInputs = [ boost curl htmlcxx jsoncpp liboauth rhash tinyxml-2 ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Unofficial downloader to GOG.com for Linux users. It uses the same API as the official GOGDownloader"; homepage = "https://github.com/Sude-/lgogdownloader"; license = licenses.wtfpl; diff --git a/pkgs/games/liberal-crime-squad/default.nix b/pkgs/games/liberal-crime-squad/default.nix index 25d8bf3eae53..d8048b01d21e 100644 --- a/pkgs/games/liberal-crime-squad/default.nix +++ b/pkgs/games/liberal-crime-squad/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, stdenv, autoreconfHook, libiconv, ncurses, SDL2, SDL2_mixer }: +{ fetchFromGitHub, lib, stdenv, autoreconfHook, libiconv, ncurses, SDL2, SDL2_mixer }: stdenv.mkDerivation { version = "2016-07-06"; @@ -16,7 +16,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A humorous politically themed ncurses game"; longDescription = '' Welcome to Liberal Crime Squad! The Conservatives have taken the Executive, Legislative, and Judicial branches of government. Over time, the Liberal laws of this nation will erode and turn the country into a BACKWOODS YET CORPORATE NIGHTMARE. To prevent this from happening, the Liberal Crime Squad was established. The mood of the country is shifting, and we need to turn things around. Go out on the streets and indoctrinate Conservative automatons. That is, let them see their True Liberal Nature. Then arm them and send them forth to Stop Evil. diff --git a/pkgs/games/lincity/default.nix b/pkgs/games/lincity/default.nix index 574b8ead0950..397ca0cfe8ef 100644 --- a/pkgs/games/lincity/default.nix +++ b/pkgs/games/lincity/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, libX11, libXext, xorgproto, libICE, libSM, libpng12, zlib }: +{ lib, stdenv, fetchurl, fetchpatch, libX11, libXext, xorgproto, libICE, libSM, libpng12, zlib }: stdenv.mkDerivation rec { pname = "lincity"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { }) ]; - meta = with stdenv.lib; { + meta = with lib; { description = "City simulation game"; license = licenses.gpl2Plus; homepage = "https://sourceforge.net/projects/lincity"; diff --git a/pkgs/games/lincity/ng.nix b/pkgs/games/lincity/ng.nix index 67f15be1ed3e..4c3114a92027 100644 --- a/pkgs/games/lincity/ng.nix +++ b/pkgs/games/lincity/ng.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, jam, pkgconfig +{ lib, stdenv, fetchFromGitHub, autoreconfHook, jam, pkgconfig , zlib, libxml2, libxslt, xorgproto, libX11, libGLU, libGL, SDL , SDL_mixer, SDL_image, SDL_ttf, SDL_gfx, physfs }: @@ -46,7 +46,7 @@ stdenv.mkDerivation { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "City building game"; license = licenses.gpl2; maintainers = with maintainers; [ raskin ]; diff --git a/pkgs/games/liquidwar/5.nix b/pkgs/games/liquidwar/5.nix index 3d8cf3840f8b..8abb1c7d53ee 100644 --- a/pkgs/games/liquidwar/5.nix +++ b/pkgs/games/liquidwar/5.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, allegro }: +{ lib, stdenv, fetchurl, allegro }: stdenv.mkDerivation rec { version = "5.6.5"; pname = "liquidwar5"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = [ "-lm" ]; - meta = with stdenv.lib; { + meta = with lib; { description = ''The classic version of a quick tactics game LiquidWar''; maintainers = [ maintainers.raskin ]; license = licenses.gpl2Plus; diff --git a/pkgs/games/liquidwar/default.nix b/pkgs/games/liquidwar/default.nix index 341d077879c2..09ddcb0346c8 100644 --- a/pkgs/games/liquidwar/default.nix +++ b/pkgs/games/liquidwar/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, xorgproto, libX11, libXrender +{ lib, stdenv, fetchurl, xorgproto, libX11, libXrender , gmp, libjpeg, libpng , expat, gettext, perl, guile , SDL, SDL_image, SDL_mixer, SDL_ttf @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { # To avoid problems finding SDL_types.h. configureFlags = [ "CFLAGS=-I${SDL.dev}/include/SDL" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Quick tactics game"; homepage = "https://www.gnu.org/software/liquidwar6/"; maintainers = [ maintainers.raskin ]; diff --git a/pkgs/games/ltris/default.nix b/pkgs/games/ltris/default.nix index 0ea4143bc3d2..d128f6c6c017 100644 --- a/pkgs/games/ltris/default.nix +++ b/pkgs/games/ltris/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, SDL, SDL_mixer }: +{ lib, stdenv, fetchurl, SDL, SDL_mixer }: stdenv.mkDerivation rec { pname = "ltris"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { patchPhase = "patch -p0 < ${./gcc5_compliance.diff}"; - meta = with stdenv.lib; { + meta = with lib; { description = "Tetris clone from the LGames series"; homepage = "http://lgames.sourceforge.net/LBreakout2/"; license = licenses.gpl2; diff --git a/pkgs/games/mar1d/default.nix b/pkgs/games/mar1d/default.nix index 9fe99bff2f92..1323e1a8ac9c 100644 --- a/pkgs/games/mar1d/default.nix +++ b/pkgs/games/mar1d/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , cmake , libGLU @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { cd src ''; - meta = with stdenv.lib; { + meta = with lib; { description = "First person Super Mario Bros"; longDescription = '' The original Super Mario Bros as you've never seen it. Step into Mario's diff --git a/pkgs/games/mari0/default.nix b/pkgs/games/mari0/default.nix index c3fb66208b80..cb3349960f02 100644 --- a/pkgs/games/mari0/default.nix +++ b/pkgs/games/mari0/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, zip, love_11, lua, makeWrapper, makeDesktopItem }: +{ lib, stdenv, fetchFromGitHub, zip, love_11, lua, makeWrapper, makeDesktopItem }: let pname = "mari0"; @@ -40,7 +40,7 @@ stdenv.mkDerivation { chmod +x $out/bin/${pname} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Crossover between Super Mario Bros. and Portal"; platforms = platforms.linux; license = licenses.mit; diff --git a/pkgs/games/mars/default.nix b/pkgs/games/mars/default.nix index 53ffb4e4b2d0..0fa744677d83 100644 --- a/pkgs/games/mars/default.nix +++ b/pkgs/games/mars/default.nix @@ -1,14 +1,16 @@ -{ stdenv, fetchgit, cmake, libGLU, libGL, sfml, fribidi, taglib }: +{ lib, stdenv, fetchFromGitHub, cmake, libGLU, libGL, sfml, fribidi, taglib }: stdenv.mkDerivation rec { - name = "mars-${version}-${rev}"; + pname = "mars"; version = "0.7.5"; - rev = "c855d04409"; - src = fetchgit { - url = "https://github.com/thelaui/M.A.R.S..git"; - inherit rev; + + src = fetchFromGitHub { + owner = "thelaui"; + repo = "M.A.R.S."; + rev = "c855d044094a1d92317e38935d81ba938946132e"; sha256 = "1r4c5gap1z2zsv4yjd34qriqkxaq4lb4rykapyzkkdf4g36lc3nh"; }; - buildInputs = [ cmake libGLU libGL sfml fribidi taglib ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ libGLU libGL sfml fribidi taglib ]; patches = [ ./unbind_fix.patch ./fix-gluortho2d.patch @@ -27,7 +29,7 @@ stdenv.mkDerivation rec { EOF chmod +x "$out/bin/mars" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://mars-game.sourceforge.net/"; description = "A game about fighting with ships in a 2D space setting"; license = licenses.gpl3Plus; diff --git a/pkgs/games/megaglest/default.nix b/pkgs/games/megaglest/default.nix index b7ab42ed7307..0660d196f1eb 100644 --- a/pkgs/games/megaglest/default.nix +++ b/pkgs/games/megaglest/default.nix @@ -1,4 +1,4 @@ -{ stdenv, cmake, pkgconfig, git, curl, SDL2, xercesc, openal, lua, libvlc +{ stdenv, cmake, pkg-config, git, curl, SDL2, xercesc, openal, lua, libvlc , libjpeg, wxGTK, cppunit, ftgl, glew, libogg, libvorbis, buildEnv, libpng , fontconfig, freetype, xorg, makeWrapper, bash, which, gnome3, libGLU, glib , fetchFromGitHub @@ -28,17 +28,17 @@ stdenv.mkDerivation { sha256 = "0fb58a706nic14ss89zrigphvdiwy5s9dwvhscvvgrfvjpahpcws"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake git curl SDL2 xercesc openal lua libpng libjpeg libvlc wxGTK + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ git curl SDL2 xercesc openal lua libpng libjpeg libvlc wxGTK glib cppunit fontconfig freetype ftgl glew libogg libvorbis makeWrapper libGLU ]; - configurePhase = '' - cmake -DCMAKE_INSTALL_PREFIX=$out \ - -DBUILD_MEGAGLEST=On \ - -DBUILD_MEGAGLEST_MAP_EDITOR=On \ - -DBUILD_MEGAGLEST_MODEL_IMPORT_EXPORT_TOOLS=On \ - -DBUILD_MEGAGLEST_MODEL_VIEWER=On - ''; + cmakeFlags = [ + "-DCMAKE_INSTALL_PREFIX=$out" + "-DBUILD_MEGAGLEST=On" + "-DBUILD_MEGAGLEST_MAP_EDITOR=On" + "-DBUILD_MEGAGLEST_MODEL_IMPORT_EXPORT_TOOLS=On" + "-DBUILD_MEGAGLEST_MODEL_VIEWER=On" + ]; postInstall = '' for i in $out/bin/*; do @@ -48,11 +48,11 @@ stdenv.mkDerivation { done ''; - meta = { + meta = with stdenv.lib; { description = "An entertaining free (freeware and free software) and open source cross-platform 3D real-time strategy (RTS) game"; - license = stdenv.lib.licenses.gpl3; + license = licenses.gpl3; homepage = "http://megaglest.org/"; - maintainers = [ stdenv.lib.maintainers.matejc ]; - platforms = stdenv.lib.platforms.linux; + maintainers = [ maintainers.matejc ]; + platforms = platforms.linux; }; } diff --git a/pkgs/games/meritous/default.nix b/pkgs/games/meritous/default.nix index 2958c6a9210f..e7dd1bee70c9 100644 --- a/pkgs/games/meritous/default.nix +++ b/pkgs/games/meritous/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, SDL, SDL_image, SDL_mixer, zlib }: +{ lib, stdenv, fetchFromGitLab, SDL, SDL_image, SDL_mixer, zlib }: stdenv.mkDerivation { pname = "meritous"; @@ -29,7 +29,7 @@ stdenv.mkDerivation { hardeningDisable = [ "stackprotector" "fortify" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Action-adventure dungeon crawl game"; homepage = "http://www.asceai.net/meritous/"; license = licenses.gpl3; diff --git a/pkgs/games/mindustry/0001-fix-include-path-for-SDL2-on-linux.patch b/pkgs/games/mindustry/0001-fix-include-path-for-SDL2-on-linux.patch new file mode 100644 index 000000000000..d4fe7be19183 --- /dev/null +++ b/pkgs/games/mindustry/0001-fix-include-path-for-SDL2-on-linux.patch @@ -0,0 +1,33 @@ +From 9dbfa680db6bfd1033772dda753120fe4452e0d9 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Milan=20P=C3=A4ssler?= +Date: Fri, 8 Jan 2021 04:49:14 +0100 +Subject: [PATCH] fix include path for SDL2 on linux + +--- + .../src/main/java/arc/backend/sdl/jni/SDL.java | 8 -------- + 1 file changed, 8 deletions(-) + +diff --git a/backends/backend-sdl/src/main/java/arc/backend/sdl/jni/SDL.java b/backends/backend-sdl/src/main/java/arc/backend/sdl/jni/SDL.java +index 62d9286a..2853119d 100644 +--- a/Arc/backends/backend-sdl/src/main/java/arc/backend/sdl/jni/SDL.java ++++ b/Arc/backends/backend-sdl/src/main/java/arc/backend/sdl/jni/SDL.java +@@ -8,16 +8,8 @@ import java.nio.*; + public class SDL{ + /*JNI + +- #ifdef __APPLE__ +- + #include "SDL2/SDL.h" + +- #else +- +- #include "SDL.h" +- +- #endif +- + */ + + static{ +-- +2.29.2 + diff --git a/pkgs/games/mindustry/default.nix b/pkgs/games/mindustry/default.nix index 423bf4bf9fe0..b9969b84fb76 100644 --- a/pkgs/games/mindustry/default.nix +++ b/pkgs/games/mindustry/default.nix @@ -1,12 +1,20 @@ -{ stdenv +{ lib, stdenv , makeWrapper , makeDesktopItem +, copyDesktopItems , fetchFromGitHub +, fetchpatch , gradleGen -, jdk14 +, jdk , perl -, jre + +# for arc +, SDL2 +, pkg-config +, stb +, ant , alsaLib +, glew # Make the build version easily overridable. # Server and client build versions must match, and an empty build version means @@ -22,15 +30,55 @@ let # Note: when raising the version, ensure that all SNAPSHOT versions in # build.gradle are replaced by a fixed version # (the current one at the time of release) (see postPatch). - version = "122"; + version = "122.1"; buildVersion = makeBuildVersion version; - src = fetchFromGitHub { + Mindustry = fetchFromGitHub { owner = "Anuken"; repo = "Mindustry"; rev = "v${version}"; - sha256 = "19dxqscnny0c5w3pyg88hflrkhsqgd7zx19240kh4h69y3wwaz0m"; + sha256 = "18m4s81cfb2cr2fj61nf6spiln7cbvx25g42w6fypfikflv3qd8y"; }; + Arc = fetchFromGitHub { + owner = "Anuken"; + repo = "Arc"; + rev = "v${version}"; + sha256 = "0inzyj01442da7794cpxlaab7di9gv1snc97cbffqsdxgin16i7d"; + }; + soloud = fetchFromGitHub { + owner = "Anuken"; + repo = "soloud"; + # this is never pinned in upstream, see https://github.com/Anuken/Arc/issues/39 + rev = "8553049c6fb0d1eaa7f57c1793b96219c84e8ba5"; + sha256 = "076vnjs2qxd65qq5i37gbmj5v5i04a1vw0kznq986gv9190jj531"; + }; + + patches = [ + ./0001-fix-include-path-for-SDL2-on-linux.patch + # upstream fix for https://github.com/Anuken/Arc/issues/40, remove on next release + (fetchpatch { + url = "https://github.com/Anuken/Arc/commit/b2f3d212c1a88a62f140f5cb04f4c86e61332d1c.patch"; + sha256 = "1yjp4drv7lk3kinzy47g8jhb2qazr92b85vbc79vsqrs8sycskan"; + extraPrefix = "Arc/"; + stripLen = 1; + }) + # add resolveDependencies task, remove when and if it gets added upstream in a future release + (fetchpatch { + url = "https://github.com/Anuken/Mindustry/pull/4302.patch"; + sha256 = "0yp42sray4fxkajhpdljal0wss8jh9rvmclysw6cixsa94pw5khq"; + extraPrefix = "Mindustry/"; + stripLen = 1; + }) + ]; + + unpackPhase = '' + cp -r ${Mindustry} Mindustry + cp -r ${Arc} Arc + chmod -R u+w -- Mindustry Arc + cp ${stb.src}/stb_image.h Arc/arc-core/csrc/ + cp -r ${soloud} Arc/arc-core/csrc/soloud + chmod -R u+w -- Arc + ''; desktopItem = makeDesktopItem { type = "Application"; @@ -40,7 +88,9 @@ let icon = "mindustry"; }; - postPatch = '' + cleanupMindustrySrc = '' + pushd Mindustry + # Remove unbuildable iOS stuff sed -i '/^project(":ios"){/,/^}/d' build.gradle sed -i '/robo(vm|VM)/d' build.gradle @@ -48,30 +98,28 @@ let # Pin 'SNAPSHOT' versions sed -i 's/com.github.anuken:packr:-SNAPSHOT/com.github.anuken:packr:034efe51781d2d8faa90370492133241bfb0283c/' build.gradle - ''; - preBuild = '' - # Arc is run at build time for sprite packing, and it needs to see - # the runtime libraries - ${stdenv.lib.optionalString stdenv.isLinux "export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${alsaLib}/lib"} - export GRADLE_USER_HOME=$(mktemp -d) + popd ''; # The default one still uses jdk8 (#89731) - gradle_6 = (gradleGen.override (old: { java = jdk14; })).gradle_6_7; + gradle_6 = (gradleGen.override (old: { java = jdk; })).gradle_6_7; # fake build to pre-download deps into fixed-output derivation deps = stdenv.mkDerivation { pname = "${pname}-deps"; - inherit version src postPatch; + inherit version unpackPhase patches; + postPatch = cleanupMindustrySrc; + nativeBuildInputs = [ gradle_6 perl ]; - # Here we build both the server and the client so we only have to specify - # one hash for 'deps'. Deps can be garbage collected after the build, - # so this is not really an issue. + # Here we download dependencies for both the server and the client so + # we only have to specify one hash for 'deps'. Deps can be garbage + # collected after the build, so this is not really an issue. buildPhase = '' - ${preBuild} - gradle --no-daemon desktop:dist -Pbuildversion=${buildVersion} - gradle --no-daemon server:dist -Pbuildversion=${buildVersion} + pushd Mindustry + export GRADLE_USER_HOME=$(mktemp -d) + gradle --no-daemon resolveDependencies + popd ''; # perl code mavenizes pathes (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar) installPhase = '' @@ -81,66 +129,83 @@ let ''; outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "1kymfrd2vd23y1rmx19q47wc212r6qx03x6g58pxbqyylxmcw5zq"; + outputHash = "09rwyrg2yv8r499b0dk1bzvymsf98d4j5b95bwd9s4xvrz71is3l"; }; - # Separate commands for building and installing the server and the client - buildClient = '' - gradle --offline --no-daemon desktop:dist -Pbuildversion=${buildVersion} - ''; - buildServer = '' - gradle --offline --no-daemon server:dist -Pbuildversion=${buildVersion} - ''; - installClient = '' - install -Dm644 desktop/build/libs/Mindustry.jar $out/share/mindustry.jar - mkdir -p $out/bin - makeWrapper ${jre}/bin/java $out/bin/mindustry \ - ${stdenv.lib.optionalString stdenv.isLinux "--prefix LD_LIBRARY_PATH : ${alsaLib}/lib"} \ - --add-flags "-jar $out/share/mindustry.jar" - install -Dm644 core/assets/icons/icon_64.png $out/share/icons/hicolor/64x64/apps/mindustry.png - install -Dm644 ${desktopItem}/share/applications/Mindustry.desktop $out/share/applications/Mindustry.desktop - ''; - installServer = '' - install -Dm644 server/build/libs/server-release.jar $out/share/mindustry-server.jar - mkdir -p $out/bin - makeWrapper ${jre}/bin/java $out/bin/mindustry-server \ - --add-flags "-jar $out/share/mindustry-server.jar" - ''; - in -assert stdenv.lib.assertMsg (enableClient || enableServer) +assert lib.assertMsg (enableClient || enableServer) "mindustry: at least one of 'enableClient' and 'enableServer' must be true"; stdenv.mkDerivation rec { - inherit pname version src postPatch; + inherit pname version unpackPhase patches; - nativeBuildInputs = [ gradle_6 makeWrapper ]; + postPatch = '' + # ensure the prebuilt shared objects don't accidentally get shipped + rm Arc/natives/natives-desktop/libs/libarc*.so + rm Arc/backends/backend-sdl/libs/linux64/libsdl-arc*.so + '' + cleanupMindustrySrc; + + buildInputs = lib.optionals enableClient [ + SDL2 + glew + alsaLib + ]; + nativeBuildInputs = [ + pkg-config + gradle_6 + makeWrapper + jdk + ] ++ lib.optionals enableClient [ + ant + copyDesktopItems + ]; + + desktopItems = lib.optional enableClient desktopItem; + + buildPhase = with lib; '' + export GRADLE_USER_HOME=$(mktemp -d) - buildPhase = with stdenv.lib; '' - ${preBuild} # point to offline repo - sed -ie "s#mavenLocal()#mavenLocal(); maven { url '${deps}' }#g" build.gradle - ${optionalString enableClient buildClient} - ${optionalString enableServer buildServer} + sed -ie "s#mavenLocal()#mavenLocal(); maven { url '${deps}' }#g" Mindustry/build.gradle + sed -ie "s#mavenCentral()#mavenCentral(); maven { url '${deps}' }#g" Arc/build.gradle + + pushd Mindustry + '' + optionalString enableClient '' + gradle --offline --no-daemon jnigenBuild -Pbuildversion=${buildVersion} + gradle --offline --no-daemon sdlnatives -Pdynamic -Pbuildversion=${buildVersion} + patchelf ../Arc/backends/backend-sdl/libs/linux64/libsdl-arc*.so \ + --add-needed ${glew.out}/lib/libGLEW.so \ + --add-needed ${SDL2}/lib/libSDL2.so + gradle --offline --no-daemon desktop:dist -Pbuildversion=${buildVersion} + '' + optionalString enableServer '' + gradle --offline --no-daemon server:dist -Pbuildversion=${buildVersion} ''; - installPhase = with stdenv.lib; '' - ${optionalString enableClient installClient} - ${optionalString enableServer installServer} + installPhase = with lib; '' + runHook preInstall + '' + optionalString enableClient '' + install -Dm644 desktop/build/libs/Mindustry.jar $out/share/mindustry.jar + mkdir -p $out/bin + makeWrapper ${jdk}/bin/java $out/bin/mindustry \ + --add-flags "-jar $out/share/mindustry.jar" + install -Dm644 core/assets/icons/icon_64.png $out/share/icons/hicolor/64x64/apps/mindustry.png + '' + optionalString enableServer '' + install -Dm644 server/build/libs/server-release.jar $out/share/mindustry-server.jar + mkdir -p $out/bin + makeWrapper ${jdk}/bin/java $out/bin/mindustry-server \ + --add-flags "-jar $out/share/mindustry-server.jar" + '' + '' + runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://mindustrygame.github.io/"; downloadPage = "https://github.com/Anuken/Mindustry/releases"; description = "A sandbox tower defense game"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ fgaz ]; - platforms = platforms.all; + maintainers = with maintainers; [ fgaz petabyteboy ]; + platforms = platforms.x86_64; # Hash mismatch on darwin: # https://github.com/NixOS/nixpkgs/pull/105590#issuecomment-737120293 - # Problems with native libraries in aarch64: - # https://github.com/NixOS/nixpkgs/pull/107646 - # https://logs.nix.ci/?key=nixos/nixpkgs.107646&attempt_id=3032c060-72e9-4a76-8186-4739544397dd - broken = stdenv.isDarwin || - stdenv.isAarch64; + broken = stdenv.isDarwin; }; } diff --git a/pkgs/games/minecraft-server/default.nix b/pkgs/games/minecraft-server/default.nix index 77181692ec22..bba64fe4b4f9 100644 --- a/pkgs/games/minecraft-server/default.nix +++ b/pkgs/games/minecraft-server/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, nixosTests, jre_headless }: +{ lib, stdenv, fetchurl, nixosTests, jre_headless }: stdenv.mkDerivation { pname = "minecraft-server"; version = "1.16.4"; @@ -30,7 +30,7 @@ stdenv.mkDerivation { updateScript = ./update.sh; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Minecraft Server"; homepage = "https://minecraft.net"; license = licenses.unfreeRedistributable; diff --git a/pkgs/games/minecraft/default.nix b/pkgs/games/minecraft/default.nix index 292b43bec0ad..814abd698cee 100644 --- a/pkgs/games/minecraft/default.nix +++ b/pkgs/games/minecraft/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , nixosTests , copyDesktopItems @@ -145,7 +145,7 @@ stdenv.mkDerivation rec { desktopItems = [ desktopItem ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Official launcher for Minecraft, a sandbox-building game"; homepage = "https://minecraft.net"; maintainers = with maintainers; [ cpages ryantm infinisil ]; diff --git a/pkgs/games/minetest/default.nix b/pkgs/games/minetest/default.nix index f49ec1f4a826..763c7f4bd67d 100644 --- a/pkgs/games/minetest/default.nix +++ b/pkgs/games/minetest/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, irrlicht, libpng, bzip2, curl, libogg, jsoncpp +{ lib, stdenv, fetchFromGitHub, cmake, irrlicht, libpng, bzip2, curl, libogg, jsoncpp , libjpeg, libXxf86vm, libGLU, libGL, openal, libvorbis, sqlite, luajit , freetype, gettext, doxygen, ncurses, graphviz, xorg, gmp, libspatialindex , leveldb, postgresql, hiredis, libiconv, OpenGL, OpenAL ? openal, Carbon, Cocoa @@ -60,7 +60,7 @@ let cp -rv ${sources.data}/* $out/share/minetest/games/minetest_game/ ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://minetest.net/"; description = "Infinite-world block sandbox game"; license = licenses.lgpl21Plus; diff --git a/pkgs/games/mrrescue/default.nix b/pkgs/games/mrrescue/default.nix index 367a7a5c5e61..d3caa986b857 100644 --- a/pkgs/games/mrrescue/default.nix +++ b/pkgs/games/mrrescue/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, love, lua, makeWrapper, makeDesktopItem }: +{ lib, stdenv, fetchurl, love, lua, makeWrapper, makeDesktopItem }: let pname = "mrrescue"; @@ -48,7 +48,7 @@ stdenv.mkDerivation { ln -s ${desktopItem}/share/applications/* $out/share/applications/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Arcade-style fire fighting game"; maintainers = with maintainers; [ ]; platforms = platforms.linux; diff --git a/pkgs/games/mudlet/default.nix b/pkgs/games/mudlet/default.nix index b73af4515d3c..b6f66b30769d 100644 --- a/pkgs/games/mudlet/default.nix +++ b/pkgs/games/mudlet/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, fetchpatch, stdenv, wrapQtAppsHook, git, pcre, pugixml, qtbase, libsForQt5, qtmultimedia, qttools, yajl, libzip, hunspell +{ fetchFromGitHub, fetchpatch, lib, stdenv, wrapQtAppsHook, git, pcre, pugixml, qtbase, libsForQt5, qtmultimedia, qttools, yajl, libzip, hunspell , boost, libGLU, lua, cmake, which, }: let @@ -24,8 +24,6 @@ stdenv.mkDerivation rec { WITH_FONTS = "NO"; WITH_UPDATER = "NO"; - enableParallelBuilding = true; - installPhase = '' mkdir -pv $out/lib cp 3rdparty/edbee-lib/edbee-lib/qslog/lib/libQsLog.so $out/lib @@ -47,7 +45,7 @@ stdenv.mkDerivation rec { --run "cd $out"; ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Crossplatform mud client"; homepage = "http://mudlet.org/"; maintainers = [ maintainers.wyvie maintainers.pstn ]; diff --git a/pkgs/games/multimc/default.nix b/pkgs/games/multimc/default.nix index c114afe9a8e3..6ac2e65b5776 100644 --- a/pkgs/games/multimc/default.nix +++ b/pkgs/games/multimc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, mkDerivation, fetchFromGitHub, cmake, jdk8, zlib, file, makeWrapper, xorg, libpulseaudio, qtbase }: +{ lib, stdenv, mkDerivation, fetchFromGitHub, cmake, jdk8, zlib, file, makeWrapper, xorg, libpulseaudio, qtbase }: let jdk = jdk8; @@ -16,8 +16,6 @@ in mkDerivation rec { nativeBuildInputs = [ cmake file makeWrapper ]; buildInputs = [ qtbase jdk zlib ]; - enableParallelBuilding = true; - cmakeFlags = [ "-DMultiMC_LAYOUT=lin-system" ]; postInstall = '' @@ -28,7 +26,7 @@ in mkDerivation rec { wrapProgram $out/bin/multimc --set GAME_LIBRARY_PATH /run/opengl-driver/lib:${libpath} --prefix PATH : ${jdk}/bin/:${xorg.xrandr}/bin/ ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://multimc.org/"; description = "A free, open source launcher for Minecraft"; longDescription = '' diff --git a/pkgs/games/nethack/default.nix b/pkgs/games/nethack/default.nix index 1b082537148b..a922064f78b6 100644 --- a/pkgs/games/nethack/default.nix +++ b/pkgs/games/nethack/default.nix @@ -141,7 +141,7 @@ in stdenv.mkDerivation rec { ${lib.optionalString (!(x11Mode || qtMode)) "install -Dm 555 util/dlb -t $out/libexec/nethack/"} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Rogue-like game"; homepage = "http://nethack.org/"; license = "nethack"; diff --git a/pkgs/games/netris/default.nix b/pkgs/games/netris/default.nix index 994db4e67f8a..ff898128ca06 100644 --- a/pkgs/games/netris/default.nix +++ b/pkgs/games/netris/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ncurses }: +{ lib, stdenv, fetchFromGitHub, ncurses }: stdenv.mkDerivation { pname = "netris"; @@ -23,7 +23,7 @@ stdenv.mkDerivation { cp ./netris $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A free networked version of T*tris"; license = licenses.gpl2; maintainers = with maintainers; [ patryk27 ]; diff --git a/pkgs/games/newtonwars/default.nix b/pkgs/games/newtonwars/default.nix index 093f071c7233..0da6d9352e06 100644 --- a/pkgs/games/newtonwars/default.nix +++ b/pkgs/games/newtonwars/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, makeWrapper, freeglut, libGLU, libGL }: +{ lib, stdenv, fetchFromGitHub, makeWrapper, freeglut, libGLU, libGL }: stdenv.mkDerivation { pname = "newtonwars"; @@ -30,7 +30,7 @@ stdenv.mkDerivation { --prefix LD_LIBRARY_PATH ":" ${libGL}/lib ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A space battle game with gravity as the main theme"; maintainers = with maintainers; [ pSub ]; platforms = platforms.linux; diff --git a/pkgs/games/ninvaders/default.nix b/pkgs/games/ninvaders/default.nix index 26462c1eef5c..df4a3ad111b6 100644 --- a/pkgs/games/ninvaders/default.nix +++ b/pkgs/games/ninvaders/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, ncurses }: +{ lib, stdenv, fetchFromGitHub, cmake, ncurses }: stdenv.mkDerivation rec { pname = "ninvaders"; @@ -11,9 +11,10 @@ stdenv.mkDerivation rec { sha256 = "1wmwws1zsap4bfc2439p25vnja0hnsf57k293rdxw626gly06whi"; }; - buildInputs = [ cmake ncurses ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ ncurses ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Space Invaders clone based on ncurses"; homepage = "http://ninvaders.sourceforge.net/"; license = licenses.gpl2; diff --git a/pkgs/games/nottetris2/default.nix b/pkgs/games/nottetris2/default.nix index dde35e4fe320..53e7dec08032 100644 --- a/pkgs/games/nottetris2/default.nix +++ b/pkgs/games/nottetris2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, zip, love_0_7, makeWrapper, makeDesktopItem }: +{ lib, stdenv, fetchFromGitHub, zip, love_0_7, makeWrapper, makeDesktopItem }: let pname = "nottetris2"; @@ -40,7 +40,7 @@ stdenv.mkDerivation { chmod +x $out/bin/${pname} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "It's like Tetris, but it's not"; platforms = platforms.linux; license = licenses.wtfpl; diff --git a/pkgs/games/nudoku/default.nix b/pkgs/games/nudoku/default.nix index 0e1bd9eb4a9d..d10807071a97 100644 --- a/pkgs/games/nudoku/default.nix +++ b/pkgs/games/nudoku/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gettext, ncurses }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gettext, ncurses }: stdenv.mkDerivation rec { pname = "nudoku"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { configureFlags = stdenv.lib.optional stdenv.hostPlatform.isMusl "--disable-nls"; - meta = with stdenv.lib; { + meta = with lib; { description = "An ncurses based sudoku game"; homepage = "http://jubalh.github.io/nudoku/"; license = licenses.gpl3; diff --git a/pkgs/games/odamex/default.nix b/pkgs/games/odamex/default.nix index af9bccadeb3e..ba220a720cd1 100644 --- a/pkgs/games/odamex/default.nix +++ b/pkgs/games/odamex/default.nix @@ -12,8 +12,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ SDL SDL_mixer SDL_net wxGTK30 ]; - enableParallelBuilding = true; - meta = { homepage = "http://odamex.net/"; description = "A client/server port for playing old-school Doom online"; diff --git a/pkgs/games/onscripter-en/default.nix b/pkgs/games/onscripter-en/default.nix index ebcf755780d3..bcd33eb98928 100644 --- a/pkgs/games/onscripter-en/default.nix +++ b/pkgs/games/onscripter-en/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , libpng, libjpeg, libogg, libvorbis, freetype, smpeg , SDL, SDL_image, SDL_mixer, SDL_ttf }: @@ -25,7 +25,7 @@ stdenv.mkDerivation { sed -i 's/.dll//g' Makefile ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Japanese visual novel scripting engine"; homepage = "http://unclemion.com/onscripter/"; license = licenses.gpl2; diff --git a/pkgs/games/openclonk/default.nix b/pkgs/games/openclonk/default.nix index 18147c896bf4..db9b4760b253 100644 --- a/pkgs/games/openclonk/default.nix +++ b/pkgs/games/openclonk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, pkgconfig +{ lib, stdenv, fetchurl, cmake, pkgconfig , SDL2, libvorbis, libogg, libjpeg, libpng, freetype, glew, tinyxml, openal , freealut, readline, gcc-unwrapped , enableSoundtrack ? false # Enable the "Open Clonk Soundtrack - Explorers Journey" by David Oerther @@ -24,8 +24,6 @@ in stdenv.mkDerivation rec { ln -sv ${soundtrack_src} $out/share/games/openclonk/Music.ocg ''; - enableParallelBuilding = true; - nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ @@ -37,7 +35,7 @@ in stdenv.mkDerivation rec { cmakeBuildType = "RelWithDebInfo"; - meta = with stdenv.lib; { + meta = with lib; { description = "Free multiplayer action game in which you control clonks, small but witty and nimble humanoid beings"; homepage = "https://www.openclonk.org"; license = if enableSoundtrack then licenses.unfreeRedistributable else licenses.isc; diff --git a/pkgs/games/opendune/default.nix b/pkgs/games/opendune/default.nix index 591bea12297d..cf15568b37df 100644 --- a/pkgs/games/opendune/default.nix +++ b/pkgs/games/opendune/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Dune, Reinvented"; homepage = "https://github.com/OpenDUNE/OpenDUNE"; license = licenses.gpl2; diff --git a/pkgs/games/opendungeons/default.nix b/pkgs/games/opendungeons/default.nix index 64b6c07f4a2a..d18682b8807f 100644 --- a/pkgs/games/opendungeons/default.nix +++ b/pkgs/games/opendungeons/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ogre, cegui, boost, sfml, openal, cmake, ois, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, ogre, cegui, boost, sfml, openal, cmake, ois, pkg-config }: stdenv.mkDerivation rec { pname = "opendungeons"; @@ -13,14 +13,14 @@ stdenv.mkDerivation rec { patches = [ ./cmakepaths.patch ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake ogre cegui boost sfml openal ois ]; + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ ogre cegui boost sfml openal ois ]; NIX_LDFLAGS = "-lpthread"; - meta = with stdenv.lib; { + meta = with lib; { description = "An open source, real time strategy game sharing game elements with the Dungeon Keeper series and Evil Genius"; homepage = "https://opendungeons.github.io"; - license = [ licenses.gpl3Plus licenses.zlib licenses.mit licenses.cc-by-sa-30 licenses.cc0 licenses.ofl licenses.cc-by-30 ]; + license = with licenses; [ gpl3Plus zlib mit cc-by-sa-30 cc0 ofl cc-by-30 ]; platforms = platforms.linux; }; } diff --git a/pkgs/games/openjk/default.nix b/pkgs/games/openjk/default.nix index 0fe327b308e9..ecb2cd3c46c2 100644 --- a/pkgs/games/openjk/default.nix +++ b/pkgs/games/openjk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, makeDesktopItem, makeWrapper, cmake, libjpeg, zlib, libpng, libGL, SDL2 }: +{ lib, stdenv, fetchFromGitHub, makeDesktopItem, makeWrapper, cmake, libjpeg, zlib, libpng, libGL, SDL2 }: let jamp = makeDesktopItem rec { @@ -31,7 +31,6 @@ in stdenv.mkDerivation { }; dontAddPrefix = true; - enableParallelBuilding = true; nativeBuildInputs = [ makeWrapper cmake ]; buildInputs = [ libjpeg zlib libpng libGL SDL2 ]; @@ -54,7 +53,7 @@ in stdenv.mkDerivation { ln -s ${jasp}/share/applications/* $out/share/applications ''; - meta = with stdenv.lib; { + meta = with lib; { description = "An open-source engine for Star Wars Jedi Academy game"; homepage = "https://github.com/JACoders/OpenJK"; license = licenses.gpl2; diff --git a/pkgs/games/openlierox/default.nix b/pkgs/games/openlierox/default.nix index 66c9420591d5..7bda06b8457a 100644 --- a/pkgs/games/openlierox/default.nix +++ b/pkgs/games/openlierox/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, libX11, xorgproto, gd, SDL, SDL_image, SDL_mixer, zlib -, libxml2, pkgconfig, curl, cmake, libzip }: +, libxml2, pkg-config, curl, cmake, libzip }: stdenv.mkDerivation { name = "openlierox-0.58rc3"; @@ -28,8 +28,9 @@ stdenv.mkDerivation { cp -R ../share/gamedir/* $out/share/OpenLieroX ''; + nativeBuildInputs = [ cmake pkg-config curl ]; buildInputs = [ libX11 xorgproto gd SDL SDL_image SDL_mixer zlib libxml2 - pkgconfig curl cmake libzip ]; + libzip ]; meta = { homepage = "http://openlierox.net"; diff --git a/pkgs/games/openmw/default.nix b/pkgs/games/openmw/default.nix index 22f3ea8d6ad3..23572998d034 100644 --- a/pkgs/games/openmw/default.nix +++ b/pkgs/games/openmw/default.nix @@ -1,5 +1,5 @@ -{ stdenv, mkDerivationWith, fetchFromGitHub, qtbase, openscenegraph, mygui, bullet, ffmpeg_3 -, boost, cmake, SDL2, unshield, openal, libXt, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, qtbase, openscenegraph, mygui, bullet, ffmpeg_3 +, boost, cmake, SDL2, unshield, openal, libXt, pkg-config }: let openscenegraph_ = openscenegraph.overrideDerivation (self: { @@ -10,7 +10,9 @@ let sha256 = "0d74hijzmj82nx3jkv5qmr3pkgvplra0b8fbjx1y3vmzxamb0axd"; }; }); -in mkDerivationWith stdenv.mkDerivation rec { +in + +stdenv.mkDerivation rec { version = "0.46.0"; pname = "openmw"; @@ -21,19 +23,17 @@ in mkDerivationWith stdenv.mkDerivation rec { sha256 = "0rm32zsmxvr6b0jjihfj543skhicbw5kg6shjx312clhlm035w2x"; }; - enableParallelBuilding = true; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake boost ffmpeg_3 bullet mygui openscenegraph_ SDL2 unshield openal libXt qtbase ]; + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ boost ffmpeg_3 bullet mygui openscenegraph_ SDL2 unshield openal libXt qtbase ]; cmakeFlags = [ "-DDESIRED_QT_VERSION:INT=5" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "An unofficial open source engine reimplementation of the game Morrowind"; homepage = "http://openmw.org"; - license = licenses.gpl3; + license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; }; diff --git a/pkgs/games/openmw/tes3mp.nix b/pkgs/games/openmw/tes3mp.nix index df332c0e5bf3..47b383a82bd9 100644 --- a/pkgs/games/openmw/tes3mp.nix +++ b/pkgs/games/openmw/tes3mp.nix @@ -1,4 +1,4 @@ -{ stdenv, cmake, openmw, fetchFromGitHub, luajit, makeWrapper, mygui }: +{ lib, stdenv, cmake, openmw, fetchFromGitHub, luajit, makeWrapper, mygui }: # revisions are taken from https://github.com/GrimKriegor/TES3MP-deploy @@ -84,7 +84,7 @@ in openmw.overrideAttrs (oldAttrs: rec { --run "cd $out/bin" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Multiplayer for TES3:Morrowind based on OpenMW"; homepage = "https://tes3mp.com/"; license = licenses.gpl3; diff --git a/pkgs/games/openrct2/default.nix b/pkgs/games/openrct2/default.nix index 4f3993973e26..96d79a8744e8 100644 --- a/pkgs/games/openrct2/default.nix +++ b/pkgs/games/openrct2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , SDL2, cmake, curl, duktape, fontconfig, freetype, icu, jansson, libGLU , libiconv, libpng, libpthreadstubs, libzip, nlohmann_json, openssl, pkgconfig , speexdsp, zlib @@ -68,11 +68,9 @@ stdenv.mkDerivation { "-DDOWNLOAD_TITLE_SEQUENCES=OFF" ]; - enableParallelBuilding = true; - preFixup = "ln -s $out/share/openrct2 $out/bin/data"; - meta = with stdenv.lib; { + meta = with lib; { description = "An open source re-implementation of RollerCoaster Tycoon 2 (original game required)"; homepage = "https://openrct2.io/"; license = licenses.gpl3; diff --git a/pkgs/games/openrw/default.nix b/pkgs/games/openrw/default.nix index b53850a87438..7258ed6550c5 100644 --- a/pkgs/games/openrw/default.nix +++ b/pkgs/games/openrw/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, cmake, sfml, libGLU, libGL, bullet, glm, libmad, xlibsWrapper, openal +{ lib, stdenv, fetchgit, cmake, sfml, libGLU, libGL, bullet, glm, libmad, xlibsWrapper, openal , SDL2, boost, ffmpeg_3, Cocoa, OpenAL }: stdenv.mkDerivation { @@ -18,7 +18,7 @@ stdenv.mkDerivation { sfml libGLU libGL bullet glm libmad xlibsWrapper openal SDL2 boost ffmpeg_3 ] ++ stdenv.lib.optionals stdenv.isDarwin [ OpenAL Cocoa ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Unofficial open source recreation of the classic Grand Theft Auto III game executable"; homepage = "https://github.com/rwengine/openrw"; license = licenses.gpl3; diff --git a/pkgs/games/openspades/default.nix b/pkgs/games/openspades/default.nix index b00524461a49..fdd429e376fe 100644 --- a/pkgs/games/openspades/default.nix +++ b/pkgs/games/openspades/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub, fetchpatch, cmake, unzip, zip, file +{ lib, stdenv, fetchurl, fetchFromGitHub, fetchpatch, cmake, unzip, zip, file , curl, glew , libGL, SDL2, SDL2_image, zlib, freetype, imagemagick , openal , opusfile, libogg , Cocoa @@ -55,11 +55,9 @@ stdenv.mkDerivation rec { cp $notoFont $out/share/games/openspades/Resources/ ''; - enableParallelBuilding = true; - NIX_CFLAGS_LINK = "-lopenal"; - meta = with stdenv.lib; { + meta = with lib; { description = "A compatible client of Ace of Spades 0.75"; homepage = "https://github.com/yvt/openspades/"; license = licenses.gpl3; diff --git a/pkgs/games/openttd/default.nix b/pkgs/games/openttd/default.nix index bab4e510e7da..8c0755127cbe 100644 --- a/pkgs/games/openttd/default.nix +++ b/pkgs/games/openttd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchzip, pkgconfig, which, SDL2, libpng, zlib, xz, freetype, fontconfig, libxdg_basedir +{ lib, stdenv, fetchurl, fetchzip, pkgconfig, which, SDL2, libpng, zlib, xz, freetype, fontconfig, libxdg_basedir , withOpenGFX ? true, withOpenSFX ? true, withOpenMSX ? true , withFluidSynth ? true, audioDriver ? "alsa", fluidsynth, soundfont-fluid, procps , writeScriptBin, makeWrapper, runtimeShell @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { ''} ''; - meta = with stdenv.lib; { + meta = with lib; { description = ''Open source clone of the Microprose game "Transport Tycoon Deluxe"''; longDescription = '' OpenTTD is a transportation economics simulator. In single player mode, diff --git a/pkgs/games/openxray/default.nix b/pkgs/games/openxray/default.nix index 33a0ae105973..8fe47d31ca73 100644 --- a/pkgs/games/openxray/default.nix +++ b/pkgs/games/openxray/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, glew, freeimage, liblockfile +{ lib, stdenv, fetchFromGitHub, cmake, glew, freeimage, liblockfile , openal, libtheora, SDL2, lzo, libjpeg, libogg, tbb , pcre, makeWrapper, fetchpatch }: @@ -27,7 +27,7 @@ let doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Crypto++, a free C++ class library of cryptographic schemes"; homepage = "https://cryptopp.com/"; license = with licenses; [ boost publicDomain ]; @@ -65,7 +65,7 @@ in stdenv.mkDerivation rec { --prefix LD_LIBRARY_PATH : $out/lib ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Improved version of the X-Ray Engine, the game engine used in the world-famous S.T.A.L.K.E.R. game series by GSC Game World"; homepage = src.meta.homepage; license = licenses.unfree // { diff --git a/pkgs/games/orthorobot/default.nix b/pkgs/games/orthorobot/default.nix index a2a66f6838bc..e1067645b620 100644 --- a/pkgs/games/orthorobot/default.nix +++ b/pkgs/games/orthorobot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub, zip, love, lua, makeWrapper, makeDesktopItem }: +{ lib, stdenv, fetchurl, fetchFromGitHub, zip, love, lua, makeWrapper, makeDesktopItem }: let pname = "orthorobot"; @@ -46,7 +46,7 @@ stdenv.mkDerivation { chmod +x $out/bin/${pname} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Recharge the robot"; maintainers = with maintainers; [ leenaars ]; platforms = platforms.linux; diff --git a/pkgs/games/pacvim/default.nix b/pkgs/games/pacvim/default.nix index 6e28753b4f31..dc2c216b1bf1 100644 --- a/pkgs/games/pacvim/default.nix +++ b/pkgs/games/pacvim/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ncurses }: +{ lib, stdenv, fetchFromGitHub, ncurses }: stdenv.mkDerivation { pname = "pacvim"; @@ -13,7 +13,7 @@ stdenv.mkDerivation { buildInputs = [ ncurses ]; makeFlags = [ "PREFIX=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/jmoon018/PacVim"; description = "A game that teaches you vim commands"; maintainers = with maintainers; [ infinisil ]; diff --git a/pkgs/games/performous/default.nix b/pkgs/games/performous/default.nix index 96b07e9787e8..d5128aaec077 100644 --- a/pkgs/games/performous/default.nix +++ b/pkgs/games/performous/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, gettext +{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, gettext , glibmm, libxmlxx, pango, librsvg , SDL2, glew, boost, libav, portaudio, epoxy }: @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "performous"; version = "1.1"; - meta = with stdenv.lib; { + meta = with lib; { description = "Karaoke, band and dancing game"; homepage = "http://performous.org/"; license = licenses.gpl2Plus; diff --git a/pkgs/games/pioneer/default.nix b/pkgs/games/pioneer/default.nix index 3f3a2dd363d4..d801e7c82ec4 100644 --- a/pkgs/games/pioneer/default.nix +++ b/pkgs/games/pioneer/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, stdenv, cmake, pkgconfig, curl, libsigcxx, SDL2 +{ fetchFromGitHub, lib, stdenv, cmake, pkgconfig, curl, libsigcxx, SDL2 , SDL2_image, freetype, libvorbis, libpng, assimp, libGLU, libGL , glew }: @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { export PIONEER_DATA_DIR="$out/share/pioneer/data"; ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A space adventure game set in the Milky Way galaxy at the turn of the 31st century"; homepage = "https://pioneerspacesim.net"; license = with licenses; [ diff --git a/pkgs/games/pioneers/default.nix b/pkgs/games/pioneers/default.nix index 882303ab0232..9e292da8c98b 100644 --- a/pkgs/games/pioneers/default.nix +++ b/pkgs/games/pioneers/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , pkg-config , intltool @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 libxml2 ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Addicting game based on The Settlers of Catan"; homepage = "http://pio.sourceforge.net/"; # https does not work license = licenses.gpl2Plus; diff --git a/pkgs/games/planetaryannihilation/default.nix b/pkgs/games/planetaryannihilation/default.nix index a42eb672e62e..768e0a1d724b 100644 --- a/pkgs/games/planetaryannihilation/default.nix +++ b/pkgs/games/planetaryannihilation/default.nix @@ -1,4 +1,4 @@ -{ stdenv, config, fetchurl, patchelf, makeWrapper, gtk2, glib, udev, alsaLib, atk +{ lib, stdenv, config, fetchurl, patchelf, makeWrapper, gtk2, glib, udev, alsaLib, atk , nspr, fontconfig, cairo, pango, nss, freetype, gnome2, gdk-pixbuf, curl, systemd, xorg }: # TODO: use dynamic attributes once Nix 1.7 is out @@ -43,7 +43,7 @@ stdenv.mkDerivation { done ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.uberent.com/pa/"; description = "Next-generation RTS that takes the genre to a planetary scale"; license = stdenv.lib.licenses.unfree; diff --git a/pkgs/games/privateer/default.nix b/pkgs/games/privateer/default.nix index 16d0036b6583..f3ea6dc8cb19 100644 --- a/pkgs/games/privateer/default.nix +++ b/pkgs/games/privateer/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchsvn, boost, cmake, ffmpeg_3, freeglut, glib, +{ lib, stdenv, fetchsvn, boost, cmake, ffmpeg_3, freeglut, glib, gtk2, libjpeg, libpng, libpthreadstubs, libvorbis, libXau, libXdmcp, - libXmu, libGLU, libGL, openal, pixman, pkgconfig, python27, SDL }: + libXmu, libGLU, libGL, openal, pixman, pkg-config, python27, SDL }: stdenv.mkDerivation { name = "privateer-1.03"; @@ -12,10 +12,11 @@ stdenv.mkDerivation { sha256 = "e1759087d4565d3fc95e5c87d0f6ddf36b2cd5befec5695ec56ed5f3cd144c63"; }; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = - [ boost cmake ffmpeg_3 freeglut glib gtk2 libjpeg libpng + [ boost ffmpeg_3 freeglut glib gtk2 libjpeg libpng libpthreadstubs libvorbis libXau libXdmcp libXmu libGLU libGL openal - pixman pkgconfig python27 SDL ]; + pixman python27 SDL ]; patches = [ ./0001-fix-VSFile-constructor.patch ]; @@ -29,7 +30,7 @@ stdenv.mkDerivation { cp vegaserver $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://privateer.sourceforge.net/"; description = "Adventure space flight simulation computer game"; license = licenses.gpl2Plus; # and a special license for art data diff --git a/pkgs/games/pro-office-calculator/default.nix b/pkgs/games/pro-office-calculator/default.nix index 35571ff149ac..dbe2db363ea1 100644 --- a/pkgs/games/pro-office-calculator/default.nix +++ b/pkgs/games/pro-office-calculator/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, stdenv, fetchFromGitHub, tinyxml-2, cmake, qtbase, qtmultimedia }: +{ mkDerivation, lib, stdenv, fetchFromGitHub, tinyxml-2, cmake, qtbase, qtmultimedia }: mkDerivation rec { version = "1.0.13"; pname = "pro-office-calculator"; @@ -14,7 +14,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A completely normal office calculator"; homepage = "https://proofficecalculator.com/"; maintainers = [ maintainers.pmiddend ]; diff --git a/pkgs/games/pysolfc/default.nix b/pkgs/games/pysolfc/default.nix index 31dbe7f6bbcc..c765a1cbdf5b 100644 --- a/pkgs/games/pysolfc/default.nix +++ b/pkgs/games/pysolfc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, buildPythonApplication, python3Packages +{ lib, stdenv, fetchzip, buildPythonApplication, python3Packages , desktop-file-utils, freecell-solver }: buildPythonApplication rec { @@ -39,7 +39,7 @@ buildPythonApplication rec { # No tests in archive doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "A collection of more than 1000 solitaire card games"; homepage = "https://pysolfc.sourceforge.io"; license = licenses.gpl3; diff --git a/pkgs/games/qqwing/default.nix b/pkgs/games/qqwing/default.nix index 43fa45ca4325..3fadd73ce18e 100644 --- a/pkgs/games/qqwing/default.nix +++ b/pkgs/games/qqwing/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, perl, autoconf, automake, libtool }: +{ lib, stdenv, fetchFromGitHub, perl, autoconf, automake, libtool }: stdenv.mkDerivation rec { pname = "qqwing"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { makeFlags = [ "prefix=$(out)" "tgz" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://qqwing.com"; description = "Sudoku generating and solving software"; license = licenses.gpl2; diff --git a/pkgs/games/quake2/yquake2/default.nix b/pkgs/games/quake2/yquake2/default.nix index 3af692d5bf96..57405d9abd38 100644 --- a/pkgs/games/quake2/yquake2/default.nix +++ b/pkgs/games/quake2/yquake2/default.nix @@ -24,8 +24,6 @@ let sha256 = "1dszbvxlh1npq4nv9s4wv4lcyfgb01k92ncxrrczsxy1dddg86pp"; }; - enableParallelBuilding = true; - nativeBuildInputs = [ cmake ]; buildInputs = [ SDL2 libGL curl ] @@ -57,7 +55,7 @@ let cp $src/stuff/yq2.cfg $out/share/games/quake2 ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Yamagi Quake II client"; homepage = "https://www.yamagi.org/quake2/"; license = licenses.gpl2; diff --git a/pkgs/games/quake2/yquake2/games.nix b/pkgs/games/quake2/yquake2/games.nix index 98354a46d4a1..02b130489115 100644 --- a/pkgs/games/quake2/yquake2/games.nix +++ b/pkgs/games/quake2/yquake2/games.nix @@ -37,8 +37,6 @@ let rev = "${lib.toUpper id}_${builtins.replaceStrings ["."] ["_"] version}"; }; - enableParallelBuilding = true; - nativeBuildInputs = [ cmake ]; installPhase = '' @@ -46,7 +44,7 @@ let cp Release/* $out/lib/yquake2/${id} ''; - meta = with stdenv.lib; { + meta = with lib; { inherit (data) description; homepage = "https://www.yamagi.org/quake2/"; license = licenses.unfree; diff --git a/pkgs/games/quake3/content/demo.nix b/pkgs/games/quake3/content/demo.nix index 0d8a64f14cdc..36d0396ec796 100644 --- a/pkgs/games/quake3/content/demo.nix +++ b/pkgs/games/quake3/content/demo.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: let version = "1.11-6"; @@ -20,7 +20,7 @@ in stdenv.mkDerivation { preferLocalBuild = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Quake 3 Arena demo content"; license = licenses.unfreeRedistributable; platforms = platforms.all; diff --git a/pkgs/games/quake3/content/pointrelease.nix b/pkgs/games/quake3/content/pointrelease.nix index e34064d93b05..d9c9a55ddce9 100644 --- a/pkgs/games/quake3/content/pointrelease.nix +++ b/pkgs/games/quake3/content/pointrelease.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: let version = "1.32b-3"; @@ -20,7 +20,7 @@ in stdenv.mkDerivation { preferLocalBuild = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Quake 3 Arena point release"; license = licenses.unfreeRedistributable; platforms = platforms.all; diff --git a/pkgs/games/quake3/ioquake/default.nix b/pkgs/games/quake3/ioquake/default.nix index 285fb7e68840..e006507a6335 100644 --- a/pkgs/games/quake3/ioquake/default.nix +++ b/pkgs/games/quake3/ioquake/default.nix @@ -1,19 +1,19 @@ -{ stdenv, fetchFromGitHub, which, pkgconfig, SDL2, libGL, openalSoft +{ lib, stdenv, fetchFromGitHub, which, pkg-config, SDL2, libGL, openalSoft , curl, speex, opusfile, libogg, libvorbis, libopus, libjpeg, mumble, freetype }: stdenv.mkDerivation { pname = "ioquake3-git"; - version = "2019-05-29"; + version = "2020-12-26"; src = fetchFromGitHub { owner = "ioquake"; repo = "ioq3"; - rev = "350b8f9c7c88c002dccea4f0350f1919b86d3b4e"; - sha256 = "17qkqi22f2fyh6bnfcf1zz2lycgv08d6aw52sf0hqw7r3qq86d08"; + rev = "05180e32dcfb9a4552e1b9652b56127248a9950c"; + sha256 = "0hcxxa1ambpdwhg7nb5hvb32g49rl5p9dcflpzcv5cax9drn166i"; }; - nativeBuildInputs = [ which pkgconfig ]; + nativeBuildInputs = [ which pkg-config ]; buildInputs = [ SDL2 libGL openalSoft curl speex opusfile libogg libvorbis libopus libjpeg freetype mumble @@ -31,10 +31,10 @@ stdenv.mkDerivation { mkdir -p $out/baseq3 ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://ioquake3.org/"; description = "First person shooter engine based on the Quake 3: Arena and Quake 3: Team Arena"; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = platforms.linux; maintainers = with maintainers; [ rvolosatovs eelco abbradar ]; }; diff --git a/pkgs/games/quake3/quake3e/default.nix b/pkgs/games/quake3/quake3e/default.nix index 0e3e74ae7a73..691406160d1d 100644 --- a/pkgs/games/quake3/quake3e/default.nix +++ b/pkgs/games/quake3/quake3e/default.nix @@ -1,4 +1,4 @@ -{ stdenv, curl, libGL, libX11, libXxf86dga, alsaLib, libXrandr, libXxf86vm, libXext, fetchFromGitHub }: +{ lib, stdenv, curl, libGL, libX11, libXxf86dga, alsaLib, libXrandr, libXxf86vm, libXext, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "Quake3e"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { cp build/*/*x64 $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/ec-/Quake3e"; description = "Improved Quake III Arena engine"; license = licenses.gpl2; diff --git a/pkgs/games/quakespasm/vulkan.nix b/pkgs/games/quakespasm/vulkan.nix index 73639fd7553c..fbca6e0eb540 100644 --- a/pkgs/games/quakespasm/vulkan.nix +++ b/pkgs/games/quakespasm/vulkan.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, makeWrapper, SDL2, gzip, libvorbis, libmad, vulkan-headers, vulkan-loader }: +{ lib, stdenv, fetchFromGitHub, makeWrapper, SDL2, gzip, libvorbis, libmad, vulkan-headers, vulkan-loader }: stdenv.mkDerivation rec { pname = "vkquake"; @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Vulkan Quake port based on QuakeSpasm"; homepage = src.meta.homepage; longDescription = '' diff --git a/pkgs/games/r2mod_cli/default.nix b/pkgs/games/r2mod_cli/default.nix index d49dda36e570..edf53482ac3f 100644 --- a/pkgs/games/r2mod_cli/default.nix +++ b/pkgs/games/r2mod_cli/default.nix @@ -2,7 +2,7 @@ , jq , makeWrapper , p7zip -, stdenv +, lib, stdenv }: stdenv.mkDerivation rec { @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/r2mod --prefix PATH : "${stdenv.lib.makeBinPath [ jq p7zip ]}"; ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A Risk of Rain 2 Mod Manager in Bash"; homepage = "https://github.com/foldex/r2mod_cli"; license = licenses.gpl3Only; diff --git a/pkgs/games/redeclipse/default.nix b/pkgs/games/redeclipse/default.nix index d99d7ccb1d90..4b24de28c451 100644 --- a/pkgs/games/redeclipse/default.nix +++ b/pkgs/games/redeclipse/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchurl, fetchpatch +{ lib, stdenv, fetchFromGitHub, fetchurl, fetchpatch , curl, ed, pkgconfig, freetype, zlib, libX11 , SDL2, SDL2_image, SDL2_mixer }: @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { cp -R -t $out/share/redeclipse/data/ data/* ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A first person arena shooter, featuring parkour, impulse boosts, and more"; longDescription = '' Red Eclipse is a fun-filled new take on the first person arena shooter, diff --git a/pkgs/games/rigsofrods/default.nix b/pkgs/games/rigsofrods/default.nix index 9aa51bf344ee..f1e1c50a5966 100644 --- a/pkgs/games/rigsofrods/default.nix +++ b/pkgs/games/rigsofrods/default.nix @@ -1,5 +1,5 @@ { fetchFromGitHub, stdenv, wxGTK30, freeimage, cmake, zziplib, libGLU, libGL, boost, - pkgconfig, libuuid, openal, ogre, ois, curl, gtk2, mygui, unzip, + pkg-config, libuuid, openal, ogre, ois, curl, gtk2, mygui, unzip, angelscript, ogrepaged, mysocketw, libxcb }: @@ -14,8 +14,6 @@ stdenv.mkDerivation rec { sha256 = "0cb1il7qm45kfhh6h6jwfpxvjlh2dmg8z1yz9kj4d6098myf2lg4"; }; - enableParallelBuilding = true; - installPhase = '' sed -e "s@/usr/local/lib/OGRE@${ogre}/lib/OGRE@" -i ../tools/linux/binaries/plugins.cfg mkdir -p $out/share/rigsofrods @@ -25,17 +23,17 @@ stdenv.mkDerivation rec { ln -s $out/share/rigsofrods/{RoR,RoRConfig} $out/bin ''; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ wxGTK30 freeimage cmake zziplib libGLU libGL boost + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ wxGTK30 freeimage zziplib libGLU libGL boost libuuid openal ogre ois curl gtk2 mygui unzip angelscript ogrepaged mysocketw libxcb ]; - meta = { + meta = with stdenv.lib; { description = "3D simulator game where you can drive, fly and sail various vehicles"; homepage = "http://rigsofrods.sourceforge.net/"; - license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [raskin]; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl3; + maintainers = with maintainers; [ raskin ]; + platforms = platforms.linux; hydraPlatforms = []; }; } diff --git a/pkgs/games/riko4/default.nix b/pkgs/games/riko4/default.nix index 5ea9b8f54162..7014bf9ca21b 100644 --- a/pkgs/games/riko4/default.nix +++ b/pkgs/games/riko4/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, SDL2, libGLU, luajit, curl, curlpp }: +{ lib, stdenv, fetchFromGitHub, cmake, SDL2, libGLU, luajit, curl, curlpp }: let # Newer versions of sdl-gpu don't work with Riko4 (corrupted graphics), @@ -15,9 +15,8 @@ let }; buildInputs = [ SDL2 libGLU ]; nativeBuildInputs = [ cmake ]; - enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/grimfang4/sdl-gpu"; description = "A library for high-performance, modern 2D graphics with SDL written in C"; license = licenses.mit; @@ -57,9 +56,7 @@ stdenv.mkDerivation rec { chmod +x $out/bin/riko4 ''; - enableParallelBuilding = true; - - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/incinirate/Riko4"; description = "Fantasy console for pixel art game development"; license = licenses.mit; diff --git a/pkgs/games/rimshot/default.nix b/pkgs/games/rimshot/default.nix index 2e5087319f0c..381d00bf992c 100644 --- a/pkgs/games/rimshot/default.nix +++ b/pkgs/games/rimshot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, love, lua, makeWrapper, makeDesktopItem }: +{ lib, stdenv, fetchurl, unzip, love, lua, makeWrapper, makeDesktopItem }: let pname = "rimshot"; @@ -51,7 +51,7 @@ stdenv.mkDerivation { ln -s ${desktopItem}/share/applications/* $out/share/applications/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Create your own music"; maintainers = with maintainers; [ leenaars ]; platforms = platforms.linux; diff --git a/pkgs/games/rocksndiamonds/default.nix b/pkgs/games/rocksndiamonds/default.nix index ebced6467d2a..c31bf78a3552 100644 --- a/pkgs/games/rocksndiamonds/default.nix +++ b/pkgs/games/rocksndiamonds/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeDesktopItem, SDL2, SDL2_image, SDL2_mixer, SDL2_net }: +{ lib, stdenv, fetchurl, makeDesktopItem, SDL2, SDL2_image, SDL2_mixer, SDL2_net }: stdenv.mkDerivation rec { name = "${project}-${version}"; @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Scrolling tile-based arcade style puzzle game"; homepage = "https://www.artsoft.org/rocksndiamonds/"; license = licenses.gpl2; diff --git a/pkgs/games/rogue/default.nix b/pkgs/games/rogue/default.nix index 592f897f20f1..1e215c813b53 100644 --- a/pkgs/games/rogue/default.nix +++ b/pkgs/games/rogue/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ncurses}: +{lib, stdenv, fetchurl, ncurses}: stdenv.mkDerivation { name = "rogue-5.4.4"; @@ -17,7 +17,7 @@ stdenv.mkDerivation { # Fix build for recent ncurses versions NIX_CFLAGS_COMPILE = "-DNCURSES_INTERNALS=1"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://rogue.rogueforge.net/rogue-5-4/"; description = "The final version of the original Rogue game developed for the UNIX operating system"; platforms = platforms.all; diff --git a/pkgs/games/rrootage/default.nix b/pkgs/games/rrootage/default.nix index 459ff238b4a4..6cd5919c4e8f 100644 --- a/pkgs/games/rrootage/default.nix +++ b/pkgs/games/rrootage/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchpatch, fetchurl, SDL, SDL_mixer, bulletml }: +{ lib, stdenv, fetchpatch, fetchurl, SDL, SDL_mixer, bulletml }: let version = "0.23a"; @@ -72,7 +72,7 @@ in stdenv.mkDerivation { install -m 644 readme_linux "$out"/share/doc/rrootage/README ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Abstract shooter created by Kenta Cho"; homepage = "http://rrootage.sourceforge.net/"; license = licenses.bsd2; diff --git a/pkgs/games/sauerbraten/default.nix b/pkgs/games/sauerbraten/default.nix index e1f482cc7d40..2d5f3d9a3c71 100644 --- a/pkgs/games/sauerbraten/default.nix +++ b/pkgs/games/sauerbraten/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchzip, SDL2, SDL2_image, SDL2_mixer +{ lib, stdenv, fetchzip, SDL2, SDL2_image, SDL2_mixer , zlib, makeWrapper }: stdenv.mkDerivation rec { pname = "sauerbraten"; - version = "2020-12-04"; + version = "2020-12-27"; src = fetchzip { url = "mirror://sourceforge/sauerbraten/sauerbraten_${builtins.replaceStrings [ "-" ] [ "_" ] version}_linux.tar.bz2"; - sha256 = "1hknwpnvsakz6s7l7j1r5aqmgrzp4wcbn8yg8nxmvsddbhxdj1kc"; + sha256 = "0llknzj23vx6f3y452by9c7wlhzclyq4bqi22qd52m3l916z2mn5"; }; nativeBuildInputs = [ @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { --add-flags "-q\''${HOME}" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A free multiplayer & singleplayer first person shooter, the successor of the Cube FPS"; maintainers = with maintainers; [ raskin ajs124 ]; hydraPlatforms = diff --git a/pkgs/games/scid-vs-pc/default.nix b/pkgs/games/scid-vs-pc/default.nix index 1ff0a0dc728b..bb33faf7374b 100644 --- a/pkgs/games/scid-vs-pc/default.nix +++ b/pkgs/games/scid-vs-pc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, tcl, tk, libX11, zlib, makeWrapper, makeDesktopItem }: +{ lib, stdenv, fetchurl, tcl, tk, libX11, zlib, makeWrapper, makeDesktopItem }: stdenv.mkDerivation rec { pname = "scid-vs-pc"; @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { categories = "Game;BoardGame;"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Chess database with play and training functionality"; homepage = "http://scidvspc.sourceforge.net/"; license = stdenv.lib.licenses.gpl2; diff --git a/pkgs/games/scorched3d/default.nix b/pkgs/games/scorched3d/default.nix index b7f448e119a5..47c17ce60d7a 100644 --- a/pkgs/games/scorched3d/default.nix +++ b/pkgs/games/scorched3d/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libGLU, libGL, glew, pkgconfig, openalSoft, freealut, wxGTK, libogg +{ lib, stdenv, fetchurl, libGLU, libGL, glew, pkgconfig, openalSoft, freealut, wxGTK, libogg , freetype, libvorbis, fftwSinglePrec, SDL, SDL_net, expat, libjpeg, libpng }: stdenv.mkDerivation rec { @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = "-lopenal"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://scorched3d.co.uk/"; description = "3D Clone of the classic Scorched Earth"; license = licenses.gpl2Plus; diff --git a/pkgs/games/scummvm/default.nix b/pkgs/games/scummvm/default.nix index 02df60c829f2..20d781db23d9 100644 --- a/pkgs/games/scummvm/default.nix +++ b/pkgs/games/scummvm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, nasm +{ lib, stdenv, fetchurl, nasm , alsaLib, curl, flac, fluidsynth, freetype, libjpeg, libmad, libmpeg2, libogg, libvorbis, libGLU, libGL, SDL2, zlib }: @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { sed -i "s/-c -s/-c -s --strip-program=''${STRIP@Q}/" ports.mk ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Program to run certain classic graphical point-and-click adventure games (such as Monkey Island)"; homepage = "https://www.scummvm.org/"; license = licenses.gpl2; diff --git a/pkgs/games/scummvm/games.nix b/pkgs/games/scummvm/games.nix index 0165a797c3a6..2ffd176ccf6e 100644 --- a/pkgs/games/scummvm/games.nix +++ b/pkgs/games/scummvm/games.nix @@ -51,7 +51,7 @@ let runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.scummvm.org"; license = licenses.free; # refer to the readme for exact wording maintainers = with maintainers; [ peterhoeg ]; diff --git a/pkgs/games/sfrotz/default.nix b/pkgs/games/sfrotz/default.nix index 6e4839703a1c..e6b959371995 100644 --- a/pkgs/games/sfrotz/default.nix +++ b/pkgs/games/sfrotz/default.nix @@ -10,7 +10,7 @@ , pkg-config , SDL2 , SDL2_mixer -, stdenv +, lib, stdenv , zlib }: stdenv.mkDerivation rec { @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { buildPhase = "make sdl"; installTargets = [ "install_sfrotz" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Interpreter for Infocom and other Z-Machine games (SDL interface)"; longDescription = '' diff --git a/pkgs/games/sgt-puzzles/default.nix b/pkgs/games/sgt-puzzles/default.nix index 4cac596282e2..24ea62d9db83 100644 --- a/pkgs/games/sgt-puzzles/default.nix +++ b/pkgs/games/sgt-puzzles/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, desktop-file-utils +{ lib, stdenv, fetchurl, desktop-file-utils , gtk3, libX11 , makeWrapper, pkgconfig, perl, autoreconfHook, wrapGAppsHook }: @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -Wno-error" cp Makefile.gtk Makefile ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Simon Tatham's portable puzzle collection"; license = licenses.mit; maintainers = [ maintainers.raskin ]; diff --git a/pkgs/games/shattered-pixel-dungeon/default.nix b/pkgs/games/shattered-pixel-dungeon/default.nix index f3808102bd1d..f8aa4397ddad 100644 --- a/pkgs/games/shattered-pixel-dungeon/default.nix +++ b/pkgs/games/shattered-pixel-dungeon/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , makeWrapper , fetchFromGitHub , nixosTests @@ -71,7 +71,7 @@ in stdenv.mkDerivation rec { shattered-pixel-dungeon-starts = nixosTests.shattered-pixel-dungeon; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://shatteredpixel.com/"; downloadPage = "https://github.com/00-Evan/shattered-pixel-dungeon/releases"; description = "Traditional roguelike game with pixel-art graphics and simple interface"; diff --git a/pkgs/games/sienna/default.nix b/pkgs/games/sienna/default.nix index bedd446e34cc..0a38723368e8 100644 --- a/pkgs/games/sienna/default.nix +++ b/pkgs/games/sienna/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, love, lua, makeWrapper, makeDesktopItem }: +{ lib, stdenv, fetchurl, love, lua, makeWrapper, makeDesktopItem }: let pname = "sienna"; @@ -48,7 +48,7 @@ stdenv.mkDerivation { ln -s ${desktopItem}/share/applications/* $out/share/applications/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Fast-paced one button platformer"; maintainers = with maintainers; [ leenaars ]; platforms = platforms.linux; diff --git a/pkgs/games/simutrans/default.nix b/pkgs/games/simutrans/default.nix index b75b67e0528e..b45a182cc014 100644 --- a/pkgs/games/simutrans/default.nix +++ b/pkgs/games/simutrans/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, unzip, zlib, libpng, bzip2, SDL, SDL_mixer +{ lib, stdenv, fetchurl, pkgconfig, unzip, zlib, libpng, bzip2, SDL, SDL_mixer , buildEnv, config, runtimeShell }: @@ -52,7 +52,7 @@ let "pak128.german" = { url = "mirror://sourceforge/simutrans/PAK128.german/" + "pak128.german_1.2_for_ST_121.0/PAK128.german_1.2_for_ST_121-0.zip"; - sha256 = "1jxjckz4b02yv1mv1zc3pmajpq740dfnlvhr0x762lbrybymvagi"; + sha256 = "1cv1rzl1a3i5dvk476zq094wawk9hhdh2f0y4xrdny5gn17mb2xi"; }; /* This release contains accented filenames that prevent unzipping. @@ -152,7 +152,7 @@ let mv build/default/sim $out/bin/simutrans ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A simulation game in which the player strives to run a successful transport system"; longDescription = '' Simutrans is a cross-platform simulation game in which the diff --git a/pkgs/games/sm64ex/default.nix b/pkgs/games/sm64ex/default.nix index e5aeb84fbf11..1e678a49f05c 100644 --- a/pkgs/games/sm64ex/default.nix +++ b/pkgs/games/sm64ex/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , python3 , pkg-config @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { cp build/${region}_pc/sm64.${region}.f3dex2e $out/bin/sm64ex ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/sm64pc/sm64ex"; description = "Super Mario 64 port based off of decompilation"; longDescription = '' diff --git a/pkgs/games/snake4/default.nix b/pkgs/games/snake4/default.nix index 4c4161d5049a..e5419cef249e 100644 --- a/pkgs/games/snake4/default.nix +++ b/pkgs/games/snake4/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, shhmsg, shhopt, xorg }: +{ lib, stdenv, fetchurl, shhmsg, shhopt, xorg }: stdenv.mkDerivation rec { name = "snake4-1.0.14"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { "INSTBINDIR=$(out)/bin" "INSTMANDIR=$(out)/man" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A game starring a fruit-eating snake"; homepage = "https://shh.thathost.com/pub-unix/html/snake4.html"; license = licenses.artistic1; diff --git a/pkgs/games/snipes/default.nix b/pkgs/games/snipes/default.nix index 37993e32a5d1..66188ba0efe8 100644 --- a/pkgs/games/snipes/default.nix +++ b/pkgs/games/snipes/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchurl, SDL2, SDL2_ttf }: +{ lib, stdenv, fetchFromGitHub, fetchurl, SDL2, SDL2_ttf }: let font = fetchurl { @@ -36,7 +36,7 @@ in stdenv.mkDerivation { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Modern port of the classic 1982 text-mode game Snipes"; homepage = "https://www.vogons.org/viewtopic.php?f=7&t=49073"; license = licenses.free; # This reverse-engineered source code is released with the original authors' permission. diff --git a/pkgs/games/soi/default.nix b/pkgs/games/soi/default.nix index 0e4722cebb1a..c9d35a08dc23 100644 --- a/pkgs/games/soi/default.nix +++ b/pkgs/games/soi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake +{ lib, stdenv, fetchurl, cmake , boost, eigen2, lua, luabind, libGLU, libGL, SDL }: stdenv.mkDerivation rec { @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { "-DEIGEN_INCLUDE_DIR=${eigen2}/include/eigen2" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A physics-based puzzle game"; maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; diff --git a/pkgs/games/solarus/default.nix b/pkgs/games/solarus/default.nix index c204846ae2fc..c42464feaed2 100644 --- a/pkgs/games/solarus/default.nix +++ b/pkgs/games/solarus/default.nix @@ -22,8 +22,6 @@ mkDerivation rec { openal libmodplug libvorbis qtbase glm ]; - enableParallelBuilding = true; - preFixup = '' mkdir $lib/ mv $out/lib $lib diff --git a/pkgs/games/soldat-unstable/default.nix b/pkgs/games/soldat-unstable/default.nix new file mode 100644 index 000000000000..0278afc5e40c --- /dev/null +++ b/pkgs/games/soldat-unstable/default.nix @@ -0,0 +1,123 @@ +{ stdenv, fetchFromGitHub, fetchpatch, fpc, zip, makeWrapper +, SDL2, freetype, physfs, openal, gamenetworkingsockets +, xorg, autoPatchelfHook +}: + +let + base = stdenv.mkDerivation rec { + pname = "soldat-base"; + version = "unstable-2020-11-26"; + + src = fetchFromGitHub { + name = "base"; + owner = "Soldat"; + repo = "base"; + rev = "e5f9c35ec12562595b248a7a921dd3458b36b605"; + sha256 = "0qg0p2adb5v6di44iqczswldhypdqvn1nl96vxkfkxdg9i8x90w3"; + }; + + nativeBuildInputs = [ zip ]; + + buildPhase = '' + sh create_smod.sh + ''; + + installPhase = '' + install -Dm644 soldat.smod -t $out/share/soldat + install -Dm644 client/play-regular.ttf -t $out/share/soldat + ''; + + meta = with stdenv.lib; { + description = "Soldat's base game content"; + license = licenses.cc-by-40; + platforms = platforms.all; + inherit (src.meta) homepage; + }; + }; + +in + +stdenv.mkDerivation rec { + pname = "soldat-unstable"; + version = "2020-11-26"; + + src = fetchFromGitHub { + name = "soldat"; + owner = "Soldat"; + repo = "soldat"; + rev = "2280296ac56883f6a9cad4da48025af8ae7782e7"; + sha256 = "17i3nlhxm4x4zx00i00aivhxmagbnyizxnpwiqzg57bf23hrvdj3"; + }; + + nativeBuildInputs = [ fpc makeWrapper autoPatchelfHook ]; + + buildInputs = [ SDL2 freetype physfs openal gamenetworkingsockets ]; + runtimeDependencies = [ xorg.libX11 ]; + + patches = [ + # fix an argument parsing issue which prevents + # us from passing nix store paths to soldat + (fetchpatch { + url = "https://github.com/sternenseemann/soldat/commit/9f7687430f5fe142c563b877d2206f5c9bbd5ca0.patch"; + sha256 = "0wsrazb36i7v4idg06jlzfhqwf56q9szzz7jp5cg4wsvcky3wajf"; + }) + ]; + + postPatch = '' + for f in client/Makefile server/Makefile; do + # fix unportable uname invocation + substituteInPlace "$f" --replace "uname -p" "uname -m" + done + ''; + + buildPhase = '' + mkdir -p client/build server/build + + # build .so from stb headers + pushd client/libs/stb + make + popd + + # build client + pushd client + make mode=release + popd + + # build server + pushd server + make mode=release + popd + ''; + + installPhase = '' + install -Dm644 client/libs/stb/libstb.so -t $out/lib + install -Dm755 client/build/soldat_* $out/bin/soldat + install -Dm755 server/build/soldatserver_* $out/bin/soldatserver + + # make sure soldat{,server} find their game archive, + # let them write their state and configuration files + # to $XDG_CONFIG_HOME/soldat/soldat{,server} unless + # the user specifies otherwise. + for p in $out/bin/soldatserver $out/bin/soldat; do + configDir="\''${XDG_CONFIG_HOME:-\$HOME/.config}/soldat/$(basename "$p")" + + wrapProgram "$p" \ + --run "mkdir -p \"$configDir\"" \ + --add-flags "-fs_portable 0" \ + --add-flags "-fs_userpath \"$configDir\"" \ + --add-flags "-fs_basepath \"${base}/share/soldat\"" + done + ''; + + meta = with stdenv.lib; { + description = "Soldat is a unique 2D (side-view) multiplayer action game"; + license = [ licenses.mit base.meta.license ]; + inherit (src.meta) homepage; + maintainers = [ maintainers.sternenseemann ]; + platforms = platforms.x86_64 ++ platforms.i686; + # portability currently mainly limited by fpc + # in nixpkgs which doesn't work on darwin, + # aarch64 and arm support should be possible: + # https://github.com/Soldat/soldat/issues/45 + }; +} diff --git a/pkgs/games/space-orbit/default.nix b/pkgs/games/space-orbit/default.nix index e9fe6257fb63..6794a340310a 100644 --- a/pkgs/games/space-orbit/default.nix +++ b/pkgs/games/space-orbit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , libGLU, libGL, libXi, libXt, libXext, libX11, libXmu, freeglut }: @@ -37,7 +37,7 @@ EOF chmod a+x $out/bin/space-orbit ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A space combat simulator"; license = licenses.gpl2; platforms = platforms.all; diff --git a/pkgs/games/spring/default.nix b/pkgs/games/spring/default.nix index b130a7b5f77e..9bc204c08d04 100644 --- a/pkgs/games/spring/default.nix +++ b/pkgs/games/spring/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, cmake, lzma, boost, libdevil, zlib, p7zip +{ lib, stdenv, fetchFromGitHub, cmake, lzma, boost, libdevil, zlib, p7zip , openal, libvorbis, glew, freetype, xorg, SDL2, libGLU, libGL -, asciidoc, libxslt, docbook_xsl, docbook_xsl_ns, curl, makeWrapper +, asciidoc, docbook_xsl, docbook_xsl_ns, curl, makeWrapper , jdk ? null, python ? null, systemd, libunwind, which, minizip , withAI ? true # support for AI Interfaces and Skirmish AIs }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { # taken from https://github.com/spring/spring/commits/maintenance src = fetchFromGitHub { owner = "spring"; - repo = "spring"; + repo = pname; inherit rev; sha256 = "1nx68d894yfmqc6df72hmk75ph26fqdvlmmq58cca0vbwpz9hf5v"; fetchSubmodules = true; @@ -40,14 +40,13 @@ stdenv.mkDerivation rec { "-DCMAKE_INSTALL_RPATH_USE_LINK_PATH:BOOL=ON" "-DPREFER_STATIC_LIBS:BOOL=OFF"]; - buildInputs = [ cmake lzma boost libdevil zlib p7zip openal libvorbis freetype SDL2 - xorg.libX11 xorg.libXcursor libGLU libGL glew asciidoc libxslt docbook_xsl curl makeWrapper - docbook_xsl_ns systemd libunwind which minizip ] + nativeBuildInputs = [ cmake makeWrapper docbook_xsl docbook_xsl_ns asciidoc ]; + buildInputs = [ lzma boost libdevil zlib p7zip openal libvorbis freetype SDL2 + xorg.libX11 xorg.libXcursor libGLU libGL glew curl + systemd libunwind which minizip ] ++ stdenv.lib.optional withAI jdk ++ stdenv.lib.optional withAI python; - enableParallelBuilding = true; - NIX_CFLAGS_COMPILE = "-fpermissive"; # GL header minor incompatibility postInstall = '' @@ -55,11 +54,11 @@ stdenv.mkDerivation rec { --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc systemd ]}" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://springrts.com/"; description = "A powerful real-time strategy (RTS) game engine"; license = licenses.gpl2; - maintainers = [ maintainers.phreedom maintainers.qknight maintainers.domenkozar maintainers.sorki ]; + maintainers = with maintainers; [ phreedom qknight domenkozar sorki ]; platforms = platforms.linux; }; } diff --git a/pkgs/games/spring/springlobby.nix b/pkgs/games/spring/springlobby.nix index 231090419e66..2f8a9d9885b9 100644 --- a/pkgs/games/spring/springlobby.nix +++ b/pkgs/games/spring/springlobby.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, cmake, wxGTK30, openal, pkgconfig, curl, libtorrent-rasterbar +{ lib, stdenv, fetchurl, fetchpatch, cmake, wxGTK30, openal, pkgconfig, curl, libtorrent-rasterbar , libpng, libX11, gettext, boost, libnotify, gtk2, doxygen, spring , makeWrapper, glib, minizip, alure, pcre, jsoncpp }: @@ -26,15 +26,13 @@ stdenv.mkDerivation rec { }) ]; - enableParallelBuilding = true; - postInstall = '' wrapProgram $out/bin/springlobby \ --prefix PATH : "${spring}/bin" \ --set SPRING_BUNDLE_DIR "${spring}/lib" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://springlobby.info/"; repositories.git = "git://github.com/springlobby/springlobby.git"; description = "Cross-platform lobby client for the Spring RTS project"; diff --git a/pkgs/games/stardust/default.nix b/pkgs/games/stardust/default.nix index 1e2089b9c503..2555950506ab 100644 --- a/pkgs/games/stardust/default.nix +++ b/pkgs/games/stardust/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, zlib, libtiff, libxml2, SDL, xorgproto, libX11 +{ lib, stdenv, fetchurl, zlib, libtiff, libxml2, SDL, xorgproto, libX11 , libXi, libXmu, libXext, libGLU, libGL }: stdenv.mkDerivation rec { @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { --replace '#define PACKAGE ""' '#define PACKAGE "stardust"' ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Space flight simulator"; maintainers = [ maintainers.raskin ]; platforms = platforms.linux; diff --git a/pkgs/games/steam/runtime.nix b/pkgs/games/steam/runtime.nix index 69e222ab0d66..70c6abe8db41 100644 --- a/pkgs/games/steam/runtime.nix +++ b/pkgs/games/steam/runtime.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl # for update script , writeShellScript, curl, nix-update @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ''; }; - meta = with stdenv.lib; { + meta = with lib; { description = "The official runtime used by Steam"; homepage = "https://github.com/ValveSoftware/steam-runtime"; license = licenses.unfreeRedistributable; # Includes NVIDIA CG toolkit diff --git a/pkgs/games/steam/steam.nix b/pkgs/games/steam/steam.nix index ed837c9f0bd2..f7ef287c1ffa 100644 --- a/pkgs/games/steam/steam.nix +++ b/pkgs/games/steam/steam.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, runtimeShell, traceDeps ? false, bash }: +{ lib, stdenv, fetchurl, runtimeShell, traceDeps ? false, bash }: let traceLog = "/tmp/steam-trace-dependencies.log"; @@ -38,7 +38,7 @@ in stdenv.mkDerivation { sed -e 's,/usr/bin/steam,steam,g' steam.desktop > $out/share/applications/steam.desktop ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A digital distribution platform"; homepage = "http://store.steampowered.com/"; license = licenses.unfreeRedistributable; diff --git a/pkgs/games/steam/steamcmd.nix b/pkgs/games/steam/steamcmd.nix index 223dff332a70..1c834f1c2ea6 100644 --- a/pkgs/games/steam/steamcmd.nix +++ b/pkgs/games/steam/steamcmd.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, steam-run, bash, coreutils +{ lib, stdenv, fetchurl, steam-run, bash, coreutils , steamRoot ? "~/.local/share/Steam" }: @@ -36,7 +36,7 @@ stdenv.mkDerivation { chmod 0755 $out/bin/steamcmd ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Steam command-line tools"; homepage = "https://developer.valvesoftware.com/wiki/SteamCMD"; platforms = platforms.linux; diff --git a/pkgs/games/stepmania/default.nix b/pkgs/games/stepmania/default.nix index f6cfb873709c..1512359d495f 100644 --- a/pkgs/games/stepmania/default.nix +++ b/pkgs/games/stepmania/default.nix @@ -32,8 +32,6 @@ stdenv.mkDerivation rec { ln -s $out/stepmania-5.1/stepmania $out/bin/stepmania ''; - enableParallelBuilding = true; - meta = with lib; { homepage = "https://www.stepmania.com/"; description = "Free dance and rhythm game for Windows, Mac, and Linux"; diff --git a/pkgs/games/stockfish/default.nix b/pkgs/games/stockfish/default.nix index bdea1db9b3e9..075db08a5ce3 100644 --- a/pkgs/games/stockfish/default.nix +++ b/pkgs/games/stockfish/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: let arch = if stdenv.isx86_64 then "x86-64" else if stdenv.isi686 then "x86-32" else @@ -34,7 +34,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://stockfishchess.org/"; description = "Strong open source chess engine"; longDescription = '' diff --git a/pkgs/games/stuntrally/default.nix b/pkgs/games/stuntrally/default.nix index 98a3ca883178..bf9e034d7b4a 100644 --- a/pkgs/games/stuntrally/default.nix +++ b/pkgs/games/stuntrally/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, cmake, boost, ogre, mygui, ois, SDL2, libvorbis, pkgconfig +{ lib, fetchurl, stdenv, cmake, boost, ogre, mygui, ois, SDL2, libvorbis, pkg-config , makeWrapper, enet, libXcursor, bullet, openal }: stdenv.mkDerivation rec { @@ -26,14 +26,12 @@ stdenv.mkDerivation rec { popd ''; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake boost ogre mygui ois SDL2 libvorbis + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ boost ogre mygui ois SDL2 libvorbis makeWrapper enet libXcursor bullet openal ]; - enableParallelBuilding = true; - - meta = with stdenv.lib; { + meta = with lib; { description = "Stunt Rally game with Track Editor, based on VDrift and OGRE"; homepage = "http://stuntrally.tuxfamily.org/"; license = licenses.gpl3Plus; diff --git a/pkgs/games/super-tux-kart/default.nix b/pkgs/games/super-tux-kart/default.nix index 2c686f5724de..1729e2fc2853 100644 --- a/pkgs/games/super-tux-kart/default.nix +++ b/pkgs/games/super-tux-kart/default.nix @@ -76,8 +76,6 @@ in stdenv.mkDerivation rec { wrapProgram $out/bin/supertuxkart --set-default SUPERTUXKART_ASSETS_DIR "${assets}" ''; - enableParallelBuilding = true; - meta = with lib; { description = "A Free 3D kart racing game"; longDescription = '' diff --git a/pkgs/games/supertux/default.nix b/pkgs/games/supertux/default.nix index 68b49fd55172..01048c825432 100644 --- a/pkgs/games/supertux/default.nix +++ b/pkgs/games/supertux/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, pkgconfig, SDL2, SDL2_image , curl +{ lib, stdenv, fetchurl, cmake, pkgconfig, SDL2, SDL2_image , curl , libogg, libvorbis, libGLU, libGL, openal, boost, glew , libpng, freetype }: @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ln -s $out/games/supertux2 $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Classic 2D jump'n run sidescroller game"; homepage = "http://supertux.github.io/"; license = licenses.gpl2; diff --git a/pkgs/games/t4kcommon/default.nix b/pkgs/games/t4kcommon/default.nix index 997ce72db33c..bc820c8e8e45 100644 --- a/pkgs/games/t4kcommon/default.nix +++ b/pkgs/games/t4kcommon/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchurl, cmake, pkgconfig, SDL, SDL_image, SDL_mixer, SDL_net, SDL_ttf, libpng, librsvg, libxml2 }: +{ lib, stdenv, fetchFromGitHub, fetchurl, cmake, pkgconfig, SDL, SDL_image, SDL_mixer, SDL_net, SDL_ttf, libpng, librsvg, libxml2 }: stdenv.mkDerivation rec { version = "0.1.1"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ SDL SDL_image SDL_mixer SDL_net SDL_ttf libpng librsvg libxml2 ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A library of code shared between tuxmath and tuxtype"; homepage = "https://github.com/tux4kids/t4kcommon"; license = licenses.gpl3Plus; diff --git a/pkgs/games/taisei/default.nix b/pkgs/games/taisei/default.nix index 3c4d0df2b036..e0d1175fce89 100644 --- a/pkgs/games/taisei/default.nix +++ b/pkgs/games/taisei/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl # Build depends , docutils, meson, ninja, pkgconfig, python3 # Runtime depends @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { patchShebangs . ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A free and open-source Touhou Project clone and fangame"; longDescription = '' Taisei is an open clone of the Tōhō Project series. Tōhō is a one-man diff --git a/pkgs/games/tennix/default.nix b/pkgs/games/tennix/default.nix index 56ac0a2faf4e..c8b2a415923f 100644 --- a/pkgs/games/tennix/default.nix +++ b/pkgs/games/tennix/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, SDL, SDL_mixer, SDL_image, SDL_ttf, SDL_net, python } : +{lib, stdenv, fetchurl, SDL, SDL_mixer, SDL_image, SDL_ttf, SDL_net, python } : stdenv.mkDerivation rec { name = "tennix-1.1"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { installFlags="PREFIX=$out install" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://icculus.org/tennix/"; description = "Classic Championship Tour 2011"; license = licenses.gpl2Plus; diff --git a/pkgs/games/the-butterfly-effect/default.nix b/pkgs/games/the-butterfly-effect/default.nix index 99599b92dfa0..c87d1bea1c73 100644 --- a/pkgs/games/the-butterfly-effect/default.nix +++ b/pkgs/games/the-butterfly-effect/default.nix @@ -1,4 +1,4 @@ -{ stdenv, mkDerivation, fetchFromGitHub, qt5, box2d, which, cmake, gettext }: +{ lib, stdenv, mkDerivation, fetchFromGitHub, qt5, box2d, which, cmake, gettext }: mkDerivation rec { pname = "tbe"; @@ -17,7 +17,6 @@ mkDerivation rec { qt5.qtbase qt5.qtsvg qt5.qttranslations box2d which cmake gettext ]; - enableParallelBuilding = true; installPhase = '' make DESTDIR=.. install @@ -26,7 +25,7 @@ mkDerivation rec { cp -r ../usr/share $out/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A physics-based game vaguely similar to Incredible Machine"; homepage = "http://the-butterfly-effect.org/"; maintainers = [ maintainers.raskin ]; diff --git a/pkgs/games/the-powder-toy/default.nix b/pkgs/games/the-powder-toy/default.nix index af392eca8d8f..084a4103bd57 100644 --- a/pkgs/games/the-powder-toy/default.nix +++ b/pkgs/games/the-powder-toy/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub, scons, pkgconfig, SDL2, lua, fftwFloat, +{ lib, stdenv, fetchFromGitHub, scons, pkgconfig, SDL2, lua, fftwFloat, zlib, bzip2, curl, darwin }: stdenv.mkDerivation rec { @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A free 2D physics sandbox game"; homepage = "http://powdertoy.co.uk/"; platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; diff --git a/pkgs/games/tintin/default.nix b/pkgs/games/tintin/default.nix index cd58fcf24fd8..80f9ffa8f4ff 100644 --- a/pkgs/games/tintin/default.nix +++ b/pkgs/games/tintin/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { cd src ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A free MUD client for macOS, Linux and Windows"; homepage = "http://tintin.sourceforge.net"; license = licenses.gpl2; diff --git a/pkgs/games/tome2/default.nix b/pkgs/games/tome2/default.nix index 1fc80b1764d5..d40717c9a385 100644 --- a/pkgs/games/tome2/default.nix +++ b/pkgs/games/tome2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, makeDesktopItem, ncurses, libX11, boost, cmake }: +{ lib, stdenv, fetchFromGitHub, makeDesktopItem, ncurses, libX11, boost, cmake }: let pname = "tome2"; @@ -41,7 +41,7 @@ in stdenv.mkDerivation { cp ${desktopItem}/share/applications/*.desktop $out/share/applications ''; - meta = with stdenv.lib; { + meta = with lib; { inherit description; license = licenses.unfree; maintainers = with maintainers; [ cizra ]; diff --git a/pkgs/games/tome4/default.nix b/pkgs/games/tome4/default.nix index 59dced9ac67d..70a032171582 100644 --- a/pkgs/games/tome4/default.nix +++ b/pkgs/games/tome4/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeDesktopItem, makeWrapper, premake4, unzip +{ lib, stdenv, fetchurl, makeDesktopItem, makeWrapper, premake4, unzip , openal, libpng, libvorbis, libGLU, SDL2, SDL2_image, SDL2_ttf }: let @@ -70,7 +70,7 @@ in stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Tales of Maj'eyal (rogue-like game)"; homepage = "https://te4.org/"; license = licenses.gpl3; diff --git a/pkgs/games/toppler/default.nix b/pkgs/games/toppler/default.nix index cf037a0f4362..08baf2ab6fd2 100644 --- a/pkgs/games/toppler/default.nix +++ b/pkgs/games/toppler/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , SDL , SDL_mixer @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { zlib ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Jump and run game, reimplementation of Tower Toppler/Nebulus"; homepage = "http://toppler.sourceforge.net/"; license = licenses.gpl2; diff --git a/pkgs/games/trackballs/default.nix b/pkgs/games/trackballs/default.nix index ec607758bd6d..3eee4f17af11 100644 --- a/pkgs/games/trackballs/default.nix +++ b/pkgs/games/trackballs/default.nix @@ -1,24 +1,23 @@ { stdenv, fetchFromGitHub, cmake, SDL2, SDL2_ttf, gettext, zlib, SDL2_mixer, SDL2_image, guile, libGLU, libGL }: -with stdenv.lib; - stdenv.mkDerivation rec { pname = "trackballs"; - version = "1.3.1"; + version = "1.3.2"; src = fetchFromGitHub { owner = "trackballs"; - repo = "trackballs"; + repo = pname; rev = "v${version}"; - sha256 = "1yjzz50r57aahy7wcbsmhrd40abzyriq40j49225ya7m9g28vmgl"; + sha256 = "G+KfQgqk+iI+Beb/ZRul2ArCBcvwYQ/ftEWzdrtwb18="; }; - buildInputs = [ cmake zlib SDL2 SDL2_ttf SDL2_mixer SDL2_image guile gettext libGLU libGL ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ zlib SDL2 SDL2_ttf SDL2_mixer SDL2_image guile gettext libGLU libGL ]; - meta = { + meta = with stdenv.lib; { homepage = "https://trackballs.github.io/"; description = "3D Marble Madness clone"; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.gpl2; + platforms = platforms.linux; + license = licenses.gpl2; }; } diff --git a/pkgs/games/tremulous/default.nix b/pkgs/games/tremulous/default.nix index cab77b23ee91..a4bf47b5e362 100644 --- a/pkgs/games/tremulous/default.nix +++ b/pkgs/games/tremulous/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, libGLU, libGL, libX11, SDL, openal, runtimeShell }: +{ lib, stdenv, fetchurl, unzip, libGLU, libGL, libX11, SDL, openal, runtimeShell }: stdenv.mkDerivation rec { pname = "tremulous"; version = "1.1.0"; @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { done ''; dontPatchELF = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A game that blends a team based FPS with elements of an RTS"; longDescription = '' Tremulous is a free, open source game that blends a team based FPS with diff --git a/pkgs/games/tuxtype/default.nix b/pkgs/games/tuxtype/default.nix index 9d04440a1672..1032eba4bcb5 100644 --- a/pkgs/games/tuxtype/default.nix +++ b/pkgs/games/tuxtype/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, librsvg, libxml2, SDL, SDL_image, SDL_mixer, SDL_net, SDL_ttf, t4kcommon }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, librsvg, libxml2, SDL, SDL_image, SDL_mixer, SDL_net, SDL_ttf, t4kcommon }: stdenv.mkDerivation rec { version = "1.8.3"; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--without-sdlpango" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "An Educational Typing Tutor Game Starring Tux, the Linux Penguin"; homepage = "https://github.com/tux4kids/tuxtype"; license = licenses.gpl3Plus; diff --git a/pkgs/games/typespeed/default.nix b/pkgs/games/typespeed/default.nix index 9da67cbd1ea1..396e41c46714 100644 --- a/pkgs/games/typespeed/default.nix +++ b/pkgs/games/typespeed/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses }: +{ lib, stdenv, fetchurl, ncurses }: stdenv.mkDerivation { name = "typespeed-0.6.5"; @@ -13,7 +13,7 @@ stdenv.mkDerivation { configureFlags = [ "--datadir=\${out}/share/" ]; makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A curses based typing game"; homepage = "http://typespeed.sourceforge.net/"; license = licenses.gpl2; diff --git a/pkgs/games/ultrastardx/default.nix b/pkgs/games/ultrastardx/default.nix index b6e1da204edf..43fd30f1d7de 100644 --- a/pkgs/games/ultrastardx/default.nix +++ b/pkgs/games/ultrastardx/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , autoreconfHook , fetchFromGitHub , fetchpatch @@ -64,7 +64,7 @@ in stdenv.mkDerivation rec { # dlopened libgcc requires the rpath not to be shrinked dontPatchELF = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://ultrastardx.sourceforge.net/"; description = "Free and open source karaoke game"; license = licenses.gpl2Plus; diff --git a/pkgs/games/unnethack/default.nix b/pkgs/games/unnethack/default.nix index 94f39a4b5789..03928ff48f4c 100644 --- a/pkgs/games/unnethack/default.nix +++ b/pkgs/games/unnethack/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, util-linux, ncurses, flex, bison }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, util-linux, ncurses, flex, bison }: stdenv.mkDerivation rec { pname = "unnethack"; @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { chmod +x $out/bin/unnethack ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Fork of NetHack"; homepage = "https://unnethack.wordpress.com/"; license = "nethack"; diff --git a/pkgs/games/urbanterror/default.nix b/pkgs/games/urbanterror/default.nix index ccc20281302b..10553d483a50 100644 --- a/pkgs/games/urbanterror/default.nix +++ b/pkgs/games/urbanterror/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, SDL, libGLU, libGL, openal, curl, libXxf86vm }: +{ lib, stdenv, fetchurl, unzip, SDL, libGLU, libGL, openal, curl, libXxf86vm }: stdenv.mkDerivation rec { pname = "urbanterror"; @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A multiplayer tactical FPS on top of Quake 3 engine"; longDescription = '' Urban Terror is a free multiplayer first person shooter developed by diff --git a/pkgs/games/ut2004/demo.nix b/pkgs/games/ut2004/demo.nix index 5b501022e2a6..5203453cc601 100644 --- a/pkgs/games/ut2004/demo.nix +++ b/pkgs/games/ut2004/demo.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: let arch = @@ -30,7 +30,7 @@ in stdenv.mkDerivation rec { dontStrip = true; dontPatchELF = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A first-person shooter video game developed by Epic Games and Digital Extreme -- demo version"; homepage = "http://www.unrealtournament2004.com"; license = licenses.unfree; diff --git a/pkgs/games/vapor/default.nix b/pkgs/games/vapor/default.nix index a8d345151d64..e79c49779af5 100644 --- a/pkgs/games/vapor/default.nix +++ b/pkgs/games/vapor/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, love, lua, makeWrapper, makeDesktopItem }: +{ lib, stdenv, fetchurl, love, lua, makeWrapper, makeDesktopItem }: let pname = "vapor"; @@ -50,7 +50,7 @@ stdenv.mkDerivation { ln -s ${desktopItem}/share/applications/* $out/share/applications/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "LÖVE Distribution Client allowing access to many games"; platforms = platforms.linux; license = licenses.zlib; diff --git a/pkgs/games/vassal/default.nix b/pkgs/games/vassal/default.nix index 413d98d26ace..effb999e02c3 100644 --- a/pkgs/games/vassal/default.nix +++ b/pkgs/games/vassal/default.nix @@ -1,11 +1,12 @@ -{ stdenv, fetchurl, jre, makeWrapper }: +{ lib, stdenv, fetchzip, jre, makeWrapper }: stdenv.mkDerivation rec { - name = "VASSAL-3.3.2"; + pname = "VASSAL"; + version = "3.4.12"; - src = fetchurl { - url = "mirror://sourceforge/vassalengine/${name}-linux.tar.bz2"; - sha256 = "1abhlkl27gyfa1lghvv76xa6ks5hiwv2s9wb9ddadm0m07f87n1w"; + src = fetchzip { + url = "https://github.com/vassalengine/vassal/releases/download/${version}/${pname}-${version}-linux.tar.bz2"; + sha256 = "0xn403fxz6ay5lv8whyfdq611kvxj5q309bj317yw5cxbb08w1yb"; }; buildInputs = [ makeWrapper ]; @@ -13,7 +14,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin $out/share/vassal $out/doc - cp CHANGES LICENSE README $out + cp CHANGES LICENSE README.md $out cp -R lib/* $out/share/vassal cp -R doc/* $out/doc @@ -25,10 +26,10 @@ stdenv.mkDerivation rec { # Don't move doc to share/, VASSAL expects it to be in the root forceShare = [ "man" "info" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A free, open-source boardgame engine"; homepage = "http://www.vassalengine.org/"; - license = licenses.lgpl21; + license = licenses.lgpl21Only; maintainers = with maintainers; [ tvestelind ]; platforms = platforms.linux; }; diff --git a/pkgs/games/vessel/default.nix b/pkgs/games/vessel/default.nix index 4e0337fa1b47..fa5aff2b81b4 100644 --- a/pkgs/games/vessel/default.nix +++ b/pkgs/games/vessel/default.nix @@ -1,4 +1,4 @@ -{ stdenv, requireFile, SDL, libpulseaudio, alsaLib, runtimeShell }: +{ lib, stdenv, requireFile, SDL, libpulseaudio, alsaLib, runtimeShell }: stdenv.mkDerivation rec { name = "vessel-12082012"; @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { chmod +x $out/bin/Vessel ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A fluid physics based puzzle game"; longDescription = '' Living liquid machines have overrun this world of unstoppable progress, diff --git a/pkgs/games/voxelands/default.nix b/pkgs/games/voxelands/default.nix index 5e52cba3b49c..0d28a93e401e 100644 --- a/pkgs/games/voxelands/default.nix +++ b/pkgs/games/voxelands/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitLab , bzip2 , cmake @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { xlibsWrapper ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://voxelands.net/"; description = "Infinite-world block sandbox game based on Minetest"; license = licenses.gpl3Plus; diff --git a/pkgs/games/warmux/default.nix b/pkgs/games/warmux/default.nix index dc8b53d09ad6..464095e714bc 100644 --- a/pkgs/games/warmux/default.nix +++ b/pkgs/games/warmux/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoconf, automake +{ lib, stdenv, fetchFromGitHub, autoconf, automake , zlib, curl, gnutls, fribidi, libpng, SDL, SDL_gfx, SDL_image, SDL_mixer , SDL_net, SDL_ttf, libunwind, libX11, xorgproto, libxml2, pkgconfig , gettext, intltool, libtool, perl @@ -27,7 +27,7 @@ stdenv.mkDerivation { ]; enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Ballistics turn-based battle game between teams - unofficial copy"; maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; diff --git a/pkgs/games/warsow/default.nix b/pkgs/games/warsow/default.nix index 4c2cd1b5a288..81c467dd9db7 100644 --- a/pkgs/games/warsow/default.nix +++ b/pkgs/games/warsow/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, warsow-engine, makeWrapper }: +{ lib, stdenv, fetchurl, warsow-engine, makeWrapper }: stdenv.mkDerivation rec { pname = "warsow"; version = "2.1.2"; src = fetchurl { - url = "http://slice.sh/warsow/${pname}-${version}.tar.gz"; + url = "http://warsow.net/${pname}-${version}.tar.gz"; sha256 = "07y2airw5qg3s1bf1c63a6snjj22riz0mqhk62jmfm9nrarhavrc"; }; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Multiplayer FPS game designed for competitive gaming"; longDescription = '' Set in a futuristic cartoon-like world where rocketlauncher-wielding diff --git a/pkgs/games/warsow/engine.nix b/pkgs/games/warsow/engine.nix index 19c368671e64..4c8de4a02d33 100644 --- a/pkgs/games/warsow/engine.nix +++ b/pkgs/games/warsow/engine.nix @@ -32,8 +32,6 @@ in stdenv.mkDerivation (libs // rec { cmakeFlags = [ "-DQFUSION_GAME=Warsow" ]; - enableParallelBuilding = true; - installPhase = '' mkdir -p $out/lib cp -r libs $out/lib/warsow @@ -42,7 +40,7 @@ in stdenv.mkDerivation (libs // rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Multiplayer FPS game designed for competitive gaming (engine only)"; homepage = "http://www.warsow.net"; license = licenses.gpl2; diff --git a/pkgs/games/warzone2100/default.nix b/pkgs/games/warzone2100/default.nix index 3d7be936f1bc..2dfb2a72d89b 100644 --- a/pkgs/games/warzone2100/default.nix +++ b/pkgs/games/warzone2100/default.nix @@ -1,4 +1,4 @@ -{ stdenv, mkDerivation, fetchurl, autoconf, automake +{ lib, stdenv, mkDerivation, fetchurl, autoconf, automake , perl, unzip, zip, which, pkgconfig, qtbase, qtscript , SDL2, libtheora, openal, glew, physfs, fribidi, libXrandr , withVideos ? false @@ -47,7 +47,7 @@ mkDerivation rec { postInstall = stdenv.lib.optionalString withVideos "cp ${sequences_src} $out/share/warzone2100/sequences.wz"; - meta = with stdenv.lib; { + meta = with lib; { description = "A free RTS game, originally developed by Pumpkin Studios"; longDescription = '' Warzone 2100 is an open source real-time strategy and real-time tactics diff --git a/pkgs/games/wesnoth/default.nix b/pkgs/games/wesnoth/default.nix index 2f971e12c9fd..d5eb7495df08 100644 --- a/pkgs/games/wesnoth/default.nix +++ b/pkgs/games/wesnoth/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, SDL2, SDL2_image, SDL2_mixer, SDL2_net, SDL2_ttf +{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, SDL2, SDL2_image, SDL2_mixer, SDL2_net, SDL2_ttf , pango, gettext, boost, libvorbis, fribidi, dbus, libpng, pcre, openssl, icu , Cocoa, Foundation , enableTools ? false @@ -23,9 +23,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DENABLE_TOOLS=${if enableTools then "ON" else "OFF"}" ]; - enableParallelBuilding = true; - - meta = with stdenv.lib; { + meta = with lib; { description = "The Battle for Wesnoth, a free, turn-based strategy game with a fantasy theme"; longDescription = '' The Battle for Wesnoth is a Free, turn-based tactical strategy diff --git a/pkgs/games/widelands/default.nix b/pkgs/games/widelands/default.nix index e499f4ad1fcc..ba7ce241b868 100644 --- a/pkgs/games/widelands/default.nix +++ b/pkgs/games/widelands/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, python, gettext +{ lib, stdenv, fetchurl, cmake, python, gettext , boost, libpng, zlib, glew, lua, doxygen, icu , SDL2, SDL2_image, SDL2_mixer, SDL2_net, SDL2_ttf }: @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "widelands"; version = "20"; - meta = with stdenv.lib; { + meta = with lib; { description = "RTS with multiple-goods economy"; homepage = "http://widelands.org/"; longDescription = '' @@ -53,6 +53,4 @@ stdenv.mkDerivation rec { mkdir -p "$out/share/applications/" cp -v "../debian/org.widelands.widelands.desktop" "$out/share/applications/" ''; - - enableParallelBuilding = true; } diff --git a/pkgs/games/worldofgoo/default.nix b/pkgs/games/worldofgoo/default.nix index 81540fa4d962..8d06b94271f4 100644 --- a/pkgs/games/worldofgoo/default.nix +++ b/pkgs/games/worldofgoo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, requireFile, unzip, makeDesktopItem, SDL2, SDL2_mixer, libogg, libvorbis }: +{ lib, stdenv, requireFile, unzip, makeDesktopItem, SDL2, SDL2_mixer, libogg, libvorbis }: let arch = if stdenv.system == "x86_64-linux" @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath $libPath $out/bin/WorldOfGoo.bin.${arch} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A physics based puzzle game"; longDescription = '' World of Goo is a physics based puzzle / construction game. The millions of Goo diff --git a/pkgs/games/wyvern/default.nix b/pkgs/games/wyvern/default.nix index dcf81bc0985f..82209a69a44b 100644 --- a/pkgs/games/wyvern/default.nix +++ b/pkgs/games/wyvern/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchgit , rustPlatform , unzip @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ openssl ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A simple CLI client for installing and maintaining linux GOG games"; homepage = "https://git.sr.ht/~nicohman/wyvern"; license = licenses.gpl3; diff --git a/pkgs/games/xbomb/default.nix b/pkgs/games/xbomb/default.nix index 0754905ce50d..8ec625a0b6bb 100644 --- a/pkgs/games/xbomb/default.nix +++ b/pkgs/games/xbomb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libX11, libXaw }: +{ lib, stdenv, fetchurl, libX11, libXaw }: stdenv.mkDerivation rec { name = "xbomb-2.2b"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { "INSTDIR=${placeholder ''out''}" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.gedanken.org.uk/software/xbomb/"; description = "Minesweeper for X11 with various grid sizes and shapes"; license = licenses.gpl2Plus; diff --git a/pkgs/games/xconq/default.nix b/pkgs/games/xconq/default.nix index 6e8526399794..8f4366fbcb87 100644 --- a/pkgs/games/xconq/default.nix +++ b/pkgs/games/xconq/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cpio, xorgproto, libX11, libXmu, libXaw, libXt, tcl, tk +{ lib, stdenv, fetchurl, cpio, xorgproto, libX11, libXmu, libXaw, libXt, tcl, tk , libXext, fontconfig, makeWrapper }: stdenv.mkDerivation rec { @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A programmable turn-based strategy game"; maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; diff --git a/pkgs/games/xcowsay/default.nix b/pkgs/games/xcowsay/default.nix index dd95bf1e5a16..0a6371801bd5 100644 --- a/pkgs/games/xcowsay/default.nix +++ b/pkgs/games/xcowsay/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, pkg-config +{ lib, stdenv, fetchurl, makeWrapper, pkg-config , dbus, dbus-glib, gtk3, gdk-pixbuf, librsvg , fortune }: @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.doof.me.uk/xcowsay"; description = "A program based on cowsay that displays a cute cow and message on your desktop"; diff --git a/pkgs/games/xjump/default.nix b/pkgs/games/xjump/default.nix index afac2de9fcec..3c13fc1a9b78 100644 --- a/pkgs/games/xjump/default.nix +++ b/pkgs/games/xjump/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, libX11, libXt, libXpm, libXaw, localStateDir?null }: +{ lib, stdenv, fetchFromGitHub, autoconf, automake, libX11, libXt, libXpm, libXaw, localStateDir?null }: stdenv.mkDerivation { pname = "xjump"; @@ -19,7 +19,7 @@ stdenv.mkDerivation { else []; - meta = with stdenv.lib; { + meta = with lib; { description = "The falling tower game"; license = licenses.gpl2; maintainers = with maintainers; [ pmeunier ]; diff --git a/pkgs/games/xmage/default.nix b/pkgs/games/xmage/default.nix index e8b8eb8a9419..7552ce700f32 100644 --- a/pkgs/games/xmage/default.nix +++ b/pkgs/games/xmage/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , jdk8 , unzip @@ -30,7 +30,7 @@ EOS chmod +x $out/bin/xmage ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Magic Another Game Engine"; license = licenses.mit; maintainers = with maintainers; [ matthiasbeyer ]; diff --git a/pkgs/games/xmoto/default.nix b/pkgs/games/xmoto/default.nix index d49998a68d73..afeded792f2e 100644 --- a/pkgs/games/xmoto/default.nix +++ b/pkgs/games/xmoto/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, chipmunk, sqlite, curl, zlib, bzip2, libjpeg +{ lib, stdenv, fetchurl, chipmunk, sqlite, curl, zlib, bzip2, libjpeg , libpng, freeglut, libGLU, libGL, SDL, SDL_mixer, SDL_image, SDL_net , SDL_ttf, lua5, ode, libxdg_basedir, libxml2 }: @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { "-D_GLIBCXX_USE_CXX11_ABI=0" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Obstacled race game"; homepage = "http://xmoto.tuxfamily.org"; maintainers = with maintainers; [ raskin pSub ]; diff --git a/pkgs/games/xpilot/bloodspilot-server.nix b/pkgs/games/xpilot/bloodspilot-server.nix index 6b0a0603af51..a860c4e1d5ff 100644 --- a/pkgs/games/xpilot/bloodspilot-server.nix +++ b/pkgs/games/xpilot/bloodspilot-server.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, expat }: +{ lib, stdenv, fetchurl, expat }: stdenv.mkDerivation rec { pname = "bloodspilot-xpilot-fxi-server"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ./server-gcc5.patch ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A multiplayer X11 space combat game (server part)"; homepage = "http://bloodspilot.sf.net/"; license = licenses.gpl2Plus ; diff --git a/pkgs/games/xpilot/default.nix b/pkgs/games/xpilot/default.nix index 8803806547bf..bd86538d99ec 100644 --- a/pkgs/games/xpilot/default.nix +++ b/pkgs/games/xpilot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libX11, libSM, SDL, libGLU, libGL, expat, SDL_ttf +{ lib, stdenv, fetchurl, libX11, libSM, SDL, libGLU, libGL, expat, SDL_ttf , SDL_image, zlib, libXxf86misc }: stdenv.mkDerivation rec { pname = "xpilot-ng"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ libX11 libSM SDL SDL_ttf SDL_image libGLU libGL expat zlib libXxf86misc ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A multiplayer X11 space combat game"; homepage = "http://xpilot.sf.net/"; license = licenses.gpl2Plus; diff --git a/pkgs/games/xskat/default.nix b/pkgs/games/xskat/default.nix index 5fa91a0395c1..5f0f867f1836 100644 --- a/pkgs/games/xskat/default.nix +++ b/pkgs/games/xskat/default.nix @@ -1,37 +1,29 @@ {stdenv, fetchurl, libX11, imake, gccmakedep}: +stdenv.mkDerivation rec { + pname = "xskat"; + version = "4.0"; -let - s = # Generated upstream information - rec { - baseName="xskat"; - version="4.0"; - name="${baseName}-${version}"; + nativeBuildInputs = [ gccmakedep ]; + buildInputs = [ libX11 imake ]; - url="http://www.xskat.de/xskat-4.0.tar.gz"; - hash="8ba52797ccbd131dce69b96288f525b0d55dee5de4008733f7a5a51deb831c10"; - sha256="8ba52797ccbd131dce69b96288f525b0d55dee5de4008733f7a5a51deb831c10"; - }; - buildInputs = [ libX11 imake gccmakedep ]; -in - -stdenv.mkDerivation { - inherit (s) name version; - inherit buildInputs; src = fetchurl { - inherit (s) url sha256; + url = "http://www.xskat.de/xskat-${version }.tar.gz"; + sha256 = "8ba52797ccbd131dce69b96288f525b0d55dee5de4008733f7a5a51deb831c10"; }; + preInstall = '' sed -i Makefile \ -e "s|.* BINDIR .*| BINDIR = $out/bin|" \ -e "s|.* MANPATH .*| MANPATH = $out/man|" ''; + installTargets = [ "install" "install.man" ]; - meta = { - inherit (s) version; + + meta = with stdenv.lib; { description = ''Famous german card game''; - platforms = stdenv.lib.platforms.unix; - license = stdenv.lib.licenses.free; + platforms = platforms.unix; + license = licenses.free; longDescription = ''Play the german card game Skat against the AI or over IRC.''; homepage = "http://www.xskat.de/"; }; diff --git a/pkgs/games/xsokoban/default.nix b/pkgs/games/xsokoban/default.nix index 3f6062c4f686..68b47e6225a5 100644 --- a/pkgs/games/xsokoban/default.nix +++ b/pkgs/games/xsokoban/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libX11, xorgproto, libXpm, libXt }: +{ lib, stdenv, fetchurl, libX11, xorgproto, libXpm, libXt }: stdenv.mkDerivation rec { pname = "xsokoban"; @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { mkdir -p $out/bin $out/share $out/man/man1 $out/lib ''; - meta = with stdenv.lib; { + meta = with lib; { description = "X sokoban"; license = licenses.publicDomain; maintainers = [ maintainers.raskin ]; diff --git a/pkgs/games/xtris/default.nix b/pkgs/games/xtris/default.nix index c9421b23a821..e6da0c6f17cc 100644 --- a/pkgs/games/xtris/default.nix +++ b/pkgs/games/xtris/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, xorg }: +{ lib, stdenv, fetchzip, xorg }: stdenv.mkDerivation rec { pname = "xtris"; version = "1.15"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; buildInputs = [ xorg.libX11 ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A multi-player version of the classical game of Tetris, for the X Window system"; homepage = "https://web.archive.org/web/20120315061213/http://www.iagora.com/~espel/xtris/xtris.html"; license = licenses.gpl2; diff --git a/pkgs/games/zandronum/default.nix b/pkgs/games/zandronum/default.nix index bdafff992434..25f536885d61 100644 --- a/pkgs/games/zandronum/default.nix +++ b/pkgs/games/zandronum/default.nix @@ -51,8 +51,6 @@ in stdenv.mkDerivation rec { then [ "-DSERVERONLY=ON" ] else [ "-DFMOD_LIBRARY=${fmod}/lib/libfmodex.so" ]); - enableParallelBuilding = true; - hardeningDisable = [ "format" ]; installPhase = '' @@ -74,7 +72,7 @@ in stdenv.mkDerivation rec { inherit fmod sqlite; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://zandronum.com/"; description = "Multiplayer oriented port, based off Skulltag, for Doom and Doom II by id Software"; maintainers = with maintainers; [ lassulus MP2E ]; diff --git a/pkgs/games/zandronum/fmod.nix b/pkgs/games/zandronum/fmod.nix index 5eebcd4a38e7..257dd3751c8e 100644 --- a/pkgs/games/zandronum/fmod.nix +++ b/pkgs/games/zandronum/fmod.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { cp -r api/inc $out/include ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Programming library and toolkit for the creation and playback of interactive audio"; homepage = "http://www.fmod.org/"; license = licenses.unfreeRedistributable; diff --git a/pkgs/games/zaz/default.nix b/pkgs/games/zaz/default.nix index 9d42cfd6896d..00416eb1c980 100644 --- a/pkgs/games/zaz/default.nix +++ b/pkgs/games/zaz/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , pkgconfig , SDL @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { "ZAZ_LIBS+=-lvorbisfile" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A puzzle game about arranging balls in triplets, like Luxor, Zuma, or Puzzle Bobble"; homepage = "http://zaz.sourceforge.net/"; license = licenses.gpl3; diff --git a/pkgs/games/zdoom/bcc-git.nix b/pkgs/games/zdoom/bcc-git.nix index ae7a4ae6f426..8716a82fc105 100644 --- a/pkgs/games/zdoom/bcc-git.nix +++ b/pkgs/games/zdoom/bcc-git.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation { name = "doom-bcc-git-0.8.0.2018.01.04"; @@ -22,7 +22,7 @@ stdenv.mkDerivation { cp -av lib $out/lib/bcc ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Compiler for Doom/Hexen scripts (ACS, BCS)"; homepage = "https://github.com/wormt/bcc"; license = licenses.mit; diff --git a/pkgs/games/zdoom/default.nix b/pkgs/games/zdoom/default.nix index 646021eb2fcc..3a31f8fdfb5f 100644 --- a/pkgs/games/zdoom/default.nix +++ b/pkgs/games/zdoom/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, p7zip, cmake +{ lib, stdenv, fetchurl, p7zip, cmake , SDL2, openal, fluidsynth, soundfont-fluid, bzip2, zlib, libjpeg, game-music-emu , libsndfile, mpg123 }: @@ -25,8 +25,6 @@ stdenv.mkDerivation rec { sourceRoot = "."; - enableParallelBuilding = true; - NIX_CFLAGS_LINK = [ "-lopenal" "-lfluidsynth" ]; preConfigure = '' @@ -45,7 +43,7 @@ stdenv.mkDerivation rec { ln -s $out/lib/zdoom/zdoom $out/bin/zdoom ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://zdoom.org/"; description = "Enhanced port of the official DOOM source code"; # Doom source license, MAME license diff --git a/pkgs/games/zdoom/zdbsp.nix b/pkgs/games/zdoom/zdbsp.nix index e86ebd6dbc22..e688b908e126 100644 --- a/pkgs/games/zdoom/zdbsp.nix +++ b/pkgs/games/zdoom/zdbsp.nix @@ -1,27 +1,32 @@ -{ stdenv, fetchurl, cmake, unzip, zlib }: +{ lib, stdenv, fetchzip, cmake, zlib }: stdenv.mkDerivation rec { pname = "zdbsp"; version = "1.19"; - src = fetchurl { + src = fetchzip { url = "https://zdoom.org/files/utils/zdbsp/zdbsp-${version}-src.zip"; - sha256 = "0j82q7g7hgvnahk6gdyhmn9880mqii3b4agqc98f5xaj3kxmd2dr"; + sha256 = "1j6k0appgjjj3ffbll9hy9nnbqr17szd1s66q08zrbkfqf6g8f0d"; + stripRoot = false; }; - nativeBuildInputs = [cmake unzip]; - buildInputs = [zlib]; - sourceRoot = "."; - enableParallelBuilding = true; + nativeBuildInputs = [ + cmake + ]; + + buildInputs = [ + zlib + ]; + installPhase = '' install -Dm755 zdbsp $out/bin/zdbsp ''; - meta = with stdenv.lib; { + meta = with lib; { description = "ZDoom's internal node builder for DOOM maps"; homepage = "https://zdoom.org/wiki/ZDBSP"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ertes]; - platforms = platforms.linux; + maintainers = with maintainers; [ lassulus siraben ]; + platforms = platforms.unix; }; } diff --git a/pkgs/games/zoom/default.nix b/pkgs/games/zoom/default.nix index 827fb351f1de..086d860872c7 100644 --- a/pkgs/games/zoom/default.nix +++ b/pkgs/games/zoom/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, expat, xlibsWrapper, freetype }: +{ lib, stdenv, fetchurl, perl, expat, xlibsWrapper, freetype }: # !!! assert freetype == xorg.freetype @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-I${freetype}/include/freetype2 -fgnu89-inline"; - meta = with stdenv.lib; { + meta = with lib; { description = "Player for Z-Code, TADS and HUGO stories or games"; longDescription = '' Zoom is a player for Z-Code, TADS and HUGO stories or games. These are diff --git a/pkgs/misc/acpilight/default.nix b/pkgs/misc/acpilight/default.nix index 1975e2d37907..b5a385ab4076 100644 --- a/pkgs/misc/acpilight/default.nix +++ b/pkgs/misc/acpilight/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, python3, coreutils }: +{ lib, stdenv, fetchgit, python3, coreutils }: stdenv.mkDerivation rec { pname = "acpilight"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { makeFlags = [ "DESTDIR=$(out) prefix=" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://gitlab.com/wavexx/acpilight"; description = "ACPI backlight control"; license = licenses.gpl3; diff --git a/pkgs/misc/apulse/default.nix b/pkgs/misc/apulse/default.nix index 33ba0bf86761..6f13414701a9 100644 --- a/pkgs/misc/apulse/default.nix +++ b/pkgs/misc/apulse/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, alsaLib, cmake, pkgconfig, glib +{ lib, stdenv, fetchFromGitHub, alsaLib, cmake, pkgconfig, glib , tracingSupport ? true, logToStderr ? true }: let oz = x: if x then "1" else "0"; in @@ -14,8 +14,6 @@ stdenv.mkDerivation rec { sha256 = "1p6fh6ah5v3qz7dxhcsixx38bxg44ypbim4m03bxk3ls5i9xslmn"; }; - enableParallelBuilding = true; - nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ alsaLib glib ]; @@ -25,7 +23,7 @@ stdenv.mkDerivation rec { "-DLOG_TO_STDERR=${oz logToStderr}" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "PulseAudio emulation for ALSA"; homepage = "https://github.com/i-rinat/apulse"; license = licenses.mit; diff --git a/pkgs/misc/beep/default.nix b/pkgs/misc/beep/default.nix index bb62271a3109..92d84bdf6dc8 100644 --- a/pkgs/misc/beep/default.nix +++ b/pkgs/misc/beep/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: # this package is working only as root # in order to work as a non privileged user you would need to suid the bin @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { makeFlags = [ "DESTDIR=\${out}" "prefix="]; - meta = with stdenv.lib; { + meta = with lib; { description = "The advanced PC speaker beeper"; homepage = "https://github.com/spkr-beep/beep"; license = licenses.gpl2Only; diff --git a/pkgs/misc/brightnessctl/default.nix b/pkgs/misc/brightnessctl/default.nix index 37956785a5bb..2fab8b4bd676 100644 --- a/pkgs/misc/brightnessctl/default.nix +++ b/pkgs/misc/brightnessctl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkg-config, systemd }: +{ lib, stdenv, fetchFromGitHub, pkg-config, systemd }: stdenv.mkDerivation rec { pname = "brightnessctl"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ systemd ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/Hummer12007/brightnessctl"; description = "This program allows you read and control device brightness"; license = licenses.mit; diff --git a/pkgs/misc/calaos/installer/default.nix b/pkgs/misc/calaos/installer/default.nix index ee7c089bc8ee..575471b2ee51 100644 --- a/pkgs/misc/calaos/installer/default.nix +++ b/pkgs/misc/calaos/installer/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, stdenv, fetchFromGitHub, qmake, qttools, qtbase }: +{ mkDerivation, lib, stdenv, fetchFromGitHub, qmake, qttools, qtbase }: mkDerivation rec { pname = "calaos_installer"; @@ -24,7 +24,7 @@ mkDerivation rec { cp -a calaos_installer $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Calaos Installer, a tool to create calaos configuration"; homepage = "https://www.calaos.fr/"; license = licenses.gpl3Plus; diff --git a/pkgs/misc/cups/cups-pk-helper.nix b/pkgs/misc/cups/cups-pk-helper.nix index 3151bace5587..3be5bd7711fa 100644 --- a/pkgs/misc/cups/cups-pk-helper.nix +++ b/pkgs/misc/cups/cups-pk-helper.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, intltool, pkgconfig, glib, polkit, cups, fetchpatch }: +{ lib, stdenv, fetchurl, intltool, pkgconfig, glib, polkit, cups, fetchpatch }: stdenv.mkDerivation rec { version = "0.2.6"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { }) ]; - meta = with stdenv.lib; { + meta = with lib; { description = "PolicyKit helper to configure cups with fine-grained privileges"; homepage = "http://www.freedesktop.org/wiki/Software/cups-pk-helper/"; license = licenses.gpl2; diff --git a/pkgs/misc/cups/drivers/brlaser/default.nix b/pkgs/misc/cups/drivers/brlaser/default.nix index 141e3f9e6123..b0dfd8d8170a 100644 --- a/pkgs/misc/cups/drivers/brlaser/default.nix +++ b/pkgs/misc/cups/drivers/brlaser/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, zlib, cups }: +{ lib, stdenv, fetchFromGitHub, cmake, zlib, cups }: stdenv.mkDerivation rec { pname = "brlaser"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DCUPS_SERVER_BIN=lib/cups" "-DCUPS_DATA_DIR=share/cups" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A CUPS driver for Brother laser printers"; longDescription = '' diff --git a/pkgs/misc/cups/drivers/canon/default.nix b/pkgs/misc/cups/drivers/canon/default.nix index dbc6390ef498..754c0f4d1d0e 100644 --- a/pkgs/misc/cups/drivers/canon/default.nix +++ b/pkgs/misc/cups/drivers/canon/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, unzip, autoreconfHook, libtool, makeWrapper, cups, ghostscript, pkgsi686Linux, zlib }: +{lib, stdenv, fetchurl, unzip, autoreconfHook, libtool, makeWrapper, cups, ghostscript, pkgsi686Linux, zlib }: let @@ -214,7 +214,7 @@ stdenv.mkDerivation { --prefix PATH ":" "$out/bin" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "CUPS Linux drivers for Canon printers"; homepage = "http://www.canon.com/"; license = licenses.unfree; diff --git a/pkgs/misc/cups/drivers/estudio/default.nix b/pkgs/misc/cups/drivers/estudio/default.nix index 9aaae31488d3..37b39556d932 100644 --- a/pkgs/misc/cups/drivers/estudio/default.nix +++ b/pkgs/misc/cups/drivers/estudio/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl }: +{ lib, stdenv, fetchurl, perl }: stdenv.mkDerivation { pname = "cups-toshiba-estudio"; @@ -31,7 +31,7 @@ stdenv.mkDerivation { chmod 755 $out/share/cups/model/Toshiba/TOSHIBA_ColorMFP_CUPS.gz ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Printer only driver for the Toshiba e-STUDIO class of printers"; longDescription = '' This driver supports the following printers: TOSHIBA e-STUDIO2000AC, diff --git a/pkgs/misc/cups/drivers/fxlinuxprint/default.nix b/pkgs/misc/cups/drivers/fxlinuxprint/default.nix index 30d737871047..36134780e9bf 100644 --- a/pkgs/misc/cups/drivers/fxlinuxprint/default.nix +++ b/pkgs/misc/cups/drivers/fxlinuxprint/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { mv usr/share/ppd/FujiXerox/* $out/share/cups/model ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Fuji Xerox Linux Printer Driver"; longDescription = '' DocuPrint P365/368 d diff --git a/pkgs/misc/cups/drivers/googlecloudprint/default.nix b/pkgs/misc/cups/drivers/googlecloudprint/default.nix index 9b612c43a000..6503571eb6b6 100644 --- a/pkgs/misc/cups/drivers/googlecloudprint/default.nix +++ b/pkgs/misc/cups/drivers/googlecloudprint/default.nix @@ -55,7 +55,7 @@ in stdenv.mkDerivation rec { popd ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Google Cloud Print driver for CUPS, allows printing to printers hosted on Google Cloud Print"; homepage = "http://ccp.niftiestsoftware.com"; platforms = platforms.linux; diff --git a/pkgs/misc/cups/drivers/hll2340dw/default.nix b/pkgs/misc/cups/drivers/hll2340dw/default.nix index a291f1662883..a621137c8f19 100644 --- a/pkgs/misc/cups/drivers/hll2340dw/default.nix +++ b/pkgs/misc/cups/drivers/hll2340dw/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, cups, dpkg, gnused, makeWrapper, ghostscript, file, a2ps, coreutils, gawk, perl, gnugrep, which}: +{lib, stdenv, fetchurl, cups, dpkg, gnused, makeWrapper, ghostscript, file, a2ps, coreutils, gawk, perl, gnugrep, which}: let version = "3.2.0-1"; @@ -57,7 +57,7 @@ stdenv.mkDerivation { --prefix PATH ":" ${ stdenv.lib.makeBinPath [ ghostscript a2ps file gnused gnugrep coreutils which ] } ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.brother.com/"; description = "Brother hl-l2340dw printer driver"; license = licenses.unfree; diff --git a/pkgs/misc/cups/drivers/hll2390dw-cups/default.nix b/pkgs/misc/cups/drivers/hll2390dw-cups/default.nix index 0a55ee0c8bbf..1e247d42ca4b 100644 --- a/pkgs/misc/cups/drivers/hll2390dw-cups/default.nix +++ b/pkgs/misc/cups/drivers/hll2390dw-cups/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper +{ lib, stdenv, fetchurl, makeWrapper , cups , dpkg , a2ps, ghostscript, gnugrep, gnused, coreutils, file, perl, which @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { --prefix PATH ":" ${ stdenv.lib.makeBinPath [ ghostscript a2ps file gnused gnugrep coreutils which ] } ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.brother.com/"; description = "Brother HL-L2390DW combined print driver"; license = licenses.unfree; diff --git a/pkgs/misc/cups/drivers/mfcj6510dwcupswrapper/default.nix b/pkgs/misc/cups/drivers/mfcj6510dwcupswrapper/default.nix index 8a5c9644512e..1653ced85c5a 100644 --- a/pkgs/misc/cups/drivers/mfcj6510dwcupswrapper/default.nix +++ b/pkgs/misc/cups/drivers/mfcj6510dwcupswrapper/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, mfcj6510dwlpr, makeWrapper}: +{ lib, stdenv, fetchurl, mfcj6510dwlpr, makeWrapper}: stdenv.mkDerivation rec { pname = "mfcj6510dw-cupswrapper"; @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { make clean ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.brother.com/"; description = "Brother MFC-J6510DW CUPS wrapper driver"; license = with licenses; gpl2; diff --git a/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix b/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix index 8f07d4b41970..ea06e8c104d1 100644 --- a/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix +++ b/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgsi686Linux, dpkg, makeWrapper, coreutils, gnused, gawk, file, cups, util-linux, xxd, runtimeShell +{ lib, stdenv, fetchurl, pkgsi686Linux, dpkg, makeWrapper, coreutils, gnused, gawk, file, cups, util-linux, xxd, runtimeShell , ghostscript, a2ps }: # Why: @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { --prefix PATH ":" ${ stdenv.lib.makeBinPath [ coreutils gnused file ghostscript a2ps ] } ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Brother MFC-J6510DW LPR driver"; downloadPage = "http://support.brother.com/g/b/downloadlist.aspx?c=us&lang=en&prod=mfcj6510dw_all&os=128"; homepage = "http://www.brother.com/"; diff --git a/pkgs/misc/cups/drivers/samsung/1.00.36/default.nix b/pkgs/misc/cups/drivers/samsung/1.00.36/default.nix index 4088ce700de2..f346b6e3c40d 100644 --- a/pkgs/misc/cups/drivers/samsung/1.00.36/default.nix +++ b/pkgs/misc/cups/drivers/samsung/1.00.36/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cups, libusb-compat-0_1, libxml2, perl }: +{ lib, stdenv, fetchurl, cups, libusb-compat-0_1, libxml2, perl }: let @@ -102,7 +102,7 @@ in stdenv.mkDerivation rec { # we did this in prefixup already dontPatchELF = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Unified Linux Driver for Samsung printers and scanners"; homepage = "http://www.bchemnet.com/suldr"; downloadPage = "http://www.bchemnet.com/suldr/driver/"; diff --git a/pkgs/misc/cups/drivers/samsung/1.00.37.nix b/pkgs/misc/cups/drivers/samsung/1.00.37.nix index c205560706f6..af022454e42b 100644 --- a/pkgs/misc/cups/drivers/samsung/1.00.37.nix +++ b/pkgs/misc/cups/drivers/samsung/1.00.37.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cups, libusb-compat-0_1, libxml2 }: +{ lib, stdenv, fetchurl, cups, libusb-compat-0_1, libxml2 }: let @@ -85,7 +85,7 @@ in stdenv.mkDerivation rec { # we did this in prefixup already dontPatchELF = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Unified Linux Driver for Samsung printers and scanners"; homepage = "http://www.bchemnet.com/suldr"; downloadPage = "http://www.bchemnet.com/suldr/driver/"; diff --git a/pkgs/misc/cups/drivers/samsung/4.00.39/default.nix b/pkgs/misc/cups/drivers/samsung/4.00.39/default.nix index c3c3613bbda8..9982e7b4282c 100644 --- a/pkgs/misc/cups/drivers/samsung/4.00.39/default.nix +++ b/pkgs/misc/cups/drivers/samsung/4.00.39/default.nix @@ -11,7 +11,7 @@ # } # (This advice was tested on 2010 August 2.) -{ stdenv, fetchurl, cups, gcc, ghostscript, glibc, patchelf }: +{ lib, stdenv, fetchurl, cups, gcc, ghostscript, glibc, patchelf }: # Do not bump lightly! Visit # to see what will break when upgrading. Consider a new versioned attribute. @@ -34,7 +34,7 @@ in stdenv.mkDerivation rec { builder = ./builder.sh; - meta = with stdenv.lib; { + meta = with lib; { description = "Samsung's Linux printing drivers; includes binaries without source code"; homepage = "http://www.samsung.com/"; license = licenses.unfree; diff --git a/pkgs/misc/cups/drivers/samsung/4.01.17.nix b/pkgs/misc/cups/drivers/samsung/4.01.17.nix index 5de93b20cb80..68f2abde7057 100644 --- a/pkgs/misc/cups/drivers/samsung/4.01.17.nix +++ b/pkgs/misc/cups/drivers/samsung/4.01.17.nix @@ -11,7 +11,7 @@ # } # (This advice was tested on the 1st November 2016.) -{ stdenv, fetchurl, cups, libusb-compat-0_1 }: +{ lib, stdenv, fetchurl, cups, libusb-compat-0_1 }: # Do not bump lightly! Visit # to see what will break when upgrading. Consider a new versioned attribute. @@ -72,7 +72,7 @@ in stdenv.mkDerivation rec { cp -r ./* $out/share/cups/model/samsung ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Samsung's Linux printing drivers; includes binaries without source code"; homepage = "http://www.samsung.com/"; license = licenses.unfree; diff --git a/pkgs/misc/cups/drivers/splix/default.nix b/pkgs/misc/cups/drivers/splix/default.nix index c65ca401d60f..1125e7697112 100644 --- a/pkgs/misc/cups/drivers/splix/default.nix +++ b/pkgs/misc/cups/drivers/splix/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchsvn, fetchurl, cups, cups-filters, jbigkit, zlib }: +{ lib, stdenv, fetchsvn, fetchurl, cups, cups-filters, jbigkit, zlib }: let @@ -45,7 +45,7 @@ in stdenv.mkDerivation rec { buildInputs = [ cups zlib jbigkit ]; - meta = with stdenv.lib; { + meta = with lib; { description = "CUPS drivers for SPL (Samsung Printer Language) printers"; homepage = "http://splix.ap2c.org"; license = licenses.gpl2; diff --git a/pkgs/misc/cups/drivers/zj-58/default.nix b/pkgs/misc/cups/drivers/zj-58/default.nix index 67df20df4911..0e2534997e35 100644 --- a/pkgs/misc/cups/drivers/zj-58/default.nix +++ b/pkgs/misc/cups/drivers/zj-58/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, cups}: +{lib, stdenv, fetchFromGitHub, cups}: stdenv.mkDerivation { pname = "cups-zj-58"; @@ -18,7 +18,7 @@ stdenv.mkDerivation { install -D ZJ-58.ppd $out/share/cups/model/zjiang/ZJ-58.ppd ''; - meta = with stdenv.lib; { + meta = with lib; { description = "CUPS filter for thermal printer Zjiang ZJ-58"; homepage = "https://github.com/klirichek/zj-58"; platforms = platforms.linux; diff --git a/pkgs/misc/doge/default.nix b/pkgs/misc/doge/default.nix index 37a3b4be7063..8334444ec4c9 100644 --- a/pkgs/misc/doge/default.nix +++ b/pkgs/misc/doge/default.nix @@ -1,4 +1,4 @@ -{ stdenv , python3Packages }: +{ lib, stdenv , python3Packages }: python3Packages.buildPythonPackage rec { pname = "doge"; @@ -9,7 +9,7 @@ python3Packages.buildPythonPackage rec { sha256 = "0lwdl06lbpnaqqjk8ap9dsags3bzma30z17v0zc7spng1gz8m6xj"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/thiderman/doge"; description = "wow very terminal doge"; license = licenses.mit; diff --git a/pkgs/misc/drivers/epson-201106w/default.nix b/pkgs/misc/drivers/epson-201106w/default.nix index 95eb59f7167c..690a4e4841e7 100644 --- a/pkgs/misc/drivers/epson-201106w/default.nix +++ b/pkgs/misc/drivers/epson-201106w/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, rpmextract, autoreconfHook, file, libjpeg, cups }: +{ lib, stdenv, fetchurl, rpmextract, autoreconfHook, file, libjpeg, cups }: let version = "1.0.1"; @@ -48,7 +48,7 @@ in cp -a README $out/doc/README.driver ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.openprinting.org/driver/epson-201106w"; description = "Epson printer driver (BX535WD, BX630FW, BX635FWD, ME940FW, NX530, NX635, NX635, SX535WD, WorkForce 545, WorkForce 645"; longDescription = '' diff --git a/pkgs/misc/drivers/epson-alc1100/default.nix b/pkgs/misc/drivers/epson-alc1100/default.nix index fe52b104a528..fc467e8a4d2d 100644 --- a/pkgs/misc/drivers/epson-alc1100/default.nix +++ b/pkgs/misc/drivers/epson-alc1100/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cups, pkgsi686Linux, dpkg, psutils, makeWrapper, ghostscript, bash }: +{ lib, stdenv, fetchurl, cups, pkgsi686Linux, dpkg, psutils, makeWrapper, ghostscript, bash }: let version = "1.2-0"; @@ -49,7 +49,7 @@ in --suffix PATH : "\$PATH:${psutils}/bin:${ghostscript}/bin:${bash}/bin:/var/lib/cups/path/bin" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://download.ebz.epson.net/dsc/search/01/search/"; description = "Epson AcuLaser C1100 Driver"; longDescription = '' diff --git a/pkgs/misc/drivers/epson-escpr/default.nix b/pkgs/misc/drivers/epson-escpr/default.nix index d90ef2c91f64..8d8951db249d 100644 --- a/pkgs/misc/drivers/epson-escpr/default.nix +++ b/pkgs/misc/drivers/epson-escpr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cups }: +{ lib, stdenv, fetchurl, cups }: stdenv.mkDerivation { pname = "epson-escpr"; @@ -21,7 +21,7 @@ stdenv.mkDerivation { buildInputs = [ cups ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://download.ebz.epson.net/dsc/search/01/search/"; description = "ESC/P-R Driver (generic driver)"; longDescription = '' diff --git a/pkgs/misc/drivers/epson-escpr2/default.nix b/pkgs/misc/drivers/epson-escpr2/default.nix index afde25ee6b4e..934f00d7492b 100644 --- a/pkgs/misc/drivers/epson-escpr2/default.nix +++ b/pkgs/misc/drivers/epson-escpr2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cups, busybox }: +{ lib, stdenv, fetchurl, cups, busybox }: stdenv.mkDerivation rec { pname = "epson-inkjet-printer-escpr2"; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { cd ${pname}-${version} ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://download.ebz.epson.net/dsc/search/01/search/"; description = "ESC/P-R 2 Driver (generic driver)"; longDescription = '' diff --git a/pkgs/misc/drivers/epson_201207w/default.nix b/pkgs/misc/drivers/epson_201207w/default.nix index 6a9782715d21..6de25dbe678d 100644 --- a/pkgs/misc/drivers/epson_201207w/default.nix +++ b/pkgs/misc/drivers/epson_201207w/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, rpmextract, autoreconfHook, file, libjpeg, cups }: +{ lib, stdenv, fetchurl, rpmextract, autoreconfHook, file, libjpeg, cups }: let version = "1.0.0"; @@ -46,7 +46,7 @@ in cp -a README $out/doc/README.driver ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.openprinting.org/driver/epson-201207w"; description = "Epson printer driver (L110, L210, L300, L350, L355, L550, L555)"; longDescription = '' diff --git a/pkgs/misc/drivers/foo2zjs/default.nix b/pkgs/misc/drivers/foo2zjs/default.nix index 7e1ff01bda05..deea3bd25f50 100644 --- a/pkgs/misc/drivers/foo2zjs/default.nix +++ b/pkgs/misc/drivers/foo2zjs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, foomatic-filters, bc, unzip, ghostscript, systemd, vim, time }: +{ lib, stdenv, fetchurl, foomatic-filters, bc, unzip, ghostscript, systemd, vim, time }: stdenv.mkDerivation rec { name = "foo2zjs-20180519"; @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { cp -v getweb arm2hpdl "$out/bin" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "ZjStream printer drivers"; maintainers = with maintainers; [ diff --git a/pkgs/misc/drivers/gutenprint/default.nix b/pkgs/misc/drivers/gutenprint/default.nix index c7fc859576ba..5957f30327fa 100644 --- a/pkgs/misc/drivers/gutenprint/default.nix +++ b/pkgs/misc/drivers/gutenprint/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { # Testing is very, very long. # doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Ghostscript and cups printer drivers"; homepage = "https://sourceforge.net/projects/gimp-print/"; license = licenses.gpl2; diff --git a/pkgs/misc/drivers/hplip/3.16.11.nix b/pkgs/misc/drivers/hplip/3.16.11.nix index 4b9f47d88f94..c48c5bff4bf3 100644 --- a/pkgs/misc/drivers/hplip/3.16.11.nix +++ b/pkgs/misc/drivers/hplip/3.16.11.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, substituteAll +{ lib, stdenv, fetchurl, substituteAll , pkgconfig , cups, libjpeg, libusb1, python2Packages, sane-backends, dbus, usbutils , net-snmp, openssl, nettools @@ -179,7 +179,7 @@ python2Packages.buildPythonApplication { --replace {/usr,$out}/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Print, scan and fax HP drivers for Linux"; homepage = "http://hplipopensource.com/"; downloadPage = "https://sourceforge.net/projects/hplip/files/hplip/"; diff --git a/pkgs/misc/drivers/hplip/3.18.5.nix b/pkgs/misc/drivers/hplip/3.18.5.nix index 59b3d2b9d634..c7e1f47e2e52 100644 --- a/pkgs/misc/drivers/hplip/3.18.5.nix +++ b/pkgs/misc/drivers/hplip/3.18.5.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, substituteAll +{ lib, stdenv, fetchurl, substituteAll , pkgconfig , cups, zlib, libjpeg, libusb1, python2Packages, sane-backends , dbus, file, ghostscript, usbutils @@ -216,7 +216,7 @@ python2Packages.buildPythonApplication { --replace {/usr,$out}/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Print, scan and fax HP drivers for Linux"; homepage = "https://developers.hp.com/hp-linux-imaging-and-printing"; downloadPage = "https://sourceforge.net/projects/hplip/files/hplip/"; diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index b740f5091fa7..b20797808af5 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, substituteAll +{ lib, stdenv, fetchurl, substituteAll , pkgconfig , cups, zlib, libjpeg, libusb1, python3Packages, sane-backends , dbus, file, ghostscript, usbutils -, net-snmp, openssl, perl, nettools +, net-snmp, openssl, perl, nettools, avahi , bash, coreutils, util-linux # To remove references to gcc-unwrapped , removeReferencesTo, qt5 @@ -13,17 +13,17 @@ let - name = "hplip-${version}"; - version = "3.20.5"; + pname = "hplip"; + version = "3.20.11"; src = fetchurl { - url = "mirror://sourceforge/hplip/${name}.tar.gz"; - sha256 = "004bbd78487b7803cdcf2a96b00de938797227068c4de43ee7ad7d174c4e475a"; + url = "mirror://sourceforge/hplip/${pname}-${version}.tar.gz"; + sha256 = "CxZ1s9jnCaEyX+hj9arOO9NxB3mnPq6Gj3su6aVv2xE="; }; plugin = fetchurl { - url = "https://developers.hp.com/sites/default/files/${name}-plugin.run"; - sha256 = "ff3dedda3158be64b985efbf636890ddda5b271ae1f1fbd788219e1344a9c2e7"; + url = "https://developers.hp.com/sites/default/files/${pname}-${version}-plugin.run"; + sha256 = "r8PoQQFfjdHKySPCFwtDR8Tl6v5Eag9gXpBAp6sCF9Q="; }; hplipState = substituteAll { @@ -50,7 +50,7 @@ assert withPlugin -> builtins.elem hplipArch pluginArches || throw "HPLIP plugin not supported on ${stdenv.hostPlatform.system}"; python3Packages.buildPythonApplication { - inherit name src; + inherit pname version src; format = "other"; buildInputs = [ @@ -65,6 +65,7 @@ python3Packages.buildPythonApplication { openssl perl zlib + avahi ]; nativeBuildInputs = [ @@ -92,6 +93,12 @@ python3Packages.buildPythonApplication { # https://bugs.launchpad.net/hplip/+bug/1788706 # https://bugs.launchpad.net/hplip/+bug/1787289 ./image-processor.patch + + # HPLIP's getSystemPPDs() function relies on searching for PPDs below common FHS + # paths, and hp-setup crashes if none of these paths actually exist (which they + # don't on NixOS). Add the equivalent NixOS path, /var/lib/cups/path/share. + # See: https://github.com/NixOS/nixpkgs/issues/21796 + ./hplip-3.20.11-nixos-cups-ppd-search-path.patch ]; prePatch = '' @@ -233,7 +240,7 @@ python3Packages.buildPythonApplication { "share/hplip" "lib/cups/backend" "lib/cups/filter" python3Packages.python.sitePackages "lib/sane" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Print, scan and fax HP drivers for Linux"; homepage = "https://developers.hp.com/hp-linux-imaging-and-printing"; downloadPage = "https://sourceforge.net/projects/hplip/files/hplip/"; diff --git a/pkgs/misc/drivers/hplip/hplip-3.20.11-nixos-cups-ppd-search-path.patch b/pkgs/misc/drivers/hplip/hplip-3.20.11-nixos-cups-ppd-search-path.patch new file mode 100644 index 000000000000..d26e13dd2d63 --- /dev/null +++ b/pkgs/misc/drivers/hplip/hplip-3.20.11-nixos-cups-ppd-search-path.patch @@ -0,0 +1,24 @@ +From: Bryan Gardiner +Date: Sat, 9 Jan 2021 16:51:20 -0800 +Subject: [PATCH] Add NixOS CUPS PPD search path. + +--- + base/g.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/base/g.py b/base/g.py +index f73e23f..758f339 100644 +--- a/base/g.py ++++ b/base/g.py +@@ -283,7 +283,7 @@ prop.max_message_len = 8192 + prop.max_message_read = 65536 + prop.read_timeout = 90 + +-prop.ppd_search_path = '/usr/share;/usr/local/share;/usr/lib;/usr/local/lib;/usr/libexec;/opt;/usr/lib64' ++prop.ppd_search_path = '/var/lib/cups/path/share;/usr/share;/usr/local/share;/usr/lib;/usr/local/lib;/usr/libexec;/opt;/usr/lib64' + prop.ppd_search_pattern = 'HP-*.ppd.*' + prop.ppd_download_url = 'http://www.linuxprinting.org/ppd-o-matic.cgi' + prop.ppd_file_suffix = '-hpijs.ppd' +-- +2.29.2 + diff --git a/pkgs/misc/drivers/m33-linux/default.nix b/pkgs/misc/drivers/m33-linux/default.nix index cb78bd3498a9..d2ba2685a291 100644 --- a/pkgs/misc/drivers/m33-linux/default.nix +++ b/pkgs/misc/drivers/m33-linux/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation { name = "M33-Linux-2016-06-23"; @@ -15,7 +15,7 @@ stdenv.mkDerivation { install -Dm755 90-micro-3d-local.rules $out/lib/udev/rules.d/90-micro-3d-local.rules ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/donovan6000/M3D-Linux"; description = "A Linux program that can communicate with the Micro 3D printer"; license = licenses.gpl2; diff --git a/pkgs/misc/drivers/moltengamepad/default.nix b/pkgs/misc/drivers/moltengamepad/default.nix index e5b3b5bab228..486e4e96dd41 100644 --- a/pkgs/misc/drivers/moltengamepad/default.nix +++ b/pkgs/misc/drivers/moltengamepad/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, udev }: +{ lib, stdenv, fetchFromGitHub, udev }: stdenv.mkDerivation { pname = "moltengamepad-git"; @@ -28,7 +28,7 @@ stdenv.mkDerivation { sed -i -e '159d;161d;472d;473d;474d;475d' source/eventlists/key_list.cpp ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/jgeumlek/MoltenGamepad"; description = "Flexible Linux input device translator, geared for gamepads"; license = licenses.mit; diff --git a/pkgs/misc/drivers/pentablet-driver/default.nix b/pkgs/misc/drivers/pentablet-driver/default.nix index 2f46d950d584..91564f2db89f 100644 --- a/pkgs/misc/drivers/pentablet-driver/default.nix +++ b/pkgs/misc/drivers/pentablet-driver/default.nix @@ -1,4 +1,4 @@ -{ stdenv, mkDerivation, fetchzip, autoPatchelfHook, libusb1, libX11, libXtst, qtbase, libglvnd }: +{ lib, stdenv, mkDerivation, fetchzip, autoPatchelfHook, libusb1, libX11, libXtst, qtbase, libglvnd }: mkDerivation rec { pname = "pentablet-driver"; @@ -28,7 +28,7 @@ mkDerivation rec { cp config.xml $out/bin/config.xml ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.xp-pen.com/download-46.html"; description = "Driver for XP-PEN Pentablet drawing tablets"; license = licenses.unfree; diff --git a/pkgs/misc/drivers/postscript-lexmark/default.nix b/pkgs/misc/drivers/postscript-lexmark/default.nix index 74b7c68d38e7..ebc6439dd5ca 100644 --- a/pkgs/misc/drivers/postscript-lexmark/default.nix +++ b/pkgs/misc/drivers/postscript-lexmark/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, rpmextract }: +{ lib, stdenv, fetchurl, rpmextract }: let version = "20160218"; in @@ -30,7 +30,7 @@ stdenv.mkDerivation { cp -r opt/OpenPrinting-Lexmark/doc $out/doc ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.openprinting.org/driver/Postscript-Lexmark/"; description = "Lexmark Postscript Drivers"; platforms = platforms.linux; diff --git a/pkgs/misc/drivers/steamcontroller/default.nix b/pkgs/misc/drivers/steamcontroller/default.nix index ca5607b53072..77a2e03d1618 100644 --- a/pkgs/misc/drivers/steamcontroller/default.nix +++ b/pkgs/misc/drivers/steamcontroller/default.nix @@ -21,11 +21,13 @@ buildPythonApplication { ''; buildInputs = [ libusb1 ]; - propagatedBuildInputs = - [ psutil python3Packages.libusb1 ] + propagatedBuildInputs = [ psutil python3Packages.libusb1 ] ++ lib.optionals GyroplotSupport [ pyqtgraph pyside ]; - meta = with stdenv.lib; { + doCheck = false; + pythonImportsCheck = [ "steamcontroller" ]; + + meta = with lib; { description = "A standalone Steam controller driver"; homepage = "https://github.com/ynsta/steamcontroller"; license = licenses.mit; diff --git a/pkgs/misc/drivers/utsushi/default.nix b/pkgs/misc/drivers/utsushi/default.nix index 20701c5cc4df..ae3a083148ba 100644 --- a/pkgs/misc/drivers/utsushi/default.nix +++ b/pkgs/misc/drivers/utsushi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, writeScriptBin, fetchFromGitLab, autoreconfHook, pkg-config +{ lib, stdenv, writeScriptBin, fetchFromGitLab, autoreconfHook, pkg-config , autoconf-archive, libxslt, boost , gtkmm2 , imagemagick, sane-backends , tesseract4, udev, libusb1, gnum4 }: @@ -12,13 +12,13 @@ let ''; in stdenv.mkDerivation rec { pname = "utsushi"; - version = "unstable-2020-11-10"; + version = "unstable-2021-01-01"; src = fetchFromGitLab { owner = pname; repo = pname; - rev = "04700043e2d16062eb8bd27f4efff3024f387d32"; - sha256 = "0rxv5n0985d414i6hwichsn7hybwgwsimpy5s4hmcsvxqcpks4li"; + rev = "1646d7d301f3d2aeb24930696688853fed5f0d43"; + sha256 = "1g9m00qljhlw56h3hgfq67ywf4r92nl37m7x5mxa7ygaxc0dyb14"; }; nativeBuildInputs = [ @@ -77,7 +77,7 @@ in stdenv.mkDerivation rec { doInstallCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "SANE utsushi backend for some Epson scanners"; longDescription = '' ImageScanV3 (aka utsushi) scanner driver. Non-free plugins are not diff --git a/pkgs/misc/drivers/xboxdrv/default.nix b/pkgs/misc/drivers/xboxdrv/default.nix index f7fd59fd9fd1..82678eec1642 100644 --- a/pkgs/misc/drivers/xboxdrv/default.nix +++ b/pkgs/misc/drivers/xboxdrv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, sconsPackages, libX11, pkgconfig +{ lib, stdenv, fetchurl, sconsPackages, libX11, pkgconfig , libusb1, boost, glib, dbus-glib }: let @@ -17,7 +17,7 @@ in stdenv.mkDerivation { buildInputs = [ libX11 libusb1 boost glib dbus-glib ]; dontUseSconsInstall = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://pingus.seul.org/~grumbel/xboxdrv/"; description = "Xbox/Xbox360 (and more) gamepad driver for Linux that works in userspace"; license = licenses.gpl3Plus; diff --git a/pkgs/misc/drivers/xow/default.nix b/pkgs/misc/drivers/xow/default.nix index 785f7f396e9d..309db8908c77 100644 --- a/pkgs/misc/drivers/xow/default.nix +++ b/pkgs/misc/drivers/xow/default.nix @@ -1,4 +1,4 @@ -{ stdenv, cabextract, fetchurl, fetchFromGitHub, libusb1 }: +{ lib, stdenv, cabextract, fetchurl, fetchFromGitHub, libusb1 }: stdenv.mkDerivation rec { pname = "xow"; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cabextract ]; buildInputs = [ libusb1 ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/medusalix/xow"; description = "Linux driver for the Xbox One wireless dongle"; license = licenses.gpl2Plus; diff --git a/pkgs/misc/dumb/default.nix b/pkgs/misc/dumb/default.nix index 829367aa3299..9b733e00f69c 100644 --- a/pkgs/misc/dumb/default.nix +++ b/pkgs/misc/dumb/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchFromGitHub, cmake, allegro, SDL2 }: +{ lib, stdenv, fetchFromGitHub, cmake, allegro, SDL2 }: stdenv.mkDerivation rec { pname = "dumb"; version = "2.0.3"; - enableParallelBuilding = true; + nativeBuildInputs = [ cmake ]; buildInputs = [ allegro SDL2 ]; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { "-DBUILD_EXAMPLES='OFF'" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/kode54/dumb"; description = "Module/tracker based music format parser and player library"; license = licenses.free; # Derivative of GPL diff --git a/pkgs/misc/emulators/atari++/default.nix b/pkgs/misc/emulators/atari++/default.nix index 9d7a477be61d..4758d173e92d 100644 --- a/pkgs/misc/emulators/atari++/default.nix +++ b/pkgs/misc/emulators/atari++/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libSM, libX11, libICE, SDL, alsaLib, gcc-unwrapped, libXext }: +{ lib, stdenv, fetchurl, libSM, libX11, libICE, SDL, alsaLib, gcc-unwrapped, libXext }: stdenv.mkDerivation rec { pname = "atari++"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { patchelf --set-rpath ${stdenv.lib.makeLibraryPath buildInputs} "$out/bin/atari++" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.xl-project.com/"; description = "An enhanced, cycle-accurated Atari emulator"; longDescription = '' diff --git a/pkgs/misc/emulators/attract-mode/default.nix b/pkgs/misc/emulators/attract-mode/default.nix index ac87190b0507..1550f71fb40a 100644 --- a/pkgs/misc/emulators/attract-mode/default.nix +++ b/pkgs/misc/emulators/attract-mode/default.nix @@ -1,5 +1,5 @@ { expat, fetchFromGitHub, ffmpeg_3, fontconfig, freetype, libarchive, libjpeg -, libGLU, libGL, openal, pkgconfig, sfml, stdenv, zlib +, libGLU, libGL, openal, pkgconfig, sfml, lib, stdenv, zlib }: stdenv.mkDerivation rec { @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { expat ffmpeg_3 fontconfig freetype libarchive libjpeg libGLU libGL openal sfml zlib ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A frontend for arcade cabinets and media PCs"; homepage = "http://attractmode.org"; license = licenses.gpl3Plus; diff --git a/pkgs/misc/emulators/caprice32/default.nix b/pkgs/misc/emulators/caprice32/default.nix index 4b2b6208bb40..69002d00f80a 100644 --- a/pkgs/misc/emulators/caprice32/default.nix +++ b/pkgs/misc/emulators/caprice32/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, desktop-file-utils, libpng +{ lib, stdenv, fetchFromGitHub, desktop-file-utils, libpng , pkgconfig, SDL, freetype, zlib }: stdenv.mkDerivation rec { @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { install -Dm644 $out/share/caprice32/resources/freedesktop/caprice32.menu -t $out/etc/xdg/menus/applications-merged/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A complete emulation of CPC464, CPC664 and CPC6128"; homepage = "https://github.com/ColinPitrat/caprice32"; license = licenses.gpl2; diff --git a/pkgs/misc/emulators/ccemux/default.nix b/pkgs/misc/emulators/ccemux/default.nix index 2313a63dc698..96cb9afaf2f8 100644 --- a/pkgs/misc/emulators/ccemux/default.nix +++ b/pkgs/misc/emulators/ccemux/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeDesktopItem, makeWrapper, jre +{ lib, stdenv, fetchurl, makeDesktopItem, makeWrapper, jre , useCCTweaked ? true }: @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A modular ComputerCraft emulator"; homepage = "https://github.com/CCEmuX/CCEmuX"; license = licenses.mit; diff --git a/pkgs/misc/emulators/cdemu/base.nix b/pkgs/misc/emulators/cdemu/base.nix index f493faaac54f..51e6a6ac5c8f 100644 --- a/pkgs/misc/emulators/cdemu/base.nix +++ b/pkgs/misc/emulators/cdemu/base.nix @@ -1,5 +1,5 @@ { pkgName, version, pkgSha256 }: -{ stdenv, fetchurl, cmake, pkgconfig, buildInputs, drvParams ? {} }: +{ lib, stdenv, fetchurl, cmake, pkgconfig, buildInputs, drvParams ? {} }: let name = "${pkgName}-${version}"; in stdenv.mkDerivation ({ inherit name buildInputs; @@ -16,7 +16,7 @@ in stdenv.mkDerivation ({ configurePhase = '' cmake ../${name} -DCMAKE_INSTALL_PREFIX=$out -DCMAKE_BUILD_TYPE=Release -DCMAKE_SKIP_RPATH=ON ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A suite of tools for emulating optical drives and discs"; longDescription = '' CDEmu consists of: diff --git a/pkgs/misc/emulators/cdemu/vhba.nix b/pkgs/misc/emulators/cdemu/vhba.nix index 9723e53a8fdb..17d2f8f5e97a 100644 --- a/pkgs/misc/emulators/cdemu/vhba.nix +++ b/pkgs/misc/emulators/cdemu/vhba.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, kernel }: +{ lib, stdenv, fetchurl, kernel }: stdenv.mkDerivation rec { pname = "vhba"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "pic" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Provides a Virtual (SCSI) HBA"; homepage = "http://cdemu.sourceforge.net/about/vhba/"; platforms = platforms.linux; diff --git a/pkgs/misc/emulators/citra/default.nix b/pkgs/misc/emulators/citra/default.nix index efe4770a7b00..b4afb6bbf975 100644 --- a/pkgs/misc/emulators/citra/default.nix +++ b/pkgs/misc/emulators/citra/default.nix @@ -11,7 +11,6 @@ mkDerivation { sha256 = "0c1zn1f84h4f6n6p0aqz905yvv5qpdmkj2z58yla6bfgbzabfyrj"; }; - enableParallelBuilding = true; nativeBuildInputs = [ cmake ]; buildInputs = [ SDL2 qtbase qtmultimedia boost ]; @@ -22,7 +21,7 @@ mkDerivation { done ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://citra-emu.org"; description = "An open-source emulator for the Nintendo 3DS"; license = licenses.gpl2; diff --git a/pkgs/misc/emulators/craftos-pc/default.nix b/pkgs/misc/emulators/craftos-pc/default.nix index 42fb33051e61..3bc9e0b81cc0 100644 --- a/pkgs/misc/emulators/craftos-pc/default.nix +++ b/pkgs/misc/emulators/craftos-pc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, poco, openssl, SDL2, SDL2_mixer }: +{ lib, stdenv, fetchFromGitHub, poco, openssl, SDL2, SDL2_mixer }: let craftos2-lua = fetchFromGitHub { @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { DESTDIR=$out/bin make install ''; - meta = with stdenv.lib; { + meta = with lib; { description = "An implementation of the CraftOS-PC API written in C++ using SDL"; homepage = "https://www.craftos-pc.cc"; license = licenses.mit; diff --git a/pkgs/misc/emulators/dgen-sdl/default.nix b/pkgs/misc/emulators/dgen-sdl/default.nix index 1eabf5b53b01..4a76ee0df026 100644 --- a/pkgs/misc/emulators/dgen-sdl/default.nix +++ b/pkgs/misc/emulators/dgen-sdl/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , libarchive , doxygen @@ -33,7 +33,7 @@ in stdenv.mkDerivation { "--with-dz80" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://dgen.sourceforge.net/"; description = "Sega Genesis/Mega Drive emulator"; longDescription = '' diff --git a/pkgs/misc/emulators/dolphin-emu/default.nix b/pkgs/misc/emulators/dolphin-emu/default.nix index 65484aab18e4..2b392074a51a 100644 --- a/pkgs/misc/emulators/dolphin-emu/default.nix +++ b/pkgs/misc/emulators/dolphin-emu/default.nix @@ -69,8 +69,6 @@ stdenv.mkDerivation rec { "-DENABLE_LTO=True" ]; - enableParallelBuilding = true; - nativeBuildInputs = [ pkgconfig cmake diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/misc/emulators/dolphin-emu/master.nix index 270ffde38bc9..697492797fcf 100644 --- a/pkgs/misc/emulators/dolphin-emu/master.nix +++ b/pkgs/misc/emulators/dolphin-emu/master.nix @@ -30,7 +30,6 @@ in stdenv.mkDerivation rec { sha256 = "0vv3ahk6zdx2hx5diq4jkhl289wjybqcr4lwinrkfiywb83hcabg"; }; - enableParallelBuilding = true; nativeBuildInputs = [ cmake pkgconfig ] ++ lib.optional stdenv.isLinux wrapQtAppsHook; diff --git a/pkgs/misc/emulators/emu2/default.nix b/pkgs/misc/emulators/emu2/default.nix index fb13b602b6a6..eef361ecd037 100644 --- a/pkgs/misc/emulators/emu2/default.nix +++ b/pkgs/misc/emulators/emu2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "emu2"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/dmsc/emu2/"; description = "A simple text-mode x86 + DOS emulator"; platforms = platforms.linux; diff --git a/pkgs/misc/emulators/emulationstation/default.nix b/pkgs/misc/emulators/emulationstation/default.nix index af83d4b9f34b..10c542c5a6ee 100644 --- a/pkgs/misc/emulators/emulationstation/default.nix +++ b/pkgs/misc/emulators/emulationstation/default.nix @@ -27,8 +27,6 @@ stdenv.mkDerivation { install -D ../emulationstation $out/bin/emulationstation ''; - enableParallelBuilding = true; - meta = { description = "A flexible emulator front-end supporting keyboardless navigation and custom system themes"; homepage = "https://emulationstation.org"; diff --git a/pkgs/misc/emulators/gens-gs/default.nix b/pkgs/misc/emulators/gens-gs/default.nix index a9449808d527..563ea5f46f89 100644 --- a/pkgs/misc/emulators/gens-gs/default.nix +++ b/pkgs/misc/emulators/gens-gs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtk2, SDL, nasm, zlib, libpng, libGLU, libGL }: +{ lib, stdenv, fetchurl, pkgconfig, gtk2, SDL, nasm, zlib, libpng, libGLU, libGL }: stdenv.mkDerivation { name = "gens-gs-7"; @@ -15,7 +15,7 @@ stdenv.mkDerivation { # See http://ubuntuforums.org/showthread.php?p=10535837 NIX_CFLAGS_COMPILE = "-UGTK_DISABLE_DEPRECATED -UGSEAL_ENABLE"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://segaretro.org/Gens/GS"; description = "A Genesis/Mega Drive emulator"; platforms = [ "i686-linux" ]; diff --git a/pkgs/misc/emulators/gxemul/default.nix b/pkgs/misc/emulators/gxemul/default.nix index 8671056d14eb..3149ccaaaac0 100644 --- a/pkgs/misc/emulators/gxemul/default.nix +++ b/pkgs/misc/emulators/gxemul/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "gxemul"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { cp -r ./man $out ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://gavare.se/gxemul/"; description = "Gavare's experimental emulator"; longDescription = '' diff --git a/pkgs/misc/emulators/hatari/default.nix b/pkgs/misc/emulators/hatari/default.nix index 03397bd244cb..267944a8bfc6 100644 --- a/pkgs/misc/emulators/hatari/default.nix +++ b/pkgs/misc/emulators/hatari/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { # For pthread_cancel cmakeFlags = [ "-DCMAKE_EXE_LINKER_FLAGS=-lgcc_s" ]; - buildInputs = [ zlib SDL cmake ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ zlib SDL ]; meta = { homepage = "http://hatari.tuxfamily.org/"; diff --git a/pkgs/misc/emulators/higan/default.nix b/pkgs/misc/emulators/higan/default.nix index e735bdb38eed..88872dd3972b 100644 --- a/pkgs/misc/emulators/higan/default.nix +++ b/pkgs/misc/emulators/higan/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , pkgconfig , libX11, libXv , udev @@ -104,7 +104,7 @@ stdenv.mkDerivation rec { chmod +x $out/bin/higan-init.sh ''; - meta = with stdenv.lib; { + meta = with lib; { description = "An open-source, cycle-accurate multi-system emulator"; longDescription = '' higan is a multi-system game console emulator. The purpose of higan is to diff --git a/pkgs/misc/emulators/kega-fusion/default.nix b/pkgs/misc/emulators/kega-fusion/default.nix index 0b6fb0dea54d..1b00a55fe058 100644 --- a/pkgs/misc/emulators/kega-fusion/default.nix +++ b/pkgs/misc/emulators/kega-fusion/default.nix @@ -68,7 +68,7 @@ in stdenv.mkDerivation { chmod +x "$out/bin/kega-fusion" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Sega SG1000, SC3000, SF7000, Master System, Game Gear, Genesis/Megadrive, SVP, Pico, SegaCD/MegaCD and 32X emulator"; homepage = "https://www.carpeludum.com/kega-fusion/"; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/misc/emulators/lambda-delta/default.nix b/pkgs/misc/emulators/lambda-delta/default.nix index 0668d2db9086..a17a0eadfd5b 100644 --- a/pkgs/misc/emulators/lambda-delta/default.nix +++ b/pkgs/misc/emulators/lambda-delta/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, SDL2 }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, SDL2 }: stdenv.mkDerivation rec { pname = "lambda-delta"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--without-SDL1" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "LMI (Lambda Lisp Machine) emulator"; homepage = "https://github.com/dseagrav/ld"; license = licenses.gpl2; diff --git a/pkgs/misc/emulators/libdsk/default.nix b/pkgs/misc/emulators/libdsk/default.nix index 219875ba6fcb..c0e54e48db32 100644 --- a/pkgs/misc/emulators/libdsk/default.nix +++ b/pkgs/misc/emulators/libdsk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "libdsk"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0s2k9vkrf95pf4ydc6vazb29ysrnhdpcfjnf17lpk4nmlv1j3vyv"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A library for accessing discs and disc image files"; homepage = "http://www.seasip.info/Unix/LibDsk/"; license = licenses.gpl2Plus; diff --git a/pkgs/misc/emulators/mednafen/default.nix b/pkgs/misc/emulators/mednafen/default.nix index cb4b7997383f..693ada8d3c7f 100644 --- a/pkgs/misc/emulators/mednafen/default.nix +++ b/pkgs/misc/emulators/mednafen/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, freeglut, libGLU, libGL, libcdio, libjack2 +{ lib, stdenv, fetchurl, pkgconfig, freeglut, libGLU, libGL, libcdio, libjack2 , libsamplerate, libsndfile, libX11, SDL2, SDL2_net, zlib, alsaLib }: stdenv.mkDerivation rec { @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { mv Documentation $out/share/doc/mednafen ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A portable, CLI-driven, SDL+OpenGL-based, multi-system emulator"; longDescription = '' Mednafen is a portable, utilizing OpenGL and SDL, diff --git a/pkgs/misc/emulators/mednafen/server.nix b/pkgs/misc/emulators/mednafen/server.nix index 9a1edc00452d..065426255549 100644 --- a/pkgs/misc/emulators/mednafen/server.nix +++ b/pkgs/misc/emulators/mednafen/server.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "mednafen-server"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { postInstall = "install -m 644 -Dt $out/share/mednafen-server standard.conf"; - meta = with stdenv.lib; { + meta = with lib; { description = "Netplay server for Mednafen"; homepage = "https://mednafen.github.io/"; license = licenses.gpl2; diff --git a/pkgs/misc/emulators/melonDS/default.nix b/pkgs/misc/emulators/melonDS/default.nix index e5c972e079d4..98754de8d4f0 100644 --- a/pkgs/misc/emulators/melonDS/default.nix +++ b/pkgs/misc/emulators/melonDS/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , mkDerivation , cmake @@ -21,7 +21,6 @@ mkDerivation rec { sha256 = "0m45m1ch0az8l3d3grjbqvi5vvydbffxwka9w3k3qiia50m7fnph"; }; - enableParallelBuilding = true; nativeBuildInputs = [ cmake pkgconfig wrapGAppsHook ]; buildInputs = [ SDL2 @@ -32,7 +31,7 @@ mkDerivation rec { cmakeFlags = [ "-UUNIX_PORTABLE" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://melonds.kuribo64.net/"; description = "Work in progress Nintendo DS emulator"; license = licenses.gpl3Plus; diff --git a/pkgs/misc/emulators/mgba/default.nix b/pkgs/misc/emulators/mgba/default.nix index 9efe47cc250e..a6f59122b64d 100644 --- a/pkgs/misc/emulators/mgba/default.nix +++ b/pkgs/misc/emulators/mgba/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, makeDesktopItem, wrapQtAppsHook, pkgconfig +{ lib, stdenv, fetchFromGitHub, makeDesktopItem, wrapQtAppsHook, pkgconfig , cmake, epoxy, libzip, libelf, libedit, ffmpeg_3, SDL2, imagemagick , qtbase, qtmultimedia, qttools, minizip }: @@ -24,7 +24,6 @@ in stdenv.mkDerivation rec { sha256 = "0nqj4bnn5c2z1bq4bnbw1wznc0wpmq4sy3w8pipd6n6620b9m4qq"; }; - enableParallelBuilding = true; nativeBuildInputs = [ wrapQtAppsHook pkgconfig cmake ]; buildInputs = [ @@ -36,7 +35,7 @@ in stdenv.mkDerivation rec { cp -r ${desktopItem}/share/applications $out/share ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://mgba.io"; description = "A modern GBA emulator with a focus on accuracy"; diff --git a/pkgs/misc/emulators/mupen64plus/default.nix b/pkgs/misc/emulators/mupen64plus/default.nix index 621559627a75..49681aaee942 100644 --- a/pkgs/misc/emulators/mupen64plus/default.nix +++ b/pkgs/misc/emulators/mupen64plus/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, boost, dash, freetype, libpng, pkgconfig, SDL, which, zlib, nasm }: +{lib, stdenv, fetchurl, boost, dash, freetype, libpng, pkgconfig, SDL, which, zlib, nasm }: stdenv.mkDerivation rec { pname = "mupen64plus"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { dash m64p_install.sh DESTDIR="$out" PREFIX="" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A Nintendo 64 Emulator"; license = licenses.gpl2Plus; homepage = "http://www.mupen64plus.org/"; diff --git a/pkgs/misc/emulators/oberon-risc-emu/default.nix b/pkgs/misc/emulators/oberon-risc-emu/default.nix new file mode 100644 index 000000000000..14c213fcc0ae --- /dev/null +++ b/pkgs/misc/emulators/oberon-risc-emu/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, SDL2 }: + +stdenv.mkDerivation { + pname = "oberon-risc-emu"; + version = "unstable-2020-08-18"; + + src = fetchFromGitHub { + owner = "pdewacht"; + repo = "oberon-risc-emu"; + rev = "26c8ac5737c71811803c87ad51f1f0d6e62e71fe"; + sha256 = "1iriix3cfcpbkjb5xjb4ysh592xppgprwzp3b6qhwcx44g7kdvxq"; + }; + + buildInputs = [ SDL2 ]; + + installPhase = '' + mkdir -p $out/bin + mv risc $out/bin + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/pdewacht/oberon-risc-emu/"; + description = "Emulator for the Oberon RISC machine"; + license = licenses.isc; + maintainers = with maintainers; [ siraben ]; + }; +} diff --git a/pkgs/misc/emulators/pcem/default.nix b/pkgs/misc/emulators/pcem/default.nix new file mode 100644 index 000000000000..6e7e3bc6379c --- /dev/null +++ b/pkgs/misc/emulators/pcem/default.nix @@ -0,0 +1,29 @@ +{ stdenv, lib, fetchzip, wxGTK31, coreutils, SDL2, openal, alsaLib, pkg-config +, autoreconfHook, withNetworking ? true, withALSA ? true }: + +stdenv.mkDerivation rec { + pname = "pcem"; + version = "17"; + + src = fetchzip { + url = "https://pcem-emulator.co.uk/files/PCemV${version}Linux.tar.gz"; + stripRoot = false; + sha256 = "067pbnc15h6a4pnnym82klr1w8qwfm6p0pkx93gx06wvwqsxvbdv"; + }; + + nativeBuildInputs = [ autoreconfHook pkg-config ]; + buildInputs = [ wxGTK31 coreutils SDL2 openal ] + ++ lib.optional withALSA alsaLib; + + configureFlags = [ "--enable-release-build" ] + ++ lib.optional withNetworking "--enable-networking" + ++ lib.optional withALSA "--enable-alsa"; + + meta = with lib; { + description = "Emulator for IBM PC computers and clones"; + homepage = "https://pcem-emulator.co.uk/"; + license = licenses.gpl2Only; + maintainers = [ maintainers.terin ]; + platforms = platforms.linux ++ platforms.windows; + }; +} diff --git a/pkgs/misc/emulators/pcsx2/default.nix b/pkgs/misc/emulators/pcsx2/default.nix index 5bbf70004abe..a71ccb46b998 100644 --- a/pkgs/misc/emulators/pcsx2/default.nix +++ b/pkgs/misc/emulators/pcsx2/default.nix @@ -19,7 +19,7 @@ , portaudio , SDL2 , soundtouch -, stdenv +, lib, stdenv , udev , wrapGAppsHook , wxGTK @@ -91,7 +91,7 @@ stdenv.mkDerivation { zlib ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Playstation 2 emulator"; longDescription= '' PCSX2 is an open-source PlayStation 2 (AKA PS2) emulator. Its purpose diff --git a/pkgs/misc/emulators/pcsxr/default.nix b/pkgs/misc/emulators/pcsxr/default.nix index ae608f563128..47a87dcca0b5 100644 --- a/pkgs/misc/emulators/pcsxr/default.nix +++ b/pkgs/misc/emulators/pcsxr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, intltool, pkgconfig, gtk3, SDL2, xorg +{ lib, stdenv, fetchurl, autoreconfHook, intltool, pkgconfig, gtk3, SDL2, xorg , wrapGAppsHook, libcdio, nasm, ffmpeg, file , fetchpatch }: @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { "$out/share/doc/${pname}-${version}" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Playstation 1 emulator"; homepage = "https://pcsxr.codeplex.com/"; maintainers = with maintainers; [ rardiol ]; diff --git a/pkgs/misc/emulators/qmc2/default.nix b/pkgs/misc/emulators/qmc2/default.nix index 5a813c5d2efe..b38692de2633 100644 --- a/pkgs/misc/emulators/qmc2/default.nix +++ b/pkgs/misc/emulators/qmc2/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl, qttools, pkgconfig , minizip, zlib , qtbase, qtsvg, qtmultimedia, qtwebkit, qttranslations, qtxmlpatterns @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { "DATADIR=/share/" "SYSCONFDIR=/etc" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A Qt frontend for MAME/MESS"; homepage = "https://qmc2.batcom-it.net"; license = licenses.gpl2; diff --git a/pkgs/misc/emulators/reicast/default.nix b/pkgs/misc/emulators/reicast/default.nix index c9dff7217d2f..8c0bc30d4384 100644 --- a/pkgs/misc/emulators/reicast/default.nix +++ b/pkgs/misc/emulators/reicast/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , cmake , pkg-config @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://reicast.com/"; description = "A multi-platform Sega Dreamcast emulator"; license = with licenses; [ bsd3 gpl2Only lgpl2Only ]; diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/pkgs/misc/emulators/retroarch/cores.nix index 2b9cb5e6d27e..657715778960 100644 --- a/pkgs/misc/emulators/retroarch/cores.nix +++ b/pkgs/misc/emulators/retroarch/cores.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, fetchFromGitHub, fetchFromGitLab, fetchpatch, cmake, pkgconfig, makeWrapper, python27, python37, retroarch +{ lib, stdenv, fetchgit, fetchFromGitHub, fetchFromGitLab, fetchpatch, cmake, pkgconfig, makeWrapper, python27, python37, retroarch , alsaLib, fluidsynth, curl, hidapi, libGLU, gettext, glib, gtk2, portaudio, SDL, SDL_net, SDL2, SDL2_image, libGL , ffmpeg_3, pcre, libevdev, libpng, libjpeg, libzip, udev, libvorbis, snappy, which, hexdump , miniupnpc, sfml, xorg, zlib, nasm, libpcap, boost, icu, openssl @@ -41,14 +41,12 @@ let --add-flags "-L $COREDIR/${d2u core}_libretro${stdenv.hostPlatform.extensions.sharedLibrary} $@" ''; - enableParallelBuilding = true; - passthru = { inherit (a) core; libretroCore = "/lib/retroarch/cores"; }; - meta = with stdenv.lib; { + meta = with lib; { inherit (a) description license; broken = a.broken or false; homepage = "https://www.libretro.com/"; diff --git a/pkgs/misc/emulators/retrofe/default.nix b/pkgs/misc/emulators/retrofe/default.nix index d2c904723b1e..f69505b65f12 100644 --- a/pkgs/misc/emulators/retrofe/default.nix +++ b/pkgs/misc/emulators/retrofe/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchhg, cmake, glib, gst_all_1, makeWrapper, pkgconfig +{ lib, stdenv, fetchhg, cmake, glib, gst_all_1, makeWrapper, pkgconfig , python, SDL2, SDL2_image, SDL2_mixer, SDL2_ttf, sqlite, zlib, runtimeShell }: @@ -68,7 +68,7 @@ stdenv.mkDerivation { --run 'export RETROFE_PATH=''${RETROFE_PATH:-$PWD}' ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A frontend for arcade cabinets and media PCs"; homepage = "http://retrofe.com"; license = licenses.gpl3Plus; diff --git a/pkgs/misc/emulators/rpcs3/default.nix b/pkgs/misc/emulators/rpcs3/default.nix index c672a9bf6bbd..4ed6852c17e8 100644 --- a/pkgs/misc/emulators/rpcs3/default.nix +++ b/pkgs/misc/emulators/rpcs3/default.nix @@ -44,12 +44,10 @@ mkDerivation { ++ lib.optional alsaSupport alsaLib ++ lib.optional waylandSupport wayland; - enableParallelBuilding = true; - meta = with lib; { description = "PS3 emulator/debugger"; homepage = "https://rpcs3.net/"; - maintainers = with maintainers; [ abbradar neonfuz nocent ]; + maintainers = with maintainers; [ abbradar neonfuz ilian ]; license = licenses.gpl2; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/misc/emulators/ruffle/default.nix b/pkgs/misc/emulators/ruffle/default.nix index f3518a647fa1..b817716075cc 100644 --- a/pkgs/misc/emulators/ruffle/default.nix +++ b/pkgs/misc/emulators/ruffle/default.nix @@ -4,7 +4,7 @@ , pkg-config , python3 , rustPlatform -, stdenv +, lib, stdenv , wayland , xorg }: @@ -39,7 +39,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "05kwfcbzjyyfhiqklhhlv06pinzw9bry4j8l9lk3k04c1q30gzkw"; - meta = with stdenv.lib; { + meta = with lib; { description = "An Adobe Flash Player emulator written in the Rust programming language."; homepage = "https://ruffle.rs/"; license = with licenses; [ mit asl20 ]; diff --git a/pkgs/misc/emulators/ryujinx/default.nix b/pkgs/misc/emulators/ryujinx/default.nix index 0e6784e69eab..b7259a3deb32 100644 --- a/pkgs/misc/emulators/ryujinx/default.nix +++ b/pkgs/misc/emulators/ryujinx/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchurl, makeWrapper, makeDesktopItem, linkFarmFromDrvs +{ lib, stdenv, fetchFromGitHub, fetchurl, makeWrapper, makeDesktopItem, linkFarmFromDrvs , dotnet-sdk_3, dotnetPackages, dotnetCorePackages , SDL2, libX11, openal , gtk3, gobject-introspection, wrapGAppsHook @@ -96,7 +96,7 @@ in stdenv.mkDerivation rec { # Strip breaks the executable. dontStrip = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Experimental Nintendo Switch Emulator written in C#"; homepage = "https://ryujinx.org/"; license = licenses.mit; diff --git a/pkgs/misc/emulators/sameboy/default.nix b/pkgs/misc/emulators/sameboy/default.nix index e90cc5a00f50..d23129eba7e5 100644 --- a/pkgs/misc/emulators/sameboy/default.nix +++ b/pkgs/misc/emulators/sameboy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gtk3, rgbds, SDL2, wrapGAppsHook, glib }: +{ lib, stdenv, fetchFromGitHub, gtk3, rgbds, SDL2, wrapGAppsHook, glib }: stdenv.mkDerivation rec { pname = "sameboy"; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { popd ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://sameboy.github.io"; description = "Game Boy, Game Boy Color, and Super Game Boy emulator"; diff --git a/pkgs/misc/emulators/simh/default.nix b/pkgs/misc/emulators/simh/default.nix index 50e02a8f2403..08068debeefc 100644 --- a/pkgs/misc/emulators/simh/default.nix +++ b/pkgs/misc/emulators/simh/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , SDL2 , SDL2_ttf @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { (cd $out/bin; for i in *; do ln -s $i simh-$i; done) ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://simh.trailing-edge.com/"; description = "A collection of simulators of historic hardware"; longDescription = '' diff --git a/pkgs/misc/emulators/simplenes/default.nix b/pkgs/misc/emulators/simplenes/default.nix index d4805a62d761..d073098507ee 100644 --- a/pkgs/misc/emulators/simplenes/default.nix +++ b/pkgs/misc/emulators/simplenes/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , cmake , sfml @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { cp ./SimpleNES $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/amhndu/SimpleNES"; description = "An NES emulator written in C++"; license = licenses.gpl3; diff --git a/pkgs/misc/emulators/snes9x-gtk/default.nix b/pkgs/misc/emulators/snes9x-gtk/default.nix index f33af245f710..254c4a329e54 100644 --- a/pkgs/misc/emulators/snes9x-gtk/default.nix +++ b/pkgs/misc/emulators/snes9x-gtk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, wrapGAppsHook +{ lib, stdenv, fetchFromGitHub, meson, ninja, pkgconfig, wrapGAppsHook , SDL2, zlib, gtk3, libxml2, libXv, epoxy, minizip, pulseaudio, portaudio }: stdenv.mkDerivation rec { @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { preConfigure = "cd gtk"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.snes9x.com"; description = "Super Nintendo Entertainment System (SNES) emulator"; diff --git a/pkgs/misc/emulators/tilem/default.nix b/pkgs/misc/emulators/tilem/default.nix index 8a6c5075c9b3..4c51759e71e8 100644 --- a/pkgs/misc/emulators/tilem/default.nix +++ b/pkgs/misc/emulators/tilem/default.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ glib gnome2.gtk libticonv libtifiles2 libticables2 libticalcs2 ]; NIX_CFLAGS_COMPILE = [ "-lm" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://lpg.ticalc.org/prj_tilem/"; description = "Emulator and debugger for Texas Instruments Z80-based graphing calculators"; license = licenses.gpl3Plus; diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/misc/emulators/wine/base.nix index d8655e558bd6..6d164fd27bf5 100644 --- a/pkgs/misc/emulators/wine/base.nix +++ b/pkgs/misc/emulators/wine/base.nix @@ -99,14 +99,6 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) { # elements specified above. dontPatchELF = true; - # Disable stripping to avoid breaking placeholder DLLs/EXEs. - # Symptoms of broken placeholders are: when the wineprefix is created - # drive_c/windows/system32 will only contain a few files instead of - # hundreds, there will be an error about winemenubuilder and MountMgr - # on startup of Wine, and the Drives tab in winecfg will show an error. - # TODO: binutils 2.34 contains a fix for this bug, re-enable stripping once available. - dontStrip = true; - ## FIXME # Add capability to ignore known failing tests # and enable doCheck diff --git a/pkgs/misc/emulators/wine/vkd3d.nix b/pkgs/misc/emulators/wine/vkd3d.nix index 91bef28559d5..303d33df217d 100644 --- a/pkgs/misc/emulators/wine/vkd3d.nix +++ b/pkgs/misc/emulators/wine/vkd3d.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, vulkan-headers, spirv-headers, vulkan-loader }: +{ lib, stdenv, fetchurl, vulkan-headers, spirv-headers, vulkan-loader }: #TODO: MoltenVK #TODO: unstable @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A 3d library build on top on Vulkan with a similar api to DirectX 12"; homepage = "https://source.winehq.org/git/vkd3d.git"; license = licenses.lgpl21; diff --git a/pkgs/misc/emulators/yabause/default.nix b/pkgs/misc/emulators/yabause/default.nix index 584a7b47dc70..80ddc32ac6cf 100644 --- a/pkgs/misc/emulators/yabause/default.nix +++ b/pkgs/misc/emulators/yabause/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, stdenv, fetchurl, cmake, pkgconfig, qtbase, qt5, libGLU, libGL +{ mkDerivation, lib, stdenv, fetchurl, cmake, pkgconfig, qtbase, qt5, libGLU, libGL , freeglut ? null, openal ? null, SDL2 ? null }: mkDerivation rec { @@ -26,7 +26,7 @@ mkDerivation rec { "-DYAB_PORTS=qt" ] ; - meta = with stdenv.lib; { + meta = with lib; { description = "An open-source Sega Saturn emulator"; homepage = "https://yabause.org/"; license = licenses.gpl2Plus; diff --git a/pkgs/misc/emulators/yuzu/default.nix b/pkgs/misc/emulators/yuzu/default.nix index 3c643822c16e..ae151f96ed36 100644 --- a/pkgs/misc/emulators/yuzu/default.nix +++ b/pkgs/misc/emulators/yuzu/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , cmake, pkgconfig, wrapQtAppsHook , boost173, catch2, fmt, lz4, nlohmann_json, rapidjson, zlib, zstd, SDL2 , udev, libusb1, libzip, qtbase, qtwebengine, qttools, ffmpeg @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/yuzu-cmd --prefix LD_LIBRARY_PATH : ${vulkan-loader}/lib ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://yuzu-emu.org"; description = "An experimental Nintendo Switch emulator written in C++"; license = with licenses; [ diff --git a/pkgs/misc/gnuk/generic.nix b/pkgs/misc/gnuk/generic.nix index c7bbb3b530d7..8ed186e1ed61 100644 --- a/pkgs/misc/gnuk/generic.nix +++ b/pkgs/misc/gnuk/generic.nix @@ -1,4 +1,4 @@ -{ stdenv, gcc-arm-embedded, binutils-arm-embedded, makeWrapper +{ lib, stdenv, gcc-arm-embedded, binutils-arm-embedded, makeWrapper , python, pythonPackages # Extra options @@ -43,7 +43,7 @@ stdenv.mkDerivation { chmod +x $out/bin/{unlock,flash} ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.fsij.org/pages/gnuk"; description = "An implementation of USB cryptographic token for gpg"; license = licenses.gpl3; diff --git a/pkgs/misc/hdt/default.nix b/pkgs/misc/hdt/default.nix index a8cf5c5d4d35..a01668e138f4 100644 --- a/pkgs/misc/hdt/default.nix +++ b/pkgs/misc/hdt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, libtool, pkgconfig, zlib, serd }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, libtool, pkgconfig, zlib, serd }: stdenv.mkDerivation rec { pname = "hdt"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with 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; diff --git a/pkgs/misc/jackaudio/jack1.nix b/pkgs/misc/jackaudio/jack1.nix index 2b5d0d960caf..2a5bf806d0f3 100644 --- a/pkgs/misc/jackaudio/jack1.nix +++ b/pkgs/misc/jackaudio/jack1.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig +{ lib, stdenv, fetchurl, pkgconfig # Optional Dependencies , alsaLib ? null, db ? null, libuuid ? null, libffado ? null, celt ? null @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { buildInputs = [ optAlsaLib optDb optLibffado optCelt ]; propagatedBuildInputs = [ optLibuuid ]; - meta = with stdenv.lib; { + meta = with lib; { description = "JACK audio connection kit"; homepage = "https://jackaudio.org"; license = with licenses; [ gpl2 lgpl21 ]; diff --git a/pkgs/misc/lguf-brightness/default.nix b/pkgs/misc/lguf-brightness/default.nix index 02ce011c59df..efdc8e151482 100644 --- a/pkgs/misc/lguf-brightness/default.nix +++ b/pkgs/misc/lguf-brightness/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, libusb1, ncurses5 }: +{ lib, stdenv, fetchFromGitHub, cmake, libusb1, ncurses5 }: stdenv.mkDerivation rec { pname = "lguf-brightness"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { install -D lguf_brightness $out/bin/lguf_brightness ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Adjust brightness for LG UltraFine 4K display (cross platform)"; homepage = "https://github.com/periklis/lguf-brightness"; license = licenses.lgpl21Plus; diff --git a/pkgs/misc/lightspark/default.nix b/pkgs/misc/lightspark/default.nix index 86177892f431..bd33997d09af 100644 --- a/pkgs/misc/lightspark/default.nix +++ b/pkgs/misc/lightspark/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, cmake, curl, zlib, ffmpeg_3, glew, pcre +{ lib, stdenv, fetchFromGitHub, pkgconfig, cmake, curl, zlib, ffmpeg_3, glew, pcre , rtmpdump, cairo, boost, SDL2, SDL2_mixer, libjpeg, pango, lzma, nasm , llvm, glibmm }: @@ -25,9 +25,7 @@ stdenv.mkDerivation rec { pango lzma nasm llvm glibmm ]; - enableParallelBuilding = true; - - meta = with stdenv.lib; { + meta = with lib; { description = "Open source Flash Player implementation"; homepage = "https://lightspark.github.io/"; license = licenses.lgpl3; diff --git a/pkgs/misc/lilypond/fonts.nix b/pkgs/misc/lilypond/fonts.nix index deeedf679954..ca87db757cc0 100644 --- a/pkgs/misc/lilypond/fonts.nix +++ b/pkgs/misc/lilypond/fonts.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, lilypond }: +{ lib, stdenv, fetchFromGitHub, lilypond }: let @@ -29,7 +29,7 @@ let done ''; - meta = with stdenv.lib; { + meta = with lib; { inherit (lilypond.meta) homepage platforms; description = "${fontName} font for LilyPond"; license = licenses.ofl; diff --git a/pkgs/misc/logging/beats/6.x.nix b/pkgs/misc/logging/beats/6.x.nix index 2d01ea622612..7196202dba4a 100644 --- a/pkgs/misc/logging/beats/6.x.nix +++ b/pkgs/misc/logging/beats/6.x.nix @@ -15,7 +15,7 @@ let beat = package : extraArgs : buildGoPackage (rec { subPackages = [ package ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.elastic.co/products/beats"; license = licenses.asl20; maintainers = with maintainers; [ fadenb basvandijk ]; diff --git a/pkgs/misc/logging/beats/7.x.nix b/pkgs/misc/logging/beats/7.x.nix index 465051d3726e..9e524e6a5e6c 100644 --- a/pkgs/misc/logging/beats/7.x.nix +++ b/pkgs/misc/logging/beats/7.x.nix @@ -15,7 +15,7 @@ let beat = package : extraArgs : buildGoPackage (rec { subPackages = [ package ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.elastic.co/products/beats"; license = licenses.asl20; maintainers = with maintainers; [ fadenb basvandijk ]; diff --git a/pkgs/misc/mxt-app/default.nix b/pkgs/misc/mxt-app/default.nix index 96d1c17fb294..099300634e8c 100644 --- a/pkgs/misc/mxt-app/default.nix +++ b/pkgs/misc/mxt-app/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, libtool }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, libtool }: stdenv.mkDerivation rec { version="1.32"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "fortify" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Command line utility for Atmel maXTouch devices"; homepage = "https://github.com/atmel-maxtouch/mxt-app"; license = licenses.bsd2; diff --git a/pkgs/misc/my-env/default.nix b/pkgs/misc/my-env/default.nix index fb8de9b6a71f..8a35525b3e82 100644 --- a/pkgs/misc/my-env/default.nix +++ b/pkgs/misc/my-env/default.nix @@ -6,15 +6,15 @@ packageOverrides = pkgs : with pkgs; { sdlEnv = pkgs.myEnvFun { name = "sdl"; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ stdenv SDL SDL_image SDL_ttf SDL_gfx cmake SDL_net]; + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ stdenv SDL SDL_image SDL_ttf SDL_gfx SDL_net]; }; }; } - # Then you can install it by: + # Then you can install it by: # $ nix-env -i env-sdl - # And you can load it simply calling: + # And you can load it simply calling: # $ load-env-sdl # and this will update your env vars to have 'make' and 'gcc' finding the SDL # headers and libs. @@ -29,7 +29,7 @@ let complicatedMyEnv = { name, buildInputs ? [], cTags ? [], extraCmds ? ""}: pkgs.myEnvFun { inherit name; - buildInputs = buildInputs + buildInputs = buildInputs ++ map (x : sourceWithTagsDerivation ( (addCTaggingInfo x ).passthru.sourceWithTags ) ) cTags; extraCmds = '' diff --git a/pkgs/misc/ptouch-print/default.nix b/pkgs/misc/ptouch-print/default.nix index ac15ec633097..f9889cfe4bef 100644 --- a/pkgs/misc/ptouch-print/default.nix +++ b/pkgs/misc/ptouch-print/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchgit , autoreconfHook , gd @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { libusb1 ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Command line tool to print labels on Brother P-Touch printers on Linux"; license = licenses.gpl3Plus; homepage = "https://mockmoon-cybernetics.ch/computer/p-touch2430pc/"; diff --git a/pkgs/misc/rkdeveloptool/default.nix b/pkgs/misc/rkdeveloptool/default.nix index 8ce4fd8e14c7..f149072a7bba 100644 --- a/pkgs/misc/rkdeveloptool/default.nix +++ b/pkgs/misc/rkdeveloptool/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libusb1 }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libusb1 }: stdenv.mkDerivation { pname = "rkdeveloptool"; @@ -15,7 +15,7 @@ stdenv.mkDerivation { buildInputs = [ libusb1 ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/rockchip-linux/rkdeveloptool"; description = "A tool from Rockchip to communicate with Rockusb devices"; license = licenses.gpl2; diff --git a/pkgs/misc/sailsd/default.nix b/pkgs/misc/sailsd/default.nix index 0dca07010980..2c67853ae317 100644 --- a/pkgs/misc/sailsd/default.nix +++ b/pkgs/misc/sailsd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, jansson }: +{ lib, stdenv, fetchFromGitHub, pkgconfig, jansson }: let libsailing = fetchFromGitHub { @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { --replace gcc cc ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Simulator daemon for autonomous sailing boats"; homepage = "https://github.com/sails-simulator/sailsd"; license = licenses.gpl3; diff --git a/pkgs/misc/scrcpy/default.nix b/pkgs/misc/scrcpy/default.nix index adebcbd633db..0e0769f35de5 100644 --- a/pkgs/misc/scrcpy/default.nix +++ b/pkgs/misc/scrcpy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub, makeWrapper +{ lib, stdenv, fetchurl, fetchFromGitHub, makeWrapper , meson , ninja , pkg-config @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { wrapProgram "$out/bin/scrcpy" --prefix PATH : "${platform-tools}/bin" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Display and control Android devices over USB or TCP/IP"; homepage = "https://github.com/Genymobile/scrcpy"; license = licenses.asl20; diff --git a/pkgs/misc/screensavers/alock/default.nix b/pkgs/misc/screensavers/alock/default.nix index c9340b2503e8..345745457505 100644 --- a/pkgs/misc/screensavers/alock/default.nix +++ b/pkgs/misc/screensavers/alock/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, pkgconfig, autoreconfHook +{ lib, stdenv, fetchgit, pkgconfig, autoreconfHook , libX11, pam, libgcrypt, libXrender, imlib2 }: stdenv.mkDerivation rec { @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { pam libgcrypt libXrender imlib2 ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/Arkq/alock"; description = "Simple screen lock application for X server"; longDescription = '' diff --git a/pkgs/misc/screensavers/betterlockscreen/default.nix b/pkgs/misc/screensavers/betterlockscreen/default.nix index f090156a85c0..a62aeda9f506 100644 --- a/pkgs/misc/screensavers/betterlockscreen/default.nix +++ b/pkgs/misc/screensavers/betterlockscreen/default.nix @@ -1,5 +1,5 @@ { - stdenv, makeWrapper, fetchFromGitHub, + lib, stdenv, makeWrapper, fetchFromGitHub, imagemagick, i3lock-color, xdpyinfo, xrandr, bc, feh, procps, xrdb }: @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { wrapProgram "$out/bin/betterlockscreen" --prefix PATH : "$out/bin:${PATH}" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A simple minimal lock screen which allows you to cache images with different filters and lockscreen with blazing speed"; homepage = "https://github.com/pavanjadhaw/betterlockscreen"; license = licenses.mit; diff --git a/pkgs/misc/screensavers/electricsheep/default.nix b/pkgs/misc/screensavers/electricsheep/default.nix index 0d772da67905..b9aa08728395 100644 --- a/pkgs/misc/screensavers/electricsheep/default.nix +++ b/pkgs/misc/screensavers/electricsheep/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, wxGTK30, libav, lua5_1, curl +{ lib, stdenv, fetchFromGitHub, autoreconfHook, wxGTK30, libav, lua5_1, curl , libpng, xorg, pkgconfig, flam3, libgtop, boost, tinyxml, freeglut, libGLU, libGL , glee }: @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { sed -i "s|/usr|$out|" Makefile ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Electric Sheep, a distributed screen saver for evolving artificial organisms"; homepage = "https://electricsheep.org/"; maintainers = with maintainers; [ nand0p fpletz ]; diff --git a/pkgs/misc/screensavers/i3lock-pixeled/default.nix b/pkgs/misc/screensavers/i3lock-pixeled/default.nix index 39497917755f..cb7a2fd1e184 100644 --- a/pkgs/misc/screensavers/i3lock-pixeled/default.nix +++ b/pkgs/misc/screensavers/i3lock-pixeled/default.nix @@ -1,4 +1,4 @@ -{ stdenv, i3lock, imagemagick, scrot, playerctl, fetchFromGitLab }: +{ lib, stdenv, i3lock, imagemagick, scrot, playerctl, fetchFromGitLab }: stdenv.mkDerivation rec { pname = "i3lock-pixeled"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { --replace playerctl "${playerctl}/bin/playerctl" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Simple i3lock helper which pixels a screenshot by scaling it down and up to get a pixeled version of the screen when the lock is active"; homepage = "https://gitlab.com/Ma27/i3lock-pixeled"; license = licenses.mit; diff --git a/pkgs/misc/screensavers/light-locker/default.nix b/pkgs/misc/screensavers/light-locker/default.nix index c4915bec8959..0853a25a3eb1 100644 --- a/pkgs/misc/screensavers/light-locker/default.nix +++ b/pkgs/misc/screensavers/light-locker/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , nix-update-script , meson @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/the-cavalry/light-locker"; description = "A simple session-locker for LightDM"; longDescription = '' diff --git a/pkgs/misc/screensavers/multilockscreen/default.nix b/pkgs/misc/screensavers/multilockscreen/default.nix index 3fa6dbc725e9..4d4e7609d936 100644 --- a/pkgs/misc/screensavers/multilockscreen/default.nix +++ b/pkgs/misc/screensavers/multilockscreen/default.nix @@ -1,5 +1,5 @@ { - stdenv, makeWrapper, fetchFromGitHub, writeShellScriptBin, + lib, stdenv, makeWrapper, fetchFromGitHub, writeShellScriptBin, imagemagick, i3lock-color, xdpyinfo, xrandr, bc, feh, procps, xrdb, xset, gnused, gnugrep, coreutils }: @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { wrapProgram "$out/bin/multilockscreen" --prefix PATH : "${binPath}" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Wrapper script for i3lock-color"; longDescription = '' multilockscreen is a wrapper script for i3lock-color. diff --git a/pkgs/misc/screensavers/physlock/default.nix b/pkgs/misc/screensavers/physlock/default.nix index c27ac344e055..d25a777e650b 100644 --- a/pkgs/misc/screensavers/physlock/default.nix +++ b/pkgs/misc/screensavers/physlock/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pam, systemd }: +{ lib, stdenv, fetchFromGitHub, pam, systemd }: stdenv.mkDerivation rec { version = "v13"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" "SESSION=systemd" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A secure suspend/hibernate-friendly alternative to `vlock -an`"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/misc/screensavers/pipes/default.nix b/pkgs/misc/screensavers/pipes/default.nix index 94d6299d3832..a4e40fd77efe 100644 --- a/pkgs/misc/screensavers/pipes/default.nix +++ b/pkgs/misc/screensavers/pipes/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, coreutils, ncurses }: +{ lib, stdenv, fetchurl, makeWrapper, coreutils, ncurses }: stdenv.mkDerivation rec { pname = "pipes"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { --set PATH "${stdenv.lib.makeBinPath [ coreutils ncurses ]}" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/pipeseroni/pipes.sh"; description = "Animated pipes terminal screensaver"; license = licenses.mit; diff --git a/pkgs/misc/screensavers/vlock/default.nix b/pkgs/misc/screensavers/vlock/default.nix index 83d82e2b3b34..243d582bdcee 100644 --- a/pkgs/misc/screensavers/vlock/default.nix +++ b/pkgs/misc/screensavers/vlock/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pam }: +{ lib, stdenv, fetchurl, pam }: stdenv.mkDerivation { name = "vlock-2.2.2"; @@ -20,7 +20,7 @@ stdenv.mkDerivation { buildInputs = [ pam ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Virtual console locking program"; license = licenses.gpl2; maintainers = [ maintainers.lethalman ]; diff --git a/pkgs/misc/screensavers/xautolock/default.nix b/pkgs/misc/screensavers/xautolock/default.nix index d46f772e4953..cdb12b554647 100644 --- a/pkgs/misc/screensavers/xautolock/default.nix +++ b/pkgs/misc/screensavers/xautolock/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, xlibsWrapper +{ lib, stdenv, fetchFromGitHub, xlibsWrapper , imake, gccmakedep, libXScrnSaver, xorgproto }: @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { installTargets = [ "install" "install.man" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Launch a given program when your X session has been idle for a given time"; homepage = "http://www.ibiblio.org/pub/linux/X11/screensavers"; maintainers = with maintainers; [ peti ]; diff --git a/pkgs/misc/screensavers/xss-lock/default.nix b/pkgs/misc/screensavers/xss-lock/default.nix index b7b0e27ad46b..c6dafd2a8127 100644 --- a/pkgs/misc/screensavers/xss-lock/default.nix +++ b/pkgs/misc/screensavers/xss-lock/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, docutils, pkgconfig, glib, libpthreadstubs +{ lib, stdenv, fetchFromGitHub, cmake, docutils, pkg-config, glib, libpthreadstubs , libXau, libXdmcp, xcbutil }: stdenv.mkDerivation { @@ -11,11 +11,10 @@ stdenv.mkDerivation { sha256 = "040nqgfh564frvqkrkmak3x3h0yadz6kzk81jkfvd9vd20a9drh7"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake docutils glib libpthreadstubs libXau - libXdmcp xcbutil ]; + nativeBuildInputs = [ cmake pkg-config docutils ]; + buildInputs = [ glib libpthreadstubs libXau libXdmcp xcbutil ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Use external locker (such as i3lock) as X screen saver"; license = licenses.mit; maintainers = with maintainers; [ malyn offline ]; diff --git a/pkgs/misc/seafile-shared/default.nix b/pkgs/misc/seafile-shared/default.nix index 8db6995b6fae..21e2d4516cbe 100644 --- a/pkgs/misc/seafile-shared/default.nix +++ b/pkgs/misc/seafile-shared/default.nix @@ -1,22 +1,38 @@ -{stdenv, fetchFromGitHub, which, autoreconfHook, pkgconfig, vala, python2, curl, libevent, glib, libsearpc, sqlite, intltool, fuse, ccnet, libuuid }: +{ lib, stdenv +, fetchFromGitHub +, autoreconfHook +, ccnet +, curl +, fuse +, glib +, intltool +, libevent +, libsearpc +, libuuid +, pkg-config +, python3 +, sqlite +, vala +, which +}: stdenv.mkDerivation rec { pname = "seafile-shared"; - version = "7.0.9"; + version = "8.0.1"; src = fetchFromGitHub { owner = "haiwen"; repo = "seafile"; - rev = "v${version}"; - sha256 = "1n0jq6d6vgk58qmqgdr7w7jfgcrlicnaafz1za9qf76sbi5vc6fk"; + rev = "d34499a2aafa024623a4210fe7f663cef13fe9a6"; + sha256 = "VKoGr3CTDFg3Q0X+MTlwa4BbfLB+28FeTyTJRCq37RA="; }; nativeBuildInputs = [ autoreconfHook vala - pkgconfig - python2 - python2.pkgs.wrapPython + pkg-config + python3 + python3.pkgs.wrapPython ]; buildInputs = [ @@ -30,10 +46,10 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-server" "--disable-console" + "--with-python3" ]; - pythonPath = with python2.pkgs; [ - future + pythonPath = with python3.pkgs; [ libsearpc ]; @@ -41,7 +57,7 @@ stdenv.mkDerivation rec { wrapPythonPrograms ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/haiwen/seafile"; description = "Shared components of Seafile: seafile-daemon, libseafile, libseafile python bindings, manuals, and icons"; license = licenses.gpl3; diff --git a/pkgs/misc/sndio/default.nix b/pkgs/misc/sndio/default.nix index 34e60b8a4bb7..179148ac3fcf 100644 --- a/pkgs/misc/sndio/default.nix +++ b/pkgs/misc/sndio/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, fixDarwinDylibNames }: +{ lib, stdenv, fetchurl, alsaLib, fixDarwinDylibNames }: stdenv.mkDerivation rec { pname = "sndio"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0ljmac0lnjn61admgbcwjfcr5fwccrsblx9rj9bys8wlhz8f796x"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.sndio.org"; description = "Small audio and MIDI framework part of the OpenBSD project"; license = licenses.isc; diff --git a/pkgs/misc/sound-of-sorting/default.nix b/pkgs/misc/sound-of-sorting/default.nix index 6b660232d52c..6e838803dea0 100644 --- a/pkgs/misc/sound-of-sorting/default.nix +++ b/pkgs/misc/sound-of-sorting/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, SDL2, wxGTK } : +{ lib, stdenv, fetchFromGitHub, SDL2, wxGTK } : stdenv.mkDerivation rec { @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { export SDL_CONFIG=${SDL2.dev}/bin/sdl2-config ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Audibilization and Visualization of Sorting Algorithms"; homepage = "https://panthema.net/2013/sound-of-sorting/"; license = with licenses; gpl3; diff --git a/pkgs/misc/tmux-plugins/default.nix b/pkgs/misc/tmux-plugins/default.nix index 33bff019536c..93e58516610c 100644 --- a/pkgs/misc/tmux-plugins/default.nix +++ b/pkgs/misc/tmux-plugins/default.nix @@ -136,7 +136,7 @@ in rec { rev = "6757a5329948f00addd66b02ea94f61dd94456f5"; sha256 = "0wwwzg3bwcrbr2nmf84prz7k4i79yq0960vs6zjp0x8nqn2fvziy"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://draculatheme.com/tmux"; description = "A feature packed Dracula theme for tmux!"; license = licenses.mit; @@ -213,7 +213,7 @@ in rec { ''; dependencies = [ pkgs.ruby ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/schasse/tmux-jump"; description = "Vimium/Easymotion like navigation for tmux"; license = licenses.gpl3; @@ -290,6 +290,7 @@ in rec { onedark-theme = mkDerivation { pluginName = "onedark-theme"; + rtpFilePath = "tmux-onedark-theme.tmux"; version = "unstable-2020-06-07"; src = fetchFromGitHub { owner = "odedlaz"; @@ -324,6 +325,18 @@ in rec { ''; }; + power-theme = mkDerivation { + pluginName = "power"; + rtpFilePath = "tmux-power.tmux"; + version = "unstable-2020-11-18"; + src = pkgs.fetchFromGitHub { + owner = "wfxr"; + repo = "tmux-power"; + rev = "aec44aa5e00cc39eb71c668b1d73823270058e7d"; + sha256 = "11nm8cylx10d565g17acy0bj12n6dcbxp71zca2bmg0j1dq859cm"; + }; + }; + prefix-highlight = mkDerivation { pluginName = "prefix-highlight"; version = "unstable-2020-03-26"; @@ -429,7 +442,7 @@ in rec { sha256 = "1x58h3bg9d69j40fh8rcjpxvg0i6j04pj8p3jk57l3cghxis5j05"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/jabirali/tmux-tilish"; description = "Plugin which makes tmux work and feel like i3wm"; license = licenses.mit; @@ -509,7 +522,7 @@ in rec { sha256 = "130l73v18md95djkc4s9d0fr018f8f183sjcgy7dgldwdaxlqdi1"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/tmux-plugins/vim-tmux-focus-events"; description = "Makes FocusGained and FocusLost autocommand events work in vim when using tmux"; license = licenses.mit; diff --git a/pkgs/misc/uboot/0001-configs-rpi-allow-for-bigger-kernels.patch b/pkgs/misc/uboot/0001-configs-rpi-allow-for-bigger-kernels.patch new file mode 100644 index 000000000000..3d0324a692cc --- /dev/null +++ b/pkgs/misc/uboot/0001-configs-rpi-allow-for-bigger-kernels.patch @@ -0,0 +1,45 @@ +From 3d0ce353cf62efea11aa88f814aa23bf8c04acc9 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Milan=20P=C3=A4ssler?= +Date: Mon, 11 Jan 2021 15:13:10 +0100 +Subject: [PATCH] configs/rpi: allow for bigger kernels + +--- + include/configs/rpi.h | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +diff --git a/include/configs/rpi.h b/include/configs/rpi.h +index 834f1cd..10ab1e7 100644 +--- a/include/configs/rpi.h ++++ b/include/configs/rpi.h +@@ -153,20 +153,20 @@ + * more than ~700M away from the start of the kernel image but this number can + * be larger OR smaller depending on e.g. the 'vmalloc=xxxM' command line + * parameter given to the kernel. So reserving memory from low to high +- * satisfies this constraint again. Reserving 1M at 0x02600000-0x02700000 for +- * the DTB leaves rest of the free RAM to the initrd starting at 0x02700000. ++ * satisfies this constraint again. Reserving 1M at 0x02e00000-0x02f00000 for ++ * the DTB leaves rest of the free RAM to the initrd starting at 0x02f00000. + * Even with the smallest possible CPU-GPU memory split of the CPU getting +- * only 64M, the remaining 25M starting at 0x02700000 should allow quite +- * large initrds before they start colliding with U-Boot. ++ * only 64M, the remaining 17M starting at 0x02f00000 should allow reasonably ++ * sized initrds before they start colliding with U-Boot. + */ + #define ENV_MEM_LAYOUT_SETTINGS \ + "fdt_high=" FDT_HIGH "\0" \ + "initrd_high=" INITRD_HIGH "\0" \ + "kernel_addr_r=0x00080000\0" \ +- "scriptaddr=0x02400000\0" \ +- "pxefile_addr_r=0x02500000\0" \ +- "fdt_addr_r=0x02600000\0" \ +- "ramdisk_addr_r=0x02700000\0" ++ "scriptaddr=0x02c00000\0" \ ++ "pxefile_addr_r=0x02d00000\0" \ ++ "fdt_addr_r=0x02e00000\0" \ ++ "ramdisk_addr_r=0x02f00000\0" + + #if CONFIG_IS_ENABLED(CMD_MMC) + #define BOOT_TARGET_MMC(func) \ +-- +2.29.2 + diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix index 0a178b398006..20d928d944d8 100644 --- a/pkgs/misc/uboot/default.nix +++ b/pkgs/misc/uboot/default.nix @@ -18,10 +18,10 @@ }: let - defaultVersion = "2020.10"; + defaultVersion = "2021.01"; defaultSrc = fetchurl { url = "ftp://ftp.denx.de/pub/u-boot/u-boot-${defaultVersion}.tar.bz2"; - sha256 = "08m6f1bh4pdcqbxf983qdb66ccd5vak5cbzc114yf3jwq2yinj0d"; + sha256 = "0m04glv9kn3bhs62sn675w60wkrl4m3a4hnbnnw67s3l198y21xl"; }; buildUBoot = { version ? null @@ -40,7 +40,9 @@ let src = if src == null then defaultSrc else src; - patches = extraPatches; + patches = [ + ./0001-configs-rpi-allow-for-bigger-kernels.patch + ] ++ extraPatches; postPatch = '' patchShebangs tools @@ -53,7 +55,10 @@ let dtc flex openssl - (buildPackages.python3.withPackages (p: [ p.libfdt ])) + (buildPackages.python3.withPackages (p: [ + p.libfdt + p.setuptools # for pkg_resources + ])) swig ]; depsBuildBuild = [ buildPackages.stdenv.cc ]; @@ -314,6 +319,18 @@ in { filesToInstall = ["u-boot.bin"]; }; + ubootRaspberryPi4_32bit = buildUBoot { + defconfig = "rpi_4_32b_defconfig"; + extraMeta.platforms = ["armv7l-linux"]; + filesToInstall = ["u-boot.bin"]; + }; + + ubootRaspberryPi4_64bit = buildUBoot { + defconfig = "rpi_4_defconfig"; + extraMeta.platforms = ["aarch64-linux"]; + filesToInstall = ["u-boot.bin"]; + }; + ubootRaspberryPiZero = buildUBoot { defconfig = "rpi_0_w_defconfig"; extraMeta.platforms = ["armv6l-linux"]; diff --git a/pkgs/misc/urbit/default.nix b/pkgs/misc/urbit/default.nix index 031b65a1ef61..97f5edd94b36 100644 --- a/pkgs/misc/urbit/default.nix +++ b/pkgs/misc/urbit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, curl, git, gmp, libsigsegv, meson, ncurses, ninja +{ lib, stdenv, fetchFromGitHub, curl, git, gmp, libsigsegv, meson, ncurses, ninja , openssl, pkgconfig, re2c, zlib }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { patchShebangs . ''; - meta = with stdenv.lib; { + meta = with lib; { description = "An operating function"; homepage = "https://urbit.org"; license = licenses.mit; diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index ccaa9b1ff1b2..35abdcf5421e 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-12-16"; + version = "2021-01-13"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "f996ede5999c99b1b3e3cecc02dbd06cb286d3ff"; - sha256 = "0sdi933zl64j31i72m6hwx6bayrms3j4z3mkwhyb51qy8bg55kpv"; + rev = "97ce2423b04745d5c7588385ddbd75be9ef846d4"; + sha256 = "1q55kd8xqxl43rvj08awyq32a0mrv4svm2932s6q73zb8022db4a"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -87,6 +87,18 @@ let meta.homepage = "https://github.com/vim-scripts/align/"; }; + aniseed = buildVimPluginFrom2Nix { + pname = "aniseed"; + version = "2020-12-21"; + src = fetchFromGitHub { + owner = "Olical"; + repo = "aniseed"; + rev = "50adbc5ed5bb97b73b0b0c3241d9e62621ca59f9"; + sha256 = "1wy5jd86273q7sxa50kv88flqdgmg9z2m4b6phpw3xnl5d1sj9f7"; + }; + meta.homepage = "https://github.com/Olical/aniseed/"; + }; + ansible-vim = buildVimPluginFrom2Nix { pname = "ansible-vim"; version = "2020-10-15"; @@ -137,24 +149,24 @@ let async-vim = buildVimPluginFrom2Nix { pname = "async-vim"; - version = "2020-06-20"; + version = "2020-12-30"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "async.vim"; - rev = "6102020b4690f05ab6509a37fa25bc53e2d799a9"; - sha256 = "1b39nnym8lwdwhpbrbl6438s7ragnfm3n2lbs8acp78jl4jraiwz"; + rev = "236debf1a68d69a74f1f6647c273b0477e1ec1bf"; + sha256 = "12xz71182shfj8l300j7wnngxm5zkx2g1c2d4l6dvbk5z1dbzlj6"; }; meta.homepage = "https://github.com/prabirshrestha/async.vim/"; }; asyncomplete-vim = buildVimPluginFrom2Nix { pname = "asyncomplete-vim"; - version = "2020-11-27"; + version = "2020-12-23"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "asyncomplete.vim"; - rev = "c5f5808581bd3a41ee379836ebf804eb46a189a5"; - sha256 = "1izxr4lx6nncajaiszff3w38qc8c6hrpkd6rj8q7wasqcsxd3fcj"; + rev = "e546095e4ac7a20d06bcf16d207275dd4d6b4115"; + sha256 = "0jq5qrlijlqpfgi89249whvpmm140smflpprlq8as0pfyhpjn1d1"; }; meta.homepage = "https://github.com/prabirshrestha/asyncomplete.vim/"; }; @@ -209,12 +221,12 @@ let awesome-vim-colorschemes = buildVimPluginFrom2Nix { pname = "awesome-vim-colorschemes"; - version = "2020-12-10"; + version = "2021-01-05"; src = fetchFromGitHub { owner = "rafi"; repo = "awesome-vim-colorschemes"; - rev = "d20555a51bb73c58c0a8e627ca118305a0865643"; - sha256 = "0r5x0h90158g5b7ipl4b4jfbxbcs44586aacff1qirrnjwkp27l0"; + rev = "ae48abdd39e24e187dac904c14caf6458b76838c"; + sha256 = "12a31l2ggzihl1m1bjgmpmvw8zlqgvql01ryz1zrrhwmgzk8jk1h"; }; meta.homepage = "https://github.com/rafi/awesome-vim-colorschemes/"; }; @@ -233,12 +245,12 @@ let barbar-nvim = buildVimPluginFrom2Nix { pname = "barbar-nvim"; - version = "2020-12-04"; + version = "2021-01-05"; src = fetchFromGitHub { owner = "romgrk"; repo = "barbar.nvim"; - rev = "f6ad62aadd892b643239f078f991b6af468d1070"; - sha256 = "0sgq05gcdnihsb3k38zc7n0b87kadpagk4h1kg9as9lq15zy60b5"; + rev = "e0b4935d5956025ab595195d935a5bac00f1a973"; + sha256 = "0h723j5zhj8mzwghykd84rxdr0l4ngvyy692d6sl2zz940mvwlkw"; }; meta.homepage = "https://github.com/romgrk/barbar.nvim/"; }; @@ -293,12 +305,12 @@ let brainfuck-vim = buildVimPluginFrom2Nix { pname = "brainfuck-vim"; - version = "2020-12-16"; + version = "2021-01-10"; src = fetchFromGitHub { owner = "fruit-in"; repo = "brainfuck-vim"; - rev = "1e0f81c11214c6cc27dc55775fe6f43216fcf09a"; - sha256 = "0wvz7gbjnk2lm6jbxmsxfs6hc38g8zwmrqw2clkzpj7kvs1ayw26"; + rev = "d58b673eaa3dbc58975e9b23c09eac57c3e1e4b5"; + sha256 = "178m0ada1a0gijdwikycszls41kzgx6ysbd2aavlkbnrvclrkfa9"; }; meta.homepage = "https://github.com/fruit-in/brainfuck-vim/"; }; @@ -329,12 +341,12 @@ let calendar-vim = buildVimPluginFrom2Nix { pname = "calendar-vim"; - version = "2020-11-30"; + version = "2021-01-11"; src = fetchFromGitHub { owner = "itchyny"; repo = "calendar.vim"; - rev = "4a27972d1af6a4a659cebefeed8ec81f3c783c79"; - sha256 = "17wy2zybnlcajy91rcs2px726c0c1gjssggwyilx14wkp52ag0zn"; + rev = "289fe67f9a20a88b93b570671cf8a5d258fc7b69"; + sha256 = "17201r2nvy3jxf0f29ihqrln37xr4h3f2z20igjhajl3ajkg60h1"; }; meta.homepage = "https://github.com/itchyny/calendar.vim/"; }; @@ -389,12 +401,12 @@ let ci_dark = buildVimPluginFrom2Nix { pname = "ci_dark"; - version = "2020-08-20"; + version = "2020-12-25"; src = fetchFromGitHub { owner = "chuling"; repo = "ci_dark"; - rev = "d105c5978eb983d44461f83fc3b1033eb11d1a55"; - sha256 = "1nbb8zq2nhsbxn3lzh9sdhds2hv4n91vxafia7ydmzmyz9gyh6qw"; + rev = "9e683226bb2b73f234cd8feb7367514553d23d32"; + sha256 = "1jdpnljgf7bnqsfiqy7qfjhwcx4727gc9h0mrcn0xcfl19ppa6xs"; }; meta.homepage = "https://github.com/chuling/ci_dark/"; }; @@ -425,12 +437,12 @@ let coc-clap = buildVimPluginFrom2Nix { pname = "coc-clap"; - version = "2020-07-17"; + version = "2020-12-17"; src = fetchFromGitHub { owner = "vn-ki"; repo = "coc-clap"; - rev = "09d9059c243a25c5859fd73fff6b664d8bf5eed0"; - sha256 = "057kad7nwc75c92d2al6q25gs7vrf0l14529iclrgd61vg369sva"; + rev = "5a0685a6e9eac82d5b1912e10b4ebdd41823dccd"; + sha256 = "16g10s8zwzjzk21s09bvlc8z20gxv0whb83wf9kbysiv5aamf0n1"; }; meta.homepage = "https://github.com/vn-ki/coc-clap/"; }; @@ -449,28 +461,40 @@ let coc-explorer = buildVimPluginFrom2Nix { pname = "coc-explorer"; - version = "2020-12-11"; + version = "2021-01-13"; src = fetchFromGitHub { owner = "weirongxu"; repo = "coc-explorer"; - rev = "2335a2325488c0e43974a70f307e77afc15382d9"; - sha256 = "1cpqypqlw7bwm6a8jc0kkrb0nyxa375s6rw4rq2lss8jlwxcsia2"; + rev = "e0a4cfa0fb856b31a6d16828ce3629b2901496f0"; + sha256 = "0vadrkk92vrw48h7clbasqacyfcjn63ziq33740mciwa7a3h5bfg"; }; meta.homepage = "https://github.com/weirongxu/coc-explorer/"; }; coc-fzf = buildVimPluginFrom2Nix { pname = "coc-fzf"; - version = "2020-12-14"; + version = "2020-12-29"; src = fetchFromGitHub { owner = "antoinemadec"; repo = "coc-fzf"; - rev = "39f128c29fea82ebd7920e632a9fe81d829c89b4"; - sha256 = "0f7wfmvnmh3007yblq5jswrh1iapl66ibcc4q7pz6ansm38apj8j"; + rev = "a8b32b8b8a37d7fb87687c0187b7ad36987e2122"; + sha256 = "1x6xfizcix1hlcl2dhxbaxxl2q7lpgnfyvdg81c88rcn68qykfn0"; }; meta.homepage = "https://github.com/antoinemadec/coc-fzf/"; }; + coc-lua = buildVimPluginFrom2Nix { + pname = "coc-lua"; + version = "2021-01-08"; + src = fetchFromGitHub { + owner = "josa42"; + repo = "coc-lua"; + rev = "ad83de5ef16299e026b7fce6a024c82b2b7110f5"; + sha256 = "0b56af3z04vvlkr67yg3bfj71qycyhrv895p1sbfamj483hs7ds6"; + }; + meta.homepage = "https://github.com/josa42/coc-lua/"; + }; + coc-neco = buildVimPluginFrom2Nix { pname = "coc-neco"; version = "2020-04-07"; @@ -497,24 +521,24 @@ let coc-nvim = buildVimPluginFrom2Nix { pname = "coc-nvim"; - version = "2020-12-16"; + version = "2021-01-12"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "8c9d90539cdaecfd782d78a7a729100d9e30557d"; - sha256 = "1jgbilhldxc6cd7wmffcahp2yr2fv7lmnx5g4j0kcgw5fcd79nsn"; + rev = "891c73f0deb3777870aed67c6ea6e5e184bafe27"; + sha256 = "11wlsicv74vsxyr5l7q8r02h1wmf6zq3igxrp1anndv3j8mjbi09"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; codi-vim = buildVimPluginFrom2Nix { pname = "codi-vim"; - version = "2020-07-25"; + version = "2021-01-11"; src = fetchFromGitHub { owner = "metakirby5"; repo = "codi.vim"; - rev = "08e26f4dc4bdb0cbc790474beb29a48e7a9c8ceb"; - sha256 = "1qwacymipshfvvg7ya7gsfz1r65q44qjjsgya6wm81n04q9rpxfx"; + rev = "cf62681a4962ce1873e4b2a5e0bf401dcd42890f"; + sha256 = "15j08qa7sklm0pilfn3ljgq75hrv8y9h8xzj8ibrafp29640gkfl"; }; meta.homepage = "https://github.com/metakirby5/codi.vim/"; }; @@ -582,12 +606,12 @@ let completion-nvim = buildVimPluginFrom2Nix { pname = "completion-nvim"; - version = "2020-11-20"; + version = "2021-01-13"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "completion-nvim"; - rev = "936bbd17577101a4ffb07ea7f860f77dd8007d43"; - sha256 = "1z399q3v36hx2ipj1fhxcc051pi4q0lifyglmclxi5zkbmm0z6a7"; + rev = "d8eb3ba816d6bae9b741c23dee4d496e545a4ef8"; + sha256 = "1nndg6lbsgfp65vpqw5bpjj2qa944c2x5s38jfrf2lp68hk39z23"; }; meta.homepage = "https://github.com/nvim-lua/completion-nvim/"; }; @@ -630,12 +654,12 @@ let conjure = buildVimPluginFrom2Nix { pname = "conjure"; - version = "2020-11-17"; + version = "2021-01-03"; src = fetchFromGitHub { owner = "Olical"; repo = "conjure"; - rev = "bcdaf3761b762dafb4314389d84294232dd61ed6"; - sha256 = "0ivbxr90h61zcw3ydkaajsmd5dbwcqqri3qw367kpmfsndk9k9s9"; + rev = "e966ef58720fa0a2739aa33e9307809925b36597"; + sha256 = "1baf3r6fmdwn1pbn5sfrrmzi4dxp9a298bajr4sqds05avk4z2dc"; }; meta.homepage = "https://github.com/Olical/conjure/"; }; @@ -652,14 +676,26 @@ let meta.homepage = "https://github.com/Shougo/context_filetype.vim/"; }; + coq-vim = buildVimPluginFrom2Nix { + pname = "coq-vim"; + version = "2013-01-16"; + src = fetchFromGitHub { + owner = "jvoorhis"; + repo = "coq.vim"; + rev = "9b229f5872854dadfb8ba4b67a6a273f37eca4b8"; + sha256 = "0hpfwcm8lvv831b7i27lw72nqxfy7jymq6a6g3xmf0ycb0l3pnky"; + }; + meta.homepage = "https://github.com/jvoorhis/coq.vim/"; + }; + Coqtail = buildVimPluginFrom2Nix { pname = "Coqtail"; - version = "2020-12-02"; + version = "2021-01-03"; src = fetchFromGitHub { owner = "whonore"; repo = "Coqtail"; - rev = "f2c48d99015bb4f8317c53b8eb0f3a39406ed4cb"; - sha256 = "1h6ngs1kdnhxjnas0b62yvbx94zjn87q18hinccr4cis3qz902is"; + rev = "8c3cced82a5ea8051fbbe2ade25fac557ca976f0"; + sha256 = "1ayzpwc9bi6x5l5yhmhlfqifizpya9z57f0qdm64diwqvr8lvyb2"; }; meta.homepage = "https://github.com/whonore/Coqtail/"; }; @@ -774,12 +810,12 @@ let defx-git = buildVimPluginFrom2Nix { pname = "defx-git"; - version = "2020-08-14"; + version = "2021-01-01"; src = fetchFromGitHub { owner = "kristijanhusak"; repo = "defx-git"; - rev = "717b30addcd5204cf11c0736792c4b7c45005b88"; - sha256 = "1mx398lpzbzvrd1jawlxa4sd84ba60w3k9l46hg53hmbp1df4wff"; + rev = "324552fc652ed09e14a45485945b2e52eb04cbdc"; + sha256 = "1imgzbyrpivk601z35wdr6lk0r9vwriy37l4a0c3cmmb87pxkzcf"; }; meta.homepage = "https://github.com/kristijanhusak/defx-git/"; }; @@ -798,12 +834,12 @@ let defx-nvim = buildVimPluginFrom2Nix { pname = "defx-nvim"; - version = "2020-12-14"; + version = "2021-01-08"; src = fetchFromGitHub { owner = "Shougo"; repo = "defx.nvim"; - rev = "609e858b5211ec4de45cb93045ab320c961048b2"; - sha256 = "0yigdh18cnb6732613jps0zv0awwmqiz47hsxry65p71by72f026"; + rev = "a9259687391457c71fa8bcbf609ca83742b6d277"; + sha256 = "0smlfvxdily3vz9i3vr0b5r3410zp5asf13cbjxxv219fqa3z22a"; }; meta.homepage = "https://github.com/Shougo/defx.nvim/"; }; @@ -846,24 +882,24 @@ let denite-nvim = buildVimPluginFrom2Nix { pname = "denite-nvim"; - version = "2020-12-14"; + version = "2021-01-13"; src = fetchFromGitHub { owner = "Shougo"; repo = "denite.nvim"; - rev = "54be7f99b9f754c532034c77dcb717200d522a21"; - sha256 = "1gy91qz7w1ih3an3b8qgxgglk5q8v7pqjsps3zbj0dbxc6hfn6wl"; + rev = "d01c56ff3eab215c1485bd04d132b709f922de3e"; + sha256 = "0b2hmdkbi9d1273f8pylb87hxq2mws4s8g06rmy61ycbq60ldg4k"; }; meta.homepage = "https://github.com/Shougo/denite.nvim/"; }; deol-nvim = buildVimPluginFrom2Nix { pname = "deol-nvim"; - version = "2020-12-14"; + version = "2021-01-13"; src = fetchFromGitHub { owner = "Shougo"; repo = "deol.nvim"; - rev = "2bd742e2eadf6436e85aed1e95d43775524f0118"; - sha256 = "0rnsjxspiic0vqqnhsxws752q6xiq1g7yvx790ra3sf2j6nj8j6r"; + rev = "e470e3df3e94181c6e8a20e62df564beb8d7df36"; + sha256 = "17l0ykpib84lgq30dkfdk7s6gxb2dc20wg22z0pvf3slnyfdf8ra"; }; meta.homepage = "https://github.com/Shougo/deol.nvim/"; }; @@ -956,12 +992,12 @@ let deoplete-jedi = buildVimPluginFrom2Nix { pname = "deoplete-jedi"; - version = "2020-11-07"; + version = "2020-12-21"; src = fetchFromGitHub { owner = "deoplete-plugins"; repo = "deoplete-jedi"; - rev = "2d61fe45e348f89979c8faf663b3e88c61435f47"; - sha256 = "0qmszwrchp272zc4rf727k9l0x472lxbbql8k2pyj1vd1ks97q1i"; + rev = "43058915007d92dc167b84dd5b8ada2d2a057a82"; + sha256 = "0qh43mwzjsn67id6qs96p9lw1fjsgdgqmks0161hfgvbyixx2b3y"; }; meta.homepage = "https://github.com/deoplete-plugins/deoplete-jedi/"; }; @@ -992,12 +1028,12 @@ let deoplete-lsp = buildVimPluginFrom2Nix { pname = "deoplete-lsp"; - version = "2020-11-18"; + version = "2020-12-26"; src = fetchFromGitHub { owner = "Shougo"; repo = "deoplete-lsp"; - rev = "134e970130d57c6683052a506776fa12e04bd3de"; - sha256 = "1drbjkqx8ss2m1ns3sk5dhsg7l6xm0lvlj8kqgapqq9v5gb876j2"; + rev = "760eb2f647a518144ca1dc1091cc449c0dbee71e"; + sha256 = "0dcq79xqfb5qnjinwni0bi3vn2sfsri8wmc75wgvw2114vyf2k9a"; }; meta.homepage = "https://github.com/Shougo/deoplete-lsp/"; }; @@ -1064,12 +1100,12 @@ let deoplete-vim-lsp = buildVimPluginFrom2Nix { pname = "deoplete-vim-lsp"; - version = "2020-10-27"; + version = "2020-12-21"; src = fetchFromGitHub { owner = "lighttiger2505"; repo = "deoplete-vim-lsp"; - rev = "cb5af558e892a70648587e673fc251409ac3dc72"; - sha256 = "03rpw1z5fgglba7vymi3ln810nh5x3x9hjqlm41shdik9pgmg867"; + rev = "0c5d9e6efd6a7bea503faa854c41a3e5af00ec57"; + sha256 = "1hckg9p7srw2d674is0wzilnwwvw1s2q8xapr6dawslm5j364xlk"; }; meta.homepage = "https://github.com/lighttiger2505/deoplete-vim-lsp/"; }; @@ -1088,12 +1124,12 @@ let deoplete-nvim = buildVimPluginFrom2Nix { pname = "deoplete-nvim"; - version = "2020-12-14"; + version = "2021-01-12"; src = fetchFromGitHub { owner = "Shougo"; repo = "deoplete.nvim"; - rev = "2849fa544b9a3a07ec1ddafb2bb6f72945b24c62"; - sha256 = "08a5gb2hyqvpwj887g348vzxf14c28kls8dc86cizx5l1g6q2kpa"; + rev = "4c5acd271591c4b5e5420ce05c2b20eb7beb08e3"; + sha256 = "1vy3n81y7f535adyplmy3pvvsgjdzrxcfqlzrwz62r4bspqqf42r"; }; meta.homepage = "https://github.com/Shougo/deoplete.nvim/"; }; @@ -1160,12 +1196,12 @@ let dracula-vim = buildVimPluginFrom2Nix { pname = "dracula-vim"; - version = "2020-11-13"; + version = "2020-12-23"; src = fetchFromGitHub { owner = "dracula"; repo = "vim"; - rev = "ba00ac0432541811955e50b8420c25b22762c7c9"; - sha256 = "1rp0zip0p07rbfiz8b5nvm6k1d80yvdgn4h59v3bg8j9qan7rg3h"; + rev = "e7154372adc95d637ccd911c2f8601d9ff2eac1f"; + sha256 = "1li5q3151kjh8c6a7cdnmbydxhkjgqsa5nlv49dy6dnqc3b50m7s"; }; meta.homepage = "https://github.com/dracula/vim/"; }; @@ -1292,6 +1328,30 @@ let meta.homepage = "https://github.com/konfekt/fastfold/"; }; + fern-vim = buildVimPluginFrom2Nix { + pname = "fern-vim"; + version = "2021-01-13"; + src = fetchFromGitHub { + owner = "lambdalisue"; + repo = "fern.vim"; + rev = "316c8ad965f7d23093bd36a792730f701b80fb2a"; + sha256 = "1l04kjrnafj8509nmz349ki6xm5vzry9dqikgw5gsykrwgf8cp3a"; + }; + meta.homepage = "https://github.com/lambdalisue/fern.vim/"; + }; + + fennel-vim = buildVimPluginFrom2Nix { + pname = "fennel.vim"; + version = "2021-01-08"; + src = fetchFromGitHub { + owner = "bakpakin"; + repo = "fennel.vim"; + rev = "30b9beabad2c4f09b9b284caf5cd5666b6b4dc89"; + sha256 = "1fvcn4q87d594nzxlj1597bmrixzlfqnl7k8f547skvvywx09kii"; + }; + meta.homepage = "https://github.com/bakpakin/fennel.vim/"; + }; + ferret = buildVimPluginFrom2Nix { pname = "ferret"; version = "2020-12-08"; @@ -1389,14 +1449,26 @@ let meta.homepage = "https://github.com/shumphrey/fugitive-gitlab.vim/"; }; + fzf-lsp-nvim = buildVimPluginFrom2Nix { + pname = "fzf-lsp-nvim"; + version = "2020-12-24"; + src = fetchFromGitHub { + owner = "gfanto"; + repo = "fzf-lsp.nvim"; + rev = "de69b03c9feaa4b574e4a3e053a9a33467848227"; + sha256 = "09kpcmnvzgsdbwd5nsnkm93khqhncb8bjl67519wjgx39g73pq50"; + }; + meta.homepage = "https://github.com/gfanto/fzf-lsp.nvim/"; + }; + fzf-vim = buildVimPluginFrom2Nix { pname = "fzf-vim"; - version = "2020-12-14"; + version = "2021-01-07"; src = fetchFromGitHub { owner = "junegunn"; repo = "fzf.vim"; - rev = "e9d62b4c873f5f207202b4ba5bbd63de7003a0d3"; - sha256 = "0zifj72fm2c533cdj6ddkvm8y6p76imwmbnbm6l6s03zp1yq4kqy"; + rev = "d43df0ea2f099836c2e3499756101e87bcbd3e25"; + sha256 = "1hclx6c476i523qa5r27r2jbdfdrlbgan1j7aczzwgj3lahbdlvx"; }; meta.homepage = "https://github.com/junegunn/fzf.vim/"; }; @@ -1427,12 +1499,12 @@ let ghcid = buildVimPluginFrom2Nix { pname = "ghcid"; - version = "2020-11-24"; + version = "2021-01-12"; src = fetchFromGitHub { owner = "ndmitchell"; repo = "ghcid"; - rev = "2c82ecf78b709a60ce7b3023ff6f49e01fa4275d"; - sha256 = "0hfbz11g887kdn9zsry53gf5gfh0n84h3ww9bjn7fkq9qpkkq9mv"; + rev = "52883ef368c97b013dad5c9afcf6cd9bdae9875a"; + sha256 = "06mw3y3idzsbr2kb74vlrwjds4pzgp1fknjbabdpw38y90ax0j8c"; }; meta.homepage = "https://github.com/ndmitchell/ghcid/"; }; @@ -1451,12 +1523,12 @@ let git-messenger-vim = buildVimPluginFrom2Nix { pname = "git-messenger-vim"; - version = "2020-08-20"; + version = "2020-12-27"; src = fetchFromGitHub { owner = "rhysd"; repo = "git-messenger.vim"; - rev = "c16b0d43ca57e77081f1f23f67552efe37110b39"; - sha256 = "171w3dv3jl4mw1ikh5p688v0a8nf85h862d9zvsmdzs2v6ajigpw"; + rev = "a67de1d08cffa547183bbc2f95c4e29723504263"; + sha256 = "0pjw17z76yq873jh74pr01r3ay4blzb4j0ghax553fb0d8ni4lkl"; }; meta.homepage = "https://github.com/rhysd/git-messenger.vim/"; }; @@ -1643,12 +1715,12 @@ let iceberg-vim = buildVimPluginFrom2Nix { pname = "iceberg-vim"; - version = "2020-07-20"; + version = "2020-12-25"; src = fetchFromGitHub { owner = "cocopon"; repo = "iceberg.vim"; - rev = "203d56849325fb0420587c9951859a755798aea3"; - sha256 = "16calikypw9gyb4vzybwqgl329v6wpqj05z6m2ajbr027fksxfjr"; + rev = "866f9f4ac9ff9a0ae33de96253c359c68ab556b4"; + sha256 = "1zlj85xg8r8qbnr7dpszkcjqw70xahay7ydwnik0zwhq96mic1pv"; }; meta.homepage = "https://github.com/cocopon/iceberg.vim/"; }; @@ -1811,12 +1883,12 @@ let jedi-vim = buildVimPluginFrom2Nix { pname = "jedi-vim"; - version = "2020-07-17"; + version = "2021-01-03"; src = fetchFromGitHub { owner = "davidhalter"; repo = "jedi-vim"; - rev = "a17b0333031bd3652ad4c6169caaed05ffb7c49d"; - sha256 = "0xqsh0mw64s9ph4sd550fc129q567dld3vk7fciwd2905h9q0k8q"; + rev = "960eaa8053e5516195966321e06568750b2feb28"; + sha256 = "1ap9h7a6ybv6yvvszizyhzmgjhxd5xzaw2f6x7wn8dcsk7isy0a5"; fetchSubmodules = true; }; meta.homepage = "https://github.com/davidhalter/jedi-vim/"; @@ -1860,12 +1932,12 @@ let julia-vim = buildVimPluginFrom2Nix { pname = "julia-vim"; - version = "2020-12-07"; + version = "2021-01-07"; src = fetchFromGitHub { owner = "JuliaEditorSupport"; repo = "julia-vim"; - rev = "e14fd34409de39025af93873adc6d26a831d70f9"; - sha256 = "1s1n74dn53aww6mjb87jcjpmipk2k2ayimimss7kg9c6n15jkqkg"; + rev = "ce48f42f1fd1d4566503ae26307026c895905a10"; + sha256 = "08yk47pvyh550iqv6zvrxcjdinn0w9p5al1v49m7p49jfqck3h1m"; }; meta.homepage = "https://github.com/JuliaEditorSupport/julia-vim/"; }; @@ -1944,12 +2016,12 @@ let lean-vim = buildVimPluginFrom2Nix { pname = "lean-vim"; - version = "2020-11-01"; + version = "2021-01-02"; src = fetchFromGitHub { owner = "leanprover"; repo = "lean.vim"; - rev = "d1b3037680be79f114a87620844117e20ca7efcf"; - sha256 = "0x3cz4is30jsrp7dym4rz4xngv9mimybl4kqnry9x0nkqzn55910"; + rev = "313fd1e09e7a14352f87d44c82005b6e6316c9bc"; + sha256 = "0f6jq0hliy4jignjc1d30bsvfkb4xl4nzj900hphbc7l2aw7scqr"; }; meta.homepage = "https://github.com/leanprover/lean.vim/"; }; @@ -2004,24 +2076,24 @@ let lh-brackets = buildVimPluginFrom2Nix { pname = "lh-brackets"; - version = "2020-11-23"; + version = "2021-01-06"; src = fetchFromGitHub { owner = "LucHermitte"; repo = "lh-brackets"; - rev = "16520df9bcb57a5c150efff5a8bf2cd64f659f07"; - sha256 = "0hnn7hw1a7a5ld742mlw070xnj2zyvyq2kzrzsp2ky7ir3lhn7x2"; + rev = "547fc9ab14ecf6ecc0d81e8bbb1cc1fec314b6aa"; + sha256 = "0344ap5fkp1d0g91rv9pn0p28xqz8as48d3m6kxc99w229sj6p2q"; }; meta.homepage = "https://github.com/LucHermitte/lh-brackets/"; }; lh-vim-lib = buildVimPluginFrom2Nix { pname = "lh-vim-lib"; - version = "2020-11-19"; + version = "2021-01-06"; src = fetchFromGitHub { owner = "LucHermitte"; repo = "lh-vim-lib"; - rev = "0edb04acd77b9e5e498314b6345d422d93921ffa"; - sha256 = "1cndwbwx9pg6550k7j2z0pw91dll0idspd0jpd0kycpxm4330jy9"; + rev = "65614730a667144a444fbd4a028a81171481c537"; + sha256 = "1vxm3ym51qa63zbrkdz2pvwafr3kmdxgpxrdwb1g8i7qsxjsvgl1"; }; meta.homepage = "https://github.com/LucHermitte/lh-vim-lib/"; }; @@ -2040,24 +2112,24 @@ let lightline-bufferline = buildVimPluginFrom2Nix { pname = "lightline-bufferline"; - version = "2020-12-03"; + version = "2020-12-28"; src = fetchFromGitHub { owner = "mengelbrecht"; repo = "lightline-bufferline"; - rev = "9dffe95e90e331faaf363e179970ffc46afaeb59"; - sha256 = "05d1b0gzy6pz2pky8kxz3pdqzz2pmafjjib3yhskf11fd9k8q4l1"; + rev = "510c8be3d78bb58f25976ff9e7415c8cdc2a3054"; + sha256 = "0bd44jkz07pdzzs1vh0lkkms1vw8cd96wlsh8sa37mkx8bk5js5n"; }; meta.homepage = "https://github.com/mengelbrecht/lightline-bufferline/"; }; lightline-vim = buildVimPluginFrom2Nix { pname = "lightline-vim"; - version = "2020-11-21"; + version = "2021-01-11"; src = fetchFromGitHub { owner = "itchyny"; repo = "lightline.vim"; - rev = "709b2d8dc88fa622d6c076f34b05b58fcccf393f"; - sha256 = "08v68ymwj6rralfmjpjggd29sc2pvan4yg1y7sysylwlmwl7nhlp"; + rev = "8e013f32f524157bf14ccaa87d97be3d3a7201e2"; + sha256 = "0yl5r1dv91wzkgflh37fd52dinwsm4rcf4kfizn4xg5lbzdafkmn"; }; meta.homepage = "https://github.com/itchyny/lightline.vim/"; }; @@ -2074,6 +2146,18 @@ let meta.homepage = "https://github.com/junegunn/limelight.vim/"; }; + lsp-status-nvim = buildVimPluginFrom2Nix { + pname = "lsp-status-nvim"; + version = "2021-01-05"; + src = fetchFromGitHub { + owner = "nvim-lua"; + repo = "lsp-status.nvim"; + rev = "5215ea78a5949b42b86bf474d33608de6b7594a3"; + sha256 = "05h8n0ggi55g4ri9jsa4210knds0rxp8ym2knlq3njy40q0jjaxd"; + }; + meta.homepage = "https://github.com/nvim-lua/lsp-status.nvim/"; + }; + lsp_extensions-nvim = buildVimPluginFrom2Nix { pname = "lsp_extensions-nvim"; version = "2020-11-30"; @@ -2086,6 +2170,18 @@ let meta.homepage = "https://github.com/nvim-lua/lsp_extensions.nvim/"; }; + lualine-nvim = buildVimPluginFrom2Nix { + pname = "lualine-nvim"; + version = "2021-01-11"; + src = fetchFromGitHub { + owner = "hoob3rt"; + repo = "lualine.nvim"; + rev = "823665c511d5727107a57e4f31205f92bb2c573e"; + sha256 = "1krfj35zmbf9gznsh4npwhjmy132svbrivsy007vpz798lir7i06"; + }; + meta.homepage = "https://github.com/hoob3rt/lualine.nvim/"; + }; + lushtags = buildVimPluginFrom2Nix { pname = "lushtags"; version = "2017-04-19"; @@ -2124,12 +2220,12 @@ let mattn-calendar-vim = buildVimPluginFrom2Nix { pname = "mattn-calendar-vim"; - version = "2019-11-24"; + version = "2020-12-29"; src = fetchFromGitHub { owner = "mattn"; repo = "calendar-vim"; - rev = "de499b9525490b10edbd28fb8f0c4e81c6a6f20c"; - sha256 = "0xvvkq9zckmv9pnzvxg71fblly8lksfi736brbcwcvnszqif4b69"; + rev = "9a32891101990dd88b86befb50c46575ef8a364e"; + sha256 = "0i6nxap9fx8z9dx6q33pc9hz8s8vc2ghz5zchyxxmdn2mb5fki53"; }; meta.homepage = "https://github.com/mattn/calendar-vim/"; }; @@ -2148,12 +2244,12 @@ let mkdx = buildVimPluginFrom2Nix { pname = "mkdx"; - version = "2020-10-12"; + version = "2020-12-10"; src = fetchFromGitHub { owner = "SidOfc"; repo = "mkdx"; - rev = "65f343251d99c20db9f22e9c836b709f249129f6"; - sha256 = "06xz12h87wkcpn2w22k6m7gxshk5x75hg8ql9cmja89v0birsn0f"; + rev = "c977b1feff1dd53fc876f107d5c1128354e3cfb5"; + sha256 = "15b0w9wabrp4mb4hj1zi3bf5ma0p2qkb7b93c9hzrqbimkzdy1db"; }; meta.homepage = "https://github.com/SidOfc/mkdx/"; }; @@ -2172,12 +2268,12 @@ let ncm2 = buildVimPluginFrom2Nix { pname = "ncm2"; - version = "2020-07-26"; + version = "2020-12-19"; src = fetchFromGitHub { owner = "ncm2"; repo = "ncm2"; - rev = "7d49f7b473db732878091f2f8c68bc47b015559b"; - sha256 = "112pspa730pvwiv0hbzn9z6i3zpn25p8g45wf67kj2084wiqkkx3"; + rev = "3de17695c58f309642c5148b21d47fac61937a96"; + sha256 = "1415yjxydyamsyx6fmb5wawgcgqqr96cv6vy60f5h5x4dsaqvs24"; }; meta.homepage = "https://github.com/ncm2/ncm2/"; }; @@ -2244,12 +2340,12 @@ let ncm2-jedi = buildVimPluginFrom2Nix { pname = "ncm2-jedi"; - version = "2020-08-06"; + version = "2021-01-05"; src = fetchFromGitHub { owner = "ncm2"; repo = "ncm2-jedi"; - rev = "d378d3e80e15368c1714fd6c20dd461dc7db9796"; - sha256 = "0bphij55pjh87wcy0xk9yvgi0w3i0wvhbg71vddq0jn6m3r2gmlf"; + rev = "f2e9007783b1f543b00d336a94210b4bc76b67e0"; + sha256 = "1vrrz5zp39xk7c35dz737gfbr8j3yhqmmwmdwrxl5nibjwph4c30"; }; meta.homepage = "https://github.com/ncm2/ncm2-jedi/"; }; @@ -2364,12 +2460,12 @@ let neco-ghc = buildVimPluginFrom2Nix { pname = "neco-ghc"; - version = "2020-06-06"; + version = "2020-12-19"; src = fetchFromGitHub { owner = "eagletmt"; repo = "neco-ghc"; - rev = "b4ea02c537975a5a2bf00cb5f24cd784b2b6f5ad"; - sha256 = "13la3slqkljn7y8y9p8ic3majnvjf7pnrwr16cdpacklmz733x1f"; + rev = "ba23875fadc5e9022acb9d746b99f6fe5155d586"; + sha256 = "08q3wlaq6a8acfcbhh3gdhzwn5rr7w18aqqww0z76hgblav11a4k"; }; meta.homepage = "https://github.com/eagletmt/neco-ghc/"; }; @@ -2436,12 +2532,12 @@ let neoformat = buildVimPluginFrom2Nix { pname = "neoformat"; - version = "2020-12-02"; + version = "2021-01-13"; src = fetchFromGitHub { owner = "sbdchd"; repo = "neoformat"; - rev = "7e458dafae64b7f14f8c2eaecb886b7a85b8f66d"; - sha256 = "00x6yx4y4m45p3silwz084scs1a602d4xazyr39lgc0ssv6d9jhv"; + rev = "18aee89508fb7eea2bbff824dd1c33bdf7158d75"; + sha256 = "1bq2m85kdlgak1df5gpslylq0x7fxf694gb2y18s33jxmpvnahxz"; }; meta.homepage = "https://github.com/sbdchd/neoformat/"; }; @@ -2460,12 +2556,12 @@ let neomake = buildVimPluginFrom2Nix { pname = "neomake"; - version = "2020-11-09"; + version = "2020-12-20"; src = fetchFromGitHub { owner = "neomake"; repo = "neomake"; - rev = "3b611ca24a7b78f7842facf6361404724717af1a"; - sha256 = "0x710kk7cac4m6s7xlqbm8pch1kfbwkmk6myvmsgf2qflj2qxn2j"; + rev = "5e140db568eb2f7b88e4110cd4b651562e8878ab"; + sha256 = "0gvlpv7mfqrac10ccndl58axib42ack92m2simn78ksdap9g7n6n"; }; meta.homepage = "https://github.com/neomake/neomake/"; }; @@ -2484,12 +2580,12 @@ let neosnippet-snippets = buildVimPluginFrom2Nix { pname = "neosnippet-snippets"; - version = "2020-11-16"; + version = "2020-12-23"; src = fetchFromGitHub { owner = "Shougo"; repo = "neosnippet-snippets"; - rev = "415dc1a83087173e2307a6b4e3e7c86a3cfa3183"; - sha256 = "18amifx20y9vhx1sl4pyhzdqsgznmn52c58nws4jsqszp12xmk0a"; + rev = "901b9ba8f2eea6222649282a58d7b86b8719334f"; + sha256 = "0k08057fbs4pmx9w6mwnjvms6sn694h6n255ff6n40sf4yy8w4mh"; }; meta.homepage = "https://github.com/Shougo/neosnippet-snippets/"; }; @@ -2556,36 +2652,36 @@ let neoyank-vim = buildVimPluginFrom2Nix { pname = "neoyank-vim"; - version = "2020-07-27"; + version = "2020-12-20"; src = fetchFromGitHub { owner = "Shougo"; repo = "neoyank.vim"; - rev = "0d86f6565a6193cdf017ac4f79e52fed04d5c0fb"; - sha256 = "02n1n3hb3bn5x9na05crhwmdmk66wyjx8i01fsyazlpv32v1wfsy"; + rev = "8b3c9f7d8109744766d13eaf6c17eb195dd61d9d"; + sha256 = "0fmn92kjgwkfpsh328bvd3nsw32q6wbjjp9vqmfnbs8rbkmpn0vh"; }; meta.homepage = "https://github.com/Shougo/neoyank.vim/"; }; nerdcommenter = buildVimPluginFrom2Nix { pname = "nerdcommenter"; - version = "2020-12-11"; + version = "2021-01-12"; src = fetchFromGitHub { owner = "preservim"; repo = "nerdcommenter"; - rev = "119b99d1662113a588734e3666213d246e50900d"; - sha256 = "1dci0a5hcpvx567vqns7csn7p24i2m2l3ra8jmcvwrhlk72kvgrf"; + rev = "7d2fb974a36b3c7773a90a749fcb92a40669e444"; + sha256 = "1vq4wkywidmjr2g8z9js5173b15lr6zawxb0z12fmvaiwxpbli4z"; }; meta.homepage = "https://github.com/preservim/nerdcommenter/"; }; nerdtree = buildVimPluginFrom2Nix { pname = "nerdtree"; - version = "2020-10-14"; + version = "2020-12-20"; src = fetchFromGitHub { owner = "preservim"; repo = "nerdtree"; - rev = "14af89743ac1c31ff9bb43682025eda50333a7d5"; - sha256 = "1q50cc9z91v809s65w0zq2s0z5smvghy0fbdjn64mr894ndvrmcv"; + rev = "aaa946fb6bd79b9af86fbaf4b6b63fd81d839bd9"; + sha256 = "1fhwfwqlvz0pm5qdpjbmjx4dqlnchbp170jw63dc5fxin90h4ivh"; }; meta.homepage = "https://github.com/preservim/nerdtree/"; }; @@ -2628,12 +2724,12 @@ let nlua-nvim = buildVimPluginFrom2Nix { pname = "nlua-nvim"; - version = "2020-11-16"; + version = "2021-01-05"; src = fetchFromGitHub { owner = "tjdevries"; repo = "nlua.nvim"; - rev = "92fdfb1eb791e79ff1d6403dd26b59ce61dd09c6"; - sha256 = "1ka8k8rxn406glrc0qz8rk3zrxhpdaky040v1a65g5alb50af9hz"; + rev = "c0e8fbcaf8bcf5571a9e1d780a72094aad3f3094"; + sha256 = "0q5aw3n4dsszk5iw7qg01xx1rbrr18jh1wqs6k9dd1kcr6yq22rq"; }; meta.homepage = "https://github.com/tjdevries/nlua.nvim/"; }; @@ -2664,12 +2760,12 @@ let nvcode-color-schemes-vim = buildVimPluginFrom2Nix { pname = "nvcode-color-schemes-vim"; - version = "2020-11-25"; + version = "2021-01-10"; src = fetchFromGitHub { owner = "ChristianChiarulli"; repo = "nvcode-color-schemes.vim"; - rev = "f94ec5a9259b4fd2deb495ead0341a38c19c2799"; - sha256 = "1f7z23dn7vnldc82d6x1j8wqvj9vsi169rbcg0scfphh79fq61pc"; + rev = "7ed43362582c7c202f9a3edc2293dbb87d96e5fc"; + sha256 = "1bcl2cdsvafvlsh5d4a2cr3v1nzpdlh9whaasq2ac192a6hs0c3x"; }; meta.homepage = "https://github.com/ChristianChiarulli/nvcode-color-schemes.vim/"; }; @@ -2700,12 +2796,12 @@ let nvim-dap = buildVimPluginFrom2Nix { pname = "nvim-dap"; - version = "2020-12-08"; + version = "2021-01-10"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "6830ad2ce5f9b328b7becbf390fca330195efb96"; - sha256 = "060899ajnck6v3fx2xprh8kf0g28wc12blxb13jd5ibgr7zdl5vn"; + rev = "e971d2af33189bff941c9632aca51211dfca0869"; + sha256 = "09h2kacqbqazllajacpfnlysvwb1ikg5gmymci3hp39g488i3kx6"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; @@ -2724,24 +2820,24 @@ let nvim-gdb = buildVimPluginFrom2Nix { pname = "nvim-gdb"; - version = "2020-12-08"; + version = "2021-01-08"; src = fetchFromGitHub { owner = "sakhnik"; repo = "nvim-gdb"; - rev = "a0e6003548ae0f89101347b483a3df773d24e6ed"; - sha256 = "1s1wsa3hmafdfh4zd97imr5a0yiqq9v82f6aih1ha9bz503q4mg2"; + rev = "81930348bbb1398635cc0ecbbc88e3defd8aaa0f"; + sha256 = "106g7pxa9rwwq45hmsb55b3dy0px2lr5lb25yy8n6jx6a70z9hf7"; }; meta.homepage = "https://github.com/sakhnik/nvim-gdb/"; }; nvim-highlite = buildVimPluginFrom2Nix { pname = "nvim-highlite"; - version = "2020-12-14"; + version = "2020-12-31"; src = fetchFromGitHub { owner = "Iron-E"; repo = "nvim-highlite"; - rev = "e9733ce739c4c8659226ebf0b2aa26bc1d10f3c1"; - sha256 = "0kl5ph1yxb5hhcyn78f70xglssrj0w3k9kwq13fxhi1lms15mvg2"; + rev = "2fb6dc1b2a702a2f7ddd3dedff04b7fdfe66d9be"; + sha256 = "0sxyk1g82ycgx5mi21s1jyrqg3qd4cyjrzy6hbwil04kcadqkkc1"; }; meta.homepage = "https://github.com/Iron-E/nvim-highlite/"; }; @@ -2760,28 +2856,40 @@ let nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2020-12-14"; + version = "2021-01-12"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "afe4a78021568578ec750e4fc398050a720f1815"; - sha256 = "1vnl5vaqxs04j084gnxk5ayx4q9ibf7la0iiwpryl57csxpvc5lm"; + rev = "844d6f9d7af961eb27f876dc0cae9fe0fab5a769"; + sha256 = "151s2n50zmvfgbb30h63cgzbbxi8vb5fagiyl4gr6vpfn6p64s4g"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; nvim-lsputils = buildVimPluginFrom2Nix { pname = "nvim-lsputils"; - version = "2020-11-29"; + version = "2021-01-12"; src = fetchFromGitHub { owner = "RishabhRD"; repo = "nvim-lsputils"; - rev = "cf5184a84217549966ae3fa156bc459d2448c7b8"; - sha256 = "1wfmlr3scl3lawhvpya94f9zy3w3kyx622llxyg8s1frahzc9a3m"; + rev = "fae88180b573e935f4a0827eb096208a7c76b215"; + sha256 = "1i7gmh3zb2i8jig0j6drvknsx5p4dxm1v8b6bdrnjgs4pyrpy7si"; }; meta.homepage = "https://github.com/RishabhRD/nvim-lsputils/"; }; + nvim-scrollview = buildVimPluginFrom2Nix { + pname = "nvim-scrollview"; + version = "2021-01-09"; + src = fetchFromGitHub { + owner = "dstein64"; + repo = "nvim-scrollview"; + rev = "426fc6549aff1d5a1b84127dd80807a4f134d4ab"; + sha256 = "0yadrawg9q49fiizn4k8ng9hsp9vi2l0bw73s6ib0szg641k1w42"; + }; + meta.homepage = "https://github.com/dstein64/nvim-scrollview/"; + }; + nvim-terminal-lua = buildVimPluginFrom2Nix { pname = "nvim-terminal-lua"; version = "2019-10-17"; @@ -2796,84 +2904,84 @@ let nvim-tree-lua = buildVimPluginFrom2Nix { pname = "nvim-tree-lua"; - version = "2020-12-16"; + version = "2021-01-10"; src = fetchFromGitHub { owner = "kyazdani42"; repo = "nvim-tree.lua"; - rev = "bc8245c7bb57059ced9d957d9f15f56957656807"; - sha256 = "1lnbi746c5zhjlwsqbchhy8pna8d9drg7yi2jwsagj4jr2n4knwa"; + rev = "361e20ecfa21c6bbc31436cf701ceb87e8e7bde7"; + sha256 = "01yd5i56k8c7kii3gnxh3654d5a8kdmad974yicxj0jzgvawncn4"; }; meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/"; }; nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2020-12-16"; + version = "2021-01-12"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "775021cbd5a5c242af74ee0892d3678971b5452b"; - sha256 = "1rsf19vpnbk4vs5a8kzbq3s8svvnf7kbrkswb1hy9qrfp94zmdvi"; + rev = "39968ca258c89b796fc9ce5f3643ca8781150dd8"; + sha256 = "0lcm37xrysypflyrblmbgn6sv8106mrjv9qg1rf4mn1sbdc7z4bp"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; nvim-treesitter-context = buildVimPluginFrom2Nix { pname = "nvim-treesitter-context"; - version = "2020-11-23"; + version = "2020-12-31"; src = fetchFromGitHub { owner = "romgrk"; repo = "nvim-treesitter-context"; - rev = "192baea80c5b1a98a267eb7f13769f33adab7de8"; - sha256 = "0bap7ckwha4halhdz0hv69iad0wrcdwd9843rnzvfkz3b1bdbvdn"; + rev = "a7773cc3c581fa43cf0b59693ecdc6fc4e79e748"; + sha256 = "1mxm6b00jmnci4yvd3bs9njf73bjbdwcn10l5bw9180a511aggv1"; }; meta.homepage = "https://github.com/romgrk/nvim-treesitter-context/"; }; nvim-treesitter-refactor = buildVimPluginFrom2Nix { pname = "nvim-treesitter-refactor"; - version = "2020-10-07"; + version = "2021-01-07"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-refactor"; - rev = "9d4b9daf2f138a5de538ee094bd899591004f8e2"; - sha256 = "0ma5zsl70mi92b9y8nhgkppdiqfjj0bl3gklhjv1c3lg7kny7511"; + rev = "16bbe963d044ec94316679868e0988caa7b5b4c3"; + sha256 = "0jgasxphwi222ga73y3jh5zq9m95n74331jn8r3nv741lk2g0772"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-refactor/"; }; nvim-treesitter-textobjects = buildVimPluginFrom2Nix { pname = "nvim-treesitter-textobjects"; - version = "2020-12-13"; + version = "2021-01-01"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-textobjects"; - rev = "8743e233c22092e5ced954267eaa1e5d9b12e881"; - sha256 = "1qqy3qxqq8qijxq4mg0703x3gx92kccb1h47xrsp49crjpw1g8z1"; + rev = "065b342db053810ac7a5ee9740b891cfa05c380f"; + sha256 = "07yl5iin11snw2637860r9zva9yfn7qkljkv0sjfldm73afflds7"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/"; }; nvim-ts-rainbow = buildVimPluginFrom2Nix { pname = "nvim-ts-rainbow"; - version = "2020-12-15"; + version = "2021-01-05"; src = fetchFromGitHub { owner = "p00f"; repo = "nvim-ts-rainbow"; - rev = "7887fe8847c5c2ad67bd05c1da3f6613ee30bd8d"; - sha256 = "00030lnb80h7yrjdjz1pzwxg2gcp6kfjj9glckk5zl4sjk5gp31j"; + rev = "68eee9b031432de6a1964315235d3cf265243a77"; + sha256 = "0zjhyd02sj17i0yrmffzzja2s0y9fa37v1nvqa17kap9vmcgyh7h"; }; meta.homepage = "https://github.com/p00f/nvim-ts-rainbow/"; }; nvim-web-devicons = buildVimPluginFrom2Nix { pname = "nvim-web-devicons"; - version = "2020-11-08"; + version = "2020-12-28"; src = fetchFromGitHub { owner = "kyazdani42"; repo = "nvim-web-devicons"; - rev = "61693bf98df40dc17354edd5f92311e2aaa0f5cc"; - sha256 = "0siifa9gxj6kz9w4fpnra6afyri6y0b34605aqkf7820krhcmckz"; + rev = "aaffb87b5a640d15a566d9af9e74baafcf9ec016"; + sha256 = "1qk2h8cwcb0v12lxayjdxka6wh5r1phn9cz5xkm5hvm1vcwrvlln"; }; meta.homepage = "https://github.com/kyazdani42/nvim-web-devicons/"; }; @@ -3036,24 +3144,24 @@ let playground = buildVimPluginFrom2Nix { pname = "playground"; - version = "2020-12-04"; + version = "2020-12-17"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "playground"; - rev = "bc68ffe8efab3a3b575122a26cf434e13e084844"; - sha256 = "1vlgx149fzkbxlznlwkcqbvlj4bg4g0g7xr1skvxg1qgmlgzwfx3"; + rev = "0cba1b99cd6cfcd0379e57c317ea1df0c1c82b3a"; + sha256 = "1xs2g7inlmcjchzzmsa4qh1mf61xz6gdn96mzfkr8fs65g78861b"; }; meta.homepage = "https://github.com/nvim-treesitter/playground/"; }; plenary-nvim = buildVimPluginFrom2Nix { pname = "plenary-nvim"; - version = "2020-12-16"; + version = "2021-01-11"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "plenary.nvim"; - rev = "2c7d9031eea13e50818f94118a5cdd30692feafa"; - sha256 = "1vx0l3p44ycqhy1mkdz47j64bdakq77hlda2zldbcfshxlmsb6rb"; + rev = "e9b81e2bb98e00e9f6ca2b6a698cc8452fe2943e"; + sha256 = "00j5gnx5jgrx7qmbxhrjsrdzp9krc5c7zij9a25jhz3l2j98xpdg"; }; meta.homepage = "https://github.com/nvim-lua/plenary.nvim/"; }; @@ -3072,12 +3180,12 @@ let popfix = buildVimPluginFrom2Nix { pname = "popfix"; - version = "2020-12-16"; + version = "2021-01-07"; src = fetchFromGitHub { owner = "RishabhRD"; repo = "popfix"; - rev = "e610f0ec1639f28e9efb87b16f7fbf9c0e90d141"; - sha256 = "18hf65fwxl3m3gf8pi5j3dnphnqki3wz59ld3fqbq9720cfrcs2y"; + rev = "9ab0aa5f186a2a2429c55f1512e2fd8b536183f0"; + sha256 = "0ks9hxc506ybwrvk5qkl1qkj634ms5icy8cg0w3b1q5qzgz5k0wn"; fetchSubmodules = true; }; meta.homepage = "https://github.com/RishabhRD/popfix/"; @@ -3157,12 +3265,12 @@ let quick-scope = buildVimPluginFrom2Nix { pname = "quick-scope"; - version = "2020-12-05"; + version = "2020-12-28"; src = fetchFromGitHub { owner = "unblevable"; repo = "quick-scope"; - rev = "5cd7d8493256b5900984af6d82a7ff81ce57d544"; - sha256 = "12v9h9q6lr06r563y1ryvd56zf8m0xshmg27sgm2453k2xps31ly"; + rev = "d4c02b85ff168f7749833607536cb02281464c26"; + sha256 = "16hl1np40p3wrk1q0blmxfaa28lljvca1dv9xpiw1ddm9n7qlr21"; }; meta.homepage = "https://github.com/unblevable/quick-scope/"; }; @@ -3505,14 +3613,14 @@ let Spacegray-vim = buildVimPluginFrom2Nix { pname = "Spacegray-vim"; - version = "2020-09-18"; + version = "2021-01-02"; src = fetchFromGitHub { - owner = "ajh17"; + owner = "ackyshake"; repo = "Spacegray.vim"; - rev = "338b319da09b5e62744a54c79148262ba0f24bf3"; - sha256 = "0jkv0sg1sc7d8br32zmwr5m1iwbvzi43f4gvshfi71c6k2fyhwlb"; + rev = "012ff0065eac2c149084d59e1272ec0d740051ab"; + sha256 = "0y0jlycgsc8ll5gnqmjc9blyn9ynnzrgnp280k49h4lh5b689y5m"; }; - meta.homepage = "https://github.com/ajh17/Spacegray.vim/"; + meta.homepage = "https://github.com/ackyshake/Spacegray.vim/"; }; spacevim = buildVimPluginFrom2Nix { @@ -3578,12 +3686,12 @@ let srcery-vim = buildVimPluginFrom2Nix { pname = "srcery-vim"; - version = "2020-10-26"; + version = "2020-12-22"; src = fetchFromGitHub { owner = "srcery-colors"; repo = "srcery-vim"; - rev = "ecbd5ba9055ad6b78dc47ef4f0894a7da63215f7"; - sha256 = "1ynyllw0fg4gfb5qcmwfjsqg5dr3dwfc5hya261zzd8a42qab1y4"; + rev = "8cd04af0507635a8368609ede79a332b96a7a245"; + sha256 = "0gb1mjr2yryrq0p9q17d4ndyi7b6wyba3s8ds72wf5bkl4vzrsbd"; }; meta.homepage = "https://github.com/srcery-colors/srcery-vim/"; }; @@ -3650,12 +3758,12 @@ let syntastic = buildVimPluginFrom2Nix { pname = "syntastic"; - version = "2020-11-06"; + version = "2021-01-04"; src = fetchFromGitHub { owner = "vim-syntastic"; repo = "syntastic"; - rev = "63741646a9e87bbe105674747555aded6f52c490"; - sha256 = "0x1rn76zjig4kdbs719fcpc22mbh2jz93ni8zpzpkn8r186f05s5"; + rev = "d97a664b9adbd1a0a9cba6c1c3baf071a1059d1e"; + sha256 = "1azranlzdm1w98ifmczp1zx1w66yrpdi9h3k05v126rwaqkd6bsj"; }; meta.homepage = "https://github.com/vim-syntastic/syntastic/"; }; @@ -3698,12 +3806,12 @@ let tagbar = buildVimPluginFrom2Nix { pname = "tagbar"; - version = "2020-11-30"; + version = "2021-01-12"; src = fetchFromGitHub { owner = "preservim"; repo = "tagbar"; - rev = "b63e8cb83f08165d15474ea1291c51f6661f1f7e"; - sha256 = "0vghkl7i6pldyasb4fr0prjc53aq1jj567pxh9mssn2sy9l8ishg"; + rev = "c7e7d5e565eca1c8a39a567a7a26cdc2512c1c7e"; + sha256 = "0sqsh8vca1yvj253as4ky0l925czf8584k7zcbcimkjb35cp4d64"; }; meta.homepage = "https://github.com/preservim/tagbar/"; }; @@ -3746,12 +3854,12 @@ let telescope-nvim = buildVimPluginFrom2Nix { pname = "telescope-nvim"; - version = "2020-12-16"; + version = "2021-01-12"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "b5ff9de13d4b15e78e9d3433d6bf085601f62a5d"; - sha256 = "1ckb1ka1wp8m859xdbvzhh52gq4i3j5qia4w6mcz78x358mknp6x"; + rev = "57012550977679925176819345adc4d0dce85a00"; + sha256 = "002c120ppz8g6xiqckq61nbr7zcfdh5n75hhzbcn0xqlagmi9p6y"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -3794,12 +3902,12 @@ let thumbnail-vim = buildVimPluginFrom2Nix { pname = "thumbnail-vim"; - version = "2020-08-15"; + version = "2021-01-11"; src = fetchFromGitHub { owner = "itchyny"; repo = "thumbnail.vim"; - rev = "161ff743cb031eff376780108b018735d92160b0"; - sha256 = "105a1a9kahfdicw1gkdhc88w41pyhmhv6yw2kh1flkaikzqlxbc8"; + rev = "bfd408a3210c305aaf51e6ce31ac99497e6ab1ec"; + sha256 = "1kh12d0dg932j9drby27fhg8vbjm8rwih33rm4yjba0316i8wcyv"; }; meta.homepage = "https://github.com/itchyny/thumbnail.vim/"; }; @@ -3927,12 +4035,12 @@ let unite-vim = buildVimPluginFrom2Nix { pname = "unite-vim"; - version = "2020-06-28"; + version = "2021-01-08"; src = fetchFromGitHub { owner = "Shougo"; repo = "unite.vim"; - rev = "787c777ff2fedd46fc10e315bdfea339fe016d33"; - sha256 = "1bm48d3n07i2hy7bqz6pzyl3zb5mikhplmk5fk5x09q2i47l6bqg"; + rev = "c455008595a15c7ccc2c9f2ea309ba2bf5d3fe63"; + sha256 = "054h0yrb2wffmirvqql2v34rfr5q0rx20p2y2wbrpx2w1vcwr2rc"; }; meta.homepage = "https://github.com/Shougo/unite.vim/"; }; @@ -4239,12 +4347,12 @@ let vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2020-12-09"; + version = "2021-01-10"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "f39208f1a074fb525270312a20c87521a50c74ef"; - sha256 = "1prjrrg9r1vxkdxi2p5mbl9hypa6r8sa7yk7xw6bv5vsbwpl8nhj"; + rev = "0ca9576331ba845e7bf29f5e092f5da04f4f3580"; + sha256 = "11ai8j7l1v6pviijvrayaw4wcs5720a0qpk35x99ir3dq7pflm54"; }; meta.homepage = "https://github.com/vim-airline/vim-airline/"; }; @@ -4263,12 +4371,12 @@ let vim-airline-themes = buildVimPluginFrom2Nix { pname = "vim-airline-themes"; - version = "2020-11-27"; + version = "2020-12-17"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline-themes"; - rev = "5cf03c355b64836ebcb681136539f48ada34f363"; - sha256 = "1wjsmm0bf6714rxnrvfb9080ycgcy4x3vp3qs46nznxsxrxx935n"; + rev = "8f1aa2c7fa44bf33b1fd4678f9c7b40c126b0e2b"; + sha256 = "1gwk7m8ghg5lix14bqxjyxc1wv5agkfhqinsikssydab0liw0xyf"; }; meta.homepage = "https://github.com/vim-airline/vim-airline-themes/"; }; @@ -4429,6 +4537,18 @@ let meta.homepage = "https://github.com/qpkorr/vim-bufkill/"; }; + vim-capslock = buildVimPluginFrom2Nix { + pname = "vim-capslock"; + version = "2019-11-13"; + src = fetchFromGitHub { + owner = "tpope"; + repo = "vim-capslock"; + rev = "84c9e467a7b8e5aabf33674ed17c6356cf98777c"; + sha256 = "1c2fr8s9im3vxrszsrzm6wvad6disbdslmq6lqdp4603ialy4kja"; + }; + meta.homepage = "https://github.com/tpope/vim-capslock/"; + }; + vim-carbon-now-sh = buildVimPluginFrom2Nix { pname = "vim-carbon-now-sh"; version = "2020-10-28"; @@ -4467,12 +4587,12 @@ let vim-clap = buildVimPluginFrom2Nix { pname = "vim-clap"; - version = "2020-12-16"; + version = "2021-01-12"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "af939a85cc78c9974dcf202a95ff8793755d575d"; - sha256 = "1kcnj0jqbag62gvxrr54hmri5qpskfs0i0l2m8z4ffliixy0mkan"; + rev = "07cac9de58ad1f1ce287e47ac41e7eb7bb4db6a3"; + sha256 = "186d3mncgw6g4hrl6qv6wxnpy5mk5xkjpr0b03ql6z52iybcmxff"; }; meta.homepage = "https://github.com/liuchengxu/vim-clap/"; }; @@ -4501,6 +4621,18 @@ let meta.homepage = "https://github.com/guns/vim-clojure-static/"; }; + vim-closer = buildVimPluginFrom2Nix { + pname = "vim-closer"; + version = "2020-10-24"; + src = fetchFromGitHub { + owner = "rstacruz"; + repo = "vim-closer"; + rev = "c61667d27280df171a285b1274dd3cf04cbf78d4"; + sha256 = "1dgcag4dibckpvsm8hr28yw10z81ic52sdm5narcwr1k6hjidxpn"; + }; + meta.homepage = "https://github.com/rstacruz/vim-closer/"; + }; + vim-closetag = buildVimPluginFrom2Nix { pname = "vim-closetag"; version = "2020-10-09"; @@ -4515,24 +4647,24 @@ let vim-codefmt = buildVimPluginFrom2Nix { pname = "vim-codefmt"; - version = "2020-12-07"; + version = "2020-12-18"; src = fetchFromGitHub { owner = "google"; repo = "vim-codefmt"; - rev = "6761a211eb8690e84167a1cb2efb11f31e07973d"; - sha256 = "0fppgyrbn6yy9qwi0vffj34vmqc40sqrh1drlbn9493j4r27ffyz"; + rev = "0bf16eb74e8243ee477ad97330e451026311fbae"; + sha256 = "06060173jyz1n977a2jaq706x850bayg2n2jwmidbrsbiyx2krzy"; }; meta.homepage = "https://github.com/google/vim-codefmt/"; }; vim-coffee-script = buildVimPluginFrom2Nix { pname = "vim-coffee-script"; - version = "2018-02-27"; + version = "2020-12-20"; src = fetchFromGitHub { owner = "kchmck"; repo = "vim-coffee-script"; - rev = "9e3b4de2a476caeb6ff21b5da20966d7c67a98bb"; - sha256 = "1yzhyi12r508r2yjkzbcnddv3q4whjf3kchp23xs0snhwd9b981x"; + rev = "28421258a8dde5a50deafbfc19cd9873cacfaa79"; + sha256 = "07k7whr32x782jyvzl2vg6c2pdrj5jynf4b4f2my7502rgv03w02"; }; meta.homepage = "https://github.com/kchmck/vim-coffee-script/"; }; @@ -4717,6 +4849,18 @@ let meta.homepage = "https://github.com/sunaku/vim-dasht/"; }; + vim-DetectSpellLang = buildVimPluginFrom2Nix { + pname = "vim-DetectSpellLang"; + version = "2020-01-13"; + src = fetchFromGitHub { + owner = "konfekt"; + repo = "vim-DetectSpellLang"; + rev = "d8b545ef138a9ff013f8243f85c79b277b26f5e1"; + sha256 = "0c1bxryw4rg4cyql7vfp2gwhkl2d0b8inc6shmgfy7jg4svhzs0w"; + }; + meta.homepage = "https://github.com/konfekt/vim-DetectSpellLang/"; + }; + vim-devicons = buildVimPluginFrom2Nix { pname = "vim-devicons"; version = "2020-12-10"; @@ -4767,12 +4911,12 @@ let vim-dirvish-git = buildVimPluginFrom2Nix { pname = "vim-dirvish-git"; - version = "2020-06-04"; + version = "2020-12-18"; src = fetchFromGitHub { owner = "kristijanhusak"; repo = "vim-dirvish-git"; - rev = "8a3a8b88ed0815500c2912658fe0de7583ee1d45"; - sha256 = "1z8a718kam2r87kimhayxndjbmpgk0mgwrc5v52bid584xml584k"; + rev = "0c8c1a2878074abb0ac24054810de427ebff5500"; + sha256 = "0gan44cyjskzjx5wv20zyvw2jn4cs4537fpwh2m3vi6758s2bmwy"; }; meta.homepage = "https://github.com/kristijanhusak/vim-dirvish-git/"; }; @@ -4839,12 +4983,12 @@ let vim-easymotion = buildVimPluginFrom2Nix { pname = "vim-easymotion"; - version = "2020-10-25"; + version = "2020-12-17"; src = fetchFromGitHub { owner = "easymotion"; repo = "vim-easymotion"; - rev = "41bbb8ce8a3c3acc837895ebd79f8a8bc07b99b3"; - sha256 = "1lbn844pv5pnla3qhc01wyyrx3czmr83gax8pr3w6283jwp4di6y"; + rev = "d75d9591e415652b25d9e0a3669355550325263d"; + sha256 = "1j2kgh1iri0fqkbgbgvfjqgsksfipnmr1xbj554i602pnm0hbg19"; }; meta.homepage = "https://github.com/easymotion/vim-easymotion/"; }; @@ -4887,12 +5031,12 @@ let vim-elm-syntax = buildVimPluginFrom2Nix { pname = "vim-elm-syntax"; - version = "2020-10-29"; + version = "2021-01-09"; src = fetchFromGitHub { owner = "andys8"; repo = "vim-elm-syntax"; - rev = "998ef67262dcbeadd596458d7ff40079b5bc5cbb"; - sha256 = "0gja4ifdpl6wfq3n897h1h635kf92v5c44jzr0ixbv3i924xqjhj"; + rev = "b65370b5292730ef35cbdb969da05b52d77d51dc"; + sha256 = "0nd3ig7zpx49dmgwyqhs3545x64jxbrrgzd9fch4ihb6bhd4j3fr"; }; meta.homepage = "https://github.com/andys8/vim-elm-syntax/"; }; @@ -5031,12 +5175,12 @@ let vim-floaterm = buildVimPluginFrom2Nix { pname = "vim-floaterm"; - version = "2020-11-30"; + version = "2021-01-12"; src = fetchFromGitHub { owner = "voldikss"; repo = "vim-floaterm"; - rev = "d7880f46f9b339f935e9912bb3f41c9b346ae992"; - sha256 = "1hyvfsjwpgyk5sgrr4zn8r0r530p1v3z8gz8a1dhjgpdykb90mpw"; + rev = "37c999def265ebf5463a925decc6604481f3c598"; + sha256 = "1ix3q36hhb5k7y1c4r5qzmr8gyxk6amb3zk88bs85j36kn56mz4j"; }; meta.homepage = "https://github.com/voldikss/vim-floaterm/"; }; @@ -5079,12 +5223,12 @@ let vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2020-12-07"; + version = "2020-12-17"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "7afa1cfaa62e7fc6f891d0d59f4b10d046b5fd8e"; - sha256 = "1a2q4n9dk8p3j9d8nr8briszmmign4393sbmrdrjkg963ysfc63g"; + rev = "bebe504e38d0a20c30d6dd666c4c793b3cc66104"; + sha256 = "03w28pll83sj7g7ngif27mj81zmwik0iw8yc50yc3szk0lv816yc"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; @@ -5125,6 +5269,18 @@ let meta.homepage = "https://github.com/lambdalisue/vim-gista/"; }; + vim-git = buildVimPluginFrom2Nix { + pname = "vim-git"; + version = "2020-07-13"; + src = fetchFromGitHub { + owner = "tpope"; + repo = "vim-git"; + rev = "4be54a3e2e300a94f6f7dfa7a6ee9e81245c9886"; + sha256 = "1061l9igdywfbqgwpf2f25yby78phb512hjbyzvqz5l1p7dw1xyd"; + }; + meta.homepage = "https://github.com/tpope/vim-git/"; + }; + vim-gitbranch = buildVimPluginFrom2Nix { pname = "vim-gitbranch"; version = "2017-05-27"; @@ -5173,14 +5329,26 @@ let meta.homepage = "https://github.com/tikhomirov/vim-glsl/"; }; + vim-gnupg = buildVimPluginFrom2Nix { + pname = "vim-gnupg"; + version = "2020-11-11"; + src = fetchFromGitHub { + owner = "jamessan"; + repo = "vim-gnupg"; + rev = "96be0be1240a848da56d665b38e1b0fe7ee3f1af"; + sha256 = "10syaaylyaqn60zhyx008863b5b1349pygg7lnaqchw6bard1135"; + }; + meta.homepage = "https://github.com/jamessan/vim-gnupg/"; + }; + vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2020-12-12"; + version = "2021-01-10"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "2855115efb1dd8a5f4436a80138633a1cb5d9f0c"; - sha256 = "1clq50v9r0mdgvpg3qclrs1ar5939fmi9y8ajpdhi8akwmzwq2z2"; + rev = "d68fc4d71d7c254c8fbd666a470b2d92c8a6d610"; + sha256 = "04py4c52hlb8adkgywkn4hnibrsiczvmmf8b82wfr2sa1k5b9hbx"; }; meta.homepage = "https://github.com/fatih/vim-go/"; }; @@ -5199,12 +5367,12 @@ let vim-graphql = buildVimPluginFrom2Nix { pname = "vim-graphql"; - version = "2020-12-06"; + version = "2020-12-20"; src = fetchFromGitHub { owner = "jparise"; repo = "vim-graphql"; - rev = "2e3b8fb97845136d43d6470c4aa4b73685a904e1"; - sha256 = "1cliwmjw7p7mp0nqhiv2ffmjrq41gx0yd0i46js8a7xyz3fwa0aa"; + rev = "c5169b2705f23cc4926606a7786d8e8fae138d5c"; + sha256 = "19nmdkbd4wcip18bb4inx64mc0awjj3bbahbhpsd8g6d889r9jha"; }; meta.homepage = "https://github.com/jparise/vim-graphql/"; }; @@ -5295,12 +5463,12 @@ let vim-hexokinase = buildVimPluginFrom2Nix { pname = "vim-hexokinase"; - version = "2020-11-03"; + version = "2020-12-31"; src = fetchFromGitHub { owner = "RRethy"; repo = "vim-hexokinase"; - rev = "776f1b2a5df00249e89112655dcda6f9a8492bdb"; - sha256 = "1zxl6injhhsp9r7qjrfjq626yy32vza2lcrcgxsv8m7mf2b11zdp"; + rev = "a7468f62a70d1da85b3fbe7f540a6dbd7a199536"; + sha256 = "1vx48gq0skjmcjrxc8qkvjbqdsap50jrh1gyiqmm9s9rqxzsi4hs"; fetchSubmodules = true; }; meta.homepage = "https://github.com/RRethy/vim-hexokinase/"; @@ -5428,12 +5596,12 @@ let vim-illuminate = buildVimPluginFrom2Nix { pname = "vim-illuminate"; - version = "2020-12-13"; + version = "2021-01-11"; src = fetchFromGitHub { owner = "RRethy"; repo = "vim-illuminate"; - rev = "b4a95300782781e2c27611e3bdeaadf2a8e75e56"; - sha256 = "1zabzl6zsxl2q60ipsrig3289l4gsglyf0w77vgfl0sxbhh3ii2q"; + rev = "19bfdcaafcc15b2d891c6c523c4ce80dfbba965a"; + sha256 = "0c586j1icllyl0y54dayn4204w0rvfvv9srz51rk6k1n7rghr72n"; }; meta.homepage = "https://github.com/RRethy/vim-illuminate/"; }; @@ -5524,12 +5692,12 @@ let vim-javacomplete2 = buildVimPluginFrom2Nix { pname = "vim-javacomplete2"; - version = "2020-11-16"; + version = "2021-01-04"; src = fetchFromGitHub { owner = "artur-shaik"; repo = "vim-javacomplete2"; - rev = "1a0cd30af7a4d3a0fd2a053b380c92057431325a"; - sha256 = "1p82shirc11z78w82h13d7ih9l1akas6brbylkp3qwrp0pxkxpnw"; + rev = "c59ac683bd2fd6164e8ab772ab16c1f4c82130a5"; + sha256 = "04mk200wbgg007qm3qxzckcz1nxrmvr6da31bf82ilzjf5vwhr52"; }; meta.homepage = "https://github.com/artur-shaik/vim-javacomplete2/"; }; @@ -5621,12 +5789,12 @@ let vim-jsx-pretty = buildVimPluginFrom2Nix { pname = "vim-jsx-pretty"; - version = "2020-11-07"; + version = "2021-01-12"; src = fetchFromGitHub { owner = "MaxMEllon"; repo = "vim-jsx-pretty"; - rev = "8059c9269ab62ffc4ccca587e2a2a894806fa5e6"; - sha256 = "04jmmyz79mrq7mpl9kqrc8v28gn50jl93lzkyyhzp7dyhixgbgkm"; + rev = "6989f1663cc03d7da72b5ef1c03f87e6ddb70b41"; + sha256 = "16d76jvfb1cq591i06fnmgzv0q16g89zz7cmvgvj24vap2wgkbp8"; }; meta.homepage = "https://github.com/MaxMEllon/vim-jsx-pretty/"; }; @@ -5645,12 +5813,12 @@ let vim-kitty-navigator = buildVimPluginFrom2Nix { pname = "vim-kitty-navigator"; - version = "2020-09-16"; + version = "2020-12-16"; src = fetchFromGitHub { owner = "knubie"; repo = "vim-kitty-navigator"; - rev = "ebdf6988bac3d1ebc45b3e51a86f3c065cf60c24"; - sha256 = "0zw24lhgs37lpbbdv2ir9s7g0fd3gjhjx2kvv54cs6mjszg2qmsm"; + rev = "ee9252c62bcdc22e8326373ba1716442658b19d1"; + sha256 = "1885gwbv2a4bwwydn129hd7xjgqp0cfjqkm0zw8lfylxgxadg0zb"; }; meta.homepage = "https://github.com/knubie/vim-kitty-navigator/"; }; @@ -5801,48 +5969,48 @@ let vim-lsc = buildVimPluginFrom2Nix { pname = "vim-lsc"; - version = "2020-11-14"; + version = "2021-01-05"; src = fetchFromGitHub { owner = "natebosch"; repo = "vim-lsc"; - rev = "b3d239f71c02b274fcb74ebc57b836810f978da9"; - sha256 = "1vs50npx5bx13wmlbfl7dk48ifvn0kn1l4qal14sdzlv56y6hy57"; + rev = "9f914a4859d911d8a152ff828ad093198fee8763"; + sha256 = "0xvzwnfmgix6cz3xzzl9v9aslassnp6jkjpv5q2qngfrf33z8j9j"; }; meta.homepage = "https://github.com/natebosch/vim-lsc/"; }; vim-lsp = buildVimPluginFrom2Nix { pname = "vim-lsp"; - version = "2020-12-13"; + version = "2021-01-13"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "vim-lsp"; - rev = "9dce8c50ed845b1f68d03875007c0a8a47b5490a"; - sha256 = "0csvrd52i9cd2vwkc0rfsi598zi217kg67w87yjmh9v16bjjdmb4"; + rev = "3bca7e8c8a794fde38075e7df9d14c286d055a84"; + sha256 = "1x9rb34a9542rn2dx2kaz4iq83swpq56144h81pr8l080r6vi2l6"; }; meta.homepage = "https://github.com/prabirshrestha/vim-lsp/"; }; vim-lsp-cxx-highlight = buildVimPluginFrom2Nix { pname = "vim-lsp-cxx-highlight"; - version = "2020-08-12"; + version = "2020-12-23"; src = fetchFromGitHub { owner = "jackguo380"; repo = "vim-lsp-cxx-highlight"; - rev = "7c47d39d808118f0ef030b15db28ff3995d91cb6"; - sha256 = "0yiyxfhicqhhpp83ilknngr8l9r8z9bchkn3xd2ri8bx0bm7i4l7"; + rev = "f42db17e0917e6011a1d3581c3a8f29efab8ed93"; + sha256 = "0n67ap7zi888xin7c7ag8sk7hjrzg36mlpg42rqfgx66k6dm0455"; }; meta.homepage = "https://github.com/jackguo380/vim-lsp-cxx-highlight/"; }; vim-maktaba = buildVimPluginFrom2Nix { pname = "vim-maktaba"; - version = "2020-09-23"; + version = "2020-12-23"; src = fetchFromGitHub { owner = "google"; repo = "vim-maktaba"; - rev = "cdf8247c0abd251475be26a044b2e95698df6c09"; - sha256 = "0i4926gw06m8pqqn8a8k2xsxxg0pm3q8q1k3xd0imxi3gkyvz1fq"; + rev = "46730b0d818da2da005e3c8a38ff987a2dd36d7c"; + sha256 = "1lc4lysv3q7qvivfrwqggrpdgsb3zkhq1clvzfsxfsa2m1y4gr0z"; }; meta.homepage = "https://github.com/google/vim-maktaba/"; }; @@ -5898,12 +6066,12 @@ let vim-matchup = buildVimPluginFrom2Nix { pname = "vim-matchup"; - version = "2020-12-09"; + version = "2021-01-13"; src = fetchFromGitHub { owner = "andymass"; repo = "vim-matchup"; - rev = "24407e21e0a977e67774f70e0065dd3fea8d7595"; - sha256 = "03bmlvvfsyr5ccfjfrnl1r5wzkvarmdbm735abal02pifni05k1r"; + rev = "c74467ea130f99bc97697f91b0e5369f958e6333"; + sha256 = "0w03l0iri8wsjm3fz3ysqqhl38gkfqci4b3dfkbshy2civpg2g7j"; }; meta.homepage = "https://github.com/andymass/vim-matchup/"; }; @@ -6018,24 +6186,24 @@ let vim-mundo = buildVimPluginFrom2Nix { pname = "vim-mundo"; - version = "2020-11-08"; + version = "2020-12-29"; src = fetchFromGitHub { owner = "simnalamburt"; repo = "vim-mundo"; - rev = "33a91cc55ebc7a55b8846c46f0ab50ec0d81613f"; - sha256 = "18qbmnwlwf9hmak73zam44daf6c50hi72b9g8ra7v1l5psgi39z7"; + rev = "4f8628caebe393ac1b84564e965f894d89a7582d"; + sha256 = "0hmww1xln0rvvi8hy7sv9arjwlp40ks0b07irzqpm5xi93hgyq2n"; }; meta.homepage = "https://github.com/simnalamburt/vim-mundo/"; }; vim-nerdtree-syntax-highlight = buildVimPluginFrom2Nix { pname = "vim-nerdtree-syntax-highlight"; - version = "2020-07-19"; + version = "2021-01-11"; src = fetchFromGitHub { owner = "tiagofumo"; repo = "vim-nerdtree-syntax-highlight"; - rev = "1acc12aa7f773ede38538293332905f1ba3fea6a"; - sha256 = "0zm023mhi1si9g5r46md1v4rlls6z2m6kyn1jcfxjqyrgba67899"; + rev = "5178ee4d7f4e7761187df30bb709f703d91df18a"; + sha256 = "0i690a9sd3a9193mdm150q5yx43mihpzkm0k5glllsmnwpngrq1a"; }; meta.homepage = "https://github.com/tiagofumo/vim-nerdtree-syntax-highlight/"; }; @@ -6114,12 +6282,12 @@ let vim-numbertoggle = buildVimPluginFrom2Nix { pname = "vim-numbertoggle"; - version = "2017-10-26"; + version = "2021-01-12"; src = fetchFromGitHub { owner = "jeffkreeftmeijer"; repo = "vim-numbertoggle"; - rev = "cfaecb9e22b45373bb4940010ce63a89073f6d8b"; - sha256 = "1rrmvv7ali50rpbih1s0fj00a3hjspwinx2y6nhwac7bjsnqqdwi"; + rev = "df9b1fe616507340718716204ba7f434125bdf7a"; + sha256 = "02zgzkwv2fk4zyg6agvski054nwkrm1m9dw0jpva57ksbf8rvqrg"; }; meta.homepage = "https://github.com/jeffkreeftmeijer/vim-numbertoggle/"; }; @@ -6138,12 +6306,12 @@ let vim-ocaml = buildVimPluginFrom2Nix { pname = "vim-ocaml"; - version = "2020-10-11"; + version = "2021-01-10"; src = fetchFromGitHub { owner = "ocaml"; repo = "vim-ocaml"; - rev = "023a2a464e7a096779d3e541ee7d1dbe61148f6a"; - sha256 = "0wj945n3da9bzcj5n8002m4vrzv9cgk6sqcc7nyc1x34y9452z94"; + rev = "f51b69f46d5eb0ebbdfcd39b5aa36bfd9454eafd"; + sha256 = "0fs5pn2hhi0mnjz0xpjl0sh4032s4n4afzjrnhygw9l9a5m51dm4"; }; meta.homepage = "https://github.com/ocaml/vim-ocaml/"; }; @@ -6220,6 +6388,18 @@ let meta.homepage = "https://github.com/fcpg/vim-osc52/"; }; + vim-oscyank = buildVimPluginFrom2Nix { + pname = "vim-oscyank"; + version = "2021-01-11"; + src = fetchFromGitHub { + owner = "ojroques"; + repo = "vim-oscyank"; + rev = "ffac2ecab211469a1f9a4d17d42bc543214112f5"; + sha256 = "08vkalypqcrj4p2znx2gih7b1i87pk2ygybvl8a7hby13gwrm8v1"; + }; + meta.homepage = "https://github.com/ojroques/vim-oscyank/"; + }; + vim-over = buildVimPluginFrom2Nix { pname = "vim-over"; version = "2020-01-26"; @@ -6318,12 +6498,12 @@ let vim-pathogen = buildVimPluginFrom2Nix { pname = "vim-pathogen"; - version = "2020-01-17"; + version = "2021-01-04"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-pathogen"; - rev = "c6bc42404597c718e4a032a98e21e63321cbb05a"; - sha256 = "1scj84vlrn2kavnq2wabhdzhnlkb3w046grv9j3976i5ykjmyiif"; + rev = "e0a3efbda5ea8e5b181b2b232ef6453c05d07732"; + sha256 = "1b9v6k0560b7yf2l9v8n23bm27k3akycrv19wfi50havxdjagw1f"; }; meta.homepage = "https://github.com/tpope/vim-pathogen/"; }; @@ -6402,12 +6582,12 @@ let vim-polyglot = buildVimPluginFrom2Nix { pname = "vim-polyglot"; - version = "2020-11-27"; + version = "2021-01-03"; src = fetchFromGitHub { owner = "sheerun"; repo = "vim-polyglot"; - rev = "73c518717741fb3ebb6822645d38f37ffae7c19b"; - sha256 = "08zwvnlg08v3h04iw754wl9wkirqcvqip86hh4m7bxxl0qkysnv6"; + rev = "7bde552a463999897320a1899a6ca4f8806041ea"; + sha256 = "1rc9dfpl7x2fmqcm954x1syfcl392vsrcgid2pm6p91j3drm78nq"; }; meta.homepage = "https://github.com/sheerun/vim-polyglot/"; }; @@ -6510,12 +6690,12 @@ let vim-puppet = buildVimPluginFrom2Nix { pname = "vim-puppet"; - version = "2019-09-16"; + version = "2021-01-13"; src = fetchFromGitHub { owner = "rodjek"; repo = "vim-puppet"; - rev = "fc6e9efef797c505b2e67631ad2517d7d6e8f00d"; - sha256 = "0a4qv8f74g6c2i9l6kv3zbcq9lskhdqg86w12f8hshw1vkfmfr4x"; + rev = "cee73ec40ee21083c3fc1e1fede2c288fa46c2c3"; + sha256 = "0mbsslhwjnjg8l39pbqj4zlirqvysj21xq01fb6dnld7rl7qrxyg"; }; meta.homepage = "https://github.com/rodjek/vim-puppet/"; }; @@ -6630,12 +6810,12 @@ let vim-rhubarb = buildVimPluginFrom2Nix { pname = "vim-rhubarb"; - version = "2020-11-29"; + version = "2020-12-18"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-rhubarb"; - rev = "857865bdab4bf134789484c36181346fdc29ccb9"; - sha256 = "1jwg3nij3skha4wspb833wqarqrmsxg6apry40m9s1l4gc1c3cz5"; + rev = "d865e427d067af57d85cf2b7d2bc1912eb84d0bf"; + sha256 = "1gcphxq52jx96fzf6xkq7mxvgyhjn6yzh7l5qc9h18lqmax9gqw2"; }; meta.homepage = "https://github.com/tpope/vim-rhubarb/"; }; @@ -6834,12 +7014,12 @@ let vim-slime = buildVimPluginFrom2Nix { pname = "vim-slime"; - version = "2020-12-05"; + version = "2021-01-09"; src = fetchFromGitHub { owner = "jpalardy"; repo = "vim-slime"; - rev = "59d5e6c4bd99f6a1825ec83e9d56a333b12be36b"; - sha256 = "0679rn285z4v237gmxnkxdsx4gc0phh453bnhynsmr353x5a6gn3"; + rev = "72171eaaf176d7eb3f73ecebf86ff3e5f4ba7dbd"; + sha256 = "0rcy6p4g8784w2dbbq0b7y1z3anqjpvycns40d556vbf1y1pbc41"; }; meta.homepage = "https://github.com/jpalardy/vim-slime/"; }; @@ -6858,12 +7038,12 @@ let vim-smoothie = buildVimPluginFrom2Nix { pname = "vim-smoothie"; - version = "2020-12-13"; + version = "2020-12-25"; src = fetchFromGitHub { owner = "psliwka"; repo = "vim-smoothie"; - rev = "a0414d1203e55d21b2b81050173c1c76bf0f854f"; - sha256 = "1ixz25fbdzcip324h9mkkmdfrwk3f0fqafrs5cnzmk5bcg9c22rv"; + rev = "1f5ee84b789384a273b3e27b6a5a7e2f54dbc30e"; + sha256 = "0977qb31hgss38g01m7ikx3qdqial3c7zw9cv72k7rnmcgy761wz"; }; meta.homepage = "https://github.com/psliwka/vim-smoothie/"; }; @@ -6894,24 +7074,24 @@ let vim-snipmate = buildVimPluginFrom2Nix { pname = "vim-snipmate"; - version = "2020-10-02"; + version = "2021-01-13"; src = fetchFromGitHub { owner = "garbas"; repo = "vim-snipmate"; - rev = "68eebf9dabe5c1d1964e78dda188765f224bab34"; - sha256 = "1mxa373ry17zwszd089k99lbgr5pg46x5dlahpk0l68ksxpkbxir"; + rev = "a5b5dd46e9c2b796599ff4530e1c8d29fdd77945"; + sha256 = "05k6irv1p8kglznz9pfdzlb3qplf6y1k4x9qr3zcidv79hldg0b5"; }; meta.homepage = "https://github.com/garbas/vim-snipmate/"; }; vim-snippets = buildVimPluginFrom2Nix { pname = "vim-snippets"; - version = "2020-12-14"; + version = "2021-01-11"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "e7a8a3fb439e22a9d55b050f3cab5c962b8d5aa7"; - sha256 = "1s6xmyfkg2iqlgg3zgygfa3p3d2fbyinylffdn2iy384q0fjn7lw"; + rev = "29d37483c4a8dad8baf0684f73541f6364dd3734"; + sha256 = "0dav4125sjrbj5mg0d76ivsadz9mh8skzaixzifxs2cq2zl3n0s1"; }; meta.homepage = "https://github.com/honza/vim-snippets/"; }; @@ -6942,12 +7122,12 @@ let vim-sourcetrail = buildVimPluginFrom2Nix { pname = "vim-sourcetrail"; - version = "2020-11-24"; + version = "2020-12-21"; src = fetchFromGitHub { owner = "CoatiSoftware"; repo = "vim-sourcetrail"; - rev = "103ad3f96ebf3518494350afaa72763e9e769eec"; - sha256 = "1hpin1x5l8k54qkckc8v3c2gkv1sbqj3hxikwa0vxr5mz0zaz2wc"; + rev = "b603ee7cf5c751918efc40014b9cfb40bf19ec32"; + sha256 = "1yssa2yll5q61mffwxiq8swpzq80xxypyzr7svn8acwrakn0dx5r"; }; meta.homepage = "https://github.com/CoatiSoftware/vim-sourcetrail/"; }; @@ -7123,12 +7303,12 @@ let vim-test = buildVimPluginFrom2Nix { pname = "vim-test"; - version = "2020-12-01"; + version = "2021-01-03"; src = fetchFromGitHub { owner = "vim-test"; repo = "vim-test"; - rev = "180c8ced850ed288bf7ce9c44c6b4451f995f275"; - sha256 = "0yza1lgilgg1qlpcw4kg5232mylbqjb0gar0l4rjxk6i7xvpxryi"; + rev = "d170b48bd167ff06ac83d71834135f42bf4dad4a"; + sha256 = "0pqh5zqn11fv0653zdkiad066clw29amhdqnm5nz1rcx8vmpparq"; }; meta.homepage = "https://github.com/vim-test/vim-test/"; }; @@ -7387,12 +7567,12 @@ let vim-visual-multi = buildVimPluginFrom2Nix { pname = "vim-visual-multi"; - version = "2020-12-08"; + version = "2021-01-06"; src = fetchFromGitHub { owner = "mg979"; repo = "vim-visual-multi"; - rev = "20a59dd6b82fa838f92a333061f40c8db0e41ffb"; - sha256 = "0kkldla4rjw0gk7nvrq5l08nvpfhf6hmsmp4z0k9z4hin3yiddav"; + rev = "d95d4c31a7919f58e9bb89bfc0c3a272461d782d"; + sha256 = "1xnixwq6rddvs0za76sic3sf5fk0v10cdrsyaz3d6y0g0qmv9cz0"; }; meta.homepage = "https://github.com/mg979/vim-visual-multi/"; }; @@ -7411,24 +7591,24 @@ let vim-vsnip = buildVimPluginFrom2Nix { pname = "vim-vsnip"; - version = "2020-12-06"; + version = "2021-01-07"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "vim-vsnip"; - rev = "17afebf49f3a13a4dbf44c90c0b5a9caf1cdbeb4"; - sha256 = "0xarnz4d9liwckgblckjma5yc66mal4ilggfjcr41i68h6mhdj88"; + rev = "5917d944b259baab85c9c249a8be33a82cd033d3"; + sha256 = "0gj5qjrb31j93vv8wpqlhdpsgrnkwaxvhvslkjj9m3fnx34gqvdv"; }; meta.homepage = "https://github.com/hrsh7th/vim-vsnip/"; }; vim-vsnip-integ = buildVimPluginFrom2Nix { pname = "vim-vsnip-integ"; - version = "2020-11-09"; + version = "2020-12-31"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "vim-vsnip-integ"; - rev = "8f171eac11eb7668a33991953f9ae5af9556cc59"; - sha256 = "0a8f1nblgwdv7z0ycxlx5arx68dgg5qzvwwgws18lpf201qp07sx"; + rev = "60dfbb0dc73cfc4828e9328251a46ccbd7e9b5fe"; + sha256 = "0nv8imllzpm5zvg2n3c5mb7lc1v1fn6jmqy8vgmv2fp1050p3dy3"; }; meta.homepage = "https://github.com/hrsh7th/vim-vsnip-integ/"; }; @@ -7447,12 +7627,12 @@ let vim-wakatime = buildVimPluginFrom2Nix { pname = "vim-wakatime"; - version = "2020-11-02"; + version = "2020-12-29"; src = fetchFromGitHub { owner = "wakatime"; repo = "vim-wakatime"; - rev = "c725124ae8885ca6da4fe5cd03bda4bd77dc3fd1"; - sha256 = "1mvvqbjszp6mc0rq6m1nj7cyy44z4xf2h4lc561wkfblhhk9j4i6"; + rev = "45dfc28c30b44041183d749cf724e3dba9ac65ef"; + sha256 = "1ipdynpg9v5mll1zimyiaxw4zzj004myh5xjky32z783lgi0qlxl"; }; meta.homepage = "https://github.com/wakatime/vim-wakatime/"; }; @@ -7471,12 +7651,12 @@ let vim-which-key = buildVimPluginFrom2Nix { pname = "vim-which-key"; - version = "2020-12-15"; + version = "2020-12-21"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-which-key"; - rev = "9d08a9416787ef0f3ede6ef9bc66f78cecf6d72b"; - sha256 = "1adb3r9iyni86k2hxrkj4hr7zdz0v9a1h84dn0yhjy1dwgwlxjrq"; + rev = "c5322b2f67bc627d467e527a530ff6695ccd3dbd"; + sha256 = "0j3pnbg0a2rcjfp691v7wzcp9bqan24qvdl4fxzljipl2lyim0qb"; }; meta.homepage = "https://github.com/liuchengxu/vim-which-key/"; }; @@ -7651,12 +7831,12 @@ let vimsence = buildVimPluginFrom2Nix { pname = "vimsence"; - version = "2020-11-02"; + version = "2021-01-01"; src = fetchFromGitHub { owner = "hugolgst"; repo = "vimsence"; - rev = "433875b4a994582a28795f8944af10d935b64322"; - sha256 = "117yxp3bzhrdi03r2d2zr1r2702czkxamdvgcxr62gysdgbz5i9z"; + rev = "d135a75530d2ad4d034a5a2515136f043ffcecb2"; + sha256 = "0v0qbqms513c4fcwa69d175ylkzb9n5i93gz1pqlcgnfmzdsfn22"; }; meta.homepage = "https://github.com/hugolgst/vimsence/"; }; @@ -7675,12 +7855,12 @@ let vimspector = buildVimPluginFrom2Nix { pname = "vimspector"; - version = "2020-12-14"; + version = "2021-01-10"; src = fetchFromGitHub { owner = "puremourning"; repo = "vimspector"; - rev = "61179b7670491a70b40cb34ddeefe793bee7fcb8"; - sha256 = "1gqfmvp1fzrj3zl21viqamjvfhjxw2qxs7ssvwblv3jympm27aww"; + rev = "52eff3265181bbbe5338818dc5bc196e234cea45"; + sha256 = "1j4f3762zpw4qvqiyrq1ym4lk78w3r93ya70id7g6w4pviaqcv1j"; fetchSubmodules = true; }; meta.homepage = "https://github.com/puremourning/vimspector/"; @@ -7688,12 +7868,12 @@ let vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2020-12-12"; + version = "2021-01-13"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "83f4b63d4043aeb808c8cdc01f883c9a95446530"; - sha256 = "10d72r81m2cr4vzp61l8kg9bcpkrwbbx7wqxicqj1j00xln7p29i"; + rev = "aebcaddf2ede37e04812a2804b0d951dacdfa150"; + sha256 = "0cf94yv9zmksnvsv4d8xyqk48d4v3k7zs1cb01g7l4m34cx0gv99"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -7736,12 +7916,12 @@ let vista-vim = buildVimPluginFrom2Nix { pname = "vista-vim"; - version = "2020-12-12"; + version = "2021-01-01"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vista.vim"; - rev = "3a1809ccf01b6acffdc2d5c529a946961266c4d7"; - sha256 = "12n7i5n2if4daafxwnnbnglq4g2gvcx2zsa973cs3fj2jjx0fqvg"; + rev = "691fbce5fa1473c64035fba6e3c7b3876a99cb58"; + sha256 = "0xx06s8syqs3a5b5711zgbjbzqz17pk66vzcazhq08bqgys21alr"; }; meta.homepage = "https://github.com/liuchengxu/vista.vim/"; }; @@ -7856,12 +8036,12 @@ let yats-vim = buildVimPluginFrom2Nix { pname = "yats-vim"; - version = "2020-12-06"; + version = "2021-01-10"; src = fetchFromGitHub { owner = "HerringtonDarkholme"; repo = "yats.vim"; - rev = "a488d15f535cddd2acc6c8b77c6c4381debcadbf"; - sha256 = "0rxv4hmpw0lcmp99kcgax4yll6m896d5vljv1hb7ycmz1q25ij52"; + rev = "ac6057f57e0d96ee744635e35cacf2f2d3037d95"; + sha256 = "037vmmnhir217ais2bnl6lskbpdh2wfmjq6qmjvrdp2ylwscm81d"; fetchSubmodules = true; }; meta.homepage = "https://github.com/HerringtonDarkholme/yats.vim/"; @@ -7869,12 +8049,12 @@ let YouCompleteMe = buildVimPluginFrom2Nix { pname = "YouCompleteMe"; - version = "2020-12-16"; + version = "2020-12-31"; src = fetchFromGitHub { owner = "ycm-core"; repo = "YouCompleteMe"; - rev = "e252f6512f1f4a9a515dfc42401baf30a5fe72c8"; - sha256 = "0f0jrap8ivrywkzc7rwy27p6ssa5kll26df251ipsg1frmc7fmjm"; + rev = "2434b104065be4590f07ad950d0943b7194f01e6"; + sha256 = "0hhwqb5w84bi28h27wmisx4mb91xc6jbdh004d5994bl2098yrf8"; fetchSubmodules = true; }; meta.homepage = "https://github.com/ycm-core/YouCompleteMe/"; @@ -7918,12 +8098,12 @@ let zig-vim = buildVimPluginFrom2Nix { pname = "zig-vim"; - version = "2020-10-09"; + version = "2020-12-31"; src = fetchFromGitHub { owner = "ziglang"; repo = "zig.vim"; - rev = "fa5f6d7c5be47bd32dcc69ccf980fc585575cc38"; - sha256 = "0szrnp27ccl93fbn1j9ybsld1l6j3xdrnx6dsf01gdxidm3w60f3"; + rev = "ef331a76f0d660a67504e1cd0d981c345db3607f"; + sha256 = "0976539h1zsxrnihp5x5lvra12iwvjbbrl5nw6f914yh09jqbgjf"; }; meta.homepage = "https://github.com/ziglang/zig.vim/"; }; diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index b1846276276b..c914ac62b835 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -231,7 +231,7 @@ self: super: { }); vimsence = super.vimsence.overrideAttrs(old: { - meta = with stdenv.lib; { + meta = with lib; { description = "Discord rich presence for Vim"; homepage = "https://github.com/hugolgst/vimsence"; maintainers = with stdenv.lib.maintainers; [ hugolgst ]; @@ -321,7 +321,7 @@ self: super: { # remove unnecessary duplicated bin wrapper script rm -r plugin/vimacs ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Vim-Improved eMACS: Emacs emulation plugin for Vim"; homepage = "http://algorithm.com.au/code/vimacs"; license = licenses.gpl2Plus; @@ -395,6 +395,16 @@ self: super: { passthru.python3Dependencies = ps: with ps; [ beancount ]; }); + vim-closer = super.vim-closer.overrideAttrs(old: { + patches = [ + # Fix duplicate tag in doc + (fetchpatch { + url = "https://github.com/rstacruz/vim-closer/commit/a504be8c7050e41b7dfc50c2362948e2cf7c5422.patch"; + sha256 = "065q30d913fm3pc7r5y53wmnb7q7bhv21qxavm65bkb91242d409"; + }) + ]; + }); + vim-codefmt = super.vim-codefmt.overrideAttrs(old: { dependencies = with super; [ vim-maktaba ]; }); @@ -557,7 +567,7 @@ self: super: { ln -s ${ycmd}/lib/ycmd third_party ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A code-completion engine for Vim"; homepage = "https://github.com/Valloric/YouCompleteMe"; license = licenses.gpl3; @@ -644,7 +654,7 @@ self: super: { libiconv ]; - cargoSha256 = "QUi3GyAsakAtDQkiVA7ez05s5CixqsVSp92svYmcWdQ="; + cargoSha256 = "1738hvqzwr4h1bigsqffc6alkzvir8s6f7mr0xyp21qbf5qkxmq2"; }; in '' ln -s ${maple-bin}/bin/maple $target/bin/maple diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index c559a73b5b52..c61fd8ef3a19 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -1,8 +1,8 @@ 907th/vim-auto-save aca/completion-tabnine +ackyshake/Spacegray.vim@main airblade/vim-gitgutter airblade/vim-rooter -ajh17/Spacegray.vim aklt/plantuml-syntax altercation/vim-colors-solarized alvan/vim-closetag @@ -23,6 +23,7 @@ arcticicestudio/nord-vim artur-shaik/vim-javacomplete2 autozimu/LanguageClient-neovim ayu-theme/ayu-vim +bakpakin/fennel.vim bazelbuild/vim-bazel bbchung/clighter8 benizi/vim-automkdir @@ -34,7 +35,7 @@ bling/vim-bufferline blueyed/vim-diminactive bogado/file-line bohlender/vim-smt2 -brennanfee/vim-gui-position +brennanfee/vim-gui-position@main bronson/vim-trailing-whitespace brooth/far.vim buoto/gotests-vim @@ -91,6 +92,7 @@ dpelle/vim-LanguageTool dracula/vim as dracula-vim drewtempelmeyer/palenight.vim drmingdrmer/xptemplate +dstein64/nvim-scrollview@main dylanaraps/wal.vim eagletmt/ghcmod-vim eagletmt/neco-ghc @@ -128,6 +130,7 @@ fszymanski/deoplete-emoji garbas/vim-snipmate gentoo/gentoo-syntax GEverding/vim-hocon +gfanto/fzf-lsp.nvim@main gibiansky/vim-textobj-haskell glts/vim-textobj-comment godlygeek/csapprox @@ -157,6 +160,7 @@ hecal3/vim-leader-guide henrik/vim-indexed-search HerringtonDarkholme/yats.vim honza/vim-snippets +hoob3rt/lualine.nvim hotwatermorning/auto-git-diff hrsh7th/vim-vsnip hrsh7th/vim-vsnip-integ @@ -180,6 +184,7 @@ ivanov/vim-ipython jackguo380/vim-lsp-cxx-highlight jacoborus/tender.vim jakwings/vim-pony +jamessan/vim-gnupg@main jaredgorski/SpaceCamp jaxbot/semantic-highlight.vim JazzCore/ctrlp-cmatcher @@ -201,6 +206,7 @@ jnurmine/zenburn jonbri/vim-colorstepper jonsmithers/vim-html-template-literals joonty/vim-xdebug +josa42/coc-lua josa42/vim-lightline-coc joshdick/onedark.vim jpalardy/vim-slime@main @@ -228,6 +234,7 @@ justincampbell/vim-eighties justinj/vim-pico8-syntax justinmk/vim-dirvish justinmk/vim-sneak +jvoorhis/coq.vim KabbAmine/vCoolor.vim KabbAmine/zeavim.vim kalbasit/vim-colemak @@ -246,6 +253,7 @@ keith/swift.vim kien/rainbow_parentheses.vim knubie/vim-kitty-navigator konfekt/fastfold +konfekt/vim-DetectSpellLang kristijanhusak/defx-git kristijanhusak/defx-icons kristijanhusak/deoplete-phpactor @@ -255,6 +263,7 @@ kristijanhusak/vim-hybrid-material kshenoy/vim-signature kyazdani42/nvim-tree.lua kyazdani42/nvim-web-devicons +lambdalisue/fern.vim lambdalisue/vim-gista lambdalisue/vim-manpager lambdalisue/vim-pager @@ -388,6 +397,7 @@ numirias/semshi nvie/vim-flake8 nvim-lua/completion-nvim nvim-lua/diagnostic-nvim +nvim-lua/lsp-status.nvim nvim-lua/lsp_extensions.nvim nvim-lua/plenary.nvim nvim-lua/popup.nvim @@ -399,6 +409,8 @@ nvim-treesitter/nvim-treesitter-textobjects nvim-treesitter/playground ocaml/vim-ocaml octol/vim-cpp-enhanced-highlight +ojroques/vim-oscyank@main +Olical/aniseed Olical/conjure OrangeT/vim-csharp osyo-manga/shabadou.vim @@ -465,6 +477,7 @@ roxma/nvim-yarp roxma/vim-tmux-clipboard RRethy/vim-hexokinase RRethy/vim-illuminate +rstacruz/vim-closer rust-lang/rust.vim ryanoasis/vim-devicons ryvnf/readline.vim @@ -507,8 +520,8 @@ slashmili/alchemist.vim sodapopcan/vim-twiggy solarnz/arcanist.vim sonph/onehalf -steelsojka/completion-buffers srcery-colors/srcery-vim +steelsojka/completion-buffers stefandtw/quickfix-reflector.vim stephpy/vim-yaml sunaku/vim-dasht @@ -545,6 +558,7 @@ tommcdo/vim-ninja-feet tomtom/tcomment_vim tomtom/tlib_vim tpope/vim-abolish +tpope/vim-capslock tpope/vim-commentary tpope/vim-dadbod tpope/vim-dispatch @@ -553,6 +567,7 @@ tpope/vim-eunuch tpope/vim-fireplace tpope/vim-flagship tpope/vim-fugitive +tpope/vim-git tpope/vim-liquid tpope/vim-obsession tpope/vim-pathogen diff --git a/pkgs/misc/vscode-extensions/cpptools/default.nix b/pkgs/misc/vscode-extensions/cpptools/default.nix index f6c765383ea3..bb547b3d34d0 100644 --- a/pkgs/misc/vscode-extensions/cpptools/default.nix +++ b/pkgs/misc/vscode-extensions/cpptools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, vscode-utils +{ lib, stdenv, vscode-utils , fetchurl, unzip , mono, writeScript, runtimeShell , jq, clang-tools @@ -92,7 +92,7 @@ vscode-utils.buildVscodeMarketplaceExtension rec { chmod a+x ./bin/cpptools{-srv,} ''; - meta = with stdenv.lib; { + meta = with lib; { license = licenses.unfree; maintainers = [ maintainers.jraygauthier ]; # A 32 bit linux would also be possible with some effort (specific download of binaries + diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index 4c6446436585..a40faed134fe 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -36,6 +36,18 @@ let }; }; + alexdima.copy-relative-path = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "copy-relative-path"; + publisher = "alexdima"; + version = "0.0.2"; + sha256 = "06g601n9d6wyyiz659w60phgm011gn9jj5fy0gf5wpi2bljk3vcn"; + }; + meta = { + license = lib.licenses.mit; + }; + }; + ms-python.vscode-pylance = buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-pylance"; @@ -58,11 +70,23 @@ let version = "1.0.1"; sha256 = "0zd0n9f5z1f0ckzfjr38xw2zzmcxg1gjrava7yahg5cvdcw6l35b"; }; - meta = with stdenv.lib; { + meta = with lib; { license = licenses.mit; }; }; + brettm12345.nixfmt-vscode = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "nixfmt-vscode"; + publisher = "brettm12345"; + version = "0.0.1"; + sha256 = "07w35c69vk1l6vipnq3qfack36qcszqxn8j3v332bl0w6m02aa7k"; + }; + meta = with lib; { + license = licenses.mpl20; + }; + }; + cmschuetz12.wal = buildVscodeMarketplaceExtension { mktplcRef = { name = "wal"; @@ -70,7 +94,19 @@ let version = "0.1.0"; sha256 = "0q089jnzqzhjfnv0vlb5kf747s3mgz64r7q3zscl66zb2pz5q4zd"; }; - meta = with stdenv.lib; { + meta = with lib; { + license = licenses.mit; + }; + }; + + coenraads.bracket-pair-colorizer-2 = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "bracket-pair-colorizer-2"; + publisher = "CoenraadS"; + version = "0.2.0"; + sha256 = "0nppgfbmw0d089rka9cqs3sbd5260dhhiipmjfga3nar9vp87slh"; + }; + meta = with lib; { license = licenses.mit; }; }; @@ -107,6 +143,34 @@ let }; }; + formulahendry.auto-rename-tag = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "auto-rename-tag"; + publisher = "formulahendry"; + version = "0.1.6"; + sha256 = "0cqg9mxkyf41brjq2c764w42lzyn6ffphw6ciw7xnqk1h1x8wwbs"; + }; + meta = { + license = stdenv.lib.licenses.mit; + }; + }; + + github.github-vscode-theme = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "github-vscode-theme"; + publisher = "github"; + version = "1.1.5"; + sha256 = "10f0098cce026d1f0c855fb7a66ea60b5d8acd2b76126ea94fe7361e49cd9ed2"; + }; + meta = with lib; { + description = "GitHub theme for VS Code"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=GitHub.github-vscode-theme"; + homepage = "https://github.com/primer/github-vscode-theme"; + license = licenses.mit; + maintainers = with maintainers; [ hugolgst ]; + }; + }; + golang.Go = buildVscodeMarketplaceExtension { mktplcRef = { name = "Go"; @@ -126,7 +190,19 @@ let version = "1.1.0"; sha256 = "1wg06lyk0qn9jd6gi007sg7v0z9z8gwq7x2449d4ihs9n3w5l0gb"; }; - meta = with stdenv.lib; { + meta = with lib; { + license = licenses.mit; + }; + }; + + ibm.output-colorizer = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "output-colorizer"; + publisher = "IBM"; + version = "0.1.2"; + sha256 = "0i9kpnlk3naycc7k8gmcxas3s06d67wxr3nnyv5hxmsnsx5sfvb7"; + }; + meta = with lib; { license = licenses.mit; }; }; @@ -138,11 +214,23 @@ let version = "8.2.0"; sha256 = "1ai16aam4v5jzhxgms589q0l24kyk1a9in6z4i7g05b3sahyxab2"; }; - meta = with stdenv.lib; { + meta = with lib; { license = licenses.mit; }; }; + jnoortheen.nix-ide = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "nix-ide"; + publisher = "jnoortheen"; + version = "0.1.7"; + sha256 = "1bw4wyq9abimxbhl7q9g8grvj2ax9qqq6mmqbiqlbsi2arvk0wrm"; + }; + meta = { + license = stdenv.lib.licenses.mit; + }; + }; + justusadam.language-haskell = buildVscodeMarketplaceExtension { mktplcRef = { name = "language-haskell"; @@ -167,6 +255,18 @@ let }; }; + mechatroner.rainbow-csv = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "rainbow-csv"; + publisher = "mechatroner"; + version = "1.7.1"; + sha256 = "0w5mijs4ll5qjkpyw7qpn1k40pq8spm0b3q72x150ydbcini5hxw"; + }; + meta = { + license = stdenv.lib.licenses.mit; + }; + }; + ms-azuretools.vscode-docker = buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-docker"; @@ -237,6 +337,18 @@ let }; }; + ryu1kn.partial-diff = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "partial-diff"; + publisher = "ryu1kn"; + version = "1.4.1"; + sha256 = "1r4kg4slgxncdppr4fn7i5vfhvzcg26ljia2r97n6wvwn8534vs9"; + }; + meta = { + license = stdenv.lib.licenses.mit; + }; + }; + scala-lang.scala = buildVscodeMarketplaceExtension { mktplcRef = { name = "scala"; @@ -280,7 +392,7 @@ let version = "0.2.1"; sha256 = "0y1ivymn81ranmir25zk83kdjpjwcqpnc9r3jwfykjd9x0jib2hl"; }; - meta = with stdenv.lib; { + meta = with lib; { license = licenses.mit; }; }; @@ -297,10 +409,34 @@ let }; }; + tyriar.sort-lines = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "sort-lines"; + publisher = "Tyriar"; + version = "1.9.0"; + sha256 = "0l4wibsjnlbzbrl1wcj18vnm1q4ygvxmh347jvzziv8f1l790qjl"; + }; + meta = { + license = stdenv.lib.licenses.mit; + }; + }; + vadimcn.vscode-lldb = callPackage ./vscode-lldb { lldb = llvmPackages_latest.lldb; }; + vincaslt.highlight-matching-tag = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "highlight-matching-tag"; + publisher = "vincaslt"; + version = "0.10.0"; + sha256 = "1albwz3lc9i20if77inm1ipwws8apigvx24rbag3d1h3p4vwda49"; + }; + meta = { + license = stdenv.lib.licenses.mit; + }; + }; + ms-vsliveshare.vsliveshare = callPackage ./ms-vsliveshare-vsliveshare {}; vscodevim.vim = buildVscodeMarketplaceExtension { @@ -322,7 +458,7 @@ let version = "1.9.0"; sha256 = "abd0ef9176eff864f278c548c944032b8f4d8ec97d9ac6e7383d60c92e258c2f"; }; - meta = with stdenv.lib; { + meta = with lib; { license = licenses.mit; maintainers = [ maintainers.zeratax ]; }; diff --git a/pkgs/misc/vscode-extensions/remote-ssh/default.nix b/pkgs/misc/vscode-extensions/remote-ssh/default.nix index e58ea98a606f..575b9ed490ca 100644 --- a/pkgs/misc/vscode-extensions/remote-ssh/default.nix +++ b/pkgs/misc/vscode-extensions/remote-ssh/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , vscode-utils , useLocalExtensions ? false}: # Note that useLocalExtensions requires that vscode-server is not running @@ -45,7 +45,7 @@ in --replace "# install extensions" '${patch}' ''; - meta = with stdenv.lib; { + meta = with lib; { description ="Use any remote machine with a SSH server as your development environment."; license = licenses.unfree; maintainers = with maintainers; [ diff --git a/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json b/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json index ea91b6d6470e..aba4ba44097a 100644 --- a/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json +++ b/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json @@ -3,24 +3,24 @@ "version": "0.4.0-dev", "dependencies": { "node-fetch": "^2.6.1", - "vscode-languageclient": "7.0.0-next.12", - "@rollup/plugin-commonjs": "^13.0.2", - "@rollup/plugin-node-resolve": "^8.4.0", + "vscode-languageclient": "7.0.0", + "@rollup/plugin-commonjs": "^17.0.0", + "@rollup/plugin-node-resolve": "^11.0.0", "@types/glob": "^7.1.3", - "@types/mocha": "^7.0.2", - "@types/node": "~12.7.0", + "@types/mocha": "^8.0.4", + "@types/node": "~12.12.6", "@types/node-fetch": "^2.5.7", - "@types/vscode": "^1.47.1", - "@typescript-eslint/eslint-plugin": "^3.10.1", - "@typescript-eslint/parser": "^3.10.1", - "eslint": "^7.8.0", + "@types/vscode": "^1.52.0", + "@typescript-eslint/eslint-plugin": "^4.9.0", + "@typescript-eslint/parser": "^4.9.0", + "eslint": "^7.15.0", "glob": "^7.1.6", - "mocha": "^8.1.3", - "rollup": "^2.26.9", - "tslib": "^2.0.1", - "typescript": "^3.9.7", + "mocha": "^8.2.1", + "rollup": "^2.34.2", + "tslib": "^2.0.3", + "typescript": "^4.1.2", "typescript-formatter": "^7.2.2", - "vsce": "^1.79.5", - "vscode-test": "^1.4.0" + "vsce": "^1.81.1", + "vscode-test": "^1.4.1" } } diff --git a/pkgs/misc/vscode-extensions/wakatime/default.nix b/pkgs/misc/vscode-extensions/wakatime/default.nix index b1c7142c5917..336cd059f57a 100644 --- a/pkgs/misc/vscode-extensions/wakatime/default.nix +++ b/pkgs/misc/vscode-extensions/wakatime/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , wakatime, vscode-utils }: let @@ -17,7 +17,7 @@ in cp -rt wakatime-master --no-preserve=all ${wakatime}/lib/python*/site-packages/wakatime ''; - meta = with stdenv.lib; { + meta = with lib; { description = '' Visual Studio Code plugin for automatic time tracking and metrics generated from your programming activity diff --git a/pkgs/misc/xosd/default.nix b/pkgs/misc/xosd/default.nix index 561f915d6636..3190cfb380d8 100644 --- a/pkgs/misc/xosd/default.nix +++ b/pkgs/misc/xosd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libX11, libXext, libXt, xorgproto }: +{ lib, stdenv, fetchurl, libX11, libXext, libXt, xorgproto }: stdenv.mkDerivation rec { pname = "xosd"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ libX11 libXext libXt xorgproto ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Displays text on your screen"; homepage = "https://sourceforge.net/projects/libxosd"; license = licenses.gpl2; diff --git a/pkgs/os-specific/darwin/apple-sdk/default.nix b/pkgs/os-specific/darwin/apple-sdk/default.nix index 97523cf15a8d..a768accdbcb8 100644 --- a/pkgs/os-specific/darwin/apple-sdk/default.nix +++ b/pkgs/os-specific/darwin/apple-sdk/default.nix @@ -51,7 +51,7 @@ let popd ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Apple SDK ${version}"; maintainers = with maintainers; [ copumpkin ]; platforms = platforms.darwin; @@ -183,7 +183,7 @@ let "/System/Library/Frameworks/${name}.framework/${name}" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Apple SDK framework ${name}"; maintainers = with maintainers; [ copumpkin ]; platforms = platforms.darwin; diff --git a/pkgs/os-specific/darwin/apple-source-releases/CarbonHeaders/default.nix b/pkgs/os-specific/darwin/apple-source-releases/CarbonHeaders/default.nix index 5c6d54aeb9c3..9afd4b475de5 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/CarbonHeaders/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/CarbonHeaders/default.nix @@ -1,4 +1,4 @@ -{ stdenv, appleDerivation }: +{ lib, stdenv, appleDerivation }: appleDerivation { dontBuild = true; @@ -12,7 +12,7 @@ appleDerivation { --replace "CarbonCore/" "" ''; - meta = with stdenv.lib; { + meta = with lib; { maintainers = with maintainers; [ copumpkin ]; platforms = platforms.darwin; license = licenses.apsl20; diff --git a/pkgs/os-specific/darwin/apple-source-releases/CommonCrypto/default.nix b/pkgs/os-specific/darwin/apple-source-releases/CommonCrypto/default.nix index ad51f1df2bcd..3e5399dbb355 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/CommonCrypto/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/CommonCrypto/default.nix @@ -1,4 +1,4 @@ -{ stdenv, appleDerivation }: +{ lib, stdenv, appleDerivation }: appleDerivation { installPhase = '' @@ -6,7 +6,7 @@ appleDerivation { cp include/* $out/include/CommonCrypto ''; - meta = with stdenv.lib; { + meta = with lib; { maintainers = with maintainers; [ copumpkin ]; platforms = platforms.darwin; license = licenses.apsl20; diff --git a/pkgs/os-specific/darwin/apple-source-releases/Csu/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Csu/default.nix index 7fd32a64fe57..2f6c8319b1cf 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/Csu/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/Csu/default.nix @@ -1,4 +1,4 @@ -{ stdenv, appleDerivation }: +{ lib, stdenv, appleDerivation }: appleDerivation { prePatch = '' @@ -18,7 +18,7 @@ appleDerivation { installFlags = [ "DSTROOT=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Apple's common startup stubs for darwin"; maintainers = with maintainers; [ copumpkin ]; platforms = platforms.darwin; diff --git a/pkgs/os-specific/darwin/apple-source-releases/IOKit/default.nix b/pkgs/os-specific/darwin/apple-source-releases/IOKit/default.nix index a945409ed7a0..976b977e6023 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/IOKit/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/IOKit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, appleDerivation, IOKitSrcs, xnu, darwin-stubs }: +{ lib, stdenv, appleDerivation, IOKitSrcs, xnu, darwin-stubs }: # Someday it'll make sense to split these out into their own packages, but today is not that day. appleDerivation { @@ -182,7 +182,7 @@ appleDerivation { # video: missing altogether ''; - meta = with stdenv.lib; { + meta = with lib; { maintainers = with maintainers; [ joelteon copumpkin ]; platforms = platforms.darwin; license = licenses.apsl20; diff --git a/pkgs/os-specific/darwin/apple-source-releases/Librpcsvc/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Librpcsvc/default.nix index a7b2bd7d981d..7f93a87837a2 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/Librpcsvc/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/Librpcsvc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, appleDerivation, developer_cmds }: +{ lib, stdenv, appleDerivation, developer_cmds }: appleDerivation { buildInputs = [ developer_cmds ]; @@ -14,7 +14,7 @@ appleDerivation { rmdir $out/usr/ ''; - meta = with stdenv.lib; { + meta = with lib; { maintainers = with maintainers; [ matthewbauer ]; platforms = platforms.darwin; license = licenses.apsl20; diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix index 24526f05f062..a5508b5ec12f 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix @@ -1,4 +1,4 @@ -{ stdenv, appleDerivation, cpio, xnu, Libc, Libm, libdispatch, cctools, Libinfo +{ lib, stdenv, appleDerivation, cpio, xnu, Libc, Libm, libdispatch, cctools, Libinfo , dyld, Csu, architecture, libclosure, CarbonHeaders, ncurses, CommonCrypto , copyfile, removefile, libresolv, Libnotify, libplatform, libpthread , mDNSResponder, launchd, libutil, hfs, darling, darwin-stubs }: @@ -115,7 +115,7 @@ appleDerivation { ln -s libresolv.9.dylib $out/lib/libresolv.dylib ''; - meta = with stdenv.lib; { + meta = with lib; { description = "The Mac OS libc/libSystem (tapi library with pure headers)"; maintainers = with maintainers; [ copumpkin gridaphobe ]; platforms = platforms.darwin; diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/reexported_libraries b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/reexported_libraries deleted file mode 100644 index edc2e759a29e..000000000000 --- a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/reexported_libraries +++ /dev/null @@ -1,41 +0,0 @@ -# These are generated with otool -L /usr/lib/libSystem.dylib on a 10.11 machine -/usr/lib/system/libcache.dylib -/usr/lib/system/libcommonCrypto.dylib -/usr/lib/system/libcompiler_rt.dylib -/usr/lib/system/libcopyfile.dylib -/usr/lib/system/libcorecrypto.dylib -/usr/lib/system/libdispatch.dylib -/usr/lib/system/libdyld.dylib -/usr/lib/system/libkeymgr.dylib -/usr/lib/system/liblaunch.dylib -/usr/lib/system/libmacho.dylib -/usr/lib/system/libquarantine.dylib -/usr/lib/system/libremovefile.dylib -/usr/lib/system/libsystem_asl.dylib -/usr/lib/system/libsystem_blocks.dylib - -# We handle this specially in the expression -# /usr/lib/system/libsystem_c.dylib - -/usr/lib/system/libsystem_configuration.dylib -/usr/lib/system/libsystem_coreservices.dylib -# /usr/lib/system/libsystem_coretls.dylib # Removed in 10.13 -/usr/lib/system/libsystem_dnssd.dylib -/usr/lib/system/libsystem_info.dylib - -# We handle this specially in the expression -# /usr/lib/system/libsystem_kernel.dylib - -/usr/lib/system/libsystem_m.dylib -/usr/lib/system/libsystem_malloc.dylib -# /usr/lib/system/libsystem_network.dylib # Removed in 10.14 -/usr/lib/system/libsystem_networkextension.dylib -/usr/lib/system/libsystem_notify.dylib -/usr/lib/system/libsystem_platform.dylib -/usr/lib/system/libsystem_pthread.dylib -/usr/lib/system/libsystem_sandbox.dylib -/usr/lib/system/libsystem_secinit.dylib -/usr/lib/system/libsystem_trace.dylib -/usr/lib/system/libunc.dylib -/usr/lib/system/libunwind.dylib -/usr/lib/system/libxpc.dylib diff --git a/pkgs/os-specific/darwin/apple-source-releases/architecture/default.nix b/pkgs/os-specific/darwin/apple-source-releases/architecture/default.nix index ebeb3ef08845..f7503dbb953c 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/architecture/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/architecture/default.nix @@ -1,4 +1,4 @@ -{ stdenv, appleDerivation }: +{ lib, stdenv, appleDerivation }: appleDerivation { dontBuild = true; @@ -13,7 +13,7 @@ appleDerivation { DSTROOT = "$(out)"; - meta = with stdenv.lib; { + meta = with lib; { maintainers = with maintainers; [ copumpkin ]; platforms = platforms.darwin; license = licenses.apsl20; diff --git a/pkgs/os-specific/darwin/apple-source-releases/dyld/default.nix b/pkgs/os-specific/darwin/apple-source-releases/dyld/default.nix index ddadf1f3940b..4a72ea337ebf 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/dyld/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/dyld/default.nix @@ -1,4 +1,4 @@ -{ stdenv, appleDerivation }: +{ lib, stdenv, appleDerivation }: appleDerivation { installPhase = '' @@ -7,7 +7,7 @@ appleDerivation { cp -r include $out/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Impure primitive symlinks to the Mac OS native dyld, along with headers"; maintainers = with maintainers; [ copumpkin ]; platforms = platforms.darwin; diff --git a/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix index 0532c88b66b9..72ef086f5990 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix @@ -1,6 +1,6 @@ { stdenv, appleDerivation, lib -, enableStatic ? stdenv.targetPlatform.isiOS -, enableShared ? !stdenv.targetPlatform.isiOS +, enableStatic ? stdenv.hostPlatform.isStatic +, enableShared ? !stdenv.hostPlatform.isStatic }: appleDerivation { diff --git a/pkgs/os-specific/darwin/apple-source-releases/libunwind/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libunwind/default.nix index bd219ae434c0..24986e288524 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libunwind/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libunwind/default.nix @@ -1,4 +1,4 @@ -{ stdenv, appleDerivation }: +{ lib, stdenv, appleDerivation }: appleDerivation { buildPhase = ":"; @@ -9,7 +9,7 @@ appleDerivation { cp -R include $out/include ''; - meta = with stdenv.lib; { + meta = with lib; { maintainers = with maintainers; [ copumpkin lnl7 ]; platforms = platforms.darwin; license = licenses.apsl20; diff --git a/pkgs/os-specific/darwin/chunkwm/default.nix b/pkgs/os-specific/darwin/chunkwm/default.nix index d94f66969f46..b326b98de539 100644 --- a/pkgs/os-specific/darwin/chunkwm/default.nix +++ b/pkgs/os-specific/darwin/chunkwm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, Carbon, Cocoa, ScriptingBridge }: +{ lib, stdenv, fetchzip, Carbon, Cocoa, ScriptingBridge }: stdenv.mkDerivation rec { pname = "chunkwm"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { cp plugins/*.so $out/lib/chunkwm/plugins ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Tiling window manager for macOS based on plugin architecture"; homepage = "https://github.com/koekeishiya/chunkwm"; platforms = platforms.darwin; diff --git a/pkgs/os-specific/darwin/darling/default.nix b/pkgs/os-specific/darwin/darling/default.nix index 846831d0a879..ef9afafbcd36 100644 --- a/pkgs/os-specific/darwin/darling/default.nix +++ b/pkgs/os-specific/darwin/darling/default.nix @@ -31,8 +31,6 @@ stdenv.mkDerivation rec { cp src/libaks/include/* $out/include ''; - # buildInputs = [ cmake bison flex ]; - meta = with lib; { maintainers = with maintainers; [ matthewbauer ]; license = licenses.gpl3; diff --git a/pkgs/os-specific/darwin/darwin-stubs/default.nix b/pkgs/os-specific/darwin/darwin-stubs/default.nix index f7f083e32f43..aa946eb5bf0a 100644 --- a/pkgs/os-specific/darwin/darwin-stubs/default.nix +++ b/pkgs/os-specific/darwin/darwin-stubs/default.nix @@ -1,20 +1,18 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchurl }: stdenv.mkDerivation { pname = "darwin-stubs"; version = "10.12"; - src = fetchFromGitHub { - owner = "NixOS"; - repo = "darwin-stubs"; - rev = "80b3d4a57d3454c975eefd984c804dbd76f04ef2"; - sha256 = "0sslg4rmskms8ixixv1gvnrvvvmn723vbfjj6mcn24fj2ncg38y7"; + src = fetchurl { + url = "https://github.com/NixOS/darwin-stubs/releases/download/v20201216/10.12.tar.gz"; + sha256 = "1fyd3xig7brkzlzp0ql7vyfj5sp8iy56kgp548mvicqdyw92adgm"; }; dontBuild = true; installPhase = '' mkdir $out - cp -vr stubs/$version/* $out + mv * $out ''; } diff --git a/pkgs/os-specific/darwin/goku/default.nix b/pkgs/os-specific/darwin/goku/default.nix index f6834fca7351..b65547ff32fb 100644 --- a/pkgs/os-specific/darwin/goku/default.nix +++ b/pkgs/os-specific/darwin/goku/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl }: +{lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "goku"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { cp gokuw $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Karabiner configurator"; homepage = "https://github.com/yqrashawn/GokuRakuJoudo"; license = licenses.gpl3; diff --git a/pkgs/os-specific/darwin/iproute2mac/default.nix b/pkgs/os-specific/darwin/iproute2mac/default.nix index edf1583de9a8..915ef7c91588 100644 --- a/pkgs/os-specific/darwin/iproute2mac/default.nix +++ b/pkgs/os-specific/darwin/iproute2mac/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, darwin, python2 }: +{ lib, stdenv, fetchFromGitHub, darwin, python2 }: stdenv.mkDerivation rec { version = "1.2.1"; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { install -D -m 755 src/ip.py $out/bin/ip ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/brona/iproute2mac"; description = "CLI wrapper for basic network utilites on Mac OS X inspired with iproute2 on Linux systems - ip command."; license = licenses.mit; diff --git a/pkgs/os-specific/darwin/khd/default.nix b/pkgs/os-specific/darwin/khd/default.nix index b09b65f33d56..87e1a8bf6ae6 100644 --- a/pkgs/os-specific/darwin/khd/default.nix +++ b/pkgs/os-specific/darwin/khd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, Carbon, Cocoa }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, Carbon, Cocoa }: stdenv.mkDerivation rec { pname = "khd"; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { substituteInPlace $out/Library/LaunchDaemons/org.nixos.khd.plist --subst-var out ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A simple modal hotkey daemon for OSX"; homepage = "https://github.com/koekeishiya/khd"; downloadPage = "https://github.com/koekeishiya/khd/releases"; diff --git a/pkgs/os-specific/darwin/kwm/default.nix b/pkgs/os-specific/darwin/kwm/default.nix index 8c412aa68ed7..273ea7345d9d 100644 --- a/pkgs/os-specific/darwin/kwm/default.nix +++ b/pkgs/os-specific/darwin/kwm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip }: +{ lib, stdenv, fetchzip }: stdenv.mkDerivation rec { pname = "kwm"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { substituteInPlace $out/Library/LaunchDaemons/org.nixos.kwm.plist --subst-var out ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Tiling window manager with focus follows mouse for OSX"; homepage = "https://github.com/koekeishiya/kwm"; downloadPage = "https://github.com/koekeishiya/kwm/releases"; diff --git a/pkgs/os-specific/darwin/libtapi/default.nix b/pkgs/os-specific/darwin/libtapi/default.nix index a6bc16d42f91..8c83b4ae1e69 100644 --- a/pkgs/os-specific/darwin/libtapi/default.nix +++ b/pkgs/os-specific/darwin/libtapi/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libtapi"; - version = "1000.10.8"; # determined by looking at VERSION.txt + version = "1100.0.11"; # determined by looking at VERSION.txt src = fetchFromGitHub { owner = "tpoechtrager"; repo = "apple-libtapi"; - rev = "3cb307764cc5f1856c8a23bbdf3eb49dfc6bea48"; - sha256 = "1zb10p6xkls8x7wsdwgy9c0v16z97rfkgidii9ffq5rfczgvrhjh"; + rev = "664b8414f89612f2dfd35a9b679c345aa5389026"; + sha256 = "1y1yl46msabfy14z0rln333a06087bk14f5h7q1cdawn8nmvbdbr"; }; sourceRoot = "source/src/llvm"; @@ -31,9 +31,9 @@ stdenv.mkDerivation rec { cmakeFlagsArray+=(-DCMAKE_CXX_FLAGS="$INCLUDE_FIX") ''; - buildFlags = [ "clangBasic" "libtapi" ]; + buildFlags = [ "clangBasic" "libtapi" "tapi" ]; - installTargets = [ "install-libtapi" "install-tapi-headers" ]; + installTargets = [ "install-libtapi" "install-tapi-headers" "install-tapi" ]; postInstall = lib.optionalString stdenv.isDarwin '' install_name_tool -id $out/lib/libtapi.dylib $out/lib/libtapi.dylib diff --git a/pkgs/os-specific/darwin/m-cli/default.nix b/pkgs/os-specific/darwin/m-cli/default.nix index 2699bb8e1408..b69849d82453 100644 --- a/pkgs/os-specific/darwin/m-cli/default.nix +++ b/pkgs/os-specific/darwin/m-cli/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "m-cli"; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { install -Dt "$out/share/zsh/site-functions/" -m444 completion/zsh/_m ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Swiss Army Knife for macOS"; inherit (src.meta) homepage; repositories.git = "git://github.com/rgcr/m-cli.git"; diff --git a/pkgs/os-specific/darwin/noah/default.nix b/pkgs/os-specific/darwin/noah/default.nix index 81f4ab2bd9e9..f4d8a4b21a87 100644 --- a/pkgs/os-specific/darwin/noah/default.nix +++ b/pkgs/os-specific/darwin/noah/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, Hypervisor }: +{ lib, stdenv, fetchFromGitHub, cmake, Hypervisor }: stdenv.mkDerivation rec { pname = "noah"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ Hypervisor ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Bash on Ubuntu on macOS"; homepage = "https://github.com/linux-noah/noah"; license = [ licenses.mit licenses.gpl2 ]; diff --git a/pkgs/os-specific/darwin/osx-cpu-temp/default.nix b/pkgs/os-specific/darwin/osx-cpu-temp/default.nix index 1e8a56154f34..ea9d8399667a 100644 --- a/pkgs/os-specific/darwin/osx-cpu-temp/default.nix +++ b/pkgs/os-specific/darwin/osx-cpu-temp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , IOKit }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { cp osx-cpu-temp $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Outputs current CPU temperature for OSX."; homepage = "https://github.com/lavoiesl/osx-cpu-temp"; license = licenses.gpl2; diff --git a/pkgs/os-specific/darwin/osxfuse/default.nix b/pkgs/os-specific/darwin/osxfuse/default.nix index e13a08420120..d0f6b0f53117 100644 --- a/pkgs/os-specific/darwin/osxfuse/default.nix +++ b/pkgs/os-specific/darwin/osxfuse/default.nix @@ -1,4 +1,4 @@ -{ stdenv, runCommand, fetchFromGitHub, autoreconfHook }: +{ lib, stdenv, runCommand, fetchFromGitHub, autoreconfHook }: let version = "3.8.3"; @@ -39,7 +39,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ headers ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://osxfuse.github.io"; description = "C-based FUSE for macOS SDK"; platforms = platforms.darwin; diff --git a/pkgs/os-specific/darwin/qes/default.nix b/pkgs/os-specific/darwin/qes/default.nix index f231ee571677..dce6e5266260 100644 --- a/pkgs/os-specific/darwin/qes/default.nix +++ b/pkgs/os-specific/darwin/qes/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, Carbon }: +{ lib, stdenv, fetchFromGitHub, Carbon }: stdenv.mkDerivation { pname = "qes"; @@ -15,7 +15,7 @@ stdenv.mkDerivation { makeFlags = [ "BUILD_PATH=$(out)/bin" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Quartz Event Synthesizer"; homepage = "https://github.com/koekeishiya/qes"; platforms = platforms.darwin; diff --git a/pkgs/os-specific/darwin/reattach-to-user-namespace/default.nix b/pkgs/os-specific/darwin/reattach-to-user-namespace/default.nix index 685837768504..dedc75789510 100644 --- a/pkgs/os-specific/darwin/reattach-to-user-namespace/default.nix +++ b/pkgs/os-specific/darwin/reattach-to-user-namespace/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "reattach-to-user-namespace"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { cp reattach-to-user-namespace $out/bin/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A wrapper that provides access to the Mac OS X pasteboard service"; license = licenses.bsd2; maintainers = with maintainers; [ lnl7 ]; diff --git a/pkgs/os-specific/darwin/skhd/default.nix b/pkgs/os-specific/darwin/skhd/default.nix index d145c0d75d09..ad33cf713d0c 100644 --- a/pkgs/os-specific/darwin/skhd/default.nix +++ b/pkgs/os-specific/darwin/skhd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, Carbon }: +{ lib, stdenv, fetchFromGitHub, Carbon }: stdenv.mkDerivation rec { pname = "skhd"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { substituteInPlace $out/Library/LaunchDaemons/org.nixos.skhd.plist --subst-var out ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Simple hotkey daemon for macOS"; homepage = "https://github.com/koekeishiya/skhd"; platforms = platforms.darwin; diff --git a/pkgs/os-specific/darwin/spacebar/default.nix b/pkgs/os-specific/darwin/spacebar/default.nix index 6d47499b8350..780347c60c58 100644 --- a/pkgs/os-specific/darwin/spacebar/default.nix +++ b/pkgs/os-specific/darwin/spacebar/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, Carbon, Cocoa, ScriptingBridge }: +{ lib, stdenv, fetchFromGitHub, Carbon, Cocoa, ScriptingBridge }: stdenv.mkDerivation rec { pname = "spacebar"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { cp ./doc/spacebar.1 $out/share/man/man1/spacebar.1 ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A minimal status bar for macOS"; homepage = "https://github.com/cmacrae/spacebar"; platforms = platforms.darwin; diff --git a/pkgs/os-specific/darwin/swift-corelibs/libdispatch.nix b/pkgs/os-specific/darwin/swift-corelibs/libdispatch.nix index bd143b6071ba..a5b4b2a52df1 100644 --- a/pkgs/os-specific/darwin/swift-corelibs/libdispatch.nix +++ b/pkgs/os-specific/darwin/swift-corelibs/libdispatch.nix @@ -8,5 +8,6 @@ stdenv.mkDerivation rec { rev = "f83b5a498bad8e9ff8916183cf6e8ccf677c346b"; sha256 = "1czkyyc9llq2mnqfp19mzcfsxzas0y8zrk0gr5hg60acna6jkz2l"; }; - buildInputs = [ cmake apple_sdk_sierra.sdk xnu-new ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ apple_sdk_sierra.sdk xnu-new ]; } diff --git a/pkgs/os-specific/darwin/xcode/default.nix b/pkgs/os-specific/darwin/xcode/default.nix index 34e3b2dfeeae..851110f7b65a 100644 --- a/pkgs/os-specific/darwin/xcode/default.nix +++ b/pkgs/os-specific/darwin/xcode/default.nix @@ -31,7 +31,7 @@ let requireXcode = version: sha256: rm -rf Xcode.app ''; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://developer.apple.com/downloads/"; description = "Apple's XCode SDK"; license = licenses.unfree; diff --git a/pkgs/os-specific/darwin/yabai/default.nix b/pkgs/os-specific/darwin/yabai/default.nix index d4471da4781f..b371e97d06fc 100644 --- a/pkgs/os-specific/darwin/yabai/default.nix +++ b/pkgs/os-specific/darwin/yabai/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, Carbon, Cocoa, ScriptingBridge, xxd }: +{ lib, stdenv, fetchFromGitHub, Carbon, Cocoa, ScriptingBridge, xxd }: stdenv.mkDerivation rec { pname = "yabai"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { cp ./doc/yabai.1 $out/share/man/man1/yabai.1 ''; - meta = with stdenv.lib; { + meta = with lib; { description = '' A tiling window manager for macOS based on binary space partitioning ''; diff --git a/pkgs/os-specific/linux/915resolution/default.nix b/pkgs/os-specific/linux/915resolution/default.nix index 906ea04293fe..57f8ba0d33b3 100644 --- a/pkgs/os-specific/linux/915resolution/default.nix +++ b/pkgs/os-specific/linux/915resolution/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation rec { name = "915resolution-0.5.3"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { patchPhase = "rm *.o"; installPhase = "mkdir -p $out/sbin; cp 915resolution $out/sbin/"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://915resolution.mango-lang.org/"; description = "A tool to modify Intel 800/900 video BIOS"; platforms = [ "i686-linux" "x86_64-linux" ]; diff --git a/pkgs/os-specific/linux/acpi-call/default.nix b/pkgs/os-specific/linux/acpi-call/default.nix index bb3aef885a7c..87535b92e465 100644 --- a/pkgs/os-specific/linux/acpi-call/default.nix +++ b/pkgs/os-specific/linux/acpi-call/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, kernel }: +{ lib, stdenv, fetchFromGitHub, kernel }: stdenv.mkDerivation rec { pname = "acpi-call"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { install -D -m755 examples/turn_off_gpu.sh $out/bin/test_discrete_video_off.sh ''; - meta = with stdenv.lib; { + meta = with lib; { maintainers = with maintainers; [ raskin mic92 ]; inherit (src.meta) homepage; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/acpi/default.nix b/pkgs/os-specific/linux/acpi/default.nix index 69a36d7bf52b..127d0c4b0223 100644 --- a/pkgs/os-specific/linux/acpi/default.nix +++ b/pkgs/os-specific/linux/acpi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "acpi"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "01ahldvf0gc29dmbd5zi4rrnrw2i1ajnf30sx2vyaski3jv099fp"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Show battery status and other ACPI information"; longDescription = '' Linux ACPI client is a small command-line diff --git a/pkgs/os-specific/linux/acpid/default.nix b/pkgs/os-specific/linux/acpid/default.nix index 5ef5e2724b23..d28ff447681e 100644 --- a/pkgs/os-specific/linux/acpid/default.nix +++ b/pkgs/os-specific/linux/acpid/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook }: +{ lib, stdenv, fetchurl, autoreconfHook }: stdenv.mkDerivation rec { name = "acpid-2.0.32"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { --replace "strrchr strtol" "strrchr strtol malloc realloc" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://sourceforge.net/projects/acpid2/"; description = "A daemon for delivering ACPI events to userspace programs"; license = licenses.gpl2Plus; diff --git a/pkgs/os-specific/linux/alsa-lib/default.nix b/pkgs/os-specific/linux/alsa-lib/default.nix index b1d85f2674cb..30bb669cf4ce 100644 --- a/pkgs/os-specific/linux/alsa-lib/default.nix +++ b/pkgs/os-specific/linux/alsa-lib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsa-ucm-conf, alsa-topology-conf }: +{ lib, stdenv, fetchurl, alsa-ucm-conf, alsa-topology-conf }: stdenv.mkDerivation rec { pname = "alsa-lib"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.alsa-project.org/"; description = "ALSA, the Advanced Linux Sound Architecture libraries"; diff --git a/pkgs/os-specific/linux/alsa-oss/default.nix b/pkgs/os-specific/linux/alsa-oss/default.nix index 774dc3d8d676..9c87dbe8e8c8 100644 --- a/pkgs/os-specific/linux/alsa-oss/default.nix +++ b/pkgs/os-specific/linux/alsa-oss/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, alsaLib, gettext, ncurses, libsamplerate}: +{lib, stdenv, fetchurl, alsaLib, gettext, ncurses, libsamplerate}: stdenv.mkDerivation rec { pname = "alsa-oss"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { installFlags = [ "ASOUND_STATE_DIR=$(TMPDIR)/dummy" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.alsa-project.org/"; description = "ALSA, the Advanced Linux Sound Architecture alsa-oss emulation"; diff --git a/pkgs/os-specific/linux/alsa-plugins/default.nix b/pkgs/os-specific/linux/alsa-plugins/default.nix index a69d86c5c4d6..54d7ce6222a3 100644 --- a/pkgs/os-specific/linux/alsa-plugins/default.nix +++ b/pkgs/os-specific/linux/alsa-plugins/default.nix @@ -15,13 +15,14 @@ stdenv.mkDerivation rec { buildInputs = [ alsaLib libogg ] ++ lib.optional (libpulseaudio != null) libpulseaudio - ++ lib.optional (libjack2 != null) libjack2; + # https://github.com/NixOS/nixpkgs/issues/96548 + ++ lib.optional (libjack2 != null && (stdenv.buildPlatform == stdenv.hostPlatform)) libjack2; meta = with lib; { description = "Various plugins for ALSA"; homepage = "http://alsa-project.org/"; license = licenses.lgpl21; - maintainers = [maintainers.marcweber]; + maintainers = [ maintainers.marcweber ]; platforms = platforms.linux; }; } diff --git a/pkgs/os-specific/linux/alsa-tools/default.nix b/pkgs/os-specific/linux/alsa-tools/default.nix index 2fef5e07c63c..4feb99f6bef9 100644 --- a/pkgs/os-specific/linux/alsa-tools/default.nix +++ b/pkgs/os-specific/linux/alsa-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, pkgconfig, gtk2, gtk3, fltk13 }: +{ lib, stdenv, fetchurl, alsaLib, pkgconfig, gtk2, gtk3, fltk13 }: # Comes from upstream as as bundle of several tools, # some use gtk2, some gtk3 (and some even fltk13). @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.alsa-project.org/"; description = "ALSA, the Advanced Linux Sound Architecture tools"; diff --git a/pkgs/os-specific/linux/alsa-topology-conf/default.nix b/pkgs/os-specific/linux/alsa-topology-conf/default.nix index 4b6678d09b23..2328fea91fd7 100644 --- a/pkgs/os-specific/linux/alsa-topology-conf/default.nix +++ b/pkgs/os-specific/linux/alsa-topology-conf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "alsa-topology-conf-${version}"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.alsa-project.org/"; description = "ALSA topology configuration files"; diff --git a/pkgs/os-specific/linux/alsa-ucm-conf/default.nix b/pkgs/os-specific/linux/alsa-ucm-conf/default.nix index 3ee800438175..d667cd3d51bb 100644 --- a/pkgs/os-specific/linux/alsa-ucm-conf/default.nix +++ b/pkgs/os-specific/linux/alsa-ucm-conf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "alsa-ucm-conf-${version}"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.alsa-project.org/"; description = "ALSA Use Case Manager configuration"; diff --git a/pkgs/os-specific/linux/alsa-utils/default.nix b/pkgs/os-specific/linux/alsa-utils/default.nix index 055927b7a31e..40db2261007e 100644 --- a/pkgs/os-specific/linux/alsa-utils/default.nix +++ b/pkgs/os-specific/linux/alsa-utils/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, alsaLib, gettext, makeWrapper, ncurses, libsamplerate, pciutils, which, fftw}: +{lib, stdenv, fetchurl, alsaLib, gettext, makeWrapper, ncurses, libsamplerate, pciutils, which, fftw}: stdenv.mkDerivation rec { pname = "alsa-utils"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/alsa-info.sh --prefix PATH : "${stdenv.lib.makeBinPath [ which pciutils ]}" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.alsa-project.org/"; description = "ALSA, the Advanced Linux Sound Architecture utils"; longDescription = '' diff --git a/pkgs/os-specific/linux/amdgpu-pro/default.nix b/pkgs/os-specific/linux/amdgpu-pro/default.nix index 32763fcded51..78d0748ed3b0 100644 --- a/pkgs/os-specific/linux/amdgpu-pro/default.nix +++ b/pkgs/os-specific/linux/amdgpu-pro/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, elfutils +{ lib, stdenv, fetchurl, elfutils , xorg, patchelf, openssl, libdrm, udev , libxcb, libxshmfence, epoxy, perl, zlib , ncurses @@ -171,7 +171,7 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "AMDGPU-PRO drivers"; homepage = "http://support.amd.com/en-us/kb-articles/Pages/AMDGPU-PRO-Beta-Driver-for-Vulkan-Release-Notes.aspx"; license = licenses.unfree; diff --git a/pkgs/os-specific/linux/anbox/default.nix b/pkgs/os-specific/linux/anbox/default.nix index 5f8ca7ac46fa..cfbdb3769775 100644 --- a/pkgs/os-specific/linux/anbox/default.nix +++ b/pkgs/os-specific/linux/anbox/default.nix @@ -1,24 +1,28 @@ -{ stdenv, fetchFromGitHub, fetchurl -, cmake, pkgconfig, dbus, makeWrapper -, gtest +{ lib, stdenv, fetchFromGitHub, fetchurl +, cmake, pkg-config, dbus, makeWrapper , boost +, elfutils # for libdw +, git +, glib +, glm +, gtest +, libbfd , libcap -, systemd -, mesa +, libdwarf , libGL , libglvnd -, glib -, git -, SDL2 -, SDL2_image +, lxc +, mesa , properties-cpp , protobuf , protobufc -, python -, lxc +, python3 +, runtimeShell +, SDL2 +, SDL2_image +, systemd , writeText , writeScript -, runtimeShell }: let @@ -45,27 +49,42 @@ in stdenv.mkDerivation rec { pname = "anbox"; - version = "unstable-2019-11-15"; + version = "unstable-2020-11-29"; src = fetchFromGitHub { owner = pname; repo = pname; - rev = "0a49ae08f76de7f886a3dbed4422711c2fa39d10"; - sha256 = "09l56nv9cnyhykclfmvam6bkcxlamwbql6nrz9n022553w92hkjf"; + rev = "6c10125a7f13908d2cbe56d2d9ab09872755f265"; + sha256 = "00bqssh4zcs0jj6w07b91719xkrpdw75vpcplwrvlhwsvl55f901"; + fetchSubmodules = true; }; nativeBuildInputs = [ + cmake + pkg-config makeWrapper ]; buildInputs = [ - cmake pkgconfig dbus boost libcap gtest systemd mesa glib - SDL2 SDL2_image protobuf protobufc properties-cpp lxc python + boost + dbus + elfutils # libdw + glib + glm + gtest + libbfd + libcap + libdwarf libGL + lxc + mesa + properties-cpp + protobuf protobufc + python3 + SDL2 SDL2_image + systemd ]; - NIX_CFLAGS_COMPILE = "-Wno-error=missing-field-initializers"; - patchPhase = '' patchShebangs scripts @@ -129,7 +148,7 @@ stdenv.mkDerivation rec { }; }.${stdenv.system} or null; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://anbox.io"; description = "Android in a box"; license = licenses.gpl2; diff --git a/pkgs/os-specific/linux/anbox/kmod.nix b/pkgs/os-specific/linux/anbox/kmod.nix index 896beaf3056e..f62e6ee6aa53 100644 --- a/pkgs/os-specific/linux/anbox/kmod.nix +++ b/pkgs/os-specific/linux/anbox/kmod.nix @@ -1,4 +1,4 @@ -{ stdenv, kernel, fetchFromGitHub }: +{ lib, stdenv, kernel, fetchFromGitHub }: stdenv.mkDerivation { pname = "anbox-modules"; @@ -31,7 +31,7 @@ stdenv.mkDerivation { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Anbox ashmem and binder drivers."; homepage = "https://github.com/anbox/anbox-modules"; license = licenses.gpl2; diff --git a/pkgs/os-specific/linux/android-udev-rules/default.nix b/pkgs/os-specific/linux/android-udev-rules/default.nix index b6fe86d1b26a..3d69f5ce0e59 100644 --- a/pkgs/os-specific/linux/android-udev-rules/default.nix +++ b/pkgs/os-specific/linux/android-udev-rules/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: ## Usage # In NixOS, simply add this package to services.udev.packages: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { install -D 51-android.rules $out/lib/udev/rules.d/51-android.rules ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/M0Rf30/android-udev-rules"; description = "Android udev rules list aimed to be the most comprehensive on the net"; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/asus-wmi-sensors/default.nix b/pkgs/os-specific/linux/asus-wmi-sensors/default.nix index 8eb8a7484e15..3098cbb72538 100644 --- a/pkgs/os-specific/linux/asus-wmi-sensors/default.nix +++ b/pkgs/os-specific/linux/asus-wmi-sensors/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, kernel }: +{ lib, stdenv, fetchFromGitHub, kernel }: stdenv.mkDerivation rec { name = "asus-wmi-sensors-${version}-${kernel.version}"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { "MODDESTDIR=${placeholder "out"}/lib/modules/${kernel.modDirVersion}/kernel/drivers/hwmon" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Linux HWMON (lmsensors) sensors driver for various ASUS Ryzen and Threadripper motherboards"; homepage = "https://github.com/electrified/asus-wmi-sensors"; license = licenses.gpl2; diff --git a/pkgs/os-specific/linux/ati-drivers/default.nix b/pkgs/os-specific/linux/ati-drivers/default.nix index 63f9b5399da9..f4378cad816c 100644 --- a/pkgs/os-specific/linux/ati-drivers/default.nix +++ b/pkgs/os-specific/linux/ati-drivers/default.nix @@ -126,7 +126,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "ATI Catalyst display drivers"; homepage = "http://support.amd.com/us/gpudownload/Pages/index.aspx"; license = licenses.unfree; diff --git a/pkgs/os-specific/linux/atop/default.nix b/pkgs/os-specific/linux/atop/default.nix index 7557497b959e..f3df61c15108 100644 --- a/pkgs/os-specific/linux/atop/default.nix +++ b/pkgs/os-specific/linux/atop/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, zlib, ncurses}: +{lib, stdenv, fetchurl, zlib, ncurses}: stdenv.mkDerivation rec { pname = "atop"; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { mkdir -p "$out"/{bin,sbin} ''; - meta = with stdenv.lib; { + meta = with lib; { platforms = platforms.linux; maintainers = with maintainers; [ raskin ]; description = ''Console system performance monitor''; diff --git a/pkgs/os-specific/linux/bbswitch/default.nix b/pkgs/os-specific/linux/bbswitch/default.nix index 67cbc6e5c5e6..837906fb5549 100644 --- a/pkgs/os-specific/linux/bbswitch/default.nix +++ b/pkgs/os-specific/linux/bbswitch/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, kernel, runtimeShell }: +{ lib, stdenv, fetchurl, fetchpatch, kernel, runtimeShell }: let baseName = "bbswitch"; @@ -54,7 +54,7 @@ stdenv.mkDerivation { chmod +x $out/bin/discrete_vga_poweroff $out/bin/discrete_vga_poweron ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A module for powering off hybrid GPUs"; platforms = [ "x86_64-linux" "i686-linux" ]; homepage = "https://github.com/Bumblebee-Project/bbswitch"; diff --git a/pkgs/os-specific/linux/bcc/default.nix b/pkgs/os-specific/linux/bcc/default.nix index 2bc705d4487a..5338562b7e71 100644 --- a/pkgs/os-specific/linux/bcc/default.nix +++ b/pkgs/os-specific/linux/bcc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch +{ lib, stdenv, fetchurl, fetchpatch , makeWrapper, cmake, llvmPackages, kernel , flex, bison, elfutils, python, luajit, netperf, iperf, libelf , systemtap, bash @@ -68,7 +68,7 @@ python.pkgs.buildPythonApplication rec { wrapPythonProgramsIn "$out/share/bcc/tools" "$out $pythonPath" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Dynamic Tracing Tools for Linux"; homepage = "https://iovisor.github.io/bcc/"; license = licenses.asl20; diff --git a/pkgs/os-specific/linux/bluez/default.nix b/pkgs/os-specific/linux/bluez/default.nix index 8e110fb13ace..be7435fb1d0f 100644 --- a/pkgs/os-specific/linux/bluez/default.nix +++ b/pkgs/os-specific/linux/bluez/default.nix @@ -112,7 +112,7 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Bluetooth support for Linux"; homepage = "http://www.bluez.org/"; license = with licenses; [ gpl2 lgpl21 ]; diff --git a/pkgs/os-specific/linux/bolt/default.nix b/pkgs/os-specific/linux/bolt/default.nix index 1508125695e7..d857fa1463a9 100644 --- a/pkgs/os-specific/linux/bolt/default.nix +++ b/pkgs/os-specific/linux/bolt/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , meson , ninja , pkgconfig @@ -85,7 +85,7 @@ stdenv.mkDerivation rec { PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "${placeholder "out"}/lib/systemd/system"; PKG_CONFIG_UDEV_UDEVDIR = "${placeholder "out"}/lib/udev"; - meta = with stdenv.lib; { + meta = with lib; { description = "Thunderbolt 3 device management daemon"; homepage = "https://gitlab.freedesktop.org/bolt/bolt"; license = licenses.lgpl21Plus; diff --git a/pkgs/os-specific/linux/bpftool/default.nix b/pkgs/os-specific/linux/bpftool/default.nix index 34ddcc3a213f..d8c64738d829 100644 --- a/pkgs/os-specific/linux/bpftool/default.nix +++ b/pkgs/os-specific/linux/bpftool/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , libopcodes, libbfd, libelf , linuxPackages_latest, zlib , python3 @@ -21,7 +21,7 @@ stdenv.mkDerivation { --replace '/sbin' '/bin' ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Debugging/program analysis tool for the eBPF subsystem"; license = [ licenses.gpl2 licenses.bsd2 ]; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/bpftrace/default.nix b/pkgs/os-specific/linux/bpftrace/default.nix index 9fbeda708e05..ce890ec578b5 100644 --- a/pkgs/os-specific/linux/bpftrace/default.nix +++ b/pkgs/os-specific/linux/bpftrace/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , cmake, pkgconfig, flex, bison , llvmPackages, kernel, elfutils , libelf, libbfd, libbpf, libopcodes, bcc @@ -15,8 +15,6 @@ stdenv.mkDerivation rec { sha256 = "0y4qgm2cpccrsm20rnh92hqplddqsc5q5zhw9nqn2igm3h9i0z7h"; }; - enableParallelBuilding = true; - buildInputs = with llvmPackages; [ llvm clang-unwrapped kernel elfutils libelf bcc @@ -54,7 +52,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "man" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "High-level tracing language for Linux eBPF"; homepage = "https://github.com/iovisor/bpftrace"; license = licenses.asl20; diff --git a/pkgs/os-specific/linux/brillo/default.nix b/pkgs/os-specific/linux/brillo/default.nix index 5baaa0752aa6..0736a13ce12e 100644 --- a/pkgs/os-specific/linux/brillo/default.nix +++ b/pkgs/os-specific/linux/brillo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab , go-md2man, coreutils, substituteAll }: +{ lib, stdenv, fetchFromGitLab , go-md2man, coreutils, substituteAll }: stdenv.mkDerivation rec { pname = "brillo"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { installTargets = [ "install-dist" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Backlight and Keyboard LED control tool"; homepage = "https://gitlab.com/cameronnemo/brillo"; license = [ licenses.gpl3 licenses.bsd0 ]; diff --git a/pkgs/os-specific/linux/btfs/default.nix b/pkgs/os-specific/linux/btfs/default.nix index 6d919ce57d4f..8aa1bf488922 100644 --- a/pkgs/os-specific/linux/btfs/default.nix +++ b/pkgs/os-specific/linux/btfs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig , python3, boost, fuse, libtorrent-rasterbar, curl }: stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { boost fuse libtorrent-rasterbar curl python3 ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A bittorrent filesystem based on FUSE"; homepage = "https://github.com/johang/btfs"; license = licenses.gpl3; diff --git a/pkgs/os-specific/linux/busybox/0001-Fix-build-with-glibc-2.31.patch b/pkgs/os-specific/linux/busybox/0001-Fix-build-with-glibc-2.31.patch deleted file mode 100644 index 029333b57e4d..000000000000 --- a/pkgs/os-specific/linux/busybox/0001-Fix-build-with-glibc-2.31.patch +++ /dev/null @@ -1,71 +0,0 @@ -From c29b637b55c93214993f40b1a223233d40b8a7d6 Mon Sep 17 00:00:00 2001 -From: Maximilian Bosch -Date: Wed, 19 Feb 2020 22:32:28 +0100 -Subject: [PATCH] Fix build with glibc 2.31 - -This is derived from the corresponding upstream patch[1], however this -one doesn't apply cleanly on busybox-1.31.1, so I rebased the patch -locally and added it directly to nixpkgs. - -[1] https://git.busybox.net/busybox/patch/?id=d3539be8f27b8cbfdfee460fe08299158f08bcd9 ---- - coreutils/date.c | 2 +- - libbb/missing_syscalls.c | 8 -------- - util-linux/rdate.c | 8 ++++++-- - 3 files changed, 7 insertions(+), 11 deletions(-) - -diff --git a/coreutils/date.c b/coreutils/date.c -index 3414d38..931b7f9 100644 ---- a/coreutils/date.c -+++ b/coreutils/date.c -@@ -303,7 +303,7 @@ int date_main(int argc UNUSED_PARAM, char **argv) - ts.tv_sec = validate_tm_time(date_str, &tm_time); - - /* if setting time, set it */ -- if ((opt & OPT_SET) && stime(&ts.tv_sec) < 0) { -+ if ((opt & OPT_SET) && clock_settime(CLOCK_REALTIME, &ts) < 0) { - bb_perror_msg("can't set date"); - } - } -diff --git a/libbb/missing_syscalls.c b/libbb/missing_syscalls.c -index 87cf59b..dc40d91 100644 ---- a/libbb/missing_syscalls.c -+++ b/libbb/missing_syscalls.c -@@ -15,14 +15,6 @@ pid_t getsid(pid_t pid) - return syscall(__NR_getsid, pid); - } - --int stime(const time_t *t) --{ -- struct timeval tv; -- tv.tv_sec = *t; -- tv.tv_usec = 0; -- return settimeofday(&tv, NULL); --} -- - int sethostname(const char *name, size_t len) - { - return syscall(__NR_sethostname, name, len); -diff --git a/util-linux/rdate.c b/util-linux/rdate.c -index 70f829e..878375d 100644 ---- a/util-linux/rdate.c -+++ b/util-linux/rdate.c -@@ -95,9 +95,13 @@ int rdate_main(int argc UNUSED_PARAM, char **argv) - if (!(flags & 2)) { /* no -p (-s may be present) */ - if (time(NULL) == remote_time) - bb_error_msg("current time matches remote time"); -- else -- if (stime(&remote_time) < 0) -+ else { -+ struct timespec ts; -+ ts.tv_sec = remote_time; -+ ts.tv_nsec = 0; -+ if (clock_settime(CLOCK_REALTIME, &ts) < 0) - bb_perror_msg_and_die("can't set time of day"); -+ } - } - - if (flags != 1) /* not lone -s */ --- -2.25.0 - diff --git a/pkgs/os-specific/linux/busybox/0001-wget-implement-TLS-verification-with-ENABLE_FEATURE_.patch b/pkgs/os-specific/linux/busybox/0001-wget-implement-TLS-verification-with-ENABLE_FEATURE_.patch deleted file mode 100644 index d11cd670d5e8..000000000000 --- a/pkgs/os-specific/linux/busybox/0001-wget-implement-TLS-verification-with-ENABLE_FEATURE_.patch +++ /dev/null @@ -1,94 +0,0 @@ -From 45fa3f18adf57ef9d743038743d9c90573aeeb91 Mon Sep 17 00:00:00 2001 -From: Dimitri John Ledkov -Date: Tue, 19 May 2020 18:20:39 +0100 -Subject: [PATCH] wget: implement TLS verification with - ENABLE_FEATURE_WGET_OPENSSL - -When ENABLE_FEATURE_WGET_OPENSSL is enabled, correctly implement TLS -verification by default. And only ignore verification errors, if ---no-check-certificate was passed. - -Also note, that previously OPENSSL implementation did not implement -TLS verification, nor printed any warning messages that verification -was not performed. - -Bug-Ubuntu: https://bugs.launchpad.net/bugs/1879533 - -CVE-2018-1000500 - -Signed-off-by: Dimitri John Ledkov -Signed-off-by: Denys Vlasenko ---- - networking/wget.c | 20 +++++++++++++++++--- - 1 file changed, 17 insertions(+), 3 deletions(-) - -diff --git a/networking/wget.c b/networking/wget.c -index f2fc9e215..6a8c08324 100644 ---- a/networking/wget.c -+++ b/networking/wget.c -@@ -91,6 +91,9 @@ - //config: patches, but do want to waste bandwidth expaining how wrong - //config: it is, you will be ignored. - //config: -+//config: FEATURE_WGET_OPENSSL does implement TLS verification -+//config: using the certificates available to OpenSSL. -+//config: - //config:config FEATURE_WGET_OPENSSL - //config: bool "Try to connect to HTTPS using openssl" - //config: default y -@@ -115,6 +118,9 @@ - //config: If openssl can't be executed, internal TLS code will be used - //config: (if you enabled it); if openssl can be executed but fails later, - //config: wget can't detect this, and download will fail. -+//config: -+//config: By default TLS verification is performed, unless -+//config: --no-check-certificate option is passed. - - //applet:IF_WGET(APPLET(wget, BB_DIR_USR_BIN, BB_SUID_DROP)) - -@@ -124,8 +130,11 @@ - //usage: IF_FEATURE_WGET_LONG_OPTIONS( - //usage: "[-c|--continue] [--spider] [-q|--quiet] [-O|--output-document FILE]\n" - //usage: " [-o|--output-file FILE] [--header 'header: value'] [-Y|--proxy on/off]\n" -+//usage: IF_FEATURE_WGET_OPENSSL( -+//usage: " [--no-check-certificate]\n" -+//usage: ) - /* Since we ignore these opts, we don't show them in --help */ --/* //usage: " [--no-check-certificate] [--no-cache] [--passive-ftp] [-t TRIES]" */ -+/* //usage: " [--no-cache] [--passive-ftp] [-t TRIES]" */ - /* //usage: " [-nv] [-nc] [-nH] [-np]" */ - //usage: " [-P DIR] [-S|--server-response] [-U|--user-agent AGENT]" IF_FEATURE_WGET_TIMEOUT(" [-T SEC]") " URL..." - //usage: ) -@@ -137,7 +146,9 @@ - //usage: "Retrieve files via HTTP or FTP\n" - //usage: IF_FEATURE_WGET_LONG_OPTIONS( - //usage: "\n --spider Only check URL existence: $? is 0 if exists" --///////: "\n --no-check-certificate Don't validate the server's certificate" -+//usage: IF_FEATURE_WGET_OPENSSL( -+//usage: "\n --no-check-certificate Don't validate the server's certificate" -+//usage: ) - //usage: ) - //usage: "\n -c Continue retrieval of aborted transfer" - //usage: "\n -q Quiet" -@@ -662,7 +673,7 @@ static int spawn_https_helper_openssl(const char *host, unsigned port) - pid = xvfork(); - if (pid == 0) { - /* Child */ -- char *argv[8]; -+ char *argv[9]; - - close(sp[0]); - xmove_fd(sp[1], 0); -@@ -689,6 +700,9 @@ static int spawn_https_helper_openssl(const char *host, unsigned port) - argv[5] = (char*)"-servername"; - argv[6] = (char*)servername; - } -+ if (!(option_mask32 & WGET_OPT_NO_CHECK_CERT)) { -+ argv[7] = (char*)"-verify_return_error"; -+ } - - BB_EXECVP(argv[0], argv); - xmove_fd(3, 2); --- -2.28.0 - diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix index 599754129b43..49b07bd18e7e 100644 --- a/pkgs/os-specific/linux/busybox/default.nix +++ b/pkgs/os-specific/linux/busybox/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, buildPackages, fetchurl, fetchFromGitLab -, enableStatic ? false +, enableStatic ? stdenv.hostPlatform.isStatic , enableMinimal ? false # Allow forcing musl without switching stdenv itself, e.g. for our bootstrapping: # nix build -f pkgs/top-level/release.nix stdenvBootstrapTools.x86_64-linux.dist @@ -48,17 +48,15 @@ let in stdenv.mkDerivation rec { - # TODO: When bumping this version, please validate whether the wget patch is present upstream - # and remove the patch if it is. The patch should be present upstream for all versions 1.32.0+. - # See NixOs/nixpkgs#94722 for context. - name = "busybox-1.31.1"; + pname = "busybox"; + version = "1.32.1"; # Note to whoever is updating busybox: please verify that: # nix-build pkgs/stdenv/linux/make-bootstrap-tools.nix -A test # still builds after the update. src = fetchurl { - url = "https://busybox.net/downloads/${name}.tar.bz2"; - sha256 = "1659aabzp8w4hayr4z8kcpbk2z1q2wqhw7i1yb0l72b45ykl1yfh"; + url = "https://busybox.net/downloads/${pname}-${version}.tar.bz2"; + sha256 = "1vhd59qmrdyrr1q7rvxmyl96z192mxl089hi87yl0hcp6fyw8mwx"; }; hardeningDisable = [ "format" "pie" ] @@ -66,8 +64,6 @@ stdenv.mkDerivation rec { patches = [ ./busybox-in-store.patch - ./0001-Fix-build-with-glibc-2.31.patch - ./0001-wget-implement-TLS-verification-with-ENABLE_FEATURE_.patch ] ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) ./clang-cross.patch; postPatch = "patchShebangs ."; @@ -133,7 +129,7 @@ stdenv.mkDerivation rec { doCheck = false; # tries to access the net - meta = with stdenv.lib; { + meta = with lib; { description = "Tiny versions of common UNIX utilities in a single small executable"; homepage = "https://busybox.net/"; license = licenses.gpl2; diff --git a/pkgs/os-specific/linux/cachefilesd/default.nix b/pkgs/os-specific/linux/cachefilesd/default.nix index 27fd8c9613ac..6c52eb4a7f60 100644 --- a/pkgs/os-specific/linux/cachefilesd/default.nix +++ b/pkgs/os-specific/linux/cachefilesd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "cachefilesd"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { "MANDIR=$(out)/share/man" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Local network file caching management daemon"; homepage = "https://people.redhat.com/dhowells/fscache/"; license = licenses.gpl2Plus; diff --git a/pkgs/os-specific/linux/can-isotp/default.nix b/pkgs/os-specific/linux/can-isotp/default.nix index cccc7550fba8..89857a35d921 100644 --- a/pkgs/os-specific/linux/can-isotp/default.nix +++ b/pkgs/os-specific/linux/can-isotp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, kernel, fetchFromGitHub }: +{ lib, stdenv, kernel, fetchFromGitHub }: stdenv.mkDerivation { pname = "can-isotp"; @@ -26,7 +26,7 @@ stdenv.mkDerivation { nativeBuildInputs = kernel.moduleBuildDependencies; - meta = with stdenv.lib; { + meta = with lib; { description = "Kernel module for ISO-TP (ISO 15765-2)"; homepage = "https://github.com/hartkopp/can-isotp"; license = licenses.gpl2; diff --git a/pkgs/os-specific/linux/can-utils/default.nix b/pkgs/os-specific/linux/can-utils/default.nix index 2b6b82591b59..90261e829048 100644 --- a/pkgs/os-specific/linux/can-utils/default.nix +++ b/pkgs/os-specific/linux/can-utils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation { pname = "can-utils"; @@ -21,7 +21,7 @@ stdenv.mkDerivation { preConfigure = ''makeFlagsArray+=(PREFIX="$out")''; - meta = with stdenv.lib; { + meta = with lib; { description = "CAN userspace utilities and tools (for use with Linux SocketCAN)"; homepage = "https://github.com/linux-can/can-utils"; license = licenses.gpl2Plus; diff --git a/pkgs/os-specific/linux/checksec/default.nix b/pkgs/os-specific/linux/checksec/default.nix index eb33aedd1d49..f5d4c44b0534 100644 --- a/pkgs/os-specific/linux/checksec/default.nix +++ b/pkgs/os-specific/linux/checksec/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, makeWrapper, file, findutils +{ lib, stdenv, fetchFromGitHub, makeWrapper, file, findutils , binutils-unwrapped, glibc, coreutils, sysctl, openssl }: @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { --prefix PATH : ${path} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A tool for checking security bits on executables"; homepage = "http://www.trapkit.de/tools/checksec.html"; license = licenses.bsd3; diff --git a/pkgs/os-specific/linux/cifs-utils/default.nix b/pkgs/os-specific/linux/cifs-utils/default.nix index 11544d946662..3171c30987e2 100644 --- a/pkgs/os-specific/linux/cifs-utils/default.nix +++ b/pkgs/os-specific/linux/cifs-utils/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { makeFlags = [ "root_sbindir=$(out)/sbin" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.samba.org/linux-cifs/cifs-utils/"; description = "Tools for managing Linux CIFS client filesystems"; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/compsize/default.nix b/pkgs/os-specific/linux/compsize/default.nix index dd54df77c348..e1979997d11b 100644 --- a/pkgs/os-specific/linux/compsize/default.nix +++ b/pkgs/os-specific/linux/compsize/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, btrfs-progs }: +{ lib, stdenv, fetchFromGitHub, btrfs-progs }: stdenv.mkDerivation rec { pname = "compsize"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { install -m 0444 compsize.8 $out/share/man/man8 ''; - meta = with stdenv.lib; { + meta = with lib; { description = "btrfs: Find compression type/ratio on a file or set of files"; homepage = "https://github.com/kilobyte/compsize"; license = licenses.gpl2; diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix index ee67140cd861..fa3aa563fb15 100644 --- a/pkgs/os-specific/linux/conky/default.nix +++ b/pkgs/os-specific/linux/conky/default.nix @@ -1,4 +1,4 @@ -{ config, stdenv, fetchFromGitHub, pkgconfig, cmake +{ config, lib, stdenv, fetchFromGitHub, pkgconfig, cmake # dependencies , glib, libXinerama @@ -133,7 +133,7 @@ stdenv.mkDerivation rec { # src/conky.cc:137:23: fatal error: defconfig.h: No such file or directory enableParallelBuilding = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://conky.sourceforge.net/"; description = "Advanced, highly configurable system monitor based on torsmo"; maintainers = [ maintainers.guibert ]; diff --git a/pkgs/os-specific/linux/conntrack-tools/default.nix b/pkgs/os-specific/linux/conntrack-tools/default.nix index 43306e51166b..c41f1410b01a 100644 --- a/pkgs/os-specific/linux/conntrack-tools/default.nix +++ b/pkgs/os-specific/linux/conntrack-tools/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, flex, bison, pkgconfig, libmnl, libnfnetlink +{ fetchurl, lib, stdenv, flex, bison, pkgconfig, libmnl, libnfnetlink , libnetfilter_conntrack, libnetfilter_queue, libnetfilter_cttimeout , libnetfilter_cthelper, systemd , libtirpc @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ flex bison pkgconfig ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://conntrack-tools.netfilter.org/"; description = "Connection tracking userspace tools"; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/consoletools/default.nix b/pkgs/os-specific/linux/consoletools/default.nix index 83de8f5ae1a5..8def013b956f 100644 --- a/pkgs/os-specific/linux/consoletools/default.nix +++ b/pkgs/os-specific/linux/consoletools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, SDL }: +{ lib, stdenv, fetchurl, SDL }: stdenv.mkDerivation rec { pname = "linuxconsoletools"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { installFlags = [ "PREFIX=\"\"" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://sourceforge.net/projects/linuxconsole/"; description = "A set of tools for joysticks and serial peripherals"; license = licenses.gpl2Plus; diff --git a/pkgs/os-specific/linux/cpufrequtils/default.nix b/pkgs/os-specific/linux/cpufrequtils/default.nix index 4c0515e94b3b..d099a62bc810 100644 --- a/pkgs/os-specific/linux/cpufrequtils/default.nix +++ b/pkgs/os-specific/linux/cpufrequtils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libtool, gettext }: +{ lib, stdenv, fetchurl, libtool, gettext }: stdenv.mkDerivation rec { name = "cpufrequtils-008"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { buildInputs = [ stdenv.cc.libc.linuxHeaders libtool gettext ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Tools to display or change the CPU governor settings"; homepage = "http://ftp.be.debian.org/pub/linux/utils/kernel/cpufreq/cpufrequtils.html"; license = licenses.gpl2; diff --git a/pkgs/os-specific/linux/cpupower/default.nix b/pkgs/os-specific/linux/cpupower/default.nix index b6ecaa11de28..cdc76b6772e2 100644 --- a/pkgs/os-specific/linux/cpupower/default.nix +++ b/pkgs/os-specific/linux/cpupower/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPackages, kernel, pciutils, gettext }: +{ lib, stdenv, buildPackages, kernel, pciutils, gettext }: stdenv.mkDerivation { pname = "cpupower"; @@ -35,7 +35,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Tool to examine and tune power saving features"; homepage = "https://www.kernel.org/"; license = licenses.gpl2; diff --git a/pkgs/os-specific/linux/cpuset/default.nix b/pkgs/os-specific/linux/cpuset/default.nix index 9e775de62f58..d1a93e4247e9 100644 --- a/pkgs/os-specific/linux/cpuset/default.nix +++ b/pkgs/os-specific/linux/cpuset/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , fetchpatch , pythonPackages @@ -35,7 +35,7 @@ pythonPackages.buildPythonApplication rec { make ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Python application that forms a wrapper around the standard Linux filesystem calls to make using the cpusets facilities in the Linux kernel easier"; homepage = "https://github.com/lpechacek/cpuset"; license = licenses.gpl2; diff --git a/pkgs/os-specific/linux/cramfsprogs/default.nix b/pkgs/os-specific/linux/cramfsprogs/default.nix index 8633823ab5c5..3f3e8a075b19 100644 --- a/pkgs/os-specific/linux/cramfsprogs/default.nix +++ b/pkgs/os-specific/linux/cramfsprogs/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , zlib }: @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ zlib ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Tools to create, check, and extract content of CramFs images"; homepage = "https://packages.debian.org/jessie/cramfsprogs"; license = licenses.gpl2; diff --git a/pkgs/os-specific/linux/cramfsswap/default.nix b/pkgs/os-specific/linux/cramfsswap/default.nix index afb38364c4e6..f47482c1111f 100644 --- a/pkgs/os-specific/linux/cramfsswap/default.nix +++ b/pkgs/os-specific/linux/cramfsswap/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, zlib}: +{lib, stdenv, fetchurl, zlib}: stdenv.mkDerivation rec { pname = "cramfsswap"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { install --target $out/bin -D cramfsswap ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Swap endianess of a cram filesystem (cramfs)"; homepage = "https://packages.debian.org/sid/utils/cramfsswap"; license = licenses.gpl2; diff --git a/pkgs/os-specific/linux/crda/default.nix b/pkgs/os-specific/linux/crda/default.nix index 979b7cf1deb3..a970451e0dd1 100644 --- a/pkgs/os-specific/linux/crda/default.nix +++ b/pkgs/os-specific/linux/crda/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, libgcrypt, libnl, pkgconfig, python3Packages, wireless-regdb }: +{ lib, stdenv, fetchurl, fetchpatch, libgcrypt, libnl, pkgconfig, python3Packages, wireless-regdb }: stdenv.mkDerivation rec { pname = "crda"; @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { rm $out/include/reglib/keys-gcrypt.h ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Linux wireless Central Regulatory Domain Agent"; longDescription = '' CRDA acts as the udev helper for communication between the kernel and diff --git a/pkgs/os-specific/linux/criu/default.nix b/pkgs/os-specific/linux/criu/default.nix index abc11a4a5f06..3c46595ed87c 100644 --- a/pkgs/os-specific/linux/criu/default.nix +++ b/pkgs/os-specific/linux/criu/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { wrapPythonPrograms ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Userspace checkpoint/restore for Linux"; homepage = "https://criu.org"; license = licenses.gpl2; diff --git a/pkgs/os-specific/linux/dbus-broker/default.nix b/pkgs/os-specific/linux/dbus-broker/default.nix index d84676bcda6f..74b35c50de59 100644 --- a/pkgs/os-specific/linux/dbus-broker/default.nix +++ b/pkgs/os-specific/linux/dbus-broker/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, docutils, meson, ninja, pkgconfig +{ lib, stdenv, fetchFromGitHub, docutils, meson, ninja, pkgconfig , dbus, linuxHeaders, systemd }: stdenv.mkDerivation rec { @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Linux D-Bus Message Broker"; homepage = "https://github.com/bus1/dbus-broker/wiki"; license = licenses.asl20; diff --git a/pkgs/os-specific/linux/ddcci/default.nix b/pkgs/os-specific/linux/ddcci/default.nix index c977db64ee8a..7e5f95cb2067 100644 --- a/pkgs/os-specific/linux/ddcci/default.nix +++ b/pkgs/os-specific/linux/ddcci/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, kernel }: +{ lib, stdenv, fetchFromGitLab, kernel }: stdenv.mkDerivation rec { pname = "ddcci-driver"; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { "INCLUDEDIR=$(out)/include" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Kernel module driver for DDC/CI monitors"; homepage = "https://gitlab.com/ddcci-driver-linux/ddcci-driver-linux"; license = licenses.gpl2; diff --git a/pkgs/os-specific/linux/devmem2/default.nix b/pkgs/os-specific/linux/devmem2/default.nix index 9115601e3573..86f6f916cefc 100644 --- a/pkgs/os-specific/linux/devmem2/default.nix +++ b/pkgs/os-specific/linux/devmem2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation { name = "devmem2-2004-08-05"; @@ -18,7 +18,7 @@ stdenv.mkDerivation { install -D devmem2 "$out/bin/devmem2" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Simple program to read/write from/to any location in memory"; homepage = "http://lartmaker.nl/lartware/port/"; license = licenses.gpl2Plus; diff --git a/pkgs/os-specific/linux/digimend/default.nix b/pkgs/os-specific/linux/digimend/default.nix index 94f32d2c4329..d0f02097587b 100644 --- a/pkgs/os-specific/linux/digimend/default.nix +++ b/pkgs/os-specific/linux/digimend/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, kernel }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, kernel }: assert stdenv.lib.versionAtLeast kernel.version "3.5"; @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { "DESTDIR=${placeholder "out"}" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "DIGImend graphics tablet drivers for the Linux kernel"; homepage = "https://digimend.github.io/"; license = licenses.gpl2; diff --git a/pkgs/os-specific/linux/directvnc/default.nix b/pkgs/os-specific/linux/directvnc/default.nix index c79371909152..fad9559cc638 100644 --- a/pkgs/os-specific/linux/directvnc/default.nix +++ b/pkgs/os-specific/linux/directvnc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, directfb, zlib, libjpeg, xorgproto }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, directfb, zlib, libjpeg, xorgproto }: stdenv.mkDerivation { pname = "directvnc"; @@ -15,7 +15,7 @@ stdenv.mkDerivation { buildInputs = [ directfb zlib libjpeg xorgproto ]; - meta = with stdenv.lib; { + meta = with lib; { description = "DirectFB VNC client"; homepage = "http://drinkmilk.github.io/directvnc/"; license = licenses.gpl2; diff --git a/pkgs/os-specific/linux/displaylink/default.nix b/pkgs/os-specific/linux/displaylink/default.nix index 5e60d68bc2bb..bd50852bd9d4 100644 --- a/pkgs/os-specific/linux/displaylink/default.nix +++ b/pkgs/os-specific/linux/displaylink/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { dontPatchELF = true; - meta = with stdenv.lib; { + meta = with lib; { description = "DisplayLink DL-5xxx, DL-41xx and DL-3x00 Driver for Linux"; maintainers = with maintainers; [ nshalman abbradar peterhoeg eyjhb ]; platforms = [ "x86_64-linux" "i686-linux" ]; diff --git a/pkgs/os-specific/linux/dmidecode/default.nix b/pkgs/os-specific/linux/dmidecode/default.nix index 7d0990d9f81a..a4e09492debd 100644 --- a/pkgs/os-specific/linux/dmidecode/default.nix +++ b/pkgs/os-specific/linux/dmidecode/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch }: +{ lib, stdenv, fetchurl, fetchpatch }: stdenv.mkDerivation rec { name = "dmidecode-3.2"; @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { makeFlags = [ "prefix=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.nongnu.org/dmidecode/"; description = "A tool that reads information about your system's hardware from the BIOS according to the SMBIOS/DMI standard"; license = licenses.gpl2Plus; diff --git a/pkgs/os-specific/linux/dmtcp/default.nix b/pkgs/os-specific/linux/dmtcp/default.nix index 0f7f2f9817a5..21458daf966f 100644 --- a/pkgs/os-specific/linux/dmtcp/default.nix +++ b/pkgs/os-specific/linux/dmtcp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, bash, perl, python }: +{ lib, stdenv, fetchFromGitHub, bash, perl, python }: stdenv.mkDerivation rec { pname = "dmtcp"; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { --replace "os.getenv('USER')" "\"nixbld1\"" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Distributed MultiThreaded Checkpointing"; longDescription = '' DMTCP (Distributed MultiThreaded Checkpointing) is a tool to diff --git a/pkgs/os-specific/linux/drbd/default.nix b/pkgs/os-specific/linux/drbd/default.nix index bbf2535ce3d6..ae3e986e14af 100644 --- a/pkgs/os-specific/linux/drbd/default.nix +++ b/pkgs/os-specific/linux/drbd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, flex, systemd, perl }: +{ lib, stdenv, fetchurl, flex, systemd, perl }: stdenv.mkDerivation rec { name = "drbd-8.4.4"; @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { "INITDIR=$(out)/etc/init.d" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.drbd.org/"; description = "Distributed Replicated Block Device, a distributed storage system for Linux"; license = licenses.gpl2; diff --git a/pkgs/os-specific/linux/dropwatch/default.nix b/pkgs/os-specific/linux/dropwatch/default.nix index 69acfa9682b6..915d79aabac5 100644 --- a/pkgs/os-specific/linux/dropwatch/default.nix +++ b/pkgs/os-specific/linux/dropwatch/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig , libnl, readline, libbfd, ncurses, zlib }: stdenv.mkDerivation rec { @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Linux kernel dropped packet monitor"; homepage = "https://github.com/nhorman/dropwatch"; license = licenses.gpl2; diff --git a/pkgs/os-specific/linux/dstat/default.nix b/pkgs/os-specific/linux/dstat/default.nix index 6d2d8eb75b00..7d0b87609b36 100644 --- a/pkgs/os-specific/linux/dstat/default.nix +++ b/pkgs/os-specific/linux/dstat/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python2Packages }: +{ lib, stdenv, fetchurl, python2Packages }: python2Packages.buildPythonApplication rec { pname = "dstat"; @@ -16,7 +16,7 @@ python2Packages.buildPythonApplication rec { makeFlags = [ "prefix=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://dag.wieers.com/home-made/dstat/"; description = "Versatile resource statistics tool"; license = licenses.gpl2; diff --git a/pkgs/os-specific/linux/earlyoom/default.nix b/pkgs/os-specific/linux/earlyoom/default.nix index 1eecacad60c0..668a3795b993 100644 --- a/pkgs/os-specific/linux/earlyoom/default.nix +++ b/pkgs/os-specific/linux/earlyoom/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pandoc, installShellFiles, withManpage ? false }: +{ lib, stdenv, fetchFromGitHub, pandoc, installShellFiles, withManpage ? false }: stdenv.mkDerivation rec { pname = "earlyoom"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { installManPage earlyoom.1 ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Early OOM Daemon for Linux"; homepage = "https://github.com/rfjakob/earlyoom"; license = licenses.mit; diff --git a/pkgs/os-specific/linux/ebtables/default.nix b/pkgs/os-specific/linux/ebtables/default.nix index d3705195f599..2045c4b112c8 100644 --- a/pkgs/os-specific/linux/ebtables/default.nix +++ b/pkgs/os-specific/linux/ebtables/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "ebtables"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { preInstall = "mkdir -p $out/etc/sysconfig"; - meta = with stdenv.lib; { + meta = with lib; { description = "A filtering tool for Linux-based bridging firewalls"; homepage = "http://ebtables.sourceforge.net/"; license = licenses.gpl2; diff --git a/pkgs/os-specific/linux/edac-utils/default.nix b/pkgs/os-specific/linux/edac-utils/default.nix index fb0a6dbf62ec..9b8b99812742 100644 --- a/pkgs/os-specific/linux/edac-utils/default.nix +++ b/pkgs/os-specific/linux/edac-utils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, perl, makeWrapper +{ lib, stdenv, fetchFromGitHub, perl, makeWrapper , sysfsutils, dmidecode, kmod }: stdenv.mkDerivation { @@ -28,7 +28,7 @@ stdenv.mkDerivation { --set PATH ${stdenv.lib.makeBinPath [ dmidecode kmod ]} ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/grondo/edac-utils"; description = "Handles the reporting of hardware-related memory errors"; license = licenses.gpl2; diff --git a/pkgs/os-specific/linux/ell/default.nix b/pkgs/os-specific/linux/ell/default.nix index c6aed21cd8e8..183c82f467a5 100644 --- a/pkgs/os-specific/linux/ell/default.nix +++ b/pkgs/os-specific/linux/ell/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchgit , autoreconfHook , pkgconfig @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://01.org/ell"; description = "Embedded Linux Library"; longDescription = '' diff --git a/pkgs/os-specific/linux/ena/default.nix b/pkgs/os-specific/linux/ena/default.nix index 2f06e99b3e13..dc17f7f16965 100644 --- a/pkgs/os-specific/linux/ena/default.nix +++ b/pkgs/os-specific/linux/ena/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, kernel }: +{ lib, stdenv, fetchFromGitHub, kernel }: stdenv.mkDerivation rec { version = "2.3.0"; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { xz $dest/ena.ko ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Amazon Elastic Network Adapter (ENA) driver for Linux"; homepage = "https://github.com/amzn/amzn-drivers"; license = licenses.gpl2; diff --git a/pkgs/os-specific/linux/erofs-utils/default.nix b/pkgs/os-specific/linux/erofs-utils/default.nix new file mode 100644 index 000000000000..ffa39dc58028 --- /dev/null +++ b/pkgs/os-specific/linux/erofs-utils/default.nix @@ -0,0 +1,25 @@ +{ lib, stdenv, fetchgit, autoreconfHook, pkgconfig, fuse, libuuid, lz4 }: + +stdenv.mkDerivation rec { + pname = "erofs-utils"; + version = "1.2"; + outputs = [ "out" "man" ]; + + src = fetchgit { + url = + "https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git"; + rev = "v" + version; + sha256 = "07hvijq2hsn3gg1kb8abrfk23n83j57yx8kyv4wqgwhhvd30myjc"; + }; + + buildInputs = [ autoreconfHook pkgconfig fuse libuuid lz4 ]; + + configureFlags = [ "--enable-fuse" ]; + + meta = with lib; { + description = "Userspace utilities for linux-erofs file system"; + license = with licenses; [ gpl2 ]; + maintainers = with maintainers; [ ehmry ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/os-specific/linux/evdi/default.nix b/pkgs/os-specific/linux/evdi/default.nix index 986bb402e57f..0f56d0e95ca6 100644 --- a/pkgs/os-specific/linux/evdi/default.nix +++ b/pkgs/os-specific/linux/evdi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, kernel, libdrm }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, kernel, libdrm }: stdenv.mkDerivation rec { pname = "evdi"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { install -Dm755 library/libevdi.so $out/lib/libevdi.so ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Extensible Virtual Display Interface"; maintainers = with maintainers; [ eyjhb ]; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/extrace/default.nix b/pkgs/os-specific/linux/extrace/default.nix index 23a9c68b5d5b..8a02d9c67b14 100644 --- a/pkgs/os-specific/linux/extrace/default.nix +++ b/pkgs/os-specific/linux/extrace/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "extrace"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { install -m644 LICENSE "$out/share/licenses/extrace/LICENSE" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/leahneukirchen/extrace"; description = "Trace exec() calls system-wide"; license = with licenses; [ gpl2 bsd2 ]; diff --git a/pkgs/os-specific/linux/facetimehd/default.nix b/pkgs/os-specific/linux/facetimehd/default.nix index 941e71c3bfc7..80c823b31d73 100644 --- a/pkgs/os-specific/linux/facetimehd/default.nix +++ b/pkgs/os-specific/linux/facetimehd/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/patjak/bcwc_pcie"; description = "Linux driver for the Facetime HD (Broadcom 1570) PCIe webcam"; license = licenses.gpl2; diff --git a/pkgs/os-specific/linux/fatrace/default.nix b/pkgs/os-specific/linux/fatrace/default.nix index 69d1afad8a68..a7f754a53ab5 100644 --- a/pkgs/os-specific/linux/fatrace/default.nix +++ b/pkgs/os-specific/linux/fatrace/default.nix @@ -1,12 +1,18 @@ -{ stdenv, fetchurl, python3, which }: +{ lib, stdenv +, fetchFromGitHub +, python3 +, which +}: stdenv.mkDerivation rec { pname = "fatrace"; - version = "0.13"; + version = "0.16.1"; - src = fetchurl { - url = "https://launchpad.net/fatrace/trunk/${version}/+download/${pname}-${version}.tar.bz2"; - sha256 = "0hrh45bpzncw0jkxw3x2smh748r65k2yxvfai466043bi5q0d2vx"; + src = fetchFromGitHub { + owner = "martinpitt"; + repo = pname; + rev = version; + sha256 = "0lxfqin2bw9235yah8ylb4p8lc3755050sjg30z3gy7bab0lfyg9"; }; buildInputs = [ python3 which ]; @@ -14,16 +20,13 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace power-usage-report \ --replace "'which'" "'${which}/bin/which'" - - # Avoid a glibc >= 2.25 deprecation warning that gets fatal via -Werror. - sed 1i'#include ' -i fatrace.c ''; makeFlags = [ "PREFIX=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Report system-wide file access events"; - homepage = "https://launchpad.net/fatrace/"; + homepage = "https://github.com/martinpitt/fatrace"; license = licenses.gpl3Plus; longDescription = '' fatrace reports file access events from all running processes. diff --git a/pkgs/os-specific/linux/fbterm/default.nix b/pkgs/os-specific/linux/fbterm/default.nix index 2b049bc6df5d..e1909eea8947 100644 --- a/pkgs/os-specific/linux/fbterm/default.nix +++ b/pkgs/os-specific/linux/fbterm/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation { ./select.patch ]; - meta = with stdenv.lib; { + meta = with lib; { inherit (s) version; description = "Framebuffer terminal emulator"; homepage = "https://code.google.com/archive/p/fbterm/"; diff --git a/pkgs/os-specific/linux/ffado/default.nix b/pkgs/os-specific/linux/ffado/default.nix index b93caccc7574..96ebaf178bf7 100644 --- a/pkgs/os-specific/linux/ffado/default.nix +++ b/pkgs/os-specific/linux/ffado/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , mkDerivation , dbus , dbus_cplusplus @@ -98,7 +98,7 @@ mkDerivation rec { wrapQtApp $bin/bin/ffado-mixer ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.ffado.org"; description = "FireWire audio drivers"; license = licenses.gpl3; diff --git a/pkgs/os-specific/linux/firmware/b43-firmware/6.30.163.46.nix b/pkgs/os-specific/linux/firmware/b43-firmware/6.30.163.46.nix index 3972e52977f6..c0226065ea26 100644 --- a/pkgs/os-specific/linux/firmware/b43-firmware/6.30.163.46.nix +++ b/pkgs/os-specific/linux/firmware/b43-firmware/6.30.163.46.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, b43FirmwareCutter }: +{ lib, stdenv, fetchurl, b43FirmwareCutter }: stdenv.mkDerivation rec { pname = "b43-firmware"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { b43-fwcutter -w $out *.wl_apsta.o ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Firmware for cards supported by the b43 kernel module"; homepage = "http://wireless.kernel.org/en/users/Drivers/b43"; downloadPage = "http://www.lwfinger.com/b43-firmware"; diff --git a/pkgs/os-specific/linux/firmware/broadcom-bt-firmware/default.nix b/pkgs/os-specific/linux/firmware/broadcom-bt-firmware/default.nix index 314a6b7521b8..5118d0a0b9bf 100644 --- a/pkgs/os-specific/linux/firmware/broadcom-bt-firmware/default.nix +++ b/pkgs/os-specific/linux/firmware/broadcom-bt-firmware/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cabextract, bt-fw-converter }: +{ lib, stdenv, fetchurl, cabextract, bt-fw-converter }: # Kernels between 4.2 and 4.7 will not work with # this packages as they expect the firmware to be named "BCM.hcd" @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { outputHashAlgo = "sha256"; outputHash = "042frb2dmrqfj8q83h5p769q6hg2b3i8fgnyvs9r9a71z7pbsagq"; - meta = with stdenv.lib; { + meta = with lib; { description = "Firmware for Broadcom WIDCOMM® Bluetooth devices"; homepage = "http://www.catalog.update.microsoft.com/Search.aspx?q=Broadcom+bluetooth"; license = licenses.unfree; diff --git a/pkgs/os-specific/linux/firmware/bt-fw-converter/default.nix b/pkgs/os-specific/linux/firmware/bt-fw-converter/default.nix index 5b4506a10eae..f9218b688a97 100644 --- a/pkgs/os-specific/linux/firmware/bt-fw-converter/default.nix +++ b/pkgs/os-specific/linux/firmware/bt-fw-converter/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, perl, perlPackages, bluez }: +{ lib, stdenv, fetchurl, makeWrapper, perl, perlPackages, bluez }: stdenv.mkDerivation rec { pname = "bt-fw-converter"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/bt-fw-converter --set PERL5LIB $PERL5LIB ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/winterheart/broadcom-bt-firmware/"; description = "A tool that converts hex to hcd based on inf file"; license = licenses.mit; diff --git a/pkgs/os-specific/linux/firmware/facetimehd-firmware/default.nix b/pkgs/os-specific/linux/firmware/facetimehd-firmware/default.nix index 7d735e69f568..88a32f174d54 100644 --- a/pkgs/os-specific/linux/firmware/facetimehd-firmware/default.nix +++ b/pkgs/os-specific/linux/firmware/facetimehd-firmware/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cpio, xz, pkgs }: +{ lib, stdenv, fetchurl, cpio, xz, pkgs }: let @@ -54,7 +54,7 @@ stdenv.mkDerivation { gunzip -c ${firmwareOut}.gz > $out/lib/firmware/facetimehd/${firmwareOut} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "facetimehd firmware"; homepage = "https://support.apple.com/kb/DL1877"; license = licenses.unfree; diff --git a/pkgs/os-specific/linux/firmware/fwupd/default.nix b/pkgs/os-specific/linux/firmware/fwupd/default.nix index eb984d54c783..25e0e6b0d882 100644 --- a/pkgs/os-specific/linux/firmware/fwupd/default.nix +++ b/pkgs/os-specific/linux/firmware/fwupd/default.nix @@ -1,6 +1,6 @@ # Updating? Keep $out/etc synchronized with passthru keys -{ stdenv +{ lib, stdenv , fetchurl , fetchFromGitHub , substituteAll @@ -329,7 +329,7 @@ let }; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://fwupd.org/"; maintainers = with maintainers; [ jtojnar ]; license = licenses.lgpl21Plus; diff --git a/pkgs/os-specific/linux/firmware/openelec-dvb-firmware/default.nix b/pkgs/os-specific/linux/firmware/openelec-dvb-firmware/default.nix index ff0081a71e17..3181072ea182 100644 --- a/pkgs/os-specific/linux/firmware/openelec-dvb-firmware/default.nix +++ b/pkgs/os-specific/linux/firmware/openelec-dvb-firmware/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "openelec-dvb-firmware"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { find $out \( -name 'README.*' -or -name 'LICEN[SC]E.*' -or -name '*.txt' \) | xargs rm ''; - meta = with stdenv.lib; { + meta = with lib; { description = "DVB firmware from OpenELEC"; homepage = "https://github.com/OpenELEC/dvb-firmware"; license = licenses.unfreeRedistributableFirmware; diff --git a/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix b/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix index 1a432eb768c9..041694e2ec17 100644 --- a/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix +++ b/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation { pname = "raspberrypi-wireless-firmware"; @@ -43,7 +43,7 @@ stdenv.mkDerivation { outputHashAlgo = "sha256"; outputHash = "17k9y499kjc4zv7ivnsfrgfibwj0ldr3sqdgia4dackbr70jfg2h"; - meta = with stdenv.lib; { + meta = with lib; { description = "Firmware for builtin Wifi/Bluetooth devices in the Raspberry Pi 3+ and Zero W"; homepage = "https://github.com/RPi-Distro/firmware-nonfree"; license = licenses.unfreeRedistributableFirmware; diff --git a/pkgs/os-specific/linux/firmware/raspberrypi/armstubs.nix b/pkgs/os-specific/linux/firmware/raspberrypi/armstubs.nix new file mode 100644 index 000000000000..00ae9868673c --- /dev/null +++ b/pkgs/os-specific/linux/firmware/raspberrypi/armstubs.nix @@ -0,0 +1,51 @@ +{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig }: + +let + inherit (stdenv.lib) optionals; +in +stdenv.mkDerivation { + pname = "raspberrypi-armstubs"; + version = "2020-10-08"; + + src = fetchFromGitHub { + owner = "raspberrypi"; + repo = "tools"; + rev = "fc0e73c13865450e95edd046200e42a6e52d8256"; + sha256 = "1g6ikpjcrm5x0rk5aiwjdd8grf997qkvgamcrdxy6k9ln746h25s"; + }; + + NIX_CFLAGS_COMPILE = [ + "-march=armv8-a+crc" + ]; + + preConfigure = '' + cd armstubs + ''; + + makeFlags = [ + "CC8=${stdenv.cc.targetPrefix}cc" + "LD8=${stdenv.cc.targetPrefix}ld" + "OBJCOPY8=${stdenv.cc.targetPrefix}objcopy" + "OBJDUMP8=${stdenv.cc.targetPrefix}objdump" + "CC7=${stdenv.cc.targetPrefix}cc" + "LD7=${stdenv.cc.targetPrefix}ld" + "OBJCOPY7=${stdenv.cc.targetPrefix}objcopy" + "OBJDUMP7=${stdenv.cc.targetPrefix}objdump" + ] + ++ optionals (stdenv.isAarch64) [ "armstub8.bin" "armstub8-gic.bin" ] + ++ optionals (stdenv.isAarch32) [ "armstub7.bin" "armstub8-32.bin" "armstub8-32-gic.bin" ] + ; + + installPhase = '' + mkdir -vp $out/ + cp -v *.bin $out/ + ''; + + meta = with lib; { + description = "Firmware related ARM stubs for the Raspberry Pi"; + homepage = https://github.com/raspberrypi/tools; + license = licenses.bsd3; + platforms = [ "armv6l-linux" "armv7l-linux" "aarch64-linux" ]; + maintainers = with maintainers; [ samueldr ]; + }; +} diff --git a/pkgs/os-specific/linux/firmware/rt5677/default.nix b/pkgs/os-specific/linux/firmware/rt5677/default.nix index af0c07d10596..f5d84179fd29 100644 --- a/pkgs/os-specific/linux/firmware/rt5677/default.nix +++ b/pkgs/os-specific/linux/firmware/rt5677/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit }: +{ lib, stdenv, fetchgit }: stdenv.mkDerivation { name = "rt5677-firmware"; @@ -15,7 +15,7 @@ stdenv.mkDerivation { cp ./firmware/rt5677_elf_vad $out/lib/firmware ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Firmware for Realtek rt5677 device"; license = licenses.unfreeRedistributableFirmware; maintainers = [ maintainers.zohl ]; diff --git a/pkgs/os-specific/linux/firmware/rtl8192su-firmware/default.nix b/pkgs/os-specific/linux/firmware/rtl8192su-firmware/default.nix index 9b68a49266f5..84a753ca8eac 100644 --- a/pkgs/os-specific/linux/firmware/rtl8192su-firmware/default.nix +++ b/pkgs/os-specific/linux/firmware/rtl8192su-firmware/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: with stdenv.lib; stdenv.mkDerivation { name = "rtl8192su-unstable-2016-10-05"; @@ -26,7 +26,7 @@ stdenv.mkDerivation { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Firmware for Realtek RTL8188SU/RTL8191SU/RTL8192SU"; homepage = "https://github.com/chunkeey/rtl8192su"; license = licenses.unfreeRedistributableFirmware; diff --git a/pkgs/os-specific/linux/firmware/rtl8723bs-firmware/default.nix b/pkgs/os-specific/linux/firmware/rtl8723bs-firmware/default.nix index f95d1efcef77..4f33f09cc787 100644 --- a/pkgs/os-specific/linux/firmware/rtl8723bs-firmware/default.nix +++ b/pkgs/os-specific/linux/firmware/rtl8723bs-firmware/default.nix @@ -1,4 +1,4 @@ -{ stdenv, linuxPackages }: +{ lib, stdenv, linuxPackages }: with stdenv.lib; stdenv.mkDerivation { name = "rtl8723bs-firmware-${linuxPackages.rtl8723bs.version}"; @@ -12,7 +12,7 @@ stdenv.mkDerivation { cp rtl8723bs_wowlan.bin "$out/lib/firmware/rtlwifi" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Firmware for RealTek 8723bs"; homepage = "https://github.com/hadess/rtl8723bs"; license = licenses.unfreeRedistributableFirmware; diff --git a/pkgs/os-specific/linux/firmware/rtl8761b-firmware/default.nix b/pkgs/os-specific/linux/firmware/rtl8761b-firmware/default.nix index 4418722c7c45..f2dd36a0e065 100644 --- a/pkgs/os-specific/linux/firmware/rtl8761b-firmware/default.nix +++ b/pkgs/os-specific/linux/firmware/rtl8761b-firmware/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation { name = "rtl8761b-firmware"; @@ -20,7 +20,7 @@ stdenv.mkDerivation { $out/lib/firmware/rtl_bt/rtl8761b_config.bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Firmware for Realtek RTL8761b"; license = licenses.unfreeRedistributableFirmware; maintainers = with maintainers; [ edibopp ]; diff --git a/pkgs/os-specific/linux/firmware/sof-firmware/default.nix b/pkgs/os-specific/linux/firmware/sof-firmware/default.nix index 684d638ce29f..c1f99bdad686 100644 --- a/pkgs/os-specific/linux/firmware/sof-firmware/default.nix +++ b/pkgs/os-specific/linux/firmware/sof-firmware/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: with stdenv.lib; stdenv.mkDerivation rec { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ROOT=$out SOF_VERSION=v${version} ./go.sh ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Sound Open Firmware"; homepage = "https://www.sofproject.org/"; license = with licenses; [ bsd3 isc ]; diff --git a/pkgs/os-specific/linux/flashbench/default.nix b/pkgs/os-specific/linux/flashbench/default.nix index 70ad779c239b..9c14fde319df 100644 --- a/pkgs/os-specific/linux/flashbench/default.nix +++ b/pkgs/os-specific/linux/flashbench/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit }: +{ lib, stdenv, fetchgit }: stdenv.mkDerivation { pname = "flashbench"; @@ -17,7 +17,7 @@ stdenv.mkDerivation { install -v -m644 README $out/share/doc/flashbench ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Testing tool for flash based memory devices"; homepage = "https://github.com/bradfa/flashbench"; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/freefall/default.nix b/pkgs/os-specific/linux/freefall/default.nix index a6c5a6593d1c..683b599e5beb 100644 --- a/pkgs/os-specific/linux/freefall/default.nix +++ b/pkgs/os-specific/linux/freefall/default.nix @@ -1,4 +1,4 @@ -{ stdenv, kernel }: +{ lib, stdenv, kernel }: stdenv.mkDerivation { inherit (kernel) version src; @@ -15,7 +15,7 @@ stdenv.mkDerivation { makeFlags = [ "PREFIX=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { inherit (kernel.meta) homepage license; description = "Free-fall protection for spinning HP/Dell laptop hard drives"; diff --git a/pkgs/os-specific/linux/fscrypt/default.nix b/pkgs/os-specific/linux/fscrypt/default.nix index 000400e4cdf9..db4b70037c8f 100644 --- a/pkgs/os-specific/linux/fscrypt/default.nix +++ b/pkgs/os-specific/linux/fscrypt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, gnum4, pam, fscrypt-experimental }: +{ lib, stdenv, buildGoModule, fetchFromGitHub, gnum4, pam, fscrypt-experimental }: # Don't use this for anything important yet! @@ -34,7 +34,7 @@ buildGoModule rec { make install ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A high-level tool for the management of Linux filesystem encryption"; longDescription = '' diff --git a/pkgs/os-specific/linux/fscryptctl/default.nix b/pkgs/os-specific/linux/fscryptctl/default.nix index ecab0350d789..204ce6bf992c 100644 --- a/pkgs/os-specific/linux/fscryptctl/default.nix +++ b/pkgs/os-specific/linux/fscryptctl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: # Don't use this for anything important yet! @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { makeFlags = [ "DESTDIR=$(out)/bin" ]; - meta = with stdenv.lib; { + meta = with lib; { description = '' A low-level tool that handles raw keys and manages policies for Linux filesystem encryption diff --git a/pkgs/os-specific/linux/ftop/default.nix b/pkgs/os-specific/linux/ftop/default.nix index d7791cd1a629..abd6d7884619 100644 --- a/pkgs/os-specific/linux/ftop/default.nix +++ b/pkgs/os-specific/linux/ftop/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses }: +{ lib, stdenv, fetchurl, ncurses }: stdenv.mkDerivation rec { pname = "ftop"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { substituteInPlace configure --replace "curses" "ncurses" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Show progress of open files and file systems"; homepage = "https://code.google.com/archive/p/ftop/"; license = licenses.gpl3Plus; diff --git a/pkgs/os-specific/linux/fuse/common.nix b/pkgs/os-specific/linux/fuse/common.nix index b40bd84cbb8d..faef3673bb98 100644 --- a/pkgs/os-specific/linux/fuse/common.nix +++ b/pkgs/os-specific/linux/fuse/common.nix @@ -1,6 +1,6 @@ { version, sha256Hash }: -{ stdenv, fetchFromGitHub, fetchpatch +{ lib, stdenv, fetchFromGitHub, fetchpatch , fusePackages, util-linux, gettext , meson, ninja, pkg-config , autoreconfHook @@ -83,7 +83,7 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Library that allows filesystems to be implemented in user space"; longDescription = '' FUSE (Filesystem in Userspace) is an interface for userspace programs to diff --git a/pkgs/os-specific/linux/fwts/default.nix b/pkgs/os-specific/linux/fwts/default.nix index 58d4bdbae855..857d30859b5a 100644 --- a/pkgs/os-specific/linux/fwts/default.nix +++ b/pkgs/os-specific/linux/fwts/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, autoreconfHook, pkgconfig, glib, libtool, pcre +{ lib, stdenv, fetchzip, autoreconfHook, pkgconfig, glib, libtool, pcre , json_c, flex, bison, dtc, pciutils, dmidecode, iasl, libbsd }: stdenv.mkDerivation rec { @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://wiki.ubuntu.com/FirmwareTestSuite"; description = "Firmware Test Suite"; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/fwts/module.nix b/pkgs/os-specific/linux/fwts/module.nix index ef90e0c303ba..737d3316e21d 100644 --- a/pkgs/os-specific/linux/fwts/module.nix +++ b/pkgs/os-specific/linux/fwts/module.nix @@ -1,4 +1,4 @@ -{ stdenv, fwts, kernel }: +{ lib, stdenv, fwts, kernel }: stdenv.mkDerivation rec { pname = "fwts-efi-runtime"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { "INSTALL_MOD_PATH=${placeholder "out"}" ]; - meta = with stdenv.lib; { + meta = with lib; { inherit (fwts.meta) homepage license; description = fwts.meta.description + "(efi-runtime kernel module)"; maintainers = with maintainers; [ dtzWill ]; diff --git a/pkgs/os-specific/linux/fxload/default.nix b/pkgs/os-specific/linux/fxload/default.nix index e77983254e43..3255c992f864 100644 --- a/pkgs/os-specific/linux/fxload/default.nix +++ b/pkgs/os-specific/linux/fxload/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation { name = "fxload-2002_04_11"; @@ -27,7 +27,7 @@ stdenv.mkDerivation { mkdir -p $out/share/usb ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://linux-hotplug.sourceforge.net/?selected=usb"; description = "Tool to upload firmware to Cypress EZ-USB microcontrollers"; license = licenses.gpl2; diff --git a/pkgs/os-specific/linux/gcadapter-oc-kmod/default.nix b/pkgs/os-specific/linux/gcadapter-oc-kmod/default.nix index dd2979b58712..ab2e099d9708 100644 --- a/pkgs/os-specific/linux/gcadapter-oc-kmod/default.nix +++ b/pkgs/os-specific/linux/gcadapter-oc-kmod/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , kernel , kmod @@ -28,7 +28,7 @@ in stdenv.mkDerivation rec { install -D {,$out/${kerneldir}/extra/}gcadapter_oc.ko ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Kernel module for overclocking the Nintendo Wii U/Mayflash GameCube adapter"; homepage = "https://github.com/HannesMann/gcadapter-oc-kmod"; license = licenses.gpl2; diff --git a/pkgs/os-specific/linux/gobi_loader/default.nix b/pkgs/os-specific/linux/gobi_loader/default.nix index b8735354c2c6..b7972007719c 100644 --- a/pkgs/os-specific/linux/gobi_loader/default.nix +++ b/pkgs/os-specific/linux/gobi_loader/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { makeFlags = "prefix=${placeholder "out"}"; - meta = with stdenv.lib; { + meta = with lib; { description = "Firmware loader for Qualcomm Gobi USB chipsets"; homepage = "https://www.codon.org.uk/~mjg59/gobi_loader/"; license = with licenses; [ gpl2 ]; diff --git a/pkgs/os-specific/linux/gogoclient/default.nix b/pkgs/os-specific/linux/gogoclient/default.nix index d107f18c8da2..b5eb1ce1a50c 100644 --- a/pkgs/os-specific/linux/gogoclient/default.nix +++ b/pkgs/os-specific/linux/gogoclient/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, openssl, nettools, iproute, sysctl}: +{lib, stdenv, fetchurl, openssl, nettools, iproute, sysctl}: let baseName = "gogoclient"; version = "1.2"; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { sed -i -e 's/^.*Exec \$route -A.*$/& metric 128/' $out/template/linux.sh ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://ipv6.ernet.in/Tunnel_broker"; description = "Client to connect to the Freenet6 IPv6 tunnel broker service"; maintainers = [ maintainers.bluescreen303 ]; diff --git a/pkgs/os-specific/linux/gradm/default.nix b/pkgs/os-specific/linux/gradm/default.nix index fee183c82599..90f8df63e3b3 100644 --- a/pkgs/os-specific/linux/gradm/default.nix +++ b/pkgs/os-specific/linux/gradm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , bison, flex , pam }: @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { postInstall = ''rmdir $out/dev''; - meta = with stdenv.lib; { + meta = with lib; { description = "grsecurity RBAC administration and policy analysis utility"; homepage = "https://grsecurity.net"; license = licenses.gpl2; diff --git a/pkgs/os-specific/linux/guvcview/default.nix b/pkgs/os-specific/linux/guvcview/default.nix index d780cade7865..00e726d7222b 100644 --- a/pkgs/os-specific/linux/guvcview/default.nix +++ b/pkgs/os-specific/linux/guvcview/default.nix @@ -1,5 +1,5 @@ { config -, stdenv +, lib, stdenv , fetchurl , intltool , pkgconfig @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { gsl libpng sfml - ] + ] ++ stdenv.lib.optionals (pulseaudioSupport) [ libpulseaudio ] ++ stdenv.lib.optionals (useGtk) [ gtk3 ] ++ stdenv.lib.optionals (useQt) [ @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optionals (useQt) [ "--enable-qt5" ] ; - meta = with stdenv.lib; { + meta = with lib; { description = "A simple interface for devices supported by the linux UVC driver"; homepage = "http://guvcview.sourceforge.net"; maintainers = [ maintainers.coconnor ]; diff --git a/pkgs/os-specific/linux/hal-flash/default.nix b/pkgs/os-specific/linux/hal-flash/default.nix index c3463851fd3e..a24bf093f8cf 100644 --- a/pkgs/os-specific/linux/hal-flash/default.nix +++ b/pkgs/os-specific/linux/hal-flash/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoconf, automake, dbus, glib, libtool, pkgconfig, udisks2 }: +{ lib, stdenv, fetchurl, autoconf, automake, dbus, glib, libtool, pkgconfig, udisks2 }: stdenv.mkDerivation { name = "hal-flash-0.3.3"; @@ -13,7 +13,7 @@ stdenv.mkDerivation { preConfigure = "libtoolize && aclocal && autoconf && automake --add-missing"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/cshorler/hal-flash"; description = "libhal stub library to satisfy the Flash Player DRM requirements"; longDescription = diff --git a/pkgs/os-specific/linux/hd-idle/default.nix b/pkgs/os-specific/linux/hd-idle/default.nix index 5e32e220b2f8..3e4b08151463 100644 --- a/pkgs/os-specific/linux/hd-idle/default.nix +++ b/pkgs/os-specific/linux/hd-idle/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "hd-idle-1.05"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { installFlags = [ "TARGET_DIR=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Spins down external disks after a period of idle time"; homepage = "http://hd-idle.sourceforge.net/"; license = licenses.gpl2Plus; diff --git a/pkgs/os-specific/linux/hdparm/default.nix b/pkgs/os-specific/linux/hdparm/default.nix index 012cfb7e6032..ada0ddef2330 100644 --- a/pkgs/os-specific/linux/hdparm/default.nix +++ b/pkgs/os-specific/linux/hdparm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "hdparm"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { makeFlagsArray=(sbindir=$out/sbin manprefix=$out) ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A tool to get/set ATA/SATA drive parameters under Linux"; homepage = "https://sourceforge.net/projects/hdparm/"; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/hostapd/default.nix b/pkgs/os-specific/linux/hostapd/default.nix index 991dcbe26152..f004a27fca1f 100644 --- a/pkgs/os-specific/linux/hostapd/default.nix +++ b/pkgs/os-specific/linux/hostapd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libnl, openssl, sqlite ? null }: +{ lib, stdenv, fetchurl, pkgconfig, libnl, openssl, sqlite ? null }: stdenv.mkDerivation rec { pname = "hostapd"; @@ -94,7 +94,7 @@ stdenv.mkDerivation rec { install -vD hostapd_cli.1 -t $man/share/man/man1 ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://hostap.epitest.fi"; repositories.git = "git://w1.fi/hostap.git"; description = "A user space daemon for access point and authentication servers"; diff --git a/pkgs/os-specific/linux/hyperv-daemons/default.nix b/pkgs/os-specific/linux/hyperv-daemons/default.nix index 1a111a295a42..2d7644e6bda6 100644 --- a/pkgs/os-specific/linux/hyperv-daemons/default.nix +++ b/pkgs/os-specific/linux/hyperv-daemons/default.nix @@ -98,7 +98,7 @@ in stdenv.mkDerivation { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Integration Services for running NixOS under HyperV"; longDescription = '' This packages contains the daemons that are used by the Hyper-V hypervisor diff --git a/pkgs/os-specific/linux/i2c-tools/default.nix b/pkgs/os-specific/linux/i2c-tools/default.nix index d1dc94290fab..23bc89b7d1c9 100644 --- a/pkgs/os-specific/linux/i2c-tools/default.nix +++ b/pkgs/os-specific/linux/i2c-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, read-edid }: +{ lib, stdenv, fetchurl, perl, read-edid }: stdenv.mkDerivation rec { pname = "i2c-tools"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { rm -rf $out/include # Installs include/linux/i2c-dev.h that conflics with kernel headers ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Set of I2C tools for Linux"; homepage = "https://i2c.wiki.kernel.org/index.php/I2C_Tools"; license = licenses.gpl2; diff --git a/pkgs/os-specific/linux/ifmetric/default.nix b/pkgs/os-specific/linux/ifmetric/default.nix index 1f69d728f604..f5d55db5e41b 100644 --- a/pkgs/os-specific/linux/ifmetric/default.nix +++ b/pkgs/os-specific/linux/ifmetric/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, lynx }: +{ lib, stdenv, fetchurl, lynx }: stdenv.mkDerivation rec { pname = "ifmetric"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { }) ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Tool for setting IP interface metrics"; longDescription = '' ifmetric is a Linux tool for setting the metrics of all IPv4 routes diff --git a/pkgs/os-specific/linux/iio-sensor-proxy/default.nix b/pkgs/os-specific/linux/iio-sensor-proxy/default.nix index 95f555cef8c0..3f4a8e2348b5 100644 --- a/pkgs/os-specific/linux/iio-sensor-proxy/default.nix +++ b/pkgs/os-specific/linux/iio-sensor-proxy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoconf-archive, gettext, libtool, intltool, autoconf, automake +{ lib, stdenv, fetchFromGitHub, autoconf-archive, gettext, libtool, intltool, autoconf, automake , glib, gtk3, gtk-doc, libgudev, pkgconfig, systemd }: stdenv.mkDerivation rec { @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { pkgconfig ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Proxy for sending IIO sensor data to D-Bus"; homepage = "https://github.com/hadess/iio-sensor-proxy"; license = licenses.gpl3 ; diff --git a/pkgs/os-specific/linux/input-utils/default.nix b/pkgs/os-specific/linux/input-utils/default.nix index 0fc2130d102a..3be25867c335 100644 --- a/pkgs/os-specific/linux/input-utils/default.nix +++ b/pkgs/os-specific/linux/input-utils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, linuxHeaders }: +{ lib, stdenv, fetchurl, linuxHeaders }: stdenv.mkDerivation rec { pname = "input-utils"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { "STRIP=" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Input layer utilities, includes lsinput"; homepage = "https://www.kraxel.org/blog/linux/input/"; license = licenses.gpl2; diff --git a/pkgs/os-specific/linux/intel-compute-runtime/default.nix b/pkgs/os-specific/linux/intel-compute-runtime/default.nix index 7b8c2197d706..9d69eca57f44 100644 --- a/pkgs/os-specific/linux/intel-compute-runtime/default.nix +++ b/pkgs/os-specific/linux/intel-compute-runtime/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , patchelf , cmake @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { $out/lib/intel-opencl/libigdrcl.so ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/intel/compute-runtime"; description = "Intel Graphics Compute Runtime for OpenCL. Replaces Beignet for Gen8 (Broadwell) and beyond"; license = licenses.mit; diff --git a/pkgs/os-specific/linux/intel-speed-select/default.nix b/pkgs/os-specific/linux/intel-speed-select/default.nix index 12536130a864..89b4feff7a50 100644 --- a/pkgs/os-specific/linux/intel-speed-select/default.nix +++ b/pkgs/os-specific/linux/intel-speed-select/default.nix @@ -1,4 +1,4 @@ -{ stdenv, kernel }: +{ lib, stdenv, kernel }: stdenv.mkDerivation { pname = "intel-speed-select"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { sed -i 's,/usr,,g' Makefile ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Tool to enumerate and control the Intel Speed Select Technology features"; homepage = "https://www.kernel.org/"; license = licenses.gpl2; diff --git a/pkgs/os-specific/linux/ioport/default.nix b/pkgs/os-specific/linux/ioport/default.nix index fad85335200c..543495ec2afc 100644 --- a/pkgs/os-specific/linux/ioport/default.nix +++ b/pkgs/os-specific/linux/ioport/default.nix @@ -1,4 +1,4 @@ -{ stdenv, perl, fetchurl }: +{ lib, stdenv, perl, fetchurl }: stdenv.mkDerivation { name = "ioport-1.2"; @@ -7,7 +7,7 @@ stdenv.mkDerivation { sha256 = "1h4d5g78y7kla0zl25jgyrk43wy3m3bygqg0blki357bc55irb3z"; }; buildInputs = [ perl ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Direct access to I/O ports from the command line"; homepage = "https://people.redhat.com/rjones/ioport/"; license = licenses.gpl2Plus; diff --git a/pkgs/os-specific/linux/iotop/default.nix b/pkgs/os-specific/linux/iotop/default.nix index 8f742aa01be8..1924e326c1e5 100644 --- a/pkgs/os-specific/linux/iotop/default.nix +++ b/pkgs/os-specific/linux/iotop/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python3Packages, fetchpatch }: +{ lib, stdenv, fetchurl, python3Packages, fetchpatch }: python3Packages.buildPythonApplication rec { name = "iotop-0.6"; @@ -17,7 +17,7 @@ python3Packages.buildPythonApplication rec { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "A tool to find out the processes doing the most IO"; homepage = "http://guichaz.free.fr/iotop"; license = licenses.gpl2; diff --git a/pkgs/os-specific/linux/iproute/default.nix b/pkgs/os-specific/linux/iproute/default.nix index b3de7ceedaad..afd495dd6d1d 100644 --- a/pkgs/os-specific/linux/iproute/default.nix +++ b/pkgs/os-specific/linux/iproute/default.nix @@ -1,23 +1,20 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , buildPackages, bison, flex, pkg-config , db, iptables, libelf, libmnl }: stdenv.mkDerivation rec { pname = "iproute2"; - version = "5.9.0"; + version = "5.10.0"; src = fetchurl { url = "mirror://kernel/linux/utils/net/${pname}/${pname}-${version}.tar.xz"; - sha256 = "1kys6dmhrl43iaq95n5sh02p39d7bq8i5y672qrzgwnwpjaaqpd2"; + sha256 = "1sakmhvh40gh4x55vzgy6cyvizqkhqalcfpvs6r0c14w62p38jm5"; }; preConfigure = '' # Don't try to create /var/lib/arpd: sed -e '/ARPDDIR/d' -i Makefile - # TODO: Drop temporary version fix for 5.9 once 5.10 is out: - substituteInPlace include/version.h \ - --replace "5.8.0" "${version}" ''; outputs = [ "out" "dev" ]; @@ -43,7 +40,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://wiki.linuxfoundation.org/networking/iproute2"; description = "A collection of utilities for controlling TCP/IP networking and traffic control in Linux"; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/iproute/mptcp.nix b/pkgs/os-specific/linux/iproute/mptcp.nix index 63f0abcd2a29..6505d1d80eea 100644 --- a/pkgs/os-specific/linux/iproute/mptcp.nix +++ b/pkgs/os-specific/linux/iproute/mptcp.nix @@ -1,4 +1,4 @@ -{ stdenv, iproute, fetchFromGitHub }: +{ lib, stdenv, iproute, fetchFromGitHub }: iproute.overrideAttrs (oa: rec { pname = "iproute_mptcp"; @@ -17,7 +17,7 @@ iproute.overrideAttrs (oa: rec { patchShebangs configure ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/multipath-tcp/iproute-mptcp"; description = "IP-Route extensions for MultiPath TCP"; license = licenses.gpl2; diff --git a/pkgs/os-specific/linux/ipsec-tools/default.nix b/pkgs/os-specific/linux/ipsec-tools/default.nix index bff356ccb6cf..4e0ae7955bee 100644 --- a/pkgs/os-specific/linux/ipsec-tools/default.nix +++ b/pkgs/os-specific/linux/ipsec-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, linuxHeaders, readline, openssl, flex, kerberos, pam }: +{ lib, stdenv, fetchurl, fetchpatch, linuxHeaders, readline, openssl, flex, kerberos, pam }: # TODO: These tools are supposed to work under NetBSD and FreeBSD as # well, so I guess it's not appropriate to place this expression in @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { "--enable-stats" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://ipsec-tools.sourceforge.net/"; description = "Port of KAME's IPsec utilities to the Linux-2.6 IPsec implementation"; license = licenses.bsd3; diff --git a/pkgs/os-specific/linux/ipset/default.nix b/pkgs/os-specific/linux/ipset/default.nix index 647e5e3597df..083c9aa726c6 100644 --- a/pkgs/os-specific/linux/ipset/default.nix +++ b/pkgs/os-specific/linux/ipset/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libmnl }: +{ lib, stdenv, fetchurl, pkgconfig, libmnl }: stdenv.mkDerivation rec { pname = "ipset"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-kmod=no" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://ipset.netfilter.org/"; description = "Administration tool for IP sets"; license = licenses.gpl2; diff --git a/pkgs/os-specific/linux/iptstate/default.nix b/pkgs/os-specific/linux/iptstate/default.nix index 529a82e96469..94693f1559e5 100644 --- a/pkgs/os-specific/linux/iptstate/default.nix +++ b/pkgs/os-specific/linux/iptstate/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libnetfilter_conntrack, ncurses }: +{ lib, stdenv, fetchurl, libnetfilter_conntrack, ncurses }: stdenv.mkDerivation rec { pname = "iptstate"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ libnetfilter_conntrack ncurses ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Conntrack top like tool"; homepage = "https://github.com/jaymzh/iptstate"; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/ipvsadm/default.nix b/pkgs/os-specific/linux/ipvsadm/default.nix index 5f91fa5dccd9..aab8c2c7c83f 100644 --- a/pkgs/os-specific/linux/ipvsadm/default.nix +++ b/pkgs/os-specific/linux/ipvsadm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libnl, popt, gnugrep }: +{ lib, stdenv, fetchurl, pkgconfig, libnl, popt, gnugrep }: stdenv.mkDerivation rec { pname = "ipvsadm"; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { sed -i -e "s|^PATH=.*|PATH=$out/bin:${gnugrep}/bin|" $out/sbin/ipvsadm-{restore,save} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Linux Virtual Server support programs"; homepage = "http://www.linuxvirtualserver.org/software/ipvs.html"; license = licenses.gpl2; diff --git a/pkgs/os-specific/linux/it87/default.nix b/pkgs/os-specific/linux/it87/default.nix index c48de130e5a1..1e56d3a830cc 100644 --- a/pkgs/os-specific/linux/it87/default.nix +++ b/pkgs/os-specific/linux/it87/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, kernel }: +{ lib, stdenv, fetchFromGitHub, kernel }: stdenv.mkDerivation rec { name = "it87-${version}-${kernel.version}"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { "MODDESTDIR=$(out)/lib/modules/${kernel.modDirVersion}/kernel/drivers/hwmon" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Patched module for IT87xx superio chip sensors support"; homepage = "https://github.com/hannesha/it87"; license = licenses.gpl2; diff --git a/pkgs/os-specific/linux/iwd/default.nix b/pkgs/os-specific/linux/iwd/default.nix index 0cbd7ff3a3ad..0e73dc94e5a0 100644 --- a/pkgs/os-specific/linux/iwd/default.nix +++ b/pkgs/os-specific/linux/iwd/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchgit , fetchpatch , autoreconfHook @@ -85,7 +85,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://git.kernel.org/pub/scm/network/wireless/iwd.git"; description = "Wireless daemon for Linux"; license = licenses.lgpl21; diff --git a/pkgs/os-specific/linux/ixgbevf/default.nix b/pkgs/os-specific/linux/ixgbevf/default.nix index 67b9a66a8abb..6a748c470190 100644 --- a/pkgs/os-specific/linux/ixgbevf/default.nix +++ b/pkgs/os-specific/linux/ixgbevf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, kernel, kmod }: +{ lib, stdenv, fetchurl, kernel, kmod }: stdenv.mkDerivation rec { name = "ixgbevf-${version}-${kernel.version}"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Intel 82599 Virtual Function Driver"; homepage = "https://sourceforge.net/projects/e1000/files/ixgbevf%20stable/"; license = licenses.gpl2; diff --git a/pkgs/os-specific/linux/jfbview/default.nix b/pkgs/os-specific/linux/jfbview/default.nix index 7984e2678070..8ed1d87c195a 100644 --- a/pkgs/os-specific/linux/jfbview/default.nix +++ b/pkgs/os-specific/linux/jfbview/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , freetype, harfbuzz, jbig2dec, libjpeg, libX11, mupdf_1_17, ncurses, openjpeg , openssl @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { install ${toString binaries} $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "PDF and image viewer for the Linux framebuffer"; longDescription = '' A very fast PDF and image viewer for the Linux framebuffer with some diff --git a/pkgs/os-specific/linux/jool/cli.nix b/pkgs/os-specific/linux/jool/cli.nix index 2d6e624fee69..8572f8ebdb93 100644 --- a/pkgs/os-specific/linux/jool/cli.nix +++ b/pkgs/os-specific/linux/jool/cli.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libnl, iptables }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libnl, iptables }: let sourceAttrs = (import ./source.nix) { inherit fetchFromGitHub; }; @@ -18,7 +18,7 @@ stdenv.mkDerivation { sed -e 's%^XTABLES_SO_DIR = .*%XTABLES_SO_DIR = '"$out"'/lib/xtables%g' -i src/usr/iptables/Makefile ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.jool.mx/"; description = "Fairly compliant SIIT and Stateful NAT64 for Linux - CLI tools"; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/jool/default.nix b/pkgs/os-specific/linux/jool/default.nix index 69c0da331364..58894de6c2e6 100644 --- a/pkgs/os-specific/linux/jool/default.nix +++ b/pkgs/os-specific/linux/jool/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, kernel }: +{ lib, stdenv, fetchFromGitHub, kernel }: let sourceAttrs = (import ./source.nix) { inherit fetchFromGitHub; }; @@ -24,7 +24,7 @@ stdenv.mkDerivation { make -C src/mod modules_install INSTALL_MOD_PATH=$out ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.jool.mx/"; description = "Fairly compliant SIIT and Stateful NAT64 for Linux - kernel modules"; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/kbd/default.nix b/pkgs/os-specific/linux/kbd/default.nix index 7ee449ff33ed..80cb98feffe1 100644 --- a/pkgs/os-specific/linux/kbd/default.nix +++ b/pkgs/os-specific/linux/kbd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, +{ lib, stdenv, fetchurl, autoreconfHook, gzip, bzip2, pkgconfig, flex, check, pam, coreutils }: @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { makeFlags = [ "setowner=" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "ftp://ftp.altlinux.org/pub/people/legion/kbd/"; description = "Linux keyboard utilities and keyboard maps"; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/kbdlight/default.nix b/pkgs/os-specific/linux/kbdlight/default.nix index bc2d53b5e5d9..0ed575b82546 100644 --- a/pkgs/os-specific/linux/kbdlight/default.nix +++ b/pkgs/os-specific/linux/kbdlight/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "kbdlight"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { --replace 4755 0755 ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/hobarrera/kbdlight"; description = "A very simple application that changes MacBooks' keyboard backlight level"; license = licenses.isc; diff --git a/pkgs/os-specific/linux/kernel-headers/default.nix b/pkgs/os-specific/linux/kernel-headers/default.nix index 284ef472d049..cadf65a7220f 100644 --- a/pkgs/os-specific/linux/kernel-headers/default.nix +++ b/pkgs/os-specific/linux/kernel-headers/default.nix @@ -69,12 +69,12 @@ let in { inherit makeLinuxHeaders; - linuxHeaders = let version = "5.9.8"; in + linuxHeaders = let version = "5.10.4"; in makeLinuxHeaders { inherit version; src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "19l67gzk97higd2cbggipcb0wi21pv0ag0mc4qh6cqk564xp6mkn"; + sha256 = "1v2nbpp21c3fkw23dgrrfznnnlvi0538kj8wrlb2m6g94rn3jklh"; }; patches = [ ./no-relocs.patch # for building x86 kernel headers on non-ELF platforms diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 47e49dbe01d7..c86ec88ec69b 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -416,7 +416,10 @@ let SECURITY_APPARMOR = yes; DEFAULT_SECURITY_APPARMOR = yes; - SECURITY_LOCKDOWN_LSM = whenAtLeast "5.4" yes; + MODULE_SIG = no; # r13y, generates a random key during build and bakes it in + # Depends on MODULE_SIG and only really helps when you sign your modules + # and enforce signatures which we don't do by default. + SECURITY_LOCKDOWN_LSM = option no; } // optionalAttrs (!stdenv.hostPlatform.isAarch32) { # Detect buffer overflows on the stack @@ -654,7 +657,10 @@ let MODULE_COMPRESS = yes; MODULE_COMPRESS_XZ = yes; - KERNEL_XZ = yes; + + # use zstd for kernel compression if newer than 5.9, else xz. + KERNEL_XZ = whenOlder "5.9" yes; + KERNEL_ZSTD = whenAtLeast "5.9" yes; SYSVIPC = yes; # System-V IPC @@ -819,6 +825,12 @@ let # See comments on https://github.com/NixOS/nixpkgs/commit/9b67ea9106102d882f53d62890468071900b9647 CRYPTO_AEGIS128_SIMD = whenAtLeast "5.4" no; + + # Distros should configure the default as a kernel option. + # We previously defined it on the kernel command line as cma= + # The kernel command line will override a platform-specific configuration from its device tree. + # https://github.com/torvalds/linux/blob/856deb866d16e29bd65952e0289066f6078af773/kernel/dma/contiguous.c#L35-L44 + CMA_SIZE_MBYTES = freeform "32"; }; }; in diff --git a/pkgs/os-specific/linux/kernel/generate-config.pl b/pkgs/os-specific/linux/kernel/generate-config.pl index 26c559ea9086..6a2aec809a1b 100644 --- a/pkgs/os-specific/linux/kernel/generate-config.pl +++ b/pkgs/os-specific/linux/kernel/generate-config.pl @@ -61,6 +61,12 @@ sub runConfig { # Remember choice alternatives ("> 1. bla (FOO)" or " 2. bla (BAR) (NEW)"). if ($line =~ /^\s*>?\s*(\d+)\.\s+.*?\(([A-Za-z0-9_]+)\)(?:\s+\(NEW\))?\s*$/) { $choices{$2} = $1; + } else { + # The list of choices has ended without us being + # asked. This happens for options where only one value + # is valid, for instance. The results can foul up + # later options, so forget about it. + %choices = (); } $line = ""; diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 0ea36ce8f440..83d01bbb6b62 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -1,20 +1,30 @@ { "4.14": { - "name": "linux-hardened-4.14.212.a.patch", - "sha256": "068grrkygd6klv4zx3jghk987bl0v7g5g5911a2irllpsjv55rna", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.212.a/linux-hardened-4.14.212.a.patch" + "extra": ".a", + "name": "linux-hardened-4.14.215.a.patch", + "sha256": "1bk00y0cm05pzsshf1kmbxwcizi0lnq6ss1ig2bhxzgv2rxzj8cz", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.215.a/linux-hardened-4.14.215.a.patch" }, "4.19": { - "name": "linux-hardened-4.19.163.a.patch", - "sha256": "0p8y9r1f3blsqrakxy4yp73sff0i0k43cwp5rg4ry3apnzfly1a4", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.163.a/linux-hardened-4.19.163.a.patch" + "extra": ".a", + "name": "linux-hardened-4.19.167.a.patch", + "sha256": "1ijdlkh1ad803i9dds46w2457jwigzlil9v37x793v4mx0rqb8ag", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.167.a/linux-hardened-4.19.167.a.patch" + }, + "5.10": { + "extra": ".a", + "name": "linux-hardened-5.10.7.a.patch", + "sha256": "1b5djibfdqs0zhidh87hz9fhnvxyjxnz7lys0ks3a9a7ha5mina4", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.7.a/linux-hardened-5.10.7.a.patch" }, "5.4": { - "name": "linux-hardened-5.4.85.a.patch", - "sha256": "1ml9vpakhpxry29c4q0fz346ly7s3hwd7rasr4dzkgs71lm5a1sy", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.85.a/linux-hardened-5.4.85.a.patch" + "extra": ".a", + "name": "linux-hardened-5.4.89.a.patch", + "sha256": "1rbk8j8f31j8jjb7p29q3sv538jjlrc9mgxrac4pga11dmxzgahk", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.89.a/linux-hardened-5.4.89.a.patch" }, "5.9": { + "extra": "", "name": "linux-hardened-5.9.16.a.patch", "sha256": "024wdzc9bwgr4nd4z0l6bazcl35jczhsmdl2lb26bvffjwg207rw", "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.9.16.a/linux-hardened-5.9.16.a.patch" diff --git a/pkgs/os-specific/linux/kernel/hardened/update.py b/pkgs/os-specific/linux/kernel/hardened/update.py index d6443d2e7511..b831c6491095 100755 --- a/pkgs/os-specific/linux/kernel/hardened/update.py +++ b/pkgs/os-specific/linux/kernel/hardened/update.py @@ -31,7 +31,7 @@ VersionComponent = Union[int, str] Version = List[VersionComponent] -Patch = TypedDict("Patch", {"name": str, "url": str, "sha256": str}) +Patch = TypedDict("Patch", {"name": str, "url": str, "sha256": str, "extra": str}) @dataclass @@ -99,7 +99,10 @@ def verify_openpgp_signature( return False -def fetch_patch(*, name: str, release: GitRelease) -> Optional[Patch]: +def fetch_patch(*, name: str, release_info: ReleaseInfo) -> Optional[Patch]: + release = release_info.release + extra = f'.{release_info.version[-1]}' + def find_asset(filename: str) -> str: try: it: Iterator[str] = ( @@ -130,7 +133,7 @@ def fetch_patch(*, name: str, release: GitRelease) -> Optional[Patch]: if not sig_ok: return None - return Patch(name=patch_filename, url=patch_url, sha256=sha256) + return Patch(name=patch_filename, url=patch_url, sha256=sha256, extra=extra) def parse_version(version_str: str) -> Version: @@ -252,7 +255,7 @@ for kernel_key in sorted(releases.keys()): update = True if update: - patch = fetch_patch(name=name, release=release) + patch = fetch_patch(name=name, release_info=release_info) if patch is None: failures = True else: diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index aff68e1efa70..0f1b26eb8898 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.213"; + version = "4.14.215"; # 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 = "079axkl14jp8lz30h21q4gmhmjw6zf5ycmxji65kgcgyg7dwwyzx"; + sha256 = "1ni6p485dszi365rfflrwmjl6arbkhfvl1zm7p99vcv11hllx14s"; }; } // (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 b542fab118ba..3012eca87a54 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.163"; + version = "4.19.167"; # 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 = "1z65iwwyx2b01fncygckmhpxirzs52qfqmv3agirn4laxgjw9viy"; + sha256 = "00gddgr1jj9zkd10mbbkanfkgpqi2jqszibq80rc9bbmgiknfb1i"; }; } // (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 744f35e3ea8b..ae832fe58aaf 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.249"; + version = "4.4.251"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "04pb4vgia6zaindf6804gq9jn3mhmy01yijqmpi79sh9rlqzzh1i"; + sha256 = "13mnlwwcwvbyqn8lafjymq66qjfj7nksdiyrcgymx8s03z1why86"; }; } // (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 bf044f73246d..fea6a7c7102a 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.249"; + version = "4.9.251"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0kjcw0vgga9msgqnipgg028v3rcc5am2d094v3hqkkjvzyb8dwxi"; + sha256 = "03cn3yzyv8vwvv76nxj655i14s9avhr4hcc18mq2rh0qn6zcnkgg"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.10.nix b/pkgs/os-specific/linux/kernel/linux-5.10.nix index 783e7cf2d968..f9a74dec425b 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.10.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.10.3"; + version = "5.10.7"; # 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 = "09cml495fnf52lhlkjxjznw34q5s8arvq7shkb6wjq6fwlrk65gr"; + sha256 = "1gpsdxq2gx40gpmm0zya0wxd7fdflbaq9j1j0hbffahgz44nxgsc"; }; } // (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 0d504ff334a4..f30abeb6b901 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.85"; + version = "5.4.89"; # 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 = "0220k327aa7gg48fqw171mcng8h717c4a1v14r3q36ksirnmiqqx"; + sha256 = "1bqamd3z71h8jh3mxfisqiaxj5m027xjyifj9ryqdwbdgcbxb396"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-lqx.nix b/pkgs/os-specific/linux/kernel/linux-lqx.nix index f27043789797..c8f5df788b77 100644 --- a/pkgs/os-specific/linux/kernel/linux-lqx.nix +++ b/pkgs/os-specific/linux/kernel/linux-lqx.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, buildLinux, linux_zen, ... } @ args: let - version = "5.9.16"; + version = "5.10.6"; in buildLinux (args // { @@ -13,11 +13,11 @@ buildLinux (args // { owner = "zen-kernel"; repo = "zen-kernel"; rev = "v${version}-lqx1"; - sha256 = "0ljvqf91nxpql98z75bicg5y3nzkm41rq5b0rm1kcnsk0ji829ps"; + sha256 = "0vvb00311yhf08ib3yvkjwk2j45f8r268ywg5299yjgbyl6g95kg"; }; extraMeta = { - branch = "5.9/master"; + branch = "5.10/master"; maintainers = with stdenv.lib.maintainers; [ atemu ]; description = linux_zen.meta.description + " (Same as linux_zen but less aggressive release schedule)"; }; diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix index 07a74c107711..ed19559f95f4 100644 --- a/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "5.10.1-rt20"; # updated by ./update-rt.sh + version = "5.10.4-rt22"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -18,14 +18,14 @@ in buildLinux (args // { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; - sha256 = "0p2fl7kl4ckphq17xir7n7vgrzlhbdqmyd2yyp4yilwvih9625pd"; + sha256 = "1v2nbpp21c3fkw23dgrrfznnnlvi0538kj8wrlb2m6g94rn3jklh"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "0z8ljfcn908hzjl11fkmwrx2r7j0hcgpx07g21ag162qrn6g5qby"; + sha256 = "1wnp7w3k1z10ipg8vzgyh22lpfya1p3ckabjadk9hadpa1ialma0"; }; }; in [ rt-patch ] ++ lib.remove rt-patch kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index ac84e70bae48..c18d75b93f20 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.11-rc1"; + version = "5.11-rc3"; extraMeta.branch = "5.11"; # 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 = "sha256-nPJpz058khWE83QV9ITylTXjimBBw7SQwg7WBjWA7H0="; + sha256 = "15dfgvicp7s9xqaa3w8lmfffzyjsqrq1fa2gs1a8awzs5rxgsn61"; }; # Should the testing kernels ever be built on Hydra? diff --git a/pkgs/os-specific/linux/kernel/linux-zen.nix b/pkgs/os-specific/linux/kernel/linux-zen.nix index dc28f37338bd..118272d28762 100644 --- a/pkgs/os-specific/linux/kernel/linux-zen.nix +++ b/pkgs/os-specific/linux/kernel/linux-zen.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, buildLinux, ... } @ args: let - version = "5.10.1"; + version = "5.10.6"; in buildLinux (args // { @@ -13,7 +13,7 @@ buildLinux (args // { owner = "zen-kernel"; repo = "zen-kernel"; rev = "v${version}-zen1"; - sha256 = "1c77x53ixyn64b4qq6br6ckicmjs316c8k08yfxibmhv72av1wcp"; + sha256 = "0asn4ysnzv845g35ca9sdi89sc7clcc88xmx64pcxmh033civ5fw"; }; extraMeta = { diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 3bdb8c4f2973..c2f137183082 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -1,5 +1,5 @@ { buildPackages, runCommand, nettools, bc, bison, flex, perl, rsync, gmp, libmpc, mpfr, openssl -, libelf, cpio, elfutils +, libelf, cpio, elfutils, zstd, gawk , writeTextFile }: @@ -113,7 +113,14 @@ let sed -i "$mf" -e 's|/usr/bin/||g ; s|/bin/||g ; s|/sbin/||g' done sed -i Makefile -e 's|= depmod|= ${buildPackages.kmod}/bin/depmod|' - sed -i scripts/ld-version.sh -e "s|/usr/bin/awk|${buildPackages.gawk}/bin/awk|" + + # Don't include a (random) NT_GNU_BUILD_ID, to make the build more deterministic. + # This way kernels can be bit-by-bit reproducible depending on settings + # (e.g. MODULE_SIG and SECURITY_LOCKDOWN_LSM need to be disabled). + # See also https://kernelnewbies.org/BuildId + sed -i Makefile -e 's|--build-id|--build-id=none|' + + patchShebangs scripts/ld-version.sh ''; postPatch = '' @@ -299,7 +306,7 @@ stdenv.mkDerivation ((drvAttrs config stdenv.hostPlatform.platform kernelPatches enableParallelBuilding = true; depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ perl bc nettools openssl rsync gmp libmpc mpfr ] + nativeBuildInputs = [ perl bc nettools openssl rsync gmp libmpc mpfr gawk zstd ] ++ optional (stdenv.hostPlatform.platform.kernelTarget == "uImage") buildPackages.ubootTools ++ optional (stdenv.lib.versionAtLeast version "4.14" && stdenv.lib.versionOlder version "5.8") libelf # Removed util-linuxMinimal since it should not be a dependency. diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 23c01d041921..6b1568013b92 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -41,7 +41,8 @@ hardened = let mkPatch = kernelVersion: src: { name = lib.removeSuffix ".patch" src.name; - patch = fetchurl src; + patch = fetchurl (lib.filterAttrs (k: v: k != "extra") src); + extra = src.extra; }; patches = builtins.fromJSON (builtins.readFile ./hardened/patches.json); in lib.mapAttrs mkPatch patches; diff --git a/pkgs/os-specific/linux/kexectools/default.nix b/pkgs/os-specific/linux/kexectools/default.nix index a70cb2e087fc..21d803e2b721 100644 --- a/pkgs/os-specific/linux/kexectools/default.nix +++ b/pkgs/os-specific/linux/kexectools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPackages, fetchurl, zlib, fetchpatch }: +{ lib, stdenv, buildPackages, fetchurl, zlib, fetchpatch }: stdenv.mkDerivation rec { pname = "kexec-tools"; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { }) ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://horms.net/projects/kexec/kexec-tools"; description = "Tools related to the kexec Linux feature"; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/keyutils/default.nix b/pkgs/os-specific/linux/keyutils/default.nix index fe9cb46fb8a9..81d37d14d9d7 100644 --- a/pkgs/os-specific/linux/keyutils/default.nix +++ b/pkgs/os-specific/linux/keyutils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: # Note: this package is used for bootstrapping fetchurl, and thus # cannot use fetchpatch! All mutable patches (generated by GitHub or @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { "USRLIBDIR=$(lib)/lib" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://people.redhat.com/dhowells/keyutils/"; description = "Tools used to control the Linux kernel key management system"; license = licenses.gpl2Plus; diff --git a/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix b/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix index 17f34f9bbd79..1c7ea22b7584 100644 --- a/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix +++ b/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gnugrep, findutils }: +{ lib, stdenv, fetchurl, gnugrep, findutils }: let version = "22-1.1ubuntu1"; # Zesty @@ -30,7 +30,7 @@ in stdenv.mkDerivation { --replace " xargs " " ${findutils}/bin/xargs " ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://packages.ubuntu.com/source/zesty/kmod"; description = "Linux kernel module blacklists from Ubuntu"; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/kmod/default.nix b/pkgs/os-specific/linux/kmod/default.nix index 805b8a32aedd..9feb4fe98216 100644 --- a/pkgs/os-specific/linux/kmod/default.nix +++ b/pkgs/os-specific/linux/kmod/default.nix @@ -1,6 +1,7 @@ { stdenv, lib, fetchurl, autoreconfHook, pkgconfig , libxslt, xz, elf-header -, withStatic ? false }: +, withStatic ? stdenv.hostPlatform.isStatic +}: let systems = [ "/run/current-system/kernel-modules" "/run/booted-system/kernel-modules" "" ]; @@ -37,7 +38,7 @@ in stdenv.mkDerivation rec { ln -s bin $out/sbin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Tools for loading and managing Linux kernel modules"; longDescription = '' kmod is a set of tools to handle common tasks with Linux kernel modules diff --git a/pkgs/os-specific/linux/kmscon/default.nix b/pkgs/os-specific/linux/kmscon/default.nix index 8b01fe94d4c7..ee6a108301ba 100644 --- a/pkgs/os-specific/linux/kmscon/default.nix +++ b/pkgs/os-specific/linux/kmscon/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , autoreconfHook , libtsm @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "KMS/DRM based System Console"; homepage = "http://www.freedesktop.org/wiki/Software/kmscon/"; license = licenses.mit; diff --git a/pkgs/os-specific/linux/kmscube/default.nix b/pkgs/os-specific/linux/kmscube/default.nix index e2e63bc10a18..147b82c82bff 100644 --- a/pkgs/os-specific/linux/kmscube/default.nix +++ b/pkgs/os-specific/linux/kmscube/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, autoreconfHook, libdrm, libX11, libGL, mesa, pkgconfig }: +{ lib, stdenv, fetchgit, autoreconfHook, libdrm, libX11, libGL, mesa, pkgconfig }: stdenv.mkDerivation { name = "kmscube-2018-06-17"; @@ -12,7 +12,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ libdrm libX11 libGL mesa ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Example OpenGL app using KMS/GBM"; homepage = "https://gitlab.freedesktop.org/mesa/kmscube"; license = licenses.mit; diff --git a/pkgs/os-specific/linux/ledger-udev-rules/default.nix b/pkgs/os-specific/linux/ledger-udev-rules/default.nix index e85eb02f8c80..7b23719c791c 100644 --- a/pkgs/os-specific/linux/ledger-udev-rules/default.nix +++ b/pkgs/os-specific/linux/ledger-udev-rules/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation { pname = "ledger-udev-rules"; @@ -19,7 +19,7 @@ stdenv.mkDerivation { cp 20-hw1.rules $out/lib/udev/rules.d/20-ledger.rules ''; - meta = with stdenv.lib; { + meta = with lib; { description = "udev rules for Ledger devices"; license = licenses.asl20; maintainers = with maintainers; [ asymmetric ]; diff --git a/pkgs/os-specific/linux/libatasmart/default.nix b/pkgs/os-specific/linux/libatasmart/default.nix index cf5fc54ed65b..5060df1638b6 100644 --- a/pkgs/os-specific/linux/libatasmart/default.nix +++ b/pkgs/os-specific/linux/libatasmart/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, udev, buildPackages }: +{ lib, stdenv, fetchurl, pkgconfig, udev, buildPackages }: stdenv.mkDerivation rec { name = "libatasmart-0.19"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ udev ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://0pointer.de/blog/projects/being-smart.html"; description = "Library for querying ATA SMART status"; license = licenses.lgpl21; diff --git a/pkgs/os-specific/linux/libbpf/default.nix b/pkgs/os-specific/linux/libbpf/default.nix index 948b8aab9afd..c454fc5f3b1e 100644 --- a/pkgs/os-specific/linux/libbpf/default.nix +++ b/pkgs/os-specific/linux/libbpf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig +{ lib, stdenv, fetchFromGitHub, pkgconfig , libelf, zlib , fetchpatch }: @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { # outputs = [ "out" "dev" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Upstream mirror of libbpf"; homepage = "https://github.com/libbpf/libbpf"; license = with licenses; [ lgpl21 /* or */ bsd2 ]; diff --git a/pkgs/os-specific/linux/libcap/default.nix b/pkgs/os-specific/linux/libcap/default.nix index 713c4b5d13d9..ab78a3a33d8f 100644 --- a/pkgs/os-specific/linux/libcap/default.nix +++ b/pkgs/os-specific/linux/libcap/default.nix @@ -1,5 +1,9 @@ -{ stdenv, lib, buildPackages, fetchurl, attr, perl, pam -, static ? stdenv.targetPlatform.isStatic }: +{ stdenv, lib, buildPackages, fetchurl, attr, perl +, usePam ? !isStatic, pam ? null +, isStatic ? stdenv.hostPlatform.isStatic +}: + +assert usePam -> pam != null; stdenv.mkDerivation rec { pname = "libcap"; @@ -10,21 +14,21 @@ stdenv.mkDerivation rec { sha256 = "1qf80lifygbnxwvqjf8jz5j24n6fqqx4ixnkbf76xs2vrmcq664j"; }; - patches = lib.optional static ./no-shared-lib.patch; + patches = lib.optional isStatic ./no-shared-lib.patch; outputs = [ "out" "dev" "lib" "man" "doc" ] - ++ lib.optional (pam != null) "pam"; + ++ lib.optional usePam "pam"; depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ perl ]; - buildInputs = [ pam ]; + buildInputs = lib.optional usePam pam; propagatedBuildInputs = [ attr ]; makeFlags = [ "lib=lib" - "PAM_CAP=${if pam == null then "no" else "yes"}" + "PAM_CAP=${if usePam then "yes" else "no"}" "BUILD_CC=$(CC_FOR_BUILD)" "CC:=$(CC)" ]; @@ -48,10 +52,10 @@ stdenv.mkDerivation rec { installFlags = [ "RAISE_SETFCAP=no" ]; postInstall = '' - ${lib.optionalString (!static) ''rm "$lib"/lib/*.a''} + ${lib.optionalString (!isStatic) ''rm "$lib"/lib/*.a''} mkdir -p "$doc/share/doc/${pname}-${version}" cp License "$doc/share/doc/${pname}-${version}/" - '' + stdenv.lib.optionalString (pam != null) '' + '' + stdenv.lib.optionalString usePam '' mkdir -p "$pam/lib/security" mv "$lib"/lib/security "$pam/lib" ''; diff --git a/pkgs/os-specific/linux/libevdevc/default.nix b/pkgs/os-specific/linux/libevdevc/default.nix index 372f110f3471..cb21eeaa7533 100644 --- a/pkgs/os-specific/linux/libevdevc/default.nix +++ b/pkgs/os-specific/linux/libevdevc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, coreutils, pkgconfig, glib, jsoncpp }: +{ lib, stdenv, fetchFromGitHub, coreutils, pkgconfig, glib, jsoncpp }: stdenv.mkDerivation rec { name = "libevdevc"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { makeFlags = [ "DESTDIR=$(out)" "LIBDIR=/lib" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "ChromiumOS libevdev. Renamed to avoid conflicts with the standard libevdev found in Linux distros"; license = licenses.bsd3; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/libfabric/default.nix b/pkgs/os-specific/linux/libfabric/default.nix index 1911391c935c..f6171220fb65 100644 --- a/pkgs/os-specific/linux/libfabric/default.nix +++ b/pkgs/os-specific/linux/libfabric/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, libpsm2 }: +{ lib, stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, libpsm2 }: stdenv.mkDerivation rec { pname = "libfabric"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-psm2=${libpsm2}" ] ; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://libfabric.org/"; description = "Open Fabric Interfaces"; license = with licenses; [ gpl2 bsd2 ]; diff --git a/pkgs/os-specific/linux/libgestures/default.nix b/pkgs/os-specific/linux/libgestures/default.nix index 46d25df31b9f..9aaa1c2bce62 100644 --- a/pkgs/os-specific/linux/libgestures/default.nix +++ b/pkgs/os-specific/linux/libgestures/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, glib, jsoncpp }: +{ lib, stdenv, fetchFromGitHub, pkgconfig, glib, jsoncpp }: stdenv.mkDerivation rec { name = "libgestures-${version}"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { makeFlags = [ "DESTDIR=$(out)" "LIBDIR=/lib" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "ChromiumOS libgestures modified to compile for Linux"; license = licenses.bsd3; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/libpsm2/default.nix b/pkgs/os-specific/linux/libpsm2/default.nix index 501453b88216..b7163617ce53 100644 --- a/pkgs/os-specific/linux/libpsm2/default.nix +++ b/pkgs/os-specific/linux/libpsm2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, numactl, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, numactl, pkgconfig }: stdenv.mkDerivation rec { pname = "libpsm2"; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { rmdir $out/usr ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/intel/opa-psm2"; description = "The PSM2 library supports a number of fabric media and stacks"; license = with licenses; [ gpl2 bsd3 ]; diff --git a/pkgs/os-specific/linux/libratbag/default.nix b/pkgs/os-specific/linux/libratbag/default.nix index e9f090255f92..2a52e72cc91f 100644 --- a/pkgs/os-specific/linux/libratbag/default.nix +++ b/pkgs/os-specific/linux/libratbag/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig +{ lib, stdenv, fetchFromGitHub, meson, ninja, pkgconfig , glib, systemd, udev, libevdev, gitMinimal, check, valgrind, swig, python3 , json-glib, libunistring }: @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { "-Dsystemd-unit-dir=./lib/systemd/system/" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Configuration library for gaming mice"; homepage = "https://github.com/libratbag/libratbag"; license = licenses.mit; diff --git a/pkgs/os-specific/linux/libsepol/default.nix b/pkgs/os-specific/linux/libsepol/default.nix index 3592ba1637c1..f5a190718bf8 100644 --- a/pkgs/os-specific/linux/libsepol/default.nix +++ b/pkgs/os-specific/linux/libsepol/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, flex }: +{ lib, stdenv, fetchurl, flex }: stdenv.mkDerivation rec { pname = "libsepol"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { passthru = { inherit se_release se_url; }; - meta = with stdenv.lib; { + meta = with lib; { description = "SELinux binary policy manipulation library"; homepage = "http://userspace.selinuxproject.org"; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/libsmbios/default.nix b/pkgs/os-specific/linux/libsmbios/default.nix index 268588f53ab1..108568d0b519 100644 --- a/pkgs/os-specific/linux/libsmbios/default.nix +++ b/pkgs/os-specific/linux/libsmbios/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, help2man, gettext +{ lib, stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, help2man, gettext , libxml2, perl, python3, doxygen }: @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { preFixup = ''rm -rf "$(pwd)" ''; # Hack to avoid TMPDIR in RPATHs - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/dell/libsmbios"; description = "A library to obtain BIOS information"; license = with licenses; [ osl21 gpl2Plus ]; diff --git a/pkgs/os-specific/linux/libudev0-shim/default.nix b/pkgs/os-specific/linux/libudev0-shim/default.nix index 2073f9f6f56f..642dd534232b 100644 --- a/pkgs/os-specific/linux/libudev0-shim/default.nix +++ b/pkgs/os-specific/linux/libudev0-shim/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, udev }: +{ lib, stdenv, fetchFromGitHub, udev }: stdenv.mkDerivation rec { pname = "libudev0-shim"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ln -s "$name" "$out/lib/libudev.so.0" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Shim to preserve libudev.so.0 compatibility"; homepage = "https://github.com/archlinux/libudev0-shim"; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/libvolume_id/default.nix b/pkgs/os-specific/linux/libvolume_id/default.nix index 98ddc50e2e48..f6b760668636 100644 --- a/pkgs/os-specific/linux/libvolume_id/default.nix +++ b/pkgs/os-specific/linux/libvolume_id/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation { name = "libvolume_id-0.81.1"; @@ -18,7 +18,7 @@ stdenv.mkDerivation { cp -f libvolume_id.so.0 $out/lib/ "; - meta = with stdenv.lib; { + meta = with lib; { platforms = platforms.linux; license = licenses.gpl2; }; diff --git a/pkgs/os-specific/linux/libwebcam/default.nix b/pkgs/os-specific/linux/libwebcam/default.nix index 5cccc82b8430..5f87a89496b7 100644 --- a/pkgs/os-specific/linux/libwebcam/default.nix +++ b/pkgs/os-specific/linux/libwebcam/default.nix @@ -2,7 +2,7 @@ , stdenv , fetchurl , cmake -, pkgconfig +, pkg-config , libxml2 }: @@ -19,11 +19,8 @@ stdenv.mkDerivation rec { ./uvcdynctrl_symlink_support_and_take_data_dir_from_env.patch ]; - buildInputs = [ - cmake - pkgconfig - libxml2 - ]; + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ libxml2 ]; postPatch = '' substituteInPlace ./uvcdynctrl/CMakeLists.txt \ diff --git a/pkgs/os-specific/linux/linuxptp/default.nix b/pkgs/os-specific/linux/linuxptp/default.nix index c836cfe5c433..c9de5f874a3a 100644 --- a/pkgs/os-specific/linux/linuxptp/default.nix +++ b/pkgs/os-specific/linux/linuxptp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, linuxHeaders } : +{ lib, stdenv, fetchurl, linuxHeaders } : stdenv.mkDerivation rec { @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Implementation of the Precision Time Protocol (PTP) according to IEEE standard 1588 for Linux"; homepage = "http://linuxptp.sourceforge.net/"; maintainers = [ maintainers.markuskowa ]; diff --git a/pkgs/os-specific/linux/lksctp-tools/default.nix b/pkgs/os-specific/linux/lksctp-tools/default.nix index 6ddf4db562b7..8bbd3ab7f427 100644 --- a/pkgs/os-specific/linux/lksctp-tools/default.nix +++ b/pkgs/os-specific/linux/lksctp-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "lksctp-tools-1.0.17"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "05da6c2v3acc18ndvmkrag6x5lf914b7s0xkkr6wkvrbvd621sqs"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Linux Kernel Stream Control Transmission Protocol Tools"; homepage = "http://lksctp.sourceforge.net/"; license = with licenses; [ gpl2 lgpl21 ]; # library is lgpl21 diff --git a/pkgs/os-specific/linux/lm-sensors/default.nix b/pkgs/os-specific/linux/lm-sensors/default.nix index fa71d1fd1551..7bde5bd84a74 100644 --- a/pkgs/os-specific/linux/lm-sensors/default.nix +++ b/pkgs/os-specific/linux/lm-sensors/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, bison, flex, which, perl +{ lib, stdenv, fetchzip, bison, flex, which, perl , sensord ? false, rrdtool ? null }: @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { "AR=${stdenv.cc.targetPrefix}ar" ] ++ stdenv.lib.optional sensord "PROG_EXTRA=sensord"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://hwmon.wiki.kernel.org/lm_sensors"; changelog = "https://raw.githubusercontent.com/lm-sensors/lm-sensors/V${dashedVersion}/CHANGES"; description = "Tools for reading hardware sensors"; diff --git a/pkgs/os-specific/linux/logitech-udev-rules/default.nix b/pkgs/os-specific/linux/logitech-udev-rules/default.nix index 369f412fbfc5..fde75fdcd650 100644 --- a/pkgs/os-specific/linux/logitech-udev-rules/default.nix +++ b/pkgs/os-specific/linux/logitech-udev-rules/default.nix @@ -1,4 +1,4 @@ -{ stdenv, solaar }: +{ lib, stdenv, solaar }: # ltunifi and solaar both provide udev rules but solaar's rules are more # up-to-date so we simply use that instead of having to maintain our own rules @@ -11,7 +11,7 @@ stdenv.mkDerivation { install -Dm644 -t $out/etc/udev/rules.d ${solaar.src}/rules.d/*.rules ''; - meta = with stdenv.lib; { + meta = with lib; { description = "udev rules for Logitech devices"; inherit (solaar.meta) homepage license platforms; maintainers = with maintainers; [ peterhoeg ]; diff --git a/pkgs/os-specific/linux/lsscsi/default.nix b/pkgs/os-specific/linux/lsscsi/default.nix index 57778357d006..90c0361bce35 100644 --- a/pkgs/os-specific/linux/lsscsi/default.nix +++ b/pkgs/os-specific/linux/lsscsi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation { name = "lsscsi-0.31"; @@ -12,7 +12,7 @@ stdenv.mkDerivation { substituteInPlace Makefile.in --replace /usr "$out" ''; - meta = with stdenv.lib; { + meta = with lib; { license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/os-specific/linux/lttng-modules/default.nix b/pkgs/os-specific/linux/lttng-modules/default.nix index 30d4a29b166c..8e20ffda346e 100644 --- a/pkgs/os-specific/linux/lttng-modules/default.nix +++ b/pkgs/os-specific/linux/lttng-modules/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, kernel }: +{ lib, stdenv, fetchurl, kernel }: stdenv.mkDerivation rec { pname = "lttng-modules-${version}"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Linux kernel modules for LTTng tracing"; homepage = "https://lttng.org/"; license = with licenses; [ lgpl21 gpl2 mit ]; diff --git a/pkgs/os-specific/linux/lvm2/default.nix b/pkgs/os-specific/linux/lvm2/default.nix index 6f1290cf0705..a7666cc6a7f5 100644 --- a/pkgs/os-specific/linux/lvm2/default.nix +++ b/pkgs/os-specific/linux/lvm2/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchpatch , fetchurl , pkgconfig @@ -118,7 +118,7 @@ stdenv.mkDerivation rec { passthru.tests.installer = nixosTests.installer.lvm; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://sourceware.org/lvm2/"; description = "Tools to support Logical Volume Management (LVM) on Linux"; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/macchanger/default.nix b/pkgs/os-specific/linux/macchanger/default.nix index 29d2a3914a29..5c3646f7b3cc 100644 --- a/pkgs/os-specific/linux/macchanger/default.nix +++ b/pkgs/os-specific/linux/macchanger/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, texinfo }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, texinfo }: stdenv.mkDerivation rec { pname = "macchanger"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "info" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A utility for viewing/manipulating the MAC address of network interfaces"; maintainers = with maintainers; [ joachifm ma27 ]; license = licenses.gpl2Plus; diff --git a/pkgs/os-specific/linux/mba6x_bl/default.nix b/pkgs/os-specific/linux/mba6x_bl/default.nix index f48a3dbb62f5..441476d5f065 100644 --- a/pkgs/os-specific/linux/mba6x_bl/default.nix +++ b/pkgs/os-specific/linux/mba6x_bl/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, kernel, stdenv }: +{ fetchFromGitHub, kernel, lib, stdenv }: stdenv.mkDerivation { name = "mba6x_bl-2016-12-08"; @@ -20,7 +20,7 @@ stdenv.mkDerivation { "INSTALL_MOD_PATH=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "MacBook Air 6,1 and 6,2 (mid 2013) backlight driver"; homepage = "https://github.com/patjak/mba6x_bl"; license = licenses.gpl2; diff --git a/pkgs/os-specific/linux/mcelog/default.nix b/pkgs/os-specific/linux/mcelog/default.nix index 2e97f9da1eae..de2c1afb0658 100644 --- a/pkgs/os-specific/linux/mcelog/default.nix +++ b/pkgs/os-specific/linux/mcelog/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, util-linux }: +{ lib, stdenv, fetchFromGitHub, util-linux }: stdenv.mkDerivation rec { pname = "mcelog"; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { --replace /usr/sbin $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Log x86 machine checks: memory, IO, and CPU hardware errors"; longDescription = '' The mcelog daemon accounts memory and some other errors in various ways diff --git a/pkgs/os-specific/linux/mdadm/default.nix b/pkgs/os-specific/linux/mdadm/default.nix index 2fbe05557a2f..6a319572cbe9 100644 --- a/pkgs/os-specific/linux/mdadm/default.nix +++ b/pkgs/os-specific/linux/mdadm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, util-linux, coreutils, fetchurl, groff, system-sendmail }: +{ lib, stdenv, util-linux, coreutils, fetchurl, groff, system-sendmail }: stdenv.mkDerivation rec { name = "mdadm-4.1"; @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { grep -r $out $out/bin && false || true ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Programs for managing RAID arrays under Linux"; homepage = "http://neil.brown.name/blog/mdadm"; license = licenses.gpl2; diff --git a/pkgs/os-specific/linux/metastore/default.nix b/pkgs/os-specific/linux/metastore/default.nix index 590b931ac920..c9875297186e 100644 --- a/pkgs/os-specific/linux/metastore/default.nix +++ b/pkgs/os-specific/linux/metastore/default.nix @@ -1,4 +1,4 @@ -{ stdenv, libbsd, fetchFromGitHub }: +{ lib, stdenv, libbsd, fetchFromGitHub }: stdenv.mkDerivation rec { version = "1.1.2"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ libbsd ]; installFlags = [ "PREFIX=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Store and restore metadata from a filesystem"; homepage = "https://software.przemoc.net/#metastore"; license = licenses.gpl2; diff --git a/pkgs/os-specific/linux/microcode/amd.nix b/pkgs/os-specific/linux/microcode/amd.nix index 135187c9a108..72f413f9cb66 100644 --- a/pkgs/os-specific/linux/microcode/amd.nix +++ b/pkgs/os-specific/linux/microcode/amd.nix @@ -1,4 +1,4 @@ -{ stdenv, firmwareLinuxNonfree, libarchive }: +{ lib, stdenv, firmwareLinuxNonfree, libarchive }: stdenv.mkDerivation { name = "amd-ucode-${firmwareLinuxNonfree.version}"; @@ -20,7 +20,7 @@ stdenv.mkDerivation { echo kernel/x86/microcode/AuthenticAMD.bin | bsdcpio -o -H newc -R 0:0 > $out/amd-ucode.img ''; - meta = with stdenv.lib; { + meta = with lib; { description = "AMD Processor microcode patch"; homepage = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git"; license = licenses.unfreeRedistributableFirmware; diff --git a/pkgs/os-specific/linux/microcode/intel.nix b/pkgs/os-specific/linux/microcode/intel.nix index 50055102dbbe..d6d04f12f885 100644 --- a/pkgs/os-specific/linux/microcode/intel.nix +++ b/pkgs/os-specific/linux/microcode/intel.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libarchive, iucode-tool }: +{ lib, stdenv, fetchFromGitHub, libarchive, iucode-tool }: stdenv.mkDerivation rec { pname = "microcode-intel"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.intel.com/"; description = "Microcode for Intel processors"; license = licenses.unfreeRedistributableFirmware; diff --git a/pkgs/os-specific/linux/microcode/iucode-tool.nix b/pkgs/os-specific/linux/microcode/iucode-tool.nix index 65cb01c84a52..e38dd83e0dba 100644 --- a/pkgs/os-specific/linux/microcode/iucode-tool.nix +++ b/pkgs/os-specific/linux/microcode/iucode-tool.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, autoreconfHook }: +{ lib, stdenv, fetchFromGitLab, autoreconfHook }: stdenv.mkDerivation rec { pname = "iucode-tool"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Intel® 64 and IA-32 processor microcode tool"; homepage = "https://gitlab.com/iucode-tool/iucode-tool"; license = licenses.gpl2; diff --git a/pkgs/os-specific/linux/mingetty/default.nix b/pkgs/os-specific/linux/mingetty/default.nix index 775910d30d6f..8a2cf69dd368 100644 --- a/pkgs/os-specific/linux/mingetty/default.nix +++ b/pkgs/os-specific/linux/mingetty/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation { name = "mingetty-1.08"; @@ -13,7 +13,7 @@ stdenv.mkDerivation { makeFlagsArray=(SBINDIR=$out/sbin MANDIR=$out/share/man/man8) ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://sourceforge.net/projects/mingetty"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/miraclecast/default.nix b/pkgs/os-specific/linux/miraclecast/default.nix index d04695ef619d..e2230da3d2c0 100644 --- a/pkgs/os-specific/linux/miraclecast/default.nix +++ b/pkgs/os-specific/linux/miraclecast/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig +{ lib, stdenv, fetchFromGitHub, meson, ninja, pkgconfig , glib, readline, pcre, systemd, udev }: stdenv.mkDerivation { @@ -23,7 +23,7 @@ stdenv.mkDerivation { "-Dbuild-tests=true" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Connect external monitors via Wi-Fi"; homepage = "https://github.com/albfan/miraclecast"; license = licenses.lgpl21Plus; diff --git a/pkgs/os-specific/linux/mkinitcpio-nfs-utils/default.nix b/pkgs/os-specific/linux/mkinitcpio-nfs-utils/default.nix index 8a20a2f733af..eeea1d74dcac 100644 --- a/pkgs/os-specific/linux/mkinitcpio-nfs-utils/default.nix +++ b/pkgs/os-specific/linux/mkinitcpio-nfs-utils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "mkinitcpio-nfs-utils-0.3"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { rm -rf $out/usr ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://archlinux.org/"; description = "ipconfig and nfsmount tools for root on NFS, ported from klibc"; license = licenses.gpl2; diff --git a/pkgs/os-specific/linux/mmc-utils/default.nix b/pkgs/os-specific/linux/mmc-utils/default.nix index 6a9f807947d4..aff847c20ff6 100644 --- a/pkgs/os-specific/linux/mmc-utils/default.nix +++ b/pkgs/os-specific/linux/mmc-utils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit }: +{ lib, stdenv, fetchgit }: stdenv.mkDerivation { pname = "mmc-utils"; @@ -18,7 +18,7 @@ stdenv.mkDerivation { cp man/mmc.1 $out/share/man/man1/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Configure MMC storage devices from userspace"; homepage = "http://git.kernel.org/cgit/linux/kernel/git/cjb/mmc-utils.git/"; license = licenses.gpl2; diff --git a/pkgs/os-specific/linux/molly-guard/default.nix b/pkgs/os-specific/linux/molly-guard/default.nix index c9bdff9de3ec..de396e4f5c76 100644 --- a/pkgs/os-specific/linux/molly-guard/default.nix +++ b/pkgs/os-specific/linux/molly-guard/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, dpkg, busybox, systemd }: +{ lib, stdenv, fetchurl, dpkg, busybox, systemd }: stdenv.mkDerivation rec { pname = "molly-guard"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { done; ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Attempts to prevent you from accidentally shutting down or rebooting machines"; homepage = "https://salsa.debian.org/debian/molly-guard"; license = licenses.artistic2; diff --git a/pkgs/os-specific/linux/msr-tools/default.nix b/pkgs/os-specific/linux/msr-tools/default.nix index f7b81bd3915d..67356719ffdb 100644 --- a/pkgs/os-specific/linux/msr-tools/default.nix +++ b/pkgs/os-specific/linux/msr-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip }: +{ lib, stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { pname = "msr-tools"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { --replace /usr/sbin $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Tool to read/write from/to MSR CPU registers on Linux"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/mstpd/default.nix b/pkgs/os-specific/linux/mstpd/default.nix index 4a7c6282d4c7..389acdf91e6e 100644 --- a/pkgs/os-specific/linux/mstpd/default.nix +++ b/pkgs/os-specific/linux/mstpd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook }: stdenv.mkDerivation rec { pname = "mstpd"; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { "--libexecdir=$(out)/lib" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Multiple Spanning Tree Protocol daemon"; homepage = "https://github.com/mstpd/mstpd"; license = licenses.gpl2; diff --git a/pkgs/os-specific/linux/multipath-tools/default.nix b/pkgs/os-specific/linux/multipath-tools/default.nix index 02853f6497fc..57c75210568f 100644 --- a/pkgs/os-specific/linux/multipath-tools/default.nix +++ b/pkgs/os-specific/linux/multipath-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, perl, lvm2, libaio, gzip, readline, systemd, liburcu, json_c }: +{ lib, stdenv, fetchurl, pkgconfig, perl, lvm2, libaio, gzip, readline, systemd, liburcu, json_c }: stdenv.mkDerivation rec { pname = "multipath-tools"; @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { "SYSTEMDPATH=lib" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Tools for the Linux multipathing driver"; homepage = "http://christophe.varoqui.free.fr/"; license = licenses.gpl2; diff --git a/pkgs/os-specific/linux/musl/default.nix b/pkgs/os-specific/linux/musl/default.nix index acc9fff5b482..63d8114ac77a 100644 --- a/pkgs/os-specific/linux/musl/default.nix +++ b/pkgs/os-specific/linux/musl/default.nix @@ -35,11 +35,11 @@ let in stdenv.mkDerivation rec { pname = "musl"; - version = "1.2.0"; + version = "1.2.1"; src = fetchurl { url = "https://www.musl-libc.org/releases/${pname}-${version}.tar.gz"; - sha256 = "1s6lix02k1ijm4nmhzpmwzk5w6xfkhn70nvvk8zjs51r24cpppn6"; + sha256 = "0jz8fzwgvfyjgxjbpw35ixdglp2apqjvp8m386f6yr4zacc6xbv8"; }; enableParallelBuilding = true; diff --git a/pkgs/os-specific/linux/mxu11x0/default.nix b/pkgs/os-specific/linux/mxu11x0/default.nix index ab0b927f1bd1..730b03e93feb 100644 --- a/pkgs/os-specific/linux/mxu11x0/default.nix +++ b/pkgs/os-specific/linux/mxu11x0/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, kernel }: +{ lib, stdenv, fetchurl, kernel }: stdenv.mkDerivation { name = "mxu11x0-1.4-${kernel.version}"; @@ -26,7 +26,7 @@ stdenv.mkDerivation { hardeningDisable = [ "pic" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "MOXA UPort 11x0 USB to Serial Hub driver"; homepage = "https://www.moxa.com/en/products/industrial-edge-connectivity/usb-to-serial-converters-usb-hubs/usb-to-serial-converters/uport-1000-series"; license = licenses.gpl2Plus; diff --git a/pkgs/os-specific/linux/net-tools/mptcp.nix b/pkgs/os-specific/linux/net-tools/mptcp.nix index 6e798e6807d7..a9f99874367c 100644 --- a/pkgs/os-specific/linux/net-tools/mptcp.nix +++ b/pkgs/os-specific/linux/net-tools/mptcp.nix @@ -1,4 +1,4 @@ -{ stdenv, nettools, fetchFromGitHub }: +{ lib, stdenv, nettools, fetchFromGitHub }: nettools.overrideAttrs(oa: rec { name = "net-tools-mptcp"; @@ -11,7 +11,7 @@ nettools.overrideAttrs(oa: rec { sha256 = "0i7gr1y699nc7j9qllsx8kicqkpkhw51x4chcmyl5xs06b2mdjri"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/multipath-tcp/net-tools"; description = "A set of tools for controlling the network subsystem in Linux"; license = licenses.gpl2Plus; diff --git a/pkgs/os-specific/linux/nfs-utils/default.nix b/pkgs/os-specific/linux/nfs-utils/default.nix index 63a1a0d8f966..708430da397e 100644 --- a/pkgs/os-specific/linux/nfs-utils/default.nix +++ b/pkgs/os-specific/linux/nfs-utils/default.nix @@ -114,7 +114,7 @@ stdenv.mkDerivation rec { nfs4-kerberos = nixosTests.nfs4.kerberos; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Linux user-space NFS utilities"; longDescription = '' diff --git a/pkgs/os-specific/linux/nmon/default.nix b/pkgs/os-specific/linux/nmon/default.nix index 9de18401d7b2..7ec84443cfe8 100644 --- a/pkgs/os-specific/linux/nmon/default.nix +++ b/pkgs/os-specific/linux/nmon/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, ncurses }: +{ fetchurl, lib, stdenv, ncurses }: stdenv.mkDerivation rec { pname = "nmon"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { cp nmon $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "AIX & Linux Performance Monitoring tool"; homepage = "http://nmon.sourceforge.net"; license = licenses.gpl3Plus; diff --git a/pkgs/os-specific/linux/nss_ldap/default.nix b/pkgs/os-specific/linux/nss_ldap/default.nix index 74369060ba9f..0121c4a6f1c8 100644 --- a/pkgs/os-specific/linux/nss_ldap/default.nix +++ b/pkgs/os-specific/linux/nss_ldap/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, openldap, perl}: +{lib, stdenv, fetchurl, openldap, perl}: stdenv.mkDerivation { name = "nss_ldap-265"; @@ -30,7 +30,7 @@ stdenv.mkDerivation { buildInputs = [ openldap perl ]; - meta = with stdenv.lib; { + meta = with lib; { description = "LDAP module for the Solaris Nameservice Switch (NSS)"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/numactl/default.nix b/pkgs/os-specific/linux/numactl/default.nix index 6e16ecabba2d..d796bf579f12 100644 --- a/pkgs/os-specific/linux/numactl/default.nix +++ b/pkgs/os-specific/linux/numactl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { pname = "numactl"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { # building ~5% slower until reboot. Ugh! doCheck = false; # never ever! - meta = with stdenv.lib; { + meta = with lib; { description = "Library and tools for non-uniform memory access (NUMA) machines"; homepage = "https://github.com/numactl/numactl"; license = with licenses; [ gpl2 lgpl21 ]; # libnuma is lgpl21 diff --git a/pkgs/os-specific/linux/numad/default.nix b/pkgs/os-specific/linux/numad/default.nix index 47af20152db9..cab5fe15e66d 100644 --- a/pkgs/os-specific/linux/numad/default.nix +++ b/pkgs/os-specific/linux/numad/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "numad-0.5"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { makeFlags = [ "prefix=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A user-level daemon that monitors NUMA topology and processes resource consumption to facilitate good NUMA resource access"; homepage = "https://fedoraproject.org/wiki/Features/numad"; license = licenses.lgpl21; diff --git a/pkgs/os-specific/linux/numatop/default.nix b/pkgs/os-specific/linux/numatop/default.nix index 57ee511bbadc..a534ebaaac30 100644 --- a/pkgs/os-specific/linux/numatop/default.nix +++ b/pkgs/os-specific/linux/numatop/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, numactl, ncurses, check }: +{ lib, stdenv, fetchurl, pkgconfig, numactl, ncurses, check }: stdenv.mkDerivation rec { pname = "numatop"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Tool for runtime memory locality characterization and analysis of processes and threads on a NUMA system"; homepage = "https://01.org/numatop"; license = licenses.bsd3; diff --git a/pkgs/os-specific/linux/numworks-udev-rules/default.nix b/pkgs/os-specific/linux/numworks-udev-rules/default.nix index 4a123b202730..aae7507f50cd 100644 --- a/pkgs/os-specific/linux/numworks-udev-rules/default.nix +++ b/pkgs/os-specific/linux/numworks-udev-rules/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "numworks-udev-rules"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { install -Dm 644 "${udevRules}" "$out/lib/udev/rules.d/50-numworks-calculator.rules" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Udev rules for Numworks calculators"; homepage = "https://numworks.com"; license = licenses.gpl3Plus; diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index b9af74906b49..4b0c060f9ce4 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -22,10 +22,11 @@ rec { # Policy: use the highest stable version as the default (on our master). stable = if stdenv.hostPlatform.system == "x86_64-linux" then generic { - version = "455.45.01"; - sha256_64bit = "6tyMfggvZVQPp/aiSdgwn7VG/mIGb0lUcnAdyMEDoVM="; - settingsSha256 = "70ABqnO/heCp/5IztpU0Lo7eZd4n4wUoTlp1xIQ3aCc="; - persistencedSha256 = "36sM+djZvm77Gle7dcZ5tppgzQkD4IA0FJgCGsdZRI8="; + version = "460.32.03"; + sha256_64bit = "0qb0f8djys55b7qgvpbwafw5lkwvmcslqz3i2kr3jm354gy248ag"; + settingsVersion = "460.27.04"; + settingsSha256 = "1z9ibkhyjqzhhzi3gj88f5jlpc1d76jsncsy6wxpnbdbak8ljkw5"; + persistencedSha256 = "1zrnmwlwqg3pgy1jvldy9iv994wr823rl7vjr1kqnngdmn7bflxl"; } else legacy_390; diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix index 8a9e340a20a2..1587ad06bc30 100644 --- a/pkgs/os-specific/linux/nvidia-x11/generic.nix +++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix @@ -16,7 +16,7 @@ , broken ? false }@args: -{ stdenv, callPackage, pkgs, pkgsi686Linux, fetchurl +{ lib, stdenv, callPackage, pkgs, pkgsi686Linux, fetchurl , kernel ? null, perl, nukeReferences , # Whether to build the libraries only (i.e. not the kernel module or # nvidia-settings). Used to support 32-bit binaries on 64-bit @@ -95,7 +95,7 @@ let inherit persistencedVersion settingsVersion; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.nvidia.com/object/unix.html"; description = "X.org driver and kernel module for NVIDIA graphics cards"; license = licenses.unfreeRedistributable; diff --git a/pkgs/os-specific/linux/nvidia-x11/persistenced.nix b/pkgs/os-specific/linux/nvidia-x11/persistenced.nix index 5979f7e9a224..9a3daa3d2705 100644 --- a/pkgs/os-specific/linux/nvidia-x11/persistenced.nix +++ b/pkgs/os-specific/linux/nvidia-x11/persistenced.nix @@ -1,6 +1,7 @@ nvidia_x11: sha256: { stdenv +, lib , fetchFromGitHub , m4 , libtirpc @@ -35,7 +36,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = [ "-I${libtirpc.dev}/include/tirpc" ]; NIX_LDFLAGS = [ "-ltirpc" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.nvidia.com/object/unix.html"; description = "Settings application for NVIDIA graphics cards"; license = licenses.unfreeRedistributable; diff --git a/pkgs/os-specific/linux/nvidia-x11/settings.nix b/pkgs/os-specific/linux/nvidia-x11/settings.nix index fbddd7b7fa21..4076a27ffc25 100644 --- a/pkgs/os-specific/linux/nvidia-x11/settings.nix +++ b/pkgs/os-specific/linux/nvidia-x11/settings.nix @@ -97,7 +97,7 @@ stdenv.mkDerivation { inherit libXNVCtrl; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.nvidia.com/object/unix.html"; description = "Settings application for NVIDIA graphics cards"; license = licenses.unfreeRedistributable; diff --git a/pkgs/os-specific/linux/nvidiabl/default.nix b/pkgs/os-specific/linux/nvidiabl/default.nix index f56e74eda042..7ce7c313485d 100644 --- a/pkgs/os-specific/linux/nvidiabl/default.nix +++ b/pkgs/os-specific/linux/nvidiabl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, kernel }: +{ lib, stdenv, fetchFromGitHub, kernel }: stdenv.mkDerivation rec { name = "nvidiabl-${version}-${kernel.version}"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { "KVER=${kernel.modDirVersion}" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Linux driver for setting the backlight brightness on laptops using NVIDIA GPU"; homepage = "https://github.com/guillaumezin/nvidiabl"; license = licenses.gpl2; diff --git a/pkgs/os-specific/linux/oci-seccomp-bpf-hook/default.nix b/pkgs/os-specific/linux/oci-seccomp-bpf-hook/default.nix index 3247e8c4eda5..c74810d24d5a 100644 --- a/pkgs/os-specific/linux/oci-seccomp-bpf-hook/default.nix +++ b/pkgs/os-specific/linux/oci-seccomp-bpf-hook/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildGoModule , fetchFromGitHub , go-md2man @@ -45,7 +45,7 @@ buildGoModule rec { installManPage docs/*.[1-9] ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/containers/oci-seccomp-bpf-hook"; description = '' OCI hook to trace syscalls and generate a seccomp profile diff --git a/pkgs/os-specific/linux/odp-dpdk/default.nix b/pkgs/os-specific/linux/odp-dpdk/default.nix index 39bb2f3e411f..621e6d1f54c3 100644 --- a/pkgs/os-specific/linux/odp-dpdk/default.nix +++ b/pkgs/os-specific/linux/odp-dpdk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, pkgconfig +{ lib, stdenv, fetchurl, autoreconfHook, pkgconfig , dpdk, libconfig, libpcap, numactl, openssl, zlib, libbsd, libelf, jansson }: let dpdk_18_11 = dpdk.overrideAttrs (old: rec { @@ -50,7 +50,7 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Open Data Plane optimized for DPDK"; homepage = "https://www.opendataplane.org"; license = licenses.bsd3; diff --git a/pkgs/os-specific/linux/ofp/default.nix b/pkgs/os-specific/linux/ofp/default.nix index 7467f7d87137..b392bf6f0ea8 100644 --- a/pkgs/os-specific/linux/ofp/default.nix +++ b/pkgs/os-specific/linux/ofp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook +{ lib, stdenv, fetchFromGitHub, pkgconfig, autoreconfHook , openssl, libpcap, odp-dpdk, dpdk }: @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { "--disable-shared" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "High performance TCP/IP stack"; homepage = "http://www.openfastpath.org"; license = licenses.bsd3; diff --git a/pkgs/os-specific/linux/open-iscsi/default.nix b/pkgs/os-specific/linux/open-iscsi/default.nix index b8aa251489dc..5894d4f506ed 100644 --- a/pkgs/os-specific/linux/open-iscsi/default.nix +++ b/pkgs/os-specific/linux/open-iscsi/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchFromGitHub, automake, autoconf, libtool, gettext +{ lib, stdenv, fetchFromGitHub, automake, autoconf, libtool, gettext , util-linux, openisns, openssl, kmod, perl, systemd, pkgconf }: stdenv.mkDerivation rec { pname = "open-iscsi"; - version = "2.1.2"; + version = "2.1.3"; nativeBuildInputs = [ autoconf automake gettext libtool perl pkgconf ]; buildInputs = [ kmod openisns.lib openssl systemd util-linux ]; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { owner = "open-iscsi"; repo = "open-iscsi"; rev = version; - sha256 = "0fazf2ighj0akrvcj3jm3kd6wl9lgznvr38g6icwfkqk7bykjkam"; + sha256 = "14rcf4xmrmz522z57sm8bb3mn79dqsdwz84rl6id84fgjbwbsp6b"; }; DESTDIR = "$(out)"; @@ -42,9 +42,9 @@ stdenv.mkDerivation rec { sed -i "s|/sbin/iscsiadm|$out/bin/iscsiadm|" $out/bin/iscsi_fw_login ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A high performance, transport independent, multi-platform implementation of RFC3720"; - license = licenses.gpl2; + license = licenses.gpl2Plus; homepage = "https://www.open-iscsi.com"; platforms = platforms.linux; maintainers = with maintainers; [ cleverca22 zaninime ]; diff --git a/pkgs/os-specific/linux/openrazer/driver.nix b/pkgs/os-specific/linux/openrazer/driver.nix index ef96c7697e77..32c99a8be13a 100644 --- a/pkgs/os-specific/linux/openrazer/driver.nix +++ b/pkgs/os-specific/linux/openrazer/driver.nix @@ -2,11 +2,12 @@ , fetchFromGitHub , kernel , stdenv +, lib , util-linux }: let - common = import ../../../development/python-modules/openrazer/common.nix { inherit stdenv fetchFromGitHub; }; + common = import ../../../development/python-modules/openrazer/common.nix { inherit lib stdenv fetchFromGitHub; }; in stdenv.mkDerivation (common // { name = "openrazer-${common.version}-${kernel.version}"; diff --git a/pkgs/os-specific/linux/openvswitch/default.nix b/pkgs/os-specific/linux/openvswitch/default.nix index 84f8abf73b0f..ab7e7cf62e20 100644 --- a/pkgs/os-specific/linux/openvswitch/default.nix +++ b/pkgs/os-specific/linux/openvswitch/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, pkgconfig, util-linux, which +{ lib, stdenv, fetchurl, makeWrapper, pkgconfig, util-linux, which , procps, libcap_ng, openssl, python3 , perl , kernel ? null }: @@ -44,7 +44,7 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; doCheck = false; # bash-completion test fails with "compgen: command not found" - meta = with stdenv.lib; { + meta = with lib; { platforms = platforms.linux; description = "A multilayer virtual switch"; longDescription = diff --git a/pkgs/os-specific/linux/openvswitch/lts.nix b/pkgs/os-specific/linux/openvswitch/lts.nix index 54ecefc54b2f..d0588d4b4416 100644 --- a/pkgs/os-specific/linux/openvswitch/lts.nix +++ b/pkgs/os-specific/linux/openvswitch/lts.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, pkgconfig, util-linux, which +{ lib, stdenv, fetchurl, makeWrapper, pkgconfig, util-linux, which , procps, libcap_ng, openssl, python2, iproute , perl , automake, autoconf, libtool, kernel ? null }: @@ -61,7 +61,7 @@ in stdenv.mkDerivation rec { --replace "self.cert_dir" "root_prefix + self.cert_dir" ''; - meta = with stdenv.lib; { + meta = with lib; { platforms = platforms.linux; description = "A multilayer virtual switch"; longDescription = diff --git a/pkgs/os-specific/linux/pagemon/default.nix b/pkgs/os-specific/linux/pagemon/default.nix index 64177fa5d00b..2ce723913578 100644 --- a/pkgs/os-specific/linux/pagemon/default.nix +++ b/pkgs/os-specific/linux/pagemon/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ncurses }: +{ lib, stdenv, fetchFromGitHub, ncurses }: stdenv.mkDerivation rec { pname = "pagemon"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { "MANDIR=$(out)/share/man/man8" ]; - meta = with stdenv.lib; { + meta = with lib; { inherit (src.meta) homepage; description = "Interactive memory/page monitor for Linux"; longDescription = '' diff --git a/pkgs/os-specific/linux/pam/default.nix b/pkgs/os-specific/linux/pam/default.nix index fb969d7574a0..d42ced5ad55a 100644 --- a/pkgs/os-specific/linux/pam/default.nix +++ b/pkgs/os-specific/linux/pam/default.nix @@ -1,12 +1,14 @@ -{ stdenv, buildPackages, fetchurl, fetchpatch, flex, cracklib, db4 }: +{ lib, stdenv, buildPackages, fetchurl, fetchpatch, flex, cracklib, db4 +, nixosTests +}: stdenv.mkDerivation rec { pname = "linux-pam"; - version = "1.3.1"; + version = "1.5.1"; src = fetchurl { - url = "https://github.com/linux-pam/linux-pam/releases/download/v1.3.1/Linux-PAM-${version}.tar.xz"; - sha256 = "1nyh9kdi3knhxcbv5v4snya0g3gff0m671lnvqcbygw3rm77mx7g"; + url = "https://github.com/linux-pam/linux-pam/releases/download/v${version}/Linux-PAM-${version}.tar.xz"; + sha256 = "sha256-IB1AcwsRNbGzzeoJ8sKKxjTXMYHM0Bcs7d7jZJxXkvw="; }; patches = stdenv.lib.optionals (stdenv.hostPlatform.libc == "musl") [ @@ -63,7 +65,11 @@ stdenv.mkDerivation rec { doCheck = false; # fails - meta = with stdenv.lib; { + passthru.tests = { + inherit (nixosTests) pam-oath-login pam-u2f shadow; + }; + + meta = with lib; { homepage = "http://www.linux-pam.org/"; description = "Pluggable Authentication Modules, a flexible mechanism for authenticating user"; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/pam_ccreds/default.nix b/pkgs/os-specific/linux/pam_ccreds/default.nix index c4abfe5c44cb..bfe9ac7c830c 100644 --- a/pkgs/os-specific/linux/pam_ccreds/default.nix +++ b/pkgs/os-specific/linux/pam_ccreds/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pam, openssl, db}: +{lib, stdenv, fetchurl, pam, openssl, db}: stdenv.mkDerivation rec { name = "pam_ccreds-10"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ pam openssl db ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.padl.com/OSS/pam_ccreds.html"; description = "PAM module to locally authenticate using an enterprise identity when the network is unavailable"; license = licenses.gpl2; diff --git a/pkgs/os-specific/linux/pam_gnupg/default.nix b/pkgs/os-specific/linux/pam_gnupg/default.nix index 50373fe746d6..6ffc6050055e 100644 --- a/pkgs/os-specific/linux/pam_gnupg/default.nix +++ b/pkgs/os-specific/linux/pam_gnupg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pam, gnupg }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pam, gnupg }: stdenv.mkDerivation rec { pname = "pam_gnupg"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Unlock GnuPG keys on login"; longDescription = '' A PAM module that hands over your login password to gpg-agent. This can diff --git a/pkgs/os-specific/linux/pam_krb5/default.nix b/pkgs/os-specific/linux/pam_krb5/default.nix index 7a384c793d23..8abfe5fee9d6 100644 --- a/pkgs/os-specific/linux/pam_krb5/default.nix +++ b/pkgs/os-specific/linux/pam_krb5/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pam, kerberos }: +{ lib, stdenv, fetchurl, pam, kerberos }: stdenv.mkDerivation rec { name = "pam-krb5-4.9"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ pam kerberos ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.eyrie.org/~eagle/software/pam-krb5/"; description = "PAM module allowing PAM-aware applications to authenticate users by performing an AS exchange with a Kerberos KDC"; longDescription = '' diff --git a/pkgs/os-specific/linux/pam_mount/default.nix b/pkgs/os-specific/linux/pam_mount/default.nix index ebfd896555ae..464a2b04b2b4 100644 --- a/pkgs/os-specific/linux/pam_mount/default.nix +++ b/pkgs/os-specific/linux/pam_mount/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, pkgconfig, libtool, pam, libHX, libxml2, pcre, perl, openssl, cryptsetup, util-linux }: +{ lib, stdenv, fetchurl, autoreconfHook, pkgconfig, libtool, pam, libHX, libxml2, pcre, perl, openssl, cryptsetup, util-linux }: stdenv.mkDerivation rec { pname = "pam_mount"; @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { rm -r $out/var ''; - meta = with stdenv.lib; { + meta = with lib; { description = "PAM module to mount volumes for a user session"; homepage = "https://pam-mount.sourceforge.net/"; license = with licenses; [ gpl2 gpl3 lgpl21 lgpl3 ]; diff --git a/pkgs/os-specific/linux/pam_p11/default.nix b/pkgs/os-specific/linux/pam_p11/default.nix index d5336cc9f4ce..1ed47ba53c2a 100644 --- a/pkgs/os-specific/linux/pam_p11/default.nix +++ b/pkgs/os-specific/linux/pam_p11/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, openssl, libp11, pam }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, openssl, libp11, pam }: stdenv.mkDerivation rec { pname = "pam_p11"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ pam openssl libp11 ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/OpenSC/pam_p11"; description = "Authentication with PKCS#11 modules"; license = licenses.lgpl21Plus; diff --git a/pkgs/os-specific/linux/pam_pgsql/default.nix b/pkgs/os-specific/linux/pam_pgsql/default.nix index 6aa1c3be1e25..eece7b84c3d6 100644 --- a/pkgs/os-specific/linux/pam_pgsql/default.nix +++ b/pkgs/os-specific/linux/pam_pgsql/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, postgresql, libgcrypt, pam }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, postgresql, libgcrypt, pam }: stdenv.mkDerivation rec { pname = "pam_pgsql"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ libgcrypt pam postgresql ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Support to authenticate against PostgreSQL for PAM-enabled appliations"; homepage = "https://github.com/pam-pgsql/pam-pgsql"; license = licenses.gpl2Plus; diff --git a/pkgs/os-specific/linux/pam_ssh_agent_auth/default.nix b/pkgs/os-specific/linux/pam_ssh_agent_auth/default.nix index b8cdda5a69a5..167363e60a85 100644 --- a/pkgs/os-specific/linux/pam_ssh_agent_auth/default.nix +++ b/pkgs/os-specific/linux/pam_ssh_agent_auth/default.nix @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { # Allow multiple colon-separated authorized keys files to be # specified in the file= option. ./multiple-key-files.patch + ./edcsa-crash-fix.patch ]; configureFlags = [ diff --git a/pkgs/os-specific/linux/pam_ssh_agent_auth/edcsa-crash-fix.patch b/pkgs/os-specific/linux/pam_ssh_agent_auth/edcsa-crash-fix.patch new file mode 100644 index 000000000000..45ee87458161 --- /dev/null +++ b/pkgs/os-specific/linux/pam_ssh_agent_auth/edcsa-crash-fix.patch @@ -0,0 +1,53 @@ +commit 1b0d9bcc5f5cd78b0bb1357d6a11da5d616ad26f +Author: Wout Mertens +Date: Thu Jun 11 18:08:13 2020 +0200 + + fix segfault when using ECDSA keys. + + Author: Marc Deslauriers + Bug-Ubuntu: https://bugs.launchpad.net/bugs/1869512 + +diff --git a/ssh-ecdsa.c b/ssh-ecdsa.c +index 5b13b30..5bf29cc 100644 +--- a/ssh-ecdsa.c ++++ b/ssh-ecdsa.c +@@ -46,7 +46,7 @@ ssh_ecdsa_sign(const Key *key, u_char **sigp, u_int *lenp, + u_int len, dlen; + Buffer b, bb; + #if OPENSSL_VERSION_NUMBER >= 0x10100005L +- BIGNUM *r, *s; ++ BIGNUM *r = NULL, *s = NULL; + #endif + + if (key == NULL || key->type != KEY_ECDSA || key->ecdsa == NULL) { +@@ -137,20 +137,27 @@ ssh_ecdsa_verify(const Key *key, const u_char *signature, u_int signaturelen, + + /* parse signature */ + if ((sig = ECDSA_SIG_new()) == NULL) +- pamsshagentauth_fatal("ssh_ecdsa_verify: DSA_SIG_new failed"); ++ pamsshagentauth_fatal("ssh_ecdsa_verify: ECDSA_SIG_new failed"); + + pamsshagentauth_buffer_init(&b); + pamsshagentauth_buffer_append(&b, sigblob, len); + #if OPENSSL_VERSION_NUMBER < 0x10100005L + if ((pamsshagentauth_buffer_get_bignum2_ret(&b, sig->r) == -1) || + (pamsshagentauth_buffer_get_bignum2_ret(&b, sig->s) == -1)) ++ pamsshagentauth_fatal("ssh_ecdsa_verify:" ++ "pamsshagentauth_buffer_get_bignum2_ret failed"); + #else +- DSA_SIG_get0(sig, &r, &s); ++ if ((r = BN_new()) == NULL) ++ pamsshagentauth_fatal("ssh_ecdsa_verify: BN_new failed"); ++ if ((s = BN_new()) == NULL) ++ pamsshagentauth_fatal("ssh_ecdsa_verify: BN_new failed"); + if ((pamsshagentauth_buffer_get_bignum2_ret(&b, r) == -1) || + (pamsshagentauth_buffer_get_bignum2_ret(&b, s) == -1)) +-#endif + pamsshagentauth_fatal("ssh_ecdsa_verify:" + "pamsshagentauth_buffer_get_bignum2_ret failed"); ++ if (ECDSA_SIG_set0(sig, r, s) != 1) ++ pamsshagentauth_fatal("ssh_ecdsa_verify: ECDSA_SIG_set0 failed"); ++#endif + + /* clean up */ + memset(sigblob, 0, len); diff --git a/pkgs/os-specific/linux/pam_u2f/default.nix b/pkgs/os-specific/linux/pam_u2f/default.nix index d8d9a96652c4..852fb2d73ef8 100644 --- a/pkgs/os-specific/linux/pam_u2f/default.nix +++ b/pkgs/os-specific/linux/pam_u2f/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libfido2, pam, openssl }: +{ lib, stdenv, fetchurl, pkgconfig, libfido2, pam, openssl }: stdenv.mkDerivation rec { pname = "pam_u2f"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { configureFlagsArray+=("--with-pam-dir=$out/lib/security") ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://developers.yubico.com/pam-u2f/"; description = "A PAM module for allowing authentication with a U2F device"; license = licenses.bsd2; diff --git a/pkgs/os-specific/linux/paxctl/default.nix b/pkgs/os-specific/linux/paxctl/default.nix index 754f6bcac333..da9928a66e3b 100644 --- a/pkgs/os-specific/linux/paxctl/default.nix +++ b/pkgs/os-specific/linux/paxctl/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, elf-header }: +{ fetchurl, lib, stdenv, elf-header }: stdenv.mkDerivation rec { pname = "paxctl"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { setupHook = ./setup-hook.sh; - meta = with stdenv.lib; { + meta = with lib; { description = "A tool for controlling PaX flags on a per binary basis"; homepage = "https://pax.grsecurity.net"; license = licenses.gpl2; diff --git a/pkgs/os-specific/linux/paxtest/default.nix b/pkgs/os-specific/linux/paxtest/default.nix index 6bd59e1e7fd0..aae8c1296c63 100644 --- a/pkgs/os-specific/linux/paxtest/default.nix +++ b/pkgs/os-specific/linux/paxtest/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, paxctl }: +{ lib, stdenv, fetchurl, paxctl }: stdenv.mkDerivation rec { pname = "paxtest"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PAXBIN=${paxctl}/bin/paxctl" "BINDIR=$(out)/bin" "RUNDIR=$(out)/lib/paxtest" ]; installFlags = [ "DESTDIR=\"\"" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Test various memory protection measures"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/pcimem/default.nix b/pkgs/os-specific/linux/pcimem/default.nix new file mode 100644 index 000000000000..dda4d0fff0b9 --- /dev/null +++ b/pkgs/os-specific/linux/pcimem/default.nix @@ -0,0 +1,30 @@ +{ lib, stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "pcimem"; + version = "unstable-2018-08-29"; + + src = fetchFromGitHub { + owner = "billfarrow"; + repo = pname; + rev = "09724edb1783a98da2b7ae53c5aaa87493aabc9b"; + sha256 = "0zlbvcl5q4hgna11p3w00px1p8qgn8ga79lh6a2m7d597g86kbq3"; + }; + + outputs = [ "out" "doc" ]; + + makeFlags = [ "CFLAGS=-Wno-maybe-uninitialized" ]; + + installPhase = '' + install -D pcimem "$out/bin/pcimem" + install -D README "$doc/doc/README" + ''; + + meta = with lib; { + description = "Simple method of reading and writing to memory registers on a PCI card"; + homepage = "https://github.com/billfarrow/pcimem"; + license = licenses.gpl2Only; + platforms = platforms.linux; + maintainers = with maintainers; [ mafo ]; + }; +} diff --git a/pkgs/os-specific/linux/pcm/default.nix b/pkgs/os-specific/linux/pcm/default.nix index 66f5dcf338a3..f791661d2ef1 100644 --- a/pkgs/os-specific/linux/pcm/default.nix +++ b/pkgs/os-specific/linux/pcm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { version = "202011"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { cp pcm*.x $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Processor counter monitor"; homepage = "https://www.intel.com/software/pcm"; license = licenses.bsd3; diff --git a/pkgs/os-specific/linux/perf-tools/default.nix b/pkgs/os-specific/linux/perf-tools/default.nix index 1a18c6ea2721..7d5d6d59ea84 100644 --- a/pkgs/os-specific/linux/perf-tools/default.nix +++ b/pkgs/os-specific/linux/perf-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, perl }: +{ lib, stdenv, fetchFromGitHub, perl }: stdenv.mkDerivation { name = "perf-tools-20171219"; @@ -34,7 +34,7 @@ stdenv.mkDerivation { mv $d/man $out/share/ ''; - meta = with stdenv.lib; { + meta = with lib; { platforms = platforms.linux; homepage = "https://github.com/brendangregg/perf-tools"; description = "Performance analysis tools based on Linux perf_events (aka perf) and ftrace"; diff --git a/pkgs/os-specific/linux/phc-intel/default.nix b/pkgs/os-specific/linux/phc-intel/default.nix index 2d5d149292cd..4b4c86aa9164 100644 --- a/pkgs/os-specific/linux/phc-intel/default.nix +++ b/pkgs/os-specific/linux/phc-intel/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, kernel, which }: +{ lib, stdenv, fetchurl, kernel, which }: # Don't bother with older versions, though some might even work: assert stdenv.lib.versionAtLeast kernel.version "4.10"; @@ -36,7 +36,7 @@ in stdenv.mkDerivation rec { install -m 644 *.ko $out/lib/modules/${kernel.modDirVersion}/extra/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Undervolting kernel driver for Intel processors"; longDescription = '' PHC is a Linux kernel patch to undervolt processors. This can divide the diff --git a/pkgs/os-specific/linux/piper/default.nix b/pkgs/os-specific/linux/piper/default.nix index 641c8b8ba81f..caa6b1848e7d 100644 --- a/pkgs/os-specific/linux/piper/default.nix +++ b/pkgs/os-specific/linux/piper/default.nix @@ -1,4 +1,4 @@ -{ stdenv, meson, ninja, pkgconfig, gettext, fetchFromGitHub, python3 +{ lib, stdenv, meson, ninja, pkgconfig, gettext, fetchFromGitHub, python3 , wrapGAppsHook, gtk3, glib, desktop-file-utils, appstream-glib, gnome3 , gobject-introspection }: @@ -28,7 +28,7 @@ python3.pkgs.buildPythonApplication rec { patchShebangs meson_install.sh ''; - meta = with stdenv.lib; { + meta = with lib; { description = "GTK frontend for ratbagd mouse config daemon"; homepage = "https://github.com/libratbag/piper"; license = licenses.gpl2; diff --git a/pkgs/os-specific/linux/pktgen/default.nix b/pkgs/os-specific/linux/pktgen/default.nix index a883935b7b95..23b9b9426df4 100644 --- a/pkgs/os-specific/linux/pktgen/default.nix +++ b/pkgs/os-specific/linux/pktgen/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { rm -rf $out/include $out/lib ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Traffic generator powered by DPDK"; homepage = "http://dpdk.org/"; license = licenses.bsdOriginal; diff --git a/pkgs/os-specific/linux/ply/default.nix b/pkgs/os-specific/linux/ply/default.nix index 1d98cfb0cd18..0433a7a0718c 100644 --- a/pkgs/os-specific/linux/ply/default.nix +++ b/pkgs/os-specific/linux/ply/default.nix @@ -1,4 +1,4 @@ -{ stdenv, kernel, fetchFromGitHub, autoreconfHook, yacc, flex, p7zip, rsync }: +{ lib, stdenv, kernel, fetchFromGitHub, autoreconfHook, yacc, flex, p7zip, rsync }: assert kernel != null -> stdenv.lib.versionAtLeast kernel.version "4.0"; @@ -33,7 +33,7 @@ in stdenv.mkDerivation { ./autogen.sh --prefix=$out ''; - meta = with stdenv.lib; { + meta = with lib; { description = "dynamic Tracing in Linux"; homepage = "https://wkz.github.io/ply/"; license = [ licenses.gpl2 ]; diff --git a/pkgs/os-specific/linux/plymouth/default.nix b/pkgs/os-specific/linux/plymouth/default.nix index 7a6c227f401f..88575580e2a2 100644 --- a/pkgs/os-specific/linux/plymouth/default.nix +++ b/pkgs/os-specific/linux/plymouth/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { "plymouthd_confdir=$(out)/etc/plymouth" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.freedesktop.org/wiki/Software/Plymouth"; description = "A graphical boot animation"; license = licenses.gpl2; diff --git a/pkgs/os-specific/linux/policycoreutils/default.nix b/pkgs/os-specific/linux/policycoreutils/default.nix index f9e3a7fb5d4f..7e2ff29325a8 100644 --- a/pkgs/os-specific/linux/policycoreutils/default.nix +++ b/pkgs/os-specific/linux/policycoreutils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gettext, libsepol, libselinux, libsemanage }: +{ lib, stdenv, fetchurl, gettext, libsepol, libselinux, libsemanage }: stdenv.mkDerivation rec { pname = "policycoreutils"; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { "MAN5DIR=$(out)/share/man/man5" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "SELinux policy core utilities"; license = licenses.gpl2; inherit (libsepol.meta) homepage platforms maintainers; diff --git a/pkgs/os-specific/linux/powertop/default.nix b/pkgs/os-specific/linux/powertop/default.nix index 22e70fc0b658..a8733ac1f8af 100644 --- a/pkgs/os-specific/linux/powertop/default.nix +++ b/pkgs/os-specific/linux/powertop/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, gettext, libnl, ncurses, pciutils, pkgconfig, zlib }: +{ lib, stdenv, fetchurl, fetchpatch, gettext, libnl, ncurses, pciutils, pkgconfig, zlib }: stdenv.mkDerivation rec { pname = "powertop"; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { substituteInPlace src/tuning/bluetooth.cpp --replace "/usr/bin/hcitool" "hcitool" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Analyze power consumption on Intel-based laptops"; homepage = "https://01.org/powertop"; license = licenses.gpl2; diff --git a/pkgs/os-specific/linux/prl-tools/default.nix b/pkgs/os-specific/linux/prl-tools/default.nix index 9b0e38198a33..14e43b09e309 100644 --- a/pkgs/os-specific/linux/prl-tools/default.nix +++ b/pkgs/os-specific/linux/prl-tools/default.nix @@ -156,7 +156,7 @@ stdenv.mkDerivation rec { dontStrip = true; dontPatchELF = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Parallels Tools for Linux guests"; homepage = "https://parallels.com"; platforms = [ "i686-linux" "x86_64-linux" ]; diff --git a/pkgs/os-specific/linux/procdump/default.nix b/pkgs/os-specific/linux/procdump/default.nix index 74ee1533e461..75ca2cb165e0 100644 --- a/pkgs/os-specific/linux/procdump/default.nix +++ b/pkgs/os-specific/linux/procdump/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, bash, coreutils, gdb, zlib }: +{ lib, stdenv, fetchFromGitHub, bash, coreutils, gdb, zlib }: stdenv.mkDerivation rec { pname = "procdump"; @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { runHook postInstallCheck ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A Linux version of the ProcDump Sysinternals tool"; homepage = "https://github.com/Microsoft/ProcDump-for-Linux"; license = licenses.mit; diff --git a/pkgs/os-specific/linux/pscircle/default.nix b/pkgs/os-specific/linux/pscircle/default.nix index 9dd4ba6cd373..f6ee22ee0fc6 100644 --- a/pkgs/os-specific/linux/pscircle/default.nix +++ b/pkgs/os-specific/linux/pscircle/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, meson, pkgconfig, ninja, cairo }: +{ lib, stdenv, fetchFromGitLab, meson, pkgconfig, ninja, cairo }: stdenv.mkDerivation rec { pname = "pscircle"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ninja ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://gitlab.com/mildlyparallel/pscircle"; description = "Visualize Linux processes in a form of a radial tree"; license = licenses.gpl2; diff --git a/pkgs/os-specific/linux/psftools/default.nix b/pkgs/os-specific/linux/psftools/default.nix index 5a19fbec24d5..f7bcc2fd6add 100644 --- a/pkgs/os-specific/linux/psftools/default.nix +++ b/pkgs/os-specific/linux/psftools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "psftools"; version = "1.0.14"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { }; outputs = ["out" "man" "dev" "lib"]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.seasip.info/Unix/PSF"; description = "Conversion tools for .PSF fonts"; longDescription = '' diff --git a/pkgs/os-specific/linux/psmisc/default.nix b/pkgs/os-specific/linux/psmisc/default.nix index 4379ee3ae49f..3e03ec4ea672 100644 --- a/pkgs/os-specific/linux/psmisc/default.nix +++ b/pkgs/os-specific/linux/psmisc/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitLab, autoconf, automake, gettext, ncurses}: +{lib, stdenv, fetchFromGitLab, autoconf, automake, gettext, ncurses}: stdenv.mkDerivation rec { pname = "psmisc"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ./autogen.sh ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://gitlab.com/psmisc/psmisc"; description = "A set of small useful utilities that use the proc filesystem (such as fuser, killall and pstree)"; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/radeontools/default.nix b/pkgs/os-specific/linux/radeontools/default.nix index d2c3c11c9390..0d50c6b41d87 100644 --- a/pkgs/os-specific/linux/radeontools/default.nix +++ b/pkgs/os-specific/linux/radeontools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , autoreconfHook , pciutils , pkgconfig @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ xorg.libpciaccess ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Lowlevel tools to tweak register and dump state on radeon GPUs"; homepage = "https://airlied.livejournal.com/"; license = licenses.zlib; diff --git a/pkgs/os-specific/linux/radeontop/default.nix b/pkgs/os-specific/linux/radeontop/default.nix index f55b09f6991b..f1655c94b84d 100644 --- a/pkgs/os-specific/linux/radeontop/default.nix +++ b/pkgs/os-specific/linux/radeontop/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, gettext, makeWrapper +{ lib, stdenv, fetchFromGitHub, pkgconfig, gettext, makeWrapper , ncurses, libdrm, libpciaccess, libxcb }: stdenv.mkDerivation rec { @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { --prefix LD_LIBRARY_PATH : $out/lib ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Top-like tool for viewing AMD Radeon GPU utilization"; longDescription = '' View GPU utilization, both for the total activity percent and individual diff --git a/pkgs/os-specific/linux/rdma-core/default.nix b/pkgs/os-specific/linux/rdma-core/default.nix index 042a54ff1575..fd7148b7eb63 100644 --- a/pkgs/os-specific/linux/rdma-core/default.nix +++ b/pkgs/os-specific/linux/rdma-core/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, docutils +{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, docutils , pandoc, ethtool, iproute, libnl, udev, python, perl , makeWrapper } : let - version = "31.2"; + version = "33.0"; in stdenv.mkDerivation { pname = "rdma-core"; @@ -14,7 +14,7 @@ in stdenv.mkDerivation { owner = "linux-rdma"; repo = "rdma-core"; rev = "v${version}"; - sha256 = "0njfn8ziip57a2s435d4s0p3yylb85y7hdgbq660vwpsia9fb4sq"; + sha256 = "04q4z95nxxxjc674qnbwn19bv18nl3x7xwp6aql17h1cw3gdmhw4"; }; nativeBuildInputs = [ cmake pkgconfig pandoc docutils makeWrapper ]; @@ -43,7 +43,7 @@ in stdenv.mkDerivation { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "RDMA Core Userspace Libraries and Daemons"; homepage = "https://github.com/linux-rdma/rdma-core"; license = licenses.gpl2; diff --git a/pkgs/os-specific/linux/read-edid/default.nix b/pkgs/os-specific/linux/read-edid/default.nix index 36020d831aca..24ad06749766 100644 --- a/pkgs/os-specific/linux/read-edid/default.nix +++ b/pkgs/os-specific/linux/read-edid/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { substituteInPlace CMakeLists.txt --replace 'COPYING' 'LICENSE' ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Tool for reading and parsing EDID data from monitors"; homepage = "http://www.polypux.org/projects/read-edid/"; license = licenses.bsd2; # Quoted: "This is an unofficial license. Let's call it BSD-like." diff --git a/pkgs/os-specific/linux/regionset/default.nix b/pkgs/os-specific/linux/regionset/default.nix index 15030d1b19a2..f685eec19488 100644 --- a/pkgs/os-specific/linux/regionset/default.nix +++ b/pkgs/os-specific/linux/regionset/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: let version = "0.2"; in stdenv.mkDerivation { @@ -15,7 +15,7 @@ stdenv.mkDerivation { install -Dm644 {.,$out/share/man/man8}/regionset.8 ''; - meta = with stdenv.lib; { + meta = with lib; { inherit version; homepage = "http://linvdr.org/projects/regionset/"; description = "Tool for changing the region code setting of DVD players"; diff --git a/pkgs/os-specific/linux/rewritefs/default.nix b/pkgs/os-specific/linux/rewritefs/default.nix index a852e43b38f8..2c50c491d43f 100644 --- a/pkgs/os-specific/linux/rewritefs/default.nix +++ b/pkgs/os-specific/linux/rewritefs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, fuse, pcre }: +{ lib, stdenv, fetchFromGitHub, pkgconfig, fuse, pcre }: stdenv.mkDerivation { pname = "rewritefs"; @@ -21,7 +21,7 @@ stdenv.mkDerivation { preConfigure = "substituteInPlace Makefile --replace /usr/local $out"; - meta = with stdenv.lib; { + meta = with lib; { description = ''A FUSE filesystem intended to be used like Apache mod_rewrite''; homepage = "https://github.com/sloonz/rewritefs"; diff --git a/pkgs/os-specific/linux/rfkill/udev.nix b/pkgs/os-specific/linux/rfkill/udev.nix index a24c947673de..e1a14a80162c 100644 --- a/pkgs/os-specific/linux/rfkill/udev.nix +++ b/pkgs/os-specific/linux/rfkill/udev.nix @@ -1,4 +1,4 @@ -{ stdenv, substituteAll }: +{ lib, stdenv, substituteAll }: # Provides a facility to hook into rfkill changes. # @@ -47,7 +47,7 @@ in stdenv.mkDerivation { cp ${rfkillHook} "$out/bin/rfkill-hook.sh" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://wireless.kernel.org/en/users/Documentation/rfkill"; description = "Rules+hook for udev to catch rfkill state changes"; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/roccat-tools/default.nix b/pkgs/os-specific/linux/roccat-tools/default.nix index f8a1b836a6c6..766216f07d98 100644 --- a/pkgs/os-specific/linux/roccat-tools/default.nix +++ b/pkgs/os-specific/linux/roccat-tools/default.nix @@ -24,8 +24,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig gettext ]; buildInputs = [ dbus dbus-glib libgaminggear libgudev lua ]; - enableParallelBuilding = true; - cmakeFlags = [ "-DUDEVDIR=\${out}/lib/udev/rules.d" "-DCMAKE_MODULE_PATH=${libgaminggear.dev}/lib/cmake" diff --git a/pkgs/os-specific/linux/rtkit/default.nix b/pkgs/os-specific/linux/rtkit/default.nix index b3f73e6c3bba..8138fb9c3465 100644 --- a/pkgs/os-specific/linux/rtkit/default.nix +++ b/pkgs/os-specific/linux/rtkit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch +{ lib, stdenv, fetchFromGitHub, fetchpatch , meson, ninja, pkgconfig, unixtools , dbus, libcap, polkit, systemd }: @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { "-Dsystemd_systemunitdir=${placeholder "out"}/etc/systemd/system" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/heftig/rtkit"; description = "A daemon that hands out real-time priority to processes"; license = with licenses; [ gpl3 bsd0 ]; # lib is bsd license diff --git a/pkgs/os-specific/linux/rtl8812au/default.nix b/pkgs/os-specific/linux/rtl8812au/default.nix index 9b2bcf3b91ce..0051e689794c 100644 --- a/pkgs/os-specific/linux/rtl8812au/default.nix +++ b/pkgs/os-specific/linux/rtl8812au/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, kernel, bc, nukeReferences }: +{ lib, stdenv, fetchFromGitHub, kernel, bc, nukeReferences }: stdenv.mkDerivation rec { name = "rtl8812au-${kernel.version}-${version}"; @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { nuke-refs $out/lib/modules/*/kernel/net/wireless/*.ko ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Driver for Realtek 802.11ac, rtl8812au, provides the 8812au mod"; homepage = "https://github.com/gordboy/rtl8812au-5.6.4.2"; license = licenses.gpl2; diff --git a/pkgs/os-specific/linux/rtl8814au/default.nix b/pkgs/os-specific/linux/rtl8814au/default.nix index 99d22e2f9998..a710ef34e956 100644 --- a/pkgs/os-specific/linux/rtl8814au/default.nix +++ b/pkgs/os-specific/linux/rtl8814au/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, kernel }: +{ lib, stdenv, fetchFromGitHub, kernel }: stdenv.mkDerivation rec { name = "rtl8814au-${kernel.version}-${version}"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { mkdir -p "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Realtek 8814AU USB WiFi driver"; homepage = "https://github.com/zebulon2/rtl8814au"; license = licenses.gpl2; diff --git a/pkgs/os-specific/linux/rtl8821au/default.nix b/pkgs/os-specific/linux/rtl8821au/default.nix index f3d68cf79194..908220a1f28d 100644 --- a/pkgs/os-specific/linux/rtl8821au/default.nix +++ b/pkgs/os-specific/linux/rtl8821au/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, kernel, bc, nukeReferences }: +{ lib, stdenv, fetchFromGitHub, kernel, bc, nukeReferences }: stdenv.mkDerivation rec { name = "rtl8821au-${kernel.version}-${version}"; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { nuke-refs $out/lib/modules/*/kernel/net/wireless/*.ko ''; - meta = with stdenv.lib; { + meta = with lib; { description = "rtl8821AU, rtl8812AU and rtl8811AU chipset driver with firmware"; homepage = "https://github.com/zebulon2/rtl8812au"; license = licenses.gpl2; diff --git a/pkgs/os-specific/linux/rtl8821ce/default.nix b/pkgs/os-specific/linux/rtl8821ce/default.nix index ae6586262a5c..81c129fae3eb 100644 --- a/pkgs/os-specific/linux/rtl8821ce/default.nix +++ b/pkgs/os-specific/linux/rtl8821ce/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, kernel, bc }: +{ lib, stdenv, fetchFromGitHub, kernel, bc }: stdenv.mkDerivation rec { name = "rtl8821ce-${kernel.version}-${version}"; version = "5.5.2_34066.20200325"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { mkdir -p "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Realtek rtl8821ce driver"; homepage = "https://github.com/tomaspinho/rtl8821ce"; license = licenses.gpl2; diff --git a/pkgs/os-specific/linux/rtl8821cu/default.nix b/pkgs/os-specific/linux/rtl8821cu/default.nix index 35dbd1a9ee10..20bb590895b9 100644 --- a/pkgs/os-specific/linux/rtl8821cu/default.nix +++ b/pkgs/os-specific/linux/rtl8821cu/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, kernel, bc }: +{ lib, stdenv, fetchFromGitHub, kernel, bc }: stdenv.mkDerivation rec { name = "rtl8821cu-${kernel.version}-${version}"; version = "unstable-2020-12-21"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { mkdir -p "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Realtek rtl8821cu driver"; homepage = "https://github.com/brektrou/rtl8821CU"; license = licenses.gpl2; diff --git a/pkgs/os-specific/linux/rtl88x2bu/default.nix b/pkgs/os-specific/linux/rtl88x2bu/default.nix index c2b5eb1cdb4c..fb94b14d9eab 100644 --- a/pkgs/os-specific/linux/rtl88x2bu/default.nix +++ b/pkgs/os-specific/linux/rtl88x2bu/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, kernel, bc }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, kernel, bc }: stdenv.mkDerivation rec { name = "rtl88x2bu-${kernel.version}-${version}"; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { mkdir -p "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Realtek rtl88x2bu driver"; homepage = "https://github.com/cilynx/rtl88x2bu"; license = licenses.gpl2; diff --git a/pkgs/os-specific/linux/rtl88xxau-aircrack/default.nix b/pkgs/os-specific/linux/rtl88xxau-aircrack/default.nix index a86d76a3be59..c37c9502d2db 100644 --- a/pkgs/os-specific/linux/rtl88xxau-aircrack/default.nix +++ b/pkgs/os-specific/linux/rtl88xxau-aircrack/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, kernel }: +{ lib, stdenv, fetchFromGitHub, kernel }: stdenv.mkDerivation rec { name = "rtl88xxau-aircrack-${kernel.version}-${version}"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { mkdir -p "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Aircrack-ng kernel module for Realtek 88XXau network cards\n(8811au, 8812au, 8814au and 8821au chipsets) with monitor mode and injection support."; homepage = "https://github.com/aircrack-ng/rtl8812au"; license = licenses.gpl2; diff --git a/pkgs/os-specific/linux/schedtool/default.nix b/pkgs/os-specific/linux/schedtool/default.nix index 98663a5ab41e..98d9248e3f42 100644 --- a/pkgs/os-specific/linux/schedtool/default.nix +++ b/pkgs/os-specific/linux/schedtool/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "schedtool"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { makeFlags = [ "DESTDIR=$(out)" "DESTPREFIX=" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Query or alter a process' scheduling policy under Linux"; homepage = "https://freequaos.host.sk/schedtool/"; license = licenses.gpl2; diff --git a/pkgs/os-specific/linux/sd-switch/default.nix b/pkgs/os-specific/linux/sd-switch/default.nix index 7cbad8d6df3b..026488a24ded 100644 --- a/pkgs/os-specific/linux/sd-switch/default.nix +++ b/pkgs/os-specific/linux/sd-switch/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, rustPlatform, pkg-config, dbus }: +{ lib, stdenv, fetchFromGitLab, rustPlatform, pkg-config, dbus }: rustPlatform.buildRustPackage rec { pname = "sd-switch"; @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ dbus ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A systemd unit switcher for Home Manager"; homepage = "https://gitlab.com/rycee/sd-switch"; license = licenses.gpl3Plus; diff --git a/pkgs/os-specific/linux/sdparm/default.nix b/pkgs/os-specific/linux/sdparm/default.nix index e0392e442bf5..08e61a98f6b9 100644 --- a/pkgs/os-specific/linux/sdparm/default.nix +++ b/pkgs/os-specific/linux/sdparm/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation rec { pname = "sdparm"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1nqjc4w2w47zavcbf5xmm53x1zbwgljaw1lpajcdi537cgy32fa8"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://sg.danny.cz/sg/sdparm.html"; description = "A utility to access SCSI device parameters"; license = licenses.bsd3; diff --git a/pkgs/os-specific/linux/semodule-utils/default.nix b/pkgs/os-specific/linux/semodule-utils/default.nix index bf1f36835b47..c1243582a517 100644 --- a/pkgs/os-specific/linux/semodule-utils/default.nix +++ b/pkgs/os-specific/linux/semodule-utils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libsepol }: +{ lib, stdenv, fetchurl, libsepol }: stdenv.mkDerivation rec { pname = "semodule-utils"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { "LIBSEPOLA=${stdenv.lib.getLib libsepol}/lib/libsepol.a" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "SELinux policy core utilities (packaging additions)"; license = licenses.gpl2; inherit (libsepol.meta) homepage platforms; diff --git a/pkgs/os-specific/linux/sepolgen/default.nix b/pkgs/os-specific/linux/sepolgen/default.nix index 53250b345e83..f7ef1cb9c3a7 100644 --- a/pkgs/os-specific/linux/sepolgen/default.nix +++ b/pkgs/os-specific/linux/sepolgen/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libsepol, python }: +{ lib, stdenv, fetchurl, libsepol, python }: stdenv.mkDerivation rec { pname = "sepolgen"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { makeFlagsArray+=("PYTHONLIBDIR=lib/${python.libPrefix}/site-packages") ''; - meta = with stdenv.lib; { + meta = with lib; { inherit (libsepol.meta) homepage platforms maintainers; description = "SELinux policy generation library"; license = licenses.gpl2; diff --git a/pkgs/os-specific/linux/service-wrapper/default.nix b/pkgs/os-specific/linux/service-wrapper/default.nix index 150262158da4..381f0699697a 100644 --- a/pkgs/os-specific/linux/service-wrapper/default.nix +++ b/pkgs/os-specific/linux/service-wrapper/default.nix @@ -1,4 +1,4 @@ -{ stdenv, runCommand, substituteAll, coreutils }: +{ lib, stdenv, runCommand, substituteAll, coreutils }: let name = "service-wrapper-${version}"; @@ -12,7 +12,7 @@ runCommand name { inherit coreutils; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A convenient wrapper for the systemctl commands, borrow from Ubuntu"; license = licenses.gpl2Plus; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/shadow/default.nix b/pkgs/os-specific/linux/shadow/default.nix index 59cc59d7714d..a6d288e0e720 100644 --- a/pkgs/os-specific/linux/shadow/default.nix +++ b/pkgs/os-specific/linux/shadow/default.nix @@ -1,4 +1,4 @@ -{ stdenv, nixosTests, fetchpatch, fetchFromGitHub, autoreconfHook, libxslt +{ lib, stdenv, nixosTests, fetchpatch, fetchFromGitHub, autoreconfHook, libxslt , libxml2 , docbook_xml_dtd_45, docbook_xsl, itstool, flex, bison , pam ? null, glibcCross ? null }: @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { mv $out/bin/su $su/bin ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/shadow-maint"; description = "Suite containing authentication-related tools such as passwd and su"; license = licenses.bsd3; diff --git a/pkgs/os-specific/linux/sssd/default.nix b/pkgs/os-specific/linux/sssd/default.nix index 05866f942692..0398757c57e9 100644 --- a/pkgs/os-specific/linux/sssd/default.nix +++ b/pkgs/os-specific/linux/sssd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, glibc, augeas, dnsutils, c-ares, curl, +{ lib, stdenv, fetchurl, fetchpatch, glibc, augeas, dnsutils, c-ares, curl, cyrus_sasl, ding-libs, libnl, libunistring, nss, samba, nfs-utils, doxygen, python, python3, pam, popt, talloc, tdb, tevent, pkgconfig, ldb, openldap, pcre, kerberos, cifs-utils, glib, keyutils, dbus, fakeroot, libxslt, libxml2, @@ -93,7 +93,7 @@ stdenv.mkDerivation rec { find "$out" -depth -type d -exec rmdir --ignore-fail-on-non-empty {} \; ''; - meta = with stdenv.lib; { + meta = with lib; { description = "System Security Services Daemon"; homepage = "https://fedorahosted.org/sssd/"; license = licenses.gpl3; diff --git a/pkgs/os-specific/linux/syscall_limiter/default.nix b/pkgs/os-specific/linux/syscall_limiter/default.nix index 0354abf46e1a..329ec522c422 100644 --- a/pkgs/os-specific/linux/syscall_limiter/default.nix +++ b/pkgs/os-specific/linux/syscall_limiter/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , libseccomp , perl @@ -27,7 +27,7 @@ stdenv.mkDerivation { --replace which ${which}/bin/which ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Start Linux programs with only selected syscalls enabled"; homepage = "https://github.com/vi/syscall_limiter"; license = licenses.mit; diff --git a/pkgs/os-specific/linux/sysklogd/default.nix b/pkgs/os-specific/linux/sysklogd/default.nix index f93e9012e05d..454527321fb1 100644 --- a/pkgs/os-specific/linux/sysklogd/default.nix +++ b/pkgs/os-specific/linux/sysklogd/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation { name = "sysklogd-1.5.1"; @@ -21,7 +21,7 @@ stdenv.mkDerivation { preInstall = "mkdir -p $out/share/man/man5/ $out/share/man/man8/ $out/sbin"; - meta = with stdenv.lib; { + meta = with lib; { description = "A system logging daemon"; platforms = platforms.linux; license = licenses.gpl2; diff --git a/pkgs/os-specific/linux/syslinux/default.nix b/pkgs/os-specific/linux/syslinux/default.nix index 28681aed5640..cf263281da27 100644 --- a/pkgs/os-specific/linux/syslinux/default.nix +++ b/pkgs/os-specific/linux/syslinux/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, fetchurl, fetchpatch, nasm, perl, python3, libuuid, mtools, makeWrapper }: +{ lib, stdenv, fetchgit, fetchurl, fetchpatch, nasm, perl, python3, libuuid, mtools, makeWrapper }: stdenv.mkDerivation { pname = "syslinux"; @@ -47,6 +47,7 @@ stdenv.mkDerivation { url = mkURL "26f0e7b2" "0018-prevent-pow-optimization.patch"; sha256 = "1c8g0jz5yj9a0rsmryx9vdjsw4hw8mjfcg05c9pmyjg85w3dfp3m"; }) + ./gcc10.patch ]; postPatch = '' @@ -90,7 +91,7 @@ stdenv.mkDerivation { rm -rf $out/share/syslinux/com32 ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.syslinux.org/"; description = "A lightweight bootloader"; license = licenses.gpl2; diff --git a/pkgs/os-specific/linux/syslinux/gcc10.patch b/pkgs/os-specific/linux/syslinux/gcc10.patch new file mode 100644 index 000000000000..f4893a912313 --- /dev/null +++ b/pkgs/os-specific/linux/syslinux/gcc10.patch @@ -0,0 +1,33 @@ +diff --git a/dos/string.h b/dos/string.h +index f648de2..a502132 100644 +--- a/dos/string.h ++++ b/dos/string.h +@@ -5,12 +5,13 @@ + #ifndef _STRING_H + #define _STRING_H + ++#include ++ + /* Standard routines */ + #define memcpy(a,b,c) __builtin_memcpy(a,b,c) + #define memmove(a,b,c) __builtin_memmove(a,b,c) + #define memset(a,b,c) __builtin_memset(a,b,c) + #define strcpy(a,b) __builtin_strcpy(a,b) +-#define strlen(a) __builtin_strlen(a) + + /* This only returns true or false */ + static inline int memcmp(const void *__m1, const void *__m2, unsigned int __n) +@@ -21,6 +22,13 @@ static inline int memcmp(const void *__m1, const void *__m2, unsigned int __n) + return rv; + } + ++static inline size_t strlen(const char *s) ++{ ++ size_t len = 0; ++ while (*s++) len++; ++ return len; ++} ++ + extern char *strchr(const char *s, int c); + + #endif /* _STRING_H */ diff --git a/pkgs/os-specific/linux/system76-acpi/default.nix b/pkgs/os-specific/linux/system76-acpi/default.nix index b7c0e27669da..f642fad69787 100644 --- a/pkgs/os-specific/linux/system76-acpi/default.nix +++ b/pkgs/os-specific/linux/system76-acpi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, kernel }: +{ lib, stdenv, fetchFromGitHub, kernel }: let version = "1.0.1"; sha256 = "0jmm9h607f7k20yassm6af9mh5l00yih5248wwv4i05bd68yw3p5"; @@ -29,7 +29,7 @@ stdenv.mkDerivation { mv lib/udev/hwdb.d/* $out/lib/udev/hwdb.d ''; - meta = with stdenv.lib; { + meta = with lib; { maintainers = [ maintainers.khumba ]; license = [ licenses.gpl2Only ]; platforms = [ "i686-linux" "x86_64-linux" ]; diff --git a/pkgs/os-specific/linux/system76-io/default.nix b/pkgs/os-specific/linux/system76-io/default.nix index dac1e2db1e38..fb697430f61c 100644 --- a/pkgs/os-specific/linux/system76-io/default.nix +++ b/pkgs/os-specific/linux/system76-io/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, kernel }: +{ lib, stdenv, fetchFromGitHub, kernel }: let version = "1.0.1"; sha256 = "0qkgkkjy1isv6ws6hrcal75dxjz98rpnvqbm7agdcc6yv0c17wwh"; @@ -27,7 +27,7 @@ stdenv.mkDerivation { install -D system76-io.ko $out/lib/modules/${kernel.modDirVersion}/misc/system76-io.ko ''; - meta = with stdenv.lib; { + meta = with lib; { maintainers = [ maintainers.khumba ]; license = [ licenses.gpl2Plus ]; platforms = [ "i686-linux" "x86_64-linux" ]; diff --git a/pkgs/os-specific/linux/system76/default.nix b/pkgs/os-specific/linux/system76/default.nix index 02eca1d5bbd5..84c153c2f82e 100644 --- a/pkgs/os-specific/linux/system76/default.nix +++ b/pkgs/os-specific/linux/system76/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, kernel }: +{ lib, stdenv, fetchFromGitHub, kernel }: let version = "1.0.9"; sha256 = "0i4825y2vd679kdjv30ifzj1i1066d3x37z4lgk39hx16993k162"; @@ -29,7 +29,7 @@ stdenv.mkDerivation { mv lib/udev/hwdb.d/* $out/lib/udev/hwdb.d ''; - meta = with stdenv.lib; { + meta = with lib; { maintainers = [ maintainers.khumba ]; license = [ licenses.gpl2Plus ]; platforms = [ "i686-linux" "x86_64-linux" ]; diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index e6cb589c9bfe..2822bffdb51c 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -160,6 +160,90 @@ stdenv.mkDerivation { --replace \ "find_program('objcopy'" \ "find_program('${stdenv.cc.bintools.targetPrefix}objcopy'" + '' + (let + + # The folllowing dlopen patches ensure that all the features that are + # implemented via dlopen(3) are available (or explicitly deactivated) by + # pointing dlopen to the absolute store path instead of relying on the + # linkers runtime lookup code. + # + # All of the dlopen calls have to be handled. When new ones are introduced + # by upstream (or one of our patches) they must be explicitly declared, + # otherwise the build will fail. + # + # As of systemd version 247 we've seen a few errors like `libpcre2.… not + # found` when using e.g. --grep with journalctl. Those errors should + # become less unexpected now. + # + # There are generally two classes of dlopen(3) calls. Those that we want to + # support and those that should be deactivated / unsupported. This change + # enforces that we handle all dlopen calls explicitly. Meaning: There is + # not a single dlopen call in the source code tree that we did not + # explicitly handle. + # + # In order to do this we introduced a list of attributes that maps from + # shared object name to the package that contains them. The package can be + # null meaning the reference should be nuked and the shared object will + # never be loadable during runtime (because it points at an invalid store + # path location). + # + # To get a list of dynamically loaded libraries issue something like + # `grep -ri 'dlopen("lib' $src` and update the below list. + dlopenLibs = [ + # We did never provide support for libxkbcommon & qrencode + { name = "libxkbcommon.so.0"; pkg = null; } + { name = "libqrencode.so.4"; pkg = null; } + + # We did not provide libpwquality before so it is safe to disable it for + # now. + { name = "libpwquality.so.1"; pkg = null; } + + # Only include cryptsetup if it is enabled. We might not be able to + # provide it during "bootstrap" in e.g. the minimal systemd build as + # cryptsetup has udev (aka systemd) in it's dependencies. + { name = "libcryptsetup.so.12"; pkg = if withCryptsetup then cryptsetup else null; } + + # We are using libidn2 so we only provide that and ignore the others. + # Systemd does this decision during configure time and uses ifdef's to + # enable specific branches. We can safely ignore (nuke) the libidn "v1" + # libraries. + { name = "libidn2.so.0"; pkg = libidn2; } + { name = "libidn.so.12"; pkg = null; } + { name = "libidn.so.11"; pkg = null; } + + # journalctl --grep requires libpcre so lets provide it + { name = "libpcre2-8.so.0"; pkg = pcre2; } + ]; + + patchDlOpen = dl: let + library = "${lib.makeLibraryPath [dl.pkg]}/${dl.name}"; + in if dl.pkg == null then '' + # remove the dependency on the library by replacing it with an invalid path + for file in $(grep -lr 'dlopen("${dl.name}"' src); do + echo "patching dlopen(\"${dl.name}\", …) in $file to an invalid store path ("/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-not-implemented/${dl.name}")…" + substituteInPlace "$file" --replace 'dlopen("${dl.name}"' 'dlopen("/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-not-implemented/${dl.name}"' + done + '' else '' + # ensure that the library we provide actually exists + if ! [ -e ${library} ]; then + echo 'The shared library `${library}` does not exist but was given as subtitute for `${dl.name}`' + exit 1 + fi + # make the path to the dependency explicit + for file in $(grep -lr 'dlopen("${dl.name}"' src); do + echo "patching dlopen(\"${dl.name}\", …) in $file to ${library}…" + substituteInPlace "$file" --replace 'dlopen("${dl.name}"' 'dlopen("${library}"' + done + ''; + in # patch all the dlopen calls to contain absolute paths to the libraries + lib.concatMapStringsSep "\n" patchDlOpen dlopenLibs) + # finally ensure that there are no left-over dlopen calls that we didn't handle + + '' + if grep -qr 'dlopen("[^/]' src; then + echo "Found unhandled dlopen calls: " + grep -r 'dlopen("[^/]' src + exit 1 + fi ''; outputs = [ "out" "man" "dev" ]; diff --git a/pkgs/os-specific/linux/targetcli/default.nix b/pkgs/os-specific/linux/targetcli/default.nix index 94920c4012a4..ba1c063cc054 100644 --- a/pkgs/os-specific/linux/targetcli/default.nix +++ b/pkgs/os-specific/linux/targetcli/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python3, fetchFromGitHub }: +{ lib, stdenv, python3, fetchFromGitHub }: python3.pkgs.buildPythonApplication rec { pname = "targetcli"; @@ -18,7 +18,7 @@ python3.pkgs.buildPythonApplication rec { install -D targetclid.8 -t $out/share/man/man8/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A command shell for managing the Linux LIO kernel target"; homepage = "https://github.com/open-iscsi/targetcli-fb"; license = licenses.asl20; diff --git a/pkgs/os-specific/linux/tiptop/default.nix b/pkgs/os-specific/linux/tiptop/default.nix index 03db9e3bb0ee..c6870d2a4c44 100644 --- a/pkgs/os-specific/linux/tiptop/default.nix +++ b/pkgs/os-specific/linux/tiptop/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, libxml2, ncurses, bison, flex }: +{ lib, stdenv, fetchurl, fetchpatch, libxml2, ncurses, bison, flex }: stdenv.mkDerivation rec { pname = "tiptop"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-I${libxml2.dev}/include/libxml2"; - meta = with stdenv.lib; { + meta = with lib; { description = "Performance monitoring tool for Linux"; homepage = "http://tiptop.gforge.inria.fr"; license = licenses.gpl2; diff --git a/pkgs/os-specific/linux/tmon/default.nix b/pkgs/os-specific/linux/tmon/default.nix index f8438f8d40f0..5a14d3d2ee34 100644 --- a/pkgs/os-specific/linux/tmon/default.nix +++ b/pkgs/os-specific/linux/tmon/default.nix @@ -1,4 +1,4 @@ -{ stdenv, kernel, ncurses }: +{ lib, stdenv, kernel, ncurses }: stdenv.mkDerivation { name = "tmon-${kernel.version}"; @@ -16,7 +16,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Monitoring and Testing Tool for Linux kernel thermal subsystem"; homepage = "https://www.kernel.org/"; license = licenses.gpl2; diff --git a/pkgs/os-specific/linux/tomb/default.nix b/pkgs/os-specific/linux/tomb/default.nix index 0c5a02061b82..438934f07d5b 100644 --- a/pkgs/os-specific/linux/tomb/default.nix +++ b/pkgs/os-specific/linux/tomb/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { --prefix PATH : $out/bin:${lib.makeBinPath [ cryptsetup gettext gnupg pinentry util-linux e2fsprogs ]} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "File encryption on GNU/Linux"; homepage = "https://www.dyne.org/software/tomb/"; license = licenses.gpl3; diff --git a/pkgs/os-specific/linux/trace-cmd/default.nix b/pkgs/os-specific/linux/trace-cmd/default.nix index ddd411702151..27dbc6f583ab 100644 --- a/pkgs/os-specific/linux/trace-cmd/default.nix +++ b/pkgs/os-specific/linux/trace-cmd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, asciidoc, docbook_xsl, libxslt }: +{ lib, stdenv, fetchgit, asciidoc, docbook_xsl, libxslt }: stdenv.mkDerivation { pname = "trace-cmd"; version = "2.9-dev"; @@ -26,7 +26,7 @@ stdenv.mkDerivation { "BASH_COMPLETE_DIR=${placeholder "out"}/share/bash-completion/completions" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "User-space tools for the Linux kernel ftrace subsystem"; homepage = "https://kernelshark.org/"; license = licenses.gpl2; diff --git a/pkgs/os-specific/linux/trace-cmd/kernelshark.nix b/pkgs/os-specific/linux/trace-cmd/kernelshark.nix index 3a280b8af0be..4db4d64bc939 100644 --- a/pkgs/os-specific/linux/trace-cmd/kernelshark.nix +++ b/pkgs/os-specific/linux/trace-cmd/kernelshark.nix @@ -1,4 +1,4 @@ -{ stdenv, mkDerivation, fetchgit, qtbase, cmake, asciidoc, docbook_xsl, json_c, mesa_glu, freeglut, trace-cmd, pkg-config }: +{ lib, stdenv, mkDerivation, fetchgit, qtbase, cmake, asciidoc, docbook_xsl, json_c, mesa_glu, freeglut, trace-cmd, pkg-config }: mkDerivation { pname = "kernelshark"; version = "1.1.0"; @@ -30,7 +30,7 @@ mkDerivation { pushd kernel-shark/build ''; - meta = with stdenv.lib; { + meta = with lib; { description = "GUI for trace-cmd which is an interface for the Linux kernel ftrace subsystem"; homepage = "https://kernelshark.org/"; license = licenses.gpl2; diff --git a/pkgs/os-specific/linux/trezor-udev-rules/default.nix b/pkgs/os-specific/linux/trezor-udev-rules/default.nix index c2be81373768..e5d20171c5cb 100644 --- a/pkgs/os-specific/linux/trezor-udev-rules/default.nix +++ b/pkgs/os-specific/linux/trezor-udev-rules/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "trezor-udev-rules"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { cp 51-trezor.rules $out/lib/udev/rules.d/51-trezor.rules ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Udev rules for Trezor"; license = licenses.gpl3; maintainers = with maintainers; [ prusnak ]; diff --git a/pkgs/os-specific/linux/trinity/default.nix b/pkgs/os-specific/linux/trinity/default.nix index 6d9848ab7126..9bfe0e942eeb 100644 --- a/pkgs/os-specific/linux/trinity/default.nix +++ b/pkgs/os-specific/linux/trinity/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "trinity"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { makeFlags = [ "DESTDIR=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A Linux System call fuzz tester"; homepage = "https://codemonkey.org.uk/projects/trinity/"; license = licenses.gpl2; diff --git a/pkgs/os-specific/linux/turbostat/default.nix b/pkgs/os-specific/linux/turbostat/default.nix index 035dddcc4ec0..fb1bcf582fba 100644 --- a/pkgs/os-specific/linux/turbostat/default.nix +++ b/pkgs/os-specific/linux/turbostat/default.nix @@ -1,4 +1,4 @@ -{ stdenv, kernel, libcap }: +{ lib, stdenv, kernel, libcap }: stdenv.mkDerivation { pname = "turbostat"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { cd tools/power/x86/turbostat ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Report processor frequency and idle statistics"; homepage = "https://www.kernel.org/"; license = licenses.gpl2; diff --git a/pkgs/os-specific/linux/tuxedo-keyboard/default.nix b/pkgs/os-specific/linux/tuxedo-keyboard/default.nix index b67bf2d3dab6..3187ba6d4dbd 100644 --- a/pkgs/os-specific/linux/tuxedo-keyboard/default.nix +++ b/pkgs/os-specific/linux/tuxedo-keyboard/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, kernel, kmod }: +{ lib, stdenv, fetchFromGitHub, kernel, kmod }: stdenv.mkDerivation rec { pname = "tuxedo-keyboard-${kernel.version}"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { mv src/tuxedo_keyboard.ko $out/lib/modules/${kernel.modDirVersion} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Full color keyboard driver for tuxedo computers laptops"; homepage = "https://github.com/tuxedocomputers/tuxedo-keyboard/"; license = licenses.gpl2; diff --git a/pkgs/os-specific/linux/uclibc/default.nix b/pkgs/os-specific/linux/uclibc/default.nix index 125a8608c153..03798b9fe5c2 100644 --- a/pkgs/os-specific/linux/uclibc/default.nix +++ b/pkgs/os-specific/linux/uclibc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPackages +{ lib, stdenv, buildPackages , fetchurl, linuxHeaders, libiconvReal , extraConfig ? "" }: @@ -104,7 +104,7 @@ stdenv.mkDerivation { libiconv = libiconvReal; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://uclibc-ng.org"; description = "A small implementation of the C library"; maintainers = with maintainers; [ rasendubi ]; diff --git a/pkgs/os-specific/linux/udisks/1-default.nix b/pkgs/os-specific/linux/udisks/1-default.nix index 725706f9b0eb..8f48ae017f0f 100644 --- a/pkgs/os-specific/linux/udisks/1-default.nix +++ b/pkgs/os-specific/linux/udisks/1-default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, sg3_utils, udev, glib, dbus, dbus-glib +{ lib, stdenv, fetchurl, pkgconfig, sg3_utils, udev, glib, dbus, dbus-glib , polkit, parted, lvm2, libatasmart, intltool, libuuid, mdadm , libxslt, docbook_xsl, util-linux, libgudev }: @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--localstatedir=/var" "--enable-lvm2" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.freedesktop.org/wiki/Software/udisks"; description = "A daemon and command-line utility for querying and manipulating storage devices"; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/udisks/2-default.nix b/pkgs/os-specific/linux/udisks/2-default.nix index b47d31ab6fdc..1152ab7ca1e0 100644 --- a/pkgs/os-specific/linux/udisks/2-default.nix +++ b/pkgs/os-specific/linux/udisks/2-default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, substituteAll, libtool, pkgconfig, gettext, gnused +{ lib, stdenv, fetchFromGitHub, fetchpatch, substituteAll, libtool, pkgconfig, gettext, gnused , gtk-doc, acl, systemd, glib, libatasmart, polkit, coreutils, bash, which , expat, libxslt, docbook_xsl, util-linux, mdadm, libgudev, libblockdev, parted , gobject-introspection, docbook_xml_dtd_412, docbook_xml_dtd_43, autoconf, automake @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A daemon, tools and libraries to access and manipulate disks, storage devices and technologies"; homepage = "https://www.freedesktop.org/wiki/Software/udisks/"; license = with licenses; [ lgpl2Plus gpl2Plus ]; # lgpl2Plus for the library, gpl2Plus for the tools & daemon diff --git a/pkgs/os-specific/linux/undervolt/default.nix b/pkgs/os-specific/linux/undervolt/default.nix index 2f03ee8c8201..5f4ffb50c07b 100644 --- a/pkgs/os-specific/linux/undervolt/default.nix +++ b/pkgs/os-specific/linux/undervolt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python3Packages }: +{ lib, stdenv, fetchFromGitHub, python3Packages }: python3Packages.buildPythonApplication rec { version = "0.3.0"; @@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec { sha256 = "1aybk8vbb4745raz7rvpkk6b98xrdiwjhkpbv3kwsgsr9sj42lp0"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/georgewhewell/undervolt/"; description = "A program for undervolting Intel CPUs on Linux"; diff --git a/pkgs/os-specific/linux/untie/default.nix b/pkgs/os-specific/linux/untie/default.nix index 9ca1c37e11b4..947ae2ca8d8b 100644 --- a/pkgs/os-specific/linux/untie/default.nix +++ b/pkgs/os-specific/linux/untie/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "untie"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A tool to run processes untied from some of the namespaces"; maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/upower/default.nix b/pkgs/os-specific/linux/upower/default.nix index e9d9eff007cd..3a5fb4fa2613 100644 --- a/pkgs/os-specific/linux/upower/default.nix +++ b/pkgs/os-specific/linux/upower/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , pkgconfig , libxslt @@ -62,7 +62,7 @@ stdenv.mkDerivation { "sysconfdir=${placeholder "out"}/etc" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://upower.freedesktop.org/"; description = "A D-Bus service for power management"; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/usbip/default.nix b/pkgs/os-specific/linux/usbip/default.nix index 9a009b74f083..923eab71b7a8 100644 --- a/pkgs/os-specific/linux/usbip/default.nix +++ b/pkgs/os-specific/linux/usbip/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { ./autogen.sh ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/torvalds/linux/tree/master/tools/usb/usbip"; description = "allows to pass USB device from server to client over the network"; license = licenses.gpl2; diff --git a/pkgs/os-specific/linux/usbtop/default.nix b/pkgs/os-specific/linux/usbtop/default.nix index 0ff8fcf0ddf7..6948d51e5dc7 100644 --- a/pkgs/os-specific/linux/usbtop/default.nix +++ b/pkgs/os-specific/linux/usbtop/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , cmake , libpcap, boost }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ libpcap boost ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/aguinet/usbtop"; description = "A top utility that shows an estimated instantaneous bandwidth on USB buses and devices"; maintainers = with maintainers; [ etu ]; diff --git a/pkgs/os-specific/linux/usbutils/default.nix b/pkgs/os-specific/linux/usbutils/default.nix index 41db602bce50..a723c18e8426 100644 --- a/pkgs/os-specific/linux/usbutils/default.nix +++ b/pkgs/os-specific/linux/usbutils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, substituteAll, autoreconfHook, pkgconfig, libusb1, hwdata , python3 }: +{ lib, stdenv, fetchurl, substituteAll, autoreconfHook, pkgconfig, libusb1, hwdata , python3 }: stdenv.mkDerivation rec { name = "usbutils-012"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { moveToOutput "bin/lsusb.py" "$python" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.linux-usb.org/"; description = "Tools for working with USB devices, such as lsusb"; license = licenses.gpl2Plus; diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix index 4f8f7cae7f8a..600d10888c56 100644 --- a/pkgs/os-specific/linux/util-linux/default.nix +++ b/pkgs/os-specific/linux/util-linux/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, zlib, shadow +{ lib, stdenv, fetchurl, fetchpatch, pkgconfig, zlib, shadow , ncurses ? null, perl ? null, pam, systemd ? null, minimal ? false }: stdenv.mkDerivation rec { @@ -12,6 +12,11 @@ stdenv.mkDerivation rec { patches = [ ./rtcwake-search-PATH-for-shutdown.patch + # Remove patch below in 2.36.2, see https://github.com/karelzak/util-linux/issues/1193 + (fetchpatch { + url = "https://github.com/karelzak/util-linux/commit/52f730e47869ce630fafb24fd46f755dc7ffc691.patch"; + sha256 = "1fz3p9127lfvmrdj1j1s8jds0jjz2dzkvmia66555ihv7hcfajbg"; + }) ]; outputs = [ "bin" "dev" "out" "man" ]; diff --git a/pkgs/os-specific/linux/uvcdynctrl/default.nix b/pkgs/os-specific/linux/uvcdynctrl/default.nix index f022023fcbb0..3d7fe1f5e150 100644 --- a/pkgs/os-specific/linux/uvcdynctrl/default.nix +++ b/pkgs/os-specific/linux/uvcdynctrl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, libxml2 }: +{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, libxml2 }: stdenv.mkDerivation { version = "0.3.0"; @@ -27,7 +27,7 @@ stdenv.mkDerivation { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A simple interface for devices supported by the linux UVC driver"; homepage = "http://guvcview.sourceforge.net"; license = licenses.gpl3Plus; diff --git a/pkgs/os-specific/linux/v4l-utils/default.nix b/pkgs/os-specific/linux/v4l-utils/default.nix index 2c9b395949aa..b9cbd48944c3 100644 --- a/pkgs/os-specific/linux/v4l-utils/default.nix +++ b/pkgs/os-specific/linux/v4l-utils/default.nix @@ -44,7 +44,7 @@ in stdenv.mkDerivation rec { patchShebangs utils/libcecutil/cec-gen.pl ''; - meta = with stdenv.lib; { + meta = with lib; { description = "V4L utils and libv4l, provide common image formats regardless of the v4l device"; homepage = "https://linuxtv.org/projects.php"; license = licenses.lgpl21Plus; diff --git a/pkgs/os-specific/linux/v4l2loopback/default.nix b/pkgs/os-specific/linux/v4l2loopback/default.nix index 32ae45fbb0ea..5e0125da00a6 100644 --- a/pkgs/os-specific/linux/v4l2loopback/default.nix +++ b/pkgs/os-specific/linux/v4l2loopback/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, kernel, kmod }: +{ lib, stdenv, fetchFromGitHub, kernel, kmod }: stdenv.mkDerivation rec { name = "v4l2loopback-${version}-${kernel.version}"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { "KERNEL_DIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A kernel module to create V4L2 loopback devices"; homepage = "https://github.com/umlaeute/v4l2loopback"; license = licenses.gpl2; diff --git a/pkgs/os-specific/linux/v86d/default.nix b/pkgs/os-specific/linux/v86d/default.nix index ec0c318042a1..36270cdfcc0e 100644 --- a/pkgs/os-specific/linux/v86d/default.nix +++ b/pkgs/os-specific/linux/v86d/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , kernel, klibc }: @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { buildInputs = [ klibc ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A daemon to run x86 code in an emulated environment"; homepage = "https://github.com/mjanusz/v86d"; license = licenses.gpl2; diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix index 25a59b14ab82..590e16f7993f 100644 --- a/pkgs/os-specific/linux/wireguard/default.nix +++ b/pkgs/os-specific/linux/wireguard/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, kernel, perl, wireguard-tools, bc }: +{ lib, stdenv, fetchzip, kernel, perl, wireguard-tools, bc }: # module requires Linux >= 3.10 https://www.wireguard.io/install/#kernel-requirements assert stdenv.lib.versionAtLeast kernel.version "3.10"; @@ -7,11 +7,11 @@ assert stdenv.lib.versionOlder kernel.version "5.6"; stdenv.mkDerivation rec { pname = "wireguard"; - version = "1.0.20201112"; + version = "1.0.20201221"; src = fetchzip { url = "https://git.zx2c4.com/wireguard-linux-compat/snapshot/wireguard-linux-compat-${version}.tar.xz"; - sha256 = "sha256-HnYvjZ3VUH79NwNIvyTTygWYbVqEL2ttvlOlLiHhb5s="; + sha256 = "sha256-8RPJEk+6NaJP3LNZYEncLlkdrw2jHxNekKwEr+YpHeQ="; }; hardeningDisable = [ "pic" ]; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { inherit (wireguard-tools) tests; }; - meta = with stdenv.lib; { + meta = with lib; { inherit (wireguard-tools.meta) homepage license maintainers; description = "Kernel module for the WireGuard secure network tunnel"; downloadPage = "https://git.zx2c4.com/wireguard-linux-compat/refs/"; diff --git a/pkgs/os-specific/linux/wooting-udev-rules/default.nix b/pkgs/os-specific/linux/wooting-udev-rules/default.nix index 0093603c250c..75924ad02a72 100644 --- a/pkgs/os-specific/linux/wooting-udev-rules/default.nix +++ b/pkgs/os-specific/linux/wooting-udev-rules/default.nix @@ -1,4 +1,4 @@ -{ stdenv }: +{ lib, stdenv }: stdenv.mkDerivation rec { pname = "wooting-udev-rules"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { install -Dpm644 $src $out/lib/udev/rules.d/70-wooting.rules ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://wooting.helpscoutdocs.com/article/34-linux-udev-rules"; description = "udev rules that give NixOS permission to communicate with Wooting keyboards"; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix index 5cd440bcdfc7..7703ffc0e4f1 100644 --- a/pkgs/os-specific/linux/wpa_supplicant/default.nix +++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl, pkgconfig, libnl +{ lib, stdenv, fetchurl, openssl, pkgconfig, libnl , dbus, readline ? null, pcsclite ? null }: @@ -104,7 +104,7 @@ stdenv.mkDerivation rec { install -Dm444 wpa_supplicant.conf $out/share/doc/wpa_supplicant/wpa_supplicant.conf.example ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://hostap.epitest.fi/wpa_supplicant/"; description = "A tool for connecting to WPA and WPA2-protected wireless networks"; license = licenses.bsd3; diff --git a/pkgs/os-specific/linux/wpa_supplicant/gui.nix b/pkgs/os-specific/linux/wpa_supplicant/gui.nix index 132cad4b6d29..ab1cece0f339 100644 --- a/pkgs/os-specific/linux/wpa_supplicant/gui.nix +++ b/pkgs/os-specific/linux/wpa_supplicant/gui.nix @@ -1,4 +1,4 @@ -{ stdenv, mkDerivation, fetchpatch, qtbase, qmake, inkscape, imagemagick, wpa_supplicant }: +{ lib, stdenv, mkDerivation, fetchpatch, qtbase, qmake, inkscape, imagemagick, wpa_supplicant }: mkDerivation { name = "wpa_gui-${wpa_supplicant.version}"; @@ -32,7 +32,7 @@ mkDerivation { cp -av icons/hicolor $out/share/icons ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Qt-based GUI for wpa_supplicant"; homepage = "https://hostap.epitest.fi/wpa_supplicant/"; license = licenses.bsd3; diff --git a/pkgs/os-specific/linux/x86_energy_perf_policy/default.nix b/pkgs/os-specific/linux/x86_energy_perf_policy/default.nix index 880456afbde2..4b57ed4ceae5 100644 --- a/pkgs/os-specific/linux/x86_energy_perf_policy/default.nix +++ b/pkgs/os-specific/linux/x86_energy_perf_policy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, kernel }: +{ lib, stdenv, kernel }: stdenv.mkDerivation { name = "x86_energy_perf_policy-${kernel.version}"; @@ -16,7 +16,7 @@ stdenv.mkDerivation { makeFlags = [ "DESTDIR=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Set the energy versus performance policy preference bias on recent X86 processors"; homepage = "https://www.kernel.org/"; license = licenses.gpl2; diff --git a/pkgs/os-specific/linux/xf86-input-cmt/default.nix b/pkgs/os-specific/linux/xf86-input-cmt/default.nix index 93fd7dd5b0e6..e3ac4df2fd78 100644 --- a/pkgs/os-specific/linux/xf86-input-cmt/default.nix +++ b/pkgs/os-specific/linux/xf86-input-cmt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, xorgserver, xorgproto, +{ lib, stdenv, fetchFromGitHub, pkgconfig, xorgserver, xorgproto, utilmacros, libgestures, libevdevc }: stdenv.mkDerivation rec { @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { "--with-sdkdir=${placeholder "out"}" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Chromebook touchpad driver"; license = licenses.bsd3; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/xf86-input-wacom/default.nix b/pkgs/os-specific/linux/xf86-input-wacom/default.nix index 8a7541afa692..bea1871b0eb8 100644 --- a/pkgs/os-specific/linux/xf86-input-wacom/default.nix +++ b/pkgs/os-specific/linux/xf86-input-wacom/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , xorgproto, libX11, libXext, libXi, libXrandr, libXrender , ncurses, pkgconfig, xorgserver, udev, libXinerama, pixman }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { CFLAGS = "-I${pixman}/include/pixman-1"; - meta = with stdenv.lib; { + meta = with lib; { maintainers = [ maintainers.goibhniu ]; description = "Wacom digitizer driver for X11"; homepage = "http://linuxwacom.sourceforge.net"; diff --git a/pkgs/os-specific/linux/xf86-video-nested/default.nix b/pkgs/os-specific/linux/xf86-video-nested/default.nix index f86393cba84d..dbd59d530ce8 100644 --- a/pkgs/os-specific/linux/xf86-video-nested/default.nix +++ b/pkgs/os-specific/linux/xf86-video-nested/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, autoreconfHook, xorgproto, libX11, libXext +{ lib, stdenv, fetchgit, autoreconfHook, xorgproto, libX11, libXext , pixman, pkgconfig, utilmacros, xorgserver }: @@ -20,7 +20,7 @@ stdenv.mkDerivation { CFLAGS = "-I${pixman}/include/pixman-1"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://cgit.freedesktop.org/xorg/driver/xf86-video-nested"; description = "A driver to run Xorg on top of Xorg or something else"; maintainers = [ maintainers.goibhniu ]; diff --git a/pkgs/os-specific/linux/zenmonitor/default.nix b/pkgs/os-specific/linux/zenmonitor/default.nix index 23acaaa3e231..4fc2a11a65fb 100644 --- a/pkgs/os-specific/linux/zenmonitor/default.nix +++ b/pkgs/os-specific/linux/zenmonitor/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, gtk3, wrapGAppsHook }: +{ lib, stdenv, fetchFromGitHub, pkgconfig, gtk3, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "zenmonitor"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=${placeholder "out"}" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Monitoring software for AMD Zen-based CPUs"; homepage = "https://github.com/ocerman/zenmonitor"; license = licenses.mit; diff --git a/pkgs/os-specific/linux/zenpower/default.nix b/pkgs/os-specific/linux/zenpower/default.nix index 43885027d9e7..af59ec8e37bf 100644 --- a/pkgs/os-specific/linux/zenpower/default.nix +++ b/pkgs/os-specific/linux/zenpower/default.nix @@ -1,4 +1,4 @@ -{ stdenv, kernel, fetchFromGitHub, fetchpatch }: +{ lib, stdenv, kernel, fetchFromGitHub, fetchpatch }: stdenv.mkDerivation rec { pname = "zenpower"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { install -D zenpower.ko -t "$out/lib/modules/${kernel.modDirVersion}/kernel/drivers/hwmon/zenpower/" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Linux kernel driver for reading temperature, voltage(SVI2), current(SVI2) and power(SVI2) for AMD Zen family CPUs."; homepage = "https://github.com/ocerman/zenpower"; license = licenses.gpl2; diff --git a/pkgs/os-specific/linux/zenstates/default.nix b/pkgs/os-specific/linux/zenstates/default.nix index 4ac77c00aa3b..a56337cfef22 100644 --- a/pkgs/os-specific/linux/zenstates/default.nix +++ b/pkgs/os-specific/linux/zenstates/default.nix @@ -21,7 +21,7 @@ # before = [ "sleep.target" ]; # }; -{ stdenv, fetchFromGitHub, python3 }: +{ lib, stdenv, fetchFromGitHub, python3 }: stdenv.mkDerivation rec { pname = "zenstates"; version = "0.0.1"; @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { patchShebangs --build $out/bin/zenstates ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Linux utility for Ryzen processors and motherboards"; homepage = "https://github.com/r4m0n/ZenStates-Linux"; license = licenses.mit; diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index a2464aeb5865..59719922987b 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, fetchpatch -, autoreconfHook, util-linux, nukeReferences, coreutils +, autoreconfHook269, util-linux, nukeReferences, coreutils , perl, buildPackages , configFile ? "all" @@ -89,7 +89,7 @@ let "PATH=${makeBinPath [ coreutils gawk gnused gnugrep systemd ]}" ''; - nativeBuildInputs = [ autoreconfHook nukeReferences ] + nativeBuildInputs = [ autoreconfHook269 nukeReferences ] ++ optionals buildKernel (kernel.moduleBuildDependencies ++ [ perl ]) ++ optional buildUser pkgconfig; buildInputs = optionals buildUser [ zlib libuuid attr libtirpc ] @@ -176,11 +176,6 @@ let maintainers = with maintainers; [ hmenke jcumming jonringer wizeman fpletz globin mic92 ]; }; }; - - linux-rt-patch = fetchpatch { - url = "https://github.com/openzfs/zfs/commit/ab4fb9b74e9d089fc9a261c4f41e19697ad6a4ca.patch"; - sha256 = "1nrxmb4rhrkgncav6dzwm66l0700fi72qkkcs0w6pkm850srws36"; - }; in { # also check if kernel version constraints in # ./nixos/modules/tasks/filesystems/zfs.nix needs @@ -190,11 +185,11 @@ in { # incompatibleKernelVersion = "4.20"; # this package should point to the latest release. - version = "2.0.0"; + version = "2.0.1"; - sha256 = "1kriz6pg8wj98izvjc60wp23lgcp4k3mzhpkgj74np73rzgy6v8r"; + sha256 = "0wmw823ildwm9rcfyk22pvzg100yhps3y9hfjlrpspfd1hhkbp0d"; - extraPatches = [ linux-rt-patch ]; + extraPatches = [ ]; }; zfsUnstable = common { @@ -202,10 +197,10 @@ in { # incompatibleKernelVersion = "4.19"; # this package should point to a version / git revision compatible with the latest kernel release - version = "2.0.0"; + version = "2.0.1"; - sha256 = "1kriz6pg8wj98izvjc60wp23lgcp4k3mzhpkgj74np73rzgy6v8r"; + sha256 = "0wmw823ildwm9rcfyk22pvzg100yhps3y9hfjlrpspfd1hhkbp0d"; - extraPatches = [ linux-rt-patch ]; + extraPatches = [ ]; }; } diff --git a/pkgs/os-specific/linux/zsa-udev-rules/default.nix b/pkgs/os-specific/linux/zsa-udev-rules/default.nix index 76150affe49f..ac69dc13b474 100644 --- a/pkgs/os-specific/linux/zsa-udev-rules/default.nix +++ b/pkgs/os-specific/linux/zsa-udev-rules/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation { pname = "zsa-udev-rules"; @@ -23,7 +23,7 @@ stdenv.mkDerivation { cp dist/linux64/50-wally.rules $out/lib/udev/rules.d/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "udev rules for ZSA devices"; license = licenses.mit; maintainers = with maintainers; [ davidak ]; diff --git a/pkgs/os-specific/windows/pthread-w32/default.nix b/pkgs/os-specific/windows/pthread-w32/default.nix index 257067339674..de909828f7a2 100644 --- a/pkgs/os-specific/windows/pthread-w32/default.nix +++ b/pkgs/os-specific/windows/pthread-w32/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip }: +{ lib, stdenv, fetchzip }: stdenv.mkDerivation { pname = "pthreads-w32"; @@ -19,7 +19,7 @@ stdenv.mkDerivation { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "POSIX threads library for Windows"; homepage = "https://sourceware.org/pthreads-win32"; license = licenses.lgpl21Plus; diff --git a/pkgs/servers/adguardhome/default.nix b/pkgs/servers/adguardhome/default.nix index 0194ce6afa7a..58996a6e85ac 100644 --- a/pkgs/servers/adguardhome/default.nix +++ b/pkgs/servers/adguardhome/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "adguardhome"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { install -m755 -D ./AdGuardHome $out/bin/adguardhome ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/AdguardTeam/AdGuardHome"; description = "Network-wide ads & trackers blocking DNS server"; platforms = platforms.linux; diff --git a/pkgs/servers/adminer/default.nix b/pkgs/servers/adminer/default.nix index 65a4dc37ecc8..2774c8d1f289 100644 --- a/pkgs/servers/adminer/default.nix +++ b/pkgs/servers/adminer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, libbsd, fetchurl, phpPackages, php }: +{ lib, stdenv, fetchurl, php }: stdenv.mkDerivation rec { version = "4.7.8"; @@ -10,22 +10,36 @@ stdenv.mkDerivation rec { sha256 = "0k794agvd8pa3mwl0076i7753fzxd41lhr23aih4l2lbdgnzi68z"; }; - nativeBuildInputs = with phpPackages; [ php composer ]; + nativeBuildInputs = [ + php + php.packages.composer + ]; buildPhase = '' + runHook preBuild + composer --no-cache run compile + + runHook postBuild ''; installPhase = '' + runHook preInstall + mkdir $out cp adminer-${version}.php $out/adminer.php + + runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Database management in a single PHP file"; homepage = "https://www.adminer.org"; - license = with licenses; [ asl20 gpl2 ]; - maintainers = with maintainers; [ sstef ]; + license = with licenses; [ asl20 gpl2Only ]; + maintainers = with maintainers; [ + jtojnar + sstef + ]; platforms = platforms.all; }; } diff --git a/pkgs/servers/amqp/qpid-cpp/default.nix b/pkgs/servers/amqp/qpid-cpp/default.nix index 4f7186f31404..d65ad1301139 100644 --- a/pkgs/servers/amqp/qpid-cpp/default.nix +++ b/pkgs/servers/amqp/qpid-cpp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, python2, boost, libuuid, ruby, buildEnv, buildPythonPackage, qpid-python }: +{ lib, stdenv, fetchurl, cmake, python2, boost, libuuid, ruby, buildEnv, buildPythonPackage, qpid-python }: let pname = "qpid-cpp"; @@ -10,7 +10,7 @@ let sha256 = "088dx1l6myrksbhpr15bs09j6qm8vdliqwjp2ja5amym47md103r"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://qpid.apache.org"; repositories.git = "git://git.apache.org/qpid.git"; repositories.svn = "http://svn.apache.org/repos/asf/qpid"; diff --git a/pkgs/servers/apache-kafka/default.nix b/pkgs/servers/apache-kafka/default.nix index 9ab14140c67f..826e952376c7 100644 --- a/pkgs/servers/apache-kafka/default.nix +++ b/pkgs/servers/apache-kafka/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jre8, makeWrapper, bash, coreutils, gnugrep, gnused, ps, +{ lib, stdenv, fetchurl, jre8, makeWrapper, bash, coreutils, gnugrep, gnused, ps, majorVersion ? "1.0" }: let @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { chmod +x $out/bin\/* ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://kafka.apache.org"; description = "A high-throughput distributed messaging system"; license = licenses.asl20; diff --git a/pkgs/servers/apcupsd/default.nix b/pkgs/servers/apcupsd/default.nix index bdbb77faf6c1..07bfcfd26736 100644 --- a/pkgs/servers/apcupsd/default.nix +++ b/pkgs/servers/apcupsd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, systemd, util-linux, coreutils, wall, hostname, man +{ lib, stdenv, fetchurl, pkgconfig, systemd, util-linux, coreutils, wall, hostname, man , enableCgiScripts ? true, gd }: @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Daemon for controlling APC UPSes"; homepage = "http://www.apcupsd.com/"; license = licenses.gpl2; diff --git a/pkgs/servers/asterisk/default.nix b/pkgs/servers/asterisk/default.nix index 6e960bd92fe9..26d361e97c20 100644 --- a/pkgs/servers/asterisk/default.nix +++ b/pkgs/servers/asterisk/default.nix @@ -71,7 +71,7 @@ let ${lib.optionalString (lib.versionAtLeast version "17.0.0") "make install-headers"} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Software implementation of a telephone private branch exchange (PBX)"; homepage = "https://www.asterisk.org/"; license = licenses.gpl2; diff --git a/pkgs/servers/asterisk/sccp/default.nix b/pkgs/servers/asterisk/sccp/default.nix index 827b26255cf0..a830c5bdbd4a 100644 --- a/pkgs/servers/asterisk/sccp/default.nix +++ b/pkgs/servers/asterisk/sccp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, binutils-unwrapped, patchelf, asterisk }: +{ lib, stdenv, fetchFromGitHub, binutils-unwrapped, patchelf, asterisk }: stdenv.mkDerivation rec { pname = "asterisk-module-sccp"; version = "4.3.2-epsilon"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { patchelf --set-rpath "$p:${stdenv.lib.makeLibraryPath [ binutils-unwrapped ]}" "$p" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Replacement for the SCCP channel driver in Asterisk"; license = licenses.gpl1Only; maintainers = with maintainers; [ das_j ]; diff --git a/pkgs/servers/atlassian/crowd.nix b/pkgs/servers/atlassian/crowd.nix index 44d9aba582ef..6fec1b5960e0 100644 --- a/pkgs/servers/atlassian/crowd.nix +++ b/pkgs/servers/atlassian/crowd.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, home ? "/var/lib/crowd" +{ lib, stdenv, fetchurl, home ? "/var/lib/crowd" , port ? 8092, proxyUrl ? null, openidPassword ? "WILL_NEVER_BE_SET" }: stdenv.mkDerivation rec { @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { cp -rva . $out ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Single sign-on and identity management tool"; homepage = "https://www.atlassian.com/software/crowd"; license = licenses.unfree; diff --git a/pkgs/servers/atlassian/jira.nix b/pkgs/servers/atlassian/jira.nix index 66d26dbde760..995ff8625914 100644 --- a/pkgs/servers/atlassian/jira.nix +++ b/pkgs/servers/atlassian/jira.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { cp -rva . $out ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Proprietary issue tracking product, also providing project management functions"; homepage = "https://www.atlassian.com/software/jira"; license = licenses.unfree; diff --git a/pkgs/servers/beanstalkd/default.nix b/pkgs/servers/beanstalkd/default.nix index d81feb3b72ef..01af8a4d5bc8 100644 --- a/pkgs/servers/beanstalkd/default.nix +++ b/pkgs/servers/beanstalkd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, installShellFiles }: +{ lib, stdenv, fetchurl, installShellFiles }: stdenv.mkDerivation rec { version = "1.12"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { installManPage doc/beanstalkd.1 ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://kr.github.io/beanstalkd/"; description = "A simple, fast work queue"; license = licenses.mit; diff --git a/pkgs/servers/blockbook/default.nix b/pkgs/servers/blockbook/default.nix index 5a4111269913..ceff2139414d 100644 --- a/pkgs/servers/blockbook/default.nix +++ b/pkgs/servers/blockbook/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildGoModule , fetchFromGitHub , packr @@ -54,7 +54,7 @@ buildGoModule rec { cp -r $src/static/css/ $out/share/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Trezor address/account balance backend"; homepage = "https://github.com/trezor/blockbook"; license = licenses.agpl3; diff --git a/pkgs/servers/caddy/default.nix b/pkgs/servers/caddy/default.nix index 1eb33dc32267..d48bcad17946 100644 --- a/pkgs/servers/caddy/default.nix +++ b/pkgs/servers/caddy/default.nix @@ -1,8 +1,8 @@ -{ stdenv, buildGoModule, fetchFromGitHub, nixosTests }: +{ lib, stdenv, buildGoModule, fetchFromGitHub, nixosTests }: buildGoModule rec { pname = "caddy"; - version = "2.2.1"; + version = "2.3.0"; subPackages = [ "cmd/caddy" ]; @@ -10,14 +10,14 @@ buildGoModule rec { owner = "caddyserver"; repo = pname; rev = "v${version}"; - sha256 = "065kxnyapjk4r07qrr55zs5w72p8rb8mapq3dh9lr1y13b8sgka9"; + sha256 = "03cbbr8z9g156lgx7pyn1p1i4mh8ayhhhv24r1z3h1vgq6y4ka7r"; }; - vendorSha256 = "1rm7v03v6rf9fdqrrl639z8a46cdzswjp8rdpygcsndqfznn5w7b"; + vendorSha256 = "0gpzxjiyv7l1nibh1gas4mvinamiyyfgidd8cy4abz95v6z437lp"; passthru.tests = { inherit (nixosTests) caddy; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://caddyserver.com"; description = "Fast, cross-platform HTTP/2 web server with automatic HTTPS"; license = licenses.asl20; diff --git a/pkgs/servers/clickhouse/default.nix b/pkgs/servers/clickhouse/default.nix index da73bc3c6012..063964b2f6a6 100644 --- a/pkgs/servers/clickhouse/default.nix +++ b/pkgs/servers/clickhouse/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, cmake, libtool, lldClang, ninja +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, libtool, lldClang, ninja , boost, brotli, capnproto, cctz, clang-unwrapped, double-conversion , icu, jemalloc, libcpuid, libxml2, lld, llvm, lz4, libmysqlclient, openssl, perl , poco, protobuf, python3, rapidjson, re2, rdkafka, readline, sparsehash, unixODBC @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://clickhouse.tech/"; description = "Column-oriented database management system"; license = licenses.asl20; diff --git a/pkgs/servers/cloud-print-connector/default.nix b/pkgs/servers/cloud-print-connector/default.nix index e81993100274..8e1ef8312691 100644 --- a/pkgs/servers/cloud-print-connector/default.nix +++ b/pkgs/servers/cloud-print-connector/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, avahi, cups, fetchpatch }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub, avahi, cups, fetchpatch }: # TODO: Add a service for gcp-cups-connector and perhaps some other # kind of configuration for the same thing that gcp-connector-util @@ -52,7 +52,7 @@ buildGoPackage rec { buildInputs = [ avahi cups ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Share printers from your Windows, Linux, FreeBSD or macOS computer with ChromeOS and Android devices, using the Cloud Print Connector"; homepage = "https://github.com/google/cloud-print-connector"; license = licenses.bsd3; diff --git a/pkgs/servers/code-server/default.nix b/pkgs/servers/code-server/default.nix index c62fc072ecb7..60b4d57c6477 100644 --- a/pkgs/servers/code-server/default.nix +++ b/pkgs/servers/code-server/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, makeWrapper, runCommand +{ lib, stdenv, fetchFromGitHub, buildGoModule, makeWrapper, runCommand , moreutils, jq, git, zip, rsync, pkgconfig, yarn, python2 , nodejs-12_x, libsecret, xorg, ripgrep, nettools }: @@ -12,17 +12,31 @@ let in stdenv.mkDerivation rec { pname = "code-server"; - version = "3.4.1"; - commit = "d3773c11f147bdd7a4f5acfefdee23c26f069e76"; + version = "3.6.0"; + commit = "a4a03c14922ccaec2a9ff8d1b7b2af8522a4214d"; src = fetchFromGitHub { owner = "cdr"; repo = "code-server"; - rev = version; - sha256 = "PfDD0waloppGZ09zCQ9ggBeVL/Dhfv6QmEs/fs7QLtA="; + rev = "v${version}"; + sha256 = "1c0p1s0bl3az5ysl97mz3gbynyndz6jd2jj7lx2snz6jqqd43y9p"; fetchSubmodules = true; }; + cloudAgent = buildGoModule rec { + pname = "cloud-agent"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "cdr"; + repo = "cloud-agent"; + rev = version; + sha256 = "1p20cvgvs38604km9ixylz0r3k7blkd80lncmma3z05y5n5fqps1"; + }; + + vendorSha256 = "0yky1v1ak3ysykjf3gm1hd7qyj5rm4fw7amga81sb31x0357jlzr"; + }; + yarnCache = stdenv.mkDerivation { name = "${pname}-${version}-${system}-yarn-cache"; inherit src; @@ -45,10 +59,10 @@ in stdenv.mkDerivation rec { outputHashMode = "recursive"; outputHashAlgo = "sha256"; - # to get hash values use nix-build -A code-server.yarnPrefetchCache + # to get hash values use nix-build -A code-server.prefetchYarnCache outputHash = { - x86_64-linux = "Zze2hEm2Np+SyQ0KXy5CZr5wilZbHBYXNYcRJBUUkQo="; - aarch64-linux = "LiIvGuBismWSL2yV2DuKUWDjIzuIQU/VVxtiD4xJ+6Q="; + x86_64-linux = "1443qwkllb714s4qw3b9y1mcc6p2ykgc02pw2k3z2gczvvr0g8qv"; + aarch64-linux = "1443qwkllb714s4qw3b9y1mcc6p2ykgc02pw2k3z2gczvvr0g8qv"; }.${system} or (throw "Unsupported system ${system}"); }; @@ -64,7 +78,7 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ libsecret xorg.libX11 xorg.libxkbfile ]; - patchPhase = '' + postPatch = '' export HOME=$PWD patchShebangs ./ci @@ -76,6 +90,21 @@ in stdenv.mkDerivation rec { substituteInPlace lib/vscode/build/npm/postinstall.js \ --replace '--ignore-optional' '--offline' + # remove unnecessary git config command + substituteInPlace lib/vscode/build/npm/postinstall.js \ + --replace "cp.execSync('git config pull.rebase true');" "" + + # allow offline install for postinstall scripts in extensions + grep -rl "yarn install" --include package.json lib/vscode/extensions \ + | xargs sed -i 's/yarn install/yarn install --offline/g' + + # remove download of coder-cloud agent + sed -i ':a;N;$!ba;s/OS=.*agent//' ci/build/npm-postinstall.sh + + # use offline cache when installing release packages + substituteInPlace ci/build/npm-postinstall.sh \ + --replace 'yarn --production' 'yarn --production --offline' + # fix path to ifconfig, so vscode can get mac address substituteInPlace lib/vscode/src/vs/base/node/macAddress.ts \ --replace '/sbin/ifconfig' '${nettools}/bin/ifconfig' @@ -111,8 +140,14 @@ in stdenv.mkDerivation rec { # set nodedir, so we can build binaries later npm config set nodedir "${nodeSources}" + # link coder-cloud agent from nix store + ln -s "${cloudAgent}/bin/cloud-agent" ./lib/coder-cloud-agent + # skip browser downloads for playwright export PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD="true" + + # skip unnecessary electron download + export ELECTRON_SKIP_BINARY_DOWNLOAD=1 ''; buildPhase = '' @@ -162,6 +197,9 @@ in stdenv.mkDerivation rec { # install only production dependencies yarn --offline --cwd "$out/libexec/code-server" --production + # link coder-cloud agent from nix store + ln -s "${cloudAgent}/bin/cloud-agent" $out/libexec/code-server/lib/coder-cloud-agent + # create wrapper makeWrapper "${nodejs-12_x}/bin/node" "$out/bin/code-server" \ --add-flags "$out/libexec/code-server/out/node/entry.js" @@ -173,7 +211,7 @@ in stdenv.mkDerivation rec { }); }; - meta = with stdenv.lib; { + meta = with lib; { description = "Run VS Code on a remote server"; longDescription = '' code-server is VS Code running on a remote server, accessible through the diff --git a/pkgs/servers/computing/slurm-spank-x11/default.nix b/pkgs/servers/computing/slurm-spank-x11/default.nix index bb7885025d19..8e64185e71c6 100644 --- a/pkgs/servers/computing/slurm-spank-x11/default.nix +++ b/pkgs/servers/computing/slurm-spank-x11/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, slurm } : +{ lib, stdenv, fetchFromGitHub, slurm } : let version = "0.2.5"; in @@ -26,7 +26,7 @@ stdenv.mkDerivation { install -m 755 x11.so $out/lib ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/hautreux/slurm-spank-x11"; description = "Plugin for SLURM to allow for interactive X11 sessions"; platforms = platforms.linux; diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix index 9e2c482e0d96..d5a2c030c115 100644 --- a/pkgs/servers/computing/slurm/default.nix +++ b/pkgs/servers/computing/slurm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, libtool, curl +{ lib, stdenv, fetchFromGitHub, pkgconfig, libtool, curl , python3, munge, perl, pam, zlib, shadow, coreutils , ncurses, libmysqlclient, gtk2, lua, hwloc, numactl , readline, freeipmi, xorg, lz4, rdma-core, nixosTests @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { passthru.tests.slurm = nixosTests.slurm; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.schedmd.com/"; description = "Simple Linux Utility for Resource Management"; platforms = platforms.linux; diff --git a/pkgs/servers/computing/storm/default.nix b/pkgs/servers/computing/storm/default.nix index 541e9f6e11b5..e961e1cf2c94 100644 --- a/pkgs/servers/computing/storm/default.nix +++ b/pkgs/servers/computing/storm/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { dontStrip = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://storm.apache.org"; description = "Distributed realtime computation system"; license = licenses.asl20; diff --git a/pkgs/servers/computing/torque/default.nix b/pkgs/servers/computing/torque/default.nix index de358a5d66f8..28651752dd19 100644 --- a/pkgs/servers/computing/torque/default.nix +++ b/pkgs/servers/computing/torque/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, openssl, flex, bison, pkgconfig, groff, libxml2, util-linux +{ lib, stdenv, fetchFromGitHub, openssl, flex, bison, pkgconfig, groff, libxml2, util-linux , coreutils, file, libtool, which, boost, autoreconfHook }: @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { chmod +x $out/bin/pbs_mkdirs $out/bin/torque.setup ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.adaptivecomputing.com/products/open-source/torque"; description = "Resource management system for submitting and controlling jobs on supercomputers, clusters, and grids"; platforms = platforms.linux; diff --git a/pkgs/servers/confluent-platform/default.nix b/pkgs/servers/confluent-platform/default.nix index 52023b39812f..e1cf49099324 100644 --- a/pkgs/servers/confluent-platform/default.nix +++ b/pkgs/servers/confluent-platform/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.confluent.io/"; description = "Confluent event streaming platform based on Apache Kafka"; license = licenses.asl20; diff --git a/pkgs/servers/consul/default.nix b/pkgs/servers/consul/default.nix index 5d741cf0bbac..f319c5f3db19 100644 --- a/pkgs/servers/consul/default.nix +++ b/pkgs/servers/consul/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, nixosTests }: +{ lib, stdenv, buildGoModule, fetchFromGitHub, nixosTests }: buildGoModule rec { pname = "consul"; @@ -39,7 +39,7 @@ buildGoModule rec { -X github.com/hashicorp/consul/version.VersionPrerelease=") ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Tool for service discovery, monitoring and configuration"; homepage = "https://www.consul.io/"; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/servers/coturn/default.nix b/pkgs/servers/coturn/default.nix index c32ddecc7a36..91ecfc113cd0 100644 --- a/pkgs/servers/coturn/default.nix +++ b/pkgs/servers/coturn/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, openssl, libevent }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, openssl, libevent }: stdenv.mkDerivation rec { pname = "coturn"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ./pure-configure.patch ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://coturn.net/"; license = with licenses; [ bsd3 ]; description = "A TURN server"; diff --git a/pkgs/servers/dante/default.nix b/pkgs/servers/dante/default.nix index 6be80c491fd6..99bde454659c 100644 --- a/pkgs/servers/dante/default.nix +++ b/pkgs/servers/dante/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pam, libkrb5, cyrus_sasl, miniupnpc }: +{ lib, stdenv, fetchurl, pam, libkrb5, cyrus_sasl, miniupnpc }: stdenv.mkDerivation rec { pname = "dante"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { dontAddDisableDepTrack = stdenv.isDarwin; - meta = with stdenv.lib; { + meta = with lib; { description = "A circuit-level SOCKS client/server that can be used to provide convenient and secure network connectivity"; homepage = "https://www.inet.no/dante/"; maintainers = [ maintainers.arobyn ]; diff --git a/pkgs/servers/demoit/default.nix b/pkgs/servers/demoit/default.nix index 9a78d5c7c18e..0c6fe8187756 100644 --- a/pkgs/servers/demoit/default.nix +++ b/pkgs/servers/demoit/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildGoModule , fetchFromGitHub }: @@ -16,7 +16,7 @@ buildGoModule { vendorSha256 = null; subPackages = [ "." ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Live coding demos without Context Switching"; homepage = "https://github.com/dgageot/demoit"; license = licenses.asl20; diff --git a/pkgs/servers/dex/default.nix b/pkgs/servers/dex/default.nix index 5886a2ae73a3..677c50010a3d 100644 --- a/pkgs/servers/dex/default.nix +++ b/pkgs/servers/dex/default.nix @@ -1,24 +1,24 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "dex"; - version = "2.23.0"; + version = "2.27.0"; src = fetchFromGitHub { owner = "dexidp"; repo = pname; rev = "v${version}"; - sha256 = "1fr5r7d0xwj0b69jhszyyif4yc4kiy7zpfcpf83zdy12mh8f96c8"; + sha256 = "0n66nm91qcmm00mz8f8x39xqr3y05qxk34fvka53s6xax1gxvxxi"; }; - goPackagePath = "github.com/dexidp/dex"; + vendorSha256 = "1k87q3ic02n2b632y3lmnclac1iaidmsl3f9py61myi5r02p03lp"; subPackages = [ "cmd/dex" ]; buildFlagsArray = [ - "-ldflags=-w -X github.com/dexidp/dex/version.Version=${src.rev}" + "-ldflags=-w -s -X github.com/dexidp/dex/version.Version=${src.rev}" ]; postInstall = '' diff --git a/pkgs/servers/dico/default.nix b/pkgs/servers/dico/default.nix index 69ec2e6222b7..cf0417e332e8 100644 --- a/pkgs/servers/dico/default.nix +++ b/pkgs/servers/dico/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, libtool, gettext, zlib, readline, gsasl +{ fetchurl, lib, stdenv, libtool, gettext, zlib, readline, gsasl , guile, python, pcre, libffi, groff }: stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Flexible dictionary server and client implementing RFC 2229"; homepage = "https://www.gnu.org/software/dico/"; license = licenses.gpl3Plus; diff --git a/pkgs/servers/dict/default.nix b/pkgs/servers/dict/default.nix index 5e4d625c187b..4e94b69f5124 100644 --- a/pkgs/servers/dict/default.nix +++ b/pkgs/servers/dict/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, which, bison, flex, libmaa, zlib, libtool }: +{ lib, stdenv, fetchurl, which, bison, flex, libmaa, zlib, libtool }: stdenv.mkDerivation rec { pname = "dictd"; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { install -Dm444 -t $out/share/doc/${pname} NEWS README ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Dict protocol server and client"; homepage = "http://www.dict.org"; license = licenses.gpl2; diff --git a/pkgs/servers/dict/libmaa.nix b/pkgs/servers/dict/libmaa.nix index 4ac4328c35fc..d55f89b9477f 100644 --- a/pkgs/servers/dict/libmaa.nix +++ b/pkgs/servers/dict/libmaa.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libtool }: +{ lib, stdenv, fetchurl, libtool }: stdenv.mkDerivation rec { version = "1.3.2"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-Wno-error=format-truncation"; - meta = with stdenv.lib; { + meta = with lib; { description = "Dict protocol server and client"; maintainers = [ ]; platforms = platforms.linux; diff --git a/pkgs/servers/diod/default.nix b/pkgs/servers/diod/default.nix index 9e33a8c7910e..8bab803056e9 100644 --- a/pkgs/servers/diod/default.nix +++ b/pkgs/servers/diod/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, munge, lua, +{ lib, stdenv, fetchurl, munge, lua, libcap, perl, ncurses }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ munge lua libcap perl ncurses ]; - meta = with stdenv.lib; { + meta = with lib; { description = "An I/O forwarding server that implements a variant of the 9P protocol"; maintainers = with maintainers; [ rnhmjoj ]; platforms = platforms.linux; diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index 858a4fcb5fa0..55bc638d2f4d 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { passthru.tests = { inherit (nixosTests) bind; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.isc.org/downloads/bind/"; description = "Domain name server"; license = licenses.mpl20; diff --git a/pkgs/servers/dns/coredns/default.nix b/pkgs/servers/dns/coredns/default.nix index ff0211d37e7c..6973e46412bf 100644 --- a/pkgs/servers/dns/coredns/default.nix +++ b/pkgs/servers/dns/coredns/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "coredns"; @@ -15,7 +15,7 @@ buildGoModule rec { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://coredns.io"; description = "A DNS server that runs middleware"; license = licenses.asl20; diff --git a/pkgs/servers/dns/dnsdist/default.nix b/pkgs/servers/dns/dnsdist/default.nix index 61fa164010e7..4bb012d72974 100644 --- a/pkgs/servers/dns/dnsdist/default.nix +++ b/pkgs/servers/dns/dnsdist/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, systemd +{ lib, stdenv, fetchurl, pkgconfig, systemd , boost, libsodium, libedit, re2 , net-snmp, lua, protobuf, openssl, zlib, h2o }: @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "DNS Loadbalancer"; homepage = "https://dnsdist.org"; license = licenses.gpl2; diff --git a/pkgs/servers/dns/https-dns-proxy/default.nix b/pkgs/servers/dns/https-dns-proxy/default.nix index 6f2cb5048034..c32d3eca2263 100644 --- a/pkgs/servers/dns/https-dns-proxy/default.nix +++ b/pkgs/servers/dns/https-dns-proxy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, gtest, c-ares, curl, libev }: +{ lib, stdenv, fetchFromGitHub, cmake, gtest, c-ares, curl, libev }: stdenv.mkDerivation rec { pname = "https-dns-proxy"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { # for when that happens despite there being none as of right now doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "DNS to DNS over HTTPS (DoH) proxy"; license = licenses.mit; maintainers = with maintainers; [ peterhoeg ]; diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index ee37ae1f0bf1..e1bd2bb2fff3 100644 --- a/pkgs/servers/dns/knot-dns/default.nix +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gnutls, liburcu, lmdb, libcap_ng, libidn2, libunistring +{ lib, stdenv, fetchurl, pkgconfig, gnutls, liburcu, lmdb, libcap_ng, libidn2, libunistring , systemd, nettle, libedit, zlib, libiconv, libintl, libmaxminddb, libbpf, nghttp2 , autoreconfHook }: @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { rm -r "$out"/lib/*.la ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Authoritative-only DNS server from .cz domain registry"; homepage = "https://knot-dns.cz"; license = licenses.gpl3Plus; diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix index 9e09a11e712a..1f495622f28b 100644 --- a/pkgs/servers/dns/knot-resolver/default.nix +++ b/pkgs/servers/dns/knot-resolver/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch +{ lib, stdenv, fetchurl, fetchpatch # native deps. , runCommand, pkgconfig, meson, ninja, makeWrapper # build+runtime deps. @@ -84,7 +84,7 @@ unwrapped = stdenv.mkDerivation rec { meson test --print-errorlogs ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Caching validating DNS resolver, from .cz domain registry"; homepage = "https://knot-resolver.cz"; license = licenses.gpl3Plus; diff --git a/pkgs/servers/dns/nsd/default.nix b/pkgs/servers/dns/nsd/default.nix index f505bb786ee7..02a460219ec6 100644 --- a/pkgs/servers/dns/nsd/default.nix +++ b/pkgs/servers/dns/nsd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libevent, openssl, nixosTests +{ lib, stdenv, fetchurl, libevent, openssl, nixosTests , bind8Stats ? false , checking ? false , ipv6 ? true @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { inherit (nixosTests) nsd; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.nlnetlabs.nl"; description = "Authoritative only, high performance, simple and open source name server"; license = licenses.bsd3; diff --git a/pkgs/servers/dns/pdns-recursor/default.nix b/pkgs/servers/dns/pdns-recursor/default.nix index 8257d4ef2525..f23aa6b02c17 100644 --- a/pkgs/servers/dns/pdns-recursor/default.nix +++ b/pkgs/servers/dns/pdns-recursor/default.nix @@ -8,11 +8,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "pdns-recursor"; - version = "4.4.1"; + version = "4.4.2"; src = fetchurl { url = "https://downloads.powerdns.com/releases/pdns-recursor-${version}.tar.bz2"; - sha256 = "162nczipxnsbgg7clap697yikxjz1vdsjkaxxsn6hb6l6m3a6zzr"; + sha256 = "1kzmliim2pwh04y3y6bpai9fm0qmdicrmff09fv5h5wahi4pzfdh"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/dns/powerdns/default.nix b/pkgs/servers/dns/powerdns/default.nix index 0f9f91ebf861..990386f06ce9 100644 --- a/pkgs/servers/dns/powerdns/default.nix +++ b/pkgs/servers/dns/powerdns/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, nixosTests +{ lib, stdenv, fetchurl, fetchpatch, pkgconfig, nixosTests , boost, libyamlcpp, libsodium, sqlite, protobuf, openssl, systemd , mysql57, postgresql, lua, openldap, geoip, curl, unixODBC }: @@ -12,6 +12,14 @@ stdenv.mkDerivation rec { sha256 = "0if27znz528sir52y9i4gcfhdsym7yxiwjgffy9lpscf1426q56m"; }; + patches = [ + (fetchpatch { # remove for >= 4.4.0 + name = "gcc-10_undefined-reference.diff"; + url = "https://github.com/PowerDNS/pdns/commit/05c9dd77b28.diff"; + sha256 = "1m9szbi02h9kcabgw3kb8k9qrb54d34z0qzizrlfiw3hxs6c2zql"; + }) + ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ boost mysql57.connector-c postgresql lua openldap sqlite protobuf geoip @@ -41,7 +49,7 @@ stdenv.mkDerivation rec { nixos = nixosTests.powerdns; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Authoritative DNS server"; homepage = "https://www.powerdns.com"; platforms = platforms.unix; diff --git a/pkgs/servers/domoticz/default.nix b/pkgs/servers/domoticz/default.nix index 8b1d11ab36b3..a9f5245ff1fe 100644 --- a/pkgs/servers/domoticz/default.nix +++ b/pkgs/servers/domoticz/default.nix @@ -1,4 +1,4 @@ -{ stdenv, +{ lib, stdenv, fetchzip, makeWrapper, cmake, @@ -41,8 +41,6 @@ stdenv.mkDerivation rec { cp -r ${minizip-src}/* $sourceRoot/extern/minizip ''; - enableParallelBuilding = true; - buildInputs = [ openssl python3 @@ -88,7 +86,7 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/domoticz --set LD_LIBRARY_PATH ${python3}/lib; ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Home automation system"; longDescription = '' Domoticz is a home automation system that lets you monitor and configure diff --git a/pkgs/servers/elasticmq-server-bin/default.nix b/pkgs/servers/elasticmq-server-bin/default.nix index 5293b18368e7..c10ea7dd1806 100644 --- a/pkgs/servers/elasticmq-server-bin/default.nix +++ b/pkgs/servers/elasticmq-server-bin/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jdk, jre, makeWrapper }: +{ lib, stdenv, fetchurl, jdk, jre, makeWrapper }: stdenv.mkDerivation rec { pname = "elasticmq-server"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { --add-flags "-jar $out/share/elasticmq-server/elasticmq-server.jar" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/softwaremill/elasticmq"; description = "Message queueing system with Java, Scala and Amazon SQS-compatible interfaces"; license = licenses.asl20; diff --git a/pkgs/servers/endlessh/default.nix b/pkgs/servers/endlessh/default.nix index 216318380fc1..fc05ec033d4b 100644 --- a/pkgs/servers/endlessh/default.nix +++ b/pkgs/servers/endlessh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "endlessh"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "SSH tarpit that slowly sends an endless banner"; homepage = "https://github.com/skeeto/endlessh"; changelog = "https://github.com/skeeto/endlessh/releases/tag/${version}"; diff --git a/pkgs/servers/exhibitor/default.nix b/pkgs/servers/exhibitor/default.nix index 2d1ccaf6e26c..b4869b162db9 100644 --- a/pkgs/servers/exhibitor/default.nix +++ b/pkgs/servers/exhibitor/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, maven, jdk, makeWrapper, stdenv, ... }: +{ fetchFromGitHub, maven, jdk, makeWrapper, lib, stdenv, ... }: stdenv.mkDerivation rec { pname = "exhibitor"; version = "1.5.6"; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { cd ${pomFileDir} mvn package --offline -Dmaven.repo.local=$(cp -dpR ${fetchedMavenDeps}/.m2 ./ && chmod +w -R .m2 && pwd)/.m2 ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/soabase/exhibitor"; description = "ZooKeeper co-process for instance monitoring, backup/recovery, cleanup and visualization"; license = licenses.asl20; diff --git a/pkgs/servers/fcgiwrap/default.nix b/pkgs/servers/fcgiwrap/default.nix index a15e1c15b15b..54b699e8a6de 100644 --- a/pkgs/servers/fcgiwrap/default.nix +++ b/pkgs/servers/fcgiwrap/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, systemd, fcgi, autoreconfHook, pkgconfig }: +{ lib, stdenv, fetchurl, systemd, fcgi, autoreconfHook, pkgconfig }: stdenv.mkDerivation rec { pname = "fcgiwrap"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { substituteInPlace configure.ac --replace libsystemd-daemon libsystemd ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://nginx.localdomain.pl/wiki/FcgiWrap"; description = "Simple server for running CGI applications over FastCGI"; maintainers = with maintainers; [ lethalman ]; diff --git a/pkgs/servers/felix/default.nix b/pkgs/servers/felix/default.nix index 486474a46b0f..dd9d34c85fdd 100644 --- a/pkgs/servers/felix/default.nix +++ b/pkgs/servers/felix/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation rec { pname = "apache-felix"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { mkdir -p $out cp -av * $out ''; - meta = with stdenv.lib; { + meta = with lib; { description = "An OSGi gateway"; homepage = "https://felix.apache.org"; license = licenses.asl20; diff --git a/pkgs/servers/fileshare/default.nix b/pkgs/servers/fileshare/default.nix index 90bf2c3a57f6..e626019f09b5 100644 --- a/pkgs/servers/fileshare/default.nix +++ b/pkgs/servers/fileshare/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { cp bin/release/fileshare $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A small HTTP Server for quickly sharing files over the network"; longDescription = "Fileshare is a simple tool for sharing the contents of a directory via a webserver and optionally allowing uploads."; homepage = "https://git.tkolb.de/Public/fileshare"; diff --git a/pkgs/servers/fingerd/bsd-fingerd/default.nix b/pkgs/servers/fingerd/bsd-fingerd/default.nix index 999718160215..eac51beadcba 100644 --- a/pkgs/servers/fingerd/bsd-fingerd/default.nix +++ b/pkgs/servers/fingerd/bsd-fingerd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: # !!! Duplication: this package is almost exactly the same as `bsd-fingerd'. @@ -18,7 +18,7 @@ stdenv.mkDerivation { preInstall = '' mkdir -p $out/man/man8 $out/sbin ''; - meta = with stdenv.lib; { + meta = with lib; { platforms = platforms.linux; license = licenses.bsdOriginal; }; diff --git a/pkgs/servers/foundationdb/cmake.nix b/pkgs/servers/foundationdb/cmake.nix index 7ad27e78d3a8..2a94008a4e9a 100644 --- a/pkgs/servers/foundationdb/cmake.nix +++ b/pkgs/servers/foundationdb/cmake.nix @@ -36,7 +36,6 @@ let ++ lib.optional useClang [ llvmPackages.lld ]; separateDebugInfo = true; - enableParallelBuilding = true; dontFixCmake = true; cmakeFlags = @@ -66,7 +65,7 @@ let # fix up the use of the very weird and custom 'fdb_install' command by just # replacing it with cmake's ordinary version. postPatch = '' - for x in bindings/c/CMakeLists.txt fdbserver/CMakeLists.txt fdbmonitor/CMakeLists.txt fdbbackup/CMakeLists.txt fdbcli/CMakeLists.txt; do + for x in bindings/c/CMakeLists.txt fdbserver/CMakeLists.txt fdbmonitor/CMakeLists.txt fdbbackup/CMakeLists.txt fdbcli/CMakeLists.txt; do substituteInPlace $x --replace 'fdb_install' 'install' done ''; @@ -119,7 +118,7 @@ let outputs = [ "out" "dev" "lib" "pythonsrc" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Open source, distributed, transactional key-value store"; homepage = "https://www.foundationdb.org"; license = licenses.asl20; diff --git a/pkgs/servers/freeradius/default.nix b/pkgs/servers/freeradius/default.nix index 84c92619f735..6f932208f3c9 100644 --- a/pkgs/servers/freeradius/default.nix +++ b/pkgs/servers/freeradius/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, autoreconfHook, talloc, finger_bsd, perl +{ lib, stdenv, fetchurl, fetchpatch, autoreconfHook, talloc, finger_bsd, perl , openssl , linkOpenssl? true , openldap @@ -98,7 +98,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "man" "doc" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://freeradius.org/"; description = "A modular, high performance free RADIUS suite"; license = licenses.gpl2; diff --git a/pkgs/servers/ftp/bftpd/default.nix b/pkgs/servers/ftp/bftpd/default.nix index 538877169e1a..e6454ced2a76 100644 --- a/pkgs/servers/ftp/bftpd/default.nix +++ b/pkgs/servers/ftp/bftpd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: let pname = "bftpd"; @@ -24,7 +24,7 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { inherit version; description = "A minimal ftp server"; downloadPage = "http://bftpd.sf.net/download.html"; diff --git a/pkgs/servers/ftp/pure-ftpd/default.nix b/pkgs/servers/ftp/pure-ftpd/default.nix index 32e039f546b5..731d2c9e19a9 100644 --- a/pkgs/servers/ftp/pure-ftpd/default.nix +++ b/pkgs/servers/ftp/pure-ftpd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl, fetchpatch }: +{ lib, stdenv, fetchurl, openssl, fetchpatch }: stdenv.mkDerivation rec { name = "pure-ftpd-1.0.49"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-tls" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A free, secure, production-quality and standard-conformant FTP server"; homepage = "https://www.pureftpd.org"; license = licenses.isc; # with some parts covered by BSD3(?) diff --git a/pkgs/servers/ftp/vsftpd/default.nix b/pkgs/servers/ftp/vsftpd/default.nix index 1ef624f2a41e..1a5bd4370d72 100644 --- a/pkgs/servers/ftp/vsftpd/default.nix +++ b/pkgs/servers/ftp/vsftpd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libcap, openssl, pam }: +{ lib, stdenv, fetchurl, libcap, openssl, pam }: stdenv.mkDerivation rec { name = "vsftpd-3.0.3"; @@ -24,10 +24,11 @@ stdenv.mkDerivation rec { ''; NIX_LDFLAGS = "-lcrypt -lssl -lcrypto -lpam -lcap"; + NIX_CFLAGS_COMPILE = "-Wno-error=enum-conversion"; enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A very secure FTP daemon"; license = licenses.gpl2; maintainers = with maintainers; [ peterhoeg ]; diff --git a/pkgs/servers/gerbera/default.nix b/pkgs/servers/gerbera/default.nix index c3f36a75923e..965e1d1b0820 100644 --- a/pkgs/servers/gerbera/default.nix +++ b/pkgs/servers/gerbera/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , cmake, pkg-config # required , libupnp, libuuid, pugixml, libiconv, sqlite, zlib, spdlog, fmt @@ -63,7 +63,7 @@ in stdenv.mkDerivation rec { ++ optionals enableFFmpegThumbnailer [ pkgs.ffmpegthumbnailer ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://docs.gerbera.io/"; description = "UPnP Media Server for 2020"; longDescription = '' diff --git a/pkgs/servers/gobetween/default.nix b/pkgs/servers/gobetween/default.nix index 9f28a89f51eb..f429f9ad385b 100644 --- a/pkgs/servers/gobetween/default.nix +++ b/pkgs/servers/gobetween/default.nix @@ -1,4 +1,6 @@ -{ buildGoModule, fetchFromGitHub, lib, enableStatic ? false }: +{ stdenv, buildGoModule, fetchFromGitHub, lib +, enableStatic ? stdenv.hostPlatform.isStatic +}: buildGoModule rec { pname = "gobetween"; diff --git a/pkgs/servers/gopher/gofish/default.nix b/pkgs/servers/gopher/gofish/default.nix index d8091c4e98d6..6468f6a9fcc3 100644 --- a/pkgs/servers/gopher/gofish/default.nix +++ b/pkgs/servers/gopher/gofish/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0br5nvlna86k4ya4q13gz0i7nlmk225lqmpfiqlkldxkr473kf0s"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A lightweight Gopher server"; homepage = "http://gofish.sourceforge.net/"; license = licenses.gpl2; diff --git a/pkgs/servers/gotify/default.nix b/pkgs/servers/gotify/default.nix index a7fb1d0e7e57..7b9b8124366d 100644 --- a/pkgs/servers/gotify/default.nix +++ b/pkgs/servers/gotify/default.nix @@ -50,7 +50,7 @@ buildGoModule rec { "-ldflags=-X main.Version=${version} -X main.Mode=prod" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A simple server for sending and receiving messages in real-time per WebSocket"; homepage = "https://gotify.net"; license = licenses.mit; diff --git a/pkgs/servers/gotify/source-sha.nix b/pkgs/servers/gotify/source-sha.nix index 5e3531497d4e..7176070742d5 100644 --- a/pkgs/servers/gotify/source-sha.nix +++ b/pkgs/servers/gotify/source-sha.nix @@ -1 +1 @@ -"0d82girrhw9k68f5kcy8d0bl0bnsq651l4bb60xmqrilylp7qgmp" +"1rb7gmkinp3nwdng3xw2nrim10iw374rwhzlviqgmz87djgajh3l" diff --git a/pkgs/servers/gotify/version.nix b/pkgs/servers/gotify/version.nix index 5783e8bd78f3..7dbc45290739 100644 --- a/pkgs/servers/gotify/version.nix +++ b/pkgs/servers/gotify/version.nix @@ -1 +1 @@ -"2.0.20" +"2.0.21" diff --git a/pkgs/servers/gotty/default.nix b/pkgs/servers/gotty/default.nix index e7d0e6f7c65a..c4881baeac06 100644 --- a/pkgs/servers/gotty/default.nix +++ b/pkgs/servers/gotty/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "gotty"; @@ -14,7 +14,7 @@ buildGoPackage rec { sha256 = "1vhhs7d4k1vpkf2k69ai2r3bp3zwnwa8l9q7vza0rck69g4nmz7a"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Share your terminal as a web application"; homepage = "https://github.com/yudai/gotty"; maintainers = with maintainers; [ ]; diff --git a/pkgs/servers/gpm/default.nix b/pkgs/servers/gpm/default.nix index 1a5032772aba..bde4150d15d7 100644 --- a/pkgs/servers/gpm/default.nix +++ b/pkgs/servers/gpm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, automake, autoconf, libtool, flex, bison, texinfo, fetchpatch +{ lib, stdenv, fetchurl, automake, autoconf, libtool, flex, bison, texinfo, fetchpatch # Optional Dependencies , ncurses ? null @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { ln -sv $out/lib/libgpm.so.2 $out/lib/libgpm.so ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.nico.schottelius.org/software/gpm/"; description = "A daemon that provides mouse support on the Linux console"; license = licenses.gpl2; diff --git a/pkgs/servers/gpsd/default.nix b/pkgs/servers/gpsd/default.nix index 7f197254878d..b7d507193055 100644 --- a/pkgs/servers/gpsd/default.nix +++ b/pkgs/servers/gpsd/default.nix @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { wrapPythonProgramsIn $out/bin "$out $pythonPath" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "GPS service daemon"; longDescription = '' gpsd is a service daemon that monitors one or more GPSes or AIS diff --git a/pkgs/servers/grocy/default.nix b/pkgs/servers/grocy/default.nix index 2f2772505f6a..bd9a02f7b91a 100644 --- a/pkgs/servers/grocy/default.nix +++ b/pkgs/servers/grocy/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, unzip, nixosTests }: +{ lib, stdenv, fetchurl, unzip, nixosTests }: stdenv.mkDerivation rec { pname = "grocy"; - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { url = "https://github.com/grocy/grocy/releases/download/v${version}/grocy_${version}.zip"; - sha256 = "sha256-O7DksfA95IHvLJyRrWG8iECcUUDsOtytd78koNZdQzE="; + sha256 = "sha256-Yjxv0LcLNtpYs4ntBano9NUxwdWgF5etA/M6hUVzOa8="; }; nativeBuildInputs = [ unzip ]; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { cp -R . $out/ ''; - meta = with stdenv.lib; { + meta = with lib; { license = licenses.mit; maintainers = with maintainers; [ ma27 ]; description = "ERP beyond your fridge - grocy is a web-based self-hosted groceries & household management solution for your home"; diff --git a/pkgs/servers/h2/default.nix b/pkgs/servers/h2/default.nix index b7f56cfe446c..cdcd802916b5 100644 --- a/pkgs/servers/h2/default.nix +++ b/pkgs/servers/h2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, jre, makeWrapper }: +{ lib, stdenv, fetchzip, jre, makeWrapper }: stdenv.mkDerivation rec { pname = "h2"; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { chmod +x $out/bin/*.sh ''; - meta = with stdenv.lib; { + meta = with lib; { description = "The Java SQL database"; homepage = "http://www.h2database.com/html/main.html"; license = licenses.mpl20; diff --git a/pkgs/servers/hashi-ui/default.nix b/pkgs/servers/hashi-ui/default.nix index 70926e37739a..73a96d6a3c0e 100644 --- a/pkgs/servers/hashi-ui/default.nix +++ b/pkgs/servers/hashi-ui/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "hashi-ui"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { install -m755 -D $src $out/bin/hashi-ui ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/jippi/hashi-ui"; description = "A modern user interface for hashicorp Consul & Nomad"; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/servers/hbase/default.nix b/pkgs/servers/hbase/default.nix index e964e956c55b..5e1d8c85a3ff 100644 --- a/pkgs/servers/hbase/default.nix +++ b/pkgs/servers/hbase/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper }: +{ lib, stdenv, fetchurl, makeWrapper }: stdenv.mkDerivation rec { pname = "hbase"; version = "0.98.24"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { mkdir -p $out cp -R * $out ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A distributed, scalable, big data store"; homepage = "https://hbase.apache.org"; license = licenses.asl20; diff --git a/pkgs/servers/headphones/default.nix b/pkgs/servers/headphones/default.nix index 7259104d145f..0ae4bbcb1fd6 100644 --- a/pkgs/servers/headphones/default.nix +++ b/pkgs/servers/headphones/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python2, makeWrapper }: +{ lib, stdenv, fetchFromGitHub, python2, makeWrapper }: python2.pkgs.buildPythonApplication rec { pname = "headphones"; @@ -24,7 +24,7 @@ python2.pkgs.buildPythonApplication rec { makeWrapper $out/Headphones.py $out/bin/headphones ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Automatic music downloader for SABnzbd"; license = licenses.gpl3; homepage = "https://github.com/rembo10/headphones"; diff --git a/pkgs/servers/hitch/default.nix b/pkgs/servers/hitch/default.nix index 1576d940a7a6..497cdb4fcf42 100644 --- a/pkgs/servers/hitch/default.nix +++ b/pkgs/servers/hitch/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, docutils, libev, openssl, pkgconfig, nixosTests }: +{ lib, stdenv, fetchurl, docutils, libev, openssl, pkgconfig, nixosTests }: stdenv.mkDerivation rec { version = "1.7.0"; pname = "hitch"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { passthru.tests.hitch = nixosTests.hitch; - meta = with stdenv.lib; { + meta = with lib; { description = "Libev-based high performance SSL/TLS proxy by Varnish Software"; homepage = "https://hitch-tls.org/"; license = licenses.bsd2; diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 93595c5729f1..b7c72607f063 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,20 +2,20 @@ # Do not edit! { - version = "2020.12.2"; + version = "2021.1.1"; components = { "abode" = ps: with ps; [ abodepy ]; "accuweather" = ps: with ps; [ accuweather ]; "acer_projector" = ps: with ps; [ pyserial ]; - "acmeda" = ps: with ps; [ ]; # missing inputs: aiopulse + "acmeda" = ps: with ps; [ aiopulse ]; "actiontec" = ps: with ps; [ ]; "adguard" = ps: with ps; [ adguardhome ]; "ads" = ps: with ps; [ pyads ]; - "advantage_air" = ps: with ps; [ ]; # missing inputs: advantage_air + "advantage_air" = ps: with ps; [ advantage-air ]; "aftership" = ps: with ps; [ pyaftership ]; "agent_dvr" = ps: with ps; [ ]; # missing inputs: agent-py "air_quality" = ps: with ps; [ ]; - "airly" = ps: with ps; [ ]; # missing inputs: airly + "airly" = ps: with ps; [ airly ]; "airvisual" = ps: with ps; [ pyairvisual ]; "aladdin_connect" = ps: with ps; [ ]; # missing inputs: aladdin_connect "alarm_control_panel" = ps: with ps; [ ]; @@ -25,7 +25,7 @@ "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 + "ambiclimate" = ps: with ps; [ aiohttp-cors ambiclimate ]; "ambient_station" = ps: with ps; [ ]; # missing inputs: aioambient "amcrest" = ps: with ps; [ ha-ffmpeg ]; # missing inputs: amcrest "ampio" = ps: with ps; [ ]; # missing inputs: asmog @@ -45,7 +45,7 @@ "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 pyarlo ]; "arris_tg2492lg" = ps: with ps; [ ]; # missing inputs: arris-tg2492lg "aruba" = ps: with ps; [ pexpect ]; "arwn" = ps: with ps; [ aiohttp-cors paho-mqtt ]; @@ -60,11 +60,10 @@ "aurora_abb_powerone" = ps: with ps; [ ]; # missing inputs: aurorapy "auth" = ps: with ps; [ aiohttp-cors ]; "automation" = ps: with ps; [ aiohttp-cors ]; - "avea" = ps: with ps; [ ]; # missing inputs: avea + "avea" = ps: with ps; [ avea ]; "avion" = ps: with ps; [ ]; # missing inputs: avion - "avri" = ps: with ps; [ pycountry ]; # missing inputs: avri-api "awair" = ps: with ps; [ ]; # missing inputs: python_awair - "aws" = ps: with ps; [ ]; # missing inputs: aiobotocore + "aws" = ps: with ps; [ aiobotocore ]; "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 @@ -76,7 +75,7 @@ "beewi_smartclim" = ps: with ps; [ ]; # missing inputs: beewi_smartclim "bh1750" = ps: with ps; [ smbus-cffi ]; # missing inputs: i2csense "binary_sensor" = ps: with ps; [ ]; - "bitcoin" = ps: with ps; [ ]; # missing inputs: blockchain + "bitcoin" = ps: with ps; [ blockchain ]; "bizkaibus" = ps: with ps; [ ]; # missing inputs: bizkaibus "blackbird" = ps: with ps; [ ]; # missing inputs: pyblackbird "blebox" = ps: with ps; [ ]; # missing inputs: blebox_uniapi @@ -137,7 +136,7 @@ "control4" = ps: with ps; [ ]; # missing inputs: pyControl4 "conversation" = ps: with ps; [ aiohttp-cors ]; "coolmaster" = ps: with ps; [ ]; # missing inputs: pycoolmasternet-async - "coronavirus" = ps: with ps; [ ]; # missing inputs: coronavirus + "coronavirus" = ps: with ps; [ coronavirus ]; "counter" = ps: with ps; [ ]; "cover" = ps: with ps; [ ]; "cppm_tracker" = ps: with ps; [ ]; # missing inputs: clearpasspy @@ -161,12 +160,12 @@ "denon" = ps: with ps; [ ]; "denonavr" = ps: with ps; [ denonavr getmac ]; "derivative" = ps: with ps; [ ]; - "deutsche_bahn" = ps: with ps; [ ]; # missing inputs: schiene + "deutsche_bahn" = ps: with ps; [ schiene ]; "device_automation" = ps: with ps; [ ]; "device_sun_light_trigger" = ps: with ps; [ aiohttp-cors pillow ]; "device_tracker" = ps: with ps; [ ]; "devolo_home_control" = ps: with ps; [ aiohttp-cors zeroconf ]; # missing inputs: devolo-home-control-api - "dexcom" = ps: with ps; [ ]; # missing inputs: pydexcom + "dexcom" = ps: with ps; [ pydexcom ]; "dht" = ps: with ps; [ ]; # missing inputs: Adafruit-DHT "dialogflow" = ps: with ps; [ aiohttp-cors ]; "digital_ocean" = ps: with ps; [ digital-ocean ]; @@ -234,7 +233,7 @@ "essent" = ps: with ps; [ ]; # missing inputs: PyEssent "etherscan" = ps: with ps; [ ]; # missing inputs: python-etherscan-api "eufy" = ps: with ps; [ ]; # missing inputs: lakeside - "everlights" = ps: with ps; [ ]; # missing inputs: pyeverlights + "everlights" = ps: with ps; [ pyeverlights ]; "evohome" = ps: with ps; [ ]; # missing inputs: evohome-async "ezviz" = ps: with ps; [ ]; # missing inputs: pyezviz "facebook" = ps: with ps; [ ]; @@ -248,7 +247,7 @@ "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 + "fido" = ps: with ps; [ pyfido ]; "file" = ps: with ps; [ ]; "filesize" = ps: with ps; [ ]; "filter" = ps: with ps; [ aiohttp-cors sqlalchemy ]; @@ -256,9 +255,9 @@ "fireservicerota" = ps: with ps; [ ]; # missing inputs: pyfireservicerota "firmata" = ps: with ps; [ ]; # missing inputs: pymata-express "fitbit" = ps: with ps; [ aiohttp-cors fitbit ]; - "fixer" = ps: with ps; [ ]; # missing inputs: fixerio + "fixer" = ps: with ps; [ fixerio ]; "fleetgo" = ps: with ps; [ ]; # missing inputs: ritassist - "flexit" = ps: with ps; [ ]; # missing inputs: pyflexit pymodbus + "flexit" = ps: with ps; [ pymodbus ]; # missing inputs: pyflexit "flic" = ps: with ps; [ ]; # missing inputs: pyflic-homeassistant "flick_electric" = ps: with ps; [ ]; # missing inputs: PyFlick "flo" = ps: with ps; [ ]; # missing inputs: aioflo @@ -284,7 +283,7 @@ "fronius" = ps: with ps; [ ]; # missing inputs: pyfronius "frontend" = ps: with ps; [ aiohttp-cors pillow ]; # missing inputs: home-assistant-frontend "frontier_silicon" = ps: with ps; [ ]; # missing inputs: afsapi - "futurenow" = ps: with ps; [ ]; # missing inputs: pyfnip + "futurenow" = ps: with ps; [ pyfnip ]; "garadget" = ps: with ps; [ ]; "garmin_connect" = ps: with ps; [ ]; # missing inputs: garminconnect "gc100" = ps: with ps; [ ]; # missing inputs: python-gc100 @@ -303,17 +302,17 @@ "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 + "glances" = ps: with ps; [ glances-api ]; "gntp" = ps: with ps; [ gntp ]; "goalfeed" = ps: with ps; [ ]; # missing inputs: pysher "goalzero" = ps: with ps; [ ]; # missing inputs: goalzero "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_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_pubsub" = ps: with ps; [ google-cloud-pubsub ]; "google_translate" = ps: with ps; [ gtts ]; "google_travel_time" = ps: with ps; [ googlemaps ]; "google_wifi" = ps: with ps; [ ]; @@ -329,7 +328,7 @@ "growatt_server" = ps: with ps; [ ]; # missing inputs: growattServer "gstreamer" = ps: with ps; [ ]; # missing inputs: gstreamer-player "gtfs" = ps: with ps; [ ]; # missing inputs: pygtfs - "guardian" = ps: with ps; [ ]; # missing inputs: aioguardian + "guardian" = ps: with ps; [ aioguardian ]; "habitica" = ps: with ps; [ ]; # missing inputs: habitipy "hangouts" = ps: with ps; [ ]; # missing inputs: hangups "harman_kardon_avr" = ps: with ps; [ ]; # missing inputs: hkavr @@ -368,7 +367,7 @@ "humidifier" = ps: with ps; [ ]; "hunterdouglas_powerview" = ps: with ps; [ ]; # missing inputs: aiopvapi "hvv_departures" = ps: with ps; [ ]; # missing inputs: pygti - "hydrawise" = ps: with ps; [ ]; # missing inputs: hydrawiser + "hydrawise" = ps: with ps; [ hydrawiser ]; "hyperion" = ps: with ps; [ ]; # missing inputs: hyperion-py "iammeter" = ps: with ps; [ ]; # missing inputs: iammeter "iaqualink" = ps: with ps; [ ]; # missing inputs: iaqualink @@ -380,7 +379,7 @@ "ihc" = ps: with ps; [ defusedxml ]; # missing inputs: ihcsdk "image" = ps: with ps; [ aiohttp-cors pillow ]; "image_processing" = ps: with ps; [ aiohttp-cors ]; - "imap" = ps: with ps; [ ]; # missing inputs: aioimaplib + "imap" = ps: with ps; [ aioimaplib ]; "imap_email_content" = ps: with ps; [ ]; "incomfort" = ps: with ps; [ ]; # missing inputs: incomfort-client "influxdb" = ps: with ps; [ influxdb-client influxdb ]; @@ -389,7 +388,7 @@ "input_number" = ps: with ps; [ ]; "input_select" = ps: with ps; [ ]; "input_text" = ps: with ps; [ ]; - "insteon" = ps: with ps; [ ]; # missing inputs: pyinsteon + "insteon" = ps: with ps; [ pyinsteon ]; "integration" = ps: with ps; [ ]; "intent" = ps: with ps; [ aiohttp-cors ]; "intent_script" = ps: with ps; [ ]; @@ -399,7 +398,7 @@ "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 + "iqvia" = ps: with ps; [ numpy 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 @@ -414,22 +413,22 @@ "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; [ aiokef getmac ]; "keyboard" = ps: with ps; [ ]; # missing inputs: pyuserinput "keyboard_remote" = ps: with ps; [ aionotify evdev ]; - "kira" = ps: with ps; [ ]; # missing inputs: pykira + "kira" = ps: with ps; [ pykira ]; "kiwi" = ps: with ps; [ ]; # missing inputs: kiwiki-client - "knx" = ps: with ps; [ ]; # missing inputs: xknx + "knx" = ps: with ps; [ xknx ]; "kodi" = ps: with ps; [ ]; # missing inputs: pykodi "konnected" = ps: with ps; [ aiohttp-cors ]; # missing inputs: konnected "kulersky" = ps: with ps; [ ]; # missing inputs: pykulersky "kwb" = ps: with ps; [ ]; # missing inputs: pykwb - "lacrosse" = ps: with ps; [ ]; # missing inputs: pylacrosse + "lacrosse" = ps: with ps; [ pylacrosse ]; "lametric" = ps: with ps; [ ]; # missing inputs: lmnotify "lannouncer" = ps: with ps; [ ]; "lastfm" = ps: with ps; [ pylast ]; "launch_library" = ps: with ps; [ ]; # missing inputs: pylaunches - "lcn" = ps: with ps; [ ]; # missing inputs: pypck + "lcn" = ps: with ps; [ 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 @@ -460,7 +459,7 @@ "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" = ps: with ps; [ 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 @@ -503,7 +502,7 @@ "mjpeg" = ps: with ps; [ ]; "mobile_app" = ps: with ps; [ pynacl aiohttp-cors emoji hass-nabucasa pillow ]; "mochad" = ps: with ps; [ ]; # missing inputs: pymochad - "modbus" = ps: with ps; [ ]; # missing inputs: pymodbus + "modbus" = ps: with ps; [ pymodbus ]; "modem_callerid" = ps: with ps; [ ]; # missing inputs: basicmodem "mold_indicator" = ps: with ps; [ ]; "monoprice" = ps: with ps; [ ]; # missing inputs: pymonoprice @@ -520,21 +519,21 @@ "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 + "myq" = ps: with ps; [ pymyq ]; "mysensors" = ps: with ps; [ aiohttp-cors paho-mqtt ]; # missing inputs: pymysensors - "mystrom" = ps: with ps; [ aiohttp-cors ]; # missing inputs: python-mystrom + "mystrom" = ps: with ps; [ aiohttp-cors 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 ]; + "neato" = ps: with ps; [ aiohttp-cors 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; [ aiohttp-cors ha-ffmpeg python-nest ]; # missing inputs: google-nest-sdm "netatmo" = ps: with ps; [ aiohttp-cors hass-nabucasa pyatmo ]; - "netdata" = ps: with ps; [ ]; # missing inputs: netdata + "netdata" = ps: with ps; [ 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 @@ -586,12 +585,12 @@ "opengarage" = ps: with ps; [ ]; # missing inputs: open-garage "openhardwaremonitor" = ps: with ps; [ ]; "openhome" = ps: with ps; [ ]; # missing inputs: openhomedevice - "opensensemap" = ps: with ps; [ ]; # missing inputs: opensensemap-api + "opensensemap" = ps: with ps; [ opensensemap-api ]; "opensky" = ps: with ps; [ ]; "opentherm_gw" = ps: with ps; [ ]; # missing inputs: pyotgw "openuv" = ps: with ps; [ ]; # missing inputs: pyopenuv "openweathermap" = ps: with ps; [ pyowm ]; - "opnsense" = ps: with ps; [ ]; # missing inputs: pyopnsense + "opnsense" = ps: with ps; [ pyopnsense ]; "opple" = ps: with ps; [ ]; # missing inputs: pyoppleio "orangepi_gpio" = ps: with ps; [ ]; # missing inputs: OPi.GPIO "oru" = ps: with ps; [ ]; # missing inputs: oru @@ -612,11 +611,11 @@ "person" = ps: with ps; [ aiohttp-cors pillow ]; "philips_js" = ps: with ps; [ ]; # missing inputs: ha-philipsjs "pi4ioe5v9xxxx" = ps: with ps; [ ]; # missing inputs: pi4ioe5v9xxxx - "pi_hole" = ps: with ps; [ ]; # missing inputs: hole + "pi_hole" = ps: with ps; [ hole ]; "picotts" = ps: with ps; [ ]; "piglow" = ps: with ps; [ ]; # missing inputs: piglow "pilight" = ps: with ps; [ ]; # missing inputs: pilight - "ping" = ps: with ps; [ ]; # missing inputs: icmplib + "ping" = ps: with ps; [ icmplib ]; "pioneer" = ps: with ps; [ ]; "pjlink" = ps: with ps; [ ]; # missing inputs: pypjlink2 "plaato" = ps: with ps; [ aiohttp-cors ]; @@ -624,9 +623,9 @@ "plex" = ps: with ps; [ aiohttp-cors plexapi plexauth plexwebsocket pysonos ]; "plugwise" = ps: with ps; [ ]; # missing inputs: plugwise "plum_lightpad" = ps: with ps; [ ]; # missing inputs: plumlightpad - "pocketcasts" = ps: with ps; [ ]; # missing inputs: pocketcasts + "pocketcasts" = ps: with ps; [ ]; # missing inputs: pycketcasts "point" = ps: with ps; [ aiohttp-cors ]; # missing inputs: pypoint - "poolsense" = ps: with ps; [ ]; # missing inputs: poolsense + "poolsense" = ps: with ps; [ poolsense ]; "powerwall" = ps: with ps; [ ]; # missing inputs: tesla-powerwall "profiler" = ps: with ps; [ objgraph pyprof2calltree ]; # missing inputs: guppy3 "progettihwsw" = ps: with ps; [ ]; # missing inputs: progettihwsw @@ -785,7 +784,7 @@ "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 + "stiebel_eltron" = ps: with ps; [ pymodbus ]; # missing inputs: pystiebeleltron "stookalert" = ps: with ps; [ ]; # missing inputs: stookalert "stream" = ps: with ps; [ aiohttp-cors av ]; "streamlabswater" = ps: with ps; [ ]; # missing inputs: streamlabswater @@ -796,7 +795,7 @@ "supla" = ps: with ps; [ ]; # missing inputs: asyncpysupla "surepetcare" = ps: with ps; [ ]; # missing inputs: surepy "swiss_hydrological_data" = ps: with ps; [ ]; # missing inputs: swisshydrodata - "swiss_public_transport" = ps: with ps; [ ]; # missing inputs: python_opendata_transport + "swiss_public_transport" = ps: with ps; [ python-opendata-transport ]; "swisscom" = ps: with ps; [ ]; "switch" = ps: with ps; [ ]; "switchbot" = ps: with ps; [ ]; # missing inputs: PySwitchbot @@ -828,8 +827,8 @@ "telnet" = ps: with ps; [ ]; "temper" = ps: with ps; [ ]; # missing inputs: temperusb "template" = ps: with ps; [ ]; - "tensorflow" = ps: with ps; [ numpy pillow tensorflow-build_2 ]; # missing inputs: pycocotools tf-models-official - "tesla" = ps: with ps; [ ]; # missing inputs: teslajsonpy + "tensorflow" = ps: with ps; [ numpy pillow tensorflow ]; # missing inputs: pycocotools tf-models-official + "tesla" = ps: with ps; [ teslajsonpy ]; "tfiac" = ps: with ps; [ ]; # missing inputs: pytfiac "thermoworks_smoke" = ps: with ps; [ stringcase ]; # missing inputs: thermoworks_smoke "thethingsnetwork" = ps: with ps; [ ]; @@ -839,10 +838,10 @@ "threshold" = ps: with ps; [ ]; "tibber" = ps: with ps; [ ]; # missing inputs: pyTibber "tikteck" = ps: with ps; [ ]; # missing inputs: tikteck - "tile" = ps: with ps; [ ]; # missing inputs: pytile + "tile" = ps: with ps; [ pytile ]; "time_date" = ps: with ps; [ ]; "timer" = ps: with ps; [ ]; - "tmb" = ps: with ps; [ ]; # missing inputs: tmb + "tmb" = ps: with ps; [ tmb ]; "tod" = ps: with ps; [ ]; "todoist" = ps: with ps; [ todoist ]; "tof" = ps: with ps; [ ]; # missing inputs: RPi.GPIO VL53L1X2 @@ -876,10 +875,10 @@ "uk_transport" = ps: with ps; [ ]; "unifi" = ps: with ps; [ aiounifi ]; "unifi_direct" = ps: with ps; [ pexpect ]; - "unifiled" = ps: with ps; [ ]; # missing inputs: unifiled + "unifiled" = ps: with ps; [ unifiled ]; "universal" = ps: with ps; [ ]; "upb" = ps: with ps; [ ]; # missing inputs: upb_lib - "upc_connect" = ps: with ps; [ ]; # missing inputs: connect-box + "upc_connect" = ps: with ps; [ connect-box ]; "upcloud" = ps: with ps; [ ]; # missing inputs: upcloud-api "updater" = ps: with ps; [ distro ]; "upnp" = ps: with ps; [ async-upnp-client ]; @@ -895,7 +894,7 @@ "velbus" = ps: with ps; [ ]; # missing inputs: python-velbus "velux" = ps: with ps; [ ]; # missing inputs: pyvlx "venstar" = ps: with ps; [ ]; # missing inputs: venstarcolortouch - "vera" = ps: with ps; [ ]; # missing inputs: pyvera + "vera" = ps: with ps; [ pyvera ]; "verisure" = ps: with ps; [ jsonpath ]; # missing inputs: vsure "versasense" = ps: with ps; [ ]; # missing inputs: pyversasense "version" = ps: with ps; [ pyhaversion ]; @@ -908,7 +907,7 @@ "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 + "volkszaehler" = ps: with ps; [ volkszaehler ]; "volumio" = ps: with ps; [ ]; # missing inputs: pyvolumio "volvooncall" = ps: with ps; [ ]; # missing inputs: volvooncall "vultr" = ps: with ps; [ vultr ]; @@ -925,9 +924,9 @@ "webostv" = ps: with ps; [ ]; # missing inputs: aiopylgtv "websocket_api" = ps: with ps; [ aiohttp-cors ]; "wemo" = ps: with ps; [ ]; # missing inputs: pywemo - "whois" = ps: with ps; [ ]; # missing inputs: python-whois + "whois" = ps: with ps; [ python-whois ]; "wiffi" = ps: with ps; [ ]; # missing inputs: wiffi - "wilight" = ps: with ps; [ ]; # missing inputs: pywilight + "wilight" = ps: with ps; [ pywilight ]; "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 @@ -943,7 +942,7 @@ "xbee" = ps: with ps; [ ]; # missing inputs: xbee-helper "xbox" = ps: with ps; [ aiohttp-cors ]; # missing inputs: xbox-webapi "xbox_live" = ps: with ps; [ ]; # missing inputs: xboxapi - "xeoma" = ps: with ps; [ ]; # missing inputs: pyxeoma + "xeoma" = ps: with ps; [ 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 diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 68d11e85fd2a..2275f8c14b5c 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -62,7 +62,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "2020.12.2"; + hassVersion = "2021.1.1"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -71,6 +71,9 @@ in with py.pkgs; buildPythonApplication rec { # check REQUIRED_PYTHON_VER in homeassistant/const.py disabled = pythonOlder "3.7.1"; + # don't try and fail to strip 6600+ python files, it takes minutes! + dontStrip = true; + inherit availableComponents; # PyPI tarball is missing tests/ directory @@ -78,7 +81,7 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - sha256 = "1hd3z0bvscrg0ihy26djm1x9cj1pkdbnsgpzhdy42j8vy80q9bxr"; + sha256 = "1linjv1hryqsh8y1rql1i95b4lz4h8siw847gm78m1z8niacz7ss"; }; # leave this in, so users don't have to constantly update their downstream patch handling @@ -176,6 +179,11 @@ in with py.pkgs; buildPythonApplication rec { "test_cached_event_message" # ValueError: count must be a positive integer (got 0) "test_media_view" + # AssertionError: len(events) == 1 + "test_error_posted_as_event" + # keyring.errors.NoKeyringError: No recommended backend was available. + "test_secrets_from_unrelated_fails" + "test_secrets_credstash" ]; preCheck = '' diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index 36f89dc0069e..9606f8645a1d 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -4,13 +4,16 @@ buildPythonPackage rec { # the frontend version corresponding to a specific home-assistant version can be found here # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json pname = "home-assistant-frontend"; - version = "20201212.0"; + version = "20201229.1"; src = fetchPypi { inherit pname version; - sha256 = "1nz5f7bpj0xs740af8i6j33idff6yzx7z9vydlah2sxcdgpwmz84"; + sha256 = "sha256-3JMWugAiVDq/NBgX8ft2Bchim2g493jy7wZvvXrX+Ws="; }; + # there is nothing to strip in this package + dontStrip = true; + # no Python tests implemented doCheck = false; diff --git a/pkgs/servers/home-assistant/parse-requirements.py b/pkgs/servers/home-assistant/parse-requirements.py index 4fa4b8a48ee4..fc0e790bd6f1 100755 --- a/pkgs/servers/home-assistant/parse-requirements.py +++ b/pkgs/servers/home-assistant/parse-requirements.py @@ -30,7 +30,7 @@ from urllib.request import urlopen COMPONENT_PREFIX = "homeassistant.components" PKG_SET = "python3Packages" -# If some requirements are matched by multiple python packages, +# If some requirements are matched by multiple Python packages, # the following can be used to choose one of them PKG_PREFERENCES = { # Use python3Packages.youtube-dl-light instead of python3Packages.youtube-dl @@ -39,6 +39,7 @@ PKG_PREFERENCES = { "tensorflow-bin_2": "tensorflow", "tensorflowWithoutCuda": "tensorflow", "tensorflow-build_2": "tensorflow", + "whois": "python-whois", } diff --git a/pkgs/servers/home-assistant/update.sh b/pkgs/servers/home-assistant/update.sh index 11189cf3577a..e80b7acbed0f 100755 --- a/pkgs/servers/home-assistant/update.sh +++ b/pkgs/servers/home-assistant/update.sh @@ -31,4 +31,4 @@ sed -i -e "s/hassVersion =.*/hassVersion = \"${TARGET_VERSION}\";/" \ ) git add ./component-packages.nix ./default.nix ./frontend.nix -git commit -m "homeassistant: ${CURRENT_VERSION} -> ${TARGET_VERSION}" +git commit -m "home-assistant: ${CURRENT_VERSION} -> ${TARGET_VERSION}" diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix index 71f8c8054c71..e0c906fe9f11 100644 --- a/pkgs/servers/http/apache-httpd/2.4.nix +++ b/pkgs/servers/http/apache-httpd/2.4.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, zlib, apr, aprutil, pcre, libiconv, lynx +{ lib, stdenv, fetchurl, perl, zlib, apr, aprutil, pcre, libiconv, lynx , proxySupport ? true , sslSupport ? true, openssl , http2Support ? true, nghttp2 @@ -87,7 +87,7 @@ stdenv.mkDerivation rec { inherit apr aprutil sslSupport proxySupport ldapSupport luaSupport lua5; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Apache HTTPD, the world's most popular web server"; homepage = "http://httpd.apache.org/"; license = licenses.asl20; diff --git a/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix b/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix index d696ece82675..498d3bc0424a 100644 --- a/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix +++ b/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix @@ -1,4 +1,4 @@ -{ stdenv, apacheHttpd, autoconf, automake, autoreconfHook, curl, fetchFromGitHub, glib, lasso, libtool, libxml2, libxslt, openssl, pkgconfig, xmlsec }: +{ lib, stdenv, apacheHttpd, autoconf, automake, autoreconfHook, curl, fetchFromGitHub, glib, lasso, libtool, libxml2, libxslt, openssl, pkgconfig, xmlsec }: stdenv.mkDerivation rec { @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { cp ./.libs/mod_auth_mellon.so $out/modules ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/UNINETT/mod_auth_mellon"; description = "An Apache module with a simple SAML 2.0 service provider"; license = licenses.gpl2Plus; diff --git a/pkgs/servers/http/apache-modules/mod_ca/default.nix b/pkgs/servers/http/apache-modules/mod_ca/default.nix index c4551108338b..04440666f291 100644 --- a/pkgs/servers/http/apache-modules/mod_ca/default.nix +++ b/pkgs/servers/http/apache-modules/mod_ca/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, apacheHttpd, openssl, openldap, apr, aprutil }: +{ lib, stdenv, fetchurl, pkgconfig, apacheHttpd, openssl, openldap, apr, aprutil }: stdenv.mkDerivation rec { pname = "mod_ca"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { "LIBEXECDIR=${placeholder ''out''}/modules" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "RedWax CA service module"; homepage = "https://redwax.eu"; diff --git a/pkgs/servers/http/apache-modules/mod_crl/default.nix b/pkgs/servers/http/apache-modules/mod_crl/default.nix index ee7dbe3245d4..a5f06a58ad56 100644 --- a/pkgs/servers/http/apache-modules/mod_crl/default.nix +++ b/pkgs/servers/http/apache-modules/mod_crl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, mod_ca, apr, aprutil }: +{ lib, stdenv, fetchurl, pkgconfig, mod_ca, apr, aprutil }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ mod_ca apr aprutil ]; inherit (mod_ca) configureFlags installFlags; - meta = with stdenv.lib; { + meta = with lib; { description = "RedWax module for Certificate Revocation Lists"; homepage = "https://redwax.eu"; diff --git a/pkgs/servers/http/apache-modules/mod_csr/default.nix b/pkgs/servers/http/apache-modules/mod_csr/default.nix index 6547d3aa2b5c..e83ef99a2f09 100644 --- a/pkgs/servers/http/apache-modules/mod_csr/default.nix +++ b/pkgs/servers/http/apache-modules/mod_csr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, mod_ca, apr, aprutil }: +{ lib, stdenv, fetchurl, pkgconfig, mod_ca, apr, aprutil }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ mod_ca apr aprutil ]; inherit (mod_ca) configureFlags installFlags; - meta = with stdenv.lib; { + meta = with lib; { description = "RedWax CA service module to handle Certificate Signing Requests"; homepage = "https://redwax.eu"; diff --git a/pkgs/servers/http/apache-modules/mod_dnssd/default.nix b/pkgs/servers/http/apache-modules/mod_dnssd/default.nix index 583140181328..783f7bfb4b21 100644 --- a/pkgs/servers/http/apache-modules/mod_dnssd/default.nix +++ b/pkgs/servers/http/apache-modules/mod_dnssd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, apacheHttpd, apr, avahi }: +{ lib, stdenv, fetchurl, fetchpatch, pkgconfig, apacheHttpd, apr, avahi }: stdenv.mkDerivation rec { name = "mod_dnssd-0.6"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { cp src/.libs/mod_dnssd.so $out/modules ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://0pointer.de/lennart/projects/mod_dnssd"; description = "Provide Zeroconf support via DNS-SD using Avahi"; license = licenses.asl20; diff --git a/pkgs/servers/http/apache-modules/mod_ocsp/default.nix b/pkgs/servers/http/apache-modules/mod_ocsp/default.nix index 6ec3f246fad5..fa9309fc4720 100644 --- a/pkgs/servers/http/apache-modules/mod_ocsp/default.nix +++ b/pkgs/servers/http/apache-modules/mod_ocsp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, mod_ca, apr, aprutil }: +{ lib, stdenv, fetchurl, pkgconfig, mod_ca, apr, aprutil }: stdenv.mkDerivation rec { pname = "mod_ocsp"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ mod_ca apr aprutil ]; inherit (mod_ca) configureFlags installFlags; - meta = with stdenv.lib; { + meta = with lib; { description = "RedWax CA service modules of OCSP Online Certificate Validation"; homepage = "https://redwax.eu"; diff --git a/pkgs/servers/http/apache-modules/mod_pkcs12/default.nix b/pkgs/servers/http/apache-modules/mod_pkcs12/default.nix index 1cf68f2a2768..711443230e69 100644 --- a/pkgs/servers/http/apache-modules/mod_pkcs12/default.nix +++ b/pkgs/servers/http/apache-modules/mod_pkcs12/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, mod_ca, apr, aprutil }: +{ lib, stdenv, fetchurl, pkgconfig, mod_ca, apr, aprutil }: stdenv.mkDerivation rec { pname = "mod_pkcs12"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ mod_ca apr aprutil ]; inherit (mod_ca) configureFlags installFlags; - meta = with stdenv.lib; { + meta = with lib; { description = "RedWax CA service modules for PKCS#12 format files"; homepage = "https://redwax.eu"; diff --git a/pkgs/servers/http/apache-modules/mod_scep/default.nix b/pkgs/servers/http/apache-modules/mod_scep/default.nix index 1331c6da3e41..e56fa6987e15 100644 --- a/pkgs/servers/http/apache-modules/mod_scep/default.nix +++ b/pkgs/servers/http/apache-modules/mod_scep/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, mod_ca, apr, aprutil }: +{ lib, stdenv, fetchurl, pkgconfig, mod_ca, apr, aprutil }: stdenv.mkDerivation rec { pname = "mod_scep"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ mod_ca apr aprutil ]; inherit (mod_ca) configureFlags installFlags; - meta = with stdenv.lib; { + meta = with lib; { description = "RedWax CA service modules for SCEP (Automatic ceritifcate issue/renewal)"; homepage = "https://redwax.eu"; diff --git a/pkgs/servers/http/apache-modules/mod_spkac/default.nix b/pkgs/servers/http/apache-modules/mod_spkac/default.nix index 00f054f755ea..dba56765538f 100644 --- a/pkgs/servers/http/apache-modules/mod_spkac/default.nix +++ b/pkgs/servers/http/apache-modules/mod_spkac/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, mod_ca, apr, aprutil }: +{ lib, stdenv, fetchurl, pkgconfig, mod_ca, apr, aprutil }: stdenv.mkDerivation rec { pname = "mod_spkac"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ mod_ca apr aprutil ]; inherit (mod_ca) configureFlags installFlags; - meta = with stdenv.lib; { + meta = with lib; { description = "RedWax CA service module for handling the Netscape keygen requests. "; homepage = "https://redwax.eu"; diff --git a/pkgs/servers/http/apache-modules/mod_tile/default.nix b/pkgs/servers/http/apache-modules/mod_tile/default.nix index 397e0dfe0bb4..31ddd1863838 100644 --- a/pkgs/servers/http/apache-modules/mod_tile/default.nix +++ b/pkgs/servers/http/apache-modules/mod_tile/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, apacheHttpd, apr, cairo, iniparser, mapnik }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, apacheHttpd, apr, cairo, iniparser, mapnik }: stdenv.mkDerivation rec { pname = "mod_tile"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { rm -rf $out/nix ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/openstreetmap/mod_tile"; description = "Efficiently render and serve OpenStreetMap tiles using Apache and Mapnik"; license = licenses.gpl2; diff --git a/pkgs/servers/http/apache-modules/mod_timestamp/default.nix b/pkgs/servers/http/apache-modules/mod_timestamp/default.nix index 9cd2a822b098..5e315fe956fc 100644 --- a/pkgs/servers/http/apache-modules/mod_timestamp/default.nix +++ b/pkgs/servers/http/apache-modules/mod_timestamp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, mod_ca, apr, aprutil }: +{ lib, stdenv, fetchurl, pkgconfig, mod_ca, apr, aprutil }: stdenv.mkDerivation rec { pname = "mod_timestamp"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ mod_ca apr aprutil ]; inherit (mod_ca) configureFlags installFlags; - meta = with stdenv.lib; { + meta = with lib; { description = "RedWax CA service module for issuing signed timestamps"; homepage = "https://redwax.eu"; diff --git a/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix b/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix index 0e07454bbc5e..bea94a888597 100644 --- a/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix +++ b/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, apacheHttpd, jdk }: +{ lib, stdenv, fetchurl, apacheHttpd, jdk }: stdenv.mkDerivation rec { name = "tomcat-connectors-1.2.48"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { buildInputs = [ apacheHttpd jdk ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Provides web server plugins to connect web servers with Tomcat"; homepage = "https://tomcat.apache.org/download-connectors.cgi"; license = licenses.asl20; diff --git a/pkgs/servers/http/apt-cacher-ng/default.nix b/pkgs/servers/http/apt-cacher-ng/default.nix index f8c4b8002045..1f5e861e60c9 100644 --- a/pkgs/servers/http/apt-cacher-ng/default.nix +++ b/pkgs/servers/http/apt-cacher-ng/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , bzip2 , cmake , doxygen @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake doxygen pkgconfig ]; buildInputs = [ bzip2 fuse libevent lzma openssl systemd tcp_wrappers zlib ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A caching proxy specialized for linux distribution files"; homepage = "https://www.unix-ag.uni-kl.de/~bloch/acng/"; license = licenses.gpl2; diff --git a/pkgs/servers/http/couchdb/2.0.0.nix b/pkgs/servers/http/couchdb/2.0.0.nix index 737947c0524b..2881a3dc196b 100644 --- a/pkgs/servers/http/couchdb/2.0.0.nix +++ b/pkgs/servers/http/couchdb/2.0.0.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, erlang, icu, openssl, spidermonkey_1_8_5 +{ lib, stdenv, fetchurl, erlang, icu, openssl, spidermonkey_1_8_5 , coreutils, bash, makeWrapper, python3 }: stdenv.mkDerivation rec { @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/couchdb --suffix PATH : ${bash}/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A database that uses JSON for documents, JavaScript for MapReduce queries, and regular HTTP for an API"; homepage = "http://couchdb.apache.org"; license = licenses.asl20; diff --git a/pkgs/servers/http/couchdb/3.nix b/pkgs/servers/http/couchdb/3.nix index bb856d7aa07d..94b94081d430 100644 --- a/pkgs/servers/http/couchdb/3.nix +++ b/pkgs/servers/http/couchdb/3.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, erlang, icu, openssl, spidermonkey_68 +{ lib, stdenv, fetchurl, erlang, icu, openssl, spidermonkey_68 , coreutils, bash, makeWrapper, python3 }: stdenv.mkDerivation rec { @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { cp -r rel/couchdb/* $out ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A database that uses JSON for documents, JavaScript for MapReduce queries, and regular HTTP for an API"; homepage = "http://couchdb.apache.org"; license = licenses.asl20; diff --git a/pkgs/servers/http/couchdb/default.nix b/pkgs/servers/http/couchdb/default.nix index b484cce15a26..91b636cfdde2 100644 --- a/pkgs/servers/http/couchdb/default.nix +++ b/pkgs/servers/http/couchdb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, erlang, icu, openssl, spidermonkey_1_8_5, curl, help2man +{ lib, stdenv, fetchurl, erlang, icu, openssl, spidermonkey_1_8_5, curl, help2man , sphinx, which, file, pkgconfig, getopt }: stdenv.mkDerivation rec { @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { "--enable-js-trunk" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A database that uses JSON for documents, JavaScript for MapReduce queries, and regular HTTP for an API"; homepage = "http://couchdb.apache.org"; license = licenses.asl20; diff --git a/pkgs/servers/http/darkhttpd/default.nix b/pkgs/servers/http/darkhttpd/default.nix index 4bcb16a04ea7..49097fe2bfac 100644 --- a/pkgs/servers/http/darkhttpd/default.nix +++ b/pkgs/servers/http/darkhttpd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "darkhttpd"; @@ -12,19 +12,16 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; installPhase = '' - # install darkhttpd - install -Dm755 "darkhttpd" "$out/bin/darkhttpd" - - # install license - install -d "$out/share/licenses/darkhttpd" - head -n 18 darkhttpd.c > "$out/share/licenses/darkhttpd/LICENSE" + install -Dm555 -t $out/bin darkhttpd + install -Dm444 -t $out/share/doc/${pname} README + head -n 18 darkhttpd.c > $out/share/doc/${pname}/LICENSE ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Small and secure static webserver"; - homepage = "https://unix4lyfe.org/darkhttpd/"; - license = licenses.bsd3; + homepage = "https://unix4lyfe.org/darkhttpd/"; + license = licenses.bsd3; maintainers = with maintainers; [ bobvanderlinden ]; - platforms = platforms.all; + platforms = platforms.all; }; } diff --git a/pkgs/servers/http/gatling/default.nix b/pkgs/servers/http/gatling/default.nix index 0c095c55e970..145a045014b8 100644 --- a/pkgs/servers/http/gatling/default.nix +++ b/pkgs/servers/http/gatling/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libowfat, libcap, zlib, openssl }: +{ lib, stdenv, fetchurl, libowfat, libcap, zlib, openssl }: let version = "0.16"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { make gatling ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A high performance web server"; homepage = "http://www.fefe.de/gatling/"; license = stdenv.lib.licenses.gpl2; diff --git a/pkgs/servers/http/h2o/default.nix b/pkgs/servers/http/h2o/default.nix index 999016e4bd95..a53be3e2aa6e 100644 --- a/pkgs/servers/http/h2o/default.nix +++ b/pkgs/servers/http/h2o/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , pkgconfig, cmake, ninja , openssl, libuv, zlib }: @@ -16,11 +16,10 @@ stdenv.mkDerivation rec { outputs = [ "out" "man" "dev" "lib" ]; - enableParallelBuilding = true; nativeBuildInputs = [ pkgconfig cmake ninja ]; buildInputs = [ openssl libuv zlib ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Optimized HTTP/1 and HTTP/2 server"; homepage = "https://h2o.examp1e.net"; license = licenses.mit; diff --git a/pkgs/servers/http/hiawatha/default.nix b/pkgs/servers/http/hiawatha/default.nix index 7def709a8408..3a4f44ebf8ca 100644 --- a/pkgs/servers/http/hiawatha/default.nix +++ b/pkgs/servers/http/hiawatha/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitLab , cmake @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { ( if enableToolkit then "-DENABLE_TOOLKIT=on" else "-DENABLE_TOOLKIT=off" ) ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.hiawatha-webserver.org"; description = "An advanced and secure webserver"; license = licenses.gpl2; diff --git a/pkgs/servers/http/hyp/default.nix b/pkgs/servers/http/hyp/default.nix index 6a16ee412f51..52f345d54771 100644 --- a/pkgs/servers/http/hyp/default.nix +++ b/pkgs/servers/http/hyp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python3Packages }: +{ lib, stdenv, fetchurl, python3Packages }: python3Packages.buildPythonPackage rec { pname = "hyp-server"; @@ -9,7 +9,7 @@ python3Packages.buildPythonPackage rec { sha256 = "1lafjdcn9nnq6xc3hhyizfwh6l69lc7rixn6dx65aq71c913jc15"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Hyperminimal https server"; homepage = "https://github.com/rnhmjoj/hyp"; license = with licenses; [gpl3Plus mit]; diff --git a/pkgs/servers/http/jboss/default.nix b/pkgs/servers/http/jboss/default.nix index 00ed93c860c1..ba89d19db34b 100644 --- a/pkgs/servers/http/jboss/default.nix +++ b/pkgs/servers/http/jboss/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, jdk }: +{ lib, stdenv, fetchurl, unzip, jdk }: stdenv.mkDerivation { name = "jboss-as-7.1.1.Final"; @@ -16,7 +16,7 @@ stdenv.mkDerivation { find $out/bin -name \*.sh -print0 | xargs -0 sed -i -e '/#!\/bin\/sh/aJAVA_HOME=${jdk}' ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.jboss.org/"; description = "Open Source J2EE application server"; license = licenses.lgpl21; diff --git a/pkgs/servers/http/lighttpd/default.nix b/pkgs/servers/http/lighttpd/default.nix index d90357044f54..a3f0b045aa11 100644 --- a/pkgs/servers/http/lighttpd/default.nix +++ b/pkgs/servers/http/lighttpd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPackages, fetchurl, pkgconfig, pcre, libxml2, zlib, bzip2, which, file +{ lib, stdenv, buildPackages, fetchurl, pkgconfig, pcre, libxml2, zlib, bzip2, which, file , openssl, enableMagnet ? false, lua5_1 ? null , enableMysql ? false, libmysqlclient ? null , enableLdap ? false, openldap ? null @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { rm "$out/share/lighttpd/doc/config/vhosts.d/Makefile"* ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Lightweight high-performance web server"; homepage = "http://www.lighttpd.net/"; license = stdenv.lib.licenses.bsd3; diff --git a/pkgs/servers/http/lwan/default.nix b/pkgs/servers/http/lwan/default.nix index fb8bc03a1d52..b1764b553694 100644 --- a/pkgs/servers/http/lwan/default.nix +++ b/pkgs/servers/http/lwan/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, zlib, cmake, jemalloc }: +{ lib, stdenv, fetchFromGitHub, pkgconfig, zlib, cmake, jemalloc }: stdenv.mkDerivation rec { pname = "lwan"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ jemalloc zlib ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Lightweight high-performance multi-threaded web server"; longDescription = "A lightweight and speedy web server with a low memory footprint (~500KiB for 10k idle connections), with minimal system calls and diff --git a/pkgs/servers/http/micro-httpd/default.nix b/pkgs/servers/http/micro-httpd/default.nix index d99af7a81aef..99960d6cb719 100644 --- a/pkgs/servers/http/micro-httpd/default.nix +++ b/pkgs/servers/http/micro-httpd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation { name = "micro-httpd-20140814"; @@ -14,7 +14,7 @@ stdenv.mkDerivation { mkdir -p $out/share/man/man8 ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://acme.com/software/micro_httpd/"; description = "A really small HTTP server"; license = licenses.bsd2; diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index ae658a7fdd4e..71bc969bbea6 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -265,7 +265,7 @@ in meta = { description = "PageSpeed module for Nginx"; homepage = "https://developers.google.com/speed/pagespeed/module/"; - license = pkgs.stdenv.lib.licenses.asl20; + license = pkgs.lib.licenses.asl20; }; } '' diff --git a/pkgs/servers/http/spawn-fcgi/default.nix b/pkgs/servers/http/spawn-fcgi/default.nix index c24b0b4c1a94..090450ba9688 100644 --- a/pkgs/servers/http/spawn-fcgi/default.nix +++ b/pkgs/servers/http/spawn-fcgi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchsvn, autoconf, automake }: +{ lib, stdenv, fetchsvn, autoconf, automake }: stdenv.mkDerivation rec { pname = "spawn-fcgi"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { ./autogen.sh ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://redmine.lighttpd.net/projects/spawn-fcgi"; description = "Provides an interface to external programs that support the FastCGI interface"; license = licenses.bsd3; diff --git a/pkgs/servers/http/tomcat/tomcat-native.nix b/pkgs/servers/http/tomcat/tomcat-native.nix index 55eb277522a1..313066d30e1d 100644 --- a/pkgs/servers/http/tomcat/tomcat-native.nix +++ b/pkgs/servers/http/tomcat/tomcat-native.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, apr, jdk, openssl }: +{ lib, stdenv, fetchurl, apr, jdk, openssl }: stdenv.mkDerivation rec { pname = "tomcat-native"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { "--with-ssl=${openssl.dev}" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "An optional component for use with Apache Tomcat that allows Tomcat to use certain native resources for performance, compatibility, etc"; homepage = "https://tomcat.apache.org/native-doc/"; license = licenses.asl20; diff --git a/pkgs/servers/http/webfs/default.nix b/pkgs/servers/http/webfs/default.nix index cb95673b5bb1..1281dee22be3 100644 --- a/pkgs/servers/http/webfs/default.nix +++ b/pkgs/servers/http/webfs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl }: +{ lib, stdenv, fetchurl, openssl }: let # Let's not pull the whole apache httpd package mime_file = fetchurl { @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { "prefix=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "HTTP server for purely static content"; homepage = "http://linux.bytesex.org/misc/webfs.html"; license = licenses.gpl2; diff --git a/pkgs/servers/http/yaws/default.nix b/pkgs/servers/http/yaws/default.nix index 1d57a951dc7b..be22ebdd36c9 100644 --- a/pkgs/servers/http/yaws/default.nix +++ b/pkgs/servers/http/yaws/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, erlang, pam, perl }: +{lib, stdenv, fetchurl, erlang, pam, perl }: stdenv.mkDerivation rec { pname = "yaws"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { sed -i "s#which #type -P #" $out/bin/yaws ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A high performance HTTP 1.1 server in Erlang"; homepage = "http://yaws.hyber.org"; license = licenses.bsd2; diff --git a/pkgs/servers/hydron/default.nix b/pkgs/servers/hydron/default.nix index 28c92d073ff3..3a67f6143483 100644 --- a/pkgs/servers/hydron/default.nix +++ b/pkgs/servers/hydron/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, pkgconfig, ffmpeg-full, graphicsmagick +{ lib, stdenv, buildGoPackage, fetchFromGitHub, pkgconfig, ffmpeg-full, graphicsmagick , quicktemplate, go-bindata, easyjson }: buildGoPackage { @@ -18,7 +18,7 @@ buildGoPackage { buildInputs = [ ffmpeg-full graphicsmagick quicktemplate easyjson ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/bakape/hydron"; description = "High performance media tagger and organizer"; license = licenses.lgpl3Plus; diff --git a/pkgs/servers/icecream/default.nix b/pkgs/servers/icecream/default.nix index 1800700b0408..573dcee7170e 100644 --- a/pkgs/servers/icecream/default.nix +++ b/pkgs/servers/icecream/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, docbook2x, libarchive, libcap_ng, lzo, zstd, docbook_xml_dtd_45 }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, docbook2x, libarchive, libcap_ng, lzo, zstd, docbook_xml_dtd_45 }: stdenv.mkDerivation rec { pname = "icecream"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook docbook2x ]; buildInputs = [ libarchive libcap_ng lzo zstd docbook_xml_dtd_45 ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Distributed compiler with a central scheduler to share build load"; inherit (src.meta) homepage; license = licenses.gpl2; diff --git a/pkgs/servers/identd/nullidentdmod/default.nix b/pkgs/servers/identd/nullidentdmod/default.nix index 4fdc7f6d5030..b383135f2eb5 100644 --- a/pkgs/servers/identd/nullidentdmod/default.nix +++ b/pkgs/servers/identd/nullidentdmod/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ... }: stdenv.mkDerivation rec { +{ lib, stdenv, fetchFromGitHub, ... }: stdenv.mkDerivation rec { pname = "nullidentdmod"; version = "1.3"; @@ -15,7 +15,7 @@ install -Dm755 nullidentdmod $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Simple identd that just replies with a random string or customized userid"; license = licenses.gpl2; homepage = "http://acidhub.click/NullidentdMod"; diff --git a/pkgs/servers/identd/oidentd/default.nix b/pkgs/servers/identd/oidentd/default.nix index 46a26a659ac1..390b3cbc46a4 100644 --- a/pkgs/servers/identd/oidentd/default.nix +++ b/pkgs/servers/identd/oidentd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bison, flex }: +{ lib, stdenv, fetchurl, bison, flex }: stdenv.mkDerivation rec { pname = "oidentd"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1d5mqlknfywbx2bgj7ap7x6qzvz257hhqcqhy6zk45dqpsirdn7a"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Configurable Ident protocol server"; homepage = "https://oidentd.janikrabe.com/"; license = licenses.gpl2; diff --git a/pkgs/servers/irc/atheme/default.nix b/pkgs/servers/irc/atheme/default.nix index 06119861b9f4..95019fb939f4 100644 --- a/pkgs/servers/irc/atheme/default.nix +++ b/pkgs/servers/irc/atheme/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, libmowgli, pkgconfig, git, gettext, pcre, libidn, cracklib, openssl }: +{ lib, stdenv, fetchgit, libmowgli, pkgconfig, git, gettext, pcre, libidn, cracklib, openssl }: stdenv.mkDerivation rec { pname = "atheme"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { "--enable-reproducible-builds" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A set of services for IRC networks"; homepage = "https://atheme.github.io/"; license = licenses.isc; diff --git a/pkgs/servers/irc/charybdis/default.nix b/pkgs/servers/irc/charybdis/default.nix index ebc0b47f8b7b..bf31633e41e3 100644 --- a/pkgs/servers/irc/charybdis/default.nix +++ b/pkgs/servers/irc/charybdis/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, bison, flex, openssl, gnutls }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, bison, flex, openssl, gnutls }: stdenv.mkDerivation rec { name = "charybdis-4.1.2"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook bison flex ]; buildInputs = [ openssl gnutls ]; - meta = with stdenv.lib; { + meta = with lib; { description = "IRCv3 server designed to be highly scalable"; homepage = "https://github.com/charybdis-ircd/charybdis"; license = licenses.gpl2; diff --git a/pkgs/servers/irc/robustirc-bridge/default.nix b/pkgs/servers/irc/robustirc-bridge/default.nix index 84b80203f57c..d0b192010c10 100644 --- a/pkgs/servers/irc/robustirc-bridge/default.nix +++ b/pkgs/servers/irc/robustirc-bridge/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, nixosTests }: +{ lib, stdenv, buildGoModule, fetchFromGitHub, nixosTests }: buildGoModule rec { pname = "robustirc-bridge"; @@ -19,7 +19,7 @@ buildGoModule rec { passthru.tests.robustirc-bridge = nixosTests.robustirc-bridge; - meta = with stdenv.lib; { + meta = with lib; { description = "Bridge to robustirc.net-IRC-Network"; homepage = "https://robustirc.net/"; license = licenses.bsd3; diff --git a/pkgs/servers/irc/solanum/default.nix b/pkgs/servers/irc/solanum/default.nix new file mode 100644 index 000000000000..d5ee98a18043 --- /dev/null +++ b/pkgs/servers/irc/solanum/default.nix @@ -0,0 +1,60 @@ +{ lib, stdenv +, fetchFromGitHub +, autoreconfHook +, pkg-config +, bison +, flex +, openssl +, sqlite +, lksctp-tools +}: + +stdenv.mkDerivation rec { + pname = "solanum"; + version = "unstable-2020-12-14"; + + src = fetchFromGitHub { + owner = "solanum-ircd"; + repo = pname; + rev = "551e5a146eab4948ce4a57d87a7f671f2d7cc02d"; + sha256 = "14cd2cb04w6nwck7q49jw5zvifkzhkmblwhjfskc2nxcdb5x3l96"; + }; + + patches = [ + ./dont-create-logdir.patch + ]; + + configureFlags = [ + "--enable-epoll" + "--enable-ipv6" + "--enable-openssl=${openssl.dev}" + "--with-program-prefix=solanum-" + "--localstatedir=/var/lib/solanum" + "--with-rundir=/run/solanum" + "--with-logdir=/var/log/solanum" + ] ++ stdenv.lib.optionals (stdenv.isLinux) [ + "--enable-sctp=${lksctp-tools.out}/lib" + ]; + + nativeBuildInputs = [ + autoreconfHook + bison + flex + pkg-config + ]; + + buildInputs = [ + openssl + sqlite + ]; + + doCheck = !stdenv.isDarwin; + + meta = with lib; { + description = "An IRCd for unified networks"; + homepage = "https://github.com/solanum-ircd/solanum"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ hexa ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/servers/irc/solanum/dont-create-logdir.patch b/pkgs/servers/irc/solanum/dont-create-logdir.patch new file mode 100644 index 000000000000..e348dd7b85ba --- /dev/null +++ b/pkgs/servers/irc/solanum/dont-create-logdir.patch @@ -0,0 +1,14 @@ +diff --git a/Makefile.am b/Makefile.am +index 19e7b396..21093521 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -35,9 +35,6 @@ include/serno.h: + echo '#define DATECODE 0UL' >>include/serno.h; \ + fi + +-install-data-hook: +- test -d ${DESTDIR}${logdir} || mkdir -p ${DESTDIR}${logdir} +- + install-exec-hook: + rm -f ${DESTDIR}${libdir}/*.la + rm -f ${DESTDIR}${moduledir}/*.la diff --git a/pkgs/servers/irker/default.nix b/pkgs/servers/irker/default.nix index f91b5a73b7d0..8f6f31bba35d 100644 --- a/pkgs/servers/irker/default.nix +++ b/pkgs/servers/irker/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, python, pkgconfig +{ lib, stdenv, fetchFromGitLab, python, pkgconfig , xmlto, docbook2x, docbook_xsl, docbook_xml_dtd_412 }: stdenv.mkDerivation { @@ -31,7 +31,7 @@ stdenv.mkDerivation { "DESTDIR=$$out" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "IRC client that runs as a daemon accepting notification requests"; homepage = "https://gitlab.com/esr/irker"; license = licenses.bsd2; diff --git a/pkgs/servers/isso/default.nix b/pkgs/servers/isso/default.nix index d2387a1fa629..4680c37c85e3 100644 --- a/pkgs/servers/isso/default.nix +++ b/pkgs/servers/isso/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python3Packages, fetchFromGitHub }: +{ lib, stdenv, python3Packages, fetchFromGitHub }: with python3Packages; buildPythonApplication rec { @@ -35,7 +35,7 @@ with python3Packages; buildPythonApplication rec { ${python.interpreter} setup.py nosetests ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A commenting server similar to Disqus"; homepage = "https://posativ.org/isso/"; license = licenses.mit; diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index 61a845d75f57..9fda62a68afa 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ curl icu60 openssl zlib ]} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "API Support for your favorite torrent trackers"; homepage = "https://github.com/Jackett/Jackett/"; license = licenses.gpl2; diff --git a/pkgs/servers/jetbrains/youtrack.nix b/pkgs/servers/jetbrains/youtrack.nix index 2f8241e7b09d..a965a2dbfeec 100644 --- a/pkgs/servers/jetbrains/youtrack.nix +++ b/pkgs/servers/jetbrains/youtrack.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, jre, gawk }: +{ lib, stdenv, fetchurl, makeWrapper, jre, gawk }: stdenv.mkDerivation rec { pname = "youtrack"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Issue tracking and project management tool for developers"; maintainers = with maintainers; [ yorickvp ]; # https://www.jetbrains.com/youtrack/buy/license.html diff --git a/pkgs/servers/jicofo/default.nix b/pkgs/servers/jicofo/default.nix index 266b94dbffa1..f706438d6c14 100644 --- a/pkgs/servers/jicofo/default.nix +++ b/pkgs/servers/jicofo/default.nix @@ -1,4 +1,4 @@ -{ pkgs, stdenv, fetchurl, dpkg, jre_headless, nixosTests }: +{ pkgs, lib, stdenv, fetchurl, dpkg, jre_headless, nixosTests }: let pname = "jicofo"; @@ -30,7 +30,7 @@ stdenv.mkDerivation { single-node-smoke-test = nixosTests.jitsi-meet; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A server side focus component used in Jitsi Meet conferences"; longDescription = '' JItsi COnference FOcus is a server side focus component used in Jitsi Meet conferences. diff --git a/pkgs/servers/jitsi-videobridge/default.nix b/pkgs/servers/jitsi-videobridge/default.nix index 37cffa2e9206..d9dd84c7cfb8 100644 --- a/pkgs/servers/jitsi-videobridge/default.nix +++ b/pkgs/servers/jitsi-videobridge/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, dpkg, jre_headless, nixosTests }: +{ lib, stdenv, fetchurl, makeWrapper, dpkg, jre_headless, nixosTests }: let pname = "jitsi-videobridge2"; @@ -15,6 +15,8 @@ stdenv.mkDerivation { unpackCmd = "${dpkg}/bin/dpkg-deb -x $src debcontents"; + buildInputs = [ makeWrapper ]; + installPhase = '' substituteInPlace usr/share/jitsi-videobridge/jvb.sh \ --replace "exec java" "exec ${jre_headless}/bin/java" @@ -24,13 +26,17 @@ stdenv.mkDerivation { cp ${./logging.properties-journal} $out/etc/jitsi/videobridge/logging.properties-journal mv usr/share/jitsi-videobridge/* $out/share/jitsi-videobridge/ ln -s $out/share/jitsi-videobridge/jvb.sh $out/bin/jitsi-videobridge + + # work around https://github.com/jitsi/jitsi-videobridge/issues/1547 + wrapProgram $out/bin/jitsi-videobridge \ + --set VIDEOBRIDGE_GC_TYPE G1GC ''; passthru.tests = { single-host-smoke-test = nixosTests.jitsi-meet; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A WebRTC compatible video router"; longDescription = '' Jitsi Videobridge is an XMPP server component that allows for multiuser video communication. diff --git a/pkgs/servers/kapowbang/default.nix b/pkgs/servers/kapowbang/default.nix index 27c5feb0d8d1..a0096eab026c 100644 --- a/pkgs/servers/kapowbang/default.nix +++ b/pkgs/servers/kapowbang/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "kapowbang"; @@ -17,7 +17,7 @@ buildGoModule rec { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/BBVA/kapow"; description = "Expose command-line tools over HTTP"; license = licenses.asl20; diff --git a/pkgs/servers/keycloak/default.nix b/pkgs/servers/keycloak/default.nix index 6340f734d08c..91234cdb4100 100644 --- a/pkgs/servers/keycloak/default.nix +++ b/pkgs/servers/keycloak/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { passthru.tests = nixosTests.keycloak; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.keycloak.org/"; description = "Identity and access management for modern applications and services"; license = licenses.asl20; diff --git a/pkgs/servers/kippo/default.nix b/pkgs/servers/kippo/default.nix index e91c35538a25..a3c6d683a1ba 100644 --- a/pkgs/servers/kippo/default.nix +++ b/pkgs/servers/kippo/default.nix @@ -25,7 +25,7 @@ # # Use this package at your own risk. -{stdenv, fetchurl, pythonPackages }: +{lib, stdenv, fetchurl, pythonPackages }: let @@ -48,7 +48,7 @@ let # details. postInstall = "$out/bin/twistd --help > /dev/null"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://twistedmatrix.com/"; description = "Twisted, an event-driven networking engine written in Python"; longDescription = '' @@ -85,7 +85,7 @@ in stdenv.mkDerivation rec { passthru.twisted = twisted_13; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/desaster/kippo"; description = "SSH Honeypot"; longDescription = '' diff --git a/pkgs/servers/ldap/389/default.nix b/pkgs/servers/ldap/389/default.nix index 8de4c471e22a..9b518bf80a3e 100644 --- a/pkgs/servers/ldap/389/default.nix +++ b/pkgs/servers/ldap/389/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, autoreconfHook, pkgconfig, doxygen, perl, pam, nspr, nss, openldap +{ lib, stdenv, fetchurl, fetchpatch, autoreconfHook, pkgconfig, doxygen, perl, pam, nspr, nss, openldap , db, cyrus_sasl, svrcore, icu, net-snmp, kerberos, pcre, perlPackages, libevent, openssl, python }: @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { passthru.version = version; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.port389.org/"; description = "Enterprise-class Open Source LDAP server for Linux"; license = licenses.gpl3Plus; diff --git a/pkgs/servers/lidarr/default.nix b/pkgs/servers/lidarr/default.nix index 8074329aa1df..46c88b95c378 100644 --- a/pkgs/servers/lidarr/default.nix +++ b/pkgs/servers/lidarr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, mono, libmediainfo, sqlite, curl, chromaprint, makeWrapper }: +{ lib, stdenv, fetchurl, mono, libmediainfo, sqlite, curl, chromaprint, makeWrapper }: stdenv.mkDerivation rec { pname = "lidarr"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { curl sqlite libmediainfo ]} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A Usenet/BitTorrent music downloader"; homepage = "https://lidarr.audio/"; license = licenses.gpl3; diff --git a/pkgs/servers/limesurvey/default.nix b/pkgs/servers/limesurvey/default.nix index 023e1bbd2ccf..261285341c42 100644 --- a/pkgs/servers/limesurvey/default.nix +++ b/pkgs/servers/limesurvey/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, writeText, nixosTests }: +{ lib, stdenv, fetchFromGitHub, writeText, nixosTests }: stdenv.mkDerivation rec { pname = "limesurvey"; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { smoke-test = nixosTests.limesurvey; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Open source survey application"; license = licenses.gpl2; homepage = "https://www.limesurvey.org"; diff --git a/pkgs/servers/livepeer/default.nix b/pkgs/servers/livepeer/default.nix index 959e82d259b1..6d5506ded88e 100644 --- a/pkgs/servers/livepeer/default.nix +++ b/pkgs/servers/livepeer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildGoModule +{ lib, stdenv, fetchFromGitHub, buildGoModule , pkg-config, ffmpeg, gnutls }: @@ -23,7 +23,7 @@ buildGoModule rec { buildInputs = [ ffmpeg gnutls ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Official Go implementation of the Livepeer protocol"; homepage = "https://livepeer.org"; license = licenses.mit; diff --git a/pkgs/servers/ma1sd/default.nix b/pkgs/servers/ma1sd/default.nix index a4a95197d0dc..055136c20719 100644 --- a/pkgs/servers/ma1sd/default.nix +++ b/pkgs/servers/ma1sd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, jre, git, gradle_5, perl, makeWrapper }: +{ lib, stdenv, fetchFromGitHub, jre, git, gradle_5, perl, makeWrapper }: let name = "ma1sd-${version}"; @@ -59,7 +59,7 @@ stdenv.mkDerivation { makeWrapper ${jre}/bin/java $out/bin/ma1sd --add-flags "-jar $out/lib/ma1sd.jar" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "a federated matrix identity server; fork of mxisd"; homepage = "https://github.com/ma1uta/ma1sd"; license = licenses.agpl3; diff --git a/pkgs/servers/mail/archiveopteryx/default.nix b/pkgs/servers/mail/archiveopteryx/default.nix index 962d5603e472..4cc612ef89a1 100644 --- a/pkgs/servers/mail/archiveopteryx/default.nix +++ b/pkgs/servers/mail/archiveopteryx/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl, perl, zlib, jam }: +{ lib, stdenv, fetchurl, openssl, perl, zlib, jam }: stdenv.mkDerivation rec { version = "3.2.0"; pname = "archiveopteryx"; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { mv installroot/$out $out ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://archiveopteryx.org/"; description = "An advanced PostgreSQL-based IMAP/POP server"; license = licenses.postgresql; diff --git a/pkgs/servers/mail/clamsmtp/default.nix b/pkgs/servers/mail/clamsmtp/default.nix index 327e545adcea..fc3212453d88 100644 --- a/pkgs/servers/mail/clamsmtp/default.nix +++ b/pkgs/servers/mail/clamsmtp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "clamsmtp-" + version; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { patches = [ ./header-order.patch ]; - meta = with stdenv.lib; { + meta = with lib; { description = "SMTP filter that allows to check for viruses using the ClamAV anti-virus software"; homepage = "http://thewalter.net/stef/software/clamsmtp/"; diff --git a/pkgs/servers/mail/dkimproxy/default.nix b/pkgs/servers/mail/dkimproxy/default.nix index 376beac7e36f..f4905ecf4d8f 100644 --- a/pkgs/servers/mail/dkimproxy/default.nix +++ b/pkgs/servers/mail/dkimproxy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, perlPackages, fetchurl }: +{ lib, stdenv, perlPackages, fetchurl }: let pkg = "dkimproxy"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { buildInputs = [ perlPackages.perl ]; propagatedBuildInputs = with perlPackages; [ Error MailDKIM MIMETools NetServer ]; - meta = with stdenv.lib; { + meta = with lib; { description = "SMTP-proxy that signs and/or verifies emails"; homepage = "http://dkimproxy.sourceforge.net/"; license = licenses.gpl2Plus; diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/servers/mail/dovecot/default.nix index 1a11e065d938..8d39c01478f9 100644 --- a/pkgs/servers/mail/dovecot/default.nix +++ b/pkgs/servers/mail/dovecot/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { pname = "dovecot"; - version = "2.3.11.3"; + version = "2.3.13"; nativeBuildInputs = [ perl pkgconfig ]; buildInputs = @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://dovecot.org/releases/2.3/${pname}-${version}.tar.gz"; - sha256 = "1p5gp8jbavcsaara5mfn5cbrnlxssajnchczbgmmfzr7228fmnfk"; + sha256 = "1i7ijss79a23v7b6lycfzaa8r5rh01k0h0b9h0j4a6n11sw7by53"; }; enableParallelBuilding = true; @@ -89,5 +89,6 @@ stdenv.mkDerivation rec { }; passthru.tests = { opensmtpd-interaction = nixosTests.opensmtpd; + inherit (nixosTests) dovecot; }; } diff --git a/pkgs/servers/mail/dovecot/plugins/fts_xapian/default.nix b/pkgs/servers/mail/dovecot/plugins/fts_xapian/default.nix index 8a0f2d4efab2..0b61a779c483 100644 --- a/pkgs/servers/mail/dovecot/plugins/fts_xapian/default.nix +++ b/pkgs/servers/mail/dovecot/plugins/fts_xapian/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, pkg-config, dovecot, libtool, xapian, icu64, sqlite }: +{ lib, stdenv, fetchFromGitHub, autoconf, automake, pkg-config, dovecot, libtool, xapian, icu64, sqlite }: stdenv.mkDerivation { pname = "fts-xapian"; version = "1.3.1"; @@ -25,7 +25,7 @@ stdenv.mkDerivation { "--with-moduledir=$(out)/lib/dovecot" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/grosjo/fts-xapian"; description = "Dovecot FTS plugin based on Xapian"; license = licenses.lgpl21; diff --git a/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix b/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix index 5c01453cb277..e5a07aa3c278 100644 --- a/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix +++ b/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, dovecot, openssl }: +{ lib, stdenv, fetchurl, dovecot, openssl }: stdenv.mkDerivation rec { pname = "dovecot-pigeonhole"; - version = "0.5.11"; + version = "0.5.13"; src = fetchurl { url = "https://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-${version}.tar.gz"; - sha256 = "1w5mryv6izh1gv7davnl94rb0pvh5bxl2bydzbfla1b83x22m5qb"; + sha256 = "05xz2d82ck6lmv94nbc3qff09j8b60a5640i3fmqwqsvv9kfa7wi"; }; buildInputs = [ dovecot openssl ]; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://pigeonhole.dovecot.org/"; description = "A sieve plugin for the Dovecot IMAP server"; license = licenses.lgpl21; diff --git a/pkgs/servers/mail/exim/default.nix b/pkgs/servers/mail/exim/default.nix index 8bd197f46c1d..25e1bb02dbed 100644 --- a/pkgs/servers/mail/exim/default.nix +++ b/pkgs/servers/mail/exim/default.nix @@ -1,4 +1,4 @@ -{ coreutils, db, fetchurl, openssl, pcre, perl, pkgconfig, stdenv +{ coreutils, db, fetchurl, openssl, pcre, perl, pkgconfig, lib, stdenv , enableLDAP ? false, openldap , enableMySQL ? false, libmysqlclient, zlib , enableAuthDovecot ? false, dovecot @@ -99,7 +99,7 @@ stdenv.mkDerivation rec { done ) ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://exim.org/"; description = "A mail transfer agent (MTA)"; license = with licenses; [ gpl2Plus bsd3 ]; diff --git a/pkgs/servers/mail/mailhog/default.nix b/pkgs/servers/mail/mailhog/default.nix index d0fded5c63b5..f1ba497720a9 100644 --- a/pkgs/servers/mail/mailhog/default.nix +++ b/pkgs/servers/mail/mailhog/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "MailHog"; @@ -13,7 +13,7 @@ buildGoPackage rec { sha256 = "124216850572r1h0ii7ad6jd1cd5czcvkz7k2jzvjb4pv2kl8p3y"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Web and API based SMTP testing"; homepage = "https://github.com/mailhog/MailHog"; changelog = "https://github.com/mailhog/MailHog/releases/tag/v${version}"; diff --git a/pkgs/servers/mail/mlmmj/default.nix b/pkgs/servers/mail/mlmmj/default.nix index 4caa9e8bfefa..e9d3bf9c8f32 100644 --- a/pkgs/servers/mail/mlmmj/default.nix +++ b/pkgs/servers/mail/mlmmj/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { install -vDm 644 -t $out/share/doc/mlmmj/ $docfiles ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://mlmmj.org"; description = "Mailing List Management Made Joyful"; maintainers = [ maintainers.edwtjo ]; diff --git a/pkgs/servers/mail/opensmtpd/default.nix b/pkgs/servers/mail/opensmtpd/default.nix index a59e18837d7d..cd6a760b9e23 100644 --- a/pkgs/servers/mail/opensmtpd/default.nix +++ b/pkgs/servers/mail/opensmtpd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoconf, automake, libtool, bison +{ lib, stdenv, fetchurl, autoconf, automake, libtool, bison , libasr, libevent, zlib, libressl, db, pam, nixosTests }: @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { "localstatedir=\${TMPDIR}" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.opensmtpd.org/"; description = '' A free implementation of the server-side SMTP protocol as defined by diff --git a/pkgs/servers/mail/opensmtpd/extras.nix b/pkgs/servers/mail/opensmtpd/extras.nix index 6c29de8cddbc..d3084ff258d6 100644 --- a/pkgs/servers/mail/opensmtpd/extras.nix +++ b/pkgs/servers/mail/opensmtpd/extras.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl, libevent, libasr, +{ lib, stdenv, fetchurl, openssl, libevent, libasr, python2, pkgconfig, lua5, perl, libmysqlclient, postgresql, sqlite, hiredis, enablePython ? true, enableLua ? true, @@ -81,7 +81,7 @@ stdenv.mkDerivation rec { + stdenv.lib.optionalString enableMysql " -L${libmysqlclient}/lib/mysql"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.opensmtpd.org/"; description = "Extra plugins for the OpenSMTPD mail server"; license = licenses.isc; diff --git a/pkgs/servers/mail/postgrey/default.nix b/pkgs/servers/mail/postgrey/default.nix index dffe0191a0a4..d0eaf40d06c7 100644 --- a/pkgs/servers/mail/postgrey/default.nix +++ b/pkgs/servers/mail/postgrey/default.nix @@ -15,7 +15,7 @@ in runCommand name { url = "https://postgrey.schweikert.ch/pub/${name}.tar.gz"; sha256 = "1xx51xih4711vrvc6d57il9ccallbljj5zhgqdb07jzmz11rakgz"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A postfix policy server to provide greylisting"; homepage = "https://postgrey.schweikert.ch/"; platforms = postfix.meta.platforms; diff --git a/pkgs/servers/mail/postsrsd/default.nix b/pkgs/servers/mail/postsrsd/default.nix index 28d281dde158..978a3f6216bc 100644 --- a/pkgs/servers/mail/postsrsd/default.nix +++ b/pkgs/servers/mail/postsrsd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, help2man }: +{ lib, stdenv, fetchFromGitHub, cmake, help2man }: stdenv.mkDerivation rec { pname = "postsrsd"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake help2man ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/roehling/postsrsd"; description = "Postfix Sender Rewriting Scheme daemon"; license = licenses.gpl2; diff --git a/pkgs/servers/mail/rspamd/default.nix b/pkgs/servers/mail/rspamd/default.nix index 71205ee093a4..ba69e99cc8b9 100644 --- a/pkgs/servers/mail/rspamd/default.nix +++ b/pkgs/servers/mail/rspamd/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { passthru.tests.rspamd = nixosTests.rspamd; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://rspamd.com"; license = licenses.asl20; description = "Advanced spam filtering system"; diff --git a/pkgs/servers/mail/spamassassin/default.nix b/pkgs/servers/mail/spamassassin/default.nix index c474c501cee8..afdd2ea860d3 100644 --- a/pkgs/servers/mail/spamassassin/default.nix +++ b/pkgs/servers/mail/spamassassin/default.nix @@ -2,11 +2,11 @@ perlPackages.buildPerlPackage rec { pname = "SpamAssassin"; - version = "3.4.3"; + version = "3.4.4"; src = fetchurl { url = "mirror://apache/spamassassin/source/Mail-${pname}-${version}.tar.bz2"; - sha256 = "1380cmrgjsyidnznr844c5yr9snz36dw7xchdfryi2s61vjzvf55"; + sha256 = "0ga5mi2nv2v91kakk9xakkg71rnxnddlzv76ca13vfyd4jgcfasf"; }; buildInputs = [ makeWrapper ] ++ (with perlPackages; [ @@ -37,6 +37,6 @@ perlPackages.buildPerlPackage rec { description = "Open-Source Spam Filter"; license = stdenv.lib.licenses.asl20; platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ peti qknight ]; + maintainers = with stdenv.lib.maintainers; [ peti qknight qyliss ]; }; } diff --git a/pkgs/servers/mail/sympa/default.nix b/pkgs/servers/mail/sympa/default.nix index 3e69274ff2d5..b3b7c742d719 100644 --- a/pkgs/servers/mail/sympa/default.nix +++ b/pkgs/servers/mail/sympa/default.nix @@ -1,4 +1,4 @@ -{ stdenv, perl, fetchFromGitHub, autoreconfHook, nixosTests }: +{ lib, stdenv, perl, fetchFromGitHub, autoreconfHook, nixosTests }: let dataDir = "/var/lib/sympa"; @@ -110,7 +110,7 @@ stdenv.mkDerivation rec { inherit (nixosTests) sympa; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Open source mailing list manager"; homepage = "https://www.sympa.org"; license = licenses.gpl2; diff --git a/pkgs/servers/mail/system-sendmail/default.nix b/pkgs/servers/mail/system-sendmail/default.nix index 7bd7df849244..a8fb65c0f42e 100644 --- a/pkgs/servers/mail/system-sendmail/default.nix +++ b/pkgs/servers/mail/system-sendmail/default.nix @@ -1,4 +1,4 @@ -{ stdenv, writeText, runtimeShell }: +{ lib, stdenv, writeText, runtimeShell }: let script = writeText "script" '' #!${runtimeShell} @@ -26,7 +26,7 @@ stdenv.mkDerivation { chmod +x $out/bin/sendmail ''; - meta = with stdenv.lib; { + meta = with lib; { description = '' A sendmail wrapper that calls the system sendmail. Do not install as system-wide sendmail! ''; diff --git a/pkgs/servers/martin/default.nix b/pkgs/servers/martin/default.nix index 2c506dca6af5..e2ba917e5aba 100644 --- a/pkgs/servers/martin/default.nix +++ b/pkgs/servers/martin/default.nix @@ -1,4 +1,4 @@ -{ stdenv, rustPlatform, fetchFromGitHub, Security }: +{ lib, stdenv, rustPlatform, fetchFromGitHub, Security }: rustPlatform.buildRustPackage rec { pname = "martin"; @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Blazing fast and lightweight PostGIS vector tiles server"; homepage = "https://martin.urbica.co/"; license = licenses.mit; diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 112fdac53d3a..6c6636b47ee0 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -73,7 +73,7 @@ buildPythonApplication rec { passthru.tools = tools; passthru.python = python3; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://matrix.org"; description = "Matrix reference homeserver"; license = licenses.asl20; diff --git a/pkgs/servers/matterbridge/default.nix b/pkgs/servers/matterbridge/default.nix index cab386d18f1e..7cc1c89de6d4 100644 --- a/pkgs/servers/matterbridge/default.nix +++ b/pkgs/servers/matterbridge/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchurl }: +{ lib, stdenv, buildGoModule, fetchurl }: buildGoModule rec { pname = "matterbridge"; @@ -13,7 +13,7 @@ buildGoModule rec { sha256 = "1s9y7m5xzmzcp8bphc1najrmci8rf8yvz8kwm2ggmchykw2q3jjg"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Simple bridge between Mattermost, IRC, XMPP, Gitter, Slack, Discord, Telegram, Rocket.Chat, Hipchat(via xmpp), Matrix and Steam"; homepage = "https://github.com/42wim/matterbridge"; license = with licenses; [ asl20 ]; diff --git a/pkgs/servers/mattermost/default.nix b/pkgs/servers/mattermost/default.nix index 722802a019d2..f63f76efabae 100644 --- a/pkgs/servers/mattermost/default.nix +++ b/pkgs/servers/mattermost/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub, buildGoPackage, buildEnv }: +{ lib, stdenv, fetchurl, fetchFromGitHub, buildGoPackage, buildEnv }: let version = "5.25.3"; @@ -48,7 +48,7 @@ in name = "mattermost-${version}"; paths = [ mattermost-server mattermost-webapp ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Open-source, self-hosted Slack-alternative"; homepage = "https://www.mattermost.org"; license = with licenses; [ agpl3 asl20 ]; diff --git a/pkgs/servers/mattermost/matterircd.nix b/pkgs/servers/mattermost/matterircd.nix index ece2195d117a..36edd851f36f 100644 --- a/pkgs/servers/mattermost/matterircd.nix +++ b/pkgs/servers/mattermost/matterircd.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "matterircd"; @@ -13,7 +13,7 @@ buildGoPackage rec { goPackagePath = "github.com/42wim/matterircd"; - meta = with stdenv.lib; { + meta = with lib; { inherit (src.meta) homepage; description = "Minimal IRC server bridge to Mattermost"; license = licenses.mit; diff --git a/pkgs/servers/mautrix-whatsapp/default.nix b/pkgs/servers/mautrix-whatsapp/default.nix index d6ab3ec34b86..eea873929275 100644 --- a/pkgs/servers/mautrix-whatsapp/default.nix +++ b/pkgs/servers/mautrix-whatsapp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, olm }: +{ lib, stdenv, buildGoModule, fetchFromGitHub, olm }: buildGoModule rec { pname = "mautrix-whatsapp"; @@ -19,7 +19,7 @@ buildGoModule rec { runVend = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/tulir/mautrix-whatsapp"; description = "Matrix <-> Whatsapp hybrid puppeting/relaybot bridge"; license = licenses.agpl3; diff --git a/pkgs/servers/mediatomb/default.nix b/pkgs/servers/mediatomb/default.nix index ff3d31ea2e72..c310e17608e8 100644 --- a/pkgs/servers/mediatomb/default.nix +++ b/pkgs/servers/mediatomb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit +{ lib, stdenv, fetchgit , sqlite, expat, mp4v2, flac, spidermonkey_68, taglib, libexif, curl, ffmpeg_3, file , pkgconfig, autoreconfHook }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ sqlite expat spidermonkey_68 taglib libexif curl ffmpeg_3 file mp4v2 flac pkgconfig autoreconfHook ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://mediatomb.cc"; repositories.git = "git://mediatomb.git.sourceforge.net/gitroot/mediatomb/mediatomb"; description = "UPnP MediaServer with a web user interface"; diff --git a/pkgs/servers/memcached/default.nix b/pkgs/servers/memcached/default.nix index 0435d0e1d402..9ea845338211 100644 --- a/pkgs/servers/memcached/default.nix +++ b/pkgs/servers/memcached/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, cyrus_sasl, libevent, nixosTests }: +{lib, stdenv, fetchurl, cyrus_sasl, libevent, nixosTests }: stdenv.mkDerivation rec { version = "1.6.9"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = [ "-Wno-error=deprecated-declarations" ] ++ stdenv.lib.optional stdenv.isDarwin "-Wno-error"; - meta = with stdenv.lib; { + meta = with lib; { description = "A distributed memory object caching system"; repositories.git = "https://github.com/memcached/memcached.git"; homepage = "http://memcached.org/"; diff --git a/pkgs/servers/metabase/default.nix b/pkgs/servers/metabase/default.nix index 8e16a59452eb..b63428ba7d9d 100644 --- a/pkgs/servers/metabase/default.nix +++ b/pkgs/servers/metabase/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, makeWrapper, jre }: +{ lib, stdenv, fetchurl, makeWrapper, jre }: stdenv.mkDerivation rec { pname = "metabase"; - version = "0.37.3"; + version = "0.37.5"; src = fetchurl { - url = "http://downloads.metabase.com/v${version}/metabase.jar"; - sha256 = "0ka0k0ficvw8srpaa89l0jdzpl4n7hjwz18r41kw1hzk2ydd3p5c"; + url = "https://downloads.metabase.com/v${version}/metabase.jar"; + sha256 = "1wvq5nx3y28w8wn6wyy650gc32hgkx7inbcylrdirhagzqhcm8z6"; }; nativeBuildInputs = [ makeWrapper ]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { makeWrapper ${jre}/bin/java $out/bin/metabase --add-flags "-jar $src" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "The easy, open source way for everyone in your company to ask questions and learn from data"; homepage = "https://metabase.com"; license = licenses.agpl3; diff --git a/pkgs/servers/meteor/default.nix b/pkgs/servers/meteor/default.nix index ddf7a972c2eb..96363583b62e 100644 --- a/pkgs/servers/meteor/default.nix +++ b/pkgs/servers/meteor/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, zlib, patchelf, runtimeShell }: let - version = "1.10.2"; + version = "1.12"; in stdenv.mkDerivation { @@ -9,7 +9,7 @@ stdenv.mkDerivation { pname = "meteor"; src = fetchurl { url = "https://static-meteor.netdna-ssl.com/packages-bootstrap/${version}/meteor-bootstrap-os.linux.x86_64.tar.gz"; - sha256 = "17s1n92nznasaaprvxg289a1fcizq2nj51xqw7akgw5f77q19vmw"; + sha256 = "0l3zc76djzypvc0dm5ikv5ybb6574qd6kdbbkarzc2dxx64wkyvb"; }; #dontStrip = true; diff --git a/pkgs/servers/microserver/default.nix b/pkgs/servers/microserver/default.nix index 618b6f75e7b7..4090aebc8f00 100644 --- a/pkgs/servers/microserver/default.nix +++ b/pkgs/servers/microserver/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform, darwin }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, darwin }: rustPlatform.buildRustPackage rec { pname = "microserver"; @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { buildInputs = stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Security ]); - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/robertohuertasm/microserver"; description = "Simple ad-hoc server with SPA support"; maintainers = with maintainers; [ flosse ]; diff --git a/pkgs/servers/miniflux/default.nix b/pkgs/servers/miniflux/default.nix index 55a328b21d55..55dd3d8afc59 100644 --- a/pkgs/servers/miniflux/default.nix +++ b/pkgs/servers/miniflux/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, installShellFiles, nixosTests }: +{ lib, stdenv, buildGoModule, fetchFromGitHub, installShellFiles, nixosTests }: let pname = "miniflux"; @@ -31,7 +31,7 @@ in buildGoModule { passthru.tests = nixosTests.miniflux; - meta = with stdenv.lib; { + meta = with lib; { description = "Minimalist and opinionated feed reader"; homepage = "https://miniflux.app/"; license = licenses.asl20; diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix index 32dee6460df7..cd7e1d4141d0 100644 --- a/pkgs/servers/minio/default.nix +++ b/pkgs/servers/minio/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, nixosTests }: +{ lib, stdenv, buildGoModule, fetchFromGitHub, nixosTests }: buildGoModule rec { pname = "minio"; @@ -33,7 +33,7 @@ buildGoModule rec { passthru.tests.minio = nixosTests.minio; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.minio.io/"; description = "An S3-compatible object storage server"; maintainers = with maintainers; [ eelco bachp ]; diff --git a/pkgs/servers/misc/airsonic/default.nix b/pkgs/servers/misc/airsonic/default.nix index 852b5350bbae..f20fed3e2df8 100644 --- a/pkgs/servers/misc/airsonic/default.nix +++ b/pkgs/servers/misc/airsonic/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "airsonic"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { cp "$src" "$out/webapps/airsonic.war" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Personal media streamer"; homepage = "https://airsonic.github.io"; license = stdenv.lib.licenses.gpl3; diff --git a/pkgs/servers/misc/oven-media-engine/default.nix b/pkgs/servers/misc/oven-media-engine/default.nix index 7faf8a9cfeeb..f7c97abf104e 100644 --- a/pkgs/servers/misc/oven-media-engine/default.nix +++ b/pkgs/servers/misc/oven-media-engine/default.nix @@ -1,5 +1,6 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub +, fetchpatch , srt , ffmpeg_3_4 , bc @@ -12,6 +13,7 @@ , libopus , srtp , jemalloc +, pcre2 }: let @@ -27,21 +29,30 @@ let in stdenv.mkDerivation rec { pname = "oven-media-engine"; - version = "0.10.8"; + version = "0.10.9-hotfix"; src = fetchFromGitHub { owner = "AirenSoft"; repo = "OvenMediaEngine"; rev = "v${version}"; - sha256 = "ec4yvS+4/rTBHGEx2OP0yoNGDtzPucFOcZJ0o0cCAHg="; + sha256 = "1fhria0vwqsgmsglv5gn858li33vfy2dwy1f1qdd2jwikskb53am"; }; + patches = [ + (fetchpatch { + # Needed to fix compilation under GCC 10. + url = "https://github.com/AirenSoft/OvenMediaEngine/commit/ad83e1d2226445d649e4b7e0c75106e31af4940d.patch"; + sha256 = "1zk1rgi1wsjl6gdx3hdmgxlgindv6a3lsnkwcgi87ga9abw4vafw"; + stripLen = 1; + }) + ]; + sourceRoot = "source/src"; makeFlags = "release CONFIG_LIBRARY_PATHS= CONFIG_PKG_PATHS= GLOBAL_CC=$(CC) GLOBAL_CXX=$(CXX) GLOBAL_LD=$(CXX) SHELL=${stdenv.shell}"; enableParallelBuilding = true; nativeBuildInputs = [ bc pkgconfig perl ]; - buildInputs = [ openssl srt zlib ffmpeg libvpx libopus srtp jemalloc ]; + buildInputs = [ openssl srt zlib ffmpeg libvpx libopus srtp jemalloc pcre2 ]; preBuild = '' patchShebangs core/colorg++ @@ -59,10 +70,10 @@ stdenv.mkDerivation rec { install -Dm0644 ../misc/conf_examples/Logger.xml $out/share/examples/edge_conf/Logger.xml ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Open-source streaming video service with sub-second latency"; homepage = "https://ovenmediaengine.com"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; [ lukegb ]; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/servers/misc/qremotecontrol-server/default.nix b/pkgs/servers/misc/qremotecontrol-server/default.nix index ddf69d109689..4e752a0e2841 100644 --- a/pkgs/servers/misc/qremotecontrol-server/default.nix +++ b/pkgs/servers/misc/qremotecontrol-server/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , qmake4Hook , qt4 @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { --replace /usr $out ''; - meta = with stdenv.lib; { + meta = with lib; { license = licenses.gpl3; platforms = platforms.all; maintainers = with maintainers; [ fgaz ]; diff --git a/pkgs/servers/misc/subsonic/default.nix b/pkgs/servers/misc/subsonic/default.nix index 9f7559872b9f..4c5ea3fe6c6c 100644 --- a/pkgs/servers/misc/subsonic/default.nix +++ b/pkgs/servers/misc/subsonic/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jre }: +{ lib, stdenv, fetchurl, jre }: stdenv.mkDerivation rec { pname = "subsonic"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://subsonic.org"; description = "Personal media streamer"; license = licenses.unfree; diff --git a/pkgs/servers/misc/taskserver/default.nix b/pkgs/servers/misc/taskserver/default.nix index e5024e6694ef..4cd2e13e4a52 100644 --- a/pkgs/servers/misc/taskserver/default.nix +++ b/pkgs/servers/misc/taskserver/default.nix @@ -4,8 +4,6 @@ stdenv.mkDerivation rec { pname = "taskserver"; version = "1.1.0"; - enableParallelBuilding = true; - src = fetchurl { url = "http://www.taskwarrior.org/download/taskd-${version}.tar.gz"; sha256 = "1d110q9vw8g5syzihxymik7hd27z1592wkpz55kya6lphzk8i13v"; @@ -30,8 +28,8 @@ stdenv.mkDerivation rec { done ''; - buildInputs = [ makeWrapper ]; - nativeBuildInputs = [ cmake libuuid gnutls ]; + buildInputs = [ libuuid gnutls ]; + nativeBuildInputs = [ cmake makeWrapper ]; meta = { description = "Server for synchronising Taskwarrior clients"; diff --git a/pkgs/servers/monitoring/alertmanager-bot/default.nix b/pkgs/servers/monitoring/alertmanager-bot/default.nix index f28ef6617c7a..562bd1ea8159 100644 --- a/pkgs/servers/monitoring/alertmanager-bot/default.nix +++ b/pkgs/servers/monitoring/alertmanager-bot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "alertmanager-bot"; @@ -15,7 +15,7 @@ buildGoPackage rec { goDeps = ./deps.nix; - meta = with stdenv.lib; { + meta = with lib; { description = "Bot for Prometheus' Alertmanager"; homepage = "https://github.com/metalmatze/alertmanager-bot"; license = licenses.mit; diff --git a/pkgs/servers/monitoring/cadvisor/default.nix b/pkgs/servers/monitoring/cadvisor/default.nix index 426dd2ad2a23..04767d0f71ce 100644 --- a/pkgs/servers/monitoring/cadvisor/default.nix +++ b/pkgs/servers/monitoring/cadvisor/default.nix @@ -1,23 +1,32 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "cadvisor"; - version = "0.36.0"; + version = "0.37.0"; src = fetchFromGitHub { owner = "google"; repo = "cadvisor"; rev = "v${version}"; - sha256 = "12hk2l82i7hawzbvj6imcfwn6v8pcfv0dbjfn259yi4b0jrlx6l8"; + sha256 = "15njzwvsl7jc2hgxlpsksmn7md3bqpavzaskfdlmzxnxp3biw3cj"; }; - goPackagePath = "github.com/google/cadvisor"; + modRoot = "./cmd"; - subPackages = [ "." ]; + vendorSha256 = "1vbydwj3xrz2gimwfasiqiwzsdiplaq7imildzr4wspkk64dprf4"; buildFlagsArray = [ "-ldflags=-s -w -X github.com/google/cadvisor/version.Version=${version}" ]; - meta = with stdenv.lib; { + postInstall = '' + mv $out/bin/{cmd,cadvisor} + rm $out/bin/example + ''; + + preCheck = '' + rm internal/container/mesos/handler_test.go + ''; + + meta = with lib; { description = "Analyzes resource usage and performance characteristics of running docker containers"; homepage = "https://github.com/google/cadvisor"; license = licenses.asl20; diff --git a/pkgs/servers/monitoring/consul-alerts/default.nix b/pkgs/servers/monitoring/consul-alerts/default.nix index 9bece7cb2e0b..896664658cf1 100644 --- a/pkgs/servers/monitoring/consul-alerts/default.nix +++ b/pkgs/servers/monitoring/consul-alerts/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "consul-alerts"; @@ -16,7 +16,7 @@ buildGoPackage rec { sha256 = "0836zicv76sd6ljhbbii1mrzh65pch10w3gfa128iynaviksbgn5"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "An extendable open source continuous integration server"; homepage = "https://github.com/AcalephStorage/consul-alerts"; # As per README diff --git a/pkgs/servers/monitoring/fusion-inventory/default.nix b/pkgs/servers/monitoring/fusion-inventory/default.nix index a7d2da6ac570..a94928730789 100644 --- a/pkgs/servers/monitoring/fusion-inventory/default.nix +++ b/pkgs/servers/monitoring/fusion-inventory/default.nix @@ -73,7 +73,7 @@ perlPackages.buildPerlPackage rec { outputs = [ "out" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.fusioninventory.org"; description = "FusionInventory unified Agent for UNIX, Linux, Windows and MacOSX"; license = stdenv.lib.licenses.gpl2; diff --git a/pkgs/servers/monitoring/grafana-image-renderer/default.nix b/pkgs/servers/monitoring/grafana-image-renderer/default.nix new file mode 100644 index 000000000000..d2bf5040b0e6 --- /dev/null +++ b/pkgs/servers/monitoring/grafana-image-renderer/default.nix @@ -0,0 +1,67 @@ +{ lib, mkYarnPackage, fetchFromGitHub, nodejs, runtimeShell }: + +# Notes for the upgrade: +# * Download the tarball of the new version to use. +# * Remove the `resolutions`-section from upstream `package.json` +# as this breaks with `yarn2nix`. +# * Regenerate `yarn.lock` and `yarn2nix`. +# * Replace new `package.json`, `yarn.nix`, `yarn.lock` here. +# * Update `version`+`hash` and rebuild. + +mkYarnPackage rec { + name = "grafana-image-renderer-unstable"; + version = "2020-12-01"; + + src = fetchFromGitHub { + owner = "grafana"; + repo = "grafana-image-renderer"; + rev = "ce1f81438e5f69c7fd7c73ce08bab624c4c92e25"; + sha256 = "sha256-1Ke1KLLNZ1dkLH0BWB60r2c45RBbndd0eepjc0nlHVk="; + }; + + buildPhase = '' + runHook preBuild + + pushd deps/renderer + npm run build + popd + + runHook postBuild + ''; + + dontInstall = true; + + packageJSON = ./package.json; + yarnNix = ./yarn.nix; + yarnLock = ./yarn.lock; + + distPhase = '' + runHook preDist + + shopt -s extglob + + pushd deps/renderer + install_path="$out/libexec/grafana-image-renderer" + mkdir -p $install_path + cp -R ../../node_modules $install_path + cp -R ./!(node_modules) $install_path + popd + + mkdir -p $out/bin + cat >$out/bin/grafana-image-renderer <=12 <13" + }, + "volta": { + "node": "12.19.0" + } +} diff --git a/pkgs/servers/monitoring/grafana-image-renderer/yarn.lock b/pkgs/servers/monitoring/grafana-image-renderer/yarn.lock new file mode 100644 index 000000000000..eaf8c1abb4ec --- /dev/null +++ b/pkgs/servers/monitoring/grafana-image-renderer/yarn.lock @@ -0,0 +1,3017 @@ +# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. +# yarn lockfile v1 + + +"@babel/code-frame@^7.0.0": + version "7.8.3" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.8.3.tgz#33e25903d7481181534e12ec0a25f16b6fcf419e" + integrity sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g== + dependencies: + "@babel/highlight" "^7.8.3" + +"@babel/highlight@^7.8.3": + version "7.8.3" + resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.8.3.tgz#28f173d04223eaaa59bc1d439a3836e6d1265797" + integrity sha512-PX4y5xQUvy0fnEVHrYOarRPXVWafSjTW9T0Hab8gVIawpl2Sj0ORyrygANq+KjcNlSSTw0YCLSNA8OyZ1I4yEg== + dependencies: + chalk "^2.0.0" + esutils "^2.0.2" + js-tokens "^4.0.0" + +"@babel/parser@^7.9.4": + version "7.9.6" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.9.6.tgz#3b1bbb30dabe600cd72db58720998376ff653bc7" + integrity sha512-AoeIEJn8vt+d/6+PXDRPaksYhnlbMIiejioBZvvMQsOjW/JYK6k/0dKnvvP3EhK5GfMBWDPtrxRtegWdAcdq9Q== + +"@babel/runtime@^7.9.2": + version "7.9.6" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.9.6.tgz#a9102eb5cadedf3f31d08a9ecf294af7827ea29f" + integrity sha512-64AF1xY3OAkFHqOb9s4jpgk1Mm5vDZ4L3acHvAml+53nO1XbXLuDodsVpO4OIUsmemlUHMxNdYMNJmsvOwLrvQ== + dependencies: + regenerator-runtime "^0.13.4" + +"@grpc/grpc-js@^1.0": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@grpc/grpc-js/-/grpc-js-1.0.3.tgz#7fa2ba293ccc1e91b24074c2628c8c68336e18c4" + integrity sha512-JKV3f5Bv2TZxK6eJSB9EarsZrnLxrvcFNwI9goq0YRXa3S6NNoCSnI3cG3lkXVIJ03Wng1WXe76kc2JQtRe7AQ== + dependencies: + semver "^6.2.0" + +"@grpc/proto-loader@^0.5.4": + version "0.5.4" + resolved "https://registry.yarnpkg.com/@grpc/proto-loader/-/proto-loader-0.5.4.tgz#038a3820540f621eeb1b05d81fbedfb045e14de0" + integrity sha512-HTM4QpI9B2XFkPz7pjwMyMgZchJ93TVkL3kWPW8GDMDKYxsMnmf4w2TNMJK7+KNiYHS5cJrCEAFlF+AwtXWVPA== + dependencies: + lodash.camelcase "^4.3.0" + protobufjs "^6.8.6" + +"@hapi/boom@^9.1.0": + version "9.1.0" + resolved "https://registry.yarnpkg.com/@hapi/boom/-/boom-9.1.0.tgz#0d9517657a56ff1e0b42d0aca9da1b37706fec56" + integrity sha512-4nZmpp4tXbm162LaZT45P7F7sgiem8dwAh2vHWT6XX24dozNjGMg6BvKCRvtCUcmcXqeMIUqWN8Rc5X8yKuROQ== + dependencies: + "@hapi/hoek" "9.x.x" + +"@hapi/hoek@9.x.x": + version "9.1.0" + resolved "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-9.1.0.tgz#6c9eafc78c1529248f8f4d92b0799a712b6052c6" + integrity sha512-i9YbZPN3QgfighY/1X1Pu118VUz2Fmmhd6b2n0/O8YVgGGfw0FbUYoA97k7FkpGJ+pLCFEDLUmAPPV4D1kpeFw== + +"@nodelib/fs.scandir@2.1.3": + version "2.1.3" + resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz#3a582bdb53804c6ba6d146579c46e52130cf4a3b" + integrity sha512-eGmwYQn3gxo4r7jdQnkrrN6bY478C3P+a/y72IJukF8LjB6ZHeB3c+Ehacj3sYeSmUXGlnA67/PmbM9CVwL7Dw== + dependencies: + "@nodelib/fs.stat" "2.0.3" + run-parallel "^1.1.9" + +"@nodelib/fs.stat@2.0.3", "@nodelib/fs.stat@^2.0.2": + version "2.0.3" + resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.3.tgz#34dc5f4cabbc720f4e60f75a747e7ecd6c175bd3" + integrity sha512-bQBFruR2TAwoevBEd/NWMoAAtNGzTRgdrqnYCc7dhzfoNvqPzLyqlEQnzZ3kVnNrSp25iyxE00/3h2fqGAGArA== + +"@nodelib/fs.walk@^1.2.3": + version "1.2.4" + resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.4.tgz#011b9202a70a6366e436ca5c065844528ab04976" + integrity sha512-1V9XOY4rDW0rehzbrcqAmHnz8e7SKvX27gh8Gt2WgB0+pdzdiLV83p72kZPU+jvMbS1qU5mauP2iOvO8rhmurQ== + dependencies: + "@nodelib/fs.scandir" "2.1.3" + fastq "^1.6.0" + +"@protobufjs/aspromise@^1.1.1", "@protobufjs/aspromise@^1.1.2": + version "1.1.2" + resolved "https://registry.yarnpkg.com/@protobufjs/aspromise/-/aspromise-1.1.2.tgz#9b8b0cc663d669a7d8f6f5d0893a14d348f30fbf" + integrity sha1-m4sMxmPWaafY9vXQiToU00jzD78= + +"@protobufjs/base64@^1.1.2": + version "1.1.2" + resolved "https://registry.yarnpkg.com/@protobufjs/base64/-/base64-1.1.2.tgz#4c85730e59b9a1f1f349047dbf24296034bb2735" + integrity sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg== + +"@protobufjs/codegen@^2.0.4": + version "2.0.4" + resolved "https://registry.yarnpkg.com/@protobufjs/codegen/-/codegen-2.0.4.tgz#7ef37f0d010fb028ad1ad59722e506d9262815cb" + integrity sha512-YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg== + +"@protobufjs/eventemitter@^1.1.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz#355cbc98bafad5978f9ed095f397621f1d066b70" + integrity sha1-NVy8mLr61ZePntCV85diHx0Ga3A= + +"@protobufjs/fetch@^1.1.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@protobufjs/fetch/-/fetch-1.1.0.tgz#ba99fb598614af65700c1619ff06d454b0d84c45" + integrity sha1-upn7WYYUr2VwDBYZ/wbUVLDYTEU= + dependencies: + "@protobufjs/aspromise" "^1.1.1" + "@protobufjs/inquire" "^1.1.0" + +"@protobufjs/float@^1.0.2": + version "1.0.2" + resolved "https://registry.yarnpkg.com/@protobufjs/float/-/float-1.0.2.tgz#5e9e1abdcb73fc0a7cb8b291df78c8cbd97b87d1" + integrity sha1-Xp4avctz/Ap8uLKR33jIy9l7h9E= + +"@protobufjs/inquire@^1.1.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@protobufjs/inquire/-/inquire-1.1.0.tgz#ff200e3e7cf2429e2dcafc1140828e8cc638f089" + integrity sha1-/yAOPnzyQp4tyvwRQIKOjMY48Ik= + +"@protobufjs/path@^1.1.2": + version "1.1.2" + resolved "https://registry.yarnpkg.com/@protobufjs/path/-/path-1.1.2.tgz#6cc2b20c5c9ad6ad0dccfd21ca7673d8d7fbf68d" + integrity sha1-bMKyDFya1q0NzP0hynZz2Nf79o0= + +"@protobufjs/pool@^1.1.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@protobufjs/pool/-/pool-1.1.0.tgz#09fd15f2d6d3abfa9b65bc366506d6ad7846ff54" + integrity sha1-Cf0V8tbTq/qbZbw2ZQbWrXhG/1Q= + +"@protobufjs/utf8@^1.1.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@protobufjs/utf8/-/utf8-1.1.0.tgz#a777360b5b39a1a2e5106f8e858f2fd2d060c570" + integrity sha1-p3c2C1s5oaLlEG+OhY8v0tBgxXA= + +"@samverschueren/stream-to-observable@^0.3.0": + version "0.3.0" + resolved "https://registry.yarnpkg.com/@samverschueren/stream-to-observable/-/stream-to-observable-0.3.0.tgz#ecdf48d532c58ea477acfcab80348424f8d0662f" + integrity sha512-MI4Xx6LHs4Webyvi6EbspgyAb4D2Q2VtnCQ1blOJcoLS6mVa8lNN2rkIy1CVxfTUpoyIbCTkXES1rLXztFD1lg== + dependencies: + any-observable "^0.3.0" + +"@types/body-parser@*": + version "1.17.1" + resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.17.1.tgz#18fcf61768fb5c30ccc508c21d6fd2e8b3bf7897" + integrity sha512-RoX2EZjMiFMjZh9lmYrwgoP9RTpAjSHiJxdp4oidAQVO02T7HER3xj9UKue5534ULWeqVEkujhWcyvUce+d68w== + dependencies: + "@types/connect" "*" + "@types/node" "*" + +"@types/color-name@^1.1.1": + version "1.1.1" + resolved "https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.1.tgz#1c1261bbeaa10a8055bbc5d8ab84b7b2afc846a0" + integrity sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ== + +"@types/connect@*": + version "3.4.33" + resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.33.tgz#31610c901eca573b8713c3330abc6e6b9f588546" + integrity sha512-2+FrkXY4zllzTNfJth7jOqEHC+enpLeGslEhpnTAkg21GkRrWV4SsAtqchtT4YS9/nODBU2/ZfsBY2X4J/dX7A== + dependencies: + "@types/node" "*" + +"@types/events@*": + version "3.0.0" + resolved "https://registry.yarnpkg.com/@types/events/-/events-3.0.0.tgz#2862f3f58a9a7f7c3e78d79f130dd4d71c25c2a7" + integrity sha512-EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g== + +"@types/express-serve-static-core@*": + version "4.17.1" + resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.1.tgz#82be64a77211b205641e0209096fd3afb62481d3" + integrity sha512-9e7jj549ZI+RxY21Cl0t8uBnWyb22HzILupyHZjYEVK//5TT/1bZodU+yUbLnPdoYViBBnNWbxp4zYjGV0zUGw== + dependencies: + "@types/node" "*" + "@types/range-parser" "*" + +"@types/express@^4.11.1": + version "4.17.2" + resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.2.tgz#a0fb7a23d8855bac31bc01d5a58cadd9b2173e6c" + integrity sha512-5mHFNyavtLoJmnusB8OKJ5bshSzw+qkMIBAobLrIM48HJvunFva9mOa6aBwh64lBFyNwBbs0xiEFuj4eU/NjCA== + dependencies: + "@types/body-parser" "*" + "@types/express-serve-static-core" "*" + "@types/serve-static" "*" + +"@types/glob@^7.1.1": + version "7.1.1" + resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.1.tgz#aa59a1c6e3fbc421e07ccd31a944c30eba521575" + integrity sha512-1Bh06cbWJUHMC97acuD6UMG29nMt0Aqz1vF3guLfG+kHHJhy3AyohZFFxYk2f7Q1SQIrNwvncxAE0N/9s70F2w== + dependencies: + "@types/events" "*" + "@types/minimatch" "*" + "@types/node" "*" + +"@types/long@^4.0.0": + version "4.0.0" + resolved "https://registry.yarnpkg.com/@types/long/-/long-4.0.0.tgz#719551d2352d301ac8b81db732acb6bdc28dbdef" + integrity sha512-1w52Nyx4Gq47uuu0EVcsHBxZFJgurQ+rTKS3qMHxR1GY2T8c2AJYd6vZoZ9q1rupaDjU0yT+Jc2XTyXkjeMA+Q== + +"@types/mime@*": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@types/mime/-/mime-2.0.1.tgz#dc488842312a7f075149312905b5e3c0b054c79d" + integrity sha512-FwI9gX75FgVBJ7ywgnq/P7tw+/o1GUbtP0KzbtusLigAOgIgNISRK0ZPl4qertvXSIE8YbsVJueQ90cDt9YYyw== + +"@types/minimatch@*": + version "3.0.3" + resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d" + integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA== + +"@types/node@*": + version "13.1.8" + resolved "https://registry.yarnpkg.com/@types/node/-/node-13.1.8.tgz#1d590429fe8187a02707720ecf38a6fe46ce294b" + integrity sha512-6XzyyNM9EKQW4HKuzbo/CkOIjn/evtCmsU+MUM1xDfJ+3/rNjBttM1NgN7AOQvN6tP1Sl1D1PIKMreTArnxM9A== + +"@types/node@^10.0.9", "@types/node@^10.1.0": + version "10.17.13" + resolved "https://registry.yarnpkg.com/@types/node/-/node-10.17.13.tgz#ccebcdb990bd6139cd16e84c39dc2fb1023ca90c" + integrity sha512-pMCcqU2zT4TjqYFrWtYHKal7Sl30Ims6ulZ4UFXxI4xbtQqK/qqKwkDoBFCfooRqqmRu9vY3xaJRwxSh673aYg== + +"@types/normalize-package-data@^2.4.0": + version "2.4.0" + resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz#e486d0d97396d79beedd0a6e33f4534ff6b4973e" + integrity sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA== + +"@types/range-parser@*": + version "1.2.3" + resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.3.tgz#7ee330ba7caafb98090bece86a5ee44115904c2c" + integrity sha512-ewFXqrQHlFsgc09MK5jP5iR7vumV/BYayNC6PgJO2LPe8vrnNFyjQjSppfEngITi0qvfKtzFvgKymGheFM9UOA== + +"@types/serve-static@*": + version "1.13.3" + resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.3.tgz#eb7e1c41c4468272557e897e9171ded5e2ded9d1" + integrity sha512-oprSwp094zOglVrXdlo/4bAHtKTAxX6VT8FOZlBKrmyLbNvE1zxZyJ6yikMVtHIvwP45+ZQGJn+FdXGKTozq0g== + dependencies: + "@types/express-serve-static-core" "*" + "@types/mime" "*" + +accepts@~1.3.7: + version "1.3.7" + resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz#531bc726517a3b2b41f850021c6cc15eaab507cd" + integrity sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA== + dependencies: + mime-types "~2.1.24" + negotiator "0.6.2" + +agent-base@^4.3.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.3.0.tgz#8165f01c436009bccad0b1d122f05ed770efc6ee" + integrity sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg== + dependencies: + es6-promisify "^5.0.0" + +aggregate-error@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.0.1.tgz#db2fe7246e536f40d9b5442a39e117d7dd6a24e0" + integrity sha512-quoaXsZ9/BLNae5yiNoUz+Nhkwz83GhWwtYFglcjEQB2NDHCIpApbqXxIFnm4Pq/Nvhrsq5sYJFyohrrxnTGAA== + dependencies: + clean-stack "^2.0.0" + indent-string "^4.0.0" + +ajv@^6.5.5: + version "6.11.0" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.11.0.tgz#c3607cbc8ae392d8a5a536f25b21f8e5f3f87fe9" + integrity sha512-nCprB/0syFYy9fVYU1ox1l2KN8S9I+tziH8D4zdZuLT3N6RMlGSGt5FSTpAiHB/Whv8Qs1cWHma1aMKZyaHRKA== + dependencies: + fast-deep-equal "^3.1.1" + fast-json-stable-stringify "^2.0.0" + json-schema-traverse "^0.4.1" + uri-js "^4.2.2" + +ansi-escapes@^3.0.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz#8780b98ff9dbf5638152d1f1fe5c1d7b4442976b" + integrity sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ== + +ansi-regex@^2.0.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df" + integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8= + +ansi-regex@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998" + integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg= + +ansi-styles@^2.2.1: + version "2.2.1" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe" + integrity sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4= + +ansi-styles@^3.2.1: + version "3.2.1" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" + integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA== + dependencies: + color-convert "^1.9.0" + +ansi-styles@^4.1.0: + version "4.2.1" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.2.1.tgz#90ae75c424d008d2624c5bf29ead3177ebfcf359" + integrity sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA== + dependencies: + "@types/color-name" "^1.1.1" + color-convert "^2.0.1" + +any-observable@^0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/any-observable/-/any-observable-0.3.0.tgz#af933475e5806a67d0d7df090dd5e8bef65d119b" + integrity sha512-/FQM1EDkTsf63Ub2C6O7GuYFDsSXUwsaZDurV0np41ocwq0jthUAYCmhBX9f+KwlaCgIuWyr/4WlUQUBfKfZog== + +any-promise@^1.0.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/any-promise/-/any-promise-1.3.0.tgz#abc6afeedcea52e809cdc0376aed3ce39635d17f" + integrity sha1-q8av7tzqUugJzcA3au0845Y10X8= + +argparse@^1.0.7: + version "1.0.10" + resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911" + integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg== + dependencies: + sprintf-js "~1.0.2" + +array-flatten@1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2" + integrity sha1-ml9pkFGx5wczKPKgCJaLZOopVdI= + +array-union@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d" + integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw== + +asn1@~0.2.3: + version "0.2.4" + resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz#8d2475dfab553bb33e77b54e59e880bb8ce23136" + integrity sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg== + dependencies: + safer-buffer "~2.1.0" + +assert-plus@1.0.0, assert-plus@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525" + integrity sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU= + +async-limiter@~1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.1.tgz#dd379e94f0db8310b08291f9d64c3209766617fd" + integrity sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ== + +async@^2.6.1: + version "2.6.3" + resolved "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz#d72625e2344a3656e3a3ad4fa749fa83299d82ff" + integrity sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg== + dependencies: + lodash "^4.17.14" + +asynckit@^0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" + integrity sha1-x57Zf380y48robyXkLzDZkdLS3k= + +aws-sign2@~0.7.0: + version "0.7.0" + resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8" + integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg= + +aws4@^1.8.0: + version "1.9.1" + resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.9.1.tgz#7e33d8f7d449b3f673cd72deb9abdc552dbe528e" + integrity sha512-wMHVg2EOHaMRxbzgFJ9gtjOOCrI80OHLG14rxi28XwOW8ux6IiEbRCGGGqCtdAIg4FQCbW20k9RsT4y3gJlFug== + +balanced-match@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767" + integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c= + +basic-auth@~2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/basic-auth/-/basic-auth-2.0.1.tgz#b998279bf47ce38344b4f3cf916d4679bbf51e3a" + integrity sha512-NF+epuEdnUYVlGuhaxbbq+dvJttwLnGY+YixlXlME5KpQ5W3CnXA5cVTneY3SPbPDRkcjMbifrwmFYcClgOZeg== + dependencies: + safe-buffer "5.1.2" + +bcrypt-pbkdf@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e" + integrity sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4= + dependencies: + tweetnacl "^0.14.3" + +bintrees@1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/bintrees/-/bintrees-1.0.1.tgz#0e655c9b9c2435eaab68bf4027226d2b55a34524" + integrity sha1-DmVcm5wkNeqraL9AJyJtK1WjRSQ= + +body-parser@1.19.0: + version "1.19.0" + resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.0.tgz#96b2709e57c9c4e09a6fd66a8fd979844f69f08a" + integrity sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw== + dependencies: + bytes "3.1.0" + content-type "~1.0.4" + debug "2.6.9" + depd "~1.1.2" + http-errors "1.7.2" + iconv-lite "0.4.24" + on-finished "~2.3.0" + qs "6.7.0" + raw-body "2.4.0" + type-is "~1.6.17" + +brace-expansion@^1.1.7: + version "1.1.11" + resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" + integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA== + dependencies: + balanced-match "^1.0.0" + concat-map "0.0.1" + +braces@^3.0.1: + version "3.0.2" + resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107" + integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A== + dependencies: + fill-range "^7.0.1" + +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== + +builtin-modules@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f" + integrity sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8= + +byline@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/byline/-/byline-5.0.0.tgz#741c5216468eadc457b03410118ad77de8c1ddb1" + integrity sha1-dBxSFkaOrcRXsDQQEYrXfejB3bE= + +bytes@3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6" + integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg== + +caller-callsite@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/caller-callsite/-/caller-callsite-2.0.0.tgz#847e0fce0a223750a9a027c54b33731ad3154134" + integrity sha1-hH4PzgoiN1CpoCfFSzNzGtMVQTQ= + dependencies: + callsites "^2.0.0" + +caller-path@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/caller-path/-/caller-path-2.0.0.tgz#468f83044e369ab2010fac5f06ceee15bb2cb1f4" + integrity sha1-Ro+DBE42mrIBD6xfBs7uFbsssfQ= + dependencies: + caller-callsite "^2.0.0" + +callsites@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/callsites/-/callsites-2.0.0.tgz#06eb84f00eea413da86affefacbffb36093b3c50" + integrity sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA= + +caseless@~0.12.0: + version "0.12.0" + resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc" + integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw= + +chalk@^1.0.0, chalk@^1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98" + integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg= + dependencies: + ansi-styles "^2.2.1" + escape-string-regexp "^1.0.2" + has-ansi "^2.0.0" + strip-ansi "^3.0.0" + supports-color "^2.0.0" + +chalk@^2.0.0, chalk@^2.3.0, chalk@^2.4.1, chalk@^2.4.2: + version "2.4.2" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" + integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== + dependencies: + ansi-styles "^3.2.1" + escape-string-regexp "^1.0.5" + supports-color "^5.3.0" + +chalk@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz#3f73c2bf526591f574cc492c51e2456349f844e4" + integrity sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg== + dependencies: + ansi-styles "^4.1.0" + supports-color "^7.1.0" + +ci-info@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46" + integrity sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ== + +clean-stack@^2.0.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b" + integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A== + +cli-cursor@^2.0.0, cli-cursor@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5" + integrity sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU= + dependencies: + restore-cursor "^2.0.0" + +cli-truncate@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-0.2.1.tgz#9f15cfbb0705005369216c626ac7d05ab90dd574" + integrity sha1-nxXPuwcFAFNpIWxiasfQWrkN1XQ= + dependencies: + slice-ansi "0.0.4" + string-width "^1.0.1" + +code-point-at@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" + integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c= + +color-convert@^1.9.0, color-convert@^1.9.1: + version "1.9.3" + resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" + integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg== + dependencies: + color-name "1.1.3" + +color-convert@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3" + integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ== + dependencies: + color-name "~1.1.4" + +color-name@1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" + integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU= + +color-name@^1.0.0, color-name@~1.1.4: + version "1.1.4" + resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" + integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== + +color-string@^1.5.2: + version "1.5.3" + resolved "https://registry.yarnpkg.com/color-string/-/color-string-1.5.3.tgz#c9bbc5f01b58b5492f3d6857459cb6590ce204cc" + integrity sha512-dC2C5qeWoYkxki5UAXapdjqO672AM4vZuPGRQfO8b5HKuKGBbKWpITyDYN7TOFKvRW7kOgAn3746clDBMDJyQw== + dependencies: + color-name "^1.0.0" + simple-swizzle "^0.2.2" + +color@3.0.x: + version "3.0.0" + resolved "https://registry.yarnpkg.com/color/-/color-3.0.0.tgz#d920b4328d534a3ac8295d68f7bd4ba6c427be9a" + integrity sha512-jCpd5+s0s0t7p3pHQKpnJ0TpQKKdleP71LWcA0aqiljpiuAkOSUFN/dyH8ZwF0hRmFlrIuRhufds1QyEP9EB+w== + dependencies: + color-convert "^1.9.1" + color-string "^1.5.2" + +colornames@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/colornames/-/colornames-1.1.1.tgz#f8889030685c7c4ff9e2a559f5077eb76a816f96" + integrity sha1-+IiQMGhcfE/54qVZ9Qd+t2qBb5Y= + +colors@^1.2.1: + version "1.4.0" + resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78" + integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA== + +colorspace@1.1.x: + version "1.1.2" + resolved "https://registry.yarnpkg.com/colorspace/-/colorspace-1.1.2.tgz#e0128950d082b86a2168580796a0aa5d6c68d8c5" + integrity sha512-vt+OoIP2d76xLhjwbBaucYlNSpPsrJWPlBTtwCpQKIu6/CSMutyzX93O/Do0qzpH3YoHEes8YEFXyZ797rEhzQ== + dependencies: + color "3.0.x" + text-hex "1.0.x" + +combined-stream@^1.0.6, combined-stream@~1.0.6: + version "1.0.8" + resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f" + integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg== + dependencies: + delayed-stream "~1.0.0" + +commander@^2.12.1, commander@^2.20.0: + version "2.20.3" + resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" + integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== + +concat-map@0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" + integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= + +concat-stream@1.6.2: + version "1.6.2" + resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34" + integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw== + dependencies: + buffer-from "^1.0.0" + inherits "^2.0.3" + readable-stream "^2.2.2" + typedarray "^0.0.6" + +content-disposition@0.5.3: + version "0.5.3" + resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.3.tgz#e130caf7e7279087c5616c2007d0485698984fbd" + integrity sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g== + dependencies: + safe-buffer "5.1.2" + +content-type@~1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b" + integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA== + +cookie-signature@1.0.6: + version "1.0.6" + resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c" + integrity sha1-4wOogrNCzD7oylE6eZmXNNqzriw= + +cookie@0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.0.tgz#beb437e7022b3b6d49019d088665303ebe9c14ba" + integrity sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg== + +core-util-is@1.0.2, 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= + +cosmiconfig@^5.2.1: + version "5.2.1" + resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.2.1.tgz#040f726809c591e77a17c0a3626ca45b4f168b1a" + integrity sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA== + dependencies: + import-fresh "^2.0.0" + is-directory "^0.3.1" + js-yaml "^3.13.1" + parse-json "^4.0.0" + +cross-spawn@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449" + integrity sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk= + dependencies: + lru-cache "^4.0.1" + shebang-command "^1.2.0" + which "^1.2.9" + +cross-spawn@^6.0.0: + version "6.0.5" + resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4" + integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ== + dependencies: + nice-try "^1.0.4" + path-key "^2.0.1" + semver "^5.5.0" + shebang-command "^1.2.0" + which "^1.2.9" + +cross-spawn@^7.0.0: + version "7.0.1" + resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.1.tgz#0ab56286e0f7c24e153d04cc2aa027e43a9a5d14" + integrity sha512-u7v4o84SwFpD32Z8IIcPZ6z1/ie24O6RU3RbtL5Y316l3KuHVPx9ItBgWQ6VlfAFnRnTtMUrsQ9MUUTuEZjogg== + dependencies: + path-key "^3.1.0" + shebang-command "^2.0.0" + which "^2.0.1" + +dashdash@^1.12.0: + version "1.14.1" + resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0" + integrity sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA= + dependencies: + assert-plus "^1.0.0" + +date-fns@^1.27.2: + version "1.30.1" + resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-1.30.1.tgz#2e71bf0b119153dbb4cc4e88d9ea5acfb50dc05c" + integrity sha512-hBSVCvSmWC+QypYObzwGOd9wqdDpOt+0wl0KbU+R+uuZBS1jN8VsD1ss3irQDknRj5NvxiTF6oj/nDRnN/UQNw== + +debug@2.6.9: + version "2.6.9" + resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" + integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== + dependencies: + ms "2.0.0" + +debug@^3.1.0: + version "3.2.6" + resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b" + integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ== + dependencies: + ms "^2.1.1" + +debug@^4.1.0, debug@^4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791" + integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw== + dependencies: + ms "^2.1.1" + +dedent@^0.7.0: + version "0.7.0" + resolved "https://registry.yarnpkg.com/dedent/-/dedent-0.7.0.tgz#2495ddbaf6eb874abb0e1be9df22d2e5a544326c" + integrity sha1-JJXduvbrh0q7Dhvp3yLS5aVEMmw= + +deep-is@~0.1.3: + version "0.1.3" + resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34" + integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ= + +del@^5.0.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/del/-/del-5.1.0.tgz#d9487c94e367410e6eff2925ee58c0c84a75b3a7" + integrity sha512-wH9xOVHnczo9jN2IW68BabcecVPxacIA3g/7z6vhSU/4stOKQzeCRK0yD0A24WiAAUJmmVpWqrERcTxnLo3AnA== + dependencies: + globby "^10.0.1" + graceful-fs "^4.2.2" + is-glob "^4.0.1" + is-path-cwd "^2.2.0" + is-path-inside "^3.0.1" + p-map "^3.0.0" + rimraf "^3.0.0" + slash "^3.0.0" + +delayed-stream@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" + integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk= + +depd@~1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9" + integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak= + +destroy@~1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80" + integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA= + +diagnostics@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/diagnostics/-/diagnostics-1.1.1.tgz#cab6ac33df70c9d9a727490ae43ac995a769b22a" + integrity sha512-8wn1PmdunLJ9Tqbx+Fx/ZEuHfJf4NKSN2ZBj7SJC/OWRWha843+WsTjqMe1B5E3p28jqBlp+mJ2fPVxPyNgYKQ== + dependencies: + colorspace "1.1.x" + enabled "1.0.x" + kuler "1.0.x" + +diff@^4.0.1: + version "4.0.2" + resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d" + integrity sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A== + +dir-glob@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f" + integrity sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA== + dependencies: + path-type "^4.0.0" + +duplexer@~0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1" + integrity sha1-rOb/gIwc5mtX0ev5eXessCM0z8E= + +ecc-jsbn@~0.1.1: + version "0.1.2" + resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9" + integrity sha1-OoOpBOVDUyh4dMVkt1SThoSamMk= + dependencies: + jsbn "~0.1.0" + safer-buffer "^2.1.0" + +ee-first@1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" + integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0= + +elegant-spinner@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/elegant-spinner/-/elegant-spinner-1.0.1.tgz#db043521c95d7e303fd8f345bedc3349cfb0729e" + integrity sha1-2wQ1IcldfjA/2PNFvtwzSc+wcp4= + +enabled@1.0.x: + version "1.0.2" + resolved "https://registry.yarnpkg.com/enabled/-/enabled-1.0.2.tgz#965f6513d2c2d1c5f4652b64a2e3396467fc2f93" + integrity sha1-ll9lE9LC0cX0ZStkouM5ZGf8L5M= + dependencies: + env-variable "0.0.x" + +encodeurl@~1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" + integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k= + +end-of-stream@^1.1.0: + version "1.4.4" + resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0" + integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q== + dependencies: + once "^1.4.0" + +env-variable@0.0.x: + version "0.0.5" + resolved "https://registry.yarnpkg.com/env-variable/-/env-variable-0.0.5.tgz#913dd830bef11e96a039c038d4130604eba37f88" + integrity sha512-zoB603vQReOFvTg5xMl9I1P2PnHsHQQKTEowsKKD7nseUfJq6UWzK+4YtlWUO1nhiQUxe6XMkk+JleSZD1NZFA== + +error-ex@^1.3.1: + version "1.3.2" + resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf" + integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g== + dependencies: + is-arrayish "^0.2.1" + +es6-promise@^4.0.3: + version "4.2.8" + resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.8.tgz#4eb21594c972bc40553d276e510539143db53e0a" + integrity sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w== + +es6-promisify@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/es6-promisify/-/es6-promisify-5.0.0.tgz#5109d62f3e56ea967c4b63505aef08291c8a5203" + integrity sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM= + dependencies: + es6-promise "^4.0.3" + +escape-html@~1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988" + integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg= + +escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" + integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= + +escodegen@^1.14.1: + version "1.14.1" + resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.1.tgz#ba01d0c8278b5e95a9a45350142026659027a457" + integrity sha512-Bmt7NcRySdIfNPfU2ZoXDrrXsG9ZjvDxcAlMfDUgRBjLOWTuIACXPBFJH7Z+cLb40JeQco5toikyc9t9P8E9SQ== + dependencies: + esprima "^4.0.1" + estraverse "^4.2.0" + esutils "^2.0.2" + optionator "^0.8.1" + optionalDependencies: + source-map "~0.6.1" + +esprima@^4.0.0, esprima@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71" + integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A== + +estraverse@^4.2.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d" + integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw== + +esutils@^2.0.2: + version "2.0.3" + resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64" + integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g== + +etag@~1.8.1: + version "1.8.1" + resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887" + integrity sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc= + +event-stream@=3.3.4: + version "3.3.4" + resolved "https://registry.yarnpkg.com/event-stream/-/event-stream-3.3.4.tgz#4ab4c9a0f5a54db9338b4c34d86bfce8f4b35571" + integrity sha1-SrTJoPWlTbkzi0w02Gv86PSzVXE= + dependencies: + duplexer "~0.1.1" + from "~0" + map-stream "~0.1.0" + pause-stream "0.0.11" + split "0.3" + stream-combiner "~0.0.4" + through "~2.3.1" + +execa@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz#c6236a5bb4df6d6f15e88e7f017798216749ddd8" + integrity sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA== + dependencies: + cross-spawn "^6.0.0" + get-stream "^4.0.0" + is-stream "^1.1.0" + npm-run-path "^2.0.0" + p-finally "^1.0.0" + signal-exit "^3.0.0" + strip-eof "^1.0.0" + +execa@^2.0.3: + version "2.1.0" + resolved "https://registry.yarnpkg.com/execa/-/execa-2.1.0.tgz#e5d3ecd837d2a60ec50f3da78fd39767747bbe99" + integrity sha512-Y/URAVapfbYy2Xp/gb6A0E7iR8xeqOCXsuuaoMn7A5PzrXUK84E1gyiEfq0wQd/GHA6GsoHWwhNq8anb0mleIw== + dependencies: + cross-spawn "^7.0.0" + get-stream "^5.0.0" + is-stream "^2.0.0" + merge-stream "^2.0.0" + npm-run-path "^3.0.0" + onetime "^5.1.0" + p-finally "^2.0.0" + signal-exit "^3.0.2" + strip-final-newline "^2.0.0" + +expand-template@^2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/expand-template/-/expand-template-2.0.3.tgz#6e14b3fcee0f3a6340ecb57d2e8918692052a47c" + integrity sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg== + +express-prom-bundle@^5.1.5: + version "5.1.5" + resolved "https://registry.yarnpkg.com/express-prom-bundle/-/express-prom-bundle-5.1.5.tgz#f298615879299a58cf8ec1350186f4de91d91fa4" + integrity sha512-tUaQUBu0r9zGYcVDpKBI2AeWimuuodaC5BSBkzLPQxRTxaKQShQNnONQSYwjLxbHfPwlCKVZlzfbB9Recnj0Vg== + dependencies: + on-finished "^2.3.0" + url-value-parser "^2.0.0" + +express@^4.16.3: + version "4.17.1" + resolved "https://registry.yarnpkg.com/express/-/express-4.17.1.tgz#4491fc38605cf51f8629d39c2b5d026f98a4c134" + integrity sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g== + dependencies: + accepts "~1.3.7" + array-flatten "1.1.1" + body-parser "1.19.0" + content-disposition "0.5.3" + content-type "~1.0.4" + cookie "0.4.0" + cookie-signature "1.0.6" + debug "2.6.9" + depd "~1.1.2" + encodeurl "~1.0.2" + escape-html "~1.0.3" + etag "~1.8.1" + finalhandler "~1.1.2" + fresh "0.5.2" + merge-descriptors "1.0.1" + methods "~1.1.2" + on-finished "~2.3.0" + parseurl "~1.3.3" + path-to-regexp "0.1.7" + proxy-addr "~2.0.5" + qs "6.7.0" + range-parser "~1.2.1" + safe-buffer "5.1.2" + send "0.17.1" + serve-static "1.14.1" + setprototypeof "1.1.1" + statuses "~1.5.0" + type-is "~1.6.18" + utils-merge "1.0.1" + vary "~1.1.2" + +extend@~3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa" + integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g== + +extract-zip@^1.6.6: + version "1.6.7" + resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-1.6.7.tgz#a840b4b8af6403264c8db57f4f1a74333ef81fe9" + integrity sha1-qEC0uK9kAyZMjbV/Txp0Mz74H+k= + dependencies: + concat-stream "1.6.2" + debug "2.6.9" + mkdirp "0.5.1" + yauzl "2.4.1" + +extsprintf@1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05" + integrity sha1-lpGEQOMEGnpBT4xS48V06zw+HgU= + +extsprintf@^1.2.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f" + integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8= + +fast-deep-equal@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz#545145077c501491e33b15ec408c294376e94ae4" + integrity sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA== + +fast-glob@^3.0.3: + version "3.1.1" + resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.1.1.tgz#87ee30e9e9f3eb40d6f254a7997655da753d7c82" + integrity sha512-nTCREpBY8w8r+boyFYAx21iL6faSsQynliPHM4Uf56SbkyohCNxpVPEH9xrF5TXKy+IsjkPUHDKiUkzBVRXn9g== + dependencies: + "@nodelib/fs.stat" "^2.0.2" + "@nodelib/fs.walk" "^1.2.3" + glob-parent "^5.1.0" + merge2 "^1.3.0" + micromatch "^4.0.2" + +fast-glob@^3.1.1: + version "3.2.2" + resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.2.tgz#ade1a9d91148965d4bf7c51f72e1ca662d32e63d" + integrity sha512-UDV82o4uQyljznxwMxyVRJgZZt3O5wENYojjzbaGEGZgeOxkLFf+V4cnUD+krzb2F72E18RhamkMZ7AdeggF7A== + dependencies: + "@nodelib/fs.stat" "^2.0.2" + "@nodelib/fs.walk" "^1.2.3" + glob-parent "^5.1.0" + merge2 "^1.3.0" + micromatch "^4.0.2" + picomatch "^2.2.1" + +fast-json-stable-stringify@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633" + integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw== + +fast-levenshtein@~2.0.6: + version "2.0.6" + resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" + integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc= + +fast-safe-stringify@^2.0.4: + version "2.0.7" + resolved "https://registry.yarnpkg.com/fast-safe-stringify/-/fast-safe-stringify-2.0.7.tgz#124aa885899261f68aedb42a7c080de9da608743" + integrity sha512-Utm6CdzT+6xsDk2m8S6uL8VHxNwI6Jub+e9NYTcAms28T84pTa25GJQV9j0CY0N1rM8hK4x6grpF2BQf+2qwVA== + +fastq@^1.6.0: + version "1.6.0" + resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.6.0.tgz#4ec8a38f4ac25f21492673adb7eae9cfef47d1c2" + integrity sha512-jmxqQ3Z/nXoeyDmWAzF9kH1aGZSis6e/SbfPmJpUnyZ0ogr6iscHQaml4wsEepEWSdtmpy+eVXmCRIMpxaXqOA== + dependencies: + reusify "^1.0.0" + +fd-slicer@~1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.0.1.tgz#8b5bcbd9ec327c5041bf9ab023fd6750f1177e65" + integrity sha1-i1vL2ewyfFBBv5qwI/1nUPEXfmU= + dependencies: + pend "~1.2.0" + +fecha@^2.3.3: + version "2.3.3" + resolved "https://registry.yarnpkg.com/fecha/-/fecha-2.3.3.tgz#948e74157df1a32fd1b12c3a3c3cdcb6ec9d96cd" + integrity sha512-lUGBnIamTAwk4znq5BcqsDaxSmZ9nDVJaij6NvRt/Tg4R69gERA+otPKbS86ROw9nxVMw2/mp1fnaiWqbs6Sdg== + +figures@^1.7.0: + version "1.7.0" + resolved "https://registry.yarnpkg.com/figures/-/figures-1.7.0.tgz#cbe1e3affcf1cd44b80cadfed28dc793a9701d2e" + integrity sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4= + dependencies: + escape-string-regexp "^1.0.5" + object-assign "^4.1.0" + +figures@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz#3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962" + integrity sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI= + dependencies: + escape-string-regexp "^1.0.5" + +fill-range@^7.0.1: + version "7.0.1" + resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40" + integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ== + dependencies: + to-regex-range "^5.0.1" + +finalhandler@~1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d" + integrity sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA== + dependencies: + debug "2.6.9" + encodeurl "~1.0.2" + escape-html "~1.0.3" + on-finished "~2.3.0" + parseurl "~1.3.3" + statuses "~1.5.0" + unpipe "~1.0.0" + +find-up@^4.0.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19" + integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw== + dependencies: + locate-path "^5.0.0" + path-exists "^4.0.0" + +forever-agent@~0.6.1: + version "0.6.1" + resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91" + integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE= + +form-data@~2.3.2: + version "2.3.3" + resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6" + integrity sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ== + dependencies: + asynckit "^0.4.0" + combined-stream "^1.0.6" + mime-types "^2.1.12" + +forwarded@~0.1.2: + version "0.1.2" + resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz#98c23dab1175657b8c0573e8ceccd91b0ff18c84" + integrity sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ= + +fresh@0.5.2: + version "0.5.2" + resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7" + integrity sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac= + +from2@^2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/from2/-/from2-2.3.0.tgz#8bfb5502bde4a4d36cfdeea007fcca21d7e382af" + integrity sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8= + dependencies: + inherits "^2.0.1" + readable-stream "^2.0.0" + +from@~0: + version "0.1.7" + resolved "https://registry.yarnpkg.com/from/-/from-0.1.7.tgz#83c60afc58b9c56997007ed1a768b3ab303a44fe" + integrity sha1-g8YK/Fi5xWmXAH7Rp2izqzA6RP4= + +fs-extra@^8.1.0: + version "8.1.0" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0" + integrity sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g== + dependencies: + graceful-fs "^4.2.0" + jsonfile "^4.0.0" + universalify "^0.1.0" + +fs.realpath@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" + integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8= + +get-own-enumerable-property-symbols@^3.0.0: + version "3.0.2" + resolved "https://registry.yarnpkg.com/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.2.tgz#b5fde77f22cbe35f390b4e089922c50bce6ef664" + integrity sha512-I0UBV/XOz1XkIJHEUDMZAbzCThU/H8DxmSfmdGcKPnVhu2VfFqr34jr9777IyaTYvxjedWhqVIilEDsCdP5G6g== + +get-stdin@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-7.0.0.tgz#8d5de98f15171a125c5e516643c7a6d0ea8a96f6" + integrity sha512-zRKcywvrXlXsA0v0i9Io4KDRaAw7+a1ZpjRwl9Wox8PFlVCCHra7E9c4kqXCoCM9nR5tBkaTTZRBoCm60bFqTQ== + +get-stream@^4.0.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5" + integrity sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w== + dependencies: + pump "^3.0.0" + +get-stream@^5.0.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.1.0.tgz#01203cdc92597f9b909067c3e656cc1f4d3c4dc9" + integrity sha512-EXr1FOzrzTfGeL0gQdeFEvOMm2mzMOglyiOXSTpPC+iAjAKftbr3jpCMWynogwYnM+eSj9sHGc6wjIcDvYiygw== + dependencies: + pump "^3.0.0" + +getpass@^0.1.1: + version "0.1.7" + resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa" + integrity sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo= + dependencies: + assert-plus "^1.0.0" + +glob-parent@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.0.tgz#5f4c1d1e748d30cd73ad2944b3577a81b081e8c2" + integrity sha512-qjtRgnIVmOfnKUE3NJAQEdk+lKrxfw8t5ke7SXtfMTHcjsBfOfWXCQfdb30zfDoZQ2IRSIiidmjtbHZPZ++Ihw== + dependencies: + is-glob "^4.0.1" + +glob@^7.1.1, glob@^7.1.3: + version "7.1.6" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6" + integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA== + dependencies: + fs.realpath "^1.0.0" + inflight "^1.0.4" + inherits "2" + minimatch "^3.0.4" + once "^1.3.0" + path-is-absolute "^1.0.0" + +globby@^10.0.1: + version "10.0.2" + resolved "https://registry.yarnpkg.com/globby/-/globby-10.0.2.tgz#277593e745acaa4646c3ab411289ec47a0392543" + integrity sha512-7dUi7RvCoT/xast/o/dLN53oqND4yk0nsHkhRgn9w65C4PofCLOoJ39iSOg+qVDdWQPIEj+eszMHQ+aLVwwQSg== + dependencies: + "@types/glob" "^7.1.1" + array-union "^2.1.0" + dir-glob "^3.0.1" + fast-glob "^3.0.3" + glob "^7.1.3" + ignore "^5.1.1" + merge2 "^1.2.3" + slash "^3.0.0" + +globby@^11.0.0: + version "11.0.0" + resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.0.tgz#56fd0e9f0d4f8fb0c456f1ab0dee96e1380bc154" + integrity sha512-iuehFnR3xu5wBBtm4xi0dMe92Ob87ufyu/dHwpDYfbcpYpIbrO5OnS8M1vWvrBhSGEJ3/Ecj7gnX76P8YxpPEg== + dependencies: + array-union "^2.1.0" + dir-glob "^3.0.1" + fast-glob "^3.1.1" + ignore "^5.1.4" + merge2 "^1.3.0" + slash "^3.0.0" + +google-protobuf@3.5.0: + version "3.5.0" + resolved "https://registry.yarnpkg.com/google-protobuf/-/google-protobuf-3.5.0.tgz#b8cc63c74d83457bd8a9a904503c8efb26bca339" + integrity sha1-uMxjx02DRXvYqakEUDyO+ya8ozk= + +graceful-fs@^4.1.6, graceful-fs@^4.2.2: + version "4.2.3" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.3.tgz#4a12ff1b60376ef09862c2093edd908328be8423" + integrity sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ== + +graceful-fs@^4.2.0: + version "4.2.4" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb" + integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw== + +har-schema@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92" + integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI= + +har-validator@~5.1.3: + version "5.1.3" + resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.3.tgz#1ef89ebd3e4996557675eed9893110dc350fa080" + integrity sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g== + dependencies: + ajv "^6.5.5" + har-schema "^2.0.0" + +has-ansi@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91" + integrity sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE= + dependencies: + ansi-regex "^2.0.0" + +has-flag@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" + integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0= + +has-flag@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" + integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ== + +hosted-git-info@^2.1.4: + version "2.8.5" + resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.5.tgz#759cfcf2c4d156ade59b0b2dfabddc42a6b9c70c" + integrity sha512-kssjab8CvdXfcXMXVcvsXum4Hwdq9XGtRD3TteMEvEbq0LXyiNQr6AprqKqfeaDXze7SxWvRxdpwE6ku7ikLkg== + +http-errors@1.7.2: + version "1.7.2" + resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.2.tgz#4f5029cf13239f31036e5b2e55292bcfbcc85c8f" + integrity sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg== + dependencies: + depd "~1.1.2" + inherits "2.0.3" + setprototypeof "1.1.1" + statuses ">= 1.5.0 < 2" + toidentifier "1.0.0" + +http-errors@~1.7.2: + version "1.7.3" + resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.3.tgz#6c619e4f9c60308c38519498c14fbb10aacebb06" + integrity sha512-ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw== + dependencies: + depd "~1.1.2" + inherits "2.0.4" + setprototypeof "1.1.1" + statuses ">= 1.5.0 < 2" + toidentifier "1.0.0" + +http-signature@~1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1" + integrity sha1-muzZJRFHcvPZW2WmCruPfBj7rOE= + dependencies: + assert-plus "^1.0.0" + jsprim "^1.2.2" + sshpk "^1.7.0" + +https-proxy-agent@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-3.0.1.tgz#b8c286433e87602311b01c8ea34413d856a4af81" + integrity sha512-+ML2Rbh6DAuee7d07tYGEKOEi2voWPUGan+ExdPbPW6Z3svq+JCqr0v8WmKPOkz1vOVykPCBSuobe7G8GJUtVg== + dependencies: + agent-base "^4.3.0" + debug "^3.1.0" + +husky@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/husky/-/husky-3.1.0.tgz#5faad520ab860582ed94f0c1a77f0f04c90b57c0" + integrity sha512-FJkPoHHB+6s4a+jwPqBudBDvYZsoQW5/HBuMSehC8qDiCe50kpcxeqFoDSlow+9I6wg47YxBoT3WxaURlrDIIQ== + dependencies: + chalk "^2.4.2" + ci-info "^2.0.0" + cosmiconfig "^5.2.1" + execa "^1.0.0" + get-stdin "^7.0.0" + opencollective-postinstall "^2.0.2" + pkg-dir "^4.2.0" + please-upgrade-node "^3.2.0" + read-pkg "^5.2.0" + run-node "^1.0.0" + slash "^3.0.0" + +iconv-lite@0.4.24: + version "0.4.24" + resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" + integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA== + dependencies: + safer-buffer ">= 2.1.2 < 3" + +ignore@^5.1.1, ignore@^5.1.4: + version "5.1.4" + resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.4.tgz#84b7b3dbe64552b6ef0eca99f6743dbec6d97adf" + integrity sha512-MzbUSahkTW1u7JpKKjY7LCARd1fU5W2rLdxlM4kdkayuCwZImjkpluF9CM1aLewYJguPDqewLam18Y6AU69A8A== + +import-fresh@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-2.0.0.tgz#d81355c15612d386c61f9ddd3922d4304822a546" + integrity sha1-2BNVwVYS04bGH53dOSLUMEgipUY= + dependencies: + caller-path "^2.0.0" + resolve-from "^3.0.0" + +imurmurhash@^0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" + integrity sha1-khi5srkoojixPcT7a21XbyMUU+o= + +indent-string@^3.0.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-3.2.0.tgz#4a5fd6d27cc332f37e5419a504dbb837105c9289" + integrity sha1-Sl/W0nzDMvN+VBmlBNu4NxBckok= + +indent-string@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251" + integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg== + +inflight@^1.0.4: + version "1.0.6" + resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" + integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk= + dependencies: + once "^1.3.0" + wrappy "1" + +inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, 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== + +inherits@2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" + integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4= + +into-stream@^5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/into-stream/-/into-stream-5.1.1.tgz#f9a20a348a11f3c13face22763f2d02e127f4db8" + integrity sha512-krrAJ7McQxGGmvaYbB7Q1mcA+cRwg9Ij2RfWIeVesNBgVDZmzY/Fa4IpZUT3bmdRzMzdf/mzltCG2Dq99IZGBA== + dependencies: + from2 "^2.3.0" + p-is-promise "^3.0.0" + +ipaddr.js@1.9.0: + version "1.9.0" + resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.0.tgz#37df74e430a0e47550fe54a2defe30d8acd95f65" + integrity sha512-M4Sjn6N/+O6/IXSJseKqHoFc+5FdGJ22sXqnjTpdZweHK64MzEPAyQZyEU3R/KRv2GLoa7nNtg/C2Ev6m7z+eA== + +is-arrayish@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d" + integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0= + +is-arrayish@^0.3.1: + version "0.3.2" + resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.3.2.tgz#4574a2ae56f7ab206896fb431eaeed066fdf8f03" + integrity sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ== + +is-directory@^0.3.1: + version "0.3.1" + resolved "https://registry.yarnpkg.com/is-directory/-/is-directory-0.3.1.tgz#61339b6f2475fc772fd9c9d83f5c8575dc154ae1" + integrity sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE= + +is-extglob@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" + integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI= + +is-fullwidth-code-point@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb" + integrity sha1-754xOG8DGn8NZDr4L95QxFfvAMs= + dependencies: + number-is-nan "^1.0.0" + +is-fullwidth-code-point@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f" + integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8= + +is-glob@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc" + integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg== + dependencies: + is-extglob "^2.1.1" + +is-number@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b" + integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng== + +is-obj@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f" + integrity sha1-PkcprB9f3gJc19g6iW2rn09n2w8= + +is-observable@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/is-observable/-/is-observable-1.1.0.tgz#b3e986c8f44de950867cab5403f5a3465005975e" + integrity sha512-NqCa4Sa2d+u7BWc6CukaObG3Fh+CU9bvixbpcXYhy2VvYS7vVGIdAgnIS5Ks3A/cqk4rebLJ9s8zBstT2aKnIA== + dependencies: + symbol-observable "^1.1.0" + +is-path-cwd@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-2.2.0.tgz#67d43b82664a7b5191fd9119127eb300048a9fdb" + integrity sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ== + +is-path-inside@^3.0.1: + version "3.0.2" + resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.2.tgz#f5220fc82a3e233757291dddc9c5877f2a1f3017" + integrity sha512-/2UGPSgmtqwo1ktx8NDHjuPwZWmHhO+gj0f93EkhLB5RgW9RZevWYYlIkS6zePc6U2WpOdQYIwHe9YC4DWEBVg== + +is-promise@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa" + integrity sha1-eaKp7OfwlugPNtKy87wWwf9L8/o= + +is-regexp@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-regexp/-/is-regexp-1.0.0.tgz#fd2d883545c46bac5a633e7b9a09e87fa2cb5069" + integrity sha1-/S2INUXEa6xaYz57mgnof6LLUGk= + +is-stream@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44" + integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ= + +is-stream@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.0.tgz#bde9c32680d6fae04129d6ac9d921ce7815f78e3" + integrity sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw== + +is-typedarray@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" + integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo= + +isarray@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" + integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE= + +isexe@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" + integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA= + +isstream@~0.1.2: + version "0.1.2" + resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a" + integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo= + +js-tokens@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" + integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ== + +js-yaml@^3.13.1: + version "3.13.1" + resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847" + integrity sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw== + dependencies: + argparse "^1.0.7" + esprima "^4.0.0" + +jsbn@~0.1.0: + version "0.1.1" + resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513" + integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM= + +json-parse-better-errors@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9" + integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw== + +json-schema-traverse@^0.4.1: + version "0.4.1" + resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660" + integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg== + +json-schema@0.2.3: + version "0.2.3" + resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13" + integrity sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM= + +json-stringify-safe@~5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb" + integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus= + +jsonfile@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb" + integrity sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss= + optionalDependencies: + graceful-fs "^4.1.6" + +jsprim@^1.2.2: + version "1.4.1" + resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2" + integrity sha1-MT5mvB5cwG5Di8G3SZwuXFastqI= + dependencies: + assert-plus "1.0.0" + extsprintf "1.3.0" + json-schema "0.2.3" + verror "1.10.0" + +kuler@1.0.x: + version "1.0.1" + resolved "https://registry.yarnpkg.com/kuler/-/kuler-1.0.1.tgz#ef7c784f36c9fb6e16dd3150d152677b2b0228a6" + integrity sha512-J9nVUucG1p/skKul6DU3PUZrhs0LPulNaeUOox0IyXDi8S4CztTHs1gQphhuZmzXG7VOQSf6NJfKuzteQLv9gQ== + dependencies: + colornames "^1.1.1" + +levn@~0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee" + integrity sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4= + dependencies: + prelude-ls "~1.1.2" + type-check "~0.3.2" + +lines-and-columns@^1.1.6: + version "1.1.6" + resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00" + integrity sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA= + +lint-staged@^9.5.0: + version "9.5.0" + resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-9.5.0.tgz#290ec605252af646d9b74d73a0fa118362b05a33" + integrity sha512-nawMob9cb/G1J98nb8v3VC/E8rcX1rryUYXVZ69aT9kde6YWX+uvNOEHY5yf2gcWcTJGiD0kqXmCnS3oD75GIA== + dependencies: + chalk "^2.4.2" + commander "^2.20.0" + cosmiconfig "^5.2.1" + debug "^4.1.1" + dedent "^0.7.0" + del "^5.0.0" + execa "^2.0.3" + listr "^0.14.3" + log-symbols "^3.0.0" + micromatch "^4.0.2" + normalize-path "^3.0.0" + please-upgrade-node "^3.1.1" + string-argv "^0.3.0" + stringify-object "^3.3.0" + +listr-silent-renderer@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/listr-silent-renderer/-/listr-silent-renderer-1.1.1.tgz#924b5a3757153770bf1a8e3fbf74b8bbf3f9242e" + integrity sha1-kktaN1cVN3C/Go4/v3S4u/P5JC4= + +listr-update-renderer@^0.5.0: + version "0.5.0" + resolved "https://registry.yarnpkg.com/listr-update-renderer/-/listr-update-renderer-0.5.0.tgz#4ea8368548a7b8aecb7e06d8c95cb45ae2ede6a2" + integrity sha512-tKRsZpKz8GSGqoI/+caPmfrypiaq+OQCbd+CovEC24uk1h952lVj5sC7SqyFUm+OaJ5HN/a1YLt5cit2FMNsFA== + dependencies: + chalk "^1.1.3" + cli-truncate "^0.2.1" + elegant-spinner "^1.0.1" + figures "^1.7.0" + indent-string "^3.0.0" + log-symbols "^1.0.2" + log-update "^2.3.0" + strip-ansi "^3.0.1" + +listr-verbose-renderer@^0.5.0: + version "0.5.0" + resolved "https://registry.yarnpkg.com/listr-verbose-renderer/-/listr-verbose-renderer-0.5.0.tgz#f1132167535ea4c1261102b9f28dac7cba1e03db" + integrity sha512-04PDPqSlsqIOaaaGZ+41vq5FejI9auqTInicFRndCBgE3bXG8D6W1I+mWhk+1nqbHmyhla/6BUrd5OSiHwKRXw== + dependencies: + chalk "^2.4.1" + cli-cursor "^2.1.0" + date-fns "^1.27.2" + figures "^2.0.0" + +listr@^0.14.3: + version "0.14.3" + resolved "https://registry.yarnpkg.com/listr/-/listr-0.14.3.tgz#2fea909604e434be464c50bddba0d496928fa586" + integrity sha512-RmAl7su35BFd/xoMamRjpIE4j3v+L28o8CT5YhAXQJm1fD+1l9ngXY8JAQRJ+tFK2i5njvi0iRUKV09vPwA0iA== + dependencies: + "@samverschueren/stream-to-observable" "^0.3.0" + is-observable "^1.1.0" + is-promise "^2.1.0" + is-stream "^1.1.0" + listr-silent-renderer "^1.1.1" + listr-update-renderer "^0.5.0" + listr-verbose-renderer "^0.5.0" + p-map "^2.0.0" + rxjs "^6.3.3" + +locate-path@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0" + integrity sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g== + dependencies: + p-locate "^4.1.0" + +lodash.camelcase@^4.3.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6" + integrity sha1-soqmKIorn8ZRA1x3EfZathkDMaY= + +lodash@^4.17.14, lodash@^4.17.19: + version "4.17.19" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.19.tgz#e48ddedbe30b3321783c5b4301fbd353bc1e4a4b" + integrity sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ== + +log-symbols@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-1.0.2.tgz#376ff7b58ea3086a0f09facc74617eca501e1a18" + integrity sha1-N2/3tY6jCGoPCfrMdGF+ylAeGhg= + dependencies: + chalk "^1.0.0" + +log-symbols@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-3.0.0.tgz#f3a08516a5dea893336a7dee14d18a1cfdab77c4" + integrity sha512-dSkNGuI7iG3mfvDzUuYZyvk5dD9ocYCYzNU6CYDE6+Xqd+gwme6Z00NS3dUh8mq/73HaEtT7m6W+yUPtU6BZnQ== + dependencies: + chalk "^2.4.2" + +log-update@^2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/log-update/-/log-update-2.3.0.tgz#88328fd7d1ce7938b29283746f0b1bc126b24708" + integrity sha1-iDKP19HOeTiykoN0bwsbwSayRwg= + dependencies: + ansi-escapes "^3.0.0" + cli-cursor "^2.0.0" + wrap-ansi "^3.0.1" + +logform@^2.1.1: + version "2.1.2" + resolved "https://registry.yarnpkg.com/logform/-/logform-2.1.2.tgz#957155ebeb67a13164069825ce67ddb5bb2dd360" + integrity sha512-+lZh4OpERDBLqjiwDLpAWNQu6KMjnlXH2ByZwCuSqVPJletw0kTWJf5CgSNAUKn1KUkv3m2cUz/LK8zyEy7wzQ== + dependencies: + colors "^1.2.1" + fast-safe-stringify "^2.0.4" + fecha "^2.3.3" + ms "^2.1.1" + triple-beam "^1.3.0" + +long@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/long/-/long-4.0.0.tgz#9a7b71cfb7d361a194ea555241c92f7468d5bf28" + integrity sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA== + +lru-cache@^4.0.1: + version "4.1.5" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd" + integrity sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g== + dependencies: + pseudomap "^1.0.2" + yallist "^2.1.2" + +map-stream@~0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/map-stream/-/map-stream-0.1.0.tgz#e56aa94c4c8055a16404a0674b78f215f7c8e194" + integrity sha1-5WqpTEyAVaFkBKBnS3jyFffI4ZQ= + +media-typer@0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748" + integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g= + +merge-descriptors@1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61" + integrity sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E= + +merge-stream@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60" + integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w== + +merge2@^1.2.3, merge2@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.3.0.tgz#5b366ee83b2f1582c48f87e47cf1a9352103ca81" + integrity sha512-2j4DAdlBOkiSZIsaXk4mTE3sRS02yBHAtfy127xRV3bQUFqXkjHCHLW6Scv7DwNRbIWNHH8zpnz9zMaKXIdvYw== + +methods@~1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee" + integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4= + +micromatch@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.2.tgz#4fcb0999bf9fbc2fcbdd212f6d629b9a56c39259" + integrity sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q== + dependencies: + braces "^3.0.1" + picomatch "^2.0.5" + +mime-db@1.43.0: + version "1.43.0" + resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.43.0.tgz#0a12e0502650e473d735535050e7c8f4eb4fae58" + integrity sha512-+5dsGEEovYbT8UY9yD7eE4XTc4UwJ1jBYlgaQQF38ENsKR3wj/8q8RFZrF9WIZpB2V1ArTVFUva8sAul1NzRzQ== + +mime-types@^2.1.12, mime-types@~2.1.19, mime-types@~2.1.24: + version "2.1.26" + resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.26.tgz#9c921fc09b7e149a65dfdc0da4d20997200b0a06" + integrity sha512-01paPWYgLrkqAyrlDorC1uDwl2p3qZT7yl806vW7DvDoxwXi46jsjFbg+WdwotBIk6/MbEhO/dh5aZ5sNj/dWQ== + dependencies: + mime-db "1.43.0" + +mime@1.6.0: + version "1.6.0" + resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1" + integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg== + +mime@^2.0.3: + version "2.4.4" + resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.4.tgz#bd7b91135fc6b01cde3e9bae33d659b63d8857e5" + integrity sha512-LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA== + +mimic-fn@^1.0.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022" + integrity sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ== + +mimic-fn@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" + integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg== + +minimatch@^3.0.4: + version "3.0.4" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" + integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA== + dependencies: + brace-expansion "^1.1.7" + +minimist@0.0.8: + version "0.0.8" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d" + integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0= + +minimist@^1.2.0, minimist@^1.2.5: + version "1.2.5" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" + integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== + +mkdirp@0.5.1, mkdirp@^0.5.1: + version "0.5.1" + resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903" + integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM= + dependencies: + minimist "0.0.8" + +mkdirp@^0.5.3: + version "0.5.5" + resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def" + integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ== + dependencies: + minimist "^1.2.5" + +morgan@^1.9.0: + version "1.9.1" + resolved "https://registry.yarnpkg.com/morgan/-/morgan-1.9.1.tgz#0a8d16734a1d9afbc824b99df87e738e58e2da59" + integrity sha512-HQStPIV4y3afTiCYVxirakhlCfGkI161c76kKFca7Fk1JusM//Qeo1ej2XaMniiNeaZklMVrh3vTtIzpzwbpmA== + dependencies: + basic-auth "~2.0.0" + debug "2.6.9" + depd "~1.1.2" + on-finished "~2.3.0" + on-headers "~1.0.1" + +ms@2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" + integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g= + +ms@2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a" + integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg== + +ms@^2.1.1: + version "2.1.2" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" + integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== + +multistream@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/multistream/-/multistream-2.1.1.tgz#629d3a29bd76623489980d04519a2c365948148c" + integrity sha512-xasv76hl6nr1dEy3lPvy7Ej7K/Lx3O/FCvwge8PeVJpciPPoNCbaANcNiBug3IpdvTveZUcAV0DJzdnUDMesNQ== + dependencies: + inherits "^2.0.1" + readable-stream "^2.0.5" + +mz@^2.7.0: + version "2.7.0" + resolved "https://registry.yarnpkg.com/mz/-/mz-2.7.0.tgz#95008057a56cafadc2bc63dde7f9ff6955948e32" + integrity sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q== + dependencies: + any-promise "^1.0.0" + object-assign "^4.0.1" + thenify-all "^1.0.0" + +negotiator@0.6.2: + version "0.6.2" + resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb" + integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw== + +nice-try@^1.0.4: + version "1.0.5" + resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366" + integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ== + +node-cleanup@^2.1.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/node-cleanup/-/node-cleanup-2.1.2.tgz#7ac19abd297e09a7f72a71545d951b517e4dde2c" + integrity sha1-esGavSl+Caf3KnFUXZUbUX5N3iw= + +normalize-package-data@^2.5.0: + version "2.5.0" + resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8" + integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA== + dependencies: + hosted-git-info "^2.1.4" + resolve "^1.10.0" + semver "2 || 3 || 4 || 5" + validate-npm-package-license "^3.0.1" + +normalize-path@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65" + integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA== + +npm-run-path@^2.0.0: + version "2.0.2" + resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f" + integrity sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8= + dependencies: + path-key "^2.0.0" + +npm-run-path@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-3.1.0.tgz#7f91be317f6a466efed3c9f2980ad8a4ee8b0fa5" + integrity sha512-Dbl4A/VfiVGLgQv29URL9xshU8XDY1GeLy+fsaZ1AA8JDSfjvr5P5+pzRbWqRSBxk6/DW7MIh8lTM/PaGnP2kg== + dependencies: + path-key "^3.0.0" + +number-is-nan@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d" + integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0= + +oauth-sign@~0.9.0: + version "0.9.0" + resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455" + integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ== + +object-assign@^4.0.1, object-assign@^4.1.0: + version "4.1.1" + resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" + integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM= + +on-finished@^2.3.0, on-finished@~2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947" + integrity sha1-IPEzZIGwg811M3mSoWlxqi2QaUc= + dependencies: + ee-first "1.1.1" + +on-headers@~1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.2.tgz#772b0ae6aaa525c399e489adfad90c403eb3c28f" + integrity sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA== + +once@^1.3.0, once@^1.3.1, once@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" + integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E= + dependencies: + wrappy "1" + +one-time@0.0.4: + version "0.0.4" + resolved "https://registry.yarnpkg.com/one-time/-/one-time-0.0.4.tgz#f8cdf77884826fe4dff93e3a9cc37b1e4480742e" + integrity sha1-+M33eISCb+Tf+T46nMN7HkSAdC4= + +onetime@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz#067428230fd67443b2794b22bba528b6867962d4" + integrity sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ= + dependencies: + mimic-fn "^1.0.0" + +onetime@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.0.tgz#fff0f3c91617fe62bb50189636e99ac8a6df7be5" + integrity sha512-5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q== + dependencies: + mimic-fn "^2.1.0" + +opencollective-postinstall@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/opencollective-postinstall/-/opencollective-postinstall-2.0.2.tgz#5657f1bede69b6e33a45939b061eb53d3c6c3a89" + integrity sha512-pVOEP16TrAO2/fjej1IdOyupJY8KDUM1CvsaScRbw6oddvpQoOfGk4ywha0HKKVAD6RkW4x6Q+tNBwhf3Bgpuw== + +optionator@^0.8.1: + version "0.8.3" + resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495" + integrity sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA== + dependencies: + deep-is "~0.1.3" + fast-levenshtein "~2.0.6" + levn "~0.3.0" + prelude-ls "~1.1.2" + type-check "~0.3.2" + word-wrap "~1.2.3" + +os-tmpdir@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" + integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ= + +p-finally@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae" + integrity sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4= + +p-finally@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-2.0.1.tgz#bd6fcaa9c559a096b680806f4d657b3f0f240561" + integrity sha512-vpm09aKwq6H9phqRQzecoDpD8TmVyGw70qmWlyq5onxY7tqyTTFVvxMykxQSQKILBSFlbXpypIw2T1Ml7+DDtw== + +p-is-promise@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-3.0.0.tgz#58e78c7dfe2e163cf2a04ff869e7c1dba64a5971" + integrity sha512-Wo8VsW4IRQSKVXsJCn7TomUaVtyfjVDn3nUP7kE967BQk0CwFpdbZs0X0uk5sW9mkBa9eNM7hCMaG93WUAwxYQ== + +p-limit@^2.2.0: + version "2.2.2" + resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.2.2.tgz#61279b67721f5287aa1c13a9a7fbbc48c9291b1e" + integrity sha512-WGR+xHecKTr7EbUEhyLSh5Dube9JtdiG78ufaeLxTgpudf/20KqyMioIUZJAezlTIi6evxuoUs9YXc11cU+yzQ== + dependencies: + p-try "^2.0.0" + +p-locate@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07" + integrity sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A== + dependencies: + p-limit "^2.2.0" + +p-map@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/p-map/-/p-map-2.1.0.tgz#310928feef9c9ecc65b68b17693018a665cea175" + integrity sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw== + +p-map@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/p-map/-/p-map-3.0.0.tgz#d704d9af8a2ba684e2600d9a215983d4141a979d" + integrity sha512-d3qXVTF/s+W+CdJ5A29wywV2n8CQQYahlgz2bFiA+4eVNJbHJodPZ+/gXwPGh0bOqA+j8S+6+ckmvLGPk1QpxQ== + dependencies: + aggregate-error "^3.0.0" + +p-try@^2.0.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6" + integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ== + +parse-json@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz#be35f5425be1f7f6c747184f98a788cb99477ee0" + integrity sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA= + dependencies: + error-ex "^1.3.1" + json-parse-better-errors "^1.0.1" + +parse-json@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.0.0.tgz#73e5114c986d143efa3712d4ea24db9a4266f60f" + integrity sha512-OOY5b7PAEFV0E2Fir1KOkxchnZNCdowAJgQ5NuxjpBKTRP3pQhwkrkxqQjeoKJ+fO7bCpmIZaogI4eZGDMEGOw== + dependencies: + "@babel/code-frame" "^7.0.0" + error-ex "^1.3.1" + json-parse-better-errors "^1.0.1" + lines-and-columns "^1.1.6" + +parseurl@~1.3.3: + version "1.3.3" + resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4" + integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ== + +path-exists@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3" + integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w== + +path-is-absolute@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" + integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18= + +path-key@^2.0.0, path-key@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40" + integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A= + +path-key@^3.0.0, path-key@^3.1.0: + version "3.1.1" + resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375" + integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q== + +path-parse@^1.0.6: + version "1.0.6" + resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c" + integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw== + +path-to-regexp@0.1.7: + version "0.1.7" + resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c" + integrity sha1-32BBeABfUi8V60SQ5yR6G/qmf4w= + +path-type@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b" + integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw== + +pause-stream@0.0.11: + version "0.0.11" + resolved "https://registry.yarnpkg.com/pause-stream/-/pause-stream-0.0.11.tgz#fe5a34b0cbce12b5aa6a2b403ee2e73b602f1445" + integrity sha1-/lo0sMvOErWqaitAPuLnO2AvFEU= + dependencies: + through "~2.3" + +pend@~1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50" + integrity sha1-elfrVQpng/kRUzH89GY9XI4AelA= + +performance-now@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" + integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns= + +picomatch@^2.0.5: + version "2.2.1" + resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.1.tgz#21bac888b6ed8601f831ce7816e335bc779f0a4a" + integrity sha512-ISBaA8xQNmwELC7eOjqFKMESB2VIqt4PPDD0nsS95b/9dZXvVKOlz9keMSnoGGKcOHXfTvDD6WMaRoSc9UuhRA== + +picomatch@^2.2.1: + version "2.2.2" + resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad" + integrity sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg== + +pkg-dir@^4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3" + integrity sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ== + dependencies: + find-up "^4.0.0" + +pkg-fetch@^2.6.7: + version "2.6.8" + resolved "https://registry.yarnpkg.com/pkg-fetch/-/pkg-fetch-2.6.8.tgz#458ba6b9c936de1b0f3f9c830f389888561e630f" + integrity sha512-CFG7jOeVD38lltLGA7xCJxYsD//GKLjl1P9tc/n9By2a4WEHQjfkBMrYdMS8WOHVP+r9L20fsZNbaKcubDAiQg== + dependencies: + "@babel/runtime" "^7.9.2" + byline "^5.0.0" + chalk "^3.0.0" + expand-template "^2.0.3" + fs-extra "^8.1.0" + minimist "^1.2.5" + progress "^2.0.3" + request "^2.88.0" + request-progress "^3.0.0" + semver "^6.3.0" + unique-temp-dir "^1.0.0" + +pkg@4.4.8: + version "4.4.8" + resolved "https://registry.yarnpkg.com/pkg/-/pkg-4.4.8.tgz#145fb81f31eebfb90d2010dd2c4b663ca0db4009" + integrity sha512-Fqqv0iaX48U3CFZxd6Dq6JKe7BrAWbgRAqMJkz/m8W3H5cqJ6suvsUWe5AJPRlN/AhbBYXBJ0XG9QlYPTXcVFA== + dependencies: + "@babel/parser" "^7.9.4" + "@babel/runtime" "^7.9.2" + chalk "^3.0.0" + escodegen "^1.14.1" + fs-extra "^8.1.0" + globby "^11.0.0" + into-stream "^5.1.1" + minimist "^1.2.5" + multistream "^2.1.1" + pkg-fetch "^2.6.7" + progress "^2.0.3" + resolve "^1.15.1" + stream-meter "^1.0.4" + +please-upgrade-node@^3.1.1, please-upgrade-node@^3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/please-upgrade-node/-/please-upgrade-node-3.2.0.tgz#aeddd3f994c933e4ad98b99d9a556efa0e2fe942" + integrity sha512-gQR3WpIgNIKwBMVLkpMUeR3e1/E1y42bqDQZfql+kDeXd8COYfM8PQA4X6y7a8u9Ua9FHmsrrmirW2vHs45hWg== + dependencies: + semver-compare "^1.0.0" + +prelude-ls@~1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54" + integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ= + +prettier@^1.19.1: + version "1.19.1" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.19.1.tgz#f7d7f5ff8a9cd872a7be4ca142095956a60797cb" + integrity sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew== + +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== + +progress@^2.0.1, progress@^2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8" + integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA== + +prom-client@^11.5.3: + version "11.5.3" + resolved "https://registry.yarnpkg.com/prom-client/-/prom-client-11.5.3.tgz#5fedfce1083bac6c2b223738e966d0e1643756f8" + integrity sha512-iz22FmTbtkyL2vt0MdDFY+kWof+S9UB/NACxSn2aJcewtw+EERsen0urSkZ2WrHseNdydsvcxCTAnPcSMZZv4Q== + dependencies: + tdigest "^0.1.1" + +protobufjs@^6.8.6: + version "6.8.8" + resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-6.8.8.tgz#c8b4f1282fd7a90e6f5b109ed11c84af82908e7c" + integrity sha512-AAmHtD5pXgZfi7GMpllpO3q1Xw1OYldr+dMUlAnffGTAhqkg72WdmSY71uKBF/JuyiKs8psYbtKrhi0ASCD8qw== + dependencies: + "@protobufjs/aspromise" "^1.1.2" + "@protobufjs/base64" "^1.1.2" + "@protobufjs/codegen" "^2.0.4" + "@protobufjs/eventemitter" "^1.1.0" + "@protobufjs/fetch" "^1.1.0" + "@protobufjs/float" "^1.0.2" + "@protobufjs/inquire" "^1.1.0" + "@protobufjs/path" "^1.1.2" + "@protobufjs/pool" "^1.1.0" + "@protobufjs/utf8" "^1.1.0" + "@types/long" "^4.0.0" + "@types/node" "^10.1.0" + long "^4.0.0" + +proxy-addr@~2.0.5: + version "2.0.5" + resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.5.tgz#34cbd64a2d81f4b1fd21e76f9f06c8a45299ee34" + integrity sha512-t/7RxHXPH6cJtP0pRG6smSr9QJidhB+3kXu0KgXnbGYMgzEnUxRQ4/LDdfOwZEMyIh3/xHb8PX3t+lfL9z+YVQ== + dependencies: + forwarded "~0.1.2" + ipaddr.js "1.9.0" + +proxy-from-env@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.0.0.tgz#33c50398f70ea7eb96d21f7b817630a55791c7ee" + integrity sha1-M8UDmPcOp+uW0h97gXYwpVeRx+4= + +ps-tree@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/ps-tree/-/ps-tree-1.2.0.tgz#5e7425b89508736cdd4f2224d028f7bb3f722ebd" + integrity sha512-0VnamPPYHl4uaU/nSFeZZpR21QAWRz+sRv4iW9+v/GS/J5U5iZB5BNN6J0RMoOvdx2gWM2+ZFMIm58q24e4UYA== + dependencies: + event-stream "=3.3.4" + +pseudomap@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3" + integrity sha1-8FKijacOYYkX7wqKw0wa5aaChrM= + +psl@^1.1.28: + version "1.7.0" + resolved "https://registry.yarnpkg.com/psl/-/psl-1.7.0.tgz#f1c4c47a8ef97167dea5d6bbf4816d736e884a3c" + integrity sha512-5NsSEDv8zY70ScRnOTn7bK7eanl2MvFrOrS/R6x+dBt5g1ghnj9Zv90kO8GwT8gxcu2ANyFprnFYB85IogIJOQ== + +pump@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64" + integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww== + dependencies: + end-of-stream "^1.1.0" + once "^1.3.1" + +punycode@^2.1.0, punycode@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" + integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A== + +puppeteer-cluster@^0.18.0: + version "0.18.0" + resolved "https://registry.yarnpkg.com/puppeteer-cluster/-/puppeteer-cluster-0.18.0.tgz#189ef1cea474590aa4d42c9a665dc319689e8fad" + integrity sha512-sMhK7foa+gq8khtgvKar6xwIjmPFS92ZrDsnpMHcQMX2Q8hWmVSViHG7RhuAOmbfIbS7Ya+lViXlx1xtgUjarQ== + dependencies: + debug "^4.1.1" + +puppeteer@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-2.0.0.tgz#0612992e29ec418e0a62c8bebe61af1a64d7ec01" + integrity sha512-t3MmTWzQxPRP71teU6l0jX47PHXlc4Z52sQv4LJQSZLq1ttkKS2yGM3gaI57uQwZkNaoGd0+HPPMELZkcyhlqA== + dependencies: + debug "^4.1.0" + extract-zip "^1.6.6" + https-proxy-agent "^3.0.0" + mime "^2.0.3" + progress "^2.0.1" + proxy-from-env "^1.0.0" + rimraf "^2.6.1" + ws "^6.1.0" + +qs@6.7.0: + version "6.7.0" + resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc" + integrity sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ== + +qs@~6.5.2: + version "6.5.2" + resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36" + integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA== + +range-parser@~1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031" + integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg== + +raw-body@2.4.0: + version "2.4.0" + resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.0.tgz#a1ce6fb9c9bc356ca52e89256ab59059e13d0332" + integrity sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q== + dependencies: + bytes "3.1.0" + http-errors "1.7.2" + iconv-lite "0.4.24" + unpipe "1.0.0" + +read-pkg@^5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-5.2.0.tgz#7bf295438ca5a33e56cd30e053b34ee7250c93cc" + integrity sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg== + dependencies: + "@types/normalize-package-data" "^2.4.0" + normalize-package-data "^2.5.0" + parse-json "^5.0.0" + type-fest "^0.6.0" + +readable-stream@^2.0.0, readable-stream@^2.0.5, readable-stream@^2.1.4, readable-stream@^2.2.2, readable-stream@^2.3.6: + 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" + +readable-stream@^3.1.1: + version "3.5.0" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.5.0.tgz#465d70e6d1087f6162d079cd0b5db7fbebfd1606" + integrity sha512-gSz026xs2LfxBPudDuI41V1lka8cxg64E66SGe78zJlsUofOg/yqwezdIcdfwik6B4h8LFmWPA9ef9X3FiNFLA== + dependencies: + inherits "^2.0.3" + string_decoder "^1.1.1" + util-deprecate "^1.0.1" + +regenerator-runtime@^0.13.4: + version "0.13.5" + resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz#d878a1d094b4306d10b9096484b33ebd55e26697" + integrity sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA== + +request-progress@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/request-progress/-/request-progress-3.0.0.tgz#4ca754081c7fec63f505e4faa825aa06cd669dbe" + integrity sha1-TKdUCBx/7GP1BeT6qCWqBs1mnb4= + dependencies: + throttleit "^1.0.0" + +request@^2.88.0: + version "2.88.2" + resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3" + integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw== + dependencies: + aws-sign2 "~0.7.0" + aws4 "^1.8.0" + caseless "~0.12.0" + combined-stream "~1.0.6" + extend "~3.0.2" + forever-agent "~0.6.1" + form-data "~2.3.2" + har-validator "~5.1.3" + http-signature "~1.2.0" + is-typedarray "~1.0.0" + isstream "~0.1.2" + json-stringify-safe "~5.0.1" + mime-types "~2.1.19" + oauth-sign "~0.9.0" + performance-now "^2.1.0" + qs "~6.5.2" + safe-buffer "^5.1.2" + tough-cookie "~2.5.0" + tunnel-agent "^0.6.0" + uuid "^3.3.2" + +resolve-from@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748" + integrity sha1-six699nWiBvItuZTM17rywoYh0g= + +resolve@^1.10.0, resolve@^1.3.2: + version "1.14.2" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.14.2.tgz#dbf31d0fa98b1f29aa5169783b9c290cb865fea2" + integrity sha512-EjlOBLBO1kxsUxsKjLt7TAECyKW6fOh1VRkykQkKGzcBbjjPIxBqGh0jf7GJ3k/f5mxMqW3htMD3WdTUVtW8HQ== + dependencies: + path-parse "^1.0.6" + +resolve@^1.15.1: + version "1.17.0" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.17.0.tgz#b25941b54968231cc2d1bb76a79cb7f2c0bf8444" + integrity sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w== + dependencies: + path-parse "^1.0.6" + +restore-cursor@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf" + integrity sha1-n37ih/gv0ybU/RYpI9YhKe7g368= + dependencies: + onetime "^2.0.0" + signal-exit "^3.0.2" + +reusify@^1.0.0: + version "1.0.4" + resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76" + integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw== + +rimraf@^2.6.1: + version "2.7.1" + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec" + integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w== + dependencies: + glob "^7.1.3" + +rimraf@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.0.tgz#614176d4b3010b75e5c390eb0ee96f6dc0cebb9b" + integrity sha512-NDGVxTsjqfunkds7CqsOiEnxln4Bo7Nddl3XhS4pXg5OzwkLqJ971ZVAAnB+DDLnF76N+VnDEiBHaVV8I06SUg== + dependencies: + glob "^7.1.3" + +run-node@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/run-node/-/run-node-1.0.0.tgz#46b50b946a2aa2d4947ae1d886e9856fd9cabe5e" + integrity sha512-kc120TBlQ3mih1LSzdAJXo4xn/GWS2ec0l3S+syHDXP9uRr0JAT8Qd3mdMuyjqCzeZktgP3try92cEgf9Nks8A== + +run-parallel@^1.1.9: + version "1.1.9" + resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.1.9.tgz#c9dd3a7cf9f4b2c4b6244e173a6ed866e61dd679" + integrity sha512-DEqnSRTDw/Tc3FXf49zedI638Z9onwUotBMiUFKmrO2sdFKIbXamXGQ3Axd4qgphxKB4kw/qP1w5kTxnfU1B9Q== + +rxjs@^6.3.3: + version "6.5.4" + resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.4.tgz#e0777fe0d184cec7872df147f303572d414e211c" + integrity sha512-naMQXcgEo3csAEGvw/NydRA0fuS2nDZJiw1YUWFKU7aPPAPGZEsD4Iimit96qwCieH6y614MCLYwdkrWx7z/7Q== + dependencies: + tslib "^1.9.0" + +safe-buffer@5.1.2, 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== + +safe-buffer@^5.0.1, safe-buffer@^5.1.2, safe-buffer@~5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.0.tgz#b74daec49b1148f88c64b68d49b1e815c1f2f519" + integrity sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg== + +"safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0: + version "2.1.2" + resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" + integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== + +semver-compare@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc" + integrity sha1-De4hahyUGrN+nvsXiPavxf9VN/w= + +"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.5.0: + version "5.7.1" + resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" + integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== + +semver@^6.2.0, semver@^6.3.0: + version "6.3.0" + resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" + integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== + +send@0.17.1: + version "0.17.1" + resolved "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz#c1d8b059f7900f7466dd4938bdc44e11ddb376c8" + integrity sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg== + dependencies: + debug "2.6.9" + depd "~1.1.2" + destroy "~1.0.4" + encodeurl "~1.0.2" + escape-html "~1.0.3" + etag "~1.8.1" + fresh "0.5.2" + http-errors "~1.7.2" + mime "1.6.0" + ms "2.1.1" + on-finished "~2.3.0" + range-parser "~1.2.1" + statuses "~1.5.0" + +serve-static@1.14.1: + version "1.14.1" + resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.1.tgz#666e636dc4f010f7ef29970a88a674320898b2f9" + integrity sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg== + dependencies: + encodeurl "~1.0.2" + escape-html "~1.0.3" + parseurl "~1.3.3" + send "0.17.1" + +setprototypeof@1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.1.tgz#7e95acb24aa92f5885e0abef5ba131330d4ae683" + integrity sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw== + +shebang-command@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea" + integrity sha1-RKrGW2lbAzmJaMOfNj/uXer98eo= + dependencies: + shebang-regex "^1.0.0" + +shebang-command@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea" + integrity sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA== + dependencies: + shebang-regex "^3.0.0" + +shebang-regex@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3" + integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM= + +shebang-regex@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172" + integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A== + +signal-exit@^3.0.0, signal-exit@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d" + integrity sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0= + +simple-swizzle@^0.2.2: + version "0.2.2" + resolved "https://registry.yarnpkg.com/simple-swizzle/-/simple-swizzle-0.2.2.tgz#a4da6b635ffcccca33f70d17cb92592de95e557a" + integrity sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo= + dependencies: + is-arrayish "^0.3.1" + +slash@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634" + integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q== + +slice-ansi@0.0.4: + version "0.0.4" + resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-0.0.4.tgz#edbf8903f66f7ce2f8eafd6ceed65e264c831b35" + integrity sha1-7b+JA/ZvfOL46v1s7tZeJkyDGzU= + +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== + +spdx-correct@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.0.tgz#fb83e504445268f154b074e218c87c003cd31df4" + integrity sha512-lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q== + dependencies: + spdx-expression-parse "^3.0.0" + spdx-license-ids "^3.0.0" + +spdx-exceptions@^2.1.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz#2ea450aee74f2a89bfb94519c07fcd6f41322977" + integrity sha512-2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA== + +spdx-expression-parse@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz#99e119b7a5da00e05491c9fa338b7904823b41d0" + integrity sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg== + dependencies: + spdx-exceptions "^2.1.0" + spdx-license-ids "^3.0.0" + +spdx-license-ids@^3.0.0: + version "3.0.5" + resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz#3694b5804567a458d3c8045842a6358632f62654" + integrity sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q== + +split@0.3: + version "0.3.3" + resolved "https://registry.yarnpkg.com/split/-/split-0.3.3.tgz#cd0eea5e63a211dfff7eb0f091c4133e2d0dd28f" + integrity sha1-zQ7qXmOiEd//frDwkcQTPi0N0o8= + dependencies: + through "2" + +sprintf-js@~1.0.2: + version "1.0.3" + resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" + integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw= + +sshpk@^1.7.0: + version "1.16.1" + resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.1.tgz#fb661c0bef29b39db40769ee39fa70093d6f6877" + integrity sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg== + dependencies: + asn1 "~0.2.3" + assert-plus "^1.0.0" + bcrypt-pbkdf "^1.0.0" + dashdash "^1.12.0" + ecc-jsbn "~0.1.1" + getpass "^0.1.1" + jsbn "~0.1.0" + safer-buffer "^2.0.2" + tweetnacl "~0.14.0" + +stack-trace@0.0.x: + version "0.0.10" + resolved "https://registry.yarnpkg.com/stack-trace/-/stack-trace-0.0.10.tgz#547c70b347e8d32b4e108ea1a2a159e5fdde19c0" + integrity sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA= + +"statuses@>= 1.5.0 < 2", statuses@~1.5.0: + version "1.5.0" + resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c" + integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow= + +stream-combiner@~0.0.4: + version "0.0.4" + resolved "https://registry.yarnpkg.com/stream-combiner/-/stream-combiner-0.0.4.tgz#4d5e433c185261dde623ca3f44c586bcf5c4ad14" + integrity sha1-TV5DPBhSYd3mI8o/RMWGvPXErRQ= + dependencies: + duplexer "~0.1.1" + +stream-meter@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/stream-meter/-/stream-meter-1.0.4.tgz#52af95aa5ea760a2491716704dbff90f73afdd1d" + integrity sha1-Uq+Vql6nYKJJFxZwTb/5D3Ov3R0= + dependencies: + readable-stream "^2.1.4" + +string-argv@^0.1.1: + version "0.1.2" + resolved "https://registry.yarnpkg.com/string-argv/-/string-argv-0.1.2.tgz#c5b7bc03fb2b11983ba3a72333dd0559e77e4738" + integrity sha512-mBqPGEOMNJKXRo7z0keX0wlAhbBAjilUdPW13nN0PecVryZxdHIeM7TqbsSUA7VYuS00HGC6mojP7DlQzfa9ZA== + +string-argv@^0.3.0: + version "0.3.1" + resolved "https://registry.yarnpkg.com/string-argv/-/string-argv-0.3.1.tgz#95e2fbec0427ae19184935f816d74aaa4c5c19da" + integrity sha512-a1uQGz7IyVy9YwhqjZIZu1c8JO8dNIe20xBmSS6qu9kv++k3JGzCVmprbNN5Kn+BgzD5E7YYwg1CcjuJMRNsvg== + +string-width@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3" + integrity sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M= + dependencies: + code-point-at "^1.0.0" + is-fullwidth-code-point "^1.0.0" + strip-ansi "^3.0.0" + +string-width@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e" + integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw== + dependencies: + is-fullwidth-code-point "^2.0.0" + strip-ansi "^4.0.0" + +string_decoder@^1.1.1: + version "1.3.0" + resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e" + integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA== + dependencies: + safe-buffer "~5.2.0" + +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" + +stringify-object@^3.3.0: + version "3.3.0" + resolved "https://registry.yarnpkg.com/stringify-object/-/stringify-object-3.3.0.tgz#703065aefca19300d3ce88af4f5b3956d7556629" + integrity sha512-rHqiFh1elqCQ9WPLIC8I0Q/g/wj5J1eMkyoiD6eoQApWHP0FtlK7rqnhmabL5VUY9JQCcqwwvlOaSuutekgyrw== + dependencies: + get-own-enumerable-property-symbols "^3.0.0" + is-obj "^1.0.1" + is-regexp "^1.0.0" + +strip-ansi@^3.0.0, strip-ansi@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" + integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8= + dependencies: + ansi-regex "^2.0.0" + +strip-ansi@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f" + integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8= + dependencies: + ansi-regex "^3.0.0" + +strip-eof@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf" + integrity sha1-u0P/VZim6wXYm1n80SnJgzE2Br8= + +strip-final-newline@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad" + integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA== + +supports-color@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7" + integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc= + +supports-color@^5.3.0: + version "5.5.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f" + integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow== + dependencies: + has-flag "^3.0.0" + +supports-color@^7.1.0: + version "7.1.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.1.0.tgz#68e32591df73e25ad1c4b49108a2ec507962bfd1" + integrity sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g== + dependencies: + has-flag "^4.0.0" + +symbol-observable@^1.1.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804" + integrity sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ== + +tdigest@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/tdigest/-/tdigest-0.1.1.tgz#2e3cb2c39ea449e55d1e6cd91117accca4588021" + integrity sha1-Ljyyw56kSeVdHmzZEReszKRYgCE= + dependencies: + bintrees "1.0.1" + +text-hex@1.0.x: + version "1.0.0" + resolved "https://registry.yarnpkg.com/text-hex/-/text-hex-1.0.0.tgz#69dc9c1b17446ee79a92bf5b884bb4b9127506f5" + integrity sha512-uuVGNWzgJ4yhRaNSiubPY7OjISw4sw4E5Uv0wbjp+OzcbmVU/rsT8ujgcXJhn9ypzsgr5vlzpPqP+MBBKcGvbg== + +thenify-all@^1.0.0: + version "1.6.0" + resolved "https://registry.yarnpkg.com/thenify-all/-/thenify-all-1.6.0.tgz#1a1918d402d8fc3f98fbf234db0bcc8cc10e9726" + integrity sha1-GhkY1ALY/D+Y+/I02wvMjMEOlyY= + dependencies: + thenify ">= 3.1.0 < 4" + +"thenify@>= 3.1.0 < 4": + version "3.3.0" + resolved "https://registry.yarnpkg.com/thenify/-/thenify-3.3.0.tgz#e69e38a1babe969b0108207978b9f62b88604839" + integrity sha1-5p44obq+lpsBCCB5eLn2K4hgSDk= + dependencies: + any-promise "^1.0.0" + +throttleit@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/throttleit/-/throttleit-1.0.0.tgz#9e785836daf46743145a5984b6268d828528ac6c" + integrity sha1-nnhYNtr0Z0MUWlmEtiaNgoUorGw= + +through@2, through@~2.3, through@~2.3.1: + version "2.3.8" + resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" + integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU= + +to-regex-range@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4" + integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ== + dependencies: + is-number "^7.0.0" + +toidentifier@1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553" + integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw== + +tough-cookie@~2.5.0: + version "2.5.0" + resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2" + integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g== + dependencies: + psl "^1.1.28" + punycode "^2.1.1" + +triple-beam@^1.2.0, triple-beam@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/triple-beam/-/triple-beam-1.3.0.tgz#a595214c7298db8339eeeee083e4d10bd8cb8dd9" + integrity sha512-XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw== + +tsc-watch@^4.2.3: + version "4.2.3" + resolved "https://registry.yarnpkg.com/tsc-watch/-/tsc-watch-4.2.3.tgz#630aaf1ed8bbfb6fbcbddb9bef96054bed217c4b" + integrity sha512-M1Lo37+ggVfavGX3ObUVMz9QBH7moqq2RlmBdxnz6a6etwecetznZ/ZgYOi2c9HQ4Ki2qStj7V9J/gSf0rThig== + dependencies: + cross-spawn "^5.1.0" + node-cleanup "^2.1.2" + ps-tree "^1.2.0" + string-argv "^0.1.1" + strip-ansi "^4.0.0" + +tslib@^1.10.0: + version "1.11.1" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.11.1.tgz#eb15d128827fbee2841549e171f45ed338ac7e35" + integrity sha512-aZW88SY8kQbU7gpV19lN24LtXh/yD4ZZg6qieAJDDg+YBsJcSmLGK9QpnUjAKVG/xefmvJGd1WUmfpT/g6AJGA== + +tslib@^1.8.1, tslib@^1.9.0: + version "1.10.0" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.10.0.tgz#c3c19f95973fb0a62973fb09d90d961ee43e5c8a" + integrity sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ== + +tslint@^6.1.1: + version "6.1.1" + resolved "https://registry.yarnpkg.com/tslint/-/tslint-6.1.1.tgz#ac03fbd17f85bfefaae348b353b25a88efe10cde" + integrity sha512-kd6AQ/IgPRpLn6g5TozqzPdGNZ0q0jtXW4//hRcj10qLYBaa3mTUU2y2MCG+RXZm8Zx+KZi0eA+YCrMyNlF4UA== + dependencies: + "@babel/code-frame" "^7.0.0" + builtin-modules "^1.1.1" + chalk "^2.3.0" + commander "^2.12.1" + diff "^4.0.1" + glob "^7.1.1" + js-yaml "^3.13.1" + minimatch "^3.0.4" + mkdirp "^0.5.3" + resolve "^1.3.2" + semver "^5.3.0" + tslib "^1.10.0" + tsutils "^2.29.0" + +tsutils@^2.29.0: + version "2.29.0" + resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-2.29.0.tgz#32b488501467acbedd4b85498673a0812aca0b99" + integrity sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA== + dependencies: + tslib "^1.8.1" + +tunnel-agent@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd" + integrity sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0= + dependencies: + safe-buffer "^5.0.1" + +tweetnacl@^0.14.3, tweetnacl@~0.14.0: + version "0.14.5" + resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64" + integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q= + +type-check@~0.3.2: + version "0.3.2" + resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72" + integrity sha1-WITKtRLPHTVeP7eE8wgEsrUg23I= + dependencies: + prelude-ls "~1.1.2" + +type-fest@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.6.0.tgz#8d2a2370d3df886eb5c90ada1c5bf6188acf838b" + integrity sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg== + +type-is@~1.6.17, type-is@~1.6.18: + version "1.6.18" + resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131" + integrity sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g== + dependencies: + media-typer "0.3.0" + mime-types "~2.1.24" + +typedarray@^0.0.6: + version "0.0.6" + resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" + integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= + +typescript@^3.8.3: + version "3.8.3" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.8.3.tgz#409eb8544ea0335711205869ec458ab109ee1061" + integrity sha512-MYlEfn5VrLNsgudQTVJeNaQFUAI7DkhnOjdpAp4T+ku1TfQClewlbSuTVHiA+8skNBgaf02TL/kLOvig4y3G8w== + +uid2@0.0.3: + version "0.0.3" + resolved "https://registry.yarnpkg.com/uid2/-/uid2-0.0.3.tgz#483126e11774df2f71b8b639dcd799c376162b82" + integrity sha1-SDEm4Rd03y9xuLY53NeZw3YWK4I= + +unique-filename@^1.1.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.1.tgz#1d69769369ada0583103a1e6ae87681b56573230" + integrity sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ== + dependencies: + unique-slug "^2.0.0" + +unique-slug@^2.0.0: + version "2.0.2" + resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-2.0.2.tgz#baabce91083fc64e945b0f3ad613e264f7cd4e6c" + integrity sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w== + dependencies: + imurmurhash "^0.1.4" + +unique-temp-dir@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/unique-temp-dir/-/unique-temp-dir-1.0.0.tgz#6dce95b2681ca003eebfb304a415f9cbabcc5385" + integrity sha1-bc6VsmgcoAPuv7MEpBX5y6vMU4U= + dependencies: + mkdirp "^0.5.1" + os-tmpdir "^1.0.1" + uid2 "0.0.3" + +universalify@^0.1.0: + version "0.1.2" + resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66" + integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg== + +unpipe@1.0.0, unpipe@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec" + integrity sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw= + +uri-js@^4.2.2: + version "4.2.2" + resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.2.tgz#94c540e1ff772956e2299507c010aea6c8838eb0" + integrity sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ== + dependencies: + punycode "^2.1.0" + +url-value-parser@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/url-value-parser/-/url-value-parser-2.0.1.tgz#c8179a095ab9ec1f5aa17ca36af5af396b4e95ed" + integrity sha512-bexECeREBIueboLGM3Y1WaAzQkIn+Tca/Xjmjmfd0S/hFHSCEoFkNh0/D0l9G4K74MkEP/lLFRlYnxX3d68Qgw== + +util-deprecate@^1.0.1, 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= + +utils-merge@1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713" + integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM= + +uuid@^3.3.2: + version "3.4.0" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee" + integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A== + +validate-npm-package-license@^3.0.1: + version "3.0.4" + resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a" + integrity sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew== + dependencies: + spdx-correct "^3.0.0" + spdx-expression-parse "^3.0.0" + +vary@~1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc" + integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw= + +verror@1.10.0: + version "1.10.0" + resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400" + integrity sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA= + dependencies: + assert-plus "^1.0.0" + core-util-is "1.0.2" + extsprintf "^1.2.0" + +which@^1.2.9: + version "1.3.1" + resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" + integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ== + dependencies: + isexe "^2.0.0" + +which@^2.0.1: + version "2.0.2" + resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1" + integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA== + dependencies: + isexe "^2.0.0" + +winston-transport@^4.3.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/winston-transport/-/winston-transport-4.3.0.tgz#df68c0c202482c448d9b47313c07304c2d7c2c66" + integrity sha512-B2wPuwUi3vhzn/51Uukcao4dIduEiPOcOt9HJ3QeaXgkJ5Z7UwpBzxS4ZGNHtrxrUvTwemsQiSys0ihOf8Mp1A== + dependencies: + readable-stream "^2.3.6" + triple-beam "^1.2.0" + +winston@^3.2.1: + version "3.2.1" + resolved "https://registry.yarnpkg.com/winston/-/winston-3.2.1.tgz#63061377976c73584028be2490a1846055f77f07" + integrity sha512-zU6vgnS9dAWCEKg/QYigd6cgMVVNwyTzKs81XZtTFuRwJOcDdBg7AU0mXVyNbs7O5RH2zdv+BdNZUlx7mXPuOw== + dependencies: + async "^2.6.1" + diagnostics "^1.1.1" + is-stream "^1.1.0" + logform "^2.1.1" + one-time "0.0.4" + readable-stream "^3.1.1" + stack-trace "0.0.x" + triple-beam "^1.3.0" + winston-transport "^4.3.0" + +word-wrap@~1.2.3: + version "1.2.3" + resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c" + integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ== + +wrap-ansi@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-3.0.1.tgz#288a04d87eda5c286e060dfe8f135ce8d007f8ba" + integrity sha1-KIoE2H7aXChuBg3+jxNc6NAH+Lo= + dependencies: + string-width "^2.1.1" + strip-ansi "^4.0.0" + +wrappy@1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" + integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= + +ws@^6.1.0: + version "6.2.1" + resolved "https://registry.yarnpkg.com/ws/-/ws-6.2.1.tgz#442fdf0a47ed64f59b6a5d8ff130f4748ed524fb" + integrity sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA== + dependencies: + async-limiter "~1.0.0" + +yallist@^2.1.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52" + integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI= + +yauzl@2.4.1: + version "2.4.1" + resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.4.1.tgz#9528f442dab1b2284e58b4379bb194e22e0c4005" + integrity sha1-lSj0QtqxsihOWLQ3m7GU4i4MQAU= + dependencies: + fd-slicer "~1.0.1" diff --git a/pkgs/servers/monitoring/grafana-image-renderer/yarn.nix b/pkgs/servers/monitoring/grafana-image-renderer/yarn.nix new file mode 100644 index 000000000000..3d11945721ad --- /dev/null +++ b/pkgs/servers/monitoring/grafana-image-renderer/yarn.nix @@ -0,0 +1,3549 @@ +{ fetchurl, fetchgit, linkFarm, runCommandNoCC, gnutar }: rec { + offline_cache = linkFarm "offline" packages; + packages = [ + { + name = "_babel_code_frame___code_frame_7.8.3.tgz"; + path = fetchurl { + name = "_babel_code_frame___code_frame_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.8.3.tgz"; + sha1 = "33e25903d7481181534e12ec0a25f16b6fcf419e"; + }; + } + { + name = "_babel_highlight___highlight_7.8.3.tgz"; + path = fetchurl { + name = "_babel_highlight___highlight_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.8.3.tgz"; + sha1 = "28f173d04223eaaa59bc1d439a3836e6d1265797"; + }; + } + { + name = "_babel_parser___parser_7.9.6.tgz"; + path = fetchurl { + name = "_babel_parser___parser_7.9.6.tgz"; + url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.9.6.tgz"; + sha1 = "3b1bbb30dabe600cd72db58720998376ff653bc7"; + }; + } + { + name = "_babel_runtime___runtime_7.9.6.tgz"; + path = fetchurl { + name = "_babel_runtime___runtime_7.9.6.tgz"; + url = "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.9.6.tgz"; + sha1 = "a9102eb5cadedf3f31d08a9ecf294af7827ea29f"; + }; + } + { + name = "_grpc_grpc_js___grpc_js_1.0.3.tgz"; + path = fetchurl { + name = "_grpc_grpc_js___grpc_js_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/@grpc/grpc-js/-/grpc-js-1.0.3.tgz"; + sha1 = "7fa2ba293ccc1e91b24074c2628c8c68336e18c4"; + }; + } + { + name = "_grpc_proto_loader___proto_loader_0.5.4.tgz"; + path = fetchurl { + name = "_grpc_proto_loader___proto_loader_0.5.4.tgz"; + url = "https://registry.yarnpkg.com/@grpc/proto-loader/-/proto-loader-0.5.4.tgz"; + sha1 = "038a3820540f621eeb1b05d81fbedfb045e14de0"; + }; + } + { + name = "_hapi_boom___boom_9.1.0.tgz"; + path = fetchurl { + name = "_hapi_boom___boom_9.1.0.tgz"; + url = "https://registry.yarnpkg.com/@hapi/boom/-/boom-9.1.0.tgz"; + sha1 = "0d9517657a56ff1e0b42d0aca9da1b37706fec56"; + }; + } + { + name = "_hapi_hoek___hoek_9.1.0.tgz"; + path = fetchurl { + name = "_hapi_hoek___hoek_9.1.0.tgz"; + url = "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-9.1.0.tgz"; + sha1 = "6c9eafc78c1529248f8f4d92b0799a712b6052c6"; + }; + } + { + name = "_nodelib_fs.scandir___fs.scandir_2.1.3.tgz"; + path = fetchurl { + name = "_nodelib_fs.scandir___fs.scandir_2.1.3.tgz"; + url = "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz"; + sha1 = "3a582bdb53804c6ba6d146579c46e52130cf4a3b"; + }; + } + { + name = "_nodelib_fs.stat___fs.stat_2.0.3.tgz"; + path = fetchurl { + name = "_nodelib_fs.stat___fs.stat_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.3.tgz"; + sha1 = "34dc5f4cabbc720f4e60f75a747e7ecd6c175bd3"; + }; + } + { + name = "_nodelib_fs.walk___fs.walk_1.2.4.tgz"; + path = fetchurl { + name = "_nodelib_fs.walk___fs.walk_1.2.4.tgz"; + url = "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.4.tgz"; + sha1 = "011b9202a70a6366e436ca5c065844528ab04976"; + }; + } + { + name = "_protobufjs_aspromise___aspromise_1.1.2.tgz"; + path = fetchurl { + name = "_protobufjs_aspromise___aspromise_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/@protobufjs/aspromise/-/aspromise-1.1.2.tgz"; + sha1 = "9b8b0cc663d669a7d8f6f5d0893a14d348f30fbf"; + }; + } + { + name = "_protobufjs_base64___base64_1.1.2.tgz"; + path = fetchurl { + name = "_protobufjs_base64___base64_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/@protobufjs/base64/-/base64-1.1.2.tgz"; + sha1 = "4c85730e59b9a1f1f349047dbf24296034bb2735"; + }; + } + { + name = "_protobufjs_codegen___codegen_2.0.4.tgz"; + path = fetchurl { + name = "_protobufjs_codegen___codegen_2.0.4.tgz"; + url = "https://registry.yarnpkg.com/@protobufjs/codegen/-/codegen-2.0.4.tgz"; + sha1 = "7ef37f0d010fb028ad1ad59722e506d9262815cb"; + }; + } + { + name = "_protobufjs_eventemitter___eventemitter_1.1.0.tgz"; + path = fetchurl { + name = "_protobufjs_eventemitter___eventemitter_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz"; + sha1 = "355cbc98bafad5978f9ed095f397621f1d066b70"; + }; + } + { + name = "_protobufjs_fetch___fetch_1.1.0.tgz"; + path = fetchurl { + name = "_protobufjs_fetch___fetch_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/@protobufjs/fetch/-/fetch-1.1.0.tgz"; + sha1 = "ba99fb598614af65700c1619ff06d454b0d84c45"; + }; + } + { + name = "_protobufjs_float___float_1.0.2.tgz"; + path = fetchurl { + name = "_protobufjs_float___float_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/@protobufjs/float/-/float-1.0.2.tgz"; + sha1 = "5e9e1abdcb73fc0a7cb8b291df78c8cbd97b87d1"; + }; + } + { + name = "_protobufjs_inquire___inquire_1.1.0.tgz"; + path = fetchurl { + name = "_protobufjs_inquire___inquire_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/@protobufjs/inquire/-/inquire-1.1.0.tgz"; + sha1 = "ff200e3e7cf2429e2dcafc1140828e8cc638f089"; + }; + } + { + name = "_protobufjs_path___path_1.1.2.tgz"; + path = fetchurl { + name = "_protobufjs_path___path_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/@protobufjs/path/-/path-1.1.2.tgz"; + sha1 = "6cc2b20c5c9ad6ad0dccfd21ca7673d8d7fbf68d"; + }; + } + { + name = "_protobufjs_pool___pool_1.1.0.tgz"; + path = fetchurl { + name = "_protobufjs_pool___pool_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/@protobufjs/pool/-/pool-1.1.0.tgz"; + sha1 = "09fd15f2d6d3abfa9b65bc366506d6ad7846ff54"; + }; + } + { + name = "_protobufjs_utf8___utf8_1.1.0.tgz"; + path = fetchurl { + name = "_protobufjs_utf8___utf8_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/@protobufjs/utf8/-/utf8-1.1.0.tgz"; + sha1 = "a777360b5b39a1a2e5106f8e858f2fd2d060c570"; + }; + } + { + name = "_samverschueren_stream_to_observable___stream_to_observable_0.3.0.tgz"; + path = fetchurl { + name = "_samverschueren_stream_to_observable___stream_to_observable_0.3.0.tgz"; + url = "https://registry.yarnpkg.com/@samverschueren/stream-to-observable/-/stream-to-observable-0.3.0.tgz"; + sha1 = "ecdf48d532c58ea477acfcab80348424f8d0662f"; + }; + } + { + name = "_types_body_parser___body_parser_1.17.1.tgz"; + path = fetchurl { + name = "_types_body_parser___body_parser_1.17.1.tgz"; + url = "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.17.1.tgz"; + sha1 = "18fcf61768fb5c30ccc508c21d6fd2e8b3bf7897"; + }; + } + { + name = "_types_color_name___color_name_1.1.1.tgz"; + path = fetchurl { + name = "_types_color_name___color_name_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.1.tgz"; + sha1 = "1c1261bbeaa10a8055bbc5d8ab84b7b2afc846a0"; + }; + } + { + name = "_types_connect___connect_3.4.33.tgz"; + path = fetchurl { + name = "_types_connect___connect_3.4.33.tgz"; + url = "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.33.tgz"; + sha1 = "31610c901eca573b8713c3330abc6e6b9f588546"; + }; + } + { + name = "_types_events___events_3.0.0.tgz"; + path = fetchurl { + name = "_types_events___events_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/@types/events/-/events-3.0.0.tgz"; + sha1 = "2862f3f58a9a7f7c3e78d79f130dd4d71c25c2a7"; + }; + } + { + name = "_types_express_serve_static_core___express_serve_static_core_4.17.1.tgz"; + path = fetchurl { + name = "_types_express_serve_static_core___express_serve_static_core_4.17.1.tgz"; + url = "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.1.tgz"; + sha1 = "82be64a77211b205641e0209096fd3afb62481d3"; + }; + } + { + name = "_types_express___express_4.17.2.tgz"; + path = fetchurl { + name = "_types_express___express_4.17.2.tgz"; + url = "https://registry.yarnpkg.com/@types/express/-/express-4.17.2.tgz"; + sha1 = "a0fb7a23d8855bac31bc01d5a58cadd9b2173e6c"; + }; + } + { + name = "_types_glob___glob_7.1.1.tgz"; + path = fetchurl { + name = "_types_glob___glob_7.1.1.tgz"; + url = "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.1.tgz"; + sha1 = "aa59a1c6e3fbc421e07ccd31a944c30eba521575"; + }; + } + { + name = "_types_long___long_4.0.0.tgz"; + path = fetchurl { + name = "_types_long___long_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/@types/long/-/long-4.0.0.tgz"; + sha1 = "719551d2352d301ac8b81db732acb6bdc28dbdef"; + }; + } + { + name = "_types_mime___mime_2.0.1.tgz"; + path = fetchurl { + name = "_types_mime___mime_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/@types/mime/-/mime-2.0.1.tgz"; + sha1 = "dc488842312a7f075149312905b5e3c0b054c79d"; + }; + } + { + name = "_types_minimatch___minimatch_3.0.3.tgz"; + path = fetchurl { + name = "_types_minimatch___minimatch_3.0.3.tgz"; + url = "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz"; + sha1 = "3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"; + }; + } + { + name = "_types_node___node_13.1.8.tgz"; + path = fetchurl { + name = "_types_node___node_13.1.8.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-13.1.8.tgz"; + sha1 = "1d590429fe8187a02707720ecf38a6fe46ce294b"; + }; + } + { + name = "_types_node___node_10.17.13.tgz"; + path = fetchurl { + name = "_types_node___node_10.17.13.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-10.17.13.tgz"; + sha1 = "ccebcdb990bd6139cd16e84c39dc2fb1023ca90c"; + }; + } + { + name = "_types_normalize_package_data___normalize_package_data_2.4.0.tgz"; + path = fetchurl { + name = "_types_normalize_package_data___normalize_package_data_2.4.0.tgz"; + url = "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz"; + sha1 = "e486d0d97396d79beedd0a6e33f4534ff6b4973e"; + }; + } + { + name = "_types_range_parser___range_parser_1.2.3.tgz"; + path = fetchurl { + name = "_types_range_parser___range_parser_1.2.3.tgz"; + url = "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.3.tgz"; + sha1 = "7ee330ba7caafb98090bece86a5ee44115904c2c"; + }; + } + { + name = "_types_serve_static___serve_static_1.13.3.tgz"; + path = fetchurl { + name = "_types_serve_static___serve_static_1.13.3.tgz"; + url = "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.3.tgz"; + sha1 = "eb7e1c41c4468272557e897e9171ded5e2ded9d1"; + }; + } + { + name = "accepts___accepts_1.3.7.tgz"; + path = fetchurl { + name = "accepts___accepts_1.3.7.tgz"; + url = "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz"; + sha1 = "531bc726517a3b2b41f850021c6cc15eaab507cd"; + }; + } + { + name = "agent_base___agent_base_4.3.0.tgz"; + path = fetchurl { + name = "agent_base___agent_base_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/agent-base/-/agent-base-4.3.0.tgz"; + sha1 = "8165f01c436009bccad0b1d122f05ed770efc6ee"; + }; + } + { + name = "aggregate_error___aggregate_error_3.0.1.tgz"; + path = fetchurl { + name = "aggregate_error___aggregate_error_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.0.1.tgz"; + sha1 = "db2fe7246e536f40d9b5442a39e117d7dd6a24e0"; + }; + } + { + name = "ajv___ajv_6.11.0.tgz"; + path = fetchurl { + name = "ajv___ajv_6.11.0.tgz"; + url = "https://registry.yarnpkg.com/ajv/-/ajv-6.11.0.tgz"; + sha1 = "c3607cbc8ae392d8a5a536f25b21f8e5f3f87fe9"; + }; + } + { + name = "ansi_escapes___ansi_escapes_3.2.0.tgz"; + path = fetchurl { + name = "ansi_escapes___ansi_escapes_3.2.0.tgz"; + url = "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz"; + sha1 = "8780b98ff9dbf5638152d1f1fe5c1d7b4442976b"; + }; + } + { + name = "ansi_regex___ansi_regex_2.1.1.tgz"; + path = fetchurl { + name = "ansi_regex___ansi_regex_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz"; + sha1 = "c3b33ab5ee360d86e0e628f0468ae7ef27d654df"; + }; + } + { + name = "ansi_regex___ansi_regex_3.0.0.tgz"; + path = fetchurl { + name = "ansi_regex___ansi_regex_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz"; + sha1 = "ed0317c322064f79466c02966bddb605ab37d998"; + }; + } + { + name = "ansi_styles___ansi_styles_2.2.1.tgz"; + path = fetchurl { + name = "ansi_styles___ansi_styles_2.2.1.tgz"; + url = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz"; + sha1 = "b432dd3358b634cf75e1e4664368240533c1ddbe"; + }; + } + { + name = "ansi_styles___ansi_styles_3.2.1.tgz"; + path = fetchurl { + name = "ansi_styles___ansi_styles_3.2.1.tgz"; + url = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz"; + sha1 = "41fbb20243e50b12be0f04b8dedbf07520ce841d"; + }; + } + { + name = "ansi_styles___ansi_styles_4.2.1.tgz"; + path = fetchurl { + name = "ansi_styles___ansi_styles_4.2.1.tgz"; + url = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.2.1.tgz"; + sha1 = "90ae75c424d008d2624c5bf29ead3177ebfcf359"; + }; + } + { + name = "any_observable___any_observable_0.3.0.tgz"; + path = fetchurl { + name = "any_observable___any_observable_0.3.0.tgz"; + url = "https://registry.yarnpkg.com/any-observable/-/any-observable-0.3.0.tgz"; + sha1 = "af933475e5806a67d0d7df090dd5e8bef65d119b"; + }; + } + { + name = "any_promise___any_promise_1.3.0.tgz"; + path = fetchurl { + name = "any_promise___any_promise_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/any-promise/-/any-promise-1.3.0.tgz"; + sha1 = "abc6afeedcea52e809cdc0376aed3ce39635d17f"; + }; + } + { + name = "argparse___argparse_1.0.10.tgz"; + path = fetchurl { + name = "argparse___argparse_1.0.10.tgz"; + url = "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz"; + sha1 = "bcd6791ea5ae09725e17e5ad988134cd40b3d911"; + }; + } + { + name = "array_flatten___array_flatten_1.1.1.tgz"; + path = fetchurl { + name = "array_flatten___array_flatten_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz"; + sha1 = "9a5f699051b1e7073328f2a008968b64ea2955d2"; + }; + } + { + name = "array_union___array_union_2.1.0.tgz"; + path = fetchurl { + name = "array_union___array_union_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz"; + sha1 = "b798420adbeb1de828d84acd8a2e23d3efe85e8d"; + }; + } + { + name = "asn1___asn1_0.2.4.tgz"; + path = fetchurl { + name = "asn1___asn1_0.2.4.tgz"; + url = "https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz"; + sha1 = "8d2475dfab553bb33e77b54e59e880bb8ce23136"; + }; + } + { + name = "assert_plus___assert_plus_1.0.0.tgz"; + path = fetchurl { + name = "assert_plus___assert_plus_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz"; + sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"; + }; + } + { + name = "async_limiter___async_limiter_1.0.1.tgz"; + path = fetchurl { + name = "async_limiter___async_limiter_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.1.tgz"; + sha1 = "dd379e94f0db8310b08291f9d64c3209766617fd"; + }; + } + { + name = "async___async_2.6.3.tgz"; + path = fetchurl { + name = "async___async_2.6.3.tgz"; + url = "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz"; + sha1 = "d72625e2344a3656e3a3ad4fa749fa83299d82ff"; + }; + } + { + name = "asynckit___asynckit_0.4.0.tgz"; + path = fetchurl { + name = "asynckit___asynckit_0.4.0.tgz"; + url = "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz"; + sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"; + }; + } + { + name = "aws_sign2___aws_sign2_0.7.0.tgz"; + path = fetchurl { + name = "aws_sign2___aws_sign2_0.7.0.tgz"; + url = "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz"; + sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"; + }; + } + { + name = "aws4___aws4_1.9.1.tgz"; + path = fetchurl { + name = "aws4___aws4_1.9.1.tgz"; + url = "https://registry.yarnpkg.com/aws4/-/aws4-1.9.1.tgz"; + sha1 = "7e33d8f7d449b3f673cd72deb9abdc552dbe528e"; + }; + } + { + name = "balanced_match___balanced_match_1.0.0.tgz"; + path = fetchurl { + name = "balanced_match___balanced_match_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz"; + sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767"; + }; + } + { + name = "basic_auth___basic_auth_2.0.1.tgz"; + path = fetchurl { + name = "basic_auth___basic_auth_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/basic-auth/-/basic-auth-2.0.1.tgz"; + sha1 = "b998279bf47ce38344b4f3cf916d4679bbf51e3a"; + }; + } + { + name = "bcrypt_pbkdf___bcrypt_pbkdf_1.0.2.tgz"; + path = fetchurl { + name = "bcrypt_pbkdf___bcrypt_pbkdf_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz"; + sha1 = "a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"; + }; + } + { + name = "bintrees___bintrees_1.0.1.tgz"; + path = fetchurl { + name = "bintrees___bintrees_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/bintrees/-/bintrees-1.0.1.tgz"; + sha1 = "0e655c9b9c2435eaab68bf4027226d2b55a34524"; + }; + } + { + name = "body_parser___body_parser_1.19.0.tgz"; + path = fetchurl { + name = "body_parser___body_parser_1.19.0.tgz"; + url = "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.0.tgz"; + sha1 = "96b2709e57c9c4e09a6fd66a8fd979844f69f08a"; + }; + } + { + name = "brace_expansion___brace_expansion_1.1.11.tgz"; + path = fetchurl { + name = "brace_expansion___brace_expansion_1.1.11.tgz"; + url = "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz"; + sha1 = "3c7fcbf529d87226f3d2f52b966ff5271eb441dd"; + }; + } + { + name = "braces___braces_3.0.2.tgz"; + path = fetchurl { + name = "braces___braces_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz"; + sha1 = "3454e1a462ee8d599e236df336cd9ea4f8afe107"; + }; + } + { + name = "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 = "builtin_modules___builtin_modules_1.1.1.tgz"; + path = fetchurl { + name = "builtin_modules___builtin_modules_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz"; + sha1 = "270f076c5a72c02f5b65a47df94c5fe3a278892f"; + }; + } + { + name = "byline___byline_5.0.0.tgz"; + path = fetchurl { + name = "byline___byline_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/byline/-/byline-5.0.0.tgz"; + sha1 = "741c5216468eadc457b03410118ad77de8c1ddb1"; + }; + } + { + name = "bytes___bytes_3.1.0.tgz"; + path = fetchurl { + name = "bytes___bytes_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz"; + sha1 = "f6cf7933a360e0588fa9fde85651cdc7f805d1f6"; + }; + } + { + name = "caller_callsite___caller_callsite_2.0.0.tgz"; + path = fetchurl { + name = "caller_callsite___caller_callsite_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/caller-callsite/-/caller-callsite-2.0.0.tgz"; + sha1 = "847e0fce0a223750a9a027c54b33731ad3154134"; + }; + } + { + name = "caller_path___caller_path_2.0.0.tgz"; + path = fetchurl { + name = "caller_path___caller_path_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/caller-path/-/caller-path-2.0.0.tgz"; + sha1 = "468f83044e369ab2010fac5f06ceee15bb2cb1f4"; + }; + } + { + name = "callsites___callsites_2.0.0.tgz"; + path = fetchurl { + name = "callsites___callsites_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/callsites/-/callsites-2.0.0.tgz"; + sha1 = "06eb84f00eea413da86affefacbffb36093b3c50"; + }; + } + { + name = "caseless___caseless_0.12.0.tgz"; + path = fetchurl { + name = "caseless___caseless_0.12.0.tgz"; + url = "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz"; + sha1 = "1b681c21ff84033c826543090689420d187151dc"; + }; + } + { + name = "chalk___chalk_1.1.3.tgz"; + path = fetchurl { + name = "chalk___chalk_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz"; + sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98"; + }; + } + { + name = "chalk___chalk_2.4.2.tgz"; + path = fetchurl { + name = "chalk___chalk_2.4.2.tgz"; + url = "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz"; + sha1 = "cd42541677a54333cf541a49108c1432b44c9424"; + }; + } + { + name = "chalk___chalk_3.0.0.tgz"; + path = fetchurl { + name = "chalk___chalk_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz"; + sha1 = "3f73c2bf526591f574cc492c51e2456349f844e4"; + }; + } + { + name = "ci_info___ci_info_2.0.0.tgz"; + path = fetchurl { + name = "ci_info___ci_info_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz"; + sha1 = "67a9e964be31a51e15e5010d58e6f12834002f46"; + }; + } + { + name = "clean_stack___clean_stack_2.2.0.tgz"; + path = fetchurl { + name = "clean_stack___clean_stack_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz"; + sha1 = "ee8472dbb129e727b31e8a10a427dee9dfe4008b"; + }; + } + { + name = "cli_cursor___cli_cursor_2.1.0.tgz"; + path = fetchurl { + name = "cli_cursor___cli_cursor_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz"; + sha1 = "b35dac376479facc3e94747d41d0d0f5238ffcb5"; + }; + } + { + name = "cli_truncate___cli_truncate_0.2.1.tgz"; + path = fetchurl { + name = "cli_truncate___cli_truncate_0.2.1.tgz"; + url = "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-0.2.1.tgz"; + sha1 = "9f15cfbb0705005369216c626ac7d05ab90dd574"; + }; + } + { + name = "code_point_at___code_point_at_1.1.0.tgz"; + path = fetchurl { + name = "code_point_at___code_point_at_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz"; + sha1 = "0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"; + }; + } + { + name = "color_convert___color_convert_1.9.3.tgz"; + path = fetchurl { + name = "color_convert___color_convert_1.9.3.tgz"; + url = "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz"; + sha1 = "bb71850690e1f136567de629d2d5471deda4c1e8"; + }; + } + { + name = "color_convert___color_convert_2.0.1.tgz"; + path = fetchurl { + name = "color_convert___color_convert_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz"; + sha1 = "72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"; + }; + } + { + name = "color_name___color_name_1.1.3.tgz"; + path = fetchurl { + name = "color_name___color_name_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz"; + sha1 = "a7d0558bd89c42f795dd42328f740831ca53bc25"; + }; + } + { + name = "color_name___color_name_1.1.4.tgz"; + path = fetchurl { + name = "color_name___color_name_1.1.4.tgz"; + url = "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz"; + sha1 = "c2a09a87acbde69543de6f63fa3995c826c536a2"; + }; + } + { + name = "color_string___color_string_1.5.3.tgz"; + path = fetchurl { + name = "color_string___color_string_1.5.3.tgz"; + url = "https://registry.yarnpkg.com/color-string/-/color-string-1.5.3.tgz"; + sha1 = "c9bbc5f01b58b5492f3d6857459cb6590ce204cc"; + }; + } + { + name = "color___color_3.0.0.tgz"; + path = fetchurl { + name = "color___color_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/color/-/color-3.0.0.tgz"; + sha1 = "d920b4328d534a3ac8295d68f7bd4ba6c427be9a"; + }; + } + { + name = "colornames___colornames_1.1.1.tgz"; + path = fetchurl { + name = "colornames___colornames_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/colornames/-/colornames-1.1.1.tgz"; + sha1 = "f8889030685c7c4ff9e2a559f5077eb76a816f96"; + }; + } + { + name = "colors___colors_1.4.0.tgz"; + path = fetchurl { + name = "colors___colors_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz"; + sha1 = "c50491479d4c1bdaed2c9ced32cf7c7dc2360f78"; + }; + } + { + name = "colorspace___colorspace_1.1.2.tgz"; + path = fetchurl { + name = "colorspace___colorspace_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/colorspace/-/colorspace-1.1.2.tgz"; + sha1 = "e0128950d082b86a2168580796a0aa5d6c68d8c5"; + }; + } + { + name = "combined_stream___combined_stream_1.0.8.tgz"; + path = fetchurl { + name = "combined_stream___combined_stream_1.0.8.tgz"; + url = "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz"; + sha1 = "c3d45a8b34fd730631a110a8a2520682b31d5a7f"; + }; + } + { + name = "commander___commander_2.20.3.tgz"; + path = fetchurl { + name = "commander___commander_2.20.3.tgz"; + url = "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz"; + sha1 = "fd485e84c03eb4881c20722ba48035e8531aeb33"; + }; + } + { + name = "concat_map___concat_map_0.0.1.tgz"; + path = fetchurl { + name = "concat_map___concat_map_0.0.1.tgz"; + url = "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz"; + sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b"; + }; + } + { + name = "concat_stream___concat_stream_1.6.2.tgz"; + path = fetchurl { + name = "concat_stream___concat_stream_1.6.2.tgz"; + url = "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz"; + sha1 = "904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"; + }; + } + { + name = "content_disposition___content_disposition_0.5.3.tgz"; + path = fetchurl { + name = "content_disposition___content_disposition_0.5.3.tgz"; + url = "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.3.tgz"; + sha1 = "e130caf7e7279087c5616c2007d0485698984fbd"; + }; + } + { + name = "content_type___content_type_1.0.4.tgz"; + path = fetchurl { + name = "content_type___content_type_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz"; + sha1 = "e138cc75e040c727b1966fe5e5f8c9aee256fe3b"; + }; + } + { + name = "cookie_signature___cookie_signature_1.0.6.tgz"; + path = fetchurl { + name = "cookie_signature___cookie_signature_1.0.6.tgz"; + url = "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz"; + sha1 = "e303a882b342cc3ee8ca513a79999734dab3ae2c"; + }; + } + { + name = "cookie___cookie_0.4.0.tgz"; + path = fetchurl { + name = "cookie___cookie_0.4.0.tgz"; + url = "https://registry.yarnpkg.com/cookie/-/cookie-0.4.0.tgz"; + sha1 = "beb437e7022b3b6d49019d088665303ebe9c14ba"; + }; + } + { + name = "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 = "cosmiconfig___cosmiconfig_5.2.1.tgz"; + path = fetchurl { + name = "cosmiconfig___cosmiconfig_5.2.1.tgz"; + url = "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.2.1.tgz"; + sha1 = "040f726809c591e77a17c0a3626ca45b4f168b1a"; + }; + } + { + name = "cross_spawn___cross_spawn_5.1.0.tgz"; + path = fetchurl { + name = "cross_spawn___cross_spawn_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz"; + sha1 = "e8bd0efee58fcff6f8f94510a0a554bbfa235449"; + }; + } + { + name = "cross_spawn___cross_spawn_6.0.5.tgz"; + path = fetchurl { + name = "cross_spawn___cross_spawn_6.0.5.tgz"; + url = "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz"; + sha1 = "4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"; + }; + } + { + name = "cross_spawn___cross_spawn_7.0.1.tgz"; + path = fetchurl { + name = "cross_spawn___cross_spawn_7.0.1.tgz"; + url = "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.1.tgz"; + sha1 = "0ab56286e0f7c24e153d04cc2aa027e43a9a5d14"; + }; + } + { + name = "dashdash___dashdash_1.14.1.tgz"; + path = fetchurl { + name = "dashdash___dashdash_1.14.1.tgz"; + url = "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz"; + sha1 = "853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"; + }; + } + { + name = "date_fns___date_fns_1.30.1.tgz"; + path = fetchurl { + name = "date_fns___date_fns_1.30.1.tgz"; + url = "https://registry.yarnpkg.com/date-fns/-/date-fns-1.30.1.tgz"; + sha1 = "2e71bf0b119153dbb4cc4e88d9ea5acfb50dc05c"; + }; + } + { + name = "debug___debug_2.6.9.tgz"; + path = fetchurl { + name = "debug___debug_2.6.9.tgz"; + url = "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz"; + sha1 = "5d128515df134ff327e90a4c93f4e077a536341f"; + }; + } + { + name = "debug___debug_3.2.6.tgz"; + path = fetchurl { + name = "debug___debug_3.2.6.tgz"; + url = "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz"; + sha1 = "e83d17de16d8a7efb7717edbe5fb10135eee629b"; + }; + } + { + name = "debug___debug_4.1.1.tgz"; + path = fetchurl { + name = "debug___debug_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz"; + sha1 = "3b72260255109c6b589cee050f1d516139664791"; + }; + } + { + name = "dedent___dedent_0.7.0.tgz"; + path = fetchurl { + name = "dedent___dedent_0.7.0.tgz"; + url = "https://registry.yarnpkg.com/dedent/-/dedent-0.7.0.tgz"; + sha1 = "2495ddbaf6eb874abb0e1be9df22d2e5a544326c"; + }; + } + { + name = "deep_is___deep_is_0.1.3.tgz"; + path = fetchurl { + name = "deep_is___deep_is_0.1.3.tgz"; + url = "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz"; + sha1 = "b369d6fb5dbc13eecf524f91b070feedc357cf34"; + }; + } + { + name = "del___del_5.1.0.tgz"; + path = fetchurl { + name = "del___del_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/del/-/del-5.1.0.tgz"; + sha1 = "d9487c94e367410e6eff2925ee58c0c84a75b3a7"; + }; + } + { + name = "delayed_stream___delayed_stream_1.0.0.tgz"; + path = fetchurl { + name = "delayed_stream___delayed_stream_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz"; + sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619"; + }; + } + { + name = "depd___depd_1.1.2.tgz"; + path = fetchurl { + name = "depd___depd_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz"; + sha1 = "9bcd52e14c097763e749b274c4346ed2e560b5a9"; + }; + } + { + name = "destroy___destroy_1.0.4.tgz"; + path = fetchurl { + name = "destroy___destroy_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz"; + sha1 = "978857442c44749e4206613e37946205826abd80"; + }; + } + { + name = "diagnostics___diagnostics_1.1.1.tgz"; + path = fetchurl { + name = "diagnostics___diagnostics_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/diagnostics/-/diagnostics-1.1.1.tgz"; + sha1 = "cab6ac33df70c9d9a727490ae43ac995a769b22a"; + }; + } + { + name = "diff___diff_4.0.2.tgz"; + path = fetchurl { + name = "diff___diff_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz"; + sha1 = "60f3aecb89d5fae520c11aa19efc2bb982aade7d"; + }; + } + { + name = "dir_glob___dir_glob_3.0.1.tgz"; + path = fetchurl { + name = "dir_glob___dir_glob_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz"; + sha1 = "56dbf73d992a4a93ba1584f4534063fd2e41717f"; + }; + } + { + name = "duplexer___duplexer_0.1.1.tgz"; + path = fetchurl { + name = "duplexer___duplexer_0.1.1.tgz"; + url = "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz"; + sha1 = "ace6ff808c1ce66b57d1ebf97977acb02334cfc1"; + }; + } + { + name = "ecc_jsbn___ecc_jsbn_0.1.2.tgz"; + path = fetchurl { + name = "ecc_jsbn___ecc_jsbn_0.1.2.tgz"; + url = "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz"; + sha1 = "3a83a904e54353287874c564b7549386849a98c9"; + }; + } + { + name = "ee_first___ee_first_1.1.1.tgz"; + path = fetchurl { + name = "ee_first___ee_first_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz"; + sha1 = "590c61156b0ae2f4f0255732a158b266bc56b21d"; + }; + } + { + name = "elegant_spinner___elegant_spinner_1.0.1.tgz"; + path = fetchurl { + name = "elegant_spinner___elegant_spinner_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/elegant-spinner/-/elegant-spinner-1.0.1.tgz"; + sha1 = "db043521c95d7e303fd8f345bedc3349cfb0729e"; + }; + } + { + name = "enabled___enabled_1.0.2.tgz"; + path = fetchurl { + name = "enabled___enabled_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/enabled/-/enabled-1.0.2.tgz"; + sha1 = "965f6513d2c2d1c5f4652b64a2e3396467fc2f93"; + }; + } + { + name = "encodeurl___encodeurl_1.0.2.tgz"; + path = fetchurl { + name = "encodeurl___encodeurl_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz"; + sha1 = "ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"; + }; + } + { + name = "end_of_stream___end_of_stream_1.4.4.tgz"; + path = fetchurl { + name = "end_of_stream___end_of_stream_1.4.4.tgz"; + url = "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz"; + sha1 = "5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"; + }; + } + { + name = "env_variable___env_variable_0.0.5.tgz"; + path = fetchurl { + name = "env_variable___env_variable_0.0.5.tgz"; + url = "https://registry.yarnpkg.com/env-variable/-/env-variable-0.0.5.tgz"; + sha1 = "913dd830bef11e96a039c038d4130604eba37f88"; + }; + } + { + name = "error_ex___error_ex_1.3.2.tgz"; + path = fetchurl { + name = "error_ex___error_ex_1.3.2.tgz"; + url = "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz"; + sha1 = "b4ac40648107fdcdcfae242f428bea8a14d4f1bf"; + }; + } + { + name = "es6_promise___es6_promise_4.2.8.tgz"; + path = fetchurl { + name = "es6_promise___es6_promise_4.2.8.tgz"; + url = "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.8.tgz"; + sha1 = "4eb21594c972bc40553d276e510539143db53e0a"; + }; + } + { + name = "es6_promisify___es6_promisify_5.0.0.tgz"; + path = fetchurl { + name = "es6_promisify___es6_promisify_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/es6-promisify/-/es6-promisify-5.0.0.tgz"; + sha1 = "5109d62f3e56ea967c4b63505aef08291c8a5203"; + }; + } + { + name = "escape_html___escape_html_1.0.3.tgz"; + path = fetchurl { + name = "escape_html___escape_html_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz"; + sha1 = "0258eae4d3d0c0974de1c169188ef0051d1d1988"; + }; + } + { + name = "escape_string_regexp___escape_string_regexp_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 = "escodegen___escodegen_1.14.1.tgz"; + path = fetchurl { + name = "escodegen___escodegen_1.14.1.tgz"; + url = "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.1.tgz"; + sha1 = "ba01d0c8278b5e95a9a45350142026659027a457"; + }; + } + { + name = "esprima___esprima_4.0.1.tgz"; + path = fetchurl { + name = "esprima___esprima_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz"; + sha1 = "13b04cdb3e6c5d19df91ab6987a8695619b0aa71"; + }; + } + { + name = "estraverse___estraverse_4.3.0.tgz"; + path = fetchurl { + name = "estraverse___estraverse_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz"; + sha1 = "398ad3f3c5a24948be7725e83d11a7de28cdbd1d"; + }; + } + { + name = "esutils___esutils_2.0.3.tgz"; + path = fetchurl { + name = "esutils___esutils_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz"; + sha1 = "74d2eb4de0b8da1293711910d50775b9b710ef64"; + }; + } + { + name = "etag___etag_1.8.1.tgz"; + path = fetchurl { + name = "etag___etag_1.8.1.tgz"; + url = "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz"; + sha1 = "41ae2eeb65efa62268aebfea83ac7d79299b0887"; + }; + } + { + name = "event_stream___event_stream_3.3.4.tgz"; + path = fetchurl { + name = "event_stream___event_stream_3.3.4.tgz"; + url = "https://registry.yarnpkg.com/event-stream/-/event-stream-3.3.4.tgz"; + sha1 = "4ab4c9a0f5a54db9338b4c34d86bfce8f4b35571"; + }; + } + { + name = "execa___execa_1.0.0.tgz"; + path = fetchurl { + name = "execa___execa_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz"; + sha1 = "c6236a5bb4df6d6f15e88e7f017798216749ddd8"; + }; + } + { + name = "execa___execa_2.1.0.tgz"; + path = fetchurl { + name = "execa___execa_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/execa/-/execa-2.1.0.tgz"; + sha1 = "e5d3ecd837d2a60ec50f3da78fd39767747bbe99"; + }; + } + { + name = "expand_template___expand_template_2.0.3.tgz"; + path = fetchurl { + name = "expand_template___expand_template_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/expand-template/-/expand-template-2.0.3.tgz"; + sha1 = "6e14b3fcee0f3a6340ecb57d2e8918692052a47c"; + }; + } + { + name = "express_prom_bundle___express_prom_bundle_5.1.5.tgz"; + path = fetchurl { + name = "express_prom_bundle___express_prom_bundle_5.1.5.tgz"; + url = "https://registry.yarnpkg.com/express-prom-bundle/-/express-prom-bundle-5.1.5.tgz"; + sha1 = "f298615879299a58cf8ec1350186f4de91d91fa4"; + }; + } + { + name = "express___express_4.17.1.tgz"; + path = fetchurl { + name = "express___express_4.17.1.tgz"; + url = "https://registry.yarnpkg.com/express/-/express-4.17.1.tgz"; + sha1 = "4491fc38605cf51f8629d39c2b5d026f98a4c134"; + }; + } + { + name = "extend___extend_3.0.2.tgz"; + path = fetchurl { + name = "extend___extend_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz"; + sha1 = "f8b1136b4071fbd8eb140aff858b1019ec2915fa"; + }; + } + { + name = "extract_zip___extract_zip_1.6.7.tgz"; + path = fetchurl { + name = "extract_zip___extract_zip_1.6.7.tgz"; + url = "https://registry.yarnpkg.com/extract-zip/-/extract-zip-1.6.7.tgz"; + sha1 = "a840b4b8af6403264c8db57f4f1a74333ef81fe9"; + }; + } + { + name = "extsprintf___extsprintf_1.3.0.tgz"; + path = fetchurl { + name = "extsprintf___extsprintf_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz"; + sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05"; + }; + } + { + name = "extsprintf___extsprintf_1.4.0.tgz"; + path = fetchurl { + name = "extsprintf___extsprintf_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz"; + sha1 = "e2689f8f356fad62cca65a3a91c5df5f9551692f"; + }; + } + { + name = "fast_deep_equal___fast_deep_equal_3.1.1.tgz"; + path = fetchurl { + name = "fast_deep_equal___fast_deep_equal_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz"; + sha1 = "545145077c501491e33b15ec408c294376e94ae4"; + }; + } + { + name = "fast_glob___fast_glob_3.1.1.tgz"; + path = fetchurl { + name = "fast_glob___fast_glob_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.1.1.tgz"; + sha1 = "87ee30e9e9f3eb40d6f254a7997655da753d7c82"; + }; + } + { + name = "fast_glob___fast_glob_3.2.2.tgz"; + path = fetchurl { + name = "fast_glob___fast_glob_3.2.2.tgz"; + url = "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.2.tgz"; + sha1 = "ade1a9d91148965d4bf7c51f72e1ca662d32e63d"; + }; + } + { + name = "fast_json_stable_stringify___fast_json_stable_stringify_2.1.0.tgz"; + path = fetchurl { + name = "fast_json_stable_stringify___fast_json_stable_stringify_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz"; + sha1 = "874bf69c6f404c2b5d99c481341399fd55892633"; + }; + } + { + name = "fast_levenshtein___fast_levenshtein_2.0.6.tgz"; + path = fetchurl { + name = "fast_levenshtein___fast_levenshtein_2.0.6.tgz"; + url = "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz"; + sha1 = "3d8a5c66883a16a30ca8643e851f19baa7797917"; + }; + } + { + name = "fast_safe_stringify___fast_safe_stringify_2.0.7.tgz"; + path = fetchurl { + name = "fast_safe_stringify___fast_safe_stringify_2.0.7.tgz"; + url = "https://registry.yarnpkg.com/fast-safe-stringify/-/fast-safe-stringify-2.0.7.tgz"; + sha1 = "124aa885899261f68aedb42a7c080de9da608743"; + }; + } + { + name = "fastq___fastq_1.6.0.tgz"; + path = fetchurl { + name = "fastq___fastq_1.6.0.tgz"; + url = "https://registry.yarnpkg.com/fastq/-/fastq-1.6.0.tgz"; + sha1 = "4ec8a38f4ac25f21492673adb7eae9cfef47d1c2"; + }; + } + { + name = "fd_slicer___fd_slicer_1.0.1.tgz"; + path = fetchurl { + name = "fd_slicer___fd_slicer_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.0.1.tgz"; + sha1 = "8b5bcbd9ec327c5041bf9ab023fd6750f1177e65"; + }; + } + { + name = "fecha___fecha_2.3.3.tgz"; + path = fetchurl { + name = "fecha___fecha_2.3.3.tgz"; + url = "https://registry.yarnpkg.com/fecha/-/fecha-2.3.3.tgz"; + sha1 = "948e74157df1a32fd1b12c3a3c3cdcb6ec9d96cd"; + }; + } + { + name = "figures___figures_1.7.0.tgz"; + path = fetchurl { + name = "figures___figures_1.7.0.tgz"; + url = "https://registry.yarnpkg.com/figures/-/figures-1.7.0.tgz"; + sha1 = "cbe1e3affcf1cd44b80cadfed28dc793a9701d2e"; + }; + } + { + name = "figures___figures_2.0.0.tgz"; + path = fetchurl { + name = "figures___figures_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz"; + sha1 = "3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"; + }; + } + { + name = "fill_range___fill_range_7.0.1.tgz"; + path = fetchurl { + name = "fill_range___fill_range_7.0.1.tgz"; + url = "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz"; + sha1 = "1919a6a7c75fe38b2c7c77e5198535da9acdda40"; + }; + } + { + name = "finalhandler___finalhandler_1.1.2.tgz"; + path = fetchurl { + name = "finalhandler___finalhandler_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz"; + sha1 = "b7e7d000ffd11938d0fdb053506f6ebabe9f587d"; + }; + } + { + name = "find_up___find_up_4.1.0.tgz"; + path = fetchurl { + name = "find_up___find_up_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz"; + sha1 = "97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"; + }; + } + { + name = "forever_agent___forever_agent_0.6.1.tgz"; + path = fetchurl { + name = "forever_agent___forever_agent_0.6.1.tgz"; + url = "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz"; + sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"; + }; + } + { + name = "form_data___form_data_2.3.3.tgz"; + path = fetchurl { + name = "form_data___form_data_2.3.3.tgz"; + url = "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz"; + sha1 = "dcce52c05f644f298c6a7ab936bd724ceffbf3a6"; + }; + } + { + name = "forwarded___forwarded_0.1.2.tgz"; + path = fetchurl { + name = "forwarded___forwarded_0.1.2.tgz"; + url = "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz"; + sha1 = "98c23dab1175657b8c0573e8ceccd91b0ff18c84"; + }; + } + { + name = "fresh___fresh_0.5.2.tgz"; + path = fetchurl { + name = "fresh___fresh_0.5.2.tgz"; + url = "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz"; + sha1 = "3d8cadd90d976569fa835ab1f8e4b23a105605a7"; + }; + } + { + name = "from2___from2_2.3.0.tgz"; + path = fetchurl { + name = "from2___from2_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/from2/-/from2-2.3.0.tgz"; + sha1 = "8bfb5502bde4a4d36cfdeea007fcca21d7e382af"; + }; + } + { + name = "from___from_0.1.7.tgz"; + path = fetchurl { + name = "from___from_0.1.7.tgz"; + url = "https://registry.yarnpkg.com/from/-/from-0.1.7.tgz"; + sha1 = "83c60afc58b9c56997007ed1a768b3ab303a44fe"; + }; + } + { + name = "fs_extra___fs_extra_8.1.0.tgz"; + path = fetchurl { + name = "fs_extra___fs_extra_8.1.0.tgz"; + url = "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz"; + sha1 = "49d43c45a88cd9677668cb7be1b46efdb8d2e1c0"; + }; + } + { + name = "fs.realpath___fs.realpath_1.0.0.tgz"; + path = fetchurl { + name = "fs.realpath___fs.realpath_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz"; + sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; + }; + } + { + name = "get_own_enumerable_property_symbols___get_own_enumerable_property_symbols_3.0.2.tgz"; + path = fetchurl { + name = "get_own_enumerable_property_symbols___get_own_enumerable_property_symbols_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.2.tgz"; + sha1 = "b5fde77f22cbe35f390b4e089922c50bce6ef664"; + }; + } + { + name = "get_stdin___get_stdin_7.0.0.tgz"; + path = fetchurl { + name = "get_stdin___get_stdin_7.0.0.tgz"; + url = "https://registry.yarnpkg.com/get-stdin/-/get-stdin-7.0.0.tgz"; + sha1 = "8d5de98f15171a125c5e516643c7a6d0ea8a96f6"; + }; + } + { + name = "get_stream___get_stream_4.1.0.tgz"; + path = fetchurl { + name = "get_stream___get_stream_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz"; + sha1 = "c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"; + }; + } + { + name = "get_stream___get_stream_5.1.0.tgz"; + path = fetchurl { + name = "get_stream___get_stream_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/get-stream/-/get-stream-5.1.0.tgz"; + sha1 = "01203cdc92597f9b909067c3e656cc1f4d3c4dc9"; + }; + } + { + name = "getpass___getpass_0.1.7.tgz"; + path = fetchurl { + name = "getpass___getpass_0.1.7.tgz"; + url = "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz"; + sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa"; + }; + } + { + name = "glob_parent___glob_parent_5.1.0.tgz"; + path = fetchurl { + name = "glob_parent___glob_parent_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.0.tgz"; + sha1 = "5f4c1d1e748d30cd73ad2944b3577a81b081e8c2"; + }; + } + { + name = "glob___glob_7.1.6.tgz"; + path = fetchurl { + name = "glob___glob_7.1.6.tgz"; + url = "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz"; + sha1 = "141f33b81a7c2492e125594307480c46679278a6"; + }; + } + { + name = "globby___globby_10.0.2.tgz"; + path = fetchurl { + name = "globby___globby_10.0.2.tgz"; + url = "https://registry.yarnpkg.com/globby/-/globby-10.0.2.tgz"; + sha1 = "277593e745acaa4646c3ab411289ec47a0392543"; + }; + } + { + name = "globby___globby_11.0.0.tgz"; + path = fetchurl { + name = "globby___globby_11.0.0.tgz"; + url = "https://registry.yarnpkg.com/globby/-/globby-11.0.0.tgz"; + sha1 = "56fd0e9f0d4f8fb0c456f1ab0dee96e1380bc154"; + }; + } + { + name = "google_protobuf___google_protobuf_3.5.0.tgz"; + path = fetchurl { + name = "google_protobuf___google_protobuf_3.5.0.tgz"; + url = "https://registry.yarnpkg.com/google-protobuf/-/google-protobuf-3.5.0.tgz"; + sha1 = "b8cc63c74d83457bd8a9a904503c8efb26bca339"; + }; + } + { + name = "graceful_fs___graceful_fs_4.2.3.tgz"; + path = fetchurl { + name = "graceful_fs___graceful_fs_4.2.3.tgz"; + url = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.3.tgz"; + sha1 = "4a12ff1b60376ef09862c2093edd908328be8423"; + }; + } + { + name = "graceful_fs___graceful_fs_4.2.4.tgz"; + path = fetchurl { + name = "graceful_fs___graceful_fs_4.2.4.tgz"; + url = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz"; + sha1 = "2256bde14d3632958c465ebc96dc467ca07a29fb"; + }; + } + { + name = "har_schema___har_schema_2.0.0.tgz"; + path = fetchurl { + name = "har_schema___har_schema_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz"; + sha1 = "a94c2224ebcac04782a0d9035521f24735b7ec92"; + }; + } + { + name = "har_validator___har_validator_5.1.3.tgz"; + path = fetchurl { + name = "har_validator___har_validator_5.1.3.tgz"; + url = "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.3.tgz"; + sha1 = "1ef89ebd3e4996557675eed9893110dc350fa080"; + }; + } + { + name = "has_ansi___has_ansi_2.0.0.tgz"; + path = fetchurl { + name = "has_ansi___has_ansi_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz"; + sha1 = "34f5049ce1ecdf2b0649af3ef24e45ed35416d91"; + }; + } + { + name = "has_flag___has_flag_3.0.0.tgz"; + path = fetchurl { + name = "has_flag___has_flag_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz"; + sha1 = "b5d454dc2199ae225699f3467e5a07f3b955bafd"; + }; + } + { + name = "has_flag___has_flag_4.0.0.tgz"; + path = fetchurl { + name = "has_flag___has_flag_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz"; + sha1 = "944771fd9c81c81265c4d6941860da06bb59479b"; + }; + } + { + name = "hosted_git_info___hosted_git_info_2.8.5.tgz"; + path = fetchurl { + name = "hosted_git_info___hosted_git_info_2.8.5.tgz"; + url = "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.5.tgz"; + sha1 = "759cfcf2c4d156ade59b0b2dfabddc42a6b9c70c"; + }; + } + { + name = "http_errors___http_errors_1.7.2.tgz"; + path = fetchurl { + name = "http_errors___http_errors_1.7.2.tgz"; + url = "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.2.tgz"; + sha1 = "4f5029cf13239f31036e5b2e55292bcfbcc85c8f"; + }; + } + { + name = "http_errors___http_errors_1.7.3.tgz"; + path = fetchurl { + name = "http_errors___http_errors_1.7.3.tgz"; + url = "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.3.tgz"; + sha1 = "6c619e4f9c60308c38519498c14fbb10aacebb06"; + }; + } + { + name = "http_signature___http_signature_1.2.0.tgz"; + path = fetchurl { + name = "http_signature___http_signature_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz"; + sha1 = "9aecd925114772f3d95b65a60abb8f7c18fbace1"; + }; + } + { + name = "https_proxy_agent___https_proxy_agent_3.0.1.tgz"; + path = fetchurl { + name = "https_proxy_agent___https_proxy_agent_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-3.0.1.tgz"; + sha1 = "b8c286433e87602311b01c8ea34413d856a4af81"; + }; + } + { + name = "husky___husky_3.1.0.tgz"; + path = fetchurl { + name = "husky___husky_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/husky/-/husky-3.1.0.tgz"; + sha1 = "5faad520ab860582ed94f0c1a77f0f04c90b57c0"; + }; + } + { + name = "iconv_lite___iconv_lite_0.4.24.tgz"; + path = fetchurl { + name = "iconv_lite___iconv_lite_0.4.24.tgz"; + url = "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz"; + sha1 = "2022b4b25fbddc21d2f524974a474aafe733908b"; + }; + } + { + name = "ignore___ignore_5.1.4.tgz"; + path = fetchurl { + name = "ignore___ignore_5.1.4.tgz"; + url = "https://registry.yarnpkg.com/ignore/-/ignore-5.1.4.tgz"; + sha1 = "84b7b3dbe64552b6ef0eca99f6743dbec6d97adf"; + }; + } + { + name = "import_fresh___import_fresh_2.0.0.tgz"; + path = fetchurl { + name = "import_fresh___import_fresh_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/import-fresh/-/import-fresh-2.0.0.tgz"; + sha1 = "d81355c15612d386c61f9ddd3922d4304822a546"; + }; + } + { + name = "imurmurhash___imurmurhash_0.1.4.tgz"; + path = fetchurl { + name = "imurmurhash___imurmurhash_0.1.4.tgz"; + url = "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz"; + sha1 = "9218b9b2b928a238b13dc4fb6b6d576f231453ea"; + }; + } + { + name = "indent_string___indent_string_3.2.0.tgz"; + path = fetchurl { + name = "indent_string___indent_string_3.2.0.tgz"; + url = "https://registry.yarnpkg.com/indent-string/-/indent-string-3.2.0.tgz"; + sha1 = "4a5fd6d27cc332f37e5419a504dbb837105c9289"; + }; + } + { + name = "indent_string___indent_string_4.0.0.tgz"; + path = fetchurl { + name = "indent_string___indent_string_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz"; + sha1 = "624f8f4497d619b2d9768531d58f4122854d7251"; + }; + } + { + name = "inflight___inflight_1.0.6.tgz"; + path = fetchurl { + name = "inflight___inflight_1.0.6.tgz"; + url = "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz"; + sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9"; + }; + } + { + name = "inherits___inherits_2.0.4.tgz"; + path = fetchurl { + name = "inherits___inherits_2.0.4.tgz"; + url = "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz"; + sha1 = "0fa2c64f932917c3433a0ded55363aae37416b7c"; + }; + } + { + name = "inherits___inherits_2.0.3.tgz"; + path = fetchurl { + name = "inherits___inherits_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz"; + sha1 = "633c2c83e3da42a502f52466022480f4208261de"; + }; + } + { + name = "into_stream___into_stream_5.1.1.tgz"; + path = fetchurl { + name = "into_stream___into_stream_5.1.1.tgz"; + url = "https://registry.yarnpkg.com/into-stream/-/into-stream-5.1.1.tgz"; + sha1 = "f9a20a348a11f3c13face22763f2d02e127f4db8"; + }; + } + { + name = "ipaddr.js___ipaddr.js_1.9.0.tgz"; + path = fetchurl { + name = "ipaddr.js___ipaddr.js_1.9.0.tgz"; + url = "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.0.tgz"; + sha1 = "37df74e430a0e47550fe54a2defe30d8acd95f65"; + }; + } + { + name = "is_arrayish___is_arrayish_0.2.1.tgz"; + path = fetchurl { + name = "is_arrayish___is_arrayish_0.2.1.tgz"; + url = "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz"; + sha1 = "77c99840527aa8ecb1a8ba697b80645a7a926a9d"; + }; + } + { + name = "is_arrayish___is_arrayish_0.3.2.tgz"; + path = fetchurl { + name = "is_arrayish___is_arrayish_0.3.2.tgz"; + url = "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.3.2.tgz"; + sha1 = "4574a2ae56f7ab206896fb431eaeed066fdf8f03"; + }; + } + { + name = "is_directory___is_directory_0.3.1.tgz"; + path = fetchurl { + name = "is_directory___is_directory_0.3.1.tgz"; + url = "https://registry.yarnpkg.com/is-directory/-/is-directory-0.3.1.tgz"; + sha1 = "61339b6f2475fc772fd9c9d83f5c8575dc154ae1"; + }; + } + { + name = "is_extglob___is_extglob_2.1.1.tgz"; + path = fetchurl { + name = "is_extglob___is_extglob_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz"; + sha1 = "a88c02535791f02ed37c76a1b9ea9773c833f8c2"; + }; + } + { + name = "is_fullwidth_code_point___is_fullwidth_code_point_1.0.0.tgz"; + path = fetchurl { + name = "is_fullwidth_code_point___is_fullwidth_code_point_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz"; + sha1 = "ef9e31386f031a7f0d643af82fde50c457ef00cb"; + }; + } + { + name = "is_fullwidth_code_point___is_fullwidth_code_point_2.0.0.tgz"; + path = fetchurl { + name = "is_fullwidth_code_point___is_fullwidth_code_point_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz"; + sha1 = "a3b30a5c4f199183167aaab93beefae3ddfb654f"; + }; + } + { + name = "is_glob___is_glob_4.0.1.tgz"; + path = fetchurl { + name = "is_glob___is_glob_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz"; + sha1 = "7567dbe9f2f5e2467bc77ab83c4a29482407a5dc"; + }; + } + { + name = "is_number___is_number_7.0.0.tgz"; + path = fetchurl { + name = "is_number___is_number_7.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz"; + sha1 = "7535345b896734d5f80c4d06c50955527a14f12b"; + }; + } + { + name = "is_obj___is_obj_1.0.1.tgz"; + path = fetchurl { + name = "is_obj___is_obj_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz"; + sha1 = "3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"; + }; + } + { + name = "is_observable___is_observable_1.1.0.tgz"; + path = fetchurl { + name = "is_observable___is_observable_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-observable/-/is-observable-1.1.0.tgz"; + sha1 = "b3e986c8f44de950867cab5403f5a3465005975e"; + }; + } + { + name = "is_path_cwd___is_path_cwd_2.2.0.tgz"; + path = fetchurl { + name = "is_path_cwd___is_path_cwd_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-2.2.0.tgz"; + sha1 = "67d43b82664a7b5191fd9119127eb300048a9fdb"; + }; + } + { + name = "is_path_inside___is_path_inside_3.0.2.tgz"; + path = fetchurl { + name = "is_path_inside___is_path_inside_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.2.tgz"; + sha1 = "f5220fc82a3e233757291dddc9c5877f2a1f3017"; + }; + } + { + name = "is_promise___is_promise_2.1.0.tgz"; + path = fetchurl { + name = "is_promise___is_promise_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz"; + sha1 = "79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"; + }; + } + { + name = "is_regexp___is_regexp_1.0.0.tgz"; + path = fetchurl { + name = "is_regexp___is_regexp_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-regexp/-/is-regexp-1.0.0.tgz"; + sha1 = "fd2d883545c46bac5a633e7b9a09e87fa2cb5069"; + }; + } + { + name = "is_stream___is_stream_1.1.0.tgz"; + path = fetchurl { + name = "is_stream___is_stream_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz"; + sha1 = "12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"; + }; + } + { + name = "is_stream___is_stream_2.0.0.tgz"; + path = fetchurl { + name = "is_stream___is_stream_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.0.tgz"; + sha1 = "bde9c32680d6fae04129d6ac9d921ce7815f78e3"; + }; + } + { + name = "is_typedarray___is_typedarray_1.0.0.tgz"; + path = fetchurl { + name = "is_typedarray___is_typedarray_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz"; + sha1 = "e479c80858df0c1b11ddda6940f96011fcda4a9a"; + }; + } + { + 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 = "isexe___isexe_2.0.0.tgz"; + path = fetchurl { + name = "isexe___isexe_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz"; + sha1 = "e8fbf374dc556ff8947a10dcb0572d633f2cfa10"; + }; + } + { + name = "isstream___isstream_0.1.2.tgz"; + path = fetchurl { + name = "isstream___isstream_0.1.2.tgz"; + url = "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz"; + sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a"; + }; + } + { + name = "js_tokens___js_tokens_4.0.0.tgz"; + path = fetchurl { + name = "js_tokens___js_tokens_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz"; + sha1 = "19203fb59991df98e3a287050d4647cdeaf32499"; + }; + } + { + name = "js_yaml___js_yaml_3.13.1.tgz"; + path = fetchurl { + name = "js_yaml___js_yaml_3.13.1.tgz"; + url = "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz"; + sha1 = "aff151b30bfdfa8e49e05da22e7415e9dfa37847"; + }; + } + { + name = "jsbn___jsbn_0.1.1.tgz"; + path = fetchurl { + name = "jsbn___jsbn_0.1.1.tgz"; + url = "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz"; + sha1 = "a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"; + }; + } + { + name = "json_parse_better_errors___json_parse_better_errors_1.0.2.tgz"; + path = fetchurl { + name = "json_parse_better_errors___json_parse_better_errors_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz"; + sha1 = "bb867cfb3450e69107c131d1c514bab3dc8bcaa9"; + }; + } + { + name = "json_schema_traverse___json_schema_traverse_0.4.1.tgz"; + path = fetchurl { + name = "json_schema_traverse___json_schema_traverse_0.4.1.tgz"; + url = "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz"; + sha1 = "69f6a87d9513ab8bb8fe63bdb0979c448e684660"; + }; + } + { + name = "json_schema___json_schema_0.2.3.tgz"; + path = fetchurl { + name = "json_schema___json_schema_0.2.3.tgz"; + url = "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz"; + sha1 = "b480c892e59a2f05954ce727bd3f2a4e882f9e13"; + }; + } + { + name = "json_stringify_safe___json_stringify_safe_5.0.1.tgz"; + path = fetchurl { + name = "json_stringify_safe___json_stringify_safe_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"; + sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"; + }; + } + { + name = "jsonfile___jsonfile_4.0.0.tgz"; + path = fetchurl { + name = "jsonfile___jsonfile_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz"; + sha1 = "8771aae0799b64076b76640fca058f9c10e33ecb"; + }; + } + { + name = "jsprim___jsprim_1.4.1.tgz"; + path = fetchurl { + name = "jsprim___jsprim_1.4.1.tgz"; + url = "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz"; + sha1 = "313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"; + }; + } + { + name = "kuler___kuler_1.0.1.tgz"; + path = fetchurl { + name = "kuler___kuler_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/kuler/-/kuler-1.0.1.tgz"; + sha1 = "ef7c784f36c9fb6e16dd3150d152677b2b0228a6"; + }; + } + { + name = "levn___levn_0.3.0.tgz"; + path = fetchurl { + name = "levn___levn_0.3.0.tgz"; + url = "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz"; + sha1 = "3b09924edf9f083c0490fdd4c0bc4421e04764ee"; + }; + } + { + name = "lines_and_columns___lines_and_columns_1.1.6.tgz"; + path = fetchurl { + name = "lines_and_columns___lines_and_columns_1.1.6.tgz"; + url = "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz"; + sha1 = "1c00c743b433cd0a4e80758f7b64a57440d9ff00"; + }; + } + { + name = "lint_staged___lint_staged_9.5.0.tgz"; + path = fetchurl { + name = "lint_staged___lint_staged_9.5.0.tgz"; + url = "https://registry.yarnpkg.com/lint-staged/-/lint-staged-9.5.0.tgz"; + sha1 = "290ec605252af646d9b74d73a0fa118362b05a33"; + }; + } + { + name = "listr_silent_renderer___listr_silent_renderer_1.1.1.tgz"; + path = fetchurl { + name = "listr_silent_renderer___listr_silent_renderer_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/listr-silent-renderer/-/listr-silent-renderer-1.1.1.tgz"; + sha1 = "924b5a3757153770bf1a8e3fbf74b8bbf3f9242e"; + }; + } + { + name = "listr_update_renderer___listr_update_renderer_0.5.0.tgz"; + path = fetchurl { + name = "listr_update_renderer___listr_update_renderer_0.5.0.tgz"; + url = "https://registry.yarnpkg.com/listr-update-renderer/-/listr-update-renderer-0.5.0.tgz"; + sha1 = "4ea8368548a7b8aecb7e06d8c95cb45ae2ede6a2"; + }; + } + { + name = "listr_verbose_renderer___listr_verbose_renderer_0.5.0.tgz"; + path = fetchurl { + name = "listr_verbose_renderer___listr_verbose_renderer_0.5.0.tgz"; + url = "https://registry.yarnpkg.com/listr-verbose-renderer/-/listr-verbose-renderer-0.5.0.tgz"; + sha1 = "f1132167535ea4c1261102b9f28dac7cba1e03db"; + }; + } + { + name = "listr___listr_0.14.3.tgz"; + path = fetchurl { + name = "listr___listr_0.14.3.tgz"; + url = "https://registry.yarnpkg.com/listr/-/listr-0.14.3.tgz"; + sha1 = "2fea909604e434be464c50bddba0d496928fa586"; + }; + } + { + name = "locate_path___locate_path_5.0.0.tgz"; + path = fetchurl { + name = "locate_path___locate_path_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz"; + sha1 = "1afba396afd676a6d42504d0a67a3a7eb9f62aa0"; + }; + } + { + name = "lodash.camelcase___lodash.camelcase_4.3.0.tgz"; + path = fetchurl { + name = "lodash.camelcase___lodash.camelcase_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz"; + sha1 = "b28aa6288a2b9fc651035c7711f65ab6190331a6"; + }; + } + { + name = "lodash___lodash_4.17.19.tgz"; + path = fetchurl { + name = "lodash___lodash_4.17.19.tgz"; + url = "https://registry.yarnpkg.com/lodash/-/lodash-4.17.19.tgz"; + sha1 = "e48ddedbe30b3321783c5b4301fbd353bc1e4a4b"; + }; + } + { + name = "log_symbols___log_symbols_1.0.2.tgz"; + path = fetchurl { + name = "log_symbols___log_symbols_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/log-symbols/-/log-symbols-1.0.2.tgz"; + sha1 = "376ff7b58ea3086a0f09facc74617eca501e1a18"; + }; + } + { + name = "log_symbols___log_symbols_3.0.0.tgz"; + path = fetchurl { + name = "log_symbols___log_symbols_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/log-symbols/-/log-symbols-3.0.0.tgz"; + sha1 = "f3a08516a5dea893336a7dee14d18a1cfdab77c4"; + }; + } + { + name = "log_update___log_update_2.3.0.tgz"; + path = fetchurl { + name = "log_update___log_update_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/log-update/-/log-update-2.3.0.tgz"; + sha1 = "88328fd7d1ce7938b29283746f0b1bc126b24708"; + }; + } + { + name = "logform___logform_2.1.2.tgz"; + path = fetchurl { + name = "logform___logform_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/logform/-/logform-2.1.2.tgz"; + sha1 = "957155ebeb67a13164069825ce67ddb5bb2dd360"; + }; + } + { + name = "long___long_4.0.0.tgz"; + path = fetchurl { + name = "long___long_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/long/-/long-4.0.0.tgz"; + sha1 = "9a7b71cfb7d361a194ea555241c92f7468d5bf28"; + }; + } + { + name = "lru_cache___lru_cache_4.1.5.tgz"; + path = fetchurl { + name = "lru_cache___lru_cache_4.1.5.tgz"; + url = "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz"; + sha1 = "8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd"; + }; + } + { + name = "map_stream___map_stream_0.1.0.tgz"; + path = fetchurl { + name = "map_stream___map_stream_0.1.0.tgz"; + url = "https://registry.yarnpkg.com/map-stream/-/map-stream-0.1.0.tgz"; + sha1 = "e56aa94c4c8055a16404a0674b78f215f7c8e194"; + }; + } + { + name = "media_typer___media_typer_0.3.0.tgz"; + path = fetchurl { + name = "media_typer___media_typer_0.3.0.tgz"; + url = "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz"; + sha1 = "8710d7af0aa626f8fffa1ce00168545263255748"; + }; + } + { + name = "merge_descriptors___merge_descriptors_1.0.1.tgz"; + path = fetchurl { + name = "merge_descriptors___merge_descriptors_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz"; + sha1 = "b00aaa556dd8b44568150ec9d1b953f3f90cbb61"; + }; + } + { + name = "merge_stream___merge_stream_2.0.0.tgz"; + path = fetchurl { + name = "merge_stream___merge_stream_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz"; + sha1 = "52823629a14dd00c9770fb6ad47dc6310f2c1f60"; + }; + } + { + name = "merge2___merge2_1.3.0.tgz"; + path = fetchurl { + name = "merge2___merge2_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/merge2/-/merge2-1.3.0.tgz"; + sha1 = "5b366ee83b2f1582c48f87e47cf1a9352103ca81"; + }; + } + { + name = "methods___methods_1.1.2.tgz"; + path = fetchurl { + name = "methods___methods_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz"; + sha1 = "5529a4d67654134edcc5266656835b0f851afcee"; + }; + } + { + name = "micromatch___micromatch_4.0.2.tgz"; + path = fetchurl { + name = "micromatch___micromatch_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.2.tgz"; + sha1 = "4fcb0999bf9fbc2fcbdd212f6d629b9a56c39259"; + }; + } + { + name = "mime_db___mime_db_1.43.0.tgz"; + path = fetchurl { + name = "mime_db___mime_db_1.43.0.tgz"; + url = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.43.0.tgz"; + sha1 = "0a12e0502650e473d735535050e7c8f4eb4fae58"; + }; + } + { + name = "mime_types___mime_types_2.1.26.tgz"; + path = fetchurl { + name = "mime_types___mime_types_2.1.26.tgz"; + url = "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.26.tgz"; + sha1 = "9c921fc09b7e149a65dfdc0da4d20997200b0a06"; + }; + } + { + name = "mime___mime_1.6.0.tgz"; + path = fetchurl { + name = "mime___mime_1.6.0.tgz"; + url = "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz"; + sha1 = "32cd9e5c64553bd58d19a568af452acff04981b1"; + }; + } + { + name = "mime___mime_2.4.4.tgz"; + path = fetchurl { + name = "mime___mime_2.4.4.tgz"; + url = "https://registry.yarnpkg.com/mime/-/mime-2.4.4.tgz"; + sha1 = "bd7b91135fc6b01cde3e9bae33d659b63d8857e5"; + }; + } + { + name = "mimic_fn___mimic_fn_1.2.0.tgz"; + path = fetchurl { + name = "mimic_fn___mimic_fn_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz"; + sha1 = "820c86a39334640e99516928bd03fca88057d022"; + }; + } + { + name = "mimic_fn___mimic_fn_2.1.0.tgz"; + path = fetchurl { + name = "mimic_fn___mimic_fn_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz"; + sha1 = "7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"; + }; + } + { + name = "minimatch___minimatch_3.0.4.tgz"; + path = fetchurl { + name = "minimatch___minimatch_3.0.4.tgz"; + url = "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz"; + sha1 = "5166e286457f03306064be5497e8dbb0c3d32083"; + }; + } + { + name = "minimist___minimist_0.0.8.tgz"; + path = fetchurl { + name = "minimist___minimist_0.0.8.tgz"; + url = "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz"; + sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d"; + }; + } + { + name = "minimist___minimist_1.2.5.tgz"; + path = fetchurl { + name = "minimist___minimist_1.2.5.tgz"; + url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz"; + sha1 = "67d66014b66a6a8aaa0c083c5fd58df4e4e97602"; + }; + } + { + name = "mkdirp___mkdirp_0.5.1.tgz"; + path = fetchurl { + name = "mkdirp___mkdirp_0.5.1.tgz"; + url = "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz"; + sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903"; + }; + } + { + name = "mkdirp___mkdirp_0.5.5.tgz"; + path = fetchurl { + name = "mkdirp___mkdirp_0.5.5.tgz"; + url = "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz"; + sha1 = "d91cefd62d1436ca0f41620e251288d420099def"; + }; + } + { + name = "morgan___morgan_1.9.1.tgz"; + path = fetchurl { + name = "morgan___morgan_1.9.1.tgz"; + url = "https://registry.yarnpkg.com/morgan/-/morgan-1.9.1.tgz"; + sha1 = "0a8d16734a1d9afbc824b99df87e738e58e2da59"; + }; + } + { + name = "ms___ms_2.0.0.tgz"; + path = fetchurl { + name = "ms___ms_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz"; + sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8"; + }; + } + { + name = "ms___ms_2.1.1.tgz"; + path = fetchurl { + name = "ms___ms_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz"; + sha1 = "30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"; + }; + } + { + name = "ms___ms_2.1.2.tgz"; + path = fetchurl { + name = "ms___ms_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz"; + sha1 = "d09d1f357b443f493382a8eb3ccd183872ae6009"; + }; + } + { + name = "multistream___multistream_2.1.1.tgz"; + path = fetchurl { + name = "multistream___multistream_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/multistream/-/multistream-2.1.1.tgz"; + sha1 = "629d3a29bd76623489980d04519a2c365948148c"; + }; + } + { + name = "mz___mz_2.7.0.tgz"; + path = fetchurl { + name = "mz___mz_2.7.0.tgz"; + url = "https://registry.yarnpkg.com/mz/-/mz-2.7.0.tgz"; + sha1 = "95008057a56cafadc2bc63dde7f9ff6955948e32"; + }; + } + { + name = "negotiator___negotiator_0.6.2.tgz"; + path = fetchurl { + name = "negotiator___negotiator_0.6.2.tgz"; + url = "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz"; + sha1 = "feacf7ccf525a77ae9634436a64883ffeca346fb"; + }; + } + { + name = "nice_try___nice_try_1.0.5.tgz"; + path = fetchurl { + name = "nice_try___nice_try_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz"; + sha1 = "a3378a7696ce7d223e88fc9b764bd7ef1089e366"; + }; + } + { + name = "node_cleanup___node_cleanup_2.1.2.tgz"; + path = fetchurl { + name = "node_cleanup___node_cleanup_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/node-cleanup/-/node-cleanup-2.1.2.tgz"; + sha1 = "7ac19abd297e09a7f72a71545d951b517e4dde2c"; + }; + } + { + name = "normalize_package_data___normalize_package_data_2.5.0.tgz"; + path = fetchurl { + name = "normalize_package_data___normalize_package_data_2.5.0.tgz"; + url = "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz"; + sha1 = "e66db1838b200c1dfc233225d12cb36520e234a8"; + }; + } + { + name = "normalize_path___normalize_path_3.0.0.tgz"; + path = fetchurl { + name = "normalize_path___normalize_path_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz"; + sha1 = "0dcd69ff23a1c9b11fd0978316644a0388216a65"; + }; + } + { + name = "npm_run_path___npm_run_path_2.0.2.tgz"; + path = fetchurl { + name = "npm_run_path___npm_run_path_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz"; + sha1 = "35a9232dfa35d7067b4cb2ddf2357b1871536c5f"; + }; + } + { + name = "npm_run_path___npm_run_path_3.1.0.tgz"; + path = fetchurl { + name = "npm_run_path___npm_run_path_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-3.1.0.tgz"; + sha1 = "7f91be317f6a466efed3c9f2980ad8a4ee8b0fa5"; + }; + } + { + name = "number_is_nan___number_is_nan_1.0.1.tgz"; + path = fetchurl { + name = "number_is_nan___number_is_nan_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz"; + sha1 = "097b602b53422a522c1afb8790318336941a011d"; + }; + } + { + name = "oauth_sign___oauth_sign_0.9.0.tgz"; + path = fetchurl { + name = "oauth_sign___oauth_sign_0.9.0.tgz"; + url = "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz"; + sha1 = "47a7b016baa68b5fa0ecf3dee08a85c679ac6455"; + }; + } + { + name = "object_assign___object_assign_4.1.1.tgz"; + path = fetchurl { + name = "object_assign___object_assign_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz"; + sha1 = "2109adc7965887cfc05cbbd442cac8bfbb360863"; + }; + } + { + name = "on_finished___on_finished_2.3.0.tgz"; + path = fetchurl { + name = "on_finished___on_finished_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz"; + sha1 = "20f1336481b083cd75337992a16971aa2d906947"; + }; + } + { + name = "on_headers___on_headers_1.0.2.tgz"; + path = fetchurl { + name = "on_headers___on_headers_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.2.tgz"; + sha1 = "772b0ae6aaa525c399e489adfad90c403eb3c28f"; + }; + } + { + name = "once___once_1.4.0.tgz"; + path = fetchurl { + name = "once___once_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz"; + sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1"; + }; + } + { + name = "one_time___one_time_0.0.4.tgz"; + path = fetchurl { + name = "one_time___one_time_0.0.4.tgz"; + url = "https://registry.yarnpkg.com/one-time/-/one-time-0.0.4.tgz"; + sha1 = "f8cdf77884826fe4dff93e3a9cc37b1e4480742e"; + }; + } + { + name = "onetime___onetime_2.0.1.tgz"; + path = fetchurl { + name = "onetime___onetime_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz"; + sha1 = "067428230fd67443b2794b22bba528b6867962d4"; + }; + } + { + name = "onetime___onetime_5.1.0.tgz"; + path = fetchurl { + name = "onetime___onetime_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/onetime/-/onetime-5.1.0.tgz"; + sha1 = "fff0f3c91617fe62bb50189636e99ac8a6df7be5"; + }; + } + { + name = "opencollective_postinstall___opencollective_postinstall_2.0.2.tgz"; + path = fetchurl { + name = "opencollective_postinstall___opencollective_postinstall_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/opencollective-postinstall/-/opencollective-postinstall-2.0.2.tgz"; + sha1 = "5657f1bede69b6e33a45939b061eb53d3c6c3a89"; + }; + } + { + name = "optionator___optionator_0.8.3.tgz"; + path = fetchurl { + name = "optionator___optionator_0.8.3.tgz"; + url = "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz"; + sha1 = "84fa1d036fe9d3c7e21d99884b601167ec8fb495"; + }; + } + { + name = "os_tmpdir___os_tmpdir_1.0.2.tgz"; + path = fetchurl { + name = "os_tmpdir___os_tmpdir_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz"; + sha1 = "bbe67406c79aa85c5cfec766fe5734555dfa1274"; + }; + } + { + name = "p_finally___p_finally_1.0.0.tgz"; + path = fetchurl { + name = "p_finally___p_finally_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz"; + sha1 = "3fbcfb15b899a44123b34b6dcc18b724336a2cae"; + }; + } + { + name = "p_finally___p_finally_2.0.1.tgz"; + path = fetchurl { + name = "p_finally___p_finally_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/p-finally/-/p-finally-2.0.1.tgz"; + sha1 = "bd6fcaa9c559a096b680806f4d657b3f0f240561"; + }; + } + { + name = "p_is_promise___p_is_promise_3.0.0.tgz"; + path = fetchurl { + name = "p_is_promise___p_is_promise_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-3.0.0.tgz"; + sha1 = "58e78c7dfe2e163cf2a04ff869e7c1dba64a5971"; + }; + } + { + name = "p_limit___p_limit_2.2.2.tgz"; + path = fetchurl { + name = "p_limit___p_limit_2.2.2.tgz"; + url = "https://registry.yarnpkg.com/p-limit/-/p-limit-2.2.2.tgz"; + sha1 = "61279b67721f5287aa1c13a9a7fbbc48c9291b1e"; + }; + } + { + name = "p_locate___p_locate_4.1.0.tgz"; + path = fetchurl { + name = "p_locate___p_locate_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz"; + sha1 = "a3428bb7088b3a60292f66919278b7c297ad4f07"; + }; + } + { + name = "p_map___p_map_2.1.0.tgz"; + path = fetchurl { + name = "p_map___p_map_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/p-map/-/p-map-2.1.0.tgz"; + sha1 = "310928feef9c9ecc65b68b17693018a665cea175"; + }; + } + { + name = "p_map___p_map_3.0.0.tgz"; + path = fetchurl { + name = "p_map___p_map_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/p-map/-/p-map-3.0.0.tgz"; + sha1 = "d704d9af8a2ba684e2600d9a215983d4141a979d"; + }; + } + { + name = "p_try___p_try_2.2.0.tgz"; + path = fetchurl { + name = "p_try___p_try_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz"; + sha1 = "cb2868540e313d61de58fafbe35ce9004d5540e6"; + }; + } + { + name = "parse_json___parse_json_4.0.0.tgz"; + path = fetchurl { + name = "parse_json___parse_json_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz"; + sha1 = "be35f5425be1f7f6c747184f98a788cb99477ee0"; + }; + } + { + name = "parse_json___parse_json_5.0.0.tgz"; + path = fetchurl { + name = "parse_json___parse_json_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/parse-json/-/parse-json-5.0.0.tgz"; + sha1 = "73e5114c986d143efa3712d4ea24db9a4266f60f"; + }; + } + { + name = "parseurl___parseurl_1.3.3.tgz"; + path = fetchurl { + name = "parseurl___parseurl_1.3.3.tgz"; + url = "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz"; + sha1 = "9da19e7bee8d12dff0513ed5b76957793bc2e8d4"; + }; + } + { + name = "path_exists___path_exists_4.0.0.tgz"; + path = fetchurl { + name = "path_exists___path_exists_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz"; + sha1 = "513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"; + }; + } + { + name = "path_is_absolute___path_is_absolute_1.0.1.tgz"; + path = fetchurl { + name = "path_is_absolute___path_is_absolute_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz"; + sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"; + }; + } + { + name = "path_key___path_key_2.0.1.tgz"; + path = fetchurl { + name = "path_key___path_key_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz"; + sha1 = "411cadb574c5a140d3a4b1910d40d80cc9f40b40"; + }; + } + { + name = "path_key___path_key_3.1.1.tgz"; + path = fetchurl { + name = "path_key___path_key_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz"; + sha1 = "581f6ade658cbba65a0d3380de7753295054f375"; + }; + } + { + name = "path_parse___path_parse_1.0.6.tgz"; + path = fetchurl { + name = "path_parse___path_parse_1.0.6.tgz"; + url = "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz"; + sha1 = "d62dbb5679405d72c4737ec58600e9ddcf06d24c"; + }; + } + { + name = "path_to_regexp___path_to_regexp_0.1.7.tgz"; + path = fetchurl { + name = "path_to_regexp___path_to_regexp_0.1.7.tgz"; + url = "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz"; + sha1 = "df604178005f522f15eb4490e7247a1bfaa67f8c"; + }; + } + { + name = "path_type___path_type_4.0.0.tgz"; + path = fetchurl { + name = "path_type___path_type_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz"; + sha1 = "84ed01c0a7ba380afe09d90a8c180dcd9d03043b"; + }; + } + { + name = "pause_stream___pause_stream_0.0.11.tgz"; + path = fetchurl { + name = "pause_stream___pause_stream_0.0.11.tgz"; + url = "https://registry.yarnpkg.com/pause-stream/-/pause-stream-0.0.11.tgz"; + sha1 = "fe5a34b0cbce12b5aa6a2b403ee2e73b602f1445"; + }; + } + { + name = "pend___pend_1.2.0.tgz"; + path = fetchurl { + name = "pend___pend_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz"; + sha1 = "7a57eb550a6783f9115331fcf4663d5c8e007a50"; + }; + } + { + name = "performance_now___performance_now_2.1.0.tgz"; + path = fetchurl { + name = "performance_now___performance_now_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz"; + sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"; + }; + } + { + name = "picomatch___picomatch_2.2.1.tgz"; + path = fetchurl { + name = "picomatch___picomatch_2.2.1.tgz"; + url = "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.1.tgz"; + sha1 = "21bac888b6ed8601f831ce7816e335bc779f0a4a"; + }; + } + { + name = "picomatch___picomatch_2.2.2.tgz"; + path = fetchurl { + name = "picomatch___picomatch_2.2.2.tgz"; + url = "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz"; + sha1 = "21f333e9b6b8eaff02468f5146ea406d345f4dad"; + }; + } + { + name = "pkg_dir___pkg_dir_4.2.0.tgz"; + path = fetchurl { + name = "pkg_dir___pkg_dir_4.2.0.tgz"; + url = "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz"; + sha1 = "f099133df7ede422e81d1d8448270eeb3e4261f3"; + }; + } + { + name = "pkg_fetch___pkg_fetch_2.6.8.tgz"; + path = fetchurl { + name = "pkg_fetch___pkg_fetch_2.6.8.tgz"; + url = "https://registry.yarnpkg.com/pkg-fetch/-/pkg-fetch-2.6.8.tgz"; + sha1 = "458ba6b9c936de1b0f3f9c830f389888561e630f"; + }; + } + { + name = "pkg___pkg_4.4.8.tgz"; + path = fetchurl { + name = "pkg___pkg_4.4.8.tgz"; + url = "https://registry.yarnpkg.com/pkg/-/pkg-4.4.8.tgz"; + sha1 = "145fb81f31eebfb90d2010dd2c4b663ca0db4009"; + }; + } + { + name = "please_upgrade_node___please_upgrade_node_3.2.0.tgz"; + path = fetchurl { + name = "please_upgrade_node___please_upgrade_node_3.2.0.tgz"; + url = "https://registry.yarnpkg.com/please-upgrade-node/-/please-upgrade-node-3.2.0.tgz"; + sha1 = "aeddd3f994c933e4ad98b99d9a556efa0e2fe942"; + }; + } + { + name = "prelude_ls___prelude_ls_1.1.2.tgz"; + path = fetchurl { + name = "prelude_ls___prelude_ls_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz"; + sha1 = "21932a549f5e52ffd9a827f570e04be62a97da54"; + }; + } + { + name = "prettier___prettier_1.19.1.tgz"; + path = fetchurl { + name = "prettier___prettier_1.19.1.tgz"; + url = "https://registry.yarnpkg.com/prettier/-/prettier-1.19.1.tgz"; + sha1 = "f7d7f5ff8a9cd872a7be4ca142095956a60797cb"; + }; + } + { + 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 = "progress___progress_2.0.3.tgz"; + path = fetchurl { + name = "progress___progress_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz"; + sha1 = "7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"; + }; + } + { + name = "prom_client___prom_client_11.5.3.tgz"; + path = fetchurl { + name = "prom_client___prom_client_11.5.3.tgz"; + url = "https://registry.yarnpkg.com/prom-client/-/prom-client-11.5.3.tgz"; + sha1 = "5fedfce1083bac6c2b223738e966d0e1643756f8"; + }; + } + { + name = "protobufjs___protobufjs_6.8.8.tgz"; + path = fetchurl { + name = "protobufjs___protobufjs_6.8.8.tgz"; + url = "https://registry.yarnpkg.com/protobufjs/-/protobufjs-6.8.8.tgz"; + sha1 = "c8b4f1282fd7a90e6f5b109ed11c84af82908e7c"; + }; + } + { + name = "proxy_addr___proxy_addr_2.0.5.tgz"; + path = fetchurl { + name = "proxy_addr___proxy_addr_2.0.5.tgz"; + url = "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.5.tgz"; + sha1 = "34cbd64a2d81f4b1fd21e76f9f06c8a45299ee34"; + }; + } + { + name = "proxy_from_env___proxy_from_env_1.0.0.tgz"; + path = fetchurl { + name = "proxy_from_env___proxy_from_env_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.0.0.tgz"; + sha1 = "33c50398f70ea7eb96d21f7b817630a55791c7ee"; + }; + } + { + name = "ps_tree___ps_tree_1.2.0.tgz"; + path = fetchurl { + name = "ps_tree___ps_tree_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/ps-tree/-/ps-tree-1.2.0.tgz"; + sha1 = "5e7425b89508736cdd4f2224d028f7bb3f722ebd"; + }; + } + { + name = "pseudomap___pseudomap_1.0.2.tgz"; + path = fetchurl { + name = "pseudomap___pseudomap_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz"; + sha1 = "f052a28da70e618917ef0a8ac34c1ae5a68286b3"; + }; + } + { + name = "psl___psl_1.7.0.tgz"; + path = fetchurl { + name = "psl___psl_1.7.0.tgz"; + url = "https://registry.yarnpkg.com/psl/-/psl-1.7.0.tgz"; + sha1 = "f1c4c47a8ef97167dea5d6bbf4816d736e884a3c"; + }; + } + { + name = "pump___pump_3.0.0.tgz"; + path = fetchurl { + name = "pump___pump_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz"; + sha1 = "b4a2116815bde2f4e1ea602354e8c75565107a64"; + }; + } + { + name = "punycode___punycode_2.1.1.tgz"; + path = fetchurl { + name = "punycode___punycode_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz"; + sha1 = "b58b010ac40c22c5657616c8d2c2c02c7bf479ec"; + }; + } + { + name = "puppeteer_cluster___puppeteer_cluster_0.18.0.tgz"; + path = fetchurl { + name = "puppeteer_cluster___puppeteer_cluster_0.18.0.tgz"; + url = "https://registry.yarnpkg.com/puppeteer-cluster/-/puppeteer-cluster-0.18.0.tgz"; + sha1 = "189ef1cea474590aa4d42c9a665dc319689e8fad"; + }; + } + { + name = "puppeteer___puppeteer_2.0.0.tgz"; + path = fetchurl { + name = "puppeteer___puppeteer_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/puppeteer/-/puppeteer-2.0.0.tgz"; + sha1 = "0612992e29ec418e0a62c8bebe61af1a64d7ec01"; + }; + } + { + name = "qs___qs_6.7.0.tgz"; + path = fetchurl { + name = "qs___qs_6.7.0.tgz"; + url = "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz"; + sha1 = "41dc1a015e3d581f1621776be31afb2876a9b1bc"; + }; + } + { + name = "qs___qs_6.5.2.tgz"; + path = fetchurl { + name = "qs___qs_6.5.2.tgz"; + url = "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz"; + sha1 = "cb3ae806e8740444584ef154ce8ee98d403f3e36"; + }; + } + { + name = "range_parser___range_parser_1.2.1.tgz"; + path = fetchurl { + name = "range_parser___range_parser_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz"; + sha1 = "3cf37023d199e1c24d1a55b84800c2f3e6468031"; + }; + } + { + name = "raw_body___raw_body_2.4.0.tgz"; + path = fetchurl { + name = "raw_body___raw_body_2.4.0.tgz"; + url = "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.0.tgz"; + sha1 = "a1ce6fb9c9bc356ca52e89256ab59059e13d0332"; + }; + } + { + name = "read_pkg___read_pkg_5.2.0.tgz"; + path = fetchurl { + name = "read_pkg___read_pkg_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/read-pkg/-/read-pkg-5.2.0.tgz"; + sha1 = "7bf295438ca5a33e56cd30e053b34ee7250c93cc"; + }; + } + { + name = "readable_stream___readable_stream_2.3.7.tgz"; + path = fetchurl { + name = "readable_stream___readable_stream_2.3.7.tgz"; + url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz"; + sha1 = "1eca1cf711aef814c04f62252a36a62f6cb23b57"; + }; + } + { + name = "readable_stream___readable_stream_3.5.0.tgz"; + path = fetchurl { + name = "readable_stream___readable_stream_3.5.0.tgz"; + url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.5.0.tgz"; + sha1 = "465d70e6d1087f6162d079cd0b5db7fbebfd1606"; + }; + } + { + name = "regenerator_runtime___regenerator_runtime_0.13.5.tgz"; + path = fetchurl { + name = "regenerator_runtime___regenerator_runtime_0.13.5.tgz"; + url = "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz"; + sha1 = "d878a1d094b4306d10b9096484b33ebd55e26697"; + }; + } + { + name = "request_progress___request_progress_3.0.0.tgz"; + path = fetchurl { + name = "request_progress___request_progress_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/request-progress/-/request-progress-3.0.0.tgz"; + sha1 = "4ca754081c7fec63f505e4faa825aa06cd669dbe"; + }; + } + { + name = "request___request_2.88.2.tgz"; + path = fetchurl { + name = "request___request_2.88.2.tgz"; + url = "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz"; + sha1 = "d73c918731cb5a87da047e207234146f664d12b3"; + }; + } + { + name = "resolve_from___resolve_from_3.0.0.tgz"; + path = fetchurl { + name = "resolve_from___resolve_from_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz"; + sha1 = "b22c7af7d9d6881bc8b6e653335eebcb0a188748"; + }; + } + { + name = "resolve___resolve_1.14.2.tgz"; + path = fetchurl { + name = "resolve___resolve_1.14.2.tgz"; + url = "https://registry.yarnpkg.com/resolve/-/resolve-1.14.2.tgz"; + sha1 = "dbf31d0fa98b1f29aa5169783b9c290cb865fea2"; + }; + } + { + name = "resolve___resolve_1.17.0.tgz"; + path = fetchurl { + name = "resolve___resolve_1.17.0.tgz"; + url = "https://registry.yarnpkg.com/resolve/-/resolve-1.17.0.tgz"; + sha1 = "b25941b54968231cc2d1bb76a79cb7f2c0bf8444"; + }; + } + { + name = "restore_cursor___restore_cursor_2.0.0.tgz"; + path = fetchurl { + name = "restore_cursor___restore_cursor_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz"; + sha1 = "9f7ee287f82fd326d4fd162923d62129eee0dfaf"; + }; + } + { + name = "reusify___reusify_1.0.4.tgz"; + path = fetchurl { + name = "reusify___reusify_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz"; + sha1 = "90da382b1e126efc02146e90845a88db12925d76"; + }; + } + { + name = "rimraf___rimraf_2.7.1.tgz"; + path = fetchurl { + name = "rimraf___rimraf_2.7.1.tgz"; + url = "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz"; + sha1 = "35797f13a7fdadc566142c29d4f07ccad483e3ec"; + }; + } + { + name = "rimraf___rimraf_3.0.0.tgz"; + path = fetchurl { + name = "rimraf___rimraf_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.0.tgz"; + sha1 = "614176d4b3010b75e5c390eb0ee96f6dc0cebb9b"; + }; + } + { + name = "run_node___run_node_1.0.0.tgz"; + path = fetchurl { + name = "run_node___run_node_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/run-node/-/run-node-1.0.0.tgz"; + sha1 = "46b50b946a2aa2d4947ae1d886e9856fd9cabe5e"; + }; + } + { + name = "run_parallel___run_parallel_1.1.9.tgz"; + path = fetchurl { + name = "run_parallel___run_parallel_1.1.9.tgz"; + url = "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.1.9.tgz"; + sha1 = "c9dd3a7cf9f4b2c4b6244e173a6ed866e61dd679"; + }; + } + { + name = "rxjs___rxjs_6.5.4.tgz"; + path = fetchurl { + name = "rxjs___rxjs_6.5.4.tgz"; + url = "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.4.tgz"; + sha1 = "e0777fe0d184cec7872df147f303572d414e211c"; + }; + } + { + name = "safe_buffer___safe_buffer_5.1.2.tgz"; + path = fetchurl { + name = "safe_buffer___safe_buffer_5.1.2.tgz"; + url = "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz"; + sha1 = "991ec69d296e0313747d59bdfd2b745c35f8828d"; + }; + } + { + name = "safe_buffer___safe_buffer_5.2.0.tgz"; + path = fetchurl { + name = "safe_buffer___safe_buffer_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.0.tgz"; + sha1 = "b74daec49b1148f88c64b68d49b1e815c1f2f519"; + }; + } + { + name = "safer_buffer___safer_buffer_2.1.2.tgz"; + path = fetchurl { + name = "safer_buffer___safer_buffer_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz"; + sha1 = "44fa161b0187b9549dd84bb91802f9bd8385cd6a"; + }; + } + { + name = "semver_compare___semver_compare_1.0.0.tgz"; + path = fetchurl { + name = "semver_compare___semver_compare_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz"; + sha1 = "0dee216a1c941ab37e9efb1788f6afc5ff5537fc"; + }; + } + { + name = "semver___semver_5.7.1.tgz"; + path = fetchurl { + name = "semver___semver_5.7.1.tgz"; + url = "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz"; + sha1 = "a954f931aeba508d307bbf069eff0c01c96116f7"; + }; + } + { + name = "semver___semver_6.3.0.tgz"; + path = fetchurl { + name = "semver___semver_6.3.0.tgz"; + url = "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz"; + sha1 = "ee0a64c8af5e8ceea67687b133761e1becbd1d3d"; + }; + } + { + name = "send___send_0.17.1.tgz"; + path = fetchurl { + name = "send___send_0.17.1.tgz"; + url = "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz"; + sha1 = "c1d8b059f7900f7466dd4938bdc44e11ddb376c8"; + }; + } + { + name = "serve_static___serve_static_1.14.1.tgz"; + path = fetchurl { + name = "serve_static___serve_static_1.14.1.tgz"; + url = "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.1.tgz"; + sha1 = "666e636dc4f010f7ef29970a88a674320898b2f9"; + }; + } + { + name = "setprototypeof___setprototypeof_1.1.1.tgz"; + path = fetchurl { + name = "setprototypeof___setprototypeof_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.1.tgz"; + sha1 = "7e95acb24aa92f5885e0abef5ba131330d4ae683"; + }; + } + { + name = "shebang_command___shebang_command_1.2.0.tgz"; + path = fetchurl { + name = "shebang_command___shebang_command_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz"; + sha1 = "44aac65b695b03398968c39f363fee5deafdf1ea"; + }; + } + { + name = "shebang_command___shebang_command_2.0.0.tgz"; + path = fetchurl { + name = "shebang_command___shebang_command_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz"; + sha1 = "ccd0af4f8835fbdc265b82461aaf0c36663f34ea"; + }; + } + { + name = "shebang_regex___shebang_regex_1.0.0.tgz"; + path = fetchurl { + name = "shebang_regex___shebang_regex_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz"; + sha1 = "da42f49740c0b42db2ca9728571cb190c98efea3"; + }; + } + { + name = "shebang_regex___shebang_regex_3.0.0.tgz"; + path = fetchurl { + name = "shebang_regex___shebang_regex_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz"; + sha1 = "ae16f1644d873ecad843b0307b143362d4c42172"; + }; + } + { + name = "signal_exit___signal_exit_3.0.2.tgz"; + path = fetchurl { + name = "signal_exit___signal_exit_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz"; + sha1 = "b5fdc08f1287ea1178628e415e25132b73646c6d"; + }; + } + { + name = "simple_swizzle___simple_swizzle_0.2.2.tgz"; + path = fetchurl { + name = "simple_swizzle___simple_swizzle_0.2.2.tgz"; + url = "https://registry.yarnpkg.com/simple-swizzle/-/simple-swizzle-0.2.2.tgz"; + sha1 = "a4da6b635ffcccca33f70d17cb92592de95e557a"; + }; + } + { + name = "slash___slash_3.0.0.tgz"; + path = fetchurl { + name = "slash___slash_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz"; + sha1 = "6539be870c165adbd5240220dbe361f1bc4d4634"; + }; + } + { + name = "slice_ansi___slice_ansi_0.0.4.tgz"; + path = fetchurl { + name = "slice_ansi___slice_ansi_0.0.4.tgz"; + url = "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-0.0.4.tgz"; + sha1 = "edbf8903f66f7ce2f8eafd6ceed65e264c831b35"; + }; + } + { + name = "source_map___source_map_0.6.1.tgz"; + path = fetchurl { + name = "source_map___source_map_0.6.1.tgz"; + url = "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz"; + sha1 = "74722af32e9614e9c287a8d0bbde48b5e2f1a263"; + }; + } + { + name = "spdx_correct___spdx_correct_3.1.0.tgz"; + path = fetchurl { + name = "spdx_correct___spdx_correct_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.0.tgz"; + sha1 = "fb83e504445268f154b074e218c87c003cd31df4"; + }; + } + { + name = "spdx_exceptions___spdx_exceptions_2.2.0.tgz"; + path = fetchurl { + name = "spdx_exceptions___spdx_exceptions_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz"; + sha1 = "2ea450aee74f2a89bfb94519c07fcd6f41322977"; + }; + } + { + name = "spdx_expression_parse___spdx_expression_parse_3.0.0.tgz"; + path = fetchurl { + name = "spdx_expression_parse___spdx_expression_parse_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz"; + sha1 = "99e119b7a5da00e05491c9fa338b7904823b41d0"; + }; + } + { + name = "spdx_license_ids___spdx_license_ids_3.0.5.tgz"; + path = fetchurl { + name = "spdx_license_ids___spdx_license_ids_3.0.5.tgz"; + url = "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz"; + sha1 = "3694b5804567a458d3c8045842a6358632f62654"; + }; + } + { + name = "split___split_0.3.3.tgz"; + path = fetchurl { + name = "split___split_0.3.3.tgz"; + url = "https://registry.yarnpkg.com/split/-/split-0.3.3.tgz"; + sha1 = "cd0eea5e63a211dfff7eb0f091c4133e2d0dd28f"; + }; + } + { + name = "sprintf_js___sprintf_js_1.0.3.tgz"; + path = fetchurl { + name = "sprintf_js___sprintf_js_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz"; + sha1 = "04e6926f662895354f3dd015203633b857297e2c"; + }; + } + { + name = "sshpk___sshpk_1.16.1.tgz"; + path = fetchurl { + name = "sshpk___sshpk_1.16.1.tgz"; + url = "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.1.tgz"; + sha1 = "fb661c0bef29b39db40769ee39fa70093d6f6877"; + }; + } + { + name = "stack_trace___stack_trace_0.0.10.tgz"; + path = fetchurl { + name = "stack_trace___stack_trace_0.0.10.tgz"; + url = "https://registry.yarnpkg.com/stack-trace/-/stack-trace-0.0.10.tgz"; + sha1 = "547c70b347e8d32b4e108ea1a2a159e5fdde19c0"; + }; + } + { + name = "statuses___statuses_1.5.0.tgz"; + path = fetchurl { + name = "statuses___statuses_1.5.0.tgz"; + url = "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz"; + sha1 = "161c7dac177659fd9811f43771fa99381478628c"; + }; + } + { + name = "stream_combiner___stream_combiner_0.0.4.tgz"; + path = fetchurl { + name = "stream_combiner___stream_combiner_0.0.4.tgz"; + url = "https://registry.yarnpkg.com/stream-combiner/-/stream-combiner-0.0.4.tgz"; + sha1 = "4d5e433c185261dde623ca3f44c586bcf5c4ad14"; + }; + } + { + name = "stream_meter___stream_meter_1.0.4.tgz"; + path = fetchurl { + name = "stream_meter___stream_meter_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/stream-meter/-/stream-meter-1.0.4.tgz"; + sha1 = "52af95aa5ea760a2491716704dbff90f73afdd1d"; + }; + } + { + name = "string_argv___string_argv_0.1.2.tgz"; + path = fetchurl { + name = "string_argv___string_argv_0.1.2.tgz"; + url = "https://registry.yarnpkg.com/string-argv/-/string-argv-0.1.2.tgz"; + sha1 = "c5b7bc03fb2b11983ba3a72333dd0559e77e4738"; + }; + } + { + name = "string_argv___string_argv_0.3.1.tgz"; + path = fetchurl { + name = "string_argv___string_argv_0.3.1.tgz"; + url = "https://registry.yarnpkg.com/string-argv/-/string-argv-0.3.1.tgz"; + sha1 = "95e2fbec0427ae19184935f816d74aaa4c5c19da"; + }; + } + { + name = "string_width___string_width_1.0.2.tgz"; + path = fetchurl { + name = "string_width___string_width_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz"; + sha1 = "118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"; + }; + } + { + name = "string_width___string_width_2.1.1.tgz"; + path = fetchurl { + name = "string_width___string_width_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz"; + sha1 = "ab93f27a8dc13d28cac815c462143a6d9012ae9e"; + }; + } + { + name = "string_decoder___string_decoder_1.3.0.tgz"; + path = fetchurl { + name = "string_decoder___string_decoder_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz"; + sha1 = "42f114594a46cf1a8e30b0a84f56c78c3edac21e"; + }; + } + { + name = "string_decoder___string_decoder_1.1.1.tgz"; + path = fetchurl { + name = "string_decoder___string_decoder_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz"; + sha1 = "9cf1611ba62685d7030ae9e4ba34149c3af03fc8"; + }; + } + { + name = "stringify_object___stringify_object_3.3.0.tgz"; + path = fetchurl { + name = "stringify_object___stringify_object_3.3.0.tgz"; + url = "https://registry.yarnpkg.com/stringify-object/-/stringify-object-3.3.0.tgz"; + sha1 = "703065aefca19300d3ce88af4f5b3956d7556629"; + }; + } + { + name = "strip_ansi___strip_ansi_3.0.1.tgz"; + path = fetchurl { + name = "strip_ansi___strip_ansi_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz"; + sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"; + }; + } + { + name = "strip_ansi___strip_ansi_4.0.0.tgz"; + path = fetchurl { + name = "strip_ansi___strip_ansi_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz"; + sha1 = "a8479022eb1ac368a871389b635262c505ee368f"; + }; + } + { + name = "strip_eof___strip_eof_1.0.0.tgz"; + path = fetchurl { + name = "strip_eof___strip_eof_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz"; + sha1 = "bb43ff5598a6eb05d89b59fcd129c983313606bf"; + }; + } + { + name = "strip_final_newline___strip_final_newline_2.0.0.tgz"; + path = fetchurl { + name = "strip_final_newline___strip_final_newline_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz"; + sha1 = "89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad"; + }; + } + { + name = "supports_color___supports_color_2.0.0.tgz"; + path = fetchurl { + name = "supports_color___supports_color_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz"; + sha1 = "535d045ce6b6363fa40117084629995e9df324c7"; + }; + } + { + name = "supports_color___supports_color_5.5.0.tgz"; + path = fetchurl { + name = "supports_color___supports_color_5.5.0.tgz"; + url = "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz"; + sha1 = "e2e69a44ac8772f78a1ec0b35b689df6530efc8f"; + }; + } + { + name = "supports_color___supports_color_7.1.0.tgz"; + path = fetchurl { + name = "supports_color___supports_color_7.1.0.tgz"; + url = "https://registry.yarnpkg.com/supports-color/-/supports-color-7.1.0.tgz"; + sha1 = "68e32591df73e25ad1c4b49108a2ec507962bfd1"; + }; + } + { + name = "symbol_observable___symbol_observable_1.2.0.tgz"; + path = fetchurl { + name = "symbol_observable___symbol_observable_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz"; + sha1 = "c22688aed4eab3cdc2dfeacbb561660560a00804"; + }; + } + { + name = "tdigest___tdigest_0.1.1.tgz"; + path = fetchurl { + name = "tdigest___tdigest_0.1.1.tgz"; + url = "https://registry.yarnpkg.com/tdigest/-/tdigest-0.1.1.tgz"; + sha1 = "2e3cb2c39ea449e55d1e6cd91117accca4588021"; + }; + } + { + name = "text_hex___text_hex_1.0.0.tgz"; + path = fetchurl { + name = "text_hex___text_hex_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/text-hex/-/text-hex-1.0.0.tgz"; + sha1 = "69dc9c1b17446ee79a92bf5b884bb4b9127506f5"; + }; + } + { + name = "thenify_all___thenify_all_1.6.0.tgz"; + path = fetchurl { + name = "thenify_all___thenify_all_1.6.0.tgz"; + url = "https://registry.yarnpkg.com/thenify-all/-/thenify-all-1.6.0.tgz"; + sha1 = "1a1918d402d8fc3f98fbf234db0bcc8cc10e9726"; + }; + } + { + name = "thenify___thenify_3.3.0.tgz"; + path = fetchurl { + name = "thenify___thenify_3.3.0.tgz"; + url = "https://registry.yarnpkg.com/thenify/-/thenify-3.3.0.tgz"; + sha1 = "e69e38a1babe969b0108207978b9f62b88604839"; + }; + } + { + name = "throttleit___throttleit_1.0.0.tgz"; + path = fetchurl { + name = "throttleit___throttleit_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/throttleit/-/throttleit-1.0.0.tgz"; + sha1 = "9e785836daf46743145a5984b6268d828528ac6c"; + }; + } + { + name = "through___through_2.3.8.tgz"; + path = fetchurl { + name = "through___through_2.3.8.tgz"; + url = "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz"; + sha1 = "0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"; + }; + } + { + name = "to_regex_range___to_regex_range_5.0.1.tgz"; + path = fetchurl { + name = "to_regex_range___to_regex_range_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz"; + sha1 = "1648c44aae7c8d988a326018ed72f5b4dd0392e4"; + }; + } + { + name = "toidentifier___toidentifier_1.0.0.tgz"; + path = fetchurl { + name = "toidentifier___toidentifier_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz"; + sha1 = "7e1be3470f1e77948bc43d94a3c8f4d7752ba553"; + }; + } + { + name = "tough_cookie___tough_cookie_2.5.0.tgz"; + path = fetchurl { + name = "tough_cookie___tough_cookie_2.5.0.tgz"; + url = "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz"; + sha1 = "cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"; + }; + } + { + name = "triple_beam___triple_beam_1.3.0.tgz"; + path = fetchurl { + name = "triple_beam___triple_beam_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/triple-beam/-/triple-beam-1.3.0.tgz"; + sha1 = "a595214c7298db8339eeeee083e4d10bd8cb8dd9"; + }; + } + { + name = "tsc_watch___tsc_watch_4.2.3.tgz"; + path = fetchurl { + name = "tsc_watch___tsc_watch_4.2.3.tgz"; + url = "https://registry.yarnpkg.com/tsc-watch/-/tsc-watch-4.2.3.tgz"; + sha1 = "630aaf1ed8bbfb6fbcbddb9bef96054bed217c4b"; + }; + } + { + name = "tslib___tslib_1.11.1.tgz"; + path = fetchurl { + name = "tslib___tslib_1.11.1.tgz"; + url = "https://registry.yarnpkg.com/tslib/-/tslib-1.11.1.tgz"; + sha1 = "eb15d128827fbee2841549e171f45ed338ac7e35"; + }; + } + { + name = "tslib___tslib_1.10.0.tgz"; + path = fetchurl { + name = "tslib___tslib_1.10.0.tgz"; + url = "https://registry.yarnpkg.com/tslib/-/tslib-1.10.0.tgz"; + sha1 = "c3c19f95973fb0a62973fb09d90d961ee43e5c8a"; + }; + } + { + name = "tslint___tslint_6.1.1.tgz"; + path = fetchurl { + name = "tslint___tslint_6.1.1.tgz"; + url = "https://registry.yarnpkg.com/tslint/-/tslint-6.1.1.tgz"; + sha1 = "ac03fbd17f85bfefaae348b353b25a88efe10cde"; + }; + } + { + name = "tsutils___tsutils_2.29.0.tgz"; + path = fetchurl { + name = "tsutils___tsutils_2.29.0.tgz"; + url = "https://registry.yarnpkg.com/tsutils/-/tsutils-2.29.0.tgz"; + sha1 = "32b488501467acbedd4b85498673a0812aca0b99"; + }; + } + { + name = "tunnel_agent___tunnel_agent_0.6.0.tgz"; + path = fetchurl { + name = "tunnel_agent___tunnel_agent_0.6.0.tgz"; + url = "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz"; + sha1 = "27a5dea06b36b04a0a9966774b290868f0fc40fd"; + }; + } + { + name = "tweetnacl___tweetnacl_0.14.5.tgz"; + path = fetchurl { + name = "tweetnacl___tweetnacl_0.14.5.tgz"; + url = "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz"; + sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64"; + }; + } + { + name = "type_check___type_check_0.3.2.tgz"; + path = fetchurl { + name = "type_check___type_check_0.3.2.tgz"; + url = "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz"; + sha1 = "5884cab512cf1d355e3fb784f30804b2b520db72"; + }; + } + { + name = "type_fest___type_fest_0.6.0.tgz"; + path = fetchurl { + name = "type_fest___type_fest_0.6.0.tgz"; + url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.6.0.tgz"; + sha1 = "8d2a2370d3df886eb5c90ada1c5bf6188acf838b"; + }; + } + { + name = "type_is___type_is_1.6.18.tgz"; + path = fetchurl { + name = "type_is___type_is_1.6.18.tgz"; + url = "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz"; + sha1 = "4e552cd05df09467dcbc4ef739de89f2cf37c131"; + }; + } + { + name = "typedarray___typedarray_0.0.6.tgz"; + path = fetchurl { + name = "typedarray___typedarray_0.0.6.tgz"; + url = "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz"; + sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777"; + }; + } + { + name = "typescript___typescript_3.8.3.tgz"; + path = fetchurl { + name = "typescript___typescript_3.8.3.tgz"; + url = "https://registry.yarnpkg.com/typescript/-/typescript-3.8.3.tgz"; + sha1 = "409eb8544ea0335711205869ec458ab109ee1061"; + }; + } + { + name = "uid2___uid2_0.0.3.tgz"; + path = fetchurl { + name = "uid2___uid2_0.0.3.tgz"; + url = "https://registry.yarnpkg.com/uid2/-/uid2-0.0.3.tgz"; + sha1 = "483126e11774df2f71b8b639dcd799c376162b82"; + }; + } + { + name = "unique_filename___unique_filename_1.1.1.tgz"; + path = fetchurl { + name = "unique_filename___unique_filename_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.1.tgz"; + sha1 = "1d69769369ada0583103a1e6ae87681b56573230"; + }; + } + { + name = "unique_slug___unique_slug_2.0.2.tgz"; + path = fetchurl { + name = "unique_slug___unique_slug_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/unique-slug/-/unique-slug-2.0.2.tgz"; + sha1 = "baabce91083fc64e945b0f3ad613e264f7cd4e6c"; + }; + } + { + name = "unique_temp_dir___unique_temp_dir_1.0.0.tgz"; + path = fetchurl { + name = "unique_temp_dir___unique_temp_dir_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/unique-temp-dir/-/unique-temp-dir-1.0.0.tgz"; + sha1 = "6dce95b2681ca003eebfb304a415f9cbabcc5385"; + }; + } + { + name = "universalify___universalify_0.1.2.tgz"; + path = fetchurl { + name = "universalify___universalify_0.1.2.tgz"; + url = "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz"; + sha1 = "b646f69be3942dabcecc9d6639c80dc105efaa66"; + }; + } + { + name = "unpipe___unpipe_1.0.0.tgz"; + path = fetchurl { + name = "unpipe___unpipe_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz"; + sha1 = "b2bf4ee8514aae6165b4817829d21b2ef49904ec"; + }; + } + { + name = "uri_js___uri_js_4.2.2.tgz"; + path = fetchurl { + name = "uri_js___uri_js_4.2.2.tgz"; + url = "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.2.tgz"; + sha1 = "94c540e1ff772956e2299507c010aea6c8838eb0"; + }; + } + { + name = "url_value_parser___url_value_parser_2.0.1.tgz"; + path = fetchurl { + name = "url_value_parser___url_value_parser_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/url-value-parser/-/url-value-parser-2.0.1.tgz"; + sha1 = "c8179a095ab9ec1f5aa17ca36af5af396b4e95ed"; + }; + } + { + name = "util_deprecate___util_deprecate_1.0.2.tgz"; + path = fetchurl { + name = "util_deprecate___util_deprecate_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz"; + sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf"; + }; + } + { + name = "utils_merge___utils_merge_1.0.1.tgz"; + path = fetchurl { + name = "utils_merge___utils_merge_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz"; + sha1 = "9f95710f50a267947b2ccc124741c1028427e713"; + }; + } + { + name = "uuid___uuid_3.4.0.tgz"; + path = fetchurl { + name = "uuid___uuid_3.4.0.tgz"; + url = "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz"; + sha1 = "b23e4358afa8a202fe7a100af1f5f883f02007ee"; + }; + } + { + name = "validate_npm_package_license___validate_npm_package_license_3.0.4.tgz"; + path = fetchurl { + name = "validate_npm_package_license___validate_npm_package_license_3.0.4.tgz"; + url = "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz"; + sha1 = "fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"; + }; + } + { + name = "vary___vary_1.1.2.tgz"; + path = fetchurl { + name = "vary___vary_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz"; + sha1 = "2299f02c6ded30d4a5961b0b9f74524a18f634fc"; + }; + } + { + name = "verror___verror_1.10.0.tgz"; + path = fetchurl { + name = "verror___verror_1.10.0.tgz"; + url = "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz"; + sha1 = "3a105ca17053af55d6e270c1f8288682e18da400"; + }; + } + { + name = "which___which_1.3.1.tgz"; + path = fetchurl { + name = "which___which_1.3.1.tgz"; + url = "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz"; + sha1 = "a45043d54f5805316da8d62f9f50918d3da70b0a"; + }; + } + { + name = "which___which_2.0.2.tgz"; + path = fetchurl { + name = "which___which_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz"; + sha1 = "7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"; + }; + } + { + name = "winston_transport___winston_transport_4.3.0.tgz"; + path = fetchurl { + name = "winston_transport___winston_transport_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/winston-transport/-/winston-transport-4.3.0.tgz"; + sha1 = "df68c0c202482c448d9b47313c07304c2d7c2c66"; + }; + } + { + name = "winston___winston_3.2.1.tgz"; + path = fetchurl { + name = "winston___winston_3.2.1.tgz"; + url = "https://registry.yarnpkg.com/winston/-/winston-3.2.1.tgz"; + sha1 = "63061377976c73584028be2490a1846055f77f07"; + }; + } + { + name = "word_wrap___word_wrap_1.2.3.tgz"; + path = fetchurl { + name = "word_wrap___word_wrap_1.2.3.tgz"; + url = "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz"; + sha1 = "610636f6b1f703891bd34771ccb17fb93b47079c"; + }; + } + { + name = "wrap_ansi___wrap_ansi_3.0.1.tgz"; + path = fetchurl { + name = "wrap_ansi___wrap_ansi_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-3.0.1.tgz"; + sha1 = "288a04d87eda5c286e060dfe8f135ce8d007f8ba"; + }; + } + { + name = "wrappy___wrappy_1.0.2.tgz"; + path = fetchurl { + name = "wrappy___wrappy_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz"; + sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"; + }; + } + { + name = "ws___ws_6.2.1.tgz"; + path = fetchurl { + name = "ws___ws_6.2.1.tgz"; + url = "https://registry.yarnpkg.com/ws/-/ws-6.2.1.tgz"; + sha1 = "442fdf0a47ed64f59b6a5d8ff130f4748ed524fb"; + }; + } + { + name = "yallist___yallist_2.1.2.tgz"; + path = fetchurl { + name = "yallist___yallist_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz"; + sha1 = "1c11f9218f076089a47dd512f93c6699a6a81d52"; + }; + } + { + name = "yauzl___yauzl_2.4.1.tgz"; + path = fetchurl { + name = "yauzl___yauzl_2.4.1.tgz"; + url = "https://registry.yarnpkg.com/yauzl/-/yauzl-2.4.1.tgz"; + sha1 = "9528f442dab1b2284e58b4379bb194e22e0c4005"; + }; + } + ]; +} diff --git a/pkgs/servers/monitoring/grafana/plugins/default.nix b/pkgs/servers/monitoring/grafana/plugins/default.nix new file mode 100644 index 000000000000..95be470831c1 --- /dev/null +++ b/pkgs/servers/monitoring/grafana/plugins/default.nix @@ -0,0 +1,7 @@ +{ newScope, pkgs }: + +let + callPackage = newScope (pkgs // plugins); + plugins = import ./plugins.nix { inherit callPackage; }; +in + plugins diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-clock-panel/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-clock-panel/default.nix new file mode 100644 index 000000000000..c0648c97e68b --- /dev/null +++ b/pkgs/servers/monitoring/grafana/plugins/grafana-clock-panel/default.nix @@ -0,0 +1,13 @@ +{ grafanaPlugin, lib }: + +grafanaPlugin rec { + pname = "grafana-clock-panel"; + version = "1.1.1"; + zipHash = "sha256-SvZyg7r+XG6i7jqYwxpPn6ZzJc7qmtfPtyphYppURDk="; + meta = with lib; { + description = "Clock panel for Grafana"; + license = licenses.asl20; + maintainers = with maintainers; [ lukegb ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-piechart-panel/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-piechart-panel/default.nix new file mode 100644 index 000000000000..2c44d3a4a062 --- /dev/null +++ b/pkgs/servers/monitoring/grafana/plugins/grafana-piechart-panel/default.nix @@ -0,0 +1,13 @@ +{ grafanaPlugin, lib }: + +grafanaPlugin rec { + pname = "grafana-piechart-panel"; + version = "1.6.1"; + zipHash = "sha256-64K/efoBKuBFp8Jw79hTdMyTurTZsL0qfgPDcUWz2jg="; + meta = with lib; { + description = "Pie chart panel for Grafana"; + license = licenses.asl20; + maintainers = with maintainers; [ lukegb ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-plugin.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-plugin.nix new file mode 100644 index 000000000000..3b3cee88fd7a --- /dev/null +++ b/pkgs/servers/monitoring/grafana/plugins/grafana-plugin.nix @@ -0,0 +1,28 @@ +{ stdenvNoCC, fetchurl, unzip }: + +{ pname, version, zipHash, meta ? {}, passthru ? {}, ... }@args: +stdenvNoCC.mkDerivation ({ + inherit pname version; + + src = fetchurl { + name = "${pname}-${version}.zip"; + url = "https://grafana.com/api/plugins/${pname}/versions/${version}/download"; + hash = zipHash; + }; + + nativeBuildInputs = [ unzip ]; + + installPhase = '' + cp -R "." "$out" + chmod -R a-w "$out" + chmod u+w "$out" + ''; + + passthru = { + updateScript = [ ./update-grafana-plugin.sh pname ]; + } // passthru; + + meta = { + homepage = "https://grafana.com/grafana/plugins/${pname}"; + } // meta; +} // (builtins.removeAttrs args [ "pname" "version" "sha256" "meta" ])) diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-polystat-panel/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-polystat-panel/default.nix new file mode 100644 index 000000000000..efbaeda93762 --- /dev/null +++ b/pkgs/servers/monitoring/grafana/plugins/grafana-polystat-panel/default.nix @@ -0,0 +1,13 @@ +{ grafanaPlugin, lib }: + +grafanaPlugin rec { + pname = "grafana-polystat-panel"; + version = "1.2.2"; + zipHash = "sha256-HWQdhstnrDuXPithZ8kOG2ZtSeAT215MJ1ftMCt6/tc="; + meta = with lib; { + description = "Hexagonal multi-stat panel for Grafana"; + license = licenses.asl20; + maintainers = with maintainers; [ lukegb ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-worldmap-panel/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-worldmap-panel/default.nix new file mode 100644 index 000000000000..2f1671750fa5 --- /dev/null +++ b/pkgs/servers/monitoring/grafana/plugins/grafana-worldmap-panel/default.nix @@ -0,0 +1,13 @@ +{ grafanaPlugin, lib }: + +grafanaPlugin rec { + pname = "grafana-worldmap-panel"; + version = "0.3.2"; + zipHash = "sha256-MGAJzS9X91x6wt305jH1chLoW3zd7pIYDwRnPg9qrgE="; + meta = with lib; { + description = "World Map panel for Grafana"; + license = licenses.asl20; + maintainers = with maintainers; [ lukegb ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/servers/monitoring/grafana/plugins/plugins.nix b/pkgs/servers/monitoring/grafana/plugins/plugins.nix new file mode 100644 index 000000000000..b2991ba4e74e --- /dev/null +++ b/pkgs/servers/monitoring/grafana/plugins/plugins.nix @@ -0,0 +1,11 @@ +{ callPackage }: +{ + inherit callPackage; + + grafanaPlugin = callPackage ./grafana-plugin.nix { }; + + grafana-clock-panel = callPackage ./grafana-clock-panel { }; + grafana-piechart-panel = callPackage ./grafana-piechart-panel { }; + grafana-polystat-panel = callPackage ./grafana-polystat-panel { }; + grafana-worldmap-panel = callPackage ./grafana-worldmap-panel { }; +} diff --git a/pkgs/servers/monitoring/grafana/plugins/update-grafana-plugin.sh b/pkgs/servers/monitoring/grafana/plugins/update-grafana-plugin.sh new file mode 100755 index 000000000000..dd8f050c633c --- /dev/null +++ b/pkgs/servers/monitoring/grafana/plugins/update-grafana-plugin.sh @@ -0,0 +1,8 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl jq common-updater-scripts + +set -eu -o pipefail + +readonly plugin_name="$1" +readonly latest_version="$(curl "https://grafana.com/api/plugins/${plugin_name}" | jq -r .version)" +update-source-version "grafanaPlugins.${plugin_name}" "$latest_version" diff --git a/pkgs/servers/monitoring/lcdproc/default.nix b/pkgs/servers/monitoring/lcdproc/default.nix index e469ee6b4082..41247362799c 100644 --- a/pkgs/servers/monitoring/lcdproc/default.nix +++ b/pkgs/servers/monitoring/lcdproc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, makeWrapper, pkgconfig +{ lib, stdenv, fetchFromGitHub, autoreconfHook, makeWrapper, pkgconfig , doxygen, freetype, libX11, libftdi, libusb-compat-0_1, libusb1, ncurses, perl }: stdenv.mkDerivation rec { @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { --replace server/drivers/ $out/lib/lcdproc/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Client/server suite for controlling a wide variety of LCD devices"; homepage = "http://lcdproc.org/"; license = licenses.gpl2; diff --git a/pkgs/servers/monitoring/loki/default.nix b/pkgs/servers/monitoring/loki/default.nix index a3e85e2b822e..5e630623dabb 100644 --- a/pkgs/servers/monitoring/loki/default.nix +++ b/pkgs/servers/monitoring/loki/default.nix @@ -28,7 +28,7 @@ buildGoModule rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Like Prometheus, but for logs"; license = licenses.asl20; homepage = "https://grafana.com/oss/loki/"; diff --git a/pkgs/servers/monitoring/longview/default.nix b/pkgs/servers/monitoring/longview/default.nix index 10f0f248a805..96048005cb14 100644 --- a/pkgs/servers/monitoring/longview/default.nix +++ b/pkgs/servers/monitoring/longview/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, perl, perlPackages, makeWrapper, glibc }: +{lib, stdenv, fetchFromGitHub, perl, perlPackages, makeWrapper, glibc }: stdenv.mkDerivation rec { version = "1.1.5"; @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { --suffix PERL5LIB : $out --suffix INC : $out ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.linode.com/longview"; description = "Collects all of your system-level metrics and sends them to Linode"; license = licenses.gpl2Plus; diff --git a/pkgs/servers/monitoring/munin/default.nix b/pkgs/servers/monitoring/munin/default.nix index cfc66a9a76aa..5168f2e7e9d6 100644 --- a/pkgs/servers/monitoring/munin/default.nix +++ b/pkgs/servers/monitoring/munin/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, makeWrapper, which, coreutils, rrdtool, perlPackages +{ lib, stdenv, fetchFromGitHub, makeWrapper, which, coreutils, rrdtool, perlPackages , python, ruby, jre, nettools, bc }: @@ -126,7 +126,7 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Networked resource monitoring tool"; longDescription = '' Munin is a monitoring tool that surveys all your computers and remembers diff --git a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix index 35d02a5f9e2c..90ff605b733c 100644 --- a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix +++ b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, file, openssl, makeWrapper, which, curl, fetchpatch }: +{ lib, stdenv, fetchFromGitHub, file, openssl, makeWrapper, which, curl, fetchpatch }: stdenv.mkDerivation rec { pname = "check_ssl_cert"; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { --prefix PATH : "${stdenv.lib.makeBinPath [ openssl file which curl ]}" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A Nagios plugin to check the CA and validity of an X.509 certificate"; license = licenses.gpl3; platforms = platforms.all; diff --git a/pkgs/servers/monitoring/net-snmp/default.nix b/pkgs/servers/monitoring/net-snmp/default.nix index 160907d58fa6..d2f31e4c3727 100644 --- a/pkgs/servers/monitoring/net-snmp/default.nix +++ b/pkgs/servers/monitoring/net-snmp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, autoreconfHook, removeReferencesTo +{ lib, stdenv, fetchurl, fetchpatch, autoreconfHook, removeReferencesTo , file, openssl, perl, perlPackages, unzip, nettools, ncurses }: stdenv.mkDerivation rec { @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { find $lib/lib -type f -exec remove-references-to -t $dev '{}' + ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Clients and server for the SNMP network monitoring protocol"; homepage = "http://net-snmp.sourceforge.net/"; license = licenses.bsd3; diff --git a/pkgs/servers/monitoring/newrelic-sysmond/default.nix b/pkgs/servers/monitoring/newrelic-sysmond/default.nix index 9413b5e73b6c..3cdcbde161b7 100644 --- a/pkgs/servers/monitoring/newrelic-sysmond/default.nix +++ b/pkgs/servers/monitoring/newrelic-sysmond/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "newrelic-sysmond"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { $out/bin/nrsysmond ''; - meta = with stdenv.lib; { + meta = with lib; { description = "System-wide monitoring for newrelic"; homepage = "https://newrelic.com/"; license = licenses.unfree; diff --git a/pkgs/servers/monitoring/plugins/esxi.nix b/pkgs/servers/monitoring/plugins/esxi.nix index 2dc355ecac3d..6b609d8160da 100644 --- a/pkgs/servers/monitoring/plugins/esxi.nix +++ b/pkgs/servers/monitoring/plugins/esxi.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python3Packages }: +{ lib, stdenv, fetchFromGitHub, python3Packages }: let bName = "check_esxi_hardware"; @@ -28,7 +28,7 @@ in python3Packages.buildPythonApplication rec { propagatedBuildInputs = with python3Packages; [ pywbem requests setuptools ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.claudiokuenzler.com/nagios-plugins/"; license = licenses.gpl2; maintainers = with maintainers; [ peterhoeg ]; diff --git a/pkgs/servers/monitoring/plugins/labs_consol_de.nix b/pkgs/servers/monitoring/plugins/labs_consol_de.nix index e7a6fa6e4001..ee66cde0c506 100644 --- a/pkgs/servers/monitoring/plugins/labs_consol_de.nix +++ b/pkgs/servers/monitoring/plugins/labs_consol_de.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchurl, autoreconfHook, makeWrapper +{ lib, stdenv, fetchFromGitHub, fetchurl, autoreconfHook, makeWrapper , perlPackages, coreutils, gnused, gnugrep }: let @@ -42,7 +42,7 @@ let done ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://labs.consol.de/"; license = licenses.gpl2; maintainers = with maintainers; [ peterhoeg ]; diff --git a/pkgs/servers/monitoring/plugins/uptime.nix b/pkgs/servers/monitoring/plugins/uptime.nix index d4861309fe58..04a3ba18aa79 100644 --- a/pkgs/servers/monitoring/plugins/uptime.nix +++ b/pkgs/servers/monitoring/plugins/uptime.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation { pname = "check-uptime"; @@ -17,7 +17,7 @@ stdenv.mkDerivation { postInstall = "ln -sr $out/libexec $out/bin"; - meta = with stdenv.lib; { + meta = with lib; { description = "Uptime check plugin for Sensu/Nagios/others"; homepage = "https://github.com/madrisan/nagios-plugins-uptime"; license = licenses.gpl3; diff --git a/pkgs/servers/monitoring/plugins/wmic-bin.nix b/pkgs/servers/monitoring/plugins/wmic-bin.nix index c8f4eb77c468..e091727e48e2 100644 --- a/pkgs/servers/monitoring/plugins/wmic-bin.nix +++ b/pkgs/servers/monitoring/plugins/wmic-bin.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { runHook postInstallCheck ''; - meta = with stdenv.lib; { + meta = with lib; { description = "WMI client for Linux (binary)"; homepage = "https://www.openvas.org"; license = licenses.mit; diff --git a/pkgs/servers/monitoring/plugins/wmiplus/default.nix b/pkgs/servers/monitoring/plugins/wmiplus/default.nix index dacd4e2c5b7b..00474e12b9ac 100644 --- a/pkgs/servers/monitoring/plugins/wmiplus/default.nix +++ b/pkgs/servers/monitoring/plugins/wmiplus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, makeWrapper, perlPackages, txt2man +{ lib, stdenv, fetchFromGitHub, makeWrapper, perlPackages, txt2man , monitoring-plugins , wmic-bin ? null }: @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { gzip $out/share/man/man1/check_wmi_plus.1 ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A sensu/nagios plugin using WMI to query Windows hosts"; homepage = "http://edcint.co.nz/checkwmiplus"; license = licenses.gpl2; diff --git a/pkgs/servers/monitoring/prometheus/alertmanager.nix b/pkgs/servers/monitoring/prometheus/alertmanager.nix index f5c7c062c878..a11fcf18c253 100644 --- a/pkgs/servers/monitoring/prometheus/alertmanager.nix +++ b/pkgs/servers/monitoring/prometheus/alertmanager.nix @@ -1,4 +1,4 @@ -{ stdenv, go, buildGoPackage, fetchFromGitHub, installShellFiles }: +{ lib, stdenv, go, buildGoPackage, fetchFromGitHub, installShellFiles }: buildGoPackage rec { pname = "alertmanager"; @@ -31,7 +31,7 @@ buildGoPackage rec { installShellCompletion amtool.bash ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Alert dispatcher for the Prometheus monitoring system"; homepage = "https://github.com/prometheus/alertmanager"; license = licenses.asl20; diff --git a/pkgs/servers/monitoring/prometheus/apcupsd-exporter.nix b/pkgs/servers/monitoring/prometheus/apcupsd-exporter.nix index 33f93cd130dd..648bb59b0d2d 100644 --- a/pkgs/servers/monitoring/prometheus/apcupsd-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/apcupsd-exporter.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, nixosTests }: +{ lib, stdenv, buildGoModule, fetchFromGitHub, nixosTests }: buildGoModule rec { pname = "apcupsd-exporter"; @@ -17,7 +17,7 @@ buildGoModule rec { passthru.tests = { inherit (nixosTests.prometheus-exporters) apcupsd; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Provides a Prometheus exporter for the apcupsd Network Information Server (NIS)"; homepage = "https://github.com/mdlayher/apcupsd_exporter"; license = licenses.mit; diff --git a/pkgs/servers/monitoring/prometheus/aws-s3-exporter.nix b/pkgs/servers/monitoring/prometheus/aws-s3-exporter.nix index 6f1a3f21f5b2..2548e196837a 100644 --- a/pkgs/servers/monitoring/prometheus/aws-s3-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/aws-s3-exporter.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "aws-s3-exporter"; @@ -15,7 +15,7 @@ buildGoPackage rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Exports Prometheus metrics about S3 buckets and objects"; homepage = "https://github.com/ribbybibby/s3_exporter"; license = licenses.asl20; diff --git a/pkgs/servers/monitoring/prometheus/bind-exporter.nix b/pkgs/servers/monitoring/prometheus/bind-exporter.nix index 3913cbd5f852..d6f0f864dec7 100644 --- a/pkgs/servers/monitoring/prometheus/bind-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/bind-exporter.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, nixosTests }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub, nixosTests }: buildGoPackage rec { pname = "bind_exporter"; @@ -16,7 +16,7 @@ buildGoPackage rec { passthru.tests = { inherit (nixosTests.prometheus-exporters) bind; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Prometheus exporter for bind9 server"; homepage = "https://github.com/digitalocean/bind_exporter"; license = licenses.asl20; diff --git a/pkgs/servers/monitoring/prometheus/bird-exporter.nix b/pkgs/servers/monitoring/prometheus/bird-exporter.nix new file mode 100644 index 000000000000..5670233b0547 --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/bird-exporter.nix @@ -0,0 +1,24 @@ +{ lib, stdenv, buildGoModule, fetchFromGitHub, nixosTests }: + +buildGoModule rec { + pname = "bird-exporter"; + version = "1.3.5-git"; + + src = fetchFromGitHub { + owner = "czerwonk"; + repo = "bird_exporter"; + rev = "019fc09804625658d452a8e043cc16559c3b5b84"; + sha256 = "1iym46368k8zzy4djx511m926dg8x5mg3xi91f65sknqv26zfggb"; + }; + + vendorSha256 = null; + + passthru.tests = { inherit (nixosTests.prometheus-exporters) bird; }; + + meta = with lib; { + description = "Prometheus exporter for the bird routing daemon"; + homepage = "https://github.com/czerwonk/bird_exporter"; + license = licenses.mit; + maintainers = with maintainers; [ lukegb ]; + }; +} diff --git a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix b/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix index e1fd31c3202f..3140056a2696 100644 --- a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, nixosTests }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub, nixosTests }: buildGoPackage rec { pname = "blackbox_exporter"; @@ -19,7 +19,7 @@ buildGoPackage rec { passthru.tests = { inherit (nixosTests.prometheus-exporters) blackbox; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Blackbox probing of endpoints over HTTP, HTTPS, DNS, TCP and ICMP"; homepage = "https://github.com/prometheus/blackbox_exporter"; license = licenses.asl20; diff --git a/pkgs/servers/monitoring/prometheus/collectd-exporter.nix b/pkgs/servers/monitoring/prometheus/collectd-exporter.nix index 12f9cd3d3501..f86c3a42773c 100644 --- a/pkgs/servers/monitoring/prometheus/collectd-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/collectd-exporter.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, nixosTests }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub, nixosTests }: buildGoPackage rec { pname = "collectd-exporter"; @@ -16,7 +16,7 @@ buildGoPackage rec { passthru.tests = { inherit (nixosTests.prometheus-exporters) collectd; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Relay server for exporting metrics from collectd to Prometheus"; homepage = "https://github.com/prometheus/collectd_exporter"; license = licenses.asl20; diff --git a/pkgs/servers/monitoring/prometheus/consul-exporter.nix b/pkgs/servers/monitoring/prometheus/consul-exporter.nix index 20281313d0e2..ab4b67402d39 100644 --- a/pkgs/servers/monitoring/prometheus/consul-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/consul-exporter.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "consul_exporter"; @@ -13,7 +13,7 @@ buildGoPackage rec { sha256 = "16ibafcbpiplsh1awcvblzzf2cbr4baf8wiwpdpibgmcwwf9m5ya"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Prometheus exporter for Consul metrics"; homepage = "https://github.com/prometheus/consul_exporter"; license = licenses.asl20; diff --git a/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix b/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix index 6f2fe462a469..e01417186960 100644 --- a/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, nixosTests }: +{ lib, stdenv, buildGoModule, fetchFromGitHub, nixosTests }: buildGoModule rec { pname = "dnsmasq_exporter"; @@ -17,7 +17,7 @@ buildGoModule rec { passthru.tests = { inherit (nixosTests.prometheus-exporters) dnsmasq; }; - meta = with stdenv.lib; { + meta = with lib; { inherit (src.meta) homepage; description = "A dnsmasq exporter for Prometheus"; license = licenses.asl20; diff --git a/pkgs/servers/monitoring/prometheus/dovecot-exporter.nix b/pkgs/servers/monitoring/prometheus/dovecot-exporter.nix index 2d5f58a920be..c0d96b08bb65 100644 --- a/pkgs/servers/monitoring/prometheus/dovecot-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/dovecot-exporter.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, nixosTests }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub, nixosTests }: buildGoPackage rec { pname = "dovecot_exporter"; @@ -17,7 +17,7 @@ buildGoPackage rec { passthru.tests = { inherit (nixosTests.prometheus-exporters) dovecot; }; - meta = with stdenv.lib; { + meta = with lib; { inherit (src.meta) homepage; description = "Prometheus metrics exporter for Dovecot"; license = licenses.asl20; diff --git a/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix b/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix index 2f062cbfcfe8..bc9058e36d97 100644 --- a/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, nixosTests }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub, nixosTests }: buildGoPackage rec { pname = "fritzbox-exporter"; @@ -18,7 +18,7 @@ buildGoPackage rec { passthru.tests = { inherit (nixosTests.prometheus-exporters) fritzbox; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Prometheus Exporter for FRITZ!Box (TR64 and UPnP)"; homepage = "https://github.com/ndecker/fritzbox_exporter"; license = licenses.asl20; diff --git a/pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix b/pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix index e6dcfb4a346b..718c8f2fcb13 100644 --- a/pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "gitlab-ci-pipelines-exporter"; @@ -17,7 +17,7 @@ buildGoPackage rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Prometheus / OpenMetrics exporter for GitLab CI pipelines insights"; homepage = "https://github.com/mvisonneau/gitlab-ci-pipelines-exporter"; license = licenses.asl20; diff --git a/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix b/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix index aaff022df89f..e12c76e09f04 100644 --- a/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "haproxy_exporter"; @@ -14,7 +14,7 @@ buildGoPackage rec { sha256 = "0gx8pq67w71ch3g3c77xaz39msrd9graizc6d3shwabdjx35yc6q"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "HAProxy Exporter for the Prometheus monitoring system"; homepage = "https://github.com/prometheus/haproxy_exporter"; license = licenses.asl20; diff --git a/pkgs/servers/monitoring/prometheus/jmx-httpserver.nix b/pkgs/servers/monitoring/prometheus/jmx-httpserver.nix index 8cb9dbb2382c..0c5aa7d8a438 100644 --- a/pkgs/servers/monitoring/prometheus/jmx-httpserver.nix +++ b/pkgs/servers/monitoring/prometheus/jmx-httpserver.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jre, makeWrapper }: +{ lib, stdenv, fetchurl, jre, makeWrapper }: let version = "0.10"; @@ -25,7 +25,7 @@ in stdenv.mkDerivation { makeWrapper "${jre}/bin/java" $out/bin/jmx_prometheus_httpserver --add-flags "-jar $out/libexec/$jarName" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/prometheus/jmx_exporter"; description = "A process for exposing JMX Beans via HTTP for Prometheus consumption"; license = licenses.asl20; diff --git a/pkgs/servers/monitoring/prometheus/json-exporter.nix b/pkgs/servers/monitoring/prometheus/json-exporter.nix index afa610809318..796eb065e63c 100644 --- a/pkgs/servers/monitoring/prometheus/json-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/json-exporter.nix @@ -1,31 +1,23 @@ -# This file was generated by go2nix. -{ buildGoPackage, fetchFromGitHub, fetchpatch, lib, nixosTests }: +{ lib, buildGoModule, fetchFromGitHub, nixosTests }: -buildGoPackage { +buildGoModule rec { pname = "prometheus-json-exporter"; - version = "unstable-2017-10-06"; - - goPackagePath = "github.com/kawamuray/prometheus-json-exporter"; + version = "0.2.0"; src = fetchFromGitHub { - owner = "kawamuray"; - repo = "prometheus-json-exporter"; - rev = "51e3dc02a30ab818bb73e5c98c3853231c2dbb5f"; - sha256 = "1v1p4zcqnb3d3rm55r695ydn61h6gz95f55cpa22hzw18dasahdh"; + owner = "prometheus-community"; + repo = "json_exporter"; + rev = "v${version}"; + sha256 = "1aabvd75a2223x5wnbyryigj7grw6l05jhr3g3s97b1f1hfigz6d"; }; - goDeps = ./json-exporter_deps.nix; - - patches = [(fetchpatch { # adds bool support - url = "https://patch-diff.githubusercontent.com/raw/kawamuray/prometheus-json-exporter/pull/17.patch"; - sha256 = "0mc5axhd2bykci41dgswl4r1552d70jsmb17lbih7czhsy6rgmrm"; - })]; + vendorSha256 = "03kb0gklq08krl7qnvs7267siw1pkyy346b42dsk1d9gr5302wsw"; passthru.tests = { inherit (nixosTests.prometheus-exporters) json; }; meta = with lib; { description = "A prometheus exporter which scrapes remote JSON by JSONPath"; - homepage = "https://github.com/kawamuray/prometheus-json-exporter"; + homepage = "https://github.com/prometheus-community/json_exporter"; license = licenses.asl20; maintainers = with maintainers; [ willibutz ]; }; diff --git a/pkgs/servers/monitoring/prometheus/json-exporter_deps.nix b/pkgs/servers/monitoring/prometheus/json-exporter_deps.nix deleted file mode 100644 index 9416125bc0c2..000000000000 --- a/pkgs/servers/monitoring/prometheus/json-exporter_deps.nix +++ /dev/null @@ -1,111 +0,0 @@ -# This file was generated by go2nix. -[ - { - goPackagePath = "github.com/Sirupsen/logrus"; - fetch = { - type = "git"; - url = "https://github.com/Sirupsen/logrus"; - rev = "a437dfd2463eaedbec3dfe443e477d3b0a810b3f"; - sha256 = "1904s2bbc7p88anzjp6fyj3jrbm5p6wbb8j4490674dq10kkcfbj"; - }; - } - { - goPackagePath = "github.com/beorn7/perks"; - fetch = { - type = "git"; - url = "https://github.com/beorn7/perks"; - rev = "4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9"; - sha256 = "1hrybsql68xw57brzj805xx2mghydpdiysv3gbhr7f5wlxj2514y"; - }; - } - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "8ee79997227bf9b34611aee7946ae64735e6fd93"; - sha256 = "0qm1lpdhf97k2hxgivq2cpjgawhlmmz39y230kgxijhm96xijxb8"; - }; - } - { - goPackagePath = "github.com/kawamuray/jsonpath"; - fetch = { - type = "git"; - url = "https://github.com/kawamuray/jsonpath"; - rev = "5c448ebf973557834ef870e788b0b2d95ac68d12"; - sha256 = "1i1id1i85rf09rldp03h0ibyi6zg0fz9p9l5qj7i8dfs6h6y8f0a"; - }; - } - { - goPackagePath = "github.com/kawamuray/prometheus-exporter-harness"; - fetch = { - type = "git"; - url = "https://github.com/kawamuray/prometheus-exporter-harness"; - rev = "97eeea7b8b0619ea2a065d75c0f0f5909327afa6"; - sha256 = "12al8irf8jb6p2xmm4wbh0wjqsyrdywynr4w122wxxnsx2n56xyv"; - }; - } - { - goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; - fetch = { - type = "git"; - url = "https://github.com/matttproud/golang_protobuf_extensions"; - rev = "c12348ce28de40eed0136aa2b644d0ee0650e56c"; - sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya"; - }; - } - { - goPackagePath = "github.com/prometheus/client_golang"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_golang"; - rev = "575f371f7862609249a1be4c9145f429fe065e32"; - sha256 = "0hyvszjv5m6i40k2fn21c3bjr8jhlfdqavk1r6g2v5dybyj47vps"; - }; - } - { - goPackagePath = "github.com/prometheus/client_model"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_model"; - rev = "fa8ad6fec33561be4280a8f0514318c79d7f6cb6"; - sha256 = "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9"; - }; - } - { - goPackagePath = "github.com/prometheus/common"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/common"; - rev = "0d5de9d6d8629cb8bee6d4674da4127cd8b615a3"; - sha256 = "1zlvvgw67p66fz9nswkydq15j4a5z5kkiskl0jxps8i27ya1baq0"; - }; - } - { - goPackagePath = "github.com/prometheus/procfs"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/procfs"; - rev = "abf152e5f3e97f2fafac028d2cc06c1feb87ffa5"; - sha256 = "0cp8lznv1b4zhi3wnbjkfxwzhkqd3wbmiy6mwgjanip8l9l3ykws"; - }; - } - { - goPackagePath = "github.com/urfave/cli"; - fetch = { - type = "git"; - url = "https://github.com/urfave/cli"; - rev = "0bdeddeeb0f650497d603c4ad7b20cfe685682f6"; - sha256 = "1ny63c7bfwfrsp7vfkvb4i0xhq4v7yxqnwxa52y4xlfxs4r6v6fg"; - }; - } - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/yaml.v2"; - rev = "a5b47d31c556af34a302ce5d659e6fea44d90de0"; - sha256 = "0v6l48fshdjrqzyq1kwn22gy7vy434xdr1i0lm3prsf6jbln9fam"; - }; - } -] diff --git a/pkgs/servers/monitoring/prometheus/keylight-exporter.nix b/pkgs/servers/monitoring/prometheus/keylight-exporter.nix index f1a7d0c38e32..e7ecffee9927 100644 --- a/pkgs/servers/monitoring/prometheus/keylight-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/keylight-exporter.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, nixosTests }: +{ lib, stdenv, buildGoModule, fetchFromGitHub, nixosTests }: buildGoModule rec { pname = "keylight-exporter"; @@ -17,7 +17,7 @@ buildGoModule rec { passthru.tests = { inherit (nixosTests.prometheus-exporters) keylight; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/mdlayher/keylight_exporter"; description = "Prometheus exporter for Elgato Key Light devices"; license = licenses.mit; diff --git a/pkgs/servers/monitoring/prometheus/lnd-exporter.nix b/pkgs/servers/monitoring/prometheus/lnd-exporter.nix index cdece1212433..1f9c38922ebc 100644 --- a/pkgs/servers/monitoring/prometheus/lnd-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/lnd-exporter.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, nixosTests }: +{ lib, stdenv, buildGoModule, fetchFromGitHub, nixosTests }: buildGoModule rec { pname = "lndmon"; @@ -17,7 +17,7 @@ buildGoModule rec { passthru.tests = { inherit (nixosTests.prometheus-exporters) lnd; }; - meta = with stdenv.lib; { + meta = with lib; { inherit (src.meta) homepage; description = "Prometheus exporter for lnd (Lightning Network Daemon)"; license = licenses.mit; diff --git a/pkgs/servers/monitoring/prometheus/mail-exporter.nix b/pkgs/servers/monitoring/prometheus/mail-exporter.nix index 95908e8b6a55..daad5dc81cd8 100644 --- a/pkgs/servers/monitoring/prometheus/mail-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/mail-exporter.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, installShellFiles, nixosTests }: +{ lib, stdenv, buildGoModule, fetchFromGitHub, installShellFiles, nixosTests }: buildGoModule { pname = "mailexporter"; @@ -22,7 +22,7 @@ buildGoModule { passthru.tests = { inherit (nixosTests.prometheus-exporters) mail; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Export Prometheus-style metrics about mail server functionality"; homepage = "https://github.com/cherti/mailexporter"; license = licenses.gpl3; diff --git a/pkgs/servers/monitoring/prometheus/mesos-exporter.nix b/pkgs/servers/monitoring/prometheus/mesos-exporter.nix index ce0404628051..0fb7ee4fce32 100644 --- a/pkgs/servers/monitoring/prometheus/mesos-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/mesos-exporter.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "mesos_exporter"; @@ -16,7 +16,7 @@ buildGoPackage rec { goDeps = ./mesos-exporter_deps.nix; - meta = with stdenv.lib; { + meta = with lib; { description = "Export Mesos metrics to Prometheus"; homepage = "https://github.com/prometheus/mesos_exporter"; license = licenses.asl20; diff --git a/pkgs/servers/monitoring/prometheus/mikrotik-exporter.nix b/pkgs/servers/monitoring/prometheus/mikrotik-exporter.nix index fe1ce5e4a999..5044db4b1c14 100644 --- a/pkgs/servers/monitoring/prometheus/mikrotik-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/mikrotik-exporter.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, nixosTests }: +{ lib, stdenv, buildGoModule, fetchFromGitHub, nixosTests }: buildGoModule rec { pname = "mikrotik-exporter-unstable"; @@ -17,7 +17,7 @@ buildGoModule rec { passthru.tests = { inherit (nixosTests.prometheus-exporters) mikrotik; }; - meta = with stdenv.lib; { + meta = with lib; { inherit (src.meta) homepage; description = "Prometheus MikroTik device(s) exporter"; license = licenses.bsd3; diff --git a/pkgs/servers/monitoring/prometheus/minio-exporter/default.nix b/pkgs/servers/monitoring/prometheus/minio-exporter/default.nix index c329050d4d1a..78642821b946 100644 --- a/pkgs/servers/monitoring/prometheus/minio-exporter/default.nix +++ b/pkgs/servers/monitoring/prometheus/minio-exporter/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, fetchpatch }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub, fetchpatch }: buildGoPackage rec { pname = "minio-exporter"; @@ -25,7 +25,7 @@ buildGoPackage rec { goDeps = ./deps.nix; - meta = with stdenv.lib; { + meta = with lib; { description = "A Prometheus exporter for Minio cloud storage server"; homepage = "https://github.com/joe-pll/minio-exporter"; license = licenses.asl20; diff --git a/pkgs/servers/monitoring/prometheus/modemmanager-exporter.nix b/pkgs/servers/monitoring/prometheus/modemmanager-exporter.nix index 34b927e0f7b4..c23d44dca389 100644 --- a/pkgs/servers/monitoring/prometheus/modemmanager-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/modemmanager-exporter.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, nixosTests }: +{ lib, stdenv, buildGoModule, fetchFromGitHub, nixosTests }: buildGoModule rec { pname = "modemmanager-exporter"; @@ -17,7 +17,7 @@ buildGoModule rec { passthru.tests = { inherit (nixosTests.prometheus-exporters) modemmanager; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/mdlayher/modemmanager_exporter"; description = "Prometheus exporter for ModemManager and its devices"; license = licenses.mit; diff --git a/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix b/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix index 8787a39de32a..ec181d2e1107 100644 --- a/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "mysqld_exporter"; @@ -14,7 +14,7 @@ buildGoPackage rec { sha256 = "0nzbfzx4dzs3cagdid1fqddrqimgr8x6r8gmmxglrss05c8srgs8"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Prometheus exporter for MySQL server metrics"; homepage = "https://github.com/prometheus/mysqld_exporter"; license = licenses.asl20; diff --git a/pkgs/servers/monitoring/prometheus/nginx-exporter.nix b/pkgs/servers/monitoring/prometheus/nginx-exporter.nix index 45612509e948..259b4f752d37 100644 --- a/pkgs/servers/monitoring/prometheus/nginx-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/nginx-exporter.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, nixosTests }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub, nixosTests }: buildGoPackage rec { pname = "nginx_exporter"; @@ -21,7 +21,7 @@ buildGoPackage rec { passthru.tests = { inherit (nixosTests.prometheus-exporters) nginx; }; - meta = with stdenv.lib; { + meta = with lib; { description = "NGINX Prometheus Exporter for NGINX and NGINX Plus"; homepage = "https://github.com/nginxinc/nginx-prometheus-exporter"; license = licenses.asl20; diff --git a/pkgs/servers/monitoring/prometheus/nginxlog-exporter.nix b/pkgs/servers/monitoring/prometheus/nginxlog-exporter.nix index 771bbf39b081..b15a54c6529c 100644 --- a/pkgs/servers/monitoring/prometheus/nginxlog-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/nginxlog-exporter.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, nixosTests }: +{ lib, stdenv, buildGoModule, fetchFromGitHub, nixosTests }: buildGoModule rec { pname = "nginxlog_exporter"; @@ -19,7 +19,7 @@ buildGoModule rec { passthru.tests = { inherit (nixosTests.prometheus-exporters) nginxlog; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Export metrics from Nginx access log files to Prometheus"; homepage = "https://github.com/martin-helmich/prometheus-nginxlog-exporter"; license = licenses.asl20; diff --git a/pkgs/servers/monitoring/prometheus/node-exporter.nix b/pkgs/servers/monitoring/prometheus/node-exporter.nix index 38f054aeb2dd..e2b601f56c14 100644 --- a/pkgs/servers/monitoring/prometheus/node-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/node-exporter.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, nixosTests }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub, nixosTests }: buildGoPackage rec { pname = "node_exporter"; @@ -25,7 +25,7 @@ buildGoPackage rec { passthru.tests = { inherit (nixosTests.prometheus-exporters) node; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Prometheus exporter for machine metrics"; homepage = "https://github.com/prometheus/node_exporter"; license = licenses.asl20; diff --git a/pkgs/servers/monitoring/prometheus/openvpn-exporter.nix b/pkgs/servers/monitoring/prometheus/openvpn-exporter.nix index 5d62ff8c50f9..8e3daa931ee8 100644 --- a/pkgs/servers/monitoring/prometheus/openvpn-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/openvpn-exporter.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "openvpn_exporter-unstable"; @@ -16,7 +16,7 @@ buildGoPackage rec { goDeps = ./openvpn-exporter-deps.nix; - meta = with stdenv.lib; { + meta = with lib; { inherit (src.meta) homepage; description = "Prometheus exporter for OpenVPN"; license = licenses.asl20; diff --git a/pkgs/servers/monitoring/prometheus/process-exporter.nix b/pkgs/servers/monitoring/prometheus/process-exporter.nix index 53497b685b87..5a3c232ac85c 100644 --- a/pkgs/servers/monitoring/prometheus/process-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/process-exporter.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "process-exporter"; @@ -19,7 +19,7 @@ buildGoPackage rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Prometheus exporter that mines /proc to report on selected processes"; homepage = "https://github.com/ncabatoff/process-exporter"; license = licenses.mit; diff --git a/pkgs/servers/monitoring/prometheus/prom2json.nix b/pkgs/servers/monitoring/prometheus/prom2json.nix index 101a53e7bb3a..b333faf0bbdc 100644 --- a/pkgs/servers/monitoring/prometheus/prom2json.nix +++ b/pkgs/servers/monitoring/prometheus/prom2json.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "prom2json"; @@ -16,7 +16,7 @@ buildGoPackage rec { goDeps = ./prom2json_deps.nix; - meta = with stdenv.lib; { + meta = with lib; { description = "Tool to scrape a Prometheus client and dump the result as JSON"; homepage = "https://github.com/prometheus/prom2json"; license = licenses.asl20; diff --git a/pkgs/servers/monitoring/prometheus/promscale.nix b/pkgs/servers/monitoring/prometheus/promscale.nix index 081c7c8352e6..f4a9070fd84a 100644 --- a/pkgs/servers/monitoring/prometheus/promscale.nix +++ b/pkgs/servers/monitoring/prometheus/promscale.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildGoModule , fetchFromGitHub }: @@ -20,7 +20,7 @@ buildGoModule rec { doCheck = false; # Requires access to a docker daemon - meta = with stdenv.lib; { + meta = with lib; { description = "An open-source analytical platform for Prometheus metrics"; homepage = "https://github.com/timescale/promscale"; license = licenses.asl20; diff --git a/pkgs/servers/monitoring/prometheus/pushgateway.nix b/pkgs/servers/monitoring/prometheus/pushgateway.nix index d2d59c5e5ded..29897267b6e1 100644 --- a/pkgs/servers/monitoring/prometheus/pushgateway.nix +++ b/pkgs/servers/monitoring/prometheus/pushgateway.nix @@ -1,4 +1,4 @@ -{ stdenv, go, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, go, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "pushgateway"; @@ -39,7 +39,7 @@ buildGoPackage rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Allows ephemeral and batch jobs to expose metrics to Prometheus"; homepage = "https://github.com/prometheus/pushgateway"; license = licenses.asl20; diff --git a/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix b/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix index 07dadd7a6350..41069dabc6ff 100644 --- a/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix @@ -1,5 +1,5 @@ # This file was generated by https://github.com/kamilchm/go2nix v2.0-dev -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage { pname = "rabbitmq_exporter"; @@ -16,7 +16,7 @@ buildGoPackage { goDeps = ./rabbitmq-exporter_deps.nix; - meta = with stdenv.lib; { + meta = with lib; { description = "Prometheus exporter for RabbitMQ"; homepage = "https://github.com/kbudde/rabbitmq_exporter"; license = licenses.mit; diff --git a/pkgs/servers/monitoring/prometheus/redis-exporter.nix b/pkgs/servers/monitoring/prometheus/redis-exporter.nix index 9082fd81c632..945f403041c6 100644 --- a/pkgs/servers/monitoring/prometheus/redis-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/redis-exporter.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, nixosTests }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub, nixosTests }: buildGoPackage rec { pname = "redis_exporter"; @@ -24,7 +24,7 @@ buildGoPackage rec { passthru.tests = { inherit (nixosTests.prometheus-exporters) redis; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Prometheus exporter for Redis metrics"; inherit (src.meta) homepage; license = licenses.mit; diff --git a/pkgs/servers/monitoring/prometheus/smokeping-prober.nix b/pkgs/servers/monitoring/prometheus/smokeping-prober.nix new file mode 100644 index 000000000000..f440be3f57a4 --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/smokeping-prober.nix @@ -0,0 +1,43 @@ +{ lib, stdenv, buildGoModule, fetchFromGitHub, nixosTests }: + +let + inherit (stdenv) lib; + baseVersion = "0.3.1"; + commit = "9ba85274dcc21bf8132cbe3b3dccfcb4aab57d9f"; +in +buildGoModule rec { + pname = "smokeping_prober"; + version = "${baseVersion}-g${commit}"; + + buildFlagsArray = let + setVars = { + Version = baseVersion; + Revision = commit; + Branch = commit; + BuildUser = "nix"; + }; + varFlags = lib.concatStringsSep " " (lib.mapAttrsToList (name: value: "-X github.com/prometheus/common/version.${name}=${value}") setVars); + in [ + "-ldflags=${varFlags} -s -w" + ]; + + src = fetchFromGitHub { + rev = commit; + owner = "SuperQ"; + repo = "smokeping_prober"; + sha256 = "sha256:19596di2gzcvlcwiypsncq4zwbyb6d1r6wxsfi59wax3423i7ndg"; + }; + vendorSha256 = "sha256:1b2v3v3kn0m7dvjxbs8q0gw6zingksdqhm5g1frx0mymqk0lg889"; + + doCheck = true; + + passthru.tests = { inherit (nixosTests.prometheus-exporters) smokeping; }; + + meta = with lib; { + description = "Prometheus exporter for sending continual ICMP/UDP pings"; + homepage = "https://github.com/SuperQ/smokeping_prober"; + license = licenses.asl20; + maintainers = with maintainers; [ lukegb ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/servers/monitoring/prometheus/snmp-exporter.nix b/pkgs/servers/monitoring/prometheus/snmp-exporter.nix index b6fafe5eaa43..a71b03a2b41d 100644 --- a/pkgs/servers/monitoring/prometheus/snmp-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/snmp-exporter.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, net-snmp, nixosTests }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub, net-snmp, nixosTests }: buildGoPackage rec { pname = "snmp_exporter"; @@ -19,7 +19,7 @@ buildGoPackage rec { passthru.tests = { inherit (nixosTests.prometheus-exporters) snmp; }; - meta = with stdenv.lib; { + meta = with lib; { description = "SNMP Exporter for Prometheus"; homepage = "https://github.com/prometheus/snmp_exporter"; license = licenses.asl20; diff --git a/pkgs/servers/monitoring/prometheus/sql-exporter.nix b/pkgs/servers/monitoring/prometheus/sql-exporter.nix index c689cc1ed793..d6c69a6089bf 100644 --- a/pkgs/servers/monitoring/prometheus/sql-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/sql-exporter.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, nixosTests }: +{ lib, stdenv, buildGoModule, fetchFromGitHub, nixosTests }: buildGoModule rec { pname = "sql_exporter"; @@ -13,7 +13,7 @@ buildGoModule rec { sha256 = "125brlxgwhkn3z5v0522gpm0sk6v905ghh05c4c3wf1hlm7bhnrc"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Flexible SQL exporter for Prometheus"; homepage = "https://github.com/justwatchcom/sql_exporter"; license = licenses.mit; diff --git a/pkgs/servers/monitoring/prometheus/statsd-exporter.nix b/pkgs/servers/monitoring/prometheus/statsd-exporter.nix index cc6b55cac220..a2b0f73904b9 100644 --- a/pkgs/servers/monitoring/prometheus/statsd-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/statsd-exporter.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "statsd_exporter"; @@ -14,7 +14,7 @@ buildGoPackage rec { sha256 = "0bgi00005j41p650rb6n1iz2w9m4p22d1w91f2hwlh5bqxf55al3"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Receives StatsD-style metrics and exports them to Prometheus"; homepage = "https://github.com/prometheus/statsd_exporter"; license = licenses.asl20; diff --git a/pkgs/servers/monitoring/prometheus/surfboard-exporter.nix b/pkgs/servers/monitoring/prometheus/surfboard-exporter.nix index d6f4bea15313..50915bf65f87 100644 --- a/pkgs/servers/monitoring/prometheus/surfboard-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/surfboard-exporter.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, nixosTests }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub, nixosTests }: buildGoPackage rec { pname = "surfboard_exporter"; @@ -15,7 +15,7 @@ buildGoPackage rec { passthru.tests = { inherit (nixosTests.prometheus-exporters) surfboard; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Arris Surfboard signal metrics exporter"; homepage = "https://github.com/ipstatic/surfboard_exporter"; license = licenses.mit; diff --git a/pkgs/servers/monitoring/prometheus/unifi-exporter/default.nix b/pkgs/servers/monitoring/prometheus/unifi-exporter/default.nix index b4f58d789f6f..669cf8ffaeae 100644 --- a/pkgs/servers/monitoring/prometheus/unifi-exporter/default.nix +++ b/pkgs/servers/monitoring/prometheus/unifi-exporter/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "unifi-exporter"; @@ -14,7 +14,7 @@ buildGoPackage rec { sha256 = "08zqvwvdqnc301f8jfh7bdvc138szw6xszx884b2v8w2x38w3rmn"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Prometheus exporter that exposes metrics from a Ubiquiti UniFi Controller and UniFi devices"; homepage = "https://github.com/mdlayher/unifi_exporter"; license = licenses.mit; diff --git a/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix b/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix index 0f303f669af9..0cbfc89bd5d4 100644 --- a/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "wireguard-exporter"; - version = "3.3.0"; + version = "3.4.2"; src = fetchFromGitHub { owner = "MindFlavor"; repo = "prometheus_wireguard_exporter"; rev = version; - sha256 = "1c6zadqnn4b83yglcdn1hw54jj1c4makbdy6fli3cfb7sha1ynml"; + sha256 = "sha256-nzY+pCkj0/m7cWPq5+xvQ1b1/PqdI6QuxNdTRT030tY="; }; - cargoSha256 = "148982ypkxhab2kmijk9zwwi5l6nk4rcdwaz0r1j9fni47q49f35"; + cargoSha256 = "sha256-L2ohowt5+F3XJSzoihtJ2prW2bzZiNMUL9vqHIZBy1M="; buildInputs = lib.optional stdenv.isDarwin Security; diff --git a/pkgs/servers/monitoring/riemann/default.nix b/pkgs/servers/monitoring/riemann/default.nix index d993e1a08a90..03609e4d25a1 100644 --- a/pkgs/servers/monitoring/riemann/default.nix +++ b/pkgs/servers/monitoring/riemann/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, jre }: +{ lib, stdenv, fetchurl, makeWrapper, jre }: stdenv.mkDerivation rec { pname = "riemann"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { wrapProgram "$out/bin/riemann" --prefix PATH : "${jre}/bin" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://riemann.io/"; description = "A network monitoring system"; license = licenses.epl10; diff --git a/pkgs/servers/monitoring/seyren/default.nix b/pkgs/servers/monitoring/seyren/default.nix index e926d797f9f9..1d26afad3d8b 100644 --- a/pkgs/servers/monitoring/seyren/default.nix +++ b/pkgs/servers/monitoring/seyren/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, jre }: +{ lib, stdenv, fetchurl, makeWrapper, jre }: stdenv.mkDerivation rec { pname = "seyren"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { makeWrapper "${jre}/bin/java" "$out"/bin/seyren --add-flags "-jar $src" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "An alerting dashboard for Graphite"; homepage = "https://github.com/scobal/seyren"; license = licenses.asl20; diff --git a/pkgs/servers/monitoring/telegraf/default.nix b/pkgs/servers/monitoring/telegraf/default.nix index 2080195dc566..76acc2822f40 100644 --- a/pkgs/servers/monitoring/telegraf/default.nix +++ b/pkgs/servers/monitoring/telegraf/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "telegraf"; - version = "1.16.3"; + version = "1.17.0"; excludedPackages = "test"; @@ -12,10 +12,10 @@ buildGoModule rec { owner = "influxdata"; repo = "telegraf"; rev = "v${version}"; - sha256 = "1vhxa1sdnkjy86rn2zsyf8kc3nn2fdbym3kw5zxz88mjc8iq3x0d"; + sha256 = "1j3wi398vcvlnf1q335hhbw6bq69qclak92sg2na05cl4snw68y0"; }; - vendorSha256 = "12rh8pggpdjgw9x23qa99cj7i67iqchacgzd11m4ficxv8a4bkyc"; + vendorSha256 = "0vb1gvmj7pmz4dljyk91smkn8japmv7mc3mgb0s1imvxala8qq83"; buildFlagsArray = [ ''-ldflags= -w -s -X main.version=${version} @@ -27,6 +27,6 @@ buildGoModule rec { description = "The plugin-driven server agent for collecting & reporting metrics"; license = licenses.mit; homepage = "https://www.influxdata.com/time-series-platform/telegraf/"; - maintainers = with maintainers; [ mic92 roblabla foxit64 ]; + maintainers = with maintainers; [ mic92 roblabla timstott foxit64 ]; }; } diff --git a/pkgs/servers/monitoring/thanos/default.nix b/pkgs/servers/monitoring/thanos/default.nix index f6415ca89852..9955b4a83330 100644 --- a/pkgs/servers/monitoring/thanos/default.nix +++ b/pkgs/servers/monitoring/thanos/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "thanos"; version = "0.17.2"; @@ -25,7 +25,7 @@ buildGoModule rec { -X ${t}.BuildDate=unknown ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Highly available Prometheus setup with long term storage capabilities"; homepage = "https://github.com/thanos-io/thanos"; license = licenses.asl20; diff --git a/pkgs/servers/monitoring/uchiwa/default.nix b/pkgs/servers/monitoring/uchiwa/default.nix index 9f0be68e168b..121b31e46eb8 100644 --- a/pkgs/servers/monitoring/uchiwa/default.nix +++ b/pkgs/servers/monitoring/uchiwa/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildBowerComponents, buildGoPackage, makeWrapper }: +{ lib, stdenv, fetchFromGitHub, buildBowerComponents, buildGoPackage, makeWrapper }: let inherit (import ./src.nix) version sha256; @@ -43,7 +43,7 @@ in stdenv.mkDerivation { ln -s ${frontend.out}/bower_components $out/public/bower_components ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A Dashboard for the sensu monitoring framework"; homepage = "http://sensuapp.org/"; license = licenses.mit; diff --git a/pkgs/servers/monitoring/unifi-poller/default.nix b/pkgs/servers/monitoring/unifi-poller/default.nix index 7ddc53f38e8f..0343384a6795 100644 --- a/pkgs/servers/monitoring/unifi-poller/default.nix +++ b/pkgs/servers/monitoring/unifi-poller/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "unifi-poller"; @@ -21,7 +21,7 @@ buildGoModule rec { -X github.com/prometheus/common/version.Version=${version}-0 ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Collect ALL UniFi Controller, Site, Device & Client Data - Export to InfluxDB or Prometheus"; homepage = "https://github.com/unifi-poller/unifi-poller"; license = licenses.mit; diff --git a/pkgs/servers/monitoring/zabbix/agent.nix b/pkgs/servers/monitoring/zabbix/agent.nix index 184d7e6aea7a..aadbd879f5e6 100644 --- a/pkgs/servers/monitoring/zabbix/agent.nix +++ b/pkgs/servers/monitoring/zabbix/agent.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libiconv, openssl, pcre }: +{ lib, stdenv, fetchurl, pkgconfig, libiconv, openssl, pcre }: import ./versions.nix ({ version, sha256 }: stdenv.mkDerivation { @@ -28,7 +28,7 @@ import ./versions.nix ({ version, sha256 }: cp conf/zabbix_agentd/*.conf $out/etc/zabbix_agentd.conf.d/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "An enterprise-class open source distributed monitoring solution (client-side agent)"; homepage = "https://www.zabbix.com/"; license = licenses.gpl2; diff --git a/pkgs/servers/monitoring/zabbix/proxy.nix b/pkgs/servers/monitoring/zabbix/proxy.nix index 4179cf52c7a9..190bfbcb81bf 100644 --- a/pkgs/servers/monitoring/zabbix/proxy.nix +++ b/pkgs/servers/monitoring/zabbix/proxy.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libevent, libiconv, openssl, pcre, zlib +{ lib, stdenv, fetchurl, pkgconfig, libevent, libiconv, openssl, pcre, zlib , odbcSupport ? true, unixODBC , snmpSupport ? true, net-snmp , sshSupport ? true, libssh2 @@ -72,7 +72,7 @@ in cp -prvd database/postgresql/schema.sql $out/share/zabbix/database/postgresql/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "An enterprise-class open source distributed monitoring solution (client-server proxy)"; homepage = "https://www.zabbix.com/"; license = licenses.gpl2; diff --git a/pkgs/servers/monitoring/zabbix/server.nix b/pkgs/servers/monitoring/zabbix/server.nix index 9d0e1c199d32..b82c3ce9ee83 100644 --- a/pkgs/servers/monitoring/zabbix/server.nix +++ b/pkgs/servers/monitoring/zabbix/server.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, pkgconfig, curl, libevent, libiconv, libxml2, openssl, pcre, zlib +{ lib, stdenv, fetchurl, autoreconfHook, pkgconfig, curl, libevent, libiconv, libxml2, openssl, pcre, zlib , jabberSupport ? true, iksemel , ldapSupport ? true, openldap , odbcSupport ? true, unixODBC @@ -83,7 +83,7 @@ in cp -prvd database/postgresql/*.sql $out/share/zabbix/database/postgresql/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "An enterprise-class open source distributed monitoring solution"; homepage = "https://www.zabbix.com/"; license = licenses.gpl2; diff --git a/pkgs/servers/monitoring/zabbix/web.nix b/pkgs/servers/monitoring/zabbix/web.nix index f677fe5c0af3..16e5be4045aa 100644 --- a/pkgs/servers/monitoring/zabbix/web.nix +++ b/pkgs/servers/monitoring/zabbix/web.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, writeText }: +{ lib, stdenv, fetchurl, writeText }: import ./versions.nix ({ version, sha256 }: stdenv.mkDerivation rec { @@ -22,7 +22,7 @@ import ./versions.nix ({ version, sha256 }: cp ${phpConfig} $out/share/zabbix/conf/zabbix.conf.php ''; - meta = with stdenv.lib; { + meta = with lib; { description = "An enterprise-class open source distributed monitoring solution (web frontend)"; homepage = "https://www.zabbix.com/"; license = licenses.gpl2; diff --git a/pkgs/servers/monitoring/zipkin/default.nix b/pkgs/servers/monitoring/zipkin/default.nix index c9b2e36d8730..e84c422ea646 100644 --- a/pkgs/servers/monitoring/zipkin/default.nix +++ b/pkgs/servers/monitoring/zipkin/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, makeWrapper, jre}: +{lib, stdenv, fetchurl, makeWrapper, jre}: stdenv.mkDerivation rec { version = "1.28.1"; pname = "zipkin-server"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { makeWrapper ${jre}/bin/java $out/bin/zipkin-server \ --add-flags "-cp $out/share/java/zipkin-server-${version}-exec.jar org.springframework.boot.loader.JarLauncher" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Zipkin distributed tracing system"; homepage = "https://zipkin.io/"; license = licenses.asl20; diff --git a/pkgs/servers/mpd/clientlib.nix b/pkgs/servers/mpd/clientlib.nix index 3016b7dba835..b180e62ce18a 100644 --- a/pkgs/servers/mpd/clientlib.nix +++ b/pkgs/servers/mpd/clientlib.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, meson, ninja, fixDarwinDylibNames }: +{ lib, stdenv, fetchFromGitHub, meson, ninja, fixDarwinDylibNames }: stdenv.mkDerivation rec { version = "2.19"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja ] ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; - meta = with stdenv.lib; { + meta = with lib; { description = "Client library for MPD (music player daemon)"; homepage = "https://www.musicpd.org/libs/libmpdclient/"; license = licenses.gpl2; diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index c403d160e2bc..8c50c0b10ae2 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, meson, ninja, pkg-config, glib, systemd, boost, darwin +{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, glib, systemd, boost, darwin # Inputs , curl, libmms, libnfs, liburing, samba # Archive support @@ -171,7 +171,7 @@ let passthru.tests.nixos = nixosTests.mpd; - meta = with stdenv.lib; { + meta = with lib; { description = "A flexible, powerful daemon for playing music"; homepage = "https://www.musicpd.org/"; license = licenses.gpl2; @@ -190,7 +190,7 @@ in mpd = run { }; mpd-small = run { features = [ "webdav" "curl" "mms" "bzip2" "zzip" - "audiofile" "faad" "flac" "gme" "mad" + "audiofile" "faad" "flac" "gme" "mpg123" "opus" "vorbis" "vorbisenc" "lame" "libsamplerate" "shout" "libmpdclient" "id3tag" "expat" "pcre" diff --git a/pkgs/servers/mqtt/mosquitto/default.nix b/pkgs/servers/mqtt/mosquitto/default.nix index e956e3b7cfd4..05ce1105d18d 100644 --- a/pkgs/servers/mqtt/mosquitto/default.nix +++ b/pkgs/servers/mqtt/mosquitto/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { "-DWITH_WEBSOCKETS=ON" ] ++ lib.optional withSystemd "-DWITH_SYSTEMD=ON"; - meta = with stdenv.lib; { + meta = with lib; { description = "An open source MQTT v3.1/3.1.1 broker"; homepage = "https://mosquitto.org/"; license = licenses.epl10; diff --git a/pkgs/servers/mtprotoproxy/default.nix b/pkgs/servers/mtprotoproxy/default.nix index e8782050eeea..bd4ad80e317f 100644 --- a/pkgs/servers/mtprotoproxy/default.nix +++ b/pkgs/servers/mtprotoproxy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python, pyaes, pycrypto, uvloop, wrapPython }: +{ lib, stdenv, fetchFromGitHub, python, pyaes, pycrypto, uvloop, wrapPython }: stdenv.mkDerivation rec { pname = "mtprotoproxy"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { wrapPythonPrograms ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Async MTProto proxy for Telegram"; license = licenses.mit; homepage = "https://github.com/alexbers/mtprotoproxy"; diff --git a/pkgs/servers/mxisd/default.nix b/pkgs/servers/mxisd/default.nix index 6e9ab2ca99a2..b2ea54208091 100644 --- a/pkgs/servers/mxisd/default.nix +++ b/pkgs/servers/mxisd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, jre, git, gradle, perl, makeWrapper }: +{ lib, stdenv, fetchFromGitHub, jre, git, gradle, perl, makeWrapper }: let name = "mxisd-${version}"; @@ -59,7 +59,7 @@ stdenv.mkDerivation { makeWrapper ${jre}/bin/java $out/bin/mxisd --add-flags "-jar $out/lib/mxisd.jar" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "a federated matrix identity server"; homepage = "https://github.com/kamax-matrix/mxisd"; license = licenses.agpl3; diff --git a/pkgs/servers/nas/default.nix b/pkgs/servers/nas/default.nix index 2e8b8b14d44f..319bee115c28 100644 --- a/pkgs/servers/nas/default.nix +++ b/pkgs/servers/nas/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, imake, bison, flex, gccmakedep +{ lib, stdenv, fetchurl, imake, bison, flex, gccmakedep , xorgproto, libXau, libXt, libXext, libXaw, libXpm, xorgcffiles }: let @@ -25,7 +25,7 @@ in stdenv.mkDerivation { rm -r $out/nix ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A network transparent, client/server audio transport system"; homepage = "http://radscan.com/nas.html"; license = licenses.mit; diff --git a/pkgs/servers/neard/default.nix b/pkgs/servers/neard/default.nix index 3b360e308b57..ad3a68b46eb3 100644 --- a/pkgs/servers/neard/default.nix +++ b/pkgs/servers/neard/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, pkgconfig, systemd, glib, dbus, libnl, pythonPackages }: +{ lib, stdenv, fetchurl, autoreconfHook, pkgconfig, systemd, glib, dbus, libnl, pythonPackages }: stdenv.mkDerivation rec { name = "neard-0.16"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { wrapPythonProgramsIn $out/lib/neard "$out $pythonPath" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Near Field Communication manager"; homepage = "https://01.org/linux-nfc"; license = licenses.gpl2; diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index 8d4b52a01593..75fa1ff08244 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, nixosTests }: +{ lib, stdenv, fetchurl, nixosTests }: let generic = { @@ -20,7 +20,7 @@ let cp -R . $out/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Sharing solution for files, calendars, contacts and more"; homepage = "https://nextcloud.com"; maintainers = with maintainers; [ schneefux bachp globin fpletz ma27 ]; @@ -53,7 +53,7 @@ in { version = "19.0.6"; sha256 = "sha256-pqqIayE0OyTailtd2zeYi+G1APjv/YHqyO8jCpq7KJg="; extraVulnerabilities = [ - "Nextcloud 19 is still supported, but CVE-2020-8259 & CVE-2020-8152 are unfixed!" + "Nextcloud 19 is still supported, but CVE-2020-8259 & CVE-2020-8152 are unfixed! Please note that both CVEs only affect the file encryption module which is turned off by default. Alternatively, `pkgs.nextcloud20` can be used." ]; }; diff --git a/pkgs/servers/nfs-ganesha/default.nix b/pkgs/servers/nfs-ganesha/default.nix index 7ec56b023e59..b5fefc963f07 100644 --- a/pkgs/servers/nfs-ganesha/default.nix +++ b/pkgs/servers/nfs-ganesha/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkg-config +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config , krb5, xfsprogs, jemalloc, dbus, libcap , ntirpc, liburcu, bison, flex, nfs-utils } : @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { nfs-utils ]; - meta = with stdenv.lib; { + meta = with lib; { description = "NFS server that runs in user space"; homepage = "https://github.com/nfs-ganesha/nfs-ganesha/wiki"; maintainers = [ maintainers.markuskowa ]; diff --git a/pkgs/servers/nginx-sso/default.nix b/pkgs/servers/nginx-sso/default.nix index dffe48db58a3..0029d9ad55ee 100644 --- a/pkgs/servers/nginx-sso/default.nix +++ b/pkgs/servers/nginx-sso/default.nix @@ -1,4 +1,4 @@ -{ buildGoPackage, fetchFromGitHub, stdenv, nixosTests }: +{ buildGoPackage, fetchFromGitHub, lib, stdenv, nixosTests }: buildGoPackage rec { pname = "nginx-sso"; @@ -23,7 +23,7 @@ buildGoPackage rec { inherit (nixosTests) nginx-sso; }; - meta = with stdenv.lib; { + meta = with lib; { description = "SSO authentication provider for the auth_request nginx module"; homepage = "https://github.com/Luzifer/nginx-sso"; license = licenses.asl20; diff --git a/pkgs/servers/nosql/aerospike/default.nix b/pkgs/servers/nosql/aerospike/default.nix index 73a07ec057eb..33347a73a20c 100644 --- a/pkgs/servers/nosql/aerospike/default.nix +++ b/pkgs/servers/nosql/aerospike/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, libtool, openssl, zlib }: +{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, openssl, zlib }: stdenv.mkDerivation rec { pname = "aerospike-server"; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { cp -dpR modules/lua-core/src $out/share/udf/lua ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Flash-optimized, in-memory, NoSQL database"; homepage = "http://aerospike.com/"; license = licenses.agpl3; diff --git a/pkgs/servers/nosql/arangodb/default.nix b/pkgs/servers/nosql/arangodb/default.nix index 4d5c24c73046..bf7f7b439609 100644 --- a/pkgs/servers/nosql/arangodb/default.nix +++ b/pkgs/servers/nosql/arangodb/default.nix @@ -36,8 +36,6 @@ let "-DASM_OPTIMIZATIONS=${if stdenv.hostPlatform.sse4_2Support then "ON" else "OFF"}" ]; - enableParallelBuilding = true; - meta = with lib; { homepage = "https://www.arangodb.com"; description = "A native multi-model database with flexible data models for documents, graphs, and key-values"; diff --git a/pkgs/servers/nosql/cassandra/generic.nix b/pkgs/servers/nosql/cassandra/generic.nix index 487dbdf07e01..696334e85616 100644 --- a/pkgs/servers/nosql/cassandra/generic.nix +++ b/pkgs/servers/nosql/cassandra/generic.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python, makeWrapper, gawk, bash, getopt, procps +{ lib, stdenv, fetchurl, python, makeWrapper, gawk, bash, getopt, procps , which, jre, coreutils, nixosTests # generation is the attribute version suffix such as 3_11 in pkgs.cassandra_3_11 , generation @@ -98,7 +98,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://cassandra.apache.org/"; description = "A massively scalable open source NoSQL database"; platforms = platforms.unix; diff --git a/pkgs/servers/nosql/neo4j/default.nix b/pkgs/servers/nosql/neo4j/default.nix index 743553f5f616..74e7cd463b78 100644 --- a/pkgs/servers/nosql/neo4j/default.nix +++ b/pkgs/servers/nosql/neo4j/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, jre8, which, gawk }: +{ lib, stdenv, fetchurl, makeWrapper, jre8, which, gawk }: with stdenv.lib; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A highly scalable, robust (fully ACID) native graph database"; homepage = "http://www.neo4j.org/"; license = licenses.gpl3; diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix index 38e12010f416..45dd26fb8f0e 100644 --- a/pkgs/servers/nosql/redis/default.nix +++ b/pkgs/servers/nosql/redis/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, lua, pkgconfig, systemd, jemalloc, nixosTests }: +{ lib, stdenv, fetchurl, lua, pkgconfig, systemd, jemalloc, nixosTests +, tlsSupport ? true, openssl +}: stdenv.mkDerivation rec { version = "6.0.6"; @@ -18,14 +20,19 @@ stdenv.mkDerivation rec { ''} ''; - buildInputs = [ lua pkgconfig ] ++ stdenv.lib.optional (stdenv.isLinux && !stdenv.hostPlatform.isMusl) systemd; + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ lua ] + ++ stdenv.lib.optional (stdenv.isLinux && !stdenv.hostPlatform.isMusl) systemd + ++ stdenv.lib.optionals tlsSupport [ openssl ]; # More cross-compiling fixes. # Note: this enables libc malloc as a temporary fix for cross-compiling. # Due to hardcoded configure flags in jemalloc, we can't cross-compile vendored jemalloc properly, and so we're forced to use libc allocator. # It's weird that the build isn't failing because of failure to compile dependencies, it's from failure to link them! makeFlags = [ "PREFIX=$(out)" ] ++ stdenv.lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "AR=${stdenv.cc.targetPrefix}ar" "RANLIB=${stdenv.cc.targetPrefix}ranlib" "MALLOC=libc" ] - ++ stdenv.lib.optional (stdenv.isLinux && !stdenv.hostPlatform.isMusl) ["USE_SYSTEMD=yes"]; + ++ stdenv.lib.optional (stdenv.isLinux && !stdenv.hostPlatform.isMusl) ["USE_SYSTEMD=yes"] + ++ stdenv.lib.optionals tlsSupport [ "BUILD_TLS=yes" ]; enableParallelBuilding = true; @@ -33,7 +40,7 @@ stdenv.mkDerivation rec { passthru.tests.redis = nixosTests.redis; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://redis.io"; description = "An open source, advanced key-value store"; license = licenses.bsd3; diff --git a/pkgs/servers/nzbhydra2/default.nix b/pkgs/servers/nzbhydra2/default.nix new file mode 100644 index 000000000000..aab3952e9ed9 --- /dev/null +++ b/pkgs/servers/nzbhydra2/default.nix @@ -0,0 +1,32 @@ +{ lib, stdenv, fetchzip, makeWrapper, jre, python3, unzip }: + +stdenv.mkDerivation rec { + pname = "nzbhydra2"; + version = "3.8.0"; + + src = fetchzip { + url = "https://github.com/theotherp/${pname}/releases/download/v${version}/${pname}-${version}-linux.zip"; + sha512 = "1gybricq26hixr5cmw1iwyax7h17d0n5wqzhrx727xda1x35jfjp5ynjdkxzysbfhs1za6vy54bpm0sda4nkrh16p0xqnz3nsd4hvzh"; + stripRoot = false; + }; + + nativeBuildInputs = [ jre makeWrapper unzip ]; + + installPhase = '' + install -d -m 755 "$out/lib/${pname}" + cp -dpr --no-preserve=ownership "lib" "readme.md" "$out/lib/nzbhydra2" + install -D -m 755 "nzbhydra2wrapperPy3.py" "$out/lib/nzbhydra2/nzbhydra2wrapperPy3.py" + + makeWrapper ${python3}/bin/python $out/bin/nzbhydra2 \ + --add-flags "$out/lib/nzbhydra2/nzbhydra2wrapperPy3.py" \ + --prefix PATH ":" ${jre}/bin + ''; + + meta = with lib; { + description = "Usenet meta search"; + homepage = "https://github.com/theotherp/nzbhydra2"; + license = licenses.asl20; + maintainers = with maintainers; [ jamiemagee ]; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/servers/openafs/1.8/default.nix b/pkgs/servers/openafs/1.8/default.nix index c26f8d3a23c5..de780e9fb964 100644 --- a/pkgs/servers/openafs/1.8/default.nix +++ b/pkgs/servers/openafs/1.8/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPackages, fetchurl, which, autoconf, automake, flex +{ lib, stdenv, buildPackages, fetchurl, which, autoconf, automake, flex , yacc , glibc, perl, kerberos, libxslt, docbook_xsl, file , docbook_xml_dtd_43, libtool_2 , withDevdoc ? false, doxygen, dblatex # Extra developer documentation @@ -94,7 +94,7 @@ in stdenv.mkDerivation { rm -rf "$(pwd)" && mkdir "$(pwd)" ''; - meta = with stdenv.lib; { + meta = with lib; { outputsToInstall = [ "out" "doc" "man" ]; description = "Open AFS client"; homepage = "https://www.openafs.org"; diff --git a/pkgs/servers/openafs/1.8/module.nix b/pkgs/servers/openafs/1.8/module.nix index 722e514ea016..97e20238a7c3 100644 --- a/pkgs/servers/openafs/1.8/module.nix +++ b/pkgs/servers/openafs/1.8/module.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, which, autoconf, automake, flex, yacc +{ lib, stdenv, fetchurl, which, autoconf, automake, flex, yacc , kernel, glibc, perl, libtool_2, kerberos, fetchpatch }: with (import ./srcs.nix { @@ -69,7 +69,7 @@ in stdenv.mkDerivation { xz -f ${modDestDir}/libafs.ko ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Open AFS client kernel module"; homepage = "https://www.openafs.org"; license = licenses.ipl10; diff --git a/pkgs/servers/openafs/1.9/default.nix b/pkgs/servers/openafs/1.9/default.nix index c26f8d3a23c5..de780e9fb964 100644 --- a/pkgs/servers/openafs/1.9/default.nix +++ b/pkgs/servers/openafs/1.9/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPackages, fetchurl, which, autoconf, automake, flex +{ lib, stdenv, buildPackages, fetchurl, which, autoconf, automake, flex , yacc , glibc, perl, kerberos, libxslt, docbook_xsl, file , docbook_xml_dtd_43, libtool_2 , withDevdoc ? false, doxygen, dblatex # Extra developer documentation @@ -94,7 +94,7 @@ in stdenv.mkDerivation { rm -rf "$(pwd)" && mkdir "$(pwd)" ''; - meta = with stdenv.lib; { + meta = with lib; { outputsToInstall = [ "out" "doc" "man" ]; description = "Open AFS client"; homepage = "https://www.openafs.org"; diff --git a/pkgs/servers/openafs/1.9/module.nix b/pkgs/servers/openafs/1.9/module.nix index 547134726221..5ed09a21742d 100644 --- a/pkgs/servers/openafs/1.9/module.nix +++ b/pkgs/servers/openafs/1.9/module.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, which, autoconf, automake, flex, yacc +{ lib, stdenv, fetchurl, which, autoconf, automake, flex, yacc , kernel, glibc, perl, libtool_2, kerberos, fetchpatch }: with (import ./srcs.nix { @@ -52,7 +52,7 @@ in stdenv.mkDerivation { xz -f ${modDestDir}/libafs.ko ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Open AFS client kernel module"; homepage = "https://www.openafs.org"; license = licenses.ipl10; diff --git a/pkgs/servers/openbgpd/default.nix b/pkgs/servers/openbgpd/default.nix index 02c1c607eab8..58f799c97ba4 100644 --- a/pkgs/servers/openbgpd/default.nix +++ b/pkgs/servers/openbgpd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, libtool, m4, yacc }: +{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, m4, yacc }: let openbsd_version = @@ -35,7 +35,7 @@ in stdenv.mkDerivation rec { ./autogen.sh ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A free implementation of the Border Gateway Protocol, Version 4. It allows ordinary machines to be used as routers exchanging routes with other systems speaking the BGP protocol"; license = licenses.isc; diff --git a/pkgs/servers/p910nd/default.nix b/pkgs/servers/p910nd/default.nix index f209a2d2aa6e..e5e4df1a292b 100644 --- a/pkgs/servers/p910nd/default.nix +++ b/pkgs/servers/p910nd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "p910nd"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { mv $out/etc $out/share/doc/examples ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Small printer daemon passing jobs directly to the printer"; longDescription = '' p910nd is a small printer daemon intended for diskless platforms that diff --git a/pkgs/servers/pinnwand/default.nix b/pkgs/servers/pinnwand/default.nix index fd02fc770813..807f241fa3e1 100644 --- a/pkgs/servers/pinnwand/default.nix +++ b/pkgs/servers/pinnwand/default.nix @@ -14,18 +14,18 @@ let }; in with python.pkgs; buildPythonApplication rec { pname = "pinnwand"; - version = "1.2.2"; + version = "1.2.3"; format = "pyproject"; src = fetchFromGitHub { owner = "supakeen"; repo = pname; rev = "v${version}"; - sha256 = "0cxdpc3lxgzakzgvdyyrn234380dm05svnwr8av5nrjp4nm9s8z4"; + sha256 = "1p6agvp136q6km7gjfv8dpjn6x4ap770lqa40ifblyhw13bsrqlh"; }; nativeBuildInputs = [ - poetry + poetry-core ]; propagatedBuildInputs = [ @@ -37,11 +37,9 @@ in with python.pkgs; buildPythonApplication rec { sqlalchemy ]; - checkInputs = [ pytest ]; + checkInputs = [ pytestCheckHook ]; - checkPhase = '' - pytest - ''; + __darwinAllowLocalNetworking = true; passthru.tests = nixosTests.pinnwand; diff --git a/pkgs/servers/pinnwand/steck.nix b/pkgs/servers/pinnwand/steck.nix index 90f7d6b49f56..8d44f8160d03 100644 --- a/pkgs/servers/pinnwand/steck.nix +++ b/pkgs/servers/pinnwand/steck.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "steck"; - version = "0.6.0"; + version = "0.7.0"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "07gc5iwbyprb8nihnjjl2zd06z8p4nl3a3drzh9a8ny35ig1khq0"; + sha256 = "1a3l427ibwck9zzzy1sp10hmjgminya08i4r9j4559qzy7lxghs1"; }; propagatedBuildInputs = with python3Packages; [ @@ -19,6 +19,9 @@ python3Packages.buildPythonApplication rec { toml ]; + # tests are not in pypi package + doCheck = false; + passthru.tests = nixosTests.pinnwand; meta = with lib; { diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix index 9e60e9f37044..89158838527e 100644 --- a/pkgs/servers/plex/raw.nix +++ b/pkgs/servers/plex/raw.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , dpkg , writeScript @@ -12,16 +12,16 @@ # server, and the FHS userenv and corresponding NixOS module should # automatically pick up the changes. stdenv.mkDerivation rec { - version = "1.21.1.3795-ee64ab56f"; + version = "1.21.1.3842-b0c7a97d9"; pname = "plexmediaserver"; # Fetch the source src = if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb"; - sha256 = "1k4ayb5jygi9g78703r1z4y4m0mp66m6jc72zj4zqk4xckzvjf4f"; + sha256 = "0wq8q9dvdwciazidvh9plxjzngjr6ibg077yksxhy41dv14vkw7s"; } else fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb"; - sha256 = "0qfc5k9sgi465pgrhv8nbm5p7s4wdpaljj54m2i7hfydva8ws8ci"; + sha256 = "14pa50kvgi4m5hbw4a0q7y3s4xn9ghvnm4vdim9g18p1khfmwmwp"; }; outputs = [ "out" "basedb" ]; @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://plex.tv/"; license = licenses.unfree; platforms = [ "x86_64-linux" "aarch64-linux" ]; diff --git a/pkgs/servers/polipo/default.nix b/pkgs/servers/polipo/default.nix index 444705d85d01..10c58cfb9588 100644 --- a/pkgs/servers/polipo/default.nix +++ b/pkgs/servers/polipo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, texinfo }: +{ lib, stdenv, fetchurl, texinfo }: stdenv.mkDerivation rec { pname = "polipo"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ texinfo ]; makeFlags = [ "PREFIX=$(out)" "LOCAL_ROOT=$(out)/share/polipo/www" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.pps.jussieu.fr/~jch/software/polipo/"; description = "A small and fast caching web proxy"; license = licenses.mit; diff --git a/pkgs/servers/pounce/default.nix b/pkgs/servers/pounce/default.nix index 4a55a2c65620..65b1cbc7ddfc 100644 --- a/pkgs/servers/pounce/default.nix +++ b/pkgs/servers/pounce/default.nix @@ -1,4 +1,4 @@ -{ stdenv, libressl, fetchzip, fetchpatch, pkg-config }: +{ lib, stdenv, libressl, fetchzip, fetchpatch, pkg-config }: stdenv.mkDerivation rec { pname = "pounce"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { "PREFIX=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://code.causal.agency/june/pounce"; description = "Simple multi-client TLS-only IRC bouncer"; license = licenses.gpl3; diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index 70a964039fce..625e2e0e8ca5 100644 --- a/pkgs/servers/pulseaudio/default.nix +++ b/pkgs/servers/pulseaudio/default.nix @@ -93,7 +93,8 @@ stdenv.mkDerivation rec { ] ++ lib.optional (jackaudioSupport && !libOnly) "--enable-jack" ++ lib.optional stdenv.isDarwin "--with-mac-sysroot=/" - ++ lib.optional (stdenv.isLinux && useSystemd) "--with-systemduserunitdir=${placeholder "out"}/lib/systemd/user"; + ++ lib.optional (stdenv.isLinux && useSystemd) "--with-systemduserunitdir=${placeholder "out"}/lib/systemd/user" + ++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "--disable-gsettings"; enableParallelBuilding = true; @@ -118,7 +119,7 @@ stdenv.mkDerivation rec { rm -f $out/bin/qpaeq # this is packaged by the "qpaeq" package now, because of missing deps ''; - preFixup = lib.optionalString stdenv.isLinux '' + preFixup = lib.optionalString (stdenv.isLinux && (stdenv.hostPlatform == stdenv.buildPlatform)) '' wrapProgram $out/libexec/pulse/gsettings-helper \ --prefix XDG_DATA_DIRS : "$out/share/gsettings-schemas/${name}" \ --prefix GIO_EXTRA_MODULES : "${lib.getLib dconf}/lib/gio/modules" diff --git a/pkgs/servers/pulseaudio/hsphfpd.nix b/pkgs/servers/pulseaudio/hsphfpd.nix index 9a235434ce32..bcb3934fb7b7 100644 --- a/pkgs/servers/pulseaudio/hsphfpd.nix +++ b/pkgs/servers/pulseaudio/hsphfpd.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, makeWrapper, perlPackages }: +{ lib, stdenv, fetchFromGitHub, makeWrapper, perlPackages }: let perlLibs = with perlPackages; [ NetDBus XMLTwig XMLParser ]; @@ -36,7 +36,7 @@ stdenv.mkDerivation { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Bluetooth HSP/HFP daemon"; homepage = "https://github.com/pali/hsphfpd-prototype"; license = licenses.artistic1; diff --git a/pkgs/servers/quagga/default.nix b/pkgs/servers/quagga/default.nix index 5bff70878d3b..b74950d627ca 100644 --- a/pkgs/servers/quagga/default.nix +++ b/pkgs/servers/quagga/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libcap, libnl, readline, net-snmp, less, perl, texinfo, +{ lib, stdenv, fetchurl, libcap, libnl, readline, net-snmp, less, perl, texinfo, pkgconfig, c-ares }: stdenv.mkDerivation rec { @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Quagga BGP/OSPF/ISIS/RIP/RIPNG routing daemon suite"; longDescription = '' GNU Quagga is free software which manages TCP/IP based routing protocols. diff --git a/pkgs/servers/radarr/default.nix b/pkgs/servers/radarr/default.nix index e39e0bf76470..231b390f326b 100644 --- a/pkgs/servers/radarr/default.nix +++ b/pkgs/servers/radarr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, mono, libmediainfo, sqlite, curl, makeWrapper }: +{ lib, stdenv, fetchurl, mono, libmediainfo, sqlite, curl, makeWrapper }: stdenv.mkDerivation rec { pname = "radarr"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { curl sqlite libmediainfo ]} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A Usenet/BitTorrent movie downloader"; homepage = "https://radarr.video/"; license = licenses.gpl3; diff --git a/pkgs/servers/radicale/1.x.nix b/pkgs/servers/radicale/1.x.nix index 96c94c2bc6b2..6ca821214856 100644 --- a/pkgs/servers/radicale/1.x.nix +++ b/pkgs/servers/radicale/1.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pythonPackages }: +{ lib, stdenv, fetchurl, pythonPackages }: pythonPackages.buildPythonApplication rec { pname = "radicale"; @@ -17,7 +17,7 @@ pythonPackages.buildPythonApplication rec { doCheck = !pythonPackages.isPy3k; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.radicale.org/"; description = "CalDAV CardDAV server"; longDescription = '' diff --git a/pkgs/servers/radicale/2.x.nix b/pkgs/servers/radicale/2.x.nix index 8d36717ec69b..918dad537a53 100644 --- a/pkgs/servers/radicale/2.x.nix +++ b/pkgs/servers/radicale/2.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python3 }: +{ lib, stdenv, fetchFromGitHub, python3 }: python3.pkgs.buildPythonApplication rec { pname = "Radicale"; @@ -30,7 +30,7 @@ python3.pkgs.buildPythonApplication rec { pytest ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.radicale.org/2.x.nix"; description = "CalDAV CardDAV server"; longDescription = '' diff --git a/pkgs/servers/rainloop/default.nix b/pkgs/servers/rainloop/default.nix index 42c68d5608ed..0c149149e159 100644 --- a/pkgs/servers/rainloop/default.nix +++ b/pkgs/servers/rainloop/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, pkgs, dataPath ? "/var/lib/rainloop" }: let +{ lib, stdenv, fetchurl, unzip, pkgs, dataPath ? "/var/lib/rainloop" }: let common = { edition, sha256 }: stdenv.mkDerivation (rec { pname = "rainloop${stdenv.lib.optionalString (edition != "") "-${edition}"}"; @@ -38,7 +38,7 @@ chmod 700 $out/data ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Simple, modern & fast web-based email client"; homepage = "https://www.rainloop.net"; downloadPage = "https://github.com/RainLoop/rainloop-webmail/releases"; diff --git a/pkgs/servers/rippled/default.nix b/pkgs/servers/rippled/default.nix index c95d043106cd..22223f2a27e6 100644 --- a/pkgs/servers/rippled/default.nix +++ b/pkgs/servers/rippled/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchgit, fetchurl, runCommand, git, cmake, pkgconfig +{ lib, stdenv, fetchFromGitHub, fetchgit, fetchurl, runCommand, git, cmake, pkg-config , openssl, zlib, boost, grpc, c-ares, abseil-cpp, protobuf3_8, libnsl }: let @@ -129,7 +129,7 @@ in stdenv.mkDerivation rec { hardeningDisable = ["format"]; cmakeFlags = ["-Dstatic=OFF" "-DBoost_NO_BOOST_CMAKE=ON"]; - nativeBuildInputs = [ pkgconfig cmake git ]; + nativeBuildInputs = [ pkg-config cmake git ]; buildInputs = [ openssl openssl.dev boostSharedStatic zlib grpc c-ares c-ares.cmake-config abseil-cpp protobuf3_8 libnsl ]; preConfigure = '' @@ -157,7 +157,7 @@ in stdenv.mkDerivation rec { ./rippled --unittest ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Ripple P2P payment network reference server"; homepage = "https://github.com/ripple/rippled"; maintainers = with maintainers; [ ehmry offline RaghavSood ]; diff --git a/pkgs/servers/routinator/default.nix b/pkgs/servers/routinator/default.nix index 7cb28c49a50e..e62ad9753806 100644 --- a/pkgs/servers/routinator/default.nix +++ b/pkgs/servers/routinator/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform }: +{ lib, stdenv, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { pname = "routinator"; @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0fcp4b2b0mjddj4blr20gvp1ih3ldzzr04rm1m06i8d2lnl68i79"; - meta = with stdenv.lib; { + meta = with lib; { description = "An RPKI Validator written in Rust"; homepage = "https://github.com/NLnetLabs/routinator"; license = licenses.bsd3; diff --git a/pkgs/servers/rpcbind/default.nix b/pkgs/servers/rpcbind/default.nix index 52197a6afaac..ad18c42858b4 100644 --- a/pkgs/servers/rpcbind/default.nix +++ b/pkgs/servers/rpcbind/default.nix @@ -1,4 +1,4 @@ -{ fetchgit, stdenv, pkgconfig, libnsl, libtirpc, autoreconfHook +{ fetchgit, lib, stdenv, pkgconfig, libnsl, libtirpc, autoreconfHook , useSystemd ? true, systemd }: stdenv.mkDerivation { @@ -26,7 +26,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ autoreconfHook pkgconfig ]; - meta = with stdenv.lib; { + meta = with lib; { description = "ONC RPC portmapper"; license = licenses.bsd3; platforms = platforms.unix; diff --git a/pkgs/servers/rtsp-simple-server/default.nix b/pkgs/servers/rtsp-simple-server/default.nix index 94a15d35489f..d3ec7dc75ee6 100644 --- a/pkgs/servers/rtsp-simple-server/default.nix +++ b/pkgs/servers/rtsp-simple-server/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , buildGoModule }: @@ -23,7 +23,7 @@ buildGoModule rec { "-ldflags=-X main.Version=${version}" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Ready-to-use RTSP server and RTSP proxy that allows to read and publish video and audio streams" ; diff --git a/pkgs/servers/sabnzbd/default.nix b/pkgs/servers/sabnzbd/default.nix index f2cbb2f820cf..d72caf54fc4c 100644 --- a/pkgs/servers/sabnzbd/default.nix +++ b/pkgs/servers/sabnzbd/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , python3 , par2cmdline @@ -41,7 +41,7 @@ in stdenv.mkDerivation rec { wrapProgram $out/bin/sabnzbd --set PATH ${path} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Usenet NZB downloader, par2 repairer and auto extracting server"; homepage = "https://sabnzbd.org"; license = licenses.gpl2Plus; diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index 164604242d86..a665de00cced 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , python , pkgconfig @@ -153,7 +153,7 @@ stdenv.mkDerivation rec { tests.samba = nixosTests.samba; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.samba.org"; description = "The standard Windows interoperability suite of programs for Linux and Unix"; license = licenses.gpl3; diff --git a/pkgs/servers/scylladb/default.nix b/pkgs/servers/scylladb/default.nix index a2671e17cb7a..522d40e070ac 100644 --- a/pkgs/servers/scylladb/default.nix +++ b/pkgs/servers/scylladb/default.nix @@ -1,5 +1,5 @@ { - stdenv, + lib, stdenv, fetchgit, python3Packages, pkgconfig, @@ -91,7 +91,7 @@ gcc8Stdenv.mkDerivation { requiredSystemFeatures = [ "big-parallel" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "NoSQL data store using the seastar framework, compatible with Apache Cassandra"; homepage = "https://scylladb.com"; license = licenses.agpl3; diff --git a/pkgs/servers/search/elasticsearch/plugins.nix b/pkgs/servers/search/elasticsearch/plugins.nix index 846fb33000bb..c51b0d209845 100644 --- a/pkgs/servers/search/elasticsearch/plugins.nix +++ b/pkgs/servers/search/elasticsearch/plugins.nix @@ -40,7 +40,7 @@ in { else if version == "6.8.3" then "0vbaqyj0lfy3ijl1c9h92b0nh605h5mjs57bk2zhycdvbw5sx2lv" else throw "unsupported version ${version} for plugin ${pluginName}"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/elastic/elasticsearch/tree/master/plugins/analysis-icu"; description = "The ICU Analysis plugin integrates the Lucene ICU module into elasticsearch"; license = licenses.asl20; diff --git a/pkgs/servers/search/groonga/default.nix b/pkgs/servers/search/groonga/default.nix index 501533bda54f..8f7e63665b86 100644 --- a/pkgs/servers/search/groonga/default.nix +++ b/pkgs/servers/search/groonga/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, mecab, kytea, libedit, pkgconfig +{ lib, stdenv, fetchurl, mecab, kytea, libedit, pkgconfig , suggestSupport ? false, zeromq, libevent, msgpack , lz4Support ? false, lz4 , zlibSupport ? false, zlib @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { doInstallCheck = true; installCheckPhase = "$out/bin/groonga --version"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://groonga.org/"; description = "An open-source fulltext search engine and column store"; license = licenses.lgpl21; diff --git a/pkgs/servers/search/meilisearch/default.nix b/pkgs/servers/search/meilisearch/default.nix index d6bee327412d..569da6b5b971 100644 --- a/pkgs/servers/search/meilisearch/default.nix +++ b/pkgs/servers/search/meilisearch/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , rustPlatform , fetchFromGitHub , IOKit @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { buildInputs = stdenv.lib.optionals stdenv.isDarwin [ IOKit Security ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Ultra relevant and instant full-text search API"; homepage = "https://meilisearch.com/"; license = licenses.mit; diff --git a/pkgs/servers/search/solr/default.nix b/pkgs/servers/search/solr/default.nix index b5390d1537d2..52bb37a81863 100644 --- a/pkgs/servers/search/solr/default.nix +++ b/pkgs/servers/search/solr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jre, makeWrapper, nixosTests }: +{ lib, stdenv, fetchurl, jre, makeWrapper, nixosTests }: stdenv.mkDerivation rec { pname = "solr"; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { inherit (nixosTests) solr; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://lucene.apache.org/solr/"; description = "Open source enterprise search platform from the Apache Lucene project"; license = licenses.asl20; diff --git a/pkgs/servers/ser2net/default.nix b/pkgs/servers/ser2net/default.nix index 466f07052b8c..bbb40844ae51 100644 --- a/pkgs/servers/ser2net/default.nix +++ b/pkgs/servers/ser2net/default.nix @@ -1,17 +1,33 @@ -{ stdenv, lib, fetchFromGitHub, gensio, libyaml, autoreconfHook, pkgconfig }: +{ autoreconfHook +, fetchFromGitHub +, gensio +, lib +, libyaml +, nix-update-script +, pkg-config +, stdenv +}: stdenv.mkDerivation rec { pname = "ser2net"; - version = "4.2.1"; + version = "4.3.0"; src = fetchFromGitHub { owner = "cminyard"; repo = pname; rev = "v${version}"; - sha256 = "01w82nrgffsfz2c80p4cyppg3bz56d90jm6i6356j0nva3784haw"; + sha256 = "13zhds3zav03f1snc4bb1j07i2x606bmnqm17yx37frib2hjs4nx"; }; - buildInputs = [ pkgconfig autoreconfHook gensio libyaml ]; + passthru = { + updateScript = nix-update-script { + attrPath = pname; + }; + }; + + nativeBuildInputs = [ pkg-config autoreconfHook ]; + + buildInputs = [ gensio libyaml ]; meta = with lib; { description = "Serial to network connection server"; diff --git a/pkgs/servers/serf/default.nix b/pkgs/servers/serf/default.nix index 8129cb5ad8e3..04cd93c5306e 100644 --- a/pkgs/servers/serf/default.nix +++ b/pkgs/servers/serf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "serf"; @@ -14,7 +14,7 @@ buildGoPackage rec { sha256 = "1arakjvhyasrk52vhxas2ghlrby3i3wj59r7sjrkbpln2cdbqnlx"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Tool for service orchestration and management"; homepage = "https://www.serf.io/"; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/servers/serviio/default.nix b/pkgs/servers/serviio/default.nix index 769ed5e72728..f3c8fc2311cc 100644 --- a/pkgs/servers/serviio/default.nix +++ b/pkgs/servers/serviio/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "serviio"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { cp -R config legal lib library plugins LICENCE.txt NOTICE.txt README.txt RELEASE_NOTES.txt $out ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://serviio.org"; description = "UPnP Media Streaming Server"; longDescription = '' diff --git a/pkgs/servers/shairplay/default.nix b/pkgs/servers/shairplay/default.nix index 1c726c477648..655e60060cba 100644 --- a/pkgs/servers/shairplay/default.nix +++ b/pkgs/servers/shairplay/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig , avahi, libao }: stdenv.mkDerivation rec { @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { $out/bin/shairplay ''; - meta = with stdenv.lib; { + meta = with lib; { inherit (src.meta) homepage; description = "Apple AirPlay and RAOP protocol server"; license = licenses.mit; diff --git a/pkgs/servers/shairport-sync/default.nix b/pkgs/servers/shairport-sync/default.nix index a20579371516..108721fceb0e 100644 --- a/pkgs/servers/shairport-sync/default.nix +++ b/pkgs/servers/shairport-sync/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, openssl, avahi, alsaLib +{ lib, stdenv, fetchFromGitHub, autoreconfHook, openssl, avahi, alsaLib , libdaemon, popt, pkgconfig, libconfig, libpulseaudio, soxr }: stdenv.mkDerivation rec { @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { "--sysconfdir=/etc" ]; - meta = with stdenv.lib; { + meta = with lib; { inherit (src.meta) homepage; description = "Airtunes server and emulator with multi-room capabilities"; license = licenses.mit; diff --git a/pkgs/servers/shellinabox/default.nix b/pkgs/servers/shellinabox/default.nix index 279cfa3300be..0240cd5a862c 100644 --- a/pkgs/servers/shellinabox/default.nix +++ b/pkgs/servers/shellinabox/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pam, openssl, openssh, shadow, makeWrapper }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pam, openssl, openssh, shadow, makeWrapper }: stdenv.mkDerivation rec { version = "2.20"; @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { cp shellinabox/* $out/lib ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/shellinabox/shellinabox"; description = "Web based AJAX terminal emulator"; license = licenses.gpl2; diff --git a/pkgs/servers/sickbeard/default.nix b/pkgs/servers/sickbeard/default.nix index 6cca58a175e8..10a5018d7814 100644 --- a/pkgs/servers/sickbeard/default.nix +++ b/pkgs/servers/sickbeard/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python2, makeWrapper }: +{ lib, stdenv, fetchFromGitHub, python2, makeWrapper }: let pythonEnv = python2.withPackages(ps: with ps; [ cheetah ]); @@ -26,7 +26,7 @@ in stdenv.mkDerivation { makeWrapper $out/SickBeard.py $out/bin/sickbeard ''; - meta = with stdenv.lib; { + meta = with lib; { description = "PVR & episode guide that downloads and manages all your TV shows"; license = licenses.gpl3; homepage = "https://github.com/midgetspy/Sick-Beard"; diff --git a/pkgs/servers/sickbeard/sickgear.nix b/pkgs/servers/sickbeard/sickgear.nix index 433cd97f9a7b..48efe7147614 100644 --- a/pkgs/servers/sickbeard/sickgear.nix +++ b/pkgs/servers/sickbeard/sickgear.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python2, makeWrapper }: +{ lib, stdenv, fetchFromGitHub, python2, makeWrapper }: let pythonEnv = python2.withPackages(ps: with ps; [ cheetah ]); @@ -26,7 +26,7 @@ in stdenv.mkDerivation rec { makeWrapper $out/SickBeard.py $out/bin/sickgear ''; - meta = with stdenv.lib; { + meta = with lib; { description = "The most reliable stable TV fork of the great Sick-Beard to fully automate TV enjoyment with innovation"; license = licenses.gpl3; homepage = "https://github.com/SickGear/SickGear"; diff --git a/pkgs/servers/sickbeard/sickrage.nix b/pkgs/servers/sickbeard/sickrage.nix index 9ff44fade822..6b7d3e7b1ca4 100644 --- a/pkgs/servers/sickbeard/sickrage.nix +++ b/pkgs/servers/sickbeard/sickrage.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python2, makeWrapper }: +{ lib, stdenv, fetchFromGitHub, python2, makeWrapper }: python2.pkgs.buildPythonApplication rec { pname = "sickrage"; @@ -24,7 +24,7 @@ python2.pkgs.buildPythonApplication rec { makeWrapper $out/SickBeard.py $out/bin/sickrage ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Automatic Video Library Manager for TV Shows"; longDescription = "It watches for new episodes of your favorite shows, and when they are posted it does its magic."; license = licenses.gpl3; diff --git a/pkgs/servers/simplehttp2server/default.nix b/pkgs/servers/simplehttp2server/default.nix index 58b04b316b34..bc56053515bf 100644 --- a/pkgs/servers/simplehttp2server/default.nix +++ b/pkgs/servers/simplehttp2server/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "simplehttp2server"; @@ -15,7 +15,7 @@ buildGoPackage rec { goDeps = ./deps.nix; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/GoogleChromeLabs/simplehttp2server"; description = "HTTP/2 server for development purposes"; license = licenses.asl20; diff --git a/pkgs/servers/sks/default.nix b/pkgs/servers/sks/default.nix index f6f914b7cbd5..8e0ce6bedac5 100644 --- a/pkgs/servers/sks/default.nix +++ b/pkgs/servers/sks/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromBitbucket, ocaml, zlib, db, perl, camlp4 }: +{ lib, stdenv, fetchFromBitbucket, ocaml, zlib, db, perl, camlp4 }: stdenv.mkDerivation rec { pname = "sks"; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { # Copy the web examples for the NixOS module postInstall = "cp -R sampleWeb $webSamples"; - meta = with stdenv.lib; { + meta = with lib; { description = "An easily deployable & decentralized OpenPGP keyserver"; longDescription = '' SKS is an OpenPGP keyserver whose goal is to provide easy to deploy, diff --git a/pkgs/servers/slimserver/default.nix b/pkgs/servers/slimserver/default.nix index 8be2cc15d4a7..6b83df2496cd 100644 --- a/pkgs/servers/slimserver/default.nix +++ b/pkgs/servers/slimserver/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper +{ lib, stdenv, fetchurl, makeWrapper , perlPackages, flac, faad2, sox, lame, monkeysAudio, wavpack }: perlPackages.buildPerlPackage rec { @@ -14,6 +14,7 @@ perlPackages.buildPerlPackage rec { makeWrapper perlPackages.perl perlPackages.AnyEvent + perlPackages.ArchiveZip perlPackages.AudioScan perlPackages.CarpClan perlPackages.CGI @@ -92,7 +93,7 @@ perlPackages.buildPerlPackage rec { outputs = [ "out" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/Logitech/slimserver"; description = "Server for Logitech Squeezebox players. This server is also called Logitech Media Server"; # the firmware is not under a free license! diff --git a/pkgs/servers/smcroute/default.nix b/pkgs/servers/smcroute/default.nix index b881c6007309..3a332876ffd1 100644 --- a/pkgs/servers/smcroute/default.nix +++ b/pkgs/servers/smcroute/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libcap }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libcap }: stdenv.mkDerivation rec { pname = "smcroute"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { "--with-systemd=\$(out)/lib/systemd/system" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Static multicast routing daemon"; homepage = "https://troglobit.com/smcroute.html"; license = licenses.gpl2Plus; diff --git a/pkgs/servers/softether/4.25.nix b/pkgs/servers/softether/4.25.nix index 65e21010e757..f22bd0859ada 100644 --- a/pkgs/servers/softether/4.25.nix +++ b/pkgs/servers/softether/4.25.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , openssl, readline, ncurses, zlib , dataDir ? "/var/lib/softether" }: @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { Makefile ''; - meta = with stdenv.lib; { + meta = with lib; { description = "An Open-Source Free Cross-platform Multi-protocol VPN Program"; homepage = "https://www.softether.org/"; license = licenses.gpl2; diff --git a/pkgs/servers/softether/4.29.nix b/pkgs/servers/softether/4.29.nix index b1ef8643aa36..83eb3b05b37f 100644 --- a/pkgs/servers/softether/4.29.nix +++ b/pkgs/servers/softether/4.29.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , openssl, readline, ncurses, zlib , dataDir ? "/var/lib/softether" }: @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { Makefile ''; - meta = with stdenv.lib; { + meta = with lib; { description = "An Open-Source Free Cross-platform Multi-protocol VPN Program"; homepage = "https://www.softether.org/"; license = licenses.asl20; diff --git a/pkgs/servers/sozu/default.nix b/pkgs/servers/sozu/default.nix index 137d5b24d18b..c3c839fcc29e 100644 --- a/pkgs/servers/sozu/default.nix +++ b/pkgs/servers/sozu/default.nix @@ -1,4 +1,4 @@ -{ stdenv, rustPlatform, fetchFromGitHub, darwin }: +{ lib, stdenv, rustPlatform, fetchFromGitHub, darwin }: rustPlatform.buildRustPackage rec { pname = "sozu"; @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { buildInputs = stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; - meta = with stdenv.lib; { + meta = with lib; { description = "Open Source HTTP Reverse Proxy built in Rust for Immutable Infrastructures"; homepage = "https://www.sozu.io"; diff --git a/pkgs/servers/sql/cockroachdb/default.nix b/pkgs/servers/sql/cockroachdb/default.nix index ee156e37173a..05d41afa28bd 100644 --- a/pkgs/servers/sql/cockroachdb/default.nix +++ b/pkgs/servers/sql/cockroachdb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchurl +{ lib, stdenv, buildGoPackage, fetchurl , cmake, xz, which, autoconf , ncurses6, libedit, libunwind , installShellFiles @@ -60,7 +60,7 @@ buildGoPackage rec { find $out -type f -exec ${removeReferencesTo}/bin/remove-references-to -t ${go} '{}' + ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.cockroachlabs.com"; description = "A scalable, survivable, strongly-consistent SQL database"; license = licenses.bsl11; diff --git a/pkgs/servers/sql/mariadb/connector-c/default.nix b/pkgs/servers/sql/mariadb/connector-c/default.nix index 8c71514dfba7..6454aa4897e8 100644 --- a/pkgs/servers/sql/mariadb/connector-c/default.nix +++ b/pkgs/servers/sql/mariadb/connector-c/default.nix @@ -42,8 +42,6 @@ stdenv.mkDerivation { propagatedBuildInputs = [ curl openssl zlib ]; buildInputs = [ libiconv ]; - enableParallelBuilding = true; - postInstall = '' moveToOutput bin/mariadb_config "$dev" ''; diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index cbfae1d5e6e5..562b059015fe 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -1,12 +1,11 @@ { stdenv, fetchurl, fetchFromGitHub, cmake, pkgconfig, makeWrapper, ncurses, nixosTests -, libiconv, openssl, pcre, boost, judy, bison, libxml2, libkrb5, linux-pam, curl -, libaio, libevent, jemalloc450, jemalloc, cracklib, systemd, perl +, libiconv, openssl, pcre2, boost, judy, bison, libxml2, libkrb5, linux-pam, curl +, libaio, libevent, jemalloc, cracklib, systemd, perl , bzip2, lz4, lzo, snappy, xz, zlib, zstd , fixDarwinDylibNames, cctools, CoreServices, less , numactl # NUMA Support , withStorageMroonga ? true, kytea, msgpack, zeromq , withStorageRocks ? true -, withStorageToku ? true }: with stdenv.lib; @@ -23,14 +22,14 @@ mariadb = server // { }; common = rec { # attributes common to both builds - version = "10.4.15"; + version = "10.5.8"; src = fetchurl { urls = [ "https://downloads.mariadb.org/f/mariadb-${version}/source/mariadb-${version}.tar.gz" "https://downloads.mariadb.com/MariaDB/mariadb-${version}/source/mariadb-${version}.tar.gz" ]; - sha256 = "0cdfzr768cb7n9ag9gqahr8c6igfn513md67xn4rf98ajmnxg0r7"; + sha256 = "1s3vfm73911cddjhgpcbkya6nz7ag2zygg56qqzwscn5ybv28j7b"; name = "mariadb-${version}.tar.gz"; }; @@ -38,11 +37,10 @@ common = rec { # attributes common to both builds ++ optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; buildInputs = [ - ncurses openssl zlib pcre libiconv curl + ncurses openssl zlib pcre2 libiconv curl ] ++ optionals stdenv.hostPlatform.isLinux [ libaio systemd libkrb5 ] ++ optionals stdenv.hostPlatform.isDarwin [ perl cctools CoreServices ] - ++ optional (!stdenv.hostPlatform.isDarwin && withStorageToku) [ jemalloc450 ] - ++ optional (!stdenv.hostPlatform.isDarwin && !withStorageToku) [ jemalloc ]; + ++ optional (!stdenv.hostPlatform.isDarwin) [ jemalloc ]; prePatch = '' sed -i 's,[^"]*/var/log,/var/log,g' storage/mroonga/vendor/groonga/CMakeLists.txt @@ -100,8 +98,6 @@ common = rec { # attributes common to both builds rm -r $out/share/aclocal ''; - enableParallelBuilding = true; - passthru.mysqlVersion = "5.7"; passthru.tests = { @@ -176,6 +172,7 @@ server = stdenv.mkDerivation (common // { "-DWITH_INNODB_DISALLOW_WRITES=ON" "-DWITHOUT_EXAMPLE=1" "-DWITHOUT_FEDERATED=1" + "-DWITHOUT_TOKUDB=1" ] ++ optional (stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAarch32) [ "-DWITH_NUMA=ON" ] ++ optional (!withStorageMroonga) [ @@ -184,13 +181,12 @@ server = stdenv.mkDerivation (common // { "-DWITHOUT_ROCKSDB=1" ] ++ optional (!stdenv.hostPlatform.isDarwin && withStorageRocks) [ "-DWITH_ROCKSDB_JEMALLOC=ON" - ] ++ optional (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isMusl || !withStorageToku) [ - "-DWITHOUT_TOKUDB=1" - ] ++ optional (!stdenv.hostPlatform.isDarwin && withStorageToku) [ - "-DWITH_JEMALLOC=static" - ] ++ optional stdenv.hostPlatform.isDarwin [ + ] ++ optional (!stdenv.hostPlatform.isDarwin) [ + "-DWITH_JEMALLOC=yes" + ] ++ optionals stdenv.hostPlatform.isDarwin [ "-DPLUGIN_AUTH_PAM=OFF" "-DWITHOUT_OQGRAPH=1" + "-DWITHOUT_PLUGIN_S3=1" ]; preConfigure = optionalString (!stdenv.hostPlatform.isDarwin) '' @@ -200,7 +196,6 @@ server = stdenv.mkDerivation (common // { postInstall = common.postInstall + '' chmod +x "$out"/bin/wsrep_sst_common rm "$out"/bin/{mariadb-client-test,mariadb-test,mysql_client_test,mysqltest} - rm -r "$out"/data # Don't need testing data '' + optionalString withStorageMroonga '' mv "$out"/share/{groonga,groonga-normalizer-mysql} "$out"/share/doc/mysql '' + optionalString (!stdenv.hostPlatform.isDarwin) '' diff --git a/pkgs/servers/sql/mariadb/galera/default.nix b/pkgs/servers/sql/mariadb/galera/default.nix index 14ab75d159b2..7d1c49815e44 100644 --- a/pkgs/servers/sql/mariadb/galera/default.nix +++ b/pkgs/servers/sql/mariadb/galera/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildEnv +{ lib, stdenv, fetchFromGitHub, buildEnv , asio, boost, check, openssl, scons }: @@ -50,7 +50,7 @@ in stdenv.mkDerivation rec { install -m 444 "www.evanjones.ca/LICENSE" "$out/$GALERA_LICENSE_DIR/LICENSE.crc32c" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Galera 3 wsrep provider library"; homepage = "https://galeracluster.com/"; license = licenses.lgpl2; diff --git a/pkgs/servers/sql/monetdb/default.nix b/pkgs/servers/sql/monetdb/default.nix index 04617943e269..ca284330b30a 100644 --- a/pkgs/servers/sql/monetdb/default.nix +++ b/pkgs/servers/sql/monetdb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, python3 +{ lib, stdenv, fetchurl, cmake, python3 , bison, openssl, readline, bzip2 }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake python3 ]; buildInputs = [ bison openssl readline bzip2 ]; - meta = with stdenv.lib; { + meta = with lib; { description = "An open source database system"; homepage = "https://www.monetdb.org/"; license = licenses.mpl20; diff --git a/pkgs/servers/sql/mysql/5.7.x.nix b/pkgs/servers/sql/mysql/5.7.x.nix index 8b489816a50a..bfdacf3444ea 100644 --- a/pkgs/servers/sql/mysql/5.7.x.nix +++ b/pkgs/servers/sql/mysql/5.7.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, bison, pkgconfig +{ lib, stdenv, fetchurl, cmake, bison, pkgconfig , boost, libedit, libevent, lz4, ncurses, openssl, protobuf, readline, zlib, perl , cctools, CoreServices, developer_cmds , libtirpc, rpcsvc-proto @@ -75,7 +75,7 @@ self = stdenv.mkDerivation rec { mysqlVersion = "5.7"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.mysql.com/"; description = "The world's most popular open source database"; platforms = platforms.unix; diff --git a/pkgs/servers/sql/mysql/8.0.x.nix b/pkgs/servers/sql/mysql/8.0.x.nix index 299302b27de0..519ef64bca80 100644 --- a/pkgs/servers/sql/mysql/8.0.x.nix +++ b/pkgs/servers/sql/mysql/8.0.x.nix @@ -1,27 +1,33 @@ { lib, stdenv, fetchurl, bison, cmake, pkgconfig -, boost, icu, libedit, libevent, lz4, ncurses, openssl, protobuf, re2, readline, zlib +, boost, icu, libedit, libevent, lz4, ncurses, openssl, protobuf, re2, readline, zlib, zstd , numactl, perl, cctools, CoreServices, developer_cmds, libtirpc, rpcsvc-proto }: let self = stdenv.mkDerivation rec { pname = "mysql"; - version = "8.0.17"; + version = "8.0.22"; src = fetchurl { url = "https://dev.mysql.com/get/Downloads/MySQL-${self.mysqlVersion}/${pname}-${version}.tar.gz"; - sha256 = "1mjrlxn8vigi69r0r674j2dibdnkaar01ji5965gsyx7k60z7qy6"; + sha256 = "9fd85bb243940ef8234d21384ef421a0962fd4d13406fc1420efa902115ce17a"; }; patches = [ ./abi-check.patch - ./libutils.patch ]; nativeBuildInputs = [ bison cmake pkgconfig rpcsvc-proto ]; + ## NOTE: MySQL upstream frequently twiddles the invocations of libtool. When updating, you might proactively grep for libtool references. + postPatch = '' + substituteInPlace cmake/libutils.cmake --replace /usr/bin/libtool libtool + substituteInPlace cmake/os/Darwin.cmake --replace /usr/bin/libtool libtool + ''; + buildInputs = [ boost icu libedit libevent lz4 ncurses openssl protobuf re2 readline zlib + zstd ] ++ lib.optionals stdenv.isLinux [ numactl libtirpc ] ++ lib.optionals stdenv.isDarwin [ diff --git a/pkgs/servers/sql/mysql/libutils.patch b/pkgs/servers/sql/mysql/libutils.patch deleted file mode 100644 index fa1a35e12f23..000000000000 --- a/pkgs/servers/sql/mysql/libutils.patch +++ /dev/null @@ -1,5 +0,0 @@ ---- a/cmake/libutils.cmake -+++ b/cmake/libutils.cmake -@@ -345 +345 @@ MACRO(MERGE_CONVENIENCE_LIBRARIES) -- COMMAND /usr/bin/libtool -static -o $ -+ COMMAND libtool -static -o $ diff --git a/pkgs/servers/sql/patroni/default.nix b/pkgs/servers/sql/patroni/default.nix index bd06aa2ff7db..682dbe45f7d0 100644 --- a/pkgs/servers/sql/patroni/default.nix +++ b/pkgs/servers/sql/patroni/default.nix @@ -52,6 +52,6 @@ pythonPackages.buildPythonApplication rec { description = "A Template for PostgreSQL HA with ZooKeeper, etcd or Consul"; license = licenses.mit; platforms = platforms.linux; - maintainers = [ maintainers.limeytexan ]; + maintainers = teams.deshaw.members; }; } diff --git a/pkgs/servers/sql/percona/5.6.x.nix b/pkgs/servers/sql/percona/5.6.x.nix index 46913525336f..905a8424e8ef 100644 --- a/pkgs/servers/sql/percona/5.6.x.nix +++ b/pkgs/servers/sql/percona/5.6.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, bison, ncurses, openssl, zlib, libaio, perl }: +{ lib, stdenv, fetchurl, cmake, bison, ncurses, openssl, zlib, libaio, perl }: stdenv.mkDerivation rec { pname = "percona-server"; @@ -9,9 +9,8 @@ stdenv.mkDerivation rec { sha256 = "09qqk02iny7jvngyk6k2j0kk2sspc6gw8sm3i6nn97njbkihi697"; }; - buildInputs = [ cmake bison ncurses openssl zlib libaio perl ]; - - enableParallelBuilding = true; + nativeBuildInputs = [ cmake bison perl ]; + buildInputs = [ ncurses openssl zlib libaio ]; cmakeFlags = [ "-DFEATURE_SET=community" @@ -51,7 +50,7 @@ stdenv.mkDerivation rec { passthru.mysqlVersion = "5.6"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.percona.com"; description = "a free, fully compatible, enhanced, open source drop-in replacement for MySQL that provides superior performance, scalability and instrumentation"; platforms = platforms.linux; diff --git a/pkgs/servers/sql/pgbouncer/default.nix b/pkgs/servers/sql/pgbouncer/default.nix index d72a32746dba..9fa596292a6e 100644 --- a/pkgs/servers/sql/pgbouncer/default.nix +++ b/pkgs/servers/sql/pgbouncer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl, libevent, c-ares, pkg-config }: +{ lib, stdenv, fetchurl, openssl, libevent, c-ares, pkg-config }: stdenv.mkDerivation rec { pname = "pgbouncer"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ libevent openssl c-ares ]; enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://pgbouncer.github.io"; description = "Lightweight connection pooler for PostgreSQL"; license = licenses.isc; diff --git a/pkgs/servers/sql/pgpool/default.nix b/pkgs/servers/sql/pgpool/default.nix index 7c2f3521a085..ad32904ce8a5 100644 --- a/pkgs/servers/sql/pgpool/default.nix +++ b/pkgs/servers/sql/pgpool/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, postgresql, openssl, pam ? null, libmemcached ? null }: +{ lib, stdenv, fetchurl, postgresql, openssl, pam ? null, libmemcached ? null }: stdenv.mkDerivation rec { pname = "pgpool-II"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://pgpool.net/mediawiki/index.php"; description = "A middleware that works between postgresql servers and postgresql clients"; license = licenses.free; diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index ed3fe43faebd..20e3637f40c6 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -13,7 +13,10 @@ let , this, self, newScope, buildEnv # source specification - , version, sha256, psqlSchema + , version, sha256, psqlSchema, + + # for tests + nixosTests, thisAttr }: let atLeast = lib.versionAtLeast version; @@ -142,6 +145,8 @@ let postgresql = this; } this.pkgs; + + tests.postgresql = nixosTests.postgresql-wal-receiver.${thisAttr}; }; meta = with lib; { @@ -191,6 +196,7 @@ in self: { psqlSchema = "9.5"; sha256 = "0an2k4m1da96897hyxlff8p4p63wg4dffwsfg57aib7mp4yzsp06"; this = self.postgresql_9_5; + thisAttr = "postgresql_9_5"; inherit self; }; @@ -199,6 +205,7 @@ in self: { psqlSchema = "9.6"; sha256 = "1dkv916y7vrfbygrfbfvs6y3fxaysnh32i5j88nvcnnl16jcn21x"; this = self.postgresql_9_6; + thisAttr = "postgresql_9_6"; inherit self; }; @@ -207,6 +214,7 @@ in self: { psqlSchema = "10.0"; # should be 10, but changing it is invasive sha256 = "0zhzj9skag1pgqas2rnd217vj41ilaalqna17j47gyngpvhbqmjr"; this = self.postgresql_10; + thisAttr = "postgresql_10"; inherit self; }; @@ -215,6 +223,7 @@ in self: { psqlSchema = "11.1"; # should be 11, but changing it is invasive sha256 = "16bqp6ds37kbwqx7mk5gg3y6gv59wq6xz33iqwxldzk20vwd5rhk"; this = self.postgresql_11; + thisAttr = "postgresql_11"; inherit self; }; @@ -223,6 +232,7 @@ in self: { psqlSchema = "12"; sha256 = "15gzg778da23sbfmy7sqg443f9ny480301lm7i3vay4m3ls2a3dx"; this = self.postgresql_12; + thisAttr = "postgresql_12"; inherit self; }; @@ -231,6 +241,7 @@ in self: { psqlSchema = "13"; sha256 = "07z6zwr58dckaa97yl9ml240z83d1lhgaxw9aq49i8lsp21mqd0j"; this = self.postgresql_13; + thisAttr = "postgresql_13"; inherit self; }; } diff --git a/pkgs/servers/sql/postgresql/ext/age.nix b/pkgs/servers/sql/postgresql/ext/age.nix index 09021317cd13..1017611aeaa9 100644 --- a/pkgs/servers/sql/postgresql/ext/age.nix +++ b/pkgs/servers/sql/postgresql/ext/age.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, bison, flex, postgresql }: +{ lib, stdenv, fetchFromGitHub, bison, flex, postgresql }: stdenv.mkDerivation rec { pname = "age"; @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { ''; }; - meta = with stdenv.lib; { + meta = with 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}"; diff --git a/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix b/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix index 5525fc9f9655..d88d693f073d 100644 --- a/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix +++ b/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, postgresql, protobufc }: +{ lib, stdenv, fetchFromGitHub, postgresql, protobufc }: stdenv.mkDerivation rec { pname = "cstore_fdw"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { cp *.control $out/share/postgresql/extension ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Columnar storage for PostgreSQL"; homepage = "https://www.citusdata.com/"; maintainers = with maintainers; [ thoughtpolice ]; diff --git a/pkgs/servers/sql/postgresql/ext/periods.nix b/pkgs/servers/sql/postgresql/ext/periods.nix index c2277019f89b..4d1d3326457f 100644 --- a/pkgs/servers/sql/postgresql/ext/periods.nix +++ b/pkgs/servers/sql/postgresql/ext/periods.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, postgresql }: +{ lib, stdenv, fetchFromGitHub, postgresql }: stdenv.mkDerivation rec { pname = "periods"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { install -D -t $out/share/postgresql/extension *.control ''; - meta = with stdenv.lib; { + meta = with lib; { description = "PostgreSQL extension implementing SQL standard functionality for PERIODs and SYSTEM VERSIONING"; homepage = "https://github.com/xocolatl/periods"; maintainers = with maintainers; [ ivan ]; diff --git a/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix b/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix index 14cdb3ba8f80..99a81f875484 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, postgresql, openssl, zlib, readline }: +{ lib, stdenv, fetchFromGitHub, postgresql, openssl, zlib, readline }: stdenv.mkDerivation rec { pname = "pg_auto_failover"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { install -D -t $out/share/postgresql/extension src/monitor/pgautofailover.control ''; - meta = with stdenv.lib; { + meta = with lib; { description = "PostgreSQL extension and service for automated failover and high-availability"; homepage = "https://github.com/citusdata/pg_auto_failover"; maintainers = [ maintainers.marsam ]; diff --git a/pkgs/servers/sql/postgresql/ext/pg_bigm.nix b/pkgs/servers/sql/postgresql/ext/pg_bigm.nix index 055d1de3c788..a1077a42ac22 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_bigm.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_bigm.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, postgresql }: +{ lib, stdenv, fetchurl, postgresql }: stdenv.mkDerivation rec { pname = "pg_bigm"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { cp *.control $out/share/postgresql/extension ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Text similarity measurement and index searching based on bigrams"; homepage = "https://pgbigm.osdn.jp/"; maintainers = [ maintainers.marsam ]; diff --git a/pkgs/servers/sql/postgresql/ext/pg_cron.nix b/pkgs/servers/sql/postgresql/ext/pg_cron.nix index 1d791c3a0725..c1aefa1770ff 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_cron.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_cron.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, postgresql }: +{ lib, stdenv, fetchFromGitHub, postgresql }: stdenv.mkDerivation rec { pname = "pg_cron"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { cp *.control $out/share/postgresql/extension ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Run Cron jobs through PostgreSQL"; homepage = "https://github.com/citusdata/pg_cron"; maintainers = with maintainers; [ thoughtpolice ]; diff --git a/pkgs/servers/sql/postgresql/ext/pg_ed25519.nix b/pkgs/servers/sql/postgresql/ext/pg_ed25519.nix index 95d45b2663d9..d3ff2a56e3a8 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_ed25519.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_ed25519.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, postgresql }: +{ lib, stdenv, fetchurl, postgresql }: stdenv.mkDerivation rec { pname = "pg_ed25519"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { cp *.control $out/share/postgresql/extension ''; - meta = with stdenv.lib; { + meta = with lib; { description = "PostgreSQL extension for signing and verifying ed25519 signatures"; homepage = "https://gitlab.com/dwagin/pg_ed25519"; maintainers = [ maintainers.renzo ]; diff --git a/pkgs/servers/sql/postgresql/ext/pg_hll.nix b/pkgs/servers/sql/postgresql/ext/pg_hll.nix index ab80cd1748c5..4689f176188c 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_hll.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_hll.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, postgresql }: +{ lib, stdenv, fetchFromGitHub, postgresql }: stdenv.mkDerivation rec { pname = "pg_hll"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { cp *.control $out/share/postgresql/extension ''; - meta = with stdenv.lib; { + meta = with lib; { description = "HyperLogLog for PostgreSQL"; homepage = "https://github.com/citusdata/postgresql-hll"; changelog = "https://github.com/citusdata/postgresql-hll/blob/v${version}/CHANGELOG.md"; diff --git a/pkgs/servers/sql/postgresql/ext/pg_partman.nix b/pkgs/servers/sql/postgresql/ext/pg_partman.nix index 9a289919558c..d0bc8435c3e3 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_partman.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_partman.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, postgresql }: +{ lib, stdenv, fetchFromGitHub, postgresql }: stdenv.mkDerivation rec { pname = "pg_partman"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { cp *.control $out/share/postgresql/extension ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Partition management extension for PostgreSQL"; homepage = "https://github.com/pgpartman/pg_partman"; maintainers = with maintainers; [ ggpeti ]; diff --git a/pkgs/servers/sql/postgresql/ext/pg_repack.nix b/pkgs/servers/sql/postgresql/ext/pg_repack.nix index f197bef5463c..ecc4000f5f6b 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_repack.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_repack.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, postgresql, openssl, zlib, readline }: +{ lib, stdenv, fetchFromGitHub, postgresql, openssl, zlib, readline }: stdenv.mkDerivation rec { pname = "pg_repack"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { install -D lib/{pg_repack--${version}.sql,pg_repack.control} -t $out/share/postgresql/extension ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Reorganize tables in PostgreSQL databases with minimal locks"; longDescription = '' pg_repack is a PostgreSQL extension which lets you remove bloat from tables and indexes, and optionally restore diff --git a/pkgs/servers/sql/postgresql/ext/pg_safeupdate.nix b/pkgs/servers/sql/postgresql/ext/pg_safeupdate.nix index b835141e2ca7..b2a58b6bc3e4 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_safeupdate.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_safeupdate.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, postgresql }: +{ lib, stdenv, fetchFromGitHub, postgresql }: stdenv.mkDerivation rec { pname = "pg-safeupdate"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { install -D safeupdate.so -t $out/lib ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A simple extension to PostgreSQL that requires criteria for UPDATE and DELETE"; homepage = "https://github.com/eradman/pg-safeupdate"; platforms = postgresql.meta.platforms; diff --git a/pkgs/servers/sql/postgresql/ext/pg_topn.nix b/pkgs/servers/sql/postgresql/ext/pg_topn.nix index 03d571c03ba6..eb0965a33781 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_topn.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_topn.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, postgresql }: +{ lib, stdenv, fetchFromGitHub, postgresql }: stdenv.mkDerivation rec { pname = "pg_topn"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { cp *.control $out/share/postgresql/extension ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Efficient querying of 'top values' for PostgreSQL"; homepage = "https://github.com/citusdata/postgresql-topn"; changelog = "https://github.com/citusdata/postgresql-topn/blob/v${version}/CHANGELOG.md"; diff --git a/pkgs/servers/sql/postgresql/ext/pgjwt.nix b/pkgs/servers/sql/postgresql/ext/pgjwt.nix index 9576c4186118..b89ac1725008 100644 --- a/pkgs/servers/sql/postgresql/ext/pgjwt.nix +++ b/pkgs/servers/sql/postgresql/ext/pgjwt.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, postgresql }: +{ lib, stdenv, fetchFromGitHub, postgresql }: stdenv.mkDerivation { pname = "pgjwt"; @@ -17,7 +17,7 @@ stdenv.mkDerivation { cp pg*sql *.control $out/share/postgresql/extension ''; - meta = with stdenv.lib; { + meta = with lib; { description = "PostgreSQL implementation of JSON Web Tokens"; longDescription = '' sign() and verify() functions to create and verify JSON Web Tokens. diff --git a/pkgs/servers/sql/postgresql/ext/pgroonga.nix b/pkgs/servers/sql/postgresql/ext/pgroonga.nix index 05fc6c5ca6a9..50fb383dabb8 100644 --- a/pkgs/servers/sql/postgresql/ext/pgroonga.nix +++ b/pkgs/servers/sql/postgresql/ext/pgroonga.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, postgresql, msgpack, groonga }: +{ lib, stdenv, fetchurl, pkgconfig, postgresql, msgpack, groonga }: stdenv.mkDerivation rec { pname = "pgroonga"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { install -D ./{pgroonga-*.sql,pgroonga.control} -t $out/share/postgresql/extension ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A PostgreSQL extension to use Groonga as the index"; longDescription = '' PGroonga is a PostgreSQL extension to use Groonga as the index. diff --git a/pkgs/servers/sql/postgresql/ext/pgrouting.nix b/pkgs/servers/sql/postgresql/ext/pgrouting.nix index 9863b2276d11..c51ef153444f 100644 --- a/pkgs/servers/sql/postgresql/ext/pgrouting.nix +++ b/pkgs/servers/sql/postgresql/ext/pgrouting.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, postgresql, perl, cmake, boost }: +{ lib, stdenv, fetchFromGitHub, postgresql, perl, cmake, boost }: stdenv.mkDerivation rec { pname = "pgrouting"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { install -D sql/common/pgrouting.control -t $out/share/postgresql/extension ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A PostgreSQL/PostGIS extension that provides geospatial routing functionality"; homepage = "https://pgrouting.org/"; changelog = "https://github.com/pgRouting/pgrouting/releases/tag/v${version}"; diff --git a/pkgs/servers/sql/postgresql/ext/pgtap.nix b/pkgs/servers/sql/postgresql/ext/pgtap.nix index 69f46ba3e905..396e743e70b4 100644 --- a/pkgs/servers/sql/postgresql/ext/pgtap.nix +++ b/pkgs/servers/sql/postgresql/ext/pgtap.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, postgresql, perl, perlPackages, which }: +{ lib, stdenv, fetchFromGitHub, postgresql, perl, perlPackages, which }: stdenv.mkDerivation rec { pname = "pgtap"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { install -D {sql/pgtap--${version}.sql,pgtap.control} -t $out/share/postgresql/extension ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A unit testing framework for PostgreSQL"; longDescription = '' pgTAP is a unit testing framework for PostgreSQL written in PL/pgSQL and PL/SQL. diff --git a/pkgs/servers/sql/postgresql/ext/pipelinedb.nix b/pkgs/servers/sql/postgresql/ext/pipelinedb.nix index 3bca35095c4c..d909761cb5ea 100644 --- a/pkgs/servers/sql/postgresql/ext/pipelinedb.nix +++ b/pkgs/servers/sql/postgresql/ext/pipelinedb.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, postgresql, zeromq, openssl }: +{ lib, stdenv, fetchFromGitHub, postgresql, zeromq, openssl }: stdenv.mkDerivation rec { pname = "pipelinedb"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { install -D -t $out/share/postgresql/extension {pipelinedb-*.sql,pipelinedb.control} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "High-performance time-series aggregation for PostgreSQL"; homepage = "https://www.pipelinedb.com/"; license = licenses.asl20; diff --git a/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix b/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix index 665cb1dc0693..5ce32177d51b 100644 --- a/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix +++ b/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, postgresql }: +{ lib, stdenv, fetchFromGitHub, postgresql }: stdenv.mkDerivation rec { pname = "plpgsql_check"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { install -D -t $out/share/postgresql/extension *.control ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Linter tool for language PL/pgSQL"; homepage = "https://github.com/okbob/plpgsql_check"; platforms = postgresql.meta.platforms; diff --git a/pkgs/servers/sql/postgresql/ext/plv8.nix b/pkgs/servers/sql/postgresql/ext/plv8.nix index 8186e9128d9b..a546c3a687f4 100644 --- a/pkgs/servers/sql/postgresql/ext/plv8.nix +++ b/pkgs/servers/sql/postgresql/ext/plv8.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, v8, perl, postgresql }: +{ lib, stdenv, fetchFromGitHub, v8, perl, postgresql }: stdenv.mkDerivation rec { pname = "plv8"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { install -D {plls,plcoffee,plv8}{--${version}.sql,.control} -t $out/share/postgresql/extension ''; - meta = with stdenv.lib; { + meta = with lib; { description = "V8 Engine Javascript Procedural Language add-on for PostgreSQL"; homepage = "https://plv8.github.io/"; maintainers = with maintainers; [ volth marsam ]; diff --git a/pkgs/servers/sql/postgresql/ext/postgis.nix b/pkgs/servers/sql/postgresql/ext/postgis.nix index fdf4b40d3b06..e9c9a24ae367 100644 --- a/pkgs/servers/sql/postgresql/ext/postgis.nix +++ b/pkgs/servers/sql/postgresql/ext/postgis.nix @@ -1,5 +1,5 @@ { fetchurl -, stdenv +, lib, stdenv , perl , libxml2 , postgresql @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { passthru.tests.postgis = nixosTests.postgis; - meta = with stdenv.lib; { + meta = with lib; { description = "Geographic Objects for PostgreSQL"; homepage = "https://postgis.net/"; changelog = "https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${version}/NEWS"; diff --git a/pkgs/servers/sql/postgresql/ext/repmgr.nix b/pkgs/servers/sql/postgresql/ext/repmgr.nix index a2e319170bd4..ceb9cc9d8af2 100644 --- a/pkgs/servers/sql/postgresql/ext/repmgr.nix +++ b/pkgs/servers/sql/postgresql/ext/repmgr.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , postgresql , openssl , zlib @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { cp *.control $out/share/postgresql/extension ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://repmgr.org/"; description = "Replication manager for PostgreSQL cluster"; license = licenses.postgresql; diff --git a/pkgs/servers/sql/postgresql/ext/smlar.nix b/pkgs/servers/sql/postgresql/ext/smlar.nix index adefe085a0bb..fdb2f7395c83 100644 --- a/pkgs/servers/sql/postgresql/ext/smlar.nix +++ b/pkgs/servers/sql/postgresql/ext/smlar.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, postgresql }: +{ lib, stdenv, fetchgit, postgresql }: stdenv.mkDerivation rec { pname = "smlar-unstable"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { install -D -t $out/share/postgresql/extension *.control ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Compute similary of any one-dimensional arrays"; homepage = "http://sigaev.ru/git/gitweb.cgi?p=smlar.git"; platforms = postgresql.meta.platforms; diff --git a/pkgs/servers/sql/postgresql/ext/tds_fdw.nix b/pkgs/servers/sql/postgresql/ext/tds_fdw.nix index 478b27b74f16..19331f350c55 100644 --- a/pkgs/servers/sql/postgresql/ext/tds_fdw.nix +++ b/pkgs/servers/sql/postgresql/ext/tds_fdw.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, postgresql, freetds }: +{ lib, stdenv, fetchFromGitHub, postgresql, freetds }: stdenv.mkDerivation rec { pname = "tds_fdw"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { install -D tds_fdw.control -t $out/share/postgresql/extension ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A PostgreSQL foreign data wrapper to connect to TDS databases (Sybase and Microsoft SQL Server)"; homepage = "https://github.com/tds-fdw/tds_fdw"; maintainers = [ maintainers.steve-chavez ]; diff --git a/pkgs/servers/sql/postgresql/ext/temporal_tables.nix b/pkgs/servers/sql/postgresql/ext/temporal_tables.nix index eaf63fcba6e9..a2c3fe0e390d 100644 --- a/pkgs/servers/sql/postgresql/ext/temporal_tables.nix +++ b/pkgs/servers/sql/postgresql/ext/temporal_tables.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, postgresql }: +{ lib, stdenv, fetchFromGitHub, postgresql }: stdenv.mkDerivation rec { pname = "temporal_tables"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { cp *.control $out/share/postgresql/extension ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Temporal Tables PostgreSQL Extension "; homepage = "https://github.com/mlt/temporal_tables"; maintainers = with maintainers; [ ggpeti ]; diff --git a/pkgs/servers/sql/postgresql/ext/timescaledb.nix b/pkgs/servers/sql/postgresql/ext/timescaledb.nix index 76619b83c142..abde49542f1a 100644 --- a/pkgs/servers/sql/postgresql/ext/timescaledb.nix +++ b/pkgs/servers/sql/postgresql/ext/timescaledb.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, postgresql, openssl }: +{ lib, stdenv, fetchFromGitHub, cmake, postgresql, openssl }: # # To enable on NixOS: # config.services.postgresql = { @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { pname = "timescaledb"; - version = "1.7.4"; + version = "2.0.0"; nativeBuildInputs = [ cmake ]; buildInputs = [ postgresql openssl ]; @@ -17,10 +17,11 @@ stdenv.mkDerivation rec { owner = "timescale"; repo = "timescaledb"; rev = "refs/tags/${version}"; - sha256 = "0w0sl5izwic3j1k94xhky2y4wkd8l18m5hcknj5vqxq3ryhxaszc"; + sha256 = "0id1h46490mjqp8ijhv2qswpdli2nh2z15mgh6gfc2wl3bhwhi1g"; }; - cmakeFlags = [ "-DSEND_TELEMETRY_DEFAULT=OFF" "-DREGRESS_CHECKS=OFF" ]; + # -DWARNINGS_AS_ERRORS=OFF to be removed once https://github.com/timescale/timescaledb/issues/2770 is fixed in upstream + cmakeFlags = [ "-DSEND_TELEMETRY_DEFAULT=OFF" "-DREGRESS_CHECKS=OFF" "-DWARNINGS_AS_ERRORS=OFF" ]; # Fix the install phase which tries to install into the pgsql extension dir, # and cannot be manually overridden. This is rather fragile but works OK. @@ -36,7 +37,7 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Scales PostgreSQL for time-series data via automatic partitioning across time and space"; homepage = "https://www.timescale.com/"; maintainers = with maintainers; [ volth marsam ]; diff --git a/pkgs/servers/sql/postgresql/ext/tsearch_extras.nix b/pkgs/servers/sql/postgresql/ext/tsearch_extras.nix index f05fa6312d8f..f94bb69871cb 100644 --- a/pkgs/servers/sql/postgresql/ext/tsearch_extras.nix +++ b/pkgs/servers/sql/postgresql/ext/tsearch_extras.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, postgresql }: +{ lib, stdenv, fetchFromGitHub, pkgconfig, postgresql }: stdenv.mkDerivation { pname = "tsearch-extras"; @@ -19,7 +19,7 @@ stdenv.mkDerivation { install -D ./{tsearch_extras--1.0.sql,tsearch_extras.control} -t $out/share/postgresql/extension ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Provides a few PostgreSQL functions for a lower-level data full text search"; homepage = "https://github.com/zulip/tsearch_extras/"; license = licenses.postgresql; diff --git a/pkgs/servers/sql/sqlite/jdbc/default.nix b/pkgs/servers/sql/sqlite/jdbc/default.nix index f5444bb06836..01a9d5fa2e23 100644 --- a/pkgs/servers/sql/sqlite/jdbc/default.nix +++ b/pkgs/servers/sql/sqlite/jdbc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchMavenArtifact }: +{ lib, stdenv, fetchMavenArtifact }: stdenv.mkDerivation rec { pname = "sqlite-jdbc"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { install -m444 -D ${src}/share/java/*${pname}-${version}.jar "$out/share/java/${pname}-${version}.jar" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/xerial/sqlite-jdbc"; description = "Library for accessing and creating SQLite database files in Java"; license = licenses.asl20; diff --git a/pkgs/servers/sql/virtuoso/6.x.nix b/pkgs/servers/sql/virtuoso/6.x.nix index efd8cd02a15b..4737c0a38942 100644 --- a/pkgs/servers/sql/virtuoso/6.x.nix +++ b/pkgs/servers/sql/virtuoso/6.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libxml2, openssl, readline, gawk }: +{ lib, stdenv, fetchurl, libxml2, openssl, readline, gawk }: stdenv.mkDerivation rec { name = "virtuoso-opensource-6.1.6"; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "SQL/RDF database used by, e.g., KDE-nepomuk"; homepage = "http://virtuoso.openlinksw.com/dataspace/dav/wiki/Main/"; platforms = platforms.linux; diff --git a/pkgs/servers/sql/virtuoso/7.x.nix b/pkgs/servers/sql/virtuoso/7.x.nix index bca1aae82e51..a27cd249f1ce 100644 --- a/pkgs/servers/sql/virtuoso/7.x.nix +++ b/pkgs/servers/sql/virtuoso/7.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libxml2, openssl, readline, gawk }: +{ lib, stdenv, fetchurl, libxml2, openssl, readline, gawk }: stdenv.mkDerivation rec { name = "virtuoso-opensource-7.2.4.2"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { find $out -name "*.a" -delete -o -name "*.jar" -delete -o -type d -empty -delete ''; - meta = with stdenv.lib; { + meta = with lib; { description = "SQL/RDF database used by, e.g., KDE-nepomuk"; homepage = "http://virtuoso.openlinksw.com/dataspace/dav/wiki/Main/"; #configure: The current version [...] can only be built on 64bit platforms diff --git a/pkgs/servers/squid/default.nix b/pkgs/servers/squid/default.nix index ad7d534103cf..09507aaef2a0 100644 --- a/pkgs/servers/squid/default.nix +++ b/pkgs/servers/squid/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, openldap, pam, db, cyrus_sasl, libcap +{ lib, stdenv, fetchurl, perl, openldap, pam, db, cyrus_sasl, libcap , expat, libxml2, openssl, pkgconfig }: @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { "--enable-x-accelerator-vary" ] ++ stdenv.lib.optional (stdenv.isLinux && !stdenv.hostPlatform.isMusl) "--enable-linux-netfilter"; - meta = with stdenv.lib; { + meta = with lib; { description = "A caching proxy for the Web supporting HTTP, HTTPS, FTP, and more"; homepage = "http://www.squid-cache.org"; license = licenses.gpl2; diff --git a/pkgs/servers/sslh/default.nix b/pkgs/servers/sslh/default.nix index 578d280afd9a..e7637e26f14a 100644 --- a/pkgs/servers/sslh/default.nix +++ b/pkgs/servers/sslh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libcap, libconfig, perl, tcp_wrappers, pcre, nixosTests }: +{ lib, stdenv, fetchurl, libcap, libconfig, perl, tcp_wrappers, pcre, nixosTests }: stdenv.mkDerivation rec { pname = "sslh"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { inherit (nixosTests) sslh; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Applicative Protocol Multiplexer (e.g. share SSH and HTTPS on the same port)"; license = licenses.gpl2Plus; homepage = "https://www.rutschle.net/tech/sslh/README.html"; diff --git a/pkgs/servers/tacacsplus/default.nix b/pkgs/servers/tacacsplus/default.nix index 296b79f0a444..9acba4631025 100644 --- a/pkgs/servers/tacacsplus/default.nix +++ b/pkgs/servers/tacacsplus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, tcp_wrappers, flex, bison, perl, libnsl }: +{ lib, stdenv, fetchurl, tcp_wrappers, flex, bison, perl, libnsl }: stdenv.mkDerivation rec { pname = "tacacsplus"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ flex bison ]; buildInputs = [ tcp_wrappers perl libnsl ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A protocol for authentication, authorization and accounting (AAA) services for routers and network devices"; homepage = "http://www.shrubbery.net/tac_plus/"; license = licenses.free; diff --git a/pkgs/servers/tarssh/default.nix b/pkgs/servers/tarssh/default.nix index 4e9ef3e0b588..bb353dda9289 100644 --- a/pkgs/servers/tarssh/default.nix +++ b/pkgs/servers/tarssh/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, rustPlatform, stdenv }: +{ fetchFromGitHub, rustPlatform, lib, stdenv }: with rustPlatform; @@ -15,7 +15,7 @@ buildRustPackage rec { cargoSha256 = "1f3anrh2y8yg7l4nilwk0a7c7kq5yvg07cqh75igjdb5a7p9di0j"; - meta = with stdenv.lib; { + meta = with lib; { description = "A simple SSH tarpit inspired by endlessh"; homepage = "https://github.com/Freaky/tarssh"; license = [ licenses.mit ]; diff --git a/pkgs/servers/tegola/default.nix b/pkgs/servers/tegola/default.nix index ec049c6b0101..c18bf17a7c7c 100644 --- a/pkgs/servers/tegola/default.nix +++ b/pkgs/servers/tegola/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "tegola"; @@ -17,7 +17,7 @@ buildGoPackage rec { excludedPackages = [ "example" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.tegola.io/"; description = "Mapbox Vector Tile server"; maintainers = with maintainers; [ ingenieroariel ]; diff --git a/pkgs/servers/tmate-ssh-server/default.nix b/pkgs/servers/tmate-ssh-server/default.nix index ca188ee951d9..6fe5bc201f9b 100644 --- a/pkgs/servers/tmate-ssh-server/default.nix +++ b/pkgs/servers/tmate-ssh-server/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, cmake, libtool, pkgconfig +{ lib, stdenv, fetchFromGitHub, autoreconfHook, cmake, libtool, pkgconfig , zlib, openssl, libevent, ncurses, ruby, msgpack, libssh }: stdenv.mkDerivation rec { @@ -16,9 +16,8 @@ stdenv.mkDerivation rec { buildInputs = [ libtool zlib openssl libevent ncurses ruby msgpack libssh ]; nativeBuildInputs = [ autoreconfHook cmake pkgconfig ]; - enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://tmate.io/"; description = "tmate SSH Server"; license = licenses.mit; diff --git a/pkgs/servers/traefik/default.nix b/pkgs/servers/traefik/default.nix index 9c576dd2bdfd..4ef454d6b561 100644 --- a/pkgs/servers/traefik/default.nix +++ b/pkgs/servers/traefik/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, buildGoModule, go-bindata, nixosTests }: +{ lib, stdenv, fetchzip, buildGoModule, go-bindata, nixosTests }: buildGoModule rec { pname = "traefik"; @@ -30,7 +30,7 @@ buildGoModule rec { -X github.com/traefik/traefik/v2/pkg/version.Codename=$CODENAME") ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://traefik.io"; description = "A modern reverse proxy"; license = licenses.mit; diff --git a/pkgs/servers/trezord/default.nix b/pkgs/servers/trezord/default.nix index b89abfc6153b..03ff9f32fa51 100644 --- a/pkgs/servers/trezord/default.nix +++ b/pkgs/servers/trezord/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildGoModule , fetchFromGitHub , trezor-udev-rules @@ -19,7 +19,7 @@ buildGoModule rec { propagatedBuildInputs = [ trezor-udev-rules ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Trezor Communication Daemon aka Trezor Bridge"; homepage = "https://trezor.io"; license = licenses.lgpl3; diff --git a/pkgs/servers/trickster/trickster.nix b/pkgs/servers/trickster/trickster.nix index cb8c87aa611a..b99375dbb3d0 100644 --- a/pkgs/servers/trickster/trickster.nix +++ b/pkgs/servers/trickster/trickster.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "trickster"; @@ -17,7 +17,7 @@ buildGoPackage rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Reverse proxy cache for the Prometheus HTTP APIv1"; homepage = "https://github.com/Comcast/trickster"; license = licenses.asl20; diff --git a/pkgs/servers/tt-rss/default.nix b/pkgs/servers/tt-rss/default.nix index 4478c4ab8d7d..95b895b281bb 100644 --- a/pkgs/servers/tt-rss/default.nix +++ b/pkgs/servers/tt-rss/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "tt-rss"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { cp -ra * $out/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Web-based news feed (RSS/Atom) aggregator"; license = licenses.gpl2Plus; homepage = "https://tt-rss.org"; diff --git a/pkgs/servers/tt-rss/plugin-auth-ldap/default.nix b/pkgs/servers/tt-rss/plugin-auth-ldap/default.nix index 14e6eaa77ae3..d48db311ea10 100644 --- a/pkgs/servers/tt-rss/plugin-auth-ldap/default.nix +++ b/pkgs/servers/tt-rss/plugin-auth-ldap/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch }: +{ lib, stdenv, fetchFromGitHub, fetchpatch }: stdenv.mkDerivation rec { pname = "tt-rss-plugin-auth-ldap"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { install -D plugins/auth_ldap/init.php $out/auth_ldap/init.php ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Plugin for TT-RSS to authenticate users via ldap"; license = licenses.asl20; homepage = "https://github.com/hydrian/TTRSS-Auth-LDAP"; diff --git a/pkgs/servers/tt-rss/plugin-ff-instagram/default.nix b/pkgs/servers/tt-rss/plugin-ff-instagram/default.nix index fd6ca9909470..375726a4692e 100644 --- a/pkgs/servers/tt-rss/plugin-ff-instagram/default.nix +++ b/pkgs/servers/tt-rss/plugin-ff-instagram/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ... }: stdenv.mkDerivation { +{ lib, stdenv, fetchFromGitHub, ... }: stdenv.mkDerivation { pname = "tt-rss-plugin-ff-instagram"; version = "git-2019-01-10"; # No release, see https://github.com/wltb/ff_instagram/issues/6 @@ -15,7 +15,7 @@ cp *.php $out/ff_instagram ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Plugin for Tiny Tiny RSS that allows to fetch posts from Instagram user sites"; longDescription = '' Plugin for Tiny Tiny RSS that allows to fetch posts from Instagram user sites. diff --git a/pkgs/servers/tt-rss/plugin-tumblr-gdpr/default.nix b/pkgs/servers/tt-rss/plugin-tumblr-gdpr/default.nix index a6f47c1ccbf9..987a6d8aaa67 100644 --- a/pkgs/servers/tt-rss/plugin-tumblr-gdpr/default.nix +++ b/pkgs/servers/tt-rss/plugin-tumblr-gdpr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ... }: stdenv.mkDerivation rec { +{ lib, stdenv, fetchFromGitHub, ... }: stdenv.mkDerivation rec { pname = "tt-rss-plugin-tumblr-gdpr"; version = "2.1"; @@ -15,7 +15,7 @@ cp init.php $out/tumblr_gdpr ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Plugin for TT-RSS to workaround GDPR in Europe"; longDescription = '' Plugin for TT-RSS to workaround GDPR in Europe. diff --git a/pkgs/servers/tt-rss/theme-feedly/default.nix b/pkgs/servers/tt-rss/theme-feedly/default.nix index 1f47f5b2226b..41f47ca4a4ec 100644 --- a/pkgs/servers/tt-rss/theme-feedly/default.nix +++ b/pkgs/servers/tt-rss/theme-feedly/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "tt-rss-theme-feedly"; version = "2.5.0"; @@ -17,7 +17,7 @@ cp -ra feedly *.css $out ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Feedly theme for Tiny Tiny RSS"; license = licenses.wtfpl; homepage = "https://github.com/levito/tt-rss-feedly-theme"; diff --git a/pkgs/servers/ttyd/default.nix b/pkgs/servers/ttyd/default.nix index ef830710c1cf..d5e4d607f72e 100644 --- a/pkgs/servers/ttyd/default.nix +++ b/pkgs/servers/ttyd/default.nix @@ -17,7 +17,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig cmake xxd ]; buildInputs = [ openssl libwebsockets json_c libuv zlib ]; - enableParallelBuilding = true; outputs = [ "out" "man" ]; diff --git a/pkgs/servers/tvheadend/default.nix b/pkgs/servers/tvheadend/default.nix index f4c3270bf3df..0276f5aca0a6 100644 --- a/pkgs/servers/tvheadend/default.nix +++ b/pkgs/servers/tvheadend/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, makeWrapper, pkgconfig +{ lib, stdenv, fetchFromGitHub, cmake, makeWrapper, pkgconfig , avahi, dbus, gettext, git, gnutar, gzip, bzip2, ffmpeg_3, libiconv, openssl, python , v4l-utils, which, zlib }: @@ -35,8 +35,6 @@ in stdenv.mkDerivation { nativeBuildInputs = [ cmake makeWrapper pkgconfig ]; - enableParallelBuilding = true; - NIX_CFLAGS_COMPILE = [ "-Wno-error=format-truncation" "-Wno-error=stringop-truncation" ]; # disable dvbscan, as having it enabled causes a network download which @@ -70,12 +68,12 @@ in stdenv.mkDerivation { --prefix PATH : ${stdenv.lib.makeBinPath [ bzip2 ]} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "TV streaming server"; longDescription = '' - Tvheadend is a TV streaming server and recorder for Linux, FreeBSD and Android + Tvheadend is a TV streaming server and recorder for Linux, FreeBSD and Android supporting DVB-S, DVB-S2, DVB-C, DVB-T, ATSC, IPTV, SAT>IP and HDHomeRun as input sources. - Tvheadend offers the HTTP (VLC, MPlayer), HTSP (Kodi, Movian) and SAT>IP streaming.''; + Tvheadend offers the HTTP (VLC, MPlayer), HTSP (Kodi, Movian) and SAT>IP streaming.''; homepage = "https://tvheadend.org"; license = licenses.gpl3; platforms = platforms.unix; diff --git a/pkgs/servers/u9fs/default.nix b/pkgs/servers/u9fs/default.nix index 97745b77ad2f..60dde01e9c63 100644 --- a/pkgs/servers/u9fs/default.nix +++ b/pkgs/servers/u9fs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchhg }: +{ lib, stdenv, fetchhg }: stdenv.mkDerivation { pname = "u9fs"; @@ -16,7 +16,7 @@ stdenv.mkDerivation { cp u9fs $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Serve 9P from Unix"; homepage = "http://plan9.bell-labs.com/magic/man2html/4/u9fs"; license = licenses.free; diff --git a/pkgs/servers/uhub/default.nix b/pkgs/servers/uhub/default.nix index 05c67b0ce1cf..34e2b1bae7d5 100644 --- a/pkgs/servers/uhub/default.nix +++ b/pkgs/servers/uhub/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchpatch, fetchFromGitHub, cmake, openssl, sqlite, pkgconfig, systemd +{ lib, stdenv, fetchpatch, fetchFromGitHub, cmake, openssl, sqlite, pkg-config, systemd , tlsSupport ? false }: assert tlsSupport -> openssl != null; @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { sha256 = "0zdbxfvw7apmfhqgsfkfp4pn9iflzwdn0zwvzymm5inswfc00pxg"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake sqlite systemd ] ++ stdenv.lib.optional tlsSupport openssl; + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ sqlite systemd ] ++ stdenv.lib.optional tlsSupport openssl; outputs = [ "out" "mod_example" @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { (if tlsSupport then "-DSSL_SUPPORT=ON" else "-DSSL_SUPPORT=OFF") ]; - meta = with stdenv.lib; { + meta = with lib; { description = "High performance peer-to-peer hub for the ADC network"; homepage = "https://www.uhub.org/"; license = licenses.gpl3; diff --git a/pkgs/servers/unifi/default.nix b/pkgs/servers/unifi/default.nix index b354fd994c97..c8b610c4d17f 100644 --- a/pkgs/servers/unifi/default.nix +++ b/pkgs/servers/unifi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, dpkg, fetchurl }: +{ lib, stdenv, dpkg, fetchurl }: let generic = { version, sha256, suffix ? "" }: @@ -29,7 +29,7 @@ let runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.ubnt.com/"; description = "Controller for Ubiquiti UniFi access points"; license = licenses.unfree; diff --git a/pkgs/servers/unpfs/default.nix b/pkgs/servers/unpfs/default.nix index 9b67a901693d..818e92f05965 100644 --- a/pkgs/servers/unpfs/default.nix +++ b/pkgs/servers/unpfs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform }: +{ lib, stdenv, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { pname = "unpfs"; @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { install -D -m 0444 ../../LICEN* -t "$out/share/doc/${pname}" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "9P2000.L server implementation in Rust"; homepage = "https://github.com/pfpacket/rust-9p"; license = licenses.bsd3; diff --git a/pkgs/servers/ursadb/default.nix b/pkgs/servers/ursadb/default.nix index 6a3a1cff5b56..f86599adccbd 100644 --- a/pkgs/servers/ursadb/default.nix +++ b/pkgs/servers/ursadb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, zeromq, cppzmq }: +{ lib, stdenv, fetchurl, cmake, zeromq, cppzmq }: stdenv.mkDerivation { name = "ursadb"; @@ -25,7 +25,7 @@ stdenv.mkDerivation { cppzmq ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/CERT-Polska/ursadb"; description = "Trigram database written in C++, suited for malware indexing"; license = licenses.bsd3; diff --git a/pkgs/servers/urserver/default.nix b/pkgs/servers/urserver/default.nix index 3f665a32ebda..2d2e83fe01b2 100644 --- a/pkgs/servers/urserver/default.nix +++ b/pkgs/servers/urserver/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , autoPatchelfHook , bluez @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { cp -r manager $out/bin/manager ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.unifiedremote.com/"; description = "The one-and-only remote for your computer"; license = licenses.unfree; diff --git a/pkgs/servers/uwsgi/default.nix b/pkgs/servers/uwsgi/default.nix index d9ed810cdf49..14876e47df3f 100644 --- a/pkgs/servers/uwsgi/default.nix +++ b/pkgs/servers/uwsgi/default.nix @@ -3,6 +3,7 @@ , plugins ? [] , pam, withPAM ? stdenv.isLinux , systemd, withSystemd ? stdenv.isLinux +, libcap, withCap ? stdenv.isLinux , python2, python3, ncurses , ruby, php, libmysqlclient }: @@ -75,6 +76,7 @@ stdenv.mkDerivation rec { buildInputs = [ jansson pcre ] ++ lib.optional withPAM pam ++ lib.optional withSystemd systemd + ++ lib.optional withCap libcap ++ lib.concatMap (x: x.inputs) needed ; @@ -83,6 +85,8 @@ stdenv.mkDerivation rec { ++ lib.optional withSystemd "systemd_logger" ); + UWSGI_INCLUDES = lib.optionalString withCap "${libcap.dev}/include"; + passthru = { inherit python2 python3; }; @@ -113,7 +117,7 @@ stdenv.mkDerivation rec { ${lib.concatMapStringsSep "\n" (x: x.install or "") needed} ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://uwsgi-docs.readthedocs.org/en/latest/"; description = "A fast, self-healing and developer/sysadmin-friendly application container server coded in pure C"; license = licenses.gpl2; diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix index 27e0edfcc2b2..0326c8988f49 100644 --- a/pkgs/servers/varnish/default.nix +++ b/pkgs/servers/varnish/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pcre, libxslt, groff, ncurses, pkgconfig, readline, libedit +{ lib, stdenv, fetchurl, pcre, libxslt, groff, ncurses, pkgconfig, readline, libedit , python3, makeWrapper }: let @@ -30,7 +30,7 @@ let outputs = [ "out" "dev" "man" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Web application accelerator also known as a caching HTTP reverse proxy"; homepage = "https://www.varnish-cache.org"; license = licenses.bsd2; diff --git a/pkgs/servers/varnish/digest.nix b/pkgs/servers/varnish/digest.nix index 8d69451f8b5e..b6ec11e4e8df 100644 --- a/pkgs/servers/varnish/digest.nix +++ b/pkgs/servers/varnish/digest.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, varnish, libmhash, docutils }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, varnish, libmhash, docutils }: stdenv.mkDerivation rec { version = "1.0.2"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Digest and HMAC vmod"; homepage = "https://github.com/varnish/libvmod-digest"; inherit (varnish.meta) license platforms maintainers; diff --git a/pkgs/servers/varnish/dynamic.nix b/pkgs/servers/varnish/dynamic.nix index c43f00b7a6bb..a9900424b966 100644 --- a/pkgs/servers/varnish/dynamic.nix +++ b/pkgs/servers/varnish/dynamic.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, varnish, docutils }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, varnish, docutils }: stdenv.mkDerivation rec { version = "0.4"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; configureFlags = [ "VMOD_DIR=$(out)/lib/varnish/vmods" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Dynamic director similar to the DNS director from Varnish 3"; homepage = "https://github.com/nigoroll/libvmod-dynamic"; inherit (varnish.meta) license platforms maintainers; diff --git a/pkgs/servers/varnish/modules.nix b/pkgs/servers/varnish/modules.nix index 69ee7028de87..f39afd9c87ca 100644 --- a/pkgs/servers/varnish/modules.nix +++ b/pkgs/servers/varnish/modules.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, varnish, docutils, removeReferencesTo }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, varnish, docutils, removeReferencesTo }: stdenv.mkDerivation rec { version = "0.15.0"; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { postInstall = "find $out -type f -exec remove-references-to -t ${varnish.dev} '{}' +"; # varnish.dev captured only as __FILE__ in assert messages - meta = with stdenv.lib; { + meta = with lib; { description = "Collection of Varnish Cache modules (vmods) by Varnish Software"; homepage = "https://github.com/varnish/varnish-modules"; inherit (varnish.meta) license platforms maintainers; diff --git a/pkgs/servers/web-apps/dokuwiki/default.nix b/pkgs/servers/web-apps/dokuwiki/default.nix index 2cb20e4932f5..1f1173469281 100644 --- a/pkgs/servers/web-apps/dokuwiki/default.nix +++ b/pkgs/servers/web-apps/dokuwiki/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, writeText }: +{ lib, stdenv, fetchFromGitHub, writeText }: stdenv.mkDerivation rec { pname = "dokuwiki"; @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { cp ${phpPluginsLocalConfig} $out/share/dokuwiki/conf/plugins.local.php ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Simple to use and highly versatile Open Source wiki software that doesn't require a database"; license = licenses.gpl2; homepage = "https://www.dokuwiki.org"; diff --git a/pkgs/servers/web-apps/engelsystem/default.nix b/pkgs/servers/web-apps/engelsystem/default.nix index 92d50ff67c8e..22abbdac08ce 100644 --- a/pkgs/servers/web-apps/engelsystem/default.nix +++ b/pkgs/servers/web-apps/engelsystem/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, php, writeText, nixosTests }: +{ lib, stdenv, fetchzip, php, writeText, nixosTests }: let phpExt = php.withExtensions @@ -39,7 +39,7 @@ in stdenv.mkDerivation rec { passthru.tests = nixosTests.engelsystem; - meta = with stdenv.lib; { + meta = with lib; { description = "Coordinate your volunteers in teams, assign them to work shifts or let them decide for themselves when and where they want to help with what"; license = licenses.gpl2; diff --git a/pkgs/servers/web-apps/fileshelter/default.nix b/pkgs/servers/web-apps/fileshelter/default.nix index 928d80b1297a..76b468d35d77 100644 --- a/pkgs/servers/web-apps/fileshelter/default.nix +++ b/pkgs/servers/web-apps/fileshelter/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, libzip, boost, wt4, libconfig, pkgconfig } : +{ lib, stdenv, fetchFromGitHub, autoreconfHook, libzip, boost, wt4, libconfig, pkgconfig } : stdenv.mkDerivation rec { pname = "fileshelter"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ln -s ${wt4}/share/Wt/resources $out/share/fileshelter/docroot/resources ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/epoupon/fileshelter"; description = "FileShelter is a 'one-click' file sharing web application"; maintainers = [ maintainers.willibutz ]; diff --git a/pkgs/servers/web-apps/hedgedoc/default.nix b/pkgs/servers/web-apps/hedgedoc/default.nix index 9fdaafbd24ab..76c0d0ce72c7 100644 --- a/pkgs/servers/web-apps/hedgedoc/default.nix +++ b/pkgs/servers/web-apps/hedgedoc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, makeWrapper +{ lib, stdenv, fetchFromGitHub, fetchpatch, makeWrapper , which, nodejs, mkYarnPackage, python2, nixosTests }: mkYarnPackage rec { @@ -61,7 +61,7 @@ mkYarnPackage rec { passthru.tests = { inherit (nixosTests) hedgedoc; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Realtime collaborative markdown notes on all platforms"; license = licenses.agpl3; homepage = "https://hedgedoc.org"; diff --git a/pkgs/servers/web-apps/jirafeau/default.nix b/pkgs/servers/web-apps/jirafeau/default.nix index 33cde2c5922c..6091eb498208 100644 --- a/pkgs/servers/web-apps/jirafeau/default.nix +++ b/pkgs/servers/web-apps/jirafeau/default.nix @@ -1,5 +1,4 @@ -{ stdenv, fetchFromGitLab, writeText }: - +{ lib, stdenv, fetchFromGitLab, writeText }: let localConfig = writeText "config.local.php" '' /dev/null ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A real-time web analytics application"; license = licenses.gpl3Plus; homepage = "https://matomo.org/"; diff --git a/pkgs/servers/web-apps/mediawiki/default.nix b/pkgs/servers/web-apps/mediawiki/default.nix index 78f01f19faaf..ddd2ecf81327 100644 --- a/pkgs/servers/web-apps/mediawiki/default.nix +++ b/pkgs/servers/web-apps/mediawiki/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, writeText }: +{ lib, stdenv, fetchurl, makeWrapper, writeText }: stdenv.mkDerivation rec { pname = "mediawiki"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "The collaborative editing software that runs Wikipedia"; license = licenses.gpl2Plus; homepage = "https://www.mediawiki.org/"; diff --git a/pkgs/servers/web-apps/moodle/default.nix b/pkgs/servers/web-apps/moodle/default.nix index da84481c9353..6b22c29c128c 100644 --- a/pkgs/servers/web-apps/moodle/default.nix +++ b/pkgs/servers/web-apps/moodle/default.nix @@ -52,7 +52,7 @@ in stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Free and open-source learning management system (LMS) written in PHP"; license = licenses.gpl3Plus; diff --git a/pkgs/servers/web-apps/morty/default.nix b/pkgs/servers/web-apps/morty/default.nix index 3d43862cbe0e..6b17476623b9 100644 --- a/pkgs/servers/web-apps/morty/default.nix +++ b/pkgs/servers/web-apps/morty/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchgit }: +{ lib, stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { pname = "morty"; @@ -14,7 +14,7 @@ buildGoPackage rec { goDeps = ./deps.nix; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/asciimoo/morty"; maintainers = with maintainers; [ leenaars ]; license = licenses.agpl3; diff --git a/pkgs/servers/web-apps/pgpkeyserver-lite/default.nix b/pkgs/servers/web-apps/pgpkeyserver-lite/default.nix index f98388570611..0930b3a4978d 100644 --- a/pkgs/servers/web-apps/pgpkeyserver-lite/default.nix +++ b/pkgs/servers/web-apps/pgpkeyserver-lite/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation { pname = "pgpkeyserver-lite"; @@ -16,7 +16,7 @@ stdenv.mkDerivation { cp -R 404.html assets favicon.ico index.html robots.txt $out ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/mattrude/pgpkeyserver-lite"; description = "A lightweight static front-end for a sks keyserver"; license = licenses.gpl3; diff --git a/pkgs/servers/web-apps/restya-board/default.nix b/pkgs/servers/web-apps/restya-board/default.nix index 89e22b23361e..934ef81ac90e 100644 --- a/pkgs/servers/web-apps/restya-board/default.nix +++ b/pkgs/servers/web-apps/restya-board/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip }: +{ lib, stdenv, fetchurl, unzip }: let @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { unzip -d $out/client/apps ${togetherjs} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Web-based kanban board"; license = licenses.osl3; homepage = "https://restya.com"; diff --git a/pkgs/servers/web-apps/searx/default.nix b/pkgs/servers/web-apps/searx/default.nix index dc87acddd881..bb9944ea3772 100644 --- a/pkgs/servers/web-apps/searx/default.nix +++ b/pkgs/servers/web-apps/searx/default.nix @@ -1,28 +1,34 @@ -{ lib, python3Packages, fetchFromGitHub, fetchpatch }: +{ lib, nixosTests, python3, python3Packages, fetchFromGitHub, fetchpatch }: with python3Packages; -buildPythonApplication rec { +toPythonModule (buildPythonApplication rec { pname = "searx"; - version = "0.17.0"; + version = "0.18.0"; # Can not use PyPI because certain test files are missing. src = fetchFromGitHub { - owner = "asciimoo"; + owner = "searx"; repo = "searx"; rev = "v${version}"; - sha256 = "0pznz3wsaikl8khmzqvj05kzh5y07hjw8gqhy6x0lz1b00cn5af4"; + sha256 = "0idxspvckvsd02v42h4z4wqrfkn1l8n59i91f7pc837cxya8p6hn"; }; postPatch = '' sed -i 's/==.*$//' requirements.txt + # skip failing test + sed -i '/test_json_serial(/,+3d' tests/unit/test_standalone_searx.py + ''; + + preBuild = '' + export SEARX_DEBUG="true"; ''; propagatedBuildInputs = [ pyyaml lxml grequests flaskbabel flask requests gevent speaklater Babel pytz dateutil pygments pyasn1 pyasn1-modules ndg-httpsclient certifi pysocks - jinja2 + jinja2 werkzeug ]; checkInputs = [ @@ -30,14 +36,18 @@ buildPythonApplication rec { unittest2 zope_testrunner selenium ]; - preCheck = '' - rm tests/test_robot.py # A variable that is imported is commented out + postInstall = '' + # Create a symlink for easier access to static data + mkdir -p $out/share + ln -s ../${python3.sitePackages}/searx/static $out/share/ ''; + passthru.tests = { inherit (nixosTests) searx; }; + meta = with lib; { - homepage = "https://github.com/asciimoo/searx"; + homepage = "https://github.com/searx/searx"; description = "A privacy-respecting, hackable metasearch engine"; license = licenses.agpl3Plus; maintainers = with maintainers; [ matejc fpletz globin danielfullmer ]; }; -} +}) diff --git a/pkgs/servers/web-apps/selfoss/default.nix b/pkgs/servers/web-apps/selfoss/default.nix index e54f9d74c1d2..383c57ee9382 100644 --- a/pkgs/servers/web-apps/selfoss/default.nix +++ b/pkgs/servers/web-apps/selfoss/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip }: +{ lib, stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { pname = "selfoss"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { cp -ra * $out/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Web-based news feed (RSS/Atom) aggregator"; homepage = "https://selfoss.aditu.de"; license = licenses.gpl3; diff --git a/pkgs/servers/web-apps/shaarli/default.nix b/pkgs/servers/web-apps/shaarli/default.nix index a4374b833908..2e3386de6440 100644 --- a/pkgs/servers/web-apps/shaarli/default.nix +++ b/pkgs/servers/web-apps/shaarli/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "shaarli"; @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { cp -R ./* $out ''; - meta = with stdenv.lib; { + meta = with lib; { description = "The personal, minimalist, super-fast, database free, bookmarking service"; license = licenses.gpl3Plus; homepage = "https://github.com/shaarli/Shaarli"; diff --git a/pkgs/servers/web-apps/shiori/default.nix b/pkgs/servers/web-apps/shiori/default.nix index 45b93bf1ad5f..7100c70c0ed8 100644 --- a/pkgs/servers/web-apps/shiori/default.nix +++ b/pkgs/servers/web-apps/shiori/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "shiori"; @@ -15,7 +15,7 @@ buildGoModule rec { sha256 = "13and7gh2882khqppwz3wwq44p7az4bfdfjvlnqcpqyi8xa28pmq"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Simple bookmark manager built with Go"; homepage = "https://github.com/go-shiori/shiori"; license = licenses.mit; diff --git a/pkgs/servers/web-apps/wallabag/default.nix b/pkgs/servers/web-apps/wallabag/default.nix index 48afdc5c01da..6417064663a1 100644 --- a/pkgs/servers/web-apps/wallabag/default.nix +++ b/pkgs/servers/web-apps/wallabag/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "wallabag"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { cp -R * $out/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Web page archiver"; longDescription = '' wallabag is a self hostable application for saving web pages. diff --git a/pkgs/servers/web-apps/whitebophir/default.nix b/pkgs/servers/web-apps/whitebophir/default.nix new file mode 100644 index 000000000000..a1d8e9c00617 --- /dev/null +++ b/pkgs/servers/web-apps/whitebophir/default.nix @@ -0,0 +1,38 @@ +{ stdenv +, pkgs +, lib +, fetchurl +, nodejs +, runtimeShell +}: + +let + nodePackages = import ./node-packages.nix { + inherit pkgs nodejs; + inherit (stdenv.hostPlatform) system; + }; + + whitebophir = lib.head (lib.attrValues nodePackages); + + combined = whitebophir.override { + postInstall = '' + out_whitebophir=$out/lib/node_modules/whitebophir + + mkdir $out/bin + cat < $out/bin/whitebophir + #!${runtimeShell} + exec ${nodejs}/bin/node $out_whitebophir/server/server.js + EOF + chmod +x $out/bin/whitebophir + ''; + + meta = with lib; { + description = "Online collaborative whiteboard that is simple, free, easy to use and to deploy"; + license = licenses.agpl3; + homepage = "https://github.com/lovasoa/whitebophir"; + maintainers = with maintainers; [ iblech ]; + platforms = platforms.unix; + }; + }; +in + combined diff --git a/pkgs/servers/web-apps/whitebophir/generate.sh b/pkgs/servers/web-apps/whitebophir/generate.sh new file mode 100755 index 000000000000..825def892fc5 --- /dev/null +++ b/pkgs/servers/web-apps/whitebophir/generate.sh @@ -0,0 +1,9 @@ +#!/usr/bin/env nix-shell +#! nix-shell -i bash -p nodePackages.node2nix +set -euo pipefail + +node2nix \ + --input node-packages.json \ + --output node-packages-generated.nix \ + --composition node-packages.nix \ + --node-env ../../../development/node-packages/node-env.nix diff --git a/pkgs/servers/web-apps/whitebophir/node-packages-generated.nix b/pkgs/servers/web-apps/whitebophir/node-packages-generated.nix new file mode 100644 index 000000000000..78d4b9ccd774 --- /dev/null +++ b/pkgs/servers/web-apps/whitebophir/node-packages-generated.nix @@ -0,0 +1,1495 @@ +# This file has been generated by node2nix 1.8.0. Do not edit! + +{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: + +let + sources = { + "@financial-times/polyfill-useragent-normaliser-1.9.0" = { + name = "_at_financial-times_slash_polyfill-useragent-normaliser"; + packageName = "@financial-times/polyfill-useragent-normaliser"; + version = "1.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@financial-times/polyfill-useragent-normaliser/-/polyfill-useragent-normaliser-1.9.0.tgz"; + sha512 = "jrVQ42tT1RrWyR/hkJlro2HhHZMPGXknKfJyZabe0CYj1c1KIqdS1JhhXEOt0T9ntaRCYq56y2/hAMM6LOU73g=="; + }; + }; + "@financial-times/useragent_parser-1.5.1" = { + name = "_at_financial-times_slash_useragent_parser"; + packageName = "@financial-times/useragent_parser"; + version = "1.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@financial-times/useragent_parser/-/useragent_parser-1.5.1.tgz"; + sha512 = "g6MJ5tVszip1wAOq41yk8Z0WJqjfpu3hKaos/IaechYC4RqIn8bTanNR/EGD6oeOdJ9/fTPbQQX5/3ZQwSTXtQ=="; + }; + }; + "@formatjs/ecma402-abstract-1.5.0" = { + name = "_at_formatjs_slash_ecma402-abstract"; + packageName = "@formatjs/ecma402-abstract"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@formatjs/ecma402-abstract/-/ecma402-abstract-1.5.0.tgz"; + sha512 = "wXv36yo+mfWllweN0Fq7sUs7PUiNopn7I0JpLTe3hGu6ZMR4CV7LqK1llhB18pndwpKoafQKb1et2DCJAOW20Q=="; + }; + }; + "@formatjs/intl-datetimeformat-3.2.2" = { + name = "_at_formatjs_slash_intl-datetimeformat"; + packageName = "@formatjs/intl-datetimeformat"; + version = "3.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@formatjs/intl-datetimeformat/-/intl-datetimeformat-3.2.2.tgz"; + sha512 = "wIqe4dPzbYB6SrJWNPKBnXkPj1pR68qtGCzHkPo8JGRpWQcVpHh3Cigw1cQs2I9M1F9dOtFHQP6gi+xsb1kAiA=="; + }; + }; + "@formatjs/intl-displaynames-4.0.3" = { + name = "_at_formatjs_slash_intl-displaynames"; + packageName = "@formatjs/intl-displaynames"; + version = "4.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@formatjs/intl-displaynames/-/intl-displaynames-4.0.3.tgz"; + sha512 = "wNJZzIzlA88oyHZAFdAnLKV/srtIrU//md9SU2Bo0LKXKIukz/g5LmJlyhq6uF1oYoJzVvvTxoVXscBJmKcJmg=="; + }; + }; + "@formatjs/intl-getcanonicallocales-1.5.3" = { + name = "_at_formatjs_slash_intl-getcanonicallocales"; + packageName = "@formatjs/intl-getcanonicallocales"; + version = "1.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@formatjs/intl-getcanonicallocales/-/intl-getcanonicallocales-1.5.3.tgz"; + sha512 = "QVBnSPZ32Y80wkXbf36hP9VbyklbOb8edppxFcgO9Lbd47zagllw65Y81QOHEn/j11JcTn2OhW0vea95LHvQmA=="; + }; + }; + "@formatjs/intl-listformat-5.0.3" = { + name = "_at_formatjs_slash_intl-listformat"; + packageName = "@formatjs/intl-listformat"; + version = "5.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@formatjs/intl-listformat/-/intl-listformat-5.0.3.tgz"; + sha512 = "IaW428RI5RpwXr/+doYT1H4ZHL3mYLU3nzR7ZaTkk5dBi1PKKGk1sDwymEzVxyrELT0WHhqhqLKdLjXAqxCz9g=="; + }; + }; + "@formatjs/intl-locale-2.4.12" = { + name = "_at_formatjs_slash_intl-locale"; + packageName = "@formatjs/intl-locale"; + version = "2.4.12"; + src = fetchurl { + url = "https://registry.npmjs.org/@formatjs/intl-locale/-/intl-locale-2.4.12.tgz"; + sha512 = "40khHPYtZRdqjQs1fItNj94eMoiGwJJOAKN//9qUhAsHrXvGxseFVBSg+mItV0Orwb3wqItUj3hu6evrouhstw=="; + }; + }; + "@formatjs/intl-numberformat-6.1.2" = { + name = "_at_formatjs_slash_intl-numberformat"; + packageName = "@formatjs/intl-numberformat"; + version = "6.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@formatjs/intl-numberformat/-/intl-numberformat-6.1.2.tgz"; + sha512 = "td0XggQKu8dlPUlP2f322NW0WY58zWLlOoiUVh4eolcWqOs4maKL8tjmFBPXSQt55JiKy14ZrDw1dljyNHLB0g=="; + }; + }; + "@formatjs/intl-pluralrules-4.0.2" = { + name = "_at_formatjs_slash_intl-pluralrules"; + packageName = "@formatjs/intl-pluralrules"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@formatjs/intl-pluralrules/-/intl-pluralrules-4.0.2.tgz"; + sha512 = "Oh4zmA3odkXBCPAGVhZuAnP3IfCPy8DyizA9s4QkYptVICX38RbUvXwzr2a9DVpKNiZ7i2TnV4Qkeo06N/6b7Q=="; + }; + }; + "@formatjs/intl-relativetimeformat-8.0.2" = { + name = "_at_formatjs_slash_intl-relativetimeformat"; + packageName = "@formatjs/intl-relativetimeformat"; + version = "8.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@formatjs/intl-relativetimeformat/-/intl-relativetimeformat-8.0.2.tgz"; + sha512 = "RBO+4zxJuIYtYGfxv1GuZJQDtrA+fZlgcHjSVoo5HwznWdfg5vVTe8qdbSDbdyFobbB2OYqwj4mcRO2M5P1oNw=="; + }; + }; + "@juggle/resize-observer-3.2.0" = { + name = "_at_juggle_slash_resize-observer"; + packageName = "@juggle/resize-observer"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@juggle/resize-observer/-/resize-observer-3.2.0.tgz"; + sha512 = "fsLxt0CHx2HCV9EL8lDoVkwHffsA0snUpddYjdLyXcG5E41xaamn9ZyQqOE9TUJdrRlH8/hjIf+UdOdDeKCUgg=="; + }; + }; + "@types/component-emitter-1.2.10" = { + name = "_at_types_slash_component-emitter"; + packageName = "@types/component-emitter"; + version = "1.2.10"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/component-emitter/-/component-emitter-1.2.10.tgz"; + sha512 = "bsjleuRKWmGqajMerkzox19aGbscQX5rmmvvXl3wlIp5gMG1HgkiwPxsN5p070fBDKTNSPgojVbuY1+HWMbFhg=="; + }; + }; + "@types/cookie-0.4.0" = { + name = "_at_types_slash_cookie"; + packageName = "@types/cookie"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/cookie/-/cookie-0.4.0.tgz"; + sha512 = "y7mImlc/rNkvCRmg8gC3/lj87S7pTUIJ6QGjwHR9WQJcFs+ZMTOaoPrkdFA/YdbuqVEmEbb5RdhVxMkAcgOnpg=="; + }; + }; + "@types/cors-2.8.9" = { + name = "_at_types_slash_cors"; + packageName = "@types/cors"; + version = "2.8.9"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/cors/-/cors-2.8.9.tgz"; + sha512 = "zurD1ibz21BRlAOIKP8yhrxlqKx6L9VCwkB5kMiP6nZAhoF5MvC7qS1qPA7nRcr1GJolfkQC7/EAL4hdYejLtg=="; + }; + }; + "@types/node-14.14.20" = { + name = "_at_types_slash_node"; + packageName = "@types/node"; + version = "14.14.20"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/node/-/node-14.14.20.tgz"; + sha512 = "Y93R97Ouif9JEOWPIUyU+eyIdyRqQR0I8Ez1dzku4hDx34NWh4HbtIc3WNzwB1Y9ULvNGeu5B8h8bVL5cAk4/A=="; + }; + }; + "@webcomponents/template-1.4.4" = { + name = "_at_webcomponents_slash_template"; + packageName = "@webcomponents/template"; + version = "1.4.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@webcomponents/template/-/template-1.4.4.tgz"; + sha512 = "QqCmmywIKJTilkl6UIPLxEBBuqhDaOBpvQyKOnUEwl9lJuVHBrVlhMIhhnp9VSZJ6xEUnp+PiX8DST1k0q/v4Q=="; + }; + }; + "Base64-1.1.0" = { + name = "Base64"; + packageName = "Base64"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/Base64/-/Base64-1.1.0.tgz"; + sha512 = "qeacf8dvGpf+XAT27ESHMh7z84uRzj/ua2pQdJg483m3bEXv/kVFtDnMgvf70BQGqzbZhR9t6BmASzKvqfJf3Q=="; + }; + }; + "abort-controller-3.0.0" = { + name = "abort-controller"; + packageName = "abort-controller"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz"; + sha512 = "h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg=="; + }; + }; + "accept-language-parser-1.5.0" = { + name = "accept-language-parser"; + packageName = "accept-language-parser"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/accept-language-parser/-/accept-language-parser-1.5.0.tgz"; + sha1 = "8877c54040a8dcb59e0a07d9c1fde42298334791"; + }; + }; + "accepts-1.3.7" = { + name = "accepts"; + packageName = "accepts"; + version = "1.3.7"; + src = fetchurl { + url = "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz"; + sha512 = "Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA=="; + }; + }; + "align-text-0.1.4" = { + name = "align-text"; + packageName = "align-text"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz"; + sha1 = "0cd90a561093f35d0a99256c22b7069433fad117"; + }; + }; + "audio-context-polyfill-1.0.0" = { + name = "audio-context-polyfill"; + packageName = "audio-context-polyfill"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/audio-context-polyfill/-/audio-context-polyfill-1.0.0.tgz"; + sha1 = "4b728faf0a19555194d4fbd05582f833fdcd137b"; + }; + }; + "balanced-match-1.0.0" = { + name = "balanced-match"; + packageName = "balanced-match"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz"; + sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767"; + }; + }; + "base64-arraybuffer-0.1.4" = { + name = "base64-arraybuffer"; + packageName = "base64-arraybuffer"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.4.tgz"; + sha1 = "9818c79e059b1355f97e0428a017c838e90ba812"; + }; + }; + "base64id-2.0.0" = { + name = "base64id"; + packageName = "base64id"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/base64id/-/base64id-2.0.0.tgz"; + sha512 = "lGe34o6EHj9y3Kts9R4ZYs/Gr+6N7MCaMlIFA3F1R2O5/m7K06AxfSeO5530PEERE6/WyEg3lsuyw4GHlPZHog=="; + }; + }; + "brace-expansion-1.1.11" = { + name = "brace-expansion"; + packageName = "brace-expansion"; + version = "1.1.11"; + src = fetchurl { + url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz"; + sha512 = "iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA=="; + }; + }; + "camelcase-1.2.1" = { + name = "camelcase"; + packageName = "camelcase"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz"; + sha1 = "9bb5304d2e0b56698b2c758b08a3eaa9daa58a39"; + }; + }; + "center-align-0.1.3" = { + name = "center-align"; + packageName = "center-align"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz"; + sha1 = "aa0d32629b6ee972200411cbd4461c907bc2b7ad"; + }; + }; + "cldr-core-38.0.0" = { + name = "cldr-core"; + packageName = "cldr-core"; + version = "38.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cldr-core/-/cldr-core-38.0.0.tgz"; + sha512 = "WkjA4zo5rLT/BWTZAxHJ0lJXwI33gCYucEz1+CpoI8Wu+rr5IrC57wyNXyrNNMdxfDE5RsWi/JCQ9qnG8sHTiw=="; + }; + }; + "cliui-2.1.0" = { + name = "cliui"; + packageName = "cliui"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz"; + sha1 = "4b475760ff80264c762c3a1719032e91c7fea0d1"; + }; + }; + "component-emitter-1.3.0" = { + name = "component-emitter"; + packageName = "component-emitter"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz"; + sha512 = "Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg=="; + }; + }; + "concat-map-0.0.1" = { + name = "concat-map"; + packageName = "concat-map"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"; + sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b"; + }; + }; + "cookie-0.4.1" = { + name = "cookie"; + packageName = "cookie"; + version = "0.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cookie/-/cookie-0.4.1.tgz"; + sha512 = "ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA=="; + }; + }; + "core-util-is-1.0.2" = { + name = "core-util-is"; + packageName = "core-util-is"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"; + sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; + }; + }; + "cors-2.8.5" = { + name = "cors"; + packageName = "cors"; + version = "2.8.5"; + src = fetchurl { + url = "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz"; + sha512 = "KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g=="; + }; + }; + "current-script-polyfill-1.0.0" = { + name = "current-script-polyfill"; + packageName = "current-script-polyfill"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/current-script-polyfill/-/current-script-polyfill-1.0.0.tgz"; + sha1 = "f31cf7e4f3e218b0726e738ca92a02d3488ef615"; + }; + }; + "debug-2.6.9" = { + name = "debug"; + packageName = "debug"; + version = "2.6.9"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz"; + sha512 = "bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="; + }; + }; + "debug-4.1.1" = { + name = "debug"; + packageName = "debug"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz"; + sha512 = "pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw=="; + }; + }; + "debug-4.3.2" = { + name = "debug"; + packageName = "debug"; + version = "4.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz"; + sha512 = "mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw=="; + }; + }; + "decamelize-1.2.0" = { + name = "decamelize"; + packageName = "decamelize"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz"; + sha1 = "f6534d15148269b20352e7bee26f501f9a191290"; + }; + }; + "deep-is-0.1.3" = { + name = "deep-is"; + packageName = "deep-is"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz"; + sha1 = "b369d6fb5dbc13eecf524f91b070feedc357cf34"; + }; + }; + "depd-1.1.2" = { + name = "depd"; + packageName = "depd"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz"; + sha1 = "9bcd52e14c097763e749b274c4346ed2e560b5a9"; + }; + }; + "destroy-1.0.4" = { + name = "destroy"; + packageName = "destroy"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz"; + sha1 = "978857442c44749e4206613e37946205826abd80"; + }; + }; + "diff-4.0.2" = { + name = "diff"; + packageName = "diff"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz"; + sha512 = "58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A=="; + }; + }; + "ee-first-1.1.1" = { + name = "ee-first"; + packageName = "ee-first"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz"; + sha1 = "590c61156b0ae2f4f0255732a158b266bc56b21d"; + }; + }; + "encodeurl-1.0.2" = { + name = "encodeurl"; + packageName = "encodeurl"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz"; + sha1 = "ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"; + }; + }; + "engine.io-4.0.6" = { + name = "engine.io"; + packageName = "engine.io"; + version = "4.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/engine.io/-/engine.io-4.0.6.tgz"; + sha512 = "rf7HAVZpcRrcKEKddgIzYUnwg0g5HE1RvJaTLwkcfJmce4g+po8aMuE6vxzp6JwlK8FEq/vi0KWN6tA585DjaA=="; + }; + }; + "engine.io-parser-4.0.2" = { + name = "engine.io-parser"; + packageName = "engine.io-parser"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-4.0.2.tgz"; + sha512 = "sHfEQv6nmtJrq6TKuIz5kyEKH/qSdK56H/A+7DnAuUPWosnIZAS2NHNcPLmyjtY3cGS/MqJdZbUjW97JU72iYg=="; + }; + }; + "escape-html-1.0.3" = { + name = "escape-html"; + packageName = "escape-html"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz"; + sha1 = "0258eae4d3d0c0974de1c169188ef0051d1d1988"; + }; + }; + "etag-1.8.1" = { + name = "etag"; + packageName = "etag"; + version = "1.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz"; + sha1 = "41ae2eeb65efa62268aebfea83ac7d79299b0887"; + }; + }; + "event-source-polyfill-1.0.22" = { + name = "event-source-polyfill"; + packageName = "event-source-polyfill"; + version = "1.0.22"; + src = fetchurl { + url = "https://registry.npmjs.org/event-source-polyfill/-/event-source-polyfill-1.0.22.tgz"; + sha512 = "Fnk9E2p4rkZ3eJGBn2HDeZoBTpyjPxj8RX/whdr4Pm5622xYgYo1k48SUD649Xlo6nnoKRr2WwcUlneil/AZ8g=="; + }; + }; + "event-target-shim-5.0.1" = { + name = "event-target-shim"; + packageName = "event-target-shim"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz"; + sha512 = "i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ=="; + }; + }; + "fastestsmallesttextencoderdecoder-1.0.22" = { + name = "fastestsmallesttextencoderdecoder"; + packageName = "fastestsmallesttextencoderdecoder"; + version = "1.0.22"; + src = fetchurl { + url = "https://registry.npmjs.org/fastestsmallesttextencoderdecoder/-/fastestsmallesttextencoderdecoder-1.0.22.tgz"; + sha512 = "Pb8d48e+oIuY4MaM64Cd7OW1gt4nxCHs7/ddPPZ/Ic3sg8yVGM7O9wDvZ7us6ScaUupzM+pfBolwtYhN1IxBIw=="; + }; + }; + "fresh-0.5.2" = { + name = "fresh"; + packageName = "fresh"; + version = "0.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz"; + sha1 = "3d8cadd90d976569fa835ab1f8e4b23a105605a7"; + }; + }; + "from2-2.3.0" = { + name = "from2"; + packageName = "from2"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz"; + sha1 = "8bfb5502bde4a4d36cfdeea007fcca21d7e382af"; + }; + }; + "from2-string-1.1.0" = { + name = "from2-string"; + packageName = "from2-string"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/from2-string/-/from2-string-1.1.0.tgz"; + sha1 = "18282b27d08a267cb3030cd2b8b4b0f212af752a"; + }; + }; + "fs.realpath-1.0.0" = { + name = "fs.realpath"; + packageName = "fs.realpath"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"; + sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; + }; + }; + "glob-7.1.6" = { + name = "glob"; + packageName = "glob"; + version = "7.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz"; + sha512 = "LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA=="; + }; + }; + "graceful-fs-4.2.4" = { + name = "graceful-fs"; + packageName = "graceful-fs"; + version = "4.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz"; + sha512 = "WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw=="; + }; + }; + "handlebars-4.7.6" = { + name = "handlebars"; + packageName = "handlebars"; + version = "4.7.6"; + src = fetchurl { + url = "https://registry.npmjs.org/handlebars/-/handlebars-4.7.6.tgz"; + sha512 = "1f2BACcBfiwAfStCKZNrUCgqNZkGsAT7UM3kkYtXuLo0KnaVfjKOyf7PRzB6++aK9STyT1Pd2ZCPe3EGOXleXA=="; + }; + }; + "html5shiv-3.7.3" = { + name = "html5shiv"; + packageName = "html5shiv"; + version = "3.7.3"; + src = fetchurl { + url = "https://registry.npmjs.org/html5shiv/-/html5shiv-3.7.3.tgz"; + sha1 = "d78a84a367bcb9a710100d57802c387b084631d2"; + }; + }; + "http-errors-1.7.3" = { + name = "http-errors"; + packageName = "http-errors"; + version = "1.7.3"; + src = fetchurl { + url = "https://registry.npmjs.org/http-errors/-/http-errors-1.7.3.tgz"; + sha512 = "ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw=="; + }; + }; + "inflight-1.0.6" = { + name = "inflight"; + packageName = "inflight"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz"; + sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9"; + }; + }; + "inherits-2.0.4" = { + name = "inherits"; + packageName = "inherits"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz"; + sha512 = "k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="; + }; + }; + "ip-regex-2.1.0" = { + name = "ip-regex"; + packageName = "ip-regex"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ip-regex/-/ip-regex-2.1.0.tgz"; + sha1 = "fa78bf5d2e6913c911ce9f819ee5146bb6d844e9"; + }; + }; + "is-buffer-1.1.6" = { + name = "is-buffer"; + packageName = "is-buffer"; + version = "1.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz"; + sha512 = "NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="; + }; + }; + "is-url-1.2.4" = { + name = "is-url"; + packageName = "is-url"; + version = "1.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/is-url/-/is-url-1.2.4.tgz"; + sha512 = "ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww=="; + }; + }; + "is2-2.0.1" = { + name = "is2"; + packageName = "is2"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is2/-/is2-2.0.1.tgz"; + sha512 = "+WaJvnaA7aJySz2q/8sLjMb2Mw14KTplHmSwcSpZ/fWJPkUmqw3YTzSWbPJ7OAwRvdYTWF2Wg+yYJ1AdP5Z8CA=="; + }; + }; + "isarray-1.0.0" = { + name = "isarray"; + packageName = "isarray"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"; + sha1 = "bb935d48582cba168c06834957a54a3e07124f11"; + }; + }; + "js-polyfills-0.1.43" = { + name = "js-polyfills"; + packageName = "js-polyfills"; + version = "0.1.43"; + src = fetchurl { + url = "https://registry.npmjs.org/js-polyfills/-/js-polyfills-0.1.43.tgz"; + sha512 = "wWCJcw7uMA12uk7qcqZlIQy9nj+Evh1wVUmn5MOlJ7GPC8HT5PLjB9Uiqjw9ldAbbOuNOWJ6ENb7NwU6qqf48g=="; + }; + }; + "json3-3.3.3" = { + name = "json3"; + packageName = "json3"; + version = "3.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/json3/-/json3-3.3.3.tgz"; + sha512 = "c7/8mbUsKigAbLkD5B010BK4D9LZm7A1pNItkEwiUZRpIN66exu/e7YQWysGun+TRKaJp8MhemM+VkfWv42aCA=="; + }; + }; + "kind-of-3.2.2" = { + name = "kind-of"; + packageName = "kind-of"; + version = "3.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz"; + sha1 = "31ea21a734bab9bbb0f32466d893aea51e4a3c64"; + }; + }; + "lazy-cache-1.0.4" = { + name = "lazy-cache"; + packageName = "lazy-cache"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz"; + sha1 = "a1d78fc3a50474cb80845d3b3b6e1da49a446e8e"; + }; + }; + "longest-1.0.1" = { + name = "longest"; + packageName = "longest"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz"; + sha1 = "30a0b2da38f73770e8294a0d22e6625ed77d0097"; + }; + }; + "lru-cache-6.0.0" = { + name = "lru-cache"; + packageName = "lru-cache"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz"; + sha512 = "Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA=="; + }; + }; + "merge2-1.4.1" = { + name = "merge2"; + packageName = "merge2"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz"; + sha512 = "8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg=="; + }; + }; + "mime-1.6.0" = { + name = "mime"; + packageName = "mime"; + version = "1.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz"; + sha512 = "x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="; + }; + }; + "mime-db-1.45.0" = { + name = "mime-db"; + packageName = "mime-db"; + version = "1.45.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.45.0.tgz"; + sha512 = "CkqLUxUk15hofLoLyljJSrukZi8mAtgd+yE5uO4tqRZsdsAJKv0O+rFMhVDRJgozy+yG6md5KwuXhD4ocIoP+w=="; + }; + }; + "mime-types-2.1.28" = { + name = "mime-types"; + packageName = "mime-types"; + version = "2.1.28"; + src = fetchurl { + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.28.tgz"; + sha512 = "0TO2yJ5YHYr7M2zzT7gDU1tbwHxEUWBCLt0lscSNpcdAfFyJOVEpRYNS7EXVcTLNj/25QO8gulHC5JtTzSE2UQ=="; + }; + }; + "minimatch-3.0.4" = { + name = "minimatch"; + packageName = "minimatch"; + version = "3.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz"; + sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA=="; + }; + }; + "minimist-1.2.5" = { + name = "minimist"; + packageName = "minimist"; + version = "1.2.5"; + src = fetchurl { + url = "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz"; + sha512 = "FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="; + }; + }; + "mkdirp-1.0.4" = { + name = "mkdirp"; + packageName = "mkdirp"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz"; + sha512 = "vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="; + }; + }; + "mnemonist-0.38.1" = { + name = "mnemonist"; + packageName = "mnemonist"; + version = "0.38.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mnemonist/-/mnemonist-0.38.1.tgz"; + sha512 = "I674bCCj9p87Re+gv15ynDrP14XjcmLR7tBO22l3UoxQLniyIXdD9vid2sSxYkyOr0fZwJTA+dXRvrwANgdnyg=="; + }; + }; + "ms-2.0.0" = { + name = "ms"; + packageName = "ms"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz"; + sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8"; + }; + }; + "ms-2.1.1" = { + name = "ms"; + packageName = "ms"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz"; + sha512 = "tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg=="; + }; + }; + "ms-2.1.2" = { + name = "ms"; + packageName = "ms"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz"; + sha512 = "sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="; + }; + }; + "ms-2.1.3" = { + name = "ms"; + packageName = "ms"; + version = "2.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz"; + sha512 = "6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="; + }; + }; + "mutationobserver-shim-0.3.7" = { + name = "mutationobserver-shim"; + packageName = "mutationobserver-shim"; + version = "0.3.7"; + src = fetchurl { + url = "https://registry.npmjs.org/mutationobserver-shim/-/mutationobserver-shim-0.3.7.tgz"; + sha512 = "oRIDTyZQU96nAiz2AQyngwx1e89iApl2hN5AOYwyxLUB47UYsU3Wv9lJWqH5y/QdiYkc5HQLi23ZNB3fELdHcQ=="; + }; + }; + "negotiator-0.6.2" = { + name = "negotiator"; + packageName = "negotiator"; + version = "0.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz"; + sha512 = "hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw=="; + }; + }; + "neo-async-2.6.2" = { + name = "neo-async"; + packageName = "neo-async"; + version = "2.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz"; + sha512 = "Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw=="; + }; + }; + "object-assign-4.1.1" = { + name = "object-assign"; + packageName = "object-assign"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz"; + sha1 = "2109adc7965887cfc05cbbd442cac8bfbb360863"; + }; + }; + "obliterator-1.6.1" = { + name = "obliterator"; + packageName = "obliterator"; + version = "1.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/obliterator/-/obliterator-1.6.1.tgz"; + sha512 = "9WXswnqINnnhOG/5SLimUlzuU1hFJUc8zkwyD59Sd+dPOMf05PmnYG/d6Q7HZ+KmgkZJa1PxRso6QdM3sTNHig=="; + }; + }; + "on-finished-2.3.0" = { + name = "on-finished"; + packageName = "on-finished"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz"; + sha1 = "20f1336481b083cd75337992a16971aa2d906947"; + }; + }; + "once-1.4.0" = { + name = "once"; + packageName = "once"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/once/-/once-1.4.0.tgz"; + sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1"; + }; + }; + "parseurl-1.3.3" = { + name = "parseurl"; + packageName = "parseurl"; + version = "1.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz"; + sha512 = "CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ=="; + }; + }; + "path-is-absolute-1.0.1" = { + name = "path-is-absolute"; + packageName = "path-is-absolute"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"; + sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"; + }; + }; + "picturefill-3.0.3" = { + name = "picturefill"; + packageName = "picturefill"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/picturefill/-/picturefill-3.0.3.tgz"; + sha512 = "JDdx+3i4fs2pkqwWZJgGEM2vFWsq+01YsQFT9CKPGuv2Q0xSdrQZoxi9XwyNARTgxiOdgoAwWQRluLRe/JQX2g=="; + }; + }; + "polyfill-library-3.101.0" = { + name = "polyfill-library"; + packageName = "polyfill-library"; + version = "3.101.0"; + src = fetchurl { + url = "https://registry.npmjs.org/polyfill-library/-/polyfill-library-3.101.0.tgz"; + sha512 = "o/ln6GpYGf1Tn8wJiTkoZ3vEtf6oWrcqM9YC61CW4KaHawVm36R/wN+6ZAv7JoAsPFm0J7PsroukpJVlVxPRjQ=="; + }; + }; + "process-nextick-args-2.0.1" = { + name = "process-nextick-args"; + packageName = "process-nextick-args"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz"; + sha512 = "3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="; + }; + }; + "promise-polyfill-1.1.6" = { + name = "promise-polyfill"; + packageName = "promise-polyfill"; + version = "1.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/promise-polyfill/-/promise-polyfill-1.1.6.tgz"; + sha1 = "cd04eff46f5c95c3a7d045591d79b5e3e01f12d7"; + }; + }; + "range-parser-1.2.1" = { + name = "range-parser"; + packageName = "range-parser"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz"; + sha512 = "Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="; + }; + }; + "readable-stream-2.3.7" = { + name = "readable-stream"; + packageName = "readable-stream"; + version = "2.3.7"; + src = fetchurl { + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz"; + sha512 = "Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw=="; + }; + }; + "repeat-string-1.6.1" = { + name = "repeat-string"; + packageName = "repeat-string"; + version = "1.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz"; + sha1 = "8dcae470e1c88abc2d600fff4a776286da75e637"; + }; + }; + "right-align-0.1.3" = { + name = "right-align"; + packageName = "right-align"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz"; + sha1 = "61339b722fe6a3515689210d24e14c96148613ef"; + }; + }; + "rimraf-3.0.2" = { + name = "rimraf"; + packageName = "rimraf"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz"; + sha512 = "JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA=="; + }; + }; + "safe-buffer-5.1.2" = { + name = "safe-buffer"; + packageName = "safe-buffer"; + version = "5.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz"; + sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="; + }; + }; + "seamless-scroll-polyfill-1.2.3" = { + name = "seamless-scroll-polyfill"; + packageName = "seamless-scroll-polyfill"; + version = "1.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/seamless-scroll-polyfill/-/seamless-scroll-polyfill-1.2.3.tgz"; + sha512 = "emnwZtu6NrlBlvT6HrlbAOs024JX4orWew8H5owBOyUJ7eFXn8lGe4bsXTBD6AAWzP/p7LL86AjVIH8Apqec5w=="; + }; + }; + "semver-7.3.4" = { + name = "semver"; + packageName = "semver"; + version = "7.3.4"; + src = fetchurl { + url = "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz"; + sha512 = "tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw=="; + }; + }; + "send-0.17.1" = { + name = "send"; + packageName = "send"; + version = "0.17.1"; + src = fetchurl { + url = "https://registry.npmjs.org/send/-/send-0.17.1.tgz"; + sha512 = "BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg=="; + }; + }; + "serve-static-1.14.1" = { + name = "serve-static"; + packageName = "serve-static"; + version = "1.14.1"; + src = fetchurl { + url = "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz"; + sha512 = "JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg=="; + }; + }; + "setprototypeof-1.1.1" = { + name = "setprototypeof"; + packageName = "setprototypeof"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz"; + sha512 = "JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw=="; + }; + }; + "socket.io-3.0.5" = { + name = "socket.io"; + packageName = "socket.io"; + version = "3.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/socket.io/-/socket.io-3.0.5.tgz"; + sha512 = "5yWQ43P/4IttmPCGKDQ3CVocBiJWGpibyhYJxgUhf69EHMzmK8XW0DkmHIoYdLmZaVZJyiEkUqpeC7rSCIqekw=="; + }; + }; + "socket.io-adapter-2.0.3" = { + name = "socket.io-adapter"; + packageName = "socket.io-adapter"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.0.3.tgz"; + sha512 = "2wo4EXgxOGSFueqvHAdnmi5JLZzWqMArjuP4nqC26AtLh5PoCPsaRbRdah2xhcwTAMooZfjYiNVNkkmmSMaxOQ=="; + }; + }; + "socket.io-parser-4.0.3" = { + name = "socket.io-parser"; + packageName = "socket.io-parser"; + version = "4.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.0.3.tgz"; + sha512 = "m4ybFiP4UYVORRt7jcdqf8UWx+ywVdAqqsJyruXxAdD3Sv6MDemijWij34mOWdMJ55bEdIb9jACBhxUgNK6sxw=="; + }; + }; + "source-map-0.5.7" = { + name = "source-map"; + packageName = "source-map"; + version = "0.5.7"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz"; + sha1 = "8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"; + }; + }; + "source-map-0.6.1" = { + name = "source-map"; + packageName = "source-map"; + version = "0.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz"; + sha512 = "UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="; + }; + }; + "spdx-licenses-1.0.0" = { + name = "spdx-licenses"; + packageName = "spdx-licenses"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/spdx-licenses/-/spdx-licenses-1.0.0.tgz"; + sha512 = "BmeFZRYH9XXf56omx0LuiG+gBXRqwmrKsOtcsGTJh8tw9U0cgRKTrOnyDpP1uvI1AVEkoRKYaAvR902ByotFOw=="; + }; + }; + "statuses-1.5.0" = { + name = "statuses"; + packageName = "statuses"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz"; + sha1 = "161c7dac177659fd9811f43771fa99381478628c"; + }; + }; + "stream-cache-0.0.2" = { + name = "stream-cache"; + packageName = "stream-cache"; + version = "0.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-cache/-/stream-cache-0.0.2.tgz"; + sha1 = "1ac5ad6832428ca55667dbdee395dad4e6db118f"; + }; + }; + "stream-from-promise-1.0.0" = { + name = "stream-from-promise"; + packageName = "stream-from-promise"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-from-promise/-/stream-from-promise-1.0.0.tgz"; + sha1 = "763687f7dd777e4c894f6408333fc6b3fc8a61bb"; + }; + }; + "stream-to-string-1.2.0" = { + name = "stream-to-string"; + packageName = "stream-to-string"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-to-string/-/stream-to-string-1.2.0.tgz"; + sha512 = "8drZlFIKBHSMdX9GCWv8V9AAWnQcTqw0iAI6/GC7UJ0H0SwKeFKjOoZfGY1tOU00GGU7FYZQoJ/ZCUEoXhD7yQ=="; + }; + }; + "string_decoder-1.1.1" = { + name = "string_decoder"; + packageName = "string_decoder"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz"; + sha512 = "n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg=="; + }; + }; + "toidentifier-1.0.0" = { + name = "toidentifier"; + packageName = "toidentifier"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz"; + sha512 = "yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw=="; + }; + }; + "toposort-2.0.2" = { + name = "toposort"; + packageName = "toposort"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/toposort/-/toposort-2.0.2.tgz"; + sha1 = "ae21768175d1559d48bef35420b2f4962f09c330"; + }; + }; + "tslib-2.1.0" = { + name = "tslib"; + packageName = "tslib"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz"; + sha512 = "hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A=="; + }; + }; + "uglify-js-2.8.29" = { + name = "uglify-js"; + packageName = "uglify-js"; + version = "2.8.29"; + src = fetchurl { + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz"; + sha1 = "29c5733148057bb4e1f75df35b7a9cb72e6a59dd"; + }; + }; + "uglify-js-3.12.4" = { + name = "uglify-js"; + packageName = "uglify-js"; + version = "3.12.4"; + src = fetchurl { + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.12.4.tgz"; + sha512 = "L5i5jg/SHkEqzN18gQMTWsZk3KelRsfD1wUVNqtq0kzqWQqcJjyL8yc1o8hJgRrWqrAl2mUFbhfznEIoi7zi2A=="; + }; + }; + "uglify-to-browserify-1.0.2" = { + name = "uglify-to-browserify"; + packageName = "uglify-to-browserify"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz"; + sha1 = "6e0924d6bda6b5afe349e39a6d632850a0f882b7"; + }; + }; + "unorm-1.6.0" = { + name = "unorm"; + packageName = "unorm"; + version = "1.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/unorm/-/unorm-1.6.0.tgz"; + sha512 = "b2/KCUlYZUeA7JFUuRJZPUtr4gZvBh7tavtv4fvk4+KV9pfGiR6CQAQAWl49ZpR3ts2dk4FYkP7EIgDJoiOLDA=="; + }; + }; + "usertiming-0.1.8" = { + name = "usertiming"; + packageName = "usertiming"; + version = "0.1.8"; + src = fetchurl { + url = "https://registry.npmjs.org/usertiming/-/usertiming-0.1.8.tgz"; + sha1 = "35378e7f41a248d40e658d05f80423469a7b0650"; + }; + }; + "util-deprecate-1.0.2" = { + name = "util-deprecate"; + packageName = "util-deprecate"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"; + sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf"; + }; + }; + "vary-1.1.2" = { + name = "vary"; + packageName = "vary"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz"; + sha1 = "2299f02c6ded30d4a5961b0b9f74524a18f634fc"; + }; + }; + "web-animations-js-2.3.2" = { + name = "web-animations-js"; + packageName = "web-animations-js"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/web-animations-js/-/web-animations-js-2.3.2.tgz"; + sha512 = "TOMFWtQdxzjWp8qx4DAraTWTsdhxVSiWa6NkPFSaPtZ1diKUxTn4yTix73A1euG1WbSOMMPcY51cnjTIHrGtDA=="; + }; + }; + "whatwg-fetch-3.5.0" = { + name = "whatwg-fetch"; + packageName = "whatwg-fetch"; + version = "3.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.5.0.tgz"; + sha512 = "jXkLtsR42xhXg7akoDKvKWE40eJeI+2KZqcp2h3NsOrRnDvtWX36KcKl30dy+hxECivdk2BVUHVNrPtoMBUx6A=="; + }; + }; + "wicg-inert-3.1.0" = { + name = "wicg-inert"; + packageName = "wicg-inert"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/wicg-inert/-/wicg-inert-3.1.0.tgz"; + sha512 = "P0ZiWaN9SxOkJbYtF/PIwmIRO8UTqTJtyl33QTQlHfAb6h15T0Dp5m7WTJ8N6UWIoj+KU5M0a8EtfRZLlHiP0Q=="; + }; + }; + "window-size-0.1.0" = { + name = "window-size"; + packageName = "window-size"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz"; + sha1 = "5438cd2ea93b202efa3a19fe8887aee7c94f9c9d"; + }; + }; + "wordwrap-0.0.2" = { + name = "wordwrap"; + packageName = "wordwrap"; + version = "0.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz"; + sha1 = "b79669bb42ecb409f83d583cad52ca17eaa1643f"; + }; + }; + "wordwrap-1.0.0" = { + name = "wordwrap"; + packageName = "wordwrap"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz"; + sha1 = "27584810891456a4171c8d0226441ade90cbcaeb"; + }; + }; + "wrappy-1.0.2" = { + name = "wrappy"; + packageName = "wrappy"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"; + sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"; + }; + }; + "ws-7.4.2" = { + name = "ws"; + packageName = "ws"; + version = "7.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ws/-/ws-7.4.2.tgz"; + sha512 = "T4tewALS3+qsrpGI/8dqNMLIVdq/g/85U98HPMa6F0m6xTbvhXU6RCQLqPH3+SlomNV/LdY6RXEbBpMH6EOJnA=="; + }; + }; + "yaku-1.0.1" = { + name = "yaku"; + packageName = "yaku"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/yaku/-/yaku-1.0.1.tgz"; + sha512 = "uZCrhA5DEytGnFfw9XZKIoWRG43v6oCA20vInFS4anPJb3G5Hy+PKuaKSMTJ+aChvFdNDxY5K8jFx5wmlLbTjQ=="; + }; + }; + "yallist-4.0.0" = { + name = "yallist"; + packageName = "yallist"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz"; + sha512 = "3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="; + }; + }; + "yargs-3.10.0" = { + name = "yargs"; + packageName = "yargs"; + version = "3.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz"; + sha1 = "f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1"; + }; + }; + }; +in +{ + "whitebophir-git+https://github.com/lovasoa/whitebophir.git#v1.7.0" = nodeEnv.buildNodePackage { + name = "whitebophir"; + packageName = "whitebophir"; + version = "1.7.0"; + src = fetchgit { + url = "https://github.com/lovasoa/whitebophir.git"; + rev = "3bf594334e683c63229ac9b6b3a607fdad43c8e1"; + sha256 = "7d6d7baddc759d75b586131c436be3ea16b63889f916996e866f2e9aca7cfe50"; + }; + dependencies = [ + sources."@financial-times/polyfill-useragent-normaliser-1.9.0" + sources."@financial-times/useragent_parser-1.5.1" + sources."@formatjs/ecma402-abstract-1.5.0" + sources."@formatjs/intl-datetimeformat-3.2.2" + sources."@formatjs/intl-displaynames-4.0.3" + sources."@formatjs/intl-getcanonicallocales-1.5.3" + sources."@formatjs/intl-listformat-5.0.3" + sources."@formatjs/intl-locale-2.4.12" + sources."@formatjs/intl-numberformat-6.1.2" + sources."@formatjs/intl-pluralrules-4.0.2" + sources."@formatjs/intl-relativetimeformat-8.0.2" + sources."@juggle/resize-observer-3.2.0" + sources."@types/component-emitter-1.2.10" + sources."@types/cookie-0.4.0" + sources."@types/cors-2.8.9" + sources."@types/node-14.14.20" + sources."@webcomponents/template-1.4.4" + sources."Base64-1.1.0" + sources."abort-controller-3.0.0" + sources."accept-language-parser-1.5.0" + sources."accepts-1.3.7" + sources."align-text-0.1.4" + sources."audio-context-polyfill-1.0.0" + sources."balanced-match-1.0.0" + sources."base64-arraybuffer-0.1.4" + sources."base64id-2.0.0" + sources."brace-expansion-1.1.11" + sources."camelcase-1.2.1" + sources."center-align-0.1.3" + sources."cldr-core-38.0.0" + (sources."cliui-2.1.0" // { + dependencies = [ + sources."wordwrap-0.0.2" + ]; + }) + sources."component-emitter-1.3.0" + sources."concat-map-0.0.1" + sources."cookie-0.4.1" + sources."core-util-is-1.0.2" + sources."cors-2.8.5" + sources."current-script-polyfill-1.0.0" + sources."debug-4.1.1" + sources."decamelize-1.2.0" + sources."deep-is-0.1.3" + sources."depd-1.1.2" + sources."destroy-1.0.4" + sources."diff-4.0.2" + sources."ee-first-1.1.1" + sources."encodeurl-1.0.2" + (sources."engine.io-4.0.6" // { + dependencies = [ + sources."debug-4.3.2" + sources."ms-2.1.2" + ]; + }) + sources."engine.io-parser-4.0.2" + sources."escape-html-1.0.3" + sources."etag-1.8.1" + sources."event-source-polyfill-1.0.22" + sources."event-target-shim-5.0.1" + sources."fastestsmallesttextencoderdecoder-1.0.22" + sources."fresh-0.5.2" + sources."from2-2.3.0" + sources."from2-string-1.1.0" + sources."fs.realpath-1.0.0" + sources."glob-7.1.6" + sources."graceful-fs-4.2.4" + sources."handlebars-4.7.6" + sources."html5shiv-3.7.3" + sources."http-errors-1.7.3" + sources."inflight-1.0.6" + sources."inherits-2.0.4" + sources."ip-regex-2.1.0" + sources."is-buffer-1.1.6" + sources."is-url-1.2.4" + sources."is2-2.0.1" + sources."isarray-1.0.0" + sources."js-polyfills-0.1.43" + sources."json3-3.3.3" + sources."kind-of-3.2.2" + sources."lazy-cache-1.0.4" + sources."longest-1.0.1" + sources."lru-cache-6.0.0" + sources."merge2-1.4.1" + sources."mime-1.6.0" + sources."mime-db-1.45.0" + sources."mime-types-2.1.28" + sources."minimatch-3.0.4" + sources."minimist-1.2.5" + sources."mkdirp-1.0.4" + sources."mnemonist-0.38.1" + sources."ms-2.1.3" + sources."mutationobserver-shim-0.3.7" + sources."negotiator-0.6.2" + sources."neo-async-2.6.2" + sources."object-assign-4.1.1" + sources."obliterator-1.6.1" + sources."on-finished-2.3.0" + sources."once-1.4.0" + sources."parseurl-1.3.3" + sources."path-is-absolute-1.0.1" + sources."picturefill-3.0.3" + (sources."polyfill-library-3.101.0" // { + dependencies = [ + sources."source-map-0.5.7" + sources."uglify-js-2.8.29" + ]; + }) + sources."process-nextick-args-2.0.1" + sources."promise-polyfill-1.1.6" + sources."range-parser-1.2.1" + sources."readable-stream-2.3.7" + sources."repeat-string-1.6.1" + sources."right-align-0.1.3" + sources."rimraf-3.0.2" + sources."safe-buffer-5.1.2" + sources."seamless-scroll-polyfill-1.2.3" + sources."semver-7.3.4" + (sources."send-0.17.1" // { + dependencies = [ + (sources."debug-2.6.9" // { + dependencies = [ + sources."ms-2.0.0" + ]; + }) + sources."ms-2.1.1" + ]; + }) + sources."serve-static-1.14.1" + sources."setprototypeof-1.1.1" + (sources."socket.io-3.0.5" // { + dependencies = [ + sources."debug-4.3.2" + sources."ms-2.1.2" + ]; + }) + sources."socket.io-adapter-2.0.3" + (sources."socket.io-parser-4.0.3" // { + dependencies = [ + sources."debug-4.3.2" + sources."ms-2.1.2" + ]; + }) + sources."source-map-0.6.1" + sources."spdx-licenses-1.0.0" + sources."statuses-1.5.0" + sources."stream-cache-0.0.2" + sources."stream-from-promise-1.0.0" + sources."stream-to-string-1.2.0" + sources."string_decoder-1.1.1" + sources."toidentifier-1.0.0" + sources."toposort-2.0.2" + sources."tslib-2.1.0" + sources."uglify-js-3.12.4" + sources."uglify-to-browserify-1.0.2" + sources."unorm-1.6.0" + sources."usertiming-0.1.8" + sources."util-deprecate-1.0.2" + sources."vary-1.1.2" + sources."web-animations-js-2.3.2" + sources."whatwg-fetch-3.5.0" + sources."wicg-inert-3.1.0" + sources."window-size-0.1.0" + sources."wordwrap-1.0.0" + sources."wrappy-1.0.2" + sources."ws-7.4.2" + sources."yaku-1.0.1" + sources."yallist-4.0.0" + sources."yargs-3.10.0" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Online collaborative whiteboard"; + license = "AGPL-3.0-or-later"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; +} \ No newline at end of file diff --git a/pkgs/servers/web-apps/whitebophir/node-packages.json b/pkgs/servers/web-apps/whitebophir/node-packages.json new file mode 100644 index 000000000000..44977342cc27 --- /dev/null +++ b/pkgs/servers/web-apps/whitebophir/node-packages.json @@ -0,0 +1,3 @@ +[ + { "whitebophir": "git+https://github.com/lovasoa/whitebophir.git#v1.7.0" } +] diff --git a/pkgs/servers/web-apps/whitebophir/node-packages.nix b/pkgs/servers/web-apps/whitebophir/node-packages.nix new file mode 100644 index 000000000000..d0273cfe1f9a --- /dev/null +++ b/pkgs/servers/web-apps/whitebophir/node-packages.nix @@ -0,0 +1,17 @@ +# This file has been generated by node2nix 1.8.0. Do not edit! + +{pkgs ? import { + inherit system; + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}: + +let + nodeEnv = import ../../../development/node-packages/node-env.nix { + inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile; + inherit nodejs; + libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; + }; +in +import ./node-packages-generated.nix { + inherit (pkgs) fetchurl fetchgit; + inherit nodeEnv; +} diff --git a/pkgs/servers/web-apps/wordpress/default.nix b/pkgs/servers/web-apps/wordpress/default.nix index af2a41202671..0fae5ac2287e 100644 --- a/pkgs/servers/web-apps/wordpress/default.nix +++ b/pkgs/servers/web-apps/wordpress/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, nixosTests }: +{ lib, stdenv, fetchurl, nixosTests }: stdenv.mkDerivation rec { pname = "wordpress"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { inherit (nixosTests) wordpress; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://wordpress.org"; description = "WordPress is open source software you can use to create a beautiful website, blog, or app"; license = [ licenses.gpl2 ]; diff --git a/pkgs/servers/webmetro/default.nix b/pkgs/servers/webmetro/default.nix index 4be6ef682747..316e3a524972 100644 --- a/pkgs/servers/webmetro/default.nix +++ b/pkgs/servers/webmetro/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform }: +{ lib, stdenv, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { pname = "webmetro"; @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0xifc3jwj0c6ynx0gzm5zlnfcq023fjpjmdg9x0vs1fh3b42pdsy"; - meta = with stdenv.lib; { + meta = with lib; { description = "Simple relay server for broadcasting a WebM stream"; longDescription = '' Webmetro is a simple relay server for broadcasting a WebM stream diff --git a/pkgs/servers/wsdd/default.nix b/pkgs/servers/wsdd/default.nix index 1411b6f3adcf..8fdd9a93a239 100644 --- a/pkgs/servers/wsdd/default.nix +++ b/pkgs/servers/wsdd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, makeWrapper, nixosTests, python3 }: +{ lib, stdenv, fetchFromGitHub, makeWrapper, nixosTests, python3, fetchpatch }: stdenv.mkDerivation rec { pname = "wsdd"; @@ -15,6 +15,15 @@ stdenv.mkDerivation rec { buildInputs = [ python3 ]; + patches = [ + (fetchpatch { + # https://github.com/christgau/wsdd/issues/72 + name = "fix_send_messages_using_correct_socket.patch"; + url = "https://github.com/christgau/wsdd/commit/1ed74fe73a9fe2e2720859e2822116d65e4ffa5b.patch"; + sha256 = "1n9bqvh20nhnvnc5pxvzf9kk8nky6rmbmfryg65lfmr1hmg676zg"; + }) + ]; + installPhase = '' install -Dm0755 src/wsdd.py $out/bin/wsdd wrapProgram $out/bin/wsdd --prefix PYTHONPATH : "$PYTHONPATH" @@ -24,7 +33,7 @@ stdenv.mkDerivation rec { tests.samba-wsdd = nixosTests.samba-wsdd; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/christgau/wsdd"; description = "A Web Service Discovery (WSD) host daemon for SMB/Samba"; maintainers = with maintainers; [ izorkin ]; diff --git a/pkgs/servers/x11/quartz-wm/default.nix b/pkgs/servers/x11/quartz-wm/default.nix index 84904d48b1ee..0d7d6df87bc0 100644 --- a/pkgs/servers/x11/quartz-wm/default.nix +++ b/pkgs/servers/x11/quartz-wm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, xorg, pixman, pkgconfig, AppKit, Foundation, Xplugin }: +{ lib, stdenv, fetchurl, xorg, pixman, pkgconfig, AppKit, Foundation, Xplugin }: let version = "1.3.1"; in stdenv.mkDerivation { @@ -22,7 +22,7 @@ in stdenv.mkDerivation { pkgconfig AppKit Xplugin Foundation ]; - meta = with stdenv.lib; { + meta = with lib; { license = licenses.apsl20; platforms = platforms.darwin; maintainers = with maintainers; [ matthewbauer ]; diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 42b2c69f688e..a5904629670b 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -15,7 +15,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 xorgproto libXt ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; bdftopcf = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { @@ -28,7 +28,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; bitmap = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXaw, xbitmaps, libXmu, xorgproto, libXt }: stdenv.mkDerivation { @@ -41,7 +41,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 libXaw xbitmaps libXmu xorgproto libXt ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; editres = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXaw, libXmu, xorgproto, libXt }: stdenv.mkDerivation { @@ -54,7 +54,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 libXaw libXmu xorgproto libXt ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; encodings = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { @@ -67,7 +67,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; fontadobe100dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { @@ -81,7 +81,7 @@ lib.makeScope newScope (self: with self; { nativeBuildInputs = [ pkgconfig bdftopcf fontutil mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; fontadobe75dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { @@ -95,7 +95,7 @@ lib.makeScope newScope (self: with self; { nativeBuildInputs = [ pkgconfig bdftopcf fontutil mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; fontadobeutopia100dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { @@ -109,7 +109,7 @@ lib.makeScope newScope (self: with self; { nativeBuildInputs = [ pkgconfig bdftopcf fontutil mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; fontadobeutopia75dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { @@ -123,7 +123,7 @@ lib.makeScope newScope (self: with self; { nativeBuildInputs = [ pkgconfig bdftopcf fontutil mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; fontadobeutopiatype1 = callPackage ({ stdenv, pkgconfig, fetchurl, mkfontscale }: stdenv.mkDerivation { @@ -137,7 +137,7 @@ lib.makeScope newScope (self: with self; { nativeBuildInputs = [ pkgconfig mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; fontalias = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { @@ -150,7 +150,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; fontarabicmisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { @@ -164,7 +164,7 @@ lib.makeScope newScope (self: with self; { nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; fontbh100dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { @@ -178,7 +178,7 @@ lib.makeScope newScope (self: with self; { nativeBuildInputs = [ pkgconfig bdftopcf fontutil mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; fontbh75dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { @@ -192,7 +192,7 @@ lib.makeScope newScope (self: with self; { nativeBuildInputs = [ pkgconfig bdftopcf fontutil mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; fontbhlucidatypewriter100dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { @@ -206,7 +206,7 @@ lib.makeScope newScope (self: with self; { nativeBuildInputs = [ pkgconfig bdftopcf fontutil mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; fontbhlucidatypewriter75dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { @@ -220,7 +220,7 @@ lib.makeScope newScope (self: with self; { nativeBuildInputs = [ pkgconfig bdftopcf fontutil mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; fontbhttf = callPackage ({ stdenv, pkgconfig, fetchurl, mkfontscale }: stdenv.mkDerivation { @@ -234,7 +234,7 @@ lib.makeScope newScope (self: with self; { nativeBuildInputs = [ pkgconfig mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; fontbhtype1 = callPackage ({ stdenv, pkgconfig, fetchurl, mkfontscale }: stdenv.mkDerivation { @@ -248,7 +248,7 @@ lib.makeScope newScope (self: with self; { nativeBuildInputs = [ pkgconfig mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; fontbitstream100dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { @@ -262,7 +262,7 @@ lib.makeScope newScope (self: with self; { nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; fontbitstream75dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { @@ -276,7 +276,7 @@ lib.makeScope newScope (self: with self; { nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; fontbitstreamtype1 = callPackage ({ stdenv, pkgconfig, fetchurl, mkfontscale }: stdenv.mkDerivation { @@ -290,7 +290,7 @@ lib.makeScope newScope (self: with self; { nativeBuildInputs = [ pkgconfig mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; fontcronyxcyrillic = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { @@ -304,7 +304,7 @@ lib.makeScope newScope (self: with self; { nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; fontcursormisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { @@ -318,7 +318,7 @@ lib.makeScope newScope (self: with self; { nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; fontdaewoomisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { @@ -332,7 +332,7 @@ lib.makeScope newScope (self: with self; { nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; fontdecmisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { @@ -346,7 +346,7 @@ lib.makeScope newScope (self: with self; { nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; fontibmtype1 = callPackage ({ stdenv, pkgconfig, fetchurl, mkfontscale }: stdenv.mkDerivation { @@ -360,7 +360,7 @@ lib.makeScope newScope (self: with self; { nativeBuildInputs = [ pkgconfig mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; fontisasmisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { @@ -374,7 +374,7 @@ lib.makeScope newScope (self: with self; { nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; fontjismisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { @@ -388,7 +388,7 @@ lib.makeScope newScope (self: with self; { nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; fontmicromisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { @@ -402,7 +402,7 @@ lib.makeScope newScope (self: with self; { nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; fontmisccyrillic = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { @@ -416,7 +416,7 @@ lib.makeScope newScope (self: with self; { nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; fontmiscethiopic = callPackage ({ stdenv, pkgconfig, fetchurl, mkfontscale }: stdenv.mkDerivation { @@ -430,7 +430,7 @@ lib.makeScope newScope (self: with self; { nativeBuildInputs = [ pkgconfig mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; fontmiscmeltho = callPackage ({ stdenv, pkgconfig, fetchurl, mkfontscale }: stdenv.mkDerivation { @@ -444,7 +444,7 @@ lib.makeScope newScope (self: with self; { nativeBuildInputs = [ pkgconfig mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; fontmiscmisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { @@ -458,7 +458,7 @@ lib.makeScope newScope (self: with self; { nativeBuildInputs = [ pkgconfig bdftopcf fontutil mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; fontmuttmisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { @@ -472,7 +472,7 @@ lib.makeScope newScope (self: with self; { nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; fontschumachermisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { @@ -486,7 +486,7 @@ lib.makeScope newScope (self: with self; { nativeBuildInputs = [ pkgconfig bdftopcf fontutil mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; fontscreencyrillic = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { @@ -500,7 +500,7 @@ lib.makeScope newScope (self: with self; { nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; fontsonymisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { @@ -514,7 +514,7 @@ lib.makeScope newScope (self: with self; { nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; fontsunmisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { @@ -528,7 +528,7 @@ lib.makeScope newScope (self: with self; { nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; fonttosfnt = callPackage ({ stdenv, pkgconfig, fetchurl, libfontenc, freetype, xorgproto }: stdenv.mkDerivation { @@ -541,7 +541,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libfontenc freetype xorgproto ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; fontutil = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { @@ -554,7 +554,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; fontwinitzkicyrillic = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { @@ -568,7 +568,7 @@ lib.makeScope newScope (self: with self; { nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; fontxfree86type1 = callPackage ({ stdenv, pkgconfig, fetchurl, mkfontscale }: stdenv.mkDerivation { @@ -582,7 +582,7 @@ lib.makeScope newScope (self: with self; { nativeBuildInputs = [ pkgconfig mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; gccmakedep = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { @@ -595,7 +595,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; iceauth = callPackage ({ stdenv, pkgconfig, fetchurl, libICE, xorgproto }: stdenv.mkDerivation { @@ -608,7 +608,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libICE xorgproto ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; ico = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { @@ -621,7 +621,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 xorgproto ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; imake = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto }: stdenv.mkDerivation { @@ -634,7 +634,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ xorgproto ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; libAppleWM = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11, libXext }: stdenv.mkDerivation { @@ -647,7 +647,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ xorgproto libX11 libXext ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; libFS = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, xtrans }: stdenv.mkDerivation { @@ -660,7 +660,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ xorgproto xtrans ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; libICE = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, xtrans }: stdenv.mkDerivation { @@ -673,7 +673,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ xorgproto xtrans ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; libSM = callPackage ({ stdenv, pkgconfig, fetchurl, libICE, libuuid, xorgproto, xtrans }: stdenv.mkDerivation { @@ -686,7 +686,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libICE libuuid xorgproto xtrans ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; libWindowsWM = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11, libXext }: stdenv.mkDerivation { @@ -699,7 +699,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ xorgproto libX11 libXext ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; libX11 = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libxcb, xtrans }: stdenv.mkDerivation { @@ -712,7 +712,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ xorgproto libxcb xtrans ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; libXScrnSaver = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11, libXext }: stdenv.mkDerivation { @@ -725,7 +725,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ xorgproto libX11 libXext ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; libXTrap = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11, libXext, libXt }: stdenv.mkDerivation { @@ -738,7 +738,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ xorgproto libX11 libXext libXt ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; libXau = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto }: stdenv.mkDerivation { @@ -751,7 +751,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ xorgproto ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; libXaw = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, xorgproto, libXmu, libXpm, libXt }: stdenv.mkDerivation { @@ -764,7 +764,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 libXext xorgproto libXmu libXpm libXt ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; libXaw3d = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, libXmu, libXpm, xorgproto, libXt }: stdenv.mkDerivation { @@ -777,7 +777,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 libXext libXmu libXpm xorgproto libXt ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; libXcomposite = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11, libXfixes }: stdenv.mkDerivation { @@ -790,7 +790,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ xorgproto libX11 libXfixes ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; libXcursor = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11, libXfixes, libXrender }: stdenv.mkDerivation { @@ -803,7 +803,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ xorgproto libX11 libXfixes libXrender ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; libXdamage = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11, libXfixes }: stdenv.mkDerivation { @@ -816,7 +816,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ xorgproto libX11 libXfixes ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; libXdmcp = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto }: stdenv.mkDerivation { @@ -829,7 +829,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ xorgproto ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; libXext = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { @@ -842,7 +842,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 xorgproto ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; libXfixes = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11 }: stdenv.mkDerivation { @@ -855,7 +855,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ xorgproto libX11 ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; libXfont = callPackage ({ stdenv, pkgconfig, fetchurl, libfontenc, xorgproto, freetype, xtrans, zlib }: stdenv.mkDerivation { @@ -868,7 +868,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libfontenc xorgproto freetype xtrans zlib ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; libXfont2 = callPackage ({ stdenv, pkgconfig, fetchurl, libfontenc, xorgproto, freetype, xtrans, zlib }: stdenv.mkDerivation { @@ -881,7 +881,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libfontenc xorgproto freetype xtrans zlib ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; libXft = callPackage ({ stdenv, pkgconfig, fetchurl, fontconfig, freetype, libX11, xorgproto, libXrender }: stdenv.mkDerivation { @@ -894,7 +894,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ fontconfig freetype libX11 xorgproto libXrender ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; libXi = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11, libXext, libXfixes }: stdenv.mkDerivation { @@ -907,7 +907,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ xorgproto libX11 libXext libXfixes ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; libXinerama = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, xorgproto }: stdenv.mkDerivation { @@ -920,7 +920,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 libXext xorgproto ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; libXmu = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, xorgproto, libXt }: stdenv.mkDerivation { @@ -933,7 +933,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 libXext xorgproto libXt ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; libXp = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11, libXau, libXext }: stdenv.mkDerivation { @@ -946,7 +946,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ xorgproto libX11 libXau libXext ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; libXpm = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, xorgproto, libXt, gettext }: stdenv.mkDerivation { @@ -959,7 +959,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig gettext ]; buildInputs = [ libX11 libXext xorgproto libXt ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; libXpresent = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11 }: stdenv.mkDerivation { @@ -972,7 +972,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ xorgproto libX11 ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; libXrandr = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11, libXext, libXrender }: stdenv.mkDerivation { @@ -985,7 +985,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ xorgproto libX11 libXext libXrender ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; libXrender = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11 }: stdenv.mkDerivation { @@ -998,7 +998,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ xorgproto libX11 ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; libXres = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11, libXext }: stdenv.mkDerivation { @@ -1011,7 +1011,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ xorgproto libX11 libXext ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; libXt = callPackage ({ stdenv, pkgconfig, fetchurl, libICE, xorgproto, libSM, libX11 }: stdenv.mkDerivation { @@ -1024,7 +1024,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libICE xorgproto libSM libX11 ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; libXtst = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11, libXext, libXi }: stdenv.mkDerivation { @@ -1037,7 +1037,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ xorgproto libX11 libXext libXi ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; libXv = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11, libXext }: stdenv.mkDerivation { @@ -1050,7 +1050,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ xorgproto libX11 libXext ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; libXvMC = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11, libXext, libXv }: stdenv.mkDerivation { @@ -1063,7 +1063,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ xorgproto libX11 libXext libXv ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; libXxf86dga = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, xorgproto }: stdenv.mkDerivation { @@ -1076,7 +1076,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 libXext xorgproto ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; libXxf86misc = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, xorgproto }: stdenv.mkDerivation { @@ -1089,7 +1089,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 libXext xorgproto ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; libXxf86vm = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, xorgproto }: stdenv.mkDerivation { @@ -1102,7 +1102,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 libXext xorgproto ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; libdmx = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11, libXext }: stdenv.mkDerivation { @@ -1115,7 +1115,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ xorgproto libX11 libXext ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; libfontenc = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, zlib }: stdenv.mkDerivation { @@ -1128,7 +1128,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ xorgproto zlib ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; libpciaccess = callPackage ({ stdenv, pkgconfig, fetchurl, zlib }: stdenv.mkDerivation { @@ -1141,7 +1141,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ zlib ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; libpthreadstubs = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { @@ -1154,7 +1154,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; libxcb = callPackage ({ stdenv, pkgconfig, fetchurl, libxslt, libpthreadstubs, libXau, xcbproto, libXdmcp, python3 }: stdenv.mkDerivation { @@ -1167,7 +1167,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig python3 ]; buildInputs = [ libxslt libpthreadstubs libXau xcbproto libXdmcp ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; libxkbfile = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11 }: stdenv.mkDerivation { @@ -1180,7 +1180,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ xorgproto libX11 ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; libxshmfence = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto }: stdenv.mkDerivation { @@ -1193,7 +1193,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ xorgproto ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; listres = callPackage ({ stdenv, pkgconfig, fetchurl, libXaw, libXmu, xorgproto, libXt }: stdenv.mkDerivation { @@ -1206,7 +1206,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libXaw libXmu xorgproto libXt ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; lndir = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto }: stdenv.mkDerivation { @@ -1219,7 +1219,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ xorgproto ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; luit = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { @@ -1232,7 +1232,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; makedepend = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto }: stdenv.mkDerivation { @@ -1245,7 +1245,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ xorgproto ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; mkfontscale = callPackage ({ stdenv, pkgconfig, fetchurl, libfontenc, freetype, xorgproto, zlib }: stdenv.mkDerivation { @@ -1258,7 +1258,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libfontenc freetype xorgproto zlib ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; oclock = callPackage ({ stdenv, pkgconfig, fetchurl, libxkbfile, libX11, libXext, libXmu, libXt }: stdenv.mkDerivation { @@ -1271,7 +1271,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libxkbfile libX11 libXext libXmu libXt ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; sessreg = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto }: stdenv.mkDerivation { @@ -1284,7 +1284,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ xorgproto ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; setxkbmap = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libxkbfile }: stdenv.mkDerivation { @@ -1297,7 +1297,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 libxkbfile ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; smproxy = callPackage ({ stdenv, pkgconfig, fetchurl, libICE, libSM, libXmu, libXt }: stdenv.mkDerivation { @@ -1310,7 +1310,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libICE libSM libXmu libXt ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; transset = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { @@ -1323,7 +1323,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 xorgproto ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; twm = callPackage ({ stdenv, pkgconfig, fetchurl, libICE, libSM, libX11, libXext, libXmu, xorgproto, libXt }: stdenv.mkDerivation { @@ -1336,7 +1336,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libICE libSM libX11 libXext libXmu xorgproto libXt ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; utilmacros = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { @@ -1349,7 +1349,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; viewres = callPackage ({ stdenv, pkgconfig, fetchurl, libXaw, libXmu, libXt }: stdenv.mkDerivation { @@ -1362,7 +1362,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libXaw libXmu libXt ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; x11perf = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, libXft, libXmu, xorgproto, libXrender }: stdenv.mkDerivation { @@ -1375,7 +1375,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 libXext libXft libXmu xorgproto libXrender ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; xauth = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXau, libXext, libXmu, xorgproto }: stdenv.mkDerivation { @@ -1388,7 +1388,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 libXau libXext libXmu xorgproto ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; xbacklight = callPackage ({ stdenv, pkgconfig, fetchurl, libxcb, xcbutil }: stdenv.mkDerivation { @@ -1401,7 +1401,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libxcb xcbutil ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; xbitmaps = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { @@ -1414,7 +1414,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; xcalc = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXaw, xorgproto, libXt }: stdenv.mkDerivation { @@ -1427,7 +1427,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 libXaw xorgproto libXt ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; xcbproto = callPackage ({ stdenv, pkgconfig, fetchurl, python3 }: stdenv.mkDerivation { @@ -1440,7 +1440,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig python3 ]; buildInputs = [ ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; xcbutil = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, libxcb, xorgproto, m4 }: stdenv.mkDerivation { @@ -1453,7 +1453,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig m4 ]; buildInputs = [ gperf libxcb xorgproto ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; xcbutilcursor = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, libxcb, xcbutilimage, xcbutilrenderutil, xorgproto, m4 }: stdenv.mkDerivation { @@ -1466,7 +1466,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig m4 ]; buildInputs = [ gperf libxcb xcbutilimage xcbutilrenderutil xorgproto ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; xcbutilerrors = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, libxcb, xcbproto, xorgproto, m4 }: stdenv.mkDerivation { @@ -1479,7 +1479,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig m4 ]; buildInputs = [ gperf libxcb xcbproto xorgproto ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; xcbutilimage = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, libxcb, xcbutil, xorgproto, m4 }: stdenv.mkDerivation { @@ -1492,7 +1492,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig m4 ]; buildInputs = [ gperf libxcb xcbutil xorgproto ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; xcbutilkeysyms = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, libxcb, xorgproto, m4 }: stdenv.mkDerivation { @@ -1505,7 +1505,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig m4 ]; buildInputs = [ gperf libxcb xorgproto ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; xcbutilrenderutil = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, libxcb, xorgproto, m4 }: stdenv.mkDerivation { @@ -1518,7 +1518,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig m4 ]; buildInputs = [ gperf libxcb xorgproto ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; xcbutilwm = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, libxcb, xorgproto, m4 }: stdenv.mkDerivation { @@ -1531,7 +1531,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig m4 ]; buildInputs = [ gperf libxcb xorgproto ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; xclock = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXaw, libXft, libxkbfile, libXmu, xorgproto, libXrender, libXt }: stdenv.mkDerivation { @@ -1544,7 +1544,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 libXaw libXft libxkbfile libXmu xorgproto libXrender libXt ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; xcmsdb = callPackage ({ stdenv, pkgconfig, fetchurl, libX11 }: stdenv.mkDerivation { @@ -1557,7 +1557,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; xcompmgr = callPackage ({ stdenv, pkgconfig, fetchurl, libXcomposite, libXdamage, libXext, libXfixes, libXrender }: stdenv.mkDerivation { @@ -1570,7 +1570,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libXcomposite libXdamage libXext libXfixes libXrender ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; xconsole = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXaw, libXmu, xorgproto, libXt }: stdenv.mkDerivation { @@ -1583,7 +1583,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 libXaw libXmu xorgproto libXt ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; xcursorgen = callPackage ({ stdenv, pkgconfig, fetchurl, libpng, libX11, libXcursor }: stdenv.mkDerivation { @@ -1596,7 +1596,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libpng libX11 libXcursor ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; xcursorthemes = callPackage ({ stdenv, pkgconfig, fetchurl, libXcursor }: stdenv.mkDerivation { @@ -1609,7 +1609,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libXcursor ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; xdm = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXau, libXaw, libXdmcp, libXext, libXft, libXinerama, libXmu, libXpm, xorgproto, libXrender, libXt }: stdenv.mkDerivation { @@ -1622,7 +1622,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 libXau libXaw libXdmcp libXext libXft libXinerama libXmu libXpm xorgproto libXrender libXt ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; xdpyinfo = callPackage ({ stdenv, pkgconfig, fetchurl, libdmx, libX11, libxcb, libXcomposite, libXext, libXi, libXinerama, xorgproto, libXrender, libXtst, libXxf86dga, libXxf86misc, libXxf86vm }: stdenv.mkDerivation { @@ -1635,7 +1635,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libdmx libX11 libxcb libXcomposite libXext libXi libXinerama xorgproto libXrender libXtst libXxf86dga libXxf86misc libXxf86vm ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; xdriinfo = callPackage ({ stdenv, pkgconfig, fetchurl, libGL, xorgproto, libX11 }: stdenv.mkDerivation { @@ -1648,7 +1648,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libGL xorgproto libX11 ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; xev = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xorgproto, libXrandr }: stdenv.mkDerivation { @@ -1661,7 +1661,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 xorgproto libXrandr ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; xeyes = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, libXmu, xorgproto, libXrender, libXt }: stdenv.mkDerivation { @@ -1674,7 +1674,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 libXext libXmu xorgproto libXrender libXt ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; xf86inputevdev = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libevdev, udev, mtdev, xorgserver }: stdenv.mkDerivation { @@ -1687,7 +1687,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ xorgproto libevdev udev mtdev xorgserver ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; xf86inputjoystick = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { @@ -1700,7 +1700,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ xorgproto xorgserver ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; xf86inputkeyboard = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { @@ -1713,7 +1713,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ xorgproto xorgserver ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; xf86inputlibinput = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libinput, xorgserver }: stdenv.mkDerivation { @@ -1726,7 +1726,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ xorgproto libinput xorgserver ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; xf86inputmouse = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { @@ -1739,7 +1739,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ xorgproto xorgserver ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; xf86inputsynaptics = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libevdev, libX11, libXi, xorgserver, libXtst }: stdenv.mkDerivation { @@ -1752,7 +1752,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ xorgproto libevdev libX11 libXi xorgserver libXtst ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; xf86inputvmmouse = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, udev, xorgserver }: stdenv.mkDerivation { @@ -1765,7 +1765,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ xorgproto udev xorgserver ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; xf86inputvoid = callPackage ({ stdenv, pkgconfig, fetchurl, xorgserver, xorgproto }: stdenv.mkDerivation { @@ -1778,7 +1778,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ xorgserver xorgproto ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; xf86videoamdgpu = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, mesa, libGL, libdrm, udev, xorgserver }: stdenv.mkDerivation { @@ -1791,7 +1791,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ xorgproto mesa libGL libdrm udev xorgserver ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; xf86videoapm = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { @@ -1804,7 +1804,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ xorgproto libpciaccess xorgserver ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; xf86videoark = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { @@ -1817,7 +1817,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ xorgproto libpciaccess xorgserver ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; xf86videoast = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { @@ -1830,7 +1830,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ xorgproto libpciaccess xorgserver ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; xf86videoati = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, mesa, libGL, libdrm, udev, libpciaccess, xorgserver }: stdenv.mkDerivation { @@ -1843,7 +1843,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ xorgproto mesa libGL libdrm udev libpciaccess xorgserver ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; xf86videochips = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { @@ -1856,7 +1856,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ xorgproto libpciaccess xorgserver ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; xf86videocirrus = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { @@ -1869,7 +1869,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ xorgproto libpciaccess xorgserver ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; xf86videodummy = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { @@ -1882,7 +1882,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ xorgproto xorgserver ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; xf86videofbdev = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { @@ -1895,7 +1895,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ xorgproto libpciaccess xorgserver ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; xf86videogeode = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { @@ -1908,7 +1908,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ xorgproto libpciaccess xorgserver ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; xf86videoglide = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { @@ -1921,7 +1921,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ xorgproto xorgserver ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; xf86videoglint = callPackage ({ stdenv, pkgconfig, fetchurl, libpciaccess, xorgproto, xorgserver }: stdenv.mkDerivation { @@ -1934,7 +1934,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libpciaccess xorgproto xorgserver ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; xf86videoi128 = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { @@ -1947,7 +1947,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ xorgproto libpciaccess xorgserver ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; xf86videoi740 = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { @@ -1960,7 +1960,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ xorgproto libpciaccess xorgserver ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; xf86videointel = callPackage ({ stdenv, pkgconfig, fetchurl, cairo, xorgproto, libdrm, libpng, udev, libpciaccess, libX11, xcbutil, libxcb, libXcursor, libXdamage, libXext, libXfixes, xorgserver, libXrandr, libXrender, libxshmfence, libXtst, libXvMC }: stdenv.mkDerivation { @@ -1973,7 +1973,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ cairo xorgproto libdrm libpng udev libpciaccess libX11 xcbutil libxcb libXcursor libXdamage libXext libXfixes xorgserver libXrandr libXrender libxshmfence libXtst libXvMC ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; xf86videomach64 = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver }: stdenv.mkDerivation { @@ -1986,7 +1986,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ xorgproto libdrm libpciaccess xorgserver ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; xf86videomga = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver }: stdenv.mkDerivation { @@ -1999,7 +1999,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ xorgproto libdrm libpciaccess xorgserver ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; xf86videoneomagic = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { @@ -2012,7 +2012,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ xorgproto libpciaccess xorgserver ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; xf86videonewport = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { @@ -2025,20 +2025,20 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ xorgproto xorgserver ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; xf86videonouveau = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libdrm, udev, libpciaccess, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-nouveau-1.0.15"; + name = "xf86-video-nouveau-1.0.16"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-video-nouveau-1.0.15.tar.bz2"; - sha256 = "0k0xah72ryjwak4dc4crszxrlkmi9x1s7p3sd4la642n77yi1pmf"; + url = "mirror://xorg/individual/driver/xf86-video-nouveau-1.0.16.tar.bz2"; + sha256 = "01mz8gnq7j6bvrqb2ljm3d1wpjhi9p2z2w8zbkdrqmqmcj060h1h"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ xorgproto libdrm udev libpciaccess xorgserver ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; xf86videonv = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { @@ -2051,7 +2051,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ xorgproto libpciaccess xorgserver ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; xf86videoomap = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libdrm, xorgserver }: stdenv.mkDerivation { @@ -2064,7 +2064,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ xorgproto libdrm xorgserver ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; xf86videoopenchrome = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libdrm, udev, libpciaccess, libX11, libXext, xorgserver, libXvMC }: stdenv.mkDerivation { @@ -2077,7 +2077,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ xorgproto libdrm udev libpciaccess libX11 libXext xorgserver libXvMC ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; xf86videoqxl = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libdrm, udev, libpciaccess, xorgserver }: stdenv.mkDerivation { @@ -2090,7 +2090,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ xorgproto libdrm udev libpciaccess xorgserver ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; xf86videor128 = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver }: stdenv.mkDerivation { @@ -2103,7 +2103,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ xorgproto libdrm libpciaccess xorgserver ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; xf86videorendition = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { @@ -2116,7 +2116,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ xorgproto libpciaccess xorgserver ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; xf86videos3virge = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { @@ -2129,7 +2129,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ xorgproto libpciaccess xorgserver ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; xf86videosavage = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver }: stdenv.mkDerivation { @@ -2142,7 +2142,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ xorgproto libdrm libpciaccess xorgserver ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; xf86videosiliconmotion = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { @@ -2155,7 +2155,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ xorgproto libpciaccess xorgserver ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; xf86videosis = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver }: stdenv.mkDerivation { @@ -2168,7 +2168,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ xorgproto libdrm libpciaccess xorgserver ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; xf86videosisusb = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { @@ -2181,7 +2181,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ xorgproto libpciaccess xorgserver ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; xf86videosuncg6 = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { @@ -2194,7 +2194,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ xorgproto xorgserver ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; xf86videosunffb = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { @@ -2207,7 +2207,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ xorgproto xorgserver ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; xf86videosunleo = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { @@ -2220,7 +2220,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ xorgproto xorgserver ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; xf86videotdfx = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver }: stdenv.mkDerivation { @@ -2233,7 +2233,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ xorgproto libdrm libpciaccess xorgserver ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; xf86videotga = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { @@ -2246,7 +2246,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ xorgproto libpciaccess xorgserver ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; xf86videotrident = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { @@ -2259,7 +2259,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ xorgproto libpciaccess xorgserver ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; xf86videov4l = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { @@ -2272,7 +2272,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ xorgproto xorgserver ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; xf86videovboxvideo = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { @@ -2285,20 +2285,20 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ xorgproto libpciaccess xorgserver ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; xf86videovesa = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-vesa-2.4.0"; + name = "xf86-video-vesa-2.5.0"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-video-vesa-2.4.0.tar.bz2"; - sha256 = "1373vsxn6qh00na0s9c09kf09gj78rzi98zq93id8v5zsya3qi5z"; + url = "mirror://xorg/individual/driver/xf86-video-vesa-2.5.0.tar.bz2"; + sha256 = "0nf6ai74c60xk96kgr8q9mx6lrxm5id3765ws4d801irqzrj85hz"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ xorgproto libpciaccess xorgserver ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; xf86videovmware = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libdrm, udev, libpciaccess, libX11, libXext, xorgserver }: stdenv.mkDerivation { @@ -2311,7 +2311,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ xorgproto libdrm udev libpciaccess libX11 libXext xorgserver ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; xf86videovoodoo = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { @@ -2324,7 +2324,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ xorgproto libpciaccess xorgserver ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; xf86videowsfb = callPackage ({ stdenv, pkgconfig, fetchurl, xorgserver, xorgproto }: stdenv.mkDerivation { @@ -2337,7 +2337,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ xorgserver xorgproto ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; xf86videoxgi = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver }: stdenv.mkDerivation { @@ -2350,7 +2350,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ xorgproto libdrm libpciaccess xorgserver ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; xfd = callPackage ({ stdenv, pkgconfig, fetchurl, libxkbfile, fontconfig, libXaw, libXft, libXmu, xorgproto, libXrender, libXt, gettext }: stdenv.mkDerivation { @@ -2363,7 +2363,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig gettext ]; buildInputs = [ libxkbfile fontconfig libXaw libXft libXmu xorgproto libXrender libXt ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; xfontsel = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXaw, libXmu, libXt }: stdenv.mkDerivation { @@ -2376,7 +2376,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 libXaw libXmu libXt ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; xfs = callPackage ({ stdenv, pkgconfig, fetchurl, libXfont2, xorgproto, xtrans }: stdenv.mkDerivation { @@ -2389,7 +2389,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libXfont2 xorgproto xtrans ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; xfsinfo = callPackage ({ stdenv, pkgconfig, fetchurl, libFS, xorgproto }: stdenv.mkDerivation { @@ -2402,7 +2402,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libFS xorgproto ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; xgamma = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xorgproto, libXxf86vm }: stdenv.mkDerivation { @@ -2415,7 +2415,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 xorgproto libXxf86vm ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; xgc = callPackage ({ stdenv, pkgconfig, fetchurl, libXaw, libXt }: stdenv.mkDerivation { @@ -2428,7 +2428,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libXaw libXt ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; xhost = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXau, libXmu, xorgproto }: stdenv.mkDerivation { @@ -2441,7 +2441,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 libXau libXmu xorgproto ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; xinit = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { @@ -2454,7 +2454,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 xorgproto ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; xinput = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11, libXext, libXi, libXinerama, libXrandr }: stdenv.mkDerivation { @@ -2467,20 +2467,20 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ xorgproto libX11 libXext libXi libXinerama libXrandr ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; xkbcomp = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libxkbfile, xorgproto }: stdenv.mkDerivation { - name = "xkbcomp-1.4.2"; + name = "xkbcomp-1.4.4"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/xkbcomp-1.4.2.tar.bz2"; - sha256 = "0944rrkkf0dxp07vhh9yr4prslxhqyw63qmbjirbv1bypswvrn3d"; + url = "mirror://xorg/individual/app/xkbcomp-1.4.4.tar.bz2"; + sha256 = "0zpjkbap9160pdd6jpgb5f0yg5281w0rkkx1l0i7g887lq1ydk2r"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 libxkbfile xorgproto ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; xkbevd = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libxkbfile }: stdenv.mkDerivation { @@ -2493,7 +2493,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 libxkbfile ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; xkbprint = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libxkbfile, xorgproto }: stdenv.mkDerivation { @@ -2506,7 +2506,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 libxkbfile xorgproto ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; xkbutils = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11, libXaw, libXt }: stdenv.mkDerivation { @@ -2519,7 +2519,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ xorgproto libX11 libXaw libXt ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; xkeyboardconfig = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xorgproto, python3 }: stdenv.mkDerivation { @@ -2532,7 +2532,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig python3 ]; buildInputs = [ libX11 xorgproto ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; xkill = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXmu, xorgproto }: stdenv.mkDerivation { @@ -2545,7 +2545,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 libXmu xorgproto ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; xload = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXaw, libXmu, xorgproto, libXt, gettext }: stdenv.mkDerivation { @@ -2558,7 +2558,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig gettext ]; buildInputs = [ libX11 libXaw libXmu xorgproto libXt ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; xlsatoms = callPackage ({ stdenv, pkgconfig, fetchurl, libxcb }: stdenv.mkDerivation { @@ -2571,7 +2571,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libxcb ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; xlsclients = callPackage ({ stdenv, pkgconfig, fetchurl, libxcb }: stdenv.mkDerivation { @@ -2584,7 +2584,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libxcb ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; xlsfonts = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { @@ -2597,7 +2597,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 xorgproto ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; xmag = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXaw, libXmu, libXt }: stdenv.mkDerivation { @@ -2610,7 +2610,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 libXaw libXmu libXt ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; xmessage = callPackage ({ stdenv, pkgconfig, fetchurl, libXaw, libXt }: stdenv.mkDerivation { @@ -2623,7 +2623,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libXaw libXt ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; xmodmap = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { @@ -2636,7 +2636,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 xorgproto ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; xmore = callPackage ({ stdenv, pkgconfig, fetchurl, libXaw, libXt }: stdenv.mkDerivation { @@ -2649,7 +2649,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libXaw libXt ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; xorgcffiles = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { @@ -2662,7 +2662,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; xorgdocs = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { @@ -2675,7 +2675,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; xorgproto = callPackage ({ stdenv, pkgconfig, fetchurl, libXt }: stdenv.mkDerivation { @@ -2688,7 +2688,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libXt ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; xorgserver = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, openssl, libX11, libXau, libXaw, libxcb, xcbutil, xcbutilwm, xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, libXdmcp, libXfixes, libxkbfile, libXmu, libXpm, libXrender, libXres, libXt }: stdenv.mkDerivation { @@ -2701,7 +2701,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ xorgproto openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; xorgsgmldoctools = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { @@ -2714,7 +2714,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; xpr = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXmu, xorgproto }: stdenv.mkDerivation { @@ -2727,7 +2727,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 libXmu xorgproto ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; xprop = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { @@ -2740,7 +2740,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 xorgproto ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; xrandr = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xorgproto, libXrandr, libXrender }: stdenv.mkDerivation { @@ -2753,7 +2753,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 xorgproto libXrandr libXrender ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; xrdb = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXmu, xorgproto }: stdenv.mkDerivation { @@ -2766,7 +2766,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 libXmu xorgproto ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; xrefresh = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { @@ -2779,7 +2779,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 xorgproto ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; xset = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, libXmu, xorgproto, libXxf86misc }: stdenv.mkDerivation { @@ -2792,7 +2792,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 libXext libXmu xorgproto libXxf86misc ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; xsetroot = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xbitmaps, libXcursor, libXmu, xorgproto }: stdenv.mkDerivation { @@ -2805,7 +2805,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 xbitmaps libXcursor libXmu xorgproto ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; xsm = callPackage ({ stdenv, pkgconfig, fetchurl, libICE, libSM, libX11, libXaw, libXt }: stdenv.mkDerivation { @@ -2818,7 +2818,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libICE libSM libX11 libXaw libXt ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; xstdcmap = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXmu, xorgproto }: stdenv.mkDerivation { @@ -2831,7 +2831,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 libXmu xorgproto ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; xtrans = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { @@ -2844,7 +2844,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; xtrap = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXt, libXTrap }: stdenv.mkDerivation { @@ -2857,7 +2857,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 libXt libXTrap ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; xvinfo = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xorgproto, libXv }: stdenv.mkDerivation { @@ -2870,7 +2870,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 xorgproto libXv ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; xwd = callPackage ({ stdenv, pkgconfig, fetchurl, libxkbfile, libX11, xorgproto }: stdenv.mkDerivation { @@ -2883,7 +2883,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libxkbfile libX11 xorgproto ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; xwininfo = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libxcb, xorgproto }: stdenv.mkDerivation { @@ -2896,7 +2896,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 libxcb xorgproto ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; xwud = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { @@ -2909,7 +2909,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 xorgproto ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; }) diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index b0cab5fb88ee..a6cd8032ba70 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -311,7 +311,7 @@ foreach my $pkg (sort (keys %pkgURLs)) { hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig $nativeBuildInputsStr]; buildInputs = [ $buildInputsStr];$extraAttrsStr - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; }) {}; EOF diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index ddf0aacdf07d..e31d1ab707c8 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -74,7 +74,8 @@ self: super: mkfontdir = self.mkfontscale; libxcb = super.libxcb.overrideAttrs (attrs: { - configureFlags = [ "--enable-xkb" "--enable-xinput" ]; + configureFlags = [ "--enable-xkb" "--enable-xinput" ] + ++ stdenv.lib.optional stdenv.hostPlatform.isStatic "--disable-shared"; outputs = [ "out" "dev" "man" "doc" ]; }); @@ -82,15 +83,18 @@ self: super: outputs = [ "out" "dev" "man" ]; configureFlags = attrs.configureFlags or [] ++ malloc0ReturnsNullCrossFlag; - depsBuildBuild = [ buildPackages.stdenv.cc ]; + depsBuildBuild = [ + buildPackages.stdenv.cc + ] ++ stdenv.lib.optionals stdenv.hostPlatform.isStatic [ + (self.buildPackages.stdenv.cc.libc.static or null) + ]; preConfigure = '' sed 's,^as_dummy.*,as_dummy="\$PATH",' -i configure ''; - postInstall = - '' - # Remove useless DocBook XML files. - rm -rf $out/share/doc - ''; + postInstall = '' + # Remove useless DocBook XML files. + rm -rf $out/share/doc + ''; CPP = stdenv.lib.optionalString stdenv.isDarwin "clang -E -"; propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ self.xorgproto ]; }); @@ -138,6 +142,11 @@ self: super: xdpyinfo = super.xdpyinfo.overrideAttrs (attrs: { configureFlags = attrs.configureFlags or [] ++ malloc0ReturnsNullCrossFlag; + preConfigure = attrs.preConfigure or "" + # missing transitive dependencies + + stdenv.lib.optionalString stdenv.hostPlatform.isStatic '' + export NIX_CFLAGS_LINK="$NIX_CFLAGS_LINK -lXau -lXdmcp" + ''; }); # Propagate some build inputs because of header file dependencies. @@ -223,8 +232,9 @@ self: super: libXi = super.libXi.overrideAttrs (attrs: { outputs = [ "out" "dev" "man" "doc" ]; propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ self.libXfixes ]; - configureFlags = stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) - "xorg_cv_malloc0_returns_null=no"; + configureFlags = stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + "xorg_cv_malloc0_returns_null=no" + ] ++ stdenv.lib.optional stdenv.hostPlatform.isStatic "--disable-shared"; }); libXinerama = super.libXinerama.overrideAttrs (attrs: { @@ -745,6 +755,11 @@ self: super: xauth = super.xauth.overrideAttrs (attrs: { doCheck = false; # fails + preConfigure = attrs.preConfigure or "" + # missing transitive dependencies + + stdenv.lib.optionalString stdenv.hostPlatform.isStatic '' + export NIX_CFLAGS_LINK="$NIX_CFLAGS_LINK -lxcb -lXau -lXdmcp" + ''; }); xcursorthemes = super.xcursorthemes.overrideAttrs (attrs: { diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 4fc3f3304e13..02467ce304b8 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -46,7 +46,7 @@ mirror://xorg/individual/app/xgc-1.0.5.tar.bz2 mirror://xorg/individual/app/xhost-1.0.8.tar.bz2 mirror://xorg/individual/app/xinit-1.4.1.tar.bz2 mirror://xorg/individual/app/xinput-1.6.3.tar.bz2 -mirror://xorg/individual/app/xkbcomp-1.4.2.tar.bz2 +mirror://xorg/individual/app/xkbcomp-1.4.4.tar.bz2 mirror://xorg/individual/app/xkbevd-1.1.4.tar.bz2 mirror://xorg/individual/app/xkbprint-1.0.4.tar.bz2 mirror://xorg/individual/app/xkbutils-1.0.4.tar.bz2 @@ -105,7 +105,7 @@ mirror://xorg/individual/driver/xf86-video-mach64-6.9.6.tar.bz2 mirror://xorg/individual/driver/xf86-video-mga-2.0.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-neomagic-1.3.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-newport-0.2.4.tar.bz2 -mirror://xorg/individual/driver/xf86-video-nouveau-1.0.15.tar.bz2 +mirror://xorg/individual/driver/xf86-video-nouveau-1.0.16.tar.bz2 mirror://xorg/individual/driver/xf86-video-nv-2.1.21.tar.bz2 mirror://xorg/individual/driver/xf86-video-omap-0.4.5.tar.bz2 mirror://xorg/individual/driver/xf86-video-openchrome-0.6.0.tar.bz2 @@ -125,7 +125,7 @@ mirror://xorg/individual/driver/xf86-video-tga-1.2.2.tar.bz2 mirror://xorg/individual/driver/xf86-video-trident-1.3.8.tar.bz2 mirror://xorg/individual/driver/xf86-video-v4l-0.3.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-vboxvideo-1.0.0.tar.bz2 -mirror://xorg/individual/driver/xf86-video-vesa-2.4.0.tar.bz2 +mirror://xorg/individual/driver/xf86-video-vesa-2.5.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-vmware-13.3.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-voodoo-1.2.5.tar.bz2 mirror://xorg/individual/driver/xf86-video-wsfb-0.4.0.tar.bz2 diff --git a/pkgs/servers/x11/xorg/xcb-util-xrm.nix b/pkgs/servers/x11/xorg/xcb-util-xrm.nix index e868dbab7f60..cc8bf7dfa106 100644 --- a/pkgs/servers/x11/xorg/xcb-util-xrm.nix +++ b/pkgs/servers/x11/xorg/xcb-util-xrm.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, m4, libxcb, xcbutil, libX11 }: +{ lib, stdenv, fetchurl, pkgconfig, m4, libxcb, xcbutil, libX11 }: stdenv.mkDerivation rec { version = "1.3"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ libxcb xcbutil ]; checkInputs = [ libX11 ]; - meta = with stdenv.lib; { + meta = with lib; { description = "XCB utility functions for the X resource manager"; homepage = "https://github.com/Airblader/xcb-util-xrm"; license = licenses.mit; # X11 variant diff --git a/pkgs/servers/x11/xquartz/default.nix b/pkgs/servers/x11/xquartz/default.nix index cd5fac60abe4..96269b1a4f37 100644 --- a/pkgs/servers/x11/xquartz/default.nix +++ b/pkgs/servers/x11/xquartz/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildEnv, makeFontsConf, gnused, writeScript, xorg, bashInteractive, xterm, makeWrapper, ruby +{ lib, stdenv, buildEnv, makeFontsConf, gnused, writeScript, xorg, bashInteractive, xterm, makeWrapper, ruby , quartz-wm, fontconfig, xlsfonts, xfontsel , ttf_bitstream_vera, freefont_ttf, liberation_ttf , shell ? "${bashInteractive}/bin/bash" @@ -184,7 +184,7 @@ in stdenv.mkDerivation { --replace "@FONTCONFIG_FILE@" "$fontsConfPath" ''; - meta = with stdenv.lib; { + meta = with lib; { platforms = platforms.darwin; maintainers = with maintainers; [ cstrahan ]; license = licenses.mit; diff --git a/pkgs/servers/xandikos/default.nix b/pkgs/servers/xandikos/default.nix index 515282c1dbcf..b8eb29d87b2d 100644 --- a/pkgs/servers/xandikos/default.nix +++ b/pkgs/servers/xandikos/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , python3Packages , installShellFiles @@ -31,7 +31,7 @@ python3Packages.buildPythonApplication rec { installManPage xandikos.1 ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Lightweight CalDAV/CardDAV server"; homepage = "https://github.com/jelmer/xandikos"; license = licenses.gpl3Plus; diff --git a/pkgs/servers/xmpp/biboumi/default.nix b/pkgs/servers/xmpp/biboumi/default.nix index 257d94f4a733..deaa7ca18f07 100644 --- a/pkgs/servers/xmpp/biboumi/default.nix +++ b/pkgs/servers/xmpp/biboumi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchgit, cmake, libuuid, expat, sqlite, libidn, +{ lib, stdenv, fetchurl, fetchgit, cmake, libuuid, expat, sqlite, libidn, libiconv, botan2, systemd, pkgconfig, udns, pandoc, coreutils } : stdenv.mkDerivation rec { @@ -27,10 +27,9 @@ stdenv.mkDerivation rec { cp $louiz_catch/single_include/catch.hpp tests/ ''; - enableParallelBuilding = true; doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Modern XMPP IRC gateway"; platforms = platforms.unix; homepage = "https://lab.louiz.org/louiz/biboumi"; diff --git a/pkgs/servers/xmpp/ejabberd/default.nix b/pkgs/servers/xmpp/ejabberd/default.nix index f6a8f658039b..1efadd5915eb 100644 --- a/pkgs/servers/xmpp/ejabberd/default.nix +++ b/pkgs/servers/xmpp/ejabberd/default.nix @@ -110,7 +110,7 @@ in stdenv.mkDerivation rec { wrapProgram $out/lib/eimp-*/priv/bin/eimp --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ libpng libjpeg libwebp ]}" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Open-source XMPP application server written in Erlang"; license = licenses.gpl2; homepage = "https://www.ejabberd.im"; diff --git a/pkgs/servers/xmpp/pyIRCt/default.nix b/pkgs/servers/xmpp/pyIRCt/default.nix index 7db8ec3b6049..ebb817f1645c 100644 --- a/pkgs/servers/xmpp/pyIRCt/default.nix +++ b/pkgs/servers/xmpp/pyIRCt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, xmpppy, pythonIRClib, python, pythonPackages, runtimeShell } : +{ lib, stdenv, fetchurl, xmpppy, pythonIRClib, python, pythonPackages, runtimeShell } : stdenv.mkDerivation rec { pname = "pyIRCt"; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { wrapPythonPrograms ''; - meta = with stdenv.lib; { + meta = with lib; { description = "IRC transport module for XMPP"; platforms = platforms.unix; license = licenses.gpl2; diff --git a/pkgs/servers/xmpp/pyMAILt/default.nix b/pkgs/servers/xmpp/pyMAILt/default.nix index 0c85f322f487..68349214359e 100644 --- a/pkgs/servers/xmpp/pyMAILt/default.nix +++ b/pkgs/servers/xmpp/pyMAILt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python, xmpppy, pythonPackages, fetchcvs, runtimeShell } : +{ lib, stdenv, python, xmpppy, pythonPackages, fetchcvs, runtimeShell } : stdenv.mkDerivation rec { pname = "pyMAILt"; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { wrapPythonPrograms ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Email transport module for XMPP"; platforms = platforms.unix; license = licenses.gpl2; diff --git a/pkgs/servers/zigbee2mqtt/default.nix b/pkgs/servers/zigbee2mqtt/default.nix index 9e0b75133bb5..550e93fb5aa3 100644 --- a/pkgs/servers/zigbee2mqtt/default.nix +++ b/pkgs/servers/zigbee2mqtt/default.nix @@ -15,7 +15,7 @@ package.override rec { passthru.tests.zigbee2mqtt = nixosTests.zigbee2mqtt; - meta = with pkgs.stdenv.lib; { + meta = with pkgs.lib; { description = "Zigbee to MQTT bridge using zigbee-shepherd"; license = licenses.gpl3; homepage = https://github.com/Koenkk/zigbee2mqtt; diff --git a/pkgs/servers/zoneminder/default.nix b/pkgs/servers/zoneminder/default.nix index 657bbc8d6648..babcd8e6374b 100644 --- a/pkgs/servers/zoneminder/default.nix +++ b/pkgs/servers/zoneminder/default.nix @@ -159,8 +159,6 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ cmake makeWrapper pkgconfig ]; - enableParallelBuilding = true; - cmakeFlags = [ "-DWITH_SYSTEMD=ON" "-DZM_LOGDIR=/var/log/${dirName}" @@ -196,7 +194,7 @@ in stdenv.mkDerivation rec { ln -s $out/share/zoneminder/www $out/share/zoneminder/www/zm ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Video surveillance software system"; homepage = "https://zoneminder.com"; license = licenses.gpl3; diff --git a/pkgs/servers/zookeeper/default.nix b/pkgs/servers/zookeeper/default.nix index 5777532d9474..526a8d2956b3 100644 --- a/pkgs/servers/zookeeper/default.nix +++ b/pkgs/servers/zookeeper/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jre, makeWrapper, bash, coreutils, runtimeShell }: +{ lib, stdenv, fetchurl, jre, makeWrapper, bash, coreutils, runtimeShell }: stdenv.mkDerivation rec { pname = "zookeeper"; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { chmod -x $out/bin/zkEnv.sh ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://zookeeper.apache.org"; description = "Apache Zookeeper"; license = licenses.asl20; diff --git a/pkgs/shells/any-nix-shell/default.nix b/pkgs/shells/any-nix-shell/default.nix index bab39aef2441..3a9f0a0bfbd1 100644 --- a/pkgs/shells/any-nix-shell/default.nix +++ b/pkgs/shells/any-nix-shell/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchFromGitHub, makeWrapper }: +{ lib, stdenv, fetchFromGitHub, makeWrapper }: stdenv.mkDerivation rec { pname = "any-nix-shell"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "haslersn"; repo = "any-nix-shell"; rev = "v${version}"; - sha256 = "02cv86csk1m8nlh2idvh7bjw43lpssmdawya2jhr4bam2606yzdv"; + sha256 = "05xixgsdfv0qk648r74nvazw16dpw49ryz8dax9kwmhqrgkjaqv6"; }; nativeBuildInputs = [ makeWrapper ]; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/any-nix-shell --prefix PATH ":" $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "fish and zsh support for nix-shell"; license = licenses.mit; homepage = "https://github.com/haslersn/any-nix-shell"; diff --git a/pkgs/shells/bash/4.4.nix b/pkgs/shells/bash/4.4.nix index d06157fa77cc..afdfb816c955 100644 --- a/pkgs/shells/bash/4.4.nix +++ b/pkgs/shells/bash/4.4.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPackages +{ lib, stdenv, buildPackages , fetchurl, binutils ? null, bison, autoconf, util-linux # patch for cygwin requires readline support @@ -111,7 +111,7 @@ stdenv.mkDerivation rec { rm -rf "$out/share" "$out/bin/bashbug" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.gnu.org/software/bash/"; description = "GNU Bourne-Again Shell, the de facto standard shell on Linux" + diff --git a/pkgs/shells/bash/5.1.nix b/pkgs/shells/bash/5.1.nix index 8950e5f5b1cf..fd8c0c32cd61 100644 --- a/pkgs/shells/bash/5.1.nix +++ b/pkgs/shells/bash/5.1.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPackages , fetchurl , binutils ? null @@ -102,7 +102,7 @@ stdenv.mkDerivation rec { rm -rf "$out/share" "$out/bin/bashbug" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.gnu.org/software/bash/"; description = "GNU Bourne-Again Shell, the de facto standard shell on Linux" + diff --git a/pkgs/shells/bash/bash-completion/default.nix b/pkgs/shells/bash/bash-completion/default.nix index 5fda57048121..22a7ead545dd 100644 --- a/pkgs/shells/bash/bash-completion/default.nix +++ b/pkgs/shells/bash/bash-completion/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchurl , fetchpatch , autoreconfHook , perl @@ -11,11 +11,13 @@ stdenv.mkDerivation rec { pname = "bash-completion"; version = "2.11"; - src = fetchFromGitHub { - owner = "scop"; - repo = "bash-completion"; - rev = version; - sha256 = "0m3brd5jx7w07h8vxvvcmbyrlnadrx6hra3cvx6grzv6rin89liv"; + # Using fetchurl because fetchGithub or fetchzip will have trouble on + # e.g. APFS filesystems (macOS) because of non UTF-8 characters in some of the + # test fixtures that are part of the repository. + # See discussion in https://github.com/NixOS/nixpkgs/issues/107768 + src = fetchurl { + url = "https://github.com/scop/${pname}/releases/download/${version}/${pname}-${version}.tar.xz"; + sha256 = "1b0iz7da1sgifx1a5wdyx1kxbzys53v0kyk8nhxfipllmm5qka3k"; }; nativeBuildInputs = [ autoreconfHook ]; @@ -61,7 +63,7 @@ stdenv.mkDerivation rec { sed -i -e 's/readlink -f/readlink/g' bash_completion completions/* ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/scop/bash-completion"; description = "Programmable completion for the bash shell"; license = licenses.gpl2Plus; diff --git a/pkgs/shells/bash/nix-bash-completions/default.nix b/pkgs/shells/bash/nix-bash-completions/default.nix index 5dfd673a6298..2034eed1f5da 100644 --- a/pkgs/shells/bash/nix-bash-completions/default.nix +++ b/pkgs/shells/bash/nix-bash-completions/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { version = "0.6.8"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/hedning/nix-bash-completions"; description = "Bash completions for Nix, NixOS, and NixOps"; license = licenses.bsd3; diff --git a/pkgs/shells/dash/default.nix b/pkgs/shells/dash/default.nix index bc270daf09cf..2c6e9cc0e681 100644 --- a/pkgs/shells/dash/default.nix +++ b/pkgs/shells/dash/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPackages, autoreconfHook, fetchurl }: +{ lib, stdenv, buildPackages, autoreconfHook, fetchurl }: stdenv.mkDerivation rec { pname = "dash"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin autoreconfHook; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://gondor.apana.org.au/~herbert/dash/"; description = "A POSIX-compliant implementation of /bin/sh that aims to be as small as possible"; platforms = platforms.unix; diff --git a/pkgs/shells/dgsh/default.nix b/pkgs/shells/dgsh/default.nix index 0314180e2d55..28e5b15b3e76 100644 --- a/pkgs/shells/dgsh/default.nix +++ b/pkgs/shells/dgsh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, pkgconfig, +{ lib, stdenv, fetchFromGitHub, autoconf, automake, pkgconfig, libtool, check, bison, git, gperf, perl, texinfo, help2man, gettext, ncurses }: @@ -35,7 +35,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "The Directed Graph Shell"; homepage = "http://www.dmst.aueb.gr/dds/sw/dgsh"; license = with licenses; asl20; diff --git a/pkgs/shells/elvish/default.nix b/pkgs/shells/elvish/default.nix index 2cb45f33f7bc..938029e9af97 100644 --- a/pkgs/shells/elvish/default.nix +++ b/pkgs/shells/elvish/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "elvish"; @@ -19,7 +19,7 @@ buildGoModule rec { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "A friendly and expressive command shell"; longDescription = '' Elvish is a friendly interactive shell and an expressive programming diff --git a/pkgs/shells/es/default.nix b/pkgs/shells/es/default.nix index 992fdc93dcb3..7b2251a3f440 100644 --- a/pkgs/shells/es/default.nix +++ b/pkgs/shells/es/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, readline, yacc }: +{ lib, stdenv, fetchurl, readline, yacc }: let version = "0.9.1"; @@ -24,7 +24,7 @@ stdenv.mkDerivation { configureFlags = [ "--with-readline" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "An extensible shell with higher order functions"; longDescription = '' diff --git a/pkgs/shells/fish/babelfish.nix b/pkgs/shells/fish/babelfish.nix new file mode 100644 index 000000000000..bfe01740f140 --- /dev/null +++ b/pkgs/shells/fish/babelfish.nix @@ -0,0 +1,21 @@ +{ lib, stdenv, buildGoModule, fetchFromGitHub }: +buildGoModule rec { + pname = "babelfish"; + version = "0.1.3"; + + src = fetchFromGitHub { + owner = "bouk"; + repo = "babelfish"; + rev = "v${version}"; + sha256 = "08i4y4fw60ynamr1jz8nkfkidxj06vcyhi1v4wxpl2macn6n4skk"; + }; + + vendorSha256 = "0xjy50wciw329kq1nkd7hhaipcp4fy28hhk6cdq21qwid6g21gag"; + + meta = with lib; { + description = "Translate bash scripts to fish"; + homepage = "https://github.com/bouk/babelfish"; + license = licenses.mit; + maintainers = with maintainers; [ bouk kevingriffin ]; + }; +} diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix index 0811d43eb6ab..a39a2fc740bd 100644 --- a/pkgs/shells/fish/default.nix +++ b/pkgs/shells/fish/default.nix @@ -196,8 +196,6 @@ let tee -a $out/share/fish/__fish_build_paths.fish < ${fishPreInitHooks} ''; - enableParallelBuilding = true; - meta = with lib; { description = "Smart and user-friendly command line shell"; homepage = "http://fishshell.com/"; diff --git a/pkgs/shells/fish/plugins/build-fish-plugin.nix b/pkgs/shells/fish/plugins/build-fish-plugin.nix new file mode 100644 index 000000000000..a52c57464929 --- /dev/null +++ b/pkgs/shells/fish/plugins/build-fish-plugin.nix @@ -0,0 +1,67 @@ +{ stdenv, lib, writeScript, wrapFish }: + +attrs@{ + pname, + version, + src, + + name ? "fishplugin-${pname}-${version}", + unpackPhase ? "", + configurePhase ? ":", + buildPhase ? ":", + preInstall ? "", + postInstall ? "", + # name of the subdirectory in which to store the plugin + installPath ? lib.getName pname, + + checkInputs ? [], + # plugin packages to add to the vendor paths of the test fish shell + checkPlugins ? [], + # vendor directories to add to the function path of the test fish shell + checkFunctionDirs ? [], + # test script to be executed in a fish shell + checkPhase ? "", + doCheck ? checkPhase != "", + + ... +}: + +stdenv.mkDerivation (attrs // { + inherit name; + inherit unpackPhase configurePhase buildPhase; + + inherit preInstall postInstall; + installPhase = '' + runHook preInstall + + ( + install_vendor_files() { + source="$1" + target="$out/share/fish/vendor_$2.d" + + [ -d $source ] || return 0 + mkdir -p $target + cp -r $source/*.fish "$target/" + } + + install_vendor_files completions completions + install_vendor_files functions functions + install_vendor_files conf conf + install_vendor_files conf.d conf + ) + + runHook postInstall + ''; + + inherit doCheck; + + checkInputs = [ (wrapFish { + pluginPkgs = checkPlugins; + functionDirs = checkFunctionDirs; + }) ] ++ checkInputs; + + checkPhase = '' + export HOME=$(mktemp -d) # fish wants a writable home + fish "${writeScript "${name}-test" checkPhase}" + ''; +}) diff --git a/pkgs/shells/fish/plugins/default.nix b/pkgs/shells/fish/plugins/default.nix new file mode 100644 index 000000000000..e543d49516a8 --- /dev/null +++ b/pkgs/shells/fish/plugins/default.nix @@ -0,0 +1,13 @@ +{ lib, newScope }: + +lib.makeScope newScope (self: with self; { + + buildFishPlugin = callPackage ./build-fish-plugin.nix { }; + + fishtape = callPackage ./fishtape.nix { }; + + foreign-env = callPackage ./foreign-env { }; + + pure = callPackage ./pure.nix { }; + +}) diff --git a/pkgs/shells/fish/plugins/fishtape.nix b/pkgs/shells/fish/plugins/fishtape.nix new file mode 100644 index 000000000000..82f2375d5e3f --- /dev/null +++ b/pkgs/shells/fish/plugins/fishtape.nix @@ -0,0 +1,32 @@ +{ lib, buildFishPlugin, fetchFromGitHub }: + +buildFishPlugin rec { + pname = "fishtape"; + version = "2.1.3"; + + src = fetchFromGitHub { + owner = "jorgebucaran"; + repo = "fishtape"; + rev = version; + sha256 = "0dxcyhs2shhgy5xnwcimqja8vqsyk841x486lgq13i3y1h0kp2kd"; + }; + + checkFunctionDirs = [ "./" ]; # fishtape is introspective + checkPhase = '' + rm test/tty.fish # test expects a tty + fishtape test/*.fish + ''; + + preInstall = '' + # move the function script in the proper sub-directory + mkdir functions + mv fishtape.fish functions/ + ''; + + meta = { + description = "TAP-based test runner for Fish"; + homepage = "https://github.com/jorgebucaran/fishtape"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pacien ]; + }; +} diff --git a/pkgs/shells/fish/fish-foreign-env/default.nix b/pkgs/shells/fish/plugins/foreign-env/default.nix similarity index 66% rename from pkgs/shells/fish/fish-foreign-env/default.nix rename to pkgs/shells/fish/plugins/foreign-env/default.nix index ef157f323923..03435340d179 100644 --- a/pkgs/shells/fish/fish-foreign-env/default.nix +++ b/pkgs/shells/fish/plugins/foreign-env/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchFromGitHub, gnused, bash, coreutils }: +{ lib, buildFishPlugin, fetchFromGitHub, gnused, bash, coreutils }: -stdenv.mkDerivation { - pname = "fish-foreign-env"; +buildFishPlugin { + pname = "foreign-env"; version = "git-20200209"; src = fetchFromGitHub { @@ -11,18 +11,16 @@ stdenv.mkDerivation { sha256 = "00xqlyl3lffc5l0viin1nyp819wf81fncqyz87jx8ljjdhilmgbs"; }; - installPhase = '' - mkdir -p $out/share/fish-foreign-env/functions/ - cp functions/* $out/share/fish-foreign-env/functions/ + patches = [ ./suppress-harmless-warnings.patch ]; + + preInstall = '' sed -e "s|sed|${gnused}/bin/sed|" \ -e "s|bash|${bash}/bin/bash|" \ -e "s|\| tr|\| ${coreutils}/bin/tr|" \ - -i $out/share/fish-foreign-env/functions/* + -i functions/* ''; - patches = [ ./suppress-harmless-warnings.patch ]; - - meta = with stdenv.lib; { + meta = with lib; { description = "A foreign environment interface for Fish shell"; license = licenses.mit; maintainers = with maintainers; [ jgillich ]; diff --git a/pkgs/shells/fish/fish-foreign-env/suppress-harmless-warnings.patch b/pkgs/shells/fish/plugins/foreign-env/suppress-harmless-warnings.patch similarity index 100% rename from pkgs/shells/fish/fish-foreign-env/suppress-harmless-warnings.patch rename to pkgs/shells/fish/plugins/foreign-env/suppress-harmless-warnings.patch diff --git a/pkgs/shells/fish/plugins/pure.nix b/pkgs/shells/fish/plugins/pure.nix new file mode 100644 index 000000000000..3221f6b97ca7 --- /dev/null +++ b/pkgs/shells/fish/plugins/pure.nix @@ -0,0 +1,29 @@ +{ lib, buildFishPlugin, fetchFromGitHub, git, fishtape }: + +buildFishPlugin rec { + pname = "pure"; + version = "3.4.2"; + + src = fetchFromGitHub { + owner = "rafaelrinaldi"; + repo = "pure"; + rev = "v${version}"; + sha256 = "134sz3f98gb6z2vgd5kkm6dd8pka5gijk843c32s616w35y07sga"; + }; + + checkInputs = [ git ]; + checkPlugins = [ fishtape ]; + checkPhase = '' + # https://github.com/rafaelrinaldi/pure/issues/264 + rm tests/_pure_string_width.test.fish + + fishtape tests/*.test.fish + ''; + + meta = { + description = "Pretty, minimal and fast Fish prompt, ported from zsh"; + homepage = "https://github.com/rafaelrinaldi/pure"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pacien ]; + }; +} diff --git a/pkgs/shells/fish/wrapper.nix b/pkgs/shells/fish/wrapper.nix new file mode 100644 index 000000000000..053568bc6b9b --- /dev/null +++ b/pkgs/shells/fish/wrapper.nix @@ -0,0 +1,25 @@ +{ lib, writeShellScriptBin, fish }: + +with lib; + +makeOverridable ({ + completionDirs ? [], + functionDirs ? [], + confDirs ? [], + pluginPkgs ? [] +}: + +let + vendorDir = kind: plugin: "${plugin}/share/fish/vendor_${kind}.d"; + complPath = completionDirs ++ map (vendorDir "completions") pluginPkgs; + funcPath = functionDirs ++ map (vendorDir "functions") pluginPkgs; + confPath = confDirs ++ map (vendorDir "conf") pluginPkgs; + safeConfPath = map escapeShellArg confPath; + +in writeShellScriptBin "fish" '' + ${fish}/bin/fish --init-command " + set --prepend fish_complete_path ${escapeShellArgs complPath} + set --prepend fish_function_path ${escapeShellArgs funcPath} + for c in {${concatStringsSep "," safeConfPath}}/*; source $c; end + " "$@" +'') diff --git a/pkgs/shells/ion/default.nix b/pkgs/shells/ion/default.nix index c2cc626bd3c9..d1b499a9160c 100644 --- a/pkgs/shells/ion/default.nix +++ b/pkgs/shells/ion/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform, Security }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, Security }: rustPlatform.buildRustPackage rec { pname = "ion"; @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1ph3r3vspy700mb8pica8478v9arqz07k2nzpbrdkdkqgfcwlgcg"; - meta = with stdenv.lib; { + meta = with lib; { description = "Modern system shell with simple (and powerful) syntax"; homepage = "https://gitlab.redox-os.org/redox-os/ion"; license = licenses.mit; diff --git a/pkgs/shells/jush/default.nix b/pkgs/shells/jush/default.nix index 9894c90bb69e..f6d07814ce12 100644 --- a/pkgs/shells/jush/default.nix +++ b/pkgs/shells/jush/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, editline }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, editline }: stdenv.mkDerivation rec { pname = "jush"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { passthru.shellPath = "/bin/jush"; - meta = with stdenv.lib; { + meta = with lib; { description = "just a useless shell"; homepage = "https://github.com/troglobit/jush"; license = licenses.isc; diff --git a/pkgs/shells/ksh/default.nix b/pkgs/shells/ksh/default.nix index e27732226f55..822f1dc3491b 100644 --- a/pkgs/shells/ksh/default.nix +++ b/pkgs/shells/ksh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, meson, ninja, fetchFromGitHub, which, python, fetchpatch +{ lib, stdenv, meson, ninja, fetchFromGitHub, which, python, fetchpatch , libiconv }: stdenv.mkDerivation rec { @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { buildInputs = [ libiconv ]; - meta = with stdenv.lib; { + meta = with lib; { description = "KornShell Command And Programming Language"; longDescription = '' The KornShell language was designed and developed by David G. Korn at diff --git a/pkgs/shells/liquidprompt/default.nix b/pkgs/shells/liquidprompt/default.nix index 9893624eaf86..4463d70cf526 100644 --- a/pkgs/shells/liquidprompt/default.nix +++ b/pkgs/shells/liquidprompt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "liquidprompt"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { $out/share/zsh/plugins/liquidprompt/liquidprompt ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A full-featured & carefully designed adaptive prompt for Bash & Zsh"; homepage = "https://github.com/nojhan/liquidprompt"; license = licenses.agpl3; diff --git a/pkgs/shells/mksh/default.nix b/pkgs/shells/mksh/default.nix index c19406e5f55c..7022f6b37e31 100644 --- a/pkgs/shells/mksh/default.nix +++ b/pkgs/shells/mksh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "mksh"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { install -D -m 644 dot.mkshrc $out/share/mksh/mkshrc ''; - meta = with stdenv.lib; { + meta = with lib; { description = "MirBSD Korn Shell"; longDescription = '' The MirBSD Korn Shell is a DFSG-free and OSD-compliant (and OSI diff --git a/pkgs/shells/mrsh/default.nix b/pkgs/shells/mrsh/default.nix index c72f23c143b0..c457b72953b4 100644 --- a/pkgs/shells/mrsh/default.nix +++ b/pkgs/shells/mrsh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, readline }: +{ lib, stdenv, fetchFromGitHub, meson, ninja, pkgconfig, readline }: stdenv.mkDerivation rec { pname = "mrsh"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A minimal POSIX shell"; homepage = "https://mrsh.sh"; license = licenses.mit; diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix index 1774a1c66772..74843dea6cc9 100644 --- a/pkgs/shells/nushell/default.nix +++ b/pkgs/shells/nushell/default.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage rec { pname = "nushell"; - version = "0.24.1"; + version = "0.25.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "0nza860gg9lnkld9c7is93fmfxl9yay8yf2f18h16cgjk3n686kd"; + sha256 = "0wsl57i3cd9whqvgjdnbz05230mkn2174gqld7mzn9iiym1rkcm4"; }; - cargoSha256 = "1mb6ws2zw089cx475c1vpvvxkzi8by6wmw4frans5lbl3a2lldl0"; + cargoSha256 = "1ifvfwmrl97skjwp1qwrj863npsxcgfqm4a81cvw9bqhbylbjc77"; nativeBuildInputs = [ pkg-config ] ++ lib.optionals (withStableFeatures && stdenv.isLinux) [ python3 ]; diff --git a/pkgs/shells/oksh/default.nix b/pkgs/shells/oksh/default.nix new file mode 100644 index 000000000000..8c2998ab54cc --- /dev/null +++ b/pkgs/shells/oksh/default.nix @@ -0,0 +1,21 @@ +{ stdenv, lib, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "oksh"; + version = "6.8.1"; + + src = fetchFromGitHub { + owner = "ibara"; + repo = pname; + rev = "${pname}-${version}"; + sha256 = "0lny550qfanysc4pqs0mxxx8zyz6plv9ll8y05gz0xmq9vx5384r"; + }; + + meta = with lib; { + description = "Portable OpenBSD ksh, based on the Public Domain Korn Shell (pdksh)"; + homepage = "https://github.com/ibara/oksh"; + license = licenses.publicDomain; + maintainers = with maintainers; [ siraben ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/shells/pash/default.nix b/pkgs/shells/pash/default.nix index c646c1c3f9bd..06ca24207987 100644 --- a/pkgs/shells/pash/default.nix +++ b/pkgs/shells/pash/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildDotnetPackage }: +{ lib, stdenv, fetchFromGitHub, buildDotnetPackage }: buildDotnetPackage { baseName = "pash"; @@ -15,7 +15,7 @@ buildDotnetPackage { outputFiles = [ "Source/PashConsole/bin/Release/*" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "An open source implementation of Windows PowerShell"; homepage = "https://github.com/Pash-Project/Pash"; maintainers = [ maintainers.fornever maintainers.vrthra ]; diff --git a/pkgs/shells/rc/default.nix b/pkgs/shells/rc/default.nix index cd5ed860b2e6..a71d5ba28971 100644 --- a/pkgs/shells/rc/default.nix +++ b/pkgs/shells/rc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook +{ lib, stdenv, fetchurl, autoreconfHook , ncurses #acinclude.m4 wants headers for tgetent(). , historySupport ? false , readline ? null @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { shellPath = "/bin/rc"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "The Plan 9 shell"; longDescription = "Byron Rakitzis' UNIX reimplementation of Tom Duff's Plan 9 shell."; homepage = "http://tobold.org/article/rc"; diff --git a/pkgs/shells/tcsh/default.nix b/pkgs/shells/tcsh/default.nix index 87cbf8c59f36..468d17b60b7e 100644 --- a/pkgs/shells/tcsh/default.nix +++ b/pkgs/shells/tcsh/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchurl, fetchpatch -, ncurses }: +{ lib, stdenv, fetchurl, fetchpatch +, ncurses +}: -with stdenv.lib; stdenv.mkDerivation rec { pname = "tcsh"; - version = "6.22.02"; + version = "6.22.03"; src = fetchurl { urls = [ @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { "ftp://ftp.astron.com/pub/tcsh/${pname}-${version}.tar.gz" "ftp://ftp.funet.fi/pub/unix/shells/tcsh/${pname}-${version}.tar.gz" ]; - sha256 = "0nw8prz1n0lmr82wnpyhrzmki630afn7p9cfgr3vl00vr9c72a7d"; + sha256 = "sha256-viz9ZT0qDH9QbS3RTBIyS6dJvUhAN75t9Eo5c/UiYrc="; }; buildInputs = [ ncurses ]; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { sha256 = "1qc6ydxhdfizsbkaxhpn3wib8sfphrw10xnnsxx2prvzg9g2zp67"; }); - meta = { + meta = with lib; { description = "An enhanced version of the Berkeley UNIX C shell (csh)"; longDescription = '' tcsh is an enhanced but completely compatible version of the diff --git a/pkgs/shells/xonsh/default.nix b/pkgs/shells/xonsh/default.nix index 711d7060fa55..53bd137ddfae 100644 --- a/pkgs/shells/xonsh/default.nix +++ b/pkgs/shells/xonsh/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , python3Packages , glibcLocales @@ -43,7 +43,7 @@ python3Packages.buildPythonApplication rec { propagatedBuildInputs = with python3Packages; [ ply prompt_toolkit pygments ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A Python-ish, BASHwards-compatible shell"; homepage = "https://xon.sh/"; changelog = "https://github.com/xonsh/xonsh/releases/tag/${version}"; diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix index 56c76289e857..eab6d88a0b7d 100644 --- a/pkgs/shells/zsh/default.nix +++ b/pkgs/shells/zsh/default.nix @@ -26,6 +26,7 @@ stdenv.mkDerivation { "--with-tcsetpgrp" "--enable-pcre" "--enable-zprofile=${placeholder "out"}/etc/zprofile" + "--disable-site-fndir" ]; # the zsh/zpty module is not available on hydra diff --git a/pkgs/shells/zsh/fzf-zsh/default.nix b/pkgs/shells/zsh/fzf-zsh/default.nix index 075707f425c4..ac5cab94d4cb 100644 --- a/pkgs/shells/zsh/fzf-zsh/default.nix +++ b/pkgs/shells/zsh/fzf-zsh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fzf }: +{ lib, stdenv, fetchFromGitHub, fzf }: stdenv.mkDerivation rec { pname = "fzf-zsh-unstable"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { install -Dm0644 fzf-zsh.plugin.zsh $out/share/zsh/plugins/fzf-zsh/fzf-zsh.plugin.zsh ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/wyntau/fzf-zsh"; description = "wrap fzf to use in oh-my-zsh"; license = licenses.mit; diff --git a/pkgs/shells/zsh/gradle-completion/default.nix b/pkgs/shells/zsh/gradle-completion/default.nix index 72667d862a89..bf5969d1300a 100644 --- a/pkgs/shells/zsh/gradle-completion/default.nix +++ b/pkgs/shells/zsh/gradle-completion/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "gradle-completion"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Gradle tab completion for bash and zsh"; homepage = "https://github.com/gradle/gradle-completion"; license = licenses.mit; diff --git a/pkgs/shells/zsh/grml-zsh-config/default.nix b/pkgs/shells/zsh/grml-zsh-config/default.nix index 756c01d6e346..201816305479 100644 --- a/pkgs/shells/zsh/grml-zsh-config/default.nix +++ b/pkgs/shells/zsh/grml-zsh-config/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { ln -s grmlzshrc.5.gz $out/share/man/man5/grml-zsh-config.5.gz ''; - meta = with stdenv.lib; { + meta = with lib; { description = "grml's zsh setup"; homepage = "https://grml.org/zsh/"; license = licenses.gpl2; diff --git a/pkgs/shells/zsh/lambda-mod-zsh-theme/default.nix b/pkgs/shells/zsh/lambda-mod-zsh-theme/default.nix index 37614dac0a32..d9a846c9e06f 100644 --- a/pkgs/shells/zsh/lambda-mod-zsh-theme/default.nix +++ b/pkgs/shells/zsh/lambda-mod-zsh-theme/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation { pname = "lambda-mod-zsh-theme-unstable"; @@ -15,7 +15,7 @@ stdenv.mkDerivation { install -Dm0644 lambda-mod.zsh-theme $out/share/zsh/themes/lambda-mod.zsh-theme ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A ZSH theme optimized for people who use Git & Unicode-compatible fonts and terminals"; homepage = "https://github.com/halfo/lambda-mod-zsh-theme/"; license = licenses.mit; diff --git a/pkgs/shells/zsh/nix-zsh-completions/default.nix b/pkgs/shells/zsh/nix-zsh-completions/default.nix index 623d562b16e0..c48bf209d0f9 100644 --- a/pkgs/shells/zsh/nix-zsh-completions/default.nix +++ b/pkgs/shells/zsh/nix-zsh-completions/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: let version = "0.4.4"; @@ -21,7 +21,7 @@ stdenv.mkDerivation { cp *.zsh $out/share/zsh/plugins/nix ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/spwhitt/nix-zsh-completions"; description = "ZSH completions for Nix, NixOS, and NixOps"; license = licenses.bsd3; diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index 4e377218b73b..1b3a4c21cf32 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -1,19 +1,19 @@ # 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, fetchFromGitHub, nixosTests, writeScript, common-updater-scripts, git +{ lib, stdenv, fetchFromGitHub, nixosTests, writeScript, common-updater-scripts, git , nix, nixfmt, jq, coreutils, gnused, curl, cacert }: stdenv.mkDerivation rec { - version = "2020-12-28"; + version = "2021-01-07"; pname = "oh-my-zsh"; - rev = "4b2431e8b1c08a2dc14fe31bf07a5e5f08eaa87e"; + rev = "c9bf8b4a84d4ae392cf1bdd6a4a7c7c4f7710b92"; src = fetchFromGitHub { inherit rev; owner = "ohmyzsh"; repo = "ohmyzsh"; - sha256 = "09776acglph64lg9x1f1ypglbbhknrqidq47zk95vksd1in8l3is"; + sha256 = "13i4r2bhffdjcln5cml29m9gzw9m39yxcln49h3shpp7s1gl3z4a"; }; installPhase = '' @@ -102,7 +102,7 @@ stdenv.mkDerivation rec { ''; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A framework for managing your zsh configuration"; longDescription = '' Oh My Zsh is a framework for managing your zsh configuration. diff --git a/pkgs/shells/zsh/spaceship-prompt/default.nix b/pkgs/shells/zsh/spaceship-prompt/default.nix index 7db8cdb33492..8f4b9bf0875c 100644 --- a/pkgs/shells/zsh/spaceship-prompt/default.nix +++ b/pkgs/shells/zsh/spaceship-prompt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "spaceship-prompt"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ln -s "$out/lib/spaceship-prompt/spaceship.zsh" "$out/share/zsh/site-functions/prompt_spaceship_setup" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Zsh prompt for Astronauts"; homepage = "https://github.com/denysdovhan/spaceship-prompt/"; license = licenses.mit; diff --git a/pkgs/shells/zsh/zsh-autosuggestions/default.nix b/pkgs/shells/zsh/zsh-autosuggestions/default.nix index 58e560d2fa4d..3f5cadfccb1d 100644 --- a/pkgs/shells/zsh/zsh-autosuggestions/default.nix +++ b/pkgs/shells/zsh/zsh-autosuggestions/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, zsh }: +{ lib, stdenv, fetchFromGitHub, zsh }: # To make use of this derivation, use the `programs.zsh.enableAutoSuggestions` option @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { $out/share/zsh-autosuggestions/zsh-autosuggestions.zsh ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Fish shell autosuggestions for Zsh"; homepage = "https://github.com/zsh-users/zsh-autosuggestions"; license = licenses.mit; diff --git a/pkgs/shells/zsh/zsh-command-time/default.nix b/pkgs/shells/zsh/zsh-command-time/default.nix index 3ef210a02818..9696e441cf5a 100644 --- a/pkgs/shells/zsh/zsh-command-time/default.nix +++ b/pkgs/shells/zsh/zsh-command-time/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: # To make use of this plugin, need to add # programs.zsh.interactiveShellInit = '' @@ -25,7 +25,7 @@ stdenv.mkDerivation { install -Dm0444 $src/command-time.plugin.zsh --target-directory=$out/share/zsh/plugins/command-time ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Plugin that output time: xx after long commands"; homepage = "https://github.com/popstas/zsh-command-time"; license = licenses.mit; diff --git a/pkgs/shells/zsh/zsh-deer/default.nix b/pkgs/shells/zsh/zsh-deer/default.nix index 735d6a2b7619..895ca621cfed 100644 --- a/pkgs/shells/zsh/zsh-deer/default.nix +++ b/pkgs/shells/zsh/zsh-deer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, perl }: +{ lib, stdenv, fetchFromGitHub, perl }: let version = "1.4"; @@ -25,7 +25,7 @@ in stdenv.mkDerivation { cp deer $out/share/zsh/site-functions/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Ranger-like file navigation for zsh"; homepage = "https://github.com/Vifon/deer"; license = licenses.gpl3Plus; diff --git a/pkgs/shells/zsh/zsh-nix-shell/default.nix b/pkgs/shells/zsh/zsh-nix-shell/default.nix index 6db78f1c0f56..20017414cf7d 100644 --- a/pkgs/shells/zsh/zsh-nix-shell/default.nix +++ b/pkgs/shells/zsh/zsh-nix-shell/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgs }: +{ lib, stdenv, fetchFromGitHub, pkgs }: # To make use of this derivation, use # `programs.zsh.interactiveShellInit = "source ${pkgs.zsh-nix-shell}/share/zsh-nix-shell/nix-shell.plugin.zsh";` @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { install -D scripts/* --target-directory=$out/share/zsh-nix-shell/scripts ''; - meta = with stdenv.lib; { + meta = with lib; { description = "zsh plugin that lets you use zsh in nix-shell shell"; homepage = src.meta.homepage; license = licenses.bsd3; diff --git a/pkgs/shells/zsh/zsh-prezto/default.nix b/pkgs/shells/zsh/zsh-prezto/default.nix index dffecf617b17..138de38786be 100644 --- a/pkgs/shells/zsh/zsh-prezto/default.nix +++ b/pkgs/shells/zsh/zsh-prezto/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "zsh-prezto"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { mkdir -p $out cp ./* $out/ -R ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Prezto is the configuration framework for Zsh; it enriches the command line interface environment with sane defaults, aliases, functions, auto completion, and prompt themes"; homepage = "https://github.com/sorin-ionescu/prezto"; license = licenses.mit; diff --git a/pkgs/shells/zsh/zsh-syntax-highlighting/default.nix b/pkgs/shells/zsh/zsh-syntax-highlighting/default.nix index 906352b8b3e0..09d6eb3cf963 100644 --- a/pkgs/shells/zsh/zsh-syntax-highlighting/default.nix +++ b/pkgs/shells/zsh/zsh-syntax-highlighting/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, zsh }: +{ lib, stdenv, fetchFromGitHub, zsh }: # To make use of this derivation, use the `programs.zsh.enableSyntaxHighlighting` option @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { installFlags = [ "PREFIX=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Fish shell like syntax highlighting for Zsh"; homepage = "https://github.com/zsh-users/zsh-syntax-highlighting"; license = licenses.bsd3; diff --git a/pkgs/shells/zsh/zsh-you-should-use/default.nix b/pkgs/shells/zsh/zsh-you-should-use/default.nix index 603757c3332b..8019e75a8594 100644 --- a/pkgs/shells/zsh/zsh-you-should-use/default.nix +++ b/pkgs/shells/zsh/zsh-you-should-use/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "zsh-you-should-use"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { install -D you-should-use.plugin.zsh $out/share/zsh/plugins/you-should-use/you-should-use.plugin.zsh ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/MichaelAquilina/zsh-you-should-use"; license = licenses.gpl3; description = "ZSH plugin that reminds you to use existing aliases for commands you just typed"; diff --git a/pkgs/stdenv/cross/default.nix b/pkgs/stdenv/cross/default.nix index 064e1836b17c..ed2b291ca2a1 100644 --- a/pkgs/stdenv/cross/default.nix +++ b/pkgs/stdenv/cross/default.nix @@ -66,7 +66,7 @@ in lib.init bootStages ++ [ else if crossSystem.isDarwin then buildPackages.llvmPackages.clang else if crossSystem.useLLVM or false - then buildPackages.llvmPackages_8.lldClang + then buildPackages.llvmPackages.lldClang else buildPackages.gcc; extraNativeBuildInputs = old.extraNativeBuildInputs diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index f07b1ee73b87..ecec2903b5f7 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -54,8 +54,6 @@ in rec { args = [ ./unpack-bootstrap-tools.sh ]; inherit (bootstrapFiles) mkdir bzip2 cpio tarball; - reexportedLibrariesFile = - ../../os-specific/darwin/apple-source-releases/Libsystem/reexported_libraries; __impureHostDeps = commonImpureHostDeps; }; @@ -167,19 +165,57 @@ in rec { stage0 = stageFun 0 null { overrides = self: super: with stage0; { - coreutils = { name = "bootstrap-stage0-coreutils"; outPath = bootstrapTools; }; - gnugrep = { name = "bootstrap-stage0-gnugrep"; outPath = bootstrapTools; }; + coreutils = stdenv.mkDerivation { + name = "bootstrap-stage0-coreutils"; + buildCommand = '' + mkdir -p $out + ln -s ${bootstrapTools}/bin $out/bin + ''; + }; + + gnugrep = stdenv.mkDerivation { + name = "bootstrap-stage0-gnugrep"; + buildCommand = '' + mkdir -p $out + ln -s ${bootstrapTools}/bin $out/bin + ''; + }; darwin = super.darwin // { Libsystem = stdenv.mkDerivation { name = "bootstrap-stage0-Libsystem"; buildCommand = '' mkdir -p $out - ln -s ${bootstrapTools}/lib $out/lib + + cp -r ${self.darwin.darwin-stubs}/usr/lib $out/lib + chmod -R +w $out/lib + substituteInPlace $out/lib/libSystem.B.tbd --replace /usr/lib/system $out/lib/system + + ln -s libSystem.B.tbd $out/lib/libSystem.tbd + + for name in c dbm dl info m mx poll proc pthread rpcsvc util gcc_s.10.4 gcc_s.10.5; do + ln -s libSystem.tbd $out/lib/lib$name.tbd + done + + ln -s ${bootstrapTools}/lib/*.o $out/lib + + ln -s ${bootstrapTools}/lib/libresolv.9.dylib $out/lib + ln -s libresolv.9.dylib $out/lib/libresolv.dylib + ln -s ${bootstrapTools}/include-Libsystem $out/include ''; }; - dyld = bootstrapTools; + + darwin-stubs = super.darwin.darwin-stubs.override { inherit (self) stdenv fetchurl; }; + + dyld = { + name = "bootstrap-stage0-dyld"; + buildCommand = '' + mkdir -p $out + ln -s ${bootstrapTools}/lib $out/lib + ln -s ${bootstrapTools}/include $out/include + ''; + }; binutils = lib.makeOverridable (import ../../build-support/bintools-wrapper) { shell = "${bootstrapTools}/bin/bash"; @@ -194,10 +230,15 @@ in rec { }; llvmPackages_7 = { - clang-unwrapped = { + clang-unwrapped = stdenv.mkDerivation { name = "bootstrap-stage0-clang"; - outPath = bootstrapTools; version = bootstrapClangVersion; + buildCommand = '' + mkdir -p $out/lib + ln -s ${bootstrapTools}/bin $out/bin + ln -s ${bootstrapTools}/lib/clang $out/lib/clang + ln -s ${bootstrapTools}/include $out/include + ''; }; libcxx = stdenv.mkDerivation { @@ -256,6 +297,7 @@ in rec { darwin = super.darwin // { binutils = darwin.binutils.override { + coreutils = self.coreutils; libc = self.darwin.Libsystem; }; }; @@ -268,8 +310,8 @@ in rec { allowedRequisites = [ bootstrapTools ] ++ - (with pkgs; [ libcxx libcxxabi llvmPackages_7.compiler-rt ]) ++ - (with pkgs.darwin; [ Libsystem ]); + (with pkgs; [ coreutils gnugrep libcxx libcxxabi llvmPackages_7.clang-unwrapped llvmPackages_7.compiler-rt ]) ++ + (with pkgs.darwin; [ darwin-stubs Libsystem ]); overrides = persistent; }; @@ -318,8 +360,8 @@ in rec { [ bootstrapTools ] ++ (with pkgs; [ xz.bin xz.out libcxx libcxxabi llvmPackages_7.compiler-rt - zlib libxml2.out curl.out openssl.out libssh2.out - nghttp2.lib libkrb5 coreutils gnugrep pcre.out gmp libiconv + llvmPackages_7.clang-unwrapped zlib libxml2.out curl.out openssl.out + libssh2.out nghttp2.lib libkrb5 coreutils gnugrep pcre.out gmp libiconv ]) ++ (with pkgs.darwin; [ dyld Libsystem CF ICU locale ]); @@ -370,8 +412,8 @@ in rec { [ bootstrapTools ] ++ (with pkgs; [ xz.bin xz.out bash libcxx libcxxabi llvmPackages_7.compiler-rt - zlib libxml2.out curl.out openssl.out libssh2.out - nghttp2.lib libkrb5 coreutils gnugrep pcre.out gmp libiconv + llvmPackages_7.clang-unwrapped zlib libxml2.out curl.out openssl.out + libssh2.out nghttp2.lib libkrb5 coreutils gnugrep pcre.out gmp libiconv ]) ++ (with pkgs.darwin; [ dyld ICU Libsystem locale ]); diff --git a/pkgs/stdenv/darwin/make-bootstrap-tools.nix b/pkgs/stdenv/darwin/make-bootstrap-tools.nix index 1243b96e5051..9824d57dff86 100644 --- a/pkgs/stdenv/darwin/make-bootstrap-tools.nix +++ b/pkgs/stdenv/darwin/make-bootstrap-tools.nix @@ -180,9 +180,6 @@ in rec { unpack = stdenv.mkDerivation (bootstrapFiles // { name = "unpack"; - reexportedLibrariesFile = - ../../os-specific/darwin/apple-source-releases/Libsystem/reexported_libraries; - # This is by necessity a near-duplicate of unpack-bootstrap-tools.sh. If we refer to it directly, # we can't make any changes to it due to our testing stdenv depending on it. Think of this as the # unpack-bootstrap-tools.sh for the next round of bootstrap tools. diff --git a/pkgs/stdenv/darwin/unpack-bootstrap-tools.sh b/pkgs/stdenv/darwin/unpack-bootstrap-tools.sh index 0da80ec5ce56..37beeaf28f94 100644 --- a/pkgs/stdenv/darwin/unpack-bootstrap-tools.sh +++ b/pkgs/stdenv/darwin/unpack-bootstrap-tools.sh @@ -17,41 +17,6 @@ for i in $out/bin/*; do fi done -install_name_tool \ - -id $out/lib/system/libsystem_c.dylib \ - $out/lib/system/libsystem_c.dylib - -install_name_tool \ - -id $out/lib/system/libsystem_kernel.dylib \ - $out/lib/system/libsystem_kernel.dylib - -# TODO: this logic basically duplicates similar logic in the Libsystem expression. Deduplicate them! -libs=$(cat $reexportedLibrariesFile | grep -v '^#') - -for i in $libs; do - if [ "$i" != "/usr/lib/system/libsystem_kernel.dylib" ] && [ "$i" != "/usr/lib/system/libsystem_c.dylib" ]; then - args="$args -reexport_library $i" - fi -done - -ld -macosx_version_min 10.7 \ - -arch x86_64 \ - -dylib \ - -o $out/lib/libSystem.B.dylib \ - -compatibility_version 1.0 \ - -current_version 1226.10.1 \ - -reexport_library $out/lib/system/libsystem_c.dylib \ - -reexport_library $out/lib/system/libsystem_kernel.dylib \ - $args - -ln -s libSystem.B.dylib $out/lib/libSystem.dylib - -for name in c dbm dl info m mx poll proc pthread rpcsvc util gcc_s.10.4 gcc_s.10.5; do - ln -s libSystem.dylib $out/lib/lib$name.dylib -done - -ln -s libresolv.9.dylib $out/lib/libresolv.dylib - for i in $out/lib/*.dylib $out/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation; do if test ! -L "$i" -a "$i" != "$out/lib/libSystem*.dylib"; then echo "Patching $i" diff --git a/pkgs/test/cc-wrapper/default.nix b/pkgs/test/cc-wrapper/default.nix index c0c89d63ffff..fae3448c44c6 100644 --- a/pkgs/test/cc-wrapper/default.nix +++ b/pkgs/test/cc-wrapper/default.nix @@ -1,11 +1,13 @@ -{ stdenv }: +{ stdenv, glibc }: with stdenv.lib; let # Sanitizers are not supported on Darwin. # Sanitizer headers aren't available in older libc++ stdenvs due to a bug - sanitizersWorking = - (stdenv.cc.isClang && versionAtLeast (getVersion stdenv.cc.name) "5.0.0") - || (stdenv.cc.isGNU && stdenv.isLinux); + sanitizersWorking = !stdenv.hostPlatform.isMusl && ( + (stdenv.cc.isClang && versionAtLeast (getVersion stdenv.cc.name) "5.0.0") + || (stdenv.cc.isGNU && stdenv.isLinux) + ); + staticLibc = optionalString (stdenv.hostPlatform.libc == "glibc") "-L ${glibc.static}/lib"; in stdenv.mkDerivation { name = "cc-wrapper-test"; @@ -28,6 +30,19 @@ in stdenv.mkDerivation { ./core-foundation-check ''} + + ${optionalString (!stdenv.isDarwin) '' + printf "checking whether compiler builds valid static C binaries... " >&2 + $CC ${staticLibc} -static -o cc-static ${./cc-main.c} + ./cc-static + # our glibc does not have pie enabled yet. + ${optionalString (stdenv.hostPlatform.isMusl && stdenv.cc.isGNU) '' + printf "checking whether compiler builds valid static pie C binaries... " >&2 + $CC ${staticLibc} -static-pie -o cc-static-pie ${./cc-main.c} + ./cc-static-pie + ''} + ''} + printf "checking whether compiler uses NIX_CFLAGS_COMPILE... " >&2 mkdir -p foo/include cp ${./foo.c} foo/include/foo.h diff --git a/pkgs/tools/X11/alttab/default.nix b/pkgs/tools/X11/alttab/default.nix index 7917ad5215eb..4c9c0b66a505 100644 --- a/pkgs/tools/X11/alttab/default.nix +++ b/pkgs/tools/X11/alttab/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, pkgconfig, ronn, libpng, uthash +{ lib, stdenv, fetchFromGitHub, autoconf, automake, pkgconfig, ronn, libpng, uthash , xorg }: stdenv.mkDerivation rec { @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/sagb/alttab"; description = "X11 window switcher designed for minimalistic window managers or standalone X11 session"; license = licenses.gpl3; diff --git a/pkgs/tools/X11/bgs/default.nix b/pkgs/tools/X11/bgs/default.nix index 66d845b0587f..9db666672d48 100644 --- a/pkgs/tools/X11/bgs/default.nix +++ b/pkgs/tools/X11/bgs/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, libX11, libXinerama, imlib2}: +{lib, stdenv, fetchurl, pkgconfig, libX11, libXinerama, imlib2}: stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { preConfigure = ''sed -i "s@PREFIX = /usr/local@PREFIX = $out@g" config.mk''; - meta = with stdenv.lib; { + meta = with lib; { description = "Extremely fast and small background setter for X"; license = licenses.mit; platforms = platforms.linux; diff --git a/pkgs/tools/X11/bumblebee/default.nix b/pkgs/tools/X11/bumblebee/default.nix index 8540cf6975dc..8bd65ec2fc2c 100644 --- a/pkgs/tools/X11/bumblebee/default.nix +++ b/pkgs/tools/X11/bumblebee/default.nix @@ -133,7 +133,7 @@ in stdenv.mkDerivation rec { --prefix PATH : "${virtualgl}/bin" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/Bumblebee-Project/Bumblebee"; description = "Daemon for managing Optimus videocards (power-on/off, spawns xservers)"; platforms = platforms.linux; diff --git a/pkgs/tools/X11/ckbcomp/default.nix b/pkgs/tools/X11/ckbcomp/default.nix index 275fe38611de..8bb2cddc0801 100644 --- a/pkgs/tools/X11/ckbcomp/default.nix +++ b/pkgs/tools/X11/ckbcomp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, perl, xkeyboard_config }: +{ lib, stdenv, fetchFromGitLab, perl, xkeyboard_config }: stdenv.mkDerivation rec { pname = "ckbcomp"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { install -Dm0444 -t $out/share/man/man1 man/ckbcomp.1 ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Compiles a XKB keyboard description to a keymap suitable for loadkeys"; homepage = "https://salsa.debian.org/installer-team/console-setup"; license = licenses.gpl2Plus; diff --git a/pkgs/tools/X11/devour/default.nix b/pkgs/tools/X11/devour/default.nix index 4f39c0a98904..016ffa6215db 100644 --- a/pkgs/tools/X11/devour/default.nix +++ b/pkgs/tools/X11/devour/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libX11 }: +{ lib, stdenv, fetchFromGitHub, libX11 }: stdenv.mkDerivation rec { pname = "devour"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ libX11 ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Devour hides your current window when launching an external program"; longDescription = "Devour hides your current window before launching an external program and unhides it after quitting"; homepage = "https://github.com/salman-abedin/devour"; diff --git a/pkgs/tools/X11/dex/default.nix b/pkgs/tools/X11/dex/default.nix index 22d6c1bfdeca..dd1953d783a0 100644 --- a/pkgs/tools/X11/dex/default.nix +++ b/pkgs/tools/X11/dex/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python3 }: +{ lib, stdenv, fetchFromGitHub, python3 }: stdenv.mkDerivation rec { program = "dex"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ python3.pkgs.sphinx ]; makeFlags = [ "PREFIX=$(out)" "VERSION=$(version)" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A program to generate and execute DesktopEntry files of the Application type"; homepage = "https://github.com/jceb/dex"; platforms = platforms.linux; diff --git a/pkgs/tools/X11/dispad/default.nix b/pkgs/tools/X11/dispad/default.nix index fccb28489efd..fbb7b117d298 100644 --- a/pkgs/tools/X11/dispad/default.nix +++ b/pkgs/tools/X11/dispad/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libX11, libXi, libconfuse }: +{ lib, stdenv, fetchFromGitHub, libX11, libXi, libconfuse }: stdenv.mkDerivation rec { pname = "dispad"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ libX11 libXi libconfuse ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A small daemon for disabling trackpads while typing"; homepage = "https://github.com/BlueDragonX/dispad"; license = licenses.gpl2; diff --git a/pkgs/tools/X11/dragon-drop/default.nix b/pkgs/tools/X11/dragon-drop/default.nix index 86c867b16ba8..632fc844e5ed 100644 --- a/pkgs/tools/X11/dragon-drop/default.nix +++ b/pkgs/tools/X11/dragon-drop/default.nix @@ -1,4 +1,4 @@ -{ stdenv, gtk, pkgconfig, fetchFromGitHub }: +{ lib, stdenv, gtk, pkgconfig, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "dragon-drop"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { install -D dragon -t $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Simple drag-and-drop source/sink for X"; homepage = "https://github.com/mwh/dragon"; maintainers = with maintainers; [ jb55 markus1189 ]; diff --git a/pkgs/tools/X11/ffcast/default.nix b/pkgs/tools/X11/ffcast/default.nix index 1378d5e6b982..3f6122e4093d 100644 --- a/pkgs/tools/X11/ffcast/default.nix +++ b/pkgs/tools/X11/ffcast/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, perl, libX11 }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, perl, libX11 }: stdenv.mkDerivation rec { pname = "ffcast"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { make install ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Run commands on rectangular screen regions"; homepage = "https://github.com/lolilolicon/FFcast"; license = licenses.gpl3; diff --git a/pkgs/tools/X11/find-cursor/default.nix b/pkgs/tools/X11/find-cursor/default.nix index 13f274577887..9e3b779d686b 100644 --- a/pkgs/tools/X11/find-cursor/default.nix +++ b/pkgs/tools/X11/find-cursor/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libX11, libXdamage, libXrender, libXcomposite, libXext, installShellFiles, git }: +{ lib, stdenv, fetchFromGitHub, libX11, libXdamage, libXrender, libXcomposite, libXext, installShellFiles, git }: stdenv.mkDerivation rec { pname = "find-cursor"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { preInstall = "mkdir -p $out/share/man/man1"; installFlags = "PREFIX=${placeholder "out"}"; - meta = with stdenv.lib; { + meta = with lib; { description = "Simple XLib program to highlight the cursor position"; homepage = "https://github.com/arp242/find-cursor"; license = licenses.mit; diff --git a/pkgs/tools/X11/go-sct/default.nix b/pkgs/tools/X11/go-sct/default.nix index 01d82b4a112c..b52183e2dd28 100644 --- a/pkgs/tools/X11/go-sct/default.nix +++ b/pkgs/tools/X11/go-sct/default.nix @@ -1,4 +1,4 @@ -{ stdenv, xorg, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, xorg, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "go-sct"; @@ -18,7 +18,7 @@ buildGoPackage rec { buildInputs = [ xorg.libX11 xorg.libXrandr ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Color temperature setting library and CLI that operates in a similar way to f.lux and Redshift"; license = licenses.mit; maintainers = with maintainers; [ rvolosatovs cstrahan ]; diff --git a/pkgs/tools/X11/grobi/default.nix b/pkgs/tools/X11/grobi/default.nix index 9d10dd478818..1ebd8ccc4e4c 100644 --- a/pkgs/tools/X11/grobi/default.nix +++ b/pkgs/tools/X11/grobi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildGoModule, fetchpatch }: +{ lib, stdenv, fetchFromGitHub, buildGoModule, fetchpatch }: buildGoModule rec { version = "0.6.0"; @@ -21,7 +21,7 @@ buildGoModule rec { }) ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/fd0/grobi"; description = "Automatically configure monitors/outputs for Xorg via RANDR"; license = with licenses; [ bsd2 ]; diff --git a/pkgs/tools/X11/hsetroot/default.nix b/pkgs/tools/X11/hsetroot/default.nix index 0d42687bf0b0..69842a7bd59c 100644 --- a/pkgs/tools/X11/hsetroot/default.nix +++ b/pkgs/tools/X11/hsetroot/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , pkg-config , imlib2 @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { mkdir -p "$out/bin" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Allows you to compose wallpapers ('root pixmaps') for X"; homepage = "https://github.com/himdel/hsetroot"; license = licenses.gpl2Plus; diff --git a/pkgs/tools/X11/icon-slicer/default.nix b/pkgs/tools/X11/icon-slicer/default.nix new file mode 100644 index 000000000000..18d6d468af8c --- /dev/null +++ b/pkgs/tools/X11/icon-slicer/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, pkg-config, gdk-pixbuf, popt }: +stdenv.mkDerivation rec { + pname = "icon-slicer"; + version = "0.3"; + + src = fetchurl { + url = "https://freedesktop.org/software/icon-slicer/releases/icon-slicer-${version}.tar.gz"; + sha256 = "0kdnc08k2rs8llfg7xgvnrsk60x59pv5fqz6kn2ifnn2s1nj3w05"; + }; + + patches = [ + # Fixes hotspot `y` coordinate. The `x` coordinate is used on the y-axis. + (fetchurl { + url = "https://aur.archlinux.org/cgit/aur.git/plain/hotspotfix.patch?h=icon-slicer"; + sha256 = "1l1dc1x5p4hys02arkmq3x6b1xdi510969d25g928zr4gf4an03h"; + }) + ]; + + nativeBuildInputs = [ popt pkg-config ]; + buildInputs = [ gdk-pixbuf ]; + + meta = with stdenv.lib; { + description = "Utility for generating icon themes and libXcursor cursor themes"; + homepage = "https://www.freedesktop.org/wiki/Software/icon-slicer/"; + license = licenses.mit; + maintainers = with maintainers; [ zaninime ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/X11/imwheel/default.nix b/pkgs/tools/X11/imwheel/default.nix index efed00f96397..27a545a95cdb 100644 --- a/pkgs/tools/X11/imwheel/default.nix +++ b/pkgs/tools/X11/imwheel/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libX11, libXext, libXi, libXmu, libXt, libXtst }: +{ lib, stdenv, fetchurl, libX11, libXext, libXi, libXmu, libXt, libXtst }: stdenv.mkDerivation rec { name = "imwheel-1.0.0pre12"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { "ETCDIR=${placeholder "out"}/etc" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://imwheel.sourceforge.net/"; description = "Mouse wheel configuration tool for XFree86/Xorg"; maintainers = with maintainers; [ jhillyerd ]; diff --git a/pkgs/tools/X11/keynav/default.nix b/pkgs/tools/X11/keynav/default.nix index 64684cf73df2..d737ba56ed86 100644 --- a/pkgs/tools/X11/keynav/default.nix +++ b/pkgs/tools/X11/keynav/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, libX11, xorgproto, libXtst, libXi, libXext +{ lib, stdenv, fetchFromGitHub, pkgconfig, libX11, xorgproto, libXtst, libXi, libXext , libXinerama, libXrandr, glib, cairo, xdotool }: let release = "20180821"; in @@ -29,7 +29,7 @@ stdenv.mkDerivation { cp keynavrc $out/share/keynav/doc ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Generate X11 mouse clicks from keyboard"; homepage = "https://www.semicomplete.com/projects/keynav/"; license = licenses.bsd3; diff --git a/pkgs/tools/X11/ksuperkey/default.nix b/pkgs/tools/X11/ksuperkey/default.nix index d5c2232dce11..aed85f978cd5 100644 --- a/pkgs/tools/X11/ksuperkey/default.nix +++ b/pkgs/tools/X11/ksuperkey/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libX11, libXtst, pkgconfig, xorgproto, libXi }: +{ lib, stdenv, fetchFromGitHub, libX11, libXtst, pkgconfig, xorgproto, libXi }: stdenv.mkDerivation rec { pname = "ksuperkey"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 libXtst xorgproto libXi ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A tool to be able to bind the super key as a key rather than a modifier"; homepage = "https://github.com/hanschen/ksuperkey"; license = licenses.gpl3; diff --git a/pkgs/tools/X11/libstrangle/default.nix b/pkgs/tools/X11/libstrangle/default.nix index d24654ce3ad7..1f0a7a8e3a6a 100644 --- a/pkgs/tools/X11/libstrangle/default.nix +++ b/pkgs/tools/X11/libstrangle/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "libstrangle"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { substituteAllInPlace src/strangle.sh ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/milaq/libstrangle"; description = "Frame rate limiter for Linux/OpenGL"; license = licenses.gpl3; diff --git a/pkgs/tools/X11/ncview/default.nix b/pkgs/tools/X11/ncview/default.nix index 1f793aa6c4c9..c22c6c0eb38a 100644 --- a/pkgs/tools/X11/ncview/default.nix +++ b/pkgs/tools/X11/ncview/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , netcdf, xlibsWrapper, xorg, udunits, expat }: @@ -16,7 +16,7 @@ in stdenv.mkDerivation { buildInputs = [ netcdf xlibsWrapper xorg.libXaw udunits expat ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Visual browser for netCDF format files"; homepage = "http://meteora.ucsd.edu/~pierce/ncview_home_page.html"; license = licenses.gpl3; diff --git a/pkgs/tools/X11/numlockx/default.nix b/pkgs/tools/X11/numlockx/default.nix index b59e9dc30ac8..5cd23a81f308 100644 --- a/pkgs/tools/X11/numlockx/default.nix +++ b/pkgs/tools/X11/numlockx/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libX11, libXext, autoconf }: +{ lib, stdenv, fetchFromGitHub, libX11, libXext, autoconf }: stdenv.mkDerivation rec { version = "1.2"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ libX11 libXext autoconf ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Allows to start X with NumLock turned on"; license = licenses.mit; platforms = platforms.all; diff --git a/pkgs/tools/X11/nx-libs/default.nix b/pkgs/tools/X11/nx-libs/default.nix index 807282fae598..3fbb0930cab6 100644 --- a/pkgs/tools/X11/nx-libs/default.nix +++ b/pkgs/tools/X11/nx-libs/default.nix @@ -23,8 +23,6 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = [ "-I${libtirpc.dev}/include/tirpc" ]; NIX_LDFLAGS = [ "-ltirpc" ]; - enableParallelBuilding = true; - postPatch = '' patchShebangs . find . -type f -name Makefile -exec sed -i 's|^\(SHELL:=\)/bin/bash$|\1${stdenv.shell}|g' {} \; diff --git a/pkgs/tools/X11/opentabletdriver/default.nix b/pkgs/tools/X11/opentabletdriver/default.nix index 6f8f9e44cc4a..dc527f47dd34 100644 --- a/pkgs/tools/X11/opentabletdriver/default.nix +++ b/pkgs/tools/X11/opentabletdriver/default.nix @@ -2,7 +2,6 @@ , lib , fetchFromGitHub , fetchurl -, makeWrapper , linkFarmFromDrvs , dotnet-netcore , dotnet-sdk @@ -15,7 +14,10 @@ , libevdev , libnotify , udev +, copyDesktopItems , makeDesktopItem +, makeWrapper +, nixosTests , wrapGAppsHook }: @@ -39,6 +41,7 @@ stdenv.mkDerivation rec { dotnet-sdk dotnetPackages.Nuget dpkg + copyDesktopItems makeWrapper wrapGAppsHook ]; @@ -62,6 +65,8 @@ stdenv.mkDerivation rec { ]; configurePhase = '' + runHook preConfigure + export HOME=$(mktemp -d) export DOTNET_CLI_TELEMETRY_OPTOUT=1 export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 @@ -76,20 +81,25 @@ stdenv.mkDerivation rec { for project in OpenTabletDriver.{Console,Daemon,UX.Gtk}; do dotnet restore --source "$PWD/nixos" $project done + + runHook postConfigure ''; buildPhase = '' + runHook preBuild + for project in OpenTabletDriver.{Console,Daemon,UX.Gtk}; do dotnet build $project \ --no-restore \ --configuration Release \ --framework net5 done + + runHook postBuild ''; installPhase = '' - mkdir -p $out/lib/OpenTabletDriver/ - cp -r ./OpenTabletDriver/Configurations/ $out/lib/OpenTabletDriver/ + runHook preInstall for project in OpenTabletDriver.{Console,Daemon,UX.Gtk}; do dotnet publish $project \ @@ -119,11 +129,19 @@ stdenv.mkDerivation rec { --set DOTNET_ROOT "${dotnet-netcore}" \ --suffix LD_LIBRARY_PATH : "${lib.makeLibraryPath runtimeDeps}" - mkdir -p $out/share/{applications,pixmaps} + mkdir -p $out/lib/OpenTabletDriver + cp -rv ./OpenTabletDriver/Configurations $out/lib/OpenTabletDriver + install -Dm644 $src/OpenTabletDriver.UX/Assets/otd.png -t $out/share/pixmaps - cp -r $src/OpenTabletDriver.UX/Assets/* $out/share/pixmaps + # TODO: Ideally this should be build from OpenTabletDriver/OpenTabletDriver-udev instead + dpkg-deb --fsys-tarfile ${debPkg} | tar xf - ./usr/lib/udev/rules.d/30-opentabletdriver.rules + install -Dm644 ./usr/lib/udev/rules.d/30-opentabletdriver.rules -t $out/lib/udev/rules.d - cp -r ${makeDesktopItem { + runHook postInstall + ''; + + desktopItems = [ + (makeDesktopItem { desktopName = "OpenTabletDriver"; name = "OpenTabletDriver"; exec = "otd-gui"; @@ -131,17 +149,16 @@ stdenv.mkDerivation rec { comment = meta.description; type = "Application"; categories = "Utility;"; - }}/share/applications/* $out/share/applications - - # TODO: Ideally this should be build from OpenTabletDriver/OpenTabletDriver-udev instead - dpkg-deb --fsys-tarfile ${debPkg} | tar xf - ./usr/lib/udev/rules.d/30-opentabletdriver.rules - mkdir -p $out/lib/udev/rules.d - cp ./usr/lib/udev/rules.d/* $out/lib/udev/rules.d - ''; + }) + ]; dontWrapGApps = true; dontStrip = true; + passthru.tests = { + otd-runs = nixosTests.opentabletdriver; + }; + meta = with lib; { description = "Open source, cross-platform, user-mode tablet driver"; homepage = "https://github.com/InfinityGhost/OpenTabletDriver"; diff --git a/pkgs/tools/X11/primus/lib.nix b/pkgs/tools/X11/primus/lib.nix index f4c2c9efc49e..d2f779ddd724 100644 --- a/pkgs/tools/X11/primus/lib.nix +++ b/pkgs/tools/X11/primus/lib.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch +{ lib, stdenv, fetchFromGitHub, fetchpatch , libX11, libGL, mesa , nvidia_x11 ? null , libglvnd @@ -42,7 +42,7 @@ in stdenv.mkDerivation { passthru.glvnd = if nvidia_x11 != null && nvidia_x11.useGLVND then nvidia_x11 else null; - meta = with stdenv.lib; { + meta = with lib; { description = "Low-overhead client-side GPU offloading"; homepage = "https://github.com/amonakov/primus"; platforms = [ "i686-linux" "x86_64-linux" ]; diff --git a/pkgs/tools/X11/run-scaled/default.nix b/pkgs/tools/X11/run-scaled/default.nix index aae09d49b3d4..6b2f400c2951 100644 --- a/pkgs/tools/X11/run-scaled/default.nix +++ b/pkgs/tools/X11/run-scaled/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, makeWrapper, bc, xorgserver, xpra, xrandr }: +{ lib, stdenv, fetchFromGitHub, makeWrapper, bc, xorgserver, xpra, xrandr }: stdenv.mkDerivation { version = "git-2018-06-03"; @@ -20,7 +20,7 @@ stdenv.mkDerivation { ${stdenv.lib.makeBinPath [ bc xorgserver xpra xrandr ]} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Run an X application scaled via xpra"; homepage = "https://github.com/kaueraal/run_scaled"; maintainers = [ maintainers.snaar ]; diff --git a/pkgs/tools/X11/sct/default.nix b/pkgs/tools/X11/sct/default.nix index 3f6291417e59..0d74206155ab 100644 --- a/pkgs/tools/X11/sct/default.nix +++ b/pkgs/tools/X11/sct/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libX11, libXrandr }: +{ lib, stdenv, fetchurl, libX11, libXrandr }: stdenv.mkDerivation rec { name = "sct"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { installPhase = "install -Dt $out/bin sct"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.tedunangst.com/flak/post/sct-set-color-temperature"; description = "A minimal utility to set display colour temperature"; maintainers = [ maintainers.raskin ]; diff --git a/pkgs/tools/X11/setroot/default.nix b/pkgs/tools/X11/setroot/default.nix index 56c356b20d5b..a59e2a0d0dbb 100644 --- a/pkgs/tools/X11/setroot/default.nix +++ b/pkgs/tools/X11/setroot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libX11, imlib2 +{ lib, stdenv, fetchFromGitHub, libX11, imlib2 , enableXinerama ? true, libXinerama ? null }: @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { installFlags = [ "DESTDIR=$(out)" "PREFIX=" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Simple X background setter inspired by imlibsetroot and feh"; homepage = "https://github.com/ttzhou/setroot"; license = licenses.gpl3Plus; diff --git a/pkgs/tools/X11/srandrd/default.nix b/pkgs/tools/X11/srandrd/default.nix index 6d5fa0f3d980..4c79e11765cb 100644 --- a/pkgs/tools/X11/srandrd/default.nix +++ b/pkgs/tools/X11/srandrd/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , libX11 , libXrandr @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/jceb/srandrd"; description = "Simple randr daemon"; license = licenses.mit; diff --git a/pkgs/tools/X11/vdpauinfo/default.nix b/pkgs/tools/X11/vdpauinfo/default.nix index 741043a9e538..73f94768bcd9 100644 --- a/pkgs/tools/X11/vdpauinfo/default.nix +++ b/pkgs/tools/X11/vdpauinfo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libvdpau }: +{ lib, stdenv, fetchurl, pkgconfig, libvdpau }: stdenv.mkDerivation rec { pname = "vdpauinfo"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libvdpau ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://people.freedesktop.org/~aplattner/vdpau/"; description = "Tool to query the Video Decode and Presentation API for Unix (VDPAU) abilities of the system"; license = licenses.mit; # expat version diff --git a/pkgs/tools/X11/virtualgl/lib.nix b/pkgs/tools/X11/virtualgl/lib.nix index 054e061c4ac8..362a86fff37c 100644 --- a/pkgs/tools/X11/virtualgl/lib.nix +++ b/pkgs/tools/X11/virtualgl/lib.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake +{ lib, stdenv, fetchurl, cmake , libGL, libGLU, libX11, libXv, libXtst, libjpeg_turbo, fltk , xorg , opencl-headers, opencl-clhpp, ocl-icd @@ -31,9 +31,7 @@ stdenv.mkDerivation rec { --replace "LD_PRELOAD=libgefaker" "LD_PRELOAD=$out/lib/libgefaker" ''; - enableParallelBuilding = true; - - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.virtualgl.org/"; description = "X11 GL rendering in a remote computer with full 3D hw acceleration"; license = licenses.wxWindows; diff --git a/pkgs/tools/X11/wmutils-core/default.nix b/pkgs/tools/X11/wmutils-core/default.nix index fdf805f80992..c8f3bd52c3e9 100644 --- a/pkgs/tools/X11/wmutils-core/default.nix +++ b/pkgs/tools/X11/wmutils-core/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libxcb }: +{ lib, stdenv, fetchurl, libxcb }: stdenv.mkDerivation rec { pname = "wmutils-core"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { installFlags = [ "PREFIX=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Set of window manipulation tools"; homepage = "https://github.com/wmutils/core"; license = licenses.isc; diff --git a/pkgs/tools/X11/wmutils-libwm/default.nix b/pkgs/tools/X11/wmutils-libwm/default.nix index 72022621afed..6d2787a96cd3 100644 --- a/pkgs/tools/X11/wmutils-libwm/default.nix +++ b/pkgs/tools/X11/wmutils-libwm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libxcb }: +{ lib, stdenv, fetchFromGitHub, libxcb }: stdenv.mkDerivation rec { pname = "wmutils-libwm"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { installFlags = [ "PREFIX=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A small library for X window manipulation"; homepage = "https://github.com/wmutils/libwm"; license = licenses.isc; diff --git a/pkgs/tools/X11/wmutils-opt/default.nix b/pkgs/tools/X11/wmutils-opt/default.nix index 39f26b95cdbc..0d847262ea58 100644 --- a/pkgs/tools/X11/wmutils-opt/default.nix +++ b/pkgs/tools/X11/wmutils-opt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libxcb }: +{ lib, stdenv, fetchFromGitHub, libxcb }: stdenv.mkDerivation rec { pname = "wmutils-opt"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { installFlags = [ "PREFIX=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Optional addons to wmutils"; homepage = "https://github.com/wmutils/opt"; license = licenses.isc; diff --git a/pkgs/tools/X11/wpgtk/default.nix b/pkgs/tools/X11/wpgtk/default.nix index 84d1f379e8aa..f2864ca2eb5a 100644 --- a/pkgs/tools/X11/wpgtk/default.nix +++ b/pkgs/tools/X11/wpgtk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python3Packages, fetchFromGitHub, libxslt, +{ lib, stdenv, python3Packages, fetchFromGitHub, libxslt, gobject-introspection, gtk3, wrapGAppsHook, gnome3 }: python3Packages.buildPythonApplication rec { @@ -34,7 +34,7 @@ python3Packages.buildPythonApplication rec { # No test exist doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Template based wallpaper/colorscheme generator and manager"; longDescription = '' In short, wpgtk is a colorscheme/wallpaper manager with a template system attached which lets you create templates from any textfile and will replace keywords on it on the fly, allowing for great styling and theming possibilities. diff --git a/pkgs/tools/X11/x11spice/default.nix b/pkgs/tools/X11/x11spice/default.nix index 33bc9110848e..7f3bfbf75a43 100644 --- a/pkgs/tools/X11/x11spice/default.nix +++ b/pkgs/tools/X11/x11spice/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, autoreconfHook, pkgconfig +{ lib, stdenv, fetchFromGitLab, autoreconfHook, pkgconfig , xorg, gtk2, spice, spice-protocol }: @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = "-lpthread"; - meta = with stdenv.lib; { + meta = with lib; { description = "Enable a running X11 desktop to be available via a Spice server"; homepage = "https://gitlab.freedesktop.org/spice/x11spice"; platforms = platforms.linux; diff --git a/pkgs/tools/X11/x11vnc/default.nix b/pkgs/tools/X11/x11vnc/default.nix index 5ed827b5a546..7264311d2dd5 100644 --- a/pkgs/tools/X11/x11vnc/default.nix +++ b/pkgs/tools/X11/x11vnc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, +{ lib, stdenv, fetchFromGitHub, fetchpatch, openssl, zlib, libjpeg, xorg, coreutils, libvncserver, autoreconfHook, pkgconfig }: @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { configureFlags="--mandir=$out/share/man" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A VNC server connected to a real X11 screen"; homepage = "https://github.com/LibVNC/x11vnc/"; platforms = platforms.linux; diff --git a/pkgs/tools/X11/x2vnc/default.nix b/pkgs/tools/X11/x2vnc/default.nix index 65d45e23396e..10519128a9d8 100644 --- a/pkgs/tools/X11/x2vnc/default.nix +++ b/pkgs/tools/X11/x2vnc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, xorg }: +{ lib, stdenv, fetchurl, xorg }: stdenv.mkDerivation { name = "x2vnc-1.7.2"; @@ -14,7 +14,7 @@ stdenv.mkDerivation { hardeningDisable = [ "format" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://fredrik.hubbe.net/x2vnc.html"; description = "A program to control a remote VNC server"; platforms = platforms.unix; diff --git a/pkgs/tools/X11/x2x/default.nix b/pkgs/tools/X11/x2x/default.nix index deada6ae2d1c..01169e68f6e8 100644 --- a/pkgs/tools/X11/x2x/default.nix +++ b/pkgs/tools/X11/x2x/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, imake, libX11, libXtst, libXext, gccmakedep }: +{ lib, stdenv, fetchurl, imake, libX11, libXtst, libXext, gccmakedep }: stdenv.mkDerivation { name = "x2x-1.27"; @@ -20,7 +20,7 @@ stdenv.mkDerivation { install -D x2x.1 $out/man/man1/x2x.1 ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Allows the keyboard, mouse on one X display to be used to control another X display"; homepage = "https://github.com/dottedmag/x2x"; license = licenses.bsd3; diff --git a/pkgs/tools/X11/xcalib/default.nix b/pkgs/tools/X11/xcalib/default.nix index 4e400ee8a247..78804d027917 100644 --- a/pkgs/tools/X11/xcalib/default.nix +++ b/pkgs/tools/X11/xcalib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libX11, libXxf86vm, libXext, libXrandr }: +{ lib, stdenv, fetchFromGitHub, libX11, libXxf86vm, libXext, libXrandr }: stdenv.mkDerivation rec { name = "xcalib-0.10"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { cp xcalib $out/bin/ ''; - meta = with stdenv.lib; { + meta = with lib; { inherit (src.meta) homepage; description = "A tiny monitor calibration loader for X and MS-Windows"; license = licenses.gpl2; diff --git a/pkgs/tools/X11/xcape/default.nix b/pkgs/tools/X11/xcape/default.nix index eefaad82b1a7..ab9e0c345429 100644 --- a/pkgs/tools/X11/xcape/default.nix +++ b/pkgs/tools/X11/xcape/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, libX11, libXtst, xorgproto, +{ lib, stdenv, fetchFromGitHub, pkgconfig, libX11, libXtst, xorgproto, libXi }: stdenv.mkDerivation rec { @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { postInstall = "install -Dm444 --target-directory $out/share/doc README.md"; - meta = with stdenv.lib; { + meta = with lib; { description = "Utility to configure modifier keys to act as other keys"; longDescription = '' xcape allows you to use a modifier key as another key when diff --git a/pkgs/tools/X11/xcwd/default.nix b/pkgs/tools/X11/xcwd/default.nix index c0e8cf5d35b3..fa4ec15b8160 100644 --- a/pkgs/tools/X11/xcwd/default.nix +++ b/pkgs/tools/X11/xcwd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libX11 }: +{ lib, stdenv, fetchFromGitHub, libX11 }: stdenv.mkDerivation { version = "2019-05-09"; @@ -19,7 +19,7 @@ stdenv.mkDerivation { install -D xcwd "$out/bin/xcwd" ''; - meta = with stdenv.lib; { + meta = with lib; { description = '' A simple tool which print the current working directory of the currently focused window ''; diff --git a/pkgs/tools/X11/xdg-user-dirs/default.nix b/pkgs/tools/X11/xdg-user-dirs/default.nix index 9ad3db80805f..6d0c46e52e92 100644 --- a/pkgs/tools/X11/xdg-user-dirs/default.nix +++ b/pkgs/tools/X11/xdg-user-dirs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libxslt, docbook_xsl, makeWrapper }: +{ lib, stdenv, fetchurl, libxslt, docbook_xsl, makeWrapper }: stdenv.mkDerivation rec { name = "xdg-user-dirs-0.17"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { --suffix XDG_CONFIG_DIRS : "$out/etc/xdg" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://freedesktop.org/wiki/Software/xdg-user-dirs"; description = "A tool to help manage well known user directories like the desktop folder and the music folder"; license = licenses.gpl2; diff --git a/pkgs/tools/X11/xdg-utils/default.nix b/pkgs/tools/X11/xdg-utils/default.nix index 85d87d9e36d6..5f0e0ef19d6c 100644 --- a/pkgs/tools/X11/xdg-utils/default.nix +++ b/pkgs/tools/X11/xdg-utils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub +{ lib, stdenv, fetchurl, fetchFromGitHub , file, libxslt, docbook_xml_dtd_412, docbook_xsl, xmlto , w3m, gnugrep, gnused, coreutils, xset, perlPackages , mimiSupport ? false, gawk ? null }: @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { sed 's|\bwhich\b|type -P|g' -i "$out"/bin/* ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.freedesktop.org/wiki/Software/xdg-utils/"; description = "A set of command line tools that assist applications with a variety of desktop integration tasks"; license = if mimiSupport then licenses.gpl2 else licenses.free; diff --git a/pkgs/tools/X11/xgeometry-select/default.nix b/pkgs/tools/X11/xgeometry-select/default.nix index ed3b460dcb61..b954205990b9 100644 --- a/pkgs/tools/X11/xgeometry-select/default.nix +++ b/pkgs/tools/X11/xgeometry-select/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libX11 }: +{ lib, stdenv, fetchurl, libX11 }: stdenv.mkDerivation rec { name = "${baseName}-${version}"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { mv -v ${baseName} $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Select a region with mouse and prints geometry information (x/y/w/h)"; homepage = "https://bbs.archlinux.org/viewtopic.php?pid=660837"; maintainers = with maintainers; [ obadz ]; diff --git a/pkgs/tools/X11/xkb-switch-i3/default.nix b/pkgs/tools/X11/xkb-switch-i3/default.nix index 9485cb62b2bf..fcb71b5d6d1f 100644 --- a/pkgs/tools/X11/xkb-switch-i3/default.nix +++ b/pkgs/tools/X11/xkb-switch-i3/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , cmake , fetchFromGitHub , i3 @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ i3 jsoncpp libsigcxx libX11 libxkbfile ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Switch your X keyboard layouts from the command line(i3 edition)"; homepage = "https://github.com/Zebradil/xkb-switch-i3"; license = licenses.gpl3Plus; diff --git a/pkgs/tools/X11/xkb-switch/default.nix b/pkgs/tools/X11/xkb-switch/default.nix index 3b69ec880549..65426a049fea 100644 --- a/pkgs/tools/X11/xkb-switch/default.nix +++ b/pkgs/tools/X11/xkb-switch/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, libX11, libxkbfile }: +{ lib, stdenv, fetchFromGitHub, cmake, libX11, libxkbfile }: stdenv.mkDerivation rec { pname = "xkb-switch"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ libX11 libxkbfile ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Switch your X keyboard layouts from the command line"; homepage = "https://github.com/ierton/xkb-switch"; license = licenses.gpl2Plus; diff --git a/pkgs/tools/X11/xkbset/default.nix b/pkgs/tools/X11/xkbset/default.nix index e6f6622f85ac..132b7a111220 100644 --- a/pkgs/tools/X11/xkbset/default.nix +++ b/pkgs/tools/X11/xkbset/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, libX11 }: +{ lib, stdenv, fetchurl, perl, libX11 }: stdenv.mkDerivation rec { name = "xkbset-0.5"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { rm -f $out/bin/xkbset-gui ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://faculty.missouri.edu/~stephen/software/#xkbset"; description = "Program to help manage many of XKB features of X window"; maintainers = with maintainers; [ drets ]; diff --git a/pkgs/tools/X11/xlayoutdisplay/default.nix b/pkgs/tools/X11/xlayoutdisplay/default.nix index 9ca3f24b618a..16565296e1e6 100644 --- a/pkgs/tools/X11/xlayoutdisplay/default.nix +++ b/pkgs/tools/X11/xlayoutdisplay/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, xorg, boost, cmake, gtest }: +{ lib, stdenv, fetchFromGitHub, xorg, boost, cmake, gtest }: stdenv.mkDerivation rec { pname = "xlayoutdisplay"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { substituteInPlace CMakeLists.txt --replace "set(Boost_USE_STATIC_LIBS ON)" "" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Detects and arranges linux display outputs, using XRandR for detection and xrandr for arrangement"; homepage = "https://github.com/alex-courtis/xlayoutdisplay"; maintainers = with maintainers; [ dtzWill ]; diff --git a/pkgs/tools/X11/xmagnify/default.nix b/pkgs/tools/X11/xmagnify/default.nix index 710c9b83dbd0..797d624323bf 100644 --- a/pkgs/tools/X11/xmagnify/default.nix +++ b/pkgs/tools/X11/xmagnify/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, libX11, xorgproto }: +{ lib, stdenv, fetchFromGitLab, libX11, xorgproto }: stdenv.mkDerivation { name = "xmagnify-0.1.0"; @@ -14,7 +14,7 @@ stdenv.mkDerivation { buildInputs = [ libX11 xorgproto ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Tiny screen magnifier for X11"; homepage = "https://gitlab.com/amiloradovsky/magnify"; license = licenses.mit; # or GPL2+, optionally diff --git a/pkgs/tools/X11/xmousepasteblock/default.nix b/pkgs/tools/X11/xmousepasteblock/default.nix index 094b26d1f55c..7402f19c2c8a 100644 --- a/pkgs/tools/X11/xmousepasteblock/default.nix +++ b/pkgs/tools/X11/xmousepasteblock/default.nix @@ -1,4 +1,4 @@ -{ xorg, stdenv, libev, fetchFromGitHub, pkgconfig }: +{ xorg, lib, stdenv, libev, fetchFromGitHub, pkgconfig }: stdenv.mkDerivation rec { pname = "xmousepasteblock"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { makeFlags = "PREFIX=$(out)"; buildInputs = with xorg; [ libX11 libXext libXi libev ]; nativeBuildInputs = [ pkgconfig ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Middle mouse button primary X selection/clipboard paste disabler"; homepage = "https://github.com/milaq/XMousePasteBlock"; license = stdenv.lib.licenses.gpl2; diff --git a/pkgs/tools/X11/xob/default.nix b/pkgs/tools/X11/xob/default.nix index cf74fa3d867b..2c1ae4bdf61c 100644 --- a/pkgs/tools/X11/xob/default.nix +++ b/pkgs/tools/X11/xob/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkg-config, xorg, libconfig }: +{ lib, stdenv, fetchFromGitHub, pkg-config, xorg, libconfig }: stdenv.mkDerivation rec { pname = "xob"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { makeFlags = [ "prefix=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A lightweight overlay bar for the X Window System"; longDescription = '' A lightweight configurable overlay volume/backlight/progress/anything bar diff --git a/pkgs/tools/X11/xosview2/default.nix b/pkgs/tools/X11/xosview2/default.nix index 5dfe74fd3734..fbee1e0ef647 100644 --- a/pkgs/tools/X11/xosview2/default.nix +++ b/pkgs/tools/X11/xosview2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libX11 }: +{ lib, stdenv, fetchurl, libX11 }: stdenv.mkDerivation rec { pname = "xosview2"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ libX11 ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Lightweight program that gathers information from your operating system and displays it in graphical form"; longDescription = '' xosview is a lightweight program that gathers information from your diff --git a/pkgs/tools/X11/xpra/libfakeXinerama.nix b/pkgs/tools/X11/xpra/libfakeXinerama.nix index e43043d78f2e..bad43c39eef4 100644 --- a/pkgs/tools/X11/xpra/libfakeXinerama.nix +++ b/pkgs/tools/X11/xpra/libfakeXinerama.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libX11, libXinerama }: +{ lib, stdenv, fetchurl, libX11, libXinerama }: stdenv.mkDerivation rec { pname = "libfakeXinerama"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ln -s libXinerama.so.1 $out/lib/libXinerama.so ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://xpra.org/"; description = "fakeXinerama for Xpra"; platforms = platforms.linux; diff --git a/pkgs/tools/X11/xrectsel/default.nix b/pkgs/tools/X11/xrectsel/default.nix index e2f9fdf4a435..0189e52ede9f 100644 --- a/pkgs/tools/X11/xrectsel/default.nix +++ b/pkgs/tools/X11/xrectsel/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, libX11 }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, libX11 }: stdenv.mkDerivation rec { pname = "xrectsel"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { make install ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Print the geometry of a rectangular screen region"; homepage = "https://github.com/lolilolicon/xrectsel"; license = licenses.gpl3; diff --git a/pkgs/tools/X11/xsettingsd/default.nix b/pkgs/tools/X11/xsettingsd/default.nix index 10abd957e397..55262125fadb 100644 --- a/pkgs/tools/X11/xsettingsd/default.nix +++ b/pkgs/tools/X11/xsettingsd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, scons, pkgconfig, libX11 }: +{ lib, stdenv, fetchFromGitHub, scons, pkgconfig, libX11 }: stdenv.mkDerivation rec { pname = "xsettingsd"; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { install -D -t "$out"/usr/share/man/man1 xsettingsd.1 dump_xsettings.1 ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Provides settings to X11 applications via the XSETTINGS specification"; homepage = "https://github.com/derat/xsettingsd"; license = licenses.bsd3; diff --git a/pkgs/tools/X11/xtrace/default.nix b/pkgs/tools/X11/xtrace/default.nix index aae31d649f44..dfd834e67b80 100644 --- a/pkgs/tools/X11/xtrace/default.nix +++ b/pkgs/tools/X11/xtrace/default.nix @@ -1,4 +1,4 @@ -{ stdenv, autoreconfHook, fetchFromGitLab, libX11, xauth, makeWrapper }: +{ lib, stdenv, autoreconfHook, fetchFromGitLab, libX11, xauth, makeWrapper }: stdenv.mkDerivation rec { pname = "xtrace"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { --prefix PATH ':' "${xauth}/bin" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://salsa.debian.org/debian/xtrace"; description = "Tool to trace X11 protocol connections"; license = licenses.gpl2; diff --git a/pkgs/tools/X11/xtruss/default.nix b/pkgs/tools/X11/xtruss/default.nix index 7d490571f482..1af1ec925e53 100644 --- a/pkgs/tools/X11/xtruss/default.nix +++ b/pkgs/tools/X11/xtruss/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "xtruss"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1mm8k92zc318jk71wlf2r4rb723nd9lalhjl0pf48raiajb5ifgd"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "easy-to-use X protocol tracing program"; homepage = "https://www.chiark.greenend.org.uk/~sgtatham/xtruss"; license = licenses.mit; diff --git a/pkgs/tools/X11/xvkbd/default.nix b/pkgs/tools/X11/xvkbd/default.nix index 6c61133077e4..05936d1d1f3d 100644 --- a/pkgs/tools/X11/xvkbd/default.nix +++ b/pkgs/tools/X11/xvkbd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, imake, libXt, libXaw, libXtst +{ lib, stdenv, fetchurl, imake, libXt, libXaw, libXtst , libXi, libXpm, xorgproto, gccmakedep, Xaw3d }: stdenv.mkDerivation { @@ -18,7 +18,7 @@ stdenv.mkDerivation { "MANPATH=$(out)/man" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Virtual keyboard for X window system"; longDescription = '' xvkbd is a virtual (graphical) keyboard program for X Window System which provides diff --git a/pkgs/tools/X11/xwallpaper/default.nix b/pkgs/tools/X11/xwallpaper/default.nix index aab4d1180e0e..55c5f8636157 100644 --- a/pkgs/tools/X11/xwallpaper/default.nix +++ b/pkgs/tools/X11/xwallpaper/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , pkg-config , autoreconfHook @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ pixman xcbutilimage xcbutil libseccomp libjpeg libpng libXpm ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/stoeckmann/xwallpaper"; description = "Utility for setting wallpapers in X"; license = licenses.isc; diff --git a/pkgs/tools/X11/xwinwrap/default.nix b/pkgs/tools/X11/xwinwrap/default.nix index 89b2fdd3dcf1..00ee7413189a 100644 --- a/pkgs/tools/X11/xwinwrap/default.nix +++ b/pkgs/tools/X11/xwinwrap/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchbzr, xlibsWrapper }: +{ lib, stdenv, fetchbzr, xlibsWrapper }: let version = "4"; @@ -28,7 +28,7 @@ stdenv.mkDerivation { mv */xwinwrap $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A utility that allows you to use an animated X window as the wallpaper"; longDescription = '' XWinWrap is a small utility written a loooong time ago that allowed you to diff --git a/pkgs/tools/admin/acme.sh/default.nix b/pkgs/tools/admin/acme.sh/default.nix index 8fb14ed2ead7..9b4b09c24848 100644 --- a/pkgs/tools/admin/acme.sh/default.nix +++ b/pkgs/tools/admin/acme.sh/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { }" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A pure Unix shell script implementing ACME client protocol"; homepage = "https://acme.sh/"; license = licenses.gpl3; diff --git a/pkgs/tools/admin/adtool/default.nix b/pkgs/tools/admin/adtool/default.nix index f239b18aec9f..d7f6ffadaca9 100644 --- a/pkgs/tools/admin/adtool/default.nix +++ b/pkgs/tools/admin/adtool/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openldap }: +{ lib, stdenv, fetchurl, openldap }: stdenv.mkDerivation rec { pname = "adtool"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { # It requires an LDAP server for tests doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Active Directory administration utility for Unix"; homepage = "https://gp2x.org/adtool"; license = licenses.gpl2; diff --git a/pkgs/tools/admin/amazon-ec2-utils/default.nix b/pkgs/tools/admin/amazon-ec2-utils/default.nix new file mode 100644 index 000000000000..2dc91f037a98 --- /dev/null +++ b/pkgs/tools/admin/amazon-ec2-utils/default.nix @@ -0,0 +1,53 @@ +{ stdenv +, lib +, fetchFromGitHub +, curl +, python3 +}: +stdenv.mkDerivation rec { + pname = "amazon-ec2-utils"; + version = "1.3"; + + src = fetchFromGitHub { + owner = "aws"; + repo = "amazon-ec2-utils"; + rev = version; + hash = "sha256:04dpxaaca144a74r6d93q4lp0d5l32v07rldj7v2v1c6s9nsf4mv"; + }; + + buildInputs = [ + python3 + ]; + + propagatedBuildInputs = [ + curl + ]; + + installPhase = '' + mkdir -p $out/bin/ + + cp ebsnvme-id $out/bin/ + cp ec2-metadata $out/bin/ + cp ec2udev-vbd $out/bin/ + cp ec2udev-vcpu $out/bin/ + + chmod +x $out/bin/* + ''; + + doInstallCheck = true; + + # We cannot run + # ec2-metadata --help + # because it actually checks EC2 metadata even if --help is given + # so it won't work in the test sandbox. + installCheckPhase = '' + $out/bin/ebsnvme-id --help + ''; + + meta = with lib; { + homepage = "https://github.com/aws/amazon-ec2-utils"; + description = "Contains a set of utilities and settings for Linux deployments in EC2"; + license = licenses.mit; + maintainers = with maintainers; [ ketzacoatl ]; + }; +} diff --git a/pkgs/tools/admin/aws-nuke/default.nix b/pkgs/tools/admin/aws-nuke/default.nix new file mode 100644 index 000000000000..32c006d7a5ff --- /dev/null +++ b/pkgs/tools/admin/aws-nuke/default.nix @@ -0,0 +1,36 @@ +{ lib, stdenv +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "aws-nuke"; + version = "2.14.0"; + + src = fetchFromGitHub { + owner = "rebuy-de"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-ULHT2ysAVZHSojIdsbPTuwskwOQVrK8f14r9eq+Effs="; + }; + + vendorSha256 = "sha256-GUCsl5VyptNvStJZgCsJDlllZasX1OhbVkahcQFuiC8="; + + preBuild = '' + if [ "x$outputHashAlgo" != "x" ]; then + # Only `go generate` when fetching the go mod vendor code + go generate ./... + fi + ''; + + doCheck = false; + + subPackages = [ "." ]; + + meta = with lib; { + description = "Nuke a whole AWS account and delete all its resources"; + homepage = "https://github.com/rebuy-de/aws-nuke"; + license = licenses.mit; + maintainers = with maintainers; [ grahamc ]; + }; +} diff --git a/pkgs/tools/admin/aws-rotate-key/default.nix b/pkgs/tools/admin/aws-rotate-key/default.nix index 9c2f747e1558..4b26e3a74344 100644 --- a/pkgs/tools/admin/aws-rotate-key/default.nix +++ b/pkgs/tools/admin/aws-rotate-key/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "aws-rotate-key"; @@ -15,7 +15,7 @@ buildGoPackage rec { goDeps = ./deps.nix; - meta = with stdenv.lib; { + meta = with lib; { description = "Easily rotate your AWS key"; homepage = "https://github.com/Fullscreen/aws-rotate-key"; license = licenses.mit; diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix index 9c7f9936e592..772c4a2f3b9f 100644 --- a/pkgs/tools/admin/awscli/default.nix +++ b/pkgs/tools/admin/awscli/default.nix @@ -28,11 +28,11 @@ let in with py.pkgs; buildPythonApplication rec { pname = "awscli"; - version = "1.18.204"; # N.B: if you change this, change botocore to a matching version too + version = "1.18.211"; # N.B: if you change this, change botocore to a matching version too src = fetchPypi { inherit pname version; - sha256 = "sha256-YAyqRJbETCagcME63dt5b9WDRj6tq8Gdwk6qyAd86lE="; + sha256 = "sha256-dkPdr0Q05CjeNg1FKbye4Ndtfakido0wKR22Afls3Mk="; }; postPatch = '' diff --git a/pkgs/tools/admin/awscli2/default.nix b/pkgs/tools/admin/awscli2/default.nix index a477beac5a0f..d832b00a6eef 100644 --- a/pkgs/tools/admin/awscli2/default.nix +++ b/pkgs/tools/admin/awscli2/default.nix @@ -8,12 +8,12 @@ let py = python3.override { packageOverrides = self: super: { botocore = super.botocore.overridePythonAttrs (oldAttrs: rec { - version = "2.0.0dev75"; + version = "2.0.0dev85"; src = fetchFromGitHub { owner = "boto"; repo = "botocore"; - rev = "1a4caa8d1c232e9463febec406a8fedc71cb065c"; - sha256 = "0z2c9i2ci3f8979si8gcgnsz44ylchjax1f3dhj7pzyb2kcw6zri"; + rev = "962bb5d356096c57e25a5579d09e4b4d928c886d"; + sha256 = "09bk8d0r3245kbi96641gvfl3q4jjhw55gjldc2cpml6mv36hhnb"; }; }); prompt_toolkit = super.prompt_toolkit.overridePythonAttrs (oldAttrs: rec { @@ -29,13 +29,13 @@ let in with py.pkgs; buildPythonApplication rec { pname = "awscli2"; - version = "2.1.7"; # N.B: if you change this, change botocore to a matching version too + version = "2.1.17"; # N.B: if you change this, change botocore to a matching version too src = fetchFromGitHub { owner = "aws"; repo = "aws-cli"; rev = version; - sha256 = "0sxdbc8y5yqcvsk2bxkywdh4fsq90vlsmcm45y0sa3rpza64xs3r"; + sha256 = "1pla97sylzhvj7r5cschv4bg23hpl0ax1m5cx4291fppjnrn2yp9"; }; postPatch = '' diff --git a/pkgs/tools/admin/awslogs/default.nix b/pkgs/tools/admin/awslogs/default.nix index 4a33d7420765..f71422f77a25 100644 --- a/pkgs/tools/admin/awslogs/default.nix +++ b/pkgs/tools/admin/awslogs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python3Packages }: +{ lib, stdenv, fetchFromGitHub, python3Packages }: python3Packages.buildPythonApplication rec { pname = "awslogs"; @@ -17,7 +17,7 @@ python3Packages.buildPythonApplication rec { boto3 termcolor dateutil docutils setuptools ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/jorgebastida/awslogs"; description = "AWS CloudWatch logs for Humans"; maintainers = with maintainers; [ dbrock ]; diff --git a/pkgs/tools/admin/azure-cli/default.nix b/pkgs/tools/admin/azure-cli/default.nix index 59b22f48f99e..a4c34662ef36 100644 --- a/pkgs/tools/admin/azure-cli/default.nix +++ b/pkgs/tools/admin/azure-cli/default.nix @@ -1,12 +1,14 @@ { stdenv, lib, python3, fetchFromGitHub, installShellFiles }: let - version = "2.16.0"; + version = "2.17.1"; + srcName = "azure-cli-${version}-src"; src = fetchFromGitHub { + name = srcName; owner = "Azure"; repo = "azure-cli"; rev = "azure-cli-${version}"; - sha256 = "wuHPNpt5pizgAwxRxJpRBiX6keJpKRpHu6M5BpFUyeY="; + sha256 = "sha256-RTYCsdoZx1YQa9a8ZyvwQ9yTLEB6r7/mMgfecc/vGvM="; }; # put packages that needs to be overriden in the py package scope @@ -19,7 +21,7 @@ py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage { pname = "azure-cli"; inherit version src; - sourceRoot = "source/src/azure-cli"; + sourceRoot = "${srcName}/src/azure-cli"; prePatch = '' substituteInPlace setup.py \ @@ -67,6 +69,7 @@ py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage { azure-mgmt-containerregistry azure-mgmt-containerservice azure-mgmt-cosmosdb + azure-mgmt-databoxedge azure-mgmt-datalake-analytics azure-mgmt-datalake-store azure-mgmt-datamigration diff --git a/pkgs/tools/admin/azure-cli/python-packages.nix b/pkgs/tools/admin/azure-cli/python-packages.nix index f5f661c8e9b9..743c9e197d76 100644 --- a/pkgs/tools/admin/azure-cli/python-packages.nix +++ b/pkgs/tools/admin/azure-cli/python-packages.nix @@ -52,7 +52,7 @@ let pname = "azure-cli-core"; inherit version src; - sourceRoot = "source/src/azure-cli-core"; + sourceRoot = "${src.name}/src/azure-cli-core"; propagatedBuildInputs = with self; [ adal @@ -111,7 +111,7 @@ let version = "1.0.4"; # might be wrong, but doesn't really matter inherit src; - sourceRoot = "source/src/azure-cli-telemetry"; + sourceRoot = "${src.name}/src/azure-cli-telemetry"; propagatedBuildInputs = with super; [ applicationinsights @@ -125,8 +125,8 @@ let ''; }; - azure-batch = overrideAzureMgmtPackage super.azure-batch "9.0.0" "zip" - "112d73gxjqng348mcvi36ska6pxyg8qc3qswvhf5x4a0lr86zjj7"; + azure-batch = overrideAzureMgmtPackage super.azure-batch "10.0.0" "zip" + "83d7a2b0be42ca456ac2b56fa3dc6ce704c130e888d37d924072c1d3718f32d0"; azure-mgmt-apimanagement = overrideAzureMgmtPackage super.azure-mgmt-apimanagement "0.2.0" "zip" "0whx3s8ri9939r3pdvjf8iqcslas1xy6cnccidmp10r5ng0023vr"; @@ -158,8 +158,8 @@ let azure-mgmt-cognitiveservices = overrideAzureMgmtPackage super.azure-mgmt-cognitiveservices "6.3.0" "zip" "059lhbxqx1r1717s8xz5ahpxwphq5fgy0h7k6b63cahm818rs0hx"; - azure-mgmt-compute = overrideAzureMgmtPackage super.azure-mgmt-compute "14.0.0" "zip" - "0bvqv56plcgmnfyj0apphlbsn2vfm1a22idvy8y5npbfjz4zwja9"; + azure-mgmt-compute = overrideAzureMgmtPackage super.azure-mgmt-compute "18.0.0" "zip" + "34815c91193640ad8ff0c4dad7f2d997548c853d2e8b10250329ed516e55879e"; azure-mgmt-consumption = overrideAzureMgmtPackage super.azure-mgmt-consumption "2.0.0" "zip" "12ai4qps73ivawh0yzvgb148ksx02r30pqlvfihx497j62gsi1cs"; @@ -206,8 +206,11 @@ let azure-mgmt-loganalytics = overrideAzureMgmtPackage super.azure-mgmt-loganalytics "0.7.0" "zip" "18n2lqvrhq40gdqhlzzg8mc03571i02c7qq7jv771lc58rqpzysh"; - azure-mgmt-network = overrideAzureMgmtPackage super.azure-mgmt-network "13.0.0" "zip" - "02ac54fs4wqdwy986j9qyx6fbl5zmpkh1sykr9r6mqk1xx9l4jq8"; + azure-mgmt-network = overrideAzureMgmtPackage super.azure-mgmt-network "17.0.0" "zip" + "3694f2675e152afccb1588a6cc7bb4b4795d442a4e5d7082cdf1f4e32a779199"; + + azure-mgmt-marketplaceordering = overrideAzureMgmtPackage super.azure-mgmt-marketplaceordering "0.1.0" "zip" + "sha256-baEkJcurDMYvJG5yZrTWev9r3QMey+UMdULC8rJECtQ="; azure-mgmt-media = overrideAzureMgmtPackage super.azure-mgmt-media "2.1.0" "zip" "1py0hch0wghzfxazdrrs7p0kln2zn9jh3fmkzwd2z8qggj38q6gm"; @@ -230,8 +233,8 @@ let azure-mgmt-search = overrideAzureMgmtPackage super.azure-mgmt-search "2.0.0" "zip" "14v8ja8har2xrb00v98610pqvakcdvnzw8hkd6wbr1np3f3dxi8f"; - azure-mgmt-security = overrideAzureMgmtPackage super.azure-mgmt-security "0.4.1" "zip" - "08gf401d40bd1kn9wmpxcjxqdh84cd9hxm8rdjd0918483sqs71r"; + azure-mgmt-security = overrideAzureMgmtPackage super.azure-mgmt-security "0.6.0" "zip" + "9f37d0151d730801222af111f0830905634795dbfd59ad1b89c35197421e74d3"; azure-mgmt-signalr = overrideAzureMgmtPackage super.azure-mgmt-signalr "0.4.0" "zip" "09n12ligh301z4xwixl50n8f1rgd2k6lpsxqzr6n6jvgkpdds0v5"; @@ -260,8 +263,8 @@ let azure-mgmt-cdn = overrideAzureMgmtPackage super.azure-mgmt-cdn "5.2.0" "zip" "10b8y1b5qlyr666x7yimnwis9386ciphrxdnmmyzk90qg6h0niry"; - azure-mgmt-containerregistry = overrideAzureMgmtPackage super.azure-mgmt-containerregistry "3.0.0rc15" "zip" - "1fnmdl3m7kdn6c2ws5vrm7nwadcbq9mgc6g5bg4s1a4xjb23q6vb"; + azure-mgmt-containerregistry = overrideAzureMgmtPackage super.azure-mgmt-containerregistry "3.0.0rc16" "zip" + "eT5gH0K4q2Qr1lEpuqjxQhOUrA6bEsAktj+PKsfMXTo="; azure-mgmt-monitor = overrideAzureMgmtPackage super.azure-mgmt-monitor "0.11.0" "zip" "05jhn66d4sl1qi6w34rqd8wl500jndismiwhdmzzmprdvn1zxqf6"; @@ -393,6 +396,23 @@ let ''; }); + azure-mgmt-datalake-store = super.azure-mgmt-datalake-store.overrideAttrs(oldAttrs: rec { + version = "0.5.0"; + + src = super.fetchPypi { + inherit (oldAttrs) pname; + inherit version; + sha256 = "sha256-k3bTVJVmHRn4rMVgT2ewvFlJOxg1u8SA+aGVL5ABekw="; + extension = "zip"; + }; + + preBuild = '' + rm azure_bdist_wheel.py + substituteInPlace setup.cfg \ + --replace "azure-namespace-package = azure-mgmt-datalake-nspkg" "" + ''; + }); + knack = super.knack.overridePythonAttrs(oldAttrs: rec { version = "0.7.2"; diff --git a/pkgs/tools/admin/bash-my-aws/default.nix b/pkgs/tools/admin/bash-my-aws/default.nix index b99f031f4165..5214cfeee2a6 100644 --- a/pkgs/tools/admin/bash-my-aws/default.nix +++ b/pkgs/tools/admin/bash-my-aws/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , awscli , jq , fetchgit @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { popd ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://bash-my-aws.org"; description = "CLI commands for AWS"; license = licenses.mit; diff --git a/pkgs/tools/admin/berglas/default.nix b/pkgs/tools/admin/berglas/default.nix index 050ad9db75db..ca588db01a59 100644 --- a/pkgs/tools/admin/berglas/default.nix +++ b/pkgs/tools/admin/berglas/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "berglas"; @@ -15,7 +15,7 @@ buildGoModule rec { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "A tool for managing secrets on Google Cloud"; homepage = "https://github.com/GoogleCloudPlatform/berglas"; license = licenses.asl20; diff --git a/pkgs/tools/admin/bubblewrap/default.nix b/pkgs/tools/admin/bubblewrap/default.nix index b98cadd57d11..6441b0782d50 100644 --- a/pkgs/tools/admin/bubblewrap/default.nix +++ b/pkgs/tools/admin/bubblewrap/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libxslt, docbook_xsl, libcap }: +{ lib, stdenv, fetchurl, libxslt, docbook_xsl, libcap }: stdenv.mkDerivation rec { pname = "bubblewrap"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ libxslt docbook_xsl ]; buildInputs = [ libcap ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Unprivileged sandboxing tool"; homepage = "https://github.com/containers/bubblewrap"; license = licenses.lgpl2Plus; diff --git a/pkgs/tools/admin/certigo/default.nix b/pkgs/tools/admin/certigo/default.nix index e363df04556e..ff66e926d4b5 100644 --- a/pkgs/tools/admin/certigo/default.nix +++ b/pkgs/tools/admin/certigo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "certigo"; @@ -15,7 +15,7 @@ buildGoModule rec { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "A utility to examine and validate certificates in a variety of formats"; homepage = "https://github.com/square/certigo"; license = licenses.asl20; diff --git a/pkgs/tools/admin/chkcrontab/default.nix b/pkgs/tools/admin/chkcrontab/default.nix index 0740b0c1be60..6404eb92a26e 100644 --- a/pkgs/tools/admin/chkcrontab/default.nix +++ b/pkgs/tools/admin/chkcrontab/default.nix @@ -1,4 +1,4 @@ -{ python, stdenv }: +{ python, lib, stdenv }: with python.pkgs; @@ -11,10 +11,10 @@ buildPythonApplication rec { sha256 = "0gmxavjkjkvjysgf9cf5fcpk589gb75n1mn20iki82wifi1pk1jn"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A tool to detect crontab errors"; license = licenses.asl20; - maintainers = with maintainers; [ ma27 ]; + maintainers = with maintainers; [ SuperSandro2000 ]; homepage = "https://github.com/lyda/chkcrontab"; }; } diff --git a/pkgs/tools/admin/credhub-cli/default.nix b/pkgs/tools/admin/credhub-cli/default.nix index f3cc5141618b..2a1ceb531a50 100644 --- a/pkgs/tools/admin/credhub-cli/default.nix +++ b/pkgs/tools/admin/credhub-cli/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "credhub-cli"; @@ -35,7 +35,7 @@ buildGoModule rec { export HOME=$TMPDIR ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Provides a command line interface to interact with CredHub servers"; homepage = "https://github.com/cloudfoundry-incubator/credhub-cli"; maintainers = with maintainers; [ ris ]; diff --git a/pkgs/tools/admin/dehydrated/default.nix b/pkgs/tools/admin/dehydrated/default.nix index e6b909a0a5bd..5ec710dde434 100644 --- a/pkgs/tools/admin/dehydrated/default.nix +++ b/pkgs/tools/admin/dehydrated/default.nix @@ -1,4 +1,4 @@ -{ stdenv, coreutils, curl, diffutils, gawk, gnugrep, gnused, openssl, makeWrapper, fetchFromGitHub, installShellFiles }: +{ lib, stdenv, coreutils, curl, diffutils, gawk, gnugrep, gnused, openssl, makeWrapper, fetchFromGitHub, installShellFiles }: stdenv.mkDerivation rec { pname = "dehydrated"; version = "0.7.0"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { wrapProgram "$out/bin/dehydrated" --prefix PATH : "${stdenv.lib.makeBinPath [ openssl coreutils gnused gnugrep diffutils curl gawk ]}" ''; - meta = with stdenv.lib; { + meta = with lib; { inherit (src.meta) homepage; description = "Letsencrypt/acme client implemented as a shell-script"; license = licenses.mit; diff --git a/pkgs/tools/admin/docker-credential-gcr/default.nix b/pkgs/tools/admin/docker-credential-gcr/default.nix index d45a57c32211..2ca0f2c4d084 100644 --- a/pkgs/tools/admin/docker-credential-gcr/default.nix +++ b/pkgs/tools/admin/docker-credential-gcr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "docker-credential-gcr"; @@ -13,7 +13,7 @@ buildGoPackage rec { sha256 = "0m7jx669yf27z2g9gw9vwncpwldrcb3ldlf1xhvbwbijnc2jk866"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A Docker credential helper for GCR (https://gcr.io) users"; longDescription = '' docker-credential-gcr is Google Container Registry's Docker credential diff --git a/pkgs/tools/admin/docker-credential-helpers/default.nix b/pkgs/tools/admin/docker-credential-helpers/default.nix index 38762b6fd29c..ef8df0d47265 100644 --- a/pkgs/tools/admin/docker-credential-helpers/default.nix +++ b/pkgs/tools/admin/docker-credential-helpers/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, pkg-config, libsecret }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub, pkg-config, libsecret }: buildGoPackage rec { pname = "docker-credential-helpers"; @@ -39,7 +39,7 @@ buildGoPackage rec { install -Dm755 -t $out/bin bin/docker-credential-secretservice ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Suite of programs to use native stores to keep Docker credentials safe"; homepage = "https://github.com/docker/docker-credential-helpers"; license = licenses.mit; diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix index 6f38b14f44be..54d78d8fab7a 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.34.0"; + version = "0.35.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - sha256 = "1n2mvnis6r5vpb60jlb3c84sllsbvy93gzsds54igsp6l3zngq19"; + sha256 = "0l4wlg6x074slndkihvwdvw4frsyzwxfqm1pkzqwc3x8awa9nlbv"; }; - vendorSha256 = "0ggxilp44mm81b8hrxyb7642vy2q1109yz619z97mgvk0drhkhc0"; + vendorSha256 = "0sfx8x1iwdqwbyiid5hc9wiwjc16aig8vplpjlqxkmcvig8qlwff"; doCheck = false; diff --git a/pkgs/tools/admin/fastlane/Gemfile.lock b/pkgs/tools/admin/fastlane/Gemfile.lock index 1bfce8606532..19305c7d1370 100644 --- a/pkgs/tools/admin/fastlane/Gemfile.lock +++ b/pkgs/tools/admin/fastlane/Gemfile.lock @@ -1,75 +1,77 @@ GEM remote: https://rubygems.org/ specs: - CFPropertyList (3.0.2) + CFPropertyList (3.0.3) addressable (2.7.0) public_suffix (>= 2.0.2, < 5.0) atomos (0.1.3) aws-eventstream (1.1.0) - aws-partitions (1.320.0) - aws-sdk-core (3.96.1) + aws-partitions (1.414.0) + aws-sdk-core (3.110.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-kms (1.31.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-kms (1.40.0) + aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.66.0) - aws-sdk-core (~> 3, >= 3.96.1) + aws-sdk-s3 (1.87.0) + aws-sdk-core (~> 3, >= 3.109.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.1) - aws-sigv4 (1.1.3) - aws-eventstream (~> 1.0, >= 1.0.2) - babosa (1.0.3) + aws-sigv4 (1.2.2) + aws-eventstream (~> 1, >= 1.0.2) + babosa (1.0.4) claide (1.0.3) colored (1.2) colored2 (3.1.2) commander-fastlane (4.4.6) highline (~> 1.7.2) - declarative (0.0.10) + declarative (0.0.20) declarative-option (0.1.0) - digest-crc (0.5.1) + digest-crc (0.6.3) + rake (>= 12.0.0, < 14.0.0) domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) - dotenv (2.7.5) - emoji_regex (1.0.1) - excon (0.73.0) - faraday (1.0.1) + dotenv (2.7.6) + emoji_regex (3.2.1) + excon (0.78.1) + faraday (1.3.0) + faraday-net_http (~> 1.0) multipart-post (>= 1.2, < 3) - faraday-cookie_jar (0.0.6) - faraday (>= 0.7.4) + ruby2_keywords + faraday-cookie_jar (0.0.7) + faraday (>= 0.8.0) http-cookie (~> 1.0.0) + faraday-net_http (1.0.0) faraday_middleware (1.0.0) faraday (~> 1.0) - fastimage (2.1.7) - fastlane (2.148.1) + fastimage (2.2.1) + fastlane (2.171.0) CFPropertyList (>= 2.3, < 4.0.0) addressable (>= 2.3, < 3.0.0) aws-sdk-s3 (~> 1.0) - babosa (>= 1.0.2, < 2.0.0) + babosa (>= 1.0.3, < 2.0.0) bundler (>= 1.12.0, < 3.0.0) colored commander-fastlane (>= 4.4.6, < 5.0.0) dotenv (>= 2.1.1, < 3.0.0) - emoji_regex (>= 0.1, < 2.0) + emoji_regex (>= 0.1, < 4.0) excon (>= 0.71.0, < 1.0.0) - faraday (>= 0.17, < 2.0) + faraday (~> 1.0) faraday-cookie_jar (~> 0.0.6) - faraday_middleware (>= 0.13.1, < 2.0) + faraday_middleware (~> 1.0) fastimage (>= 2.1.0, < 3.0.0) gh_inspector (>= 1.1.2, < 2.0.0) google-api-client (>= 0.37.0, < 0.39.0) google-cloud-storage (>= 1.15.0, < 2.0.0) highline (>= 1.7.2, < 2.0.0) json (< 3.0.0) - jwt (~> 2.1.0) + jwt (>= 2.1.0, < 3) mini_magick (>= 4.9.4, < 5.0.0) - multi_xml (~> 0.5) multipart-post (~> 2.0.0) plist (>= 3.1.0, < 4.0.0) - public_suffix (~> 2.0.0) - rubyzip (>= 1.3.0, < 2.0.0) + rubyzip (>= 2.0.0, < 3.0.0) security (= 0.1.3) simctl (~> 1.6.3) slack-notifier (>= 2.0.0, < 3.0.0) @@ -93,17 +95,17 @@ GEM google-cloud-core (1.5.0) google-cloud-env (~> 1.0) google-cloud-errors (~> 1.0) - google-cloud-env (1.3.1) + google-cloud-env (1.4.0) faraday (>= 0.17.3, < 2.0) - google-cloud-errors (1.0.0) - google-cloud-storage (1.26.1) + google-cloud-errors (1.0.1) + google-cloud-storage (1.29.2) addressable (~> 2.5) digest-crc (~> 0.4) google-api-client (~> 0.33) google-cloud-core (~> 1.2) googleauth (~> 0.9) mini_mime (~> 1.0) - googleauth (0.12.0) + googleauth (0.14.0) faraday (>= 0.17.3, < 2.0) jwt (>= 1.4, < 3.0) memoist (~> 0.16) @@ -115,26 +117,27 @@ GEM domain_name (~> 0.5) httpclient (2.8.3) jmespath (1.4.0) - json (2.3.0) - jwt (2.1.0) + json (2.5.1) + jwt (2.2.2) memoist (0.16.2) - mini_magick (4.10.1) + mini_magick (4.11.0) mini_mime (1.0.2) - multi_json (1.14.1) - multi_xml (0.6.0) + multi_json (1.15.0) multipart-post (2.0.0) - nanaimo (0.2.6) + nanaimo (0.3.0) naturally (2.2.0) - os (1.1.0) - plist (3.5.0) - public_suffix (2.0.5) + os (1.1.1) + plist (3.6.0) + public_suffix (4.0.6) + rake (13.0.3) representable (3.0.4) declarative (< 0.1.0) declarative-option (< 0.2.0) uber (< 0.2.0) retriable (3.1.2) rouge (2.0.7) - rubyzip (1.3.0) + ruby2_keywords (0.0.2) + rubyzip (2.3.0) security (0.1.3) signet (0.14.0) addressable (~> 2.3) @@ -149,7 +152,7 @@ GEM terminal-table (1.8.0) unicode-display_width (~> 1.1, >= 1.1.1) tty-cursor (0.7.1) - tty-screen (0.7.1) + tty-screen (0.8.1) tty-spinner (0.9.3) tty-cursor (~> 0.7) uber (0.1.0) @@ -158,15 +161,15 @@ GEM unf_ext (0.0.7.7) unicode-display_width (1.7.0) word_wrap (1.0.0) - xcodeproj (1.16.0) + xcodeproj (1.19.0) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) colored2 (~> 3.1) - nanaimo (~> 0.2.6) + nanaimo (~> 0.3.0) xcpretty (0.3.0) rouge (~> 2.0.7) - xcpretty-travis-formatter (1.0.0) + xcpretty-travis-formatter (1.0.1) xcpretty (~> 0.2, >= 0.0.7) PLATFORMS @@ -176,4 +179,4 @@ DEPENDENCIES fastlane BUNDLED WITH - 2.1.4 \ No newline at end of file + 2.1.4 diff --git a/pkgs/tools/admin/fastlane/default.nix b/pkgs/tools/admin/fastlane/default.nix index 1093ab9df028..245c1dfef8cb 100644 --- a/pkgs/tools/admin/fastlane/default.nix +++ b/pkgs/tools/admin/fastlane/default.nix @@ -1,4 +1,4 @@ -{ stdenv, bundlerEnv, ruby, bundlerUpdateScript, makeWrapper }: +{ lib, stdenv, bundlerEnv, ruby, bundlerUpdateScript, makeWrapper }: stdenv.mkDerivation rec { pname = "fastlane"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { passthru.updateScript = bundlerUpdateScript "fastlane"; - meta = with stdenv.lib; { + meta = with lib; { description = "A tool to automate building and releasing iOS and Android apps"; longDescription = "fastlane is a tool for iOS and Android developers to automate tedious tasks like generating screenshots, dealing with provisioning profiles, and releasing your application."; homepage = "https://github.com/fastlane/fastlane"; diff --git a/pkgs/tools/admin/fastlane/gemset.nix b/pkgs/tools/admin/fastlane/gemset.nix index e289bc6f17d2..a3c32f7c5dec 100644 --- a/pkgs/tools/admin/fastlane/gemset.nix +++ b/pkgs/tools/admin/fastlane/gemset.nix @@ -35,10 +35,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "011ch85shkb3i3w16jymjx19dmxcgb6jrl6dzwqr4bx16ikdyclc"; + sha256 = "0dy7y0zgc53cz1qiifx74glixkjd96nk8p6qrq1n5cdylnlpng8k"; type = "gem"; }; - version = "1.320.0"; + version = "1.414.0"; }; aws-sdk-core = { dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"]; @@ -46,10 +46,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jdnzynjrpp2jyg8vrbfbaad16k8ni1520xah1z2ckl5779x9fi6"; + sha256 = "1lrxwi9im4bpdcga6w7bmam7hywy5c2yss09377lyqm89whb4kl4"; type = "gem"; }; - version = "3.96.1"; + version = "3.110.0"; }; aws-sdk-kms = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -57,10 +57,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1czxr6yi8p9gma4dwgygp1jn0i289hwa2vw69kzfscgbn118c3mm"; + sha256 = "1pk76w1w9z4dh1sic08jp1j2rbbmnrfci53a6pkxq0g3y4kkx2g4"; type = "gem"; }; - version = "1.31.0"; + version = "1.40.0"; }; aws-sdk-s3 = { dependencies = ["aws-sdk-core" "aws-sdk-kms" "aws-sigv4"]; @@ -68,10 +68,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1x1d1azxwanvm0d7qppw41x5nx2zv0bcz41yk9vqi5lvr7apaq13"; + sha256 = "0capqhvm08ngq74n33ym0khixkdj342jpikssw57avdmd8g6kaq7"; type = "gem"; }; - version = "1.66.0"; + version = "1.87.0"; }; aws-sigv4 = { dependencies = ["aws-eventstream"]; @@ -79,30 +79,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0kysxyw1zkvggbmcj4xnscdh15kxli8mx07hv447h74g9x02drsd"; + sha256 = "1ll9382c1x2hp750cilh01h1cycgyhdr4cmmgx23k94hyyb8chv5"; type = "gem"; }; - version = "1.1.3"; + version = "1.2.2"; }; babosa = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10nn9bw63i4awpzn5vrx6kmpx1sg7z8r3fhw9r8bvg9pz2wh489g"; + sha256 = "16dwqn33kmxkqkv51cwiikdkbrdjfsymlnc0rgbjwilmym8a9phq"; type = "gem"; }; - version = "1.0.3"; + version = "1.0.4"; }; CFPropertyList = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1825ll26p28swjiw8n3x2pnh5ygsmg83spf82fnzcjn2p87vc5lf"; + sha256 = "0ia09r8bj3bjhcfiyr3vlk9zx7vahfypbs2lyrxix9x1jx3lfzq4"; type = "gem"; }; - version = "3.0.2"; + version = "3.0.3"; }; claide = { groups = ["default"]; @@ -150,10 +150,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0642xvwzzbgi3kp1bg467wma4g3xqrrn0sk369hjam7w579gnv5j"; + sha256 = "1yczgnqrbls7shrg63y88g7wand2yp9h6sf56c9bdcksn5nds8c0"; type = "gem"; }; - version = "0.0.10"; + version = "0.0.20"; }; declarative-option = { groups = ["default"]; @@ -166,14 +166,15 @@ version = "0.1.0"; }; digest-crc = { + dependencies = ["rake"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10f10yhz7rn31pq859jx47dypsfsxcmx8h482xn7aijfr6vn8yv9"; + sha256 = "118d5p02kdw6a5pi8af12dxma7q3b77zz5q5xjjf5kgp8qh1930a"; type = "gem"; }; - version = "0.5.1"; + version = "0.6.3"; }; domain_name = { dependencies = ["unf"]; @@ -191,41 +192,41 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17hkd62ig9b0czv192kqdfq7gw0a8hgq07yclri6myc8y5lmfin5"; + sha256 = "0iym172c5337sm1x2ykc2i3f961vj3wdclbyg1x6sxs3irgfsl94"; type = "gem"; }; - version = "2.7.5"; + version = "2.7.6"; }; emoji_regex = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1jfsv8ik2h1msqf3if1f121pnx3lccp8fqnka9na309mnw3bq532"; + sha256 = "0qbzlracxw4xwyvrgr0qcl1alk4ijk6pv53ni6f43csi649y3n3s"; type = "gem"; }; - version = "1.0.1"; + version = "3.2.1"; }; excon = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zvphy60fwycl6z2h7dpsy9lgyfrh27fj16987p7bl1n4xlqkvmw"; + sha256 = "16ij8617v3js03yj1zd32mmrf7kpi9l96bid5mpqk30c4mzai55r"; type = "gem"; }; - version = "0.73.0"; + version = "0.78.1"; }; faraday = { - dependencies = ["multipart-post"]; + dependencies = ["faraday-net_http" "multipart-post" "ruby2_keywords"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0wwks9652xwgjm7yszcq5xr960pjypc07ivwzbjzpvy9zh2fw6iq"; + sha256 = "1hmssd8pj4n7yq4kz834ylkla8ryyvhaap6q9nzymp93m1xq21kz"; type = "gem"; }; - version = "1.0.1"; + version = "1.3.0"; }; faraday-cookie_jar = { dependencies = ["faraday" "http-cookie"]; @@ -233,10 +234,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1di4gx6446a6zdkrpj679m5k515i53wvb4yxcsqvy8d8zacxiiv6"; + sha256 = "00hligx26w9wdnpgsrf0qdnqld4rdccy8ym6027h5m735mpvxjzk"; type = "gem"; }; - version = "0.0.6"; + version = "0.0.7"; + }; + faraday-net_http = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1kk5d1c5nxbmwawl5gcznwiscjz24nz3vdhxrlzvj7748c1qqr6d"; + type = "gem"; + }; + version = "1.0.0"; }; faraday_middleware = { dependencies = ["faraday"]; @@ -254,21 +265,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06lgsy1zdkhhgd9w1c0nb7v9d38mljwz13n6gi3acbzkhz1sf642"; + sha256 = "1vqp53s9vgd28f4l17q0vs7xv32y64af0ny3wb1fgg4i534rzg6j"; type = "gem"; }; - version = "2.1.7"; + version = "2.2.1"; }; fastlane = { - dependencies = ["CFPropertyList" "addressable" "aws-sdk-s3" "babosa" "colored" "commander-fastlane" "dotenv" "emoji_regex" "excon" "faraday" "faraday-cookie_jar" "faraday_middleware" "fastimage" "gh_inspector" "google-api-client" "google-cloud-storage" "highline" "json" "jwt" "mini_magick" "multi_xml" "multipart-post" "plist" "public_suffix" "rubyzip" "security" "simctl" "slack-notifier" "terminal-notifier" "terminal-table" "tty-screen" "tty-spinner" "word_wrap" "xcodeproj" "xcpretty" "xcpretty-travis-formatter"]; + dependencies = ["CFPropertyList" "addressable" "aws-sdk-s3" "babosa" "colored" "commander-fastlane" "dotenv" "emoji_regex" "excon" "faraday" "faraday-cookie_jar" "faraday_middleware" "fastimage" "gh_inspector" "google-api-client" "google-cloud-storage" "highline" "json" "jwt" "mini_magick" "multipart-post" "plist" "rubyzip" "security" "simctl" "slack-notifier" "terminal-notifier" "terminal-table" "tty-screen" "tty-spinner" "word_wrap" "xcodeproj" "xcpretty" "xcpretty-travis-formatter"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1jss8cpcngwrmpck6ncijksrfcj5csgljwn2rmqv9gx1azj4mlgv"; + sha256 = "1h921zfck75f5b50z9jxnhanf8q9d58n122ffnpd1980q5w912rp"; type = "gem"; }; - version = "2.148.1"; + version = "2.171.0"; }; gh_inspector = { groups = ["default"]; @@ -308,20 +319,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rbascsddvwsq827fj4m2daqh0l3ghmdlbbhy48clgaysapaz685"; + sha256 = "0bjgxyvagy6hjj8yg7fqq24rwdjxb6hx7fdd1bmn4mwd846lci2i"; type = "gem"; }; - version = "1.3.1"; + version = "1.4.0"; }; google-cloud-errors = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0nl08lhgjvz3g7nsarn9nnsck0k3dg8mwg4awcnklnzpvs62b4ih"; + sha256 = "1hvs1x39g77hbdqjxmzcl6gq8160pv3kskvzbbch0ww1np6qwm67"; type = "gem"; }; - version = "1.0.0"; + version = "1.0.1"; }; google-cloud-storage = { dependencies = ["addressable" "digest-crc" "google-api-client" "google-cloud-core" "googleauth" "mini_mime"]; @@ -329,10 +340,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wdnd5wisbrlivapdr7bcg8v59hayqz3q5qiqs0628g371lwx30k"; + sha256 = "0dy5f00jsnd6id7bkc03pl2d6c78rl3lkysdn0f90padys5id1k5"; type = "gem"; }; - version = "1.26.1"; + version = "1.29.2"; }; googleauth = { dependencies = ["faraday" "jwt" "memoist" "multi_json" "os" "signet"]; @@ -340,10 +351,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rsk471ld98pxhvzig3lnw9i13454c9nschvzxvq6vjqnn9ip0yh"; + sha256 = "0cm60nbmwzf83fzy06f3iyn5a6sw91siw8x9bdvpwwmjsmivana6"; type = "gem"; }; - version = "0.12.0"; + version = "0.14.0"; }; highline = { groups = ["default"]; @@ -391,20 +402,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0nrmw2r4nfxlfgprfgki3hjifgrcrs3l5zvm3ca3gb4743yr25mn"; + sha256 = "0lrirj0gw420kw71bjjlqkqhqbrplla61gbv1jzgsz6bv90qr3ci"; type = "gem"; }; - version = "2.3.0"; + version = "2.5.1"; }; jwt = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1w0kaqrbl71cq9sbnixc20x5lqah3hs2i93xmhlfdg2y3by7yzky"; + sha256 = "14ynyq1q483spj20ffl4xayfqx1a8qr761mqjfxczf8lwlap392n"; type = "gem"; }; - version = "2.1.0"; + version = "2.2.2"; }; memoist = { groups = ["default"]; @@ -421,10 +432,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lpq12z70n10c1qshcddd5nib2pkcbkwzvmiqqzj60l01k3x4fg9"; + sha256 = "1aj604x11d9pksbljh0l38f70b558rhdgji1s9i763hiagvvx2hs"; type = "gem"; }; - version = "4.10.1"; + version = "4.11.0"; }; mini_mime = { groups = ["default"]; @@ -441,20 +452,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xy54mjf7xg41l8qrg1bqri75agdqmxap9z466fjismc1rn2jwfr"; + sha256 = "0pb1g1y3dsiahavspyzkdy39j4q377009f6ix0bh1ag4nqw43l0z"; type = "gem"; }; - version = "1.14.1"; - }; - multi_xml = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0lmd4f401mvravi1i1yq7b2qjjli0yq7dfc4p1nj5nwajp7r6hyj"; - type = "gem"; - }; - version = "0.6.0"; + version = "1.15.0"; }; multipart-post = { groups = ["default"]; @@ -471,10 +472,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ajfyaqjw3dzykk612yw8sm21savfqy292hgps8h8l4lvxww1lz6"; + sha256 = "0xi36h3f7nm8bc2k0b6svpda1lyank2gf872lxjbhw3h95hdrbma"; type = "gem"; }; - version = "0.2.6"; + version = "0.3.0"; }; naturally = { groups = ["default"]; @@ -491,30 +492,40 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xnynckvrn9ailkmkrmkldnpv8hmmbdwxr7c7iz27cl1cpcdd49n"; + sha256 = "12fli64wz5j9868gpzv5wqsingk1jk457qyqksv9ksmq9b0zpc9x"; type = "gem"; }; - version = "1.1.0"; + version = "1.1.1"; }; plist = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ra0910xxbhfsmdi0ig36pr3q0khdqzwb5da3wg7y3n8d1sh9ffp"; + sha256 = "1whhr897z6z6av85x2cipyjk46bwh6s4wx6nbrcd3iifnzvbqs7l"; type = "gem"; }; - version = "3.5.0"; + version = "3.6.0"; }; public_suffix = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "040jf98jpp6w140ghkhw2hvc1qx41zvywx5gj7r2ylr1148qnj7q"; + sha256 = "1xqcgkl7bwws1qrlnmxgh8g4g9m10vg60bhlw40fplninb3ng6d9"; type = "gem"; }; - version = "2.0.5"; + version = "4.0.6"; + }; + rake = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1iik52mf9ky4cgs38fp2m8r6skdkq1yz23vh18lk95fhbcxb6a67"; + type = "gem"; + }; + version = "13.0.3"; }; representable = { dependencies = ["declarative" "declarative-option" "uber"]; @@ -547,15 +558,25 @@ }; version = "2.0.7"; }; + ruby2_keywords = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "17pcc0wgvh3ikrkr7bm3nx0qhyiqwidd13ij0fa50k7gsbnr2p0l"; + type = "gem"; + }; + version = "0.0.2"; + }; rubyzip = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qxc2zxwwipm6kviiar4gfhcakpx1jdcs89v6lvzivn5hq1xk78l"; + sha256 = "0590m2pr9i209pp5z4mx0nb1961ishdiqb28995hw1nln1d1b5ji"; type = "gem"; }; - version = "1.3.0"; + version = "2.3.0"; }; security = { groups = ["default"]; @@ -635,10 +656,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1jwgr2i3wilng3mx851xczmkzllbirmsmr42ik4amqyyvry1yzyf"; + sha256 = "18jr6s1cg8yb26wzkqa6874q0z93rq0y5aw092kdqazk71y6a235"; type = "gem"; }; - version = "0.7.1"; + version = "0.8.1"; }; tty-spinner = { dependencies = ["tty-cursor"]; @@ -708,10 +729,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bkk8y6lzd86w9yx72hd1nil3fkk5f0v3il9vm554gzpl6dhc2bi"; + sha256 = "1411j6sfnz0cx4fiw52f0yqx4bgcn8cmpgi3i5rwmmahayyjz2fn"; type = "gem"; }; - version = "1.16.0"; + version = "1.19.0"; }; xcpretty = { dependencies = ["rouge"]; @@ -730,9 +751,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15b5c0lxz2blmichfdlabzlbyw5nlh1ci898pxwb661m9bahz3ml"; + sha256 = "14rg4f70klrs910n7rsgfa4dn8s2qyny55194ax2qyyb2wpk7k5a"; type = "gem"; }; - version = "1.0.0"; + version = "1.0.1"; }; } \ No newline at end of file diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix index 29592451734f..61f41daf2423 100644 --- a/pkgs/tools/admin/google-cloud-sdk/default.nix +++ b/pkgs/tools/admin/google-cloud-sdk/default.nix @@ -21,18 +21,18 @@ let sources = name: system: { x86_64-darwin = { url = "${baseUrl}/${name}-darwin-x86_64.tar.gz"; - sha256 = "0kldvy63gba5k6ymybnggw3q3rlav1gcbpxiwnv6670lk5qzqdsw"; + sha256 = "1rfaa4b34mijlqxi9savzjplk1z83rs1z8iyx89zbw21fyry08kb"; }; x86_64-linux = { url = "${baseUrl}/${name}-linux-x86_64.tar.gz"; - sha256 = "1ifl4skwqhkapfwhymyz7v4jpwpd01n4x3956w5ci8c3zvw8l118"; + sha256 = "15izl7bvv7m96nyrs93b60fivr7gi2i306ryq6ynxrbq0nq43iya"; }; }.${system}; in stdenv.mkDerivation rec { pname = "google-cloud-sdk"; - version = "319.0.0"; + version = "322.0.0"; src = fetchurl (sources "${pname}-${version}" stdenv.hostPlatform.system); @@ -93,13 +93,13 @@ in stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Tools for the google cloud platform"; longDescription = "The Google Cloud SDK. This package has the programs: gcloud, gsutil, and bq"; # This package contains vendored dependencies. All have free licenses. license = licenses.free; homepage = "https://cloud.google.com/sdk/"; - maintainers = with maintainers; [ pradyuman stephenmw zimbatm ]; + maintainers = with maintainers; [ iammrinal0 pradyuman stephenmw zimbatm ]; platforms = [ "x86_64-linux" "x86_64-darwin" ]; }; } diff --git a/pkgs/tools/admin/gtk-vnc/default.nix b/pkgs/tools/admin/gtk-vnc/default.nix index afaa237d342c..152025d41c90 100644 --- a/pkgs/tools/admin/gtk-vnc/default.nix +++ b/pkgs/tools/admin/gtk-vnc/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , fetchpatch , meson @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "GTK VNC widget"; homepage = "https://wiki.gnome.org/Projects/gtk-vnc"; license = licenses.lgpl2Plus; diff --git a/pkgs/tools/admin/iamy/default.nix b/pkgs/tools/admin/iamy/default.nix index 1a668777e2e6..e7481e16948f 100644 --- a/pkgs/tools/admin/iamy/default.nix +++ b/pkgs/tools/admin/iamy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "iamy"; @@ -19,7 +19,7 @@ buildGoModule rec { -X main.Version=v${version} -s -w '']; - meta = with stdenv.lib; { + meta = with lib; { description = "A cli tool for importing and exporting AWS IAM configuration to YAML files"; homepage = "https://github.com/99designs/iamy"; license = licenses.mit; diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix index 0a079c5107f9..5c97d110f9ae 100644 --- a/pkgs/tools/admin/lxd/default.nix +++ b/pkgs/tools/admin/lxd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, hwdata, pkgconfig, lxc, buildGoPackage, fetchurl +{ lib, stdenv, hwdata, pkgconfig, lxc, buildGoPackage, fetchurl , makeWrapper, acl, rsync, gnutar, xz, btrfs-progs, gzip, dnsmasq , squashfsTools, iproute, iptables, ebtables, iptables-nftables-compat, libcap , libco-canonical, dqlite, raft-canonical, sqlite-replication, udev @@ -18,13 +18,13 @@ let in buildGoPackage rec { pname = "lxd"; - version = "4.9"; + version = "4.10"; goPackagePath = "github.com/lxc/lxd"; src = fetchurl { url = "https://github.com/lxc/lxd/releases/download/${pname}-${version}/${pname}-${version}.tar.gz"; - sha256 = "0sq3avgsrdzkbsil0xsri60xxi0bzf4l6w43w23lbhacrby1spj4"; + sha256 = "0s8lbvh2vsqphvspyjyxp5s589gf2wrjpka8v496lf6fv1nsi5s8"; }; postPatch = '' @@ -62,7 +62,7 @@ buildGoPackage rec { buildInputs = [ lxc acl libcap libco-canonical.dev dqlite.dev raft-canonical.dev sqlite-replication udev.dev ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Daemon based on liblxc offering a REST API to manage containers"; homepage = "https://linuxcontainers.org/lxd/"; license = licenses.asl20; diff --git a/pkgs/tools/admin/nomachine-client/default.nix b/pkgs/tools/admin/nomachine-client/default.nix index 50083535a2da..6727a8978788 100644 --- a/pkgs/tools/admin/nomachine-client/default.nix +++ b/pkgs/tools/admin/nomachine-client/default.nix @@ -1,4 +1,4 @@ -{ stdenv, file, fetchurl, makeWrapper, +{ lib, stdenv, file, fetchurl, makeWrapper, autoPatchelfHook, jsoncpp, libpulseaudio }: let versionMajor = "6.12"; @@ -81,7 +81,7 @@ in dontBuild = true; dontStrip = true; - meta = with stdenv.lib; { + meta = with lib; { description = "NoMachine remote desktop client (nxplayer)"; homepage = "https://www.nomachine.com/"; license = { diff --git a/pkgs/tools/admin/procs/default.nix b/pkgs/tools/admin/procs/default.nix index 2c11b6f4523b..f331c137107c 100644 --- a/pkgs/tools/admin/procs/default.nix +++ b/pkgs/tools/admin/procs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform, Security }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, Security }: rustPlatform.buildRustPackage rec { pname = "procs"; @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { buildInputs = stdenv.lib.optional stdenv.isDarwin Security; - meta = with stdenv.lib; { + meta = with lib; { description = "A modern replacement for ps written in Rust"; homepage = "https://github.com/dalance/procs"; license = licenses.mit; diff --git a/pkgs/tools/admin/pulumi/data.nix b/pkgs/tools/admin/pulumi/data.nix index 1bcee96c9fff..08f61da03076 100644 --- a/pkgs/tools/admin/pulumi/data.nix +++ b/pkgs/tools/admin/pulumi/data.nix @@ -1,60 +1,60 @@ # DO NOT EDIT! This file is generated automatically by update.sh { }: { - version = "2.15.0"; + version = "2.17.0"; pulumiPkgs = { x86_64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v2.15.0-linux-x64.tar.gz"; - sha256 = "0yvzqqcfmgblig5jwdc07phyhnfjzvjd1qm0vgfi9ll9y88l33lc"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v2.17.0-linux-x64.tar.gz"; + sha256 = "0k2vdgyb75krjqb9kikkfpvd6rn90gm6dzbpgzsycrwrmbx3rk79"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v1.3.0-linux-amd64.tar.gz"; - sha256 = "1rpmzra42kx2jnhdbnqg120lbnpw86y00vkqbqc3qyagi260f01g"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v1.5.1-linux-amd64.tar.gz"; + sha256 = "0qghccr8kj21scsil4ibc19y3sgrsyzs5c04a5ppv1k62y89h7m7"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v3.19.0-linux-amd64.tar.gz"; - sha256 = "0y0j1aflrfas9sfr4g7jbn2cnhlz9hpz5il6qykz0m01v6sv604w"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v3.23.0-linux-amd64.tar.gz"; + sha256 = "125jqdjn9iipnjj3xgwvcfhcq0xi8xvn8mgs17g79xwbbxpvrjiv"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v2.8.0-linux-amd64.tar.gz"; - sha256 = "174b6r2vhbf9svknidd05sccjzihp97wcd8jwy6dll83d8f8v2xn"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v2.11.0-linux-amd64.tar.gz"; + sha256 = "14pdsvgd512qflvkc1890q9wrri2rrcjdjw5n9lf2qb2m7wvns4y"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v2.6.2-linux-amd64.tar.gz"; sha256 = "0xq36wh57w7b7l5skx173lj3chl4rfgbfdivsvyjlnfahh2fmfr4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v2.11.0-linux-amd64.tar.gz"; - sha256 = "0p2i0k0js3js35jcphf64rzxs7zg9wq25yfzd9q6b2kp2vyqbvjs"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v2.14.0-linux-amd64.tar.gz"; + sha256 = "0vj9674msiadnhmcypqv3dvhkl60sms9frjzpf4hnhlimxc9fpdd"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v3.1.1-linux-amd64.tar.gz"; - sha256 = "1hzf4668sljy2g6s9xz6lvn8cbjy8bb2flhdmc4ln69xxcsslj9z"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v3.2.0-linux-amd64.tar.gz"; + sha256 = "1qipbpp74690w7n42dfsp8524gdjvm8z5665rmsy7mbdi2bd2x5v"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v2.4.1-linux-amd64.tar.gz"; - sha256 = "0fr8ac7864ph02hhl3f08xjyk626c4zbcf8nr7xhmh2ifz6sj9sl"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v2.6.0-linux-amd64.tar.gz"; + sha256 = "0khbcgqbssndx8fwb34ny0wcpy3xi165lq8dq224q1f9bjbklbml"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v4.4.0-linux-amd64.tar.gz"; - sha256 = "0zx9yy97n0wk87ylgq67nphagfp1gas5z99mcfmlh9rf4mj8fhpz"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v4.6.1-linux-amd64.tar.gz"; + sha256 = "13x9yxfyx65pqgsnpdfi12z6fg3b50fzkmsffvwi80857z2389rg"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v2.3.0-linux-amd64.tar.gz"; - sha256 = "02c0nmnk27q9ssv7wv8s30ysxnkqbq7sd004gia4wxf97fhlhl5x"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v2.4.1-linux-amd64.tar.gz"; + sha256 = "1s8g32d06dfaayjhga3skdh7vsrv5ysmhz6ygg202pqqpiy27vl5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v3.3.0-linux-amd64.tar.gz"; - sha256 = "01rpv9m6mj8yqz302g15x4yp37pp4ghdc686n4l7xz08xdb209xi"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v3.4.0-linux-amd64.tar.gz"; + sha256 = "0diylv5kbxjhwvwmwil6l8ln9lijmjnxwgf4yd0rhad118zpibnp"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v0.4.0-linux-amd64.tar.gz"; - sha256 = "1w4cjgccm29ncqb7jfsf9ajlvq0q8h5mnz4v5lxwyx21n80kq34p"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v0.4.1-linux-amd64.tar.gz"; + sha256 = "1851nx4mmgc2j4jihcqxlx5c5dx95xbc2h0kxr055zvdfg2wcp8i"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v2.7.3-linux-amd64.tar.gz"; - sha256 = "0imqwx4v6qsk10anxvnaxpxg87mm34x0qcq30c435mcfrly728sp"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v2.7.5-linux-amd64.tar.gz"; + sha256 = "0f90v8q00hhqrnmwa17gl9sas61bzqsgblpaw1p48agnjxa76vnz"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v2.3.1-linux-amd64.tar.gz"; @@ -65,8 +65,8 @@ sha256 = "12gs049074vn5s0njza0r48bk5z8d7bfc50j2mbbylkdrlrl87ci"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v2.9.0-linux-amd64.tar.gz"; - sha256 = "1vqzl72q939i381vy6dkn75xv09vjs2mg2prbmx63j3hylgb9m6r"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v2.10.1-linux-amd64.tar.gz"; + sha256 = "16mq1ymvkql3l6f3rsinm4yfxfl9qcpwfmhc8k1vj79h6gkd29cz"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-packet-v3.2.2-linux-amd64.tar.gz"; @@ -77,70 +77,70 @@ sha256 = "1xxhc5sy3z391dgzzb4s6wzad2n2j3f5g158wffcj8jss2ylbh1x"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v2.4.2-linux-amd64.tar.gz"; - sha256 = "02xq4mph35fnziz6fb230cvd828yfs030nmi3a4hwh4w1xbr24iw"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v3.0.0-linux-amd64.tar.gz"; + sha256 = "1q8ifm8xmny04y38bswclaa065x657sjq9b573fxrnv9gv9nx5sy"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v3.1.0-linux-amd64.tar.gz"; - sha256 = "0avlf8gyh52zc11a87izy2v8iy4zvbfv6zrm8zg1i5ar43xqg3pm"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v3.2.0-linux-amd64.tar.gz"; + sha256 = "047izxnmsykmk3dpm2q4zxhi575hiqlb1l7xx6sy43dh6ink16jb"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v2.11.2-linux-amd64.tar.gz"; - sha256 = "1wb953vm990c4dsb757msmz7ws844alad3g68sfy029cgmnf8q5i"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v2.11.3-linux-amd64.tar.gz"; + sha256 = "1g32kjvh7zp6f4n4qy457s45qf9ddrzyd5ncfdvpsd0dirjf4crg"; } ]; x86_64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v2.15.0-darwin-x64.tar.gz"; - sha256 = "08hyk06qwm1aibpyqb07h83gc6nfp0cwf6hikf8mc18b2mrwr27r"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v2.17.0-darwin-x64.tar.gz"; + sha256 = "0pa1a4j977cn3m43zia75aj4g5bqr69n0a4hha72dbnnid4d72g8"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v1.3.0-darwin-amd64.tar.gz"; - sha256 = "0ih9l3pkqxfslc11qcgwshxqxbcwy5wfpjczahny6mkgqwmxixnx"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v1.5.1-darwin-amd64.tar.gz"; + sha256 = "1q3r1a3wqzaw78abiz97364a9qgr3rr1m83kyjni3jhs5cgxbax0"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v3.19.0-darwin-amd64.tar.gz"; - sha256 = "0yqm66av2yb9qndpkxxisjml66dyg3zhzkb9fr6kywx8xar4gfdp"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v3.23.0-darwin-amd64.tar.gz"; + sha256 = "0h4g49zr6gxvyavd9pzvlmnzxjqnnzh27dhz6007c10rgn894yba"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v2.8.0-darwin-amd64.tar.gz"; - sha256 = "02is7mfbzhv8bkyn4vk1x9b6m1v9c21chihpry6cjdhpq46bfssf"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v2.11.0-darwin-amd64.tar.gz"; + sha256 = "0k1azgpkrqbr4482h5v2w5qnavmgl5vnx0my2wsgzkwg5pv2i1ky"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v2.6.2-darwin-amd64.tar.gz"; sha256 = "09z1kn5gbgda0d4sfyd17qv1p9ldvxn8jbd049s46gvalmqbfwpd"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v2.11.0-darwin-amd64.tar.gz"; - sha256 = "1r0r6hpchkiq6bg3z6bqnqqz8s96pijsp6rn1dby9f2kaqmar23c"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v2.14.0-darwin-amd64.tar.gz"; + sha256 = "08clh3nnb32gzvnghk5w9m04jh3nn3svy4qx0hfidj3ci0dz6ncl"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v3.1.1-darwin-amd64.tar.gz"; - sha256 = "1nrj3lh2asw6169pddjp83q6ll3w5fjp854bdrx99zajpv7gd0gm"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v3.2.0-darwin-amd64.tar.gz"; + sha256 = "01z8hwlw5i19rpcjk03iw12q2j9xy5in60d6y70v2n4nsmpqhlmq"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v2.4.1-darwin-amd64.tar.gz"; - sha256 = "0y76cy3h0n004lfch37gf9vi8glxnxixwmf1zby3izxd34pyri17"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v2.6.0-darwin-amd64.tar.gz"; + sha256 = "04d3gn89kn7q494g7j6wz3ivmqkdk12l0i2lsmwqlmn3jra44wnd"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v4.4.0-darwin-amd64.tar.gz"; - sha256 = "09zc0sg2h07c97bqbh3ma4pgs232nbd0q5l43992nqa4mn5b8w14"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v4.6.1-darwin-amd64.tar.gz"; + sha256 = "1jxxm8iq1cnym45c8g2js731xz1xwgg72gfxryvy8i7faq6cxakq"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v2.3.0-darwin-amd64.tar.gz"; - sha256 = "08crawyaa26llqc3hj2grba0546ny8zwj8dfg6i46ad3kx1nmycq"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v2.4.1-darwin-amd64.tar.gz"; + sha256 = "17pyiknkjnqlh3cyvclbzg60qf8qig4rp4b0d97vhx8njb5ia9z5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v3.3.0-darwin-amd64.tar.gz"; - sha256 = "12ny0kmly1blj8hd8dlzqbg1pbfh37259x3k2kxx2zcqvcw9y4z9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v3.4.0-darwin-amd64.tar.gz"; + sha256 = "01vpfn62gnklamn2s17icdvzl25d9d97g0mdz955vwqhjsx7man3"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v0.4.0-darwin-amd64.tar.gz"; - sha256 = "0svbnv3axy397w2hi3g1mghcahq88aj4jsnipn3lyxrm29n4wna7"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v0.4.1-darwin-amd64.tar.gz"; + sha256 = "0552wdbykypaafyacjfwqc4sfsl87pgayrnkwg1km00mb1dknzl9"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v2.7.3-darwin-amd64.tar.gz"; - sha256 = "1viwi0ji1qqy4ysl4a9dhv8sfpg8sp3w4i9ndvxs2m7zq0hbndbs"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v2.7.5-darwin-amd64.tar.gz"; + sha256 = "0lhvv5d2v21b0sqcy6wabjlqwg9qx9gxbysnkx3c5f5iwk1hrj8g"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v2.3.1-darwin-amd64.tar.gz"; @@ -151,8 +151,8 @@ sha256 = "1fb6p0nafs3s0kablwyq8v5kf5bs0fi9hkgwkz8hl0ydijzpasl4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v2.9.0-darwin-amd64.tar.gz"; - sha256 = "0dhxhsjb3vbc1bq4pgidadiyfr3gasj0h344prcjzcaxymb3609f"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v2.10.1-darwin-amd64.tar.gz"; + sha256 = "0s6iaqn1jfm7glfnmdps6rk4iqrq2xspmbn4dmqj6q9w9ig1wab6"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-packet-v3.2.2-darwin-amd64.tar.gz"; @@ -163,16 +163,16 @@ sha256 = "0mf7a33ldvfx3yiprprh0cdb4bcnjcp7dhl0bifwyi644v94ffm1"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v2.4.2-darwin-amd64.tar.gz"; - sha256 = "0f77ja9cvhcl86654a3gmb399c7ybigznmxxd8f6f2m7x44pih4q"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v3.0.0-darwin-amd64.tar.gz"; + sha256 = "192a9zkc0yz44jzx3b7xcfy1xdw2blfsmqqvy7dqjhg029nfjfzp"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v3.1.0-darwin-amd64.tar.gz"; - sha256 = "18i81mdws02kfil8zcrnjl3i4gjxqix9n04flz67mqw730mhr3ss"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v3.2.0-darwin-amd64.tar.gz"; + sha256 = "1x5avdbfsrxs98lz20vyl1vyz2dnkz6cdix3yqm4nnyllin34pps"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v2.11.2-darwin-amd64.tar.gz"; - sha256 = "1mw70j1iky98k09739mq1b7lsarvlqp2kcm26555520z78ifiibh"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v2.11.3-darwin-amd64.tar.gz"; + sha256 = "1hzcy1mxvcv9nm5jf6dy96ha3f29kcnbidfw01qc4smy8hc40f66"; } ]; }; diff --git a/pkgs/tools/admin/pulumi/update.sh b/pkgs/tools/admin/pulumi/update.sh index 80acc33322d0..1dd05fe1c901 100755 --- a/pkgs/tools/admin/pulumi/update.sh +++ b/pkgs/tools/admin/pulumi/update.sh @@ -3,31 +3,31 @@ # Version of Pulumi from # https://www.pulumi.com/docs/get-started/install/versions/ -VERSION="2.15.0" +VERSION="2.17.0" # Grab latest release ${VERSION} from # https://github.com/pulumi/pulumi-${NAME}/releases plugins=( - "auth0=1.3.0" - "aws=3.19.0" - "cloudflare=2.8.0" + "auth0=1.5.1" + "aws=3.23.0" + "cloudflare=2.11.0" "consul=2.6.2" - "datadog=2.11.0" - "digitalocean=3.1.1" - "docker=2.4.1" - "gcp=4.4.0" - "github=2.3.0" - "gitlab=3.3.0" - "hcloud=0.4.0" - "kubernetes=2.7.3" + "datadog=2.14.0" + "digitalocean=3.2.0" + "docker=2.6.0" + "gcp=4.6.1" + "github=2.4.1" + "gitlab=3.4.0" + "hcloud=0.4.1" + "kubernetes=2.7.5" "mailgun=2.3.1" "mysql=2.3.2" - "openstack=2.9.0" + "openstack=2.10.1" "packet=3.2.2" "postgresql=2.5.2" - "random=2.4.2" - "vault=3.1.0" - "vsphere=2.11.2" + "random=3.0.0" + "vault=3.2.0" + "vsphere=2.11.3" ); function genMainSrc() { diff --git a/pkgs/tools/admin/s3bro/default.nix b/pkgs/tools/admin/s3bro/default.nix index 154b4aae9665..bf807d149975 100644 --- a/pkgs/tools/admin/s3bro/default.nix +++ b/pkgs/tools/admin/s3bro/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python3Packages }: +{ lib, stdenv, python3Packages }: python3Packages.buildPythonPackage rec { pname = "s3bro"; @@ -14,7 +14,7 @@ python3Packages.buildPythonPackage rec { # No tests doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "A handy s3 cli tool"; homepage = "https://github.com/rsavordelli/s3bro"; license = licenses.mit; diff --git a/pkgs/tools/admin/scaleway-cli/default.nix b/pkgs/tools/admin/scaleway-cli/default.nix index a174937e5a12..0aeccb755a1b 100644 --- a/pkgs/tools/admin/scaleway-cli/default.nix +++ b/pkgs/tools/admin/scaleway-cli/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildGoPackage }: +{ lib, stdenv, fetchFromGitHub, buildGoPackage }: buildGoPackage rec { pname = "scaleway-cli"; @@ -13,7 +13,7 @@ buildGoPackage rec { sha256 = "14likzp3hl04nq9nmpmh9m5zqjyspy5cyk20dkh03c1nhkd4vcnx"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Interact with Scaleway API from the command line"; homepage = "https://github.com/scaleway/scaleway-cli"; license = licenses.mit; diff --git a/pkgs/tools/admin/sewer/default.nix b/pkgs/tools/admin/sewer/default.nix index 471a8788a95e..42288bafe015 100644 --- a/pkgs/tools/admin/sewer/default.nix +++ b/pkgs/tools/admin/sewer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python3Packages }: +{ lib, stdenv, python3Packages }: python3Packages.buildPythonApplication rec { pname = "sewer"; @@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec { propagatedBuildInputs = with python3Packages; [ pyopenssl requests tldextract ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/komuw/sewer"; description = "ACME client"; license = licenses.mit; diff --git a/pkgs/tools/admin/simp_le/default.nix b/pkgs/tools/admin/simp_le/default.nix index 6ff547ab5322..fc064641943a 100644 --- a/pkgs/tools/admin/simp_le/default.nix +++ b/pkgs/tools/admin/simp_le/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python3Packages, bash }: +{ lib, stdenv, python3Packages, bash }: python3Packages.buildPythonApplication rec { pname = "simp_le-client"; @@ -22,7 +22,7 @@ python3Packages.buildPythonApplication rec { propagatedBuildInputs = with python3Packages; [ acme setuptools_scm josepy idna ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/zenhack/simp_le"; description = "Simple Let's Encrypt client"; license = licenses.gpl3; diff --git a/pkgs/tools/admin/ssh-import-id/default.nix b/pkgs/tools/admin/ssh-import-id/default.nix index 77d30e56d5fc..6c8520648ec6 100644 --- a/pkgs/tools/admin/ssh-import-id/default.nix +++ b/pkgs/tools/admin/ssh-import-id/default.nix @@ -1,5 +1,5 @@ { buildPythonPackage -, stdenv +, lib, stdenv , fetchgit , requests , makeWrapper @@ -27,7 +27,7 @@ buildPythonPackage rec { # handlers require main bin, main bin requires handlers makeWrapperArgs = [ "--prefix" ":" "$out/bin" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Retrieves an SSH public key and installs it locally"; license = licenses.gpl3; maintainers = with maintainers; [ mkg20001 ]; diff --git a/pkgs/tools/admin/ssl-cert-check/default.nix b/pkgs/tools/admin/ssl-cert-check/default.nix index b94d77bdf706..f29ced9ebfd8 100644 --- a/pkgs/tools/admin/ssl-cert-check/default.nix +++ b/pkgs/tools/admin/ssl-cert-check/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , makeWrapper , openssl @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { --set PATH "${stdenv.lib.makeBinPath buildInputs}" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "a Bourne shell script that can be used to report on expiring SSL certificates"; homepage = "https://github.com/Matty9191/ssl-cert-check"; license = licenses.gpl2; diff --git a/pkgs/tools/admin/ssmsh/default.nix b/pkgs/tools/admin/ssmsh/default.nix index 1d4275c65cbd..6b0d03809015 100644 --- a/pkgs/tools/admin/ssmsh/default.nix +++ b/pkgs/tools/admin/ssmsh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "ssmsh"; @@ -17,7 +17,7 @@ buildGoModule rec { buildFlagsArray = [ "-ldflags=-w -s -X main.Version=${version}" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/bwhaley/ssmsh"; description = "An interactive shell for AWS Parameter Store"; license = licenses.mit; diff --git a/pkgs/tools/admin/stripe-cli/default.nix b/pkgs/tools/admin/stripe-cli/default.nix index f675e7518f58..c410bd81e89a 100644 --- a/pkgs/tools/admin/stripe-cli/default.nix +++ b/pkgs/tools/admin/stripe-cli/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "stripe-cli"; @@ -17,7 +17,7 @@ buildGoModule rec { "cmd/stripe" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://stripe.com/docs/stripe-cli"; description = "A command-line tool for Stripe"; license = with licenses; [ asl20 ]; diff --git a/pkgs/tools/admin/tigervnc/default.nix b/pkgs/tools/admin/tigervnc/default.nix index 0bb291d797ba..8412ffa9cad1 100644 --- a/pkgs/tools/admin/tigervnc/default.nix +++ b/pkgs/tools/admin/tigervnc/default.nix @@ -6,40 +6,45 @@ , libGLU , gnutls, pam, nettle , xterm, openssh, perl -, makeWrapper}: +, makeWrapper +}: with stdenv.lib; stdenv.mkDerivation rec { - version = "1.10.1"; + version = "1.11.0"; pname = "tigervnc"; src = fetchFromGitHub { owner = "TigerVNC"; repo = "tigervnc"; - rev = "v1.10.1"; - sha256 = "001n189d2f3psn7nxgl8188ml6f7jbk26cxn2835y3mnlk5lmhgr"; + rev = "v${version}"; + sha256 = "sha256-IX39oEhTyk7NV+9dD9mFtes22fBdMTAVIv5XkqFK560="; }; inherit fontDirectories; - patches = [ ./u_xorg-server-1.20.7-ddxInputThreadInit.patch ]; - postPatch = '' - sed -i -e '/^\$cmd \.= " -pn";/a$cmd .= " -xkbdir ${xkeyboard_config}/etc/X11/xkb";' unix/vncserver + sed -i -e '/^\$cmd \.= " -pn";/a$cmd .= " -xkbdir ${xkeyboard_config}/etc/X11/xkb";' unix/vncserver/vncserver.in fontPath= for i in $fontDirectories; do for j in $(find $i -name fonts.dir); do addToSearchPathWithCustomDelimiter "," fontPath $(dirname $j) done done - sed -i -e '/^\$cmd \.= " -pn";/a$cmd .= " -fp '"$fontPath"'";' unix/vncserver + sed -i -e '/^\$cmd \.= " -pn";/a$cmd .= " -fp '"$fontPath"'";' unix/vncserver/vncserver.in substituteInPlace vncviewer/vncviewer.cxx \ --replace '"/usr/bin/ssh' '"${openssh}/bin/ssh' ''; dontUseCmakeBuildDir = true; + cmakeFlags = [ + "-DCMAKE_INSTALL_PREFIX=${placeholder "out"}" + "-DCMAKE_INSTALL_SBINDIR=${placeholder "out"}/bin" + "-DCMAKE_INSTALL_LIBEXECDIR=${placeholder "out"}/bin" + ]; + postBuild = '' export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -Wno-error=int-to-pointer-cast -Wno-error=pointer-to-int-cast" export CXXFLAGS="$CXXFLAGS -fpermissive" @@ -93,8 +98,6 @@ stdenv.mkDerivation rec { propagatedBuildInputs = xorg.xorgserver.propagatedBuildInputs; - enableParallelBuilding = true; - meta = { homepage = "https://tigervnc.org/"; license = stdenv.lib.licenses.gpl2Plus; diff --git a/pkgs/tools/admin/tigervnc/u_xorg-server-1.20.7-ddxInputThreadInit.patch b/pkgs/tools/admin/tigervnc/u_xorg-server-1.20.7-ddxInputThreadInit.patch deleted file mode 100644 index c18f4bf213f2..000000000000 --- a/pkgs/tools/admin/tigervnc/u_xorg-server-1.20.7-ddxInputThreadInit.patch +++ /dev/null @@ -1,21 +0,0 @@ -Origin: https://build.opensuse.org/package/view_file/X11:XOrg/tigervnc/u_xorg-server-1.20.7-ddxInputThreadInit.patch -diff -u -p -r tigervnc-1.10.0.old/unix/xserver/hw/vnc/xvnc.c tigervnc-1.10.0/unix/xserver/hw/vnc/xvnc.c ---- tigervnc-1.10.0.old/unix/xserver/hw/vnc/xvnc.c 2020-01-15 11:19:19.486731848 +0000 -+++ tigervnc-1.10.0/unix/xserver/hw/vnc/xvnc.c 2020-01-15 11:37:33.275445409 +0000 -@@ -295,6 +295,15 @@ void ddxBeforeReset(void) - } - #endif - -+#if INPUTTHREAD -+/** This function is called in Xserver/os/inputthread.c when starting -+ the input thread. */ -+void -+ddxInputThreadInit(void) -+{ -+} -+#endif -+ - void ddxUseMsg(void) - { - vncPrintBanner(); - diff --git a/pkgs/tools/admin/trivy/default.nix b/pkgs/tools/admin/trivy/default.nix index ffe5d25bd9c1..0a4bf934d805 100644 --- a/pkgs/tools/admin/trivy/default.nix +++ b/pkgs/tools/admin/trivy/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "trivy"; - version = "0.14.0"; + version = "0.15.0"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "1ylk6n062n9w2c8179mj0z5acz98b30w6dkpz8gslachsz9sb5ij"; + sha256 = "11fd32qb69g23lxrynsnfy8a783sl60rzknvq4shdg41p2ikigdk"; }; - vendorSha256 = "0kljvy61n72dg99jyc47fzhc8ihyfjk30a1a031gczk3q3z2l7kj"; + vendorSha256 = "09birwc8x90l2y0znf4fwny3phnmq0cz0l2z3xzwg0j3msrdl2np"; subPackages = [ "cmd/trivy" ]; diff --git a/pkgs/tools/admin/virtscreen/default.nix b/pkgs/tools/admin/virtscreen/default.nix index 3c5fb64f7224..ebfd6c21772f 100644 --- a/pkgs/tools/admin/virtscreen/default.nix +++ b/pkgs/tools/admin/virtscreen/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python3Packages, x11vnc, xrandr, libGL }: +{ lib, stdenv, fetchFromGitHub, python3Packages, x11vnc, xrandr, libGL }: python3Packages.buildPythonApplication rec { pname = "virtscreen"; @@ -30,7 +30,7 @@ python3Packages.buildPythonApplication rec { --replace "'GL'" "'${libGL}/lib/libGL${ext}'" \ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Make your iPad/tablet/computer as a secondary monitor on Linux"; homepage = "https://github.com/kbumsik/VirtScreen"; license = licenses.gpl3; diff --git a/pkgs/tools/archivers/arc_unpacker/default.nix b/pkgs/tools/archivers/arc_unpacker/default.nix index 76eb9a7fccbc..dcd5243d7135 100644 --- a/pkgs/tools/archivers/arc_unpacker/default.nix +++ b/pkgs/tools/archivers/arc_unpacker/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, makeWrapper, boost, libpng, libjpeg, zlib +{ lib, stdenv, fetchFromGitHub, cmake, makeWrapper, boost, libpng, libjpeg, zlib , openssl, libwebp, catch }: stdenv.mkDerivation rec { @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A tool to extract files from visual novel archives"; homepage = "https://github.com/vn-tools/arc_unpacker"; license = licenses.gpl3; diff --git a/pkgs/tools/archivers/bomutils/default.nix b/pkgs/tools/archivers/bomutils/default.nix index fc68184be319..9ace81a5ec2c 100644 --- a/pkgs/tools/archivers/bomutils/default.nix +++ b/pkgs/tools/archivers/bomutils/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/hogliux/bomutils"; description = "Open source tools to create bill-of-materials files used in macOS installers"; platforms = platforms.all; diff --git a/pkgs/tools/archivers/cabextract/default.nix b/pkgs/tools/archivers/cabextract/default.nix index 14c4ede50041..3ed07544bb2b 100644 --- a/pkgs/tools/archivers/cabextract/default.nix +++ b/pkgs/tools/archivers/cabextract/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "cabextract-1.9.1"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "19qwhl2r8ip95q4vxzxg2kp4p125hjmc9762sns1dwwf7ikm7hmg"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.cabextract.org.uk/"; description = "Free Software for extracting Microsoft cabinet files"; platforms = platforms.all; diff --git a/pkgs/tools/archivers/cpio/default.nix b/pkgs/tools/archivers/cpio/default.nix index a196ddcaa306..5b88e10b1c37 100644 --- a/pkgs/tools/archivers/cpio/default.nix +++ b/pkgs/tools/archivers/cpio/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: let version = "2.13"; @@ -17,7 +17,7 @@ in stdenv.mkDerivation { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.gnu.org/software/cpio/"; description = "A program to create or extract from cpio archives"; license = licenses.gpl3; diff --git a/pkgs/tools/archivers/cromfs/default.nix b/pkgs/tools/archivers/cromfs/default.nix index e0eb11aa9a6f..145a66a31315 100644 --- a/pkgs/tools/archivers/cromfs/default.nix +++ b/pkgs/tools/archivers/cromfs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, fuse, perl }: +{ lib, stdenv, fetchurl, pkgconfig, fuse, perl }: stdenv.mkDerivation rec { name = "cromfs-1.5.10.2"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ fuse perl ]; - meta = with stdenv.lib; { + meta = with lib; { description = "FUSE Compressed ROM filesystem with lzma"; homepage = "https://bisqwit.iki.fi/source/cromfs.html"; license = licenses.gpl3; diff --git a/pkgs/tools/archivers/ctrtool/default.nix b/pkgs/tools/archivers/ctrtool/default.nix index 4b8eb4dfab2e..4743f7ded3e8 100644 --- a/pkgs/tools/archivers/ctrtool/default.nix +++ b/pkgs/tools/archivers/ctrtool/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "ctrtool"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { cp ctrtool${stdenv.hostPlatform.extensions.executable} $out/bin/ "; - meta = with stdenv.lib; { + meta = with lib; { license = licenses.mit; description = "A tool to extract data from a 3ds rom"; platforms = platforms.linux; diff --git a/pkgs/tools/archivers/fsarchiver/default.nix b/pkgs/tools/archivers/fsarchiver/default.nix index 721accd93f03..5196ccf668f2 100644 --- a/pkgs/tools/archivers/fsarchiver/default.nix +++ b/pkgs/tools/archivers/fsarchiver/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig , zlib, bzip2, lzma, lzo, lz4, zstd, xz , libgcrypt, e2fsprogs, util-linux, libgpgerror }: @@ -25,7 +25,7 @@ in stdenv.mkDerivation { libgcrypt e2fsprogs util-linux libgpgerror ]; - meta = with stdenv.lib; { + meta = with lib; { description = "File system archiver for linux"; longDescription = '' FSArchiver is a system tool that allows you to save the contents of a diff --git a/pkgs/tools/archivers/innoextract/default.nix b/pkgs/tools/archivers/innoextract/default.nix index da26639fcb5f..d5d35a38251f 100644 --- a/pkgs/tools/archivers/innoextract/default.nix +++ b/pkgs/tools/archivers/innoextract/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, makeWrapper, python +{ lib, stdenv, fetchurl, cmake, makeWrapper, python , boost, lzma , withGog ? false, unar ? null }: @@ -14,15 +14,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake makeWrapper ]; - enableParallelBuilding = true; - # we need unar to for multi-archive extraction postFixup = stdenv.lib.optionalString withGog '' wrapProgram $out/bin/innoextract \ --prefix PATH : ${stdenv.lib.makeBinPath [ unar ]} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A tool to unpack installers created by Inno Setup"; homepage = "https://constexpr.org/innoextract/"; license = licenses.zlib; diff --git a/pkgs/tools/archivers/maxcso/default.nix b/pkgs/tools/archivers/maxcso/default.nix index 333b0dcabc3d..ed81a1825257 100644 --- a/pkgs/tools/archivers/maxcso/default.nix +++ b/pkgs/tools/archivers/maxcso/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libuv, lz4, zlib }: +{ lib, stdenv, fetchFromGitHub, libuv, lz4, zlib }: stdenv.mkDerivation rec { pname = "maxcso"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/unknownbrackets/maxcso"; description = "A fast ISO to CSO compression program for use with PSP and PS2 emulators, which uses multiple algorithms for best compression ratio"; diff --git a/pkgs/tools/archivers/p7zip/default.nix b/pkgs/tools/archivers/p7zip/default.nix index a155c1717eb4..90602cd42d84 100644 --- a/pkgs/tools/archivers/p7zip/default.nix +++ b/pkgs/tools/archivers/p7zip/default.nix @@ -1,17 +1,15 @@ -{ stdenv, fetchFromGitHub, lib, enableUnfree ? false }: +{ stdenv, fetchFromGitHub, fetchpatch, lib, enableUnfree ? false }: stdenv.mkDerivation rec { pname = "p7zip"; - version = "17.01"; - + version = "17.03"; src = fetchFromGitHub { owner = "szcnick"; repo = pname; rev = "v${version}"; - sha256 = "0gczdmypwbfnxzb11rjrrndjkkb3jzxfby2cchn5j8ysny13mfps"; - } - ; + sha256 = "0zgpa90z5p30jbpqydiig1h8hn41c76n2x26rh8cc92xw72ni33d"; + }; # Default makefile is full of impurities on Darwin. The patch doesn't hurt Linux so I'm leaving it unconditional postPatch = '' @@ -31,12 +29,13 @@ stdenv.mkDerivation rec { find . -name makefile'*' -exec sed -i '/Rar/d' {} + ''; + makeFlags = [ "DEST_HOME=${placeholder "out"}" ]; + preConfigure = '' - makeFlagsArray=(DEST_HOME=$out) - buildFlags=all3 - '' + stdenv.lib.optionalString stdenv.isDarwin '' - cp makefile.macosx_llvm_64bits makefile.machine -''; + buildFlags=all3 + '' + stdenv.lib.optionalString stdenv.isDarwin '' + cp makefile.macosx_llvm_64bits makefile.machine + ''; enableParallelBuilding = true; diff --git a/pkgs/tools/archivers/pax/default.nix b/pkgs/tools/archivers/pax/default.nix index aa457b976d0d..d554ea4dade3 100644 --- a/pkgs/tools/archivers/pax/default.nix +++ b/pkgs/tools/archivers/pax/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "pax"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { install -Dm444 mans/pax{,cpio,tar}.1 -t $out/share/man/man1/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "POSIX standard archive tool from MirBSD"; homepage = "https://www.mirbsd.org/pax.htm"; license = licenses.bsd3; diff --git a/pkgs/tools/archivers/rpmextract/default.nix b/pkgs/tools/archivers/rpmextract/default.nix index 59ff67e3eefb..d4bbbe77a2d8 100644 --- a/pkgs/tools/archivers/rpmextract/default.nix +++ b/pkgs/tools/archivers/rpmextract/default.nix @@ -1,4 +1,4 @@ -{ stdenv, rpm, cpio, substituteAll }: +{ lib, stdenv, rpm, cpio, substituteAll }: stdenv.mkDerivation { name = "rpmextract"; @@ -14,7 +14,7 @@ stdenv.mkDerivation { inherit (stdenv) shell; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Script to extract RPM archives"; platforms = platforms.all; license = licenses.gpl2; diff --git a/pkgs/tools/archivers/sharutils/default.nix b/pkgs/tools/archivers/sharutils/default.nix index aefe4f87eb4a..c785211e682f 100644 --- a/pkgs/tools/archivers/sharutils/default.nix +++ b/pkgs/tools/archivers/sharutils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gettext, coreutils }: +{ lib, stdenv, fetchurl, gettext, coreutils }: stdenv.mkDerivation rec { name = "sharutils-4.15.2"; @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Tools for remote synchronization and `shell archives'"; longDescription = '' GNU shar makes so-called shell archives out of many files, preparing diff --git a/pkgs/tools/archivers/snzip/default.nix b/pkgs/tools/archivers/snzip/default.nix index 031cac64b759..1f4a0f12ff2f 100644 --- a/pkgs/tools/archivers/snzip/default.nix +++ b/pkgs/tools/archivers/snzip/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { # run. That's why we generate it. nativeBuildInputs = [ autoreconfHook pkgconfig ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A compression/decompression tool based on snappy"; homepage = "https://github.com/kubo/snzip"; maintainers = with maintainers; [ doronbehar ]; diff --git a/pkgs/tools/archivers/unar/default.nix b/pkgs/tools/archivers/unar/default.nix index 6e75ee720e80..d0d0ef90e68d 100644 --- a/pkgs/tools/archivers/unar/default.nix +++ b/pkgs/tools/archivers/unar/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, installShellFiles, gnustep, bzip2, zlib, icu, openssl, wavpack }: +{ lib, stdenv, fetchFromGitHub, installShellFiles, gnustep, bzip2, zlib, icu, openssl, wavpack }: stdenv.mkDerivation rec { pname = "unar"; @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://theunarchiver.com"; description = "An archive unpacker program"; longDescription = '' diff --git a/pkgs/tools/archivers/undmg/default.nix b/pkgs/tools/archivers/undmg/default.nix index 0eaabdb627da..0bbf725d191b 100644 --- a/pkgs/tools/archivers/undmg/default.nix +++ b/pkgs/tools/archivers/undmg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, zlib, bzip2, lzfse, pkg-config }: +{ lib, stdenv, fetchFromGitHub, zlib, bzip2, lzfse, pkg-config }: stdenv.mkDerivation rec { version = "1.1.0"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/matthewbauer/undmg"; description = "Extract a DMG file"; license = licenses.gpl3; diff --git a/pkgs/tools/archivers/unp/default.nix b/pkgs/tools/archivers/unp/default.nix index afe00972141c..34f8cb1c40e6 100644 --- a/pkgs/tools/archivers/unp/default.nix +++ b/pkgs/tools/archivers/unp/default.nix @@ -34,7 +34,7 @@ in stdenv.mkDerivation { --prefix PATH : ${lib.makeBinPath runtime_bins} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Command line tool for unpacking archives easily"; homepage = "https://packages.qa.debian.org/u/unp.html"; license = with licenses; [ gpl2 ]; diff --git a/pkgs/tools/archivers/unrar/default.nix b/pkgs/tools/archivers/unrar/default.nix index 9396267b3a10..b06242a98c04 100644 --- a/pkgs/tools/archivers/unrar/default.nix +++ b/pkgs/tools/archivers/unrar/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation rec { pname = "unrar"; @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { setupHook = ./setup-hook.sh; - meta = with stdenv.lib; { + meta = with lib; { description = "Utility for RAR archives"; homepage = "https://www.rarlab.com/"; license = licenses.unfreeRedistributable; diff --git a/pkgs/tools/archivers/unshield/default.nix b/pkgs/tools/archivers/unshield/default.nix index dbcb2b24f100..2c58b546b63c 100644 --- a/pkgs/tools/archivers/unshield/default.nix +++ b/pkgs/tools/archivers/unshield/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, zlib, openssl }: +{ lib, stdenv, fetchFromGitHub, cmake, zlib, openssl }: stdenv.mkDerivation rec { pname = "unshield"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ zlib openssl ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Tool and library to extract CAB files from InstallShield installers"; homepage = "https://github.com/twogood/unshield"; license = licenses.mit; diff --git a/pkgs/tools/archivers/wimlib/default.nix b/pkgs/tools/archivers/wimlib/default.nix index 51f75ee923d3..16e93470e892 100644 --- a/pkgs/tools/archivers/wimlib/default.nix +++ b/pkgs/tools/archivers/wimlib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper +{ lib, stdenv, fetchurl, makeWrapper , pkgconfig, openssl, fuse, libxml2 , cabextract ? null , cdrkit ? null @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { patchShebangs tests ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://wimlib.net"; description = "A library and program to extract, create, and modify WIM files"; platforms = platforms.unix; diff --git a/pkgs/tools/archivers/zip/default.nix b/pkgs/tools/archivers/zip/default.nix index 173f48121090..74f1982a425e 100644 --- a/pkgs/tools/archivers/zip/default.nix +++ b/pkgs/tools/archivers/zip/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, enableNLS ? false, libnatspec ? null, libiconv }: +{ lib, stdenv, fetchurl, enableNLS ? false, libnatspec ? null, libiconv }: assert enableNLS -> libnatspec != null; @@ -30,7 +30,7 @@ stdenv.mkDerivation { buildInputs = stdenv.lib.optional enableNLS libnatspec ++ stdenv.lib.optional stdenv.isCygwin libiconv; - meta = with stdenv.lib; { + meta = with lib; { description = "Compressor/archiver for creating and modifying zipfiles"; homepage = "http://www.info-zip.org"; license = licenses.bsdOriginal; diff --git a/pkgs/tools/archivers/zpaq/default.nix b/pkgs/tools/archivers/zpaq/default.nix index dbdcdf5cada8..7c9f9ac7d632 100644 --- a/pkgs/tools/archivers/zpaq/default.nix +++ b/pkgs/tools/archivers/zpaq/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, perl, unzip }: +{ lib, stdenv, fetchFromGitHub, perl, unzip }: stdenv.mkDerivation rec { pname = "zpaq"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { installFlags = [ "PREFIX=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Incremental journaling backup utility and archiver"; homepage = "http://mattmahoney.net/dc/zpaq.html"; license = licenses.gpl3Plus ; diff --git a/pkgs/tools/archivers/zpaq/zpaqd.nix b/pkgs/tools/archivers/zpaq/zpaqd.nix index 611654331c3b..6abad5a17be4 100644 --- a/pkgs/tools/archivers/zpaq/zpaqd.nix +++ b/pkgs/tools/archivers/zpaq/zpaqd.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip }: +{ lib, stdenv, fetchurl, unzip }: let # Generated upstream information @@ -39,7 +39,7 @@ stdenv.mkDerivation { cp readme_zpaqd.txt "$out/share/doc/zpaq" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "ZPAQ archive (de)compressor and algorithm development tool"; license = licenses.gpl3Plus ; maintainers = with maintainers; [ raskin ]; diff --git a/pkgs/tools/audio/abcm2ps/default.nix b/pkgs/tools/audio/abcm2ps/default.nix index 139d684fb671..5ecc1d1331c9 100644 --- a/pkgs/tools/audio/abcm2ps/default.nix +++ b/pkgs/tools/audio/abcm2ps/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, which, docutils, freetype, pango }: +{ lib, stdenv, fetchFromGitHub, pkgconfig, which, docutils, freetype, pango }: stdenv.mkDerivation rec { pname = "abcm2ps"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { buildInputs = [ freetype pango ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://moinejf.free.fr/"; license = licenses.gpl3; description = "A command line program which converts ABC to music sheet in PostScript or SVG format"; diff --git a/pkgs/tools/audio/abcmidi/default.nix b/pkgs/tools/audio/abcmidi/default.nix index e33ff98587bf..b3f45410f429 100644 --- a/pkgs/tools/audio/abcmidi/default.nix +++ b/pkgs/tools/audio/abcmidi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip }: +{ lib, stdenv, fetchzip }: stdenv.mkDerivation rec { pname = "abcMIDI"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { # There is also a file called "makefile" which seems to be preferred by the standard build phase makefile = "Makefile"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://abc.sourceforge.net/abcMIDI/"; downloadPage = "https://ifdo.ca/~seymour/runabc/top.html"; license = licenses.gpl2Plus; diff --git a/pkgs/tools/audio/accuraterip-checksum/default.nix b/pkgs/tools/audio/accuraterip-checksum/default.nix index efd440256470..161e9848bea6 100644 --- a/pkgs/tools/audio/accuraterip-checksum/default.nix +++ b/pkgs/tools/audio/accuraterip-checksum/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libsndfile }: +{ lib, stdenv, fetchFromGitHub, libsndfile }: stdenv.mkDerivation rec { pname = "accuraterip-checksum"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Program for computing the AccurateRip checksum of singletrack WAV files"; homepage = "https://github.com/leo-bogert/accuraterip-checksum"; license = licenses.gpl3; diff --git a/pkgs/tools/audio/acoustid-fingerprinter/default.nix b/pkgs/tools/audio/acoustid-fingerprinter/default.nix index e2824bc07b66..3c8f43772b55 100644 --- a/pkgs/tools/audio/acoustid-fingerprinter/default.nix +++ b/pkgs/tools/audio/acoustid-fingerprinter/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, cmake, pkgconfig, qt4, taglib, chromaprint, ffmpeg }: +{ lib, stdenv, fetchurl, fetchpatch, cmake, pkg-config, qt4, taglib, chromaprint, ffmpeg }: stdenv.mkDerivation rec { pname = "acoustid-fingerprinter"; @@ -10,8 +10,8 @@ stdenv.mkDerivation rec { sha256 = "0ckglwy95qgqvl2l6yd8ilwpd6qs7yzmj8g7lnxb50d12115s5n0"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake qt4 taglib chromaprint ffmpeg ]; + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ qt4 taglib chromaprint ffmpeg ]; cmakeFlags = [ "-DTAGLIB_MIN_VERSION=${stdenv.lib.getVersion taglib}" ]; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ./ffmpeg.patch ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://acoustid.org/fingerprinter"; description = "Audio fingerprinting tool using chromaprint"; license = stdenv.lib.licenses.gpl2Plus; diff --git a/pkgs/tools/audio/alsaequal/default.nix b/pkgs/tools/audio/alsaequal/default.nix index 9498baca991b..12d590c4c762 100644 --- a/pkgs/tools/audio/alsaequal/default.nix +++ b/pkgs/tools/audio/alsaequal/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , alsaLib, caps }: @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { mkdir -p "$out/lib/alsa-lib" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Real-time adjustable equalizer plugin for ALSA"; homepage = "https://thedigitalmachine.net/alsaequal.html"; license = licenses.gpl2; diff --git a/pkgs/tools/audio/audiowaveform/default.nix b/pkgs/tools/audio/audiowaveform/default.nix index 9d674dcfe436..e120f6fcbf0e 100644 --- a/pkgs/tools/audio/audiowaveform/default.nix +++ b/pkgs/tools/audio/audiowaveform/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, gtest, boost, gd, libsndfile, libmad, libid3tag }: +{ lib, stdenv, fetchFromGitHub, cmake, gtest, boost, gd, libsndfile, libmad, libid3tag }: stdenv.mkDerivation rec { pname = "audiowaveform"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { # One test is failing, see PR #101947 doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "C++ program to generate waveform data and render waveform images from audio files"; longDescription = '' audiowaveform is a C++ command-line application that generates waveform data from either MP3, WAV, FLAC, or Ogg Vorbis format audio files. diff --git a/pkgs/tools/audio/beets/badfiles-plugin-nix-paths.patch b/pkgs/tools/audio/beets/badfiles-plugin-nix-paths.patch new file mode 100644 index 000000000000..6956183344c4 --- /dev/null +++ b/pkgs/tools/audio/beets/badfiles-plugin-nix-paths.patch @@ -0,0 +1,21 @@ +diff --git i/beetsplug/badfiles.py w/beetsplug/badfiles.py +index 36b45de3..5208b696 100644 +--- i/beetsplug/badfiles.py ++++ w/beetsplug/badfiles.py +@@ -71,14 +71,14 @@ class BadFiles(BeetsPlugin): + return status, errors, [line for line in output.split("\n") if line] + + def check_mp3val(self, path): +- status, errors, output = self.run_command(["mp3val", path]) ++ status, errors, output = self.run_command(["@mp3val@/bin/mp3val", path]) + if status == 0: + output = [line for line in output if line.startswith("WARNING:")] + errors = len(output) + return status, errors, output + + def check_flac(self, path): +- return self.run_command(["flac", "-wst", path]) ++ return self.run_command(["@flac@/bin/flac", "-wst", path]) + + def check_custom(self, command): + def checker(path): diff --git a/pkgs/tools/audio/beets/bash-completion-always-print.patch b/pkgs/tools/audio/beets/bash-completion-always-print.patch new file mode 100644 index 000000000000..7bc3e57117e3 --- /dev/null +++ b/pkgs/tools/audio/beets/bash-completion-always-print.patch @@ -0,0 +1,43 @@ +diff --git i/beets/ui/commands.py w/beets/ui/commands.py +index 4d010f4b..0b023585 100755 +--- i/beets/ui/commands.py ++++ w/beets/ui/commands.py +@@ -1741,20 +1741,6 @@ default_commands.append(config_cmd) + def print_completion(*args): + for line in completion_script(default_commands + plugins.commands()): + print_(line, end=u'') +- if not any(map(os.path.isfile, BASH_COMPLETION_PATHS)): +- log.warning(u'Warning: Unable to find the bash-completion package. ' +- u'Command line completion might not work.') +- +-BASH_COMPLETION_PATHS = map(syspath, [ +- u'/etc/bash_completion', +- u'/usr/share/bash-completion/bash_completion', +- u'/usr/local/share/bash-completion/bash_completion', +- # SmartOS +- u'/opt/local/share/bash-completion/bash_completion', +- # Homebrew (before bash-completion2) +- u'/usr/local/etc/bash_completion', +-]) +- + + def completion_script(commands): + """Yield the full completion shell script as strings. +diff --git i/test/test_ui.py w/test/test_ui.py +index 5cfed1fd..9d3dc458 100644 +--- i/test/test_ui.py ++++ w/test/test_ui.py +@@ -1230,12 +1230,7 @@ class CompletionTest(_common.TestCase, TestHelper): + stdout=subprocess.PIPE, env=env) + + # Load bash_completion library. +- for path in commands.BASH_COMPLETION_PATHS: +- if os.path.exists(util.syspath(path)): +- bash_completion = path +- break +- else: +- self.skipTest(u'bash-completion script not found') ++ self.skipTest(u'bash-completion script not found') + try: + with open(util.syspath(bash_completion), 'rb') as f: + tester.stdin.writelines(f) diff --git a/pkgs/tools/audio/beets/compatibility-with-breaking-changes-to-the-ast-module.patch b/pkgs/tools/audio/beets/compatibility-with-breaking-changes-to-the-ast-module.patch deleted file mode 100644 index 4865b6f62341..000000000000 --- a/pkgs/tools/audio/beets/compatibility-with-breaking-changes-to-the-ast-module.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 771ce704ebeac4cd9bd74b3ddde9fb01f3dc7eb4 Mon Sep 17 00:00:00 2001 -From: wisp3rwind <17089248+wisp3rwind@users.noreply.github.com> -Date: Tue, 9 Jun 2020 19:34:31 +0200 -Subject: [PATCH] compatibility with breaking changes to the ast module - -new in 3.10, also backported to 3.8 and 3.9: https://github.com/python/cpython/pull/20649 -In fact, our generation of some Literals has been invalid since Python -3.4, fix that too. ---- - beets/util/functemplate.py | 29 ++++++++++++++++++++--------- - 1 file changed, 20 insertions(+), 9 deletions(-) - -diff --git a/beets/util/functemplate.py b/beets/util/functemplate.py -index af22b790..266534a9 100644 ---- a/beets/util/functemplate.py -+++ b/beets/util/functemplate.py -@@ -73,15 +73,26 @@ def ex_literal(val): - """An int, float, long, bool, string, or None literal with the given - value. - """ -- if val is None: -- return ast.Name('None', ast.Load()) -- elif isinstance(val, six.integer_types): -- return ast.Num(val) -- elif isinstance(val, bool): -- return ast.Name(bytes(val), ast.Load()) -- elif isinstance(val, six.string_types): -- return ast.Str(val) -- raise TypeError(u'no literal for {0}'.format(type(val))) -+ if sys.version_info[:2] < (3, 4): -+ if val is None: -+ return ast.Name('None', ast.Load()) -+ elif isinstance(val, six.integer_types): -+ return ast.Num(val) -+ elif isinstance(val, bool): -+ return ast.Name(bytes(val), ast.Load()) -+ elif isinstance(val, six.string_types): -+ return ast.Str(val) -+ raise TypeError(u'no literal for {0}'.format(type(val))) -+ elif sys.version_info[:2] < (3, 6): -+ if val in [None, True, False]: -+ return ast.NameConstant(val) -+ elif isinstance(val, six.integer_types): -+ return ast.Num(val) -+ elif isinstance(val, six.string_types): -+ return ast.Str(val) -+ raise TypeError(u'no literal for {0}'.format(type(val))) -+ else: -+ return ast.Constant(val) - - - def ex_varassign(name, expr): --- -2.27.0 - diff --git a/pkgs/tools/audio/beets/convert-plugin-ffmpeg-path.patch b/pkgs/tools/audio/beets/convert-plugin-ffmpeg-path.patch new file mode 100644 index 000000000000..bcc77179d796 --- /dev/null +++ b/pkgs/tools/audio/beets/convert-plugin-ffmpeg-path.patch @@ -0,0 +1,43 @@ +diff --git i/beetsplug/convert.py w/beetsplug/convert.py +index 70363f6e..2962aa4f 100644 +--- i/beetsplug/convert.py ++++ w/beetsplug/convert.py +@@ -81,7 +81,7 @@ def get_format(fmt=None): + command = config['convert']['command'].as_str() + elif 'opts' in keys: + # Undocumented option for backwards compatibility with < 1.3.1. +- command = u'ffmpeg -i $source -y {0} $dest'.format( ++ command = u'@ffmpeg@/bin/ffmpeg -i $source -y {0} $dest'.format( + config['convert']['opts'].as_str() + ) + if 'extension' in keys: +@@ -121,22 +121,22 @@ class ConvertPlugin(BeetsPlugin): + u'id3v23': u'inherit', + u'formats': { + u'aac': { +- u'command': u'ffmpeg -i $source -y -vn -acodec aac ' ++ u'command': u'@ffmpeg@/bin/ffmpeg -i $source -y -vn -acodec aac ' + u'-aq 1 $dest', + u'extension': u'm4a', + }, + u'alac': { +- u'command': u'ffmpeg -i $source -y -vn -acodec alac $dest', ++ u'command': u'@ffmpeg@/bin/ffmpeg -i $source -y -vn -acodec alac $dest', + u'extension': u'm4a', + }, +- u'flac': u'ffmpeg -i $source -y -vn -acodec flac $dest', +- u'mp3': u'ffmpeg -i $source -y -vn -aq 2 $dest', ++ u'flac': u'@ffmpeg@/bin/ffmpeg -i $source -y -vn -acodec flac $dest', ++ u'mp3': u'@ffmpeg@/bin/ffmpeg -i $source -y -vn -aq 2 $dest', + u'opus': +- u'ffmpeg -i $source -y -vn -acodec libopus -ab 96k $dest', ++ u'@ffmpeg@/bin/ffmpeg -i $source -y -vn -acodec libopus -ab 96k $dest', + u'ogg': +- u'ffmpeg -i $source -y -vn -acodec libvorbis -aq 3 $dest', ++ u'@ffmpeg@/bin/ffmpeg -i $source -y -vn -acodec libvorbis -aq 3 $dest', + u'wma': +- u'ffmpeg -i $source -y -vn -acodec wmav2 -vn $dest', ++ u'@ffmpeg@/bin/ffmpeg -i $source -y -vn -acodec wmav2 -vn $dest', + }, + u'max_bitrate': 500, + u'auto': False, diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix index 56551891a4a5..f72692c845c7 100644 --- a/pkgs/tools/audio/beets/default.nix +++ b/pkgs/tools/audio/beets/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, writeScript, glibcLocales, diffPlugins +{ stdenv, lib, fetchFromGitHub, writeScript, glibcLocales, diffPlugins, substituteAll , pythonPackages, imagemagick, gobject-introspection, gst_all_1 , runtimeShell , fetchpatch @@ -6,61 +6,70 @@ # Attributes needed for tests of the external plugins , callPackage, beets -, enableAbsubmit ? stdenv.lib.elem stdenv.hostPlatform.system essentia-extractor.meta.platforms, essentia-extractor ? null -, enableAcousticbrainz ? true -, enableAcoustid ? true -, enableBadfiles ? true, flac ? null, mp3val ? null -, enableConvert ? true, ffmpeg_3 ? null -, enableDiscogs ? true -, enableEmbyupdate ? true -, enableFetchart ? true -, enableGmusic ? true -, enableKeyfinder ? true, keyfinder-cli ? null -, enableKodiupdate ? true -, enableLastfm ? true -, enableLoadext ? true -, enableMpd ? true -, enablePlaylist ? true -, enableReplaygain ? true, bs1770gain ? null -, enableSonosUpdate ? true -, enableSubsonicupdate ? true -, enableThumbnails ? true -, enableWeb ? true +, enableAbsubmit ? lib.elem stdenv.hostPlatform.system essentia-extractor.meta.platforms, essentia-extractor ? null +, enableAcousticbrainz ? true +, enableAcoustid ? true +, enableBadfiles ? true, flac ? null, mp3val ? null +, enableBeatport ? true +, enableBpsync ? true +, enableConvert ? true, ffmpeg ? null +, enableDeezer ? true +, enableDiscogs ? true +, enableEmbyupdate ? true +, enableFetchart ? true +, enableGmusic ? true +, enableKeyfinder ? true, keyfinder-cli ? null +, enableKodiupdate ? true +, enableLastfm ? true +, enableLoadext ? true +, enableMpd ? true +, enablePlaylist ? true +, enableReplaygain ? true +, enableSonosUpdate ? true +, enableSubsonicplaylist ? true +, enableSubsonicupdate ? true +, enableThumbnails ? true +, enableWeb ? true # External plugins -, enableAlternatives ? false -, enableCheck ? false, liboggz ? null -, enableCopyArtifacts ? false -, enableExtraFiles ? false +, enableAlternatives ? false +, enableCheck ? false, liboggz ? null +, enableCopyArtifacts ? false +, enableExtraFiles ? false , bashInteractive, bash-completion }: -assert enableAbsubmit -> essentia-extractor != null; -assert enableAcoustid -> pythonPackages.pyacoustid != null; +assert enableAbsubmit -> essentia-extractor != null; +assert enableAcoustid -> pythonPackages.pyacoustid != null; assert enableBadfiles -> flac != null && mp3val != null; +assert enableBeatport -> pythonPackages.requests_oauthlib != null; +assert enableBpsync -> enableBeatport; assert enableCheck -> flac != null && mp3val != null && liboggz != null; -assert enableConvert -> ffmpeg_3 != null; -assert enableDiscogs -> pythonPackages.discogs_client != null; -assert enableFetchart -> pythonPackages.responses != null; -assert enableGmusic -> pythonPackages.gmusicapi != null; -assert enableKeyfinder -> keyfinder-cli != null; -assert enableLastfm -> pythonPackages.pylast != null; -assert enableMpd -> pythonPackages.mpd2 != null; -assert enableReplaygain -> bs1770gain != null; -assert enableSonosUpdate -> pythonPackages.soco != null; -assert enableThumbnails -> pythonPackages.pyxdg != null; -assert enableWeb -> pythonPackages.flask != null; +assert enableConvert -> ffmpeg != null; +assert enableDiscogs -> pythonPackages.discogs_client != null; +assert enableFetchart -> pythonPackages.responses != null; +assert enableGmusic -> pythonPackages.gmusicapi != null; +assert enableKeyfinder -> keyfinder-cli != null; +assert enableLastfm -> pythonPackages.pylast != null; +assert enableMpd -> pythonPackages.mpd2 != null; +assert enableReplaygain -> ffmpeg != null; +assert enableSonosUpdate -> pythonPackages.soco != null; +assert enableThumbnails -> pythonPackages.pyxdg != null; +assert enableWeb -> pythonPackages.flask != null; -with stdenv.lib; +with lib; let optionalPlugins = { absubmit = enableAbsubmit; acousticbrainz = enableAcousticbrainz; badfiles = enableBadfiles; + beatport = enableBeatport; + bpsync = enableBpsync; chroma = enableAcoustid; convert = enableConvert; + deezer = enableDeezer; discogs = enableDiscogs; embyupdate = enableEmbyupdate; fetchart = enableFetchart; @@ -75,18 +84,19 @@ let playlist = enablePlaylist; replaygain = enableReplaygain; sonosupdate = enableSonosUpdate; + subsonicplaylist = enableSubsonicplaylist; subsonicupdate = enableSubsonicupdate; thumbnails = enableThumbnails; web = enableWeb; }; pluginsWithoutDeps = [ - "beatport" "bench" "bpd" "bpm" "bucket" "cue" "duplicates" "edit" "embedart" - "export" "filefilter" "freedesktop" "fromfilename" "ftintitle" "fuzzy" + "bench" "bpd" "bpm" "bucket" "cue" "duplicates" "edit" "embedart" + "export" "filefilter" "fish" "freedesktop" "fromfilename" "ftintitle" "fuzzy" "hook" "ihate" "importadded" "importfeeds" "info" "inline" "ipfs" "lyrics" - "mbcollection" "mbsubmit" "mbsync" "metasync" "missing" "permissions" "play" + "mbcollection" "mbsubmit" "mbsync" "metasync" "missing" "parentwork" "permissions" "play" "plexupdate" "random" "rewrite" "scrub" "smartplaylist" "spotify" "the" - "types" "zero" + "types" "unimported" "zero" ]; enabledOptionalPlugins = attrNames (filterAttrs (_: id) optionalPlugins); @@ -102,28 +112,33 @@ let enableAlternatives = false; enableCopyArtifacts = false; enableExtraFiles = false; - }).overrideAttrs (stdenv.lib.const { + }).overrideAttrs (const { doInstallCheck = false; }); pluginArgs = externalTestArgs // { inherit pythonPackages; }; plugins = { - alternatives = callPackage ./alternatives-plugin.nix pluginArgs; - check = callPackage ./check-plugin.nix pluginArgs; - copyartifacts = callPackage ./copyartifacts-plugin.nix pluginArgs; - extrafiles = callPackage ./extrafiles-plugin.nix pluginArgs; + alternatives = callPackage ./plugins/alternatives.nix pluginArgs; + check = callPackage ./plugins/check.nix pluginArgs; + copyartifacts = callPackage ./plugins/copyartifacts.nix pluginArgs; + extrafiles = callPackage ./plugins/extrafiles.nix pluginArgs; }; in pythonPackages.buildPythonApplication rec { pname = "beets"; - version = "1.4.9"; + # While there is a stable version, 1.4.9, it is more than 1000 commits behind + # master and lacks many bug fixes and improvements[1]. Also important, + # unstable does not require bs1770gain[2]. + # [1]: https://discourse.beets.io/t/forming-a-beets-core-team/639 + # [2]: https://github.com/NixOS/nixpkgs/pull/90504 + version = "unstable-2020-12-22"; src = fetchFromGitHub { owner = "beetbox"; repo = "beets"; - rev = "v${version}"; - sha256 = "1qxdqbzvz97zgykzdwn78g2xyxmg0q2jdb12dnjnrwvhmjv67vi8"; + rev = "53dcb24d10788897f20c341774b474808ec2c0b6"; + sha256 = "sha256-P++NA13T2TRHW3Se10np8BSe/WRBYAKRte5xKoHKW50="; }; propagatedBuildInputs = [ @@ -137,19 +152,25 @@ in pythonPackages.buildPythonApplication rec { pythonPackages.unidecode pythonPackages.gst-python pythonPackages.pygobject3 + pythonPackages.reflink + pythonPackages.confuse + pythonPackages.mediafile gobject-introspection ] ++ optional enableAbsubmit essentia-extractor ++ optional enableAcoustid pythonPackages.pyacoustid + ++ optional enableBeatport pythonPackages.requests_oauthlib ++ optional (enableFetchart + || enableDeezer || enableEmbyupdate || enableKodiupdate || enableLoadext || enablePlaylist + || enableSubsonicplaylist || enableSubsonicupdate || enableAcousticbrainz) pythonPackages.requests ++ optional enableCheck plugins.check - ++ optional enableConvert ffmpeg_3 + ++ optional enableConvert ffmpeg ++ optional enableDiscogs pythonPackages.discogs_client ++ optional enableGmusic pythonPackages.gmusicapi ++ optional enableKeyfinder keyfinder-cli @@ -187,41 +208,35 @@ in pythonPackages.buildPythonApplication rec { ]; patches = [ - ./replaygain-default-bs1770gain.patch + # Bash completion fix for Nix + ./bash-completion-always-print.patch + # From some reason upstream assumes the program 'keyfinder-cli' is located + # in the path as `KeyFinder` ./keyfinder-default-bin.patch - ./mutagen-1.43.patch - (fetchpatch { - # Fixes failing testcases around the werkzeug component; can dropped after 1.4.9 - url = "https://github.com/beetbox/beets/commit/d43d54e21cde97f57f19486925ab56b419254cc8.patch"; - sha256 = "13n2gzmcgfi0m2ycl2r1hpczgksplnkc3y6b66vg57rx5y8nnv5c"; + ] + # We need to force ffmpeg as the default, since we do not package + # bs1770gain, and set the absolute path there, to avoid impurities. + ++ lib.optional enableReplaygain (substituteAll { + src = ./replaygain-default-ffmpeg.patch; + ffmpeg = getBin ffmpeg; }) + # Put absolute Nix paths in place + ++ lib.optional enableConvert (substituteAll { + src = ./convert-plugin-ffmpeg-path.patch; + ffmpeg = getBin ffmpeg; + }) + ++ lib.optional enableBadfiles (substituteAll { + src = ./badfiles-plugin-nix-paths.patch; + inherit mp3val flac; + }) + ; - # Fixes 548 tests due to breaking changes to the ast module - # https://github.com/beetbox/beets/pull/3621 - # Can be dropped after 1.4.9 - ./compatibility-with-breaking-changes-to-the-ast-module.patch - ]; - + # Disable failing tests postPatch = '' sed -i -e '/assertIn.*item.*path/d' test/test_info.py echo echo completion tests passed > test/rsrc/test_completion.sh - sed -i -e '/^BASH_COMPLETION_PATHS *=/,/^])$/ { - /^])$/i u"${completion}" - }' beets/ui/commands.py - '' + optionalString enableBadfiles '' - sed -i -e '/self\.run_command(\[/ { - s,"flac","${flac.bin}/bin/flac", - s,"mp3val","${mp3val}/bin/mp3val", - }' beetsplug/badfiles.py - '' + optionalString enableConvert '' - sed -i -e 's,\(util\.command_output(\)\([^)]\+\)),\1[b"${ffmpeg_3.bin}/bin/ffmpeg" if args[0] == b"ffmpeg" else args[0]] + \2[1:]),' beetsplug/convert.py - '' + optionalString enableReplaygain '' - sed -i -re ' - s!^( *cmd *= *b?['\'''"])(bs1770gain['\'''"])!\1${bs1770gain}/bin/\2! - ' beetsplug/replaygain.py - sed -i -e 's/if has_program.*bs1770gain.*:/if True:/' \ - test/test_replaygain.py + sed -i -e 's/len(mf.images)/0/' test/test_zero.py ''; postInstall = '' @@ -281,7 +296,7 @@ in pythonPackages.buildPythonApplication rec { description = "Music tagger and library organizer"; homepage = "http://beets.io"; license = licenses.mit; - maintainers = with maintainers; [ aszlig domenkozar pjones ]; + maintainers = with maintainers; [ aszlig domenkozar doronbehar lovesegfault pjones ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/audio/beets/keyfinder-default-bin.patch b/pkgs/tools/audio/beets/keyfinder-default-bin.patch index 1ea195a678e8..ec6bc3a5561c 100644 --- a/pkgs/tools/audio/beets/keyfinder-default-bin.patch +++ b/pkgs/tools/audio/beets/keyfinder-default-bin.patch @@ -1,8 +1,8 @@ diff --git a/beetsplug/keyfinder.py b/beetsplug/keyfinder.py -index 34a4abc..59e8539 100644 +index 702003f0..08689cd8 100644 --- a/beetsplug/keyfinder.py +++ b/beetsplug/keyfinder.py -@@ -30,7 +30,7 @@ class KeyFinderPlugin(BeetsPlugin): +@@ -31,7 +31,7 @@ class KeyFinderPlugin(BeetsPlugin): def __init__(self): super(KeyFinderPlugin, self).__init__() self.config.add({ @@ -11,18 +11,8 @@ index 34a4abc..59e8539 100644 u'auto': True, u'overwrite': False, }) -@@ -59,8 +59,7 @@ class KeyFinderPlugin(BeetsPlugin): - continue - - try: -- output = util.command_output([bin, '-f', -- util.syspath(item.path)]) -+ output = util.command_output([bin, util.syspath(item.path)]) - except (subprocess.CalledProcessError, OSError) as exc: - self._log.error(u'execution failed: {0}', exc) - continue diff --git a/test/test_keyfinder.py b/test/test_keyfinder.py -index 57e2bcd..c1ee916 100644 +index c8735e47..d7d670a4 100644 --- a/test/test_keyfinder.py +++ b/test/test_keyfinder.py @@ -44,7 +44,7 @@ class KeyFinderTest(unittest.TestCase, TestHelper): @@ -31,6 +21,6 @@ index 57e2bcd..c1ee916 100644 command_output.assert_called_with( - ['KeyFinder', '-f', util.syspath(item.path)]) + ['keyfinder-cli', util.syspath(item.path)]) - + def test_add_key_on_import(self, command_output): - command_output.return_value = 'dbm' + command_output.return_value = util.CommandOutput(b"dbm", b"") diff --git a/pkgs/tools/audio/beets/mutagen-1.43.patch b/pkgs/tools/audio/beets/mutagen-1.43.patch deleted file mode 100644 index d0d448c15e9a..000000000000 --- a/pkgs/tools/audio/beets/mutagen-1.43.patch +++ /dev/null @@ -1,40 +0,0 @@ -Backport -https://github.com/beetbox/mediafile/commit/b3343c4ee08d1251ae5e2344401a2f5892b4e868 -https://github.com/beetbox/mediafile/commit/d2fc3b59f77c515b02dfe7ad936f89264375d2b4 -to Beets 1.4.9. - -diff --git i/setup.py w/setup.py -index 79278f8b..b8d60687 100755 ---- i/setup.py -+++ w/setup.py -@@ -87,7 +87,7 @@ setup( - - install_requires=[ - 'six>=1.9', -- 'mutagen>=1.33', -+ 'mutagen>=1.43', - 'unidecode', - 'musicbrainzngs>=0.4', - 'pyyaml', -diff --git i/test/test_mediafile.py w/test/test_mediafile.py -index 36a2c53a..0ddde44e 100644 ---- i/test/test_mediafile.py -+++ w/test/test_mediafile.py -@@ -888,7 +888,7 @@ class WavpackTest(ReadWriteTestBase, unittest.TestCase): - 'bitrate': 109312, - 'format': u'WavPack', - 'samplerate': 44100, -- 'bitdepth': 0, -+ 'bitdepth': 16, - 'channels': 1, - } - -@@ -912,7 +912,7 @@ class AIFFTest(ReadWriteTestBase, unittest.TestCase): - 'bitrate': 705600, - 'format': u'AIFF', - 'samplerate': 44100, -- 'bitdepth': 0, -+ 'bitdepth': 16, - 'channels': 1, - } - diff --git a/pkgs/tools/audio/beets/alternatives-plugin.nix b/pkgs/tools/audio/beets/plugins/alternatives.nix similarity index 100% rename from pkgs/tools/audio/beets/alternatives-plugin.nix rename to pkgs/tools/audio/beets/plugins/alternatives.nix diff --git a/pkgs/tools/audio/beets/beet-check-tests.patch b/pkgs/tools/audio/beets/plugins/check-tests.patch similarity index 100% rename from pkgs/tools/audio/beets/beet-check-tests.patch rename to pkgs/tools/audio/beets/plugins/check-tests.patch diff --git a/pkgs/tools/audio/beets/check-plugin.nix b/pkgs/tools/audio/beets/plugins/check.nix similarity index 89% rename from pkgs/tools/audio/beets/check-plugin.nix rename to pkgs/tools/audio/beets/plugins/check.nix index 241dcdad4521..545e6d7cf2c7 100644 --- a/pkgs/tools/audio/beets/check-plugin.nix +++ b/pkgs/tools/audio/beets/plugins/check.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, beets, pythonPackages, flac, liboggz, mp3val }: +{ lib, stdenv, fetchFromGitHub, beets, pythonPackages, flac, liboggz, mp3val }: pythonPackages.buildPythonApplication rec { name = "beets-check"; @@ -26,7 +26,7 @@ pythonPackages.buildPythonApplication rec { checkPhase = "nosetests"; - meta = with stdenv.lib; { + meta = with lib; { description = "Beets plugin to Verify and store checksums in your library"; homepage = "https://github.com/geigerzaehler/beets-check"; license = licenses.mit; diff --git a/pkgs/tools/audio/beets/copyartifacts-plugin.nix b/pkgs/tools/audio/beets/plugins/copyartifacts.nix similarity index 100% rename from pkgs/tools/audio/beets/copyartifacts-plugin.nix rename to pkgs/tools/audio/beets/plugins/copyartifacts.nix diff --git a/pkgs/tools/audio/beets/extrafiles-plugin.nix b/pkgs/tools/audio/beets/plugins/extrafiles.nix similarity index 100% rename from pkgs/tools/audio/beets/extrafiles-plugin.nix rename to pkgs/tools/audio/beets/plugins/extrafiles.nix diff --git a/pkgs/tools/audio/beets/replaygain-default-bs1770gain.patch b/pkgs/tools/audio/beets/replaygain-default-bs1770gain.patch deleted file mode 100644 index 538f9e933039..000000000000 --- a/pkgs/tools/audio/beets/replaygain-default-bs1770gain.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/beetsplug/replaygain.py b/beetsplug/replaygain.py -index 40b3a3a..9b54a5a 100644 ---- a/beetsplug/replaygain.py -+++ b/beetsplug/replaygain.py -@@ -627,11 +627,10 @@ class ReplayGainPlugin(BeetsPlugin): - super(ReplayGainPlugin, self).__init__() - self.import_stages = [self.imported] - -- # default backend is 'command' for backward-compatibility. - self.config.add({ - 'overwrite': False, - 'auto': True, -- 'backend': u'command', -+ 'backend': u'bs1770gain', - 'targetlevel': 89, - }) - diff --git a/pkgs/tools/audio/beets/replaygain-default-ffmpeg.patch b/pkgs/tools/audio/beets/replaygain-default-ffmpeg.patch new file mode 100644 index 000000000000..0ceba3c09442 --- /dev/null +++ b/pkgs/tools/audio/beets/replaygain-default-ffmpeg.patch @@ -0,0 +1,26 @@ +diff --git i/beetsplug/replaygain.py w/beetsplug/replaygain.py +index 9d6fa23c..c5800039 100644 +--- i/beetsplug/replaygain.py ++++ w/beetsplug/replaygain.py +@@ -391,7 +391,7 @@ class FfmpegBackend(Backend): + + def __init__(self, config, log): + super(FfmpegBackend, self).__init__(config, log) +- self._ffmpeg_path = "ffmpeg" ++ self._ffmpeg_path = "@ffmpeg@/bin/ffmpeg" + + # check that ffmpeg is installed + try: +@@ -1228,11 +1228,10 @@ class ReplayGainPlugin(BeetsPlugin): + def __init__(self): + super(ReplayGainPlugin, self).__init__() + +- # default backend is 'command' for backward-compatibility. + self.config.add({ + 'overwrite': False, + 'auto': True, +- 'backend': u'command', ++ 'backend': u'ffmpeg', + 'threads': cpu_count(), + 'parallel_on_import': False, + 'per_disc': False, diff --git a/pkgs/tools/audio/bpm-tools/default.nix b/pkgs/tools/audio/bpm-tools/default.nix index 6207cbeb9fe6..afd5785f3cff 100644 --- a/pkgs/tools/audio/bpm-tools/default.nix +++ b/pkgs/tools/audio/bpm-tools/default.nix @@ -1,5 +1,5 @@ { - stdenv, + lib, stdenv, fetchurl, gnuplot, sox, @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/bpm-graph --prefix PATH : "${path}" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.pogo.org.uk/~mark/bpm-tools/"; description = "Automatically calculate BPM (tempo) of music files"; license = licenses.gpl2; diff --git a/pkgs/tools/audio/dir2opus/default.nix b/pkgs/tools/audio/dir2opus/default.nix index 872006547031..d23c334ad62f 100644 --- a/pkgs/tools/audio/dir2opus/default.nix +++ b/pkgs/tools/audio/dir2opus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python, mutagen, wrapPython, opusTools, mpg123 }: +{ lib, stdenv, fetchurl, python, mutagen, wrapPython, opusTools, mpg123 }: let version = "0.12.2"; in stdenv.mkDerivation rec { @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { postFixup = "wrapPythonPrograms"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/ehmry/dir2opus"; maintainers = [ maintainers.ehmry ]; license = licenses.gpl2; diff --git a/pkgs/tools/audio/essentia-extractor/default.nix b/pkgs/tools/audio/essentia-extractor/default.nix index 0d2bb17a75d4..a02cca6a3d65 100644 --- a/pkgs/tools/audio/essentia-extractor/default.nix +++ b/pkgs/tools/audio/essentia-extractor/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: let arch_table = { "x86_64-linux" = "linux-x86_64"; @@ -31,7 +31,7 @@ in stdenv.mkDerivation rec { cp streaming_extractor_music $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://acousticbrainz.org/download"; description = "AcousticBrainz audio feature extractor"; license = licenses.agpl3Plus; diff --git a/pkgs/tools/audio/ezstream/default.nix b/pkgs/tools/audio/ezstream/default.nix index 499f9842852f..0befbaceb018 100644 --- a/pkgs/tools/audio/ezstream/default.nix +++ b/pkgs/tools/audio/ezstream/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libiconv, libshout, taglib, libxml2, pkgconfig }: +{ lib, stdenv, fetchurl, libiconv, libshout, taglib, libxml2, pkgconfig }: stdenv.mkDerivation rec { pname = "ezstream"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A command line source client for Icecast media streaming servers"; longDescription = '' Ezstream is a command line source client for Icecast media diff --git a/pkgs/tools/audio/glyr/default.nix b/pkgs/tools/audio/glyr/default.nix index 41490381487e..c50913eb22a9 100644 --- a/pkgs/tools/audio/glyr/default.nix +++ b/pkgs/tools/audio/glyr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake +{ lib, stdenv, fetchFromGitHub, cmake , curl, glib, sqlite, pkgconfig }: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ sqlite glib curl ]; - meta = with stdenv.lib; { + meta = with lib; { license = licenses.lgpl3; description = "A music related metadata searchengine"; homepage = "https://github.com/sahib/glyr"; diff --git a/pkgs/tools/audio/google-music-scripts/default.nix b/pkgs/tools/audio/google-music-scripts/default.nix index 272cf9025392..481a7ecb75b3 100644 --- a/pkgs/tools/audio/google-music-scripts/default.nix +++ b/pkgs/tools/audio/google-music-scripts/default.nix @@ -26,11 +26,11 @@ buildPythonApplication rec { sha256 = "0apwgj86whrc077dfymvyb4qwj19bawyrx49g4kg364895v0rbbq"; }; - # pendulum pinning was to prevent PEP517 from trying to build from source + # there are already later releases present postPatch = '' substituteInPlace setup.py \ --replace "tomlkit>=0.5,<0.6" "tomlkit" \ - --replace "pendulum>=2.0,<=3.0,!=2.0.5,!=2.1.0" "pendulum" + --replace "attrs>=18.2,<19.4" "attrs" ''; propagatedBuildInputs = [ diff --git a/pkgs/tools/audio/kaldi/default.nix b/pkgs/tools/audio/kaldi/default.nix new file mode 100644 index 000000000000..2d61a984a00d --- /dev/null +++ b/pkgs/tools/audio/kaldi/default.nix @@ -0,0 +1,88 @@ +{ lib, stdenv +, openblas +, blas +, lapack +, openfst +, icu +, cmake +, pkg-config +, fetchFromGitHub +, git +, python3 +}: + +assert blas.implementation == "openblas" && lapack.implementation == "openblas"; +let + # rev from https://github.com/kaldi-asr/kaldi/blob/master/cmake/third_party/openfst.cmake + openfst = fetchFromGitHub { + owner = "kkm000"; + repo = "openfst"; + rev = "0bca6e76d24647427356dc242b0adbf3b5f1a8d9"; + sha256 = "1802rr14a03zl1wa5a0x1fa412kcvbgprgkadfj5s6s3agnn11rx"; + }; +in +stdenv.mkDerivation { + pname = "kaldi"; + version = "2020-12-26"; + + src = fetchFromGitHub { + owner = "kaldi-asr"; + repo = "kaldi"; + rev = "813b73185a18725e4f6021981d17221d6ee23a19"; + sha256 = "sha256-lTqXTG5ZTPmhCgt+BVzOwjKEIj+bLGUa+IxJq+XtHUg="; + }; + + cmakeFlags = [ + "-DKALDI_BUILD_TEST=off" + "-DBUILD_SHARED_LIBS=on" + ]; + + preConfigure = '' + mkdir bin + cat > bin/git <<'EOF' + #!${stdenv.shell} + if [[ "$1" == "--version" ]]; then + # cmake checks this + ${git}/bin/git --version + elif [[ "$1" == "clone" ]]; then + # mock this call: + + # https://github.com/kaldi-asr/kaldi/blob/c9d8b9ad3fef89237ba5517617d977b7d70a7ed5/cmake/third_party/openfst.cmake#L5 + cp -r ${openfst} ''${@: -1} + chmod -R +w ''${@: -1} + elif [[ "$1" == "rev-list" ]]; then + # fix up this call: + # https://github.com/kaldi-asr/kaldi/blob/c9d8b9ad3fef89237ba5517617d977b7d70a7ed5/cmake/VersionHelper.cmake#L8 + echo 0 + fi + true + EOF + chmod +x bin/git + export PATH=$(pwd)/bin:$PATH + ''; + + buildInputs = [ + openblas + openfst + icu + ]; + + nativeBuildInputs = [ + cmake + pkg-config + python3 + ]; + + postInstall = '' + mkdir -p $out/share/kaldi + cp -r ../egs $out/share/kaldi + ''; + + meta = with lib; { + description = "Speech Recognition Toolkit"; + homepage = "https://kaldi-asr.org"; + license = licenses.mit; + maintainers = with maintainers; [ mic92 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/audio/liquidsoap/full.nix b/pkgs/tools/audio/liquidsoap/full.nix index a228c23651db..84750bb2358d 100644 --- a/pkgs/tools/audio/liquidsoap/full.nix +++ b/pkgs/tools/audio/liquidsoap/full.nix @@ -1,4 +1,4 @@ -{ stdenv, makeWrapper, fetchurl, which, pkgconfig +{ lib, stdenv, makeWrapper, fetchurl, which, pkgconfig , ocamlPackages , libao, portaudio, alsaLib, libpulseaudio, libjack2 , libsamplerate, libmad, taglib, lame, libogg @@ -64,7 +64,7 @@ stdenv.mkDerivation { hardeningDisable = [ "format" "fortify" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Swiss-army knife for multimedia streaming"; homepage = "https://www.liquidsoap.info/"; maintainers = with maintainers; [ ehmry ]; diff --git a/pkgs/tools/audio/midicsv/default.nix b/pkgs/tools/audio/midicsv/default.nix index e5f3f6124b9b..f02f6ed956d6 100644 --- a/pkgs/tools/audio/midicsv/default.nix +++ b/pkgs/tools/audio/midicsv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "midicsv-1.1"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { substituteInPlace Makefile --replace /usr/local $out ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Losslessly translate MIDI to CSV and back"; homepage = "http://www.fourmilab.ch/webtools/midicsv/"; license = licenses.publicDomain; diff --git a/pkgs/tools/audio/mididings/default.nix b/pkgs/tools/audio/mididings/default.nix index addb95b9f1bd..ccaa01412312 100644 --- a/pkgs/tools/audio/mididings/default.nix +++ b/pkgs/tools/audio/mididings/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pythonPackages, fetchFromGitHub, pkg-config, glib, alsaLib, libjack2 }: +{ lib, stdenv, pythonPackages, fetchFromGitHub, pkg-config, glib, alsaLib, libjack2 }: pythonPackages.buildPythonApplication { version = "2015-11-17"; @@ -28,7 +28,7 @@ pythonPackages.buildPythonApplication { --replace boost_python "boost_python${major pythonPackages.python.version}${minor pythonPackages.python.version}" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A MIDI router and processor based on Python, supporting ALSA and JACK MIDI"; homepage = "http://das.nasophon.de/mididings"; license = licenses.gpl2; diff --git a/pkgs/tools/audio/mp3cat/default.nix b/pkgs/tools/audio/mp3cat/default.nix index e7a1d004a019..dbcc458164de 100644 --- a/pkgs/tools/audio/mp3cat/default.nix +++ b/pkgs/tools/audio/mp3cat/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "mp3cat"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { "install_bin" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A command line program which concatenates MP3 files"; longDescription = '' A command line program which concatenates MP3 files, mp3cat diff --git a/pkgs/tools/audio/mpd-mpris/default.nix b/pkgs/tools/audio/mpd-mpris/default.nix index c66a12dadd3a..801058e0496b 100644 --- a/pkgs/tools/audio/mpd-mpris/default.nix +++ b/pkgs/tools/audio/mpd-mpris/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "mpd-mpris"; @@ -24,7 +24,7 @@ buildGoModule rec { cp mpd-mpris.service $out/lib/systemd/user ''; - meta = with stdenv.lib; { + meta = with lib; { description = "An implementation of the MPRIS protocol for MPD"; homepage = "https://github.com/natsukagami/mpd-mpris"; license = licenses.mit; diff --git a/pkgs/tools/audio/mpdas/default.nix b/pkgs/tools/audio/mpdas/default.nix index 507e62b0dae9..d4be0550e184 100644 --- a/pkgs/tools/audio/mpdas/default.nix +++ b/pkgs/tools/audio/mpdas/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, mpd_clientlib, curl }: +{ lib, stdenv, fetchFromGitHub, pkgconfig, mpd_clientlib, curl }: stdenv.mkDerivation rec { pname = "mpdas"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { makeFlags = [ "CONFIG=/etc" "DESTDIR=" "PREFIX=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Music Player Daemon AudioScrobbler"; homepage = "https://50hz.ws/mpdas/"; license = licenses.bsd3; diff --git a/pkgs/tools/audio/mpdcron/default.nix b/pkgs/tools/audio/mpdcron/default.nix index c083c60a9625..13303ef58e19 100644 --- a/pkgs/tools/audio/mpdcron/default.nix +++ b/pkgs/tools/audio/mpdcron/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, glib, libdaemon +{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, glib, libdaemon , mpd_clientlib, curl, sqlite, bundlerEnv, libnotify, pandoc }: let @@ -17,7 +17,7 @@ in stdenv.mkDerivation { sha256 = "0vdksf6lcgmizqr5mqp0bbci259k0dj7gpmhx32md41jlmw5skaw"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A cron like daemon for mpd"; homepage = "http://alip.github.io/mpdcron/"; license = licenses.gpl2; diff --git a/pkgs/tools/audio/mpdris2/default.nix b/pkgs/tools/audio/mpdris2/default.nix index 029dcd127f13..30b0d90f5623 100644 --- a/pkgs/tools/audio/mpdris2/default.nix +++ b/pkgs/tools/audio/mpdris2/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , autoreconfHook , fetchFromGitHub , glib @@ -45,7 +45,7 @@ python3.pkgs.buildPythonApplication rec { pygobject3 ]; - meta = with stdenv.lib; { + meta = with lib; { description = "MPRIS 2 support for mpd"; homepage = "https://github.com/eonpatapon/mpDris2/"; license = licenses.gpl3; diff --git a/pkgs/tools/audio/mpris-scrobbler/default.nix b/pkgs/tools/audio/mpris-scrobbler/default.nix new file mode 100644 index 000000000000..911dbf752029 --- /dev/null +++ b/pkgs/tools/audio/mpris-scrobbler/default.nix @@ -0,0 +1,60 @@ +{ lib, stdenv +, fetchFromGitHub +, nix-update-script +, curl +, dbus +, libevent +, m4 +, meson +, ninja +, pkg-config +, scdoc +, json_c +, xdg_utils +}: + +stdenv.mkDerivation rec { + pname = "mpris-scrobbler"; + version = "0.4.0.1"; + + src = fetchFromGitHub { + owner = "mariusor"; + repo = "mpris-scrobbler"; + rev = "v${version}"; + sha256 = "0jzmgcb9a19hl8y7iwy8l3cc2vgzi0scw7r5q72kszfyxn0yk2gs"; + }; + + postPatch = '' + substituteInPlace src/signon.c \ + --replace "/usr/bin/xdg-open" "${xdg_utils}/bin/xdg-open" + ''; + + nativeBuildInputs = [ + m4 + meson + ninja + pkg-config + scdoc + ]; + + buildInputs = [ + curl + dbus + json_c + libevent + ]; + + passthru = { + updateScript = nix-update-script { + attrPath = pname; + }; + }; + + meta = with lib; { + description = "Minimalistic scrobbler for libre.fm & last.fm"; + homepage = "https://github.com/mariusor/mpris-scrobbler"; + license = licenses.mit; + maintainers = with maintainers; [ emantor ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/audio/opl3bankeditor/default.nix b/pkgs/tools/audio/opl3bankeditor/default.nix index 381591edb021..c79204cffa2a 100644 --- a/pkgs/tools/audio/opl3bankeditor/default.nix +++ b/pkgs/tools/audio/opl3bankeditor/default.nix @@ -1,4 +1,4 @@ -{ stdenv, mkDerivation, fetchFromGitHub, cmake, qttools, alsaLib }: +{ lib, stdenv, mkDerivation, fetchFromGitHub, cmake, qttools, alsaLib }: mkDerivation rec { version = "1.5.1"; @@ -17,7 +17,7 @@ mkDerivation rec { ]; nativeBuildInputs = [ cmake ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A small cross-platform editor of the OPL3 FM banks of different formats"; homepage = src.meta.homepage; license = licenses.gpl3; diff --git a/pkgs/tools/audio/pa-applet/default.nix b/pkgs/tools/audio/pa-applet/default.nix index 69e5976e6d5e..89761cd0d4b9 100644 --- a/pkgs/tools/audio/pa-applet/default.nix +++ b/pkgs/tools/audio/pa-applet/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, libpulseaudio, pkgconfig, gtk3, glibc, autoconf, automake, libnotify, libX11, xf86inputevdev }: +{ lib, stdenv, fetchgit, libpulseaudio, pkgconfig, gtk3, glibc, autoconf, automake, libnotify, libX11, xf86inputevdev }: stdenv.mkDerivation { name = "pa-applet-2012-04-11"; @@ -24,7 +24,7 @@ stdenv.mkDerivation { postInstall = '' ''; - meta = with stdenv.lib; { + meta = with lib; { description = ""; license = licenses.gpl2; maintainers = with maintainers; [ domenkozar ]; diff --git a/pkgs/tools/audio/pasystray/default.nix b/pkgs/tools/audio/pasystray/default.nix index d80f1af4182a..ba61c4ad9f9e 100644 --- a/pkgs/tools/audio/pasystray/default.nix +++ b/pkgs/tools/audio/pasystray/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchpatch, fetchFromGitHub, pkgconfig, autoreconfHook, wrapGAppsHook +{ lib, stdenv, fetchpatch, fetchFromGitHub, pkgconfig, autoreconfHook, wrapGAppsHook , gnome3, avahi, gtk3, libayatana-appindicator-gtk3, libnotify, libpulseaudio , xlibsWrapper, gsettings-desktop-schemas }: @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { gsettings-desktop-schemas ]; - meta = with stdenv.lib; { + meta = with lib; { description = "PulseAudio system tray"; homepage = "https://github.com/christophgysin/pasystray"; license = licenses.lgpl21Plus; diff --git a/pkgs/tools/audio/playerctl/default.nix b/pkgs/tools/audio/playerctl/default.nix index 7ef9557b42aa..7c583f4f1f9f 100644 --- a/pkgs/tools/audio/playerctl/default.nix +++ b/pkgs/tools/audio/playerctl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, meson, ninja, fetchFromGitHub, glib, pkgconfig, gtk-doc, docbook_xsl, gobject-introspection }: +{ lib, stdenv, meson, ninja, fetchFromGitHub, glib, pkgconfig, gtk-doc, docbook_xsl, gobject-introspection }: stdenv.mkDerivation rec { pname = "playerctl"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dbash-completions=true" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Command-line utility and library for controlling media players that implement MPRIS"; homepage = "https://github.com/acrisci/playerctl"; license = licenses.lgpl3; diff --git a/pkgs/tools/audio/pnmixer/default.nix b/pkgs/tools/audio/pnmixer/default.nix index c1e40ae5dbb9..f16a7764e6c8 100644 --- a/pkgs/tools/audio/pnmixer/default.nix +++ b/pkgs/tools/audio/pnmixer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, gettext, alsaLib, gtk3, glib, libnotify, libX11, pcre }: +{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, gettext, alsaLib, gtk3, glib, libnotify, libX11, pcre }: stdenv.mkDerivation rec { pname = "pnmixer"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ alsaLib gtk3 glib libnotify libX11 pcre ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/nicklan/pnmixer"; description = "ALSA volume mixer for the system tray"; license = licenses.gpl3; diff --git a/pkgs/tools/audio/pulsemixer/default.nix b/pkgs/tools/audio/pulsemixer/default.nix index b735c40031f6..e6fc0c03e898 100644 --- a/pkgs/tools/audio/pulsemixer/default.nix +++ b/pkgs/tools/audio/pulsemixer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python3, libpulseaudio }: +{ lib, stdenv, fetchFromGitHub, python3, libpulseaudio }: stdenv.mkDerivation rec { pname = "pulsemixer"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { --replace "libpulse.so.0" "$libpulseaudio/lib/libpulse.so.0" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Cli and curses mixer for pulseaudio"; homepage = "https://github.com/GeorgeFilipkin/pulsemixer"; license = licenses.mit; diff --git a/pkgs/tools/audio/trx/default.nix b/pkgs/tools/audio/trx/default.nix index 6a23b6caead4..c7445f03fd37 100644 --- a/pkgs/tools/audio/trx/default.nix +++ b/pkgs/tools/audio/trx/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, libopus, ortp, bctoolbox }: +{ lib, stdenv, fetchurl, alsaLib, libopus, ortp, bctoolbox }: stdenv.mkDerivation rec { pname = "trx"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ alsaLib libopus ortp bctoolbox ]; makeFlags = [ "PREFIX=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A simple toolset for broadcasting live audio using RTP/UDP and Opus"; homepage = "http://www.pogo.org.uk/~mark/trx/"; license = licenses.gpl2; diff --git a/pkgs/tools/audio/video2midi/default.nix b/pkgs/tools/audio/video2midi/default.nix index cf9297119e9f..3ce76fb61fae 100644 --- a/pkgs/tools/audio/video2midi/default.nix +++ b/pkgs/tools/audio/video2midi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pythonPackages, opencv3 }: +{ lib, stdenv, fetchFromGitHub, pythonPackages, opencv3 }: let opencv3_ = pythonPackages.toPythonModule (opencv3.override { @@ -25,7 +25,7 @@ in pythonPackages.buildPythonApplication rec { install -Dm755 v2m.py $out/bin/v2m.py ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Youtube synthesia video to midi conversion tool"; homepage = src.meta.homepage; license = licenses.gpl3; diff --git a/pkgs/tools/audio/volctl/default.nix b/pkgs/tools/audio/volctl/default.nix index 1965fb083169..06b6079bde24 100644 --- a/pkgs/tools/audio/volctl/default.nix +++ b/pkgs/tools/audio/volctl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python3Packages, fetchFromGitHub, wrapGAppsHook, gobject-introspection, libpulseaudio, glib, gtk3, pango, xorg }: +{ lib, stdenv, python3Packages, fetchFromGitHub, wrapGAppsHook, gobject-introspection, libpulseaudio, glib, gtk3, pango, xorg }: python3Packages.buildPythonApplication rec { pname = "volctl"; @@ -46,7 +46,7 @@ python3Packages.buildPythonApplication rec { gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : "${libpulseaudio}/lib") ''; - meta = with stdenv.lib; { + meta = with lib; { description = "PulseAudio enabled volume control featuring per-app sliders"; homepage = "https://buzz.github.io/volctl/"; license = licenses.gpl2; diff --git a/pkgs/tools/audio/volumeicon/default.nix b/pkgs/tools/audio/volumeicon/default.nix index 50290881dc77..3628433121e2 100644 --- a/pkgs/tools/audio/volumeicon/default.nix +++ b/pkgs/tools/audio/volumeicon/default.nix @@ -1,4 +1,4 @@ -{ pkgs, fetchurl, stdenv, gtk3, pkgconfig, intltool, alsaLib }: +{ pkgs, fetchurl, lib, stdenv, gtk3, pkgconfig, intltool, alsaLib }: stdenv.mkDerivation { pname = "volumeicon"; @@ -12,7 +12,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gtk3 intltool alsaLib ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A lightweight volume control that sits in your systray"; homepage = "http://softwarebakery.com/maato/volumeicon.html"; platforms = pkgs.lib.platforms.linux; diff --git a/pkgs/tools/backup/automysqlbackup/default.nix b/pkgs/tools/backup/automysqlbackup/default.nix index acdf31e47d8c..b3b6e40997cc 100644 --- a/pkgs/tools/backup/automysqlbackup/default.nix +++ b/pkgs/tools/backup/automysqlbackup/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, mysql, mailutils, pbzip2, pigz, bzip2, gzip }: +{ lib, stdenv, fetchurl, makeWrapper, mysql, mailutils, pbzip2, pigz, bzip2, gzip }: stdenv.mkDerivation rec { pname = "automysqlbackup"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/automysqlbackup --prefix PATH : ${stdenv.lib.makeBinPath [ mysql mailutils pbzip2 pigz bzip2 gzip ]} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A script to run daily, weekly and monthly backups for your MySQL database"; homepage = "https://sourceforge.net/projects/automysqlbackup/"; platforms = platforms.linux; diff --git a/pkgs/tools/backup/bacula/default.nix b/pkgs/tools/backup/bacula/default.nix index 823fd000aee3..23036596c977 100644 --- a/pkgs/tools/backup/bacula/default.nix +++ b/pkgs/tools/backup/bacula/default.nix @@ -1,13 +1,14 @@ -{ stdenv, fetchurl, sqlite, postgresql, zlib, acl, ncurses, openssl, readline +{ lib, stdenv, fetchurl, sqlite, postgresql, zlib, acl, ncurses, openssl, readline , CoreFoundation, IOKit }: stdenv.mkDerivation rec { - name = "bacula-9.6.6"; + pname = "bacula"; + version = "11.0.0"; src = fetchurl { - url = "mirror://sourceforge/bacula/${name}.tar.gz"; - sha256 = "10c25igfvff09nz5ll8rxc46f659rnwimj1v9cdhr67lwdswk1k2"; + url = "mirror://sourceforge/bacula/${pname}-${version}.tar.gz"; + sha256 = "JmBTwI/wUEytkhu0SYbTX6/dDQG6xvN2odEYTVpztok="; }; buildInputs = [ postgresql sqlite zlib ncurses openssl readline ] @@ -36,10 +37,10 @@ stdenv.mkDerivation rec { ln -s $out/sbin/* $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Enterprise ready, Network Backup Tool"; homepage = "http://bacula.org/"; - license = licenses.gpl2; + license = with licenses; [ agpl3Only bsd2 ]; maintainers = with maintainers; [ domenkozar lovek323 eleanor ]; platforms = platforms.all; }; diff --git a/pkgs/tools/backup/bareos/default.nix b/pkgs/tools/backup/bareos/default.nix index 53de4853c627..90fb2f4c4a49 100644 --- a/pkgs/tools/backup/bareos/default.nix +++ b/pkgs/tools/backup/bareos/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, nettools, gettext, flex +{ lib, stdenv, fetchFromGitHub, pkgconfig, nettools, gettext, flex , readline ? null, openssl ? null, python2 ? null, ncurses ? null, rocksdb , sqlite ? null, postgresql ? null, libmysqlclient ? null, zlib ? null, lzo ? null , jansson ? null, acl ? null, glusterfs ? null, libceph ? null, libcap ? null @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { "sbindir=\${out}/bin" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.bareos.org/"; description = "A fork of the bacula project"; license = licenses.agpl3; diff --git a/pkgs/tools/backup/bdsync/default.nix b/pkgs/tools/backup/bdsync/default.nix index be2e9d0e6f21..0112ad4c9a19 100644 --- a/pkgs/tools/backup/bdsync/default.nix +++ b/pkgs/tools/backup/bdsync/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , openssl , pandoc , which @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { install -Dm644 bdsync.1 -t $out/share/man/man1/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Fast block device synchronizing tool"; homepage = "https://github.com/TargetHolding/bdsync"; license = licenses.gpl2; diff --git a/pkgs/tools/backup/borg/default.nix b/pkgs/tools/backup/borg/default.nix index f7d9896431ca..121900f76f51 100644 --- a/pkgs/tools/backup/borg/default.nix +++ b/pkgs/tools/backup/borg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python3, acl, libb2, lz4, zstd, openssl, openssh }: +{ lib, stdenv, python3, acl, libb2, lz4, zstd, openssl, openssh }: python3.pkgs.buildPythonApplication rec { pname = "borgbackup"; @@ -61,7 +61,7 @@ python3.pkgs.buildPythonApplication rec { # 64 failures, needs pytest-benchmark doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Deduplicating archiver with compression and encryption"; homepage = "https://www.borgbackup.org"; license = licenses.bsd3; diff --git a/pkgs/tools/backup/btrbk/default.nix b/pkgs/tools/backup/btrbk/default.nix index 6e450b11aa2b..db6946e88057 100644 --- a/pkgs/tools/backup/btrbk/default.nix +++ b/pkgs/tools/backup/btrbk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, coreutils, bash, btrfs-progs, openssh, perl, perlPackages +{ lib, stdenv, fetchurl, coreutils, bash, btrfs-progs, openssh, perl, perlPackages , util-linux, asciidoc, asciidoctor, mbuffer, makeWrapper }: stdenv.mkDerivation rec { @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { --prefix PATH ':' "${stdenv.lib.makeBinPath [ btrfs-progs bash mbuffer openssh ]}" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A backup tool for btrfs subvolumes"; homepage = "https://digint.ch/btrbk"; license = licenses.gpl3; diff --git a/pkgs/tools/backup/bupstash/default.nix b/pkgs/tools/backup/bupstash/default.nix new file mode 100644 index 000000000000..9801d8ded9c4 --- /dev/null +++ b/pkgs/tools/backup/bupstash/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchFromGitHub, installShellFiles, rustPlatform, ronn, pkg-config, libsodium }: +rustPlatform.buildRustPackage rec { + pname = "bupstash"; + version = "0.6.4"; + + src = fetchFromGitHub { + owner = "andrewchambers"; + repo = pname; + rev = "v${version}"; + sha256 = "013k8pr4865f5rp66fjf3a8069kmd29brxv0l20z571gy2kxs5p9"; + }; + + cargoSha256 = "17cdi93q71wsqqfkpz6mxcaqqhqclsbns0g1r9mni39nikw7amv1"; + + nativeBuildInputs = [ ronn pkg-config installShellFiles ]; + buildInputs = [ libsodium ]; + + postBuild = '' + RUBYOPT="-KU -E utf-8:utf-8" ronn doc/man/*.md + ''; + + postInstall = '' + installManPage doc/man/*.[1-9] + ''; + + meta = with stdenv.lib; { + description = "Easy and efficient encrypted backups"; + homepage = "https://bupstash.io"; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ andrewchambers ]; + }; +} diff --git a/pkgs/tools/backup/burp/default.nix b/pkgs/tools/backup/burp/default.nix index d9b4df98790e..0da366b58eb1 100644 --- a/pkgs/tools/backup/burp/default.nix +++ b/pkgs/tools/backup/burp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig , acl, librsync, ncurses, openssl, zlib, uthash }: stdenv.mkDerivation rec { @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { installFlags = [ "localstatedir=/tmp" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "BURP - BackUp and Restore Program"; homepage = "https://burp.grke.org"; license = licenses.agpl3; diff --git a/pkgs/tools/backup/dedup/default.nix b/pkgs/tools/backup/dedup/default.nix index db9a05fcfde6..db7d24b7d85d 100644 --- a/pkgs/tools/backup/dedup/default.nix +++ b/pkgs/tools/backup/dedup/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, lz4, snappy, libsodium +{ lib, stdenv, fetchurl, lz4, snappy, libsodium # For testing , coreutils, gawk }: @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { checkInputs = [ coreutils gawk ]; checkTarget = "test"; - meta = with stdenv.lib; { + meta = with lib; { description = "Data deduplication program"; homepage = "https://git.2f30.org/dedup/file/README.html"; license = with licenses; [ bsd0 isc ]; diff --git a/pkgs/tools/backup/dirvish/default.nix b/pkgs/tools/backup/dirvish/default.nix index c762da1a5fcb..701ac2333de9 100644 --- a/pkgs/tools/backup/dirvish/default.nix +++ b/pkgs/tools/backup/dirvish/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, makeWrapper, perl, perlPackages }: +{ fetchurl, lib, stdenv, makeWrapper, perl, perlPackages }: stdenv.mkDerivation rec { name = "dirvish-1.2.1"; @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Fast, disk based, rotating network backup system"; homepage = "http://dirvish.org/"; license = stdenv.lib.licenses.osl2; diff --git a/pkgs/tools/backup/diskrsync/default.nix b/pkgs/tools/backup/diskrsync/default.nix index 1057eb71dd60..d70efa1d2248 100644 --- a/pkgs/tools/backup/diskrsync/default.nix +++ b/pkgs/tools/backup/diskrsync/default.nix @@ -1,4 +1,4 @@ -{ buildGoPackage, fetchFromGitHub, stdenv, openssh, makeWrapper }: +{ buildGoPackage, fetchFromGitHub, lib, stdenv, openssh, makeWrapper }: buildGoPackage rec { pname = "diskrsync"; @@ -20,7 +20,7 @@ buildGoPackage rec { wrapProgram "$out/bin/diskrsync" --argv0 diskrsync --prefix PATH : ${openssh}/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Rsync for block devices and disk images"; homepage = "https://github.com/dop251/diskrsync"; license = licenses.mit; diff --git a/pkgs/tools/backup/dump/default.nix b/pkgs/tools/backup/dump/default.nix index 38564e109d1c..8299b7653f01 100644 --- a/pkgs/tools/backup/dump/default.nix +++ b/pkgs/tools/backup/dump/default.nix @@ -1,7 +1,7 @@ # Tested with simple dump and restore -i, but complains that # /nix/store/.../etc/dumpdates doesn't exist. -{ stdenv, fetchurl, pkgconfig, +{ lib, stdenv, fetchurl, pkgconfig, e2fsprogs, ncurses, readline }: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ e2fsprogs pkgconfig ncurses readline ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://dump.sourceforge.io/"; description = "Linux Ext2 filesystem dump/restore utilities"; license = licenses.bsd3; diff --git a/pkgs/tools/backup/duplicati/default.nix b/pkgs/tools/backup/duplicati/default.nix index 63f35538796a..502c8c713536 100644 --- a/pkgs/tools/backup/duplicati/default.nix +++ b/pkgs/tools/backup/duplicati/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, mono, sqlite, makeWrapper }: +{ lib, stdenv, fetchzip, mono, sqlite, makeWrapper }: stdenv.mkDerivation rec { pname = "duplicati"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { sqlite ]} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A free backup client that securely stores encrypted, incremental, compressed backups on cloud storage services and remote file servers"; homepage = "https://www.duplicati.com/"; license = licenses.lgpl21; diff --git a/pkgs/tools/backup/duplicity/default.nix b/pkgs/tools/backup/duplicity/default.nix index c29af7b2fd4e..284cf50132f3 100644 --- a/pkgs/tools/backup/duplicity/default.nix +++ b/pkgs/tools/backup/duplicity/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchpatch , fetchurl , pythonPackages @@ -49,6 +49,7 @@ pythonPackages.buildPythonApplication rec { propagatedBuildInputs = with pythonPackages; [ b2sdk boto + boto3 cffi cryptography ecdsa @@ -111,7 +112,7 @@ pythonPackages.buildPythonApplication rec { # > OSError: out of pty devices doCheck = !stdenv.isDarwin; - meta = with stdenv.lib; { + meta = with lib; { description = "Encrypted bandwidth-efficient backup using the rsync algorithm"; homepage = "https://www.nongnu.org/duplicity"; license = licenses.gpl2Plus; diff --git a/pkgs/tools/backup/duply/default.nix b/pkgs/tools/backup/duply/default.nix index 7808a0925b15..61e97b66e183 100644 --- a/pkgs/tools/backup/duply/default.nix +++ b/pkgs/tools/backup/duply/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, coreutils, python2, duplicity, gawk, gnupg, bash +{ lib, stdenv, fetchurl, coreutils, python2, duplicity, gawk, gnupg, bash , gnugrep, txt2man, makeWrapper, which }: @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { "$out/bin/duply" txt2man > "$out/share/man/man1/duply.1" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Shell front end for the duplicity backup tool"; longDescription = '' Duply is a shell front end for the duplicity backup tool diff --git a/pkgs/tools/backup/easysnap/default.nix b/pkgs/tools/backup/easysnap/default.nix index 5c2ad1a50a7b..815dedc998d5 100644 --- a/pkgs/tools/backup/easysnap/default.nix +++ b/pkgs/tools/backup/easysnap/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, zfs }: +{lib, stdenv, fetchFromGitHub, zfs }: stdenv.mkDerivation { pname = "easysnap"; @@ -21,7 +21,7 @@ stdenv.mkDerivation { done ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/sjau/easysnap"; description = "Customizable ZFS Snapshotting tool with zfs send/recv pulling"; license = licenses.gpl3; diff --git a/pkgs/tools/backup/flockit/default.nix b/pkgs/tools/backup/flockit/default.nix index 53baa6a6d934..cd17f8e2438c 100644 --- a/pkgs/tools/backup/flockit/default.nix +++ b/pkgs/tools/backup/flockit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, runtimeShell }: +{ lib, stdenv, fetchFromGitHub, runtimeShell }: stdenv.mkDerivation { pname = "flockit"; @@ -23,7 +23,7 @@ stdenv.mkDerivation { chmod +x $out/bin/flockit ''; - meta = with stdenv.lib; { + meta = with lib; { description = "LD_PRELOAD shim to add file locking to programs that don't do it (I'm looking at you, rsync!)"; longDescription = '' This library and tool exists solely because rsync doesn't have file locking. diff --git a/pkgs/tools/backup/grab-site/default.nix b/pkgs/tools/backup/grab-site/default.nix index e69823ab45d6..2ef3b5f54209 100644 --- a/pkgs/tools/backup/grab-site/default.nix +++ b/pkgs/tools/backup/grab-site/default.nix @@ -1,5 +1,4 @@ -{ stdenv, python37, fetchFromGitHub }: - +{ lib, stdenv, python37, fetchFromGitHub }: let python = python37.override { self = python; @@ -8,19 +7,32 @@ let }; }; -in with python.pkgs; buildPythonApplication rec { - version = "2.1.19"; - name = "grab-site-${version}"; +in +with python.pkgs; buildPythonApplication rec { + pname = "grab-site"; + version = "2.2.0"; src = fetchFromGitHub { rev = version; owner = "ArchiveTeam"; repo = "grab-site"; - sha256 = "1v1hnhv5knzdl0kj3574ccwlh171vcb7faddp095ycdmiiybalk4"; + sha256 = "1jxcv9dral6h7vfpfqkp1yif6plj0vspzakymkj8hfl75nh0wpv8"; }; + postPatch = '' + substituteInPlace setup.py \ + --replace '"wpull @ https://github.com/ArchiveTeam/ludios_wpull/tarball/master#egg=wpull-3.0.7"' '"wpull"' + ''; + propagatedBuildInputs = [ - click ludios_wpull manhole lmdb autobahn fb-re2 websockets cchardet + click + ludios_wpull + manhole + lmdb + autobahn + fb-re2 + websockets + cchardet ]; checkPhase = '' @@ -28,7 +40,7 @@ in with python.pkgs; buildPythonApplication rec { bash ./tests/offline-tests ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Crawler for web archiving with WARC output"; homepage = "https://github.com/ArchiveTeam/grab-site"; license = licenses.mit; diff --git a/pkgs/tools/backup/hpe-ltfs/default.nix b/pkgs/tools/backup/hpe-ltfs/default.nix index e34155bb2389..346cb6521baf 100644 --- a/pkgs/tools/backup/hpe-ltfs/default.nix +++ b/pkgs/tools/backup/hpe-ltfs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fuse, icu, pkgconfig, libxml2, libuuid }: +{ lib, stdenv, fetchFromGitHub, fuse, icu, pkgconfig, libxml2, libuuid }: stdenv.mkDerivation rec { version = "3.4.2_Z7550-02501"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { fuse icu libxml2 libuuid ]; - meta = with stdenv.lib; { + meta = with lib; { description = "HPE's implementation of the open-source tape filesystem standard ltfs"; homepage = "https://support.hpe.com/hpesc/public/km/product/1009214665/Product"; license = licenses.lgpl21; diff --git a/pkgs/tools/backup/httrack/default.nix b/pkgs/tools/backup/httrack/default.nix index 9a77153e2ff3..f611a953f3a8 100644 --- a/pkgs/tools/backup/httrack/default.nix +++ b/pkgs/tools/backup/httrack/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, zlib, openssl, libiconv }: +{ lib, stdenv, fetchurl, zlib, openssl, libiconv }: stdenv.mkDerivation rec { version = "3.49.2"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Easy-to-use offline browser / website mirroring utility"; homepage = "http://www.httrack.com"; license = licenses.gpl3; diff --git a/pkgs/tools/backup/httrack/qt.nix b/pkgs/tools/backup/httrack/qt.nix index 6ee7f6e6a210..000f11a5a00e 100644 --- a/pkgs/tools/backup/httrack/qt.nix +++ b/pkgs/tools/backup/httrack/qt.nix @@ -1,4 +1,4 @@ -{ mkDerivation, stdenv, fetchurl, cmake, pkgconfig, makeWrapper +{ mkDerivation, lib, stdenv, fetchurl, cmake, pkgconfig, makeWrapper , httrack, qtbase, qtmultimedia }: mkDerivation rec { @@ -14,8 +14,6 @@ mkDerivation rec { nativeBuildInputs = [ cmake makeWrapper pkgconfig ]; - enableParallelBuilding = true; - prePatch = '' substituteInPlace cmake/HTTRAQTFindHttrack.cmake \ --replace /usr/include/httrack/ ${httrack}/include/httrack/ @@ -30,7 +28,7 @@ mkDerivation rec { --replace /usr/share/httraqt/ $out/share/httraqt ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Easy-to-use offline browser / website mirroring utility - QT frontend"; homepage = "http://www.httrack.com"; license = licenses.gpl3; diff --git a/pkgs/tools/backup/lvmsync/default.nix b/pkgs/tools/backup/lvmsync/default.nix index 75962c98f8b6..c289c3938ab7 100644 --- a/pkgs/tools/backup/lvmsync/default.nix +++ b/pkgs/tools/backup/lvmsync/default.nix @@ -1,4 +1,4 @@ -{ stdenv, bundlerEnv, ruby, bundlerUpdateScript, makeWrapper }: +{ lib, stdenv, bundlerEnv, ruby, bundlerUpdateScript, makeWrapper }: stdenv.mkDerivation rec { pname = "lvmsync"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { passthru.updateScript = bundlerUpdateScript "lvmsync"; - meta = with stdenv.lib; { + meta = with lib; { description = "Optimised synchronisation of LVM snapshots over a network"; homepage = "https://theshed.hezmatt.org/lvmsync/"; license = licenses.gpl3; diff --git a/pkgs/tools/backup/monolith/default.nix b/pkgs/tools/backup/monolith/default.nix index 4d17209be893..f88ee31711f6 100644 --- a/pkgs/tools/backup/monolith/default.nix +++ b/pkgs/tools/backup/monolith/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , rustPlatform , fetchFromGitHub , pkg-config @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { checkFlagsArray = [ "--skip=tests::cli" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Bundle any web page into a single HTML file"; homepage = "https://github.com/Y2Z/monolith"; license = licenses.unlicense; diff --git a/pkgs/tools/backup/mydumper/default.nix b/pkgs/tools/backup/mydumper/default.nix index 611e543ca6ce..7549ac73292d 100644 --- a/pkgs/tools/backup/mydumper/default.nix +++ b/pkgs/tools/backup/mydumper/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig +{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig , glib, zlib, pcre, libmysqlclient, libressl }: let inherit (stdenv.lib) getDev; in @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DMYSQL_INCLUDE_DIR=${getDev libmysqlclient}/include/mysql" ]; - meta = with stdenv.lib; { + meta = with lib; { description = ''High-perfomance MySQL backup tool''; homepage = "https://github.com/maxbube/mydumper"; license = licenses.gpl3; diff --git a/pkgs/tools/backup/ori/default.nix b/pkgs/tools/backup/ori/default.nix index 9f00a7f2133a..79eb57c2bbe2 100644 --- a/pkgs/tools/backup/ori/default.nix +++ b/pkgs/tools/backup/ori/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, boost, pkgconfig, scons, util-linux, fuse, libevent, openssl, zlib }: +{ lib, stdenv, fetchurl, boost, pkgconfig, scons, util-linux, fuse, libevent, openssl, zlib }: stdenv.mkDerivation { version = "0.8.1"; @@ -19,7 +19,7 @@ stdenv.mkDerivation { installPhase = ":"; - meta = with stdenv.lib; { + meta = with lib; { description = "A secure distributed file system"; homepage = "http://ori.scs.stanford.edu/"; license = licenses.mit; diff --git a/pkgs/tools/backup/percona-xtrabackup/generic.nix b/pkgs/tools/backup/percona-xtrabackup/generic.nix index 9339e8155eab..7d8c3627f675 100644 --- a/pkgs/tools/backup/percona-xtrabackup/generic.nix +++ b/pkgs/tools/backup/percona-xtrabackup/generic.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, bison, boost, cmake, makeWrapper, pkgconfig +{ lib, stdenv, fetchFromGitHub, bison, boost, cmake, makeWrapper, pkgconfig , curl, cyrus_sasl, libaio, libedit, libev, libevent, libgcrypt, libgpgerror, lz4 , ncurses, numactl, openssl, protobuf, valgrind, xxd, zlib , perlPackages @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { rm -r "$out"/lib/plugin/debug '' + extraPostInstall; - meta = with stdenv.lib; { + meta = with lib; { description = "Non-blocking backup tool for MySQL"; homepage = "http://www.percona.com/software/percona-xtrabackup"; license = licenses.lgpl2; diff --git a/pkgs/tools/backup/rdedup/default.nix b/pkgs/tools/backup/rdedup/default.nix index 83b14d87db7b..05b35e004a29 100644 --- a/pkgs/tools/backup/rdedup/default.nix +++ b/pkgs/tools/backup/rdedup/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform, pkgconfig, openssl, libsodium +{ lib, stdenv, fetchFromGitHub, rustPlatform, pkgconfig, openssl, libsodium , llvmPackages, clang, lzma , Security }: @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec { export LIBCLANG_PATH="${llvmPackages.libclang}/lib" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Data deduplication with compression and public key encryption"; homepage = "https://github.com/dpc/rdedup"; license = licenses.mpl20; diff --git a/pkgs/tools/backup/rsnapshot/default.nix b/pkgs/tools/backup/rsnapshot/default.nix index 0503dc3b6572..1f65bd6ae5a4 100644 --- a/pkgs/tools/backup/rsnapshot/default.nix +++ b/pkgs/tools/backup/rsnapshot/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, perl, openssh, rsync, logger }: +{ fetchurl, lib, stdenv, perl, openssh, rsync, logger }: stdenv.mkDerivation rec { name = "rsnapshot-1.4.3"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { "/usr/bin/pod2man" "${perl}/bin/pod2man" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A filesystem snapshot utility for making backups of local and remote systems"; homepage = "https://rsnapshot.org/"; license = stdenv.lib.licenses.gpl2Plus; diff --git a/pkgs/tools/backup/s3ql/default.nix b/pkgs/tools/backup/s3ql/default.nix index 346f8d279646..74b90236c4e9 100644 --- a/pkgs/tools/backup/s3ql/default.nix +++ b/pkgs/tools/backup/s3ql/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python3Packages, sqlite, which }: +{ lib, stdenv, fetchFromGitHub, python3Packages, sqlite, which }: python3Packages.buildPythonApplication rec { pname = "s3ql"; @@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec { checkInputs = [ which ] ++ (with python3Packages; [ cython pytest ]); propagatedBuildInputs = with python3Packages; [ sqlite apsw pycrypto requests defusedxml dugong llfuse - cython pytest pytest-catchlog google_auth google-auth-oauthlib + cython pytest pytest-catchlog google-auth google-auth-oauthlib ]; preBuild = '' @@ -27,7 +27,7 @@ python3Packages.buildPythonApplication rec { pytest tests ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A full-featured file system for online data storage"; homepage = "https://github.com/s3ql/s3ql/"; license = licenses.gpl3; diff --git a/pkgs/tools/backup/ugarit-manifest-maker/default.nix b/pkgs/tools/backup/ugarit-manifest-maker/default.nix index f763296e1d6e..99ddd62e6ae2 100644 --- a/pkgs/tools/backup/ugarit-manifest-maker/default.nix +++ b/pkgs/tools/backup/ugarit-manifest-maker/default.nix @@ -1,4 +1,4 @@ -{ pkgs, stdenv, eggDerivation, fetchegg }: +{ pkgs, lib, stdenv, eggDerivation, fetchegg }: let eggs = import ./eggs.nix { inherit eggDerivation fetchegg; }; in with pkgs; eggDerivation rec { @@ -21,7 +21,7 @@ in with pkgs; eggDerivation rec { numbers ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.kitten-technologies.co.uk/project/ugarit-manifest-maker/"; description = "A tool for generating import manifests for Ugarit"; license = licenses.bsd3; diff --git a/pkgs/tools/backup/ugarit/default.nix b/pkgs/tools/backup/ugarit/default.nix index bc69662dc2bd..938c24f38ce1 100644 --- a/pkgs/tools/backup/ugarit/default.nix +++ b/pkgs/tools/backup/ugarit/default.nix @@ -1,4 +1,4 @@ -{ pkgs, stdenv, eggDerivation, fetchegg }: +{ pkgs, lib, stdenv, eggDerivation, fetchegg }: let eggs = import ./eggs.nix { inherit eggDerivation fetchegg; }; in with pkgs; eggDerivation rec { @@ -31,7 +31,7 @@ in with pkgs; eggDerivation rec { z3 ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.kitten-technologies.co.uk/project/ugarit/"; description = "A backup/archival system based around content-addressible storage"; license = licenses.bsd3; diff --git a/pkgs/tools/backup/wal-e/default.nix b/pkgs/tools/backup/wal-e/default.nix index a6d5b6b48010..b3e9bfd56c0f 100644 --- a/pkgs/tools/backup/wal-e/default.nix +++ b/pkgs/tools/backup/wal-e/default.nix @@ -17,7 +17,7 @@ python3Packages.buildPythonApplication rec { propagatedBuildInputs = (with python3Packages; [ boto gevent - google_cloud_storage + google-cloud-storage ]) ++ [ postgresql lzop diff --git a/pkgs/tools/backup/zfs-prune-snapshots/default.nix b/pkgs/tools/backup/zfs-prune-snapshots/default.nix index 434c86b343a8..f8a3adfecda6 100644 --- a/pkgs/tools/backup/zfs-prune-snapshots/default.nix +++ b/pkgs/tools/backup/zfs-prune-snapshots/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, go-md2man }: +{ lib, stdenv, fetchFromGitHub, go-md2man }: stdenv.mkDerivation rec { version = "1.1.0"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { install -m 644 -D man/zfs-prune-snapshots.1 $out/share/man/man1/zfs-prune-snapshots.1 ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Remove snapshots from one or more zpools that match given criteria"; homepage = "https://github.com/bahamas10/zfs-prune-snapshots"; license = licenses.mit; diff --git a/pkgs/tools/backup/zfs-replicate/default.nix b/pkgs/tools/backup/zfs-replicate/default.nix index 782133fd8d7b..02e3c19f0046 100644 --- a/pkgs/tools/backup/zfs-replicate/default.nix +++ b/pkgs/tools/backup/zfs-replicate/default.nix @@ -1,5 +1,5 @@ { buildPythonApplication, click, fetchPypi, hypothesis, mypy, pytest -, pytestcov, pytestrunner, stdenv, stringcase +, pytestcov, pytestrunner, lib, stdenv, stringcase }: buildPythonApplication rec { @@ -33,7 +33,7 @@ buildPythonApplication rec { pytest --doctest-modules ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/alunduil/zfs-replicate"; description = "ZFS Snapshot Replication"; license = licenses.bsd2; diff --git a/pkgs/tools/backup/zfsnap/default.nix b/pkgs/tools/backup/zfsnap/default.nix index 89d7414246c4..36e369b4f30a 100644 --- a/pkgs/tools/backup/zfsnap/default.nix +++ b/pkgs/tools/backup/zfsnap/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, coreutils, installShellFiles }: +{ lib, stdenv, fetchFromGitHub, coreutils, installShellFiles }: stdenv.mkDerivation rec { version = "2.0.0-beta3"; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { installShellCompletion completion/*.{bash,zsh} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A portable, performant script to make rolling ZFS snapshots easy"; homepage = "https://github.com/zfsnap/zfsnap"; license = licenses.bsd3; diff --git a/pkgs/tools/backup/znapzend/default.nix b/pkgs/tools/backup/znapzend/default.nix index 5ca460beb3be..1e4e84b445bd 100644 --- a/pkgs/tools/backup/znapzend/default.nix +++ b/pkgs/tools/backup/znapzend/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchurl, perl, perlPackages, wget, autoconf, automake, autoreconfHook }: +{ lib, stdenv, fetchFromGitHub, fetchurl, perl, perlPackages, wget, autoconf, automake, autoreconfHook }: let # when upgrade znapzend, check versions of Perl libs here: https://github.com/oetiker/znapzend/blob/master/cpanfile @@ -77,7 +77,7 @@ stdenv.mkDerivation { " ''; - meta = with stdenv.lib; { + meta = with lib; { description = "High performance open source ZFS backup with mbuffer and ssh support"; homepage = "http://www.znapzend.org"; license = licenses.gpl3; diff --git a/pkgs/tools/bluetooth/bluez-tools/default.nix b/pkgs/tools/bluetooth/bluez-tools/default.nix index 47aaadc9ccf0..bf3d73c657a1 100644 --- a/pkgs/tools/bluetooth/bluez-tools/default.nix +++ b/pkgs/tools/bluetooth/bluez-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, autoreconfHook, readline +{ lib, stdenv, autoreconfHook, readline , fetchFromGitHub, glib, pkgconfig }: stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ readline glib ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Command line bluetooth manager for Bluez5"; license = licenses.gpl2; maintainers = [ maintainers.dasuxullebt ]; diff --git a/pkgs/tools/bluetooth/obex-data-server/default.nix b/pkgs/tools/bluetooth/obex-data-server/default.nix index f95869e789cb..93cb3a1c8442 100644 --- a/pkgs/tools/bluetooth/obex-data-server/default.nix +++ b/pkgs/tools/bluetooth/obex-data-server/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libusb-compat-0_1, glib, dbus-glib, bluez, openobex, dbus }: +{ lib, stdenv, fetchurl, pkgconfig, libusb-compat-0_1, glib, dbus-glib, bluez, openobex, dbus }: stdenv.mkDerivation rec { name = "obex-data-server-0.4.6"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { export PKG_CONFIG_PATH="${dbus.dev}/lib/pkgconfig:$PKG_CONFIG_PATH" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://wiki.muiline.com/obex-data-server"; platforms = platforms.linux; license = licenses.gpl2; diff --git a/pkgs/tools/bluetooth/obexd/default.nix b/pkgs/tools/bluetooth/obexd/default.nix index c235c99d762c..dc6ced6814cb 100644 --- a/pkgs/tools/bluetooth/obexd/default.nix +++ b/pkgs/tools/bluetooth/obexd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, dbus, openobex, bluez, libical }: +{ lib, stdenv, fetchurl, pkgconfig, glib, dbus, openobex, bluez, libical }: stdenv.mkDerivation rec { name = "obexd-0.48"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.bluez.org/"; platforms = platforms.linux; license = licenses.gpl3; diff --git a/pkgs/tools/bluetooth/obexfs/default.nix b/pkgs/tools/bluetooth/obexfs/default.nix index 1c24697c6898..914032e1ee16 100644 --- a/pkgs/tools/bluetooth/obexfs/default.nix +++ b/pkgs/tools/bluetooth/obexfs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, bluez, fuse, obexftp }: +{ lib, stdenv, fetchurl, pkgconfig, bluez, fuse, obexftp }: stdenv.mkDerivation rec { name = "obexfs-0.12"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ fuse obexftp bluez ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://dev.zuckschwerdt.org/openobex/wiki/ObexFs"; description = "A tool to mount OBEX-based devices (such as Bluetooth phones)"; platforms = platforms.linux; diff --git a/pkgs/tools/bluetooth/obexftp/default.nix b/pkgs/tools/bluetooth/obexftp/default.nix index 69779557300d..d0cc7c321640 100644 --- a/pkgs/tools/bluetooth/obexftp/default.nix +++ b/pkgs/tools/bluetooth/obexftp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, openobex, bluez, cmake }: +{ lib, stdenv, fetchurl, pkgconfig, openobex, bluez, cmake }: stdenv.mkDerivation rec { name = "obexftp-0.24.2"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { sed -i 's,^Requires: bluetooth,Requires:,' $out/lib/pkgconfig/obexftp.pc ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://dev.zuckschwerdt.org/openobex/wiki/ObexFtp"; description = "A library and tool to access files on OBEX-based devices (such as Bluetooth phones)"; platforms = platforms.linux; diff --git a/pkgs/tools/bluetooth/openobex/default.nix b/pkgs/tools/bluetooth/openobex/default.nix index 7ac0234852c1..27dac53e6b38 100644 --- a/pkgs/tools/bluetooth/openobex/default.nix +++ b/pkgs/tools/bluetooth/openobex/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, bluez, libusb-compat-0_1, cmake }: +{ lib, stdenv, fetchurl, pkgconfig, bluez, libusb-compat-0_1, cmake }: stdenv.mkDerivation rec { name = "openobex-1.7.2"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { sed -i "/if ( PKGCONFIG_UDEV_FOUND )/,/endif ( PKGCONFIG_UDEV_FOUND )/d" udev/CMakeLists.txt ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://dev.zuckschwerdt.org/openobex/"; description = "An open source implementation of the Object Exchange (OBEX) protocol"; platforms = platforms.linux; diff --git a/pkgs/tools/bootloaders/refind/0001-Fix-GCC-10-compile-problem.patch b/pkgs/tools/bootloaders/refind/0001-Fix-GCC-10-compile-problem.patch new file mode 100644 index 000000000000..90b60235aad5 --- /dev/null +++ b/pkgs/tools/bootloaders/refind/0001-Fix-GCC-10-compile-problem.patch @@ -0,0 +1,25 @@ +From e34a16301f425f273a67ed3abbc45840bc82d892 Mon Sep 17 00:00:00 2001 +From: srs5694 +Date: Fri, 15 May 2020 12:34:14 -0400 +Subject: [PATCH] Fix GCC 10 compile problem + +--- + Make.common | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Make.common b/Make.common +index 3f0b919..95a3a97 100644 +--- a/Make.common ++++ b/Make.common +@@ -60,7 +60,7 @@ endif + # + + # ...for both GNU-EFI and TianoCore.... +-OPTIMFLAGS = -Os -fno-strict-aliasing ++OPTIMFLAGS = -Os -fno-strict-aliasing -fno-tree-loop-distribute-patterns + CFLAGS = $(OPTIMFLAGS) -fno-stack-protector -fshort-wchar -Wall + + # ...for GNU-EFI.... +-- +2.29.2 + diff --git a/pkgs/tools/bootloaders/refind/default.nix b/pkgs/tools/bootloaders/refind/default.nix index 5c7c68d9d9e3..9c36e55b8f24 100644 --- a/pkgs/tools/bootloaders/refind/default.nix +++ b/pkgs/tools/bootloaders/refind/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gnu-efi }: +{ lib, stdenv, fetchurl, gnu-efi }: let archids = { @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { patches = [ ./0001-toolchain.patch + ./0001-Fix-GCC-10-compile-problem.patch ]; buildInputs = [ gnu-efi ]; @@ -103,7 +104,7 @@ stdenv.mkDerivation rec { sed -i 's,`which \(.*\)`,`type -p \1`,g' $out/bin/refind-mkfont ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A graphical {,U}EFI boot manager"; longDescription = '' rEFInd is a graphical boot manager for EFI- and UEFI-based diff --git a/pkgs/tools/cd-dvd/bashburn/default.nix b/pkgs/tools/cd-dvd/bashburn/default.nix index 0acf55da7fe2..d9664f1072fb 100644 --- a/pkgs/tools/cd-dvd/bashburn/default.nix +++ b/pkgs/tools/cd-dvd/bashburn/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, util-linux +{ lib, stdenv, fetchurl, util-linux , cdparanoia, cdrdao, dvdplusrwtools, flac, lame, mpg123, normalize , vorbis-tools, xorriso }: @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { sh Install.sh --prefix $out ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Bash script CD Burner Writer"; longDescription = '' It might not be the best looking application out there, but it works. diff --git a/pkgs/tools/cd-dvd/bchunk/default.nix b/pkgs/tools/cd-dvd/bchunk/default.nix index df63ced882fe..d5c3a30e7aea 100644 --- a/pkgs/tools/cd-dvd/bchunk/default.nix +++ b/pkgs/tools/cd-dvd/bchunk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "bchunk"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { install -Dt $out/share/man/man1 bchunk.1 ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://he.fi/bchunk/"; description = "A program that converts CD images in BIN/CUE format into a set of ISO and CDR tracks"; platforms = platforms.unix; diff --git a/pkgs/tools/cd-dvd/brasero/default.nix b/pkgs/tools/cd-dvd/brasero/default.nix index cdc198873337..727c092e3aac 100644 --- a/pkgs/tools/cd-dvd/brasero/default.nix +++ b/pkgs/tools/cd-dvd/brasero/default.nix @@ -36,10 +36,10 @@ in stdenv.mkDerivation rec { ]; preFixup = '' - gappsWrapperArgs+=(--prefix PATH : "${binpath}" --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH") + gappsWrapperArgs+=(--prefix PATH : "${binpath}") ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A Gnome CD/DVD Burner"; homepage = "https://wiki.gnome.org/Apps/Brasero"; maintainers = [ maintainers.bdimcheff ]; diff --git a/pkgs/tools/cd-dvd/ccd2iso/default.nix b/pkgs/tools/cd-dvd/ccd2iso/default.nix index a6ba7fd332f3..10f8d9701d40 100644 --- a/pkgs/tools/cd-dvd/ccd2iso/default.nix +++ b/pkgs/tools/cd-dvd/ccd2iso/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "ccd2iso-0.3"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1z000zi7hpr2h9cabj6hzf3n6a6gd6glmm8nn36v4b8i4vzbhx7q"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "CloneCD to ISO converter"; homepage = "https://sourceforge.net/projects/ccd2iso/"; license = licenses.gpl2; diff --git a/pkgs/tools/cd-dvd/cdi2iso/default.nix b/pkgs/tools/cd-dvd/cdi2iso/default.nix index 9d7336663a8e..9df7ab7657f1 100644 --- a/pkgs/tools/cd-dvd/cdi2iso/default.nix +++ b/pkgs/tools/cd-dvd/cdi2iso/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation rec { pname = "cdi2iso"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { cp cdi2iso $out/bin/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A very simple utility for converting DiscJuggler images to the standard ISO-9660 format"; homepage = "https://sourceforge.net/projects/cdi2iso.berlios"; license = licenses.gpl2; diff --git a/pkgs/tools/cd-dvd/cdimgtools/default.nix b/pkgs/tools/cd-dvd/cdimgtools/default.nix index fde9eb1a3320..5f8d6016aa21 100644 --- a/pkgs/tools/cd-dvd/cdimgtools/default.nix +++ b/pkgs/tools/cd-dvd/cdimgtools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromRepoOrCz, autoreconfHook, makeWrapper, libdvdcss, libdvdread, perl, perlPackages, asciidoc, xmlto, sourceHighlight, docbook_xsl, docbook_xml_dtd_45 }: +{ lib, stdenv, fetchFromRepoOrCz, autoreconfHook, makeWrapper, libdvdcss, libdvdread, perl, perlPackages, asciidoc, xmlto, sourceHighlight, docbook_xsl, docbook_xml_dtd_45 }: stdenv.mkDerivation { pname = "cdimgtools"; @@ -26,7 +26,7 @@ stdenv.mkDerivation { installTargets = [ "install" "install-doc" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://repo.or.cz/cdimgtools.git/blob_plain/refs/heads/release:/README.html"; description = "Tools to inspect and manipulate CD/DVD optical disc images"; license = licenses.gpl2; diff --git a/pkgs/tools/cd-dvd/cdrdao/default.nix b/pkgs/tools/cd-dvd/cdrdao/default.nix index d0d12c34c059..85bebad2723a 100644 --- a/pkgs/tools/cd-dvd/cdrdao/default.nix +++ b/pkgs/tools/cd-dvd/cdrdao/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, libvorbis, libmad, pkgconfig, libao}: +{lib, stdenv, fetchurl, libvorbis, libmad, pkgconfig, libao}: stdenv.mkDerivation { name = "cdrdao-1.2.3"; @@ -28,7 +28,7 @@ stdenv.mkDerivation { # Needed on gcc >= 6. NIX_CFLAGS_COMPILE = "-Wno-narrowing"; - meta = with stdenv.lib; { + meta = with lib; { description = "A tool for recording audio or data CD-Rs in disk-at-once (DAO) mode"; homepage = "http://cdrdao.sourceforge.net/"; platforms = platforms.linux; diff --git a/pkgs/tools/cd-dvd/cdrkit/default.nix b/pkgs/tools/cd-dvd/cdrkit/default.nix index 251eee66f9cf..e5d7a842e6c7 100644 --- a/pkgs/tools/cd-dvd/cdrkit/default.nix +++ b/pkgs/tools/cd-dvd/cdrkit/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1nj7iv3xrq600i37na9a5idd718piiiqbs4zxvpjs66cdrsk1h6i"; }; - buildInputs = [cmake libcap zlib bzip2 perl]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ libcap zlib bzip2 perl ]; hardeningDisable = [ "format" ]; @@ -36,7 +37,7 @@ stdenv.mkDerivation rec { cdrkit is not affiliated with any of these authors; it is now an independent project. ''; - + homepage = "http://cdrkit.org/"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/cd-dvd/cdrtools/default.nix b/pkgs/tools/cd-dvd/cdrtools/default.nix index f4f07143a207..bca1a1c689c3 100644 --- a/pkgs/tools/cd-dvd/cdrtools/default.nix +++ b/pkgs/tools/cd-dvd/cdrtools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, m4, acl, libcap, Carbon, IOKit }: +{ lib, stdenv, fetchurl, m4, acl, libcap, Carbon, IOKit }: stdenv.mkDerivation rec { pname = "cdrtools"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = false; # parallel building fails on some linux machines - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://cdrtools.sourceforge.net/private/cdrecord.html"; description = "Highly portable CD/DVD/BluRay command line recording software"; license = with licenses; [ cddl gpl2 lgpl21 ]; diff --git a/pkgs/tools/cd-dvd/cuetools/default.nix b/pkgs/tools/cd-dvd/cuetools/default.nix index ebc631521773..a6cf5506138b 100644 --- a/pkgs/tools/cd-dvd/cuetools/default.nix +++ b/pkgs/tools/cd-dvd/cuetools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook +{ lib, stdenv, fetchFromGitHub, autoreconfHook , bison, flac, flex, id3v2, vorbis-tools }: @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ln -s $out/bin/cuetag.sh $out/bin/cuetag ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A set of utilities for working with cue files and toc files"; homepage = "https://github.com/svend/cuetools"; license = licenses.gpl2; diff --git a/pkgs/tools/cd-dvd/dvd+rw-tools/default.nix b/pkgs/tools/cd-dvd/dvd+rw-tools/default.nix index 40925a14537a..d396bf030ca6 100644 --- a/pkgs/tools/cd-dvd/dvd+rw-tools/default.nix +++ b/pkgs/tools/cd-dvd/dvd+rw-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, cdrtools, m4 }: +{ lib, stdenv, fetchurl, fetchpatch, cdrtools, m4 }: stdenv.mkDerivation rec { pname = "dvd+rw-tools"; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { makeFlags = [ "prefix=${placeholder "out"}" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://fy.chalmers.se/~appro/linux/DVD+RW/tools"; description = "Tools for mastering Blu-ray and DVD+-RW/+-R media"; platforms = platforms.linux; diff --git a/pkgs/tools/cd-dvd/dvd-vr/default.nix b/pkgs/tools/cd-dvd/dvd-vr/default.nix index aef0c3a636f9..4375aebe2990 100644 --- a/pkgs/tools/cd-dvd/dvd-vr/default.nix +++ b/pkgs/tools/cd-dvd/dvd-vr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "dvd-vr"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; makeFlags = [ "PREFIX=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.pixelbeat.org/programs/dvd-vr/"; downloadPage = "https://www.pixelbeat.org/programs/dvd-vr/"; description = "A utility to identify and optionally copy recordings from a DVD-VR format disc"; diff --git a/pkgs/tools/cd-dvd/dvdisaster/default.nix b/pkgs/tools/cd-dvd/dvdisaster/default.nix index 5a3828d80131..1087bb94b432 100644 --- a/pkgs/tools/cd-dvd/dvdisaster/default.nix +++ b/pkgs/tools/cd-dvd/dvdisaster/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gettext, which +{ lib, stdenv, fetchurl, pkgconfig, gettext, which , glib, gtk2 , enableSoftening ? true }: @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://dvdisaster.net/"; description = "Data loss/scratch/aging protection for CD/DVD media"; longDescription = '' diff --git a/pkgs/tools/cd-dvd/ecm-tools/default.nix b/pkgs/tools/cd-dvd/ecm-tools/default.nix index 2ebf8e655517..18ef6f02d80c 100644 --- a/pkgs/tools/cd-dvd/ecm-tools/default.nix +++ b/pkgs/tools/cd-dvd/ecm-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "ecm-tools"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { (cd $out/bin; ln -s bin2ecm ecm2bin) ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A utility to uncompress ECM files to BIN CD format"; homepage = "https://github.com/alucryd/ecm-tools"; license = licenses.gpl3; diff --git a/pkgs/tools/cd-dvd/isolyzer/default.nix b/pkgs/tools/cd-dvd/isolyzer/default.nix index 1fd704d90f19..477fa337da84 100644 --- a/pkgs/tools/cd-dvd/isolyzer/default.nix +++ b/pkgs/tools/cd-dvd/isolyzer/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , python3 , fetchFromGitHub }: @@ -16,7 +16,7 @@ python3.pkgs.buildPythonApplication rec { propagatedBuildInputs = with python3.pkgs; [ setuptools six ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/KBNLresearch/isolyzer"; description = "Verify size of ISO 9660 image against Volume Descriptor fields"; license = licenses.asl20; diff --git a/pkgs/tools/cd-dvd/isomd5sum/default.nix b/pkgs/tools/cd-dvd/isomd5sum/default.nix index 0c30f0fe9801..2ca14cc4d603 100644 --- a/pkgs/tools/cd-dvd/isomd5sum/default.nix +++ b/pkgs/tools/cd-dvd/isomd5sum/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , python3 , popt }: @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { # we don't install python stuff as it borks up directories installTargets = [ "install-bin" "install-devel" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/rhinstaller/isomd5sum"; description = "Utilities for working with md5sum implanted in ISO images"; platforms = platforms.linux; diff --git a/pkgs/tools/cd-dvd/lsdvd/default.nix b/pkgs/tools/cd-dvd/lsdvd/default.nix index 39d0ab5fc2d6..7847720dc6d5 100644 --- a/pkgs/tools/cd-dvd/lsdvd/default.nix +++ b/pkgs/tools/cd-dvd/lsdvd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libdvdread, pkgconfig }: +{ lib, stdenv, fetchurl, libdvdread, pkgconfig }: let version = "0.17"; @@ -14,7 +14,7 @@ stdenv.mkDerivation { buildInputs = [ libdvdread ]; nativeBuildInputs = [ pkgconfig ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://sourceforge.net/projects/lsdvd/"; description = "Display information about audio, video, and subtitle tracks on a DVD"; license = licenses.gpl2; diff --git a/pkgs/tools/cd-dvd/mdf2iso/default.nix b/pkgs/tools/cd-dvd/mdf2iso/default.nix index dbad9d362478..e737e38d1bd6 100644 --- a/pkgs/tools/cd-dvd/mdf2iso/default.nix +++ b/pkgs/tools/cd-dvd/mdf2iso/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchgit}: +{lib, stdenv, fetchgit}: stdenv.mkDerivation rec { pname = "mdf2iso"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0xg43jlvrk8adfjgbjir15nxwcj0nhz4gxpqx7jdfvhg0kwliq0n"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Small utility that converts MDF images to ISO format"; homepage = src.url; license = licenses.gpl2; diff --git a/pkgs/tools/cd-dvd/mkcue/default.nix b/pkgs/tools/cd-dvd/mkcue/default.nix index 357992d72916..596164f13ffa 100644 --- a/pkgs/tools/cd-dvd/mkcue/default.nix +++ b/pkgs/tools/cd-dvd/mkcue/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "mkcue"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { preInstall = "mkdir -pv $out/bin"; postInstall = "chmod -v +w $out/bin/mkcue"; - meta = with stdenv.lib; { + meta = with lib; { description = "Generates CUE sheets from a CD TOC"; license = licenses.lgpl2Plus; platforms = platforms.linux; diff --git a/pkgs/tools/cd-dvd/nrg2iso/default.nix b/pkgs/tools/cd-dvd/nrg2iso/default.nix index 082dada85fde..e57948a80dd6 100644 --- a/pkgs/tools/cd-dvd/nrg2iso/default.nix +++ b/pkgs/tools/cd-dvd/nrg2iso/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation rec { pname = "nrg2iso"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { cp -v nrg2iso $out/bin/nrg2iso ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A linux utils for converting CD (or DVD) image generated by Nero Burning Rom to ISO format"; homepage = "http://gregory.kokanosky.free.fr/v4/linux/nrg2iso.en.html"; license = licenses.gpl2; diff --git a/pkgs/tools/cd-dvd/sacd/default.nix b/pkgs/tools/cd-dvd/sacd/default.nix index a3ce3d361824..23bf808c50fe 100644 --- a/pkgs/tools/cd-dvd/sacd/default.nix +++ b/pkgs/tools/cd-dvd/sacd/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , fetchpatch }: @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { "PREFIX=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Converts SACD image files, Philips DSDIFF and Sony DSF files to 24-bit high resolution wave files. Handles both DST and DSD streams. "; longDescription = '' Super Audio CD decoder. Converts SACD image files, Philips DSDIFF and Sony DSF files to 24-bit high resolution wave files. diff --git a/pkgs/tools/cd-dvd/srt-to-vtt-cl/default.nix b/pkgs/tools/cd-dvd/srt-to-vtt-cl/default.nix index 8efc50c44935..70fcedde858a 100644 --- a/pkgs/tools/cd-dvd/srt-to-vtt-cl/default.nix +++ b/pkgs/tools/cd-dvd/srt-to-vtt-cl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, substituteAll }: +{ lib, stdenv, fetchFromGitHub, substituteAll }: stdenv.mkDerivation rec { pname = "srt-to-vtt-cl"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { cp bin/$(uname -s)/$(uname -m)/srt-vtt $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Convert SRT files to VTT"; license = licenses.mit; maintainers = with maintainers; [ ericdallo ]; diff --git a/pkgs/tools/cd-dvd/unetbootin/default.nix b/pkgs/tools/cd-dvd/unetbootin/default.nix index b935bc02d150..5ccb4b49d7e8 100644 --- a/pkgs/tools/cd-dvd/unetbootin/default.nix +++ b/pkgs/tools/cd-dvd/unetbootin/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, makeWrapper, qt4, util-linux, coreutils, which, qmake4Hook +{ lib, stdenv, fetchFromGitHub, makeWrapper, qt4, util-linux, coreutils, which, qmake4Hook , p7zip, mtools, syslinux }: stdenv.mkDerivation rec { @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://unetbootin.sourceforge.net/"; description = "A tool to create bootable live USB drives from ISO images"; license = licenses.gpl2Plus; diff --git a/pkgs/tools/cd-dvd/vobsub2srt/default.nix b/pkgs/tools/cd-dvd/vobsub2srt/default.nix index 9e5ee52fca8d..e187d49b783a 100644 --- a/pkgs/tools/cd-dvd/vobsub2srt/default.nix +++ b/pkgs/tools/cd-dvd/vobsub2srt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, cmake, libtiff, pkgconfig, tesseract }: +{ stdenv, fetchgit, cmake, libtiff, pkg-config, tesseract }: let rev = "a6abbd61127a6392d420bbbebdf7612608c943c2"; shortRev = builtins.substring 0 7 rev; @@ -12,8 +12,8 @@ stdenv.mkDerivation { sha256 = "1rpanrv8bgdh95v2320qbd44xskncvq6y84cbbfc86gw0qxpd9cb"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake libtiff ]; + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ libtiff ]; propagatedBuildInputs = [ tesseract ]; meta = { diff --git a/pkgs/tools/cd-dvd/xorriso/default.nix b/pkgs/tools/cd-dvd/xorriso/default.nix index b3f268214db3..b40808a5a8cc 100644 --- a/pkgs/tools/cd-dvd/xorriso/default.nix +++ b/pkgs/tools/cd-dvd/xorriso/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, libcdio, zlib, bzip2, readline, acl, attr, libiconv }: +{ fetchurl, lib, stdenv, libcdio, zlib, bzip2, readline, acl, attr, libiconv }: stdenv.mkDerivation rec { name = "xorriso-${version}"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ libcdio zlib bzip2 readline libiconv ] ++ stdenv.lib.optionals stdenv.isLinux [ acl attr ]; - meta = with stdenv.lib; { + meta = with lib; { description = "ISO 9660 Rock Ridge file system manipulator"; longDescription = diff --git a/pkgs/tools/compression/advancecomp/default.nix b/pkgs/tools/compression/advancecomp/default.nix index e648aa6feb64..b0e7f9e8f6b5 100644 --- a/pkgs/tools/compression/advancecomp/default.nix +++ b/pkgs/tools/compression/advancecomp/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , fetchpatch , autoreconfHook @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { echo "${version}" >.version ''; - meta = with stdenv.lib; { + meta = with lib; { description = ''A set of tools to optimize deflate-compressed files''; license = licenses.gpl3 ; maintainers = [ maintainers.raskin ]; diff --git a/pkgs/tools/compression/brotli/default.nix b/pkgs/tools/compression/brotli/default.nix index f4f0ac41563a..1c80c70b7c1d 100644 --- a/pkgs/tools/compression/brotli/default.nix +++ b/pkgs/tools/compression/brotli/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchFromGitHub, cmake, fetchpatch, staticOnly ? false }: +{ lib, stdenv, fetchFromGitHub, cmake, fetchpatch +, staticOnly ? stdenv.hostPlatform.isStatic +}: # ?TODO: there's also python lib in there @@ -50,7 +52,7 @@ stdenv.mkDerivation rec { cp ../docs/*.3 $out/share/man/man3/ ''; - meta = with stdenv.lib; { + meta = with lib; { inherit (src.meta) homepage; description = "A generic-purpose lossless compression algorithm and tool"; diff --git a/pkgs/tools/compression/bsc/default.nix b/pkgs/tools/compression/bsc/default.nix index 384cbfc3839b..1f15b3d2f87b 100644 --- a/pkgs/tools/compression/bsc/default.nix +++ b/pkgs/tools/compression/bsc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openmp ? null }: +{ lib, stdenv, fetchurl, openmp ? null }: stdenv.mkDerivation rec { pname = "bsc"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { makeFlagsArray+=("PREFIX=$out") ''; - meta = with stdenv.lib; { + meta = with lib; { description = "High performance block-sorting data compression library"; homepage = "http://libbsc.com/"; # Later commits changed the licence to Apache2 (no release yet, though) diff --git a/pkgs/tools/compression/bzip2/1_1.nix b/pkgs/tools/compression/bzip2/1_1.nix index 3f6105ca507b..7557c5843ccc 100644 --- a/pkgs/tools/compression/bzip2/1_1.nix +++ b/pkgs/tools/compression/bzip2/1_1.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitLab , meson , python3 @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "High-quality data compression program"; license = licenses.bsdOriginal; platforms = platforms.all; diff --git a/pkgs/tools/compression/bzip2/default.nix b/pkgs/tools/compression/bzip2/default.nix index 3e20258cbbee..7b97c66b3b90 100644 --- a/pkgs/tools/compression/bzip2/default.nix +++ b/pkgs/tools/compression/bzip2/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl -, linkStatic ? (stdenv.hostPlatform.system == "i686-cygwin") +{ lib, stdenv, fetchurl +, linkStatic ? with stdenv.hostPlatform; isStatic || isCygwin , autoreconfHook }: @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "High-quality data compression program"; license = licenses.bsdOriginal; platforms = platforms.all; diff --git a/pkgs/tools/compression/dejsonlz4/default.nix b/pkgs/tools/compression/dejsonlz4/default.nix index 7520fc824c01..9e6f95aecb8e 100644 --- a/pkgs/tools/compression/dejsonlz4/default.nix +++ b/pkgs/tools/compression/dejsonlz4/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "dejsonlz4"; version = "1.1"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { cp dejsonlz4 $out/bin/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Decompress Mozilla Firefox bookmarks backup files"; homepage = "https://github.com/avih/dejsonlz4"; license = licenses.bsd2; diff --git a/pkgs/tools/compression/dtrx/default.nix b/pkgs/tools/compression/dtrx/default.nix index 81a446066d97..0abea9b12854 100644 --- a/pkgs/tools/compression/dtrx/default.nix +++ b/pkgs/tools/compression/dtrx/default.nix @@ -24,7 +24,7 @@ in pythonPackages.buildPythonApplication rec { wrapProgram "$out/bin/dtrx" --prefix PATH : "${archivers}" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Do The Right Extraction: A tool for taking the hassle out of extracting archives"; homepage = "https://brettcsmith.org/2007/dtrx/"; license = licenses.gpl3Plus; diff --git a/pkgs/tools/compression/flips/default.nix b/pkgs/tools/compression/flips/default.nix index 76676624fc32..e99f3fec163e 100644 --- a/pkgs/tools/compression/flips/default.nix +++ b/pkgs/tools/compression/flips/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gtk3, libdivsufsort, pkg-config, wrapGAppsHook }: +{ lib, stdenv, fetchFromGitHub, gtk3, libdivsufsort, pkg-config, wrapGAppsHook }: stdenv.mkDerivation { pname = "flips"; @@ -17,7 +17,7 @@ stdenv.mkDerivation { makeFlags = [ "PREFIX=${placeholder "out"}" ]; buildPhase = "./make.sh"; - meta = with stdenv.lib; { + meta = with lib; { description = "A patcher for IPS and BPS files"; homepage = "https://github.com/Alcaro/Flips"; license = licenses.gpl3Plus; diff --git a/pkgs/tools/compression/hactool/default.nix b/pkgs/tools/compression/hactool/default.nix index d34ca73556bb..2cce7bb8b929 100644 --- a/pkgs/tools/compression/hactool/default.nix +++ b/pkgs/tools/compression/hactool/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "hactool"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { install -D hactool $out/bin/hactool ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/SciresM/hactool"; description = "A tool to manipulate common file formats for the Nintendo Switch"; longDescription = "A tool to view information about, decrypt, and extract common file formats for the Nintendo Switch, especially Nintendo Content Archives"; diff --git a/pkgs/tools/compression/lbzip2/default.nix b/pkgs/tools/compression/lbzip2/default.nix index 99d41c06ec64..4072dd43aef1 100644 --- a/pkgs/tools/compression/lbzip2/default.nix +++ b/pkgs/tools/compression/lbzip2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gnulib, perl, autoconf, automake }: +{ lib, stdenv, fetchFromGitHub, gnulib, perl, autoconf, automake }: stdenv.mkDerivation rec { version = "2.5"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ./build-aux/autogen.sh ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/kjn/lbzip2"; # Formerly http://lbzip2.org/ description = "Parallel bzip2 compression utility"; license = licenses.gpl3; diff --git a/pkgs/tools/compression/lz4/default.nix b/pkgs/tools/compression/lz4/default.nix index 0124a0b3d63b..080504551843 100644 --- a/pkgs/tools/compression/lz4/default.nix +++ b/pkgs/tools/compression/lz4/default.nix @@ -1,5 +1,6 @@ -{ stdenv, fetchFromGitHub, valgrind, fetchpatch -, enableStatic ? false, enableShared ? true +{ lib, stdenv, fetchFromGitHub, valgrind, fetchpatch +, enableStatic ? stdenv.hostPlatform.isStatic +, enableShared ? !stdenv.hostPlatform.isStatic }: stdenv.mkDerivation rec { @@ -44,7 +45,7 @@ stdenv.mkDerivation rec { moveToOutput bin "$bin" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Extremely fast compression algorithm"; longDescription = '' Very fast lossless compression algorithm, providing compression speed diff --git a/pkgs/tools/compression/lzbench/default.nix b/pkgs/tools/compression/lzbench/default.nix index 3609e5330446..93ccc67f7d14 100644 --- a/pkgs/tools/compression/lzbench/default.nix +++ b/pkgs/tools/compression/lzbench/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "lzbench"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { cp lzbench $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { inherit (src.meta) homepage; description = "In-memory benchmark of open-source LZ77/LZSS/LZMA compressors"; license = licenses.free; diff --git a/pkgs/tools/compression/lzfse/default.nix b/pkgs/tools/compression/lzfse/default.nix index bd97620dba66..13764971bb51 100644 --- a/pkgs/tools/compression/lzfse/default.nix +++ b/pkgs/tools/compression/lzfse/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "lzfse"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/lzfse/lzfse"; description = "a reference C implementation of the LZFSE compressor"; longDescription = '' diff --git a/pkgs/tools/compression/lzham/default.nix b/pkgs/tools/compression/lzham/default.nix index 9c18e4d69fed..7f4273163a3e 100644 --- a/pkgs/tools/compression/lzham/default.nix +++ b/pkgs/tools/compression/lzham/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake } : +{ lib, stdenv, fetchFromGitHub, cmake } : stdenv.mkDerivation { name = "lzham-1.0"; @@ -10,16 +10,14 @@ stdenv.mkDerivation { sha256 = "14c1zvzmp1ylp4pgayfdfk1kqjb23xj4f7ll1ra7b18wjxc9ja1v"; }; - buildInputs = [ cmake ]; - - enableParallelBuilding = true; + nativeBuildInputs = [ cmake ]; installPhase = '' mkdir -p $out/bin cp ../bin_linux/lzhamtest $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Lossless data compression codec with LZMA-like ratios but 1.5x-8x faster decompression speed"; homepage = "https://github.com/richgel999/lzham_codec"; license = with licenses; [ mit ]; diff --git a/pkgs/tools/compression/lzop/default.nix b/pkgs/tools/compression/lzop/default.nix index 48645942038f..be31048c2186 100644 --- a/pkgs/tools/compression/lzop/default.nix +++ b/pkgs/tools/compression/lzop/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, lzo}: +{lib, stdenv, fetchurl, lzo}: stdenv.mkDerivation rec { name = "lzop-1.04"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { buildInputs = [ lzo ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.lzop.org"; description = "Fast file compressor"; license = licenses.gpl2; diff --git a/pkgs/tools/compression/pbzip2/default.nix b/pkgs/tools/compression/pbzip2/default.nix index 1c78d27654d2..599c096adefa 100644 --- a/pkgs/tools/compression/pbzip2/default.nix +++ b/pkgs/tools/compression/pbzip2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bzip2 }: +{ lib, stdenv, fetchurl, bzip2 }: let major = "1.1"; version = "${major}.13"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=reserved-user-defined-literal"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://compression.ca/pbzip2/"; description = "A parallel implementation of bzip2 for multi-core machines"; license = licenses.bsd2; diff --git a/pkgs/tools/compression/pigz/default.nix b/pkgs/tools/compression/pigz/default.nix index 07c7bf95607d..9178e3ad5875 100644 --- a/pkgs/tools/compression/pigz/default.nix +++ b/pkgs/tools/compression/pigz/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, zlib, util-linux }: +{ lib, stdenv, fetchurl, zlib, util-linux }: let name = "pigz"; version = "2.4"; @@ -28,7 +28,7 @@ stdenv.mkDerivation { install -Dm755 pigz.pdf "$out/share/doc/pigz/pigz.pdf" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.zlib.net/pigz/"; description = "A parallel implementation of gzip for multi-core machines"; license = licenses.zlib; diff --git a/pkgs/tools/compression/upx/default.nix b/pkgs/tools/compression/upx/default.nix index 06dcaa26077a..10e02626c017 100644 --- a/pkgs/tools/compression/upx/default.nix +++ b/pkgs/tools/compression/upx/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ucl, zlib, perl }: +{ lib, stdenv, fetchurl, ucl, zlib, perl }: stdenv.mkDerivation rec { pname = "upx"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { cp src/upx.out $out/bin/upx ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://upx.github.io/"; description = "The Ultimate Packer for eXecutables"; license = licenses.gpl2Plus; diff --git a/pkgs/tools/compression/xdelta/default.nix b/pkgs/tools/compression/xdelta/default.nix index 2420f3fab61c..b599ee2920f1 100644 --- a/pkgs/tools/compression/xdelta/default.nix +++ b/pkgs/tools/compression/xdelta/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook +{ lib, stdenv, fetchFromGitHub, autoreconfHook , lzmaSupport ? true, xz ? null }: @@ -47,7 +47,7 @@ in stdenv.mkDerivation rec { install -D -m644 xdelta3.1 $out/share/man/man1/xdelta3.1 ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Binary differential compression in VCDIFF (RFC 3284) format"; longDescription = '' xdelta is a command line program for delta encoding, which generates two diff --git a/pkgs/tools/compression/xdelta/unstable.nix b/pkgs/tools/compression/xdelta/unstable.nix index ae4a5ebac3ec..25cd3ed311ad 100644 --- a/pkgs/tools/compression/xdelta/unstable.nix +++ b/pkgs/tools/compression/xdelta/unstable.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook +{ lib, stdenv, fetchFromGitHub, autoreconfHook , lzmaSupport ? true, xz ? null }: @@ -51,7 +51,7 @@ in stdenv.mkDerivation rec { install -D -m644 xdelta3.1 $out/share/man/man1/xdelta3.1 ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Binary differential compression in VCDIFF (RFC 3284) format"; longDescription = '' xdelta is a command line program for delta encoding, which generates two diff --git a/pkgs/tools/compression/xz/default.nix b/pkgs/tools/compression/xz/default.nix index 0b6082bb5780..fa4a01243339 100644 --- a/pkgs/tools/compression/xz/default.nix +++ b/pkgs/tools/compression/xz/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, enableStatic ? false }: +{ lib, stdenv, fetchurl +, enableStatic ? stdenv.hostPlatform.isStatic +}: # Note: this package is used for bootstrapping fetchurl, and thus # cannot use fetchpatch! All mutable patches (generated by GitHub or @@ -29,7 +31,7 @@ stdenv.mkDerivation rec { postInstall = "rm -rf $out/share/doc"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://tukaani.org/xz/"; description = "A general-purpose data compression software, successor of LZMA"; diff --git a/pkgs/tools/compression/zdelta/default.nix b/pkgs/tools/compression/zdelta/default.nix index b59e7d5708ba..b3932ec3da8e 100644 --- a/pkgs/tools/compression/zdelta/default.nix +++ b/pkgs/tools/compression/zdelta/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation rec { name = "zdelta-2.1"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0k6y0r9kv5qiglnr2j4a0yvfynjkvm0pyv8ly28j0pr3w6rbxrh3"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://cis.poly.edu/zdelta"; platforms = platforms.linux; license = licenses.zlib; diff --git a/pkgs/tools/compression/zopfli/default.nix b/pkgs/tools/compression/zopfli/default.nix index 13e1d8369381..753368b70b97 100644 --- a/pkgs/tools/compression/zopfli/default.nix +++ b/pkgs/tools/compression/zopfli/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, cmake }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake }: stdenv.mkDerivation rec { pname = "zopfli"; @@ -22,9 +22,7 @@ stdenv.mkDerivation rec { cp $src/src/zopfli/*.h $dev/include/ ''; - enableParallelBuilding = true; - - meta = with stdenv.lib; { + meta = with lib; { inherit (src.meta) homepage; description = "Very good, but slow, deflate or zlib compression"; longDescription = '' diff --git a/pkgs/tools/compression/zstd/default.nix b/pkgs/tools/compression/zstd/default.nix index c26ca507525f..eb4144443aec 100644 --- a/pkgs/tools/compression/zstd/default.nix +++ b/pkgs/tools/compression/zstd/default.nix @@ -1,19 +1,19 @@ -{ stdenv, fetchFromGitHub, fetchpatch, cmake, bash, gnugrep +{ lib, stdenv, fetchFromGitHub, cmake, bash, gnugrep , fixDarwinDylibNames , file , legacySupport ? false -, static ? false +, static ? stdenv.hostPlatform.isStatic }: stdenv.mkDerivation rec { pname = "zstd"; - version = "1.4.5"; + version = "1.4.8"; src = fetchFromGitHub { owner = "facebook"; repo = "zstd"; rev = "v${version}"; - sha256 = "0ay3qlk4sffnmcl3b34q4zd7mkcmjds023icmib1mdli97qcp38l"; + sha256 = "018zgigp5xlrb4mgshgrvns0cfbhhcg89cifbjj4rv6s3n9riphw"; }; nativeBuildInputs = [ cmake ] @@ -22,10 +22,6 @@ stdenv.mkDerivation rec { patches = [ ./playtests-darwin.patch - (fetchpatch { - url = "https://github.com/facebook/zstd/pull/2163.patch"; - sha256 = "07mfjc5f9wy0w2xlj36hyf7g5ax9r2rf6ixhkffhnwc6rwy0q54p"; - }) ] # This I didn't upstream because if you use posix threads with MinGW it will # work fine, and I'm not sure how to write the condition. ++ stdenv.lib.optional stdenv.hostPlatform.isWindows ./mcfgthreads-no-pthread.patch; @@ -76,7 +72,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional stdenv.hostPlatform.isUnix "man" ++ [ "out" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Zstandard real-time compression algorithm"; longDescription = '' Zstd, short for Zstandard, is a fast lossless compression algorithm, @@ -88,6 +84,7 @@ stdenv.mkDerivation rec { property shared by most LZ compression algorithms, such as zlib. ''; homepage = "https://facebook.github.io/zstd/"; + changelog = "https://github.com/facebook/zstd/blob/v${version}/CHANGELOG"; license = with licenses; [ bsd3 ]; # Or, at your opinion, GPL-2.0-only. platforms = platforms.all; diff --git a/pkgs/tools/filesystems/aefs/default.nix b/pkgs/tools/filesystems/aefs/default.nix index ea94c26248e9..ed47b8f885bd 100644 --- a/pkgs/tools/filesystems/aefs/default.nix +++ b/pkgs/tools/filesystems/aefs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fuse }: +{ lib, stdenv, fetchurl, fuse }: stdenv.mkDerivation rec { name = "aefs-0.4pre259-8843b7c"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ fuse ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/edolstra/aefs"; description = "A cryptographic filesystem implemented in userspace using FUSE"; platforms = platforms.linux; diff --git a/pkgs/tools/filesystems/afpfs-ng/default.nix b/pkgs/tools/filesystems/afpfs-ng/default.nix index 3340bdba0e6d..9c4268e402da 100644 --- a/pkgs/tools/filesystems/afpfs-ng/default.nix +++ b/pkgs/tools/filesystems/afpfs-ng/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fuse, readline, libgcrypt, gmp }: +{ lib, stdenv, fetchFromGitHub, fuse, readline, libgcrypt, gmp }: stdenv.mkDerivation { pname = "afpfs-ng"; @@ -13,7 +13,7 @@ stdenv.mkDerivation { buildInputs = [ fuse readline libgcrypt gmp ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/simonvetter/afpfs-ng"; description = "A client implementation of the Apple Filing Protocol"; license = licenses.gpl2; diff --git a/pkgs/tools/filesystems/android-file-transfer/default.nix b/pkgs/tools/filesystems/android-file-transfer/default.nix index d9ae2cb74615..59add4b4c21c 100644 --- a/pkgs/tools/filesystems/android-file-transfer/default.nix +++ b/pkgs/tools/filesystems/android-file-transfer/default.nix @@ -1,23 +1,23 @@ -{ stdenv, mkDerivation, fetchFromGitHub, cmake, fuse, readline, pkgconfig, qtbase, qttools }: +{ lib, stdenv, mkDerivation, fetchFromGitHub, cmake, fuse, readline, pkgconfig, qtbase, qttools }: mkDerivation rec { pname = "android-file-transfer"; - version = "4.1"; + version = "4.2"; src = fetchFromGitHub { owner = "whoozle"; repo = "android-file-transfer-linux"; rev = "v${version}"; - sha256 = "0xmnwxr649wdzsa1vf3spl387hxs4pq0rldyrsr9hz43da4v081k"; + sha256 = "125rq8ji83nw6chfw43i0h9c38hjqh1qjibb0gnf9wrigar9zc8b"; }; nativeBuildInputs = [ cmake readline pkgconfig ]; buildInputs = [ fuse qtbase qttools ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Reliable MTP client with minimalistic UI"; homepage = "https://whoozle.github.io/android-file-transfer-linux/"; - license = licenses.lgpl21; + license = licenses.lgpl21Plus; maintainers = [ maintainers.xaverdh ]; platforms = platforms.linux; }; diff --git a/pkgs/tools/filesystems/apfs-fuse/default.nix b/pkgs/tools/filesystems/apfs-fuse/default.nix index 32cde83d749a..adf845f943ea 100644 --- a/pkgs/tools/filesystems/apfs-fuse/default.nix +++ b/pkgs/tools/filesystems/apfs-fuse/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fuse3, bzip2, zlib, attr, cmake }: +{ lib, stdenv, fetchFromGitHub, fuse3, bzip2, zlib, attr, cmake }: stdenv.mkDerivation { pname = "apfs-fuse-unstable"; @@ -19,7 +19,7 @@ stdenv.mkDerivation { ln -s $out/bin/apfs-fuse $out/bin/mount.fuse.apfs-fuse ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/sgan81/apfs-fuse"; description = "FUSE driver for APFS (Apple File System)"; license = licenses.gpl2; diff --git a/pkgs/tools/filesystems/bashmount/default.nix b/pkgs/tools/filesystems/bashmount/default.nix index bab8df1280dd..ef7bfd492e37 100644 --- a/pkgs/tools/filesystems/bashmount/default.nix +++ b/pkgs/tools/filesystems/bashmount/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub}: +{lib, stdenv, fetchFromGitHub}: stdenv.mkDerivation rec { pname = "bashmount"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { cp NEWS $out/share/doc/bashmount ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/jamielinux/bashmount"; description = "A menu-driven bash script for the management of removable media with udisks"; maintainers = [ maintainers.koral ]; diff --git a/pkgs/tools/filesystems/bcache-tools/default.nix b/pkgs/tools/filesystems/bcache-tools/default.nix index 6e39ff174588..f9c2b470026f 100644 --- a/pkgs/tools/filesystems/bcache-tools/default.nix +++ b/pkgs/tools/filesystems/bcache-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, util-linux, bash }: +{ lib, stdenv, fetchurl, pkgconfig, util-linux, bash }: stdenv.mkDerivation rec { pname = "bcache-tools"; @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { mkdir -p "$out/sbin" "$out/lib/udev/rules.d" "$out/share/man/man8" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "User-space tools required for bcache (Linux block layer cache)"; longDescription = '' Bcache is a Linux kernel block layer cache. It allows one or more fast diff --git a/pkgs/tools/filesystems/bcachefs-tools/default.nix b/pkgs/tools/filesystems/bcachefs-tools/default.nix index 5b2a4e322421..869d2782855c 100644 --- a/pkgs/tools/filesystems/bcachefs-tools/default.nix +++ b/pkgs/tools/filesystems/bcachefs-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, attr, libuuid, libscrypt, libsodium, keyutils +{ lib, stdenv, fetchFromGitHub, pkgconfig, attr, libuuid, libscrypt, libsodium, keyutils , liburcu, zlib, libaio, udev, zstd, lz4, valgrind, python3Packages , fuseSupport ? false, fuse3 ? null }: @@ -39,7 +39,7 @@ stdenv.mkDerivation { installFlags = [ "PREFIX=${placeholder "out"}" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Tool for managing bcachefs filesystems"; homepage = "https://bcachefs.org/"; license = licenses.gpl2; diff --git a/pkgs/tools/filesystems/bees/default.nix b/pkgs/tools/filesystems/bees/default.nix index bdca893a136c..bbad83f01768 100644 --- a/pkgs/tools/filesystems/bees/default.nix +++ b/pkgs/tools/filesystems/bees/default.nix @@ -1,4 +1,4 @@ -{ stdenv, runCommand, fetchFromGitHub, bash, btrfs-progs, coreutils, python3Packages, util-linux }: +{ lib, stdenv, runCommand, fetchFromGitHub, bash, btrfs-progs, coreutils, python3Packages, util-linux }: let @@ -43,7 +43,7 @@ let "SYSTEMD_SYSTEM_UNIT_DIR=$(out)/etc/systemd/system" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/Zygo/bees"; description = "Block-oriented BTRFS deduplication service"; license = licenses.gpl3; diff --git a/pkgs/tools/filesystems/blobfuse/default.nix b/pkgs/tools/filesystems/blobfuse/default.nix index 3c6f62283293..2156758f68e1 100644 --- a/pkgs/tools/filesystems/blobfuse/default.nix +++ b/pkgs/tools/filesystems/blobfuse/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, curl, gnutls, libgcrypt, libuuid, fuse }: +{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, curl, gnutls, libgcrypt, libuuid, fuse }: stdenv.mkDerivation rec { pname = "blobfuse"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ curl gnutls libgcrypt libuuid fuse ]; nativeBuildInputs = [ cmake pkgconfig ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Mount an Azure Blob storage as filesystem through FUSE"; license = licenses.mit; maintainers = with maintainers; [ jbgi ]; diff --git a/pkgs/tools/filesystems/boxfs/default.nix b/pkgs/tools/filesystems/boxfs/default.nix index 5dba4b4bbf1a..4ccec06050d4 100644 --- a/pkgs/tools/filesystems/boxfs/default.nix +++ b/pkgs/tools/filesystems/boxfs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, curl, fuse, libxml2, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, curl, fuse, libxml2, pkgconfig }: let srcs = { @@ -44,7 +44,7 @@ in stdenv.mkDerivation { install boxfs boxfs-init $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "FUSE file system for box.com accounts"; longDescription = '' Store files on box.com (an account is required). The first time you run diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix index 03db1d913e2b..469a499b5549 100644 --- a/pkgs/tools/filesystems/btrfs-progs/default.nix +++ b/pkgs/tools/filesystems/btrfs-progs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, attr, acl, zlib, libuuid, e2fsprogs, lzo +{ lib, stdenv, fetchurl, pkgconfig, attr, acl, zlib, libuuid, e2fsprogs, lzo , asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt, zstd, python3 }: @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { configureFlags = stdenv.lib.optional stdenv.hostPlatform.isMusl "--disable-backtrace"; - meta = with stdenv.lib; { + meta = with lib; { description = "Utilities for the btrfs filesystem"; homepage = "https://btrfs.wiki.kernel.org/"; license = licenses.gpl2; diff --git a/pkgs/tools/filesystems/catcli/default.nix b/pkgs/tools/filesystems/catcli/default.nix index 25de04467ef9..f5dbabaf5834 100644 --- a/pkgs/tools/filesystems/catcli/default.nix +++ b/pkgs/tools/filesystems/catcli/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , buildPythonApplication , docopt, anytree @@ -20,7 +20,7 @@ buildPythonApplication rec { postPatch = '' patchShebangs . ''; - meta = with stdenv.lib; { + meta = with lib; { description = "The command line catalog tool for your offline data"; homepage = "https://github.com/deadc0de6/catcli"; license = licenses.gpl3; diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix index 1a43d792ad3e..7f6acca39705 100644 --- a/pkgs/tools/filesystems/ceph/default.nix +++ b/pkgs/tools/filesystems/ceph/default.nix @@ -81,7 +81,7 @@ let inherit description; license = with licenses; [ lgpl21 gpl2 bsd3 mit publicDomain ]; maintainers = with maintainers; [ adev ak johanot krav ]; - platforms = [ "x86_64-linux" ]; + platforms = [ "x86_64-linux" "aarch64-linux" ]; }; ceph-common = python3Packages.buildPythonPackage rec{ @@ -195,8 +195,6 @@ in rec { test -f $out/bin/ceph-volume ''; - enableParallelBuilding = true; - outputs = [ "out" "lib" "dev" "doc" "man" ]; doCheck = false; # uses pip to install things from the internet diff --git a/pkgs/tools/filesystems/convoy/default.nix b/pkgs/tools/filesystems/convoy/default.nix index 3372ec835304..4c493ea22527 100644 --- a/pkgs/tools/filesystems/convoy/default.nix +++ b/pkgs/tools/filesystems/convoy/default.nix @@ -1,5 +1,5 @@ # This file was generated by go2nix. -{ stdenv, buildGoPackage, fetchFromGitHub, lvm2 }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub, lvm2 }: buildGoPackage rec { pname = "convoy"; @@ -16,7 +16,7 @@ buildGoPackage rec { buildInputs = [lvm2]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/rancher/convoy"; description = "A Docker volume plugin, managing persistent container volumes"; license = licenses.asl20; diff --git a/pkgs/tools/filesystems/cpcfs/default.nix b/pkgs/tools/filesystems/cpcfs/default.nix index 1c639dfc29ec..2aa63208e008 100644 --- a/pkgs/tools/filesystems/cpcfs/default.nix +++ b/pkgs/tools/filesystems/cpcfs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, makeWrapper, ncurses, readline, ronn }: +{ lib, stdenv, fetchFromGitHub, makeWrapper, ncurses, readline, ronn }: stdenv.mkDerivation rec { @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Manipulating CPC dsk images and files"; homepage = "https://github.com/derikz/cpcfs/" ; license = licenses.bsd2; diff --git a/pkgs/tools/filesystems/cryfs/default.nix b/pkgs/tools/filesystems/cryfs/default.nix index 8f7f4f1a313f..5573acc1a8cf 100644 --- a/pkgs/tools/filesystems/cryfs/default.nix +++ b/pkgs/tools/filesystems/cryfs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch +{ lib, stdenv, fetchFromGitHub, fetchpatch , cmake, pkgconfig, python, gtest , boost, cryptopp, curl, fuse, openssl }: @@ -48,8 +48,6 @@ stdenv.mkDerivation rec { buildInputs = [ boost cryptopp curl fuse openssl ]; - enableParallelBuilding = true; - cmakeFlags = [ "-DCRYFS_UPDATE_CHECKS:BOOL=FALSE" "-DBoost_USE_STATIC_LIBS:BOOL=FALSE" # this option is case sensitive @@ -68,7 +66,7 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Cryptographic filesystem for the cloud"; homepage = "https://www.cryfs.org"; license = licenses.lgpl3; diff --git a/pkgs/tools/filesystems/curlftpfs/default.nix b/pkgs/tools/filesystems/curlftpfs/default.nix index a0306693b28e..3e59a286be32 100644 --- a/pkgs/tools/filesystems/curlftpfs/default.nix +++ b/pkgs/tools/filesystems/curlftpfs/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, fuse, curl, pkgconfig, glib, zlib}: +{lib, stdenv, fetchurl, fuse, curl, pkgconfig, glib, zlib}: stdenv.mkDerivation { name = "curlftpfs-0.9.2"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { doCheck = false; # fails, doesn't work well too, btw - meta = with stdenv.lib; { + meta = with lib; { description = "Filesystem for accessing FTP hosts based on FUSE and libcurl"; homepage = "http://curlftpfs.sourceforge.net"; license = licenses.gpl2; diff --git a/pkgs/tools/filesystems/darling-dmg/default.nix b/pkgs/tools/filesystems/darling-dmg/default.nix index 42853eb8ff97..b5addf833c1b 100644 --- a/pkgs/tools/filesystems/darling-dmg/default.nix +++ b/pkgs/tools/filesystems/darling-dmg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, fuse, zlib, bzip2, openssl, libxml2, icu, lzfse }: +{ lib, stdenv, fetchFromGitHub, cmake, fuse, zlib, bzip2, openssl, libxml2, icu, lzfse }: stdenv.mkDerivation rec { pname = "darling-dmg"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { "-llzfse" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.darlinghq.org/"; description = "Darling lets you open macOS dmgs on Linux"; platforms = platforms.linux; diff --git a/pkgs/tools/filesystems/dislocker/default.nix b/pkgs/tools/filesystems/dislocker/default.nix index e1f28a0f2792..e65e4665bd56 100644 --- a/pkgs/tools/filesystems/dislocker/default.nix +++ b/pkgs/tools/filesystems/dislocker/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , cmake , mbedtls @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ fuse mbedtls ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Read BitLocker encrypted partitions in Linux"; homepage = "https://github.com/aorimn/dislocker"; license = licenses.gpl2; diff --git a/pkgs/tools/filesystems/disorderfs/default.nix b/pkgs/tools/filesystems/disorderfs/default.nix index 5137719790af..849360f53741 100644 --- a/pkgs/tools/filesystems/disorderfs/default.nix +++ b/pkgs/tools/filesystems/disorderfs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, fuse, attr, asciidoc }: +{ lib, stdenv, fetchurl, pkgconfig, fuse, attr, asciidoc }: stdenv.mkDerivation rec { pname = "disorderfs"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { installFlags = [ "PREFIX=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "An overlay FUSE filesystem that introduces non-determinism into filesystem metadata"; license = licenses.gpl3; platforms = platforms.linux; diff --git a/pkgs/tools/filesystems/duff/default.nix b/pkgs/tools/filesystems/duff/default.nix index 48511b97c04e..f980c7613332 100644 --- a/pkgs/tools/filesystems/duff/default.nix +++ b/pkgs/tools/filesystems/duff/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, gettext }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, gettext }: stdenv.mkDerivation { pname = "duff"; @@ -27,7 +27,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Quickly find duplicate files"; longDescription = '' Duff is a Unix command-line utility for quickly finding duplicates in diff --git a/pkgs/tools/filesystems/duperemove/default.nix b/pkgs/tools/filesystems/duperemove/default.nix index 3d70f2f73c7f..62df5ee07c68 100644 --- a/pkgs/tools/filesystems/duperemove/default.nix +++ b/pkgs/tools/filesystems/duperemove/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libgcrypt +{ lib, stdenv, fetchFromGitHub, libgcrypt , pkgconfig, glib, linuxHeaders ? stdenv.cc.libc.linuxHeaders, sqlite }: stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=${placeholder "out"}" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A simple tool for finding duplicated extents and submitting them for deduplication"; homepage = "https://github.com/markfasheh/duperemove"; license = licenses.gpl2; diff --git a/pkgs/tools/filesystems/e2fsprogs/default.nix b/pkgs/tools/filesystems/e2fsprogs/default.nix index f846bf1f2001..d48c92ebfc36 100644 --- a/pkgs/tools/filesystems/e2fsprogs/default.nix +++ b/pkgs/tools/filesystems/e2fsprogs/default.nix @@ -1,4 +1,6 @@ -{ stdenv, buildPackages, fetchurl, fetchpatch, pkgconfig, libuuid, gettext, texinfo, shared ? true }: +{ lib, stdenv, buildPackages, fetchurl, fetchpatch, pkgconfig, libuuid, gettext, texinfo +, shared ? !stdenv.hostPlatform.isStatic +}: stdenv.mkDerivation rec { pname = "e2fsprogs"; @@ -63,7 +65,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://e2fsprogs.sourceforge.net/"; description = "Tools for creating and checking ext2/ext3/ext4 filesystems"; license = licenses.gpl2; diff --git a/pkgs/tools/filesystems/encfs/default.nix b/pkgs/tools/filesystems/encfs/default.nix index 24aa52e366f1..4d28fc6a9e86 100644 --- a/pkgs/tools/filesystems/encfs/default.nix +++ b/pkgs/tools/filesystems/encfs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , cmake, pkgconfig, perl , gettext, fuse, openssl, tinyxml2 }: @@ -23,9 +23,7 @@ stdenv.mkDerivation rec { "-DINSTALL_LIBENCFS=ON" ]; - enableParallelBuilding = true; - - meta = with stdenv.lib; { + meta = with lib; { description = "An encrypted filesystem in user-space via FUSE"; homepage = "https://vgough.github.io/encfs"; license = with licenses; [ gpl3 lgpl3 ]; diff --git a/pkgs/tools/filesystems/exfat/default.nix b/pkgs/tools/filesystems/exfat/default.nix index 24db663aee02..2d6eaf8e9785 100644 --- a/pkgs/tools/filesystems/exfat/default.nix +++ b/pkgs/tools/filesystems/exfat/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, fuse }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, fuse }: stdenv.mkDerivation rec { pname = "exfat"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ fuse ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Free exFAT file system implementation"; inherit (src.meta) homepage; license = licenses.gpl2Plus; diff --git a/pkgs/tools/filesystems/ext4magic/default.nix b/pkgs/tools/filesystems/ext4magic/default.nix index 19e0e4ee63ec..a5f15c5fb2ea 100644 --- a/pkgs/tools/filesystems/ext4magic/default.nix +++ b/pkgs/tools/filesystems/ext4magic/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, file, libuuid, e2fsprogs, zlib, bzip2 }: +{ lib, stdenv, fetchurl, fetchpatch, file, libuuid, e2fsprogs, zlib, bzip2 }: stdenv.mkDerivation rec { version = "0.3.2"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { buildInputs = [ file libuuid e2fsprogs zlib bzip2 ]; installFlags = [ "PREFIX=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Recover / undelete files from ext3 or ext4 partitions"; longDescription = '' ext4magic can recover/undelete files from ext3 or ext4 partitions diff --git a/pkgs/tools/filesystems/extundelete/default.nix b/pkgs/tools/filesystems/extundelete/default.nix index 447f7a656d12..5992fd6a78e4 100644 --- a/pkgs/tools/filesystems/extundelete/default.nix +++ b/pkgs/tools/filesystems/extundelete/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, e2fsprogs }: +{ lib, stdenv, fetchurl, e2fsprogs }: stdenv.mkDerivation { version = "0.2.4"; @@ -19,7 +19,7 @@ stdenv.mkDerivation { --replace "inode.i_dir_acl" "inode.i_size_high" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Utility that can recover deleted files from an ext3 or ext4 partition"; homepage = "http://extundelete.sourceforge.net/"; license = licenses.gpl2; diff --git a/pkgs/tools/filesystems/f2fs-tools/default.nix b/pkgs/tools/filesystems/f2fs-tools/default.nix index af30751b885b..35a087dbd7b9 100644 --- a/pkgs/tools/filesystems/f2fs-tools/default.nix +++ b/pkgs/tools/filesystems/f2fs-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, autoreconfHook, libselinux, libuuid, pkgconfig }: +{ lib, stdenv, fetchgit, autoreconfHook, libselinux, libuuid, pkgconfig }: stdenv.mkDerivation rec { pname = "f2fs-tools"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { patches = [ ./f2fs-tools-cross-fix.patch ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git/"; description = "Userland tools for the f2fs filesystem"; license = licenses.gpl2; diff --git a/pkgs/tools/filesystems/fatresize/default.nix b/pkgs/tools/filesystems/fatresize/default.nix index c8366a96f075..8f258a79f7de 100644 --- a/pkgs/tools/filesystems/fatresize/default.nix +++ b/pkgs/tools/filesystems/fatresize/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, parted, util-linux, pkg-config }: +{ lib, stdenv, fetchFromGitHub, parted, util-linux, pkg-config }: stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ parted util-linux ]; - meta = with stdenv.lib; { + meta = with lib; { description = "The FAT16/FAT32 non-destructive resizer"; homepage = "https://github.com/ya-mouse/fatresize"; platforms = platforms.linux; diff --git a/pkgs/tools/filesystems/fatsort/default.nix b/pkgs/tools/filesystems/fatsort/default.nix index 90ab3a6df415..ec7563dfc494 100644 --- a/pkgs/tools/filesystems/fatsort/default.nix +++ b/pkgs/tools/filesystems/fatsort/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, help2man}: +{lib, stdenv, fetchurl, help2man}: stdenv.mkDerivation rec { version = "1.6.3.622"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=${placeholder "out"}" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://fatsort.sourceforge.net/"; description = "Sorts FAT partition table, for devices that don't do sorting of files"; maintainers = [ maintainers.kovirobi ]; diff --git a/pkgs/tools/filesystems/file-rename/default.nix b/pkgs/tools/filesystems/file-rename/default.nix index 588295f77912..6ddf5d788633 100644 --- a/pkgs/tools/filesystems/file-rename/default.nix +++ b/pkgs/tools/filesystems/file-rename/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perlPackages, makeWrapper }: +{ lib, stdenv, fetchurl, perlPackages, makeWrapper }: perlPackages.buildPerlPackage { pname = "File-Rename"; @@ -24,7 +24,7 @@ perlPackages.buildPerlPackage { doCheck = !stdenv.isDarwin; - meta = with stdenv.lib; { + meta = with lib; { description = "Perl extension for renaming multiple files"; license = licenses.artistic1; maintainers = with maintainers; [ peterhoeg ]; diff --git a/pkgs/tools/filesystems/fuse-7z-ng/default.nix b/pkgs/tools/filesystems/fuse-7z-ng/default.nix index a8eb1118f4d3..b9edd4799bc8 100644 --- a/pkgs/tools/filesystems/fuse-7z-ng/default.nix +++ b/pkgs/tools/filesystems/fuse-7z-ng/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fuse, p7zip, autoconf, automake, pkgconfig, makeWrapper }: +{ lib, stdenv, fetchFromGitHub, fuse, p7zip, autoconf, automake, pkgconfig, makeWrapper }: stdenv.mkDerivation rec { pname = "fuse-7z-ng"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { cp TODO README NEWS COPYING ChangeLog AUTHORS $out/share/doc/${pname}/ ''; - meta = with stdenv.lib; { + meta = with lib; { inherit version; inherit (src.homepage); description = "A FUSE-based filesystem that uses the p7zip library"; diff --git a/pkgs/tools/filesystems/fuse-overlayfs/default.nix b/pkgs/tools/filesystems/fuse-overlayfs/default.nix index 4aafe8d6d628..25e2cc29bd75 100644 --- a/pkgs/tools/filesystems/fuse-overlayfs/default.nix +++ b/pkgs/tools/filesystems/fuse-overlayfs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, fuse3, nixosTests }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, fuse3, nixosTests }: stdenv.mkDerivation rec { pname = "fuse-overlayfs"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { passthru.tests = { inherit (nixosTests) podman; }; - meta = with stdenv.lib; { + meta = with lib; { description = "FUSE implementation for overlayfs"; longDescription = "An implementation of overlay+shiftfs in FUSE for rootless containers."; license = licenses.gpl3; diff --git a/pkgs/tools/filesystems/fuseiso/default.nix b/pkgs/tools/filesystems/fuseiso/default.nix index 0a4472d7123d..f8c4ead50f21 100644 --- a/pkgs/tools/filesystems/fuseiso/default.nix +++ b/pkgs/tools/filesystems/fuseiso/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, autoreconfHook, pkgconfig, fuse, glib, zlib }: +{ lib, stdenv, fetchurl, fetchpatch, autoreconfHook, pkgconfig, fuse, glib, zlib }: stdenv.mkDerivation rec { pname = "fuseiso"; @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { install -Dm444 -t $out/share/doc/${pname} NEWS README ''; - meta = with stdenv.lib; { + meta = with lib; { description = "FUSE module to mount ISO filesystem images"; homepage = "https://sourceforge.net/projects/fuseiso"; license = licenses.gpl2; diff --git a/pkgs/tools/filesystems/genext2fs/default.nix b/pkgs/tools/filesystems/genext2fs/default.nix index 8d0c0325aa9d..b4980e83bee5 100644 --- a/pkgs/tools/filesystems/genext2fs/default.nix +++ b/pkgs/tools/filesystems/genext2fs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation { name = "genext2fs-1.4.1"; @@ -14,7 +14,7 @@ stdenv.mkDerivation { sed -e 's@4 [*] (EXT2_TIND_BLOCK+1)@-1+&@' -i genext2fs.c ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://genext2fs.sourceforge.net/"; description = "A tool to generate ext2 filesystem images without requiring root privileges"; license = licenses.gpl2; diff --git a/pkgs/tools/filesystems/genimage/default.nix b/pkgs/tools/filesystems/genimage/default.nix index c3b867fbb601..23c38e6a6d36 100644 --- a/pkgs/tools/filesystems/genimage/default.nix +++ b/pkgs/tools/filesystems/genimage/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libconfuse, gettext }: +{ lib, stdenv, fetchurl, pkgconfig, libconfuse, gettext }: stdenv.mkDerivation rec { pname = "genimage"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { cp -v README "$docdir" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://git.pengutronix.de/cgit/genimage"; description = "Generate filesystem images from directory trees"; license = licenses.gpl2Plus; diff --git a/pkgs/tools/filesystems/genromfs/default.nix b/pkgs/tools/filesystems/genromfs/default.nix index 4adf124d529f..205d84791ec9 100644 --- a/pkgs/tools/filesystems/genromfs/default.nix +++ b/pkgs/tools/filesystems/genromfs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { version = "0.5.2"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { --replace "gcc" "cc" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://romfs.sourceforge.net/"; description = "Tool for creating romfs file system images"; license = licenses.gpl2; diff --git a/pkgs/tools/filesystems/glusterfs/default.nix b/pkgs/tools/filesystems/glusterfs/default.nix index a4e6bc1182be..d23faf16886f 100644 --- a/pkgs/tools/filesystems/glusterfs/default.nix +++ b/pkgs/tools/filesystems/glusterfs/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, fuse, bison, flex_2_5_35, openssl, python3, ncurses, readline, +{lib, stdenv, fetchFromGitHub, fuse, bison, flex_2_5_35, openssl, python3, ncurses, readline, autoconf, automake, libtool, pkgconfig, zlib, libaio, libxml2, acl, sqlite, liburcu, attr, makeWrapper, coreutils, gnused, gnugrep, which, openssh, gawk, findutils, util-linux, lvm2, btrfs-progs, e2fsprogs, xfsprogs, systemd, @@ -180,7 +180,7 @@ in stdenv.mkDerivation rec { rm -r $out/bin/conf.py ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Distributed storage system"; homepage = "https://www.gluster.org"; license = licenses.lgpl3Plus; # dual licese: choice of lgpl3Plus or gpl2 diff --git a/pkgs/tools/filesystems/gocryptfs/default.nix b/pkgs/tools/filesystems/gocryptfs/default.nix index bed971229cd6..318e39e8322e 100644 --- a/pkgs/tools/filesystems/gocryptfs/default.nix +++ b/pkgs/tools/filesystems/gocryptfs/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildGoModule , fetchFromGitHub , openssl @@ -41,7 +41,7 @@ buildGoModule rec { popd ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Encrypted overlay filesystem written in Go"; license = licenses.mit; homepage = "https://nuetzlich.net/gocryptfs/"; diff --git a/pkgs/tools/filesystems/gpart/default.nix b/pkgs/tools/filesystems/gpart/default.nix index 59b4785888b2..eafbe066ac94 100644 --- a/pkgs/tools/filesystems/gpart/default.nix +++ b/pkgs/tools/filesystems/gpart/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { pname = "gpart"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { inherit (src.meta) homepage; description = "Guess PC-type hard disk partitions"; longDescription = '' diff --git a/pkgs/tools/filesystems/grive2/default.nix b/pkgs/tools/filesystems/grive2/default.nix index 01b63003d62d..7392b4748407 100644 --- a/pkgs/tools/filesystems/grive2/default.nix +++ b/pkgs/tools/filesystems/grive2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, yajl, cmake, libgcrypt, curl, expat, boost, libiberty }: +{ lib, stdenv, fetchFromGitHub, pkgconfig, yajl, cmake, libgcrypt, curl, expat, boost, libiberty }: stdenv.mkDerivation rec { version = "0.5.1"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ libgcrypt yajl curl expat stdenv boost libiberty ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A console Google Drive client"; homepage = "https://github.com/vitalif/grive2"; license = licenses.gpl2; diff --git a/pkgs/tools/filesystems/hubicfuse/default.nix b/pkgs/tools/filesystems/hubicfuse/default.nix index 5bb8b4e91e2b..5bd140e6cdfc 100644 --- a/pkgs/tools/filesystems/hubicfuse/default.nix +++ b/pkgs/tools/filesystems/hubicfuse/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, curl, openssl, fuse, libxml2, json_c, file }: +{ lib, stdenv, fetchFromGitHub, pkgconfig, curl, openssl, fuse, libxml2, json_c, file }: stdenv.mkDerivation rec { pname = "hubicfuse"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ln -sf $out/bin/hubicfuse $out/sbin/mount.hubicfuse ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/TurboGit/hubicfuse"; description = "FUSE-based filesystem to access hubic cloud storage"; platforms = platforms.linux; diff --git a/pkgs/tools/filesystems/idsk/default.nix b/pkgs/tools/filesystems/idsk/default.nix index a8e2cc3f0974..12a0af7ea4d3 100644 --- a/pkgs/tools/filesystems/idsk/default.nix +++ b/pkgs/tools/filesystems/idsk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { cp iDSK $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Manipulating CPC dsk images and files"; homepage = "https://github.com/cpcsdk/idsk" ; license = licenses.mit; diff --git a/pkgs/tools/filesystems/ifuse/default.nix b/pkgs/tools/filesystems/ifuse/default.nix index 96a8c1d630d9..b262080d1826 100644 --- a/pkgs/tools/filesystems/ifuse/default.nix +++ b/pkgs/tools/filesystems/ifuse/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, usbmuxd, fuse, libimobiledevice }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, usbmuxd, fuse, libimobiledevice }: stdenv.mkDerivation rec { pname = "ifuse"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig fuse usbmuxd libimobiledevice ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/libimobiledevice/ifuse"; description = "A fuse filesystem implementation to access the contents of iOS devices"; longDescription = '' diff --git a/pkgs/tools/filesystems/irods/common.nix b/pkgs/tools/filesystems/irods/common.nix index dfa7530ac64f..2062a8442e6d 100644 --- a/pkgs/tools/filesystems/irods/common.nix +++ b/pkgs/tools/filesystems/irods/common.nix @@ -5,9 +5,8 @@ with stdenv; { - enableParallelBuilding = true; - - buildInputs = [ bzip2 zlib autoconf automake cmake gnumake help2man texinfo libtool cppzmq libarchive avro-cpp jansson zeromq openssl pam libiodbc kerberos gcc boost libcxx which catch2 ]; + nativeBuildInputs = [ autoconf automake cmake gnumake help2man texinfo which gcc ]; + buildInputs = [ bzip2 zlib libtool cppzmq libarchive avro-cpp jansson zeromq openssl pam libiodbc kerberos boost libcxx catch2 ]; cmakeFlags = [ "-DIRODS_EXTERNALS_FULLPATH_CLANG=${stdenv.cc}" diff --git a/pkgs/tools/filesystems/jfsutils/default.nix b/pkgs/tools/filesystems/jfsutils/default.nix index 954393e45897..fadc639fbf63 100644 --- a/pkgs/tools/filesystems/jfsutils/default.nix +++ b/pkgs/tools/filesystems/jfsutils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, libuuid, autoreconfHook }: +{ lib, stdenv, fetchurl, fetchpatch, libuuid, autoreconfHook }: stdenv.mkDerivation rec { name = "jfsutils-1.1.15"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ libuuid ]; - meta = with stdenv.lib; { + meta = with lib; { description = "IBM JFS utilities"; homepage = "http://jfs.sourceforge.net"; license = licenses.gpl3; diff --git a/pkgs/tools/filesystems/jmtpfs/default.nix b/pkgs/tools/filesystems/jmtpfs/default.nix index 56afb8f0f55d..fe45c9539888 100644 --- a/pkgs/tools/filesystems/jmtpfs/default.nix +++ b/pkgs/tools/filesystems/jmtpfs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, file, fuse, libmtp }: +{ lib, stdenv, fetchFromGitHub, pkgconfig, file, fuse, libmtp }: let version = "0.5"; in stdenv.mkDerivation { @@ -15,7 +15,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ file fuse libmtp ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A FUSE filesystem for MTP devices like Android phones"; homepage = "https://github.com/JasonFerrara/jmtpfs"; license = licenses.gpl3; diff --git a/pkgs/tools/filesystems/lizardfs/default.nix b/pkgs/tools/filesystems/lizardfs/default.nix index e0bb39a6f0bc..785a9225cf32 100644 --- a/pkgs/tools/filesystems/lizardfs/default.nix +++ b/pkgs/tools/filesystems/lizardfs/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , fetchpatch , cmake @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { zlib boost judy pam spdlog fmt python3 systemdMinimal ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://lizardfs.com"; description = "A highly reliable, scalable and efficient distributed file system"; platforms = platforms.linux; diff --git a/pkgs/tools/filesystems/mergerfs/tools.nix b/pkgs/tools/filesystems/mergerfs/tools.nix index 44337cf11619..2b3f6a8b3cbf 100644 --- a/pkgs/tools/filesystems/mergerfs/tools.nix +++ b/pkgs/tools/filesystems/mergerfs/tools.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, coreutils, makeWrapper +{ lib, stdenv, fetchFromGitHub, coreutils, makeWrapper , rsync, python3, pythonPackages }: stdenv.mkDerivation rec { @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/mergerfs.mktrash --prefix PATH : ${makeBinPath [ pythonPackages.xattr ]} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Optional tools to help manage data in a mergerfs pool"; homepage = "https://github.com/trapexit/mergerfs-tools"; license = licenses.isc; diff --git a/pkgs/tools/filesystems/mkspiffs/default.nix b/pkgs/tools/filesystems/mkspiffs/default.nix index 086791de787a..30312ec7dc7b 100644 --- a/pkgs/tools/filesystems/mkspiffs/default.nix +++ b/pkgs/tools/filesystems/mkspiffs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, git }: +{ lib, stdenv, fetchFromGitHub, git }: # Changing the variables CPPFLAGS and BUILD_CONFIG_NAME can be done by # overriding the same-named attributes. See ./presets.nix for examples. @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { cp mkspiffs $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Tool to build and unpack SPIFFS images"; license = licenses.mit; homepage = "https://github.com/igrr/mkspiffs"; diff --git a/pkgs/tools/filesystems/moosefs/default.nix b/pkgs/tools/filesystems/moosefs/default.nix index 48c005e1caaf..0d0f13b7c2bf 100644 --- a/pkgs/tools/filesystems/moosefs/default.nix +++ b/pkgs/tools/filesystems/moosefs/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , makeWrapper , python @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { substituteInPlace $out/sbin/mfscgiserv --replace "datapath=\"$out" "datapath=\"" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://moosefs.com"; description = "Open Source, Petabyte, Fault-Tolerant, Highly Performing, Scalable Network Distributed File System"; platforms = platforms.linux; diff --git a/pkgs/tools/filesystems/mp3fs/default.nix b/pkgs/tools/filesystems/mp3fs/default.nix index 9675f44583a3..12b64573c40d 100644 --- a/pkgs/tools/filesystems/mp3fs/default.nix +++ b/pkgs/tools/filesystems/mp3fs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, flac, fuse, lame, libid3tag, pkgconfig }: +{ lib, stdenv, fetchurl, flac, fuse, lame, libid3tag, pkgconfig }: stdenv.mkDerivation rec { pname = "mp3fs"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "FUSE file system that transparently transcodes to MP3"; longDescription = '' A read-only FUSE filesystem which transcodes between audio formats diff --git a/pkgs/tools/filesystems/mtools/default.nix b/pkgs/tools/filesystems/mtools/default.nix index 5f78b3c379d2..b2cac0f75906 100644 --- a/pkgs/tools/filesystems/mtools/default.nix +++ b/pkgs/tools/filesystems/mtools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "mtools"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.gnu.org/software/mtools/"; description = "Utilities to access MS-DOS disks"; platforms = platforms.unix; diff --git a/pkgs/tools/filesystems/mtpfs/default.nix b/pkgs/tools/filesystems/mtpfs/default.nix index bede0e5fca01..295b7a0e5e50 100644 --- a/pkgs/tools/filesystems/mtpfs/default.nix +++ b/pkgs/tools/filesystems/mtpfs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, fuse, libmtp, glib, libmad, libid3tag }: +{ lib, stdenv, fetchurl, pkgconfig, fuse, libmtp, glib, libmad, libid3tag }: stdenv.mkDerivation rec { name = "mtpfs-1.1"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { sha256 = "07acrqb17kpif2xcsqfqh5j4axvsa4rnh6xwnpqab5b9w5ykbbqv"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/cjd/mtpfs"; description = "FUSE Filesystem providing access to MTP devices"; platforms = platforms.all; diff --git a/pkgs/tools/filesystems/nilfs-utils/default.nix b/pkgs/tools/filesystems/nilfs-utils/default.nix index dd8116ff4013..72d07ed19220 100644 --- a/pkgs/tools/filesystems/nilfs-utils/default.nix +++ b/pkgs/tools/filesystems/nilfs-utils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, libuuid, libselinux }: +{ lib, stdenv, fetchurl, fetchpatch, libuuid, libselinux }: let sourceInfo = rec { version = "2.2.7"; @@ -52,7 +52,7 @@ stdenv.mkDerivation { find . -name .libs | xargs rm -rf ''; - meta = with stdenv.lib; { + meta = with lib; { description = "NILFS utilities"; maintainers = [ maintainers.raskin ]; platforms = platforms.linux; diff --git a/pkgs/tools/filesystems/nixpart/0.4/blivet.nix b/pkgs/tools/filesystems/nixpart/0.4/blivet.nix index 15d6686fbc33..17a324525f8f 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/blivet.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/blivet.nix @@ -1,6 +1,6 @@ # FIXME: Unify with pkgs/development/python-modules/blivet/default.nix. -{ stdenv, fetchurl, buildPythonApplication, pykickstart, pyparted, pyblock +{ lib, stdenv, fetchurl, buildPythonApplication, pykickstart, pyparted, pyblock , libselinux, cryptsetup, multipath_tools, lsof, util-linux , useNixUdev ? true, systemd ? null # useNixUdev is here for bw compatibility @@ -41,7 +41,7 @@ buildPythonApplication rec { # tests are currently _heavily_ broken upstream doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://fedoraproject.org/wiki/Blivet"; description = "Module for management of a system's storage configuration"; license = with licenses; [ gpl2Plus lgpl21Plus ]; diff --git a/pkgs/tools/filesystems/nixpart/0.4/default.nix b/pkgs/tools/filesystems/nixpart/0.4/default.nix index 703d918f92a9..3ad9de468b4a 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/default.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python, buildPythonApplication +{ lib, stdenv, fetchurl, python, buildPythonApplication , libselinux # Propagated to blivet , useNixUdev ? true @@ -67,7 +67,7 @@ in buildPythonApplication rec { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "NixOS storage manager/partitioner"; homepage = "https://github.com/NixOS/nixpart"; license = licenses.gpl2Plus; diff --git a/pkgs/tools/filesystems/nixpart/0.4/parted.nix b/pkgs/tools/filesystems/nixpart/0.4/parted.nix index 7fe1b7454668..d3fc9ce96f58 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/parted.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/parted.nix @@ -1,5 +1,7 @@ { stdenv, fetchurl, fetchpatch, lvm2, libuuid, gettext, readline -, util-linux, check, enableStatic ? false }: +, util-linux, check +, enableStatic ? stdenv.hostPlatform.isStatic +}: stdenv.mkDerivation rec { name = "parted-3.1"; diff --git a/pkgs/tools/filesystems/ntfs-3g/default.nix b/pkgs/tools/filesystems/ntfs-3g/default.nix index 2065e31e97a0..30c7aa7ba364 100644 --- a/pkgs/tools/filesystems/ntfs-3g/default.nix +++ b/pkgs/tools/filesystems/ntfs-3g/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, util-linux, libuuid +{lib, stdenv, fetchurl, util-linux, libuuid , crypto ? false, libgcrypt, gnutls, pkgconfig}: stdenv.mkDerivation rec { @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { ln -sv mount.ntfs-3g $out/sbin/mount.ntfs ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.tuxera.com/community/open-source-ntfs-3g/"; description = "FUSE-based NTFS driver with full write support"; maintainers = with maintainers; [ dezgeg ]; diff --git a/pkgs/tools/filesystems/orangefs/default.nix b/pkgs/tools/filesystems/orangefs/default.nix index 8c1378d97bc4..1b10941f1392 100644 --- a/pkgs/tools/filesystems/orangefs/default.nix +++ b/pkgs/tools/filesystems/orangefs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bison, flex, autoreconfHook +{ lib, stdenv, fetchurl, bison, flex, autoreconfHook , openssl, db, attr, perl, tcsh } : @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { sed -i 's:openssl:${openssl}/bin/openssl:' $out/bin/pvfs2-gen-keys.sh ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Scale-out network file system for use on high-end computing systems"; homepage = "http://www.orangefs.org/"; license = with licenses; [ asl20 bsd3 gpl2 lgpl21 lgpl21Plus openldap ]; diff --git a/pkgs/tools/filesystems/rar2fs/default.nix b/pkgs/tools/filesystems/rar2fs/default.nix index 889f075645a3..a3056a80aa1f 100644 --- a/pkgs/tools/filesystems/rar2fs/default.nix +++ b/pkgs/tools/filesystems/rar2fs/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , autoreconfHook , fuse @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { "--disable-static-unrar" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "FUSE file system for reading RAR archives"; homepage = "https://hasse69.github.io/rar2fs/"; license = licenses.gpl3Plus; diff --git a/pkgs/tools/filesystems/rdfind/default.nix b/pkgs/tools/filesystems/rdfind/default.nix index 54cb54b1df4b..62d602f06808 100644 --- a/pkgs/tools/filesystems/rdfind/default.nix +++ b/pkgs/tools/filesystems/rdfind/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, nettle }: +{ lib, stdenv, fetchurl, nettle }: stdenv.mkDerivation rec { pname = "rdfind"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ nettle ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://rdfind.pauldreik.se/"; description = "Removes or hardlinks duplicate files very swiftly"; license = stdenv.lib.licenses.gpl2; diff --git a/pkgs/tools/filesystems/reiser4progs/default.nix b/pkgs/tools/filesystems/reiser4progs/default.nix index 158097d38129..46c0120f64c4 100644 --- a/pkgs/tools/filesystems/reiser4progs/default.nix +++ b/pkgs/tools/filesystems/reiser4progs/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, libaal}: +{lib, stdenv, fetchurl, libaal}: let version = "2.0.1"; in stdenv.mkDerivation rec { @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { substituteInPlace Makefile --replace ./run-ldconfig true ''; - meta = with stdenv.lib; { + meta = with lib; { inherit version; homepage = "https://sourceforge.net/projects/reiser4/"; description = "Reiser4 utilities"; diff --git a/pkgs/tools/filesystems/rmount/default.nix b/pkgs/tools/filesystems/rmount/default.nix index 529fc0244916..fb1e1a5539a2 100644 --- a/pkgs/tools/filesystems/rmount/default.nix +++ b/pkgs/tools/filesystems/rmount/default.nix @@ -1,4 +1,4 @@ -{ stdenv, nmap, jq, cifs-utils, sshfs, fetchFromGitHub, makeWrapper }: +{ lib, stdenv, nmap, jq, cifs-utils, sshfs, fetchFromGitHub, makeWrapper }: stdenv.mkDerivation rec { @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/rmount --prefix PATH : ${stdenv.lib.makeBinPath [ nmap jq cifs-utils sshfs ]} ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/Luis-Hebendanz/rmount"; description = "Remote mount utility which parses a json file"; license = licenses.mit; diff --git a/pkgs/tools/filesystems/romdirfs/default.nix b/pkgs/tools/filesystems/romdirfs/default.nix index 040889903480..12b6978af623 100644 --- a/pkgs/tools/filesystems/romdirfs/default.nix +++ b/pkgs/tools/filesystems/romdirfs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, fuse }: +{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, fuse }: stdenv.mkDerivation rec { pname = "romdirfs"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ fuse ]; - meta = with stdenv.lib; { + meta = with lib; { description = "FUSE for access Playstation 2 IOP IOPRP images and BIOS dumps"; homepage = "https://github.com/mlafeldt/romdirfs"; license = licenses.gpl3; diff --git a/pkgs/tools/filesystems/s3backer/default.nix b/pkgs/tools/filesystems/s3backer/default.nix index 1906f6805354..b617414aac84 100644 --- a/pkgs/tools/filesystems/s3backer/default.nix +++ b/pkgs/tools/filesystems/s3backer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , autoreconfHook, pkgconfig , fuse, curl, expat }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ./autogen.sh ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/archiecobbs/s3backer"; description = "FUSE-based single file backing store via Amazon S3"; license = licenses.gpl2Plus; diff --git a/pkgs/tools/filesystems/s3fs/default.nix b/pkgs/tools/filesystems/s3fs/default.nix index 3e91a1b0c475..487ecf63c938 100644 --- a/pkgs/tools/filesystems/s3fs/default.nix +++ b/pkgs/tools/filesystems/s3fs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, curl, openssl, libxml2, fuse, osxfuse }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, curl, openssl, libxml2, fuse, osxfuse }: stdenv.mkDerivation rec { pname = "s3fs-fuse"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ln -s $out/bin/s3fs $out/bin/mount.s3fs ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Mount an S3 bucket as filesystem through FUSE"; license = licenses.gpl2; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/tools/filesystems/sandboxfs/default.nix b/pkgs/tools/filesystems/sandboxfs/default.nix index 85677a53f43d..8777fa50a5d8 100644 --- a/pkgs/tools/filesystems/sandboxfs/default.nix +++ b/pkgs/tools/filesystems/sandboxfs/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , rustPlatform , fuse @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { postInstall = "installManPage man/sandboxfs.1"; - meta = with stdenv.lib; { + meta = with lib; { description = "A virtual file system for sandboxing"; homepage = "https://github.com/bazelbuild/sandboxfs"; license = with licenses; [ asl20 ]; diff --git a/pkgs/tools/filesystems/sasquatch/default.nix b/pkgs/tools/filesystems/sasquatch/default.nix index d4c7d9b76674..011387e7a4de 100644 --- a/pkgs/tools/filesystems/sasquatch/default.nix +++ b/pkgs/tools/filesystems/sasquatch/default.nix @@ -4,7 +4,7 @@ , lz4Support ? false , lzma , lzo -, stdenv +, lib, stdenv , xz , zlib }: @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { makeFlags = [ "XZ_SUPPORT=1" ] ++ stdenv.lib.optional lz4Support "LZ4_SUPPORT=1"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/devttys0/sasquatch"; description = "Set of patches to the standard unsquashfs utility (part of squashfs-tools) that attempts to add support for as many hacked-up vendor-specific SquashFS implementations as possible"; license = licenses.gpl2Plus; diff --git a/pkgs/tools/filesystems/securefs/default.nix b/pkgs/tools/filesystems/securefs/default.nix index c8efa4d61abd..235d8a53fe72 100644 --- a/pkgs/tools/filesystems/securefs/default.nix +++ b/pkgs/tools/filesystems/securefs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , cmake , fuse }: @@ -17,9 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ fuse ]; - enableParallelBuilding = true; - - meta = with stdenv.lib; { + meta = with lib; { inherit (src.meta) homepage; description = "Transparent encryption filesystem"; longDescription = '' diff --git a/pkgs/tools/filesystems/simg2img/default.nix b/pkgs/tools/filesystems/simg2img/default.nix index 6782987c027f..d0d7304c9d20 100644 --- a/pkgs/tools/filesystems/simg2img/default.nix +++ b/pkgs/tools/filesystems/simg2img/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, zlib }: +{ lib, stdenv, fetchFromGitHub, zlib }: stdenv.mkDerivation rec { pname = "simg2img"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Tool to convert Android sparse images to raw images"; homepage = "https://github.com/anestisb/android-simg2img"; license = licenses.asl20; diff --git a/pkgs/tools/filesystems/smbnetfs/default.nix b/pkgs/tools/filesystems/smbnetfs/default.nix index 04c7d7c9d2a9..7967be701065 100644 --- a/pkgs/tools/filesystems/smbnetfs/default.nix +++ b/pkgs/tools/filesystems/smbnetfs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fuse, samba, pkgconfig, glib, autoconf, attr, libsecret }: +{ lib, stdenv, fetchurl, fuse, samba, pkgconfig, glib, autoconf, attr, libsecret }: stdenv.mkDerivation rec { pname = "smbnetfs"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { substituteInPlace src/function.c --replace "attr/xattr.h" "sys/xattr.h" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A FUSE FS for mounting Samba shares"; maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; diff --git a/pkgs/tools/filesystems/sshfs-fuse/default.nix b/pkgs/tools/filesystems/sshfs-fuse/default.nix index 3922851af331..bec84b3810e5 100644 --- a/pkgs/tools/filesystems/sshfs-fuse/default.nix +++ b/pkgs/tools/filesystems/sshfs-fuse/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , meson, pkg-config, ninja, docutils, makeWrapper , fuse3, glib , which, python3Packages @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { python3 -m pytest test/ ''; - meta = with stdenv.lib; { + meta = with lib; { inherit (src.meta) homepage; description = "FUSE-based filesystem that allows remote filesystems to be mounted over SSH"; platforms = platforms.linux; diff --git a/pkgs/tools/filesystems/tmsu/default.nix b/pkgs/tools/filesystems/tmsu/default.nix index 5efa218ed081..7129de950136 100644 --- a/pkgs/tools/filesystems/tmsu/default.nix +++ b/pkgs/tools/filesystems/tmsu/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, fuse, installShellFiles }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub, fuse, installShellFiles }: buildGoPackage rec { pname = "tmsu"; @@ -30,7 +30,7 @@ buildGoPackage rec { installShellCompletion --zsh src/misc/zsh/_tmsu ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.tmsu.org"; description = "A tool for tagging your files using a virtual filesystem"; maintainers = with maintainers; [ pSub ]; diff --git a/pkgs/tools/filesystems/u3-tool/default.nix b/pkgs/tools/filesystems/u3-tool/default.nix index f18eb9e82271..6abab83b0fd0 100644 --- a/pkgs/tools/filesystems/u3-tool/default.nix +++ b/pkgs/tools/filesystems/u3-tool/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "u3-tool"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1p9c9kibd1pdbdfa0nd0i3n7bvzi3xg0chm38jg3xfl8gsn0390f"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Tool for controlling the special features of a 'U3 smart drive' USB Flash disk"; homepage = "https://sourceforge.net/projects/u3-tool/"; license = licenses.gpl2; diff --git a/pkgs/tools/filesystems/ubidump/default.nix b/pkgs/tools/filesystems/ubidump/default.nix index 4feca6a040b4..2787b87964fd 100644 --- a/pkgs/tools/filesystems/ubidump/default.nix +++ b/pkgs/tools/filesystems/ubidump/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python3, makeWrapper }: +{ lib, stdenv, fetchFromGitHub, python3, makeWrapper }: python3.pkgs.buildPythonApplication rec { @@ -30,7 +30,7 @@ python3.pkgs.buildPythonApplication rec { $out/bin/ubidump -h > /dev/null ''; - meta = with stdenv.lib; { + meta = with lib; { description = "View or extract the contents of UBIFS images"; homepage = "https://github.com/nlitsme/ubidump"; license = licenses.mit; diff --git a/pkgs/tools/filesystems/udftools/default.nix b/pkgs/tools/filesystems/udftools/default.nix index 0f52635efc60..ec3fd6efefae 100644 --- a/pkgs/tools/filesystems/udftools/default.nix +++ b/pkgs/tools/filesystems/udftools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ncurses, readline, autoreconfHook }: +{ lib, stdenv, fetchFromGitHub, ncurses, readline, autoreconfHook }: stdenv.mkDerivation rec { pname = "udftools"; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { sed -i -e "s@/usr/sbin/pktsetup@$out/sbin/pktsetup@" $out/lib/udev/rules.d/80-pktsetup.rules ''; - meta = with stdenv.lib; { + meta = with lib; { description = "UDF tools"; maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; diff --git a/pkgs/tools/filesystems/unionfs-fuse/default.nix b/pkgs/tools/filesystems/unionfs-fuse/default.nix index 359d8b7abbe4..77f45d06c91c 100644 --- a/pkgs/tools/filesystems/unionfs-fuse/default.nix +++ b/pkgs/tools/filesystems/unionfs-fuse/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, fuse }: +{ lib, stdenv, fetchFromGitHub, cmake, fuse }: stdenv.mkDerivation rec { pname = "unionfs-fuse"; @@ -19,7 +19,8 @@ stdenv.mkDerivation rec { ./prevent-kill-on-shutdown.patch ]; - buildInputs = [ cmake fuse ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ fuse ]; # Put the unionfs mount helper in place as mount.unionfs-fuse. This makes it # possible to do: @@ -34,7 +35,7 @@ stdenv.mkDerivation rec { substituteInPlace $out/sbin/mount.unionfs-fuse --replace unionfs $out/bin/unionfs ''; - meta = with stdenv.lib; { + meta = with lib; { description = "FUSE UnionFS implementation"; homepage = "https://github.com/rpodgorny/unionfs-fuse"; license = licenses.bsd3; diff --git a/pkgs/tools/filesystems/vmfs-tools/default.nix b/pkgs/tools/filesystems/vmfs-tools/default.nix index f473fa04334a..2d4f3b22a771 100644 --- a/pkgs/tools/filesystems/vmfs-tools/default.nix +++ b/pkgs/tools/filesystems/vmfs-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , pkgconfig , asciidoc @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { install -Dm444 -t $out/share/doc/${pname} AUTHORS LICENSE README TODO ''; - meta = with stdenv.lib; { + meta = with lib; { description = "FUSE-based VMFS (vmware) file system tools"; maintainers = with maintainers; [ peterhoeg ]; license = licenses.gpl2; diff --git a/pkgs/tools/filesystems/wdfs/default.nix b/pkgs/tools/filesystems/wdfs/default.nix index af1caecfd748..d32138f184be 100644 --- a/pkgs/tools/filesystems/wdfs/default.nix +++ b/pkgs/tools/filesystems/wdfs/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, glib, neon, fuse, pkgconfig}: +{lib, stdenv, fetchurl, glib, neon, fuse, pkgconfig}: stdenv.mkDerivation { name = "wdfs-fuse-1.4.2"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig ]; buildInputs = [fuse glib neon]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://noedler.de/projekte/wdfs/"; license = licenses.gpl2; description = "User-space filesystem that allows to mount a webdav share"; diff --git a/pkgs/tools/filesystems/wiimms-iso-tools/default.nix b/pkgs/tools/filesystems/wiimms-iso-tools/default.nix index cb09fdcf131a..70c445014098 100644 --- a/pkgs/tools/filesystems/wiimms-iso-tools/default.nix +++ b/pkgs/tools/filesystems/wiimms-iso-tools/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, zlib, ncurses, fuse}: +{lib, stdenv, fetchurl, zlib, ncurses, fuse}: stdenv.mkDerivation rec { name = "wiimms-iso-tools"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ./install.sh --no-sudo ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://wit.wiimm.de"; description = "A set of command line tools to manipulate Wii and GameCube ISO images and WBFS containers"; license = licenses.gpl2; diff --git a/pkgs/tools/filesystems/xfsprogs/default.nix b/pkgs/tools/filesystems/xfsprogs/default.nix index 95e95ff6a183..3e3c26329c4f 100644 --- a/pkgs/tools/filesystems/xfsprogs/default.nix +++ b/pkgs/tools/filesystems/xfsprogs/default.nix @@ -1,22 +1,14 @@ -{ stdenv, buildPackages, fetchpatch, fetchgit, autoconf, automake, gettext, libtool, pkgconfig -, icu, libuuid, readline +{ lib, stdenv, buildPackages, fetchpatch, fetchurl, autoconf, automake, gettext, libtool, pkgconfig +, icu, libuuid, readline, inih }: -let - gentooPatch = name: sha256: fetchpatch { - url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sys-fs/xfsprogs/files/${name}?id=2517dd766cf84d251631f4324f7ec4bce912abb9"; - inherit sha256; - }; -in - stdenv.mkDerivation rec { pname = "xfsprogs"; - version = "4.19.0"; + version = "5.10.0"; - src = fetchgit { - url = "https://git.kernel.org/pub/scm/fs/xfs/xfsprogs-dev.git"; - rev = "v${version}"; - sha256 = "18728hzfxr1bg4bdzqlxjs893ac1zwlfr7nmc2q4a1sxs0sphd1d"; + src = fetchurl { + url = "mirror://kernel/linux/utils/fs/xfs/xfsprogs/${pname}-${version}.tar.xz"; + sha256 = "1schqzjx836jd54l10pqds7hyli2m77df3snk95xbr23dpj1fh70"; }; outputs = [ "bin" "dev" "out" "doc" ]; @@ -26,26 +18,24 @@ stdenv.mkDerivation rec { autoconf automake libtool gettext pkgconfig libuuid # codegen tool uses libuuid ]; - buildInputs = [ readline icu ]; + buildInputs = [ readline icu inih ]; propagatedBuildInputs = [ libuuid ]; # Dev headers include enableParallelBuilding = true; - # Why is all this garbage needed? Why? Why? - patches = [ - (gentooPatch "xfsprogs-4.15.0-sharedlibs.patch" "0bv2naxpiw7vcsg8p1v2i47wgfda91z1xy1kfwydbp4wmb4nbyyv") - (gentooPatch "xfsprogs-4.15.0-docdir.patch" "1srgdidvq2ka0rmfdwpqp92fapgh53w1h7rajm4nnby5vp2v8dfr") - (gentooPatch "xfsprogs-4.9.0-underlinking.patch" "1r7l8jphspy14i43zbfnjrnyrdm4cpgyfchblascxylmans0gci7") - ]; - + # @sbindir@ is replaced with /run/current-system/sw/bin to fix dependency cycles preConfigure = '' - sed -i Makefile -e '/cp include.install-sh/d' + for file in scrub/{xfs_scrub_all.cron.in,xfs_scrub@.service.in,xfs_scrub_all.service.in}; do + substituteInPlace "$file" \ + --replace '@sbindir@' '/run/current-system/sw/bin' + done make configure + patchShebangs ./install-sh ''; configureFlags = [ "--disable-lib64" - "--enable-readline" + "--with-systemd-unit-dir=${placeholder "out"}/lib/systemd/system" ]; installFlags = [ "install-dev" ]; @@ -55,11 +45,11 @@ stdenv.mkDerivation rec { find . -type d -name .libs | xargs rm -rf ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://xfs.org/"; description = "SGI XFS utilities"; license = licenses.lgpl21; platforms = platforms.linux; - maintainers = with maintainers; [ dezgeg ]; + maintainers = with maintainers; [ dezgeg ajs124 ]; }; } diff --git a/pkgs/tools/filesystems/zfstools/default.nix b/pkgs/tools/filesystems/zfstools/default.nix index 476d80653127..ecc4b1184867 100644 --- a/pkgs/tools/filesystems/zfstools/default.nix +++ b/pkgs/tools/filesystems/zfstools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ruby, zfs }: +{ lib, stdenv, fetchFromGitHub, ruby, zfs }: let version = "0.3.6"; in stdenv.mkDerivation rec { @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { sed -e 's|cmd.*=.*"zfs |cmd = "${zfs}/sbin/zfs |g' -i $out/lib/zfstools/{dataset,snapshot}.rb ''; - meta = with stdenv.lib; { + meta = with lib; { inherit version; inherit (src.meta) homepage; description = "OpenSolaris-compatible auto-snapshotting script for ZFS"; diff --git a/pkgs/tools/graphics/amber/default.nix b/pkgs/tools/graphics/amber/default.nix index 1b8c90c8fb70..f5156dd08abf 100644 --- a/pkgs/tools/graphics/amber/default.nix +++ b/pkgs/tools/graphics/amber/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , cmake , pkg-config @@ -86,7 +86,7 @@ stdenv.mkDerivation rec { install -Dm755 -t $out/bin amber image_diff ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Multi-API shader test framework"; homepage = "https://github.com/google/amber"; license = licenses.asl20; diff --git a/pkgs/tools/graphics/appleseed/default.nix b/pkgs/tools/graphics/appleseed/default.nix index e9e57595e3d3..a0d659efb3e8 100644 --- a/pkgs/tools/graphics/appleseed/default.nix +++ b/pkgs/tools/graphics/appleseed/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, boost165, pkgconfig, guile, +{ lib, stdenv, fetchFromGitHub, cmake, boost165, pkg-config, guile, eigen, libpng, python, libGLU, qt4, openexr, openimageio, opencolorio, xercesc, ilmbase, osl, seexpr, makeWrapper }: @@ -18,10 +18,11 @@ in stdenv.mkDerivation rec { rev = version; sha256 = "1sq9s0rzjksdn8ayp1g17gdqhp7fqks8v1ddd3i5rsl96b04fqx5"; }; + nativeBuildInputs = [ cmake pkg-config makeWrapper ]; buildInputs = [ - cmake pkgconfig boost_static guile eigen libpng python + boost_static guile eigen libpng python libGLU qt4 openexr openimageio opencolorio xercesc - osl seexpr makeWrapper + osl seexpr ]; NIX_CFLAGS_COMPILE = toString [ @@ -46,9 +47,8 @@ in stdenv.mkDerivation rec { "-DUSE_SSE=ON" "-DUSE_SSE42=ON" ]; - enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Open source, physically-based global illumination rendering engine"; homepage = "https://appleseedhq.net/"; maintainers = with maintainers; [ hodapp ]; diff --git a/pkgs/tools/graphics/argyllcms/default.nix b/pkgs/tools/graphics/argyllcms/default.nix index 115a9a3e4a56..727aa1dc56e3 100644 --- a/pkgs/tools/graphics/argyllcms/default.nix +++ b/pkgs/tools/graphics/argyllcms/default.nix @@ -114,7 +114,7 @@ stdenv.mkDerivation rec { mv $out/ref $out/share/argyllcms ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.argyllcms.com"; description = "Color management system (compatible with ICC)"; license = licenses.gpl3; diff --git a/pkgs/tools/graphics/asymptote/default.nix b/pkgs/tools/graphics/asymptote/default.nix index 6b8c6870a668..a7c6d6eb4394 100644 --- a/pkgs/tools/graphics/asymptote/default.nix +++ b/pkgs/tools/graphics/asymptote/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchurl, fetchpatch +{ lib, stdenv, fetchFromGitHub, fetchurl, fetchpatch , autoreconfHook, bison, glm, yacc, flex , freeglut, ghostscriptX, imagemagick, fftw , boehmgc, libGLU, libGL, mesa, ncurses, readline, gsl, libsigsegv @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A tool for programming graphics intended to replace Metapost"; license = licenses.gpl3Plus; maintainers = [ maintainers.raskin maintainers.peti ]; diff --git a/pkgs/tools/graphics/barcode/default.nix b/pkgs/tools/graphics/barcode/default.nix index 48558d022597..2906304a6d2a 100644 --- a/pkgs/tools/graphics/barcode/default.nix +++ b/pkgs/tools/graphics/barcode/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { version = "0.99"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "GNU barcode generator"; maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; # Maybe other non-darwin Unix diff --git a/pkgs/tools/graphics/blockhash/default.nix b/pkgs/tools/graphics/blockhash/default.nix index b4f99a9192cd..3ea88053d9e3 100644 --- a/pkgs/tools/graphics/blockhash/default.nix +++ b/pkgs/tools/graphics/blockhash/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python, pkgconfig, imagemagick, wafHook }: +{ lib, stdenv, fetchFromGitHub, python, pkgconfig, imagemagick, wafHook }: stdenv.mkDerivation rec { pname = "blockhash"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ python pkgconfig wafHook ]; buildInputs = [ imagemagick ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://blockhash.io/"; description = '' This is a perceptual image hash calculation tool based on algorithm diff --git a/pkgs/tools/graphics/blur-effect/default.nix b/pkgs/tools/graphics/blur-effect/default.nix index b22a2e8970b6..7ccda815e1ca 100644 --- a/pkgs/tools/graphics/blur-effect/default.nix +++ b/pkgs/tools/graphics/blur-effect/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, cmake, gdk-pixbuf, libGL, mesa }: +{ lib, stdenv, fetchFromGitHub, pkgconfig, cmake, gdk-pixbuf, libGL, mesa }: stdenv.mkDerivation rec { pname = "blur-effect"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { mesa ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/sonald/blur-effect"; description = "Off-screen image blurring utility using OpenGL ES 3.0"; license = licenses.gpl3; diff --git a/pkgs/tools/graphics/cfdg/default.nix b/pkgs/tools/graphics/cfdg/default.nix index 2cbf43407ffe..9295bbe28d56 100644 --- a/pkgs/tools/graphics/cfdg/default.nix +++ b/pkgs/tools/graphics/cfdg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libpng, bison, flex, ffmpeg_3, icu }: +{ lib, stdenv, fetchFromGitHub, libpng, bison, flex, ffmpeg_3, icu }: stdenv.mkDerivation rec { pname = "cfdg"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { cp *.txt $out/share/doc/${pname}-${version} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Context-free design grammar - a tool for graphics generation"; maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; diff --git a/pkgs/tools/graphics/cuneiform/default.nix b/pkgs/tools/graphics/cuneiform/default.nix index 5213245b7d4b..ac6481cc6251 100644 --- a/pkgs/tools/graphics/cuneiform/default.nix +++ b/pkgs/tools/graphics/cuneiform/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, imagemagick }: +{ lib, stdenv, fetchurl, cmake, imagemagick }: stdenv.mkDerivation { pname = "cuneiform"; @@ -24,7 +24,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Multi-language OCR system"; homepage = "https://launchpad.net/cuneiform-linux"; license = licenses.bsd3; diff --git a/pkgs/tools/graphics/directx-shader-compiler/default.nix b/pkgs/tools/graphics/directx-shader-compiler/default.nix index 4e74d2c443f1..6bab32ff27fa 100644 --- a/pkgs/tools/graphics/directx-shader-compiler/default.nix +++ b/pkgs/tools/graphics/directx-shader-compiler/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, python3, git }: +{ lib, stdenv, fetchFromGitHub, cmake, python3, git }: stdenv.mkDerivation rec { pname = "directx-shader-compiler"; @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { cp -r $src/include/dxc $dev/include/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A compiler to compile HLSL programs into DXIL and SPIR-V"; homepage = "https://github.com/microsoft/DirectXShaderCompiler"; platforms = with platforms; linux ++ darwin; diff --git a/pkgs/tools/graphics/ditaa/default.nix b/pkgs/tools/graphics/ditaa/default.nix index 89a18ae1fe2a..79a24ed3841c 100644 --- a/pkgs/tools/graphics/ditaa/default.nix +++ b/pkgs/tools/graphics/ditaa/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jre }: +{ lib, stdenv, fetchurl, jre }: stdenv.mkDerivation rec { name = "ditaa-0.11.0"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { chmod a+x "$out/bin/ditaa" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Convert ascii art diagrams into proper bitmap graphics"; homepage = "https://github.com/stathissideris/ditaa"; license = licenses.lgpl3; diff --git a/pkgs/tools/graphics/dpic/default.nix b/pkgs/tools/graphics/dpic/default.nix index ea65f3dbb55c..c0dc7661715d 100644 --- a/pkgs/tools/graphics/dpic/default.nix +++ b/pkgs/tools/graphics/dpic/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "dpic"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { # The prefix passed to configure is not used. makeFlags = [ "DESTDIR=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "An implementation of the pic little language for creating drawings"; homepage = "https://ece.uwaterloo.ca/~aplevich/dpic/"; license = licenses.bsd2; diff --git a/pkgs/tools/graphics/editres/default.nix b/pkgs/tools/graphics/editres/default.nix index 1dc4891d6423..2c9eadea8bfb 100644 --- a/pkgs/tools/graphics/editres/default.nix +++ b/pkgs/tools/graphics/editres/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libXt, libXaw, libXres, utilmacros }: +{ lib, stdenv, fetchurl, pkgconfig, libXt, libXaw, libXres, utilmacros }: stdenv.mkDerivation rec { name = "editres-1.0.7"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://cgit.freedesktop.org/xorg/app/editres/"; description = "A dynamic resource editor for X Toolkit applications"; license = licenses.mit; diff --git a/pkgs/tools/graphics/enblend-enfuse/default.nix b/pkgs/tools/graphics/enblend-enfuse/default.nix index 89c861267f0b..d071b2441672 100644 --- a/pkgs/tools/graphics/enblend-enfuse/default.nix +++ b/pkgs/tools/graphics/enblend-enfuse/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , boost, freeglut, glew, gsl, lcms2, libpng, libtiff, libGLU, libGL, vigra , help2man, pkgconfig, perl, texlive }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://enblend.sourceforge.net/"; description = "Blends away the seams in a panoramic image mosaic using a multiresolution spline"; license = licenses.gpl2; diff --git a/pkgs/tools/graphics/eplot/default.nix b/pkgs/tools/graphics/eplot/default.nix index de729e38662d..b4dd9cd36d8d 100644 --- a/pkgs/tools/graphics/eplot/default.nix +++ b/pkgs/tools/graphics/eplot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gnuplot, ruby }: +{ lib, stdenv, fetchurl, gnuplot, ruby }: stdenv.mkDerivation { name = "eplot-2.07"; @@ -28,7 +28,7 @@ stdenv.mkDerivation { sed -i -e "s|gnuplot -persist|${gnuplot}/bin/gnuplot -persist|" "$out/bin/eplot" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Create plots quickly with gnuplot"; longDescription = '' eplot ("easy gnuplot") is a ruby script which allows to pipe data easily diff --git a/pkgs/tools/graphics/epstool/default.nix b/pkgs/tools/graphics/epstool/default.nix index aed49158599a..8052434ff0b8 100644 --- a/pkgs/tools/graphics/epstool/default.nix +++ b/pkgs/tools/graphics/epstool/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { version = "3.08"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { patches = [ ./gcc43.patch ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A utility to create or extract preview images in EPS files, fix bounding boxes and convert to bitmaps"; homepage = "http://pages.cs.wisc.edu/~ghost/gsview/epstool.htm"; license = licenses.gpl2; diff --git a/pkgs/tools/graphics/exif/default.nix b/pkgs/tools/graphics/exif/default.nix index 68007ec3a6b2..33a085724ec5 100644 --- a/pkgs/tools/graphics/exif/default.nix +++ b/pkgs/tools/graphics/exif/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libexif, popt, libintl }: +{ lib, stdenv, fetchurl, pkgconfig, libexif, popt, libintl }: stdenv.mkDerivation rec { name = "exif-0.6.21"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libexif popt libintl ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://libexif.github.io"; description = "A utility to read and manipulate EXIF data in digital photographs"; platforms = platforms.unix; diff --git a/pkgs/tools/graphics/exifprobe/default.nix b/pkgs/tools/graphics/exifprobe/default.nix index 93a9be58b72a..7331ac69185a 100644 --- a/pkgs/tools/graphics/exifprobe/default.nix +++ b/pkgs/tools/graphics/exifprobe/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "exifprobe"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { rm -r $out/usr ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Tool for reading EXIF data from image files produced by digital cameras"; homepage = "https://github.com/hfiguiere/exifprobe"; license = licenses.bsd2; diff --git a/pkgs/tools/graphics/facedetect/default.nix b/pkgs/tools/graphics/facedetect/default.nix index 690c7336b695..257de05a898a 100644 --- a/pkgs/tools/graphics/facedetect/default.nix +++ b/pkgs/tools/graphics/facedetect/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python2Packages }: +{ lib, stdenv, fetchFromGitHub, python2Packages }: stdenv.mkDerivation rec { pname = "facedetect"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { wrapPythonPrograms ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.thregr.org/~wavexx/software/facedetect/"; description = "A simple face detector for batch processing"; license = licenses.gpl2Plus; diff --git a/pkgs/tools/graphics/fbv/default.nix b/pkgs/tools/graphics/fbv/default.nix index 561c007ff161..6f6e0aeca2cc 100644 --- a/pkgs/tools/graphics/fbv/default.nix +++ b/pkgs/tools/graphics/fbv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, getopt, libjpeg, libpng12, libungif }: +{ lib, stdenv, fetchurl, getopt, libjpeg, libpng12, libungif }: stdenv.mkDerivation rec { name = "fbv-1.0b"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { mkdir -p $out/{bin,man/man1} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "View pictures on a linux framebuffer device"; homepage = "http://s-tech.elsat.net.pl/fbv/"; license = licenses.gpl2; diff --git a/pkgs/tools/graphics/feedgnuplot/default.nix b/pkgs/tools/graphics/feedgnuplot/default.nix index ef699b5437a0..1fe254d77857 100644 --- a/pkgs/tools/graphics/feedgnuplot/default.nix +++ b/pkgs/tools/graphics/feedgnuplot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, makeWrapper, gawk +{ lib, stdenv, fetchFromGitHub, makeWrapper, gawk , makeFontsConf, freefont_ttf, gnuplot, perl, perlPackages }: @@ -46,7 +46,7 @@ perlPackages.buildPerlPackage rec { completions/zsh/_feedgnuplot ''; - meta = with stdenv.lib; { + meta = with lib; { description = "General purpose pipe-oriented plotting tool"; homepage = "https://github.com/dkogan/feedgnuplot/"; license = with licenses; [ artistic1 gpl1Plus ]; diff --git a/pkgs/tools/graphics/fgallery/default.nix b/pkgs/tools/graphics/fgallery/default.nix index cc387e29412b..9694fb728f8c 100644 --- a/pkgs/tools/graphics/fgallery/default.nix +++ b/pkgs/tools/graphics/fgallery/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, makeWrapper, perlPackages +{ lib, stdenv, fetchurl, unzip, makeWrapper, perlPackages , coreutils, zip, imagemagick, pngcrush, lcms2 , facedetect, fbida }: @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { [ coreutils zip imagemagick pngcrush lcms2 facedetect fbida ]}" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Static photo gallery generator"; homepage = "http://www.thregr.org/~wavexx/software/fgallery/"; license = licenses.gpl2; diff --git a/pkgs/tools/graphics/fim/default.nix b/pkgs/tools/graphics/fim/default.nix index 6a3d9a29db37..9a3163951d24 100644 --- a/pkgs/tools/graphics/fim/default.nix +++ b/pkgs/tools/graphics/fim/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoconf, automake, pkgconfig +{ gcc9Stdenv, fetchurl, autoconf, automake, pkgconfig, lib , perl, flex, bison, readline, libexif , x11Support ? true, SDL , svgSupport ? true, inkscape @@ -9,7 +9,7 @@ , pngSupport ? true, libpng }: -stdenv.mkDerivation rec { +gcc9Stdenv.mkDerivation rec { pname = "fim"; version = "0.6"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoconf automake pkgconfig ]; - buildInputs = with stdenv.lib; + buildInputs = with lib; [ perl flex bison readline libexif ] ++ optional x11Support SDL ++ optional svgSupport inkscape @@ -35,9 +35,9 @@ stdenv.mkDerivation rec { ++ optional jpegSupport libjpeg ++ optional pngSupport libpng; - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString x11Support "-lSDL"; + NIX_CFLAGS_COMPILE = lib.optionalString x11Support "-lSDL"; - meta = with stdenv.lib; { + meta = with lib; { description = "A lightweight, highly customizable and scriptable image viewer"; longDescription = '' FIM (Fbi IMproved) is a lightweight, console based image viewer that aims diff --git a/pkgs/tools/graphics/flam3/default.nix b/pkgs/tools/graphics/flam3/default.nix index 29560cfe6e55..58aefd1d5852 100644 --- a/pkgs/tools/graphics/flam3/default.nix +++ b/pkgs/tools/graphics/flam3/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, zlib, libpng, libxml2, libjpeg }: +{lib, stdenv, fetchFromGitHub, zlib, libpng, libxml2, libjpeg }: stdenv.mkDerivation rec { pname = "flam3"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ zlib libpng libxml2 libjpeg ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Cosmic recursive fractal flames"; homepage = "https://flam3.com/"; maintainers = [ maintainers.nand0p ]; diff --git a/pkgs/tools/graphics/ggobi/default.nix b/pkgs/tools/graphics/ggobi/default.nix index 82ee194ad121..bce1564946c7 100644 --- a/pkgs/tools/graphics/ggobi/default.nix +++ b/pkgs/tools/graphics/ggobi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libxml2, gtk2 }: +{ lib, stdenv, fetchurl, pkgconfig, libxml2, gtk2 }: stdenv.mkDerivation rec { version = "2.1.11"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Visualization program for exploring high-dimensional data"; homepage = "http://www.ggobi.org/"; license = licenses.cpl10; diff --git a/pkgs/tools/graphics/gifsicle/default.nix b/pkgs/tools/graphics/gifsicle/default.nix index 007ba0f99720..72220fab4803 100644 --- a/pkgs/tools/graphics/gifsicle/default.nix +++ b/pkgs/tools/graphics/gifsicle/default.nix @@ -1,4 +1,7 @@ -{ stdenv, fetchurl, xorgproto, libXt, libX11, gifview ? false, static ? false }: +{ stdenv, fetchurl, xorgproto, libXt, libX11 +, gifview ? false +, static ? stdenv.hostPlatform.isStatic +}: with stdenv.lib; diff --git a/pkgs/tools/graphics/gifski/default.nix b/pkgs/tools/graphics/gifski/default.nix index aa247a4c9177..38f83c076ff8 100644 --- a/pkgs/tools/graphics/gifski/default.nix +++ b/pkgs/tools/graphics/gifski/default.nix @@ -1,4 +1,4 @@ -{ stdenv, rustPlatform, fetchFromGitHub, pkgconfig }: +{ lib, stdenv, rustPlatform, fetchFromGitHub, pkgconfig }: rustPlatform.buildRustPackage rec { pname = "gifski"; @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkgconfig ]; - meta = with stdenv.lib; { + meta = with lib; { description = "GIF encoder based on libimagequant (pngquant)"; homepage = "https://gif.ski/"; license = licenses.agpl3; diff --git a/pkgs/tools/graphics/glee/default.nix b/pkgs/tools/graphics/glee/default.nix index 58fcfbfd9aca..fad37d1e08eb 100644 --- a/pkgs/tools/graphics/glee/default.nix +++ b/pkgs/tools/graphics/glee/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchgit, cmake, libGLU, libGL, xorg }: +{lib, stdenv, fetchgit, cmake, libGLU, libGL, xorg }: stdenv.mkDerivation rec { pname = "glee"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { sed -i 's/readme/Readme/' cmake_install.cmake ''; - meta = with stdenv.lib; { + meta = with lib; { description = "GL Easy Extension Library"; homepage = "https://sourceforge.net/p/glee/glee/"; maintainers = with maintainers; [ nand0p ]; diff --git a/pkgs/tools/graphics/glmark2/default.nix b/pkgs/tools/graphics/glmark2/default.nix index deea9e10a1a0..e2acd81b9b00 100644 --- a/pkgs/tools/graphics/glmark2/default.nix +++ b/pkgs/tools/graphics/glmark2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, libjpeg, libpng, xorg, libX11, libGL, libdrm, +{ lib, stdenv, fetchFromGitHub, pkgconfig, libjpeg, libpng, xorg, libX11, libGL, libdrm, python27, wayland, udev, mesa, wafHook }: stdenv.mkDerivation { @@ -19,7 +19,7 @@ stdenv.mkDerivation { wafConfigureFlags = ["--with-flavors=x11-gl,x11-glesv2,drm-gl,drm-glesv2,wayland-gl,wayland-glesv2"]; - meta = with stdenv.lib; { + meta = with lib; { description = "OpenGL (ES) 2.0 benchmark"; homepage = "https://github.com/glmark2/glmark2"; license = licenses.gpl3Plus; diff --git a/pkgs/tools/graphics/glxinfo/default.nix b/pkgs/tools/graphics/glxinfo/default.nix index 6518a74512ba..0dcf30fda156 100644 --- a/pkgs/tools/graphics/glxinfo/default.nix +++ b/pkgs/tools/graphics/glxinfo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libGL, libX11 }: +{ lib, stdenv, fetchurl, libGL, libX11 }: stdenv.mkDerivation rec { pname = "glxinfo"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { install -Dm 555 -t $out/bin glx{info,gears} es2{_info,gears} eglinfo "; - meta = with stdenv.lib; { + meta = with lib; { description = "Test utilities for OpenGL"; homepage = "https://www.mesa3d.org/"; license = licenses.mit; diff --git a/pkgs/tools/graphics/gmic/default.nix b/pkgs/tools/graphics/gmic/default.nix index e8e9472cabdf..07d4d1dd303a 100644 --- a/pkgs/tools/graphics/gmic/default.nix +++ b/pkgs/tools/graphics/gmic/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , cmake , ninja @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { "-DENABLE_DYNAMIC_LINKING=ON" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Open and full-featured framework for image processing"; homepage = "https://gmic.eu/"; license = licenses.cecill20; diff --git a/pkgs/tools/graphics/graph-easy/default.nix b/pkgs/tools/graphics/graph-easy/default.nix index 009a86094ec5..4ae68207aaec 100644 --- a/pkgs/tools/graphics/graph-easy/default.nix +++ b/pkgs/tools/graphics/graph-easy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, perlPackages, fetchurl }: +{ lib, stdenv, perlPackages, fetchurl }: perlPackages.buildPerlPackage { pname = "Graph-Easy"; @@ -8,7 +8,7 @@ perlPackages.buildPerlPackage { sha256 = "d4a2c10aebef663b598ea37f3aa3e3b752acf1fbbb961232c3dbe1155008d1fa"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Render/convert graphs in/from various formats"; license = licenses.gpl1; platforms = platforms.unix; diff --git a/pkgs/tools/graphics/graphviz/base.nix b/pkgs/tools/graphics/graphviz/base.nix index cdec84270052..a3cdf9c6fc8e 100644 --- a/pkgs/tools/graphics/graphviz/base.nix +++ b/pkgs/tools/graphics/graphviz/base.nix @@ -1,6 +1,6 @@ { rev, sha256, version }: -{ stdenv, fetchFromGitLab, autoreconfHook, pkgconfig, cairo, expat, flex +{ lib, stdenv, fetchFromGitLab, autoreconfHook, pkgconfig, cairo, expat, flex , fontconfig, gd, gettext, gts, libdevil, libjpeg, libpng, libtool, pango , yacc, fetchpatch, xorg ? null, ApplicationServices ? null }: @@ -81,7 +81,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://graphviz.org"; description = "Graph visualization tools"; license = licenses.epl10; diff --git a/pkgs/tools/graphics/grim/default.nix b/pkgs/tools/graphics/grim/default.nix index a357277ed12e..cca74cea569a 100644 --- a/pkgs/tools/graphics/grim/default.nix +++ b/pkgs/tools/graphics/grim/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cairo, libjpeg, meson, ninja, wayland, pkgconfig, scdoc, wayland-protocols }: +{ lib, stdenv, fetchFromGitHub, cairo, libjpeg, meson, ninja, wayland, pkgconfig, scdoc, wayland-protocols }: stdenv.mkDerivation rec { pname = "grim"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { wayland-protocols ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Grab images from a Wayland compositor"; homepage = "https://github.com/emersion/grim"; license = licenses.mit; diff --git a/pkgs/tools/graphics/gromit-mpx/default.nix b/pkgs/tools/graphics/gromit-mpx/default.nix index b8c344258bb9..710ed04006c4 100644 --- a/pkgs/tools/graphics/gromit-mpx/default.nix +++ b/pkgs/tools/graphics/gromit-mpx/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config , gtk, glib, pcre, libappindicator, libpthreadstubs, libXdmcp , libxkbcommon, epoxy, at-spi2-core, dbus, libdbusmenu , wrapGAppsHook @@ -15,15 +15,14 @@ stdenv.mkDerivation rec { sha256 = "1xn14r7lhay720y78j1fs4amp5lia39kpq7vzv02x4nnwhgbsd9r"; }; - nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; + nativeBuildInputs = [ cmake pkg-config wrapGAppsHook ]; buildInputs = [ - cmake gtk glib pcre libappindicator libpthreadstubs libXdmcp libxkbcommon epoxy at-spi2-core dbus libdbusmenu ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Desktop annotation tool"; longDescription = '' diff --git a/pkgs/tools/graphics/ibniz/default.nix b/pkgs/tools/graphics/ibniz/default.nix index 564685c1ceaf..227ab5d082dc 100644 --- a/pkgs/tools/graphics/ibniz/default.nix +++ b/pkgs/tools/graphics/ibniz/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, SDL }: +{ lib, stdenv, fetchurl, SDL }: stdenv.mkDerivation rec { pname = "ibniz"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { cp ibniz $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Virtual machine designed for extremely compact low-level audiovisual programs"; homepage = "http://www.pelulamu.net/ibniz/"; license = licenses.zlib; diff --git a/pkgs/tools/graphics/imageworsener/default.nix b/pkgs/tools/graphics/imageworsener/default.nix index 3eade7ee76b9..120643ddde05 100644 --- a/pkgs/tools/graphics/imageworsener/default.nix +++ b/pkgs/tools/graphics/imageworsener/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , zlib , libpng @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A raster image scaling and processing utility"; homepage = "https://entropymine.com/imageworsener/"; changelog = "https://github.com/jsummers/${pname}/blob/${version}/changelog.txt"; diff --git a/pkgs/tools/graphics/imgur-screenshot/default.nix b/pkgs/tools/graphics/imgur-screenshot/default.nix index 1a211ebd857f..db96299abe13 100644 --- a/pkgs/tools/graphics/imgur-screenshot/default.nix +++ b/pkgs/tools/graphics/imgur-screenshot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, makeWrapper, curl, jq, gnugrep, libnotify, scrot, which, xclip }: +{ lib, stdenv, fetchFromGitHub, makeWrapper, curl, jq, gnugrep, libnotify, scrot, which, xclip }: let deps = stdenv.lib.makeBinPath [ curl jq gnugrep libnotify scrot which xclip ]; in stdenv.mkDerivation rec { @@ -19,7 +19,7 @@ in stdenv.mkDerivation rec { wrapProgram $out/bin/imgur-screenshot --prefix PATH ':' ${deps} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A tool for easy screencapping and uploading to imgur"; homepage = "https://github.com/jomo/imgur-screenshot/"; platforms = platforms.linux; diff --git a/pkgs/tools/graphics/imgurbash2/default.nix b/pkgs/tools/graphics/imgurbash2/default.nix index ea3b1ed9b02d..84e25150fab0 100644 --- a/pkgs/tools/graphics/imgurbash2/default.nix +++ b/pkgs/tools/graphics/imgurbash2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, bash, curl, xsel }: +{ lib, stdenv, fetchFromGitHub, bash, curl, xsel }: stdenv.mkDerivation rec { pname = "imgurbash2"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { chmod +x $out/bin/imgurbash2 ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A shell script that uploads images to imgur"; license = licenses.mit; platforms = platforms.linux; diff --git a/pkgs/tools/graphics/jhead/default.nix b/pkgs/tools/graphics/jhead/default.nix index 1d3696a8cd24..ab5fd4f5401d 100644 --- a/pkgs/tools/graphics/jhead/default.nix +++ b/pkgs/tools/graphics/jhead/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, libjpeg }: +{ lib, stdenv, fetchurl, fetchpatch, libjpeg }: stdenv.mkDerivation rec { pname = "jhead"; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { cp -v *.txt $out/share/doc/${pname}-${version} ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.sentex.net/~mwandel/jhead/"; description = "Exif Jpeg header manipulation tool"; license = licenses.publicDomain; diff --git a/pkgs/tools/graphics/ldgallery/compiler/default.nix b/pkgs/tools/graphics/ldgallery/compiler/default.nix new file mode 100644 index 000000000000..37aa2983b49f --- /dev/null +++ b/pkgs/tools/graphics/ldgallery/compiler/default.nix @@ -0,0 +1,37 @@ +# generated with cabal2nix by ./generate.sh +{ mkDerivation, aeson, base, cmdargs, containers, data-ordlist +, directory, fetchgit, filepath, Glob, hpack, parallel-io, process +, safe, stdenv, text, time, yaml +}: +mkDerivation { + pname = "ldgallery-compiler"; + version = "2.0"; + src = fetchgit { + url = "https://github.com/pacien/ldgallery.git"; + sha256 = "1a82wy6ns1434gdba2l04crvr5waf03y02bappcxqci2cfb1cznz"; + rev = "e93f7b1eb84c083d67567115284c0002a3a7d5fc"; + fetchSubmodules = true; + }; + postUnpack = "sourceRoot+=/compiler; echo source root reset to $sourceRoot"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base cmdargs containers data-ordlist directory filepath Glob + parallel-io process safe text time yaml + ]; + libraryToolDepends = [ hpack ]; + executableHaskellDepends = [ + aeson base cmdargs containers data-ordlist directory filepath Glob + parallel-io process safe text time yaml + ]; + testHaskellDepends = [ + aeson base cmdargs containers data-ordlist directory filepath Glob + parallel-io process safe text time yaml + ]; + prePatch = "hpack"; + homepage = "https://ldgallery.pacien.org"; + description = "A static generator which turns a collection of tagged pictures into a searchable web gallery"; + license = stdenv.lib.licenses.agpl3; + maintainers = with stdenv.lib.maintainers; [ pacien ]; +} diff --git a/pkgs/tools/graphics/ldgallery/compiler/generate.sh b/pkgs/tools/graphics/ldgallery/compiler/generate.sh new file mode 100755 index 000000000000..355206cb0ff9 --- /dev/null +++ b/pkgs/tools/graphics/ldgallery/compiler/generate.sh @@ -0,0 +1,19 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p cabal2nix + +set -euo pipefail + +if [ "$#" -ne 1 ] || [[ "$1" == -* ]]; then + echo "Regenerates the nix file for the ldgallery-compiler package." + echo "Usage: $0 " + exit 1 +fi + +echo "# generated with cabal2nix by ./generate.sh" > default.nix + +cabal2nix \ + --maintainer pacien \ + --subpath compiler \ + --revision $1 \ + "https://github.com/pacien/ldgallery.git" \ + >> default.nix diff --git a/pkgs/tools/graphics/ldgallery/default.nix b/pkgs/tools/graphics/ldgallery/default.nix new file mode 100644 index 000000000000..77acafcb8125 --- /dev/null +++ b/pkgs/tools/graphics/ldgallery/default.nix @@ -0,0 +1,53 @@ +{ lib, pkgs, makeWrapper, haskellPackages, haskell, pandoc, imagemagick7 }: + +with lib; +with haskell.lib; + +let + ldgallery-viewer = pkgs.callPackage ./viewer { }; + inherit (haskellPackages) ldgallery-compiler; + +in + +# making sure that the versions of the compiler and viewer parts are in sync +assert ldgallery-compiler.version == versions.majorMinor ldgallery-viewer.version; + +justStaticExecutables (overrideCabal ldgallery-compiler (oldAttrs: { + pname = "ldgallery"; # bundled viewer + compiler + + buildTools = (oldAttrs.buildTools or []) ++ [ makeWrapper pandoc ]; + + prePatch = '' + # add viewer dist to data + ln -s "${ldgallery-viewer}/share/ldgallery/viewer" "data/" + + ${oldAttrs.prePatch or ""} + ''; + + postInstall = '' + ${oldAttrs.postInstall or ""} + + # wrapper for runtime dependencies registration + wrapProgram "$out/bin/ldgallery" \ + --prefix PATH : ${lib.makeBinPath [ imagemagick7 ]} + + # bash completion + mkdir -p "$out/share/bash-completion/completions" + "$out/bin/ldgallery" \ + --help=bash \ + > "$out/share/bash-completion/completions/ldgallery" + + # man pages + mkdir -p $out/share/man/man{1,7} + ln -s ${ldgallery-viewer}/share/man/man7/* "$out/share/man/man7/" + pandoc --standalone --to man \ + "../ldgallery-quickstart.7.md" \ + --output "$out/share/man/man7/ldgallery-quickstart.7" + pandoc --standalone --to man \ + "ldgallery.1.md" \ + --output "$out/share/man/man1/ldgallery.1" + ''; + + # other package metadata (maintainer, description, license, ...) + # are inherited from the compiler package +})) diff --git a/pkgs/tools/graphics/ldgallery/viewer/default.nix b/pkgs/tools/graphics/ldgallery/viewer/default.nix new file mode 100644 index 000000000000..9559120069f7 --- /dev/null +++ b/pkgs/tools/graphics/ldgallery/viewer/default.nix @@ -0,0 +1,53 @@ +{ lib, stdenv, fetchFromGitHub, pkgs, nodejs-12_x, pandoc }: + +with lib; + +let + # Note for maintainers: + # * keep version in sync with the ldgallery compiler + # * regenerate node-*.nix with `./generate.sh ` + sourcePkg = fetchFromGitHub { + owner = "pacien"; + repo = "ldgallery"; + rev = "v2.0"; + sha256 = "1a82wy6ns1434gdba2l04crvr5waf03y02bappcxqci2cfb1cznz"; + }; + + nodePackages = import ./node-composition.nix { + inherit pkgs; + inherit (stdenv.hostPlatform) system; + + # some native node dependencies still require NodeJS 12 with Python 2 + nodejs = nodejs-12_x; + }; + + nodePkg = nodePackages.package.override { + src = "${sourcePkg}/viewer"; + postInstall = "npm run build"; + }; + +in + +# making sure that the source and the node package are in sync +assert versions.majorMinor nodePkg.version == removePrefix "v" sourcePkg.rev; + +stdenv.mkDerivation { + pname = nodePkg.packageName; + version = nodePkg.version; + src = nodePkg; + + buildInputs = [ pandoc ]; + + installPhase = '' + mkdir -p "$out/share/ldgallery" + cp -rp "lib/node_modules/ldgallery-viewer/dist" \ + "$out/share/ldgallery/viewer/" + cp -rp "lib/node_modules/ldgallery-viewer/examples" \ + "$out/share/ldgallery/viewer/" + + mkdir -p "$out/share/man/man7" + pandoc --standalone --to man \ + "lib/node_modules/ldgallery-viewer/ldgallery-viewer.7.md" \ + --output "$out/share/man/man7/ldgallery-viewer.7" + ''; +} diff --git a/pkgs/tools/graphics/ldgallery/viewer/generate.sh b/pkgs/tools/graphics/ldgallery/viewer/generate.sh new file mode 100755 index 000000000000..0874051b6765 --- /dev/null +++ b/pkgs/tools/graphics/ldgallery/viewer/generate.sh @@ -0,0 +1,34 @@ +#!/usr/bin/env nix-shell +#!nix-shell -I nixpkgs=../../../../.. -i bash -p nodePackages.node2nix + +# TODO: merge with other node packages in nixpkgs/pkgs/development/node-packages once +# * support for npm projects in sub-directories is added to node2nix: +# https://github.com/svanderburg/node2nix/issues/177 +# * we find a way to enable development dependencies for some of the packages + +set -euo pipefail + +if [ "$#" -ne 1 ] || [[ "$1" == -* ]]; then + echo "Regenerates the node composition and package nix files for the ldgallery-viewer package." + echo "Usage: $0 " + exit 1 +fi + +wget https://github.com/pacien/ldgallery/raw/$1/viewer/package.json +wget https://github.com/pacien/ldgallery/raw/$1/viewer/package-lock.json + +# Development dependencies are required for this Vue application to build +node2nix \ + --node-env ../../../../development/node-packages/node-env.nix \ + --development \ + --input ./package.json \ + --lock ./package-lock.json \ + --output node-packages.nix \ + --composition node-composition.nix + +rm package.json package-lock.json + +# Temporary quickfix to accomodate for the util-linux package rename. +# See https://github.com/svanderburg/node2nix/issues/213 +git restore :/pkgs/development/node-packages/node-env.nix +sed -i 's/utillinux/util-linux/g' node-composition.nix diff --git a/pkgs/tools/graphics/ldgallery/viewer/node-composition.nix b/pkgs/tools/graphics/ldgallery/viewer/node-composition.nix new file mode 100644 index 000000000000..f6c53f6c58da --- /dev/null +++ b/pkgs/tools/graphics/ldgallery/viewer/node-composition.nix @@ -0,0 +1,17 @@ +# This file has been generated by node2nix 1.8.0. Do not edit! + +{pkgs ? import { + inherit system; + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}: + +let + nodeEnv = import ../../../../development/node-packages/node-env.nix { + inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile; + inherit nodejs; + libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; + }; +in +import ./node-packages.nix { + inherit (pkgs) fetchurl fetchgit; + inherit nodeEnv; +} \ No newline at end of file diff --git a/pkgs/tools/graphics/ldgallery/viewer/node-packages.nix b/pkgs/tools/graphics/ldgallery/viewer/node-packages.nix new file mode 100644 index 000000000000..14691f640654 --- /dev/null +++ b/pkgs/tools/graphics/ldgallery/viewer/node-packages.nix @@ -0,0 +1,13269 @@ +# This file has been generated by node2nix 1.8.0. Do not edit! + +{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: + +let + sources = { + "@babel/code-frame-7.10.3" = { + name = "_at_babel_slash_code-frame"; + packageName = "@babel/code-frame"; + version = "7.10.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.3.tgz"; + sha512 = "fDx9eNW0qz0WkUeqL6tXEXzVlPh6Y5aCDEZesl0xBGA8ndRukX91Uk44ZqnkECp01NAZUdCAl+aiQNGi0k88Eg=="; + }; + }; + "@babel/code-frame-7.5.5" = { + name = "_at_babel_slash_code-frame"; + packageName = "@babel/code-frame"; + version = "7.5.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.5.5.tgz"; + sha512 = "27d4lZoomVyo51VegxI20xZPuSHusqbQag/ztrBC7wegWoQ1nLREPVSKSW8byhTlzTKyNE4ifaTA6lCp7JjpFw=="; + }; + }; + "@babel/compat-data-7.10.3" = { + name = "_at_babel_slash_compat-data"; + packageName = "@babel/compat-data"; + version = "7.10.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.10.3.tgz"; + sha512 = "BDIfJ9uNZuI0LajPfoYV28lX8kyCPMHY6uY4WH1lJdcicmAfxCK5ASzaeV0D/wsUaRH/cLk+amuxtC37sZ8TUg=="; + }; + }; + "@babel/core-7.10.3" = { + name = "_at_babel_slash_core"; + packageName = "@babel/core"; + version = "7.10.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/core/-/core-7.10.3.tgz"; + sha512 = "5YqWxYE3pyhIi84L84YcwjeEgS+fa7ZjK6IBVGTjDVfm64njkR2lfDhVR5OudLk8x2GK59YoSyVv+L/03k1q9w=="; + }; + }; + "@babel/generator-7.10.3" = { + name = "_at_babel_slash_generator"; + packageName = "@babel/generator"; + version = "7.10.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.10.3.tgz"; + sha512 = "drt8MUHbEqRzNR0xnF8nMehbY11b1SDkRw03PSNH/3Rb2Z35oxkddVSi3rcaak0YJQ86PCuE7Qx1jSFhbLNBMA=="; + }; + }; + "@babel/helper-annotate-as-pure-7.10.1" = { + name = "_at_babel_slash_helper-annotate-as-pure"; + packageName = "@babel/helper-annotate-as-pure"; + version = "7.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.10.1.tgz"; + sha512 = "ewp3rvJEwLaHgyWGe4wQssC2vjks3E80WiUe2BpMb0KhreTjMROCbxXcEovTrbeGVdQct5VjQfrv9EgC+xMzCw=="; + }; + }; + "@babel/helper-builder-binary-assignment-operator-visitor-7.10.3" = { + name = "_at_babel_slash_helper-builder-binary-assignment-operator-visitor"; + packageName = "@babel/helper-builder-binary-assignment-operator-visitor"; + version = "7.10.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.10.3.tgz"; + sha512 = "lo4XXRnBlU6eRM92FkiZxpo1xFLmv3VsPFk61zJKMm7XYJfwqXHsYJTY6agoc4a3L8QPw1HqWehO18coZgbT6A=="; + }; + }; + "@babel/helper-compilation-targets-7.10.2" = { + name = "_at_babel_slash_helper-compilation-targets"; + packageName = "@babel/helper-compilation-targets"; + version = "7.10.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.10.2.tgz"; + sha512 = "hYgOhF4To2UTB4LTaZepN/4Pl9LD4gfbJx8A34mqoluT8TLbof1mhUlYuNWTEebONa8+UlCC4X0TEXu7AOUyGA=="; + }; + }; + "@babel/helper-create-class-features-plugin-7.10.3" = { + name = "_at_babel_slash_helper-create-class-features-plugin"; + packageName = "@babel/helper-create-class-features-plugin"; + version = "7.10.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.10.3.tgz"; + sha512 = "iRT9VwqtdFmv7UheJWthGc/h2s7MqoweBF9RUj77NFZsg9VfISvBTum3k6coAhJ8RWv2tj3yUjA03HxPd0vfpQ=="; + }; + }; + "@babel/helper-create-regexp-features-plugin-7.10.1" = { + name = "_at_babel_slash_helper-create-regexp-features-plugin"; + packageName = "@babel/helper-create-regexp-features-plugin"; + version = "7.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.10.1.tgz"; + sha512 = "Rx4rHS0pVuJn5pJOqaqcZR4XSgeF9G/pO/79t+4r7380tXFJdzImFnxMU19f83wjSrmKHq6myrM10pFHTGzkUA=="; + }; + }; + "@babel/helper-define-map-7.10.3" = { + name = "_at_babel_slash_helper-define-map"; + packageName = "@babel/helper-define-map"; + version = "7.10.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.10.3.tgz"; + sha512 = "bxRzDi4Sin/k0drWCczppOhov1sBSdBvXJObM1NLHQzjhXhwRtn7aRWGvLJWCYbuu2qUk3EKs6Ci9C9ps8XokQ=="; + }; + }; + "@babel/helper-explode-assignable-expression-7.10.3" = { + name = "_at_babel_slash_helper-explode-assignable-expression"; + packageName = "@babel/helper-explode-assignable-expression"; + version = "7.10.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.10.3.tgz"; + sha512 = "0nKcR64XrOC3lsl+uhD15cwxPvaB6QKUDlD84OT9C3myRbhJqTMYir69/RWItUvHpharv0eJ/wk7fl34ONSwZw=="; + }; + }; + "@babel/helper-function-name-7.10.3" = { + name = "_at_babel_slash_helper-function-name"; + packageName = "@babel/helper-function-name"; + version = "7.10.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.3.tgz"; + sha512 = "FvSj2aiOd8zbeqijjgqdMDSyxsGHaMt5Tr0XjQsGKHD3/1FP3wksjnLAWzxw7lvXiej8W1Jt47SKTZ6upQNiRw=="; + }; + }; + "@babel/helper-get-function-arity-7.10.3" = { + name = "_at_babel_slash_helper-get-function-arity"; + packageName = "@babel/helper-get-function-arity"; + version = "7.10.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.3.tgz"; + sha512 = "iUD/gFsR+M6uiy69JA6fzM5seno8oE85IYZdbVVEuQaZlEzMO2MXblh+KSPJgsZAUx0EEbWXU0yJaW7C9CdAVg=="; + }; + }; + "@babel/helper-hoist-variables-7.10.3" = { + name = "_at_babel_slash_helper-hoist-variables"; + packageName = "@babel/helper-hoist-variables"; + version = "7.10.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.10.3.tgz"; + sha512 = "9JyafKoBt5h20Yv1+BXQMdcXXavozI1vt401KBiRc2qzUepbVnd7ogVNymY1xkQN9fekGwfxtotH2Yf5xsGzgg=="; + }; + }; + "@babel/helper-member-expression-to-functions-7.10.3" = { + name = "_at_babel_slash_helper-member-expression-to-functions"; + packageName = "@babel/helper-member-expression-to-functions"; + version = "7.10.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.10.3.tgz"; + sha512 = "q7+37c4EPLSjNb2NmWOjNwj0+BOyYlssuQ58kHEWk1Z78K5i8vTUsteq78HMieRPQSl/NtpQyJfdjt3qZ5V2vw=="; + }; + }; + "@babel/helper-module-imports-7.10.3" = { + name = "_at_babel_slash_helper-module-imports"; + packageName = "@babel/helper-module-imports"; + version = "7.10.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.10.3.tgz"; + sha512 = "Jtqw5M9pahLSUWA+76nhK9OG8nwYXzhQzVIGFoNaHnXF/r4l7kz4Fl0UAW7B6mqC5myoJiBP5/YQlXQTMfHI9w=="; + }; + }; + "@babel/helper-module-transforms-7.10.1" = { + name = "_at_babel_slash_helper-module-transforms"; + packageName = "@babel/helper-module-transforms"; + version = "7.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.10.1.tgz"; + sha512 = "RLHRCAzyJe7Q7sF4oy2cB+kRnU4wDZY/H2xJFGof+M+SJEGhZsb+GFj5j1AD8NiSaVBJ+Pf0/WObiXu/zxWpFg=="; + }; + }; + "@babel/helper-optimise-call-expression-7.10.3" = { + name = "_at_babel_slash_helper-optimise-call-expression"; + packageName = "@babel/helper-optimise-call-expression"; + version = "7.10.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.3.tgz"; + sha512 = "kT2R3VBH/cnSz+yChKpaKRJQJWxdGoc6SjioRId2wkeV3bK0wLLioFpJROrX0U4xr/NmxSSAWT/9Ih5snwIIzg=="; + }; + }; + "@babel/helper-plugin-utils-7.10.3" = { + name = "_at_babel_slash_helper-plugin-utils"; + packageName = "@babel/helper-plugin-utils"; + version = "7.10.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.3.tgz"; + sha512 = "j/+j8NAWUTxOtx4LKHybpSClxHoq6I91DQ/mKgAXn5oNUPIUiGppjPIX3TDtJWPrdfP9Kfl7e4fgVMiQR9VE/g=="; + }; + }; + "@babel/helper-regex-7.10.1" = { + name = "_at_babel_slash_helper-regex"; + packageName = "@babel/helper-regex"; + version = "7.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-regex/-/helper-regex-7.10.1.tgz"; + sha512 = "7isHr19RsIJWWLLFn21ubFt223PjQyg1HY7CZEMRr820HttHPpVvrsIN3bUOo44DEfFV4kBXO7Abbn9KTUZV7g=="; + }; + }; + "@babel/helper-remap-async-to-generator-7.10.3" = { + name = "_at_babel_slash_helper-remap-async-to-generator"; + packageName = "@babel/helper-remap-async-to-generator"; + version = "7.10.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.10.3.tgz"; + sha512 = "sLB7666ARbJUGDO60ZormmhQOyqMX/shKBXZ7fy937s+3ID8gSrneMvKSSb+8xIM5V7Vn6uNVtOY1vIm26XLtA=="; + }; + }; + "@babel/helper-replace-supers-7.10.1" = { + name = "_at_babel_slash_helper-replace-supers"; + packageName = "@babel/helper-replace-supers"; + version = "7.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.10.1.tgz"; + sha512 = "SOwJzEfpuQwInzzQJGjGaiG578UYmyi2Xw668klPWV5n07B73S0a9btjLk/52Mlcxa+5AdIYqws1KyXRfMoB7A=="; + }; + }; + "@babel/helper-simple-access-7.10.1" = { + name = "_at_babel_slash_helper-simple-access"; + packageName = "@babel/helper-simple-access"; + version = "7.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.10.1.tgz"; + sha512 = "VSWpWzRzn9VtgMJBIWTZ+GP107kZdQ4YplJlCmIrjoLVSi/0upixezHCDG8kpPVTBJpKfxTH01wDhh+jS2zKbw=="; + }; + }; + "@babel/helper-split-export-declaration-7.10.1" = { + name = "_at_babel_slash_helper-split-export-declaration"; + packageName = "@babel/helper-split-export-declaration"; + version = "7.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.10.1.tgz"; + sha512 = "UQ1LVBPrYdbchNhLwj6fetj46BcFwfS4NllJo/1aJsT+1dLTEnXJL0qHqtY7gPzF8S2fXBJamf1biAXV3X077g=="; + }; + }; + "@babel/helper-validator-identifier-7.10.3" = { + name = "_at_babel_slash_helper-validator-identifier"; + packageName = "@babel/helper-validator-identifier"; + version = "7.10.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.3.tgz"; + sha512 = "bU8JvtlYpJSBPuj1VUmKpFGaDZuLxASky3LhaKj3bmpSTY6VWooSM8msk+Z0CZoErFye2tlABF6yDkT3FOPAXw=="; + }; + }; + "@babel/helper-wrap-function-7.10.1" = { + name = "_at_babel_slash_helper-wrap-function"; + packageName = "@babel/helper-wrap-function"; + version = "7.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.10.1.tgz"; + sha512 = "C0MzRGteVDn+H32/ZgbAv5r56f2o1fZSA/rj/TYo8JEJNHg+9BdSmKBUND0shxWRztWhjlT2cvHYuynpPsVJwQ=="; + }; + }; + "@babel/helpers-7.10.1" = { + name = "_at_babel_slash_helpers"; + packageName = "@babel/helpers"; + version = "7.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.10.1.tgz"; + sha512 = "muQNHF+IdU6wGgkaJyhhEmI54MOZBKsFfsXFhboz1ybwJ1Kl7IHlbm2a++4jwrmY5UYsgitt5lfqo1wMFcHmyw=="; + }; + }; + "@babel/highlight-7.10.3" = { + name = "_at_babel_slash_highlight"; + packageName = "@babel/highlight"; + version = "7.10.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.3.tgz"; + sha512 = "Ih9B/u7AtgEnySE2L2F0Xm0GaM729XqqLfHkalTsbjXGyqmf/6M0Cu0WpvqueUlW+xk88BHw9Nkpj49naU+vWw=="; + }; + }; + "@babel/highlight-7.5.0" = { + name = "_at_babel_slash_highlight"; + packageName = "@babel/highlight"; + version = "7.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.5.0.tgz"; + sha512 = "7dV4eu9gBxoM0dAnj/BCFDW9LFU0zvTrkq0ugM7pnHEgguOEeOz1so2ZghEdzviYzQEED0r4EAgpsBChKy1TRQ=="; + }; + }; + "@babel/parser-7.10.3" = { + name = "_at_babel_slash_parser"; + packageName = "@babel/parser"; + version = "7.10.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.10.3.tgz"; + sha512 = "oJtNJCMFdIMwXGmx+KxuaD7i3b8uS7TTFYW/FNG2BT8m+fmGHoiPYoH0Pe3gya07WuFmM5FCDIr1x0irkD/hyA=="; + }; + }; + "@babel/plugin-proposal-async-generator-functions-7.10.3" = { + name = "_at_babel_slash_plugin-proposal-async-generator-functions"; + packageName = "@babel/plugin-proposal-async-generator-functions"; + version = "7.10.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.10.3.tgz"; + sha512 = "WUUWM7YTOudF4jZBAJIW9D7aViYC/Fn0Pln4RIHlQALyno3sXSjqmTA4Zy1TKC2D49RCR8Y/Pn4OIUtEypK3CA=="; + }; + }; + "@babel/plugin-proposal-class-properties-7.10.1" = { + name = "_at_babel_slash_plugin-proposal-class-properties"; + packageName = "@babel/plugin-proposal-class-properties"; + version = "7.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.10.1.tgz"; + sha512 = "sqdGWgoXlnOdgMXU+9MbhzwFRgxVLeiGBqTrnuS7LC2IBU31wSsESbTUreT2O418obpfPdGUR2GbEufZF1bpqw=="; + }; + }; + "@babel/plugin-proposal-decorators-7.10.3" = { + name = "_at_babel_slash_plugin-proposal-decorators"; + packageName = "@babel/plugin-proposal-decorators"; + version = "7.10.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.10.3.tgz"; + sha512 = "Rzwn5tcYFTdWWK3IrhMZkMDjzFQLIGYqHvv9XuzNnEB91Y6gHr/JjazYV1Yec9g0yMLhy1p/21eiW1P7f5UN4A=="; + }; + }; + "@babel/plugin-proposal-dynamic-import-7.10.1" = { + name = "_at_babel_slash_plugin-proposal-dynamic-import"; + packageName = "@babel/plugin-proposal-dynamic-import"; + version = "7.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.10.1.tgz"; + sha512 = "Cpc2yUVHTEGPlmiQzXj026kqwjEQAD9I4ZC16uzdbgWgitg/UHKHLffKNCQZ5+y8jpIZPJcKcwsr2HwPh+w3XA=="; + }; + }; + "@babel/plugin-proposal-json-strings-7.10.1" = { + name = "_at_babel_slash_plugin-proposal-json-strings"; + packageName = "@babel/plugin-proposal-json-strings"; + version = "7.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.10.1.tgz"; + sha512 = "m8r5BmV+ZLpWPtMY2mOKN7wre6HIO4gfIiV+eOmsnZABNenrt/kzYBwrh+KOfgumSWpnlGs5F70J8afYMSJMBg=="; + }; + }; + "@babel/plugin-proposal-nullish-coalescing-operator-7.10.1" = { + name = "_at_babel_slash_plugin-proposal-nullish-coalescing-operator"; + packageName = "@babel/plugin-proposal-nullish-coalescing-operator"; + version = "7.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.10.1.tgz"; + sha512 = "56cI/uHYgL2C8HVuHOuvVowihhX0sxb3nnfVRzUeVHTWmRHTZrKuAh/OBIMggGU/S1g/1D2CRCXqP+3u7vX7iA=="; + }; + }; + "@babel/plugin-proposal-numeric-separator-7.10.1" = { + name = "_at_babel_slash_plugin-proposal-numeric-separator"; + packageName = "@babel/plugin-proposal-numeric-separator"; + version = "7.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.10.1.tgz"; + sha512 = "jjfym4N9HtCiNfyyLAVD8WqPYeHUrw4ihxuAynWj6zzp2gf9Ey2f7ImhFm6ikB3CLf5Z/zmcJDri6B4+9j9RsA=="; + }; + }; + "@babel/plugin-proposal-object-rest-spread-7.10.3" = { + name = "_at_babel_slash_plugin-proposal-object-rest-spread"; + packageName = "@babel/plugin-proposal-object-rest-spread"; + version = "7.10.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.10.3.tgz"; + sha512 = "ZZh5leCIlH9lni5bU/wB/UcjtcVLgR8gc+FAgW2OOY+m9h1II3ItTO1/cewNUcsIDZSYcSaz/rYVls+Fb0ExVQ=="; + }; + }; + "@babel/plugin-proposal-optional-catch-binding-7.10.1" = { + name = "_at_babel_slash_plugin-proposal-optional-catch-binding"; + packageName = "@babel/plugin-proposal-optional-catch-binding"; + version = "7.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.10.1.tgz"; + sha512 = "VqExgeE62YBqI3ogkGoOJp1R6u12DFZjqwJhqtKc2o5m1YTUuUWnos7bZQFBhwkxIFpWYJ7uB75U7VAPPiKETA=="; + }; + }; + "@babel/plugin-proposal-optional-chaining-7.10.3" = { + name = "_at_babel_slash_plugin-proposal-optional-chaining"; + packageName = "@babel/plugin-proposal-optional-chaining"; + version = "7.10.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.10.3.tgz"; + sha512 = "yyG3n9dJ1vZ6v5sfmIlMMZ8azQoqx/5/nZTSWX1td6L1H1bsjzA8TInDChpafCZiJkeOFzp/PtrfigAQXxI1Ng=="; + }; + }; + "@babel/plugin-proposal-private-methods-7.10.1" = { + name = "_at_babel_slash_plugin-proposal-private-methods"; + packageName = "@babel/plugin-proposal-private-methods"; + version = "7.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.10.1.tgz"; + sha512 = "RZecFFJjDiQ2z6maFprLgrdnm0OzoC23Mx89xf1CcEsxmHuzuXOdniEuI+S3v7vjQG4F5sa6YtUp+19sZuSxHg=="; + }; + }; + "@babel/plugin-proposal-unicode-property-regex-7.10.1" = { + name = "_at_babel_slash_plugin-proposal-unicode-property-regex"; + packageName = "@babel/plugin-proposal-unicode-property-regex"; + version = "7.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.10.1.tgz"; + sha512 = "JjfngYRvwmPwmnbRZyNiPFI8zxCZb8euzbCG/LxyKdeTb59tVciKo9GK9bi6JYKInk1H11Dq9j/zRqIH4KigfQ=="; + }; + }; + "@babel/plugin-syntax-async-generators-7.8.4" = { + name = "_at_babel_slash_plugin-syntax-async-generators"; + packageName = "@babel/plugin-syntax-async-generators"; + version = "7.8.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz"; + sha512 = "tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw=="; + }; + }; + "@babel/plugin-syntax-class-properties-7.10.1" = { + name = "_at_babel_slash_plugin-syntax-class-properties"; + packageName = "@babel/plugin-syntax-class-properties"; + version = "7.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.10.1.tgz"; + sha512 = "Gf2Yx/iRs1JREDtVZ56OrjjgFHCaldpTnuy9BHla10qyVT3YkIIGEtoDWhyop0ksu1GvNjHIoYRBqm3zoR1jyQ=="; + }; + }; + "@babel/plugin-syntax-decorators-7.10.1" = { + name = "_at_babel_slash_plugin-syntax-decorators"; + packageName = "@babel/plugin-syntax-decorators"; + version = "7.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.10.1.tgz"; + sha512 = "a9OAbQhKOwSle1Vr0NJu/ISg1sPfdEkfRKWpgPuzhnWWzForou2gIeUIIwjAMHRekhhpJ7eulZlYs0H14Cbi+g=="; + }; + }; + "@babel/plugin-syntax-dynamic-import-7.8.3" = { + name = "_at_babel_slash_plugin-syntax-dynamic-import"; + packageName = "@babel/plugin-syntax-dynamic-import"; + version = "7.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz"; + sha512 = "5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ=="; + }; + }; + "@babel/plugin-syntax-json-strings-7.8.3" = { + name = "_at_babel_slash_plugin-syntax-json-strings"; + packageName = "@babel/plugin-syntax-json-strings"; + version = "7.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz"; + sha512 = "lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA=="; + }; + }; + "@babel/plugin-syntax-jsx-7.10.1" = { + name = "_at_babel_slash_plugin-syntax-jsx"; + packageName = "@babel/plugin-syntax-jsx"; + version = "7.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.10.1.tgz"; + sha512 = "+OxyOArpVFXQeXKLO9o+r2I4dIoVoy6+Uu0vKELrlweDM3QJADZj+Z+5ERansZqIZBcLj42vHnDI8Rz9BnRIuQ=="; + }; + }; + "@babel/plugin-syntax-nullish-coalescing-operator-7.8.3" = { + name = "_at_babel_slash_plugin-syntax-nullish-coalescing-operator"; + packageName = "@babel/plugin-syntax-nullish-coalescing-operator"; + version = "7.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz"; + sha512 = "aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ=="; + }; + }; + "@babel/plugin-syntax-numeric-separator-7.10.1" = { + name = "_at_babel_slash_plugin-syntax-numeric-separator"; + packageName = "@babel/plugin-syntax-numeric-separator"; + version = "7.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.1.tgz"; + sha512 = "uTd0OsHrpe3tH5gRPTxG8Voh99/WCU78vIm5NMRYPAqC8lR4vajt6KkCAknCHrx24vkPdd/05yfdGSB4EIY2mg=="; + }; + }; + "@babel/plugin-syntax-object-rest-spread-7.8.3" = { + name = "_at_babel_slash_plugin-syntax-object-rest-spread"; + packageName = "@babel/plugin-syntax-object-rest-spread"; + version = "7.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz"; + sha512 = "XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA=="; + }; + }; + "@babel/plugin-syntax-optional-catch-binding-7.8.3" = { + name = "_at_babel_slash_plugin-syntax-optional-catch-binding"; + packageName = "@babel/plugin-syntax-optional-catch-binding"; + version = "7.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz"; + sha512 = "6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q=="; + }; + }; + "@babel/plugin-syntax-optional-chaining-7.8.3" = { + name = "_at_babel_slash_plugin-syntax-optional-chaining"; + packageName = "@babel/plugin-syntax-optional-chaining"; + version = "7.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz"; + sha512 = "KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg=="; + }; + }; + "@babel/plugin-syntax-top-level-await-7.10.1" = { + name = "_at_babel_slash_plugin-syntax-top-level-await"; + packageName = "@babel/plugin-syntax-top-level-await"; + version = "7.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.10.1.tgz"; + sha512 = "hgA5RYkmZm8FTFT3yu2N9Bx7yVVOKYT6yEdXXo6j2JTm0wNxgqaGeQVaSHRjhfnQbX91DtjFB6McRFSlcJH3xQ=="; + }; + }; + "@babel/plugin-transform-arrow-functions-7.10.1" = { + name = "_at_babel_slash_plugin-transform-arrow-functions"; + packageName = "@babel/plugin-transform-arrow-functions"; + version = "7.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.10.1.tgz"; + sha512 = "6AZHgFJKP3DJX0eCNJj01RpytUa3SOGawIxweHkNX2L6PYikOZmoh5B0d7hIHaIgveMjX990IAa/xK7jRTN8OA=="; + }; + }; + "@babel/plugin-transform-async-to-generator-7.10.1" = { + name = "_at_babel_slash_plugin-transform-async-to-generator"; + packageName = "@babel/plugin-transform-async-to-generator"; + version = "7.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.10.1.tgz"; + sha512 = "XCgYjJ8TY2slj6SReBUyamJn3k2JLUIiiR5b6t1mNCMSvv7yx+jJpaewakikp0uWFQSF7ChPPoe3dHmXLpISkg=="; + }; + }; + "@babel/plugin-transform-block-scoped-functions-7.10.1" = { + name = "_at_babel_slash_plugin-transform-block-scoped-functions"; + packageName = "@babel/plugin-transform-block-scoped-functions"; + version = "7.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.10.1.tgz"; + sha512 = "B7K15Xp8lv0sOJrdVAoukKlxP9N59HS48V1J3U/JGj+Ad+MHq+am6xJVs85AgXrQn4LV8vaYFOB+pr/yIuzW8Q=="; + }; + }; + "@babel/plugin-transform-block-scoping-7.10.1" = { + name = "_at_babel_slash_plugin-transform-block-scoping"; + packageName = "@babel/plugin-transform-block-scoping"; + version = "7.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.10.1.tgz"; + sha512 = "8bpWG6TtF5akdhIm/uWTyjHqENpy13Fx8chg7pFH875aNLwX8JxIxqm08gmAT+Whe6AOmaTeLPe7dpLbXt+xUw=="; + }; + }; + "@babel/plugin-transform-classes-7.10.3" = { + name = "_at_babel_slash_plugin-transform-classes"; + packageName = "@babel/plugin-transform-classes"; + version = "7.10.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.10.3.tgz"; + sha512 = "irEX0ChJLaZVC7FvvRoSIxJlmk0IczFLcwaRXUArBKYHCHbOhe57aG8q3uw/fJsoSXvZhjRX960hyeAGlVBXZw=="; + }; + }; + "@babel/plugin-transform-computed-properties-7.10.3" = { + name = "_at_babel_slash_plugin-transform-computed-properties"; + packageName = "@babel/plugin-transform-computed-properties"; + version = "7.10.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.10.3.tgz"; + sha512 = "GWzhaBOsdbjVFav96drOz7FzrcEW6AP5nax0gLIpstiFaI3LOb2tAg06TimaWU6YKOfUACK3FVrxPJ4GSc5TgA=="; + }; + }; + "@babel/plugin-transform-destructuring-7.10.1" = { + name = "_at_babel_slash_plugin-transform-destructuring"; + packageName = "@babel/plugin-transform-destructuring"; + version = "7.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.10.1.tgz"; + sha512 = "V/nUc4yGWG71OhaTH705pU8ZSdM6c1KmmLP8ys59oOYbT7RpMYAR3MsVOt6OHL0WzG7BlTU076va9fjJyYzJMA=="; + }; + }; + "@babel/plugin-transform-dotall-regex-7.10.1" = { + name = "_at_babel_slash_plugin-transform-dotall-regex"; + packageName = "@babel/plugin-transform-dotall-regex"; + version = "7.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.10.1.tgz"; + sha512 = "19VIMsD1dp02RvduFUmfzj8uknaO3uiHHF0s3E1OHnVsNj8oge8EQ5RzHRbJjGSetRnkEuBYO7TG1M5kKjGLOA=="; + }; + }; + "@babel/plugin-transform-duplicate-keys-7.10.1" = { + name = "_at_babel_slash_plugin-transform-duplicate-keys"; + packageName = "@babel/plugin-transform-duplicate-keys"; + version = "7.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.10.1.tgz"; + sha512 = "wIEpkX4QvX8Mo9W6XF3EdGttrIPZWozHfEaDTU0WJD/TDnXMvdDh30mzUl/9qWhnf7naicYartcEfUghTCSNpA=="; + }; + }; + "@babel/plugin-transform-exponentiation-operator-7.10.1" = { + name = "_at_babel_slash_plugin-transform-exponentiation-operator"; + packageName = "@babel/plugin-transform-exponentiation-operator"; + version = "7.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.10.1.tgz"; + sha512 = "lr/przdAbpEA2BUzRvjXdEDLrArGRRPwbaF9rvayuHRvdQ7lUTTkZnhZrJ4LE2jvgMRFF4f0YuPQ20vhiPYxtA=="; + }; + }; + "@babel/plugin-transform-for-of-7.10.1" = { + name = "_at_babel_slash_plugin-transform-for-of"; + packageName = "@babel/plugin-transform-for-of"; + version = "7.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.10.1.tgz"; + sha512 = "US8KCuxfQcn0LwSCMWMma8M2R5mAjJGsmoCBVwlMygvmDUMkTCykc84IqN1M7t+agSfOmLYTInLCHJM+RUoz+w=="; + }; + }; + "@babel/plugin-transform-function-name-7.10.1" = { + name = "_at_babel_slash_plugin-transform-function-name"; + packageName = "@babel/plugin-transform-function-name"; + version = "7.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.10.1.tgz"; + sha512 = "//bsKsKFBJfGd65qSNNh1exBy5Y9gD9ZN+DvrJ8f7HXr4avE5POW6zB7Rj6VnqHV33+0vXWUwJT0wSHubiAQkw=="; + }; + }; + "@babel/plugin-transform-literals-7.10.1" = { + name = "_at_babel_slash_plugin-transform-literals"; + packageName = "@babel/plugin-transform-literals"; + version = "7.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.10.1.tgz"; + sha512 = "qi0+5qgevz1NHLZroObRm5A+8JJtibb7vdcPQF1KQE12+Y/xxl8coJ+TpPW9iRq+Mhw/NKLjm+5SHtAHCC7lAw=="; + }; + }; + "@babel/plugin-transform-member-expression-literals-7.10.1" = { + name = "_at_babel_slash_plugin-transform-member-expression-literals"; + packageName = "@babel/plugin-transform-member-expression-literals"; + version = "7.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.10.1.tgz"; + sha512 = "UmaWhDokOFT2GcgU6MkHC11i0NQcL63iqeufXWfRy6pUOGYeCGEKhvfFO6Vz70UfYJYHwveg62GS83Rvpxn+NA=="; + }; + }; + "@babel/plugin-transform-modules-amd-7.10.1" = { + name = "_at_babel_slash_plugin-transform-modules-amd"; + packageName = "@babel/plugin-transform-modules-amd"; + version = "7.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.10.1.tgz"; + sha512 = "31+hnWSFRI4/ACFr1qkboBbrTxoBIzj7qA69qlq8HY8p7+YCzkCT6/TvQ1a4B0z27VeWtAeJd6pr5G04dc1iHw=="; + }; + }; + "@babel/plugin-transform-modules-commonjs-7.10.1" = { + name = "_at_babel_slash_plugin-transform-modules-commonjs"; + packageName = "@babel/plugin-transform-modules-commonjs"; + version = "7.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.10.1.tgz"; + sha512 = "AQG4fc3KOah0vdITwt7Gi6hD9BtQP/8bhem7OjbaMoRNCH5Djx42O2vYMfau7QnAzQCa+RJnhJBmFFMGpQEzrg=="; + }; + }; + "@babel/plugin-transform-modules-systemjs-7.10.3" = { + name = "_at_babel_slash_plugin-transform-modules-systemjs"; + packageName = "@babel/plugin-transform-modules-systemjs"; + version = "7.10.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.10.3.tgz"; + sha512 = "GWXWQMmE1GH4ALc7YXW56BTh/AlzvDWhUNn9ArFF0+Cz5G8esYlVbXfdyHa1xaD1j+GnBoCeoQNlwtZTVdiG/A=="; + }; + }; + "@babel/plugin-transform-modules-umd-7.10.1" = { + name = "_at_babel_slash_plugin-transform-modules-umd"; + packageName = "@babel/plugin-transform-modules-umd"; + version = "7.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.10.1.tgz"; + sha512 = "EIuiRNMd6GB6ulcYlETnYYfgv4AxqrswghmBRQbWLHZxN4s7mupxzglnHqk9ZiUpDI4eRWewedJJNj67PWOXKA=="; + }; + }; + "@babel/plugin-transform-named-capturing-groups-regex-7.10.3" = { + name = "_at_babel_slash_plugin-transform-named-capturing-groups-regex"; + packageName = "@babel/plugin-transform-named-capturing-groups-regex"; + version = "7.10.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.10.3.tgz"; + sha512 = "I3EH+RMFyVi8Iy/LekQm948Z4Lz4yKT7rK+vuCAeRm0kTa6Z5W7xuhRxDNJv0FPya/her6AUgrDITb70YHtTvA=="; + }; + }; + "@babel/plugin-transform-new-target-7.10.1" = { + name = "_at_babel_slash_plugin-transform-new-target"; + packageName = "@babel/plugin-transform-new-target"; + version = "7.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.10.1.tgz"; + sha512 = "MBlzPc1nJvbmO9rPr1fQwXOM2iGut+JC92ku6PbiJMMK7SnQc1rytgpopveE3Evn47gzvGYeCdgfCDbZo0ecUw=="; + }; + }; + "@babel/plugin-transform-object-super-7.10.1" = { + name = "_at_babel_slash_plugin-transform-object-super"; + packageName = "@babel/plugin-transform-object-super"; + version = "7.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.10.1.tgz"; + sha512 = "WnnStUDN5GL+wGQrJylrnnVlFhFmeArINIR9gjhSeYyvroGhBrSAXYg/RHsnfzmsa+onJrTJrEClPzgNmmQ4Gw=="; + }; + }; + "@babel/plugin-transform-parameters-7.10.1" = { + name = "_at_babel_slash_plugin-transform-parameters"; + packageName = "@babel/plugin-transform-parameters"; + version = "7.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.10.1.tgz"; + sha512 = "tJ1T0n6g4dXMsL45YsSzzSDZCxiHXAQp/qHrucOq5gEHncTA3xDxnd5+sZcoQp+N1ZbieAaB8r/VUCG0gqseOg=="; + }; + }; + "@babel/plugin-transform-property-literals-7.10.1" = { + name = "_at_babel_slash_plugin-transform-property-literals"; + packageName = "@babel/plugin-transform-property-literals"; + version = "7.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.10.1.tgz"; + sha512 = "Kr6+mgag8auNrgEpbfIWzdXYOvqDHZOF0+Bx2xh4H2EDNwcbRb9lY6nkZg8oSjsX+DH9Ebxm9hOqtKW+gRDeNA=="; + }; + }; + "@babel/plugin-transform-regenerator-7.10.3" = { + name = "_at_babel_slash_plugin-transform-regenerator"; + packageName = "@babel/plugin-transform-regenerator"; + version = "7.10.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.10.3.tgz"; + sha512 = "H5kNeW0u8mbk0qa1jVIVTeJJL6/TJ81ltD4oyPx0P499DhMJrTmmIFCmJ3QloGpQG8K9symccB7S7SJpCKLwtw=="; + }; + }; + "@babel/plugin-transform-reserved-words-7.10.1" = { + name = "_at_babel_slash_plugin-transform-reserved-words"; + packageName = "@babel/plugin-transform-reserved-words"; + version = "7.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.10.1.tgz"; + sha512 = "qN1OMoE2nuqSPmpTqEM7OvJ1FkMEV+BjVeZZm9V9mq/x1JLKQ4pcv8riZJMNN3u2AUGl0ouOMjRr2siecvHqUQ=="; + }; + }; + "@babel/plugin-transform-runtime-7.10.3" = { + name = "_at_babel_slash_plugin-transform-runtime"; + packageName = "@babel/plugin-transform-runtime"; + version = "7.10.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.10.3.tgz"; + sha512 = "b5OzMD1Hi8BBzgQdRHyVVaYrk9zG0wset1it2o3BgonkPadXfOv0aXRqd7864DeOIu3FGKP/h6lr15FE5mahVw=="; + }; + }; + "@babel/plugin-transform-shorthand-properties-7.10.1" = { + name = "_at_babel_slash_plugin-transform-shorthand-properties"; + packageName = "@babel/plugin-transform-shorthand-properties"; + version = "7.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.10.1.tgz"; + sha512 = "AR0E/lZMfLstScFwztApGeyTHJ5u3JUKMjneqRItWeEqDdHWZwAOKycvQNCasCK/3r5YXsuNG25funcJDu7Y2g=="; + }; + }; + "@babel/plugin-transform-spread-7.10.1" = { + name = "_at_babel_slash_plugin-transform-spread"; + packageName = "@babel/plugin-transform-spread"; + version = "7.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.10.1.tgz"; + sha512 = "8wTPym6edIrClW8FI2IoaePB91ETOtg36dOkj3bYcNe7aDMN2FXEoUa+WrmPc4xa1u2PQK46fUX2aCb+zo9rfw=="; + }; + }; + "@babel/plugin-transform-sticky-regex-7.10.1" = { + name = "_at_babel_slash_plugin-transform-sticky-regex"; + packageName = "@babel/plugin-transform-sticky-regex"; + version = "7.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.10.1.tgz"; + sha512 = "j17ojftKjrL7ufX8ajKvwRilwqTok4q+BjkknmQw9VNHnItTyMP5anPFzxFJdCQs7clLcWpCV3ma+6qZWLnGMA=="; + }; + }; + "@babel/plugin-transform-template-literals-7.10.3" = { + name = "_at_babel_slash_plugin-transform-template-literals"; + packageName = "@babel/plugin-transform-template-literals"; + version = "7.10.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.10.3.tgz"; + sha512 = "yaBn9OpxQra/bk0/CaA4wr41O0/Whkg6nqjqApcinxM7pro51ojhX6fv1pimAnVjVfDy14K0ULoRL70CA9jWWA=="; + }; + }; + "@babel/plugin-transform-typeof-symbol-7.10.1" = { + name = "_at_babel_slash_plugin-transform-typeof-symbol"; + packageName = "@babel/plugin-transform-typeof-symbol"; + version = "7.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.10.1.tgz"; + sha512 = "qX8KZcmbvA23zDi+lk9s6hC1FM7jgLHYIjuLgULgc8QtYnmB3tAVIYkNoKRQ75qWBeyzcoMoK8ZQmogGtC/w0g=="; + }; + }; + "@babel/plugin-transform-unicode-escapes-7.10.1" = { + name = "_at_babel_slash_plugin-transform-unicode-escapes"; + packageName = "@babel/plugin-transform-unicode-escapes"; + version = "7.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.10.1.tgz"; + sha512 = "zZ0Poh/yy1d4jeDWpx/mNwbKJVwUYJX73q+gyh4bwtG0/iUlzdEu0sLMda8yuDFS6LBQlT/ST1SJAR6zYwXWgw=="; + }; + }; + "@babel/plugin-transform-unicode-regex-7.10.1" = { + name = "_at_babel_slash_plugin-transform-unicode-regex"; + packageName = "@babel/plugin-transform-unicode-regex"; + version = "7.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.10.1.tgz"; + sha512 = "Y/2a2W299k0VIUdbqYm9X2qS6fE0CUBhhiPpimK6byy7OJ/kORLlIX+J6UrjgNu5awvs62k+6RSslxhcvVw2Tw=="; + }; + }; + "@babel/preset-env-7.10.3" = { + name = "_at_babel_slash_preset-env"; + packageName = "@babel/preset-env"; + version = "7.10.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.10.3.tgz"; + sha512 = "jHaSUgiewTmly88bJtMHbOd1bJf2ocYxb5BWKSDQIP5tmgFuS/n0gl+nhSrYDhT33m0vPxp+rP8oYYgPgMNQlg=="; + }; + }; + "@babel/preset-modules-0.1.3" = { + name = "_at_babel_slash_preset-modules"; + packageName = "@babel/preset-modules"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.3.tgz"; + sha512 = "Ra3JXOHBq2xd56xSF7lMKXdjBn3T772Y1Wet3yWnkDly9zHvJki029tAFzvAAK5cf4YV3yoxuP61crYRol6SVg=="; + }; + }; + "@babel/runtime-7.10.3" = { + name = "_at_babel_slash_runtime"; + packageName = "@babel/runtime"; + version = "7.10.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.10.3.tgz"; + sha512 = "RzGO0RLSdokm9Ipe/YD+7ww8X2Ro79qiXZF3HU9ljrM+qnJmH1Vqth+hbiQZy761LnMJTMitHDuKVYTk3k4dLw=="; + }; + }; + "@babel/template-7.10.3" = { + name = "_at_babel_slash_template"; + packageName = "@babel/template"; + version = "7.10.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/template/-/template-7.10.3.tgz"; + sha512 = "5BjI4gdtD+9fHZUsaxPHPNpwa+xRkDO7c7JbhYn2afvrkDu5SfAAbi9AIMXw2xEhO/BR35TqiW97IqNvCo/GqA=="; + }; + }; + "@babel/traverse-7.10.3" = { + name = "_at_babel_slash_traverse"; + packageName = "@babel/traverse"; + version = "7.10.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.10.3.tgz"; + sha512 = "qO6623eBFhuPm0TmmrUFMT1FulCmsSeJuVGhiLodk2raUDFhhTECLd9E9jC4LBIWziqt4wgF6KuXE4d+Jz9yug=="; + }; + }; + "@babel/types-7.10.3" = { + name = "_at_babel_slash_types"; + packageName = "@babel/types"; + version = "7.10.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/types/-/types-7.10.3.tgz"; + sha512 = "nZxaJhBXBQ8HVoIcGsf9qWep3Oh3jCENK54V4mRF7qaJabVsAYdbTtmSD8WmAp1R6ytPiu5apMwSXyxB1WlaBA=="; + }; + }; + "@fortawesome/fontawesome-common-types-0.2.30" = { + name = "_at_fortawesome_slash_fontawesome-common-types"; + packageName = "@fortawesome/fontawesome-common-types"; + version = "0.2.30"; + src = fetchurl { + url = "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.2.30.tgz"; + sha512 = "TsRwpTuKwFNiPhk1UfKgw7zNPeV5RhNp2Uw3pws+9gDAkPGKrtjR1y2lI3SYn7+YzyfuNknflpBA1LRKjt7hMg=="; + }; + }; + "@fortawesome/fontawesome-svg-core-1.2.30" = { + name = "_at_fortawesome_slash_fontawesome-svg-core"; + packageName = "@fortawesome/fontawesome-svg-core"; + version = "1.2.30"; + src = fetchurl { + url = "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-1.2.30.tgz"; + sha512 = "E3sAXATKCSVnT17HYmZjjbcmwihrNOCkoU7dVMlasrcwiJAHxSKeZ+4WN5O+ElgO/FaYgJmASl8p9N7/B/RttA=="; + }; + }; + "@fortawesome/free-regular-svg-icons-5.14.0" = { + name = "_at_fortawesome_slash_free-regular-svg-icons"; + packageName = "@fortawesome/free-regular-svg-icons"; + version = "5.14.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@fortawesome/free-regular-svg-icons/-/free-regular-svg-icons-5.14.0.tgz"; + sha512 = "6LCFvjGSMPoUQbn3NVlgiG4CY5iIY8fOm+to/D6QS/GvdqhDt+xZklQeERdCvVRbnFa1ITc1rJHPRXqkX5wztQ=="; + }; + }; + "@fortawesome/free-solid-svg-icons-5.14.0" = { + name = "_at_fortawesome_slash_free-solid-svg-icons"; + packageName = "@fortawesome/free-solid-svg-icons"; + version = "5.14.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-5.14.0.tgz"; + sha512 = "M933RDM8cecaKMWDSk3FRYdnzWGW7kBBlGNGfvqLVwcwhUPNj9gcw+xZMrqBdRqxnSXdl3zWzTCNNGEtFUq67Q=="; + }; + }; + "@fortawesome/vue-fontawesome-2.0.0" = { + name = "_at_fortawesome_slash_vue-fontawesome"; + packageName = "@fortawesome/vue-fontawesome"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@fortawesome/vue-fontawesome/-/vue-fontawesome-2.0.0.tgz"; + sha512 = "N3VKw7KzRfOm8hShUVldpinlm13HpvLBQgT63QS+aCrIRLwjoEUXY5Rcmttbfb6HkzZaeqjLqd/aZCQ53UjQpg=="; + }; + }; + "@hapi/address-2.1.4" = { + name = "_at_hapi_slash_address"; + packageName = "@hapi/address"; + version = "2.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@hapi/address/-/address-2.1.4.tgz"; + sha512 = "QD1PhQk+s31P1ixsX0H0Suoupp3VMXzIVMSwobR3F3MSUO2YCV0B7xqLcUw/Bh8yuvd3LhpyqLQWTNcRmp6IdQ=="; + }; + }; + "@hapi/bourne-1.3.2" = { + name = "_at_hapi_slash_bourne"; + packageName = "@hapi/bourne"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@hapi/bourne/-/bourne-1.3.2.tgz"; + sha512 = "1dVNHT76Uu5N3eJNTYcvxee+jzX4Z9lfciqRRHCU27ihbUcYi+iSc2iml5Ke1LXe1SyJCLA0+14Jh4tXJgOppA=="; + }; + }; + "@hapi/hoek-8.5.1" = { + name = "_at_hapi_slash_hoek"; + packageName = "@hapi/hoek"; + version = "8.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@hapi/hoek/-/hoek-8.5.1.tgz"; + sha512 = "yN7kbciD87WzLGc5539Tn0sApjyiGHAJgKvG9W8C7O+6c7qmoQMfVs0W4bX17eqz6C78QJqqFrtgdK5EWf6Qow=="; + }; + }; + "@hapi/joi-15.1.1" = { + name = "_at_hapi_slash_joi"; + packageName = "@hapi/joi"; + version = "15.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@hapi/joi/-/joi-15.1.1.tgz"; + sha512 = "entf8ZMOK8sc+8YfeOlM8pCfg3b5+WZIKBfUaaJT8UsjAAPjartzxIYm3TIbjvA4u+u++KbcXD38k682nVHDAQ=="; + }; + }; + "@hapi/topo-3.1.6" = { + name = "_at_hapi_slash_topo"; + packageName = "@hapi/topo"; + version = "3.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@hapi/topo/-/topo-3.1.6.tgz"; + sha512 = "tAag0jEcjwH+P2quUfipd7liWCNX2F8NvYjQp2wtInsZxnMlypdw0FtAOLxtvvkO+GSRRbmNi8m/5y42PQJYCQ=="; + }; + }; + "@intervolga/optimize-cssnano-plugin-1.0.6" = { + name = "_at_intervolga_slash_optimize-cssnano-plugin"; + packageName = "@intervolga/optimize-cssnano-plugin"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@intervolga/optimize-cssnano-plugin/-/optimize-cssnano-plugin-1.0.6.tgz"; + sha512 = "zN69TnSr0viRSU6cEDIcuPcP67QcpQ6uHACg58FiN9PDrU6SLyGW3MR4tiISbYxy1kDWAVPwD+XwQTWE5cigAA=="; + }; + }; + "@mrmlnc/readdir-enhanced-2.2.1" = { + name = "_at_mrmlnc_slash_readdir-enhanced"; + packageName = "@mrmlnc/readdir-enhanced"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz"; + sha512 = "bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g=="; + }; + }; + "@nodelib/fs.stat-1.1.3" = { + name = "_at_nodelib_slash_fs.stat"; + packageName = "@nodelib/fs.stat"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz"; + sha512 = "shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw=="; + }; + }; + "@soda/friendly-errors-webpack-plugin-1.7.1" = { + name = "_at_soda_slash_friendly-errors-webpack-plugin"; + packageName = "@soda/friendly-errors-webpack-plugin"; + version = "1.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@soda/friendly-errors-webpack-plugin/-/friendly-errors-webpack-plugin-1.7.1.tgz"; + sha512 = "cWKrGaFX+rfbMrAxVv56DzhPNqOJPZuNIS2HGMELtgGzb+vsMzyig9mml5gZ/hr2BGtSLV+dP2LUEuAL8aG2mQ=="; + }; + }; + "@soda/get-current-script-1.0.2" = { + name = "_at_soda_slash_get-current-script"; + packageName = "@soda/get-current-script"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@soda/get-current-script/-/get-current-script-1.0.2.tgz"; + sha512 = "T7VNNlYVM1SgQ+VsMYhnDkcGmWhQdL0bDyGm5TlQ3GBXnJscEClUUOKduWTmm2zCnvNLC1hc3JpuXjs/nFOc5w=="; + }; + }; + "@types/anymatch-1.3.1" = { + name = "_at_types_slash_anymatch"; + packageName = "@types/anymatch"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/anymatch/-/anymatch-1.3.1.tgz"; + sha512 = "/+CRPXpBDpo2RK9C68N3b2cOvO0Cf5B9aPijHsoDQTHivnGSObdOF2BRQOYjojWTDy6nQvMjmqRXIxH55VjxxA=="; + }; + }; + "@types/color-name-1.1.1" = { + name = "_at_types_slash_color-name"; + packageName = "@types/color-name"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz"; + sha512 = "rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ=="; + }; + }; + "@types/eslint-visitor-keys-1.0.0" = { + name = "_at_types_slash_eslint-visitor-keys"; + packageName = "@types/eslint-visitor-keys"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz"; + sha512 = "OCutwjDZ4aFS6PB1UZ988C4YgwlBHJd6wCeQqaLdmadZ/7e+w79+hbMUFC1QXDNCmdyoRfAFdm0RypzwR+Qpag=="; + }; + }; + "@types/events-3.0.0" = { + name = "_at_types_slash_events"; + packageName = "@types/events"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/events/-/events-3.0.0.tgz"; + sha512 = "EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g=="; + }; + }; + "@types/glob-7.1.1" = { + name = "_at_types_slash_glob"; + packageName = "@types/glob"; + version = "7.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/glob/-/glob-7.1.1.tgz"; + sha512 = "1Bh06cbWJUHMC97acuD6UMG29nMt0Aqz1vF3guLfG+kHHJhy3AyohZFFxYk2f7Q1SQIrNwvncxAE0N/9s70F2w=="; + }; + }; + "@types/hammerjs-2.0.36" = { + name = "_at_types_slash_hammerjs"; + packageName = "@types/hammerjs"; + version = "2.0.36"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/hammerjs/-/hammerjs-2.0.36.tgz"; + sha512 = "7TUK/k2/QGpEAv/BCwSHlYu3NXZhQ9ZwBYpzr9tjlPIL2C5BeGhH3DmVavRx3ZNyELX5TLC91JTz/cen6AAtIQ=="; + }; + }; + "@types/json-schema-7.0.4" = { + name = "_at_types_slash_json-schema"; + packageName = "@types/json-schema"; + version = "7.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.4.tgz"; + sha512 = "8+KAKzEvSUdeo+kmqnKrqgeE+LcA0tjYWFY7RPProVYwnqDjukzO+3b6dLD56rYX5TdWejnEOLJYOIeh4CXKuA=="; + }; + }; + "@types/marked-1.1.0" = { + name = "_at_types_slash_marked"; + packageName = "@types/marked"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/marked/-/marked-1.1.0.tgz"; + sha512 = "j8XXj6/l9kFvCwMyVqozznqpd/nk80krrW+QiIJN60Uu9gX5Pvn4/qPJ2YngQrR3QREPwmrE1f9/EWKVTFzoEw=="; + }; + }; + "@types/minimatch-3.0.3" = { + name = "_at_types_slash_minimatch"; + packageName = "@types/minimatch"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz"; + sha512 = "tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA=="; + }; + }; + "@types/node-13.9.8" = { + name = "_at_types_slash_node"; + packageName = "@types/node"; + version = "13.9.8"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/node/-/node-13.9.8.tgz"; + sha512 = "1WgO8hsyHynlx7nhP1kr0OFzsgKz5XDQL+Lfc3b1Q3qIln/n8cKD4m09NJ0+P1Rq7Zgnc7N0+SsMnoD1rEb0kA=="; + }; + }; + "@types/normalize-package-data-2.4.0" = { + name = "_at_types_slash_normalize-package-data"; + packageName = "@types/normalize-package-data"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz"; + sha512 = "f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA=="; + }; + }; + "@types/q-1.5.4" = { + name = "_at_types_slash_q"; + packageName = "@types/q"; + version = "1.5.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/q/-/q-1.5.4.tgz"; + sha512 = "1HcDas8SEj4z1Wc696tH56G8OlRaH/sqZOynNNB+HF0WOeXPaxTtbYzJY2oEfiUxjSKjhCKr+MvR7dCHcEelug=="; + }; + }; + "@types/source-list-map-0.1.2" = { + name = "_at_types_slash_source-list-map"; + packageName = "@types/source-list-map"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.2.tgz"; + sha512 = "K5K+yml8LTo9bWJI/rECfIPrGgxdpeNbj+d53lwN4QjW1MCwlkhUms+gtdzigTeUyBr09+u8BwOIY3MXvHdcsA=="; + }; + }; + "@types/tapable-1.0.6" = { + name = "_at_types_slash_tapable"; + packageName = "@types/tapable"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/tapable/-/tapable-1.0.6.tgz"; + sha512 = "W+bw9ds02rAQaMvaLYxAbJ6cvguW/iJXNT6lTssS1ps6QdrMKttqEAMEG/b5CR8TZl3/L7/lH0ZV5nNR1LXikA=="; + }; + }; + "@types/uglify-js-3.9.3" = { + name = "_at_types_slash_uglify-js"; + packageName = "@types/uglify-js"; + version = "3.9.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.9.3.tgz"; + sha512 = "KswB5C7Kwduwjj04Ykz+AjvPcfgv/37Za24O2EDzYNbwyzOo8+ydtvzUfZ5UMguiVu29Gx44l1A6VsPPcmYu9w=="; + }; + }; + "@types/webpack-4.41.22" = { + name = "_at_types_slash_webpack"; + packageName = "@types/webpack"; + version = "4.41.22"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.22.tgz"; + sha512 = "JQDJK6pj8OMV9gWOnN1dcLCyU9Hzs6lux0wBO4lr1+gyEhIBR9U3FMrz12t2GPkg110XAxEAw2WHF6g7nZIbRQ=="; + }; + }; + "@types/webpack-env-1.15.2" = { + name = "_at_types_slash_webpack-env"; + packageName = "@types/webpack-env"; + version = "1.15.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/webpack-env/-/webpack-env-1.15.2.tgz"; + sha512 = "67ZgZpAlhIICIdfQrB5fnDvaKFcDxpKibxznfYRVAT4mQE41Dido/3Ty+E3xGBmTogc5+0Qb8tWhna+5B8z1iQ=="; + }; + }; + "@types/webpack-sources-1.4.2" = { + name = "_at_types_slash_webpack-sources"; + packageName = "@types/webpack-sources"; + version = "1.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/webpack-sources/-/webpack-sources-1.4.2.tgz"; + sha512 = "77T++JyKow4BQB/m9O96n9d/UUHWLQHlcqXb9Vsf4F1+wKNrrlWNFPDLKNT92RJnCSL6CieTc+NDXtCVZswdTw=="; + }; + }; + "@typescript-eslint/eslint-plugin-2.34.0" = { + name = "_at_typescript-eslint_slash_eslint-plugin"; + packageName = "@typescript-eslint/eslint-plugin"; + version = "2.34.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.34.0.tgz"; + sha512 = "4zY3Z88rEE99+CNvTbXSyovv2z9PNOVffTWD2W8QF5s2prBQtwN2zadqERcrHpcR7O/+KMI3fcTAmUUhK/iQcQ=="; + }; + }; + "@typescript-eslint/experimental-utils-2.34.0" = { + name = "_at_typescript-eslint_slash_experimental-utils"; + packageName = "@typescript-eslint/experimental-utils"; + version = "2.34.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-2.34.0.tgz"; + sha512 = "eS6FTkq+wuMJ+sgtuNTtcqavWXqsflWcfBnlYhg/nS4aZ1leewkXGbvBhaapn1q6qf4M71bsR1tez5JTRMuqwA=="; + }; + }; + "@typescript-eslint/parser-2.34.0" = { + name = "_at_typescript-eslint_slash_parser"; + packageName = "@typescript-eslint/parser"; + version = "2.34.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-2.34.0.tgz"; + sha512 = "03ilO0ucSD0EPTw2X4PntSIRFtDPWjrVq7C3/Z3VQHRC7+13YB55rcJI3Jt+YgeHbjUdJPcPa7b23rXCBokuyA=="; + }; + }; + "@typescript-eslint/typescript-estree-2.34.0" = { + name = "_at_typescript-eslint_slash_typescript-estree"; + packageName = "@typescript-eslint/typescript-estree"; + version = "2.34.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-2.34.0.tgz"; + sha512 = "OMAr+nJWKdlVM9LOqCqh3pQQPwxHAN7Du8DR6dmwCrAmxtiXQnhHJ6tBNtf+cggqfo51SG/FCwnKhXCIM7hnVg=="; + }; + }; + "@vue/babel-helper-vue-jsx-merge-props-1.0.0" = { + name = "_at_vue_slash_babel-helper-vue-jsx-merge-props"; + packageName = "@vue/babel-helper-vue-jsx-merge-props"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@vue/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-1.0.0.tgz"; + sha512 = "6tyf5Cqm4m6v7buITuwS+jHzPlIPxbFzEhXR5JGZpbrvOcp1hiQKckd305/3C7C36wFekNTQSxAtgeM0j0yoUw=="; + }; + }; + "@vue/babel-plugin-transform-vue-jsx-1.1.2" = { + name = "_at_vue_slash_babel-plugin-transform-vue-jsx"; + packageName = "@vue/babel-plugin-transform-vue-jsx"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@vue/babel-plugin-transform-vue-jsx/-/babel-plugin-transform-vue-jsx-1.1.2.tgz"; + sha512 = "YfdaoSMvD1nj7+DsrwfTvTnhDXI7bsuh+Y5qWwvQXlD24uLgnsoww3qbiZvWf/EoviZMrvqkqN4CBw0W3BWUTQ=="; + }; + }; + "@vue/babel-preset-app-4.4.6" = { + name = "_at_vue_slash_babel-preset-app"; + packageName = "@vue/babel-preset-app"; + version = "4.4.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@vue/babel-preset-app/-/babel-preset-app-4.4.6.tgz"; + sha512 = "urIa6Qk3lKacLvscrzxMNyYlTqKFcPAUo5MohOjv1ISZ9PssHw693WTOrqSC0XksdMLtp/rnLvc6l5G8Muk0lw=="; + }; + }; + "@vue/babel-preset-jsx-1.1.2" = { + name = "_at_vue_slash_babel-preset-jsx"; + packageName = "@vue/babel-preset-jsx"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@vue/babel-preset-jsx/-/babel-preset-jsx-1.1.2.tgz"; + sha512 = "zDpVnFpeC9YXmvGIDSsKNdL7qCG2rA3gjywLYHPCKDT10erjxF4U+6ay9X6TW5fl4GsDlJp9bVfAVQAAVzxxvQ=="; + }; + }; + "@vue/babel-sugar-functional-vue-1.1.2" = { + name = "_at_vue_slash_babel-sugar-functional-vue"; + packageName = "@vue/babel-sugar-functional-vue"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@vue/babel-sugar-functional-vue/-/babel-sugar-functional-vue-1.1.2.tgz"; + sha512 = "YhmdJQSVEFF5ETJXzrMpj0nkCXEa39TvVxJTuVjzvP2rgKhdMmQzlJuMv/HpadhZaRVMCCF3AEjjJcK5q/cYzQ=="; + }; + }; + "@vue/babel-sugar-inject-h-1.1.2" = { + name = "_at_vue_slash_babel-sugar-inject-h"; + packageName = "@vue/babel-sugar-inject-h"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@vue/babel-sugar-inject-h/-/babel-sugar-inject-h-1.1.2.tgz"; + sha512 = "VRSENdTvD5htpnVp7i7DNuChR5rVMcORdXjvv5HVvpdKHzDZAYiLSD+GhnhxLm3/dMuk8pSzV+k28ECkiN5m8w=="; + }; + }; + "@vue/babel-sugar-v-model-1.1.2" = { + name = "_at_vue_slash_babel-sugar-v-model"; + packageName = "@vue/babel-sugar-v-model"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@vue/babel-sugar-v-model/-/babel-sugar-v-model-1.1.2.tgz"; + sha512 = "vLXPvNq8vDtt0u9LqFdpGM9W9IWDmCmCyJXuozlq4F4UYVleXJ2Fa+3JsnTZNJcG+pLjjfnEGHci2339Kj5sGg=="; + }; + }; + "@vue/babel-sugar-v-on-1.1.2" = { + name = "_at_vue_slash_babel-sugar-v-on"; + packageName = "@vue/babel-sugar-v-on"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@vue/babel-sugar-v-on/-/babel-sugar-v-on-1.1.2.tgz"; + sha512 = "T8ZCwC8Jp2uRtcZ88YwZtZXe7eQrJcfRq0uTFy6ShbwYJyz5qWskRFoVsdTi9o0WEhmQXxhQUewodOSCUPVmsQ=="; + }; + }; + "@vue/cli-overlay-4.4.6" = { + name = "_at_vue_slash_cli-overlay"; + packageName = "@vue/cli-overlay"; + version = "4.4.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@vue/cli-overlay/-/cli-overlay-4.4.6.tgz"; + sha512 = "fzjg2gWQt+jw5fyLsD9HZNxGNQgZjLDI2s9bLWJwRucdfmncSi9neqA0TZyszGrgcJA4Qu4V5KgV0qwVSBYCaw=="; + }; + }; + "@vue/cli-plugin-babel-4.4.6" = { + name = "_at_vue_slash_cli-plugin-babel"; + packageName = "@vue/cli-plugin-babel"; + version = "4.4.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@vue/cli-plugin-babel/-/cli-plugin-babel-4.4.6.tgz"; + sha512 = "9cX9mN+4DIbcqw3rV6UBOA0t5zikIkrBLQloUzsOBOu5Xb7/UoD7inInFj7bnyHUflr5LqbdWJ+etCQcWAIIXA=="; + }; + }; + "@vue/cli-plugin-eslint-4.4.6" = { + name = "_at_vue_slash_cli-plugin-eslint"; + packageName = "@vue/cli-plugin-eslint"; + version = "4.4.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@vue/cli-plugin-eslint/-/cli-plugin-eslint-4.4.6.tgz"; + sha512 = "3a9rVpOKPQsDgAlRkhmBMHboGobivG/47BbQGE66Z8YJxrgF/AWikP3Jy67SmxtszRkyiWfw4aJFRV9r3MzffQ=="; + }; + }; + "@vue/cli-plugin-router-4.4.6" = { + name = "_at_vue_slash_cli-plugin-router"; + packageName = "@vue/cli-plugin-router"; + version = "4.4.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@vue/cli-plugin-router/-/cli-plugin-router-4.4.6.tgz"; + sha512 = "TkLdn0ZYo3zgn78Rk8doPlR+4UkGjGW2R1eGEaZEkue/mw2VhUWtTk9cKLZaYrw0eY8Ro/j+OV6mD+scyrairg=="; + }; + }; + "@vue/cli-plugin-typescript-4.4.6" = { + name = "_at_vue_slash_cli-plugin-typescript"; + packageName = "@vue/cli-plugin-typescript"; + version = "4.4.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@vue/cli-plugin-typescript/-/cli-plugin-typescript-4.4.6.tgz"; + sha512 = "FIIx9yqm19M62+2X4QwTrnlePdghsKnFbBPCHJawx3ULx30B11fL7X0uwmcq+kEAAHwAGBI6QyU7dgwPDRUCOw=="; + }; + }; + "@vue/cli-plugin-vuex-4.4.6" = { + name = "_at_vue_slash_cli-plugin-vuex"; + packageName = "@vue/cli-plugin-vuex"; + version = "4.4.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@vue/cli-plugin-vuex/-/cli-plugin-vuex-4.4.6.tgz"; + sha512 = "Ho0YzUivn8BLPqFoFypntR8CMTEXYYHVr0GdnZW99XL+DbGw75f+tJfnrV9UFHDTfvZt7uewKiXDMlrzQ0l3Ug=="; + }; + }; + "@vue/cli-service-4.4.6" = { + name = "_at_vue_slash_cli-service"; + packageName = "@vue/cli-service"; + version = "4.4.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@vue/cli-service/-/cli-service-4.4.6.tgz"; + sha512 = "k5OFGh2NnvRymCyq9DfBiNJvECUuun3pl5KMm3557IZyA5E5csv+RHoSW3dX8HHe0zXq18g52VswP1llvR9POw=="; + }; + }; + "@vue/cli-shared-utils-4.4.6" = { + name = "_at_vue_slash_cli-shared-utils"; + packageName = "@vue/cli-shared-utils"; + version = "4.4.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-4.4.6.tgz"; + sha512 = "ba+FZZCjiTSu2otnLjY4qXqASe7ZIQ/QBljk5oRPgqrR0p1NUkDPUcZhqa041aOaSW1yAfSfhOD7Q84nMnWhzQ=="; + }; + }; + "@vue/component-compiler-utils-3.1.2" = { + name = "_at_vue_slash_component-compiler-utils"; + packageName = "@vue/component-compiler-utils"; + version = "3.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@vue/component-compiler-utils/-/component-compiler-utils-3.1.2.tgz"; + sha512 = "QLq9z8m79mCinpaEeSURhnNCN6djxpHw0lpP/bodMlt5kALfONpryMthvnrQOlTcIKoF+VoPi+lPHUYeDFPXug=="; + }; + }; + "@vue/eslint-config-typescript-5.0.2" = { + name = "_at_vue_slash_eslint-config-typescript"; + packageName = "@vue/eslint-config-typescript"; + version = "5.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@vue/eslint-config-typescript/-/eslint-config-typescript-5.0.2.tgz"; + sha512 = "GEZOHKOnelgQf5npA+6VNuhJZu9xEJaics3SYUyRjaSay+2SCpEINHhEpt6fXoNy/aIFt8CkDlt9CaEb+QPIcg=="; + }; + }; + "@vue/preload-webpack-plugin-1.1.1" = { + name = "_at_vue_slash_preload-webpack-plugin"; + packageName = "@vue/preload-webpack-plugin"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@vue/preload-webpack-plugin/-/preload-webpack-plugin-1.1.1.tgz"; + sha512 = "8VCoJeeH8tCkzhkpfOkt+abALQkS11OIHhte5MBzYaKMTqK0A3ZAKEUVAffsOklhEv7t0yrQt696Opnu9oAx+w=="; + }; + }; + "@vue/web-component-wrapper-1.2.0" = { + name = "_at_vue_slash_web-component-wrapper"; + packageName = "@vue/web-component-wrapper"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@vue/web-component-wrapper/-/web-component-wrapper-1.2.0.tgz"; + sha512 = "Xn/+vdm9CjuC9p3Ae+lTClNutrVhsXpzxvoTXXtoys6kVRX9FkueSUAqSWAyZntmVLlR4DosBV4pH8y5Z/HbUw=="; + }; + }; + "@webassemblyjs/ast-1.9.0" = { + name = "_at_webassemblyjs_slash_ast"; + packageName = "@webassemblyjs/ast"; + version = "1.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.9.0.tgz"; + sha512 = "C6wW5L+b7ogSDVqymbkkvuW9kruN//YisMED04xzeBBqjHa2FYnmvOlS6Xj68xWQRgWvI9cIglsjFowH/RJyEA=="; + }; + }; + "@webassemblyjs/floating-point-hex-parser-1.9.0" = { + name = "_at_webassemblyjs_slash_floating-point-hex-parser"; + packageName = "@webassemblyjs/floating-point-hex-parser"; + version = "1.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.9.0.tgz"; + sha512 = "TG5qcFsS8QB4g4MhrxK5TqfdNe7Ey/7YL/xN+36rRjl/BlGE/NcBvJcqsRgCP6Z92mRE+7N50pRIi8SmKUbcQA=="; + }; + }; + "@webassemblyjs/helper-api-error-1.9.0" = { + name = "_at_webassemblyjs_slash_helper-api-error"; + packageName = "@webassemblyjs/helper-api-error"; + version = "1.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.9.0.tgz"; + sha512 = "NcMLjoFMXpsASZFxJ5h2HZRcEhDkvnNFOAKneP5RbKRzaWJN36NC4jqQHKwStIhGXu5mUWlUUk7ygdtrO8lbmw=="; + }; + }; + "@webassemblyjs/helper-buffer-1.9.0" = { + name = "_at_webassemblyjs_slash_helper-buffer"; + packageName = "@webassemblyjs/helper-buffer"; + version = "1.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.9.0.tgz"; + sha512 = "qZol43oqhq6yBPx7YM3m9Bv7WMV9Eevj6kMi6InKOuZxhw+q9hOkvq5e/PpKSiLfyetpaBnogSbNCfBwyB00CA=="; + }; + }; + "@webassemblyjs/helper-code-frame-1.9.0" = { + name = "_at_webassemblyjs_slash_helper-code-frame"; + packageName = "@webassemblyjs/helper-code-frame"; + version = "1.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.9.0.tgz"; + sha512 = "ERCYdJBkD9Vu4vtjUYe8LZruWuNIToYq/ME22igL+2vj2dQ2OOujIZr3MEFvfEaqKoVqpsFKAGsRdBSBjrIvZA=="; + }; + }; + "@webassemblyjs/helper-fsm-1.9.0" = { + name = "_at_webassemblyjs_slash_helper-fsm"; + packageName = "@webassemblyjs/helper-fsm"; + version = "1.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.9.0.tgz"; + sha512 = "OPRowhGbshCb5PxJ8LocpdX9Kl0uB4XsAjl6jH/dWKlk/mzsANvhwbiULsaiqT5GZGT9qinTICdj6PLuM5gslw=="; + }; + }; + "@webassemblyjs/helper-module-context-1.9.0" = { + name = "_at_webassemblyjs_slash_helper-module-context"; + packageName = "@webassemblyjs/helper-module-context"; + version = "1.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.9.0.tgz"; + sha512 = "MJCW8iGC08tMk2enck1aPW+BE5Cw8/7ph/VGZxwyvGbJwjktKkDK7vy7gAmMDx88D7mhDTCNKAW5tED+gZ0W8g=="; + }; + }; + "@webassemblyjs/helper-wasm-bytecode-1.9.0" = { + name = "_at_webassemblyjs_slash_helper-wasm-bytecode"; + packageName = "@webassemblyjs/helper-wasm-bytecode"; + version = "1.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.9.0.tgz"; + sha512 = "R7FStIzyNcd7xKxCZH5lE0Bqy+hGTwS3LJjuv1ZVxd9O7eHCedSdrId/hMOd20I+v8wDXEn+bjfKDLzTepoaUw=="; + }; + }; + "@webassemblyjs/helper-wasm-section-1.9.0" = { + name = "_at_webassemblyjs_slash_helper-wasm-section"; + packageName = "@webassemblyjs/helper-wasm-section"; + version = "1.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.9.0.tgz"; + sha512 = "XnMB8l3ek4tvrKUUku+IVaXNHz2YsJyOOmz+MMkZvh8h1uSJpSen6vYnw3IoQ7WwEuAhL8Efjms1ZWjqh2agvw=="; + }; + }; + "@webassemblyjs/ieee754-1.9.0" = { + name = "_at_webassemblyjs_slash_ieee754"; + packageName = "@webassemblyjs/ieee754"; + version = "1.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.9.0.tgz"; + sha512 = "dcX8JuYU/gvymzIHc9DgxTzUUTLexWwt8uCTWP3otys596io0L5aW02Gb1RjYpx2+0Jus1h4ZFqjla7umFniTg=="; + }; + }; + "@webassemblyjs/leb128-1.9.0" = { + name = "_at_webassemblyjs_slash_leb128"; + packageName = "@webassemblyjs/leb128"; + version = "1.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.9.0.tgz"; + sha512 = "ENVzM5VwV1ojs9jam6vPys97B/S65YQtv/aanqnU7D8aSoHFX8GyhGg0CMfyKNIHBuAVjy3tlzd5QMMINa7wpw=="; + }; + }; + "@webassemblyjs/utf8-1.9.0" = { + name = "_at_webassemblyjs_slash_utf8"; + packageName = "@webassemblyjs/utf8"; + version = "1.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.9.0.tgz"; + sha512 = "GZbQlWtopBTP0u7cHrEx+73yZKrQoBMpwkGEIqlacljhXCkVM1kMQge/Mf+csMJAjEdSwhOyLAS0AoR3AG5P8w=="; + }; + }; + "@webassemblyjs/wasm-edit-1.9.0" = { + name = "_at_webassemblyjs_slash_wasm-edit"; + packageName = "@webassemblyjs/wasm-edit"; + version = "1.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.9.0.tgz"; + sha512 = "FgHzBm80uwz5M8WKnMTn6j/sVbqilPdQXTWraSjBwFXSYGirpkSWE2R9Qvz9tNiTKQvoKILpCuTjBKzOIm0nxw=="; + }; + }; + "@webassemblyjs/wasm-gen-1.9.0" = { + name = "_at_webassemblyjs_slash_wasm-gen"; + packageName = "@webassemblyjs/wasm-gen"; + version = "1.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.9.0.tgz"; + sha512 = "cPE3o44YzOOHvlsb4+E9qSqjc9Qf9Na1OO/BHFy4OI91XDE14MjFN4lTMezzaIWdPqHnsTodGGNP+iRSYfGkjA=="; + }; + }; + "@webassemblyjs/wasm-opt-1.9.0" = { + name = "_at_webassemblyjs_slash_wasm-opt"; + packageName = "@webassemblyjs/wasm-opt"; + version = "1.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.9.0.tgz"; + sha512 = "Qkjgm6Anhm+OMbIL0iokO7meajkzQD71ioelnfPEj6r4eOFuqm4YC3VBPqXjFyyNwowzbMD+hizmprP/Fwkl2A=="; + }; + }; + "@webassemblyjs/wasm-parser-1.9.0" = { + name = "_at_webassemblyjs_slash_wasm-parser"; + packageName = "@webassemblyjs/wasm-parser"; + version = "1.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.9.0.tgz"; + sha512 = "9+wkMowR2AmdSWQzsPEjFU7njh8HTO5MqO8vjwEHuM+AMHioNqSBONRdr0NQQ3dVQrzp0s8lTcYqzUdb7YgELA=="; + }; + }; + "@webassemblyjs/wast-parser-1.9.0" = { + name = "_at_webassemblyjs_slash_wast-parser"; + packageName = "@webassemblyjs/wast-parser"; + version = "1.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.9.0.tgz"; + sha512 = "qsqSAP3QQ3LyZjNC/0jBJ/ToSxfYJ8kYyuiGvtn/8MK89VrNEfwj7BPQzJVHi0jGTRK2dGdJ5PRqhtjzoww+bw=="; + }; + }; + "@webassemblyjs/wast-printer-1.9.0" = { + name = "_at_webassemblyjs_slash_wast-printer"; + packageName = "@webassemblyjs/wast-printer"; + version = "1.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.9.0.tgz"; + sha512 = "2J0nE95rHXHyQ24cWjMKJ1tqB/ds8z/cyeOZxJhcb+rW+SQASVjuznUSmdz5GpVJTzU8JkhYut0D3siFDD6wsA=="; + }; + }; + "@xtuc/ieee754-1.2.0" = { + name = "_at_xtuc_slash_ieee754"; + packageName = "@xtuc/ieee754"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz"; + sha512 = "DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA=="; + }; + }; + "@xtuc/long-4.2.2" = { + name = "_at_xtuc_slash_long"; + packageName = "@xtuc/long"; + version = "4.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz"; + sha512 = "NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ=="; + }; + }; + "abbrev-1.1.1" = { + name = "abbrev"; + packageName = "abbrev"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz"; + sha512 = "nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="; + }; + }; + "accepts-1.3.7" = { + name = "accepts"; + packageName = "accepts"; + version = "1.3.7"; + src = fetchurl { + url = "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz"; + sha512 = "Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA=="; + }; + }; + "acorn-6.4.1" = { + name = "acorn"; + packageName = "acorn"; + version = "6.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/acorn/-/acorn-6.4.1.tgz"; + sha512 = "ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA=="; + }; + }; + "acorn-7.1.1" = { + name = "acorn"; + packageName = "acorn"; + version = "7.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/acorn/-/acorn-7.1.1.tgz"; + sha512 = "add7dgA5ppRPxCFJoAGfMDi7PIBXq1RtGo7BhbLaxwrXPOmw8gq48Y9ozT01hUKy9byMjlR20EJhu5zlkErEkg=="; + }; + }; + "acorn-7.3.1" = { + name = "acorn"; + packageName = "acorn"; + version = "7.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/acorn/-/acorn-7.3.1.tgz"; + sha512 = "tLc0wSnatxAQHVHUapaHdz72pi9KUyHjq5KyHjGg9Y8Ifdc79pTh2XvI6I1/chZbnM7QtNKzh66ooDogPZSleA=="; + }; + }; + "acorn-jsx-5.1.0" = { + name = "acorn-jsx"; + packageName = "acorn-jsx"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.1.0.tgz"; + sha512 = "tMUqwBWfLFbJbizRmEcWSLw6HnFzfdJs2sOJEOwwtVPMoH/0Ay+E703oZz78VSXZiiDcZrQ5XKjPIUQixhmgVw=="; + }; + }; + "acorn-walk-7.2.0" = { + name = "acorn-walk"; + packageName = "acorn-walk"; + version = "7.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz"; + sha512 = "OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA=="; + }; + }; + "address-1.1.2" = { + name = "address"; + packageName = "address"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/address/-/address-1.1.2.tgz"; + sha512 = "aT6camzM4xEA54YVJYSqxz1kv4IHnQZRtThJJHhUMRExaU5spC7jX5ugSwTaTgJliIgs4VhZOk7htClvQ/LmRA=="; + }; + }; + "aggregate-error-3.0.1" = { + name = "aggregate-error"; + packageName = "aggregate-error"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.0.1.tgz"; + sha512 = "quoaXsZ9/BLNae5yiNoUz+Nhkwz83GhWwtYFglcjEQB2NDHCIpApbqXxIFnm4Pq/Nvhrsq5sYJFyohrrxnTGAA=="; + }; + }; + "ajv-6.10.2" = { + name = "ajv"; + packageName = "ajv"; + version = "6.10.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz"; + sha512 = "TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw=="; + }; + }; + "ajv-6.12.2" = { + name = "ajv"; + packageName = "ajv"; + version = "6.12.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ajv/-/ajv-6.12.2.tgz"; + sha512 = "k+V+hzjm5q/Mr8ef/1Y9goCmlsK4I6Sm74teeyGvFk1XrOsbsKLjEdrvny42CZ+a8sXbk8KWpY/bDwS+FLL2UQ=="; + }; + }; + "ajv-errors-1.0.1" = { + name = "ajv-errors"; + packageName = "ajv-errors"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ajv-errors/-/ajv-errors-1.0.1.tgz"; + sha512 = "DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ=="; + }; + }; + "ajv-keywords-3.4.1" = { + name = "ajv-keywords"; + packageName = "ajv-keywords"; + version = "3.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.4.1.tgz"; + sha512 = "RO1ibKvd27e6FEShVFfPALuHI3WjSVNeK5FIsmme/LYRNxjKuNj+Dt7bucLa6NdSv3JcVTyMlm9kGR84z1XpaQ=="; + }; + }; + "alphanum-sort-1.0.2" = { + name = "alphanum-sort"; + packageName = "alphanum-sort"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/alphanum-sort/-/alphanum-sort-1.0.2.tgz"; + sha1 = "97a1119649b211ad33691d9f9f486a8ec9fbe0a3"; + }; + }; + "amdefine-1.0.1" = { + name = "amdefine"; + packageName = "amdefine"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz"; + sha1 = "4a5282ac164729e93619bcfd3ad151f817ce91f5"; + }; + }; + "ansi-colors-3.2.4" = { + name = "ansi-colors"; + packageName = "ansi-colors"; + version = "3.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.4.tgz"; + sha512 = "hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA=="; + }; + }; + "ansi-escapes-4.3.0" = { + name = "ansi-escapes"; + packageName = "ansi-escapes"; + version = "4.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.0.tgz"; + sha512 = "EiYhwo0v255HUL6eDyuLrXEkTi7WwVCLAw+SeOQ7M7qdun1z1pum4DEm/nuqIVbPvi9RPPc9k9LbyBv6H0DwVg=="; + }; + }; + "ansi-html-0.0.7" = { + name = "ansi-html"; + packageName = "ansi-html"; + version = "0.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-html/-/ansi-html-0.0.7.tgz"; + sha1 = "813584021962a9e9e6fd039f940d12f56ca7859e"; + }; + }; + "ansi-regex-2.1.1" = { + name = "ansi-regex"; + packageName = "ansi-regex"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz"; + sha1 = "c3b33ab5ee360d86e0e628f0468ae7ef27d654df"; + }; + }; + "ansi-regex-3.0.0" = { + name = "ansi-regex"; + packageName = "ansi-regex"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz"; + sha1 = "ed0317c322064f79466c02966bddb605ab37d998"; + }; + }; + "ansi-regex-4.1.0" = { + name = "ansi-regex"; + packageName = "ansi-regex"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz"; + sha512 = "1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg=="; + }; + }; + "ansi-regex-5.0.0" = { + name = "ansi-regex"; + packageName = "ansi-regex"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz"; + sha512 = "bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg=="; + }; + }; + "ansi-styles-2.2.1" = { + name = "ansi-styles"; + packageName = "ansi-styles"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz"; + sha1 = "b432dd3358b634cf75e1e4664368240533c1ddbe"; + }; + }; + "ansi-styles-3.2.1" = { + name = "ansi-styles"; + packageName = "ansi-styles"; + version = "3.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz"; + sha512 = "VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA=="; + }; + }; + "ansi-styles-4.2.1" = { + name = "ansi-styles"; + packageName = "ansi-styles"; + version = "4.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz"; + sha512 = "9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA=="; + }; + }; + "any-promise-1.3.0" = { + name = "any-promise"; + packageName = "any-promise"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz"; + sha1 = "abc6afeedcea52e809cdc0376aed3ce39635d17f"; + }; + }; + "anymatch-2.0.0" = { + name = "anymatch"; + packageName = "anymatch"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz"; + sha512 = "5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw=="; + }; + }; + "anymatch-3.1.1" = { + name = "anymatch"; + packageName = "anymatch"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz"; + sha512 = "mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg=="; + }; + }; + "aproba-1.2.0" = { + name = "aproba"; + packageName = "aproba"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz"; + sha512 = "Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw=="; + }; + }; + "arch-2.1.2" = { + name = "arch"; + packageName = "arch"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/arch/-/arch-2.1.2.tgz"; + sha512 = "NTBIIbAfkJeIletyABbVtdPgeKfDafR+1mZV/AyyfC1UkVkp9iUjV+wwmqtUgphHYajbI86jejBJp5e+jkGTiQ=="; + }; + }; + "are-we-there-yet-1.1.5" = { + name = "are-we-there-yet"; + packageName = "are-we-there-yet"; + version = "1.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz"; + sha512 = "5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w=="; + }; + }; + "argparse-1.0.10" = { + name = "argparse"; + packageName = "argparse"; + version = "1.0.10"; + src = fetchurl { + url = "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz"; + sha512 = "o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg=="; + }; + }; + "arr-diff-4.0.0" = { + name = "arr-diff"; + packageName = "arr-diff"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz"; + sha1 = "d6461074febfec71e7e15235761a329a5dc7c520"; + }; + }; + "arr-flatten-1.1.0" = { + name = "arr-flatten"; + packageName = "arr-flatten"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz"; + sha512 = "L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg=="; + }; + }; + "arr-union-3.1.0" = { + name = "arr-union"; + packageName = "arr-union"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz"; + sha1 = "e39b09aea9def866a8f206e288af63919bae39c4"; + }; + }; + "array-find-index-1.0.2" = { + name = "array-find-index"; + packageName = "array-find-index"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz"; + sha1 = "df010aa1287e164bbda6f9723b0a96a1ec4187a1"; + }; + }; + "array-flatten-1.1.1" = { + name = "array-flatten"; + packageName = "array-flatten"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz"; + sha1 = "9a5f699051b1e7073328f2a008968b64ea2955d2"; + }; + }; + "array-flatten-2.1.2" = { + name = "array-flatten"; + packageName = "array-flatten"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz"; + sha512 = "hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ=="; + }; + }; + "array-union-1.0.2" = { + name = "array-union"; + packageName = "array-union"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz"; + sha1 = "9a34410e4f4e3da23dea375be5be70f24778ec39"; + }; + }; + "array-uniq-1.0.3" = { + name = "array-uniq"; + packageName = "array-uniq"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz"; + sha1 = "af6ac877a25cc7f74e058894753858dfdb24fdb6"; + }; + }; + "array-unique-0.3.2" = { + name = "array-unique"; + packageName = "array-unique"; + version = "0.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz"; + sha1 = "a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"; + }; + }; + "asn1-0.2.4" = { + name = "asn1"; + packageName = "asn1"; + version = "0.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz"; + 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=="; + }; + }; + "assert-1.5.0" = { + name = "assert"; + packageName = "assert"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/assert/-/assert-1.5.0.tgz"; + sha512 = "EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA=="; + }; + }; + "assert-plus-1.0.0" = { + name = "assert-plus"; + packageName = "assert-plus"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz"; + sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"; + }; + }; + "assign-symbols-1.0.0" = { + name = "assign-symbols"; + packageName = "assign-symbols"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz"; + sha1 = "59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"; + }; + }; + "astral-regex-1.0.0" = { + name = "astral-regex"; + packageName = "astral-regex"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz"; + sha512 = "+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg=="; + }; + }; + "async-2.6.3" = { + name = "async"; + packageName = "async"; + version = "2.6.3"; + src = fetchurl { + url = "https://registry.npmjs.org/async/-/async-2.6.3.tgz"; + sha512 = "zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg=="; + }; + }; + "async-each-1.0.3" = { + name = "async-each"; + packageName = "async-each"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/async-each/-/async-each-1.0.3.tgz"; + sha512 = "z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ=="; + }; + }; + "async-foreach-0.1.3" = { + name = "async-foreach"; + packageName = "async-foreach"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/async-foreach/-/async-foreach-0.1.3.tgz"; + sha1 = "36121f845c0578172de419a97dbeb1d16ec34542"; + }; + }; + "async-limiter-1.0.1" = { + name = "async-limiter"; + packageName = "async-limiter"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz"; + sha512 = "csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ=="; + }; + }; + "asynckit-0.4.0" = { + name = "asynckit"; + packageName = "asynckit"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz"; + sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"; + }; + }; + "atob-2.1.2" = { + name = "atob"; + packageName = "atob"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz"; + sha512 = "Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg=="; + }; + }; + "autoprefixer-9.8.4" = { + name = "autoprefixer"; + packageName = "autoprefixer"; + version = "9.8.4"; + src = fetchurl { + url = "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.8.4.tgz"; + sha512 = "84aYfXlpUe45lvmS+HoAWKCkirI/sw4JK0/bTeeqgHYco3dcsOn0NqdejISjptsYwNji/21dnkDri9PsYKk89A=="; + }; + }; + "aws-sign2-0.7.0" = { + name = "aws-sign2"; + packageName = "aws-sign2"; + version = "0.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz"; + sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"; + }; + }; + "aws4-1.9.0" = { + name = "aws4"; + packageName = "aws4"; + version = "1.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/aws4/-/aws4-1.9.0.tgz"; + sha512 = "Uvq6hVe90D0B2WEnUqtdgY1bATGz3mw33nH9Y+dmA+w5DHvUmBgkr5rM/KCHpCsiFNRUfokW/szpPPgMK2hm4A=="; + }; + }; + "babel-code-frame-6.26.0" = { + name = "babel-code-frame"; + packageName = "babel-code-frame"; + version = "6.26.0"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz"; + sha1 = "63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"; + }; + }; + "babel-loader-8.1.0" = { + name = "babel-loader"; + packageName = "babel-loader"; + version = "8.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-loader/-/babel-loader-8.1.0.tgz"; + sha512 = "7q7nC1tYOrqvUrN3LQK4GwSk/TQorZSOlO9C+RZDZpODgyN4ZlCqE5q9cDsyWOliN+aU9B4JX01xK9eJXowJLw=="; + }; + }; + "babel-plugin-dynamic-import-node-2.3.3" = { + name = "babel-plugin-dynamic-import-node"; + packageName = "babel-plugin-dynamic-import-node"; + version = "2.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz"; + sha512 = "jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ=="; + }; + }; + "balanced-match-1.0.0" = { + name = "balanced-match"; + packageName = "balanced-match"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz"; + sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767"; + }; + }; + "base-0.11.2" = { + name = "base"; + packageName = "base"; + version = "0.11.2"; + src = fetchurl { + url = "https://registry.npmjs.org/base/-/base-0.11.2.tgz"; + sha512 = "5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg=="; + }; + }; + "base64-js-1.3.1" = { + name = "base64-js"; + packageName = "base64-js"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz"; + sha512 = "mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g=="; + }; + }; + "batch-0.6.1" = { + name = "batch"; + packageName = "batch"; + version = "0.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz"; + sha1 = "dc34314f4e679318093fc760272525f94bf25c16"; + }; + }; + "bcrypt-pbkdf-1.0.2" = { + name = "bcrypt-pbkdf"; + packageName = "bcrypt-pbkdf"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz"; + sha1 = "a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"; + }; + }; + "bfj-6.1.2" = { + name = "bfj"; + packageName = "bfj"; + version = "6.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/bfj/-/bfj-6.1.2.tgz"; + sha512 = "BmBJa4Lip6BPRINSZ0BPEIfB1wUY/9rwbwvIHQA1KjX9om29B6id0wnWXq7m3bn5JrUVjeOTnVuhPT1FiHwPGw=="; + }; + }; + "big.js-3.2.0" = { + name = "big.js"; + packageName = "big.js"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/big.js/-/big.js-3.2.0.tgz"; + sha512 = "+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q=="; + }; + }; + "big.js-5.2.2" = { + name = "big.js"; + packageName = "big.js"; + version = "5.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz"; + sha512 = "vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ=="; + }; + }; + "binary-extensions-1.13.1" = { + name = "binary-extensions"; + packageName = "binary-extensions"; + version = "1.13.1"; + src = fetchurl { + url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz"; + sha512 = "Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw=="; + }; + }; + "binary-extensions-2.1.0" = { + name = "binary-extensions"; + packageName = "binary-extensions"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.1.0.tgz"; + sha512 = "1Yj8h9Q+QDF5FzhMs/c9+6UntbD5MkRfRwac8DoEm9ZfUBZ7tZ55YcGVAzEe4bXsdQHEk+s9S5wsOKVdZrw0tQ=="; + }; + }; + "bindings-1.5.0" = { + name = "bindings"; + packageName = "bindings"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz"; + sha512 = "p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ=="; + }; + }; + "block-stream-0.0.9" = { + name = "block-stream"; + packageName = "block-stream"; + version = "0.0.9"; + src = fetchurl { + url = "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz"; + sha1 = "13ebfe778a03205cfe03751481ebb4b3300c126a"; + }; + }; + "bluebird-3.7.2" = { + name = "bluebird"; + packageName = "bluebird"; + version = "3.7.2"; + src = fetchurl { + url = "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz"; + sha512 = "XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg=="; + }; + }; + "bn.js-4.11.8" = { + name = "bn.js"; + packageName = "bn.js"; + version = "4.11.8"; + src = fetchurl { + url = "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz"; + sha512 = "ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA=="; + }; + }; + "body-parser-1.19.0" = { + name = "body-parser"; + packageName = "body-parser"; + version = "1.19.0"; + src = fetchurl { + url = "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz"; + sha512 = "dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw=="; + }; + }; + "bonjour-3.5.0" = { + name = "bonjour"; + packageName = "bonjour"; + version = "3.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bonjour/-/bonjour-3.5.0.tgz"; + sha1 = "8e890a183d8ee9a2393b3844c691a42bcf7bc9f5"; + }; + }; + "boolbase-1.0.0" = { + name = "boolbase"; + packageName = "boolbase"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz"; + sha1 = "68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"; + }; + }; + "brace-expansion-1.1.11" = { + name = "brace-expansion"; + packageName = "brace-expansion"; + version = "1.1.11"; + src = fetchurl { + url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz"; + sha512 = "iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA=="; + }; + }; + "braces-2.3.2" = { + name = "braces"; + packageName = "braces"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz"; + sha512 = "aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w=="; + }; + }; + "braces-3.0.2" = { + name = "braces"; + packageName = "braces"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz"; + sha512 = "b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A=="; + }; + }; + "brorand-1.1.0" = { + name = "brorand"; + packageName = "brorand"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz"; + sha1 = "12c25efe40a45e3c323eb8675a0a0ce57b22371f"; + }; + }; + "browserify-aes-1.2.0" = { + name = "browserify-aes"; + packageName = "browserify-aes"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz"; + sha512 = "+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA=="; + }; + }; + "browserify-cipher-1.0.1" = { + name = "browserify-cipher"; + packageName = "browserify-cipher"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz"; + sha512 = "sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w=="; + }; + }; + "browserify-des-1.0.2" = { + name = "browserify-des"; + packageName = "browserify-des"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz"; + sha512 = "BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A=="; + }; + }; + "browserify-rsa-4.0.1" = { + name = "browserify-rsa"; + packageName = "browserify-rsa"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz"; + sha1 = "21e0abfaf6f2029cf2fafb133567a701d4135524"; + }; + }; + "browserify-sign-4.0.4" = { + name = "browserify-sign"; + packageName = "browserify-sign"; + version = "4.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.4.tgz"; + sha1 = "aa4eb68e5d7b658baa6bf6a57e630cbd7a93d298"; + }; + }; + "browserify-zlib-0.2.0" = { + name = "browserify-zlib"; + packageName = "browserify-zlib"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz"; + sha512 = "Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA=="; + }; + }; + "browserslist-4.11.1" = { + name = "browserslist"; + packageName = "browserslist"; + version = "4.11.1"; + src = fetchurl { + url = "https://registry.npmjs.org/browserslist/-/browserslist-4.11.1.tgz"; + sha512 = "DCTr3kDrKEYNw6Jb9HFxVLQNaue8z+0ZfRBRjmCunKDEXEBajKDj2Y+Uelg+Pi29OnvaSGwjOsnRyNEkXzHg5g=="; + }; + }; + "browserslist-4.12.2" = { + name = "browserslist"; + packageName = "browserslist"; + version = "4.12.2"; + src = fetchurl { + url = "https://registry.npmjs.org/browserslist/-/browserslist-4.12.2.tgz"; + sha512 = "MfZaeYqR8StRZdstAK9hCKDd2StvePCYp5rHzQCPicUjfFliDgmuaBNPHYUTpAywBN8+Wc/d7NYVFkO0aqaBUw=="; + }; + }; + "buefy-0.8.15" = { + name = "buefy"; + packageName = "buefy"; + version = "0.8.15"; + src = fetchurl { + url = "https://registry.npmjs.org/buefy/-/buefy-0.8.15.tgz"; + sha512 = "rDTtLNIip+uFpB1Z9E9YllLPYUkJUIFsf7tBhutNfP9SYGrcDhXnUsIEhPHSxGEeddPlX9YT98Mx1zhOz622vg=="; + }; + }; + "buffer-4.9.2" = { + name = "buffer"; + packageName = "buffer"; + version = "4.9.2"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer/-/buffer-4.9.2.tgz"; + sha512 = "xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg=="; + }; + }; + "buffer-from-1.1.1" = { + name = "buffer-from"; + packageName = "buffer-from"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz"; + sha512 = "MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A=="; + }; + }; + "buffer-indexof-1.1.1" = { + name = "buffer-indexof"; + packageName = "buffer-indexof"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer-indexof/-/buffer-indexof-1.1.1.tgz"; + sha512 = "4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g=="; + }; + }; + "buffer-json-2.0.0" = { + name = "buffer-json"; + packageName = "buffer-json"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer-json/-/buffer-json-2.0.0.tgz"; + sha512 = "+jjPFVqyfF1esi9fvfUs3NqM0pH1ziZ36VP4hmA/y/Ssfo/5w5xHKfTw9BwQjoJ1w/oVtpLomqwUHKdefGyuHw=="; + }; + }; + "buffer-xor-1.0.3" = { + name = "buffer-xor"; + packageName = "buffer-xor"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz"; + sha1 = "26e61ed1422fb70dd42e6e36729ed51d855fe8d9"; + }; + }; + "builtin-modules-1.1.1" = { + name = "builtin-modules"; + packageName = "builtin-modules"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz"; + sha1 = "270f076c5a72c02f5b65a47df94c5fe3a278892f"; + }; + }; + "builtin-status-codes-3.0.0" = { + name = "builtin-status-codes"; + packageName = "builtin-status-codes"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz"; + sha1 = "85982878e21b98e1c66425e03d0174788f569ee8"; + }; + }; + "bulma-0.7.5" = { + name = "bulma"; + packageName = "bulma"; + version = "0.7.5"; + src = fetchurl { + url = "https://registry.npmjs.org/bulma/-/bulma-0.7.5.tgz"; + sha512 = "cX98TIn0I6sKba/DhW0FBjtaDpxTelU166pf7ICXpCCuplHWyu6C9LYZmL5PEsnePIeJaiorsTEzzNk3Tsm1hw=="; + }; + }; + "bytes-3.0.0" = { + name = "bytes"; + packageName = "bytes"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz"; + sha1 = "d32815404d689699f85a4ea4fa8755dd13a96048"; + }; + }; + "bytes-3.1.0" = { + name = "bytes"; + packageName = "bytes"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz"; + sha512 = "zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg=="; + }; + }; + "cacache-12.0.4" = { + name = "cacache"; + packageName = "cacache"; + version = "12.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/cacache/-/cacache-12.0.4.tgz"; + sha512 = "a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ=="; + }; + }; + "cacache-13.0.1" = { + name = "cacache"; + packageName = "cacache"; + version = "13.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cacache/-/cacache-13.0.1.tgz"; + sha512 = "5ZvAxd05HDDU+y9BVvcqYu2LLXmPnQ0hW62h32g4xBTgL/MppR4/04NHfj/ycM2y6lmTnbw6HVi+1eN0Psba6w=="; + }; + }; + "cache-base-1.0.1" = { + name = "cache-base"; + packageName = "cache-base"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz"; + sha512 = "AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ=="; + }; + }; + "cache-loader-4.1.0" = { + name = "cache-loader"; + packageName = "cache-loader"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cache-loader/-/cache-loader-4.1.0.tgz"; + sha512 = "ftOayxve0PwKzBF/GLsZNC9fJBXl8lkZE3TOsjkboHfVHVkL39iUEs1FO07A33mizmci5Dudt38UZrrYXDtbhw=="; + }; + }; + "call-me-maybe-1.0.1" = { + name = "call-me-maybe"; + packageName = "call-me-maybe"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/call-me-maybe/-/call-me-maybe-1.0.1.tgz"; + sha1 = "26d208ea89e37b5cbde60250a15f031c16a4d66b"; + }; + }; + "caller-callsite-2.0.0" = { + name = "caller-callsite"; + packageName = "caller-callsite"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/caller-callsite/-/caller-callsite-2.0.0.tgz"; + sha1 = "847e0fce0a223750a9a027c54b33731ad3154134"; + }; + }; + "caller-path-2.0.0" = { + name = "caller-path"; + packageName = "caller-path"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/caller-path/-/caller-path-2.0.0.tgz"; + sha1 = "468f83044e369ab2010fac5f06ceee15bb2cb1f4"; + }; + }; + "callsites-2.0.0" = { + name = "callsites"; + packageName = "callsites"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz"; + sha1 = "06eb84f00eea413da86affefacbffb36093b3c50"; + }; + }; + "callsites-3.1.0" = { + name = "callsites"; + packageName = "callsites"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz"; + sha512 = "P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ=="; + }; + }; + "camel-case-3.0.0" = { + name = "camel-case"; + packageName = "camel-case"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/camel-case/-/camel-case-3.0.0.tgz"; + sha1 = "ca3c3688a4e9cf3a4cda777dc4dcbc713249cf73"; + }; + }; + "camelcase-2.1.1" = { + name = "camelcase"; + packageName = "camelcase"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz"; + sha1 = "7c1d16d679a1bbe59ca02cacecfb011e201f5a1f"; + }; + }; + "camelcase-5.3.1" = { + name = "camelcase"; + packageName = "camelcase"; + version = "5.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz"; + sha512 = "L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="; + }; + }; + "camelcase-keys-2.1.0" = { + name = "camelcase-keys"; + packageName = "camelcase-keys"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz"; + sha1 = "308beeaffdf28119051efa1d932213c91b8f92e7"; + }; + }; + "caniuse-api-3.0.0" = { + name = "caniuse-api"; + packageName = "caniuse-api"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/caniuse-api/-/caniuse-api-3.0.0.tgz"; + sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; + }; + }; + "caniuse-lite-1.0.30001038" = { + name = "caniuse-lite"; + packageName = "caniuse-lite"; + version = "1.0.30001038"; + src = fetchurl { + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001038.tgz"; + sha512 = "zii9quPo96XfOiRD4TrfYGs+QsGZpb2cGiMAzPjtf/hpFgB6zCPZgJb7I1+EATeMw/o+lG8FyRAnI+CWStHcaQ=="; + }; + }; + "caniuse-lite-1.0.30001090" = { + name = "caniuse-lite"; + packageName = "caniuse-lite"; + version = "1.0.30001090"; + src = fetchurl { + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001090.tgz"; + sha512 = "QzPRKDCyp7RhjczTPZaqK3CjPA5Ht2UnXhZhCI4f7QiB5JK6KEuZBxIzyWnB3wO4hgAj4GMRxAhuiacfw0Psjg=="; + }; + }; + "case-sensitive-paths-webpack-plugin-2.3.0" = { + name = "case-sensitive-paths-webpack-plugin"; + packageName = "case-sensitive-paths-webpack-plugin"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/case-sensitive-paths-webpack-plugin/-/case-sensitive-paths-webpack-plugin-2.3.0.tgz"; + sha512 = "/4YgnZS8y1UXXmC02xD5rRrBEu6T5ub+mQHLNRj0fzTRbgdBYhsNo2V5EqwgqrExjxsjtF/OpAKAMkKsxbD5XQ=="; + }; + }; + "caseless-0.12.0" = { + name = "caseless"; + packageName = "caseless"; + version = "0.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz"; + sha1 = "1b681c21ff84033c826543090689420d187151dc"; + }; + }; + "chalk-1.1.3" = { + name = "chalk"; + packageName = "chalk"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz"; + sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98"; + }; + }; + "chalk-2.4.2" = { + name = "chalk"; + packageName = "chalk"; + version = "2.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz"; + sha512 = "Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ=="; + }; + }; + "chalk-3.0.0" = { + name = "chalk"; + packageName = "chalk"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz"; + sha512 = "4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg=="; + }; + }; + "chardet-0.7.0" = { + name = "chardet"; + packageName = "chardet"; + version = "0.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz"; + sha512 = "mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA=="; + }; + }; + "check-types-8.0.3" = { + name = "check-types"; + packageName = "check-types"; + version = "8.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/check-types/-/check-types-8.0.3.tgz"; + sha512 = "YpeKZngUmG65rLudJ4taU7VLkOCTMhNl/u4ctNC56LQS/zJTyNH0Lrtwm1tfTsbLlwvlfsA2d1c8vCf/Kh2KwQ=="; + }; + }; + "chokidar-2.1.8" = { + name = "chokidar"; + packageName = "chokidar"; + version = "2.1.8"; + src = fetchurl { + url = "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz"; + sha512 = "ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg=="; + }; + }; + "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=="; + }; + }; + "chownr-1.1.4" = { + name = "chownr"; + packageName = "chownr"; + version = "1.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz"; + sha512 = "jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg=="; + }; + }; + "chrome-trace-event-1.0.2" = { + name = "chrome-trace-event"; + packageName = "chrome-trace-event"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz"; + sha512 = "9e/zx1jw7B4CO+c/RXoCsfg/x1AfUBioy4owYH0bJprEYAx5hRFLRhWBqHAG57D0ZM4H7vxbP7bPe0VwhQRYDQ=="; + }; + }; + "ci-info-1.6.0" = { + name = "ci-info"; + packageName = "ci-info"; + version = "1.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ci-info/-/ci-info-1.6.0.tgz"; + sha512 = "vsGdkwSCDpWmP80ncATX7iea5DWQemg1UgCW5J8tqjU3lYw4FBYuj89J0CTVomA7BEfvSZd84GmHko+MxFQU2A=="; + }; + }; + "cipher-base-1.0.4" = { + name = "cipher-base"; + packageName = "cipher-base"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz"; + sha512 = "Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q=="; + }; + }; + "class-utils-0.3.6" = { + name = "class-utils"; + packageName = "class-utils"; + version = "0.3.6"; + src = fetchurl { + url = "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz"; + sha512 = "qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg=="; + }; + }; + "clean-css-4.2.3" = { + name = "clean-css"; + packageName = "clean-css"; + version = "4.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/clean-css/-/clean-css-4.2.3.tgz"; + sha512 = "VcMWDN54ZN/DS+g58HYL5/n4Zrqe8vHJpGA8KdgUXFU4fuP/aHNw8eld9SyEIyabIMJX/0RaY/fplOo5hYLSFA=="; + }; + }; + "clean-stack-2.2.0" = { + name = "clean-stack"; + packageName = "clean-stack"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz"; + sha512 = "4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A=="; + }; + }; + "cli-cursor-2.1.0" = { + name = "cli-cursor"; + packageName = "cli-cursor"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz"; + sha1 = "b35dac376479facc3e94747d41d0d0f5238ffcb5"; + }; + }; + "cli-cursor-3.1.0" = { + name = "cli-cursor"; + packageName = "cli-cursor"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz"; + sha512 = "I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw=="; + }; + }; + "cli-highlight-2.1.4" = { + name = "cli-highlight"; + packageName = "cli-highlight"; + version = "2.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-highlight/-/cli-highlight-2.1.4.tgz"; + sha512 = "s7Zofobm20qriqDoU9sXptQx0t2R9PEgac92mENNm7xaEe1hn71IIMsXMK+6encA6WRCWWxIGQbipr3q998tlQ=="; + }; + }; + "cli-spinners-2.2.0" = { + name = "cli-spinners"; + packageName = "cli-spinners"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.2.0.tgz"; + sha512 = "tgU3fKwzYjiLEQgPMD9Jt+JjHVL9kW93FiIMX/l7rivvOD4/LL0Mf7gda3+4U2KJBloybwgj5KEoQgGRioMiKQ=="; + }; + }; + "cli-table3-0.5.1" = { + name = "cli-table3"; + packageName = "cli-table3"; + version = "0.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-table3/-/cli-table3-0.5.1.tgz"; + sha512 = "7Qg2Jrep1S/+Q3EceiZtQcDPWxhAvBw+ERf1162v4sikJrvojMHFqXt8QIVha8UlH9rgU0BeWPytZ9/TzYqlUw=="; + }; + }; + "cli-width-2.2.0" = { + name = "cli-width"; + packageName = "cli-width"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz"; + sha1 = "ff19ede8a9a5e579324147b0c11f0fbcbabed639"; + }; + }; + "clipboardy-2.3.0" = { + name = "clipboardy"; + packageName = "clipboardy"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/clipboardy/-/clipboardy-2.3.0.tgz"; + sha512 = "mKhiIL2DrQIsuXMgBgnfEHOZOryC7kY7YO//TN6c63wlEm3NG5tz+YgY5rVi29KCmq/QQjKYvM7a19+MDOTHOQ=="; + }; + }; + "cliui-5.0.0" = { + name = "cliui"; + packageName = "cliui"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz"; + sha512 = "PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA=="; + }; + }; + "cliui-6.0.0" = { + name = "cliui"; + packageName = "cliui"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz"; + sha512 = "t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ=="; + }; + }; + "clone-1.0.4" = { + name = "clone"; + packageName = "clone"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz"; + sha1 = "da309cc263df15994c688ca902179ca3c7cd7c7e"; + }; + }; + "clone-deep-4.0.1" = { + name = "clone-deep"; + packageName = "clone-deep"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz"; + sha512 = "neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ=="; + }; + }; + "coa-2.0.2" = { + name = "coa"; + packageName = "coa"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/coa/-/coa-2.0.2.tgz"; + sha512 = "q5/jG+YQnSy4nRTV4F7lPepBJZ8qBNJJDBuJdoejDyLXgmL7IEo+Le2JDZudFTFt7mrCqIRaSjws4ygRCTCAXA=="; + }; + }; + "code-point-at-1.1.0" = { + name = "code-point-at"; + packageName = "code-point-at"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz"; + sha1 = "0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"; + }; + }; + "collection-visit-1.0.0" = { + name = "collection-visit"; + packageName = "collection-visit"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz"; + sha1 = "4bc0373c164bc3291b4d368c829cf1a80a59dca0"; + }; + }; + "color-3.1.2" = { + name = "color"; + packageName = "color"; + version = "3.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/color/-/color-3.1.2.tgz"; + sha512 = "vXTJhHebByxZn3lDvDJYw4lR5+uB3vuoHsuYA5AKuxRVn5wzzIfQKGLBmgdVRHKTJYeK5rvJcHnrd0Li49CFpg=="; + }; + }; + "color-convert-1.9.3" = { + name = "color-convert"; + packageName = "color-convert"; + version = "1.9.3"; + src = fetchurl { + url = "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz"; + sha512 = "QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg=="; + }; + }; + "color-convert-2.0.1" = { + name = "color-convert"; + packageName = "color-convert"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz"; + sha512 = "RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ=="; + }; + }; + "color-name-1.1.3" = { + name = "color-name"; + packageName = "color-name"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz"; + sha1 = "a7d0558bd89c42f795dd42328f740831ca53bc25"; + }; + }; + "color-name-1.1.4" = { + name = "color-name"; + packageName = "color-name"; + version = "1.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz"; + sha512 = "dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="; + }; + }; + "color-string-1.5.3" = { + name = "color-string"; + packageName = "color-string"; + version = "1.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/color-string/-/color-string-1.5.3.tgz"; + sha512 = "dC2C5qeWoYkxki5UAXapdjqO672AM4vZuPGRQfO8b5HKuKGBbKWpITyDYN7TOFKvRW7kOgAn3746clDBMDJyQw=="; + }; + }; + "colorette-1.2.0" = { + name = "colorette"; + packageName = "colorette"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/colorette/-/colorette-1.2.0.tgz"; + sha512 = "soRSroY+OF/8OdA3PTQXwaDJeMc7TfknKKrxeSCencL2a4+Tx5zhxmmv7hdpCjhKBjehzp8+bwe/T68K0hpIjw=="; + }; + }; + "colors-1.4.0" = { + name = "colors"; + packageName = "colors"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz"; + sha512 = "a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA=="; + }; + }; + "combined-stream-1.0.8" = { + name = "combined-stream"; + packageName = "combined-stream"; + version = "1.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz"; + sha512 = "FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg=="; + }; + }; + "commander-2.17.1" = { + name = "commander"; + packageName = "commander"; + version = "2.17.1"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-2.17.1.tgz"; + sha512 = "wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg=="; + }; + }; + "commander-2.19.0" = { + name = "commander"; + packageName = "commander"; + version = "2.19.0"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-2.19.0.tgz"; + sha512 = "6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg=="; + }; + }; + "commander-2.20.3" = { + name = "commander"; + packageName = "commander"; + version = "2.20.3"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz"; + sha512 = "GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="; + }; + }; + "commondir-1.0.1" = { + name = "commondir"; + packageName = "commondir"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz"; + sha1 = "ddd800da0c66127393cca5950ea968a3aaf1253b"; + }; + }; + "component-emitter-1.3.0" = { + name = "component-emitter"; + packageName = "component-emitter"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz"; + sha512 = "Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg=="; + }; + }; + "compressible-2.0.18" = { + name = "compressible"; + packageName = "compressible"; + version = "2.0.18"; + src = fetchurl { + url = "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz"; + sha512 = "AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg=="; + }; + }; + "compression-1.7.4" = { + name = "compression"; + packageName = "compression"; + version = "1.7.4"; + src = fetchurl { + url = "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz"; + sha512 = "jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ=="; + }; + }; + "concat-map-0.0.1" = { + name = "concat-map"; + packageName = "concat-map"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"; + sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b"; + }; + }; + "concat-stream-1.6.2" = { + name = "concat-stream"; + packageName = "concat-stream"; + version = "1.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz"; + sha512 = "27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw=="; + }; + }; + "connect-history-api-fallback-1.6.0" = { + name = "connect-history-api-fallback"; + packageName = "connect-history-api-fallback"; + version = "1.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz"; + sha512 = "e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg=="; + }; + }; + "console-browserify-1.2.0" = { + name = "console-browserify"; + packageName = "console-browserify"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/console-browserify/-/console-browserify-1.2.0.tgz"; + sha512 = "ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA=="; + }; + }; + "console-control-strings-1.1.0" = { + name = "console-control-strings"; + packageName = "console-control-strings"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz"; + sha1 = "3d7cf4464db6446ea644bf4b39507f9851008e8e"; + }; + }; + "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=="; + }; + }; + "constants-browserify-1.0.0" = { + name = "constants-browserify"; + packageName = "constants-browserify"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz"; + sha1 = "c20b96d8c617748aaf1c16021760cd27fcb8cb75"; + }; + }; + "content-disposition-0.5.3" = { + name = "content-disposition"; + packageName = "content-disposition"; + version = "0.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz"; + sha512 = "ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g=="; + }; + }; + "content-type-1.0.4" = { + name = "content-type"; + packageName = "content-type"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz"; + sha512 = "hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA=="; + }; + }; + "convert-source-map-1.7.0" = { + name = "convert-source-map"; + packageName = "convert-source-map"; + version = "1.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz"; + sha512 = "4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA=="; + }; + }; + "cookie-0.4.0" = { + name = "cookie"; + packageName = "cookie"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz"; + sha512 = "+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg=="; + }; + }; + "cookie-signature-1.0.6" = { + name = "cookie-signature"; + packageName = "cookie-signature"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz"; + sha1 = "e303a882b342cc3ee8ca513a79999734dab3ae2c"; + }; + }; + "copy-concurrently-1.0.5" = { + name = "copy-concurrently"; + packageName = "copy-concurrently"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz"; + sha512 = "f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A=="; + }; + }; + "copy-descriptor-0.1.1" = { + name = "copy-descriptor"; + packageName = "copy-descriptor"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz"; + sha1 = "676f6eb3c39997c2ee1ac3a924fd6124748f578d"; + }; + }; + "copy-webpack-plugin-5.1.1" = { + name = "copy-webpack-plugin"; + packageName = "copy-webpack-plugin"; + version = "5.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-5.1.1.tgz"; + sha512 = "P15M5ZC8dyCjQHWwd4Ia/dm0SgVvZJMYeykVIVYXbGyqO4dWB5oyPHp9i7wjwo5LhtlhKbiBCdS2NvM07Wlybg=="; + }; + }; + "core-js-3.6.5" = { + name = "core-js"; + packageName = "core-js"; + version = "3.6.5"; + src = fetchurl { + url = "https://registry.npmjs.org/core-js/-/core-js-3.6.5.tgz"; + sha512 = "vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA=="; + }; + }; + "core-js-compat-3.6.5" = { + name = "core-js-compat"; + packageName = "core-js-compat"; + version = "3.6.5"; + src = fetchurl { + url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.6.5.tgz"; + sha512 = "7ItTKOhOZbznhXAQ2g/slGg1PJV5zDO/WdkTwi7UEOJmkvsE32PWvx6mKtDjiMpjnR2CNf6BAD6sSxIlv7ptng=="; + }; + }; + "core-util-is-1.0.2" = { + name = "core-util-is"; + packageName = "core-util-is"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"; + sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; + }; + }; + "cosmiconfig-5.2.1" = { + name = "cosmiconfig"; + packageName = "cosmiconfig"; + version = "5.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.2.1.tgz"; + sha512 = "H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA=="; + }; + }; + "create-ecdh-4.0.3" = { + name = "create-ecdh"; + packageName = "create-ecdh"; + version = "4.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.3.tgz"; + sha512 = "GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw=="; + }; + }; + "create-hash-1.2.0" = { + name = "create-hash"; + packageName = "create-hash"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz"; + sha512 = "z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg=="; + }; + }; + "create-hmac-1.1.7" = { + name = "create-hmac"; + packageName = "create-hmac"; + version = "1.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz"; + sha512 = "MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg=="; + }; + }; + "cross-spawn-3.0.1" = { + name = "cross-spawn"; + packageName = "cross-spawn"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-3.0.1.tgz"; + sha1 = "1256037ecb9f0c5f79e3d6ef135e30770184b982"; + }; + }; + "cross-spawn-5.1.0" = { + name = "cross-spawn"; + packageName = "cross-spawn"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz"; + sha1 = "e8bd0efee58fcff6f8f94510a0a554bbfa235449"; + }; + }; + "cross-spawn-6.0.5" = { + name = "cross-spawn"; + packageName = "cross-spawn"; + version = "6.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz"; + sha512 = "eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ=="; + }; + }; + "cross-spawn-7.0.3" = { + name = "cross-spawn"; + packageName = "cross-spawn"; + version = "7.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz"; + sha512 = "iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w=="; + }; + }; + "crypto-browserify-3.12.0" = { + name = "crypto-browserify"; + packageName = "crypto-browserify"; + version = "3.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz"; + sha512 = "fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg=="; + }; + }; + "css-color-names-0.0.4" = { + name = "css-color-names"; + packageName = "css-color-names"; + version = "0.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.4.tgz"; + sha1 = "808adc2e79cf84738069b646cb20ec27beb629e0"; + }; + }; + "css-declaration-sorter-4.0.1" = { + name = "css-declaration-sorter"; + packageName = "css-declaration-sorter"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-4.0.1.tgz"; + sha512 = "BcxQSKTSEEQUftYpBVnsH4SF05NTuBokb19/sBt6asXGKZ/6VP7PLG1CBCkFDYOnhXhPh0jMhO6xZ71oYHXHBA=="; + }; + }; + "css-loader-3.6.0" = { + name = "css-loader"; + packageName = "css-loader"; + version = "3.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/css-loader/-/css-loader-3.6.0.tgz"; + sha512 = "M5lSukoWi1If8dhQAUCvj4H8vUt3vOnwbQBH9DdTm/s4Ym2B/3dPMtYZeJmq7Q3S3Pa+I94DcZ7pc9bP14cWIQ=="; + }; + }; + "css-select-1.2.0" = { + name = "css-select"; + packageName = "css-select"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz"; + sha1 = "2b3a110539c5355f1cd8d314623e870b121ec858"; + }; + }; + "css-select-2.1.0" = { + name = "css-select"; + packageName = "css-select"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/css-select/-/css-select-2.1.0.tgz"; + sha512 = "Dqk7LQKpwLoH3VovzZnkzegqNSuAziQyNZUcrdDM401iY+R5NkGBXGmtO05/yaXQziALuPogeG0b7UAgjnTJTQ=="; + }; + }; + "css-select-base-adapter-0.1.1" = { + name = "css-select-base-adapter"; + packageName = "css-select-base-adapter"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/css-select-base-adapter/-/css-select-base-adapter-0.1.1.tgz"; + sha512 = "jQVeeRG70QI08vSTwf1jHxp74JoZsr2XSgETae8/xC8ovSnL2WF87GTLO86Sbwdt2lK4Umg4HnnwMO4YF3Ce7w=="; + }; + }; + "css-tree-1.0.0-alpha.37" = { + name = "css-tree"; + packageName = "css-tree"; + version = "1.0.0-alpha.37"; + src = fetchurl { + url = "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.37.tgz"; + sha512 = "DMxWJg0rnz7UgxKT0Q1HU/L9BeJI0M6ksor0OgqOnF+aRCDWg/N2641HmVyU9KVIu0OVVWOb2IpC9A+BJRnejg=="; + }; + }; + "css-tree-1.0.0-alpha.39" = { + name = "css-tree"; + packageName = "css-tree"; + version = "1.0.0-alpha.39"; + src = fetchurl { + url = "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.39.tgz"; + sha512 = "7UvkEYgBAHRG9Nt980lYxjsTrCyHFN53ky3wVsDkiMdVqylqRt+Zc+jm5qw7/qyOvN2dHSYtX0e4MbCCExSvnA=="; + }; + }; + "css-what-2.1.3" = { + name = "css-what"; + packageName = "css-what"; + version = "2.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/css-what/-/css-what-2.1.3.tgz"; + sha512 = "a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg=="; + }; + }; + "css-what-3.3.0" = { + name = "css-what"; + packageName = "css-what"; + version = "3.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/css-what/-/css-what-3.3.0.tgz"; + sha512 = "pv9JPyatiPaQ6pf4OvD/dbfm0o5LviWmwxNWzblYf/1u9QZd0ihV+PMwy5jdQWQ3349kZmKEx9WXuSka2dM4cg=="; + }; + }; + "cssesc-3.0.0" = { + name = "cssesc"; + packageName = "cssesc"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz"; + sha512 = "/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg=="; + }; + }; + "cssnano-4.1.10" = { + name = "cssnano"; + packageName = "cssnano"; + version = "4.1.10"; + src = fetchurl { + url = "https://registry.npmjs.org/cssnano/-/cssnano-4.1.10.tgz"; + sha512 = "5wny+F6H4/8RgNlaqab4ktc3e0/blKutmq8yNlBFXA//nSFFAqAngjNVRzUvCgYROULmZZUoosL/KSoZo5aUaQ=="; + }; + }; + "cssnano-preset-default-4.0.7" = { + name = "cssnano-preset-default"; + packageName = "cssnano-preset-default"; + version = "4.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-4.0.7.tgz"; + sha512 = "x0YHHx2h6p0fCl1zY9L9roD7rnlltugGu7zXSKQx6k2rYw0Hi3IqxcoAGF7u9Q5w1nt7vK0ulxV8Lo+EvllGsA=="; + }; + }; + "cssnano-util-get-arguments-4.0.0" = { + name = "cssnano-util-get-arguments"; + packageName = "cssnano-util-get-arguments"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cssnano-util-get-arguments/-/cssnano-util-get-arguments-4.0.0.tgz"; + sha1 = "ed3a08299f21d75741b20f3b81f194ed49cc150f"; + }; + }; + "cssnano-util-get-match-4.0.0" = { + name = "cssnano-util-get-match"; + packageName = "cssnano-util-get-match"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cssnano-util-get-match/-/cssnano-util-get-match-4.0.0.tgz"; + sha1 = "c0e4ca07f5386bb17ec5e52250b4f5961365156d"; + }; + }; + "cssnano-util-raw-cache-4.0.1" = { + name = "cssnano-util-raw-cache"; + packageName = "cssnano-util-raw-cache"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cssnano-util-raw-cache/-/cssnano-util-raw-cache-4.0.1.tgz"; + sha512 = "qLuYtWK2b2Dy55I8ZX3ky1Z16WYsx544Q0UWViebptpwn/xDBmog2TLg4f+DBMg1rJ6JDWtn96WHbOKDWt1WQA=="; + }; + }; + "cssnano-util-same-parent-4.0.1" = { + name = "cssnano-util-same-parent"; + packageName = "cssnano-util-same-parent"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cssnano-util-same-parent/-/cssnano-util-same-parent-4.0.1.tgz"; + sha512 = "WcKx5OY+KoSIAxBW6UBBRay1U6vkYheCdjyVNDm85zt5K9mHoGOfsOsqIszfAqrQQFIIKgjh2+FDgIj/zsl21Q=="; + }; + }; + "csso-4.0.3" = { + name = "csso"; + packageName = "csso"; + version = "4.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/csso/-/csso-4.0.3.tgz"; + sha512 = "NL3spysxUkcrOgnpsT4Xdl2aiEiBG6bXswAABQVHcMrfjjBisFOKwLDOmf4wf32aPdcJws1zds2B0Rg+jqMyHQ=="; + }; + }; + "currently-unhandled-0.4.1" = { + name = "currently-unhandled"; + packageName = "currently-unhandled"; + version = "0.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz"; + sha1 = "988df33feab191ef799a61369dd76c17adf957ea"; + }; + }; + "cyclist-1.0.1" = { + name = "cyclist"; + packageName = "cyclist"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cyclist/-/cyclist-1.0.1.tgz"; + sha1 = "596e9698fd0c80e12038c2b82d6eb1b35b6224d9"; + }; + }; + "dashdash-1.14.1" = { + name = "dashdash"; + packageName = "dashdash"; + version = "1.14.1"; + src = fetchurl { + url = "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz"; + sha1 = "853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"; + }; + }; + "de-indent-1.0.2" = { + name = "de-indent"; + packageName = "de-indent"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/de-indent/-/de-indent-1.0.2.tgz"; + sha1 = "b2038e846dc33baa5796128d0804b455b8c1e21d"; + }; + }; + "debug-2.6.9" = { + name = "debug"; + packageName = "debug"; + version = "2.6.9"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz"; + sha512 = "bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="; + }; + }; + "debug-3.2.6" = { + name = "debug"; + packageName = "debug"; + version = "3.2.6"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz"; + sha512 = "mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ=="; + }; + }; + "debug-4.1.1" = { + name = "debug"; + packageName = "debug"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz"; + sha512 = "pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw=="; + }; + }; + "decamelize-1.2.0" = { + name = "decamelize"; + packageName = "decamelize"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz"; + sha1 = "f6534d15148269b20352e7bee26f501f9a191290"; + }; + }; + "decode-uri-component-0.2.0" = { + name = "decode-uri-component"; + packageName = "decode-uri-component"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz"; + sha1 = "eb3913333458775cb84cd1a1fae062106bb87545"; + }; + }; + "deep-equal-1.1.1" = { + name = "deep-equal"; + packageName = "deep-equal"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.1.tgz"; + sha512 = "yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g=="; + }; + }; + "deep-is-0.1.3" = { + name = "deep-is"; + packageName = "deep-is"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz"; + sha1 = "b369d6fb5dbc13eecf524f91b070feedc357cf34"; + }; + }; + "deepmerge-1.5.2" = { + name = "deepmerge"; + packageName = "deepmerge"; + version = "1.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/deepmerge/-/deepmerge-1.5.2.tgz"; + sha512 = "95k0GDqvBjZavkuvzx/YqVLv/6YYa17fz6ILMSf7neqQITCPbnfEnQvEgMPNjH4kgobe7+WIL0yJEHku+H3qtQ=="; + }; + }; + "deepmerge-4.2.2" = { + name = "deepmerge"; + packageName = "deepmerge"; + version = "4.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz"; + sha512 = "FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg=="; + }; + }; + "default-gateway-4.2.0" = { + name = "default-gateway"; + packageName = "default-gateway"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/default-gateway/-/default-gateway-4.2.0.tgz"; + sha512 = "h6sMrVB1VMWVrW13mSc6ia/DwYYw5MN6+exNu1OaJeFac5aSAvwM7lZ0NVfTABuSkQelr4h5oebg3KB1XPdjgA=="; + }; + }; + "default-gateway-5.0.5" = { + name = "default-gateway"; + packageName = "default-gateway"; + version = "5.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/default-gateway/-/default-gateway-5.0.5.tgz"; + sha512 = "z2RnruVmj8hVMmAnEJMTIJNijhKCDiGjbLP+BHJFOT7ld3Bo5qcIBpVYDniqhbMIIf+jZDlkP2MkPXiQy/DBLA=="; + }; + }; + "defaults-1.0.3" = { + name = "defaults"; + packageName = "defaults"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz"; + sha1 = "c656051e9817d9ff08ed881477f3fe4019f3ef7d"; + }; + }; + "define-properties-1.1.3" = { + name = "define-properties"; + packageName = "define-properties"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz"; + sha512 = "3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ=="; + }; + }; + "define-property-0.2.5" = { + name = "define-property"; + packageName = "define-property"; + version = "0.2.5"; + src = fetchurl { + url = "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz"; + sha1 = "c35b1ef918ec3c990f9a5bc57be04aacec5c8116"; + }; + }; + "define-property-1.0.0" = { + name = "define-property"; + packageName = "define-property"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz"; + sha1 = "769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6"; + }; + }; + "define-property-2.0.2" = { + name = "define-property"; + packageName = "define-property"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz"; + sha512 = "jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ=="; + }; + }; + "del-4.1.1" = { + name = "del"; + packageName = "del"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/del/-/del-4.1.1.tgz"; + sha512 = "QwGuEUouP2kVwQenAsOof5Fv8K9t3D8Ca8NxcXKrIpEHjTXK5J2nXLdP+ALI1cgv8wj7KuwBhTwBkOZSJKM5XQ=="; + }; + }; + "delayed-stream-1.0.0" = { + name = "delayed-stream"; + packageName = "delayed-stream"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"; + sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619"; + }; + }; + "delegates-1.0.0" = { + name = "delegates"; + packageName = "delegates"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz"; + sha1 = "84c6e159b81904fdca59a0ef44cd870d31250f9a"; + }; + }; + "depd-1.1.2" = { + name = "depd"; + packageName = "depd"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz"; + sha1 = "9bcd52e14c097763e749b274c4346ed2e560b5a9"; + }; + }; + "des.js-1.0.1" = { + name = "des.js"; + packageName = "des.js"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/des.js/-/des.js-1.0.1.tgz"; + sha512 = "Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA=="; + }; + }; + "destroy-1.0.4" = { + name = "destroy"; + packageName = "destroy"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz"; + sha1 = "978857442c44749e4206613e37946205826abd80"; + }; + }; + "detect-node-2.0.4" = { + name = "detect-node"; + packageName = "detect-node"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/detect-node/-/detect-node-2.0.4.tgz"; + sha512 = "ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw=="; + }; + }; + "diff-4.0.2" = { + name = "diff"; + packageName = "diff"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz"; + sha512 = "58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A=="; + }; + }; + "diffie-hellman-5.0.3" = { + name = "diffie-hellman"; + packageName = "diffie-hellman"; + version = "5.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz"; + sha512 = "kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg=="; + }; + }; + "dir-glob-2.2.2" = { + name = "dir-glob"; + packageName = "dir-glob"; + version = "2.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/dir-glob/-/dir-glob-2.2.2.tgz"; + sha512 = "f9LBi5QWzIW3I6e//uxZoLBlUt9kcp66qo0sSCxL6YZKc75R1c4MFCoe/LaZiBGmgujvQdxc5Bn3QhfyvK5Hsw=="; + }; + }; + "dns-equal-1.0.0" = { + name = "dns-equal"; + packageName = "dns-equal"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz"; + sha1 = "b39e7f1da6eb0a75ba9c17324b34753c47e0654d"; + }; + }; + "dns-packet-1.3.1" = { + name = "dns-packet"; + packageName = "dns-packet"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.1.tgz"; + sha512 = "0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg=="; + }; + }; + "dns-txt-2.0.2" = { + name = "dns-txt"; + packageName = "dns-txt"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/dns-txt/-/dns-txt-2.0.2.tgz"; + sha1 = "b91d806f5d27188e4ab3e7d107d881a1cc4642b6"; + }; + }; + "doctrine-3.0.0" = { + name = "doctrine"; + packageName = "doctrine"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz"; + sha512 = "yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w=="; + }; + }; + "dom-converter-0.2.0" = { + name = "dom-converter"; + packageName = "dom-converter"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dom-converter/-/dom-converter-0.2.0.tgz"; + sha512 = "gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA=="; + }; + }; + "dom-serializer-0.2.2" = { + name = "dom-serializer"; + packageName = "dom-serializer"; + version = "0.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz"; + sha512 = "2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g=="; + }; + }; + "domain-browser-1.2.0" = { + name = "domain-browser"; + packageName = "domain-browser"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz"; + sha512 = "jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA=="; + }; + }; + "domelementtype-1.3.1" = { + name = "domelementtype"; + packageName = "domelementtype"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz"; + sha512 = "BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w=="; + }; + }; + "domelementtype-2.0.1" = { + name = "domelementtype"; + packageName = "domelementtype"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/domelementtype/-/domelementtype-2.0.1.tgz"; + sha512 = "5HOHUDsYZWV8FGWN0Njbr/Rn7f/eWSQi1v7+HsUVwXgn8nWWlL64zKDkS0n8ZmQ3mlWOMuXOnR+7Nx/5tMO5AQ=="; + }; + }; + "domhandler-2.4.2" = { + name = "domhandler"; + packageName = "domhandler"; + version = "2.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/domhandler/-/domhandler-2.4.2.tgz"; + sha512 = "JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA=="; + }; + }; + "domutils-1.5.1" = { + name = "domutils"; + packageName = "domutils"; + version = "1.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz"; + sha1 = "dcd8488a26f563d61079e48c9f7b7e32373682cf"; + }; + }; + "domutils-1.7.0" = { + name = "domutils"; + packageName = "domutils"; + version = "1.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz"; + sha512 = "Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg=="; + }; + }; + "dot-object-1.9.0" = { + name = "dot-object"; + packageName = "dot-object"; + version = "1.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dot-object/-/dot-object-1.9.0.tgz"; + sha512 = "7MPN6y7XhAO4vM4eguj5+5HNKLjJYfkVG1ZR1Aput4Q4TR6SYeSjhpVQ77IzJHoSHffKbDxBC+48aCiiRurDPw=="; + }; + }; + "dot-prop-5.2.0" = { + name = "dot-prop"; + packageName = "dot-prop"; + version = "5.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dot-prop/-/dot-prop-5.2.0.tgz"; + sha512 = "uEUyaDKoSQ1M4Oq8l45hSE26SnTxL6snNnqvK/VWx5wJhmff5z0FUVJDKDanor/6w3kzE3i7XZOk+7wC0EXr1A=="; + }; + }; + "dotenv-8.2.0" = { + name = "dotenv"; + packageName = "dotenv"; + version = "8.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dotenv/-/dotenv-8.2.0.tgz"; + sha512 = "8sJ78ElpbDJBHNeBzUbUVLsqKdccaa/BXF1uPTw3GrvQTBgrQrtObr2mUrE38vzYd8cEv+m/JBfDLioYcfXoaw=="; + }; + }; + "dotenv-expand-5.1.0" = { + name = "dotenv-expand"; + packageName = "dotenv-expand"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-5.1.0.tgz"; + sha512 = "YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA=="; + }; + }; + "duplexer-0.1.1" = { + name = "duplexer"; + packageName = "duplexer"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz"; + sha1 = "ace6ff808c1ce66b57d1ebf97977acb02334cfc1"; + }; + }; + "duplexify-3.7.1" = { + name = "duplexify"; + packageName = "duplexify"; + version = "3.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz"; + sha512 = "07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g=="; + }; + }; + "easy-stack-1.0.0" = { + name = "easy-stack"; + packageName = "easy-stack"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/easy-stack/-/easy-stack-1.0.0.tgz"; + sha1 = "12c91b3085a37f0baa336e9486eac4bf94e3e788"; + }; + }; + "ecc-jsbn-0.1.2" = { + name = "ecc-jsbn"; + packageName = "ecc-jsbn"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz"; + sha1 = "3a83a904e54353287874c564b7549386849a98c9"; + }; + }; + "ee-first-1.1.1" = { + name = "ee-first"; + packageName = "ee-first"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz"; + sha1 = "590c61156b0ae2f4f0255732a158b266bc56b21d"; + }; + }; + "ejs-2.7.4" = { + name = "ejs"; + packageName = "ejs"; + version = "2.7.4"; + src = fetchurl { + url = "https://registry.npmjs.org/ejs/-/ejs-2.7.4.tgz"; + sha512 = "7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA=="; + }; + }; + "electron-to-chromium-1.3.393" = { + name = "electron-to-chromium"; + packageName = "electron-to-chromium"; + version = "1.3.393"; + src = fetchurl { + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.393.tgz"; + sha512 = "Ko3/VdhZAaMaJBLBFqEJ+M1qMiBI8sJfPY/hSJvDrkB3Do8LJsL9tmXy4w7o9nPXif/jFaZGSlXTQWU8XVsYtg=="; + }; + }; + "electron-to-chromium-1.3.483" = { + name = "electron-to-chromium"; + packageName = "electron-to-chromium"; + version = "1.3.483"; + src = fetchurl { + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.483.tgz"; + sha512 = "+05RF8S9rk8S0G8eBCqBRBaRq7+UN3lDs2DAvnG8SBSgQO3hjy0+qt4CmRk5eiuGbTcaicgXfPmBi31a+BD3lg=="; + }; + }; + "elliptic-6.5.2" = { + name = "elliptic"; + packageName = "elliptic"; + version = "6.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/elliptic/-/elliptic-6.5.2.tgz"; + sha512 = "f4x70okzZbIQl/NSRLkI/+tteV/9WqL98zx+SQ69KbXxmVrmjwsNUPn/gYJJ0sHvEak24cZgHIPegRePAtA/xw=="; + }; + }; + "emoji-regex-7.0.3" = { + name = "emoji-regex"; + packageName = "emoji-regex"; + version = "7.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz"; + sha512 = "CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA=="; + }; + }; + "emoji-regex-8.0.0" = { + name = "emoji-regex"; + packageName = "emoji-regex"; + version = "8.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz"; + sha512 = "MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="; + }; + }; + "emojis-list-2.1.0" = { + name = "emojis-list"; + packageName = "emojis-list"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz"; + sha1 = "4daa4d9db00f9819880c79fa457ae5b09a1fd389"; + }; + }; + "emojis-list-3.0.0" = { + name = "emojis-list"; + packageName = "emojis-list"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz"; + sha512 = "/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q=="; + }; + }; + "encodeurl-1.0.2" = { + name = "encodeurl"; + packageName = "encodeurl"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz"; + sha1 = "ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"; + }; + }; + "end-of-stream-1.4.4" = { + name = "end-of-stream"; + packageName = "end-of-stream"; + version = "1.4.4"; + src = fetchurl { + url = "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz"; + sha512 = "+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q=="; + }; + }; + "enhanced-resolve-4.1.1" = { + name = "enhanced-resolve"; + packageName = "enhanced-resolve"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.1.1.tgz"; + sha512 = "98p2zE+rL7/g/DzMHMTF4zZlCgeVdJ7yr6xzEpJRYwFYrGi9ANdn5DnJURg6RpBkyk60XYDnWIv51VfIhfNGuA=="; + }; + }; + "entities-1.1.2" = { + name = "entities"; + packageName = "entities"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz"; + sha512 = "f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w=="; + }; + }; + "entities-2.0.3" = { + name = "entities"; + packageName = "entities"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/entities/-/entities-2.0.3.tgz"; + sha512 = "MyoZ0jgnLvB2X3Lg5HqpFmn1kybDiIfEQmKzTb5apr51Rb+T3KdmMiqa70T+bhGnyv7bQ6WMj2QMHpGMmlrUYQ=="; + }; + }; + "errno-0.1.7" = { + name = "errno"; + packageName = "errno"; + version = "0.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz"; + sha512 = "MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg=="; + }; + }; + "error-ex-1.3.2" = { + name = "error-ex"; + packageName = "error-ex"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz"; + 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=="; + }; + }; + "es-abstract-1.17.0-next.1" = { + name = "es-abstract"; + packageName = "es-abstract"; + version = "1.17.0-next.1"; + src = fetchurl { + url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.0-next.1.tgz"; + sha512 = "7MmGr03N7Rnuid6+wyhD9sHNE2n4tFSwExnU2lQl3lIo2ShXWGePY80zYaoMOmILWv57H0amMjZGHNzzGG70Rw=="; + }; + }; + "es-abstract-1.17.6" = { + name = "es-abstract"; + packageName = "es-abstract"; + version = "1.17.6"; + src = fetchurl { + url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.6.tgz"; + sha512 = "Fr89bON3WFyUi5EvAeI48QTWX0AyekGgLA8H+c+7fbfCkJwRWRMLd8CQedNEyJuoYYhmtEqY92pgte1FAhBlhw=="; + }; + }; + "es-to-primitive-1.2.1" = { + name = "es-to-primitive"; + packageName = "es-to-primitive"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz"; + sha512 = "QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA=="; + }; + }; + "escalade-3.0.1" = { + name = "escalade"; + packageName = "escalade"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/escalade/-/escalade-3.0.1.tgz"; + sha512 = "DR6NO3h9niOT+MZs7bjxlj2a1k+POu5RN8CLTPX2+i78bRi9eLe7+0zXgUHMnGXWybYcL61E9hGhPKqedy8tQA=="; + }; + }; + "escape-html-1.0.3" = { + name = "escape-html"; + packageName = "escape-html"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz"; + sha1 = "0258eae4d3d0c0974de1c169188ef0051d1d1988"; + }; + }; + "escape-string-regexp-1.0.5" = { + name = "escape-string-regexp"; + packageName = "escape-string-regexp"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"; + sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; + }; + }; + "eslint-6.8.0" = { + name = "eslint"; + packageName = "eslint"; + version = "6.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint/-/eslint-6.8.0.tgz"; + sha512 = "K+Iayyo2LtyYhDSYwz5D5QdWw0hCacNzyq1Y821Xna2xSJj7cijoLLYmLxTQgcgZ9mC61nryMy9S7GRbYpI5Ig=="; + }; + }; + "eslint-config-prettier-6.11.0" = { + name = "eslint-config-prettier"; + packageName = "eslint-config-prettier"; + version = "6.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-6.11.0.tgz"; + sha512 = "oB8cpLWSAjOVFEJhhyMZh6NOEOtBVziaqdDQ86+qhDHFbZXoRTM7pNSvFRfW/W/L/LrQ38C99J5CGuRBBzBsdA=="; + }; + }; + "eslint-loader-2.2.1" = { + name = "eslint-loader"; + packageName = "eslint-loader"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-loader/-/eslint-loader-2.2.1.tgz"; + sha512 = "RLgV9hoCVsMLvOxCuNjdqOrUqIj9oJg8hF44vzJaYqsAHuY9G2YAeN3joQ9nxP0p5Th9iFSIpKo+SD8KISxXRg=="; + }; + }; + "eslint-plugin-prettier-3.1.4" = { + name = "eslint-plugin-prettier"; + packageName = "eslint-plugin-prettier"; + version = "3.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-3.1.4.tgz"; + sha512 = "jZDa8z76klRqo+TdGDTFJSavwbnWK2ZpqGKNZ+VvweMW516pDUMmQ2koXvxEE4JhzNvTv+radye/bWGBmA6jmg=="; + }; + }; + "eslint-plugin-vue-6.2.2" = { + name = "eslint-plugin-vue"; + packageName = "eslint-plugin-vue"; + version = "6.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-6.2.2.tgz"; + sha512 = "Nhc+oVAHm0uz/PkJAWscwIT4ijTrK5fqNqz9QB1D35SbbuMG1uB6Yr5AJpvPSWg+WOw7nYNswerYh0kOk64gqQ=="; + }; + }; + "eslint-scope-4.0.3" = { + name = "eslint-scope"; + packageName = "eslint-scope"; + version = "4.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz"; + sha512 = "p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg=="; + }; + }; + "eslint-scope-5.0.0" = { + name = "eslint-scope"; + packageName = "eslint-scope"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.0.0.tgz"; + sha512 = "oYrhJW7S0bxAFDvWqzvMPRm6pcgcnWc4QnofCAqRTRfQC0JcwenzGglTtsLyIuuWFfkqDG9vz67cnttSd53djw=="; + }; + }; + "eslint-utils-1.4.3" = { + name = "eslint-utils"; + packageName = "eslint-utils"; + version = "1.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.3.tgz"; + sha512 = "fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q=="; + }; + }; + "eslint-utils-2.1.0" = { + name = "eslint-utils"; + packageName = "eslint-utils"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz"; + sha512 = "w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg=="; + }; + }; + "eslint-visitor-keys-1.1.0" = { + name = "eslint-visitor-keys"; + packageName = "eslint-visitor-keys"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz"; + sha512 = "8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A=="; + }; + }; + "esm-3.2.25" = { + name = "esm"; + packageName = "esm"; + version = "3.2.25"; + src = fetchurl { + url = "https://registry.npmjs.org/esm/-/esm-3.2.25.tgz"; + sha512 = "U1suiZ2oDVWv4zPO56S0NcR5QriEahGtdN2OR6FiOG4WJvcjBVFB0qI4+eKoWFH483PKGuLuu6V8Z4T5g63UVA=="; + }; + }; + "espree-6.1.2" = { + name = "espree"; + packageName = "espree"; + version = "6.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/espree/-/espree-6.1.2.tgz"; + sha512 = "2iUPuuPP+yW1PZaMSDM9eyVf8D5P0Hi8h83YtZ5bPc/zHYjII5khoixIUTMO794NOY8F/ThF1Bo8ncZILarUTA=="; + }; + }; + "esprima-4.0.1" = { + name = "esprima"; + packageName = "esprima"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz"; + sha512 = "eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="; + }; + }; + "esquery-1.0.1" = { + name = "esquery"; + packageName = "esquery"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/esquery/-/esquery-1.0.1.tgz"; + sha512 = "SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA=="; + }; + }; + "esrecurse-4.2.1" = { + name = "esrecurse"; + packageName = "esrecurse"; + version = "4.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz"; + sha512 = "64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ=="; + }; + }; + "estraverse-4.3.0" = { + name = "estraverse"; + packageName = "estraverse"; + version = "4.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz"; + sha512 = "39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw=="; + }; + }; + "esutils-2.0.3" = { + name = "esutils"; + packageName = "esutils"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz"; + sha512 = "kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g=="; + }; + }; + "etag-1.8.1" = { + name = "etag"; + packageName = "etag"; + version = "1.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz"; + sha1 = "41ae2eeb65efa62268aebfea83ac7d79299b0887"; + }; + }; + "event-pubsub-4.3.0" = { + name = "event-pubsub"; + packageName = "event-pubsub"; + version = "4.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/event-pubsub/-/event-pubsub-4.3.0.tgz"; + sha512 = "z7IyloorXvKbFx9Bpie2+vMJKKx1fH1EN5yiTfp8CiLOTptSYy1g8H4yDpGlEdshL1PBiFtBHepF2cNsqeEeFQ=="; + }; + }; + "eventemitter3-4.0.4" = { + name = "eventemitter3"; + packageName = "eventemitter3"; + version = "4.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.4.tgz"; + sha512 = "rlaVLnVxtxvoyLsQQFBx53YmXHDxRIzzTLbdfxqi4yocpSjAxXwkU0cScM5JgSKMqEhrZpnvQ2D9gjylR0AimQ=="; + }; + }; + "events-3.1.0" = { + name = "events"; + packageName = "events"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/events/-/events-3.1.0.tgz"; + sha512 = "Rv+u8MLHNOdMjTAFeT3nCjHn2aGlx435FP/sDHNaRhDEMwyI/aB22Kj2qIN8R0cw3z28psEQLYwxVKLsKrMgWg=="; + }; + }; + "eventsource-1.0.7" = { + name = "eventsource"; + packageName = "eventsource"; + version = "1.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/eventsource/-/eventsource-1.0.7.tgz"; + sha512 = "4Ln17+vVT0k8aWq+t/bF5arcS3EpT9gYtW66EPacdj/mAFevznsnyoHLPy2BA8gbIQeIHoPsvwmfBftfcG//BQ=="; + }; + }; + "evp_bytestokey-1.0.3" = { + name = "evp_bytestokey"; + packageName = "evp_bytestokey"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz"; + sha512 = "/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA=="; + }; + }; + "execa-0.8.0" = { + name = "execa"; + packageName = "execa"; + version = "0.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/execa/-/execa-0.8.0.tgz"; + sha1 = "d8d76bbc1b55217ed190fd6dd49d3c774ecfc8da"; + }; + }; + "execa-1.0.0" = { + name = "execa"; + packageName = "execa"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz"; + sha512 = "adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA=="; + }; + }; + "execa-3.4.0" = { + name = "execa"; + packageName = "execa"; + version = "3.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/execa/-/execa-3.4.0.tgz"; + sha512 = "r9vdGQk4bmCuK1yKQu1KTwcT2zwfWdbdaXfCtAh+5nU/4fSX+JAb7vZGvI5naJrQlvONrEB20jeruESI69530g=="; + }; + }; + "expand-brackets-2.1.4" = { + name = "expand-brackets"; + packageName = "expand-brackets"; + version = "2.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz"; + sha1 = "b77735e315ce30f6b6eff0f83b04151a22449622"; + }; + }; + "express-4.17.1" = { + name = "express"; + packageName = "express"; + version = "4.17.1"; + src = fetchurl { + url = "https://registry.npmjs.org/express/-/express-4.17.1.tgz"; + sha512 = "mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g=="; + }; + }; + "extend-3.0.2" = { + name = "extend"; + packageName = "extend"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz"; + sha512 = "fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="; + }; + }; + "extend-shallow-2.0.1" = { + name = "extend-shallow"; + packageName = "extend-shallow"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz"; + sha1 = "51af7d614ad9a9f610ea1bafbb989d6b1c56890f"; + }; + }; + "extend-shallow-3.0.2" = { + name = "extend-shallow"; + packageName = "extend-shallow"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz"; + sha1 = "26a71aaf073b39fb2127172746131c2704028db8"; + }; + }; + "external-editor-3.1.0" = { + name = "external-editor"; + packageName = "external-editor"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz"; + sha512 = "hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew=="; + }; + }; + "extglob-2.0.4" = { + name = "extglob"; + packageName = "extglob"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz"; + sha512 = "Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw=="; + }; + }; + "extsprintf-1.3.0" = { + name = "extsprintf"; + packageName = "extsprintf"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz"; + sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05"; + }; + }; + "fast-deep-equal-2.0.1" = { + name = "fast-deep-equal"; + packageName = "fast-deep-equal"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz"; + sha1 = "7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"; + }; + }; + "fast-deep-equal-3.1.3" = { + name = "fast-deep-equal"; + packageName = "fast-deep-equal"; + version = "3.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz"; + sha512 = "f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="; + }; + }; + "fast-diff-1.2.0" = { + name = "fast-diff"; + packageName = "fast-diff"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-diff/-/fast-diff-1.2.0.tgz"; + sha512 = "xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w=="; + }; + }; + "fast-glob-2.2.7" = { + name = "fast-glob"; + packageName = "fast-glob"; + version = "2.2.7"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-glob/-/fast-glob-2.2.7.tgz"; + sha512 = "g1KuQwHOZAmOZMuBtHdxDtju+T2RT8jgCC9aANsbpdiDDTSnjgfuVsIBNKbUeJI3oKMRExcfNDtJl4OhbffMsw=="; + }; + }; + "fast-json-stable-stringify-2.1.0" = { + name = "fast-json-stable-stringify"; + packageName = "fast-json-stable-stringify"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz"; + sha512 = "lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="; + }; + }; + "fast-levenshtein-2.0.6" = { + name = "fast-levenshtein"; + packageName = "fast-levenshtein"; + version = "2.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz"; + sha1 = "3d8a5c66883a16a30ca8643e851f19baa7797917"; + }; + }; + "faye-websocket-0.10.0" = { + name = "faye-websocket"; + packageName = "faye-websocket"; + version = "0.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.10.0.tgz"; + sha1 = "4e492f8d04dfb6f89003507f6edbf2d501e7c6f4"; + }; + }; + "faye-websocket-0.11.3" = { + name = "faye-websocket"; + packageName = "faye-websocket"; + version = "0.11.3"; + src = fetchurl { + url = "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.3.tgz"; + sha512 = "D2y4bovYpzziGgbHYtGCMjlJM36vAl/y+xUyn1C+FVx8szd1E+86KwVw6XvYSzOP8iMpm1X0I4xJD+QtUb36OA=="; + }; + }; + "figgy-pudding-3.5.2" = { + name = "figgy-pudding"; + packageName = "figgy-pudding"; + version = "3.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.2.tgz"; + sha512 = "0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw=="; + }; + }; + "figures-3.1.0" = { + name = "figures"; + packageName = "figures"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/figures/-/figures-3.1.0.tgz"; + sha512 = "ravh8VRXqHuMvZt/d8GblBeqDMkdJMBdv/2KntFH+ra5MXkO7nxNKpzQ3n6QD/2da1kH0aWmNISdvhM7gl2gVg=="; + }; + }; + "file-entry-cache-5.0.1" = { + name = "file-entry-cache"; + packageName = "file-entry-cache"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-5.0.1.tgz"; + sha512 = "bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g=="; + }; + }; + "file-loader-4.3.0" = { + name = "file-loader"; + packageName = "file-loader"; + version = "4.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/file-loader/-/file-loader-4.3.0.tgz"; + sha512 = "aKrYPYjF1yG3oX0kWRrqrSMfgftm7oJW5M+m4owoldH5C51C0RkIwB++JbRvEW3IU6/ZG5n8UvEcdgwOt2UOWA=="; + }; + }; + "file-uri-to-path-1.0.0" = { + name = "file-uri-to-path"; + packageName = "file-uri-to-path"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz"; + sha512 = "0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw=="; + }; + }; + "filesize-3.6.1" = { + name = "filesize"; + packageName = "filesize"; + version = "3.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/filesize/-/filesize-3.6.1.tgz"; + sha512 = "7KjR1vv6qnicaPMi1iiTcI85CyYwRO/PSFCu6SvqL8jN2Wjt/NIYQTFtFs7fSDCYOstUkEWIQGFUg5YZQfjlcg=="; + }; + }; + "fill-range-4.0.0" = { + name = "fill-range"; + packageName = "fill-range"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz"; + sha1 = "d544811d428f98eb06a63dc402d2403c328c38f7"; + }; + }; + "fill-range-7.0.1" = { + name = "fill-range"; + packageName = "fill-range"; + version = "7.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz"; + sha512 = "qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ=="; + }; + }; + "finalhandler-1.1.2" = { + name = "finalhandler"; + packageName = "finalhandler"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz"; + sha512 = "aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA=="; + }; + }; + "find-cache-dir-0.1.1" = { + name = "find-cache-dir"; + packageName = "find-cache-dir"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-0.1.1.tgz"; + sha1 = "c8defae57c8a52a8a784f9e31c57c742e993a0b9"; + }; + }; + "find-cache-dir-2.1.0" = { + name = "find-cache-dir"; + packageName = "find-cache-dir"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz"; + sha512 = "Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ=="; + }; + }; + "find-cache-dir-3.3.1" = { + name = "find-cache-dir"; + packageName = "find-cache-dir"; + version = "3.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.1.tgz"; + sha512 = "t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ=="; + }; + }; + "find-up-1.1.2" = { + name = "find-up"; + packageName = "find-up"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz"; + sha1 = "6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"; + }; + }; + "find-up-2.1.0" = { + name = "find-up"; + packageName = "find-up"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz"; + sha1 = "45d1b7e506c717ddd482775a2b77920a3c0c57a7"; + }; + }; + "find-up-3.0.0" = { + name = "find-up"; + packageName = "find-up"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz"; + sha512 = "1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg=="; + }; + }; + "find-up-4.1.0" = { + name = "find-up"; + packageName = "find-up"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz"; + sha512 = "PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw=="; + }; + }; + "flat-5.0.2" = { + name = "flat"; + packageName = "flat"; + version = "5.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz"; + sha512 = "b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ=="; + }; + }; + "flat-cache-2.0.1" = { + name = "flat-cache"; + packageName = "flat-cache"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/flat-cache/-/flat-cache-2.0.1.tgz"; + sha512 = "LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA=="; + }; + }; + "flatted-2.0.1" = { + name = "flatted"; + packageName = "flatted"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/flatted/-/flatted-2.0.1.tgz"; + sha512 = "a1hQMktqW9Nmqr5aktAux3JMNqaucxGcjtjWnZLHX7yyPCmlSV3M54nGYbqT8K+0GhF3NBgmJCc3ma+WOgX8Jg=="; + }; + }; + "flush-write-stream-1.1.1" = { + name = "flush-write-stream"; + packageName = "flush-write-stream"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.1.1.tgz"; + sha512 = "3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w=="; + }; + }; + "follow-redirects-1.12.1" = { + name = "follow-redirects"; + packageName = "follow-redirects"; + version = "1.12.1"; + src = fetchurl { + url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.12.1.tgz"; + sha512 = "tmRv0AVuR7ZyouUHLeNSiO6pqulF7dYa3s19c6t+wz9LD69/uSzdMxJ2S91nTI9U3rt/IldxpzMOFejp6f0hjg=="; + }; + }; + "for-in-1.0.2" = { + name = "for-in"; + packageName = "for-in"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz"; + sha1 = "81068d295a8142ec0ac726c6e2200c30fb6d5e80"; + }; + }; + "forever-agent-0.6.1" = { + name = "forever-agent"; + packageName = "forever-agent"; + version = "0.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz"; + sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"; + }; + }; + "fork-ts-checker-webpack-plugin-3.1.1" = { + name = "fork-ts-checker-webpack-plugin"; + packageName = "fork-ts-checker-webpack-plugin"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-3.1.1.tgz"; + sha512 = "DuVkPNrM12jR41KM2e+N+styka0EgLkTnXmNcXdgOM37vtGeY+oCBK/Jx0hzSeEU6memFCtWb4htrHPMDfwwUQ=="; + }; + }; + "form-data-2.3.3" = { + name = "form-data"; + packageName = "form-data"; + version = "2.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz"; + sha512 = "1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ=="; + }; + }; + "forwarded-0.1.2" = { + name = "forwarded"; + packageName = "forwarded"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz"; + sha1 = "98c23dab1175657b8c0573e8ceccd91b0ff18c84"; + }; + }; + "fragment-cache-0.2.1" = { + name = "fragment-cache"; + packageName = "fragment-cache"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz"; + sha1 = "4290fad27f13e89be7f33799c6bc5a0abfff0d19"; + }; + }; + "fresh-0.5.2" = { + name = "fresh"; + packageName = "fresh"; + version = "0.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz"; + sha1 = "3d8cadd90d976569fa835ab1f8e4b23a105605a7"; + }; + }; + "from2-2.3.0" = { + name = "from2"; + packageName = "from2"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz"; + sha1 = "8bfb5502bde4a4d36cfdeea007fcca21d7e382af"; + }; + }; + "fs-extra-7.0.1" = { + name = "fs-extra"; + packageName = "fs-extra"; + version = "7.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz"; + sha512 = "YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw=="; + }; + }; + "fs-minipass-2.1.0" = { + name = "fs-minipass"; + packageName = "fs-minipass"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz"; + sha512 = "V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg=="; + }; + }; + "fs-write-stream-atomic-1.0.10" = { + name = "fs-write-stream-atomic"; + packageName = "fs-write-stream-atomic"; + version = "1.0.10"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz"; + sha1 = "b47df53493ef911df75731e70a9ded0189db40c9"; + }; + }; + "fs.realpath-1.0.0" = { + name = "fs.realpath"; + packageName = "fs.realpath"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"; + sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; + }; + }; + "fsevents-1.2.12" = { + name = "fsevents"; + packageName = "fsevents"; + version = "1.2.12"; + src = fetchurl { + url = "https://registry.npmjs.org/fsevents/-/fsevents-1.2.12.tgz"; + sha512 = "Ggd/Ktt7E7I8pxZRbGIs7vwqAPscSESMrCSkx2FtWeqmheJgCo2R74fTsZFCifr0VTPwqRpPv17+6b8Zp7th0Q=="; + }; + }; + "fsevents-2.1.3" = { + name = "fsevents"; + packageName = "fsevents"; + version = "2.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz"; + sha512 = "Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ=="; + }; + }; + "fstream-1.0.12" = { + name = "fstream"; + packageName = "fstream"; + version = "1.0.12"; + src = fetchurl { + url = "https://registry.npmjs.org/fstream/-/fstream-1.0.12.tgz"; + sha512 = "WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg=="; + }; + }; + "function-bind-1.1.1" = { + name = "function-bind"; + packageName = "function-bind"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz"; + sha512 = "yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="; + }; + }; + "functional-red-black-tree-1.0.1" = { + name = "functional-red-black-tree"; + packageName = "functional-red-black-tree"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz"; + sha1 = "1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"; + }; + }; + "gauge-2.7.4" = { + name = "gauge"; + packageName = "gauge"; + version = "2.7.4"; + src = fetchurl { + url = "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz"; + sha1 = "2c03405c7538c39d7eb37b317022e325fb018bf7"; + }; + }; + "gaze-1.1.3" = { + name = "gaze"; + packageName = "gaze"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/gaze/-/gaze-1.1.3.tgz"; + sha512 = "BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g=="; + }; + }; + "gensync-1.0.0-beta.1" = { + name = "gensync"; + packageName = "gensync"; + version = "1.0.0-beta.1"; + src = fetchurl { + url = "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.1.tgz"; + sha512 = "r8EC6NO1sngH/zdD9fiRDLdcgnbayXah+mLgManTaIZJqEC1MZstmnox8KpnI2/fxQwrp5OpCOYWLp4rBl4Jcg=="; + }; + }; + "get-caller-file-2.0.5" = { + name = "get-caller-file"; + packageName = "get-caller-file"; + version = "2.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz"; + sha512 = "DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="; + }; + }; + "get-stdin-4.0.1" = { + name = "get-stdin"; + packageName = "get-stdin"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz"; + sha1 = "b968c6b0a04384324902e8bf1a5df32579a450fe"; + }; + }; + "get-stdin-6.0.0" = { + name = "get-stdin"; + packageName = "get-stdin"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/get-stdin/-/get-stdin-6.0.0.tgz"; + sha512 = "jp4tHawyV7+fkkSKyvjuLZswblUtz+SQKzSWnBbii16BuZksJlU1wuBYXY75r+duh/llF1ur6oNwi+2ZzjKZ7g=="; + }; + }; + "get-stream-3.0.0" = { + name = "get-stream"; + packageName = "get-stream"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz"; + sha1 = "8e943d1358dc37555054ecbe2edb05aa174ede14"; + }; + }; + "get-stream-4.1.0" = { + name = "get-stream"; + packageName = "get-stream"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz"; + sha512 = "GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w=="; + }; + }; + "get-stream-5.1.0" = { + name = "get-stream"; + packageName = "get-stream"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/get-stream/-/get-stream-5.1.0.tgz"; + sha512 = "EXr1FOzrzTfGeL0gQdeFEvOMm2mzMOglyiOXSTpPC+iAjAKftbr3jpCMWynogwYnM+eSj9sHGc6wjIcDvYiygw=="; + }; + }; + "get-value-2.0.6" = { + name = "get-value"; + packageName = "get-value"; + version = "2.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz"; + sha1 = "dc15ca1c672387ca76bd37ac0a395ba2042a2c28"; + }; + }; + "getpass-0.1.7" = { + name = "getpass"; + packageName = "getpass"; + version = "0.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz"; + sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa"; + }; + }; + "glob-7.1.6" = { + name = "glob"; + packageName = "glob"; + version = "7.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz"; + sha512 = "LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA=="; + }; + }; + "glob-parent-3.1.0" = { + name = "glob-parent"; + packageName = "glob-parent"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz"; + sha1 = "9e6af6299d8d3bd2bd40430832bd113df906c5ae"; + }; + }; + "glob-parent-5.1.0" = { + name = "glob-parent"; + packageName = "glob-parent"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.0.tgz"; + sha512 = "qjtRgnIVmOfnKUE3NJAQEdk+lKrxfw8t5ke7SXtfMTHcjsBfOfWXCQfdb30zfDoZQ2IRSIiidmjtbHZPZ++Ihw=="; + }; + }; + "glob-parent-5.1.1" = { + name = "glob-parent"; + packageName = "glob-parent"; + version = "5.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz"; + sha512 = "FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ=="; + }; + }; + "glob-to-regexp-0.3.0" = { + name = "glob-to-regexp"; + packageName = "glob-to-regexp"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz"; + sha1 = "8c5a1494d2066c570cc3bfe4496175acc4d502ab"; + }; + }; + "globals-11.12.0" = { + name = "globals"; + packageName = "globals"; + version = "11.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz"; + sha512 = "WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA=="; + }; + }; + "globals-12.3.0" = { + name = "globals"; + packageName = "globals"; + version = "12.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/globals/-/globals-12.3.0.tgz"; + sha512 = "wAfjdLgFsPZsklLJvOBUBmzYE8/CwhEqSBEMRXA3qxIiNtyqvjYurAtIfDh6chlEPUfmTY3MnZh5Hfh4q0UlIw=="; + }; + }; + "globby-6.1.0" = { + name = "globby"; + packageName = "globby"; + version = "6.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz"; + sha1 = "f5a6d70e8395e21c858fb0489d64df02424d506c"; + }; + }; + "globby-7.1.1" = { + name = "globby"; + packageName = "globby"; + version = "7.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/globby/-/globby-7.1.1.tgz"; + sha1 = "fb2ccff9401f8600945dfada97440cca972b8680"; + }; + }; + "globby-9.2.0" = { + name = "globby"; + packageName = "globby"; + version = "9.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/globby/-/globby-9.2.0.tgz"; + sha512 = "ollPHROa5mcxDEkwg6bPt3QbEf4pDQSNtd6JPL1YvOvAo/7/0VAm9TccUeoTmarjPw4pfUthSCqcyfNB1I3ZSg=="; + }; + }; + "globule-1.3.2" = { + name = "globule"; + packageName = "globule"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/globule/-/globule-1.3.2.tgz"; + sha512 = "7IDTQTIu2xzXkT+6mlluidnWo+BypnbSoEVVQCGfzqnl5Ik8d3e1d4wycb8Rj9tWW+Z39uPWsdlquqiqPCd/pA=="; + }; + }; + "graceful-fs-4.2.3" = { + name = "graceful-fs"; + packageName = "graceful-fs"; + version = "4.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz"; + sha512 = "a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ=="; + }; + }; + "gzip-size-5.1.1" = { + name = "gzip-size"; + packageName = "gzip-size"; + version = "5.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/gzip-size/-/gzip-size-5.1.1.tgz"; + sha512 = "FNHi6mmoHvs1mxZAds4PpdCS6QG8B4C1krxJsMutgxl5t3+GlRTzzI3NEkifXx2pVsOvJdOGSmIgDhQ55FwdPA=="; + }; + }; + "hammerjs-2.0.8" = { + name = "hammerjs"; + packageName = "hammerjs"; + version = "2.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/hammerjs/-/hammerjs-2.0.8.tgz"; + sha1 = "04ef77862cff2bb79d30f7692095930222bf60f1"; + }; + }; + "handle-thing-2.0.1" = { + name = "handle-thing"; + packageName = "handle-thing"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.1.tgz"; + sha512 = "9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg=="; + }; + }; + "har-schema-2.0.0" = { + name = "har-schema"; + packageName = "har-schema"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz"; + sha1 = "a94c2224ebcac04782a0d9035521f24735b7ec92"; + }; + }; + "har-validator-5.1.3" = { + name = "har-validator"; + packageName = "har-validator"; + version = "5.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz"; + sha512 = "sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g=="; + }; + }; + "has-1.0.3" = { + name = "has"; + packageName = "has"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/has/-/has-1.0.3.tgz"; + sha512 = "f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw=="; + }; + }; + "has-ansi-2.0.0" = { + name = "has-ansi"; + packageName = "has-ansi"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz"; + sha1 = "34f5049ce1ecdf2b0649af3ef24e45ed35416d91"; + }; + }; + "has-flag-3.0.0" = { + name = "has-flag"; + packageName = "has-flag"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz"; + sha1 = "b5d454dc2199ae225699f3467e5a07f3b955bafd"; + }; + }; + "has-flag-4.0.0" = { + name = "has-flag"; + packageName = "has-flag"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz"; + sha512 = "EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="; + }; + }; + "has-symbols-1.0.1" = { + name = "has-symbols"; + packageName = "has-symbols"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz"; + sha512 = "PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg=="; + }; + }; + "has-unicode-2.0.1" = { + name = "has-unicode"; + packageName = "has-unicode"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz"; + sha1 = "e0e6fe6a28cf51138855e086d1691e771de2a8b9"; + }; + }; + "has-value-0.3.1" = { + name = "has-value"; + packageName = "has-value"; + version = "0.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz"; + sha1 = "7b1f58bada62ca827ec0a2078025654845995e1f"; + }; + }; + "has-value-1.0.0" = { + name = "has-value"; + packageName = "has-value"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz"; + sha1 = "18b281da585b1c5c51def24c930ed29a0be6b177"; + }; + }; + "has-values-0.1.4" = { + name = "has-values"; + packageName = "has-values"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz"; + sha1 = "6d61de95d91dfca9b9a02089ad384bff8f62b771"; + }; + }; + "has-values-1.0.0" = { + name = "has-values"; + packageName = "has-values"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz"; + sha1 = "95b0b63fec2146619a6fe57fe75628d5a39efe4f"; + }; + }; + "hash-base-3.0.4" = { + name = "hash-base"; + packageName = "hash-base"; + version = "3.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz"; + sha1 = "5fc8686847ecd73499403319a6b0a3f3f6ae4918"; + }; + }; + "hash-sum-1.0.2" = { + name = "hash-sum"; + packageName = "hash-sum"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/hash-sum/-/hash-sum-1.0.2.tgz"; + sha1 = "33b40777754c6432573c120cc3808bbd10d47f04"; + }; + }; + "hash-sum-2.0.0" = { + name = "hash-sum"; + packageName = "hash-sum"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/hash-sum/-/hash-sum-2.0.0.tgz"; + sha512 = "WdZTbAByD+pHfl/g9QSsBIIwy8IT+EsPiKDs0KNX+zSHhdDLFKdZu0BQHljvO+0QI/BasbMSUa8wYNCZTvhslg=="; + }; + }; + "hash.js-1.1.7" = { + name = "hash.js"; + packageName = "hash.js"; + version = "1.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz"; + sha512 = "taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA=="; + }; + }; + "he-1.2.0" = { + name = "he"; + packageName = "he"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/he/-/he-1.2.0.tgz"; + sha512 = "F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw=="; + }; + }; + "hex-color-regex-1.1.0" = { + name = "hex-color-regex"; + packageName = "hex-color-regex"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/hex-color-regex/-/hex-color-regex-1.1.0.tgz"; + sha512 = "l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ=="; + }; + }; + "highlight.js-9.18.1" = { + name = "highlight.js"; + packageName = "highlight.js"; + version = "9.18.1"; + src = fetchurl { + url = "https://registry.npmjs.org/highlight.js/-/highlight.js-9.18.1.tgz"; + sha512 = "OrVKYz70LHsnCgmbXctv/bfuvntIKDz177h0Co37DQ5jamGZLVmoCVMtjMtNZY3X9DrCcKfklHPNeA0uPZhSJg=="; + }; + }; + "hmac-drbg-1.0.1" = { + name = "hmac-drbg"; + packageName = "hmac-drbg"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz"; + sha1 = "d2745701025a6c775a6c545793ed502fc0c649a1"; + }; + }; + "hoopy-0.1.4" = { + name = "hoopy"; + packageName = "hoopy"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/hoopy/-/hoopy-0.1.4.tgz"; + sha512 = "HRcs+2mr52W0K+x8RzcLzuPPmVIKMSv97RGHy0Ea9y/mpcaK+xTrjICA04KAHi4GRzxliNqNJEFYWHghy3rSfQ=="; + }; + }; + "hosted-git-info-2.8.5" = { + name = "hosted-git-info"; + packageName = "hosted-git-info"; + version = "2.8.5"; + src = fetchurl { + url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.5.tgz"; + sha512 = "kssjab8CvdXfcXMXVcvsXum4Hwdq9XGtRD3TteMEvEbq0LXyiNQr6AprqKqfeaDXze7SxWvRxdpwE6ku7ikLkg=="; + }; + }; + "hpack.js-2.1.6" = { + name = "hpack.js"; + packageName = "hpack.js"; + version = "2.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz"; + sha1 = "87774c0949e513f42e84575b3c45681fade2a0b2"; + }; + }; + "hsl-regex-1.0.0" = { + name = "hsl-regex"; + packageName = "hsl-regex"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/hsl-regex/-/hsl-regex-1.0.0.tgz"; + sha1 = "d49330c789ed819e276a4c0d272dffa30b18fe6e"; + }; + }; + "hsla-regex-1.0.0" = { + name = "hsla-regex"; + packageName = "hsla-regex"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/hsla-regex/-/hsla-regex-1.0.0.tgz"; + sha1 = "c1ce7a3168c8c6614033a4b5f7877f3b225f9c38"; + }; + }; + "html-comment-regex-1.1.2" = { + name = "html-comment-regex"; + packageName = "html-comment-regex"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/html-comment-regex/-/html-comment-regex-1.1.2.tgz"; + sha512 = "P+M65QY2JQ5Y0G9KKdlDpo0zK+/OHptU5AaBwUfAIDJZk1MYf32Frm84EcOytfJE0t5JvkAnKlmjsXDnWzCJmQ=="; + }; + }; + "html-entities-1.3.1" = { + name = "html-entities"; + packageName = "html-entities"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/html-entities/-/html-entities-1.3.1.tgz"; + sha512 = "rhE/4Z3hIhzHAUKbW8jVcCyuT5oJCXXqhN/6mXXVCpzTmvJnoH2HL/bt3EZ6p55jbFJBeAe1ZNpL5BugLujxNA=="; + }; + }; + "html-minifier-3.5.21" = { + name = "html-minifier"; + packageName = "html-minifier"; + version = "3.5.21"; + src = fetchurl { + url = "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.21.tgz"; + sha512 = "LKUKwuJDhxNa3uf/LPR/KVjm/l3rBqtYeCOAekvG8F1vItxMUpueGd94i/asDDr8/1u7InxzFA5EeGjhhG5mMA=="; + }; + }; + "html-tags-2.0.0" = { + name = "html-tags"; + packageName = "html-tags"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/html-tags/-/html-tags-2.0.0.tgz"; + sha1 = "10b30a386085f43cede353cc8fa7cb0deeea668b"; + }; + }; + "html-webpack-plugin-3.2.0" = { + name = "html-webpack-plugin"; + packageName = "html-webpack-plugin"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-3.2.0.tgz"; + sha1 = "b01abbd723acaaa7b37b6af4492ebda03d9dd37b"; + }; + }; + "htmlparser2-3.10.1" = { + name = "htmlparser2"; + packageName = "htmlparser2"; + version = "3.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.10.1.tgz"; + sha512 = "IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ=="; + }; + }; + "http-deceiver-1.2.7" = { + name = "http-deceiver"; + packageName = "http-deceiver"; + version = "1.2.7"; + src = fetchurl { + url = "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz"; + sha1 = "fa7168944ab9a519d337cb0bec7284dc3e723d87"; + }; + }; + "http-errors-1.6.3" = { + name = "http-errors"; + packageName = "http-errors"; + version = "1.6.3"; + src = fetchurl { + url = "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz"; + sha1 = "8b55680bb4be283a0b5bf4ea2e38580be1d9320d"; + }; + }; + "http-errors-1.7.2" = { + name = "http-errors"; + packageName = "http-errors"; + version = "1.7.2"; + src = fetchurl { + url = "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz"; + sha512 = "uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg=="; + }; + }; + "http-proxy-1.18.1" = { + name = "http-proxy"; + packageName = "http-proxy"; + version = "1.18.1"; + src = fetchurl { + url = "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz"; + sha512 = "7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ=="; + }; + }; + "http-proxy-middleware-0.19.1" = { + name = "http-proxy-middleware"; + packageName = "http-proxy-middleware"; + version = "0.19.1"; + src = fetchurl { + url = "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.19.1.tgz"; + sha512 = "yHYTgWMQO8VvwNS22eLLloAkvungsKdKTLO8AJlftYIKNfJr3GK3zK0ZCfzDDGUBttdGc8xFy1mCitvNKQtC3Q=="; + }; + }; + "http-signature-1.2.0" = { + name = "http-signature"; + packageName = "http-signature"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz"; + sha1 = "9aecd925114772f3d95b65a60abb8f7c18fbace1"; + }; + }; + "https-browserify-1.0.0" = { + name = "https-browserify"; + packageName = "https-browserify"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz"; + sha1 = "ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"; + }; + }; + "human-signals-1.1.1" = { + name = "human-signals"; + packageName = "human-signals"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/human-signals/-/human-signals-1.1.1.tgz"; + sha512 = "SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw=="; + }; + }; + "iconv-lite-0.4.24" = { + name = "iconv-lite"; + packageName = "iconv-lite"; + version = "0.4.24"; + src = fetchurl { + url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz"; + sha512 = "v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA=="; + }; + }; + "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=="; + }; + }; + "ieee754-1.1.13" = { + name = "ieee754"; + packageName = "ieee754"; + version = "1.1.13"; + src = fetchurl { + url = "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz"; + sha512 = "4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg=="; + }; + }; + "iferr-0.1.5" = { + name = "iferr"; + packageName = "iferr"; + version = "0.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/iferr/-/iferr-0.1.5.tgz"; + sha1 = "c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501"; + }; + }; + "ignore-3.3.10" = { + name = "ignore"; + packageName = "ignore"; + version = "3.3.10"; + src = fetchurl { + url = "https://registry.npmjs.org/ignore/-/ignore-3.3.10.tgz"; + sha512 = "Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug=="; + }; + }; + "ignore-4.0.6" = { + name = "ignore"; + packageName = "ignore"; + version = "4.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz"; + sha512 = "cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg=="; + }; + }; + "import-cwd-2.1.0" = { + name = "import-cwd"; + packageName = "import-cwd"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/import-cwd/-/import-cwd-2.1.0.tgz"; + sha1 = "aa6cf36e722761285cb371ec6519f53e2435b0a9"; + }; + }; + "import-fresh-2.0.0" = { + name = "import-fresh"; + packageName = "import-fresh"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/import-fresh/-/import-fresh-2.0.0.tgz"; + sha1 = "d81355c15612d386c61f9ddd3922d4304822a546"; + }; + }; + "import-fresh-3.2.1" = { + name = "import-fresh"; + packageName = "import-fresh"; + version = "3.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/import-fresh/-/import-fresh-3.2.1.tgz"; + sha512 = "6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ=="; + }; + }; + "import-from-2.1.0" = { + name = "import-from"; + packageName = "import-from"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/import-from/-/import-from-2.1.0.tgz"; + sha1 = "335db7f2a7affd53aaa471d4b8021dee36b7f3b1"; + }; + }; + "import-local-2.0.0" = { + name = "import-local"; + packageName = "import-local"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/import-local/-/import-local-2.0.0.tgz"; + sha512 = "b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ=="; + }; + }; + "imurmurhash-0.1.4" = { + name = "imurmurhash"; + packageName = "imurmurhash"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz"; + sha1 = "9218b9b2b928a238b13dc4fb6b6d576f231453ea"; + }; + }; + "in-publish-2.0.1" = { + name = "in-publish"; + packageName = "in-publish"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/in-publish/-/in-publish-2.0.1.tgz"; + sha512 = "oDM0kUSNFC31ShNxHKUyfZKy8ZeXZBWMjMdZHKLOk13uvT27VTL/QzRGfRUcevJhpkZAvlhPYuXkF7eNWrtyxQ=="; + }; + }; + "indent-string-2.1.0" = { + name = "indent-string"; + packageName = "indent-string"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz"; + sha1 = "8e2d48348742121b4a8218b7a137e9a52049dc80"; + }; + }; + "indent-string-4.0.0" = { + name = "indent-string"; + packageName = "indent-string"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz"; + sha512 = "EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg=="; + }; + }; + "indexes-of-1.0.1" = { + name = "indexes-of"; + packageName = "indexes-of"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/indexes-of/-/indexes-of-1.0.1.tgz"; + sha1 = "f30f716c8e2bd346c7b67d3df3915566a7c05607"; + }; + }; + "infer-owner-1.0.4" = { + name = "infer-owner"; + packageName = "infer-owner"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz"; + sha512 = "IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A=="; + }; + }; + "inflight-1.0.6" = { + name = "inflight"; + packageName = "inflight"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz"; + sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9"; + }; + }; + "inherits-2.0.1" = { + name = "inherits"; + packageName = "inherits"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"; + sha1 = "b17d08d326b4423e568eff719f91b0b1cbdf69f1"; + }; + }; + "inherits-2.0.3" = { + name = "inherits"; + packageName = "inherits"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz"; + sha1 = "633c2c83e3da42a502f52466022480f4208261de"; + }; + }; + "inherits-2.0.4" = { + name = "inherits"; + packageName = "inherits"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz"; + sha512 = "k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="; + }; + }; + "inquirer-7.0.1" = { + name = "inquirer"; + packageName = "inquirer"; + version = "7.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/inquirer/-/inquirer-7.0.1.tgz"; + sha512 = "V1FFQ3TIO15det8PijPLFR9M9baSlnRs9nL7zWu1MNVA2T9YVl9ZbrHJhYs7e9X8jeMZ3lr2JH/rdHFgNCBdYw=="; + }; + }; + "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=="; + }; + }; + "internal-ip-4.3.0" = { + name = "internal-ip"; + packageName = "internal-ip"; + version = "4.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/internal-ip/-/internal-ip-4.3.0.tgz"; + sha512 = "S1zBo1D6zcsyuC6PMmY5+55YMILQ9av8lotMx447Bq6SAgo/sDK6y6uUKmuYhW7eacnIhFfsPmCNYdDzsnnDCg=="; + }; + }; + "invariant-2.2.4" = { + name = "invariant"; + packageName = "invariant"; + version = "2.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz"; + sha512 = "phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA=="; + }; + }; + "ip-1.1.5" = { + name = "ip"; + packageName = "ip"; + version = "1.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz"; + sha1 = "bdded70114290828c0a039e72ef25f5aaec4354a"; + }; + }; + "ip-regex-2.1.0" = { + name = "ip-regex"; + packageName = "ip-regex"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ip-regex/-/ip-regex-2.1.0.tgz"; + sha1 = "fa78bf5d2e6913c911ce9f819ee5146bb6d844e9"; + }; + }; + "ipaddr.js-1.9.1" = { + name = "ipaddr.js"; + packageName = "ipaddr.js"; + version = "1.9.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz"; + sha512 = "0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g=="; + }; + }; + "is-absolute-url-2.1.0" = { + name = "is-absolute-url"; + packageName = "is-absolute-url"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-2.1.0.tgz"; + sha1 = "50530dfb84fcc9aa7dbe7852e83a37b93b9f2aa6"; + }; + }; + "is-absolute-url-3.0.3" = { + name = "is-absolute-url"; + packageName = "is-absolute-url"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-3.0.3.tgz"; + sha512 = "opmNIX7uFnS96NtPmhWQgQx6/NYFgsUXYMllcfzwWKUMwfo8kku1TvE6hkNcH+Q1ts5cMVrsY7j0bxXQDciu9Q=="; + }; + }; + "is-accessor-descriptor-0.1.6" = { + name = "is-accessor-descriptor"; + packageName = "is-accessor-descriptor"; + version = "0.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz"; + sha1 = "a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"; + }; + }; + "is-accessor-descriptor-1.0.0" = { + name = "is-accessor-descriptor"; + packageName = "is-accessor-descriptor"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz"; + sha512 = "m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ=="; + }; + }; + "is-arguments-1.0.4" = { + name = "is-arguments"; + packageName = "is-arguments"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/is-arguments/-/is-arguments-1.0.4.tgz"; + sha512 = "xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA=="; + }; + }; + "is-arrayish-0.2.1" = { + name = "is-arrayish"; + packageName = "is-arrayish"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz"; + sha1 = "77c99840527aa8ecb1a8ba697b80645a7a926a9d"; + }; + }; + "is-arrayish-0.3.2" = { + name = "is-arrayish"; + packageName = "is-arrayish"; + version = "0.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz"; + sha512 = "eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ=="; + }; + }; + "is-binary-path-1.0.1" = { + name = "is-binary-path"; + packageName = "is-binary-path"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz"; + sha1 = "75f16642b480f187a711c814161fd3a4a7655898"; + }; + }; + "is-binary-path-2.1.0" = { + name = "is-binary-path"; + packageName = "is-binary-path"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz"; + sha512 = "ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw=="; + }; + }; + "is-buffer-1.1.6" = { + name = "is-buffer"; + packageName = "is-buffer"; + version = "1.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz"; + sha512 = "NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="; + }; + }; + "is-callable-1.1.5" = { + name = "is-callable"; + packageName = "is-callable"; + version = "1.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/is-callable/-/is-callable-1.1.5.tgz"; + sha512 = "ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q=="; + }; + }; + "is-callable-1.2.0" = { + name = "is-callable"; + packageName = "is-callable"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-callable/-/is-callable-1.2.0.tgz"; + sha512 = "pyVD9AaGLxtg6srb2Ng6ynWJqkHU9bEM087AKck0w8QwDarTfNcpIYoU8x8Hv2Icm8u6kFJM18Dag8lyqGkviw=="; + }; + }; + "is-ci-1.2.1" = { + name = "is-ci"; + packageName = "is-ci"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-ci/-/is-ci-1.2.1.tgz"; + sha512 = "s6tfsaQaQi3JNciBH6shVqEDvhGut0SUXr31ag8Pd8BBbVVlcGfWhpPmEOoM6RJ5TFhbypvf5yyRw/VXW1IiWg=="; + }; + }; + "is-color-stop-1.1.0" = { + name = "is-color-stop"; + packageName = "is-color-stop"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-color-stop/-/is-color-stop-1.1.0.tgz"; + sha1 = "cfff471aee4dd5c9e158598fbe12967b5cdad345"; + }; + }; + "is-data-descriptor-0.1.4" = { + name = "is-data-descriptor"; + packageName = "is-data-descriptor"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz"; + sha1 = "0b5ee648388e2c860282e793f1856fec3f301b56"; + }; + }; + "is-data-descriptor-1.0.0" = { + name = "is-data-descriptor"; + packageName = "is-data-descriptor"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz"; + sha512 = "jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ=="; + }; + }; + "is-date-object-1.0.2" = { + name = "is-date-object"; + packageName = "is-date-object"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz"; + sha512 = "USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g=="; + }; + }; + "is-descriptor-0.1.6" = { + name = "is-descriptor"; + packageName = "is-descriptor"; + version = "0.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz"; + sha512 = "avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg=="; + }; + }; + "is-descriptor-1.0.2" = { + name = "is-descriptor"; + packageName = "is-descriptor"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz"; + sha512 = "2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg=="; + }; + }; + "is-directory-0.3.1" = { + name = "is-directory"; + packageName = "is-directory"; + version = "0.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-directory/-/is-directory-0.3.1.tgz"; + sha1 = "61339b6f2475fc772fd9c9d83f5c8575dc154ae1"; + }; + }; + "is-docker-2.0.0" = { + name = "is-docker"; + packageName = "is-docker"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-docker/-/is-docker-2.0.0.tgz"; + sha512 = "pJEdRugimx4fBMra5z2/5iRdZ63OhYV0vr0Dwm5+xtW4D1FvRkB8hamMIhnWfyJeDdyr/aa7BDyNbtG38VxgoQ=="; + }; + }; + "is-extendable-0.1.1" = { + name = "is-extendable"; + packageName = "is-extendable"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz"; + sha1 = "62b110e289a471418e3ec36a617d472e301dfc89"; + }; + }; + "is-extendable-1.0.1" = { + name = "is-extendable"; + packageName = "is-extendable"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz"; + sha512 = "arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA=="; + }; + }; + "is-extglob-2.1.1" = { + name = "is-extglob"; + packageName = "is-extglob"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz"; + sha1 = "a88c02535791f02ed37c76a1b9ea9773c833f8c2"; + }; + }; + "is-finite-1.1.0" = { + name = "is-finite"; + packageName = "is-finite"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-finite/-/is-finite-1.1.0.tgz"; + sha512 = "cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w=="; + }; + }; + "is-fullwidth-code-point-1.0.0" = { + name = "is-fullwidth-code-point"; + packageName = "is-fullwidth-code-point"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz"; + sha1 = "ef9e31386f031a7f0d643af82fde50c457ef00cb"; + }; + }; + "is-fullwidth-code-point-2.0.0" = { + name = "is-fullwidth-code-point"; + packageName = "is-fullwidth-code-point"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz"; + sha1 = "a3b30a5c4f199183167aaab93beefae3ddfb654f"; + }; + }; + "is-fullwidth-code-point-3.0.0" = { + name = "is-fullwidth-code-point"; + packageName = "is-fullwidth-code-point"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz"; + sha512 = "zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="; + }; + }; + "is-glob-3.1.0" = { + name = "is-glob"; + packageName = "is-glob"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz"; + sha1 = "7ba5ae24217804ac70707b96922567486cc3e84a"; + }; + }; + "is-glob-4.0.1" = { + name = "is-glob"; + packageName = "is-glob"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz"; + sha512 = "5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg=="; + }; + }; + "is-number-3.0.0" = { + name = "is-number"; + packageName = "is-number"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz"; + sha1 = "24fd6201a4782cf50561c810276afc7d12d71195"; + }; + }; + "is-number-7.0.0" = { + name = "is-number"; + packageName = "is-number"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz"; + sha512 = "41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng=="; + }; + }; + "is-obj-2.0.0" = { + name = "is-obj"; + packageName = "is-obj"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz"; + sha512 = "drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w=="; + }; + }; + "is-path-cwd-2.2.0" = { + name = "is-path-cwd"; + packageName = "is-path-cwd"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz"; + sha512 = "w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ=="; + }; + }; + "is-path-in-cwd-2.1.0" = { + name = "is-path-in-cwd"; + packageName = "is-path-in-cwd"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-2.1.0.tgz"; + sha512 = "rNocXHgipO+rvnP6dk3zI20RpOtrAM/kzbB258Uw5BWr3TpXi861yzjo16Dn4hUox07iw5AyeMLHWsujkjzvRQ=="; + }; + }; + "is-path-inside-2.1.0" = { + name = "is-path-inside"; + packageName = "is-path-inside"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-path-inside/-/is-path-inside-2.1.0.tgz"; + sha512 = "wiyhTzfDWsvwAW53OBWF5zuvaOGlZ6PwYxAbPVDhpm+gM09xKQGjBq/8uYN12aDvMxnAnq3dxTyoSoRNmg5YFg=="; + }; + }; + "is-plain-obj-1.1.0" = { + name = "is-plain-obj"; + packageName = "is-plain-obj"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz"; + sha1 = "71a50c8429dfca773c92a390a4a03b39fcd51d3e"; + }; + }; + "is-plain-object-2.0.4" = { + name = "is-plain-object"; + packageName = "is-plain-object"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz"; + sha512 = "h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og=="; + }; + }; + "is-promise-2.1.0" = { + name = "is-promise"; + packageName = "is-promise"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz"; + sha1 = "79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"; + }; + }; + "is-regex-1.0.5" = { + name = "is-regex"; + packageName = "is-regex"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/is-regex/-/is-regex-1.0.5.tgz"; + sha512 = "vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ=="; + }; + }; + "is-regex-1.1.0" = { + name = "is-regex"; + packageName = "is-regex"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-regex/-/is-regex-1.1.0.tgz"; + sha512 = "iI97M8KTWID2la5uYXlkbSDQIg4F6o1sYboZKKTDpnDQMLtUL86zxhgDet3Q2SriaYsyGqZ6Mn2SjbRKeLHdqw=="; + }; + }; + "is-resolvable-1.1.0" = { + name = "is-resolvable"; + packageName = "is-resolvable"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.1.0.tgz"; + sha512 = "qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg=="; + }; + }; + "is-stream-1.1.0" = { + name = "is-stream"; + packageName = "is-stream"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz"; + sha1 = "12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"; + }; + }; + "is-stream-2.0.0" = { + name = "is-stream"; + packageName = "is-stream"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz"; + sha512 = "XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw=="; + }; + }; + "is-svg-3.0.0" = { + name = "is-svg"; + packageName = "is-svg"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-svg/-/is-svg-3.0.0.tgz"; + sha512 = "gi4iHK53LR2ujhLVVj+37Ykh9GLqYHX6JOVXbLAucaG/Cqw9xwdFOjDM2qeifLs1sF1npXXFvDu0r5HNgCMrzQ=="; + }; + }; + "is-symbol-1.0.3" = { + name = "is-symbol"; + packageName = "is-symbol"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz"; + sha512 = "OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ=="; + }; + }; + "is-typedarray-1.0.0" = { + name = "is-typedarray"; + packageName = "is-typedarray"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz"; + sha1 = "e479c80858df0c1b11ddda6940f96011fcda4a9a"; + }; + }; + "is-utf8-0.2.1" = { + name = "is-utf8"; + packageName = "is-utf8"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz"; + sha1 = "4b0da1442104d1b336340e80797e865cf39f7d72"; + }; + }; + "is-valid-glob-1.0.0" = { + name = "is-valid-glob"; + packageName = "is-valid-glob"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-valid-glob/-/is-valid-glob-1.0.0.tgz"; + sha1 = "29bf3eff701be2d4d315dbacc39bc39fe8f601aa"; + }; + }; + "is-windows-1.0.2" = { + name = "is-windows"; + packageName = "is-windows"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz"; + sha512 = "eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA=="; + }; + }; + "is-wsl-1.1.0" = { + name = "is-wsl"; + packageName = "is-wsl"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz"; + sha1 = "1f16e4aa22b04d1336b66188a66af3c600c3a66d"; + }; + }; + "is-wsl-2.2.0" = { + name = "is-wsl"; + packageName = "is-wsl"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz"; + sha512 = "fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww=="; + }; + }; + "isarray-1.0.0" = { + name = "isarray"; + packageName = "isarray"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"; + sha1 = "bb935d48582cba168c06834957a54a3e07124f11"; + }; + }; + "isexe-2.0.0" = { + name = "isexe"; + packageName = "isexe"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz"; + sha1 = "e8fbf374dc556ff8947a10dcb0572d633f2cfa10"; + }; + }; + "isobject-2.1.0" = { + name = "isobject"; + packageName = "isobject"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz"; + sha1 = "f065561096a3f1da2ef46272f815c840d87e0c89"; + }; + }; + "isobject-3.0.1" = { + name = "isobject"; + packageName = "isobject"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz"; + sha1 = "4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"; + }; + }; + "isstream-0.1.2" = { + name = "isstream"; + packageName = "isstream"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz"; + sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a"; + }; + }; + "javascript-stringify-2.0.1" = { + name = "javascript-stringify"; + packageName = "javascript-stringify"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/javascript-stringify/-/javascript-stringify-2.0.1.tgz"; + sha512 = "yV+gqbd5vaOYjqlbk16EG89xB5udgjqQF3C5FAORDg4f/IS1Yc5ERCv5e/57yBcfJYw05V5JyIXabhwb75Xxow=="; + }; + }; + "jest-worker-25.5.0" = { + name = "jest-worker"; + packageName = "jest-worker"; + version = "25.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jest-worker/-/jest-worker-25.5.0.tgz"; + sha512 = "/dsSmUkIy5EBGfv/IjjqmFxrNAUpBERfGs1oHROyD7yxjG/w+t0GOJDX8O1k32ySmd7+a5IhnJU2qQFcJ4n1vw=="; + }; + }; + "js-base64-2.6.2" = { + name = "js-base64"; + packageName = "js-base64"; + version = "2.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/js-base64/-/js-base64-2.6.2.tgz"; + sha512 = "1hgLrLIrmCgZG+ID3VoLNLOSwjGnoZa8tyrUdEteMeIzsT6PH7PMLyUvbDwzNE56P3PNxyvuIOx4Uh2E5rzQIw=="; + }; + }; + "js-message-1.0.5" = { + name = "js-message"; + packageName = "js-message"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/js-message/-/js-message-1.0.5.tgz"; + sha1 = "2300d24b1af08e89dd095bc1a4c9c9cfcb892d15"; + }; + }; + "js-queue-2.0.0" = { + name = "js-queue"; + packageName = "js-queue"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/js-queue/-/js-queue-2.0.0.tgz"; + sha1 = "362213cf860f468f0125fc6c96abc1742531f948"; + }; + }; + "js-tokens-3.0.2" = { + name = "js-tokens"; + packageName = "js-tokens"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz"; + sha1 = "9866df395102130e38f7f996bceb65443209c25b"; + }; + }; + "js-tokens-4.0.0" = { + name = "js-tokens"; + packageName = "js-tokens"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz"; + 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=="; + }; + }; + "jsbn-0.1.1" = { + name = "jsbn"; + packageName = "jsbn"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz"; + sha1 = "a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"; + }; + }; + "jsesc-0.5.0" = { + name = "jsesc"; + packageName = "jsesc"; + version = "0.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz"; + sha1 = "e7dee66e35d6fc16f710fe91d5cf69f70f08911d"; + }; + }; + "jsesc-2.5.2" = { + name = "jsesc"; + packageName = "jsesc"; + version = "2.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz"; + sha512 = "OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA=="; + }; + }; + "json-parse-better-errors-1.0.2" = { + name = "json-parse-better-errors"; + packageName = "json-parse-better-errors"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz"; + sha512 = "mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw=="; + }; + }; + "json-schema-0.2.3" = { + name = "json-schema"; + packageName = "json-schema"; + version = "0.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz"; + sha1 = "b480c892e59a2f05954ce727bd3f2a4e882f9e13"; + }; + }; + "json-schema-traverse-0.4.1" = { + name = "json-schema-traverse"; + packageName = "json-schema-traverse"; + version = "0.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz"; + sha512 = "xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="; + }; + }; + "json-stable-stringify-without-jsonify-1.0.1" = { + name = "json-stable-stringify-without-jsonify"; + packageName = "json-stable-stringify-without-jsonify"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz"; + sha1 = "9db7b59496ad3f3cfef30a75142d2d930ad72651"; + }; + }; + "json-stringify-safe-5.0.1" = { + name = "json-stringify-safe"; + packageName = "json-stringify-safe"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"; + sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"; + }; + }; + "json3-3.3.3" = { + name = "json3"; + packageName = "json3"; + version = "3.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/json3/-/json3-3.3.3.tgz"; + sha512 = "c7/8mbUsKigAbLkD5B010BK4D9LZm7A1pNItkEwiUZRpIN66exu/e7YQWysGun+TRKaJp8MhemM+VkfWv42aCA=="; + }; + }; + "json5-0.5.1" = { + name = "json5"; + packageName = "json5"; + version = "0.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz"; + sha1 = "1eade7acc012034ad84e2396767ead9fa5495821"; + }; + }; + "json5-1.0.1" = { + name = "json5"; + packageName = "json5"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz"; + sha512 = "aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow=="; + }; + }; + "json5-2.1.3" = { + name = "json5"; + packageName = "json5"; + version = "2.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/json5/-/json5-2.1.3.tgz"; + sha512 = "KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA=="; + }; + }; + "jsonfile-4.0.0" = { + name = "jsonfile"; + packageName = "jsonfile"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz"; + sha1 = "8771aae0799b64076b76640fca058f9c10e33ecb"; + }; + }; + "jsprim-1.4.1" = { + name = "jsprim"; + packageName = "jsprim"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz"; + sha1 = "313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"; + }; + }; + "killable-1.0.1" = { + name = "killable"; + packageName = "killable"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/killable/-/killable-1.0.1.tgz"; + sha512 = "LzqtLKlUwirEUyl/nicirVmNiPvYs7l5n8wOPP7fyJVpUPkvCnW/vuiXGpylGUlnPDnB7311rARzAt3Mhswpjg=="; + }; + }; + "kind-of-3.2.2" = { + name = "kind-of"; + packageName = "kind-of"; + version = "3.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz"; + sha1 = "31ea21a734bab9bbb0f32466d893aea51e4a3c64"; + }; + }; + "kind-of-4.0.0" = { + name = "kind-of"; + packageName = "kind-of"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz"; + sha1 = "20813df3d712928b207378691a45066fae72dd57"; + }; + }; + "kind-of-5.1.0" = { + name = "kind-of"; + packageName = "kind-of"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz"; + sha512 = "NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw=="; + }; + }; + "kind-of-6.0.3" = { + name = "kind-of"; + packageName = "kind-of"; + version = "6.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz"; + sha512 = "dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw=="; + }; + }; + "launch-editor-2.2.1" = { + name = "launch-editor"; + packageName = "launch-editor"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/launch-editor/-/launch-editor-2.2.1.tgz"; + sha512 = "On+V7K2uZK6wK7x691ycSUbLD/FyKKelArkbaAMSSJU8JmqmhwN2+mnJDNINuJWSrh2L0kDk+ZQtbC/gOWUwLw=="; + }; + }; + "launch-editor-middleware-2.2.1" = { + name = "launch-editor-middleware"; + packageName = "launch-editor-middleware"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/launch-editor-middleware/-/launch-editor-middleware-2.2.1.tgz"; + sha512 = "s0UO2/gEGiCgei3/2UN3SMuUj1phjQN8lcpnvgLSz26fAzNWPQ6Nf/kF5IFClnfU2ehp6LrmKdMU/beveO+2jg=="; + }; + }; + "leven-3.1.0" = { + name = "leven"; + packageName = "leven"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz"; + sha512 = "qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A=="; + }; + }; + "levenary-1.1.1" = { + name = "levenary"; + packageName = "levenary"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/levenary/-/levenary-1.1.1.tgz"; + sha512 = "mkAdOIt79FD6irqjYSs4rdbnlT5vRonMEvBVPVb3XmevfS8kgRXwfes0dhPdEtzTWD/1eNE/Bm/G1iRt6DcnQQ=="; + }; + }; + "levn-0.3.0" = { + name = "levn"; + packageName = "levn"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz"; + sha1 = "3b09924edf9f083c0490fdd4c0bc4421e04764ee"; + }; + }; + "lines-and-columns-1.1.6" = { + name = "lines-and-columns"; + packageName = "lines-and-columns"; + version = "1.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz"; + sha1 = "1c00c743b433cd0a4e80758f7b64a57440d9ff00"; + }; + }; + "load-json-file-1.1.0" = { + name = "load-json-file"; + packageName = "load-json-file"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz"; + sha1 = "956905708d58b4bab4c2261b04f59f31c99374c0"; + }; + }; + "loader-fs-cache-1.0.3" = { + name = "loader-fs-cache"; + packageName = "loader-fs-cache"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/loader-fs-cache/-/loader-fs-cache-1.0.3.tgz"; + sha512 = "ldcgZpjNJj71n+2Mf6yetz+c9bM4xpKtNds4LbqXzU/PTdeAX0g3ytnU1AJMEcTk2Lex4Smpe3Q/eCTsvUBxbA=="; + }; + }; + "loader-runner-2.4.0" = { + name = "loader-runner"; + packageName = "loader-runner"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/loader-runner/-/loader-runner-2.4.0.tgz"; + sha512 = "Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw=="; + }; + }; + "loader-utils-0.2.17" = { + name = "loader-utils"; + packageName = "loader-utils"; + version = "0.2.17"; + src = fetchurl { + url = "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.17.tgz"; + sha1 = "f86e6374d43205a6e6c60e9196f17c0299bfb348"; + }; + }; + "loader-utils-1.2.3" = { + name = "loader-utils"; + packageName = "loader-utils"; + version = "1.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/loader-utils/-/loader-utils-1.2.3.tgz"; + sha512 = "fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA=="; + }; + }; + "loader-utils-1.4.0" = { + name = "loader-utils"; + packageName = "loader-utils"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz"; + sha512 = "qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA=="; + }; + }; + "locate-path-2.0.0" = { + name = "locate-path"; + packageName = "locate-path"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz"; + sha1 = "2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"; + }; + }; + "locate-path-3.0.0" = { + name = "locate-path"; + packageName = "locate-path"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz"; + sha512 = "7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A=="; + }; + }; + "locate-path-5.0.0" = { + name = "locate-path"; + packageName = "locate-path"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz"; + sha512 = "t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g=="; + }; + }; + "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.defaultsdeep-4.6.1" = { + name = "lodash.defaultsdeep"; + packageName = "lodash.defaultsdeep"; + version = "4.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.defaultsdeep/-/lodash.defaultsdeep-4.6.1.tgz"; + sha512 = "3j8wdDzYuWO3lM3Reg03MuQR957t287Rpcxp1njpEa8oDrikb+FwGdW3n+FELh/A6qib6yPit0j/pv9G/yeAqA=="; + }; + }; + "lodash.kebabcase-4.1.1" = { + name = "lodash.kebabcase"; + packageName = "lodash.kebabcase"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.kebabcase/-/lodash.kebabcase-4.1.1.tgz"; + sha1 = "8489b1cb0d29ff88195cceca448ff6d6cc295c36"; + }; + }; + "lodash.mapvalues-4.6.0" = { + name = "lodash.mapvalues"; + packageName = "lodash.mapvalues"; + version = "4.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.mapvalues/-/lodash.mapvalues-4.6.0.tgz"; + sha1 = "1bafa5005de9dd6f4f26668c30ca37230cc9689c"; + }; + }; + "lodash.memoize-4.1.2" = { + name = "lodash.memoize"; + packageName = "lodash.memoize"; + version = "4.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz"; + sha1 = "bcc6c49a42a2840ed997f323eada5ecd182e0bfe"; + }; + }; + "lodash.transform-4.6.0" = { + name = "lodash.transform"; + packageName = "lodash.transform"; + version = "4.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.transform/-/lodash.transform-4.6.0.tgz"; + sha1 = "12306422f63324aed8483d3f38332b5f670547a0"; + }; + }; + "lodash.uniq-4.5.0" = { + name = "lodash.uniq"; + packageName = "lodash.uniq"; + version = "4.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz"; + sha1 = "d0225373aeb652adc1bc82e4945339a842754773"; + }; + }; + "log-symbols-2.2.0" = { + name = "log-symbols"; + packageName = "log-symbols"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/log-symbols/-/log-symbols-2.2.0.tgz"; + sha512 = "VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg=="; + }; + }; + "loglevel-1.6.8" = { + name = "loglevel"; + packageName = "loglevel"; + version = "1.6.8"; + src = fetchurl { + url = "https://registry.npmjs.org/loglevel/-/loglevel-1.6.8.tgz"; + sha512 = "bsU7+gc9AJ2SqpzxwU3+1fedl8zAntbtC5XYlt3s2j1hJcn2PsXSmgN8TaLG/J1/2mod4+cE/3vNL70/c1RNCA=="; + }; + }; + "loose-envify-1.4.0" = { + name = "loose-envify"; + packageName = "loose-envify"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz"; + sha512 = "lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q=="; + }; + }; + "loud-rejection-1.6.0" = { + name = "loud-rejection"; + packageName = "loud-rejection"; + version = "1.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz"; + sha1 = "5b46f80147edee578870f086d04821cf998e551f"; + }; + }; + "lower-case-1.1.4" = { + name = "lower-case"; + packageName = "lower-case"; + version = "1.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/lower-case/-/lower-case-1.1.4.tgz"; + sha1 = "9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac"; + }; + }; + "lru-cache-4.1.5" = { + name = "lru-cache"; + packageName = "lru-cache"; + version = "4.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz"; + sha512 = "sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g=="; + }; + }; + "lru-cache-5.1.1" = { + name = "lru-cache"; + packageName = "lru-cache"; + version = "5.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz"; + sha512 = "KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w=="; + }; + }; + "make-dir-2.1.0" = { + name = "make-dir"; + packageName = "make-dir"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz"; + sha512 = "LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA=="; + }; + }; + "make-dir-3.0.2" = { + name = "make-dir"; + packageName = "make-dir"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/make-dir/-/make-dir-3.0.2.tgz"; + sha512 = "rYKABKutXa6vXTXhoV18cBE7PaewPXHe/Bdq4v+ZLMhxbWApkFFplT0LcbMW+6BbjnQXzZ/sAvSE/JdguApG5w=="; + }; + }; + "make-dir-3.1.0" = { + name = "make-dir"; + packageName = "make-dir"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz"; + sha512 = "g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw=="; + }; + }; + "map-cache-0.2.2" = { + name = "map-cache"; + packageName = "map-cache"; + version = "0.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz"; + sha1 = "c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"; + }; + }; + "map-obj-1.0.1" = { + name = "map-obj"; + packageName = "map-obj"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz"; + sha1 = "d933ceb9205d82bdcf4886f6742bdc2b4dea146d"; + }; + }; + "map-visit-1.0.0" = { + name = "map-visit"; + packageName = "map-visit"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz"; + sha1 = "ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"; + }; + }; + "marked-1.1.1" = { + name = "marked"; + packageName = "marked"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/marked/-/marked-1.1.1.tgz"; + sha512 = "mJzT8D2yPxoPh7h0UXkB+dBj4FykPJ2OIfxAWeIHrvoHDkFxukV/29QxoFQoPM6RLEwhIFdJpmKBlqVM3s2ZIw=="; + }; + }; + "md5.js-1.3.5" = { + name = "md5.js"; + packageName = "md5.js"; + version = "1.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz"; + sha512 = "xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg=="; + }; + }; + "mdn-data-2.0.4" = { + name = "mdn-data"; + packageName = "mdn-data"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.4.tgz"; + sha512 = "iV3XNKw06j5Q7mi6h+9vbx23Tv7JkjEVgKHW4pimwyDGWm0OIQntJJ+u1C6mg6mK1EaTv42XQ7w76yuzH7M2cA=="; + }; + }; + "mdn-data-2.0.6" = { + name = "mdn-data"; + packageName = "mdn-data"; + version = "2.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.6.tgz"; + sha512 = "rQvjv71olwNHgiTbfPZFkJtjNMciWgswYeciZhtvWLO8bmX3TnhyA62I6sTWOyZssWHJJjY6/KiWwqQsWWsqOA=="; + }; + }; + "media-typer-0.3.0" = { + name = "media-typer"; + packageName = "media-typer"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz"; + sha1 = "8710d7af0aa626f8fffa1ce00168545263255748"; + }; + }; + "memory-fs-0.4.1" = { + name = "memory-fs"; + packageName = "memory-fs"; + version = "0.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz"; + sha1 = "3a9a20b8462523e447cfbc7e8bb80ed667bfc552"; + }; + }; + "memory-fs-0.5.0" = { + name = "memory-fs"; + packageName = "memory-fs"; + version = "0.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/memory-fs/-/memory-fs-0.5.0.tgz"; + sha512 = "jA0rdU5KoQMC0e6ppoNRtpp6vjFq6+NY7r8hywnC7V+1Xj/MtHwGIbB1QaK/dunyjWteJzmkpd7ooeWg10T7GA=="; + }; + }; + "meow-3.7.0" = { + name = "meow"; + packageName = "meow"; + version = "3.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz"; + sha1 = "72cb668b425228290abbfa856892587308a801fb"; + }; + }; + "merge-descriptors-1.0.1" = { + name = "merge-descriptors"; + packageName = "merge-descriptors"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz"; + sha1 = "b00aaa556dd8b44568150ec9d1b953f3f90cbb61"; + }; + }; + "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"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz"; + sha512 = "abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w=="; + }; + }; + "merge2-1.3.0" = { + name = "merge2"; + packageName = "merge2"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/merge2/-/merge2-1.3.0.tgz"; + sha512 = "2j4DAdlBOkiSZIsaXk4mTE3sRS02yBHAtfy127xRV3bQUFqXkjHCHLW6Scv7DwNRbIWNHH8zpnz9zMaKXIdvYw=="; + }; + }; + "methods-1.1.2" = { + name = "methods"; + packageName = "methods"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz"; + sha1 = "5529a4d67654134edcc5266656835b0f851afcee"; + }; + }; + "microevent.ts-0.1.1" = { + name = "microevent.ts"; + packageName = "microevent.ts"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/microevent.ts/-/microevent.ts-0.1.1.tgz"; + sha512 = "jo1OfR4TaEwd5HOrt5+tAZ9mqT4jmpNAusXtyfNzqVm9uiSYFZlKM1wYL4oU7azZW/PxQW53wM0S6OR1JHNa2g=="; + }; + }; + "micromatch-3.1.10" = { + name = "micromatch"; + packageName = "micromatch"; + version = "3.1.10"; + src = fetchurl { + url = "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz"; + sha512 = "MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg=="; + }; + }; + "micromatch-4.0.2" = { + name = "micromatch"; + packageName = "micromatch"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz"; + sha512 = "y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q=="; + }; + }; + "miller-rabin-4.0.1" = { + name = "miller-rabin"; + packageName = "miller-rabin"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz"; + sha512 = "115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA=="; + }; + }; + "mime-1.6.0" = { + name = "mime"; + packageName = "mime"; + version = "1.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz"; + sha512 = "x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="; + }; + }; + "mime-2.4.6" = { + name = "mime"; + packageName = "mime"; + version = "2.4.6"; + src = fetchurl { + url = "https://registry.npmjs.org/mime/-/mime-2.4.6.tgz"; + sha512 = "RZKhC3EmpBchfTGBVb8fb+RL2cWyw/32lshnsETttkBAyAUXSGHxbEJWWRXc751DrIxG1q04b8QwMbAwkRPpUA=="; + }; + }; + "mime-db-1.42.0" = { + name = "mime-db"; + packageName = "mime-db"; + version = "1.42.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.42.0.tgz"; + sha512 = "UbfJCR4UAVRNgMpfImz05smAXK7+c+ZntjaA26ANtkXLlOe947Aag5zdIcKQULAiF9Cq4WxBi9jUs5zkA84bYQ=="; + }; + }; + "mime-db-1.44.0" = { + name = "mime-db"; + packageName = "mime-db"; + version = "1.44.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.44.0.tgz"; + sha512 = "/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg=="; + }; + }; + "mime-types-2.1.25" = { + name = "mime-types"; + packageName = "mime-types"; + version = "2.1.25"; + src = fetchurl { + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.25.tgz"; + sha512 = "5KhStqB5xpTAeGqKBAMgwaYMnQik7teQN4IAzC7npDv6kzeU6prfkR67bc87J1kWMPGkoaZSq1npmexMgkmEVg=="; + }; + }; + "mimic-fn-1.2.0" = { + name = "mimic-fn"; + packageName = "mimic-fn"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz"; + sha512 = "jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ=="; + }; + }; + "mimic-fn-2.1.0" = { + name = "mimic-fn"; + packageName = "mimic-fn"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz"; + sha512 = "OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg=="; + }; + }; + "mini-css-extract-plugin-0.9.0" = { + name = "mini-css-extract-plugin"; + packageName = "mini-css-extract-plugin"; + version = "0.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-0.9.0.tgz"; + sha512 = "lp3GeY7ygcgAmVIcRPBVhIkf8Us7FZjA+ILpal44qLdSu11wmjKQ3d9k15lfD7pO4esu9eUIAW7qiYIBppv40A=="; + }; + }; + "minimalistic-assert-1.0.1" = { + name = "minimalistic-assert"; + packageName = "minimalistic-assert"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz"; + sha512 = "UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A=="; + }; + }; + "minimalistic-crypto-utils-1.0.1" = { + name = "minimalistic-crypto-utils"; + packageName = "minimalistic-crypto-utils"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz"; + sha1 = "f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"; + }; + }; + "minimatch-3.0.4" = { + name = "minimatch"; + packageName = "minimatch"; + version = "3.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz"; + sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA=="; + }; + }; + "minimist-0.0.8" = { + name = "minimist"; + packageName = "minimist"; + version = "0.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"; + sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d"; + }; + }; + "minimist-1.2.5" = { + name = "minimist"; + packageName = "minimist"; + version = "1.2.5"; + src = fetchurl { + url = "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz"; + sha512 = "FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="; + }; + }; + "minipass-3.1.3" = { + name = "minipass"; + packageName = "minipass"; + version = "3.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/minipass/-/minipass-3.1.3.tgz"; + sha512 = "Mgd2GdMVzY+x3IJ+oHnVM+KG3lA5c8tnabyJKmHSaG2kAGpudxuOf8ToDkhumF7UzME7DecbQE9uOZhNm7PuJg=="; + }; + }; + "minipass-collect-1.0.2" = { + name = "minipass-collect"; + packageName = "minipass-collect"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/minipass-collect/-/minipass-collect-1.0.2.tgz"; + sha512 = "6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA=="; + }; + }; + "minipass-flush-1.0.5" = { + name = "minipass-flush"; + packageName = "minipass-flush"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz"; + sha512 = "JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw=="; + }; + }; + "minipass-pipeline-1.2.3" = { + name = "minipass-pipeline"; + packageName = "minipass-pipeline"; + version = "1.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.3.tgz"; + sha512 = "cFOknTvng5vqnwOpDsZTWhNll6Jf8o2x+/diplafmxpuIymAjzoOolZG0VvQf3V2HgqzJNhnuKHYp2BqDgz8IQ=="; + }; + }; + "mississippi-3.0.0" = { + name = "mississippi"; + packageName = "mississippi"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz"; + sha512 = "x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA=="; + }; + }; + "mixin-deep-1.3.2" = { + name = "mixin-deep"; + packageName = "mixin-deep"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz"; + sha512 = "WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA=="; + }; + }; + "mkdirp-0.5.1" = { + name = "mkdirp"; + packageName = "mkdirp"; + version = "0.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz"; + sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903"; + }; + }; + "mkdirp-0.5.4" = { + name = "mkdirp"; + packageName = "mkdirp"; + version = "0.5.4"; + src = fetchurl { + url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.4.tgz"; + sha512 = "iG9AK/dJLtJ0XNgTuDbSyNS3zECqDlAhnQW4CsNxBG3LQJBbHmRX1egw39DmtOdCAqY+dKXV+sgPgilNWUKMVw=="; + }; + }; + "mkdirp-0.5.5" = { + name = "mkdirp"; + packageName = "mkdirp"; + version = "0.5.5"; + src = fetchurl { + url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz"; + sha512 = "NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ=="; + }; + }; + "move-concurrently-1.0.1" = { + name = "move-concurrently"; + packageName = "move-concurrently"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz"; + sha1 = "be2c005fda32e0b29af1f05d7c4b33214c701f92"; + }; + }; + "ms-2.0.0" = { + name = "ms"; + packageName = "ms"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz"; + sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8"; + }; + }; + "ms-2.1.1" = { + name = "ms"; + packageName = "ms"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz"; + sha512 = "tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg=="; + }; + }; + "ms-2.1.2" = { + name = "ms"; + packageName = "ms"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz"; + sha512 = "sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="; + }; + }; + "multicast-dns-6.2.3" = { + name = "multicast-dns"; + packageName = "multicast-dns"; + version = "6.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.2.3.tgz"; + sha512 = "ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g=="; + }; + }; + "multicast-dns-service-types-1.1.0" = { + name = "multicast-dns-service-types"; + packageName = "multicast-dns-service-types"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz"; + sha1 = "899f11d9686e5e05cb91b35d5f0e63b773cfc901"; + }; + }; + "mute-stream-0.0.8" = { + name = "mute-stream"; + packageName = "mute-stream"; + version = "0.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz"; + sha512 = "nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA=="; + }; + }; + "mz-2.7.0" = { + name = "mz"; + packageName = "mz"; + version = "2.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz"; + sha512 = "z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q=="; + }; + }; + "nan-2.14.0" = { + name = "nan"; + packageName = "nan"; + version = "2.14.0"; + src = fetchurl { + url = "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz"; + sha512 = "INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg=="; + }; + }; + "nanomatch-1.2.13" = { + name = "nanomatch"; + packageName = "nanomatch"; + version = "1.2.13"; + src = fetchurl { + url = "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz"; + sha512 = "fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA=="; + }; + }; + "natural-compare-1.4.0" = { + name = "natural-compare"; + packageName = "natural-compare"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz"; + sha1 = "4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"; + }; + }; + "negotiator-0.6.2" = { + name = "negotiator"; + packageName = "negotiator"; + version = "0.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz"; + sha512 = "hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw=="; + }; + }; + "neo-async-2.6.1" = { + name = "neo-async"; + packageName = "neo-async"; + version = "2.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/neo-async/-/neo-async-2.6.1.tgz"; + sha512 = "iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw=="; + }; + }; + "nice-try-1.0.5" = { + name = "nice-try"; + packageName = "nice-try"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz"; + sha512 = "1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ=="; + }; + }; + "no-case-2.3.2" = { + name = "no-case"; + packageName = "no-case"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz"; + sha512 = "rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ=="; + }; + }; + "node-forge-0.9.0" = { + name = "node-forge"; + packageName = "node-forge"; + version = "0.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/node-forge/-/node-forge-0.9.0.tgz"; + sha512 = "7ASaDa3pD+lJ3WvXFsxekJQelBKRpne+GOVbLbtHYdd7pFspyeuJHnWfLplGf3SwKGbfs/aYl5V/JCIaHVUKKQ=="; + }; + }; + "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-ipc-9.1.1" = { + name = "node-ipc"; + packageName = "node-ipc"; + version = "9.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/node-ipc/-/node-ipc-9.1.1.tgz"; + sha512 = "FAyICv0sIRJxVp3GW5fzgaf9jwwRQxAKDJlmNFUL5hOy+W4X/I5AypyHoq0DXXbo9o/gt79gj++4cMr4jVWE/w=="; + }; + }; + "node-libs-browser-2.2.1" = { + name = "node-libs-browser"; + packageName = "node-libs-browser"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.2.1.tgz"; + sha512 = "h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q=="; + }; + }; + "node-releases-1.1.53" = { + name = "node-releases"; + packageName = "node-releases"; + version = "1.1.53"; + src = fetchurl { + url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.53.tgz"; + sha512 = "wp8zyQVwef2hpZ/dJH7SfSrIPD6YoJz6BDQDpGEkcA0s3LpAQoxBIYmfIq6QAhC1DhwsyCgTaTTcONwX8qzCuQ=="; + }; + }; + "node-releases-1.1.58" = { + name = "node-releases"; + packageName = "node-releases"; + version = "1.1.58"; + src = fetchurl { + url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.58.tgz"; + sha512 = "NxBudgVKiRh/2aPWMgPR7bPTX0VPmGx5QBwCtdHitnqFE5/O8DeBXuIMH1nwNnw/aMo6AjOrpsHzfY3UbUJ7yg=="; + }; + }; + "node-sass-4.14.1" = { + name = "node-sass"; + packageName = "node-sass"; + version = "4.14.1"; + src = fetchurl { + url = "https://registry.npmjs.org/node-sass/-/node-sass-4.14.1.tgz"; + sha512 = "sjCuOlvGyCJS40R8BscF5vhVlQjNN069NtQ1gSxyK1u9iqvn6tf7O1R4GNowVZfiZUCRt5MmMs1xd+4V/7Yr0g=="; + }; + }; + "nopt-3.0.6" = { + name = "nopt"; + packageName = "nopt"; + version = "3.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz"; + sha1 = "c6465dbf08abcd4db359317f79ac68a646b28ff9"; + }; + }; + "normalize-package-data-2.5.0" = { + name = "normalize-package-data"; + packageName = "normalize-package-data"; + version = "2.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz"; + sha512 = "/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA=="; + }; + }; + "normalize-path-1.0.0" = { + name = "normalize-path"; + packageName = "normalize-path"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/normalize-path/-/normalize-path-1.0.0.tgz"; + sha1 = "32d0e472f91ff345701c15a8311018d3b0a90379"; + }; + }; + "normalize-path-2.1.1" = { + name = "normalize-path"; + packageName = "normalize-path"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz"; + sha1 = "1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"; + }; + }; + "normalize-path-3.0.0" = { + name = "normalize-path"; + packageName = "normalize-path"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz"; + sha512 = "6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="; + }; + }; + "normalize-range-0.1.2" = { + name = "normalize-range"; + packageName = "normalize-range"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz"; + sha1 = "2d10c06bdfd312ea9777695a4d28439456b75942"; + }; + }; + "normalize-url-1.9.1" = { + name = "normalize-url"; + packageName = "normalize-url"; + version = "1.9.1"; + src = fetchurl { + url = "https://registry.npmjs.org/normalize-url/-/normalize-url-1.9.1.tgz"; + sha1 = "2cc0d66b31ea23036458436e3620d85954c66c3c"; + }; + }; + "normalize-url-3.3.0" = { + name = "normalize-url"; + packageName = "normalize-url"; + version = "3.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/normalize-url/-/normalize-url-3.3.0.tgz"; + sha512 = "U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg=="; + }; + }; + "npm-run-path-2.0.2" = { + name = "npm-run-path"; + packageName = "npm-run-path"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz"; + sha1 = "35a9232dfa35d7067b4cb2ddf2357b1871536c5f"; + }; + }; + "npm-run-path-4.0.1" = { + name = "npm-run-path"; + packageName = "npm-run-path"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz"; + sha512 = "S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw=="; + }; + }; + "npmlog-4.1.2" = { + name = "npmlog"; + packageName = "npmlog"; + version = "4.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz"; + sha512 = "2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg=="; + }; + }; + "nth-check-1.0.2" = { + name = "nth-check"; + packageName = "nth-check"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz"; + sha512 = "WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg=="; + }; + }; + "num2fraction-1.2.2" = { + name = "num2fraction"; + packageName = "num2fraction"; + version = "1.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz"; + sha1 = "6f682b6a027a4e9ddfa4564cd2589d1d4e669ede"; + }; + }; + "number-is-nan-1.0.1" = { + name = "number-is-nan"; + packageName = "number-is-nan"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz"; + sha1 = "097b602b53422a522c1afb8790318336941a011d"; + }; + }; + "oauth-sign-0.9.0" = { + name = "oauth-sign"; + packageName = "oauth-sign"; + version = "0.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz"; + sha512 = "fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ=="; + }; + }; + "object-assign-4.1.1" = { + name = "object-assign"; + packageName = "object-assign"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz"; + sha1 = "2109adc7965887cfc05cbbd442cac8bfbb360863"; + }; + }; + "object-copy-0.1.0" = { + name = "object-copy"; + packageName = "object-copy"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz"; + sha1 = "7e7d858b781bd7c991a41ba975ed3812754e998c"; + }; + }; + "object-hash-1.3.1" = { + name = "object-hash"; + packageName = "object-hash"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/object-hash/-/object-hash-1.3.1.tgz"; + sha512 = "OSuu/pU4ENM9kmREg0BdNrUDIl1heYa4mBZacJc+vVWz4GtAwu7jO8s4AIt2aGRUTqxykpWzI3Oqnsm13tTMDA=="; + }; + }; + "object-inspect-1.7.0" = { + name = "object-inspect"; + packageName = "object-inspect"; + version = "1.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.7.0.tgz"; + sha512 = "a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw=="; + }; + }; + "object-is-1.1.2" = { + name = "object-is"; + packageName = "object-is"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/object-is/-/object-is-1.1.2.tgz"; + sha512 = "5lHCz+0uufF6wZ7CRFWJN3hp8Jqblpgve06U5CMQ3f//6iDjPr2PEo9MWCjEssDsa+UZEL4PkFpr+BMop6aKzQ=="; + }; + }; + "object-keys-1.1.1" = { + name = "object-keys"; + packageName = "object-keys"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz"; + sha512 = "NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="; + }; + }; + "object-visit-1.0.1" = { + name = "object-visit"; + packageName = "object-visit"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz"; + sha1 = "f79c4493af0c5377b59fe39d395e41042dd045bb"; + }; + }; + "object.assign-4.1.0" = { + name = "object.assign"; + packageName = "object.assign"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz"; + sha512 = "exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w=="; + }; + }; + "object.getownpropertydescriptors-2.1.0" = { + name = "object.getownpropertydescriptors"; + packageName = "object.getownpropertydescriptors"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz"; + sha512 = "Z53Oah9A3TdLoblT7VKJaTDdXdT+lQO+cNpKVnya5JDe9uLvzu1YyY1yFDFrcxrlRgWrEFH0jJtD/IbuwjcEVg=="; + }; + }; + "object.pick-1.3.0" = { + name = "object.pick"; + packageName = "object.pick"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz"; + sha1 = "87a10ac4c1694bd2e1cbf53591a66141fb5dd747"; + }; + }; + "object.values-1.1.1" = { + name = "object.values"; + packageName = "object.values"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/object.values/-/object.values-1.1.1.tgz"; + sha512 = "WTa54g2K8iu0kmS/us18jEmdv1a4Wi//BZ/DTVYEcH0XhLM5NYdpDHja3gt57VrZLcNAO2WGA+KpWsDBaHt6eA=="; + }; + }; + "obuf-1.1.2" = { + name = "obuf"; + packageName = "obuf"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz"; + sha512 = "PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg=="; + }; + }; + "on-finished-2.3.0" = { + name = "on-finished"; + packageName = "on-finished"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz"; + sha1 = "20f1336481b083cd75337992a16971aa2d906947"; + }; + }; + "on-headers-1.0.2" = { + name = "on-headers"; + packageName = "on-headers"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz"; + sha512 = "pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA=="; + }; + }; + "once-1.4.0" = { + name = "once"; + packageName = "once"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/once/-/once-1.4.0.tgz"; + sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1"; + }; + }; + "onetime-2.0.1" = { + name = "onetime"; + packageName = "onetime"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz"; + sha1 = "067428230fd67443b2794b22bba528b6867962d4"; + }; + }; + "onetime-5.1.0" = { + name = "onetime"; + packageName = "onetime"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/onetime/-/onetime-5.1.0.tgz"; + sha512 = "5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q=="; + }; + }; + "open-6.4.0" = { + name = "open"; + packageName = "open"; + version = "6.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/open/-/open-6.4.0.tgz"; + sha512 = "IFenVPgF70fSm1keSd2iDBIDIBZkroLeuffXq+wKTzTJlBpesFWojV9lb8mzOfaAzM1sr7HQHuO0vtV0zYekGg=="; + }; + }; + "opener-1.5.1" = { + name = "opener"; + packageName = "opener"; + version = "1.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/opener/-/opener-1.5.1.tgz"; + sha512 = "goYSy5c2UXE4Ra1xixabeVh1guIX/ZV/YokJksb6q2lubWu6UbvPQ20p542/sFIll1nl8JnCyK9oBaOcCWXwvA=="; + }; + }; + "opn-5.5.0" = { + name = "opn"; + packageName = "opn"; + version = "5.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/opn/-/opn-5.5.0.tgz"; + sha512 = "PqHpggC9bLV0VeWcdKhkpxY+3JTzetLSqTCWL/z/tFIbI6G8JCjondXklT1JinczLz2Xib62sSp0T/gKT4KksA=="; + }; + }; + "optionator-0.8.3" = { + name = "optionator"; + packageName = "optionator"; + version = "0.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz"; + sha512 = "+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA=="; + }; + }; + "ora-3.4.0" = { + name = "ora"; + packageName = "ora"; + version = "3.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ora/-/ora-3.4.0.tgz"; + sha512 = "eNwHudNbO1folBP3JsZ19v9azXWtQZjICdr3Q0TDPIaeBQ3mXLrh54wM+er0+hSp+dWKf+Z8KM58CYzEyIYxYg=="; + }; + }; + "original-1.0.2" = { + name = "original"; + packageName = "original"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/original/-/original-1.0.2.tgz"; + sha512 = "hyBVl6iqqUOJ8FqRe+l/gS8H+kKYjrEndd5Pm1MfBtsEKA038HkkdbAl/72EAXGyonD/PFsvmVG+EvcIpliMBg=="; + }; + }; + "os-browserify-0.3.0" = { + name = "os-browserify"; + packageName = "os-browserify"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz"; + sha1 = "854373c7f5c2315914fc9bfc6bd8238fdda1ec27"; + }; + }; + "os-homedir-1.0.2" = { + name = "os-homedir"; + packageName = "os-homedir"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz"; + sha1 = "ffbc4988336e0e833de0c168c7ef152121aa7fb3"; + }; + }; + "os-tmpdir-1.0.2" = { + name = "os-tmpdir"; + packageName = "os-tmpdir"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz"; + sha1 = "bbe67406c79aa85c5cfec766fe5734555dfa1274"; + }; + }; + "osenv-0.1.5" = { + name = "osenv"; + packageName = "osenv"; + version = "0.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz"; + sha512 = "0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g=="; + }; + }; + "p-finally-1.0.0" = { + name = "p-finally"; + packageName = "p-finally"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz"; + sha1 = "3fbcfb15b899a44123b34b6dcc18b724336a2cae"; + }; + }; + "p-finally-2.0.1" = { + name = "p-finally"; + packageName = "p-finally"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/p-finally/-/p-finally-2.0.1.tgz"; + sha512 = "vpm09aKwq6H9phqRQzecoDpD8TmVyGw70qmWlyq5onxY7tqyTTFVvxMykxQSQKILBSFlbXpypIw2T1Ml7+DDtw=="; + }; + }; + "p-limit-1.3.0" = { + name = "p-limit"; + packageName = "p-limit"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz"; + sha512 = "vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q=="; + }; + }; + "p-limit-2.2.1" = { + name = "p-limit"; + packageName = "p-limit"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/p-limit/-/p-limit-2.2.1.tgz"; + sha512 = "85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg=="; + }; + }; + "p-limit-2.3.0" = { + name = "p-limit"; + packageName = "p-limit"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz"; + sha512 = "//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w=="; + }; + }; + "p-locate-2.0.0" = { + name = "p-locate"; + packageName = "p-locate"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz"; + sha1 = "20a0103b222a70c8fd39cc2e580680f3dde5ec43"; + }; + }; + "p-locate-3.0.0" = { + name = "p-locate"; + packageName = "p-locate"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz"; + sha512 = "x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ=="; + }; + }; + "p-locate-4.1.0" = { + name = "p-locate"; + packageName = "p-locate"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz"; + sha512 = "R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A=="; + }; + }; + "p-map-2.1.0" = { + name = "p-map"; + packageName = "p-map"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-map/-/p-map-2.1.0.tgz"; + sha512 = "y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw=="; + }; + }; + "p-map-3.0.0" = { + name = "p-map"; + packageName = "p-map"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-map/-/p-map-3.0.0.tgz"; + sha512 = "d3qXVTF/s+W+CdJ5A29wywV2n8CQQYahlgz2bFiA+4eVNJbHJodPZ+/gXwPGh0bOqA+j8S+6+ckmvLGPk1QpxQ=="; + }; + }; + "p-retry-3.0.1" = { + name = "p-retry"; + packageName = "p-retry"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/p-retry/-/p-retry-3.0.1.tgz"; + sha512 = "XE6G4+YTTkT2a0UWb2kjZe8xNwf8bIbnqpc/IS/idOBVhyves0mK5OJgeocjx7q5pvX/6m23xuzVPYT1uGM73w=="; + }; + }; + "p-try-1.0.0" = { + name = "p-try"; + packageName = "p-try"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz"; + sha1 = "cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"; + }; + }; + "p-try-2.2.0" = { + name = "p-try"; + packageName = "p-try"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz"; + sha512 = "R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="; + }; + }; + "pako-1.0.11" = { + name = "pako"; + packageName = "pako"; + version = "1.0.11"; + src = fetchurl { + url = "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz"; + sha512 = "4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw=="; + }; + }; + "parallel-transform-1.2.0" = { + name = "parallel-transform"; + packageName = "parallel-transform"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.2.0.tgz"; + sha512 = "P2vSmIu38uIlvdcU7fDkyrxj33gTUy/ABO5ZUbGowxNCopBq/OoD42bP4UmMrJoPyk4Uqf0mu3mtWBhHCZD8yg=="; + }; + }; + "param-case-2.1.1" = { + name = "param-case"; + packageName = "param-case"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/param-case/-/param-case-2.1.1.tgz"; + sha1 = "df94fd8cf6531ecf75e6bef9a0858fbc72be2247"; + }; + }; + "parent-module-1.0.1" = { + name = "parent-module"; + packageName = "parent-module"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz"; + sha512 = "GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g=="; + }; + }; + "parse-asn1-5.1.5" = { + name = "parse-asn1"; + packageName = "parse-asn1"; + version = "5.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.5.tgz"; + sha512 = "jkMYn1dcJqF6d5CpU689bq7w/b5ALS9ROVSpQDPrZsqqesUJii9qutvoT5ltGedNXMO2e16YUWIghG9KxaViTQ=="; + }; + }; + "parse-json-2.2.0" = { + name = "parse-json"; + packageName = "parse-json"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz"; + sha1 = "f480f40434ef80741f8469099f8dea18f55a4dc9"; + }; + }; + "parse-json-4.0.0" = { + name = "parse-json"; + packageName = "parse-json"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz"; + sha1 = "be35f5425be1f7f6c747184f98a788cb99477ee0"; + }; + }; + "parse-json-5.0.0" = { + name = "parse-json"; + packageName = "parse-json"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/parse-json/-/parse-json-5.0.0.tgz"; + sha512 = "OOY5b7PAEFV0E2Fir1KOkxchnZNCdowAJgQ5NuxjpBKTRP3pQhwkrkxqQjeoKJ+fO7bCpmIZaogI4eZGDMEGOw=="; + }; + }; + "parse5-5.1.1" = { + name = "parse5"; + packageName = "parse5"; + version = "5.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/parse5/-/parse5-5.1.1.tgz"; + sha512 = "ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug=="; + }; + }; + "parse5-htmlparser2-tree-adapter-5.1.1" = { + name = "parse5-htmlparser2-tree-adapter"; + packageName = "parse5-htmlparser2-tree-adapter"; + version = "5.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-5.1.1.tgz"; + sha512 = "CF+TKjXqoqyDwHqBhFQ+3l5t83xYi6fVT1tQNg+Ye0JRLnTxWvIroCjEp1A0k4lneHNBGnICUf0cfYVYGEazqw=="; + }; + }; + "parseurl-1.3.3" = { + name = "parseurl"; + packageName = "parseurl"; + version = "1.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz"; + sha512 = "CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ=="; + }; + }; + "pascalcase-0.1.1" = { + name = "pascalcase"; + packageName = "pascalcase"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz"; + sha1 = "b363e55e8006ca6fe21784d2db22bd15d7917f14"; + }; + }; + "path-browserify-0.0.1" = { + name = "path-browserify"; + packageName = "path-browserify"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.1.tgz"; + sha512 = "BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ=="; + }; + }; + "path-dirname-1.0.2" = { + name = "path-dirname"; + packageName = "path-dirname"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz"; + sha1 = "cc33d24d525e099a5388c0336c6e32b9160609e0"; + }; + }; + "path-exists-2.1.0" = { + name = "path-exists"; + packageName = "path-exists"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz"; + sha1 = "0feb6c64f0fc518d9a754dd5efb62c7022761f4b"; + }; + }; + "path-exists-3.0.0" = { + name = "path-exists"; + packageName = "path-exists"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz"; + sha1 = "ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"; + }; + }; + "path-exists-4.0.0" = { + name = "path-exists"; + packageName = "path-exists"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz"; + sha512 = "ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w=="; + }; + }; + "path-is-absolute-1.0.1" = { + name = "path-is-absolute"; + packageName = "path-is-absolute"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"; + sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"; + }; + }; + "path-is-inside-1.0.2" = { + name = "path-is-inside"; + packageName = "path-is-inside"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz"; + sha1 = "365417dede44430d1c11af61027facf074bdfc53"; + }; + }; + "path-key-2.0.1" = { + name = "path-key"; + packageName = "path-key"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz"; + sha1 = "411cadb574c5a140d3a4b1910d40d80cc9f40b40"; + }; + }; + "path-key-3.1.1" = { + name = "path-key"; + packageName = "path-key"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz"; + sha512 = "ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q=="; + }; + }; + "path-parse-1.0.6" = { + name = "path-parse"; + packageName = "path-parse"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz"; + sha512 = "GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw=="; + }; + }; + "path-to-regexp-0.1.7" = { + name = "path-to-regexp"; + packageName = "path-to-regexp"; + version = "0.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz"; + sha1 = "df604178005f522f15eb4490e7247a1bfaa67f8c"; + }; + }; + "path-type-1.1.0" = { + name = "path-type"; + packageName = "path-type"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz"; + sha1 = "59c44f7ee491da704da415da5a4070ba4f8fe441"; + }; + }; + "path-type-3.0.0" = { + name = "path-type"; + packageName = "path-type"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz"; + sha512 = "T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg=="; + }; + }; + "pbkdf2-3.0.17" = { + name = "pbkdf2"; + packageName = "pbkdf2"; + version = "3.0.17"; + src = fetchurl { + url = "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.17.tgz"; + sha512 = "U/il5MsrZp7mGg3mSQfn742na2T+1/vHDCG5/iTI3X9MKUuYUZVLQhyRsg06mCgDBTd57TxzgZt7P+fYfjRLtA=="; + }; + }; + "performance-now-2.1.0" = { + name = "performance-now"; + packageName = "performance-now"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz"; + sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"; + }; + }; + "picomatch-2.2.2" = { + name = "picomatch"; + packageName = "picomatch"; + version = "2.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz"; + sha512 = "q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg=="; + }; + }; + "pify-2.3.0" = { + name = "pify"; + packageName = "pify"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz"; + sha1 = "ed141a6ac043a849ea588498e7dca8b15330e90c"; + }; + }; + "pify-3.0.0" = { + name = "pify"; + packageName = "pify"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz"; + sha1 = "e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"; + }; + }; + "pify-4.0.1" = { + name = "pify"; + packageName = "pify"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz"; + sha512 = "uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g=="; + }; + }; + "pinkie-2.0.4" = { + name = "pinkie"; + packageName = "pinkie"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz"; + sha1 = "72556b80cfa0d48a974e80e77248e80ed4f7f870"; + }; + }; + "pinkie-promise-2.0.1" = { + name = "pinkie-promise"; + packageName = "pinkie-promise"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz"; + sha1 = "2135d6dfa7a358c069ac9b178776288228450ffa"; + }; + }; + "pkg-dir-1.0.0" = { + name = "pkg-dir"; + packageName = "pkg-dir"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pkg-dir/-/pkg-dir-1.0.0.tgz"; + sha1 = "7a4b508a8d5bb2d629d447056ff4e9c9314cf3d4"; + }; + }; + "pkg-dir-3.0.0" = { + name = "pkg-dir"; + packageName = "pkg-dir"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz"; + sha512 = "/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw=="; + }; + }; + "pkg-dir-4.2.0" = { + name = "pkg-dir"; + packageName = "pkg-dir"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz"; + sha512 = "HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ=="; + }; + }; + "pkg-up-2.0.0" = { + name = "pkg-up"; + packageName = "pkg-up"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pkg-up/-/pkg-up-2.0.0.tgz"; + sha1 = "c819ac728059a461cab1c3889a2be3c49a004d7f"; + }; + }; + "pnp-webpack-plugin-1.6.4" = { + name = "pnp-webpack-plugin"; + packageName = "pnp-webpack-plugin"; + version = "1.6.4"; + src = fetchurl { + url = "https://registry.npmjs.org/pnp-webpack-plugin/-/pnp-webpack-plugin-1.6.4.tgz"; + sha512 = "7Wjy+9E3WwLOEL30D+m8TSTF7qJJUJLONBnwQp0518siuMxUQUbgZwssaFX+QKlZkjHZcw/IpZCt/H0srrntSg=="; + }; + }; + "portfinder-1.0.26" = { + name = "portfinder"; + packageName = "portfinder"; + version = "1.0.26"; + src = fetchurl { + url = "https://registry.npmjs.org/portfinder/-/portfinder-1.0.26.tgz"; + sha512 = "Xi7mKxJHHMI3rIUrnm/jjUgwhbYMkp/XKEcZX3aG4BrumLpq3nmoQMX+ClYnDZnZ/New7IatC1no5RX0zo1vXQ=="; + }; + }; + "posix-character-classes-0.1.1" = { + name = "posix-character-classes"; + packageName = "posix-character-classes"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz"; + sha1 = "01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"; + }; + }; + "postcss-7.0.32" = { + name = "postcss"; + packageName = "postcss"; + version = "7.0.32"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss/-/postcss-7.0.32.tgz"; + sha512 = "03eXong5NLnNCD05xscnGKGDZ98CyzoqPSMjOe6SuoQY7Z2hIj0Ld1g/O/UQRuOle2aRtiIRDg9tDcTGAkLfKw=="; + }; + }; + "postcss-calc-7.0.2" = { + name = "postcss-calc"; + packageName = "postcss-calc"; + version = "7.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-calc/-/postcss-calc-7.0.2.tgz"; + sha512 = "rofZFHUg6ZIrvRwPeFktv06GdbDYLcGqh9EwiMutZg+a0oePCCw1zHOEiji6LCpyRcjTREtPASuUqeAvYlEVvQ=="; + }; + }; + "postcss-colormin-4.0.3" = { + name = "postcss-colormin"; + packageName = "postcss-colormin"; + version = "4.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-4.0.3.tgz"; + sha512 = "WyQFAdDZpExQh32j0U0feWisZ0dmOtPl44qYmJKkq9xFWY3p+4qnRzCHeNrkeRhwPHz9bQ3mo0/yVkaply0MNw=="; + }; + }; + "postcss-convert-values-4.0.1" = { + name = "postcss-convert-values"; + packageName = "postcss-convert-values"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-4.0.1.tgz"; + sha512 = "Kisdo1y77KUC0Jmn0OXU/COOJbzM8cImvw1ZFsBgBgMgb1iL23Zs/LXRe3r+EZqM3vGYKdQ2YJVQ5VkJI+zEJQ=="; + }; + }; + "postcss-discard-comments-4.0.2" = { + name = "postcss-discard-comments"; + packageName = "postcss-discard-comments"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-4.0.2.tgz"; + sha512 = "RJutN259iuRf3IW7GZyLM5Sw4GLTOH8FmsXBnv8Ab/Tc2k4SR4qbV4DNbyyY4+Sjo362SyDmW2DQ7lBSChrpkg=="; + }; + }; + "postcss-discard-duplicates-4.0.2" = { + name = "postcss-discard-duplicates"; + packageName = "postcss-discard-duplicates"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-4.0.2.tgz"; + sha512 = "ZNQfR1gPNAiXZhgENFfEglF93pciw0WxMkJeVmw8eF+JZBbMD7jp6C67GqJAXVZP2BWbOztKfbsdmMp/k8c6oQ=="; + }; + }; + "postcss-discard-empty-4.0.1" = { + name = "postcss-discard-empty"; + packageName = "postcss-discard-empty"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-4.0.1.tgz"; + sha512 = "B9miTzbznhDjTfjvipfHoqbWKwd0Mj+/fL5s1QOz06wufguil+Xheo4XpOnc4NqKYBCNqqEzgPv2aPBIJLox0w=="; + }; + }; + "postcss-discard-overridden-4.0.1" = { + name = "postcss-discard-overridden"; + packageName = "postcss-discard-overridden"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-4.0.1.tgz"; + sha512 = "IYY2bEDD7g1XM1IDEsUT4//iEYCxAmP5oDSFMVU/JVvT7gh+l4fmjciLqGgwjdWpQIdb0Che2VX00QObS5+cTg=="; + }; + }; + "postcss-load-config-2.1.0" = { + name = "postcss-load-config"; + packageName = "postcss-load-config"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-2.1.0.tgz"; + sha512 = "4pV3JJVPLd5+RueiVVB+gFOAa7GWc25XQcMp86Zexzke69mKf6Nx9LRcQywdz7yZI9n1udOxmLuAwTBypypF8Q=="; + }; + }; + "postcss-loader-3.0.0" = { + name = "postcss-loader"; + packageName = "postcss-loader"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-loader/-/postcss-loader-3.0.0.tgz"; + sha512 = "cLWoDEY5OwHcAjDnkyRQzAXfs2jrKjXpO/HQFcc5b5u/r7aa471wdmChmwfnv7x2u840iat/wi0lQ5nbRgSkUA=="; + }; + }; + "postcss-merge-longhand-4.0.11" = { + name = "postcss-merge-longhand"; + packageName = "postcss-merge-longhand"; + version = "4.0.11"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-4.0.11.tgz"; + sha512 = "alx/zmoeXvJjp7L4mxEMjh8lxVlDFX1gqWHzaaQewwMZiVhLo42TEClKaeHbRf6J7j82ZOdTJ808RtN0ZOZwvw=="; + }; + }; + "postcss-merge-rules-4.0.3" = { + name = "postcss-merge-rules"; + packageName = "postcss-merge-rules"; + version = "4.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-4.0.3.tgz"; + sha512 = "U7e3r1SbvYzO0Jr3UT/zKBVgYYyhAz0aitvGIYOYK5CPmkNih+WDSsS5tvPrJ8YMQYlEMvsZIiqmn7HdFUaeEQ=="; + }; + }; + "postcss-minify-font-values-4.0.2" = { + name = "postcss-minify-font-values"; + packageName = "postcss-minify-font-values"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-4.0.2.tgz"; + sha512 = "j85oO6OnRU9zPf04+PZv1LYIYOprWm6IA6zkXkrJXyRveDEuQggG6tvoy8ir8ZwjLxLuGfNkCZEQG7zan+Hbtg=="; + }; + }; + "postcss-minify-gradients-4.0.2" = { + name = "postcss-minify-gradients"; + packageName = "postcss-minify-gradients"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-4.0.2.tgz"; + sha512 = "qKPfwlONdcf/AndP1U8SJ/uzIJtowHlMaSioKzebAXSG4iJthlWC9iSWznQcX4f66gIWX44RSA841HTHj3wK+Q=="; + }; + }; + "postcss-minify-params-4.0.2" = { + name = "postcss-minify-params"; + packageName = "postcss-minify-params"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-4.0.2.tgz"; + sha512 = "G7eWyzEx0xL4/wiBBJxJOz48zAKV2WG3iZOqVhPet/9geefm/Px5uo1fzlHu+DOjT+m0Mmiz3jkQzVHe6wxAWg=="; + }; + }; + "postcss-minify-selectors-4.0.2" = { + name = "postcss-minify-selectors"; + packageName = "postcss-minify-selectors"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-4.0.2.tgz"; + sha512 = "D5S1iViljXBj9kflQo4YutWnJmwm8VvIsU1GeXJGiG9j8CIg9zs4voPMdQDUmIxetUOh60VilsNzCiAFTOqu3g=="; + }; + }; + "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-3.0.2" = { + name = "postcss-modules-local-by-default"; + packageName = "postcss-modules-local-by-default"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-3.0.2.tgz"; + sha512 = "jM/V8eqM4oJ/22j0gx4jrp63GSvDH6v86OqyTHHUvk4/k1vceipZsaymiZ5PvocqZOl5SFHiFJqjs3la0wnfIQ=="; + }; + }; + "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-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"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-4.0.1.tgz"; + sha512 = "gMXCrrlWh6G27U0hF3vNvR3w8I1s2wOBILvA87iNXaPvSNo5uZAMYsZG7XjCUf1eVxuPfyL4TJ7++SGZLc9A3g=="; + }; + }; + "postcss-normalize-display-values-4.0.2" = { + name = "postcss-normalize-display-values"; + packageName = "postcss-normalize-display-values"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-4.0.2.tgz"; + sha512 = "3F2jcsaMW7+VtRMAqf/3m4cPFhPD3EFRgNs18u+k3lTJJlVe7d0YPO+bnwqo2xg8YiRpDXJI2u8A0wqJxMsQuQ=="; + }; + }; + "postcss-normalize-positions-4.0.2" = { + name = "postcss-normalize-positions"; + packageName = "postcss-normalize-positions"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-4.0.2.tgz"; + sha512 = "Dlf3/9AxpxE+NF1fJxYDeggi5WwV35MXGFnnoccP/9qDtFrTArZ0D0R+iKcg5WsUd8nUYMIl8yXDCtcrT8JrdA=="; + }; + }; + "postcss-normalize-repeat-style-4.0.2" = { + name = "postcss-normalize-repeat-style"; + packageName = "postcss-normalize-repeat-style"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-4.0.2.tgz"; + sha512 = "qvigdYYMpSuoFs3Is/f5nHdRLJN/ITA7huIoCyqqENJe9PvPmLhNLMu7QTjPdtnVf6OcYYO5SHonx4+fbJE1+Q=="; + }; + }; + "postcss-normalize-string-4.0.2" = { + name = "postcss-normalize-string"; + packageName = "postcss-normalize-string"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-4.0.2.tgz"; + sha512 = "RrERod97Dnwqq49WNz8qo66ps0swYZDSb6rM57kN2J+aoyEAJfZ6bMx0sx/F9TIEX0xthPGCmeyiam/jXif0eA=="; + }; + }; + "postcss-normalize-timing-functions-4.0.2" = { + name = "postcss-normalize-timing-functions"; + packageName = "postcss-normalize-timing-functions"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-4.0.2.tgz"; + sha512 = "acwJY95edP762e++00Ehq9L4sZCEcOPyaHwoaFOhIwWCDfik6YvqsYNxckee65JHLKzuNSSmAdxwD2Cud1Z54A=="; + }; + }; + "postcss-normalize-unicode-4.0.1" = { + name = "postcss-normalize-unicode"; + packageName = "postcss-normalize-unicode"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-4.0.1.tgz"; + sha512 = "od18Uq2wCYn+vZ/qCOeutvHjB5jm57ToxRaMeNuf0nWVHaP9Hua56QyMF6fs/4FSUnVIw0CBPsU0K4LnBPwYwg=="; + }; + }; + "postcss-normalize-url-4.0.1" = { + name = "postcss-normalize-url"; + packageName = "postcss-normalize-url"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-4.0.1.tgz"; + sha512 = "p5oVaF4+IHwu7VpMan/SSpmpYxcJMtkGppYf0VbdH5B6hN8YNmVyJLuY9FmLQTzY3fag5ESUUHDqM+heid0UVA=="; + }; + }; + "postcss-normalize-whitespace-4.0.2" = { + name = "postcss-normalize-whitespace"; + packageName = "postcss-normalize-whitespace"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-4.0.2.tgz"; + sha512 = "tO8QIgrsI3p95r8fyqKV+ufKlSHh9hMJqACqbv2XknufqEDhDvbguXGBBqxw9nsQoXWf0qOqppziKJKHMD4GtA=="; + }; + }; + "postcss-ordered-values-4.1.2" = { + name = "postcss-ordered-values"; + packageName = "postcss-ordered-values"; + version = "4.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-4.1.2.tgz"; + sha512 = "2fCObh5UanxvSxeXrtLtlwVThBvHn6MQcu4ksNT2tsaV2Fg76R2CV98W7wNSlX+5/pFwEyaDwKLLoEV7uRybAw=="; + }; + }; + "postcss-reduce-initial-4.0.3" = { + name = "postcss-reduce-initial"; + packageName = "postcss-reduce-initial"; + version = "4.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-4.0.3.tgz"; + sha512 = "gKWmR5aUulSjbzOfD9AlJiHCGH6AEVLaM0AV+aSioxUDd16qXP1PCh8d1/BGVvpdWn8k/HiK7n6TjeoXN1F7DA=="; + }; + }; + "postcss-reduce-transforms-4.0.2" = { + name = "postcss-reduce-transforms"; + packageName = "postcss-reduce-transforms"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-4.0.2.tgz"; + sha512 = "EEVig1Q2QJ4ELpJXMZR8Vt5DQx8/mo+dGWSR7vWXqcob2gQLyQGsionYcGKATXvQzMPn6DSN1vTN7yFximdIAg=="; + }; + }; + "postcss-selector-parser-3.1.2" = { + name = "postcss-selector-parser"; + packageName = "postcss-selector-parser"; + version = "3.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz"; + sha512 = "h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA=="; + }; + }; + "postcss-selector-parser-6.0.2" = { + name = "postcss-selector-parser"; + packageName = "postcss-selector-parser"; + version = "6.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.2.tgz"; + sha512 = "36P2QR59jDTOAiIkqEprfJDsoNrvwFei3eCqKd1Y0tUsBimsq39BLp7RD+JWny3WgB1zGhJX8XVePwm9k4wdBg=="; + }; + }; + "postcss-svgo-4.0.2" = { + name = "postcss-svgo"; + packageName = "postcss-svgo"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-4.0.2.tgz"; + sha512 = "C6wyjo3VwFm0QgBy+Fu7gCYOkCmgmClghO+pjcxvrcBKtiKt0uCF+hvbMO1fyv5BMImRK90SMb+dwUnfbGd+jw=="; + }; + }; + "postcss-unique-selectors-4.0.1" = { + name = "postcss-unique-selectors"; + packageName = "postcss-unique-selectors"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-4.0.1.tgz"; + sha512 = "+JanVaryLo9QwZjKrmJgkI4Fn8SBgRO6WXQBJi7KiAVPlmxikB5Jzc4EvXMT2H0/m0RjrVVm9rGNhZddm/8Spg=="; + }; + }; + "postcss-value-parser-3.3.1" = { + name = "postcss-value-parser"; + packageName = "postcss-value-parser"; + version = "3.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz"; + sha512 = "pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="; + }; + }; + "postcss-value-parser-4.1.0" = { + name = "postcss-value-parser"; + packageName = "postcss-value-parser"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz"; + sha512 = "97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ=="; + }; + }; + "prelude-ls-1.1.2" = { + name = "prelude-ls"; + packageName = "prelude-ls"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz"; + sha1 = "21932a549f5e52ffd9a827f570e04be62a97da54"; + }; + }; + "prepend-http-1.0.4" = { + name = "prepend-http"; + packageName = "prepend-http"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz"; + sha1 = "d4f4562b0ce3696e41ac52d0e002e57a635dc6dc"; + }; + }; + "prettier-1.19.1" = { + name = "prettier"; + packageName = "prettier"; + version = "1.19.1"; + src = fetchurl { + url = "https://registry.npmjs.org/prettier/-/prettier-1.19.1.tgz"; + sha512 = "s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew=="; + }; + }; + "prettier-linter-helpers-1.0.0" = { + name = "prettier-linter-helpers"; + packageName = "prettier-linter-helpers"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz"; + sha512 = "GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w=="; + }; + }; + "pretty-error-2.1.1" = { + name = "pretty-error"; + packageName = "pretty-error"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pretty-error/-/pretty-error-2.1.1.tgz"; + sha1 = "5f4f87c8f91e5ae3f3ba87ab4cf5e03b1a17f1a3"; + }; + }; + "private-0.1.8" = { + name = "private"; + packageName = "private"; + version = "0.1.8"; + src = fetchurl { + url = "https://registry.npmjs.org/private/-/private-0.1.8.tgz"; + sha512 = "VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg=="; + }; + }; + "process-0.11.10" = { + name = "process"; + packageName = "process"; + version = "0.11.10"; + src = fetchurl { + url = "https://registry.npmjs.org/process/-/process-0.11.10.tgz"; + sha1 = "7332300e840161bda3e69a1d1d91a7d4bc16f182"; + }; + }; + "process-nextick-args-2.0.1" = { + name = "process-nextick-args"; + packageName = "process-nextick-args"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz"; + sha512 = "3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="; + }; + }; + "progress-2.0.3" = { + name = "progress"; + packageName = "progress"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz"; + sha512 = "7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA=="; + }; + }; + "promise-inflight-1.0.1" = { + name = "promise-inflight"; + packageName = "promise-inflight"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz"; + sha1 = "98472870bf228132fcbdd868129bad12c3c029e3"; + }; + }; + "proxy-addr-2.0.6" = { + name = "proxy-addr"; + packageName = "proxy-addr"; + version = "2.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.6.tgz"; + sha512 = "dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw=="; + }; + }; + "prr-1.0.1" = { + name = "prr"; + packageName = "prr"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz"; + sha1 = "d3fc114ba06995a45ec6893f484ceb1d78f5f476"; + }; + }; + "pseudomap-1.0.2" = { + name = "pseudomap"; + packageName = "pseudomap"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz"; + sha1 = "f052a28da70e618917ef0a8ac34c1ae5a68286b3"; + }; + }; + "psl-1.6.0" = { + name = "psl"; + packageName = "psl"; + version = "1.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/psl/-/psl-1.6.0.tgz"; + sha512 = "SYKKmVel98NCOYXpkwUqZqh0ahZeeKfmisiLIcEZdsb+WbLv02g/dI5BUmZnIyOe7RzZtLax81nnb2HbvC2tzA=="; + }; + }; + "public-encrypt-4.0.3" = { + name = "public-encrypt"; + packageName = "public-encrypt"; + version = "4.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz"; + sha512 = "zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q=="; + }; + }; + "pump-2.0.1" = { + name = "pump"; + packageName = "pump"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz"; + sha512 = "ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA=="; + }; + }; + "pump-3.0.0" = { + name = "pump"; + packageName = "pump"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz"; + sha512 = "LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww=="; + }; + }; + "pumpify-1.5.1" = { + name = "pumpify"; + packageName = "pumpify"; + version = "1.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pumpify/-/pumpify-1.5.1.tgz"; + sha512 = "oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ=="; + }; + }; + "punycode-1.3.2" = { + name = "punycode"; + packageName = "punycode"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz"; + sha1 = "9653a036fb7c1ee42342f2325cceefea3926c48d"; + }; + }; + "punycode-1.4.1" = { + name = "punycode"; + packageName = "punycode"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz"; + sha1 = "c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"; + }; + }; + "punycode-2.1.1" = { + name = "punycode"; + packageName = "punycode"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz"; + sha512 = "XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="; + }; + }; + "q-1.5.1" = { + name = "q"; + packageName = "q"; + version = "1.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/q/-/q-1.5.1.tgz"; + sha1 = "7e32f75b41381291d04611f1bf14109ac00651d7"; + }; + }; + "qs-6.5.2" = { + name = "qs"; + packageName = "qs"; + version = "6.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz"; + sha512 = "N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="; + }; + }; + "qs-6.7.0" = { + name = "qs"; + packageName = "qs"; + version = "6.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz"; + sha512 = "VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ=="; + }; + }; + "query-string-4.3.4" = { + name = "query-string"; + packageName = "query-string"; + version = "4.3.4"; + src = fetchurl { + url = "https://registry.npmjs.org/query-string/-/query-string-4.3.4.tgz"; + sha1 = "bbb693b9ca915c232515b228b1a02b609043dbeb"; + }; + }; + "querystring-0.2.0" = { + name = "querystring"; + packageName = "querystring"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz"; + sha1 = "b209849203bb25df820da756e747005878521620"; + }; + }; + "querystring-es3-0.2.1" = { + name = "querystring-es3"; + packageName = "querystring-es3"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz"; + sha1 = "9ec61f79049875707d69414596fd907a4d711e73"; + }; + }; + "querystringify-2.1.1" = { + name = "querystringify"; + packageName = "querystringify"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/querystringify/-/querystringify-2.1.1.tgz"; + sha512 = "w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA=="; + }; + }; + "randombytes-2.1.0" = { + name = "randombytes"; + packageName = "randombytes"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz"; + sha512 = "vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ=="; + }; + }; + "randomfill-1.0.4" = { + name = "randomfill"; + packageName = "randomfill"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz"; + sha512 = "87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw=="; + }; + }; + "range-parser-1.2.1" = { + name = "range-parser"; + packageName = "range-parser"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz"; + sha512 = "Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="; + }; + }; + "raw-body-2.4.0" = { + name = "raw-body"; + packageName = "raw-body"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz"; + sha512 = "4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q=="; + }; + }; + "read-pkg-1.1.0" = { + name = "read-pkg"; + packageName = "read-pkg"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz"; + sha1 = "f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28"; + }; + }; + "read-pkg-5.2.0" = { + name = "read-pkg"; + packageName = "read-pkg"; + version = "5.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz"; + sha512 = "Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg=="; + }; + }; + "read-pkg-up-1.0.1" = { + name = "read-pkg-up"; + packageName = "read-pkg-up"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz"; + sha1 = "9d63c13276c065918d57f002a57f40a1b643fb02"; + }; + }; + "readable-stream-2.3.6" = { + name = "readable-stream"; + packageName = "readable-stream"; + version = "2.3.6"; + src = fetchurl { + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz"; + sha512 = "tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw=="; + }; + }; + "readable-stream-3.6.0" = { + name = "readable-stream"; + packageName = "readable-stream"; + version = "3.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz"; + sha512 = "BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA=="; + }; + }; + "readdirp-2.2.1" = { + name = "readdirp"; + packageName = "readdirp"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz"; + sha512 = "1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ=="; + }; + }; + "readdirp-3.4.0" = { + name = "readdirp"; + packageName = "readdirp"; + version = "3.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/readdirp/-/readdirp-3.4.0.tgz"; + sha512 = "0xe001vZBnJEK+uKcj8qOhyAKPzIT+gStxWr3LCB0DwcXR5NZJ3IaC+yGnHCYzB/S7ov3m3EEbZI2zeNvX+hGQ=="; + }; + }; + "redent-1.0.0" = { + name = "redent"; + packageName = "redent"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz"; + sha1 = "cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde"; + }; + }; + "regenerate-1.4.1" = { + name = "regenerate"; + packageName = "regenerate"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/regenerate/-/regenerate-1.4.1.tgz"; + sha512 = "j2+C8+NtXQgEKWk49MMP5P/u2GhnahTtVkRIHr5R5lVRlbKvmQ+oS+A5aLKWp2ma5VkT8sh6v+v4hbH0YHR66A=="; + }; + }; + "regenerate-unicode-properties-8.2.0" = { + name = "regenerate-unicode-properties"; + packageName = "regenerate-unicode-properties"; + version = "8.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz"; + sha512 = "F9DjY1vKLo/tPePDycuH3dn9H1OTPIkVD9Kz4LODu+F2C75mgjAJ7x/gwy6ZcSNRAAkhNlJSOHRe8k3p+K9WhA=="; + }; + }; + "regenerator-runtime-0.13.5" = { + name = "regenerator-runtime"; + packageName = "regenerator-runtime"; + version = "0.13.5"; + src = fetchurl { + url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz"; + sha512 = "ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA=="; + }; + }; + "regenerator-transform-0.14.4" = { + name = "regenerator-transform"; + packageName = "regenerator-transform"; + version = "0.14.4"; + src = fetchurl { + url = "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.14.4.tgz"; + sha512 = "EaJaKPBI9GvKpvUz2mz4fhx7WPgvwRLY9v3hlNHWmAuJHI13T4nwKnNvm5RWJzEdnI5g5UwtOww+S8IdoUC2bw=="; + }; + }; + "regex-not-1.0.2" = { + name = "regex-not"; + packageName = "regex-not"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz"; + sha512 = "J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A=="; + }; + }; + "regexp.prototype.flags-1.3.0" = { + name = "regexp.prototype.flags"; + packageName = "regexp.prototype.flags"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.3.0.tgz"; + sha512 = "2+Q0C5g951OlYlJz6yu5/M33IcsESLlLfsyIaLJaG4FA2r4yP8MvVMJUUP/fVBkSpbbbZlS5gynbEWLipiiXiQ=="; + }; + }; + "regexpp-2.0.1" = { + name = "regexpp"; + packageName = "regexpp"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/regexpp/-/regexpp-2.0.1.tgz"; + sha512 = "lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw=="; + }; + }; + "regexpp-3.1.0" = { + name = "regexpp"; + packageName = "regexpp"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/regexpp/-/regexpp-3.1.0.tgz"; + sha512 = "ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q=="; + }; + }; + "regexpu-core-4.7.0" = { + name = "regexpu-core"; + packageName = "regexpu-core"; + version = "4.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.7.0.tgz"; + sha512 = "TQ4KXRnIn6tz6tjnrXEkD/sshygKH/j5KzK86X8MkeHyZ8qst/LZ89j3X4/8HEIfHANTFIP/AbXakeRhWIl5YQ=="; + }; + }; + "regjsgen-0.5.2" = { + name = "regjsgen"; + packageName = "regjsgen"; + version = "0.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/regjsgen/-/regjsgen-0.5.2.tgz"; + sha512 = "OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A=="; + }; + }; + "regjsparser-0.6.4" = { + name = "regjsparser"; + packageName = "regjsparser"; + version = "0.6.4"; + src = fetchurl { + url = "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.4.tgz"; + sha512 = "64O87/dPDgfk8/RQqC4gkZoGyyWFIEUTTh80CU6CWuK5vkCGyekIx+oKcEIYtP/RAxSQltCZHCNu/mdd7fqlJw=="; + }; + }; + "relateurl-0.2.7" = { + name = "relateurl"; + packageName = "relateurl"; + version = "0.2.7"; + src = fetchurl { + url = "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz"; + sha1 = "54dbf377e51440aca90a4cd274600d3ff2d888a9"; + }; + }; + "remove-trailing-separator-1.1.0" = { + name = "remove-trailing-separator"; + packageName = "remove-trailing-separator"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz"; + sha1 = "c24bce2a283adad5bc3f58e0d48249b92379d8ef"; + }; + }; + "renderkid-2.0.3" = { + name = "renderkid"; + packageName = "renderkid"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/renderkid/-/renderkid-2.0.3.tgz"; + sha512 = "z8CLQp7EZBPCwCnncgf9C4XAi3WR0dv+uWu/PjIyhhAb5d6IJ/QZqlHFprHeKT+59//V6BNUsLbvN8+2LarxGA=="; + }; + }; + "repeat-element-1.1.3" = { + name = "repeat-element"; + packageName = "repeat-element"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.3.tgz"; + sha512 = "ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g=="; + }; + }; + "repeat-string-1.6.1" = { + name = "repeat-string"; + packageName = "repeat-string"; + version = "1.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz"; + sha1 = "8dcae470e1c88abc2d600fff4a776286da75e637"; + }; + }; + "repeating-2.0.1" = { + name = "repeating"; + packageName = "repeating"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz"; + sha1 = "5214c53a926d3552707527fbab415dbc08d06dda"; + }; + }; + "request-2.88.2" = { + name = "request"; + packageName = "request"; + version = "2.88.2"; + src = fetchurl { + url = "https://registry.npmjs.org/request/-/request-2.88.2.tgz"; + sha512 = "MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw=="; + }; + }; + "require-directory-2.1.1" = { + name = "require-directory"; + packageName = "require-directory"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz"; + sha1 = "8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"; + }; + }; + "require-main-filename-2.0.0" = { + name = "require-main-filename"; + packageName = "require-main-filename"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz"; + sha512 = "NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg=="; + }; + }; + "requires-port-1.0.0" = { + name = "requires-port"; + packageName = "requires-port"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz"; + sha1 = "925d2601d39ac485e091cf0da5c6e694dc3dcaff"; + }; + }; + "resize-observer-polyfill-1.5.1" = { + name = "resize-observer-polyfill"; + packageName = "resize-observer-polyfill"; + version = "1.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz"; + sha512 = "LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg=="; + }; + }; + "resolve-1.14.1" = { + name = "resolve"; + packageName = "resolve"; + version = "1.14.1"; + src = fetchurl { + url = "https://registry.npmjs.org/resolve/-/resolve-1.14.1.tgz"; + sha512 = "fn5Wobh4cxbLzuHaE+nphztHy43/b++4M6SsGFC2gB8uYwf0C8LcarfCz1un7UTW8OFQg9iNjZ4xpcFVGebDPg=="; + }; + }; + "resolve-cwd-2.0.0" = { + name = "resolve-cwd"; + packageName = "resolve-cwd"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-2.0.0.tgz"; + sha1 = "00a9f7387556e27038eae232caa372a6a59b665a"; + }; + }; + "resolve-from-3.0.0" = { + name = "resolve-from"; + packageName = "resolve-from"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz"; + sha1 = "b22c7af7d9d6881bc8b6e653335eebcb0a188748"; + }; + }; + "resolve-from-4.0.0" = { + name = "resolve-from"; + packageName = "resolve-from"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz"; + sha512 = "pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g=="; + }; + }; + "resolve-url-0.2.1" = { + name = "resolve-url"; + packageName = "resolve-url"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz"; + sha1 = "2c637fe77c893afd2a663fe21aa9080068e2052a"; + }; + }; + "restore-cursor-2.0.0" = { + name = "restore-cursor"; + packageName = "restore-cursor"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz"; + sha1 = "9f7ee287f82fd326d4fd162923d62129eee0dfaf"; + }; + }; + "restore-cursor-3.1.0" = { + name = "restore-cursor"; + packageName = "restore-cursor"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz"; + sha512 = "l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA=="; + }; + }; + "ret-0.1.15" = { + name = "ret"; + packageName = "ret"; + version = "0.1.15"; + src = fetchurl { + url = "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz"; + sha512 = "TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg=="; + }; + }; + "retry-0.12.0" = { + name = "retry"; + packageName = "retry"; + version = "0.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz"; + sha1 = "1b42a6266a21f07421d1b0b54b7dc167b01c013b"; + }; + }; + "rgb-regex-1.0.1" = { + name = "rgb-regex"; + packageName = "rgb-regex"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/rgb-regex/-/rgb-regex-1.0.1.tgz"; + sha1 = "c0e0d6882df0e23be254a475e8edd41915feaeb1"; + }; + }; + "rgba-regex-1.0.0" = { + name = "rgba-regex"; + packageName = "rgba-regex"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/rgba-regex/-/rgba-regex-1.0.0.tgz"; + sha1 = "43374e2e2ca0968b0ef1523460b7d730ff22eeb3"; + }; + }; + "rimraf-2.6.3" = { + name = "rimraf"; + packageName = "rimraf"; + version = "2.6.3"; + src = fetchurl { + url = "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz"; + sha512 = "mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA=="; + }; + }; + "rimraf-2.7.1" = { + name = "rimraf"; + packageName = "rimraf"; + version = "2.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz"; + sha512 = "uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w=="; + }; + }; + "rimraf-3.0.2" = { + name = "rimraf"; + packageName = "rimraf"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz"; + sha512 = "JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA=="; + }; + }; + "ripemd160-2.0.2" = { + name = "ripemd160"; + packageName = "ripemd160"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz"; + sha512 = "ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA=="; + }; + }; + "run-async-2.3.0" = { + name = "run-async"; + packageName = "run-async"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz"; + sha1 = "0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0"; + }; + }; + "run-async-2.4.1" = { + name = "run-async"; + packageName = "run-async"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz"; + sha512 = "tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ=="; + }; + }; + "run-queue-1.0.3" = { + name = "run-queue"; + packageName = "run-queue"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/run-queue/-/run-queue-1.0.3.tgz"; + sha1 = "e848396f057d223f24386924618e25694161ec47"; + }; + }; + "rxjs-6.5.3" = { + name = "rxjs"; + packageName = "rxjs"; + version = "6.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/rxjs/-/rxjs-6.5.3.tgz"; + sha512 = "wuYsAYYFdWTAnAaPoKGNhfpWwKZbJW+HgAJ+mImp+Epl7BG8oNWBCTyRM8gba9k4lk8BgWdoYm21Mo/RYhhbgA=="; + }; + }; + "safe-buffer-5.1.2" = { + name = "safe-buffer"; + packageName = "safe-buffer"; + version = "5.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz"; + sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="; + }; + }; + "safe-regex-1.1.0" = { + name = "safe-regex"; + packageName = "safe-regex"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz"; + sha1 = "40a3669f3b077d1e943d44629e157dd48023bf2e"; + }; + }; + "safer-buffer-2.1.2" = { + name = "safer-buffer"; + packageName = "safer-buffer"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz"; + sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; + }; + }; + "sass-graph-2.2.5" = { + name = "sass-graph"; + packageName = "sass-graph"; + version = "2.2.5"; + src = fetchurl { + url = "https://registry.npmjs.org/sass-graph/-/sass-graph-2.2.5.tgz"; + sha512 = "VFWDAHOe6mRuT4mZRd4eKE+d8Uedrk6Xnh7Sh9b4NGufQLQjOrvf/MQoOdx+0s92L89FeyUUNfU597j/3uNpag=="; + }; + }; + "sass-loader-8.0.2" = { + name = "sass-loader"; + packageName = "sass-loader"; + version = "8.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/sass-loader/-/sass-loader-8.0.2.tgz"; + sha512 = "7o4dbSK8/Ol2KflEmSco4jTjQoV988bM82P9CZdmo9hR3RLnvNc0ufMNdMrB0caq38JQ/FgF4/7RcbcfKzxoFQ=="; + }; + }; + "sax-1.2.4" = { + name = "sax"; + packageName = "sax"; + version = "1.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz"; + sha512 = "NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="; + }; + }; + "schema-utils-1.0.0" = { + name = "schema-utils"; + packageName = "schema-utils"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz"; + sha512 = "i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g=="; + }; + }; + "schema-utils-2.6.1" = { + name = "schema-utils"; + packageName = "schema-utils"; + version = "2.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/schema-utils/-/schema-utils-2.6.1.tgz"; + sha512 = "0WXHDs1VDJyo+Zqs9TKLKyD/h7yDpHUhEFsM2CzkICFdoX1av+GBq/J2xRTFfsQO5kBfhZzANf2VcIm84jqDbg=="; + }; + }; + "schema-utils-2.7.0" = { + name = "schema-utils"; + packageName = "schema-utils"; + version = "2.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.0.tgz"; + sha512 = "0ilKFI6QQF5nxDZLFn2dMjvc4hjg/Wkg7rHd3jK6/A4a1Hl9VFdQWvgB1UMGoU94pad1P/8N7fMcEnLnSiju8A=="; + }; + }; + "scss-tokenizer-0.2.3" = { + name = "scss-tokenizer"; + packageName = "scss-tokenizer"; + version = "0.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz"; + sha1 = "8eb06db9a9723333824d3f5530641149847ce5d1"; + }; + }; + "select-hose-2.0.0" = { + name = "select-hose"; + packageName = "select-hose"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz"; + sha1 = "625d8658f865af43ec962bfc376a37359a4994ca"; + }; + }; + "selfsigned-1.10.7" = { + name = "selfsigned"; + packageName = "selfsigned"; + version = "1.10.7"; + src = fetchurl { + url = "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.7.tgz"; + sha512 = "8M3wBCzeWIJnQfl43IKwOmC4H/RAp50S8DF60znzjW5GVqTcSe2vWclt7hmYVPkKPlHWOu5EaWOMZ2Y6W8ZXTA=="; + }; + }; + "semver-5.3.0" = { + name = "semver"; + packageName = "semver"; + version = "5.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz"; + sha1 = "9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"; + }; + }; + "semver-5.7.1" = { + name = "semver"; + packageName = "semver"; + version = "5.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz"; + sha512 = "sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="; + }; + }; + "semver-6.3.0" = { + name = "semver"; + packageName = "semver"; + version = "6.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz"; + sha512 = "b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="; + }; + }; + "semver-7.0.0" = { + name = "semver"; + packageName = "semver"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz"; + sha512 = "+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A=="; + }; + }; + "semver-7.3.2" = { + name = "semver"; + packageName = "semver"; + version = "7.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz"; + sha512 = "OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ=="; + }; + }; + "send-0.17.1" = { + name = "send"; + packageName = "send"; + version = "0.17.1"; + src = fetchurl { + url = "https://registry.npmjs.org/send/-/send-0.17.1.tgz"; + sha512 = "BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg=="; + }; + }; + "serialize-javascript-2.1.2" = { + name = "serialize-javascript"; + packageName = "serialize-javascript"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-2.1.2.tgz"; + sha512 = "rs9OggEUF0V4jUSecXazOYsLfu7OGK2qIn3c7IPBiffz32XniEp/TX9Xmc9LQfK2nQ2QKHvZ2oygKUGU0lG4jQ=="; + }; + }; + "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=="; + }; + }; + "serve-index-1.9.1" = { + name = "serve-index"; + packageName = "serve-index"; + version = "1.9.1"; + src = fetchurl { + url = "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz"; + sha1 = "d3768d69b1e7d82e5ce050fff5b453bea12a9239"; + }; + }; + "serve-static-1.14.1" = { + name = "serve-static"; + packageName = "serve-static"; + version = "1.14.1"; + src = fetchurl { + url = "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz"; + sha512 = "JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg=="; + }; + }; + "set-blocking-2.0.0" = { + name = "set-blocking"; + packageName = "set-blocking"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz"; + sha1 = "045f9782d011ae9a6803ddd382b24392b3d890f7"; + }; + }; + "set-value-2.0.1" = { + name = "set-value"; + packageName = "set-value"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz"; + sha512 = "JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw=="; + }; + }; + "setimmediate-1.0.5" = { + name = "setimmediate"; + packageName = "setimmediate"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz"; + sha1 = "290cbb232e306942d7d7ea9b83732ab7856f8285"; + }; + }; + "setprototypeof-1.1.0" = { + name = "setprototypeof"; + packageName = "setprototypeof"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz"; + sha512 = "BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ=="; + }; + }; + "setprototypeof-1.1.1" = { + name = "setprototypeof"; + packageName = "setprototypeof"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz"; + sha512 = "JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw=="; + }; + }; + "sha.js-2.4.11" = { + name = "sha.js"; + packageName = "sha.js"; + version = "2.4.11"; + src = fetchurl { + url = "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz"; + sha512 = "QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ=="; + }; + }; + "shallow-clone-3.0.1" = { + name = "shallow-clone"; + packageName = "shallow-clone"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz"; + sha512 = "/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA=="; + }; + }; + "shebang-command-1.2.0" = { + name = "shebang-command"; + packageName = "shebang-command"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz"; + sha1 = "44aac65b695b03398968c39f363fee5deafdf1ea"; + }; + }; + "shebang-command-2.0.0" = { + name = "shebang-command"; + packageName = "shebang-command"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz"; + sha512 = "kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA=="; + }; + }; + "shebang-regex-1.0.0" = { + name = "shebang-regex"; + packageName = "shebang-regex"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz"; + sha1 = "da42f49740c0b42db2ca9728571cb190c98efea3"; + }; + }; + "shebang-regex-3.0.0" = { + name = "shebang-regex"; + packageName = "shebang-regex"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz"; + sha512 = "7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="; + }; + }; + "shell-quote-1.7.2" = { + name = "shell-quote"; + packageName = "shell-quote"; + version = "1.7.2"; + src = fetchurl { + url = "https://registry.npmjs.org/shell-quote/-/shell-quote-1.7.2.tgz"; + sha512 = "mRz/m/JVscCrkMyPqHc/bczi3OQHkLTqXHEFu0zDhK/qfv3UcOA4SVmRCLmos4bhjr9ekVQubj/R7waKapmiQg=="; + }; + }; + "signal-exit-3.0.2" = { + name = "signal-exit"; + packageName = "signal-exit"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz"; + sha1 = "b5fdc08f1287ea1178628e415e25132b73646c6d"; + }; + }; + "simple-swizzle-0.2.2" = { + name = "simple-swizzle"; + packageName = "simple-swizzle"; + version = "0.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz"; + sha1 = "a4da6b635ffcccca33f70d17cb92592de95e557a"; + }; + }; + "slash-1.0.0" = { + name = "slash"; + packageName = "slash"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz"; + sha1 = "c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"; + }; + }; + "slash-2.0.0" = { + name = "slash"; + packageName = "slash"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz"; + sha512 = "ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A=="; + }; + }; + "slice-ansi-2.1.0" = { + name = "slice-ansi"; + packageName = "slice-ansi"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/slice-ansi/-/slice-ansi-2.1.0.tgz"; + sha512 = "Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ=="; + }; + }; + "snapdragon-0.8.2" = { + name = "snapdragon"; + packageName = "snapdragon"; + version = "0.8.2"; + src = fetchurl { + url = "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz"; + sha512 = "FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg=="; + }; + }; + "snapdragon-node-2.1.1" = { + name = "snapdragon-node"; + packageName = "snapdragon-node"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz"; + sha512 = "O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw=="; + }; + }; + "snapdragon-util-3.0.1" = { + name = "snapdragon-util"; + packageName = "snapdragon-util"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz"; + sha512 = "mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ=="; + }; + }; + "sockjs-0.3.20" = { + name = "sockjs"; + packageName = "sockjs"; + version = "0.3.20"; + src = fetchurl { + url = "https://registry.npmjs.org/sockjs/-/sockjs-0.3.20.tgz"; + sha512 = "SpmVOVpdq0DJc0qArhF3E5xsxvaiqGNb73XfgBpK1y3UD5gs8DSo8aCTsuT5pX8rssdc2NDIzANwP9eCAiSdTA=="; + }; + }; + "sockjs-client-1.4.0" = { + name = "sockjs-client"; + packageName = "sockjs-client"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.4.0.tgz"; + sha512 = "5zaLyO8/nri5cua0VtOrFXBPK1jbL4+1cebT/mmKA1E1ZXOvJrII75bPu0l0k843G/+iAbhEqzyKr0w/eCCj7g=="; + }; + }; + "sort-keys-1.1.2" = { + name = "sort-keys"; + packageName = "sort-keys"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/sort-keys/-/sort-keys-1.1.2.tgz"; + sha1 = "441b6d4d346798f1b4e49e8920adfba0e543f9ad"; + }; + }; + "source-list-map-2.0.1" = { + name = "source-list-map"; + packageName = "source-list-map"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz"; + sha512 = "qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw=="; + }; + }; + "source-map-0.4.4" = { + name = "source-map"; + packageName = "source-map"; + version = "0.4.4"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz"; + sha1 = "eba4f5da9c0dc999de68032d8b4f76173652036b"; + }; + }; + "source-map-0.5.7" = { + name = "source-map"; + packageName = "source-map"; + version = "0.5.7"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz"; + sha1 = "8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"; + }; + }; + "source-map-0.6.1" = { + name = "source-map"; + packageName = "source-map"; + version = "0.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz"; + sha512 = "UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="; + }; + }; + "source-map-0.7.3" = { + name = "source-map"; + packageName = "source-map"; + version = "0.7.3"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz"; + sha512 = "CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ=="; + }; + }; + "source-map-resolve-0.5.3" = { + name = "source-map-resolve"; + packageName = "source-map-resolve"; + version = "0.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz"; + sha512 = "Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw=="; + }; + }; + "source-map-support-0.5.16" = { + name = "source-map-support"; + packageName = "source-map-support"; + version = "0.5.16"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.16.tgz"; + sha512 = "efyLRJDr68D9hBBNIPWFjhpFzURh+KJykQwvMyW5UiZzYwoF6l4YMMDIJJEyFWxWCqfyxLzz6tSfUFR+kXXsVQ=="; + }; + }; + "source-map-url-0.4.0" = { + name = "source-map-url"; + packageName = "source-map-url"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz"; + sha1 = "3e935d7ddd73631b97659956d55128e87b5084a3"; + }; + }; + "spdx-correct-3.1.0" = { + name = "spdx-correct"; + packageName = "spdx-correct"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.0.tgz"; + sha512 = "lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q=="; + }; + }; + "spdx-exceptions-2.2.0" = { + name = "spdx-exceptions"; + packageName = "spdx-exceptions"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz"; + sha512 = "2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA=="; + }; + }; + "spdx-expression-parse-3.0.0" = { + name = "spdx-expression-parse"; + packageName = "spdx-expression-parse"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz"; + sha512 = "Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg=="; + }; + }; + "spdx-license-ids-3.0.5" = { + name = "spdx-license-ids"; + packageName = "spdx-license-ids"; + version = "3.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz"; + sha512 = "J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q=="; + }; + }; + "spdy-4.0.2" = { + name = "spdy"; + packageName = "spdy"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/spdy/-/spdy-4.0.2.tgz"; + sha512 = "r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA=="; + }; + }; + "spdy-transport-3.0.0" = { + name = "spdy-transport"; + packageName = "spdy-transport"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz"; + sha512 = "hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw=="; + }; + }; + "split-string-3.1.0" = { + name = "split-string"; + packageName = "split-string"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz"; + sha512 = "NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw=="; + }; + }; + "sprintf-js-1.0.3" = { + name = "sprintf-js"; + packageName = "sprintf-js"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz"; + sha1 = "04e6926f662895354f3dd015203633b857297e2c"; + }; + }; + "sshpk-1.16.1" = { + name = "sshpk"; + packageName = "sshpk"; + version = "1.16.1"; + src = fetchurl { + url = "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz"; + sha512 = "HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg=="; + }; + }; + "ssri-6.0.1" = { + name = "ssri"; + packageName = "ssri"; + version = "6.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz"; + sha512 = "3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA=="; + }; + }; + "ssri-7.1.0" = { + name = "ssri"; + packageName = "ssri"; + version = "7.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ssri/-/ssri-7.1.0.tgz"; + sha512 = "77/WrDZUWocK0mvA5NTRQyveUf+wsrIc6vyrxpS8tVvYBcX215QbafrJR3KtkpskIzoFLqqNuuYQvxaMjXJ/0g=="; + }; + }; + "stable-0.1.8" = { + name = "stable"; + packageName = "stable"; + version = "0.1.8"; + src = fetchurl { + url = "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz"; + sha512 = "ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w=="; + }; + }; + "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=="; + }; + }; + "static-extend-0.1.2" = { + name = "static-extend"; + packageName = "static-extend"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz"; + sha1 = "60809c39cbff55337226fd5e0b520f341f1fb5c6"; + }; + }; + "statuses-1.5.0" = { + name = "statuses"; + packageName = "statuses"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz"; + sha1 = "161c7dac177659fd9811f43771fa99381478628c"; + }; + }; + "stdout-stream-1.4.1" = { + name = "stdout-stream"; + packageName = "stdout-stream"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/stdout-stream/-/stdout-stream-1.4.1.tgz"; + sha512 = "j4emi03KXqJWcIeF8eIXkjMFN1Cmb8gUlDYGeBALLPo5qdyTfA9bOtl8m33lRoC+vFMkP3gl0WsDr6+gzxbbTA=="; + }; + }; + "stream-browserify-2.0.2" = { + name = "stream-browserify"; + packageName = "stream-browserify"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.2.tgz"; + sha512 = "nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg=="; + }; + }; + "stream-each-1.2.3" = { + name = "stream-each"; + packageName = "stream-each"; + version = "1.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-each/-/stream-each-1.2.3.tgz"; + sha512 = "vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw=="; + }; + }; + "stream-http-2.8.3" = { + name = "stream-http"; + packageName = "stream-http"; + version = "2.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-http/-/stream-http-2.8.3.tgz"; + sha512 = "+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw=="; + }; + }; + "stream-shift-1.0.1" = { + name = "stream-shift"; + packageName = "stream-shift"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.1.tgz"; + sha512 = "AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ=="; + }; + }; + "strict-uri-encode-1.1.0" = { + name = "strict-uri-encode"; + packageName = "strict-uri-encode"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz"; + sha1 = "279b225df1d582b1f54e65addd4352e18faa0713"; + }; + }; + "string-width-1.0.2" = { + name = "string-width"; + packageName = "string-width"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz"; + sha1 = "118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"; + }; + }; + "string-width-2.1.1" = { + name = "string-width"; + packageName = "string-width"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz"; + sha512 = "nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw=="; + }; + }; + "string-width-3.1.0" = { + name = "string-width"; + packageName = "string-width"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz"; + sha512 = "vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w=="; + }; + }; + "string-width-4.2.0" = { + name = "string-width"; + packageName = "string-width"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz"; + sha512 = "zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg=="; + }; + }; + "string.prototype.trimend-1.0.1" = { + name = "string.prototype.trimend"; + packageName = "string.prototype.trimend"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz"; + sha512 = "LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g=="; + }; + }; + "string.prototype.trimleft-2.1.1" = { + name = "string.prototype.trimleft"; + packageName = "string.prototype.trimleft"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.1.tgz"; + sha512 = "iu2AGd3PuP5Rp7x2kEZCrB2Nf41ehzh+goo8TV7z8/XDBbsvc6HQIlUl9RjkZ4oyrW1XM5UwlGl1oVEaDjg6Ag=="; + }; + }; + "string.prototype.trimright-2.1.1" = { + name = "string.prototype.trimright"; + packageName = "string.prototype.trimright"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.1.tgz"; + sha512 = "qFvWL3/+QIgZXVmJBfpHmxLB7xsUXz6HsUmP8+5dRaC3Q7oKUv9Vo6aMCRZC1smrtyECFsIT30PqBJ1gTjAs+g=="; + }; + }; + "string.prototype.trimstart-1.0.1" = { + name = "string.prototype.trimstart"; + packageName = "string.prototype.trimstart"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz"; + sha512 = "XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw=="; + }; + }; + "string_decoder-1.1.1" = { + name = "string_decoder"; + packageName = "string_decoder"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz"; + sha512 = "n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg=="; + }; + }; + "strip-ansi-3.0.1" = { + name = "strip-ansi"; + packageName = "strip-ansi"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz"; + sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"; + }; + }; + "strip-ansi-4.0.0" = { + name = "strip-ansi"; + packageName = "strip-ansi"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz"; + sha1 = "a8479022eb1ac368a871389b635262c505ee368f"; + }; + }; + "strip-ansi-5.2.0" = { + name = "strip-ansi"; + packageName = "strip-ansi"; + version = "5.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz"; + sha512 = "DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA=="; + }; + }; + "strip-ansi-6.0.0" = { + name = "strip-ansi"; + packageName = "strip-ansi"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz"; + sha512 = "AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w=="; + }; + }; + "strip-bom-2.0.0" = { + name = "strip-bom"; + packageName = "strip-bom"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz"; + sha1 = "6219a85616520491f35788bdbf1447a99c7e6b0e"; + }; + }; + "strip-eof-1.0.0" = { + name = "strip-eof"; + packageName = "strip-eof"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz"; + sha1 = "bb43ff5598a6eb05d89b59fcd129c983313606bf"; + }; + }; + "strip-final-newline-2.0.0" = { + name = "strip-final-newline"; + packageName = "strip-final-newline"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz"; + sha512 = "BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA=="; + }; + }; + "strip-indent-1.0.1" = { + name = "strip-indent"; + packageName = "strip-indent"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz"; + sha1 = "0c7962a6adefa7bbd4ac366460a638552ae1a0a2"; + }; + }; + "strip-indent-2.0.0" = { + name = "strip-indent"; + packageName = "strip-indent"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-indent/-/strip-indent-2.0.0.tgz"; + sha1 = "5ef8db295d01e6ed6cbf7aab96998d7822527b68"; + }; + }; + "strip-json-comments-3.0.1" = { + name = "strip-json-comments"; + packageName = "strip-json-comments"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.0.1.tgz"; + sha512 = "VTyMAUfdm047mwKl+u79WIdrZxtFtn+nBxHeb844XBQ9uMNTuTHdx2hc5RiAJYqwTj3wc/xe5HLSdJSkJ+WfZw=="; + }; + }; + "stylehacks-4.0.3" = { + name = "stylehacks"; + packageName = "stylehacks"; + version = "4.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/stylehacks/-/stylehacks-4.0.3.tgz"; + sha512 = "7GlLk9JwlElY4Y6a/rmbH2MhVlTyVmiJd1PfTCqFaIBEGMYNsrO/v3SeGTdhBThLg4Z+NbOk/qFMwCa+J+3p/g=="; + }; + }; + "supports-color-2.0.0" = { + name = "supports-color"; + packageName = "supports-color"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz"; + sha1 = "535d045ce6b6363fa40117084629995e9df324c7"; + }; + }; + "supports-color-5.5.0" = { + name = "supports-color"; + packageName = "supports-color"; + version = "5.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz"; + sha512 = "QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow=="; + }; + }; + "supports-color-6.1.0" = { + name = "supports-color"; + packageName = "supports-color"; + version = "6.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz"; + sha512 = "qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ=="; + }; + }; + "supports-color-7.1.0" = { + name = "supports-color"; + packageName = "supports-color"; + version = "7.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz"; + sha512 = "oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g=="; + }; + }; + "svg-tags-1.0.0" = { + name = "svg-tags"; + packageName = "svg-tags"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/svg-tags/-/svg-tags-1.0.0.tgz"; + sha1 = "58f71cee3bd519b59d4b2a843b6c7de64ac04764"; + }; + }; + "svgo-1.3.2" = { + name = "svgo"; + packageName = "svgo"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/svgo/-/svgo-1.3.2.tgz"; + sha512 = "yhy/sQYxR5BkC98CY7o31VGsg014AKLEPxdfhora76l36hD9Rdy5NZA/Ocn6yayNPgSamYdtX2rFJdcv07AYVw=="; + }; + }; + "table-5.4.6" = { + name = "table"; + packageName = "table"; + version = "5.4.6"; + src = fetchurl { + url = "https://registry.npmjs.org/table/-/table-5.4.6.tgz"; + sha512 = "wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug=="; + }; + }; + "tapable-1.1.3" = { + name = "tapable"; + packageName = "tapable"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/tapable/-/tapable-1.1.3.tgz"; + sha512 = "4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA=="; + }; + }; + "tar-2.2.2" = { + name = "tar"; + packageName = "tar"; + version = "2.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/tar/-/tar-2.2.2.tgz"; + sha512 = "FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA=="; + }; + }; + "terser-4.6.10" = { + name = "terser"; + packageName = "terser"; + version = "4.6.10"; + src = fetchurl { + url = "https://registry.npmjs.org/terser/-/terser-4.6.10.tgz"; + sha512 = "qbF/3UOo11Hggsbsqm2hPa6+L4w7bkr+09FNseEe8xrcVD3APGLFqE+Oz1ZKAxjYnFsj80rLOfgAtJ0LNJjtTA=="; + }; + }; + "terser-4.8.0" = { + name = "terser"; + packageName = "terser"; + version = "4.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/terser/-/terser-4.8.0.tgz"; + sha512 = "EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw=="; + }; + }; + "terser-webpack-plugin-1.4.3" = { + name = "terser-webpack-plugin"; + packageName = "terser-webpack-plugin"; + version = "1.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.4.3.tgz"; + sha512 = "QMxecFz/gHQwteWwSo5nTc6UaICqN1bMedC5sMtUc7y3Ha3Q8y6ZO0iCR8pq4RJC8Hjf0FEPEHZqcMB/+DFCrA=="; + }; + }; + "terser-webpack-plugin-2.3.7" = { + name = "terser-webpack-plugin"; + packageName = "terser-webpack-plugin"; + version = "2.3.7"; + src = fetchurl { + url = "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-2.3.7.tgz"; + sha512 = "xzYyaHUNhzgaAdBsXxk2Yvo/x1NJdslUaussK3fdpBbvttm1iIwU+c26dj9UxJcwk2c5UWt5F55MUTIA8BE7Dg=="; + }; + }; + "text-table-0.2.0" = { + name = "text-table"; + packageName = "text-table"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz"; + sha1 = "7f5ee823ae805207c00af2df4a84ec3fcfa570b4"; + }; + }; + "thenify-3.3.1" = { + name = "thenify"; + packageName = "thenify"; + version = "3.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/thenify/-/thenify-3.3.1.tgz"; + sha512 = "RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw=="; + }; + }; + "thenify-all-1.6.0" = { + name = "thenify-all"; + packageName = "thenify-all"; + version = "1.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz"; + sha1 = "1a1918d402d8fc3f98fbf234db0bcc8cc10e9726"; + }; + }; + "thread-loader-2.1.3" = { + name = "thread-loader"; + packageName = "thread-loader"; + version = "2.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/thread-loader/-/thread-loader-2.1.3.tgz"; + sha512 = "wNrVKH2Lcf8ZrWxDF/khdlLlsTMczdcwPA9VEK4c2exlEPynYWxi9op3nPTo5lAnDIkE0rQEB3VBP+4Zncc9Hg=="; + }; + }; + "through-2.3.8" = { + name = "through"; + packageName = "through"; + version = "2.3.8"; + src = fetchurl { + url = "https://registry.npmjs.org/through/-/through-2.3.8.tgz"; + sha1 = "0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"; + }; + }; + "through2-2.0.5" = { + name = "through2"; + packageName = "through2"; + version = "2.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz"; + sha512 = "/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ=="; + }; + }; + "thunky-1.1.0" = { + name = "thunky"; + packageName = "thunky"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz"; + sha512 = "eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA=="; + }; + }; + "timers-browserify-2.0.11" = { + name = "timers-browserify"; + packageName = "timers-browserify"; + version = "2.0.11"; + src = fetchurl { + url = "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.11.tgz"; + sha512 = "60aV6sgJ5YEbzUdn9c8kYGIqOubPoUdqQCul3SBAsRCZ40s6Y5cMcrW4dt3/k/EsbLVJNl9n6Vz3fTc+k2GeKQ=="; + }; + }; + "timsort-0.3.0" = { + name = "timsort"; + packageName = "timsort"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/timsort/-/timsort-0.3.0.tgz"; + sha1 = "405411a8e7e6339fe64db9a234de11dc31e02bd4"; + }; + }; + "tmp-0.0.33" = { + name = "tmp"; + packageName = "tmp"; + version = "0.0.33"; + src = fetchurl { + url = "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz"; + sha512 = "jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw=="; + }; + }; + "to-arraybuffer-1.0.1" = { + name = "to-arraybuffer"; + packageName = "to-arraybuffer"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz"; + sha1 = "7d229b1fcc637e466ca081180836a7aabff83f43"; + }; + }; + "to-fast-properties-2.0.0" = { + name = "to-fast-properties"; + packageName = "to-fast-properties"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz"; + sha1 = "dc5e698cbd079265bc73e0377681a4e4e83f616e"; + }; + }; + "to-object-path-0.3.0" = { + name = "to-object-path"; + packageName = "to-object-path"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz"; + sha1 = "297588b7b0e7e0ac08e04e672f85c1f4999e17af"; + }; + }; + "to-regex-3.0.2" = { + name = "to-regex"; + packageName = "to-regex"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz"; + sha512 = "FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw=="; + }; + }; + "to-regex-range-2.1.1" = { + name = "to-regex-range"; + packageName = "to-regex-range"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz"; + sha1 = "7c80c17b9dfebe599e27367e0d4dd5590141db38"; + }; + }; + "to-regex-range-5.0.1" = { + name = "to-regex-range"; + packageName = "to-regex-range"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz"; + sha512 = "65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ=="; + }; + }; + "toidentifier-1.0.0" = { + name = "toidentifier"; + packageName = "toidentifier"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz"; + sha512 = "yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw=="; + }; + }; + "toposort-1.0.7" = { + name = "toposort"; + packageName = "toposort"; + version = "1.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/toposort/-/toposort-1.0.7.tgz"; + sha1 = "2e68442d9f64ec720b8cc89e6443ac6caa950029"; + }; + }; + "tough-cookie-2.5.0" = { + name = "tough-cookie"; + packageName = "tough-cookie"; + version = "2.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz"; + sha512 = "nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g=="; + }; + }; + "trim-newlines-1.0.0" = { + name = "trim-newlines"; + packageName = "trim-newlines"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz"; + sha1 = "5887966bb582a4503a41eb524f7d35011815a613"; + }; + }; + "true-case-path-1.0.3" = { + name = "true-case-path"; + packageName = "true-case-path"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/true-case-path/-/true-case-path-1.0.3.tgz"; + sha512 = "m6s2OdQe5wgpFMC+pAJ+q9djG82O2jcHPOI6RNg1yy9rCYR+WD6Nbpl32fDpfC56nirdRy+opFa/Vk7HYhqaew=="; + }; + }; + "tryer-1.0.1" = { + name = "tryer"; + packageName = "tryer"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/tryer/-/tryer-1.0.1.tgz"; + sha512 = "c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA=="; + }; + }; + "ts-loader-6.2.2" = { + name = "ts-loader"; + packageName = "ts-loader"; + version = "6.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ts-loader/-/ts-loader-6.2.2.tgz"; + sha512 = "HDo5kXZCBml3EUPcc7RlZOV/JGlLHwppTLEHb3SHnr5V7NXD4klMEkrhJe5wgRbaWsSXi+Y1SIBN/K9B6zWGWQ=="; + }; + }; + "ts-pnp-1.2.0" = { + name = "ts-pnp"; + packageName = "ts-pnp"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ts-pnp/-/ts-pnp-1.2.0.tgz"; + sha512 = "csd+vJOb/gkzvcCHgTGSChYpy5f1/XKNsmvBGO4JXS+z1v2HobugDz4s1IeFXM3wZB44uczs+eazB5Q/ccdhQw=="; + }; + }; + "tslib-1.10.0" = { + name = "tslib"; + packageName = "tslib"; + version = "1.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tslib/-/tslib-1.10.0.tgz"; + sha512 = "qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ=="; + }; + }; + "tslint-5.20.1" = { + name = "tslint"; + packageName = "tslint"; + version = "5.20.1"; + src = fetchurl { + url = "https://registry.npmjs.org/tslint/-/tslint-5.20.1.tgz"; + sha512 = "EcMxhzCFt8k+/UP5r8waCf/lzmeSyVlqxqMEDQE7rWYiQky8KpIBz1JAoYXfROHrPZ1XXd43q8yQnULOLiBRQg=="; + }; + }; + "tsutils-2.29.0" = { + name = "tsutils"; + packageName = "tsutils"; + version = "2.29.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tsutils/-/tsutils-2.29.0.tgz"; + sha512 = "g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA=="; + }; + }; + "tsutils-3.17.1" = { + name = "tsutils"; + packageName = "tsutils"; + version = "3.17.1"; + src = fetchurl { + url = "https://registry.npmjs.org/tsutils/-/tsutils-3.17.1.tgz"; + sha512 = "kzeQ5B8H3w60nFY2g8cJIuH7JDpsALXySGtwGJ0p2LSjLgay3NdIpqq5SoOBe46bKDW2iq25irHCr8wjomUS2g=="; + }; + }; + "tty-browserify-0.0.0" = { + name = "tty-browserify"; + packageName = "tty-browserify"; + version = "0.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz"; + sha1 = "a157ba402da24e9bf957f9aa69d524eed42901a6"; + }; + }; + "tunnel-agent-0.6.0" = { + name = "tunnel-agent"; + packageName = "tunnel-agent"; + version = "0.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz"; + sha1 = "27a5dea06b36b04a0a9966774b290868f0fc40fd"; + }; + }; + "tweetnacl-0.14.5" = { + name = "tweetnacl"; + packageName = "tweetnacl"; + version = "0.14.5"; + src = fetchurl { + url = "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz"; + sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64"; + }; + }; + "type-check-0.3.2" = { + name = "type-check"; + packageName = "type-check"; + version = "0.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz"; + sha1 = "5884cab512cf1d355e3fb784f30804b2b520db72"; + }; + }; + "type-fest-0.6.0" = { + name = "type-fest"; + packageName = "type-fest"; + version = "0.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz"; + sha512 = "q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg=="; + }; + }; + "type-fest-0.8.1" = { + name = "type-fest"; + packageName = "type-fest"; + version = "0.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz"; + sha512 = "4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA=="; + }; + }; + "type-is-1.6.18" = { + name = "type-is"; + packageName = "type-is"; + version = "1.6.18"; + src = fetchurl { + url = "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz"; + sha512 = "TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g=="; + }; + }; + "typedarray-0.0.6" = { + name = "typedarray"; + packageName = "typedarray"; + version = "0.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz"; + sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777"; + }; + }; + "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=="; + }; + }; + "uglify-js-3.4.10" = { + name = "uglify-js"; + packageName = "uglify-js"; + version = "3.4.10"; + src = fetchurl { + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.10.tgz"; + sha512 = "Y2VsbPVs0FIshJztycsO2SfPk7/KAF/T72qzv9u5EpQ4kB2hQoHlhNQTsNyy6ul7lQtqJN/AoWeS23OzEiEFxw=="; + }; + }; + "unicode-canonical-property-names-ecmascript-1.0.4" = { + name = "unicode-canonical-property-names-ecmascript"; + packageName = "unicode-canonical-property-names-ecmascript"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz"; + sha512 = "jDrNnXWHd4oHiTZnx/ZG7gtUTVp+gCcTTKr8L0HjlwphROEW3+Him+IpvC+xcJEFegapiMZyZe02CyuOnRmbnQ=="; + }; + }; + "unicode-match-property-ecmascript-1.0.4" = { + name = "unicode-match-property-ecmascript"; + packageName = "unicode-match-property-ecmascript"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz"; + sha512 = "L4Qoh15vTfntsn4P1zqnHulG0LdXgjSO035fEpdtp6YxXhMT51Q6vgM5lYdG/5X3MjS+k/Y9Xw4SFCY9IkR0rg=="; + }; + }; + "unicode-match-property-value-ecmascript-1.2.0" = { + name = "unicode-match-property-value-ecmascript"; + packageName = "unicode-match-property-value-ecmascript"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.2.0.tgz"; + sha512 = "wjuQHGQVofmSJv1uVISKLE5zO2rNGzM/KCYZch/QQvez7C1hUhBIuZ701fYXExuufJFMPhv2SyL8CyoIfMLbIQ=="; + }; + }; + "unicode-property-aliases-ecmascript-1.1.0" = { + name = "unicode-property-aliases-ecmascript"; + packageName = "unicode-property-aliases-ecmascript"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.1.0.tgz"; + sha512 = "PqSoPh/pWetQ2phoj5RLiaqIk4kCNwoV3CI+LfGmWLKI3rE3kl1h59XpX2BjgDrmbxD9ARtQobPGU1SguCYuQg=="; + }; + }; + "union-value-1.0.1" = { + name = "union-value"; + packageName = "union-value"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz"; + sha512 = "tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg=="; + }; + }; + "uniq-1.0.1" = { + name = "uniq"; + packageName = "uniq"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz"; + sha1 = "b31c5ae8254844a3a8281541ce2b04b865a734ff"; + }; + }; + "uniqs-2.0.0" = { + name = "uniqs"; + packageName = "uniqs"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/uniqs/-/uniqs-2.0.0.tgz"; + sha1 = "ffede4b36b25290696e6e165d4a59edb998e6b02"; + }; + }; + "unique-filename-1.1.1" = { + name = "unique-filename"; + packageName = "unique-filename"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz"; + sha512 = "Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ=="; + }; + }; + "unique-slug-2.0.2" = { + name = "unique-slug"; + packageName = "unique-slug"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.2.tgz"; + sha512 = "zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w=="; + }; + }; + "universalify-0.1.2" = { + name = "universalify"; + packageName = "universalify"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz"; + sha512 = "rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="; + }; + }; + "unpipe-1.0.0" = { + name = "unpipe"; + packageName = "unpipe"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz"; + sha1 = "b2bf4ee8514aae6165b4817829d21b2ef49904ec"; + }; + }; + "unquote-1.1.1" = { + name = "unquote"; + packageName = "unquote"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/unquote/-/unquote-1.1.1.tgz"; + sha1 = "8fded7324ec6e88a0ff8b905e7c098cdc086d544"; + }; + }; + "unset-value-1.0.0" = { + name = "unset-value"; + packageName = "unset-value"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz"; + sha1 = "8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"; + }; + }; + "upath-1.2.0" = { + name = "upath"; + packageName = "upath"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz"; + sha512 = "aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg=="; + }; + }; + "upper-case-1.1.3" = { + name = "upper-case"; + packageName = "upper-case"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/upper-case/-/upper-case-1.1.3.tgz"; + sha1 = "f6b4501c2ec4cdd26ba78be7222961de77621598"; + }; + }; + "uri-js-4.2.2" = { + name = "uri-js"; + packageName = "uri-js"; + version = "4.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz"; + sha512 = "KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ=="; + }; + }; + "urix-0.1.0" = { + name = "urix"; + packageName = "urix"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz"; + sha1 = "da937f7a62e21fec1fd18d49b35c2935067a6c72"; + }; + }; + "url-0.11.0" = { + name = "url"; + packageName = "url"; + version = "0.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/url/-/url-0.11.0.tgz"; + sha1 = "3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"; + }; + }; + "url-loader-2.3.0" = { + name = "url-loader"; + packageName = "url-loader"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/url-loader/-/url-loader-2.3.0.tgz"; + sha512 = "goSdg8VY+7nPZKUEChZSEtW5gjbS66USIGCeSJ1OVOJ7Yfuh/36YxCwMi5HVEJh6mqUYOoy3NJ0vlOMrWsSHog=="; + }; + }; + "url-parse-1.4.7" = { + name = "url-parse"; + packageName = "url-parse"; + version = "1.4.7"; + src = fetchurl { + url = "https://registry.npmjs.org/url-parse/-/url-parse-1.4.7.tgz"; + sha512 = "d3uaVyzDB9tQoSXFvuSUNFibTd9zxd2bkVrDRvF5TmvWWQwqE4lgYJ5m+x1DbecWkw+LK4RNl2CU1hHuOKPVlg=="; + }; + }; + "use-3.1.1" = { + name = "use"; + packageName = "use"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/use/-/use-3.1.1.tgz"; + sha512 = "cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ=="; + }; + }; + "util-0.10.3" = { + name = "util"; + packageName = "util"; + version = "0.10.3"; + src = fetchurl { + url = "https://registry.npmjs.org/util/-/util-0.10.3.tgz"; + sha1 = "7afb1afe50805246489e3db7fe0ed379336ac0f9"; + }; + }; + "util-0.11.1" = { + name = "util"; + packageName = "util"; + version = "0.11.1"; + src = fetchurl { + url = "https://registry.npmjs.org/util/-/util-0.11.1.tgz"; + sha512 = "HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ=="; + }; + }; + "util-deprecate-1.0.2" = { + name = "util-deprecate"; + packageName = "util-deprecate"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"; + sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf"; + }; + }; + "util.promisify-1.0.0" = { + name = "util.promisify"; + packageName = "util.promisify"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.0.tgz"; + sha512 = "i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA=="; + }; + }; + "util.promisify-1.0.1" = { + name = "util.promisify"; + packageName = "util.promisify"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.1.tgz"; + sha512 = "g9JpC/3He3bm38zsLupWryXHoEcS22YHthuPQSJdMy6KNrzIRzWqcsHzD/WUnqe45whVou4VIsPew37DoXWNrA=="; + }; + }; + "utila-0.4.0" = { + name = "utila"; + packageName = "utila"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/utila/-/utila-0.4.0.tgz"; + sha1 = "8a16a05d445657a3aea5eecc5b12a4fa5379772c"; + }; + }; + "utils-merge-1.0.1" = { + name = "utils-merge"; + packageName = "utils-merge"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz"; + sha1 = "9f95710f50a267947b2ccc124741c1028427e713"; + }; + }; + "uuid-3.3.3" = { + name = "uuid"; + packageName = "uuid"; + version = "3.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/uuid/-/uuid-3.3.3.tgz"; + sha512 = "pW0No1RGHgzlpHJO1nsVrHKpOEIxkGg1xB+v0ZmdNH5OAeAwzAVrCnI2/6Mtx+Uys6iaylxa+D3g4j63IKKjSQ=="; + }; + }; + "uuid-3.4.0" = { + name = "uuid"; + packageName = "uuid"; + version = "3.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz"; + sha512 = "HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="; + }; + }; + "v-lazy-image-1.4.0" = { + name = "v-lazy-image"; + packageName = "v-lazy-image"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/v-lazy-image/-/v-lazy-image-1.4.0.tgz"; + sha512 = "Xp/fM786hdXlP10HatvtNsvvPjW6yOsH17lvVEEuGiNMnyiafT9XVomQRRM4t+IzN21cz3SQcw9cqd486yhpgQ=="; + }; + }; + "v8-compile-cache-2.1.0" = { + name = "v8-compile-cache"; + packageName = "v8-compile-cache"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.1.0.tgz"; + sha512 = "usZBT3PW+LOjM25wbqIlZwPeJV+3OSz3M1k1Ws8snlW39dZyYL9lOGC5FgPVHfk0jKmjiDV8Z0mIbVQPiwFs7g=="; + }; + }; + "validate-npm-package-license-3.0.4" = { + name = "validate-npm-package-license"; + packageName = "validate-npm-package-license"; + version = "3.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz"; + sha512 = "DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew=="; + }; + }; + "vary-1.1.2" = { + name = "vary"; + packageName = "vary"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz"; + sha1 = "2299f02c6ded30d4a5961b0b9f74524a18f634fc"; + }; + }; + "vendors-1.0.4" = { + name = "vendors"; + packageName = "vendors"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/vendors/-/vendors-1.0.4.tgz"; + sha512 = "/juG65kTL4Cy2su4P8HjtkTxk6VmJDiOPBufWniqQ6wknac6jNiXS9vU+hO3wgusiyqWlzTbVHi0dyJqRONg3w=="; + }; + }; + "verror-1.10.0" = { + name = "verror"; + packageName = "verror"; + version = "1.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz"; + sha1 = "3a105ca17053af55d6e270c1f8288682e18da400"; + }; + }; + "vm-browserify-1.1.2" = { + name = "vm-browserify"; + packageName = "vm-browserify"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz"; + sha512 = "2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ=="; + }; + }; + "vue-2.6.12" = { + name = "vue"; + packageName = "vue"; + version = "2.6.12"; + src = fetchurl { + url = "https://registry.npmjs.org/vue/-/vue-2.6.12.tgz"; + sha512 = "uhmLFETqPPNyuLLbsKz6ioJ4q7AZHzD8ZVFNATNyICSZouqP2Sz0rotWQC8UNBF6VGSCs5abnKJoStA6JbCbfg=="; + }; + }; + "vue-class-component-7.2.5" = { + name = "vue-class-component"; + packageName = "vue-class-component"; + version = "7.2.5"; + src = fetchurl { + url = "https://registry.npmjs.org/vue-class-component/-/vue-class-component-7.2.5.tgz"; + sha512 = "0CSftHY0bDTD+4FbYkuFf6+iKDjZ4h2in2YYJDRMk5daZIjrgT9LjFHvP7Rzqy9/s1pij3zDtTSLRUjsPWMwqg=="; + }; + }; + "vue-cli-plugin-buefy-0.3.7" = { + name = "vue-cli-plugin-buefy"; + packageName = "vue-cli-plugin-buefy"; + version = "0.3.7"; + src = fetchurl { + url = "https://registry.npmjs.org/vue-cli-plugin-buefy/-/vue-cli-plugin-buefy-0.3.7.tgz"; + sha512 = "w+1Wnj1VmoLJmv0yHoLUErnFkLSzz4yTGhCz7GudDKX7vB5NpVK+/xWmiFOytuDkleWeYrJgHN8CIOY7xe26jQ=="; + }; + }; + "vue-cli-plugin-fontawesome-0.2.0" = { + name = "vue-cli-plugin-fontawesome"; + packageName = "vue-cli-plugin-fontawesome"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vue-cli-plugin-fontawesome/-/vue-cli-plugin-fontawesome-0.2.0.tgz"; + sha512 = "/4DzKldf4e6CcZ1E3hO19ZFVX36DqjewCytzXekpBL74KFcpWAFaAZEJkisPfMVsalbVn6AOk27VOA8nfnZAFg=="; + }; + }; + "vue-cli-plugin-i18n-1.0.1" = { + name = "vue-cli-plugin-i18n"; + packageName = "vue-cli-plugin-i18n"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/vue-cli-plugin-i18n/-/vue-cli-plugin-i18n-1.0.1.tgz"; + sha512 = "sLo6YzudaWgn5dOMvrKixE5bb/onYGxcxm+0YexqoOx0QtR+7hZ/P5WPFBMM9v/2i1ec2YYe2PvKTBel7KE+tA=="; + }; + }; + "vue-dragscroll-2.1.0" = { + name = "vue-dragscroll"; + packageName = "vue-dragscroll"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vue-dragscroll/-/vue-dragscroll-2.1.0.tgz"; + sha512 = "ZNcvOdrnq9w4US2RqZOfp2cCJzEz1p4xZ1w4I+xKSAFlEOrXbryLe/iclspHH57dco5QT3Azd8/KD930WzadiQ=="; + }; + }; + "vue-eslint-parser-7.0.0" = { + name = "vue-eslint-parser"; + packageName = "vue-eslint-parser"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-7.0.0.tgz"; + sha512 = "yR0dLxsTT7JfD2YQo9BhnQ6bUTLsZouuzt9SKRP7XNaZJV459gvlsJo4vT2nhZ/2dH9j3c53bIx9dnqU2prM9g=="; + }; + }; + "vue-hot-reload-api-2.3.4" = { + name = "vue-hot-reload-api"; + packageName = "vue-hot-reload-api"; + version = "2.3.4"; + src = fetchurl { + url = "https://registry.npmjs.org/vue-hot-reload-api/-/vue-hot-reload-api-2.3.4.tgz"; + sha512 = "BXq3jwIagosjgNVae6tkHzzIk6a8MHFtzAdwhnV5VlvPTFxDCvIttgSiHWjdGoTJvXtmRu5HacExfdarRcFhog=="; + }; + }; + "vue-i18n-8.21.0" = { + name = "vue-i18n"; + packageName = "vue-i18n"; + version = "8.21.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vue-i18n/-/vue-i18n-8.21.0.tgz"; + sha512 = "pKBq6Kg5hNacFHMFgPbpYsFlDIMRu4Ew/tpvTWns14CZoCxt7B3tmSNdrLruGMMivnJu1rhhRqsQqT6YwHkuQQ=="; + }; + }; + "vue-i18n-extract-1.0.2" = { + name = "vue-i18n-extract"; + packageName = "vue-i18n-extract"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/vue-i18n-extract/-/vue-i18n-extract-1.0.2.tgz"; + sha512 = "+zwDKvle4KcfloXZnj5hF01ViKDiFr5RMx5507D7oyDXpSleRpekF5YHgZa/+Ra6Go68//z0Nya58J9tKFsCjw=="; + }; + }; + "vue-loader-15.9.3" = { + name = "vue-loader"; + packageName = "vue-loader"; + version = "15.9.3"; + src = fetchurl { + url = "https://registry.npmjs.org/vue-loader/-/vue-loader-15.9.3.tgz"; + sha512 = "Y67VnGGgVLH5Voostx8JBZgPQTlDQeOVBLOEsjc2cXbCYBKexSKEpOA56x0YZofoDOTszrLnIShyOX1p9uCEHA=="; + }; + }; + "vue-property-decorator-9.0.0" = { + name = "vue-property-decorator"; + packageName = "vue-property-decorator"; + version = "9.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vue-property-decorator/-/vue-property-decorator-9.0.0.tgz"; + sha512 = "oegTNPItuHOkW0AP1MnbdNwkmyhfsUIIXvIRHpgC18tVoEo21/i6kItyeekjMs8JgZJeuHzsaTc/DZaJFH4IWQ=="; + }; + }; + "vue-router-3.4.3" = { + name = "vue-router"; + packageName = "vue-router"; + version = "3.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/vue-router/-/vue-router-3.4.3.tgz"; + sha512 = "BADg1mjGWX18Dpmy6bOGzGNnk7B/ZA0RxuA6qedY/YJwirMfKXIDzcccmHbQI0A6k5PzMdMloc0ElHfyOoX35A=="; + }; + }; + "vue-style-loader-4.1.2" = { + name = "vue-style-loader"; + packageName = "vue-style-loader"; + version = "4.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/vue-style-loader/-/vue-style-loader-4.1.2.tgz"; + sha512 = "0ip8ge6Gzz/Bk0iHovU9XAUQaFt/G2B61bnWa2tCcqqdgfHs1lF9xXorFbE55Gmy92okFT+8bfmySuUOu13vxQ=="; + }; + }; + "vue-template-compiler-2.6.12" = { + name = "vue-template-compiler"; + packageName = "vue-template-compiler"; + version = "2.6.12"; + src = fetchurl { + url = "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.6.12.tgz"; + sha512 = "OzzZ52zS41YUbkCBfdXShQTe69j1gQDZ9HIX8miuC9C3rBCk9wIRjLiZZLrmX9V+Ftq/YEyv1JaVr5Y/hNtByg=="; + }; + }; + "vue-template-es2015-compiler-1.9.1" = { + name = "vue-template-es2015-compiler"; + packageName = "vue-template-es2015-compiler"; + version = "1.9.1"; + src = fetchurl { + url = "https://registry.npmjs.org/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.9.1.tgz"; + sha512 = "4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw=="; + }; + }; + "vuex-3.5.1" = { + name = "vuex"; + packageName = "vuex"; + version = "3.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/vuex/-/vuex-3.5.1.tgz"; + sha512 = "w7oJzmHQs0FM9LXodfskhw9wgKBiaB+totOdb8sNzbTB2KDCEEwEs29NzBZFh/lmEK1t5tDmM1vtsO7ubG1DFw=="; + }; + }; + "vuex-class-component-2.3.5" = { + name = "vuex-class-component"; + packageName = "vuex-class-component"; + version = "2.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/vuex-class-component/-/vuex-class-component-2.3.5.tgz"; + sha512 = "e7BhLrh5jZNHoeUajfQ5NFwA9gnVj69HKxBGRiw6FRZVpXTGewPo23S1//lb5Ed1RucIfQlqfwVpC/2mtej6bw=="; + }; + }; + "watchpack-1.6.1" = { + name = "watchpack"; + packageName = "watchpack"; + version = "1.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/watchpack/-/watchpack-1.6.1.tgz"; + sha512 = "+IF9hfUFOrYOOaKyfaI7h7dquUIOgyEMoQMLA7OP5FxegKA2+XdXThAZ9TU2kucfhDH7rfMHs1oPYziVGWRnZA=="; + }; + }; + "wbuf-1.7.3" = { + name = "wbuf"; + packageName = "wbuf"; + version = "1.7.3"; + src = fetchurl { + url = "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz"; + sha512 = "O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA=="; + }; + }; + "wcwidth-1.0.1" = { + name = "wcwidth"; + packageName = "wcwidth"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz"; + sha1 = "f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8"; + }; + }; + "webpack-4.42.1" = { + name = "webpack"; + packageName = "webpack"; + version = "4.42.1"; + src = fetchurl { + url = "https://registry.npmjs.org/webpack/-/webpack-4.42.1.tgz"; + sha512 = "SGfYMigqEfdGchGhFFJ9KyRpQKnipvEvjc1TwrXEPCM6H5Wywu10ka8o3KGrMzSMxMQKt8aCHUFh5DaQ9UmyRg=="; + }; + }; + "webpack-bundle-analyzer-3.8.0" = { + name = "webpack-bundle-analyzer"; + packageName = "webpack-bundle-analyzer"; + version = "3.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.8.0.tgz"; + sha512 = "PODQhAYVEourCcOuU+NiYI7WdR8QyELZGgPvB1y2tjbUpbmcQOt5Q7jEK+ttd5se0KSBKD9SXHCEozS++Wllmw=="; + }; + }; + "webpack-chain-6.4.0" = { + name = "webpack-chain"; + packageName = "webpack-chain"; + version = "6.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/webpack-chain/-/webpack-chain-6.4.0.tgz"; + sha512 = "f97PYqxU+9/u0IUqp/ekAHRhBD1IQwhBv3wlJo2nvyELpr2vNnUqO3XQEk+qneg0uWGP54iciotszpjfnEExFA=="; + }; + }; + "webpack-dev-middleware-3.7.2" = { + name = "webpack-dev-middleware"; + packageName = "webpack-dev-middleware"; + version = "3.7.2"; + src = fetchurl { + url = "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.7.2.tgz"; + sha512 = "1xC42LxbYoqLNAhV6YzTYacicgMZQTqRd27Sim9wn5hJrX3I5nxYy1SxSd4+gjUFsz1dQFj+yEe6zEVmSkeJjw=="; + }; + }; + "webpack-dev-server-3.11.0" = { + name = "webpack-dev-server"; + packageName = "webpack-dev-server"; + version = "3.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.11.0.tgz"; + sha512 = "PUxZ+oSTxogFQgkTtFndEtJIPNmml7ExwufBZ9L2/Xyyd5PnOL5UreWe5ZT7IU25DSdykL9p1MLQzmLh2ljSeg=="; + }; + }; + "webpack-log-2.0.0" = { + name = "webpack-log"; + packageName = "webpack-log"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/webpack-log/-/webpack-log-2.0.0.tgz"; + sha512 = "cX8G2vR/85UYG59FgkoMamwHUIkSSlV3bBMRsbxVXVUk2j6NleCKjQ/WE9eYg9WY4w25O9w8wKP4rzNZFmUcUg=="; + }; + }; + "webpack-merge-4.2.2" = { + name = "webpack-merge"; + packageName = "webpack-merge"; + version = "4.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.2.2.tgz"; + sha512 = "TUE1UGoTX2Cd42j3krGYqObZbOD+xF7u28WB7tfUordytSjbWTIjK/8V0amkBfTYN4/pB/GIDlJZZ657BGG19g=="; + }; + }; + "webpack-sources-1.4.3" = { + name = "webpack-sources"; + packageName = "webpack-sources"; + version = "1.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz"; + sha512 = "lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ=="; + }; + }; + "websocket-driver-0.6.5" = { + name = "websocket-driver"; + packageName = "websocket-driver"; + version = "0.6.5"; + src = fetchurl { + url = "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.6.5.tgz"; + sha1 = "5cb2556ceb85f4373c6d8238aa691c8454e13a36"; + }; + }; + "websocket-extensions-0.1.4" = { + name = "websocket-extensions"; + packageName = "websocket-extensions"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz"; + sha512 = "OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg=="; + }; + }; + "which-1.3.1" = { + name = "which"; + packageName = "which"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/which/-/which-1.3.1.tgz"; + sha512 = "HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ=="; + }; + }; + "which-2.0.2" = { + name = "which"; + packageName = "which"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/which/-/which-2.0.2.tgz"; + sha512 = "BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA=="; + }; + }; + "which-module-2.0.0" = { + name = "which-module"; + packageName = "which-module"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz"; + sha1 = "d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"; + }; + }; + "wide-align-1.1.3" = { + name = "wide-align"; + packageName = "wide-align"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz"; + sha512 = "QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA=="; + }; + }; + "word-wrap-1.2.3" = { + name = "word-wrap"; + packageName = "word-wrap"; + version = "1.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz"; + sha512 = "Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ=="; + }; + }; + "worker-farm-1.7.0" = { + name = "worker-farm"; + packageName = "worker-farm"; + version = "1.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/worker-farm/-/worker-farm-1.7.0.tgz"; + sha512 = "rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw=="; + }; + }; + "worker-rpc-0.1.1" = { + name = "worker-rpc"; + packageName = "worker-rpc"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/worker-rpc/-/worker-rpc-0.1.1.tgz"; + sha512 = "P1WjMrUB3qgJNI9jfmpZ/htmBEjFh//6l/5y8SD9hg1Ef5zTTVVoRjTrTEzPrNBQvmhMxkoTsjOXN10GWU7aCg=="; + }; + }; + "wrap-ansi-5.1.0" = { + name = "wrap-ansi"; + packageName = "wrap-ansi"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz"; + sha512 = "QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q=="; + }; + }; + "wrap-ansi-6.2.0" = { + name = "wrap-ansi"; + packageName = "wrap-ansi"; + version = "6.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz"; + sha512 = "r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA=="; + }; + }; + "wrappy-1.0.2" = { + name = "wrappy"; + packageName = "wrappy"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"; + sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"; + }; + }; + "write-1.0.3" = { + name = "write"; + packageName = "write"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/write/-/write-1.0.3.tgz"; + sha512 = "/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig=="; + }; + }; + "ws-6.2.1" = { + name = "ws"; + packageName = "ws"; + version = "6.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ws/-/ws-6.2.1.tgz"; + sha512 = "GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA=="; + }; + }; + "xtend-4.0.2" = { + name = "xtend"; + packageName = "xtend"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz"; + sha512 = "LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ=="; + }; + }; + "y18n-4.0.0" = { + name = "y18n"; + packageName = "y18n"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz"; + sha512 = "r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w=="; + }; + }; + "yallist-2.1.2" = { + name = "yallist"; + packageName = "yallist"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz"; + sha1 = "1c11f9218f076089a47dd512f93c6699a6a81d52"; + }; + }; + "yallist-3.1.1" = { + name = "yallist"; + packageName = "yallist"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz"; + sha512 = "a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="; + }; + }; + "yallist-4.0.0" = { + name = "yallist"; + packageName = "yallist"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz"; + sha512 = "3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="; + }; + }; + "yargs-13.3.2" = { + name = "yargs"; + packageName = "yargs"; + version = "13.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz"; + sha512 = "AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw=="; + }; + }; + "yargs-15.3.1" = { + name = "yargs"; + packageName = "yargs"; + version = "15.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs/-/yargs-15.3.1.tgz"; + sha512 = "92O1HWEjw27sBfgmXiixJWT5hRBp2eobqXicLtPBIDBhYB+1HpwZlXmbW2luivBJHBzki+7VyCLRtAkScbTBQA=="; + }; + }; + "yargs-parser-13.1.2" = { + name = "yargs-parser"; + packageName = "yargs-parser"; + version = "13.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz"; + sha512 = "3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg=="; + }; + }; + "yargs-parser-18.1.3" = { + name = "yargs-parser"; + packageName = "yargs-parser"; + version = "18.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz"; + sha512 = "o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ=="; + }; + }; + "yorkie-2.0.0" = { + name = "yorkie"; + packageName = "yorkie"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yorkie/-/yorkie-2.0.0.tgz"; + sha512 = "jcKpkthap6x63MB4TxwCyuIGkV0oYP/YRyuQU5UO0Yz/E/ZAu+653/uov+phdmO54n6BcvFRyyt0RRrWdN2mpw=="; + }; + }; + }; + args = { + name = "ldgallery-viewer"; + packageName = "ldgallery-viewer"; + version = "2.0.0"; + src = ./.; + dependencies = [ + sources."@babel/code-frame-7.5.5" + (sources."@babel/compat-data-7.10.3" // { + dependencies = [ + sources."browserslist-4.12.2" + sources."caniuse-lite-1.0.30001090" + sources."electron-to-chromium-1.3.483" + sources."node-releases-1.1.58" + ]; + }) + (sources."@babel/core-7.10.3" // { + dependencies = [ + sources."@babel/code-frame-7.10.3" + sources."@babel/highlight-7.10.3" + sources."source-map-0.5.7" + ]; + }) + (sources."@babel/generator-7.10.3" // { + dependencies = [ + sources."source-map-0.5.7" + ]; + }) + sources."@babel/helper-annotate-as-pure-7.10.1" + sources."@babel/helper-builder-binary-assignment-operator-visitor-7.10.3" + (sources."@babel/helper-compilation-targets-7.10.2" // { + dependencies = [ + sources."browserslist-4.12.2" + sources."caniuse-lite-1.0.30001090" + sources."electron-to-chromium-1.3.483" + sources."node-releases-1.1.58" + ]; + }) + sources."@babel/helper-create-class-features-plugin-7.10.3" + sources."@babel/helper-create-regexp-features-plugin-7.10.1" + sources."@babel/helper-define-map-7.10.3" + sources."@babel/helper-explode-assignable-expression-7.10.3" + sources."@babel/helper-function-name-7.10.3" + sources."@babel/helper-get-function-arity-7.10.3" + sources."@babel/helper-hoist-variables-7.10.3" + sources."@babel/helper-member-expression-to-functions-7.10.3" + sources."@babel/helper-module-imports-7.10.3" + sources."@babel/helper-module-transforms-7.10.1" + sources."@babel/helper-optimise-call-expression-7.10.3" + sources."@babel/helper-plugin-utils-7.10.3" + sources."@babel/helper-regex-7.10.1" + sources."@babel/helper-remap-async-to-generator-7.10.3" + sources."@babel/helper-replace-supers-7.10.1" + sources."@babel/helper-simple-access-7.10.1" + sources."@babel/helper-split-export-declaration-7.10.1" + sources."@babel/helper-validator-identifier-7.10.3" + sources."@babel/helper-wrap-function-7.10.1" + sources."@babel/helpers-7.10.1" + sources."@babel/highlight-7.5.0" + sources."@babel/parser-7.10.3" + sources."@babel/plugin-proposal-async-generator-functions-7.10.3" + sources."@babel/plugin-proposal-class-properties-7.10.1" + sources."@babel/plugin-proposal-decorators-7.10.3" + sources."@babel/plugin-proposal-dynamic-import-7.10.1" + sources."@babel/plugin-proposal-json-strings-7.10.1" + sources."@babel/plugin-proposal-nullish-coalescing-operator-7.10.1" + sources."@babel/plugin-proposal-numeric-separator-7.10.1" + sources."@babel/plugin-proposal-object-rest-spread-7.10.3" + sources."@babel/plugin-proposal-optional-catch-binding-7.10.1" + sources."@babel/plugin-proposal-optional-chaining-7.10.3" + sources."@babel/plugin-proposal-private-methods-7.10.1" + sources."@babel/plugin-proposal-unicode-property-regex-7.10.1" + sources."@babel/plugin-syntax-async-generators-7.8.4" + sources."@babel/plugin-syntax-class-properties-7.10.1" + sources."@babel/plugin-syntax-decorators-7.10.1" + sources."@babel/plugin-syntax-dynamic-import-7.8.3" + sources."@babel/plugin-syntax-json-strings-7.8.3" + sources."@babel/plugin-syntax-jsx-7.10.1" + sources."@babel/plugin-syntax-nullish-coalescing-operator-7.8.3" + sources."@babel/plugin-syntax-numeric-separator-7.10.1" + sources."@babel/plugin-syntax-object-rest-spread-7.8.3" + sources."@babel/plugin-syntax-optional-catch-binding-7.8.3" + sources."@babel/plugin-syntax-optional-chaining-7.8.3" + sources."@babel/plugin-syntax-top-level-await-7.10.1" + sources."@babel/plugin-transform-arrow-functions-7.10.1" + sources."@babel/plugin-transform-async-to-generator-7.10.1" + sources."@babel/plugin-transform-block-scoped-functions-7.10.1" + sources."@babel/plugin-transform-block-scoping-7.10.1" + sources."@babel/plugin-transform-classes-7.10.3" + sources."@babel/plugin-transform-computed-properties-7.10.3" + sources."@babel/plugin-transform-destructuring-7.10.1" + sources."@babel/plugin-transform-dotall-regex-7.10.1" + sources."@babel/plugin-transform-duplicate-keys-7.10.1" + sources."@babel/plugin-transform-exponentiation-operator-7.10.1" + sources."@babel/plugin-transform-for-of-7.10.1" + sources."@babel/plugin-transform-function-name-7.10.1" + sources."@babel/plugin-transform-literals-7.10.1" + sources."@babel/plugin-transform-member-expression-literals-7.10.1" + sources."@babel/plugin-transform-modules-amd-7.10.1" + sources."@babel/plugin-transform-modules-commonjs-7.10.1" + sources."@babel/plugin-transform-modules-systemjs-7.10.3" + sources."@babel/plugin-transform-modules-umd-7.10.1" + sources."@babel/plugin-transform-named-capturing-groups-regex-7.10.3" + sources."@babel/plugin-transform-new-target-7.10.1" + sources."@babel/plugin-transform-object-super-7.10.1" + sources."@babel/plugin-transform-parameters-7.10.1" + sources."@babel/plugin-transform-property-literals-7.10.1" + sources."@babel/plugin-transform-regenerator-7.10.3" + sources."@babel/plugin-transform-reserved-words-7.10.1" + sources."@babel/plugin-transform-runtime-7.10.3" + sources."@babel/plugin-transform-shorthand-properties-7.10.1" + sources."@babel/plugin-transform-spread-7.10.1" + sources."@babel/plugin-transform-sticky-regex-7.10.1" + sources."@babel/plugin-transform-template-literals-7.10.3" + sources."@babel/plugin-transform-typeof-symbol-7.10.1" + sources."@babel/plugin-transform-unicode-escapes-7.10.1" + sources."@babel/plugin-transform-unicode-regex-7.10.1" + (sources."@babel/preset-env-7.10.3" // { + dependencies = [ + sources."browserslist-4.12.2" + sources."caniuse-lite-1.0.30001090" + sources."electron-to-chromium-1.3.483" + sources."node-releases-1.1.58" + ]; + }) + sources."@babel/preset-modules-0.1.3" + sources."@babel/runtime-7.10.3" + (sources."@babel/template-7.10.3" // { + dependencies = [ + sources."@babel/code-frame-7.10.3" + sources."@babel/highlight-7.10.3" + ]; + }) + (sources."@babel/traverse-7.10.3" // { + dependencies = [ + sources."@babel/code-frame-7.10.3" + sources."@babel/highlight-7.10.3" + ]; + }) + sources."@babel/types-7.10.3" + sources."@fortawesome/fontawesome-common-types-0.2.30" + sources."@fortawesome/fontawesome-svg-core-1.2.30" + sources."@fortawesome/free-regular-svg-icons-5.14.0" + sources."@fortawesome/free-solid-svg-icons-5.14.0" + sources."@fortawesome/vue-fontawesome-2.0.0" + sources."@hapi/address-2.1.4" + sources."@hapi/bourne-1.3.2" + sources."@hapi/hoek-8.5.1" + sources."@hapi/joi-15.1.1" + sources."@hapi/topo-3.1.6" + sources."@intervolga/optimize-cssnano-plugin-1.0.6" + sources."@mrmlnc/readdir-enhanced-2.2.1" + sources."@nodelib/fs.stat-1.1.3" + (sources."@soda/friendly-errors-webpack-plugin-1.7.1" // { + dependencies = [ + sources."ansi-regex-2.1.1" + sources."ansi-styles-2.2.1" + sources."chalk-1.1.3" + sources."strip-ansi-3.0.1" + sources."supports-color-2.0.0" + ]; + }) + sources."@soda/get-current-script-1.0.2" + sources."@types/anymatch-1.3.1" + sources."@types/color-name-1.1.1" + sources."@types/eslint-visitor-keys-1.0.0" + sources."@types/events-3.0.0" + sources."@types/glob-7.1.1" + sources."@types/hammerjs-2.0.36" + sources."@types/json-schema-7.0.4" + sources."@types/marked-1.1.0" + sources."@types/minimatch-3.0.3" + sources."@types/node-13.9.8" + sources."@types/normalize-package-data-2.4.0" + sources."@types/q-1.5.4" + sources."@types/source-list-map-0.1.2" + sources."@types/tapable-1.0.6" + sources."@types/uglify-js-3.9.3" + sources."@types/webpack-4.41.22" + sources."@types/webpack-env-1.15.2" + (sources."@types/webpack-sources-1.4.2" // { + dependencies = [ + sources."source-map-0.7.3" + ]; + }) + (sources."@typescript-eslint/eslint-plugin-2.34.0" // { + dependencies = [ + sources."@typescript-eslint/experimental-utils-2.34.0" + sources."@typescript-eslint/typescript-estree-2.34.0" + sources."eslint-utils-2.1.0" + sources."semver-7.3.2" + ]; + }) + (sources."@typescript-eslint/experimental-utils-2.34.0" // { + dependencies = [ + sources."eslint-utils-2.1.0" + ]; + }) + sources."@typescript-eslint/parser-2.34.0" + (sources."@typescript-eslint/typescript-estree-2.34.0" // { + dependencies = [ + sources."semver-7.3.2" + ]; + }) + sources."@vue/babel-helper-vue-jsx-merge-props-1.0.0" + sources."@vue/babel-plugin-transform-vue-jsx-1.1.2" + (sources."@vue/babel-preset-app-4.4.6" // { + dependencies = [ + sources."core-js-3.6.5" + sources."semver-6.3.0" + ]; + }) + sources."@vue/babel-preset-jsx-1.1.2" + sources."@vue/babel-sugar-functional-vue-1.1.2" + sources."@vue/babel-sugar-inject-h-1.1.2" + sources."@vue/babel-sugar-v-model-1.1.2" + sources."@vue/babel-sugar-v-on-1.1.2" + sources."@vue/cli-overlay-4.4.6" + (sources."@vue/cli-plugin-babel-4.4.6" // { + dependencies = [ + sources."@vue/cli-shared-utils-4.4.6" + sources."request-2.88.2" + sources."semver-6.3.0" + sources."tough-cookie-2.5.0" + ]; + }) + (sources."@vue/cli-plugin-eslint-4.4.6" // { + dependencies = [ + sources."@vue/cli-shared-utils-4.4.6" + sources."ansi-styles-4.2.1" + sources."cli-cursor-3.1.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."has-flag-4.0.0" + (sources."inquirer-7.2.0" // { + dependencies = [ + sources."chalk-3.0.0" + ]; + }) + sources."is-fullwidth-code-point-3.0.0" + sources."mimic-fn-2.1.0" + sources."onetime-5.1.0" + sources."request-2.88.2" + sources."restore-cursor-3.1.0" + sources."run-async-2.4.1" + sources."semver-6.3.0" + sources."string-width-4.2.0" + sources."supports-color-7.1.0" + sources."tough-cookie-2.5.0" + ]; + }) + (sources."@vue/cli-plugin-router-4.4.6" // { + dependencies = [ + sources."@vue/cli-shared-utils-4.4.6" + sources."request-2.88.2" + sources."semver-6.3.0" + sources."tough-cookie-2.5.0" + ]; + }) + sources."@vue/cli-plugin-typescript-4.4.6" + sources."@vue/cli-plugin-vuex-4.4.6" + (sources."@vue/cli-service-4.4.6" // { + dependencies = [ + sources."@vue/cli-plugin-router-4.4.6" + sources."@vue/cli-plugin-vuex-4.4.6" + sources."@vue/cli-shared-utils-4.4.6" + sources."acorn-7.3.1" + sources."ajv-6.12.2" + sources."browserslist-4.12.2" + sources."cacache-13.0.1" + sources."caniuse-lite-1.0.30001090" + sources."cliui-6.0.0" + sources."electron-to-chromium-1.3.483" + sources."fast-deep-equal-3.1.3" + sources."find-cache-dir-3.3.1" + sources."find-up-4.1.0" + sources."is-fullwidth-code-point-3.0.0" + sources."locate-path-5.0.0" + sources."make-dir-3.1.0" + sources."node-releases-1.1.58" + sources."p-limit-2.3.0" + sources."p-locate-4.1.0" + sources."path-exists-4.0.0" + sources."pkg-dir-4.2.0" + sources."request-2.88.2" + sources."schema-utils-2.7.0" + sources."semver-6.3.0" + sources."serialize-javascript-3.1.0" + sources."ssri-7.1.0" + sources."string-width-4.2.0" + sources."terser-4.8.0" + sources."terser-webpack-plugin-2.3.7" + sources."tough-cookie-2.5.0" + ]; + }) + (sources."@vue/cli-shared-utils-4.4.6" // { + dependencies = [ + sources."request-2.88.2" + sources."semver-6.3.0" + sources."tough-cookie-2.5.0" + ]; + }) + (sources."@vue/component-compiler-utils-3.1.2" // { + dependencies = [ + sources."hash-sum-1.0.2" + sources."lru-cache-4.1.5" + sources."yallist-2.1.2" + ]; + }) + sources."@vue/eslint-config-typescript-5.0.2" + sources."@vue/preload-webpack-plugin-1.1.1" + sources."@vue/web-component-wrapper-1.2.0" + sources."@webassemblyjs/ast-1.9.0" + sources."@webassemblyjs/floating-point-hex-parser-1.9.0" + sources."@webassemblyjs/helper-api-error-1.9.0" + sources."@webassemblyjs/helper-buffer-1.9.0" + sources."@webassemblyjs/helper-code-frame-1.9.0" + sources."@webassemblyjs/helper-fsm-1.9.0" + sources."@webassemblyjs/helper-module-context-1.9.0" + sources."@webassemblyjs/helper-wasm-bytecode-1.9.0" + sources."@webassemblyjs/helper-wasm-section-1.9.0" + sources."@webassemblyjs/ieee754-1.9.0" + sources."@webassemblyjs/leb128-1.9.0" + sources."@webassemblyjs/utf8-1.9.0" + sources."@webassemblyjs/wasm-edit-1.9.0" + sources."@webassemblyjs/wasm-gen-1.9.0" + sources."@webassemblyjs/wasm-opt-1.9.0" + sources."@webassemblyjs/wasm-parser-1.9.0" + sources."@webassemblyjs/wast-parser-1.9.0" + sources."@webassemblyjs/wast-printer-1.9.0" + sources."@xtuc/ieee754-1.2.0" + sources."@xtuc/long-4.2.2" + sources."abbrev-1.1.1" + sources."accepts-1.3.7" + sources."acorn-6.4.1" + sources."acorn-jsx-5.1.0" + sources."acorn-walk-7.2.0" + sources."address-1.1.2" + sources."aggregate-error-3.0.1" + sources."ajv-6.10.2" + sources."ajv-errors-1.0.1" + sources."ajv-keywords-3.4.1" + sources."alphanum-sort-1.0.2" + sources."amdefine-1.0.1" + sources."ansi-colors-3.2.4" + (sources."ansi-escapes-4.3.0" // { + dependencies = [ + sources."type-fest-0.8.1" + ]; + }) + sources."ansi-html-0.0.7" + sources."ansi-regex-4.1.0" + sources."ansi-styles-3.2.1" + sources."any-promise-1.3.0" + (sources."anymatch-2.0.0" // { + dependencies = [ + sources."normalize-path-2.1.1" + ]; + }) + sources."aproba-1.2.0" + sources."arch-2.1.2" + sources."are-we-there-yet-1.1.5" + 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-find-index-1.0.2" + 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."asn1-0.2.4" + sources."asn1.js-4.10.1" + (sources."assert-1.5.0" // { + dependencies = [ + sources."inherits-2.0.1" + sources."util-0.10.3" + ]; + }) + sources."assert-plus-1.0.0" + sources."assign-symbols-1.0.0" + sources."astral-regex-1.0.0" + sources."async-2.6.3" + sources."async-each-1.0.3" + sources."async-foreach-0.1.3" + sources."async-limiter-1.0.1" + sources."asynckit-0.4.0" + sources."atob-2.1.2" + (sources."autoprefixer-9.8.4" // { + dependencies = [ + sources."browserslist-4.12.2" + sources."caniuse-lite-1.0.30001090" + sources."electron-to-chromium-1.3.483" + sources."node-releases-1.1.58" + ]; + }) + sources."aws-sign2-0.7.0" + sources."aws4-1.9.0" + (sources."babel-code-frame-6.26.0" // { + dependencies = [ + sources."ansi-regex-2.1.1" + sources."ansi-styles-2.2.1" + sources."chalk-1.1.3" + sources."js-tokens-3.0.2" + sources."strip-ansi-3.0.1" + sources."supports-color-2.0.0" + ]; + }) + (sources."babel-loader-8.1.0" // { + dependencies = [ + sources."ajv-6.12.2" + sources."emojis-list-3.0.0" + sources."fast-deep-equal-3.1.3" + sources."json5-1.0.1" + sources."loader-utils-1.4.0" + sources."mkdirp-0.5.5" + sources."schema-utils-2.7.0" + ]; + }) + sources."babel-plugin-dynamic-import-node-2.3.3" + sources."balanced-match-1.0.0" + (sources."base-0.11.2" // { + dependencies = [ + sources."define-property-1.0.0" + sources."is-accessor-descriptor-1.0.0" + sources."is-data-descriptor-1.0.0" + sources."is-descriptor-1.0.2" + ]; + }) + sources."base64-js-1.3.1" + sources."batch-0.6.1" + sources."bcrypt-pbkdf-1.0.2" + sources."bfj-6.1.2" + sources."big.js-5.2.2" + sources."binary-extensions-1.13.1" + sources."bindings-1.5.0" + sources."block-stream-0.0.9" + sources."bluebird-3.7.2" + sources."bn.js-4.11.8" + (sources."body-parser-1.19.0" // { + dependencies = [ + sources."debug-2.6.9" + sources."ms-2.0.0" + sources."qs-6.7.0" + ]; + }) + (sources."bonjour-3.5.0" // { + dependencies = [ + sources."array-flatten-2.1.2" + ]; + }) + sources."boolbase-1.0.0" + sources."brace-expansion-1.1.11" + (sources."braces-2.3.2" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + sources."brorand-1.1.0" + sources."browserify-aes-1.2.0" + sources."browserify-cipher-1.0.1" + sources."browserify-des-1.0.2" + sources."browserify-rsa-4.0.1" + sources."browserify-sign-4.0.4" + sources."browserify-zlib-0.2.0" + sources."browserslist-4.11.1" + sources."buefy-0.8.15" + sources."buffer-4.9.2" + sources."buffer-from-1.1.1" + sources."buffer-indexof-1.1.1" + sources."buffer-json-2.0.0" + sources."buffer-xor-1.0.3" + sources."builtin-modules-1.1.1" + sources."builtin-status-codes-3.0.0" + sources."bulma-0.7.5" + sources."bytes-3.1.0" + sources."cacache-12.0.4" + sources."cache-base-1.0.1" + (sources."cache-loader-4.1.0" // { + dependencies = [ + sources."find-cache-dir-3.3.1" + sources."find-up-4.1.0" + sources."locate-path-5.0.0" + sources."make-dir-3.0.2" + sources."p-locate-4.1.0" + sources."path-exists-4.0.0" + sources."pkg-dir-4.2.0" + sources."semver-6.3.0" + ]; + }) + sources."call-me-maybe-1.0.1" + sources."caller-callsite-2.0.0" + sources."caller-path-2.0.0" + sources."callsites-2.0.0" + sources."camel-case-3.0.0" + sources."camelcase-5.3.1" + (sources."camelcase-keys-2.1.0" // { + dependencies = [ + sources."camelcase-2.1.1" + ]; + }) + sources."caniuse-api-3.0.0" + sources."caniuse-lite-1.0.30001038" + sources."case-sensitive-paths-webpack-plugin-2.3.0" + sources."caseless-0.12.0" + sources."chalk-2.4.2" + sources."chardet-0.7.0" + sources."check-types-8.0.3" + sources."chokidar-2.1.8" + sources."chownr-1.1.4" + sources."chrome-trace-event-1.0.2" + sources."ci-info-1.6.0" + sources."cipher-base-1.0.4" + (sources."class-utils-0.3.6" // { + dependencies = [ + sources."define-property-0.2.5" + ]; + }) + sources."clean-css-4.2.3" + sources."clean-stack-2.2.0" + sources."cli-cursor-2.1.0" + (sources."cli-highlight-2.1.4" // { + 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."cli-spinners-2.2.0" + sources."cli-table3-0.5.1" + sources."cli-width-2.2.0" + (sources."clipboardy-2.3.0" // { + dependencies = [ + sources."is-wsl-2.2.0" + ]; + }) + (sources."cliui-5.0.0" // { + dependencies = [ + sources."emoji-regex-7.0.3" + sources."string-width-3.1.0" + sources."strip-ansi-5.2.0" + sources."wrap-ansi-5.1.0" + ]; + }) + sources."clone-1.0.4" + sources."clone-deep-4.0.1" + sources."coa-2.0.2" + sources."code-point-at-1.1.0" + sources."collection-visit-1.0.0" + sources."color-3.1.2" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."color-string-1.5.3" + sources."colorette-1.2.0" + sources."colors-1.4.0" + sources."combined-stream-1.0.8" + sources."commander-2.20.3" + sources."commondir-1.0.1" + sources."component-emitter-1.3.0" + (sources."compressible-2.0.18" // { + dependencies = [ + sources."mime-db-1.44.0" + ]; + }) + (sources."compression-1.7.4" // { + dependencies = [ + sources."bytes-3.0.0" + sources."debug-2.6.9" + sources."ms-2.0.0" + ]; + }) + sources."concat-map-0.0.1" + sources."concat-stream-1.6.2" + sources."connect-history-api-fallback-1.6.0" + sources."console-browserify-1.2.0" + sources."console-control-strings-1.1.0" + sources."consolidate-0.15.1" + sources."constants-browserify-1.0.0" + sources."content-disposition-0.5.3" + sources."content-type-1.0.4" + sources."convert-source-map-1.7.0" + sources."cookie-0.4.0" + sources."cookie-signature-1.0.6" + sources."copy-concurrently-1.0.5" + sources."copy-descriptor-0.1.1" + (sources."copy-webpack-plugin-5.1.1" // { + dependencies = [ + sources."globby-7.1.1" + sources."ignore-3.3.10" + sources."pify-3.0.0" + sources."schema-utils-1.0.0" + sources."slash-1.0.0" + ]; + }) + sources."core-js-3.6.5" + (sources."core-js-compat-3.6.5" // { + dependencies = [ + sources."semver-7.0.0" + ]; + }) + sources."core-util-is-1.0.2" + (sources."cosmiconfig-5.2.1" // { + dependencies = [ + sources."parse-json-4.0.0" + ]; + }) + sources."create-ecdh-4.0.3" + 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-names-0.0.4" + sources."css-declaration-sorter-4.0.1" + (sources."css-loader-3.6.0" // { + dependencies = [ + sources."ajv-6.12.2" + sources."fast-deep-equal-3.1.3" + sources."schema-utils-2.7.0" + sources."semver-6.3.0" + ]; + }) + sources."css-select-2.1.0" + sources."css-select-base-adapter-0.1.1" + sources."css-tree-1.0.0-alpha.37" + sources."css-what-3.3.0" + sources."cssesc-3.0.0" + sources."cssnano-4.1.10" + sources."cssnano-preset-default-4.0.7" + sources."cssnano-util-get-arguments-4.0.0" + sources."cssnano-util-get-match-4.0.0" + sources."cssnano-util-raw-cache-4.0.1" + sources."cssnano-util-same-parent-4.0.1" + (sources."csso-4.0.3" // { + dependencies = [ + sources."css-tree-1.0.0-alpha.39" + sources."mdn-data-2.0.6" + ]; + }) + sources."currently-unhandled-0.4.1" + sources."cyclist-1.0.1" + sources."dashdash-1.14.1" + sources."de-indent-1.0.2" + sources."debug-4.1.1" + sources."decamelize-1.2.0" + sources."decode-uri-component-0.2.0" + sources."deep-equal-1.1.1" + sources."deep-is-0.1.3" + sources."deepmerge-1.5.2" + (sources."default-gateway-5.0.5" // { + dependencies = [ + sources."cross-spawn-7.0.3" + sources."execa-3.4.0" + sources."get-stream-5.1.0" + sources."is-stream-2.0.0" + sources."mimic-fn-2.1.0" + sources."npm-run-path-4.0.1" + sources."onetime-5.1.0" + sources."p-finally-2.0.1" + sources."path-key-3.1.1" + sources."shebang-command-2.0.0" + sources."shebang-regex-3.0.0" + sources."which-2.0.2" + ]; + }) + sources."defaults-1.0.3" + sources."define-properties-1.1.3" + (sources."define-property-2.0.2" // { + dependencies = [ + sources."is-accessor-descriptor-1.0.0" + sources."is-data-descriptor-1.0.0" + sources."is-descriptor-1.0.2" + ]; + }) + (sources."del-4.1.1" // { + dependencies = [ + (sources."globby-6.1.0" // { + dependencies = [ + sources."pify-2.3.0" + ]; + }) + sources."p-map-2.1.0" + ]; + }) + sources."delayed-stream-1.0.0" + sources."delegates-1.0.0" + sources."depd-1.1.2" + sources."des.js-1.0.1" + sources."destroy-1.0.4" + sources."detect-node-2.0.4" + sources."diff-4.0.2" + sources."diffie-hellman-5.0.3" + sources."dir-glob-2.2.2" + sources."dns-equal-1.0.0" + sources."dns-packet-1.3.1" + sources."dns-txt-2.0.2" + sources."doctrine-3.0.0" + sources."dom-converter-0.2.0" + (sources."dom-serializer-0.2.2" // { + dependencies = [ + sources."domelementtype-2.0.1" + ]; + }) + sources."domain-browser-1.2.0" + sources."domelementtype-1.3.1" + sources."domhandler-2.4.2" + sources."domutils-1.7.0" + sources."dot-object-1.9.0" + sources."dot-prop-5.2.0" + sources."dotenv-8.2.0" + sources."dotenv-expand-5.1.0" + sources."duplexer-0.1.1" + sources."duplexify-3.7.1" + sources."easy-stack-1.0.0" + sources."ecc-jsbn-0.1.2" + sources."ee-first-1.1.1" + sources."ejs-2.7.4" + sources."electron-to-chromium-1.3.393" + sources."elliptic-6.5.2" + sources."emoji-regex-8.0.0" + sources."emojis-list-2.1.0" + sources."encodeurl-1.0.2" + sources."end-of-stream-1.4.4" + (sources."enhanced-resolve-4.1.1" // { + dependencies = [ + sources."memory-fs-0.5.0" + ]; + }) + sources."entities-2.0.3" + sources."errno-0.1.7" + sources."error-ex-1.3.2" + sources."error-stack-parser-2.0.6" + sources."es-abstract-1.17.0-next.1" + sources."es-to-primitive-1.2.1" + sources."escalade-3.0.1" + sources."escape-html-1.0.3" + sources."escape-string-regexp-1.0.5" + (sources."eslint-6.8.0" // { + dependencies = [ + sources."glob-parent-5.1.0" + sources."globals-12.3.0" + sources."import-fresh-3.2.1" + sources."regexpp-2.0.1" + sources."resolve-from-4.0.0" + sources."semver-6.3.0" + sources."strip-ansi-5.2.0" + sources."type-fest-0.8.1" + ]; + }) + (sources."eslint-config-prettier-6.11.0" // { + dependencies = [ + sources."get-stdin-6.0.0" + ]; + }) + sources."eslint-loader-2.2.1" + sources."eslint-plugin-prettier-3.1.4" + sources."eslint-plugin-vue-6.2.2" + sources."eslint-scope-5.0.0" + sources."eslint-utils-1.4.3" + sources."eslint-visitor-keys-1.1.0" + sources."esm-3.2.25" + (sources."espree-6.1.2" // { + dependencies = [ + sources."acorn-7.1.1" + ]; + }) + sources."esprima-4.0.1" + sources."esquery-1.0.1" + sources."esrecurse-4.2.1" + sources."estraverse-4.3.0" + sources."esutils-2.0.3" + sources."etag-1.8.1" + sources."event-pubsub-4.3.0" + sources."eventemitter3-4.0.4" + sources."events-3.1.0" + sources."eventsource-1.0.7" + sources."evp_bytestokey-1.0.3" + sources."execa-1.0.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."ms-2.0.0" + ]; + }) + (sources."express-4.17.1" // { + dependencies = [ + sources."debug-2.6.9" + sources."ms-2.0.0" + sources."qs-6.7.0" + ]; + }) + sources."extend-3.0.2" + (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."is-accessor-descriptor-1.0.0" + sources."is-data-descriptor-1.0.0" + sources."is-descriptor-1.0.2" + ]; + }) + sources."extsprintf-1.3.0" + sources."fast-deep-equal-2.0.1" + sources."fast-diff-1.2.0" + sources."fast-glob-2.2.7" + sources."fast-json-stable-stringify-2.1.0" + sources."fast-levenshtein-2.0.6" + sources."faye-websocket-0.10.0" + sources."figgy-pudding-3.5.2" + sources."figures-3.1.0" + sources."file-entry-cache-5.0.1" + sources."file-loader-4.3.0" + sources."file-uri-to-path-1.0.0" + sources."filesize-3.6.1" + (sources."fill-range-4.0.0" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + (sources."finalhandler-1.1.2" // { + dependencies = [ + sources."debug-2.6.9" + sources."ms-2.0.0" + ]; + }) + sources."find-cache-dir-2.1.0" + sources."find-up-3.0.0" + sources."flat-5.0.2" + (sources."flat-cache-2.0.1" // { + dependencies = [ + sources."rimraf-2.6.3" + ]; + }) + sources."flatted-2.0.1" + sources."flush-write-stream-1.1.1" + sources."follow-redirects-1.12.1" + sources."for-in-1.0.2" + sources."forever-agent-0.6.1" + (sources."fork-ts-checker-webpack-plugin-3.1.1" // { + dependencies = [ + sources."anymatch-3.1.1" + sources."binary-extensions-2.1.0" + sources."braces-3.0.2" + sources."chokidar-3.4.0" + sources."fill-range-7.0.1" + sources."fsevents-2.1.3" + sources."glob-parent-5.1.1" + sources."is-binary-path-2.1.0" + sources."is-number-7.0.0" + sources."readdirp-3.4.0" + sources."to-regex-range-5.0.1" + ]; + }) + sources."form-data-2.3.3" + sources."forwarded-0.1.2" + sources."fragment-cache-0.2.1" + sources."fresh-0.5.2" + sources."from2-2.3.0" + sources."fs-extra-7.0.1" + sources."fs-minipass-2.1.0" + sources."fs-write-stream-atomic-1.0.10" + sources."fs.realpath-1.0.0" + sources."fsevents-1.2.12" + sources."fstream-1.0.12" + sources."function-bind-1.1.1" + sources."functional-red-black-tree-1.0.1" + (sources."gauge-2.7.4" // { + dependencies = [ + sources."ansi-regex-2.1.1" + sources."is-fullwidth-code-point-1.0.0" + sources."string-width-1.0.2" + sources."strip-ansi-3.0.1" + ]; + }) + sources."gaze-1.1.3" + sources."gensync-1.0.0-beta.1" + sources."get-caller-file-2.0.5" + sources."get-stdin-4.0.1" + sources."get-stream-4.1.0" + sources."get-value-2.0.6" + sources."getpass-0.1.7" + 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."globals-11.12.0" + sources."globby-9.2.0" + sources."globule-1.3.2" + sources."graceful-fs-4.2.3" + sources."gzip-size-5.1.1" + sources."hammerjs-2.0.8" + sources."handle-thing-2.0.1" + sources."har-schema-2.0.0" + sources."har-validator-5.1.3" + sources."has-1.0.3" + (sources."has-ansi-2.0.0" // { + dependencies = [ + sources."ansi-regex-2.1.1" + ]; + }) + sources."has-flag-3.0.0" + sources."has-symbols-1.0.1" + sources."has-unicode-2.0.1" + sources."has-value-1.0.0" + (sources."has-values-1.0.0" // { + dependencies = [ + sources."kind-of-4.0.0" + ]; + }) + sources."hash-base-3.0.4" + sources."hash-sum-2.0.0" + sources."hash.js-1.1.7" + sources."he-1.2.0" + sources."hex-color-regex-1.1.0" + sources."highlight.js-9.18.1" + sources."hmac-drbg-1.0.1" + sources."hoopy-0.1.4" + sources."hosted-git-info-2.8.5" + sources."hpack.js-2.1.6" + sources."hsl-regex-1.0.0" + sources."hsla-regex-1.0.0" + sources."html-comment-regex-1.1.2" + sources."html-entities-1.3.1" + (sources."html-minifier-3.5.21" // { + dependencies = [ + sources."commander-2.17.1" + ]; + }) + sources."html-tags-2.0.0" + (sources."html-webpack-plugin-3.2.0" // { + dependencies = [ + sources."big.js-3.2.0" + sources."json5-0.5.1" + sources."loader-utils-0.2.17" + sources."util.promisify-1.0.0" + ]; + }) + (sources."htmlparser2-3.10.1" // { + dependencies = [ + sources."entities-1.1.2" + sources."readable-stream-3.6.0" + ]; + }) + sources."http-deceiver-1.2.7" + (sources."http-errors-1.7.2" // { + dependencies = [ + sources."inherits-2.0.3" + ]; + }) + sources."http-proxy-1.18.1" + sources."http-proxy-middleware-0.19.1" + sources."http-signature-1.2.0" + sources."https-browserify-1.0.0" + sources."human-signals-1.1.1" + sources."iconv-lite-0.4.24" + sources."icss-utils-4.1.1" + sources."ieee754-1.1.13" + sources."iferr-0.1.5" + sources."ignore-4.0.6" + sources."import-cwd-2.1.0" + sources."import-fresh-2.0.0" + sources."import-from-2.1.0" + sources."import-local-2.0.0" + sources."imurmurhash-0.1.4" + sources."in-publish-2.0.1" + sources."indent-string-4.0.0" + sources."indexes-of-1.0.1" + sources."infer-owner-1.0.4" + sources."inflight-1.0.6" + sources."inherits-2.0.4" + (sources."inquirer-7.0.1" // { + dependencies = [ + sources."ansi-regex-5.0.0" + sources."cli-cursor-3.1.0" + sources."is-fullwidth-code-point-3.0.0" + sources."mimic-fn-2.1.0" + sources."onetime-5.1.0" + sources."restore-cursor-3.1.0" + (sources."string-width-4.2.0" // { + dependencies = [ + sources."strip-ansi-6.0.0" + ]; + }) + (sources."strip-ansi-5.2.0" // { + dependencies = [ + sources."ansi-regex-4.1.0" + ]; + }) + ]; + }) + (sources."internal-ip-4.3.0" // { + dependencies = [ + sources."default-gateway-4.2.0" + ]; + }) + sources."invariant-2.2.4" + sources."ip-1.1.5" + sources."ip-regex-2.1.0" + sources."ipaddr.js-1.9.1" + sources."is-absolute-url-2.1.0" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-arguments-1.0.4" + sources."is-arrayish-0.2.1" + sources."is-binary-path-1.0.1" + sources."is-buffer-1.1.6" + sources."is-callable-1.1.5" + sources."is-ci-1.2.1" + sources."is-color-stop-1.1.0" + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-date-object-1.0.2" + (sources."is-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-5.1.0" + ]; + }) + sources."is-directory-0.3.1" + sources."is-docker-2.0.0" + sources."is-extendable-0.1.1" + sources."is-extglob-2.1.1" + sources."is-finite-1.1.0" + sources."is-fullwidth-code-point-2.0.0" + sources."is-glob-4.0.1" + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-obj-2.0.0" + sources."is-path-cwd-2.2.0" + sources."is-path-in-cwd-2.1.0" + sources."is-path-inside-2.1.0" + sources."is-plain-obj-1.1.0" + sources."is-plain-object-2.0.4" + sources."is-promise-2.1.0" + sources."is-regex-1.0.5" + sources."is-resolvable-1.1.0" + sources."is-stream-1.1.0" + sources."is-svg-3.0.0" + sources."is-symbol-1.0.3" + sources."is-typedarray-1.0.0" + sources."is-utf8-0.2.1" + sources."is-valid-glob-1.0.0" + sources."is-windows-1.0.2" + sources."is-wsl-1.1.0" + sources."isarray-1.0.0" + sources."isexe-2.0.0" + sources."isobject-3.0.1" + sources."isstream-0.1.2" + sources."javascript-stringify-2.0.1" + (sources."jest-worker-25.5.0" // { + dependencies = [ + sources."has-flag-4.0.0" + sources."supports-color-7.1.0" + ]; + }) + sources."js-base64-2.6.2" + sources."js-message-1.0.5" + sources."js-queue-2.0.0" + sources."js-tokens-4.0.0" + sources."js-yaml-3.13.1" + sources."jsbn-0.1.1" + sources."jsesc-2.5.2" + sources."json-parse-better-errors-1.0.2" + sources."json-schema-0.2.3" + sources."json-schema-traverse-0.4.1" + sources."json-stable-stringify-without-jsonify-1.0.1" + sources."json-stringify-safe-5.0.1" + sources."json3-3.3.3" + sources."json5-2.1.3" + sources."jsonfile-4.0.0" + sources."jsprim-1.4.1" + sources."killable-1.0.1" + sources."kind-of-6.0.3" + sources."launch-editor-2.2.1" + sources."launch-editor-middleware-2.2.1" + sources."leven-3.1.0" + sources."levenary-1.1.1" + sources."levn-0.3.0" + sources."lines-and-columns-1.1.6" + (sources."load-json-file-1.1.0" // { + dependencies = [ + sources."parse-json-2.2.0" + sources."pify-2.3.0" + ]; + }) + (sources."loader-fs-cache-1.0.3" // { + dependencies = [ + sources."find-cache-dir-0.1.1" + sources."find-up-1.1.2" + sources."path-exists-2.1.0" + sources."pkg-dir-1.0.0" + ]; + }) + sources."loader-runner-2.4.0" + (sources."loader-utils-1.2.3" // { + dependencies = [ + sources."json5-1.0.1" + ]; + }) + sources."locate-path-3.0.0" + sources."lodash-4.17.15" + sources."lodash.defaultsdeep-4.6.1" + sources."lodash.kebabcase-4.1.1" + sources."lodash.mapvalues-4.6.0" + sources."lodash.memoize-4.1.2" + sources."lodash.transform-4.6.0" + sources."lodash.uniq-4.5.0" + sources."log-symbols-2.2.0" + sources."loglevel-1.6.8" + sources."loose-envify-1.4.0" + sources."loud-rejection-1.6.0" + sources."lower-case-1.1.4" + sources."lru-cache-5.1.1" + sources."make-dir-2.1.0" + sources."map-cache-0.2.2" + sources."map-obj-1.0.1" + sources."map-visit-1.0.0" + sources."marked-1.1.1" + sources."md5.js-1.3.5" + sources."mdn-data-2.0.4" + sources."media-typer-0.3.0" + sources."memory-fs-0.4.1" + sources."meow-3.7.0" + sources."merge-descriptors-1.0.1" + sources."merge-source-map-1.1.0" + sources."merge-stream-2.0.0" + sources."merge2-1.3.0" + sources."methods-1.1.2" + sources."microevent.ts-0.1.1" + sources."micromatch-3.1.10" + sources."miller-rabin-4.0.1" + sources."mime-2.4.6" + sources."mime-db-1.42.0" + sources."mime-types-2.1.25" + sources."mimic-fn-1.2.0" + (sources."mini-css-extract-plugin-0.9.0" // { + dependencies = [ + sources."normalize-url-1.9.1" + sources."schema-utils-1.0.0" + ]; + }) + sources."minimalistic-assert-1.0.1" + sources."minimalistic-crypto-utils-1.0.1" + sources."minimatch-3.0.4" + sources."minimist-1.2.5" + (sources."minipass-3.1.3" // { + dependencies = [ + sources."yallist-4.0.0" + ]; + }) + sources."minipass-collect-1.0.2" + sources."minipass-flush-1.0.5" + sources."minipass-pipeline-1.2.3" + sources."mississippi-3.0.0" + (sources."mixin-deep-1.3.2" // { + dependencies = [ + sources."is-extendable-1.0.1" + ]; + }) + (sources."mkdirp-0.5.1" // { + dependencies = [ + sources."minimist-0.0.8" + ]; + }) + sources."move-concurrently-1.0.1" + sources."ms-2.1.2" + sources."multicast-dns-6.2.3" + sources."multicast-dns-service-types-1.1.0" + sources."mute-stream-0.0.8" + sources."mz-2.7.0" + sources."nan-2.14.0" + sources."nanomatch-1.2.13" + sources."natural-compare-1.4.0" + sources."negotiator-0.6.2" + sources."neo-async-2.6.1" + sources."nice-try-1.0.5" + sources."no-case-2.3.2" + sources."node-forge-0.9.0" + (sources."node-gyp-3.8.0" // { + dependencies = [ + sources."semver-5.3.0" + ]; + }) + sources."node-ipc-9.1.1" + (sources."node-libs-browser-2.2.1" // { + dependencies = [ + sources."punycode-1.4.1" + ]; + }) + sources."node-releases-1.1.53" + (sources."node-sass-4.14.1" // { + dependencies = [ + sources."ansi-regex-2.1.1" + sources."ansi-styles-2.2.1" + sources."chalk-1.1.3" + sources."cross-spawn-3.0.1" + sources."lru-cache-4.1.5" + sources."strip-ansi-3.0.1" + sources."supports-color-2.0.0" + sources."yallist-2.1.2" + ]; + }) + sources."nopt-3.0.6" + sources."normalize-package-data-2.5.0" + sources."normalize-path-3.0.0" + sources."normalize-range-0.1.2" + sources."normalize-url-3.3.0" + sources."npm-run-path-2.0.2" + sources."npmlog-4.1.2" + sources."nth-check-1.0.2" + sources."num2fraction-1.2.2" + sources."number-is-nan-1.0.1" + sources."oauth-sign-0.9.0" + sources."object-assign-4.1.1" + (sources."object-copy-0.1.0" // { + dependencies = [ + sources."define-property-0.2.5" + sources."kind-of-3.2.2" + ]; + }) + sources."object-hash-1.3.1" + sources."object-inspect-1.7.0" + (sources."object-is-1.1.2" // { + dependencies = [ + sources."es-abstract-1.17.6" + sources."is-callable-1.2.0" + sources."is-regex-1.1.0" + ]; + }) + sources."object-keys-1.1.1" + 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."object.values-1.1.1" + sources."obuf-1.1.2" + sources."on-finished-2.3.0" + sources."on-headers-1.0.2" + sources."once-1.4.0" + sources."onetime-2.0.1" + sources."open-6.4.0" + sources."opener-1.5.1" + sources."opn-5.5.0" + sources."optionator-0.8.3" + (sources."ora-3.4.0" // { + dependencies = [ + sources."strip-ansi-5.2.0" + ]; + }) + sources."original-1.0.2" + sources."os-browserify-0.3.0" + sources."os-homedir-1.0.2" + sources."os-tmpdir-1.0.2" + sources."osenv-0.1.5" + sources."p-finally-1.0.0" + sources."p-limit-2.2.1" + sources."p-locate-3.0.0" + sources."p-map-3.0.0" + sources."p-retry-3.0.1" + sources."p-try-2.2.0" + sources."pako-1.0.11" + sources."parallel-transform-1.2.0" + sources."param-case-2.1.1" + (sources."parent-module-1.0.1" // { + dependencies = [ + sources."callsites-3.1.0" + ]; + }) + sources."parse-asn1-5.1.5" + sources."parse-json-5.0.0" + sources."parse5-5.1.1" + sources."parse5-htmlparser2-tree-adapter-5.1.1" + sources."parseurl-1.3.3" + sources."pascalcase-0.1.1" + sources."path-browserify-0.0.1" + sources."path-dirname-1.0.2" + sources."path-exists-3.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."path-to-regexp-0.1.7" + (sources."path-type-3.0.0" // { + dependencies = [ + sources."pify-3.0.0" + ]; + }) + sources."pbkdf2-3.0.17" + sources."performance-now-2.1.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-3.0.0" + (sources."pkg-up-2.0.0" // { + dependencies = [ + sources."find-up-2.1.0" + sources."locate-path-2.0.0" + sources."p-limit-1.3.0" + sources."p-locate-2.0.0" + sources."p-try-1.0.0" + ]; + }) + sources."pnp-webpack-plugin-1.6.4" + (sources."portfinder-1.0.26" // { + dependencies = [ + sources."debug-3.2.6" + ]; + }) + sources."posix-character-classes-0.1.1" + (sources."postcss-7.0.32" // { + dependencies = [ + sources."supports-color-6.1.0" + ]; + }) + sources."postcss-calc-7.0.2" + (sources."postcss-colormin-4.0.3" // { + dependencies = [ + sources."postcss-value-parser-3.3.1" + ]; + }) + (sources."postcss-convert-values-4.0.1" // { + dependencies = [ + sources."postcss-value-parser-3.3.1" + ]; + }) + sources."postcss-discard-comments-4.0.2" + sources."postcss-discard-duplicates-4.0.2" + sources."postcss-discard-empty-4.0.1" + sources."postcss-discard-overridden-4.0.1" + sources."postcss-load-config-2.1.0" + (sources."postcss-loader-3.0.0" // { + dependencies = [ + sources."schema-utils-1.0.0" + ]; + }) + (sources."postcss-merge-longhand-4.0.11" // { + dependencies = [ + sources."postcss-value-parser-3.3.1" + ]; + }) + (sources."postcss-merge-rules-4.0.3" // { + dependencies = [ + sources."postcss-selector-parser-3.1.2" + ]; + }) + (sources."postcss-minify-font-values-4.0.2" // { + dependencies = [ + sources."postcss-value-parser-3.3.1" + ]; + }) + (sources."postcss-minify-gradients-4.0.2" // { + dependencies = [ + sources."postcss-value-parser-3.3.1" + ]; + }) + (sources."postcss-minify-params-4.0.2" // { + dependencies = [ + sources."postcss-value-parser-3.3.1" + ]; + }) + (sources."postcss-minify-selectors-4.0.2" // { + dependencies = [ + sources."postcss-selector-parser-3.1.2" + ]; + }) + sources."postcss-modules-extract-imports-2.0.0" + sources."postcss-modules-local-by-default-3.0.2" + sources."postcss-modules-scope-2.2.0" + sources."postcss-modules-values-3.0.0" + sources."postcss-normalize-charset-4.0.1" + (sources."postcss-normalize-display-values-4.0.2" // { + dependencies = [ + sources."postcss-value-parser-3.3.1" + ]; + }) + (sources."postcss-normalize-positions-4.0.2" // { + dependencies = [ + sources."postcss-value-parser-3.3.1" + ]; + }) + (sources."postcss-normalize-repeat-style-4.0.2" // { + dependencies = [ + sources."postcss-value-parser-3.3.1" + ]; + }) + (sources."postcss-normalize-string-4.0.2" // { + dependencies = [ + sources."postcss-value-parser-3.3.1" + ]; + }) + (sources."postcss-normalize-timing-functions-4.0.2" // { + dependencies = [ + sources."postcss-value-parser-3.3.1" + ]; + }) + (sources."postcss-normalize-unicode-4.0.1" // { + dependencies = [ + sources."postcss-value-parser-3.3.1" + ]; + }) + (sources."postcss-normalize-url-4.0.1" // { + dependencies = [ + sources."postcss-value-parser-3.3.1" + ]; + }) + (sources."postcss-normalize-whitespace-4.0.2" // { + dependencies = [ + sources."postcss-value-parser-3.3.1" + ]; + }) + (sources."postcss-ordered-values-4.1.2" // { + dependencies = [ + sources."postcss-value-parser-3.3.1" + ]; + }) + sources."postcss-reduce-initial-4.0.3" + (sources."postcss-reduce-transforms-4.0.2" // { + dependencies = [ + sources."postcss-value-parser-3.3.1" + ]; + }) + sources."postcss-selector-parser-6.0.2" + (sources."postcss-svgo-4.0.2" // { + dependencies = [ + sources."postcss-value-parser-3.3.1" + ]; + }) + sources."postcss-unique-selectors-4.0.1" + sources."postcss-value-parser-4.1.0" + sources."prelude-ls-1.1.2" + sources."prepend-http-1.0.4" + sources."prettier-1.19.1" + sources."prettier-linter-helpers-1.0.0" + sources."pretty-error-2.1.1" + sources."private-0.1.8" + sources."process-0.11.10" + sources."process-nextick-args-2.0.1" + sources."progress-2.0.3" + sources."promise-inflight-1.0.1" + sources."proxy-addr-2.0.6" + sources."prr-1.0.1" + sources."pseudomap-1.0.2" + sources."psl-1.6.0" + sources."public-encrypt-4.0.3" + sources."pump-3.0.0" + (sources."pumpify-1.5.1" // { + dependencies = [ + sources."pump-2.0.1" + ]; + }) + sources."punycode-2.1.1" + sources."q-1.5.1" + sources."qs-6.5.2" + sources."query-string-4.3.4" + sources."querystring-0.2.0" + sources."querystring-es3-0.2.1" + sources."querystringify-2.1.1" + sources."randombytes-2.1.0" + sources."randomfill-1.0.4" + sources."range-parser-1.2.1" + sources."raw-body-2.4.0" + sources."read-pkg-5.2.0" + (sources."read-pkg-up-1.0.1" // { + dependencies = [ + sources."find-up-1.1.2" + sources."path-exists-2.1.0" + sources."path-type-1.1.0" + sources."pify-2.3.0" + sources."read-pkg-1.1.0" + ]; + }) + sources."readable-stream-2.3.6" + sources."readdirp-2.2.1" + (sources."redent-1.0.0" // { + dependencies = [ + sources."indent-string-2.1.0" + sources."strip-indent-1.0.1" + ]; + }) + sources."regenerate-1.4.1" + sources."regenerate-unicode-properties-8.2.0" + sources."regenerator-runtime-0.13.5" + sources."regenerator-transform-0.14.4" + sources."regex-not-1.0.2" + sources."regexp.prototype.flags-1.3.0" + sources."regexpp-3.1.0" + sources."regexpu-core-4.7.0" + sources."regjsgen-0.5.2" + (sources."regjsparser-0.6.4" // { + dependencies = [ + sources."jsesc-0.5.0" + ]; + }) + sources."relateurl-0.2.7" + sources."remove-trailing-separator-1.1.0" + (sources."renderkid-2.0.3" // { + dependencies = [ + sources."ansi-regex-2.1.1" + sources."css-select-1.2.0" + sources."css-what-2.1.3" + sources."domutils-1.5.1" + sources."strip-ansi-3.0.1" + ]; + }) + sources."repeat-element-1.1.3" + sources."repeat-string-1.6.1" + sources."repeating-2.0.1" + sources."request-2.88.2" + sources."require-directory-2.1.1" + sources."require-main-filename-2.0.0" + sources."requires-port-1.0.0" + sources."resize-observer-polyfill-1.5.1" + sources."resolve-1.14.1" + sources."resolve-cwd-2.0.0" + sources."resolve-from-3.0.0" + sources."resolve-url-0.2.1" + sources."restore-cursor-2.0.0" + sources."ret-0.1.15" + sources."retry-0.12.0" + sources."rgb-regex-1.0.1" + sources."rgba-regex-1.0.0" + sources."rimraf-2.7.1" + sources."ripemd160-2.0.2" + sources."run-async-2.3.0" + sources."run-queue-1.0.3" + sources."rxjs-6.5.3" + sources."safe-buffer-5.1.2" + sources."safe-regex-1.1.0" + sources."safer-buffer-2.1.2" + (sources."sass-graph-2.2.5" // { + dependencies = [ + sources."emoji-regex-7.0.3" + sources."string-width-3.1.0" + sources."strip-ansi-5.2.0" + sources."yargs-13.3.2" + sources."yargs-parser-13.1.2" + ]; + }) + (sources."sass-loader-8.0.2" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) + sources."sax-1.2.4" + sources."schema-utils-2.6.1" + (sources."scss-tokenizer-0.2.3" // { + dependencies = [ + sources."source-map-0.4.4" + ]; + }) + sources."select-hose-2.0.0" + sources."selfsigned-1.10.7" + sources."semver-5.7.1" + (sources."send-0.17.1" // { + dependencies = [ + (sources."debug-2.6.9" // { + dependencies = [ + sources."ms-2.0.0" + ]; + }) + sources."mime-1.6.0" + sources."ms-2.1.1" + ]; + }) + sources."serialize-javascript-2.1.2" + (sources."serve-index-1.9.1" // { + dependencies = [ + sources."debug-2.6.9" + sources."http-errors-1.6.3" + sources."inherits-2.0.3" + sources."ms-2.0.0" + sources."setprototypeof-1.1.0" + ]; + }) + 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."setimmediate-1.0.5" + sources."setprototypeof-1.1.1" + sources."sha.js-2.4.11" + sources."shallow-clone-3.0.1" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" + sources."shell-quote-1.7.2" + sources."signal-exit-3.0.2" + (sources."simple-swizzle-0.2.2" // { + dependencies = [ + sources."is-arrayish-0.3.2" + ]; + }) + sources."slash-2.0.0" + sources."slice-ansi-2.1.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."ms-2.0.0" + sources."source-map-0.5.7" + ]; + }) + (sources."snapdragon-node-2.1.1" // { + dependencies = [ + sources."define-property-1.0.0" + sources."is-accessor-descriptor-1.0.0" + sources."is-data-descriptor-1.0.0" + sources."is-descriptor-1.0.2" + ]; + }) + (sources."snapdragon-util-3.0.1" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."sockjs-0.3.20" // { + dependencies = [ + sources."uuid-3.4.0" + ]; + }) + (sources."sockjs-client-1.4.0" // { + dependencies = [ + sources."debug-3.2.6" + sources."faye-websocket-0.11.3" + ]; + }) + sources."sort-keys-1.1.2" + sources."source-list-map-2.0.1" + sources."source-map-0.6.1" + sources."source-map-resolve-0.5.3" + sources."source-map-support-0.5.16" + sources."source-map-url-0.4.0" + sources."spdx-correct-3.1.0" + sources."spdx-exceptions-2.2.0" + sources."spdx-expression-parse-3.0.0" + sources."spdx-license-ids-3.0.5" + sources."spdy-4.0.2" + (sources."spdy-transport-3.0.0" // { + dependencies = [ + sources."readable-stream-3.6.0" + ]; + }) + sources."split-string-3.1.0" + sources."sprintf-js-1.0.3" + sources."sshpk-1.16.1" + sources."ssri-6.0.1" + sources."stable-0.1.8" + sources."stackframe-1.2.0" + (sources."static-extend-0.1.2" // { + dependencies = [ + sources."define-property-0.2.5" + ]; + }) + sources."statuses-1.5.0" + sources."stdout-stream-1.4.1" + sources."stream-browserify-2.0.2" + sources."stream-each-1.2.3" + sources."stream-http-2.8.3" + sources."stream-shift-1.0.1" + sources."strict-uri-encode-1.1.0" + (sources."string-width-2.1.1" // { + dependencies = [ + sources."ansi-regex-3.0.0" + sources."strip-ansi-4.0.0" + ]; + }) + (sources."string.prototype.trimend-1.0.1" // { + dependencies = [ + sources."es-abstract-1.17.6" + sources."is-callable-1.2.0" + sources."is-regex-1.1.0" + ]; + }) + sources."string.prototype.trimleft-2.1.1" + sources."string.prototype.trimright-2.1.1" + (sources."string.prototype.trimstart-1.0.1" // { + dependencies = [ + sources."es-abstract-1.17.6" + sources."is-callable-1.2.0" + sources."is-regex-1.1.0" + ]; + }) + sources."string_decoder-1.1.1" + (sources."strip-ansi-6.0.0" // { + dependencies = [ + sources."ansi-regex-5.0.0" + ]; + }) + sources."strip-bom-2.0.0" + sources."strip-eof-1.0.0" + sources."strip-final-newline-2.0.0" + sources."strip-indent-2.0.0" + sources."strip-json-comments-3.0.1" + (sources."stylehacks-4.0.3" // { + dependencies = [ + sources."postcss-selector-parser-3.1.2" + ]; + }) + sources."supports-color-5.5.0" + sources."svg-tags-1.0.0" + sources."svgo-1.3.2" + (sources."table-5.4.6" // { + dependencies = [ + sources."emoji-regex-7.0.3" + sources."string-width-3.1.0" + sources."strip-ansi-5.2.0" + ]; + }) + sources."tapable-1.1.3" + sources."tar-2.2.2" + sources."terser-4.6.10" + (sources."terser-webpack-plugin-1.4.3" // { + dependencies = [ + sources."schema-utils-1.0.0" + ]; + }) + sources."text-table-0.2.0" + sources."thenify-3.3.1" + sources."thenify-all-1.6.0" + sources."thread-loader-2.1.3" + sources."through-2.3.8" + sources."through2-2.0.5" + sources."thunky-1.1.0" + sources."timers-browserify-2.0.11" + sources."timsort-0.3.0" + sources."tmp-0.0.33" + sources."to-arraybuffer-1.0.1" + sources."to-fast-properties-2.0.0" + (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."toidentifier-1.0.0" + sources."toposort-1.0.7" + sources."tough-cookie-2.5.0" + sources."trim-newlines-1.0.0" + sources."true-case-path-1.0.3" + sources."tryer-1.0.1" + (sources."ts-loader-6.2.2" // { + dependencies = [ + sources."braces-3.0.2" + sources."fill-range-7.0.1" + sources."is-number-7.0.0" + sources."micromatch-4.0.2" + sources."semver-6.3.0" + sources."to-regex-range-5.0.1" + ]; + }) + sources."ts-pnp-1.2.0" + sources."tslib-1.10.0" + (sources."tslint-5.20.1" // { + dependencies = [ + sources."tsutils-2.29.0" + ]; + }) + sources."tsutils-3.17.1" + sources."tty-browserify-0.0.0" + sources."tunnel-agent-0.6.0" + sources."tweetnacl-0.14.5" + sources."type-check-0.3.2" + sources."type-fest-0.6.0" + sources."type-is-1.6.18" + sources."typedarray-0.0.6" + sources."typescript-3.9.5" + (sources."uglify-js-3.4.10" // { + dependencies = [ + sources."commander-2.19.0" + ]; + }) + sources."unicode-canonical-property-names-ecmascript-1.0.4" + sources."unicode-match-property-ecmascript-1.0.4" + sources."unicode-match-property-value-ecmascript-1.2.0" + sources."unicode-property-aliases-ecmascript-1.1.0" + sources."union-value-1.0.1" + sources."uniq-1.0.1" + sources."uniqs-2.0.0" + sources."unique-filename-1.1.1" + sources."unique-slug-2.0.2" + sources."universalify-0.1.2" + sources."unpipe-1.0.0" + sources."unquote-1.1.1" + (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."upath-1.2.0" + sources."upper-case-1.1.3" + sources."uri-js-4.2.2" + sources."urix-0.1.0" + (sources."url-0.11.0" // { + dependencies = [ + sources."punycode-1.3.2" + ]; + }) + sources."url-loader-2.3.0" + sources."url-parse-1.4.7" + sources."use-3.1.1" + (sources."util-0.11.1" // { + dependencies = [ + sources."inherits-2.0.3" + ]; + }) + sources."util-deprecate-1.0.2" + (sources."util.promisify-1.0.1" // { + dependencies = [ + sources."es-abstract-1.17.6" + sources."is-callable-1.2.0" + sources."is-regex-1.1.0" + ]; + }) + sources."utila-0.4.0" + sources."utils-merge-1.0.1" + sources."uuid-3.3.3" + sources."v-lazy-image-1.4.0" + sources."v8-compile-cache-2.1.0" + sources."validate-npm-package-license-3.0.4" + sources."vary-1.1.2" + sources."vendors-1.0.4" + sources."verror-1.10.0" + sources."vm-browserify-1.1.2" + sources."vue-2.6.12" + sources."vue-class-component-7.2.5" + sources."vue-cli-plugin-buefy-0.3.7" + sources."vue-cli-plugin-fontawesome-0.2.0" + (sources."vue-cli-plugin-i18n-1.0.1" // { + dependencies = [ + sources."deepmerge-4.2.2" + sources."rimraf-3.0.2" + ]; + }) + sources."vue-dragscroll-2.1.0" + sources."vue-eslint-parser-7.0.0" + sources."vue-hot-reload-api-2.3.4" + sources."vue-i18n-8.21.0" + (sources."vue-i18n-extract-1.0.2" // { + dependencies = [ + sources."emoji-regex-7.0.3" + sources."string-width-3.1.0" + sources."strip-ansi-5.2.0" + sources."yargs-13.3.2" + sources."yargs-parser-13.1.2" + ]; + }) + (sources."vue-loader-15.9.3" // { + dependencies = [ + sources."hash-sum-1.0.2" + ]; + }) + sources."vue-property-decorator-9.0.0" + sources."vue-router-3.4.3" + (sources."vue-style-loader-4.1.2" // { + dependencies = [ + sources."hash-sum-1.0.2" + ]; + }) + sources."vue-template-compiler-2.6.12" + sources."vue-template-es2015-compiler-1.9.1" + sources."vuex-3.5.1" + sources."vuex-class-component-2.3.5" + sources."watchpack-1.6.1" + sources."wbuf-1.7.3" + sources."wcwidth-1.0.1" + (sources."webpack-4.42.1" // { + dependencies = [ + sources."eslint-scope-4.0.3" + sources."mkdirp-0.5.4" + sources."schema-utils-1.0.0" + ]; + }) + (sources."webpack-bundle-analyzer-3.8.0" // { + dependencies = [ + sources."acorn-7.3.1" + ]; + }) + sources."webpack-chain-6.4.0" + sources."webpack-dev-middleware-3.7.2" + (sources."webpack-dev-server-3.11.0" // { + dependencies = [ + sources."ansi-regex-2.1.1" + sources."emoji-regex-7.0.3" + sources."is-absolute-url-3.0.3" + sources."schema-utils-1.0.0" + sources."semver-6.3.0" + (sources."string-width-3.1.0" // { + dependencies = [ + sources."ansi-regex-4.1.0" + sources."strip-ansi-5.2.0" + ]; + }) + sources."strip-ansi-3.0.1" + sources."supports-color-6.1.0" + sources."yargs-13.3.2" + sources."yargs-parser-13.1.2" + ]; + }) + sources."webpack-log-2.0.0" + sources."webpack-merge-4.2.2" + sources."webpack-sources-1.4.3" + sources."websocket-driver-0.6.5" + sources."websocket-extensions-0.1.4" + sources."which-1.3.1" + sources."which-module-2.0.0" + sources."wide-align-1.1.3" + sources."word-wrap-1.2.3" + sources."worker-farm-1.7.0" + sources."worker-rpc-0.1.1" + (sources."wrap-ansi-6.2.0" // { + dependencies = [ + sources."ansi-styles-4.2.1" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.0" + ]; + }) + sources."wrappy-1.0.2" + sources."write-1.0.3" + sources."ws-6.2.1" + sources."xtend-4.0.2" + sources."y18n-4.0.0" + sources."yallist-3.1.1" + (sources."yargs-15.3.1" // { + dependencies = [ + sources."cliui-6.0.0" + sources."find-up-4.1.0" + 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."string-width-4.2.0" + ]; + }) + sources."yargs-parser-18.1.3" + (sources."yorkie-2.0.0" // { + dependencies = [ + sources."cross-spawn-5.1.0" + sources."execa-0.8.0" + sources."get-stream-3.0.0" + sources."lru-cache-4.1.5" + sources."normalize-path-1.0.0" + sources."yallist-2.1.2" + ]; + }) + ]; + buildInputs = globalBuildInputs; + meta = { + homepage = https://ldgallery.pacien.org/; + license = "AGPL-3"; + }; + production = false; + bypassCache = true; + reconstructLock = false; + }; +in +{ + args = args; + sources = sources; + tarball = nodeEnv.buildNodeSourceDist args; + package = nodeEnv.buildNodePackage args; + shell = nodeEnv.buildNodeShell args; +} \ No newline at end of file diff --git a/pkgs/tools/graphics/lepton/default.nix b/pkgs/tools/graphics/lepton/default.nix index cbb48fe37280..1835b9fec213 100644 --- a/pkgs/tools/graphics/lepton/default.nix +++ b/pkgs/tools/graphics/lepton/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, git, glibc }: +{ lib, stdenv, fetchFromGitHub, cmake, git, glibc }: stdenv.mkDerivation rec { version = "2019-08-20"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake git ]; buildInputs = stdenv.lib.optionals stdenv.isLinux [ glibc.static ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/dropbox/lepton"; description = "A tool to losslessly compress JPEGs"; license = licenses.asl20; diff --git a/pkgs/tools/graphics/logstalgia/default.nix b/pkgs/tools/graphics/logstalgia/default.nix index 83178824eab6..d4abee146b8e 100644 --- a/pkgs/tools/graphics/logstalgia/default.nix +++ b/pkgs/tools/graphics/logstalgia/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, SDL2, ftgl, pkgconfig, libpng, libjpeg, pcre, SDL2_image, glew +{ lib, stdenv, fetchurl, SDL2, ftgl, pkgconfig, libpng, libjpeg, pcre, SDL2_image, glew , libGLU, libGL, boost, glm, freetype }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ glew SDL2 ftgl libpng libjpeg pcre SDL2_image libGLU libGL boost glm freetype ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://logstalgia.io/"; description = "Website traffic visualization tool"; license = licenses.gpl3Plus; diff --git a/pkgs/tools/graphics/luxcorerender/default.nix b/pkgs/tools/graphics/luxcorerender/default.nix index 3afb6ebd9877..af71990e459c 100644 --- a/pkgs/tools/graphics/luxcorerender/default.nix +++ b/pkgs/tools/graphics/luxcorerender/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchFromGitHub, cmake, boost165, pkgconfig, python36 +{ lib, stdenv, fetchFromGitHub, cmake, boost165, pkg-config, python36 , tbb, openimageio, libjpeg, libpng, zlib, libtiff, ilmbase , freetype, openexr, libXdmcp, libxkbcommon, epoxy, at-spi2-core , dbus, doxygen, qt5, c-blosc, libGLU, gnome3, dconf, gtk3, pcre , bison, flex, libpthreadstubs, libX11 , embree2, makeWrapper, gsettings-desktop-schemas, glib -, withOpenCL ? true , opencl-headers, ocl-icd, opencl-clhpp +, withOpenCL ? true , opencl-headers, ocl-icd, opencl-clhpp, rocm-opencl-runtime }: let @@ -30,19 +30,19 @@ in stdenv.mkDerivation { inherit sha256; }; - buildInputs = - [ embree2 pkgconfig cmake zlib boost_static libjpeg - libtiff libpng ilmbase freetype openexr openimageio - tbb qt5.full c-blosc libGLU pcre bison - flex libX11 libpthreadstubs python libXdmcp libxkbcommon - epoxy at-spi2-core dbus doxygen - # needed for GSETTINGS_SCHEMAS_PATH - gsettings-desktop-schemas glib gtk3 - # needed for XDG_ICON_DIRS - gnome3.adwaita-icon-theme - makeWrapper - (stdenv.lib.getLib dconf) - ] ++ stdenv.lib.optionals withOpenCL [opencl-headers ocl-icd opencl-clhpp]; + nativeBuildInputs = [ cmake flex bison doxygen makeWrapper pkg-config ]; + buildInputs = [ + embree2 zlib boost_static libjpeg + libtiff libpng ilmbase freetype openexr openimageio + tbb qt5.full c-blosc libGLU pcre + libX11 libpthreadstubs python libXdmcp libxkbcommon + epoxy at-spi2-core dbus + # needed for GSETTINGS_SCHEMAS_PATH + gsettings-desktop-schemas glib gtk3 + # needed for XDG_ICON_DIRS + gnome3.adwaita-icon-theme + (stdenv.lib.getLib dconf) + ] ++ stdenv.lib.optionals withOpenCL [ opencl-headers ocl-icd opencl-clhpp rocm-opencl-runtime ]; cmakeFlags = [ "-DOpenEXR_Iex_INCLUDE_DIR=${openexr.dev}/include/OpenEXR" @@ -55,7 +55,8 @@ in stdenv.mkDerivation { "-DEMBREE_LIBRARY=${embree2}/lib/libembree.so" "-DBoost_PYTHON_LIBRARY_RELEASE=${boost_static}/lib/libboost_python3-mt.so" ] ++ stdenv.lib.optional withOpenCL - "-DOPENCL_INCLUDE_DIR=${opencl-headers}/include"; + "-DOPENCL_INCLUDE_DIR=${opencl-headers}/include"; + preConfigure = '' NIX_CFLAGS_COMPILE+=" -isystem ${python}/include/python${python.pythonVersion}" NIX_LDFLAGS+=" -lpython3" @@ -75,7 +76,7 @@ in stdenv.mkDerivation { --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib dconf}/lib/gio/modules" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Open source, physically based, unbiased rendering engine"; homepage = "https://luxcorerender.org/"; maintainers = with maintainers; [ hodapp ]; diff --git a/pkgs/tools/graphics/maim/default.nix b/pkgs/tools/graphics/maim/default.nix index 29c9144f89fe..99bbd4b13dae 100644 --- a/pkgs/tools/graphics/maim/default.nix +++ b/pkgs/tools/graphics/maim/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig +{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig , zlib, libpng, libjpeg, libGLU, libGL, glm , libX11, libXext, libXfixes, libXrandr, libXcomposite, slop, icu }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { inherit (src.meta) homepage; description = "A command-line screenshot utility"; longDescription = '' diff --git a/pkgs/tools/graphics/mesa-demos/default.nix b/pkgs/tools/graphics/mesa-demos/default.nix index 12e751e0f087..14b7a038a130 100644 --- a/pkgs/tools/graphics/mesa-demos/default.nix +++ b/pkgs/tools/graphics/mesa-demos/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, freeglut, glew, libGL, libGLU, libX11, libXext, mesa, pkg-config, wayland }: +{ lib, stdenv, fetchurl, freeglut, glew, libGL, libGLU, libX11, libXext, mesa, pkg-config, wayland }: stdenv.mkDerivation rec { pname = "mesa-demos"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Collection of demos and test programs for OpenGL and Mesa"; homepage = "https://www.mesa3d.org/"; license = licenses.mit; diff --git a/pkgs/tools/graphics/nifskope/default.nix b/pkgs/tools/graphics/nifskope/default.nix index 68cf812d052a..d91f163c50b8 100644 --- a/pkgs/tools/graphics/nifskope/default.nix +++ b/pkgs/tools/graphics/nifskope/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, qmake, qtbase, qttools, substituteAll, libGLU, wrapQtAppsHook, fetchpatch }: +{ lib, stdenv, fetchFromGitHub, qmake, qtbase, qttools, substituteAll, libGLU, wrapQtAppsHook, fetchpatch }: stdenv.mkDerivation { pname = "nifskope"; @@ -59,7 +59,7 @@ stdenv.mkDerivation { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://niftools.sourceforge.net/wiki/NifSkope"; description = "A tool for analyzing and editing NetImmerse/Gamebryo '*.nif' files"; maintainers = with maintainers; [ eelco ma27 ]; diff --git a/pkgs/tools/graphics/nip2/default.nix b/pkgs/tools/graphics/nip2/default.nix index ac4d8441bf59..421735256509 100644 --- a/pkgs/tools/graphics/nip2/default.nix +++ b/pkgs/tools/graphics/nip2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, libxml2, flex, bison, vips, gnome2, +{ lib, stdenv, fetchurl, pkgconfig, glib, libxml2, flex, bison, vips, gnome2, fftw, gsl, goffice, libgsf }: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { gnome2.gtk fftw gsl goffice libgsf ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/libvips/nip2"; description = "Graphical user interface for VIPS image processing system"; license = licenses.gpl2Plus; diff --git a/pkgs/tools/graphics/optar/default.nix b/pkgs/tools/graphics/optar/default.nix index 3061a5cebaf9..688d1c496294 100644 --- a/pkgs/tools/graphics/optar/default.nix +++ b/pkgs/tools/graphics/optar/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, imagemagick, libpng }: +{ lib, stdenv, fetchurl, imagemagick, libpng }: stdenv.mkDerivation { pname = "optar"; @@ -25,7 +25,7 @@ stdenv.mkDerivation { mkdir -p $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "OPTical ARchiver - it's a codec for encoding data on paper"; homepage = "http://ronja.twibright.com/optar/"; license = licenses.gpl2; diff --git a/pkgs/tools/graphics/optipng/default.nix b/pkgs/tools/graphics/optipng/default.nix index 93c2f2c35025..772e7d192d1c 100644 --- a/pkgs/tools/graphics/optipng/default.nix +++ b/pkgs/tools/graphics/optipng/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, libpng, static ? false +{ lib, stdenv, fetchurl, libpng +, static ? stdenv.hostPlatform.isStatic }: # This package comes with its own copy of zlib, libpng and pngxtern @@ -33,7 +34,7 @@ stdenv.mkDerivation rec { mv "$out"/bin/optipng{,.exe} '' else null; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://optipng.sourceforge.net/"; description = "A PNG optimizer"; license = licenses.zlib; diff --git a/pkgs/tools/graphics/oxipng/default.nix b/pkgs/tools/graphics/oxipng/default.nix index 1c89a1574c54..98ece65eb167 100644 --- a/pkgs/tools/graphics/oxipng/default.nix +++ b/pkgs/tools/graphics/oxipng/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchCrate, rustPlatform }: +{ lib, stdenv, fetchCrate, rustPlatform }: rustPlatform.buildRustPackage rec { version = "4.0.2"; @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { doCheck = !stdenv.isAarch64 && !stdenv.isDarwin; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/shssoichiro/oxipng"; description = "A multithreaded lossless PNG compression optimizer"; license = licenses.mit; diff --git a/pkgs/tools/graphics/pdf2svg/default.nix b/pkgs/tools/graphics/pdf2svg/default.nix index b1463544bbd7..f96f690a1cca 100644 --- a/pkgs/tools/graphics/pdf2svg/default.nix +++ b/pkgs/tools/graphics/pdf2svg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig , cairo, gtk2, poppler }: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ cairo poppler gtk2 ]; - meta = with stdenv.lib; { + meta = with lib; { description = "PDF converter to SVG format"; homepage = "http://www.cityinthesky.co.uk/opensource/pdf2svg"; license = licenses.gpl2; diff --git a/pkgs/tools/graphics/pdfread/default.nix b/pkgs/tools/graphics/pdfread/default.nix index 80f7404bc94f..912aa07ea8d4 100644 --- a/pkgs/tools/graphics/pdfread/default.nix +++ b/pkgs/tools/graphics/pdfread/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, unzip, python, makeWrapper, ghostscript, pngnq, pillow, djvulibre +{lib, stdenv, fetchurl, unzip, python, makeWrapper, ghostscript, pngnq, pillow, djvulibre , optipng, unrar}: stdenv.mkDerivation { @@ -42,7 +42,7 @@ stdenv.mkDerivation { --prefix PATH : ${stdenv.lib.makeBinPath [ ghostscript pngnq djvulibre unrar optipng ]} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "PDF/DJVU to ebook format converter"; homepage = "https://www.mobileread.com/forums/showthread.php?t=21906"; license = licenses.mit; diff --git a/pkgs/tools/graphics/pdfredacttools/default.nix b/pkgs/tools/graphics/pdfredacttools/default.nix index 28b13c782b91..31a327331d7f 100644 --- a/pkgs/tools/graphics/pdfredacttools/default.nix +++ b/pkgs/tools/graphics/pdfredacttools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python2Packages, imagemagick, exiftool, file, ghostscript }: +{ lib, stdenv, fetchFromGitHub, python2Packages, imagemagick, exiftool, file, ghostscript }: python2Packages.buildPythonApplication rec { pname = "pdf-redact-tools"; @@ -19,7 +19,7 @@ python2Packages.buildPythonApplication rec { propagatedBuildInputs = [ imagemagick exiftool ghostscript ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Redact and strip metadata from documents before publishing"; longDescription = '' PDF Redact Tools helps with securely redacting and stripping metadata diff --git a/pkgs/tools/graphics/pdftag/default.nix b/pkgs/tools/graphics/pdftag/default.nix index 7e0229363188..2d2fe74d7848 100644 --- a/pkgs/tools/graphics/pdftag/default.nix +++ b/pkgs/tools/graphics/pdftag/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, meson, vala, ninja +{ lib, stdenv, fetchFromGitHub, pkgconfig, meson, vala, ninja , gtk3, poppler, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig meson ninja wrapGAppsHook vala ]; buildInputs = [ gtk3 poppler ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Edit metadata found in PDFs"; license = licenses.gpl3; maintainers = with maintainers; [ leenaars ]; diff --git a/pkgs/tools/graphics/perceptualdiff/default.nix b/pkgs/tools/graphics/perceptualdiff/default.nix index dc5acc9433f6..2227ff402994 100644 --- a/pkgs/tools/graphics/perceptualdiff/default.nix +++ b/pkgs/tools/graphics/perceptualdiff/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, freeimage }: +{ lib, stdenv, fetchFromGitHub, cmake, freeimage }: stdenv.mkDerivation rec { pname = "perceptualdiff"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ freeimage ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A program that compares two images using a perceptually based image metric"; homepage = "https://github.com/myint/perceptualdiff"; license = licenses.gpl2; diff --git a/pkgs/tools/graphics/pfstools/default.nix b/pkgs/tools/graphics/pfstools/default.nix index f570251374cf..c22746c52146 100644 --- a/pkgs/tools/graphics/pfstools/default.nix +++ b/pkgs/tools/graphics/pfstools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, mkDerivation, fetchurl, cmake, pkgconfig, darwin +{ lib, stdenv, mkDerivation, fetchurl, cmake, pkgconfig, darwin , openexr, zlib, imagemagick, libGLU, libGL, freeglut, fftwFloat , fftw, gsl, libexif, perl, opencv2, qtbase, netpbm }: @@ -37,7 +37,7 @@ mkDerivation rec { patches = [ ./threads.patch ./pfstools.patch ./pfsalign.patch ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://pfstools.sourceforge.net/"; description = "Toolkit for manipulation of HDR images"; platforms = platforms.linux; diff --git a/pkgs/tools/graphics/ploticus/default.nix b/pkgs/tools/graphics/ploticus/default.nix index 409a91dba0d5..23d6919f78e0 100644 --- a/pkgs/tools/graphics/ploticus/default.nix +++ b/pkgs/tools/graphics/ploticus/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, zlib, libX11, libpng}: +{lib, stdenv, fetchurl, zlib, libX11, libpng}: stdenv.mkDerivation { name = "ploticus-2.42"; @@ -21,7 +21,7 @@ stdenv.mkDerivation { ln -sf pl.1 "$out"/man/man1/ploticus.1 ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A non-interactive software package for producing plots and charts"; longDescription = ''Ploticus is a free, GPL'd, non-interactive software package for producing plots, charts, and graphics from diff --git a/pkgs/tools/graphics/pngnq/default.nix b/pkgs/tools/graphics/pngnq/default.nix index ca1edda454e9..462dd2bf7e4a 100644 --- a/pkgs/tools/graphics/pngnq/default.nix +++ b/pkgs/tools/graphics/pngnq/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libpng, zlib }: +{ lib, stdenv, fetchurl, pkgconfig, libpng, zlib }: stdenv.mkDerivation rec { name = "pngnq-1.1"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sed -i '/png.h/a \#include ' src/rwpng.c ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://pngnq.sourceforge.net/"; description = "A PNG quantizer"; license = licenses.bsd3; diff --git a/pkgs/tools/graphics/pngquant/default.nix b/pkgs/tools/graphics/pngquant/default.nix index 2c9e3b272e70..64e6077062e2 100644 --- a/pkgs/tools/graphics/pngquant/default.nix +++ b/pkgs/tools/graphics/pngquant/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, libpng, zlib, lcms2 }: +{ lib, stdenv, fetchFromGitHub, pkgconfig, libpng, zlib, lcms2 }: stdenv.mkDerivation rec { pname = "pngquant"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libpng zlib lcms2 ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://pngquant.org/"; description = "A tool to convert 24/32-bit RGBA PNGs to 8-bit palette with alpha channel preserved"; platforms = platforms.unix; diff --git a/pkgs/tools/graphics/povray/default.nix b/pkgs/tools/graphics/povray/default.nix index 94ce3e7f06b1..735bba8bd4f4 100644 --- a/pkgs/tools/graphics/povray/default.nix +++ b/pkgs/tools/graphics/povray/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, boost +{ lib, stdenv, fetchFromGitHub, autoconf, automake, boost , zlib, libpng, libjpeg, libtiff, xlibsWrapper, SDL }: @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.povray.org/"; description = "Persistence of Vision Raytracer"; license = licenses.free; diff --git a/pkgs/tools/graphics/pstoedit/default.nix b/pkgs/tools/graphics/pstoedit/default.nix index ec06088ae52f..47c3bc25b2e8 100644 --- a/pkgs/tools/graphics/pstoedit/default.nix +++ b/pkgs/tools/graphics/pstoedit/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { substituteInPlace config/pstoedit.pc.in --replace '@LIBPNG_LDFLAGS@' "" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Translates PostScript and PDF graphics into other vector formats"; homepage = "https://sourceforge.net/projects/pstoedit/"; license = licenses.gpl2; diff --git a/pkgs/tools/graphics/qrcode/default.nix b/pkgs/tools/graphics/qrcode/default.nix index 909f0e397268..82c0332689b5 100644 --- a/pkgs/tools/graphics/qrcode/default.nix +++ b/pkgs/tools/graphics/qrcode/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation { pname = "qrcode-git"; @@ -19,7 +19,7 @@ stdenv.mkDerivation { cp DOCUMENTATION LICENCE "$out/share/doc/qrcode" ''; - meta = with stdenv.lib; { + meta = with lib; { description = ''A small QR-code tool''; license = licenses.gpl3Plus; maintainers = with maintainers; [ raskin ]; diff --git a/pkgs/tools/graphics/rocket/default.nix b/pkgs/tools/graphics/rocket/default.nix index 683a2c73f454..ec32d6c7140f 100644 --- a/pkgs/tools/graphics/rocket/default.nix +++ b/pkgs/tools/graphics/rocket/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, stdenv, fetchFromGitHub, qmake, qtbase }: +{ mkDerivation, lib, stdenv, fetchFromGitHub, qmake, qtbase }: mkDerivation { pname = "rocket"; @@ -21,7 +21,7 @@ mkDerivation { cp -r editor/editor $out/bin/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A tool for synchronizing music and visuals in demoscene productions"; homepage = "https://github.com/rocket/rocket"; license = licenses.zlib; diff --git a/pkgs/tools/graphics/scanbd/default.nix b/pkgs/tools/graphics/scanbd/default.nix index 14f925a4fd2d..0ad03e23b391 100644 --- a/pkgs/tools/graphics/scanbd/default.nix +++ b/pkgs/tools/graphics/scanbd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig +{ lib, stdenv, fetchurl, pkgconfig , dbus, libconfuse, libjpeg, sane-backends, systemd }: stdenv.mkDerivation rec { @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Scanner button daemon"; longDescription = '' scanbd polls a scanner's buttons, looking for button presses, function diff --git a/pkgs/tools/graphics/scrot/default.nix b/pkgs/tools/graphics/scrot/default.nix index df6fb7bcda89..2fd56d0737d4 100644 --- a/pkgs/tools/graphics/scrot/default.nix +++ b/pkgs/tools/graphics/scrot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, giblib, xlibsWrapper, autoreconfHook +{ lib, stdenv, fetchFromGitHub, giblib, xlibsWrapper, autoreconfHook , autoconf-archive, libXfixes, libXcursor, libXcomposite }: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook autoconf-archive ]; buildInputs = [ giblib xlibsWrapper libXfixes libXcursor libXcomposite ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/resurrecting-open-source-projects/scrot"; description = "A command-line screen capture utility"; platforms = platforms.linux; diff --git a/pkgs/tools/graphics/sng/default.nix b/pkgs/tools/graphics/sng/default.nix index 45f5a6f2c235..cec0b21cce24 100644 --- a/pkgs/tools/graphics/sng/default.nix +++ b/pkgs/tools/graphics/sng/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libpng, netpbm }: +{ lib, stdenv, fetchurl, libpng, netpbm }: stdenv.mkDerivation rec { pname = "sng"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { "--with-rgbtxt=${netpbm.out}/share/netpbm/misc/rgb.txt" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Minilanguage designed to represent the entire contents of a PNG file in an editable form"; homepage = "http://sng.sourceforge.net/"; license = licenses.zlib; diff --git a/pkgs/tools/graphics/spirv-cross/default.nix b/pkgs/tools/graphics/spirv-cross/default.nix index 76d554457d91..95e4d83645e0 100644 --- a/pkgs/tools/graphics/spirv-cross/default.nix +++ b/pkgs/tools/graphics/spirv-cross/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, python3 }: +{ lib, stdenv, fetchFromGitHub, cmake, python3 }: stdenv.mkDerivation rec { pname = "spirv-cross"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake python3 ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A tool designed for parsing and converting SPIR-V to other shader languages"; homepage = "https://github.com/KhronosGroup/SPIRV-Cross"; platforms = platforms.linux; diff --git a/pkgs/tools/graphics/structure-synth/default.nix b/pkgs/tools/graphics/structure-synth/default.nix index 73dd9c04be99..ec2cb359a5e0 100644 --- a/pkgs/tools/graphics/structure-synth/default.nix +++ b/pkgs/tools/graphics/structure-synth/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qt4, qmake4Hook, unzip, libGLU, makeWrapper }: +{ lib, stdenv, fetchurl, qt4, qmake4Hook, unzip, libGLU, makeWrapper }: stdenv.mkDerivation { @@ -37,7 +37,7 @@ stdenv.mkDerivation { wrapProgram "$out/bin/structure-synth" --run "cd $out/share" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Application for generating 3D structures by specifying a design grammar"; homepage = "http://structuresynth.sourceforge.net"; maintainers = with maintainers; [ hodapp ]; diff --git a/pkgs/tools/graphics/svgcleaner/default.nix b/pkgs/tools/graphics/svgcleaner/default.nix index 201b43f4f448..653e585c6ed6 100644 --- a/pkgs/tools/graphics/svgcleaner/default.nix +++ b/pkgs/tools/graphics/svgcleaner/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform }: +{ lib, stdenv, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { pname = "svgcleaner"; @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1xhwlsq9b6cnafbapm5jf48zqdx5k2vxlr701lh5f8nqvd7nxi6g"; - meta = with stdenv.lib; { + meta = with lib; { description = "A tool for tidying and optimizing SVGs"; homepage = "https://github.com/RazrFalcon/svgcleaner"; license = licenses.gpl2; diff --git a/pkgs/tools/graphics/twilight/default.nix b/pkgs/tools/graphics/twilight/default.nix index 42a86187a72d..2716c5e7c650 100644 --- a/pkgs/tools/graphics/twilight/default.nix +++ b/pkgs/tools/graphics/twilight/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , libGL, libGLU, freeglut, libX11 }: let @@ -20,7 +20,7 @@ in stdenv.mkDerivation rec { install -Dm755 twilight $out/bin/twilight ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Redo of IRIX twilight backdrop in old school OpenGL"; homepage = src.meta.homepage; license = licenses.mit; diff --git a/pkgs/tools/graphics/unpaper/default.nix b/pkgs/tools/graphics/unpaper/default.nix index f3e6f0d8b96f..a42f8bb45ee5 100644 --- a/pkgs/tools/graphics/unpaper/default.nix +++ b/pkgs/tools/graphics/unpaper/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libav, libxslt }: +{ lib, stdenv, fetchurl, pkgconfig, libav, libxslt }: stdenv.mkDerivation rec { pname = "unpaper"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libav libxslt ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.flameeyes.eu/projects/unpaper"; description = "Post-processing tool for scanned sheets of paper"; license = licenses.gpl2; diff --git a/pkgs/tools/graphics/vips/default.nix b/pkgs/tools/graphics/vips/default.nix index 2e745fc1a7c9..4ea4e49cdbe9 100644 --- a/pkgs/tools/graphics/vips/default.nix +++ b/pkgs/tools/graphics/vips/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , pkgconfig , glib , libxml2 @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { NOCONFIGURE=1 ./autogen.sh ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://libvips.github.io/libvips/"; description = "Image processing system for large images"; license = licenses.lgpl2Plus; diff --git a/pkgs/tools/graphics/vulkan-extension-layer/default.nix b/pkgs/tools/graphics/vulkan-extension-layer/default.nix index 3a7473530d60..f2ea439e0c97 100644 --- a/pkgs/tools/graphics/vulkan-extension-layer/default.nix +++ b/pkgs/tools/graphics/vulkan-extension-layer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, writeText, vulkan-headers, jq }: +{ lib, stdenv, fetchFromGitHub, cmake, writeText, vulkan-headers, jq }: stdenv.mkDerivation rec { pname = "vulkan-extension-layer"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Layers providing Vulkan features when native support is unavailable"; homepage = "https://github.com/KhronosGroup/Vulkan-ExtensionLayer/"; platforms = platforms.linux; diff --git a/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix b/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix index 9ce87b4cb671..389fae9a6393 100644 --- a/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix +++ b/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix @@ -6,15 +6,16 @@ stdenv.mkDerivation rec { pname = "vulkan-tools-lunarg"; # The version must match that in vulkan-headers - version = "1.2.141.0"; + version = "1.2.162.0"; - src = (assert version == vulkan-headers.version; fetchFromGitHub { - owner = "LunarG"; - repo = "VulkanTools"; - rev = "sdk-${version}"; - sha256 = "1zsgc1hdmivdahzrarx7a5byhgnmm5ahz366l92fmdb8pffgq42g"; - fetchSubmodules = true; - }); + src = (assert version == vulkan-headers.version; + fetchFromGitHub { + owner = "LunarG"; + repo = "VulkanTools"; + rev = "sdk-${version}"; + sha256 = "13v4202bfd7d7nwi8w12ja9k1vi10p9xxypzkpi063hmsgzxm5k5"; + fetchSubmodules = true; + }); nativeBuildInputs = [ cmake pkgconfig python3 jq ]; @@ -61,8 +62,6 @@ stdenv.mkDerivation rec { done ''; - enableParallelBuilding = true; - # Same as vulkan-validation-layers libraryPath = lib.strings.makeLibraryPath [ vulkan-loader ]; dontPatchELF = true; @@ -72,7 +71,7 @@ stdenv.mkDerivation rec { export XDG_CONFIG_DIRS=@out@/etc''${XDG_CONFIG_DIRS:+:''${XDG_CONFIG_DIRS}} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "LunarG Vulkan Tools and Utilities"; longDescription = '' Tools to aid in Vulkan development including useful layers, trace and diff --git a/pkgs/tools/graphics/vulkan-tools/default.nix b/pkgs/tools/graphics/vulkan-tools/default.nix index ff620ef8287b..87e7b861554b 100644 --- a/pkgs/tools/graphics/vulkan-tools/default.nix +++ b/pkgs/tools/graphics/vulkan-tools/default.nix @@ -4,18 +4,17 @@ stdenv.mkDerivation rec { pname = "vulkan-tools"; - version = "1.2.141.0"; + version = "1.2.162.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-Tools"; rev = "sdk-${version}"; - sha256 = "1ch56ihm7rmilipfyc4i4ww7l6i20fb3qikkpm1ch43kzn42zjaw"; + sha256 = "088vqh956zma3p1qc3p6rsygf5s395b6cv8b1x0whp2a0a1y81xz"; }; nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ python3 vulkan-headers vulkan-loader xlibsWrapper libxcb libXrandr wayland ]; - enableParallelBuilding = true; libraryPath = lib.strings.makeLibraryPath [ vulkan-loader ]; @@ -29,7 +28,7 @@ stdenv.mkDerivation rec { "-DCMAKE_INSTALL_RPATH=${libraryPath}" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Khronos official Vulkan Tools and Utilities"; longDescription = '' This project provides Vulkan tools and utilities that can assist diff --git a/pkgs/tools/graphics/xcur2png/default.nix b/pkgs/tools/graphics/xcur2png/default.nix index f917328460c2..694dba091760 100644 --- a/pkgs/tools/graphics/xcur2png/default.nix +++ b/pkgs/tools/graphics/xcur2png/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, libpng, xorg }: +{ lib, stdenv, fetchFromGitHub, pkgconfig, libpng, xorg }: stdenv.mkDerivation rec { pname = "xcur2png"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { xorg.xorgproto ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/eworm-de/xcur2png/releases"; description = "Convert X cursors to PNG images"; license = licenses.gpl3; diff --git a/pkgs/tools/graphics/yafaray-core/default.nix b/pkgs/tools/graphics/yafaray-core/default.nix index 9a52d4531854..f0dd183dc2c6 100644 --- a/pkgs/tools/graphics/yafaray-core/default.nix +++ b/pkgs/tools/graphics/yafaray-core/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, opencv, zlib +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, opencv, zlib , libxml2, freetype, libjpeg, libtiff, swig, openexr , ilmbase, boost165 , withPython ? true, python3 @@ -20,12 +20,13 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE+=" -isystem ${ilmbase.dev}/include/OpenEXR" ''; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ - cmake pkgconfig boost165 opencv zlib libxml2 freetype libjpeg libtiff + boost165 opencv zlib libxml2 freetype libjpeg libtiff swig openexr ilmbase ] ++ stdenv.lib.optional withPython python3; - meta = with stdenv.lib; { + meta = with lib; { description = "A free, open source raytracer"; homepage = "http://www.yafaray.org"; maintainers = with maintainers; [ hodapp ]; diff --git a/pkgs/tools/graphics/yaxg/default.nix b/pkgs/tools/graphics/yaxg/default.nix index 467210b27b35..ff7e26064ae9 100644 --- a/pkgs/tools/graphics/yaxg/default.nix +++ b/pkgs/tools/graphics/yaxg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, makeWrapper, +{ lib, stdenv, fetchFromGitHub, makeWrapper, maim, slop, ffmpeg_3, byzanz, libnotify, xdpyinfo }: stdenv.mkDerivation rec { @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/yaxg --prefix PATH : ${ stdenv.lib.makeBinPath [ maim slop ffmpeg_3 byzanz libnotify xdpyinfo ]} ''; - meta = with stdenv.lib; { + meta = with lib; { inherit (src.meta) homepage; description = "Yet Another X Grabber script"; longDescription = '' diff --git a/pkgs/tools/inputmethods/anthy/default.nix b/pkgs/tools/inputmethods/anthy/default.nix index 9214edfefb05..f337d4648d57 100644 --- a/pkgs/tools/inputmethods/anthy/default.nix +++ b/pkgs/tools/inputmethods/anthy/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "anthy-9100h"; - meta = with stdenv.lib; { + meta = with lib; { description = "Hiragana text to Kana Kanji mixed text Japanese input method"; homepage = "https://anthy.osdn.jp/"; license = licenses.gpl2Plus; diff --git a/pkgs/tools/inputmethods/evdevremapkeys/default.nix b/pkgs/tools/inputmethods/evdevremapkeys/default.nix index 0dc6f6739257..99f7231c58a4 100644 --- a/pkgs/tools/inputmethods/evdevremapkeys/default.nix +++ b/pkgs/tools/inputmethods/evdevremapkeys/default.nix @@ -1,11 +1,8 @@ -{ stdenv, fetchFromGitHub, python3Packages }: +{ lib, stdenv, fetchFromGitHub, python3Packages }: -let - pythonPackages = python3Packages; - -in pythonPackages.buildPythonPackage rec { - name = "${pname}-0.1.0"; +python3Packages.buildPythonPackage rec { pname = "evdevremapkeys"; + version = "0.1.0"; src = fetchFromGitHub { owner = "philipl"; @@ -14,14 +11,19 @@ in pythonPackages.buildPythonPackage rec { sha256 = "0c9slflakm5jqd8s1zpxm7gmrrk0335m040d7m70hnsak42jvs2f"; }; - propagatedBuildInputs = with pythonPackages; [ + propagatedBuildInputs = with python3Packages; [ pyyaml pyxdg python-daemon evdev ]; - meta = with stdenv.lib; { + # hase no tests + doCheck = false; + + pythonImportsCheck = [ "evdevremapkeys" ]; + + meta = with lib; { homepage = "https://github.com/philipl/evdevremapkeys"; description = "Daemon to remap events on linux input devices"; license = licenses.mit; diff --git a/pkgs/tools/inputmethods/evscript/default.nix b/pkgs/tools/inputmethods/evscript/default.nix new file mode 100644 index 000000000000..95f322ed8c68 --- /dev/null +++ b/pkgs/tools/inputmethods/evscript/default.nix @@ -0,0 +1,24 @@ +{ stdenv, rustPlatform, fetchFromGitHub }: + +rustPlatform.buildRustPackage rec { + pname = "evscript"; + version = "git-${builtins.substring 0 7 src.rev}"; + + src = fetchFromGitHub { + owner = "myfreeweb"; + repo = pname; + rev = "47f86f0d15add2af785ea1ff47f24d130026d1b4"; + sha256 = "1xm8297k0d8d0aq7fxgmibr4qva4d02cb6gnnlzq77jcmnknxv14"; + }; + + cargoSha256 = "1dcyhxfyq0nrjl05g1s9pjkg7vqw63wbdhlskrdcvxncmci3s7rp"; + verifyCargoDeps = true; + + meta = with stdenv.lib; { + homepage = "https://github.com/myfreeweb/${pname}"; + description = "A tiny sandboxed Dyon scripting environment for evdev input devices"; + license = licenses.unlicense; + maintainers = with maintainers; [ milesbreslin ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-anthy/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-anthy/default.nix index d1e7f85f75f3..3fe5a59175f2 100644 --- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-anthy/default.nix +++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-anthy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, fcitx, anthy, gettext, pkgconfig }: +{ lib, stdenv, fetchurl, cmake, fcitx, anthy, gettext, pkg-config }: stdenv.mkDerivation rec { pname = "fcitx-anthy"; @@ -9,15 +9,15 @@ stdenv.mkDerivation rec { sha256 = "01jx7wwq0mifqrzkswfglqhwkszbfcl4jinxgdgqx9kc6mb4k6zd"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake fcitx anthy gettext ]; + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ fcitx anthy gettext ]; preInstall = '' substituteInPlace src/cmake_install.cmake \ --replace ${fcitx} $out ''; - meta = with stdenv.lib; { + meta = with lib; { isFcitxEngine = true; description = "Fcitx Wrapper for anthy"; license = licenses.gpl2Plus; diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-chewing/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-chewing/default.nix index d9b202f7ef15..defbe616ab22 100644 --- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-chewing/default.nix +++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-chewing/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, fcitx, gettext, libchewing, pkgconfig }: +{ lib, stdenv, fetchurl, cmake, fcitx, gettext, libchewing, pkg-config }: stdenv.mkDerivation rec { pname = "fcitx-chewing"; @@ -9,8 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1w5smp5zvjx681cp1znjypyr9sw5x6v0wnsk8a7ncwxi9q9wf4xk"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake fcitx gettext libchewing ]; + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ fcitx gettext libchewing ]; preInstall = '' substituteInPlace src/cmake_install.cmake \ @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { --replace ${fcitx} $out ''; - meta = with stdenv.lib; { + meta = with lib; { isFcitxEngine = true; homepage = "https://github.com/fcitx/fcitx-chewing"; downloadPage = "http://download.fcitx-im.org/fcitx-chewing/"; diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-cloudpinyin/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-cloudpinyin/default.nix index 043b4438b3cc..d84407e982b0 100644 --- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-cloudpinyin/default.nix +++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-cloudpinyin/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, pkgconfig, fcitx, gettext, curl }: +{ lib, stdenv, fetchurl, cmake, pkg-config, fcitx, gettext, curl }: stdenv.mkDerivation rec { pname = "fcitx-cloudpinyin"; @@ -9,8 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0ai347wv3qdjzcbh0j9hdjpzwvh2kk57324xbxq37nzagrdgg5x0"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake fcitx gettext curl ]; + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ fcitx gettext curl ]; preInstall = '' substituteInPlace src/cmake_install.cmake \ @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { --replace ${fcitx} $out ''; - meta = with stdenv.lib; { + meta = with lib; { isFcitxEngine = true; description = "A standalone module for fcitx that uses web API to provide better pinyin result"; homepage = "https://github.com/fcitx/fcitx-cloudpinyin"; diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-hangul/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-hangul/default.nix index c9a40b84a6d9..d99a0228e226 100644 --- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-hangul/default.nix +++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-hangul/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, fcitx, libhangul, gettext, pkgconfig }: +{ lib, stdenv, fetchurl, cmake, fcitx, libhangul, gettext, pkg-config }: stdenv.mkDerivation rec { pname = "fcitx-hangul"; @@ -9,8 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0ds4071ljq620w7vnprm2jl8zqqkw7qsxvzbjapqak4jarczvmbd"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake fcitx libhangul gettext ]; + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ fcitx libhangul gettext ]; preInstall = '' substituteInPlace src/cmake_install.cmake \ @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { --replace ${fcitx} $out ''; - meta = with stdenv.lib; { + meta = with lib; { isFcitxEngine = true; homepage = "https://github.com/fcitx/fcitx-hangul"; downloadPage = "http://download.fcitx-im.org/fcitx-hangul/"; diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/default.nix index 02724a94be39..2af4061ae046 100644 --- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/default.nix +++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, pkgconfig, fcitx, gettext, libpinyin, glib, pcre, dbus, qtwebengine, qtbase, fcitx-qt5 }: +{ lib, stdenv, fetchurl, cmake, pkg-config, fcitx, gettext, libpinyin, glib, pcre, dbus, qtwebengine, qtbase, fcitx-qt5 }: stdenv.mkDerivation rec { pname = "fcitx-libpinyin"; @@ -9,8 +9,8 @@ stdenv.mkDerivation rec { sha256 = "196c229ckib3xvafkk4n3n3jk9rpksfcjsbbwka6a9k2f34qrjj6"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ fcitx-qt5 qtbase qtwebengine.dev cmake fcitx gettext libpinyin glib pcre dbus ]; + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ fcitx-qt5 qtbase qtwebengine.dev fcitx gettext libpinyin glib pcre dbus ]; # With a typical installation via NixOS option i18n.inputMethod.fcitx.engines, # the FCITXDIR environment variable is set to $out of fcitx-with-plugins, @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { cp -rv ${store_path} $NIX_BUILD_TOP/$name/data/${ZHUYIN_DATA_FILE_NAME} ''; - meta = with stdenv.lib; { + meta = with lib; { isFcitxEngine = true; description = "Fcitx Wrapper for libpinyin, Library to deal with pinyin"; homepage = "https://github.com/fcitx/fcitx-libpinyin"; diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-m17n/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-m17n/default.nix index 8b25b2846ff5..31a735559884 100644 --- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-m17n/default.nix +++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-m17n/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, fcitx, gettext, m17n_lib, m17n_db, pkgconfig }: +{ lib, stdenv, fetchurl, cmake, fcitx, gettext, m17n_lib, m17n_db, pkg-config }: stdenv.mkDerivation rec { pname = "fcitx-m17n"; @@ -9,15 +9,15 @@ stdenv.mkDerivation rec { sha256 = "15s52h979xz967f8lm0r0qkplig2w3wjck1ymndbg9kvj25ib0ng"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake fcitx gettext m17n_lib m17n_db ]; + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ fcitx gettext m17n_lib m17n_db ]; preInstall = '' substituteInPlace im/cmake_install.cmake \ --replace ${fcitx} $out ''; - meta = with stdenv.lib; { + meta = with lib; { isFcitxEngine = true; homepage = "https://github.com/fcitx/fcitx-m17n"; downloadPage = "http://download.fcitx-im.org/fcitx-table-other/"; diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-rime/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-rime/default.nix index 1410dcc1f1cd..42c02fe003d7 100644 --- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-rime/default.nix +++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-rime/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, pkgconfig, fcitx, librime, brise, hicolor-icon-theme }: +{ lib, stdenv, fetchurl, cmake, pkg-config, fcitx, librime, brise, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "fcitx-rime"; @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0bd8snfa6jr8dhnm0s0z021iryh5pbaf7p15rhkgbigw2pssczpr"; }; - buildInputs = [ cmake pkgconfig fcitx librime brise hicolor-icon-theme ]; + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ fcitx librime brise hicolor-icon-theme ]; # cmake cannont automatically find our nonstandard brise install location cmakeFlags = [ "-DRIME_DATA_DIR=${brise}/share/rime-data" ]; @@ -21,9 +22,7 @@ stdenv.mkDerivation rec { --replace ${fcitx} $out ''; - enableParallelBuilding = true; - - meta = with stdenv.lib; { + meta = with lib; { isFcitxEngine = true; homepage = "https://github.com/fcitx/fcitx-rime"; downloadPage = "https://download.fcitx-im.org/fcitx-rime/"; diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-skk/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-skk/default.nix index 187587fbfb49..5bbcf83cb48f 100644 --- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-skk/default.nix +++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-skk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, fcitx, libskk, skk-dicts }: +{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, fcitx, libskk, skk-dicts }: stdenv.mkDerivation { pname = "fcitx-skk"; @@ -25,7 +25,7 @@ stdenv.mkDerivation { --replace ${fcitx} $out ''; - meta = with stdenv.lib; { + meta = with lib; { isFcitxEngine = true; description = "A SKK style input method engine for fcitx"; longDescription = '' diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-table-extra/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-table-extra/default.nix index 833e417ae913..399d426dc3e8 100644 --- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-table-extra/default.nix +++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-table-extra/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, fcitx, gettext }: +{ lib, stdenv, fetchurl, cmake, fcitx, gettext }: stdenv.mkDerivation rec { pname = "fcitx-table-extra"; @@ -9,14 +9,15 @@ stdenv.mkDerivation rec { sha256 = "c91bb19c1a7b53c5339bf2f75ae83839020d337990f237a8b9bc0f4416c120ef"; }; - buildInputs = [ cmake fcitx gettext ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ fcitx gettext ]; preInstall = '' substituteInPlace tables/cmake_install.cmake \ --replace ${fcitx} $out ''; - meta = with stdenv.lib; { + meta = with lib; { isFcitxEngine = true; homepage = "https://github.com/fcitx/fcitx-table-extra"; downloadPage = "http://download.fcitx-im.org/fcitx-table-extra/"; diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-table-other/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-table-other/default.nix index ffee83875a17..410569b7afbd 100644 --- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-table-other/default.nix +++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-table-other/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, fcitx, gettext }: +{ lib, stdenv, fetchurl, cmake, fcitx, gettext }: stdenv.mkDerivation rec { pname = "fcitx-table-other"; @@ -9,14 +9,15 @@ stdenv.mkDerivation rec { sha256 = "1di60lr6l5k2sdwi3yrc0hl89j2k0yipayrsn803vd040w1fgfhq"; }; - buildInputs = [ cmake fcitx gettext ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ fcitx gettext ]; preInstall = '' substituteInPlace tables/cmake_install.cmake \ --replace ${fcitx} $out ''; - meta = with stdenv.lib; { + meta = with lib; { isFcitxEngine = true; homepage = "https://github.com/fcitx/fcitx-table-other"; downloadPage = "http://download.fcitx-im.org/fcitx-table-other/"; diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-unikey/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-unikey/default.nix index 1deff93e2016..5422efb9d38d 100644 --- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-unikey/default.nix +++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-unikey/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, fcitx, gettext, pkgconfig }: +{ lib, stdenv, fetchurl, cmake, fcitx, gettext, pkg-config }: stdenv.mkDerivation rec { pname = "fcitx-unikey"; @@ -9,8 +9,8 @@ stdenv.mkDerivation rec { sha256 = "063vc29v7ycaai98v3z4q319sv9sm91my17pmhblw1vifxnw02wf"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake fcitx gettext ]; + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ fcitx gettext ]; NIX_CFLAGS_COMPILE = "-Wno-narrowing"; @@ -20,8 +20,8 @@ stdenv.mkDerivation rec { substituteInPlace data/cmake_install.cmake \ --replace ${fcitx} $out ''; - - meta = with stdenv.lib; { + + meta = with lib; { isFcitxEngine = true; homepage = "https://github.com/fcitx/fcitx-unikey"; downloadPage = "http://download.fcitx-im.org/fcitx-table-other/"; diff --git a/pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix b/pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix index ae9d8d0f53f6..6e0c48d0610c 100644 --- a/pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix +++ b/pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchurl, makeWrapper, pkgconfig, cmake, fcitx, gtk3, isocodes, gnome3 }: +{ lib, stdenv, fetchurl, makeWrapper, pkg-config, cmake, fcitx, gtk3, isocodes, gnome3 }: stdenv.mkDerivation rec { name = "fcitx-configtool-0.4.10"; - meta = with stdenv.lib; { + meta = with lib; { description = "GTK-based config tool for Fcitx"; license = licenses.gpl2; platforms = platforms.linux; @@ -15,9 +15,8 @@ stdenv.mkDerivation rec { sha256 = "1yyi9jhkwn49lx9a47k1zbvwgazv4y4z72gnqgzdpgdzfrlrgi5w"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ makeWrapper fcitx cmake isocodes gtk3 - gnome3.adwaita-icon-theme ]; + nativeBuildInputs = [ cmake pkg-config makeWrapper ]; + buildInputs = [ fcitx isocodes gtk3 gnome3.adwaita-icon-theme ]; # Patch paths to `fcitx-remote` prePatch = '' @@ -32,4 +31,3 @@ stdenv.mkDerivation rec { --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS"; ''; } - diff --git a/pkgs/tools/inputmethods/fcitx/unwrapped.nix b/pkgs/tools/inputmethods/fcitx/unwrapped.nix index 99a92a95060a..180dc302ca0c 100644 --- a/pkgs/tools/inputmethods/fcitx/unwrapped.nix +++ b/pkgs/tools/inputmethods/fcitx/unwrapped.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, cmake, intltool, gettext +{ lib, stdenv, fetchurl, pkgconfig, cmake, intltool, gettext , libxml2, enchant2, isocodes, icu, libpthreadstubs , pango, cairo, libxkbfile, libXau, libXdmcp, libxkbcommon , dbus, gtk2, gtk3, qt4, extra-cmake-modules @@ -90,7 +90,7 @@ stdenv.mkDerivation rec { "-DXKB_RULES_XML_FILE='${xkeyboard_config}/share/X11/xkb/rules/evdev.xml'" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/fcitx/fcitx"; description = "A Flexible Input Method Framework"; license = licenses.gpl2; diff --git a/pkgs/tools/inputmethods/fcitx5/default.nix b/pkgs/tools/inputmethods/fcitx5/default.nix new file mode 100644 index 000000000000..5fa85064fa3f --- /dev/null +++ b/pkgs/tools/inputmethods/fcitx5/default.nix @@ -0,0 +1,100 @@ +{ stdenv +, fetchurl +, fetchFromGitHub +, pkg-config +, cmake +, extra-cmake-modules +, cairo +, cldr-emoji-annotation +, pango +, fribidi +, fmt +, wayland +, systemd +, wayland-protocols +, json_c +, isocodes +, xkeyboard_config +, enchant +, gdk-pixbuf +, libGL +, libevent +, libuuid +, libselinux +, libXdmcp +, libsepol +, libxkbcommon +, libthai +, libdatrie +, xcbutilkeysyms +, pcre +, xcbutilwm +, xcb-imdkit +, libxkbfile +}: +let + enDictVer = "20121020"; + enDict = fetchurl { + url = "https://download.fcitx-im.org/data/en_dict-${enDictVer}.tar.gz"; + sha256 = "1svcb97sq7nrywp5f2ws57cqvlic8j6p811d9ngflplj8xw5sjn4"; + }; +in +stdenv.mkDerivation rec { + pname = "fcitx5"; + version = "5.0.3"; + + src = fetchFromGitHub { + owner = "fcitx"; + repo = "fcitx5"; + rev = version; + sha256 = "QYMH0WbhHqDKUvpj1VOB8U5sbBD89H6moLFkQBJijZA="; + }; + + prePatch = '' + ln -s ${enDict} src/modules/spell/dict/$(stripHash ${enDict}) + ''; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + pkg-config + ]; + + buildInputs = [ + fmt + isocodes + cairo + enchant + pango + libthai + libdatrie + fribidi + systemd + gdk-pixbuf + wayland + wayland-protocols + cldr-emoji-annotation + json_c + libGL + libevent + libuuid + libselinux + libsepol + libXdmcp + libxkbcommon + pcre + xcbutilwm + xcbutilkeysyms + xcb-imdkit + xkeyboard_config + libxkbfile + ]; + + meta = with stdenv.lib; { + description = "Next generation of fcitx"; + homepage = "https://github.com/fcitx/fcitx5"; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ poscat ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix new file mode 100644 index 000000000000..2b8a07537b0b --- /dev/null +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix @@ -0,0 +1,76 @@ +{ stdenv +, mkDerivation +, fetchurl +, fetchFromGitHub +, cmake +, extra-cmake-modules +, boost +, libime +, fcitx5 +, fcitx5-qt +, fcitx5-lua +, qtwebengine +, opencc +, curl +, fmt +, luaSupport ? true +}: + +let + pyStrokeVer = "20121124"; + pyStroke = fetchurl { + url = "http://download.fcitx-im.org/data/py_stroke-${pyStrokeVer}.tar.gz"; + sha256 = "0j72ckmza5d671n2zg0psg7z9iils4gyxz7jgkk54fd4pyljiccf"; + }; + pyTableVer = "20121124"; + pyTable = fetchurl { + url = "http://download.fcitx-im.org/data/py_table-${pyTableVer}.tar.gz"; + sha256 = "011cg7wssssm6hm564cwkrrnck2zj5rxi7p9z5akvhg6gp4nl522"; + }; +in + +mkDerivation rec { + pname = "fcitx5-chinese-addons"; + version = "5.0.2"; + + src = fetchFromGitHub { + owner = "fcitx"; + repo = "fcitx5-chinese-addons"; + rev = version; + sha256 = "11UIMrwzZqO8nrQx5oubeoQN8hspL1mvHw5Dc9sVOqQ="; + }; + + cmakeFlags = [ + "-DUSE_WEBKIT=off" + ]; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + boost + fcitx5-lua + ]; + + prePatch = '' + ln -s ${pyStroke} modules/pinyinhelper/$(stripHash ${pyStroke}) + ln -s ${pyTable} modules/pinyinhelper/$(stripHash ${pyTable}) + ''; + + buildInputs = [ + fcitx5 + fcitx5-qt + libime + curl + opencc + qtwebengine + fmt + ] ++ stdenv.lib.optional luaSupport fcitx5-lua; + + meta = with stdenv.lib; { + description = "Addons related to Chinese, including IME previous bundled inside fcitx4"; + homepage = "https://github.com/fcitx/fcitx5-chinese-addons"; + license = with licenses; [ gpl2Plus lgpl21Plus ]; + maintainers = with maintainers; [ poscat ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix new file mode 100644 index 000000000000..e5b55c26cd4b --- /dev/null +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix @@ -0,0 +1,60 @@ +{ stdenv +, mkDerivation +, fetchFromGitHub +, cmake +, extra-cmake-modules +, fcitx5 +, fcitx5-qt +, qtx11extras +, kwidgetsaddons +, kdeclarative +, kirigami2 +, isocodes +, xkeyboardconfig +, libxkbfile +, libXdmcp +, kcmSupport ? true +}: + +mkDerivation rec { + pname = "fcitx5-configtool"; + version = "5.0.1"; + + src = fetchFromGitHub { + owner = "fcitx"; + repo = "fcitx5-configtool"; + rev = version; + sha256 = "npSqd0R6bqKc+JxYCGcfVzgNLpuLtnHq6zM58smZ8/I="; + }; + + cmakeFlags = [ + "-DKDE_INSTALL_USE_QT_SYS_PATHS=ON" + ]; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; + + buildInputs = [ + fcitx5 + fcitx5-qt + qtx11extras + kirigami2 + isocodes + xkeyboardconfig + libxkbfile + libXdmcp + ] ++ stdenv.lib.optionals kcmSupport [ + kdeclarative + kwidgetsaddons + ]; + + meta = with stdenv.lib; { + description = "Configuration Tool for Fcitx5"; + homepage = "https://github.com/fcitx/fcitx5-configtool"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ poscat ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix new file mode 100644 index 000000000000..ce157f792535 --- /dev/null +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix @@ -0,0 +1,71 @@ +{ stdenv +, fetchurl +, fetchFromGitHub +, cmake +, extra-cmake-modules +, fcitx5 +, gobject-introspection +, gtk2 +, gtk3 +, pcre +, libuuid +, libselinux +, libsepol +, libthai +, libdatrie +, libXdmcp +, libxkbcommon +, epoxy +, dbus +, at-spi2-core +, libXtst +, withGTK2 ? false +}: + +stdenv.mkDerivation rec { + pname = "fcitx5-gtk"; + version = "5.0.1"; + + src = fetchFromGitHub { + owner = "fcitx"; + repo = "fcitx5-gtk"; + rev = version; + sha256 = "rkusIqMRQMTjcpJR335as1xUQrzD9dLVB/wrLstPXPY="; + }; + + cmakeFlags = [ + "-DGOBJECT_INTROSPECTION_GIRDIR=share/gir-1.0" + "-DGOBJECT_INTROSPECTION_TYPELIBDIR=lib/girepository-1.0" + ] ++ stdenv.lib.optional (! withGTK2) "-DENABLE_GTK2_IM_MODULE=off"; + + buildInputs = [ + gtk3 + gobject-introspection + fcitx5 + pcre + libuuid + libselinux + libsepol + libthai + libdatrie + libXdmcp + libxkbcommon + epoxy + dbus + at-spi2-core + libXtst + ] ++ stdenv.lib.optional withGTK2 gtk2; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; + + meta = with stdenv.lib; { + description = "Fcitx5 gtk im module and glib based dbus client library"; + homepage = "https://github.com/fcitx/fcitx5-gtk"; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ poscat ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix new file mode 100644 index 000000000000..310cae035ba7 --- /dev/null +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix @@ -0,0 +1,40 @@ +{ stdenv +, fetchFromGitHub +, cmake +, extra-cmake-modules +, fcitx5 +, lua5_3 +, luaPackage ? lua5_3 +, gettext +}: + +stdenv.mkDerivation rec { + pname = "fcitx5-lua"; + version = "5.0.1"; + + src = fetchFromGitHub { + owner = "fcitx"; + repo = "fcitx5-lua"; + rev = "${version}"; + sha256 = "OiTk9ldqBqF7WT1KY71hacLD6OQQNO05F7+cSXlli40="; + }; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; + + buildInputs = [ + fcitx5 + luaPackage + gettext + ]; + + meta = with stdenv.lib; { + description = "Lua support for Fcitx 5"; + homepage = "https://github.com/fcitx/fcitx5-lua"; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ poscat ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix new file mode 100644 index 000000000000..580082096ece --- /dev/null +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix @@ -0,0 +1,46 @@ +{ stdenv +, mkDerivation +, fetchFromGitHub +, cmake +, extra-cmake-modules +, fcitx5 +, qtx11extras +, libxcb +, libXdmcp +}: + +mkDerivation rec { + pname = "fcitx5-qt"; + version = "5.0.1"; + + src = fetchFromGitHub { + owner = "fcitx"; + repo = "fcitx5-qt"; + rev = version; + sha256 = "BVOumk2xj3vmwmm4KwiktQhWyTuUA2OFwYXNR6HgwyM="; + }; + + cmakeFlags = [ + "-DENABLE_QT4=0" + ]; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; + + buildInputs = [ + fcitx5 + qtx11extras + libxcb + libXdmcp + ]; + + meta = with stdenv.lib; { + description = "Fcitx5 Qt Library"; + homepage = "https://github.com/fcitx/fcitx5-qt"; + license = with licenses; [ lgpl21Plus bsd3 ]; + maintainers = with maintainers; [ poscat ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix new file mode 100644 index 000000000000..9992e1987589 --- /dev/null +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix @@ -0,0 +1,47 @@ +{ stdenv +, fetchurl +, fetchFromGitHub +, pkgconfig +, cmake +, extra-cmake-modules +, gettext +, fcitx5 +, librime +, brise +}: + +stdenv.mkDerivation rec { + pname = "fcitx5-rime"; + version = "5.0.2"; + + src = fetchFromGitHub { + owner = "fcitx"; + repo = "fcitx5-rime"; + rev = version; + sha256 = "cVCTsD1Iw6OtyYFpxff3ix2CubRTnDaBevAYA4I9Ai8="; + }; + + cmakeFlags = [ + "-DRIME_DATA_DIR=${brise}/share/rime-data" + ]; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + pkgconfig + gettext + ]; + + buildInputs = [ + fcitx5 + librime + ]; + + meta = with stdenv.lib; { + description = "RIME support for Fcitx5"; + homepage = "https://github.com/fcitx/fcitx5-rime"; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ poscat ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-table-extra.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-table-extra.nix new file mode 100644 index 000000000000..7dcca7e130d0 --- /dev/null +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-table-extra.nix @@ -0,0 +1,38 @@ +{ stdenv +, fetchFromGitHub +, cmake +, extra-cmake-modules +, gettext +, libime +, boost +, fcitx5 +}: + +stdenv.mkDerivation rec { + pname = "fcitx5-table-extra"; + version = "5.0.1"; + + src = fetchFromGitHub { + owner = "fcitx"; + repo = "fcitx5-table-extra"; + rev = version; + sha256 = "UHhiWm2Khh6JBB9jz0ZKFofkAJPlqn6SqHeK9etoaxs="; + }; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + gettext + libime + boost + fcitx5 + ]; + + meta = with stdenv.lib; { + description = "Extra table for Fcitx, including Boshiamy, Zhengma, Cangjie, and Quick"; + homepage = "https://github.com/fcitx/fcitx5-table-extra"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ poscat ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-table-other.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-table-other.nix new file mode 100644 index 000000000000..eb9d93d6e7ce --- /dev/null +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-table-other.nix @@ -0,0 +1,38 @@ +{ stdenv +, fetchFromGitHub +, cmake +, extra-cmake-modules +, gettext +, libime +, boost +, fcitx5 +}: + +stdenv.mkDerivation rec { + pname = "fcitx5-table-other"; + version = "5.0.1"; + + src = fetchFromGitHub { + owner = "fcitx"; + repo = "fcitx5-table-other"; + rev = version; + sha256 = "hQlrjDPImDof2+3/uOtTdJ27cInevbxH9B+lNwquKbs="; + }; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + gettext + libime + boost + fcitx5 + ]; + + meta = with stdenv.lib; { + description = "Some other tables for Fcitx"; + homepage = "https://github.com/fcitx/fcitx5-table-other"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ poscat ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/inputmethods/fcitx5/with-addons.nix b/pkgs/tools/inputmethods/fcitx5/with-addons.nix new file mode 100644 index 000000000000..854020effeaa --- /dev/null +++ b/pkgs/tools/inputmethods/fcitx5/with-addons.nix @@ -0,0 +1,18 @@ +{ symlinkJoin, makeWrapper, fcitx5, fcitx5-lua, fcitx5-configtool, fcitx5-qt, fcitx5-gtk, addons ? [] }: + +symlinkJoin { + name = "fcitx5-with-addons-${fcitx5.version}"; + + paths = [ fcitx5 fcitx5-configtool fcitx5-lua fcitx5-qt fcitx5-gtk ] ++ addons; + + buildInputs = [ makeWrapper ]; + + postBuild = '' + wrapProgram $out/bin/fcitx5 \ + --prefix FCITX_ADDON_DIRS : "$out/lib/fcitx5" \ + --suffix XDG_DATA_DIRS : "$out/share" \ + --suffix PATH : "$out/bin" + ''; + + meta = fcitx5.meta; +} diff --git a/pkgs/tools/inputmethods/hime/default.nix b/pkgs/tools/inputmethods/hime/default.nix index 4d2b44456ae7..894e8768c282 100644 --- a/pkgs/tools/inputmethods/hime/default.nix +++ b/pkgs/tools/inputmethods/hime/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { configureFlags = [ "--disable-lib64" "--disable-qt5-immodule" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://hime-ime.github.io/"; downloadPage = "https://github.com/hime-ime/hime/downloads"; description = "A useful input method engine for Asia region"; diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix index 34d918cb7da7..ecc142ac16ce 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , gettext , pkgconfig @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { substituteInPlace $out/share/ibus/component/anthy.xml --replace \$\{exec_prefix\} $out ''; - meta = with stdenv.lib; { + meta = with lib; { isIbusEngine = true; description = "IBus interface to the anthy input method"; homepage = "https://github.com/fujiwarat/ibus-anthy"; diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-bamboo/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-bamboo/default.nix index 18e878b47b5c..61ea12ff59b2 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-bamboo/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-bamboo/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , gettext , xorg @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { ]; - meta = with stdenv.lib; { + meta = with lib; { isIbusEngine = true; description = "A Vietnamese IME for IBus"; homepage = "https://github.com/BambooEngine/ibus-bamboo"; diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix index f6ceece34e19..531aeb3d6643 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , substituteAll , appstream-glib @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { ])) ]; - meta = with stdenv.lib; { + meta = with lib; { isIbusEngine = true; description = "Ibus Hangul engine"; homepage = "https://github.com/choehwanjin/ibus-hangul"; diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-kkc/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-kkc/default.nix index 0b16b54ad48b..cdebf64d8629 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-kkc/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-kkc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , vala, intltool, pkgconfig , libkkc, ibus, skk-dicts , gtk3 @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ln -s ${skk-dicts}/share $out/share/skk ''; - meta = with stdenv.lib; { + meta = with lib; { isIbusEngine = true; description = "libkkc (Japanese Kana Kanji input method) engine for ibus"; homepage = "https://github.com/ueno/ibus-kkc"; diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix index 2c1d558f04d3..18cd2ec4ed83 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , autoreconfHook , gettext @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { db ]; - meta = with stdenv.lib; { + meta = with lib; { isIbusEngine = true; description = "IBus interface to the libpinyin input method"; license = licenses.gpl2; diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-libthai/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-libthai/default.nix index 9c5f2cefb517..1bb2479b4997 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-libthai/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-libthai/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, pkg-config, ibus, gtk3, libthai }: +{ lib, stdenv, fetchurl, makeWrapper, pkg-config, ibus, gtk3, libthai }: stdenv.mkDerivation rec { pname = "ibus-libthai"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 ibus libthai ]; - meta = with stdenv.lib; { + meta = with lib; { isIbusEngine = true; homepage = "https://linux.thai.net/projects/ibus-libthai"; description = "Thai input method engine for IBus"; diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix index 35e02d52b486..252fc2b286b6 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , autoreconfHook , pkgconfig @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { "--with-gtk=3.0" ]; - meta = with stdenv.lib; { + meta = with lib; { isIbusEngine = true; description = "m17n engine for ibus"; homepage = "https://github.com/ibus/ibus-m17n"; diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix index 695a45d81ffc..8964b1809897 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, which, ninja, python, pkgconfig, protobuf +{ lib, stdenv, fetchFromGitHub, which, ninja, python, pkgconfig, protobuf , ibus, gtk2, zinnia, qt5, libxcb, tegaki-zinnia-japanese, python3Packages }: let @@ -12,7 +12,7 @@ in stdenv.mkDerivation rec { name = "ibus-mozc-${version}"; version = "2.23.4206.102"; - meta = with stdenv.lib; { + meta = with lib; { isIbusEngine = true; description = "Japanese input method from Google"; homepage = "https://github.com/google/mozc"; diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-rime/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-rime/default.nix index 03a801abbeb0..d444d44f2337 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-rime/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-rime/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkg-config, gdk-pixbuf, glib, ibus, libnotify +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, gdk-pixbuf, glib, ibus, libnotify , librime, brise }: stdenv.mkDerivation rec { @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { --replace '/usr' $out ''; - meta = with stdenv.lib; { + meta = with lib; { isIbusEngine = true; description = "Rime input method engine for IBus"; homepage = "https://rime.im/"; diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-table-chinese/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-table-chinese/default.nix index 316593990d96..40c33aff4011 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-table-chinese/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-table-chinese/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, fetchFromGitHub, pkgconfig, ibus, ibus-table, python3, cmake }: +{ lib, stdenv, fetchgit, fetchFromGitHub, pkg-config, ibus, ibus-table, python3, cmake }: let src = fetchFromGitHub { @@ -51,9 +51,10 @@ in stdenv.mkDerivation { rm -rf $HOME ''; - buildInputs = [ pkgconfig ibus ibus-table python3 cmake ]; + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ ibus ibus-table python3 ]; - meta = with stdenv.lib; { + meta = with lib; { isIbusEngine = true; description = "Chinese tables for IBus-Table"; homepage = "https://github.com/definite/ibus-table-chinese"; diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix index b74378f07934..0c7670fd250c 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ibus, ibus-table, pkgconfig, python3 }: +{ lib, stdenv, fetchurl, ibus, ibus-table, pkgconfig, python3 }: stdenv.mkDerivation rec { pname = "ibus-table-others"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { rm -rf $HOME ''; - meta = with stdenv.lib; { + meta = with lib; { isIbusEngine = true; description = "Various table-based input methods for IBus"; homepage = "https://github.com/moebiuscurve/ibus-table-others"; diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix index 831161df2b7b..f923c630d177 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , autoreconfHook, docbook2x, pkgconfig , gtk3, dconf, gobject-introspection , ibus, python3, wrapGAppsHook }: @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { --replace "docbook2man" "docbook2man --sgml" ''; - meta = with stdenv.lib; { + meta = with lib; { isIbusEngine = true; description = "An IBus framework for table-based input methods"; homepage = "https://github.com/kaio/ibus-table/wiki"; diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix index cc0d12745b12..a8336e1d7950 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, python3, ibus, pkgconfig, gtk3, m17n_lib +{ lib, stdenv, fetchFromGitHub, autoreconfHook, python3, ibus, pkgconfig, gtk3, m17n_lib , wrapGAppsHook, gobject-introspection }: @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : "${m17n_lib}/lib") ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://mike-fabian.github.io/ibus-typing-booster/"; license = licenses.gpl3Plus; description = "A typing booster engine for the IBus platform"; diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-uniemoji/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-uniemoji/default.nix index 435d1154d4ad..38f746e3ceeb 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-uniemoji/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-uniemoji/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , gobject-introspection , wrapGAppsHook @@ -51,7 +51,7 @@ in stdenv.mkDerivation rec { wrapGApp $out/share/ibus-uniemoji/uniemoji.py ''; - meta = with stdenv.lib; { + meta = with lib; { isIbusEngine = true; description = "Input method (ibus) for entering unicode symbols and emoji by name"; homepage = "https://github.com/salty-horse/ibus-uniemoji"; diff --git a/pkgs/tools/inputmethods/ibus/ibus-qt.nix b/pkgs/tools/inputmethods/ibus/ibus-qt.nix index 4e6b92f77c55..4f6a4e1bef3e 100644 --- a/pkgs/tools/inputmethods/ibus/ibus-qt.nix +++ b/pkgs/tools/inputmethods/ibus/ibus-qt.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ibus, cmake, pkgconfig, qt4, icu, doxygen }: +{ lib, stdenv, fetchurl, ibus, cmake, pkg-config, qt4, icu, doxygen }: stdenv.mkDerivation rec { pname = "ibus-qt"; @@ -9,14 +9,12 @@ stdenv.mkDerivation rec { sha256 = "1q9g7qghpcf07valc2ni7yf994xqx2pmdffknj7scxfidav6p19g"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ - ibus cmake qt4 icu doxygen - ]; + nativeBuildInputs = [ cmake pkg-config doxygen ]; + buildInputs = [ ibus qt4 icu ]; cmakeFlags = [ "-DQT_PLUGINS_DIR=lib/qt4/plugins" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/ibus/ibus-qt/"; description = "Qt4 interface to the ibus input method"; platforms = platforms.linux; diff --git a/pkgs/tools/inputmethods/interception-tools/caps2esc.nix b/pkgs/tools/inputmethods/interception-tools/caps2esc.nix index 7e6206eb1f37..ab4242295a0f 100644 --- a/pkgs/tools/inputmethods/interception-tools/caps2esc.nix +++ b/pkgs/tools/inputmethods/interception-tools/caps2esc.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, cmake }: +{ lib, stdenv, fetchFromGitLab, cmake }: stdenv.mkDerivation rec { pname = "caps2esc"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://gitlab.com/interception/linux/plugins/caps2esc"; description = "Transforming the most useless key ever into the most useful one"; license = licenses.mit; diff --git a/pkgs/tools/inputmethods/keyfuzz/default.nix b/pkgs/tools/inputmethods/keyfuzz/default.nix index 0b2883f70a45..8980abba2f62 100644 --- a/pkgs/tools/inputmethods/keyfuzz/default.nix +++ b/pkgs/tools/inputmethods/keyfuzz/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation { pname = "keyfuzz"; version = "0.2"; - meta = with stdenv.lib; { + meta = with lib; { description = "Manipulate the scancode/keycode translation tables of keyboard drivers"; homepage = "http://0pointer.de/lennart/projects/keyfuzz/"; license = licenses.gpl2Plus; diff --git a/pkgs/tools/inputmethods/libinput-gestures/default.nix b/pkgs/tools/inputmethods/libinput-gestures/default.nix index b816a6898ab3..1d0ea40e34f4 100644 --- a/pkgs/tools/inputmethods/libinput-gestures/default.nix +++ b/pkgs/tools/inputmethods/libinput-gestures/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { wrapProgram "$out/bin/libinput-gestures" --prefix PATH : "${lib.makeBinPath ([coreutils] ++ extraUtilsPath)}" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/bulletmark/libinput-gestures"; description = "Gesture mapper for libinput"; license = licenses.gpl3Plus; diff --git a/pkgs/tools/inputmethods/libkkc/default.nix b/pkgs/tools/inputmethods/libkkc/default.nix index 1e24d5d969f9..c8cb927b6ab2 100644 --- a/pkgs/tools/inputmethods/libkkc/default.nix +++ b/pkgs/tools/inputmethods/libkkc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , vala, gobject-introspection, intltool, python2Packages, glib , pkgconfig , libgee, json-glib, marisa, libkkc-data @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ln -s ${libkkc-data}/lib/libkkc/models $out/share/libkkc/models ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Japanese Kana Kanji conversion input method library"; homepage = "https://github.com/ueno/libkkc"; license = licenses.gpl3Plus; diff --git a/pkgs/tools/inputmethods/nabi/default.nix b/pkgs/tools/inputmethods/nabi/default.nix index ef316ec55a0a..167dd7b030da 100644 --- a/pkgs/tools/inputmethods/nabi/default.nix +++ b/pkgs/tools/inputmethods/nabi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtk2, libhangul }: +{ lib, stdenv, fetchurl, pkgconfig, gtk2, libhangul }: stdenv.mkDerivation { name = "nabi-1.0.0"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gtk2 libhangul ]; - meta = with stdenv.lib; { + meta = with lib; { description = "The Easy Hangul XIM"; homepage = "https://github.com/choehwanjin/nabi"; license = licenses.gpl2; diff --git a/pkgs/tools/inputmethods/netevent/default.nix b/pkgs/tools/inputmethods/netevent/default.nix index f845111f4b94..b7c0e4d47020 100644 --- a/pkgs/tools/inputmethods/netevent/default.nix +++ b/pkgs/tools/inputmethods/netevent/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, docutils, installShellFiles }: +{ lib, stdenv, fetchFromGitHub, docutils, installShellFiles }: stdenv.mkDerivation { pname = "netevent"; @@ -31,7 +31,7 @@ stdenv.mkDerivation { cp doc/netevent.rst $doc/share/doc/netevent/netevent.rst ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Share linux event devices with other machines"; homepage = "https://github.com/Blub/netevent"; license = licenses.gpl2Only; diff --git a/pkgs/tools/inputmethods/tegaki-zinnia-japanese/default.nix b/pkgs/tools/inputmethods/tegaki-zinnia-japanese/default.nix index 4295e2b3fdd8..6829de9241b4 100644 --- a/pkgs/tools/inputmethods/tegaki-zinnia-japanese/default.nix +++ b/pkgs/tools/inputmethods/tegaki-zinnia-japanese/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip }: +{ lib, stdenv, fetchurl, unzip }: stdenv.mkDerivation { pname = "tegaki-zinnia-japanese"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "1nmg9acxhcqly9gwkyb9m0hpy76fll91ywk4b1q4xms0ajxip1h7"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Japanese handwriting model for the Zinnia engine"; homepage = "http://tegaki.org/"; license = licenses.lgpl21; diff --git a/pkgs/tools/inputmethods/triggerhappy/default.nix b/pkgs/tools/inputmethods/triggerhappy/default.nix index 22987fe639f6..b89f205a0648 100644 --- a/pkgs/tools/inputmethods/triggerhappy/default.nix +++ b/pkgs/tools/inputmethods/triggerhappy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, perl, systemd }: +{ lib, stdenv, fetchFromGitHub, pkgconfig, perl, systemd }: stdenv.mkDerivation rec { pname = "triggerhappy"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { install -D -m 644 -t "$out/etc/triggerhappy/triggers.d" "triggerhappy.conf.examples" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A lightweight hotkey daemon"; longDescription = '' Triggerhappy is a hotkey daemon developed with small and embedded systems in diff --git a/pkgs/tools/inputmethods/uim/default.nix b/pkgs/tools/inputmethods/uim/default.nix index 7fe00bd4dfce..f7ee905b9eee 100644 --- a/pkgs/tools/inputmethods/uim/default.nix +++ b/pkgs/tools/inputmethods/uim/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, shared-mime-info +{ lib, stdenv, fetchFromGitHub, shared-mime-info , autoconf, automake, intltool, libtool, pkgconfig, cmake , ruby, librsvg , ncurses, m17n_lib, m17n_db, expat @@ -135,7 +135,7 @@ stdenv.mkDerivation rec { dontUseCmakeConfigure = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = src.meta.homepage; description = "A multilingual input method framework"; license = licenses.bsd3; diff --git a/pkgs/tools/inputmethods/zinnia/default.nix b/pkgs/tools/inputmethods/zinnia/default.nix index b1516aa56ab0..8070dbc66ba8 100644 --- a/pkgs/tools/inputmethods/zinnia/default.nix +++ b/pkgs/tools/inputmethods/zinnia/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation { pname = "zinnia"; @@ -15,7 +15,7 @@ stdenv.mkDerivation { sourceRoot=$(echo */zinnia) ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Online hand recognition system with machine learning"; homepage = "http://taku910.github.io/zinnia/"; license = licenses.bsd2; diff --git a/pkgs/tools/misc/0x0/default.nix b/pkgs/tools/misc/0x0/default.nix index d78846922c6e..1fc081d71abf 100644 --- a/pkgs/tools/misc/0x0/default.nix +++ b/pkgs/tools/misc/0x0/default.nix @@ -1,4 +1,4 @@ -{ stdenv, xsel, curl, fetchFromGitLab, makeWrapper}: +{ lib, stdenv, xsel, curl, fetchFromGitLab, makeWrapper}: stdenv.mkDerivation { pname = "0x0"; @@ -21,7 +21,7 @@ stdenv.mkDerivation { --prefix PATH : '${stdenv.lib.makeBinPath [ curl xsel ]}' ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A client for 0x0.st"; homepage = "https://gitlab.com/somasis/scripts/"; maintainers = [ maintainers.ar1a ]; diff --git a/pkgs/tools/misc/3mux/default.nix b/pkgs/tools/misc/3mux/default.nix index 945ebea0cb89..3f1e981fd0e3 100644 --- a/pkgs/tools/misc/3mux/default.nix +++ b/pkgs/tools/misc/3mux/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "3mux"; @@ -13,7 +13,7 @@ buildGoModule rec { vendorSha256 = "sha256-rcbnyScD2GU1DLY6dTEPgFNXZfgkxXPn5lt6HRqa0d8="; - meta = with stdenv.lib; { + meta = with lib; { description = "Terminal multiplexer inspired by i3"; longDescription = '' 3mux is a terminal multiplexer with out-of-the-box support for search, diff --git a/pkgs/tools/misc/adafruit-ampy/default.nix b/pkgs/tools/misc/adafruit-ampy/default.nix index 31ef3e2487be..f51497376393 100644 --- a/pkgs/tools/misc/adafruit-ampy/default.nix +++ b/pkgs/tools/misc/adafruit-ampy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python3 }: +{ lib, stdenv, python3 }: with python3.pkgs; @@ -17,7 +17,7 @@ buildPythonApplication rec { # No tests doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/pycampers/ampy"; license = licenses.mit; description = "Utility to interact with a MicroPython board over a serial connection"; diff --git a/pkgs/tools/misc/aescrypt/default.nix b/pkgs/tools/misc/aescrypt/default.nix index 42941c263e6d..05ee0145636f 100644 --- a/pkgs/tools/misc/aescrypt/default.nix +++ b/pkgs/tools/misc/aescrypt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libiconv }: +{ lib, stdenv, fetchurl, libiconv }: stdenv.mkDerivation rec { version = "3.14"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { buildInputs = [ libiconv ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Encrypt files with Advanced Encryption Standard (AES)"; homepage = "https://www.aescrypt.com/"; license = licenses.gpl2; diff --git a/pkgs/tools/misc/agedu/default.nix b/pkgs/tools/misc/agedu/default.nix index 3cdfa36337f8..2146d0c24914 100644 --- a/pkgs/tools/misc/agedu/default.nix +++ b/pkgs/tools/misc/agedu/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchgit, autoreconfHook, halibut}: +{lib, stdenv, fetchgit, autoreconfHook, halibut}: let date = "20200705"; rev = "2a7d4a2"; @@ -16,7 +16,7 @@ stdenv.mkDerivation { nativeBuildInputs = [autoreconfHook halibut]; - meta = with stdenv.lib; { + meta = with lib; { description = "A Unix utility for tracking down wasted disk space"; longDescription = '' Most Unix file systems, in their default mode, helpfully record when a diff --git a/pkgs/tools/misc/alarm-clock-applet/default.nix b/pkgs/tools/misc/alarm-clock-applet/default.nix index 3102dd635ca2..6ad9341b85e3 100644 --- a/pkgs/tools/misc/alarm-clock-applet/default.nix +++ b/pkgs/tools/misc/alarm-clock-applet/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , pkgconfig , autoconf , automake111x @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://alarm-clock.pseudoberries.com/"; description = "A fully-featured alarm clock for your GNOME panel or equivalent"; license = licenses.gpl2; diff --git a/pkgs/tools/misc/apparix/default.nix b/pkgs/tools/misc/apparix/default.nix index 155fa8190d9f..7d8de2c14367 100644 --- a/pkgs/tools/misc/apparix/default.nix +++ b/pkgs/tools/misc/apparix/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "apparix-11-062"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://micans.org/apparix"; description = "Add directory bookmarks, distant listing, and distant editing to the command line"; maintainers = with maintainers; [ lethalman ]; diff --git a/pkgs/tools/misc/apt-offline/default.nix b/pkgs/tools/misc/apt-offline/default.nix index 7e29c63347dd..5c17b7f2d131 100644 --- a/pkgs/tools/misc/apt-offline/default.nix +++ b/pkgs/tools/misc/apt-offline/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python3Packages }: +{ lib, stdenv, fetchFromGitHub, python3Packages }: python3Packages.buildPythonApplication rec { version = "1.8.1"; @@ -16,7 +16,7 @@ python3Packages.buildPythonApplication rec { # Requires python-qt4 (feel free to get it working). preFixup = ''rm "$out/bin/apt-offline-gui"''; - meta = with stdenv.lib; { + meta = with lib; { description = "Offline APT package manager"; license = licenses.gpl3; maintainers = [ ]; diff --git a/pkgs/tools/misc/aptly/default.nix b/pkgs/tools/misc/aptly/default.nix index 6af3238dbd77..2ee81460b283 100644 --- a/pkgs/tools/misc/aptly/default.nix +++ b/pkgs/tools/misc/aptly/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, installShellFiles, makeWrapper, gnupg, bzip2, xz, graphviz }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub, installShellFiles, makeWrapper, gnupg, bzip2, xz, graphviz }: let @@ -37,7 +37,7 @@ buildGoPackage { --prefix PATH ":" "${stdenv.lib.makeBinPath [ gnupg bzip2 xz graphviz ]}" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.aptly.info"; description = "Debian repository management tool"; license = licenses.mit; diff --git a/pkgs/tools/misc/archi/default.nix b/pkgs/tools/misc/archi/default.nix index 41562ccbf711..554700dad93f 100644 --- a/pkgs/tools/misc/archi/default.nix +++ b/pkgs/tools/misc/archi/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , fetchzip , autoPatchelfHook @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { mv Archi.app "$out/Applications/" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "ArchiMate modelling toolkit"; longDescription = '' Archi is an open source modelling toolkit to create ArchiMate diff --git a/pkgs/tools/misc/argtable/default.nix b/pkgs/tools/misc/argtable/default.nix deleted file mode 100644 index 867b2eaba5d0..000000000000 --- a/pkgs/tools/misc/argtable/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ stdenv -, fetchgit -}: -stdenv.mkDerivation { - pname = "argtable"; - version = "3.0.1"; - - src = fetchgit { - url = "https://github.com/argtable/argtable3.git"; - rev = "de93cfd85f755250285b337cba053a709a270721"; - sha256 = "0fbvk78s3dwryrzgafdra0lb8w7lb873c6xgldl94ps9828x85i3"; - }; - - buildPhase = '' - gcc -shared -o libargtable3.so -fPIC argtable3.c - - pushd tests - make - popd - ''; - - installPhase = '' - mkdir -p $out/include - cp argtable3.h $out/include - - mkdir -p $out/lib - cp libargtable3.so $out/lib - - mkdir -p $out/src - cp argtable3.c $out/src - cp -r examples $out/src - ln -s $out/include/argtable3.h $out/src/argtable3.h - ''; - - meta = with stdenv.lib; { - homepage = "https://www.argtable.org/"; - description = "A Cross-Platform, Single-File, ANSI C Command-Line Parsing Library"; - license = licenses.bsd3; - maintainers = with maintainers; [ artuuge ]; - }; -} diff --git a/pkgs/tools/misc/arp-scan/default.nix b/pkgs/tools/misc/arp-scan/default.nix index 9a3164db5d7c..f4786a57bd75 100644 --- a/pkgs/tools/misc/arp-scan/default.nix +++ b/pkgs/tools/misc/arp-scan/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, libpcap, makeWrapper, perlPackages }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, libpcap, makeWrapper, perlPackages }: stdenv.mkDerivation rec { pname = "arp-scan"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { done; ''; - meta = with stdenv.lib; { + meta = with lib; { description = "ARP scanning and fingerprinting tool"; longDescription = '' Arp-scan is a command-line tool that uses the ARP protocol to discover diff --git a/pkgs/tools/misc/asciinema-scenario/default.nix b/pkgs/tools/misc/asciinema-scenario/default.nix index cff96a4ec86c..25bac9768438 100644 --- a/pkgs/tools/misc/asciinema-scenario/default.nix +++ b/pkgs/tools/misc/asciinema-scenario/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , rustPlatform , fetchCrate }: @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "109ij5h31bhn44l0wywgpnnlfjgyairxr5l19s6bz47sbka0xyxk"; - meta = with stdenv.lib; { + meta = with lib; { description = "Create asciinema videos from a text file"; homepage = "https://github.com/garbas/asciinema-scenario/"; maintainers = with maintainers; [ garbas ]; diff --git a/pkgs/tools/misc/aspcud/default.nix b/pkgs/tools/misc/aspcud/default.nix index b58f603ce594..4c5622fab09c 100644 --- a/pkgs/tools/misc/aspcud/default.nix +++ b/pkgs/tools/misc/aspcud/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip +{ lib, stdenv, fetchzip , boost, clasp, cmake, gringo, re2c }: @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "0vrf7h7g99vw1mybqfrpxamsnf89p18czlzgjmxl1zkiwc7vjpzw"; }; - buildInputs = [ boost clasp cmake gringo re2c ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ boost clasp gringo re2c ]; cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" @@ -19,7 +20,7 @@ stdenv.mkDerivation rec { "-DASPCUD_CLASP_PATH=${clasp}/bin/clasp" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Solver for package problems in CUDF format using ASP"; homepage = "https://potassco.org/aspcud/"; platforms = platforms.all; diff --git a/pkgs/tools/misc/autojump/default.nix b/pkgs/tools/misc/autojump/default.nix index c1a55256b35a..47c4cbcb4e74 100644 --- a/pkgs/tools/misc/autojump/default.nix +++ b/pkgs/tools/misc/autojump/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python3, bash }: +{ lib, stdenv, fetchFromGitHub, python3, bash }: stdenv.mkDerivation rec { pname = "autojump"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { install -Dt "$out/share/zsh/site-functions/" -m444 "$out/share/autojump/autojump.zsh" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A `cd' command that learns"; longDescription = '' One of the most used shell commands is “cd”. A quick survey diff --git a/pkgs/tools/misc/automirror/default.nix b/pkgs/tools/misc/automirror/default.nix index dde9c2d02d3a..cc10c93b3f65 100644 --- a/pkgs/tools/misc/automirror/default.nix +++ b/pkgs/tools/misc/automirror/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, git, ronn}: +{lib, stdenv, fetchFromGitHub, git, ronn}: stdenv.mkDerivation rec { pname = "automirror"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { installFlags = [ "DESTDIR=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/schlomo/automirror"; description = "Automatic Display Mirror"; license = licenses.gpl3; diff --git a/pkgs/tools/misc/autorandr/default.nix b/pkgs/tools/misc/autorandr/default.nix index 376b66181669..1d4a3a2b6ec9 100644 --- a/pkgs/tools/misc/autorandr/default.nix +++ b/pkgs/tools/misc/autorandr/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , python3Packages , fetchFromGitHub , systemd @@ -56,7 +56,7 @@ in sha256 = "0rmnqk2bi6bbd2if1rll37mlzlqxzmnazfffdhcpzskxwyaj4yn5"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/phillipberndt/autorandr/"; description = "Automatically select a display configuration based on connected devices"; license = licenses.gpl3Plus; diff --git a/pkgs/tools/misc/autorevision/default.nix b/pkgs/tools/misc/autorevision/default.nix index abaca62c400c..61bd5b5fc652 100644 --- a/pkgs/tools/misc/autorevision/default.nix +++ b/pkgs/tools/misc/autorevision/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, asciidoc, libxml2, docbook_xml_dtd_45, libxslt +{ lib, stdenv, fetchurl, asciidoc, libxml2, docbook_xml_dtd_45, libxslt , docbook_xsl, diffutils, coreutils, gnugrep, gnused }: @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { -i "$out/bin/autorevision" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Extracts revision metadata from your VCS repository"; homepage = "https://autorevision.github.io/"; license = licenses.mit; diff --git a/pkgs/tools/misc/azure-vhd-utils/default.nix b/pkgs/tools/misc/azure-vhd-utils/default.nix index bfb622ee7419..cb38f2705b12 100644 --- a/pkgs/tools/misc/azure-vhd-utils/default.nix +++ b/pkgs/tools/misc/azure-vhd-utils/default.nix @@ -1,5 +1,5 @@ # This file was generated by go2nix. -{ stdenv, buildGoPackage, fetchgit }: +{ lib, stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { pname = "azure-vhd-utils"; @@ -16,7 +16,7 @@ buildGoPackage rec { goDeps = ./deps.nix; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/Microsoft/azure-vhd-utils"; description = "Read, inspect and upload VHD files for Azure"; longDescription = "Go package to read Virtual Hard Disk (VHD) file, a CLI interface to upload local VHD to Azure storage and to inspect a local VHD"; diff --git a/pkgs/tools/misc/bandwidth/default.nix b/pkgs/tools/misc/bandwidth/default.nix index 024454a3472d..677a9ddef514 100644 --- a/pkgs/tools/misc/bandwidth/default.nix +++ b/pkgs/tools/misc/bandwidth/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, nasm }: +{ lib, stdenv, fetchurl, nasm }: let inherit (stdenv.hostPlatform.parsed.cpu) bits; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { cp ${arch} $out/bin/bandwidth ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://zsmith.co/bandwidth.html"; description = "Artificial benchmark for identifying weaknesses in the memory subsystem"; license = licenses.gpl2Plus; diff --git a/pkgs/tools/misc/bash_unit/default.nix b/pkgs/tools/misc/bash_unit/default.nix index abfe4078870e..2fd93cb33b97 100644 --- a/pkgs/tools/misc/bash_unit/default.nix +++ b/pkgs/tools/misc/bash_unit/default.nix @@ -1,5 +1,5 @@ { fetchFromGitHub -, stdenv +, lib, stdenv }: stdenv.mkDerivation rec { @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { cp bash_unit $out/bin/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Bash unit testing enterprise edition framework for professionals"; maintainers = with maintainers; [ pamplemousse ]; platforms = platforms.linux; diff --git a/pkgs/tools/misc/bashcards/default.nix b/pkgs/tools/misc/bashcards/default.nix index 3e91b9741c63..30a442ef5623 100644 --- a/pkgs/tools/misc/bashcards/default.nix +++ b/pkgs/tools/misc/bashcards/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { cp bashcards $out/bin/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Practice flashcards in bash"; homepage = "https://github.com/rpearce/bashcards/"; license = licenses.bsd3; diff --git a/pkgs/tools/misc/bashplotlib/default.nix b/pkgs/tools/misc/bashplotlib/default.nix index 3e8ae31835a6..cc3476f598b7 100644 --- a/pkgs/tools/misc/bashplotlib/default.nix +++ b/pkgs/tools/misc/bashplotlib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python3Packages, fetchFromGitHub }: +{ lib, stdenv, python3Packages, fetchFromGitHub }: python3Packages.buildPythonApplication { pname = "bashplotlib"; @@ -14,7 +14,7 @@ python3Packages.buildPythonApplication { # No tests doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/glamp/bashplotlib"; description = "Plotting in the terminal"; maintainers = with maintainers; [ dtzWill ]; diff --git a/pkgs/tools/misc/bat-extras/default.nix b/pkgs/tools/misc/bat-extras/default.nix index 36adc09cdba1..a2ec5afd965a 100644 --- a/pkgs/tools/misc/bat-extras/default.nix +++ b/pkgs/tools/misc/bat-extras/default.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, fetchFromGitHub, bash, makeWrapper, bat +{ lib, stdenv, callPackage, fetchFromGitHub, bash, makeWrapper, bat # batdiff, batgrep, and batwatch , coreutils , less @@ -76,7 +76,7 @@ let # The per-script derivations will go ahead and patch the files they actually install. dontPatchShebangs = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Bash scripts that integrate bat with various command line tools"; homepage = "https://github.com/eth-p/bat-extras"; license = with licenses; [ mit ]; diff --git a/pkgs/tools/misc/bat/default.nix b/pkgs/tools/misc/bat/default.nix index 5c60305a2e74..ac043ca7fea0 100644 --- a/pkgs/tools/misc/bat/default.nix +++ b/pkgs/tools/misc/bat/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , nixosTests , rustPlatform , fetchFromGitHub @@ -41,7 +41,7 @@ rustPlatform.buildRustPackage rec { passthru.tests = { inherit (nixosTests) bat; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A cat(1) clone with syntax highlighting and Git integration"; homepage = "https://github.com/sharkdp/bat"; license = with licenses; [ asl20 /* or */ mit ]; diff --git a/pkgs/tools/misc/bbe/default.nix b/pkgs/tools/misc/bbe/default.nix index b0af13160d21..fb62b8be8947 100644 --- a/pkgs/tools/misc/bbe/default.nix +++ b/pkgs/tools/misc/bbe/default.nix @@ -1,4 +1,4 @@ -{ stdenv , fetchurl, autoreconfHook }: +{ lib, stdenv , fetchurl, autoreconfHook }: stdenv.mkDerivation rec { pname = "bbe"; version = "0.2.2"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "doc" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A sed-like editor for binary files"; homepage = "http://bbe-.sourceforge.net/"; license = licenses.gpl2Plus; diff --git a/pkgs/tools/misc/bcunit/default.nix b/pkgs/tools/misc/bcunit/default.nix index 203735d79b0b..bc3bbc8276dd 100644 --- a/pkgs/tools/misc/bcunit/default.nix +++ b/pkgs/tools/misc/bcunit/default.nix @@ -1,6 +1,6 @@ { cmake , fetchFromGitLab -, stdenv +, lib, stdenv }: stdenv.mkDerivation rec { @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { # https://gitlab.linphone.org/BC/public/bcunit/issues/1 version = "unstable-2019-11-19"; - buildInputs = [ cmake ]; + nativeBuildInputs = [ cmake ]; src = fetchFromGitLab { domain = "gitlab.linphone.org"; owner = "public"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { sha256 = "1237hpmkls2igp60gdfkbknxpgwvxn1vmv2m41vyl25xw1d3g35w"; }; - meta = with stdenv.lib; { + meta = with lib; { inherit version; description = "A fork of CUnit test framework"; homepage = "https://gitlab.linphone.org/BC/public/bcunit"; diff --git a/pkgs/tools/misc/bdf2psf/default.nix b/pkgs/tools/misc/bdf2psf/default.nix index 676467c9b67d..ff14f2d1a4e2 100644 --- a/pkgs/tools/misc/bdf2psf/default.nix +++ b/pkgs/tools/misc/bdf2psf/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, perl, dpkg }: +{ lib, stdenv, fetchurl, perl, dpkg }: stdenv.mkDerivation rec { pname = "bdf2psf"; - version = "1.199"; + version = "1.200"; src = fetchurl { url = "mirror://debian/pool/main/c/console-setup/bdf2psf_${version}_all.deb"; - sha256 = "0qs0qrdagvnh4z20wp4v3v4ry6j5jihlpv3iqzzhdzzxjfrw9m9y"; + sha256 = "07z686h2fv9b3446fcym0sfzxwgkm9cc4bd3zhpv6j8bdfadnjxw"; }; nativeBuildInputs = [ dpkg ]; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { mv usr $out "; - meta = with stdenv.lib; { + meta = with lib; { description = "BDF to PSF converter"; homepage = "https://packages.debian.org/sid/bdf2psf"; longDescription = '' diff --git a/pkgs/tools/misc/bdf2sfd/default.nix b/pkgs/tools/misc/bdf2sfd/default.nix index 728967ec3da8..1d8bd38c1e18 100644 --- a/pkgs/tools/misc/bdf2sfd/default.nix +++ b/pkgs/tools/misc/bdf2sfd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "bdf2sfd"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - meta = with stdenv.lib; { + meta = with lib; { description = "BDF to SFD converter"; homepage = "https://github.com/fcambus/bdf2sfd"; license = licenses.bsd2; diff --git a/pkgs/tools/misc/betterdiscordctl/default.nix b/pkgs/tools/misc/betterdiscordctl/default.nix new file mode 100644 index 000000000000..c0822b9e1016 --- /dev/null +++ b/pkgs/tools/misc/betterdiscordctl/default.nix @@ -0,0 +1,37 @@ +{ lib, stdenv, fetchFromGitHub, fetchpatch }: + +stdenv.mkDerivation rec { + pname = "betterdiscordctl"; + version = "1.7.0"; + + src = fetchFromGitHub { + owner = "bb010g"; + repo = "betterdiscordctl"; + rev = "v${version}"; + sha256 = "0qpmm5l8jhm7k0kqblc0bnr9fl4b6z8iddhjar03bb4kqgr962fa"; + }; + + patches = [ + (fetchpatch { # Required till https://github.com/bb010g/betterdiscordctl/pull/67 is merged upstream. + url = "https://github.com/bb010g/betterdiscordctl/pull/67/commits/f1c7170fc2626d9aec4d244977b5a73c401aa1d4.patch"; + sha256 = "003zqd9ljb9h674sjwjvvdfs7q4cw0p1ydg3lax132vb4vz9k0zi"; + }) + ]; + + preBuild = "sed -i 's/^nix=$/&yes/g;s/^DISABLE_UPGRADE=$/&yes/g' ./betterdiscordctl"; + + installPhase = '' + mkdir -p $out/bin + mkdir -p $out/share/doc/betterdiscordctl + install -Dm744 betterdiscordctl $out/bin/betterdiscordctl + install -Dm644 README.md $out/share/doc/betterdiscordctl/README.md + ''; + + meta = with lib; { + homepage = "https://github.com/bb010g/betterdiscordctl"; + description = "A utility for managing BetterDiscord on Linux"; + license = licenses.mit; + maintainers = with maintainers; [ ivar bb010g ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/misc/bfr/default.nix b/pkgs/tools/misc/bfr/default.nix index 4ec736418428..2b84412f3b27 100644 --- a/pkgs/tools/misc/bfr/default.nix +++ b/pkgs/tools/misc/bfr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl }: +{ lib, stdenv, fetchurl, perl }: stdenv.mkDerivation rec { name = "bfr-1.6"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ perl ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A general-purpose command-line pipe buffer"; license = stdenv.lib.licenses.gpl2; maintainers = with maintainers; [ pSub ]; diff --git a/pkgs/tools/misc/bibtex2html/default.nix b/pkgs/tools/misc/bibtex2html/default.nix index ddda4ef4445a..0add7340ed5a 100644 --- a/pkgs/tools/misc/bibtex2html/default.nix +++ b/pkgs/tools/misc/bibtex2html/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml }: +{ lib, stdenv, fetchurl, ocaml, perl }: stdenv.mkDerivation { pname = "bibtex2html"; @@ -9,9 +9,9 @@ stdenv.mkDerivation { sha256 = "07gzrs4lfrkvbn48cgn2gn6c7cx3jsanakkrb2irj0gmjzfxl96j"; }; - buildInputs = [ ocaml ]; + buildInputs = [ ocaml perl ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A collection of tools for translating from BibTeX to HTML"; homepage = "https://www.lri.fr/~filliatr/bibtex2html/"; license = licenses.gpl2; diff --git a/pkgs/tools/misc/bibtool/default.nix b/pkgs/tools/misc/bibtool/default.nix index 041dabeee775..df27f244fca8 100644 --- a/pkgs/tools/misc/bibtool/default.nix +++ b/pkgs/tools/misc/bibtool/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl }: +{ lib, stdenv, fetchurl, perl }: stdenv.mkDerivation rec { pname = "bibtool"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { doCheck = true; checkTarget = "test"; - meta = with stdenv.lib; { + meta = with lib; { description = "Tool for manipulating BibTeX bibliographies"; homepage = "http://www.gerd-neugebauer.de/software/TeX/BibTool/index.en.html"; license = licenses.gpl2; diff --git a/pkgs/tools/misc/bibutils/default.nix b/pkgs/tools/misc/bibutils/default.nix index bd744bcfb6fb..cf42e56b5717 100644 --- a/pkgs/tools/misc/bibutils/default.nix +++ b/pkgs/tools/misc/bibutils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "bibutils"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { doCheck = true; checkTarget = "test"; - meta = with stdenv.lib; { + meta = with lib; { description = "Bibliography format interconversion"; longDescription = "The bibutils program set interconverts between various bibliography formats using a common MODS-format XML intermediate. For example, one can convert RIS-format files to Bibtex by doing two transformations: RIS->MODS->Bibtex. By using a common intermediate for N formats, only 2N programs are required and not N²-N. These programs operate on the command line and are styled after standard UNIX-like filters."; homepage = "https://sourceforge.net/p/bibutils/home/Bibutils/"; diff --git a/pkgs/tools/misc/birdfont/default.nix b/pkgs/tools/misc/birdfont/default.nix index c3361739f0bb..cdce76a324c2 100644 --- a/pkgs/tools/misc/birdfont/default.nix +++ b/pkgs/tools/misc/birdfont/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, python3, xmlbird, +{ lib, stdenv, fetchurl, pkgconfig, python3, xmlbird, cairo, gdk-pixbuf, libgee, glib, gtk3, webkitgtk, libnotify, sqlite, vala_0_44, gobject-introspection, gsettings-desktop-schemas, wrapGAppsHook }: @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { installPhase = "./install.py"; - meta = with stdenv.lib; { + meta = with lib; { description = "Font editor which can generate fonts in TTF, EOT, SVG and BIRDFONT format"; homepage = "https://birdfont.org"; license = licenses.gpl3; diff --git a/pkgs/tools/misc/birdfont/xmlbird.nix b/pkgs/tools/misc/birdfont/xmlbird.nix index 2d0d43871e83..3f103024d897 100644 --- a/pkgs/tools/misc/birdfont/xmlbird.nix +++ b/pkgs/tools/misc/birdfont/xmlbird.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python3, pkgconfig, vala, glib, gobject-introspection }: +{ lib, stdenv, fetchurl, python3, pkgconfig, vala, glib, gobject-introspection }: stdenv.mkDerivation rec { pname = "xmlbird"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { installPhase = "./install.py"; - meta = with stdenv.lib; { + meta = with lib; { description = "XML parser for Vala and C programs"; homepage = "https://birdfont.org/xmlbird.php"; license = licenses.lgpl3; diff --git a/pkgs/tools/misc/bmap-tools/default.nix b/pkgs/tools/misc/bmap-tools/default.nix index afb41d8b6ea9..ed42f31f26b3 100644 --- a/pkgs/tools/misc/bmap-tools/default.nix +++ b/pkgs/tools/misc/bmap-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python2Packages }: +{ lib, stdenv, fetchFromGitHub, python2Packages }: python2Packages.buildPythonApplication rec { pname = "bmap-tools"; @@ -14,7 +14,7 @@ python2Packages.buildPythonApplication rec { # tests fail only on hydra. doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "bmap-related tools"; homepage = "https://github.com/intel/bmap-tools"; license = licenses.gpl2; diff --git a/pkgs/tools/misc/bmon/default.nix b/pkgs/tools/misc/bmon/default.nix index a98b2075ada6..af7e3a3d6429 100644 --- a/pkgs/tools/misc/bmon/default.nix +++ b/pkgs/tools/misc/bmon/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, ncurses, libconfuse +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, ncurses, libconfuse , libnl }: stdenv.mkDerivation rec { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { export PKG_CONFIG="$(command -v "$PKG_CONFIG")" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Network bandwidth monitor"; homepage = "https://github.com/tgraf/bmon"; # Licensed unter BSD and MIT diff --git a/pkgs/tools/misc/bonfire/default.nix b/pkgs/tools/misc/bonfire/default.nix index 85d54c167360..cda58e80d87c 100644 --- a/pkgs/tools/misc/bonfire/default.nix +++ b/pkgs/tools/misc/bonfire/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python3Packages, fetchFromGitHub }: +{ lib, stdenv, python3Packages, fetchFromGitHub }: with python3Packages; @@ -38,7 +38,7 @@ buildPythonApplication rec { propagatedBuildInputs = [ arrow click keyring parsedatetime requests six termcolor ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://pypi.python.org/pypi/bonfire"; description = "CLI Graylog Client with Follow Mode"; license = licenses.bsd3; diff --git a/pkgs/tools/misc/broadlink-cli/default.nix b/pkgs/tools/misc/broadlink-cli/default.nix index 96b13c060e4b..53925b875916 100644 --- a/pkgs/tools/misc/broadlink-cli/default.nix +++ b/pkgs/tools/misc/broadlink-cli/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python3Packages, fetchFromGitHub }: +{ lib, stdenv, python3Packages, fetchFromGitHub }: python3Packages.buildPythonApplication { pname = "broadlink-cli"; @@ -29,7 +29,7 @@ python3Packages.buildPythonApplication { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Tools for interfacing with Broadlink RM2/3 (Pro) remote controls, A1 sensor platforms and SP2/3 smartplugs"; maintainers = with maintainers; [ peterhoeg ]; inherit (python3Packages.broadlink.meta) homepage license; diff --git a/pkgs/tools/misc/broot/default.nix b/pkgs/tools/misc/broot/default.nix index 4e40a4a336d4..afda7dd7abc9 100644 --- a/pkgs/tools/misc/broot/default.nix +++ b/pkgs/tools/misc/broot/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , rustPlatform , fetchCrate , installShellFiles @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { sha256 = "04nidx43w4nnccgbrw30wg9ai8p7hbklxpn1gc6gr2325yhqvwhl"; }; - cargoSha256 = "1bzq0dsdnmxniwnb6989wlhih28c4lyd11sci821whs11lhlfpz0"; + cargoHash = "sha256-4F9HIQ1BQx4EikyH0DwlDAkYIeUJJbMsj7ZX23QD+K8="; nativeBuildInputs = [ makeWrapper @@ -68,7 +68,7 @@ rustPlatform.buildRustPackage rec { installManPage man/broot.1 ''; - meta = with stdenv.lib; { + meta = with lib; { description = "An interactive tree view, a fuzzy search, a balanced BFS descent and customizable commands"; homepage = "https://dystroy.org/broot/"; maintainers = with maintainers; [ danieldk ]; diff --git a/pkgs/tools/misc/buildtorrent/default.nix b/pkgs/tools/misc/buildtorrent/default.nix index d3d3651c2b05..ce357a1d491e 100644 --- a/pkgs/tools/misc/buildtorrent/default.nix +++ b/pkgs/tools/misc/buildtorrent/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "buildtorrent"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-6OJ2R72ziHOsVw1GwalompKwG7Z/WQidHN0IeE9wUtA="; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A simple commandline torrent creator"; homepage = "https://mathr.co.uk/blog/torrent.html"; license = licenses.gpl3Plus; diff --git a/pkgs/tools/misc/byobu/default.nix b/pkgs/tools/misc/byobu/default.nix index 695ae54d876e..2008cf7b2079 100644 --- a/pkgs/tools/misc/byobu/default.nix +++ b/pkgs/tools/misc/byobu/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper +{ lib, stdenv, fetchurl, makeWrapper , ncurses, python3, perl, textual-window-manager , gettext, vim, bc, screen }: @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://launchpad.net/byobu/"; description = "Text-based window manager and terminal multiplexer"; diff --git a/pkgs/tools/misc/capture/default.nix b/pkgs/tools/misc/capture/default.nix index e92898ccc4d6..f6762af11aa2 100644 --- a/pkgs/tools/misc/capture/default.nix +++ b/pkgs/tools/misc/capture/default.nix @@ -1,4 +1,4 @@ -{ stdenv, slop, ffmpeg_3, fetchFromGitHub, makeWrapper}: +{ lib, stdenv, slop, ffmpeg_3, fetchFromGitHub, makeWrapper}: stdenv.mkDerivation { pname = "capture-unstable"; @@ -21,7 +21,7 @@ stdenv.mkDerivation { --prefix PATH : '${stdenv.lib.makeBinPath [ slop ffmpeg_3 ]}' ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A no bullshit screen capture tool"; homepage = "https://github.com/buhman/capture"; maintainers = [ maintainers.ar1a ]; diff --git a/pkgs/tools/misc/ccze/default.nix b/pkgs/tools/misc/ccze/default.nix index 409297de9f75..140e09c010a2 100644 --- a/pkgs/tools/misc/ccze/default.nix +++ b/pkgs/tools/misc/ccze/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoconf, ncurses, pcre }: +{ lib, stdenv, fetchurl, autoconf, ncurses, pcre }: stdenv.mkDerivation rec { name = "ccze-0.2.1-2"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { preConfigure = '' autoheader && autoconf ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Fast, modular log colorizer"; longDescription = '' Fast log colorizer written in C, intended to be a drop-in replacement diff --git a/pkgs/tools/misc/chafa/default.nix b/pkgs/tools/misc/chafa/default.nix index 5ed477c93a2f..8097744692bc 100644 --- a/pkgs/tools/misc/chafa/default.nix +++ b/pkgs/tools/misc/chafa/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, which, libxslt, libxml2, docbook_xml_dtd_412, docbook_xsl, glib, imagemagick, darwin }: +{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, which, libxslt, libxml2, docbook_xml_dtd_412, docbook_xsl, glib, imagemagick, darwin }: stdenv.mkDerivation rec { @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { "--with-xml-catalog=${docbook_xml_dtd_412}/xml/dtd/docbook/catalog.xml" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Terminal graphics for the 21st century"; homepage = "https://hpjansson.org/chafa/"; license = licenses.lgpl3Plus; diff --git a/pkgs/tools/misc/chelf/default.nix b/pkgs/tools/misc/chelf/default.nix index 96949dd5da57..25344d8658e8 100644 --- a/pkgs/tools/misc/chelf/default.nix +++ b/pkgs/tools/misc/chelf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "chelf"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { mv chelf $out/bin/chelf ''; - meta = with stdenv.lib; { + meta = with lib; { description = "change or display the stack size of an ELF binary"; homepage = "https://github.com/Gottox/chelf"; license = licenses.bsd2; diff --git a/pkgs/tools/misc/chezmoi/default.nix b/pkgs/tools/misc/chezmoi/default.nix index 0722fca4370b..6fab09aaeafe 100644 --- a/pkgs/tools/misc/chezmoi/default.nix +++ b/pkgs/tools/misc/chezmoi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, installShellFiles }: +{ lib, stdenv, buildGoModule, fetchFromGitHub, installShellFiles }: buildGoModule rec { pname = "chezmoi"; @@ -29,7 +29,7 @@ buildGoModule rec { subPackages = [ "." ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.chezmoi.io/"; description = "Manage your dotfiles across multiple machines, securely"; license = licenses.mit; diff --git a/pkgs/tools/misc/chrome-export/default.nix b/pkgs/tools/misc/chrome-export/default.nix index 8639f6f6f794..d3f4878ee691 100644 --- a/pkgs/tools/misc/chrome-export/default.nix +++ b/pkgs/tools/misc/chrome-export/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , python3 }: @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { bash test/run_tests $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Scripts to save Google Chrome's bookmarks and history as HTML bookmarks files"; homepage = "https://github.com/bdesham/chrome-export"; license = [ licenses.isc ]; diff --git a/pkgs/tools/misc/cht.sh/default.nix b/pkgs/tools/misc/cht.sh/default.nix index ceef26b577d6..12730d262234 100644 --- a/pkgs/tools/misc/cht.sh/default.nix +++ b/pkgs/tools/misc/cht.sh/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , unstableGitUpdater , makeWrapper @@ -38,7 +38,7 @@ stdenv.mkDerivation { passthru.updateScript = unstableGitUpdater { }; - meta = with stdenv.lib; { + meta = with lib; { description = "CLI client for cheat.sh, a community driven cheat sheet"; license = licenses.mit; maintainers = with maintainers; [ fgaz evanjs ]; diff --git a/pkgs/tools/misc/ckb-next/default.nix b/pkgs/tools/misc/ckb-next/default.nix index 8189a07c214b..fefb797dbd03 100644 --- a/pkgs/tools/misc/ckb-next/default.nix +++ b/pkgs/tools/misc/ckb-next/default.nix @@ -1,4 +1,4 @@ -{ stdenv, mkDerivation, fetchFromGitHub, substituteAll, udev +{ lib, stdenv, mkDerivation, fetchFromGitHub, substituteAll, udev , pkgconfig, qtbase, cmake, zlib, kmod }: mkDerivation rec { @@ -39,7 +39,7 @@ mkDerivation rec { }) ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Driver and configuration tool for Corsair keyboards and mice"; homepage = "https://github.com/ckb-next/ckb-next"; license = licenses.gpl2; diff --git a/pkgs/tools/misc/clac/default.nix b/pkgs/tools/misc/clac/default.nix index 8d6e464e9bb0..4f26b2036a7d 100644 --- a/pkgs/tools/misc/clac/default.nix +++ b/pkgs/tools/misc/clac/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "clac"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { cp README* LICENSE "$out/share/doc/${pname}" ''; - meta = with stdenv.lib; { + meta = with lib; { inherit version; description = "Interactive stack-based calculator"; homepage = "https://github.com/soveran/clac"; diff --git a/pkgs/tools/misc/clasp/default.nix b/pkgs/tools/misc/clasp/default.nix index 2748c0126cde..4fc0d2c2f8cb 100644 --- a/pkgs/tools/misc/clasp/default.nix +++ b/pkgs/tools/misc/clasp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: let version = "3.1.4"; @@ -23,7 +23,7 @@ stdenv.mkDerivation { cp bin/clasp $out/bin/clasp ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Answer set solver for (extended) normal and disjunctive logic programs"; homepage = "http://potassco.sourceforge.net/"; platforms = platforms.all; diff --git a/pkgs/tools/misc/claws/default.nix b/pkgs/tools/misc/claws/default.nix index 10347e6e794d..20c8cc7af8f5 100644 --- a/pkgs/tools/misc/claws/default.nix +++ b/pkgs/tools/misc/claws/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "claws"; @@ -13,7 +13,7 @@ buildGoPackage rec { sha256 = "0nl7xvdivnabqr98mh3m1pwqznprsaqpagny6zcwwmz480x4pmfz"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/thehowl/claws"; description = "Interactive command line client for testing websocket servers"; license = licenses.mit; diff --git a/pkgs/tools/misc/clex/default.nix b/pkgs/tools/misc/clex/default.nix index af21e971fe07..a2ac0df9801d 100644 --- a/pkgs/tools/misc/clex/default.nix +++ b/pkgs/tools/misc/clex/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses }: +{ lib, stdenv, fetchurl, ncurses }: stdenv.mkDerivation rec { pname = "clex"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "File manager with full-screen terminal interface"; longDescription = '' CLEX (pronounced KLEKS) displays directory contents including the file diff --git a/pkgs/tools/misc/clipnotify/default.nix b/pkgs/tools/misc/clipnotify/default.nix index 91c428def280..5cb3a5114d8a 100644 --- a/pkgs/tools/misc/clipnotify/default.nix +++ b/pkgs/tools/misc/clipnotify/default.nix @@ -1,4 +1,4 @@ -{ libX11, libXfixes, stdenv, fetchFromGitHub }: +{ libX11, libXfixes, lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "clipnotify"; version = "git-2018-02-20"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { cp clipnotify $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Notify on new X clipboard events"; inherit (src.meta) homepage; maintainers = with maintainers; [ jb55 ]; diff --git a/pkgs/tools/misc/clipster/default.nix b/pkgs/tools/misc/clipster/default.nix index bb14830bf063..7da185050fb1 100644 --- a/pkgs/tools/misc/clipster/default.nix +++ b/pkgs/tools/misc/clipster/default.nix @@ -1,4 +1,4 @@ -{fetchFromGitHub , stdenv, python3, gtk3, libwnck3, +{fetchFromGitHub , lib, stdenv, python3, gtk3, libwnck3, gobject-introspection, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { cp clipster $out/bin/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "lightweight python clipboard manager"; longDescription = '' Clipster was designed to try to add a good selection of useful features, while avoiding bad design decisions or becoming excessively large. diff --git a/pkgs/tools/misc/cloud-sql-proxy/default.nix b/pkgs/tools/misc/cloud-sql-proxy/default.nix index 16263e2b6c35..11bfdc508ebc 100644 --- a/pkgs/tools/misc/cloud-sql-proxy/default.nix +++ b/pkgs/tools/misc/cloud-sql-proxy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchgit }: +{ lib, stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { pname = "cloud-sql-proxy"; @@ -18,7 +18,7 @@ buildGoPackage rec { buildFlagsArray = [ "-ldflags=" "-X main.versionString=${version}" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "An authenticating proxy for Second Generation Google Cloud SQL databases"; homepage = "https://${goPackagePath}"; license = licenses.asl20; diff --git a/pkgs/tools/misc/cloud-utils/default.nix b/pkgs/tools/misc/cloud-utils/default.nix index 1bd3def87c41..290bb92faa1c 100644 --- a/pkgs/tools/misc/cloud-utils/default.nix +++ b/pkgs/tools/misc/cloud-utils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper +{ lib, stdenv, fetchurl, makeWrapper , gawk, gnused, util-linux, file , wget, python3, qemu-utils, euca2ools , e2fsprogs, cdrkit @@ -48,7 +48,7 @@ in stdenv.mkDerivation rec { dontBuild = true; - meta = with stdenv.lib; { + meta = with lib; { platforms = platforms.unix; license = licenses.gpl3; }; diff --git a/pkgs/tools/misc/clpeak/default.nix b/pkgs/tools/misc/clpeak/default.nix index b021703b804a..e8b2ab68f316 100644 --- a/pkgs/tools/misc/clpeak/default.nix +++ b/pkgs/tools/misc/clpeak/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, ocl-icd, opencl-clhpp }: +{ lib, stdenv, fetchFromGitHub, cmake, ocl-icd, opencl-clhpp }: stdenv.mkDerivation rec { pname = "clpeak"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { buildInputs = [ ocl-icd opencl-clhpp ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A tool which profiles OpenCL devices to find their peak capacities"; homepage = "https://github.com/krrishnarraj/clpeak/"; license = licenses.unlicense; diff --git a/pkgs/tools/misc/code-minimap/default.nix b/pkgs/tools/misc/code-minimap/default.nix index 8c43e2b903ca..0ccfe4246458 100644 --- a/pkgs/tools/misc/code-minimap/default.nix +++ b/pkgs/tools/misc/code-minimap/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , rustPlatform , fetchFromGitHub }: @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1rxrdavj07i7qa5rf1i3aj7zdcp7c6lrg8yiy75r6lm4g98izzww"; - meta = with stdenv.lib; { + meta = with lib; { description = "A high performance code minimap render"; homepage = "https://github.com/wfxr/code-minimap"; license = with licenses; [ asl20 /* or */ mit ]; diff --git a/pkgs/tools/misc/codebraid/default.nix b/pkgs/tools/misc/codebraid/default.nix index 79ed7dd01fca..a855dac5f124 100644 --- a/pkgs/tools/misc/codebraid/default.nix +++ b/pkgs/tools/misc/codebraid/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python3Packages, fetchFromGitHub }: +{ lib, stdenv, python3Packages, fetchFromGitHub }: python3Packages.buildPythonApplication rec { pname = "codebraid"; @@ -16,7 +16,7 @@ python3Packages.buildPythonApplication rec { checkPhase = '' $out/bin/codebraid --help > /dev/null ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/gpoore/codebraid"; description = '' Live code in Pandoc Markdown. diff --git a/pkgs/tools/misc/colord-gtk/default.nix b/pkgs/tools/misc/colord-gtk/default.nix index b2113f8304cf..403b3df07537 100644 --- a/pkgs/tools/misc/colord-gtk/default.nix +++ b/pkgs/tools/misc/colord-gtk/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , colord , gettext @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { gtk3 ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.freedesktop.org/software/colord/intro.html"; license = licenses.lgpl21Plus; platforms = platforms.linux; diff --git a/pkgs/tools/misc/colord/default.nix b/pkgs/tools/misc/colord/default.nix index 1db776c8ff0d..8a8d110f4e98 100644 --- a/pkgs/tools/misc/colord/default.nix +++ b/pkgs/tools/misc/colord/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , nixosTests , bash-completion @@ -104,7 +104,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "System service to manage, install and generate color profiles to accurately color manage input and output devices"; homepage = "https://www.freedesktop.org/software/colord/"; license = licenses.lgpl2Plus; diff --git a/pkgs/tools/misc/colorpicker/default.nix b/pkgs/tools/misc/colorpicker/default.nix index 3de5d33617c7..d2d0915a46fe 100644 --- a/pkgs/tools/misc/colorpicker/default.nix +++ b/pkgs/tools/misc/colorpicker/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkg-config, gtk2 }: +{ lib, stdenv, fetchFromGitHub, pkg-config, gtk2 }: stdenv.mkDerivation rec { pname = "colorpicker"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { install -Dt $out/bin colorpicker ''; - meta = with stdenv.lib; { + meta = with 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 ]; diff --git a/pkgs/tools/misc/contacts/default.nix b/pkgs/tools/misc/contacts/default.nix index b58e0c6e31e1..40b8289e68b7 100644 --- a/pkgs/tools/misc/contacts/default.nix +++ b/pkgs/tools/misc/contacts/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, xcbuildHook, Foundation, AddressBook }: +{ lib, stdenv, fetchurl, xcbuildHook, Foundation, AddressBook }: stdenv.mkDerivation { version = "1.1a-3"; @@ -17,7 +17,7 @@ stdenv.mkDerivation { cp Products/Default/contacts $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Access contacts from the Mac address book from command-line"; homepage = "http://www.gnufoo.org/contacts/contacts.html"; license = licenses.gpl2; diff --git a/pkgs/tools/misc/convbin/default.nix b/pkgs/tools/misc/convbin/default.nix index 0abf10710caa..92890c056b15 100644 --- a/pkgs/tools/misc/convbin/default.nix +++ b/pkgs/tools/misc/convbin/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub }: @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { install -Dm755 bin/convbin $out/bin/convbin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Converts files to other formats"; longDescription = '' This program is used to convert files to other formats, diff --git a/pkgs/tools/misc/convfont/default.nix b/pkgs/tools/misc/convfont/default.nix index 0cc181082a4f..aeecb0532127 100644 --- a/pkgs/tools/misc/convfont/default.nix +++ b/pkgs/tools/misc/convfont/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { install -Dm755 convfont $out/bin/convfont ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Converts font for use with FontLibC"; homepage = "https://github.com/drdnar/convfont"; license = licenses.wtfpl; diff --git a/pkgs/tools/misc/convimg/default.nix b/pkgs/tools/misc/convimg/default.nix index f9de88cb01e5..8caf4cb706f9 100644 --- a/pkgs/tools/misc/convimg/default.nix +++ b/pkgs/tools/misc/convimg/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub }: @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { install -Dm755 bin/convimg $out/bin/convimg ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Image palette quantization"; longDescription = '' This program is used to convert images to other formats, diff --git a/pkgs/tools/misc/convmv/default.nix b/pkgs/tools/misc/convmv/default.nix index 56b9d5c849a5..b9b775a1bff9 100644 --- a/pkgs/tools/misc/convmv/default.nix +++ b/pkgs/tools/misc/convmv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl }: +{ lib, stdenv, fetchurl, perl }: stdenv.mkDerivation rec { name = "convmv-2.05"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ perl ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Converts filenames from one encoding to another"; platforms = platforms.linux ++ platforms.freebsd ++ platforms.cygwin; maintainers = [ ]; diff --git a/pkgs/tools/misc/coreboot-utils/default.nix b/pkgs/tools/misc/coreboot-utils/default.nix index 39e2e041e326..84a5d3b32554 100644 --- a/pkgs/tools/misc/coreboot-utils/default.nix +++ b/pkgs/tools/misc/coreboot-utils/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, zlib, pciutils, coreutils, acpica-tools, iasl, makeWrapper, gnugrep, gnused, file, buildEnv }: let - version = "4.12"; + version = "4.13"; commonMeta = with stdenv.lib; { description = "Various coreboot-related tools"; @@ -16,7 +16,7 @@ let src = fetchurl { url = "https://coreboot.org/releases/coreboot-${version}.tar.xz"; - sha256 = "1qibds9lsk22wf1sxwg0jg32fgcvc9an39vf74y1hwwvxq0d1jpd"; + sha256 = "0sl50aajnah4a138sr3jjm3ydc8gfh5vvlhviz3ypp95b9jdlya7"; }; enableParallelBuilding = true; @@ -89,7 +89,7 @@ let nativeBuildInputs = [ makeWrapper ]; dontBuild = true; installPhase = "install -Dm755 acpidump-all $out/bin/acpidump-all"; - postFixup = let + postFixup = let binPath = [ coreutils acpica-tools iasl gnugrep gnused file ]; in "wrapProgram $out/bin/acpidump-all --set PATH ${stdenv.lib.makeBinPath binPath}"; }; diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index d0e032b7c10e..1a0c9b2e10c8 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -76,8 +76,7 @@ stdenv.mkDerivation (rec { outputs = [ "out" "info" ]; nativeBuildInputs = [ perl xz.bin ] - ++ optionals stdenv.hostPlatform.isCygwin [ autoreconfHook texinfo ] # due to patch - ++ optionals stdenv.hostPlatform.isMusl [ autoreconfHook bison ]; # due to patch + ++ optionals stdenv.hostPlatform.isCygwin [ autoreconfHook texinfo ]; # due to patch configureFlags = [ "--with-packager=https://NixOS.org" ] ++ optional (singleBinary != false) ("--enable-single-binary" + optionalString (isString singleBinary) "=${singleBinary}") diff --git a/pkgs/tools/misc/cowsay/default.nix b/pkgs/tools/misc/cowsay/default.nix index 972b2997d810..d353115f24ea 100644 --- a/pkgs/tools/misc/cowsay/default.nix +++ b/pkgs/tools/misc/cowsay/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl }: +{ lib, stdenv, fetchurl, perl }: stdenv.mkDerivation rec { version = "3.03+dfsg2"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { install -m644 cows/* -t $out/share/cows/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A program which generates ASCII pictures of a cow with a message"; homepage = "https://en.wikipedia.org/wiki/Cowsay"; license = licenses.gpl1; diff --git a/pkgs/tools/misc/cp437/default.nix b/pkgs/tools/misc/cp437/default.nix index 70ca44bd06a2..ac9282ae4344 100644 --- a/pkgs/tools/misc/cp437/default.nix +++ b/pkgs/tools/misc/cp437/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: let version = "0.6"; in stdenv.mkDerivation { @@ -16,7 +16,7 @@ stdenv.mkDerivation { install -Dm755 cp437 -t $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = '' Emulates an old-style "code page 437" / "IBM-PC" character set terminal on a modern UTF-8 terminal emulator diff --git a/pkgs/tools/misc/cpulimit/default.nix b/pkgs/tools/misc/cpulimit/default.nix index 13c29d6ab936..27e661e26970 100644 --- a/pkgs/tools/misc/cpulimit/default.nix +++ b/pkgs/tools/misc/cpulimit/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation rec { pname = "cpulimit"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { installFlags = [ "PREFIX=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://limitcpu.sourceforge.net/"; description = "A tool to throttle the CPU usage of programs"; platforms = with platforms; linux ++ freebsd; diff --git a/pkgs/tools/misc/cpuminer-multi/default.nix b/pkgs/tools/misc/cpuminer-multi/default.nix index 2856bc2f1e0c..d99662d8ff3e 100644 --- a/pkgs/tools/misc/cpuminer-multi/default.nix +++ b/pkgs/tools/misc/cpuminer-multi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, curl, jansson, autoconf, automake +{ lib, stdenv, fetchFromGitHub, curl, jansson, autoconf, automake , aesni ? stdenv.hostPlatform.aesSupport }: let @@ -23,7 +23,7 @@ stdenv.mkDerivation { configureFlags = [ (if aesni then "--enable-aes-ni" else "--disable-aes-ni") ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Multi-algo CPUMiner"; homepage = "https://github.com/wolf9466/cpuminer-multi"; license = licenses.gpl2; diff --git a/pkgs/tools/misc/cpuminer/default.nix b/pkgs/tools/misc/cpuminer/default.nix index d48dc5ec1c9f..27bf0ec5374b 100644 --- a/pkgs/tools/misc/cpuminer/default.nix +++ b/pkgs/tools/misc/cpuminer/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , curl , jansson @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { configureFlags = [ "CFLAGS=-O3" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/pooler/cpuminer"; description = "CPU miner for Litecoin and Bitcoin"; license = licenses.gpl2; diff --git a/pkgs/tools/misc/crex/default.nix b/pkgs/tools/misc/crex/default.nix index 72e8521fec1a..14d462e8e6e4 100644 --- a/pkgs/tools/misc/crex/default.nix +++ b/pkgs/tools/misc/crex/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "crex"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Explore, test, and check regular expressions in the terminal"; homepage = "https://octobanana.com/software/crex"; license = licenses.mit; diff --git a/pkgs/tools/misc/crudini/default.nix b/pkgs/tools/misc/crudini/default.nix index 1a49446e9c01..a4b499a63235 100644 --- a/pkgs/tools/misc/crudini/default.nix +++ b/pkgs/tools/misc/crudini/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python3Packages, help2man, installShellFiles }: +{ lib, stdenv, fetchFromGitHub, python3Packages, help2man, installShellFiles }: python3Packages.buildPythonApplication rec { pname = "crudini"; @@ -40,7 +40,7 @@ python3Packages.buildPythonApplication rec { runHook postCheck ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A utility for manipulating ini files "; homepage = "https://www.pixelbeat.org/programs/crudini/"; license = licenses.gpl2Only; diff --git a/pkgs/tools/misc/csv2latex/default.nix b/pkgs/tools/misc/csv2latex/default.nix index da2225829677..035d2cb9702d 100644 --- a/pkgs/tools/misc/csv2latex/default.nix +++ b/pkgs/tools/misc/csv2latex/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "csv2latex"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { make PREFIX=$out install ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Command-line CSV to LaTeX file converter"; homepage = "http://brouits.free.fr/csv2latex/"; license = licenses.gpl2; diff --git a/pkgs/tools/misc/dashing/default.nix b/pkgs/tools/misc/dashing/default.nix index 11523ae3758d..546daef5ecbd 100644 --- a/pkgs/tools/misc/dashing/default.nix +++ b/pkgs/tools/misc/dashing/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "dashing"; @@ -17,7 +17,7 @@ buildGoPackage rec { buildFlagsArray = [ "-ldflags=-X main.version=${version}" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A Dash Generator Script for Any HTML"; homepage = "https://github.com/technosophos/dashing"; license = licenses.mit; diff --git a/pkgs/tools/misc/datamash/default.nix b/pkgs/tools/misc/datamash/default.nix index 8e9782506fb9..25f814e5f3c8 100644 --- a/pkgs/tools/misc/datamash/default.nix +++ b/pkgs/tools/misc/datamash/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "datamash"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1cxdlhgz3wzjqlq8bgwad93fgqymk2abbldfzw1ffnhcp4mmjjjp"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A command-line program which performs basic numeric,textual and statistical operations on input textual data files"; homepage = "https://www.gnu.org/software/datamash/"; license = licenses.gpl3Plus; diff --git a/pkgs/tools/misc/dateutils/default.nix b/pkgs/tools/misc/dateutils/default.nix index eae2241c3b4e..9ef68a590c27 100644 --- a/pkgs/tools/misc/dateutils/default.nix +++ b/pkgs/tools/misc/dateutils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, tzdata, fetchpatch }: +{ lib, stdenv, fetchurl, autoreconfHook, tzdata, fetchpatch }: stdenv.mkDerivation rec { version = "0.4.7"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A bunch of tools that revolve around fiddling with dates and times in the command line"; homepage = "http://www.fresse.org/dateutils/"; license = licenses.bsd3; diff --git a/pkgs/tools/misc/ddate/default.nix b/pkgs/tools/misc/ddate/default.nix index 04a89ec3dd0f..024572eaa7a8 100644 --- a/pkgs/tools/misc/ddate/default.nix +++ b/pkgs/tools/misc/ddate/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, cmake} : +{ stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "ddate"; @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { sha256 = "1qchxnxvghbma6gp1g78wnjxsri0b72ha9axyk31cplssl7yn73f"; }; - buildInputs = [ cmake ]; + nativeBuildInputs = [ cmake ]; - meta = { + meta = with stdenv.lib; { homepage = "https://github.com/bo0ts/ddate"; description = "Discordian version of the date program"; - license = stdenv.lib.licenses.publicDomain; - maintainers = with stdenv.lib.maintainers; [ kovirobi ]; - platforms = stdenv.lib.platforms.all; + license = licenses.publicDomain; + maintainers = with maintainers; [ kovirobi ]; + platforms = platforms.all; }; } diff --git a/pkgs/tools/misc/ddccontrol/default.nix b/pkgs/tools/misc/ddccontrol/default.nix index cfc48af5be54..c57f0570d1eb 100644 --- a/pkgs/tools/misc/ddccontrol/default.nix +++ b/pkgs/tools/misc/ddccontrol/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, intltool, libxml2 +{ lib, stdenv, fetchFromGitHub, autoreconfHook, intltool, libxml2 , pciutils, pkgconfig, gtk2, ddccontrol-db , makeDesktopItem }: @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { categories = "Settings;HardwareSettings;"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A program used to control monitor parameters by software"; homepage = "https://github.com/ddccontrol/ddccontrol"; license = licenses.gpl2; diff --git a/pkgs/tools/misc/ddcutil/default.nix b/pkgs/tools/misc/ddcutil/default.nix index 0a2664d6a775..4a3e8aa9e345 100644 --- a/pkgs/tools/misc/ddcutil/default.nix +++ b/pkgs/tools/misc/ddcutil/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig , glib, i2c-tools, udev, libgudev, libusb1, libdrm, xorg }: stdenv.mkDerivation rec { @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { glib libusb1 libdrm xorg.libXrandr ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.ddcutil.com/"; description = "Query and change Linux monitor settings using DDC/CI and USB"; license = licenses.gpl2; diff --git a/pkgs/tools/misc/debian-devscripts/default.nix b/pkgs/tools/misc/debian-devscripts/default.nix index 35db9ef7db36..9b97886682fd 100644 --- a/pkgs/tools/misc/debian-devscripts/default.nix +++ b/pkgs/tools/misc/debian-devscripts/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, unzip, xz, dpkg +{lib, stdenv, fetchurl, unzip, xz, dpkg , libxslt, docbook_xsl, makeWrapper , python3Packages , perlPackages, curl, gnupg, diffutils @@ -57,7 +57,7 @@ in stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = ''Debian package maintenance scripts''; license = licenses.free; # Mix of public domain, Artistic+GPL, GPL1+, GPL2+, GPL3+, and GPL2-only... TODO maintainers = with maintainers; [raskin]; diff --git a/pkgs/tools/misc/debianutils/default.nix b/pkgs/tools/misc/debianutils/default.nix index 42deec9dc5d2..d9fc2a407124 100644 --- a/pkgs/tools/misc/debianutils/default.nix +++ b/pkgs/tools/misc/debianutils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "debianutils"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1pjh2s5f8qp8jaky2x08yvf125np0s48zb2z6f3h6x4vf20hws1v"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Miscellaneous utilities specific to Debian"; longDescription = '' This package provides a number of small utilities which are used primarily by the installation scripts of Debian packages, although you may use them directly. diff --git a/pkgs/tools/misc/debootstrap/default.nix b/pkgs/tools/misc/debootstrap/default.nix index 4d4afb0b995f..f0e6a8ec4055 100644 --- a/pkgs/tools/misc/debootstrap/default.nix +++ b/pkgs/tools/misc/debootstrap/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, dpkg, gawk, perl, wget, coreutils, util-linux +{ lib, stdenv, fetchurl, dpkg, gawk, perl, wget, coreutils, util-linux , gnugrep, gnutar, gnused, gzip, makeWrapper }: # USAGE like this: debootstrap sid /tmp/target-chroot-directory # There is also cdebootstrap now. Is that easier to maintain? @@ -57,7 +57,7 @@ in stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Tool to create a Debian system in a chroot"; homepage = "https://wiki.debian.org/Debootstrap"; license = licenses.mit; diff --git a/pkgs/tools/misc/detox/default.nix b/pkgs/tools/misc/detox/default.nix index 85bed63c7f9d..6aa66b349dc7 100644 --- a/pkgs/tools/misc/detox/default.nix +++ b/pkgs/tools/misc/detox/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, flex}: +{lib, stdenv, fetchurl, flex}: stdenv.mkDerivation { name = "detox-1.2.0"; @@ -16,7 +16,7 @@ stdenv.mkDerivation { install -m644 safe.tbl $out/share/detox/ ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://detox.sourceforge.net/"; description = "Utility designed to clean up filenames"; longDescription = '' diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index b910f3f9699e..2d7715274bed 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -68,7 +68,7 @@ python3Packages.buildPythonApplication rec { cp doc/diffoscope.1 $out/share/man/man1/diffoscope.1 ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Perform in-depth comparison of files, archives, and directories"; longDescription = '' diffoscope will try to get to the bottom of what makes files or directories diff --git a/pkgs/tools/misc/direnv/default.nix b/pkgs/tools/misc/direnv/default.nix index 185b97d72732..c3317ec0b307 100644 --- a/pkgs/tools/misc/direnv/default.nix +++ b/pkgs/tools/misc/direnv/default.nix @@ -1,37 +1,30 @@ -{ stdenv, fetchFromGitHub, buildGoModule, bash, fish, zsh }: +{ lib, stdenv, fetchFromGitHub, buildGoModule, bash, fish, zsh }: buildGoModule rec { pname = "direnv"; - version = "2.25.1"; - - vendorSha256 = null; + version = "2.27.0"; src = fetchFromGitHub { owner = "direnv"; repo = "direnv"; rev = "v${version}"; - sha256 = "0bwr7zdzjm5p6bjyzafc2n57y83f0pv2bmj99rhi8f94hhfydlsf"; + sha256 = "05vvn59xd2q4yjizh5fprjib5xqq58by80d5avsm8nb1qxf383b1"; }; + vendorSha256 = "084x7d7sshcsyim76d6pl6127nlqacgwwnm965srl9y5w5nqzba6"; + # we have no bash at the moment for windows BASH_PATH = stdenv.lib.optionalString (!stdenv.hostPlatform.isWindows) "${bash}/bin/bash"; - # fix hardcoded GOFLAGS in makefile. remove once https://github.com/direnv/direnv/issues/718 is closed. - postPatch = '' - substituteInPlace GNUmakefile --replace "export GOFLAGS=-mod=vendor" "" - ''; - # replace the build phase to use the GNUMakefile instead buildPhase = '' make BASH_PATH=$BASH_PATH ''; installPhase = '' - make install DESTDIR=$out - mkdir -p $out/share/fish/vendor_conf.d - echo "eval ($out/bin/direnv hook fish)" > $out/share/fish/vendor_conf.d/direnv.fish + make install PREFIX=$out ''; checkInputs = [ fish zsh ]; @@ -41,7 +34,7 @@ buildGoModule rec { make test-go test-bash test-fish test-zsh ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A shell extension that manages your environment"; longDescription = '' Once hooked into your shell direnv is looking for an .envrc file in your diff --git a/pkgs/tools/misc/disfetch/default.nix b/pkgs/tools/misc/disfetch/default.nix new file mode 100644 index 000000000000..30d4d79488e1 --- /dev/null +++ b/pkgs/tools/misc/disfetch/default.nix @@ -0,0 +1,29 @@ +{ stdenv +, lib +, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "disfetch"; + version = "1.13"; + + src = fetchFromGitHub { + owner = "llathasa-veleth"; + repo = "disfetch"; + rev = version; + sha256 = "14vccp1z0g2hr9alx2ydz29hfa4xfv9irdjsvqm94fbyi5fa87k0"; + }; + + dontBuild = true; + + installPhase = '' + install -Dm755 -t $out/bin disfetch + ''; + + meta = with lib; { + description = "Yet another *nix distro fetching program, but less complex"; + homepage = "https://github.com/llathasa-veleth/disfetch"; + license = licenses.mit; + platforms = platforms.all; + maintainers = [ maintainers.vel ]; + }; +} diff --git a/pkgs/tools/misc/diskonaut/default.nix b/pkgs/tools/misc/diskonaut/default.nix index 20b955f877e6..6c295eb00e82 100644 --- a/pkgs/tools/misc/diskonaut/default.nix +++ b/pkgs/tools/misc/diskonaut/default.nix @@ -1,4 +1,4 @@ -{ stdenv, rustPlatform, fetchFromGitHub }: +{ lib, stdenv, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "diskonaut"; @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0y86ikf235lp5j85fgzawgp4vx66rmzqd6p5n8iy3mqwn3c1ggb8"; - meta = with stdenv.lib; { + meta = with lib; { description = "Terminal disk space navigator"; homepage = "https://github.com/imsnif/diskonaut"; license = licenses.mit; diff --git a/pkgs/tools/misc/diskscan/default.nix b/pkgs/tools/misc/diskscan/default.nix index 204b7b4cf8dd..1e7bbd6bfcec 100644 --- a/pkgs/tools/misc/diskscan/default.nix +++ b/pkgs/tools/misc/diskscan/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, ncurses, zlib }: +{ lib, stdenv, fetchFromGitHub, cmake, ncurses, zlib }: stdenv.mkDerivation rec { pname = "diskscan"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/baruch/diskscan"; description = "Scan HDD/SSD for failed and near failed sectors"; platforms = with platforms; linux; diff --git a/pkgs/tools/misc/diskus/default.nix b/pkgs/tools/misc/diskus/default.nix index b3fbc6377ab5..bf61a844196a 100644 --- a/pkgs/tools/misc/diskus/default.nix +++ b/pkgs/tools/misc/diskus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform, Security }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, Security }: rustPlatform.buildRustPackage rec { pname = "diskus"; @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0bivmjn7h4lfp5azbc6q0xiqq3fk68jdd4kwrwgbxiljg4xd2qy8"; - meta = with stdenv.lib; { + meta = with lib; { description = "A minimal, fast alternative to 'du -sh'"; homepage = "https://github.com/sharkdp/diskus"; license = with licenses; [ asl20 /* or */ mit ]; diff --git a/pkgs/tools/misc/docbook2mdoc/default.nix b/pkgs/tools/misc/docbook2mdoc/default.nix index 2237d009d43c..9a4352d32679 100644 --- a/pkgs/tools/misc/docbook2mdoc/default.nix +++ b/pkgs/tools/misc/docbook2mdoc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, expat }: +{ lib, stdenv, fetchurl, expat }: stdenv.mkDerivation rec { pname = "docbook2mdoc"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://mdocml.bsd.lv/"; description = "converter from DocBook V4.x and v5.x XML into mdoc"; license = licenses.isc; diff --git a/pkgs/tools/misc/docker-ls/default.nix b/pkgs/tools/misc/docker-ls/default.nix index e53f020fc6bd..df9755f863da 100644 --- a/pkgs/tools/misc/docker-ls/default.nix +++ b/pkgs/tools/misc/docker-ls/default.nix @@ -1,4 +1,4 @@ -{ buildGoModule, fetchFromGitHub, stdenv, docker }: +{ buildGoModule, fetchFromGitHub, lib, stdenv, docker }: buildGoModule rec { pname = "docker-ls"; @@ -13,7 +13,7 @@ buildGoModule rec { vendorSha256 = "sha256-UulcjQOLEIP++eoYQTEIbCJW51jyE312dMxB8+AKcdU="; - meta = with stdenv.lib; { + meta = with lib; { description = "Tools for browsing and manipulating docker registries"; longDescription = '' Docker-ls is a set of CLI tools for browsing and manipulating docker registries. diff --git a/pkgs/tools/misc/docui/default.nix b/pkgs/tools/misc/docui/default.nix index 73aa8984a49b..e4934853e825 100644 --- a/pkgs/tools/misc/docui/default.nix +++ b/pkgs/tools/misc/docui/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "docui"; @@ -15,7 +15,7 @@ buildGoModule rec { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "TUI Client for Docker"; homepage = "https://github.com/skanehira/docui"; license = licenses.mit; diff --git a/pkgs/tools/misc/doitlive/default.nix b/pkgs/tools/misc/doitlive/default.nix index 3c0406a4ea0e..313dc9935faf 100644 --- a/pkgs/tools/misc/doitlive/default.nix +++ b/pkgs/tools/misc/doitlive/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python3Packages }: +{ lib, stdenv, python3Packages }: python3Packages.buildPythonApplication rec { pname = "doitlive"; @@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec { # disable tests (too many failures) doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Tool for live presentations in the terminal"; homepage = "https://pypi.python.org/pypi/doitlive"; license = licenses.mit; diff --git a/pkgs/tools/misc/duc/default.nix b/pkgs/tools/misc/duc/default.nix index 74dd2a34cc44..f24f62cb5f44 100644 --- a/pkgs/tools/misc/duc/default.nix +++ b/pkgs/tools/misc/duc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig , tokyocabinet, ncurses , cairo ? null, pango ? null , enableCairo ? stdenv.isLinux @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { configureFlags = stdenv.lib.optionals (!enableCairo) [ "--disable-x11" "--disable-cairo" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://duc.zevv.nl/"; description = "Collection of tools for inspecting and visualizing disk usage"; license = licenses.gpl2; diff --git a/pkgs/tools/misc/dumptorrent/default.nix b/pkgs/tools/misc/dumptorrent/default.nix index 146ab54dd62f..73dac5280bf4 100644 --- a/pkgs/tools/misc/dumptorrent/default.nix +++ b/pkgs/tools/misc/dumptorrent/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "dumptorrent"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { cp ./dumptorrent $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Dump .torrent file information"; homepage = "https://sourceforge.net/projects/dumptorrent/"; license = licenses.gpl2; diff --git a/pkgs/tools/misc/dupd/default.nix b/pkgs/tools/misc/dupd/default.nix index 4c8f5e2e2b1e..87b39b3b7040 100644 --- a/pkgs/tools/misc/dupd/default.nix +++ b/pkgs/tools/misc/dupd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, perl, which +{ lib, stdenv, fetchFromGitHub, perl, which , openssl, sqlite }: # Instead of writing directly into $HOME, we change the default db location @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "CLI utility to find duplicate files"; homepage = "http://www.virkki.com/dupd"; license = licenses.gpl3; diff --git a/pkgs/tools/misc/dust/default.nix b/pkgs/tools/misc/dust/default.nix index 238ff73ba387..d8c828c22287 100644 --- a/pkgs/tools/misc/dust/default.nix +++ b/pkgs/tools/misc/dust/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform }: +{ lib, stdenv, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { pname = "du-dust"; @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "du + rust = dust. Like du but more intuitive"; homepage = "https://github.com/bootandy/dust"; license = licenses.asl20; diff --git a/pkgs/tools/misc/dvtm/dvtm.nix b/pkgs/tools/misc/dvtm/dvtm.nix index 5bb8efb5540c..d8bb54cb4cb6 100644 --- a/pkgs/tools/misc/dvtm/dvtm.nix +++ b/pkgs/tools/misc/dvtm/dvtm.nix @@ -1,4 +1,4 @@ -{ stdenv, ncurses, customConfig ? null, name, src, patches ? [] }: +{ lib, stdenv, ncurses, customConfig ? null, name, src, patches ? [] }: stdenv.mkDerivation { inherit name src patches; @@ -19,7 +19,7 @@ stdenv.mkDerivation { makeFlags = [ "PREFIX=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Dynamic virtual terminal manager"; homepage = "http://www.brain-dump.org/projects/dvtm"; license = licenses.mit; diff --git a/pkgs/tools/misc/dylibbundler/default.nix b/pkgs/tools/misc/dylibbundler/default.nix index c4209442de8d..7bf93bf88e7c 100644 --- a/pkgs/tools/misc/dylibbundler/default.nix +++ b/pkgs/tools/misc/dylibbundler/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation { name = "dylibbundler"; @@ -12,7 +12,7 @@ stdenv.mkDerivation { makeFlags = [ "PREFIX=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Small command-line program that aims to make bundling .dylibs as easy as possible"; homepage = "https://github.com/auriamg/macdylibbundler"; license = licenses.mit; diff --git a/pkgs/tools/misc/dynamic-colors/default.nix b/pkgs/tools/misc/dynamic-colors/default.nix index 6cb01f14a2c0..c0ff0fec328a 100644 --- a/pkgs/tools/misc/dynamic-colors/default.nix +++ b/pkgs/tools/misc/dynamic-colors/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "dynamic-colors"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { --replace /usr/share/dynamic-colors $out/share/dynamic-colors ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Change terminal colors on the fly"; homepage = "https://github.com/peterhoeg/dynamic-colors"; license = licenses.mit; diff --git a/pkgs/tools/misc/ent/default.nix b/pkgs/tools/misc/ent/default.nix index 4ecb8fe488a2..0fa265c2db6c 100644 --- a/pkgs/tools/misc/ent/default.nix +++ b/pkgs/tools/misc/ent/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, unzip}: +{lib, stdenv, fetchurl, unzip}: stdenv.mkDerivation { name = "ent-1.1"; @@ -21,7 +21,7 @@ stdenv.mkDerivation { cp ent $out/bin/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Pseudorandom Number Sequence Test Program"; homepage = "http://www.fourmilab.ch/random/"; platforms = platforms.all; diff --git a/pkgs/tools/misc/entr/default.nix b/pkgs/tools/misc/entr/default.nix index 9bd9c2104f38..29474a471c3a 100644 --- a/pkgs/tools/misc/entr/default.nix +++ b/pkgs/tools/misc/entr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, coreutils, ncurses }: +{ lib, stdenv, fetchurl, coreutils, ncurses }: stdenv.mkDerivation rec { pname = "entr"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { checkTarget = "test"; installFlags = [ "PREFIX=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://entrproject.org/"; description = "Run arbitrary commands when files change"; license = licenses.isc; diff --git a/pkgs/tools/misc/envchain/default.nix b/pkgs/tools/misc/envchain/default.nix index 1bafa4688ae8..54ae0155b311 100644 --- a/pkgs/tools/misc/envchain/default.nix +++ b/pkgs/tools/misc/envchain/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libedit, libsecret, ncurses, pkg-config, readline, Security }: +{ lib, stdenv, fetchFromGitHub, libedit, libsecret, ncurses, pkg-config, readline, Security }: stdenv.mkDerivation rec { pname = "envchain"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { makeFlags = [ "DESTDIR=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Set environment variables with macOS keychain or D-Bus secret service"; homepage = "https://github.com/sorah/envchain"; license = licenses.mit; diff --git a/pkgs/tools/misc/esptool-ck/default.nix b/pkgs/tools/misc/esptool-ck/default.nix index a57a042a0c17..0b4e8cecaf64 100644 --- a/pkgs/tools/misc/esptool-ck/default.nix +++ b/pkgs/tools/misc/esptool-ck/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "esptool-ck"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { cp esptool $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "ESP8266/ESP32 build helper tool"; homepage = "https://github.com/igrr/esptool-ck"; license = licenses.gpl2; diff --git a/pkgs/tools/misc/esptool/default.nix b/pkgs/tools/misc/esptool/default.nix index d1d6bc1cb101..89be1da8cc98 100644 --- a/pkgs/tools/misc/esptool/default.nix +++ b/pkgs/tools/misc/esptool/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python3, openssl }: +{ lib, stdenv, fetchFromGitHub, python3, openssl }: python3.pkgs.buildPythonApplication rec { pname = "esptool"; @@ -28,7 +28,7 @@ python3.pkgs.buildPythonApplication rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "ESP8266 and ESP32 serial bootloader utility"; homepage = "https://github.com/espressif/esptool"; license = licenses.gpl2; diff --git a/pkgs/tools/misc/etcher/default.nix b/pkgs/tools/misc/etcher/default.nix index 6634d2d23ca2..8e5c5d918cc6 100644 --- a/pkgs/tools/misc/etcher/default.nix +++ b/pkgs/tools/misc/etcher/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , gcc-unwrapped , dpkg @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ gcc-unwrapped.lib ]}" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Flash OS images to SD cards and USB drives, safely and easily"; homepage = "https://etcher.io/"; license = licenses.asl20; diff --git a/pkgs/tools/misc/ethminer/default.nix b/pkgs/tools/misc/ethminer/default.nix index f84b0096d044..7d2cb5c7ff2c 100644 --- a/pkgs/tools/misc/ethminer/default.nix +++ b/pkgs/tools/misc/ethminer/default.nix @@ -1,4 +1,5 @@ { + lib, clangStdenv, fetchFromGitHub, opencl-headers, @@ -69,7 +70,7 @@ in stdenv.mkDerivation rec { wrapProgram $out/bin/ethminer --prefix LD_LIBRARY_PATH : /run/opengl-driver/lib ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Ethereum miner with OpenCL, CUDA and stratum support"; homepage = "https://github.com/ethereum-mining/ethminer"; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/tools/misc/ethtool/default.nix b/pkgs/tools/misc/ethtool/default.nix index b1b9956404a9..4b6d7cc9332e 100644 --- a/pkgs/tools/misc/ethtool/default.nix +++ b/pkgs/tools/misc/ethtool/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "ethtool"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0srbqp4a3x9ryrbm5q854375y04ni8j0bmsrl89nmsyn4x4ixy12"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Utility for controlling network drivers and hardware"; homepage = "https://www.kernel.org/pub/software/network/ethtool/"; license = licenses.gpl2; diff --git a/pkgs/tools/misc/eva/default.nix b/pkgs/tools/misc/eva/default.nix index a40913343308..65da084f8419 100644 --- a/pkgs/tools/misc/eva/default.nix +++ b/pkgs/tools/misc/eva/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform, fetchpatch }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, fetchpatch }: rustPlatform.buildRustPackage rec { pname = "eva"; @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { }) ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A calculator REPL, similar to bc"; homepage = "https://github.com/NerdyPepper/eva"; license = licenses.mit; diff --git a/pkgs/tools/misc/exa/default.nix b/pkgs/tools/misc/exa/default.nix index fd6baadb685c..44c821f542d7 100644 --- a/pkgs/tools/misc/exa/default.nix +++ b/pkgs/tools/misc/exa/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, rustPlatform, cmake, perl, pkgconfig, zlib +{ lib, stdenv, fetchFromGitHub, fetchpatch, rustPlatform, cmake, perl, pkgconfig, zlib , darwin, libiconv, installShellFiles }: @@ -45,7 +45,7 @@ buildRustPackage rec { # Some tests fail, but Travis ensures a proper build doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Replacement for 'ls' written in Rust"; longDescription = '' exa is a modern replacement for ls. It uses colours for information by diff --git a/pkgs/tools/misc/expect/default.nix b/pkgs/tools/misc/expect/default.nix index cbb8c337ff87..2c5548abd839 100644 --- a/pkgs/tools/misc/expect/default.nix +++ b/pkgs/tools/misc/expect/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, tcl, makeWrapper, autoreconfHook }: +{ lib, stdenv, fetchurl, tcl, makeWrapper, autoreconfHook }: stdenv.mkDerivation rec { version = "5.45.4"; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A tool for automating interactive applications"; homepage = "http://expect.sourceforge.net/"; license = "Expect"; diff --git a/pkgs/tools/misc/fbcat/default.nix b/pkgs/tools/misc/fbcat/default.nix index 4f640f13a27f..8769f65f68c4 100644 --- a/pkgs/tools/misc/fbcat/default.nix +++ b/pkgs/tools/misc/fbcat/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub } : +{ lib, stdenv, fetchFromGitHub } : stdenv.mkDerivation rec { pname = "fbcat"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { install -d $out/share/man/man1 ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://jwilk.net/software/fbcat"; description = "Framebuffer screenshot tool"; license = licenses.gpl2Plus; diff --git a/pkgs/tools/misc/fdupes/default.nix b/pkgs/tools/misc/fdupes/default.nix index 7203d6b57fcd..42c1c3a37df4 100644 --- a/pkgs/tools/misc/fdupes/default.nix +++ b/pkgs/tools/misc/fdupes/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, ncurses, pcre2 }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, ncurses, pcre2 }: stdenv.mkDerivation rec { pname = "fdupes"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ ncurses pcre2 ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Identifies duplicate files residing within specified directories"; longDescription = '' fdupes searches the given path for duplicate files. diff --git a/pkgs/tools/misc/ffsend/default.nix b/pkgs/tools/misc/ffsend/default.nix index a8c7fce68cc8..f3f7afd30f68 100644 --- a/pkgs/tools/misc/ffsend/default.nix +++ b/pkgs/tools/misc/ffsend/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, rustPlatform, cmake, pkgconfig, openssl +{ lib, stdenv, fetchFromGitLab, rustPlatform, cmake, pkgconfig, openssl , darwin, installShellFiles , x11Support ? stdenv.isLinux || stdenv.hostPlatform.isBSD @@ -45,7 +45,7 @@ buildRustPackage rec { ''; # There's also .elv and .ps1 completion files but I don't know where to install those - meta = with stdenv.lib; { + meta = with lib; { description = "Easily and securely share files from the command line. A fully featured Firefox Send client"; longDescription = '' Easily and securely share files and directories from the command line through a safe, private diff --git a/pkgs/tools/misc/file/default.nix b/pkgs/tools/misc/file/default.nix index 8e284b25c08d..6867038c6450 100644 --- a/pkgs/tools/misc/file/default.nix +++ b/pkgs/tools/misc/file/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, file, zlib, libgnurx }: +{ lib, stdenv, fetchurl, file, zlib, libgnurx }: stdenv.mkDerivation rec { pname = "file"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { makeFlags = stdenv.lib.optional stdenv.hostPlatform.isWindows "FILE_COMPILE=file"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://darwinsys.com/file"; description = "A program that shows the type of files"; license = licenses.bsd2; diff --git a/pkgs/tools/misc/filebench/default.nix b/pkgs/tools/misc/filebench/default.nix index 4cd572ac9920..ca62c8c4a1a8 100644 --- a/pkgs/tools/misc/filebench/default.nix +++ b/pkgs/tools/misc/filebench/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, bison, flex }: +{ lib, stdenv, fetchurl, autoreconfHook, bison, flex }: stdenv.mkDerivation rec { pname = "filebench"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook bison flex ]; - meta = with stdenv.lib; { + meta = with lib; { description = "File system and storage benchmark that can generate both micro and macro workloads"; homepage = "https://sourceforge.net/projects/filebench/"; license = licenses.cddl; diff --git a/pkgs/tools/misc/flameshot/default.nix b/pkgs/tools/misc/flameshot/default.nix index 988849fbbbf6..a923dbf651f4 100644 --- a/pkgs/tools/misc/flameshot/default.nix +++ b/pkgs/tools/misc/flameshot/default.nix @@ -14,8 +14,6 @@ mkDerivation rec { nativeBuildInputs = [ cmake qttools qtsvg ]; buildInputs = [ qtbase ]; - enableParallelBuilding = true; - meta = with lib; { description = "Powerful yet simple to use screenshot software"; homepage = "https://github.com/flameshot-org/flameshot"; diff --git a/pkgs/tools/misc/fltrdr/default.nix b/pkgs/tools/misc/fltrdr/default.nix index 8d585324d875..3e51a4c8bbc2 100644 --- a/pkgs/tools/misc/fltrdr/default.nix +++ b/pkgs/tools/misc/fltrdr/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , cmake , icu, openssl @@ -19,9 +19,7 @@ stdenv.mkDerivation rec { buildInputs = [ icu openssl ]; - enableParallelBuilding = true; - - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://octobanana.com/software/fltrdr"; description = "A TUI text reader for the terminal"; @@ -40,4 +38,3 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.matthiasbeyer ]; }; } - diff --git a/pkgs/tools/misc/fluent-bit/default.nix b/pkgs/tools/misc/fluent-bit/default.nix index 60860c197e88..aa9f175e9004 100644 --- a/pkgs/tools/misc/fluent-bit/default.nix +++ b/pkgs/tools/misc/fluent-bit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, flex, bison }: +{ lib, stdenv, fetchFromGitHub, cmake, flex, bison }: stdenv.mkDerivation rec { pname = "fluent-bit"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { --replace /lib/systemd $out/lib/systemd ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Log forwarder and processor, part of Fluentd ecosystem"; homepage = "https://fluentbit.io"; maintainers = with maintainers; [ diff --git a/pkgs/tools/misc/foma/default.nix b/pkgs/tools/misc/foma/default.nix new file mode 100644 index 000000000000..2bde606adbe6 --- /dev/null +++ b/pkgs/tools/misc/foma/default.nix @@ -0,0 +1,32 @@ +{ lib, stdenv, fetchFromGitHub, zlib, flex, bison, readline }: + +stdenv.mkDerivation rec { + pname = "foma"; + version = "0.9.18alpha"; + + src = fetchFromGitHub { + owner = "mhulden"; + repo = "foma"; + rev = "4456a40e81f46e3fe909c5a97a15fcf1d2a3b6c1"; + sha256 = "188yxj8wahlj2yf93rj1vx549j5cq0085d2jmj3vwzbfjq1mi1f0"; + }; + + sourceRoot = "source/foma"; + + nativeBuildInputs = [ flex bison ]; + buildInputs = [ zlib readline ]; + + patchPhase = '' + substituteInPlace Makefile \ + --replace '-ltermcap' ' ' \ + --replace '/usr/local' '$(out)' + ''; + + meta = with lib; { + description = "A multi-purpose finite-state toolkit designed for applications ranging from natural language processing to research in automata theory"; + homepage = "https://github.com/mhulden/foma"; + license = licenses.asl20; + maintainers = [ maintainers.tckmn ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/tools/misc/fortune/default.nix b/pkgs/tools/misc/fortune/default.nix index bc23d9dd8462..cbb5eae84877 100644 --- a/pkgs/tools/misc/fortune/default.nix +++ b/pkgs/tools/misc/fortune/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, recode, perl }: +{ lib, stdenv, fetchurl, cmake, recode, perl }: stdenv.mkDerivation rec { pname = "fortune-mod"; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { -- '') ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A program that displays a pseudorandom message from a database of quotations"; license = licenses.bsdOriginal; platforms = platforms.unix; diff --git a/pkgs/tools/misc/fpart/default.nix b/pkgs/tools/misc/fpart/default.nix index e673c73d0961..bdb762c98a60 100644 --- a/pkgs/tools/misc/fpart/default.nix +++ b/pkgs/tools/misc/fpart/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, fts }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, fts }: stdenv.mkDerivation rec { pname = "fpart"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { -i "$out/bin/fpsync" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Split file trees into bags (called \"partitions\")"; longDescription = '' Fpart is a tool that helps you sort file trees and pack them into bags diff --git a/pkgs/tools/misc/fselect/default.nix b/pkgs/tools/misc/fselect/default.nix index 587483f4ac41..1076c44a1bb3 100644 --- a/pkgs/tools/misc/fselect/default.nix +++ b/pkgs/tools/misc/fselect/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform, installShellFiles }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, installShellFiles }: rustPlatform.buildRustPackage rec { pname = "fselect"; @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { installManPage docs/fselect.1 ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Find files with SQL-like queries"; homepage = "https://github.com/jhspetersson/fselect"; license = with licenses; [ asl20 mit ]; diff --git a/pkgs/tools/misc/fsmark/default.nix b/pkgs/tools/misc/fsmark/default.nix index 7bfa24e3a082..1a21156e6403 100644 --- a/pkgs/tools/misc/fsmark/default.nix +++ b/pkgs/tools/misc/fsmark/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "fsmark"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { cp fs_mark $out/bin/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Synchronous write workload file system benchmark"; homepage = "https://sourceforge.net/projects/fsmark/"; license = licenses.gpl2; diff --git a/pkgs/tools/misc/fsmon/default.nix b/pkgs/tools/misc/fsmon/default.nix index a3e3eddcda9e..c845c3de8e95 100644 --- a/pkgs/tools/misc/fsmon/default.nix +++ b/pkgs/tools/misc/fsmon/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "fsmon"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { make install PREFIX=$out ''; - meta = with stdenv.lib; { + meta = with lib; { description = "FileSystem Monitor utility"; homepage = "https://github.com/nowsecure/fsmon"; license = licenses.mit; diff --git a/pkgs/tools/misc/fsql/default.nix b/pkgs/tools/misc/fsql/default.nix index fa64d7428658..8e113ee871a1 100644 --- a/pkgs/tools/misc/fsql/default.nix +++ b/pkgs/tools/misc/fsql/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "fsql"; @@ -13,7 +13,7 @@ buildGoPackage rec { sha256 = "1accpxryk4744ydfrqc3la5k376ji11yr84n66dz5cx0f3n71vmz"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Search through your filesystem with SQL-esque queries"; homepage = "https://github.com/kshvmdn/fsql"; license = licenses.mit; diff --git a/pkgs/tools/misc/fwup/default.nix b/pkgs/tools/misc/fwup/default.nix index bf6c125ac759..b3864aff44bc 100644 --- a/pkgs/tools/misc/fwup/default.nix +++ b/pkgs/tools/misc/fwup/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ]; propagatedBuildInputs = [ zip unzip mtools dosfstools coreutils ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Configurable embedded Linux firmware update creator and runner"; homepage = "https://github.com/fhunleth/fwup"; license = licenses.asl20; diff --git a/pkgs/tools/misc/fx_cast/default.nix b/pkgs/tools/misc/fx_cast/default.nix index d24ff0e05161..581ef0aa838d 100644 --- a/pkgs/tools/misc/fx_cast/default.nix +++ b/pkgs/tools/misc/fx_cast/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, dpkg }: +{ lib, stdenv, fetchurl, dpkg }: stdenv.mkDerivation rec { pname = "fx_cast_bridge"; @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Implementation of the Chrome Sender API (Chromecast) within Firefox"; homepage = "https://hensm.github.io/fx_cast/"; license = licenses.mit; diff --git a/pkgs/tools/misc/fxlinuxprintutil/default.nix b/pkgs/tools/misc/fxlinuxprintutil/default.nix index 112f6a9f2328..b97e082128ac 100644 --- a/pkgs/tools/misc/fxlinuxprintutil/default.nix +++ b/pkgs/tools/misc/fxlinuxprintutil/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/fxlputil --prefix PATH : ${lib.makeBinPath [ tcl tk ]} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Optional configuration tool for fxlinuxprint"; homepage = "https://onlinesupport.fujixerox.com"; license = licenses.unfree; diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix index b114ee2373c1..837277a5c858 100644 --- a/pkgs/tools/misc/fzf/default.nix +++ b/pkgs/tools/misc/fzf/default.nix @@ -1,20 +1,28 @@ -{ lib, buildGoModule, fetchFromGitHub, writeText, runtimeShell, ncurses, perl }: +{ lib, buildGoModule, fetchFromGitHub, writeText, runtimeShell, ncurses, perl, fetchpatch }: buildGoModule rec { pname = "fzf"; - version = "0.24.4"; + version = "0.25.0"; src = fetchFromGitHub { owner = "junegunn"; repo = pname; rev = version; - sha256 = "17k32wr70sp7ag69xww2q9mrgnzakgkjw6la04n3jlhfa5z37dzj"; + sha256 = "1j5bfxl4w8w3n89p051y8dhxg0py9l98v7r2gkr63bg4lj32faz8"; }; vendorSha256 = "0dd0qm1fxp3jnlrhfaas8fw87cj7rygaac35a9nk3xh2xsk7q35p"; outputs = [ "out" "man" ]; + patches = [ + # Fix test failure on go 1.15 + (fetchpatch { + url = "https://github.com/junegunn/fzf/commit/82791f7efccde5b30da0b4d44f10d214ae5c0c0d.patch"; + sha256 = "1nybsz09h8cnvxjnkmx9c52g8z0x6pvrn230hw1va5a3pvmg01z1"; + }) + ]; + fishHook = writeText "load-fzf-keybindings.fish" "fzf_key_bindings"; buildInputs = [ ncurses ]; @@ -24,7 +32,7 @@ buildGoModule rec { ]; # The vim plugin expects a relative path to the binary; patch it to abspath. - patchPhase = '' + postPatch = '' sed -i -e "s|expand(':h:h')|'$out'|" plugin/fzf.vim if ! grep -q $out plugin/fzf.vim; then diff --git a/pkgs/tools/misc/fzy/default.nix b/pkgs/tools/misc/fzy/default.nix index 90042d632b79..f726adb0d462 100644 --- a/pkgs/tools/misc/fzy/default.nix +++ b/pkgs/tools/misc/fzy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "fzy"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A better fuzzy finder"; homepage = "https://github.com/jhawthorn/fzy"; license = licenses.mit; diff --git a/pkgs/tools/misc/g933-utils/default.nix b/pkgs/tools/misc/g933-utils/default.nix index 3da98301346f..67e3b3b6ea38 100644 --- a/pkgs/tools/misc/g933-utils/default.nix +++ b/pkgs/tools/misc/g933-utils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform, udev, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, udev, pkgconfig }: rustPlatform.buildRustPackage rec { pname = "g933-utils"; @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ udev ]; - meta = with stdenv.lib; { + meta = with lib; { description = "An application to configure Logitech wireless G933/G533 headsets"; homepage = "https://github.com/ashkitten/g933-utils"; license = licenses.mit; diff --git a/pkgs/tools/misc/gammy/default.nix b/pkgs/tools/misc/gammy/default.nix index 2fd99fd4a3ab..cb8f491069a8 100644 --- a/pkgs/tools/misc/gammy/default.nix +++ b/pkgs/tools/misc/gammy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, qmake, libXxf86vm, wrapQtAppsHook }: +{ lib, stdenv, fetchFromGitHub, qmake, libXxf86vm, wrapQtAppsHook }: let pname = "gammy"; @@ -19,7 +19,7 @@ stdenv.mkDerivation { buildInputs = [ libXxf86vm ]; - meta = with stdenv.lib; { + meta = with lib; { description = "GUI tool for manual- of auto-adjusting of brightness/temperature"; homepage = "https://github.com/Fushko/gammy"; license = licenses.gpl3; diff --git a/pkgs/tools/misc/geekbench/default.nix b/pkgs/tools/misc/geekbench/default.nix index a33ae0ed3305..1e1c06a3a028 100644 --- a/pkgs/tools/misc/geekbench/default.nix +++ b/pkgs/tools/misc/geekbench/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, ocl-icd, vulkan-loader, linuxPackages }: +{ lib, stdenv, fetchurl, makeWrapper, ocl-icd, vulkan-loader, linuxPackages }: stdenv.mkDerivation rec { pname = "geekbench"; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Cross-platform benchmark"; homepage = "https://geekbench.com/"; license = licenses.unfree; diff --git a/pkgs/tools/misc/geteltorito/default.nix b/pkgs/tools/misc/geteltorito/default.nix index cee93ae29910..be2de1167e3c 100644 --- a/pkgs/tools/misc/geteltorito/default.nix +++ b/pkgs/tools/misc/geteltorito/default.nix @@ -1,4 +1,4 @@ -{ stdenv, perl, ronn, fetchurl }: +{ lib, stdenv, perl, ronn, fetchurl }: stdenv.mkDerivation rec { pname = "geteltorito"; @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { install -vD geteltorito $out/bin/geteltorito ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Extract the initial/default boot image from a CD image if existent"; homepage = "https://userpages.uni-koblenz.de/~krienke/ftp/noarch/geteltorito/"; maintainers = [ maintainers.Profpatsch ]; diff --git a/pkgs/tools/misc/gh-ost/default.nix b/pkgs/tools/misc/gh-ost/default.nix index 82ff74a04192..6096dac96221 100644 --- a/pkgs/tools/misc/gh-ost/default.nix +++ b/pkgs/tools/misc/gh-ost/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "gh-ost"; @@ -15,7 +15,7 @@ buildGoPackage rec { buildFlagsArray = [ "-ldflags=-s -w -X main.AppVersion=${version} -X main.BuildDescribe=${src.rev}" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Triggerless online schema migration solution for MySQL"; homepage = "https://github.com/github/gh-ost"; license = licenses.mit; diff --git a/pkgs/tools/misc/gif-for-cli/default.nix b/pkgs/tools/misc/gif-for-cli/default.nix index 52d3e043ce9c..e82cafdd64cd 100644 --- a/pkgs/tools/misc/gif-for-cli/default.nix +++ b/pkgs/tools/misc/gif-for-cli/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python3Packages, ffmpeg, zlib, libjpeg }: +{ lib, stdenv, fetchFromGitHub, python3Packages, ffmpeg, zlib, libjpeg }: python3Packages.buildPythonApplication { pname = "gif-for-cli"; @@ -15,7 +15,7 @@ python3Packages.buildPythonApplication { buildInputs = [ zlib libjpeg ]; propagatedBuildInputs = with python3Packages; [ ffmpeg pillow requests x256 ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Render gifs as ASCII art in your cli"; longDescription = "Takes in a GIF, short video, or a query to the Tenor GIF API and converts it to animated ASCII art."; homepage = "https://github.com/google/gif-for-cli"; diff --git a/pkgs/tools/misc/git-fire/default.nix b/pkgs/tools/misc/git-fire/default.nix index 0b5deccaa904..bba1bd65a54d 100644 --- a/pkgs/tools/misc/git-fire/default.nix +++ b/pkgs/tools/misc/git-fire/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation { name = "git-fire-unstable-2017-08-27"; @@ -14,7 +14,7 @@ stdenv.mkDerivation { install -D -m755 $src/git-fire $out/bin/git-fire ''; - meta = with stdenv.lib; { + meta = with lib; { description = '' Push ALL changes in a git repository ''; diff --git a/pkgs/tools/misc/git-town/default.nix b/pkgs/tools/misc/git-town/default.nix index ab9f1907a8e2..cf3a6aba19f0 100644 --- a/pkgs/tools/misc/git-town/default.nix +++ b/pkgs/tools/misc/git-town/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "git-town"; @@ -14,7 +14,7 @@ buildGoPackage rec { 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; { + meta = with lib; { description = "Generic, high-level git support for git-flow workflows"; homepage = "https://www.git-town.com/"; maintainers = [ maintainers.allonsy maintainers.blaggacao ]; diff --git a/pkgs/tools/misc/gnuvd/default.nix b/pkgs/tools/misc/gnuvd/default.nix deleted file mode 100644 index 0c4929622704..000000000000 --- a/pkgs/tools/misc/gnuvd/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{stdenv, fetchurl}: - -stdenv.mkDerivation { - name = "gnuvd-1.0.12"; - - src = fetchurl { - url = "https://www.djcbsoftware.nl/code/gnuvd/gnuvd-1.0.12.tar.gz"; - sha256 = "0mpy76a0pxy62zjiihlzmvl4752hiwxhfs8rm1v5zgdr78acxyxz"; - }; - - meta = with stdenv.lib; { - description = "Command-line dutch dictionary application"; - homepage = "https://www.djcbsoftware.nl/code/gnuvd/"; - license = licenses.gpl2; - platforms = platforms.unix; - }; -} diff --git a/pkgs/tools/misc/go.rice/default.nix b/pkgs/tools/misc/go.rice/default.nix index 33e6975bb02d..26b082e43b39 100644 --- a/pkgs/tools/misc/go.rice/default.nix +++ b/pkgs/tools/misc/go.rice/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "go.rice"; @@ -17,7 +17,7 @@ buildGoModule rec { subPackages = [ "." "rice" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/GeertJohan/go.rice"; description = "A Go package that makes working with resources such as html, js, css, images, templates very easy"; license = licenses.bsd2; diff --git a/pkgs/tools/misc/gparted/default.nix b/pkgs/tools/misc/gparted/default.nix index 7d610416da47..b8d227df5e0f 100644 --- a/pkgs/tools/misc/gparted/default.nix +++ b/pkgs/tools/misc/gparted/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, intltool, gettext, makeWrapper, coreutils, gnused, gnome3 +{ lib, stdenv, fetchurl, intltool, gettext, makeWrapper, coreutils, gnused, gnome3 , gnugrep, parted, glib, libuuid, pkgconfig, gtkmm3, libxml2 , gpart, hdparm, procps, util-linux, polkit, wrapGAppsHook, substituteAll }: @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { $out/share/polkit-1/actions/org.gnome.gparted.policy ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Graphical disk partitioning tool"; longDescription = '' GNOME Partition Editor for creating, reorganizing, and deleting disk diff --git a/pkgs/tools/misc/graylog/default.nix b/pkgs/tools/misc/graylog/default.nix index f6a48364bfda..5be309be582f 100644 --- a/pkgs/tools/misc/graylog/default.nix +++ b/pkgs/tools/misc/graylog/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, jre_headless, nixosTests }: +{ lib, stdenv, fetchurl, makeWrapper, jre_headless, nixosTests }: stdenv.mkDerivation rec { pname = "graylog"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/graylogctl $makeWrapperArgs ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Open source log management solution"; homepage = "https://www.graylog.org/"; license = licenses.gpl3; diff --git a/pkgs/tools/misc/grc/default.nix b/pkgs/tools/misc/grc/default.nix index 1900764604b5..3188dcdafbf3 100644 --- a/pkgs/tools/misc/grc/default.nix +++ b/pkgs/tools/misc/grc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python3Packages }: +{ lib, stdenv, fetchFromGitHub, python3Packages }: python3Packages.buildPythonApplication rec { pname = "grc"; @@ -28,7 +28,7 @@ python3Packages.buildPythonApplication rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Yet another colouriser for beautifying your logfiles or output of commands"; homepage = "http://korpus.juls.savba.sk/~garabik/software/grc.html"; license = licenses.gpl2; diff --git a/pkgs/tools/misc/grex/default.nix b/pkgs/tools/misc/grex/default.nix index c4f1c8ea9c77..31306fd7aa42 100644 --- a/pkgs/tools/misc/grex/default.nix +++ b/pkgs/tools/misc/grex/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , fetchpatch , rustPlatform @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { $out/bin/grex --help > /dev/null ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A command-line tool for generating regular expressions from user-provided test cases"; homepage = "https://github.com/pemistahl/grex"; license = licenses.asl20; diff --git a/pkgs/tools/misc/gringo/default.nix b/pkgs/tools/misc/gringo/default.nix index 05e5e9b64cf0..9df59b1c127e 100644 --- a/pkgs/tools/misc/gringo/default.nix +++ b/pkgs/tools/misc/gringo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, +{ lib, stdenv, fetchurl, bison, re2c, sconsPackages, libcxx }: @@ -49,7 +49,7 @@ stdenv.mkDerivation { cp build/release/gringo $out/bin/gringo ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Converts input programs with first-order variables to equivalent ground programs"; homepage = "http://potassco.sourceforge.net/"; platforms = platforms.all; diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix index 63cdb61dd336..207396fb0895 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, python3, autoconf, automake, gnulib, libtool +{ lib, 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 @@ -110,7 +110,7 @@ stdenv.mkDerivation rec { sed -i $out/lib/grub/*/modinfo.sh -e "/grub_target_cppflags=/ s|'.*'|' '|" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "GNU GRUB, the Grand Unified Boot Loader (2.x beta)"; longDescription = diff --git a/pkgs/tools/misc/grub/default.nix b/pkgs/tools/misc/grub/default.nix index e657431429cc..a7233d5c4b1f 100644 --- a/pkgs/tools/misc/grub/default.nix +++ b/pkgs/tools/misc/grub/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, texinfo, buggyBiosCDSupport ? true }: +{ lib, stdenv, fetchurl, autoreconfHook, texinfo, buggyBiosCDSupport ? true }: stdenv.mkDerivation { name = "grub-0.97-73"; @@ -26,7 +26,7 @@ stdenv.mkDerivation { passthru.grubTarget = ""; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.gnu.org/software/grub"; description = "GRand Unified Bootloader"; license = licenses.gpl2; diff --git a/pkgs/tools/misc/grub/pvgrub_image/default.nix b/pkgs/tools/misc/grub/pvgrub_image/default.nix index 6b796dedb0ad..ec5d0ff12955 100644 --- a/pkgs/tools/misc/grub/pvgrub_image/default.nix +++ b/pkgs/tools/misc/grub/pvgrub_image/default.nix @@ -1,4 +1,4 @@ -{ stdenv, grub2_xen }: +{ lib, stdenv, grub2_xen }: with stdenv.lib; let @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { cp "grub-${efiSystemsBuild.${stdenv.hostPlatform.system}.target}-xen.bin" $out/lib/grub-xen/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "PvGrub image for use for booting PV Xen guests"; longDescription = diff --git a/pkgs/tools/misc/grub/trusted.nix b/pkgs/tools/misc/grub/trusted.nix index f14758a3ae75..7a2454cd7b58 100644 --- a/pkgs/tools/misc/grub/trusted.nix +++ b/pkgs/tools/misc/grub/trusted.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchgit, autogen, flex, bison, python, autoconf, automake +{ lib, stdenv, fetchurl, fetchgit, autogen, flex, bison, python, autoconf, automake , gettext, ncurses, libusb-compat-0_1, freetype, qemu, lvm2 , for_HP_laptop ? false }: @@ -91,7 +91,7 @@ stdenv.mkDerivation rec { doCheck = false; enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "GRUB 2.0 extended with TCG (TPM) support for integrity measured boot process (trusted boot)"; homepage = "https://github.com/Sirrix-AG/TrustedGRUB2"; license = licenses.gpl3Plus; diff --git a/pkgs/tools/misc/grub4dos/default.nix b/pkgs/tools/misc/grub4dos/default.nix index 24548b4d209b..6ffddd4f98a0 100644 --- a/pkgs/tools/misc/grub4dos/default.nix +++ b/pkgs/tools/misc/grub4dos/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, nasm }: +{ lib, stdenv, fetchFromGitHub, nasm }: let arch = if stdenv.isi686 then "i386" @@ -33,7 +33,7 @@ in stdenv.mkDerivation { # make[2]: *** No rule to make target 'pre_stage2_fullsize', needed by 'all-am'. Stop. enableParallelBuilding = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://grub4dos.chenall.net/"; description = "GRUB for DOS is the dos extension of GRUB"; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/tools/misc/gti/default.nix b/pkgs/tools/misc/gti/default.nix index 9c2e65676c2d..83452394f154 100644 --- a/pkgs/tools/misc/gti/default.nix +++ b/pkgs/tools/misc/gti/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "gti"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { cp gti.6 $out/share/man/man6 ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://r-wos.org/hacks/gti"; license = licenses.mit; description = "Humorous typo-based git runner; drives a car over the terminal"; diff --git a/pkgs/tools/misc/h/default.nix b/pkgs/tools/misc/h/default.nix index 9a80945097b7..3f5878472a79 100644 --- a/pkgs/tools/misc/h/default.nix +++ b/pkgs/tools/misc/h/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, makeWrapper, ruby }: +{ lib, stdenv, fetchFromGitHub, makeWrapper, ruby }: stdenv.mkDerivation rec { pname = "h"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { cp up $out/bin/up ''; - meta = with stdenv.lib; { + meta = with lib; { description = "faster shell navigation of projects"; homepage = "https://github.com/zimbatm/h"; license = licenses.mit; diff --git a/pkgs/tools/misc/hackertyper/default.nix b/pkgs/tools/misc/hackertyper/default.nix index 4b5973e7eeca..d72dd1798d5a 100644 --- a/pkgs/tools/misc/hackertyper/default.nix +++ b/pkgs/tools/misc/hackertyper/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ncurses }: +{ lib, stdenv, fetchFromGitHub, ncurses }: stdenv.mkDerivation { pname = "hackertyper"; @@ -19,7 +19,7 @@ stdenv.mkDerivation { $out/bin/hackertyper -v ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A C rewrite of hackertyper.net"; homepage = "https://github.com/Hurricane996/Hackertyper"; license = licenses.gpl3; diff --git a/pkgs/tools/misc/hakuneko/default.nix b/pkgs/tools/misc/hakuneko/default.nix index 6389d41cdfed..0a1d070d77ea 100644 --- a/pkgs/tools/misc/hakuneko/default.nix +++ b/pkgs/tools/misc/hakuneko/default.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { "''${gappsWrapperArgs[@]}" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Manga & Anime Downloader"; homepage = "https://sourceforge.net/projects/hakuneko/"; license = licenses.unlicense; diff --git a/pkgs/tools/misc/hashit/default.nix b/pkgs/tools/misc/hashit/default.nix index e33201c706ba..36b1770791b4 100644 --- a/pkgs/tools/misc/hashit/default.nix +++ b/pkgs/tools/misc/hashit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, nix-update-script, meson, ninja, pkgconfig, vala, pantheon, python3, libgee, gtk3, desktop-file-utils, wrapGAppsHook }: +{ lib, stdenv, fetchFromGitHub, nix-update-script, meson, ninja, pkgconfig, vala, pantheon, python3, libgee, gtk3, desktop-file-utils, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "hashit"; @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A simple app for checking usual checksums - Designed for elementary OS"; homepage = "https://github.com/artemanufrij/hashit"; license = licenses.gpl2Plus; diff --git a/pkgs/tools/misc/hdaps-gl/default.nix b/pkgs/tools/misc/hdaps-gl/default.nix index 79f4d067b108..41de7ef5d28b 100644 --- a/pkgs/tools/misc/hdaps-gl/default.nix +++ b/pkgs/tools/misc/hdaps-gl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, freeglut, libGL, libGLU }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, freeglut, libGL, libGLU }: let version = "0.0.7"; in stdenv.mkDerivation { @@ -14,7 +14,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ freeglut libGL libGLU ]; - meta = with stdenv.lib; { + meta = with lib; { description = "GL-based laptop model that rotates in real-time via hdaps"; homepage = "https://github.com/linux-thinkpad/hdaps-gl"; license = licenses.gpl2; diff --git a/pkgs/tools/misc/hddtemp/default.nix b/pkgs/tools/misc/hddtemp/default.nix index 1f3fbd2381ff..de57b2539904 100644 --- a/pkgs/tools/misc/hddtemp/default.nix +++ b/pkgs/tools/misc/hddtemp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation { name = "hddtemp-0.3_beta15"; @@ -23,7 +23,7 @@ stdenv.mkDerivation { ./configure --prefix=$out --with-db-path=$out/nix-support/hddtemp.db ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Tool for displaying hard disk temperature"; homepage = "https://savannah.nongnu.org/projects/hddtemp/"; license = licenses.gpl2Plus; diff --git a/pkgs/tools/misc/hdf4/default.nix b/pkgs/tools/misc/hdf4/default.nix index b15eba8b7bc3..caf7ceb49ee2 100644 --- a/pkgs/tools/misc/hdf4/default.nix +++ b/pkgs/tools/misc/hdf4/default.nix @@ -1,13 +1,15 @@ -{ stdenv +{ lib, stdenv , fetchpatch , fetchurl , fixDarwinDylibNames , cmake , libjpeg +, libtirpc , zlib , szip ? null }: - +let uselibtirpc = stdenv.isLinux; +in stdenv.mkDerivation rec { pname = "hdf"; version = "4.2.15"; @@ -16,6 +18,30 @@ stdenv.mkDerivation rec { sha256 = "04nbgfxyj5jg4d6sr28162cxbfwqgv0sa7vz1ayzvm8wbbpkbq5x"; }; + patches = [ + # Note that the PPC, SPARC and s390 patches are only needed so the aarch64 patch applies cleanly + (fetchpatch { + url = "https://src.fedoraproject.org/rpms/hdf/raw/edbe5f49646b609f5bc9aeeee5a2be47e9556e8c/f/hdf-ppc.patch"; + sha256 = "0dbbfpsvvqzy9zyfv38gd81zzc44gxjib9sd8scxqnkkqprj6jq0"; + }) + (fetchpatch { + url = "https://src.fedoraproject.org/rpms/hdf/raw/edbe5f49646b609f5bc9aeeee5a2be47e9556e8c/f/hdf-4.2.4-sparc.patch"; + sha256 = "0ip4prcjpa404clm87ib7l71605mws54x9492n9pbz5yb51r9aqh"; + }) + (fetchpatch { + url = "https://src.fedoraproject.org/rpms/hdf/raw/edbe5f49646b609f5bc9aeeee5a2be47e9556e8c/f/hdf-s390.patch"; + sha256 = "0aiqbr4s1l19y3r3y4wjd5fkv9cfc8rlr4apbh1p0d57wyvqa7i3"; + }) + (fetchpatch { + url = "https://src.fedoraproject.org/rpms/hdf/raw/edbe5f49646b609f5bc9aeeee5a2be47e9556e8c/f/hdf-arm.patch"; + sha256 = "157k1avvkpf3x89m1fv4a1kgab6k3jv74rskazrmjivgzav4qaw3"; + }) + (fetchpatch { + url = "https://src.fedoraproject.org/rpms/hdf/raw/edbe5f49646b609f5bc9aeeee5a2be47e9556e8c/f/hdf-aarch64.patch"; + sha256 = "112svcsilk16ybbsi8ywnxfl2p1v44zh3rfn4ijnl8z08vfqrvvs"; + }) + ]; + nativeBuildInputs = [ cmake ] ++ stdenv.lib.optionals stdenv.isDarwin [ @@ -26,9 +52,18 @@ stdenv.mkDerivation rec { libjpeg szip zlib + ] ++ stdenv.lib.optionals uselibtirpc [ + libtirpc ]; - preConfigure = stdenv.lib.optionalString (szip != null) "export SZIP_INSTALL=${szip}"; + preConfigure = stdenv.lib.optionalString uselibtirpc '' + # Make tirpc discovery work with CMAKE_PREFIX_PATH + substituteInPlace config/cmake/FindXDR.cmake \ + --replace 'find_path(XDR_INCLUDE_DIR NAMES rpc/types.h PATHS "/usr/include" "/usr/include/tirpc")' \ + 'find_path(XDR_INCLUDE_DIR NAMES rpc/types.h PATH_SUFFIXES include/tirpc)' + '' + stdenv.lib.optionalString (szip != null) '' + export SZIP_INSTALL=${szip} + ''; cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" @@ -74,7 +109,7 @@ stdenv.mkDerivation rec { moveToOutput bin "$bin" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Data model, library, and file format for storing and managing data"; homepage = "https://support.hdfgroup.org/products/hdf4/"; maintainers = with maintainers; [ knedlsepp ]; diff --git a/pkgs/tools/misc/hdf5/default.nix b/pkgs/tools/misc/hdf5/default.nix index e56108767aba..891fadac12ac 100644 --- a/pkgs/tools/misc/hdf5/default.nix +++ b/pkgs/tools/misc/hdf5/default.nix @@ -6,7 +6,7 @@ , zlib ? null , szip ? null , mpi ? null -, enableShared ? true +, enableShared ? !stdenv.hostPlatform.isStatic }: # cpp and mpi options are mutually exclusive diff --git a/pkgs/tools/misc/hdl-dump/default.nix b/pkgs/tools/misc/hdl-dump/default.nix index 96e81fe8bd4c..6a6af1391bda 100644 --- a/pkgs/tools/misc/hdl-dump/default.nix +++ b/pkgs/tools/misc/hdl-dump/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , upx }: @@ -25,7 +25,7 @@ in stdenv.mkDerivation { install -Dm755 hdl_dump -t $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/AKuHAK/hdl-dump"; description = "PlayStation 2 HDLoader image dump/install utility"; platforms = platforms.linux; diff --git a/pkgs/tools/misc/heatseeker/default.nix b/pkgs/tools/misc/heatseeker/default.nix index 207788ed61d6..13933c6c28a6 100644 --- a/pkgs/tools/misc/heatseeker/default.nix +++ b/pkgs/tools/misc/heatseeker/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform, coreutils }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, coreutils }: rustPlatform.buildRustPackage rec { pname = "heatseeker"; @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { # which we can also make use of TRAVIS = "true"; - meta = with stdenv.lib; { + meta = with lib; { description = "A general-purpose fuzzy selector"; homepage = "https://github.com/rschmitt/heatseeker"; license = licenses.mit; diff --git a/pkgs/tools/misc/hebcal/default.nix b/pkgs/tools/misc/hebcal/default.nix index 049a79fa7574..e7a9ccd6358e 100644 --- a/pkgs/tools/misc/hebcal/default.nix +++ b/pkgs/tools/misc/hebcal/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { version = "4.22"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://hebcal.github.io"; description = "A perpetual Jewish Calendar"; longDescription = "Hebcal is a program which prints out the days in the Jewish calendar for a given Gregorian year. Hebcal is fairly flexible in terms of which events in the Jewish calendar it displays."; diff --git a/pkgs/tools/misc/heimdall/default.nix b/pkgs/tools/misc/heimdall/default.nix index bd99fa7024c3..bbc07141e1ad 100644 --- a/pkgs/tools/misc/heimdall/default.nix +++ b/pkgs/tools/misc/heimdall/default.nix @@ -1,4 +1,4 @@ -{ stdenv, mkDerivation, fetchFromGitHub, cmake, zlib, libusb1 +{ lib, stdenv, mkDerivation, fetchFromGitHub, cmake, zlib, libusb1 , enableGUI ? false, qtbase ? null }: @@ -39,9 +39,7 @@ mkDerivation { install -m644 ../OSX/README.txt $out/share/doc/heimdall/README.osx ''; - enableParallelBuilding = true; - - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.glassechidna.com.au/products/heimdall/"; description = "A cross-platform tool suite to flash firmware onto Samsung Galaxy S devices"; license = licenses.mit; diff --git a/pkgs/tools/misc/hexyl/default.nix b/pkgs/tools/misc/hexyl/default.nix index d9bed8c607d0..e75d01057314 100644 --- a/pkgs/tools/misc/hexyl/default.nix +++ b/pkgs/tools/misc/hexyl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform }: +{ lib, stdenv, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { pname = "hexyl"; @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1am9vs7l2wzgwqakrsl27x1y7jpn9xaqa4kr48wwqzka401h6j4m"; - meta = with stdenv.lib; { + meta = with lib; { changelog = "https://github.com/sharkdp/hexyl/releases/tag/v${version}"; description = "A command-line hex viewer"; longDescription = '' diff --git a/pkgs/tools/misc/hhpc/default.nix b/pkgs/tools/misc/hhpc/default.nix index 4b1b0d0c7623..78e45aa4cd09 100644 --- a/pkgs/tools/misc/hhpc/default.nix +++ b/pkgs/tools/misc/hhpc/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, xorg, pkgconfig}: +{lib, stdenv, fetchFromGitHub, xorg, pkgconfig}: stdenv.mkDerivation rec { pname = "hhpc"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { cp hhpc $out/bin/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Hides the mouse pointer in X11"; maintainers = with maintainers; [ nico202 ]; platforms = platforms.unix; diff --git a/pkgs/tools/misc/hid-listen/default.nix b/pkgs/tools/misc/hid-listen/default.nix index afc7c5741fd4..1f69a3fe749b 100644 --- a/pkgs/tools/misc/hid-listen/default.nix +++ b/pkgs/tools/misc/hid-listen/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip }: +{ lib, stdenv, fetchzip }: stdenv.mkDerivation rec { pname = "hid-listen"; version = "1.01"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { mv ./hid_listen $out/bin/hid_listen ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A tool thats prints debugging information from usb HID devices"; homepage = "https://www.pjrc.com/teensy/hid_listen.html"; license = licenses.gpl3; diff --git a/pkgs/tools/misc/hpcg/default.nix b/pkgs/tools/misc/hpcg/default.nix index 6274178c266a..29799641880c 100644 --- a/pkgs/tools/misc/hpcg/default.nix +++ b/pkgs/tools/misc/hpcg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openmpi } : +{ lib, stdenv, fetchurl, openmpi } : stdenv.mkDerivation rec { pname = "hpcg"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { cp bin/hpcg.dat $out/share/hpcg ''; - meta = with stdenv.lib; { + meta = with lib; { description = "HPC conjugate gradient benchmark"; homepage = "https://www.hpcg-benchmark.org"; platforms = platforms.linux; diff --git a/pkgs/tools/misc/hpl/default.nix b/pkgs/tools/misc/hpl/default.nix index d688f3adf30e..c9a81ebb8a1b 100644 --- a/pkgs/tools/misc/hpl/default.nix +++ b/pkgs/tools/misc/hpl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, blas, lapack, mpi } : +{ lib, stdenv, fetchurl, blas, lapack, mpi } : assert (!blas.isILP64) && (!lapack.isILP64); @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ blas lapack mpi ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Portable Implementation of the Linpack Benchmark for Distributed-Memory Computers"; homepage = "http://www.netlib.org/benchmark/hpl/"; platforms = platforms.unix; diff --git a/pkgs/tools/misc/html-proofer/Gemfile.lock b/pkgs/tools/misc/html-proofer/Gemfile.lock index ce75c4e7fd89..3bd45730313a 100644 --- a/pkgs/tools/misc/html-proofer/Gemfile.lock +++ b/pkgs/tools/misc/html-proofer/Gemfile.lock @@ -6,7 +6,7 @@ GEM ethon (0.12.0) ffi (>= 1.3.0) ffi (1.14.2) - html-proofer (3.18.3) + html-proofer (3.18.5) addressable (~> 2.3) mercenary (~> 0.3) nokogumbo (~> 2.0) diff --git a/pkgs/tools/misc/html-proofer/gemset.nix b/pkgs/tools/misc/html-proofer/gemset.nix index da26cc347fe1..d6801512ca48 100644 --- a/pkgs/tools/misc/html-proofer/gemset.nix +++ b/pkgs/tools/misc/html-proofer/gemset.nix @@ -37,10 +37,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0l0nkk0px6bc4g3xwc1c5fyi0c3n8sgl1zy94vqdzllfmkjvfggc"; + sha256 = "0bz0041fizdmggc5k9an4s3qk6diyybn2agcia2wr96vymfb2qjh"; type = "gem"; }; - version = "3.18.3"; + version = "3.18.5"; }; mercenary = { groups = ["default"]; diff --git a/pkgs/tools/misc/hyperfine/default.nix b/pkgs/tools/misc/hyperfine/default.nix index cd581045cc59..fe39230a2145 100644 --- a/pkgs/tools/misc/hyperfine/default.nix +++ b/pkgs/tools/misc/hyperfine/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchCrate, rustPlatform, installShellFiles +{ lib, stdenv, fetchCrate, rustPlatform, installShellFiles , Security }: @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { --zsh $releaseDir/build/hyperfine-*/out/_hyperfine ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Command-line benchmarking tool"; homepage = "https://github.com/sharkdp/hyperfine"; license = with licenses; [ asl20 /* or */ mit ]; diff --git a/pkgs/tools/misc/hyperledger-fabric/default.nix b/pkgs/tools/misc/hyperledger-fabric/default.nix index e782d793dab8..13a88dcba303 100644 --- a/pkgs/tools/misc/hyperledger-fabric/default.nix +++ b/pkgs/tools/misc/hyperledger-fabric/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "hyperledger-fabric"; @@ -26,7 +26,7 @@ buildGoPackage rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "An implementation of blockchain technology, leveraging familiar and proven technologies"; homepage = "https://wiki.hyperledger.org/projects/Fabric"; license = licenses.asl20; diff --git a/pkgs/tools/misc/i3minator/default.nix b/pkgs/tools/misc/i3minator/default.nix index ad9c41d47052..f749ea677bc0 100644 --- a/pkgs/tools/misc/i3minator/default.nix +++ b/pkgs/tools/misc/i3minator/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pythonPackages, glibcLocales }: +{ lib, stdenv, fetchFromGitHub, pythonPackages, glibcLocales }: pythonPackages.buildPythonApplication rec { pname = "i3minator"; @@ -18,7 +18,7 @@ pythonPackages.buildPythonApplication rec { # No tests doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "i3 project manager similar to tmuxinator"; longDescription = '' A simple "workspace manager" for i3. It allows to quickly diff --git a/pkgs/tools/misc/ical2org/default.nix b/pkgs/tools/misc/ical2org/default.nix index bcba352d6d36..58afffcd7061 100644 --- a/pkgs/tools/misc/ical2org/default.nix +++ b/pkgs/tools/misc/ical2org/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildGoPackage}: +{ lib, stdenv, fetchFromGitHub, buildGoPackage}: buildGoPackage rec { pname = "ical2org"; @@ -16,7 +16,7 @@ buildGoPackage rec { goDeps = ./deps.nix; - meta = with stdenv.lib; { + meta = with lib; { description = "Convert an iCal file to org agenda format, optionally deduplicating entries"; homepage = "https://github.com/rjhorniii/ical2org"; license = licenses.gpl3; diff --git a/pkgs/tools/misc/ideviceinstaller/default.nix b/pkgs/tools/misc/ideviceinstaller/default.nix index 3dd536580362..9d1857c1136b 100644 --- a/pkgs/tools/misc/ideviceinstaller/default.nix +++ b/pkgs/tools/misc/ideviceinstaller/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, usbmuxd, libzip, libimobiledevice }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, usbmuxd, libzip, libimobiledevice }: stdenv.mkDerivation rec { pname = "ideviceinstaller"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig usbmuxd libimobiledevice libzip ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/libimobiledevice/ideviceinstaller"; description = "List/modify installed apps of iOS devices"; longDescription = '' diff --git a/pkgs/tools/misc/idevicerestore/default.nix b/pkgs/tools/misc/idevicerestore/default.nix index cbb0e1058ab7..5072d2d9b989 100644 --- a/pkgs/tools/misc/idevicerestore/default.nix +++ b/pkgs/tools/misc/idevicerestore/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig , curl , libimobiledevice , libirecovery @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { # because they are inherited `libimobiledevice`. ] ++ stdenv.lib.optionals stdenv.isDarwin [ IOKit ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/libimobiledevice/idevicerestore"; description = "Restore/upgrade firmware of iOS devices"; longDescription = '' diff --git a/pkgs/tools/misc/ili2c/default.nix b/pkgs/tools/misc/ili2c/default.nix index 2bda116e66ce..c2f4c991a708 100644 --- a/pkgs/tools/misc/ili2c/default.nix +++ b/pkgs/tools/misc/ili2c/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, jdk8, ant, makeWrapper, jre8 }: +{ lib, stdenv, fetchFromGitHub, jdk8, ant, makeWrapper, jre8 }: let jdk = jdk8; jre = jre8; in stdenv.mkDerivation rec { @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { --add-flags "-jar $out/share/${pname}/ili2c.jar" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "The INTERLIS Compiler"; longDescription = '' Checks the syntactical correctness of an INTERLIS data model. diff --git a/pkgs/tools/misc/ink/default.nix b/pkgs/tools/misc/ink/default.nix index 266298d9ec2c..8037d5413106 100644 --- a/pkgs/tools/misc/ink/default.nix +++ b/pkgs/tools/misc/ink/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libinklevel }: +{ lib, stdenv, fetchurl, libinklevel }: stdenv.mkDerivation rec { pname = "ink"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "man" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A command line tool for checking the ink level of your locally connected printer"; longDescription = '' Ink is a command line tool for checking the ink level of your locally connected printer on a system which runs Linux or FreeBSD. Canon BJNP network printers are supported too. diff --git a/pkgs/tools/misc/intermodal/default.nix b/pkgs/tools/misc/intermodal/default.nix index c96aa90cb233..ca1c58d465a2 100644 --- a/pkgs/tools/misc/intermodal/default.nix +++ b/pkgs/tools/misc/intermodal/default.nix @@ -1,4 +1,4 @@ -{ stdenv, rustPlatform, fetchFromGitHub }: +{ lib, stdenv, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "intermodal"; @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { # include_hidden test tries to use `chflags` on darwin checkFlagsArray = stdenv.lib.optionals stdenv.isDarwin [ "--skip=subcommand::torrent::create::tests::include_hidden" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "User-friendly and featureful command-line BitTorrent metainfo utility"; homepage = "https://github.com/casey/intermodal"; license = licenses.cc0; diff --git a/pkgs/tools/misc/ipad_charge/default.nix b/pkgs/tools/misc/ipad_charge/default.nix index 981d9f2dc6cf..d92961be9c5a 100644 --- a/pkgs/tools/misc/ipad_charge/default.nix +++ b/pkgs/tools/misc/ipad_charge/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libusb1 }: +{ lib, stdenv, fetchFromGitHub, libusb1 }: stdenv.mkDerivation rec { pname = "ipad_charge"; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { mkdir -p $out/{bin,lib/udev/rules.d} ''; - meta = with stdenv.lib; { + meta = with lib; { inherit (src.meta) homepage; description = "Apple device USB charging utility for Linux"; longDescription = '' diff --git a/pkgs/tools/misc/ipbt/default.nix b/pkgs/tools/misc/ipbt/default.nix index e523dd198d42..8ee6bb5addb9 100644 --- a/pkgs/tools/misc/ipbt/default.nix +++ b/pkgs/tools/misc/ipbt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, ncurses }: +{ lib, stdenv, fetchurl, perl, ncurses }: stdenv.mkDerivation rec { version = "20190601.d1519e0"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ perl ]; buildInputs = [ ncurses ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A high-tech ttyrec player for Unix"; homepage = "https://www.chiark.greenend.org.uk/~sgtatham/ipbt/"; license = licenses.mit; diff --git a/pkgs/tools/misc/ipxe/default.nix b/pkgs/tools/misc/ipxe/default.nix index 87b26f223bc8..beb6f0e708bf 100644 --- a/pkgs/tools/misc/ipxe/default.nix +++ b/pkgs/tools/misc/ipxe/default.nix @@ -19,7 +19,7 @@ in stdenv.mkDerivation rec { pname = "ipxe"; - version = "1.20.1"; + version = "1.21.1"; nativeBuildInputs = [ perl cdrkit syslinux xz openssl gnu-efi mtools ]; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { owner = "ipxe"; repo = "ipxe"; rev = "v${version}"; - sha256 = "0w7h7y97gj9nqvbmsg1zp6zj5mpbbpckqbbx7bpp6k3ahy5fk8zp"; + sha256 = "1pkf1n1c0rdlzfls8fvjvi1sd9xjd9ijqlyz3wigr70ijcv6x8i9"; }; # not possible due to assembler code diff --git a/pkgs/tools/misc/ix/default.nix b/pkgs/tools/misc/ix/default.nix index cedaa13b74a0..bf298090f3fa 100644 --- a/pkgs/tools/misc/ix/default.nix +++ b/pkgs/tools/misc/ix/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, curl }: +{ lib, stdenv, fetchurl, makeWrapper, curl }: stdenv.mkDerivation { pname = "ix"; @@ -21,7 +21,7 @@ stdenv.mkDerivation { wrapProgram $out/bin/ix --prefix PATH : "${stdenv.lib.makeBinPath [ curl ]}" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://ix.io"; description = "Command line pastebin"; maintainers = with maintainers; [ asymmetric ]; diff --git a/pkgs/tools/misc/jdiskreport/default.nix b/pkgs/tools/misc/jdiskreport/default.nix index ae70e0f3e613..117199617e14 100644 --- a/pkgs/tools/misc/jdiskreport/default.nix +++ b/pkgs/tools/misc/jdiskreport/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, jre, makeDesktopItem, copyDesktopItems }: +{ lib, stdenv, fetchurl, unzip, jre, makeDesktopItem, copyDesktopItems }: let desktopItem = makeDesktopItem { @@ -44,7 +44,7 @@ stdenv.mkDerivation { desktopItems = [ desktopItem ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.jgoodies.com/freeware/jdiskreport/"; description = "A graphical utility to visualize disk usage"; license = licenses.unfreeRedistributable; #TODO freedist, libs under BSD-3 diff --git a/pkgs/tools/misc/jdupes/default.nix b/pkgs/tools/misc/jdupes/default.nix index a22fcc77dd96..c55c0879e5d8 100644 --- a/pkgs/tools/misc/jdupes/default.nix +++ b/pkgs/tools/misc/jdupes/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "jdupes"; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { install -Dm444 -t $out/share/doc/jdupes CHANGES LICENSE README.md ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A powerful duplicate file finder and an enhanced fork of 'fdupes'"; longDescription = '' jdupes is a program for identifying and taking actions upon diff --git a/pkgs/tools/misc/jugglinglab/default.nix b/pkgs/tools/misc/jugglinglab/default.nix index 1b5f11440fa0..f9038da04b57 100644 --- a/pkgs/tools/misc/jugglinglab/default.nix +++ b/pkgs/tools/misc/jugglinglab/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, jre, makeWrapper, ant, jdk }: +{ lib, stdenv, fetchFromGitHub, jre, makeWrapper, ant, jdk }: stdenv.mkDerivation rec { version = "1.2.1"; name = "jugglinglab"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { --add-flags "-jar $out/lib/JugglingLab.jar" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A program to visualize different juggling pattens"; license = licenses.gpl2; maintainers = with maintainers; [ wnklmnn ]; diff --git a/pkgs/tools/misc/kanshi/default.nix b/pkgs/tools/misc/kanshi/default.nix index 0cb20315f66c..90ee2a3446b5 100644 --- a/pkgs/tools/misc/kanshi/default.nix +++ b/pkgs/tools/misc/kanshi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, meson, ninja, pkg-config, scdoc, wayland }: +{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, scdoc, wayland }: stdenv.mkDerivation rec { pname = "kanshi"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkg-config scdoc ]; buildInputs = [ wayland ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Dynamic display configuration tool"; longDescription = '' kanshi allows you to define output profiles that are automatically enabled diff --git a/pkgs/tools/misc/kargo/default.nix b/pkgs/tools/misc/kargo/default.nix index ac40eb762d50..00bf94034273 100644 --- a/pkgs/tools/misc/kargo/default.nix +++ b/pkgs/tools/misc/kargo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python3Packages }: +{ lib, stdenv, fetchurl, python3Packages }: with python3Packages; @@ -28,7 +28,7 @@ buildPythonApplication rec { HOME=$TMPDIR $out/bin/kargo -v ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/kubespray/kargo-cli"; description = "A tool helps to deploy a kubernetes cluster with Ansible"; platforms = platforms.linux; diff --git a/pkgs/tools/misc/kermit/default.nix b/pkgs/tools/misc/kermit/default.nix index 2155b8676bec..1a561f0bef47 100644 --- a/pkgs/tools/misc/kermit/default.nix +++ b/pkgs/tools/misc/kermit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, glibc }: +{ lib, stdenv, fetchurl, ncurses, glibc }: stdenv.mkDerivation { name = "kermit-9.0.302"; @@ -29,7 +29,7 @@ stdenv.mkDerivation { make -f makefile install ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.kermitproject.org/ck90.html"; description = "Portable Scriptable Network and Serial Communication Software"; license = licenses.bsd3; diff --git a/pkgs/tools/misc/kisslicer/default.nix b/pkgs/tools/misc/kisslicer/default.nix index c6ec5f3103fe..bd112e4b8765 100644 --- a/pkgs/tools/misc/kisslicer/default.nix +++ b/pkgs/tools/misc/kisslicer/default.nix @@ -2,7 +2,7 @@ , libX11 , libGLU, libGL , makeWrapper -, stdenv +, lib, stdenv }: let @@ -48,7 +48,7 @@ stdenv.mkDerivation { --run "mkdir -p ${inidir}" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Convert STL files into Gcode"; homepage = "http://www.kisslicer.com"; license = licenses.unfree; diff --git a/pkgs/tools/misc/kodi-cli/default.nix b/pkgs/tools/misc/kodi-cli/default.nix index 37eed61008b4..517e195040f5 100644 --- a/pkgs/tools/misc/kodi-cli/default.nix +++ b/pkgs/tools/misc/kodi-cli/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, makeWrapper, curl, bash, jq, youtube-dl, gnome3 }: +{ lib, stdenv, fetchFromGitHub, makeWrapper, curl, bash, jq, youtube-dl, gnome3 }: stdenv.mkDerivation rec { pname = "kodi-cli"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/playlist_to_kodi --prefix PATH : ${stdenv.lib.makeBinPath [ curl bash gnome3.zenity jq youtube-dl ]} ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/nawar/kodi-cli"; description = "Kodi/XBMC bash script to send Kodi commands using JSON RPC. It also allows sending YouTube videos to Kodi"; license = licenses.gpl2; diff --git a/pkgs/tools/misc/kt/default.nix b/pkgs/tools/misc/kt/default.nix index 9664759cf5a4..8d70b35584e7 100644 --- a/pkgs/tools/misc/kt/default.nix +++ b/pkgs/tools/misc/kt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildGoPackage }: +{ lib, stdenv, fetchFromGitHub, buildGoPackage }: buildGoPackage rec { pname = "kt"; @@ -13,7 +13,7 @@ buildGoPackage rec { goPackagePath = "github.com/fgeller/kt"; - meta = with stdenv.lib; { + meta = with lib; { description = "Kafka command line tool"; homepage = "https://github.com/fgeller/kt"; maintainers = with maintainers; [ utdemir ]; diff --git a/pkgs/tools/misc/latex2html/default.nix b/pkgs/tools/misc/latex2html/default.nix index 33ecdb8cd8e5..6f532533f99d 100644 --- a/pkgs/tools/misc/latex2html/default.nix +++ b/pkgs/tools/misc/latex2html/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, makeWrapper +{ lib, stdenv, fetchFromGitHub, makeWrapper , ghostscript, netpbm, perl }: # TODO: withTex @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "LaTeX-to-HTML translator"; longDescription = '' A Perl program that translates LaTeX into HTML (HyperText Markup diff --git a/pkgs/tools/misc/lazydocker/default.nix b/pkgs/tools/misc/lazydocker/default.nix index 5c70c7fba7d1..ea66a04a40df 100644 --- a/pkgs/tools/misc/lazydocker/default.nix +++ b/pkgs/tools/misc/lazydocker/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "lazydocker"; @@ -15,7 +15,7 @@ buildGoPackage rec { subPackages = [ "." ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A simple terminal UI for both docker and docker-compose"; homepage = "https://github.com/jesseduffield/lazydocker"; license = licenses.mit; diff --git a/pkgs/tools/misc/lcdf-typetools/default.nix b/pkgs/tools/misc/lcdf-typetools/default.nix index 44f6768fd3bc..3c4fd39713b4 100644 --- a/pkgs/tools/misc/lcdf-typetools/default.nix +++ b/pkgs/tools/misc/lcdf-typetools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { pname = "lcdf-typetools"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--without-kpathsea" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Utilities for manipulating OpenType, PostScript Type 1, and Multiple Master fonts"; homepage = "https://www.lcdf.org/type"; license = licenses.gpl2; diff --git a/pkgs/tools/misc/ldapvi/default.nix b/pkgs/tools/misc/ldapvi/default.nix index 52e6b0c6a30a..9c062cf418d9 100644 --- a/pkgs/tools/misc/ldapvi/default.nix +++ b/pkgs/tools/misc/ldapvi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, openldap, openssl, popt, glib, ncurses, readline, pkgconfig, cyrus_sasl, autoconf, automake }: +{ lib, stdenv, fetchgit, openldap, openssl, popt, glib, ncurses, readline, pkgconfig, cyrus_sasl, autoconf, automake }: stdenv.mkDerivation { pname = "ldapvi"; @@ -18,7 +18,7 @@ stdenv.mkDerivation { ./autogen.sh ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Interactive LDAP client for Unix terminals"; longDescription = '' ldapvi is an interactive LDAP client for Unix terminals. Using it, you diff --git a/pkgs/tools/misc/ldmtool/default.nix b/pkgs/tools/misc/ldmtool/default.nix index 9c9751d35c32..4a965cbe165d 100644 --- a/pkgs/tools/misc/ldmtool/default.nix +++ b/pkgs/tools/misc/ldmtool/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, gtk-doc, pkgconfig, libuuid, +{ lib, stdenv, fetchFromGitHub, autoconf, automake, gtk-doc, pkgconfig, libuuid, libtool, readline, gobject-introspection, json-glib, lvm2, libxslt, docbook_xsl , fetchpatch }: @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { libtool readline gobject-introspection json-glib libuuid ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Tool and library for managing Microsoft Windows Dynamic Disks"; homepage = "https://github.com/mdbooth/libldm"; maintainers = with maintainers; [ jensbin ]; diff --git a/pkgs/tools/misc/less/default.nix b/pkgs/tools/misc/less/default.nix index 4ffbf8634a8e..5fa4b339b1ee 100644 --- a/pkgs/tools/misc/less/default.nix +++ b/pkgs/tools/misc/less/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, lessSecure ? false }: +{ lib, stdenv, fetchurl, ncurses, lessSecure ? false }: stdenv.mkDerivation rec { pname = "less"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.greenwoodsoftware.com/less/"; description = "A more advanced file pager than ‘more’"; platforms = platforms.unix; diff --git a/pkgs/tools/misc/lesspipe/default.nix b/pkgs/tools/misc/lesspipe/default.nix index 8a13ef5dfd8a..5c8a13e3c202 100644 --- a/pkgs/tools/misc/lesspipe/default.nix +++ b/pkgs/tools/misc/lesspipe/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, substituteAll, perl, file, ncurses }: +{ lib, stdenv, fetchFromGitHub, substituteAll, perl, file, ncurses }: stdenv.mkDerivation rec { pname = "lesspipe"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { }) ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A preprocessor for less"; longDescription = '' Usually lesspipe.sh is called as an input filter to less. With the help diff --git a/pkgs/tools/misc/libbitcoin/libbitcoin-client.nix b/pkgs/tools/misc/libbitcoin/libbitcoin-client.nix index bad820c15069..71a9233fab53 100644 --- a/pkgs/tools/misc/libbitcoin/libbitcoin-client.nix +++ b/pkgs/tools/misc/libbitcoin/libbitcoin-client.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook +{ lib, stdenv, fetchFromGitHub, pkgconfig, autoreconfHook , boost, libbitcoin, libbitcoin-protocol }: let @@ -26,7 +26,7 @@ in stdenv.mkDerivation { "--with-boost-libdir=${boost.out}/lib" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Bitcoin client query library"; homepage = "https://github.com/libbitcoin/libbitcoin-client"; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/tools/misc/libbitcoin/libbitcoin-explorer.nix b/pkgs/tools/misc/libbitcoin/libbitcoin-explorer.nix index 93d8ceed2b47..fe7290f801b5 100644 --- a/pkgs/tools/misc/libbitcoin/libbitcoin-explorer.nix +++ b/pkgs/tools/misc/libbitcoin/libbitcoin-explorer.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook +{ lib, stdenv, fetchFromGitHub, pkgconfig, autoreconfHook , boost, libbitcoin-client, libbitcoin-network }: let @@ -27,7 +27,7 @@ in stdenv.mkDerivation { "--with-bash-completiondir=$out/share/bash-completion/completions" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Bitcoin command line tool"; homepage = "https://github.com/libbitcoin/libbitcoin-explorer"; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/tools/misc/libbitcoin/libbitcoin-network.nix b/pkgs/tools/misc/libbitcoin/libbitcoin-network.nix index fc660687ffc3..42f3669cad0a 100644 --- a/pkgs/tools/misc/libbitcoin/libbitcoin-network.nix +++ b/pkgs/tools/misc/libbitcoin/libbitcoin-network.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook +{ lib, stdenv, fetchFromGitHub, pkgconfig, autoreconfHook , boost, libbitcoin, zeromq }: let @@ -26,7 +26,7 @@ in stdenv.mkDerivation { "--with-boost-libdir=${boost.out}/lib" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Bitcoin P2P Network Library"; homepage = "https://libbitcoin.org/"; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/tools/misc/libbitcoin/libbitcoin-protocol.nix b/pkgs/tools/misc/libbitcoin/libbitcoin-protocol.nix index a5467fdcbd7a..469e7e83085a 100644 --- a/pkgs/tools/misc/libbitcoin/libbitcoin-protocol.nix +++ b/pkgs/tools/misc/libbitcoin/libbitcoin-protocol.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook +{ lib, stdenv, fetchFromGitHub, pkgconfig, autoreconfHook , boost, libbitcoin, secp256k1, zeromq }: let @@ -27,7 +27,7 @@ in stdenv.mkDerivation { "--with-boost-libdir=${boost.out}/lib" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Bitcoin Blockchain Query Protocol"; homepage = "https://libbitcoin.org/"; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/tools/misc/libbitcoin/libbitcoin.nix b/pkgs/tools/misc/libbitcoin/libbitcoin.nix index e68635585d0f..5198676cb75c 100644 --- a/pkgs/tools/misc/libbitcoin/libbitcoin.nix +++ b/pkgs/tools/misc/libbitcoin/libbitcoin.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook +{ lib, stdenv, fetchFromGitHub, pkgconfig, autoreconfHook , boost, secp256k1 }: let @@ -27,7 +27,7 @@ in stdenv.mkDerivation { "--with-boost-libdir=${boost.out}/lib" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "C++ library for building bitcoin applications"; homepage = "https://libbitcoin.org/"; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/tools/misc/libcpuid/default.nix b/pkgs/tools/misc/libcpuid/default.nix index 873399c185bf..cb02d87e22ad 100644 --- a/pkgs/tools/misc/libcpuid/default.nix +++ b/pkgs/tools/misc/libcpuid/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { pname = "libcpuid"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://libcpuid.sourceforge.net/"; description = "A small C library for x86 CPU detection and feature extraction"; license = licenses.bsd2; diff --git a/pkgs/tools/misc/lice/default.nix b/pkgs/tools/misc/lice/default.nix index 2d96819e8778..f7a8c68ed062 100644 --- a/pkgs/tools/misc/lice/default.nix +++ b/pkgs/tools/misc/lice/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python3Packages }: +{ lib, stdenv, fetchFromGitHub, python3Packages }: python3Packages.buildPythonPackage rec { @@ -13,7 +13,7 @@ python3Packages.buildPythonPackage rec { fetchSubmodules = true; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Print license based on selection and user options"; homepage = "https://github.com/licenses/lice"; license = licenses.bsd3; diff --git a/pkgs/tools/misc/linuxquota/default.nix b/pkgs/tools/misc/linuxquota/default.nix index b6b722379da8..58c6c1d53515 100644 --- a/pkgs/tools/misc/linuxquota/default.nix +++ b/pkgs/tools/misc/linuxquota/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, e2fsprogs, openldap, pkgconfig }: +{ lib, stdenv, fetchurl, e2fsprogs, openldap, pkgconfig }: stdenv.mkDerivation rec { version = "4.05"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ e2fsprogs openldap ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Tools to manage kernel-level quotas in Linux"; homepage = "https://sourceforge.net/projects/linuxquota/"; license = licenses.gpl2; # With some files being BSD as an exception diff --git a/pkgs/tools/misc/lnav/default.nix b/pkgs/tools/misc/lnav/default.nix index 9e5fad269886..4d9364ff23e4 100644 --- a/pkgs/tools/misc/lnav/default.nix +++ b/pkgs/tools/misc/lnav/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pcre-cpp, sqlite, ncurses +{ lib, stdenv, fetchFromGitHub, pcre-cpp, sqlite, ncurses , readline, zlib, bzip2, autoconf, automake, curl }: stdenv.mkDerivation rec { @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ./autogen.sh ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/tstack/lnav"; description = "The Logfile Navigator"; longDescription = '' diff --git a/pkgs/tools/misc/lnch/default.nix b/pkgs/tools/misc/lnch/default.nix index 51b9b94ef70d..377ba05eba69 100644 --- a/pkgs/tools/misc/lnch/default.nix +++ b/pkgs/tools/misc/lnch/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildGoPackage }: +{ lib, stdenv, fetchFromGitHub, buildGoPackage }: buildGoPackage rec { pname = "lnch"; @@ -13,7 +13,7 @@ buildGoPackage rec { sha256 = "0skzrjnbxq1yj7y64cq7angp4wqnrgw1xp9v8vw9zp8f8zwmpy0y"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/oem/lnch"; description = "A small go app that launches a process and moves it out of the process group"; license = licenses.publicDomain; # really I don't know diff --git a/pkgs/tools/misc/logstash/6.x.nix b/pkgs/tools/misc/logstash/6.x.nix index b8008864bccf..6735b5fd0962 100644 --- a/pkgs/tools/misc/logstash/6.x.nix +++ b/pkgs/tools/misc/logstash/6.x.nix @@ -1,6 +1,6 @@ { elk6Version , enableUnfree ? true -, stdenv +, lib, stdenv , fetchurl , makeWrapper , jre @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A data pipeline that helps you process logs and other event data from a variety of systems"; homepage = "https://www.elastic.co/products/logstash"; license = if enableUnfree then licenses.elastic else licenses.asl20; diff --git a/pkgs/tools/misc/logstash/7.x.nix b/pkgs/tools/misc/logstash/7.x.nix index cd554167dda8..df661988877d 100644 --- a/pkgs/tools/misc/logstash/7.x.nix +++ b/pkgs/tools/misc/logstash/7.x.nix @@ -1,6 +1,6 @@ { elk7Version , enableUnfree ? true -, stdenv +, lib, stdenv , fetchurl , makeWrapper , jre @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Logstash is a data pipeline that helps you process logs and other event data from a variety of systems"; homepage = "https://www.elastic.co/products/logstash"; license = if enableUnfree then licenses.elastic else licenses.asl20; diff --git a/pkgs/tools/misc/logtop/default.nix b/pkgs/tools/misc/logtop/default.nix index a7b2f6282fd9..855a85f53aac 100644 --- a/pkgs/tools/misc/logtop/default.nix +++ b/pkgs/tools/misc/logtop/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ncurses, uthash, pkg-config }: +{ lib, stdenv, fetchFromGitHub, ncurses, uthash, pkg-config }: stdenv.mkDerivation { name = "logtop-0.7"; @@ -19,7 +19,7 @@ stdenv.mkDerivation { substituteInPlace Makefile --replace /usr "" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Displays a real-time count of strings received from stdin"; longDescription = '' logtop displays a real-time count of strings received from stdin. diff --git a/pkgs/tools/misc/lokalise2-cli/default.nix b/pkgs/tools/misc/lokalise2-cli/default.nix index ccf7a05907d1..1b2fa9bda86b 100644 --- a/pkgs/tools/misc/lokalise2-cli/default.nix +++ b/pkgs/tools/misc/lokalise2-cli/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "lokalise2-cli"; @@ -19,7 +19,7 @@ buildGoModule rec { mv $out/bin/lokalise-cli-2-go $out/bin/lokalise2 ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Translation platform for developers. Upload language files, translate, integrate via API"; homepage = "https://lokalise.com"; license = licenses.bsd3; diff --git a/pkgs/tools/misc/loop/default.nix b/pkgs/tools/misc/loop/default.nix index 3cc0466d80ad..b7bd7678535c 100644 --- a/pkgs/tools/misc/loop/default.nix +++ b/pkgs/tools/misc/loop/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform }: +{ lib, stdenv, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage { pname = "loop"; @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage { cargoSha256 = "0a3l580ca23vx8isd1qff870ci3p7wf4qrm53jl7nhfjh7rg5a4w"; - meta = with stdenv.lib; { + meta = with lib; { description = "UNIX's missing `loop` command"; homepage = "https://github.com/Miserlou/Loop"; maintainers = with maintainers; [ koral ]; diff --git a/pkgs/tools/misc/lorri/default.nix b/pkgs/tools/misc/lorri/default.nix index 99ac31f6a0b9..d191a82853fc 100644 --- a/pkgs/tools/misc/lorri/default.nix +++ b/pkgs/tools/misc/lorri/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , pkgs , fetchFromGitHub , rustPlatform @@ -23,7 +23,7 @@ in (rustPlatform.buildRustPackage rec { pname = "lorri"; inherit version; - meta = with stdenv.lib; { + meta = with lib; { description = "Your project's nix-env"; homepage = "https://github.com/target/lorri"; license = licenses.asl20; diff --git a/pkgs/tools/misc/lottieconverter/default.nix b/pkgs/tools/misc/lottieconverter/default.nix index bf2a68df702a..aae27cb652eb 100644 --- a/pkgs/tools/misc/lottieconverter/default.nix +++ b/pkgs/tools/misc/lottieconverter/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libpng, rlottie, zlib }: +{ lib, stdenv, fetchFromGitHub, libpng, rlottie, zlib }: stdenv.mkDerivation rec { pname = "LottieConverter"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/sot-tech/LottieConverter/"; description = "Lottie converter utility"; license = licenses.lgpl21Plus; diff --git a/pkgs/tools/misc/lrzsz/default.nix b/pkgs/tools/misc/lrzsz/default.nix index 112a14f55f24..55c11b00c93c 100644 --- a/pkgs/tools/misc/lrzsz/default.nix +++ b/pkgs/tools/misc/lrzsz/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "lrzsz-0.12.20"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--program-transform-name=s/^l//" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://ohse.de/uwe/software/lrzsz.html"; description = "Communication package providing the XMODEM, YMODEM ZMODEM file transfer protocols"; license = licenses.gpl2; diff --git a/pkgs/tools/misc/lsd/default.nix b/pkgs/tools/misc/lsd/default.nix index 706b66d998c3..239c9651b86d 100644 --- a/pkgs/tools/misc/lsd/default.nix +++ b/pkgs/tools/misc/lsd/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , nixosTests , fetchFromGitHub , rustPlatform @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { passthru.tests = { inherit (nixosTests) lsd; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/Peltoche/lsd"; description = "The next gen ls command"; license = licenses.asl20; diff --git a/pkgs/tools/misc/ltunify/default.nix b/pkgs/tools/misc/ltunify/default.nix index e345f86e0212..b97a0e42ee00 100644 --- a/pkgs/tools/misc/ltunify/default.nix +++ b/pkgs/tools/misc/ltunify/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: # Although we copy in the udev rules here, you probably just want to use logitech-udev-rules instead of # adding this to services.udev.packages on NixOS @@ -16,7 +16,7 @@ stdenv.mkDerivation { makeFlags = [ "DESTDIR=$(out)" "bindir=/bin" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Tool for working with Logitech Unifying receivers and devices"; homepage = "https://lekensteyn.nl/logitech-unifying.html"; license = licenses.gpl3Plus; diff --git a/pkgs/tools/misc/makebootfat/default.nix b/pkgs/tools/misc/makebootfat/default.nix index dc66976720d0..1f512d04a225 100644 --- a/pkgs/tools/misc/makebootfat/default.nix +++ b/pkgs/tools/misc/makebootfat/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "makebootfat-1.4"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0v0g1xax0y6hmw2x10nfhchp9n7vqyvgc33gcxqax8jdq2pxm1q2"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Create bootable USB disks using the FAT filesystem and syslinux"; homepage = "http://advancemame.sourceforge.net/boot-readme.html"; license = licenses.gpl2; diff --git a/pkgs/tools/misc/man-db/default.nix b/pkgs/tools/misc/man-db/default.nix index 68e1aaa4d613..2816392e18ca 100644 --- a/pkgs/tools/misc/man-db/default.nix +++ b/pkgs/tools/misc/man-db/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libpipeline, db, groff, libiconv, makeWrapper, buildPackages }: +{ lib, stdenv, fetchurl, pkgconfig, libpipeline, db, groff, libiconv, makeWrapper, buildPackages }: stdenv.mkDerivation rec { name = "man-db-2.9.3"; @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { doCheck = !stdenv.hostPlatform.isMusl /* iconv binary */ && !stdenv.hostPlatform.isDarwin; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://man-db.nongnu.org"; description = "An implementation of the standard Unix documentation system accessed using the man command"; license = licenses.gpl2; diff --git a/pkgs/tools/misc/mandoc/default.nix b/pkgs/tools/misc/mandoc/default.nix index 82fc1dee00c3..da756f764d40 100644 --- a/pkgs/tools/misc/mandoc/default.nix +++ b/pkgs/tools/misc/mandoc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, zlib }: +{ lib, stdenv, fetchurl, zlib }: stdenv.mkDerivation rec { pname = "mandoc"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { echo $configureLocal > configure.local ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://mandoc.bsd.lv/"; description = "suite of tools compiling mdoc and man"; downloadPage = "http://mandoc.bsd.lv/snapshots/"; diff --git a/pkgs/tools/misc/marlin-calc/default.nix b/pkgs/tools/misc/marlin-calc/default.nix index c7222f696c99..0e75af62231c 100644 --- a/pkgs/tools/misc/marlin-calc/default.nix +++ b/pkgs/tools/misc/marlin-calc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation { pname = "marlin-calc"; @@ -21,7 +21,7 @@ stdenv.mkDerivation { install -Dm0755 {,$out/bin/}marlin-calc ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/eyal0/Marlin"; description = "Marlin 3D printer timing simulator"; license = licenses.gpl3; diff --git a/pkgs/tools/misc/mc/default.nix b/pkgs/tools/misc/mc/default.nix index fb279f313b4d..8dd6bd0195b2 100644 --- a/pkgs/tools/misc/mc/default.nix +++ b/pkgs/tools/misc/mc/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , pkgconfig , glib @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { sed -i -e "s!PKG_CONFIG_PATH=''${PKG_CONFIG_PATH}!PKG_CONFIG_PATH=$(echo "$PKG_CONFIG_PATH" | sed -e 's/./0/g')!" $out/bin/mc ''; - meta = with stdenv.lib; { + meta = with lib; { description = "File Manager and User Shell for the GNU Project"; downloadPage = "https://www.midnight-commander.org/downloads/"; homepage = "https://www.midnight-commander.org"; diff --git a/pkgs/tools/misc/mcfly/default.nix b/pkgs/tools/misc/mcfly/default.nix index 68a2b877c912..4fee29216fd9 100644 --- a/pkgs/tools/misc/mcfly/default.nix +++ b/pkgs/tools/misc/mcfly/default.nix @@ -1,4 +1,4 @@ -{ stdenv, rustPlatform, fetchFromGitHub }: +{ lib, stdenv, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "mcfly"; @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1c8qjkpc8wi095zzmgd05721kdf1knh9la91l081mvwa3inwk6ax"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/cantino/mcfly"; description = "An upgraded ctrl-r for Bash whose history results make sense for what you're working on right now"; changelog = "https://github.com/cantino/mcfly/blob/v${version}/CHANGELOG.txt"; diff --git a/pkgs/tools/misc/mcrypt/default.nix b/pkgs/tools/misc/mcrypt/default.nix index afbe811e7f2f..b2237ce04839 100644 --- a/pkgs/tools/misc/mcrypt/default.nix +++ b/pkgs/tools/misc/mcrypt/default.nix @@ -14,6 +14,7 @@ stdenv.mkDerivation rec { ./overflow_CVE-2012-4409.patch ./segv.patch ./sprintf_CVE-2012-4527.patch + ./malloc_to_stdlib.patch ]; buildInputs = [ libmcrypt libmhash ]; @@ -26,7 +27,7 @@ stdenv.mkDerivation rec { ever-wider range of algorithms and modes. ''; homepage = "http://mcrypt.sourceforge.net"; - license = stdenv.lib.licenses.gpl2; + license = stdenv.lib.licenses.gpl3Only; platforms = stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.qknight ]; }; diff --git a/pkgs/tools/misc/mcrypt/malloc_to_stdlib.patch b/pkgs/tools/misc/mcrypt/malloc_to_stdlib.patch new file mode 100755 index 000000000000..e92f5a46ae7e --- /dev/null +++ b/pkgs/tools/misc/mcrypt/malloc_to_stdlib.patch @@ -0,0 +1,26 @@ +From e295844e8ef5c13487996ab700e5f12a7fadb1a6 Mon Sep 17 00:00:00 2001 +From: Nima Vasseghi +Date: Wed, 30 Dec 2020 16:06:46 -0800 +Subject: [PATCH] malloc.h to stdlib.h in rfc2440.c + +The malloc.h is deprecated and should not be used +--- + src/rfc2440.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/rfc2440.c b/src/rfc2440.c +index 5a1f296..4d6a5db 100644 +--- a/src/rfc2440.c ++++ b/src/rfc2440.c +@@ -23,7 +23,7 @@ + #include + #endif + #include +-#include ++#include + + #include "xmalloc.h" + #include "keys.h" +-- +2.13.5 + diff --git a/pkgs/tools/misc/me_cleaner/default.nix b/pkgs/tools/misc/me_cleaner/default.nix index d224ad1dcc5d..19f43f2c8c5f 100644 --- a/pkgs/tools/misc/me_cleaner/default.nix +++ b/pkgs/tools/misc/me_cleaner/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub }: +{ lib, stdenv, buildPythonPackage, fetchFromGitHub }: buildPythonPackage rec { pname = "me_cleaner"; @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "1bdj2clm13ir441vn7sv860xsc5gh71ja5lc2wn0gggnff0adxj4"; }; - meta = with stdenv.lib; { + meta = with lib; { inherit (src.meta) homepage; description = "Tool for partial deblobbing of Intel ME/TXE firmware images"; longDescription = '' diff --git a/pkgs/tools/misc/mht2htm/default.nix b/pkgs/tools/misc/mht2htm/default.nix index 31f645e48ceb..e417c0e665db 100644 --- a/pkgs/tools/misc/mht2htm/default.nix +++ b/pkgs/tools/misc/mht2htm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, fpc, lazarus }: +{ lib, stdenv, fetchurl, unzip, fpc, lazarus }: let date = "07.apr.2016"; @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Convert .mht files to .html"; homepage = "http://pgm.bpalanka.com/mht2htm.html"; license = licenses.gpl3; diff --git a/pkgs/tools/misc/microplane/default.nix b/pkgs/tools/misc/microplane/default.nix new file mode 100644 index 000000000000..a0ac411f98e1 --- /dev/null +++ b/pkgs/tools/misc/microplane/default.nix @@ -0,0 +1,40 @@ +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + pname = "microplane"; + version = "0.0.25"; + + src = fetchFromGitHub { + owner = "Clever"; + repo = "microplane"; + rev = "v${version}"; + sha256 = "0vynkv3d70q8d079kgdmwbavyyrjssqnd223dl1rikyy7sd5sli8"; + }; + + goPackagePath = "github.com/Clever/microplane"; + + subPackages = ["."]; + + # Regenerate deps.nix with the following steps: + # git clone git@github.com:Clever/microplane.git + # cd microplane + # git checkout v + # dep2nix + + goDeps = ./deps.nix; + + buildFlagsArray = '' + -ldflags="-s -w -X main.version=v${version}" + ''; + + postInstall = '' + ln -s $out/bin/microplane $out/bin/mp + ''; + + meta = with lib; { + description = "A CLI tool to make git changes across many repos"; + homepage = "https://github.com/Clever/microplane"; + license = licenses.asl20; + maintainers = with maintainers; [ dbirks ]; + }; +} diff --git a/pkgs/tools/misc/microplane/deps.nix b/pkgs/tools/misc/microplane/deps.nix new file mode 100644 index 000000000000..f415bae45074 --- /dev/null +++ b/pkgs/tools/misc/microplane/deps.nix @@ -0,0 +1,228 @@ +# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) +[ + { + goPackagePath = "github.com/cpuguy83/go-md2man"; + fetch = { + type = "git"; + url = "https://github.com/cpuguy83/go-md2man"; + rev = "1d903dcb749992f3741d744c0f8376b4bd7eb3e1"; + sha256 = "1p1ncq4vv244w9v144vplsb2vbl3369wdxn4gc7xbfafkjwn8bxc"; + }; + } + { + goPackagePath = "github.com/davecgh/go-spew"; + fetch = { + type = "git"; + url = "https://github.com/davecgh/go-spew"; + rev = "346938d642f2ec3594ed81d874461961cd0faa76"; + sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c"; + }; + } + { + goPackagePath = "github.com/facebookgo/errgroup"; + fetch = { + type = "git"; + url = "https://github.com/facebookgo/errgroup"; + rev = "779c8d7ef069c522bc72ee5f31a98d89a37f3fb6"; + sha256 = "1kyqrnvr158f5lgb1pbianjd8xnmxxvpgz7qilmp7zvr69gykbas"; + }; + } + { + goPackagePath = "github.com/fatih/color"; + fetch = { + type = "git"; + url = "https://github.com/fatih/color"; + rev = "570b54cabe6b8eb0bc2dfce68d964677d63b5260"; + sha256 = "1hw9hgkfzbzqjhy29pqpk20xggxaqjv45wx8yn69488mw5ph7khh"; + }; + } + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "130e6b02ab059e7b717a096f397c5b60111cae74"; + sha256 = "0zk4d7gcykig9ld8f5h86fdxshm2gs93a2xkpf52jd5m4z59q26s"; + }; + } + { + goPackagePath = "github.com/google/go-github"; + fetch = { + type = "git"; + url = "https://github.com/google/go-github"; + rev = "e881974953e6ab6d1a6a1610e98ed6401a3aa1ba"; + sha256 = "0qaxcm2p655r1jd59rv1hd58driadw5hxlfy7h53c7pzcsmf2546"; + }; + } + { + goPackagePath = "github.com/google/go-querystring"; + fetch = { + type = "git"; + url = "https://github.com/google/go-querystring"; + rev = "53e6ce116135b80d037921a7fdd5138cf32d7a8a"; + sha256 = "0lkbm067nhmxk66pyjx59d77dbjjzwyi43gdvzyx2f8m1942rq7f"; + }; + } + { + goPackagePath = "github.com/inconshreveable/mousetrap"; + fetch = { + type = "git"; + url = "https://github.com/inconshreveable/mousetrap"; + rev = "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"; + sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152"; + }; + } + { + goPackagePath = "github.com/juju/errors"; + fetch = { + type = "git"; + url = "https://github.com/juju/errors"; + rev = "c7d06af17c68cd34c835053720b21f6549d9b0ee"; + sha256 = "1dmj8wkpmkw4z4c7wmnscs4ykrcv7p8lgwb75g5akahwqjaf9zcp"; + }; + } + { + goPackagePath = "github.com/mattn/go-colorable"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-colorable"; + rev = "167de6bfdfba052fa6b2d3664c8f5272e23c9072"; + sha256 = "1nwjmsppsjicr7anq8na6md7b1z84l9ppnlr045hhxjvbkqwalvx"; + }; + } + { + goPackagePath = "github.com/mattn/go-isatty"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-isatty"; + rev = "0360b2af4f38e8d38c7fce2a9f4e702702d73a39"; + sha256 = "06w45aqz2a6yrk25axbly2k5wmsccv8cspb94bfmz4izvw8h927n"; + }; + } + { + goPackagePath = "github.com/nathanleiby/diffparser"; + fetch = { + type = "git"; + url = "https://github.com/nathanleiby/diffparser"; + rev = "936553ce5db1b73e63cbcd7546416d13538e8d85"; + sha256 = "0qlxkbda4l1glwxdy52fhk3bqkyyc55si4xplf54jpi2x9khi2v4"; + }; + } + { + goPackagePath = "github.com/pmezard/go-difflib"; + fetch = { + type = "git"; + url = "https://github.com/pmezard/go-difflib"; + rev = "792786c7400a136282c1664665ae0a8db921c6c2"; + sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; + }; + } + { + goPackagePath = "github.com/russross/blackfriday"; + fetch = { + type = "git"; + url = "https://github.com/russross/blackfriday"; + rev = "4048872b16cc0fc2c5fd9eacf0ed2c2fedaa0c8c"; + sha256 = "17zg26ia43c8axrxp5q2bxh1asiqfhin4ah7h5d8ibil6pv7xbx4"; + }; + } + { + goPackagePath = "github.com/spf13/cobra"; + fetch = { + type = "git"; + url = "https://github.com/spf13/cobra"; + rev = "7b2c5ac9fc04fc5efafb60700713d4fa609b777b"; + sha256 = "0k4xswdfd2ridj7m48ijb4klq9mxpw03g8h2rvq99yddi8vmlbvn"; + }; + } + { + goPackagePath = "github.com/spf13/pflag"; + fetch = { + type = "git"; + url = "https://github.com/spf13/pflag"; + rev = "e57e3eeb33f795204c1ca35f56c44f83227c6e66"; + sha256 = "13mhx4i913jil32j295m3a36jzvq1y64xig0naadiz7q9ja011r2"; + }; + } + { + goPackagePath = "github.com/stretchr/testify"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/testify"; + rev = "69483b4bd14f5845b5a1e55bca19e954e827f1d0"; + sha256 = "11lzrwkdzdd8yyag92akncc008h2f9d1bpc489mxiwp0jrmz4ivb"; + }; + } + { + goPackagePath = "github.com/xanzy/go-gitlab"; + fetch = { + type = "git"; + url = "https://github.com/xanzy/go-gitlab"; + rev = "ee3313ca5478c4786248d63dd75e4cd8e1fad2db"; + sha256 = "0xbn94rb9ihpw1g698xbz9vdl7393z9zbb0lck52nxs838gkr4mb"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "5c72a883971a4325f8c62bf07b6d38c20ea47a6a"; + sha256 = "1cimmqpajys001x6yq8ycklc4w34y7iwrksv7ayv7m7fgzhcjn3d"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "aabf50738bcdd9b207582cbe796b59ed65d56680"; + sha256 = "0gq60lfzbyc6ggp5v3vbl6li818nmv0n32l9qf80ckpqpqkknkh5"; + }; + } + { + goPackagePath = "golang.org/x/oauth2"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/oauth2"; + rev = "bb50c06baba3d0c76f9d125c0719093e315b5b44"; + sha256 = "19fkbykwjhwa0833cqcphv7sfwc1538ad5wlsdkgdwr59qb9d32i"; + }; + } + { + goPackagePath = "golang.org/x/sync"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sync"; + rev = "6e8e738ad208923de99951fe0b48239bfd864f28"; + sha256 = "1avk27pszd5l5df6ff7j78wgla46ir1hhy2jwfl9a3c0ys602yx9"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "28a7276518d399b9634904daad79e18b44d481bc"; + sha256 = "0qsj394qyy27iaf8srl7bkbsx7sp4aifrv3z2xllkydya8y18rv8"; + }; + } + { + goPackagePath = "google.golang.org/appengine"; + fetch = { + type = "git"; + url = "https://github.com/golang/appengine"; + rev = "150dc57a1b433e64154302bdc40b6bb8aefa313a"; + sha256 = "0w3knznv39k8bm85ri62f83czcrxknql7dv6p9hk1a5jx3xljgxq"; + }; + } + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://github.com/go-yaml/yaml"; + rev = "eb3733d160e74a9c7e442f435eb3bea458e1d19f"; + sha256 = "1srhvcaa9db3a6xj29mkjr5kg33y71pclrlx4vcwz5m1lgb5c7q6"; + }; + } +] \ No newline at end of file diff --git a/pkgs/tools/misc/mimeo/default.nix b/pkgs/tools/misc/mimeo/default.nix index 55cc9717688a..6c332198fa75 100644 --- a/pkgs/tools/misc/mimeo/default.nix +++ b/pkgs/tools/misc/mimeo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, desktop-file-utils, file, python3Packages }: +{ lib, stdenv, fetchurl, desktop-file-utils, file, python3Packages }: python3Packages.buildPythonApplication rec { pname = "mimeo"; @@ -23,7 +23,7 @@ python3Packages.buildPythonApplication rec { installPhase = "install -Dm755 Mimeo.py $out/bin/mimeo"; - meta = with stdenv.lib; { + meta = with lib; { description = "Open files by MIME-type or file name using regular expressions"; homepage = "http://xyne.archlinux.ca/projects/mimeo/"; license = [ licenses.gpl2 ]; diff --git a/pkgs/tools/misc/minicom/default.nix b/pkgs/tools/misc/minicom/default.nix index 35c04faf4592..b52d2d26baa0 100644 --- a/pkgs/tools/misc/minicom/default.nix +++ b/pkgs/tools/misc/minicom/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, autoreconfHook, makeWrapper, pkgconfig +{ lib, stdenv, fetchgit, autoreconfHook, makeWrapper, pkgconfig , lrzsz, ncurses, libiconv }: stdenv.mkDerivation { @@ -38,7 +38,7 @@ stdenv.mkDerivation { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Modem control and terminal emulation program"; homepage = "https://salsa.debian.org/minicom-team/minicom"; license = licenses.gpl2; diff --git a/pkgs/tools/misc/miniserve/default.nix b/pkgs/tools/misc/miniserve/default.nix index 3e3c62fd0930..aa549f5691a9 100644 --- a/pkgs/tools/misc/miniserve/default.nix +++ b/pkgs/tools/misc/miniserve/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , rustPlatform , fetchFromGitHub , pkg-config @@ -8,21 +8,21 @@ rustPlatform.buildRustPackage rec { pname = "miniserve"; - version = "0.10.3"; + version = "0.10.4"; src = fetchFromGitHub { owner = "svenstaro"; repo = "miniserve"; rev = "v${version}"; - sha256 = "17m0h0ib7fl0kijagcwdcnvrdcb6z3knix9dl17abg5ivbvkwz8q"; + sha256 = "0hskb72gnp66vkyxsqnxhjcqgvjj7wbd2nm5wxp94abc5l1fiigv"; }; - cargoSha256 = "0ddc8b9wph4r1qcy24p8yiaq9s2knii0d7dh0w0qnzrn6cmm17dg"; + cargoSha256 = "0s1gdngpf6gxz2lyapblxxmc6aydg2i9kmrfvngkbmqh4as1a2vl"; nativeBuildInputs = [ pkg-config zlib ]; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - meta = with stdenv.lib; { + meta = with lib; { description = "For when you really just want to serve some files over HTTP right now!"; homepage = "https://github.com/svenstaro/miniserve"; license = with licenses; [ mit ]; diff --git a/pkgs/tools/misc/ministat/default.nix b/pkgs/tools/misc/ministat/default.nix index dfc2e2c624ed..68670599c1ee 100644 --- a/pkgs/tools/misc/ministat/default.nix +++ b/pkgs/tools/misc/ministat/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit }: +{ lib, stdenv, fetchgit }: stdenv.mkDerivation rec { pname = "ministat"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { cp ministat.1 $out/share/man/man1/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Simple tool for statistical comparison of data sets"; homepage = "https://git.decadent.org.uk/gitweb/?p=ministat.git"; license = licenses.beerware; diff --git a/pkgs/tools/misc/mlocate/default.nix b/pkgs/tools/misc/mlocate/default.nix index d3f406c53552..d28828f2a4f6 100644 --- a/pkgs/tools/misc/mlocate/default.nix +++ b/pkgs/tools/misc/mlocate/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, config }: +{ lib, stdenv, fetchurl, config }: let dbfile = stdenv.lib.attrByPath [ "locate" "dbfile" ] "/var/cache/locatedb" config; @@ -14,7 +14,7 @@ in stdenv.mkDerivation rec { buildInputs = [ ]; makeFlags = [ "dbfile=${dbfile}" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Merging locate is an utility to index and quickly search for files"; homepage = "https://pagure.io/mlocate"; license = licenses.gpl2; diff --git a/pkgs/tools/misc/mmake/default.nix b/pkgs/tools/misc/mmake/default.nix index a761530a0a00..5dcbcb065ecc 100644 --- a/pkgs/tools/misc/mmake/default.nix +++ b/pkgs/tools/misc/mmake/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "mmake"; @@ -15,7 +15,7 @@ buildGoPackage rec { goDeps = ./deps.nix; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/tj/mmake"; description = "A small program which wraps make to provide additional functionality"; longDescription = '' diff --git a/pkgs/tools/misc/mmv-go/default.nix b/pkgs/tools/misc/mmv-go/default.nix index d05614d579ab..8787e4a838f6 100644 --- a/pkgs/tools/misc/mmv-go/default.nix +++ b/pkgs/tools/misc/mmv-go/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "mmv-go"; - version = "0.1.2"; + version = "0.1.3"; src = fetchFromGitHub { owner = "itchyny"; repo = "mmv"; rev = "v${version}"; - sha256 = "0kpf6abzhsikm7vyk5735p8sfjhsh7klla9qnmc43mgh0560f020"; + sha256 = "12k5zzyr0lhjadc9kza04v0zgb20v7m4syaqwc7qvn3kfvv1mz8s"; }; - vendorSha256 = "1nnfi5zad7nlp44mj0fdg09q8pm093di7rr7pknl9whqghv36dfi"; + vendorSha256 = "0xnrai15ww9lfk02bc9p5ssycwnqkyjj5ch1srh7yvnbw3fakx68"; buildFlagsArray = [ "-ldflags=-s -w -X main.revision=${src.rev}" ]; diff --git a/pkgs/tools/misc/mongodb-compass/default.nix b/pkgs/tools/misc/mongodb-compass/default.nix index 28a1339e9a37..3774a77f5a44 100644 --- a/pkgs/tools/misc/mongodb-compass/default.nix +++ b/pkgs/tools/misc/mongodb-compass/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, dpkg +{ lib, stdenv, fetchurl, dpkg , alsaLib, at-spi2-atk, at-spi2-core, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, glib , gnome2, gdk-pixbuf, gtk3, pango, libnotify, libsecret, libuuid, libxcb, nspr, nss, systemd, xorg, wrapGAppsHook }: @@ -92,7 +92,7 @@ in stdenv.mkDerivation { wrapGAppsHook $out/bin/mongodb-compass ''; - meta = with stdenv.lib; { + meta = with lib; { description = "The GUI for MongoDB"; homepage = "https://www.mongodb.com/products/compass"; license = licenses.unfree; diff --git a/pkgs/tools/misc/most/default.nix b/pkgs/tools/misc/most/default.nix index 7adac5ee2ee6..de2118083d98 100644 --- a/pkgs/tools/misc/most/default.nix +++ b/pkgs/tools/misc/most/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, slang, ncurses }: +{ lib, stdenv, fetchurl, slang, ncurses }: stdenv.mkDerivation rec { pname = "most"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { buildInputs = [ slang ncurses ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A terminal pager similar to 'more' and 'less'"; longDescription = '' MOST is a powerful paging program for Unix, VMS, MSDOS, and win32 diff --git a/pkgs/tools/misc/mpdscribble/default.nix b/pkgs/tools/misc/mpdscribble/default.nix index b3665bb6dcf1..4e033a44cfd5 100644 --- a/pkgs/tools/misc/mpdscribble/default.nix +++ b/pkgs/tools/misc/mpdscribble/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig, boost, libgcrypt, systemd, mpd_clientlib, curl }: +{ lib, stdenv, fetchurl, meson, ninja, pkgconfig, boost, libgcrypt, systemd, mpd_clientlib, curl }: stdenv.mkDerivation rec { pname = "mpdscribble"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkgconfig ]; buildInputs = [ mpd_clientlib curl boost libgcrypt systemd ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A Music Player Daemon (MPD) client which submits information about tracks being played to a scrobbler (e.g. last.fm)"; homepage = "https://www.musicpd.org/clients/mpdscribble/"; license = licenses.gpl2; diff --git a/pkgs/tools/misc/ms-sys/default.nix b/pkgs/tools/misc/ms-sys/default.nix index 315dbce74070..0df6de82bd2f 100644 --- a/pkgs/tools/misc/ms-sys/default.nix +++ b/pkgs/tools/misc/ms-sys/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gettext }: +{ lib, stdenv, fetchurl, gettext }: stdenv.mkDerivation rec { pname = "ms-sys"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A program for writing Microsoft-compatible boot records"; homepage = "http://ms-sys.sourceforge.net/"; license = licenses.gpl2Plus; diff --git a/pkgs/tools/misc/mstflint/default.nix b/pkgs/tools/misc/mstflint/default.nix index be3993d81ecf..70bace74b1e9 100644 --- a/pkgs/tools/misc/mstflint/default.nix +++ b/pkgs/tools/misc/mstflint/default.nix @@ -1,4 +1,4 @@ -{ stdenv, autoreconfHook, fetchFromGitHub, zlib, libibmad, openssl }: +{ lib, stdenv, autoreconfHook, fetchFromGitHub, zlib, libibmad, openssl }: stdenv.mkDerivation rec { pname = "mstflint"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { dontDisableStatic = true; # the build fails without this. should probably be reported upstream - meta = with stdenv.lib; { + meta = with lib; { description = "Open source version of Mellanox Firmware Tools (MFT)"; homepage = "https://github.com/Mellanox/mstflint"; license = with licenses; [ gpl2 bsd2 ]; diff --git a/pkgs/tools/misc/mtm/default.nix b/pkgs/tools/misc/mtm/default.nix index 5b45c0b712bf..bc8ac50d1aeb 100644 --- a/pkgs/tools/misc/mtm/default.nix +++ b/pkgs/tools/misc/mtm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ncurses }: +{ lib, stdenv, fetchFromGitHub, ncurses }: stdenv.mkDerivation rec { pname = "mtm"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Perhaps the smallest useful terminal multiplexer in the world"; homepage = "https://github.com/deadpixi/mtm"; license = licenses.gpl3Plus; diff --git a/pkgs/tools/misc/mysqltuner/default.nix b/pkgs/tools/misc/mysqltuner/default.nix index 2f7889111b0e..6297e6131222 100644 --- a/pkgs/tools/misc/mysqltuner/default.nix +++ b/pkgs/tools/misc/mysqltuner/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, perl }: +{ lib, stdenv, fetchFromGitHub, perl }: stdenv.mkDerivation rec { pname = "mysqltuner"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { install -m0755 mysqltuner.pl $out/bin/mysqltuner ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Make recommendations for increased performance and stability of MariaDB/MySQL"; homepage = "http://mysqltuner.com"; license = licenses.gpl3; diff --git a/pkgs/tools/misc/nagstamon/default.nix b/pkgs/tools/misc/nagstamon/default.nix index 9b063947a449..3bd297628b2d 100644 --- a/pkgs/tools/misc/nagstamon/default.nix +++ b/pkgs/tools/misc/nagstamon/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pythonPackages }: +{ lib, stdenv, fetchurl, pythonPackages }: pythonPackages.buildPythonApplication rec { pname = "nagstamon"; @@ -15,11 +15,13 @@ pythonPackages.buildPythonApplication rec { propagatedBuildInputs = with pythonPackages; [ configparser pyqt5 psutil requests beautifulsoup4 keyring requests-kerberos kerberos lxml ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A status monitor for the desktop"; homepage = "https://nagstamon.ifw-dresden.de/"; license = licenses.gpl2; maintainers = with maintainers; [ pSub ]; - inherit version; + # fails to install with: + # TypeError: cannot unpack non-iterable bool object + broken = true; }; } diff --git a/pkgs/tools/misc/nbench/default.nix b/pkgs/tools/misc/nbench/default.nix index 950f3883f8f4..adca412daf84 100644 --- a/pkgs/tools/misc/nbench/default.nix +++ b/pkgs/tools/misc/nbench/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "nbench-byte"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { cp NNET.DAT $out ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.math.utah.edu/~mayer/linux/bmark.html"; description = "A synthetic computing benchmark program"; platforms = platforms.linux; diff --git a/pkgs/tools/misc/ncdu/default.nix b/pkgs/tools/misc/ncdu/default.nix index 2d56ab9c09bd..3510be4ed775 100644 --- a/pkgs/tools/misc/ncdu/default.nix +++ b/pkgs/tools/misc/ncdu/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses }: +{ lib, stdenv, fetchurl, ncurses }: stdenv.mkDerivation rec { pname = "ncdu"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Disk usage analyzer with an ncurses interface"; homepage = "https://dev.yorhel.nl/ncdu"; license = licenses.mit; diff --git a/pkgs/tools/misc/neofetch/default.nix b/pkgs/tools/misc/neofetch/default.nix index f08e3828325a..1ed201802d53 100644 --- a/pkgs/tools/misc/neofetch/default.nix +++ b/pkgs/tools/misc/neofetch/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "neofetch"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { "SYSCONFDIR=${placeholder "out"}/etc" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A fast, highly customizable system info script"; homepage = "https://github.com/dylanaraps/neofetch"; license = licenses.mit; diff --git a/pkgs/tools/misc/nginx-config-formatter/default.nix b/pkgs/tools/misc/nginx-config-formatter/default.nix index c9726d7e0403..fb5412a5866b 100644 --- a/pkgs/tools/misc/nginx-config-formatter/default.nix +++ b/pkgs/tools/misc/nginx-config-formatter/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python3 }: +{ lib, stdenv, fetchFromGitHub, python3 }: stdenv.mkDerivation { version = "2019-02-13"; @@ -23,7 +23,7 @@ stdenv.mkDerivation { install -m 0755 $src/nginxfmt.py $out/bin/nginxfmt ''; - meta = with stdenv.lib; { + meta = with lib; { description = "nginx config file formatter"; maintainers = with maintainers; [ Baughn ]; license = licenses.asl20; diff --git a/pkgs/tools/misc/nix-direnv/default.nix b/pkgs/tools/misc/nix-direnv/default.nix index 392de7d1bd94..95175f81c8ef 100644 --- a/pkgs/tools/misc/nix-direnv/default.nix +++ b/pkgs/tools/misc/nix-direnv/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A fast, persistent use_nix implementation for direnv"; homepage = "https://github.com/nix-community/nix-direnv"; license = licenses.mit; diff --git a/pkgs/tools/misc/nms/default.nix b/pkgs/tools/misc/nms/default.nix index 0005ffe824b0..8edddc4238df 100644 --- a/pkgs/tools/misc/nms/default.nix +++ b/pkgs/tools/misc/nms/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "nms"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildFlags = [ "nms" "sneakers" ]; installFlags = [ "prefix=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/bartobri/no-more-secrets"; description = '' A command line tool that recreates the famous data decryption diff --git a/pkgs/tools/misc/nncp/default.nix b/pkgs/tools/misc/nncp/default.nix index 3322ed0c8a46..4469f130b589 100644 --- a/pkgs/tools/misc/nncp/default.nix +++ b/pkgs/tools/misc/nncp/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , go , fetchurl , curl @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { ''; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Secure UUCP-like store-and-forward exchanging"; longDescription = '' This utilities are intended to help build up small size (dozens of diff --git a/pkgs/tools/misc/noteshrink/default.nix b/pkgs/tools/misc/noteshrink/default.nix index b934b1288703..2d6f23de4687 100644 --- a/pkgs/tools/misc/noteshrink/default.nix +++ b/pkgs/tools/misc/noteshrink/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python3, imagemagick }: +{ lib, stdenv, fetchFromGitHub, python3, imagemagick }: with python3.pkgs; @@ -15,7 +15,7 @@ buildPythonApplication rec { propagatedBuildInputs = [ numpy scipy imagemagick pillow ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Convert scans of handwritten notes to beautiful, compact PDFs"; homepage = "https://mzucker.github.io/2016/09/20/noteshrink.html"; license = licenses.mit; diff --git a/pkgs/tools/misc/notify-desktop/default.nix b/pkgs/tools/misc/notify-desktop/default.nix index 61aa2c41c4fc..03e7fbb5c020 100644 --- a/pkgs/tools/misc/notify-desktop/default.nix +++ b/pkgs/tools/misc/notify-desktop/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, dbus, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, dbus, pkgconfig }: stdenv.mkDerivation { pname = "notify-desktop"; @@ -18,7 +18,7 @@ stdenv.mkDerivation { install -m 755 bin/notify-desktop $out/bin/notify-desktop ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Little application that lets you send desktop notifications with one command"; longDescription = '' It's basically clone of notify-send from libnotify, diff --git a/pkgs/tools/misc/ntfy/default.nix b/pkgs/tools/misc/ntfy/default.nix index 593a8cfc637d..9f28d99ba0f3 100644 --- a/pkgs/tools/misc/ntfy/default.nix +++ b/pkgs/tools/misc/ntfy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python3Packages, fetchFromGitHub }: +{ lib, stdenv, python3Packages, fetchFromGitHub }: python3Packages.buildPythonApplication rec { pname = "ntfy"; @@ -28,7 +28,7 @@ python3Packages.buildPythonApplication rec { HOME=$(mktemp -d) ${python3Packages.python.interpreter} setup.py test ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A utility for sending notifications, on demand and when commands finish"; homepage = "http://ntfy.rtfd.org/"; license = licenses.gpl3; diff --git a/pkgs/tools/misc/nvimpager/default.nix b/pkgs/tools/misc/nvimpager/default.nix index 2c10c9fbfbb5..61f9e7262c92 100644 --- a/pkgs/tools/misc/nvimpager/default.nix +++ b/pkgs/tools/misc/nvimpager/default.nix @@ -1,5 +1,5 @@ { fetchFromGitHub -, stdenv +, lib, stdenv , ncurses, neovim, procps , pandoc, lua51Packages, util-linux }: @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { checkInputs = [ lua51Packages.busted util-linux neovim ]; checkPhase = ''script -c "busted --lpath './?.lua' test"''; - meta = with stdenv.lib; { + meta = with lib; { description = "Use neovim as pager"; longDescription = '' Use neovim as a pager to view manpages, diffs, etc with nvim's syntax diff --git a/pkgs/tools/misc/nyancat/default.nix b/pkgs/tools/misc/nyancat/default.nix index d4092c237df7..3aca7cc1729c 100644 --- a/pkgs/tools/misc/nyancat/default.nix +++ b/pkgs/tools/misc/nyancat/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "nyancat"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { mkdir -p $out/share/man/man1 ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Nyancat in your terminal, rendered through ANSI escape sequences"; homepage = "https://nyancat.dakko.us"; license = licenses.ncsa; diff --git a/pkgs/tools/misc/odroid-xu3-bootloader/default.nix b/pkgs/tools/misc/odroid-xu3-bootloader/default.nix index 3896ca77a166..052c46cef8cb 100644 --- a/pkgs/tools/misc/odroid-xu3-bootloader/default.nix +++ b/pkgs/tools/misc/odroid-xu3-bootloader/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { $out/bin/sd_fuse-xu3 ''; - meta = with stdenv.lib; { + meta = with lib; { platforms = platforms.linux; license = licenses.unfreeRedistributableFirmware; description = "Secure boot enabled boot loader for ODROID-XU{3,4}"; diff --git a/pkgs/tools/misc/odyssey/default.nix b/pkgs/tools/misc/odyssey/default.nix index f736184ea50e..788f30067358 100644 --- a/pkgs/tools/misc/odyssey/default.nix +++ b/pkgs/tools/misc/odyssey/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, openssl }: +{ lib, stdenv, fetchFromGitHub, cmake, openssl }: stdenv.mkDerivation rec { pname = "odyssey"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { install -Dm755 -t $out/bin sources/odyssey ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Scalable PostgreSQL connection pooler"; homepage = "https://github.com/yandex/odyssey"; license = licenses.bsd3; diff --git a/pkgs/tools/misc/onefetch/default.nix b/pkgs/tools/misc/onefetch/default.nix index 165a49fad038..7a010eb5e68a 100644 --- a/pkgs/tools/misc/onefetch/default.nix +++ b/pkgs/tools/misc/onefetch/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, rustPlatform, stdenv, fetchpatch +{ fetchFromGitHub, rustPlatform, lib, stdenv, fetchpatch , CoreFoundation, libiconv, libresolv, Security }: rustPlatform.buildRustPackage rec { @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { buildInputs = with stdenv; lib.optionals isDarwin [ CoreFoundation libiconv libresolv Security ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Git repository summary on your terminal"; homepage = "https://github.com/o2sh/onefetch"; license = licenses.mit; diff --git a/pkgs/tools/misc/opencorsairlink/default.nix b/pkgs/tools/misc/opencorsairlink/default.nix index 11df20b3b827..62772021baca 100644 --- a/pkgs/tools/misc/opencorsairlink/default.nix +++ b/pkgs/tools/misc/opencorsairlink/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libusb1, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, libusb1, pkgconfig }: stdenv.mkDerivation rec { name = "OpenCorsairLink-${version}"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sha256 = "1nizicl0mc9pslc6065mnrs0fnn8sh7ca8iiw7w9ix57zrhabpld"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Linux and Mac OS support for the CorsairLink Devices "; homepage = "https://github.com/audiohacked/OpenCorsairLink"; license = licenses.gpl2; diff --git a/pkgs/tools/misc/opentsdb/default.nix b/pkgs/tools/misc/opentsdb/default.nix index ed80f620318a..bbfecd58686c 100644 --- a/pkgs/tools/misc/opentsdb/default.nix +++ b/pkgs/tools/misc/opentsdb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, autoconf, automake, curl, fetchurl, jdk8, makeWrapper, nettools +{ lib, stdenv, autoconf, automake, curl, fetchurl, jdk8, makeWrapper, nettools , python, git }: @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { --set JAVA "${jre}/bin/java" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Time series database with millisecond precision"; homepage = "http://opentsdb.net"; license = licenses.lgpl21Plus; diff --git a/pkgs/tools/misc/oppai-ng/default.nix b/pkgs/tools/misc/oppai-ng/default.nix index e44999d1c348..922ef65be24b 100644 --- a/pkgs/tools/misc/oppai-ng/default.nix +++ b/pkgs/tools/misc/oppai-ng/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub }: @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { install -D liboppai.so $out/lib/liboppai.so ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Difficulty and pp calculator for osu!"; homepage = "https://github.com/Francesco149/oppai-ng"; license = licenses.unlicense; diff --git a/pkgs/tools/misc/os-prober/default.nix b/pkgs/tools/misc/os-prober/default.nix index 9b2afed0a9a1..4914572f1563 100644 --- a/pkgs/tools/misc/os-prober/default.nix +++ b/pkgs/tools/misc/os-prober/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, makeWrapper, nixosTests, +{ lib, stdenv, fetchFromGitLab, makeWrapper, nixosTests, # optional dependencies, the command(s) they provide coreutils, # mktemp grub2, # grub-mount and grub-probe @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { passthru.tests = { os-prober = nixosTests.os-prober; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Utility to detect other OSs on a set of drives"; homepage = "http://packages.debian.org/source/sid/os-prober"; license = licenses.gpl2Plus; diff --git a/pkgs/tools/misc/osinfo-db-tools/default.nix b/pkgs/tools/misc/osinfo-db-tools/default.nix index c0921a496cc2..298a7da6e2a3 100644 --- a/pkgs/tools/misc/osinfo-db-tools/default.nix +++ b/pkgs/tools/misc/osinfo-db-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, meson, ninja, gettext, glib, libxml2, perl, python3 +{ lib, stdenv, fetchurl, pkgconfig, meson, ninja, gettext, glib, libxml2, perl, python3 , libxslt, libarchive, bzip2, lzma, json-glib, libsoup }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkgconfig gettext perl python3 ]; buildInputs = [ glib json-glib libxml2 libxslt libarchive bzip2 lzma libsoup ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Tools for managing the osinfo database"; homepage = "https://libosinfo.org/"; license = licenses.lgpl2Plus; diff --git a/pkgs/tools/misc/osm2pgsql/default.nix b/pkgs/tools/misc/osm2pgsql/default.nix index 0d5adcdb5243..184ebc19bf24 100644 --- a/pkgs/tools/misc/osm2pgsql/default.nix +++ b/pkgs/tools/misc/osm2pgsql/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , cmake , expat @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H"; - meta = with stdenv.lib; { + meta = with lib; { description = "OpenStreetMap data to PostgreSQL converter"; homepage = "https://osm2pgsql.org"; license = licenses.gpl2; diff --git a/pkgs/tools/misc/ostree/default.nix b/pkgs/tools/misc/ostree/default.nix index e2cda521f08f..c1716fef5db9 100644 --- a/pkgs/tools/misc/ostree/default.nix +++ b/pkgs/tools/misc/ostree/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , fetchpatch , substituteAll @@ -135,7 +135,7 @@ in stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Git for operating system binaries"; homepage = "https://ostree.readthedocs.io/en/latest/"; license = licenses.lgpl2Plus; diff --git a/pkgs/tools/misc/otfcc/default.nix b/pkgs/tools/misc/otfcc/default.nix index dc7e3effe0a1..c4a9c5a278e6 100644 --- a/pkgs/tools/misc/otfcc/default.nix +++ b/pkgs/tools/misc/otfcc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, premake5 }: +{ lib, stdenv, fetchFromGitHub, premake5 }: stdenv.mkDerivation rec { pname = "otfcc"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Optimized OpenType builder and inspector"; homepage = "https://github.com/caryll/otfcc"; license = licenses.asl20; diff --git a/pkgs/tools/misc/ovh-ttyrec/default.nix b/pkgs/tools/misc/ovh-ttyrec/default.nix new file mode 100644 index 000000000000..fc2c2c3d67a3 --- /dev/null +++ b/pkgs/tools/misc/ovh-ttyrec/default.nix @@ -0,0 +1,29 @@ +{ lib, stdenv, fetchFromGitHub, zstd }: + +stdenv.mkDerivation rec { + pname = "ovh-ttyrec"; + version = "1.1.6.6"; + + src = fetchFromGitHub { + owner = "ovh"; + repo = "ovh-ttyrec"; + rev = "v${version}"; + sha256 = "176g3k2pzw6zpvmcc2f8idn6vhlygf7lfzxvrhysav2izc5dd130"; + }; + + nativeBuildInputs = [ zstd ]; + + installPhase = '' + mkdir -p $out/{bin,man} + cp ttytime ttyplay ttyrec $out/bin + cp docs/*.1 $out/man + ''; + + meta = with lib; { + homepage = "https://github.com/ovh/ovh-ttyrec/"; + description = "Terminal interaction recorder and player"; + license = licenses.bsd3; + platforms = platforms.all; + maintainers = with maintainers; [ chaduffy zimbatm ]; + }; +} diff --git a/pkgs/tools/misc/pandoc-lua-filters/default.nix b/pkgs/tools/misc/pandoc-lua-filters/default.nix index b7c081c1ddd0..6eb3359b3b5e 100644 --- a/pkgs/tools/misc/pandoc-lua-filters/default.nix +++ b/pkgs/tools/misc/pandoc-lua-filters/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub }: @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A collection of lua filters for pandoc"; homepage = "https://github.com/pandoc/lua-filters"; license = licenses.mit; diff --git a/pkgs/tools/misc/paps/default.nix b/pkgs/tools/misc/paps/default.nix index 8084f49f1b38..3a8040bd5f13 100644 --- a/pkgs/tools/misc/paps/default.nix +++ b/pkgs/tools/misc/paps/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , autoconf, automake, pkgconfig, intltool, pango }: stdenv.mkDerivation rec { @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ./autogen.sh ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Pango to PostScript converter"; homepage = "https://github.com/dov/paps"; license = licenses.lgpl2; diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index 45439afe3d11..9cc4926443b5 100644 --- a/pkgs/tools/misc/parallel/default.nix +++ b/pkgs/tools/misc/parallel/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, perl, makeWrapper, procps, coreutils }: +{ fetchurl, lib, stdenv, perl, makeWrapper, procps, coreutils }: stdenv.mkDerivation rec { name = "parallel-20200922"; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Shell tool for executing jobs in parallel"; longDescription = '' GNU Parallel is a shell tool for executing jobs in parallel. A job diff --git a/pkgs/tools/misc/parcellite/default.nix b/pkgs/tools/misc/parcellite/default.nix index 97c67f59b084..861d83bcfcea 100644 --- a/pkgs/tools/misc/parcellite/default.nix +++ b/pkgs/tools/misc/parcellite/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook +{ lib, stdenv, fetchFromGitHub, autoreconfHook , gtk2, hicolor-icon-theme, intltool, pkgconfig , which, wrapGAppsHook, xdotool }: @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { gappsWrapperArgs+=(--prefix PATH : "${which}/bin:${xdotool}/bin") ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Lightweight GTK clipboard manager"; homepage = "https://github.com/rickyrockrat/parcellite"; license = licenses.gpl3Plus; diff --git a/pkgs/tools/misc/parted/default.nix b/pkgs/tools/misc/parted/default.nix index b00a0836021f..2b21b2f1427c 100644 --- a/pkgs/tools/misc/parted/default.nix +++ b/pkgs/tools/misc/parted/default.nix @@ -11,7 +11,7 @@ , python3 , util-linux , check -, enableStatic ? false +, enableStatic ? stdenv.hostPlatform.isStatic }: stdenv.mkDerivation rec { diff --git a/pkgs/tools/misc/partition-manager/default.nix b/pkgs/tools/misc/partition-manager/default.nix index 1a779616ab83..845c0fec9211 100644 --- a/pkgs/tools/misc/partition-manager/default.nix +++ b/pkgs/tools/misc/partition-manager/default.nix @@ -15,8 +15,6 @@ in mkDerivation rec { sha256 = "0jhggb4xksb0k0mj752n6pz0xmccnbzlp984xydqbz3hkigra1si"; }; - enableParallelBuilding = true; - nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook wrapQtAppsHook ]; # refer to kpmcore for the use of eject diff --git a/pkgs/tools/misc/pastebinit/default.nix b/pkgs/tools/misc/pastebinit/default.nix index 9b4202504a0f..4b28f49acaa2 100644 --- a/pkgs/tools/misc/pastebinit/default.nix +++ b/pkgs/tools/misc/pastebinit/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , fetchpatch , python3 @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { substituteInPlace $out/bin/pastebinit --replace "'/etc/pastebin.d" "'$out/etc/pastebin.d" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://launchpad.net/pastebinit"; description = "A software that lets you send anything you want directly to a pastebin from the command line"; maintainers = with maintainers; [ lethalman raboof ]; diff --git a/pkgs/tools/misc/pazi/default.nix b/pkgs/tools/misc/pazi/default.nix index cc7e7b043e0e..0375b8e14840 100644 --- a/pkgs/tools/misc/pazi/default.nix +++ b/pkgs/tools/misc/pazi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform, darwin }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, darwin }: rustPlatform.buildRustPackage rec { pname = "pazi"; @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0sja0q9i0b1zb3a0a6z561yg9lqykylwr3iwin4r6cmi7j2sw5j6"; - meta = with stdenv.lib; { + meta = with lib; { description = "An autojump \"zap to directory\" helper"; homepage = "https://github.com/euank/pazi"; license = licenses.gpl3; diff --git a/pkgs/tools/misc/pb_cli/default.nix b/pkgs/tools/misc/pb_cli/default.nix index 858422b85328..9d33f088af0d 100644 --- a/pkgs/tools/misc/pb_cli/default.nix +++ b/pkgs/tools/misc/pb_cli/default.nix @@ -1,5 +1,5 @@ { screenshots ? true, video ? false, clipboard ? true -, stdenv, jq, curl, fetchFromGitHub, makeWrapper, maim ? null, xclip ? null, capture ? null }: +, lib, stdenv, jq, curl, fetchFromGitHub, makeWrapper, maim ? null, xclip ? null, capture ? null }: assert screenshots -> maim != null; assert video -> capture != null; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { --prefix PATH : '${stdenv.lib.makeBinPath liveDeps}' ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A no bullshit 0x0.st client"; homepage = "https://github.com/ptpb/pb_cli"; maintainers = [ maintainers.ar1a ]; diff --git a/pkgs/tools/misc/pdd/default.nix b/pkgs/tools/misc/pdd/default.nix index 37f9e2f4ce5b..b339f94deb18 100644 --- a/pkgs/tools/misc/pdd/default.nix +++ b/pkgs/tools/misc/pdd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildPythonApplication, dateutil }: +{ lib, stdenv, fetchFromGitHub, buildPythonApplication, dateutil }: buildPythonApplication rec { pname = "pdd"; @@ -17,7 +17,7 @@ buildPythonApplication rec { installFlags = [ "PREFIX=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/jarun/pdd"; description = "Tiny date, time diff calculator"; longDescription = '' diff --git a/pkgs/tools/misc/pdf-parser/default.nix b/pkgs/tools/misc/pdf-parser/default.nix index 3fee457f6f54..ceb8b4d68d99 100644 --- a/pkgs/tools/misc/pdf-parser/default.nix +++ b/pkgs/tools/misc/pdf-parser/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python3Packages, fetchzip }: +{ lib, stdenv, python3Packages, fetchzip }: python3Packages.buildPythonApplication { pname = "pdf-parser"; @@ -20,7 +20,7 @@ python3Packages.buildPythonApplication { --replace '/usr/bin/python' '${python3Packages.python}/bin/python' ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Parse a PDF document"; longDescription = '' This tool will parse a PDF document to identify the fundamental elements used in the analyzed file. diff --git a/pkgs/tools/misc/pfsshell/default.nix b/pkgs/tools/misc/pfsshell/default.nix index e941cbd84c79..10cde1385bb2 100644 --- a/pkgs/tools/misc/pfsshell/default.nix +++ b/pkgs/tools/misc/pfsshell/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, meson, ninja }: +{ lib, stdenv, fetchFromGitHub, meson, ninja }: stdenv.mkDerivation rec { version = "1.1.1"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { # cc1: error: '-Wformat-security' ignored without '-Wformat' [-Werror=format-security] hardeningDisable = [ "format" ]; - meta = with stdenv.lib; { + meta = with lib; { inherit (src.meta) homepage; description = "PFS (PlayStation File System) shell for POSIX-based systems"; platforms = platforms.unix; diff --git a/pkgs/tools/misc/pg_top/default.nix b/pkgs/tools/misc/pg_top/default.nix index ca3318d45c67..a5d1baf1fd18 100644 --- a/pkgs/tools/misc/pg_top/default.nix +++ b/pkgs/tools/misc/pg_top/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, postgresql }: +{ lib, stdenv, fetchurl, ncurses, postgresql }: stdenv.mkDerivation rec { name = "pg_top-3.7.0"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses postgresql ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A 'top' like tool for PostgreSQL"; longDescription = '' pg_top allows you to: diff --git a/pkgs/tools/misc/pgcenter/default.nix b/pkgs/tools/misc/pgcenter/default.nix index 601694ebc37d..5a59e3030e64 100644 --- a/pkgs/tools/misc/pgcenter/default.nix +++ b/pkgs/tools/misc/pgcenter/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "pgcenter"; @@ -15,7 +15,7 @@ buildGoModule rec { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://pgcenter.org/"; description = "Command-line admin tool for observing and troubleshooting PostgreSQL"; license = licenses.bsd3; diff --git a/pkgs/tools/misc/pgmetrics/default.nix b/pkgs/tools/misc/pgmetrics/default.nix index e51684776727..377c0eed24b7 100644 --- a/pkgs/tools/misc/pgmetrics/default.nix +++ b/pkgs/tools/misc/pgmetrics/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "pgmetrics"; @@ -17,7 +17,7 @@ buildGoModule rec { buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://pgmetrics.io/"; description = "Collect and display information and stats from a running PostgreSQL server"; license = licenses.asl20; diff --git a/pkgs/tools/misc/phoronix-test-suite/default.nix b/pkgs/tools/misc/phoronix-test-suite/default.nix index 520794c56569..8cb8d67c733a 100644 --- a/pkgs/tools/misc/phoronix-test-suite/default.nix +++ b/pkgs/tools/misc/phoronix-test-suite/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, php, which, gnused, makeWrapper, gnumake, gcc, callPackage }: +{ lib, stdenv, fetchurl, php, which, gnused, makeWrapper, gnumake, gcc, callPackage }: stdenv.mkDerivation rec { pname = "phoronix-test-suite"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { simple-execution = callPackage ./tests.nix { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Open-Source, Automated Benchmarking"; homepage = "https://www.phoronix-test-suite.com/"; maintainers = with maintainers; [ davidak ]; diff --git a/pkgs/tools/misc/phraseapp-client/default.nix b/pkgs/tools/misc/phraseapp-client/default.nix index b99aadf9337f..27c486f4bea3 100644 --- a/pkgs/tools/misc/phraseapp-client/default.nix +++ b/pkgs/tools/misc/phraseapp-client/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "phraseapp-client"; @@ -18,7 +18,7 @@ buildGoPackage rec { ln -s $out/bin/phraseapp-client $out/bin/phraseapp ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://docs.phraseapp.com"; description = "PhraseApp API v2 Command Line Client"; license = licenses.mit; diff --git a/pkgs/tools/misc/pick/default.nix b/pkgs/tools/misc/pick/default.nix index ceb2bace7db9..ac446e7f341e 100644 --- a/pkgs/tools/misc/pick/default.nix +++ b/pkgs/tools/misc/pick/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, ncurses, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, ncurses, pkgconfig }: stdenv.mkDerivation rec { pname = "pick"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig ]; - meta = with stdenv.lib; { + meta = with lib; { inherit (src.meta) homepage; description = "Fuzzy text selection utility"; license = licenses.mit; diff --git a/pkgs/tools/misc/picocom/default.nix b/pkgs/tools/misc/picocom/default.nix index 1db8d00a9021..47126bac304d 100644 --- a/pkgs/tools/misc/picocom/default.nix +++ b/pkgs/tools/misc/picocom/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , installShellFiles , lrzsz @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { installShellCompletion --bash bash_completion/picocom ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Minimal dumb-terminal emulation program"; homepage = "https://github.com/npat-efault/picocom/"; license = licenses.gpl2Plus; diff --git a/pkgs/tools/misc/pistol/default.nix b/pkgs/tools/misc/pistol/default.nix index fa3a9d01f312..874bbdbaf701 100644 --- a/pkgs/tools/misc/pistol/default.nix +++ b/pkgs/tools/misc/pistol/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildGoModule , fetchFromGitHub , file @@ -27,7 +27,7 @@ buildGoModule rec { buildFlagsArray = [ "-ldflags=-s -w -X main.Version=${version}" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "General purpose file previewer designed for Ranger, Lf to make scope.sh redundant"; homepage = "https://github.com/doronbehar/pistol"; license = licenses.mit; diff --git a/pkgs/tools/misc/pkgdiff/default.nix b/pkgs/tools/misc/pkgdiff/default.nix index 04d0c95b81a4..2f68e9505edb 100644 --- a/pkgs/tools/misc/pkgdiff/default.nix +++ b/pkgs/tools/misc/pkgdiff/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/pkgdiff --prefix PATH : ${lib.makeBinPath [ wdiff ]} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A tool for visualizing changes in Linux software packages"; homepage = "https://lvc.github.io/pkgdiff/"; license = licenses.gpl2; diff --git a/pkgs/tools/misc/plantuml-server/default.nix b/pkgs/tools/misc/plantuml-server/default.nix index 11db08dd9735..ad0ffa810cd7 100644 --- a/pkgs/tools/misc/plantuml-server/default.nix +++ b/pkgs/tools/misc/plantuml-server/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, maven, jdk }: +{ lib, stdenv, fetchFromGitHub, maven, jdk }: let version = "1.2020.14"; @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { cp "target/plantuml.war" "$out/webapps/plantuml.war" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A web application to generate UML diagrams on-the-fly."; homepage = "https://plantuml.com/"; license = licenses.gpl3; diff --git a/pkgs/tools/misc/plantuml/default.nix b/pkgs/tools/misc/plantuml/default.nix index 742e62230d28..e366673d7737 100644 --- a/pkgs/tools/misc/plantuml/default.nix +++ b/pkgs/tools/misc/plantuml/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, jre, graphviz }: +{ lib, stdenv, fetchurl, makeWrapper, jre, graphviz }: stdenv.mkDerivation rec { version = "1.2020.22"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { $out/bin/plantuml -help ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Draw UML diagrams using a simple and human readable text description"; homepage = "http://plantuml.sourceforge.net/"; # "plantuml -license" says GPLv3 or later diff --git a/pkgs/tools/misc/plotinus/default.nix b/pkgs/tools/misc/plotinus/default.nix index 6440ed533f60..c7aff75dca51 100644 --- a/pkgs/tools/misc/plotinus/default.nix +++ b/pkgs/tools/misc/plotinus/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , gettext , libxml2 @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { gtk3 ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A searchable command palette in every modern GTK application"; homepage = "https://github.com/p-e-w/plotinus"; maintainers = with maintainers; [ samdroid-apps ]; diff --git a/pkgs/tools/misc/pod2mdoc/default.nix b/pkgs/tools/misc/pod2mdoc/default.nix index 757100251260..4e919e284892 100644 --- a/pkgs/tools/misc/pod2mdoc/default.nix +++ b/pkgs/tools/misc/pod2mdoc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "pod2mdoc"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { install -m 0444 pod2mdoc.1 $out/share/man/man1 ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://mdocml.bsd.lv/"; description = "converter from POD into mdoc"; license = licenses.isc; diff --git a/pkgs/tools/misc/powerline-go/default.nix b/pkgs/tools/misc/powerline-go/default.nix index 16734e3dd3a8..2b46e25c67e8 100644 --- a/pkgs/tools/misc/powerline-go/default.nix +++ b/pkgs/tools/misc/powerline-go/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "powerline-go"; @@ -15,7 +15,7 @@ buildGoModule rec { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "A Powerline like prompt for Bash, ZSH and Fish"; license = licenses.gpl3; platforms = platforms.unix; diff --git a/pkgs/tools/misc/profile-sync-daemon/default.nix b/pkgs/tools/misc/profile-sync-daemon/default.nix index b4497c4d7c87..0c8bb068ca6e 100644 --- a/pkgs/tools/misc/profile-sync-daemon/default.nix +++ b/pkgs/tools/misc/profile-sync-daemon/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, util-linux, coreutils}: +{ lib, stdenv, fetchurl, util-linux, coreutils}: stdenv.mkDerivation rec { version = "6.42"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { preferLocalBuild = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Syncs browser profile dirs to RAM"; longDescription = '' Profile-sync-daemon (psd) is a tiny pseudo-daemon designed to manage your diff --git a/pkgs/tools/misc/progress/default.nix b/pkgs/tools/misc/progress/default.nix index a43101f607d5..dbf844a4f9d8 100644 --- a/pkgs/tools/misc/progress/default.nix +++ b/pkgs/tools/misc/progress/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, ncurses, which }: +{ lib, stdenv, fetchFromGitHub, pkgconfig, ncurses, which }: stdenv.mkDerivation rec { pname = "progress"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/Xfennec/progress"; description = "Tool that shows the progress of coreutils programs"; license = licenses.gpl3; diff --git a/pkgs/tools/misc/pspg/default.nix b/pkgs/tools/misc/pspg/default.nix index a2048132e078..1ec6864fe6c8 100644 --- a/pkgs/tools/misc/pspg/default.nix +++ b/pkgs/tools/misc/pspg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gnugrep, ncurses, pkgconfig, readline, postgresql }: +{ lib, stdenv, fetchFromGitHub, gnugrep, ncurses, pkgconfig, readline, postgresql }: stdenv.mkDerivation rec { pname = "pspg"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=${placeholder "out"}" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/okbob/pspg"; description = "Postgres Pager"; license = licenses.bsd2; diff --git a/pkgs/tools/misc/psw/default.nix b/pkgs/tools/misc/psw/default.nix new file mode 100644 index 000000000000..562810313019 --- /dev/null +++ b/pkgs/tools/misc/psw/default.nix @@ -0,0 +1,26 @@ +{ lib +, fetchFromGitHub +, rustPlatform +}: + +rustPlatform.buildRustPackage rec { + pname = "psw"; + version = "0.1.2"; + + src = fetchFromGitHub { + owner = "Wulfsta"; + repo = pname; + rev = version; + sha256 = "10raj4899i01f5v13w0wxdnjjicql2wjblkq1zcagrfv3ly3d0fy"; + }; + + cargoSha256 = "1w18rym0xnjk7vhrb2dc4cvhg659zbq5d2153gw2snxcbs7gh7r1"; + + meta = with lib; { + description = "A command line tool to write random bytes to stdout"; + homepage = "https://github.com/Wulfsta/psw"; + license = with licenses; [ asl20 /* or */ mit ]; + maintainers = with maintainers; [ wulfsta ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/misc/pubs/default.nix b/pkgs/tools/misc/pubs/default.nix index 158b56e2a5d9..24367189ff07 100644 --- a/pkgs/tools/misc/pubs/default.nix +++ b/pkgs/tools/misc/pubs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, python3Packages }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, python3Packages }: python3Packages.buildPythonApplication rec { pname = "pubs"; @@ -25,7 +25,7 @@ python3Packages.buildPythonApplication rec { rm tests/test_git.py ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Command-line bibliography manager"; homepage = "https://github.com/pubs/pubs"; license = licenses.lgpl3; diff --git a/pkgs/tools/misc/rargs/default.nix b/pkgs/tools/misc/rargs/default.nix index 6ebbeb39c6e0..c8eea974750c 100644 --- a/pkgs/tools/misc/rargs/default.nix +++ b/pkgs/tools/misc/rargs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, rustPlatform, fetchFromGitHub }: +{ lib, stdenv, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "rargs"; @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { doCheck=false; # `rargs`'s test depends on the deprecated `assert_cli` crate, which in turn is not in Nixpkgs - meta = with stdenv.lib; { + meta = with lib; { description = "xargs + awk with pattern matching support"; homepage = "https://github.com/lolabout/rargs"; license = with licenses; [ mit ]; diff --git a/pkgs/tools/misc/rcm/default.nix b/pkgs/tools/misc/rcm/default.nix index 570b55c9acf3..dc166f3d0b4d 100644 --- a/pkgs/tools/misc/rcm/default.nix +++ b/pkgs/tools/misc/rcm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "rcm"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Management Suite for Dotfiles"; homepage = "https://github.com/thoughtbot/rcm"; license = licenses.bsd3; diff --git a/pkgs/tools/misc/recoverjpeg/default.nix b/pkgs/tools/misc/recoverjpeg/default.nix index bf75213acdf6..c71bd42c94c0 100644 --- a/pkgs/tools/misc/recoverjpeg/default.nix +++ b/pkgs/tools/misc/recoverjpeg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, python2, exif, imagemagick }: +{ lib, stdenv, fetchurl, makeWrapper, python2, exif, imagemagick }: stdenv.mkDerivation rec { pname = "recoverjpeg"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { --prefix PATH : ${stdenv.lib.makeBinPath [ exif imagemagick ]} ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://rfc1149.net/devel/recoverjpeg.html"; description = "Recover lost JPEGs and MOV files on a bogus memory card or disk"; license = licenses.gpl2; diff --git a/pkgs/tools/misc/rename/default.nix b/pkgs/tools/misc/rename/default.nix index e32b016016bd..63ceca8d9349 100644 --- a/pkgs/tools/misc/rename/default.nix +++ b/pkgs/tools/misc/rename/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, perlPackages }: +{ lib, stdenv, fetchFromGitHub, perlPackages }: perlPackages.buildPerlPackage { pname = "rename"; @@ -10,7 +10,7 @@ perlPackages.buildPerlPackage { rev = "d46f1d0ced25dc5849acb5d5974a3e2e9d97d536"; sha256 = "0qahs1cqfaci2hdf1xncrz4k0z5skkfr43apnm3kybs7za33apzw"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Rename files according to a Perl rewrite expression"; homepage = "https://github.com/pstray/rename"; maintainers = with maintainers; [ mkg ]; diff --git a/pkgs/tools/misc/reredirect/default.nix b/pkgs/tools/misc/reredirect/default.nix index 15045d4bd8ad..eb1c90324e01 100644 --- a/pkgs/tools/misc/reredirect/default.nix +++ b/pkgs/tools/misc/reredirect/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "reredirect"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { --replace "reredirect" "${placeholder "out"}/bin/reredirect" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Tool to dynamicly redirect outputs of a running process"; homepage = "https://github.com/jerome-pouiller/reredirect"; license = licenses.mit; diff --git a/pkgs/tools/misc/riemann-c-client/default.nix b/pkgs/tools/misc/riemann-c-client/default.nix index 48e0f7757aeb..ca8fe489c16b 100644 --- a/pkgs/tools/misc/riemann-c-client/default.nix +++ b/pkgs/tools/misc/riemann-c-client/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, file , protobufc }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, file , protobufc }: stdenv.mkDerivation rec { name = "riemann-c-client-1.10.4"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { make lib/riemann/proto/riemann.pb-c.h ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/algernon/riemann-c-client"; description = "A C client library for the Riemann monitoring system"; license = licenses.gpl3; diff --git a/pkgs/tools/misc/rkflashtool/default.nix b/pkgs/tools/misc/rkflashtool/default.nix index 94d6ca95748f..b96d9be8a4dd 100644 --- a/pkgs/tools/misc/rkflashtool/default.nix +++ b/pkgs/tools/misc/rkflashtool/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libusb1 }: +{ lib, stdenv, fetchurl, libusb1 }: stdenv.mkDerivation rec { name = "rkflashtool-5.1"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { cp rkunpack rkcrc rkflashtool rkparameters rkparametersblock rkunsign rkmisc $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://sourceforge.net/projects/rkflashtool/"; description = "Tools for flashing Rockchip devices"; platforms = platforms.linux; diff --git a/pkgs/tools/misc/rockbox-utility/default.nix b/pkgs/tools/misc/rockbox-utility/default.nix index 6be32e214784..1a13a1d2ed9f 100644 --- a/pkgs/tools/misc/rockbox-utility/default.nix +++ b/pkgs/tools/misc/rockbox-utility/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, cryptopp +{ lib, stdenv, fetchurl, pkgconfig, cryptopp , libusb1, qtbase, qttools, makeWrapper , qmake, withEspeak ? false, espeak ? null , qt5 }: @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { # may clobber the files read by the parallel `make build/rcc/qrc_rbutilqt-lang.cpp`. enableParallelBuilding = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Open source firmware for mp3 players"; homepage = "https://www.rockbox.org"; license = licenses.gpl2; diff --git a/pkgs/tools/misc/roundup/default.nix b/pkgs/tools/misc/roundup/default.nix index 8d0c62889f99..fd2272e6cd56 100644 --- a/pkgs/tools/misc/roundup/default.nix +++ b/pkgs/tools/misc/roundup/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ronn, shocco }: +{ lib, stdenv, fetchFromGitHub, ronn, shocco }: stdenv.mkDerivation rec { pname = "roundup"; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A unit testing tool for running test plans which are written in any POSIX shell"; homepage = "http://bmizerany.github.io/roundup/"; license = licenses.mit; diff --git a/pkgs/tools/misc/routino/default.nix b/pkgs/tools/misc/routino/default.nix index 8d9487344608..d75e51d4ed83 100644 --- a/pkgs/tools/misc/routino/default.nix +++ b/pkgs/tools/misc/routino/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, perl, zlib, bzip2 }: +{ lib, stdenv, fetchurl, fetchpatch, perl, zlib, bzip2 }: stdenv.mkDerivation rec { pname = "routino"; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { makeFlags = [ "prefix=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.routino.org/"; description = "OpenStreetMap Routing Software"; license = licenses.agpl3; diff --git a/pkgs/tools/misc/rpcsvc-proto/default.nix b/pkgs/tools/misc/rpcsvc-proto/default.nix index 925dfde13a36..400a63f7dfe3 100644 --- a/pkgs/tools/misc/rpcsvc-proto/default.nix +++ b/pkgs/tools/misc/rpcsvc-proto/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { --replace '$(top_builddir)/rpcgen/rpcgen' '${buildPackages.rpcsvc-proto}/bin/rpcgen' ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/thkukuk/rpcsvc-proto"; description = "This package contains rpcsvc proto.x files from glibc, which are missing in libtirpc"; longDescription = '' diff --git a/pkgs/tools/misc/rpm-ostree/default.nix b/pkgs/tools/misc/rpm-ostree/default.nix index abca71febb93..63c0f90079b0 100644 --- a/pkgs/tools/misc/rpm-ostree/default.nix +++ b/pkgs/tools/misc/rpm-ostree/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , ostree , rpm @@ -114,7 +114,7 @@ stdenv.mkDerivation rec { env NOCONFIGURE=1 ./autogen.sh ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A hybrid image/package system. It uses OSTree as an image format, and uses RPM as a component model"; homepage = "https://coreos.github.io/rpm-ostree/"; license = licenses.lgpl2Plus; diff --git a/pkgs/tools/misc/rrdtool/default.nix b/pkgs/tools/misc/rrdtool/default.nix index 10ff6db63f15..88db9409316b 100644 --- a/pkgs/tools/misc/rrdtool/default.nix +++ b/pkgs/tools/misc/rrdtool/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, gettext, perl, pkgconfig, libxml2, pango, cairo, groff +{ fetchurl, lib, stdenv, gettext, perl, pkgconfig, libxml2, pango, cairo, groff , tcl-8_5, darwin }: stdenv.mkDerivation rec { @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { mv $out/lib/perl/5* $out/${perl.libPrefix} ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://oss.oetiker.ch/rrdtool/"; description = "High performance logging in Round Robin Databases"; license = licenses.gpl2; diff --git a/pkgs/tools/misc/rw/default.nix b/pkgs/tools/misc/rw/default.nix index b36eff12a2fc..408723f058dc 100644 --- a/pkgs/tools/misc/rw/default.nix +++ b/pkgs/tools/misc/rw/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "rw"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://sortix.org/rw"; description = "Block device and byte copying program similar to dd"; longDescription = '' diff --git a/pkgs/tools/misc/sam-ba/default.nix b/pkgs/tools/misc/sam-ba/default.nix index 67c751a57791..5d27af2050f6 100644 --- a/pkgs/tools/misc/sam-ba/default.nix +++ b/pkgs/tools/misc/sam-ba/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, libX11, libXScrnSaver, libXext, libXft, libXrender +{ lib, stdenv, fetchzip, libX11, libXScrnSaver, libXext, libXft, libXrender , freetype, zlib, fontconfig }: @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { # Do our own thing dontPatchELF = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Programming tools for Atmel SAM3/7/9 ARM-based microcontrollers"; longDescription = '' Atmel SAM-BA software provides an open set of tools for programming the diff --git a/pkgs/tools/misc/scanmem/default.nix b/pkgs/tools/misc/scanmem/default.nix index 58350f7a638d..bd6b8dbb1d14 100644 --- a/pkgs/tools/misc/scanmem/default.nix +++ b/pkgs/tools/misc/scanmem/default.nix @@ -1,4 +1,4 @@ -{ stdenv, autoconf, automake, intltool, libtool, fetchFromGitHub, readline }: +{ lib, stdenv, autoconf, automake, intltool, libtool, fetchFromGitHub, readline }: stdenv.mkDerivation rec { version = "0.17"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { preConfigure = '' ./autogen.sh ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/scanmem/scanmem"; description = "Memory scanner for finding and poking addresses in executing processes"; maintainers = [ maintainers.chattered ]; diff --git a/pkgs/tools/misc/screen/default.nix b/pkgs/tools/misc/screen/default.nix index 9bc219289c44..aef209022ff0 100644 --- a/pkgs/tools/misc/screen/default.nix +++ b/pkgs/tools/misc/screen/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, ncurses, utmp, pam ? null }: +{ lib, stdenv, fetchurl, fetchpatch, ncurses, utmp, pam ? null }: stdenv.mkDerivation rec { pname = "screen"; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.gnu.org/software/screen/"; description = "A window manager that multiplexes a physical terminal"; license = licenses.gpl2Plus; diff --git a/pkgs/tools/misc/sd-mux-ctrl/default.nix b/pkgs/tools/misc/sd-mux-ctrl/default.nix index b87a83fcdf94..487307d3224e 100644 --- a/pkgs/tools/misc/sd-mux-ctrl/default.nix +++ b/pkgs/tools/misc/sd-mux-ctrl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, cmake, pkgconfig, libftdi1, popt}: +{ lib, stdenv, fetchgit, cmake, pkgconfig, libftdi1, popt}: stdenv.mkDerivation rec { pname = "sd-mux-ctrl-unstable"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { install -D -m 644 ../doc/man/sd-mux-ctrl.1 $out/share/man/man1/sd-mux-ctrl.1 ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Tool for controlling multiple sd-mux devices"; homepage = "https://wiki.tizen.org/SD_MUX"; license = licenses.asl20; diff --git a/pkgs/tools/misc/sdl-jstest/default.nix b/pkgs/tools/misc/sdl-jstest/default.nix index bb1bf6b0a377..c299a140b079 100644 --- a/pkgs/tools/misc/sdl-jstest/default.nix +++ b/pkgs/tools/misc/sdl-jstest/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, cmake, pkgconfig, SDL, SDL2, ncurses, docbook_xsl, git }: +{ lib, stdenv, fetchgit, cmake, pkg-config, SDL, SDL2, ncurses, docbook_xsl, git }: stdenv.mkDerivation { pname = "sdl-jstest"; @@ -12,9 +12,9 @@ stdenv.mkDerivation { }; buildInputs = [ SDL SDL2 ncurses ]; - nativeBuildInputs = [ cmake pkgconfig docbook_xsl git ]; - - meta = with stdenv.lib; { + nativeBuildInputs = [ cmake pkg-config docbook_xsl git ]; + + meta = with lib; { homepage = "https://github.com/Grumbel/sdl-jstest"; description = "Simple SDL joystick test application for the console"; license = licenses.gpl3; diff --git a/pkgs/tools/misc/shadowenv/default.nix b/pkgs/tools/misc/shadowenv/default.nix index 9becd52273e6..b3ab2002ca64 100644 --- a/pkgs/tools/misc/shadowenv/default.nix +++ b/pkgs/tools/misc/shadowenv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform, installShellFiles, Security }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, installShellFiles, Security }: rustPlatform.buildRustPackage rec { pname = "shadowenv"; @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { installShellCompletion --zsh sh/completions/_shadowenv ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://shopify.github.io/shadowenv/"; description = "reversible directory-local environment variable manipulations"; license = licenses.mit; diff --git a/pkgs/tools/misc/shelldap/default.nix b/pkgs/tools/misc/shelldap/default.nix index bfa8ea16ed36..41e4207d6c98 100644 --- a/pkgs/tools/misc/shelldap/default.nix +++ b/pkgs/tools/misc/shelldap/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perlPackages }: +{ lib, stdenv, fetchurl, perlPackages }: perlPackages.buildPerlPackage rec { pname = "shelldap"; version = "1.4.0"; @@ -16,7 +16,7 @@ perlPackages.buildPerlPackage rec { runHook preInstall ''; outputs = [ "out" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://bitbucket.org/mahlon/shelldap/"; description = "A handy shell-like interface for browsing LDAP servers and editing their content"; license = with licenses; [ bsd3 ]; diff --git a/pkgs/tools/misc/shunit2/default.nix b/pkgs/tools/misc/shunit2/default.nix index e08a5b576d3f..1895acacac27 100644 --- a/pkgs/tools/misc/shunit2/default.nix +++ b/pkgs/tools/misc/shunit2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation { pname = "shunit2"; @@ -22,7 +22,7 @@ stdenv.mkDerivation { $out/bin/shunit2 ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/kward/shunit2"; description = "A xUnit based unit test framework for Bourne based shell scripts"; maintainers = with maintainers; [ cdepillabout utdemir ]; diff --git a/pkgs/tools/misc/skim/default.nix b/pkgs/tools/misc/skim/default.nix index 996e6b4490e1..3a49876a8600 100644 --- a/pkgs/tools/misc/skim/default.nix +++ b/pkgs/tools/misc/skim/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchCrate, rustPlatform }: +{ lib, stdenv, fetchCrate, rustPlatform }: rustPlatform.buildRustPackage rec { pname = "skim"; @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec { chmod +x $out/bin/sk-share ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Command-line fuzzy finder written in Rust"; homepage = "https://github.com/lotabout/skim"; license = licenses.mit; diff --git a/pkgs/tools/misc/sl/default.nix b/pkgs/tools/misc/sl/default.nix index 902617665d88..dc55a8e783b9 100644 --- a/pkgs/tools/misc/sl/default.nix +++ b/pkgs/tools/misc/sl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ncurses }: +{ lib, stdenv, fetchFromGitHub, ncurses }: stdenv.mkDerivation rec { pname = "sl"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Steam Locomotive runs across your terminal when you type 'sl'"; homepage = "http://www.tkl.iis.u-tokyo.ac.jp/~toyoda/index_e.html"; license = rec { diff --git a/pkgs/tools/misc/slop/default.nix b/pkgs/tools/misc/slop/default.nix index 36f40dca6cb1..32d55a3733ce 100644 --- a/pkgs/tools/misc/slop/default.nix +++ b/pkgs/tools/misc/slop/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig +{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig , glew, glm, libGLU, libGL, libX11, libXext, libXrender, icu , cppcheck }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { inherit (src.meta) homepage; description = "Queries a selection from the user and prints to stdout"; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/misc/slurp/default.nix b/pkgs/tools/misc/slurp/default.nix index 32263bad4a1d..190f637936de 100644 --- a/pkgs/tools/misc/slurp/default.nix +++ b/pkgs/tools/misc/slurp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, meson, ninja, pkg-config +{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config , cairo, libxkbcommon, wayland, wayland-protocols , buildDocs ? true, scdoc }: @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { mesonFlags = stdenv.lib.optional buildDocs "-Dman-pages=enabled"; - meta = with stdenv.lib; { + meta = with lib; { description = "Select a region in a Wayland compositor"; homepage = "https://github.com/emersion/slurp"; license = licenses.mit; diff --git a/pkgs/tools/misc/smc/default.nix b/pkgs/tools/misc/smc/default.nix index 87bda5d78b43..5b0342621e80 100644 --- a/pkgs/tools/misc/smc/default.nix +++ b/pkgs/tools/misc/smc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jre, runtimeShell }: +{ lib, stdenv, fetchurl, jre, runtimeShell }: stdenv.mkDerivation { name = "smc-6.6.3"; @@ -28,7 +28,7 @@ stdenv.mkDerivation { chmod a+x "$out/bin/smc" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Generate state machine code from text input (state diagram)"; longDescription = '' SMC (State Machine Compiler) takes a text input file describing states, diff --git a/pkgs/tools/misc/smenu/default.nix b/pkgs/tools/misc/smenu/default.nix index 362c4f6c9145..5da7f19b0609 100644 --- a/pkgs/tools/misc/smenu/default.nix +++ b/pkgs/tools/misc/smenu/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ncurses }: +{ lib, stdenv, fetchFromGitHub, ncurses }: stdenv.mkDerivation rec { version = "0.9.16"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/p-gen/smenu"; description = "Terminal selection utility"; longDescription = '' diff --git a/pkgs/tools/misc/snapper/default.nix b/pkgs/tools/misc/snapper/default.nix index 177580c099b6..c249419d589c 100644 --- a/pkgs/tools/misc/snapper/default.nix +++ b/pkgs/tools/misc/snapper/default.nix @@ -1,17 +1,18 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , autoreconfHook, pkgconfig, docbook_xsl, libxslt, docbook_xml_dtd_45 , acl, attr, boost, btrfs-progs, dbus, diffutils, e2fsprogs, libxml2 -, lvm2, pam, python, util-linux, fetchpatch, json_c, nixosTests }: +, lvm2, pam, python, util-linux, fetchpatch, json_c, nixosTests +, ncurses }: stdenv.mkDerivation rec { pname = "snapper"; - version = "0.8.14"; + version = "0.8.15"; src = fetchFromGitHub { owner = "openSUSE"; repo = "snapper"; rev = "v${version}"; - sha256 = "1q687bjwy668klxnhsrc2rlhisa59j8bhmh1jw220rq7z0hm2khr"; + sha256 = "1rqv1qfxr02qbkix1mpx91s4827irxryxkhby3ii0fdkm3ympsas"; }; nativeBuildInputs = [ @@ -20,7 +21,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ acl attr boost btrfs-progs dbus diffutils e2fsprogs libxml2 - lvm2 pam python util-linux json_c + lvm2 pam python util-linux json_c ncurses ]; passthru.tests.snapper = nixosTests.snapper; @@ -65,7 +66,7 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Tool for Linux filesystem snapshot management"; homepage = "http://snapper.io"; license = licenses.gpl2; diff --git a/pkgs/tools/misc/snore/default.nix b/pkgs/tools/misc/snore/default.nix index f6f177811b02..5efeafcd26f6 100644 --- a/pkgs/tools/misc/snore/default.nix +++ b/pkgs/tools/misc/snore/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { version = "0.1"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=${placeholder "out"}" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "sleep with feedback"; homepage = "https://github.com/clamiax/snore"; license = licenses.mit; diff --git a/pkgs/tools/misc/somafm-cli/default.nix b/pkgs/tools/misc/somafm-cli/default.nix index 3ce3f62a9e2b..b0aebd6224ed 100644 --- a/pkgs/tools/misc/somafm-cli/default.nix +++ b/pkgs/tools/misc/somafm-cli/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , makeWrapper , curl @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/somafm --prefix PATH ":" "${stdenv.lib.makeBinPath [ curl jq mpv ]}"; ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Listen to SomaFM in your terminal via pure bash"; homepage = "https://github.com/rockymadden/somafm-cli"; license = licenses.mit; diff --git a/pkgs/tools/misc/starship/default.nix b/pkgs/tools/misc/starship/default.nix index 7e318b45a1f2..50d99db5322c 100644 --- a/pkgs/tools/misc/starship/default.nix +++ b/pkgs/tools/misc/starship/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , rustPlatform , pkg-config @@ -10,13 +10,13 @@ rustPlatform.buildRustPackage rec { pname = "starship"; - version = "0.47.0"; + version = "0.48.0"; src = fetchFromGitHub { owner = "starship"; repo = pname; rev = "v${version}"; - sha256 = "0vdfdwsaqrah0hgvr62qsww7s5znb1rg5kk068qpf06lmyc4gd8w"; + sha256 = "1p37cfkcpqv74gp7g099alkqxanfc002kaq1cim6zkinx50gxjxw"; }; nativeBuildInputs = [ installShellFiles ] ++ stdenv.lib.optionals stdenv.isLinux [ pkg-config ]; @@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec { done ''; - cargoSha256 = "01brsckfa2zy1aqs9vjwrn4w416i8b621bvkhicanz9q56xlnd77"; + cargoSha256 = "02djpwvwrrp7f0ifiypx1cr1v4bkqxrhqfhy0abfjszza95fjasv"; checkFlags = [ "--skip=directory_in_home" @@ -44,7 +44,7 @@ rustPlatform.buildRustPackage rec { "--skip=shows_pinned_in_project_below_root_with_global_json" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A minimal, blazing fast, and extremely customizable prompt for any shell"; homepage = "https://starship.rs"; license = licenses.isc; diff --git a/pkgs/tools/misc/staruml/default.nix b/pkgs/tools/misc/staruml/default.nix index d0266cf30e28..b6a78f85a35d 100644 --- a/pkgs/tools/misc/staruml/default.nix +++ b/pkgs/tools/misc/staruml/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A sophisticated software modeler"; homepage = "https://staruml.io/"; license = licenses.unfree; diff --git a/pkgs/tools/misc/statserial/default.nix b/pkgs/tools/misc/statserial/default.nix index 448323f43461..1ca0771914b2 100644 --- a/pkgs/tools/misc/statserial/default.nix +++ b/pkgs/tools/misc/statserial/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, glibc }: +{ lib, stdenv, fetchurl, ncurses, glibc }: stdenv.mkDerivation rec { pname = "statserial"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { cp statserial.1 $out/share/man/man1 ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://sites.google.com/site/tranter/software"; description = "Display serial port modem status lines"; license = licenses.gpl2; diff --git a/pkgs/tools/misc/subberthehut/default.nix b/pkgs/tools/misc/subberthehut/default.nix index e4fa57e30ac5..86b2941eed1b 100644 --- a/pkgs/tools/misc/subberthehut/default.nix +++ b/pkgs/tools/misc/subberthehut/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, xmlrpc_c, glib, zlib }: +{ lib, stdenv, fetchFromGitHub, pkgconfig, xmlrpc_c, glib, zlib }: stdenv.mkDerivation rec { pname = "subberthehut"; version = "20"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { install -Dm644 bash_completion $out/share/bash-completion/completions/subberthehut ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/mus65/subberthehut"; description = "An OpenSubtitles.org downloader"; license = licenses.gpl2; diff --git a/pkgs/tools/misc/svtplay-dl/default.nix b/pkgs/tools/misc/svtplay-dl/default.nix index d06bb8b134db..ae8679c03ad5 100644 --- a/pkgs/tools/misc/svtplay-dl/default.nix +++ b/pkgs/tools/misc/svtplay-dl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, makeWrapper, python3Packages, perl, zip +{ lib, stdenv, fetchFromGitHub, makeWrapper, python3Packages, perl, zip , gitMinimal, ffmpeg }: let @@ -42,7 +42,7 @@ in stdenv.mkDerivation rec { sh scripts/run-tests.sh -2 ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/spaam/svtplay-dl"; description = "Command-line tool to download videos from svtplay.se and other sites"; license = licenses.mit; diff --git a/pkgs/tools/misc/swaglyrics/default.nix b/pkgs/tools/misc/swaglyrics/default.nix index 048dac85fdb2..6831a05a3edc 100644 --- a/pkgs/tools/misc/swaglyrics/default.nix +++ b/pkgs/tools/misc/swaglyrics/default.nix @@ -35,7 +35,7 @@ python3.pkgs.buildPythonApplication rec { [ blinker swspotify pytestCheckHook flask mock flask_testing ] ++ [ ncurses ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Lyrics fetcher for currently playing Spotify song"; homepage = "https://github.com/SwagLyrics/SwagLyrics-For-Spotify"; license = licenses.mit; diff --git a/pkgs/tools/misc/sweep-visualizer/default.nix b/pkgs/tools/misc/sweep-visualizer/default.nix index fdd3c5f628d0..12168bd07f06 100644 --- a/pkgs/tools/misc/sweep-visualizer/default.nix +++ b/pkgs/tools/misc/sweep-visualizer/default.nix @@ -49,7 +49,7 @@ wrapProgram "$out/bin/sweep_visualizer" --prefix LD_LIBRARY_PATH : ${runtimeLibs} ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://support.scanse.io/hc/en-us/articles/115006008948-Visualizer-Overview"; description = "A minimal desktop application for interfacing with the Sweep device"; license = licenses.unfree; diff --git a/pkgs/tools/misc/systrayhelper/default.nix b/pkgs/tools/misc/systrayhelper/default.nix index aae69d8ad394..d7d699d2ba4a 100644 --- a/pkgs/tools/misc/systrayhelper/default.nix +++ b/pkgs/tools/misc/systrayhelper/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgconfig, libappindicator-gtk3, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, pkgconfig, libappindicator-gtk3, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "systrayhelper"; @@ -27,7 +27,7 @@ buildGoPackage rec { nativeBuildInputs = [ pkgconfig libappindicator-gtk3 ]; buildInputs = [ libappindicator-gtk3 ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A systray utility written in go, using json over stdio for control and events"; homepage = "https://github.com/ssbc/systrayhelper"; maintainers = with maintainers; [ cryptix ]; diff --git a/pkgs/tools/misc/t1utils/default.nix b/pkgs/tools/misc/t1utils/default.nix index fd4ca5f92d53..690fbe8abcb3 100644 --- a/pkgs/tools/misc/t1utils/default.nix +++ b/pkgs/tools/misc/t1utils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "t1utils-1.41"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "09rlc837dr69hyiiicha3il37mchsvz84qw8hnvb60lrh9zdsppw"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Collection of simple Type 1 font manipulation programs"; longDescription = '' t1utils is a collection of simple type-1 font manipulation programs. diff --git a/pkgs/tools/misc/tab-rs/default.nix b/pkgs/tools/misc/tab-rs/default.nix new file mode 100644 index 000000000000..b3d2e1a77a71 --- /dev/null +++ b/pkgs/tools/misc/tab-rs/default.nix @@ -0,0 +1,27 @@ +{ lib, stdenv, fetchFromGitHub, rustPlatform, IOKit }: + +rustPlatform.buildRustPackage rec { + pname = "tab-rs"; + version = "0.5.5"; + + src = fetchFromGitHub { + owner = "austinjones"; + repo = pname; + rev = "v${version}"; + sha256 = "06nip7g5y7jslqj8anvn2z7w1c8yr0gl32bpnzv26xschan4gc2h"; + }; + + cargoSha256 = "1clpl9fi07lms0din8f9m4y6br5jg8k5xsklsqmvgdwf83wyn321"; + + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ IOKit ]; + + # many tests are failing + doCheck = false; + + meta = with lib; { + description = "Intuitive, config-driven terminal multiplexer designed for software & systems engineers"; + homepage = "https://github.com/austinjones/tab-rs"; + license = licenses.mit; + maintainers = with maintainers; [ bbigras ]; + }; +} diff --git a/pkgs/tools/misc/tealdeer/default.nix b/pkgs/tools/misc/tealdeer/default.nix index 4f0677846eaf..358c32295638 100644 --- a/pkgs/tools/misc/tealdeer/default.nix +++ b/pkgs/tools/misc/tealdeer/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , rustPlatform , fetchFromGitHub , pkg-config @@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec { # and i can't disable just this one doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "A very fast implementation of tldr in Rust"; homepage = "https://github.com/dbrgn/tealdeer"; maintainers = with maintainers; [ davidak ]; diff --git a/pkgs/tools/misc/teleconsole/default.nix b/pkgs/tools/misc/teleconsole/default.nix index 47a792a3f92b..63277c90d47a 100644 --- a/pkgs/tools/misc/teleconsole/default.nix +++ b/pkgs/tools/misc/teleconsole/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "teleconsole"; @@ -27,7 +27,7 @@ buildGoPackage rec { CGO_ENABLED = 1; buildFlags = [ "-ldflags" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.teleconsole.com/"; description = "Share your terminal session with people you trust"; license = licenses.asl20; diff --git a/pkgs/tools/misc/tensorman/default.nix b/pkgs/tools/misc/tensorman/default.nix index 85091a41b126..835409be6576 100644 --- a/pkgs/tools/misc/tensorman/default.nix +++ b/pkgs/tools/misc/tensorman/default.nix @@ -1,4 +1,4 @@ -{ pkgconfig, stdenv, rustPlatform, rustc, cargo, docker, openssl, fetchFromGitHub }: +{ pkgconfig, lib, stdenv, rustPlatform, rustc, cargo, docker, openssl, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "tensorman"; @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ]; cargoSha256 = "0vckay4jhg02xg68mvh7ys0yjj0p30m6wsjriqc8k24wjsrhiw9k"; - meta = with stdenv.lib; { + meta = with lib; { description = "Utility for easy management of Tensorflow containers"; homepage = "https://github.com/pop-os/tensorman/"; license = stdenv.lib.licenses.gpl3; diff --git a/pkgs/tools/misc/texi2mdoc/default.nix b/pkgs/tools/misc/texi2mdoc/default.nix index 6c090c0b4b36..2b73c4f34dbb 100644 --- a/pkgs/tools/misc/texi2mdoc/default.nix +++ b/pkgs/tools/misc/texi2mdoc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "texi2mdoc"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://mdocml.bsd.lv/"; description = "converter from Texinfo into mdoc"; license = licenses.isc; diff --git a/pkgs/tools/misc/thefuck/default.nix b/pkgs/tools/misc/thefuck/default.nix index d923a3f44918..bf87505ab135 100644 --- a/pkgs/tools/misc/thefuck/default.nix +++ b/pkgs/tools/misc/thefuck/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildPythonApplication +{ lib, stdenv, fetchFromGitHub, buildPythonApplication , colorama, decorator, psutil, pyte, six , pytest, pytest-mock }: @@ -28,7 +28,7 @@ buildPythonApplication rec { doCheck = false; # The above is only enough for tests to pass outside the sandbox. - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/nvbn/thefuck"; description = "Magnificent app which corrects your previous console command"; license = licenses.mit; diff --git a/pkgs/tools/misc/thin-provisioning-tools/default.nix b/pkgs/tools/misc/thin-provisioning-tools/default.nix index 3eccb4883618..794e0d4e2578 100644 --- a/pkgs/tools/misc/thin-provisioning-tools/default.nix +++ b/pkgs/tools/misc/thin-provisioning-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, expat, libaio, boost, binutils }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, expat, libaio, boost, binutils }: stdenv.mkDerivation rec { pname = "thin-provisioning-tools"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/jthornber/thin-provisioning-tools/"; description = "A suite of tools for manipulating the metadata of the dm-thin device-mapper target"; license = licenses.gpl3; diff --git a/pkgs/tools/misc/timidity/default.nix b/pkgs/tools/misc/timidity/default.nix index f33520aee0a8..c6c4886a3b4a 100644 --- a/pkgs/tools/misc/timidity/default.nix +++ b/pkgs/tools/misc/timidity/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, libjack2, ncurses, pkgconfig }: +{ lib, stdenv, fetchurl, alsaLib, libjack2, ncurses, pkgconfig }: stdenv.mkDerivation { name = "timidity-2.15.0"; @@ -29,7 +29,7 @@ stdenv.mkDerivation { tar --strip-components=1 -xf $instruments -C $out/share/timidity/ ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://sourceforge.net/projects/timidity/"; license = licenses.gpl2; description = "A software MIDI renderer"; diff --git a/pkgs/tools/misc/tio/default.nix b/pkgs/tools/misc/tio/default.nix index bab0098ecaa4..a25b821c7e3d 100644 --- a/pkgs/tools/misc/tio/default.nix +++ b/pkgs/tools/misc/tio/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, autoreconfHook }: +{ lib, stdenv, fetchzip, autoreconfHook }: stdenv.mkDerivation rec { pname = "tio"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Serial console TTY"; homepage = "https://tio.github.io/"; license = licenses.gpl2Plus; diff --git a/pkgs/tools/misc/tldr/default.nix b/pkgs/tools/misc/tldr/default.nix index 66d763fd304e..e4f43b5007cf 100644 --- a/pkgs/tools/misc/tldr/default.nix +++ b/pkgs/tools/misc/tldr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, curl, libzip, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, curl, libzip, pkgconfig }: stdenv.mkDerivation rec { pname = "tldr"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { installFlags = [ "PREFIX=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Simplified and community-driven man pages"; longDescription = '' tldr pages gives common use cases for commands, so you don't need to hunt diff --git a/pkgs/tools/misc/tmate/default.nix b/pkgs/tools/misc/tmate/default.nix index 3a125fcdbf7c..5f1b8d236460 100644 --- a/pkgs/tools/misc/tmate/default.nix +++ b/pkgs/tools/misc/tmate/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, cmake, libtool, pkgconfig +{ lib, stdenv, fetchFromGitHub, autoreconfHook, cmake, libtool, pkgconfig , zlib, openssl, libevent, ncurses, ruby, msgpack, libssh }: stdenv.mkDerivation rec { @@ -16,9 +16,8 @@ stdenv.mkDerivation rec { buildInputs = [ libtool zlib openssl libevent ncurses ruby msgpack libssh ]; nativeBuildInputs = [ autoreconfHook cmake pkgconfig ]; - enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://tmate.io/"; description = "Instant Terminal Sharing"; license = licenses.mit; diff --git a/pkgs/tools/misc/tmpwatch/default.nix b/pkgs/tools/misc/tmpwatch/default.nix index ac20cab2842e..1ef486fa8556 100644 --- a/pkgs/tools/misc/tmpwatch/default.nix +++ b/pkgs/tools/misc/tmpwatch/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, psmisc }: +{ lib, stdenv, fetchurl, psmisc }: stdenv.mkDerivation { name = "tmpwatch-2.11"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { configureFlags = [ "--with-fuser=${psmisc}/bin/fuser" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://fedorahosted.org/tmpwatch/"; description = "Recursively searches through specified directories and removes files which have not been accessed in a specified period of time"; license = licenses.gpl2; diff --git a/pkgs/tools/misc/tmux-xpanes/default.nix b/pkgs/tools/misc/tmux-xpanes/default.nix index 6e41eba73590..37a60e714df0 100644 --- a/pkgs/tools/misc/tmux-xpanes/default.nix +++ b/pkgs/tools/misc/tmux-xpanes/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, openssl, perl }: +{ lib, stdenv, fetchFromGitHub, openssl, perl }: stdenv.mkDerivation rec { pname = "tmux-xpanes"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { install -m 644 man/*.1 $out/share/man/man1/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "tmux-based terminal divider"; homepage = "https://github.com/greymd/tmux-xpanes"; license = licenses.mit; diff --git a/pkgs/tools/misc/tmuxp/default.nix b/pkgs/tools/misc/tmuxp/default.nix index cc910c8b41c1..940ae130c846 100644 --- a/pkgs/tools/misc/tmuxp/default.nix +++ b/pkgs/tools/misc/tmuxp/default.nix @@ -1,14 +1,14 @@ -{ stdenv, python }: +{ lib, stdenv, python }: with python.pkgs; buildPythonApplication rec { pname = "tmuxp"; - version = "1.6.3"; + version = "1.7.0"; src = fetchPypi { inherit pname version; - sha256 = "4bc52d6683235307c92ddbb164c84e3e892ee2d00afa16ed89eca0fa7f85029e"; + sha256 = "e5135d07a8944170e39ea8b96b09123c54648cca94537b4953d8f15e5a537da2"; }; postPatch = '' @@ -27,7 +27,7 @@ buildPythonApplication rec { click colorama kaptan libtmux ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Manage tmux workspaces from JSON and YAML"; homepage = "https://tmuxp.git-pull.com/"; license = licenses.bsd3; diff --git a/pkgs/tools/misc/togglesg-download/default.nix b/pkgs/tools/misc/togglesg-download/default.nix index 4afa1781ac0e..c4d8b20ffdd6 100644 --- a/pkgs/tools/misc/togglesg-download/default.nix +++ b/pkgs/tools/misc/togglesg-download/default.nix @@ -31,7 +31,7 @@ pythonPackages.buildPythonApplication { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/0x776b7364/toggle.sg-download"; description = "Command-line tool to download videos from toggle.sg written in Python"; longDescription = '' diff --git a/pkgs/tools/misc/toilet/default.nix b/pkgs/tools/misc/toilet/default.nix index c598b37897c7..3dba479f0390 100644 --- a/pkgs/tools/misc/toilet/default.nix +++ b/pkgs/tools/misc/toilet/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libcaca }: +{ lib, stdenv, fetchurl, pkgconfig, libcaca }: stdenv.mkDerivation rec { pname = "toilet"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libcaca ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Display large colourful characters in text mode"; homepage = "http://caca.zoy.org/wiki/toilet"; license = licenses.wtfpl; diff --git a/pkgs/tools/misc/toybox/default.nix b/pkgs/tools/misc/toybox/default.nix index e7a08877e90f..25db7e668678 100644 --- a/pkgs/tools/misc/toybox/default.nix +++ b/pkgs/tools/misc/toybox/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub, which, buildPackages, - enableStatic ? false, + enableStatic ? stdenv.hostPlatform.isStatic, enableMinimal ? false, extraConfig ? "" }: @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-Wno-error"; - meta = with stdenv.lib; { + meta = with lib; { description = "Lightweight implementation of some Unix command line utilities"; homepage = "https://landley.net/toybox/"; license = licenses.bsd0; diff --git a/pkgs/tools/misc/trash-cli/default.nix b/pkgs/tools/misc/trash-cli/default.nix index fce992acd31d..1da49a153b82 100644 --- a/pkgs/tools/misc/trash-cli/default.nix +++ b/pkgs/tools/misc/trash-cli/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchFromGitHub, python3Packages }: +{ lib, stdenv, fetchFromGitHub, python3Packages }: python3Packages.buildPythonApplication rec { pname = "trash-cli"; - version = "0.20.11.23"; + version = "0.20.12.26"; src = fetchFromGitHub { owner = "andreafrancia"; repo = "trash-cli"; rev = version; - sha256 = "1fjkmpnbpzxniypql68cpwc2rrnih8b34p8pzabrf55f49wcmcph"; + sha256 = "15iivl9xln1bw1zr2x5zvqyb6aj7mc8hfqi6dniq6xkp5m046ib7"; }; propagatedBuildInputs = [ python3Packages.psutil ]; @@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec { ]; checkPhase = "nosetests"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/andreafrancia/trash-cli"; description = "Command line tool for the desktop trash can"; maintainers = [ maintainers.rycee ]; diff --git a/pkgs/tools/misc/trillian/default.nix b/pkgs/tools/misc/trillian/default.nix new file mode 100644 index 000000000000..07b4d8349787 --- /dev/null +++ b/pkgs/tools/misc/trillian/default.nix @@ -0,0 +1,43 @@ +{ stdenv +, lib +, buildGoModule +, fetchFromGitHub +}: +let + pname = "trillian"; + version = "1.3.11"; + +in +buildGoModule { + inherit pname version; + vendorSha256 = "0zxp1gjzcc3z6vkpc2bchbs1shwm1b28ks0jh4gf6zxpp4361j4l"; + + src = fetchFromGitHub { + owner = "google"; + repo = pname; + rev = "v${version}"; + sha256 = "1lh19wba90y91l5jj8ilzjqxgmqqqdvyn7pzrwvmzv7iiy18wcmh"; + }; + + # Remove tests that require networking + postPatch = '' + rm cmd/get_tree_public_key/main_test.go + ''; + + subPackages = [ + "cmd/trillian_log_server" + "cmd/trillian_log_signer" + "cmd/trillian_map_server" + "cmd/createtree" + "cmd/deletetree" + "cmd/get_tree_public_key" + "cmd/updatetree" + ]; + + meta = { + homepage = "https://github.com/google/trillian"; + description = "A transparent, highly scalable and cryptographically verifiable data store."; + license = [ lib.licenses.asl20 ]; + maintainers = [ lib.maintainers.adisbladis ]; + }; +} diff --git a/pkgs/tools/misc/ttfautohint/default.nix b/pkgs/tools/misc/ttfautohint/default.nix index 502b829afcec..1e73f716a7ab 100644 --- a/pkgs/tools/misc/ttfautohint/default.nix +++ b/pkgs/tools/misc/ttfautohint/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "An automatic hinter for TrueType fonts"; longDescription = '' A library and two programs which take a TrueType font as the diff --git a/pkgs/tools/misc/ttwatch/default.nix b/pkgs/tools/misc/ttwatch/default.nix index 8788608876ea..acebd4f92e8e 100644 --- a/pkgs/tools/misc/ttwatch/default.nix +++ b/pkgs/tools/misc/ttwatch/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , cmake, perl, pkgconfig , openssl, curl, libusb1, protobufc , enableUnsafe ? false }: @@ -23,7 +23,7 @@ stdenv.mkDerivation { chmod +x $out/bin/ttbin2mysports ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/ryanbinns/ttwatch"; description = "Linux TomTom GPS Watch Utilities"; maintainers = with maintainers; [ dotlambda ]; diff --git a/pkgs/tools/misc/tty-clock/default.nix b/pkgs/tools/misc/tty-clock/default.nix index f6a312f04608..bc253a1d23b8 100644 --- a/pkgs/tools/misc/tty-clock/default.nix +++ b/pkgs/tools/misc/tty-clock/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ncurses, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, ncurses, pkgconfig }: stdenv.mkDerivation rec { pname = "tty-clock"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/xorg62/tty-clock"; license = licenses.free; description = "Digital clock in ncurses"; diff --git a/pkgs/tools/misc/ttygif/default.nix b/pkgs/tools/misc/ttygif/default.nix index 5a14dade01b8..045448f03020 100644 --- a/pkgs/tools/misc/ttygif/default.nix +++ b/pkgs/tools/misc/ttygif/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub, makeWrapper, imagemagick, xorg }: stdenv.mkDerivation rec { pname = "ttygif"; @@ -13,7 +13,13 @@ stdenv.mkDerivation rec { makeFlags = [ "CC:=$(CC)" "PREFIX=${placeholder "out"}" ]; - meta = with stdenv.lib; { + nativeBuildInputs = [ makeWrapper ]; + postInstall = '' + wrapProgram $out/bin/ttygif \ + --prefix PATH : ${stdenv.lib.makeBinPath [ imagemagick xorg.xwd ]} + ''; + + meta = with lib; { homepage = "https://github.com/icholy/ttygif"; description = "Convert terminal recordings to animated gifs"; platforms = platforms.unix; diff --git a/pkgs/tools/misc/ttylog/default.nix b/pkgs/tools/misc/ttylog/default.nix index 55785c7a211c..248630795cb0 100644 --- a/pkgs/tools/misc/ttylog/default.nix +++ b/pkgs/tools/misc/ttylog/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "ttylog"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://ttylog.sourceforge.net"; description = "Simple serial port logger"; longDescription = '' diff --git a/pkgs/tools/misc/ttyplot/default.nix b/pkgs/tools/misc/ttyplot/default.nix index afa4cb3e1555..7becc090a83b 100644 --- a/pkgs/tools/misc/ttyplot/default.nix +++ b/pkgs/tools/misc/ttyplot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ncurses }: +{ lib, stdenv, fetchFromGitHub, ncurses }: stdenv.mkDerivation rec { pname = "ttyplot"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { cp ttyplot $out/bin/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A simple general purpose plotting utility for tty with data input from stdin"; homepage = "https://github.com/tenox7/ttyplot"; license = licenses.unlicense; diff --git a/pkgs/tools/misc/ttyrec/clang-fixes.patch b/pkgs/tools/misc/ttyrec/clang-fixes.patch deleted file mode 100644 index 126ab44090eb..000000000000 --- a/pkgs/tools/misc/ttyrec/clang-fixes.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -ru ttyrec-1.0.8.orig/io.h ttyrec-1.0.8/io.h ---- ttyrec-1.0.8.orig/io.h 2006-06-11 17:52:50.000000000 +0200 -+++ ttyrec-1.0.8/io.h 2015-11-15 09:59:54.000000000 +0100 -@@ -9,5 +9,6 @@ - int edup (int oldfd); - int edup2 (int oldfd, int newfd); - FILE* efdopen (int fd, const char *mode); -+void set_progname (const char *name); - - #endif -diff -ru ttyrec-1.0.8.orig/ttyrec.c ttyrec-1.0.8/ttyrec.c ---- ttyrec-1.0.8.orig/ttyrec.c 2006-06-11 17:52:50.000000000 +0200 -+++ ttyrec-1.0.8/ttyrec.c 2015-11-15 09:59:41.000000000 +0100 -@@ -54,6 +54,7 @@ - #include - #include - #include -+#include - - #if defined(SVR4) - #include diff --git a/pkgs/tools/misc/ttyrec/default.nix b/pkgs/tools/misc/ttyrec/default.nix deleted file mode 100644 index 97049276a32d..000000000000 --- a/pkgs/tools/misc/ttyrec/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ stdenv, fetchurl }: - -stdenv.mkDerivation rec { - pname = "ttyrec"; - version = "1.0.8"; - - src = fetchurl { - url = "http://0xcc.net/ttyrec/${pname}-${version}.tar.gz"; - sha256 = "ef5e9bf276b65bb831f9c2554cd8784bd5b4ee65353808f82b7e2aef851587ec"; - }; - - patches = [ ./clang-fixes.patch ]; - - makeFlags = stdenv.lib.optional stdenv.buildPlatform.isLinux "CFLAGS=-DSVR4" - ++ stdenv.lib.optional stdenv.cc.isClang "CC=clang"; - - installPhase = '' - mkdir -p $out/{bin,man} - cp ttytime ttyplay ttyrec $out/bin - cp *.1 $out/man - ''; - - meta = with stdenv.lib; { - homepage = "http://0xcc.net/ttyrec/"; - description = "Terminal interaction recorder and player"; - license = licenses.bsd3; - platforms = platforms.all; - maintainers = with maintainers; [ zimbatm ]; - broken = true; # 2020-01-28 - }; -} diff --git a/pkgs/tools/misc/txr/default.nix b/pkgs/tools/misc/txr/default.nix index ce928f0a3781..9c200f1030ea 100644 --- a/pkgs/tools/misc/txr/default.nix +++ b/pkgs/tools/misc/txr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bison, flex, libffi }: +{ lib, stdenv, fetchurl, bison, flex, libffi }: stdenv.mkDerivation rec { pname = "txr"; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { EOF ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Programming language for convenient data munging"; license = licenses.bsd2; homepage = "http://nongnu.org/txr"; diff --git a/pkgs/tools/misc/txtw/default.nix b/pkgs/tools/misc/txtw/default.nix index 1cf80007901e..e8a14b57634a 100644 --- a/pkgs/tools/misc/txtw/default.nix +++ b/pkgs/tools/misc/txtw/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cairo }: +{ lib, stdenv, fetchFromGitHub, cairo }: stdenv.mkDerivation rec { version = "0.4"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { prePatch = ''sed -i "s@/usr/local@$out@" Makefile''; - meta = with stdenv.lib; { + meta = with lib; { description = "Compute text widths"; homepage = "https://github.com/baskerville/txtw"; maintainers = with maintainers; [ lihop ]; diff --git a/pkgs/tools/misc/tydra/default.nix b/pkgs/tools/misc/tydra/default.nix index c19f808397af..6714ee489f5c 100644 --- a/pkgs/tools/misc/tydra/default.nix +++ b/pkgs/tools/misc/tydra/default.nix @@ -1,4 +1,4 @@ -{ stdenv, rustPlatform, fetchFromGitHub, installShellFiles }: +{ lib, stdenv, rustPlatform, fetchFromGitHub, installShellFiles }: rustPlatform.buildRustPackage rec { pname = "tydra"; @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { installShellCompletion tydra.{bash,fish} _tydra ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Shortcut menu-based task runner, inspired by Emacs Hydra"; homepage = "https://github.com/Mange/tydra"; license = licenses.mit; diff --git a/pkgs/tools/misc/ugtrain/default.nix b/pkgs/tools/misc/ugtrain/default.nix index 0645645ae2bf..e92170ad595a 100644 --- a/pkgs/tools/misc/ugtrain/default.nix +++ b/pkgs/tools/misc/ugtrain/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , autoreconfHook , pkg-config @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config scanmem ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/ugtrain/ugtrain"; description = "The Universal Elite Game Trainer for CLI (Linux game trainer research project)"; maintainers = with maintainers; [ mtrsk ]; diff --git a/pkgs/tools/misc/uhubctl/default.nix b/pkgs/tools/misc/uhubctl/default.nix index 49da81d6094f..bd7e956bb1cb 100644 --- a/pkgs/tools/misc/uhubctl/default.nix +++ b/pkgs/tools/misc/uhubctl/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , libusb1 }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ libusb1 ]; installFlags = [ "prefix=${placeholder "out"}" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/mvp/uhubctl"; description = "Utility to control USB power per-port on smart USB hubs"; license = licenses.gpl2; diff --git a/pkgs/tools/misc/umlet/default.nix b/pkgs/tools/misc/umlet/default.nix index b0edf3e7de0a..a073417be7d2 100644 --- a/pkgs/tools/misc/umlet/default.nix +++ b/pkgs/tools/misc/umlet/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jre, unzip, runtimeShell }: +{ lib, stdenv, fetchurl, jre, unzip, runtimeShell }: stdenv.mkDerivation rec { major = "14"; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { chmod a+x "$out/bin/umlet" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Free, open-source UML tool with a simple user interface"; longDescription = '' UMLet is a free, open-source UML tool with a simple user interface: diff --git a/pkgs/tools/misc/unclutter-xfixes/default.nix b/pkgs/tools/misc/unclutter-xfixes/default.nix index 7d2e5e0c367d..612ace92f5bc 100644 --- a/pkgs/tools/misc/unclutter-xfixes/default.nix +++ b/pkgs/tools/misc/unclutter-xfixes/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, +{ lib, stdenv, fetchFromGitHub, xlibsWrapper, libev, libXi, libXfixes, pkgconfig, asciidoc, libxslt, docbook_xsl }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { installFlags = [ "PREFIX=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Rewrite of unclutter using the X11 Xfixes extension"; platforms = platforms.unix; license = stdenv.lib.licenses.mit; diff --git a/pkgs/tools/misc/unclutter/default.nix b/pkgs/tools/misc/unclutter/default.nix index ef8e865e91f3..a7470fae6894 100644 --- a/pkgs/tools/misc/unclutter/default.nix +++ b/pkgs/tools/misc/unclutter/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, xlibsWrapper}: +{lib, stdenv, fetchurl, xlibsWrapper}: stdenv.mkDerivation { name = "unclutter-8"; @@ -18,7 +18,7 @@ stdenv.mkDerivation { make DESTDIR="$out" MANPATH="$out/share/man" PREFIX="" install.man ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Hides mouse pointer while not in use"; longDescription = '' Unclutter hides your X mouse cursor when you do not need it, to prevent diff --git a/pkgs/tools/misc/unicode/default.nix b/pkgs/tools/misc/unicode/default.nix index b83dd17d0bc1..c8e1a0f7ca4b 100644 --- a/pkgs/tools/misc/unicode/default.nix +++ b/pkgs/tools/misc/unicode/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchurl, python3Packages, installShellFiles }: +{ lib, stdenv, fetchFromGitHub, fetchurl, python3Packages, installShellFiles }: python3Packages.buildPythonApplication rec { pname = "unicode"; @@ -27,7 +27,7 @@ python3Packages.buildPythonApplication rec { installManPage paracode.1 unicode.1 ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Display unicode character properties"; homepage = "https://github.com/garabik/unicode"; license = licenses.gpl3; diff --git a/pkgs/tools/misc/units/default.nix b/pkgs/tools/misc/units/default.nix index d62f10daeea6..2b40e289cadd 100644 --- a/pkgs/tools/misc/units/default.nix +++ b/pkgs/tools/misc/units/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Unit conversion tool"; homepage = "https://www.gnu.org/software/units/"; license = [ licenses.gpl3Plus ]; diff --git a/pkgs/tools/misc/urn-timer/default.nix b/pkgs/tools/misc/urn-timer/default.nix new file mode 100644 index 000000000000..a6871526f181 --- /dev/null +++ b/pkgs/tools/misc/urn-timer/default.nix @@ -0,0 +1,66 @@ +{ stdenv +, fetchFromGitHub +, fetchpatch +, unstableGitUpdater +, xxd +, pkg-config +, imagemagick +, wrapGAppsHook +, gtk3 +, jansson +}: + +stdenv.mkDerivation { + pname = "urn-timer"; + version = "unstable-2017-08-20"; + + src = fetchFromGitHub { + owner = "3snowp7im"; + repo = "urn"; + rev = "246a7a642fa7a673166c1bd281585d0fc22e75b2"; + sha256 = "0bniwf3nhsqapsss9m9y9ylh38v6v7q45999wa1qcsddpa72k0i0"; + fetchSubmodules = true; + }; + + patches = [ + # https://github.com/3snowp7im/urn/pull/50 + (fetchpatch { + name = "stop-hardcoding-prefix"; + url = "https://github.com/3snowp7im/urn/commit/6054ee62dcd6095e31e8fb2a229155dbbcb39f68.patch"; + sha256 = "1xdkylbqlqjwqx4pb9v1snf81ag7b6q8vybirz3ibsv6iy79v9pk"; + }) + # https://github.com/3snowp7im/urn/pull/53 + (fetchpatch { + name = "create-installation-directories"; + url = "https://github.com/3snowp7im/urn/commit/fb032851b9c5bebb5066d306f5366f0be34f0797.patch"; + sha256 = "0jjhcz4n8bm3hl56rvjzkvxr6imc05qlyavzjrlafa19hf036g4a"; + }) + ]; + + postPatch = ''substituteInPlace GNUmakefile --replace 'rsync -a --exclude=".*"' 'cp -r' ''; + + nativeBuildInputs = [ + xxd + pkg-config + imagemagick + wrapGAppsHook + ]; + + buildInputs = [ + gtk3 + jansson + ]; + + makeFlags = [ "PREFIX=$(out)" ]; + + passthru.updateScript = unstableGitUpdater { + url = "https://github.com/3snowp7im/urn.git"; + }; + + meta = with stdenv.lib; { + homepage = "https://github.com/3snowp7im/urn"; + description = "Split tracker / timer for speedrunning with GTK+ frontend"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ fgaz ]; + }; +} diff --git a/pkgs/tools/misc/usbmuxd/default.nix b/pkgs/tools/misc/usbmuxd/default.nix index 968b4e0072a5..68d972e5968d 100644 --- a/pkgs/tools/misc/usbmuxd/default.nix +++ b/pkgs/tools/misc/usbmuxd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libusb1, libimobiledevice }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libusb1, libimobiledevice }: stdenv.mkDerivation rec { pname = "usbmuxd"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { configureFlags="$configureFlags --with-systemdsystemunitdir=$out/lib/systemd/system" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/libimobiledevice/usbmuxd"; description = "A socket daemon to multiplex connections from and to iOS devices"; longDescription = '' diff --git a/pkgs/tools/misc/vcs_query/default.nix b/pkgs/tools/misc/vcs_query/default.nix index da42b35391b7..7e1387df1f82 100644 --- a/pkgs/tools/misc/vcs_query/default.nix +++ b/pkgs/tools/misc/vcs_query/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python3, fetchFromGitHub }: +{ lib, stdenv, python3, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "vcs_query"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { patchPythonScript $out/bin/vcs_query ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/mageta/vcs_query"; description = "eMail query-command to use vCards in mutt and Vim"; license = licenses.mit; diff --git a/pkgs/tools/misc/vector/default.nix b/pkgs/tools/misc/vector/default.nix index d7b141153f46..1d0b5d84f77b 100644 --- a/pkgs/tools/misc/vector/default.nix +++ b/pkgs/tools/misc/vector/default.nix @@ -58,7 +58,7 @@ rustPlatform.buildRustPackage rec { ''} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A high-performance logs, metrics, and events router"; homepage = "https://github.com/timberio/vector"; license = with licenses; [ asl20 ]; diff --git a/pkgs/tools/misc/vimer/default.nix b/pkgs/tools/misc/vimer/default.nix index 5bef80adcaf8..1fbb85f07516 100644 --- a/pkgs/tools/misc/vimer/default.nix +++ b/pkgs/tools/misc/vimer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { version = "0.2.0"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { chmod +x $out/bin/vimer ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/susam/vimer"; description = '' A convenience wrapper for gvim/mvim --remote(-tab)-silent to open files diff --git a/pkgs/tools/misc/vimpager/build.nix b/pkgs/tools/misc/vimpager/build.nix index 60389f6862b6..ec1766d7af31 100644 --- a/pkgs/tools/misc/vimpager/build.nix +++ b/pkgs/tools/misc/vimpager/build.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , coreutils , sharutils @@ -30,7 +30,7 @@ stdenv.mkDerivation { ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Use Vim as PAGER"; homepage = "https://www.vim.org/scripts/script.php?script_id=1723"; license = with licenses; [ bsd2 mit vim ]; diff --git a/pkgs/tools/misc/vimv/default.nix b/pkgs/tools/misc/vimv/default.nix index 023d3384ed68..2b056cd079a7 100644 --- a/pkgs/tools/misc/vimv/default.nix +++ b/pkgs/tools/misc/vimv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, bash, fetchFromGitHub }: +{ lib, stdenv, bash, fetchFromGitHub }: stdenv.mkDerivation { pname = "vimv"; version = "unstable-2019-10-31"; @@ -14,7 +14,7 @@ stdenv.mkDerivation { install $src/vimv $out/bin/vimv patchShebangs $out/bin/vimv ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/thameera/vimv"; description = "Batch-rename files using Vim"; license = licenses.mit; diff --git a/pkgs/tools/misc/vimwiki-markdown/default.nix b/pkgs/tools/misc/vimwiki-markdown/default.nix index 7c8a723f41f0..c1b1fce7abdd 100644 --- a/pkgs/tools/misc/vimwiki-markdown/default.nix +++ b/pkgs/tools/misc/vimwiki-markdown/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonApplication , fetchPypi , markdown @@ -19,7 +19,7 @@ buildPythonApplication rec { pygments ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Vimwiki markdown plugin"; homepage = "https://github.com/WnP/vimwiki_markdown"; license = licenses.mit; diff --git a/pkgs/tools/misc/vivid/default.nix b/pkgs/tools/misc/vivid/default.nix index 35a1d5d2d12a..dad352cc6577 100644 --- a/pkgs/tools/misc/vivid/default.nix +++ b/pkgs/tools/misc/vivid/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform }: +{ lib, stdenv, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { pname = "vivid"; @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "10xddr5cccc5cmhn4kwi27h3krmgapd7bqcp4rhjlbhdhsw7qxkx"; - meta = with stdenv.lib; { + meta = with lib; { description = "A generator for LS_COLORS with support for multiple color themes"; homepage = "https://github.com/sharkdp/vivid"; license = with licenses; [ asl20 /* or */ mit ]; diff --git a/pkgs/tools/misc/vix/default.nix b/pkgs/tools/misc/vix/default.nix index 7e93cd5d67ec..cf060218889a 100644 --- a/pkgs/tools/misc/vix/default.nix +++ b/pkgs/tools/misc/vix/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, SDL }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, SDL }: stdenv.mkDerivation { pname = "vix"; @@ -15,7 +15,7 @@ stdenv.mkDerivation { buildInputs = [ SDL ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Visual Interface heXadecimal dump "; homepage = "http://actinid.org/vix/"; license = licenses.gpl3; diff --git a/pkgs/tools/misc/void/default.nix b/pkgs/tools/misc/void/default.nix index 21df532f9489..e6d36155732e 100644 --- a/pkgs/tools/misc/void/default.nix +++ b/pkgs/tools/misc/void/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform }: +{ lib, stdenv, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { pname = "void"; @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0fnkcjxcsiw9j0ibh4z7zy0m6r5d84q5hvr2darwpckbn9ryrh3k"; - meta = with stdenv.lib; { + meta = with lib; { description = "Terminal-based personal organizer"; homepage = "https://github.com/spacejam/void"; license = licenses.gpl3; diff --git a/pkgs/tools/misc/vorbisgain/default.nix b/pkgs/tools/misc/vorbisgain/default.nix index fdb283d4dce9..fe405b0eaa40 100644 --- a/pkgs/tools/misc/vorbisgain/default.nix +++ b/pkgs/tools/misc/vorbisgain/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, libogg, libvorbis }: +{ lib, stdenv, fetchurl, unzip, libogg, libvorbis }: stdenv.mkDerivation rec { name = "vorbisgain-0.37"; @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { configureFlags="--mandir=$out/share/man" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://sjeng.org/vorbisgain.html"; description = "A utility that corrects the volume of an Ogg Vorbis file to a predefined standardized loudness"; license = licenses.gpl2; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ pSub ]; }; } diff --git a/pkgs/tools/misc/vsh/default.nix b/pkgs/tools/misc/vsh/default.nix new file mode 100644 index 000000000000..1ad9ddd4debb --- /dev/null +++ b/pkgs/tools/misc/vsh/default.nix @@ -0,0 +1,26 @@ +{ buildGoModule, fetchFromGitHub, lib }: + +buildGoModule rec { + pname = "vsh"; + version = "0.7.2"; + + src = fetchFromGitHub { + owner = "fishi0x01"; + repo = "vsh"; + rev = "v${version}"; + sha256 = "0k9bbfzqhijzimng8plk2xx9h37h7d2wj8g3plvvs3wrf7pmwxs7"; + }; + + # vendor dir is already part of repository + vendorSha256 = null; + + # make sure version gets set at compile time + buildFlagsArray = [ "-ldflags=-s -w -X main.vshVersion=v${version}" ]; + + meta = with lib; { + description = "HashiCorp Vault interactive shell"; + homepage = "https://github.com/fishi0x01/vsh"; + license = licenses.mit; + maintainers = with maintainers; [ fishi0x01 ]; + }; +} diff --git a/pkgs/tools/misc/vttest/default.nix b/pkgs/tools/misc/vttest/default.nix index 6be05cf53a21..64a76e97baef 100644 --- a/pkgs/tools/misc/vttest/default.nix +++ b/pkgs/tools/misc/vttest/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "vttest"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0181lk999gfqk8pkd4yx0qrz9r3k9a0z0i50wcayp7z1n1ivqllb"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Tests the compatibility so-called 'VT100-compatible' terminals"; homepage = "https://invisible-island.net/vttest/"; license = licenses.mit; diff --git a/pkgs/tools/misc/wakatime/default.nix b/pkgs/tools/misc/wakatime/default.nix index 4e0e9193fe7d..75f461062093 100644 --- a/pkgs/tools/misc/wakatime/default.nix +++ b/pkgs/tools/misc/wakatime/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python3Packages, fetchFromGitHub, glibcLocales }: +{ lib, stdenv, python3Packages, fetchFromGitHub, glibcLocales }: with python3Packages; buildPythonApplication rec { @@ -22,7 +22,7 @@ buildPythonApplication rec { pytest tests ''; - meta = with stdenv.lib; { + meta = with lib; { inherit (src.meta) homepage; description = "WakaTime command line interface"; longDescription = '' diff --git a/pkgs/tools/misc/watchexec/default.nix b/pkgs/tools/misc/watchexec/default.nix index 728cdd0c1736..8a68bef264cd 100644 --- a/pkgs/tools/misc/watchexec/default.nix +++ b/pkgs/tools/misc/watchexec/default.nix @@ -1,4 +1,4 @@ -{ stdenv, rustPlatform, fetchFromGitHub, CoreServices, installShellFiles }: +{ lib, stdenv, rustPlatform, fetchFromGitHub, CoreServices, installShellFiles }: rustPlatform.buildRustPackage rec { pname = "watchexec"; @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { installShellCompletion --zsh --name _watchexec completions/zsh ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Executes commands in response to file modifications"; homepage = "https://github.com/watchexec/watchexec"; license = with licenses; [ asl20 ]; diff --git a/pkgs/tools/misc/websocat/default.nix b/pkgs/tools/misc/websocat/default.nix index f2bcfd8b7813..0d4bfacfa273 100644 --- a/pkgs/tools/misc/websocat/default.nix +++ b/pkgs/tools/misc/websocat/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, openssl, rustPlatform, Security, makeWrapper, bash }: +{ lib, stdenv, fetchFromGitHub, pkgconfig, openssl, rustPlatform, Security, makeWrapper, bash }: rustPlatform.buildRustPackage rec { pname = "websocat"; @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { --prefix PATH : ${stdenv.lib.makeBinPath [ bash ]} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Command-line client for WebSockets (like netcat/socat)"; homepage = "https://github.com/vi/websocat"; license = licenses.mit; diff --git a/pkgs/tools/misc/wev/default.nix b/pkgs/tools/misc/wev/default.nix index 0f033d1c7e22..c1debfd924da 100644 --- a/pkgs/tools/misc/wev/default.nix +++ b/pkgs/tools/misc/wev/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , pkg-config, scdoc, wayland , wayland-protocols, libxkbcommon }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { installFlags = [ "PREFIX=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Wayland event viewer"; longDescription = '' This is a tool for debugging events on a Wayland window, analagous to the diff --git a/pkgs/tools/misc/wimboot/default.nix b/pkgs/tools/misc/wimboot/default.nix index a63fa4106345..b25e0b55379d 100644 --- a/pkgs/tools/misc/wimboot/default.nix +++ b/pkgs/tools/misc/wimboot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, libbfd, zlib, libiberty }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, libbfd, zlib, libiberty }: stdenv.mkDerivation rec { pname = "wimboot"; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { cp wimboot.x86_64.efi $out/share/wimboot ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://ipxe.org/wimboot"; description = "Windows Imaging Format bootloader"; license = licenses.gpl2; diff --git a/pkgs/tools/misc/wl-clipboard/default.nix b/pkgs/tools/misc/wl-clipboard/default.nix index 66a613785575..3904a1a03bcd 100644 --- a/pkgs/tools/misc/wl-clipboard/default.nix +++ b/pkgs/tools/misc/wl-clipboard/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig +{ lib, stdenv, fetchFromGitHub, meson, ninja, pkgconfig , wayland, wayland-protocols }: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkgconfig wayland-protocols ]; buildInputs = [ wayland ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Command-line copy/paste utilities for Wayland"; homepage = "https://github.com/bugaevc/wl-clipboard"; license = licenses.gpl3; diff --git a/pkgs/tools/misc/wlr-randr/default.nix b/pkgs/tools/misc/wlr-randr/default.nix index 7bdffb6f7221..5f0fec9fe616 100644 --- a/pkgs/tools/misc/wlr-randr/default.nix +++ b/pkgs/tools/misc/wlr-randr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, meson, ninja, cmake, pkgconfig, wayland }: +{ lib, stdenv, fetchFromGitHub, meson, ninja, cmake, pkgconfig, wayland }: stdenv.mkDerivation rec { pname = "wlr-randr"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja cmake pkgconfig ]; buildInputs = [ wayland ]; - meta = with stdenv.lib; { + meta = with lib; { license = licenses.mit; description = "An xrandr clone for wlroots compositors"; homepage = "https://github.com/emersion/wlr-randr"; diff --git a/pkgs/tools/misc/wob/default.nix b/pkgs/tools/misc/wob/default.nix index a619a43c9f14..8ddc7960cbbe 100644 --- a/pkgs/tools/misc/wob/default.nix +++ b/pkgs/tools/misc/wob/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , meson, ninja, pkg-config, scdoc, wayland # wayland-scanner , wayland-protocols, libseccomp }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { mesonFlags = stdenv.lib.optional stdenv.isLinux "-Dseccomp=enabled"; - meta = with stdenv.lib; { + meta = with lib; { description = "A lightweight overlay bar for Wayland"; longDescription = '' A lightweight overlay volume/backlight/progress/anything bar for Wayland, diff --git a/pkgs/tools/misc/woeusb/default.nix b/pkgs/tools/misc/woeusb/default.nix index fddb98d8dc38..63c2d017868a 100644 --- a/pkgs/tools/misc/woeusb/default.nix +++ b/pkgs/tools/misc/woeusb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, makeWrapper +{ lib, stdenv, fetchFromGitHub, autoreconfHook, makeWrapper , coreutils, dosfstools, findutils, gawk, gnugrep, grub2_light, ncurses, ntfs3g, parted, p7zip, util-linux, wget , wxGTK30 }: @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { [ "$out_version" = '${version}' ] ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Create bootable USB disks from Windows ISO images"; homepage = "https://github.com/slacka/WoeUSB"; license = licenses.gpl3; diff --git a/pkgs/tools/misc/woof/default.nix b/pkgs/tools/misc/woof/default.nix index 158a83a99ca5..5c48a3cb2758 100644 --- a/pkgs/tools/misc/woof/default.nix +++ b/pkgs/tools/misc/woof/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python3 }: +{ lib, stdenv, fetchFromGitHub, python3 }: stdenv.mkDerivation rec { version = "2020-12-17"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { chmod +x $out/bin/woof ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.home.unix-ag.org/simon/woof.html"; description = "Web Offer One File - Command-line utility to easily exchange files over a local network"; license = stdenv.lib.licenses.gpl2Plus; diff --git a/pkgs/tools/misc/wsl-open/default.nix b/pkgs/tools/misc/wsl-open/default.nix index ddd3904a1057..2b5808e3be90 100644 --- a/pkgs/tools/misc/wsl-open/default.nix +++ b/pkgs/tools/misc/wsl-open/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, installShellFiles }: +{ lib, stdenv, fetchFromGitHub, installShellFiles }: stdenv.mkDerivation rec { pname = "wsl-open"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { installManPage wsl-open.1 ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Open files with xdg-open from Windows Subsystem for Linux (WSL) in Windows applications"; homepage = "https://gitlab.com/4U6U57/wsl-open"; license = licenses.mit; diff --git a/pkgs/tools/misc/wv2/default.nix b/pkgs/tools/misc/wv2/default.nix index abac98d855f3..8ed0455a33ea 100644 --- a/pkgs/tools/misc/wv2/default.nix +++ b/pkgs/tools/misc/wv2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, cmake, libgsf, glib, libxml2 }: +{ stdenv, fetchurl, pkg-config, cmake, libgsf, glib, libxml2 }: stdenv.mkDerivation rec { name = "wv2-0.4.2"; @@ -9,8 +9,8 @@ stdenv.mkDerivation rec { patches = [ ./fix-include.patch ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake libgsf glib libxml2 ]; + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ libgsf glib libxml2 ]; NIX_CFLAGS_COMPILE = "-I${libxml2.dev}/include/libxml2"; diff --git a/pkgs/tools/misc/wyrd/default.nix b/pkgs/tools/misc/wyrd/default.nix index e1c4e4fd2fca..491c362eed40 100644 --- a/pkgs/tools/misc/wyrd/default.nix +++ b/pkgs/tools/misc/wyrd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocamlPackages, ncurses, remind }: +{ lib, stdenv, fetchurl, ocamlPackages, ncurses, remind }: stdenv.mkDerivation rec { version = "1.4.6"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { preferLocalBuild = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A text-based front-end to Remind"; longDescription = '' Wyrd is a text-based front-end to Remind, a sophisticated diff --git a/pkgs/tools/misc/x11idle/default.nix b/pkgs/tools/misc/x11idle/default.nix index 5e64137cbf6e..cd1c11dbdb64 100644 --- a/pkgs/tools/misc/x11idle/default.nix +++ b/pkgs/tools/misc/x11idle/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libXScrnSaver, libX11 }: +{ lib, stdenv, fetchurl, libXScrnSaver, libX11 }: stdenv.mkDerivation rec { @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { gcc -lXss -lX11 $src -o $out/bin/x11idle ''; - meta = with stdenv.lib; { + meta = with lib; { description = '' Compute consecutive idle time for current X11 session with millisecond resolution ''; diff --git a/pkgs/tools/misc/xdaliclock/default.nix b/pkgs/tools/misc/xdaliclock/default.nix index 3950e6bee28a..6aaee0f00b51 100644 --- a/pkgs/tools/misc/xdaliclock/default.nix +++ b/pkgs/tools/misc/xdaliclock/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libX11, xorgproto, libXt, libICE, libSM, libXext }: +{ lib, stdenv, fetchurl, libX11, xorgproto, libXt, libICE, libSM, libXext }: stdenv.mkDerivation rec { pname = "xdaliclock"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { mkdir -vp $out/bin $out/share/man/man1 ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A clock application that morphs digits when they are changed"; maintainers = with maintainers; [ raskin rycee ]; platforms = with platforms; linux ++ freebsd; diff --git a/pkgs/tools/misc/xdo/default.nix b/pkgs/tools/misc/xdo/default.nix index f9928b6f140f..31df9552accd 100644 --- a/pkgs/tools/misc/xdo/default.nix +++ b/pkgs/tools/misc/xdo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libxcb, xcbutil, xcbutilwm }: +{ lib, stdenv, fetchFromGitHub, libxcb, xcbutil, xcbutilwm }: stdenv.mkDerivation rec { pname = "xdo"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ libxcb xcbutilwm xcbutil ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Small X utility to perform elementary actions on windows"; homepage = "https://github.com/baskerville/xdo"; maintainers = with maintainers; [ meisternu ]; diff --git a/pkgs/tools/misc/xdxf2slob/default.nix b/pkgs/tools/misc/xdxf2slob/default.nix index 00f1899f97af..8d4998a9ff99 100644 --- a/pkgs/tools/misc/xdxf2slob/default.nix +++ b/pkgs/tools/misc/xdxf2slob/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python3Packages }: +{ lib, stdenv, fetchFromGitHub, python3Packages }: python3Packages.buildPythonApplication { name = "xdxf2slob-unstable-2015-06-30"; @@ -12,7 +12,7 @@ python3Packages.buildPythonApplication { propagatedBuildInputs = [ python3Packages.PyICU python3Packages.slob ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Tool to convert XDXF dictionary files to slob format"; homepage = "https://github.com/itkach/xdxf2slob/"; license = licenses.gpl3; diff --git a/pkgs/tools/misc/xfstests/default.nix b/pkgs/tools/misc/xfstests/default.nix index 3bc01048c1ed..769e23c389c7 100644 --- a/pkgs/tools/misc/xfstests/default.nix +++ b/pkgs/tools/misc/xfstests/default.nix @@ -100,7 +100,7 @@ stdenv.mkDerivation { exec ./check "$@" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Torture test suite for filesystems"; homepage = "https://git.kernel.org/pub/scm/fs/xfs/xfstests-dev.git/"; license = licenses.gpl2; diff --git a/pkgs/tools/misc/xiccd/default.nix b/pkgs/tools/misc/xiccd/default.nix index 82759441a46b..8b9b30d56d49 100644 --- a/pkgs/tools/misc/xiccd/default.nix +++ b/pkgs/tools/misc/xiccd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libX11, libXrandr, glib, colord }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libX11, libXrandr, glib, colord }: stdenv.mkDerivation rec { pname = "xiccd"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ libX11 libXrandr glib colord ]; - meta = with stdenv.lib; { + meta = with lib; { description = "X color profile daemon"; homepage = "https://github.com/agalakhov/xiccd"; license = licenses.gpl3; diff --git a/pkgs/tools/misc/xilinx-bootgen/default.nix b/pkgs/tools/misc/xilinx-bootgen/default.nix index e7aa30ac0591..5d0c80c55bfb 100644 --- a/pkgs/tools/misc/xilinx-bootgen/default.nix +++ b/pkgs/tools/misc/xilinx-bootgen/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, openssl }: +{ lib, stdenv, fetchFromGitHub, openssl }: stdenv.mkDerivation { pname = "xilinx-bootgen"; @@ -19,7 +19,7 @@ stdenv.mkDerivation { install -Dm755 bootgen $out/bin/bootgen ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Generate Boot Images for Xilinx Zynq and ZU+ SoCs"; longDescription = '' Bootgen for Xilinx Zynq and ZU+ SoCs, without code related to generating diff --git a/pkgs/tools/misc/xmonad-log/default.nix b/pkgs/tools/misc/xmonad-log/default.nix index 5dfbcdfad740..b8dd369cd6a8 100644 --- a/pkgs/tools/misc/xmonad-log/default.nix +++ b/pkgs/tools/misc/xmonad-log/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "xmonad-log"; @@ -15,7 +15,7 @@ buildGoPackage rec { goDeps = ./deps.nix; - meta = with stdenv.lib; { + meta = with lib; { description = "xmonad DBus monitoring solution"; homepage = "https://github.com/xintron/xmonad-log"; license = licenses.mit; diff --git a/pkgs/tools/misc/xprite-editor/default.nix b/pkgs/tools/misc/xprite-editor/default.nix index 3f7e2e32294c..553863dda1ae 100644 --- a/pkgs/tools/misc/xprite-editor/default.nix +++ b/pkgs/tools/misc/xprite-editor/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , rustPlatform , gtk3 @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec { cargoBuildFlags = [ "--bin" "xprite-native" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/rickyhan/xprite-editor"; description = "Pixel art editor"; license = licenses.gpl3; diff --git a/pkgs/tools/misc/xvfb-run/default.nix b/pkgs/tools/misc/xvfb-run/default.nix index 02a2d67de53d..8717d9012392 100644 --- a/pkgs/tools/misc/xvfb-run/default.nix +++ b/pkgs/tools/misc/xvfb-run/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, xorgserver, getopt +{ lib, stdenv, fetchurl, makeWrapper, xorgserver, getopt , xauth, util-linux, which, fontsConf, gawk, coreutils }: let xvfb_run = fetchurl { @@ -22,7 +22,7 @@ stdenv.mkDerivation { --prefix PATH : ${stdenv.lib.makeBinPath [ getopt xorgserver xauth which util-linux gawk coreutils ]} ''; - meta = with stdenv.lib; { + meta = with lib; { platforms = platforms.unix; license = licenses.gpl2; }; diff --git a/pkgs/tools/misc/yad/default.nix b/pkgs/tools/misc/yad/default.nix index 889c266d28e2..b28b5397e62d 100644 --- a/pkgs/tools/misc/yad/default.nix +++ b/pkgs/tools/misc/yad/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, intltool, autoreconfHook, wrapGAppsHook +{ lib, stdenv, fetchFromGitHub, pkgconfig, intltool, autoreconfHook, wrapGAppsHook , gtk3, hicolor-icon-theme, netpbm }: stdenv.mkDerivation rec { @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { intltoolize ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://sourceforge.net/projects/yad-dialog/"; description = "GUI dialog tool for shell scripts"; longDescription = '' diff --git a/pkgs/tools/misc/yank/default.nix b/pkgs/tools/misc/yank/default.nix index 6111a0f98708..19a4ba986ff2 100644 --- a/pkgs/tools/misc/yank/default.nix +++ b/pkgs/tools/misc/yank/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, xsel }: +{ lib, stdenv, fetchFromGitHub, xsel }: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { installFlags = [ "PREFIX=$(out)" ]; makeFlags = [ "YANKCMD=${xsel}/bin/xsel" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/mptre/yank"; description = "Yank terminal output to clipboard"; longDescription = '' diff --git a/pkgs/tools/misc/yle-dl/default.nix b/pkgs/tools/misc/yle-dl/default.nix index 40bf214f4630..64568ca46b06 100644 --- a/pkgs/tools/misc/yle-dl/default.nix +++ b/pkgs/tools/misc/yle-dl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rtmpdump, php, wget, python3Packages, ffmpeg_3 }: +{ lib, stdenv, fetchFromGitHub, rtmpdump, php, wget, python3Packages, ffmpeg_3 }: python3Packages.buildPythonApplication rec { pname = "yle-dl"; @@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec { doCheck = false; # tests require network access checkInputs = with python3Packages; [ ffmpeg_3 pytest pytestrunner ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Downloads videos from Yle (Finnish Broadcasting Company) servers"; homepage = "https://aajanki.github.io/yle-dl/"; license = licenses.gpl3Plus; diff --git a/pkgs/tools/misc/you-get/default.nix b/pkgs/tools/misc/you-get/default.nix index 6a13c455fe06..544430839965 100644 --- a/pkgs/tools/misc/you-get/default.nix +++ b/pkgs/tools/misc/you-get/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonApplication, fetchPypi }: +{ lib, stdenv, buildPythonApplication, fetchPypi }: buildPythonApplication rec { pname = "you-get"; @@ -13,7 +13,7 @@ buildPythonApplication rec { sha256 = "5a6cc0d661fe0cd4210bf467d6c89afd8611609e402690254722c1415736da92"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A tiny command line utility to download media contents from the web"; homepage = "https://you-get.org"; license = licenses.mit; diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index abb17946fbbe..eb75ed2d6ba7 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { # The websites youtube-dl deals with are a very moving target. That means that # downloads break constantly. Because of that, updates should always be backported # to the latest stable release. - version = "2020.12.29"; + version = "2021.01.08"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz"; - sha256 = "1hcr3mf63csp6lfpqszl5ibb2jhyl180s6pvbb7771jg0kdvlbbb"; + sha256 = "1k870v9xc7g16nvixa272sdjnmc7pl49ymmnn6rdz0mcj2548h3k"; }; nativeBuildInputs = [ installShellFiles makeWrapper ]; @@ -63,6 +63,6 @@ buildPythonPackage rec { ''; license = licenses.publicDomain; platforms = with platforms; linux ++ darwin; - maintainers = with maintainers; [ bluescreen303 phreedom AndersonTorres fpletz enzime ma27 zowoq ]; + maintainers = with maintainers; [ bluescreen303 phreedom AndersonTorres fpletz ma27 zowoq ]; }; } diff --git a/pkgs/tools/misc/ytree/default.nix b/pkgs/tools/misc/ytree/default.nix index b8818ba6e5e3..9121b1289f24 100644 --- a/pkgs/tools/misc/ytree/default.nix +++ b/pkgs/tools/misc/ytree/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , ncurses , readline @@ -6,15 +6,16 @@ stdenv.mkDerivation rec { pname = "ytree"; - version = "2.02"; + version = "2.03"; src = fetchurl { url = "https://han.de/~werner/${pname}-${version}.tar.gz"; - sha256 = "1v70l244rc22f20gac1zha1smrhqkag45jn0iwgcyngfdfml3gz5"; + sha256 = "sha256-WDqnFVLRNH4Oq+OaI2+loXS/Z93piHGFO5/iojO8rvE="; }; buildInputs = [ - ncurses readline + ncurses + readline ]; # don't save timestamp, in order to improve reproducibility @@ -28,7 +29,7 @@ stdenv.mkDerivation rec { mkdir -p $out/bin $out/share/man/man1 ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A curses-based file manager similar to DOS Xtree(TM)"; homepage = "https://www.han.de/~werner/ytree.html"; license = licenses.gpl2Plus; diff --git a/pkgs/tools/misc/yubico-piv-tool/default.nix b/pkgs/tools/misc/yubico-piv-tool/default.nix index 07f186e33226..188b7fa6b28d 100644 --- a/pkgs/tools/misc/yubico-piv-tool/default.nix +++ b/pkgs/tools/misc/yubico-piv-tool/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, openssl, check, pcsclite, PCSC +{ lib, stdenv, fetchurl, pkgconfig, openssl, check, pcsclite, PCSC , withApplePCSC ? stdenv.isDarwin }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-backend=${if withApplePCSC then "macscard" else "pcsc"}" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://developers.yubico.com/yubico-piv-tool/"; description = '' Used for interacting with the Privilege and Identification Card (PIV) diff --git a/pkgs/tools/misc/yubikey-neo-manager/default.nix b/pkgs/tools/misc/yubikey-neo-manager/default.nix index cb37ae249289..eeb4f5c1bd59 100644 --- a/pkgs/tools/misc/yubikey-neo-manager/default.nix +++ b/pkgs/tools/misc/yubikey-neo-manager/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python27Packages +{ lib, stdenv, fetchurl, python27Packages , libykneomgr, yubikey-personalization, libu2f-host }: python27Packages.buildPythonPackage rec { @@ -18,7 +18,7 @@ python27Packages.buildPythonPackage rec { "--set LD_PRELOAD '${libykneomgr}/lib/libykneomgr.so ${yubikey-personalization}/lib/libykpers-1.so ${libu2f-host}/lib/libu2f-host.so'" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://developers.yubico.com/yubikey-neo-manager"; description = "Cross platform personalization tool for the YubiKey NEO"; license = licenses.bsd2; diff --git a/pkgs/tools/misc/yubikey-personalization-gui/default.nix b/pkgs/tools/misc/yubikey-personalization-gui/default.nix index 96e7024f7a7a..99187ef548f8 100644 --- a/pkgs/tools/misc/yubikey-personalization-gui/default.nix +++ b/pkgs/tools/misc/yubikey-personalization-gui/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, mkDerivation, pkgconfig, qtbase, qmake, imagemagick +{ lib, stdenv, fetchurl, mkDerivation, pkgconfig, qtbase, qmake, imagemagick , libyubikey, yubikey-personalization }: mkDerivation rec { @@ -32,7 +32,7 @@ mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://developers.yubico.com/yubikey-personalization-gui"; description = "A QT based cross-platform utility designed to facilitate reconfiguration of the Yubikey"; license = licenses.bsd2; diff --git a/pkgs/tools/misc/yubikey-personalization/default.nix b/pkgs/tools/misc/yubikey-personalization/default.nix index 69e3d5886537..1830af6a9bc0 100644 --- a/pkgs/tools/misc/yubikey-personalization/default.nix +++ b/pkgs/tools/misc/yubikey-personalization/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, libusb1, libyubikey, json_c }: +{ lib, stdenv, fetchurl, fetchpatch, pkgconfig, libusb1, libyubikey, json_c }: stdenv.mkDerivation rec { pname = "yubikey-personalization"; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { install -D -t $out/lib/udev/rules.d 69-yubikey.rules ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://developers.yubico.com/yubikey-personalization"; description = "A library and command line tool to personalize YubiKeys"; license = licenses.bsd2; diff --git a/pkgs/tools/misc/z-lua/default.nix b/pkgs/tools/misc/z-lua/default.nix index 2b5a46435499..419846a9d374 100644 --- a/pkgs/tools/misc/z-lua/default.nix +++ b/pkgs/tools/misc/z-lua/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, lua52Packages, makeWrapper }: +{ lib, stdenv, fetchFromGitHub, lua52Packages, makeWrapper }: stdenv.mkDerivation rec { pname = "z-lua"; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/skywind3000/z.lua"; description = "A new cd command that helps you navigate faster by learning your habits"; license = licenses.mit; diff --git a/pkgs/tools/misc/zabbixctl/default.nix b/pkgs/tools/misc/zabbixctl/default.nix index c54456ede3d4..15add8ed1919 100644 --- a/pkgs/tools/misc/zabbixctl/default.nix +++ b/pkgs/tools/misc/zabbixctl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "zabbixctl"; @@ -15,7 +15,7 @@ buildGoPackage rec { goDeps = ./deps.nix; - meta = with stdenv.lib; { + meta = with lib; { description = "Most effective way for operating in Zabbix Server"; homepage = "https://github.com/kovetskiy/zabbixctl"; license = licenses.mit; diff --git a/pkgs/tools/misc/zalgo/default.nix b/pkgs/tools/misc/zalgo/default.nix index d9538141af00..71cc7f8b7ddb 100644 --- a/pkgs/tools/misc/zalgo/default.nix +++ b/pkgs/tools/misc/zalgo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "zalgo"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { install -Dm755 zalgo -t $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Read stdin and corrupt it with combining diacritics"; homepage = "https://github.com/lunasorcery/zalgo"; license = licenses.unfree; diff --git a/pkgs/tools/misc/zsh-autoenv/default.nix b/pkgs/tools/misc/zsh-autoenv/default.nix index f4295443f69e..72aa2d77bc33 100644 --- a/pkgs/tools/misc/zsh-autoenv/default.nix +++ b/pkgs/tools/misc/zsh-autoenv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, runtimeShell }: +{ lib, stdenv, fetchFromGitHub, runtimeShell }: stdenv.mkDerivation { pname = "zsh-autoenv"; @@ -26,7 +26,7 @@ stdenv.mkDerivation { chmod +x $out/bin/zsh-autoenv-share ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Automatically sources whitelisted .autoenv.zsh files"; longDescription = '' zsh-autoenv automatically sources (known/whitelisted) diff --git a/pkgs/tools/misc/zsh-navigation-tools/default.nix b/pkgs/tools/misc/zsh-navigation-tools/default.nix index 86dd990cd746..f719fe3b6922 100644 --- a/pkgs/tools/misc/zsh-navigation-tools/default.nix +++ b/pkgs/tools/misc/zsh-navigation-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "zsh-navigation-tools"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { cp .config/znt/n-* $out/share/zsh/site-functions/.config/znt ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Curses-based tools for ZSH"; homepage = "https://github.com/psprint/zsh-navigation-tools"; license = licenses.gpl3; diff --git a/pkgs/tools/networking/aircrack-ng/default.nix b/pkgs/tools/networking/aircrack-ng/default.nix index fe07d203607a..76c1de651e01 100644 --- a/pkgs/tools/networking/aircrack-ng/default.nix +++ b/pkgs/tools/networking/aircrack-ng/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libpcap, openssl, zlib, wirelesstools +{ lib, stdenv, fetchurl, libpcap, openssl, zlib, wirelesstools , iw, ethtool, pciutils, libnl, pkgconfig, makeWrapper , autoreconfHook, usbutils }: @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ]} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Wireless encryption cracking tools"; homepage = "http://www.aircrack-ng.org/"; license = licenses.gpl2Plus; diff --git a/pkgs/tools/networking/airfield/default.nix b/pkgs/tools/networking/airfield/default.nix index d08996eb13f6..0976a764a6f2 100644 --- a/pkgs/tools/networking/airfield/default.nix +++ b/pkgs/tools/networking/airfield/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , pkgs, makeWrapper, buildEnv , nodejs, runtimeShell }: @@ -60,7 +60,7 @@ in stdenv.mkDerivation { --set NODE_PATH "${runtimeEnv}/lib/node_modules" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A web-interface for hipache-proxy"; license = licenses.mit; homepage = "https://github.com/emblica/airfield"; diff --git a/pkgs/tools/networking/altermime/default.nix b/pkgs/tools/networking/altermime/default.nix index b1481b2208c6..c28df4614592 100644 --- a/pkgs/tools/networking/altermime/default.nix +++ b/pkgs/tools/networking/altermime/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { baseName = "altermime"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { mkdir -p "$out/bin" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "MIME alteration tool"; maintainers = [ maintainers.raskin ]; platforms = platforms.linux; diff --git a/pkgs/tools/networking/argus-clients/default.nix b/pkgs/tools/networking/argus-clients/default.nix index a1ff30faff3f..6da6f927eca2 100644 --- a/pkgs/tools/networking/argus-clients/default.nix +++ b/pkgs/tools/networking/argus-clients/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libpcap, bison, flex, cyrus_sasl, tcp_wrappers, pkgconfig, perl }: +{ lib, stdenv, fetchurl, libpcap, bison, flex, cyrus_sasl, tcp_wrappers, pkgconfig, perl }: stdenv.mkDerivation rec { pname = "argus-clients"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libpcap bison cyrus_sasl tcp_wrappers flex ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Clients for ARGUS"; longDescription = ''Clients for Audit Record Generation and Utilization System (ARGUS). The Argus Project is focused on developing all diff --git a/pkgs/tools/networking/argus/default.nix b/pkgs/tools/networking/argus/default.nix index 32c6c785fa5d..fb3f7228c8dc 100644 --- a/pkgs/tools/networking/argus/default.nix +++ b/pkgs/tools/networking/argus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libpcap, bison, flex, cyrus_sasl, tcp_wrappers, +{ lib, stdenv, fetchurl, libpcap, bison, flex, cyrus_sasl, tcp_wrappers, pkgconfig, procps, which, wget, lsof, net-snmp, perl }: stdenv.mkDerivation rec { @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { --replace /usr/bin/snmpwalk ${stdenv.lib.getBin net-snmp}/bin/snmpwalk ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Audit Record Generation and Utilization System for networks"; longDescription = ''The Argus Project is focused on developing all aspects of large scale network situtational awareness derived from diff --git a/pkgs/tools/networking/aria2/default.nix b/pkgs/tools/networking/aria2/default.nix index 614584a5f565..428e8a2e112e 100644 --- a/pkgs/tools/networking/aria2/default.nix +++ b/pkgs/tools/networking/aria2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchpatch, fetchFromGitHub, pkgconfig, autoreconfHook +{ lib, stdenv, fetchpatch, fetchFromGitHub, pkgconfig, autoreconfHook , openssl, c-ares, libxml2, sqlite, zlib, libssh2 , cppunit, sphinx , Security @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://aria2.github.io"; description = "A lightweight, multi-protocol, multi-source, command-line download utility"; license = licenses.gpl2Plus; diff --git a/pkgs/tools/networking/arping/default.nix b/pkgs/tools/networking/arping/default.nix index ad0139b184dd..4a5cae9bd3c4 100644 --- a/pkgs/tools/networking/arping/default.nix +++ b/pkgs/tools/networking/arping/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, libnet, libpcap }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, libnet, libpcap }: stdenv.mkDerivation rec { version = "2.21"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Broadcasts a who-has ARP packet on the network and prints answers"; homepage = "https://github.com/ThomasHabets/arping"; license = with licenses; [ gpl2 ]; diff --git a/pkgs/tools/networking/arpoison/default.nix b/pkgs/tools/networking/arpoison/default.nix index eac2f380d15b..6268d958204f 100644 --- a/pkgs/tools/networking/arpoison/default.nix +++ b/pkgs/tools/networking/arpoison/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, libnet }: +{ lib, stdenv, fetchzip, libnet }: stdenv.mkDerivation rec { name = "arpoison-0.7"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { cp arpoison.8.gz $out/share/man/man8 ''; - meta = with stdenv.lib; { + meta = with lib; { description = "UNIX arp cache update utility"; homepage = "http://www.arpoison.net/"; license = with licenses; [ gpl2 ]; diff --git a/pkgs/tools/networking/assh/default.nix b/pkgs/tools/networking/assh/default.nix index caebcb6fe8c0..e8b93adcd641 100644 --- a/pkgs/tools/networking/assh/default.nix +++ b/pkgs/tools/networking/assh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, openssh, makeWrapper }: +{ lib, stdenv, buildGoModule, fetchFromGitHub, openssh, makeWrapper }: buildGoModule rec { pname = "assh"; @@ -27,7 +27,7 @@ buildGoModule rec { $out/bin/assh --help > /dev/null ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Advanced SSH config - Regex, aliases, gateways, includes and dynamic hosts"; homepage = "https://github.com/moul/assh"; changelog = "https://github.com/moul/assh/releases/tag/v${version}"; diff --git a/pkgs/tools/networking/atinout/default.nix b/pkgs/tools/networking/atinout/default.nix index fcd48564da0f..bc2af5c5ee29 100644 --- a/pkgs/tools/networking/atinout/default.nix +++ b/pkgs/tools/networking/atinout/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, ronn, mount }: +{ lib, stdenv, fetchgit, ronn, mount }: stdenv.mkDerivation rec { name = "atinout-${version}"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { make PREFIX=$out install ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://atinout.sourceforge.net"; description = "Tool for talking to modems"; platforms = platforms.unix; diff --git a/pkgs/tools/networking/autossh/default.nix b/pkgs/tools/networking/autossh/default.nix index f89302c4295f..49fb4d52e0b4 100644 --- a/pkgs/tools/networking/autossh/default.nix +++ b/pkgs/tools/networking/autossh/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, openssh}: +{lib, stdenv, fetchurl, openssh}: stdenv.mkDerivation rec { name = "autossh-1.4g"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { install -D -m644 autossh.1 $out/man/man1/autossh.1 || return 1 ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.harding.motd.ca/autossh/"; description = "Automatically restart SSH sessions and tunnels"; platforms = platforms.unix; diff --git a/pkgs/tools/networking/axel/default.nix b/pkgs/tools/networking/axel/default.nix index baa498042f94..333009226c1e 100644 --- a/pkgs/tools/networking/axel/default.nix +++ b/pkgs/tools/networking/axel/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, autoconf-archive +{ lib, stdenv, fetchFromGitHub, autoreconfHook, autoconf-archive , pkgconfig, gettext, libssl, txt2man }: stdenv.mkDerivation rec { @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { installFlags = [ "ETCDIR=${placeholder "out"}/etc" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Console downloading program with some features for parallel connections for faster downloading"; homepage = "https://github.com/axel-download-accelerator/axel"; maintainers = with maintainers; [ pSub ]; diff --git a/pkgs/tools/networking/bacnet-stack/default.nix b/pkgs/tools/networking/bacnet-stack/default.nix index 596b30d03e89..a4f2ef36360e 100644 --- a/pkgs/tools/networking/bacnet-stack/default.nix +++ b/pkgs/tools/networking/bacnet-stack/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { name = "bacnet-stack"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { cp -r bin $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "BACnet open source protocol stack for embedded systems, Linux, and Windows"; platforms = platforms.linux; license = licenses.gpl2; diff --git a/pkgs/tools/networking/badvpn/default.nix b/pkgs/tools/networking/badvpn/default.nix index c9ebc12b0db8..ab898a869360 100644 --- a/pkgs/tools/networking/badvpn/default.nix +++ b/pkgs/tools/networking/badvpn/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, cmake, openssl, nss, pkgconfig, nspr, bash, debug ? false}: +{stdenv, fetchurl, cmake, openssl, nss, pkg-config, nspr, bash, debug ? false}: let s = # Generated upstream information rec { @@ -10,15 +10,15 @@ let sha256="02b1fra43l75mljkhrq45vcrrqv0znicjn15g7nbqx3jppzbpm5z"; }; - buildInputs = [ - cmake openssl nss nspr - ]; + compileFlags = "-O3 ${stdenv.lib.optionalString (!debug) "-DNDEBUG"}"; in stdenv.mkDerivation { inherit (s) name version; - nativeBuildInputs = [ pkgconfig ]; - inherit buildInputs; + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ + openssl nss nspr + ]; src = fetchurl { inherit (s) url sha256; }; diff --git a/pkgs/tools/networking/bandwhich/default.nix b/pkgs/tools/networking/bandwhich/default.nix index 46739742bd44..a9bf8c5189b0 100644 --- a/pkgs/tools/networking/bandwhich/default.nix +++ b/pkgs/tools/networking/bandwhich/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform, Security, fetchpatch }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, Security, fetchpatch }: rustPlatform.buildRustPackage rec { pname = "bandwhich"; @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { buildInputs = stdenv.lib.optional stdenv.isDarwin Security; - meta = with stdenv.lib; { + meta = with lib; { description = "A CLI utility for displaying current network utilization"; longDescription = '' bandwhich sniffs a given network interface and records IP packet size, cross diff --git a/pkgs/tools/networking/bgpq3/default.nix b/pkgs/tools/networking/bgpq3/default.nix index e3d2218b0c97..bd0a623a916d 100644 --- a/pkgs/tools/networking/bgpq3/default.nix +++ b/pkgs/tools/networking/bgpq3/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "bgpq3"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { # Fix binary install location. Remove with next upstream release. preInstall = "mkdir -p $out/bin"; - meta = with stdenv.lib; { + meta = with lib; { description = "bgp filtering automation tool"; homepage = "https://github.com/snar/bgpq3"; license = licenses.bsd2; diff --git a/pkgs/tools/networking/bgpq4/default.nix b/pkgs/tools/networking/bgpq4/default.nix index 2caeb437f7a2..4db2d933583c 100644 --- a/pkgs/tools/networking/bgpq4/default.nix +++ b/pkgs/tools/networking/bgpq4/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { pname = "bgpq4"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { autoreconfHook ]; - meta = with stdenv.lib; { + meta = with lib; { description = "BGP filtering automation tool"; homepage = "https://github.com/bgp/bgpq4"; license = licenses.bsd2; diff --git a/pkgs/tools/networking/biosdevname/default.nix b/pkgs/tools/networking/biosdevname/default.nix index 7cd7254518ad..f44574fb0364 100644 --- a/pkgs/tools/networking/biosdevname/default.nix +++ b/pkgs/tools/networking/biosdevname/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, zlib, pciutils }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, zlib, pciutils }: stdenv.mkDerivation rec { pname = "biosdevname"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--sbindir=\${out}/bin" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Udev helper for naming devices per BIOS names"; license = licenses.gpl2; platforms = ["x86_64-linux" "i686-linux"]; diff --git a/pkgs/tools/networking/boringtun/default.nix b/pkgs/tools/networking/boringtun/default.nix index 7c322638712c..b2d41bf8019c 100644 --- a/pkgs/tools/networking/boringtun/default.nix +++ b/pkgs/tools/networking/boringtun/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform, darwin }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, darwin }: rustPlatform.buildRustPackage rec { pname = "boringtun"; @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { # Testing this project requires sudo, Docker and network access, etc. doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Userspace WireGuard® implementation in Rust"; homepage = "https://github.com/cloudflare/boringtun"; license = licenses.bsd3; diff --git a/pkgs/tools/networking/brook/default.nix b/pkgs/tools/networking/brook/default.nix index b70eb080a7af..f84176495aa4 100644 --- a/pkgs/tools/networking/brook/default.nix +++ b/pkgs/tools/networking/brook/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "brook"; @@ -15,7 +15,7 @@ buildGoPackage rec { goDeps = ./deps.nix; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/txthinking/brook"; description = "A cross-platform Proxy/VPN software"; license = with licenses; [ gpl3 ]; diff --git a/pkgs/tools/networking/bsd-finger/default.nix b/pkgs/tools/networking/bsd-finger/default.nix index d011665a492b..f3ecf7a9702d 100644 --- a/pkgs/tools/networking/bsd-finger/default.nix +++ b/pkgs/tools/networking/bsd-finger/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: # !!! Duplication: this package is almost exactly the same as `bsd-finger'. @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { preInstall = '' mkdir -p $out/man/man1 $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { platforms = platforms.linux; license = licenses.bsdOriginal; }; diff --git a/pkgs/tools/networking/bukubrow/default.nix b/pkgs/tools/networking/bukubrow/default.nix index ed8a6088db07..5188954b7634 100644 --- a/pkgs/tools/networking/bukubrow/default.nix +++ b/pkgs/tools/networking/bukubrow/default.nix @@ -1,4 +1,4 @@ -{ stdenv, rustPlatform, fetchFromGitHub, sqlite }: let +{ lib, stdenv, rustPlatform, fetchFromGitHub, sqlite }: let manifest = { description = "Bukubrow extension host application"; @@ -38,7 +38,7 @@ in rustPlatform.buildRustPackage rec { install -Dm0644 chrome.json $out/etc/chromium/native-messaging-hosts/com.samhh.bukubrow.json ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A WebExtension for Buku, a command-line bookmark manager"; homepage = "https://github.com/SamHH/bukubrow-host"; license = licenses.gpl3; diff --git a/pkgs/tools/networking/bully/default.nix b/pkgs/tools/networking/bully/default.nix index 4117932550f4..b49af33cd9e9 100644 --- a/pkgs/tools/networking/bully/default.nix +++ b/pkgs/tools/networking/bully/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libpcap }: +{ lib, stdenv, fetchFromGitHub, libpcap }: stdenv.mkDerivation rec { pname = "bully"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { install -Dm444 -t $out/share/doc/${pname} ../*.md ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Retrieve WPA/WPA2 passphrase from a WPS enabled access point"; homepage = "https://github.com/kimocoder/bully"; license = licenses.gpl3; diff --git a/pkgs/tools/networking/bwm-ng/default.nix b/pkgs/tools/networking/bwm-ng/default.nix index ae3edf7dcea7..229b4a636c4c 100644 --- a/pkgs/tools/networking/bwm-ng/default.nix +++ b/pkgs/tools/networking/bwm-ng/default.nix @@ -1,4 +1,4 @@ -{ writeText, stdenv, fetchurl, ncurses }: +{ writeText, lib, stdenv, fetchurl, ncurses }: let version = "0.6.1"; @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { # This code uses inline in the gnu89 sense: see http://clang.llvm.org/compatibility.html#inline NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-std=gnu89"; - meta = with stdenv.lib; { + meta = with lib; { description = "A small and simple console-based live network and disk io bandwidth monitor"; homepage = "http://www.gropp.org/?id=projects&sub=bwm-ng"; license = licenses.gpl2; diff --git a/pkgs/tools/networking/cadaver/default.nix b/pkgs/tools/networking/cadaver/default.nix index 46ebb234fb18..84265d3f4b7e 100644 --- a/pkgs/tools/networking/cadaver/default.nix +++ b/pkgs/tools/networking/cadaver/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, openssl, readline }: +{ lib, stdenv, fetchurl, fetchpatch, openssl, readline }: stdenv.mkDerivation rec { name = "cadaver-0.23.3"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { buildInputs = [ openssl readline ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A command-line WebDAV client"; homepage = "http://www.webdav.org/cadaver"; maintainers = with maintainers; [ ianwookim ]; diff --git a/pkgs/tools/networking/carddav-util/default.nix b/pkgs/tools/networking/carddav-util/default.nix index c28048a56c07..39728f7e9a07 100644 --- a/pkgs/tools/networking/carddav-util/default.nix +++ b/pkgs/tools/networking/carddav-util/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, python, pythonPackages, makeWrapper }: +{ lib, stdenv, fetchgit, python, pythonPackages, makeWrapper }: stdenv.mkDerivation { @@ -31,7 +31,7 @@ stdenv.mkDerivation { --prefix PATH : "$prefix/bin:$PATH" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/ljanyst/carddav-util"; description = "A CardDAV import/export utility"; platforms = platforms.unix; diff --git a/pkgs/tools/networking/ccnet/default.nix b/pkgs/tools/networking/ccnet/default.nix index 48d675ea09b3..e277f7fd6af6 100644 --- a/pkgs/tools/networking/ccnet/default.nix +++ b/pkgs/tools/networking/ccnet/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, which, autoreconfHook, pkgconfig, vala, python, libsearpc, libzdb, libuuid, libevent, sqlite, openssl}: +{lib, stdenv, fetchurl, which, autoreconfHook, pkgconfig, vala, python, libsearpc, libzdb, libuuid, libevent, sqlite, openssl}: stdenv.mkDerivation rec { version = "6.1.8"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-server" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/haiwen/ccnet"; description = "A framework for writing networked applications in C"; license = licenses.gpl3Plus; diff --git a/pkgs/tools/networking/chrony/default.nix b/pkgs/tools/networking/chrony/default.nix index 374036d11a44..e11674f5b1b7 100644 --- a/pkgs/tools/networking/chrony/default.nix +++ b/pkgs/tools/networking/chrony/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libcap, readline, texinfo, nss, nspr +{ lib, stdenv, fetchurl, pkgconfig, libcap, readline, texinfo, nss, nspr , libseccomp, pps-tools, gnutls }: assert stdenv.isLinux -> libcap != null; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--chronyvardir=$(out)/var/lib/chrony" ] ++ stdenv.lib.optional stdenv.isLinux "--enable-scfilter"; - meta = with stdenv.lib; { + meta = with lib; { description = "Sets your computer's clock from time servers on the Net"; homepage = "https://chrony.tuxfamily.org/"; repositories.git = "git://git.tuxfamily.org/gitroot/chrony/chrony.git"; diff --git a/pkgs/tools/networking/circus/default.nix b/pkgs/tools/networking/circus/default.nix index ea03f8878b20..891eb19c8352 100644 --- a/pkgs/tools/networking/circus/default.nix +++ b/pkgs/tools/networking/circus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python3 }: +{ lib, stdenv, python3 }: let python = python3.override { @@ -32,7 +32,7 @@ buildPythonApplication rec { propagatedBuildInputs = [ iowait psutil pyzmq tornado six ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A process and socket manager"; homepage = "https://github.circus.com/circus-tent/circus"; license = licenses.asl20; diff --git a/pkgs/tools/networking/cjdns/default.nix b/pkgs/tools/networking/cjdns/default.nix index 8cc891cce19c..cfc591cb2eff 100644 --- a/pkgs/tools/networking/cjdns/default.nix +++ b/pkgs/tools/networking/cjdns/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, nodejs, which, python27, util-linux, nixosTests }: +{ lib, stdenv, fetchFromGitHub, nodejs, which, python27, util-linux, nixosTests }: stdenv.mkDerivation rec { pname = "cjdns"; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { passthru.tests.basic = nixosTests.cjdns; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/cjdelisle/cjdns"; description = "Encrypted networking for regular people"; license = licenses.gpl3Plus; diff --git a/pkgs/tools/networking/cksfv/default.nix b/pkgs/tools/networking/cksfv/default.nix index 00073686238d..581d39636fa7 100644 --- a/pkgs/tools/networking/cksfv/default.nix +++ b/pkgs/tools/networking/cksfv/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation rec { name = "cksfv-1.3.15"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0k06aq94cn5xp4knjw0p7gz06hzh622ql2xvnrlr3q8rcmdvwwx1"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://zakalwe.fi/~shd/foss/cksfv/"; description = "A tool for verifying files against a SFV checksum file"; platforms = platforms.all; diff --git a/pkgs/tools/networking/clash/default.nix b/pkgs/tools/networking/clash/default.nix index 502a4b4bbd42..2044aeb35543 100644 --- a/pkgs/tools/networking/clash/default.nix +++ b/pkgs/tools/networking/clash/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildGoModule }: +{ lib, stdenv, fetchFromGitHub, buildGoModule }: buildGoModule rec { pname = "clash"; @@ -20,7 +20,7 @@ buildGoModule rec { "-X github.com/Dreamacro/clash/constant.Version=${version}" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A rule-based tunnel in Go"; homepage = "https://github.com/Dreamacro/clash"; license = licenses.gpl3; diff --git a/pkgs/tools/networking/cntlm/default.nix b/pkgs/tools/networking/cntlm/default.nix index d05d8e48dc0f..a12ceb1d4480 100644 --- a/pkgs/tools/networking/cntlm/default.nix +++ b/pkgs/tools/networking/cntlm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, which}: +{ lib, stdenv, fetchurl, which}: stdenv.mkDerivation rec { pname = "cntlm"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { mkdir -p $out/man/; cp doc/cntlm.1 $out/man/; ''; - meta = with stdenv.lib; { + meta = with lib; { description = "NTLM/NTLMv2 authenticating HTTP proxy"; homepage = "http://cntlm.sourceforge.net/"; license = licenses.gpl2; diff --git a/pkgs/tools/networking/connman/connman-gtk/default.nix b/pkgs/tools/networking/connman/connman-gtk/default.nix index 5de63098185c..03606aabfe3f 100644 --- a/pkgs/tools/networking/connman/connman-gtk/default.nix +++ b/pkgs/tools/networking/connman/connman-gtk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, intltool, pkgconfig, +{ lib, stdenv, fetchFromGitHub, autoconf, automake, intltool, pkgconfig, gtk3, connman, openconnect, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ./autogen.sh ''; - meta = with stdenv.lib; { + meta = with lib; { description = "GTK GUI for Connman"; homepage = "https://github.com/jgke/connman-gtk"; license = licenses.gpl2Plus; diff --git a/pkgs/tools/networking/connman/connman-ncurses/default.nix b/pkgs/tools/networking/connman/connman-ncurses/default.nix index 1e7f54f9ddbe..22cb9ccab88a 100644 --- a/pkgs/tools/networking/connman/connman-ncurses/default.nix +++ b/pkgs/tools/networking/connman/connman-ncurses/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchpatch, fetchFromGitHub, autoreconfHook, pkgconfig, dbus, json_c, ncurses, connman }: +{ lib, stdenv, fetchpatch, fetchFromGitHub, autoreconfHook, pkgconfig, dbus, json_c, ncurses, connman }: stdenv.mkDerivation { pname = "connman-ncurses"; @@ -31,7 +31,7 @@ stdenv.mkDerivation { cp -va connman_ncurses "$out/bin/" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Simple ncurses UI for connman"; homepage = "https://github.com/eurogiciel-oss/connman-json-client"; license = licenses.gpl2; diff --git a/pkgs/tools/networking/connman/connman-notify/default.nix b/pkgs/tools/networking/connman/connman-notify/default.nix index df72a9474899..9f0c9873e2a7 100644 --- a/pkgs/tools/networking/connman/connman-notify/default.nix +++ b/pkgs/tools/networking/connman/connman-notify/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, python3Packages, glib, gobject-introspection, wrapGAppsHook }: +{ lib, stdenv, fetchFromGitLab, python3Packages, glib, gobject-introspection, wrapGAppsHook }: python3Packages.buildPythonApplication { pname = "connman-notify"; @@ -26,7 +26,7 @@ python3Packages.buildPythonApplication { install -D -t $out/share/doc README.rst ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Desktop notification integration for connman"; homepage = "https://gitlab.com/wavexx/connman-notify"; license = licenses.gpl2; diff --git a/pkgs/tools/networking/connman/connman.nix b/pkgs/tools/networking/connman/connman.nix index 512194872205..7f2552d11419 100644 --- a/pkgs/tools/networking/connman/connman.nix +++ b/pkgs/tools/networking/connman/connman.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , pkgconfig , file @@ -161,7 +161,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A daemon for managing internet connections"; homepage = "https://01.org/connman"; maintainers = [ maintainers.matejc ]; diff --git a/pkgs/tools/networking/corerad/default.nix b/pkgs/tools/networking/corerad/default.nix index 38331163c122..64e8e09467d9 100644 --- a/pkgs/tools/networking/corerad/default.nix +++ b/pkgs/tools/networking/corerad/default.nix @@ -1,17 +1,17 @@ -{ stdenv, buildGoModule, fetchFromGitHub, nixosTests }: +{ lib, stdenv, buildGoModule, fetchFromGitHub, nixosTests }: buildGoModule rec { pname = "corerad"; - version = "0.2.8"; + version = "0.3.0"; src = fetchFromGitHub { owner = "mdlayher"; repo = "corerad"; rev = "v${version}"; - sha256 = "053rihi8lqai3z837ddi441yl41lsg1zj9gl62s9vbjmq5l11fjh"; + sha256 = "1q4wcliifas8xvwy7kcq4fbc1iv7dha3k6j1nbwl7pjqmyggs3f4"; }; - vendorSha256 = "1ra4yfplmgzxzs1nlbm0izg339fjnkfrw071y8w4m6q6wnzdhljb"; + vendorSha256 = "07khxs15z9xzcmp4gyggdwqyz361y96h6ib92qax8k83cr0l494p"; doCheck = false; @@ -31,7 +31,7 @@ buildGoModule rec { inherit (nixosTests) corerad; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/mdlayher/corerad"; description = "Extensible and observable IPv6 NDP RA daemon"; license = licenses.asl20; diff --git a/pkgs/tools/networking/corkscrew/default.nix b/pkgs/tools/networking/corkscrew/default.nix index 9cfe65873acd..d5756cefdaf8 100644 --- a/pkgs/tools/networking/corkscrew/default.nix +++ b/pkgs/tools/networking/corkscrew/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, automake }: +{ lib, stdenv, fetchurl, automake }: stdenv.mkDerivation rec { name = "corkscrew-2.0"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { ln -sf ${automake}/share/automake-*/config.guess config.guess ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://agroman.net/corkscrew/"; description = "A tool for tunneling SSH through HTTP proxies"; license = stdenv.lib.licenses.gpl2; diff --git a/pkgs/tools/networking/croc/default.nix b/pkgs/tools/networking/croc/default.nix index 08eb3d69128b..115f2f321609 100644 --- a/pkgs/tools/networking/croc/default.nix +++ b/pkgs/tools/networking/croc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, callPackage}: +{ lib, stdenv, buildGoModule, fetchFromGitHub, callPackage}: buildGoModule rec { pname = "croc"; @@ -22,7 +22,7 @@ buildGoModule rec { local-relay = callPackage ./test-local-relay.nix {}; }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Easily and securely send things from one computer to another"; homepage = "https://github.com/schollz/croc"; diff --git a/pkgs/tools/networking/curl-unix-socket/default.nix b/pkgs/tools/networking/curl-unix-socket/default.nix index b25e5dcab0b7..84b5c1861cd3 100644 --- a/pkgs/tools/networking/curl-unix-socket/default.nix +++ b/pkgs/tools/networking/curl-unix-socket/default.nix @@ -1,4 +1,4 @@ -{ buildGoPackage, stdenv, fetchFromGitHub }: +{ buildGoPackage, lib, stdenv, fetchFromGitHub }: buildGoPackage rec { name = "curl-unix-socket-2015-04-10"; @@ -21,7 +21,7 @@ buildGoPackage rec { runHook postBuild ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Run HTTP requests over UNIX socket"; license = licenses.mit; homepage = "https://github.com/Soulou/curl-unix-socket"; diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index 82245f4cd26d..a08ec75bfaa6 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -7,7 +7,8 @@ , gnutlsSupport ? false, gnutls ? null , wolfsslSupport ? false, wolfssl ? null , scpSupport ? zlibSupport && !stdenv.isSunOS && !stdenv.isCygwin, libssh2 ? null -, gssSupport ? !stdenv.hostPlatform.isWindows, libkrb5 ? null +, # a very sad story re static: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=439039 + gssSupport ? with stdenv.hostPlatform; !isWindows && !isStatic, libkrb5 ? null , c-aresSupport ? false, c-ares ? null , brotliSupport ? false, brotli ? null }: @@ -122,7 +123,7 @@ stdenv.mkDerivation rec { inherit sslSupport openssl; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A command line tool for transferring files with URL syntax"; homepage = "https://curl.haxx.se/"; license = licenses.curl; diff --git a/pkgs/tools/networking/cutter/default.nix b/pkgs/tools/networking/cutter/default.nix index 2430e75430b0..8d94da7737b8 100644 --- a/pkgs/tools/networking/cutter/default.nix +++ b/pkgs/tools/networking/cutter/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "cutter-1.04"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { install -D -m 0755 cutter $out/bin/tcp-cutter ''; - meta = with stdenv.lib; { + meta = with lib; { description = "TCP/IP Connection cutting on Linux Firewalls and Routers"; homepage = "http://www.digitage.co.uk/digitage/software/linux-security/cutter"; license = licenses.gpl2; diff --git a/pkgs/tools/networking/darkstat/default.nix b/pkgs/tools/networking/darkstat/default.nix index af15e70aa86c..04cab3655787 100644 --- a/pkgs/tools/networking/darkstat/default.nix +++ b/pkgs/tools/networking/darkstat/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libpcap, zlib }: +{ lib, stdenv, fetchurl, libpcap, zlib }: stdenv.mkDerivation rec { version = "3.0.719"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Network statistics web interface"; longDescription = '' Captures network traffic, calculates statistics about usage, and serves diff --git a/pkgs/tools/networking/davix/default.nix b/pkgs/tools/networking/davix/default.nix index ca9e7b033c51..8c8824657799 100644 --- a/pkgs/tools/networking/davix/default.nix +++ b/pkgs/tools/networking/davix/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, pkgconfig, openssl, libxml2, boost, python3, libuuid }: +{ lib, stdenv, fetchurl, cmake, pkgconfig, openssl, libxml2, boost, python3, libuuid }: stdenv.mkDerivation rec { version = "0.7.6"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }; - meta = with stdenv.lib; { + meta = with lib; { description = "Toolkit for Http-based file management"; longDescription = "Davix is a toolkit designed for file diff --git a/pkgs/tools/networking/dd-agent/datadog-agent.nix b/pkgs/tools/networking/dd-agent/datadog-agent.nix index c81192096927..34e6395ca6d5 100644 --- a/pkgs/tools/networking/dd-agent/datadog-agent.nix +++ b/pkgs/tools/networking/dd-agent/datadog-agent.nix @@ -68,7 +68,7 @@ in buildGoPackage rec { --prefix LD_LIBRARY_PATH : ${lib.getLib systemd}/lib ''; - meta = with stdenv.lib; { + meta = with lib; { description = '' Event collector for the DataDog analysis service -- v6 new golang implementation. diff --git a/pkgs/tools/networking/dd-agent/datadog-process-agent.nix b/pkgs/tools/networking/dd-agent/datadog-process-agent.nix index a59f70f633b1..a77030bba930 100644 --- a/pkgs/tools/networking/dd-agent/datadog-process-agent.nix +++ b/pkgs/tools/networking/dd-agent/datadog-process-agent.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildGoPackage }: +{ lib, stdenv, fetchFromGitHub, buildGoPackage }: buildGoPackage rec { pname = "datadog-process-agent"; @@ -15,7 +15,7 @@ buildGoPackage rec { goDeps = ./datadog-process-agent-deps.nix; goPackagePath = "github.com/${owner}/${repo}"; - meta = with stdenv.lib; { + meta = with lib; { description = "Live process collector for the DataDog Agent v6"; homepage = "https://www.datadoghq.com"; license = licenses.bsd3; diff --git a/pkgs/tools/networking/ddclient/default.nix b/pkgs/tools/networking/ddclient/default.nix index 375898913c8b..3b52c2be2527 100644 --- a/pkgs/tools/networking/ddclient/default.nix +++ b/pkgs/tools/networking/ddclient/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perlPackages, iproute, perl }: +{ lib, stdenv, fetchurl, perlPackages, iproute, perl }: perlPackages.buildPerlPackage rec { pname = "ddclient"; @@ -36,7 +36,7 @@ perlPackages.buildPerlPackage rec { # there are no tests distributed with ddclient doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Client for updating dynamic DNS service entries"; homepage = "https://sourceforge.net/p/ddclient/wiki/Home/"; license = licenses.gpl2Plus; diff --git a/pkgs/tools/networking/dhcp/default.nix b/pkgs/tools/networking/dhcp/default.nix index 5222f731efb9..55feb29af1d2 100644 --- a/pkgs/tools/networking/dhcp/default.nix +++ b/pkgs/tools/networking/dhcp/default.nix @@ -44,6 +44,7 @@ stdenv.mkDerivation rec { "-Wno-error=format-truncation" "-Wno-error=stringop-truncation" "-Wno-error=format-overflow" + "-Wno-error=stringop-overflow=8" ]; installFlags = [ "DESTDIR=\${out}" ]; @@ -67,12 +68,12 @@ stdenv.mkDerivation rec { '' substituteInPlace configure --replace "/usr/bin/file" "${file}/bin/file" sed -i "includes/dhcpd.h" \ - -"es|^ *#define \+_PATH_DHCLIENT_SCRIPT.*$|#define _PATH_DHCLIENT_SCRIPT \"$out/sbin/dhclient-script\"|g" + -e "s|^ *#define \+_PATH_DHCLIENT_SCRIPT.*$|#define _PATH_DHCLIENT_SCRIPT \"$out/sbin/dhclient-script\"|g" export AR='${stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ar' ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Dynamic Host Configuration Protocol (DHCP) tools"; longDescription = '' diff --git a/pkgs/tools/networking/dhcpcd/default.nix b/pkgs/tools/networking/dhcpcd/default.nix index 1a16645cc9b6..3b55687ddd9e 100644 --- a/pkgs/tools/networking/dhcpcd/default.nix +++ b/pkgs/tools/networking/dhcpcd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, udev, runtimeShellPackage, +{ lib, stdenv, fetchurl, fetchpatch, pkgconfig, udev, runtimeShellPackage, runtimeShell }: stdenv.mkDerivation rec { @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { # Check that the udev plugin got built. postInstall = stdenv.lib.optional (udev != null) "[ -e ${placeholder "out"}/lib/dhcpcd/dev/udev.so ]"; - meta = with stdenv.lib; { + meta = with lib; { description = "A client for the Dynamic Host Configuration Protocol (DHCP)"; homepage = "https://roy.marples.name/projects/dhcpcd"; platforms = platforms.linux; diff --git a/pkgs/tools/networking/dhcpdump/default.nix b/pkgs/tools/networking/dhcpdump/default.nix index f68d68382ddb..dba08fea7956 100644 --- a/pkgs/tools/networking/dhcpdump/default.nix +++ b/pkgs/tools/networking/dhcpdump/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libpcap, perl }: +{ lib, stdenv, fetchurl, libpcap, perl }: stdenv.mkDerivation { name = "dhcpdump-1.8"; @@ -17,7 +17,7 @@ stdenv.mkDerivation { cp dhcpdump $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A tool for visualization of DHCP packets as recorded and output by tcpdump to analyze DHCP server responses"; homepage = "http://www.mavetju.org/unix/dhcpdump-man.php"; platforms = platforms.linux; diff --git a/pkgs/tools/networking/dhcping/default.nix b/pkgs/tools/networking/dhcping/default.nix index 36f81555495a..d4255d46096a 100644 --- a/pkgs/tools/networking/dhcping/default.nix +++ b/pkgs/tools/networking/dhcping/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "dhcping"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Send DHCP request to find out if a DHCP server is running"; longDescription = '' dhcping sends either a DHCPREQUEST or DHCPINFORM packet to the server diff --git a/pkgs/tools/networking/dibbler/default.nix b/pkgs/tools/networking/dibbler/default.nix index 1849890d23c2..b8b40635a969 100644 --- a/pkgs/tools/networking/dibbler/default.nix +++ b/pkgs/tools/networking/dibbler/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "dibbler"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-D__APPLE_USE_RFC_2292=1"; - meta = with stdenv.lib; { + meta = with lib; { description = "Portable DHCPv6 implementation"; homepage = "http://www.klub.com.pl/dhcpv6/"; license = licenses.gpl2; diff --git a/pkgs/tools/networking/djbdns/default.nix b/pkgs/tools/networking/djbdns/default.nix index ca622a6244fc..1b93d64d08f5 100644 --- a/pkgs/tools/networking/djbdns/default.nix +++ b/pkgs/tools/networking/djbdns/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, glibc, dns-root-data } : +{ lib, stdenv, fetchurl, glibc, dns-root-data } : let version = "1.05"; @@ -41,7 +41,7 @@ stdenv.mkDerivation { rm -rv djbdns-man; ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A collection of Domain Name System tools"; longDescription = "Includes software for all the fundamental DNS operations: DNS cache: finding addresses of Internet hosts; DNS server: publishing addresses of Internet hosts; and DNS client: talking to a DNS cache."; homepage = "https://cr.yp.to/djbdns.html"; diff --git a/pkgs/tools/networking/dnscrypt-proxy2/default.nix b/pkgs/tools/networking/dnscrypt-proxy2/default.nix index 64a58bc15a96..978b82c77fb7 100644 --- a/pkgs/tools/networking/dnscrypt-proxy2/default.nix +++ b/pkgs/tools/networking/dnscrypt-proxy2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "dnscrypt-proxy2"; @@ -15,7 +15,7 @@ buildGoModule rec { sha256 = "08bg60j5z349blj5sip1f8f793q12ix3zmqkayym5nf69s1pfm7l"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A tool that provides secure DNS resolution"; license = licenses.isc; diff --git a/pkgs/tools/networking/dnscrypt-wrapper/default.nix b/pkgs/tools/networking/dnscrypt-wrapper/default.nix index 5c44734665c9..fdab2ff3003d 100644 --- a/pkgs/tools/networking/dnscrypt-wrapper/default.nix +++ b/pkgs/tools/networking/dnscrypt-wrapper/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libsodium, libevent }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libsodium, libevent }: stdenv.mkDerivation rec { pname = "dnscrypt-wrapper"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig autoreconfHook ]; buildInputs = [ libsodium libevent ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A tool for adding dnscrypt support to any name resolver"; homepage = "https://dnscrypt.info/"; license = licenses.isc; diff --git a/pkgs/tools/networking/dnsperf/default.nix b/pkgs/tools/networking/dnsperf/default.nix index 68107f193288..5aba2af865f3 100644 --- a/pkgs/tools/networking/dnsperf/default.nix +++ b/pkgs/tools/networking/dnsperf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub, autoreconfHook, pkgconfig +{ lib, stdenv, fetchurl, fetchFromGitHub, autoreconfHook, pkgconfig , openssl, ldns }: @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { cp ./dnsperf-src-*/doc/*.pdf "$doc/share/doc/dnsperf/" ''; - meta = with stdenv.lib; { + meta = with lib; { outputsToInstall = outputs; # The man pages and docs are likely useful to most. description = "Tools for DNS benchmaring"; diff --git a/pkgs/tools/networking/dnsproxy/default.nix b/pkgs/tools/networking/dnsproxy/default.nix index e7c30551dc9b..3c51073570fb 100644 --- a/pkgs/tools/networking/dnsproxy/default.nix +++ b/pkgs/tools/networking/dnsproxy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildGoModule }: +{ lib, stdenv, fetchFromGitHub, buildGoModule }: buildGoModule rec { pname = "dnsproxy"; @@ -15,7 +15,7 @@ buildGoModule rec { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Simple DNS proxy with DoH, DoT, and DNSCrypt support"; homepage = "https://github.com/AdguardTeam/dnsproxy"; license = licenses.gpl3; diff --git a/pkgs/tools/networking/dnstracer/default.nix b/pkgs/tools/networking/dnstracer/default.nix index 558e0dca9034..53a3e32aa6c4 100644 --- a/pkgs/tools/networking/dnstracer/default.nix +++ b/pkgs/tools/networking/dnstracer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libresolv, perl }: +{ lib, stdenv, fetchurl, libresolv, perl }: stdenv.mkDerivation rec { version = "1.10"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lresolv"; - meta = with stdenv.lib; { + meta = with lib; { description = "Determines where a given Domain Name Server (DNS) gets its information from, and follows the chain of DNS servers back to the servers which know the data"; homepage = "http://www.mavetju.org/unix/general.php"; license = licenses.bsd2; diff --git a/pkgs/tools/networking/dogdns/default.nix b/pkgs/tools/networking/dogdns/default.nix index 71e065e5d14c..4e3b255fc55d 100644 --- a/pkgs/tools/networking/dogdns/default.nix +++ b/pkgs/tools/networking/dogdns/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , rustPlatform , pkg-config @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { installShellCompletion completions/dog.{bash,fish,zsh} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Command-line DNS client"; homepage = "https://dns.lookup.dog"; license = licenses.eupl12; diff --git a/pkgs/tools/networking/drill/default.nix b/pkgs/tools/networking/drill/default.nix index 176062ed314b..7c1ba1928ec3 100644 --- a/pkgs/tools/networking/drill/default.nix +++ b/pkgs/tools/networking/drill/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , rustPlatform , fetchFromGitHub , pkg-config @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { ++ stdenv.lib.optionals stdenv.isLinux [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ Security ]; - meta = with stdenv.lib; { + meta = with lib; { description = "HTTP load testing application inspired by Ansible syntax"; homepage = "https://github.com/fcsonline/drill"; license = licenses.gpl3; diff --git a/pkgs/tools/networking/dropbear/default.nix b/pkgs/tools/networking/dropbear/default.nix index 88217302915e..f922a70344c4 100644 --- a/pkgs/tools/networking/dropbear/default.nix +++ b/pkgs/tools/networking/dropbear/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, glibc, zlib -, enableStatic ? false +, enableStatic ? stdenv.hostPlatform.isStatic , sftpPath ? "/run/current-system/sw/libexec/sftp-server" }: @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { buildInputs = [ zlib ] ++ lib.optionals enableStatic [ glibc.static zlib.static ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://matt.ucc.asn.au/dropbear/dropbear.html"; description = "A small footprint implementation of the SSH 2 protocol"; license = licenses.mit; diff --git a/pkgs/tools/networking/dsniff/default.nix b/pkgs/tools/networking/dsniff/default.nix index db9c608e931b..3a8eab862cb1 100644 --- a/pkgs/tools/networking/dsniff/default.nix +++ b/pkgs/tools/networking/dsniff/default.nix @@ -1,6 +1,10 @@ -{ stdenv, fetchFromGitLab, autoreconfHook, libpcap, db, glib, libnet, libnids, symlinkJoin, openssl +{ gcc9Stdenv, lib, fetchFromGitLab, autoreconfHook, libpcap, db, glib, libnet, libnids, symlinkJoin, openssl , rpcsvc-proto, libtirpc, libnsl }: + +# We compile with GCC 9 since GCC 10 segfaults on the code +# (see https://bugzilla.redhat.com/show_bug.cgi?id=1862809). + let /* dsniff's build system unconditionnaly wants static libraries and does not @@ -38,7 +42,7 @@ let inherit (openssl) name; paths = with openssl.override { static = true; }; [ out dev ]; }; -in stdenv.mkDerivation rec { +in gcc9Stdenv.mkDerivation rec { pname = "dsniff"; version = "2.4b1"; # upstream is so old that nearly every distribution packages the beta version. @@ -71,7 +75,7 @@ in stdenv.mkDerivation rec { "--with-openssl=${ssl}" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "collection of tools for network auditing and penetration testing"; longDescription = '' dsniff, filesnarf, mailsnarf, msgsnarf, urlsnarf, and webspy passively monitor a network for interesting data (passwords, e-mail, files, etc.). arpspoof, dnsspoof, and macof facilitate the interception of network traffic normally unavailable to an attacker (e.g, due to layer-2 switching). sshmitm and webmitm implement active monkey-in-the-middle attacks against redirected SSH and HTTPS sessions by exploiting weak bindings in ad-hoc PKI. diff --git a/pkgs/tools/networking/easyrsa/2.x.nix b/pkgs/tools/networking/easyrsa/2.x.nix index fef2648de7fb..52cf2082d63f 100644 --- a/pkgs/tools/networking/easyrsa/2.x.nix +++ b/pkgs/tools/networking/easyrsa/2.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, makeWrapper +{ lib, stdenv, fetchurl, autoreconfHook, makeWrapper , gnugrep, openssl }: stdenv.mkDerivation { @@ -28,7 +28,7 @@ stdenv.mkDerivation { sed -i "/EASY_RSA=\|OPENSSL=\|GREP=/d" $out/share/easy-rsa/vars ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Simple shell based CA utility"; homepage = "https://openvpn.net/"; license = licenses.gpl2; diff --git a/pkgs/tools/networking/easyrsa/default.nix b/pkgs/tools/networking/easyrsa/default.nix index 4568aec9c5d9..34e326858fdc 100644 --- a/pkgs/tools/networking/easyrsa/default.nix +++ b/pkgs/tools/networking/easyrsa/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, openssl, runtimeShell }: +{ lib, stdenv, fetchFromGitHub, openssl, runtimeShell }: let version = "3.0.8"; @@ -32,7 +32,7 @@ in stdenv.mkDerivation { chmod +x $out/bin/easyrsa-init ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Simple shell based CA utility"; homepage = "https://openvpn.net/"; license = licenses.gpl2; diff --git a/pkgs/tools/networking/eggdrop/default.nix b/pkgs/tools/networking/eggdrop/default.nix index dc5bf1ef9760..2db99bfa8280 100644 --- a/pkgs/tools/networking/eggdrop/default.nix +++ b/pkgs/tools/networking/eggdrop/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, tcl }: +{ lib, stdenv, fetchFromGitHub, tcl }: stdenv.mkDerivation rec { pname = "eggdrop"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { "--with-tclinc=${tcl}/include/tcl.h" ]; - meta = with stdenv.lib; { + meta = with lib; { license = licenses.gpl2; platforms = platforms.unix; homepage = "http://www.eggheads.org"; diff --git a/pkgs/tools/networking/eternal-terminal/default.nix b/pkgs/tools/networking/eternal-terminal/default.nix index fdad966c81b6..78884a23cbbd 100644 --- a/pkgs/tools/networking/eternal-terminal/default.nix +++ b/pkgs/tools/networking/eternal-terminal/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , cmake , gflags @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ gflags libsodium protobuf ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Remote shell that automatically reconnects without interrupting the session"; license = licenses.asl20; homepage = "https://mistertea.github.io/EternalTerminal/"; diff --git a/pkgs/tools/networking/fakeroute/default.nix b/pkgs/tools/networking/fakeroute/default.nix index 2bfecc389d5f..025eef72332f 100644 --- a/pkgs/tools/networking/fakeroute/default.nix +++ b/pkgs/tools/networking/fakeroute/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "fakeroute"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1sp342rxgm1gz4mvi5vvz1knz7kn9px9s39ii3jdjp4ks7lr5c8f"; }; - meta = with stdenv.lib; { + meta = with lib; { description = '' Makes your machine appear to be anywhere on the internet to any host running a (UDP) unix traceroute diff --git a/pkgs/tools/networking/fastd/default.nix b/pkgs/tools/networking/fastd/default.nix index 864b57a0c383..d57d9fc635b2 100644 --- a/pkgs/tools/networking/fastd/default.nix +++ b/pkgs/tools/networking/fastd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, bison, meson, ninja, pkgconfig +{ lib, stdenv, fetchFromGitHub, bison, meson, ninja, pkgconfig , libuecc, libsodium, libcap, json_c, openssl }: stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Fast and Secure Tunneling Daemon"; homepage = "https://projects.universe-factory.net/projects/fastd/wiki"; license = with licenses; [ bsd2 bsd3 ]; diff --git a/pkgs/tools/networking/fdm/default.nix b/pkgs/tools/networking/fdm/default.nix index cb5a781f5efa..608b669535d4 100644 --- a/pkgs/tools/networking/fdm/default.nix +++ b/pkgs/tools/networking/fdm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, openssl, tdb, zlib, flex, bison }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, openssl, tdb, zlib, flex, bison }: stdenv.mkDerivation rec { pname = "fdm"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ openssl tdb zlib flex bison ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Mail fetching and delivery tool - should do the job of getmail and procmail"; maintainers = with maintainers; [ ninjin raskin ]; platforms = with platforms; linux; diff --git a/pkgs/tools/networking/filegive/default.nix b/pkgs/tools/networking/filegive/default.nix index bedb97200c12..3ed250ca4bcd 100644 --- a/pkgs/tools/networking/filegive/default.nix +++ b/pkgs/tools/networking/filegive/default.nix @@ -1,4 +1,4 @@ -{ buildGoPackage, stdenv, fetchurl }: +{ buildGoPackage, lib, stdenv, fetchurl }: buildGoPackage rec { name = "filegive-0.7.4"; @@ -12,7 +12,7 @@ buildGoPackage rec { goPackagePath = "viric.name/soft/filegive"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://viric.name/cgi-bin/filegive"; description = "Easy p2p file sending program"; license = licenses.agpl3Plus; diff --git a/pkgs/tools/networking/fping/default.nix b/pkgs/tools/networking/fping/default.nix index d170ee4cd0e3..7974fdd244bd 100644 --- a/pkgs/tools/networking/fping/default.nix +++ b/pkgs/tools/networking/fping/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "fping-5.0"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-ipv6" "--enable-ipv4" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://fping.org/"; description = "Send ICMP echo probes to network hosts"; license = licenses.bsd0; diff --git a/pkgs/tools/networking/freebind/default.nix b/pkgs/tools/networking/freebind/default.nix index c1dc3d8fd5f8..5ba462f15b24 100644 --- a/pkgs/tools/networking/freebind/default.nix +++ b/pkgs/tools/networking/freebind/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libnetfilter_queue, libnfnetlink }: +{ lib, stdenv, fetchFromGitHub, libnetfilter_queue, libnfnetlink }: stdenv.mkDerivation { pname = "freebind"; @@ -22,7 +22,7 @@ stdenv.mkDerivation { mkdir -p $out/bin $out/lib ''; - meta = with stdenv.lib; { + meta = with lib; { description = "IPv4 and IPv6 address rate limiting evasion tool"; homepage = "https://github.com/blechschmidt/freebind"; license = licenses.gpl3; diff --git a/pkgs/tools/networking/gandi-cli/default.nix b/pkgs/tools/networking/gandi-cli/default.nix index b323cde28bc2..e66d5b7c2a5b 100644 --- a/pkgs/tools/networking/gandi-cli/default.nix +++ b/pkgs/tools/networking/gandi-cli/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python3Packages, fetchFromGitHub }: +{ lib, stdenv, python3Packages, fetchFromGitHub }: with python3Packages; @@ -17,7 +17,7 @@ buildPythonApplication rec { doCheck = false; # Tests try to contact the actual remote API - meta = with stdenv.lib; { + meta = with lib; { description = "Command-line interface to the public Gandi.net API"; homepage = "https://cli.gandi.net/"; license = licenses.gpl3Plus; diff --git a/pkgs/tools/networking/gmrender-resurrect/default.nix b/pkgs/tools/networking/gmrender-resurrect/default.nix index 8a8ed25a5a62..843c53a7ad59 100644 --- a/pkgs/tools/networking/gmrender-resurrect/default.nix +++ b/pkgs/tools/networking/gmrender-resurrect/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pkgconfig, makeWrapper, gstreamer +{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pkgconfig, makeWrapper, gstreamer , gst-plugins-base, gst-plugins-good, gst-plugins-bad, gst-plugins-ugly, gst-libav, libupnp }: let @@ -36,7 +36,7 @@ in done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Resource efficient UPnP/DLNA renderer, optimal for Raspberry Pi, CuBox or a general MediaServer"; homepage = "https://github.com/hzeller/gmrender-resurrect"; license = licenses.gpl2; diff --git a/pkgs/tools/networking/gnirehtet/default.nix b/pkgs/tools/networking/gnirehtet/default.nix index 8d7d2392dfb7..193a0b9e0fb5 100644 --- a/pkgs/tools/networking/gnirehtet/default.nix +++ b/pkgs/tools/networking/gnirehtet/default.nix @@ -1,4 +1,4 @@ -{ stdenv, rustPlatform, fetchFromGitHub, fetchzip, androidenv, makeWrapper }: +{ lib, stdenv, rustPlatform, fetchFromGitHub, fetchzip, androidenv, makeWrapper }: let version = "2.5"; apk = stdenv.mkDerivation { @@ -35,7 +35,7 @@ rustPlatform.buildRustPackage { --set ADB ${androidenv.androidPkgs_9_0.platform-tools}/bin/adb ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Reverse tethering over adb for Android"; longDescription = '' This project provides reverse tethering over adb for Android: it allows devices to use the internet connection of the computer they are plugged on. It does not require any root access (neither on the device nor on the computer). diff --git a/pkgs/tools/networking/go-shadowsocks2/default.nix b/pkgs/tools/networking/go-shadowsocks2/default.nix index 6b55c21b5b04..c989f36da3d9 100644 --- a/pkgs/tools/networking/go-shadowsocks2/default.nix +++ b/pkgs/tools/networking/go-shadowsocks2/default.nix @@ -1,21 +1,19 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "go-shadowsocks2"; - version = "0.0.11"; - - goPackagePath = "github.com/shadowsocks/go-shadowsocks2"; + version = "0.1.3"; src = fetchFromGitHub { owner = "shadowsocks"; repo = "go-shadowsocks2"; rev = "v${version}"; - sha256 = "1dprz84gmcp6xcsk873lhj32wm8b55vnqn0s984ggvwf1rjqw00c"; + sha256 = "1wzy3ml4ld83iawcl6p313bskzs6zjhz8vlg8kpwgn71cnbv4pvi"; }; - goDeps = ./deps.nix; + vendorSha256 = "0iyak8af708h3rdrslndladbcjrix35j3rlhpsb8ljchqp09lksg"; - meta = with stdenv.lib; { + meta = with lib; { description = "Fresh implementation of Shadowsocks in Go"; homepage = "https://github.com/shadowsocks/go-shadowsocks2/"; license = licenses.asl20; diff --git a/pkgs/tools/networking/go-shadowsocks2/deps.nix b/pkgs/tools/networking/go-shadowsocks2/deps.nix deleted file mode 100644 index 7fe0c2b6985b..000000000000 --- a/pkgs/tools/networking/go-shadowsocks2/deps.nix +++ /dev/null @@ -1,30 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 -[ - { - goPackagePath = "github.com/aead/chacha20"; - fetch = { - type = "git"; - url = "https://github.com/aead/chacha20"; - rev = "8b13a72661dae6e9e5dea04f344f0dc95ea29547"; - sha256 = "0gbmgq5kbqmbyrsav57ql4jzbvqvp1q7yvcd5fl3wf5g94iyv56r"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "60c769a6c58655dab1b9adac0d58967dd517cfba"; - sha256 = "1wy2pg38dz29vf1h48yfqf8m3jqvwnbdw8vkk3ldlj5d8fbbbmv8"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "fb81701db80f1745f51259b1f286de3fe2ec80c8"; - sha256 = "1cgvyzkmsbvgyp75nxp10fpnpy08scz6ak60s9w0mkgibw7irhz3"; - }; - } -] diff --git a/pkgs/tools/networking/goklp/default.nix b/pkgs/tools/networking/goklp/default.nix index 534a809e46af..78117a700bd3 100644 --- a/pkgs/tools/networking/goklp/default.nix +++ b/pkgs/tools/networking/goklp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "goklp"; @@ -15,7 +15,7 @@ buildGoPackage rec { goDeps = ./deps.nix; - meta = with stdenv.lib; { + meta = with lib; { description = "Golang OpenSSH Keys Ldap Provider for AuthorizedKeysCommand"; homepage = "https://github.com/AppliedTrust/goklp"; maintainers = with maintainers; [ disassembler ]; diff --git a/pkgs/tools/networking/gupnp-tools/default.nix b/pkgs/tools/networking/gupnp-tools/default.nix index c93873caa07f..bace27f3d8dc 100644 --- a/pkgs/tools/networking/gupnp-tools/default.nix +++ b/pkgs/tools/networking/gupnp-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , meson , ninja @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Set of utilities and demos to work with UPnP"; homepage = "https://wiki.gnome.org/Projects/GUPnP"; license = licenses.gpl2Plus; diff --git a/pkgs/tools/networking/gvpe/default.nix b/pkgs/tools/networking/gvpe/default.nix index 3dea0217b60d..788d61e9ca95 100644 --- a/pkgs/tools/networking/gvpe/default.nix +++ b/pkgs/tools/networking/gvpe/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl, gmp, zlib, iproute, nettools }: +{ lib, stdenv, fetchurl, openssl, gmp, zlib, iproute, nettools }: stdenv.mkDerivation rec { pname = "gvpe"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { sed -e 's@/sbin/ifconfig@${nettools}/sbin/ifconfig@g' -i src/device-*.C ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A protected multinode virtual network"; homepage = "http://software.schmorp.de/pkg/gvpe.html"; maintainers = [ maintainers.raskin ]; diff --git a/pkgs/tools/networking/hans/default.nix b/pkgs/tools/networking/hans/default.nix index cea13bca24c3..04271d6ef710 100644 --- a/pkgs/tools/networking/hans/default.nix +++ b/pkgs/tools/networking/hans/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, nettools }: +{ lib, stdenv, fetchFromGitHub, nettools }: stdenv.mkDerivation rec { pname = "hans"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { install -D -m0755 hans $out/bin/hans ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Tunnel IPv4 over ICMP"; longDescription = '' Hans makes it possible to tunnel IPv4 through ICMP echo packets, so you diff --git a/pkgs/tools/networking/horst/default.nix b/pkgs/tools/networking/horst/default.nix index 704eaa85cd04..66cb883f5aa1 100644 --- a/pkgs/tools/networking/horst/default.nix +++ b/pkgs/tools/networking/horst/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, pkgconfig, ncurses, libnl }: +{lib, stdenv, fetchFromGitHub, pkgconfig, ncurses, libnl }: stdenv.mkDerivation rec { pname = "horst"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { installFlags = [ "DESTDIR=${placeholder "out"}" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Small and lightweight IEEE802.11 wireless LAN analyzer with a text interface"; homepage = "http://br1.einfach.org/tech/horst/"; maintainers = [ maintainers.fpletz ]; diff --git a/pkgs/tools/networking/hping/default.nix b/pkgs/tools/networking/hping/default.nix index daa0ba38e9ee..5d8b6ab37e84 100644 --- a/pkgs/tools/networking/hping/default.nix +++ b/pkgs/tools/networking/hping/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libpcap, withTcl ? true, tcl }: +{ lib, stdenv, fetchFromGitHub, libpcap, withTcl ? true, tcl }: stdenv.mkDerivation rec { pname = "hping"; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ln -s hping3.8.gz $out/share/man/man8/hping2.8.gz ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A command-line oriented TCP/IP packet assembler/analyzer"; homepage = "http://www.hping.org/"; license = licenses.gpl2Only; diff --git a/pkgs/tools/networking/htpdate/default.nix b/pkgs/tools/networking/htpdate/default.nix index d03b08cf5eb5..cd2b3a18d421 100644 --- a/pkgs/tools/networking/htpdate/default.nix +++ b/pkgs/tools/networking/htpdate/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { version = "1.2.2"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Utility to fetch time and set the system clock over HTTP"; homepage = "http://www.vervest.org/htp/"; platforms = platforms.linux; diff --git a/pkgs/tools/networking/http-prompt/default.nix b/pkgs/tools/networking/http-prompt/default.nix index 9c524c0cc090..59a3bffdc6db 100644 --- a/pkgs/tools/networking/http-prompt/default.nix +++ b/pkgs/tools/networking/http-prompt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python3Packages, httpie }: +{ lib, stdenv, fetchFromGitHub, python3Packages, httpie }: python3Packages.buildPythonApplication rec { pname = "http-prompt"; @@ -24,7 +24,7 @@ python3Packages.buildPythonApplication rec { $out/bin/${pname} --version | grep -q "${version}" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "An interactive command-line HTTP client featuring autocomplete and syntax highlighting"; homepage = "https://github.com/eliangcs/http-prompt"; license = licenses.mit; diff --git a/pkgs/tools/networking/httperf/default.nix b/pkgs/tools/networking/httperf/default.nix index 50c35fbb33c1..f5c888dc4bb6 100644 --- a/pkgs/tools/networking/httperf/default.nix +++ b/pkgs/tools/networking/httperf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, openssl }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, openssl }: stdenv.mkDerivation rec { pname = "httperf"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { mv -v src/httperf $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "The httperf HTTP load generator"; homepage = "https://github.com/httperf/httperf"; maintainers = with maintainers; [ nand0p ]; diff --git a/pkgs/tools/networking/httping/default.nix b/pkgs/tools/networking/httping/default.nix index 74aff38e1a60..7389c78ef8db 100644 --- a/pkgs/tools/networking/httping/default.nix +++ b/pkgs/tools/networking/httping/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gettext, libintl, ncurses, openssl +{ lib, stdenv, fetchurl, gettext, libintl, ncurses, openssl , fftw ? null }: stdenv.mkDerivation rec { @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { "PREFIX=" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://vanheusden.com/httping"; description = "ping with HTTP requests"; longDescription = '' diff --git a/pkgs/tools/networking/httplab/default.nix b/pkgs/tools/networking/httplab/default.nix index f4fb4fe96076..22dc500fd4cd 100644 --- a/pkgs/tools/networking/httplab/default.nix +++ b/pkgs/tools/networking/httplab/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "httplab"; @@ -14,7 +14,7 @@ buildGoPackage rec { sha256 = "0442nnpxyfl2gi9pilv7q6cxs2cd98wblg8d4nw6dx98yh4h99zs"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/gchaincl/httplab"; description = "Interactive WebServer"; license = licenses.mit; diff --git a/pkgs/tools/networking/httplz/default.nix b/pkgs/tools/networking/httplz/default.nix index bf0a5b903888..3932bbd08cf8 100644 --- a/pkgs/tools/networking/httplz/default.nix +++ b/pkgs/tools/networking/httplz/default.nix @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { --prefix PATH : "${openssl}/bin" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A basic http server for hosting a folder fast and simply"; homepage = "https://github.com/thecoshman/http"; license = licenses.mit; diff --git a/pkgs/tools/networking/httptunnel/default.nix b/pkgs/tools/networking/httptunnel/default.nix index e8ed86da3da3..13ef64175358 100644 --- a/pkgs/tools/networking/httptunnel/default.nix +++ b/pkgs/tools/networking/httptunnel/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { version = "3.3"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0mn5s6p68n32xzadz6ds5i6bp44dyxzkq68r1yljlv470jr84bql"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Creates a bidirectional virtual data connection tunnelled in HTTP requests"; homepage = "http://www.nocrew.org/software/httptunnel"; license = licenses.gpl2; diff --git a/pkgs/tools/networking/i2p/default.nix b/pkgs/tools/networking/i2p/default.nix index 5c209393978f..a3b52d19e2dc 100644 --- a/pkgs/tools/networking/i2p/default.nix +++ b/pkgs/tools/networking/i2p/default.nix @@ -1,4 +1,4 @@ -{ stdenv, ps, coreutils, fetchurl, jdk, jre, ant, gettext, which }: +{ lib, stdenv, ps, coreutils, fetchurl, jdk, jre, ant, gettext, which }: let wrapper = stdenv.mkDerivation rec { pname = "wrapper"; @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { rm $out/{osid,postinstall.sh,INSTALL-headless.txt} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Applications and router for I2P, anonymity over the Internet"; homepage = "https://geti2p.net"; license = licenses.gpl2; diff --git a/pkgs/tools/networking/i2pd/default.nix b/pkgs/tools/networking/i2pd/default.nix index 8bf90293a8ec..873ecf03bbb1 100644 --- a/pkgs/tools/networking/i2pd/default.nix +++ b/pkgs/tools/networking/i2pd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , boost, zlib, openssl , upnpSupport ? true, miniupnpc ? null , aesniSupport ? stdenv.hostPlatform.aesSupport @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { install -D i2pd $out/bin/i2pd ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://i2pd.website"; description = "Minimal I2P router written in C++"; license = licenses.bsd3; diff --git a/pkgs/tools/networking/ifstat-legacy/default.nix b/pkgs/tools/networking/ifstat-legacy/default.nix index 25b6af5e92f4..8383f82fd93c 100644 --- a/pkgs/tools/networking/ifstat-legacy/default.nix +++ b/pkgs/tools/networking/ifstat-legacy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, net-snmp }: +{ lib, stdenv, fetchurl, autoreconfHook, net-snmp }: stdenv.mkDerivation rec { pname = "ifstat-legacy"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { mv $out/share/man/man1/ifstat.1 $out/share/man/man1/ifstat-legacy.1 ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Report network interfaces bandwith just like vmstat/iostat do for other system counters - legacy version"; homepage = "http://gael.roualland.free.fr/ifstat/"; maintainers = with maintainers; [ peterhoeg ]; diff --git a/pkgs/tools/networking/iftop/default.nix b/pkgs/tools/networking/iftop/default.nix index 70c1f0b6c965..900a740c7246 100644 --- a/pkgs/tools/networking/iftop/default.nix +++ b/pkgs/tools/networking/iftop/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, libpcap, automake, nixosTests }: +{ lib, stdenv, fetchurl, ncurses, libpcap, automake, nixosTests }: stdenv.mkDerivation { name = "iftop-1.0pre4"; @@ -20,7 +20,7 @@ stdenv.mkDerivation { passthru.tests = { inherit (nixosTests) iftop; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Display bandwidth usage on a network interface"; longDescription = '' iftop does for network usage what top(1) does for CPU usage. It listens diff --git a/pkgs/tools/networking/igmpproxy/default.nix b/pkgs/tools/networking/igmpproxy/default.nix index 83b35c098669..0c4279b6f649 100644 --- a/pkgs/tools/networking/igmpproxy/default.nix +++ b/pkgs/tools/networking/igmpproxy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { pname = "igmpproxy"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A daemon that routes multicast using IGMP forwarding"; homepage = "https://github.com/pali/igmpproxy/"; changelog = "https://github.com/pali/igmpproxy/releases/tag/${version}"; diff --git a/pkgs/tools/networking/imapsync/default.nix b/pkgs/tools/networking/imapsync/default.nix index aa0980a2514e..bec0b197c184 100644 --- a/pkgs/tools/networking/imapsync/default.nix +++ b/pkgs/tools/networking/imapsync/default.nix @@ -1,4 +1,4 @@ -{stdenv, makeWrapper, fetchurl, perl, openssl, perlPackages }: +{lib, stdenv, makeWrapper, fetchurl, perl, openssl, perlPackages }: stdenv.mkDerivation rec { name = "imapsync-1.727"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { IOSocketInet6 NTLM ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.linux-france.org/prj/imapsync/"; description = "Mail folder synchronizer between IMAP servers"; license = licenses.gpl2Plus; diff --git a/pkgs/tools/networking/inadyn/default.nix b/pkgs/tools/networking/inadyn/default.nix index f01bffa76da5..2cb04c1b2101 100644 --- a/pkgs/tools/networking/inadyn/default.nix +++ b/pkgs/tools/networking/inadyn/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig , gnutls, libite, libconfuse }: stdenv.mkDerivation rec { @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://troglobit.com/project/inadyn/"; description = "Free dynamic DNS client"; license = licenses.gpl2Plus; diff --git a/pkgs/tools/networking/iouyap/default.nix b/pkgs/tools/networking/iouyap/default.nix index b49b34d6dc7a..2367261b5223 100644 --- a/pkgs/tools/networking/iouyap/default.nix +++ b/pkgs/tools/networking/iouyap/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, bison, flex }: +{ lib, stdenv, fetchFromGitHub, bison, flex }: stdenv.mkDerivation rec { pname = "iouyap"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { install -D -m555 iouyap $out/bin/iouyap; ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Bridge IOU to UDP, TAP and Ethernet"; inherit (src.meta) homepage; license = licenses.gpl3Plus; diff --git a/pkgs/tools/networking/ip2location/default.nix b/pkgs/tools/networking/ip2location/default.nix index 205a4e6e7015..df5d26b4f5db 100644 --- a/pkgs/tools/networking/ip2location/default.nix +++ b/pkgs/tools/networking/ip2location/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "ip2location"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Look up locations of host names and IP addresses"; longDescription = '' A command-line tool to find the country, region, city,coordinates, diff --git a/pkgs/tools/networking/iperf/2.nix b/pkgs/tools/networking/iperf/2.nix index f90b74313e50..3270a25e67b2 100644 --- a/pkgs/tools/networking/iperf/2.nix +++ b/pkgs/tools/networking/iperf/2.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "iperf-2.0.13"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ln -s $out/bin/iperf2 $out/bin/iperf ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://sourceforge.net/projects/iperf/"; description = "Tool to measure IP bandwidth using UDP or TCP"; platforms = platforms.unix; diff --git a/pkgs/tools/networking/iperf/3.nix b/pkgs/tools/networking/iperf/3.nix index 2ca924731466..aa9316642dd5 100644 --- a/pkgs/tools/networking/iperf/3.nix +++ b/pkgs/tools/networking/iperf/3.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl, fetchpatch }: +{ lib, stdenv, fetchurl, openssl, fetchpatch }: stdenv.mkDerivation rec { pname = "iperf"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ln -s $man/share/man/man1/iperf3.1 $man/share/man/man1/iperf.1 ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://software.es.net/iperf/"; description = "Tool to measure IP bandwidth using UDP or TCP"; platforms = platforms.unix; diff --git a/pkgs/tools/networking/ipgrep/default.nix b/pkgs/tools/networking/ipgrep/default.nix index d9fc41e94b6f..dd85a5dcb617 100644 --- a/pkgs/tools/networking/ipgrep/default.nix +++ b/pkgs/tools/networking/ipgrep/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python3Packages }: +{ lib, stdenv, fetchFromGitHub, python3Packages }: python3Packages.buildPythonApplication rec { version = "1.0.1"; @@ -25,7 +25,7 @@ python3Packages.buildPythonApplication rec { requests ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Extract, defang, resolve names and IPs from text"; longDescription = '' ipgrep extracts possibly obfuscated host names and IP addresses diff --git a/pkgs/tools/networking/ipv6calc/default.nix b/pkgs/tools/networking/ipv6calc/default.nix index 35aeb23a9a83..47b8abe54d33 100644 --- a/pkgs/tools/networking/ipv6calc/default.nix +++ b/pkgs/tools/networking/ipv6calc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, getopt, ip2location-c, openssl, perl +{ lib, stdenv, fetchurl, getopt, ip2location-c, openssl, perl , libmaxminddb ? null, geolite-legacy ? null }: stdenv.mkDerivation rec { @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Calculate/manipulate (not only) IPv6 addresses"; longDescription = '' ipv6calc is a small utility to manipulate (not only) IPv6 addresses and diff --git a/pkgs/tools/networking/isync/default.nix b/pkgs/tools/networking/isync/default.nix index 44eb5c50ba80..365a0669e42d 100644 --- a/pkgs/tools/networking/isync/default.nix +++ b/pkgs/tools/networking/isync/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkg-config, perl +{ lib, stdenv, fetchurl, pkg-config, perl , openssl, db, zlib, cyrus_sasl }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config perl ]; buildInputs = [ openssl db cyrus_sasl zlib ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://isync.sourceforge.net/"; # https://sourceforge.net/projects/isync/ changelog = "https://sourceforge.net/p/isync/isync/ci/v${version}/tree/NEWS"; diff --git a/pkgs/tools/networking/kail/default.nix b/pkgs/tools/networking/kail/default.nix index 497afb459ef0..2ddcd6c7d4bf 100644 --- a/pkgs/tools/networking/kail/default.nix +++ b/pkgs/tools/networking/kail/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "kail"; @@ -23,7 +23,7 @@ buildGoPackage rec { deleteVendor = true; goDeps = ./deps.nix; - meta = with stdenv.lib; { + meta = with lib; { description = "Kubernetes log viewer"; homepage = "https://github.com/boz/kail"; license = licenses.mit; diff --git a/pkgs/tools/networking/kea/default.nix b/pkgs/tools/networking/kea/default.nix index 1637827f66ea..6b3640919466 100644 --- a/pkgs/tools/networking/kea/default.nix +++ b/pkgs/tools/networking/kea/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, pkgconfig, openssl, botan2, log4cplus +{ lib, stdenv, fetchurl, autoreconfHook, pkgconfig, openssl, botan2, log4cplus , boost, python3, postgresql, libmysqlclient, gmp, bzip2 }: let inherit (stdenv) lib; in @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://kea.isc.org/"; description = "High-performance, extensible DHCP server by ISC"; longDescription = '' diff --git a/pkgs/tools/networking/keepalived/default.nix b/pkgs/tools/networking/keepalived/default.nix index b773e116d8be..604a30a0ba7b 100644 --- a/pkgs/tools/networking/keepalived/default.nix +++ b/pkgs/tools/networking/keepalived/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, nixosTests +{ lib, stdenv, fetchFromGitHub, nixosTests , libnfnetlink, libnl, net-snmp, openssl , pkgconfig, autoreconfHook }: @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { "--enable-snmp" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://keepalived.org"; description = "Routing software written in C"; license = licenses.gpl2; diff --git a/pkgs/tools/networking/lftp/default.nix b/pkgs/tools/networking/lftp/default.nix index 53568615a624..d356601a9340 100644 --- a/pkgs/tools/networking/lftp/default.nix +++ b/pkgs/tools/networking/lftp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gnutls, pkgconfig, readline, zlib, libidn2, gmp, libiconv, libunistring, gettext }: +{ lib, stdenv, fetchurl, gnutls, pkgconfig, readline, zlib, libidn2, gmp, libiconv, libunistring, gettext }: stdenv.mkDerivation rec { pname = "lftp"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A file transfer program supporting a number of network protocols"; homepage = "https://lftp.tech/"; license = licenses.gpl3; diff --git a/pkgs/tools/networking/libnids/default.nix b/pkgs/tools/networking/libnids/default.nix index 2a93d3c8a598..aff451ab44a0 100644 --- a/pkgs/tools/networking/libnids/default.nix +++ b/pkgs/tools/networking/libnids/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, libpcap, glib, pkgconfig, libnet }: +{ lib, stdenv, fetchzip, libpcap, glib, pkgconfig, libnet }: stdenv.mkDerivation { pname = "libnids"; version = "1.24"; @@ -20,7 +20,7 @@ stdenv.mkDerivation { */ NIX_CFLAGS_COMPILE="-Dg_thread_init= "; - meta = with stdenv.lib; { + meta = with lib; { description = "An E-component of Network Intrusion Detection System which emulates the IP stack of Linux 2.0.x"; homepage = "http://libnids.sourceforge.net/"; license = licenses.gpl2; diff --git a/pkgs/tools/networking/libreswan/default.nix b/pkgs/tools/networking/libreswan/default.nix index 7e6f2c475ca5..1281f1b21297 100644 --- a/pkgs/tools/networking/libreswan/default.nix +++ b/pkgs/tools/networking/libreswan/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, +{ lib, stdenv, fetchurl, makeWrapper, pkgconfig, systemd, gmp, unbound, bison, flex, pam, libevent, libcap_ng, curl, nspr, bash, iproute, iptables, procps, coreutils, gnused, gawk, nss, which, python, docs ? false, xmlto, libselinux, ldns @@ -83,7 +83,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://libreswan.org"; description = "A free software implementation of the VPN protocol based on IPSec and the Internet Key Exchange"; platforms = platforms.linux ++ platforms.freebsd; diff --git a/pkgs/tools/networking/logmein-hamachi/default.nix b/pkgs/tools/networking/logmein-hamachi/default.nix index 4abe083a0b9c..82cd9ec3f12f 100644 --- a/pkgs/tools/networking/logmein-hamachi/default.nix +++ b/pkgs/tools/networking/logmein-hamachi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: with stdenv.lib; @@ -35,7 +35,7 @@ in stdenv.mkDerivation rec { dontStrip = true; dontPatchELF = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A hosted VPN service that lets you securely extend LAN-like networks to distributed teams"; homepage = "https://secure.logmein.com/products/hamachi/"; license = licenses.unfreeRedistributable; diff --git a/pkgs/tools/networking/maildrop/default.nix b/pkgs/tools/networking/maildrop/default.nix index d0a74fe4b5bf..d9fb58685b68 100644 --- a/pkgs/tools/networking/maildrop/default.nix +++ b/pkgs/tools/networking/maildrop/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, pcre, perl }: +{ fetchurl, lib, stdenv, pkgconfig, pcre, perl }: stdenv.mkDerivation { name = "maildrop-2.6.0"; @@ -15,7 +15,7 @@ stdenv.mkDerivation { doCheck = false; # fails with "setlocale: LC_ALL: cannot change locale (en_US.UTF-8)" - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.courier-mta.org/maildrop/"; description = "Mail filter/mail delivery agent that is used by the Courier Mail Server"; license = licenses.gpl3; diff --git a/pkgs/tools/networking/mailutils/default.nix b/pkgs/tools/networking/mailutils/default.nix index ff7d4176bd2e..0cc289d0149f 100644 --- a/pkgs/tools/networking/mailutils/default.nix +++ b/pkgs/tools/networking/mailutils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, autoreconfHook, dejagnu, gettext, pkgconfig +{ lib, stdenv, fetchurl, fetchpatch, autoreconfHook, dejagnu, gettext, pkgconfig , gdbm, pam, readline, ncurses, gnutls, guile, texinfo, gnum4, sasl, fribidi, nettools , python3, gss, libmysqlclient, system-sendmail }: @@ -90,7 +90,7 @@ stdenv.mkDerivation rec { unset LD_LIBRARY_PATH ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Rich and powerful protocol-independent mail framework"; longDescription = '' diff --git a/pkgs/tools/networking/maxscale/default.nix b/pkgs/tools/networking/maxscale/default.nix index 9036e07e7f3f..38ac35c342d0 100644 --- a/pkgs/tools/networking/maxscale/default.nix +++ b/pkgs/tools/networking/maxscale/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, glibc +{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, glibc , bison, curl, flex, gperftools, jansson, jemalloc, kerberos, lua, libmysqlclient , ncurses, openssl, pcre, pcre2, perl, rabbitmq-c, sqlite, tcl , libaio, libedit, libtool, libui, libuuid, zlib @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { rm -rf $out/{etc,var} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "MaxScale database proxy extends MariaDB Server's high availability"; homepage = "https://mariadb.com/products/technology/maxscale"; license = licenses.bsl11; diff --git a/pkgs/tools/networking/megatools/default.nix b/pkgs/tools/networking/megatools/default.nix index 43bbc62be954..829ba028fd5a 100644 --- a/pkgs/tools/networking/megatools/default.nix +++ b/pkgs/tools/networking/megatools/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchgit, autoreconfHook, pkg-config, glib, fuse, curl, glib-networking -, asciidoc, libxml2, docbook_xsl, docbook_xml_dtd_45, libxslt, wrapGAppsHook }: +{ lib, stdenv, fetchgit, autoreconfHook, pkg-config, glib, fuse, curl, glib-networking +, asciidoc, libxml2, docbook_xsl, docbook_xml_dtd_45, libxslt, wrapGAppsNoGuiHook }: stdenv.mkDerivation rec { pname = "megatools"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - autoreconfHook pkg-config wrapGAppsHook asciidoc libxml2 + autoreconfHook pkg-config wrapGAppsNoGuiHook asciidoc libxml2 docbook_xsl docbook_xml_dtd_45 libxslt ]; buildInputs = [ glib glib-networking curl ] @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Command line client for Mega.co.nz"; homepage = "https://megatools.megous.com/"; license = licenses.gpl2Plus; diff --git a/pkgs/tools/networking/minidlna/default.nix b/pkgs/tools/networking/minidlna/default.nix index d425e16782b3..df194ccaaaa9 100644 --- a/pkgs/tools/networking/minidlna/default.nix +++ b/pkgs/tools/networking/minidlna/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ffmpeg_3, flac, libvorbis, libogg, libid3tag, libexif, libjpeg, sqlite, gettext }: +{ lib, stdenv, fetchurl, ffmpeg_3, flac, libvorbis, libogg, libid3tag, libexif, libjpeg, sqlite, gettext }: let version = "1.3.0"; in @@ -23,7 +23,7 @@ stdenv.mkDerivation { cp minidlnad.8 $out/share/man/man8 ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Media server software"; longDescription = '' MiniDLNA (aka ReadyDLNA) is server software with the aim of being fully diff --git a/pkgs/tools/networking/minio-client/default.nix b/pkgs/tools/networking/minio-client/default.nix index e452719a494a..51ea6e1a0b39 100644 --- a/pkgs/tools/networking/minio-client/default.nix +++ b/pkgs/tools/networking/minio-client/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "minio-client"; @@ -23,7 +23,7 @@ buildGoModule rec { sed -i "s/CommitID.*/CommitID = \"${src.rev}\"/g" cmd/build-constants.go ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/minio/mc"; description = "A replacement for ls, cp, mkdir, diff and rsync commands for filesystems and object storage"; maintainers = with maintainers; [ eelco bachp ]; diff --git a/pkgs/tools/networking/minissdpd/default.nix b/pkgs/tools/networking/minissdpd/default.nix index b5702b9bfadd..869abe92e5c2 100644 --- a/pkgs/tools/networking/minissdpd/default.nix +++ b/pkgs/tools/networking/minissdpd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libnfnetlink }: +{ lib, stdenv, fetchurl, libnfnetlink }: stdenv.mkDerivation rec { pname = "minissdpd"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Small daemon to speed up UPnP device discoveries"; longDescription = '' MiniSSDPd receives NOTIFY packets and stores (caches) that information diff --git a/pkgs/tools/networking/miniupnpc/default.nix b/pkgs/tools/networking/miniupnpc/default.nix index 41927278ac82..152a0b0df66b 100644 --- a/pkgs/tools/networking/miniupnpc/default.nix +++ b/pkgs/tools/networking/miniupnpc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, which, cctools }: +{ lib, stdenv, fetchurl, which, cctools }: let generic = { version, sha256 }: @@ -19,7 +19,7 @@ let makeFlags = [ "PREFIX=$(out)" "INSTALLPREFIX=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://miniupnp.free.fr/"; description = "A client that implements the UPnP Internet Gateway Device (IGD) specification"; platforms = with platforms; linux ++ freebsd ++ darwin; diff --git a/pkgs/tools/networking/miniupnpd/default.nix b/pkgs/tools/networking/miniupnpd/default.nix index 23f02dde1f42..fe15d8bd3282 100644 --- a/pkgs/tools/networking/miniupnpd/default.nix +++ b/pkgs/tools/networking/miniupnpd/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://miniupnp.free.fr/"; description = "A daemon that implements the UPnP Internet Gateway Device (IGD) specification"; platforms = platforms.linux; diff --git a/pkgs/tools/networking/miredo/default.nix b/pkgs/tools/networking/miredo/default.nix index 1982cab6b395..48b6f5dc4cf5 100644 --- a/pkgs/tools/networking/miredo/default.nix +++ b/pkgs/tools/networking/miredo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, nettools, iproute, judy }: +{ lib, stdenv, fetchurl, nettools, iproute, judy }: stdenv.mkDerivation rec { version = "1.2.6"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { rm -rf $out/lib/systemd $out/var $out/etc/miredo/miredo.conf ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Teredo IPv6 Tunneling Daemon"; homepage = "https://www.remlab.net/miredo/"; license = licenses.gpl2; diff --git a/pkgs/tools/networking/mmsd/default.nix b/pkgs/tools/networking/mmsd/default.nix index fee347dd2015..ccc99457d9b3 100644 --- a/pkgs/tools/networking/mmsd/default.nix +++ b/pkgs/tools/networking/mmsd/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchgit , autoreconfHook , pkgconfig @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Multimedia Messaging Service Daemon"; homepage = "https://01.org/ofono"; license = licenses.gpl2; diff --git a/pkgs/tools/networking/modem-manager/default.nix b/pkgs/tools/networking/modem-manager/default.nix index 7bad593e4dfa..248cd59fe12e 100644 --- a/pkgs/tools/networking/modem-manager/default.nix +++ b/pkgs/tools/networking/modem-manager/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, glib, udev, libgudev, polkit, ppp, gettext, pkgconfig +{ lib, stdenv, fetchurl, glib, udev, libgudev, polkit, ppp, gettext, pkgconfig , libmbim, libqmi, systemd, vala, gobject-introspection, dbus }: stdenv.mkDerivation rec { @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "WWAN modem manager, part of NetworkManager"; homepage = "https://www.freedesktop.org/wiki/Software/ModemManager/"; license = licenses.gpl2Plus; diff --git a/pkgs/tools/networking/mozwire/default.nix b/pkgs/tools/networking/mozwire/default.nix index 58afc833ea0e..532d69c3f4ee 100644 --- a/pkgs/tools/networking/mozwire/default.nix +++ b/pkgs/tools/networking/mozwire/default.nix @@ -1,4 +1,4 @@ -{ rustPlatform, stdenv, fetchFromGitHub, Security }: +{ rustPlatform, lib, stdenv, fetchFromGitHub, Security }: rustPlatform.buildRustPackage rec { pname = "MozWire"; @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0yxnpnxwis46wz4j5rjzyyzrvh94hn8vzxmmrcmrdz3gkakg77hg"; - meta = with stdenv.lib; { + meta = with lib; { description = "MozillaVPN configuration manager giving Linux, macOS users (among others), access to MozillaVPN"; homepage = "https://github.com/NilsIrl/MozWire"; license = licenses.gpl3; diff --git a/pkgs/tools/networking/mpack/default.nix b/pkgs/tools/networking/mpack/default.nix index 5a8af7de36a0..3aca81596e08 100644 --- a/pkgs/tools/networking/mpack/default.nix +++ b/pkgs/tools/networking/mpack/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "mpack-1.6"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Utilities for encoding and decoding binary files in MIME"; license = licenses.free; platforms = platforms.linux; diff --git a/pkgs/tools/networking/mtr/default.nix b/pkgs/tools/networking/mtr/default.nix index 6b8b2f923745..0ebeb8410a68 100644 --- a/pkgs/tools/networking/mtr/default.nix +++ b/pkgs/tools/networking/mtr/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A network diagnostics tool"; homepage = "https://www.bitwizard.nl/mtr/"; license = licenses.gpl2; diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix index 82a22dd947d7..3b505d34f2a0 100644 --- a/pkgs/tools/networking/mu/default.nix +++ b/pkgs/tools/networking/mu/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, sqlite, pkgconfig, autoreconfHook, pmccabe +{ lib, stdenv, fetchFromGitHub, sqlite, pkgconfig, autoreconfHook, pmccabe , xapian, glib, gmime3, texinfo , emacs, guile , gtk3, webkitgtk, libsoup, icu , withMug ? false @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A collection of utilties for indexing and searching Maildirs"; license = licenses.gpl3Plus; homepage = "https://www.djcbsoftware.nl/code/mu/"; diff --git a/pkgs/tools/networking/nat-traverse/default.nix b/pkgs/tools/networking/nat-traverse/default.nix index e3bf3391f21e..a1c1337a216b 100644 --- a/pkgs/tools/networking/nat-traverse/default.nix +++ b/pkgs/tools/networking/nat-traverse/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl }: +{ lib, stdenv, fetchurl, perl }: stdenv.mkDerivation rec { pname = "nat-traverse"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { gzip -c nat-traverse.1 > $out/share/man/man1/nat-traverse.1.gz ''; - meta = with stdenv.lib; { + meta = with lib; { description = "NAT gateway traversal utility"; longDescription = '' nat-traverse establishes direct connections between nodes which are diff --git a/pkgs/tools/networking/ncftp/default.nix b/pkgs/tools/networking/ncftp/default.nix index d8c37ff58707..a43d5f4a88c8 100644 --- a/pkgs/tools/networking/ncftp/default.nix +++ b/pkgs/tools/networking/ncftp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, coreutils }: +{ lib, stdenv, fetchurl, ncurses, coreutils }: stdenv.mkDerivation rec { pname = "ncftp"; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { "--mandir=$(out)/share/man/" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Command line FTP (File Transfer Protocol) client"; homepage = "https://www.ncftp.com/ncftp/"; maintainers = with maintainers; [ bjornfor ]; diff --git a/pkgs/tools/networking/ndisc6/default.nix b/pkgs/tools/networking/ndisc6/default.nix index 03304df5f792..6612315c6f2d 100644 --- a/pkgs/tools/networking/ndisc6/default.nix +++ b/pkgs/tools/networking/ndisc6/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl }: +{ lib, stdenv, fetchurl, perl }: stdenv.mkDerivation rec { name = "ndisc6-1.0.4"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { "localstatedir=$(TMPDIR)" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.remlab.net/ndisc6/"; description = "A small collection of useful tools for IPv6 networking"; maintainers = with maintainers; [ eelco ]; diff --git a/pkgs/tools/networking/netboot/default.nix b/pkgs/tools/networking/netboot/default.nix index 7a1eac59eeae..28d9f2c5b32c 100644 --- a/pkgs/tools/networking/netboot/default.nix +++ b/pkgs/tools/networking/netboot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, yacc, lzo, db4 }: +{ lib, stdenv, fetchurl, yacc, lzo, db4 }: stdenv.mkDerivation rec { name = "netboot-0.10.2"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Mini PXE server"; maintainers = [ maintainers.raskin ]; platforms = ["x86_64-linux"]; diff --git a/pkgs/tools/networking/netcat/default.nix b/pkgs/tools/networking/netcat/default.nix index 5c275ee6ab4b..7b325b2f4840 100644 --- a/pkgs/tools/networking/netcat/default.nix +++ b/pkgs/tools/networking/netcat/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation { name = "netcat-gnu-0.7.1"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "1frjcdkhkpzk0f84hx6hmw5l0ynpmji8vcbaxg8h5k2svyxz0nmm"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Utility which reads and writes data across network connections"; homepage = "http://netcat.sourceforge.net/"; license = licenses.gpl2Plus; diff --git a/pkgs/tools/networking/nethogs/default.nix b/pkgs/tools/networking/nethogs/default.nix index 7bc6d0e2be78..c6a8f3b7f4e9 100644 --- a/pkgs/tools/networking/nethogs/default.nix +++ b/pkgs/tools/networking/nethogs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ncurses, libpcap }: +{ lib, stdenv, fetchFromGitHub, ncurses, libpcap }: stdenv.mkDerivation rec { pname = "nethogs"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { installFlags = [ "PREFIX=$(out)" "sbin=$(out)/bin" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A small 'net top' tool, grouping bandwidth by process"; longDescription = '' NetHogs is a small 'net top' tool. Instead of breaking the traffic down diff --git a/pkgs/tools/networking/netifd/default.nix b/pkgs/tools/networking/netifd/default.nix index 36d1ec7a423a..bfa64601ebfb 100644 --- a/pkgs/tools/networking/netifd/default.nix +++ b/pkgs/tools/networking/netifd/default.nix @@ -1,4 +1,4 @@ -{ runCommand, stdenv, cmake, fetchgit, libnl, libubox, uci, ubus, json_c }: +{ runCommand, lib, stdenv, cmake, fetchgit, libnl, libubox, uci, ubus, json_c }: stdenv.mkDerivation { pname = "netifd"; @@ -18,7 +18,7 @@ stdenv.mkDerivation { -I$(echo "${stdenv.lib.getDev libnl}"/include/libnl*/)" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "OpenWrt Network interface configuration daemon"; homepage = "https://git.openwrt.org/?p=project/netifd.git;a=summary"; license = licenses.lgpl21; diff --git a/pkgs/tools/networking/netmask/default.nix b/pkgs/tools/networking/netmask/default.nix index fa36ee5d8026..c1613fcf9206 100644 --- a/pkgs/tools/networking/netmask/default.nix +++ b/pkgs/tools/networking/netmask/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, texinfo }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, texinfo }: stdenv.mkDerivation rec { pname = "netmask"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ texinfo ]; nativeBuildInputs = [ autoreconfHook ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/tlby/netmask"; description = "An IP address formatting tool "; license = licenses.gpl2; diff --git a/pkgs/tools/networking/netselect/default.nix b/pkgs/tools/networking/netselect/default.nix index dfca4c9058ee..be68e3e2c600 100644 --- a/pkgs/tools/networking/netselect/default.nix +++ b/pkgs/tools/networking/netselect/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "netselect"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/apenwarr/netselect"; description = "An ultrafast intelligent parallelizing binary-search implementation of \"ping\""; license = licenses.bsd3; diff --git a/pkgs/tools/networking/netsniff-ng/default.nix b/pkgs/tools/networking/netsniff-ng/default.nix index 9eb9afcb0e78..36028208f56d 100644 --- a/pkgs/tools/networking/netsniff-ng/default.nix +++ b/pkgs/tools/networking/netsniff-ng/default.nix @@ -1,23 +1,53 @@ -{ stdenv, fetchFromGitHub, makeWrapper, bison, flex, geoip, geolite-legacy -, libcli, libnet, libnetfilter_conntrack, libnl, libpcap, libsodium -, liburcu, ncurses, pkgconfig, zlib }: +{ stdenv +, lib +, fetchFromGitHub +, makeWrapper +, bison +, flex +, geoip +, geolite-legacy +, libcli +, libnet +, libnetfilter_conntrack +, libnl +, libpcap +, libsodium +, liburcu +, ncurses +, pkg-config +, zlib +}: stdenv.mkDerivation rec { pname = "netsniff-ng"; - version = "0.6.7"; + version = "0.6.8"; - # Upstream recommends and supports git src = fetchFromGitHub { repo = pname; owner = pname; rev = "v${version}"; - sha256 = "1jvihq30cwlpjqwny0lcrciysn40wscq6xik3s9b81nw2s7wiyqr"; + sha256 = "10ih8amaqspy0zwg7hqvypa1v7ixpjl0n608cyfgyfzffp73lbqf"; }; - nativeBuildInputs = [ pkgconfig makeWrapper bison flex ]; + nativeBuildInputs = [ + bison + flex + makeWrapper + pkg-config + ]; + buildInputs = [ - geoip geolite-legacy libcli libnet libnl - libnetfilter_conntrack libpcap libsodium liburcu ncurses zlib + geoip + geolite-legacy + libcli + libnet + libnl + libnetfilter_conntrack + libpcap + libsodium + liburcu + ncurses + zlib ]; # ./configure is not autoGNU but some home-brewn magic @@ -37,16 +67,16 @@ stdenv.mkDerivation rec { wrapProgram "$out/sbin/trafgen" --prefix PATH ":" "${stdenv.cc}/bin" wrapProgram "$out/sbin/bpfc" --prefix PATH ":" "${stdenv.cc}/bin" - ln -sv ${geolite-legacy}/share/GeoIP/GeoIP.dat $out/etc/netsniff-ng/country4.dat - ln -sv ${geolite-legacy}/share/GeoIP/GeoIPv6.dat $out/etc/netsniff-ng/country6.dat - ln -sv ${geolite-legacy}/share/GeoIP/GeoIPCity.dat $out/etc/netsniff-ng/city4.dat - ln -sv ${geolite-legacy}/share/GeoIP/GeoIPCityv6.dat $out/etc/netsniff-ng/city6.dat - ln -sv ${geolite-legacy}/share/GeoIP/GeoIPASNum.dat $out/etc/netsniff-ng/asname4.dat - ln -sv ${geolite-legacy}/share/GeoIP/GeoIPASNumv6.dat $out/etc/netsniff-ng/asname6.dat + ln -sv ${geolite-legacy}/share/GeoIP/GeoIP.dat $out/etc/netsniff-ng/country4.dat + ln -sv ${geolite-legacy}/share/GeoIP/GeoIPv6.dat $out/etc/netsniff-ng/country6.dat + ln -sv ${geolite-legacy}/share/GeoIP/GeoIPCity.dat $out/etc/netsniff-ng/city4.dat + ln -sv ${geolite-legacy}/share/GeoIP/GeoIPCityv6.dat $out/etc/netsniff-ng/city6.dat + ln -sv ${geolite-legacy}/share/GeoIP/GeoIPASNum.dat $out/etc/netsniff-ng/asname4.dat + ln -sv ${geolite-legacy}/share/GeoIP/GeoIPASNumv6.dat $out/etc/netsniff-ng/asname6.dat rm -v $out/etc/netsniff-ng/geoip.conf # updating databases after installation is impossible ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Swiss army knife for daily Linux network plumbing"; longDescription = '' netsniff-ng is a free Linux networking toolkit. Its gain of performance @@ -56,7 +86,7 @@ stdenv.mkDerivation rec { development and analysis, debugging, auditing or network reconnaissance. ''; homepage = "http://netsniff-ng.org/"; - license = licenses.gpl2; + license = with licenses; [ gpl2Only ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/networking/network-manager/0.9.8/default.nix b/pkgs/tools/networking/network-manager/0.9.8/default.nix index 6035e35f6340..6252d776886e 100644 --- a/pkgs/tools/networking/network-manager/0.9.8/default.nix +++ b/pkgs/tools/networking/network-manager/0.9.8/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, intltool, pkgconfig, dbus-glib +{ lib, stdenv, fetchurl, intltool, pkgconfig, dbus-glib , udev, libnl, libuuid, gnutls, dhcp , libgcrypt, perl, libgudev, avahi, ppp, kmod }: @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { installFlagsArray=( "sysconfdir=$out/etc" "localstatedir=$out/var" ) ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://projects.gnome.org/NetworkManager/"; description = "Network configuration and management tool"; license = licenses.gpl2Plus; diff --git a/pkgs/tools/networking/network-manager/applet/default.nix b/pkgs/tools/networking/network-manager/applet/default.nix index 9f92fcfa1ab3..0eb5045ba2c2 100644 --- a/pkgs/tools/networking/network-manager/applet/default.nix +++ b/pkgs/tools/networking/network-manager/applet/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , meson , ninja @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://gitlab.gnome.org/GNOME/network-manager-applet/"; description = "NetworkManager control applet for GNOME"; license = licenses.gpl2; diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index c02275ef5b81..c5f59e3606fb 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, substituteAll, intltool, pkgconfig, fetchpatch, dbus +{ lib, stdenv, fetchurl, substituteAll, intltool, pkgconfig, fetchpatch, dbus , gnome3, systemd, libuuid, polkit, gnutls, ppp, dhcp, iptables, python3, vala , libgcrypt, dnsmasq, bluez5, readline, libselinux, audit , gobject-introspection, modemmanager, openresolv, libndp, newt, libsoup @@ -108,7 +108,7 @@ in stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://wiki.gnome.org/Projects/NetworkManager"; description = "Network configuration and management tool"; license = licenses.gpl2Plus; diff --git a/pkgs/tools/networking/network-manager/dmenu/default.nix b/pkgs/tools/networking/network-manager/dmenu/default.nix index e17d4ebc0719..0e07f2cda801 100644 --- a/pkgs/tools/networking/network-manager/dmenu/default.nix +++ b/pkgs/tools/networking/network-manager/dmenu/default.nix @@ -1,4 +1,4 @@ -{ stdenv, glib, fetchFromGitHub, networkmanager, python3Packages +{ lib, stdenv, glib, fetchFromGitHub, networkmanager, python3Packages , gobject-introspection }: let inherit (python3Packages) python pygobject3; @@ -30,7 +30,7 @@ in stdenv.mkDerivation rec { ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Small script to manage NetworkManager connections with dmenu instead of nm-applet"; homepage = "https://github.com/firecat53/networkmanager-dmenu"; license = stdenv.lib.licenses.mit; diff --git a/pkgs/tools/networking/network-manager/fortisslvpn/default.nix b/pkgs/tools/networking/network-manager/fortisslvpn/default.nix index 3cc4133b41cf..0488f23481e4 100644 --- a/pkgs/tools/networking/network-manager/fortisslvpn/default.nix +++ b/pkgs/tools/networking/network-manager/fortisslvpn/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , substituteAll , openfortivpn @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "NetworkManager’s FortiSSL plugin"; inherit (networkmanager.meta) maintainers platforms; license = licenses.gpl2; diff --git a/pkgs/tools/networking/network-manager/iodine/default.nix b/pkgs/tools/networking/network-manager/iodine/default.nix index 95d015f6964f..2ead084d51ee 100644 --- a/pkgs/tools/networking/network-manager/iodine/default.nix +++ b/pkgs/tools/networking/network-manager/iodine/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, substituteAll, autoreconfHook, iodine, intltool, pkgconfig, networkmanager, libsecret, gtk3 +{ lib, stdenv, fetchFromGitLab, substituteAll, autoreconfHook, iodine, intltool, pkgconfig, networkmanager, libsecret, gtk3 , withGnome ? true, gnome3, fetchpatch, libnma, glib }: let @@ -50,7 +50,7 @@ in stdenv.mkDerivation { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "NetworkManager's iodine plugin"; inherit (networkmanager.meta) maintainers platforms; license = licenses.gpl2Plus; diff --git a/pkgs/tools/networking/network-manager/l2tp/default.nix b/pkgs/tools/networking/network-manager/l2tp/default.nix index 430462f91997..cd79a612bf98 100644 --- a/pkgs/tools/networking/network-manager/l2tp/default.nix +++ b/pkgs/tools/networking/network-manager/l2tp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, substituteAll, fetchFromGitHub, autoreconfHook, libtool, intltool, pkgconfig +{ lib, stdenv, substituteAll, fetchFromGitHub, autoreconfHook, libtool, intltool, pkgconfig , file, findutils , gtk3, networkmanager, ppp, xl2tpd, strongswan, libsecret , withGnome ? true, libnma }: @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "L2TP plugin for NetworkManager"; inherit (networkmanager.meta) platforms; homepage = "https://github.com/nm-l2tp/network-manager-l2tp"; diff --git a/pkgs/tools/networking/network-manager/libnma/default.nix b/pkgs/tools/networking/network-manager/libnma/default.nix index d50ccc6517b4..9e8bd915dee9 100644 --- a/pkgs/tools/networking/network-manager/libnma/default.nix +++ b/pkgs/tools/networking/network-manager/libnma/default.nix @@ -80,7 +80,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://gitlab.gnome.org/GNOME/libnma"; description = "NetworkManager UI utilities (libnm version)"; license = licenses.gpl2Plus; # Mix of GPL and LPGL 2+ diff --git a/pkgs/tools/networking/network-manager/openconnect/default.nix b/pkgs/tools/networking/network-manager/openconnect/default.nix index 3c1a8d110429..cc267aec68af 100644 --- a/pkgs/tools/networking/network-manager/openconnect/default.nix +++ b/pkgs/tools/networking/network-manager/openconnect/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , substituteAll , glib @@ -72,7 +72,7 @@ in stdenv.mkDerivation { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "NetworkManager’s OpenConnect plugin"; inherit (networkmanager.meta) maintainers platforms; license = licenses.gpl2Plus; diff --git a/pkgs/tools/networking/network-manager/openvpn/default.nix b/pkgs/tools/networking/network-manager/openvpn/default.nix index 79435a9e5e8b..31b86bd2b005 100644 --- a/pkgs/tools/networking/network-manager/openvpn/default.nix +++ b/pkgs/tools/networking/network-manager/openvpn/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, substituteAll, openvpn, intltool, libxml2, pkgconfig, file, networkmanager, libsecret +{ lib, stdenv, fetchurl, substituteAll, openvpn, intltool, libxml2, pkgconfig, file, networkmanager, libsecret , gtk3, withGnome ? true, gnome3, kmod, libnma }: let @@ -37,7 +37,7 @@ in stdenv.mkDerivation { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "NetworkManager's OpenVPN plugin"; inherit (networkmanager.meta) maintainers platforms; license = licenses.gpl2Plus; diff --git a/pkgs/tools/networking/network-manager/sstp/default.nix b/pkgs/tools/networking/network-manager/sstp/default.nix index d5195cba3453..bca53f8d9cd6 100644 --- a/pkgs/tools/networking/network-manager/sstp/default.nix +++ b/pkgs/tools/networking/network-manager/sstp/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , autoreconfHook , fetchFromGitHub , fetchpatch @@ -56,7 +56,7 @@ in stdenv.mkDerivation { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "NetworkManager's sstp plugin"; inherit (networkmanager.meta) maintainers platforms; license = licenses.gpl2Plus; diff --git a/pkgs/tools/networking/network-manager/strongswan/default.nix b/pkgs/tools/networking/network-manager/strongswan/default.nix index 028d852f1395..6f37ca296bb4 100644 --- a/pkgs/tools/networking/network-manager/strongswan/default.nix +++ b/pkgs/tools/networking/network-manager/strongswan/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, intltool, pkgconfig, networkmanager, strongswanNM +{ lib, stdenv, fetchurl, intltool, pkgconfig, networkmanager, strongswanNM , gtk3, gnome3, libsecret, libnma }: stdenv.mkDerivation rec { @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { PKG_CONFIG_LIBNM_VPNSERVICEDIR = "$(out)/lib/NetworkManager/VPN"; - meta = with stdenv.lib; { + meta = with lib; { description = "NetworkManager's strongswan plugin"; inherit (networkmanager.meta) platforms; license = licenses.gpl2Plus; diff --git a/pkgs/tools/networking/network-manager/vpnc/default.nix b/pkgs/tools/networking/network-manager/vpnc/default.nix index 6cd0d2e75f57..f5f3d82d6c0a 100644 --- a/pkgs/tools/networking/network-manager/vpnc/default.nix +++ b/pkgs/tools/networking/network-manager/vpnc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, substituteAll, vpnc, intltool, pkgconfig, networkmanager, libsecret +{ lib, stdenv, fetchurl, substituteAll, vpnc, intltool, pkgconfig, networkmanager, libsecret , gtk3, withGnome ? true, gnome3, glib, kmod, file, fetchpatch, libnma }: let pname = "NetworkManager-vpnc"; @@ -41,7 +41,7 @@ in stdenv.mkDerivation { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "NetworkManager's VPNC plugin"; inherit (networkmanager.meta) maintainers platforms; license = licenses.gpl2Plus; diff --git a/pkgs/tools/networking/nfdump/default.nix b/pkgs/tools/networking/nfdump/default.nix index 0c9bc41099f2..9420f77e6185 100644 --- a/pkgs/tools/networking/nfdump/default.nix +++ b/pkgs/tools/networking/nfdump/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , autoconf, automake, libtool, pkg-config , bzip2, libpcap, flex, yacc }: @@ -31,7 +31,7 @@ stdenv.mkDerivation { "--enable-nfpcapd" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Tools for working with netflow data"; longDescription = '' nfdump is a set of tools for working with netflow data. diff --git a/pkgs/tools/networking/nfstrace/default.nix b/pkgs/tools/networking/nfstrace/default.nix index 6377f276af3f..a1bf83726d26 100644 --- a/pkgs/tools/networking/nfstrace/default.nix +++ b/pkgs/tools/networking/nfstrace/default.nix @@ -1,4 +1,4 @@ -{ cmake, fetchFromGitHub, fetchpatch, json_c, libpcap, ncurses, stdenv, libtirpc }: +{ cmake, fetchFromGitHub, fetchpatch, json_c, libpcap, ncurses, lib, stdenv, libtirpc }: stdenv.mkDerivation rec { pname = "nfstrace"; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { doCheck = false; # requires network access - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://epam.github.io/nfstrace/"; description = "NFS and CIFS tracing/monitoring/capturing/analyzing tool"; license = licenses.gpl2; diff --git a/pkgs/tools/networking/ngrep/default.nix b/pkgs/tools/networking/ngrep/default.nix index 60125b515d67..1e57ac75843e 100644 --- a/pkgs/tools/networking/ngrep/default.nix +++ b/pkgs/tools/networking/ngrep/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { sed -i "s|BPF=.*|BPF=${libpcap}/include/pcap/bpf.h|" configure ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Network packet analyzer"; longDescription = '' ngrep strives to provide most of GNU grep's common features, applying diff --git a/pkgs/tools/networking/noip/default.nix b/pkgs/tools/networking/noip/default.nix index 6503e7013774..309607941af1 100644 --- a/pkgs/tools/networking/noip/default.nix +++ b/pkgs/tools/networking/noip/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation { name = "noip-2.1.9-1"; @@ -17,7 +17,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Dynamic DNS daemon for no-ip accounts"; homepage = "http://noip.com/download?page=linux"; license = stdenv.lib.licenses.gpl2; diff --git a/pkgs/tools/networking/nss-pam-ldapd/default.nix b/pkgs/tools/networking/nss-pam-ldapd/default.nix index 3ce7638923c3..9f2c071c408c 100644 --- a/pkgs/tools/networking/nss-pam-ldapd/default.nix +++ b/pkgs/tools/networking/nss-pam-ldapd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , pkgconfig, makeWrapper, autoreconfHook , openldap, python, pam }: @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { wrapProgram $out/sbin/nslcd --prefix LD_LIBRARY_PATH ":" $out/lib ''; - meta = with stdenv.lib; { + meta = with lib; { description = "LDAP identity and authentication for NSS/PAM"; homepage = "https://arthurdejong.org/nss-pam-ldapd/"; license = licenses.lgpl21; diff --git a/pkgs/tools/networking/ntopng/default.nix b/pkgs/tools/networking/ntopng/default.nix index 3db5a28f1616..7606cb06d905 100644 --- a/pkgs/tools/networking/ntopng/default.nix +++ b/pkgs/tools/networking/ntopng/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libpcap,/* gnutls, libgcrypt,*/ libxml2, glib +{ lib, stdenv, fetchurl, libpcap,/* gnutls, libgcrypt,*/ libxml2, glib , geoip, geolite-legacy, sqlite, which, autoreconfHook, git , pkgconfig, groff, curl, json_c, luajit, zeromq, rrdtool }: @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-fpermissive" + stdenv.lib.optionalString stdenv.cc.isClang " -Wno-error=reserved-user-defined-literal"; - meta = with stdenv.lib; { + meta = with lib; { description = "High-speed web-based traffic analysis and flow collection tool"; homepage = "http://www.ntop.org/products/ntop/"; license = licenses.gpl3Plus; diff --git a/pkgs/tools/networking/ntp/default.nix b/pkgs/tools/networking/ntp/default.nix index a7deaf7b6948..b2f8d8a21076 100644 --- a/pkgs/tools/networking/ntp/default.nix +++ b/pkgs/tools/networking/ntp/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { rm -rf $out/share/doc ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.ntp.org/"; description = "An implementation of the Network Time Protocol"; license = { diff --git a/pkgs/tools/networking/nuttcp/default.nix b/pkgs/tools/networking/nuttcp/default.nix index fe3cde5f91a0..1b9e9fe04e43 100644 --- a/pkgs/tools/networking/nuttcp/default.nix +++ b/pkgs/tools/networking/nuttcp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "nuttcp"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { cp nuttcp $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Network performance measurement tool"; longDescription = '' nuttcp is a network performance measurement tool intended for use by diff --git a/pkgs/tools/networking/nylon/default.nix b/pkgs/tools/networking/nylon/default.nix index d6f8cb21e0bc..840b714fc9f8 100644 --- a/pkgs/tools/networking/nylon/default.nix +++ b/pkgs/tools/networking/nylon/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libevent, buildEnv }: +{ lib, stdenv, fetchurl, libevent, buildEnv }: let # failed to find a better way to make it work libevent-comb = buildEnv { @@ -19,7 +19,7 @@ stdenv.mkDerivation { buildInputs = [ libevent ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://monkey.org/~marius/nylon"; description = "Proxy server, supporting SOCKS 4 and 5, as well as a mirror mode"; license = licenses.bsdOriginal; diff --git a/pkgs/tools/networking/nzbget/default.nix b/pkgs/tools/networking/nzbget/default.nix index c25f19c03507..224474f1b38b 100644 --- a/pkgs/tools/networking/nzbget/default.nix +++ b/pkgs/tools/networking/nzbget/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libxml2, ncurses, libsigcxx, libpar2 +{ lib, stdenv, fetchurl, pkgconfig, libxml2, ncurses, libsigcxx, libpar2 , gnutls, libgcrypt, zlib, openssl }: stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://nzbget.net"; license = licenses.gpl2Plus; description = "A command line tool for downloading files from news servers"; diff --git a/pkgs/tools/networking/ocproxy/default.nix b/pkgs/tools/networking/ocproxy/default.nix index 877f15865acb..bc21884e6ac8 100644 --- a/pkgs/tools/networking/ocproxy/default.nix +++ b/pkgs/tools/networking/ocproxy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, libevent }: +{ lib, stdenv, fetchFromGitHub, autoconf, automake, libevent }: stdenv.mkDerivation rec { version = "1.60"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ./autogen.sh ''; - meta = with stdenv.lib; { + meta = with lib; { description = "OpenConnect proxy"; longDescription = '' ocproxy is a user-level SOCKS and port forwarding proxy for OpenConnect diff --git a/pkgs/tools/networking/ocserv/default.nix b/pkgs/tools/networking/ocserv/default.nix index daaa483149a2..587379bde89a 100644 --- a/pkgs/tools/networking/ocserv/default.nix +++ b/pkgs/tools/networking/ocserv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, autoreconfHook, pkgconfig, nettle, gnutls +{ lib, stdenv, fetchFromGitLab, autoreconfHook, pkgconfig, nettle, gnutls , libev, protobufc, guile, geoip, libseccomp, gperf, readline , lz4, libgssglue, ronn, pam }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ nettle gnutls libev protobufc guile geoip libseccomp gperf readline lz4 libgssglue ronn pam ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://gitlab.com/openconnect/ocserv"; license = licenses.gpl2; description = "This program is openconnect VPN server (ocserv), a server for the openconnect VPN client"; diff --git a/pkgs/tools/networking/ofono/default.nix b/pkgs/tools/networking/ofono/default.nix index c6b2ffe9e832..5dafb1e5639e 100644 --- a/pkgs/tools/networking/ofono/default.nix +++ b/pkgs/tools/networking/ofono/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchgit , autoreconfHook , pkgconfig @@ -46,9 +46,17 @@ stdenv.mkDerivation rec { "--enable-external-ell" ]; + postInstall = '' + rm -r $out/etc/ofono + ln -s /etc/ofono $out/etc/ofono + ''; + + enableParallelBuilding = true; + enableParallelChecking = false; + doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Infrastructure for building mobile telephony (GSM/UMTS) applications"; homepage = "https://01.org/ofono"; license = licenses.gpl2; diff --git a/pkgs/tools/networking/openapi-generator-cli/default.nix b/pkgs/tools/networking/openapi-generator-cli/default.nix index 4630342cf8ae..a5271bf410f1 100644 --- a/pkgs/tools/networking/openapi-generator-cli/default.nix +++ b/pkgs/tools/networking/openapi-generator-cli/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jre, makeWrapper }: +{ lib, stdenv, fetchurl, jre, makeWrapper }: stdenv.mkDerivation rec { version = "4.3.1"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { --add-flags "-jar $out/share/java/${jarfilename}" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Allows generation of API client libraries (SDK generation), server stubs and documentation automatically given an OpenAPI Spec"; homepage = "https://github.com/OpenAPITools/openapi-generator"; license = licenses.asl20; diff --git a/pkgs/tools/networking/openapi-generator-cli/unstable.nix b/pkgs/tools/networking/openapi-generator-cli/unstable.nix index f5d71fb8e85b..a0af97b2ea9a 100644 --- a/pkgs/tools/networking/openapi-generator-cli/unstable.nix +++ b/pkgs/tools/networking/openapi-generator-cli/unstable.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jre, makeWrapper }: +{ lib, stdenv, fetchurl, jre, makeWrapper }: stdenv.mkDerivation rec { version = "5.0.0-2020-02-04"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { --add-flags "-jar $out/share/java/${jarfilename}" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Allows generation of API client libraries (SDK generation), server stubs and documentation automatically given an OpenAPI Spec"; homepage = "https://github.com/OpenAPITools/openapi-generator"; license = licenses.asl20; diff --git a/pkgs/tools/networking/openconnect/default.nix b/pkgs/tools/networking/openconnect/default.nix index 11f9fdc0fd8c..a36330add4df 100644 --- a/pkgs/tools/networking/openconnect/default.nix +++ b/pkgs/tools/networking/openconnect/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, openssl ? null, gnutls ? null, gmp, libxml2, stoken, zlib, fetchgit, darwin } : +{ lib, stdenv, fetchurl, pkgconfig, openssl ? null, gnutls ? null, gmp, libxml2, stoken, zlib, fetchgit, darwin } : assert (openssl != null) == (gnutls == null); @@ -31,7 +31,7 @@ in stdenv.mkDerivation rec { ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.PCSC; nativeBuildInputs = [ pkgconfig ]; - meta = with stdenv.lib; { + meta = with lib; { description = "VPN Client for Cisco's AnyConnect SSL VPN"; homepage = "http://www.infradead.org/openconnect/"; license = licenses.lgpl21; diff --git a/pkgs/tools/networking/openconnect_pa/default.nix b/pkgs/tools/networking/openconnect_pa/default.nix index 4b108dc303e8..3bbc474aa60f 100644 --- a/pkgs/tools/networking/openconnect_pa/default.nix +++ b/pkgs/tools/networking/openconnect_pa/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, vpnc, openssl ? null, gnutls ? null, gmp, libxml2, stoken, zlib, autoreconfHook } : +{ lib, stdenv, fetchFromGitHub, pkgconfig, vpnc, openssl ? null, gnutls ? null, gmp, libxml2, stoken, zlib, autoreconfHook } : assert (openssl != null) == (gnutls == null); @@ -30,7 +30,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig autoreconfHook ]; propagatedBuildInputs = [ vpnc openssl gnutls gmp libxml2 stoken zlib ]; - meta = with stdenv.lib; { + meta = with lib; { description = "OpenConnect client extended to support Palo Alto Networks' GlobalProtect VPN"; homepage = "https://github.com/dlenski/openconnect/"; license = licenses.lgpl21; diff --git a/pkgs/tools/networking/openfortivpn/default.nix b/pkgs/tools/networking/openfortivpn/default.nix index a8ce80f98382..56ae2590576d 100644 --- a/pkgs/tools/networking/openfortivpn/default.nix +++ b/pkgs/tools/networking/openfortivpn/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Client for PPP+SSL VPN tunnel services"; homepage = "https://github.com/adrienverge/openfortivpn"; license = licenses.gpl3; diff --git a/pkgs/tools/networking/openntpd/default.nix b/pkgs/tools/networking/openntpd/default.nix index aa0a3926b141..e6703c748fce 100644 --- a/pkgs/tools/networking/openntpd/default.nix +++ b/pkgs/tools/networking/openntpd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libressl +{ lib, stdenv, fetchurl, libressl , privsepPath ? "/var/empty" , privsepUser ? "ntp" }: @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { "localstatedir=\${TMPDIR}" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.openntpd.org/"; license = licenses.bsd3; description = "OpenBSD NTP daemon (Debian port)"; diff --git a/pkgs/tools/networking/opensm/default.nix b/pkgs/tools/networking/opensm/default.nix index 3fe9f87d6585..a21fe68e8163 100644 --- a/pkgs/tools/networking/opensm/default.nix +++ b/pkgs/tools/networking/opensm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, libtool, bison, flex, rdma-core }: +{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, bison, flex, rdma-core }: stdenv.mkDerivation rec { pname = "opensm"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Infiniband subnet manager"; homepage = "https://www.openfabrics.org/"; license = licenses.gpl2; # dual licensed as 2-clause BSD diff --git a/pkgs/tools/networking/openvpn/default.nix b/pkgs/tools/networking/openvpn/default.nix index 04ac97003102..09495ded9544 100644 --- a/pkgs/tools/networking/openvpn/default.nix +++ b/pkgs/tools/networking/openvpn/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , pkg-config , makeWrapper @@ -68,7 +68,7 @@ let enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A robust and highly flexible tunneling application"; downloadPage = "https://openvpn.net/community-downloads/"; homepage = "https://openvpn.net/"; diff --git a/pkgs/tools/networking/openvpn/update-resolv-conf.nix b/pkgs/tools/networking/openvpn/update-resolv-conf.nix index 76d04e6b685c..d71ab72901bc 100644 --- a/pkgs/tools/networking/openvpn/update-resolv-conf.nix +++ b/pkgs/tools/networking/openvpn/update-resolv-conf.nix @@ -24,7 +24,7 @@ in stdenv.mkDerivation { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Script to update your /etc/resolv.conf with DNS settings that come from the received push dhcp-options"; homepage = "https://github.com/masterkorp/openvpn-update-resolv-conf/"; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/tools/networking/openvpn/update-systemd-resolved.nix b/pkgs/tools/networking/openvpn/update-systemd-resolved.nix index 1a192ce6688a..9d8e669fe459 100644 --- a/pkgs/tools/networking/openvpn/update-systemd-resolved.nix +++ b/pkgs/tools/networking/openvpn/update-systemd-resolved.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { --prefix PATH : ${lib.makeBinPath [ iproute systemd coreutils util-linux ]} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Helper script for OpenVPN to directly update the DNS settings of a link through systemd-resolved via DBus"; homepage = "https://github.com/jonathanio/update-systemd-resolved"; maintainers = with maintainers; [ eadwu ]; diff --git a/pkgs/tools/networking/p2p/gtk-gnutella/default.nix b/pkgs/tools/networking/p2p/gtk-gnutella/default.nix index 710f7dedb997..06b247b28bf9 100644 --- a/pkgs/tools/networking/p2p/gtk-gnutella/default.nix +++ b/pkgs/tools/networking/p2p/gtk-gnutella/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , fetchpatch , bison @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { install -Dm0444 src/${pname}.man $out/share/man/man1/${pname}.1 ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A GTK Gnutella client, optimized for speed and scalability"; homepage = "http://gtk-gnutella.sourceforge.net/"; # Code: https://github.com/gtk-gnutella/gtk-gnutella changelog = "https://raw.githubusercontent.com/gtk-gnutella/gtk-gnutella/v${version}/ChangeLog"; diff --git a/pkgs/tools/networking/p2p/libtorrent/default.nix b/pkgs/tools/networking/p2p/libtorrent/default.nix index f750e3b1bfe1..cbb1ae031131 100644 --- a/pkgs/tools/networking/p2p/libtorrent/default.nix +++ b/pkgs/tools/networking/p2p/libtorrent/default.nix @@ -1,6 +1,6 @@ # NOTE: this is rakshava's version of libtorrent, used mainly by rtorrent # This is NOT libtorrent-rasterbar, used by Deluge, qbitttorent, and others -{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook +{ lib, stdenv, fetchFromGitHub, pkgconfig, autoreconfHook , cppunit, openssl, libsigcxx, zlib }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig autoreconfHook ]; buildInputs = [ cppunit openssl libsigcxx zlib ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/rakshasa/libtorrent"; description = "A BitTorrent library written in C++ for *nix, with focus on high performance and good code"; diff --git a/pkgs/tools/networking/p2p/rtorrent/default.nix b/pkgs/tools/networking/p2p/rtorrent/default.nix index b55c673c058b..f9ad9773d4da 100644 --- a/pkgs/tools/networking/p2p/rtorrent/default.nix +++ b/pkgs/tools/networking/p2p/rtorrent/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub, pkgconfig +{ lib, stdenv, fetchurl, fetchFromGitHub, pkgconfig , libtool, autoconf, automake, cppunit , libtorrent, ncurses, libsigcxx, curl , zlib, openssl, xmlrpc_c @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { mv doc/rtorrent.rc $out/share/doc/rtorrent/rtorrent.rc ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://rakshasa.github.io/rtorrent/"; description = "An ncurses client for libtorrent, ideal for use with screen, tmux, or dtach"; diff --git a/pkgs/tools/networking/pacparser/default.nix b/pkgs/tools/networking/pacparser/default.nix index 2d703730785f..ce639a4cbc79 100644 --- a/pkgs/tools/networking/pacparser/default.nix +++ b/pkgs/tools/networking/pacparser/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "pacparser"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A library to parse proxy auto-config (PAC) files"; homepage = "http://pacparser.manugarg.com/"; license = licenses.lgpl3; diff --git a/pkgs/tools/networking/par2cmdline/default.nix b/pkgs/tools/networking/par2cmdline/default.nix index ecfe5fa03572..73e12e128567 100644 --- a/pkgs/tools/networking/par2cmdline/default.nix +++ b/pkgs/tools/networking/par2cmdline/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { pname = "par2cmdline"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/Parchive/par2cmdline"; description = "PAR 2.0 compatible file verification and repair tool"; longDescription = '' diff --git a/pkgs/tools/networking/pcapc/default.nix b/pkgs/tools/networking/pcapc/default.nix index 94a181eb5ae2..48dc96bb3f71 100644 --- a/pkgs/tools/networking/pcapc/default.nix +++ b/pkgs/tools/networking/pcapc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libpcap, cmake }: +{ lib, stdenv, fetchFromGitHub, libpcap, cmake }: stdenv.mkDerivation rec { pname = "pcapc"; @@ -16,11 +16,9 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; - enableParallelBuilding = true; - doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/pfactum/pcapc"; description = "Compile libpcap filter expressions into BPF opcodes"; license = licenses.gpl3; diff --git a/pkgs/tools/networking/pcapfix/default.nix b/pkgs/tools/networking/pcapfix/default.nix index a700bd54e7ae..c20a19f23a42 100644 --- a/pkgs/tools/networking/pcapfix/default.nix +++ b/pkgs/tools/networking/pcapfix/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "pcapfix-1.1.4"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { postPatch = ''sed -i "s|/usr|$out|" Makefile''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://f00l.de/pcapfix/"; description = "Repair your broken pcap and pcapng files"; license = licenses.gpl3; diff --git a/pkgs/tools/networking/pdnsd/default.nix b/pkgs/tools/networking/pdnsd/default.nix index d2894271301f..a08182394b1f 100644 --- a/pkgs/tools/networking/pdnsd/default.nix +++ b/pkgs/tools/networking/pdnsd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation { name = "pdnsd-1.2.9a-par"; @@ -17,7 +17,7 @@ stdenv.mkDerivation { # fix ipv6 on darwin CPPFLAGS = "-D__APPLE_USE_RFC_3542"; - meta = with stdenv.lib; { + meta = with lib; { description = "Permanent DNS caching"; homepage = "http://members.home.nl/p.a.rombouts/pdnsd"; license = licenses.gpl3Plus; diff --git a/pkgs/tools/networking/persepolis/default.nix b/pkgs/tools/networking/persepolis/default.nix index 32fb053f811c..fd36680c992e 100644 --- a/pkgs/tools/networking/persepolis/default.nix +++ b/pkgs/tools/networking/persepolis/default.nix @@ -61,7 +61,7 @@ buildPythonApplication rec { youtube-dl ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Persepolis Download Manager is a GUI for aria2"; homepage = "https://persepolisdm.github.io/"; license = licenses.gpl3; diff --git a/pkgs/tools/networking/philter/default.nix b/pkgs/tools/networking/philter/default.nix index ee079fe9fdf0..752f43b3348d 100644 --- a/pkgs/tools/networking/philter/default.nix +++ b/pkgs/tools/networking/philter/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python }: +{ lib, stdenv, fetchurl, python }: stdenv.mkDerivation rec { pname = "philter"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { chmod +x "$out"/bin/philter ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Mail sorter for Maildirs"; homepage = "http://philter.sourceforge.net"; maintainers = with maintainers; [ raskin ]; diff --git a/pkgs/tools/networking/phodav/default.nix b/pkgs/tools/networking/phodav/default.nix index 4939e75661ec..a7405abacb4b 100644 --- a/pkgs/tools/networking/phodav/default.nix +++ b/pkgs/tools/networking/phodav/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , pkgconfig, libsoup, meson, ninja }: let @@ -23,7 +23,7 @@ in stdenv.mkDerivation rec { outputs = [ "out" "dev" "lib" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "WebDav server implementation and library using libsoup"; homepage = "https://wiki.gnome.org/phodav"; license = licenses.lgpl21; diff --git a/pkgs/tools/networking/photon/default.nix b/pkgs/tools/networking/photon/default.nix index db6917ef0b76..55dedc09bea5 100644 --- a/pkgs/tools/networking/photon/default.nix +++ b/pkgs/tools/networking/photon/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python3Packages, fetchFromGitHub }: +{ lib, stdenv, python3Packages, fetchFromGitHub }: python3Packages.buildPythonApplication rec { pname = "photon"; @@ -25,7 +25,7 @@ python3Packages.buildPythonApplication rec { --add-flags "-O $out/share/photon/photon.py" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "a lightning fast web crawler which extracts URLs, files, intel & endpoints from a target"; homepage = "https://github.com/s0md3v/Photon"; license = licenses.gpl3; diff --git a/pkgs/tools/networking/pingtcp/default.nix b/pkgs/tools/networking/pingtcp/default.nix index d3fb37705bd9..5b4cbf10321f 100644 --- a/pkgs/tools/networking/pingtcp/default.nix +++ b/pkgs/tools/networking/pingtcp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "pingtcp"; @@ -14,15 +14,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - enableParallelBuilding = true; - doCheck = false; postInstall = '' install -Dm644 {..,$out/share/doc/pingtcp}/README.md ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Measure TCP handshake time"; homepage = "https://github.com/LanetNetwork/pingtcp"; license = licenses.gpl3; diff --git a/pkgs/tools/networking/pirate-get/default.nix b/pkgs/tools/networking/pirate-get/default.nix index b89ab8164cc4..76b77da1764b 100644 --- a/pkgs/tools/networking/pirate-get/default.nix +++ b/pkgs/tools/networking/pirate-get/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python3Packages }: +{ lib, stdenv, python3Packages }: with python3Packages; @@ -13,7 +13,7 @@ buildPythonApplication rec { propagatedBuildInputs = [ colorama veryprettytable pyperclip ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A command line interface for The Pirate Bay"; homepage = "https://github.com/vikstrous/pirate-get"; license = licenses.gpl1; diff --git a/pkgs/tools/networking/pmacct/default.nix b/pkgs/tools/networking/pmacct/default.nix index 4ef3cd6345e5..12c6eeaf4704 100644 --- a/pkgs/tools/networking/pmacct/default.nix +++ b/pkgs/tools/networking/pmacct/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , pkgconfig , autoreconfHook @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { ++ optional withPgSQL "--enable-pgsql" ++ optional withMysql "--enable-mysql"; - meta = with stdenv.lib; { + meta = with lib; { description = "A small set of multi-purpose passive network monitoring tools"; longDescription = '' pmacct is a small set of multi-purpose passive network monitoring tools diff --git a/pkgs/tools/networking/polygraph/default.nix b/pkgs/tools/networking/polygraph/default.nix index 05053b373494..addb72359297 100644 --- a/pkgs/tools/networking/polygraph/default.nix +++ b/pkgs/tools/networking/polygraph/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl, zlib, ncurses }: +{ lib, stdenv, fetchurl, openssl, zlib, ncurses }: stdenv.mkDerivation rec { name = "polygraph-4.13.0"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ openssl zlib ncurses ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.web-polygraph.org"; description = "Performance testing tool for caching proxies, origin server accelerators, L4/7 switches, content filters, and other Web intermediaries"; platforms = platforms.linux; diff --git a/pkgs/tools/networking/polysh/default.nix b/pkgs/tools/networking/polysh/default.nix index 34bc908060aa..68cb8fed57a0 100644 --- a/pkgs/tools/networking/polysh/default.nix +++ b/pkgs/tools/networking/polysh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python2Packages }: +{ lib, stdenv, fetchurl, python2Packages }: let inherit (python2Packages) buildPythonApplication; @@ -11,7 +11,7 @@ buildPythonApplication rec { sha256 = "0kxhp38c8a8hc8l86y53l2z5zpzxc4b8lx5zyzmq1badcrfc4mh4"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A tool to aggregate several remote shells into one"; longDescription = '' Polysh is a tool to aggregate several remote shells into one. It diff --git a/pkgs/tools/networking/ppp/default.nix b/pkgs/tools/networking/ppp/default.nix index f507b582f64b..36d156a3994b 100644 --- a/pkgs/tools/networking/ppp/default.nix +++ b/pkgs/tools/networking/ppp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, fetchFromGitHub, substituteAll, libpcap, openssl }: +{ lib, stdenv, fetchurl, fetchpatch, fetchFromGitHub, substituteAll, libpcap, openssl }: stdenv.mkDerivation rec { version = "2.4.8"; @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://ppp.samba.org/"; description = "Point-to-point implementation for Linux and Solaris"; license = with licenses; [ bsdOriginal publicDomain gpl2 lgpl2 ]; diff --git a/pkgs/tools/networking/pptp/default.nix b/pkgs/tools/networking/pptp/default.nix index dfc61d8197c1..1534d1083f4a 100644 --- a/pkgs/tools/networking/pptp/default.nix +++ b/pkgs/tools/networking/pptp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, ppp, iproute }: +{ lib, stdenv, fetchurl, perl, ppp, iproute }: stdenv.mkDerivation rec { pname = "pptp"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { patchShebangs $out ''; - meta = with stdenv.lib; { + meta = with lib; { description = "PPTP client for Linux"; homepage = "http://pptpclient.sourceforge.net/"; license = licenses.gpl2; diff --git a/pkgs/tools/networking/pptpd/default.nix b/pkgs/tools/networking/pptpd/default.nix index e6f5f9503d8e..8a802281192e 100644 --- a/pkgs/tools/networking/pptpd/default.nix +++ b/pkgs/tools/networking/pptpd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ppp }: +{ lib, stdenv, fetchurl, ppp }: stdenv.mkDerivation rec { pname = "pptpd"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { substituteInPlace plugins/Makefile --replace "install -o root" "install" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://poptop.sourceforge.net/dox/"; description = "The PPTP Server for Linux"; platforms = platforms.linux; diff --git a/pkgs/tools/networking/privoxy/default.nix b/pkgs/tools/networking/privoxy/default.nix index 8346c862fc6e..2963f2aff523 100644 --- a/pkgs/tools/networking/privoxy/default.nix +++ b/pkgs/tools/networking/privoxy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, zlib, pcre, w3m, man }: +{ lib, stdenv, fetchurl, autoreconfHook, zlib, pcre, w3m, man }: stdenv.mkDerivation rec { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { rm -rf $out/var ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.privoxy.org/"; description = "Non-caching web proxy with advanced filtering capabilities"; license = licenses.gpl2; diff --git a/pkgs/tools/networking/proxify/default.nix b/pkgs/tools/networking/proxify/default.nix index 4a75b3ca2f17..7f45d53d41d1 100644 --- a/pkgs/tools/networking/proxify/default.nix +++ b/pkgs/tools/networking/proxify/default.nix @@ -1,6 +1,6 @@ { buildGoModule , fetchFromGitHub -, stdenv +, lib, stdenv }: buildGoModule rec { @@ -16,7 +16,7 @@ buildGoModule rec { vendorSha256 = "1x78n88ri8kph827k03x1q06zpbbbp7793xsvc376ljda5n6bqig"; - meta = with stdenv.lib; { + meta = with lib; { description = "Proxy tool for HTTP/HTTPS traffic capture"; longDescription = '' This tool supports multiple operations such as request/response dump, filtering diff --git a/pkgs/tools/networking/pssh/default.nix b/pkgs/tools/networking/pssh/default.nix index 43e465e05b6a..b2b08cea8443 100644 --- a/pkgs/tools/networking/pssh/default.nix +++ b/pkgs/tools/networking/pssh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pythonPackages, openssh, rsync }: +{ lib, stdenv, fetchFromGitHub, pythonPackages, openssh, rsync }: pythonPackages.buildPythonApplication rec { pname = "pssh"; @@ -20,7 +20,7 @@ pythonPackages.buildPythonApplication rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Parallel SSH Tools"; longDescription = '' PSSH provides parallel versions of OpenSSH and related tools, diff --git a/pkgs/tools/networking/pwnat/default.nix b/pkgs/tools/networking/pwnat/default.nix index 55965173e0ef..b710b6601d1b 100644 --- a/pkgs/tools/networking/pwnat/default.nix +++ b/pkgs/tools/networking/pwnat/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { name = "${pname}-${date}"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { cp README* COPYING* $out/share/pwnat ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://samy.pl/pwnat/"; description = "ICMP NAT to NAT client-server communication"; license = stdenv.lib.licenses.gpl3Plus; diff --git a/pkgs/tools/networking/pykms/default.nix b/pkgs/tools/networking/pykms/default.nix index 345999c00bcd..f7ddd2ef3f99 100644 --- a/pkgs/tools/networking/pykms/default.nix +++ b/pkgs/tools/networking/pykms/default.nix @@ -1,4 +1,4 @@ -{ stdenv, runtimeShell, fetchFromGitHub, python3, writeText, writeScript +{ lib, stdenv, runtimeShell, fetchFromGitHub, python3, writeText, writeScript , coreutils, sqlite }: with python3.pkgs; @@ -81,7 +81,7 @@ in buildPythonApplication rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Windows KMS (Key Management Service) server written in Python"; homepage = "https://github.com/SystemRage/py-kms"; license = licenses.mit; diff --git a/pkgs/tools/networking/quickserve/default.nix b/pkgs/tools/networking/quickserve/default.nix index 53d649d791fc..f23bbcd25371 100644 --- a/pkgs/tools/networking/quickserve/default.nix +++ b/pkgs/tools/networking/quickserve/default.nix @@ -1,4 +1,4 @@ -{ stdenv, makeWrapper, fetchzip, python3, python3Packages }: +{ lib, stdenv, makeWrapper, fetchzip, python3, python3Packages }: let threaded_servers = python3Packages.buildPythonPackage { name = "threaded_servers"; @@ -26,7 +26,7 @@ in stdenv.mkDerivation { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A simple HTTP server for quickly sharing files"; homepage = "https://xyne.archlinux.ca/projects/quickserve/"; license = licenses.gpl2; diff --git a/pkgs/tools/networking/quicktun/default.nix b/pkgs/tools/networking/quicktun/default.nix index 0f7a16caa82c..8d227e1fbba1 100644 --- a/pkgs/tools/networking/quicktun/default.nix +++ b/pkgs/tools/networking/quicktun/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libsodium }: +{ lib, stdenv, fetchFromGitHub, libsodium }: stdenv.mkDerivation { pname = "quicktun"; @@ -22,7 +22,7 @@ stdenv.mkDerivation { install -vD out/quicktun* -t $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Very simple, yet secure VPN software"; homepage = "http://wiki.ucis.nl/QuickTun"; maintainers = [ maintainers.fpletz ]; diff --git a/pkgs/tools/networking/radsecproxy/default.nix b/pkgs/tools/networking/radsecproxy/default.nix index 283131b56714..1a7d895f8102 100644 --- a/pkgs/tools/networking/radsecproxy/default.nix +++ b/pkgs/tools/networking/radsecproxy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, openssl, autoreconfHook, nettle }: +{ lib, stdenv, fetchFromGitHub, openssl, autoreconfHook, nettle }: stdenv.mkDerivation rec { pname = "radsecproxy"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { "--localstatedir=/var" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://software.nordu.net/radsecproxy/"; description = "A generic RADIUS proxy that supports both UDP and TLS (RadSec) RADIUS transports"; license = licenses.bsd3; diff --git a/pkgs/tools/networking/radvd/default.nix b/pkgs/tools/networking/radvd/default.nix index aef67022f786..116b1de83ec5 100644 --- a/pkgs/tools/networking/radvd/default.nix +++ b/pkgs/tools/networking/radvd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libdaemon, bison, flex, check }: +{ lib, stdenv, fetchurl, pkgconfig, libdaemon, bison, flex, check }: stdenv.mkDerivation rec { pname = "radvd"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig bison flex check ]; buildInputs = [ libdaemon ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.litech.org/radvd/"; description = "IPv6 Router Advertisement Daemon"; platforms = platforms.linux; diff --git a/pkgs/tools/networking/ratools/default.nix b/pkgs/tools/networking/ratools/default.nix index 23d0dae086ec..0eea11bb3f58 100644 --- a/pkgs/tools/networking/ratools/default.nix +++ b/pkgs/tools/networking/ratools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "ratools"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { install -vD man/* -t $out/share/man/man8 ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A fast, dynamic, multi-threading framework for IPv6 Router Advertisements"; homepage = "https://github.com/danrl/ratools"; license = licenses.asl20; diff --git a/pkgs/tools/networking/rcon/default.nix b/pkgs/tools/networking/rcon/default.nix index f7cd08e197e8..1ec988676e4a 100644 --- a/pkgs/tools/networking/rcon/default.nix +++ b/pkgs/tools/networking/rcon/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkg-config, glib, libbsd, check, pcre }: +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, glib, libbsd, check, pcre }: stdenv.mkDerivation rec { pname = "rcon"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { pcre ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/n0la/rcon"; description = "Source RCON client for command line"; maintainers = with maintainers; [ f4814n ]; diff --git a/pkgs/tools/networking/rdrview/default.nix b/pkgs/tools/networking/rdrview/default.nix new file mode 100644 index 000000000000..8f5103957053 --- /dev/null +++ b/pkgs/tools/networking/rdrview/default.nix @@ -0,0 +1,26 @@ +{ lib, stdenv, fetchFromGitHub, libxml2, curl, libseccomp }: + +stdenv.mkDerivation { + name = "rdrview"; + version = "unstable-2020-12-22"; + + src = fetchFromGitHub { + owner = "eafer"; + repo = "rdrview"; + rev = "7be01fb36a6ab3311a9ad1c8c2c75bf5c1345d93"; + sha256 = "00hnvrrrkyp5429rzcvabq2z00lp1l8wsqxw4h7qsdms707mjnxs"; + }; + + buildInputs = [ libxml2 curl libseccomp ]; + + installPhase = '' + install -Dm755 rdrview -t $out/bin + ''; + + meta = with lib; { + description = "Command line tool to extract main content from a webpage"; + homepage = "https://github.com/eafer/rdrview"; + license = licenses.asl20; + maintainers = with maintainers; [ djanatyn ]; + }; +} diff --git a/pkgs/tools/networking/reaver-wps-t6x/default.nix b/pkgs/tools/networking/reaver-wps-t6x/default.nix index d347273f50ec..147eb2c3bf24 100644 --- a/pkgs/tools/networking/reaver-wps-t6x/default.nix +++ b/pkgs/tools/networking/reaver-wps-t6x/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libpcap, pixiewps, makeWrapper }: +{ lib, stdenv, fetchFromGitHub, libpcap, pixiewps, makeWrapper }: stdenv.mkDerivation rec { pname = "reaver-wps-t6x"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sourceRoot = "source/src"; - meta = with stdenv.lib; { + meta = with lib; { description = "Online and offline brute force attack against WPS"; homepage = "https://github.com/t6x/reaver-wps-fork-t6x"; license = licenses.gpl2Plus; diff --git a/pkgs/tools/networking/reaver-wps/default.nix b/pkgs/tools/networking/reaver-wps/default.nix index 9f4f2d5bea4e..ec226f50668b 100644 --- a/pkgs/tools/networking/reaver-wps/default.nix +++ b/pkgs/tools/networking/reaver-wps/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libpcap, sqlite, makeWrapper }: +{ lib, stdenv, fetchurl, libpcap, sqlite, makeWrapper }: stdenv.mkDerivation rec { version = "1.4"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/wash --run "[ -s ${confdir}/reaver/reaver.db ] || install -D $out/etc/reaver.db ${confdir}/reaver/reaver.db" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Brute force attack against Wifi Protected Setup"; homepage = "https://code.google.com/archive/p/reaver-wps/"; license = licenses.gpl2Plus; diff --git a/pkgs/tools/networking/ripmime/default.nix b/pkgs/tools/networking/ripmime/default.nix index 0c3c32270b17..d40c1d10aa7c 100644 --- a/pkgs/tools/networking/ripmime/default.nix +++ b/pkgs/tools/networking/ripmime/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "ripmime"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE=" -Wno-error "; - meta = with stdenv.lib; { + meta = with lib; { description = "Attachment extractor for MIME messages"; maintainers = with maintainers; [ raskin ]; homepage = "http://www.pldaniels.com/ripmime/"; diff --git a/pkgs/tools/networking/rp-pppoe/default.nix b/pkgs/tools/networking/rp-pppoe/default.nix index d8476d1d159a..fd3a563c209d 100644 --- a/pkgs/tools/networking/rp-pppoe/default.nix +++ b/pkgs/tools/networking/rp-pppoe/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ppp } : +{ lib, stdenv, fetchurl, ppp } : let version = "3.12"; in @@ -21,7 +21,7 @@ stdenv.mkDerivation { sed -i Makefile -e 's@PPPOESERVER_PPPD_OPTIONS=@&$(out)@' ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Roaring Penguin Point-to-Point over Ethernet tool"; platforms = platforms.linux; homepage = "https://www.roaringpenguin.com/products/pppoe"; diff --git a/pkgs/tools/networking/s3cmd/default.nix b/pkgs/tools/networking/s3cmd/default.nix index 53f24ddb7524..06f51b0c5063 100644 --- a/pkgs/tools/networking/s3cmd/default.nix +++ b/pkgs/tools/networking/s3cmd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonApplication, fetchFromGitHub, python_magic, dateutil }: +{ lib, stdenv, buildPythonApplication, fetchFromGitHub, python_magic, dateutil }: buildPythonApplication rec { pname = "s3cmd"; @@ -15,7 +15,7 @@ buildPythonApplication rec { dontUseSetuptoolsCheck = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://s3tools.org/s3cmd"; description = "Command line tool for managing Amazon S3 and CloudFront services"; license = licenses.gpl2; diff --git a/pkgs/tools/networking/s4cmd/default.nix b/pkgs/tools/networking/s4cmd/default.nix index dedbc751179f..80874649072a 100644 --- a/pkgs/tools/networking/s4cmd/default.nix +++ b/pkgs/tools/networking/s4cmd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python3Packages }: +{ lib, stdenv, python3Packages }: python3Packages.buildPythonApplication rec { pname = "s4cmd"; @@ -26,7 +26,7 @@ python3Packages.buildPythonApplication rec { # Test suite requires an S3 bucket doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/bloomreach/s4cmd"; description = "Super S3 command line tool"; license = licenses.asl20; diff --git a/pkgs/tools/networking/saldl/default.nix b/pkgs/tools/networking/saldl/default.nix index d51e5515bd63..b697f4c3b3d0 100644 --- a/pkgs/tools/networking/saldl/default.nix +++ b/pkgs/tools/networking/saldl/default.nix @@ -1,7 +1,8 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , pkgconfig , wafHook +, python3 , asciidoc , docbook_xml_dtd_45 , docbook_xsl @@ -25,6 +26,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig wafHook + python3 asciidoc docbook_xml_dtd_45 docbook_xsl @@ -38,7 +40,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "man" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "CLI downloader optimized for speed and early preview"; homepage = "https://saldl.github.io"; license = licenses.agpl3; diff --git a/pkgs/tools/networking/shadowfox/default.nix b/pkgs/tools/networking/shadowfox/default.nix index d1cc33457737..c7507925f5f8 100644 --- a/pkgs/tools/networking/shadowfox/default.nix +++ b/pkgs/tools/networking/shadowfox/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildGoModule }: +{ lib, stdenv, fetchFromGitHub, buildGoModule }: buildGoModule rec { pname = "shadowfox"; @@ -19,7 +19,7 @@ buildGoModule rec { "-ldflags=-X main.tag=v${version}" ]; - meta = with stdenv.lib; { + meta = with lib; { description = '' This project aims at creating a universal dark theme for Firefox while adhering to the modern design principles set by Mozilla. diff --git a/pkgs/tools/networking/shadowsocks-libev/default.nix b/pkgs/tools/networking/shadowsocks-libev/default.nix index 22b291ec44e9..b0a24b539c2b 100644 --- a/pkgs/tools/networking/shadowsocks-libev/default.nix +++ b/pkgs/tools/networking/shadowsocks-libev/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake +{ lib, stdenv, fetchFromGitHub, cmake , libsodium, mbedtls, libev, c-ares, pcre , asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt }: @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { cp lib/* $out/lib ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A lightweight secured SOCKS5 proxy"; longDescription = '' Shadowsocks-libev is a lightweight secured SOCKS5 proxy for embedded devices and low-end boxes. diff --git a/pkgs/tools/networking/shadowsocks-rust/default.nix b/pkgs/tools/networking/shadowsocks-rust/default.nix index ed793a50cb8f..4f927a684c03 100644 --- a/pkgs/tools/networking/shadowsocks-rust/default.nix +++ b/pkgs/tools/networking/shadowsocks-rust/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform, pkgconfig, openssl, libsodium, Security }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, pkgconfig, openssl, libsodium, Security }: rustPlatform.buildRustPackage rec { pname = "shadowsocks-rust"; @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { ++ stdenv.lib.optionals stdenv.isDarwin [ Security ]; nativeBuildInputs = [ pkgconfig ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/shadowsocks/shadowsocks-rust"; description = "A Rust port of shadowsocks"; license = licenses.mit; diff --git a/pkgs/tools/networking/shncpd/default.nix b/pkgs/tools/networking/shncpd/default.nix index 46c9b22248ac..8cfd1f94252a 100644 --- a/pkgs/tools/networking/shncpd/default.nix +++ b/pkgs/tools/networking/shncpd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation { pname = "shncpd"; @@ -17,7 +17,7 @@ stdenv.mkDerivation { makeFlags=( "PREFIX=$out" ) ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Simple, stupid and slow HNCP daemon"; homepage = "https://www.irif.univ-paris-diderot.fr/~jch/software/homenet/shncpd.html"; license = licenses.mit; diff --git a/pkgs/tools/networking/siege/default.nix b/pkgs/tools/networking/siege/default.nix index 4df008364d0c..125b66b36a5a 100644 --- a/pkgs/tools/networking/siege/default.nix +++ b/pkgs/tools/networking/siege/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl, zlib }: +{ lib, stdenv, fetchurl, openssl, zlib }: stdenv.mkDerivation rec { name = "siege-4.0.7"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { "--with-zlib=${zlib.dev}" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "HTTP load tester"; maintainers = with maintainers; [ raskin ]; platforms = platforms.unix; diff --git a/pkgs/tools/networking/simpleproxy/default.nix b/pkgs/tools/networking/simpleproxy/default.nix index 7a5bc713faee..6c110be05da3 100644 --- a/pkgs/tools/networking/simpleproxy/default.nix +++ b/pkgs/tools/networking/simpleproxy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "simpleproxy"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1my9g4vp19dikx3fsbii4ichid1bs9b9in46bkg05gbljhj340f6"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/vzaliva/simpleproxy"; description = "A simple TCP proxy"; license = licenses.gpl2; diff --git a/pkgs/tools/networking/sipcalc/default.nix b/pkgs/tools/networking/sipcalc/default.nix index 081f20053301..c9470cd5b8b3 100644 --- a/pkgs/tools/networking/sipcalc/default.nix +++ b/pkgs/tools/networking/sipcalc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "sipcalc"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "cfd476c667f7a119e49eb5fe8adcfb9d2339bc2e0d4d01a1d64b7c229be56357"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Advanced console ip subnet calculator"; homepage = "http://www.routemeister.net/projects/sipcalc/"; license = licenses.bsd3; diff --git a/pkgs/tools/networking/sipsak/default.nix b/pkgs/tools/networking/sipsak/default.nix index 09de1c2e594a..320a856437b9 100644 --- a/pkgs/tools/networking/sipsak/default.nix +++ b/pkgs/tools/networking/sipsak/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, c-ares, openssl ? null }: +{ lib, stdenv, fetchurl, autoreconfHook, c-ares, openssl ? null }: stdenv.mkDerivation rec { pname = "sipsak"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sha256 = "769fe59966b1962b67aa35aad7beb9a2110ebdface36558072a05c6405fb5374"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/sipwise/sipsak"; description = "SIP Swiss army knife"; license = stdenv.lib.licenses.gpl2; diff --git a/pkgs/tools/networking/slirp4netns/default.nix b/pkgs/tools/networking/slirp4netns/default.nix index c0c64405c0d4..bda3d36c2455 100644 --- a/pkgs/tools/networking/slirp4netns/default.nix +++ b/pkgs/tools/networking/slirp4netns/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , autoreconfHook , pkg-config @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { passthru.tests = { inherit (nixosTests) podman; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/rootless-containers/slirp4netns"; description = "User-mode networking for unprivileged network namespaces"; license = licenses.gpl2; diff --git a/pkgs/tools/networking/smartdns/default.nix b/pkgs/tools/networking/smartdns/default.nix index ca40012433ef..91fcc0e982eb 100644 --- a/pkgs/tools/networking/smartdns/default.nix +++ b/pkgs/tools/networking/smartdns/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, openssl }: +{ lib, stdenv, fetchFromGitHub, openssl }: stdenv.mkDerivation rec { pname = "smartdns"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { installFlags = [ "SYSCONFDIR=${placeholder "out"}/etc" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A local DNS server to obtain the fastest website IP for the best Internet experience"; longDescription = '' diff --git a/pkgs/tools/networking/socat/2.x.nix b/pkgs/tools/networking/socat/2.x.nix index 97775a00604b..0f36b83e1651 100644 --- a/pkgs/tools/networking/socat/2.x.nix +++ b/pkgs/tools/networking/socat/2.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl }: +{ lib, stdenv, fetchurl, openssl }: stdenv.mkDerivation rec { name = "socat-2.0.0-b9"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { patches = stdenv.lib.singleton ./libressl-fixes.patch ; - meta = with stdenv.lib; { + meta = with lib; { description = "A utility for bidirectional data transfer between two independent data channels"; homepage = "http://www.dest-unreach.org/socat/"; repositories.git = "git://repo.or.cz/socat.git"; diff --git a/pkgs/tools/networking/socat/default.nix b/pkgs/tools/networking/socat/default.nix index c50b2236c9e4..7a24ccf33b74 100644 --- a/pkgs/tools/networking/socat/default.nix +++ b/pkgs/tools/networking/socat/default.nix @@ -1,11 +1,19 @@ -{ stdenv, fetchurl, openssl, readline, which, nettools }: +{ lib +, fetchurl +, nettools +, openssl +, readline +, stdenv +, which +}: stdenv.mkDerivation rec { - name = "socat-1.7.3.4"; + pname = "socat"; + version = "1.7.4.1"; src = fetchurl { - url = "http://www.dest-unreach.org/socat/download/${name}.tar.bz2"; - sha256 = "1z7xgnwiqpcv1j6aghhj9nqbx7cg3gpc4n9j7vi9hm7nhv5788wp"; + url = "http://www.dest-unreach.org/socat/download/${pname}-${version}.tar.bz2"; + sha256 = "1sbmqqvni3ss9wyay6ik5v81kxffkra80mh4ypgj74g82iba5b1z"; }; postPatch = '' @@ -22,12 +30,12 @@ stdenv.mkDerivation rec { checkInputs = [ which nettools ]; doCheck = false; # fails a bunch, hangs - meta = { - description = "A utility for bidirectional data transfer between two independent data channels"; + meta = with lib; { + description = "Utility for bidirectional data transfer between two independent data channels"; homepage = "http://www.dest-unreach.org/socat/"; repositories.git = "git://repo.or.cz/socat.git"; - platforms = stdenv.lib.platforms.unix; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.eelco ]; + platforms = platforms.unix; + license = with licenses; [ gpl2Only ]; + maintainers = with maintainers; [ eelco ]; }; } diff --git a/pkgs/tools/networking/spoofer/default.nix b/pkgs/tools/networking/spoofer/default.nix index cadaf021cda7..b0aefa9ef114 100644 --- a/pkgs/tools/networking/spoofer/default.nix +++ b/pkgs/tools/networking/spoofer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, protobuf, openssl, libpcap, traceroute +{ lib, stdenv, fetchurl, pkgconfig, protobuf, openssl, libpcap, traceroute , withGUI ? false, qt5 }: let inherit (stdenv.lib) optional; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ openssl protobuf libpcap traceroute ] ++ optional withGUI qt5.qtbase ; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.caida.org/projects/spoofer"; description = "Assess and report on deployment of source address validation"; longDescription = '' diff --git a/pkgs/tools/networking/ssh-askpass-fullscreen/default.nix b/pkgs/tools/networking/ssh-askpass-fullscreen/default.nix index 07cc5da960dd..05e518371262 100644 --- a/pkgs/tools/networking/ssh-askpass-fullscreen/default.nix +++ b/pkgs/tools/networking/ssh-askpass-fullscreen/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, gtk2, openssh }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, gtk2, openssh }: stdenv.mkDerivation rec { pname = "ssh-askpass-fullscreen"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { openssh ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A small SSH askpass GUI using GTK+2"; homepage = "https://github.com/atj/ssh-askpass-fullscreen"; license = licenses.gpl2; diff --git a/pkgs/tools/networking/sshoogr/default.nix b/pkgs/tools/networking/sshoogr/default.nix index 764b34fc5a53..9539c15f5ed9 100644 --- a/pkgs/tools/networking/sshoogr/default.nix +++ b/pkgs/tools/networking/sshoogr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, jdk, makeWrapper }: +{ lib, stdenv, fetchzip, jdk, makeWrapper }: stdenv.mkDerivation rec { pname = "sshoogr"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { --prefix JAVA_HOME : ${jdk} ''; - meta = with stdenv.lib; { + meta = with lib; { description = '' A Groovy-based DSL for working with remote SSH servers ''; diff --git a/pkgs/tools/networking/sshpass/default.nix b/pkgs/tools/networking/sshpass/default.nix index 7f5644edb526..60c9ab97a8b3 100644 --- a/pkgs/tools/networking/sshpass/default.nix +++ b/pkgs/tools/networking/sshpass/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation rec { pname = "sshpass"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0q7fblaczb7kwbsz0gdy9267z0sllzgmf0c7z5c9mf88wv74ycn6"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://sourceforge.net/projects/sshpass/"; description = "Non-interactive ssh password auth"; license = licenses.gpl2; diff --git a/pkgs/tools/networking/sshping/default.nix b/pkgs/tools/networking/sshping/default.nix index aa3e57d53f88..13abba539ac5 100644 --- a/pkgs/tools/networking/sshping/default.nix +++ b/pkgs/tools/networking/sshping/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, libssh}: +{lib, stdenv, fetchFromGitHub, libssh}: stdenv.mkDerivation rec { pname = "sshping"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { install -Dm755 bin/sshping $out/bin/sshping ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/spook/sshping"; description = "Measure character-echo latency and bandwidth for an interactive ssh session"; license = licenses.mit; diff --git a/pkgs/tools/networking/sslsplit/default.nix b/pkgs/tools/networking/sslsplit/default.nix index bf23d06551d7..c3a343d7fa1e 100644 --- a/pkgs/tools/networking/sslsplit/default.nix +++ b/pkgs/tools/networking/sslsplit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, openssl, libevent, libpcap, libnet, zlib }: +{ lib, stdenv, fetchFromGitHub, openssl, libevent, libpcap, libnet, zlib }: stdenv.mkDerivation rec { pname = "sslsplit"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { "LIBNET_BASE=${libnet}" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Transparent SSL/TLS interception"; homepage = "https://www.roe.ch/SSLsplit"; platforms = platforms.all; diff --git a/pkgs/tools/networking/ssmtp/default.nix b/pkgs/tools/networking/ssmtp/default.nix index 90547eb13643..0e624631d47f 100644 --- a/pkgs/tools/networking/ssmtp/default.nix +++ b/pkgs/tools/networking/ssmtp/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, tlsSupport ? true, openssl ? null}: +{lib, stdenv, fetchurl, tlsSupport ? true, openssl ? null}: assert tlsSupport -> openssl != null; @@ -38,7 +38,7 @@ stdenv.mkDerivation { NIX_LDFLAGS = stdenv.lib.optionalString tlsSupport "-lcrypto"; - meta = with stdenv.lib; { + meta = with lib; { platforms = platforms.linux; license = licenses.gpl2; maintainers = with maintainers; [ basvandijk ]; diff --git a/pkgs/tools/networking/stubby/default.nix b/pkgs/tools/networking/stubby/default.nix index 2a10eb13e320..a87204ff0c6c 100644 --- a/pkgs/tools/networking/stubby/default.nix +++ b/pkgs/tools/networking/stubby/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, getdns, doxygen, libyaml, darwin, cmake, systemd }: +{ lib, stdenv, fetchFromGitHub, getdns, doxygen, libyaml, darwin, cmake, systemd }: stdenv.mkDerivation rec { pname = "stubby"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ doxygen getdns systemd ] ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.Security ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A local DNS Privacy stub resolver (using DNS-over-TLS)"; longDescription = '' Stubby is an application that acts as a local DNS Privacy stub diff --git a/pkgs/tools/networking/stun/default.nix b/pkgs/tools/networking/stun/default.nix index 306b1899f763..c74c73ec6a0e 100644 --- a/pkgs/tools/networking/stun/default.nix +++ b/pkgs/tools/networking/stun/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "stun"; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { cp -v debian/manpages/stund.8.gz $server/man/man8 ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Stun server and test client"; homepage = "https://sourceforge.net/projects/stun/"; license = licenses.vsl10; diff --git a/pkgs/tools/networking/subfinder/default.nix b/pkgs/tools/networking/subfinder/default.nix index f812f7ffa91f..4474cba6aee0 100644 --- a/pkgs/tools/networking/subfinder/default.nix +++ b/pkgs/tools/networking/subfinder/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "subfinder"; @@ -15,7 +15,7 @@ buildGoPackage rec { goDeps = ./deps.nix; - meta = with stdenv.lib; { + meta = with lib; { description = "Subdomain discovery tool"; longDescription = '' SubFinder is a subdomain discovery tool that discovers valid diff --git a/pkgs/tools/networking/swagger-codegen/default.nix b/pkgs/tools/networking/swagger-codegen/default.nix index c5026851f50e..e93435515b2b 100644 --- a/pkgs/tools/networking/swagger-codegen/default.nix +++ b/pkgs/tools/networking/swagger-codegen/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jre, makeWrapper }: +{ lib, stdenv, fetchurl, jre, makeWrapper }: stdenv.mkDerivation rec { version = "2.4.17"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { --add-flags "-jar $out/share/java/${jarfilename}" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Allows generation of API client libraries (SDK generation), server stubs and documentation automatically given an OpenAPI Spec"; homepage = "https://github.com/swagger-api/swagger-codegen"; license = licenses.asl20; diff --git a/pkgs/tools/networking/swaks/default.nix b/pkgs/tools/networking/swaks/default.nix index 81d0935f0b08..85e899894759 100644 --- a/pkgs/tools/networking/swaks/default.nix +++ b/pkgs/tools/networking/swaks/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, perlPackages, makeWrapper }: +{ lib, stdenv, fetchurl, perl, perlPackages, makeWrapper }: stdenv.mkDerivation rec { pname = "swaks"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ]}" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.jetmore.org/john/code/swaks/"; description = "A featureful, flexible, scriptable, transaction-oriented SMTP test tool"; license = licenses.gpl2; diff --git a/pkgs/tools/networking/tayga/default.nix b/pkgs/tools/networking/tayga/default.nix index 1cecf2d634df..8d0de6a6c188 100644 --- a/pkgs/tools/networking/tayga/default.nix +++ b/pkgs/tools/networking/tayga/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { version = "0.9.2"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1700y121lhvpna49bjpssb7jq1abj9qw5wxgjn8gzp6jm4kpj7rb"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Userland stateless NAT64 daemon"; longDescription = '' TAYGA is an out-of-kernel stateless NAT64 implementation diff --git a/pkgs/tools/networking/tcpdump/default.nix b/pkgs/tools/networking/tcpdump/default.nix index fd7b203fbbf4..fa555ad4f99c 100644 --- a/pkgs/tools/networking/tcpdump/default.nix +++ b/pkgs/tools/networking/tcpdump/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libpcap, perl }: +{ stdenv, fetchurl, libpcap, perl, fetchpatch }: stdenv.mkDerivation rec { pname = "tcpdump"; @@ -9,6 +9,14 @@ stdenv.mkDerivation rec { sha256 = "0434vdcnbqaia672rggjzdn4bb8p8dchz559yiszzdk0sjrprm1c"; }; + patches = [ + # Patch for CVE-2020-8037 + (fetchpatch { + url = "https://github.com/the-tcpdump-group/tcpdump/commit/32027e199368dad9508965aae8cd8de5b6ab5231.patch"; + sha256 = "sha256-bO3aV032ru9+M/9isBRjmH8jTZLKj9Zf9ha2rmOaZwc="; + }) + ]; + postPatch = '' patchShebangs tests ''; diff --git a/pkgs/tools/networking/tcpflow/default.nix b/pkgs/tools/networking/tcpflow/default.nix index 8f502c5ef3f6..74c7f0f11352 100644 --- a/pkgs/tools/networking/tcpflow/default.nix +++ b/pkgs/tools/networking/tcpflow/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { preConfigure = "bash ./bootstrap.sh"; - meta = with stdenv.lib; { + meta = with lib; { description = "TCP stream extractor"; longDescription = '' tcpflow is a program that captures data transmitted as part of TCP diff --git a/pkgs/tools/networking/tcpreplay/default.nix b/pkgs/tools/networking/tcpreplay/default.nix index fdf7965311d0..2875d13671a7 100644 --- a/pkgs/tools/networking/tcpreplay/default.nix +++ b/pkgs/tools/networking/tcpreplay/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libpcap, tcpdump, Carbon, CoreServices }: +{ lib, stdenv, fetchurl, libpcap, tcpdump, Carbon, CoreServices }: stdenv.mkDerivation rec { pname = "tcpreplay"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { "--with-tcpdump=${tcpdump}/bin" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A suite of utilities for editing and replaying network traffic"; homepage = "http://tcpreplay.appneta.com/"; license = with licenses; [ bsd3 gpl3 ]; diff --git a/pkgs/tools/networking/tdns-cli/default.nix b/pkgs/tools/networking/tdns-cli/default.nix index 681109712ab1..0ed7922874dc 100644 --- a/pkgs/tools/networking/tdns-cli/default.nix +++ b/pkgs/tools/networking/tdns-cli/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform }: +{ lib, stdenv, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { name = "tdns-cli"; @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0v1hx6kjsmydx6ckjqj31y2gcpvax4mshwrniicplkka3q6hx9ra"; - meta = with stdenv.lib; { + meta = with lib; { description = "DNS tool that aims to replace dig and nsupdate"; homepage = "https://github.com/rotty/tdns-cli"; license = licenses.gpl3; diff --git a/pkgs/tools/networking/tendermint/default.nix b/pkgs/tools/networking/tendermint/default.nix index 2fedae4b7a79..bd280e75379d 100644 --- a/pkgs/tools/networking/tendermint/default.nix +++ b/pkgs/tools/networking/tendermint/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildGoModule }: +{ lib, stdenv, fetchFromGitHub, buildGoModule }: buildGoModule rec { pname = "tendermint"; @@ -19,7 +19,7 @@ buildGoModule rec { buildFlagsArray = [ "-ldflags=-s -w -X github.com/tendermint/tendermint/version.GitCommit=${src.rev}" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Byzantine-Fault Tolerant State Machines. Or Blockchain, for short"; homepage = "https://tendermint.com/"; license = licenses.asl20; diff --git a/pkgs/tools/networking/termshark/default.nix b/pkgs/tools/networking/termshark/default.nix index 51168f01f448..43b7702a818a 100644 --- a/pkgs/tools/networking/termshark/default.nix +++ b/pkgs/tools/networking/termshark/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, makeWrapper, buildGoModule, wireshark-cli }: +{ lib, stdenv, fetchFromGitHub, makeWrapper, buildGoModule, wireshark-cli }: buildGoModule rec { pname = "termshark"; @@ -27,7 +27,7 @@ buildGoModule rec { -X github.com/gcla/termshark.Version=${version} ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://termshark.io/"; description = "A terminal UI for wireshark-cli, inspired by Wireshark"; license = licenses.mit; diff --git a/pkgs/tools/networking/tftp-hpa/default.nix b/pkgs/tools/networking/tftp-hpa/default.nix index 2d88c9bf07e6..f8e028dc616a 100644 --- a/pkgs/tools/networking/tftp-hpa/default.nix +++ b/pkgs/tools/networking/tftp-hpa/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "tftp-hpa"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "12vidchglhyc20znq5wdsbhi9mqg90jnl7qr9qs8hbvaz4fkdvmg"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "TFTP tools - a lot of fixes on top of BSD TFTP"; maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; diff --git a/pkgs/tools/networking/tgt/default.nix b/pkgs/tools/networking/tgt/default.nix index d9d8478e9856..9ef0c9d46d14 100644 --- a/pkgs/tools/networking/tgt/default.nix +++ b/pkgs/tools/networking/tgt/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "iSCSI Target daemon with RDMA support"; homepage = "http://stgt.sourceforge.net/"; license = licenses.gpl2; diff --git a/pkgs/tools/networking/tinc/pre.nix b/pkgs/tools/networking/tinc/pre.nix index a49ab43e55ed..2379338e51d9 100644 --- a/pkgs/tools/networking/tinc/pre.nix +++ b/pkgs/tools/networking/tinc/pre.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, fetchpatch, autoreconfHook, texinfo, ncurses, readline, zlib, lzo, openssl }: +{ lib, stdenv, fetchgit, fetchpatch, autoreconfHook, texinfo, ncurses, readline, zlib, lzo, openssl }: stdenv.mkDerivation rec { pname = "tinc"; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { "--localstatedir=/var" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "VPN daemon with full mesh routing"; longDescription = '' tinc is a Virtual Private Network (VPN) daemon that uses tunnelling and diff --git a/pkgs/tools/networking/tinyfecvpn/default.nix b/pkgs/tools/networking/tinyfecvpn/default.nix index aab937c994ee..0873b9a541a3 100644 --- a/pkgs/tools/networking/tinyfecvpn/default.nix +++ b/pkgs/tools/networking/tinyfecvpn/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, pkgconfig }: stdenv.mkDerivation rec { pname = "tinyfecvpn"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/wangyu-/tinyfecVPN"; description = "A VPN Designed for Lossy Links, with Build-in Forward Error Correction(FEC) Support"; license = licenses.mit; diff --git a/pkgs/tools/networking/tinyproxy/default.nix b/pkgs/tools/networking/tinyproxy/default.nix index 7d3c49db7b79..610322b23da5 100644 --- a/pkgs/tools/networking/tinyproxy/default.nix +++ b/pkgs/tools/networking/tinyproxy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, asciidoc, libxml2, +{ lib, stdenv, fetchFromGitHub, autoreconfHook, asciidoc, libxml2, libxslt, docbook_xsl }: stdenv.mkDerivation rec { @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { # See: https://github.com/tinyproxy/tinyproxy/issues/1 stdenv.lib.optional stdenv.isDarwin "--disable-regexcheck"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://tinyproxy.github.io/"; description = "A light-weight HTTP/HTTPS proxy daemon for POSIX operating systems"; license = licenses.gpl2; diff --git a/pkgs/tools/networking/tlspool/default.nix b/pkgs/tools/networking/tlspool/default.nix index c91c703f28fb..d3415a88b862 100644 --- a/pkgs/tools/networking/tlspool/default.nix +++ b/pkgs/tools/networking/tlspool/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , cmake, pkgconfig, arpa2cm , openldap, p11-kit, unbound, libtasn1, db, openssl, quickder, libkrb5, ldns, gnutls-kdh , softhsm @@ -43,7 +43,7 @@ stdenv.mkDerivation { cp $src/src/*.h $out/include/${pname} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A supercharged TLS daemon that allows for easy, strong and consistent deployment"; license = licenses.gpl3; homepage = "http://www.tlspool.org"; diff --git a/pkgs/tools/networking/tox-node/default.nix b/pkgs/tools/networking/tox-node/default.nix index 43be37c94288..be949d60067c 100644 --- a/pkgs/tools/networking/tox-node/default.nix +++ b/pkgs/tools/networking/tox-node/default.nix @@ -1,4 +1,4 @@ -{ stdenv, rustPlatform, fetchFromGitHub +{ lib, stdenv, rustPlatform, fetchFromGitHub , libsodium, openssl , pkgconfig }: @@ -33,7 +33,7 @@ buildRustPackage rec { cargoSha256 = "087ccb824hmmxmnn5c2bzww2q888a8zy6y7rwgsdfr8rbay2c909"; - meta = with stdenv.lib; { + meta = with lib; { description = "A server application to run tox node written in pure Rust"; homepage = "https://github.com/tox-rs/tox-node"; license = [ licenses.gpl3Plus ]; diff --git a/pkgs/tools/networking/toxvpn/default.nix b/pkgs/tools/networking/toxvpn/default.nix index 10e4dc2f1b14..887200fa2aa5 100644 --- a/pkgs/tools/networking/toxvpn/default.nix +++ b/pkgs/tools/networking/toxvpn/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, nlohmann_json, +{ lib, stdenv, fetchFromGitHub, cmake, nlohmann_json, libtoxcore, libsodium, libcap, zeromq, systemd ? null }: @@ -23,7 +23,7 @@ stdenv.mkDerivation { postInstall = "$out/bin/toxvpn -h"; - meta = with stdenv.lib; { + meta = with lib; { description = "A powerful tool that allows one to make tunneled point to point connections over Tox"; homepage = "https://github.com/cleverca22/toxvpn"; license = licenses.gpl3; diff --git a/pkgs/tools/networking/tracebox/default.nix b/pkgs/tools/networking/tracebox/default.nix index 1fe2d25e35d0..7ac4c88325c9 100644 --- a/pkgs/tools/networking/tracebox/default.nix +++ b/pkgs/tools/networking/tracebox/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, autoreconfHook, libcrafter, libpcap, lua }: +{ lib, stdenv, fetchzip, autoreconfHook, libcrafter, libpcap, lua }: stdenv.mkDerivation rec { pname = "tracebox"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { sed '/libcrafter/d' -i src/tracebox/Makefile.am ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.tracebox.org/"; description = "A middlebox detection tool"; license = stdenv.lib.licenses.gpl2; diff --git a/pkgs/tools/networking/traceroute/default.nix b/pkgs/tools/networking/traceroute/default.nix index 2948a571a386..04e66f29fccc 100644 --- a/pkgs/tools/networking/traceroute/default.nix +++ b/pkgs/tools/networking/traceroute/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "traceroute"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sed -i 's@LIBS := \(.*\) -lm \(.*\)@LIBS := \1 \2@' Make.rules ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://traceroute.sourceforge.net/"; description = "Tracks the route taken by packets over an IP network"; license = stdenv.lib.licenses.gpl2; diff --git a/pkgs/tools/networking/tridactyl-native/default.nix b/pkgs/tools/networking/tridactyl-native/default.nix index 1ebd8d8be6a2..2e17f753a5b6 100644 --- a/pkgs/tools/networking/tridactyl-native/default.nix +++ b/pkgs/tools/networking/tridactyl-native/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , python3 }: @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { wrapPythonProgramsIn "$out/share/tridactyl" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Tridactyl native messaging host application"; homepage = "https://github.com/tridactyl/tridactyl"; license = licenses.asl20; diff --git a/pkgs/tools/networking/tunnelto/default.nix b/pkgs/tools/networking/tunnelto/default.nix index 4bf251be81fc..a91a82b9d5dd 100644 --- a/pkgs/tools/networking/tunnelto/default.nix +++ b/pkgs/tools/networking/tunnelto/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , rustPlatform , fetchFromGitHub , openssl @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { ++ stdenv.lib.optionals stdenv.isLinux [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ Security ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Expose your local web server to the internet with a public URL"; homepage = "https://tunnelto.dev"; license = licenses.mit; diff --git a/pkgs/tools/networking/ubridge/default.nix b/pkgs/tools/networking/ubridge/default.nix index c628a2c8a8cc..ac475e6e8a53 100644 --- a/pkgs/tools/networking/ubridge/default.nix +++ b/pkgs/tools/networking/ubridge/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , libpcap }: @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { mkdir -p $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Bridge for UDP tunnels, Ethernet, TAP, and VMnet interfaces"; longDescription = '' uBridge is a simple application to create user-land bridges between diff --git a/pkgs/tools/networking/ucspi-tcp/default.nix b/pkgs/tools/networking/ucspi-tcp/default.nix index 72325df8be79..0d6e0a2f8d96 100644 --- a/pkgs/tools/networking/ucspi-tcp/default.nix +++ b/pkgs/tools/networking/ucspi-tcp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "ucspi-tcp-0.88"; @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { cp debian/ucspi-tcp-man/*.1 "$out/share/man/man1" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Command-line tools for building TCP client-server applications"; longDescription = '' tcpserver waits for incoming connections and, for each connection, runs a diff --git a/pkgs/tools/networking/uget-integrator/default.nix b/pkgs/tools/networking/uget-integrator/default.nix index a600d6c5341c..f89b168b84cc 100644 --- a/pkgs/tools/networking/uget-integrator/default.nix +++ b/pkgs/tools/networking/uget-integrator/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, uget, python3Packages }: +{ lib, stdenv, fetchFromGitHub, uget, python3Packages }: stdenv.mkDerivation rec { pname = "uget-integrator"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { wrapPythonPrograms ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Native messaging host to integrate uGet Download Manager with web browsers"; homepage = "https://github.com/ugetdm/uget-integrator"; license = licenses.gpl3; diff --git a/pkgs/tools/networking/uget/default.nix b/pkgs/tools/networking/uget/default.nix index f8c585c3b252..5267eda9bf29 100644 --- a/pkgs/tools/networking/uget/default.nix +++ b/pkgs/tools/networking/uget/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, openssl, curl, libnotify, +{ lib, stdenv, fetchurl, pkgconfig, intltool, openssl, curl, libnotify, libappindicator-gtk3, gst_all_1, gtk3, dconf, wrapGAppsHook, aria2 ? null }: @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { preFixup = stdenv.lib.optionalString (aria2 != null) ''gappsWrapperArgs+=(--suffix PATH : "${aria2}/bin")''; - meta = with stdenv.lib; { + meta = with lib; { description = "Download manager using GTK and libcurl"; longDescription = '' uGet is a VERY Powerful download manager application with a large diff --git a/pkgs/tools/networking/unbound/python.nix b/pkgs/tools/networking/unbound/python.nix index 939c2299e32c..71ff3b954f42 100644 --- a/pkgs/tools/networking/unbound/python.nix +++ b/pkgs/tools/networking/unbound/python.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl, expat, libevent, swig, pythonPackages }: +{ lib, stdenv, fetchurl, openssl, expat, libevent, swig, pythonPackages }: let inherit (pythonPackages) python; @@ -54,7 +54,7 @@ in stdenv.mkDerivation rec { patchelf --replace-needed libunbound.so.2 $out/${python.sitePackages}/libunbound.so.2 $out/${python.sitePackages}/_unbound.so ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Python library for Unbound, the validating, recursive, and caching DNS resolver"; license = licenses.bsd3; homepage = "http://www.unbound.net"; diff --git a/pkgs/tools/networking/urlwatch/default.nix b/pkgs/tools/networking/urlwatch/default.nix index e4b821be1f46..10bbc963a28d 100644 --- a/pkgs/tools/networking/urlwatch/default.nix +++ b/pkgs/tools/networking/urlwatch/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchFromGitHub, python3Packages }: +{ lib, stdenv, fetchFromGitHub, python3Packages }: python3Packages.buildPythonApplication rec { - name = "urlwatch-${version}"; + pname = "urlwatch"; version = "2.21"; src = fetchFromGitHub { @@ -23,7 +23,10 @@ python3Packages.buildPythonApplication rec { pyppeteer ]; - meta = with stdenv.lib; { + # no tests + doCheck = false; + + meta = with lib; { description = "A tool for monitoring webpages for updates"; homepage = "https://thp.io/2008/urlwatch/"; license = licenses.bsd3; diff --git a/pkgs/tools/networking/v2ray/default.nix b/pkgs/tools/networking/v2ray/default.nix index 4d553670e359..022504695483 100644 --- a/pkgs/tools/networking/v2ray/default.nix +++ b/pkgs/tools/networking/v2ray/default.nix @@ -3,22 +3,22 @@ }: let - version = "4.33.0"; + version = "4.34.0"; src = fetchFromGitHub { owner = "v2fly"; repo = "v2ray-core"; rev = "v${version}"; - sha256 = "05w714i56nipp7m985g6zqq6ljz0w5ihxrgs93j10llfdd089iig"; + sha256 = "0x6smffpvnrk76plnsk31qqznkyz06dh4sazncp2l3y9va8k2jb1"; }; - vendorSha256 = "0ix5kxldgbcb10jh0l64lrh8qzla4qvsxi6vanb73y7lbsix120w"; + vendorSha256 = "077jnjsmhzr0idrk7pifr5s2r9yjf1v9bvj177n2k2ln8w3wgx3g"; assets = { # MIT licensed "geoip.dat" = let - geoipRev = "202012030015"; - geoipSha256 = "1qy9h0721y5kjcp0s859lhj253jfi3d3i658gpc4kmij2l5dxm5w"; + geoipRev = "202101070033"; + geoipSha256 = "11naj51pzchdrjmkp1dqzcby1i2fhbq0mncwm4d5q5mh3chyizsf"; in fetchurl { url = "https://github.com/v2fly/geoip/releases/download/${geoipRev}/geoip.dat"; sha256 = geoipSha256; @@ -26,8 +26,8 @@ let # MIT licensed "geosite.dat" = let - geositeRev = "20201207123222"; - geositeSha256 = "03xckk39rrda42cam2awbsh0gib6rhmz28asc8vx29lsp9g2bj6n"; + geositeRev = "20210106164413"; + geositeSha256 = "0chc7jb3yzgrrjkpd3s1rlim5qgf6j2kp952fvkhpwmnap86aip7"; in fetchurl { url = "https://github.com/v2fly/domain-list-community/releases/download/${geositeRev}/dlc.dat"; sha256 = geositeSha256; @@ -48,11 +48,10 @@ let doCheck = false; buildPhase = '' + buildFlagsArray=(-v -p $NIX_BUILD_CORES -ldflags="-s -w") runHook preBuild - - go build -o v2ray v2ray.com/core/main - go build -o v2ctl v2ray.com/core/infra/control/main - + go build "''${buildFlagsArray[@]}" -o v2ray ./main + go build "''${buildFlagsArray[@]}" -o v2ctl -tags confonly ./infra/control/main runHook postBuild ''; diff --git a/pkgs/tools/networking/vde2/default.nix b/pkgs/tools/networking/vde2/default.nix index b10ec5c1695d..98a521742407 100644 --- a/pkgs/tools/networking/vde2/default.nix +++ b/pkgs/tools/networking/vde2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, openssl, libpcap, python2, withPython ? false }: +{ lib, stdenv, fetchurl, fetchpatch, openssl, libpcap, python2, withPython ? false }: stdenv.mkDerivation rec { name = "vde2-2.3.2"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/virtualsquare/vde-2"; description = "Virtual Distributed Ethernet, an Ethernet compliant virtual network"; platforms = platforms.unix; diff --git a/pkgs/tools/networking/vlan/default.nix b/pkgs/tools/networking/vlan/default.nix index 331a993f3acd..2d329cb29b06 100644 --- a/pkgs/tools/networking/vlan/default.nix +++ b/pkgs/tools/networking/vlan/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation { name = "vlan-1.9"; @@ -25,7 +25,7 @@ stdenv.mkDerivation { cp vconfig.8 $out/share/man/man8/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "User mode programs to enable VLANs on Ethernet devices"; platforms = platforms.linux; license = licenses.gpl2Plus; diff --git a/pkgs/tools/networking/vtun/default.nix b/pkgs/tools/networking/vtun/default.nix index 71d9097a1501..af4cc0fe2e52 100644 --- a/pkgs/tools/networking/vtun/default.nix +++ b/pkgs/tools/networking/vtun/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, openssl, lzo, zlib, yacc, flex }: +{ lib, stdenv, fetchurl, fetchpatch, openssl, lzo, zlib, yacc, flex }: stdenv.mkDerivation rec { name = "vtun-3.0.4"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { "--with-blowfish-headers=${openssl.dev}/include/openssl" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Virtual Tunnels over TCP/IP with traffic shaping, compression and encryption"; homepage = "http://vtun.sourceforge.net/"; license = licenses.gpl2; diff --git a/pkgs/tools/networking/wavemon/default.nix b/pkgs/tools/networking/wavemon/default.nix index 8549495e8f82..4b265e12fbf1 100644 --- a/pkgs/tools/networking/wavemon/default.nix +++ b/pkgs/tools/networking/wavemon/default.nix @@ -1,21 +1,20 @@ -{ stdenv, fetchFromGitHub, ncurses, libnl, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, ncurses, libnl, pkg-config }: stdenv.mkDerivation rec { - version = "0.9.2"; - baseName = "wavemon"; - name = "${baseName}-${version}"; + pname = "wavemon"; + version = "0.9.3"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ncurses libnl ]; src = fetchFromGitHub { owner = "uoaerg"; repo = "wavemon"; rev = "v${version}"; - sha256 = "0y984wm03lzqf7bk06a07mw7d1fzjsp9x7zxcvlx4xqmv7wlgb29"; + sha256 = "0m9n5asjxs1ir5rqprigqcrm976mgjvh4yql1jhfnbszwbf95193"; }; - meta = with stdenv.lib; { + meta = with lib; { inherit version; description = "Ncurses-based monitoring application for wireless network devices"; homepage = "https://github.com/uoaerg/wavemon"; diff --git a/pkgs/tools/networking/webalizer/default.nix b/pkgs/tools/networking/webalizer/default.nix index 133aac67bdbf..332d1cf2867f 100644 --- a/pkgs/tools/networking/webalizer/default.nix +++ b/pkgs/tools/networking/webalizer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, zlib, libpng, gd, geoip, db }: +{ lib, stdenv, fetchurl, zlib, libpng, gd, geoip, db }: stdenv.mkDerivation { name = "webalizer-2.23-05"; @@ -22,7 +22,7 @@ stdenv.mkDerivation { "--enable-shared" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Web server log file analysis program"; homepage = "http://www.webalizer.org"; platforms = platforms.unix; diff --git a/pkgs/tools/networking/wget/default.nix b/pkgs/tools/networking/wget/default.nix index 77913c4f32a1..ca70126782d6 100644 --- a/pkgs/tools/networking/wget/default.nix +++ b/pkgs/tools/networking/wget/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gettext, pkgconfig, perlPackages +{ lib, stdenv, fetchurl, gettext, pkgconfig, perlPackages , libidn2, zlib, pcre, libuuid, libiconv, libintl , python3, lzip , libpsl ? null @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Tool for retrieving files using HTTP, HTTPS, and FTP"; longDescription = diff --git a/pkgs/tools/networking/whois/default.nix b/pkgs/tools/networking/whois/default.nix index 35124ef6719c..e2dd3a4c4fd6 100644 --- a/pkgs/tools/networking/whois/default.nix +++ b/pkgs/tools/networking/whois/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, perl, gettext, pkgconfig, libidn2, libiconv }: +{ lib, stdenv, fetchFromGitHub, perl, gettext, pkgconfig, libidn2, libiconv }: stdenv.mkDerivation rec { version = "5.5.6"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { installTargets = [ "install-whois" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Intelligent WHOIS client from Debian"; longDescription = '' This package provides a commandline client for the WHOIS (RFC 3912) diff --git a/pkgs/tools/networking/wicd/default.nix b/pkgs/tools/networking/wicd/default.nix index 8cd0b7c55f7c..40550b48abbe 100644 --- a/pkgs/tools/networking/wicd/default.nix +++ b/pkgs/tools/networking/wicd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python2Packages +{ lib, stdenv, fetchurl, python2Packages , wpa_supplicant, dhcp, dhcpcd, wirelesstools , nettools, openresolv, iproute, iputils }: @@ -102,7 +102,7 @@ in stdenv.mkDerivation rec { echo "wpa2-ttls" >> "$out/etc/encryption/templates/active" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://wicd.net/"; description = "A wiredless and wired network manager"; longDescription='' diff --git a/pkgs/tools/networking/wifish/default.nix b/pkgs/tools/networking/wifish/default.nix new file mode 100644 index 000000000000..f502a2fb0d54 --- /dev/null +++ b/pkgs/tools/networking/wifish/default.nix @@ -0,0 +1,47 @@ +{ stdenv, fetchFromGitHub +, dialog +, gawk +, wpa_supplicant +, makeWrapper +}: + +stdenv.mkDerivation rec { + pname = "wifish"; + version = "1.1.4"; + + src = fetchFromGitHub{ + owner = "bougyman"; + repo = "wifish"; + rev = version; + sha256 = "sha256-eTErN6CfKDey/wV+9o9cBVaG5FzCRBiA9UicrMz3KBc="; + }; + + nativeBuildInputs = [ makeWrapper ]; + + postPatch = '' + sed -ie 's|/var/lib/wifish|${placeholder "out"}/var/lib/wifish|' wifish + ''; + + dontConfigure = true; + + installPhase = '' + install -D -m0644 awk/wscanparse.awk ${placeholder "out"}/var/lib/wifish/wscanparse.awk + install -D -m0644 awk/wlistparse.awk ${placeholder "out"}/var/lib/wifish/wlistparse.awk + install -D -m0644 awk/wscan2menu.awk ${placeholder "out"}/var/lib/wifish/wscan2menu.awk + install -D -m0644 awk/iwparse.awk ${placeholder "out"}/var/lib/wifish/iwparse.awk + install -D -m0755 wifish ${placeholder "out"}/bin/wifish + ''; + + postFixup = '' + wrapProgram ${placeholder "out"}/bin/wifish \ + --prefix PATH ":" ${stdenv.lib.makeBinPath [ dialog gawk wpa_supplicant ]} + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/bougyman/wifish"; + description = "Simple wifi shell script for linux"; + license = licenses.wtfpl; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/tools/networking/wifite2/default.nix b/pkgs/tools/networking/wifite2/default.nix index 101c4643a77f..3b1c3f14ac53 100644 --- a/pkgs/tools/networking/wifite2/default.nix +++ b/pkgs/tools/networking/wifite2/default.nix @@ -46,7 +46,7 @@ python3.pkgs.buildPythonApplication rec { checkInputs = propagatedBuildInputs; checkPhase = "python -m unittest discover tests -v"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/derv82/wifite2"; description = "Rewrite of the popular wireless network auditor, wifite"; license = licenses.gpl2; diff --git a/pkgs/tools/networking/wireguard-go/default.nix b/pkgs/tools/networking/wireguard-go/default.nix index 2913a31e16ad..100de62683db 100644 --- a/pkgs/tools/networking/wireguard-go/default.nix +++ b/pkgs/tools/networking/wireguard-go/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchzip }: +{ lib, stdenv, buildGoPackage, fetchzip }: buildGoPackage rec { pname = "wireguard-go"; @@ -21,7 +21,7 @@ buildGoPackage rec { mv $out/bin/wireguard $out/bin/wireguard-go ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Userspace Go implementation of WireGuard"; homepage = "https://git.zx2c4.com/wireguard-go/about/"; license = licenses.gpl2; diff --git a/pkgs/tools/networking/wol/default.nix b/pkgs/tools/networking/wol/default.nix index 3ca10e2ecbc3..114a8457d5b2 100644 --- a/pkgs/tools/networking/wol/default.nix +++ b/pkgs/tools/networking/wol/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl }: +{ lib, stdenv, fetchurl, perl }: stdenv.mkDerivation rec { pname = "wol"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Implements Wake On LAN functionality in a small program"; homepage = "https://sourceforge.net/projects/wake-on-lan/"; license = licenses.gpl2; diff --git a/pkgs/tools/networking/wolfebin/default.nix b/pkgs/tools/networking/wolfebin/default.nix index 52874e89bbe7..23458f2a3964 100644 --- a/pkgs/tools/networking/wolfebin/default.nix +++ b/pkgs/tools/networking/wolfebin/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python }: +{ lib, stdenv, fetchFromGitHub, python }: stdenv.mkDerivation rec { version = "5.4"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { install -m 755 wolfebin_server.py $out/bin/wolfebin_server ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/thejoshwolfe/wolfebin"; description = "Quick and easy file sharing"; license = licenses.mit; diff --git a/pkgs/tools/networking/wormhole-william/default.nix b/pkgs/tools/networking/wormhole-william/default.nix index 261db4590c1d..6476d4f43b1e 100644 --- a/pkgs/tools/networking/wormhole-william/default.nix +++ b/pkgs/tools/networking/wormhole-william/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "wormhole-william"; @@ -15,7 +15,7 @@ buildGoModule rec { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/psanford/wormhole-william"; description = "End-to-end encrypted file transfers"; changelog = "https://github.com/psanford/wormhole-william/releases/tag/v${version}"; diff --git a/pkgs/tools/networking/wrk/default.nix b/pkgs/tools/networking/wrk/default.nix index 40daeb861944..4298bd70d600 100644 --- a/pkgs/tools/networking/wrk/default.nix +++ b/pkgs/tools/networking/wrk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, luajit, openssl, perl }: +{ lib, stdenv, fetchFromGitHub, luajit, openssl, perl }: stdenv.mkDerivation rec { pname = "wrk"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { cp wrk $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "HTTP benchmarking tool"; homepage = "https://github.com/wg/wrk"; longDescription = '' diff --git a/pkgs/tools/networking/wuzz/default.nix b/pkgs/tools/networking/wuzz/default.nix index 8db9c07ffc56..73db27f1a942 100644 --- a/pkgs/tools/networking/wuzz/default.nix +++ b/pkgs/tools/networking/wuzz/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "wuzz"; @@ -16,7 +16,7 @@ buildGoPackage rec { goDeps = ./deps.nix; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/asciimoo/wuzz"; description = "Interactive cli tool for HTTP inspection"; license = licenses.agpl3; diff --git a/pkgs/tools/networking/x11-ssh-askpass/default.nix b/pkgs/tools/networking/x11-ssh-askpass/default.nix index 7e1597451b13..d33dd3df12ee 100644 --- a/pkgs/tools/networking/x11-ssh-askpass/default.nix +++ b/pkgs/tools/networking/x11-ssh-askpass/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, xlibsWrapper, imake, gccmakedep }: +{ lib, stdenv, fetchurl, xlibsWrapper, imake, gccmakedep }: stdenv.mkDerivation { name = "x11-ssh-askpass-1.2.4.1"; @@ -24,7 +24,7 @@ stdenv.mkDerivation { installTargets = [ "install" "install.man" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/sigmavirus24/x11-ssh-askpass"; description = "Lightweight passphrase dialog for OpenSSH or other open variants of SSH"; license = licenses.mit; diff --git a/pkgs/tools/networking/xl2tpd/default.nix b/pkgs/tools/networking/xl2tpd/default.nix index 38a45fd3e6fa..26731817c80f 100644 --- a/pkgs/tools/networking/xl2tpd/default.nix +++ b/pkgs/tools/networking/xl2tpd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libpcap, ppp }: +{ lib, stdenv, fetchFromGitHub, libpcap, ppp }: stdenv.mkDerivation rec { pname = "xl2tpd"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.xelerance.com/software/xl2tpd/"; description = "Layer 2 Tunnelling Protocol Daemon (RFC 2661)"; platforms = platforms.linux; diff --git a/pkgs/tools/networking/yrd/default.nix b/pkgs/tools/networking/yrd/default.nix index 9b76d033829f..7f946718588b 100644 --- a/pkgs/tools/networking/yrd/default.nix +++ b/pkgs/tools/networking/yrd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pythonPackages }: +{ lib, stdenv, fetchFromGitHub, pythonPackages }: let pname = "yrd"; @@ -17,7 +17,7 @@ in pythonPackages.buildPythonApplication { propagatedBuildInputs = with pythonPackages; [ argh ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Cjdns swiss army knife"; maintainers = with maintainers; [ akru ]; platforms = platforms.linux; diff --git a/pkgs/tools/networking/ytcc/default.nix b/pkgs/tools/networking/ytcc/default.nix index 2d474159359f..75cf8403d937 100644 --- a/pkgs/tools/networking/ytcc/default.nix +++ b/pkgs/tools/networking/ytcc/default.nix @@ -2,7 +2,7 @@ python3Packages.buildPythonApplication rec { pname = "ytcc"; - version = "1.8.4"; + version = "2.0.1"; src = fetchFromGitHub { owner = "woefe"; @@ -13,23 +13,23 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ gettext ]; - propagatedBuildInputs = with python3Packages; [ feedparser lxml sqlalchemy youtube-dl ]; + propagatedBuildInputs = with python3Packages; [ click feedparser lxml sqlalchemy youtube-dl ]; - checkInputs = with python3Packages; [ nose pytest ]; + checkInputs = with python3Packages; [ nose pytestCheckHook ]; # Disable tests that touch network or shell out to commands - checkPhase = '' - pytest . -k "not get_channels \ - and not play_video \ - and not download_videos \ - and not update_all \ - and not add_channel_duplicate" - ''; + disabledTests = [ + "get_channels" + "play_video" + "download_videos" + "update_all" + "add_channel_duplicate" + ]; meta = { description = "Command Line tool to keep track of your favourite YouTube channels without signing up for a Google account"; homepage = "https://github.com/woefe/ytcc"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ marius851000 ]; }; } diff --git a/pkgs/tools/networking/zap/default.nix b/pkgs/tools/networking/zap/default.nix index f12578b27338..183f226f84b1 100644 --- a/pkgs/tools/networking/zap/default.nix +++ b/pkgs/tools/networking/zap/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, jdk8, ant, runtimeShell }: +{ lib, stdenv, fetchFromGitHub, jdk8, ant, runtimeShell }: let jdk = jdk8; in stdenv.mkDerivation rec { @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { chmod +x "$out/bin/zap" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.owasp.org/index.php/ZAP"; description = "Java application for web penetration testing"; maintainers = with maintainers; [ mog ]; diff --git a/pkgs/tools/networking/zerotierone/default.nix b/pkgs/tools/networking/zerotierone/default.nix index 1413ca72a105..96de4fc34e46 100644 --- a/pkgs/tools/networking/zerotierone/default.nix +++ b/pkgs/tools/networking/zerotierone/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPackages, fetchFromGitHub, openssl, lzo, zlib, iproute, ronn }: +{ lib, stdenv, buildPackages, fetchFromGitHub, openssl, lzo, zlib, iproute, ronn }: stdenv.mkDerivation rec { pname = "zerotierone"; @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "man" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Create flat virtual Ethernet networks of almost unlimited size"; homepage = "https://www.zerotier.com"; license = licenses.bsl11; diff --git a/pkgs/tools/nix/cached-nix-shell/default.nix b/pkgs/tools/nix/cached-nix-shell/default.nix index 0b40e2b71435..9acf9ed11c59 100644 --- a/pkgs/tools/nix/cached-nix-shell/default.nix +++ b/pkgs/tools/nix/cached-nix-shell/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, openssl, pkgconfig, ronn, rustPlatform }: +{ lib, stdenv, fetchFromGitHub, openssl, pkgconfig, ronn, rustPlatform }: let blake3-src = fetchFromGitHub { @@ -36,7 +36,7 @@ in rustPlatform.buildRustPackage rec { make -f nix/Makefile post-install ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Instant startup time for nix-shell"; homepage = "https://github.com/xzfc/cached-nix-shell"; license = with licenses; [ unlicense /* or */ mit ]; diff --git a/pkgs/tools/nix/dnadd/default.nix b/pkgs/tools/nix/dnadd/default.nix index eff99743f1e1..3f4d76a9c4d4 100644 --- a/pkgs/tools/nix/dnadd/default.nix +++ b/pkgs/tools/nix/dnadd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "dnadd"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/joelancaster/dnadd"; description = "Adds packages declaratively on the command line"; license = licenses.gpl3Plus; diff --git a/pkgs/tools/nix/manix/default.nix b/pkgs/tools/nix/manix/default.nix index c4d1930a0fb5..f93e25efae7f 100644 --- a/pkgs/tools/nix/manix/default.nix +++ b/pkgs/tools/nix/manix/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform, darwin }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, darwin }: rustPlatform.buildRustPackage rec { pname = "manix"; @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0f2q3bj1cmpbma0fjhc2lc92j4al78fhrx3yc37kmbgzaza0yan5"; - meta = with stdenv.lib; { + meta = with lib; { description = "A Fast Documentation Searcher for Nix"; homepage = "https://github.com/mlvzk/manix"; license = [ licenses.mpl20 ]; diff --git a/pkgs/tools/nix/nar-serve/default.nix b/pkgs/tools/nix/nar-serve/default.nix index 89a38b40a199..4b0239a2fa23 100644 --- a/pkgs/tools/nix/nar-serve/default.nix +++ b/pkgs/tools/nix/nar-serve/default.nix @@ -22,7 +22,7 @@ buildGoModule rec { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Serve NAR file contents via HTTP"; homepage = "https://github.com/numtide/nar-serve"; license = licenses.mit; diff --git a/pkgs/tools/nix/nix-query-tree-viewer/default.nix b/pkgs/tools/nix/nix-query-tree-viewer/default.nix index de0b88378a48..f820f36e49f8 100644 --- a/pkgs/tools/nix/nix-query-tree-viewer/default.nix +++ b/pkgs/tools/nix/nix-query-tree-viewer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform, glib, gtk3, wrapGAppsHook }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, glib, gtk3, wrapGAppsHook }: rustPlatform.buildRustPackage rec { pname = "nix-query-tree-viewer"; @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1pbyi7knqmqxbpi3jhl492is9zkaxdpdnmbm11nqwc1nvvbjblzc"; - meta = with stdenv.lib; { + meta = with lib; { description = "GTK viewer for the output of `nix store --query --tree`"; homepage = "https://github.com/cdepillabout/nix-query-tree-viewer"; license = with licenses; [ mit ]; diff --git a/pkgs/tools/nix/nix-script/default.nix b/pkgs/tools/nix/nix-script/default.nix index d604463bb05c..a755d933219e 100644 --- a/pkgs/tools/nix/nix-script/default.nix +++ b/pkgs/tools/nix/nix-script/default.nix @@ -1,4 +1,4 @@ -{ stdenv, haskellPackages, fetchFromGitHub }: +{ lib, stdenv, haskellPackages, fetchFromGitHub }: stdenv.mkDerivation { pname = "nix-script"; @@ -24,7 +24,7 @@ stdenv.mkDerivation { ln -s $out/bin/nix-script $out/bin/nix-scripti ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A shebang for running inside nix-shell"; homepage = "https://github.com/bennofs/nix-script"; license = licenses.bsd3; diff --git a/pkgs/tools/nix/nixdoc/default.nix b/pkgs/tools/nix/nixdoc/default.nix index cdcb274945e2..3d2e434912f6 100644 --- a/pkgs/tools/nix/nixdoc/default.nix +++ b/pkgs/tools/nix/nixdoc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform, darwin }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, darwin }: rustPlatform.buildRustPackage rec { pname = "nixdoc"; @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1vamwynkbnffs8ryr2zb1a41cymjvr8zzh1bifyh9hpkx2k11rs3"; - meta = with stdenv.lib; { + meta = with lib; { description = "Generate documentation for Nix functions"; homepage = "https://github.com/tazjin/nixdoc"; license = [ licenses.gpl3 ]; diff --git a/pkgs/tools/nix/nixos-generators/default.nix b/pkgs/tools/nix/nixos-generators/default.nix index 74bbcbd0ae6b..871e223eb4be 100644 --- a/pkgs/tools/nix/nixos-generators/default.nix +++ b/pkgs/tools/nix/nixos-generators/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { --prefix PATH : ${lib.makeBinPath [ jq coreutils findutils nix ] } ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Collection of image builders"; homepage = "https://github.com/nix-community/nixos-generators"; license = licenses.mit; diff --git a/pkgs/tools/package-management/appimagekit/default.nix b/pkgs/tools/package-management/appimagekit/default.nix index 21e869b7b01e..e392d8c4a701 100644 --- a/pkgs/tools/package-management/appimagekit/default.nix +++ b/pkgs/tools/package-management/appimagekit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , pkgconfig, cmake, autoconf, automake, libtool, makeWrapper , wget, xxd, desktop-file-utils, file , gnupg, glib, zlib, cairo, openssl, fuse, xz, squashfuse, inotify-tools, libarchive @@ -109,7 +109,7 @@ in stdenv.mkDerivation rec { squashfuse = appimagekit_squashfuse; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A tool to package desktop applications as AppImages"; longDescription = '' AppImageKit is an implementation of the AppImage format that diff --git a/pkgs/tools/package-management/apt-dater/default.nix b/pkgs/tools/package-management/apt-dater/default.nix index 49669cba40a9..296012cc68f7 100644 --- a/pkgs/tools/package-management/apt-dater/default.nix +++ b/pkgs/tools/package-management/apt-dater/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , autoreconfHook, pkgconfig, gettext , vim, glib, libxml2, ncurses, popt, screen }: @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/DE-IBH/apt-dater"; description = "Terminal-based remote package update manager"; longDescription = '' diff --git a/pkgs/tools/package-management/apt/default.nix b/pkgs/tools/package-management/apt/default.nix index b83c49029b38..66b16ecc046e 100644 --- a/pkgs/tools/package-management/apt/default.nix +++ b/pkgs/tools/package-management/apt/default.nix @@ -42,8 +42,6 @@ stdenv.mkDerivation rec { "-DUSE_NLS=${if withNLS then "ON" else "OFF"}" ]; - enableParallelBuilding = true; - meta = with lib; { description = "Command-line package management tools used on Debian-based systems"; homepage = "https://salsa.debian.org/apt-team/apt"; diff --git a/pkgs/tools/package-management/bunny/default.nix b/pkgs/tools/package-management/bunny/default.nix index 33c6249ebd47..8ef808610db7 100644 --- a/pkgs/tools/package-management/bunny/default.nix +++ b/pkgs/tools/package-management/bunny/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab }: +{ lib, stdenv, fetchFromGitLab }: stdenv.mkDerivation rec { pname = "bunny"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { makeFlags = [ "prefix=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A simple shell script wrapper around multiple package managers"; homepage = "https://gitlab.com/tim241/bunny"; license = licenses.gpl3; diff --git a/pkgs/tools/package-management/cargo-download/Cargo.nix b/pkgs/tools/package-management/cargo-download/Cargo.nix index 21740ce2ead1..f96a3a207df0 100644 --- a/pkgs/tools/package-management/cargo-download/Cargo.nix +++ b/pkgs/tools/package-management/cargo-download/Cargo.nix @@ -427,7 +427,7 @@ rec { serde_urlencoded = "0.5.1"; tokio = "0.1.7"; tokio_io = "0.1.10"; - url = "1.6.0"; + url = "1.6.1"; uuid = "0.7.1"; }; deps.rustc_version."0.2.3" = { @@ -464,7 +464,7 @@ rec { dtoa = "0.4.2"; itoa = "0.3.4"; serde = "1.0.21"; - url = "1.6.0"; + url = "1.6.1"; }; deps.siphasher."0.2.2" = {}; deps.slab."0.4.0" = {}; @@ -639,7 +639,7 @@ rec { deps.unreachable."1.0.0" = { void = "1.0.2"; }; - deps.url."1.6.0" = { + deps.url."1.6.1" = { idna = "0.1.4"; matches = "0.1.6"; percent_encoding = "1.0.1"; diff --git a/pkgs/tools/package-management/cargo-download/crates-io.nix b/pkgs/tools/package-management/cargo-download/crates-io.nix index e0c0abf4dc6e..dde192585e08 100644 --- a/pkgs/tools/package-management/cargo-download/crates-io.nix +++ b/pkgs/tools/package-management/cargo-download/crates-io.nix @@ -4926,40 +4926,40 @@ rec { # end -# url-1.6.0 +# url-1.6.1 - crates.url."1.6.0" = deps: { features?(features_.url."1.6.0" deps {}) }: buildRustCrate { + crates.url."1.6.1" = deps: { features?(features_.url."1.6.1" deps {}) }: buildRustCrate { crateName = "url"; - version = "1.6.0"; + version = "1.6.1"; description = "URL library for Rust, based on the WHATWG URL Standard"; authors = [ "The rust-url developers" ]; - sha256 = "1bvzl4dvjj84h46ai3x23wyafa2wwhchj08vr2brf25dxwc7mg18"; + sha256 = "1qsnhmxznzaxl068a3ksz69kwcz7ghvl4zflg9qj7lyw4bk9ma38"; dependencies = mapFeatures features ([ - (crates."idna"."${deps."url"."1.6.0"."idna"}" deps) - (crates."matches"."${deps."url"."1.6.0"."matches"}" deps) - (crates."percent_encoding"."${deps."url"."1.6.0"."percent_encoding"}" deps) + (crates."idna"."${deps."url"."1.6.1"."idna"}" deps) + (crates."matches"."${deps."url"."1.6.1"."matches"}" deps) + (crates."percent_encoding"."${deps."url"."1.6.1"."percent_encoding"}" deps) ]); - features = mkFeatures (features."url"."1.6.0" or {}); + features = mkFeatures (features."url"."1.6.1" or {}); }; - features_.url."1.6.0" = deps: f: updateFeatures f (rec { - idna."${deps.url."1.6.0".idna}".default = true; - matches."${deps.url."1.6.0".matches}".default = true; - percent_encoding."${deps.url."1.6.0".percent_encoding}".default = true; + features_.url."1.6.1" = deps: f: updateFeatures f (rec { + idna."${deps.url."1.6.1".idna}".default = true; + matches."${deps.url."1.6.1".matches}".default = true; + percent_encoding."${deps.url."1.6.1".percent_encoding}".default = true; url = fold recursiveUpdate {} [ - { "1.6.0"."encoding" = - (f.url."1.6.0"."encoding" or false) || - (f.url."1.6.0".query_encoding or false) || - (url."1.6.0"."query_encoding" or false); } - { "1.6.0"."heapsize" = - (f.url."1.6.0"."heapsize" or false) || - (f.url."1.6.0".heap_size or false) || - (url."1.6.0"."heap_size" or false); } - { "1.6.0".default = (f.url."1.6.0".default or true); } + { "1.6.1"."encoding" = + (f.url."1.6.1"."encoding" or false) || + (f.url."1.6.1".query_encoding or false) || + (url."1.6.1"."query_encoding" or false); } + { "1.6.1"."heapsize" = + (f.url."1.6.1"."heapsize" or false) || + (f.url."1.6.1".heap_size or false) || + (url."1.6.1"."heap_size" or false); } + { "1.6.1".default = (f.url."1.6.1".default or true); } ]; }) [ - (features_.idna."${deps."url"."1.6.0"."idna"}" deps) - (features_.matches."${deps."url"."1.6.0"."matches"}" deps) - (features_.percent_encoding."${deps."url"."1.6.0"."percent_encoding"}" deps) + (features_.idna."${deps."url"."1.6.1"."idna"}" deps) + (features_.matches."${deps."url"."1.6.1"."matches"}" deps) + (features_.percent_encoding."${deps."url"."1.6.1"."percent_encoding"}" deps) ]; diff --git a/pkgs/tools/package-management/cargo-outdated/default.nix b/pkgs/tools/package-management/cargo-outdated/default.nix index 185cba66e311..a12271f5a99f 100644 --- a/pkgs/tools/package-management/cargo-outdated/default.nix +++ b/pkgs/tools/package-management/cargo-outdated/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl, libiconv, curl, darwin }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl, libiconv, curl, darwin }: rustPlatform.buildRustPackage rec { pname = "cargo-outdated"; @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { curl ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A cargo subcommand for displaying when Rust dependencies are out of date"; homepage = "https://github.com/kbknapp/cargo-outdated"; license = with licenses; [ asl20 /* or */ mit ]; diff --git a/pkgs/tools/package-management/cargo-release/default.nix b/pkgs/tools/package-management/cargo-release/default.nix index d24eb6950f36..64092ac2bb1d 100644 --- a/pkgs/tools/package-management/cargo-release/default.nix +++ b/pkgs/tools/package-management/cargo-release/default.nix @@ -1,4 +1,4 @@ -{ stdenv, rustPlatform, fetchFromGitHub, libiconv, Security, openssl, pkg-config }: +{ lib, stdenv, rustPlatform, fetchFromGitHub, libiconv, Security, openssl, pkg-config }: rustPlatform.buildRustPackage rec { pname = "cargo-release"; @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ]; - meta = with stdenv.lib; { + meta = with lib; { description = ''Cargo subcommand "release": everything about releasing a rust crate''; homepage = "https://github.com/sunng87/cargo-release"; license = with licenses; [ mit ]; diff --git a/pkgs/tools/package-management/cargo-update/default.nix b/pkgs/tools/package-management/cargo-update/default.nix index 1158d10ed296..4e3767579990 100644 --- a/pkgs/tools/package-management/cargo-update/default.nix +++ b/pkgs/tools/package-management/cargo-update/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , rustPlatform , fetchFromGitHub , cmake @@ -43,7 +43,7 @@ rustPlatform.buildRustPackage rec { installManPage man/*.1 ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A cargo subcommand for checking and applying updates to installed executables"; homepage = "https://github.com/nabijaczleweli/cargo-update"; license = licenses.mit; diff --git a/pkgs/tools/package-management/cde/default.nix b/pkgs/tools/package-management/cde/default.nix index 957919e26001..f2c308de5a76 100644 --- a/pkgs/tools/package-management/cde/default.nix +++ b/pkgs/tools/package-management/cde/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "cde"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { install -t $out/bin cde cde-exec ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://pg.ucsd.edu/cde/manual/"; description = "A packaging tool for building portable packages"; license = licenses.gpl3Plus; diff --git a/pkgs/tools/package-management/clib/default.nix b/pkgs/tools/package-management/clib/default.nix index 315589120271..e79c376ab792 100644 --- a/pkgs/tools/package-management/clib/default.nix +++ b/pkgs/tools/package-management/clib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, curl }: +{ lib, stdenv, fetchFromGitHub, curl }: stdenv.mkDerivation rec { version = "1.11.4"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ curl ]; - meta = with stdenv.lib; { + meta = with lib; { description = "C micro-package manager"; homepage = "https://github.com/clibs/clib"; license = licenses.mit; diff --git a/pkgs/tools/package-management/conda/default.nix b/pkgs/tools/package-management/conda/default.nix index 325a5c4fa5ee..57b4d17fdfdd 100644 --- a/pkgs/tools/package-management/conda/default.nix +++ b/pkgs/tools/package-management/conda/default.nix @@ -62,6 +62,8 @@ in export FONTCONFIG_FILE=/etc/fonts/fonts.conf export QTCOMPOSE=${xorg.libX11}/share/X11/locale export LIBARCHIVE=${libarchive.lib}/lib/libarchive.so + # Allows `conda activate` to work properly + source ${installationPath}/etc/profile.d/conda.sh ''; meta = { diff --git a/pkgs/tools/package-management/createrepo_c/default.nix b/pkgs/tools/package-management/createrepo_c/default.nix index 15a64ffd25e6..cc671d7329c5 100644 --- a/pkgs/tools/package-management/createrepo_c/default.nix +++ b/pkgs/tools/package-management/createrepo_c/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, bzip2, expat, glib, curl, libxml2, python3, rpm, openssl, sqlite, file, xz, pcre, bash-completion }: +{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, bzip2, expat, glib, curl, libxml2, python3, rpm, openssl, sqlite, file, xz, pcre, bash-completion }: stdenv.mkDerivation rec { pname = "createrepo_c"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { buildInputs = [ bzip2 expat glib curl libxml2 python3 rpm openssl sqlite file xz pcre bash-completion ]; - meta = with stdenv.lib; { + meta = with lib; { description = "C implementation of createrepo"; homepage = "http://rpm-software-management.github.io/createrepo_c/"; license = licenses.gpl2; diff --git a/pkgs/tools/package-management/dpkg/default.nix b/pkgs/tools/package-management/dpkg/default.nix index 8b9d812ee363..96032bc0a695 100644 --- a/pkgs/tools/package-management/dpkg/default.nix +++ b/pkgs/tools/package-management/dpkg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, zlib, bzip2, xz, makeWrapper, coreutils }: +{ lib, stdenv, fetchurl, perl, zlib, bzip2, xz, makeWrapper, coreutils }: stdenv.mkDerivation rec { pname = "dpkg"; @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { cp -r scripts/t/origins $out/etc/dpkg ''; - meta = with stdenv.lib; { + meta = with lib; { description = "The Debian package manager"; homepage = "https://wiki.debian.org/Teams/Dpkg"; license = licenses.gpl2Plus; diff --git a/pkgs/tools/package-management/gx/default.nix b/pkgs/tools/package-management/gx/default.nix index f9b996b27761..920b23f36abf 100644 --- a/pkgs/tools/package-management/gx/default.nix +++ b/pkgs/tools/package-management/gx/default.nix @@ -1,5 +1,5 @@ # This file was generated by go2nix. -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "gx"; @@ -16,7 +16,7 @@ buildGoPackage rec { goDeps = ./deps.nix; - meta = with stdenv.lib; { + meta = with lib; { description = "A packaging tool built around IPFS"; homepage = "https://github.com/whyrusleeping/gx"; license = licenses.mit; diff --git a/pkgs/tools/package-management/gx/go/default.nix b/pkgs/tools/package-management/gx/go/default.nix index 8579ef574d55..dd14976e6332 100644 --- a/pkgs/tools/package-management/gx/go/default.nix +++ b/pkgs/tools/package-management/gx/go/default.nix @@ -1,5 +1,5 @@ # This file was generated by go2nix. -{ stdenv, buildGoPackage, fetchFromGitHub +{ lib, stdenv, buildGoPackage, fetchFromGitHub , gx }: @@ -25,7 +25,7 @@ buildGoPackage rec { } ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A tool for importing go packages into gx"; homepage = "https://github.com/whyrusleeping/gx-go"; license = licenses.mit; diff --git a/pkgs/tools/package-management/home-manager/default.nix b/pkgs/tools/package-management/home-manager/default.nix index cff6122fe6d4..b8b4de36eb42 100644 --- a/pkgs/tools/package-management/home-manager/default.nix +++ b/pkgs/tools/package-management/home-manager/default.nix @@ -1,7 +1,7 @@ #Adapted from #https://github.com/rycee/home-manager/blob/2c07829be2bcae55e04997b19719ff902a44016d/home-manager/default.nix -{ bash, coreutils, findutils, gnused, less, stdenv, makeWrapper, fetchFromGitHub }: +{ bash, coreutils, findutils, gnused, less, lib, stdenv, makeWrapper, fetchFromGitHub }: stdenv.mkDerivation rec { @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { "$out/share/bash-completion/completions/home-manager" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A user environment configurator"; homepage = "https://rycee.gitlab.io/home-manager/"; platforms = platforms.unix; diff --git a/pkgs/tools/package-management/libdnf/default.nix b/pkgs/tools/package-management/libdnf/default.nix index 480222a45de2..c93f3031e825 100644 --- a/pkgs/tools/package-management/libdnf/default.nix +++ b/pkgs/tools/package-management/libdnf/default.nix @@ -1,4 +1,4 @@ -{ gcc9Stdenv, stdenv, fetchFromGitHub, cmake, gettext, pkg-config, gpgme, libsolv, openssl, check +{ gcc9Stdenv, lib, stdenv, fetchFromGitHub, cmake, gettext, pkg-config, gpgme, libsolv, openssl, check , pcre, json_c, libmodulemd, libsmartcols, sqlite, librepo, libyaml, rpm }: gcc9Stdenv.mkDerivation rec { @@ -56,7 +56,7 @@ gcc9Stdenv.mkDerivation rec { "-DWITH_ZCHUNK=OFF" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Package management library."; homepage = "https://github.com/rpm-software-management/libdnf"; license = licenses.gpl2Plus; diff --git a/pkgs/tools/package-management/librepo/default.nix b/pkgs/tools/package-management/librepo/default.nix index 203d5e20f881..64a5bc32b5c9 100644 --- a/pkgs/tools/package-management/librepo/default.nix +++ b/pkgs/tools/package-management/librepo/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , cmake , python @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { moveToOutput "lib/${python.libPrefix}" "$py" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Library providing C and Python (libcURL like) API for downloading linux repository metadata and packages"; homepage = "https://rpm-software-management.github.io/librepo/"; license = licenses.lgpl2Plus; diff --git a/pkgs/tools/package-management/microdnf/default.nix b/pkgs/tools/package-management/microdnf/default.nix index de473cf6a898..af5d50460c1a 100644 --- a/pkgs/tools/package-management/microdnf/default.nix +++ b/pkgs/tools/package-management/microdnf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, gettext, libdnf, pkg-config, glib, libpeas, libsmartcols, help2man }: +{ lib, stdenv, fetchFromGitHub, cmake, gettext, libdnf, pkg-config, glib, libpeas, libsmartcols, help2man }: stdenv.mkDerivation rec { pname = "microdnf"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config cmake gettext help2man ]; buildInputs = [ libdnf glib libpeas libsmartcols ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Lightweight implementation of dnf in C"; homepage = "https://github.com/rpm-software-management/microdnf"; license = licenses.gpl2Plus; diff --git a/pkgs/tools/package-management/mynewt-newt/default.nix b/pkgs/tools/package-management/mynewt-newt/default.nix index 63e2ae12a6e5..2390c33ca031 100644 --- a/pkgs/tools/package-management/mynewt-newt/default.nix +++ b/pkgs/tools/package-management/mynewt-newt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, fetchpatch }: +{ lib, stdenv, buildGoModule, fetchFromGitHub, fetchpatch }: buildGoModule rec { pname = "mynewt-newt"; @@ -26,7 +26,7 @@ buildGoModule rec { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://mynewt.apache.org/"; description = "Build and package management tool for embedded development"; longDescription = '' diff --git a/pkgs/tools/package-management/nfpm/default.nix b/pkgs/tools/package-management/nfpm/default.nix index f10b90d0173a..fff774d2aef4 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.10.2"; + version = "2.2.2"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - sha256 = "08qz9zfk19iwf8qfv7vmzvbl8w1vpjrry25w3pxsg93gyjw8v7mi"; + sha256 = "0qv7xw74hf4fzi7v40fpgjyf01dyz6665dmd2pacpd9n6klnr1h3"; }; - vendorSha256 = "0qnfd47ykb6g28d3mnfncgmkvqd1myx47x563sxx4lcsq542q83n"; + vendorSha256 = "0mdh4qrafdxlqqh0kl7wil7w3g5p499qi3yiw8znjkd49g85ws3w"; doCheck = false; diff --git a/pkgs/tools/package-management/nix-doc/default.nix b/pkgs/tools/package-management/nix-doc/default.nix index 630ac6e94a9b..66691d9f5c5a 100644 --- a/pkgs/tools/package-management/nix-doc/default.nix +++ b/pkgs/tools/package-management/nix-doc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, rustPlatform, fetchFromGitHub, boost, nix, pkg-config }: +{ lib, stdenv, rustPlatform, fetchFromGitHub, boost, nix, pkg-config }: rustPlatform.buildRustPackage rec { pname = "nix-doc"; @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1xz3qngs8p0s62dq4d46c01z3k1vvgg856767g56b13c38pzfh28"; - meta = with stdenv.lib; { + meta = with lib; { description = "An interactive Nix documentation tool"; longDescription = "An interactive Nix documentation tool providing a CLI for function search and a Nix plugin for docs in the REPL"; homepage = "https://github.com/lf-/nix-doc"; diff --git a/pkgs/tools/package-management/nix-du/default.nix b/pkgs/tools/package-management/nix-du/default.nix index 8356e43e2e65..0e4ad412e678 100644 --- a/pkgs/tools/package-management/nix-du/default.nix +++ b/pkgs/tools/package-management/nix-du/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform, nix, boost, graphviz, darwin }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, nix, boost, graphviz, darwin }: rustPlatform.buildRustPackage rec { pname = "nix-du"; @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { nix ] ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; - meta = with stdenv.lib; { + meta = with lib; { description = "A tool to determine which gc-roots take space in your nix store"; homepage = "https://github.com/symphorien/nix-du"; license = licenses.lgpl3; diff --git a/pkgs/tools/package-management/nix-index/default.nix b/pkgs/tools/package-management/nix-index/default.nix index 37a638c5670d..af46c51235ed 100644 --- a/pkgs/tools/package-management/nix-index/default.nix +++ b/pkgs/tools/package-management/nix-index/default.nix @@ -1,4 +1,4 @@ -{ stdenv, rustPlatform, fetchFromGitHub, pkgconfig, makeWrapper, openssl, curl +{ lib, stdenv, rustPlatform, fetchFromGitHub, pkgconfig, makeWrapper, openssl, curl , nix, Security }: @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec { --prefix PATH : "${stdenv.lib.makeBinPath [ nix ]}" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A files database for nixpkgs"; homepage = "https://github.com/bennofs/nix-index"; license = with licenses; [ bsd3 ]; diff --git a/pkgs/tools/package-management/nix-pin/default.nix b/pkgs/tools/package-management/nix-pin/default.nix index f5dfacf319bc..0e4005022ff9 100644 --- a/pkgs/tools/package-management/nix-pin/default.nix +++ b/pkgs/tools/package-management/nix-pin/default.nix @@ -42,7 +42,7 @@ let self = stdenv.mkDerivation rec { --modify-nix default.nix ''; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/timbertson/nix-pin"; description = "nixpkgs development utility"; license = licenses.mit; diff --git a/pkgs/tools/package-management/nix-prefetch-scripts/default.nix b/pkgs/tools/package-management/nix-prefetch-scripts/default.nix index bab12ca8e8df..1b4ecc8afec4 100644 --- a/pkgs/tools/package-management/nix-prefetch-scripts/default.nix +++ b/pkgs/tools/package-management/nix-prefetch-scripts/default.nix @@ -1,4 +1,4 @@ -{ stdenv, makeWrapper, buildEnv, +{ lib, stdenv, makeWrapper, buildEnv, breezy, coreutils, cvs, findutils, gawk, git, gnused, mercurial, nix, subversion }: @@ -19,7 +19,7 @@ let mkPrefetchScript = tool: src: deps: preferLocalBuild = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Script used to obtain source hashes for fetch${tool}"; maintainers = with maintainers; [ bennofs ]; platforms = stdenv.lib.platforms.unix; @@ -37,7 +37,7 @@ in rec { paths = [ nix-prefetch-bzr nix-prefetch-cvs nix-prefetch-git nix-prefetch-hg nix-prefetch-svn ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Collection of all the nix-prefetch-* scripts which may be used to obtain source hashes"; maintainers = with maintainers; [ bennofs ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/tools/package-management/nix-prefetch/default.nix b/pkgs/tools/package-management/nix-prefetch/default.nix index f1f575a81b94..fb19d3dac6a1 100644 --- a/pkgs/tools/package-management/nix-prefetch/default.nix +++ b/pkgs/tools/package-management/nix-prefetch/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, installShellFiles, makeWrapper, asciidoc +{ lib, stdenv, fetchFromGitHub, installShellFiles, makeWrapper, asciidoc , docbook_xml_dtd_45, git, docbook_xsl, libxml2, libxslt, coreutils, gawk , gnugrep, gnused, jq, nix, fetchpatch }: @@ -79,7 +79,7 @@ in stdenv.mkDerivation rec { cp -r contrib/hello_rs $out/share/doc/${pname}/contrib ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Prefetch any fetcher function call, e.g. package sources"; license = licenses.mit; maintainers = with maintainers; [ msteen ]; diff --git a/pkgs/tools/package-management/nix-simple-deploy/default.nix b/pkgs/tools/package-management/nix-simple-deploy/default.nix index 5782aa9dc35d..47734f73fd65 100644 --- a/pkgs/tools/package-management/nix-simple-deploy/default.nix +++ b/pkgs/tools/package-management/nix-simple-deploy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform }: +{ lib, stdenv, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { pname = "nix-simple-deploy"; @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0svnz9r0lrmz333qpbpdddjd46vh9i74qchws8aifa2qwnqy0kmn"; - meta = with stdenv.lib; { + meta = with lib; { description = "Deploy software or an entire NixOS system configuration to another NixOS system"; homepage = "https://github.com/misuzu/nix-simple-deploy"; license = with licenses; [ asl20 /* OR */ mit ]; diff --git a/pkgs/tools/package-management/nix-universal-prefetch/default.nix b/pkgs/tools/package-management/nix-universal-prefetch/default.nix index 224ccd1cd9ed..802fc4047bfc 100644 --- a/pkgs/tools/package-management/nix-universal-prefetch/default.nix +++ b/pkgs/tools/package-management/nix-universal-prefetch/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , ruby }: @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { --replace "/usr/bin/env nix-shell" "${ruby}/bin/ruby" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Uses nixpkgs fetchers to figure out hashes"; homepage = "https://github.com/samueldr/nix-universal-prefetch"; license = licenses.mit; diff --git a/pkgs/tools/package-management/nix-update/default.nix b/pkgs/tools/package-management/nix-update/default.nix index 34f635936124..3c420a556523 100644 --- a/pkgs/tools/package-management/nix-update/default.nix +++ b/pkgs/tools/package-management/nix-update/default.nix @@ -7,13 +7,13 @@ buildPythonApplication rec { pname = "nix-update"; - version = "0.3"; + version = "0.3.2"; src = fetchFromGitHub { owner = "Mic92"; repo = pname; rev = version; - sha256 = "sha256-cMllWFPK6pwqrocjkZKjnELIdtW4tj5Yu6AMw7Zd2JU="; + sha256 = "1ykxr0yah7zl06igm7wiji9zx3y0xpjc37hbfhn6gnir6ssa0kqp"; }; makeWrapperArgs = [ diff --git a/pkgs/tools/package-management/nix/aws-sdk-cpp-TransferManager-ContentEncoding.patch b/pkgs/tools/package-management/nix/aws-sdk-cpp-TransferManager-ContentEncoding.patch new file mode 100644 index 000000000000..59cc305a60bc --- /dev/null +++ b/pkgs/tools/package-management/nix/aws-sdk-cpp-TransferManager-ContentEncoding.patch @@ -0,0 +1,127 @@ +From 7d58e303159b2fb343af9a1ec4512238efa147c7 Mon Sep 17 00:00:00 2001 +From: Eelco Dolstra +Date: Mon, 6 Aug 2018 17:15:04 +0200 +Subject: [PATCH] TransferManager: Allow setting a content-encoding for S3 uploads + +--- a/aws-cpp-sdk-transfer/include/aws/transfer/TransferHandle.h ++++ b/aws-cpp-sdk-transfer/include/aws/transfer/TransferHandle.h +@@ -297,6 +297,14 @@ namespace Aws + * Content type of the object being transferred + */ + inline void SetContentType(const Aws::String& value) { std::lock_guard locker(m_getterSetterLock); m_contentType = value; } ++ /** ++ * Content encoding of the object being transferred ++ */ ++ inline const Aws::String GetContentEncoding() const { std::lock_guard locker(m_getterSetterLock); return m_contentEncoding; } ++ /** ++ * Content type of the object being transferred ++ */ ++ inline void SetContentEncoding(const Aws::String& value) { std::lock_guard locker(m_getterSetterLock); m_contentEncoding = value; } + /** + * In case of an upload, this is the metadata that was placed on the object when it was uploaded. + * In the case of a download, this is the object metadata from the GetObject operation. +@@ -383,6 +391,7 @@ namespace Aws + Aws::String m_key; + Aws::String m_fileName; + Aws::String m_contentType; ++ Aws::String m_contentEncoding; + Aws::String m_versionId; + Aws::Map m_metadata; + TransferStatus m_status; +--- a/aws-cpp-sdk-transfer/include/aws/transfer/TransferManager.h ++++ b/aws-cpp-sdk-transfer/include/aws/transfer/TransferManager.h +@@ -154,7 +154,8 @@ namespace Aws + const Aws::String& keyName, + const Aws::String& contentType, + const Aws::Map& metadata, +- const std::shared_ptr& context = nullptr); ++ const std::shared_ptr& context = nullptr, ++ const Aws::String& contentEncoding = ""); + + /** + * Downloads the contents of bucketName/keyName in S3 to the file specified by writeToFile. This will perform a GetObject operation. +@@ -246,7 +247,8 @@ namespace Aws + const Aws::Map& metadata, + const std::shared_ptr& context, +- const Aws::String& fileName = ""); ++ const Aws::String& fileName = "", ++ const Aws::String& contentEncoding = ""); + + /** + * Submits the actual task to task schecduler +@@ -262,7 +264,8 @@ namespace Aws + const Aws::String& keyName, + const Aws::String& contentType, + const Aws::Map& metadata, +- const std::shared_ptr& context); ++ const std::shared_ptr& context, ++ const Aws::String& contentEncoding); + + /** + * Uploads the contents of file, to bucketName/keyName in S3. contentType and metadata will be added to the object. If the object is larger than the configured bufferSize, +--- a/aws-cpp-sdk-transfer/source/transfer/TransferManager.cpp ++++ b/aws-cpp-sdk-transfer/source/transfer/TransferManager.cpp +@@ -87,9 +87,10 @@ namespace Aws + const Aws::String& bucketName, + const Aws::String& keyName, const Aws::String& contentType, + const Aws::Map& metadata, +- const std::shared_ptr& context) ++ const std::shared_ptr& context, ++ const Aws::String& contentEncoding) + { +- return this->DoUploadFile(fileStream, bucketName, keyName, contentType, metadata, context); ++ return this->DoUploadFile(fileStream, bucketName, keyName, contentType, metadata, context, contentEncoding); + } + + std::shared_ptr TransferManager::DownloadFile(const Aws::String& bucketName, +@@ -286,6 +287,9 @@ namespace Aws + createMultipartRequest.WithKey(handle->GetKey()); + createMultipartRequest.WithMetadata(handle->GetMetadata()); + ++ if (handle->GetContentEncoding() != "") ++ createMultipartRequest.WithContentEncoding(handle->GetContentEncoding()); ++ + auto createMultipartResponse = m_transferConfig.s3Client->CreateMultipartUpload(createMultipartRequest); + if (createMultipartResponse.IsSuccess()) + { +@@ -441,6 +445,9 @@ namespace Aws + + putObjectRequest.SetContentType(handle->GetContentType()); + ++ if (handle->GetContentEncoding() != "") ++ putObjectRequest.SetContentEncoding(handle->GetContentEncoding()); ++ + auto buffer = m_bufferManager.Acquire(); + + auto lengthToWrite = (std::min)(m_transferConfig.bufferSize, handle->GetBytesTotalSize()); +@@ -1140,12 +1147,15 @@ namespace Aws + const Aws::String& contentType, + const Aws::Map& metadata, + const std::shared_ptr& context, +- const Aws::String& fileName) ++ const Aws::String& fileName, ++ const Aws::String& contentEncoding) + { + auto handle = Aws::MakeShared(CLASS_TAG, bucketName, keyName, 0, fileName); + handle->SetContentType(contentType); + handle->SetMetadata(metadata); + handle->SetContext(context); ++ if (contentEncoding != "") ++ handle->SetContentEncoding(contentEncoding); + + if (!fileStream->good()) + { +@@ -1213,9 +1223,10 @@ namespace Aws + const Aws::String& keyName, + const Aws::String& contentType, + const Aws::Map& metadata, +- const std::shared_ptr& context) ++ const std::shared_ptr& context, ++ const Aws::String& contentEncoding) + { +- auto handle = CreateUploadFileHandle(fileStream.get(), bucketName, keyName, contentType, metadata, context); ++ auto handle = CreateUploadFileHandle(fileStream.get(), bucketName, keyName, contentType, metadata, context, "", contentEncoding); + return SubmitUpload(handle, fileStream); + } + diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index bfc67ccac632..d997a0a87d61 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, fetchFromGitHub, callPackage +{ lib, fetchurl, fetchFromGitHub, fetchpatch, callPackage , storeDir ? "/nix/store" , stateDir ? "/nix/var" , confDir ? "/etc" @@ -8,7 +8,7 @@ let common = - { lib, stdenv, fetchpatch, perl, curl, bzip2, sqlite, openssl ? null, xz + { lib, stdenv, perl, curl, bzip2, sqlite, openssl ? null, xz , bash, coreutils, gzip, gnutar , pkgconfig, boehmgc, perlPackages, libsodium, brotli, boost, editline, nlohmann_json , autoreconfHook, autoconf-archive, bison, flex @@ -22,18 +22,17 @@ common = , confDir , withLibseccomp ? lib.any (lib.meta.platformMatch stdenv.hostPlatform) libseccomp.meta.platforms, libseccomp , withAWS ? !enableStatic && (stdenv.isLinux || stdenv.isDarwin), aws-sdk-cpp - , enableStatic ? false + , enableStatic ? stdenv.hostPlatform.isStatic , name, suffix ? "", src - + , patches ? [ ] }: let sh = busybox-sandbox-shell; nix = stdenv.mkDerivation rec { - inherit name src; + inherit name src patches; version = lib.getVersion name; is24 = lib.versionAtLeast version "2.4pre"; - isExactly24 = lib.versionAtLeast version "2.4" && lib.versionOlder version "2.4"; VERSION_SUFFIX = suffix; @@ -61,10 +60,9 @@ common = apis = ["s3" "transfer"]; customMemoryManagement = false; }).overrideDerivation (args: { - patches = args.patches or [] ++ [(fetchpatch { - url = "https://github.com/edolstra/aws-sdk-cpp/commit/7d58e303159b2fb343af9a1ec4512238efa147c7.patch"; - sha256 = "103phn6kyvs1yc7fibyin3lgxz699qakhw671kl207484im55id1"; - })]; + patches = args.patches or [] ++ [ + ./aws-sdk-cpp-TransferManager-ContentEncoding.patch + ]; })); propagatedBuildInputs = [ boehmgc ]; @@ -93,9 +91,15 @@ common = patchelf --set-rpath $out/lib:${stdenv.cc.cc.lib}/lib $out/lib/libboost_thread.so.* ''} '' + - # For Nix 2.4, patch around an issue where the Nix configure step pulls in the - # build system's bash and other utilities when cross-compiling - lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform && isExactly24) '' + # On all versions before c9f51e87057652db0013289a95deffba495b35e7, + # released with 2.3.8, we need to patch around an issue where the Nix + # configure step pulls in the build system's bash and other utilities + # when cross-compiling. + lib.optionalString ( + stdenv.buildPlatform != stdenv.hostPlatform && + (lib.versionOlder "2.3.8" version && !is24) + # The additional is24 condition is required as versionOlder doesn't understand nixUnstable version strings + ) '' mkdir tmp/ substitute corepkgs/config.nix.in tmp/config.nix.in \ --subst-var-by bash ${bash}/bin/bash \ @@ -194,20 +198,34 @@ in rec { sha256 = "a8a85e55de43d017abbf13036edfb58674ca136691582f17080c1cd12787b7ab"; }; + patches = [( + fetchpatch { + url = "https://github.com/NixOS/nix/pull/4316.patch"; + sha256 = "0bqlm4n9sac9prgr9xlfng92arisp1hiqvc9pfh4fibsppkgdfc5"; + } + )]; + inherit storeDir stateDir confDir boehmgc; }); nixUnstable = lib.lowPrio (callPackage common rec { name = "nix-2.4${suffix}"; - suffix = "pre20201201_5a6ddb3"; + suffix = "pre20201205_a5d85d0"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "5a6ddb3de14a1684af6c793d663764d093fa7846"; - sha256 = "0qhd3nxvqzszzsfvh89xhd239ycqb0kq2n0bzh9br78pcb60vj3g"; + rev = "a5d85d07faa94cf3518e98273be4bee3d495f06a"; + sha256 = "0g9jjhh0vs4hjrff5yx88x6sh7rk87ngvni3gnyxajqia957dipg"; }; + patches = [ + (fetchpatch { # Fix build on gcc10 + url = "https://github.com/NixOS/nix/commit/d4870462f8f539adeaa6dca476aff6f1f31e1981.patch"; + sha256 = "mTvLvuxb2QVybRDgntKMq+b6da/s3YgM/ll2rWBeY/Y="; + }) + ]; + 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 c093b2fab0ee..b1a86f3137e4 100644 --- a/pkgs/tools/package-management/nixpkgs-review/default.nix +++ b/pkgs/tools/package-management/nixpkgs-review/default.nix @@ -21,7 +21,7 @@ python3.pkgs.buildPythonApplication rec { "--prefix" "PATH" ":" (lib.makeBinPath [ nixFlakes git ]) ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Review pull-requests on https://github.com/NixOS/nixpkgs"; homepage = "https://github.com/Mic92/nixpkgs-review"; license = licenses.mit; diff --git a/pkgs/tools/package-management/opkg-utils/default.nix b/pkgs/tools/package-management/opkg-utils/default.nix index 373ebbeb02f8..2554ae47a411 100644 --- a/pkgs/tools/package-management/opkg-utils/default.nix +++ b/pkgs/tools/package-management/opkg-utils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit }: +{ lib, stdenv, fetchgit }: stdenv.mkDerivation { name = "opkg-utils-20141030"; @@ -14,7 +14,7 @@ stdenv.mkDerivation { makeFlagsArray+=(PREFIX="$out") ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Helper scripts for use with the opkg package manager"; homepage = "http://git.yoctoproject.org/cgit/cgit.cgi/opkg-utils/"; license = licenses.gpl2; diff --git a/pkgs/tools/package-management/opkg/default.nix b/pkgs/tools/package-management/opkg/default.nix index 9195804a43dc..4178e7d9707a 100644 --- a/pkgs/tools/package-management/opkg/default.nix +++ b/pkgs/tools/package-management/opkg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, curl, gpgme, libarchive, bzip2, lzma, attr, acl, libxml2 +{ lib, stdenv, fetchurl, pkgconfig, curl, gpgme, libarchive, bzip2, lzma, attr, acl, libxml2 , autoreconfHook }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig autoreconfHook ]; buildInputs = [ curl gpgme libarchive bzip2 lzma attr acl libxml2 ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A lightweight package management system based upon ipkg"; homepage = "https://git.yoctoproject.org/cgit/cgit.cgi/opkg/"; license = licenses.gpl2; diff --git a/pkgs/tools/package-management/packagekit/qt.nix b/pkgs/tools/package-management/packagekit/qt.nix index 2a1ebada0020..f95a37ae7236 100644 --- a/pkgs/tools/package-management/packagekit/qt.nix +++ b/pkgs/tools/package-management/packagekit/qt.nix @@ -16,8 +16,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig qttools ]; - enableParallelBuilding = true; - meta = packagekit.meta // { description = "System to facilitate installing and updating packages - Qt"; }; diff --git a/pkgs/tools/package-management/python2nix/default.nix b/pkgs/tools/package-management/python2nix/default.nix index 675ec61f4db9..ceb919ecb820 100644 --- a/pkgs/tools/package-management/python2nix/default.nix +++ b/pkgs/tools/package-management/python2nix/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pythonPackages }: +{ lib, stdenv, fetchFromGitHub, pythonPackages }: pythonPackages.buildPythonApplication { name = "python2nix-20140927"; @@ -12,7 +12,7 @@ pythonPackages.buildPythonApplication { propagatedBuildInputs = with pythonPackages; [ requests pip setuptools ]; - meta = with stdenv.lib; { + meta = with lib; { maintainers = [ maintainers.domenkozar ]; platforms = platforms.all; }; diff --git a/pkgs/tools/package-management/rpm/default.nix b/pkgs/tools/package-management/rpm/default.nix index ac470d3e26a5..2f2080358e5e 100644 --- a/pkgs/tools/package-management/rpm/default.nix +++ b/pkgs/tools/package-management/rpm/default.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { ln -sf $out/bin/{rpm,rpmverify} ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.rpm.org/"; license = licenses.gpl2; description = "The RPM Package Manager"; diff --git a/pkgs/tools/package-management/xbps/default.nix b/pkgs/tools/package-management/xbps/default.nix index 108b64bd8b2f..19fbe8ae43d6 100644 --- a/pkgs/tools/package-management/xbps/default.nix +++ b/pkgs/tools/package-management/xbps/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, which, zlib, openssl, libarchive }: +{ lib, stdenv, fetchFromGitHub, pkgconfig, which, zlib, openssl, libarchive }: stdenv.mkDerivation rec { pname = "xbps"; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/void-linux/xbps"; description = "The X Binary Package System"; platforms = platforms.linux; # known to not work on Darwin, at least diff --git a/pkgs/tools/security/1password-gui/default.nix b/pkgs/tools/security/1password-gui/default.nix index 667a21343e61..d9f7a7c7d331 100644 --- a/pkgs/tools/security/1password-gui/default.nix +++ b/pkgs/tools/security/1password-gui/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , appimageTools , makeWrapper @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { passthru.updateScript = ./update.sh; - meta = with stdenv.lib; { + meta = with lib; { description = "Multi-platform password manager"; longDescription = '' 1Password is a multi-platform package manager. diff --git a/pkgs/tools/security/2fa/default.nix b/pkgs/tools/security/2fa/default.nix index 7b6048660c45..41e4439eeb37 100644 --- a/pkgs/tools/security/2fa/default.nix +++ b/pkgs/tools/security/2fa/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { version = "1.1.0"; @@ -13,7 +13,7 @@ buildGoPackage rec { sha256 = "0827vl2bxd6m2rbj00x7857cs7cic3mlg5nlhqzd0n73dm5vk2za"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://rsc.io/2fa"; description = "Two-factor authentication on the command line"; maintainers = with maintainers; [ rvolosatovs ]; diff --git a/pkgs/tools/security/acsccid/default.nix b/pkgs/tools/security/acsccid/default.nix index 53842cbb1fc4..df30d18edfc6 100644 --- a/pkgs/tools/security/acsccid/default.nix +++ b/pkgs/tools/security/acsccid/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , autoconf , automake @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { autoconf ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A PC/SC driver for Linux/Mac OS X and it supports ACS CCID smart card readers"; longDescription = '' acsccid is a PC/SC driver for Linux/Mac OS X and it supports ACS CCID smart card diff --git a/pkgs/tools/security/aespipe/default.nix b/pkgs/tools/security/aespipe/default.nix index e25416e55b88..f0a1dbbf7aca 100644 --- a/pkgs/tools/security/aespipe/default.nix +++ b/pkgs/tools/security/aespipe/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, sharutils, makeWrapper }: +{ lib, stdenv, fetchurl, sharutils, makeWrapper }: stdenv.mkDerivation rec { pname = "aespipe"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { --prefix PATH : $out/bin:${stdenv.lib.makeBinPath [ sharutils ]} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "AES encrypting or decrypting pipe"; homepage = "http://loop-aes.sourceforge.net/aespipe.README"; license = licenses.gpl2; diff --git a/pkgs/tools/security/afl/libdislocator.nix b/pkgs/tools/security/afl/libdislocator.nix index 103786d12441..1c22c7d1d244 100644 --- a/pkgs/tools/security/afl/libdislocator.nix +++ b/pkgs/tools/security/afl/libdislocator.nix @@ -1,4 +1,4 @@ -{ stdenv, afl}: +{ lib, stdenv, afl}: stdenv.mkDerivation { version = stdenv.lib.getVersion afl; @@ -21,7 +21,7 @@ stdenv.mkDerivation { chmod +x $out/bin/get-libdislocator-so ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://lcamtuf.coredump.cx/afl/"; description = '' Drop-in replacement for the libc allocator which improves diff --git a/pkgs/tools/security/afl/qemu.nix b/pkgs/tools/security/afl/qemu.nix index 3af44763a8a6..31aac2430b8b 100644 --- a/pkgs/tools/security/afl/qemu.nix +++ b/pkgs/tools/security/afl/qemu.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, afl, python2, zlib, pkgconfig, glib, perl +{ lib, stdenv, fetchurl, afl, python2, zlib, pkgconfig, glib, perl , texinfo, libuuid, flex, bison, pixman, autoconf }: @@ -69,7 +69,7 @@ stdenv.mkDerivation { "--localstatedir=/var" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.qemu.org/"; description = "Fork of QEMU with AFL instrumentation support"; license = licenses.gpl2Plus; diff --git a/pkgs/tools/security/aflplusplus/libdislocator.nix b/pkgs/tools/security/aflplusplus/libdislocator.nix index 6f947a7280af..99f9d51ea7e6 100644 --- a/pkgs/tools/security/aflplusplus/libdislocator.nix +++ b/pkgs/tools/security/aflplusplus/libdislocator.nix @@ -1,4 +1,4 @@ -{ stdenv, aflplusplus}: +{ lib, stdenv, aflplusplus}: stdenv.mkDerivation { version = stdenv.lib.getVersion aflplusplus; @@ -24,7 +24,7 @@ stdenv.mkDerivation { chmod +x $out/bin/get-libdislocator-so ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/vanhauser-thc/AFLplusplus"; description = '' Drop-in replacement for the libc allocator which improves diff --git a/pkgs/tools/security/aflplusplus/libtokencap.nix b/pkgs/tools/security/aflplusplus/libtokencap.nix index 9421ee0d1e2b..87e06ed9aeb9 100644 --- a/pkgs/tools/security/aflplusplus/libtokencap.nix +++ b/pkgs/tools/security/aflplusplus/libtokencap.nix @@ -1,4 +1,4 @@ -{ stdenv, aflplusplus}: +{ lib, stdenv, aflplusplus}: stdenv.mkDerivation { version = stdenv.lib.getVersion aflplusplus; @@ -23,7 +23,7 @@ stdenv.mkDerivation { chmod +x $out/bin/get-libtokencap-so ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/vanhauser-thc/AFLplusplus"; description = "strcmp & memcmp token capture library"; license = stdenv.lib.licenses.asl20; diff --git a/pkgs/tools/security/aflplusplus/qemu.nix b/pkgs/tools/security/aflplusplus/qemu.nix index c51c839afe85..cc6bf3a83efa 100644 --- a/pkgs/tools/security/aflplusplus/qemu.nix +++ b/pkgs/tools/security/aflplusplus/qemu.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, aflplusplus, python2, zlib, pkgconfig, glib, perl +{ lib, stdenv, fetchurl, aflplusplus, python2, zlib, pkgconfig, glib, perl , texinfo, libuuid, flex, bison, pixman, autoconf }: @@ -73,7 +73,7 @@ stdenv.mkDerivation { "--localstatedir=/var" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.qemu.org/"; description = "Fork of QEMU with AFL++ instrumentation support"; license = licenses.gpl2Plus; diff --git a/pkgs/tools/security/aide/default.nix b/pkgs/tools/security/aide/default.nix index 59b723207583..49291775e379 100644 --- a/pkgs/tools/security/aide/default.nix +++ b/pkgs/tools/security/aide/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, flex, bison, libmhash, zlib, acl, attr, libselinux, pcre }: +{ lib, stdenv, fetchurl, flex, bison, libmhash, zlib, acl, attr, libselinux, pcre }: stdenv.mkDerivation rec { pname = "aide"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { "--with-xattr" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://aide.github.io/"; description = "A file and directory integrity checker"; license = licenses.gpl2Plus; diff --git a/pkgs/tools/security/asc-key-to-qr-code-gif/default.nix b/pkgs/tools/security/asc-key-to-qr-code-gif/default.nix index ee5fa924cb6f..b0e3a6449596 100644 --- a/pkgs/tools/security/asc-key-to-qr-code-gif/default.nix +++ b/pkgs/tools/security/asc-key-to-qr-code-gif/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, imagemagick, qrencode +{ lib, stdenv, fetchFromGitHub, imagemagick, qrencode , testQR ? false, zbar ? null }: @@ -36,7 +36,7 @@ stdenv.mkDerivation { cp * $out/bin/ ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/yishilin14/asc-key-to-qr-code-gif"; description = "Convert ASCII-armored PGP keys to animated QR code"; platforms = platforms.linux; diff --git a/pkgs/tools/security/aws-iam-authenticator/default.nix b/pkgs/tools/security/aws-iam-authenticator/default.nix index 44282d5f9643..851eed43adef 100644 --- a/pkgs/tools/security/aws-iam-authenticator/default.nix +++ b/pkgs/tools/security/aws-iam-authenticator/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "aws-iam-authenticator"; @@ -13,7 +13,7 @@ buildGoPackage rec { sha256 = "1ghl2vms9wmvczdl2raqhy0gffxmk24h158gjb5mlw7rggzvb7bg"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/kubernetes-sigs/aws-iam-authenticator"; description = "AWS IAM credentials for Kubernetes authentication"; license = licenses.asl20; diff --git a/pkgs/tools/security/aws-okta/default.nix b/pkgs/tools/security/aws-okta/default.nix index 340c2cd971c6..de84e43b5aa6 100644 --- a/pkgs/tools/security/aws-okta/default.nix +++ b/pkgs/tools/security/aws-okta/default.nix @@ -1,4 +1,4 @@ -{ buildGoPackage, fetchFromGitHub, libusb1, pkgconfig, stdenv, libiconv }: +{ buildGoPackage, fetchFromGitHub, libusb1, pkgconfig, lib, stdenv, libiconv }: buildGoPackage rec { pname = "aws-okta"; @@ -20,7 +20,7 @@ buildGoPackage rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libusb1 libiconv ]; - meta = with stdenv.lib; { + meta = with lib; { inherit version; description = "aws-vault like tool for Okta authentication"; license = licenses.mit; diff --git a/pkgs/tools/security/badchars/default.nix b/pkgs/tools/security/badchars/default.nix new file mode 100644 index 000000000000..3125ff0c28c9 --- /dev/null +++ b/pkgs/tools/security/badchars/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonApplication +, fetchPypi +}: + +buildPythonApplication rec { + pname = "badchars"; + version = "0.4.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1xqki8qnfwl97d60xj69alyzwa1mnfbwki25j0vhvhb05varaxz2"; + }; + + postPatch = '' + substituteInPlace setup.py --replace "argparse" "" + ''; + + # no tests are available and it can't be imported (it's only a script, not a module) + doCheck = false; + + meta = with lib; { + description = "HEX badchar generator for different programming languages"; + longDescription = '' + A HEX bad char generator to instruct encoders such as shikata-ga-nai to + transform those to other chars. + ''; + homepage = "https://github.com/cytopia/badchars"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/tools/security/bash-supergenpass/default.nix b/pkgs/tools/security/bash-supergenpass/default.nix index 53bc45acf8f7..cbacf8b33a47 100644 --- a/pkgs/tools/security/bash-supergenpass/default.nix +++ b/pkgs/tools/security/bash-supergenpass/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , unstableGitUpdater , makeWrapper @@ -26,7 +26,7 @@ stdenv.mkDerivation { passthru.updateScript = unstableGitUpdater { }; - meta = with stdenv.lib; { + meta = with lib; { description = "Bash shell-script implementation of SuperGenPass password generation"; longDescription = '' Bash shell-script implementation of SuperGenPass password generation diff --git a/pkgs/tools/security/bettercap/default.nix b/pkgs/tools/security/bettercap/default.nix index 17cb0308a168..3b0a6ca62640 100644 --- a/pkgs/tools/security/bettercap/default.nix +++ b/pkgs/tools/security/bettercap/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildGoModule , fetchFromGitHub , pkg-config @@ -27,7 +27,7 @@ buildGoModule rec { buildInputs = [ libpcap libusb1 ] ++ stdenv.lib.optionals stdenv.isLinux [ libnfnetlink libnetfilter_queue ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A man in the middle tool"; longDescription = '' BetterCAP is a powerful, flexible and portable tool created to perform various types of MITM attacks against a network, manipulate HTTP, HTTPS and TCP traffic in realtime, sniff for credentials and much more. diff --git a/pkgs/tools/security/bitwarden/default.nix b/pkgs/tools/security/bitwarden/default.nix index c35a4d60e9e7..9bbcdab6bf7d 100644 --- a/pkgs/tools/security/bitwarden/default.nix +++ b/pkgs/tools/security/bitwarden/default.nix @@ -24,7 +24,7 @@ let x86_64-linux = "1z1r8327xymqf2h98wb2fb02s41pxc6fh5w4bxmdgpx7k1jx5kvg"; }.${system} or ""; - meta = with stdenv.lib; { + meta = with lib; { description = "A secure and free password manager for all of your devices"; homepage = "https://bitwarden.com"; license = licenses.gpl3; diff --git a/pkgs/tools/security/bitwarden_rs/default.nix b/pkgs/tools/security/bitwarden_rs/default.nix index 57e865ef596a..482ba400e637 100644 --- a/pkgs/tools/security/bitwarden_rs/default.nix +++ b/pkgs/tools/security/bitwarden_rs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, rustPlatform, fetchFromGitHub, nixosTests +{ lib, stdenv, rustPlatform, fetchFromGitHub, nixosTests , pkgconfig, openssl , Security, CoreServices , dbBackend ? "sqlite", libmysqlclient, postgresql }: @@ -37,7 +37,7 @@ in rustPlatform.buildRustPackage rec { passthru.tests = nixosTests.bitwarden; - meta = with stdenv.lib; { + meta = with lib; { description = "Unofficial Bitwarden compatible server written in Rust"; homepage = "https://github.com/dani-garcia/bitwarden_rs"; license = licenses.gpl3; diff --git a/pkgs/tools/security/bitwarden_rs/vault.nix b/pkgs/tools/security/bitwarden_rs/vault.nix index 786ff5784557..a6e238f9085b 100644 --- a/pkgs/tools/security/bitwarden_rs/vault.nix +++ b/pkgs/tools/security/bitwarden_rs/vault.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, nixosTests }: +{ lib, stdenv, fetchurl, nixosTests }: stdenv.mkDerivation rec { pname = "bitwarden_rs-vault"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { passthru.tests = nixosTests.bitwarden; - meta = with stdenv.lib; { + meta = with lib; { description = "Integrates the web vault into bitwarden_rs"; homepage = "https://github.com/dani-garcia/bw_web_builds"; platforms = platforms.all; diff --git a/pkgs/tools/security/bmrsa/11.nix b/pkgs/tools/security/bmrsa/11.nix index c7d4c4d01741..c8188fe4216a 100644 --- a/pkgs/tools/security/bmrsa/11.nix +++ b/pkgs/tools/security/bmrsa/11.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip }: +{ lib, stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { pname = "bmrsa"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { echo -e 'install:\n\tcp bmrsa '$out'/bin' >> Makefile ''; - meta = with stdenv.lib; { + meta = with lib; { description = "RSA utility"; homepage = "http://bmrsa.sourceforge.net/"; license = licenses.gpl1; diff --git a/pkgs/tools/security/bruteforce-luks/default.nix b/pkgs/tools/security/bruteforce-luks/default.nix index cfa27a5c6865..084368c105b2 100644 --- a/pkgs/tools/security/bruteforce-luks/default.nix +++ b/pkgs/tools/security/bruteforce-luks/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, cryptsetup }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, cryptsetup }: stdenv.mkDerivation rec { pname = "bruteforce-luks"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { inherit (src.meta) homepage; description = "Cracks passwords of LUKS encrypted volumes"; longDescription = '' diff --git a/pkgs/tools/security/brutespray/default.nix b/pkgs/tools/security/brutespray/default.nix index 78dd789047d0..69d8dbc96235 100644 --- a/pkgs/tools/security/brutespray/default.nix +++ b/pkgs/tools/security/brutespray/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python3, fetchFromGitHub, makeWrapper, medusa }: +{ lib, stdenv, python3, fetchFromGitHub, makeWrapper, medusa }: stdenv.mkDerivation rec { pname = "brutespray"; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { cp -r wordlist/ $out/share/brutespray/wordlist ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/x90skysn3k/brutespray"; description = "Brute-Forcing from Nmap output - Automatically attempts default creds on found services"; license = licenses.mit; diff --git a/pkgs/tools/security/ccid/default.nix b/pkgs/tools/security/ccid/default.nix index b7f408e748fd..1be561dae549 100644 --- a/pkgs/tools/security/ccid/default.nix +++ b/pkgs/tools/security/ccid/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pcsclite, pkgconfig, libusb1, perl }: +{ lib, stdenv, fetchurl, pcsclite, pkgconfig, libusb1, perl }: stdenv.mkDerivation rec { pname = "ccid"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig perl ]; buildInputs = [ pcsclite libusb1 ]; - meta = with stdenv.lib; { + meta = with lib; { description = "ccid drivers for pcsclite"; homepage = "https://ccid.apdu.fr/"; license = licenses.gpl2Plus; diff --git a/pkgs/tools/security/certmgr/default.nix b/pkgs/tools/security/certmgr/default.nix index be3f891cc8bb..47848b25b435 100644 --- a/pkgs/tools/security/certmgr/default.nix +++ b/pkgs/tools/security/certmgr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, fetchpatch }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub, fetchpatch }: let generic = { patches ? [] }: @@ -17,7 +17,7 @@ let inherit patches; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://cfssl.org/"; description = "Cloudflare's certificate manager"; platforms = platforms.linux; diff --git a/pkgs/tools/security/certstrap/default.nix b/pkgs/tools/security/certstrap/default.nix index 99ba5c9e29b7..f0c756f54f9d 100644 --- a/pkgs/tools/security/certstrap/default.nix +++ b/pkgs/tools/security/certstrap/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "certstrap"; @@ -13,7 +13,7 @@ buildGoPackage rec { sha256 = "1ymchnn7c9g3pq7rw4lrwsd6z3wfjx90g7qgrw6r5hssl77mnscj"; }; - meta = with stdenv.lib; { + meta = with lib; { inherit (src.meta) homepage; description = "Tools to bootstrap CAs, certificate requests, and signed certificates"; license = licenses.asl20; diff --git a/pkgs/tools/security/cfssl/default.nix b/pkgs/tools/security/cfssl/default.nix index d926aaca68fb..835c5daa72c5 100644 --- a/pkgs/tools/security/cfssl/default.nix +++ b/pkgs/tools/security/cfssl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, go-rice }: +{ lib, stdenv, buildGoModule, fetchFromGitHub, go-rice }: buildGoModule rec { pname = "cfssl"; @@ -40,7 +40,7 @@ buildGoModule rec { -X github.com/cloudflare/cfssl/cli/version.version=v${version} ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://cfssl.org/"; description = "Cloudflare's PKI and TLS toolkit"; license = licenses.bsd2; diff --git a/pkgs/tools/security/chaps/default.nix b/pkgs/tools/security/chaps/default.nix index decc9ba31268..0200fca8ff37 100644 --- a/pkgs/tools/security/chaps/default.nix +++ b/pkgs/tools/security/chaps/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitiles, fetchFromGitHub, fetchurl, trousers, leveldb, unzip +{ lib, stdenv, fetchFromGitiles, fetchFromGitHub, fetchurl, trousers, leveldb, unzip , scons, pkgconfig, glib, dbus_cplusplus, dbus, protobuf, openssl, snappy, pam }: @@ -80,7 +80,7 @@ stdenv.mkDerivation rec { cp ${name}/man/* $out/usr/share/man/man8/. ''; - meta = with stdenv.lib; { + meta = with lib; { description = "PKCS #11 implementation based on trusted platform module (TPM)"; homepage = "https://www.chromium.org/developers/design-documents/chaps-technical-design"; maintainers = [ maintainers.tstrobel ]; diff --git a/pkgs/tools/security/chipsec/default.nix b/pkgs/tools/security/chipsec/default.nix index 0f162347cc83..45d6349af403 100644 --- a/pkgs/tools/security/chipsec/default.nix +++ b/pkgs/tools/security/chipsec/default.nix @@ -25,7 +25,7 @@ pythonPackages.buildPythonApplication rec { KERNEL_SRC_DIR = lib.optionalString withDriver "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; - meta = with stdenv.lib; { + meta = with lib; { description = "Platform Security Assessment Framework"; longDescription = '' CHIPSEC is a framework for analyzing the security of PC platforms diff --git a/pkgs/tools/security/chkrootkit/default.nix b/pkgs/tools/security/chkrootkit/default.nix index 864d73aaa972..5753784542da 100644 --- a/pkgs/tools/security/chkrootkit/default.nix +++ b/pkgs/tools/security/chkrootkit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "chkrootkit-0.53"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { cp check_wtmpx chkdirs chklastlog chkproc chkrootkit chkutmp chkwtmp ifpromisc strings-static $out/sbin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Locally checks for signs of a rootkit"; homepage = "http://www.chkrootkit.org/"; license = licenses.bsd2; diff --git a/pkgs/tools/security/chntpw/default.nix b/pkgs/tools/security/chntpw/default.nix index 0a44c463eb70..d0b75bdd42b2 100644 --- a/pkgs/tools/security/chntpw/default.nix +++ b/pkgs/tools/security/chntpw/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip }: +{ lib, stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { pname = "chntpw"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { make install PREFIX=$out ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://pogostick.net/~pnh/ntpasswd/"; description = "An utility to reset the password of any user that has a valid local account on a Windows system"; maintainers = with stdenv.lib.maintainers; [ deepfire ]; diff --git a/pkgs/tools/security/chrome-token-signing/default.nix b/pkgs/tools/security/chrome-token-signing/default.nix index 0065758e1c3f..134f916f0434 100644 --- a/pkgs/tools/security/chrome-token-signing/default.nix +++ b/pkgs/tools/security/chrome-token-signing/default.nix @@ -1,4 +1,4 @@ -{ stdenv, mkDerivation, fetchFromGitHub, qmake, pcsclite, pkgconfig, opensc }: +{ lib, stdenv, mkDerivation, fetchFromGitHub, qmake, pcsclite, pkgconfig, opensc }: mkDerivation rec { pname = "chrome-token-signing"; @@ -28,7 +28,7 @@ mkDerivation rec { install -D -t $out/lib/mozilla/native-messaging-hosts host-linux/ff/ee.ria.esteid.json ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Chrome and Firefox extension for signing with your eID on the web"; homepage = "https://github.com/open-eid/chrome-token-signing/wiki"; license = licenses.lgpl21; diff --git a/pkgs/tools/security/clamav/default.nix b/pkgs/tools/security/clamav/default.nix index e3c57cbc9e90..4b3048223f7a 100644 --- a/pkgs/tools/security/clamav/default.nix +++ b/pkgs/tools/security/clamav/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkg-config +{ lib, stdenv, fetchurl, pkg-config , zlib, bzip2, libiconv, libxml2, openssl, ncurses, curl, libmilter, pcre2 , libmspack, systemd, Foundation, json_c, check }: @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.clamav.net"; description = "Antivirus engine designed for detecting Trojans, viruses, malware and other malicious threats"; license = licenses.gpl2; diff --git a/pkgs/tools/security/cloudbrute/default.nix b/pkgs/tools/security/cloudbrute/default.nix new file mode 100644 index 000000000000..06f0dd413a5f --- /dev/null +++ b/pkgs/tools/security/cloudbrute/default.nix @@ -0,0 +1,30 @@ +{ buildGoModule +, fetchFromGitHub +, lib, stdenv +}: + +buildGoModule rec { + pname = "cloudbrute"; + version = "1.0.7"; + + src = fetchFromGitHub { + owner = "0xsha"; + repo = "CloudBrute"; + rev = "v${version}"; + sha256 = "05b9klddk8wvi78j47jyg9pix6qpxyr01l1m7k1j7598siazfv9g"; + }; + + vendorSha256 = "0f3n0wrmg9d2qyn8hlnhf9lsfqd9443myzr04p48v68m8n83j6a9"; + + meta = with lib; { + description = "Cloud enumeration tool"; + longDescription = '' + A tool to find a company (target) infrastructure, files, and apps on + the top cloud providers (Amazon, Google, Microsoft, DigitalOcean, + Alibaba, Vultr, Linode). + ''; + homepage = "https://github.com/0xsha/CloudBrute"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/tools/security/crackxls/default.nix b/pkgs/tools/security/crackxls/default.nix index aff6bbd028ad..33a219e86218 100644 --- a/pkgs/tools/security/crackxls/default.nix +++ b/pkgs/tools/security/crackxls/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, autoconf, automake, openssl, libgsf, gmp }: +{ lib, stdenv, fetchFromGitHub, pkgconfig, autoconf, automake, openssl, libgsf, gmp }: stdenv.mkDerivation rec { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { cp crackxls2003 $out/bin/ ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/GavinSmith0123/crackxls2003/"; description = "Used to break the encryption on old Microsoft Excel and Microsoft Word files"; platforms = platforms.linux; diff --git a/pkgs/tools/security/creddump/default.nix b/pkgs/tools/security/creddump/default.nix index ffa2fd2311c1..7a936408433a 100644 --- a/pkgs/tools/security/creddump/default.nix +++ b/pkgs/tools/security/creddump/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, python2, python2Packages }: +{ lib, stdenv, fetchFromGitLab, python2, python2Packages }: python2Packages.buildPythonApplication rec { pname = "creddump"; @@ -24,7 +24,7 @@ python2Packages.buildPythonApplication rec { cp lsadump.py ${placeholder "out"}/bin/lsadump ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Python tool to extract various credentials and secrets from Windows registry hives"; homepage = "https://gitlab.com/kalilinux/packages/creddump"; license = licenses.gpl3; diff --git a/pkgs/tools/security/crlfuzz/default.nix b/pkgs/tools/security/crlfuzz/default.nix new file mode 100644 index 000000000000..2e4b17170c65 --- /dev/null +++ b/pkgs/tools/security/crlfuzz/default.nix @@ -0,0 +1,27 @@ +{ buildGoModule +, fetchFromGitHub +, stdenv +}: + +buildGoModule rec { + pname = "crlfuzz"; + version = "1.4.0"; + + src = fetchFromGitHub { + owner = "dwisiswant0"; + repo = pname; + rev = "v${version}"; + sha256 = "03g7z7cczn52hvg6srp1i5xhdbpia226adrh2d54cs640063bx3m"; + }; + + vendorSha256 = "19cj07f7d3ksp7lh5amdjz1s8p7xmqbwal4vp61al82n8944ify8"; + + doCheck = true; + + meta = with stdenv.lib; { + description = "Tool to scan for CRLF vulnerability"; + homepage = "https://github.com/dwisiswant0/crlfuzz"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/tools/security/crowbar/default.nix b/pkgs/tools/security/crowbar/default.nix index cd4e7db87186..2f197421e1f7 100644 --- a/pkgs/tools/security/crowbar/default.nix +++ b/pkgs/tools/security/crowbar/default.nix @@ -3,7 +3,7 @@ , nmap , openvpn , python3Packages -, stdenv +, lib, stdenv , tigervnc }: @@ -33,7 +33,7 @@ python3Packages.buildPythonApplication rec { $out/bin/crowbar --help > /dev/null ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/galkan/crowbar"; description = "A brute forcing tool that can be used during penetration tests"; license = licenses.mit; diff --git a/pkgs/tools/security/crunch/default.nix b/pkgs/tools/security/crunch/default.nix index b53ead1c8527..2422a2278bb5 100644 --- a/pkgs/tools/security/crunch/default.nix +++ b/pkgs/tools/security/crunch/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, which }: +{ lib, stdenv, fetchurl, which }: stdenv.mkDerivation rec { pname = "crunch"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Wordlist generator"; homepage = "https://sourceforge.net/projects/crunch-wordlist/"; platforms = platforms.unix; diff --git a/pkgs/tools/security/ctmg/default.nix b/pkgs/tools/security/ctmg/default.nix index a30523c3bbc1..b08af06825e3 100644 --- a/pkgs/tools/security/ctmg/default.nix +++ b/pkgs/tools/security/ctmg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip }: +{ lib, stdenv, fetchzip }: stdenv.mkDerivation rec { pname = "ctmg"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { installPhase = "install -D ctmg.sh $out/bin/ctmg"; - meta = with stdenv.lib; { + meta = with lib; { description = "An encrypted container manager for Linux using cryptsetup"; homepage = "https://git.zx2c4.com/ctmg/about/"; license = licenses.isc; diff --git a/pkgs/tools/security/deepsea/default.nix b/pkgs/tools/security/deepsea/default.nix new file mode 100644 index 000000000000..855549bb0c81 --- /dev/null +++ b/pkgs/tools/security/deepsea/default.nix @@ -0,0 +1,30 @@ +{ buildGoModule +, fetchFromGitHub +, lib, stdenv +}: + +buildGoModule rec { + pname = "deepsea"; + version = "0.9"; + + src = fetchFromGitHub { + owner = "dsnezhkov"; + repo = pname; + rev = "v${version}"; + sha256 = "02s03sha8vwp7dsaw3z446pskhb6wmy0hyj0mhpbx58sf147rkig"; + }; + + vendorSha256 = "0vpkzykfg1rq4qi1v5lsa0drpil9i6ccfw96k48ppi9hiwzpq94w"; + + meta = with lib; { + description = "Phishing tool for red teams and pentesters"; + longDescription = '' + DeepSea phishing gear aims to help RTOs and pentesters with the + delivery of opsec-tight, flexible email phishing campaigns carried + out on the outside as well as on the inside of a perimeter. + ''; + homepage = "https://github.com/dsnezhkov/deepsea"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/tools/security/dnsenum/default.nix b/pkgs/tools/security/dnsenum/default.nix index 3374c827d756..a24fc96621f1 100644 --- a/pkgs/tools/security/dnsenum/default.nix +++ b/pkgs/tools/security/dnsenum/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, makeWrapper, perl, perlPackages }: +{ lib, stdenv, fetchFromGitHub, makeWrapper, perl, perlPackages }: stdenv.mkDerivation rec { pname = "dnsenum"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { install -vD dns.txt -t $out/share ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/fwaeytens/dnsenum"; description = "A tool to enumerate DNS information"; maintainers = with maintainers; [ c0bw3b ]; diff --git a/pkgs/tools/security/dnsrecon/default.nix b/pkgs/tools/security/dnsrecon/default.nix index 2575636aeca2..65b18c5c8226 100644 --- a/pkgs/tools/security/dnsrecon/default.nix +++ b/pkgs/tools/security/dnsrecon/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python3 }: +{ lib, stdenv, fetchFromGitHub, python3 }: python3.pkgs.buildPythonApplication rec { pname = "dnsrecon"; @@ -34,7 +34,7 @@ python3.pkgs.buildPythonApplication rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "DNS Enumeration Script"; homepage = "https://github.com/darkoperator/dnsrecon"; license = licenses.gpl2; diff --git a/pkgs/tools/security/dnsx/default.nix b/pkgs/tools/security/dnsx/default.nix index 21bf7d4664cc..1a82467201df 100644 --- a/pkgs/tools/security/dnsx/default.nix +++ b/pkgs/tools/security/dnsx/default.nix @@ -1,6 +1,6 @@ { buildGoModule , fetchFromGitHub -, stdenv +, lib, stdenv }: buildGoModule rec { @@ -16,7 +16,7 @@ buildGoModule rec { vendorSha256 = "0j2cqvskzxbyfrvsv4gm4qwfjm0digizcg157z5iignnknddajax"; - meta = with stdenv.lib; { + meta = with lib; { description = "Fast and multi-purpose DNS toolkit"; longDescription = '' dnsx is a fast and multi-purpose DNS toolkit allow to run multiple diff --git a/pkgs/tools/security/doona/default.nix b/pkgs/tools/security/doona/default.nix index 5e1233f308c3..e0f459ad7453 100644 --- a/pkgs/tools/security/doona/default.nix +++ b/pkgs/tools/security/doona/default.nix @@ -1,5 +1,5 @@ { fetchFromGitHub -, stdenv +, lib, stdenv , perl }: @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { chmod +x $out/bin/doona ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/wireghoul/doona"; description = "A fork of the Bruteforce Exploit Detector Tool (BED)"; longDescription = '' diff --git a/pkgs/tools/security/ecdsatool/default.nix b/pkgs/tools/security/ecdsatool/default.nix index b1a86fe7e64a..0498b758c1d3 100644 --- a/pkgs/tools/security/ecdsatool/default.nix +++ b/pkgs/tools/security/ecdsatool/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgs }: +{ lib, stdenv, pkgs }: stdenv.mkDerivation { version = "0.0.1"; @@ -19,7 +19,7 @@ stdenv.mkDerivation { nativeBuildInputs = with pkgs; [openssl autoconf automake]; buildInputs = with pkgs; [libuecc]; - meta = with stdenv.lib; { + meta = with lib; { description = "Create and manipulate ECC NISTP256 keypairs"; homepage = "https://github.com/kaniini/ecdsatool/"; license = with licenses; [free]; diff --git a/pkgs/tools/security/ecdsautils/default.nix b/pkgs/tools/security/ecdsautils/default.nix index f5ead317f4ec..adf1a74f42af 100644 --- a/pkgs/tools/security/ecdsautils/default.nix +++ b/pkgs/tools/security/ecdsautils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgs }: +{ lib, stdenv, pkgs }: stdenv.mkDerivation { version = "0.4.0"; @@ -14,7 +14,7 @@ stdenv.mkDerivation { nativeBuildInputs = with pkgs; [ cmake pkgconfig doxygen ]; buildInputs = with pkgs; [ libuecc ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Tiny collection of programs used for ECDSA (keygen, sign, verify)"; homepage = "https://github.com/tcatm/ecdsautils/"; license = with licenses; [ mit bsd2 ]; diff --git a/pkgs/tools/security/ecryptfs/default.nix b/pkgs/tools/security/ecryptfs/default.nix index 1a8329885ba2..dbec36cb12b0 100644 --- a/pkgs/tools/security/ecryptfs/default.nix +++ b/pkgs/tools/security/ecryptfs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, perl, util-linux, keyutils, nss, nspr, python2, pam, enablePython ? false +{ lib, stdenv, fetchurl, pkgconfig, perl, util-linux, keyutils, nss, nspr, python2, pam, enablePython ? false , intltool, makeWrapper, coreutils, bash, gettext, cryptsetup, lvm2, rsync, which, lsof }: stdenv.mkDerivation rec { @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Enterprise-class stacked cryptographic filesystem"; license = licenses.gpl2Plus; maintainers = with maintainers; [ obadz ]; diff --git a/pkgs/tools/security/ecryptfs/helper.nix b/pkgs/tools/security/ecryptfs/helper.nix index fcb8d091d933..ecd12a2738d8 100644 --- a/pkgs/tools/security/ecryptfs/helper.nix +++ b/pkgs/tools/security/ecryptfs/helper.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , makeWrapper , python2 @@ -24,7 +24,7 @@ stdenv.mkDerivation { makeWrapper "${python2.interpreter}" "$out/bin/ecryptfs-helper" --add-flags "$out/libexec/ecryptfs-helper.py" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Helper script to create/mount/unemount encrypted directories using eCryptfs without needing root permissions"; license = licenses.gpl2Plus; maintainers = with maintainers; [ obadz ]; diff --git a/pkgs/tools/security/efitools/default.nix b/pkgs/tools/security/efitools/default.nix index 33b6c3b672da..60bb3627cc99 100644 --- a/pkgs/tools/security/efitools/default.nix +++ b/pkgs/tools/security/efitools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, gnu-efi, openssl, sbsigntool, perl, perlPackages, +{ lib, stdenv, gnu-efi, openssl, sbsigntool, perl, perlPackages, help2man, fetchgit }: stdenv.mkDerivation rec { pname = "efitools"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { patchShebangs . ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Tools for manipulating UEFI secure boot platforms"; homepage = "https://git.kernel.org/cgit/linux/kernel/git/jejb/efitools.git"; license = licenses.gpl2; diff --git a/pkgs/tools/security/eid-mw/default.nix b/pkgs/tools/security/eid-mw/default.nix index a55c1d8db661..116add243144 100644 --- a/pkgs/tools/security/eid-mw/default.nix +++ b/pkgs/tools/security/eid-mw/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , autoreconfHook, pkgconfig , gtk3, nssTools, pcsclite , libxml2, libproxy @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Belgian electronic identity card (eID) middleware"; homepage = "https://eid.belgium.be/en/using_your_eid/installing_the_eid_software/linux/"; license = licenses.lgpl3; diff --git a/pkgs/tools/security/encryptr/default.nix b/pkgs/tools/security/encryptr/default.nix index 62311a41da37..0cbfd79296dc 100644 --- a/pkgs/tools/security/encryptr/default.nix +++ b/pkgs/tools/security/encryptr/default.nix @@ -47,7 +47,7 @@ in stdenv.mkDerivation rec { # its application and shows a generic page dontStrip = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://spideroak.com/solutions/encryptr"; description = "Free, private and secure password management tool and e-wallet"; license = licenses.unfree; diff --git a/pkgs/tools/security/enpass/default.nix b/pkgs/tools/security/enpass/default.nix index be2e5b06246d..3b25dd58b347 100644 --- a/pkgs/tools/security/enpass/default.nix +++ b/pkgs/tools/security/enpass/default.nix @@ -51,7 +51,7 @@ let url = "${baseUrl}/${data.path}"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A well known password manager"; homepage = "https://www.enpass.io/"; license = licenses.unfree; diff --git a/pkgs/tools/security/enum4linux/default.nix b/pkgs/tools/security/enum4linux/default.nix index 9a7d1861d9bd..4fe567d1ed0f 100644 --- a/pkgs/tools/security/enum4linux/default.nix +++ b/pkgs/tools/security/enum4linux/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, samba, perl, openldap }: +{ lib, stdenv, fetchurl, makeWrapper, samba, perl, openldap }: stdenv.mkDerivation rec { pname = "enum4linux"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { --prefix PATH : ${stdenv.lib.makeBinPath [ samba openldap ]} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A tool for enumerating information from Windows and Samba systems"; homepage = "https://labs.portcullis.co.uk/tools/enum4linux/"; license = licenses.gpl2; diff --git a/pkgs/tools/security/eschalot/default.nix b/pkgs/tools/security/eschalot/default.nix index 28df3a284427..046750616152 100644 --- a/pkgs/tools/security/eschalot/default.nix +++ b/pkgs/tools/security/eschalot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, openssl }: +{ lib, stdenv, fetchFromGitHub, openssl }: stdenv.mkDerivation rec { pname = "eschalot"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { install -D -t $out/bin eschalot worgen ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Tor hidden service name generator"; homepage = src.meta.homepage; license = licenses.isc; diff --git a/pkgs/tools/security/fail2ban/default.nix b/pkgs/tools/security/fail2ban/default.nix index c27f82d70536..45bea0ae99f1 100644 --- a/pkgs/tools/security/fail2ban/default.nix +++ b/pkgs/tools/security/fail2ban/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python3 }: +{ lib, stdenv, fetchFromGitHub, python3 }: let version = "0.11.1"; in @@ -49,7 +49,7 @@ python3.pkgs.buildPythonApplication { rm -rf ${sitePackages}/etc ${sitePackages}/usr ${sitePackages}/var; ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.fail2ban.org/"; description = "A program that scans log files for repeated failing login attempts and bans IP addresses"; license = licenses.gpl2Plus; diff --git a/pkgs/tools/security/fcrackzip/default.nix b/pkgs/tools/security/fcrackzip/default.nix index 15510f7b7096..31d0b44fb710 100644 --- a/pkgs/tools/security/fcrackzip/default.nix +++ b/pkgs/tools/security/fcrackzip/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation rec { pname = "fcrackzip"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { # Do not clash with unizp/zipinfo postInstall = "mv $out/bin/zipinfo $out/bin/fcrackzip-zipinfo"; - meta = with stdenv.lib; { + meta = with lib; { description = "zip password cracker, similar to fzc, zipcrack and others"; homepage = "http://oldhome.schmorp.de/marc/fcrackzip.html"; license = licenses.gpl2; diff --git a/pkgs/tools/security/ffuf/default.nix b/pkgs/tools/security/ffuf/default.nix index 77a286df4c69..084601a41222 100644 --- a/pkgs/tools/security/ffuf/default.nix +++ b/pkgs/tools/security/ffuf/default.nix @@ -1,6 +1,6 @@ { buildGoModule , fetchFromGitHub -, stdenv +, lib, stdenv }: buildGoModule rec { @@ -20,7 +20,7 @@ buildGoModule rec { # https://github.com/ffuf/ffuf/issues/367 doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Fast web fuzzer written in Go"; longDescription = '' FFUF, or “Fuzz Faster you Fool” is an open source web fuzzing tool, diff --git a/pkgs/tools/security/fido2luks/default.nix b/pkgs/tools/security/fido2luks/default.nix index d2a5d91467a8..e0dcdadb7b07 100644 --- a/pkgs/tools/security/fido2luks/default.nix +++ b/pkgs/tools/security/fido2luks/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , rustPlatform , fetchFromGitHub , cryptsetup @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "19drjql13z8bw257z10kjppxm25jlfgrpc9g1jf68ka5j2b3nx7k"; - meta = with stdenv.lib; { + meta = with lib; { description = "Decrypt your LUKS partition using a FIDO2 compatible authenticator"; homepage = "https://github.com/shimunn/fido2luks"; license = licenses.gpl3; diff --git a/pkgs/tools/security/fierce/default.nix b/pkgs/tools/security/fierce/default.nix index 13146c3373e7..3d6472cbb44f 100644 --- a/pkgs/tools/security/fierce/default.nix +++ b/pkgs/tools/security/fierce/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python3 }: +{ lib, stdenv, fetchFromGitHub, python3 }: python3.pkgs.buildPythonApplication rec { pname = "fierce"; @@ -21,7 +21,7 @@ python3.pkgs.buildPythonApplication rec { doCheck = false; pythonImportsCheck = [ "fierce" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/mschwager/fierce"; description = "DNS reconnaissance tool for locating non-contiguous IP space"; license = licenses.gpl3Plus; diff --git a/pkgs/tools/security/fprintd/default.nix b/pkgs/tools/security/fprintd/default.nix index b14aff386aba..368f49d944d2 100644 --- a/pkgs/tools/security/fprintd/default.nix +++ b/pkgs/tools/security/fprintd/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitLab , fetchpatch , pkgconfig @@ -106,7 +106,7 @@ stdenv.mkDerivation rec { patchShebangs po/check-translations.sh ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://fprint.freedesktop.org/"; description = "D-Bus daemon that offers libfprint functionality over the D-Bus interprocess communication bus"; license = licenses.gpl2; diff --git a/pkgs/tools/security/fprot/default.nix b/pkgs/tools/security/fprot/default.nix index 12b47694db3c..22779327a9bf 100644 --- a/pkgs/tools/security/fprot/default.nix +++ b/pkgs/tools/security/fprot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation { @@ -32,7 +32,7 @@ stdenv.mkDerivation { cp doc/man/fpupdate.8 $out/share/man/man8 ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.f-prot.com"; description = "A popular proprietary antivirus program"; license = licenses.unfree; diff --git a/pkgs/tools/security/fwknop/default.nix b/pkgs/tools/security/fwknop/default.nix index 0f1c37aa7975..d3787f834d03 100644 --- a/pkgs/tools/security/fwknop/default.nix +++ b/pkgs/tools/security/fwknop/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook +{ lib, stdenv, fetchFromGitHub, autoreconfHook , libpcap, texinfo , iptables , gnupgSupport ? true, gnupg, gpgme # Increases dependencies! @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { "wknopddir = $out/etc/fwknop" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Single Packet Authorization (and Port Knocking) server/client"; longDescription = '' diff --git a/pkgs/tools/security/gau/default.nix b/pkgs/tools/security/gau/default.nix index cfbae951526c..98045a107e50 100644 --- a/pkgs/tools/security/gau/default.nix +++ b/pkgs/tools/security/gau/default.nix @@ -1,6 +1,6 @@ { buildGoModule , fetchFromGitHub -, stdenv +, lib, stdenv }: buildGoModule rec { @@ -16,7 +16,7 @@ buildGoModule rec { vendorSha256 = "17ag2wvaxv2dyx3yx3fvlf36ww4a44660pn4gvpbrwacsan9as5s"; - meta = with stdenv.lib; { + meta = with lib; { description = "Tool to fetch known URLs"; longDescription = '' getallurls (gau) fetches known URLs from various sources for any diff --git a/pkgs/tools/security/gen-oath-safe/default.nix b/pkgs/tools/security/gen-oath-safe/default.nix index 68536a519aa3..670b9631f219 100644 --- a/pkgs/tools/security/gen-oath-safe/default.nix +++ b/pkgs/tools/security/gen-oath-safe/default.nix @@ -1,4 +1,4 @@ -{ coreutils, fetchFromGitHub, file, libcaca, makeWrapper, python, openssl, qrencode, stdenv, yubikey-manager }: +{ coreutils, fetchFromGitHub, file, libcaca, makeWrapper, python, openssl, qrencode, lib, stdenv, yubikey-manager }: stdenv.mkDerivation rec { pname = "gen-oath-safe"; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/gen-oath-safe \ --prefix PATH : ${path} ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/mcepl/gen-oath-safe"; description = "Script for generating HOTP/TOTP keys (and QR code)"; platforms = platforms.unix; diff --git a/pkgs/tools/security/gencfsm/default.nix b/pkgs/tools/security/gencfsm/default.nix index e56c9e20fd43..a41c995ab407 100644 --- a/pkgs/tools/security/gencfsm/default.nix +++ b/pkgs/tools/security/gencfsm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoconf, automake, intltool, libtool, pkgconfig, encfs +{ lib, stdenv, fetchurl, autoconf, automake, intltool, libtool, pkgconfig, encfs , glib , gnome3, gtk3, libgnome-keyring, vala, wrapGAppsHook, xorg, gobject-introspection }: @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.libertyzero.com/GEncfsM/"; downloadPage = "https://launchpad.net/gencfsm/"; description = "EncFS manager and mounter with GNOME3 integration"; diff --git a/pkgs/tools/security/genpass/default.nix b/pkgs/tools/security/genpass/default.nix index 6818af194b3a..88d6604be837 100644 --- a/pkgs/tools/security/genpass/default.nix +++ b/pkgs/tools/security/genpass/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchgit , rustPlatform , CoreFoundation @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation libiconv Security ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A simple yet robust commandline random password generator"; homepage = "https://sr.ht/~cyplo/genpass/"; license = licenses.agpl3; diff --git a/pkgs/tools/security/ghidra/default.nix b/pkgs/tools/security/ghidra/default.nix index e11d028f1f8b..2e55b24f723d 100644 --- a/pkgs/tools/security/ghidra/default.nix +++ b/pkgs/tools/security/ghidra/default.nix @@ -1,6 +1,15 @@ -{ stdenv, fetchzip, lib, makeWrapper, autoPatchelfHook -, openjdk11, pam, makeDesktopItem, icoutils -}: let +{ stdenv +, fetchzip +, lib +, makeWrapper +, autoPatchelfHook +, openjdk11 +, pam +, makeDesktopItem +, icoutils +}: + +let pkg_path = "$out/lib/ghidra"; @@ -13,23 +22,22 @@ categories = "Development;"; }; - in stdenv.mkDerivation rec { pname = "ghidra"; - version = "9.2"; - versiondate = "20201113"; + version = "9.2.1"; + versiondate = "20201215"; src = fetchzip { url = "https://www.ghidra-sre.org/ghidra_${version}_PUBLIC_${versiondate}.zip"; - sha256 = "0lcvmbq04qkdsf0bz509frgw79bhyxyixkqg1k712p3576ng3nby"; + sha256 = "0rjzmx0nbv9flb666mk3w2dqliyfzjyc4ldjfmb5d29wpgnf9bnz"; }; nativeBuildInputs = [ makeWrapper - autoPatchelfHook icoutils - ]; + ] + ++ lib.optionals stdenv.isLinux [ autoPatchelfHook ]; buildInputs = [ stdenv.cc.cc.lib @@ -62,7 +70,7 @@ in stdenv.mkDerivation rec { meta = with lib; { description = "A software reverse engineering (SRE) suite of tools developed by NSA's Research Directorate in support of the Cybersecurity mission"; homepage = "https://ghidra-sre.org/"; - platforms = [ "x86_64-linux" ]; + platforms = [ "x86_64-linux" "x86_64-darwin" ]; license = licenses.asl20; maintainers = with maintainers; [ ck3d govanify ]; }; diff --git a/pkgs/tools/security/gnome-keysign/default.nix b/pkgs/tools/security/gnome-keysign/default.nix index 4b9a6fb0e321..db0e88a805ba 100644 --- a/pkgs/tools/security/gnome-keysign/default.nix +++ b/pkgs/tools/security/gnome-keysign/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitLab , fetchpatch , python3 @@ -73,7 +73,7 @@ python3.pkgs.buildPythonApplication rec { # bunch of linting doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "GTK/GNOME application to use GnuPG for signing other peoples’ keys"; homepage = "https://wiki.gnome.org/Apps/Keysign"; license = licenses.gpl3Plus; diff --git a/pkgs/tools/security/gnupg-pkcs11-scd/default.nix b/pkgs/tools/security/gnupg-pkcs11-scd/default.nix index 04af88e33352..eb0553ed0832 100644 --- a/pkgs/tools/security/gnupg-pkcs11-scd/default.nix +++ b/pkgs/tools/security/gnupg-pkcs11-scd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libgpgerror, libassuan, libgcrypt, pkcs11helper, +{ lib, stdenv, fetchurl, libgpgerror, libassuan, libgcrypt, pkcs11helper, pkgconfig, openssl }: stdenv.mkDerivation rec { @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { "--with-libgcrypt-prefix=${libgcrypt.dev}" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A smart-card daemon to enable the use of PKCS#11 tokens with GnuPG"; longDescription = '' gnupg-pkcs11 is a project to implement a BSD-licensed smart-card diff --git a/pkgs/tools/security/gnupg/1.nix b/pkgs/tools/security/gnupg/1.nix index 20ecd7c92fb2..66b05384c6be 100644 --- a/pkgs/tools/security/gnupg/1.nix +++ b/pkgs/tools/security/gnupg/1.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, readline, bzip2 }: +{ lib, stdenv, fetchurl, readline, bzip2 }: stdenv.mkDerivation rec { name = "gnupg-1.4.23"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://gnupg.org"; description = "Classic (1.4) release of the GNU Privacy Guard, a GPL OpenPGP implementation"; license = licenses.gpl3Plus; diff --git a/pkgs/tools/security/gnupg/22.nix b/pkgs/tools/security/gnupg/22.nix index 9acd64a2c86e..a6b0d43aae21 100644 --- a/pkgs/tools/security/gnupg/22.nix +++ b/pkgs/tools/security/gnupg/22.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchpatch, stdenv, pkgconfig, libgcrypt, libassuan, libksba +{ fetchurl, fetchpatch, lib, stdenv, pkgconfig, libgcrypt, libassuan, libksba , libgpgerror, libiconv, npth, gettext, texinfo, buildPackages # Each of the dependencies below are optional. @@ -16,11 +16,11 @@ assert guiSupport -> pinentry != null && enableMinimal == false; stdenv.mkDerivation rec { pname = "gnupg"; - version = "2.2.24"; + version = "2.2.27"; src = fetchurl { url = "mirror://gnupg/gnupg/${pname}-${version}.tar.bz2"; - sha256 = "0ilcp7m1dvwnri3i7q9wanf5pvhwxk7h106pd62g0d5fz80b944h"; + sha256 = "1693s2rp9sjwvdslj94n03wnb6rxysjy0dli0q1698af044h1ril"; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { ln -s -t $out/bin $out/libexec/* ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://gnupg.org"; description = "Modern (2.1) release of the GNU Privacy Guard, a GPL OpenPGP implementation"; license = licenses.gpl3Plus; diff --git a/pkgs/tools/security/gopass/default.nix b/pkgs/tools/security/gopass/default.nix index ff855cce240c..34abfe217573 100644 --- a/pkgs/tools/security/gopass/default.nix +++ b/pkgs/tools/security/gopass/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , makeWrapper , buildGoModule , fetchFromGitHub @@ -12,7 +12,7 @@ buildGoModule rec { pname = "gopass"; - version = "1.10.1"; + version = "1.11.0"; nativeBuildInputs = [ installShellFiles makeWrapper ]; @@ -20,10 +20,10 @@ buildGoModule rec { owner = "gopasspw"; repo = pname; rev = "v${version}"; - sha256 = "0dhh64mxfhk610wr7bpakzgmc4a4iyhfkkl3qhjp6a46g9iygana"; + sha256 = "0plg3hck6yqxcazjczx9m5palzz5h3qs5minzmmq8yzvfwi0shic"; }; - vendorSha256 = "07wv6yahx4yzr3h1x93x4r5rvw8wbfk836f04b4r9xjbnpq7lb2a"; + vendorSha256 = "1sycbcld5qyriqb771l52drxy4vhzm4nh9q5s6kn70nq1s2a3h7x"; doCheck = false; @@ -46,16 +46,13 @@ buildGoModule rec { ln -s $out/bin/gopass $out/bin/pass ''; - # --run to work around WONTFIX in https://github.com/gopasspw/gopass/issues/1662 postFixup = '' for bin in $out/bin/*; do - wrapProgram $bin \ - --prefix PATH : "${wrapperPath}" \ - --run 'rm -f "''${XDG_CONFIG_HOME:-~/.config}/gopass/gpg-binary.loc"' + wrapProgram $bin --prefix PATH : "${wrapperPath}" done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "The slightly more awesome Standard Unix Password Manager for Teams. Written in Go"; homepage = "https://www.gopass.pw/"; license = licenses.mit; diff --git a/pkgs/tools/security/gospider/default.nix b/pkgs/tools/security/gospider/default.nix index 7211c65d536b..ef3184a0422f 100644 --- a/pkgs/tools/security/gospider/default.nix +++ b/pkgs/tools/security/gospider/default.nix @@ -1,6 +1,6 @@ { buildGoModule , fetchFromGitHub -, stdenv +, lib, stdenv }: buildGoModule rec { @@ -10,7 +10,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "jaeles-project"; repo = pname; - rev = "${version}"; + rev = version; sha256 = "03gl8y2047iwa6bhmayyds3li21wy3sw1x4hpp9zgqgi95039q86"; }; @@ -19,7 +19,7 @@ buildGoModule rec { # tests require internet access and API keys doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Fast web spider written in Go"; longDescription = '' GoSpider is a fast web crawler that parses sitemap.xml and robots.txt file. diff --git a/pkgs/tools/security/gpgstats/default.nix b/pkgs/tools/security/gpgstats/default.nix index 80153b857c4f..c9a178cff42d 100644 --- a/pkgs/tools/security/gpgstats/default.nix +++ b/pkgs/tools/security/gpgstats/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, gpgme }: +{ lib, stdenv, fetchurl, ncurses, gpgme }: stdenv.mkDerivation rec { pname = "gpgstats"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = stdenv.lib.optionalString (!stdenv.is64bit) "-D_FILE_OFFSET_BITS=64 -DLARGEFILE_SOURCE=1"; - meta = with stdenv.lib; { + meta = with lib; { description = "Calculates statistics on the keys in your gpg key-ring"; longDescription = '' GPGstats calculates statistics on the keys in your key-ring. diff --git a/pkgs/tools/security/grype/default.nix b/pkgs/tools/security/grype/default.nix new file mode 100644 index 000000000000..495302139855 --- /dev/null +++ b/pkgs/tools/security/grype/default.nix @@ -0,0 +1,35 @@ +{ buildGoModule +, docker +, fetchFromGitHub +, lib, stdenv +}: + +buildGoModule rec { + pname = "grype"; + version = "0.6.1"; + + src = fetchFromGitHub { + owner = "anchore"; + repo = pname; + rev = "v${version}"; + sha256 = "0schq11vckvdj538mnkdzhxl452nrssqrfapab9qc44yxdi1wf8k"; + }; + + vendorSha256 = "0lna7zhsj3wnw83nv0dp93aj869pplb51gqzrkka7vnqp0rjcw50"; + + propagatedBuildInputs = [ docker ]; + + # tests require a running Docker instance + doCheck = false; + + meta = with lib; { + description = "Vulnerability scanner for container images and filesystems"; + longDescription = '' + As a vulnerability scanner is grype abale to scan the contents of a container + image or filesystem to find known vulnerabilities. + ''; + homepage = "https://github.com/anchore/grype"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/tools/security/haka/default.nix b/pkgs/tools/security/haka/default.nix index 9468ee2843bd..bc57849dcd5e 100644 --- a/pkgs/tools/security/haka/default.nix +++ b/pkgs/tools/security/haka/default.nix @@ -21,9 +21,8 @@ stdenv.mkDerivation { sed -i 's,/etc,'$out'/etc,' doc/user/tool_suite_haka.rst ''; - buildInputs = [ cmake swig wireshark check rsync libpcap gawk libedit pcre ]; - - enableParallelBuilding = true; + nativeBuildInputs = [ cmake ]; + buildInputs = [ swig wireshark check rsync libpcap gawk libedit pcre ]; meta = { description = "A collection of tools that allows capturing TCP/IP packets and filtering them based on Lua policy files"; diff --git a/pkgs/tools/security/hakrawler/default.nix b/pkgs/tools/security/hakrawler/default.nix new file mode 100644 index 000000000000..fc5ee32bcbab --- /dev/null +++ b/pkgs/tools/security/hakrawler/default.nix @@ -0,0 +1,30 @@ +{ buildGoModule +, fetchFromGitHub +, lib +}: + +buildGoModule rec { + pname = "hakrawler"; + version = "20201224-${lib.strings.substring 0 7 rev}"; + rev = "e39a514d0e179d33362ee244c017fb65cc2c12a5"; + + src = fetchFromGitHub { + owner = "hakluke"; + repo = "hakrawler"; + inherit rev; + sha256 = "0wpqfbpgnr94q5n7i4zh806k8n0phyg0ncnz43hqh4bbdh7l1y8a"; + }; + + vendorSha256 = "18zs2l77ds0a3wxfqcd91h269g0agnwhginrx3j6gj30dbfls8a1"; + + meta = with lib; { + description = "Web crawler for the discovery of endpoints and assets"; + homepage = "https://github.com/hakluke/hakrawler"; + longDescription = '' + Simple, fast web crawler designed for easy, quick discovery of endpoints + and assets within a web application. + ''; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/tools/security/hash_extender/default.nix b/pkgs/tools/security/hash_extender/default.nix index dc8ea8b2c9b4..5baeb71ce899 100644 --- a/pkgs/tools/security/hash_extender/default.nix +++ b/pkgs/tools/security/hash_extender/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, openssl }: +{ lib, stdenv, fetchFromGitHub, openssl }: stdenv.mkDerivation { pname = "hash_extender"; @@ -21,7 +21,7 @@ stdenv.mkDerivation { cp hash_extender $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Tool to automate hash length extension attacks"; homepage = "https://github.com/iagox86/hash_extender"; license = licenses.bsd3; diff --git a/pkgs/tools/security/hashcash/default.nix b/pkgs/tools/security/hashcash/default.nix index bb8fba33e1d4..b13425b72055 100644 --- a/pkgs/tools/security/hashcash/default.nix +++ b/pkgs/tools/security/hashcash/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl }: +{ lib, stdenv, fetchurl, openssl }: stdenv.mkDerivation rec { pname = "hashcash"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { "DOC_INSTALL_PATH=${placeholder "out"}/share/doc/hashcash-$(version)" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Proof-of-work algorithm used as spam and denial-of-service counter measure"; homepage = "http://hashcash.org"; license = licenses.gpl2; diff --git a/pkgs/tools/security/hashcat-utils/default.nix b/pkgs/tools/security/hashcat-utils/default.nix index 7dcfff038a8d..8b91a53db013 100644 --- a/pkgs/tools/security/hashcat-utils/default.nix +++ b/pkgs/tools/security/hashcat-utils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "hashcat-utils"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Small utilities that are useful in advanced password cracking"; homepage = "https://github.com/hashcat/hashcat-utils"; license = licenses.mit; diff --git a/pkgs/tools/security/hashcat/default.nix b/pkgs/tools/security/hashcat/default.nix index b156cda99ac7..20b5aed39320 100644 --- a/pkgs/tools/security/hashcat/default.nix +++ b/pkgs/tools/security/hashcat/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , makeWrapper , opencl-headers @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/hashcat --prefix LD_LIBRARY_PATH : ${ocl-icd}/lib ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Fast password cracker"; homepage = "https://hashcat.net/hashcat/"; license = licenses.mit; diff --git a/pkgs/tools/security/hashdeep/default.nix b/pkgs/tools/security/hashdeep/default.nix index 4ad656462b14..2f0a40dfc5e2 100644 --- a/pkgs/tools/security/hashdeep/default.nix +++ b/pkgs/tools/security/hashdeep/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook }: let version = "4.4"; in stdenv.mkDerivation { @@ -13,7 +13,7 @@ in stdenv.mkDerivation { nativeBuildInputs = [ autoreconfHook ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A set of cross-platform tools to compute hashes"; homepage = "https://github.com/jessek/hashdeep"; license = licenses.gpl2; diff --git a/pkgs/tools/security/hcxdumptool/default.nix b/pkgs/tools/security/hcxdumptool/default.nix index afc08d88a590..082ebac7f6f9 100644 --- a/pkgs/tools/security/hcxdumptool/default.nix +++ b/pkgs/tools/security/hcxdumptool/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { installFlags = [ "PREFIX=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/ZerBea/hcxdumptool"; description = "Small tool to capture packets from wlan devices"; license = licenses.mit; diff --git a/pkgs/tools/security/hcxtools/default.nix b/pkgs/tools/security/hcxtools/default.nix index a81c1ef75cf0..a1ba32b35ed7 100644 --- a/pkgs/tools/security/hcxtools/default.nix +++ b/pkgs/tools/security/hcxtools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, curl, openssl, zlib }: +{ lib, stdenv, fetchFromGitHub, curl, openssl, zlib }: stdenv.mkDerivation rec { pname = "hcxtools"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { "PREFIX=${placeholder "out"}" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Tools for capturing wlan traffic and conversion to hashcat and John the Ripper formats"; homepage = "https://github.com/ZerBea/hcxtools"; license = licenses.mit; diff --git a/pkgs/tools/security/hologram/default.nix b/pkgs/tools/security/hologram/default.nix index 9a8722ac2639..6ec4d7776e1f 100644 --- a/pkgs/tools/security/hologram/default.nix +++ b/pkgs/tools/security/hologram/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "hologram-2018-03-19"; @@ -17,7 +17,7 @@ buildGoPackage rec { sed -i 's|cacheTimeout != 3600|cacheTimeout != 0|' cmd/hologram-server/main.go ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/AdRoll/hologram/"; description = "Easy, painless AWS credentials on developer laptops"; maintainers = with maintainers; [ nand0p ]; diff --git a/pkgs/tools/security/httpx/default.nix b/pkgs/tools/security/httpx/default.nix index c7d83075e9da..7135baab3759 100644 --- a/pkgs/tools/security/httpx/default.nix +++ b/pkgs/tools/security/httpx/default.nix @@ -1,6 +1,6 @@ { buildGoModule , fetchFromGitHub -, stdenv +, lib, stdenv }: buildGoModule rec { @@ -16,7 +16,7 @@ buildGoModule rec { vendorSha256 = "0fg93vhwpx113fpw8qg4ram4bdh6a8x3a36pr1c962s4vhrabwy2"; - meta = with stdenv.lib; { + meta = with lib; { description = "Fast and multi-purpose HTTP toolkit"; longDescription = '' httpx is a fast and multi-purpose HTTP toolkit allow to run multiple diff --git a/pkgs/tools/security/ifdnfc/default.nix b/pkgs/tools/security/ifdnfc/default.nix index bab6527f4153..648774c58674 100644 --- a/pkgs/tools/security/ifdnfc/default.nix +++ b/pkgs/tools/security/ifdnfc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub , pkgconfig +{ lib, stdenv, fetchFromGitHub , pkgconfig , pcsclite , autoreconfHook , libnfc @@ -20,7 +20,7 @@ stdenv.mkDerivation { configureFlags = [ "--prefix=$(out)" ]; makeFlags = [ "DESTDIR=/" "usbdropdir=$(out)/pcsc/drivers" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "PC/SC IFD Handler based on libnfc"; longDescription = '' libnfc Interface Plugin to be used in services.pcscd.plugins. diff --git a/pkgs/tools/security/ipscan/default.nix b/pkgs/tools/security/ipscan/default.nix index 4963f5774875..8440b0b6ec98 100644 --- a/pkgs/tools/security/ipscan/default.nix +++ b/pkgs/tools/security/ipscan/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jdk, jre, swt, makeWrapper, xorg, dpkg }: +{ lib, stdenv, fetchurl, jdk, jre, swt, makeWrapper, xorg, dpkg }: stdenv.mkDerivation rec { pname = "ipscan"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { cp usr/share/pixmaps/ipscan.png $out/share/pixmaps/ipscan.png ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Fast and friendly network scanner"; homepage = "https://angryip.org"; license = licenses.gpl2; diff --git a/pkgs/tools/security/jadx/default.nix b/pkgs/tools/security/jadx/default.nix index 770062736bf1..02533f7f6f5f 100644 --- a/pkgs/tools/security/jadx/default.nix +++ b/pkgs/tools/security/jadx/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gradle, jdk, makeWrapper, perl }: +{ lib, stdenv, fetchFromGitHub, gradle, jdk, makeWrapper, perl }: let pname = "jadx"; @@ -90,7 +90,7 @@ in stdenv.mkDerivation { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Dex to Java decompiler"; longDescription = '' Command line and GUI tools for produce Java source code from Android Dex diff --git a/pkgs/tools/security/jd-gui/default.nix b/pkgs/tools/security/jd-gui/default.nix index 91c092922f04..046abed36f0c 100644 --- a/pkgs/tools/security/jd-gui/default.nix +++ b/pkgs/tools/security/jd-gui/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, jre, jdk, gradle_5, makeDesktopItem, copyDesktopItems, perl, writeText, runtimeShell }: +{ lib, stdenv, fetchFromGitHub, jre, jdk, gradle_5, makeDesktopItem, copyDesktopItems, perl, writeText, runtimeShell }: let pname = "jd-gui"; @@ -99,7 +99,7 @@ in stdenv.mkDerivation rec { desktopItems = [ desktopItem ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Fast Java Decompiler with powerful GUI"; homepage = "https://java-decompiler.github.io/"; license = licenses.gpl3; diff --git a/pkgs/tools/security/jwt-cli/default.nix b/pkgs/tools/security/jwt-cli/default.nix index 728ea0a92da5..b607cabf916e 100644 --- a/pkgs/tools/security/jwt-cli/default.nix +++ b/pkgs/tools/security/jwt-cli/default.nix @@ -1,24 +1,24 @@ -{ stdenv, fetchFromGitHub, rustPlatform, Security, fetchpatch }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, Security, fetchpatch }: rustPlatform.buildRustPackage rec { pname = "jwt-cli"; - version = "3.2.1"; + version = "3.3.0"; src = fetchFromGitHub { owner = "mike-engel"; repo = pname; rev = version; - sha256 = "07mnkr7hi29fyyyn7llb30p4ndiqz4gf1lnhm44qm09alaxmfvws"; + sha256 = "09zi55ffkhsckvqj84xnxn9bgfkrj9wnzqbh9hfsxzbk4xy7fc2h"; }; - cargoSha256 = "0jkzy7ssg9v9phhlldq6s4rfs3sn17y2r1k0jr10g9j15lzixa04"; + cargoSha256 = "1k13pw202fr5mvd0ys39n3dxwcl3sd01j6izfb28k06b6pav3wc8"; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; doInstallCheck = true; installCheckPhase = "$out/bin/jwt --version"; - meta = with stdenv.lib; { + meta = with lib; { description = "Super fast CLI tool to decode and encode JWTs"; homepage = "https://github.com/mike-engel/jwt-cli"; license = with licenses; [ mit ]; diff --git a/pkgs/tools/security/kbs2/default.nix b/pkgs/tools/security/kbs2/default.nix index a13e7214cbbd..e7b1c95126a6 100644 --- a/pkgs/tools/security/kbs2/default.nix +++ b/pkgs/tools/security/kbs2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, rustPlatform, fetchFromGitHub, installShellFiles, python3, libxcb, AppKit }: +{ lib, stdenv, rustPlatform, fetchFromGitHub, installShellFiles, python3, libxcb, AppKit }: rustPlatform.buildRustPackage rec { pname = "kbs2"; @@ -36,7 +36,7 @@ rustPlatform.buildRustPackage rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A secret manager backed by age"; homepage = "https://github.com/woodruffw/kbs2"; changelog = "https://github.com/woodruffw/kbs2/blob/v${version}/CHANGELOG.md"; diff --git a/pkgs/tools/security/keybase/default.nix b/pkgs/tools/security/keybase/default.nix index ddc83ce0ce62..ba9649f36ab9 100644 --- a/pkgs/tools/security/keybase/default.nix +++ b/pkgs/tools/security/keybase/default.nix @@ -31,7 +31,7 @@ buildGoPackage rec { buildInputs = stdenv.lib.optionals stdenv.isDarwin [ AVFoundation AudioToolbox ImageIO CoreMedia Foundation CoreGraphics MediaToolbox ]; buildFlags = [ "-tags production" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.keybase.io/"; description = "The Keybase official command-line utility and service"; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/tools/security/keybase/gui.nix b/pkgs/tools/security/keybase/gui.nix index 13a1fed2e308..54be692b007b 100644 --- a/pkgs/tools/security/keybase/gui.nix +++ b/pkgs/tools/security/keybase/gui.nix @@ -105,7 +105,7 @@ stdenv.mkDerivation rec { --replace run_keybase $out/bin/keybase-gui ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.keybase.io/"; description = "The Keybase official GUI"; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/tools/security/keybase/kbfs.nix b/pkgs/tools/security/keybase/kbfs.nix index e9284e7230fb..6916d6b99bd8 100644 --- a/pkgs/tools/security/keybase/kbfs.nix +++ b/pkgs/tools/security/keybase/kbfs.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, keybase }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub, keybase }: buildGoPackage { pname = "kbfs"; @@ -12,7 +12,7 @@ buildGoPackage { buildFlags = [ "-tags production" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://keybase.io/docs/kbfs"; description = "The Keybase filesystem"; platforms = platforms.unix; diff --git a/pkgs/tools/security/knockknock/default.nix b/pkgs/tools/security/knockknock/default.nix index 9478bb4ca237..7a00f183f15d 100644 --- a/pkgs/tools/security/knockknock/default.nix +++ b/pkgs/tools/security/knockknock/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python2Packages, hping }: +{ lib, stdenv, fetchFromGitHub, python2Packages, hping }: let rev = "bf14bbff"; in python2Packages.buildPythonApplication rec { @@ -23,7 +23,7 @@ in python2Packages.buildPythonApplication rec { substituteInPlace knockknock.py --replace 'existsInPath("hping3")' '"${hping}/bin/hping3"' ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Simple, secure port knocking daemon and client written in Python"; homepage = "http://www.thoughtcrime.org/software/knockknock/"; license = licenses.gpl3; diff --git a/pkgs/tools/security/kpcli/default.nix b/pkgs/tools/security/kpcli/default.nix index 12e2bb03d38d..a0dd8c7fc8b6 100644 --- a/pkgs/tools/security/kpcli/default.nix +++ b/pkgs/tools/security/kpcli/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, perl, perlPackages }: +{ lib, stdenv, fetchurl, makeWrapper, perl, perlPackages }: stdenv.mkDerivation rec { version = "3.6"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ''; - meta = with stdenv.lib; { + meta = with lib; { description = "KeePass Command Line Interface"; longDescription = '' KeePass Command Line Interface (CLI) / interactive shell. diff --git a/pkgs/tools/security/lastpass-cli/default.nix b/pkgs/tools/security/lastpass-cli/default.nix index 37da20225205..7ec902bcb99b 100644 --- a/pkgs/tools/security/lastpass-cli/default.nix +++ b/pkgs/tools/security/lastpass-cli/default.nix @@ -18,8 +18,6 @@ stdenv.mkDerivation rec { bash-completion curl openssl libxml2 libxslt ]; - enableParallelBuilding = true; - installTargets = [ "install" "install-doc" ]; postInstall = '' diff --git a/pkgs/tools/security/ldeep/default.nix b/pkgs/tools/security/ldeep/default.nix new file mode 100644 index 000000000000..855ffc6fdba1 --- /dev/null +++ b/pkgs/tools/security/ldeep/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonApplication +, fetchPypi +, commandparse +, dnspython +, ldap3 +, termcolor +, tqdm +}: + +buildPythonApplication rec { + pname = "ldeep"; + version = "1.0.9"; + + src = fetchPypi { + inherit pname version; + sha256 = "0n38idkn9hy31m5xkrc36dmw364d137c7phssvj76gr2gqsrqjy3"; + }; + + propagatedBuildInputs = [ + commandparse + dnspython + ldap3 + termcolor + tqdm + ]; + + # no tests are present + doCheck = false; + pythonImportsCheck = [ "ldeep" ]; + + meta = with lib; { + description = "In-depth LDAP enumeration utility"; + homepage = "https://github.com/franc-pentest/ldeep"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/tools/security/lesspass-cli/default.nix b/pkgs/tools/security/lesspass-cli/default.nix index 5bf7358fa76a..20473d1003e4 100644 --- a/pkgs/tools/security/lesspass-cli/default.nix +++ b/pkgs/tools/security/lesspass-cli/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python3, fetchFromGitHub }: +{ lib, stdenv, python3, fetchFromGitHub }: let inherit (python3.pkgs) buildPythonApplication pytest mock pexpect; @@ -30,7 +30,7 @@ buildPythonApplication rec { pytest tests ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Stateless password manager"; homepage = "https://lesspass.com"; maintainers = with maintainers; [ jasoncarr ]; diff --git a/pkgs/tools/security/libacr38u/default.nix b/pkgs/tools/security/libacr38u/default.nix index b56c15af3d62..126cfedd1576 100644 --- a/pkgs/tools/security/libacr38u/default.nix +++ b/pkgs/tools/security/libacr38u/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, pcsclite , libusb-compat-0_1 }: +{ lib, stdenv, fetchurl, pkgconfig, pcsclite , libusb-compat-0_1 }: stdenv.mkDerivation { version = "1.7.11"; @@ -18,7 +18,7 @@ stdenv.mkDerivation { makeFlagsArray=(usbdropdir="$out/pcsc/drivers"); ''; - meta = with stdenv.lib; { + meta = with lib; { description = "ACR38U smartcard reader driver for pcsclite"; longDescription = '' A PC/SC IFD handler implementation for the ACS ACR38U diff --git a/pkgs/tools/security/libmodsecurity/default.nix b/pkgs/tools/security/libmodsecurity/default.nix index 01e9a3847920..5735263206ec 100644 --- a/pkgs/tools/security/libmodsecurity/default.nix +++ b/pkgs/tools/security/libmodsecurity/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig , doxygen, perl, valgrind , curl, geoip, libxml2, lmdb, lua, pcre, yajl }: @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = '' ModSecurity v3 library component. ''; diff --git a/pkgs/tools/security/logkeys/default.nix b/pkgs/tools/security/logkeys/default.nix index f3ea25d71601..7cd6b5fd194b 100644 --- a/pkgs/tools/security/logkeys/default.nix +++ b/pkgs/tools/security/logkeys/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, which, procps, kbd }: +{ lib, stdenv, fetchFromGitHub, autoconf, automake, which, procps, kbd }: stdenv.mkDerivation { pname = "logkeys"; @@ -21,7 +21,7 @@ stdenv.mkDerivation { preConfigure = "./autogen.sh"; - meta = with stdenv.lib; { + meta = with lib; { description = "A GNU/Linux keylogger that works!"; license = licenses.gpl3; homepage = "https://github.com/kernc/logkeys"; diff --git a/pkgs/tools/security/lynis/default.nix b/pkgs/tools/security/lynis/default.nix index 9bbbc455b9b3..6533c9e96fdf 100644 --- a/pkgs/tools/security/lynis/default.nix +++ b/pkgs/tools/security/lynis/default.nix @@ -1,4 +1,4 @@ -{ stdenv, makeWrapper, fetchFromGitHub, gawk, installShellFiles }: +{ lib, stdenv, makeWrapper, fetchFromGitHub, gawk, installShellFiles }: stdenv.mkDerivation rec { pname = "lynis"; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { extras/bash_completion.d/lynis ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Security auditing tool for Linux, macOS, and UNIX-based systems"; homepage = "https://cisofy.com/lynis/"; license = licenses.gpl3; diff --git a/pkgs/tools/security/masscan/default.nix b/pkgs/tools/security/masscan/default.nix index 297d13ef9f95..0f45edcff6cf 100644 --- a/pkgs/tools/security/masscan/default.nix +++ b/pkgs/tools/security/masscan/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchFromGitHub, makeWrapper, libpcap }: +{ lib, stdenv, fetchFromGitHub, makeWrapper, libpcap }: stdenv.mkDerivation rec { pname = "masscan"; - version = "1.0.5"; + version = "1.3.0"; src = fetchFromGitHub { owner = "robertdavidgraham"; repo = "masscan"; rev = version; - sha256 = "0q0c7bsf0pbl8napry1qyg0gl4pd8wn872h4mz9b56dx4rx90vqg"; + sha256 = "04nlnficybgxa16kq9fwrrfjsbyiaps4mikfqgdr206fkqk9i05y"; }; nativeBuildInputs = [ makeWrapper ]; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/masscan --prefix LD_LIBRARY_PATH : "${libpcap}/lib" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Fast scan of the Internet"; homepage = "https://github.com/robertdavidgraham/masscan"; license = licenses.agpl3; diff --git a/pkgs/tools/security/medusa/default.nix b/pkgs/tools/security/medusa/default.nix index bc18f165be73..43a30aad8255 100644 --- a/pkgs/tools/security/medusa/default.nix +++ b/pkgs/tools/security/medusa/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkg-config, freerdp, openssl, libssh2 }: +{ lib, stdenv, fetchFromGitHub, pkg-config, freerdp, openssl, libssh2 }: stdenv.mkDerivation rec { pname = "medusa-unstable"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ freerdp openssl libssh2 ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/jmk-foofus/medusa"; description = "A speedy, parallel, and modular, login brute-forcer"; license = licenses.gpl2; diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix index a2a0a28bbff6..1260584a3a7a 100644 --- a/pkgs/tools/security/metasploit/default.nix +++ b/pkgs/tools/security/metasploit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, makeWrapper, ruby, bundlerEnv }: +{ lib, stdenv, fetchFromGitHub, makeWrapper, ruby, bundlerEnv }: let env = bundlerEnv { @@ -39,7 +39,7 @@ in stdenv.mkDerivation rec { # run with: nix-shell maintainers/scripts/update.nix --argstr path metasploit passthru.updateScript = ./update.sh; - meta = with stdenv.lib; { + meta = with lib; { description = "Metasploit Framework - a collection of exploits"; homepage = "https://github.com/rapid7/metasploit-framework/wiki"; platforms = platforms.unix; diff --git a/pkgs/tools/security/mfcuk/default.nix b/pkgs/tools/security/mfcuk/default.nix index 59908f2a9ce5..006e89871c77 100644 --- a/pkgs/tools/security/mfcuk/default.nix +++ b/pkgs/tools/security/mfcuk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libnfc }: +{ lib, stdenv, fetchurl, pkgconfig, libnfc }: stdenv.mkDerivation { pname = "mfcuk"; @@ -12,7 +12,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libnfc ]; - meta = with stdenv.lib; { + meta = with lib; { description = "MiFare Classic Universal toolKit"; license = licenses.gpl2; homepage = "https://github.com/nfc-tools/mfcuk"; diff --git a/pkgs/tools/security/mfoc/default.nix b/pkgs/tools/security/mfoc/default.nix index fb622ad82496..1d2478b6bae4 100644 --- a/pkgs/tools/security/mfoc/default.nix +++ b/pkgs/tools/security/mfoc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pkgconfig, libnfc }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pkgconfig, libnfc }: stdenv.mkDerivation rec { pname = "mfoc"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ libnfc ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Mifare Classic Offline Cracker"; license = licenses.gpl2; homepage = "https://github.com/nfc-tools/mfoc"; diff --git a/pkgs/tools/security/minisign/default.nix b/pkgs/tools/security/minisign/default.nix index b67b65b0cf8b..1fb1d6893a9f 100644 --- a/pkgs/tools/security/minisign/default.nix +++ b/pkgs/tools/security/minisign/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkg-config, libsodium }: +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, libsodium }: stdenv.mkDerivation rec { pname = "minisign"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ libsodium ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A simple tool for signing files and verifying signatures"; longDescription = '' minisign uses public key cryptography to help facilitate secure (but not diff --git a/pkgs/tools/security/mkpasswd/default.nix b/pkgs/tools/security/mkpasswd/default.nix index b88852966ee1..e001239f3136 100644 --- a/pkgs/tools/security/mkpasswd/default.nix +++ b/pkgs/tools/security/mkpasswd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, whois, perl }: +{ lib, stdenv, whois, perl }: stdenv.mkDerivation { name = "mkpasswd-${whois.version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { buildPhase = "make mkpasswd"; installPhase = "make install-mkpasswd"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://packages.qa.debian.org/w/whois.html"; description = "Overfeatured front-end to crypt, from the Debian whois package"; license = licenses.gpl2; diff --git a/pkgs/tools/security/mktemp/default.nix b/pkgs/tools/security/mktemp/default.nix index 0732adecc45b..dc3f2a8904bc 100644 --- a/pkgs/tools/security/mktemp/default.nix +++ b/pkgs/tools/security/mktemp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, groff }: +{ lib, stdenv, fetchurl, groff }: stdenv.mkDerivation { name = "mktemp-1.7"; @@ -16,7 +16,7 @@ stdenv.mkDerivation { sha256 = "0x969152znxxjbj7387xb38waslr4yv6bnj5jmhb4rpqxphvk54f"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Simple tool to make temporary file handling in shells scripts safe and simple"; homepage = "https://www.mktemp.org"; license = licenses.isc; diff --git a/pkgs/tools/security/monkeysphere/default.nix b/pkgs/tools/security/monkeysphere/default.nix index 4b1f75698871..e5dca7721ac7 100644 --- a/pkgs/tools/security/monkeysphere/default.nix +++ b/pkgs/tools/security/monkeysphere/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper +{ lib, stdenv, fetchurl, makeWrapper , perl, libassuan, libgcrypt , perlPackages, lockfileProgs, gnupg, coreutils # For the tests: @@ -84,7 +84,7 @@ in stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://web.monkeysphere.info/"; description = "Leverage the OpenPGP web of trust for SSH and TLS authentication"; longDescription = '' diff --git a/pkgs/tools/security/monsoon/default.nix b/pkgs/tools/security/monsoon/default.nix new file mode 100644 index 000000000000..c2a5aa1debf9 --- /dev/null +++ b/pkgs/tools/security/monsoon/default.nix @@ -0,0 +1,32 @@ +{ buildGoModule +, fetchFromGitHub +, stdenv +}: + +buildGoModule rec { + pname = "monsoon"; + version = "0.6.0"; + + src = fetchFromGitHub { + owner = "RedTeamPentesting"; + repo = "monsoon"; + rev = "v${version}"; + sha256 = "01c84s11m645mqaa2vdnbsj0kb842arqjhicgjv0ahb7qdw65zz4"; + }; + + vendorSha256 = "1g84az07hv8w0jha2yl4f5jm0p9nkbawgw9l7cpmn8ckbfa54l7q"; + + # tests fails on darwin + doCheck = !stdenv.isDarwin; + + meta = with stdenv.lib; { + description = "Fast HTTP enumerator"; + longDescription = '' + A fast HTTP enumerator that allows you to execute a large number of HTTP + requests, filter the responses and display them in real-time. + ''; + homepage = "https://github.com/RedTeamPentesting/monsoon"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/tools/security/mpw/default.nix b/pkgs/tools/security/mpw/default.nix index 9d25daf29a69..3973ed51343f 100644 --- a/pkgs/tools/security/mpw/default.nix +++ b/pkgs/tools/security/mpw/default.nix @@ -1,4 +1,4 @@ -{ stdenv, cmake, fetchFromGitLab +{ lib, stdenv, cmake, fetchFromGitLab , json_c, libsodium, libxml2, ncurses }: let @@ -53,7 +53,7 @@ in stdenv.mkDerivation rec { runHook postCheck ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A stateless password management solution"; homepage = "https://masterpasswordapp.com/"; license = licenses.gpl3; diff --git a/pkgs/tools/security/munge/default.nix b/pkgs/tools/security/munge/default.nix index ee1858ad2845..0462db8859c9 100644 --- a/pkgs/tools/security/munge/default.nix +++ b/pkgs/tools/security/munge/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, gawk, gnused, libgcrypt, zlib, bzip2 }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, gawk, gnused, libgcrypt, zlib, bzip2 }: stdenv.mkDerivation rec { name = "munge-0.5.14"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { "--localstatedir=/var" ]; - meta = with stdenv.lib; { + meta = with lib; { description = '' An authentication service for creating and validating credentials ''; diff --git a/pkgs/tools/security/nasty/default.nix b/pkgs/tools/security/nasty/default.nix index 7f423860100b..b3b19c9268bf 100644 --- a/pkgs/tools/security/nasty/default.nix +++ b/pkgs/tools/security/nasty/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gpgme }: +{ lib, stdenv, fetchurl, gpgme }: stdenv.mkDerivation rec { pname = "nasty"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { cp nasty $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Recover the passphrase of your PGP or GPG-key"; longDescription = '' Nasty is a program that helps you to recover the passphrase of your PGP or GPG-key diff --git a/pkgs/tools/security/ncrack/default.nix b/pkgs/tools/security/ncrack/default.nix index e377d9748645..e1504eb12b4c 100644 --- a/pkgs/tools/security/ncrack/default.nix +++ b/pkgs/tools/security/ncrack/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, openssl, zlib }: +{ lib, stdenv, fetchFromGitHub, openssl, zlib }: stdenv.mkDerivation rec { pname = "ncrack"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ openssl zlib ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Network authentication tool"; homepage = "https://nmap.org/ncrack/"; license = licenses.gpl2Only; diff --git a/pkgs/tools/security/neopg/default.nix b/pkgs/tools/security/neopg/default.nix index 8c0d31853ff9..93c12c158288 100644 --- a/pkgs/tools/security/neopg/default.nix +++ b/pkgs/tools/security/neopg/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , cmake , sqlite @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$(pwd)/3rdparty/googletest/googletest:$(pwd)/neopg ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://neopg.io/"; description = "Modern replacement for GnuPG 2"; license = licenses.gpl3; diff --git a/pkgs/tools/security/nitrokey-app/default.nix b/pkgs/tools/security/nitrokey-app/default.nix index a4936d763b6c..1da54526a614 100644 --- a/pkgs/tools/security/nitrokey-app/default.nix +++ b/pkgs/tools/security/nitrokey-app/default.nix @@ -1,4 +1,4 @@ -{ stdenv, bash-completion, cmake, fetchFromGitHub, hidapi, libusb1, pkgconfig +{ lib, stdenv, bash-completion, cmake, fetchFromGitHub, hidapi, libusb1, pkgconfig , qtbase, qttranslations, qtsvg, wrapQtAppsHook }: stdenv.mkDerivation rec { @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ]; cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Provides extra functionality for the Nitrokey Pro and Storage"; longDescription = '' The nitrokey-app provides a QT system tray widget with wich you can diff --git a/pkgs/tools/security/nmap/qt.nix b/pkgs/tools/security/nmap/qt.nix index 216186daa5be..39026c400d04 100644 --- a/pkgs/tools/security/nmap/qt.nix +++ b/pkgs/tools/security/nmap/qt.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , cmake , pkgconfig @@ -25,8 +25,6 @@ stdenv.mkDerivation rec { buildInputs = [ qtbase qtscript qtwebengine ]; - enableParallelBuilding = true; - postPatch = '' substituteInPlace src/platform/digmanager.cpp \ --replace '"dig"' '"${dnsutils}/bin/dig"' @@ -53,7 +51,7 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Qt frontend for nmap"; license = licenses.gpl2; maintainers = with maintainers; [ peterhoeg ]; diff --git a/pkgs/tools/security/notary/default.nix b/pkgs/tools/security/notary/default.nix index 020f37c836ba..fa3db0c3623c 100644 --- a/pkgs/tools/security/notary/default.nix +++ b/pkgs/tools/security/notary/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildGoPackage, libtool }: +{ lib, stdenv, fetchFromGitHub, buildGoPackage, libtool }: buildGoPackage rec { pname = "notary"; @@ -35,7 +35,7 @@ buildGoPackage rec { make test PKGS=github.com/theupdateframework/notary/cmd/notary ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A project that allows anyone to have trust over arbitrary collections of data"; longDescription = '' The Notary project comprises a server and a client for running and diff --git a/pkgs/tools/security/nsjail/default.nix b/pkgs/tools/security/nsjail/default.nix index 4522d0e897af..deab1b929c94 100644 --- a/pkgs/tools/security/nsjail/default.nix +++ b/pkgs/tools/security/nsjail/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoconf, bison, flex, libtool, pkgconfig, which +{ lib, stdenv, fetchFromGitHub, autoconf, bison, flex, libtool, pkgconfig, which , libnl, protobuf, protobufc, shadow }: @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { install nsjail.1 $out/share/man/man1/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A light-weight process isolation tool, making use of Linux namespaces and seccomp-bpf syscall filters"; homepage = "http://nsjail.com/"; license = licenses.asl20; diff --git a/pkgs/tools/security/nuclei/default.nix b/pkgs/tools/security/nuclei/default.nix index 22013352a38d..7e9d3d52e56b 100644 --- a/pkgs/tools/security/nuclei/default.nix +++ b/pkgs/tools/security/nuclei/default.nix @@ -1,6 +1,6 @@ { buildGoModule , fetchFromGitHub -, stdenv +, lib, stdenv }: buildGoModule rec { @@ -20,7 +20,7 @@ buildGoModule rec { mv v2/* . ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Tool for configurable targeted scanning"; longDescription = '' Nuclei is used to send requests across targets based on a template diff --git a/pkgs/tools/security/nwipe/default.nix b/pkgs/tools/security/nwipe/default.nix index c72ada867614..53d8abc61007 100644 --- a/pkgs/tools/security/nwipe/default.nix +++ b/pkgs/tools/security/nwipe/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ncurses, parted, automake, autoconf, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, ncurses, parted, automake, autoconf, pkgconfig }: stdenv.mkDerivation rec { version = "0.28"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ automake autoconf pkgconfig ]; buildInputs = [ ncurses parted ]; preConfigure = "sh init.sh || :"; - meta = with stdenv.lib; { + meta = with lib; { description = "Securely erase disks"; homepage = "https://github.com/martijnvanbrummelen/nwipe"; license = licenses.gpl2; diff --git a/pkgs/tools/security/oath-toolkit/default.nix b/pkgs/tools/security/oath-toolkit/default.nix index 22327c6a38f0..5fb7fadbc5c4 100644 --- a/pkgs/tools/security/oath-toolkit/default.nix +++ b/pkgs/tools/security/oath-toolkit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, fetchpatch, pam, xmlsec, autoreconfHook, pkgconfig, libxml2, gtk-doc, perl, gengetopt, bison, help2man }: +{ lib, stdenv, fetchFromGitLab, fetchpatch, pam, xmlsec, autoreconfHook, pkgconfig, libxml2, gtk-doc, perl, gengetopt, bison, help2man }: let securityDependency = @@ -40,7 +40,7 @@ in stdenv.mkDerivation { touch ChangeLog ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Components for building one-time password authentication systems"; homepage = "https://www.nongnu.org/oath-toolkit/"; platforms = with platforms; linux ++ darwin; diff --git a/pkgs/tools/security/omapd/default.nix b/pkgs/tools/security/omapd/default.nix index 8ed23864ced5..7ce377e601a3 100644 --- a/pkgs/tools/security/omapd/default.nix +++ b/pkgs/tools/security/omapd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qt4, gdb, zlib }: +{ lib, stdenv, fetchurl, qt4, gdb, zlib }: stdenv.mkDerivation rec { pname = "omapd"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ln -s $out/usr/lib/omapd/plugins $out/bin/plugins ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://code.google.com/archive/p/omapd/"; description = "IF-MAP Server that implements the IF-MAP v1.1 and v2.0 specifications published by the Trusted Computing Group (TCG)"; license = licenses.gpl3; diff --git a/pkgs/tools/security/onesixtyone/default.nix b/pkgs/tools/security/onesixtyone/default.nix index 4eed52b07f0e..374d1322246b 100644 --- a/pkgs/tools/security/onesixtyone/default.nix +++ b/pkgs/tools/security/onesixtyone/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "onesixtyone"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { install -D onesixtyone $out/bin/onesixtyone ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Fast SNMP Scanner"; homepage = "https://github.com/trailofbits/onesixtyone"; license = licenses.gpl2Plus; diff --git a/pkgs/tools/security/onioncircuits/default.nix b/pkgs/tools/security/onioncircuits/default.nix index 92888a8de2a1..bdaf087004a1 100644 --- a/pkgs/tools/security/onioncircuits/default.nix +++ b/pkgs/tools/security/onioncircuits/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, python3, intltool, gtk3, gobject-introspection, gnome3 }: +{ lib, stdenv, fetchgit, python3, intltool, gtk3, gobject-introspection, gnome3 }: python3.pkgs.buildPythonApplication rec { pname = "onioncircuits"; @@ -20,7 +20,7 @@ python3.pkgs.buildPythonApplication rec { --prefix XDG_DATA_DIRS : "$out/share:${gnome3.adwaita-icon-theme}/share" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://tails.boum.org"; description = "GTK application to display Tor circuits and streams"; license = licenses.gpl3; diff --git a/pkgs/tools/security/open-ecard/default.nix b/pkgs/tools/security/open-ecard/default.nix index bac036e67900..0dfdba804c09 100644 --- a/pkgs/tools/security/open-ecard/default.nix +++ b/pkgs/tools/security/open-ecard/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jre, pcsclite, makeDesktopItem, makeWrapper }: +{ lib, stdenv, fetchurl, jre, pcsclite, makeDesktopItem, makeWrapper }: let version = "1.2.4"; @@ -53,7 +53,7 @@ in stdenv.mkDerivation rec { --suffix LD_LIBRARY_PATH ':' ${stdenv.lib.getLib pcsclite}/lib ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Client side implementation of the eCard-API-Framework (BSI TR-03112) and related international standards, such as ISO/IEC 24727"; homepage = "https://www.openecard.org/"; diff --git a/pkgs/tools/security/opencryptoki/default.nix b/pkgs/tools/security/opencryptoki/default.nix index 1eb4aab66b47..0825708f71fd 100644 --- a/pkgs/tools/security/opencryptoki/default.nix +++ b/pkgs/tools/security/opencryptoki/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, openssl, trousers, autoreconfHook, libtool, bison, flex }: +{ lib, stdenv, fetchFromGitHub, openssl, trousers, autoreconfHook, libtool, bison, flex }: stdenv.mkDerivation rec { pname = "opencryptoki"; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "PKCS#11 implementation for Linux"; homepage = "https://github.com/opencryptoki/opencryptoki"; license = licenses.cpl10; diff --git a/pkgs/tools/security/opensc/default.nix b/pkgs/tools/security/opensc/default.nix index 735f7558e7a8..f623e3a2f6ff 100644 --- a/pkgs/tools/security/opensc/default.nix +++ b/pkgs/tools/security/opensc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, zlib, readline, openssl +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, zlib, readline, openssl , libiconv, pcsclite, libassuan, libXt , docbook_xsl, libxslt, docbook_xml_dtd_412 , Carbon, PCSC, buildPackages @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { "completiondir=$(out)/etc" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Set of libraries and utilities to access smart cards"; homepage = "https://github.com/OpenSC/OpenSC/wiki"; license = licenses.lgpl21Plus; diff --git a/pkgs/tools/security/pamtester/default.nix b/pkgs/tools/security/pamtester/default.nix index a1055dadc6ca..1944e5187d21 100644 --- a/pkgs/tools/security/pamtester/default.nix +++ b/pkgs/tools/security/pamtester/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pam }: +{ lib, stdenv, fetchurl, pam }: stdenv.mkDerivation rec { name = "pamtester-0.1.2"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ pam ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Utility program to test the PAM facility"; homepage = "http://pamtester.sourceforge.net/"; license = licenses.bsd3; diff --git a/pkgs/tools/security/paperkey/default.nix b/pkgs/tools/security/paperkey/default.nix index dc3582b7369f..766b570a074e 100644 --- a/pkgs/tools/security/paperkey/default.nix +++ b/pkgs/tools/security/paperkey/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv }: +{ fetchurl, lib, stdenv }: stdenv.mkDerivation rec { pname = "paperkey"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Store OpenPGP or GnuPG on paper"; longDescription = '' A reasonable way to achieve a long term backup of OpenPGP (GnuPG, PGP, etc) diff --git a/pkgs/tools/security/pass/default.nix b/pkgs/tools/security/pass/default.nix index 354437a9bd56..e2b163445ce2 100644 --- a/pkgs/tools/security/pass/default.nix +++ b/pkgs/tools/security/pass/default.nix @@ -149,7 +149,7 @@ stdenv.mkDerivation rec { withExtensions = env; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Stores, retrieves, generates, and synchronizes passwords securely"; homepage = "https://www.passwordstore.org/"; license = licenses.gpl2Plus; diff --git a/pkgs/tools/security/pass/extensions/audit/default.nix b/pkgs/tools/security/pass/extensions/audit/default.nix index ec0f23ddc383..415a4b9e79d1 100644 --- a/pkgs/tools/security/pass/extensions/audit/default.nix +++ b/pkgs/tools/security/pass/extensions/audit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pass, fetchFromGitHub, pythonPackages, makeWrapper, gnupg }: +{ lib, stdenv, pass, fetchFromGitHub, pythonPackages, makeWrapper, gnupg }: let pythonEnv = pythonPackages.python.withPackages (p: [ p.requests p.setuptools p.zxcvbn ]); @@ -43,7 +43,7 @@ in stdenv.mkDerivation rec { --prefix PYTHONPATH : "$out/lib/${pythonEnv.libPrefix}/site-packages" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Pass extension for auditing your password repository."; homepage = "https://github.com/roddhjav/pass-audit"; license = licenses.gpl3Plus; diff --git a/pkgs/tools/security/pass/extensions/checkup.nix b/pkgs/tools/security/pass/extensions/checkup.nix index 83a1d7a8872d..bafaabba843b 100644 --- a/pkgs/tools/security/pass/extensions/checkup.nix +++ b/pkgs/tools/security/pass/extensions/checkup.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , curl, findutils, gnugrep, gnused }: stdenv.mkDerivation rec { @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { install -D -m755 checkup.bash $out/lib/password-store/extensions/checkup.bash ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A pass extension to check against the Have I been pwned API to see if your passwords are publicly leaked or not"; homepage = "https://github.com/etu/pass-checkup"; license = licenses.gpl3; diff --git a/pkgs/tools/security/pass/extensions/genphrase.nix b/pkgs/tools/security/pass/extensions/genphrase.nix index d45e35d9bbc0..dff64d7f1855 100644 --- a/pkgs/tools/security/pass/extensions/genphrase.nix +++ b/pkgs/tools/security/pass/extensions/genphrase.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "pass-genphrase"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { --replace '$EXTENSIONS' "$out/lib/password-store/extensions/" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Pass extension that generates memorable passwords"; homepage = "https://github.com/congma/pass-genphrase"; license = licenses.gpl3; diff --git a/pkgs/tools/security/pass/extensions/import.nix b/pkgs/tools/security/pass/extensions/import.nix index 885dd05110f3..0fd14901d0db 100644 --- a/pkgs/tools/security/pass/extensions/import.nix +++ b/pkgs/tools/security/pass/extensions/import.nix @@ -1,4 +1,4 @@ -{ stdenv, pass, fetchFromGitHub, pythonPackages, makeWrapper, fetchpatch }: +{ lib, stdenv, pass, fetchFromGitHub, pythonPackages, makeWrapper, fetchpatch }: let pythonEnv = pythonPackages.python.withPackages (p: [ @@ -39,7 +39,7 @@ in stdenv.mkDerivation rec { --prefix PYTHONPATH : "$out/${pythonPackages.python.sitePackages}" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Pass extension for importing data from existing password managers"; homepage = "https://github.com/roddhjav/pass-import"; license = licenses.gpl3Plus; diff --git a/pkgs/tools/security/pass/extensions/otp.nix b/pkgs/tools/security/pass/extensions/otp.nix index 835e693c2c5c..8d9b350543dc 100644 --- a/pkgs/tools/security/pass/extensions/otp.nix +++ b/pkgs/tools/security/pass/extensions/otp.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, oathToolkit }: +{ lib, stdenv, fetchFromGitHub, oathToolkit }: stdenv.mkDerivation rec { pname = "pass-otp"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { "BASHCOMPDIR=$(out)/share/bash-completion/completions" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A pass extension for managing one-time-password (OTP) tokens"; homepage = "https://github.com/tadfisher/pass-otp"; license = licenses.gpl3; diff --git a/pkgs/tools/security/pass/extensions/tomb.nix b/pkgs/tools/security/pass/extensions/tomb.nix index 43c74a9029b3..74f8694f224c 100644 --- a/pkgs/tools/security/pass/extensions/tomb.nix +++ b/pkgs/tools/security/pass/extensions/tomb.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, tomb }: +{ lib, stdenv, fetchFromGitHub, tomb }: stdenv.mkDerivation rec { pname = "pass-tomb"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { --replace 'TOMB="''${PASSWORD_STORE_TOMB:-tomb}"' 'TOMB="''${PASSWORD_STORE_TOMB:-${tomb}/bin/tomb}"' ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Pass extension that keeps the password store encrypted inside a tomb"; homepage = "https://github.com/roddhjav/pass-tomb"; license = licenses.gpl3Plus; diff --git a/pkgs/tools/security/pass/extensions/update.nix b/pkgs/tools/security/pass/extensions/update.nix index c364c341bda5..50a4c49b90d1 100644 --- a/pkgs/tools/security/pass/extensions/update.nix +++ b/pkgs/tools/security/pass/extensions/update.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "pass-update"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { installFlags = [ "PREFIX=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Pass extension that provides an easy flow for updating passwords"; homepage = "https://github.com/roddhjav/pass-update"; license = licenses.gpl3Plus; diff --git a/pkgs/tools/security/passff-host/default.nix b/pkgs/tools/security/passff-host/default.nix index 0bdb04b76129..fb348800f5a1 100644 --- a/pkgs/tools/security/passff-host/default.nix +++ b/pkgs/tools/security/passff-host/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python3, pass }: +{ lib, stdenv, fetchFromGitHub, python3, pass }: stdenv.mkDerivation rec { pname = "passff-host"; @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Host app for the WebExtension PassFF"; homepage = "https://github.com/passff/passff-host"; license = licenses.gpl2; diff --git a/pkgs/tools/security/pbis/default.nix b/pkgs/tools/security/pbis/default.nix index 176ef7f7616b..25e945a082d2 100644 --- a/pkgs/tools/security/pbis/default.nix +++ b/pkgs/tools/security/pbis/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, libtool, perl, flex, bison, curl, +{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, perl, flex, bison, curl, pam, popt, libiconv, libuuid, openssl_1_0_2, cyrus_sasl, sqlite, tdb, libxml2 }: stdenv.mkDerivation rec { @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { ''; outputs = [ "out" "sys" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "BeyondTrust AD Bridge Open simplifies the process of joining non-Microsoft hosts to Active Directory domains"; homepage = "https://github.com/BeyondTrust/pbis-open"; license = with licenses; [ gpl2 lgpl21 ]; diff --git a/pkgs/tools/security/pcsc-cyberjack/default.nix b/pkgs/tools/security/pcsc-cyberjack/default.nix index 7ae062547aa2..65446e6fc44c 100644 --- a/pkgs/tools/security/pcsc-cyberjack/default.nix +++ b/pkgs/tools/security/pcsc-cyberjack/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, pkgconfig, libusb1, pcsclite }: +{ lib, stdenv, fetchurl, autoreconfHook, pkgconfig, libusb1, pcsclite }: let version = "3.99.5"; @@ -23,6 +23,8 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; + NIX_CFLAGS_COMPILE = "-Wno-error=narrowing"; + configureFlags = [ "--with-usbdropdir=${placeholder "out"}/pcsc/drivers" "--bindir=${placeholder "tools"}/bin" @@ -30,7 +32,7 @@ in stdenv.mkDerivation rec { postInstall = "make -C tools/cjflash install"; - meta = with stdenv.lib; { + meta = with lib; { description = "REINER SCT cyberJack USB chipcard reader user space driver"; homepage = "https://www.reiner-sct.com/"; license = licenses.gpl2Plus; diff --git a/pkgs/tools/security/pcsc-scm-scl011/default.nix b/pkgs/tools/security/pcsc-scm-scl011/default.nix index 02e38bbe249a..a9697718e3cf 100644 --- a/pkgs/tools/security/pcsc-scm-scl011/default.nix +++ b/pkgs/tools/security/pcsc-scm-scl011/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, libusb-compat-0_1 }: +{ lib, stdenv, fetchurl, unzip, libusb-compat-0_1 }: let arch = if stdenv.hostPlatform.system == "i686-linux" then "32" @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { $out/pcsc/drivers/SCLGENERIC.bundle/Contents/Linux/libSCLGENERIC.so.${version}; ''; - meta = with stdenv.lib; { + meta = with lib; { description = "SCM Microsystems SCL011 chipcard reader user space driver"; homepage = "https://www.scm-pc-card.de/index.php?lang=en&page=product&function=show_product&product_id=630"; downloadPage = "https://support.identiv.com/scl010-scl011/"; diff --git a/pkgs/tools/security/pcsclite/default.nix b/pkgs/tools/security/pcsclite/default.nix index 98a3e8797fbf..8a4ae0894403 100644 --- a/pkgs/tools/security/pcsclite/default.nix +++ b/pkgs/tools/security/pcsclite/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, udev, dbus, perl, python3 +{ lib, stdenv, fetchurl, pkgconfig, udev, dbus, perl, python3 , IOKit ? null }: stdenv.mkDerivation rec { @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { buildInputs = [ python3 ] ++ stdenv.lib.optionals stdenv.isLinux [ udev dbus ] ++ stdenv.lib.optionals stdenv.isDarwin [ IOKit ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Middleware to access a smart card using SCard API (PC/SC)"; homepage = "https://pcsclite.apdu.fr/"; license = licenses.bsd3; diff --git a/pkgs/tools/security/pgpdump/default.nix b/pkgs/tools/security/pgpdump/default.nix index cd421224fa63..89ee6a9eab2d 100644 --- a/pkgs/tools/security/pgpdump/default.nix +++ b/pkgs/tools/security/pgpdump/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , supportCompressedPackets ? true, zlib, bzip2 }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = stdenv.lib.optionals supportCompressedPackets [ zlib bzip2 ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A PGP packet visualizer"; longDescription = '' pgpdump is a PGP packet visualizer which displays the packet format of diff --git a/pkgs/tools/security/phrasendrescher/default.nix b/pkgs/tools/security/phrasendrescher/default.nix index f62288c062b8..7e8c87f6e82c 100644 --- a/pkgs/tools/security/phrasendrescher/default.nix +++ b/pkgs/tools/security/phrasendrescher/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl, libssh2, gpgme }: +{ lib, stdenv, fetchurl, openssl, libssh2, gpgme }: stdenv.mkDerivation rec { pname = "phrasendrescher"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-plugins" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A modular and multi processing pass phrase cracking tool"; homepage = "https://leidecker.info/projects/phrasendrescher/index.shtml"; license = licenses.gpl2Plus; diff --git a/pkgs/tools/security/pinentry/default.nix b/pkgs/tools/security/pinentry/default.nix index a72e8f9f5b2a..cac245bb256e 100644 --- a/pkgs/tools/security/pinentry/default.nix +++ b/pkgs/tools/security/pinentry/default.nix @@ -89,7 +89,7 @@ pinentryMkDerivation rec { passthru = { flavors = enabledFlavors; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://gnupg.org/aegypten2/"; description = "GnuPG’s interface to passphrase input"; license = licenses.gpl2Plus; diff --git a/pkgs/tools/security/proxmark3/default.nix b/pkgs/tools/security/proxmark3/default.nix index 304ba041b46d..4cc831eda391 100644 --- a/pkgs/tools/security/proxmark3/default.nix +++ b/pkgs/tools/security/proxmark3/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, ncurses, readline, pcsclite, qt5 +{ lib, stdenv, fetchFromGitHub, pkgconfig, ncurses, readline, pcsclite, qt5 , gcc-arm-embedded }: let @@ -33,7 +33,7 @@ let install -Dt $out/firmware bootrom/obj/bootrom.elf armsrc/obj/fullimage.elf ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Client for proxmark3, powerful general purpose RFID tool"; homepage = "http://www.proxmark.org"; license = licenses.gpl2Plus; diff --git a/pkgs/tools/security/pyrit/default.nix b/pkgs/tools/security/pyrit/default.nix index 93ae86416e13..ead55036425f 100644 --- a/pkgs/tools/security/pyrit/default.nix +++ b/pkgs/tools/security/pyrit/default.nix @@ -32,7 +32,7 @@ python2Packages.buildPythonApplication rec { buildInputs = [ openssl zlib libpcap ]; propagatedBuildInputs = [ cpyrit_opencl ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/JPaulMora/Pyrit"; description = "GPGPU-driven WPA/WPA2-PSK key cracker"; license = licenses.gpl3; diff --git a/pkgs/tools/security/qdigidoc/default.nix b/pkgs/tools/security/qdigidoc/default.nix index fcbc166689e3..51ddad0634f6 100644 --- a/pkgs/tools/security/qdigidoc/default.nix +++ b/pkgs/tools/security/qdigidoc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, mkDerivation, fetchgit, fetchurl, cmake, darkhttpd, gettext, makeWrapper, pkgconfig +{ lib, stdenv, mkDerivation, fetchgit, fetchurl, cmake, darkhttpd, gettext, makeWrapper, pkgconfig , libdigidocpp, opensc, openldap, openssl, pcsclite, qtbase, qttranslations, qtsvg }: mkDerivation rec { @@ -40,7 +40,7 @@ mkDerivation rec { --prefix LD_LIBRARY_PATH : ${opensc}/lib/pkcs11/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Qt-based UI for signing and verifying DigiDoc documents"; homepage = "https://www.id.ee/"; license = licenses.lgpl21Plus; diff --git a/pkgs/tools/security/rage/default.nix b/pkgs/tools/security/rage/default.nix index 69ea8c0f9c2c..5cf38cb756d9 100644 --- a/pkgs/tools/security/rage/default.nix +++ b/pkgs/tools/security/rage/default.nix @@ -1,4 +1,4 @@ -{ stdenv, rustPlatform, fetchFromGitHub, installShellFiles +{ lib, stdenv, rustPlatform, fetchFromGitHub, installShellFiles , Foundation, Security }: rustPlatform.buildRustPackage rec { @@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec { installShellCompletion target/completions/*.{bash,fish,zsh} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A simple, secure and modern encryption tool with small explicit keys, no config options, and UNIX-style composability"; homepage = "https://github.com/str4d/rage"; changelog = "https://github.com/str4d/rage/releases/tag/v${version}"; diff --git a/pkgs/tools/security/rarcrack/default.nix b/pkgs/tools/security/rarcrack/default.nix index 9749d8251688..e5bbb7e8421d 100644 --- a/pkgs/tools/security/rarcrack/default.nix +++ b/pkgs/tools/security/rarcrack/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, libxml2, file, p7zip, unrar, unzip}: +{lib, stdenv, fetchFromGitHub, libxml2, file, p7zip, unrar, unzip}: stdenv.mkDerivation { pname = "rarcrack"; @@ -23,7 +23,7 @@ stdenv.mkDerivation { mkdir -p $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "This program can crack zip,7z and rar file passwords"; longDescription = '' If you forget your password for compressed archive (rar, 7z, zip), this program is the solution. diff --git a/pkgs/tools/security/rhash/default.nix b/pkgs/tools/security/rhash/default.nix index 394dd89484fe..f4cc65f5d8e7 100644 --- a/pkgs/tools/security/rhash/default.nix +++ b/pkgs/tools/security/rhash/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, which }: +{ lib, stdenv, fetchFromGitHub, which }: stdenv.mkDerivation rec { version = "1.4.0"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { installTargets = [ "install" "install-lib-shared" "install-lib-so-link" "install-lib-headers" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://rhash.sourceforge.net/"; description = "Console utility and library for computing and verifying hash sums of files"; license = licenses.bsd0; diff --git a/pkgs/tools/security/ripasso/cursive.nix b/pkgs/tools/security/ripasso/cursive.nix index 29229bff0028..24e114634645 100644 --- a/pkgs/tools/security/ripasso/cursive.nix +++ b/pkgs/tools/security/ripasso/cursive.nix @@ -29,7 +29,7 @@ buildRustPackage rec { rm $out/bin/ripasso-man ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A simple password manager written in Rust"; homepage = "https://github.com/cortex/ripasso"; license = licenses.gpl3; diff --git a/pkgs/tools/security/rustscan/default.nix b/pkgs/tools/security/rustscan/default.nix index 43b6a3a0afd7..3d84900f18e6 100644 --- a/pkgs/tools/security/rustscan/default.nix +++ b/pkgs/tools/security/rustscan/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform, nmap, Security }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, nmap, Security }: rustPlatform.buildRustPackage rec { pname = "rustscan"; @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { "--skip=run_python_script" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Faster Nmap Scanning with Rust"; homepage = "https://github.com/RustScan/RustScan"; license = licenses.gpl3Only; diff --git a/pkgs/tools/security/safe/default.nix b/pkgs/tools/security/safe/default.nix index 43d791e19dbe..2f0f4501fd2f 100644 --- a/pkgs/tools/security/safe/default.nix +++ b/pkgs/tools/security/safe/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildGoPackage , fetchFromGitHub }: @@ -22,7 +22,7 @@ buildGoPackage rec { buildFlagsArray+=("-ldflags" "-X main.Version=${version}") ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A Vault CLI"; homepage = "https://github.com/starkandwayne/safe"; license = licenses.mit; diff --git a/pkgs/tools/security/saml2aws/default.nix b/pkgs/tools/security/saml2aws/default.nix index 68721bbdebc1..2e617a8de8a5 100644 --- a/pkgs/tools/security/saml2aws/default.nix +++ b/pkgs/tools/security/saml2aws/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "saml2aws"; @@ -22,7 +22,7 @@ buildGoModule rec { -ldflags=-X main.Version=${version} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "CLI tool which enables you to login and retrieve AWS temporary credentials using a SAML IDP"; homepage = "https://github.com/Versent/saml2aws"; license = licenses.mit; diff --git a/pkgs/tools/security/sbsigntool/default.nix b/pkgs/tools/security/sbsigntool/default.nix index 1a42ddf8beca..36e75094c595 100644 --- a/pkgs/tools/security/sbsigntool/default.nix +++ b/pkgs/tools/security/sbsigntool/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchgit, autoconf, automake, pkgconfig, help2man , openssl, libuuid, gnu-efi, libbfd }: @@ -42,7 +42,7 @@ stdenv.mkDerivation { make install ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Tools for maintaining UEFI signature databases"; homepage = "http://jk.ozlabs.org/docs/sbkeysync-maintaing-uefi-key-databases"; maintainers = [ maintainers.tstrobel ]; diff --git a/pkgs/tools/security/scallion/default.nix b/pkgs/tools/security/scallion/default.nix index 1395b8e10617..91b92071fe79 100644 --- a/pkgs/tools/security/scallion/default.nix +++ b/pkgs/tools/security/scallion/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, makeWrapper, mono, openssl_1_0_2, ocl-icd }: +{ lib, stdenv, fetchFromGitHub, makeWrapper, mono, openssl_1_0_2, ocl-icd }: stdenv.mkDerivation rec { version = "2.1"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { --add-flags $out/share/scallion.exe ''; - meta = with stdenv.lib; { + meta = with lib; { description = "GPU-based tor hidden service name generator"; homepage = src.meta.homepage; license = licenses.mit; diff --git a/pkgs/tools/security/scrypt/default.nix b/pkgs/tools/security/scrypt/default.nix index e230b2ee4574..89ff50e0a8a0 100644 --- a/pkgs/tools/security/scrypt/default.nix +++ b/pkgs/tools/security/scrypt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl, util-linux, getconf }: +{ lib, stdenv, fetchurl, openssl, util-linux, getconf }: stdenv.mkDerivation rec { pname = "scrypt"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { checkTarget = "test"; checkInputs = [ util-linux ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Encryption utility"; homepage = "https://www.tarsnap.com/scrypt.html"; license = licenses.bsd2; diff --git a/pkgs/tools/security/secp256k1/default.nix b/pkgs/tools/security/secp256k1/default.nix index d3b43d6adf69..55b02d7a8c30 100644 --- a/pkgs/tools/security/secp256k1/default.nix +++ b/pkgs/tools/security/secp256k1/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, jdk +{ lib, stdenv, fetchFromGitHub, autoreconfHook, jdk # Enable ECDSA pubkey recovery module , enableRecovery ? true @@ -42,7 +42,7 @@ stdenv.mkDerivation { doCheck = true; checkPhase = "./tests"; - meta = with stdenv.lib; { + meta = with lib; { description = "Optimized C library for EC operations on curve secp256k1"; longDescription = '' Optimized C library for EC operations on curve secp256k1. Part of diff --git a/pkgs/tools/security/sedutil/default.nix b/pkgs/tools/security/sedutil/default.nix index 4877a8adfcef..6ed4a23af1dd 100644 --- a/pkgs/tools/security/sedutil/default.nix +++ b/pkgs/tools/security/sedutil/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { pname = "sedutil"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "DTA sedutil Self encrypting drive software"; homepage = "https://www.drivetrust.com"; license = licenses.gpl3; diff --git a/pkgs/tools/security/sequoia/default.nix b/pkgs/tools/security/sequoia/default.nix index 201b4c56f2b9..706c9edc481c 100644 --- a/pkgs/tools/security/sequoia/default.nix +++ b/pkgs/tools/security/sequoia/default.nix @@ -97,7 +97,7 @@ rustPlatform.buildRustPackage rec { checkPhase = null; installPhase = null; - meta = with stdenv.lib; { + meta = with lib; { description = "A cool new OpenPGP implementation"; homepage = "https://sequoia-pgp.org/"; license = licenses.gpl3; diff --git a/pkgs/tools/security/sha1collisiondetection/default.nix b/pkgs/tools/security/sha1collisiondetection/default.nix index 8c6a026a6124..07c9ed9b2408 100644 --- a/pkgs/tools/security/sha1collisiondetection/default.nix +++ b/pkgs/tools/security/sha1collisiondetection/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libtool, which }: +{ lib, stdenv, fetchFromGitHub, libtool, which }: stdenv.mkDerivation rec { pname = "sha1collisiondetection"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ libtool which ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Library and command line tool to detect SHA-1 collision"; longDescription = '' This library and command line tool were designed as near drop-in diff --git a/pkgs/tools/security/shc/default.nix b/pkgs/tools/security/shc/default.nix index 3705d2c7ed1a..f9bdf66ed860 100644 --- a/pkgs/tools/security/shc/default.nix +++ b/pkgs/tools/security/shc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "shc"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0bfn404plsssa14q89k9l3s5lxq3df0sny5lis4j2w75qrkqx694"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://neurobin.org/projects/softwares/unix/shc/"; description = "Shell Script Compiler"; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/security/signify/default.nix b/pkgs/tools/security/signify/default.nix index 3ec260a7c0c5..1b59db540a2b 100644 --- a/pkgs/tools/security/signify/default.nix +++ b/pkgs/tools/security/signify/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libbsd, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, libbsd, pkgconfig }: stdenv.mkDerivation rec { pname = "signify"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { export PREFIX=$out ''; - meta = with stdenv.lib; { + meta = with lib; { description = "OpenBSD signing tool"; longDescription = '' OpenBSDs signing tool, which uses the Ed25519 public key signature system diff --git a/pkgs/tools/security/signing-party/default.nix b/pkgs/tools/security/signing-party/default.nix index 17c65d28884e..c2a51f3bdf5d 100644 --- a/pkgs/tools/security/signing-party/default.nix +++ b/pkgs/tools/security/signing-party/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, autoconf, automake, makeWrapper +{ lib, stdenv, fetchFromGitLab, autoconf, automake, makeWrapper , python3, perl, perlPackages , libmd, gnupg, which, getopt, libpaper, nettools, qprint , sendmailPath ? "/run/wrappers/bin/sendmail" }: @@ -196,7 +196,7 @@ in stdenv.mkDerivation rec { ${with perlPackages; makePerlPath [ GD ]} ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://salsa.debian.org/signing-party-team/signing-party"; description = "A collection of several projects relating to OpenPGP"; longDescription = '' diff --git a/pkgs/tools/security/simple-tpm-pk11/default.nix b/pkgs/tools/security/simple-tpm-pk11/default.nix index 2a360b4321c5..4d5c020ad422 100644 --- a/pkgs/tools/security/simple-tpm-pk11/default.nix +++ b/pkgs/tools/security/simple-tpm-pk11/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, trousers, openssl, opencryptoki, autoreconfHook, libtool }: +{ lib, stdenv, fetchFromGitHub, trousers, openssl, opencryptoki, autoreconfHook, libtool }: stdenv.mkDerivation rec { pname = "simple-tpm-pk11"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Simple PKCS11 provider for TPM chips"; longDescription = '' A simple library for using the TPM chip to secure SSH keys. diff --git a/pkgs/tools/security/sn0int/default.nix b/pkgs/tools/security/sn0int/default.nix index 8b99649e0c9f..ef2f97cfa111 100644 --- a/pkgs/tools/security/sn0int/default.nix +++ b/pkgs/tools/security/sn0int/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "sn0int"; - version = "0.19.1"; + version = "0.20.0"; src = fetchFromGitHub { owner = "kpcyrd"; repo = pname; rev = "v${version}"; - sha256 = "10f1wblczxlww09f4dl8i9zzgpr14jj7s329wkvm7lafmwx3qrn5"; + sha256 = "1zjrbrkk7phv8s5qr0gj6fnssa31j3k3m8c55pdfmajh7ry7wwd1"; }; - cargoSha256 = "1v0q751ylsfpdjwsbl20pvn7g75w503jwjl5kn5kc8xq3g0lnp65"; + cargoSha256 = "1jvaavhjyalnh10vfhrdyqg1jnl8b4a3gnp8a31bgi3mb0v466k3"; nativeBuildInputs = [ pkgconfig ]; @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Semi-automatic OSINT framework and package manager"; homepage = "https://github.com/kpcyrd/sn0int"; - license = licenses.gpl3; + license = with licenses; [ gpl3Plus ]; maintainers = with maintainers; [ xrelkd ]; platforms = platforms.linux; }; diff --git a/pkgs/tools/security/snow/default.nix b/pkgs/tools/security/snow/default.nix index db52d853b7a3..6d264c09ade9 100644 --- a/pkgs/tools/security/snow/default.nix +++ b/pkgs/tools/security/snow/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "snow"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { install -Dm755 snow -t $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Conceal messages in ASCII text by appending whitespace to the end of lines"; homepage = "http://www.darkside.com.au/snow/"; license = licenses.apsl20; diff --git a/pkgs/tools/security/softhsm/default.nix b/pkgs/tools/security/softhsm/default.nix index 61afb9082d0f..5ba0bd11f827 100644 --- a/pkgs/tools/security/softhsm/default.nix +++ b/pkgs/tools/security/softhsm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, botan2, libobjc, Security }: +{ lib, stdenv, fetchurl, botan2, libobjc, Security }: stdenv.mkDerivation rec { @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { postInstall = "rm -rf $out/var"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.opendnssec.org/softhsm"; description = "Cryptographic store accessible through a PKCS #11 interface"; longDescription = " diff --git a/pkgs/tools/security/sops/default.nix b/pkgs/tools/security/sops/default.nix index 7557fa6a6d38..9eddc308a4ff 100644 --- a/pkgs/tools/security/sops/default.nix +++ b/pkgs/tools/security/sops/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "sops"; @@ -15,7 +15,7 @@ buildGoModule rec { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/mozilla/sops"; description = "Mozilla sops (Secrets OPerationS) is an editor of encrypted files"; maintainers = [ maintainers.marsam ]; diff --git a/pkgs/tools/security/spectre-meltdown-checker/default.nix b/pkgs/tools/security/spectre-meltdown-checker/default.nix index b8f4eeea338f..53797ef98514 100644 --- a/pkgs/tools/security/spectre-meltdown-checker/default.nix +++ b/pkgs/tools/security/spectre-meltdown-checker/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, makeWrapper, coreutils, binutils-unwrapped }: +{ lib, stdenv, fetchFromGitHub, makeWrapper, coreutils, binutils-unwrapped }: stdenv.mkDerivation rec { pname = "spectre-meltdown-checker"; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Spectre & Meltdown vulnerability/mitigation checker for Linux"; homepage = "https://github.com/speed47/spectre-meltdown-checker"; license = licenses.gpl3; diff --git a/pkgs/tools/security/srm/default.nix b/pkgs/tools/security/srm/default.nix index 853ad4f280a2..587d7782e765 100644 --- a/pkgs/tools/security/srm/default.nix +++ b/pkgs/tools/security/srm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "10sjarhprs6s4zandndg720528rcnd4xk8dl48pjj7li1q9c30vm"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Delete files securely"; longDescription = '' srm (secure rm) is a command-line compatible rm(1) which diff --git a/pkgs/tools/security/sshguard/default.nix b/pkgs/tools/security/sshguard/default.nix index 6bae0fddc23d..88e726bc8635 100644 --- a/pkgs/tools/security/sshguard/default.nix +++ b/pkgs/tools/security/sshguard/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, yacc, flex}: +{ lib, stdenv, fetchurl, autoreconfHook, yacc, flex}: stdenv.mkDerivation rec { version = "2.4.1"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--sysconfdir=/etc" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Protects hosts from brute-force attacks"; longDescription = '' SSHGuard can read log messages from various input sources. Log messages are parsed, line-by-line, for recognized patterns. diff --git a/pkgs/tools/security/sshuttle/default.nix b/pkgs/tools/security/sshuttle/default.nix index 6f620904872d..4a24e4596972 100644 --- a/pkgs/tools/security/sshuttle/default.nix +++ b/pkgs/tools/security/sshuttle/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , python3Packages , makeWrapper , coreutils @@ -30,7 +30,7 @@ python3Packages.buildPythonApplication rec { --prefix PATH : "${stdenv.lib.makeBinPath runtimeDeps}" \ ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/sshuttle/sshuttle/"; description = "Transparent proxy server that works as a poor man's VPN"; longDescription = '' diff --git a/pkgs/tools/security/sslscan/default.nix b/pkgs/tools/security/sslscan/default.nix index 68efa7a17d1f..fcf9c4c1ac2f 100644 --- a/pkgs/tools/security/sslscan/default.nix +++ b/pkgs/tools/security/sslscan/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, openssl }: +{ lib, stdenv, fetchFromGitHub, openssl }: stdenv.mkDerivation rec { pname = "sslscan"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" "CC=cc" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Tests SSL/TLS services and discover supported cipher suites"; homepage = "https://github.com/rbsec/sslscan"; license = licenses.gpl3; diff --git a/pkgs/tools/security/steghide/default.nix b/pkgs/tools/security/steghide/default.nix index 5ac40e0a0474..cb2a0473cf15 100644 --- a/pkgs/tools/security/steghide/default.nix +++ b/pkgs/tools/security/steghide/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libjpeg, libmcrypt, zlib, libmhash, gettext, libtool}: +{ lib, stdenv, fetchurl, libjpeg, libmcrypt, zlib, libmhash, gettext, libtool}: stdenv.mkDerivation rec { buildInputs = [ libjpeg libmcrypt zlib libmhash gettext libtool ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { export AM_CXXFLAGS="$CXXFLAGS -std=c++0x" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://steghide.sourceforge.net/"; description = "Steganography program that is able to hide data in various kinds of image- and audio-files"; license = licenses.gpl2; diff --git a/pkgs/tools/security/stegseek/default.nix b/pkgs/tools/security/stegseek/default.nix new file mode 100644 index 000000000000..d2fb825b5296 --- /dev/null +++ b/pkgs/tools/security/stegseek/default.nix @@ -0,0 +1,44 @@ +{ lib, stdenv +, cmake +, fetchFromGitHub +, libjpeg +, libmcrypt +, libmhash +, libtool +, zlib +}: + +stdenv.mkDerivation rec { + pname = "stegseek"; + version = "0.5"; + + src = fetchFromGitHub { + owner = "RickdeJager"; + repo = pname; + rev = "v${version}"; + sha256 = "19hzr5533b607ihmjj71x682qjr45s75cqxh9zap21z16346ahqn"; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ + libjpeg + libmcrypt + libmhash + libtool + zlib + ]; + + doCheck = true; + + meta = with lib; { + description = "Tool to crack steganography"; + longDescription = '' + Stegseek is a lightning fast steghide cracker that can be + used to extract hidden data from files. + ''; + homepage = "https://github.com/RickdeJager/stegseek"; + license = with licenses; [ gpl2Only ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/tools/security/stoken/default.nix b/pkgs/tools/security/stoken/default.nix index 22dc5e476e7f..497d3816a767 100644 --- a/pkgs/tools/security/stoken/default.nix +++ b/pkgs/tools/security/stoken/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig +{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig , libxml2, nettle , withGTK3 ? true, gtk3 }: @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { libxml2 nettle ] ++ stdenv.lib.optional withGTK3 gtk3; - meta = with stdenv.lib; { + meta = with lib; { description = "Software Token for Linux/UNIX"; homepage = "https://github.com/cernekee/stoken"; license = licenses.lgpl21Plus; diff --git a/pkgs/tools/security/su-exec/default.nix b/pkgs/tools/security/su-exec/default.nix index 8ff33ee1ec91..0e26d2430cb1 100644 --- a/pkgs/tools/security/su-exec/default.nix +++ b/pkgs/tools/security/su-exec/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "su-exec"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { cp -a su-exec $out/bin/su-exec ''; - meta = with stdenv.lib; { + meta = with lib; { description = "switch user and group id and exec"; homepage = "https://github.com/ncopa/su-exec"; license = licenses.mit; diff --git a/pkgs/tools/security/subjs/default.nix b/pkgs/tools/security/subjs/default.nix new file mode 100644 index 000000000000..5b9a237d49cb --- /dev/null +++ b/pkgs/tools/security/subjs/default.nix @@ -0,0 +1,32 @@ +{ buildGoModule +, fetchFromGitHub +, lib, stdenv +}: + +buildGoModule rec { + pname = "subjs"; + version = "1.0.1"; + + src = fetchFromGitHub { + owner = "lc"; + repo = pname; + rev = "v${version}"; + sha256 = "01cip5rf35dnh3l325p03y6axyqdpf48ry4zcwiyd7hlfsglbk3j"; + }; + + vendorSha256 = "1y01k8pvv7y9zb15wbk068cvkx0g83484jak2dvcvghqcf5j1fr1"; + + buildFlagsArray = [ "-ldflags=-s -w -X main.AppVersion=${version}" ]; + + meta = with lib; { + description = "Fetcher for Javascript files"; + longDescription = '' + subjs fetches Javascript files from a list of URLs or subdomains. + Analyzing Javascript files can help you find undocumented endpoints, + secrets and more. + ''; + homepage = "https://github.com/lc/subjs"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/tools/security/sudolikeaboss/default.nix b/pkgs/tools/security/sudolikeaboss/default.nix index 639926578c7b..a13764638237 100644 --- a/pkgs/tools/security/sudolikeaboss/default.nix +++ b/pkgs/tools/security/sudolikeaboss/default.nix @@ -1,5 +1,5 @@ # This file was generated by go2nix, then modified by hand for Darwin support. -{ stdenv, buildGoPackage, fetchFromGitHub, darwin }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub, darwin }: buildGoPackage rec { pname = "sudolikeaboss-unstable"; @@ -21,7 +21,7 @@ buildGoPackage rec { Cocoa ]; - meta = with stdenv.lib; { + meta = with lib; { inherit version; inherit (src.meta) homepage; description = "Get 1password access from iterm2"; diff --git a/pkgs/tools/security/tboot/default.nix b/pkgs/tools/security/tboot/default.nix index 38f467fb441f..bf13fe7822e8 100644 --- a/pkgs/tools/security/tboot/default.nix +++ b/pkgs/tools/security/tboot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, trousers, openssl, zlib }: +{ lib, stdenv, fetchurl, trousers, openssl, zlib }: stdenv.mkDerivation rec { pname = "tboot"; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { installFlags = [ "DESTDIR=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A pre-kernel/VMM module that uses Intel(R) TXT to perform a measured and verified launch of an OS kernel/VMM"; homepage = "https://sourceforge.net/projects/tboot/"; license = licenses.bsd3; diff --git a/pkgs/tools/security/teler/default.nix b/pkgs/tools/security/teler/default.nix index 378663758591..1acb9e5609eb 100644 --- a/pkgs/tools/security/teler/default.nix +++ b/pkgs/tools/security/teler/default.nix @@ -1,6 +1,6 @@ { buildGoModule , fetchFromGitHub -, stdenv +, lib, stdenv }: buildGoModule rec { @@ -19,7 +19,7 @@ buildGoModule rec { # test require internet access doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Real-time HTTP Intrusion Detection"; longDescription = '' teler is an real-time intrusion detection and threat alert diff --git a/pkgs/tools/security/terrascan/default.nix b/pkgs/tools/security/terrascan/default.nix new file mode 100644 index 000000000000..fddd10da6180 --- /dev/null +++ b/pkgs/tools/security/terrascan/default.nix @@ -0,0 +1,33 @@ +{ buildGoModule +, fetchFromGitHub +, lib +}: + +buildGoModule rec { + pname = "terrascan"; + version = "1.2.0"; + + src = fetchFromGitHub { + owner = "accurics"; + repo = pname; + rev = "v${version}"; + sha256 = "1kjis0ylvmv1gvzp5qvi9a7x4611bjv8yx5mb6nkc0a8lscwb4c3"; + }; + + vendorSha256 = "0yfybzwjvnan4qf5w25k22iwh5hp9v8si93p4jv9bx25rw91swws"; + + # tests want to download a vulnerable Terraform project + doCheck = false; + + meta = with lib; { + description = "Detect compliance and security violations across Infrastructure"; + longDescription = '' + Detect compliance and security violations across Infrastructure as Code to + mitigate risk before provisioning cloud native infrastructure. It contains + 500+ polices and support for Terraform and Kubernetes. + ''; + homepage = "https://github.com/accurics/terrascan"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/tools/security/thc-hydra/default.nix b/pkgs/tools/security/thc-hydra/default.nix index f83d2675c6ac..81086e77483f 100644 --- a/pkgs/tools/security/thc-hydra/default.nix +++ b/pkgs/tools/security/thc-hydra/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { --add-flags --hydra-path --add-flags "$out/bin/hydra" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A very fast network logon cracker which support many different services"; homepage = "https://www.thc.org/thc-hydra/"; license = licenses.agpl3; diff --git a/pkgs/tools/security/thc-ipv6/default.nix b/pkgs/tools/security/thc-ipv6/default.nix index b8175ef6dbac..6e7f4fb2891a 100644 --- a/pkgs/tools/security/thc-ipv6/default.nix +++ b/pkgs/tools/security/thc-ipv6/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libpcap, openssl, libnetfilter_queue, libnfnetlink }: +{ lib, stdenv, fetchFromGitHub, libpcap, openssl, libnetfilter_queue, libnfnetlink }: stdenv.mkDerivation rec { pname = "thc-ipv6"; version = "3.8"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { "PREFIX=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "IPv6 attack toolkit"; homepage = "https://github.com/vanhauser-thc/thc-ipv6"; maintainers = with maintainers; [ ajs124 ]; diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix index 04bf598d132a..038f4040d31a 100644 --- a/pkgs/tools/security/tor/default.nix +++ b/pkgs/tools/security/tor/default.nix @@ -1,5 +1,6 @@ -{ stdenv, fetchurl, pkgconfig, libevent, openssl, zlib, torsocks +{ lib, stdenv, fetchurl, pkgconfig, libevent, openssl, zlib, torsocks , libseccomp, systemd, libcap, lzma, zstd, scrypt, nixosTests +, writeShellScript # for update.nix , writeScript @@ -12,7 +13,21 @@ , gnused , nix }: +let + tor-client-auth-gen = writeShellScript "tor-client-auth-gen" '' + PATH="${stdenv.lib.makeBinPath [coreutils gnugrep openssl]}" + pem="$(openssl genpkey -algorithm x25519)" + printf private_key=descriptor:x25519: + echo "$pem" | grep -v " PRIVATE KEY" | + base64 -d | tail --bytes=32 | base32 | tr -d = + + printf public_key=descriptor:x25519: + echo "$pem" | openssl pkey -in /dev/stdin -pubout | + grep -v " PUBLIC KEY" | + base64 -d | tail --bytes=32 | base32 | tr -d = + ''; +in stdenv.mkDerivation rec { pname = "tor"; version = "0.4.4.6"; @@ -52,6 +67,7 @@ stdenv.mkDerivation rec { mkdir -p $geoip/share/tor mv $out/share/tor/geoip{,6} $geoip/share/tor rm -rf $out/share/tor + ln -s ${tor-client-auth-gen} $out/bin/tor-client-auth-gen ''; passthru = { @@ -72,7 +88,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.torproject.org/"; repositories.git = "https://git.torproject.org/git/tor"; description = "Anonymizing overlay network"; diff --git a/pkgs/tools/security/tpm-luks/default.nix b/pkgs/tools/security/tpm-luks/default.nix index fc1931fa4ba2..25e28f158315 100644 --- a/pkgs/tools/security/tpm-luks/default.nix +++ b/pkgs/tools/security/tpm-luks/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, autoreconfHook, gawk, trousers, cryptsetup, openssl }: +{ lib, stdenv, fetchgit, autoreconfHook, gawk, trousers, cryptsetup, openssl }: stdenv.mkDerivation { pname = "tpm-luks"; @@ -25,7 +25,7 @@ stdenv.mkDerivation { rm -r $out/nix ''; - meta = with stdenv.lib; { + meta = with lib; { description = "LUKS key storage in TPM NVRAM"; homepage = "https://github.com/shpedoikal/tpm-luks/"; maintainers = [ maintainers.tstrobel ]; diff --git a/pkgs/tools/security/tpm-quote-tools/default.nix b/pkgs/tools/security/tpm-quote-tools/default.nix index a652867a0d09..94da17fabeca 100644 --- a/pkgs/tools/security/tpm-quote-tools/default.nix +++ b/pkgs/tools/security/tpm-quote-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, trousers, openssl }: +{ lib, stdenv, fetchurl, trousers, openssl }: stdenv.mkDerivation rec { pname = "tpm-quote-tools"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { $out/bin/tpm_mkaik ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A collection of programs that provide support for TPM based attestation using the TPM quote mechanism"; longDescription = '' The TPM Quote Tools is a collection of programs that provide support diff --git a/pkgs/tools/security/tpm-tools/default.nix b/pkgs/tools/security/tpm-tools/default.nix index 5e0b4e6d94f4..c0e2941323a6 100644 --- a/pkgs/tools/security/tpm-tools/default.nix +++ b/pkgs/tools/security/tpm-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, trousers, openssl, opencryptoki, perl }: +{ lib, stdenv, fetchurl, trousers, openssl, opencryptoki, perl }: let version = "1.3.9.1"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ perl ]; buildInputs = [ trousers openssl opencryptoki ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Management tools for TPM hardware"; longDescription = '' tpm-tools is an open-source package designed to enable user and diff --git a/pkgs/tools/security/trousers/default.nix b/pkgs/tools/security/trousers/default.nix index 2cc702cf6f2f..76a3443d0769 100644 --- a/pkgs/tools/security/trousers/default.nix +++ b/pkgs/tools/security/trousers/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl, pkgconfig }: +{ lib, stdenv, fetchurl, openssl, pkgconfig }: stdenv.mkDerivation rec { pname = "trousers"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = [ "-DALLOW_NON_TSS_CONFIG_FILE" ]; enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Trusted computing software stack"; homepage = "http://trousers.sourceforge.net/"; license = licenses.bsd3; diff --git a/pkgs/tools/security/urlhunter/default.nix b/pkgs/tools/security/urlhunter/default.nix new file mode 100644 index 000000000000..3364b622ad63 --- /dev/null +++ b/pkgs/tools/security/urlhunter/default.nix @@ -0,0 +1,29 @@ +{ buildGoModule +, fetchFromGitHub +, lib, stdenv +}: + +buildGoModule rec { + pname = "urlhunter"; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "utkusen"; + repo = pname; + rev = "v${version}"; + sha256 = "0ph0pwfd8bb5499bsx3bd8sqhn69y00zk32ayc3n61gpcc6rmvn7"; + }; + + vendorSha256 = "165kplaqigis0anafvzfqzwc3jjhsn2mwgf4phb4ck75n3yf85ys"; + + meta = with lib; { + description = "Recon tool that allows searching shortened URLs"; + longDescription = '' + urlhunter is a recon tool that allows searching on URLs that are + exposed via shortener services such as bit.ly and goo.gl. + ''; + homepage = "https://github.com/utkusen/urlhunter"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix index 4b460e74024b..3af00b9a22b3 100644 --- a/pkgs/tools/security/vault/default.nix +++ b/pkgs/tools/security/vault/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchFromGitHub, buildGoPackage, installShellFiles, nixosTests }: +{ lib, stdenv, fetchFromGitHub, buildGoPackage, installShellFiles, nixosTests }: buildGoPackage rec { pname = "vault"; - version = "1.6.0"; + version = "1.6.1"; src = fetchFromGitHub { owner = "hashicorp"; repo = "vault"; rev = "v${version}"; - sha256 = "13fasdiijxy87m33wfyd8gylyz556i0bdd7xp706ip2fcckrmz7a"; + sha256 = "1pgyyl2zgnr3wy4k8c5xsk2s5dpl97xdfq67lpfss7fz1bij8x47"; }; goPackagePath = "github.com/hashicorp/vault"; @@ -26,7 +26,7 @@ buildGoPackage rec { passthru.tests.vault = nixosTests.vault; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.vaultproject.io/"; description = "A tool for managing secrets"; changelog = "https://github.com/hashicorp/vault/blob/v${version}/CHANGELOG.md"; diff --git a/pkgs/tools/security/vault/vault-bin.nix b/pkgs/tools/security/vault/vault-bin.nix index 805afe89d31a..775bd8c6951e 100644 --- a/pkgs/tools/security/vault/vault-bin.nix +++ b/pkgs/tools/security/vault/vault-bin.nix @@ -1,26 +1,26 @@ -{ stdenv, fetchurl, unzip }: +{ lib, stdenv, fetchurl, unzip }: let - version = "1.6.0"; + version = "1.6.1"; sources = let base = "https://releases.hashicorp.com/vault/${version}"; in { x86_64-linux = fetchurl { url = "${base}/vault_${version}_linux_amd64.zip"; - sha256 = "0fay6bw31x9kxmc52sh5qp63nfkwji74fbnlx8pj3smz3qnqw143"; + sha256 = "1la2pylcj9y5gr7hr4aaa49427y3lgxi2phhl46pqmr7an62pkbm"; }; i686-linux = fetchurl { url = "${base}/vault_${version}_linux_386.zip"; - sha256 = "0bjks9lpgl39cq55c9cyc0glhmyxzs37a2an8ynzza94gv5mgcxa"; + sha256 = "1a2rhv5bpv43qp74a49msrwr7djzy86irsn73jl0xnkh0k6ijci1"; }; x86_64-darwin = fetchurl { url = "${base}/vault_${version}_darwin_amd64.zip"; - sha256 = "0hl1k35x78y0hi3y5xjnzby1ygisqjyvdak7s61m9f363nsr1shh"; + sha256 = "0snswwai2ya26crm3ksifrmbdnajr36v4vamh7g65plg6vzban9a"; }; aarch64-linux = fetchurl { url = "${base}/vault_${version}_linux_arm64.zip"; - sha256 = "018a5i14x6phhx1axvx0bvqn4ggsimfizs48xbmykgiyfmzkrwgz"; + sha256 = "0ix99da3xd4z200dgvpfc2h1sfx6l8cipichvfjlj39md45grs89"; }; }; @@ -40,11 +40,11 @@ in stdenv.mkDerivation { echo "complete -C $out/bin/vault vault" > $out/share/bash-completion/completions/vault ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.vaultproject.io"; description = "A tool for managing secrets, this binary includes the UI"; platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux" ]; license = licenses.mpl20; - maintainers = with maintainers; [ offline psyanticy mkaito ]; + maintainers = with maintainers; [ offline psyanticy mkaito Chili-Man ]; }; } diff --git a/pkgs/tools/security/volatility/default.nix b/pkgs/tools/security/volatility/default.nix index 4f1e90eb9100..8ffdfc4e2b09 100644 --- a/pkgs/tools/security/volatility/default.nix +++ b/pkgs/tools/security/volatility/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pythonPackages }: +{ lib, stdenv, fetchFromGitHub, pythonPackages }: pythonPackages.buildPythonApplication rec { pname = "volatility"; @@ -15,7 +15,7 @@ pythonPackages.buildPythonApplication rec { propagatedBuildInputs = [ pythonPackages.pycrypto pythonPackages.distorm3 ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.volatilityfoundation.org/"; description = "Advanced memory forensics framework"; maintainers = with maintainers; [ bosu ]; diff --git a/pkgs/tools/security/vulnix/default.nix b/pkgs/tools/security/vulnix/default.nix index d4a3a0c621a1..e95adf3e1e6c 100644 --- a/pkgs/tools/security/vulnix/default.nix +++ b/pkgs/tools/security/vulnix/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , python3Packages , nix , ronn @@ -48,7 +48,7 @@ python3Packages.buildPythonApplication rec { dontStrip = true; - meta = with stdenv.lib; { + meta = with lib; { description = "NixOS vulnerability scanner"; homepage = "https://github.com/flyingcircusio/vulnix"; license = licenses.bsd3; diff --git a/pkgs/tools/security/wad/default.nix b/pkgs/tools/security/wad/default.nix new file mode 100644 index 000000000000..ee731798097d --- /dev/null +++ b/pkgs/tools/security/wad/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonApplication +, fetchPypi +, mock +, pytestCheckHook +, six +}: + +buildPythonApplication rec { + pname = "wad"; + version = "0.4.6"; + + src = fetchPypi { + inherit pname; + inherit version; + sha256 = "02jq77h6g9v7n4qqq7qri6wmhggy257983dwgmpjsf4qsagkgwy8"; + }; + + propagatedBuildInputs = [ + six + ]; + + checkInputs = [ + pytestCheckHook + mock + ]; + + pythonImportsCheck = [ "wad" ]; + + meta = with lib; { + description = "Tool for detecting technologies used by web applications"; + longDescription = '' + WAD lets you analyze given URL(s) and detect technologies used by web + application behind that URL, from the OS and web server level, to the + programming platform and frameworks, as well as server- and client-side + applications, tools and libraries. + ''; + homepage = "https://github.com/CERN-CERT/WAD"; + # wad is GPLv3+, wappalyzer source is MIT + license = with licenses; [ gpl3Plus mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/tools/security/wipe/default.nix b/pkgs/tools/security/wipe/default.nix index 6b84803d2c46..2c3c9376f67b 100644 --- a/pkgs/tools/security/wipe/default.nix +++ b/pkgs/tools/security/wipe/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "wipe"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { patches = [ ./fix-install.patch ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Secure file wiping utility"; homepage = "http://wipe.sourceforge.net/"; license = licenses.gpl2; diff --git a/pkgs/tools/security/yara/default.nix b/pkgs/tools/security/yara/default.nix index 8a1195350234..19d409e03eea 100644 --- a/pkgs/tools/security/yara/default.nix +++ b/pkgs/tools/security/yara/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , autoreconfHook , pcre @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { (stdenv.lib.enableFeature enableCuckoo "cuckoo") ]; - meta = with stdenv.lib; { + meta = with lib; { description = "The pattern matching swiss knife for malware researchers"; homepage = "http://Virustotal.github.io/yara/"; license = licenses.asl20; diff --git a/pkgs/tools/security/zmap/default.nix b/pkgs/tools/security/zmap/default.nix index e2350b67c7d7..fdcb5ed5ce92 100644 --- a/pkgs/tools/security/zmap/default.nix +++ b/pkgs/tools/security/zmap/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, libjson, json_c, gengetopt, flex, byacc, gmp +{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, libjson, json_c, gengetopt, flex, byacc, gmp , libpcap }: @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "man" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://zmap.io/"; license = licenses.asl20; description = "Fast single packet network scanner designed for Internet-wide network surveys"; diff --git a/pkgs/tools/security/zzuf/default.nix b/pkgs/tools/security/zzuf/default.nix index 428f1ec1d09c..e7d12d8a68ea 100644 --- a/pkgs/tools/security/zzuf/default.nix +++ b/pkgs/tools/security/zzuf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig }: stdenv.mkDerivation rec { pname = "zzuf"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { preConfigure = "./bootstrap"; - meta = with stdenv.lib; { + meta = with lib; { description = "Transparent application input fuzzer"; homepage = "http://caca.zoy.org/wiki/zzuf"; license = licenses.wtfpl; diff --git a/pkgs/tools/system/acct/default.nix b/pkgs/tools/system/acct/default.nix index dd4eb0d5d2b8..fbe396f1fdf4 100644 --- a/pkgs/tools/system/acct/default.nix +++ b/pkgs/tools/system/acct/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv }: +{ fetchurl, lib, stdenv }: stdenv.mkDerivation rec { name = "acct-6.6.4"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "GNU Accounting Utilities, login and process accounting utilities"; longDescription = '' diff --git a/pkgs/tools/system/acpica-tools/default.nix b/pkgs/tools/system/acpica-tools/default.nix index 62b1be619650..36ad8ff06e38 100644 --- a/pkgs/tools/system/acpica-tools/default.nix +++ b/pkgs/tools/system/acpica-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bison, flex }: +{ lib, stdenv, fetchurl, bison, flex }: stdenv.mkDerivation rec { pname = "acpica-tools"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { installFlags = [ "PREFIX=${placeholder "out"}" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "ACPICA Tools"; homepage = "https://www.acpica.org/"; license = with licenses; [ gpl2 bsd3 ]; diff --git a/pkgs/tools/system/actkbd/default.nix b/pkgs/tools/system/actkbd/default.nix index 706b3700a415..ac2fb338d3d2 100644 --- a/pkgs/tools/system/actkbd/default.nix +++ b/pkgs/tools/system/actkbd/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv }: +{ fetchurl, lib, stdenv }: stdenv.mkDerivation rec { name = "actkbd-0.2.8"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { cp -r README samples $out/share/doc/actkbd ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A keyboard shortcut daemon"; longDescription = '' actkbd is a simple daemon that binds actions to keyboard events diff --git a/pkgs/tools/system/augeas/default.nix b/pkgs/tools/system/augeas/default.nix index 338b8f8ac453..6a8c50c60957 100644 --- a/pkgs/tools/system/augeas/default.nix +++ b/pkgs/tools/system/augeas/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, readline, libxml2 }: +{ lib, stdenv, fetchurl, pkgconfig, readline, libxml2 }: stdenv.mkDerivation rec { pname = "augeas"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ readline libxml2 ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Configuration editing tool"; license = licenses.lgpl2; homepage = "http://augeas.net/"; diff --git a/pkgs/tools/system/autocpu-freq/default.nix b/pkgs/tools/system/autocpu-freq/default.nix new file mode 100644 index 000000000000..7e23b8b5b0f7 --- /dev/null +++ b/pkgs/tools/system/autocpu-freq/default.nix @@ -0,0 +1,34 @@ +{ lib, stdenv, python3Packages, fetchFromGitHub }: + +python3Packages.buildPythonPackage rec { + pname = "auto-cpufreq"; + version = "1.5.1"; + + src = fetchFromGitHub { + owner = "AdnanHodzic"; + repo = pname; + rev = "v${version}"; + sha256 = "uVhftO6AqFnZ0uaEYRAPvVskkouNOXPtNVYXx7WJKyw="; + }; + + propagatedBuildInputs = with python3Packages; [ click distro psutil ]; + + doCheck = false; + pythonImportsCheck = [ "source" ]; + + # patch to prevent script copying and to disable install + patches = [ ./prevent-install-and-copy.patch ]; + + postInstall = '' + # copy script manually + cp ${src}/scripts/cpufreqctl.sh $out/bin/cpufreqctl + ''; + + meta = with lib; { + homepage = "https://github.com/AdnanHodzic/auto-cpufreq"; + description = "Automatic CPU speed & power optimizer for Linux"; + license = licenses.lgpl3Plus; + platforms = platforms.linux; + maintainers = [ maintainers.Technical27 ]; + }; +} diff --git a/pkgs/tools/system/autocpu-freq/prevent-install-and-copy.patch b/pkgs/tools/system/autocpu-freq/prevent-install-and-copy.patch new file mode 100644 index 000000000000..28c524e1497c --- /dev/null +++ b/pkgs/tools/system/autocpu-freq/prevent-install-and-copy.patch @@ -0,0 +1,178 @@ +diff --git a/scripts/cpufreqctl.sh b/scripts/cpufreqctl.sh +index 63a2b5b..e157efe 100755 +--- a/scripts/cpufreqctl.sh ++++ b/scripts/cpufreqctl.sh +@@ -467,35 +467,21 @@ fi + + if [ $OPTION = "--install" ] + then +- echo 'installing helpers...' +- cp $0 /usr/bin/ +- echo 'installing policy...' +- cp $(dirname "$(readlink -f "$0")")/konkor.cpufreq.policy /usr/share/polkit-1/actions/ +- echo 'installing fonts...' +- mkdir -p /usr/share/fonts/truetype/cpufreq +- cp $(dirname "$(readlink -f "$0")")/fonts/cpufreq.ttf /usr/share/fonts/truetype/cpufreq/ +- echo "done" ++ echo "install is disabled in the nix package" + exit + fi + if [ $OPTION = "--update-fonts" ] + then +- fc-cache -f ++ echo "update-fonts is disabled in the nix package" + exit + fi + if [ $OPTION = "--uninstall" ] + then +- echo 'uninstalling cpufreqctl helper...' +- rm /usr/bin/cpufreqctl +- echo 'uninstalling policy...' +- rm /usr/share/polkit-1/actions/konkor.cpufreq.policy +- echo 'uninstalling fonts...' +- rm -rf /usr/share/fonts/truetype/cpufreq +- echo "done" ++ echo "uninstall is disabled in the nix package" + exit + fi + if [ $OPTION = "--reset" ] + then +- echo 'reset to default values...' +- dconf reset -f "/org/gnome/shell/extensions/cpufreq/" ++ echo "reset is disabled in the nix package" + exit + fi +diff --git a/source/core.py b/source/core.py +index 531c0c4..2e27e65 100644 +--- a/source/core.py ++++ b/source/core.py +@@ -24,8 +24,6 @@ warnings.filterwarnings("ignore") + # - re-enable CPU fan speed display and make more generic and not only for thinkpad + # - replace get system/CPU load from: psutil.getloadavg() | available in 5.6.2) + +-SCRIPTS_DIR = Path("/usr/local/share/auto-cpufreq/scripts/") +- + # from the highest performance to the lowest + ALL_GOVERNORS = ("performance", "ondemand", "conservative", "schedutil", "userspace", "powersave") + CPUS = os.cpu_count() +@@ -156,34 +154,16 @@ def cpufreqctl(): + """ + deploy cpufreqctl script + """ +- +- # detect if running on a SNAP +- if os.getenv('PKG_MARKER') == "SNAP": +- pass +- else: +- # deploy cpufreqctl script (if missing) +- if os.path.isfile("/usr/bin/cpufreqctl"): +- shutil.copy("/usr/bin/cpufreqctl", "/usr/bin/cpufreqctl.auto-cpufreq.bak") +- shutil.copy(SCRIPTS_DIR / "cpufreqctl.sh", "/usr/bin/cpufreqctl") +- else: +- shutil.copy(SCRIPTS_DIR / "cpufreqctl.sh", "/usr/bin/cpufreqctl") ++ # scripts are already in the correct place ++ pass + + + def cpufreqctl_restore(): + """ + restore original cpufreqctl script + """ +- # detect if running on a SNAP +- if os.getenv('PKG_MARKER') == "SNAP": +- pass +- else: +- # restore original cpufreqctl script +- if os.path.isfile("/usr/bin/cpufreqctl.auto-cpufreq.bak"): +- os.system("cp /usr/bin/cpufreqctl.auto-cpufreq.bak /usr/bin/cpufreqctl") +- os.remove("/usr/bin/cpufreqctl.auto-cpufreq.bak") +- # ToDo: implement mechanism to make sure cpufreqctl (auto-cpufreq) file is +- # restored if overwritten by system. But during tool removal to also remove it +- # in def cpufreqctl ++ # no need to restore ++ pass + + + def footer(l=79): +@@ -209,71 +189,13 @@ def remove_complete_msg(): + + + def deploy_daemon(): +- print("\n" + "-" * 21 + " Deploying auto-cpufreq as a daemon " + "-" * 22 + "\n") +- +- # deploy cpufreqctl script func call +- cpufreqctl() +- +- print("* Turn off bluetooth on boot") +- btconf = Path("/etc/bluetooth/main.conf") +- try: +- orig_set = "AutoEnable=true" +- change_set = "AutoEnable=false" +- with btconf.open(mode="r+") as f: +- content = f.read() +- f.seek(0) +- f.truncate() +- f.write(content.replace(orig_set, change_set)) +- except: +- print("\nERROR:\nWas unable to turn off bluetooth on boot") +- +- auto_cpufreq_log_file.touch(exist_ok=True) +- +- print("\n* Deploy auto-cpufreq install script") +- shutil.copy(SCRIPTS_DIR / "auto-cpufreq-install.sh", "/usr/bin/auto-cpufreq-install") +- +- print("\n* Deploy auto-cpufreq remove script") +- shutil.copy(SCRIPTS_DIR / "auto-cpufreq-remove.sh", "/usr/bin/auto-cpufreq-remove") +- +- call("/usr/bin/auto-cpufreq-install", shell=True) ++ # prevent needless copying and system changes ++ pass + + + # remove auto-cpufreq daemon + def remove(): +- +- # check if auto-cpufreq is installed +- if not os.path.exists("/usr/bin/auto-cpufreq-remove"): +- print("\nauto-cpufreq daemon is not installed.\n") +- sys.exit(1) +- +- print("\n" + "-" * 21 + " Removing auto-cpufreq daemon " + "-" * 22 + "\n") +- +- print("* Turn on bluetooth on boot") +- btconf = "/etc/bluetooth/main.conf" +- try: +- orig_set = "AutoEnable=true" +- change_set = "AutoEnable=false" +- with open(btconf, "r+") as f: +- content = f.read() +- f.seek(0) +- f.truncate() +- f.write(content.replace(change_set, orig_set)) +- except: +- print("\nERROR:\nWas unable to turn on bluetooth on boot") +- +- # run auto-cpufreq daemon install script +- call("/usr/bin/auto-cpufreq-remove", shell=True) +- +- # remove auto-cpufreq-remove +- os.remove("/usr/bin/auto-cpufreq-remove") +- +- # delete log file +- if auto_cpufreq_log_file.exists(): +- auto_cpufreq_log_file.unlink() +- +- # restore original cpufrectl script +- cpufreqctl_restore() +- ++ pass + + def gov_check(): + for gov in get_avail_gov(): +@@ -798,4 +720,4 @@ def running_daemon(): + exit(1) + elif os.getenv("PKG_MARKER") == "SNAP" and dcheck == "enabled": + deploy_complete_msg() +- exit(1) +\ No newline at end of file ++ exit(1) diff --git a/pkgs/tools/system/awstats/default.nix b/pkgs/tools/system/awstats/default.nix index 9da6ac59f3de..b04532d842ff 100644 --- a/pkgs/tools/system/awstats/default.nix +++ b/pkgs/tools/system/awstats/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perlPackages, jdk }: +{ lib, stdenv, fetchurl, perlPackages, jdk }: perlPackages.buildPerlPackage rec { pname = "awstats"; @@ -52,7 +52,7 @@ perlPackages.buildPerlPackage rec { mv docs "$doc/share/doc/awstats" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Real-time logfile analyzer to get advanced statistics"; homepage = "http://awstats.org"; license = licenses.gpl3Plus; diff --git a/pkgs/tools/system/bfs/default.nix b/pkgs/tools/system/bfs/default.nix index c0755fafc06a..c49f033c42ad 100644 --- a/pkgs/tools/system/bfs/default.nix +++ b/pkgs/tools/system/bfs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libcap, acl }: +{ lib, stdenv, fetchFromGitHub, libcap, acl }: stdenv.mkDerivation rec { pname = "bfs"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; buildFlags = [ "release" ]; # "release" enables compiler optimizations - meta = with stdenv.lib; { + meta = with lib; { description = "A breadth-first version of the UNIX find command"; longDescription = '' bfs is a variant of the UNIX find command that operates breadth-first rather than diff --git a/pkgs/tools/system/bottom/default.nix b/pkgs/tools/system/bottom/default.nix index 1a975aef3932..a79e8bdcebf2 100644 --- a/pkgs/tools/system/bottom/default.nix +++ b/pkgs/tools/system/bottom/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform, darwin, installShellFiles }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, darwin, installShellFiles }: rustPlatform.buildRustPackage rec { pname = "bottom"; @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec { installShellCompletion $releaseDir/build/bottom-*/out/btm.{bash,fish} --zsh $releaseDir/build/bottom-*/out/_btm ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A cross-platform graphical process/system monitor with a customizable interface"; homepage = "https://github.com/ClementTsang/bottom"; license = licenses.mit; diff --git a/pkgs/tools/system/bpytop/default.nix b/pkgs/tools/system/bpytop/default.nix index feaebc14e0ad..abcc15939884 100644 --- a/pkgs/tools/system/bpytop/default.nix +++ b/pkgs/tools/system/bpytop/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python3Packages, fetchFromGitHub, makeWrapper, substituteAll }: +{ lib, stdenv, python3Packages, fetchFromGitHub, makeWrapper, substituteAll }: stdenv.mkDerivation rec { pname = "bpytop"; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { --prefix PYTHONPATH : "$PYTHONPATH" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A resource monitor; python port of bashtop"; homepage = src.meta.homepage; license = licenses.apsl20; diff --git a/pkgs/tools/system/clinfo/default.nix b/pkgs/tools/system/clinfo/default.nix index 9e9b4df80880..dbcbae6eaa9a 100644 --- a/pkgs/tools/system/clinfo/default.nix +++ b/pkgs/tools/system/clinfo/default.nix @@ -1,27 +1,30 @@ -{ stdenv, fetchFromGitHub, ocl-icd, opencl-headers }: +{ lib, stdenv, fetchFromGitHub, ocl-icd, opencl-headers }: stdenv.mkDerivation rec { pname = "clinfo"; version = "3.0.20.11.20"; - src = fetchFromGitHub { - owner = "Oblomov"; - repo = "clinfo"; - rev = version; - sha256 = "052xfkbmgfpalmhfwn0dj5114x2mzwz29y37qqhhsdpaxsz0y422"; - }; + src = fetchFromGitHub { + owner = "Oblomov"; + repo = "clinfo"; + rev = version; + sha256 = "052xfkbmgfpalmhfwn0dj5114x2mzwz29y37qqhhsdpaxsz0y422"; + }; buildInputs = [ ocl-icd opencl-headers ]; - NIX_CFLAGS_COMPILE = [ "-Wno-error=stringop-truncation" ]; + NIX_CFLAGS_COMPILE = [ + "-Wno-error=stringop-overflow" + "-Wno-error=stringop-truncation" + ]; makeFlags = [ "PREFIX=${placeholder "out"}" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Print all known information about all available OpenCL platforms and devices in the system"; homepage = "https://github.com/Oblomov/clinfo"; license = licenses.cc0; - platforms = platforms.linux; maintainers = with maintainers; [ athas ]; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/system/cm-rgb/default.nix b/pkgs/tools/system/cm-rgb/default.nix index acfe440b5d5c..a50fa60197ac 100644 --- a/pkgs/tools/system/cm-rgb/default.nix +++ b/pkgs/tools/system/cm-rgb/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonApplication , fetchFromGitHub , atk @@ -46,7 +46,7 @@ buildPythonApplication rec { > $out/etc/udev/rules.d/60-cm-rgb.rules ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Control AMD Wraith Prism RGB LEDs"; longDescription = '' cm-rgb controls AMD Wraith Prism RGB LEDS. diff --git a/pkgs/tools/system/collectd/default.nix b/pkgs/tools/system/collectd/default.nix index 278ab9056ad9..eb64a09a22bd 100644 --- a/pkgs/tools/system/collectd/default.nix +++ b/pkgs/tools/system/collectd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, darwin, callPackage +{ lib, stdenv, fetchurl, fetchpatch, darwin, callPackage , autoreconfHook , pkgconfig , libtool @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Daemon which collects system performance statistics periodically"; homepage = "https://collectd.org"; license = licenses.gpl2; diff --git a/pkgs/tools/system/consul-template/default.nix b/pkgs/tools/system/consul-template/default.nix index 69d5cd6bb736..7604584e1675 100644 --- a/pkgs/tools/system/consul-template/default.nix +++ b/pkgs/tools/system/consul-template/default.nix @@ -1,24 +1,27 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "consul-template"; - version = "0.19.4"; - rev = "v${version}"; - - goPackagePath = "github.com/hashicorp/consul-template"; + version = "0.25.1"; src = fetchFromGitHub { - inherit rev; owner = "hashicorp"; repo = "consul-template"; - sha256 = "06agjzpax45gw7s9b69cz9w523nx7ksikqcg0z0vipwrp7pwrydd"; + rev = "v${version}"; + sha256 = "1205rhv4mizpb1nbc2sry52n7wljcwb8xp7lpazh1r1cldfayr5b"; }; - meta = with stdenv.lib; { + vendorSha256 = "0hv4b6k8k7xkzkjgzcm5y8pqyiwyk790a1qw18gjslkwkyw5hjf2"; + + # consul-template tests depend on vault and consul services running to + # execute tests so we skip them here + doCheck = false; + + meta = with lib; { homepage = "https://github.com/hashicorp/consul-template/"; description = "Generic template rendering and notifications with Consul"; platforms = platforms.linux ++ platforms.darwin; license = licenses.mpl20; - maintainers = with maintainers; [ pradeepchhetri ]; + maintainers = with maintainers; [ cpcloud pradeepchhetri ]; }; } diff --git a/pkgs/tools/system/cron/default.nix b/pkgs/tools/system/cron/default.nix index 9cde31205e1f..d1b8d2d6afd9 100644 --- a/pkgs/tools/system/cron/default.nix +++ b/pkgs/tools/system/cron/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, vim, sendmailPath ? "/usr/sbin/sendmail"}: +{lib, stdenv, fetchurl, vim, sendmailPath ? "/usr/sbin/sendmail"}: stdenv.mkDerivation { name = "cron-4.1"; @@ -39,7 +39,7 @@ stdenv.mkDerivation { preInstall = "mkdir -p $out/bin $out/sbin $out/share/man/man1 $out/share/man/man5 $out/share/man/man8"; - meta = with stdenv.lib; { + meta = with lib; { description = "Daemon for running commands at specific times (Vixie Cron)"; license = licenses.bsd0; platforms = with platforms; linux ++ darwin; diff --git a/pkgs/tools/system/daemon/default.nix b/pkgs/tools/system/daemon/default.nix index c419824f9699..58f8da3ce4f7 100644 --- a/pkgs/tools/system/daemon/default.nix +++ b/pkgs/tools/system/daemon/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl }: +{ lib, stdenv, fetchurl, perl }: stdenv.mkDerivation rec { pname = "daemon"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ perl ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Turns other processes into daemons"; longDescription = '' Daemon turns other process into daemons. There are many tasks that need diff --git a/pkgs/tools/system/daemonize/default.nix b/pkgs/tools/system/daemonize/default.nix index a8685189b61c..b79da1986d73 100644 --- a/pkgs/tools/system/daemonize/default.nix +++ b/pkgs/tools/system/daemonize/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "daemonize"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0q2c3i3si3k7wfhl6fyckkmkc81yp67pz52p3ggis79p4nczri10"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Runs a command as a Unix daemon"; homepage = "http://software.clapper.org/daemonize/"; license = licenses.bsd3; diff --git a/pkgs/tools/system/das_watchdog/default.nix b/pkgs/tools/system/das_watchdog/default.nix index 8c1a5657991c..b9c25aef7a77 100644 --- a/pkgs/tools/system/das_watchdog/default.nix +++ b/pkgs/tools/system/das_watchdog/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, libgtop, xmessage, which, pkgconfig }: +{ lib, stdenv, fetchgit, libgtop, xmessage, which, pkgconfig }: stdenv.mkDerivation { pname = "das_watchdog"; @@ -19,7 +19,7 @@ stdenv.mkDerivation { cp test_rt $out/bin/ ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/kmatheussen/das_watchdog"; description = "A general watchdog for the linux operating system"; longDescription = '' diff --git a/pkgs/tools/system/datefudge/default.nix b/pkgs/tools/system/datefudge/default.nix index 819071f3f068..be2ad70498ae 100644 --- a/pkgs/tools/system/datefudge/default.nix +++ b/pkgs/tools/system/datefudge/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, fetchpatch }: +{ lib, stdenv, fetchgit, fetchpatch }: stdenv.mkDerivation rec { pname = "datefudge"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { postInstall = "chmod +x $out/lib/datefudge/datefudge.so"; - meta = with stdenv.lib; { + meta = with lib; { description = "Fake the system date"; longDescription = '' datefudge is a small utility that pretends that the system time is diff --git a/pkgs/tools/system/dcfldd/default.nix b/pkgs/tools/system/dcfldd/default.nix index 9ea7b485b96b..e5d5026e6290 100644 --- a/pkgs/tools/system/dcfldd/default.nix +++ b/pkgs/tools/system/dcfldd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "dcfldd-1.3.4-1"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ ]; - meta = with stdenv.lib; { + meta = with lib; { description = "An enhanced version of GNU dd"; homepage = "http://dcfldd.sourceforge.net/"; diff --git a/pkgs/tools/system/dd_rescue/default.nix b/pkgs/tools/system/dd_rescue/default.nix index 9962337de078..ba18c58becb9 100644 --- a/pkgs/tools/system/dd_rescue/default.nix +++ b/pkgs/tools/system/dd_rescue/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoconf }: +{ lib, stdenv, fetchurl, autoconf }: stdenv.mkDerivation rec { version = "1.99.8"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { cp "$out/share/dd_rescue"/dd_rhelp*/dd_rhelp "$out/bin" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A tool to copy data from a damaged block device"; maintainers = with maintainers; [ raskin domenkozar ]; platforms = platforms.linux; diff --git a/pkgs/tools/system/ddrescue/default.nix b/pkgs/tools/system/ddrescue/default.nix index 8efcf22312fb..7e96a4c01f7c 100644 --- a/pkgs/tools/system/ddrescue/default.nix +++ b/pkgs/tools/system/ddrescue/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl, lzip }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { doCheck = true; # not cross; configureFlags = [ "CXX=${stdenv.cc.targetPrefix}c++" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "GNU ddrescue, a data recovery tool"; longDescription = diff --git a/pkgs/tools/system/ddrutility/default.nix b/pkgs/tools/system/ddrutility/default.nix index bb24076ce7c8..02c89b229890 100644 --- a/pkgs/tools/system/ddrutility/default.nix +++ b/pkgs/tools/system/ddrutility/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "ddrutility"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { makeFlags = [ "DESTDIR=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A set of utilities for hard drive data rescue"; homepage = "https://sourceforge.net/projects/ddrutility/"; license = licenses.gpl2Plus; diff --git a/pkgs/tools/system/di/default.nix b/pkgs/tools/system/di/default.nix index 0a6ae26547bf..fcf4054c1820 100644 --- a/pkgs/tools/system/di/default.nix +++ b/pkgs/tools/system/di/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "di"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { makeFlags = [ "INSTALL_DIR=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Disk information utility; displays everything 'df' does and more"; homepage = "https://gentoo.com/di/"; license = licenses.zlib; diff --git a/pkgs/tools/system/disk-filltest/default.nix b/pkgs/tools/system/disk-filltest/default.nix index 7bcf592012a4..ecfa14aa91be 100644 --- a/pkgs/tools/system/disk-filltest/default.nix +++ b/pkgs/tools/system/disk-filltest/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "disk-filltest"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { mkdir -p $out/share/man; mv $out/man1 $out/share/man ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Simple program to detect bad disks by filling them with random data"; longDescription = '' disk-filltest is a tool to check storage disks for coming diff --git a/pkgs/tools/system/dog/default.nix b/pkgs/tools/system/dog/default.nix index 5063e3555bb1..94a6b34ff53e 100644 --- a/pkgs/tools/system/dog/default.nix +++ b/pkgs/tools/system/dog/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation { name = "dog-1.7"; @@ -20,7 +20,7 @@ stdenv.mkDerivation { cp dog $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://lwn.net/Articles/421072/"; description = "cat replacement"; license = licenses.gpl2Plus; diff --git a/pkgs/tools/system/efibootmgr/default.nix b/pkgs/tools/system/efibootmgr/default.nix index dd898de0fc26..773127fa1878 100644 --- a/pkgs/tools/system/efibootmgr/default.nix +++ b/pkgs/tools/system/efibootmgr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, efivar, popt }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, pkgconfig, efivar, popt }: stdenv.mkDerivation rec { pname = "efibootmgr"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { installFlags = [ "prefix=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A Linux user-space application to modify the Intel Extensible Firmware Interface (EFI) Boot Manager"; homepage = "https://github.com/rhboot/efibootmgr"; license = licenses.gpl2; diff --git a/pkgs/tools/system/efivar/default.nix b/pkgs/tools/system/efivar/default.nix index ea0ed8afcfd0..3300e0b27518 100644 --- a/pkgs/tools/system/efivar/default.nix +++ b/pkgs/tools/system/efivar/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPackages, fetchFromGitHub, fetchurl, pkgconfig, popt }: +{ lib, stdenv, buildPackages, fetchFromGitHub, fetchurl, pkgconfig, popt }: stdenv.mkDerivation rec { pname = "efivar"; @@ -39,8 +39,9 @@ stdenv.mkDerivation rec { sha256 = "1ajj11wwsvamfspq4naanvw08h63gr0g71q0dfbrrywrhc0jlmdw"; }) ]; - # We have no LTO here since commit 22284b07. + # We have no LTO here since commit 22284b07. With GCC 10 that triggers a warning. postPatch = if stdenv.isi686 then "sed '/^OPTIMIZE /s/-flto//' -i Make.defaults" else null; + NIX_CFLAGS_COMPILE = if stdenv.isi686 then "-Wno-error=stringop-truncation" else null; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ popt ]; @@ -55,7 +56,7 @@ stdenv.mkDerivation rec { "PCDIR=$(dev)/lib/pkgconfig" ]; - meta = with stdenv.lib; { + meta = with lib; { inherit (src.meta) homepage; description = "Tools and library to manipulate EFI variables"; platforms = platforms.linux; diff --git a/pkgs/tools/system/envconsul/default.nix b/pkgs/tools/system/envconsul/default.nix index 09175f14609f..1706b32449eb 100644 --- a/pkgs/tools/system/envconsul/default.nix +++ b/pkgs/tools/system/envconsul/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "envconsul"; @@ -14,7 +14,7 @@ buildGoPackage rec { sha256 = "03cgxkyyynr067dg5b0lhvaxn60318fj9fh55p1n43vj5nrzgnbc"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/hashicorp/envconsul/"; description = "Read and set environmental variables for processes from Consul"; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/tools/system/evemu/default.nix b/pkgs/tools/system/evemu/default.nix index 02f92a198909..4bb5fce1875d 100644 --- a/pkgs/tools/system/evemu/default.nix +++ b/pkgs/tools/system/evemu/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, autoreconfHook, pkgconfig, pythonPackages +{ lib, stdenv, fetchgit, autoreconfHook, pkgconfig, pythonPackages , libevdev }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ pythonPackages.python pythonPackages.evdev libevdev ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Records and replays device descriptions and events to emulate input devices through the kernel's input system"; homepage = "https://www.freedesktop.org/wiki/Evemu/"; repositories.git = "git://git.freedesktop.org/git/evemu"; diff --git a/pkgs/tools/system/facter/default.nix b/pkgs/tools/system/facter/default.nix index 2a101bba8865..a67b975ec92c 100644 --- a/pkgs/tools/system/facter/default.nix +++ b/pkgs/tools/system/facter/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, boost, cmake, cpp-hocon, curl, leatherman, libwhereami, libyamlcpp, openssl, ruby, util-linux }: +{ lib, stdenv, fetchFromGitHub, boost, cmake, cpp-hocon, curl, leatherman, libwhereami, libyamlcpp, openssl, ruby, util-linux }: stdenv.mkDerivation rec { pname = "facter"; @@ -24,9 +24,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ boost cpp-hocon curl leatherman libwhereami libyamlcpp openssl ruby util-linux ]; - enableParallelBuilding = true; - - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/puppetlabs/facter"; description = "A system inventory tool"; license = licenses.asl20; diff --git a/pkgs/tools/system/fakechroot/default.nix b/pkgs/tools/system/fakechroot/default.nix index fc74644ab032..fb56350aa72f 100644 --- a/pkgs/tools/system/fakechroot/default.nix +++ b/pkgs/tools/system/fakechroot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, perl }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, perl }: stdenv.mkDerivation rec { pname = "fakechroot"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ perl ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/dex4er/fakechroot"; description = "Give a fake chroot environment through LD_PRELOAD"; license = licenses.lgpl21; diff --git a/pkgs/tools/system/fcron/default.nix b/pkgs/tools/system/fcron/default.nix index 59daac89bd44..d6f764b9ea6a 100644 --- a/pkgs/tools/system/fcron/default.nix +++ b/pkgs/tools/system/fcron/default.nix @@ -1,7 +1,7 @@ # restart using 'killall -TERM fcron; fcron -b # use convert-fcrontab to update fcrontab files -{ stdenv, fetchurl, perl, busybox, vim }: +{ lib, stdenv, fetchurl, perl, busybox, vim }: stdenv.mkDerivation rec { pname = "fcron"; @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { find -type f | xargs sed -i -e 's@^\(\s\)*chown@\1:@' -e 's@^\(\s\)*chgrp@\1:@' ''; - meta = with stdenv.lib; { + meta = with lib; { description="A command scheduler with extended capabilities over cron and anacron"; homepage = "http://fcron.free.fr"; license = licenses.gpl2; diff --git a/pkgs/tools/system/fio/default.nix b/pkgs/tools/system/fio/default.nix index e0dc69de0e43..6efa107ef321 100644 --- a/pkgs/tools/system/fio/default.nix +++ b/pkgs/tools/system/fio/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, makeWrapper +{ lib, stdenv, fetchFromGitHub, makeWrapper , libaio, python, zlib , withGnuplot ? false, gnuplot ? null }: @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { --prefix PATH : ${stdenv.lib.makeBinPath [ gnuplot ]} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Flexible IO Tester - an IO benchmark tool"; homepage = "https://git.kernel.dk/cgit/fio/"; license = licenses.gpl2; diff --git a/pkgs/tools/system/foremost/default.nix b/pkgs/tools/system/foremost/default.nix index 96c54513ef1b..24f207e95f14 100644 --- a/pkgs/tools/system/foremost/default.nix +++ b/pkgs/tools/system/foremost/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "foremost"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { mkdir -p $out/{bin,share/man/man8} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Recover files based on their contents"; longDescription = '' Foremost is a console program to recover files based on their headers, diff --git a/pkgs/tools/system/gdmap/default.nix b/pkgs/tools/system/gdmap/default.nix index 6fdfd6e71909..da1925152bf4 100644 --- a/pkgs/tools/system/gdmap/default.nix +++ b/pkgs/tools/system/gdmap/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gtk2, pkgconfig, libxml2, intltool, gettext }: +{ lib, stdenv, fetchurl, gtk2, pkgconfig, libxml2, intltool, gettext }: stdenv.mkDerivation rec { name = "gdmap-0.8.1"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = "-lm"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://gdmap.sourceforge.net"; description = "Recursive rectangle map of disk usage"; license = licenses.gpl2; diff --git a/pkgs/tools/system/gdu/default.nix b/pkgs/tools/system/gdu/default.nix new file mode 100644 index 000000000000..6fb65e0c3a20 --- /dev/null +++ b/pkgs/tools/system/gdu/default.nix @@ -0,0 +1,37 @@ +{ lib +, stdenv +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "gdu"; + version = "2.2.0"; + + src = fetchFromGitHub { + owner = "dundee"; + repo = pname; + rev = "v${version}"; + sha256 = "0ajkc0vbzyl56d6z03s5vb17frjrg5wl145x60asnrmh7lg8adsj"; + }; + + vendorSha256 = "1jqbsda9bch3awdq816w4jybv7wz9mfflmvs5y2wsa2qnhn9nbyp"; + + buildFlagsArray = [ "-ldflags=-s -w -X main.AppVersion=${version}" ]; + + # analyze/dev_test.go: undefined: processMounts + doCheck = !stdenv.isDarwin; + + meta = with lib; { + description = "Disk usage analyzer with console interface"; + longDescription = '' + Gdu is intended primarily for SSD disks where it can fully + utilize parallel processing. However HDDs work as well, but + the performance gain is not so huge. + ''; + homepage = "https://github.com/dundee/gdu"; + license = with licenses; [ mit ]; + maintainers = [ maintainers.fab ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/system/gotop/default.nix b/pkgs/tools/system/gotop/default.nix index f5d7ff4759e7..b49307f500f6 100644 --- a/pkgs/tools/system/gotop/default.nix +++ b/pkgs/tools/system/gotop/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "gotop"; @@ -18,7 +18,7 @@ buildGoModule rec { export HOME=$(mktemp -d) ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A terminal based graphical activity monitor inspired by gtop and vtop"; homepage = "https://github.com/xxxserxxx/gotop"; license = licenses.agpl3; diff --git a/pkgs/tools/system/gptfdisk/default.nix b/pkgs/tools/system/gptfdisk/default.nix index 613f63c3f044..5e2f047674e9 100644 --- a/pkgs/tools/system/gptfdisk/default.nix +++ b/pkgs/tools/system/gptfdisk/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, libuuid, popt, icu, ncurses }: +{ fetchurl, lib, stdenv, libuuid, popt, icu, ncurses }: stdenv.mkDerivation rec { pname = "gptfdisk"; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Set of text-mode partitioning tools for Globally Unique Identifier (GUID) Partition Table (GPT) disks"; license = licenses.gpl2; homepage = "https://www.rodsbooks.com/gdisk/"; diff --git a/pkgs/tools/system/hardinfo/default.nix b/pkgs/tools/system/hardinfo/default.nix index fd8fb08cf293..2dd1d96ee648 100644 --- a/pkgs/tools/system/hardinfo/default.nix +++ b/pkgs/tools/system/hardinfo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, which, pkgconfig, gtk2, pcre, glib, libxml2 +{ lib, stdenv, fetchurl, which, pkgconfig, gtk2, pcre, glib, libxml2 , libsoup ? null }: @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { rmdir "$out/usr" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://hardinfo.org/"; description = "Display information about your hardware and operating system"; license = licenses.gpl2; diff --git a/pkgs/tools/system/hardlink/default.nix b/pkgs/tools/system/hardlink/default.nix index c0c6aa72d3ba..a790c600a9d3 100644 --- a/pkgs/tools/system/hardlink/default.nix +++ b/pkgs/tools/system/hardlink/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pcre2 }: +{ lib, stdenv, fetchurl, pcre2 }: stdenv.mkDerivation { @@ -23,7 +23,7 @@ stdenv.mkDerivation { cp -f hardlink.1 $out/share/man/man1/hardlink.1 ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Consolidate duplicate files via hardlinks"; homepage = "https://pagure.io/hardlink"; repositories.git = "https://src.fedoraproject.org/cgit/rpms/hardlink.git"; diff --git a/pkgs/tools/system/honcho/default.nix b/pkgs/tools/system/honcho/default.nix index eb96c3f46132..f39c7dd793c4 100644 --- a/pkgs/tools/system/honcho/default.nix +++ b/pkgs/tools/system/honcho/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pythonPackages }: +{ lib, stdenv, fetchFromGitHub, pythonPackages }: let inherit (pythonPackages) python; @@ -40,7 +40,7 @@ pythonPackages.buildPythonApplication rec { runHook postCheck ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A Python clone of Foreman, a tool for managing Procfile-based applications"; license = licenses.mit; homepage = "https://github.com/nickstenning/honcho"; diff --git a/pkgs/tools/system/htop/default.nix b/pkgs/tools/system/htop/default.nix index bf811942c3e6..02a3c7991d20 100644 --- a/pkgs/tools/system/htop/default.nix +++ b/pkgs/tools/system/htop/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses ] ++ lib.optionals stdenv.isDarwin [ IOKit ]; - meta = with stdenv.lib; { + meta = with lib; { description = "An interactive process viewer for Linux"; homepage = "https://htop.dev"; license = licenses.gpl2Only; diff --git a/pkgs/tools/system/hwinfo/default.nix b/pkgs/tools/system/hwinfo/default.nix index 7a212f5bbeeb..925b60d54346 100644 --- a/pkgs/tools/system/hwinfo/default.nix +++ b/pkgs/tools/system/hwinfo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libx86emu, flex, perl, libuuid }: +{ lib, stdenv, fetchFromGitHub, libx86emu, flex, perl, libuuid }: stdenv.mkDerivation rec { pname = "hwinfo"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { installFlags = [ "DESTDIR=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Hardware detection tool from openSUSE"; license = licenses.gpl2; homepage = "https://github.com/openSUSE/hwinfo"; diff --git a/pkgs/tools/system/incron/default.nix b/pkgs/tools/system/incron/default.nix index d407982bb673..2df4acba9b58 100644 --- a/pkgs/tools/system/incron/default.nix +++ b/pkgs/tools/system/incron/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, bash }: +{ lib, stdenv, fetchFromGitHub, bash }: stdenv.mkDerivation rec { name = "incron-0.5.12"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { cp incrond incrontab $out/bin/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A cron-like daemon which handles filesystem events"; homepage = "https://github.com/ar-/incron"; license = licenses.gpl2; diff --git a/pkgs/tools/system/inxi/default.nix b/pkgs/tools/system/inxi/default.nix index 14b14fa9ffd1..9de9d0b7368e 100644 --- a/pkgs/tools/system/inxi/default.nix +++ b/pkgs/tools/system/inxi/default.nix @@ -3,7 +3,7 @@ , withRecommends ? false # Install (almost) all recommended tools (see --recommends) , withRecommendedSystemPrograms ? withRecommends, util-linuxMinimal, dmidecode , file, hddtemp, iproute, ipmitool, usbutils, kmod, lm_sensors, smartmontools -, binutils, tree, upower +, binutils, tree, upower, pciutils , withRecommendedDisplayInformationPrograms ? withRecommends, glxinfo, xorg }: @@ -12,7 +12,7 @@ let "--prefix PATH ':' '${stdenv.lib.makeBinPath programs}'"; recommendedSystemPrograms = lib.optionals withRecommendedSystemPrograms [ util-linuxMinimal dmidecode file hddtemp iproute ipmitool usbutils kmod - lm_sensors smartmontools binutils tree upower + lm_sensors smartmontools binutils tree upower pciutils ]; recommendedDisplayInformationPrograms = lib.optionals withRecommendedDisplayInformationPrograms @@ -22,13 +22,13 @@ let ++ recommendedDisplayInformationPrograms; in stdenv.mkDerivation rec { pname = "inxi"; - version = "3.2.01-1"; + version = "3.2.02-1"; src = fetchFromGitHub { owner = "smxi"; repo = "inxi"; rev = version; - sha256 = "15bakrv3jzj5h88c3bd0cfhh6hb8b4hm79924k1ygn29sqzgyw65"; + hash = "sha256-+6EURaeN1kJ4X+xdhN8ojuCbcBtxqNksGFEqPhIwCc4="; }; buildInputs = [ perl makeWrapper ]; @@ -43,7 +43,7 @@ in stdenv.mkDerivation rec { cp inxi.1 $out/share/man/man1/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A full featured CLI system information tool"; longDescription = '' inxi is a command line system information script built for console and diff --git a/pkgs/tools/system/ioping/default.nix b/pkgs/tools/system/ioping/default.nix index 7b65739c1a8d..9af290503f49 100644 --- a/pkgs/tools/system/ioping/default.nix +++ b/pkgs/tools/system/ioping/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch }: +{ lib, stdenv, fetchFromGitHub, fetchpatch }: stdenv.mkDerivation rec { pname = "ioping"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Disk I/O latency measuring tool"; maintainers = with maintainers; [ raskin ]; platforms = platforms.unix; diff --git a/pkgs/tools/system/iops/default.nix b/pkgs/tools/system/iops/default.nix index cf34cb115f14..b2be488673eb 100644 --- a/pkgs/tools/system/iops/default.nix +++ b/pkgs/tools/system/iops/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "iops"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { cp iops $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Measure I/O operations per second of a storage device"; longDescription = '' Iops lets you measure how many I/O operations per second a storage device can perform. diff --git a/pkgs/tools/system/ior/default.nix b/pkgs/tools/system/ior/default.nix index eff85589a1eb..330bf35e5535 100644 --- a/pkgs/tools/system/ior/default.nix +++ b/pkgs/tools/system/ior/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, openmpi, perl, autoreconfHook }: +{ lib, stdenv, fetchFromGitHub, openmpi, perl, autoreconfHook }: stdenv.mkDerivation rec { pname = "ior"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://ior.readthedocs.io/en/latest/"; description = "Parallel file system I/O performance test"; license = licenses.gpl2; diff --git a/pkgs/tools/system/ipmitool/default.nix b/pkgs/tools/system/ipmitool/default.nix index b5da2db67fe8..196e59953fe7 100644 --- a/pkgs/tools/system/ipmitool/default.nix +++ b/pkgs/tools/system/ipmitool/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, openssl, fetchpatch, static ? false }: +{ stdenv, lib, fetchurl, openssl, fetchpatch, static ? stdenv.hostPlatform.isStatic }: let pkgname = "ipmitool"; diff --git a/pkgs/tools/system/ipmiutil/default.nix b/pkgs/tools/system/ipmiutil/default.nix index 17c28b3cd420..4efc8024cc4a 100644 --- a/pkgs/tools/system/ipmiutil/default.nix +++ b/pkgs/tools/system/ipmiutil/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl }: +{ lib, stdenv, fetchurl, openssl }: stdenv.mkDerivation rec { baseName = "ipmiutil"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-fno-stack-protector"; - meta = with stdenv.lib; { + meta = with lib; { description = "An easy-to-use IPMI server management utility"; homepage = "http://ipmiutil.sourceforge.net/"; maintainers = with maintainers; [ raskin ]; diff --git a/pkgs/tools/system/java-service-wrapper/default.nix b/pkgs/tools/system/java-service-wrapper/default.nix index 758942c05494..8c87f64d7454 100644 --- a/pkgs/tools/system/java-service-wrapper/default.nix +++ b/pkgs/tools/system/java-service-wrapper/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , jdk , ant, cunit, ncurses }: @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { cp lib/libwrapper.so $out/lib/libwrapper.so ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Enables a Java Application to be run as a Windows Service or Unix Daemon"; homepage = "https://wrapper.tanukisoftware.com/"; license = licenses.gpl2; diff --git a/pkgs/tools/system/journalwatch/default.nix b/pkgs/tools/system/journalwatch/default.nix index b41196b85c91..0ec7ef36623e 100644 --- a/pkgs/tools/system/journalwatch/default.nix +++ b/pkgs/tools/system/journalwatch/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder, systemd, pytest }: +{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder, systemd, pytest }: buildPythonPackage rec { pname = "journalwatch"; @@ -30,7 +30,7 @@ buildPythonPackage rec { ]; - meta = with stdenv.lib; { + meta = with lib; { description = "journalwatch is a tool to find error messages in the systemd journal."; homepage = "https://github.com/The-Compiler/journalwatch"; license = licenses.gpl3Plus; diff --git a/pkgs/tools/system/ledmon/default.nix b/pkgs/tools/system/ledmon/default.nix index 6775a4711261..ee9ba6c73466 100644 --- a/pkgs/tools/system/ledmon/default.nix +++ b/pkgs/tools/system/ledmon/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, perl, udev, sg3_utils }: +{ lib, stdenv, fetchFromGitHub, perl, udev, sg3_utils }: stdenv.mkDerivation rec { pname = "ledmon"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { "LEDMON_INSTDIR=${placeholder "out"}/sbin" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/intel/ledmon"; description = "Enclosure LED Utilities"; platforms = platforms.linux; diff --git a/pkgs/tools/system/loadwatch/default.nix b/pkgs/tools/system/loadwatch/default.nix index eb7f1e3bb59b..d7abc8767749 100644 --- a/pkgs/tools/system/loadwatch/default.nix +++ b/pkgs/tools/system/loadwatch/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, ... }: +{ lib, stdenv, fetchgit, ... }: stdenv.mkDerivation { name = "loadwatch-1.1-1-g6d2544c"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { mkdir -p $out/bin install loadwatch lw-ctl $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Run a program using only idle cycles"; license = licenses.gpl2; maintainers = with maintainers; [ woffs ]; diff --git a/pkgs/tools/system/localtime/default.nix b/pkgs/tools/system/localtime/default.nix index 805a70c74e9e..99e0674016b6 100644 --- a/pkgs/tools/system/localtime/default.nix +++ b/pkgs/tools/system/localtime/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildGoPackage, m4 }: +{ lib, stdenv, fetchFromGitHub, buildGoPackage, m4 }: buildGoPackage rec { name = "localtime-2017-11-07"; @@ -28,7 +28,7 @@ buildGoPackage rec { make install $makeFlags ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A daemon for keeping the system timezone up-to-date based on the current location"; homepage = "https://github.com/Stebalien/localtime"; platforms = platforms.linux; diff --git a/pkgs/tools/system/logcheck/default.nix b/pkgs/tools/system/logcheck/default.nix index 71edfde9a0b3..bdf2a4bcd302 100644 --- a/pkgs/tools/system/logcheck/default.nix +++ b/pkgs/tools/system/logcheck/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, lockfileProgs, perlPackages }: +{ lib, stdenv, fetchurl, lockfileProgs, perlPackages }: stdenv.mkDerivation rec { pname = "logcheck"; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { "SHAREDIR=share/logtail/detectrotate" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Mails anomalies in the system logfiles to the administrator"; longDescription = '' Mails anomalies in the system logfiles to the administrator. diff --git a/pkgs/tools/system/lr/default.nix b/pkgs/tools/system/lr/default.nix index 8d2febbeb8af..43d37569ba31 100644 --- a/pkgs/tools/system/lr/default.nix +++ b/pkgs/tools/system/lr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "lr"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/chneukirchen/lr"; description = "List files recursively"; license = licenses.mit; diff --git a/pkgs/tools/system/lshw/default.nix b/pkgs/tools/system/lshw/default.nix index 3d1a6ace08e4..18fe6ca43b15 100644 --- a/pkgs/tools/system/lshw/default.nix +++ b/pkgs/tools/system/lshw/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://ezix.org/project/wiki/HardwareLiSter"; description = "Provide detailed information on the hardware configuration of the machine"; license = licenses.gpl2; diff --git a/pkgs/tools/system/memtester/default.nix b/pkgs/tools/system/memtester/default.nix index 870d7e0dd1db..276d4f446cfa 100644 --- a/pkgs/tools/system/memtester/default.nix +++ b/pkgs/tools/system/memtester/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "memtester"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { installFlags = [ "INSTALLPATH=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A userspace utility for testing the memory subsystem for faults"; homepage = "http://pyropus.ca/software/memtester/"; license = licenses.gpl2; diff --git a/pkgs/tools/system/mlc/default.nix b/pkgs/tools/system/mlc/default.nix index d055c98e04cb..257cd31c0606 100644 --- a/pkgs/tools/system/mlc/default.nix +++ b/pkgs/tools/system/mlc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, patchelf }: +{ lib, stdenv, fetchurl, patchelf }: stdenv.mkDerivation rec { pname = "mlc"; version = "3.9"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/bin/mlc ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://software.intel.com/content/www/us/en/develop/articles/intelr-memory-latency-checker.html"; description = "Intel Memory Latency Checker"; license = licenses.unfree; diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix index 8192dfe6c14d..3c1fe75b581d 100644 --- a/pkgs/tools/system/netdata/default.nix +++ b/pkgs/tools/system/netdata/default.nix @@ -15,14 +15,14 @@ with stdenv.lib; let go-d-plugin = callPackage ./go.d.plugin.nix {}; in stdenv.mkDerivation rec { - version = "1.26.0"; + version = "1.28.0"; pname = "netdata"; src = fetchFromGitHub { owner = "netdata"; repo = "netdata"; rev = "v${version}"; - sha256 = "0pvl1y1qscwp1chrbmk43xf9ddjxgfm0hcslbdbljjis7ng4gacg"; + sha256 = "1266jbfw55r1zh00xi6c90j2fs9hw8hmsb7686rh04l8mffny9f4"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/tools/system/netdata/go.d.plugin.nix b/pkgs/tools/system/netdata/go.d.plugin.nix index 3cf3a1b116bf..3b97747f8793 100644 --- a/pkgs/tools/system/netdata/go.d.plugin.nix +++ b/pkgs/tools/system/netdata/go.d.plugin.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "netdata-go.d.plugin"; - version = "0.25.0"; + version = "0.26.2"; src = fetchFromGitHub { owner = "netdata"; repo = "go.d.plugin"; rev = "v${version}"; - sha256 = "0cp1asw10a8ndndzq8r57mncrm8521aw3x081vrlfqvhp6qahr3j"; + sha256 = "1jy5pc1ihyrg6sqyw0d48bsqa7kr7kqz10k3845g958vgfmfig59"; }; vendorSha256 = "16b6i9cpk8j7292qgjvida70rg7nixi6g94wayzikx01vmdbis5r"; diff --git a/pkgs/tools/system/nvtop/default.nix b/pkgs/tools/system/nvtop/default.nix index 1b826e6fab4f..fdbfeb1c31f3 100644 --- a/pkgs/tools/system/nvtop/default.nix +++ b/pkgs/tools/system/nvtop/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, cudatoolkit, ncurses, addOpenGLRunpath }: +{ lib, stdenv, fetchFromGitHub, cmake, cudatoolkit, ncurses, addOpenGLRunpath }: stdenv.mkDerivation rec { pname = "nvtop"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { addOpenGLRunpath $out/bin/nvtop ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A (h)top like task monitor for NVIDIA GPUs"; homepage = "https://github.com/Syllo/nvtop"; license = licenses.gpl3; diff --git a/pkgs/tools/system/opencl-info/default.nix b/pkgs/tools/system/opencl-info/default.nix index 34295c90ae43..d5fd86f231ab 100644 --- a/pkgs/tools/system/opencl-info/default.nix +++ b/pkgs/tools/system/opencl-info/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, opencl-clhpp, ocl-icd }: +{ lib, stdenv, fetchFromGitHub, opencl-clhpp, ocl-icd }: stdenv.mkDerivation { name = "opencl-info-2014-02-21"; @@ -26,7 +26,7 @@ stdenv.mkDerivation { install -Dm755 opencl-info $out/bin/opencl-info ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A tool to dump OpenCL platform/device information"; homepage = "https://github.com/marchv/opencl-info"; license = licenses.mit; diff --git a/pkgs/tools/system/pciutils/default.nix b/pkgs/tools/system/pciutils/default.nix index cf6616417ed0..226f55f00dcc 100644 --- a/pkgs/tools/system/pciutils/default.nix +++ b/pkgs/tools/system/pciutils/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, pkgconfig, zlib, kmod, which -, static ? stdenv.targetPlatform.isStatic +{ lib, stdenv, fetchurl, pkgconfig, zlib, kmod, which +, static ? stdenv.hostPlatform.isStatic , darwin ? null }: @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { # Get rid of update-pciids as it won't work. postInstall = "rm $out/sbin/update-pciids $out/man/man8/update-pciids.8"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://mj.ucw.cz/pciutils.html"; description = "A collection of programs for inspecting and manipulating configuration of PCI devices"; license = licenses.gpl2Plus; diff --git a/pkgs/tools/system/pcstat/default.nix b/pkgs/tools/system/pcstat/default.nix index 436fa5cae6fc..9e0f6fe147e6 100644 --- a/pkgs/tools/system/pcstat/default.nix +++ b/pkgs/tools/system/pcstat/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage { pname = "pcstat-unstable"; @@ -15,7 +15,7 @@ buildGoPackage { goDeps = ./deps.nix; - meta = with stdenv.lib; { + meta = with lib; { description = "Page Cache stat: get page cache stats for files on Linux"; homepage = "https://github.com/tobert/pcstat"; license = licenses.asl20; diff --git a/pkgs/tools/system/plan9port/default.nix b/pkgs/tools/system/plan9port/default.nix index 8164dfa9136d..c7c2ff60a7d9 100644 --- a/pkgs/tools/system/plan9port/default.nix +++ b/pkgs/tools/system/plan9port/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, which +{ lib, stdenv, fetchFromGitHub, which , darwin ? null , xorgproto ? null , libX11 @@ -79,7 +79,7 @@ stdenv.mkDerivation { ./test ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://9fans.github.io/plan9port/"; description = "Plan 9 from User Space"; longDescription = '' diff --git a/pkgs/tools/system/proot/default.nix b/pkgs/tools/system/proot/default.nix index 06147df093e6..e1871eeb7336 100644 --- a/pkgs/tools/system/proot/default.nix +++ b/pkgs/tools/system/proot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , talloc, docutils, swig, python, coreutils, enablePython ? true }: stdenv.mkDerivation { @@ -36,7 +36,7 @@ stdenv.mkDerivation { install -Dm644 doc/proot/man.1 $out/share/man/man1/proot.1 ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://proot-me.github.io"; description = "User-space implementation of chroot, mount --bind and binfmt_misc"; platforms = platforms.linux; diff --git a/pkgs/tools/system/ps_mem/default.nix b/pkgs/tools/system/ps_mem/default.nix index 45a33a1adb7b..dcca1a86da74 100644 --- a/pkgs/tools/system/ps_mem/default.nix +++ b/pkgs/tools/system/ps_mem/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pythonPackages, fetchFromGitHub }: +{ lib, stdenv, pythonPackages, fetchFromGitHub }: let version = "3.13"; @@ -13,7 +13,7 @@ in pythonPackages.buildPythonApplication { sha256 = "0pgi9hvwfbkzvwicqlkwx4rwal1ikza018yxbwpnf7c80zw0zaw9"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A utility to accurately report the in core memory usage for a program"; homepage = "https://github.com/pixelb/ps_mem"; license = licenses.lgpl21; diff --git a/pkgs/tools/system/psstop/default.nix b/pkgs/tools/system/psstop/default.nix index 3a5ee2b05813..dd2b30ada123 100644 --- a/pkgs/tools/system/psstop/default.nix +++ b/pkgs/tools/system/psstop/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, glib }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, glib }: stdenv.mkDerivation rec { pname = "psstop"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/clearlinux/psstop"; description = "Show processes' memory usage by looking into pss"; # upstream summary license = licenses.gpl3; diff --git a/pkgs/tools/system/rowhammer-test/default.nix b/pkgs/tools/system/rowhammer-test/default.nix index 02462584c650..e2d736477ee7 100644 --- a/pkgs/tools/system/rowhammer-test/default.nix +++ b/pkgs/tools/system/rowhammer-test/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation { name = "rowhammer-test-20150811"; @@ -19,7 +19,7 @@ stdenv.mkDerivation { cp rowhammer_test double_sided_rowhammer $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Test DRAM for bit flips caused by the rowhammer problem"; homepage = "https://github.com/google/rowhammer-test"; license = licenses.asl20; diff --git a/pkgs/tools/system/runit/default.nix b/pkgs/tools/system/runit/default.nix index acca0acf3ef9..977550837df6 100644 --- a/pkgs/tools/system/runit/default.nix +++ b/pkgs/tools/system/runit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, darwin +{ lib, stdenv, fetchurl, darwin # Build runit-init as a static binary , static ? false @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { cp -r ../man $man/share/man/man8 ''; - meta = with stdenv.lib; { + meta = with lib; { description = "UNIX init scheme with service supervision"; license = licenses.bsd3; homepage = "http://smarden.org/runit"; diff --git a/pkgs/tools/system/s-tui/default.nix b/pkgs/tools/system/s-tui/default.nix index 1192a1762632..51c47ab10507 100644 --- a/pkgs/tools/system/s-tui/default.nix +++ b/pkgs/tools/system/s-tui/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python3Packages }: +{ lib, stdenv, python3Packages }: python3Packages.buildPythonPackage rec { pname = "s-tui"; @@ -16,7 +16,7 @@ python3Packages.buildPythonPackage rec { LC_ALL = "en_US.UTF-8"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://amanusk.github.io/s-tui/"; description = "Stress-Terminal UI monitoring tool"; license = licenses.gpl2; diff --git a/pkgs/tools/system/safe-rm/default.nix b/pkgs/tools/system/safe-rm/default.nix index c188f066d180..c76a48ff8d59 100644 --- a/pkgs/tools/system/safe-rm/default.nix +++ b/pkgs/tools/system/safe-rm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, perl, coreutils }: +{ lib, stdenv, fetchgit, perl, coreutils }: stdenv.mkDerivation rec { pname = "safe-rm"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { pod2man safe-rm > $out/share/man/man1/safe-rm.1 ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Tool intended to prevent the accidental deletion of important files"; homepage = "https://launchpad.net/safe-rm"; license = licenses.gpl3; diff --git a/pkgs/tools/system/sg3_utils/default.nix b/pkgs/tools/system/sg3_utils/default.nix index 45e3287511a3..d0084e1f4d8a 100644 --- a/pkgs/tools/system/sg3_utils/default.nix +++ b/pkgs/tools/system/sg3_utils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "sg3_utils-1.45"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0qasc3qm4i8swjfaywiwpgz76gdxqvm47qycxgmprbsjmxqwk1qb"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://sg.danny.cz/sg/"; description = "Utilities that send SCSI commands to devices"; platforms = platforms.linux; diff --git a/pkgs/tools/system/smartmontools/default.nix b/pkgs/tools/system/smartmontools/default.nix index 5d9196fcc163..093fd7b5bd50 100644 --- a/pkgs/tools/system/smartmontools/default.nix +++ b/pkgs/tools/system/smartmontools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook +{ lib, stdenv, fetchurl, autoreconfHook , mailutils, inetutils , IOKit ? null , ApplicationServices ? null }: @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { buildInputs = [] ++ stdenv.lib.optionals stdenv.isDarwin [IOKit ApplicationServices]; enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Tools for monitoring the health of hard drives"; homepage = "https://www.smartmontools.org/"; license = licenses.gpl2Plus; diff --git a/pkgs/tools/system/snooze/default.nix b/pkgs/tools/system/snooze/default.nix index fb1ceaf897b8..750a0954d3fb 100644 --- a/pkgs/tools/system/snooze/default.nix +++ b/pkgs/tools/system/snooze/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "snooze"; version = "0.4"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; makeFlags = [ "DESTDIR=$(out)" "PREFIX=/" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Tool for waiting until a particular time and then running a command"; maintainers = with maintainers; [ kaction ]; license = licenses.cc0; diff --git a/pkgs/tools/system/stress-ng/default.nix b/pkgs/tools/system/stress-ng/default.nix index 9939f9ea1542..f033b038267e 100644 --- a/pkgs/tools/system/stress-ng/default.nix +++ b/pkgs/tools/system/stress-ng/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , attr, judy, keyutils, libaio, libapparmor, libbsd, libcap, libgcrypt, lksctp-tools, zlib }: @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { # mystery, though. :-( enableParallelBuilding = (!stdenv.isi686); - meta = with stdenv.lib; { + meta = with lib; { description = "Stress test a computer system"; longDescription = '' stress-ng will stress test a computer system in various selectable ways. It diff --git a/pkgs/tools/system/stress/default.nix b/pkgs/tools/system/stress/default.nix index 1595e8347e15..2b9923eb571b 100644 --- a/pkgs/tools/system/stress/default.nix +++ b/pkgs/tools/system/stress/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "stress-1.0.4"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0nw210jajk38m3y7h8s130ps2qsbz7j75wab07hi2r3hlz14yzh5"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Simple workload generator for POSIX systems. It imposes a configurable amount of CPU, memory, I/O, and disk stress on the system"; license = licenses.gpl2; platforms = platforms.unix; diff --git a/pkgs/tools/system/suid-chroot/default.nix b/pkgs/tools/system/suid-chroot/default.nix index 9697748e056d..e12b0d828619 100644 --- a/pkgs/tools/system/suid-chroot/default.nix +++ b/pkgs/tools/system/suid-chroot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "suid-chroot"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sed -i -e '/chmod u+s/d' Makefile ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Setuid-safe wrapper for chroot"; license = licenses.gpl2Plus; platforms = with platforms; unix; diff --git a/pkgs/tools/system/supervise/default.nix b/pkgs/tools/system/supervise/default.nix index cbf96818f486..2776d28fa38d 100644 --- a/pkgs/tools/system/supervise/default.nix +++ b/pkgs/tools/system/supervise/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip }: +{ lib, stdenv, fetchzip }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0jk6q2f67pfs18ah040lmsbvbrnjap7w04jjddsfn1j5bcrvs13x"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/catern/supervise"; description = "A minimal unprivileged process supervisor making use of modern Linux features"; platforms = platforms.linux; diff --git a/pkgs/tools/system/symlinks/default.nix b/pkgs/tools/system/symlinks/default.nix index 93a6bbf0c75b..ad275a2d4479 100644 --- a/pkgs/tools/system/symlinks/default.nix +++ b/pkgs/tools/system/symlinks/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv }: +{ fetchurl, lib, stdenv }: stdenv.mkDerivation rec { pname = "symlinks"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { cp symlinks.8 $out/share/man/man8 ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Find and remedy problematic symbolic links on a system"; homepage = "https://github.com/brandt/symlinks"; license = licenses.mit; diff --git a/pkgs/tools/system/syslog-ng-incubator/default.nix b/pkgs/tools/system/syslog-ng-incubator/default.nix index 5d802dbed7e5..51d79d267dd7 100644 --- a/pkgs/tools/system/syslog-ng-incubator/default.nix +++ b/pkgs/tools/system/syslog-ng-incubator/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, glib, syslogng +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, glib, syslogng , eventlog, perl, python, yacc, protobufc, libivykis, libcap, czmq }: @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { "--with-module-dir=$(out)/lib/syslog-ng" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/balabit/syslog-ng-incubator"; description = "A collection of tools and modules for syslog-ng"; license = licenses.gpl2; diff --git a/pkgs/tools/system/syslog-ng/default.nix b/pkgs/tools/system/syslog-ng/default.nix index eeb2a99740ee..527e82e8cf15 100644 --- a/pkgs/tools/system/syslog-ng/default.nix +++ b/pkgs/tools/system/syslog-ng/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl, libcap, curl, which +{ lib, stdenv, fetchurl, openssl, libcap, curl, which , eventlog, pkgconfig, glib, python, systemd, perl , riemann_c_client, protobufc, pcre, libnet , json_c, libuuid, libivykis, mongoc, rabbitmq-c @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.syslog-ng.com"; description = "Next-generation syslogd with advanced networking and filtering capabilities"; license = licenses.gpl2; diff --git a/pkgs/tools/system/systemd-journal2gelf/default.nix b/pkgs/tools/system/systemd-journal2gelf/default.nix index d10cbb197c50..7ac5d7cf210f 100644 --- a/pkgs/tools/system/systemd-journal2gelf/default.nix +++ b/pkgs/tools/system/systemd-journal2gelf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "SystemdJournal2Gelf-unstable"; @@ -14,7 +14,7 @@ buildGoPackage rec { goPackagePath = "github.com/parse-nl/SystemdJournal2Gelf"; - meta = with stdenv.lib; { + meta = with lib; { description = "Export entries from systemd's journal and send them to a graylog server using gelf"; license = licenses.bsd2; maintainers = with maintainers; [ fadenb fpletz ]; diff --git a/pkgs/tools/system/testdisk/default.nix b/pkgs/tools/system/testdisk/default.nix index bbece24bf655..032b20617447 100644 --- a/pkgs/tools/system/testdisk/default.nix +++ b/pkgs/tools/system/testdisk/default.nix @@ -1,5 +1,5 @@ { mkDerivation -, stdenv +, lib, stdenv , fetchurl , ncurses , libuuid @@ -43,7 +43,7 @@ assert enableQt -> qwt != null; NIX_CFLAGS_COMPILE="-Wno-unused"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.cgsecurity.org/wiki/Main_Page"; downloadPage = "https://www.cgsecurity.org/wiki/TestDisk_Download"; description = "Data recovery utilities"; diff --git a/pkgs/tools/system/thermald/default.nix b/pkgs/tools/system/thermald/default.nix index 4c076db7b8c0..16259f3b9ff0 100644 --- a/pkgs/tools/system/thermald/default.nix +++ b/pkgs/tools/system/thermald/default.nix @@ -12,7 +12,7 @@ , libxml2 , lzma , pkgconfig -, stdenv +, lib, stdenv , upower }: @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { cp ./data/thermal-conf.xml $out/etc/thermald/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Thermal Daemon"; homepage = "https://01.org/linux-thermal-daemon"; changelog = "https://github.com/intel/thermal_daemon/blob/master/README.txt"; diff --git a/pkgs/tools/system/thinkfan/default.nix b/pkgs/tools/system/thinkfan/default.nix index bf594b6b9cd1..48d5d5fc08be 100644 --- a/pkgs/tools/system/thinkfan/default.nix +++ b/pkgs/tools/system/thinkfan/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, libyamlcpp, pkgconfig +{ lib, stdenv, fetchFromGitHub, cmake, libyamlcpp, pkgconfig , smartSupport ? false, libatasmart }: stdenv.mkDerivation rec { @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A minimalist fan control program"; longDescription = "A minimalist fan control program. Originally designed specifically for IBM/Lenovo Thinkpads, it now supports any kind of system via diff --git a/pkgs/tools/system/throttled/default.nix b/pkgs/tools/system/throttled/default.nix index b19e4c471c00..d0458660c20f 100644 --- a/pkgs/tools/system/throttled/default.nix +++ b/pkgs/tools/system/throttled/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python3Packages }: +{ lib, stdenv, fetchFromGitHub, python3Packages }: stdenv.mkDerivation rec { pname = "throttled"; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { postFixup = ''wrapPythonPrograms''; - meta = with stdenv.lib; { + meta = with lib; { description = "Fix for Intel CPU throttling issues"; homepage = "https://github.com/erpalma/throttled"; license = licenses.mit; diff --git a/pkgs/tools/system/tm/default.nix b/pkgs/tools/system/tm/default.nix index 390eae4de50a..aa946c72ffc6 100644 --- a/pkgs/tools/system/tm/default.nix +++ b/pkgs/tools/system/tm/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation { @@ -15,7 +15,7 @@ stdenv.mkDerivation { sha256 = "3b389bc03b6964ad5ffa57a344b891fdbcf7c9b2604adda723a863f83657c4a0"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://vicerveza.homeunix.net/~viric/soft/tm"; description = "Terminal mixer - multiplexer for the i/o of terminal applications"; license = licenses.gpl2; diff --git a/pkgs/tools/system/tre-command/default.nix b/pkgs/tools/system/tre-command/default.nix index c3241a04587b..5a2ad41c7447 100644 --- a/pkgs/tools/system/tre-command/default.nix +++ b/pkgs/tools/system/tre-command/default.nix @@ -1,4 +1,4 @@ -{ rustPlatform, fetchFromGitHub, stdenv, installShellFiles }: +{ rustPlatform, fetchFromGitHub, lib, stdenv, installShellFiles }: rustPlatform.buildRustPackage rec { pname = "tre-command"; @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { installManPage manual/tre.1 ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Tree command, improved"; homepage = "https://github.com/dduan/tre"; license = licenses.mit; diff --git a/pkgs/tools/system/ts/default.nix b/pkgs/tools/system/ts/default.nix index 4046b3638112..b954b1adc01f 100644 --- a/pkgs/tools/system/ts/default.nix +++ b/pkgs/tools/system/ts/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , sendmailPath ? "/run/wrappers/bin/sendmail" }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sha256 = "15dkzczx10fhl0zs9bmcgkxfbwq2znc7bpscljm4rchbzx7y6lsg"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://vicerveza.homeunix.net/~viric/soft/ts"; description = "Task spooler - batch queue"; license = licenses.gpl2; diff --git a/pkgs/tools/system/tuptime/default.nix b/pkgs/tools/system/tuptime/default.nix index 213a79fe2700..c0c0ef1b2138 100644 --- a/pkgs/tools/system/tuptime/default.nix +++ b/pkgs/tools/system/tuptime/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , makeWrapper, installShellFiles , python3, sqlite }: @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { --prefix PATH : "${stdenv.lib.makeBinPath [ sqlite ]}" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Total uptime & downtime statistics utility"; homepage = "https://github.com/rfrail3/tuptime"; license = licenses.gpl2Plus; diff --git a/pkgs/tools/system/uptimed/default.nix b/pkgs/tools/system/uptimed/default.nix index e9224977542f..0e427a66b261 100644 --- a/pkgs/tools/system/uptimed/default.nix +++ b/pkgs/tools/system/uptimed/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { pname = "uptimed"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; patches = [ ./no-var-spool-install.patch ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Uptime record daemon"; longDescription = '' An uptime record daemon keeping track of the highest uptimes a computer diff --git a/pkgs/tools/system/vbetool/default.nix b/pkgs/tools/system/vbetool/default.nix index dc2ec24e594a..ed0cf5f13c64 100644 --- a/pkgs/tools/system/vbetool/default.nix +++ b/pkgs/tools/system/vbetool/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pciutils, libx86, zlib }: +{ lib, stdenv, fetchurl, pciutils, libx86, zlib }: stdenv.mkDerivation rec { pname = "vbetool"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { configureFlags = [ "LDFLAGS=-lpci" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Video BIOS execution tool"; homepage = "http://www.codon.org.uk/~mjg59/vbetool/"; maintainers = [ maintainers.raskin ]; diff --git a/pkgs/tools/system/vboot_reference/default.nix b/pkgs/tools/system/vboot_reference/default.nix index 1391a2a5ed23..13a1fd37d9c3 100644 --- a/pkgs/tools/system/vboot_reference/default.nix +++ b/pkgs/tools/system/vboot_reference/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitiles, pkgconfig, libuuid, openssl, libyaml, lzma }: +{ lib, stdenv, fetchFromGitiles, pkgconfig, libuuid, openssl, libyaml, lzma }: stdenv.mkDerivation rec { version = "20180311"; @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { cp -r tests/devkeys* $out/share/vboot/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Chrome OS partitioning and kernel signing tools"; license = licenses.bsd3; platforms = platforms.linux; diff --git a/pkgs/tools/system/which/default.nix b/pkgs/tools/system/which/default.nix index 79a50e43ed8b..f4c871d5af08 100644 --- a/pkgs/tools/system/which/default.nix +++ b/pkgs/tools/system/which/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "which-2.21"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1bgafvy3ypbhhfznwjv1lxmd6mci3x1byilnnkc7gcr486wlb8pl"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.gnu.org/software/which/"; description = "Shows the full path of (shell) commands"; platforms = platforms.all; diff --git a/pkgs/tools/system/wsmancli/default.nix b/pkgs/tools/system/wsmancli/default.nix index 79fb92d5bb2a..a0b7fae4d2aa 100644 --- a/pkgs/tools/system/wsmancli/default.nix +++ b/pkgs/tools/system/wsmancli/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig , openssl, openwsman }: stdenv.mkDerivation rec { @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { touch AUTHORS NEWS README ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Openwsman command-line client"; longDescription = '' Openwsman provides a command-line tool, wsman, to perform basic diff --git a/pkgs/tools/system/yeshup/default.nix b/pkgs/tools/system/yeshup/default.nix index 3242eeaeebc5..113d17b09b53 100644 --- a/pkgs/tools/system/yeshup/default.nix +++ b/pkgs/tools/system/yeshup/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "yeshup"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { cp -v yeshup $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/RhysU/yeshup"; platforms = platforms.linux; license = licenses.cc-by-sa-30; # From Stackoverflow answer diff --git a/pkgs/tools/system/zenith/default.nix b/pkgs/tools/system/zenith/default.nix index 35498c4cb563..430b4db25777 100644 --- a/pkgs/tools/system/zenith/default.nix +++ b/pkgs/tools/system/zenith/default.nix @@ -1,4 +1,4 @@ -{ stdenv, rustPlatform, fetchFromGitHub, IOKit }: +{ lib, stdenv, rustPlatform, fetchFromGitHub, IOKit }: rustPlatform.buildRustPackage rec { pname = "zenith"; @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { buildInputs = stdenv.lib.optionals stdenv.isDarwin [ IOKit ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Sort of like top or htop but with zoom-able charts, network, and disk usage"; homepage = "https://github.com/bvaisvil/zenith"; license = licenses.mit; diff --git a/pkgs/tools/text/a2ps/default.nix b/pkgs/tools/text/a2ps/default.nix index c29060cb82fc..978839ab1fde 100644 --- a/pkgs/tools/text/a2ps/default.nix +++ b/pkgs/tools/text/a2ps/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, autoconf, bison, libpaper, gperf, file, perl }: +{ lib, stdenv, fetchurl, fetchpatch, autoconf, bison, libpaper, gperf, file, perl }: stdenv.mkDerivation rec { name = "a2ps-4.14"; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoconf file bison perl ]; buildInputs = [ libpaper gperf ]; - meta = with stdenv.lib; { + meta = with lib; { description = "An Anything to PostScript converter and pretty-printer"; longDescription = '' GNU a2ps converts files into PostScript for printing or viewing. It uses a nice default format, diff --git a/pkgs/tools/text/agrep/default.nix b/pkgs/tools/text/agrep/default.nix index c0816f8ab76c..c5028b281288 100644 --- a/pkgs/tools/text/agrep/default.nix +++ b/pkgs/tools/text/agrep/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation { pname = "agrep"; @@ -23,7 +23,7 @@ stdenv.mkDerivation { makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Approximate grep for fast fuzzy string searching"; homepage = "https://www.tgries.de/agrep/"; license = licenses.isc; diff --git a/pkgs/tools/text/aha/default.nix b/pkgs/tools/text/aha/default.nix index 1a6d65c52cd8..4ac07cef7eed 100644 --- a/pkgs/tools/text/aha/default.nix +++ b/pkgs/tools/text/aha/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "aha"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "ANSI HTML Adapter"; longDescription = '' aha takes ANSI SGR-coloured input and produces W3C-conformant HTML code. diff --git a/pkgs/tools/text/amber/default.nix b/pkgs/tools/text/amber/default.nix index 205efc414d59..0f7a0eb5f846 100644 --- a/pkgs/tools/text/amber/default.nix +++ b/pkgs/tools/text/amber/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform +{ lib, stdenv, fetchFromGitHub, rustPlatform , Security }: @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { buildInputs = stdenv.lib.optional stdenv.isDarwin Security; - meta = with stdenv.lib; { + meta = with lib; { description = "A code search-and-replace tool"; homepage = "https://github.com/dalance/amber"; license = with licenses; [ mit ]; diff --git a/pkgs/tools/text/angle-grinder/default.nix b/pkgs/tools/text/angle-grinder/default.nix index a8702553c4b3..e04530b8110b 100644 --- a/pkgs/tools/text/angle-grinder/default.nix +++ b/pkgs/tools/text/angle-grinder/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , rustPlatform }: @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0y4c1gja0i3h2whjpm74yf3z1y85pkwmpmrl2fjsyy0mn493hzv8"; - meta = with stdenv.lib; { + meta = with lib; { description = "Slice and dice logs on the command line"; homepage = "https://github.com/rcoh/angle-grinder"; license = licenses.mit; diff --git a/pkgs/tools/text/ansifilter/default.nix b/pkgs/tools/text/ansifilter/default.nix index 8d79317ce344..6928c959dfd3 100644 --- a/pkgs/tools/text/ansifilter/default.nix +++ b/pkgs/tools/text/ansifilter/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, boost, lua }: +{ fetchurl, lib, stdenv, pkgconfig, boost, lua }: stdenv.mkDerivation rec { pname = "ansifilter"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { "conf_dir=/etc/ansifilter" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Tool to convert ANSI to other formats"; longDescription = '' Tool to remove ANSI or convert them to another format diff --git a/pkgs/tools/text/ascii/default.nix b/pkgs/tools/text/ascii/default.nix index 94ab5286f8c0..f596c8d330d2 100644 --- a/pkgs/tools/text/ascii/default.nix +++ b/pkgs/tools/text/ascii/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "ascii"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { mkdir -vp "$out/bin" "$out/share/man/man1" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Interactive ASCII name and synonym chart"; homepage = "http://www.catb.org/~esr/ascii/"; license = licenses.bsd3; diff --git a/pkgs/tools/text/boxes/default.nix b/pkgs/tools/text/boxes/default.nix index b9d54d3a9e77..407b2c67a8f0 100644 --- a/pkgs/tools/text/boxes/default.nix +++ b/pkgs/tools/text/boxes/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, bison, flex }: +{ lib, stdenv, fetchFromGitHub, bison, flex }: stdenv.mkDerivation rec { pname = "boxes"; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { install -Dm644 -t $out/share/man/man1 doc/boxes.1 ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Command line ASCII boxes unlimited!"; longDescription = '' Boxes is a command line filter program that draws ASCII art boxes around diff --git a/pkgs/tools/text/catdoc/default.nix b/pkgs/tools/text/catdoc/default.nix index 64ef092f36be..61570a70b7d8 100644 --- a/pkgs/tools/text/catdoc/default.nix +++ b/pkgs/tools/text/catdoc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch }: +{ lib, stdenv, fetchurl, fetchpatch }: stdenv.mkDerivation rec { pname = "catdoc"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-wordview" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "MS-Word/Excel/PowerPoint to text converter"; platforms = platforms.all; license = licenses.gpl2; diff --git a/pkgs/tools/text/catdocx/default.nix b/pkgs/tools/text/catdocx/default.nix index f24864f754b3..adf78397fcb3 100644 --- a/pkgs/tools/text/catdocx/default.nix +++ b/pkgs/tools/text/catdocx/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { ln -s $out/libexec/catdocx.sh $out/bin/catdocx ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Extracts plain text from docx files"; homepage = "https://github.com/jncraton/catdocx"; license = with licenses; [ bsd3 ]; diff --git a/pkgs/tools/text/cconv/default.nix b/pkgs/tools/text/cconv/default.nix index 8fe400aaab25..de16854927b4 100644 --- a/pkgs/tools/text/cconv/default.nix +++ b/pkgs/tools/text/cconv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook }: +{ lib, stdenv, fetchurl, autoreconfHook }: let version = "0.6.3"; in stdenv.mkDerivation { pname = "cconv"; @@ -11,7 +11,7 @@ let version = "0.6.3"; in nativeBuildInputs = [ autoreconfHook ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A iconv based simplified-traditional chinese conversion tool"; homepage = "https://github.com/xiaoyjy/cconv"; license = licenses.mit; diff --git a/pkgs/tools/text/chars/default.nix b/pkgs/tools/text/chars/default.nix index fa58d110550e..a65506154777 100644 --- a/pkgs/tools/text/chars/default.nix +++ b/pkgs/tools/text/chars/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , rustPlatform , Security @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Commandline tool to display information about unicode characters"; homepage = "https://github.com/antifuchs/chars"; license = licenses.mit; diff --git a/pkgs/tools/text/choose/default.nix b/pkgs/tools/text/choose/default.nix index 26192732511f..20d651df008e 100644 --- a/pkgs/tools/text/choose/default.nix +++ b/pkgs/tools/text/choose/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , rustPlatform }: @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1p18926pfff1yayb2i28v0nz37j52hqqv7244yfrzgidi29kyvbc"; - meta = with stdenv.lib; { + meta = with lib; { description = "A human-friendly and fast alternative to cut and (sometimes) awk"; homepage = "https://github.com/theryangeary/choose"; license = licenses.gpl3; diff --git a/pkgs/tools/text/cmigemo/default.nix b/pkgs/tools/text/cmigemo/default.nix index c84299c68436..6787d68991d3 100644 --- a/pkgs/tools/text/cmigemo/default.nix +++ b/pkgs/tools/text/cmigemo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchurl, gzip, libiconv, nkf, perl, skk-dicts, which }: +{ lib, stdenv, fetchFromGitHub, fetchurl, gzip, libiconv, nkf, perl, skk-dicts, which }: stdenv.mkDerivation { pname = "cmigemo"; @@ -25,7 +25,7 @@ stdenv.mkDerivation { installTargets = [ (if stdenv.isDarwin then "osx-install" else "gcc-install") ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A tool that supports Japanese incremental search with Romaji"; homepage = "https://www.kaoriya.net/software/cmigemo"; license = licenses.mit; diff --git a/pkgs/tools/text/colordiff/default.nix b/pkgs/tools/text/colordiff/default.nix index c3da9a605558..04d41b74db0f 100644 --- a/pkgs/tools/text/colordiff/default.nix +++ b/pkgs/tools/text/colordiff/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl /*, xmlto */}: +{ lib, stdenv, fetchurl, perl /*, xmlto */}: stdenv.mkDerivation rec { name = "colordiff-1.0.19"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { installPhase = ''make INSTALL_DIR=/bin MAN_DIR=/share/man/man1 DESTDIR="$out" install''; - meta = with stdenv.lib; { + meta = with lib; { description = "Wrapper for 'diff' that produces the same output but with pretty 'syntax' highlighting"; homepage = "https://www.colordiff.org/"; license = licenses.gpl3; diff --git a/pkgs/tools/text/coloursum/default.nix b/pkgs/tools/text/coloursum/default.nix index 38f544496d5e..0a87e9b3905c 100644 --- a/pkgs/tools/text/coloursum/default.nix +++ b/pkgs/tools/text/coloursum/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform, Security }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, Security }: rustPlatform.buildRustPackage rec { pname = "coloursum"; @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { buildInputs = stdenv.lib.optional stdenv.isDarwin Security; - meta = with stdenv.lib; { + meta = with lib; { description = "Colourise your checksum output"; homepage = "https://github.com/ticky/coloursum"; license = licenses.mit; diff --git a/pkgs/tools/text/copyright-update/default.nix b/pkgs/tools/text/copyright-update/default.nix index ca815f915db3..e0318c20a0e6 100644 --- a/pkgs/tools/text/copyright-update/default.nix +++ b/pkgs/tools/text/copyright-update/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, perl }: +{ lib, stdenv, fetchFromGitHub, perl }: stdenv.mkDerivation rec { pname = "copyright-update"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { installFlags = [ "INSTALL=install" "prefix=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/jaalto/project--copyright-update"; description = "Updates the copyright information in a set of files"; license = licenses.gpl2Plus; diff --git a/pkgs/tools/text/dadadodo/default.nix b/pkgs/tools/text/dadadodo/default.nix index 5de8e25e6fb2..85e57546d933 100644 --- a/pkgs/tools/text/dadadodo/default.nix +++ b/pkgs/tools/text/dadadodo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "dadadodo"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Markov chain-based text generator"; homepage = "http://www.jwz.org/dadadodo"; maintainers = with maintainers; [ pSub ]; diff --git a/pkgs/tools/text/diffr/default.nix b/pkgs/tools/text/diffr/default.nix index 4fa7814ad000..e2dcf4122b1b 100644 --- a/pkgs/tools/text/diffr/default.nix +++ b/pkgs/tools/text/diffr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform, Security }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, Security }: rustPlatform.buildRustPackage rec { pname = "diffr"; @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { export DIFFR_TESTS_BINARY_PATH=$releaseDir/diffr ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Yet another diff highlighting tool"; homepage = "https://github.com/mookid/diffr"; license = with licenses; [ mit ]; diff --git a/pkgs/tools/text/diffstat/default.nix b/pkgs/tools/text/diffstat/default.nix index bed34e30e790..b558386536e4 100644 --- a/pkgs/tools/text/diffstat/default.nix +++ b/pkgs/tools/text/diffstat/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv }: +{ fetchurl, lib, stdenv }: stdenv.mkDerivation rec { name = "diffstat-1.63"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0vyw200s5dv1257pmrh6c6fdkmw3slyz5szpqfx916xr04sdbpby"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Read output of diff and display a histogram of the changes"; longDescription = '' diffstat reads the output of diff and displays a histogram of the diff --git a/pkgs/tools/text/diffutils/default.nix b/pkgs/tools/text/diffutils/default.nix index 6fd69a9ba4cc..8fd36211e2ea 100644 --- a/pkgs/tools/text/diffutils/default.nix +++ b/pkgs/tools/text/diffutils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, xz, coreutils ? null }: +{ lib, stdenv, fetchurl, xz, coreutils ? null }: # Note: this package is used for bootstrapping fetchurl, and thus # cannot use fetchpatch! All mutable patches (generated by GitHub or @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { stdenv.lib.optional (coreutils != null) "PR_PROGRAM=${coreutils}/bin/pr" ++ stdenv.lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "gl_cv_func_getopt_gnu=yes"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.gnu.org/software/diffutils/diffutils.html"; description = "Commands for showing the differences between files (diff, cmp, etc.)"; license = licenses.gpl3; diff --git a/pkgs/tools/text/discount/default.nix b/pkgs/tools/text/discount/default.nix index a2c6ec8a9e08..264e944028e3 100644 --- a/pkgs/tools/text/discount/default.nix +++ b/pkgs/tools/text/discount/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { version = "2.2.7"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Implementation of Markdown markup language in C"; homepage = "http://www.pell.portland.or.us/~orc/Code/discount/"; license = licenses.bsd3; diff --git a/pkgs/tools/text/dos2unix/default.nix b/pkgs/tools/text/dos2unix/default.nix index b85d33d887aa..e2e07e9e4884 100644 --- a/pkgs/tools/text/dos2unix/default.nix +++ b/pkgs/tools/text/dos2unix/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, perl, gettext }: +{lib, stdenv, fetchurl, perl, gettext }: stdenv.mkDerivation rec { pname = "dos2unix"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ perl gettext ]; makeFlags = [ "prefix=${placeholder "out"}" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Convert text files with DOS or Mac line breaks to Unix line breaks and vice versa"; homepage = "https://waterlan.home.xs4all.nl/dos2unix.html"; changelog = "https://sourceforge.net/p/dos2unix/dos2unix/ci/dos2unix-${version}/tree/dos2unix/NEWS.txt?format=raw"; diff --git a/pkgs/tools/text/ebook-tools/default.nix b/pkgs/tools/text/ebook-tools/default.nix index 2a6af785692a..b69ae66e1e26 100644 --- a/pkgs/tools/text/ebook-tools/default.nix +++ b/pkgs/tools/text/ebook-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, pkgconfig, libxml2, libzip }: +{ stdenv, fetchurl, cmake, pkg-config, libxml2, libzip }: stdenv.mkDerivation rec { name = "ebook-tools-0.2.2"; @@ -8,18 +8,19 @@ stdenv.mkDerivation rec { sha256 = "1bi7wsz3p5slb43kj7lgb3r6lb91lvb6ldi556k4y50ix6b5khyb"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake libxml2 libzip ]; + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ libxml2 libzip ]; - preConfigure = + preConfigure = '' NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags libzip)" ''; - meta = { + meta = with stdenv.lib; { homepage = "http://ebook-tools.sourceforge.net"; description = "Tools and library for dealing with various ebook file formats"; maintainers = [ ]; - platforms = stdenv.lib.platforms.all; + platforms = platforms.all; + license = licenses.mit; }; } diff --git a/pkgs/tools/text/enca/default.nix b/pkgs/tools/text/enca/default.nix index 6cfb4721066c..6c23acb86b4b 100644 --- a/pkgs/tools/text/enca/default.nix +++ b/pkgs/tools/text/enca/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libiconv, recode }: +{ lib, stdenv, fetchurl, libiconv, recode }: stdenv.mkDerivation rec { pname = "enca"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ recode libiconv ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Detects the encoding of text files and reencodes them"; longDescription = '' diff --git a/pkgs/tools/text/epubcheck/default.nix b/pkgs/tools/text/epubcheck/default.nix index b40769e55222..88ead40541f1 100644 --- a/pkgs/tools/text/epubcheck/default.nix +++ b/pkgs/tools/text/epubcheck/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip +{ lib, stdenv, fetchzip , jre, makeWrapper }: stdenv.mkDerivation rec { @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { --add-flags "-classpath $classpath com.adobe.epubcheck.tool.Checker" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/w3c/epubcheck"; description = "Validation tool for EPUB"; license = with licenses; [ asl20 bsd3 mpl10 w3c ]; diff --git a/pkgs/tools/text/esh/default.nix b/pkgs/tools/text/esh/default.nix index 171d90026be8..a1d6db2a7c2d 100644 --- a/pkgs/tools/text/esh/default.nix +++ b/pkgs/tools/text/esh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, asciidoctor, gawk, gnused, runtimeShell }: +{ lib, stdenv, fetchFromGitHub, asciidoctor, gawk, gnused, runtimeShell }: stdenv.mkDerivation rec { pname = "esh"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { doCheck = true; checkTarget = "test"; - meta = with stdenv.lib; { + meta = with lib; { description = "Simple templating engine based on shell"; homepage = "https://github.com/jirutka/esh"; license = licenses.mit; diff --git a/pkgs/tools/text/fanficfare/default.nix b/pkgs/tools/text/fanficfare/default.nix index 1dbe45143631..ad92ffa9350b 100644 --- a/pkgs/tools/text/fanficfare/default.nix +++ b/pkgs/tools/text/fanficfare/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python3Packages }: +{ lib, stdenv, python3Packages }: python3Packages.buildPythonApplication rec { pname = "FanFicFare"; @@ -18,7 +18,7 @@ python3Packages.buildPythonApplication rec { doCheck = false; # no tests exist - meta = with stdenv.lib; { + meta = with lib; { description = "Tool for making eBooks from fanfiction web sites"; homepage = "https://github.com/JimmXinu/FanFicFare"; license = licenses.gpl3; diff --git a/pkgs/tools/text/fastmod/default.nix b/pkgs/tools/text/fastmod/default.nix index 023cc58f4a6b..d2a865335c18 100644 --- a/pkgs/tools/text/fastmod/default.nix +++ b/pkgs/tools/text/fastmod/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , rustPlatform , Security @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { buildInputs = stdenv.lib.optional stdenv.isDarwin Security; - meta = with stdenv.lib; { + meta = with lib; { description = "A utility that makes sweeping changes to large, shared code bases"; homepage = "https://github.com/facebookincubator/fastmod"; license = licenses.asl20; diff --git a/pkgs/tools/text/gawk/default.nix b/pkgs/tools/text/gawk/default.nix index 73e2b8a6de49..bcc66cf93dad 100644 --- a/pkgs/tools/text/gawk/default.nix +++ b/pkgs/tools/text/gawk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl # TODO: links -lsigsegv but loses the reference for some reason , withSigsegv ? (false && stdenv.hostPlatform.system != "x86_64-cygwin"), libsigsegv , interactive ? false, readline @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { libsigsegv = if withSigsegv then libsigsegv else null; # for stdenv bootstrap }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.gnu.org/software/gawk/"; description = "GNU implementation of the Awk programming language"; @@ -81,4 +81,3 @@ stdenv.mkDerivation rec { maintainers = [ ]; }; } - diff --git a/pkgs/tools/text/gawk/gawkextlib.nix b/pkgs/tools/text/gawk/gawkextlib.nix index e15b2d4e257d..058712df4095 100644 --- a/pkgs/tools/text/gawk/gawkextlib.nix +++ b/pkgs/tools/text/gawk/gawkextlib.nix @@ -1,4 +1,4 @@ -{ stdenv, recurseIntoAttrs, fetchgit, writeText, pkgconfig, autoreconfHook +{ lib, stdenv, recurseIntoAttrs, fetchgit, writeText, pkgconfig, autoreconfHook , autoconf, automake, libiconv, libtool, texinfo, gettext, gawk, rapidjson, gd , shapelib, libharu, lmdb, gmp, glibcLocales, mpfr, more, postgresql, hiredis , expat, tre, makeWrapper }: @@ -40,7 +40,7 @@ let inherit doCheck; checkInputs = [ more ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://sourceforge.net/projects/gawkextlib/"; description = "Dynamically loaded extension libraries for GNU AWK"; longDescription = '' diff --git a/pkgs/tools/text/gjo/default.nix b/pkgs/tools/text/gjo/default.nix index 28af709c30e0..27dcf633fe7a 100644 --- a/pkgs/tools/text/gjo/default.nix +++ b/pkgs/tools/text/gjo/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildGoModule , fetchFromGitHub }: @@ -16,7 +16,7 @@ buildGoModule rec { vendorSha256 = "0sjjj9z1dhilhpc8pq4154czrb79z9cm044jvn75kxcjv6v5l2m5"; - meta = with stdenv.lib; { + meta = with lib; { description = "Small utility to create JSON objects"; homepage = "https://github.com/skanehira/gjo"; license = licenses.mit; diff --git a/pkgs/tools/text/glogg/default.nix b/pkgs/tools/text/glogg/default.nix index dff7262bed2b..ceddda11c099 100644 --- a/pkgs/tools/text/glogg/default.nix +++ b/pkgs/tools/text/glogg/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, stdenv, fetchFromGitHub, qmake, boost }: +{ mkDerivation, lib, stdenv, fetchFromGitHub, qmake, boost }: mkDerivation rec { pname = "glogg"; @@ -29,7 +29,7 @@ mkDerivation rec { wrapQtApp $out/Applications/glogg.app/Contents/MacOS/glogg ''; - meta = with stdenv.lib; { + meta = with lib; { description = "The fast, smart log explorer"; longDescription = '' A multi-platform GUI application to browse and search through long or complex log files. It is designed with programmers and system administrators in mind. glogg can be seen as a graphical, interactive combination of grep and less. diff --git a/pkgs/tools/text/gnugrep/default.nix b/pkgs/tools/text/gnugrep/default.nix index 08b588691e50..42a9d913dd20 100644 --- a/pkgs/tools/text/gnugrep/default.nix +++ b/pkgs/tools/text/gnugrep/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pcre, libiconv, perl }: +{ lib, stdenv, fetchurl, pcre, libiconv, perl }: # Note: this package is used for bootstrapping fetchurl, and thus # cannot use fetchpatch! All mutable patches (generated by GitHub or @@ -46,7 +46,7 @@ stdenv.mkDerivation { chmod +x $out/bin/egrep $out/bin/fgrep ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.gnu.org/software/grep/"; description = "GNU implementation of the Unix grep command"; diff --git a/pkgs/tools/text/grip-search/default.nix b/pkgs/tools/text/grip-search/default.nix index 921691a40afd..34644e431d9c 100644 --- a/pkgs/tools/text/grip-search/default.nix +++ b/pkgs/tools/text/grip-search/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, boost, pkgconfig, cmake, catch2 }: +{ lib, stdenv, fetchFromGitHub, boost, pkgconfig, cmake, catch2 }: stdenv.mkDerivation rec { pname = "grip-search"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { substituteInPlace src/general/config.h --replace "CUSTOM-BUILD" "${version}" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Fast, indexed regexp search over large file trees"; homepage = "https://github.com/sc0ty/grip"; license = licenses.gpl3; diff --git a/pkgs/tools/text/groff/default.nix b/pkgs/tools/text/groff/default.nix index 20052f6c4cef..d6f1c051de98 100644 --- a/pkgs/tools/text/groff/default.nix +++ b/pkgs/tools/text/groff/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl +{ lib, stdenv, fetchurl, perl , ghostscript #for postscript and html output , psutils, netpbm #for html output , buildPackages @@ -52,6 +52,7 @@ stdenv.mkDerivation rec { "--with-gs=${ghostscript}/bin/gs" ] ++ stdenv.lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "ac_cv_path_PERL=${buildPackages.perl}/bin/perl" + "gl_cv_func_signbit=yes" ]; makeFlags = stdenv.lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ @@ -102,7 +103,7 @@ stdenv.mkDerivation rec { find $perl/ -type f -print0 | xargs --null sed -i 's|${buildPackages.perl}|${perl}|' ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.gnu.org/software/groff/"; description = "GNU Troff, a typesetting package that reads plain text and produces formatted output"; license = licenses.gpl3Plus; diff --git a/pkgs/tools/text/gtranslator/default.nix b/pkgs/tools/text/gtranslator/default.nix index f091d867503b..d8b2df1fc0bd 100644 --- a/pkgs/tools/text/gtranslator/default.nix +++ b/pkgs/tools/text/gtranslator/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , meson , ninja @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "GNOME translation making program"; homepage = "https://wiki.gnome.org/Apps/Gtranslator"; license = licenses.gpl3Plus; diff --git a/pkgs/tools/text/gucci/default.nix b/pkgs/tools/text/gucci/default.nix index 1667f2e45b54..4e938787ff46 100644 --- a/pkgs/tools/text/gucci/default.nix +++ b/pkgs/tools/text/gucci/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "gucci"; @@ -19,7 +19,7 @@ buildGoPackage rec { -ldflags=-X main.AppVersion=${version} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A simple CLI templating tool written in golang"; homepage = "https://github.com/noqcks/gucci"; license = licenses.mit; diff --git a/pkgs/tools/text/highlight/default.nix b/pkgs/tools/text/highlight/default.nix index e4e80e694fe1..62b449ff9c4f 100644 --- a/pkgs/tools/text/highlight/default.nix +++ b/pkgs/tools/text/highlight/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, getopt, lua, boost, pkgconfig, swig, perl, gcc }: +{ lib, stdenv, fetchFromGitLab, getopt, lua, boost, pkgconfig, swig, perl, gcc }: with stdenv.lib; @@ -45,7 +45,7 @@ let make -C extras/swig clean # Clean up intermediate files. ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Source code highlighting tool"; homepage = "http://www.andre-simon.de/doku/highlight/en/highlight.php"; platforms = platforms.unix; diff --git a/pkgs/tools/text/html-tidy/default.nix b/pkgs/tools/text/html-tidy/default.nix index 28e1759fea59..15ee4c756480 100644 --- a/pkgs/tools/text/html-tidy/default.nix +++ b/pkgs/tools/text/html-tidy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, libxslt }: +{ lib, stdenv, fetchFromGitHub, cmake, libxslt }: stdenv.mkDerivation rec { pname = "html-tidy"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { # ATM bin/tidy is statically linked, as upstream provides no other option yet. # https://github.com/htacg/tidy-html5/issues/326#issuecomment-160322107 - meta = with stdenv.lib; { + meta = with lib; { description = "A HTML validator and `tidier'"; longDescription = '' HTML Tidy is a command-line tool and C library that can be diff --git a/pkgs/tools/text/icdiff/default.nix b/pkgs/tools/text/icdiff/default.nix index 15739432a19f..07082c4c56f3 100644 --- a/pkgs/tools/text/icdiff/default.nix +++ b/pkgs/tools/text/icdiff/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pythonPackages }: +{ lib, stdenv, fetchFromGitHub, pythonPackages }: pythonPackages.buildPythonApplication rec { pname = "icdiff"; @@ -11,7 +11,7 @@ pythonPackages.buildPythonApplication rec { sha256 = "080v8h09pv8qwplin4kwfm0kmqjwdqjfxbpcdrv16sv4hwfwl5qd"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.jefftk.com/icdiff"; description = "Side-by-side highlighted command line diffs"; maintainers = with maintainers; [ aneeshusa ]; diff --git a/pkgs/tools/text/invoice2data/default.nix b/pkgs/tools/text/invoice2data/default.nix index 78ab971f0c0d..2ed3005ee776 100644 --- a/pkgs/tools/text/invoice2data/default.nix +++ b/pkgs/tools/text/invoice2data/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python3Packages, xpdf, imagemagick, tesseract }: +{ lib, stdenv, python3Packages, xpdf, imagemagick, tesseract }: python3Packages.buildPythonPackage rec { pname = "invoice2data"; @@ -16,7 +16,7 @@ python3Packages.buildPythonPackage rec { # Tests fails even when ran manually on my ubuntu machine !! doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Data extractor for PDF invoices"; homepage = "https://github.com/invoice-x/invoice2data"; license = licenses.mit; diff --git a/pkgs/tools/text/ispell/default.nix b/pkgs/tools/text/ispell/default.nix index 2f61536ed2c0..9b78b8dad7c9 100644 --- a/pkgs/tools/text/ispell/default.nix +++ b/pkgs/tools/text/ispell/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bison, ncurses }: +{ lib, stdenv, fetchurl, bison, ncurses }: stdenv.mkDerivation rec { pname = "ispell"; @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "An interactive spell-checking program for Unix"; homepage = "https://www.cs.hmc.edu/~geoff/ispell.html"; license = licenses.free; diff --git a/pkgs/tools/text/jumanpp/default.nix b/pkgs/tools/text/jumanpp/default.nix index ecadb4a89d8f..f002e228ac5d 100644 --- a/pkgs/tools/text/jumanpp/default.nix +++ b/pkgs/tools/text/jumanpp/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, cmake, protobuf }: +{ lib, stdenv, fetchurl, cmake, protobuf }: + stdenv.mkDerivation rec { pname = "jumanpp"; version = "2.0.0-rc2"; @@ -7,9 +8,10 @@ stdenv.mkDerivation rec { url = "https://github.com/ku-nlp/${pname}/releases/download/v${version}/${pname}-${version}.tar.xz"; sha256 = "17fzmd0f5m9ayfhsr0mg7hjp3pg1mhbgknhgyd8v87x46g8bg6qp"; }; - buildInputs = [ cmake protobuf ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ protobuf ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A Japanese morphological analyser using a recurrent neural network language model (RNNLM)"; longDescription = '' JUMAN++ is a new morphological analyser that considers semantic diff --git a/pkgs/tools/text/kakasi/default.nix b/pkgs/tools/text/kakasi/default.nix index 626455732599..79b26e6fb56d 100644 --- a/pkgs/tools/text/kakasi/default.nix +++ b/pkgs/tools/text/kakasi/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, libiconv }: +{ lib, stdenv, fetchurl, libiconv }: stdenv.mkDerivation rec { name = "kakasi-2.3.6"; buildInputs = stdenv.lib.optional stdenv.isDarwin [ libiconv ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Kanji Kana Simple Inverter"; longDescription = '' KAKASI is the language processing filter to convert Kanji diff --git a/pkgs/tools/text/kytea/default.nix b/pkgs/tools/text/kytea/default.nix index b120d43287a5..8ef7b276a383 100644 --- a/pkgs/tools/text/kytea/default.nix +++ b/pkgs/tools/text/kytea/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=c++11-narrowing"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.phontron.com/kytea/"; description = "General toolkit developed for analyzing text"; diff --git a/pkgs/tools/text/languagetool/default.nix b/pkgs/tools/text/languagetool/default.nix index 30029d2d4e97..90ddd5b69290 100644 --- a/pkgs/tools/text/languagetool/default.nix +++ b/pkgs/tools/text/languagetool/default.nix @@ -1,19 +1,19 @@ -{ stdenv, fetchzip, jre, makeWrapper }: +{ lib, stdenv, fetchzip, jre, makeWrapper }: stdenv.mkDerivation rec { pname = "LanguageTool"; - version = "5.1"; + version = "5.2"; src = fetchzip { url = "https://www.languagetool.org/download/${pname}-${version}.zip"; - sha256 = "07a2cxsa04lzifphlf5mv88xpnixalmryd0blawblxsmdyhmvg3y"; + sha256 = "1fz3rxqg5z2jxbalraz8lwkzj0jh69zzfmf3vpwywilvl7xlhdrd"; }; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ jre ]; installPhase = '' mkdir -p $out/share - mv * $out/share/ + mv -- * $out/share/ for lt in languagetool{,-commandline,-server};do makeWrapper ${jre}/bin/java $out/bin/$lt \ @@ -24,12 +24,10 @@ stdenv.mkDerivation rec { --add-flags "-cp $out/share/languagetool-server.jar org.languagetool.server.HTTPServer" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://languagetool.org"; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ - edwtjo - ]; + maintainers = with maintainers; [ edwtjo ]; platforms = jre.meta.platforms; description = "A proofreading program for English, French German, Polish, and more"; }; diff --git a/pkgs/tools/text/link-grammar/default.nix b/pkgs/tools/text/link-grammar/default.nix index 25a5d129c81b..ce58f4dbd584 100644 --- a/pkgs/tools/text/link-grammar/default.nix +++ b/pkgs/tools/text/link-grammar/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, python3, sqlite, libedit, zlib }: +{ lib, stdenv, fetchurl, pkgconfig, python3, sqlite, libedit, zlib }: stdenv.mkDerivation rec { version = "5.8.0"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { "--disable-java-bindings" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A Grammar Checking library"; homepage = "https://www.abisource.com/projects/link-grammar/"; license = licenses.lgpl21; diff --git a/pkgs/tools/text/lv/default.nix b/pkgs/tools/text/lv/default.nix index 3e96858f9c9c..48ed867c8e4c 100644 --- a/pkgs/tools/text/lv/default.nix +++ b/pkgs/tools/text/lv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses }: +{ lib, stdenv, fetchurl, ncurses }: stdenv.mkDerivation rec { pname = "lv"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { mkdir -p $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Powerful multi-lingual file viewer / grep"; homepage = "https://web.archive.org/web/20160310122517/www.ff.iij4u.or.jp/~nrt/lv/"; license = licenses.gpl2; diff --git a/pkgs/tools/text/markdown-pp/default.nix b/pkgs/tools/text/markdown-pp/default.nix index eaaa0547964d..55febe117298 100644 --- a/pkgs/tools/text/markdown-pp/default.nix +++ b/pkgs/tools/text/markdown-pp/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, pythonPackages, stdenv }: +{ fetchFromGitHub, pythonPackages, lib, stdenv }: with pythonPackages; buildPythonApplication rec { @@ -15,7 +15,7 @@ buildPythonApplication rec { rev = "v${version}"; sha256 = "180i5wn9z6vdk2k2bh8345z3g80hj7zf5s2pq0h7k9vaxqpp7avc"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Preprocessor for Markdown files to generate a table of contents and other documentation needs"; license = licenses.mit; homepage = "https://github.com/jreese/markdown-pp"; diff --git a/pkgs/tools/text/mawk/default.nix b/pkgs/tools/text/mawk/default.nix index 204d346082c3..d5f228d78730 100644 --- a/pkgs/tools/text/mawk/default.nix +++ b/pkgs/tools/text/mawk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "mawk-1.3.4-20200120"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0dw2icf8bnqd9y0clfd9pkcxz4b2phdihwci13z914mf3wgcvm3z"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Interpreter for the AWK Programming Language"; homepage = "https://invisible-island.net/mawk/mawk.html"; license = licenses.gpl2; diff --git a/pkgs/tools/text/mb2md/default.nix b/pkgs/tools/text/mb2md/default.nix index 91c958cf0675..78ce7f593974 100644 --- a/pkgs/tools/text/mb2md/default.nix +++ b/pkgs/tools/text/mb2md/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, perlPackages }: +{ lib, stdenv, fetchurl, makeWrapper, perlPackages }: let perlDeps = with perlPackages; [ TimeDate ]; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { --set PERL5LIB "${perlPackages.makePerlPath perlDeps}" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "mbox to maildir tool"; license = licenses.publicDomain; platforms = platforms.all; diff --git a/pkgs/tools/text/mdbook/default.nix b/pkgs/tools/text/mdbook/default.nix index 8e0350177425..69b9b8b12cf3 100644 --- a/pkgs/tools/text/mdbook/default.nix +++ b/pkgs/tools/text/mdbook/default.nix @@ -1,21 +1,21 @@ -{ stdenv, fetchFromGitHub, rustPlatform, CoreServices, darwin }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, CoreServices, darwin }: rustPlatform.buildRustPackage rec { pname = "mdbook"; - version = "0.4.4"; + version = "0.4.5"; src = fetchFromGitHub { owner = "rust-lang-nursery"; repo = "mdBook"; rev = "v${version}"; - sha256 = "0nqr5a27i91m71fhpycf60q54qplc920y1fmk9hav3pbb9wcc5dl"; + sha256 = "11v2x0q8pn7hbmznqy872ksr7szyiki9cfhapymjhkf5nwfvcdbb"; }; - cargoSha256 = "1p72iwl9ca7a92nf6wyjjbn0qns0xxb4xrbz2r2nmd83cxs0fplg"; + cargoSha256 = "1psgqj04hzv7p18h4phsahxg4rj9yz38b8mh111k6l8m4r83kd75"; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Create books from MarkDown"; homepage = "https://github.com/rust-lang-nursery/mdbook"; license = [ licenses.mpl20 ]; diff --git a/pkgs/tools/text/mdcat/default.nix b/pkgs/tools/text/mdcat/default.nix index c89d1526257f..5f5a331daca4 100644 --- a/pkgs/tools/text/mdcat/default.nix +++ b/pkgs/tools/text/mdcat/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , rustPlatform , pkgconfig @@ -11,19 +11,19 @@ rustPlatform.buildRustPackage rec { pname = "mdcat"; - version = "0.22.1"; + version = "0.22.2"; src = fetchFromGitHub { owner = "lunaryorn"; repo = pname; rev = "mdcat-${version}"; - hash = "sha256-4sM1xT/JQ+yM5tZkGwK7r0gUT5so9o1MnDJ7apZkRd4="; + hash = "sha256-i36MYTMkbSuWxxlWUDsyYMay/4Mg7M5jEFhHM60UrkM="; }; nativeBuildInputs = [ pkgconfig asciidoctor installShellFiles ]; buildInputs = [ openssl ] ++ stdenv.lib.optional stdenv.isDarwin Security; - cargoSha256 = "sha256-LoNm2/6/FgTKp95ETODY39D8Ou+9X+IXIy625YW9AFI="; + cargoSha256 = "sha256-mnDUIJhEGNoh3eq2Vhww1T/tpZh9RP+RxbRsBNrpOzw="; checkInputs = [ ansi2html ]; # Skip tests that use the network and that include files. @@ -44,7 +44,7 @@ rustPlatform.buildRustPackage rec { installShellCompletion --zsh $releaseDir/build/mdcat-*/out/completions/_mdcat ''; - meta = with stdenv.lib; { + meta = with lib; { description = "cat for markdown"; homepage = "https://github.com/lunaryorn/mdcat"; license = with licenses; [ asl20 ]; diff --git a/pkgs/tools/text/mecab/default.nix b/pkgs/tools/text/mecab/default.nix index 32060a6179a2..c579dcb8a175 100644 --- a/pkgs/tools/text/mecab/default.nix +++ b/pkgs/tools/text/mecab/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, mecab-ipadic }: +{ lib, stdenv, fetchurl, mecab-ipadic }: let mecab-base = import ./base.nix { inherit fetchurl; }; @@ -10,7 +10,7 @@ stdenv.mkDerivation (mecab-base // { sed -i 's|^dicdir = .*$|dicdir = ${mecab-ipadic}|' "$out/etc/mecabrc" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Japanese morphological analysis system"; homepage = "http://taku910.github.io/mecab/"; license = licenses.bsd3; diff --git a/pkgs/tools/text/miller/default.nix b/pkgs/tools/text/miller/default.nix index ca71c3a1b3d4..9cc31be7ed49 100644 --- a/pkgs/tools/text/miller/default.nix +++ b/pkgs/tools/text/miller/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, flex, libtool }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, flex, libtool }: stdenv.mkDerivation rec { pname = "miller"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook flex libtool ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Like awk, sed, cut, join, and sort for name-indexed data such as CSV, TSV, and tabular JSON"; homepage = "http://johnkerl.org/miller/"; license = licenses.bsd2; diff --git a/pkgs/tools/text/numdiff/default.nix b/pkgs/tools/text/numdiff/default.nix index 6e0c7e756493..db27c1bfd0c0 100644 --- a/pkgs/tools/text/numdiff/default.nix +++ b/pkgs/tools/text/numdiff/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { url = "mirror://savannah/numdiff/numdiff-${version}.tar.gz"; sha256 = "1vzmjh8mhwwysn4x4m2vif7q2k8i19x8azq7pzmkwwj4g48lla47"; }; - meta = with stdenv.lib; { + meta = with lib; { description = '' A little program that can be used to compare putatively similar files line by line and field by field, ignoring small numeric differences diff --git a/pkgs/tools/text/ocrmypdf/default.nix b/pkgs/tools/text/ocrmypdf/default.nix index 1e2b76c008e0..2ba34d42270c 100644 --- a/pkgs/tools/text/ocrmypdf/default.nix +++ b/pkgs/tools/text/ocrmypdf/default.nix @@ -7,7 +7,7 @@ , python3 , python3Packages , qpdf -, stdenv +, lib, stdenv , tesseract4 , unpaper , substituteAll @@ -80,7 +80,7 @@ buildPythonApplication rec { makeWrapperArgs = [ "--prefix PATH : ${stdenv.lib.makeBinPath [ ghostscript jbig2enc pngquant qpdf tesseract4 unpaper ]}" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/jbarlow83/OCRmyPDF"; description = "Adds an OCR text layer to scanned PDF files, allowing them to be searched"; license = licenses.gpl3; diff --git a/pkgs/tools/text/opencc/default.nix b/pkgs/tools/text/opencc/default.nix index 54027de9acde..32c82341d7b2 100644 --- a/pkgs/tools/text/opencc/default.nix +++ b/pkgs/tools/text/opencc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, python }: +{ lib, stdenv, fetchFromGitHub, cmake, python }: stdenv.mkDerivation rec { pname = "opencc"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { # Parallel building occasionaly fails with: Error copying file "/tmp/nix-build-opencc-1.0.5.drv-0/OpenCC-ver.1.0.5/build/src/libopencc.so.1.0.0" to "/tmp/nix-build-opencc-1.0.5.drv-0/OpenCC-ver.1.0.5/build/src/tools". enableParallelBuilding = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/BYVoid/OpenCC"; license = licenses.asl20; description = "A project for conversion between Traditional and Simplified Chinese"; diff --git a/pkgs/tools/text/papertrail/default.nix b/pkgs/tools/text/papertrail/default.nix index d635fab74d5a..57e79b08fda8 100644 --- a/pkgs/tools/text/papertrail/default.nix +++ b/pkgs/tools/text/papertrail/default.nix @@ -1,4 +1,4 @@ -{ stdenv, bundlerEnv, ruby, bundlerUpdateScript }: +{ lib, stdenv, bundlerEnv, ruby, bundlerUpdateScript }: let papertrail-env = bundlerEnv { @@ -20,7 +20,7 @@ in stdenv.mkDerivation { passthru.updateScript = bundlerUpdateScript "papertrail"; - meta = with stdenv.lib; { + meta = with lib; { description = "Command-line client for Papertrail log management service"; homepage = "https://github.com/papertrail/papertrail-cli/"; license = licenses.mit; diff --git a/pkgs/tools/text/par/default.nix b/pkgs/tools/text/par/default.nix index 54b5e6566e87..e4c6c5d0c086 100644 --- a/pkgs/tools/text/par/default.nix +++ b/pkgs/tools/text/par/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, fetchpatch}: +{lib, stdenv, fetchurl, fetchpatch}: stdenv.mkDerivation { pname = "par"; @@ -18,7 +18,10 @@ stdenv.mkDerivation { }) ]; - buildPhase = ''make -f protoMakefile''; + makefile = "protoMakefile"; + preBuild = '' + makeFlagsArray+=(CC="${stdenv.cc.targetPrefix}cc -c" LINK1=${stdenv.cc.targetPrefix}cc) + ''; installPhase = '' mkdir -p $out/bin @@ -29,7 +32,7 @@ stdenv.mkDerivation { ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.nicemice.net/par/"; description = "Paragraph reflow for email"; platforms = platforms.unix; diff --git a/pkgs/tools/text/patchutils/generic.nix b/pkgs/tools/text/patchutils/generic.nix index 52961e58c0ee..d3e9da242e2e 100644 --- a/pkgs/tools/text/patchutils/generic.nix +++ b/pkgs/tools/text/patchutils/generic.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl +{ lib, stdenv, fetchurl, perl , version, sha256, patches ? [] , ... }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { doCheck = false; # fails - meta = with stdenv.lib; { + meta = with lib; { description = "Tools to manipulate patch files"; homepage = "http://cyberelk.net/tim/software/patchutils"; license = licenses.gpl2Plus; diff --git a/pkgs/tools/text/pbgopy/default.nix b/pkgs/tools/text/pbgopy/default.nix index 0982fbf28b5f..cb8b981b2655 100644 --- a/pkgs/tools/text/pbgopy/default.nix +++ b/pkgs/tools/text/pbgopy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "pbgopy"; @@ -13,7 +13,7 @@ buildGoModule rec { vendorSha256 = "09hn92bi2rmixpsgckbi8f70widls40fwqqm7y7rqglyjqi7rdmw"; - meta = with stdenv.lib; { + meta = with lib; { description = "Copy and paste between devices"; homepage = "https://github.com/nakabonne/pbgopy"; license = licenses.mit; diff --git a/pkgs/tools/text/peco/default.nix b/pkgs/tools/text/peco/default.nix index c5655cb2a585..03d3580ddedb 100644 --- a/pkgs/tools/text/peco/default.nix +++ b/pkgs/tools/text/peco/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "peco"; @@ -16,7 +16,7 @@ buildGoPackage rec { goDeps = ./deps.nix; - meta = with stdenv.lib; { + meta = with lib; { description = "Simplistic interactive filtering tool"; homepage = "https://github.com/peco/peco"; license = licenses.mit; diff --git a/pkgs/tools/text/platinum-searcher/default.nix b/pkgs/tools/text/platinum-searcher/default.nix index e621d13f013d..30e7e58345d6 100644 --- a/pkgs/tools/text/platinum-searcher/default.nix +++ b/pkgs/tools/text/platinum-searcher/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "the_platinum_searcher"; @@ -16,7 +16,7 @@ buildGoPackage rec { goDeps = ./deps.nix; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/monochromegane/the_platinum_searcher"; description = "A code search tool similar to ack and the_silver_searcher(ag)"; license = licenses.mit; diff --git a/pkgs/tools/text/podiff/default.nix b/pkgs/tools/text/podiff/default.nix index b76dfd2256a0..b44003a9f0df 100644 --- a/pkgs/tools/text/podiff/default.nix +++ b/pkgs/tools/text/podiff/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation { pname = "podiff"; @@ -15,7 +15,7 @@ stdenv.mkDerivation { mkdir -p $out/share/man/man1 ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Finds differences in translations between two PO files, or revisions"; homepage = "http://puszcza.gnu.org.ua/software/podiff"; license = licenses.gpl3Plus; diff --git a/pkgs/tools/text/poedit/default.nix b/pkgs/tools/text/poedit/default.nix index 1c82d8d365e7..54c3da224d80 100644 --- a/pkgs/tools/text/poedit/default.nix +++ b/pkgs/tools/text/poedit/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, autoconf, automake, libtool, gettext, pkgconfig, wxGTK30, - boost, icu, lucenepp, asciidoc, libxslt, xmlto, gtk2, gtkspell2, pugixml, +{ lib, stdenv, fetchurl, autoconf, automake, libtool, gettext, pkgconfig, wxGTK30-gtk3, + boost, icu, lucenepp, asciidoc, libxslt, xmlto, gtk3, gtkspell3, pugixml, nlohmann_json, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoconf automake asciidoc wrapGAppsHook libxslt xmlto boost libtool pkgconfig ]; - buildInputs = [ lucenepp nlohmann_json wxGTK30 icu pugixml gtk2 gtkspell2 hicolor-icon-theme ]; + buildInputs = [ lucenepp nlohmann_json wxGTK30-gtk3 icu pugixml gtk3 gtkspell3 hicolor-icon-theme ]; propagatedBuildInputs = [ gettext ]; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Cross-platform gettext catalogs (.po files) editor"; homepage = "https://www.poedit.net/"; license = licenses.mit; diff --git a/pkgs/tools/text/proselint/default.nix b/pkgs/tools/text/proselint/default.nix index 36a68f9406d3..ea72468dc693 100644 --- a/pkgs/tools/text/proselint/default.nix +++ b/pkgs/tools/text/proselint/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, buildPythonApplication, click, future, six }: +{ lib, stdenv, fetchurl, buildPythonApplication, click, future, six }: buildPythonApplication rec { pname = "proselint"; @@ -13,7 +13,7 @@ buildPythonApplication rec { propagatedBuildInputs = [ click future six ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A linter for prose"; homepage = "http://proselint.com"; license = licenses.bsd3; diff --git a/pkgs/tools/text/qgrep/default.nix b/pkgs/tools/text/qgrep/default.nix index 30873e89d1bf..a3e18c6bba3d 100644 --- a/pkgs/tools/text/qgrep/default.nix +++ b/pkgs/tools/text/qgrep/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, CoreServices, CoreFoundation, fetchpatch }: +{ lib, stdenv, fetchFromGitHub, CoreServices, CoreFoundation, fetchpatch }: stdenv.mkDerivation rec { version = "1.1"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { install -Dm755 qgrep $out/bin/qgrep ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Fast regular expression grep for source code with incremental index updates"; homepage = "https://github.com/zeux/qgrep"; license = licenses.mit; diff --git a/pkgs/tools/text/rgxg/default.nix b/pkgs/tools/text/rgxg/default.nix index bd291be7015b..8e4d991e7bf0 100644 --- a/pkgs/tools/text/rgxg/default.nix +++ b/pkgs/tools/text/rgxg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip }: +{ lib, stdenv, fetchzip }: stdenv.mkDerivation rec { pname = "rgxg"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "050jxc3qhfrm9fdbzd67hlsqlp4qk1fa20q1g2v919sh7s6v77si"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A C library and a command-line tool to generate (extended) regular expressions"; license = licenses.zlib; maintainers = with maintainers; [ hloeffler ]; diff --git a/pkgs/tools/text/ripgrep-all/default.nix b/pkgs/tools/text/ripgrep-all/default.nix index 8da7a54ebb24..5d6a74327d42 100644 --- a/pkgs/tools/text/ripgrep-all/default.nix +++ b/pkgs/tools/text/ripgrep-all/default.nix @@ -46,7 +46,7 @@ rustPlatform.buildRustPackage rec { doInstallCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Ripgrep, but also search in PDFs, E-Books, Office documents, zip, tar.gz, and more"; longDescription = '' Ripgrep, but also search in PDFs, E-Books, Office documents, zip, tar.gz, etc. diff --git a/pkgs/tools/text/ripgrep/default.nix b/pkgs/tools/text/ripgrep/default.nix index c69c6fef8cbd..3bea0bdf8fb5 100644 --- a/pkgs/tools/text/ripgrep/default.nix +++ b/pkgs/tools/text/ripgrep/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , nixosTests , fetchFromGitHub , rustPlatform @@ -37,7 +37,7 @@ rustPlatform.buildRustPackage rec { passthru.tests = { inherit (nixosTests) ripgrep; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A utility that combines the usability of The Silver Searcher with the raw speed of grep"; homepage = "https://github.com/BurntSushi/ripgrep"; license = with licenses; [ unlicense /* or */ mit ]; diff --git a/pkgs/tools/text/rpl/default.nix b/pkgs/tools/text/rpl/default.nix index 7ac3790f8a98..f53a1d790806 100644 --- a/pkgs/tools/text/rpl/default.nix +++ b/pkgs/tools/text/rpl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pythonPackages }: +{ lib, stdenv, fetchFromGitHub, pythonPackages }: pythonPackages.buildPythonApplication rec { pname = "rpl"; @@ -14,7 +14,7 @@ pythonPackages.buildPythonApplication rec { sha256 = "1xhpgcmq91ivy9ijfyz5ilg51m7fz8ar2077r7gq246j8gbf8ggr"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Replace strings in files"; homepage = "https://github.com/kcoyner/rpl"; license = licenses.gpl2; diff --git a/pkgs/tools/text/rs/default.nix b/pkgs/tools/text/rs/default.nix index bd141f491d41..9aca92922a52 100644 --- a/pkgs/tools/text/rs/default.nix +++ b/pkgs/tools/text/rs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libbsd }: +{ lib, stdenv, fetchurl, libbsd }: stdenv.mkDerivation rec { pname = "rs"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { install -Dm 644 rs.1 -t $out/share/man/man1 ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Reshape a data array from standard input"; longDescription = '' rs reads the standard input, interpreting each line as a row of blank- diff --git a/pkgs/tools/text/ruplacer/default.nix b/pkgs/tools/text/ruplacer/default.nix index f4b3ed3dca4c..33a95c365e6f 100644 --- a/pkgs/tools/text/ruplacer/default.nix +++ b/pkgs/tools/text/ruplacer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform, Security }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, Security }: rustPlatform.buildRustPackage rec { pname = "ruplacer"; @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { buildInputs = (stdenv.lib.optional stdenv.isDarwin Security); - meta = with stdenv.lib; { + meta = with lib; { description = "Find and replace text in source files"; homepage = "https://github.com/TankerHQ/ruplacer"; license = [ licenses.bsd3 ]; diff --git a/pkgs/tools/text/schema2ldif/default.nix b/pkgs/tools/text/schema2ldif/default.nix index 5df4e90ff1aa..409bbc16a93f 100644 --- a/pkgs/tools/text/schema2ldif/default.nix +++ b/pkgs/tools/text/schema2ldif/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, perlPackages }: stdenv.mkDerivation rec { +{ lib, stdenv, fetchurl, makeWrapper, perlPackages }: stdenv.mkDerivation rec { pname = "schema2ldif"; version = "1.3"; @@ -21,7 +21,7 @@ --prefix PERL5PATH : "${perlPackages.makePerlPath [ perlPackages.GetoptLong ]}" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Utilities to manage schema in .schema and .ldif format"; homepage = "https://www.fusiondirectory.org/schema2ldif-project-and-components/"; license = licenses.bsd3; diff --git a/pkgs/tools/text/sd/default.nix b/pkgs/tools/text/sd/default.nix index 66529514ec7b..c986150b26c2 100644 --- a/pkgs/tools/text/sd/default.nix +++ b/pkgs/tools/text/sd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform, Security +{ lib, stdenv, fetchFromGitHub, rustPlatform, Security }: rustPlatform.buildRustPackage rec { @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Intuitive find & replace CLI (sed alternative)"; homepage = "https://github.com/chmln/sd"; license = licenses.mit; diff --git a/pkgs/tools/text/shocco/default.nix b/pkgs/tools/text/shocco/default.nix index 65adfc29b95a..11d8194bb702 100644 --- a/pkgs/tools/text/shocco/default.nix +++ b/pkgs/tools/text/shocco/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, perlPackages, pythonPackages }: +{ lib, stdenv, fetchFromGitHub, perlPackages, pythonPackages }: stdenv.mkDerivation rec { pname = "shocco"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ perlPackages.TextMarkdown pythonPackages.pygments ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A quick-and-dirty, literate-programming-style documentation generator for / in POSIX shell"; homepage = "https://rtomayko.github.io/shocco/"; license = licenses.mit; diff --git a/pkgs/tools/text/silver-searcher/default.nix b/pkgs/tools/text/silver-searcher/default.nix index 51003694203f..99e0e0a2ac2d 100644 --- a/pkgs/tools/text/silver-searcher/default.nix +++ b/pkgs/tools/text/silver-searcher/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, pcre, zlib, lzma}: +{lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, pcre, zlib, lzma}: stdenv.mkDerivation rec { pname = "silver-searcher"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ pcre zlib lzma ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/ggreer/the_silver_searcher/"; description = "A code-searching tool similar to ack, but faster"; maintainers = with maintainers; [ madjar ]; diff --git a/pkgs/tools/text/snippetpixie/default.nix b/pkgs/tools/text/snippetpixie/default.nix index ed35a9109a07..fe8ce9657b52 100644 --- a/pkgs/tools/text/snippetpixie/default.nix +++ b/pkgs/tools/text/snippetpixie/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , nix-update-script , meson @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Your little expandable text snippet helper"; longDescription = '' Your little expandable text snippet helper. diff --git a/pkgs/tools/text/tab/default.nix b/pkgs/tools/text/tab/default.nix index 8a80c7ad10e9..a0539d4d372b 100644 --- a/pkgs/tools/text/tab/default.nix +++ b/pkgs/tools/text/tab/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromBitbucket, python3 }: +{ lib, stdenv, fetchFromBitbucket, python3 }: stdenv.mkDerivation rec { version = "7.2"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Programming language/shell calculator"; homepage = "https://tkatchev.bitbucket.io/tab/"; license = licenses.boost; diff --git a/pkgs/tools/text/transifex-client/default.nix b/pkgs/tools/text/transifex-client/default.nix index ac10564c9f76..411c9cb98998 100644 --- a/pkgs/tools/text/transifex-client/default.nix +++ b/pkgs/tools/text/transifex-client/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonApplication, fetchPypi +{ lib, stdenv, buildPythonApplication, fetchPypi , python-slugify, requests, urllib3, six, setuptools }: buildPythonApplication rec { @@ -23,7 +23,7 @@ buildPythonApplication rec { # Requires external resources doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.transifex.com/"; license = licenses.gpl2; description = "Transifex translation service client"; diff --git a/pkgs/tools/text/ucg/default.nix b/pkgs/tools/text/ucg/default.nix index db8984536804..d81b5a14f091 100644 --- a/pkgs/tools/text/ucg/default.nix +++ b/pkgs/tools/text/ucg/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , pkg-config , autoreconfHook @@ -22,7 +22,7 @@ in stdenv.mkDerivation { nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ pcre ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/gvansickle/ucg/"; description = "Grep-like tool for searching large bodies of source code"; longDescription = '' diff --git a/pkgs/tools/text/ugrep/default.nix b/pkgs/tools/text/ugrep/default.nix index 84dc21aba3e9..83cb0e463880 100644 --- a/pkgs/tools/text/ugrep/default.nix +++ b/pkgs/tools/text/ugrep/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, boost, bzip2, lz4, pcre2, xz, zlib }: +{ lib, stdenv, fetchFromGitHub, boost, bzip2, lz4, pcre2, xz, zlib }: stdenv.mkDerivation rec { pname = "ugrep"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ boost bzip2 lz4 pcre2 xz zlib ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Ultra fast grep with interactive query UI"; homepage = "https://github.com/Genivia/ugrep"; maintainers = with maintainers; [ numkem ]; diff --git a/pkgs/tools/text/unoconv/default.nix b/pkgs/tools/text/unoconv/default.nix index dc9412d3c0e0..97a3b4d725ee 100644 --- a/pkgs/tools/text/unoconv/default.nix +++ b/pkgs/tools/text/unoconv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python3, libreoffice-unwrapped, asciidoc, makeWrapper +{ lib, stdenv, fetchFromGitHub, python3, libreoffice-unwrapped, asciidoc, makeWrapper # whether to install odt2pdf/odt2doc/... symlinks to unoconv , installSymlinks ? true }: @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { make install-links prefix="$out" '' else ""); - meta = with stdenv.lib; { + meta = with lib; { description = "Convert between any document format supported by LibreOffice/OpenOffice"; homepage = "http://dag.wieers.com/home-made/unoconv/"; license = licenses.gpl2; diff --git a/pkgs/tools/text/unrtf/default.nix b/pkgs/tools/text/unrtf/default.nix index 752d576701ee..57ffe95988d0 100644 --- a/pkgs/tools/text/unrtf/default.nix +++ b/pkgs/tools/text/unrtf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, autoconf, automake, libiconv }: +{ lib, stdenv, fetchurl, fetchpatch, autoconf, automake, libiconv }: stdenv.mkDerivation rec { pname = "unrtf"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "man" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A converter from Rich Text Format to other formats"; longDescription = '' UnRTF converts documents in Rich Text Format to other diff --git a/pkgs/tools/text/untex/default.nix b/pkgs/tools/text/untex/default.nix index 829c4da38493..55cf01d698f8 100644 --- a/pkgs/tools/text/untex/default.nix +++ b/pkgs/tools/text/untex/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "untex"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { mkdir -p $out/bin $out/share/man/man1 ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A utility which removes LaTeX commands from input"; homepage = "https://www.ctan.org/pkg/untex"; license = licenses.gpl1; diff --git a/pkgs/tools/text/vale/default.nix b/pkgs/tools/text/vale/default.nix index 11c611710cd2..2b6307ed0096 100644 --- a/pkgs/tools/text/vale/default.nix +++ b/pkgs/tools/text/vale/default.nix @@ -1,8 +1,8 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "vale"; - version = "2.6.5"; + version = "2.6.8"; subPackages = [ "." ]; outputs = [ "out" "data" ]; @@ -11,13 +11,11 @@ buildGoModule rec { owner = "errata-ai"; repo = "vale"; rev = "v${version}"; - sha256 = "0rvcxlw8xd7sjcsvr6di04l8ml990im2c8yl3hn8054wkp51yb4l"; + sha256 = "sha256-evvnIM8sd/eHpI2FYOlgjvGn8awTVc1f5QDIYAvhqmk="; }; vendorSha256 = null; - doCheck = false; - postInstall = '' mkdir -p $data/share/vale cp -r styles $data/share/vale @@ -25,7 +23,7 @@ buildGoModule rec { buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://errata-ai.gitbook.io/vale/"; description = "A syntax-aware linter for prose built with speed and extensibility in mind"; license = licenses.mit; diff --git a/pkgs/tools/text/xidel/default.nix b/pkgs/tools/text/xidel/default.nix index fabfdd857107..0996cf944eb0 100644 --- a/pkgs/tools/text/xidel/default.nix +++ b/pkgs/tools/text/xidel/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, dpkg }: +{ lib, stdenv, fetchurl, dpkg }: stdenv.mkDerivation rec { pname = "xidel"; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$out/bin/xidel" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Command line tool to download and extract data from html/xml pages"; homepage = "http://videlibri.sourceforge.net/xidel.html"; # source contains no license info (AFAICS), but sourceforge says GPLv2 diff --git a/pkgs/tools/text/xml/basex/default.nix b/pkgs/tools/text/xml/basex/default.nix index 45c9eb4866ce..9256abf3cbdb 100644 --- a/pkgs/tools/text/xml/basex/default.nix +++ b/pkgs/tools/text/xml/basex/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, jre, coreutils, makeDesktopItem }: +{ lib, stdenv, fetchurl, unzip, jre, coreutils, makeDesktopItem }: stdenv.mkDerivation rec { pname = "basex"; @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "XML database and XPath/XQuery processor"; longDescription = '' BaseX is a very fast and light-weight, yet powerful XML database and diff --git a/pkgs/tools/text/xml/html-xml-utils/default.nix b/pkgs/tools/text/xml/html-xml-utils/default.nix index d4bd40a11993..5dab3d642a3b 100644 --- a/pkgs/tools/text/xml/html-xml-utils/default.nix +++ b/pkgs/tools/text/xml/html-xml-utils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, curl, libiconv }: +{ lib, stdenv, fetchurl, curl, libiconv }: stdenv.mkDerivation rec { pname = "html-xml-utils"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [curl libiconv]; - meta = with stdenv.lib; { + meta = with lib; { description = "Utilities for manipulating HTML and XML files"; homepage = "http://www.w3.org/Tools/HTML-XML-utils/"; license = licenses.w3c; diff --git a/pkgs/tools/text/xml/jing-trang/default.nix b/pkgs/tools/text/xml/jing-trang/default.nix index dcf83c736cc4..542a4709efeb 100644 --- a/pkgs/tools/text/xml/jing-trang/default.nix +++ b/pkgs/tools/text/xml/jing-trang/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, jre_headless, jdk, ant, saxon }: +{ lib, stdenv, fetchFromGitHub, jre_headless, jdk, ant, saxon }: stdenv.mkDerivation { pname = "jing-trang"; @@ -32,7 +32,7 @@ stdenv.mkDerivation { chmod +x "$out"/bin/* ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A RELAX NG validator in Java"; # The homepage is www.thaiopensource.com, but it links to googlecode.com # for downloads and call it the "project site". diff --git a/pkgs/tools/text/xml/rnv/default.nix b/pkgs/tools/text/xml/rnv/default.nix index 2bc1b6ddddac..1ee3355d1052 100644 --- a/pkgs/tools/text/xml/rnv/default.nix +++ b/pkgs/tools/text/xml/rnv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, expat }: +{ lib, stdenv, fetchurl, expat }: stdenv.mkDerivation rec { pname = "rnv"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ expat ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Relax NG Compact Syntax validator"; homepage = "http://www.davidashen.net/rnv.html"; license = licenses.bsd3; diff --git a/pkgs/tools/text/xml/xml2/default.nix b/pkgs/tools/text/xml/xml2/default.nix index 8c341855e687..8ae8ea48bf3e 100644 --- a/pkgs/tools/text/xml/xml2/default.nix +++ b/pkgs/tools/text/xml/xml2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libxml2 }: +{ lib, stdenv, fetchurl, pkgconfig, libxml2 }: stdenv.mkDerivation { name = "xml2-0.5"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libxml2 ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://web.archive.org/web/20160515005047/http://dan.egnor.name:80/xml2"; description = "Tools for command line processing of XML, HTML, and CSV"; license = licenses.gpl2Plus; diff --git a/pkgs/tools/text/xml/xmloscopy/default.nix b/pkgs/tools/text/xml/xmloscopy/default.nix index 2cd7a580ee34..c915e2c7fc5b 100644 --- a/pkgs/tools/text/xml/xmloscopy/default.nix +++ b/pkgs/tools/text/xml/xmloscopy/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { --set PATH "${spath}" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "wtf is my docbook broken?"; homepage = "https://github.com/grahamc/xmloscopy"; license = licenses.mit; diff --git a/pkgs/tools/text/xsv/default.nix b/pkgs/tools/text/xsv/default.nix index b17dba7a127f..c71221ccd761 100644 --- a/pkgs/tools/text/xsv/default.nix +++ b/pkgs/tools/text/xsv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform, Security }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, Security }: rustPlatform.buildRustPackage rec { pname = "xsv"; @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { buildInputs = stdenv.lib.optional stdenv.isDarwin Security; - meta = with stdenv.lib; { + meta = with lib; { description = "A fast CSV toolkit written in Rust"; homepage = "https://github.com/BurntSushi/xsv"; license = with licenses; [ unlicense /* or */ mit ]; diff --git a/pkgs/tools/text/xurls/default.nix b/pkgs/tools/text/xurls/default.nix index 6c8e5520d745..b1fd02ca75bb 100644 --- a/pkgs/tools/text/xurls/default.nix +++ b/pkgs/tools/text/xurls/default.nix @@ -1,4 +1,4 @@ -{ buildGoPackage, stdenv, fetchFromGitHub }: +{ buildGoPackage, lib, stdenv, fetchFromGitHub }: buildGoPackage rec { version = "2.2.0"; @@ -14,7 +14,7 @@ buildGoPackage rec { goPackagePath = "mvdan.cc/xurls/v2"; subPackages = [ "cmd/xurls" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Extract urls from text"; homepage = "https://github.com/mvdan/xurls"; maintainers = with maintainers; [ koral ]; diff --git a/pkgs/tools/text/yaml-merge/default.nix b/pkgs/tools/text/yaml-merge/default.nix index b91d24e1137d..d36522edb874 100644 --- a/pkgs/tools/text/yaml-merge/default.nix +++ b/pkgs/tools/text/yaml-merge/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pythonPackages }: +{ lib, stdenv, fetchFromGitHub, pythonPackages }: stdenv.mkDerivation { name= "yaml-merge-2016-02-16"; @@ -18,7 +18,7 @@ stdenv.mkDerivation { wrapPythonPrograms ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Merge YAML data files"; homepage = "https://github.com/abbradar/yaml-merge"; license = licenses.bsd2; diff --git a/pkgs/tools/typesetting/asciidoc/default.nix b/pkgs/tools/typesetting/asciidoc/default.nix index 136c25f73b15..1bcd07aceb58 100644 --- a/pkgs/tools/typesetting/asciidoc/default.nix +++ b/pkgs/tools/typesetting/asciidoc/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, python2 +{ fetchurl, lib, stdenv, python2 , enableStandardFeatures ? false , sourceHighlight ? null @@ -261,7 +261,7 @@ stdenv.mkDerivation rec { preInstall = "mkdir -p $out/etc/vim"; makeFlags = stdenv.lib.optional stdenv.isCygwin "DESTDIR=/."; - meta = with stdenv.lib; { + meta = with lib; { description = "Text-based document generation system"; longDescription = '' AsciiDoc is a text document format for writing notes, documentation, diff --git a/pkgs/tools/typesetting/asciidoctorj/default.nix b/pkgs/tools/typesetting/asciidoctorj/default.nix index 391c78814e77..6a3b43dc8d18 100644 --- a/pkgs/tools/typesetting/asciidoctorj/default.nix +++ b/pkgs/tools/typesetting/asciidoctorj/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, jdk, makeWrapper }: +{ lib, stdenv, fetchzip, jdk, makeWrapper }: stdenv.mkDerivation rec { pname = "asciidoctorj"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { --prefix JAVA_HOME : ${jdk} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Official library for running Asciidoctor on the JVM"; longDescription = '' AsciidoctorJ is the official library for running Asciidoctor on the JVM. diff --git a/pkgs/tools/typesetting/bibclean/default.nix b/pkgs/tools/typesetting/bibclean/default.nix index c95c6921a4e0..8c7e123acf73 100644 --- a/pkgs/tools/typesetting/bibclean/default.nix +++ b/pkgs/tools/typesetting/bibclean/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "bibclean"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { mkdir -p $out/bin $out/share/man/man1 ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Prettyprint and syntax check BibTeX and Scribe bibliography data base files"; homepage = "http://ftp.math.utah.edu/pub/bibclean"; license = licenses.gpl2; diff --git a/pkgs/tools/typesetting/biber/default.nix b/pkgs/tools/typesetting/biber/default.nix index 0c472947c0a2..ac0220cf5614 100644 --- a/pkgs/tools/typesetting/biber/default.nix +++ b/pkgs/tools/typesetting/biber/default.nix @@ -1,7 +1,21 @@ -{ stdenv, fetchpatch, perlPackages, shortenPerlShebang, texlive }: +{ lib, stdenv, fetchurl, fetchpatch, perlPackages, shortenPerlShebang, texlive }: let biberSource = stdenv.lib.head (builtins.filter (p: p.tlType == "source") texlive.biber.pkgs); + + # perl 5.32.0 ships with U:C 1.27 + UnicodeCollate_1_29 = perlPackages.buildPerlPackage rec { + pname = "Unicode-Collate"; + version = "1.29"; + src = fetchurl { + url = "mirror://cpan/authors/id/S/SA/SADAHIRO/${pname}-${version}.tar.gz"; + sha256 = "0dr4k10fgbsczh4sz7w8d0nnba38r6jrg87cm3gw4xxgn55fzj7l"; + }; + meta = { + description = "Unicode Collation Algorithm"; + license = perlPackages.perl.meta.license; + }; + }; in perlPackages.buildPerlModule { @@ -10,21 +24,13 @@ perlPackages.buildPerlModule { src = "${biberSource}/source/bibtex/biber/biblatex-biber.tar.gz"; - patches = [ - # Fix for https://github.com/plk/biber/issues/329 - (fetchpatch { - url = "https://github.com/plk/biber/commit/fa312ce402fe581ba7cc0890c83a1d47c2610e26.diff"; - sha256 = "1j87mdwvx368z9b5x6b72s753hwvrldf2pb42p6hflq5hzkicy50"; - }) - ]; - buildInputs = with perlPackages; [ autovivification BusinessISBN BusinessISMN BusinessISSN ConfigAutoConf DataCompare DataDump DateSimple EncodeEUCJPASCII EncodeHanExtra EncodeJIS2K DateTime DateTimeFormatBuilder DateTimeCalendarJulian ExtUtilsLibBuilder FileSlurper FileWhich IPCRun3 LogLog4perl LWPProtocolHttps ListAllUtils ListMoreUtils MozillaCA ParseRecDescent IOString ReadonlyXS RegexpCommon TextBibTeX - UnicodeLineBreak URI XMLLibXMLSimple XMLLibXSLT XMLWriter + UnicodeCollate_1_29 UnicodeLineBreak URI XMLLibXMLSimple XMLLibXSLT XMLWriter ClassAccessor TextCSV TextCSV_XS TextRoman DataUniqid LinguaTranslit SortKey TestDifferences PerlIOutf8_strict @@ -35,7 +41,7 @@ perlPackages.buildPerlModule { shortenPerlShebang $out/bin/biber ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Backend for BibLaTeX"; license = with licenses; [ artistic1 gpl1Plus ]; platforms = platforms.unix; diff --git a/pkgs/tools/typesetting/biblatex-check/default.nix b/pkgs/tools/typesetting/biblatex-check/default.nix index bad560660023..606e07730e4f 100644 --- a/pkgs/tools/typesetting/biblatex-check/default.nix +++ b/pkgs/tools/typesetting/biblatex-check/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python }: +{ lib, stdenv, fetchFromGitHub, python }: stdenv.mkDerivation { pname = "biblatex-check"; @@ -17,7 +17,7 @@ stdenv.mkDerivation { install -Dm755 biblatex_check.py $out/bin/biblatex-check ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Python2/3 script for checking BibLatex .bib files"; homepage = "https://github.com/Pezmc/BibLatex-Check"; license = licenses.mit; diff --git a/pkgs/tools/typesetting/docbook2odf/default.nix b/pkgs/tools/typesetting/docbook2odf/default.nix index d846d9394b26..b6b56e83688d 100644 --- a/pkgs/tools/typesetting/docbook2odf/default.nix +++ b/pkgs/tools/typesetting/docbook2odf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perlPackages, makeWrapper, zip, libxslt }: +{ lib, stdenv, fetchurl, perlPackages, makeWrapper, zip, libxslt }: stdenv.mkDerivation rec { name = "docbook2odf-0.244"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { --prefix PERL5PATH : "${perlPackages.makePerlPath [ perlPackages.PerlMagick ]}" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Convert DocBook to OpenDocument Format (ODF)"; longDescription = '' Docbook2odf is a toolkit that automaticaly converts DocBook to OASIS diff --git a/pkgs/tools/typesetting/docbook2x/default.nix b/pkgs/tools/typesetting/docbook2x/default.nix index a36da7a2b6ae..fdfa05f20c1f 100644 --- a/pkgs/tools/typesetting/docbook2x/default.nix +++ b/pkgs/tools/typesetting/docbook2x/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, texinfo, perlPackages +{ fetchurl, lib, stdenv, texinfo, perlPackages , groff, libxml2, libxslt, gnused, libiconv, opensp , docbook_xml_dtd_43 , makeWrapper }: @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { "${gnused}/bin" ''; - meta = with stdenv.lib; { + meta = with lib; { longDescription = '' docbook2X is a software package that converts DocBook documents into the traditional Unix man page format and the GNU Texinfo diff --git a/pkgs/tools/typesetting/fop/default.nix b/pkgs/tools/typesetting/fop/default.nix index d5dea2c6dc6f..a572ce216ee6 100644 --- a/pkgs/tools/typesetting/fop/default.nix +++ b/pkgs/tools/typesetting/fop/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, ant, jdk, runtimeShell }: +{ fetchurl, lib, stdenv, ant, jdk, runtimeShell }: stdenv.mkDerivation rec { pname = "fop"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { chmod a+x $out/bin/fop ''; - meta = with stdenv.lib; { + meta = with lib; { description = "XML formatter driven by XSL Formatting Objects (XSL-FO)"; longDescription = '' FOP is a Java application that reads a formatting object tree and then diff --git a/pkgs/tools/typesetting/git-latexdiff/default.nix b/pkgs/tools/typesetting/git-latexdiff/default.nix index d969ca8fec6f..0bc8b7e073ec 100644 --- a/pkgs/tools/typesetting/git-latexdiff/default.nix +++ b/pkgs/tools/typesetting/git-latexdiff/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, git, bash }: +{ lib, stdenv, fetchFromGitLab, git, bash }: stdenv.mkDerivation rec { version = "1.3.0"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { chmod +x $prefix/bin/git-latexdiff ''; - meta = with stdenv.lib; { + meta = with lib; { description = "View diff on LaTeX source files on the generated PDF files"; homepage = "https://gitlab.com/git-latexdiff/git-latexdiff"; maintainers = [ ]; diff --git a/pkgs/tools/typesetting/halibut/default.nix b/pkgs/tools/typesetting/halibut/default.nix index d2779df0c944..d077ef823ffc 100644 --- a/pkgs/tools/typesetting/halibut/default.nix +++ b/pkgs/tools/typesetting/halibut/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, perl}: +{lib, stdenv, fetchurl, perl}: stdenv.mkDerivation rec { name = "halibut-1.2"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { make install ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Documentation production system for software manuals"; homepage = "https://www.chiark.greenend.org.uk/~sgtatham/halibut/"; license = licenses.mit; diff --git a/pkgs/tools/typesetting/hevea/default.nix b/pkgs/tools/typesetting/hevea/default.nix index f3f634eb944c..97b020d3e21c 100644 --- a/pkgs/tools/typesetting/hevea/default.nix +++ b/pkgs/tools/typesetting/hevea/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocamlPackages }: +{ lib, stdenv, fetchurl, ocamlPackages }: stdenv.mkDerivation rec { name = "hevea-2.34"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A quite complete and fast LATEX to HTML translator"; homepage = "http://pauillac.inria.fr/~maranget/hevea/"; license = licenses.qpl; diff --git a/pkgs/tools/typesetting/htmldoc/default.nix b/pkgs/tools/typesetting/htmldoc/default.nix index ae6e2e9006e6..124839ca45d6 100644 --- a/pkgs/tools/typesetting/htmldoc/default.nix +++ b/pkgs/tools/typesetting/htmldoc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , SystemConfiguration ? null, Foundation ? null }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { lib.optional isDarwin SystemConfiguration ++ lib.optional isDarwin Foundation; - meta = with stdenv.lib; { + meta = with lib; { description = "Converts HTML files to PostScript and PDF"; homepage = "https://michaelrsweet.github.io/htmldoc"; license = licenses.gpl2; diff --git a/pkgs/tools/typesetting/kindlegen/default.nix b/pkgs/tools/typesetting/kindlegen/default.nix index 1067386c2f8d..60f58a361dfd 100644 --- a/pkgs/tools/typesetting/kindlegen/default.nix +++ b/pkgs/tools/typesetting/kindlegen/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, unzip }: +{ fetchurl, lib, stdenv, unzip }: let version = "2.9"; @@ -41,7 +41,7 @@ in stdenv.mkDerivation { cp -r *.txt *.html docs/* $out/share/kindlegen/doc ''; - meta = with stdenv.lib; { + meta = with lib; { broken = true; # download links got removed description = "Convert documents to .mobi for use with Amazon Kindle"; homepage = "https://www.amazon.com/gp/feature.html?docId=1000765211"; diff --git a/pkgs/tools/typesetting/lowdown/default.nix b/pkgs/tools/typesetting/lowdown/default.nix index ecd25bf8e833..522c3438d901 100644 --- a/pkgs/tools/typesetting/lowdown/default.nix +++ b/pkgs/tools/typesetting/lowdown/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchurl, which }: +{ lib, stdenv, fetchurl, which }: stdenv.mkDerivation rec { pname = "lowdown"; - version = "0.7.5"; + version = "0.7.9"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://kristaps.bsd.lv/lowdown/snapshots/lowdown-${version}.tar.gz"; - sha512 = "1wfbrydbk0f0blhg5my3m5gw8bspwh3rdg4w4mcalnrwpypzd4zrggc4aj3zm72c5jikx6pnjb2k9w1s075k84f6q8p8chlzb3s4qd2"; + sha512 = "18q8i8lh8w127vzw697n0bzv4mchhna1p4s672hjvy39l3ls8rlj5nwq5npr5fry06yil62sjmq4652vw29r8l49wwk5j82a8l2nr7c"; }; nativeBuildInputs = [ which ]; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { MANDIR=''${!outputBin}/share/man ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://kristaps.bsd.lv/lowdown/"; description = "Simple markdown translator"; license = licenses.isc; diff --git a/pkgs/tools/typesetting/multimarkdown/default.nix b/pkgs/tools/typesetting/multimarkdown/default.nix index 5043eb681e88..67c995f6c269 100644 --- a/pkgs/tools/typesetting/multimarkdown/default.nix +++ b/pkgs/tools/typesetting/multimarkdown/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, perl }: +{ lib, stdenv, fetchgit, perl }: stdenv.mkDerivation { pname = "multimarkdown"; @@ -19,7 +19,7 @@ stdenv.mkDerivation { checkPhase = "make test-all"; installPhase = "make pkg-install prefix='' DESTDIR=$out; make pkg-install-scripts prefix='' DESTDIR=$out"; - meta = with stdenv.lib; { + meta = with lib; { description = "A derivative of Markdown that adds new syntax features"; longDescription = '' MultiMarkdown is a lightweight markup language created by diff --git a/pkgs/tools/typesetting/odpdown/default.nix b/pkgs/tools/typesetting/odpdown/default.nix index 4b85a252c130..989f61f4592e 100644 --- a/pkgs/tools/typesetting/odpdown/default.nix +++ b/pkgs/tools/typesetting/odpdown/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pythonPackages, libreoffice }: +{ lib, stdenv, fetchurl, pythonPackages, libreoffice }: pythonPackages.buildPythonApplication rec { @@ -16,7 +16,7 @@ pythonPackages.buildPythonApplication rec { nose ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/thorstenb/odpdown"; repositories.git = "https://github.com/thorstenb/odpdown.git"; description = "Create nice-looking slides from your favourite text editor"; diff --git a/pkgs/tools/typesetting/pdf2djvu/default.nix b/pkgs/tools/typesetting/pdf2djvu/default.nix index c3ddb219ab8c..eb605ef8fab4 100644 --- a/pkgs/tools/typesetting/pdf2djvu/default.nix +++ b/pkgs/tools/typesetting/pdf2djvu/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Creates djvu files from PDF files"; homepage = "https://jwilk.net/software/pdf2djvu"; license = licenses.gpl2; diff --git a/pkgs/tools/typesetting/pdf2odt/default.nix b/pkgs/tools/typesetting/pdf2odt/default.nix index 879597f91da4..8365163c2fcb 100644 --- a/pkgs/tools/typesetting/pdf2odt/default.nix +++ b/pkgs/tools/typesetting/pdf2odt/default.nix @@ -38,7 +38,7 @@ in stdenv.mkDerivation rec { --prefix PATH : ${path} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "PDF to ODT format converter"; homepage = "https://github.com/gutschke/pdf2odt"; license = licenses.mit; diff --git a/pkgs/tools/typesetting/pdfsandwich/default.nix b/pkgs/tools/typesetting/pdfsandwich/default.nix index 12fcf8a71a26..de3cc7f64e8a 100644 --- a/pkgs/tools/typesetting/pdfsandwich/default.nix +++ b/pkgs/tools/typesetting/pdfsandwich/default.nix @@ -1,4 +1,4 @@ -{ stdenv, ocaml, makeWrapper, fetchsvn, ghostscript, imagemagick, perl, poppler_utils, tesseract, unpaper }: +{ lib, stdenv, ocaml, makeWrapper, fetchsvn, ghostscript, imagemagick, perl, poppler_utils, tesseract, unpaper }: stdenv.mkDerivation { version = "0.1.7"; @@ -20,7 +20,7 @@ stdenv.mkDerivation { cp -p pdfsandwich.1.gz $out/man/man1 ''; -meta = with stdenv.lib; { +meta = with lib; { description = "OCR tool for scanned PDFs"; homepage = "http://www.tobias-elze.de/pdfsandwich/"; license = licenses.gpl2; diff --git a/pkgs/tools/typesetting/pdftk/default.nix b/pkgs/tools/typesetting/pdftk/default.nix index 25fc794b0558..f90d1d4a7ed1 100644 --- a/pkgs/tools/typesetting/pdftk/default.nix +++ b/pkgs/tools/typesetting/pdftk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, gradle, jre, perl, writeText, runtimeShell }: +{ lib, stdenv, fetchFromGitLab, gradle, jre, perl, writeText, runtimeShell }: let pname = "pdftk"; @@ -85,7 +85,7 @@ in stdenv.mkDerivation rec { cp ${src}/pdftk.1 $out/share/man/man1 ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Command-line tool for working with PDFs"; homepage = "https://gitlab.com/pdftk-java/pdftk"; license = licenses.gpl2Plus; diff --git a/pkgs/tools/typesetting/psutils/default.nix b/pkgs/tools/typesetting/psutils/default.nix index 72c72d1b3baa..fe3223ae6c90 100644 --- a/pkgs/tools/typesetting/psutils/default.nix +++ b/pkgs/tools/typesetting/psutils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl }: +{ lib, stdenv, fetchurl, perl }: stdenv.mkDerivation { name = "psutils-17"; @@ -18,7 +18,7 @@ stdenv.mkDerivation { mkdir -p $out/bin $out/share/man/man1 ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Collection of useful utilities for manipulating PS documents"; homepage = "http://knackered.knackered.org/angus/psutils/"; license = licenses.bsd3; diff --git a/pkgs/tools/typesetting/rubber/default.nix b/pkgs/tools/typesetting/rubber/default.nix index f3f036ce50eb..c09ae04e3a1d 100644 --- a/pkgs/tools/typesetting/rubber/default.nix +++ b/pkgs/tools/typesetting/rubber/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, python3Packages, texinfo }: +{ fetchurl, lib, stdenv, python3Packages, texinfo }: python3Packages.buildPythonApplication rec { pname = "rubber"; @@ -24,7 +24,7 @@ python3Packages.buildPythonApplication rec { cd tests && ${stdenv.shell} run.sh ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Wrapper for LaTeX and friends"; longDescription = '' Rubber is a program whose purpose is to handle all tasks related diff --git a/pkgs/tools/typesetting/satysfi/default.nix b/pkgs/tools/typesetting/satysfi/default.nix index b97652bb4a69..03ce2eb5ee80 100644 --- a/pkgs/tools/typesetting/satysfi/default.nix +++ b/pkgs/tools/typesetting/satysfi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, fetchFromGitHub, ruby, dune_2, ocamlPackages +{ lib, stdenv, fetchzip, fetchFromGitHub, ruby, dune_2, ocamlPackages , ipaexfont, junicode, lmodern, lmmath }: let @@ -67,7 +67,7 @@ in cp -r lib-satysfi/dist/ $out/share/satysfi/ ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/gfngfn/SATySFi"; description = "A statically-typed, functional typesetting system"; license = licenses.lgpl3; diff --git a/pkgs/tools/typesetting/scdoc/default.nix b/pkgs/tools/typesetting/scdoc/default.nix index ddff50ea0e83..1b22b781d549 100644 --- a/pkgs/tools/typesetting/scdoc/default.nix +++ b/pkgs/tools/typesetting/scdoc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "scdoc"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A simple man page generator"; longDescription = '' scdoc is a simple man page generator written for POSIX systems written in diff --git a/pkgs/tools/typesetting/sile/default.nix b/pkgs/tools/typesetting/sile/default.nix index 239bafa05c97..e28fd9a7eaf9 100644 --- a/pkgs/tools/typesetting/sile/default.nix +++ b/pkgs/tools/typesetting/sile/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , darwin , fetchurl , makeWrapper @@ -38,11 +38,11 @@ in stdenv.mkDerivation rec { pname = "sile"; - version = "0.10.12"; + version = "0.10.13"; src = fetchurl { url = "https://github.com/sile-typesetter/sile/releases/download/v${version}/${pname}-${version}.tar.xz"; - sha256 = "0bxm3vhba289vcgpzbs1hz5fjamf0zgxkr7h8vcsiijjjavmv64a"; + sha256 = "19k4r7wfszml4dac8cm1hx9rb1im3psigcidz8bdm9j9jzpd01yj"; }; configureFlags = [ @@ -95,7 +95,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "doc" "man" "dev" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A typesetting system"; longDescription = '' SILE is a typesetting system; its job is to produce beautiful @@ -109,6 +109,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://sile-typesetter.org/"; platforms = platforms.unix; + broken = stdenv.isDarwin; # https://github.com/NixOS/nixpkgs/issues/23018 maintainers = with maintainers; [ doronbehar alerque ]; license = licenses.mit; }; diff --git a/pkgs/tools/typesetting/sshlatex/default.nix b/pkgs/tools/typesetting/sshlatex/default.nix index 26af22589467..663f12611b1d 100644 --- a/pkgs/tools/typesetting/sshlatex/default.nix +++ b/pkgs/tools/typesetting/sshlatex/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, inotify-tools, openssh, perl, gnutar, bash, makeWrapper }: +{ lib, stdenv, fetchFromGitHub, inotify-tools, openssh, perl, gnutar, bash, makeWrapper }: stdenv.mkDerivation rec { pname = "sshlatex"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/sshlatex --prefix PATH : "${binPath}" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A collection of hacks to efficiently run LaTeX via ssh"; longDescription = '' sshlatex is a tool which uploads LaTeX source files to a remote, runs diff --git a/pkgs/tools/typesetting/tectonic/default.nix b/pkgs/tools/typesetting/tectonic/default.nix index d37a4a69570b..f22840e2d862 100644 --- a/pkgs/tools/typesetting/tectonic/default.nix +++ b/pkgs/tools/typesetting/tectonic/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform +{ lib, stdenv, fetchFromGitHub, rustPlatform , darwin, fontconfig, harfbuzz, openssl, pkgconfig }: rustPlatform.buildRustPackage rec { @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Modernized, complete, self-contained TeX/LaTeX engine, powered by XeTeX and TeXLive"; homepage = "https://tectonic-typesetting.github.io/"; changelog = "https://github.com/tectonic-typesetting/tectonic/blob/tectonic@${version}/CHANGELOG.md"; diff --git a/pkgs/tools/typesetting/ted/default.nix b/pkgs/tools/typesetting/ted/default.nix index 6d7ef3348613..0fc2427588f7 100644 --- a/pkgs/tools/typesetting/ted/default.nix +++ b/pkgs/tools/typesetting/ted/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, zlib, pcre, xorg, libjpeg, libtiff, libpng, gtk2, libpaper, makeWrapper, ghostscript }: +{ lib, stdenv, fetchurl, pkgconfig, zlib, pcre, xorg, libjpeg, libtiff, libpng, gtk2, libpaper, makeWrapper, ghostscript }: stdenv.mkDerivation rec { pname = "ted"; @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig zlib pcre xorg.xlibsWrapper xorg.libXpm libjpeg libtiff libpng gtk2 libpaper makeWrapper ]; - meta = with stdenv.lib; { + meta = with lib; { description = "An easy rich text processor"; longDescription = '' Ted is a text processor running under X Windows on Unix/Linux systems. diff --git a/pkgs/tools/typesetting/tex/lkproof/default.nix b/pkgs/tools/typesetting/tex/lkproof/default.nix index 39029635beb4..d5b6a7f9f973 100644 --- a/pkgs/tools/typesetting/tex/lkproof/default.nix +++ b/pkgs/tools/typesetting/tex/lkproof/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, unzip}: +{lib, stdenv, fetchurl, unzip}: stdenv.mkDerivation { name = "lkproof-3.1"; @@ -15,7 +15,7 @@ stdenv.mkDerivation { cp -prd *.sty $out/share/texmf-nix/tex/generic/lkproof "; - meta = with stdenv.lib; { + meta = with lib; { platforms = platforms.unix; license = licenses.gpl1Plus; }; diff --git a/pkgs/tools/typesetting/tex/pgf/1.x.nix b/pkgs/tools/typesetting/tex/pgf/1.x.nix index dc13ea331782..efaf0e0fe1b3 100644 --- a/pkgs/tools/typesetting/tex/pgf/1.x.nix +++ b/pkgs/tools/typesetting/tex/pgf/1.x.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation { name = "pgf-1.18"; @@ -15,7 +15,7 @@ stdenv.mkDerivation { cp -prd * $out/share/texmf-nix "; - meta = with stdenv.lib; { + meta = with lib; { branch = "1"; platforms = platforms.unix; license = licenses.gpl2; diff --git a/pkgs/tools/typesetting/tex/pgf/2.x.nix b/pkgs/tools/typesetting/tex/pgf/2.x.nix index 00b92935babb..9661ec3324be 100644 --- a/pkgs/tools/typesetting/tex/pgf/2.x.nix +++ b/pkgs/tools/typesetting/tex/pgf/2.x.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation { name = "pgf-2.00"; @@ -15,7 +15,7 @@ stdenv.mkDerivation { cp -prd * $out/share/texmf-nix "; - meta = with stdenv.lib; { + meta = with lib; { branch = "2"; platforms = platforms.unix; license = licenses.gpl2; diff --git a/pkgs/tools/typesetting/tex/pgf/3.x.nix b/pkgs/tools/typesetting/tex/pgf/3.x.nix index a9ff54e4c11e..42320b49b3d8 100644 --- a/pkgs/tools/typesetting/tex/pgf/3.x.nix +++ b/pkgs/tools/typesetting/tex/pgf/3.x.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, unzip}: +{lib, stdenv, fetchurl, unzip}: stdenv.mkDerivation { name = "pgf-3.00"; @@ -24,7 +24,7 @@ stdenv.mkDerivation { cp -prd * $out/share/texmf-nix "; - meta = with stdenv.lib; { + meta = with lib; { branch = "3"; platforms = platforms.unix; license = licenses.gpl2; diff --git a/pkgs/tools/typesetting/tex/pgfplots/default.nix b/pkgs/tools/typesetting/tex/pgfplots/default.nix index 998f61786db4..aecf32c58747 100644 --- a/pkgs/tools/typesetting/tex/pgfplots/default.nix +++ b/pkgs/tools/typesetting/tex/pgfplots/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, unzip}: +{lib, stdenv, fetchurl, unzip}: stdenv.mkDerivation { name = "pgfplots-1.5.1"; @@ -19,7 +19,7 @@ stdenv.mkDerivation { cp -prd * $out/share/texmf-nix "; - meta = with stdenv.lib; { + meta = with lib; { description = "TeX package to draw plots directly in TeX in two and three dimensions"; homepage = "http://pgfplots.sourceforge.net"; platforms = platforms.unix; diff --git a/pkgs/tools/typesetting/tex/pplatex/default.nix b/pkgs/tools/typesetting/tex/pplatex/default.nix index 01777f3dd428..d59ab8a2a90c 100644 --- a/pkgs/tools/typesetting/tex/pplatex/default.nix +++ b/pkgs/tools/typesetting/tex/pplatex/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, pcre }: +{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, pcre }: stdenv.mkDerivation { pname = "pplatex"; @@ -21,7 +21,7 @@ stdenv.mkDerivation { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A tool to reformat the output of latex and friends into readable messages"; homepage = "https://github.com/stefanhepp/pplatex"; diff --git a/pkgs/tools/typesetting/tex/tetex/default.nix b/pkgs/tools/typesetting/tex/tetex/default.nix index 021927702ffb..db0a4c016024 100644 --- a/pkgs/tools/typesetting/tex/tetex/default.nix +++ b/pkgs/tools/typesetting/tex/tetex/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, flex, bison, zlib, libpng, ncurses, ed, automake }: +{ lib, stdenv, fetchurl, flex, bison, zlib, libpng, ncurses, ed, automake }: stdenv.mkDerivation { name = "tetex-3.0"; @@ -45,7 +45,7 @@ stdenv.mkDerivation { substituteInPlace ./tetex-src-3.0/configure --replace /usr/bin/install $(type -P install) ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A full-featured (La)TeX distribution"; homepage = "http://www.tug.org/tetex/"; maintainers = with maintainers; [ lovek323 ]; diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix index 030ac1b43aae..3b09bc4a55a8 100644 --- a/pkgs/tools/typesetting/tex/texlive/bin.nix +++ b/pkgs/tools/typesetting/tex/texlive/bin.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , texlive , zlib, libiconv, libpng, libX11 , freetype, gd, libXaw, icu, ghostscript, libXpm, libXmu, libXext @@ -142,7 +142,7 @@ core = stdenv.mkDerivation rec { setupHook = ./setup-hook.sh; # TODO: maybe texmf-nix -> texmf (and all references) passthru = { inherit version buildInputs; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Basic binaries for TeX Live"; homepage = "http://www.tug.org/texlive"; license = stdenv.lib.licenses.gpl2; @@ -341,7 +341,7 @@ pygmentex = python2Packages.buildPythonApplication rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.ctan.org/pkg/pygmentex"; description = "Auxiliary tool for typesetting code listings in LaTeX documents using Pygments"; longDescription = '' diff --git a/pkgs/tools/typesetting/tex/texlive/combine.nix b/pkgs/tools/typesetting/tex/texlive/combine.nix index 0625fe16090a..bf7b7952f514 100644 --- a/pkgs/tools/typesetting/tex/texlive/combine.nix +++ b/pkgs/tools/typesetting/tex/texlive/combine.nix @@ -2,10 +2,12 @@ params: with params; # combine = args@{ pkgFilter ? (pkg: pkg.tlType == "run" || pkg.tlType == "bin" || pkg.pname == "core") -, extraName ? "combined", ... +, extraName ? "combined" +, extraVersion ? "" +, ... }: let - pkgSet = removeAttrs args [ "pkgFilter" "extraName" ] // { + pkgSet = removeAttrs args [ "pkgFilter" "extraName" "extraVersion" ] // { # include a fake "core" package core.pkgs = [ (bin.core.out // { pname = "core"; tlType = "bin"; }) @@ -37,7 +39,7 @@ let (map (p: p.outPath) (builtins.filter lib.isDerivation pkgs)); in (buildEnv { - name = "texlive-${extraName}-${bin.texliveYear}"; + name = "texlive-${extraName}-${bin.texliveYear}${extraVersion}"; extraPrefix = "/share/texmf"; diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix index c2e6399ab864..cc30024ca0f3 100644 --- a/pkgs/tools/typesetting/tex/texlive/default.nix +++ b/pkgs/tools/typesetting/tex/texlive/default.nix @@ -88,6 +88,12 @@ let ++ combinePkgs (attrs.deps or {}); }; + snapshot = { + year = "2021"; + month = "01"; + day = "09"; + }; + # create a derivation that contains an unpacked upstream TL package mkPkg = { pname, tlType, revision, version, sha512, postUnpack ? "", stripPrefix ? 1, ... }@args: let @@ -110,7 +116,7 @@ let #"ftp://tug.org/texlive/historic/2019/tlnet-final/archive" # Daily snapshots hosted by one of the texlive release managers - https://texlive.info/tlnet-archive/2020/10/09/tlnet/archive + "https://texlive.info/tlnet-archive/${snapshot.year}/${snapshot.month}/${snapshot.day}/tlnet/archive" ]; src = fetchurl { inherit urls sha512; }; @@ -174,6 +180,7 @@ in (combine { ${pname} = attrs; extraName = "combined" + lib.removePrefix "scheme" pname; + extraVersion = ".${snapshot.year}${snapshot.month}${snapshot.day}"; }) ) { inherit (tl) diff --git a/pkgs/tools/typesetting/tex/texlive/fixedHashes.nix b/pkgs/tools/typesetting/tex/texlive/fixedHashes.nix index 8358becdab77..92001874a573 100644 --- a/pkgs/tools/typesetting/tex/texlive/fixedHashes.nix +++ b/pkgs/tools/typesetting/tex/texlive/fixedHashes.nix @@ -46,8 +46,8 @@ "plain-3.141592653"="my32apfgd55b14vf8bsldaqwdd931gcg"; "tex-ini-files-40533"="831h7dslin8dnan7llz8mki6zibqfglj"; "tex-ini-files.doc-40533"="pqfrqdqmlbhmcpjycpf644v4vg0qw7ic"; -"unicode-data-1.13"="xf2vq0qljmqhmj93630s637v5lcjycd0"; -"unicode-data.doc-1.13"="x22d4xiklr72ymaihfxs1r0kkdl4vdlp"; +"unicode-data-1.14"="l3va6jrpqxc96kl6idaqgnhhzx9cwcnk"; +"unicode-data.doc-1.14"="jrwxwchmf7m8qrarf1d4dzg5jpqn0r66"; "makeindex-52851"="yzy90d3n087yrdsawabd0bn7iwz3m1i6"; "makeindex.doc-52851"="ygvhwf55z6f9ix5jny8im72qwva5w560"; "mflogo-2.0"="mnn3p5gn5h9yi4inkllswxn142j31mz4"; @@ -61,11 +61,11 @@ "pdftex.doc-56291"="5h8yj63fkg266p5klb1x4ymajlw9j5fh"; "dehyph-48599"="dwnq2aajr29sdydc45056na079ph8gc6"; "tex.doc-3.14159265"="hjzzikx7zp8zhncjv85z8g0v0zjj5vqm"; -"texlive-common.doc-56460"="9dcj7zhplmgf2q1cy1xk32vc9iipdz99"; -"texlive-docindex.doc-56593"="bw11wjaqjjahs4x0hnakfvmvrjmjckkb"; +"texlive-common.doc-57339"="7hzsgkvbvl89iiqm88yxyc3bf6k21zk2"; +"texlive-docindex.doc-57339"="bw11wjaqjjahs4x0hnakfvmvrjmjckkb"; "texlive-en.doc-54755"="my69ybbyv9cxn91hh3ms3yksy391h7py"; -"texlive-scripts-56579"="vis89yjbvc8r961syjrpgalh61wa6rrj"; -"texlive-scripts.doc-56579"="m2vylj86h3xxpkspjny4sf5kbifj7dwl"; +"texlive-scripts-57344"="6jxkfiq8181ds7yvj0ysq9r5ribpm3qy"; +"texlive-scripts.doc-57344"="ng0ni58vjqv3z9f4shad5087kpila62k"; "tlshell-56461"="r5iil3d7fmjj1fhc40nd29mh7cgdnfgv"; "tlshell.doc-56461"="yps67a47kr5r3ljhd18kq35bhn2qjj3y"; "aaai-named-52470"="3lh28gvljcszn9vhzgsb6fp93m7n4d1d"; @@ -84,7 +84,7 @@ "archaeologie.source-2.4.5"="6azzb6zrv4xcrqc89a0f23inxgicin0c"; "authordate-52564"="d2bswrn2prjx106g6qyxs0sdhxxr0wfh"; "authordate.doc-52564"="0p505jmjdgvy26acbbgmkw9cp008kzl1"; -"beebe-56534"="g5giqxg2c2hv94k4hrzgf35aqbalfd8h"; +"beebe-56713"="8ayj8j9yb88f9k0yvw33fgdz54v5hg8r"; "besjournals-45662"="n3ljrkamca5v9w0rk3m38nqw86s1izc8"; "besjournals.doc-45662"="3swy1ix6cxbp87hjlaf3x4ws4kg8sz77"; "bestpapers-1.0"="15nq2m32h0giv41k6dslrw28han015aq"; @@ -95,20 +95,20 @@ "bibarts-2.2"="w813f5qw2kbsmlhcwxsg62na06bp0p0r"; "bibarts.doc-2.2"="xrv6r5iwpdyrjzqzanvgw2dy07xgkgb0"; "bibarts.source-2.2"="c4js97f9wx1ndh8isk3fgg6lp1rhrrmb"; -"biber.doc-2.15"="vg8dnl0xsy1lx8cpxqr4n2amh64gxbzw"; -"biber.source-2.15"="jw9fanm2xw4f7f5gs7l4aqb5c9cxb98g"; +"biber.doc-2.16"="283hs3rvg9m38yk97pvajyzwkgyv38j9"; +"biber.source-2.16"="nbbnd4gdmkw2y15wigqrjxv1b2xvsdbg"; "bibexport-3.03"="gxzcd5xddarag47glbq02fmxgpn5ndw3"; "bibexport.doc-3.03"="mvqlfzqzyhbnqw8xixa01qdfgrlm5xln"; "bibexport.source-3.03"="q41ipwczv79cxnl2420cvcj5q9c6l57l"; "bibhtml-2.0.2"="b0klmx8rd09znlxg7wz5m8b1f8qpxsjv"; "bibhtml.doc-2.0.2"="snqyqvgwdwpkyfqfj69zwd478z96mcj4"; -"biblatex-3.15a"="ki4f3anc1abw53fmndw5m41d3gl5a6d6"; -"biblatex.doc-3.15a"="0jdxzkwqy9kh3rb8w1aznbq1gz4hvzxf"; +"biblatex-3.16"="1y6ynai1zf5mx9106yhka418lhki79v6"; +"biblatex.doc-3.16"="5papwbpfnyfrimwh18p0nsnpajfkb6px"; "etoolbox-2.5k"="1b2h9kr3gk2by5n0dswnq3z1hf68q5lm"; "etoolbox.doc-2.5k"="51558shd94h5lrary13dznhss225wrfd"; -"kvoptions-3.13"="jnr335l6nr52608i08zza9z1qi7drnnx"; -"kvoptions.doc-3.13"="w77jdi8gdsjzlhzwscnjvhpp0l27dh06"; -"kvoptions.source-3.13"="ab0dw2aayx34kgshcjv0k4hx4zr9ar72"; +"kvoptions-3.14"="vplbvmnl37ypgrdqcn0mycsnwr5z1ha4"; +"kvoptions.doc-3.14"="2avi8y8yglncwa87vs41akaxlvbcjgbi"; +"kvoptions.source-3.14"="rl5bv5ip88w4251w0hf2wk5p8nzl9lwj"; "logreq-1.0"="4kl4g8kjy4zch0rdn8aj2mr5yxpssdc0"; "logreq.doc-1.0"="8s7ly9p9m270mhhh16gv5p71r10cpnzv"; "pdftexcmds-0.33"="pa208jqk3rvps51niwccdmnx3c0zhlc2"; @@ -140,8 +140,8 @@ "biblatex-bookinother.doc-2.3.3"="wz5w9vgr3c19kd5x6fic9sx3qs6lz0vy"; "biblatex-bwl-0.02"="0a11hlav9gsavdisyjckvnrxkkb4134w"; "biblatex-bwl.doc-0.02"="b7ddxvcabp9qd88mzb6dxvw7sz8dnqfq"; -"biblatex-caspervector-0.3.4"="5rgdqdckgrl9pbk2d3q4cr0g6j2gb0mf"; -"biblatex-caspervector.doc-0.3.4"="2n8fhy903ydzz24kqc491qd7x0hrypjv"; +"biblatex-caspervector-0.3.5"="lfrll315pr653wb5cp3263na44g2m8lh"; +"biblatex-caspervector.doc-0.3.5"="jdq7pdz08pzhrzd4ym6i8fws90a4bhfh"; "biblatex-chem-1.1y"="fizmglf8yy4zn0kqbng2d5c7i9migvjs"; "biblatex-chem.doc-1.1y"="xl7fq05fa16ayzpxpjjqjdkkdxb0jj6x"; "biblatex-chicago-2.0"="6ljx5hr3m84xy0ljj49z04c1dxdnql8n"; @@ -152,20 +152,20 @@ "biblatex-dw.doc-1.7"="ppry56vc44c86m47r1z8mq9s7fg77n8m"; "biblatex-enc-1.0"="ccc2f3rnf7kyavb3r2hmah6pcfl1xivg"; "biblatex-enc.doc-1.0"="b54x1g0296ln6lkw1zvlbmshhr93vg7y"; -"biblatex-ext-0.9"="kzr50lz234hwhfhhblxc3hz5696znq87"; -"biblatex-ext.doc-0.9"="yq631vfhj878gwfkjryn851zlmilcvp5"; +"biblatex-ext-0.10"="jdd9sd2d5i74zlw9i1fw9nz39kzzlz66"; +"biblatex-ext.doc-0.10"="475lznr42kxgfqnjz06v22dn735n3mk3"; "biblatex-fiwi-1.7"="xwb00mw95l90bba4fc31kw62p43cxjz1"; "biblatex-fiwi.doc-1.7"="y5hpi0gwp2s7hgqir2qw2yam9l3aqzdw"; "biblatex-gb7714-2015-1.0v"="cq9fszwkn128c0yprjal5jcjfhcra8a7"; "biblatex-gb7714-2015.doc-1.0v"="gwf2wk7ha7gadg90zp0y91rq04mn4b00"; -"biblatex-german-legal-001"="myvc5zb0a4v9d9y8z4bp34ynvyblnix4"; -"biblatex-german-legal.doc-001"="g2p5by6h7fysyglyj8gdsjz3mnwjl1pc"; -"biblatex-gost-1.18"="xp5b370133fs6dsr8xzw9xfnyxf1hxfa"; -"biblatex-gost.doc-1.18"="jldlsx5faynps1m7zfc94asbcd7473x2"; +"biblatex-german-legal-002"="wfjfph758mzj742z6gmg8dbrh6snmgw4"; +"biblatex-german-legal.doc-002"="ds43kijns6a8qjirib258w4nvm46nb54"; +"biblatex-gost-1.21"="ix95xf69yj6b48w761q1i5wvyc0x5lqa"; +"biblatex-gost.doc-1.21"="bn90k270bs89314iss1rv9sbiiyk5vq3"; "biblatex-historian-0.4"="xp6r6a37ibm9fhdc95b2v3x5kgyz26c8"; "biblatex-historian.doc-0.4"="6280kicfk2n0hwp03pyhl29ljdg911hb"; -"biblatex-ieee-1.3c"="ysyhz738wl2y1a7wqkmxqjrkz7ajdax8"; -"biblatex-ieee.doc-1.3c"="jpdz0v1ircribqnv33wr19ffxxsw5b7y"; +"biblatex-ieee-1.3d"="16r09shnkza9j86x5yb674aqarvbrq6a"; +"biblatex-ieee.doc-1.3d"="arx55nh1jm6257kjdm6gnldr61d1pp4z"; "biblatex-ijsra-0.1"="179hh36v47xfagjwp5vj3hczc18jkrgf"; "biblatex-ijsra.doc-0.1"="x3js5mb545xapavsqq4phml7zqiswiki"; "biblatex-iso690-0.4"="f4hhfkq9hg3m1s3vcxddqqsi1wfhy4c7"; @@ -188,8 +188,8 @@ "biblatex-multiple-dm.doc-1.0.1"="j1hb0xn9gz6mywx018i4rq4g5xwi7af4"; "biblatex-musuos-1.0"="dj5nsyf90mbi4dlghyh8aklqr28jvx76"; "biblatex-musuos.doc-1.0"="ypw7naafkwm22kfq1hd4b0z665g4jz9p"; -"biblatex-nature-1.3c"="wjgvlv71qv8q988pc8xnffzx7gfk1xl8"; -"biblatex-nature.doc-1.3c"="dqwyqgdszfmpj5jmpwfx3607hsgp1s3a"; +"biblatex-nature-1.3d"="vqvnb88jb6rwsdxigpcs2mr03p8d3npj"; +"biblatex-nature.doc-1.3d"="yvc82f9vdh7kh6x444gz7h3bzm8cq15w"; "biblatex-nejm-0.5.0"="vybm8b0dqd5xyw3x6wp5xmq3dvl4by1k"; "biblatex-nejm.doc-0.5.0"="6ppfzm4xdys6akhzc300kfh31jg49hlf"; "biblatex-nejm.source-0.5.0"="q9s7ml5f366r7v1130brjvx20c4bpy6y"; @@ -197,9 +197,9 @@ "biblatex-nottsclassic.doc-0.1"="mswi2valgb31i1whlspd2mxvfcs1szdh"; "biblatex-opcit-booktitle-1.9.0"="3aspv5b3a0lpif4wksanjq3fqclqkdij"; "biblatex-opcit-booktitle.doc-1.9.0"="sz4gb2ahn58y76cl92hpap7xxg0mg0y5"; -"biblatex-oxref-2.0.1"="nlc115k2ciss7450vlbksrav7y3wrvqm"; -"biblatex-oxref.doc-2.0.1"="2q3cb51zp8iaaps2m2m7lw1ffzm0jzlz"; -"biblatex-oxref.source-2.0.1"="dyyjar6l7fzw2glggr3xzszcmmigbkpl"; +"biblatex-oxref-2.1"="j0x74zl6c91hxf0hpvh0g58zchd8081d"; +"biblatex-oxref.doc-2.1"="nyb34riypvic7vg2qs4s46k1j4ah795p"; +"biblatex-oxref.source-2.1"="m088ib6q6cz9sx37qhafqszdkrbr0y7a"; "biblatex-philosophy-1.9.8c"="n2nkfafqbs1rmij23q45ry0gww43s6c4"; "biblatex-philosophy.doc-1.9.8c"="lsllrjkqva40nfz6bxmgiklh2sc6rzs0"; "biblatex-philosophy.source-1.9.8c"="j2sp7vlflcfgj7r4cwdr0xys52gnf3c6"; @@ -209,8 +209,8 @@ "biblatex-publist.doc-1.21"="gqbkq5880gn9maswfdvsfkbgh9y93j9a"; "biblatex-realauthor-2.7.1a"="6qb576bh9x616f02msiq3xz83xzaa047"; "biblatex-realauthor.doc-2.7.1a"="9pbd2aixmwj8as9lrmivkkfl4081820q"; -"biblatex-sbl-0.11"="kd461qdagb93p72av0ffqpy6747yz37k"; -"biblatex-sbl.doc-0.11"="6y9nz59fsqw1mhr6f3pg6sfqasjpllsm"; +"biblatex-sbl-0.12"="c20vk47abw6af6h8xwx2193kck6vsby9"; +"biblatex-sbl.doc-0.12"="3d0pwf6w0gcnrkg1d6pqaqi0rkbidl5b"; "biblatex-science-1.2"="7ql42aav0jqxx7zdfd3mavkbv14rwq7n"; "biblatex-science.doc-1.2"="y4vhwv5nybp628i852dmq61wqccqpgvn"; "biblatex-shortfields-1.0.1"="ji0p9w4dzyf4mi46nbcpvswas9r40xij"; @@ -238,9 +238,8 @@ "biblatex2bibitem.doc-0.2.0"="fymi4mzi8z1f1i4hjh928v8cajfyblgp"; "biblist-17116"="b565jl60ysccd5qkzgidjb188i509y9l"; "biblist.doc-17116"="50kjqxwhdncn09c7cx0abkcihvhfzzpl"; -"bibtexperllibs-1.5"="nnb90d3rqwa1vcc92fmmbnhs7di0rkgv"; -"bibtexperllibs.doc-1.5"="mzvrc7zyrq6agqb5vhxy743brp57yf4j"; -"bibtexperllibs.source-1.5"="ailmqz0d71gscxa584pkb6jpvvzish9r"; +"bibtexperllibs-1.6"="prnsdd72d808kfrkv2s4c9flzs7dqq25"; +"bibtexperllibs.source-1.6"="idmidg8svnznmhzsg0qb2104bw4d9yhs"; "bibtopic-1.1a"="r3rbv97qik2ikmkp3vx6srw7qf5v704c"; "bibtopic.doc-1.1a"="anrfs022bvwbfwsm05hxl10zgwckidn6"; "bibtopic.source-1.1a"="s32v3bwk7a1aqfkmp1scaf812x6ra9rx"; @@ -292,26 +291,26 @@ "auxhook-1.6"="xac68wvfhmds8251pc9ii7rjlak9ya27"; "auxhook.doc-1.6"="gmg6905gsw51mvqwpksajw3p8yjag16c"; "auxhook.source-1.6"="d0f1ia58xllmkg796dvky2b4mv86p7yd"; -"babel-3.50"="6h9rzbgz641k7kh2ya1qyl6zcwnsk9rq"; -"babel.doc-3.50"="n1m6vsdkqgbhyy8dxjl3pypwih2kza0b"; -"babel.source-3.50"="m6jv9li0r7p79i36vzqvwql03y6vamrr"; +"babel-3.52"="wzzxgndcll56wl7flnsd2ypbv27f37z3"; +"babel.doc-3.52"="kzlwmb3p90yrxdbvkkp06qd2whrfkg2g"; +"babel.source-3.52"="vbcdg4phafqf98fq0s6834518hj89gz1"; "babel-english-3.3r"="lrsz299wwvr17sshfjvsvrzs0s9y2acs"; "babel-english.doc-3.3r"="y7rp46lrpxsp8z1ridc6msxnbb008k0c"; "babel-english.source-3.3r"="5sxvprjfcqhw6xb3mv3b0smp2gsckjs9"; -"babelbib-1.32"="0jpv3d5s8inkpg1nyz1b8m80aq6simwa"; -"babelbib.doc-1.32"="cixpp9aiajyjxj23gzvxw94zydsxd3az"; +"babelbib-1.34"="f59py6xcjdpkdrn7gs3ik7ci2b091vrh"; +"babelbib.doc-1.34"="3ajzfn5k7i3ywhhgpx55dvph91amlqsa"; "bigintcalc-1.5"="3ivnkj1qyviffssxymdjy0nagrkh95yp"; "bigintcalc.doc-1.5"="hmfcvfzcyal8sz74ywhcqx3ydhmywgnm"; "bigintcalc.source-1.5"="jlaf6n169xxpipzg2d83dclk05v72h74"; "bitset-1.3"="nw1h1rrc82r2saka495mncrd6vn54dj6"; "bitset.doc-1.3"="srlljjm4s7sfkclndy4ziwcgm3r6mpjb"; "bitset.source-1.3"="1fc9dp30lpgicd4c3cj0vkqy4j01lzkq"; -"bookmark-1.28"="bpz7mvymqhww5nimmwnsmyfr39374cm9"; -"bookmark.doc-1.28"="briagq8yzmxjx9ridrrwql99a1pk6lv7"; -"bookmark.source-1.28"="2h3yqzjr5z2jfy53r45403cfli8ch6g1"; -"carlisle-47876"="wlkxgqdq20dlbinabdia2n1af9nhz5vm"; -"carlisle.doc-47876"="i2mg4zqlcsipqcz4wa9y9p89nnfzvavf"; -"carlisle.source-47876"="bvla3z6fd0m46k365s2fsbpb5ypvb3rv"; +"bookmark-1.29"="m0fqwisbqakdvza2bnr7clwz5nhi9wlw"; +"bookmark.doc-1.29"="vr3fyr67n83j9pcj5piyy3z88n13m9ya"; +"bookmark.source-1.29"="vfkirhdggrclpxvcjv1bk6bz89zy1m6y"; +"carlisle-56753"="7cp342lr12vvr9zy0g84l5jy0aj241v5"; +"carlisle.doc-56753"="0wbnc5y0vvwd9208z2ylwfffaqr3i88p"; +"carlisle.source-56753"="bvla3z6fd0m46k365s2fsbpb5ypvb3rv"; "colortbl-1.0e"="v55k9b9db0gy7fhqp0lg3isy4v9slphm"; "colortbl.doc-1.0e"="445wygx49bhlsyqm9czmp4npksgxxs01"; "colortbl.source-1.0e"="jbxzz8nx1gxm642yr63am3nz9f3sqq5b"; @@ -321,12 +320,12 @@ "etexcmds-1.7"="5ihd653q0sbq1q40hd9pvwxj73j099iq"; "etexcmds.doc-1.7"="h35i02fn3bim95f50bvq50pwiymjdpag"; "etexcmds.source-1.7"="dkiaxggiyzx1w07brj8zgqn7f1s4vs4h"; -"fancyhdr-3.10"="0jn1ivsf29hmmclhxbl1fc2gmglgwcq8"; -"fancyhdr.doc-3.10"="dndsyllh1bb96p5acr7dics7831g4pax"; -"fancyhdr.source-3.10"="xg41mjxhd1vajr1n1s8vzvggkf4zi9lz"; -"firstaid-1.0d"="wc9n67g7v1y82wzmmijjmy7ai6f84ls8"; -"firstaid.doc-1.0d"="9s2vhl6yqgl5vr5877862j3jcfdcqfnd"; -"firstaid.source-1.0d"="qqk73cw9b4wjram607ylxq989nf32jmm"; +"fancyhdr-4.0"="1vwf5j8bf1xkk06r1i8wk4cq3lmzz50j"; +"fancyhdr.doc-4.0"="k1g0f9ss84h0n1paymhar1azbcr2ad52"; +"fancyhdr.source-4.0"="ajvh04pj955ihpn9pwzhjjs7inpmncap"; +"firstaid-1.0i"="9vivpxkdis707z686ls6yj0rnlzxpz8h"; +"firstaid.doc-1.0i"="qlansw5gcrm168fwrij2r09z6s0vxxfd"; +"firstaid.source-1.0i"="w4c8h87bhbpyp8bgriac9y4jw3iyj0g4"; "fix2col-0.04"="4lr11c6qqbsmm3jixayn7jlyikh65b83"; "fix2col.doc-0.04"="k9hlwbz12vqc446y1ydy045j7c29yzng"; "fix2col.source-0.04"="524zn5yfy3zwy70m11vch4ri5xwrgi0p"; @@ -387,37 +386,37 @@ "l3backend-56424"="7rdw1mdgyy4gm57c0c1yyalj8sfpadi8"; "l3backend.doc-56424"="4dhc5awcvpiymir33wm4asz2xbawhk45"; "l3backend.source-56424"="8infr5qkjrps0nqlrpijsap5p01ccwx6"; -"l3kernel-56556"="65gl8zbvg0pss7wx2qh2vlhgjlzl334b"; -"l3kernel.doc-56556"="gjz8zrj31z4mim2h94wyxdqms0k6172n"; -"l3kernel.source-56556"="siqk8556hfi891ahz2gviq7n4qhyml4s"; -"latex-56514"="xmsf352kgs9dlck2xhq166hggrxikfk9"; -"latex.doc-56514"="cnfa8kaznlibh8bcdx8ab1gpy7qyik9p"; -"latex.source-56514"="p2mljvf1iybpcif73rf1ir9zzp6kpxkh"; +"l3kernel-57088"="nx3qcqcasbh5wqprfd703zx83qfl9yx3"; +"l3kernel.doc-57088"="533m04r2fjgrxh4cfgdmh6kjr1vn9ik8"; +"l3kernel.source-57088"="hfdrvihmxqbwqgc0lfrnqy581nl0k15h"; +"l3packages-56785"="m451yyhjbcmig9vncj43jmxlhs6xarvz"; +"l3packages.doc-56785"="f40lhaczxfccjqrc81j44qbzvw8aqpn8"; +"l3packages.source-56785"="wsir7rqbpp28gpg0wly9apcdwsipd5pz"; +"latex-2020-10-01-PL4"="85wa2sw72nzh6lwf47pwjzmd4zypjd6d"; +"latex.doc-2020-10-01-PL4"="ddgjcjhlyqs4v336h0rxlq3bpfki985j"; +"latex.source-2020-10-01-PL4"="igvlaq2pg82a4cf66yrdi5cpc9glrpzx"; "latex-fonts-28888"="pw97wy7b4hhzm28r0wl44lacn7nx41ia"; "latex-fonts.doc-28888"="mv9ivpdxgyjj92fq9141bsw5s306mg83"; "latexconfig-53525"="p0p0bmn0xa6pny05y862pnviafrjhr7i"; -"latex-bin.doc-56548"="6k6l63crh3kpg22v79s5kq3gra330194"; -"l3packages-56556"="7r7k76lr7wqqx87d4xnjpc3aykis6328"; -"l3packages.doc-56556"="737y7wzkjkl37hav3xah06qz9ara231s"; -"l3packages.source-56556"="q4b59jmgsmfrwbm1a9dkhfdngg6ppyny"; +"latex-bin.doc-57186"="6k6l63crh3kpg22v79s5kq3gra330194"; +"everyshi-4.00"="z9jwa1p2n1463ssx82dzdnj6wy69l856"; +"everyshi.doc-4.00"="hk1m31wikxs1b66sjmh8vkjd0js50c6v"; +"everyshi.source-4.00"="lz9d57cvr57z25j3263ddyiv9xvq9h8d"; "lm-2.004"="ci5dpznkzlal3bkn0dcd2m5i05aws66g"; "lm.doc-2.004"="w3g5xn4pfqhri4glpbh66rs8d6nbrd02"; "lm.source-2.004"="bw69srvx8mprnj8d5f48bq3mg1ysfk1n"; -"luaotfload-3.15"="k4a960gmx52xlzvy58f5j731ljxnq6vx"; -"luaotfload.doc-3.15"="rk8ah69vjc92gyr459pj0iysk20yrckm"; -"luaotfload.source-3.15"="423i6lpfcs4f8y3hlh0fk7ihmpwkbz20"; -"lualibs-2.72"="iwr4hyw221wvr0qyz1pnmbj0hry0304b"; -"lualibs.doc-2.72"="6kwwhgmkpdgpwiy2l3rhl4w865ng4cg6"; -"lualibs.source-2.72"="2nh5mw358ppnb5dhcrxf0qn11n14i1iv"; -"ms-51784"="1pl0q5d2rmp29raq2icpn03lfa7hynv9"; -"ms.doc-51784"="xwl23v3xbp7kahsh1d5lgjazbbbn91hm"; -"ms.source-51784"="9bmd1famkcmas9g2bb9mi0z6yjrlrqh7"; +"luaotfload-3.16"="wl66y4wh0l7qwg7ay2wlq7phgchxycmi"; +"luaotfload.doc-3.16"="c1806dar72mbdxyh45bmqr3m204knj2d"; +"luaotfload.source-3.16"="423i6lpfcs4f8y3hlh0fk7ihmpwkbz20"; +"lualibs-2.73"="jcdwmmdkg2kbvnvybfyskf1k10wnxc6k"; +"lualibs.doc-2.73"="mvdgcbmrwamdn0ddqx866v94grdm5abn"; +"lualibs.source-2.73"="5ambrmj82026wa0ginan4sjgfxhzm87r"; "ltxmisc-21927"="lf6x6jbl1d3i77wb0dg7lmy26qxk7h8x"; "mfnfss-46036"="52p8xnxca0ypcxbbjakx42mljjwv5jjj"; "mfnfss.doc-46036"="0c2hn0h964j1c0kzn0aq19cvff0n87hs"; "mfnfss.source-46036"="829y6cng0z45bdsb2vdrs4wkq2pp0cxz"; -"mptopdf-54276"="s1gykljbmzqqpdhipyxnsz4cmmpxmm96"; -"mptopdf.doc-54276"="z2jlmw0d4lw1mkn7qwlpyvx9rradiawl"; +"mptopdf-57347"="s1gykljbmzqqpdhipyxnsz4cmmpxmm96"; +"mptopdf.doc-57347"="5lrz8b6a6k130gkh0skg72y1m1cjpzwq"; "natbib-8.31b"="c4fyqph06vxqm37z88r31q84xz5imcnj"; "natbib.doc-8.31b"="fsg1kcjvbp5hfn9h8lwhygnil9wr7awg"; "natbib.source-8.31b"="c4b7bqivps74v8286lf4j36p551jhnzj"; @@ -476,9 +475,9 @@ "footbib.source-2.0.7"="xj3agjgzfnwnfzzbzk4xjfk90fr1a6fm"; "francais-bst-1.1"="zz8wcr2ymwd7m721qr94l1k799mi9cia"; "francais-bst.doc-1.1"="qmq30903zrvvw6bprngklx5pwq9c1cqd"; -"gbt7714-2.0.2"="jm13r9974dlg6pl2dgrgi1wgkqd0c0hg"; -"gbt7714.doc-2.0.2"="kdslwk0xwgj5zansx3n7k1ds5wiv98dw"; -"gbt7714.source-2.0.2"="0hi7vgddiyrqal79nss7xvpl36jwq2n9"; +"gbt7714-2.1"="d72pw49b373nj1rrl3phvcmnyjcx4772"; +"gbt7714.doc-2.1"="rpvsgxsm3j492qsyadxnchk8hbasm6ch"; +"gbt7714.source-2.1"="0ndyqhqkrrqc8mvfga8hrm8dhzd6clcz"; "geschichtsfrkl-1.4"="94vlnvvfy0py3ig3mjjizxbnp3xcnpv6"; "geschichtsfrkl.doc-1.4"="212pcrypha38lk3nri43fvj12fgjlqzm"; "geschichtsfrkl.source-1.4"="ak3n8j6n1wx9pgawvyr4diklq9971wx1"; @@ -567,8 +566,8 @@ "usebib.source-1.0a"="967j287dsb1j4wa5k9sxsv4xp7194q3b"; "vak-23431"="7ar45am5q9mhv8liz1zvix9wgcwqgjhl"; "vak.doc-23431"="sr1gi7csll74iw13j24r1hdwn3gql9ak"; -"windycity-56492"="58aylihi386z72hx2yk532szwfr459yj"; -"windycity.doc-56492"="ylinhvp1mdigcgpq7g4946ipirdqjx8x"; +"windycity-56911"="dxlhvym5f12jymwc3kvpdjh48asvgmfc"; +"windycity.doc-56911"="hnw7s59kgaigfyzkgrh59smiblnynb1r"; "xcite-16383.99998"="wvb8mc5cp8s32hvi76gby25nk3n887jd"; "xcite.doc-16383.99998"="h07vrlm1107k8a8mjv4f8p0s69k5d08p"; "xcite.source-16383.99998"="kllh0w903i2jybhciiy925rs186klrh2"; @@ -582,8 +581,8 @@ "arara-5.1.3"="r1v2yazqi3ch0pc67gaa4h7s46f0ii4j"; "arara.doc-5.1.3"="702qxsc1si6kiwivg6409xr70aq040ih"; "arara.source-5.1.3"="pyicgm0x6kgmci9yclh4cdcb8vkhka8a"; -"asymptote-2.67"="x9zsa3qm2g31qrf1df406srz811sncwz"; -"asymptote.doc-2.67"="xwc0ggdrp2zbcb08yic8azx9mdz9hrvl"; +"asymptote-2.68"="x9zsa3qm2g31qrf1df406srz811sncwz"; +"asymptote.doc-2.68"="xwc0ggdrp2zbcb08yic8azx9mdz9hrvl"; "bibtex8-3.71"="sri58vnydvfpv947gmlxd1s3c2056fp1"; "bibtex8.doc-3.71"="d5gk5h3a5milfx9lb1bcyzc6y5pz3d2c"; "bibtexu.doc-52851"="djmr91p0ig74imwgym82lpm81jp3csgb"; @@ -630,7 +629,7 @@ "dviout-util.doc-52851"="g20rq0qgf4va4icrg830k9r9h2by1cj9"; "dvipng.doc-1.17"="ckaakzpg7r0djiiz8l7cjqr02f1glkqx"; "dvipos.doc-52851"="6m8fym7ky0a7xy6pmn0aklh5jg0ppbzx"; -"dvisvgm.doc-2.10"="kapga5h6vvzkpwck68z7hpw0zr9pir5d"; +"dvisvgm.doc-2.11"="kapga5h6vvzkpwck68z7hpw0zr9pir5d"; "findhyph-3.4"="4kc8qj2hs4hf7h25xb031fy5m9j8jygv"; "findhyph.doc-3.4"="ivpfnjybcl80xzda2jlrplaglqhf9adc"; "fragmaster-1.6"="r6wbba0qjxr5shfrf5ia8984dcrijpir"; @@ -657,8 +656,8 @@ "latexdiff.doc-1.3.1.1"="0fks08hh9z03bcyax837dn7rlf3xliq6"; "latexfileversion-0.3"="79yrcgv4lj33pavgn48ycvsd9a1x49s3"; "latexfileversion.doc-0.3"="c6n7z8c3lzrhk2g1fn4v05l2y6299sr8"; -"latexindent-3.8.2"="ac2b0aivhcivvd16sdapiizypyk68zwx"; -"latexindent.doc-3.8.2"="w93c03pmf2wzj1iy2ki153bd39f4p4ss"; +"latexindent-3.8.3"="ab4qipxyh1d385lypwbaaab202z2drnz"; +"latexindent.doc-3.8.3"="1ja82ywynqqlb4f8hd8am1yjsips148g"; "latexmk-4.70b"="21lwd164g7z57rz6w2kjfgzm2km1hwff"; "latexmk.doc-4.70b"="39gnyyhwbmpwnz82215icd78jms1na3q"; "latexmk.source-4.70b"="a6zcqynkxjfrlldpg1js76ffbh2i6m3p"; @@ -696,8 +695,8 @@ "pdftex-quiet-1.1.0"="3cx8zd0q9z19d1xhhc8rd640ifwsrjxc"; "pdftex-quiet.doc-1.1.0"="84mb3zp9h3jnl179kc6svsd52pmx13pd"; "pdftosrc.doc-54074"="2f36i1iminb16zkpb796g2brrbs1s1ra"; -"pdfxup-1.60"="2p71pka7fhw4l887h7cyd8mizhjbp8m2"; -"pdfxup.doc-1.60"="h8iwrl07ax8xp8b7ns79aiddwdjhab8l"; +"pdfxup-2.00"="mza819bgnq201y9pqkjb06ky44kjc6kw"; +"pdfxup.doc-2.00"="xjwqzajjp6hayyxldqnb6n1gczx1rqlw"; "pfarrei-r36"="n351xhnwd12vvy4b4zv2r9cqx1crd435"; "pfarrei.doc-r36"="bi4wqwx32x2498kr0k1rmkmslyz134x0"; "pfarrei.source-r36"="zrdbqakfqkm5kwbpwpy5d1pqp4w5sz42"; @@ -718,8 +717,8 @@ "sty2dtx-2.3"="irvwyxk3ggfbc8p4b8s70v5704lqmsib"; "sty2dtx.doc-2.3"="s9qzsp01129wgi8qfh0ljxkaj9jvdr65"; "synctex.doc-54074"="wk9fbvv3gdqzyh12gxa05zbd88l5zh65"; -"tex4ebook-0.3b"="yfzid2313phvxkp8f3b5mk7kkizczd7x"; -"tex4ebook.doc-0.3b"="r3i1bvrccrzazql9nxbmmrrzmgr0qqcx"; +"tex4ebook-0.3c"="s2d0w5089zd6xai6qhj8cksijbrgk2bl"; +"tex4ebook.doc-0.3c"="z54xmjb89jfz1j06gmzrli0f13kr4095"; "texcount-3.1.1"="spfdnfgbcy8y8c7191pd973wmdnrgp8j"; "texcount.doc-3.1.1"="idd45zpjjy6cgibnndxygdmljw28gyq4"; "texdef-1.9"="jc5hxmivzlsr1cklddvxmv3zxcyq5j6v"; @@ -766,15 +765,15 @@ "lm-math-1.959"="j995x0y357lac8mn1kzn9v8p3v995bz7"; "lm-math.doc-1.959"="bgfq2c4l1shm9453822cnmq7yq6hlknq"; "manfnt-font-45777"="isk7hkf6lfg41mjli9sgn77kvn6fkl96"; -"metapost-56291"="6hm4z5b1yw7qdhnk5zvr0li679rvfvi0"; -"metapost.doc-56291"="g4q6g496pzvdi5g285zyn76wvly60irs"; +"metapost-57271"="6hm4z5b1yw7qdhnk5zvr0li679rvfvi0"; +"metapost.doc-57271"="d38xa7r499np9f0fmfmxnwh6k28szr1h"; "mflogo-font-1.002"="m5lb3rhr5yighsixjb0k6zp2hx8fxvr9"; "mflogo-font.doc-1.002"="va6f9qjbh5ah4zvlmc4wi9m395x3bhpr"; "stmaryrd-22027"="shivgpyz8sa63sqkmpgqvw1v1iyc0g35"; "stmaryrd.doc-22027"="r91xmqmmm6i6jka78qyaiilas94xc5hi"; "stmaryrd.source-22027"="ch2gj89jxrqysjsl24s40za3y5z03yan"; -"xetex-56548"="5mai30qjzqsc5hdmzavbsgchlarv6gfh"; -"xetex.doc-56548"="v3ijvh3ybf8yw7623x09nz6hi36k8bnj"; +"xetex-57186"="5mai30qjzqsc5hdmzavbsgchlarv6gfh"; +"xetex.doc-57186"="v3ijvh3ybf8yw7623x09nz6hi36k8bnj"; "xetexconfig-45845"="2wjm3wl2975pd1d3ql2qd3yhhdh3gvmp"; "context-account-47085"="85lpl8g1by9mvqnmxy6v9iasvgmjnazr"; "context-account.doc-47085"="lms208c3s9clga2ymi1j2i5whyz2dffy"; @@ -860,8 +859,8 @@ "adfsymbols.doc-1.2b"="q3840xankbi9xr7fdsfxd3gkgydrvmxr"; "alegreya-54512"="g97xv22dfmdfhyn4yqz67rj42mkp35qj"; "alegreya.doc-54512"="ds3p6fvf6bdrzf9clxksrcl9r3lbbknx"; -"algolrevived-1.05"="zsvm25smf853hdl7rqw1irl7lvf6lryi"; -"algolrevived.doc-1.05"="5l6ql0n9j8xbsdxwkikw15265vqkh5w0"; +"algolrevived-1.052"="9bhf3s32fk8p0vfw81c05jcpcbjmmsrm"; +"algolrevived.doc-1.052"="vcfri2j0bl3bs2lvf3ykz9ydrva030kk"; "allrunes-2.1.1"="yxijvmvgjl2q05v667fmqisbyd7xsjpr"; "allrunes.doc-2.1.1"="b0sc4d9kla5sg792zvwqjzszz17w19iv"; "allrunes.source-2.1.1"="n986ppx466mparm30mlv7cn5mmjh74sy"; @@ -879,11 +878,15 @@ "archaic-38005"="jvj1s2dcgkwgi9ywg48vw7i14gmlmq7n"; "archaic.doc-38005"="mb0z3xq325y48yv0bx4xsz8x5f790c60"; "archaic.source-38005"="j05dan5d8xxzg43iay4v76vbcdscc6zn"; +"archivo-0.0.2"="6cklwzyrf0b5pwakna7qgfwl6f1rgz4v"; +"archivo.doc-0.0.2"="s7qhxip5n0iwgx8c10lg1c5blkvby4x8"; "arev-15878"="xc3i2264d5w0ijv10n6ka53311bgnib0"; "arev.doc-15878"="s39jgnizjbpnh1czr3ck5yd32bxks476"; "arev.source-15878"="msk58av5fwg6hi4mzpz8abgzigqyskf2"; "arimo-42880"="1z5ij30qfbd4y2c0292aai2dsg87n1rm"; "arimo.doc-42880"="2fr1vjv5386lvixzs8idr0wyf9ghlg1f"; +"arvo-57213"="jz4jq6bin6pnwz643z576hdcvldvkbv6"; +"arvo.doc-57213"="macfnskh7cjjcxsr1mhh8d74kzw67wcz"; "asapsym-1.0"="gbn04lk9k66wj689vna4kgxq8gddhwca"; "asapsym.doc-1.0"="qfbaary485cs3q5azl6d650z53kd9s73"; "asapsym.source-1.0"="g9m2vwmd438fwfczm8xwhv4wdp2aj114"; @@ -910,8 +913,8 @@ "baskervald-1.016"="igfnj3pwvb6443c531va9kzylizxm9vs"; "baskervald.doc-1.016"="mq8ms68crhv6afh9ld6scyx2xn2ik6jk"; "baskervald.source-1.016"="7y8d5vqbd1bp3gri0rhzk3cb12cwchr1"; -"baskervaldx-1.074"="iwr4zqy5l93la5mshgqm6bcwzj727i4s"; -"baskervaldx.doc-1.074"="aaqrs7brry15cggz118c27bdvh9z0arj"; +"baskervaldx-1.076"="hv5ycdbvsgrajd2waycsl0ail4vj9kh2"; +"baskervaldx.doc-1.076"="km1ycjnk0sksv73rl38dfx0jlrvdin5n"; "baskervillef-1.051"="5mb4w2c9i85hi0vdn3nkakrhbzin59ma"; "baskervillef.doc-1.051"="7000j6d5p3ar92imfm53ss57xm63r17k"; "bbding-1.01"="8kh5c0chlw1f2pqzh9pc7zx8y2jcgh0g"; @@ -1013,8 +1016,8 @@ "cmtiup.doc-2.1"="ycj4il7cxfnigs8sxxwga045g9v8rv8h"; "cmupint-1.1"="y3vd4gx3bm5432xbhp6kd6fgvgxb24id"; "cmupint.doc-1.1"="jh5gh9ca5gwvjc0zpbb8wzlbi7kzfmf6"; -"cochineal-1.064"="8bj8vs4nj13axzijxfawx6cf4f9fdpb1"; -"cochineal.doc-1.064"="l3nfnvzjarq3dl3vd7139fmdrciqlghz"; +"cochineal-1.065"="apwv5j423x4g02v8rq3wj7mp2364245q"; +"cochineal.doc-1.065"="jdz7qylnkzpndzlazzcn53dhb03izr55"; "coelacanth-0.005"="qbhn9dh24pnw2bzsjgv2inr1fyh26qka"; "coelacanth.doc-0.005"="dbx6zwlbflq60b3zgkff1aj284bl77i3"; "comfortaa-3.2"="r9sis4ra19lgzsl56h3xp8s56awhlbrq"; @@ -1111,8 +1114,8 @@ "epsdice.source-2.1"="6px6gazxv7pr9cagfrg7mzx1w3z2nxn3"; "erewhon-1.111"="dsvp55hhwrgbyrbqiiikb4inv17snffg"; "erewhon.doc-1.111"="sczyvlpvzlg9xh7qjrj5vidl803ynd6a"; -"erewhon-math-0.44"="4gk0154d8gjvrfs70kbp6rpz8573990s"; -"erewhon-math.doc-0.44"="49bp5w0xcqxmv7nrkb4qrzvwnjs76x5a"; +"erewhon-math-0.45"="hx56393y3qvz6xhdkm1sqlnzk1bs8fgy"; +"erewhon-math.doc-0.45"="q1yyga9zqywjf4ic103h5clx6sap79dg"; "esrelation-37236"="zhs9fa75r0wr060cfsk4gmmvn06mywmy"; "esrelation.doc-37236"="08i1bczpz8sccj5lf32axfl3c5ix1sri"; "esrelation.source-37236"="r1ylhybcbbxjkyvs07m6csmqgz14rrcv"; @@ -1143,8 +1146,8 @@ "fge.source-1.25"="ak2gj4nk82ya7dfbi2vwp60lvnqlvnzl"; "fira-4.3"="7djxip2p87v4bjjnlqigzyia0cdwp1yl"; "fira.doc-4.3"="llsvxv1afxxlkxxwyk9mrq32bnz4hjml"; -"firamath-0.3.3"="fl4cbr4kka8yvq31dl7iiqylp5s8kqvm"; -"firamath.doc-0.3.3"="9higy6zhahbmfaa9w6js7958kqf6v085"; +"firamath-0.3.4"="jcqr18y6256nz7pj740yimvqj6f1rwng"; +"firamath.doc-0.3.4"="mbzsrizx3rh5gq4j8aqq7jgfcri0xhf1"; "firamath-otf-0.02a"="8va0xil2r5i2bjmmv7xj39jbk9j8l9d8"; "firamath-otf.doc-0.02a"="0i3j6rfpa5jahxipwa5ibfkh4x7vhz48"; "foekfont-15878"="wha0shrvr3lv9ll9d3gv60mcav605vcc"; @@ -1169,6 +1172,9 @@ "frcursive.doc-24559"="r0bj4g91m2w3yl8q8kim6ldm4d8lyziy"; "frederika2016-1.000_2016_initial_release"="bl8g27dfv6xsqfwlr2i6w9yar7916qnn"; "frederika2016.doc-1.000_2016_initial_release"="ncd2plzgwdwcv1many94alkvbjh7xjf6"; +"frimurer-1"="fh6b7ag1zzzggi6xzb6by04hwhhl2k4x"; +"frimurer.doc-1"="vghsyznfdxa6ab2irz1gppr57sbc6b6p"; +"frimurer.source-1"="ixvp583gb0qlfi28hxy52hzbivnz77k8"; "garamond-libre-1.4"="sjc7j87aq5vi8zgxiigg9hslvgq43fwv"; "garamond-libre.doc-1.4"="k0m63fxp3f8fhyjachi19la5kz7wgz3d"; "garamond-math-52820"="mr7aafbkhy8z5iy5qc0l7pmpqbvnzq4n"; @@ -1232,6 +1238,8 @@ "initials.doc-54080"="6nhvprdk8nd8gxmhq2hb8s41rpjwmv4g"; "inriafonts-1.0"="v2z21gr8glh8557carc8405d39h9yxyq"; "inriafonts.doc-1.0"="dq2aix14cqch32dywqyka5ci8qn31ayw"; +"inter-57213"="217klka90d7inpzwvjv0cmrfrmgylpjs"; +"inter.doc-57213"="a2rnff5s05lc06k48mcidc1biyczvnyf"; "ipaex-type1-0.5"="pzqc88hkzspswvgps1bswsn6khablb87"; "ipaex-type1.doc-0.5"="xls1iggs58i1mnpc79fp15v1f1i59h3y"; "iwona-0.995b"="l8pylg2zq5pvxs7czq17b3v1xpar4qkr"; @@ -1240,8 +1248,8 @@ "jablantile.doc-16364"="yml29hq7xcawh3zkd6b32dbsk0aj024q"; "jamtimes-1.12"="mdyyd5fy4hhi74rpc5hb7bmrxwdsk9k9"; "jamtimes.doc-1.12"="c9849k8v23lrfrchf00yvrvq5q7g1gq0"; -"josefin-56311"="iyrjxsy05x1jbnzryj8s68qg9rxl770f"; -"josefin.doc-56311"="kzqdhzl0r1k8yk06qz1didbhp43pmmd5"; +"josefin-57152"="18lrkgv2giwpm43g71ygmd77nr4s4df4"; +"josefin.doc-57152"="zg0p38v21kscdcr20xn6g4a4vx4r7ylc"; "junicode-1.0.2"="2vg9bfcpawwij52yxai93fb276v351wy"; "junicode.doc-1.0.2"="49dyn91fjdhs7yzc6j7y9ihnxkc9wpml"; "kixfont-18488"="b9z3zajxsqs84zh5k15rx3jgkwwgwa40"; @@ -1249,8 +1257,8 @@ "kpfonts-3.33"="rsl5v8zsm8pblyjryw3f14svxjzhnchm"; "kpfonts.doc-3.33"="rr7q8ww1nkpzqy29xmxhsyizszf59mqx"; "kpfonts.source-3.33"="448xjy1djbz9l9wbhmq7r6fpgvsn9dyy"; -"kpfonts-otf-0.31"="k648qikyjc7izhc8h19b65cp4gzmxb8l"; -"kpfonts-otf.doc-0.31"="gmhwph5kh1ndri1yj3i45hq2dxzg2a18"; +"kpfonts-otf-0.32"="glzbjwslsv7cqhkrqmhizx4anbsqx535"; +"kpfonts-otf.doc-0.32"="b8ldq3jg09lb7c4x1iajyhx194r0nq51"; "kurier-0.995b"="dadp8vkzvblj60424k75bchravcr0338"; "kurier.doc-0.995b"="a4hw3w7qg492qnf4kivjsdfxqyrq669b"; "lato-3.3"="5cl837pwnp1zd7h8w5j7cwqpvf6pmik6"; @@ -1266,21 +1274,21 @@ "fontaxes.source-1.0e"="4cgxjx83a87dpmandkb36j4pjvmypvg7"; "mweights-53520"="6rwqdlv6x82pskdga8yzzz61yfxgvzpq"; "mweights.doc-53520"="zkki0s268s1a23zm962ymbxl3gi7mzix"; -"xkeyval-2.7a"="nznhb9srbfg7ifdi2mlkqbdcsq6329a4"; -"xkeyval.doc-2.7a"="k84lpc1h5d71qcb2k5rm5fnn04pv8czc"; -"xkeyval.source-2.7a"="9g5vvb4y71qryhdbjwjyxhh2w86cch0f"; +"xkeyval-2.8"="42rn633ggns36f6cxy4alii7mspfq0b2"; +"xkeyval.doc-2.8"="sa7qsydnwsl5s5yr0gdnmiv125j1163y"; +"xkeyval.source-2.8"="wsj7l9nya5753423srdk6dxzza8b0mf5"; "libertinegc-1.01"="jmz5hjyld04g175sgg322lrlazcbmbz7"; "libertinegc.doc-1.01"="qf8q9c30ljq44kqh8l855xdkq9i4w857"; "libertinus-0.02"="hvyjkdpyb4i742jrp38jvihki874ynzy"; "libertinus.doc-0.02"="00qv91migs6yq98sq8yzvgxyn2nfmnf2"; -"libertinus-fonts-7.000"="64k5a77sih39af4yig0n0zs646iigk0q"; -"libertinus-fonts.doc-7.000"="3fparhj044gym12c8b7h46ax6iypjs1a"; -"libertinus-otf-0.26"="vk7skfrymfjcq2bz26n0qwn2vkz84094"; -"libertinus-otf.doc-0.26"="aji4hnx7rzbvvlaahyh17ngng77ywf22"; -"libertinus-type1-56160"="n1j5n41lcl27hz8gz6qzwwjsqi49dxg5"; -"libertinus-type1.doc-56160"="5vl9xnfj5vnysw95rr5qyziwrwn3l3kn"; -"libertinust1math-1.2.1"="pi1jmb8wx2n7zpb80jvyk71z5969h7vi"; -"libertinust1math.doc-1.2.1"="7cs3igry5pvr00alrv92w9a0ybgh370f"; +"libertinus-fonts-7.020"="b1g49ajzscj8lk0szqhfnxs5n45cgw63"; +"libertinus-fonts.doc-7.020"="bnsxh72cl4iyln39w2b5m6jvlbf5mdg9"; +"libertinus-otf-0.27"="jgq0yql4nk3m01c8nmg35wz3v64qn9nc"; +"libertinus-otf.doc-0.27"="s3f5a4wg9l4gpbpbk1xi6w9s2dhxvhsx"; +"libertinus-type1-57159"="n1j5n41lcl27hz8gz6qzwwjsqi49dxg5"; +"libertinus-type1.doc-57159"="p8hng135zwahklgzfj6dqwfvah94ylxi"; +"libertinust1math-1.2.2"="pc8wfs8px04bnsgwkhbi46gs6synmvs1"; +"libertinust1math.doc-1.2.2"="v094dws0m9cv01iamdpirrwlvmdsf665"; "librebaskerville-56018"="n7ld6vxki5zh7svbpgzl239y3gb9h2xn"; "librebaskerville.doc-56018"="31pv0p1g3za88z7br5zx2jfhvpaij6m7"; "librebodoni-39375"="1znd7g37rmm1qsv35dd9kvkmkfj4d3w5"; @@ -1335,12 +1343,12 @@ "montserrat.doc-1.03"="0hb2s3xrsawiza8qn21hwkji1sxxi4xz"; "mpfonts-54512"="ar90vvz924ppxyfbqa3g7j7q9l4ddah2"; "mpfonts.doc-54512"="kyij6dba277ysdwyd74bfybqi2bgm436"; -"newcomputermodern-2.31"="g9nj0x2h3k845fb26xngpmsc4vnvw9gm"; -"newcomputermodern.doc-2.31"="prz0lnvzv52ypw4q8s15ix0l58sn9c3n"; -"newpx-1.413"="bp58v6iaiyl2ivznf1h44ny4g5snnvw5"; -"newpx.doc-1.413"="f5kk1mc9f6bp453drmmzawvina0md0qg"; -"newtx-1.630"="dqk5sv3ivpash74a9ddbgv0qjrqck1rc"; -"newtx.doc-1.630"="vm5wbybsqdz6k4qlrpzkprprhqsqyyzf"; +"newcomputermodern-2.34"="d95mf74dpndq1id44jiprf2rlmiiihy7"; +"newcomputermodern.doc-2.34"="x6dz99kgfj0s1ga9k8k3a05bd6g461mh"; +"newpx-1.414"="dhhrp4ylaz6xk7z0n19lbp5506nkx7zb"; +"newpx.doc-1.414"="3kvjf9vzmbhmcsrkcqzp9yk6v32l9wgq"; +"newtx-1.640"="vx0dbvwhxc8h39pfh8i878wpfw02xwj7"; +"newtx.doc-1.640"="fxnx7kjh4226k72qwhwgqh9703im1v3n"; "kastrup-15878"="qdr5cacl37ans3zd5jlzwr2356xxgswy"; "kastrup.doc-15878"="mvq3abnsjmzb3kv4c2z116apbzgfh2dw"; "kastrup.source-15878"="13vj32k48f0ahs5694zrsvk953kxjrwc"; @@ -1352,8 +1360,8 @@ "niceframe-type1.doc-44671"="12bn96xfs68zy9sfxi5q67mnaqkl1v2a"; "nimbus15-1.013"="9k2ck6b5lj3n5fjlpmwxs589mf9ph02y"; "nimbus15.doc-1.013"="pb7vyh76yjs5ywb1hcwpxid9gzdq082q"; -"fontools-55997"="f7m47yp3gxpy1xffa1mvlz4rsy120ypl"; -"fontools.doc-55997"="5zay561ij6sp1wcvdjyfa8p0ppagbjyh"; +"fontools-57171"="lhkm7vl0plalj8f7c3x2py1ba76w3fhz"; +"fontools.doc-57171"="zyx59j8vq5w15fljpq37jx10aaaxmnzh"; "nkarta-0.2"="g55hn51ys8zd7in6c6z46mwva577s6qd"; "nkarta.doc-0.2"="59na8icxp6l11jk6nsp53c1y5gqyjsff"; "nkarta.source-0.2"="jqh4ghyi8ry5w9x909w3kscg9p6m1279"; @@ -1361,8 +1369,8 @@ "noto.doc-54512"="ws089havhd1gi0rs7mvdh6nb0f1npbxl"; "noto-emoji-2019-11-19-unicode12"="4hgmkcwhy0air6pw59331ydfxbjj0fxv"; "noto-emoji.doc-2019-11-19-unicode12"="viyj6daza3fqvdsj101l75v32v9xkv8x"; -"notomath-1.00"="xyh8sd811brsf7gz7qsn4mbjrxas4ms8"; -"notomath.doc-1.00"="y9b5jwprlwx8drir8c6q8agfx9if22jf"; +"notomath-1.01"="82i6a43z09zmn5rxgyxpwiakb1rxr4z6"; +"notomath.doc-1.01"="nana478cpv0z89s7f9w5lmb9xvzxjx2b"; "obnov-0.11"="49j5a74f298hw84np3ih4xd0hnh6r1wh"; "obnov.doc-0.11"="m9c4z3ckj08ai2cdb3hhiv040y6n1bfl"; "ocherokee-25689"="1fg65c5gpjsx8vv9vsdg8szagf1xmg6a"; @@ -1381,12 +1389,14 @@ "old-arrows.doc-2.0"="n9ly98pmz304gymkiafs3fncs9qq29mb"; "oldlatin-1.00"="dw53za52apri5agrh2jpxrw0qvnk1mbd"; "oldlatin.doc-1.00"="ngf614psg11qa2gmda30c6an4f371lda"; -"oldstandard-2.5"="mlwzzs29s5bf8hym5748wsldj2w092rd"; -"oldstandard.doc-2.5"="qrz3lybazynjlp770l9sknzrcr2mcjdn"; +"oldstandard-2.6"="95xqbrjzizc2qhjaw30zi0x2h7w77cqm"; +"oldstandard.doc-2.6"="dmgzhqgqk0h11ix5y0gs4ci7r73cfawc"; "opensans-2.2"="a68ghfiy4iiv9n6z78s956grswbdyf4k"; "opensans.doc-2.2"="c70nwprgs35f2a7bvabdbsnmkayxyvd3"; "orkhun-15878"="fmazxvhmc0r0m96ms6a234wj139g00iy"; "orkhun.doc-15878"="mgamvmayvdi43vxfqmxgbgzfahpn3d2l"; +"oswald-57253"="rajfni01q60wwf2vjvahqhndykkjx8cj"; +"oswald.doc-57253"="qxvy0gzc4nz345qvg2k8441lh86jqc1g"; "overlock-56079"="ml25rmi7bi6q1yag7sj91zjmq49rmznd"; "overlock.doc-56079"="vcm3nk33hlydpv1yaz2gw9038mk6gbcz"; "pacioli-24947"="ka7a174yd3q3mymkbfyqbi7hhzpbhgvv"; @@ -1407,6 +1417,9 @@ "plex.doc-54512"="yf6z2wd095cln6lcg885b8qx6grnkr1z"; "plex-otf-0.07a"="2k3j1snsf3d414k4pjq56d9b1vn2vh1x"; "plex-otf.doc-0.07a"="z6clw20q3nfwzn087f3c3ifc4g2yr4kp"; +"plimsoll-1"="di983hrdafxqnqf406bgrph743kslqmk"; +"plimsoll.doc-1"="9rz48f3k6b03lvd585g8g50vn6f8xz1p"; +"plimsoll.source-1"="11ypgr9wnihsggwp3jrwr93yf93hjfvj"; "poiretone-56070"="isnd3cmsm0ps7dh40sjqiwa9vrpc1d19"; "poiretone.doc-56070"="k2g9vk6snvf66n1g6x2d4hd2d1z6cghm"; "poltawski-1.101"="ipqjw12syp38hj1pw4b9g03kx07l40vn"; @@ -1447,8 +1460,8 @@ "sauterfonts-15878"="kciqmij0w173na214ix5yhngc18likch"; "sauterfonts.doc-15878"="x2lc53r2wnwrjfainmngafdsg39zyf48"; "sauterfonts.source-15878"="kfi5301zd7pwmnr1fhqc6kfni0nr5d4m"; -"scholax-1.026"="ydajpfgivxbqvvrgx1y3816ghydi4kas"; -"scholax.doc-1.026"="lqf9lmig6dl0iddhn5q21njmyfkcqqva"; +"scholax-1.029"="ybzp2iq193fhc9y76aqrfrp101gigwz6"; +"scholax.doc-1.029"="jss5hdfcrl9bsdys9l0xmnks2lfs4vz1"; "schulschriften-4"="3g5c3l5mnpp3a6472ayj0iykriini807"; "schulschriften.doc-4"="ad6v7vnksqfglwb18via23p45xm2hr81"; "semaphor-18651"="rb37ln7zq51ck9k6g0wj1cx1q02x2i35"; @@ -1463,17 +1476,19 @@ "sourcesanspro.doc-2.8"="iyk2jh81qg0bq9j0zi8g35mypd0zcll7"; "sourceserifpro-1.4"="zxfp95p1ah6yv6n7p0bdsvnmrpm42kjl"; "sourceserifpro.doc-1.4"="qg32lg4s8ba732ac5z3gzc6i7iy0mdls"; -"spectral-56153"="wpy09gk4zc3amy45b8pnk7dx4yi0qx6r"; -"spectral.doc-56153"="ws7xnmisdi6ppagbsmqicn4384hz9fm1"; +"spectral-57296"="s16pqm20px7mjdqdvgq2ikifrbimcm83"; +"spectral.doc-57296"="zayb8fwvv08a4wbvvk5z3jmp0x6pb8sw"; "starfont-1.2"="phdad9yy6nvcxi7ym1chdvz0vvb309ag"; "starfont.doc-1.2"="96h183mv5rmxmnkgy6766519cz5nff6g"; "staves-15878"="9vcnfl7q4czfhyl3zxadig3nzdxg900r"; "staves.doc-15878"="rn25a0syl0d0n89jp09906y30679mr7v"; "staves.source-15878"="2vby0srv43ikzb1br9wgnsyxmgqpfrv3"; -"step-2.0.3"="v0amk44nny3vi305zpbwl0w16sfcafr6"; -"step.doc-2.0.3"="ahh0r2mdrkavizsw1wqb2npfy6vfjrf3"; -"stickstoo-1.033"="k0kj2930hby7wkrxlal4wr7ajagm9lnd"; -"stickstoo.doc-1.033"="mn4pm8hwyl39h1v7xkvhd8dghkbnwlk3"; +"step-2.0.5"="nr1cw7y05s41v9ndh46l6yi7g9j9ich4"; +"step.doc-2.0.5"="ym39n0yndkc213b0mckbwbvp9nwm8qk8"; +"stepgreek-3.0b1"="w7245whipp7l165zrl18q578bi9rmvc2"; +"stepgreek.doc-3.0b1"="h631y9sxkkq9wwj28z3cpk0h8307ksp8"; +"stickstoo-1.034"="1s3rabdgy9m5brnp0ldpinhsr7d1v6ay"; +"stickstoo.doc-1.034"="2ca34j220kgnmx9nmnvrm6wravidazhw"; "stix-1.1.3"="sxfvkk30xb94rfby1kli4xny57xsbqv8"; "stix.doc-1.1.3"="xa4z5gssrb74xsdc392ni8rww37c2phd"; "stix.source-1.1.3"="m4csxq0wlzy246f1kgbd4n0sfgrcbnri"; @@ -1535,8 +1550,8 @@ "venturisadf.source-1.005"="6yz4vcq9mzzm52ca19kcvgj8fg7js28g"; "wsuipa-25469"="h05k2wwr89dak3ifgvjgjw0zyvlkyyjz"; "wsuipa.doc-25469"="nrlpxbqgccmccncqa3xx8l3zlbalkcvm"; -"xcharter-1.209"="j907j2f8vvmvh70qfp5zxpyyrh2mj4c8"; -"xcharter.doc-1.209"="xbqd9g70wmzxv23i9nsg6fc3prfz5xmb"; +"xcharter-1.213"="azidj7m4wwhj42n8sgfnjzyj3pajvqmr"; +"xcharter.doc-1.213"="7y5ybmnv996qj3s5lz459acfkgc5d5gn"; "xits-1.302"="p0s2ycdklzp3nwp8ix7zfq30hp2wfgwj"; "xits.doc-1.302"="avh0lr47xhdnfqpcxbjxlcp9q7q1mi59"; "yfonts-1.4"="i2aacxlhsnkbgfb9i8p0sdwb57qv6gb6"; @@ -1604,6 +1619,9 @@ "accfonts.doc-0.25"="5v97adjwkwxpy4dgw6qiankxfrlz67ab"; "afm2pl-54074"="vpay128xrpp8jkhyz6kjah0r4vgm2d4y"; "afm2pl.doc-54074"="4kms0bi8801giwdiyk5d0l7q0rdsvqi0"; +"albatross-0.2.0"="ypcdh3bdsgviksrqsv80y01l5lxshx3f"; +"albatross.doc-0.2.0"="v5cqy86r1nn088v9r1aa0d5hzv6kbyrm"; +"albatross.source-0.2.0"="a7jydvbzzp2z1xsm9xf48k3dgwsd4s2v"; "dosepsbin-1.2"="f00pl9rcgapb03h76g4578za2p0awqh9"; "dosepsbin.doc-1.2"="41pqpdppqi9658cacc0zhg72cp1pa00x"; "dosepsbin.source-1.2"="0g1nbmyry93ikcgqhcyg48agnabnzpsk"; @@ -1616,8 +1634,8 @@ "fontware.doc-56291"="d76vkfmsnnxyn5pzp37k35mkril4f26f"; "lcdftypetools.doc-52851"="c6agyhm6yaqg7gfnahfy124cdkln32cl"; "metatype1.source-0.56"="infq9kahz9ljr5kk338xbww0g4ifg8cq"; -"mf2pt1-2.5a"="d57jv2y04fsln3q3znw2qi16j7dfq3ap"; -"mf2pt1.doc-2.5a"="gc2i9fp30877ycz5l3wgphwlg9kpfqp7"; +"mf2pt1-2.6"="c0pp9hwb6xn5ka9is576ml3cy7dkliff"; +"mf2pt1.doc-2.6"="ml4dcrc2qy0d6wkdqf0gg60719hcm3a1"; "ps2eps-1.68"="ja294cdv9aagllqxjbckv50b13swxlvj"; "ps2eps.doc-1.68"="00q5228fgcsw6rbadprynz6zdjc6y2j6"; "ps2pk.doc-52851"="k23d42q6071yrh1jnzxdw7yx19nbk5ac"; @@ -1639,7 +1657,7 @@ "eplain-3.11"="qn75j5ylrpq7n758wgspr9bgisd8bnlz"; "eplain.doc-3.11"="81yx3sj0nzw7l8q0xxf2cyqkvipfcg9m"; "eplain.source-3.11"="fn1f737csi8474xf9dis8azwbh3478sq"; -"jadetex-3.13"="79dd0y9m791m62b48pnkyw4352271a6d"; +"jadetex-3.13"="nzij63zrphdvv457fn1b7yl1cghrig5d"; "jadetex.doc-3.13"="ix7992xnb7xb1789n6d48dv98imfc4m2"; "jadetex.source-3.13"="3716mhagkrr60rjj9whznfh3v5qwvyv9"; "cyrillic-47350"="zax5fp5a3p2zd3bhbpng70sydjxm9i1p"; @@ -1678,9 +1696,9 @@ "chess-problem-diagrams-1.15"="yiqgdwhfqypmf5i21s0r48614jzl16gi"; "chess-problem-diagrams.doc-1.15"="aw911cwfw6nix4s2597w1nxa5sb7gf1j"; "chess-problem-diagrams.source-1.15"="4jflmd6p2dxlh63dmc4d96c0qga3hcgk"; -"chessboard-1.8"="mpdarc678ndb3qhx72fbkfr5di3mp05f"; -"chessboard.doc-1.8"="9s4g0f3q9dbv521rqxgwf6v4sk9l1mrl"; -"chessboard.source-1.8"="hkh4fq04v2zmw4fwjnkcswhiq46pn3wh"; +"chessboard-1.9"="366wmw6jypbcg0dd3p6blwf1rzja917a"; +"chessboard.doc-1.9"="khnp39nrlnmca5sdy0q2n7f1gr0f3wpj"; +"chessboard.source-1.9"="9hi3xxi5iablrhcpkrc7gwa0axwmbipc"; "chessfss-1.2a"="is60vi3pamq0qzj8pw0jvj4prvgbzxp2"; "chessfss.doc-1.2a"="1ia29r7y1ja9d5hx7z17bk0qw7lgz2mf"; "chessfss.source-1.2a"="r4dzyg9nx44ajf01kbj0qyfg2r4dawc5"; @@ -1731,6 +1749,9 @@ "pas-crosswords.doc-1.03"="pm76nswngl127k5c2vwm9nwscci1dcng"; "psgo-0.17"="487m1ggdz7a554viflmp4cg2kgdw9ghv"; "psgo.doc-0.17"="cw2v9zzpbmqqw8k8hdq0la2dhdggip3d"; +"realtranspose-1.1"="pkzqw0yhk215ddxwj6sjdss531vxdi0p"; +"realtranspose.doc-1.1"="cwxhdxg5gc939jifir67vin798qrcvb9"; +"realtranspose.source-1.1"="ynbps4pnm2ll3iqkhbqhsflpx0wsydk6"; "reverxii.doc-24976"="2w8l7rs761h556il3d875k0sc86xll98"; "rubik-5.0"="9wi8kxm1rfbqdmgd08bkfmmcrxh6qglv"; "rubik.doc-5.0"="byp3r482d99yvd7wj0gw7sy8azki6srs"; @@ -1861,9 +1882,9 @@ "qobitree.doc-15878"="xi15qg62q42sgh4115gp2mcnv7nriwiz"; "qtree-3.1b"="d2wip0zniiihfnm77v0rzd95f4zvf9dp"; "qtree.doc-3.1b"="pzpwi4bdw8sxhmyyx16g59nmi0zj8ijg"; -"reledmac-2.34.5"="n2883406m95bb5dlyxzmqwiz2hdngkh8"; -"reledmac.doc-2.34.5"="jlnsmw14cyn89s2vslvcnqvs1qj05hnj"; -"reledmac.source-2.34.5"="55wa89r0dz9n9k992ffjv9010xslwmvl"; +"reledmac-2.35.1"="5whll2znxwkk1j7xhgi0ir7ki01aqmsm"; +"reledmac.doc-2.35.1"="q4q0bna50w15yg65s0icf33l3b40yqg0"; +"reledmac.source-2.35.1"="ack7d2gwfnsz8rl36z91k6xqplnnr0s5"; "rrgtrees-1.1"="gijgmkpg84730ywfcangcf301kff14n5"; "rrgtrees.doc-1.1"="l557gafpfn0vm4ajcaynvqf14axn1rrq"; "rrgtrees.source-1.1"="al765qzv8rz1gd9dw672j29q1i27gf2y"; @@ -1930,8 +1951,8 @@ "na-box.doc-1.0"="7s4wcsg6khlv2lgakqgph9livd38fil9"; "persian-bib-0.9"="sakc18mdqnzymfvgkwsxvrjd9b5a7dqm"; "persian-bib.doc-0.9"="q8vjf93qjdkm6qz099464mwdl4w4gjqi"; -"quran-1.7a"="p0vapx04q4a6lfpc8bw0hzblm21z66jf"; -"quran.doc-1.7a"="c376j0bvpwzx9ww14vjhyk8jcaq4sp2j"; +"quran-1.8"="7wwrcn6x678y2xiqn4mf0mfzy496myav"; +"quran.doc-1.8"="dn3d31xax2lfciwb19jwg2pmwawasvsp"; "sexam-1"="jlh6d5mzxqbnkn6yy963fnhc6rmggigl"; "sexam.doc-1"="532l18ix2czx5r80ar4g7mqgdij4r5xx"; "simurgh-0.01b"="n8bv87n12x5xv3h41487vyqpbigv3qkc"; @@ -1974,9 +1995,9 @@ "uhc.doc-16791"="hp3z13z2yxkrgr7z3qa8pyf4d98rd37z"; "wadalab-42428"="cpc689ywzaqil8xz78nkzwx30qmqixh5"; "wadalab.doc-42428"="9gjsw3c2hlxnc1wxvky9mmqi6dyq4i9j"; -"cjk-gs-integrate-20200307.0"="2svsh7dq007rsgn7phbj6mcn4r72x99h"; -"cjk-gs-integrate.doc-20200307.0"="pm40f0bk29kasbz433m9w524yfww38k9"; -"cjk-gs-integrate.source-20200307.0"="scgfp18nqkcghsvw99khhw5x11zv693p"; +"cjk-gs-integrate-20201206.0"="0llgl1xwswii91q704aj23r13xqfdcbf"; +"cjk-gs-integrate.doc-20201206.0"="8z9x8jgv4zw2nvb4v1k3k5cyl0xc337h"; +"cjk-gs-integrate.source-20201206.0"="scgfp18nqkcghsvw99khhw5x11zv693p"; "cjkpunct-4.8.4"="8hwj54qw1xrvs5bn8bncdynich00d0ss"; "cjkpunct.doc-4.8.4"="c8wmkh6h45an46jqph2s9ljbgfyw1mf9"; "cjkpunct.source-4.8.4"="0qfm89f4l8jfmgimhrh8vvskca0d866k"; @@ -1994,16 +2015,19 @@ "xcjk2uni.source-1.0"="r4rlcadgrylpzdds14c0nf5y94yclhm8"; "zxjafont-1.2"="jpj2xg53gz5k86p1aqc0czgbi2pp8yab"; "zxjafont.doc-1.2"="8z7k507pgb7g4998rw2l53a1kydmp3xk"; -"ctex-2.5.4"="q7k71rliafarfsqysqcrilrby1cb3cfh"; -"ctex.doc-2.5.4"="8g06xsy7c8plsisp6lq1047xvgbwfz0v"; -"ctex.source-2.5.4"="z4hp28044xxybzdwag1jd0cv72scniy6"; -"beamer-3.59"="lz6nmign8qqwnlz7408bxvrm3l257l2v"; -"beamer.doc-3.59"="lx1k8s5ci3y0jzil3mrakpm06w4jqv5f"; -"pgf-3.1.6a"="nn2layzf2wyaj757rjcsbmz8y0f93ixy"; -"pgf.doc-3.1.6a"="id9zxi14x9mncld4yjb4pk0vspx0lmkz"; -"pgf.source-3.1.6a"="axqhmadpaw4srzqcj65lg69dxjr0m45y"; +"ctex-2.5.5"="l9fx68lwzrp9lwkzfq1sx0hxmmfgv3xj"; +"ctex.doc-2.5.5"="qq0y6lfa67z9nmiv6bbmc64rvi16z58s"; +"ctex.source-2.5.5"="z79vc82r08k6w6j71fyb26pckjx1x3fc"; +"beamer-3.60"="pjkxpl3nzmjqr08n8wdzkw8v7kysixq5"; +"beamer.doc-3.60"="i94jbccs916w9kyzn1sai2sa2jam0xxl"; +"pgf-3.1.8b"="hs9cw6pfxzc0cb77fyn1gs94l92jbs3l"; +"pgf.doc-3.1.8b"="is2s49v1mshmpwplajvx27mg9pz1z2gp"; +"pgf.source-3.1.8b"="axqhmadpaw4srzqcj65lg69dxjr0m45y"; "fp-2.1d"="lxyxf8jkbgrkk43qbnr2s3ns19ihgmw5"; "fp.doc-2.1d"="ih2kq6xp1nd5gs9bc9vhd34qa7jcj093"; +"ms-57002"="qp98aj0g84a9py4vn8kcg0wwndfvg7k4"; +"ms.doc-57002"="lvc0364h2bh150sjal8xyfn1hbf4xmcs"; +"ms.source-57002"="2vd4h991lmmcj3wwiqn6z5znp44vzd9l"; "xcolor-2.12"="d4hv07lqr1p36mkph8s45w93ykk2i0jg"; "xcolor.doc-2.12"="50k9wrkrb7gaf8dhpq4gbsbyfpbm6dz6"; "xcolor.source-2.12"="zgpsq8x4n6m23a9d1m5m06davpxv76id"; @@ -2022,45 +2046,45 @@ "euenc.source-0.1h"="amsw2lpbcm2grnfch6cag6hyn957acv6"; "xunicode-0.981"="ybvkdgz4sdl4nixzgz2rbmqfz7hwajv4"; "xunicode.doc-0.981"="lydvg50dcpp0lk3m9niwdyf1vra61mgf"; -"luatexja-20201005.0"="9cl7mm9sbrk1xnaa2a03l9r8ygvf1549"; -"luatexja.doc-20201005.0"="wiprs1hdgzj3579r8p7aq4si961cn173"; -"luatexja.source-20201005.0"="0vyyl2rlhkdagrqjck43r289p5xa79ch"; +"luatexja-20210103.0"="krxpdw5n4izk37kaj4f0ymi5afhdygxl"; +"luatexja.doc-20210103.0"="y0r7fmq0vi1fj2bvmzdh56gvrrqcdhjb"; +"luatexja.source-20210103.0"="yp79bqa3qy5zfzl6hzkk2mlyyk6brqh9"; "luatexbase-1.3"="hjzprkfxz8i905ffdzfad0myg2ym4vg4"; "luatexbase.doc-1.3"="3rnbzrql8m9ss0pk1yydy4v9acrk3qq0"; "luatexbase.source-1.3"="v5x5csbgplvah43m8lbjky2nmfk2s3fp"; "ctablestack-1.0"="cavlzn944q3fhha3i4kf8bgvm2y5zpdh"; "ctablestack.doc-1.0"="g2d4fq9nl422i3i0skmlrydx6d3ks8cq"; "ctablestack.source-1.0"="bqrksg21vxxki14v7sadnh35070f2vdy"; -"platex-tools-56451"="aiqfyvkvgz2186fsj25ljymbmsm8l927"; -"platex-tools.doc-56451"="ixzwk3gvdxalgnxagpy72sgqcgv1fj6a"; +"platex-tools-56661"="0gsz51576bqpza0ing7h13k9y55dwmk9"; +"platex-tools.doc-56661"="7wa681sw52rqjp8cg72vmcbhnw2g50jv"; "svn-prov-3.1862"="d5py1m0kjdzdx371fpvi66l80p92xp4i"; "svn-prov.doc-3.1862"="kz3zma1cmbi2kxvn560vzl71n0pj5bvj"; "svn-prov.source-3.1862"="xz3g6ljh9fk8vfla8c3asbzraqymnca4"; -"uplatex-56548"="xmk1pk5ck677acr534phb917ndhfxrwm"; -"uplatex.doc-56548"="b792jqspgq9p44n7ng8dprawfsp45k6f"; -"uplatex.source-56548"="jafq9dy7s19lhnzlbf13qrkdqdvcbjxs"; -"latex-base-dev-2020-10-01_pre-release_9"="n52sw89jrawgrqxxjbnz6sgc63b7cjmx"; -"latex-base-dev.doc-2020-10-01_pre-release_9"="yw2iwkhk0dmvbc1h2sa6hr29wq159vgf"; -"latex-base-dev.source-2020-10-01_pre-release_9"="indvnllsmg4l4j39dw5dv2qgvzv7p34l"; -"platex-56582"="3k5p6bl7x1p919w2iw4pvc8vhnfdnpd5"; -"platex.doc-56582"="4lmb5dsxwnhsg4dzqbsng0ka6da25dyx"; -"platex.source-56582"="iy5qsmlpfc0gyiyrrgbv3jvrd3sq98rx"; +"uplatex-57186"="xmk1pk5ck677acr534phb917ndhfxrwm"; +"uplatex.doc-57186"="b792jqspgq9p44n7ng8dprawfsp45k6f"; +"uplatex.source-57186"="jafq9dy7s19lhnzlbf13qrkdqdvcbjxs"; +"latex-base-dev-2021-05-01_pre-release_0"="ipbkxg31ix8l50ziipmbbggxkizhz6d4"; +"latex-base-dev.doc-2021-05-01_pre-release_0"="a9cyw1f79d7lb6vf974a5glz6kx5hhim"; +"latex-base-dev.source-2021-05-01_pre-release_0"="b3navw8q9x1rps0vq7ymsr7lg1bamb02"; +"platex-57186"="3k5p6bl7x1p919w2iw4pvc8vhnfdnpd5"; +"platex.doc-57186"="4lmb5dsxwnhsg4dzqbsng0ka6da25dyx"; +"platex.source-57186"="iy5qsmlpfc0gyiyrrgbv3jvrd3sq98rx"; "ptex.doc-55920"="8bbl9cw3gzqnv1a1h6al43qkj4c7hkp5"; "ptex-base-56487"="25h63rcankqnc0phq3sr0dkxd57ws9vk"; "ptex-base.doc-56487"="y0mqw72x8di4z9k0z9mnznw3sqyr34rs"; "ptex-fonts-46940"="iqch8gk4nianpr01y03nl0zwp49bw1b4"; "ptex-fonts.doc-46940"="ln071z7k84vqpdf72ngcn7s24hpkhazc"; "uptex.doc-56291"="x7582i32ib2gr2fnkl1dwmaljyqj51b6"; -"uptex-base-56489"="ailz7gb71drgy7glh81731lnydbpkmwc"; -"uptex-base.doc-56489"="ma00d4qzm6i4lln9zlpq4ik9wvvby34v"; +"uptex-base-56832"="ailz7gb71drgy7glh81731lnydbpkmwc"; +"uptex-base.doc-56832"="dsfdb6gnflgz1bdqv4dfm914scr7gxpk"; "uptex-fonts-54045"="dlh3qw9bz67kldx14fqd7f9fb9gcgcah"; "uptex-fonts.doc-54045"="fx7gncl6m75n5pi7y00qprwmvgp978n4"; -"xecjk-3.8.5"="9sy0bgygmm3m3zwn1510hbbkr7ywmji3"; -"xecjk.doc-3.8.5"="925s4lmksm59mnkrr49i6dvyqr8pzlwx"; -"xecjk.source-3.8.5"="jqx668zfxbryiv8vli98gq4bvvb3q8hl"; -"xpinyin-2.8"="jx2f7l8zlwbpbaa8zzwpnj2ka5ipfbfa"; -"xpinyin.doc-2.8"="9r26g7z5dyfcm0jfds6yb5hrrrr324vr"; -"xpinyin.source-2.8"="7gbn6jslq8xgqrzpjrhsjna8my10vwah"; +"xecjk-3.8.6"="3jp1b8rf5ncm0wm7gcwh9n1ccnncyyws"; +"xecjk.doc-3.8.6"="q82p0svfc3m40rg63frhijslapvch7zs"; +"xecjk.source-3.8.6"="h75n0pid7fhjhwl589nzhljya2wck3zn"; +"xpinyin-2.9"="1m2kq41z483px431dxn4w33kjqm50hcc"; +"xpinyin.doc-2.9"="dal70z1n0yv7j7k62rdzyj26ijnfsngj"; +"xpinyin.source-2.9"="13njiqkx26j9q98hcz4aklsr3wwlzj6l"; "zhmetrics-r206"="2li2anrf74242blfd59cxfyn13iwmfxs"; "zhmetrics.doc-r206"="njh801caaxkfyw5nsfv3q36gkcql14pj"; "zhmetrics.source-r206"="ls3gazkf44sdal0f0k8n46ml2fgigfsm"; @@ -2075,7 +2099,7 @@ "fduthesis.source-0.7e"="40fiw5f3xjz72rmls35aqwyvy58v5q1m"; "hyphen-chinese-54568"="pz0lws81lfznlprq5rc77whxx61qcw20"; "impatient-cn.doc-2020"="8k1gcnqs5gghbarikj17ykh4vgahpqbw"; -"install-latex-guide-zh-cn.doc-2020.10.1"="wcbgjk72iw9i043kr9xj9mb3adhc9ark"; +"install-latex-guide-zh-cn.doc-2020.12.1"="dl5mxpibmz8v9avcqrx77aq5ryswcj5a"; "latex-notes-zh-cn.doc-1.20"="qx777fwi8k06qvknnll3crc1j0yvraxs"; "lshort-chinese.doc-6.02"="67pcgs0daq1ns0kpk1bml43d5zsgwbl1"; "nanicolle-2.03y"="5rvjbz93d55qcywbg7dkh231bsc82xzq"; @@ -2106,18 +2130,18 @@ "babel-bulgarian-1.2g"="4c5cdn8lijfw1qhkfz69pvlvl2hcg5hz"; "babel-bulgarian.doc-1.2g"="pyikwcg47yj8nh416g6wdzwk7a7f460p"; "babel-bulgarian.source-1.2g"="km3vz4iykb1pckz9bgllgd6xxc77k2c9"; -"babel-russian-1.3k"="2rlfypayd115mvqmim0bh36njf5ihdfj"; -"babel-russian.doc-1.3k"="1i3m4iiwwkzzpdiwqn6s6n7l7cfrlwwa"; -"babel-russian.source-1.3k"="2sz18i1sfqaczkcy10b3hygrpfc8s8ky"; +"babel-russian-1.3l"="m59pjnrkqkr25c3qiglh8n38vbqhiz57"; +"babel-russian.doc-1.3l"="vbldwnf7n2x3f6lv125qdi4vabrj0sa6"; +"babel-russian.source-1.3l"="3xv3nrj81pw3j871b9q7ap4adz1i721j"; "babel-serbian-2.0a"="qz0klmzp380x2sn97v6ca1hjpir9fxmk"; "babel-serbian.doc-2.0a"="5s29smlmhqrx68ra2k6mqvw5lffclbb7"; "babel-serbian.source-2.0a"="6gp84lpbncbd2775nfac1zg86034a7i9"; "babel-serbianc-3.0a"="rxrc15zajz0g5gzczw5k7kid3g3fisxm"; "babel-serbianc.doc-3.0a"="bid4np071hjbaplxq8pvxggwifky0y8d"; "babel-serbianc.source-3.0a"="wa836abk9b2z4r5zxfzyj6z3d6wzfvjm"; -"babel-ukrainian-1.4c"="zkrzqv0a32c8dm30bin1axbkd1i7fxlm"; -"babel-ukrainian.doc-1.4c"="vj7acrkzm3cdby2aczcancag1y6swvl0"; -"babel-ukrainian.source-1.4c"="yh5qaricqrn5lmvrz9vdycbr5y2lpmr2"; +"babel-ukrainian-1.4e"="v4xihfkgfn5dr5lncrk0rrchwviakhjr"; +"babel-ukrainian.doc-1.4e"="gdyd3xlx328rpb68mcdvhbdvk9xfv6x1"; +"babel-ukrainian.source-1.4e"="5ir7vrg6inyzrph1za72cdlqml2c0nrs"; "churchslavonic-0.2.1"="5pgxy858w0nr769mn4g6832fc0687vfp"; "churchslavonic.doc-0.2.1"="pz4wqhar8vfzyy8aw4szas78hqs018lw"; "hyphen-churchslavonic-54568"="b4sqbmrs146m82i36hnlcpls09zl62hj"; @@ -2132,9 +2156,9 @@ "eskd.source-15878"="q70i7jl8dkf9vakj558fgwqfbn8230q0"; "eskdx-0.98"="b2dx9jv2rg97hmlf3gx4h4l3ci16chr2"; "eskdx.doc-0.98"="l1r5bapnlsz61yasg9gyrzp6za8iw0nf"; -"gost-1.2i"="i4ymhad9kyybwc4072yhc204pr9hfw3p"; -"gost.doc-1.2i"="vwsvpn0p9d4888107r2qj7rghl3l50xg"; -"gost.source-1.2i"="fawqr3q9mk5ki6qgqzv3xa4kz5ak2srq"; +"gost-1.2k"="8gc0lvpx68j3x12gz8p40m651g0f58a4"; +"gost.doc-1.2k"="wx6w4c5p6fr3z558s5pkhx764zhz4cj0"; +"gost.source-1.2k"="s4prj09pk5lrvm8nbdl9mqxnnmdi2b5r"; "hyphen-belarusian-54568"="58rbwvqvgbds46sg908xk8hriiw9ifzw"; "hyphen-bulgarian-54568"="nc2iqf07jr477nryla9xn5sgxdb21rd5"; "hyphen-mongolian-54568"="rl6ypg7gdsrlj4j4i3qb05mjfmljykxn"; @@ -2199,10 +2223,10 @@ "cs-41553"="ks76xw08rrkrcxg7rv72w18glx2vncfk"; "csbulletin-54433"="yc0z0nyy6mmlwrn711j3gkpm5afa6ljx"; "csbulletin.doc-54433"="andx6r2719a1pfg044bclvha66vrcc1z"; -"cslatex-56548"="4gf3lz23hvrqgqbvpnq2wc3bwrb2jdkh"; -"cslatex.doc-56548"="sjrbpvzpncq8xk13nz9n31wqz8fir6xw"; -"cslatex.source-56548"="fmrx0y2xnxcdczhbqyrh7w70wh7mrccq"; -"csplain-54699"="zcqw5855kibhsivq0vvhpyl0qjrq9yh5"; +"cslatex-57318"="4gf3lz23hvrqgqbvpnq2wc3bwrb2jdkh"; +"cslatex.doc-57318"="sjrbpvzpncq8xk13nz9n31wqz8fir6xw"; +"cslatex.source-57318"="fmrx0y2xnxcdczhbqyrh7w70wh7mrccq"; +"csplain-57318"="zcqw5855kibhsivq0vvhpyl0qjrq9yh5"; "luatex85-1.4"="ka3px4aiyi8gq487i085s31y9l95jzp1"; "luatex85.doc-1.4"="ac2agmy9dkavln2vnd63fmavv7xnkdrw"; "luatex85.source-1.4"="wpm4dw7j6fikz3dqa4zk3r5avg4isxr8"; @@ -2215,6 +2239,7 @@ "vlna.doc-54074"="f3wz8jy4vbrb3bhk9ly7fdkipwfqixbc"; "MemoirChapStyles.doc-1.7e"="r54d4g3nh30k5x99nfphvzg7k1jxrijn"; "Type1fonts.doc-2.14"="jgjs1127jqdrrgnkv3r8p1wirc8lb2gl"; +"amiweb2c-guide.doc-1.0"="w9jm6mjivcml5swz9v14jrc7amyzkw3p"; "amscls-doc.doc-46110"="4hsr68pmd3v06fnxiynmp4xpgik6v8g2"; "amslatex-primer.doc-2.3"="9d9pxr0jbjm6zwqd51f7m2bzysdq5gv7"; "around-the-bend.doc-15878"="a6jilpw0nw27vlj1shnhxfv92yn86ys2"; @@ -2223,7 +2248,7 @@ "components-of-TeX.doc-15878"="7sc5ryfj785jifvw9b44yni2ifmssr7f"; "comprehensive.doc-13.0"="c4y3bgj3r97vy17qbdakmdcmcvm7xbqw"; "dickimaw.doc-32925"="jqva0skw6ivc4ikc8m7awd7pgfaxgci7"; -"docsurvey.doc-48931"="0lml7hvr42zsfk14da493xsl24z3i8vx"; +"docsurvey.doc-57298"="46k4jz2gw4w0nv9vd77n3342kwk43ns6"; "dtxtut.doc-2.1"="108k3lyvja5wmg8gxyvqskbz8wwh0cyw"; "first-latex-doc.doc-15878"="8vcday36pq5hlr075kjk6hb82ypazjd9"; "forest-quickstart.doc-55688"="g08gcf8sk0kkn6jifvx355slh3lvbr6l"; @@ -2238,12 +2263,12 @@ "l2tabu-english.doc-1.8.5.7"="j7m684bvmpv1jaa6s856dj9aknrwlqiq"; "latex-brochure.doc-40612"="azp69yf9xkksqan9n096wabgxlk9hgsn"; "latex-course.doc-2"="km59hhadaad0hlpa07rqmx91036h123r"; -"latex-doc-ptr.doc-15878"="1dsc8ym34nlj315aln3npfibx37n9c3z"; +"latex-doc-ptr.doc-57311"="2ckpyrc8nls1jxlpnpg4g9rnw91djc2y"; "latex-graphics-companion.doc-29235"="70mixdsyyx6jf6dc46qp5kgyx9qwkma2"; "latex-refsheet.doc-1.2"="9gvmiiqg78xn8348cymz3wfzi45mf8xz"; "latex-veryshortguide.doc-0.7"="dv3ikj9drgivpsapvl9jpkbww3h839ya"; "latex-web-companion.doc-29349"="wzj6qw8bhwr82ipsph640ya62mpj6k3r"; -"latex2e-help-texinfo.doc-56291"="jmg3aygadzdj3jvdsd26rvg9ipjbwq7d"; +"latex2e-help-texinfo.doc-57213"="jmg3aygadzdj3jvdsd26rvg9ipjbwq7d"; "latex4wp.doc-1.0.10"="bxffry3cy7vkcjhdm5yzn4hipma74jdp"; "latexcheat.doc-1.13"="iav6gzdcadndwli0jar6d7i1711ssq41"; "latexcourse-rug.doc-1.1"="fxz46xn5hazqy707qrf2mkgk121m6ywv"; @@ -2263,6 +2288,7 @@ "plain-doc.doc-28424"="5bqxdfbl4fvgvw42033vg9w3kjn7pn49"; "short-math-guide.doc-2.0"="34mdd47c63946iz86c2r0g2jx11q4mhc"; "simplified-latex.doc-20620"="mmxjkyv4x0am911mkxmjs1l5ql5z19h9"; +"startlatex2e.doc-56809"="hd5dhdc0klww7vhrn0q0d77lr3frlcw3"; "svg-inkscape.doc-32199"="l8vizn8al3rzgxxamdfqm6hsrh46xm8m"; "tamethebeast.doc-1.4"="14cs89g2l3bn3xhfrhrw9pfdf65c2xcy"; "tds.doc-1.1"="fmmdgblpf26x9ajn16g024sn5sbwwy0s"; @@ -2275,15 +2301,15 @@ "titlepages.doc-19457"="g0fvssp703yk3c2icdb8qgalxikm0xq9"; "tlc2.doc-26096"="k8qb9ak5wx7k4c4j5g5i681di8cc8p5s"; "tlmgrbasics.doc-56221"="cp4cwr8k9sjq58mm67qf23swal2jqaah"; -"undergradmath.doc-42926"="kp1xxp209mbvyhpmh62yp53c6q8ppnwk"; +"undergradmath.doc-57286"="58rd10vaavwf003gq73yk82hlxzmvcva"; "visualfaq.doc-38647"="mdskjr2m6y0ljhczhqmfm50xsv8x4k1m"; "webguide.doc-25813"="xbp0q21rqfq5gmckdfkc671kbr6gj1n8"; "xetexref.doc-56291"="4ljbfwhzmwq71nfgqfkijqa27hsd3y2i"; "armtex-3.0-beta3"="vg6qlgg6nzci26mnphkbcpc8vak9jwbq"; "armtex.doc-3.0-beta3"="fam9bkmfjn2v54v3f2xjxjarbrf3adhz"; -"babel-albanian-1.0c"="1dasgklnjx05y74bk0pcwn1ivghswmvs"; -"babel-albanian.doc-1.0c"="vsgwp4d6skqm7v0i0d0bvb32zpylk7a9"; -"babel-albanian.source-1.0c"="yar9fs7vp71nsjmjp7hppgwpyd16w7xa"; +"babel-albanian-1.0d"="yqrwj8mb7773j1svwl5chhxg15rqskxh"; +"babel-albanian.doc-1.0d"="fpsfzmk847y3c6q5jq42dqz4sfm54yvs"; +"babel-albanian.source-1.0d"="xii1mv9hbv4f7xd1c13rxn53v99bjxnw"; "babel-bosnian-1.1"="l6pdr8hm15swhzxx5ly2rd24jnscsyiz"; "babel-bosnian.doc-1.1"="gahvgi7r3rs553pi00l1q33k3bz59pqa"; "babel-bosnian.source-1.1"="idi2fhr3wfq31pz63d3fi0zkjm58gzxi"; @@ -2296,9 +2322,9 @@ "babel-danish-1.3r"="j5ndb7h4jwgkk2ianlqy45sa8f59djd9"; "babel-danish.doc-1.3r"="9y9h8n6g2rwi004chcm8frm60hv16afi"; "babel-danish.source-1.3r"="slb1z6vbrhf23x471ivngv28mik8n3ir"; -"babel-dutch-3.8i"="5x891i0b2d78xsh61a96cshjncsshmki"; -"babel-dutch.doc-3.8i"="z93rpjg49q22ixnmvv8n4hy1nip4gv5w"; -"babel-dutch.source-3.8i"="3bwgdf7nzmwdrbfwglf6xm5bnf3nxqz2"; +"babel-dutch-3.8j"="4x9m1a08si80i831sgbgjnaa88bfvafp"; +"babel-dutch.doc-3.8j"="l3pigzhgp2jlb9dir38vnbkgkb0ji1xf"; +"babel-dutch.source-3.8j"="cx1l3xndvpvjins8f1rz4z3pqq86rwi9"; "babel-estonian-1.1a"="pn52pj8gprmsqf7f7i97vllrkjjm2bbh"; "babel-estonian.doc-1.1a"="nchqv4ahbhjrh6g49fj8xpjv1ghlqzn9"; "babel-estonian.source-1.1a"="8d3nvwgv9bvhhxsgdicdlf3gsrscaxsi"; @@ -2367,9 +2393,9 @@ "hrlatex-0.23"="7dr0g80mp71nmvrnwahpshawi44s2s9x"; "hrlatex.doc-0.23"="lrx3m4bg9wlqlrcd08mh90wal16fvilg"; "hrlatex.source-0.23"="s5ajy6yi6nzivfwafk5ymav4j2dcgif4"; -"hulipsum-1.0"="8pqz5vilzli6in81d604dnkz9024i5s7"; -"hulipsum.doc-1.0"="3sqiw98n02kg8752hzv7vp1r5xysrw0m"; -"hulipsum.source-1.0"="dv9wyvy9cbkvjlc9awaz0mv4vaanz7jn"; +"hulipsum-1.1"="1glcsnk30qpbxcd522vi4ddnhk3zdqym"; +"hulipsum.doc-1.1"="py5pklwmr7i1w63rhkysxw5s312i22fn"; +"hulipsum.source-1.1"="m7il2x4h4zwivgzxq9zzlc57xdd64m54"; "hyphen-croatian-54568"="wyg3vyklkrhpjhhb98x2v0iigwqf9067"; "hyphen-danish-54568"="w2ixlyv1zwnx2lww20hvrb8ghiwpy35x"; "hyphen-dutch-1.1"="fldx9b6pqwmkj21mry0s2yrfpbgi4mdx"; @@ -2406,6 +2432,8 @@ "nevelok-1.03"="v5hds3a09c91d79iac1qsyf0mr6lpaqg"; "nevelok.doc-1.03"="biq2dbyv6mak992s0cqb834k119xfa0p"; "nevelok.source-1.03"="5c03z6r25gidf0bncaanw1259n1hcdw0"; +"rojud-1.2"="z3b1grijbh986rpa49fncmfwj3lkjmcs"; +"rojud.doc-1.2"="xv1iy0filv53va4r8f99710ahb8cd0h1"; "swebib-15878"="5z0719m62712flc3ylrnp5223gbsk98n"; "swebib.doc-15878"="m23nfcdd5ddlgicd8hzlyfnr042y3bjp"; "turkmen-0.2"="r8ryr694sxginv96wy2ibwg7mjwckmy0"; @@ -2416,14 +2444,14 @@ "annee-scolaire-1.6"="r0kwlnx1bhflkj35dwz9malgjhjhf3fy"; "annee-scolaire.doc-1.6"="3rc70b93ciiw5r7mq5rpfd933ccbvh7p"; "annee-scolaire.source-1.6"="jbl0zrqvrndbvpdn52lm212b95bv9k86"; -"apprendre-a-programmer-en-tex.doc-50933"="ra7bkghkmm4cl88fi1vn3rf9yy1kzya9"; +"apprendre-a-programmer-en-tex.doc-57179"="x4qrlzv0s9prq4hjb20kn0dcff7xmgzv"; "apprends-latex.doc-4.02"="fy3lj0gsk1nkcfp2ssyfm26a7ih2ysf5"; "babel-basque-1.0f"="dasllbbd2k1yhqdwm41i38870lzp9caa"; "babel-basque.doc-1.0f"="av6dd29g89fsq2hgva9fj4h2myj95jxk"; "babel-basque.source-1.0f"="mvvhhqj4jd107zicv0gv8yhgjkjhxl33"; -"babel-french-3.5k"="9k614fpriq278ijb3b0r28i7vxypfj7p"; -"babel-french.doc-3.5k"="9fy21w7bmp2l881qkajds8npza5gxh76"; -"babel-french.source-3.5k"="j0rvcy3jbj9zjqh856sdrw73352x6zsn"; +"babel-french-3.5l"="sl1vn19njwbvy86dsx3xcixvc5kx925r"; +"babel-french.doc-3.5l"="mh277xcfj2lql9dpqfwr5ms75fslk290"; +"babel-french.source-3.5l"="rrgl05jg8dsdn292cz2pwr6mm765ca8g"; "basque-book-1.20"="6gmya3w1jnv20p9zyn3b8b095csb45cj"; "basque-book.doc-1.20"="njw9j7s7mlx35ckjg0z404fizyxpn74n"; "basque-book.source-1.20"="wydda9ij2ibwnhd8b0pg48bf2f1g969f"; @@ -2445,11 +2473,11 @@ "facture-1.2.2"="ys1fq6vkml8gnfc6bjkx2lkbdw2w0fsn"; "facture.doc-1.2.2"="ij99my45fi9m1lcc79rj6kyxggmv4v3r"; "facture.source-1.2.2"="aywgffiyigrwxv9lipf7a131mycjp839"; -"formation-latex-ul.doc-2019.03"="i0f7ij9m4h02vxd21hs3iw7m23qlgjii"; -"formation-latex-ul.source-2019.03"="3g9v9qrcjkd5dms6aa3zdlr7q0sy572b"; -"frenchmath-1.4"="nvxiiich6w76xzsn9a73sg6d9gl79klb"; -"frenchmath.doc-1.4"="h6h3ywj67r11ljpy6passw07jm8v7zp4"; -"frenchmath.source-1.4"="ansrjlrbxv1ph59ngvr3p53bw04j9cnd"; +"formation-latex-ul.doc-2020.10"="lwwcc5rjbnqccskh19scmf6zsy85a4ra"; +"formation-latex-ul.source-2020.10"="hc8lyb7812bzqfaps76jk8fjyfsfbfn0"; +"frenchmath-1.5"="9farb3by3rv5q3i791d52aizc1z9h57q"; +"frenchmath.doc-1.5"="z4y6qbx3nc5rnqizjfk3rwsmzia6cgf5"; +"frenchmath.source-1.5"="sz9288008axr9di9bnrkkjcf9pmzm0pi"; "frletter-15878"="4vqb93fvw2jmyxv1f269f6icnk4wbwpl"; "frletter.doc-15878"="pg2pg5gsjpp0iyzapm6k1m4p95fkbi4h"; "frpseudocode-0.3.0"="d088q642bl3bnaz4lfla7sr73rg916l4"; @@ -2462,7 +2490,7 @@ "impnattypo.doc-1.5"="q72pgsqjgmxrgclh3lziqv83h1r6020j"; "impnattypo.source-1.5"="z4vzzjjhrxpaj91zqhzg6mx52av49qkq"; "l2tabu-french.doc-2.3"="ncl8is1rmnk3n9ybrsav882w5qsb1w2k"; -"latex2e-help-texinfo-fr.doc-56275"="83ly2z3bbhq0p919q2r3j8bdxddrqvi8"; +"latex2e-help-texinfo-fr.doc-57275"="7ifzcfqj7hsdliym14msbjvjimh2r2y5"; "lshort-french.doc-5.01fr-0"="33vkjmz23zk2jrzyw99zri58jm0cpxax"; "mafr-1.0"="vl6jgzlqqyn70cndvj91nnkmcxas15j8"; "mafr.doc-1.0"="v44yahqn2gnnfbnf1ayqr96va6y49aij"; @@ -2494,7 +2522,7 @@ "dhua-0.11"="4n8cvm61marrsbxd7308xw089j0q2wlj"; "dhua.doc-0.11"="kisr6kymm9v5kk9nfxi0ckdf6k8mhr91"; "dhua.source-0.11"="a9ap1rwrqqwh394c6hjqx5nlw070iwp6"; -"dtk-bibliography.doc-DTK_2020-03"="6m4772vgjc32aqxx990d6gzaisicw5rq"; +"dtk-bibliography.doc-2020-04"="vi2vdhrcaax7ia4xlsp4h3fy23qy39ng"; "etdipa.doc-2.6"="cid5wjvbs4hl5lwczp1s1wbdwxfwr24n"; "etoolbox-de.doc-1"="z53x50c71bvipgvgklp42n1yb50fq8gx"; "fifinddo-info.doc-1.1b"="d7l7nsb4aj2b7nin8whkif0m5pcv11py"; @@ -2530,7 +2558,7 @@ "termcal-de-2.0"="pql7q4dqaqgg0arqgg7l8iz4hwxrxd7x"; "termcal-de.doc-2.0"="fpjnpzi59rrqg44j513w4d6f9cqi7ik0"; "termcal-de.source-2.0"="myc9fjxig0z3dirj1brla1q70ryrczrr"; -"texlive-de.doc-54604"="khc0yk2xf0v8dxhzxqavpwbwgc3wfkv1"; +"texlive-de.doc-57223"="a8qip61g838xk2gjs3xj07ankbhmffg8"; "tipa-de.doc-1.3"="aa0msh91ynxxigmbxwy72i05g095fwxg"; "translation-arsclassica-de.doc-23803"="xayn50bvfkyf5fh93426fg2m6mmvpdwc"; "translation-biblatex-de.doc-3.15"="n799gvic99wrrp9wlkzfdh3gm1sa4g32"; @@ -2549,9 +2577,9 @@ "umlaute.doc-2.1"="hkjv5ym6954i5l2qxv3jm3p1prbn55h9"; "umlaute.source-2.1"="p6217bas6hm8kksip8jkb2bhdpa9p91w"; "voss-mathcol.doc-0.1"="f15dshkczyv9r9a6vzps3ls1cz95sk8v"; -"babel-greek-1.9j"="f62w6in6bbp8in23n7d3lfs774wjzk5h"; -"babel-greek.doc-1.9j"="cgfy00f52a9z9zc1v9md5k1znmv6c668"; -"babel-greek.source-1.9j"="r53ppvvjhjk5gkxr0j1j6q8dgv92rn6s"; +"babel-greek-1.10"="17bc657ll0aacq85s967yypmalya2krv"; +"babel-greek.doc-1.10"="3h72jkrqpa3jjw1091gix8rvwgwy78j2"; +"babel-greek.source-1.10"="yhx2b0dnjfy591xj1c2qw24hf7npwqii"; "begingreek-1.5"="7v94fdb2kxzwgvcsjfd5gnqpjhsrgp9i"; "begingreek.doc-1.5"="rgiglmyfkxghz1w9g67lyx28rvk2bwgc"; "begingreek.source-1.5"="jscz6nq9n7aq1l3j86xyvki200ja40p5"; @@ -2561,9 +2589,9 @@ "gfsbaskerville.doc-1.0"="7sx91lqgpn4w4xgbdbpsk41i5mxixqf2"; "gfsporson-1.01"="k6gimiba8zfbnf4wc4zjrmwwc7ggnxkg"; "gfsporson.doc-1.01"="6i47g0k5ys9q394g6q0a3686q4h75gz3"; -"greek-fontenc-1.0"="m529vnxzq00v80700afp400q8d9468ck"; -"greek-fontenc.doc-1.0"="pr8wzpz1v48dkpcd3yhychdqaxi56vln"; -"greek-fontenc.source-1.0"="v8kv28db1b2ay1ybdcl88g1dnfvhk701"; +"greek-fontenc-2.0"="qcxq329yb8malcjbjc39rdylna76qvy8"; +"greek-fontenc.doc-2.0"="884sj5a8wq4vkjhsr9nnqzjjckhg59ah"; +"greek-fontenc.source-2.0"="2sjrw0m2an6m9gyrzx9dy0zj22yxjnlc"; "greek-inputenc-1.7"="4fwqx35kx5yqpbg8hy83pgpm45gm1q6d"; "greek-inputenc.doc-1.7"="1fwpw7k0xwbfgp38dxr9vw4hds93jbhm"; "greekdates-1.0"="zm8cfpsxp12s6n38n7lgzha482124m7v"; @@ -2589,9 +2617,9 @@ "lgreek.doc-21818"="iwa1xfg3sawwblifpgkc3na1r3hld02r"; "mkgrkindex-2.0"="v5hb36lspx6xyzzpm8ryprr7mwwpcrm5"; "mkgrkindex.doc-2.0"="mfpkm8mm8n0nqhzgnm70yjy16lzjvvhd"; -"teubner-4.8"="7h0mh95kwrp8l3im9fq4m4my65hxcwpd"; -"teubner.doc-4.8"="w0ygcfsjgrw6r5z49ciwxfwyxzpf6gfg"; -"teubner.source-4.8"="l0syr53r8jk5cjh3lx8bf279hlgwsps1"; +"teubner-5.0"="8j8svhs1l8v3x0n81yicn2z6xa5szch8"; +"teubner.doc-5.0"="0ybwf79saadw742zw3rb971s67ass35d"; +"teubner.source-5.0"="5cmgbdgnm6912h4fr4pswldwc3d41wyk"; "xgreek-3.0.1"="742vxyljmp433rk26ap2rjqbfd7802ys"; "xgreek.doc-3.0.1"="qdgh9jnqimis40pf5gj383j01ynx4cqb"; "xgreek.source-3.0.1"="33imiba9m0sxmjxilflqzsysgr7vdv1q"; @@ -2625,35 +2653,35 @@ "layaureo-0.2"="7qqhm139n1afxdpsmikzdyn7pn09hv9x"; "layaureo.doc-0.2"="pf22ypfazq7hwxpfiidcvkd24zs1gys3"; "layaureo.source-0.2"="3q0ixl7rw7sz7n2bfd8gyfnglfcq2hcs"; -"lshort-italian.doc-15878"="n79a6mw3xc3ar3adan0l1xpr4xg8wrid"; +"lshort-italian.doc-6.2"="r33gvxp6z6qzn1hfl3zcc0356514clmi"; "psfrag-italian.doc-15878"="xb8qlcz7f0za963yybhjvbyjq37z516f"; "texlive-it.doc-54534"="rjkflhhrms2qhbsakznnxfh3r3kbz5dr"; -"verifica-1.2"="dwgpgq7r4r6s6glysghbd8b2s3gazjmm"; -"verifica.doc-1.2"="73f23nps62hryhdl9q6gndblnc3vvbw9"; -"verifica.source-1.2"="glz0p5kfvk6h83icf4dbvg67pkg6k2xp"; +"verifica-1.3"="dm0n4wlbvx5621ldhj516pvlidqiigkn"; +"verifica.doc-1.3"="2pfdvki7wk8fhah50knvh01yq721yw30"; +"verifica.source-1.3"="n6qmhmpx4f2nhjinfqh1z3h370lx40mj"; "ascmac-2.1"="5fiwx48hj22yr2f0x9q37jgwpvr7ixrm"; "ascmac.doc-2.1"="nmfb4d9b21bsr7nqg5bgprxakj82ryy3"; "ascmac.source-2.1"="9d6l1w7c7g8g88vfxxflrqhvmnf0miad"; -"babel-japanese-2.2"="s8sj89mjl5fxb2cr87qn9ix0fyy7if6m"; -"babel-japanese.doc-2.2"="rxwigd9cjla62cw4sgg3j4wvz9f0q8gr"; -"babel-japanese.source-2.2"="01qb909xr4k1kcjk8dz2dpiqwfx5awdx"; +"babel-japanese-57129"="yx41fa00vvz0wra03q9xx45r3fzlnwcc"; +"babel-japanese.doc-57129"="jkk307ypyhkdz458xnxqv1fvsq3rmk0j"; +"babel-japanese.source-57129"="ls84v5vd8gxyqmklw2np6pdgry88qy70"; "bxbase-1.2"="cmpmcxr25044s63nagvkzb6zv8giyqh7"; "bxbase.doc-1.2"="na2vh2jak4zvmibrpkis6jr21ly00904"; "bxcjkjatype-0.3"="94n8gv2433510cq05vl97zrna0gyya1z"; "bxcjkjatype.doc-0.3"="z6rarps2vgxp061w0q8amki68j51yqlx"; "bxghost-0.3.0"="fmg8agh5563jny9106kxzn6ac0y9ypcc"; "bxghost.doc-0.3.0"="ybrg38lhjrc3jfadkn3h9vacy2zwhycb"; -"bxjaholiday-1.0.0"="w9mdw9zrcrrf988z2vd314bn0dqr4pd0"; -"bxjaholiday.doc-1.0.0"="yq903l1in5hwp20wj9i2kz4qmx3y0aqs"; +"bxjaholiday-1.1.0"="sqraclljhkpsgq4h9zvy3in7g6j85rrg"; +"bxjaholiday.doc-1.1.0"="d3cgw8izvja5vk7xhdy54rflgcs6n3in"; "bxjalipsum-0.3a"="d6svafibkkjc5p3hjzrc8ibb2fwmm05c"; "bxjalipsum.doc-0.3a"="srwc07mapyqn9hq6hy26gxaj6khy9ffh"; "bxjaprnind-0.3b"="8pfq18sbkvqzb2may5j4n8xadgjb8a9l"; "bxjaprnind.doc-0.3b"="1vsxn97w48hn05il79byfms5w6749xpc"; "bxjatoucs-0.2"="hmb6rpwihwgfi7sq1zpf7yw12ibr17kw"; "bxjatoucs.doc-0.2"="4nkg3si0bwryyyh0wpqnvkrmxmbnlin3"; -"bxjscls-2.2c"="z5i40795avjbcb242jijbd970wdjinls"; -"bxjscls.doc-2.2c"="5inv8gi1zpc533bd8jglfq0dvds2b64l"; -"bxjscls.source-2.2c"="1wf8z5pxq8vqfijmwr92n3sj3gajl81l"; +"bxjscls-2.4"="1arzykvy6qlwn3fa886bchvlh9svb6ff"; +"bxjscls.doc-2.4"="jrgaavvyr8y8v34wxvj07by4b353z44s"; +"bxjscls.source-2.4"="wdpk86l4r5id30ryb0f2kmr8jhq3fcg8"; "bxorigcapt-0.3"="lbrfjjqsjm4n5b7byyrhm1akbmxxap6d"; "bxorigcapt.doc-0.3"="grspvjmbrcjq91wgi6l3a73y5l7nnl4m"; "bxwareki-0.6"="rgw2day3m4vr0k6d2mbhrpy8anmzklc1"; @@ -2662,32 +2690,32 @@ "convbkmk.doc-0.30"="nvi9mfw8iiw923v54fdi5pk7r93y7vsc"; "endnotesj-3.0"="p1524a2l6zsh2gl28im4rxzr7afy323b"; "endnotesj.doc-3.0"="ksn1n0s90shsi65kgw4bppanfsbxrq0z"; -"gentombow-56429"="4mwyhhcbhp3hnjzqpkn62kv2sz27lxkb"; -"gentombow.doc-56429"="lv12zrj4xqkf02n68gfi7qad4gwafch6"; -"haranoaji-20200912"="aaa482yajabi905clhabkww2qlsyh1vw"; -"haranoaji.doc-20200912"="hxffn0lkmli3fhkvzncwjyry2agrd4pz"; -"haranoaji-extra-20200912"="0vzf6cqxk6igkbxnx2y37yvfbrjmpmby"; -"haranoaji-extra.doc-20200912"="q1zj08b1qb58bywmb905xnqrg6b8j1bf"; +"gentombow-56665"="9i576fvl59r1gna7w5b76skw7hvbziv8"; +"gentombow.doc-56665"="qn40cv4xa1ah7khfpk4368sxqhr2yjqn"; +"haranoaji-20210102"="amm14qdsyvla06iaf7qrh7c9jbh1zplm"; +"haranoaji.doc-20210102"="v3x5b96qw72c714mslg2rwk4rcbqzj81"; +"haranoaji-extra-20210102"="vw53xxz194dsnwp55can2kplb7qlqdyc"; +"haranoaji-extra.doc-20210102"="xsq16spb4rvdff62n0ip1wbqncnf31h3"; "ifptex-2.0"="vd33lyik4nfippj7dax3k8rbkpacc3c3"; "ifptex.doc-2.0"="ii033xhz4lx24hwzmkqgff5w13q38fny"; "ifxptex-0.2"="db7waqqfn8nrn8b3z4dh7dy846f2zxad"; "ifxptex.doc-0.2"="y1039vpyrh9k2dyi1xws45a1gj3b6dv1"; "ipaex-52032"="pxy5kyyznzddkci3pzdb7fla8gsfsqm5"; "ipaex.doc-52032"="bv4h64z9gnd6jf3mx85b45dqxalicjcl"; -"japanese-otf-1.7b8"="n7pnmaclyp3yb8rfn3n59g6jdy5k349r"; -"japanese-otf.doc-1.7b8"="kszig0vk5dwk708vff5cfnhcfx0rp39d"; -"japanese-otf.source-1.7b8"="dp0djxlqid3irac8y2zfh0x3r31r305d"; -"japanese-otf-uptex-0.25"="8swbn4s13n9g9sm0m8pwm94iq0gl1ziz"; -"japanese-otf-uptex.doc-0.25"="7wqm9qjxawyih9z9qls5ccm5dblq50f6"; -"japanese-otf-uptex.source-0.25"="gmslw4incmf7dlcfvkrmjkmz0wpcblw4"; -"jlreq-56450"="cd9sqg3j5jwwa9k95by1810xc6skwnw8"; -"jlreq.doc-56450"="iq495i7xsbmsja0hwd2h74w242smgz6h"; -"jlreq.source-56450"="qc40ih88g40yaiah4wgcp6rdsvdir4x7"; +"japanese-otf-1.7b8"="paspl3x1vidnyagy2bix3wnqhgwqkd3d"; +"japanese-otf.doc-1.7b8"="b1j34w3286splmlsshl5w59lsj0fccvq"; +"japanese-otf.source-1.7b8"="913dx9d29szxr89bfmc77kcn3k5wj79x"; +"japanese-otf-uptex-0.26"="3ckjzz5j3xbrkggjszwrw8iqrmb5k4cy"; +"japanese-otf-uptex.doc-0.26"="34404k1jv5ibhc08fqvmxncvclfbwy7a"; +"japanese-otf-uptex.source-0.26"="s71xnfr7py2v1f7xrzlwiw2h8ps7pn7a"; +"jlreq-57255"="nvp0x96knq1vpdsn8fnz96a7rm70r2gq"; +"jlreq.doc-57255"="6l3g4f4pnvhy84al3483z547zyzacbkb"; +"jlreq.source-57255"="gcv6xnm2biyhggddgv2hi7hwvzka5rdh"; "jlreq-deluxe-0.3.1"="6k38b15b5gyw3vr0y06hjvfc7d7l1v4f"; "jlreq-deluxe.doc-0.3.1"="wa8zvis2jn58d1b1qx9gp38mq2vzq6as"; -"jsclasses-56551"="66578bq8n52pvag0i3hxk17q7bd0kbh9"; -"jsclasses.doc-56551"="3xjdam2ca9jq1ji6zvzzd65rg167sy8g"; -"jsclasses.source-56551"="rjdyfgikzdw9x6ms2qjv3669mwywhyxc"; +"jsclasses-56608"="bq7m6pjhh3mh3z3mvklgr14wnpixcl21"; +"jsclasses.doc-56608"="jfla9xn8wymcf6m1hf85yqi6l4nmwqwc"; +"jsclasses.source-56608"="skfshlzg14lrx40lhxp5vw21wz5f7m56"; "lshort-japanese.doc-36207"="5b8svqq4w1ipn3737s73pk969s8yv63d"; "mendex-doc.doc-50268"="vp31541i0l4rfkijbng5zj0q4cmbdz19"; "mendex-doc.source-50268"="2w1ibgiylpczrzp9xhl7lidn8y2yhnn6"; @@ -2697,14 +2725,12 @@ "pbibtex-base-40986"="nix33k8m51bymsgnmfz69mwpllkk9rhq"; "pbibtex-base.doc-40986"="vgmw5w68b5y2rhwsjssm3bx4dn96ix7n"; "platexcheat.doc-3.1"="khwx5x4r6aydzhd5rkv7h9lf58l27494"; -"plautopatch-0.9j"="d1x84i98r7r0w4dish75dnrg7snba1la"; -"plautopatch.doc-0.9j"="inab0q6fxcng0z4qkxcfcss6jarxskzp"; -"ptex-fontmaps-20200217.0"="xi0xpizlahvb5ingkq4d4qazkh1lp1k6"; -"ptex-fontmaps.doc-20200217.0"="c2asq6r15z67wy364zsadjxlhznxykyz"; -"ptex-fontmaps.source-20200217.0"="9ihj3bwyp0ngy115ylcc2dbp7xp40xgq"; -"baekmuk-2.2"="5rhc42dabpd99i92hkdmkjzgr3jqhg16"; -"baekmuk.doc-2.2"="4syhh948m1jw14xlhq6dbpdw5p5p198h"; -"ptex-manual.doc-54450"="xq0cigm101rbpk0gywlkc49k710p39q6"; +"plautopatch-0.9m"="ibd9v0019f57bb2d0xz79gl2c5asm5lh"; +"plautopatch.doc-0.9m"="mwfg30ya3jgmfj8vb2sxpj54cl06zdxv"; +"ptex-fontmaps-20201227.0"="vfr2ryj599njmkx4iibb1i6crjcaz1lv"; +"ptex-fontmaps.doc-20201227.0"="ir2hb9xa03wfn6kl06rml0xv9066x2ac"; +"ptex-fontmaps.source-20201227.0"="9ihj3bwyp0ngy115ylcc2dbp7xp40xgq"; +"ptex-manual.doc-57128"="yqn4cbbrdi468hj4s7bl5wycnzcgds1d"; "ptex2pdf-20200520.0"="n51vdwpxcdyb0w3bxi3d9i2b6gh8j3ij"; "ptex2pdf.doc-20200520.0"="xy5gdmv5jh3mlabwk74hcj1b2g9qrv8f"; "pxbase-1.1b"="92jsnxmiqmpy56dhdjaark80zsbb5vxa"; @@ -2713,8 +2739,8 @@ "pxchfon.doc-1.7e"="4pimmbvbbjnrpmnh11y75rk0ahj3d7lz"; "pxcjkcat-1.1"="i368i8r85baiimnwh2rfqd0hfrklw8hs"; "pxcjkcat.doc-1.1"="hcxxg9rg6d64hwysf6nlvfhv8h360168"; -"pxjahyper-0.6"="b5q5xfvplzy9xdq2qzzzkwa72s67kyhb"; -"pxjahyper.doc-0.6"="vwm7ji8z5m7n6ba48cy486cnld18z6kz"; +"pxjahyper-0.6"="yn6s3hxp4idpn0vg79ka8p2zk7ghpdqv"; +"pxjahyper.doc-0.6"="m85nxzf8yxy5ynhbq4ck7kr3x4q838cy"; "pxjodel-0.3"="81408a28dnm6qxf1fvdzl9892bjgw16d"; "pxjodel.doc-0.3"="9gpcf45l044gd9z8pqvag7apcnfy407c"; "pxrubrica-1.3c"="p6ych4fz68bzhg7nmb0456jr32qhg20g"; @@ -2727,6 +2753,8 @@ "zxjafbfont.doc-0.2"="0901rpw6rd2wivh0fsqnna6gywc6j8hh"; "zxjatype-0.7"="8wfcvfci8mj8ikqpfa1s4km4c46i3hb5"; "zxjatype.doc-0.7"="qp9vrpjyjxma8bi3yhkdbbxv0db2l0mr"; +"baekmuk-2.2.1"="yrs4d6j382fxfn4ncmp27af5xjrv3xs4"; +"baekmuk.doc-2.2.1"="wprw23q0ksga33zysqi5478xpi5izqsr"; "cjk-ko-1.8"="bzihr3wa6c0rp7jrj89483w2xlapj6jv"; "cjk-ko.doc-1.8"="avb0cwq3p97yj94gsfwj29bwdixv2lyg"; "kotex-oblivoir-2.2.1"="cx0nxwxwj719krdh6n5hg3cf6ga7ysfm"; @@ -2832,9 +2860,9 @@ "latino-sine-flexione.doc-1.2"="hnb3gr9lz8wfqgz3g1shzb9s85r4dn9h"; "lshort-thai.doc-1.32"="iwmnm7z7b3r8km4i3afq8hz0f2vy9dl2"; "lshort-vietnamese.doc-4.00"="2y25jrim204g4q916rf1hhkavl7fi6vx"; -"marathi-1.4"="bv89wm74091k334rvc46jbj5wydds7lc"; -"marathi.doc-1.4"="9ywp9dv2cm99q1v48z550fj4gbjnfsdz"; -"marathi.source-1.4"="3rwsdhd80lxlnkqzakhhgjl9f258ydjx"; +"marathi-1.5"="51bd8dlakv17av6qsnln14s3wqdfizzi"; +"marathi.doc-1.5"="pg4n9ml082bd23yzf5qayfs2x6ynz3qr"; +"marathi.source-1.5"="ckdmamj5cp67iiiqc51dnz9y9ayjsrq3"; "ntheorem-vn.doc-1.203"="ys9g749d9f2nbq55ckyrjrr4mg9yywni"; "padauk-3.002"="dwdgm603clk71s9gcjx9ghzwlkh6k2gd"; "padauk.doc-3.002"="zarib60py4ddx2axyrm695pkikxih70z"; @@ -2931,7 +2959,7 @@ "hyphen-spanish.doc-5.0"="kznsqnkm7dg2rdpisil38syyvs6fs0j6"; "hyphen-spanish.source-5.0"="lia19yzmwyz4fsbnrca8al43hfc46i55"; "l2tabu-spanish.doc-1.1"="rc7058j31za1cg1ik27b6gcgscir9bfk"; -"latex2e-help-texinfo-spanish.doc-56291"="zqfixpmcslcpjzg9f3rxcv6z1j7i5d3w"; +"latex2e-help-texinfo-spanish.doc-57213"="zqfixpmcslcpjzg9f3rxcv6z1j7i5d3w"; "latexcheat-esmx.doc-2.00"="bzjjilpj8rmp1cc93bs32568dc8dvgic"; "lshort-spanish.doc-0.5"="3gmql5wpqh3h5mhr0pjcs6v0a5jqc1c8"; "texlive-es.doc-54465"="qbhp4jz17w79iylcj1dxv5n7zlqrn9xk"; @@ -2969,8 +2997,8 @@ "achemso-3.13b"="nmz9jzrfm4kp4961f869kcw5sziad7dj"; "achemso.doc-3.13b"="4g9pj83kvpizdfhrz00ycwhw9rzma0nh"; "achemso.source-3.13b"="zr5icfcmqvhadh0rlhf3c1knmrkr4iyd"; -"acro-3.2"="h63ir9a0mpg273kd7vzh72vwlsvrm5yd"; -"acro.doc-3.2"="4dg6dmb5qgc46frbjqpv2wblya84716m"; +"acro-3.4"="zm87wcng805m71lg1ycnrfgr3wpwim9j"; +"acro.doc-3.4"="yzl03s4l8i19aml3z6c1hx0v2qg5l4mc"; "acronym-1.47"="6471snmy26zvq7gh9lswa4fg0zp94phd"; "acronym.doc-1.47"="3z4ps2hfi959q7dazpjrj02icpbr69g9"; "acronym.source-1.47"="2sbaifpka4p220fd9dlbvzbp92vg971w"; @@ -3041,9 +3069,9 @@ "arcs-1"="b0qh2cpybhqd0d0d8a183hhv7xlx13di"; "arcs.doc-1"="x9xzx0p7wmn5mh61lkmlycfcybzfasz5"; "arcs.source-1"="jbx1wd4pyp8682lbz3mw00ha114adrad"; -"arraycols-1.0"="p6c0xqv9y69fbg7vzv1r10nmq1lspaay"; -"arraycols.doc-1.0"="946328vqw5893d8172f7l2j25bi20wfm"; -"arraycols.source-1.0"="xjw5d1b9vf75nlvnswn4vprk7mnlzjgs"; +"arraycols-1.1"="cfkhjyajfjgzp4826i0rnxbbc1yfxa20"; +"arraycols.doc-1.1"="m03wdi9flydgvs5f7450hj1i88ynm85i"; +"arraycols.source-1.1"="mh3g35c7dybg3r8npb1zc69vyzs2arva"; "arrayjobx-1.04"="zxqamnkgiq8c9p1z3w89rlgqv61bp2n6"; "arrayjobx.doc-1.04"="fyx7869qi432q3g06i3xyg92jqh29fbr"; "arraysort-1.0"="h5gbw2lvn0zfvhz0s5lmc495yz49bdds"; @@ -3062,9 +3090,11 @@ "assignment.doc-20431"="0d0cafwd56gqn5dacsq4fdgzz8jqks19"; "assoccnt-0.8"="6bikcn3hf37rs2wp84f9h8nf81z86hr6"; "assoccnt.doc-0.8"="xb17k2w0skjxh3cw3hag91m5cjxj1vz9"; -"atenddvi-1.4"="6ygnmbsi6bqj2z0vawx65snrkqlmbidg"; -"atenddvi.doc-1.4"="7hhrbjji7ibzcy65qp9xgxg2i87kar32"; -"atenddvi.source-1.4"="n8zj2xfx23h8n8bfs92kxkmdpl1drq0z"; +"association-matrix-1.0"="ia2sz5pjhb312fpd3wq4h3jlzx6p4mhq"; +"association-matrix.doc-1.0"="7yg14fhaggb07h6zj7wz4a1ml7wkz6im"; +"atenddvi-1.5"="mdd2z14rww1y98y7v1jsyq3hzrg2rf6i"; +"atenddvi.doc-1.5"="sk0j256ab9vz5lnn7v2dj7rwn5a1lnhh"; +"atenddvi.source-1.5"="x07x6lrj3ichjg83nphb044z99583c1c"; "attachfile-1.9"="vmyp7ywfqli6yzs89419885jac9x0yql"; "attachfile.doc-1.9"="f076ljz64r8ck1l9cz5g7xypm92jb9qs"; "attachfile.source-1.9"="j93ivs0jy4n52a18gw0icmh0ffsnm1j4"; @@ -3087,8 +3117,8 @@ "avremu-0.1"="xk59ssazl5122hy7cw9h8l8ky47ac58m"; "avremu.doc-0.1"="sp38mldllwslwxq2rvizcx1dcpfaava7"; "avremu.source-0.1"="inwrrgrds8ympmhzgrk3m82x544x8nhi"; -"axessibility-3.0"="a43649gdk2b6sxv4vkrvk8lmw9vmcijy"; -"axessibility.doc-3.0"="wys2qwwj4aiwhxpgllayv7kw6pb32jnd"; +"axessibility-3.0"="21hz0f1kbq51g3s4s6pcc2wg869m3a39"; +"axessibility.doc-3.0"="9s7zwv0a8y52ddgv5wvyhgp9id55zz9v"; "axessibility.source-3.0"="g8jxfyvj67bx306vkyryhfml2v535959"; "background-2.1"="akcsb7n8iyy4zlcgfp0ikwb5awzdnh9d"; "background.doc-2.1"="inm76hq9brwc39n6bhp9782766mmgwpx"; @@ -3130,8 +3160,8 @@ "beamertheme-detlevcm.doc-1.02"="5yh3kypxg8cjr8vqy04k1ad1agnlq047"; "beamertheme-epyt-1.0"="1g3593pcp0b4k9lacp4c0afs7jzffa9b"; "beamertheme-epyt.doc-1.0"="al12nh23v6l4lfa4616zzivldc5jfkjy"; -"beamertheme-focus-2.6"="lv5yfs1bhgzg70zq4bzj51pr4z1cka1x"; -"beamertheme-focus.doc-2.6"="a4gfchd3sgh1bcvc5llcib6dzaa32i7c"; +"beamertheme-focus-2.8.1"="rsyiviz20m0f8v699yv80rw4k4drbl3m"; +"beamertheme-focus.doc-2.8.1"="idhc1g1ja4y43gdnk3bd1387v6fw14d2"; "beamertheme-light-1.0"="9vz0g593s4ykwasfky58jqq6h7a95p12"; "beamertheme-light.doc-1.0"="dvyzvi4hl69xvvgbhdbp5ax2l3z68nck"; "beamertheme-metropolis-1.2"="g062nnxl4v5951xq2xa4smkdjq6v2xpk"; @@ -3141,8 +3171,8 @@ "beamertheme-npbt.doc-4.1"="dzjby8rnpsgll6gvab9cslziqszhd4zf"; "beamertheme-phnompenh-1.0"="01nbk38jh4hxk8vykf37x6bhnb55ijdb"; "beamertheme-phnompenh.doc-1.0"="p0nj4cqg4vaaq6wlycicz0xbl7391lwp"; -"beamertheme-pure-minimalistic-1.2.4"="r3kxc6gbrhal87wl85xbck483sbf2w76"; -"beamertheme-pure-minimalistic.doc-1.2.4"="54r3rj2vha4amqk7mccqir896fx35m6f"; +"beamertheme-pure-minimalistic-2.0.0"="5wsvlda1yasnisw6zx61g2qq63106a7a"; +"beamertheme-pure-minimalistic.doc-2.0.0"="a33m9xa1jqc650zrv6mrz9xdyfs14nyc"; "beamertheme-saintpetersburg-45877"="jkhmvyc96zm66cmfjl1fvrnz86a81zbp"; "beamertheme-saintpetersburg.doc-45877"="9msrd7ylkwfg6ijdx3rddcl143p17383"; "beamertheme-saintpetersburg.source-45877"="16hmcal8wb74z1qdi5r46w36w3n87n6z"; @@ -3159,9 +3189,9 @@ "beton-15878"="0psc07yssk92pgrf4c9zvyr4k3ibbz3j"; "beton.doc-15878"="9jpvnkmri3w4m9ik5d4l7mnlfpwxacg5"; "beton.source-15878"="znwrdd877gdwmsiaxc9v8pczdw21wrb8"; -"bewerbung-1.1"="kb947mnv03wjc8ja8k402inijnplk1vy"; -"bewerbung.doc-1.1"="mv9vrqp8g689cvbwpm3xkczk98s1blas"; -"bewerbung.source-1.1"="w8z7h0w0ld2dd88a0yhp6p6md8hn7kkh"; +"bewerbung-1.2"="4zrcxx73cyavv3wm4dm50hvrmjw02s3f"; +"bewerbung.doc-1.2"="m6668z3ds3sgdvpr409jbyshsznqs4qp"; +"bewerbung.source-1.2"="5kmfflgw9nnl5gsigh08ww7f9k9zhmh9"; "bez123-1.1b"="9lx6fqcskk9lj28vcfhfnkmjb9dhlqdh"; "bez123.doc-1.1b"="s5s834dhxqlqc5i8dswvayhf62chrqbh"; "bez123.source-1.1b"="fsc7gqwcbpfjlhn0bljq7l0jd8g6zapd"; @@ -3177,6 +3207,9 @@ "bigints.doc-29803"="jyxj3risms61j5aazx9hkxxfwbg6nyzr"; "biochemistry-colors-1.00"="fvz3nlqi6y12g5pcyh118l6vjbw5kz2i"; "biochemistry-colors.doc-1.00"="r7n07xkk4ixxk9zhz3ffkg7kqsz0i8fc"; +"bithesis-1.0.0"="vq8zlw5g879cmhzd9hg0mfdkjb5y7kb1"; +"bithesis.doc-1.0.0"="4hklq8jxwmfvq4sbd53gqni11d8dcbn0"; +"bithesis.source-1.0.0"="gkhy05l4m4pz82qsinnm6ajx9k6h689x"; "bizcard-1.1"="l59w5wy3djx28g5yw2ywagi5am258bry"; "bizcard.doc-1.1"="yallp1mh43m9224sqhzg85ylymiib9v2"; "bizcard.source-1.1"="z70q003l3pmi9p0z0a99f2bz0lxkq2y9"; @@ -3198,9 +3231,9 @@ "boites.source-1.1"="vcfgm806kvw3z466j5kimj5wzgaywv0f"; "bold-extra-0.1"="0kr4p0z1bfng2sindvkk7rkfzm863qmx"; "bold-extra.doc-0.1"="czal2y2szfldrzkn4h0aj6iwjk7gpifk"; -"bookcover-2.3"="mcs63f0cb9qvma487xqrym0a0p5mfli6"; -"bookcover.doc-2.3"="9zwjwl5k3i02cgizw0gf0j0ig46l5jc8"; -"bookcover.source-2.3"="jw98c4wikxgaj2vaykw25azy189q877s"; +"bookcover-3.3"="8jzphigwp2xys5h1hq3vgk8xx8hbl8bw"; +"bookcover.doc-3.3"="caki4lv0vkwnl12in3i2xa78avsba80l"; +"bookcover.source-3.3"="pr9g2yp4vqi3fgqwa7hgy3zmb3vr1f76"; "bookest-1.1"="70j4zrqfn4cr0qg7dhdqainy3pxxilg0"; "bookest.doc-1.1"="3cbqgyzvm6zvzib6jhgdyy7mcw5p75nc"; "booklet-0.7b"="fkicb41vlz1m3spn6jf9g1dk28f22v7i"; @@ -3263,8 +3296,8 @@ "cals-2.4.2"="0xq2pylhs1gl542s86wm23nynnfzk188"; "cals.doc-2.4.2"="yq4wig26r1cadd3kxg5bfraig4axvyvd"; "cals.source-2.4.2"="fshbdf6ljfy0c7kdcvz5kyinysplcj86"; -"calxxxx-yyyy-20.20a"="77wp5sxr7a9z2lhxa4cc3f20a3lc5fdz"; -"calxxxx-yyyy.doc-20.20a"="qpasnrbn64r5ha4sxkgrdfrljqjprjvf"; +"calxxxx-yyyy-20.21a"="hx11kvbi5kph8himmnr7cygyxrs92h6y"; +"calxxxx-yyyy.doc-20.21a"="rc1cp1b4mxrq8pbva644wgra1cvs45dn"; "cancel-2.2"="gq061h1xf31ivc5zz1wqk7c457m33amn"; "cancel.doc-2.2"="24zhq0iz9iqwm1lnyd6zgzc7dsg9b1gf"; "canoniclayout-0.5"="vg54aawlapxdw0dp8s7jinkl16jd8n6h"; @@ -3321,6 +3354,9 @@ "censor.doc-3.22"="rcvd45yfghlg5yc3jcfzgj506zfnbmpz"; "centeredline-1.1"="cqrj6vf1p84c5sqz09an9dixy4mkvbx5"; "centeredline.doc-1.1"="k0yjy3jia8qsxh1zzgsdvm5a7xj58ni1"; +"centerlastline-1.0"="svlrrvv2sa6534pkbr8rzqiaw4jiz6av"; +"centerlastline.doc-1.0"="6b213204s814gvfsf40rmcfhcx14ncpa"; +"centerlastline.source-1.0"="35f4f2b8ccvz9k04c7n0nss2i9s1a3ll"; "changebar-3.6c"="76f70hw5065zfzmvbkrkia3ih5jhhkjq"; "changebar.doc-3.6c"="310sfxf3nzqrrkcp2n794kpn4bzv9b3b"; "changebar.source-3.6c"="xi3ldcm33mq6aa4jad2sfv7g58kwg0p3"; @@ -3426,9 +3462,9 @@ "breqn-0.98k"="zxlvpm3140isqldavaiq93i62wx9fvd5"; "breqn.doc-0.98k"="rq5wmm3nkf8dn5ai2fc9vbrnahb1aym9"; "breqn.source-0.98k"="d6zijlq7xzciyk3xn1v5pbly5wxhd63m"; -"caption-56374"="irza4zki002sxhb3bqwrxylyl9yvy8di"; -"caption.doc-56374"="910jq53lg1dqgv2xafy3vfjs8afqzrzm"; -"caption.source-56374"="ssq3n46ifvbq3r42rjqvxrg9g9nyardi"; +"caption-56771"="bjmm0mpsrkwvz5mzk9n6dqpn6smfcbya"; +"caption.doc-56771"="ck3gbg8qcdfji56xksflhl5664fdrvkb"; +"caption.source-56771"="lg7lv6j2mwfzxd04sgcvs62f762jimp3"; "cite-5.5"="7vzh6m2dnlxwkiw62ifbyn9hx82jpgyj"; "cite.doc-5.5"="d20p75a21nvifkj1f61fd9ah5580n2bx"; "cmap-1.0h"="bky8rw1a9f00x6fzx611hgfcyf7d115f"; @@ -3439,9 +3475,9 @@ "ctable-1.31"="wd1f4k8s98g3lcfn825snbj9pvsr6s2j"; "ctable.doc-1.31"="sjikmhs468fpx52r50s7qyjc4rkfb9r0"; "ctable.source-1.31"="a3danbgiabx2z87nxkkcbvdb0l7fs0s8"; -"eso-pic-2.0i"="8zpvv2r92yzdw9sjn1hdp9gydwcy0bla"; -"eso-pic.doc-2.0i"="9bha1qpmffkbl2bsq99gkhqqvlbcbccc"; -"eso-pic.source-2.0i"="1ilqjlmap2gq7s30mq4b20c9bcahs7y4"; +"eso-pic-3.0a"="5hkndcg8z7mq3hjd710hdm05sy15gpmn"; +"eso-pic.doc-3.0a"="5ls3fcmrl5v6dpi9qzympyvhdwqfiahi"; +"eso-pic.source-3.0a"="xz2ybhj1aw80mafgbn7lrj7g6mssr5g4"; "euler-2.5"="32y9kxnr7zw4byr1zxsd2iqcfyzjvn42"; "euler.doc-2.5"="g4bxh88pzc2872qk0w0sgapcaglal808"; "euler.source-2.5"="8h1ahs9sbijdsc3xiv1rwv6k0vm9m858"; @@ -3472,21 +3508,21 @@ "jknapltx-19440"="cvwv1bfgf5s8rnahghpy2pbb7kgwzqwp"; "jknapltx.doc-19440"="cxdmxr63vm4sm8rv6bp9n3yyw5gqc7y3"; "koma-script-3.32"="iml0agfaadaqivm19nfg2bn788mbidzv"; -"l3experimental-56424"="xiczgr88w47x7k8lw6y8fqwzmjs0c3n4"; -"l3experimental.doc-56424"="0vsnycdfn4zd0vkisw717a179k86m10b"; -"l3experimental.source-56424"="18lzg9axjak2hdhcqy3cb5436hbfppn9"; -"latexbug-1.0h"="bv8jiiyxjfgalld6nxv7qisvb8i9ix1d"; -"latexbug.doc-1.0h"="fz9slhiwkar37hwqwcsx4ih1nw7zl2xa"; -"latexbug.source-1.0h"="sr865dxax5f9j7r0bvhg9nlxf8bs0rwj"; +"l3experimental-56785"="dwfrgnbi17200xqaka8sasc4dv20i7d6"; +"l3experimental.doc-56785"="l73h6vhmw3hwqldddcs2gh07z8giyvmm"; +"l3experimental.source-56785"="jfnxqj2ic0g65hadmicr20jynq45gpvq"; +"latexbug-1.0i"="5v5z4388srxr5l3g41zj22625b6y5kwm"; +"latexbug.doc-1.0i"="yw8cjcla0s5m1hnp5z2vpwbbr8fkw18h"; +"latexbug.source-1.0i"="dynv3lhhzm2rzyhn6mr48aa5grdd3c7f"; "lineno-4.41"="kvbdigwxw4db752kssgdb8rlxhljkkpm"; "lineno.doc-4.41"="cfnil0v0isahd65d1sly2kr29w38h535"; "lineno.source-4.41"="w30n8z3rnrvzpfa1d1s7mn3rcj03s892"; "listings-1.8d"="ci87vjqba9nnwsgm8412749fg7fid33v"; "listings.doc-1.8d"="jq29kbrz6bxs58iqhp76ail0kiy5s53r"; "listings.source-1.8d"="0cz06d1v08369wgfnkddmzqi7258rsx0"; -"lwarp-0.892"="5h6ljfnxs5p2cag2mnsxsf1iv2gf94z4"; -"lwarp.doc-0.892"="c94x100afrll07vaja7pgs7mj8dpa1i7"; -"lwarp.source-0.892"="5fkj8vdxjmhly9dv86v19v3vpphwwl3s"; +"lwarp-0.894"="sjx6p71lbrhdik062rpgy4fn28085il4"; +"lwarp.doc-0.894"="bykrdn8b3y4570cgxgllh8yy5abz2pzd"; +"lwarp.source-0.894"="wg064ipx6s3bmmfs68kvg9fi4hm576fv"; "mathspec-0.2b"="kwvx81d4nlxj7vbr2n5zvgnfvkasg4y0"; "mathspec.doc-0.2b"="rqykkdkfahnnnphcns26p19z9mr2mlgh"; "mathtools-1.24"="ybp5grgnwb0jbfzim9hc676q8pc10b83"; @@ -3498,15 +3534,15 @@ "metalogo-0.12"="hamja3bdw70llmwnabjq9vsdni1w77qv"; "metalogo.doc-0.12"="mi09m2hdx668xm2v9igsq25z504n4vrh"; "metalogo.source-0.12"="4xddwk98vl0xdff6j49jjanzvqbw6yzm"; -"microtype-2.7d"="b41abl38422cr5brjfy0630iq9x9mj8z"; -"microtype.doc-2.7d"="9sl8bgxi48cda1kln3qqy9xpf6lfw2d2"; -"microtype.source-2.7d"="39b3miq2ypis8brg4q2wjjrw4jzggcy3"; +"microtype-2.8"="6bgyahdxp20gnwxsfaad2jw7b3xpc525"; +"microtype.doc-2.8"="gzhij6jgvdprk551fvy9qr6w6k5kj7rz"; +"microtype.source-2.8"="hqg1hg2k649jprv3vjj5chpiqdwaqprh"; "newfloat-1.1l"="lbxyrzkqg5j3hgwjaw9gdm2h1cf381vz"; "newfloat.doc-1.1l"="fkbi9h381inng5z9qdgnig25z0fxsb4p"; "newfloat.source-1.1l"="p8lpx95dawyhvyd36nkppgilrflb79v1"; -"ntgclass-2.1d"="y8cgcs422bvbz798jxiliyzv0sllld5w"; -"ntgclass.doc-2.1d"="7s1fk4p4zhm9x4gph5zmd9vqjwj6zynp"; -"ntgclass.source-2.1d"="3m8mi9ms4mjnl5yk6ygk15a3751yhi0a"; +"ntgclass-2.1e"="zkss2080gby0mqd685h9ff8421j3nq21"; +"ntgclass.doc-2.1e"="d3ns0gma0fivb3phssvzx9b1c6zwfzpl"; +"ntgclass.source-2.1e"="i9d2yfcz7blz7c5gakqhycmmwhwykzgw"; "parskip-2.0f"="4hdlnxb9gf2q2q08fmkz7j4rwzddpz9i"; "parskip.doc-2.0f"="l2w61n7gb9iw8gixp7fmfvy4gh9aa5p0"; "parskip.source-2.0f"="iz00ql6ncqqhxinijmqp98jq38pwqddx"; @@ -3516,9 +3552,9 @@ "pdfpages-0.5q"="1bdik391lsmp7dz6d8arq1hdawj4qraf"; "pdfpages.doc-0.5q"="9jdi9zs7hycixbdxld0m95b8935f4cqw"; "pdfpages.source-0.5q"="f8nglq0jzz4n3lky57q6mmm2pdrydxf9"; -"polyglossia-1.49"="506kkq32qbwp5xnmvdahbpv6mgfx9pad"; -"polyglossia.doc-1.49"="dyfg38rwcsrq6w4z8sr2y0rsba0ipl47"; -"polyglossia.source-1.49"="sjcan0v66d6j1k7hwsrk4vrdmsr450c8"; +"polyglossia-1.51"="psda8pj73fja066g2j69ljvzjwj4gn41"; +"polyglossia.doc-1.51"="s1aazzxm3yglcrfr0lkp4r81nvllmk0x"; +"polyglossia.source-1.51"="i09x40vvg9bsvk6l5d17vsa4vy1y4qx8"; "makecmds-15878"="anpaqglvl5rmcy8r2q0ap8m117nsx89q"; "makecmds.doc-15878"="39zxaxxqlmps1wd4rjy42a1hk027n06v"; "makecmds.source-15878"="j4g888p0hniq7p6b30q1fb4qfw3qp7i6"; @@ -3568,8 +3604,8 @@ "aobs-tikz-1.0"="klfbwfabfx6lv1pk6kz3vayabsnphvrh"; "aobs-tikz.doc-1.0"="qh43c30d1xpyl4rbazp4kj8p850rdxwb"; "aobs-tikz.source-1.0"="xgmck3vrplx5q6blkm6yg2njgkk4k5bz"; -"askmaps-0.1"="4bm7q1w9sz28mj7v79gphh13rlz1ny3d"; -"askmaps.doc-0.1"="dp5c0n7vk509bhwhmxi6wvshz45s3fix"; +"askmaps-0.2"="h7gsxw1m64s9ci55nf4c8xwr709jfcg6"; +"askmaps.doc-0.2"="06v8bsahhf9mmi3ln2zg8rj9nd0kpnbp"; "asyfig-0.1c"="61q9dbbmirr3q1fncz10fpvqr68kj3zb"; "asyfig.doc-0.1c"="1ynfgvq1hvwl8dflmf5vchv2xhmr8511"; "asyfig.source-0.1c"="2403n3a1pa3gbrrs919rj56jcy4klyz0"; @@ -3615,19 +3651,19 @@ "celtic.source-1.1"="z25a01arypma6jfyj2f16n36hqyicffd"; "chemfig-1.56"="wg525q207i0jm3zvackkq2im40n624dg"; "chemfig.doc-1.56"="v2d4fmsfcdvh631sdddm3jmjq6zg477x"; -"circuit-macros-9.3"="af9csy1vch1pkpb5y0f3bqn26dh3fbgj"; -"circuit-macros.doc-9.3"="zpvs7dhf74ly62lm2mc8c5x31ssbgrih"; -"circuitikz-1.2.4"="25dmbjg0xidl0kn6ci9hnbj31a12x66l"; -"circuitikz.doc-1.2.4"="s9x2ldihx2c4zjds53jsdnjw97h57f4x"; +"circuit-macros-9.5"="af9csy1vch1pkpb5y0f3bqn26dh3fbgj"; +"circuit-macros.doc-9.5"="a7ipgax8cs0bg1nwd5yzzhd9y5ffm8ag"; +"circuitikz-1.2.7"="m196y5hvnl7bqkizd96z678310jzznnq"; +"circuitikz.doc-1.2.7"="667snrw550xgqayc4jzc342xcm5yvx61"; "combinedgraphics-0.2.2"="hr8cvhw9ng0nx1v0v34bx5yppzhw8r3a"; "combinedgraphics.doc-0.2.2"="2s219mqf373sb1rp3dwjd9kdasjl9fdg"; "combinedgraphics.source-0.2.2"="4q5n4m14613bv27dc7n3z1m8w2sfiv0q"; "curve-1.16"="w4a3qv419x68y5ydvi1dk6pnm6ni82ci"; "curve.doc-1.16"="f4n85j7dlkp12vm17vqac8d4hzm1jvd9"; "curve.source-1.16"="gkfbyzhsaknlrhm3ni81jxswdjv5z9ij"; -"curve2e-2.2.10"="3hs2rsdsf2ip2b55xshi3qfb3zvgm5kx"; -"curve2e.doc-2.2.10"="dvgxy96bkj3q77pbkf3lyi6hpcmhmx8g"; -"curve2e.source-2.2.10"="p5pw2fcdgg1hkj366fmhdk8yvyg7lbvl"; +"curve2e-2.2.13"="1iz71fdwzibj77g8hg7wfmnlsv5mxx24"; +"curve2e.doc-2.2.13"="4vq8xlmc3x1glj1r1nziiv0plq4bwgia"; +"curve2e.source-2.2.13"="p9w176wvrskj5c7sj5nh323hmr6w4v8d"; "curves-1.55"="2cyy1kwxbvxpvxpvvsbh7nvh5q5l7n7b"; "curves.doc-1.55"="jk4ma0hcrdg6lwy4l5238b9xzsb8lfrv"; "curves.source-1.55"="q9l5hcsi0n14kkcim30yk6i6sxc5cmvw"; @@ -3707,8 +3743,8 @@ "graph35-0.1.1"="x18xxd2x7yb5ckpild1s64w9f9rpi5n7"; "graph35.doc-0.1.1"="qza5xy7xdsncal55gyqs8ay9z1h5rp49"; "graph35.source-0.1.1"="gaabqpc5jr86g3jbd4sm6df0633c65y3"; -"graphicxpsd-1.1"="1lnxx7fjgam8dyjyay2ws6la9wjhbkn2"; -"graphicxpsd.doc-1.1"="rx8yz6raa7cyyqr37jr41wkgpgljdhr8"; +"graphicxpsd-1.2"="wzg5nivinnigm98anjkpqkzxy5yy7g9s"; +"graphicxpsd.doc-1.2"="41hyvv7makf7nhamhwgjdvark6ydkdfk"; "graphviz-0.94"="gicmf9qslgbamr7qkac4y3x0wajkbhw1"; "graphviz.doc-0.94"="xxyyxpgr81jv00v48zv7vxkm9sa4hjsn"; "graphviz.source-0.94"="kqv26abzy2ff31a3f0aval7lskvk5nql"; @@ -3725,8 +3761,8 @@ "hobby-1.8"="kmk2l2ik0anclivgqk6alx1v44j6g8pk"; "hobby.doc-1.8"="8bdi0hrpyxyczql8rhqfiqlrza5y2g56"; "hobby.source-1.8"="99k7q3r58r1v7vqh3hv08qbb5s1r552p"; -"hvfloat-2.16"="42b4aspf04rp4gvjlxh51284g8vkmhpn"; -"hvfloat.doc-2.16"="qsn79czwvj36r4ifp0yb8p8hrfrs4p4w"; +"hvfloat-2.17"="24f6508k2ak1lzv2gimrady79fzc44yf"; +"hvfloat.doc-2.17"="71aqcr8rqqym989hk16d6rpxnq1912qc"; "istgame-2.0"="il4ycc7pxqvpyals4cvc2bkgvzc29vmc"; "istgame.doc-2.0"="rr6wnw1csla45zv7kmcfizj72rfcgx05"; "kblocks-1.0"="lrlcxbcx98bsjxwkr10w5wax3x4lmyjm"; @@ -3739,9 +3775,9 @@ "ladder.doc-44394"="32b2x9zydsp7b2zncs2lg6ldz5cs7gpa"; "lapdf-1.1"="g5x8axkiscl5796b82is201vcbdxvc3f"; "lapdf.doc-1.1"="3lpf17r6yqaa7ld8742cp8a7crafpc9x"; -"latex-make-2.4.0"="v57k7bkaqhjbwn5chpws53r9g6a9ksac"; -"latex-make.doc-2.4.0"="faq72r8b5xhjjsczv7ws6g12s1aydjaz"; -"latex-make.source-2.4.0"="yxz5ih93ddpi61badp2js36hj36r5cgg"; +"latex-make-2.4.2"="nazmg5gjqni54i0rk3giq13jnzn9w5ql"; +"latex-make.doc-2.4.2"="rz0xp76krcxvy654ji1f003c37g1pkmf"; +"latex-make.source-2.4.2"="bfddkj3bcb11lff9ypiswkcyaa2dbcf7"; "lpic-0.8"="74wchk7ljfacnfqy6wn0j9ns5bqzhkv1"; "lpic.doc-0.8"="yqsjlvnfzgj180kssqhp1i11gq8d9c9q"; "lroundrect-1.0"="x8g1sz9w4xaj9da4y1xy58hrdblmdx4g"; @@ -3767,8 +3803,8 @@ "miniplot.doc-17483"="hi57wciv475ix91zl4rh30lv5pffns1p"; "mkpic-1.02"="m0rzxyzpyjzial8vvd5nm2rny449ka5b"; "mkpic.doc-1.02"="m0v80hkyq699sbmdbv5ydp75ccdh5yd3"; -"modiagram-0.3"="sbc0gqy5h9g3vvay1hg8nd8c8za52ns7"; -"modiagram.doc-0.3"="nxgyiv2d5sh787nmp4kjn0qlv88j77lm"; +"modiagram-0.3a"="zn4c83sdrwn9vkv6m1q15bsvwp01ycjm"; +"modiagram.doc-0.3a"="qy9zyvkyvs6r8jhchndbprhszbj69ycf"; "neuralnetwork-1.0"="3scaqj2kvqri7x23chqymfkg534298ik"; "neuralnetwork.doc-1.0"="xxsvv8bh5174ihqmaxgy5072z92glvhd"; "numericplots-2.0.2"="c6kqacnf4qlhx7lkbnrp4xji5xg9nzib"; @@ -3840,6 +3876,8 @@ "ptolemaicastronomy-1.0"="09a5aimp6j8yxwfhsdb7kf574jcy2p6g"; "ptolemaicastronomy.doc-1.0"="7ijjcz9y4ah07pwb30b6r0wpg87fxij4"; "ptolemaicastronomy.source-1.0"="xv9cql2pkkiczvgf3v7sa80p22pbz3h9"; +"puyotikz-1.0.1"="qx2rv06l811c34pni8rgkffirpc09fw8"; +"puyotikz.doc-1.0.1"="969cy9jzd8rfrm9sb5gcr9gsc1qxn23g"; "pxpgfmark-0.2"="sy9cs1y4gf9xr7jfiyp8zkr1r8di00hc"; "pxpgfmark.doc-0.2"="25vgpjc0zr0wjny4snksr3yzk908s2mq"; "qcircuit-2.6.0"="va7w4d1n5djxqa4fis7m409aapx7hqa4"; @@ -3890,6 +3928,8 @@ "spectralsequences.doc-1.2.2"="by1zrk0y8nq05qf8csa2gvwl316zc1j4"; "swimgraf-25446"="x77prbkrnadhj57fbh68hqsmrbk2qsis"; "swimgraf.doc-25446"="hfrhqz5pj6g0mdyp1fbbfbnasph11pwi"; +"syntaxdi-0.8.2"="hkrwysi8yl9741hkdqjhhmhhwsjqji9q"; +"syntaxdi.doc-0.8.2"="zdnlrpza0hrf4pacrabdmv4n3xx16rb1"; "table-fct-1.1"="b7wz94n1h3wpq9mi40zdl3v4m9hi1wxk"; "table-fct.doc-1.1"="1k2sa9bsygbw1ib85x7yqda1jbzbg05f"; "texdraw-v2r3"="rkzarniigb4a454964qbfdiaj1z124xi"; @@ -3898,6 +3938,8 @@ "ticollege.doc-1.0"="7n7nyn8zrp9za6l355797gq96vxp2d78"; "tikz-3dplot-25087"="kl827mar9jlbjpwxl90z3fml8i3zabb9"; "tikz-3dplot.doc-25087"="y736rbqkbjg7nnly25d0jl72z9gyx17w"; +"tikz-among-us-1.1.0"="d9n1f1a617n59l6h5790mzkv5arkrwzw"; +"tikz-among-us.doc-1.1.0"="m25gkpfpna507ij74x2x9fbxvw0frc3a"; "tikz-bayesnet-0.1"="w9x9vf5hgmv18ljz0kx7rby1dig63539"; "tikz-bayesnet.doc-0.1"="g7dkg4gg6729jbscb7cf3fsay2dfqv42"; "tikz-cd-0.9f"="h74wx5r1jclma4zqd78wb3f5bmpfc2pw"; @@ -3949,8 +3991,8 @@ "tikz-timing-0.7f"="phaw9fm5dzq5xr4klpnw2dhnrq3lcam0"; "tikz-timing.doc-0.7f"="cc5mlz7linvwb3ki8bnhhs6qz9xmkkb4"; "tikz-timing.source-0.7f"="8lpjas5dgvpl8dcxf1549m8nh0vn20fw"; -"tikz-trackschematic-0.5.1"="b8a2ljq13a1yg0dsa9icngsa2iiyanw0"; -"tikz-trackschematic.doc-0.5.1"="cif4841w92syf5xxwlw9njb7zlqdd0gr"; +"tikz-trackschematic-0.6"="0dpci10miikxhmb9k3vkzzq30mmf9dxk"; +"tikz-trackschematic.doc-0.6"="4xiw69h4jb3xggwyak9l4387kfga7bhn"; "tikz-truchet-50020"="h8p45wr3xhjslajpyyzr8zha6x52jyci"; "tikz-truchet.doc-50020"="6nyandwvh9qj5z6pzh20417kl3gd3q68"; "tikz-truchet.source-50020"="r5gpj9cmqj4njzzx820v7ka0v7chxy24"; @@ -3961,8 +4003,8 @@ "tikzinclude-1.0"="hh3h2srdlz39dv69wdwcrmjr1pps271a"; "tikzinclude.doc-1.0"="qdzw00zvqp206krl9ph782lvrmvjphm9"; "tikzinclude.source-1.0"="bznb6w85hk7nzsmnglz01qvi4mp64bqf"; -"tikzlings-0.3"="f75p9d4c4iizb6q4xhaafcdpm9y2bjjm"; -"tikzlings.doc-0.3"="rpbk1nbww341mf3qc1rqbss9xrgzjy9c"; +"tikzlings-0.4"="h0ifghxbc62wqvyn8rd5173jcvnxyhis"; +"tikzlings.doc-0.4"="0nx5gd5kzbk0r6lammxzwrdxskc76iyi"; "tikzmark-1.8"="5k486ngj472l6mz533nfcgj43zlp1sjl"; "tikzmark.doc-1.8"="0ljfqj9mzqrxy9hz1bjzm0z3i5hk650q"; "tikzmark.source-1.8"="864falsbql4b9wwxyf5g0xm5dwmzydrh"; @@ -4028,6 +4070,8 @@ "sauerj.source-15878"="j1bdzs9ky0ycfh00sdynswv2vfvx7nmh"; "xifthen-1.4.0"="4d6x7yb6hdr4xg2dn572gwpfnykppsph"; "xifthen.doc-1.4.0"="364kifdxmk5ak2flyqcfzjgv0dbsykax"; +"utfsym-0.8.3"="xh468icpjaggal7grvpwsl4maaclihan"; +"utfsym.doc-0.8.3"="glys9xfrh02f7przb9bbcn3k29wa0why"; "venndiagram-1.2"="pxwyrzjwbkkyhfm22v13p2mm5l9s2bqp"; "venndiagram.doc-1.2"="xn6lk2l6vjwjirm9s0vmcsqna9q096zv"; "venndiagram.source-1.2"="aj2hp4pyi0jhirjbsrv8cpajh42q64ai"; @@ -4040,6 +4084,9 @@ "colophon-1.1"="7naibja70d1kb637ydb5jbj3xbgxa4l5"; "colophon.doc-1.1"="m0y1dcw2ymnr8a09a8wzj6vw00ns055g"; "colophon.source-1.1"="xfrkdkkk54q9zbhv9jzwm2bf43czj0na"; +"color-edits-1.1"="p36qzdisyklnxg7qxfpfdqp157sifg8x"; +"color-edits.doc-1.1"="jmlvf1izvr4gaj32mfkgrwv6xmfvgw7q"; +"color-edits.source-1.1"="mlm9y14rzw6a7lpw6bbv62jnh1l8qrzp"; "colordoc-18270"="sb31vsh0mzzd16vrf3gpvs9c50zcjbgx"; "colordoc.doc-18270"="2sw71l3579qkh4z3hqirvv0y3d79sssh"; "colordoc.source-18270"="3p7baf59n87p34sxwdm9lf761dmh8w0b"; @@ -4149,8 +4196,8 @@ "crossreference.source-15878"="pmqnkrcxkwjdsz7pfwmqpjgc2kykv9s6"; "crossreftools-1.0"="ajn6w7b0nk4i3jhppd2ikmkmjj85c12p"; "crossreftools.doc-1.0"="2khdwzgrmdnpidnf8qqhnw31mf208sp0"; -"csquotes-5.2j"="a8ii20nagxkr6657vwz3py2jjbqwa0lg"; -"csquotes.doc-5.2j"="928657z95scss0zv6bz8j8p79q63gz23"; +"csquotes-5.2k"="747dygcnaj9ps48kaqpm1rjm9sxsz1j6"; +"csquotes.doc-5.2k"="mwx9yhc1z0rjlkr356bg89z7jlys75lp"; "css-colors-1.02"="5ybcj58dl55v53z40fvb3mgc8hl93z8x"; "css-colors.doc-1.02"="kyz6mh1pkrjvz4za7x7sgmig7zrrxk8b"; "csvmerge-1.0"="r2srdy1zz8m0dkbpg1gaml9ln23q9rgy"; @@ -4204,6 +4251,9 @@ "xfor-1.05"="x2bs3y606v8f42ds7xp2kmllq0vmrnms"; "xfor.doc-1.05"="lbgdf0qia743jdvlxqf7vm4w1pc77kar"; "xfor.source-1.05"="pafv6fqj0nd5xm0wgmwavkmg97rw7dnm"; +"datax-1.1.1"="mb0p3kqk4c4brqmf42zhkj1kv5y71fmq"; +"datax.doc-1.1.1"="79vryqqph1k46k0429ldinwjdd1lcs9d"; +"datax.source-1.1.1"="3r08b1n40fww69p4yxn9li9bi67iqal3"; "dateiliste-0.6"="s50fmah2lasy1vfkgkybbaynspnh0wb6"; "dateiliste.doc-0.6"="frs8z7x6yf2l78g94dxx0w5nxchx7kdx"; "dateiliste.source-0.6"="idazlpxank1dw1mjym4vcdlq0970i5gy"; @@ -4353,9 +4403,9 @@ "delimtxt-16549"="akp06kcf04g4dx2ph7bs5cg4byld136r"; "delimtxt.doc-16549"="ddxva98pp4ar0bxdlpbh6v2rxlai5d1n"; "delimtxt.source-16549"="j788dpwxgryml7ny68nzab9c3dy0322z"; -"denisbdoc-0.9"="blzw94fnv6kr25yvf7r637wwkxdkkl24"; -"denisbdoc.doc-0.9"="sk4wdmr6zv8czg80zwzhb9b9zr86960p"; -"denisbdoc.source-0.9"="vln9nx7s68vdr55mc1j9ahrsrxdh9m1p"; +"denisbdoc-0.9.1"="5xkpr9mh5607qp6vvx2a5xnw35xn07h5"; +"denisbdoc.doc-0.9.1"="8xqm0s7gp4znh4b7c0c9xgs23nwj899y"; +"denisbdoc.source-0.9.1"="bkr6b5hiymlmpm2brdy2vdjjzz48kc4p"; "diabetes-logbook-54810"="x5s8rl10s8fg10xwa8s972zay7ximns5"; "diabetes-logbook.doc-54810"="kcpszp5n9np9v31iha2yhz31h5b5snnx"; "diagbox-2.4"="2d44gh8w38gdb44amp3c5vj4calw00bh"; @@ -4427,18 +4477,18 @@ "draftcopy.source-2.16"="b6319hjnccfx3xxfrxz1kmx9813aik0a"; "draftfigure-0.2"="w154bzgm94wzqs4shyi3vir6vzfd7324"; "draftfigure.doc-0.2"="n3cvgb3mn0a0asrk5wng4f5pnr36k337"; -"draftwatermark-2.2"="2rrmq8jllyx6w1kiz8xynz3rqvalnmrk"; -"draftwatermark.doc-2.2"="apbh042x5qis6y4hp5rglh04vrz62afc"; -"draftwatermark.source-2.2"="9icchlivyradf2n8zzzys45jkqd4ax9n"; -"dtk-2.08g"="4v50smdv44x4fp57sjdjk4sl0jd8hmnc"; -"dtk.doc-2.08g"="3gr8dvcl3553c4i8z04666lscw69llyr"; +"draftwatermark-3.0"="3rnp6myad4ij6ikq9wwfdknjkxyqd04g"; +"draftwatermark.doc-3.0"="df3zzpkq6ixspdzpql1zmif2y78k5glf"; +"draftwatermark.source-3.0"="b7ngzwvmc8g8w3hc6ymk8r8h6kn1a4x5"; +"dtk-2.08h"="x0hk8li42r2m26kmmn5fz5kxjy4xi09c"; +"dtk.doc-2.08h"="6yxf7x6a5d8r7dnwipcxa87w2sgs8xz9"; "dtxdescribe-1.02"="2bhwnkb5id2raigd4iywhf7da7c772zr"; "dtxdescribe.doc-1.02"="2ygyzgrllyq4fa2xbf8fyrfk810w2ja9"; "dtxdescribe.source-1.02"="39inl1ksgzd28sszdfjyyq80gscdc6xs"; "dtxgallery.doc-1"="bpsakwyq6ihcw2ziqpjv8qh2a90s5mw9"; -"ducksay-2.5"="dyhjn1zfasgd7yzx1shbxcswj1zqz9md"; -"ducksay.doc-2.5"="8j27sx7khqa6jas9hnxvvm7hawvafiaz"; -"ducksay.source-2.5"="nd5z7dlyn7svr6msmc6hxhydnrrjv2r5"; +"ducksay-2.5a"="sg9xk4jc4ngsan1f0806w9ph5372qihk"; +"ducksay.doc-2.5a"="khw153wkf91llm5n87wkq5wqr3mgazy6"; +"ducksay.source-2.5a"="xsyz67f6rm0561r1lc128xn8091vxyva"; "duckuments-0.5"="vdc247rsaliycjf37gn8lwihycrpgksp"; "duckuments.doc-0.5"="7ia6rdsdhhnvf2jdxynz780virwl48p7"; "duckuments.source-0.5"="ndcajqs2y2vmk0fzd25ayc4i9yq03qz2"; @@ -4458,6 +4508,15 @@ "easyfig-1.2a"="l6pbmvwsjjnrpxl6d9v6askvk0fvqpyn"; "easyfig.doc-1.2a"="glg4115m5lkacjxdq29my9a01xn5mj13"; "easyfig.source-1.2a"="szidzjjq2h8aiqh995xcd37460xx5lbz"; +"easyfloats-1.0.0"="v2v3sm7d9dga3kpmr43jvi8p5s3xlbiw"; +"easyfloats.doc-1.0.0"="s385w8a59a9xncvv6rqclbiac11bsksk"; +"easyfloats.source-1.0.0"="08b3pa30hllhxb884hgmpby1zkz1n7bj"; +"environ-0.3"="abj66v6h73l8sj7rll1v0czlx99j5z8k"; +"environ.doc-0.3"="rq5cywlfalfd6c2585ihs8mabnadp2n0"; +"environ.source-0.3"="r3bq7ppaqwidvilrf1hyniqfk1fdh4d8"; +"trimspaces-1.1"="cbpq1iybp4vqb3mrbi457gfrfiy4mx5r"; +"trimspaces.doc-1.1"="b2phanji8899yl7ihwrshdqixkmir62q"; +"trimspaces.source-1.1"="07ckjn7k7rwmvr2wji8y72rs9q3nwm0g"; "easyformat-1.4.0"="x6ad1pxvbj09q2kypdg6z5js8q11a7k4"; "easyformat.doc-1.4.0"="1g0wbnrc4snik4hbzldn9c015ry80n50"; "easylist-1.3"="3mri8pvv7jc5lkqkmzh8h5a4x8agh702"; @@ -4545,8 +4604,8 @@ "engrec-1.1"="8wc4zbqvp2lgs3qgvhks8fhy0gcafddy"; "engrec.doc-1.1"="3rvil27vakyv0c56wykmhb499a3xfbjk"; "engrec.source-1.1"="3rj7ij1f8rvyb80iaxx0fw8br06w8kgp"; -"enotez-0.10b"="14hjscgb5k0pr21jg2bz75k7ys1ycgzz"; -"enotez.doc-0.10b"="x60vbpi6c6n6b0v3gmbq2sa3h6cml1sh"; +"enotez-0.10c"="qgbri1hhaq4yh7mnxcdwky11rww0ab6y"; +"enotez.doc-0.10c"="nmqm91i52qry6rm0rzlzqjxl18wmfpaj"; "enumitem-3.9"="cddx7nd076jvg59bdkqaxnmk4rdlg94a"; "enumitem.doc-3.9"="nraf0fvdrdn61w2dxiaqcd6xzlywq9pc"; "enumitem-zref-1.8"="hj60650qiwzxhdk9f9pix1wgvphgqxj4"; @@ -4554,9 +4613,6 @@ "enumitem-zref.source-1.8"="3l875sm2v3c2frxhr17rv80q36n19a9h"; "envbig-15878"="9jl4id16g9bmsqwwdbcdp2925m5c381k"; "envbig.doc-15878"="5302z09wsidh1fvnfs5d7zf3fzd9z967"; -"environ-0.3"="abj66v6h73l8sj7rll1v0czlx99j5z8k"; -"environ.doc-0.3"="rq5cywlfalfd6c2585ihs8mabnadp2n0"; -"environ.source-0.3"="r3bq7ppaqwidvilrf1hyniqfk1fdh4d8"; "envlab-1.2"="iqf24bqqcnpp7kiysfb5dy4ksw2ni0pn"; "envlab.doc-1.2"="5xscix7j6x6fbscw6hk22r4qz864y654"; "envlab.source-1.2"="ndl09cfzl24rbp7rw71lcv2q6dn9pdih"; @@ -4612,13 +4668,13 @@ "eukdate.source-1.04"="scjqaadvah0kf1rxj9r2nphvffk86cis"; "eulerpx-0.2.1"="1kvqcqfjh77lg1d1jzwj6mr2rchjpnyb"; "eulerpx.doc-0.2.1"="8jybcgzjn8c3qyagdmaxmmy0fx89sj93"; -"europasscv-49703"="l85dmsidqdd33pivkp8q5bl50mxynhhd"; -"europasscv.doc-49703"="vm9plycg2pppcnqv2mzhnxf09adzr2ff"; +"europasscv-56829"="5sjzgabngp49v4ghn8sv6dahbnnka7sd"; +"europasscv.doc-56829"="8racsqj1y0rr6r8x9hb0khb4k2g4dgw7"; "europecv-54080"="fmf2rbqmvglyydrw34ksz35dg3ya7v36"; "europecv.doc-54080"="3pwjj21avp8rw3sfr8hr1gnz2blb4fzh"; -"everypage-1.1"="ds2s326xkr4qvzz1pd3ln8j6841pgndq"; -"everypage.doc-1.1"="8d3v8gk3mmw9vyk9slxwwf8gshq4pcd2"; -"everypage.source-1.1"="v920b95jn03slad6q3w3fr97ricjvd3f"; +"everypage-2.0b"="az5nzriphfs7imw4zi1g7m02qy14d0j7"; +"everypage.doc-2.0b"="fvd7wnl16rgkkkl95z24k7057np0jh54"; +"everypage.source-2.0b"="6q8da7fiji3x0wli9dncncg2kgx4wwkj"; "exam-2.603"="c9bgf04s696pqwzvf69w42xqay2wzjjn"; "exam.doc-2.603"="n4ly7a6sc6vk3n1lc87rs9gqj4yyz5sq"; "exam-n-1.1.4"="nhyripks5spkljgi7js9mva03lgam717"; @@ -4672,9 +4728,9 @@ "facsimile-1.0"="mhx5jbh4rwv10z6hd3b2w5haj02bjz0y"; "facsimile.doc-1.0"="pb8sj68gxph376h1ph6yb65ncyblxbdw"; "facsimile.source-1.0"="dvjli6r3pr4w74n9mnm2ix30jva6yysc"; -"factura-3.73"="f9drhb4ndhzxfxjxcbj2i4b9brpx3691"; -"factura.doc-3.73"="pb4c019asn8hv1sld6psji01azkc89m1"; -"factura.source-3.73"="zqhhmhapy179pjgpc9g40xsgqgi365xh"; +"factura-4.00"="3rn2gc3d7861614g9p38jkj4zdkaga1g"; +"factura.doc-4.00"="i9l8lg739x2y4cq91hq4x7smy3m64cjh"; +"factura.source-4.00"="0a47dflwg4xq6vswm89jyvb2ms0316jl"; "fancyhandout-46411"="d1l30rd3z334px9zyw74l4x5vjyki6zi"; "fancyhandout.doc-46411"="y4vl6xw99i4q8j9nr369isqzs9vl39z1"; "fancylabel-1.1"="fvnw8s5y8rr4sfpff9ay2y1yqqgrwysk"; @@ -4707,9 +4763,9 @@ "fewerfloatpages.source-1.0a"="88x4v7p9yc5skms1zms5j3cx06lay8gm"; "ffslides-38895"="v88vqphgndyc8bznnkpc17pcgc4f429f"; "ffslides.doc-38895"="1378bj25gqxr8mhdwf99rw2q61kbakqd"; -"fgruler-1.0"="z5k7w4nncv381nbznr8c7bwq0a9k9l5m"; -"fgruler.doc-1.0"="rm6g865195d2lm97v9pbaim7jrgsnjyz"; -"fgruler.source-1.0"="67chz0f0pjn70xrxzmw7jvzgskjl9vlv"; +"fgruler-1.3"="8cb0sximw14vln08pdri479bgqz072na"; +"fgruler.doc-1.3"="qzp1jn7pxsx90zszck96412hv7g2bbhy"; +"fgruler.source-1.3"="salx2na2qh9srcyzy4pxm95hzmby9vcx"; "fibeamer-1.1.8"="9vdqi8fyrg6ixnia4qh18dyzbg1y0pdd"; "fibeamer.doc-1.1.8"="blp94av9rfbpawsvgrlwq5p2ycgwz3bm"; "fibeamer.source-1.1.8"="6s017bq2ca3g3ml50br5dwn14i9q3986"; @@ -4769,9 +4825,9 @@ "flashmovie.doc-0.4"="n1iz704bdaxj2k26m4125h6aqna0g25i"; "flipbook-0.2"="6mlbadxnf64k383jr2b2phh2ybkk1m81"; "flipbook.doc-0.2"="j9a1rvi85n2hmhr7233zzz9a5qylb6pl"; -"flippdf-1.0"="g4pw7i38h9ypal2wkqfvchwbr9wn6v5r"; -"flippdf.doc-1.0"="s9xvjdfjxxz1dag35lcbw8dznlx43305"; -"flippdf.source-1.0"="vqjf15dsa1nvx8cw0qbam1zvr2qr171y"; +"flippdf-2.0b"="pff26pmbw5sgmgdm20schik2fvx2qch6"; +"flippdf.doc-2.0b"="kpkjnx6iwwjdg62s7nn0sz1kn6ph23ma"; +"flippdf.source-2.0b"="50zpnpjcak8bcaq09q49d5wai1pwrsng"; "floatflt-1.31"="ppv98lki1x3s6xklksd69n5cr8vrd6pd"; "floatflt.doc-1.31"="7n9r2sl31qx9jnw802mhykidjldhx4hl"; "floatflt.source-1.31"="byz5ymxby208lx8am35lz229dibcn4ic"; @@ -4806,11 +4862,11 @@ "foilhtml-1.2"="78dmna552hnh9i11v9zgg6l68hmla7bc"; "foilhtml.doc-1.2"="a2bsh99xh1lfpssggzxhiz9ipwz6bijd"; "foilhtml.source-1.2"="lrjc6lj49c8knfh4bh9jx7vzpddxsh71"; -"fontsetup-1.007"="d4n2r53a8r9adw18bg479rbks021wf05"; -"fontsetup.doc-1.007"="1cjkfjqgzdmlqksq2lyflkz53hxjs9vm"; -"fontsize-0.2"="jk625dm838g7qj0y9r9llhsgb8y3rpsx"; -"fontsize.doc-0.2"="lj2lj6pdvgainc1bgj5p4j86w3mkf4za"; -"fontsize.source-0.2"="7jrjdh5lz8shcxv7jabxv35dh7gh04wh"; +"fontsetup-1.008"="8q2flj4bhrf002570vkfwyr00ivk340v"; +"fontsetup.doc-1.008"="pxrdnyhswrrxl27m9g1qz1h3h9m1qzx5"; +"fontsize-0.3"="pjqhk41c1vlysrpsy20mcf3vxf2z7726"; +"fontsize.doc-0.3"="ni55dvgwpxrja1zc94far9rjfxdikz4h"; +"fontsize.source-0.3"="28xaccan906af8i28w2wz8rwvjjlmzkn"; "fonttable-1.6c"="bljjiigal2igv0y004hwa9i1yc9i4b3d"; "fonttable.doc-1.6c"="jssz79rldva4rmrziamjqi1krl4yijan"; "fonttable.source-1.6c"="h3g6s458yvqsrlf0h7d8046ngi10698y"; @@ -4856,6 +4912,9 @@ "frankenstein.source-15878"="zc3nzdkbjrfgv241wj4xxlq6042xv9nb"; "frege-1.3"="vczq96wx0icl69c5xqcqmfsy2wdw1ncn"; "frege.doc-1.3"="h07nnplqxq2fyh6f0wh03jpism89ji0d"; +"froufrou-1.2"="7v7g5xw3q550wyg4ls80fflyl1lcx6q3"; +"froufrou.doc-1.2"="1vmkmq9nbgn6786zj027zlmy9lxx008h"; +"froufrou.source-1.2"="9n2ns02cqqkharia3bj3lk9pdkv5i74a"; "ftcap-1.4"="7srhgl4z3zpicxv7aakm970xy2yxnpns"; "ftcap.doc-1.4"="1y7r73w8r779pdchcgwmlvcd2sq8hyfj"; "ftnxtra-0.1"="8iicyf847h3xf4jvn1y8nzyjk3dw7jng"; @@ -4919,8 +4978,8 @@ "gitinfo2.doc-2.0.7"="l2rsxd08m2y44wg53q2adl7d084r14cf"; "gitlog-0.0.beta"="q64k3v3pwcvg8abw382rijglrgllfvwx"; "gitlog.doc-0.0.beta"="29ysf5jz8cvwanmhad4ka66jcwxn9a1i"; -"gitver-1.1"="h8a7jyl9vdz7va6ia9ncyal0himdc1ba"; -"gitver.doc-1.1"="v0w2s16f0xqrgfcj0zsrwbrk5788bncb"; +"gitver-1.3"="g29l771yh6kcwqmb719ilba7d4d2pk84"; +"gitver.doc-1.3"="yljhjx0nrp3vvh55i3zaswl5mwzdil5s"; "globalvals-1.1"="cjs44i0mivi683bifs5icf9nk3jr7v8k"; "globalvals.doc-1.1"="2pdq5ik88cr3z5x9j5jvqz1k6abkllm4"; "gloss-1.5.2"="xacfn3b2z30pnj9lwh6mximrbsfvarfs"; @@ -4996,12 +5055,15 @@ "graphbox-1.1"="x0ckk1yx2f9ks1g70g32f4a683rpf4nx"; "graphbox.doc-1.1"="b4m3rss283l9gfk0vc0apg05biifhpfj"; "graphbox.source-1.1"="p7vnvaxz5a2grh651f3gld07pj7lcxp9"; -"graphicx-psmin-1.1"="bp0jkvi4zbl88zpfh6zfvmqw9nw56akc"; -"graphicx-psmin.doc-1.1"="rrh6zwqmg0d4qz2r0wa97p0ql3xp982j"; -"graphicx-psmin.source-1.1"="nx2ga2h4xz7qsczgnh3d0y9bjrl2dka5"; +"graphicx-psmin-1.2"="j5n5gycsp7vqnqgqsx5p47hg27yj16s6"; +"graphicx-psmin.doc-1.2"="my9qg42ilqhfzwcirmsmf8mjj1ck0j8h"; +"graphicx-psmin.source-1.2"="hxdpbsrnh9zd9aqg3l6vxbqy4iz8nw3y"; "graphicxbox-1.0"="6grrmcmr2wlpx8dbj1k1nggs2b6z7qh4"; "graphicxbox.doc-1.0"="2blrwzsralqjrvlx6xjvyaqvsi764nmx"; "graphicxbox.source-1.0"="1vl41sp02d8byjrapj58v5pg6i2g989l"; +"graphpaper-1.0"="rgmcqd72bykipk8py9rpwffxjag3ci9b"; +"graphpaper.doc-1.0"="ca0qq1zsjfnx1c9ma42lw4iik0j19yqg"; +"graphpaper.source-1.0"="7w9rbx215ssxjv6291qazx61p9csz735"; "grayhints-49052"="g0g3914m4qsplnykwnbfy3ik6svxbifq"; "grayhints.doc-49052"="gayl01rd21rc9i5x6xnd376wm907qlz5"; "grayhints.source-49052"="jimxcmdqgjndw6dqmwzb0ry84lwr59cy"; @@ -5080,9 +5142,9 @@ "hyperbar.source-0.1"="iydbmx9cvsd986n970lvc3k6m28ix2rk"; "hypernat-1.0b"="25v0a423yhy68vf125ys0n6p0qhvr088"; "hypernat.doc-1.0b"="0n4qzpmvhks66d0g9gnyizpl44jbh4pf"; -"hyperxmp-5.6"="m6vqa9njh29d2qfz08zrkginll6z4ba3"; -"hyperxmp.doc-5.6"="hzmi4n5x1qwq2lqk8pg2fp2rzvp2pgip"; -"hyperxmp.source-5.6"="29ay8dqq1l59ibq1lh87mrk9y527wjg8"; +"hyperxmp-5.9"="9h79wa3bsc5p7ch7a42idsjdmskyzqgy"; +"hyperxmp.doc-5.9"="7hmrn0hhsi4s5p216hvrgdm3v7imc9j8"; +"hyperxmp.source-5.9"="20fwjc1fhgrfq70ihcqg2sms40jq5046"; "hyphenat-2.3c"="wr2lhsafb13b0zira7190bx5s68fak45"; "hyphenat.doc-2.3c"="z1sj3r1ny1lgixr2fcmsglz55b23f5lm"; "hyphenat.source-2.3c"="x70g8xiz9ss4pw775lz82yncq0x7lxf1"; @@ -5179,8 +5241,8 @@ "iwhdp.doc-0.50"="wphgycl74db9mxr5gjc2m80rbzkcqk3l"; "jlabels-24858"="fw5il0bzwm10lj1ly8fjic2hjiqxnr7d"; "jlabels.doc-24858"="fndgg419y1rp47d5qifv0k304b5iymab"; -"jslectureplanner-1.11"="vzd0f1283s5cqn024r0p9x8kfc8sm8ri"; -"jslectureplanner.doc-1.11"="zzcnik63rxszh5plgvg004w5q6h7d0yi"; +"jslectureplanner-1.12"="1g82c7aw484p3iqy1c9yw8d39g26q04r"; +"jslectureplanner.doc-1.12"="lx9m14da0gm8nlp6p6cx84ib5fxqi040"; "jumplines-0.2"="acxl8nhlznvcwq20n01b41kamc5xmqdr"; "jumplines.doc-0.2"="hjfl57a9hwdyf6lxl6ah0k7937r03jil"; "jvlisting-0.7"="fi23ykvl6kw34qri5nz2k4mvgjqgbbyl"; @@ -5251,18 +5313,18 @@ "lastpage-1.2m"="i37ji3jp95j287rx34q4yajih7w1riy4"; "lastpage.doc-1.2m"="jc40pwdbysv03k1wx113f2q0j8xf54dr"; "lastpage.source-1.2m"="gika2qk64lahh4l6c6pn76r5l57rspf8"; -"latex-amsmath-dev-2020-10-01_pre-release_2"="9gxzfnx8figpi65w0fa40351g8rpv3m9"; -"latex-amsmath-dev.doc-2020-10-01_pre-release_2"="r92dc282pwfkf8kxayrxr3gzl9pibl1y"; -"latex-amsmath-dev.source-2020-10-01_pre-release_2"="lchxam34sm7r2kg2yy56001ig922kbq0"; -"latex-bin-dev.doc-56548"="qk6kfk6nham1q8xfvzd6jvk9iaxqlnm7"; -"latex-graphics-dev-2020-10-01_pre-release_4"="qvr5rcvddfgbsx4f2sxw8p0hc4ik7gv2"; -"latex-graphics-dev.doc-2020-10-01_pre-release_4"="kql79zdphnrgxd6z1wwk49nnk1x73ka3"; -"latex-graphics-dev.source-2020-10-01_pre-release_4"="kym0hbfd9zjnk8xrd2xyy71waysyfs1y"; +"latex-amsmath-dev-2021-05-01_pre-release_0"="p6q4apm28gg02j85lhh3dp8ppwdc3sv3"; +"latex-amsmath-dev.doc-2021-05-01_pre-release_0"="81mlxa3lyggmff4zi0wb7lbhjlswhj07"; +"latex-amsmath-dev.source-2021-05-01_pre-release_0"="03r21wxncnrhm3jswd48x3mqva1caswg"; +"latex-bin-dev.doc-57186"="qk6kfk6nham1q8xfvzd6jvk9iaxqlnm7"; +"latex-graphics-dev-2021-05-01_pre-release_0"="qvr5rcvddfgbsx4f2sxw8p0hc4ik7gv2"; +"latex-graphics-dev.doc-2021-05-01_pre-release_0"="m70dchwqxmhnd46jb2czvlgb1z9xqvx9"; +"latex-graphics-dev.source-2021-05-01_pre-release_0"="kym0hbfd9zjnk8xrd2xyy71waysyfs1y"; "latex-tds.doc-55777"="m38f5gncr9c56sg2cjs0mfgd57wik7pd"; "latex-tds.source-55777"="xdigsidx76bs121jl0m42wavzf4y88qj"; -"latex-tools-dev-2020-10-01_pre-release_5"="hbrzqrai0j91n9jvv1ss8rrpqj0ykv9p"; -"latex-tools-dev.doc-2020-10-01_pre-release_5"="74nvwdl18m0wwplqv908r2wzfg33mgsh"; -"latex-tools-dev.source-2020-10-01_pre-release_5"="b8xgi581bvh5iyj6m1vwy1gigbhgcqr3"; +"latex-tools-dev-2021-05-01_pre-release_0"="hbrzqrai0j91n9jvv1ss8rrpqj0ykv9p"; +"latex-tools-dev.doc-2021-05-01_pre-release_0"="8gp9dhjm7dvymh58xqf3mp6gpva7aiq2"; +"latex-tools-dev.source-2021-05-01_pre-release_0"="b8xgi581bvh5iyj6m1vwy1gigbhgcqr3"; "latex-uni8-0.03"="kh4gfpkynq6f2aqg9r3wfp4b75wd3zaz"; "latex-uni8.doc-0.03"="qany361f2byfy4p1jsbwr4za45x5j74a"; "latexcolors-0.1a"="0izwkzw8h2rqlgnl9dsn2zwm0z2wczch"; @@ -5291,9 +5353,9 @@ "leading-0.3"="m10kyvg2pjysh33gajn8a8hisfc74ii1"; "leading.doc-0.3"="5bc58zdia3qp0742p1hwmxaw13qdgnxw"; "leading.source-0.3"="ks8sv07mg6n12g60aj3s33siha865chp"; -"leaflet-1.1b"="jaqjjxvh2wb6bg7c608cn6rg9d67pkv4"; -"leaflet.doc-1.1b"="5vgkqz1bw0qlxzz5fczsqf873dqsq50g"; -"leaflet.source-1.1b"="l8g4n75f5d85dj4mfwbrc19bh87jzr81"; +"leaflet-2.1a"="zlw7vvglq35pqcgydpzi70lw5p2k3bik"; +"leaflet.doc-2.1a"="jizzawdg24dcb08c1q0k8pffkrfql9gc"; +"leaflet.source-2.1a"="70m92az0j37y5yk5ci4z6ni4vlr8xxmz"; "lectures-1.0.5"="vxrkqjn0y0lqgxp2c2ms8xxwhv8y7dmw"; "lectures.doc-1.0.5"="93h48qv5h0c9g3v4ga95d3cmcml595qr"; "leftidx-15878"="d2q1jibnbyjk72phsf6yj7nxj9l37fvh"; @@ -5515,9 +5577,9 @@ "menucard-0.1"="7k5mxiwycgzqq8ais9d99ss9dhir44x6"; "menucard.doc-0.1"="lv3amrvqjpl36rc3wmrf6yg8dw9w7lw8"; "menucard.source-0.1"="p3sy5yj4gljpasmsyjbi8ndlnjvm69jl"; -"menukeys-1.5"="4paqhdrsa9n9vnlcih3lwbs7ig1cvpxb"; -"menukeys.doc-1.5"="vqip96fgdq26ypfs2xpp947qmjybxpxm"; -"menukeys.source-1.5"="g0i476r5ajhpj65sq4m3h92c236plbkw"; +"menukeys-1.6.1"="wxn5c57h8z5aj5q2d6v5kv9fbk902g1w"; +"menukeys.doc-1.6.1"="8ijrwc0zfhv0cwvy3vk6cqlbd0yxwcmg"; +"menukeys.source-1.6.1"="1gm1gpzj7lply9qfyf00aralircg6gw0"; "metalogox-1.00"="4xl37x2ng2chj7ds59rjkapvmk3fza5q"; "metalogox.doc-1.00"="wk7qd75laf3wm5wqil70vsrcg1ch6q4n"; "metalogox.source-1.00"="8yal3yny31s95vd72p10mybmkx7n11xy"; @@ -5596,9 +5658,9 @@ "monofill-0.2"="jnv36mj3w2vihnq2f17pbm1yzrz2176w"; "monofill.doc-0.2"="gr0mhc8f2w3dnd9r6flqvq5yyb388h4p"; "monofill.source-0.2"="gmdpp4qn9x5bxk24afqs4xg7vzvaqkp4"; -"moodle-0.5"="256bfwnph8m38q5y917zfs7fcwzlxijk"; -"moodle.doc-0.5"="574wp6sh5cnn4r3nggvpk1xv06fi2haw"; -"moodle.source-0.5"="y0njw4q1m03x2wd83d64ph0i3vha42rm"; +"moodle-0.8"="5dxhd75b7rmbxxyrac9rqf28ci03zmr0"; +"moodle.doc-0.8"="73gdm8jzgrawb3apg8y9aklhq2iy94qg"; +"moodle.source-0.8"="8n3ilwn62icss1vimbdsj277zslzbyav"; "moreenum-1.03"="q6a3sxik7whl9zif8j5bs1bgxcp611rr"; "moreenum.doc-1.03"="f0vzqhha6bbsvwnsgq3ng5v4qg3vkbgr"; "morefloats-1.0h"="dzx390854qkxvhcas8krahqfg2pkg93y"; @@ -5660,9 +5722,9 @@ "multilang-0.9b"="56lbpndclbci7ihkidrjqg1i1rb5d540"; "multilang.doc-0.9b"="k2fcrbwx48nwwmwjb5sln2xfyv7ac03p"; "multilang.source-0.9b"="26rcwx14xbk0zfwazm40ab76pkv6b1g1"; -"multirow-2.5"="cchqv2b096x37wbngyp264mm97vs78fh"; -"multirow.doc-2.5"="47q33df5nzraljqx9wrrrp8mrn5b417a"; -"multirow.source-2.5"="qq1b7khcjkxzvxr38hazkkl84wn3kw0k"; +"multirow-2.6"="5llkv1gjmgjvz5hp7z6fqrjg5361i9zz"; +"multirow.doc-2.6"="yfn07prmlv66qbn0h5ai5k6qm738bx6l"; +"multirow.source-2.6"="8rd6n2jjywr04idrrlkbmis0hdyd31im"; "mversion-1.0.1"="7vpmmb88cjk92m2a2hz10cijkxf44bmy"; "mversion.doc-1.0.1"="a2fx7phvl0i1nyhb5h0w6ld1n9kvcgcv"; "mversion.source-1.0.1"="zhbd3j6kxsdyznx9haqqh4vk7b8nrl09"; @@ -5672,15 +5734,17 @@ "mycv-1.5.6"="am1khnlv1w5w9732q2azpsjqjp7xd96b"; "mycv.doc-1.5.6"="gd3fqxrg0y28fw4093g50a9fl5qpb0l8"; "mycv.source-1.5.6"="9jvb2232smja8fb39hlxnh813vlvs47v"; +"mylatex-56751"="yv3rfndf7x4cd2a9gx5fsg82v3gm0qy5"; +"mylatex.doc-56751"="sar6czcxp6cksy74rjnjxdycwwxlhgnf"; "mylatexformat-3.4"="j9yz4p89ln68ra05iyl46vnsia9c2m83"; "mylatexformat.doc-3.4"="jv51r001b567qdpj04srhpinqza2cbrx"; "mylatexformat.source-3.4"="27n04f9m812jsgwpr47sk2k39anbk264"; "nag-0.7"="zvdfnz7z0rgwmf5vpj3dg7l0p8xwaxl0"; "nag.doc-0.7"="r9gmc719q62qdim96mzw2sm98vwxsdip"; "nag.source-0.7"="rybplddhj3wzplms9knly5b4fpkny05d"; -"nameauth-3.4"="7vf14i5aid38msdp6kxfmpczkbza48qa"; -"nameauth.doc-3.4"="b5hybqfylxwszjll75c651a8k5235kpx"; -"nameauth.source-3.4"="bb0bbr0635mpaiarr54dwmaaavfbk63h"; +"nameauth-3.5"="1m3lsji2ws3hl7lg7jqyvsldkis5q2sq"; +"nameauth.doc-3.5"="vgv2c6p4avikbpm35fn2gjgd088g12gj"; +"nameauth.source-3.5"="k0dpg67xs4gy4ibzvf1bs6c6khdyi7p3"; "namespc-15878"="6f7x6ldx008l8w5ziahgwl42hb5bws4k"; "namespc.doc-15878"="6aqpn007i8s488j4qi8xhbx9zsyvafbs"; "namespc.source-15878"="s5ws2rny22j23bqy5cn2mz23qn91ssfj"; @@ -5708,9 +5772,9 @@ "newvbtm-1.1"="2khz8c8b8a5946h97w2rf2gmp6z8wvh0"; "newvbtm.doc-1.1"="y1rlqvpv8y77ns1a35q6raksa88qqdnd"; "newvbtm.source-1.1"="1ws90wkmj308mz4qa3hham4mxm3lrl5i"; -"newverbs-1.5"="pcyr9wqib6j9rjv7xlrd9g3lk1da1xyf"; -"newverbs.doc-1.5"="1d4icav7dd83b49jl85k7m8vmfja2jgy"; -"newverbs.source-1.5"="dq87niyhap5jl7wgisr0if7qwl1zbxxn"; +"newverbs-1.6"="pcyr9wqib6j9rjv7xlrd9g3lk1da1xyf"; +"newverbs.doc-1.6"="1d4icav7dd83b49jl85k7m8vmfja2jgy"; +"newverbs.source-1.6"="dq87niyhap5jl7wgisr0if7qwl1zbxxn"; "nextpage-1.1a"="b7b41bpr8zk2z6m5il51q9vxb3c8h67j"; "nfssext-cfr-43640"="isp9rw94ck4a9ckl4b5hd8ma3cmlkdwd"; "nfssext-cfr.doc-43640"="si6j8b4314s0gbnjxwymqbzcajclqn2w"; @@ -5737,9 +5801,9 @@ "noitcrul.source-0.2"="b8s8g15qwdsxm7ywvgj9g6307ws3hg0d"; "nolbreaks-1.2"="1603r89wi8sninjv541na8k2islfk4sc"; "nolbreaks.doc-1.2"="g0nm3i09kzxqqcrycrz2cak05d8qlvqs"; -"nomencl-5.4"="s6hixgxx15y1pzn463005vxnarphp3k0"; -"nomencl.doc-5.4"="a3jlrikv7hick6day2ax9lawl0fnz90y"; -"nomencl.source-5.4"="cpyr0wj64q8lh7swsi0saix56980jz4c"; +"nomencl-5.5"="zxky0yrdmhjg6qs5l5l6wi36h3mszdpc"; +"nomencl.doc-5.5"="3rmvqb2q57mzdiydj7ggqnm62a2rhgnw"; +"nomencl.source-5.5"="dkyq9n1wb5cf9k331mfjd3n6hbz7l3rg"; "nomentbl-0.4"="k74vk3a9kl3sbrkmpyav1snh0cd16np9"; "nomentbl.doc-0.4"="k2ggwchfqa253i96whp2lh4s3p8vbysk"; "nomentbl.source-0.4"="al9s24x1ivpw91bbnn9sqrjp3rb5h0ni"; @@ -5779,8 +5843,8 @@ "numprint-1.39"="7fd6ja6vw3c7yg824y30xrqrmrk3qkwx"; "numprint.doc-1.39"="bbfg2cyh8cykgl3zk9c53wk3q3vbb8pn"; "numprint.source-1.39"="cr7xjw77r8h4bcjihxc68iraxd760gh2"; -"numspell-1.2"="xv0c8dxm8yncknrmarqy0nhjcqdaq8fv"; -"numspell.doc-1.2"="b6sfqk9wnbrg0l3p0hwff0nkskw13rcl"; +"numspell-1.4"="y1gvvz28ix791pp51bc2z4403bn9c1c0"; +"numspell.doc-1.4"="85l7d5arf6ss67lhzjj72fldlyz6isc4"; "ocg-p-0.4"="lxy3nprj8j37b2c7aylxzgm17221wscx"; "ocg-p.doc-0.4"="qg16xjfjp36s3jxm1m75ln2nrl1rlama"; "ocgx-0.5"="28p11v602hf9w9q1vynbf8fyhivbawl5"; @@ -5808,6 +5872,9 @@ "optional.doc-2.2b"="jg81vzayz3a2pvlxhvyrx8j3w1sw65xg"; "options-1.0"="5xy1cf8yq8awm7bspjj23nywhbs7ww67"; "options.doc-1.0"="gy13y93wl0im19p5jc011fjnr49afgsp"; +"orcidlink-1.0.2"="32vymxk7x7xrkqjsg7n8gvzjyk7cvihp"; +"orcidlink.doc-1.0.2"="pfsf1niv699xl3z7x218c6qavqbah8ai"; +"orcidlink.source-1.0.2"="320adccg7355p4agrqgsixasnmx43r03"; "outline-18360"="m192v07lmcfzq3zbv87cbckz8jwanbha"; "outline.doc-18360"="wcm9psb6ap1a5xy16fp91bwpxkhqxmh1"; "outliner-0.94"="24bsa0d5zxz2i50i4bz0b3zsc5v7hp8d"; @@ -5856,9 +5923,9 @@ "paracol.source-1.35"="zw0z1fnlqd1h9hgxgc6pqnj99rsbn679"; "parades-40042"="bkr92ffb7s3zzl845jjkj1777517dwk1"; "parades.doc-40042"="sfmlhp1idjhvy6cldh2v2k5bl5lp7s58"; -"paresse-5.0"="586bf4v9x283902iq1rymkil2y30sjgg"; -"paresse.doc-5.0"="vp9b5jpsidh9004ji5yklclfalqvz318"; -"paresse.source-5.0"="a60vw2a7hangmdypia7lvjclcmn1jddm"; +"paresse-5.0.1"="jigr743az2xjrw1qsb15w2hcvi78xjl1"; +"paresse.doc-5.0.1"="r3k4iifg67gm7sxac4l4qzlx94sj5ai1"; +"paresse.source-5.0.1"="9kcjbh6pzglp4h72dxih81xkn0ah7102"; "parnotes-3b"="42sal99phkqbw05k2d9x6by27iy7sc7j"; "parnotes.doc-3b"="3hlfpf75qjahy1qzc8l3dl1n8pj323pm"; "parsa-1.3"="iawcalgm3zpppbclhzn63i33bmnxk47c"; @@ -5885,6 +5952,9 @@ "pax-0.1l"="iqmsy6p191p8bn2bs642zclq3q42n89p"; "pax.doc-0.1l"="cjppdms9xlc6hsj0mk324ndpjqg2px93"; "pax.source-0.1l"="harabcx553nchhf8hh9m3wqwic4l80fc"; +"pbalance-1.0.1"="fa64xh9irys681nlh0gn2fn4qgq2jwbw"; +"pbalance.doc-1.0.1"="75v4ijv45pzqrzwr1cm9bhgbmcw21824"; +"pbalance.source-1.0.1"="mb458ddplvcqcbsz916nxy5crd2i0ach"; "pbox-1.2"="9y4p69w5nskv8j5i8a2pxmhswxz8nc50"; "pbox.doc-1.2"="hjv8mqhlfa9ggqypr7nwzzf03rgm7cry"; "pbox.source-1.2"="pk6hx6w8szi4dbb7irkr0wy3xwjjdpxg"; @@ -5903,13 +5973,13 @@ "pdfcprot.source-1.7a"="95cr49yywd59mcyj7qvqkfc9bhj63hxh"; "pdfmarginpar-0.92"="pra0y1df005b6br3n93zpi7wrvgk2h6d"; "pdfmarginpar.doc-0.92"="0kc0dgfq3mmnwy3xs79gjmxkkmmfl5l4"; -"pdfoverlay-1.1"="y3y3cilmgla5nd49s5vhy8jsyfy79dk0"; -"pdfoverlay.doc-1.1"="0lrr1prxgpwa5zf8xp9ypa6ipw8mjkxk"; -"pdfoverlay.source-1.1"="7zk1x6k04drra2hwdawf9f8948aimr4v"; +"pdfoverlay-1.2"="dpdcfiv148ara2fhm7lbpr2nj4zqdmxh"; +"pdfoverlay.doc-1.2"="f3pkp44zn1lyxrfjnvdz4wz8gzkryhpx"; +"pdfoverlay.source-1.2"="v434d6x8bfcqyv8g2vr6fpgplvrvai80"; "pdfpagediff-1.4"="3nj0fki5pqm0i50fzacdvnnzhhf2b5a5"; "pdfpagediff.doc-1.4"="8h093sqzw62ivh2csz6fhkbbkdg1na2h"; -"pdfpc-0.4.0"="04dacl314awsqrfizil2rfszywb1ixi0"; -"pdfpc.doc-0.4.0"="rw7dp54s8pfj5jikqlhi0ggkzvvp1c2y"; +"pdfpc-0.5.1"="yx5ahzjprl4vdaa6lnk876kx9hrkvjf8"; +"pdfpc.doc-0.5.1"="c1091w97m4m4smds9dyjn8jyjabx6dg3"; "pdfpc-movie-1.0"="la1blfvhk9kwfy2q0sp6x1ybw5c2i7jh"; "pdfpc-movie.doc-1.0"="5qc0gdmlgspl5696zvng96nbhgr0j0m4"; "pdfpc-movie.source-1.0"="2d4v3bwnsws65w57arhbs2j5gvm3w5f4"; @@ -6005,6 +6075,9 @@ "ppr-prv.source-0.13c"="g4r673h9bqfxkh1ih2qp9shhf40cbz95"; "practicalreports-2.0.3"="z0zj7cw6zrywmjxwh1kv9qh4340a8729"; "practicalreports.doc-2.0.3"="qnag6zn4rn2l8gwwrmrm2vminwrz8w4f"; +"prelim2e-2.00"="sbggpshfqbnkx6vxl8gldgswsnf0g7sa"; +"prelim2e.doc-2.00"="hjzx94h91zal4xqpdhvgq03in9pqxzzl"; +"prelim2e.source-2.00"="4979f2wp30xgi311nfvkivlcdkj2h0wb"; "preprint-2011"="z8qdsshgjd3dav562qnyx4vh9gdyga27"; "preprint.doc-2011"="78x9z1vyl7vpcv39nj167bawb4z8fsnf"; "preprint.source-2011"="i09zkvcpvapyf2jj7yhabmyrpxyf0gp0"; @@ -6014,9 +6087,9 @@ "prettyref-3.0"="a75q522ix098qzsnhxg9w12kwp62xgk2"; "prettyref.doc-3.0"="vlnivj6n4wc0cf9l53352ph04wijswv7"; "prettyref.source-3.0"="wm5367872id8pf7v2k6wbbqvbh5ysrv0"; -"preview-12.2"="j0hgpgmxn5cxfq5zs2q5a8915in16zy9"; -"preview.doc-12.2"="bygh3nzzr1v84dqldp6qhjmyqcbpx4r3"; -"preview.source-12.2"="c4pwp5f3x2dzfmbd8dp33ls800rniq5z"; +"preview-12.3"="6nij1k7lml3fwzl8qmwx8515cnsk53pd"; +"preview.doc-12.3"="9rgwn57grqwvw45jdca07k7jcj898aag"; +"preview.source-12.3"="xyak9iszf9hvfyiggz1gvl96ki862cw2"; "printlen-1.1a"="fg8vfmr64nm31r8hycy81iqvqf6l9rim"; "printlen.doc-1.1a"="95icr7kk7bkg56m6sy8g24if35pfhhwv"; "probsoln-3.05"="qxvjb9csxhrh20qfk4xh264q4pvb5ghl"; @@ -6050,8 +6123,8 @@ "pxgreeks-1.0"="hdqmxzcwyd5llq80fakhjvx8whjxs8mr"; "pxgreeks.doc-1.0"="hdm2s76j6vya85lid9lrkzhaj6bkvlda"; "pxgreeks.source-1.0"="1i5jmxhyphz2mdhl742ydrzam336ix5w"; -"pygmentex-0.8"="bnyslpaj6qfdmak1k1bjyrk0jvflvg1l"; -"pygmentex.doc-0.8"="crqmqfjxlpwibbb9s7sp9qkafnk38f8c"; +"pygmentex-0.10"="v0g38cn50ybp08jqycwkj3gfb482mzx2"; +"pygmentex.doc-0.10"="3fsj110x7rzgmwrmv3g70y84g50c848n"; "python-0.21"="a7v60025926j1nf783w765d773zla60r"; "python.doc-0.21"="901hkhiwnx89si1rx242wa3gx2mx5kkg"; "qcm-2.1"="d9xas7ra5n0hzkc22s6ky3qr752i1i2k"; @@ -6067,9 +6140,9 @@ "quicktype.doc-0.1"="ljcdha8k0ngr0ymwqbqbblgyslybvcgp"; "quiz2socrative-1.0"="8wpvm4ysp513gkigsymd0d0sg3708m4r"; "quiz2socrative.doc-1.0"="xpz8wilnlh12lf0dfjvmzcprjd7pmr4k"; -"quotchap-1.2"="f0cxvb4c0gzg40k03y6yjn1lgyjibx0v"; -"quotchap.doc-1.2"="mc84x8s62mhh3s2hvgzpw09i33klh59n"; -"quotchap.source-1.2"="s54vgrf4zzbxbcys17z8497y3wxz58x1"; +"quotchap-1.3"="jn2r0lm9ky6k8y38p60fls6lvfqh8crl"; +"quotchap.doc-1.3"="9qibsdfc8gr5f56wk9lzfyj7si7mlcq0"; +"quotchap.source-1.3"="7h3yh4i3gfd48hzzrf0xj2adjb5hmb9n"; "quoting-0.1c"="jmw5a88k3r137dxxrvznxx9xqwh9yvlw"; "quoting.doc-0.1c"="2a4d2w7b4jshz79hhz57fpq6vzgdvb34"; "quoting.source-0.1c"="g238v3pr075wgknaj82ivn70z6fbf0gp"; @@ -6218,8 +6291,8 @@ "scontents-1.9"="hh97r1s523a6v2ay9b704cqv744iny10"; "scontents.doc-1.9"="34jdskkym5x8vmhwjkbfnvwdvk7x98pv"; "scontents.source-1.9"="jx3mw5l964zggyczpxl8x30g8xcbbg21"; -"scrlttr2copy-0.1d"="jw87bnb7phfp7nmvp4gvbi6nhfwifqph"; -"scrlttr2copy.doc-0.1d"="6pfnhhnjm97ap2zbi5bjj011wqbr2yg4"; +"scrlttr2copy-0.3a"="kgi950bw7jijqn93vzlvrdx9mkrv1sg8"; +"scrlttr2copy.doc-0.3a"="daf3y1bx8187h9270y4c13wrnxac23rj"; "sdaps-1.9.8"="swij4rm5szzjh3pwqi7a2b3jzzmnxkwp"; "sdaps.doc-1.9.8"="a6aif8szw295jihhn782lygi1k6sx1i4"; "sdaps.source-1.9.8"="4h7km9vs0m0va5k8msmjwhxnqcl2lyca"; @@ -6245,8 +6318,8 @@ "selinput-1.6"="f4xcvq61azvc95rvijmiij8mhjq2ams8"; "selinput.doc-1.6"="6pwfj1pn035vm2jb19sz1qjc523zirqm"; "selinput.source-1.6"="hv4gdy52gpza79867li3img657779zq9"; -"semantex-0.461"="b8nv8fpq8x20bkcr1rcl9vylcl10kdjx"; -"semantex.doc-0.461"="9mvjv4sii7ljcp6lxawgw0f6vp2gcqpb"; +"semantex-0.463"="cg41r6nzzax6wpybk98syvhq86g54wl2"; +"semantex.doc-0.463"="3m1h2gc8h9ridydis9v6lnh1zq6cwffv"; "semtex-0.45"="mb7w1wbpfwpjv9dcnzyfacw4p9612n76"; "semtex.doc-0.45"="f0cwzvv4bsfn1jgvbyavr6455w5r684v"; "semantic-2.0"="ky4ggvzl5171nda0329151c9vbaxs7gp"; @@ -6254,6 +6327,9 @@ "semantic.source-2.0"="4fwjw0axn8d3ychsqmmdy6x73ckciv9p"; "semantic-markup-53607"="8x44h8x0qlwz95gh7wmgcq59ldwx59s3"; "semantic-markup.doc-53607"="24d8xyxdibsx9k7jqdcsidpssfbvi7qn"; +"semesterplanner-1.0"="wcqxq4w4shlj7r87jn6ivjwa5nyj8wbm"; +"semesterplanner.doc-1.0"="ndfk7h5nxr18yamb5m0z8d1n5sd05xcj"; +"semesterplanner.source-1.0"="ininzdhnah46n0b5xi78lc3qq8bwy62k"; "semioneside-0.41"="62v5zs95qqi1i0xpm2jmhcx9pa24jymn"; "semioneside.doc-0.41"="2z2azzz07gj105jrarifhx3ldjc9v09a"; "semioneside.source-0.41"="31d1fggm0km56jv6qr5yjv7da6y0ifsv"; @@ -6330,13 +6406,17 @@ "skb-0.52"="4abwsdqy977aj45v4frjhf5p4kqi08aa"; "skb.doc-0.52"="hgwacvlqab84b3nv6rnmd79irl1ilzkn"; "skb.source-0.52"="v3b3ggy38vp9z5b9n802dg0xi22yjpwz"; -"skdoc-1.5c"="v3dwsf3zbh5qpcdav60rjjgjhijvr8br"; -"skdoc.doc-1.5c"="jf85c6whs90zinlbl6q707gmb3d8h7vp"; -"skdoc.source-1.5c"="rbi9j4mgp4aqlgsixgp8ffkh98cbg4rw"; +"skdoc-1.5d"="bg0yb5d0bgmnqy12y2irpxn7zfqhin3l"; +"skdoc.doc-1.5d"="9k842q2wjblz991x81554dqn9lshskd0"; +"skdoc.source-1.5d"="991wi8q2b3fhnzddnr0wwbnwis39mczd"; +"skeldoc-0.1.1"="qn5w3f3lsf30826mfdlykfji2mq8dps6"; +"skeldoc.doc-0.1.1"="sla27imxcw6clyik6g34wwfyia7fipdd"; "skeycommand-0.4"="w3sqnw1xyx8l1qb9h7j8jg8z3f6xsnvi"; "skeycommand.doc-0.4"="y8kcbdpydw0an53vfw75nvs8f5rhp5f9"; "skeyval-1.3"="r39dajvb7hh6437jbq3gly44i22im66z"; "skeyval.doc-1.3"="g9gr3bwzslymzx3a5kja4n4s1n0ns5lm"; +"skills-1.0.0"="yhi1ypj4yqg38rg7zwmh1cr1h9r1cdsk"; +"skills.doc-1.0.0"="xlsk7bhrbn5974wjpxdjsm45iab3hh8q"; "skrapport-0.12k"="3hili1y9sl6x37pixcsz33a0r1aqqvg4"; "skrapport.doc-0.12k"="0w6nri4jmaqv9vi8rpg7wd9b68jk58fd"; "skrapport.source-0.12k"="11fvh9n4pr8xsgg3zwvdxly3z9qrk87v"; @@ -6349,11 +6429,11 @@ "smartref.doc-1.9"="hj0c7i3climwjy64h98ddab5skczf3mh"; "smartunits-1.2"="z3kj39xpdk8pa7bzqdjd6g6qlhwx2vhx"; "smartunits.doc-1.2"="r72h43bvig293769q6s8glhdlrcg9836"; -"snapshot-2.13"="pyg4abki4d4zy828r5spb45fax7b4glb"; -"snapshot.doc-2.13"="xaggw13x7izmkhcfl92ldqnzcz398zzh"; -"snapshot.source-2.13"="7hjbi6p9bxh9a405dzbhjlxmwyafckfm"; -"snotez-0.3"="vwnz8rgz6lkw0dvpq1m8xygq1qwrgn62"; -"snotez.doc-0.3"="8gxvxc7x918mf5b63b7n3wvp99ix5ka8"; +"snapshot-2.14"="6x5ifdy780sy1kps29xh2k833cqlm295"; +"snapshot.doc-2.14"="bb748sr7gilrsw9s7q0bvc14pqj2aypa"; +"snapshot.source-2.14"="d9y194pxkkb90gbigwp9kcc84zy4gbqr"; +"snotez-0.5a"="f4w7klr766ll5gwvib5rwvviqaqap9cy"; +"snotez.doc-0.5a"="9siiyz7x76rh3jrlrrpkr9wgn4ca2b2s"; "soulpos-1.1"="908fbjhq1zkq0p3qg4ihs62zxd18988i"; "soulpos.doc-1.1"="7l3pl7mbjmkpr9fwkrdcyjkhqvw2jfdn"; "soul-2.4"="krkmw15blkx20x947657pddl5kda59il"; @@ -6362,9 +6442,9 @@ "soulutf8-1.2"="90gd4zgr0nsq5ccx27cj32b84rnbk7vf"; "soulutf8.doc-1.2"="0hlg0wmni0qswpm7l3yzga6lc6wl2pkr"; "soulutf8.source-1.2"="pspazx53c9dn73absjhpv43wiycncbgb"; -"spacingtricks-1.2"="84f9wq44xbh1qsy3q6dnihgdfsdrax09"; -"spacingtricks.doc-1.2"="n9f1q4ph131jk4wfw5nk0991667j2403"; -"spacingtricks.source-1.2"="8a4sl2svxhs1wpwy5mz4iylzl701mfb6"; +"spacingtricks-1.3"="lb2y9dmbizq70hihhh4l11z7kghgw1g9"; +"spacingtricks.doc-1.3"="i4kfvvpia2sl2b0nrr3m4s692nn9197y"; +"spacingtricks.source-1.3"="9d74zwmlr5r7g9d2332jmzd2qcpv8xjw"; "spark-otf-0.05"="9siivrc6cbck4p4vg4ly0r1b37h7lw28"; "spark-otf.doc-0.05"="y4v051bqbhwc91ipzdfqc1yqrzd5hg0x"; "sparklines-1.7"="swn54z70rhmbk917dpl37mfr3sx21525"; @@ -6420,12 +6500,12 @@ "storebox.source-1.3a"="6zzmya7fcjajy73i8iys9584bldh18z2"; "storecmd-0.0.2"="k2y4zjx31k7014wpb0kvg3ivm3ssp1kv"; "storecmd.doc-0.0.2"="8iskfkck7dgqj3i0knwhzqfvhmv1pr74"; -"stringstrings-1.23"="3jyx0rjn2y5s3i7mdwgmbfygfqmph5v9"; -"stringstrings.doc-1.23"="iwlccyqlbypigdzw8dmpfif08wq8nv2g"; -"stringstrings.source-1.23"="lfm6lqdy2r3lazymqcca7padzmcvb0a6"; -"sttools-2.0"="hhzhgswnm5a26ivlaskdzmma472vsl11"; -"sttools.doc-2.0"="rdvrvdri5g9pb2pm6m95sibp73a73d9w"; -"sttools.source-2.0"="95j75a9qmcpqi8b8fm2hagdmw3fzcn50"; +"stringstrings-1.24"="wnzqsj6nmivadhqqi5hi646hvp3cbzyh"; +"stringstrings.doc-1.24"="k0gm4v75xs9lzgpgqvks7pxbkr5jvian"; +"stringstrings.source-1.24"="j632ahc5hwr2pjazfyql1lxl4x7znr3b"; +"sttools-2.1"="8286phhm1l1sp2pk8smmrmw3wn30ab9q"; +"sttools.doc-2.1"="mszlb4py9kz4gfsgpr6y4qbbzdayrwsd"; +"sttools.source-2.1"="z8dgrhfjc0qwj7vn0qcs98dw7maysmbp"; "stubs-0.1.1"="5ia769ndpi4pcrbg6cljdbpxsx353qlj"; "stubs.doc-0.1.1"="apc0wxqj03fhbab6nwwh5rvzc6i9la8y"; "studenthandouts-1.0"="3gss3z8gv8fyyj3qygmwmbp1jxs7k7dn"; @@ -6446,9 +6526,9 @@ "subfigure-2.1.5"="rnd1mc9gr078d2vna7vwnhv420mnndch"; "subfigure.doc-2.1.5"="zpsn8d5b6h8s9cwbl4fd9iv6w7hypmc4"; "subfigure.source-2.1.5"="10lv7vivb3hggcyv8hkygjhhly6ixxlf"; -"subfiles-2.0"="zhzqc6hlsb7q827v3blxfdyn8whmisml"; -"subfiles.doc-2.0"="7mq48iicimlhggw3pkr3dp8b3ps952pl"; -"subfiles.source-2.0"="l20v3cnafk2as4iyvg5ci83fivl1990g"; +"subfiles-2.2"="l5p3id4vzmik187fsbx10l9789prfqsy"; +"subfiles.doc-2.2"="4c1bv5yyynn7wq4cy7m58sdnd31498mr"; +"subfiles.source-2.2"="lmgliaxdhrb2wx49fc5p2ws0w5wqanvq"; "subfloat-2.14"="l7d8iz54q7zfi5764jfl8v786wihisw3"; "subfloat.doc-2.14"="rx97nj1mh981n89pby4prni2wfmqisj9"; "subfloat.source-2.14"="3a8hj83wyvwrsfk0v6ibzmz4ahzvbkv7"; @@ -6457,9 +6537,9 @@ "supertabular-4.1g"="2rh3aa8ch5jm9yc4iaj349cd339wabw6"; "supertabular.doc-4.1g"="5n3nyqcxgn9fszv2njl59rgadnbg2n45"; "supertabular.source-4.1g"="vi7q7isd5xw019q888apkp0rdqjzzi76"; -"svg-2.02i"="p48dvxfbd8w95fgmgqcl98mnfkdpmrym"; -"svg.doc-2.02i"="1z476mvi6fhl11mlb0bqifpb23g1a2n6"; -"svg.source-2.02i"="4221dfaf1xaw9rzrj38jb6ac0rsbw0s5"; +"svg-2.02k"="64rbl8z8f2h4y0nald9alxq81dqkriyy"; +"svg.doc-2.02k"="z863fd7lspbpdmzym8bx95csfdjnc6yg"; +"svg.source-2.02k"="6sq41726hirllwfkk0x9h6hl804cdmv2"; "svgcolor-1.0"="ld3wccj2cxdhv0xyz7qmxcvr6saab2s2"; "svgcolor.doc-1.0"="nj7w6bihmr8hmvcykya9nkxlkhmlcw6r"; "svn-43"="hv7xk90h5qb4ilx7f4a6zybijnhba9ic"; @@ -6471,6 +6551,9 @@ "svninfo-0.7.4"="761kpr460h6nfczsf1vakdj9r947in1s"; "svninfo.doc-0.7.4"="qlhr7rj98m7g55kgrms1jjw3wp3k7z4v"; "svninfo.source-0.7.4"="xsf1rs0ar8ris0dh8qbslxwx5i0ci6ck"; +"swfigure-0.9.18"="i8j5r40svsl99znl7dwbz6b6fvk6i0lx"; +"swfigure.doc-0.9.18"="3c383j9lc6751zffvylh0xlqy9irph78"; +"swfigure.source-0.9.18"="2vcw78dyrpyplf5fap9vsv9wmplg4wyj"; "syntax-15878"="1bvja2hjsw8p68202f84sbzcrs0f7d27"; "syntax.doc-15878"="pkf7w0xwcnl7cm74z99bb32v4ycn4wmr"; "syntrace-1.1"="02njfsdqh7ssnjcsnpmzi3iwxz2yfj9f"; @@ -6508,6 +6591,8 @@ "tabu-2.9"="pvg42mixn7f8vvz4ll8a5y927hhzh82s"; "tabu.doc-2.9"="zsybb13fpnbffljq4w7vcpl3nmvg5xk8"; "tabu.source-2.9"="88pnpips4j95nj427mydnjzqa5nmb2f0"; +"varwidth-0.92"="z2p07dqsj6pmdk6wm7snd0bih1s1q2dr"; +"varwidth.doc-0.92"="i4p58c787avqjqn5qqlcd19k8chxpp96"; "tabularborder-1.0a"="cfbcq6f60xjzsdwdcxnf9alsgdwcgi25"; "tabularborder.doc-1.0a"="wgd2b7s6bc3349rbhhafcg9iz3wwky33"; "tabularborder.source-1.0a"="7dchkfap6l9ff49i0xwlpxd04yvh672a"; @@ -6535,8 +6620,8 @@ "tcldoc-2.40"="r9i94qmf78q9j3adkzfly43riv2bzdmr"; "tcldoc.doc-2.40"="fh6a7m41gxn4988pwr90ph25gg26ky40"; "tcldoc.source-2.40"="p007ccff6w6d3nlpsp3q476vg9m4rjq9"; -"tcolorbox-4.41"="vccsv3l6zis6lipj4z2lv2qf14jxbd8m"; -"tcolorbox.doc-4.41"="04ffj3ccvx31hxd0y0gk59ghnqiwkagv"; +"tcolorbox-4.42"="030q9hss3ldncsz2kypwrcvvjj69rhjz"; +"tcolorbox.doc-4.42"="m1grvl7n974qqrnz9y7bsgnmgy052vdm"; "tdclock-2.5"="dzb2gj8y1dv7qm5mn7xfgzdq9aydqjk8"; "tdclock.doc-2.5"="sgdpiwcnkifms1lx7xicl3xj194lfhbg"; "technics-1.0"="cav50vxgp01465wa07bmza4blgsv49wh"; @@ -6667,17 +6752,14 @@ "totpages-2.00"="5lxvigm3prx6djwih6imgxf27d57sw2f"; "totpages.doc-2.00"="9kxxf13pfksp7whw0rkx554qn9dbbbhj"; "totpages.source-2.00"="y4d9lbpab1xlfdd69q2558c5d0ka5mrj"; -"translations-1.8b"="pd0xy1whysmnz3cn0r7dbpm9hshwmws0"; -"translations.doc-1.8b"="q9qlq3kr1hfn9ygw4178n9g5dxz4nxkr"; +"translations-1.9"="5dh6nja370fm0828qasp6fvklwlxxwb4"; +"translations.doc-1.9"="afx08p9lj0r89pg5v2zb5lgwmkpgpdg1"; "transparent-1.4"="dmcm4nfjmkxj8ycc0y7lgzklbfafm5cg"; "transparent.doc-1.4"="w7vkf495ybi15ir7vpdv9n85wlarlfl3"; "transparent.source-1.4"="hxayqrkm3ann09p5ffqq8i7vhn89k86z"; "trfsigns-1.01"="5q6ajydw6n8k0b6rfflyp0bh973n4lqa"; "trfsigns.doc-1.01"="bapnr3mrhxw22p78cg2y7gjbwfqirg7f"; "trfsigns.source-1.01"="mmk5v5g9xidmfki3jnik1m7rmwcp0xf8"; -"trimspaces-1.1"="cbpq1iybp4vqb3mrbi457gfrfiy4mx5r"; -"trimspaces.doc-1.1"="b2phanji8899yl7ihwrshdqixkmir62q"; -"trimspaces.source-1.1"="07ckjn7k7rwmvr2wji8y72rs9q3nwm0g"; "trivfloat-1.3b"="vwnj2bh21crx1dkyhq36g4bxpiyjwany"; "trivfloat.doc-1.3b"="dg12fam23s6510jskihm7hbwvf22p442"; "trivfloat.source-1.3b"="dr1x8k6sx8rzfglz91clqwfyzl202sai"; @@ -6765,12 +6847,10 @@ "varindex.source-2.3"="g260r972d5dicmhzdch9kp77fxxakpqd"; "varsfromjobname-1.0"="hy3mbsrrdd55ky6ilrmqfgc5dsx3kdl8"; "varsfromjobname.doc-1.0"="inwn7n9dn0lym3nfh2szc3vfszhns7vn"; -"varwidth-0.92"="z2p07dqsj6pmdk6wm7snd0bih1s1q2dr"; -"varwidth.doc-0.92"="i4p58c787avqjqn5qqlcd19k8chxpp96"; "vcell-1.0.1"="g4z68vrb7qslxdq1f31nawlpv5cma6za"; "vcell.doc-1.0.1"="vfsfz1lzpcaqbrdcyrpjc99xylk5inss"; -"vdmlisting-1.0"="8kkhifiignvk7ilb9ka1b0bssgc7vv1v"; -"vdmlisting.doc-1.0"="aqw59yhbm5sxfp4kmhy63npmlywh31dq"; +"vdmlisting-1.1"="n25b8bdw43shzlsn97rk4f0x31k0i2ip"; +"vdmlisting.doc-1.1"="rjcgx3yigj8w0085q0cdk8yir2728f2s"; "verbasef-1.1"="i92bhi5drkn26s6lc8kwdm2z5f2qr0y0"; "verbasef.doc-1.1"="qnn12d8793pgj92wfi0254n1kgi96r4x"; "verbatimbox-3.13"="zb6kvwdpd9a4s4d7wcax8j6c43f3dy7d"; @@ -6889,8 +6969,8 @@ "xint.source-1.4b"="nws3kzv8aadv37kyvrh5hjc6halqvflz"; "xkcdcolors-1.0.1"="2g1glnkhcq4709y8hkkn3f6b3a4wh5dl"; "xkcdcolors.doc-1.0.1"="ni52wb9gdcxdwzwdl78988anxhj5ay61"; -"xltabular-0.2d"="xr6zzhbymh3v7z16ixdaacbv7z47cl28"; -"xltabular.doc-0.2d"="76yq255vnakwh7h10dkaczkhfkg5nisz"; +"xltabular-0.2e"="ll0q138s9xm3kapjmcl2iz260xgwiya7"; +"xltabular.doc-0.2e"="1qf8125m1hxzpf98w7jkfymbhcbsv003"; "xmpincl-2.2"="wjg1lw656zbn3h41pxqzwwag9mgrk3h6"; "xmpincl.doc-2.2"="dczhfj7g5h3gf3vg7wncvccn1q3xavqp"; "xmpincl.source-2.2"="0pfma5c8agil5jamikja0qh5fnyd9wn0"; @@ -6919,8 +6999,8 @@ "xtab-2.3f"="zqrxzgk3pn3kw19jm28bvg0lch9lc7sm"; "xtab.doc-2.3f"="pmhfig6nmfimb0didacw2sja2kc1nik7"; "xtab.source-2.3f"="78m8pqm3r7jhxy1p5cvqy7p0clpzwi6q"; -"xurl-0.09"="r9jl4qmmbmybr18x273477yjb5dkfqm5"; -"xurl.doc-0.09"="pzg8fxxawhrhp4n0svxkwg221j817f4m"; +"xurl-0.09a"="2h8qp6r2i4rdd6f7lq34g40w2wfbhwv3"; +"xurl.doc-0.09a"="mnwhvjinhwwxxxcqyydpnnb9lz887q56"; "xwatermark-1.5.2d"="5c0z0yvlrs562482lkz70w6n7i80mkqi"; "xwatermark.doc-1.5.2d"="1ixadba47dckfx4r1hhzfd8q1wivygpj"; "xytree-1.5"="2kq4h083zj1zi2zvrhsnqz5wjyl0dkxf"; @@ -6948,9 +7028,9 @@ "zed-csp.doc-17258"="5p8s701yk431qyngw010qws6b9shx588"; "ziffer-2.1"="jv9y39n2mj1csaixb3pdfp0qggc16b04"; "ziffer.doc-2.1"="3ys31swbmm03zmnlvfm155aii3nrd2sm"; -"zref-2.31"="8m0k34dxidh1r4803ff6rnbjb5al80sl"; -"zref.doc-2.31"="6dyiph2mr5d1v7glk8dsi0yzil6hw883"; -"zref.source-2.31"="61h6655gkdcjpfiz9k7xb81wadzc2lbd"; +"zref-2.32"="17gs2db0nrwc4hvrh5ha3lpvbnvzaxic"; +"zref.doc-2.32"="krs6a5w6n269rbr6qipmbhma2nbcirkv"; +"zref.source-2.32"="jgjibzgh4bzhxwdic53f8iw2f9f9400v"; "zwgetfdate-15878"="ibagqadgb3nbq8y72lzhrbamv5xcipk1"; "zwgetfdate.doc-15878"="idw9limrda31c7h0xd3j6v23xqbd2nn3"; "zwpagelayout-1.4d"="h3kdf67z95ghbzw3fjm7rq9jra2qwnkg"; @@ -6965,9 +7045,11 @@ "bezierplot.doc-1.4"="crzlgln3g39kmqdba5dffqdx3p9fffzh"; "checkcites-2.4"="2vzqckrpid1lxi5awbc3s1179j0yw9rm"; "checkcites.doc-2.4"="5dfipwxsrf3jn446z9ar0caa8bsmw4al"; -"chickenize-0.2.5"="bh3kdbw0yvz28izgmxxw3psmirwmfcd5"; -"chickenize.doc-0.2.5"="hqyyggfs1is65gfl4ck1mki9wgm6238v"; -"chickenize.source-0.2.5"="xhybj8jxyv1fghx7955dcgfcl9kjgbkw"; +"chickenize-0.3"="lmc9ia08np6k06m6fm4lkzp2x8ilng33"; +"chickenize.doc-0.3"="v5b1an4wzrgbp07lh1y0ccsqm4c2xqqf"; +"chickenize.source-0.3"="8mzsm3jdxa8ii448wg4i83fjxisihz4j"; +"chinese-jfm-1.0.1"="zwgqs6w7w6dy580hvpnhfr14n81f9y4m"; +"chinese-jfm.doc-1.0.1"="yx0s2s2zndhss575b7n0cw0mca820wmp"; "cloze-1.6"="6fnj9fvkd2969p095lrsk2rxvp3bqzx5"; "cloze.doc-1.6"="sp2jppmdhd3w1z6ivi3kga393bhwqw6m"; "cloze.source-1.6"="5b31196q2dpj278h0wjbwr193q96p0fk"; @@ -6975,9 +7057,9 @@ "combofont.doc-0.3"="99h3xmx3jv5il99g6wc10csqkmpm5mg6"; "cstypo-0.03"="4iqsrwnw7pnzhzzspr686pf6y4img6zp"; "cstypo.doc-0.03"="3s9dsniw0yz2j7iffbsycsgrycfbjlg9"; -"ekdosis-1.0"="7zg59f9z3sb50vbj4z5224dypbsmywxb"; -"ekdosis.doc-1.0"="rf0i1p4092qb9my1vlp425zzlgp1j2as"; -"ekdosis.source-1.0"="iqj4hqnja5l7si40a4ds2wrjzc8nvycw"; +"ekdosis-1.1"="d8b15bhkhnky34fcr5qnbiw7mi4wizgs"; +"ekdosis.doc-1.1"="7276zfz02kmb49nqhfmd7508dpwc70hy"; +"ekdosis.source-1.1"="4z5d7qd9hw5c2jr8iqh01cxkwcd4xa6g"; "emoji-0.2.1"="v664b6kkikc2bclfv4c2p4bh4l4fwjan"; "emoji.doc-0.2.1"="51iq1l5488652ns99wl3irf3d9qsgwzl"; "emojicite-0.3"="ycvzy0rk6ilmzv8jlbn0a6502j6n0085"; @@ -6995,8 +7077,8 @@ "lua-ul.source-0.1.0"="hrcnn0m4bfqqqznfx5j4fxn72aqiglkn"; "lua-uni-algos-0.2"="52pjhipq7788hbldi78i78y5pk90v0l4"; "lua-uni-algos.doc-0.2"="pkw96m767bgcms4k8hypfbzm1xb872fi"; -"lua-visual-debug-0.7"="dc1d0z6fxpdsligy9qf6ij32sw7y99np"; -"lua-visual-debug.doc-0.7"="abkl63vyaxlvp9hbl33lwlkkr5ml5ykz"; +"lua-visual-debug-0.8"="q9v0clrwznlv66r3i4dq1srbz6a3nqd6"; +"lua-visual-debug.doc-0.8"="5ka8px5n50n5ghfi8k86svs347cahvpz"; "luacode-1.2a"="8ckzckz94cdkygfjyh2dfldhr1pwa8dl"; "luacode.doc-1.2a"="2xzk8133632231pnn3v0afb003xhl33f"; "luacode.source-1.2a"="dw3p52gn6g103qkp5v8vmgxpj2b4cwb7"; @@ -7022,9 +7104,9 @@ "lualatex-truncate-1.1"="imd10qn2sh19fdz4zp8qz57rqs0kh2n9"; "lualatex-truncate.doc-1.1"="xfanw53qhm8qhqg45ykvvf213j3q5dy9"; "lualatex-truncate.source-1.1"="sv3j09xlab2gfqn670wd41xgdk3rjc84"; -"luamplib-2.20.5"="d59kbn85512qqzby49rkmhdfq9vq9xnk"; -"luamplib.doc-2.20.5"="xh4ybk8z6frhvvjd3ybivrlnkr3ydzxl"; -"luamplib.source-2.20.5"="sk5w1r0bb36gbr304ck9px0xf568rlrf"; +"luamplib-2.20.6"="6n7blz32jw7ig9p6bxcmgx00zkzw7i21"; +"luamplib.doc-2.20.6"="jggxncxxd0gfb6yjrk7wqr9vyymq1kcy"; +"luamplib.source-2.20.6"="7j3zklr88455syyaq53p3x1pljxkcymw"; "luapackageloader-0.2"="gmc8hizbl18cka1iq0xhy8bp65yrl4gw"; "luapackageloader.doc-0.2"="ilsqrigd8gvczbfkcbr0ci54qlryhyhg"; "luaprogtable-1.0"="cyzviwzjdg10rh7xizm90d9vbsqjscir"; @@ -7038,15 +7120,15 @@ "luatextra.source-1.0.1"="3ajlrmqc27xyxlkn4vbprh6zzlqpf0xd"; "luavlna-0.1g"="q0d5901smibj9xiarwd9hcyvw6wqjw4j"; "luavlna.doc-0.1g"="zkdgb3grkrj1ixvbwc4v0jd19p7jnv52"; -"luaxml-0.1m"="9f5jxdhxdpzbmx5inhr2jnhn5w1jcqwa"; -"luaxml.doc-0.1m"="6r2q16a1cf8mmrgkhx1nkk09kzsfhbnr"; -"nodetree-2.1"="1b11kq5f9944iiq0j89kyavrfrvnnj2r"; -"nodetree.doc-2.1"="w55dx9d3i1000zw75079agf2bfgll91j"; -"nodetree.source-2.1"="jd25q55yzgr1smkjf87yyb4j27x9zl3v"; +"luaxml-0.1n"="mfc6hrdlf4kq0xfickj9p894av9hljm0"; +"luaxml.doc-0.1n"="xdbvbd6qy265j4ck813ycr5yi3v1655w"; +"nodetree-2.2"="r5kgj9y7caj0npi1z70yvyfdsgmbf124"; +"nodetree.doc-2.2"="0q6c5yfwcsbfrdj1r2435kar1q4bj1wr"; +"nodetree.source-2.2"="dsccgf77bz156m8kj7hxcg8yylg3701m"; "odsfile-0.6"="1h0vzwknsi9w3vpk008mdk87l3c33ffl"; "odsfile.doc-0.6"="4wvljjvknahcyfnwkpnpbmzg26zaa9bp"; -"optex-0.15"="di7cx8pc36wrc7rdazyw444gvj6knr6c"; -"optex.doc-0.15"="9pkhsdjk8hpz6m804nqa4hv8lm5x8015"; +"optex-0.18"="iph13j8xknvxbk2p93kvzhcc0baz8vxd"; +"optex.doc-0.18"="rclw6gshxrb98z46w0fsmss4fhzpnxn6"; "pdfarticle-1.0"="gp3238h9g1kcamcamvhndgs1h9wav9ld"; "pdfarticle.doc-1.0"="zh97mill1idcik9zhb8cp6wyq32lm7i4"; "placeat-0.1d1"="rkzxsay49qp6qpiy3wpd6r3byzrm4hgy"; @@ -7062,6 +7144,8 @@ "stricttex.doc-0.2beta"="a4hz60n22504k60j2hj2ip3fc5pn874z"; "typewriter-1.1"="4xbzb4igw0cd0p9ry0xxii4p8gj7y8w3"; "typewriter.doc-1.1"="vk3rzpx4vpgs5mwq8hmys9m0vv6gmmdj"; +"uninormalize-0.1"="a9qjz4wd45prkb54v5fnrji5y1fi3r4r"; +"uninormalize.doc-0.1"="ab1z4pxac91p1ywijfipjclzdn7hbq1x"; "12many-0.3"="kzixh8p9qmbz0hxczir6pixx8k6zc1an"; "12many.doc-0.3"="v5qw194xha1w7mr6x3zcwp9a0gpi4w4n"; "12many.source-0.3"="wqc3q5hqwg09g0sz7l5va9xazvmqbbrv"; @@ -7099,9 +7183,9 @@ "amscdx.source-2.2x"="da89in5nc7m37m5padb246ra9gl6cjrq"; "amstex-56070"="lpqwc8f3c8iv9691yxqs6r00dkjp9mh2"; "amstex.doc-56070"="fsvgc0caxsbw7gqzaqz97fsz9c5x3qi9"; -"apxproof-1.2.0"="f4p5sn16ygfnnx6lzjmz6gwhdy2pd88q"; -"apxproof.doc-1.2.0"="xzlmlck028ri44c49sd5vr5ksawjg62b"; -"apxproof.source-1.2.0"="nhmzdgibha22wzmr1ppvinifbq2vs49w"; +"apxproof-1.2.1"="rv12vr5m8iw2fw6rp07l3srnbirz3ibr"; +"apxproof.doc-1.2.1"="4cfsxj3d8f2gnvrqkqsx2i4jarmpkvc4"; +"apxproof.source-1.2.1"="4vnna3hyyqrmq1i4fvkpdyg8isvcarx5"; "autobreak-0.3"="61yyi2p6gf0sjydn5kr8h8qvpxgmvbin"; "autobreak.doc-0.3"="lzi2q6g0mrv5l8kb3b9yg0ykiiwimyfv"; "autobreak.source-0.3"="62cm1l24gp51a8jnag36y8gm1bwya7la"; @@ -7139,21 +7223,23 @@ "bussproofs-extra-0.4"="v5xhwycppwm0mpn11589shbys65hplx5"; "bussproofs-extra.doc-0.4"="29pwpr7yfc7n2nflvzfpm39gdwx0qis5"; "bussproofs-extra.source-0.4"="mi485ji1m4vvbd82xavgv05kbd3j96q6"; -"bytefield-2.4"="whxn5qk2z4pia4hpafbzggp6q6zai2c0"; -"bytefield.doc-2.4"="ixgwy7pi37anjp4nmm765hc6hh484gxz"; -"bytefield.source-2.4"="mmnbxv3g3c6i858xs5dazi1nkfvrxsjs"; +"bytefield-2.6"="ns0c255yr22gvypcpgyvn7yan52yjvwc"; +"bytefield.doc-2.6"="y537gi9040798qyg6z3vjsz9g5i8px4p"; +"bytefield.source-2.6"="asvjyk82y4x267vq2srkxq5dk0vr0jmx"; "calculation-1.0"="sss6l897zlki1lidr2s5vp60rv1jfm0f"; "calculation.doc-1.0"="zwcix1a11s0s1hh7ccy28gbdxylz1n3k"; "calculation.source-1.0"="asdip95ln7gna99vk7hjiq8n1hfcqg1x"; "cascade-1.1"="xl13i2yr1fy3awaihp637h4lz7g5d7gj"; "cascade.doc-1.1"="3jivxwvfqdwlc240ks4q52q07zrp06m2"; "cascade.source-1.1"="ggqhq9cl5ia7l54kws9yqvz20s46y3dq"; +"causets-1.1"="rqqybjv2cbfk6wbl0ffmn66ijrasc6ny"; +"causets.doc-1.1"="ywnqh68ciqxv5q0mqzplra7496vdqvvi"; "ccfonts-1.2"="im7vh7a3c8ja312745mlndwmndg1jvh3"; "ccfonts.doc-1.2"="4ayp0gvbvmf0jxnfw8ciwz1jfmvbf3ds"; "ccfonts.source-1.2"="8sfbbqrr9fq9jqbvapgrx0ghhh6r1hkc"; -"ccool-3.0"="wp017y73kf8csvr1p3vbplxbjqw87sz8"; -"ccool.doc-3.0"="sb4c3l8jqhj51ampn05zdj0c5z5kicld"; -"ccool.source-3.0"="iqz2hjjcygw2hww5yh9jk21airqw4dlc"; +"ccool-3.1"="chdi79g5j28xq27pbqk0nk9ccbcq11py"; +"ccool.doc-3.1"="q495yyd79mczqqn957jnn2ykp49xk6a5"; +"ccool.source-3.1"="lwic4fdqlcnqp6yplmrmq2zwr8h4dn5i"; "chemarrow-0.9"="mb0i68z92909632g3xd1m3ahvmg0nj72"; "chemarrow.doc-0.9"="h7g7ldb9837ngsxbmxm2c902bk0k2wdg"; "chemarrow.source-0.9"="05g345ir5pvd4wik23yykarizwp0l506"; @@ -7164,14 +7250,14 @@ "chemcono.doc-1.3"="r527psyb3zf91x0xd6ywiv429b0rmicp"; "chemexec-1.0"="szl9xw9iiql9yi7la6hwcwx8frhdxkck"; "chemexec.doc-1.0"="q7rkw9ny7g93m4xm5jvs17v8x4nwb2p1"; -"chemformula-4.15j"="dgk33ik72xs6arp5r4xywbs03skqn073"; -"chemformula.doc-4.15j"="h2w5zvnxgrf803w2s6jz79w0jiv94h1r"; +"chemformula-4.16"="9a0qa89xd6mhzwl6l0g5mn6263igqdhs"; +"chemformula.doc-4.16"="451y52ic67j0i289gzgrl25dpb5lzrb7"; "chemgreek-1.1a"="9jhyby4636bybvzq4ppvrjp7md499vp3"; "chemgreek.doc-1.1a"="1v4wdq6k5yjcyi8v976la6ldskmh061a"; -"chemmacros-5.11"="8bpw8jl33idm8pywy53j5v5qci9m9v0p"; -"chemmacros.doc-5.11"="bp5wxh0z4zdaw98x1fhhc6zzsca7zb1r"; -"chemnum-1.2c"="4az4s50lwaray904pnfc9z6i2gqi7a5x"; -"chemnum.doc-1.2c"="wbikxk89zq84klsqq67a5ds50jaf28nx"; +"chemmacros-5.11a"="fwkab5q7nkn3khh2p71qrdwsxfbwnk7i"; +"chemmacros.doc-5.11a"="55b2w1ka0n5v402h5p1m7gm840jj6q4p"; +"chemnum-1.3"="rkb4yh5gq0j4pcvbx16j0apgmazavaqp"; +"chemnum.doc-1.3"="adk6gfv163mrw50h0g004wn3bbm0qrzm"; "chemplants-0.9.8"="mnsmsmh4gsllxqd8a8590sggv7844k03"; "chemplants.doc-0.9.8"="j6zlbg0gpb3360953q726g008br0zs7b"; "chemschemex-1.2"="w3v5w049p0g28v8wx70ah804wp3map2v"; @@ -7212,8 +7298,9 @@ "cryptocode-0.40"="2v0vwspdr8xvy4s1hx41abssrgl6lpyr"; "cryptocode.doc-0.40"="q56g76fx90pyi6qc2kq7mnccnl96l4n7"; "cryptocode.source-0.40"="y27wial5c2si94j1alf6zrssghvykmlv"; -"decision-table-0.0.2"="sbimxm7awix68mi53s6hlac8cqhmhabw"; -"decision-table.doc-0.0.2"="85fyr1l1fqlhshixhfgdzhyd8d03vwc1"; +"decision-table-0.0.3"="sj1ivppcdkh5rqcvmrh0bbzxvwfjms0k"; +"decision-table.doc-0.0.3"="7lday4lz5xah837ljynxmmwbxyjrkl36"; +"decision-table.source-0.0.3"="ldvmfif7p2n6hrf4ax6hv6bswk5l2hly"; "delim-1.0"="q2f4p0f8bg1nwim31i272i5rpnjibxks"; "delim.doc-1.0"="5k874svcycyk4y5qalbs4h0x4zkviwc4"; "delim.source-1.0"="bglajqs1gdzhpjayh5d4afw7h09wln22"; @@ -7323,6 +7410,8 @@ "isomath.doc-0.6.1"="nhpi08b738hs457jqv7139b44z35xy5j"; "jkmath-0.1"="l4nykjpkg2p19fdvy4a6h32ik4hcimdq"; "jkmath.doc-0.1"="79bfybh585f88gcyc82b3ds7nx92jng6"; +"jupynotex-0.1"="ri5pp81vxiwa2m3dxk23pz1ahxl9w6yf"; +"jupynotex.doc-0.1"="hpka37bcy98c0cpm09m9gwf4j6dfm80c"; "karnaugh-21338"="8s95y2qxd4i5g5q1x0a7h8iwsci6dls2"; "karnaugh.doc-21338"="85z4avy6yfziaqd7b4w077ys394a3y4z"; "karnaugh-map-1.1"="mryi5vdfqia142b35n97pwzvh267y6bh"; @@ -7389,9 +7478,9 @@ "miller-1.2"="vgpbb05dlbyp2phs7cpwrl9l8v7yczdb"; "miller.doc-1.2"="fj6s0x2rzvldwm2lrmjx0f3hy9l4ih51"; "miller.source-1.2"="9n5iljgqg52bzz39i2ailg3wjgfvgvx3"; -"mismath-1.7"="v2s1vq1j6rkk1bz7xiad62a8ns123bpp"; -"mismath.doc-1.7"="711hsvwqxxbwr1y6lzcac1ax76n20hcl"; -"mismath.source-1.7"="f7w52yr2xq8d352z21zka6kb6zx004kd"; +"mismath-1.8"="qgcm8svg1sdxnwjnkhimjq7w8gqpqyp2"; +"mismath.doc-1.8"="aflrdaxjvq20v57jmsvmnpj05dmj53r2"; +"mismath.source-1.8"="7f2gdkc4n5177zm0r9q42qpcphdhnb43"; "multiobjective-1.0"="g6fgsq3fzl30yd4hrw2l6v73ldm957gz"; "multiobjective.doc-1.0"="187syyaknws2i7i84xxzsnl9mj22z731"; "multiobjective.source-1.0"="qhsg6vg0djg5h279gbs2lbally9vbrj6"; @@ -7399,9 +7488,9 @@ "natded.doc-0.1"="bkhf1ldr1hzsyc06bcp7rld2dbf7p4rk"; "nath-15878"="7x3cdih5q3i8dg25h6737vaphmrdxvbp"; "nath.doc-15878"="ilxg3pmmz0pf1xp6i3g5rfwgvrjprzbg"; -"nicematrix-5.4"="yxr2pc09mjxan41k7bx3m10cjp05l9x6"; -"nicematrix.doc-5.4"="911bm7fh52yrhr6qhqaj4cpp4ydii41f"; -"nicematrix.source-5.4"="2k5d0m339g5p0ywxzqik7b9lypwi630l"; +"nicematrix-5.9"="4pbjw3rmrsfxbf1i6hndqqdib0y3qzjk"; +"nicematrix.doc-5.9"="di4qvcivqqfqgfim6rkb77ksdfal2gda"; +"nicematrix.source-5.9"="yhgffsdg3r52jmssgvx9vabb43ag3h32"; "nuc-0.1"="4mmxcaippf5kwp6sgcwbcf55m4j415ma"; "nuc.doc-0.1"="b0pkc17fxlgygmfvr84gq1gf58w95a30"; "nucleardata-1.1"="b76hnd5fpl3f1hfh8pwgrsnqkadqi2zn"; @@ -7428,13 +7517,15 @@ "physunits.source-1.0.4"="bwj0mas8fx3csw3ij081znnz5mrq2nw4"; "pinoutikz-1.1.2"="dzb6wpz2hywq4i4cxi49s3yssxhxkm3v"; "pinoutikz.doc-1.1.2"="9iyyk8vp4yfnc7jy990gh6z449mxqll6"; -"pm-isomath-1.0.06"="cy9qc9l9z8hq2mlv90vbn4i3nfnyi0ak"; -"pm-isomath.doc-1.0.06"="fy7shz0li68lm894cx9754fhwikklj0z"; -"pm-isomath.source-1.0.06"="3my6scxs3dmc013ccsxb81nsa6jxg6qr"; +"pm-isomath-1.0.07"="4bhf0nkw5wsmj7r26j1cwhgdxpy62pzb"; +"pm-isomath.doc-1.0.07"="92djvbz5x4c0rdpjk1z1kbhf374pi9mm"; +"pm-isomath.source-1.0.07"="vfmjgjks3i5hs6gxp6nhzvhlbfsm6qsa"; "polexpr-0.7.5"="20yvnhmb8dy7p1jwlimayaflwm3sw2q6"; "polexpr.doc-0.7.5"="3zbnfkrlxphvikk3w1jrd21dzrsnkad7"; "prftree-1.6"="jwghbxhmr9lnai4rh4gnrrd5i98vqi1j"; "prftree.doc-1.6"="7a0lrs2rak9c45ayjfmn8ghx89zab2pg"; +"principia-1.1"="sp0508hz6pi8jn5xfhl7clx2886czw3x"; +"principia.doc-1.1"="yqmyf1syday8m8lvxjlmh922y5f3y4wr"; "proba-15878"="k6j2r5kacbcl25i7zwb71a2mlyn17dap"; "proba.doc-15878"="a30lrji3wrd9rb8aa7hzflch7cwlybdq"; "proba.source-15878"="7grfmfi6hwyqzhi0aynjq9cl65yqh5id"; @@ -7456,17 +7547,17 @@ "rank-2-roots.doc-1.0"="x84hhyxp10nhqk3vh5zwsxdqmkifwc10"; "rec-thy-3.4"="gyi6qbzryvr8w0cvq40g05pw2d5v72nf"; "rec-thy.doc-3.4"="dp8579zcyw7wp3b89k0apgm4h7rvf82b"; -"rest-api-1.3"="06a2z40gg5zr9mqcr5l9l62pikkzpgq6"; -"rest-api.doc-1.3"="v0h4q30pb18gdv3z6n32giq2y94mid1i"; -"rest-api.source-1.3"="hzxhbfc7451p9g3l4b74432gglvjdfim"; +"rest-api-1.4"="4nq3lciglb70rr49v7w9an1bj2ymq0kc"; +"rest-api.doc-1.4"="ipic9f43478jakkdigfaw0zpaq9apq32"; +"rest-api.source-1.4"="d4868ncchm5byvnbfw25mydlf27ncgl2"; "revquantum-0.11"="ciws2fb27v2jkmvacgxx5f5rjypxwhxj"; "revquantum.doc-0.11"="3yx0fd96b5sxmf0950wy2yfswfn5k5j2"; "revquantum.source-0.11"="a3lxg56ihykvv3wy0az60hbd3n721grf"; "ribbonproofs-1.0"="7r52zy2n48hichyvyxnhvzcn10v6bm3l"; "ribbonproofs.doc-1.0"="15wcmvid4xbflmy4lv1njbnvbz5svk41"; -"rmathbr-1.0.3"="fv88qckj67imsc8a7v0y9pgzqdlzcbmz"; -"rmathbr.doc-1.0.3"="giw002mrgbyjbm5mfsxy2aan7mgiqmv6"; -"rmathbr.source-1.0.3"="iq3id8a5cyskh3adf20nxwfwjxbb32ib"; +"rmathbr-1.1.1"="i61vd0n322pbpqia1ymizwkqzz31g7vz"; +"rmathbr.doc-1.1.1"="4h44kiz0z8bzxp75zfpc3jb2haxylqxq"; +"rmathbr.source-1.1.1"="z41y0xrn0amgmjmgbqhxl9fz441fd5jx"; "sasnrdisplay-0.95"="9yvwv7a6iw8a7g58w0zlgmfaz2zy8nxj"; "sasnrdisplay.doc-0.95"="0dc8ai8f6b0dn05ljdlnx2dykbhil5xh"; "sciposter-1.18"="mi8zk7ik6q8rvncwp5m0ch6mfysil8fh"; @@ -7484,8 +7575,8 @@ "shuffle-1.0"="zg1rq9yihzpl9l7xjlc7djqfg2s3mn2a"; "shuffle.doc-1.0"="dqra8x226wdqh5baz25qqg905r3xbcld"; "shuffle.source-1.0"="3r5607h5jsaibvmyvwm1v1scm0yrbfrm"; -"simplebnf-0.1.0"="gy1fdjkxfirryqcspyqn3xh19h5ab9sj"; -"simplebnf.doc-0.1.0"="fff34d89r4aiw5qcy9px8ksh4190rcql"; +"simplebnf-0.2.0"="rsyph0dhpy3yz1yqvr5wa7gmcn1zyg6i"; +"simplebnf.doc-0.2.0"="3k3pb1cylrcnr3bs0vz278xkizf11048"; "simpler-wick-1.0.0"="pmjzl9cnwrzxhjiwbrjxfd66lamrhvj3"; "simpler-wick.doc-1.0.0"="pg2id6jpail1iiz92xdr1bvi2725lj8z"; "simplewick-1.2a"="hfv61gj0g68m17iiimvp1zqzi7ri2z67"; @@ -7580,8 +7671,8 @@ "youngtab-1.1"="0pni2w43573rjhi2lygsg7547n3fi3ic"; "youngtab.doc-1.1"="1svxp5r9wmqszr860w9nx6b60nv1qiq8"; "youngtab.source-1.1"="3f54467ky4ban6xkqcldajyr4gfy7mm1"; -"yquant-0.3.2"="r4z8dsvn24lj3d69bq5mn1hfhnj6b603"; -"yquant.doc-0.3.2"="vxf63ra7jijqhiy3bkdrcz6nj6ayj09w"; +"yquant-0.3.3"="f069ff7d9f6vv5cnhmq1f27h6zl6f414"; +"yquant.doc-0.3.3"="xygcxv62qah8j35s3l6pxnnkb8cc98z2"; "ytableau-1.3"="37wsbj7an7fvsrh4w5kvjiibhq0abn9j"; "ytableau.doc-1.3"="wbgandbbk6zgms4jz2ird33kyg9yg19b"; "ytableau.source-1.3"="2rblxwykvkrljn1xqz7zw9dz1wyib686"; @@ -7626,8 +7717,8 @@ "gmp.source-1.0"="an64d733yq3h8fy347lppy46yklczrsg"; "latexmp-1.2.1"="x2plwjlw7cdim8lxh530zf5v2zjsfaxb"; "latexmp.doc-1.2.1"="d9q1zwyad9p1nkk08mq4lard5rv291rf"; -"mcf2graph-4.52"="w0vzlw5kvflnffkzbsgbbkbnli71xqvq"; -"mcf2graph.doc-4.52"="nxjcisz791gn5f0n2s7izripnbgwrss8"; +"mcf2graph-4.55"="msp8abvdflp0h9k19y596vw2rwlmvwq3"; +"mcf2graph.doc-4.55"="8jsyy4q435cmlxl4zjv43rvij238l17f"; "metago-0.9"="4gzbngrpwjbfq5d7jcfavhsmvfwnb77z"; "metago.doc-0.9"="nn86x3g4dv9y5mbr83r8camfxg0xkv1g"; "metaobj-0.93"="83hf8awwak3msfmran6q2ylgcs6720lb"; @@ -7726,9 +7817,9 @@ "musicography.doc-53596"="z63rsy6v54c4p1l844ck0b6hc9fwr96x"; "musixguit-1.2.2"="29kbldyqlcf8xs5yh5gsx0m7liwbnqg1"; "musixguit.doc-1.2.2"="pam1limbbmc1jvhznsvrwslmlr86y7vf"; -"musixtex-1.30"="rgrd6yf6vr0nns6y5xp6ppzrdja4cf5w"; -"musixtex.doc-1.30"="h56v5x6ljybd30dymw0n1i4dx1hnv1v8"; -"musixtex.source-1.30"="kb90c2jhgmx77d12x4rg6yivpiq5rxq1"; +"musixtex-1.31"="2cl7fw84mii0n2v2rvmrprbr2yinvpqv"; +"musixtex.doc-1.31"="0anlk9gnbpgzasrdbv0685mgi0zfkr5l"; +"musixtex.source-1.31"="kb90c2jhgmx77d12x4rg6yivpiq5rxq1"; "musixtex-fonts-37762"="a8kdi135xis6qcwy90yisg4wafklmw2y"; "musixtex-fonts.doc-37762"="91fl3b700pvjqkwsl6h29f0z5i5781s3"; "musixtnt-40307"="6412y8lh8awml9xs7ybcnhkgyjrc08vx"; @@ -7756,8 +7847,8 @@ "abstyles.doc-15878"="xba8x95rimsa16xhr7nziglk7djzv6w8"; "apnum-1.7"="hvw4fwjm3n7hfj08ik7nkg5w51zg9mbx"; "apnum.doc-1.7"="isai4pdly4pkhhjnh3afijlrm9mw2i0q"; -"autoaligne-1.4"="lvfsylaqq4sxi02bv9v6z1sy8gayb570"; -"autoaligne.doc-1.4"="7rzi51xaglby24ihmzplk6d0yk2x1wlb"; +"autoaligne-1.5"="1ycql6wzhqayd90wkd62n5bqymwr0z9h"; +"autoaligne.doc-1.5"="72b0nqh19zipzzv46z2hhkkv8fg93ca7"; "barr-38479"="rsgsgzki68jgx8d4r05qj1awvi02rm33"; "barr.doc-38479"="jfhxfjazvlpcvrl6zjd1sw2ghmcsscmr"; "bitelist-0.1"="22q3ivacwl5p0c8plgg1gjz8413l601b"; @@ -7793,18 +7884,18 @@ "epsf.doc-2.7.4"="b78n5gm14qk3brywpz4prglkqnpx9fpg"; "epsf-dvipdfmx-2014"="qvf8n367wnjahzv8bgh7rmqqgnwraa0p"; "epsf-dvipdfmx.doc-2014"="b290mp5xqfqzzxa92s9j798qyycaph9a"; -"expkv-1.4"="29gqz3z2a8yb4r035224dcksf7kdypws"; -"expkv.doc-1.4"="d4am4ls66vfnsxrdsq299a3f7qz2a4ql"; -"expkv.source-1.4"="6bk2fihm7ksck8pkm1hbpva54gmi9z1g"; -"expkv-cs-0.4"="cackn20g9nx2c0y117swfpqjnlssz4lj"; -"expkv-cs.doc-0.4"="1d3xf7mpjzavavc2adlnql4xd32kfmgj"; -"expkv-cs.source-0.4"="3mki6i67x9r74qd053nclwqxymrixid0"; -"expkv-def-0.5"="swzr4rilgni5a12p1mhyqd3siv6lxygz"; -"expkv-def.doc-0.5"="cadfkapwdx2b33nvh7s37h9ps7svng37"; -"expkv-def.source-0.5"="yipx1lbc2xf82xq8h9kxinm7i4rf107m"; -"expkv-opt-0.1a"="7h72cifas5v9vcd4h0g1lpjb0mn8rd0h"; -"expkv-opt.doc-0.1a"="s88rd2wfw21n3fm8pifzyzyw0r1x2n50"; -"expkv-opt.source-0.1a"="ds4jry5d0h3cfdrrqis65vc5kpgwmwvl"; +"expkv-1.6"="x19fg4al6xjan41l07dkf7lgp6akgw6l"; +"expkv.doc-1.6"="16ny94yijql35j0klhdbpvvb7l2rv8bf"; +"expkv.source-1.6"="92z0fwgv9jf2v47cvrw3j1zz9mjzwymj"; +"expkv-cs-0.6"="r6f8mb6qxasa09kz9l1lbbs3r0dzbr10"; +"expkv-cs.doc-0.6"="d708jfhsdxzpgbp6p2i1176yd0fpaskm"; +"expkv-cs.source-0.6"="daw8zwynx2xhxbph8r4cbnwb5drcvmxg"; +"expkv-def-0.7"="j4w7rgirhfl57mz938fbm512z394ycgv"; +"expkv-def.doc-0.7"="8n4pxgxg9hpn4zajr5f2w5cj58bcxm4d"; +"expkv-def.source-0.7"="iv5pzka6a93yg9k6ry0kcfzkafzkdvv8"; +"expkv-opt-0.1b"="zvgwq3f7ic1hdn9glglrmsxhs7lv31yz"; +"expkv-opt.doc-0.1b"="wwzx0jdrazqnj7c3ahbs9chw01gndvbc"; +"expkv-opt.source-0.1b"="m313vzjxyjbi5dr1ca2wi6haazm9zpig"; "fenixpar-0.92"="61jkr83g6i0bqmp0qg4w09gj7gwcdn96"; "fenixpar.doc-0.92"="95h02nbzq72mmblzawgqsk8530wi1dpb"; "figflow-21462"="166qngk7yy25v0rbjavi53m0sazk90gn"; @@ -7830,8 +7921,8 @@ "gobble-0.2"="r1knqlpg1ndgkvkmi038jy9g450qm2k4"; "gobble.doc-0.2"="kpgjg6n4p17fvw93qyih0xslid4x7w66"; "gobble.source-0.2"="i8dh8xayn1a2lsslnr8wygj0qr168wpx"; -"graphics-pln-54080"="l78qggbm95wq2yqj1yzr2gy2x244cbiq"; -"graphics-pln.doc-54080"="nx34dlv8zk90kr1agqbj5h7y2b4whq5k"; +"graphics-pln-56823"="ny2glbxpiyxv0b9nf254h3fs08cqb7dg"; +"graphics-pln.doc-56823"="c9rd01qyp0bcngq6cv997zkqdzsgbb8d"; "gtl-0.5"="bypkgzwx7y2srhdxv94a9zvbyxkbwgqh"; "gtl.doc-0.5"="777isinskwws7m2b47a0w26w9dsp01qd"; "gtl.source-0.5"="di1lh2gf5xc3wk34q247zvgvgnmnwdh4"; @@ -7914,9 +8005,9 @@ "resumemac-15878"="8kydfyx795317240qryrp7zjvpbcd43r"; "resumemac.doc-15878"="avh8y1vj230yn8bq0mb0mngrki4h0czy"; "ruler-1.1"="48pdi6yxiiwdnmpy6822p0baymfgf38z"; -"schemata-1.1"="8vhx9mla27iim098qdi0k9wkpsbzamvk"; -"schemata.doc-1.1"="2p884sk15m95rr5lslcwh90zsl44gbp0"; -"schemata.source-1.1"="lsyg7d8zk85h776fgzwlyxgx7llcgmgm"; +"schemata-1.3"="aj63lv7cnzxxx3c6s4icbz75cjfvmkgw"; +"schemata.doc-1.3"="b81sb8v41f0njm91mg6g1pid6a9n1kj6"; +"schemata.source-1.3"="cvsm59jgdhy40smv6hxpp19qs7pm5228"; "shade-1"="4ywc6gkvkgm5fiq6avik748vzj7f23g2"; "shade.doc-1"="ax6w6sfryrzmjdff803hp6qfc9x7knkf"; "simplekv-0.2"="xwzqwbgqinc13n4zxjr3wxx1d4z2yfp1"; @@ -7930,14 +8021,14 @@ "termmenu.source-37700"="xygav2l9gll238dyqa8126sn9hc1n1w2"; "tex-ps-15878"="jnzaqr3pc6a2bfh7jlsysc8hy30cq4xp"; "tex-ps.doc-15878"="g377qq7n63mqil18vlfgimfd589pa1qm"; -"tex4ht-56601"="3in5gr70fwp5h01j6igngn7jv7qj40ay"; -"tex4ht.doc-56601"="zp3gcglcmbs85qcfdy1x0rq1nwnfggvj"; +"tex4ht-57348"="182fa538apy5jcjainph0zwni1x3q494"; +"tex4ht.doc-57348"="zp3gcglcmbs85qcfdy1x0rq1nwnfggvj"; "texapi-1.04"="4ysk0vfpgxfdkpaag4982k7ni4qkksjd"; "texapi.doc-1.04"="l2753w2z702418c8shbami8hzdsyz4lx"; "texdate-2.0"="vi2h6c5c56i63vhzn64x7qvn11733z70"; "texdate.doc-2.0"="3yzkfs7q2v20ykcz7754r48p0hb2l09s"; "texdate.source-2.0"="zwkrw8y0m074w5fpjnaabbv7kk293g80"; -"texinfo-5.1"="b94hh50y0ahcn5fk9xl4fmcki7b5mw0l"; +"texinfo-5.1"="pq81j2p022cn5mjpdca5xz3irfd62xg3"; "timetable-15878"="ca6qybasxlgqhmlqyjr1dw3n3j2455wb"; "tracklang-1.4"="dla1jqizbjlb31drs8bnc09vxqilalys"; "tracklang.doc-1.4"="nm0wsmwrl78ikmfzn63gl3mp0nh6af72"; @@ -7954,8 +8045,8 @@ "xdvi.doc-54338"="dz4q0d643a261kll9fci78dmgwjkjhbb"; "xii.doc-45804"="p1ijdgk0mch86gs858rvkjzjh2yn35d8"; "xii-lat.doc-45805"="8ilsp524wb5anl3shmdhbnn1nl2c8sav"; -"xlop-0.27"="qqb21cjpvnv6k136cw9jvpflk2n5nqrl"; -"xlop.doc-0.27"="bmrvybz9axzcbczjv4fw48bl32wm0fs5"; +"xlop-0.28"="23yzc7hmvhc5dya994k7z6w40w3y8cxf"; +"xlop.doc-0.28"="4xf1rn0g79ykd4yllawjqxlayh5mlhr5"; "yax-1.03"="7kwmcvp6dlxj4jp0xp599f6469zhwnwl"; "yax.doc-1.03"="4fh5pdqkifpv1zynkl1ycw0xi817wy5h"; "zztex-17.7"="kack2q2qi130rm6x49sqlkrv4q31qzv4"; @@ -7983,8 +8074,8 @@ "pst-3d-1.10"="pg6n52kv7lk6i6rfqyzijfrxdbv7ym5x"; "pst-3d.doc-1.10"="x7bl3prki06ki517r33ab7pz72n0ycz0"; "pst-3d.source-1.10"="xchbmh6g5zwja9xgxlkdb04qx4kplclx"; -"pst-3dplot-2.05"="7l59hfwk8bf1j7f9i5xrk26cwr6fv7d9"; -"pst-3dplot.doc-2.05"="6d5kf9kjdmv62k55znwjkz5v5v29sc84"; +"pst-3dplot-2.06"="k15iab4rzyfcq8c02fnbyl0gwzc5aib2"; +"pst-3dplot.doc-2.06"="j1b2dfmfkhhdm0rvc1zppc19w5mnql3s"; "pst-abspos-0.2"="bbag5d5l1pad71rrc51lbd8k11jm7nn2"; "pst-abspos.doc-0.2"="70m0f6dbxy9j9iwxx92kj2k4vwqsbrc8"; "pst-abspos.source-0.2"="3bnsfp2rj4rviirll63zljd7wady41q5"; @@ -8123,9 +8214,9 @@ "pst-pad-0.3b"="x3762zh9c5shzl02r9ssykd2a0rqpk7k"; "pst-pad.doc-0.3b"="ymjpw81y22mbmf62735kqi80yhylvazg"; "pst-pad.source-0.3b"="7cqccc3ps8qdhbykgc6yyygjds46p5av"; -"pst-pdf-1.2e"="xjrjc29wwwlmk93x6i8ai8faazrvh636"; -"pst-pdf.doc-1.2e"="mj3572ny8nxvx5v4yrsn2dwy8x8pl9ln"; -"pst-pdf.source-1.2e"="v7byw0kwvl3ahlc63sjm0vas058bxbd5"; +"pst-pdf-1.2f"="b6y40i1cavghj4c5q1n71g6m7ncpw40h"; +"pst-pdf.doc-1.2f"="hhii0z91g0wbcqi3xsa6y0g1sk2sa0md"; +"pst-pdf.source-1.2f"="vdbn9r619v5ww220igdv9v844720ypkw"; "pst-pdgr-0.4"="cijfx5hq5ygnchsgdw7ly5a43a5v6cqb"; "pst-pdgr.doc-0.4"="s94gqhws251skwh2ap0b3hlvpp818y0z"; "pst-pdgr.source-0.4"="s2zbikk5v94207zmrmnlpr5bx3jjzc5i"; @@ -8221,9 +8312,9 @@ "abnt.doc-55471"="jk11kdy4pqbqxhscx0bqkb46r0z15lh0"; "abntex2-1.9.7"="zxahr9mb1vq0yfcj35znym4qx2jh4p53"; "abntex2.doc-1.9.7"="hs3g3ji0knhsh0gmjcz49dvc547wh0cc"; -"acmart-1.73"="lsfvbxkyv94q5y4x0zzbqv75kng4fqsp"; -"acmart.doc-1.73"="lbxb60z3bn81dz5h3zzhlyj0wwzsdh5h"; -"acmart.source-1.73"="2q9y39hzxslkk3kmyjsmrxzw6q29ww3d"; +"acmart-1.75"="76831qm9apd7fgwa45x4wr213snk0pca"; +"acmart.doc-1.75"="4s30kgw83xqzcn9xvrwyb79x1zqb0234"; +"acmart.source-1.75"="1146n4qfma5ysgkzk53rcyla8mf3d8bw"; "acmconf-1.3"="9wid04wqz4l1xisvlng52xabw9m0p1k5"; "acmconf.doc-1.3"="66xjqp6a86iq2908p77cz57651av2i23"; "acmconf.source-1.3"="7ssw68bvkxxixxmf9ygp7szxmc59fvik"; @@ -8259,9 +8350,9 @@ "apa6e-0.3"="0bilb5nbgi83kp1w7d1kci1akg36nv1z"; "apa6e.doc-0.3"="p7ir3azb68s9pms0gpa968gffr2qr0xw"; "apa6e.source-0.3"="baqh9z3mlxqy4kklhnb9a66gj36lnhxk"; -"apa7-2.03"="vb967a62gll747hcwyw65xadzhg3fz04"; -"apa7.doc-2.03"="iqrp4anw12z05975w72dgb3r0sv2mdba"; -"apa7.source-2.03"="qrc2vv7c9faaql9w9g99484cadzxw7qa"; +"apa7-2.07"="wix1v2y7iw7scr0lqdg671q8w391vs7r"; +"apa7.doc-2.07"="cwfrhj3lgswjqp0dxhk1y1fvz97rp8hb"; +"apa7.source-2.07"="j0v5d7rnaha019slvzpk33l05dzsclr7"; "arsclassica-45656"="pk5gn6ifrhj5c33f78d619hq4j3d7nmg"; "arsclassica.doc-45656"="z21lmz2x0sc7g6gc50j1x0hhzz96ra7b"; "articleingud-0.3"="45hkl8j1hxdww0igp85iifrdz4g4h18l"; @@ -8271,8 +8362,8 @@ "asaetr.doc-1.0a"="8d1x4sq5xpgc1kb5ys4dp02i2r1p3ha1"; "ascelike-2.3"="b7ff1cj0jmbdr6wrvcqr37byak164fy3"; "ascelike.doc-2.3"="sqynsfl8cm40n0r7v2a7qlhxx6zny623"; -"asmeconf-1.19"="k4ha0bi87l4lncccqfx77wgdc0zx01q4"; -"asmeconf.doc-1.19"="2vdyalblmk3hk1qha8dm617iz7hph0b1"; +"asmeconf-1.21"="wg2lj9l4m8rw4zbm7i6d7bd9imvw3l34"; +"asmeconf.doc-1.21"="dp3bjbf9bc0yk5f1as8mmmdcrdsnsw2k"; "asmejour-1.14"="8n4si71waf490dzy0qcbzvzw3478wahx"; "asmejour.doc-1.14"="jfv2azrl1pf2wpibhycfp0q1rf388v3g"; "aucklandthesis-51323"="gqqynyfp4l80jc7a90by84wjmn22s0br"; @@ -8311,6 +8402,8 @@ "cesenaexam.doc-0.2"="1cq9yg0f3j9s40jrkzgxnpk2ya88jgiv"; "cesenaexam.source-0.2"="213fs3j3x9f0330jy9hfxmq3dhpl1lgf"; "chem-journal-15878"="8rsrybpvzqr389ip3lfkjna1vy6lclv1"; +"chifoot-1.0"="k9iv6mr24x0fxdylmzma4rcip0dd7lry"; +"chifoot.doc-1.0"="kwyxpsww86h23gs0zlin4niykgjiiqal"; "chs-physics-report-54512"="ci2816gvc1ds20gh2jiiyyrc061n0ncz"; "chs-physics-report.doc-54512"="ipzvx9zkpnnzbdkmbzzk6g4wz4qaql17"; "cje-1.06"="s4l2hjnfw2s0l19hbzf5249igprbhw7a"; @@ -8338,9 +8431,9 @@ "ebsthesis.doc-1.0"="wic4wfgihf2yyk40937hr2g59933cyy5"; "ebsthesis.source-1.0"="q1lhixwgkc6zis1sgsnwzsd0p7spp0zz"; "ecothesis.doc-1.2"="92jxgiddwpj5g62zwg50wm681h2z1ixf"; -"ejpecp-1.8.3"="5xcyqpnlhm97h4fhws0995jfsxdivdll"; -"ejpecp.doc-1.8.3"="fh290208ain7ncl4gnqglb0zxg691pkd"; -"ejpecp.source-1.8.3"="wr82s5hppg2mbb29ij8sgbw2b6zg2730"; +"ejpecp-1.9.0"="6z822g8sqvwndh8gdcaii3f8pdnk0pmi"; +"ejpecp.doc-1.9.0"="a5kin866l57fzcgp5i3flqialzn94ghd"; +"ejpecp.source-1.9.0"="9jmfaci8rmnmz8lgbc7syd3lsp5f61k5"; "ekaia-1.06"="r87yx6q2rzrcp150gny82070fk0a8a9i"; "ekaia.doc-1.06"="lnjkk17sysdnj4l9vpx0qwkr1w185iq7"; "ekaia.source-1.06"="jvjhgfg1hvj60lcwa7k34zfl9v17bw5h"; @@ -8349,14 +8442,14 @@ "elbioimp.source-1.2"="lzbvgi6d0w8wwf052v6a1gzz2qfvpkn4"; "els-cas-templates-2.1"="128x9ixs3cpv1nh2pwx2kp6bhn64kxpw"; "els-cas-templates.doc-2.1"="188ypaihn3x9p3951vybzl0i725j22nd"; -"elsarticle-3.2"="wybpbhzmw2a1h76ik1m7dafh0z83537z"; -"elsarticle.doc-3.2"="1dpvggnxxpyvg331xsgnwnyzrj9sw2hm"; -"elsarticle.source-3.2"="0w53y3wskl6iarnpmdk9c154dp63pnky"; +"elsarticle-3.3"="0hii9fd4wnh10b1scaclvbsq1471fni6"; +"elsarticle.doc-3.3"="wnvrk9yhf2bv69bcrvcfhcfnjb3wv1bs"; +"elsarticle.source-3.3"="ffcj8f3r4p4wwy6aj5c0sk9k9bqp3nbc"; "elteikthesis-2.1"="mivcwfrlyxmxsrc94vg0ji7sgl1c5a33"; "elteikthesis.doc-2.1"="20a9fq7yb4xyfnk5x4c1isd3afc4s69p"; -"emisa-2.2.0"="5ap5gagakjpx889lpiz1knpd3z8fcff3"; -"emisa.doc-2.2.0"="x1qp5j19svjw388qkmccwlh6by9r5a1r"; -"emisa.source-2.2.0"="i3zqwl03w9ff9caf1nafflv8a3gvbdjm"; +"emisa-2.3.0"="25kpkvf03crgwps8fk5gm6jhi2lvmgff"; +"emisa.doc-2.3.0"="yx0k9dab0wappz1sbfdkl7aciy84qb2s"; +"emisa.source-2.3.0"="j95fvqf1p9ad4ck02nhil1vqwliwhp1b"; "erdc-1.1"="pmxparxijq91mlqb2z2ci0mk9as4r1nz"; "erdc.doc-1.1"="a7f0jw1j2l0md2s4hdzv6gb1v867nk8n"; "erdc.source-1.1"="5rf897hybsib6915bvyp0nai8j7bszgb"; @@ -8388,9 +8481,9 @@ "gatech-thesis.doc-1.8"="q97libi0drg6plfjps8p9fd7fxbxg34n"; "gradstudentresume-38832"="bmmfv6i9zhk617r9a59yz4m0g14s1q1b"; "gradstudentresume.doc-38832"="xw0w9hwnyhb6xszynfvz489c9j0vyxsk"; -"grant-0.0.3"="a9bjc5a9i24mymq11dsw78gck3pdb16n"; -"grant.doc-0.0.3"="39g10k0rwfx678fnc8vx6j77wvn8f5c0"; -"grant.source-0.0.3"="4cfhdbqmffiypcs88iij2fxc5lmylxfk"; +"grant-0.0.5"="n25rm5asji0fx6kkj9n730v1i89ki97a"; +"grant.doc-0.0.5"="fw57a585095x7iszbwblzxb3zkjbxdns"; +"grant.source-0.0.5"="r7hk7fmqdm91xd2g94jzgv5cp1c09y7b"; "gsemthesis-0.9.4"="jhw29zl7f93xh641ws6ydqh62cv1kbbj"; "gsemthesis.doc-0.9.4"="3nw8q8pxsfdbd4gmly0bg8ig15ccpy1q"; "gsemthesis.source-0.9.4"="w1k5h97pgahsar4r1sbg6i2dj4npr6y0"; @@ -8399,16 +8492,16 @@ "gzt.source-1.0.0"="rmx7xw85v4ha7d67zkba3c33xljcs0y0"; "h2020proposal-1.0"="sdm13gcvhga8q32ai16mnz2rfsnwb7bz"; "h2020proposal.doc-1.0"="8nsjvgzyw9137ncq9v48dhlncb10snyn"; -"hagenberg-thesis-51150"="173nwqf3ckrpf7l9clx68sbjv2iamqff"; -"hagenberg-thesis.doc-51150"="8q67qw9cj4lrbxs585ymw56q029s5apn"; +"hagenberg-thesis-56798"="q22ijqqwcxl09k2b7p3hqmn1dxk8h5yk"; +"hagenberg-thesis.doc-56798"="i1nfmw31ssxmn5s0dyybymlvm14ij7hg"; "har2nat-1.0"="yn5d36r1lnx5xhrk46laka9crikcd5yl"; "har2nat.doc-1.0"="8gh35w4a8j117z6dzy9p7mmbxsh789zf"; "hecthese-1.4"="8ipql2rwzwaaqc9az5syb4ny89c75d3z"; "hecthese.doc-1.4"="aily0d12b24n16ah6d4chb96vvh2ppwb"; "hecthese.source-1.4"="2m08qjacg4y5rvk16pfyyya1yiik7sry"; -"hep-paper-1.5"="7q1ih63bk64988xpgrl8xlml4ff4anrv"; -"hep-paper.doc-1.5"="j18jvw065f86asbhxx058qjcp2z90xs7"; -"hep-paper.source-1.5"="7z14d308z4n26i160vdxssy0186l5iy2"; +"hep-paper-1.6"="dil9g6bmnpsdfhvxk57gc1z19sdxlqwi"; +"hep-paper.doc-1.6"="nciggxz3kbil9vka01npln99bdcc7yhh"; +"hep-paper.source-1.6"="mppyxf3mm5wdaxzr6zlzw0f9i7nw9vdh"; "hithesis-2.0.11"="drsv1qaj1wnzsnl1kqzq5k8c4g00xi0m"; "hithesis.doc-2.0.11"="anqnh1ra6l9fhi0xmgks1yj46zp58irp"; "hithesis.source-2.0.11"="a7nrjypxwi5m6l49paqc182jz5yh96f1"; @@ -8420,9 +8513,9 @@ "hitszthesis.source-3.2"="wxvimwcr2wjmqr4f53pkz9mfwjabx25h"; "hobete-27036"="k2agw9n4s8imsfi399r1n3v80sdxc41s"; "hobete.doc-27036"="n60jvwc9ca27sxbyjam8jpp6b73ydc4g"; -"hu-berlin-bundle-1.0.5"="f2xk6c0s4ikp7qizbh0dmqpaqs6jnli1"; -"hu-berlin-bundle.doc-1.0.5"="b39mqpgdp5rj773x2cm449cs0pyp4jkc"; -"hu-berlin-bundle.source-1.0.5"="35qaqv6m0dshlq3kzf06k1m2qazffnqn"; +"hu-berlin-bundle-1.0.8"="g98c1rqidlrfklqw8xbg8nhry7sf6xid"; +"hu-berlin-bundle.doc-1.0.8"="4xj9bm4fbniv5jq3418nli7538cr8587"; +"hu-berlin-bundle.source-1.0.8"="4nihxxx8aacb1bbm90fm43zmfjv978c1"; "hustthesis-1.4"="f7wr0296h2a3i6vahvrxysl7dr03sihs"; "hustthesis.doc-1.4"="jknn279nybf7j78y4s99abb6znbkif9w"; "hustthesis.source-1.4"="j828cim80xhwzjvn6drhy5qzr8sx87w2"; @@ -8452,8 +8545,8 @@ "jmlr-1.28"="d4dsidg0avjbflvc2gdx6rr48bhrbw51"; "jmlr.doc-1.28"="w52w3cf4n9dbchs8br6xlfnwjyrjbm6a"; "jmlr.source-1.28"="2q4bm66ql7grambkhcjsy7qifk1hpz98"; -"jnuexam-0.7"="jklladlbjlbr3vc1dyqvzggr87lgwqp1"; -"jnuexam.doc-0.7"="d4mrhs90v6j5pqab9hp86i1dfydvw6dn"; +"jnuexam-1.0"="i5nabjrqbv9q7cf167wvqs2f3c1sla26"; +"jnuexam.doc-1.0"="h7qal4ph3b0fwmasah44ihws53zqjih0"; "jpsj-1.2.2"="xpasajag9rdz7nr5xk7k40g181lyc45x"; "jpsj.doc-1.2.2"="994fxd5c7947y4s7g71i7031l72qj26b"; "kdgdocs-1.0"="i0v1kfpnhn5210jj5vd2pyi9s9h1vhmr"; @@ -8490,15 +8583,18 @@ "matc3mem-1.1"="1w8m977ngbqivnhlaqsf6bvn7yngg3hg"; "matc3mem.doc-1.1"="y6b8v00dhz5xg56kz04jql3rdrl0v5n1"; "matc3mem.source-1.1"="3n9x1jfgrc8jigj8w2bmngk7pxqz9v29"; -"mcmthesis-6.3"="3sxh596ivd2sfwzb9vcyn4b0gcpwpa7f"; -"mcmthesis.doc-6.3"="aa86mfx1a75jphkyjvlm0b0gd19ng2hi"; -"mcmthesis.source-6.3"="4sr3z45i1zhjkd7z7bb5098bqf45wpih"; +"mcmthesis-6.3.1"="yx590n1qwxski5c3ha5a0p1zhl5nz8zz"; +"mcmthesis.doc-6.3.1"="hpbx9mn6df9nkhcr7066qqr3cf5xglb9"; +"mcmthesis.source-6.3.1"="g47kbm3y491m8m16hnlh5mpibmy9s8zq"; "mentis-1.5"="nfpcmyxlg0gadqj33jnxji3nvs5fni9l"; "mentis.doc-1.5"="vnj4lk1vxc0c0710jb21x3vskppk9c86"; "mentis.source-1.5"="x8djid957v6324m74fn1m8l9hcp7mr1g"; -"mlacls-0.8"="73ji41jrjrnl1xcj19b1y9l12d7582p6"; -"mlacls.doc-0.8"="699kvdgq269b735kqd1nv1n9qakplkbx"; -"mlacls.source-0.8"="fmw8xafidbn60xg7qsai600z103ah7gb"; +"mlacls-0.9"="2fkxkj9cwy2j2c3fsmrx9a7rj8idjbx8"; +"mlacls.doc-0.9"="qarilny8mbhr93jkhishz96ly84154m2"; +"mlacls.source-0.9"="5v52krplb9sqsk83zilcdp2gnf9kn25m"; +"mluexercise-2.0"="55nqdha684dmm0f8360zvz4wby202h12"; +"mluexercise.doc-2.0"="7ha9qpaz3xrq3q7c7d8lbz0xf0vklw87"; +"mluexercise.source-2.0"="9q1spi4fzz2yfzjr6q32ypr4ghr9lip9"; "mnras-3.1"="782c0f5jafxl0xys89wp8f0pw00b7rh5"; "mnras.doc-3.1"="cb0rhnjpawgc9i4hamgriy746xx4v42g"; "modeles-factures-belges-assocs-1.0.1"="yildlnjq5szbsvis65ph02bvvzydgldv"; @@ -8511,6 +8607,9 @@ "mugsthesis-34878"="cfkw21f3xy6pchbq7ryw2df8bdssilc5"; "mugsthesis.doc-34878"="xqm757zbzxi9ag50dd22274bk5n1897h"; "mugsthesis.source-34878"="6awfcfhsqggxvxxxmfbi77pa6bwchg79"; +"muling-0.2"="0isshjwygamwvdgx9lqz7wjrrcq9wk5a"; +"muling.doc-0.2"="qivxsrjaiyizrk21g7kn77lkzx87wjxb"; +"muling.source-0.2"="qyvgpl8wxl6rbwl245mc8parwq1h9cd1"; "musuos-1.1d"="v0bx55bnw5lcpq1w0zxfkf1hlxahxj0x"; "musuos.doc-1.1d"="iqviyy26inh9bw04maby457bvxip69xw"; "musuos.source-1.1d"="rx3zcmp2mw88f3jxa0igajz4dzvx135m"; @@ -8550,14 +8649,14 @@ "opteng.doc-1.0"="24dy7xc4wlz223svmhsv4k05bw6b12af"; "oup-authoring-template-1.0"="2wa7y11p3lzyq911n8ybd893mwcl2w61"; "oup-authoring-template.doc-1.0"="lr5ckdwfcnh1if3myqirjpk4yjij25yi"; -"philosophersimprint-1.4"="cdw4cms8w2z5lvj17ayb1yg3075qfpik"; -"philosophersimprint.doc-1.4"="j5ri2kgr97c4z3mzf5kilcwjlqliibjp"; -"philosophersimprint.source-1.4"="i6h47warmh5zlaswpq62mvbc6nkl3hij"; +"philosophersimprint-1.5"="4xvmqn3dbqra0mxkhpgagsgzrkmczqpm"; +"philosophersimprint.doc-1.5"="hxcldbndvc7biy3fh16f4s6ka093n7sl"; +"philosophersimprint.source-1.5"="kq0i9n14zcvj7cvxfr2nxqspx86585wg"; "pittetd-1.618"="1jjhfr2c6ycp2c6r3kg0y4fziq3vjpv5"; "pittetd.doc-1.618"="9394r72nr766i8mnb24s4qr4jp15jci4"; "pittetd.source-1.618"="s0apvlg01wkfzhzp5cgy3jwxx9z14469"; -"pkuthss-1.8.2"="rvla82aghkzrq11iklb8ysvqklaky5pk"; -"pkuthss.doc-1.8.2"="dc60g5c9zagylhnhagi37yj6066n62x8"; +"pkuthss-1.8.3"="7nv77cwznfjw31gjgkggndv66day1n80"; +"pkuthss.doc-1.8.3"="fimsmsy9zfrdix9ifgvpm3iwfcmf7dvn"; "powerdot-fuberlin-0.02a"="2wv4gd2gi1xvzmy83cp701hd7971xdsa"; "powerdot-fuberlin.doc-0.02a"="jzdfhb0xjlx0cffp8ma18r99lvr26l2z"; "powerdot-tuliplab-1.0.0"="x7ygn34dsmvncmaps2skxfqdakqkp4rz"; @@ -8577,8 +8676,8 @@ "qrbill-1.02"="q9j60z5d39s257n5lxgphddh4z97gy9k"; "qrbill.doc-1.02"="4c5j18c0xbcgfc6l5ca3w82kvgkbn6l9"; "qrbill.source-1.02"="m0bdpkmpqaqlpmbvycw0ksh5jzfjj4av"; -"quantumarticle-5.0"="gxfjl7qlir4m4rmqwrxmm1jksgh63crf"; -"quantumarticle.doc-5.0"="vzv5j94a6zvbyvbsbcdxpzialv29313j"; +"quantumarticle-5.1"="5azgk8assb2szsbfhb8sn30qmn6b788q"; +"quantumarticle.doc-5.1"="y5mfn12rhzl40l3cqgsry3d1m20vspwa"; "resphilosophica-1.35"="vaxdd2gghalbbbikxsyw92fhnx3wn8d9"; "resphilosophica.doc-1.35"="xwkcpdm9bn3vhfazhbx7fxibz5shrild"; "resphilosophica.source-1.35"="7wysrjs5ynmpadf39vkj2asysjvchqmz"; @@ -8607,8 +8706,8 @@ "sageep.source-1.0"="j5qj2vr800891ccgbvgdqbnfa0mxj4n3"; "sapthesis-4.1"="63dcp1gxf0dhdrlzljj5267j83q97pd5"; "sapthesis.doc-4.1"="mra57v29ah4bjcmngl3h1vyg5c2z9imd"; -"schule-0.8.1"="0bskmm375d4kvnpnl7askk78ni06k4ds"; -"schule.doc-0.8.1"="b3kmlg0khjb1239nb6myl1w5kxpp9175"; +"schule-0.8.2"="k0jnqi4zavamy5fxr41ah8jlfva3xcvz"; +"schule.doc-0.8.2"="6q4yghqfys34pvns8gc1k1nxaln4zn4m"; "scientific-thesis-cover-4.0.2"="g3c3y6l5nb34vmla06bry9nipwjwcxcs"; "scientific-thesis-cover.doc-4.0.2"="zzlsbapfhvlfgry78cc63a1l9d6gf66c"; "scientific-thesis-cover.source-4.0.2"="29sksgy5611i9gwmckxmyypkkk1r0vpv"; @@ -8642,9 +8741,9 @@ "stellenbosch-11a"="s0wddhmfp77y6v54qq4jsmqidjq3bkqh"; "stellenbosch.doc-11a"="97wbyj0mg7phb66ngkf82ziiy8v624b1"; "stellenbosch.source-11a"="0raanzzc5qjay7gz94himx8np0437pgb"; -"suftesi-2.9.10"="v3ql10qjlwmssbya8nbq6mxcmvfikpvx"; -"suftesi.doc-2.9.10"="pl1cy2dfbs2pp0qa012vssjpmvdvijyc"; -"suftesi.source-2.9.10"="9dlcgl4alvssjqhfj98i3cdkmf0q4b4b"; +"suftesi-2.9.11"="yh6zvs9qz3c14kji7hsgczv4rd262qyw"; +"suftesi.doc-2.9.11"="xg147fzl0acln4zr9hfs743y1457ksj4"; +"suftesi.source-2.9.11"="h572zyvxb35l9j4h54p336xvaf93g9mw"; "sugconf-15878"="9bgrgs1gqxlj5czai1l1m45z3z4xbr6d"; "sugconf.doc-15878"="siyxf3blr7z953fm4xy61z4jfx589bcb"; "tabriz-thesis-1.1"="psrla5z8x9icyxgdqnxpiv2vjnbq4rsq"; @@ -8653,9 +8752,9 @@ "technion-thesis-template.doc-1.0"="8kkfqc0f3pkn9sm84zw2iqi133nr2sy8"; "texilikechaps-1.0a"="v3x5w1a3lblqc3pks3yzychj64rvr67l"; "texilikecover-0.1"="fn8g82q7mvdqaa3i14nsc95wjlp0ziyl"; -"thesis-ekf-4.0"="36m51dx3jlm3f6a0ahhg5p2i35wyaiv9"; -"thesis-ekf.doc-4.0"="6qyln0j3hslnx0hibpfijixclha7jv86"; -"thesis-ekf.source-4.0"="yfph61m1j44d3rn2whz13m88pgn95igk"; +"thesis-ekf-4.1"="qx6shfmc4wc23xl68bvhyxj6iyy7j4gd"; +"thesis-ekf.doc-4.1"="4ljavrr21zd0d15n7r51md5p1v38s5vm"; +"thesis-ekf.source-4.1"="ixbb50g799akwc8c8vwjv44y0z1phfr3"; "thesis-gwu-1.7.0"="lmgwrdny0kp9p8ldyyxg8521vmhngjpb"; "thesis-gwu.doc-1.7.0"="2c219vkiy9h43v2jpaj69hv9lwh7m4v9"; "thesis-qom-0.42"="rnhdvsrpsgjbwih0ia9r1h4kyqdrhg6x"; @@ -8668,9 +8767,9 @@ "thucoursework-2.6"="mvwpfacql0xna37vqa3q7dkrwkzqnpvj"; "thucoursework.doc-2.6"="rg2y6dx27cxw5h1y0zifciy9wn2f63l5"; "thucoursework.source-2.6"="frk70dd03ld969k7l6s1vc38vqkdclh0"; -"thuthesis-7.0.0"="49l8ppaywbn2y9lydsqwxivdiyv0q6zl"; -"thuthesis.doc-7.0.0"="zlzv84sf4al6508fbdiwidm4blvhpihw"; -"thuthesis.source-7.0.0"="5gxwk945bq955rd65ah2jylgn8b7x7vp"; +"thuthesis-7.1.0"="iy1kp51ydv7hfwzkb9fn3nksa7yfv2ba"; +"thuthesis.doc-7.1.0"="2xwlhh7n6cwb54gr9hdfv66lbvd4sr5n"; +"thuthesis.source-7.1.0"="nmr6jyqmp82r02lk9ccxmcmp5krd7ri6"; "timbreicmc-2.0"="8mnap2xvfny35sb0ziq5xhlckwcmgb3w"; "timbreicmc.doc-2.0"="b649dhjapj0ani2as7783bphamp0hwsq"; "timbreicmc.source-2.0"="8s3vn2id27cl1164brvkrxg96ggvgb3v"; @@ -8682,14 +8781,14 @@ "toptesi-6.4.06"="f32mdcbb85b7dja6cvhc6h0b111i7h28"; "toptesi.doc-6.4.06"="rx42mn8j2fy5qji2xmi41a85wii0p1yy"; "toptesi.source-6.4.06"="9am8c6ps9if4zlbcrld528hhgk9j6f0d"; -"tuda-ci-3.04"="7vbf0nkamz958bwjfrrsaa355dm57wag"; -"tuda-ci.doc-3.04"="cfnnk6f0fkk4vysnixs22sqa3rz6cb00"; -"tudscr-2.06j"="dwbpyy1yy1h56dsg9j52k74w2x4mg5dj"; -"tudscr.doc-2.06j"="nv88hc346psjc3iwsq87ni94b60bb6im"; -"tudscr.source-2.06j"="1b2d7pbn0iqnsdnymywpcd1fwdnhffnq"; -"tugboat-2.23"="7mijib9nmvq4kap6gihvfla8cvpbxfjm"; -"tugboat.doc-2.23"="1n3myrhdb9laa5razq381ji6xznqpak0"; -"tugboat.source-2.23"="kmmd4s3dkgil4f0nh8bgayndrjcb7qd7"; +"tuda-ci-3.08"="b7xpbkawflrh5jib1n9b38rrmwn03a7d"; +"tuda-ci.doc-3.08"="ax2jy5n7awwnh3hnc88l2zwhdva4qhv0"; +"tudscr-2.06k"="60mdwggs5xpvijmyfnx0ahqziqyr2kkh"; +"tudscr.doc-2.06k"="5dxnr37xw0690k3pq8rmkc912h4rn0jg"; +"tudscr.source-2.06k"="bjwl7yf1az9lrddgcz84svsmmhd8ca14"; +"tugboat-2.24"="9c3ipn2fzwrf0w21mih2ld7j1z1w7i0w"; +"tugboat.doc-2.24"="g6vmgk9zria85cc38khzz1kk7x0s5a4m"; +"tugboat.source-2.24"="6kpj4a43gk6ww8hc434lipc04l2k3abw"; "tugboat-plain-1.25"="hdp8r703mch4096qy67y5zqjma848hh1"; "tugboat-plain.doc-1.25"="36nn5cxa1rms40af14c7bbxrkz8y7q40"; "tui-1.9"="s71xp2jz0v4wlvgvx9f9r62i2clj8grw"; @@ -8745,8 +8844,8 @@ "unifith.doc-1.2"="4gsy6kk4w91df3pkz0wxqybr13jgbvj3"; "unitn-bimrep-45581"="s3x065jkvzazjx24an10jbwj47903gjl"; "unitn-bimrep.doc-45581"="k2iakhx4fkiz9ckglr1pvnrqday0sbnp"; -"univie-ling-1.12"="0inv9zi3b5k1msr587xj0gv8dafphrk8"; -"univie-ling.doc-1.12"="c69k0m7nwp4m9iyn05gfsglxd04gddv8"; +"univie-ling-1.13"="fh7pmppl3gz3p8gf4crrxccivlsqa2lk"; +"univie-ling.doc-1.13"="pyws8xjmzfxq455v9p25a5nrk7psk2wm"; "unizgklasa-1.0"="pz93dd2qidcvdsa78zgl73s07zjgshs4"; "unizgklasa.doc-1.0"="inphl2x3czqw7mw17if9ahl0jbin3dd7"; "unswcover-1.0"="5bqxws27nxyhgrlc6c9k9v5pm8jvdhzc"; @@ -8762,8 +8861,9 @@ "urcls.doc-2.1"="rkrvkvh23jmn7qhyvgnmgzr7qhyckjy8"; "uspatent-1.0"="lqv4zrqgwdhav1075ym1wp3cmy7r3ahw"; "uspatent.doc-1.0"="0pa1qihx7vyc5lfkzr7bbakkphzmxp2p"; -"ut-thesis-2.1"="wz086qs6isll7wfa16yf154zqdbwz7zw"; -"ut-thesis.doc-2.1"="yqaa6h1yz1401ljb6wxnlz3rqmlr7fy0"; +"ut-thesis-3.0.0a"="92kva56yzsi6sqp9ydjkfysj5ny5c8lk"; +"ut-thesis.doc-3.0.0a"="vi6ddxgpmwnxhqdc6ljsfmn611k7vrmg"; +"ut-thesis.source-3.0.0a"="1kha7qd6fkmi1v86anrh28yfczbks59q"; "utexasthesis-1.0"="dyplgpcmg18gjkxvnqzgs99lf3aj6yc2"; "utexasthesis.doc-1.0"="x4ngw5sm9zm5w46l5xap4cwnygb8qlha"; "uwthesis-6.13"="1z7cpyrzcb9ga77d9a58jm9234w2zafy"; @@ -8776,9 +8876,12 @@ "xduthesis-1.00"="qxvczdxndgw1n1hxzrr5scvnrgcl3q3f"; "xduthesis.doc-1.00"="a58xwk250qq99pyz4rj2br4dqfzhhmxv"; "xduthesis.source-1.00"="nw0j5z9vd83a3idksbq2338j8ir01fr6"; -"yathesis-1.0.3"="6ispkfhr378lrdy4vwnaiwdf3q22x48c"; -"yathesis.doc-1.0.3"="ypxdv9db1snyqas2csk58y3asrjqa1qw"; -"yathesis.source-1.0.3"="w9xr9hmaknawlhllj87m1dyd2h9v2chw"; +"xmuthesis-0.4.1"="y598kfraksgxzjhiqnvpi44nkgy448bh"; +"xmuthesis.doc-0.4.1"="ryzi6wjgmw3kxar74hhdjazylp116a5k"; +"xmuthesis.source-0.4.1"="mjlyb6dl3w3gi34ld39pk5xdjkzdi064"; +"yathesis-1.0.4"="gnm9im78y7x5p7vhrcd78rp8pkdimj84"; +"yathesis.doc-1.0.4"="vghz35m84d9mxmvg3pxh8dqxg18s6cpc"; +"yathesis.source-1.0.4"="lnpa4iwg7kl69phfgmgyr28gbd1jz8p0"; "yazd-thesis-0.3"="583l53kxfnfb7s67fnh3n45lvqqww941"; "yazd-thesis.doc-0.3"="9qw7byq6s1iv4kfq19xy3qm01l9vh0q6"; "york-thesis-3.6"="rm9hh3b6cq902rr4crmv6c3z3ll2680b"; diff --git a/pkgs/tools/typesetting/tex/texlive/pkgs.nix b/pkgs/tools/typesetting/tex/texlive/pkgs.nix index 2ecb162a5713..a495fb218dbc 100644 --- a/pkgs/tools/typesetting/tex/texlive/pkgs.nix +++ b/pkgs/tools/typesetting/tex/texlive/pkgs.nix @@ -264,13 +264,13 @@ tl: { # no indentation version = "3.13b"; }; "acmart" = { - revision = 56343; + revision = 56946; stripPrefix = 0; - sha512.run = "4ee65c22b449731701cd5b42915bc045a375a16ec8b4cc32f2d8340900bf9a5e6a99d705b765a3792a31e4b90a0e715f3514d03ccd73ba4ba5dd9a2597c7af63"; - sha512.doc = "1dbee22c3e48c4d893e5901fee7fdeee4f3c66dbb095f77da3b38743fdcbd12f5f189f4ad3a4ddca15be69ee1bd7baf06f38540f8032d8f48fa4b6e83a61ce68"; - sha512.source = "d820deb59cbbb8d9623a21ed23e900bd014dfcc6cbd7dca0de7f265d9f7a0db86944d7227b45fb26180d07053b4b4391c8cb51820a358be7be741648f948ef0e"; + sha512.run = "cda16a82e6416cc92773ad39e1998bace936aced37a7b1208c48857b18447993bb14bdb31a5632fd1700e4fdd9fabd4c3e39c6af27fb355285bf824974e9d2c3"; + sha512.doc = "27e241160fcad9cffb962f0204bda5384f81946bb82ffd99fc3c35d58e95109a15586214c774d6af57a9a12e8a1fc9f230d7c18f66dfb13ef2a45deed957cf55"; + sha512.source = "b8c9b62228bb844373e972a24ec9bea3bbb81a028d0700bc61a42a4298241ac96483ee52cda42744ae3e453e1eaa2e7564299554fa535fae5ba15f77750f881f"; hasRunfiles = true; - version = "1.73"; + version = "1.75"; }; "acmconf" = { revision = 15878; @@ -282,15 +282,15 @@ tl: { # no indentation version = "1.3"; }; "acro" = { - revision = 55090; + revision = 57226; stripPrefix = 0; deps."etoolbox" = tl."etoolbox"; deps."l3kernel" = tl."l3kernel"; deps."l3packages" = tl."l3packages"; - sha512.run = "29eb42635028c26c61860a5d00d9a15bc0f5685543d4046ae0fe5ab60f4061405c1ba90b8daddafb33fcb92b0db825f49914f72dbd88e980671c6afe1cd3a682"; - sha512.doc = "acf15ed9db6731db5cdfc9360704f0f60801291581f0ed0b98ae87b996c73bd4d386e4f9490dc2b345569ebf5e81311b2629552935ac488268d391aad4994504"; + sha512.run = "24d039966a0559040d1cabc39a79ee805dbfc534a92a46286676d798f98c3bb871cdfb582fd7bcc68cae49096ed3051c49ca14769f560b0db058a49c16a62f42"; + sha512.doc = "c3935f8697b5f654229de2425143b2d13bc992bfdedc534dfa6a29a7e478a5d860a20822832cc162792b11cbe1845c714e197280722e1d0c09d6ba3d7367c6ec"; hasRunfiles = true; - version = "3.2"; + version = "3.4"; }; "acronym" = { revision = 54758; @@ -543,6 +543,14 @@ tl: { # no indentation hasRunfiles = true; version = "0.2"; }; +"albatross" = { + revision = 57103; + sha512.run = "809b1062cf7bb27690d62cc60b378e1ac6758cff7938fe1f19ad44e255c6606c7d0a718c45b7d2e0b88b34749c701a9e19beed0e30d827be883e43318706eb99"; + sha512.doc = "3b702f383079734c2e6063f537bd463660beb8a9121e8969f4ad2bf4912ea14ec18161767861b5e50b1887b614a1ae28cf68dfb8984d44c2d9455a501fde5ebd"; + sha512.source = "e1ef67131a15a03e314cc4c5a5d3da9f4ce2ff632385a54b1fd89fcbfd43777db6bb991940cced49f02afe003cc0c91d529f9ef6a26e02c3b69d5478a24763ca"; + hasRunfiles = true; + version = "0.2.0"; +}; "alegreya" = { revision = 54512; stripPrefix = 0; @@ -588,12 +596,12 @@ tl: { # no indentation version = "1.3"; }; "algolrevived" = { - revision = 56472; + revision = 56864; stripPrefix = 0; - sha512.run = "98db2033f2fd2871c6b60543951819e5609ace0b9cb7b8f789768d1f946cb2d3ec7d45d1141474e63fb9257b30d8e6d1f4224cee005fb85cf0516bbe4c3bb763"; - sha512.doc = "a27c2f189a06c602aafcbedccd0db8920ff86a497ed9515ee5225507463ef25b1cf9d7387f1a1f4aed4b443c12d3edfb9f862c7cabb1a465e30de83244cef0cb"; + sha512.run = "bb038512d7ade0cf90217150d276d8ed7fb4279b8a3088bcb38dfe8f48373e8957909f5fdfdd2f6247682623414f04e732262a393cc0042279705ceb345cd608"; + sha512.doc = "c42976e8fe3d53240de84845a0c4428363868629b5137a57863b5fc922ed8f557e2e4451446277cead1dba0dff036e843e5ead35e6e591a04f2edeb640c7932c"; hasRunfiles = true; - version = "1.05"; + version = "1.052"; }; "algorithm2e" = { revision = 44846; @@ -728,6 +736,13 @@ tl: { # no indentation hasRunfiles = true; version = "0.113"; }; +"amiweb2c-guide" = { + revision = 56878; + stripPrefix = 0; + sha512.run = "1ffd4d1691abe2543585fa950d9b18ebb10e48c5c7d97e2f05828f04620bfd730894cd92f0df507627ddd9451a253ed8bbe89c07306b6db27ba84bd6c24910ea"; + sha512.doc = "d8f6ab658d8d8f2e05876ce27b5220eb2e10a58775cde91f975cdd106708ddef86781cc1c004b4381176fa7ee8ee6630a34bf7cacec374bf21ffe5e06c8d4d68"; + version = "1.0"; +}; "amsaddr" = { revision = 29630; stripPrefix = 0; @@ -988,13 +1003,13 @@ tl: { # no indentation version = "0.3"; }; "apa7" = { - revision = 56095; + revision = 57083; stripPrefix = 0; - sha512.run = "11cf9e3cadd39f5c5c30258c2df64785b732cb2518f5a4552814ecb2eb615b1a3000cfd7b857c170aa79ed3d04ec2b81cd0d1e920e596f932f744f190902f29c"; - sha512.doc = "9a6119297cf112f0e00fad8969f52fd8ab2d947d060eeb10e198a647a709f13015406a47591df512a802635e2c4b02ba1194d10975653c45ccd229b68bc96718"; - sha512.source = "936b8f0f20cb2d36c0d5c0cf4c4fc2e332f85e17a5ad211f120f924819525a659f4a90fbaf185a1c313bbce6b1edc866f2646f188d4efd67809ef36f064fa410"; + sha512.run = "1cbb599a8c41903c3ac00d1f0ecaacf09202319ecc7455f38e0d09251a45efe36b2c9a5893450a04e5c7d02a8d08d482f85d0b05e9bf7d5668be0d2252e1f467"; + sha512.doc = "07bc7020971f87a20dd09d273538cf47a64f7f5d83bc0ea0e5510675bd42ae5b1900037bf66c7c9002eb68827c431c2d0dee854e218d6d297d1dfaf6b096a747"; + sha512.source = "09f8580f65e3e6cb9be68d675f023d594a174738b4d2be83e951ba21e331c12763da7da66c4eb68136e046bd7ac0ff1d829afc2fe40db6493c9cfe2d71098006"; hasRunfiles = true; - version = "2.03"; + version = "2.07"; }; "apacite" = { revision = 54080; @@ -1044,10 +1059,10 @@ tl: { # no indentation version = "1.2"; }; "apprendre-a-programmer-en-tex" = { - revision = 50933; + revision = 57179; stripPrefix = 0; - sha512.run = "deaf9ad3580a803fd5fa7cbf8f8a11df4d350b7b90ed880317d1e67290ce8b48bf783bfdf470076b672cc5e257bd10d69d6361c7959d81f9fb759752adbf2a6e"; - sha512.doc = "820f1ba9f635e05a25167203a1f27d13c380281640784828c27ae7366816f309c6d3a630abf3ed49ed996357064878c735c9d7c17bd6dc262a21a420fe40f77f"; + sha512.run = "2008619320d2b7e906c2511609e76894dd065f8e56dd1800cfac0e13af4415dc76c437cdadcf15cfea85d7862996e99ba3240aa30d36fa70d9c1d950b7c97e96"; + sha512.doc = "34c86cf9f0a296846a85f896f31da102013dd7b78ddc11d20aca93770671f2ab05930167160d3bf6282b7740fd9d5eb5238ec70bdf405658c1688d3bbd769d7e"; }; "apprends-latex" = { revision = 19306; @@ -1066,13 +1081,13 @@ tl: { # no indentation version = "1.0"; }; "apxproof" = { - revision = 52324; + revision = 56673; stripPrefix = 0; - sha512.run = "400c95494142780c5359df48864fd5ca48409180220a9efc25c0650889fc84fdb725f7ea263c00ce7afb8099c80d4ef42b601e5b61ae0bd2fb8e68fcdbb673fc"; - sha512.doc = "fd818e5ec077a1d479b0bbcc8470a80c396dd5e4b0fd6191c30009f709d8da6de74277e1f162df3595a4de6e10bc88db6290c9b42df37672d8a6aef7047d9164"; - sha512.source = "08eb4f6d847ba8d7fb4d19b81f1fcbd21a4d1bad908824fc6739b16d08763f6ba1bf388d5f0dfce29916205d6751983f06f9f4562d44f9284f690fb16fe7cd80"; + sha512.run = "0a81e01bc885b8e7d4bd69361b185beb8cde62f7a10db4e5441312dfea15c0da7c352a4cb412102bdbedc60d974ddaee6f44451042283f577b9a4b4f54a263c1"; + sha512.doc = "a6131b7889d7882a9bfe253f3bfd380498310dc9f0d13ae382d786e3604201c887b98b8555d69cf62067b4c6d5975b16f14169dc10cf4ca5933af3fb843b60b0"; + sha512.source = "0895ef3552dea3685c529a2adbe8efc7a7010e63b277b8e3740d1a123bbaef1609f05d2085887d013ba9f75155108397153b187f13b6bea8e49954bc75938a2d"; hasRunfiles = true; - version = "1.2.0"; + version = "1.2.1"; }; "arabi" = { revision = 44662; @@ -1141,11 +1156,11 @@ tl: { # no indentation version = "5.1.3"; }; "archaeologie" = { - revision = 56075; + revision = 57090; stripPrefix = 0; - sha512.run = "739b7be7d5bce5f3f89eab7c32a06764679f5601ae971001f656b10fadf26e2d9661331187053db6fe84265f099f76887b983f6cbd0931f71a2147ebe535fd94"; - sha512.doc = "f0093b989605ba792563a598a3862d005aa33bff2b2b66dbde69cd4afcf47abc695837bec4b378d7b5125cb7144fef0d2ab1029fb0c0f0858e4e2b290fa9adab"; - sha512.source = "08518f4c6fa8b69862b65ddca05d54f5656b983ba1ee18a63fed04bae8b2968715cba6de97f89ebac42755028ad02fc6791c697f1e1cd6361ac4456fb2e1ba1a"; + sha512.run = "40220a43a1f5775076f75379eb7c6c6eb4f7e9c709b7ff22b0db29868f5ac7e5def3cead10dbcd17e3bad2aa33af7942c10f5968c42494b5ab35dd6886c912db"; + sha512.doc = "efc68c2bb845f1966aecf6cdb20694778212261d6ba6f0136c87ddd0cd5872d0196c99220c56a9c9dd50ecc32c1a59a4d4630ff3fea9b5d953a0a9ee3aa66dcc"; + sha512.source = "2f3324c8844c5d04d35e3e4bbafac591c1c33ac2a0ba21d7b4b1231ae7883ddd53fee555ac89d2f2fe27358c80470b414f14fef073f03fc3ed405b96a5df290f"; hasRunfiles = true; version = "2.4.5"; }; @@ -1157,6 +1172,14 @@ tl: { # no indentation sha512.source = "5a39568546651ef10937849550c3305bde9379737b21e24b2adbec532dee8192ddbdaaa77f2e6bc135d518f354c1b20d7c43bc03f65ccf47d423f4af1e75d620"; hasRunfiles = true; }; +"archivo" = { + revision = 57283; + stripPrefix = 0; + sha512.run = "0f6b7985d73ba3e62874bee7a05c215cea0008bdfd1b0c3df6795a2d6363ee2a209df956b4f9698ec93ee8d9c6bd62ab5bf3bf19cff78c968a97da58a80b5f40"; + sha512.doc = "88cf002d557401730c035727251e228effdd25d52e9d76edc950d0f3ee639e2eb5bf623c77a4e80dd902b7095076030b32aa017c8adea9f57912ca9de51ab7b0"; + hasRunfiles = true; + version = "0.0.2"; +}; "arcs" = { revision = 15878; stripPrefix = 0; @@ -1210,13 +1233,13 @@ tl: { # no indentation hasRunfiles = true; }; "arraycols" = { - revision = 51491; + revision = 56997; stripPrefix = 0; - sha512.run = "818971d673180323d20534faf9bcc41afb7da93f41df689b37237af19471ebba1942d0cef900bfd5dadfa5730295bca2e9c9e873ba2b25a1fc885f0d5aa3c4fb"; - sha512.doc = "10d1132c5f964915c88eed1c00edf982da80fb1dea3dec028e372eeacc91023b06a0b49a1b63e4442d23c0ef550f2651dc0f12246e3d58d0ae320006e9b49b37"; - sha512.source = "1dc2055ab0a511896909ee526b9f5b1adeb079dd9a1a6d64c0fe9ef326e29392d69088b47a7e26dbca2d32e5527549c7bcd9d8f3b28cf8c1ca7d442819488638"; + sha512.run = "68ee9188b13dfd1e45552fc0845b80df2a497a00af9d70eee726694708b214b9351d7955819d1a9e21deb6873cf5dab90416b05a58ebfcc2d31495992bc989e0"; + sha512.doc = "43c31b4a1cf254891226c796193415d81d299cb0e831e617c61d62728b6bca768cfd813ea4b3b1fb15a702411bebf53bee36e025bf8ae8c287cfed51b90710d1"; + sha512.source = "65a24651f3cfef479b4027a0e3a687b43016bb02f67ffbc69071f57b43914c4f3cb5ade46616b7841df948562ce3b8d9eb051739280181205d68f64f3104b8d8"; hasRunfiles = true; - version = "1.0"; + version = "1.1"; }; "arrayjobx" = { revision = 18125; @@ -1251,6 +1274,13 @@ tl: { # no indentation hasRunfiles = true; version = "0.3"; }; +"arvo" = { + revision = 57213; + stripPrefix = 0; + sha512.run = "3a6236c3f5e07f3ad709c6a5e0f7d2c90574cc897f6f5d470aa1523b537370587b5942e1a8c581fd96e43e80189fb1c7c4a2475823077feeb929ec594a90ffa9"; + sha512.doc = "3d3c6a92159b47e8dd5ae7360c06c8d5db8ccab609dd5f3db47db2ddc9d62badc3e6bd7c881ec5955003ac2b460c550ce56154cb2323ebd2bdb8205318a709ce"; + hasRunfiles = true; +}; "arydshln" = { revision = 50084; stripPrefix = 0; @@ -1328,20 +1358,20 @@ tl: { # no indentation version = "2.7"; }; "askmaps" = { - revision = 32320; + revision = 56730; stripPrefix = 0; - sha512.run = "d07dc2e9b3cd0dc7d46576fcf9f08c5a628bcc701a95d8d934e322666c93f649054b9dbfe38f7d9577ce3d27344e9e5a99ec8b1e710c45f4a609a5a2dfadd126"; - sha512.doc = "a170144d18c4a90b166c8a315e9d1f0d86cc5f2a53ef69381652c3f8307b85d8b70dc610bcb98be6eee1bdbedc02b7cbf097a13133da78d492c71db33d94b04d"; + sha512.run = "0f4d91a15053d40d329744c429540075c33e2098f6d9d07eccc5ad16c5696233dd01de89c61a7090dc127c3730ef04e24f8d56845919cd268ec8c0bc68d9c09f"; + sha512.doc = "268915d685c8bea4388055487ca0d30418557babd01547457449085e58d639bb17787b6b5c97fa99301555afa9d9d11754196cd2b1dbf48b642b05a835b383b0"; hasRunfiles = true; - version = "0.1"; + version = "0.2"; }; "asmeconf" = { - revision = 56096; + revision = 57113; stripPrefix = 0; - sha512.run = "333c07c67e35687f7d5ce658322bc0771038dbce2c2c438015bf268040be7981f992967229a3ef6b0f2e3733929fa114b0c1ab0eddf1bef434d0085d603590f8"; - sha512.doc = "7252880be82af7d9fe662d151a396fe7c460b43aa28c2466e7ece4921ab416bc79cc5fcecbac451798c4a520e93692929e2723b1142043b181629df8d1364c01"; + sha512.run = "9218573b7a91d5fac5358bb634fbfedee1c70cb687785bbc4633d9fd8c3d2a9f70d125d51c38b12f05404f5af676db89edb0d4ff3a39c56902755fc53dbe978b"; + sha512.doc = "154d49872d4474c591765e5a03f268411f0adc6472203b875ab17c897d1148f90a5b5c1f79ca44f35f017d2378170ea74f857f1a8c358b7404a737a5bc778ed3"; hasRunfiles = true; - version = "1.19"; + version = "1.21"; }; "asmejour" = { revision = 56101; @@ -1374,6 +1404,14 @@ tl: { # no indentation hasRunfiles = true; version = "0.8"; }; +"association-matrix" = { + revision = 56759; + stripPrefix = 0; + sha512.run = "1f33388d8d9230fb11dc1318cb9c189fb7c14ef7404193d1df35e83863869ab8cd7f918bef8fcfdcadbff29b3c20db7309026d0ee3935e78db0f5e3365f065ae"; + sha512.doc = "d22756e5fcb921c6f0e80c6d0f5322dda0be1a52a5de60b2a0d7ca719b4d92e4039c395e06f7b4a6fa080aed59e4c4c30ae9ace8139963943134048cc40e6c94"; + hasRunfiles = true; + version = "1.0"; +}; "astro" = { revision = 15878; stripPrefix = 0; @@ -1392,11 +1430,11 @@ tl: { # no indentation version = "0.1c"; }; "asymptote" = { - revision = 56070; - sha512.run = "38c8c9928b4ed067b3ac0fb2a0a1b15a0cb3967a33274162a21869d2a6cd80d96da25f7ad8572b6a87e90792136e06ec1656804db028907f544cdb4482283560"; - sha512.doc = "ba66eb645b8ed33dda47c473d8c8f65c7316161868d9a8dcb85b7680ae08129593a326676619ea7cb760599646a57394e18f5131b3bf55ce801bb676c46eb54c"; + revision = 56991; + sha512.run = "1a6676ea28821730b98e6ba1366b8a85d3a7b9bbb5db1eab7f3b90aa8479639b1fe42f1bb5a064ee3cde52d72254b614bc8972c39d0b33add9d781bd460227b6"; + sha512.doc = "3840b3051ea6c7e76e3a95b78dc2d8999af273ddacbd59ef9a2d492496f220bfb8905c34420acf912de7fcf858a8d39429a289bfe6a9b5e9ab6cc51322b3ff57"; hasRunfiles = true; - version = "2.67"; + version = "2.68"; }; "asymptote-by-example-zh-cn" = { revision = 15878; @@ -1435,13 +1473,13 @@ tl: { # no indentation version = "1.19"; }; "atenddvi" = { - revision = 53107; + revision = 56922; stripPrefix = 0; - sha512.run = "d936d42a3a5e2c4fa0dd9064658b450ea521e054c22ab9a30b3b11e0c093ba9961b3553b686021f0fbeae6eca7e40b2aedf3c42287ecb68a724c499007c552eb"; - sha512.doc = "56f03915ef772c486e44b0b80ceb29543c2c1e2ede3ba5b4028af17f013aec8f3d373912aa7b1ef8b5f4524de5c0946833cbe418932dc3bdfe10a752a18035e1"; - sha512.source = "56abe3e2c0b7896d4b5fa46f70569f5fa0a7f18970f8d4dd6255a3825d5a698467bbb18b84eb3400bc81ce799577f8d58884f7a1c5f38a1bc5ff77a8232d3125"; + sha512.run = "49b0a69eb308e19e3ed97406fc1ded6e80f15d7787031e2b71cc41ca2e1c74c19d3f3832ae13c5f1af70abf9f2f201c9a7ef669ed2e58349a584ddc767059c54"; + sha512.doc = "d60dae681800be4495c2690f78513475d98a4480364306eb26c16c551b0e984f135aefccdcff549e6702b2b62bb185ccbdacd85dd3c12e5b20c128d9397c0e8c"; + sha512.source = "a2c6321e825629a75d745f0bd03cab168fb51b5c33d5d256a621847f27ec2010f0331c37644e95b2ee40604d68cf34772a3dde59b6c6fe340713c0e593fc318c"; hasRunfiles = true; - version = "1.4"; + version = "1.5"; }; "attachfile" = { revision = 42099; @@ -1558,12 +1596,12 @@ tl: { # no indentation version = "0.03"; }; "autoaligne" = { - revision = 49092; + revision = 56966; stripPrefix = 0; - sha512.run = "10c1b6b8973bc451d38f1051715d7f6efe8acc7420b954aae657bae10254d6919fc7e3d605ebc90e525a7cfa56f082a966bad600c54e50070f1c3fae2bec38fd"; - sha512.doc = "c0a1f2514d80e153b74efa94918c70cc16638d68c6b6e1ae4df8f765e13bc55218a1b7eed289f6dafba440ab7c5ef6cf1b6a728f8df161b21c9951894e83b949"; + sha512.run = "25e4d56033596a05c6b9e9bae4380dd5fc27d469cfa63272bb388fb3b38a57d2a980fadad7061c76940adc3d50e2115037b5299cd2f095ba5c2e9f47a88fb8d5"; + sha512.doc = "ef84201b9cfc06b3c6f9031389bd9b593e5477f92507843689304afa8db67737887773d1d5c0a2be2fc77d922dd183cffa0ca27063cf27cd3d41664f76803a7b"; hasRunfiles = true; - version = "1.4"; + version = "1.5"; }; "autoarea" = { revision = 15878; @@ -1646,19 +1684,19 @@ tl: { # no indentation version = "0.1"; }; "awesomebox" = { - revision = 51776; + revision = 57349; stripPrefix = 0; - sha512.run = "f8b841701beb248ecdc636756d954420b879028db1754319cf13a975313e7832e5393afc76f2edea579c6f38ba4a8fe779edcbf7f1442d7f179dbef9b1feb1ab"; - sha512.doc = "cb0a6e98faf307cd718b4c7409f3aa75d30a781b1a299d32c781b3b6906d6a74399c7a04d41ea421a5cb3def06d963d8fc87d841ae199e7e86dc2f1360e4e48f"; + sha512.run = "4984d58669576137746518b68988fd9837b5ef133eb8da948f67bb0d5f775ad961055871bb46084e420ef0564b6a4796ba81a093be93f667f959a45ffc0c6174"; + sha512.doc = "eec717fa5bb5a0f0d15cfc39d2172f8818718f6c7037fe962a0e811c131cbc91d3f3167077ec413d565e6b0b782f5b3f77b38257caa6529a6f5db7da8e163c3d"; hasRunfiles = true; version = "0.6"; }; "axessibility" = { - revision = 54080; + revision = 57105; stripPrefix = 0; - sha512.run = "586e60a85337059a44dd02a4e979e2d7914dabe2dbdd90d157853d76deffa8d4f7ce644636134f9c7e8ef9a99158832a9722dcab56161e14419aa2f2344418c9"; - sha512.doc = "7d6b0e9ba8cf4f524af95f39a1d39b4426d13f56dc7f6937dee874d33cfadad23ca64cf3bbfa66d1b973369ca03082794a6c815a158b6d60e0b0dec8bfec3f12"; - sha512.source = "ade173d78e8f9948e201d495e0757c4ca9ce86be6fb7f786c01f8db4a2b8ba31535b47c659ba02b67c608b5ab8e3fc773ae8234fefb84601c6d8688ad10e822a"; + sha512.run = "9b42a40556f3432e045ef35b23fb7fcb6ff295064645e5b9331d0ce99a8f2bd232d0926b46eacb5598da112dfcf3673225efd655573523dd504767a06a42686c"; + sha512.doc = "f3255c9d6b1eb75a501e5c36cece49cb72767e467c0853465d2b8a39f011138d7154eab2fa5287f9223b4f535aad5c2db25d2f76c286376499c71d0ffd120699"; + sha512.source = "c5ef10d286eccf16b270c8b487e91270cafb09ba10a88a8e0c925485a380c18002d399857f7dd42978aee72f7b1889c5dcde7ffdf2f5626424f31fd99a452ff0"; hasRunfiles = true; version = "3.0"; }; @@ -1680,22 +1718,22 @@ tl: { # no indentation version = "1.0"; }; "babel" = { - revision = 56581; + revision = 57153; stripPrefix = 0; - sha512.run = "1772ba9553ce20f13e9a8e10d69a5ce12d71dfedb07259cc2dfac77e8099db47c940dd7342bdf045b7ba67f6672d7410f4e0cfae6715da87db54740dfcfe3ec3"; - sha512.doc = "1552285e99e5d6bf542ff061f9503a94f33ac49dddc3d726b6ab4e10d07a6a84398dcfd7a0c701b1a78be7acf8a2f7609fd94327c16b79e0051b851b8859c54b"; - sha512.source = "f0f455c9a80e312a6da3839638de28b60a3ae829765327da30194534fc86960c1f83ae1649129bf2c2337cc61dbbef96c0aaa2b4c82a8108024d317f5ea684ae"; + sha512.run = "f096fbd407b22554b6e4a1f2ae4e50813d006b1221969d4a9ff9d3931e91a649885a553ca5bf79cfbac8711b7e3f1eefb2307958ad8148917012ee92f05a6ea4"; + sha512.doc = "dfb40dbc7b26940b99f6049edd11cfcbf4022398be059e0079aec7cca5b0f7034d54b20c2b8ffc61a044f577991f008f89f1328be64c317c83d9e7bbaaf5f271"; + sha512.source = "74b3212ac86ab8a0246c878453efe0ffba31a8c3c6392446db947c23dd0fb425069d11997ee964a95e6e9ff0bfdbb6338b493fd74afb71d6ccb77d53ea6169a5"; hasRunfiles = true; - version = "3.50"; + version = "3.52"; }; "babel-albanian" = { - revision = 30254; + revision = 57005; stripPrefix = 0; - sha512.run = "55231eb303d7a2549d21e2d3bba9cb784e95cb99edc29a84212539ce04eb27261078437b8902419e85c69e2a8d7e6fba7abcb86e7b6448b4ab139de60cb77d87"; - sha512.doc = "12afde1de6174c7aee0dcafa4c6df472c0096373a09726c5d4223d082b53b558185b3b48d1ab3204d03c4a89c5f5f2293136fae671c2f2913ea72109c3f58e19"; - sha512.source = "95c1550b76ca8ecf4dea6495b644b550dc2feb45cc3d3c597c94236e6d3f86a3a42da7bcc7b77b4ee6597d167da33a571da16f5f7e35fd4666ea708a86c490ea"; + sha512.run = "8a98ba1dc08bc2bdbba0793bda2a07a6c248543fdee56cbb047229d1cfe77cdf616c0ef023b0a74f877d9863768065f0e256ba35a1071e0dd3f2bbf2b47b7ebe"; + sha512.doc = "d26b9d933bbf0225f79bd8180f9dcc2961ea481fef7b535267034296062f8879b53ca47ed6b512fc724b261276be6d92ce045ba0c8bbdba0149cca6f117be8ea"; + sha512.source = "74212f36288599d730fafd00dc50839cf0f12283ed8653303471d2cb64a57217b4792f1000cb44411c7d5031e4597db67368964ad318e896987103af8e21f838"; hasRunfiles = true; - version = "1.0c"; + version = "1.0d"; }; "babel-azerbaijani" = { revision = 44197; @@ -1788,13 +1826,13 @@ tl: { # no indentation version = "1.3r"; }; "babel-dutch" = { - revision = 30263; + revision = 56827; stripPrefix = 0; - sha512.run = "3f967688c9124502243589b666e1e3af500329782cdad8da5225eb3fe6a50262c2287be02d6d6ec04f3ce81a6767b4d2821179cbf04dcea4c20001e8ea1a9f5c"; - sha512.doc = "5591a30a32ac2900266d4dd642481a5c9e7bac1062fcf5557ad4acf93cad0e36020c75e081b63680c0c96ff580a2156fded920e394a9c5c685cbb152e8d4142f"; - sha512.source = "98c412d7a2a776286fb3f78faa49da6dedab2d3ec80b5f722a20eb34fec53768ba4000debc952df3241661f1f86b7035d7e71f712be3fff91f13608dd0fcf87c"; + sha512.run = "4bdebadb6dabd378fb52eedacd8181623e40bd0a8215aa77c34f7a051a020d6c60230fa0203c2d519bfffcb9a374702ccb1d7c6b0482a232f1eeda5ff52f6c1e"; + sha512.doc = "92bb3f2df9706bc6af7d20df200174a4b3f0b3237a8f1d9259886272deeab4109e85245a0cf6cf5b43bee93b14b581b1fe5e0d4f7198b88a77e2fbf0c8156090"; + sha512.source = "5942ba0dff02c632f0a09e240b3576eb425ed1c74924c007572b2a7b8b95701777bf20b2a943acd0028682d5cf422988c51752c3c80806413c0227daf2f8fff6"; hasRunfiles = true; - version = "3.8i"; + version = "3.8j"; }; "babel-english" = { revision = 44495; @@ -1833,13 +1871,13 @@ tl: { # no indentation version = "1.3r"; }; "babel-french" = { - revision = 56333; + revision = 56607; stripPrefix = 0; - sha512.run = "387008584ad1b71c10573aef439f36838e6cea0d23e39b9c58804cfd9eb43297e64a3efc2c10a72324e89a91b0ccfc93114ff2e49a3e44433fc8bddb00e87faf"; - sha512.doc = "1a5068f911e3925685c746b49c670665000ad633dd3b9551d06ec5682c89151f66984240dfe1f7ec2278df02423533206b01725422e3f8bc21e5fac21d6ccb8c"; - sha512.source = "bce67137956b9f2f261e15951bd0c5a23064308421b4d4713690603a75eba1ee0c4aec50a334c9d9d993f45027b7a98b379ac2ca739ce55e595c73ed3194152a"; + sha512.run = "eaf680b5828b069907c0edf2b62c49475648f973f1ed220e47f6c05907e4b813021b0b18f66b3926ddea4266654dc91055913f3d6be1a799ef0bb2ac8241b9e3"; + sha512.doc = "67c54e55985a756ad52c6c904271a0b54b95e36f2da793d8804771c1606a354c075c8cb547d261c291fb70996fa818573f9f4e0e2c6f0e4a72be0ce71b65b724"; + sha512.source = "676c38f93a87b0fde0d7527f5a4e7db38744cd72e069dfa093e1bc91e365a219fe00a2d523ba06522f31aa106df1f391c669215bc4617a59df606f1cf3df179c"; hasRunfiles = true; - version = "3.5k"; + version = "3.5l"; }; "babel-friulan" = { revision = 39861; @@ -1877,13 +1915,13 @@ tl: { # no indentation version = "2.12"; }; "babel-greek" = { - revision = 54512; + revision = 56904; stripPrefix = 0; - sha512.run = "38db98876386d56f4c9bb96099ee63ca9f54938e3be615d5dd56f31d168d0b9ab1af3b8cea5b806d23da9c5c95cb29edf1cbb8650723ed23c9d16049f847913d"; - sha512.doc = "52e281383c779b7c3d4842ec338b4a53cc9068cd9b5c581cfa40326049b244b37e2757ee8a68861af0805cc38a11b9c731446aa5f59d74d7f6c835dfc9aa200e"; - sha512.source = "b438fbe2407f30841083f0087f99b3fdf0102df2ed46ef809c86122532e798a657ed3706f6ee07ec019c06fd27cb243f84cb95a4f770f0fa0d95aa8ea9e7decc"; + sha512.run = "6b0ab839f2e8a9562c8292fe8f7661a73148754ed816088be25d06537a58ba95ac34d9440bc4f3f35c3b720188b261b432887f9867ff94b51261076f9d8e0160"; + sha512.doc = "965dc1293a90ed4f7c777d32887186febf28f7a174a00af26c19720493605291d1b17a5790b5541547f9265d8a1a3d102d9a4fae79aba43780c384b7385e06b3"; + sha512.source = "907493b19b16ed7a0c6377864a4b8266732065e2330c746d118dfec14a6a4976115eb48bd6b4286ce48cf6823e30fd3c9f06551aba2f52ef4a8ccfaf3f800810"; hasRunfiles = true; - version = "1.9j"; + version = "1.10"; }; "babel-hebrew" = { revision = 30273; @@ -1948,13 +1986,12 @@ tl: { # no indentation version = "1.4.04"; }; "babel-japanese" = { - revision = 50735; + revision = 57129; stripPrefix = 0; - sha512.run = "eeab94dee49061fabb116702c1cdd0c6ff11eb61994c4bc20bc2147329411c42f5db7faae78141ca53380c308f8b310f592abbbc77d67654270b6b1d72ca5cca"; - sha512.doc = "152a3c6d723dc8bcbc046275993b207103e12ab551216e87aa999c2c912acf2ba7e1bd54b0a1c8099940c62f564a268da04372ee559da7a7c56b6e0a32e29b4f"; - sha512.source = "04bec4bd09f46c0c6e25a0f59ce2435a5d5fe222268616b02314ef091315e3bdb882381890fd304c07d5398e95e217aac46b47734fc9e6efbb32649c9f974cf2"; + sha512.run = "5c4d9be1853ea0cc90b1338bc69881b1f1a1d2b1b7bb37150747e6247ecbf2c53eeb2b29c6f08632144d9146b1891c31c6083aef0a45c84155ecb2820c120ef5"; + sha512.doc = "f2ca8d3b11d13df5cdd948cb21f7a7320d743e61a2ab33c8e9c7e69133f15dea205d3335eb0609c603d0523a4e8996524f469708cb49b07d7fb1f26b14003a08"; + sha512.source = "0edf9c1a4a383f0ad0f70bffc1ee37976d9afb80b211e5c31d53ccbb176c3fbc7058694b680506d26cabe65e63fa03a73d5e80cc91ea0aecd9a9eae9ec205dc6"; hasRunfiles = true; - version = "2.2"; }; "babel-kurmanji" = { revision = 30279; @@ -2063,13 +2100,13 @@ tl: { # no indentation hasRunfiles = true; }; "babel-russian" = { - revision = 56597; + revision = 56663; stripPrefix = 0; - sha512.run = "fde01c945239b63ac99840dafc08569e78d0a2abd143664693324004e0f815003b1a6043cbf281d5b7fdaba8753b3730e059f6f599c96466e1c2d0488f72e7ac"; - sha512.doc = "3acd55a7e161cae33fbcfa68e762d61b476d12ea91560822f1de0eb35bc8b04127cc7ef30aca2e6fcee3f4665357e23d570d1b76dd2bbe0539773867c08d8b0b"; - sha512.source = "b5eb81e9bd501846b3bab3aecea6e6789edd189673cc713e60fa37391b6a09892144bd247c38c197abe79124a814be5275c01788984b5616572d106f821430a8"; + sha512.run = "a13697984db65dbd36387761012062b6e55195137b8b1903114ced022e2def90ded6a8a9e3987b76f81d5d1d73202c371d835c1cbd00e824cd13c78aa04a2136"; + sha512.doc = "7be47356ab7350ac5d67ba2ab2f14ea728c5dde7072dcc527785f96de5286aae94e22e48692d544ba7faf6b13ff7af103f5a0585a189fe83b0cd9c03632c030b"; + sha512.source = "5d2f16e58c7cbd868a5c51f47fc703a43618f52cea4cc35bc518944b8d6fbdb821e8a0e8cd6382f7e81dffc4443ab7f3bb161e07caa7f90750a1f0766db36b19"; hasRunfiles = true; - version = "1.3k"; + version = "1.3l"; }; "babel-samin" = { revision = 30288; @@ -2171,13 +2208,13 @@ tl: { # no indentation version = "1.4"; }; "babel-ukrainian" = { - revision = 47585; + revision = 56674; stripPrefix = 0; - sha512.run = "6729384e1029580ee8ff2337508cb5998e8a385de25da4d5969341869f22f17180b03a98a403b583ac5b7a965c2a07d5c96b0aff1b93b82cdcb549b4915ceb4e"; - sha512.doc = "f36acbe23a159e2a9547d7cd5b64d529c49a35353f5a84082a303204f8a55f088f1beb0aa75d852595768a3ad10de34763329a22e2c87c5081ce2d6fa4076309"; - sha512.source = "110d08aa4e84718e04223e4e4745a968c2bbf3d7f453430ee02eec57a96fe952046dc9101b95f90a7de84bf6a4dbd65e8697e1980f0d85eee84233554de31370"; + sha512.run = "10476b0dda4e80472aa8d3b3628d372da10f8badd37df6beca434e3bf1b9e135972acd5decb63eb6f706b700ef969136117b96ae5a6d6209fd75b9c13d06567c"; + sha512.doc = "7dd3c5d02024cdd4e0c06b57d3aef0a723aba718760efd4b1214b7da2dca8877293bdfff2d3893e531eb734d5551dd93afc03dc4f3413822a3df0b40b4bec43b"; + sha512.source = "0fec3b7b65f3e2a5c0b426d4c55e55ec0551fb38a786cd36db52cdfd6c87909ff82ca21328ea33c7089b39aa2694d4d62ddcd1d59255ae929d4ec85a44abdd62"; hasRunfiles = true; - version = "1.4c"; + version = "1.4e"; }; "babel-vietnamese" = { revision = 39246; @@ -2198,12 +2235,12 @@ tl: { # no indentation version = "1.1a"; }; "babelbib" = { - revision = 50354; + revision = 57349; stripPrefix = 0; - sha512.run = "70214f7a3e16c1fe4b3bfae479df63c10f9b654b34bd29abe3b4837b1a375b1a13077d0ba98e46a78ed702616bccac6aac3c70d422c85e37f462a376b2ee2589"; - sha512.doc = "729fdb0bcc60929dffce6883db377e487a31610979d92f7be48e017a6f982298a9d113f06376bacbf2406a89fc1ce10cab86a43de3d92be8aeea7e3cb7cb9f98"; + sha512.run = "90e78ff6086c80e0102ce7aae74070d3b1444208f3957e354f2c940ea4d279f87ed59e6c3310c6d9fc1464c227fb0eb4c3813ca679a6e94295e0b824cb527376"; + sha512.doc = "cd5785a17242a523f23093f8389f1d4c5e3d49c0656ac3f168a8627fb153b217b5a14e5c990c7afd1c5ea7324b5aad2e3dd40e8c2ca0f9ba9064f91f7214bf90"; hasRunfiles = true; - version = "1.32"; + version = "1.34"; }; "background" = { revision = 42428; @@ -2224,12 +2261,12 @@ tl: { # no indentation version = "3.1"; }; "baekmuk" = { - revision = 56291; + revision = 56915; stripPrefix = 0; - sha512.run = "bfc4909c549dfa89f11f707fe8bf2f02f118ccef8863c7708e1fdb65fd772605b9a8f661a41b1ef6f259492e9383774a7751144191f29c285b13840843248419"; - sha512.doc = "c583a3ea88de39681bd49ec722f80ee09ffe43dc668a1901c73cd40eabcf3be24bdfbe582b72426cc56fe2b27d0f810208ce7feb9222a3a9e0cc2fbdd0e1b408"; + sha512.run = "f9270a17459444e128b5fc5d12b943043fa4ec2f87ee5996808f9dfad1c4c4146787db3ecd267767a375d1fdbd56e15850b25cd7c9c71ab270e3517b5863054a"; + sha512.doc = "3a3819f892bdf69afeb66b9fdfbfe1ffe06e2a488425e814cb3a1e223ec9659a71f0571dc25136e0f7afcdb616f717dcb3823b89e640b0894313683e4f79b197"; hasRunfiles = true; - version = "2.2"; + version = "2.2.1"; }; "bagpipe" = { revision = 34393; @@ -2337,12 +2374,12 @@ tl: { # no indentation version = "1.016"; }; "baskervaldx" = { - revision = 56388; + revision = 57080; stripPrefix = 0; - sha512.run = "34e55c19f6675ef921e02e48dc8dee0151a975cf86250512c91ff733d82d2cf6e7c13dfdc8b8f7bd4b59bb233c5341689ba18cd35c4af8114df34405653564c3"; - sha512.doc = "b5d6e6f4be9d72265f61e8a3dcba11155cf4a3cabae0add57bc5fe3938ac0b9605cae3770aedd46d4243106dc906db3c1634abcafba7f73ef656b45d61dde03d"; + sha512.run = "42db4e01e127ca3870f6eb692217a7b0c24857599f01314c41ff6f26664e3559c4a938fac1557e799e273b42df2884955df3dd72f8e0b44456b414b8831fc019"; + sha512.doc = "df3462932654a6fee3afd099a92c5d12b6999003af1c76a3be3ec3f32035b76993b3806c88e670a26c0857bbc699efa64063a4f23c24055ec337481e65019e91"; hasRunfiles = true; - version = "1.074"; + version = "1.076"; }; "baskervillef" = { revision = 55475; @@ -2443,7 +2480,7 @@ tl: { # no indentation version = "3.1"; }; "beamer" = { - revision = 55908; + revision = 57140; stripPrefix = 0; deps."amscls" = tl."amscls"; deps."amsfonts" = tl."amsfonts"; @@ -2456,10 +2493,10 @@ tl: { # no indentation deps."pgf" = tl."pgf"; deps."translator" = tl."translator"; deps."xcolor" = tl."xcolor"; - sha512.run = "c3632194b89f6e21fee4507ea4139215b018754a6b15cb2e4e02e7442baa5cb840393fa1d15f123dfe3d48d2312a9098b8ac477abc8dbb5a43e0c574ea8b56a9"; - sha512.doc = "dc19602254665ddecb9f7000e440671df67835142acd09044428f4c28526b0fddd86c68961bbb8d22cdd31ee171f6e15fe443d5160c232679e5a8a4b4a632ae2"; + sha512.run = "6eaf8eff8bf8e41d401368eb5c2a3a8676de36f572657dd47a0e638782632d5225353315ec7ec1ba5ce20ad25fd838645672d5c55902f40baa091f951b68c2e0"; + sha512.doc = "d5bc528d1d903964fea497764065ebc3053e230032e36bd08020663e641221654b75c76644085c9834149965d7131984a6d19fba1b33f2b54b0fc1e0d604187a"; hasRunfiles = true; - version = "3.59"; + version = "3.60"; }; "beamer-FUBerlin" = { revision = 38159; @@ -2591,12 +2628,12 @@ tl: { # no indentation version = "1.0"; }; "beamertheme-focus" = { - revision = 55475; + revision = 56967; stripPrefix = 0; - sha512.run = "c3e4be78d964598e6e83be90030cf30a0d28e0a36e639b76dc3b9b4fc1170392a97cbfe94959842a789c86422448f9b0423ae242cfca9031d68e15ac23f6968f"; - sha512.doc = "9771d48a5966da9a8fbb5417178d36769e092fd2179582c69a240f7adbecce3eb52a21a53291a34b78357b722e459a1b32e2ff4d6d338943394967e5e7eab8a9"; + sha512.run = "b3b9be62e244fe4288e77113aa8488e24f83932d5e2b31accd30d62ced1cc8bff4b44183fe2be375e69375862237f18b6f0b40c6201f1199cd1423b09c2a60f4"; + sha512.doc = "57e8e51ac4a4eed778796c916713420e9372429fe7d310d9acae988c6d540ee516e64ca290dc6feebe28ad81877ee7e8919b1145e626821c4ef72c226b3cdbde"; hasRunfiles = true; - version = "2.6"; + version = "2.8.1"; }; "beamertheme-light" = { revision = 49867; @@ -2632,12 +2669,12 @@ tl: { # no indentation version = "1.0"; }; "beamertheme-pure-minimalistic" = { - revision = 55360; + revision = 56934; stripPrefix = 0; - sha512.run = "6e915b404db09b2400b0953eb543a3ab9315b2ef782e621176e9db7de576ecd666c34f16d54e27d5500fab889d178793cd6768b63a6fc337401245fb897df4ca"; - sha512.doc = "4a0e1f612ffb1188d2a0a42a23056ae84111ced5286349b7cd69fd28ae6ebddd03ddc33e53ae2121dec39ac3ec1cf5118bcb2b50c3d77da1ff3b5aa170e4039c"; + sha512.run = "b9c6237108e1aa5f4859ebd1100efbddd2bca55c76bca876e0e3a0c10dbd322a3ee834e4e452b80b2f7755ce026fd2bbe5c69434371ad29df1fe3280b409bdc6"; + sha512.doc = "791e3a367f5c7ebfee453e7d7a76753763e2bbe122616e49fd0d4268dbd274e3ecb308b5adb850765d143bc46a311316f86bd13e60ce1449b0217d7b4f733830"; hasRunfiles = true; - version = "1.2.4"; + version = "2.0.0"; }; "beamertheme-saintpetersburg" = { revision = 45877; @@ -2688,9 +2725,9 @@ tl: { # no indentation version = "0.2"; }; "beebe" = { - revision = 56534; + revision = 56713; stripPrefix = 0; - sha512.run = "e1119cd8795e66499b811391a8ea2cedcc5e095d81edeb01750113495ce751b0edc4359ddbaafb216ce6dbe34d5748e2afb6cf8140349662d5819d9121183804"; + sha512.run = "0f48ab57f14d50a4671d616cdf9bc0431f4c092c99c911c0d839e09c80aca1b5b1b757e7fbebdb39dcbed63215eff62ef5935871743df4f32f1d1e07d20e45ac"; hasRunfiles = true; }; "begingreek" = { @@ -2790,13 +2827,13 @@ tl: { # no indentation version = "1.3"; }; "bewerbung" = { - revision = 37880; + revision = 56998; stripPrefix = 0; - sha512.run = "a82ffeb4fc7fa5bc42f06476df0c985d59d70c81b34ab50f10cf2117f8861a09b90ef3f53bee78291842a46fbc15bc40663d65b88c7c682c72b25fc86ccff2bd"; - sha512.doc = "d9fb4f9da944e132187fce6e987be8eb0ef08cce80ce63e8813c1af8738dad61a93aa7c2e214b3ac0b77c980f8a000251ab9536c8a7557b9c7cdf66ae42fcbcd"; - sha512.source = "260f6f1b5484358c7b558f8b78ca68ec5ac691fa367e634e5fe6f29b06ea9eeee868bce9e10717971d85c5ac23b71d853ed746842ad7674f7e913cf16b9def47"; + sha512.run = "85ea6341316c231786612a29fbdd4bdaa412512f23e84431669a60262b5594fee908f68b8805ec79adf8445eed724327e4df8e692e75717710498486f86a7f22"; + sha512.doc = "c414d4d98b74e8720e487ec2ff5040e9e3de59dcce449698d5e781abb300f13679a5beb2c4af3439a8ded3072a9e69d7bab431869309e87a7b5e803ad684d177"; + sha512.source = "25749c09482ea181ea35b95bebabdded49908ab6796ece3d907261907581118eaf626dba418987349d503a4ce8dfde87faa5ff2b750a53bfd6ccb4c7525ea141"; hasRunfiles = true; - version = "1.1"; + version = "1.2"; }; "bez123" = { revision = 15878; @@ -2868,11 +2905,11 @@ tl: { # no indentation version = "2.2"; }; "biber" = { - revision = 56144; - sha512.run = "9ed3866c784065dfc27655ea45679bc32851299e9c15974e19fb635b7d7bb356b34b4339274babeb5650d7a2827471f30656a183aa66ded6a5166f4173dfd008"; - sha512.doc = "c1b5f8b10d332e2bb2f5e256f67416b7e3a468f4f0e5b9d38b488091c7ef991ad843720c2176573de3b629b3410218363b5ae4e1ce4a6642163fd787e8ff051d"; - sha512.source = "9bf1ed70c4b07adff102cfce504b4c6eff879a40747a17d34b8d30c2bd6a8d27e5969bc32a6b26304f4024c2ba57209bb277ded1e537850e615d654d598d35ca"; - version = "2.15"; + revision = 57273; + sha512.run = "85c07705dda6e4dac7fb3d3fcafaa156abee84f19ce8652b71787ef5a631ba4519ca35a34c8d0d83f90b8f14c583f83f820add220d0f764c19d1abf4c3b7a3db"; + sha512.doc = "9d86fe6df7fe33221259395aac86729708481ee5222868a455153e7976c91c48a9469a9813bb0decb83c7eba2a3ec408150ec47533f9a41c974587415266f6e2"; + sha512.source = "396398323e6e9ee4df904a827bab9b246e6fbba15033076cbbc3a63e4443641f81c19646a4145c0c0fae38af37f54a5fd2166799685f39183d349c8273d13459"; + version = "2.16"; }; "bibexport" = { revision = 50677; @@ -2891,17 +2928,17 @@ tl: { # no indentation version = "2.0.2"; }; "biblatex" = { - revision = 56166; + revision = 57272; stripPrefix = 0; deps."etoolbox" = tl."etoolbox"; deps."kvoptions" = tl."kvoptions"; deps."logreq" = tl."logreq"; deps."pdftexcmds" = tl."pdftexcmds"; deps."url" = tl."url"; - sha512.run = "e32babb9276e130311ba93e3a5b107f012e406fddba3594cc2eb94d92aa5508522a868e0fe0284b5e28bc90183c0700d8784b0d4bafad6c207261b9d052de74f"; - sha512.doc = "be2dc1b5fb666c25eecf9bb37d9766e6133570af56d6b338142a73d8e025d541354126a2f57f7f64613c727d9a92848b2f614aa35d5cf53e61ad7920532a643c"; + sha512.run = "9d8fbb720f69afabb42ff17287ba61760d910b40c4b90923bf46fa0aa9e6eeb188cbf09f533f0916af145a361702387fce95ece74feb3a535d6409a3fb39f684"; + sha512.doc = "c81fd0590e7662c7887274effc3e1e0badf0d0c67fc44f32abf8c8da3426549a1adbf6703fbd530e595a2cfedbc4a5a089c703f3a542ec0416705839ad093bd5"; hasRunfiles = true; - version = "3.15a"; + version = "3.16"; }; "biblatex-abnt" = { revision = 49179; @@ -2994,12 +3031,12 @@ tl: { # no indentation version = "0.02"; }; "biblatex-caspervector" = { - revision = 52802; + revision = 56837; stripPrefix = 0; - sha512.run = "0dbc78505f64dfdae6bfda4276f0958b046305b847c8d228d8ccdad2657c571866380bcf3026c6ebe260e27060c184dea61038b99079bf93c0c98994ca64b267"; - sha512.doc = "91e37539ffc49b637afbfd097071fd6b0124f8e6a531287019f21c1ff9d13d8cf57d7915fbb65e489ac800323dfde2b251da8fa1540d6bba1cdcf19347c5d03d"; + sha512.run = "d3e8c56ef35444c740e505cc9ccd3a3e0fc7627de17658f2f83865fe9dd48610a42fb226a0896b642851d4ee8a6e4bdbf070df32eeee047bdca001a8a8e34c94"; + sha512.doc = "076578ca8f7416c698de9f54765ffc95fad9a9d504f78c50648bd1aa3a12132caec3ca067aee94731cdf71af97bbb73f4b85afe477ccf128e587d221fbe5cb4d"; hasRunfiles = true; - version = "0.3.4"; + version = "0.3.5"; }; "biblatex-cheatsheet" = { revision = 44685; @@ -3048,12 +3085,12 @@ tl: { # no indentation version = "1.0"; }; "biblatex-ext" = { - revision = 56150; + revision = 57287; stripPrefix = 0; - sha512.run = "e42c5c396c5b0134c4213dd1c6d61f7c5db5c809d395d45ea10eb3728946bf298a04e50a201b5dfa495e0a706f4ba296391f882dae8354ce38ec35f705298e03"; - sha512.doc = "e04bcfa64863a33ad7564cbae3d148186c993ae23d5a039e3b8deda42a4572ea1e548a170df1aeeb7aaecb03259dd1282647c7458009806152b997608bb2eaae"; + sha512.run = "7b0bd0fa39775117eea6ea88eef2461f7599a67a19203642884b018de79ad05584b79a75faeb0c8c69d357c9708f3bcec656dba712bfe0b9490e76f32a55b0b2"; + sha512.doc = "8a486e482964c073e659375290daa927f7313975e2cc2a6839987e7b510b0f2fba286a0659e0c2728c4f004e1cd475aaffd0192f7015e2bea9b5a67e5ec1419d"; hasRunfiles = true; - version = "0.9"; + version = "0.10"; }; "biblatex-fiwi" = { revision = 45876; @@ -3072,20 +3109,20 @@ tl: { # no indentation version = "1.0v"; }; "biblatex-german-legal" = { - revision = 54297; + revision = 56939; stripPrefix = 0; - sha512.run = "d5cd757da88530f71560785189aa2830a2a2c6677529a10b318511b472e7a4bee03cea0d627e3d7eb43c36d96577c2b757ec84617f2a2812e99280184d5f03ba"; - sha512.doc = "2422b1918d20102ffb76fbeea02592feceb408e46209d2aea4146434d5f78f9f1f6e1cadbb919a8be8b3710ace7258d3c3a919103302b6bdd0eaf4a6ce4ee3e3"; + sha512.run = "a82cb2c531e5f3671b0ec29ae27f9df9ea375f9dc616286805e8ff2a8940437427c23c51d09e477703e60c7aa70645430ed98890efbcaf9593b1747800a9836b"; + sha512.doc = "d4108ee1d625301ccc32ae4202002d9c33c1cd9817b2d26430eb1acf902386817aeaeb6af518b67669b2542a3eab91e0f513bf1ad5ef8ba2572c5f5d7b813382"; hasRunfiles = true; - version = "001"; + version = "002"; }; "biblatex-gost" = { - revision = 53916; + revision = 56790; stripPrefix = 0; - sha512.run = "a620eb113751c856e3b7838067e35af53b9ca54587b2eb76fe6a613b202a66569a607801cbfdc18afee182467841f9031db62d3777378d923a559f3811eb6f10"; - sha512.doc = "d74575b0eed08f5e75fb31f8bf2aa3cf00e4a896f34119ab6665f8add1b938ded58e81ed1ac16f7a66ff088294478eef630789c8350a6c5767d4eec829f678cc"; + sha512.run = "c9dad05fd20f6147215805df07cbcea228d023b2051a2b8fdac28e55d0d3424d81d71f48d7dbbd679f3a306c1385dd2d1c50d8d128432d3d64abc9fa96373350"; + sha512.doc = "90220ec8159d1621e54ffd83c587d111bafdd54ed3d104146992cef5340d55093166283367e4dc3cb21ea2621122b4080d0a849f7ca2b116f262b96b6d177ce1"; hasRunfiles = true; - version = "1.18"; + version = "1.21"; }; "biblatex-historian" = { revision = 19787; @@ -3096,12 +3133,12 @@ tl: { # no indentation version = "0.4"; }; "biblatex-ieee" = { - revision = 56222; + revision = 57256; stripPrefix = 0; - sha512.run = "16cf9d5ceb28274a0a33208f4d47fc6c93c70526f4ef4639756ea00c261b6d62503baa3029022bf2bfd1b3ef73fa636cceb2bd3f7c7d63d614890672561e144c"; - sha512.doc = "1fbca2aa8ed98322e4da15c663eadfe401b68d9f7e831817f4267dff31f13d9c45f1ee81ffa5c2f8753b8b059be8adb7e842e8ac320dd02cc7f301cbd97b7d03"; + sha512.run = "edf4d7d3d94c080d44154e06d1275e9a973f4d59fcd583c6fdd5ef6038db6430fc9b14605f42bf988226a374102827287157df9c2a805084969e83604d31cddc"; + sha512.doc = "4cbe9498f9a8bf08adae00d3bfd9f86d0c2a33f19d407abc13d025eb568d5e46b83e887d12f56a0d330e67ebdbce5bec6babd8812214750b16e1c854774b9c1c"; hasRunfiles = true; - version = "1.3c"; + version = "1.3d"; }; "biblatex-ijsra" = { revision = 41634; @@ -3192,12 +3229,12 @@ tl: { # no indentation version = "1.0"; }; "biblatex-nature" = { - revision = 48940; + revision = 57262; stripPrefix = 0; - sha512.run = "265427460a57fa3cba846b3e7dd4fddf9639c11e223cba5e7f47da5b18ed1d348a70c29204378ab560f2eeacfdb12257c25482a1c3d9836f9025d0ddf987b511"; - sha512.doc = "9053472af9e07e4c297ce0650c7d9d20b85dfe22645652a9be49e950bc9718160433e6ffa01e5d0dec04a036425e31d4b7e6c31de9fc7553a730720fe54eb36a"; + sha512.run = "b4b12abe904d96c9489dbdf248042ed1f1af1474921e0835027220059492f2441aace661260fa3632a65bb2c1ec0ab4e521014e63a14f7fb835293fd8191c2fe"; + sha512.doc = "c5169189b1225dba8631a0f7f5ceb5bdb5267888b2817716e23aa79bd4516665965b4343ed5e1a8e5099eb59ca64cea9edbd31613f7cb02f161b8ba561c6d4e5"; hasRunfiles = true; - version = "1.3c"; + version = "1.3d"; }; "biblatex-nejm" = { revision = 49839; @@ -3225,13 +3262,13 @@ tl: { # no indentation version = "1.9.0"; }; "biblatex-oxref" = { - revision = 53571; + revision = 56706; stripPrefix = 0; - sha512.run = "deb25777940c0aa54976865590f629b866d5175de57fe21dac0193c4991eb5333591f350475bf9ad4fee253acea2c27f9a6abc52280f487b422f70a9c77f5877"; - sha512.doc = "f589fecde40d9e07d99b453c9119668d6ee3a9b672a2a3184e8aba08e6c18484a359ef598c7a5ba9f741fee104b7d1260144075f28767064ba6971d5965771e3"; - sha512.source = "3c979ac6b9cdf3a256f29ad012068cbf901781a0f977f79603c74eadd38cd8e21365efdedc6979ddd86b145663f0ec6f74df6d6cdc7985f3836ff351210bbf77"; + sha512.run = "46cd9566e5cc55646b8e3bba36ff70f727f8aa0955397d11bc2f9495ac47a64436e361e6d54bdbee58723e429b8aa6398878a16f5ea58fb0d92bb11c198d113c"; + sha512.doc = "ad716ed5a486f743f0bd5491558dcfd511d44e58ca02b7acde4f6c65dd7b0244cfb990ab63ad596dd4f079bb8b75362e187a6e07dedb594bc61b2ae277bba562"; + sha512.source = "c21a0ec18ff976493a96429fc069677f19935b0ed1e2874094382c5576e6e7dd7b1b25ff0e8cbd2527872517aaeab2177d33e686476cde78658b70b1d915f1d1"; hasRunfiles = true; - version = "2.0.1"; + version = "2.1"; }; "biblatex-philosophy" = { revision = 56493; @@ -3267,12 +3304,12 @@ tl: { # no indentation version = "2.7.1a"; }; "biblatex-sbl" = { - revision = 49426; + revision = 56853; stripPrefix = 0; - sha512.run = "dfbe4de870b93fd1bd77aacf003ea56926adc6d52d0b5f47125d411738a66822f8c99bf3d58d0fe955105a30e5f2629a0c37ef5bc3cf00d3ebe895cadf621063"; - sha512.doc = "c7ccc14015397b816ca508bed2533fbc2ff183dbdb035d13100e8ec8faee18ea7ce10f7d8140b2ebbc6d58831db59ed6a9d7a4b75b0ef346081deebc7c323b72"; + sha512.run = "b13fc1b54270fd7b79c3dc71388152b9dd81ee868ce382063fef690c828dcac8a11127dc3cb1c02b138a16d17dd5a5e311d8639efaf8f84e50aac4de6cebcc93"; + sha512.doc = "815f16ab2f6edc7767fc1bd95f4e792c435e605ddb777e65ed54f66f8cea4e15b6cb80938276b1fa30184a498e628d32e2c226d97b7afa99b6022c6f6eb2522b"; hasRunfiles = true; - version = "0.11"; + version = "0.12"; }; "biblatex-science" = { revision = 48945; @@ -3324,10 +3361,10 @@ tl: { # no indentation version = "1.2.0"; }; "biblatex-swiss-legal" = { - revision = 56594; + revision = 57349; stripPrefix = 0; - sha512.run = "b0d626284d4bea56c3f0ca7c1b551d3f6e4ca3759aea514de97ac1a3f3a1eeb4e31cc7b4f8d321357da1dfa96b5de5a4a23ecd01e68c10068d30450b6c158a39"; - sha512.doc = "2cfc4d0ffae18fbfe022bb4613d5169cb65263df639dcf44368c9e9d1395ade3d001bc6b4c4708865056a017fdb1107140195e53ba4f21bf82ecd8d4c543f86f"; + sha512.run = "0e60b726e6d0ffbca5108c38daaf8066e44f401d553b9e1208eee1b13199e9c723e03a94fdbedc86dc14a0ce6ae7a94a7dd197773aff6b58f0de727a45d6e7ab"; + sha512.doc = "0d628718be8ad1a5857ab2462097356f5c6ced313741adff0715787c5bcf60bddb072dceb4a695709a27fc8cccac119bab20b56edb4a7d94a8d15a99cca24981"; hasRunfiles = true; version = "1.1.2a"; }; @@ -3454,13 +3491,12 @@ tl: { # no indentation version = "3.71"; }; "bibtexperllibs" = { - revision = 54512; + revision = 57137; stripPrefix = 0; - sha512.run = "32263453ac7fbca7bd9c893d363c575fcc5bc160e41d952c6d6bee137c31f242abcf6a285d0f817614b85a42cce7257f8400df152c185a7fa2acd018fa9ab4f5"; - sha512.doc = "74bf34744140a60c513fff915921c5fe5c2245e0145322bf8f3a8ea0ceb0166dccebe6ca4a6beb22c9a56a1fb23dcb70e5a92b6b48cef0e7471cf12570f8f991"; - sha512.source = "9b36fd9a5de4c45716b9ff13437765ee742bbcc1b7314c6411942b8cb2009ad4c27d24e3cc0d71036873f8e5430ef18ff7cc96883fc63da35de284b939ebec98"; + sha512.run = "a2989820b603d7001bdafd85d637d500a1f27640c37ed48990acd5cd49b8c9d0035457f9c55bb79dad5c9397fd5d4f46fc8a10834bb388a0626daf8e8269a2ba"; + sha512.source = "b4cb508f2e24de447427bc82abf3366f5f2afa0b5a5a827e1b129e8b2819878ea78c2057c771dcdd86e362eaefa942c90e0f7285a8495256a9087667cde2325b"; hasRunfiles = true; - version = "1.5"; + version = "1.6"; }; "bibtexu" = { revision = 52851; @@ -3625,6 +3661,15 @@ tl: { # no indentation hasRunfiles = true; version = "0.1"; }; +"bithesis" = { + revision = 57233; + stripPrefix = 0; + sha512.run = "63679b88ffbc811fd87471bea5b277014ce16b3c9742c2e3dc34a88e7b8c0f612b0fc0fd40e6b20efdc2225f21fcfbeaa211c39bcfe6d100e09e0da960608990"; + sha512.doc = "9d9ac7ae83d2f456f1bbd76c06f9795e4c3ccc156f53ff2c482faf05c397fef0489820e9baf115b7776192b20f6db79a3b8553d9180a6d4370442276896a2743"; + sha512.source = "629052b8eda9f325181f1cdaf4f276dbccdde557597071e8bd8d44bd23989d700b5db2589884ed62b8b17ae789b53e75dab8b7ec5e8f92edbf6bb614b7b02cd0"; + hasRunfiles = true; + version = "1.0.0"; +}; "bitpattern" = { revision = 39073; stripPrefix = 0; @@ -3808,13 +3853,13 @@ tl: { # no indentation version = "1.0.1"; }; "bookcover" = { - revision = 46410; + revision = 57326; stripPrefix = 0; - sha512.run = "1a96e15ab73c11f36b58dfbc0109529fb9bbe322d4c589222e122f774dbcff5337e88a5350a3fac05652aaf0010cf97ea1842693102acf00e9a22db7b6bf77f4"; - sha512.doc = "1f017e0071060f82e5f530d3726d1d91c5fd742c6a29613a2009756d96a2afcbda1e647cc588c350e90cd65be67207c811ef6466cd863c1b80b39f6afcbbd7e1"; - sha512.source = "e018f3a388f3c5d0a4ff9f35a952ec96e7af45b2469122d6dc225ae6768704ae9884933200b8a7cb62c1e182602ec697daca530cc966d764ed2d7fe807b09328"; + sha512.run = "1ea230af804c794f26919542d5246d16cb7fe1060f69d7c4f99df327895b528c3565f9450c5a8ded68ee1833a08f6c55c92bb5dd92855d4869b0af0ac5ea0684"; + sha512.doc = "fcd7bf97646458420e3d1ce0faa6d38f7a2d03a0722ede25fda763df506a27857631db95b7085f22f8d5de44551d1a7fdb54b9d28d9e4532587d33f2150c25f8"; + sha512.source = "982ad86158e5dbd7c00e323b77f5e685bb4737615b11b35b291eaf10995d4754701a1c1c0d876ee05d8834367b153d5587546fecd939eaf1764b4b2833f2cbdf"; hasRunfiles = true; - version = "2.3"; + version = "3.3"; }; "bookdb" = { revision = 37536; @@ -3856,13 +3901,13 @@ tl: { # no indentation hasRunfiles = true; }; "bookmark" = { - revision = 53026; + revision = 56885; stripPrefix = 0; - sha512.run = "29f24d431958caf824b8a3af098f9b8712315ac98ed7c1b4969b1a650cb8a9732341ea3af42c154e28aff35fa6a0abe8b3cfd24772662027912f355f3f5cd16e"; - sha512.doc = "39ff86ed5dace26339bf93b83e9d41a8d89cf17ba6abbf07be9f9ec72232dd27e88e88291d54c09b2bc1ff8b88bcc40a04c75767ba2f9b35a192dfbb8b6b9100"; - sha512.source = "411587deb4d6e436928dfe318166735444c178c777b2124e2479b993e4b00240060569bb95f56ff12d421e73ec191a203186318057b649bb3a48ca5cfd7ebbd5"; + sha512.run = "56d73af9961348a8436beb957b65cd9cb0bf62c9031fa71e5f247a367ecfbbb15763214710c66e057d2806a0dc0ce09b05a163d74a7687c8f0dc340ebdbd2849"; + sha512.doc = "44491b3165eb356327345f6f7c5b690db6435369e1c58571146982285ef849425935ad03ef1c9bb0e306af740bb6b886b21226093fd083e838da29d09bb005bc"; + sha512.source = "9fb4abf83e752b4c1301050feaa4d648d67fedbb6ddd9aa1bc253dd9eca76b91ce02c14fed17364d768d170e8b7ec4e991c23c582d121a4e72e4fe62a02f0442"; hasRunfiles = true; - version = "1.28"; + version = "1.29"; }; "bookshelf" = { revision = 55475; @@ -4208,12 +4253,12 @@ tl: { # no indentation version = "0.3.0"; }; "bxjaholiday" = { - revision = 49924; + revision = 57025; stripPrefix = 0; - sha512.run = "d028523087abe4587c8eaf877eb2dd0f4c12fc12055c29bc1bbf615e855155a77266df8cdf50bb458600bab0264836346a6d98fc183aafc92b546cfc7bcc1bdf"; - sha512.doc = "398bc4686c7c3b121260cbaf379ca66f7f64911b18d771c04507287d3cce834256662dd8f72f1f55601648cc364703f88a0713d9dab19c53cf19c252e2919fd1"; + sha512.run = "e062446514cdcf8e817f06a33cd02a29cd1985dff450a89baaf2e230fd9dbe20e92d3a34b661ec12c764c5a6230b1fede49034847fcac2d2db2377eb7d4450cb"; + sha512.doc = "3b44cf93b4afbbf97263b091509a5486bcbc6fc7091bc8a583be73f35487962af93f071547a78895231fb576054e440271abea20a7b07d111c197382b52ee746"; hasRunfiles = true; - version = "1.0.0"; + version = "1.1.0"; }; "bxjalipsum" = { revision = 43369; @@ -4240,13 +4285,13 @@ tl: { # no indentation version = "0.2"; }; "bxjscls" = { - revision = 56552; + revision = 56686; stripPrefix = 0; - sha512.run = "567f67ef9754d093e2ee01fcfaf3c34bf4973f28c61a30ab01a630e38a0910e9b9d20580a498f1cc456f70b965b5bb16a2df594d94cf7f44bd02b03609906330"; - sha512.doc = "0233721882bafcefac1299577ab6984bc8f45c4aebb4fc880802b93c964e724775670899b9963bae3de04c4383410839adeb720585f99bf627621e81907213b7"; - sha512.source = "444735c46edc534ddd1e9a5367308ee6f24a50c15c3f3744f0dce68c0d889fd2ccd2abd47a33c45e4e776650e15ec5ab7069f3203364bdcb2a26676cdac06345"; + sha512.run = "e5130b7aa29aae3743b323b8372d86d24d77a8ec57f1d77d3ffadbfe6a68b8e097f169aea3ac277e52dafaa3779fa69949cef651135da157120819b0939b7028"; + sha512.doc = "ab499484a06a37cbbbfe6a5e7dd90b0361775a8d64d740f82377892e99fb929a943bd87cc893d71bd2672794f3f2c60fd738d710709ddc1b41cf9e2d3564c293"; + sha512.source = "54c973e9339ffcdd808f3bbc5566ae30f8b7811886b687e0f9adbef9a5bfc777eef571ba9d353700c07366bbd0526bacf1ed2bc2ba77cabe73f4c1fe4a9d8634"; hasRunfiles = true; - version = "2.2c"; + version = "2.4"; }; "bxnewfont" = { revision = 44173; @@ -4297,13 +4342,13 @@ tl: { # no indentation version = "0.6"; }; "bytefield" = { - revision = 45339; + revision = 56821; stripPrefix = 0; - sha512.run = "ae5c3c97ded2cc83be2dad6d67132b75eb55b22ffd8d4c0bd49dc842344a310c4ac80571165e43d2b446148dee1ae3927fc2193a92e85e75ad457b4732bca7ed"; - sha512.doc = "6657581a9b97383c2dc3f8972ff77461a73ea33ecc0ba4dacbf0188e1db0dbe21e2d324dbb8fac7f05fafa585d3672d6de7d7db267a8e9f5e623838d0c46df5d"; - sha512.source = "1fab74d218ade9454924cff4345c55d6dde25d4350cd238834677d24be89ddc58ce7a610e089158281a472b102db3809979f25a57c0c31ce50dbfcef398a662a"; + sha512.run = "a36c81313224ac79fdd7d51f954aef437f011314061473455f0cc2be0cc52659c83400140a3b924a75c76d825b14ce3135e324438d9bf8830cf40a1c4d536a32"; + sha512.doc = "1aa94c8da8ca322cac0360205fc2724a9108aa0ebd3332fd0cd749123d7a1fde7467006595240e65937e0a6deb78a810efa677ce27b51ef62f5f15ebd620e593"; + sha512.source = "be5993e9addb0f22a0e618b934ba77e4169f5dac3f07ca8e3986ddd4a001c7483b52fb5b3f1575c5b07339c9227891dc7794653c9be5fe531c7375dbee43ca30"; hasRunfiles = true; - version = "2.4"; + version = "2.6"; }; "c-pascal" = { revision = 18337; @@ -4416,12 +4461,12 @@ tl: { # no indentation version = "2.4.2"; }; "calxxxx-yyyy" = { - revision = 53290; + revision = 57282; stripPrefix = 0; - sha512.run = "99c3eaa37d1502328352e67091390ea47e3bf1d3fbdf776bb885e06bc2613a1e3056db4344b2a6bf968ec146bc3e3d44c1edae6a56a37eb1a8e5225ad6f62a94"; - sha512.doc = "0fd575f4c4535bcf705acd8e3e4b091ccb1d3d1edcb8e6797bb2b5f891c95c8e7de439015d565d6be0098441abf175d96ab20351a5669237ebd846e37eaa65d4"; + sha512.run = "2e9355442fdf8c4389fc09c8966c5e6b72cfe2df1b3209ec698db686579bef9ab41c17a36bd9714b3e917a8bcbc8ae568ca34bc7112a5a39d00a5b2c5340ac65"; + sha512.doc = "849652e8def77d6f9f0d16f29753df5e5b9095bcfed9be8105294df7ddc26644d1784a27a8b203d9e6c295c0f1e7f58d36f17bf98752ec9ee26ac3ac5a2f361d"; hasRunfiles = true; - version = "20.20a"; + version = "20.21a"; }; "cancel" = { revision = 32508; @@ -4473,11 +4518,11 @@ tl: { # no indentation hasRunfiles = true; }; "caption" = { - revision = 56374; + revision = 56771; stripPrefix = 0; - sha512.run = "996c26f073fa88a4f167a757ef401f91a16ae1276b78aec02b0b86fbe90ab305366fed899fd8ac3be45d295abae6744fd7dc19303b79cb2c77d4278a8e1f5d16"; - sha512.doc = "6ffa5ca8ea4070b5be4a9d83a4612199736c32dfbd1f921c011d6351668088a547ee9e40b632d43dd141256f030a5abee67be99143922835f135a93d7dbf7de5"; - sha512.source = "25362d04b953eb18bd038030dee621accf05427621fc7c264d2e5b4b616c306d61632c8760d75db1a954fc46bb2c21d48d4dc09491af9dc4356e4498bf894f79"; + sha512.run = "d0e7276e6e84cabc85d64bc397fd2e4a258e913e4f78022ae40f3c7293e7f9b3f34dd011a944223507cb1555dbf2031dc563e34a5f7064e9903964bda5a893c3"; + sha512.doc = "50018fff476b99763a3373b9defdf9de854915af11cf37f3a00907483ac481b9a0709d23f6d3612ab754c3f079eda905c5fa3447f576dadcb65f83a5ae5a98e8"; + sha512.source = "5f961b0fb1a11d5f28d75f58331d0b79bb87800d4a5412c57a66c5693c07225a46e49cb42f8f0653e06a74e2c7de38660f99d89f12905892f47fda5ba6820826"; hasRunfiles = true; }; "carbohydrates" = { @@ -4489,11 +4534,11 @@ tl: { # no indentation version = "0.1"; }; "carlisle" = { - revision = 47876; + revision = 56753; stripPrefix = 0; - sha512.run = "d3e743a5e614479167ead02eabfefeffc8006e27c486fb5c57f1cb94278418f86db0431c752310bc1f7cda6dad22b1610edf4d24742391f6b743cad4ea050344"; - sha512.doc = "8d49c9d72669bffa042defaa53b4bdacf2e107753608747162947f05ad8438b9463afd905a376e462e6491293cf0c4a202e0b76db965854c19b97641d0a7d295"; - sha512.source = "83417675f97cd8235ad3a38f3e333596188e717573a8739e41c1041d1641e1e53d48f189f6c01a58509ea8ca1c5d755c56aeeb9842e205c9aa8a01cfc7f688e9"; + sha512.run = "679a07121b01b5ef1ad15b5713bf2b38374d49458d754eb204c914bc02dfd4ed429e30826efd980be0bfd1cefad7607804a04e8a820980877bea68286b23961f"; + sha512.doc = "55265a53e2ae899bb6f856626f155c96084328b7967e6c599e56d53faa5b746efda2f98b6f9b4571d7473da8c664799c259d2f052776b4da218dddc03265df2b"; + sha512.source = "350e30ed75ab3f6b3e33d4d0c16f84cc7cf887b022175437ab11bf561698c3d06d624f02971652ff370de1c4e6454e0a3cdbb75530e08bbf141ba9ef7298b942"; hasRunfiles = true; }; "carlito" = { @@ -4587,6 +4632,14 @@ tl: { # no indentation hasRunfiles = true; version = "0.2.7h"; }; +"causets" = { + revision = 57139; + stripPrefix = 0; + sha512.run = "3dbe4a3c2e5985dbb4a36134a3739adb97636086ad2c1d3f510e4607fb6a6d0d01cbd2d4e135835a9eb88d63128e3b9a4408bce3b910c406b47dad0d0b5c19b6"; + sha512.doc = "77f5ec1d8c16bb6d3772a78913825a1652c5130327e7851ddd16d5a5b0da9315e09dc113c880659b03d4263558781c36e1ed9ac546fabb9df88cfd4b4a3fb84b"; + hasRunfiles = true; + version = "1.1"; +}; "cbcoptic" = { revision = 16666; stripPrefix = 0; @@ -4656,13 +4709,13 @@ tl: { # no indentation hasRunfiles = true; }; "ccool" = { - revision = 55425; + revision = 56636; stripPrefix = 0; - sha512.run = "1e583f234c550f6479d51ed1607323beda8b580072a47c9833ce07427d60cf77fe23639b2d6eebaecd06b502dcfcef96157e6ada03fa64b82de03c1054389a77"; - sha512.doc = "28f7a031cd4268f7c153ec9217d2dcac4979b738b7d5de9e78a561b71ca6a38ca08b2072c8291296dd7df2694319a7966cc87d2aa5f0ee6259479123d0fd87a0"; - sha512.source = "14e36b0b3c86c750c049b313b01b1036a9ed3e2352aea5ffb1707e5cfa628c23c6144de6b22ecd68bbc1c120c06b76343ebab327609bc2b5cb6853695486ad27"; + sha512.run = "4571aa4b0d83f6651784f43e5b9b982a9d42494f9ddd5006a794d4eaa94c4217ef0e85ec2170eb2502c243c02b7b67f0e8dcacdf2ad2714f70e7f6cbbc24aa3b"; + sha512.doc = "99c777464f24e2cc5775a342d682f43686d13dd13db606c30126408de8521cf68ae62acdeecf351dee510ab6550b247100bbe6cfdc2e04cbd183270fc91c62af"; + sha512.source = "31f6f051fbff8806df6bc84c03fbf5b33440800cea7083b8d6d36e585140dfe24e7fbb192531614dc65d27f23f53e46349b0c020a2cddf4817fe9d3b7b23be44"; hasRunfiles = true; - version = "3.0"; + version = "3.1"; }; "cd" = { revision = 34452; @@ -4740,6 +4793,15 @@ tl: { # no indentation hasRunfiles = true; version = "1.1"; }; +"centerlastline" = { + revision = 56644; + stripPrefix = 0; + sha512.run = "a695c30f3b3db43c83e1ae592de9bf32b2856cca45561835e78a03808c7d3d3d8b71f4cb2cf6ecd82ff475012787f953320e4a6a5817ea384382741b7ac88cd1"; + sha512.doc = "850bd95a2ba3c9538e08163b34c900c045808ab69ab021fbb2068e1ab0fd3c5f29fca0b95864203b52704a3c33b81df7ab3cb46eb7296131fd49de71ad0fb876"; + sha512.source = "0463b1c97472750b66fed17bbe1c644b78da98ce4e02cda29cb58c4ad680124d5c5153c0b3714aaf43aab971fe38b471e7c801885d35434210d61dc43a316a43"; + hasRunfiles = true; + version = "1.0"; +}; "cesenaexam" = { revision = 44960; stripPrefix = 0; @@ -4939,13 +5001,13 @@ tl: { # no indentation version = "1.56"; }; "chemformula" = { - revision = 54158; + revision = 57206; stripPrefix = 0; deps."units" = tl."units"; - sha512.run = "fe66366d642c6e8d517303dd62d545ecbf6906f6d148efab38f058dd71986af54b92c7e61428bb025efe7d59740270b53f8d52af495da2c7f9522c476924170b"; - sha512.doc = "f9d92d3894dab9f8cfd0d3db680de6b97e014c13d153b16ac658da6e09d3308b924857902eddb264ca971c1919d205d4e2519d4fd4ac99185c3e9171d8d3e973"; + sha512.run = "6f1cbdeb8a7a30cf561febcc1232d92feadaa59c796a96881ebb04379c49804e8d39cc65dc96bba02d1843118fba347660e23906ea5633af6f00c4fb39388e60"; + sha512.doc = "61da2685650fa1652e20c97c4ed51930b133cfb137f3c1bf8dbe0477b22293693e6837c9545bed3175aa3722e8710441ca12d063bb36542b13e2cd413849cd32"; hasRunfiles = true; - version = "4.15j"; + version = "4.16"; }; "chemgreek" = { revision = 53437; @@ -4956,20 +5018,20 @@ tl: { # no indentation version = "1.1a"; }; "chemmacros" = { - revision = 54191; + revision = 56983; stripPrefix = 0; - sha512.run = "8e70d109cd203cea5c8424dc306d6c5c5ae96ee8c83adf605cc54215a68f70dd656a6c53ace711ab99255e7ea1fa7978a2ec5fff4585d885a3cfe7c0a0951f6f"; - sha512.doc = "357b7d8c3f5cc554ce86d71e2e31cc65307ae836d8bad177b4510ae4ed59b106f9dc85d4856ade241e5bab23cf2e4d4977942f2670b609167f627eed3d82d694"; + sha512.run = "9ca4d903e5d1126aa4f6fc6c07ea2efc86a5750883c354f3bcd48dbe3960ac3ea2cbc47626c67c8f8bec5343d7dd4d61aa548faa33cc42ab09d15011da551a2a"; + sha512.doc = "3482d6c49bf23bd604a2d0c4f506762c61abc1e2785cf83685af2f96006b9093886d51fed8c16a5e430b35f138ccbd35d183291208df47e1281b47d758d7d123"; hasRunfiles = true; - version = "5.11"; + version = "5.11a"; }; "chemnum" = { - revision = 52256; + revision = 57084; stripPrefix = 0; - sha512.run = "f16b41aec7baa6cb088c008b373ff648b8e801951528b24cbdfbe4ad4d54eab12c64a76e23521396bfcc8ff8cc3089f0da9cf9fad37526d1639547412038f5cf"; - sha512.doc = "b9dfe8de349ebcfbafa967668895dbe5bb14cc6f065711f56dbfa5ef771eefda79114cc994f6de2d5d45143740aa9e93543035dfbe6cf1c2628088927e06ab06"; + sha512.run = "d3f2072920568fa5ad91d95dfd811e20eab8bee1444ac73da2bfcbe479a14a274eb71a6445697b4a916fbfe8fca2938e873a6a72f2b1d4573f10841701a30fd3"; + sha512.doc = "0b9685f0130f8a8a7fcc45f20f648af48f95e6c5b3c282a0e9b0b488e080a2fd4ae4567126a8d6389cabc6f8757526cc6df58d8c5f5ac62d14867e89b1d90169"; hasRunfiles = true; - version = "1.2c"; + version = "1.3"; }; "chemplants" = { revision = 52863; @@ -5031,13 +5093,13 @@ tl: { # no indentation version = "1.15"; }; "chessboard" = { - revision = 51469; + revision = 56833; stripPrefix = 0; - sha512.run = "ed7a1d973992897fdb174ef4e250d78a6747e40a822e026b787fd0899f6465a6e845175028279b57f5e16c50162feeb8b1c833248ae3b073e32a8d63051ac0b0"; - sha512.doc = "586202bf2d2b8bade26af19170e5129da6a2f66f78e79880929d2df2b6a7971b8d3683fb79a3ea6863eeedddfee170c06bccce88ad96ca6c7d982aed43378084"; - sha512.source = "2dd479a4ab573894437ab551bd78a1b24cff7b2ed53d2a8ab444930afcc228844bb5932302e4975bab617ad24a824810851a979eafb2433bca9dc1289860d6cb"; + sha512.run = "9447eb4dd8712ccbb519f91e99ccd1c64cc0e9ba904bd46dd8c83ce03c31e5caddca8e76c2cfeeefd5946c8881b9e6b198d50c131a1e8d5622b054d1459865cc"; + sha512.doc = "1c2e8ab2776a247ab1cbaf5527e04392dbcd1eae3a9b1c6785223268d1811a778c0812a1a5437a15cf4bbf08ff28785a57da10c472dd7567f1f0217b2d7de556"; + sha512.source = "674ac2dd69312d3959bca053d5170bf98381ec70e3d688c991e276f07260c10ded70055b4f9b819fa0cefc8f1ac7850dd9df61d38a97b58c0fc05c824a42c3e5"; hasRunfiles = true; - version = "1.8"; + version = "1.9"; }; "chessfss" = { revision = 19440; @@ -5094,13 +5156,21 @@ tl: { # no indentation hasRunfiles = true; }; "chickenize" = { - revision = 45083; + revision = 57325; stripPrefix = 0; - sha512.run = "82df32cba5f14ea8de96020b2412d7c2b3939b0afc4f42bd91e957694404a12a8ea38c9260cf472d81e9aa776556e9b5cf97a674d23ad32633f4fdefe3b3bf83"; - sha512.doc = "6d29cddc0030de2ac6b82dde660e405916bb79bb1e18fd0579a66555d49062fde5d0fa327b906baa1556efd080c55b7ee181ed7569e96dab256ab2be27620935"; - sha512.source = "bd53aa09a1a136d36f92ea0e8625684361b31ab9315a9f987560f171e893c022122b64a086aa2952a9f1fb96b7931f4e248c016cce8f0ef488c94fcd33c5e8f4"; + sha512.run = "3cb2182717630c6d251a055021ff671eb930885e5b33978c0cd51176225b1743938447e3d761cfa83c9e3f46cbca1b5686c18f734a1ea5fef50a7ce48873ee0a"; + sha512.doc = "a2a7ccaa210583de7a765b940959ed4cc2678c6800b283c05f301814b69bb8c704394f8795a1824b41b03652e27106b9e47ed9d5a57179df685294fc3caa16f2"; + sha512.source = "614f105bf01bc1a36ece9ed319763a06fc2480bb5c5b1845f47b17ae1753e9fea5e4f25dab9b35cd493d2c6c31de1c636723b676269495d85829b683420b7e6d"; hasRunfiles = true; - version = "0.2.5"; + version = "0.3"; +}; +"chifoot" = { + revision = 57312; + stripPrefix = 0; + sha512.run = "492361fbe54dae9585b4d62eb1d3c3bf4a81ff8ca8020ad997cb9b30c673cfd8b35cf8ff8d742fe6c1ec7cf529e3ce558b9d5604851fc39c75d72d0fda37dc6d"; + sha512.doc = "34f5bed1ff3660a5fb1fdacb0ec26311fd47593ed6aa659d12eca8141262d9fa7d6c75b2601dc59a38ab02212269f0e69a5fb5da3d9ae1d884f25677f0f6b545"; + hasRunfiles = true; + version = "1.0"; }; "childdoc" = { revision = 49543; @@ -5111,6 +5181,14 @@ tl: { # no indentation hasRunfiles = true; version = "2.0"; }; +"chinese-jfm" = { + revision = 57227; + stripPrefix = 0; + sha512.run = "05e8a3e66fecdbddd76da58b9827595e8f70607655fc2695521f28e2741cf3e2b563aecb433fd5e0c55fb65496031650c8616475287f3b3bd54decbd610775cd"; + sha512.doc = "8e1314ee1bafe60b73b33e7f02587843b55f3d636647dfe7dba2f571675b78718254177263478094d7814eff421f319e48dfe9873b41b4491d9e5c1763aa3b0f"; + hasRunfiles = true; + version = "1.0.1"; +}; "chivo" = { revision = 54512; stripPrefix = 0; @@ -5245,20 +5323,20 @@ tl: { # no indentation version = "1.3"; }; "circuit-macros" = { - revision = 55089; + revision = 57308; stripPrefix = 0; - sha512.run = "b2251e0fbcdf7dcddf01c8001891d593fe018d269ee1d9ab3f4ae9c30dd63a2652dcea8652b82f1ee21130bdb308af870f4a3df26834f308a4ed5b025bfd2a2b"; - sha512.doc = "73bc7ceba825afc69659dd4572f0453b3ca125a5836cab8f5d25ceded4ca8bb3fb6a19a71c8505bed60cc613412538be6d2e5f17551b990e7a6a9e52eb2c7e3d"; + sha512.run = "38e9ed7362e27f836d3a364ea50f54593aac93f30b7a2b90a7bab9f0dd72f28a14cae86fd5d3dad2f47c00ef511afb458c2da29c5da203c3d65c9829b32aad52"; + sha512.doc = "44251146179c9021159523d00acc93969c1caeb92bd0efca9701d95804fe57c8ba218f41cdab878aad8b942cdb21ace7d0266ed7c7c9373d0eb9676b9e636492"; hasRunfiles = true; - version = "9.3"; + version = "9.5"; }; "circuitikz" = { - revision = 56594; + revision = 57245; stripPrefix = 0; - sha512.run = "3f18c02e92afe11c79d7770abc45e1fbdd1bcc145b098687842a242fd37d3426fcd7a10d81441a27d549b839c0bc8fa1ca780203c263a20a52304d1bb0c0c8ae"; - sha512.doc = "ab86ebbcd68a87a650b7985345e8e1b7e0c81ed6deef6fea51bd3ccf218c2f93865df5bd131bf83962ee1ee6b123febb1f680af07669147deb02954d2ebe8266"; + sha512.run = "ae21f013de9aebe73eaf0bbca06af0beb79ead977936f3ea1693aacb24de079702ad236c16550a57e80861579c91827d1d9cd3889d19fc2b9528364365162d85"; + sha512.doc = "c7639d36e3ec1f5a0f4847bd4c0184e45882c1c10c0a7f6e9ca3259e5db5a4d686024275249230d444b5bb8ba4d26ec99863a7241cbedbc1f2bbf442fe6ecfe7"; hasRunfiles = true; - version = "1.2.4"; + version = "1.2.7"; }; "cite" = { revision = 36428; @@ -5316,12 +5394,12 @@ tl: { # no indentation version = "4.8.4"; }; "cjk-gs-integrate" = { - revision = 54155; - sha512.run = "116b0762afb445d4d25a539f08f7f7e288ecea52556205290b654f3c1a8060b9e98c24cf8d48ba1b57901706d2a663ca7d0c06705571ad4c1381d0a9a838d94b"; - sha512.doc = "7e4196ecac219d6d6b5520490b3b4691329cabd16fedb62b8f4e2d70e5ddef19c4c5da64092d9cd708beb7954f819b9167cfcf773bee708e1df5bc46f9c815a8"; - sha512.source = "39a7990c8e91a5c19af2341b5ad56f83deb7a1bfbe88cc73bad36e735a563622401393f3cb70c47fd2806ecd7b44cfe4c4ded48f440606eb3cb03dd71995f8a6"; + revision = 57081; + sha512.run = "f2b8db61f861942df199cdb6e51ca7458f22d385396382bfda6291d2f2abe5555b6b35102629c4c0d478dc01b873ae917acf10b150bae7972a6fbb03ffd03f41"; + sha512.doc = "80f8054e0841bc5605faf0abd3b17ddd16919d0228d520af00c4117f884e1105e6b818d6ec92f312b38246f591f0e6743a76ff02ac05a9e93624e8f4bfaa31f4"; + sha512.source = "5d26311844626499997323d15806a31e5144b1dc6f6c18fc5dbab10f898382eff33dc316ac8429a3d76f57867720061cb8594d5c80510b7776dbad8970f0c0da"; hasRunfiles = true; - version = "20200307.0"; + version = "20201206.0"; }; "cjk-ko" = { revision = 40373; @@ -5682,12 +5760,12 @@ tl: { # no indentation version = "0.3"; }; "cochineal" = { - revision = 56418; + revision = 57176; stripPrefix = 0; - sha512.run = "99a2a1c6b330f5c9a7a74608ff48b5bdaee6fcaad63ae0cdd2c11b351329f0082e39bdd5b3c92252b8dd1ade3c94134b123987ee04597a4b62db13635cf5af1a"; - sha512.doc = "6fe723ad3b278afa6b73a56a28544f95ff27624f999f7b84681e8aea6cde8bd1457c2cf33654f94e1170345e543244a47e0a8deffe75d398a1e12e027e001f07"; + sha512.run = "a0414a08262cc0875b7df48b08b47a980cf58f0e0bbf75dab593a7d99a9002352c34c02eee411da667b379ee92df547f81caac399096098a197f183a53ff813f"; + sha512.doc = "5f51d54cfc3f04b0857223750ba841d72250219ae5259aaaed97b3870dcdf9af70d66f0f819abba09195b2691bf34c0185e42c2315d97363ef043500b85a96e4"; hasRunfiles = true; - version = "1.064"; + version = "1.065"; }; "codeanatomy" = { revision = 51627; @@ -6109,7 +6187,7 @@ tl: { # no indentation sha512.run = "5bd74e1a434549cf31ce31777e9a32f90baa14148e6658633945508a46dbf6611644c4212b53812bb32a399e850517369e3d89bb0e495c89e6f2a979090ed765"; }; "collection-fontsextra" = { - revision = 56407; + revision = 57261; stripPrefix = 0; deps."Asana-Math" = tl."Asana-Math"; deps."academicons" = tl."academicons"; @@ -6125,8 +6203,10 @@ tl: { # no indentation deps."antiqua" = tl."antiqua"; deps."antt" = tl."antt"; deps."archaic" = tl."archaic"; + deps."archivo" = tl."archivo"; deps."arev" = tl."arev"; deps."arimo" = tl."arimo"; + deps."arvo" = tl."arvo"; deps."asapsym" = tl."asapsym"; deps."ascii-font" = tl."ascii-font"; deps."aspectratio" = tl."aspectratio"; @@ -6255,6 +6335,7 @@ tl: { # no indentation deps."fouriernc" = tl."fouriernc"; deps."frcursive" = tl."frcursive"; deps."frederika2016" = tl."frederika2016"; + deps."frimurer" = tl."frimurer"; deps."garamond-libre" = tl."garamond-libre"; deps."garamond-math" = tl."garamond-math"; deps."genealogy" = tl."genealogy"; @@ -6285,6 +6366,7 @@ tl: { # no indentation deps."inconsolata" = tl."inconsolata"; deps."initials" = tl."initials"; deps."inriafonts" = tl."inriafonts"; + deps."inter" = tl."inter"; deps."ipaex-type1" = tl."ipaex-type1"; deps."iwona" = tl."iwona"; deps."jablantile" = tl."jablantile"; @@ -6352,6 +6434,7 @@ tl: { # no indentation deps."oldstandard" = tl."oldstandard"; deps."opensans" = tl."opensans"; deps."orkhun" = tl."orkhun"; + deps."oswald" = tl."oswald"; deps."overlock" = tl."overlock"; deps."pacioli" = tl."pacioli"; deps."paratype" = tl."paratype"; @@ -6361,6 +6444,7 @@ tl: { # no indentation deps."playfair" = tl."playfair"; deps."plex" = tl."plex"; deps."plex-otf" = tl."plex-otf"; + deps."plimsoll" = tl."plimsoll"; deps."poiretone" = tl."poiretone"; deps."poltawski" = tl."poltawski"; deps."prodint" = tl."prodint"; @@ -6392,6 +6476,7 @@ tl: { # no indentation deps."starfont" = tl."starfont"; deps."staves" = tl."staves"; deps."step" = tl."step"; + deps."stepgreek" = tl."stepgreek"; deps."stickstoo" = tl."stickstoo"; deps."stix" = tl."stix"; deps."stix2-otf" = tl."stix2-otf"; @@ -6425,7 +6510,7 @@ tl: { # no indentation deps."yfonts-t1" = tl."yfonts-t1"; deps."yinit-otf" = tl."yinit-otf"; deps."zlmtt" = tl."zlmtt"; - sha512.run = "d0bec50d85039bc9e619f0ead1426869591a0163069a1391620ae63ddaa121ce9506eac06a441a73981f95860506be680c45e31fa499558c9c712de881b0140e"; + sha512.run = "a029c987592a77b94421648fcd10d085135a6518ed1dccd085c628d2d1025b081364ab4824cf571261a20146e26ef063f61030ca33be154f9160383929a27f0e"; }; "collection-fontsrecommended" = { revision = 54074; @@ -6467,10 +6552,11 @@ tl: { # no indentation sha512.run = "eaa6e54780a0813a88102258ee3bd7a4640787be0b89eff4ba2c9cc19298bf3e2799ffab4e03e49f20131d07fbac9f601a7223fc1b47257dd0feeb04797c56a8"; }; "collection-fontutils" = { - revision = 54074; + revision = 57089; stripPrefix = 0; deps."accfonts" = tl."accfonts"; deps."afm2pl" = tl."afm2pl"; + deps."albatross" = tl."albatross"; deps."collection-basic" = tl."collection-basic"; deps."dosepsbin" = tl."dosepsbin"; deps."dvipsconfig" = tl."dvipsconfig"; @@ -6486,7 +6572,7 @@ tl: { # no indentation deps."psutils" = tl."psutils"; deps."t1utils" = tl."t1utils"; deps."ttfutils" = tl."ttfutils"; - sha512.run = "b7b908d87f1fb38ee1145c820c01aecb6a61b0d2b706278f8662f0f08377335b13d0809ef6a1da8c8dd2ace32a028233a08e4dffa38e293e14e3288894c2057c"; + sha512.run = "9bc0964c2ce55e4bcab2b2ad0ae1c784a49ffc981620ef3cd549052a5e2b201325ddc444d9afbe57da6dc64d1890d61be5e97caa2c9c63ebbafc5f5d0322acae"; }; "collection-formatsextra" = { revision = 54074; @@ -6514,7 +6600,7 @@ tl: { # no indentation sha512.run = "7700a6cc293a1d45208794db34a276d5de5c975fe91cb00e5b1896515f288b05437344f00997501a54ad2af515bccc983930a75ddda55c6951edc625cd6bda35"; }; "collection-games" = { - revision = 55821; + revision = 56623; stripPrefix = 0; deps."bartel-chess-fonts" = tl."bartel-chess-fonts"; deps."chess" = tl."chess"; @@ -6542,6 +6628,7 @@ tl: { # no indentation deps."othelloboard" = tl."othelloboard"; deps."pas-crosswords" = tl."pas-crosswords"; deps."psgo" = tl."psgo"; + deps."realtranspose" = tl."realtranspose"; deps."reverxii" = tl."reverxii"; deps."rubik" = tl."rubik"; deps."schwalbe-chess" = tl."schwalbe-chess"; @@ -6553,7 +6640,7 @@ tl: { # no indentation deps."sudokubundle" = tl."sudokubundle"; deps."xq" = tl."xq"; deps."xskak" = tl."xskak"; - sha512.run = "29a3739c9a0f5cd066b6013f60b28aafae66566449e3f7b2715cf487aea221016806e5e95818c413eb2faebc99822c823806cf1f774659dc5932b69e575f3c72"; + sha512.run = "654787f158be7c9d7b019fb7091b8c9f7d4319262fc21f5e324c52e7484b4bcec3a6f211a60a2b13abfe964e09f7eb69b94ab8ef8a3a598fd50dcb587e3ca813"; }; "collection-humanities" = { revision = 56575; @@ -6776,10 +6863,11 @@ tl: { # no indentation sha512.run = "719c321173ca12660891080dae509080934f72d13a9417b2c40a22add963c7c5a1ee95d3b306f0d6c26b0db97d69979c27fbb15d1690849aa03b06d4b0193a67"; }; "collection-langenglish" = { - revision = 55930; + revision = 57292; stripPrefix = 0; deps."MemoirChapStyles" = tl."MemoirChapStyles"; deps."Type1fonts" = tl."Type1fonts"; + deps."amiweb2c-guide" = tl."amiweb2c-guide"; deps."amscls-doc" = tl."amscls-doc"; deps."amslatex-primer" = tl."amslatex-primer"; deps."around-the-bend" = tl."around-the-bend"; @@ -6825,6 +6913,7 @@ tl: { # no indentation deps."plain-doc" = tl."plain-doc"; deps."short-math-guide" = tl."short-math-guide"; deps."simplified-latex" = tl."simplified-latex"; + deps."startlatex2e" = tl."startlatex2e"; deps."svg-inkscape" = tl."svg-inkscape"; deps."tamethebeast" = tl."tamethebeast"; deps."tds" = tl."tds"; @@ -6841,10 +6930,10 @@ tl: { # no indentation deps."visualfaq" = tl."visualfaq"; deps."webguide" = tl."webguide"; deps."xetexref" = tl."xetexref"; - sha512.run = "fa6f50f7c512250eeb9019432a7746c28b35b478948b155e395af9fa90ea683b8a556e3df03bbcc41eba010517d5a717ea0bdcef9f7f90514a603ce8410d2df1"; + sha512.run = "27b95358a9d963320bb6c0210ebdfe1d0057b1c17ce60c78e18dddaeb32515e763c396e046736f5803003ba175f73495ebcd3a32dcdc2ff17096cf3d01e42b68"; }; "collection-langeuropean" = { - revision = 54568; + revision = 56895; stripPrefix = 0; deps."armtex" = tl."armtex"; deps."babel-albanian" = tl."babel-albanian"; @@ -6910,9 +6999,10 @@ tl: { # no indentation deps."lshort-slovenian" = tl."lshort-slovenian"; deps."lshort-turkish" = tl."lshort-turkish"; deps."nevelok" = tl."nevelok"; + deps."rojud" = tl."rojud"; deps."swebib" = tl."swebib"; deps."turkmen" = tl."turkmen"; - sha512.run = "42f3794f5ba9859b401516a6ba5fc7d52534da01d58ef96940f478c809d6d84918c9d5b4d573d518ff746e0884d3ed339c18c8d9c981004006193c6a0fe1376b"; + sha512.run = "f66542d8abfa38917bc3455e132c276a42d1688c54abeb28eeb03447a10353ea648c45d1bcc5d1bb2ce17186dde15eeb3d963a1627c2e553a6eb5042403082cc"; }; "collection-langfrench" = { revision = 56051; @@ -7261,7 +7351,7 @@ tl: { # no indentation sha512.run = "88bdc5cefd5519bc80e50e2d808abf32aae8f7c730023afab3babb82ab817dc034c78d42b4143135df187343de7164a8fd94dc95c5ec8909e317a2f5628de15e"; }; "collection-latex" = { - revision = 56507; + revision = 57048; stripPrefix = 0; deps."ae" = tl."ae"; deps."amscls" = tl."amscls"; @@ -7297,6 +7387,7 @@ tl: { # no indentation deps."kvsetkeys" = tl."kvsetkeys"; deps."l3backend" = tl."l3backend"; deps."l3kernel" = tl."l3kernel"; + deps."l3packages" = tl."l3packages"; deps."latex" = tl."latex"; deps."latex-bin" = tl."latex-bin"; deps."latex-fonts" = tl."latex-fonts"; @@ -7319,10 +7410,10 @@ tl: { # no indentation deps."tools" = tl."tools"; deps."uniquecounter" = tl."uniquecounter"; deps."url" = tl."url"; - sha512.run = "493b72a28c23a194126feafd9e60dc6e4203e8c8db803f80e0015a20c5318f70682b7e2a226813cbea80f0e5e6529ddd9711174d9b813bdfd67b60092ee3d00c"; + sha512.run = "0568a3251d71fb3106fbb3961427200419ae1df22d39b5e72c608e2d94fc35a0e5c77fbe41bbb6fa33610321f2620624264d99675e2f88e72f9d156693143a7e"; }; "collection-latexextra" = { - revision = 56539; + revision = 57324; stripPrefix = 0; deps."2up" = tl."2up"; deps."ESIEEcv" = tl."ESIEEcv"; @@ -7372,6 +7463,7 @@ tl: { # no indentation deps."askinclude" = tl."askinclude"; deps."assignment" = tl."assignment"; deps."assoccnt" = tl."assoccnt"; + deps."association-matrix" = tl."association-matrix"; deps."atenddvi" = tl."atenddvi"; deps."attachfile" = tl."attachfile"; deps."aurl" = tl."aurl"; @@ -7420,6 +7512,7 @@ tl: { # no indentation deps."bigfoot" = tl."bigfoot"; deps."bigints" = tl."bigints"; deps."biochemistry-colors" = tl."biochemistry-colors"; + deps."bithesis" = tl."bithesis"; deps."bizcard" = tl."bizcard"; deps."blindtext" = tl."blindtext"; deps."blkarray" = tl."blkarray"; @@ -7477,6 +7570,7 @@ tl: { # no indentation deps."cellspace" = tl."cellspace"; deps."censor" = tl."censor"; deps."centeredline" = tl."centeredline"; + deps."centerlastline" = tl."centerlastline"; deps."changebar" = tl."changebar"; deps."changelayout" = tl."changelayout"; deps."changelog" = tl."changelog"; @@ -7517,6 +7611,7 @@ tl: { # no indentation deps."collection-latexrecommended" = tl."collection-latexrecommended"; deps."collection-pictures" = tl."collection-pictures"; deps."colophon" = tl."colophon"; + deps."color-edits" = tl."color-edits"; deps."colordoc" = tl."colordoc"; deps."colorinfo" = tl."colorinfo"; deps."coloring" = tl."coloring"; @@ -7578,6 +7673,7 @@ tl: { # no indentation deps."dashundergaps" = tl."dashundergaps"; deps."dataref" = tl."dataref"; deps."datatool" = tl."datatool"; + deps."datax" = tl."datax"; deps."dateiliste" = tl."dateiliste"; deps."datenumber" = tl."datenumber"; deps."datetime" = tl."datetime"; @@ -7669,6 +7765,7 @@ tl: { # no indentation deps."easy" = tl."easy"; deps."easy-todo" = tl."easy-todo"; deps."easyfig" = tl."easyfig"; + deps."easyfloats" = tl."easyfloats"; deps."easyformat" = tl."easyformat"; deps."easylist" = tl."easylist"; deps."easyreview" = tl."easyreview"; @@ -7824,6 +7921,7 @@ tl: { # no indentation deps."framed" = tl."framed"; deps."frankenstein" = tl."frankenstein"; deps."frege" = tl."frege"; + deps."froufrou" = tl."froufrou"; deps."ftcap" = tl."ftcap"; deps."ftnxtra" = tl."ftnxtra"; deps."fullblck" = tl."fullblck"; @@ -7879,6 +7977,7 @@ tl: { # no indentation deps."graphbox" = tl."graphbox"; deps."graphicx-psmin" = tl."graphicx-psmin"; deps."graphicxbox" = tl."graphicxbox"; + deps."graphpaper" = tl."graphpaper"; deps."grayhints" = tl."grayhints"; deps."grfpaste" = tl."grfpaste"; deps."grid" = tl."grid"; @@ -8139,6 +8238,7 @@ tl: { # no indentation deps."mversion" = tl."mversion"; deps."mwe" = tl."mwe"; deps."mycv" = tl."mycv"; + deps."mylatex" = tl."mylatex"; deps."mylatexformat" = tl."mylatexformat"; deps."nag" = tl."nag"; deps."nameauth" = tl."nameauth"; @@ -8194,6 +8294,7 @@ tl: { # no indentation deps."optidef" = tl."optidef"; deps."optional" = tl."optional"; deps."options" = tl."options"; + deps."orcidlink" = tl."orcidlink"; deps."outline" = tl."outline"; deps."outliner" = tl."outliner"; deps."outlines" = tl."outlines"; @@ -8225,6 +8326,7 @@ tl: { # no indentation deps."pauldoc" = tl."pauldoc"; deps."pawpict" = tl."pawpict"; deps."pax" = tl."pax"; + deps."pbalance" = tl."pbalance"; deps."pbox" = tl."pbox"; deps."pbsheet" = tl."pbsheet"; deps."pdf14" = tl."pdf14"; @@ -8273,6 +8375,7 @@ tl: { # no indentation deps."powerdot" = tl."powerdot"; deps."ppr-prv" = tl."ppr-prv"; deps."practicalreports" = tl."practicalreports"; + deps."prelim2e" = tl."prelim2e"; deps."preprint" = tl."preprint"; deps."pressrelease" = tl."pressrelease"; deps."prettyref" = tl."prettyref"; @@ -8372,6 +8475,7 @@ tl: { # no indentation deps."semantex" = tl."semantex"; deps."semantic" = tl."semantic"; deps."semantic-markup" = tl."semantic-markup"; + deps."semesterplanner" = tl."semesterplanner"; deps."semioneside" = tl."semioneside"; deps."semproc" = tl."semproc"; deps."semtex" = tl."semtex"; @@ -8403,8 +8507,10 @@ tl: { # no indentation deps."sitem" = tl."sitem"; deps."skb" = tl."skb"; deps."skdoc" = tl."skdoc"; + deps."skeldoc" = tl."skeldoc"; deps."skeycommand" = tl."skeycommand"; deps."skeyval" = tl."skeyval"; + deps."skills" = tl."skills"; deps."skrapport" = tl."skrapport"; deps."slantsc" = tl."slantsc"; deps."smalltableof" = tl."smalltableof"; @@ -8457,6 +8563,7 @@ tl: { # no indentation deps."svn-multi" = tl."svn-multi"; deps."svn-prov" = tl."svn-prov"; deps."svninfo" = tl."svninfo"; + deps."swfigure" = tl."swfigure"; deps."syntax" = tl."syntax"; deps."syntrace" = tl."syntrace"; deps."synttree" = tl."synttree"; @@ -8652,10 +8759,10 @@ tl: { # no indentation deps."zref" = tl."zref"; deps."zwgetfdate" = tl."zwgetfdate"; deps."zwpagelayout" = tl."zwpagelayout"; - sha512.run = "7251735eba465bf564b320ca79b725156618032c140e1331226cc7acc25575bd29e427aabe1d89054a8ef9c9811b51d9f899d852c6d095f312cc38801d7820d8"; + sha512.run = "1b522a670468b91abded5a379b4636f95a6cb6fc8b028c8beceb43543957b301b5f2e8ad6100dfc00839107b01386623d5b7d81204949bd1dc8c31236f393aa1"; }; "collection-latexrecommended" = { - revision = 54074; + revision = 57048; stripPrefix = 0; deps."anysize" = tl."anysize"; deps."attachfile2" = tl."attachfile2"; @@ -8672,6 +8779,7 @@ tl: { # no indentation deps."etoolbox" = tl."etoolbox"; deps."euenc" = tl."euenc"; deps."euler" = tl."euler"; + deps."everyshi" = tl."everyshi"; deps."extsizes" = tl."extsizes"; deps."fancybox" = tl."fancybox"; deps."fancyref" = tl."fancyref"; @@ -8688,7 +8796,6 @@ tl: { # no indentation deps."jknapltx" = tl."jknapltx"; deps."koma-script" = tl."koma-script"; deps."l3experimental" = tl."l3experimental"; - deps."l3packages" = tl."l3packages"; deps."latexbug" = tl."latexbug"; deps."lineno" = tl."lineno"; deps."listings" = tl."listings"; @@ -8727,10 +8834,10 @@ tl: { # no indentation deps."xkeyval" = tl."xkeyval"; deps."xltxtra" = tl."xltxtra"; deps."xunicode" = tl."xunicode"; - sha512.run = "dfab2d2976b532689105fcc1a4081f86faa400af78dbd089bdf1f26e7d5f4fecf4b432cd46219cc275603181b9b42c969e4775a21afa87d9c5870230a4b88c8a"; + sha512.run = "48c907513c676435bfe0ba08c4be0be50eb4eb04d2fc8e8db4e39ea98dbe61ee7000b643b914dff12f230df8ca4501c5ed7fb918125d0d9eb36f1b03fd7803b7"; }; "collection-luatex" = { - revision = 56210; + revision = 57257; stripPrefix = 0; deps."addliga" = tl."addliga"; deps."auto-pst-pdf-lua" = tl."auto-pst-pdf-lua"; @@ -8738,6 +8845,7 @@ tl: { # no indentation deps."bezierplot" = tl."bezierplot"; deps."checkcites" = tl."checkcites"; deps."chickenize" = tl."chickenize"; + deps."chinese-jfm" = tl."chinese-jfm"; deps."cloze" = tl."cloze"; deps."collection-basic" = tl."collection-basic"; deps."combofont" = tl."combofont"; @@ -8785,10 +8893,11 @@ tl: { # no indentation deps."spelling" = tl."spelling"; deps."stricttex" = tl."stricttex"; deps."typewriter" = tl."typewriter"; - sha512.run = "e896f6bfbda00f8e75911588fa1b9aa1edd08d9f88d29cecf6a48a7c625b69d4c2ec3c64ad40d7072686098dbb91d125e11fc1d0990f632c7ff67a2ee597e06c"; + deps."uninormalize" = tl."uninormalize"; + sha512.run = "b9ca96993591c1ea819387646d7e2bdb637d7bc56b807cd1787c199fbbdb03e01f4fbe35edda68fe0a0388e5e176aa2d51871f8b902f39a42b477686d7e2f3ff"; }; "collection-mathscience" = { - revision = 56164; + revision = 56872; stripPrefix = 0; deps."12many" = tl."12many"; deps."SIstyle" = tl."SIstyle"; @@ -8822,6 +8931,7 @@ tl: { # no indentation deps."bytefield" = tl."bytefield"; deps."calculation" = tl."calculation"; deps."cascade" = tl."cascade"; + deps."causets" = tl."causets"; deps."ccfonts" = tl."ccfonts"; deps."ccool" = tl."ccool"; deps."chemarrow" = tl."chemarrow"; @@ -8897,6 +9007,7 @@ tl: { # no indentation deps."ionumbers" = tl."ionumbers"; deps."isomath" = tl."isomath"; deps."jkmath" = tl."jkmath"; + deps."jupynotex" = tl."jupynotex"; deps."karnaugh" = tl."karnaugh"; deps."karnaugh-map" = tl."karnaugh-map"; deps."karnaughmap" = tl."karnaughmap"; @@ -8942,6 +9053,7 @@ tl: { # no indentation deps."pm-isomath" = tl."pm-isomath"; deps."polexpr" = tl."polexpr"; deps."prftree" = tl."prftree"; + deps."principia" = tl."principia"; deps."proba" = tl."proba"; deps."proof-at-the-end" = tl."proof-at-the-end"; deps."prooftrees" = tl."prooftrees"; @@ -9003,7 +9115,7 @@ tl: { # no indentation deps."youngtab" = tl."youngtab"; deps."yquant" = tl."yquant"; deps."ytableau" = tl."ytableau"; - sha512.run = "aeab82783e3bac3dfc43024541e4573cbcab5f007f541feae420fd975bc56d084634a785ba7ec7a84dddfa7505b360c1ee64e6d4f6eff7b19964f95e85c9d10d"; + sha512.run = "9a7f87647d443c7e716240d2f1ab2f2d9a49661ca63d2e53742404d7faca97c25636cbe730c761322f941cb1183197f156e39ee2693d023da480e0a5da34d022"; }; "collection-metapost" = { revision = 50293; @@ -9094,7 +9206,7 @@ tl: { # no indentation sha512.run = "bd76efc0bdec2bca391cb687a379c53f08beb55bd3ec8d781743296999cb5ea3ec31cc06550dacaea61f3cc9cedd7bce43b27f3f935386c0271eb1a5befd11ed"; }; "collection-pictures" = { - revision = 55827; + revision = 57225; stripPrefix = 0; deps."adigraph" = tl."adigraph"; deps."aobs-tikz" = tl."aobs-tikz"; @@ -9213,6 +9325,7 @@ tl: { # no indentation deps."prerex" = tl."prerex"; deps."productbox" = tl."productbox"; deps."ptolemaicastronomy" = tl."ptolemaicastronomy"; + deps."puyotikz" = tl."puyotikz"; deps."pxpgfmark" = tl."pxpgfmark"; deps."qcircuit" = tl."qcircuit"; deps."qrcode" = tl."qrcode"; @@ -9234,10 +9347,12 @@ tl: { # no indentation deps."spath3" = tl."spath3"; deps."spectralsequences" = tl."spectralsequences"; deps."swimgraf" = tl."swimgraf"; + deps."syntaxdi" = tl."syntaxdi"; deps."table-fct" = tl."table-fct"; deps."texdraw" = tl."texdraw"; deps."ticollege" = tl."ticollege"; deps."tikz-3dplot" = tl."tikz-3dplot"; + deps."tikz-among-us" = tl."tikz-among-us"; deps."tikz-bayesnet" = tl."tikz-bayesnet"; deps."tikz-cd" = tl."tikz-cd"; deps."tikz-dependency" = tl."tikz-dependency"; @@ -9291,11 +9406,12 @@ tl: { # no indentation deps."tqft" = tl."tqft"; deps."tsemlines" = tl."tsemlines"; deps."tufte-latex" = tl."tufte-latex"; + deps."utfsym" = tl."utfsym"; deps."venndiagram" = tl."venndiagram"; deps."visualpstricks" = tl."visualpstricks"; deps."xpicture" = tl."xpicture"; deps."xypic" = tl."xypic"; - sha512.run = "8e08a60ca96ceb9f9395770a93860baaea5d54477c49096d7660a2709c8f3af49e1c67779056e38a39b79ac0b38eb1bf938b909dd60c91a17c7464b245f7fb31"; + sha512.run = "3b735c7bae49002ee7056fda3e0a10d24d9101bc6080571a6983a94b5bab30defb022f6b5986de5f9fa3cd66715b68f18ab9fd372f1bed58cbf70388757b4048"; }; "collection-plaingeneric" = { revision = 56496; @@ -9526,7 +9642,7 @@ tl: { # no indentation sha512.run = "653143f95761352dc349c66f618b01a77650b20bf8b2cf45137e72b2f05ba3dcefbf0238f1b2757297ac37ec6cbd4a05283c0bfc03d6e153e57f4be23ca8f87f"; }; "collection-publishers" = { - revision = 56590; + revision = 57312; stripPrefix = 0; deps."IEEEconf" = tl."IEEEconf"; deps."IEEEtran" = tl."IEEEtran"; @@ -9570,6 +9686,7 @@ tl: { # no indentation deps."cascadilla" = tl."cascadilla"; deps."cesenaexam" = tl."cesenaexam"; deps."chem-journal" = tl."chem-journal"; + deps."chifoot" = tl."chifoot"; deps."chs-physics-report" = tl."chs-physics-report"; deps."cje" = tl."cje"; deps."classicthesis" = tl."classicthesis"; @@ -9646,11 +9763,13 @@ tl: { # no indentation deps."mcmthesis" = tl."mcmthesis"; deps."mentis" = tl."mentis"; deps."mlacls" = tl."mlacls"; + deps."mluexercise" = tl."mluexercise"; deps."mnras" = tl."mnras"; deps."modeles-factures-belges-assocs" = tl."modeles-factures-belges-assocs"; deps."msu-thesis" = tl."msu-thesis"; deps."mucproc" = tl."mucproc"; deps."mugsthesis" = tl."mugsthesis"; + deps."muling" = tl."muling"; deps."musuos" = tl."musuos"; deps."muthesis" = tl."muthesis"; deps."mynsfc" = tl."mynsfc"; @@ -9761,10 +9880,11 @@ tl: { # no indentation deps."vancouver" = tl."vancouver"; deps."wsemclassic" = tl."wsemclassic"; deps."xduthesis" = tl."xduthesis"; + deps."xmuthesis" = tl."xmuthesis"; deps."yathesis" = tl."yathesis"; deps."yazd-thesis" = tl."yazd-thesis"; deps."york-thesis" = tl."york-thesis"; - sha512.run = "5a1e89da355bc14c2faab559707a87876c822368796a57b661e7567d0ddf9f2826369de1392406ad957ea836e5660d46e7479a2b5a1f63b5a7f257ac7f4ac61c"; + sha512.run = "22a96671004c2a06fd5935793ee274ec06f3801b18ad6b3af8181667ba37eead921b84e4e1d1206f213a5ea4ccdaaa7082e8fa3b8923c266389bbda4d34e3da4"; }; "collection-texworks" = { revision = 54074; @@ -9843,6 +9963,15 @@ tl: { # no indentation hasRunfiles = true; version = "1.1"; }; +"color-edits" = { + revision = 56707; + stripPrefix = 0; + sha512.run = "e1023d734b7c8c2c781fd037f29a8c845a45fcd1c62d7880d51755bf943dba142fee040c2f0b9bea2ef6986818b5f67126ff468639c0d962d0a779f6840fb1c7"; + sha512.doc = "17322e4a1e9cd8cd6043a37e0c06bca019b887aad0100367b0c99b70fe3043d32568b5cf587cb42d0bdfe77cf18bf222fba126833d9a61789bba88bd121dbc4c"; + sha512.source = "b23f1893840a3a2a8d5a77386515c224656ca0c82aec3eb82209c862ebb222e8a2cdf4942bce3d43f4538bd380f9518fe031f08259dd063578760431a6230f10"; + hasRunfiles = true; + version = "1.1"; +}; "colordoc" = { revision = 18270; stripPrefix = 0; @@ -10808,9 +10937,12 @@ tl: { # no indentation hasRunfiles = true; }; "cslatex" = { - revision = 56548; + revision = 57318; + deps."atbegshi" = tl."atbegshi"; + deps."atveryend" = tl."atveryend"; deps."cm" = tl."cm"; deps."csplain" = tl."csplain"; + deps."everyshi" = tl."everyshi"; deps."firstaid" = tl."firstaid"; deps."hyphen-base" = tl."hyphen-base"; deps."l3kernel" = tl."l3kernel"; @@ -10819,34 +10951,33 @@ tl: { # no indentation deps."latex-fonts" = tl."latex-fonts"; deps."tex-ini-files" = tl."tex-ini-files"; deps."unicode-data" = tl."unicode-data"; - sha512.run = "8f8269473c2614094f5a04baf565a0df238d2422e4893bdad3d4af2bb94103c5d3a84f8359b42228fee4c1224bb3c65ab8362edd1d59719f16831cbc47a625fe"; - sha512.doc = "3972c41bc4831687e4feec3485c5ee93c497ad8e55e1b48c6e159887990675142e4e14278cfc17e7e555c60d5a8924d1150db94a9da3175655803c88fdd89973"; - sha512.source = "97eb8e87a3fc60c3aefdb7467ca3707543f2037234fb19d23ce451bc4b89fe1b8642affc592bd4398706f37952d7c3dbc1fea8d1b51a5dc92a8b573955064656"; + sha512.run = "a63f7481b5bc260ef470f69a443c9087a16ce0b6ba861f51ec75716648d72cdda2877a8322985da2666262de8c535fc56c8bc6e714d3a933ad96dc32931d8051"; + sha512.doc = "b024a1607f7c24a0d4b8241b054b3670fe5fe6796ebf3241d7db726f322912c2104f869049f36511ab1a26dc3230c2e472f77979348ad6898508c51a04f7759f"; + sha512.source = "c2d9b4c3049ae6533b272092e2f6d94bb77b65fd8421ddfff1c94dbe0ca8e6d1e7ddadab43afbf6817402bb6dd3aeba36ceacbd42937c0b61740c6f7efe5bef9"; hasRunfiles = true; }; "csplain" = { - revision = 54699; + revision = 57318; deps."cm" = tl."cm"; deps."cs" = tl."cs"; deps."enctex" = tl."enctex"; - deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; deps."luatex" = tl."luatex"; deps."luatex85" = tl."luatex85"; deps."plain" = tl."plain"; deps."tex" = tl."tex"; deps."tex-ini-files" = tl."tex-ini-files"; - sha512.run = "872a7456edf6aa1ae8bc124bba2a80c3e4634f663722efeb40e04ad5e5850ca68f6d298e8e35a13f3430413baef9510352a07e92b1d87a7cd2f1651061f2b174"; + sha512.run = "46a387cc8b21c6cc9bc61ca892fba1db8bde4d948ce7a4e5b7cf699c988ffbdb58e9bdaa4941ec5c8d36f0c1b9c53d1cf7bc4555e72b92420033520588da12e9"; hasRunfiles = true; }; "csquotes" = { - revision = 53041; + revision = 57332; stripPrefix = 0; deps."etoolbox" = tl."etoolbox"; - sha512.run = "541cefb84ffcb6a398c18d01cab5d7c96bfaa82841b9439c1f77f3b2b4904e0a37fe2e2b355777e4552fdff3ebb054daae9d9d9a6c7436746f44917095be119c"; - sha512.doc = "84407b58454e4e4b235d93b01bef99f7a20a5de4ebac4990c9e00694a14dd67debe27afb6f3a079040330af3ab186db11f1150e97fa9511e782e55c4abe52bcf"; + sha512.run = "d5a4ecc3202499582a7c4c03de006c6380d82754ff76b75883d5ad9eab9d1f724b76c6ab77b9efccbeaaeb5c0953cd3097ca114bd361ce8adbcc60bddb33f7da"; + sha512.doc = "c7496f8e09034c157159bfe1d465ac13e3d80e113deb83429cd09508e5389173c8e0a5c67e612b32cb06d109b6161e808d9fbdbab18a1a8724f250c5c0934c39"; hasRunfiles = true; - version = "5.2j"; + version = "5.2k"; }; "csquotes-de" = { revision = 23371; @@ -10948,7 +11079,7 @@ tl: { # no indentation version = "1.2c"; }; "ctex" = { - revision = 56166; + revision = 56705; stripPrefix = 0; deps."adobemapping" = tl."adobemapping"; deps."atbegshi" = tl."atbegshi"; @@ -10987,11 +11118,11 @@ tl: { # no indentation deps."zhmetrics" = tl."zhmetrics"; deps."zhmetrics-uptex" = tl."zhmetrics-uptex"; deps."zhnumber" = tl."zhnumber"; - sha512.run = "69357cbdfe3548de29ce0b25622b76bfef0b433a62cefe2df2173ec8efcd02fdb4d5849cdc20eedca42f6bf668f748af2993272d274179c62adb53f6e2ad1361"; - sha512.doc = "d0e3d529ee3936cc5536b805f02268c3d1f8bfb6d50ce20b7af8b9ca14f3e3860ebb3734d55e1abe4c065dddf33623ae9e11038cf3d37948176906ff4756f562"; - sha512.source = "32039d32ecb811f8a9760af66bcada456c5c7e8c9d760920be45e86f2a8acda55c093ddf0dd67d5ad13156b54c20dfad8b372eb5ff53443b4c420fd29f58796d"; + sha512.run = "0a2c781a1dde017535ea622525413f7fddc77d6769d3b9be573877b6909850c1d932bb163adbc07363803f5ee02f07453911a7bfda216867d72f67bce49bbc1d"; + sha512.doc = "0fc122d8cce8da89227314905dc029f5599610831df5b7f53ac45b5c8dba4f275413fe650e0eba9e23726a6570048e11fd78853e3e734f9dca08dbfed6655eef"; + sha512.source = "3e3ed53b303e98e38af90bdc00803310678eaad07a34d151108977a16e7fe4f9faac4afba25d825384dd7fd9423694fa656f666fccd9d57e850a04302310f141"; hasRunfiles = true; - version = "2.5.4"; + version = "2.5.5"; }; "ctex-faq" = { revision = 15878; @@ -11072,13 +11203,13 @@ tl: { # no indentation version = "1.16"; }; "curve2e" = { - revision = 56538; + revision = 57180; stripPrefix = 0; - sha512.run = "319c3b6a3b9d0b1886ed0e5c9396c5a2ca8d24cdad6252136c4bcb87869a4fb7c0ba06544add5ee16414cc8fb4a5c9552a0aafa7c9d8df253fa00d3b0f1a34be"; - sha512.doc = "a76b224e5a64f82cd50339ad6a87e06f7a0db65294e3a8b6e69972e161211bf48114a23492e306ee25981b6725f06efd9821d56e228949e04105fdb80bb32d11"; - sha512.source = "8a446660a08991f1c795e0353c4db2813e5e679b948d18755a69495b045e3604338da123e4d33f9608d4a60f149aff3670aae4c28cdcb1ef67b03ffddd251ff5"; + sha512.run = "deaeb4ce69687eef683794d1ce1669552b8f2e76dfaae480b68c1d6fff47aedca9d21460a4a56a4ba058cf12787157e4429bb4fe8c3ede866b8379eee3e84627"; + sha512.doc = "1a98a4a5fcbe70ef2e1ba3f79e83195673f7588e53c41311a6e3efadc78b70359e0fcb000f3a1f412f228a597662c2268f64e196eb3243f378b114847b8596b2"; + sha512.source = "f66027bd0f8b7fdd658ff0f7b2ddc7636445c9f8795292d944edd1acaa28c66d7edf9f33673e42b6462b69270c8989dcd1356cb7a2893baa52b76714252f7046"; hasRunfiles = true; - version = "2.2.10"; + version = "2.2.13"; }; "curves" = { revision = 45255; @@ -11258,6 +11389,15 @@ tl: { # no indentation hasRunfiles = true; version = "2.32"; }; +"datax" = { + revision = 57033; + stripPrefix = 0; + sha512.run = "f8eda309dcff2ea8fd827cf3dd5c15ea265105234e33f96e27c14316e5e4183ade4c6a240b174df3564fcc1a4046ba3ada482a6fae653ffb5e43e18682852336"; + sha512.doc = "e4257e66220e0048df198d60a963524187d7373ab7394f4b33944251f534f67648110a8cfda588a992500c381470dee55423be6c224a4e3cd08cf4e633bc0d3d"; + sha512.source = "c47641c49bf9c1dc0e47eb8045920cdd0e519c07eb18efa047fb7c2a6122166a4e8bc793adfd3db8373b77be901dc6cc8501f5bc9dcf895ed3bce3a261b55671"; + hasRunfiles = true; + version = "1.1.1"; +}; "dateiliste" = { revision = 27974; stripPrefix = 0; @@ -11707,9 +11847,9 @@ tl: { # no indentation version = "0.2"; }; "de-macro" = { - revision = 55766; - sha512.run = "36d6d47e8d2e04f6f6acbd46c9ad87e7b2e2f2f2dec9f5a06247e6955bf0a8efb3eb1593b6534b8e16049d00a3e66207e1627fd241d98b661dfd78b9f30b18e1"; - sha512.doc = "2c1cf50f37fe354582ff8cf1232188d3e6df1863747d04659e27dcdc1cd4ac919eb453c294ff2c0e13eea2e633e0ccccd2c3c12f9894eacd7f74dd4f6e2e78c5"; + revision = 57349; + sha512.run = "558a55b14822cda4cfaa05511bbd6030049145916669b699795827181462e628d0a84baf087b8d56e3dccb353d17f581af9bc1662506878124e5cfaddbd97b9a"; + sha512.doc = "af0a7a463c7a9623050a3fe73782076965eefb58dec17752c80e35a647b5a7a6b354a1dea89ba03b503eef0faffbd2f134a6e5666f4c68665d322bf3b77922d6"; hasRunfiles = true; version = "1.4"; }; @@ -11722,12 +11862,13 @@ tl: { # no indentation hasRunfiles = true; }; "decision-table" = { - revision = 56164; + revision = 57094; stripPrefix = 0; - sha512.run = "af023c527e7624448cf3c745ad4fc6e4216231f267707c635b6465f42a83eef96fb55ec2a44ae180a06375493abfbc070c2e7e40f72c5fdb67f3d1248221a48f"; - sha512.doc = "4866399fc44b5c87e2fb5ee125a9063b22b0d46082448cdca3518a658eacbdbc968078cba246bffc2ab7a1085028273f010d6a93302027b4c7aefcce5d5d7ba3"; + sha512.run = "2e89be9bbbc6a6f0fef9f3eb3caa63a6f8c6b749df1057f712d5153a78d4b15542f1fb30d3d5f5078d99a1b45f4d4e92be44d7c631eb86e349e56b03dcb4c93b"; + sha512.doc = "cdfa48c2835b48f5b0f7d454a4255128613b0f3f9bd2d750b8107c7d8eef1a36aaca3ff6aecc6cfbb1572fd2dca109628d94b4b9419ca44d91cd1ddb12326cde"; + sha512.source = "12f617e0aeedfae0cfd2e2a1fadad55cbfaeb51abdd2faea829fb04c47edae811eacef4a7480cf46533c3a445eadf8a9090dc47aef0d656a3e204eb6f19a26bb"; hasRunfiles = true; - version = "0.0.2"; + version = "0.0.3"; }; "decorule" = { revision = 55230; @@ -11805,13 +11946,13 @@ tl: { # no indentation hasRunfiles = true; }; "denisbdoc" = { - revision = 55474; + revision = 56664; stripPrefix = 0; - sha512.run = "60377f33d9a8b17e010ce58ec56c3727bf9ac8f168d0124a3fd2743d4e7eab67c64a4277f9c3639e7c73098f5ac465e13ddcf13f40fa5cb1176c8e21e86aa0bb"; - sha512.doc = "23b359e65d42d951f1767049413956fae16f89748358bb0bdf1e15c7a32e2612cee6987574ee36ac9fad637b63d507471f1a4854d0bf749b8fb33bd8b90cb45b"; - sha512.source = "86d3beb7cc5c67e0482f18bcefeb75644047330af1500d723b58efb82a7cbfb911d389e186401a290c1ef4d209f2904644e4c5f07569e2527285a7fbfca0cc2d"; + sha512.run = "636537275629ba01fe78b5a189e94845898555715ddc879a3558539016e9cbc814ea74d6eed0cc31e42d8062e6ba6c6bb5c00064a14644c236a3c4f48f688e3f"; + sha512.doc = "6e1715fe7ed2c3d0091688ffa4e0e2245a838063a896334727ea87bad566771fa93c66cd0580c3ce1980b217cdf5e6bfba36b77d10d19ea55afe4e8fd92db8be"; + sha512.source = "89abdd37bda49536437063229346ea70655211716ebcc0798a4df87d49df9a2fb38f201e0b80e8d3748a2d847ccc2ce320c29d71f9922d5f2932eb07de3c5645"; hasRunfiles = true; - version = "0.9"; + version = "0.9.1"; }; "derivative" = { revision = 55890; @@ -12088,10 +12229,10 @@ tl: { # no indentation version = "1.4"; }; "docsurvey" = { - revision = 48931; + revision = 57298; stripPrefix = 0; - sha512.run = "e51d73b0dc7267b0564119b6836398a939676d8929e850201900eacb49e701e873661ec897e8c0523a094d82e736014e0ef61d07e2ffb5311924d2fdcaf1d5c4"; - sha512.doc = "3231dbb4c28a03b754817f50f930f1a6eec33ca9ef6e29a1c4b1edd025315ee9f9e7a371b8733d6624cf9b02dbb705dfcc82d6f98a99aa1ca05b4f277e083304"; + sha512.run = "160f6119a60cfe9be1b53cf0cd44e6f6c03713e61dc334106d4c6e661d8c54e9bfe31be7b1f90d63ccf4a1802e9b1a7cf66a7f0e50314ea8398d324862053e3a"; + sha512.doc = "17fae45bd2dcb68c4fa91da29bec5dc809ee93f2b83c090f2abca591cda5966ed626eb1f8e6e338f66ef1ceffc67d4031659238113ecc8234c11fac08048060c"; }; "doctools" = { revision = 34474; @@ -12296,13 +12437,13 @@ tl: { # no indentation version = "0.2"; }; "draftwatermark" = { - revision = 55719; + revision = 57099; stripPrefix = 0; - sha512.run = "5114ef5194450fcc4dc8230d5f09d52d29626954b2dbca6b2c733990bb8ba725fc5f8141020e456c9a4b008d1d19ff0ba960bfd04f810c2dff69951184b67750"; - sha512.doc = "da126f371e0f7dfbb62058a7e839d3375c05456bb30ca99e51c51e962b628a1d53b8de1f79a59c960aacbf89ef04ff51ee0c5017f1c20c38299486e0533d0a07"; - sha512.source = "6825431c088ed8cf33d252685822da10f06a17ead54f809639bfabc3ba5dcb30aa0e0b71810f5a9c60ad771c30c11fea43e57b7cc0e4d1be95b7472aa3c2418c"; + sha512.run = "c12311ce3723e6b93e8d21df2a50a3c1ab2326aa5cb6a1600fb848efd5309fa9a1c920e0ad27c785925387af5872570142aae61a2ffea0b3578d10209060e9dc"; + sha512.doc = "bf3c28f78f03ebe43c84d722d668c14e0a751fb9e0d53ccb6a81cebf40b78f95b53fc3871ffa4919a94c260de861e93048b3adb590dee2bb8b600be1bbeaef3e"; + sha512.source = "7f9eacb71dc803059f6d9951aa7958effb9e97bb2030884ed02f0fcd43ad554f860ccebc455ede5893d67c527915f8a7093a94b2f146e4884e23303fe882527e"; hasRunfiles = true; - version = "2.2"; + version = "3.0"; }; "dramatist" = { revision = 35866; @@ -12395,19 +12536,19 @@ tl: { # no indentation version = "1.01"; }; "dtk" = { - revision = 54080; + revision = 56696; stripPrefix = 0; - sha512.run = "e7685e9b2e1086cf4ad240ec807334d91719510cc35442d9ca495306a3a547d381e7f476ac8027acca50a01e09c9f0fe0e7b1fb251fa746d8bc135214d5da550"; - sha512.doc = "1478a7a666e0800a8bf0d111140dda8e9148c280900a5a5b4564f72445d805bb905d8536e3a5ff99220fa508ec1366ec2da041429561dd311ca699c094f9ec20"; + sha512.run = "6553c4facf6e28210e22641d10babb0c4073c9514231e345f33aef419c95ea30b6fd744711233f91f90183624d5bd5c21ca7901c4ad46358b7b6335c09059241"; + sha512.doc = "9656de8b3319a84d5d32900a65c013e44ebfa5488761bb31a5d3f84faaf22f648367a842d274b25a19c70bb650e4043dcc18fa0fdeaafd6bc360534c118589d8"; hasRunfiles = true; - version = "2.08g"; + version = "2.08h"; }; "dtk-bibliography" = { - revision = 56443; + revision = 57082; stripPrefix = 0; - sha512.run = "be4ed6006ebcdb1804dc2a870b07fed385750069f706a4544b79efa4fae61ec995b8ebf5fc537df640f90b4fe25837eea2d37c9c333f299dc60521f91e7cfd2a"; - sha512.doc = "1a1db35af817b7f392344bcd31115aaf92037b154e30fc4766f49c187a627de0fe555ef7216881bcf8d1735cf852ee2f40056f63c4b813322b4c09c9c3cd1986"; - version = "DTK_2020-03"; + sha512.run = "bc92f3deffefc3ebfad785bd446053281ffea8a7a18ecb7d6c47983bb5771756548caee5855cff2e54a3e424d8457001ded17401d06ffeb86dec73906b888002"; + sha512.doc = "e0771bb3cc19ad7529c99d0196fd493c2d3f56eeb34f8d73d78a4dccd7cbad950b591ce2beb45d5e723fb1cd4a7fc2450ddc0f679e3a4c4f20687fb888cb2306"; + version = "2020-04"; }; "dtl" = { revision = 52851; @@ -12446,13 +12587,13 @@ tl: { # no indentation version = "2.1"; }; "ducksay" = { - revision = 53631; + revision = 56800; stripPrefix = 0; - sha512.run = "0d81bad6d32724b569a483cd6656abe3700e218a52dbce511f6740d05837a9a0cece95461d3b7cb6b4b35cf6ed860c675f2182d61eb1498b503bf1660b675441"; - sha512.doc = "9667ff1be349058cf969b512e022f354bc840867031d004759c5be53fee67cdff0abaf5a02205181ab6caded8ba46ee4d6f68570d7b92bace69164d7a2418151"; - sha512.source = "587cb02ca297e92539e017610d63daf0c66c797649fb45be11d2cf079ff9c1a07899ae53e7c93f38d5f90bcc28c34423c00ea63d79cda8451be6b08748e8fa2e"; + sha512.run = "e4538112c20c1afc2bbbea2d51d2f8a47721072e254c8578929e8acb0b0c6ca99c44eaae5ea3078ff33708ad7c573144e8d94055ac25d15032314db78c305627"; + sha512.doc = "faa84c55147187055af777b7c770781441ce3a12d46386efb7e4a0348895f130f7b748977c5914914c8040831e11547abb1b648eeb0f4bbeef2e0f93248427b5"; + sha512.source = "f7fb26b1905a612044a2a05a1cc032855fc395d290b48524b042bc5d87ecd915484fdc463a1115cbb2f5ee2baecf096717bdcdd9e7da75768820dbe9d7ac959c"; hasRunfiles = true; - version = "2.5"; + version = "2.5a"; }; "duckuments" = { revision = 52271; @@ -12591,10 +12732,10 @@ tl: { # no indentation version = "1.6"; }; "dvisvgm" = { - revision = 56166; - sha512.run = "fdf5a23b42d064283d81681c0f68cf4a8a6b566dfb842706e137754909e2389275bf1dab934c6f257a591d8079a0630b5ab619223a0b40f3a90e062c67944732"; - sha512.doc = "b7627afee9db13729f95a0f9a5136a1ee679466ac4e48de440f791d578dabbc5333872cdb9b28dc6033a7a16e2185a33db24ed234ea67f8784c7520b5e0662f6"; - version = "2.10"; + revision = 57090; + sha512.run = "fffb20aa49fc40e9cffd37e57cc06996b9a791894d204c6850f679fb33715e72c93b5c7f5429f81d4c05d31376e5d0a47e62a6dd5656d776d8f752cfd4d2dac4"; + sha512.doc = "f5e845a3c5e5ac6fa8881a3b402f20d47606100ad3f55a3da2bd615d2682a5a35249dcac4064c2cc62bc949314d9cc65b746414fb1c5baa99760095b9ddfb259"; + version = "2.11"; }; "dynamicnumber" = { revision = 38726; @@ -12676,6 +12817,20 @@ tl: { # no indentation hasRunfiles = true; version = "1.2a"; }; +"easyfloats" = { + revision = 57204; + stripPrefix = 0; + deps."caption" = tl."caption"; + deps."environ" = tl."environ"; + deps."etoolbox" = tl."etoolbox"; + deps."float" = tl."float"; + deps."pgf" = tl."pgf"; + sha512.run = "2d02a55fc3d50e5fb79ebe8188300db47aaecb42089843033c569ee0508a38f81e9409d872535e1f7fe3b13a067bdabbf8249073b803c8d232d08aa1d5520d48"; + sha512.doc = "d6e96d7af908e83b67b77f0432e6ffcdcc55b64bc63ac360e42291f16adec4ab6655a423f5fc8f31180071afc5645f47b7ecb2c1c80af719b6cb0cc6e77948da"; + sha512.source = "b21681d30b8963127d603bf81b140851b5e8ea17b63d5979bc05bcfa68efd67460b9f0d0419a69c44606a4d569f5840b3c8d6f0ce7b0cf18d86c1fa104776b5a"; + hasRunfiles = true; + version = "1.0.0"; +}; "easyformat" = { revision = 44543; stripPrefix = 0; @@ -12980,13 +13135,13 @@ tl: { # no indentation hasRunfiles = true; }; "ejpecp" = { - revision = 56188; + revision = 56728; stripPrefix = 0; - sha512.run = "599c97be880d075dd814ce080c408d3f42e4f1b4a2b218d843ac4e955429076e306b25f829d999ea48f4b6e2dc0ece9fd80601048bab4cff84254f5cff9aab32"; - sha512.doc = "88f646457e9e6e711a3b4c874b9986c5f8ed92f109237a2c77eb7ac4dc4df457f07f394e441f27ee28343cfa6126bde8ff501c99ee15b4367478baeff7028264"; - sha512.source = "763efe6fa376b9d6d82495823c888bd804c04478530811e8ad60ecb6956ed37261a9e98a6d3247532ddb76475fe339e7e7c16c88f78ced2fe64dea244be8a504"; + sha512.run = "ba16daaacf8b7d2b6d9f1bdaf6680b474715ab423959bf1e8fef43c7e823becdba5d6a6e3a094f47cd71c23ee00917cf9bd3b72fcbf1f091d42425535bca6b39"; + sha512.doc = "f44c075fc341b3ef334a8675fb0c2ea3ccdae25cc81fa9df7ba39ebc9ec6ababd3a6657734336539d64a6f8b9ff4380993dba312b58cdd83ef5f0f923196b310"; + sha512.source = "6325f999c4a435b7d2a4aff7b3bc1cf21d7eb0e806f9e7bfe2482e79689617bce54b274cc690f2435fe0c416bf32b2a76c911b793bc1ac0bfe408b9f773758ea"; hasRunfiles = true; - version = "1.8.3"; + version = "1.9.0"; }; "ekaia" = { revision = 49594; @@ -12998,13 +13153,13 @@ tl: { # no indentation version = "1.06"; }; "ekdosis" = { - revision = 56112; + revision = 56856; stripPrefix = 0; - sha512.run = "7f7cbe7a8df107562afab92b8e550610d6962925fdb21c47dd821fc2be58ed95f90278108a6592a8a8b8d1898a4d567cdc01987395c315407a94a917f5b4ce75"; - sha512.doc = "848c7ee3a706f510f557000a2f8ebe9edd5566eb07908fc351839cdfda12f2f07793abeb47484c0c5aaeca897e3e1ad858151ca79fc528639ea1acc81a0fbffe"; - sha512.source = "2a2b663657c752c9e3dfe1e91f8b40b6de3cde0c2ff8742b84e7bee11aceb584f1402ae038dcee3ed4eca20363582ccbef7bfdbb33cc42c550b473fc3440e0bb"; + sha512.run = "4d009f77a361386a77cefb528c345af13ff4626516839d93c3e3a12cb8b2a193113f4b3830f076e1e99c91523a549901aeb6e9aebd647736ff2f602e47c1836a"; + sha512.doc = "45033f4c022205cdcb4dacf542d887b452dd1102cf3c8ba65fb1adc4e1bf27b913d8de695898b9673fb4d37fac62e09ac4da55f8fac06e0189867ce55016f624"; + sha512.source = "2da1013c456c6ff85152a32072ed833afb041e756e09f36507c33ef9d36e1d7ef0181641b1584f6431dd868e8631cf8091f4152f5ba58fe2d3b59bb962c21b1c"; hasRunfiles = true; - version = "1.0"; + version = "1.1"; }; "ektype-tanka" = { revision = 56070; @@ -13135,13 +13290,13 @@ tl: { # no indentation version = "2.1"; }; "elsarticle" = { - revision = 50786; + revision = 56999; stripPrefix = 0; - sha512.run = "17770bd130aa601a8208e996c1bcf192459d6c6ffd4ca170a303c3a548c7481e7e3a136c64865999ab7ab38ab56b09fc2021555fab60e344a7fa23d8cd62943f"; - sha512.doc = "28c78ca516aee82dfe3be32683ae404cdb7be9d2d248fb747079e2d9cca9da44aec40145d095d2e3f0bb2f3d600712fb75a987c8d1aa1ded3f738e58350c44f6"; - sha512.source = "55755e1a228bb834820f74580935b7e8a5bb162a675ffeb617bb1c0f7a1b5d99422c53ed7ae6b0302fc51112d5dc3cf63bfa9268c49aeb66cc194529c9d36b85"; + sha512.run = "5a0a7c98a8e255e55468f9b01a43c33d757a38faa1b3130b1c3613648dfcbd0fbedfc69db99727c4406ddc0601249b2d021c680f83edd34bc3d64dcd4a7af64a"; + sha512.doc = "47fe52924e95cb8267d0f65ee6962fd56fdc4ce00ccdf49533ff7af0916a962bd8c045b31f2159d7c70d8a041f7c20aafc73b23a8982572d456223afbb85e718"; + sha512.source = "5887604f9a6ed0077bbbb2498f6ba7c1a3c8a74485688d40a6fb0e9e9765035d22e928b104876a19e42775fb766502ef71446e659f6d75a519e2b84ffdd2a01c"; hasRunfiles = true; - version = "3.2"; + version = "3.3"; }; "elteikthesis" = { revision = 55928; @@ -13219,13 +13374,13 @@ tl: { # no indentation version = "1"; }; "emisa" = { - revision = 46734; + revision = 57013; stripPrefix = 0; - sha512.run = "9f62531d3cc26b428a628d2cab0e9d3fa95b1f67e91f5ffecaa432432b02acc6076acd32ac2650eabb54d9e14b6081d70fcc09299b45a0b5bd27905f1dcc8506"; - sha512.doc = "092818afd707380679c4d3d44ad50954c48562ecb5b988d3bb94701991bc30cfa356f975a8fe8a381fe99171efea2b790115cd0a4f12b17430cecf2efc3d7d78"; - sha512.source = "cf43591889d823125ce7d49dece358563c5dc4ca5df89bddc8cb6b73550e34e5e02b5aa5c67c96c747aeafc6070fc91f899d2142ad23424b11637a7a52feb55c"; + sha512.run = "dac517c5f1f5e475948d519ef46e3639a49ab3303a5d93821707b43b224ccddcdf6edfb8576fd89888cd00705b11abf17054c46008bb288450a0c679cc0ded2f"; + sha512.doc = "7fb9b28f4675a5e14687b569e1e5394f06f25f536eaa6c36ed390d24c634d2a30fc43c558d3e1ca004bdf41436705cd7ce9b59beeb31a6dd757a5fa7421f84d7"; + sha512.source = "3cb1e47c50d4cccbfd1b428ec1193ffd0f489d0284dd095f2f969c8db76f735b854e4102f474ab5e72876bb7b6e6210dd617958e42a851cbc03f5844626030fd"; hasRunfiles = true; - version = "2.2.0"; + version = "2.3.0"; }; "emoji" = { revision = 55678; @@ -13283,11 +13438,11 @@ tl: { # no indentation version = "1.1"; }; "endfloat" = { - revision = 51003; + revision = 57090; stripPrefix = 0; - sha512.run = "2bc564cb0ad7b9bd53af9304f378b6d0cdd9aa32564f2bbb39abcf0d942c4e18015b7181d4be5e873bcdf4e8f971d65678fdbcfb544c005ad012b378eb6e1351"; - sha512.doc = "39a1cfa84a2cbe5ff1b59fd9c5fa6a19cb1d3aafac6d1fbb111f117892e34142f6a21ce7808238608ac0602d905cfff6235a78762a0d510dbc436c881baf59f9"; - sha512.source = "551afda371c0d4a6e71299cac919857eaaed3ee8891f96083cd76fb33ededfaa3daa814593efbc9e7e8dbd4e7d257945972df547d7c24665e760960eccea07c9"; + sha512.run = "9c3820ddd36934dcfd049ab766ed037119459d02e9c049401b910b1c14ae2aed93d94110db66f0cdd2149451e152b5bcac14866c7844ba4a47f8c0a27756f733"; + sha512.doc = "0004d60fe959415670b5173bbab6d37733ed82b537d714c7357dae85ff8f7204e316c48d2651b1b53cc9b6ad0206a47c9cde1acdeb6aae676a25e50f363238c2"; + sha512.source = "bc5150716b23d3aa1e3a66e29fca3e8f9703199feb05b4bf76834e79654c39b0f6790ef1f0c193abeb0acfd0b2717076d4e2c89069221e1bc45716e0de314e85"; hasRunfiles = true; version = "2.7"; }; @@ -13373,12 +13528,12 @@ tl: { # no indentation version = "0.1"; }; "enotez" = { - revision = 54512; + revision = 57130; stripPrefix = 0; - sha512.run = "cc06810fea45e42f30de3eae33850ca39e561b77641f40193c8ecc6bb830de984e236379d1367ca466cdd8c401cd059f849b9a975a347d83070150035c13cc1a"; - sha512.doc = "1e345218dc64ccb561e8cab2d8dcbebe2502d25eeb79473f1432dfd3d05d041c0bb728d6c8b75cecf88fd57ecb5907997bdbffe1b7327208b3e300910b82b3be"; + sha512.run = "1bd49ee7ece262d28d0b80f418e7aaf130044447ad341ae799c4f84c4c4e69300662951dab2733d996abf896280470857e8c35832759008881cd23f35fd52e30"; + sha512.doc = "a04cad229111ae30cb51aad4c843488661a3e59287280c9335bd82d5a5172429ebcbd31e1d7f6e2c7ec5d9a3f068bf00c88e7dc67f3e39a794f32107bc705f3a"; hasRunfiles = true; - version = "0.10b"; + version = "0.10c"; }; "enumitem" = { revision = 51423; @@ -13405,11 +13560,12 @@ tl: { # no indentation hasRunfiles = true; }; "environ" = { - revision = 54080; + revision = 56615; stripPrefix = 0; - sha512.run = "60df3a032acd64221167090c853b4a330a2cc072561a981a70be29736fa871f0bbecdfe6b2cdfdebfd448d8946c4d0bfceb252ea0693194d184bed3c4fffc747"; - sha512.doc = "8d30310ae317193925c81eece58a3d3109c1396c7e486510826fd72cb8489234867583f438873affae766a32498e375eb46db51fd0d7f9989cd61ae2109e13d6"; - sha512.source = "17531d5bcb727e94f7def5f49afd103cd6c280aff943dfdbdaed28f6cdb0a16db918ab21201447f069489f442aae93edbe77f1b4a80734d7f6e4fb6a5ebd3ee8"; + deps."trimspaces" = tl."trimspaces"; + sha512.run = "c8dec70e56651a89ae8da15abc0ad81cc2edb4487837469238e2adc0e7c58cae4c5da82b637a3336839b50103e3d846c5cee8c73141488f644469a0f3e9d363f"; + sha512.doc = "78d4d3f570470619c938687a6c9a6925aad901d781e3e893bd731a49bb8eca62bf1870e68d84f7125e10d91d7bec02a323ae42278ff59c04d7e33eefa2261496"; + sha512.source = "b30607d21bbf5ddf1c7d36bd9173a16d91bdfcfa004782be50e50f17bf54d94e943d5e524e2331b75f3ce65e81193ba98e69ab56c38959d632007f5b0a87bd6a"; hasRunfiles = true; version = "0.3"; }; @@ -13462,12 +13618,13 @@ tl: { # no indentation hasRunfiles = true; }; "eplain" = { - revision = 56548; + revision = 57186; deps."atbegshi" = tl."atbegshi"; deps."atveryend" = tl."atveryend"; deps."babel" = tl."babel"; deps."cm" = tl."cm"; deps."dehyph" = tl."dehyph"; + deps."everyshi" = tl."everyshi"; deps."firstaid" = tl."firstaid"; deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; @@ -13475,15 +13632,15 @@ tl: { # no indentation deps."l3backend" = tl."l3backend"; deps."l3kernel" = tl."l3kernel"; deps."l3packages" = tl."l3packages"; + deps."latex" = tl."latex"; deps."latex-fonts" = tl."latex-fonts"; - deps."ms" = tl."ms"; deps."pdftex" = tl."pdftex"; deps."plain" = tl."plain"; deps."tex-ini-files" = tl."tex-ini-files"; deps."unicode-data" = tl."unicode-data"; - sha512.run = "8a7da7a93651d819a068d5415824fc8798e8ce54c0326f4f993a468127b07517bb0da912a1c440d60fc9f371dad460c920f13b43288556745a4121ad7756c0ae"; - sha512.doc = "6fa123f48bb7f09cae93a64a72509ae5d32bf9683f553fc1a5f66eb67bd273a20bd0166be14223a8d0fe9d4aa86da35c75011ea3edfa0d156271b991a85e5b4d"; - sha512.source = "cd030f5213b771a1c74a53aebb59ef1f9c1d8ae4136b0c852b58deb90787b663fafa333bde1b1c6fabee942399d5682d991369b781b864bd2adcb7899916ac44"; + sha512.run = "a5b93a081e9b2201a65bf7e7fb01381480f5c1f31aafaa78c5785981d895a384f1f8db1d474db845c06cd0850cf70ec4bec0e3935b67fe506b8b07512ee97479"; + sha512.doc = "44d804287cdd427043f766ea9f5f352d93d65f941b3e18727dfc9276fc381f51fccb3a025707f24dca5efd59cccd1a340e5de0d452d928ec0296b4faa46abf67"; + sha512.source = "8edb47575e32de1d7947bc2b7e1e354eeafe287cce6b4c7bafa1266d9d7c1bd4c8df363ecb4c17da9eb35cfc1e3393e2297ae6d90f9f4aa8147b4467e2ae1c89"; hasRunfiles = true; version = "3.11"; }; @@ -13640,12 +13797,12 @@ tl: { # no indentation version = "1.111"; }; "erewhon-math" = { - revision = 55287; + revision = 56703; stripPrefix = 0; - sha512.run = "2c530992e46104ec3529f2d2e5b38a66d5e27928fb819940865a87f2035152135036f19fec79b79cedf93394f62165575cd67a3ac72d0fb0669bd5825c9ec4ea"; - sha512.doc = "74a12737c8d4963da687b95c95e55835f22d2a4bf751a4f39aeea410cec684e208d2bc86bd5f5e9a986df94603a7f21f628ed5d8376a984b7522b528bc190223"; + sha512.run = "1e1bbdf2bf030e8b8c09c955ced895a93117eeb6c6a6f784ccb62c65d7e3fd6c5f536b23ea86eab3f306f0734fe3c805e22e61dedb5a5a06f41b74b8e89efdde"; + sha512.doc = "e422d287b0fa687e1bf54dc96f8adf1e979c8d2b6cfff2a5ad2e9d3ff8fde95ace136e2317235f6ad6144fe359385401569ec7aa75c273d48c3b7134b4273e74"; hasRunfiles = true; - version = "0.44"; + version = "0.45"; }; "errata" = { revision = 42428; @@ -13740,13 +13897,13 @@ tl: { # no indentation version = "0.98"; }; "eso-pic" = { - revision = 56463; + revision = 56658; stripPrefix = 0; - sha512.run = "7646578d67dcaa61bf995762b190d07bc829dcfa322211ce84fe0e107f643649b302ee2feb2b3bc83d3369157242e33fc9bcc6b3637af274638b23e84d5c3aa9"; - sha512.doc = "3b8f7ff80a6cd3a1870172884759cd5147dae4935f05e06d6fa880b7d03de9c227390353f46bc03a7f6437efa4e05f1fa845aa4571bcc4f0ea3612a9728a1e94"; - sha512.source = "08b254a5b0f129ce70259f889082f490c38fb0519c80cece7f555d0a0e6f84b9d34695612ee8bc3af24003033fb1996890c3497206ee3f9a4728d37165e55bb8"; + sha512.run = "d4020b6d7f1ed44ecfc11938d604595e48dc32a24e2e67742016fbc2022f19ab63c759ec03030d7d3a996cc00f7a08ce8cb1354d0e9234f116080d732e4dc5e8"; + sha512.doc = "96fcdb612c8473fffe672a6c443c120b2cc8dafec5b43de132cd8f758d85bb504ea14285af121921afbaafea7c6df99e32f6c50101d1d76900b1aeba38c3010a"; + sha512.source = "86655acc2d9d11084dea3791a171b01e18715cce77b2300220764eba88d4a049a2a6bef6ff7bc1b90fdf337379be065a2d998aa32e42a0dd04b21f0293d1c14b"; hasRunfiles = true; - version = "2.0i"; + version = "3.0a"; }; "esrelation" = { revision = 37236; @@ -13967,10 +14124,10 @@ tl: { # no indentation version = "3.0b"; }; "europasscv" = { - revision = 49703; + revision = 56829; stripPrefix = 0; - sha512.run = "b47453280812327a1528e7d2a484e0b92e5464381bda11b715c624bb8fb7a1f57e3df71ccaeba7dbe8b0f757297ad3c4515aed773a44bfe78efbe9f64297e180"; - sha512.doc = "e9041765db618541c6aa9a4142b047f4096bc335a9601186a26860d6b594d6b6125c0f5392fb6dae9a296392fb565ba0a8c288155e8d99e12bc12bec0bedf52d"; + sha512.run = "35aa159fd84082e1cfb65bd05ea83462400e12edf5a40a89740373954d72b42cc33516452691814359d3bbfae1e96f4605e0d19592c54f4e2e5328542cac42a6"; + sha512.doc = "834c4266e343a8b615a45a2c4b064170bf6c9516a8631342ff02d4de7154229458818192670f3f73aac5600407c830c1be384226bb3b0923af964905a39d99b3"; hasRunfiles = true; }; "europecv" = { @@ -14004,13 +14161,22 @@ tl: { # no indentation version = "1.2"; }; "everypage" = { - revision = 15878; + revision = 56694; stripPrefix = 0; - sha512.run = "6f4779a2a0e0d2352b702652a583f6ea7da71865196894b88b630e1105e56dd5ea525cbd4eccdebe8dfa347716c192fa098d5eb8501f305109b337b266e7ec2d"; - sha512.doc = "185bb6b87896f43472d8c902cfda976139d8b1df09c5eff75e8f579314867dc05b6c215f0dcb09a3438f7279c6579ffc8f92fa7fc682fce18ddf7f080e0c6e37"; - sha512.source = "ca04b157d255502abde15994da4690b99e4c6d015c86704d179001b3412e9c9170a040216657ef5afb174aafc34d4c0501b51155b84164b17401843837a9483c"; + sha512.run = "032713896e2704667582aa03e8d542062a5eb26188d41b08968955fbd8535aacc8288559112aa264c542e3523f452dd9b2acdd1dc3f66450cdc5c5c902e38b80"; + sha512.doc = "4c19f905b5a16674980da2569b2994382a2eb108fd20bfdd29a6ef4220e00aa390c197dd86ecd093a9acb83b9a2d64521f732083e3c2828478a8c8c45463d180"; + sha512.source = "f01679f5ac00d3c75a0595496b489a008c664d7197af6d267226498b821ca83d34ae842c212756ccef81aae40f4447ddae2146b5651084dc55081f75c1ec04f8"; hasRunfiles = true; - version = "1.1"; + version = "2.0b"; +}; +"everyshi" = { + revision = 57001; + stripPrefix = 0; + sha512.run = "b6219fdc669847a30ad2359d6b0888eec0980114d5385c018e9ddfd0876dc52390e1e8ffae5d2850cfa140833365c30024456bfacde6615bdbe5101e7059d52f"; + sha512.doc = "2a05f4b42c1a85b4af8fb3881d1e32d0cb8fad7070bd8eb83632b50e387083a5c8fd264b61b70416451f56a97e1c0702507bd50c534ab7baf975372d854a97a5"; + sha512.source = "4ae653fe3cf9dcfa51f461ca72954eeef666a6324321cb5e6416d7e2baa5320115818a26f1970bf7654acec9454e5174262578fc4d28f251d3476d27d6d4d9d5"; + hasRunfiles = true; + version = "4.00"; }; "exam" = { revision = 46084; @@ -14154,40 +14320,40 @@ tl: { # no indentation version = "5.1b"; }; "expkv" = { - revision = 55750; + revision = 57247; stripPrefix = 0; - sha512.run = "aa006791a5b653059e1f45458f3496b081aec50d72ee5547988d82000534c7c29fbc9639d6563eb48b6f296a967f8b05a753147043743b0b2de26f1b2e7e1488"; - sha512.doc = "8efd25dfb7c728f8a4aa57354db3d39a2a29f5eba5441853c03c24b78cecbe97af628e028d188acc043ca7a28623e8f447df3904462e666da8fc6aa58c243ae4"; - sha512.source = "23e766017e6ecafcdc409f46f12e4d775e1b8fed597fc9f020ff3889816adbb1c4b52f41695071b4d7f0972ff6b1afecb3f57de6695ac58ac5c81b7ebe98e98e"; + sha512.run = "b8270aa4e1b827a6799869584db6e30600a4779937de424548a3dc22511e4bad4d096389038f6423731fd36d3e93be59e789d957388ff243a1e7bbad65bfe8e8"; + sha512.doc = "31182e02595893c756fcac91222ef640e8c39c053ac98140769c470c126bb85d2cf17f9b342bbacc6608e136d13aab5528761650135d64b6fb3b5014547d6cca"; + sha512.source = "2c1ad532623a79222a886706c890bdf5c34b80c58a1d378c54bd4d4ef3d1ed2f38d5bab9b415d4f1b93f4562b47e387bd77463cb0ef849a8029002bd96cb4122"; hasRunfiles = true; - version = "1.4"; + version = "1.6"; }; "expkv-cs" = { - revision = 56074; + revision = 56693; stripPrefix = 0; - sha512.run = "caec26af142e07e2a3744ef1769e6e6b36dc86d963f3b46de3c30d5b0bd277e2acaf50b1f21448005d504fbbe201e4523119362cc1f841d8046ce74617501a2b"; - sha512.doc = "302633eca5dab1dcdd9bd0e27fef2441ffed13af2e713240be8530aaf7785759d19872cfe321da5fbe47c97d151a1ae5fe37798f739187deaf84a4d1453e72fc"; - sha512.source = "ba9d5293b0e548dc4538a5b86ffdbcb23e455625d43c81cb91445d9d5ee5f111d9967b3c89742d58f458092652be7335e26caefeba2eeb518c6f93143a210846"; + sha512.run = "128720f96c0801a5db0be297702367a29f9c37363e86071496c69fb5d1cc0641585f01cecebf919ab4cfe34ef93964bb96d84ae8e29ddc91bbe1e844137d52da"; + sha512.doc = "c28461c7bdcd905036507bcada41a720e0b468bf3f431b750672303baf368a1285567e632472610cedfc2de1d3b0941007113e1caee7042593c57e1f0e9fab4c"; + sha512.source = "7ce2d0ba12959c7f8e1a93f175d6637af95de461d04e651c5e356c8428e2a3f7ac2a1f240606e9feb03b4a8032d04400f2fc101c073cf09b242f3deb56b6b10c"; hasRunfiles = true; - version = "0.4"; + version = "0.6"; }; "expkv-def" = { - revision = 55829; + revision = 57246; stripPrefix = 0; - sha512.run = "7fd04f8d3722263acdcbe991cfbaa42536575a53360c6eda061c105797ca686a59075036dcdaf4baa98982f41dd0f369eed83e7ec1c6380a98a4cd62e23c56dc"; - sha512.doc = "e6e95f42feba632f0ab9b32458e8dc48010ec977b0fa32102c20cd26e7bc537150c4688d9b00284ea81cdb08cb1b0efc631684051457d1e53f876fb46f37dff7"; - sha512.source = "708154ba4402c5afa1e95d12e2979edc943462584dbf5850b6d2362d938e970edfdce24cd8d76fe16894144900a2a37cd486c9c3d1b7cf0187bc1bcf8d3bec68"; + sha512.run = "034a3f9dc0672deb9d35a1f6f27c10d77b0ffecd82697e0a09216599472cb6d982855c7900f1b7f39a748478b0d2a1ed8a434ba676293444863e50fa9b30a07d"; + sha512.doc = "b689125035104ac0693297b018f8684503b69e166f23e02e53224454d0319e9f7e6867e1bf8bc3e32498dc7af709a67165f26bfe3e39d86de0a56b0f2c16c307"; + sha512.source = "004efe1983799c06ff03d793ee11e557ad55242ad29c1821680806495c441277d9dc1bce9d01edb558b7ddd7a71ee12e597af63663f72ac728a4d0d68b0a947d"; hasRunfiles = true; - version = "0.5"; + version = "0.7"; }; "expkv-opt" = { - revision = 55751; + revision = 56633; stripPrefix = 0; - sha512.run = "b6b8756dabb464608fd668bc1c86a70be13063e59548021b43030e9e5843e25ca84b33114d528a7417dd6f992cfdac706d3311deb25466a64ac1f0d55262de27"; - sha512.doc = "dbe0454595ed2aeefea8a3966ac0ffb1d41cd6664aeabe33223580eaabba83222d896a6ce44605f5c7c913059168b5da951954838e6a8ccd94e7e6669d117165"; - sha512.source = "335e8abe27588b3430b92ae2e2fc35105e8453983a9faf52f891300827daafadff145e4c56d2d2c985cada862b30e425abc9eecf862436278b616f39fdaa5fae"; + sha512.run = "d62e5bbaddfd5ca1be219a6504774259a8c07af1e32e5c5f8085cf78eb1e0f947318f7fc6f49fbe686cbfe8261d9bd3ea70f77f21afcb2a6781074fbd7cfc2da"; + sha512.doc = "12c903eae7f081cbfe5fb5a9d19373353aad194dd90bbcb8691a3ad078903a953e3ea8156331b1d3c600f2af8f23620ef6d514b0ca55d0e3db5ac03e63523597"; + sha512.source = "5d3db8c1c829784becd1512d2db773ca75c288a39d4d0472df09d26656c873670861b80e66fd372c6e636e0b2b86ad5ee035dbdcf8b30b87484f039f7fb87e49"; hasRunfiles = true; - version = "0.1a"; + version = "0.1b"; }; "export" = { revision = 27206; @@ -14283,13 +14449,13 @@ tl: { # no indentation version = "1.0"; }; "factura" = { - revision = 54803; + revision = 56948; stripPrefix = 0; - sha512.run = "99f59272276c7723601e720287d885066b01d44e8b388ae1115bb5e14d1face1c3de444fbede9e84d66b82772982b2f0a8666d778916316e69ef32c624db6c22"; - sha512.doc = "17176702c69d98902877489d764bd3e0d0a3d2fc2e9f41fa4215a47e05c3c4e2ac9aa82c05352aeb9f674ac2ca7f08d27d9fbe45b5e0c741ac1f0913e6b81dd9"; - sha512.source = "e8ad0a22357cf28cc44a6a69f4a8d1d1c6ec57fedb3d2694094f90951b304a872c7e34b46ee8d789c964cb1e842d5b41eeab7445926da0b7f8d66149e924edaa"; + sha512.run = "a4c20cd7b7b2dbc58cd7d1e2c7cdde59710c9363a7e4878825d5aaeffa992bbf471169bdfa01c83aaf3e82aa96ab5fc634676656e2e4e6bff55cf5c4e5407f53"; + sha512.doc = "7822a8f8cef63485f2c707e180c14b67148cbde8f8f1b6d1ec6bd0d9f6e124cf4b63bafc7d01c6ec72c8b5f1edc36f68f9f48b9bac523ceaa093a861a5790f2c"; + sha512.source = "14b3c407a61583fb5cf3813d7ef379fe34415f10b985d7e71dba622dda7b118dbb197e7c8b1cb2cbb45378e38eb333f539c4e95daeb57253983699e3015e4395"; hasRunfiles = true; - version = "3.73"; + version = "4.00"; }; "facture" = { revision = 43865; @@ -14333,13 +14499,13 @@ tl: { # no indentation hasRunfiles = true; }; "fancyhdr" = { - revision = 49886; + revision = 57327; stripPrefix = 0; - sha512.run = "da99c0def1655589988fcebf627dcb35ab1a3f7ef481f141ee91045f81138cc02f849f4879507afdbd89e631460e5104d49bf0be6a640f4c7e9532acbc952454"; - sha512.doc = "a54bd1e4c0835e1d3790ceb9c50ac63766df45fb3d807b74222465c116fd103d65bd09a8e0f4cd20941422734cc508fcca9f86be3ee0cc2beb4927b9a2149849"; - sha512.source = "aad6a82c734ba3a1a571ac67f38851808e42c600884b22b64f463f7f4b41f83a85342845ffdd70244236dbe1cb013ad77f28c1897c6c28edc16590ad61d79510"; + sha512.run = "0f2df7929961837047c1e71af86b20d74f57ccf9866555e1b97ca3b38fad044e50a21a31485e8c77fc5f28c16fe30756e4824b46b4166eb48715b8be467edc21"; + sha512.doc = "6b28ae73a502eaa3656cec93b838f380b245dd2c0bd6633af87f16260a7861d6278056ee96396f0c184fdba05920d9f9dd4e92593272774bfa14eebc00eeb9e8"; + sha512.source = "8734a36cbc4fff7d9d2d535de1689ff511503b1bfd8fd07d557663ed718ae3dfa8412f267a0a4d5ecd6109a05e5318c0aad4363ef9f57756ae8ad03be7dfd506"; hasRunfiles = true; - version = "3.10"; + version = "4.0"; }; "fancyhdr-it" = { revision = 21912; @@ -14628,13 +14794,13 @@ tl: { # no indentation version = "1.25"; }; "fgruler" = { - revision = 42966; + revision = 56854; stripPrefix = 0; - sha512.run = "d189eafb4b2f7788d42614f87684bb3cc36d8e022c9c98f8f7f44babd5f95d3462ff25d2d9ab541384d35ad4daa39b09e28dadae1fbd0f7fa25d0f8ae217c34e"; - sha512.doc = "16e5f5be432e338788ea78c5e41091eac616a3ad779c3c40bff723fda2646d5205599857f0e23f1b2774fb56a2ac795c61babe21cc4de5ecc2fadb7b6d33eb2d"; - sha512.source = "789c6383611f55e5efa878efc1ba229794a888a26bb4174fe263c5cb2ea678e67422a47520410bf83b90ebc32a4c9584a7f24bb66f4175d6b71ff0ccabdb3de0"; + sha512.run = "7567024373e5043986da5e5ab1953e207ab801284f7cbac38bdd200ed607da239a37480132d3b54ae52ff4cb409414b8dfb3e998a5a70bd49161ac99f6cc99e9"; + sha512.doc = "dae1aa1a479d95ae31efcadfd3c48b28b57b10e844968550b4772ba863b6889f8d4e7c4cfe928ffdb903db611f1ecd0b4319b0be6429895f671a695fe9362fb0"; + sha512.source = "bdca41dc44cd030d9548091521d7d92986e693280977edf7a2a6f804857602e6904c85f4639e9a18eb993c89a95b1217ee35cde50e6d30b238de3f46d332c6ae"; hasRunfiles = true; - version = "1.0"; + version = "1.3"; }; "fibeamer" = { revision = 53146; @@ -14791,12 +14957,12 @@ tl: { # no indentation version = "4.3"; }; "firamath" = { - revision = 53388; + revision = 56672; stripPrefix = 0; - sha512.run = "282d1d6dc2f414c4fbeb0267ecbc52446c125e3195d82f5ecc60f1c659b0e92607fe2621f8627835732a8428d5028df47e3b75a8da051fc3da8ecfe9eb5eab1d"; - sha512.doc = "d8d3ebd6c529a7e518597b9de2372ea8aa6e07f39c281e904c2654ee575caf200bf3e18d8a9d98861aa1102be13d64d12e18860ec046374418e8226360e3aeef"; + sha512.run = "c18ab8b2e12b947144528b196c9b1de7f1930f3a38338bd114bb61205d7f910fbf1e3b20ce48ad8228fc24b14d734ae68c3c8542218a058120a62783b007461c"; + sha512.doc = "4e434c757b4ad4c82397224ab275db9a0783994dd9e3acffaecf19f73b3bfb86dc6f70c2833b2f203ec354aa275384d1e97f48deea9a765b3d972eede02a35f1"; hasRunfiles = true; - version = "0.3.3"; + version = "0.3.4"; }; "firamath-otf" = { revision = 50732; @@ -14813,13 +14979,13 @@ tl: { # no indentation sha512.doc = "497080fdad8195bdc43bef476f9e678b49d83829f10a6653c9443d327cb0da8505623e941cd3038349b6307ee37a65ce1a3d3eb48e4c6262f9d636d10d96e17b"; }; "firstaid" = { - revision = 56540; + revision = 57154; stripPrefix = 0; - sha512.run = "942020f0757742290ab01004dbbba27f5c6338df29fb088b2003ee4d65f11f9707c0dd30b140fe837308825404118372911ec63c7b576166573759488b8356c8"; - sha512.doc = "3e63cf34a4c62a583b3f7a7147c3ee817ea2c382603da13e41fa2aab24f6da3a19a4c937c58903f49fa948955cd8cfcda2263ad75e9536d4105675dd0c420300"; - sha512.source = "0c6a66c28fa54a7ef596bdc1b1c347847b844751407f89b8549a4ad06f2e1661566dad93ac2c0515da4e424d6685a8a8fefdded54e4fd36dd565b9cc0835a337"; + sha512.run = "ab371c6f1a0d7b3850f024c6a1362213c4c53cdbed7d27a019c915c603c52cfd2ea230495ca1bc714f6438dd5edf8f4cbd953f8756cd4367db89924245a3cf8a"; + sha512.doc = "39ef54e4a4d1701584402d7d3a37ad8f6b873d68bfef29749d1dfc66dad529c1e526a9e8828bf6caa9bf4672f5d65b1209231be205bbd4fac7fe5669e0e4649d"; + sha512.source = "5f01613b7bacb518f6138f359baa045237416805f8e1ec26470a6fa69847ab6b1fdf7c4c94b60013a52033f35ddca7f670e647b914f6251e65b058c523fbc3d6"; hasRunfiles = true; - version = "1.0d"; + version = "1.0i"; }; "fitbox" = { revision = 50088; @@ -14982,13 +15148,13 @@ tl: { # no indentation version = "0.2"; }; "flippdf" = { - revision = 15878; + revision = 56782; stripPrefix = 0; - sha512.run = "8f4de43f2d6310bcf3bfe350a071d43ff4ddf4d21acaebddf59e3fdc62ae562e32006707a6f7f5de1f631f9aeec12edd7cf75332b012e433478d171e149f2c96"; - sha512.doc = "3b40280c0d142add31bf27dd57cf52ab2d5f4f43637cf1a1a20202b5615b58c52567e53ff2f9875d2d1e73116c227319909d77df1609ed5590b30d2c151f2c63"; - sha512.source = "359f526185b8d3160cfe2c78c22d36e2df4ed245f574d3ed905b8e0dd95664f57f0efc128130a00d2945c666ffb094eb4333a26c13b56c9917bc0172e31041f0"; + sha512.run = "17773b1ba5f40d694cddb3d2e2742650bde889d53302e6fa6ef0686ea4cd3fe393ca2e5b31842e93e5588631ee53ebb668cb035b2843fc5bd57911167074edaf"; + sha512.doc = "d5191d079641c9a06336498c396cbcc7585c983924a646bcd3b26889ca51a08eb166ced560f45f834281fae9abaa47d02fdd4ddadd3348cef704dd9b818e7675"; + sha512.source = "95e86fe1e8ce5cbba8745123dbf6c352545d0a75f3ce679e2cf132e46184efa28123f9f9ecf805939c10f59af5bbde84bd2a75eba8f0aae3628b41226059bdfd"; hasRunfiles = true; - version = "1.0"; + version = "2.0b"; }; "float" = { revision = 15878; @@ -15237,9 +15403,9 @@ tl: { # no indentation hasRunfiles = true; }; "fontools" = { - revision = 55997; - sha512.run = "6f6951661291e667983551fbb7ffbac6e25e22aadf94f53de6960855a97a5e2b4fdfab50ceb893d82ec0b459415a95c25310cf1038be31809dad965eb9f43cff"; - sha512.doc = "de10b5508557a0a3dae7ddabbc3326c106d878492f6cd305600b20498bcfbd244a793604ec42ca44b6a51632512347ba60f70908bd669e7308b81504e96bb737"; + revision = 57171; + sha512.run = "e7ad742fdd462f7281d1af2964fd09de98cd7d4014442f63963f3fd6bad8c63e1f9e8a7209b8c372090da7a8494ef6dc6e23f745ce032bdb6d27d64e81ec1a6a"; + sha512.doc = "b36148f545f10de55e52b695369b669465dfa98fabab8d75d0650a58984aea616da753c76747fb2ea31bff630764bc8182a48de51c0f038b84de01361354fd05"; hasRunfiles = true; }; "fonts-churchslavonic" = { @@ -15260,21 +15426,21 @@ tl: { # no indentation version = "0.7.2"; }; "fontsetup" = { - revision = 56428; + revision = 57141; stripPrefix = 0; - sha512.run = "b942f52d4d5b8f62dc56f155fe1b2f250a73a076e29383b6348dfb116c5db47868aed3e48351ad1134d35fc2d7d042d782a07ba23faee4963d25a995162076d1"; - sha512.doc = "afa300891632d757c80bfcead86216633b1c6e1232ec85f8532bb5a912a7bfe3e169cdad6ba9eab80780a4969113cac34682bca007594b6f7a07303532a6f6b9"; + sha512.run = "d2adc60542c21d9694020f51815eecb79555938c9a35d9b7d0ac1c0459541e17d3b86d837dd1d615bfab3d8fa932d7dca24a69720e1565b455f871e5f11a11b2"; + sha512.doc = "a135fa4aa983a177ebd3f816a92540ca8654e14813f94b468226b17dcf8221b873f8f0c9ed3d028e98220803b0f9756861af8e1926282e3b6f6164bc4a689440"; hasRunfiles = true; - version = "1.007"; + version = "1.008"; }; "fontsize" = { - revision = 55265; + revision = 57194; stripPrefix = 0; - sha512.run = "87a6151725f2cd238634c73c1f57872771b2095ce110fe10e32ff0d86c274565f8d61bf056935b968f7ffe497374f129d3312eb07f49100332245b572d592063"; - sha512.doc = "3187d501d01780526987c9a903184f446dd9197b0b2c89afa94ec13ab19db2a2c95d3455e01194b6cce89b3c708f89be060024f1632041100587b84261c82e95"; - sha512.source = "39d501c60870666bd38b392e70c36bc36d4a262c1dd1aebbcb5da90e904fbf5fbd492dd3c518dc15fd73be67f69e57975f73e6e825e5731e9325fdc11b0684ef"; + sha512.run = "70d9e28eb47d6d4298c7ee009a080e750f624bd659637046db6911c8062b7838425eda029a5b0c1ea5c68273eb892b5f9fa240e9b28f90dc4f419ecce41fc82e"; + sha512.doc = "280b2ca0f546e1c73c6cf337de55a8c0cd7e99b1c3b9abe7df340a31f507e75d5a51ee140406a4634418d4bd8382a1f0db44f0793637fb9428584462617335b0"; + sha512.source = "6e4247f9724b586d6ae6d9ad15e970957efac5b8f518a2d5621de28669ff06123a1a867fe51d045e6ff173e901ae955805fd0875f19ce315c85a300877c0b2a3"; hasRunfiles = true; - version = "0.2"; + version = "0.3"; }; "fontspec" = { revision = 56594; @@ -15417,12 +15583,12 @@ tl: { # no indentation version = "3.0"; }; "formation-latex-ul" = { - revision = 50205; + revision = 56714; stripPrefix = 0; - sha512.run = "d705a402a4ba61f232e559e6a610646180f22f47df251d2731cf8f62a9edd26d60be53ad969ae0bb8d02a767b302df18b88c048ed1536b3677b7199d347e35d8"; - sha512.doc = "5bf8c412d061a5ce30ea3af713af400eded6a0f75ee019fc9f6e40623c3203839f718eb4b630282ec700871cf4b0cfe68ff38d43cb50f53560184d7d44d528e2"; - sha512.source = "51a77394f3471dd2fe6b29717c89cc8d2f6f0a126ad84d5973bb1d3a8600539148be0450b1e5f5cde7070224ea02b09ed9b871f743ec82c78640b9ab54ae602d"; - version = "2019.03"; + sha512.run = "30e38c93cf692aea977479159780ffa797535c938fbb0551c86979f61f459d571cf78526a5ddd435b22e850e45fd6fb33ccd6a8308a170bff034ab3d29c63318"; + sha512.doc = "3f8744fb5c3554a256a3585cfc8f0339bbe91ff94b959fc02f2afd25466333ca54003b1183ba7e770f49e296807367ba33f809424921fd437f9773cc5aaeaf6c"; + sha512.source = "52d36951555b74a8091efe64f5bb6790917fc3346a79d660f1f7c45793512efc86c935d13bcc88f0dae714223ea5af3a02b32b062880f117009bb99727fd8dbf"; + version = "2020.10"; }; "formlett" = { revision = 21480; @@ -15568,13 +15734,22 @@ tl: { # no indentation version = "1.3"; }; "frenchmath" = { - revision = 51192; + revision = 56847; stripPrefix = 0; - sha512.run = "1102ab998250a36d6d93aac7c673628eacf8b1abd203d91989922599ec6dae58439ec2700e40eade5b0ee1666a68a30d94f89d3a225082a6273ccd63f61fb586"; - sha512.doc = "622cbf8f1149c53f240036e2cf2d6245d6870ea24f9af6e1883e7fed2f1001f38227176156e8a33c9d9c07414b1accf1a924fbf7248e91903d764fb85d277bdb"; - sha512.source = "f41712d3bd58290fbe205001e9fb531a147debea4b93aeac3b9831cb3bc8edfc7d1364bee575c750aacfe1db8632c357a36fc5afb003a7c895108146a1ab3b7e"; + sha512.run = "9f05e3391576e8f37d00852a4d5c9c961369f0fa838d6942594e8b729391d41080d1bca55b258c24ed784788f5b52bb5f1ad4e0d33303676a2811c3804740d09"; + sha512.doc = "d1e39e879de7f2cc5307970b7bf2c5535aeafc67e4d79b01d217e33f32d75c482716b07539c7f58981cb581fda61d5310f9f4d23ce9c96e7f1d151cd91a6dc7e"; + sha512.source = "d2af7f5fd3f45964d851c038b533b99e6c2a813fa382a9b34333246b044c9b18db6252ebc8c997527211ddc8ce20ec3a816d11b49e1a3e185d7356dd141967fd"; hasRunfiles = true; - version = "1.4"; + version = "1.5"; +}; +"frimurer" = { + revision = 56704; + stripPrefix = 0; + sha512.run = "81057096f64d8ed53fb8afb9bd72eac6538f5babdcc054f422c7d6d0fa73b88459d250ed56b1666ec8d6c936b52102a9a1988d04ccc2efe76761e945d9027145"; + sha512.doc = "d2c8dd345fed5935fe2e329ebfe7c2e9a5c836f3af5d52605e35ce32ebf51cee529c182505db8eaec7772476f758bc5905a8b57cad5ebd162732801c2cf6d352"; + sha512.source = "a0fc0076cb4beaf081f21ca474ee287cfcfac07c889907d690093ff7b188214875766746bfade8f7de9182e5c32c7bdf912b71336f078bee120b042615056e46"; + hasRunfiles = true; + version = "1"; }; "frletter" = { revision = 15878; @@ -15592,6 +15767,15 @@ tl: { # no indentation hasRunfiles = true; version = "1.4a"; }; +"froufrou" = { + revision = 57248; + stripPrefix = 0; + sha512.run = "62879b91bec8db0021f41d8071ba87bf924445aae702eac318e215cad1aa7b612e17fcb52952184264cb37ca33283d1c7430afaa0c73ad8bacbdf4cb3347a8f2"; + sha512.doc = "1d1c4c1fa5f7ce6d88418c89f2cddee2fa520830f32d246814c5a26f6f2c5b675d80082b0d0075ee3a85d0a529974bb8617490f65b3294871e3bf9708a3ed345"; + sha512.source = "84f8126bb7a5bb65f69bf656c9009b57595e057f9293f0c14e90c49c164181d0218ac9f2e307092a79094662aee10eb50168a2bbbb2cfe9e4ded602c36e8d1ec"; + hasRunfiles = true; + version = "1.2"; +}; "frpseudocode" = { revision = 56088; stripPrefix = 0; @@ -15820,13 +16004,13 @@ tl: { # no indentation hasRunfiles = true; }; "gbt7714" = { - revision = 55482; + revision = 57157; stripPrefix = 0; - sha512.run = "e90253212cf40c26ab7842b04eb62cad61e7219d75b8fd3d49d3159492986fd79abc52c17b881c463f707fc80fc10d4616940e2a429cba2b4a927db2f1d7cad9"; - sha512.doc = "3b16f46fb4cee9a331d68c38f16c2e1546f6a3860b8eac7168544b3e392a8585ddaafd5b727ac8d16b5140df549028a50c82a7758bbc2aca0ae9b1d516de9941"; - sha512.source = "c44225f978569cafc7bcf76378a3ac61879e7c18b29f2665e22ad43ac0e356bc0228a95ea18a9f10c9204a567e6a2417e7895224dae2a5417ef54332c06860c7"; + sha512.run = "72021c4eb7e1ee1b9b293801988df67c0e62fb5f46c7036c4dc75357a95a80d040782c4a71e98690858854d572351445fe6c06269ad8f926d62fd668095815a2"; + sha512.doc = "c41fbed87dcb702241f8f8c3004854d725083f9e0dd2b3f1bb92a70210539617b728be086c2a7e823a8be0fc9b906cf965b9202fc5c12f4f05e87d73504444fb"; + sha512.source = "7e7e48208197fe92b939f569cbd0aaa96ba1b6b35821dece635c36572f3309f2af00d86ee70a6db35aa7ed261a4ca446dd857fdc1026bf18bf4c6adeb110ea68"; hasRunfiles = true; - version = "2.0.2"; + version = "2.1"; }; "gcard" = { revision = 15878; @@ -15909,10 +16093,10 @@ tl: { # no indentation sha512.doc = "fe296c5bc38a1e6d13d2b46dc8081a6658764f7017d0831cfd46dd86082371d6ae095ec3b52b3aaaacc0a57cbcee066b94644a5746391fae4129eebaa246e146"; }; "gentombow" = { - revision = 56429; + revision = 56665; stripPrefix = 0; - sha512.run = "f01a53df6b891306b832bd09462d3ecca748bd072ea1aff03414a38b6996842799ea32648b5494992a168633de0dd6679f76a36badf1592776c1098ca0a1abab"; - sha512.doc = "6d5c8917de96ffef7b393b5e9ba286faa968828920132f77086ab4f3ecf919ae75181ac5ab40674d400d530055de075a99900132b613fe317c691fc4d5ce637a"; + sha512.run = "e97b138d5359c3fa0635bf56001ecc7c6a5afb2ab2a01fd8817cbd956adce97bee67632f4e3ae40d56e5d2ce06bc07ab33b52bbe3978f14bf4957d2647781813"; + sha512.doc = "89912adef5b6572945a81835b1dfd0648699c03e81c6f4e06309dbb8230f536f5c93bcd46a3acb508ca92398df07cdf71e8f5fa7a2f889220a03b27ad78ac110"; hasRunfiles = true; }; "geometry" = { @@ -16184,12 +16368,12 @@ tl: { # no indentation version = "0.0.beta"; }; "gitver" = { - revision = 55019; + revision = 56810; stripPrefix = 0; - sha512.run = "e43eff82e8333af8613cc522518d060bc611273c15d105c090ab494f5f25821dd5f48e0f811edcfca5339d2cd17d3437e6183e7773cb9c538601627bcc62d57f"; - sha512.doc = "df22ad04093a358e4730acf641ecc7acaf1b9e3aee26971d82aad2fe559bb685c64a60ae67bf25028f7dff9c5ffdf2692fa8bc333da73a4144b93ab5e8cfd498"; + sha512.run = "de9440bf5a42e65d9bcea03a0ae02a77499540ed5a3f35f48f55cbf8973685c08413e8770e5aef430dedeb24ac881e15bcf72f06c689909a3988b6c3a2ce6054"; + sha512.doc = "0661e3b6e92fc80e638966e7df452693cf3a3062f9b75016d636eed986dfa265cc8b240ec8d004a604c08e2fd8fe0d75eeada9c4ce554f1dc443e5ad4a0de296"; hasRunfiles = true; - version = "1.1"; + version = "1.3"; }; "globalvals" = { revision = 49962; @@ -16490,13 +16674,13 @@ tl: { # no indentation hasRunfiles = true; }; "gost" = { - revision = 44131; + revision = 57267; stripPrefix = 0; - sha512.run = "81509f8eeda503dbb62d696adebf15c7f5fccfbd34d23ca8d83a9e7e2fa328c98fc1acd1fd99061c260ace3895cadae8138f0350027c6e81a0b52fb2735a0cf0"; - sha512.doc = "4a1a95d8647cc0e2b57f7815b4b06b7fd009e78a6aae701248f70a73825b394ff508a558a03386871d0a2ce22d43af81b677a2eeb3c2f2475a64a13d87493e51"; - sha512.source = "4d54271026bc1490882e207c079a4caabb8fae9075fa39a2bab4673a4046a63d175e12182fd536d8c2e4bd049858add1739da987a4d99baf3d61a32fc0596687"; + sha512.run = "d7e26a19b61d98aa2fd0b007e5b4d3a8193f16d1fc5be40af7657e63b9192e29aadb07128414b25b1c7fa1fa15da88463def5cec46f2a2efcfed89c42be060b8"; + sha512.doc = "6948132245db5028832119139ac9eb0ab9c65bd565104c3edbaebff255881e97808d2454d03a83d484ff4d7548fed7fc4f7dfb85415b907c0c7d9823a1fc2f4d"; + sha512.source = "33704ba3f239398a7d3bdf0d09a6703bfd168bfee90f613553927cae354caad1e430dcae24d681cfd67a9a60bb55a6edce151fe43e4d2c7146f7008cb48842d6"; hasRunfiles = true; - version = "1.2i"; + version = "1.2k"; }; "gothic" = { revision = 49869; @@ -16549,13 +16733,13 @@ tl: { # no indentation version = "1.3.5"; }; "grant" = { - revision = 41905; + revision = 56852; stripPrefix = 0; - sha512.run = "849bb84949f2fc2f766556988eba540ed1a63ffe1d3a16279295cfcc772ab027dc1e9e5d55a9bf834c24e97a0bcdb04bdbfa653c71f99cf55ec3e18a83015a40"; - sha512.doc = "bfadcd59264fe3d3a6914267cc9d26c5bd6f7aa2061160a6547b04f448daed041d2c15633a61a246ea7808b778ff32679249f4c68e15b84e8502a454a4cec1dc"; - sha512.source = "183057279f539234df3f3354e0aa569679ec5a265a515dbac71aaf9cdb430d17804c001772a6ae69d7918f248d3d641c1f04740c5e9bc578dd65607cd3e4313a"; + sha512.run = "212fec263131499530ecb81d7dd23ad5d162928d4bf8a888b29c190f15d1d15df71f50ba5c243cc1cfffd324cde3362e98d2932e7562f69cdb77eb09025ac7cd"; + sha512.doc = "5170e7f01087c8198220977c1c5bef2bcd2d1a2b824122a9727fb1504576433d682caaa6c9a93454aab756dcf654875fe129c0fbe32452934b1a8b08fcac079e"; + sha512.source = "7894584e5cd67051423ec0febc19e67ddb83e6e183748f9bbe7f037073f8f3d271a6903b535cf699960ea8e8bb5a7fd47a8108cd7ca32e12d309133b9497248d"; hasRunfiles = true; - version = "0.0.3"; + version = "0.0.5"; }; "graph35" = { revision = 47522; @@ -16600,20 +16784,20 @@ tl: { # no indentation hasRunfiles = true; }; "graphics-pln" = { - revision = 54080; + revision = 56823; stripPrefix = 0; - sha512.run = "1afe8fe48cc2ad5af553629554fb83ba07c54d5f45d54ae1cb3f3f2a46235b5587ba93af191666a11f4b9d82b5eac3fbdd70b45918c754c5127636cb3005b5c7"; - sha512.doc = "3c001be0c35a778579a6439c733c8d26c3d89bb4900ee7757c35071a3258bdf1f4d0f6a77a6244b6b7780ad44b1cc3a30beb81fbfe2d5808ab933c56d6157a0d"; + sha512.run = "cbb87e4d040c6844cb2e677d352f9fdf9dca7848a894225944f52abf4b1ab9c03d6ea2881074b30bb618eee647ebfb70d8baeb2a82c3446bef40a47487e6b9c0"; + sha512.doc = "8051321f777155c8bb81d8e514a15e01d282c8ba73ceee6c60fa76201c1c91ba47299bc2ac3b21cd210a457daa1c549f73d299f94e4a972d2b7467ae9f7b9a87"; hasRunfiles = true; }; "graphicx-psmin" = { - revision = 15878; + revision = 56931; stripPrefix = 0; - sha512.run = "852b917dd2f4e4366516db9e7e22a6f34fecd1b69dddf687bd79b1dd995b1bb94c8372b85214e4d4c668a4a8d7d84a8c6e246a09e9d36937cec380c65a14c12f"; - sha512.doc = "7b2872618992fa6363b8a5a4e1d72f51779372475e7b7bf8ec3c5b9b571e77c1d80be42f2958d7c89ee4c09ce87f7c3fb76533010b0266d5108cdb89a81c49f6"; - sha512.source = "7916831178f04abfa1e9a87b993880cdaf678f567fd9bfe37a05529296c7b19ae9d1227711b7ecb829542aa49bbbe94db523ab1492e649304091a70e942ce9a6"; + sha512.run = "d0cb1283998d0ba654ec75e0696bb2b6102968a504e3dee457826cdf82d7cc5793dc8407d0145f314a780b3e015a7be49e70ed21c21e68a3735bede1aacde6fa"; + sha512.doc = "149f130b4e47f60ed3484267486033fa92aa7529169061a2dd9582daef579b6aeaaef4001261ff7bc301c17ef2817bf7bfeef909d22be44079a2c3c145c92040"; + sha512.source = "20cdc55b6645f661f5ae9ebdccbec0506c4e2a4a699dfc88aac9bb6d0ea1b0c308f7ef08abb4525faf498edc77eed5051d9130cc12769dbad7c2a31a814e46ba"; hasRunfiles = true; - version = "1.1"; + version = "1.2"; }; "graphicxbox" = { revision = 32630; @@ -16625,12 +16809,21 @@ tl: { # no indentation version = "1.0"; }; "graphicxpsd" = { - revision = 46477; + revision = 57341; stripPrefix = 0; - sha512.run = "b9a6cd054b8b2bf80372d1e4b7d8a29e1d0c6d0bf0b3d67d961e37ddb433a73678fbf99cc6f2b00d94e6111871b0b267b8541762b52100ee7ead3ebaa6257543"; - sha512.doc = "61d86c6eacc90a74a349eb52bbc7ababf6aa7dbd881a22ab39e06c0abdc6b8498cca525c431b2057245b294096a01a22d40c9dadbea91565b660f59c7b08120e"; + sha512.run = "c1327b1adc6657f423bf8eb0d29224773055f434cf749da8a8b2d1713c2a90a6fdeed2bded223c7cc941cb2b7403cb68927d72b0eb085e906750ce64ffcad3b8"; + sha512.doc = "082a8e580113ef796be4cc750d98f6dd0bf783298fef80a06f5387f352183d513e0d8b90dfb684bcaa575ff7b9307fe11e55f84aa66d7f29b411e06af76e70e7"; hasRunfiles = true; - version = "1.1"; + version = "1.2"; +}; +"graphpaper" = { + revision = 56750; + stripPrefix = 0; + sha512.run = "a165d2b37800c60f0e1c90eb1f3a52395ea3cea1442a7e0b0e2a9095551c173ba0b1dafd6d7cc01101c9f27366e8af17ad9b361f91961721edb925b74412c169"; + sha512.doc = "d49846c40ec41966d297dba2ce1522c49eafe559b093a271dddb0fff9220be0e9c8244a54aede96384a796e3eb61042dc0d0ccc5d820536ab5fa0fd6bb184ded"; + sha512.source = "99dc9fab9ab9fbd3902bdd2abf8d3e4f3bde82d4b68889f1b27ef273790433a3d4a5fded0e66eafaedf33c2c6dfd236102e7f3658ae8ae7e7573e445ae088dde"; + hasRunfiles = true; + version = "1.0"; }; "graphviz" = { revision = 31517; @@ -16650,13 +16843,13 @@ tl: { # no indentation hasRunfiles = true; }; "greek-fontenc" = { - revision = 56449; + revision = 56851; stripPrefix = 0; - sha512.run = "6d9c9fe46975b52f48717fa4f8ce7547cbcc04654bdc6232b084fde4b2203bb62e07291d5061277ba4cb545b135991734b7b60d384547fa6fdd7a8c919ea0287"; - sha512.doc = "15ba839abb76454e4287c0dccfebe6e0971954c990e410748927a1ae683386e4d31f8e99edc66ee7e93fa29548369158410823187ed0dad3923eefd8cef2c0e0"; - sha512.source = "ac2412080276a750b5cda3521995838d64cae7f72570118f65014e5bc2693b0e894dd255bb4545260d0459bf2a8adc6dcb146fd895d73e3e38f94641dab2ddc9"; + sha512.run = "4b7189bd9080c0c34bb61c5d47dcd09985d61875af06c4263c408be70e85657bbd36b94a9f183b409739ff72ba59b1add5fdd8e42a1e498bb3508e3d997d2b53"; + sha512.doc = "5d6495f824069c6866f3821839b671ef872dda96435ad0dd95a2b719dadeda5325d1d96bc8c4b68876b0812fec878e0d0770ff82c73fa4ec020bf9f0e059150d"; + sha512.source = "16049d6c57eca659c9aed41e4ac18417d667d5fb39e1bfa5976b5f8980c33425bf2301288b9284b39ae00e39d9c2878d09b25cfc793e51c09df92e703f6a968f"; hasRunfiles = true; - version = "1.0"; + version = "2.0"; }; "greek-inputenc" = { revision = 51612; @@ -16913,10 +17106,10 @@ tl: { # no indentation version = "0.1"; }; "hagenberg-thesis" = { - revision = 51150; + revision = 56798; stripPrefix = 0; - sha512.run = "a8515fd281f726029f3bcc170f60c8a98447d8e16cb64ad787fdd5576ab5fb58a077666f191a02f46608e1aaf84bfcc8f1064a28e00c77f62505134a5508be28"; - sha512.doc = "e7f1ff1c796b7ec2dcd7758a46149a20ce3d33fa6bfc3dc93a0d7dc4832e4f4692e1e74037c1f9e990a0245fd6cc5791ff998439ea6604519cf40bf463be7476"; + sha512.run = "abfb384663a77bd084a7a4f3026f59015b1cb70a851e25153c921ede1089bf43b6abf3a8a50469a55cfa6598d54983604d395eab8c5115ecefe7250ba872462a"; + sha512.doc = "78b8f4fff31a9f0a63b6d31e5d07bf8bf76aa6ad5b37e8ab7a28522bb9f9963d0b8e99925681286696d8e6bb688af8ea02788faaa7bff0ab50d2f166b6c9a4af"; hasRunfiles = true; }; "halloweenmath" = { @@ -16990,19 +17183,19 @@ tl: { # no indentation version = "1.0"; }; "haranoaji" = { - revision = 56332; - sha512.run = "d13fccbff9d21d7d824b62f1a533d71108f9431e34dc8bce659ffd77f08eb259d8b35955b49c3a7dbcb0244a144d9ce9692ccccb7304eb8f69e83d26d0ff3b2b"; - sha512.doc = "7b492338b6d3019fb1f3053df064c905da971ab349aabffaa6fab83688caf697551f5bfa72ed36a30458efbd55e30a452886cc077c02e69eea7e48768520f502"; + revision = 57294; + sha512.run = "0d27d0972980c6c5298e12161a6846a2d4e12b52013022ecdeef304e8365a6ee7c73b5c9ba970390835f4cc16ec765933a31304bdbad055390bc9dee748764bc"; + sha512.doc = "22dd5648f9195ef18bd0692dc63baa6c6d570bf1646bce94a6026dcba044dd99391bf32a33ed97597dabb08429bb2fbeef20397fa2cd576f44261ae14a657160"; hasRunfiles = true; - version = "20200912"; + version = "20210102"; }; "haranoaji-extra" = { - revision = 56331; + revision = 57295; stripPrefix = 0; - sha512.run = "df0709a9ec12df5c2afa7db5ef414fb5fcb7ecd434364c4b2315bddb4739b5d0f09b54ce6d534a3230f35a9e60c3a8f6b1ac25d2a15c42d091f7db7b5ab6d702"; - sha512.doc = "c3d8c38ba36c04d5fc4c200a4e30247f39cff044d580fa47952c1f9a1d42cf6b1493db80749b2a8e3698f3f6b4469e2abdcacdd4090696d3203f5d912900b6cb"; + sha512.run = "61b6ebb1501f78da1020369edfd0c5e8162181d19e9a761654dcbda513c17491f0a0bbf455d009c6938f3e9977333b0a571c5246f746f39c09e687434fa33ecf"; + sha512.doc = "612b8a79a489d8c02c9fde6148781b6fc0941a9e4ce6c62f58282319a54f94de94b5202ace0baba4bad9b34450de3ee255ae319b991a06147ad951cdacd0afd5"; hasRunfiles = true; - version = "20200912"; + version = "20210102"; }; "hardwrap" = { revision = 21396; @@ -17134,13 +17327,13 @@ tl: { # no indentation version = "1.0"; }; "hep-paper" = { - revision = 56503; + revision = 57045; stripPrefix = 0; - sha512.run = "b534d46acfa9c4af79284db33e1ddf5cd8065ffc7245944fe9c156cf47d53933773b346f9a37c74ee2a8f996a2b0e561cdc6e16fb10bc73b97a9a3d68f2b6fc8"; - sha512.doc = "0badf0779c4cba733b71f995b51c105a906ea53fee4fbddbf3895b0b7682b5adf205b99aa60278337ba9d15c2deefbf9c4fbebe060d88273491cbce6c4b0a382"; - sha512.source = "600f5f60c241cb6ca608b1c8f0dc82054eebb1366e68da552e1138e470eaf427dd5eb6201833fb7d63e5c34b1d6bfb6d078881537608ef30a7902e4ca76cce89"; + sha512.run = "e7422cf1015b554b20d6fa6cfca317fbd2e057ef31f6d57448ba11126c3b6b863fea428c642f15b8cbbf46929ce943f362cb99cb95cbe7d1bfe821c4315661f8"; + sha512.doc = "29f71a395be21b72cfd2c0f167e11475215dbd7005529a89032a316d5802b8e2feffc7670923ea57b6f2bdab4d298b7798f122263ab496f4a4da323f8a44c483"; + sha512.source = "7610edb2223471f6ad729dca66145bb0686e56fdcebfab9260288c3fbaedad0be638f300f789158d824a0a04828297853c5b0774c4c2a96cbb0d48f2d93fd61a"; hasRunfiles = true; - version = "1.5"; + version = "1.6"; }; "hepnames" = { revision = 35722; @@ -17392,22 +17585,22 @@ tl: { # no indentation version = "0.23"; }; "hu-berlin-bundle" = { - revision = 54938; + revision = 56808; stripPrefix = 0; - sha512.run = "ebf45ed546b7fbe9c35d36b4b025baa6e554074261b73e0bfb754ed3de72b8f39653960717510e13fcef040326bd11ac344eaad894acd625642ab2ee2ade9e66"; - sha512.doc = "ce8fc4199cb94937e94e66688f0111150bb20e81f653ead053f0bdcec33945c96ab2f6cf4465420f19bba98d4e05565167055dd1c689585c7a80743f26ee0268"; - sha512.source = "ca75f32cc9a4eadbd5bd32c4ffb3aa86f882638e67470d2da6ba6be98460df4b38606763cc72efdfa1cb43651efe5068ca4f2e06eaef5b93bd431c837acada94"; + sha512.run = "c2cecdd1d3d4d31be7cdf4816127bef40697d26a6cdafa9d571d8495d1f7b1de7288ecbfb314d8d8754e492c06598fcbb79a50dc1eb82410adda13446d7b4629"; + sha512.doc = "ec11fe418fda3d98940b5e57de1330b784fe4579b41d3394ef82cdd24bd2298e978a7819bf676efb6aa89b67118849194c4dd63beaa2b107a0d4a5336aa1ff2e"; + sha512.source = "4258c7cb1fa54fcdc1c7d19c1bdc958ec6dd47c11cdeefb0f9dfff336f2ddd2479f200989557278a8807fac62bb30150b70bda5f140bdb83f99e507ff890dd5f"; hasRunfiles = true; - version = "1.0.5"; + version = "1.0.8"; }; "hulipsum" = { - revision = 46803; + revision = 56848; stripPrefix = 0; - sha512.run = "c43867cb608e955254f2c597d3fd9938fe815c1683c9d61dcd1cfff29608b5c391d7374a740646dd915fdcf282d9adb8f83d3dcb6781fbe547b685de81f67143"; - sha512.doc = "43dcdd731116bd1eac309b1213b3c961dd189f861b8732d73127ba6b4c20d3ea3584f03340ff5973b4aab11744e61069edfe6736d389e1487587d0372591e343"; - sha512.source = "e1290087087ab8d63d2e2de72cbf641ec71ae362a64faca2e362cccfb05890abc9cd970a2eca1b1c10cdd95760dd82e8bc90fe0e8ef4d99df6cbabba24c80be0"; + sha512.run = "32e981937f3077fb1310205f17bd10c93ae20c98e098f766b0a90218d81c7708071aa4ca605bfc55da1614116cbd8299f9cf1853426dae04a99669839b2d5c83"; + sha512.doc = "862a91b902cc8bb0d71efe3933bd0a1b0f3aba1023586595d57cd45e15a0b961cc3c56a59315eee02337f89d35582497dd6894bf3ead060d2863823765211e1f"; + sha512.source = "6de61158c97297d4c76691f6aa2686d8ff88317de0dcc951a23e6aa93c63a4fecfdcabb74629e2e12ed7878a8a74987834f36faeae3c5fd661bacf99aa7f7962"; hasRunfiles = true; - version = "1.0"; + version = "1.1"; }; "hustthesis" = { revision = 42547; @@ -17427,12 +17620,12 @@ tl: { # no indentation version = "0.01"; }; "hvfloat" = { - revision = 52010; + revision = 56834; stripPrefix = 0; - sha512.run = "717fd6f3a1b9f7fab0cbbfa929b09e9186637d56092f50d1f0d1603b7b7d67c300587d12e9ec25e73a89b240ac3744bbf232802b2046d34b8606263a7fb6064b"; - sha512.doc = "98b61ee75c06007773a5119a5c9ded7d0ff9579e016dd024265329193661771ae246b9e0e44c55017dae9754219f2898abf221a4affb6231e0d7ef775fbfc30d"; + sha512.run = "3ecdc2af3e48cddaded469578c78dfe9e79fc025de0f23ad0a42747cde47a95fd45220c176a216b629ff79c2409da249cfaa05f5c0c9143dbf70bcf36188509a"; + sha512.doc = "28459902c85223099ddacacec3e1e23f25868be54d713e84a1e8819821de701bd164c63f0d9f868bb97d4f8ec7f551ce72734da9379df8084b2d8f7f5f53bd4e"; hasRunfiles = true; - version = "2.16"; + version = "2.17"; }; "hvindex" = { revision = 46051; @@ -17528,13 +17721,12 @@ tl: { # no indentation version = "7.00e"; }; "hyperxmp" = { - revision = 56599; - stripPrefix = 0; - sha512.run = "8c21d5da27f7276919e0c9e7e348dcf8732e2255363ecc78c47eaa18139cb0e71d21973f5d49ea975e766496d3a8adc5c6f4d339c1fb9476bf73e0573f4c5ef8"; - sha512.doc = "f9f99cd68383ccbe7f38848e584a7a84975359e699246bd823435ec6fb7dd8a99a5c7925a8eff1dd548217954be75ebd5ec31822ab454205925d0ee6f06326c8"; - sha512.source = "7c8b84ed41d6a4b001af3be6fa1a430d99d3989fd52e564e0cabb6603af97a675dbba991b8b15aae7e7441b1daa88f70dc58c019afc88ae8c49ef245a2bc1c2f"; + revision = 57004; + sha512.run = "559312539407e1ec8eca1e476d015baa88631b8750249c724a9a99a2bb0644680ddc7b4d9c1aa8cd74dd9ff366b2e1821a01bd6d6eef54a14a72d8877f86b7d7"; + sha512.doc = "e63bb28383038ca1ac45bf0af92a95e50383b1a9dc3714b3e077a37d92022c4304dd00ab313979c7b7763f2ec6ba8946f6ba71fb09fc0870d02a0ac89be25c53"; + sha512.source = "8c7aab81881bf79fba919bb752a5d9f5c9653e89755d1c4bff5c076dc24339dc1327de57fb35393c7d80ee0ad46b4c787c81d73cc15d8d3111a580059bc2e361"; hasRunfiles = true; - version = "5.6"; + version = "5.9"; }; "hyph-utf8" = { revision = 54568; @@ -18492,11 +18684,11 @@ tl: { # no indentation version = "2.2"; }; "install-latex-guide-zh-cn" = { - revision = 56485; + revision = 57044; stripPrefix = 0; - sha512.run = "41ea58cf9cf168e1b19b65a657b052f904dee2bbcbdfd7d197897bc8fc7eda34953e794ee46720392de9d4869d4ca2ee3f0c821d4e687b042fa32464ced4243e"; - sha512.doc = "b91e7225472c9807f485737370143b1be72c0ee819135ceb6ceda6f6aabe382ac96dc0cf82ffbc98fefabf78a0bad903894bfe92e5fb69b7ca1bc205f2ccd19a"; - version = "2020.10.1"; + sha512.run = "e78b1e40d1af14893a0a9219ad702a3acfa0f9e9b4202c8f1e86962605c5967ea161d82c47982aa05c3f7af6737fc97615af673b37064a5c538452af997e6c3e"; + sha512.doc = "18898a72273c09daeac132a1ec08bd9e324aa8a3044cdb759cf7d3476e56a5b47cfc261365ec39bbec9885d9848441af58bbf40917d8fdd016bd49a7db5950cd"; + version = "2020.12.1"; }; "installfont" = { revision = 31205; @@ -18514,6 +18706,13 @@ tl: { # no indentation hasRunfiles = true; version = "1.3"; }; +"inter" = { + revision = 57213; + stripPrefix = 0; + sha512.run = "44de293fff8e1cdcf36796db13bba42c7a95f3ea49b48597bb743bc08bacfa504ed5dfac1ebd7a4ff0ed02c88433679f164f2d2e406051b1d0f3e32218df4747"; + sha512.doc = "df5ce5a034ccbcf9a04f89f362a75191c6254f55cadb1abb10f51fccadaead4d9efc160df19e6eb7f81161716d27600a3be5db1a482cf23ff3416c19b3a172a3"; + hasRunfiles = true; +}; "interactiveworkbook" = { revision = 15878; stripPrefix = 0; @@ -18793,7 +18992,7 @@ tl: { # no indentation version = "2.4"; }; "jadetex" = { - revision = 56548; + revision = 57186; deps."amsfonts" = tl."amsfonts"; deps."atbegshi" = tl."atbegshi"; deps."atveryend" = tl."atveryend"; @@ -18807,6 +19006,7 @@ tl: { # no indentation deps."dehyph" = tl."dehyph"; deps."ec" = tl."ec"; deps."etexcmds" = tl."etexcmds"; + deps."everyshi" = tl."everyshi"; deps."fancyhdr" = tl."fancyhdr"; deps."firstaid" = tl."firstaid"; deps."graphics" = tl."graphics"; @@ -18831,7 +19031,6 @@ tl: { # no indentation deps."letltxmacro" = tl."letltxmacro"; deps."ltxcmds" = tl."ltxcmds"; deps."marvosym" = tl."marvosym"; - deps."ms" = tl."ms"; deps."passivetex" = tl."passivetex"; deps."pdfescape" = tl."pdfescape"; deps."pdftex" = tl."pdftex"; @@ -18850,9 +19049,9 @@ tl: { # no indentation deps."url" = tl."url"; deps."wasysym" = tl."wasysym"; deps."zapfding" = tl."zapfding"; - sha512.run = "888240841018c133c416f7dc93e29250cb9d310a6e0a0a1b17505e3ed43061424e4654faff7e973194df9ff6d2fb8b9bf2b80eb044241477af13db0508b60ff8"; - sha512.doc = "ceafb41e34d2e1ea2bcc6564fd2f2d0df8fb25c8289f9b116042caa8b208c55e2fd40952fab39e4dfc945a5047ac5652fcbe4f674311d7cb39872c1d9dc96d55"; - sha512.source = "04cef58d297fcbc27f6328747ae2992038d69733386084e868da9dec3e3bcb3d312a6f4eaa1ecd4b9233bc70d53cb62248df4b54a3d1949051aa70d3fe9fe45e"; + sha512.run = "985e1ed14e5db0a23e9be510e5a52456fdf07ff8c8746add0d1123fa8b8684b3a0c5d9e99e06aa193c667ffa2dd648419d4359a75685d6514e81b9ef0d92ff22"; + sha512.doc = "bf83fb4dc700f10050d34905197a630f8de75a6a27146188efc254b831ad0d68cc873b610f7457a3dc1140a10793aa05c567749efc38225089014df99fc2c895"; + sha512.source = "63bf7f94983a971833e1e1b7d33afdf684d83117e4ce846334952176641b45acfe0c18b2fe983c2f24d98e68e91469560c2c10582d53015d069802a38066280f"; hasRunfiles = true; version = "3.13"; }; @@ -18865,23 +19064,23 @@ tl: { # no indentation version = "1.12"; }; "japanese-otf" = { - revision = 50769; + revision = 56938; stripPrefix = 0; - sha512.run = "e62e32e37fd460dd16a5bf62423564a83c6fc16a9b485dafee5f00fd4c3342e3b94c78731e25a9fca3aebf9cdf91a4bd1ae6edb8213699adc4c8e7d139e14ecf"; - sha512.doc = "90d9247aecc96871f1def7db153266d9c42292c5f0fdd7b835392cdf61d2b15c908e2895868121dcc5dfd508c75c1b7424104412a2b75e430a8fd2f0107cb085"; - sha512.source = "e3cbd6b664fdaf62ef764bf10c3f42086d541805d8ddcae3557f19bb607678fadbfa2e6d7dd97e9fa914a7153765c63eb0da6e8a89506a8e3b453923e785e869"; + sha512.run = "2b239e55b0bb4d43afe140f1034ce8c6c56f2ff46e552c0075f580a8ab727c1d22b7f889b6a9be1d1961b28404c7aa5229ff3b7f5933ee0f6516f70624e9df71"; + sha512.doc = "a5bfca2b99af9923ba718c08a76e2f346eb31276724e807e5c1fb377785d331becca1ce29592a26641ee7855a8b11993032cf902084b82e8047b7cbc648450ed"; + sha512.source = "6c5a32c070e8a8b439b0c3796cf49dfa50f339a92e799de5eadb32e673d87f3cddd2613b871669c2d930d643c650a0a5b74019ec66f8726ebcb8db6b388b05af"; hasRunfiles = true; version = "1.7b8"; }; "japanese-otf-uptex" = { - revision = 54080; + revision = 56932; stripPrefix = 0; deps."japanese-otf" = tl."japanese-otf"; - sha512.run = "6588523cceb59812e63a48538684a47ca5e11208e6439dc9b0546a98931884c747c35c83167ddaf27c6db7e82b7f310b7a938705554f371dc85104af315ad082"; - sha512.doc = "4f5759c53f127aefab7bec2e9908658548cf19000372f059d1a7c16c5f48f2586357e26711e94dcc7b0454d7abd1eb0370bc6d9df8fe05e6245ddf6280ccf5d5"; - sha512.source = "3fcf2a425145af523347036de783b6a536f883ed16909689a7ee5eb95977791feb36e0efc1d61e5ce21b7895847e330160034564ad6f14caefb1ac1231a004a1"; + sha512.run = "cd95656f02cd97a06119134406b519928ced50c31647a4dd421850d7e83b3705cd2b715be2e23c45b77d1634c47fd5cf8733aea05c654a0d3fd7fd223a3742a7"; + sha512.doc = "c67265456120136645bcd45f099e62174efa2350acbc5a13e45e35e959421f94cc2f1492bba9605b087008c3fe565ae8a52f4842070ac98039d7b6d8a9bf2172"; + sha512.source = "efb029012b07e8bffa1311424138f923b4fec963bd2373a9aa083ab048007b05a2cabdf1fe53eadfc0d2431d0a48209f2e532e9a36d914868cb0dd932ce55098"; hasRunfiles = true; - version = "0.25"; + version = "0.26"; }; "jbact" = { revision = 52717; @@ -18928,11 +19127,11 @@ tl: { # no indentation hasRunfiles = true; }; "jlreq" = { - revision = 56450; + revision = 57255; stripPrefix = 0; - sha512.run = "8cdfbf489cccba9895ea88619a482c0cc79d12f713599814ffd1c6758ee69196773dc2772748a5f83eff6a7e54d3b0f599798476b55edbb009049479461a5df5"; - sha512.doc = "96bacbf8fdd7871ecd7ac06ec61129f0f6fb6406af1e2823a515f71bbaf6424730bb220cf90ccf255dccbc9069e8e22377b5cf1460594f811939781630e39333"; - sha512.source = "f2daa8c58838a543b2038f5a75efe768f55a929e6d0534b266ff567af7fec34080a7dde732e62b6341d83cc9cc81460b1ceb161a1e26293db43ae7a1ff62fe90"; + sha512.run = "3bf697f70e74e89f0ac386b873d1858b5873c7889e07c6d77f72fc5a8249d60f0253b8531d7071a0153ac1ef70a3420d0f06664535f5beb5b7c734286cc142f0"; + sha512.doc = "eaad01ae6738d1773d0f085f011f33878b1dc18950a559b2378310ed9184e68b07243aa174ff90c5fb0fd02a570ae8c063333d35b84d007a029783df0218a2a4"; + sha512.source = "6b29f1ebb6903e661924e6d83a29bf06cac256fc47f21b5098b1c0ab8954b353857729d373371d443517a47a92a7b5aa8d1808f78646d9f27b032a573b9105c0"; hasRunfiles = true; }; "jlreq-deluxe" = { @@ -18974,18 +19173,18 @@ tl: { # no indentation version = "1.00"; }; "jnuexam" = { - revision = 52696; + revision = 56867; stripPrefix = 0; - sha512.run = "9fc6ed0fc12a0eec779a511de2582cb6278b4576569cfad310a26bae0ae024336b335b2ff9760f0055463302c51933ad291a25f542a7974c56e17c3013c480c3"; - sha512.doc = "b9650a69d2f8b7c78e165d35c3b8cfebb8e76886f5b20a0592ab6b50ec63a659c5b76c6cbe02b8c5aaad5a7733623fd8c73bed624dbe9651bbb2263339f9019d"; + sha512.run = "36aa8858e22affb522332de4ef06a2760c5f4ecf24858fcad34655e0062cb319dc27a34ae1648fc89ebbdb2d3d79f8630d4d3663956022ec345a31cad58a5d1a"; + sha512.doc = "e80d4db8fd0f094589ab88ef2afb01f17be611ef07b0b6fe827e8940227c5c47fce7841881dad4ce2805c0098f41eb27da5491cd50825cc70b5aa2c5bf4b1926"; hasRunfiles = true; - version = "0.7"; + version = "1.0"; }; "josefin" = { - revision = 56311; + revision = 57152; stripPrefix = 0; - sha512.run = "1cb061f0e72671cee31091ae9814793648be204c6383faea0e57ceb8add5b33e47ed1a28e241567b4281e46e519d2a293320a7c784b9dc51e46855a5e1816f77"; - sha512.doc = "c75a3969286e3473f151e09a2ee04c79e0e145d872cafe897e71e55affb1a50bd5be8d51e5236fa3dfe134eafe417e387d866d4353e161fce24915cdcb72e767"; + sha512.run = "4f0a7e6095a676878617bf05b1680c5482b3f5f43d00abf2460bfe1d09568721afc2808081001898bebbc8e16e54f9faab0a0c9c41b0d6aa0bc43f7a829f1b16"; + sha512.doc = "2f59d8fbe271d00673bb78592d4f3a9ba70a5004236548dcf49182c4efc458b5973d1e01a3f97bc3e6556d8b70d4e20f52d7f268dd7ed2b875fc1656d6781506"; hasRunfiles = true; }; "jpsj" = { @@ -19004,20 +19203,20 @@ tl: { # no indentation hasRunfiles = true; }; "jsclasses" = { - revision = 56551; + revision = 56608; stripPrefix = 0; - sha512.run = "0b5c8198118e948edca1f997572a5e7669885bfe293a2f81864f203827dbc614a2cafa0b666c84f23921bd9d3710c69c42974698895829bf9bb6e9eda053ad7f"; - sha512.doc = "d263ac273320245d8b60025da2381002ef0d689527d314f4f1158370099add8286c13101c979fd713a77c34f362aa5748020f53838df2047994721082dd06ff2"; - sha512.source = "07742680715d6cd8a8db48b58c922c1904e85bdf378a888d637b33db3bafe94a602369ac0dc4d77f8e611390a6dfdad47ca6f2a74489bd9460bead02483acc2b"; + sha512.run = "18c5cd1e63e4fedbf1ec0faf069d40d34dd72ca18af0d634eab16b5c7ce92139cf4892492782f816c0c0deab4706ee1c5a83d052cd122f7d5df35f1d5d2ff4dc"; + sha512.doc = "f9d477ca10dfa4fe83e2f5a981f7584555e06968417c542cd09e223a0ef30074540890b3f5b28de12b9d77e9a45e3bae19590cfec31d3232528db1d854514083"; + sha512.source = "c4b4d11b3684122e47cb3b1ef59001e0163297768743b570f4c64c3eb0ab95f41a6660b44f6048acf4e9d1f4b949eae9883ee97cadec53798d363f3630cc4fca"; hasRunfiles = true; }; "jslectureplanner" = { - revision = 55117; + revision = 57095; stripPrefix = 0; - sha512.run = "c02db09361d220d33d809980036ca25ee6aae8f1f8260025b56b2f48aa4b70a22f48fed82f135b3e25638179959879c6253f64bd22f28e63b2907f7a94dd72d4"; - sha512.doc = "f69151003dae7e70219348d8ee405ba2c7da79adfdc49e609ccf3e55dde0b538e0ad60bafd84846ff3211a17d1a42d2fdb25bc852a34c2efe5f0ba890f5faf51"; + sha512.run = "022c878b95fbca48c7cd3464a12d5af8b29b26c2fe46f3c4dc2f27e6c3b3660f78f3baa7b9d289c3444fecd7186f6d6cb18d8c6c94b9ff27842f6c9018e9762e"; + sha512.doc = "1af4d1a75b6f5f056f0426f00c8c26493638e8efbdd5ff7b746f45cf4ca3c6648d97b3832885d97b71124cba7e57eb22fc2018619e5a33c66ece10ba20528a2f"; hasRunfiles = true; - version = "1.11"; + version = "1.12"; }; "jumplines" = { revision = 37553; @@ -19035,6 +19234,14 @@ tl: { # no indentation hasRunfiles = true; version = "1.0.2"; }; +"jupynotex" = { + revision = 56715; + stripPrefix = 0; + sha512.run = "3b5cca7c6b8b14eda35d52a6db5e7ac027c0b29ee08a7b8f58411886963d8dc69348752d6cc1f010d11b9216026b705fe4cc915d2c60cb3ee9f3950fcc6bb308"; + sha512.doc = "35b8d2dbcbecfb4e7b2bfb0ef39f2d076d6f4eec9189e89cee3bdfdbb6f57d5c1dcefbca3eeecf4842f7f94616030d2e73588074618b39e232f40104e371f3ea"; + hasRunfiles = true; + version = "0.1"; +}; "jura" = { revision = 15878; stripPrefix = 0; @@ -19410,12 +19617,12 @@ tl: { # no indentation version = "3.33"; }; "kpfonts-otf" = { - revision = 55605; + revision = 56965; stripPrefix = 0; - sha512.run = "f616a5e48127bd28b80ee68c92531720478f4163f1b499106099dcf886d38e417f5c6b355e7827e20ad08450e7872b81f1a098598d5e3fdde2a86f5f6d91ad5b"; - sha512.doc = "27b5013f325a9e4aac6c6798b6cc09c1b4f1c90e1b86a41cab3b3010df44a0e2b804c52d45595ca5ffa50b08186f4a5c02efe7a933f5848850c7cb78cd07809d"; + sha512.run = "5b276450ecfc349949dc093a8d4e3cbf5bcaaba4600ebaf8806c5e1501f6cf163b56f41bd6646f2aa98c2d3dd8177c1a5455ab672227c46251417cdedc6c6a15"; + sha512.doc = "57b5064033755149ff9877f669d617f6652d698f6f63a6fea62d6b1d1c31faeaaf19ccfb5489643cdb299a4c7ad1c3a40df34ae45dbec500253c2394a3170bbb"; hasRunfiles = true; - version = "0.31"; + version = "0.32"; }; "ksfh_nat" = { revision = 24825; @@ -19487,13 +19694,13 @@ tl: { # no indentation version = "0.3.5"; }; "kvoptions" = { - revision = 52985; + revision = 56609; stripPrefix = 0; - sha512.run = "af26d9fcf6f3afbd4e4dc105aa84e77bd737649864b3a8b4ba822e1dc62f4fc95e916df704249757d1ba4ec3b8281b510a6c5278b1f82b1a3af558b67790a781"; - sha512.doc = "6f567a5310250dff8d15de8d0fcda8c6eaf392fd9e221b5ea50c0de0bab44324ffcc42902a9d3b6f13cf6090f5e8ca513b5abb218b0f1827e953d76d377ff1ab"; - sha512.source = "ccb433710f2337e3663cf295b951e7d83e1fd46420a7dab127ff3f0c78f0f8e82ec064639f9c071f2a1e4ccb454776560bc25399e22fb6621c53c984c75f34bb"; + sha512.run = "47d2d386a418ffd07810589061d13e625b691fe65522ccf5efb514750314933aeafa75f1e2a56df9851b2cabf3bd54be9bd1200df59c671f0f7c92e90d9aa9b9"; + sha512.doc = "dc8fa31afcb9c86d5a94ffa4bfd7e02fd186b27d1f645a5317c718d8079e4b003426e9202c49f6cf3017cd49a59100d8c2a6a553d16012856e340da0e9ede0ef"; + sha512.source = "90a0c6d2b03855dfa7716eb9a18d3c412e51a5bc592650677298eff8040acff81e3c2cda492daa0790372034f33e93763f4ac02821587d095f77dc0810a52b25"; hasRunfiles = true; - version = "3.13"; + version = "3.14"; }; "kvsetkeys" = { revision = 53166; @@ -19563,30 +19770,30 @@ tl: { # no indentation hasRunfiles = true; }; "l3experimental" = { - revision = 56424; + revision = 56785; stripPrefix = 0; deps."l3kernel" = tl."l3kernel"; - sha512.run = "cba1e6ae68df39b177f73cd37a61336218d2b7c3a84b13e5ec73d9983371585d79d3161fd868d46965e5742a36f2750012bba26de1b5f06c91f628626451a0ec"; - sha512.doc = "7432bb979abd6d0c126ee082df7504a16f5fab8320c21b53bfb9824a12a65cac9521687bd78d7891b382400b7b0f0bc2d91e8c7cac2fd13d9bb71d00256e8cfa"; - sha512.source = "131351b476e0d49c2052486b836535bbcd21bb5ca2f7d2ab1caeb5e5f4461c813f4b5090b9160e8fccf176352f401cf95bad6eb5867c4a3937c772d7ae3e7964"; + sha512.run = "165b85e96ac4cbc9ac1a4f2e7ae20e65ba66d1aa1f50b0a9ce36041d2accdf454a165377de5f3f09aa478986f66e866af26cdb05aa2b8f6c94ec6383b3de165a"; + sha512.doc = "9646e1a90223a22b891e5735a5199df3f81af4d9865aa4a66655202caa4e430172fd9138c5f1345d0765f869749fde87545a38b78787db4ad47d3090b4add92a"; + sha512.source = "c72ea71c020c3b53d1be361598b19f7a0ae6076b16cdb83ae5e2efb435e3ff306613bf69334f9632859bf3ff6ebd1d78dabe17fde4419f2382fb1aefe255c5b8"; hasRunfiles = true; }; "l3kernel" = { - revision = 56556; + revision = 57088; stripPrefix = 0; deps."l3backend" = tl."l3backend"; - sha512.run = "dd26d0f611e65ca01b342c2d0df47691d77e2fc251a8c8ff4f6a209cf28be9f4b078aa68a4af826b144c0a01f11e6abadd5ad3449d1d95f1ea85fd3bafe734c9"; - sha512.doc = "e301a22584d4c44961dee61fcc89da60d609d1a61726c2ea5b0b73e88c44fcb6bd9bf0a8ee3c1f5cad15ade28c554c4d07c50ed17cef1cd1bbc2d542d1b674b6"; - sha512.source = "36a813c9faaf61c4d497eed0c8b2d8b3347ab44ba34b8493b077a9327ef31517ca6607219d8566036f57280500a540e149dbffe863d5d1c10576e5004455519a"; + sha512.run = "88c7dc3c6d89233cdf67e34de15aa579049cfe3697e1732dfc0cf7b8490bf1495b33bdc2887862be0bea5d3dc52524bd98f055d86947133c612772cbd40bcd13"; + sha512.doc = "a7a2096d9f6f7e314e092c81ac077c0278f15d7a16a7e04fe579f23d641c5e7441a51e40be7a02b05ca6faef440c533a68aa2df82a10b56f142c1f3b8e838e7a"; + sha512.source = "128ec7b9af20d7c4fbbfdce6817f09be325982143a72989ac46e549e6481b67ccb8eb169c00dfdd3096612ea87e2e6764d0d69be4134be81de164c48a0bda3b6"; hasRunfiles = true; }; "l3packages" = { - revision = 56556; + revision = 56785; stripPrefix = 0; deps."l3kernel" = tl."l3kernel"; - sha512.run = "b0a5e19018f8b4520bf5fc4b4cb05f5dc33745dc230a591fed2a0b537524d0b9c7a412a17fd2ad5d13b83c80ef89ee3bb21dcf2398d7c8ab1b19dddfba7c9186"; - sha512.doc = "73d09a2d6a5466f6767333a501d8da9bdd44f3e98af6ea03f31bdf9b9c1a9e78335ffa45e66ec6eed6546a4cf16b5fbf1197561eb7a3ebc16ab9384af2642ad0"; - sha512.source = "04b20e05aab7333b4928cdc81defebe0e5b7e9c20305f8151e113e899511581b4239356dee58b62d3505ae1f0cc1b003bdfbabbf597641e5d58d9a9a9c247d1b"; + sha512.run = "90facd1c1bda7c5eadb122ea6b713c19317f88cbfb18c36a43cb5b5ef98c23653c93c4d8d809480ec2f7d5e1e95d51d1970fc0a31a774939a0e5ba4b9bb82de4"; + sha512.doc = "852cc8d995d5e28a33cd94fc6c1a97a0bb3ffed33832edeafdbd9e40c42b7adbe609210d8f8ea90050795fcc095c682136c409a35c8dc1701ed1462e78054b60"; + sha512.source = "bc575633776b67d401c03883dd319fdc6a7a191cbd67c4c31c01db96bc7ef3b5a9b88d4efd6f7f645b284da5e6d2773eca74a8d6c3e58b569a10deb5729be7ed"; hasRunfiles = true; }; "labbook" = { @@ -19708,42 +19915,44 @@ tl: { # no indentation version = "1.2m"; }; "latex" = { - revision = 56514; + revision = 57354; stripPrefix = 0; deps."latex-fonts" = tl."latex-fonts"; deps."latexconfig" = tl."latexconfig"; deps."luatex" = tl."luatex"; deps."pdftex" = tl."pdftex"; - sha512.run = "ce14f150ebcdb0c2ca9ccf2163c2a86020dd185155f551ce2a81d5f4c877b979df920fe1c1792069d3a44e549b3fd6a138eddf0ceb306c641574c47f079f6fa8"; - sha512.doc = "7e4e261fecf8a4ef3321ba7ab11c7f4a76d4dd0d52dc419e0e85a0963b25ee41c08b9b94244d68308181192ac4b3f51194d0b08741ff1f67af15c3e888bf89e1"; - sha512.source = "66f48098883348f390ec6462484f7a0c46498d2157811e08f410be6d7277f298a822a8be9ed0811b7932071169ecd8a1fb3f1f8da81579252802f8a505562190"; + sha512.run = "3dc7384b2074e86b6c45f5096b7a85a03064b0d9be4e74b46adefbfcc1fe80d66700f38494961a806ccd4710219681e2968fa5c0c071b366b197114af7c798b0"; + sha512.doc = "13b7a880f89a5cb1ea79fe32f8fcc20679ed30fdba4c27837b29a7c861f52cfabd614622bcdaa7805bd0e8f1abbaeea0336d346d3a8b990e94bddb516e093ce3"; + sha512.source = "39703818293b0deb2b337ac23e8ca6bf55c982b71e5753dbebffbc3627729f6334e60fb44e68d372401dae03bcfa3a3afedc0751dadf3934fa8037365a390f51"; hasRunfiles = true; + version = "2020-10-01-PL4"; }; "latex-amsmath-dev" = { - revision = 56225; + revision = 56791; stripPrefix = 0; - sha512.run = "1a157c1c8e74587aa626339aff4f88f25df7bb1ef9c62f95208551e3bf27a6f2ad6bcce62fe050ca2e3e4e7b00d16bbf0d82ca898bfac1654f61a90c74ba5087"; - sha512.doc = "4c9b25d22d2419a76285ede17c03857b68d43de0a0eb3ea01dab3ca4040f3ebb41964c2e810f0196c4cbdb17d43110dc802e50fafb4b00d4c1c289d23a9d7533"; - sha512.source = "0b84aa145bddc2b6867a9cd5ddee651d4eb86ef0af05e7dbe6c7354ee086868b4af0e853d9d36efa86127c37edc0594cff0e3e24939a43fa8333eb20fc95ef64"; + sha512.run = "53089df5f54a43f8e6e4835df89824ebbc7ba53d54a96dcb3419be22fb8151337d5b03dec8db095a808135e83de9739f8dd314befb52d3f3340a7f82d8b0d0da"; + sha512.doc = "ec111f9ae7c306c4a028ece6edd89b205a47d05d82ad9872235ce189354cdb2415f64a401c150327dd6cbb1b84d0ca495236b733000213f7fc9865a9baceb8df"; + sha512.source = "13564f9aa92a5e6577caacd4c912ba7b8ac1da004092dd911bc311818689b9cccdff8c5b9e6ae9fb3cbac4cfb0eca0a008d83603a0e793739f02cf4cecd307cb"; hasRunfiles = true; - version = "2020-10-01_pre-release_2"; + version = "2021-05-01_pre-release_0"; }; "latex-base-dev" = { - revision = 56324; + revision = 56791; stripPrefix = 0; - sha512.run = "468cbf9d0a4ec8c3e1a255d2d7bb7867e66fdd7c27d795ced0921a18e58af7866328ea289c55eb501de5f31c49d43cf03621d4501fecf789e445bd4dc58ea5e8"; - sha512.doc = "4142a4eedbae9d595a6f029504d735a89ad1f8cb0a5c40c3379c404fa42d708326cd62de75b422b3c30296b174bad5fbd7d7ad0aeae84fb8c0285695990356d4"; - sha512.source = "f179957b475ac896608a945dc58bae0be0d1a6601f851f8f7a43228ea1b36299e6058ccc8de92db0b4eeeff0b49fb9993737ec4d417d24421382fa7402b1f7e7"; + sha512.run = "0ed7f903f119ae884a95fbff9b7811bd8c89cc88b65f2e3f8ec5f32019f8dff661e9e569eb8093c94568009a2c1fc2d6f5a20f693f644ea73a646ab5e7ba8412"; + sha512.doc = "4286f36538034d7b96aa02aee2269b56f99285dc51ae7e1159ce3f6db87eb39d304b9ea4b8a9e7bb5a1f774071ec41e6654e78741f39b633693100182053269d"; + sha512.source = "331a76aad929e2031a9b8cb1413ef61a23a71cef5b1b4094d7a242a8e1d3f0f5cfd1393e057d24bd2b26983c85fb01c50f228d33c49d4932c506b4491156b4cf"; hasRunfiles = true; - version = "2020-10-01_pre-release_9"; + version = "2021-05-01_pre-release_0"; }; "latex-bin" = { - revision = 56548; + revision = 57186; deps."atbegshi" = tl."atbegshi"; deps."atveryend" = tl."atveryend"; deps."babel" = tl."babel"; deps."cm" = tl."cm"; deps."dehyph" = tl."dehyph"; + deps."everyshi" = tl."everyshi"; deps."firstaid" = tl."firstaid"; deps."graphics" = tl."graphics"; deps."hyph-utf8" = tl."hyph-utf8"; @@ -19758,26 +19967,27 @@ tl: { # no indentation deps."luahbtex" = tl."luahbtex"; deps."luaotfload" = tl."luaotfload"; deps."luatex" = tl."luatex"; - deps."ms" = tl."ms"; deps."pdftex" = tl."pdftex"; deps."tex-ini-files" = tl."tex-ini-files"; deps."unicode-data" = tl."unicode-data"; - sha512.run = "079f4e09098b46c5cff78b807e614211ebfdb8accdfc0f52b14419ea170efe7e5ece2fcdb8455decc8f91a349577767d10efe48c3b89eb8b093fc79dcf0bbc78"; - sha512.doc = "0a27765213e1eaa8a26e35787703d6a14bb8549517d3221e0ee20cc7c25601a1cd297b6d8c08f67e111bf318d192c85c99f08472e3dfac208400de130bc55672"; + sha512.run = "69400750697649b24d8ea6a5887bd891ce30d0d46461b6cab3de02c434de0e43c06d89f70747d7c7718ac263e6cd63457cff443af24cc53e6c75266c81999777"; + sha512.doc = "16b2f1158d4f10541fee3fa5dbe768c08418918233929786929618a0d843e135f29c5d478e938c4ab3b2020cb85577a0b75d4923902d4d96e26dc756f152879f"; }; "latex-bin-dev" = { - revision = 56548; + revision = 57186; deps."atbegshi" = tl."atbegshi"; deps."atveryend" = tl."atveryend"; deps."babel" = tl."babel"; deps."cm" = tl."cm"; deps."dehyph" = tl."dehyph"; + deps."everyshi" = tl."everyshi"; deps."firstaid" = tl."firstaid"; deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; deps."l3backend" = tl."l3backend"; deps."l3kernel" = tl."l3kernel"; deps."l3packages" = tl."l3packages"; + deps."latex" = tl."latex"; deps."latex-base-dev" = tl."latex-base-dev"; deps."latex-fonts" = tl."latex-fonts"; deps."latex-graphics-dev" = tl."latex-graphics-dev"; @@ -19786,12 +19996,11 @@ tl: { # no indentation deps."luahbtex" = tl."luahbtex"; deps."luaotfload" = tl."luaotfload"; deps."luatex" = tl."luatex"; - deps."ms" = tl."ms"; deps."pdftex" = tl."pdftex"; deps."tex-ini-files" = tl."tex-ini-files"; deps."unicode-data" = tl."unicode-data"; - sha512.run = "7a529075098a1390adfda0787a8f9b07a896153abdbd5adbba5ec6b78bb8091a2f04de6ec1dee1f175d9e23042579982f17c02ea177f591549f8a654b8b5e588"; - sha512.doc = "97b68fd5829437018420e3bed46ad56622351ea048aa3127524500d6c24afe8fc566177cf40c1c55fcba6bc7f716ed04aa5b881f2f4c4853b8d67b9176dafb52"; + sha512.run = "0d89872b56e828ac55e08b52c05280ec6362d0c97ea80ea615c58337332fcaff4ae1f21c329cce59419eb273a5a7a8b19a15f202f87d69274b5754663542fd97"; + sha512.doc = "dc8a6d1d83e919b9382a38cd24c9e891afa3fea433ac0f045f3214bd797fec16b8b53adc95ab0a57d05e931b3a7206f589a8470c7d5062e133d4242cb8dddf86"; }; "latex-brochure" = { revision = 40612; @@ -19807,10 +20016,10 @@ tl: { # no indentation version = "2"; }; "latex-doc-ptr" = { - revision = 15878; + revision = 57311; stripPrefix = 0; - sha512.run = "dfdaaea00e167fa3e4183b6e6a223996d1364707a7cdfc0bb8cc76d02a0c5b3739d8171979dd80540edb571cef84167b24639b265349fc9646d5570e6c48dc61"; - sha512.doc = "e5ccf3968aa02ecdedc2a64f0c53b2eccfa3c4df66da5255068248de013753ec4be67937d9c41552f302979edabc53ce64d902a9f13e4174d67f39909adf9735"; + sha512.run = "22017cc47746d2e14436915a0d649b31050debff1827cca44a3ab7bf9b240f40450d445a8eaab811b8737f589839ab7f2078aced47b65b320237ddbcc443b99a"; + sha512.doc = "c7d7217a9136785cfd6ddb000e51d455e7482bfe395a9131329767bfffc71f918c2349b1426b615a6740263c958530c68c044ee3ae78300a004a8acf20bd8bdc"; }; "latex-fonts" = { revision = 28888; @@ -19833,23 +20042,23 @@ tl: { # no indentation sha512.doc = "ab9d885c811af3964e8cdd8576349059bd45d660e6b9a7e931697f7c7fa5282c725e044817de8f2648ded59519d1592945e0804ba7cbe0054ce2bd4d44606af5"; }; "latex-graphics-dev" = { - revision = 56238; + revision = 56791; stripPrefix = 0; deps."graphics-cfg" = tl."graphics-cfg"; - sha512.run = "cad01cba4a759c006242657b24ae0c9743e4d0ddfd84c15e040b540de948a35a2daf89205cb971a1d7ada9c55fae6e5ace0ddb5430ddcad004d4ff4f6756047e"; - sha512.doc = "a122a8d960776458eaed023041b53044ba88a681667409947664465253c1b87d808df525d596ad5b59ea8eac560374fdcf5a3e41f22ec4f67723405e9a29abe9"; - sha512.source = "8104e54078c023c145c3c78ed5cec1d184a274d1849ef84f386b7e61e331dff9c7ba5934824977007f25771bc63d40f9f97c8c9da749c8cff9b590d6793c0dcd"; + sha512.run = "0c92c61b530930e7e1d7d0343bc5b471b340d9bdab2b277afce01140d1bf7c6f7b0d7658309173d480ecffbe764ab0669335d3db9bd3c0d4be10aebd19243133"; + sha512.doc = "5ec398dcd9ba55e35f1575a09b10d6d589238089ded1653f00dfe15e60cdb1f46df88fe8d21807aeee598cedc66791609a525f01bfdef14c1d5225ee4295cd73"; + sha512.source = "db6214e4fec5acbd0c9f23d64f6e1a19e8ffebf2b2e5240498067a1cffb96b66abbc7d53d2ca02cf1b4962ffc34d79ac0ec6c53ba4a250ba5b518b54017f11f7"; hasRunfiles = true; - version = "2020-10-01_pre-release_4"; + version = "2021-05-01_pre-release_0"; }; "latex-make" = { - revision = 55486; + revision = 57349; stripPrefix = 0; - sha512.run = "71ce373d9bad144557b6cbf8f7865ff27065fd4624332ef53b6a4d6a7fceaaddc8cc02f1c014b1bd5d6ab099acd3bcff3b7e93cae4e5732f76ff8d3a28c397df"; - sha512.doc = "088eecec7bca420b76439c6bc5b9681eccf20fafba661db14727f9185e11cd7cb5abb1214ac87d2ed5174a4dde4dad679578a8045964d706dbbd2ebe260c87bd"; - sha512.source = "591c2354e2c0e833cd54ae7a88312ff4d2b3219dfa280c8e543d57e01ffcda85e89493e19e7d5762cebb1746feb7ea341a1548f478da818048c81e5794fd0e92"; + sha512.run = "1813e8f2c768d7bc33a44d8fa11609915bb392d08da86718ed969fbe3c4284d57619a39284e611ab454d207edd054b36322d5e621cd23e302e85c17c52c5060c"; + sha512.doc = "71111a4f203b1ac200515ff1668831265733c9b7fd6884c4612f1261e65ad6cb1336258e7ef47f51f0d0e12a98f3efe4884f38426c0905164b3a9b8ffd47895b"; + sha512.source = "9aef117c9db4a8e59715ea906c8293fb460ea4026d583d33bb34c3e14ad92ccd536d831cd2e3eb8729eac3b4654236e73419a2bacf84e1c10d640ab9274db2fa"; hasRunfiles = true; - version = "2.4.0"; + version = "2.4.2"; }; "latex-mr" = { revision = 55475; @@ -19887,13 +20096,13 @@ tl: { # no indentation sha512.source = "b99ef070ff70c055aaa13c12e04f1c26fbfda4b663ab98b03b053de76e4ffc80afcaabc7b53633e38a7ad67fa650ef9ede55fd1c924fcbff31c17cf5edfbd73a"; }; "latex-tools-dev" = { - revision = 56225; + revision = 56791; stripPrefix = 0; - sha512.run = "37235091ed24b683b1a396508c793eaa8390fedd65efe50467f5462c97a07dc6520c279bd35b121033ec0d6dc1abb8bf24b0da13c40d640800c010ebeb5a339f"; - sha512.doc = "adb0a407f6914c54c2a11f99e71e53c446439bcdae6bc373197a6dc381925d7b89fd7874998079eebedd69ecb74be25c0cf3443a524638f2b06999a23764b93d"; - sha512.source = "abe9f049767020d20af6850937779a17da1cf0a09ca46150f45161f8d91a4cad467bea4034bfa661e66c888bfc9ea9182f4a9e4732f0980dff3b322672122151"; + sha512.run = "4bbd234013b4105948cba255d8b49f603fc0efc43e563bd95bb9b50612c5e3e1d80cc702d85e53331cd81bff670959683e9be539833138829907ad3af05959c5"; + sha512.doc = "850218831c7ee628c0d6f9764e9b2dc954886c7552b2f7c8a0dc020caa9f629c988b800da7dc46117b950bcf9645ab1d676fdd3b7ef5fcb9b5956d994725e872"; + sha512.source = "16c6e4c33282d4ecf648d549826142c090fbf874bf9dcc75d93c2006b7a264259b997dc2b3d58227200fd57787831b64be32d99a02405fc011526209920818e9"; hasRunfiles = true; - version = "2020-10-01_pre-release_5"; + version = "2021-05-01_pre-release_0"; }; "latex-uni8" = { revision = 49729; @@ -19924,22 +20133,22 @@ tl: { # no indentation sha512.doc = "a972860f65d763c6fb45e9726e5dd7b8234509b90634f45b8b25e090da92d0ac577bf8b33ea7b0a0f91e4e5639bf62c07086dc36708ae697c1e16e644acc83f0"; }; "latex2e-help-texinfo" = { - revision = 56291; + revision = 57213; stripPrefix = 0; - sha512.run = "24c1c19d33f814968553e165fcf715176b6c9d4abefe6ea01281daca347973e3b151f6c3cadf0e9d5e7c7f0fa237f0a79ee2c33c9c7ed424da280d7552700c9c"; - sha512.doc = "875a385bf04aade55883f6e4f55f4d26eed6f6693dfff7d4761b8686cdcafb2b0c9b4f6527e78516db081daa35d0bebe3a19c6c1708cc871a7d4e0dece209f55"; + sha512.run = "914b0959cd94f13c8c8a9e3bf4ce88988816298853d73e02ef3bef24a03e621a43d6e7e2a33a0253991c32c4a02b87bff7eb6d6a8cec7f4ca80142308c4d79bd"; + sha512.doc = "d659abed2563ca91820af487693cc91919ee3ae10c077c40a27fdbcc5ef1b7fc223007945bfe15ba6e5e8c2522b0f46c78810342cbebf9a6e9a96563d42c583e"; }; "latex2e-help-texinfo-fr" = { - revision = 56275; + revision = 57275; stripPrefix = 0; - sha512.run = "867b2ffa7d59a932d5e3194d6fed32f1942f7fb8e241f2c281e3be8618b4d7279794e8fa14a96ea712dee3cf66b9bf211b02cd209303e05725369e4876b9da0c"; - sha512.doc = "97647985c6c205e3f934369ce51a159507a9e24a1c0cbb61fa78bb0a5cb771c3fd0f44b68987ff1682b2819913df1adfc99940a05ca7c077ac12e1c8245974dd"; + sha512.run = "d531614aca1d80614fd6fd8f56ff8c5542c5c2f1c944083d151317820b9019395a7d3ec4daf91d7afc53d3852aee1fbfaa6ece12bc08783d508e996b330e5059"; + sha512.doc = "91f4166da251720271be473412764934212e19fbe21a4487245a0b19e08967c2693b81c89d98788ff7a768f1da462a5cd44aeec95ac459c912e0f128ebe65ecc"; }; "latex2e-help-texinfo-spanish" = { - revision = 56291; + revision = 57213; stripPrefix = 0; - sha512.run = "2dc0cbab315728797ec5e039768ab1eff74f251e7be397cc4b7d440002c329103ddc1b608b343e1f3ade367f89e36216ce94ca38794c8b4386de07b2dd3bc651"; - sha512.doc = "4038cd8f5d507f959234ce1ea704987d9ef1553e2708ea5ca74d8acc090fb39018e1f6eeabdfd6cfadab89f648d156e8c3d2d3993e1479024e9167f57e26e893"; + sha512.run = "d6181f2049056c06911b5eabe977d07d24099bc2bfbfee3ff4d2bee811af9b2a6165fd8ee464fe68172f5b8d47d85ac9ae973a2bbe8dcbe0529c9d68d9c3c692"; + sha512.doc = "8b8bc956d914b97d2679274e6f3e4ef62022eaf32e20dbac83e0c995e0c85ae33e8cf707f94a2ae9890747bedcc27ec46f627dd4a2923f10a4a7ec62d039194e"; }; "latex2man" = { revision = 49249; @@ -19985,13 +20194,13 @@ tl: { # no indentation version = "0.2"; }; "latexbug" = { - revision = 56434; + revision = 57299; stripPrefix = 0; - sha512.run = "2c1c06b809fb954a00b917b23c4e19c887ad54676692aa22a2e791ce273913e80a4768ae6752f89037c83acd83a5d0e98454778a03089eb1a3535c268be5440b"; - sha512.doc = "f2f4f368a24c754a6617449b140eae7b6c865a77043b216d0f33d21982bfd026dfce6306b4607a09d27693550491c830ba73c64fbcc0dfcfb7ee7365dee8b3c7"; - sha512.source = "84c3287dd88f67dd61da423859e2319fecdd268534785c77ff4fa25d384f079d5f98d4a3811c1aac5a82d063df97ff0b889f2722ca44a72c5dec538a65a91fe5"; + sha512.run = "f7045e463fc2496c48fca4d20d8a16c3e19951144fd9e4d5e4c1bfa3e1c43205c28d07bf40e56a4706fba444861fa5f95d941ff5fc65fe1b85f02407e5d91ce3"; + sha512.doc = "48f63935627b204baf755c380cec4e9e1e44ae1f041d7c84849a477e19f836958020c792d81034a1c466aa7ca2dc91ec7bb3dcd4745882efbd37e17a9a24af44"; + sha512.source = "82487020d630979c3f0237a1805427653c4213d06e42c78828dc8e38014746780296d8a528e53a40498c8570a74af5986c207d93dd915614de5cd2789a7b27bc"; hasRunfiles = true; - version = "1.0h"; + version = "1.0i"; }; "latexcheat" = { revision = 15878; @@ -20083,17 +20292,17 @@ tl: { # no indentation hasRunfiles = true; }; "latexindent" = { - revision = 55520; - sha512.run = "9dcd8267d22238e19d0eaa5f59cc3e0982793bb8c95285621a9837960cf8f17278429db212247050f8ab3b4155e32d10c30539bc022ea5e1af9f95850633f838"; - sha512.doc = "08c0145cb2ce2d5afbd1ce78173512b0aa13efc954eef445e3c93cae54e3159bc0e8c4f7c1cff5e0e67a75991b858202953f83dc7681364586ab25855449eed7"; + revision = 56869; + sha512.run = "478b25241fe302b4380193aec2493d8e1e9af701150e012e5b39a19033cd3033d0ecece5a6339fa6bc0b1a5b9b7b228f832ef482d58b14167f481a630f27d309"; + sha512.doc = "a45278547647407029c0633c8932be1c88e240cae0adce10d5a84d7a5531a71706f48d0e7d09a0c673467340fe2ebe80dbbcc4c8ecc2c8fe78419ae9e96d7818"; hasRunfiles = true; - version = "3.8.2"; + version = "3.8.3"; }; "latexmk" = { - revision = 56490; - sha512.run = "419df4657513224fa1586c29fb0c0468c0e31b3c87b85af349d44f236656144e5ccbc145956dde8e3d008c708cb66b7fe4e131d6721893add4fda38a4fd87bb7"; - sha512.doc = "892870b84be7dc2ce87083ad370cb5cefdc4cf27798f633e15b42c6af17b09b7ee803b9c960a311a86e9f7985acdea4768de73d3a992416a6c65ad57d3d1e58b"; - sha512.source = "8ba256d30cf89300645d8412a1117ce914ad59c0c8044fee48728b94fd4ea11c0cdd2353e4d3a320d7d0f4a5a5203deb24af0a7b160f99bafde1b709c09aeab8"; + revision = 57213; + sha512.run = "6f27053fe1356cf751b39801a2d1cb208b5309f45202ac11d87a4b8a573291aedabefbffb4e355935dba8755862a89b5d47eab820d939e6f5f851a7009933d7d"; + sha512.doc = "fce0c767ac6aad345b5cbadb31bda92e1483723299e877ba83983c1fb9346bf776ceaefac89be265d45d5348777f8e5d072306432fba9a81010d2cd15944e48c"; + sha512.source = "32d772c91be32f870d11891f4a34bd7bc903b95d27725edb6e9e3fa8a2b163ea4730c09ee4e0f93babad123f5f25c30f5efcbcfcb64837a7793e9c3d51da9ef4"; hasRunfiles = true; version = "4.70b"; }; @@ -20214,13 +20423,13 @@ tl: { # no indentation version = "0.6"; }; "leaflet" = { - revision = 43523; + revision = 56878; stripPrefix = 0; - sha512.run = "b819cae65ac9f38d7170f4aec4f94adfc547afdeadc345091fad170def744247ed46d653975e493aa64a28117e89a5414463f693a4b2f7e28b9bf998b8859915"; - sha512.doc = "d2355c9b93ae490f4087bca09ed3acc815abb714fa7508b64155d8b5994c967b7296b79f8b3d68cd59d082d7d3d7c618c0d4d0fa50df23724ed50718f0433f8d"; - sha512.source = "38cdcd9b452afc6ff98e946d162119615e44f372322664894a479130035a2a05520b7b1e7f616f17b04914c5caac6910ff18fd71c06a31dae9d4e044c6106627"; + sha512.run = "ec809f2aa4cbc16dd26aae988e2e3b5fcef9284cd31deb126d26989358e52596a50fd63df07095f0bf081c46d1e8af3b3f59572d372be873d9afe1f3db3cee95"; + sha512.doc = "ccfee44447524b112f47211729bcd2c78021dfd19394b82eb7024bd10a68d1a04789d01d16cc9f3b5eab7feda884eae6bbd47b6abe8023893587c49613b44d6a"; + sha512.source = "cb505761b78adbc0dd69fba2888ab86394c7c32fd590969f721cebac249ab8298c87fad284fbb8bd9d557e4f7741559536e504155ee3b4f771dd135204857337"; hasRunfiles = true; - version = "1.1b"; + version = "2.1a"; }; "lecturer" = { revision = 23916; @@ -20429,35 +20638,35 @@ tl: { # no indentation version = "0.02"; }; "libertinus-fonts" = { - revision = 56148; + revision = 56656; stripPrefix = 0; - sha512.run = "d48b4185c711150cc0b72fc9c446a2d1d60141d1a2cdf76b16a279a6c6e17ed52a6183c52fe2809d6df040a700f4273c341e28903b3493ea03caf7856c0cd000"; - sha512.doc = "fbd777f3f6bc9eb1e557b28779957607ed48bfe87bd61567535e31755dc0a50b7da05e115c8ff4a8f69fb2aae72cce9663cc7a3d8e075dbbf665c3dd7043e4d4"; + sha512.run = "2470e6c0ca297b9e8ca6658594e8ed4134320148c71d40a95eaa67969ddd94643bf5375e5a799d3e4a3aa6aa2304170c53e2faa63a0ec571943aa6aee86f68af"; + sha512.doc = "1d869f2e19e7305aed20d4ee530ea10465c12fde92eeaa0c284b1f21a0142e6cb352678c99f49ab1912da7babb34697c9cd51e9b0952fe876fac5d1499499430"; hasRunfiles = true; - version = "7.000"; + version = "7.020"; }; "libertinus-otf" = { - revision = 56017; + revision = 56649; stripPrefix = 0; - sha512.run = "d9f4ef880b9e781d8af175adbdbb36d9a2f3ae9df719260595db0dd329f7a23fa32394cd068df8b93a862316f327f7c5cf61db41e197bd35b0cbcc440d8cfa9c"; - sha512.doc = "d2ceaa1385d4800f95f16b7c9d5a1fce5c9c7dd9c9a51f8baa81d745562d434b42cf82165c265b465c4165dd40fe10f9771fc432dbd46ed9bc4d0470e4d84300"; + sha512.run = "651889d25c03fea583215317148ed157aa23ce66ee911b4b15eb2948f4a658c133108eff6429bdff4ee009241b22ce8ae27cd6820bcff41f21dd47410b110e7e"; + sha512.doc = "c667bafb28873707c0528c7b9a1f0c16cf1b37455d99b62e8dcc80ac09acfa09c16a1fece05eebdfd5e936b4d97d719be928916e878f25126c1d657835252623"; hasRunfiles = true; - version = "0.26"; + version = "0.27"; }; "libertinus-type1" = { - revision = 56160; + revision = 57159; stripPrefix = 0; - sha512.run = "93cac61cef7a6ea024e22e0b082b19404c402898cd900af3cf6fed31111ad1a800b16f59027c4bd7c6d96a8bbd1eaa9866891a090992e210b6f498865ff0ee59"; - sha512.doc = "dc0d3dcbf3180d7b01c65ad301784400a250e33e71f5796e9e22fff9f750dde2c00d129a9e9442cb1aff842fc8e672b8696f80c704bbd236dd1e3645cce266f7"; + sha512.run = "b348fc16903aa7a6ec39ec1266c361966f29c6a15172da955b8f863b834d1bef31c2a1fb430ee268d8ddc55b31b4f848eaf066b1a6e0c8ae5924bdc8918cb145"; + sha512.doc = "7a4bf5396bbd08aa911cf80897d9226bee8bb19b68e54424722cd091f7c39b3c57c3162eff25b8e50c69956f7b569059fb36d84e8ba11173068126f8f08918c0"; hasRunfiles = true; }; "libertinust1math" = { - revision = 55517; + revision = 56861; stripPrefix = 0; - sha512.run = "b6088ae126a70323332c08589903407d849353e979cef4cf5420b2a4556e874d66cd207a51e2ac44b126ff9fec0df19ca1631b174c7533f00ebc081d6a361038"; - sha512.doc = "2ecc63bbb6bb2adaf6720935b0bbe05d354538ff9bd99f21bf783ae3995e89fd88a39128f1b1f2c0b534f05eb9ca4790126f8cff5b51c625c02c777fb9ef7f3b"; + sha512.run = "a0720e690aecd6e8239aabacdb815ebd70512b067782d0efbef9da437b8cbed9edc70f5650eae18f51e3cd37b4dc966af472690fac9bcca0dd025faf591b26fc"; + sha512.doc = "d963d7e8541a8a7df1ab8da508cee578abffeebae9d1326ed0d11f1c28831b6f6656429988ea77378477d7a5680aab1fcadd793931908a93cb16548265c7a96d"; hasRunfiles = true; - version = "1.2.1"; + version = "1.2.2"; }; "libgreek" = { revision = 27789; @@ -21022,10 +21231,11 @@ tl: { # no indentation version = "3.0c"; }; "lshort-italian" = { - revision = 15878; + revision = 57038; stripPrefix = 0; - sha512.run = "b92c1566d1a7c9a079d3d770e9d5bc8e33e61da53100c3cb4617e37765076accd16b89210da12ff954e25a97c55d8a2168f81789ab31c05f66bcd6a19168f719"; - sha512.doc = "2f46613ff2ebaad079a8f2bea6756932aa9dd0840977dcbb8ee195072c1d8c590549e362dc979e9bd373a46ec44d21303aab72f351d799d2a7a3f5b6883e2c06"; + sha512.run = "05435f3a1af4c589267f1841e9af267fc12e2a3fe5b3ea2c586fd352f4a1184f1fc4be408780ff6db1b9212e1e4d1bb7263e3b35e7be9358e97e1712e9abcd6a"; + sha512.doc = "6caa8b7d2795779ef010c0ef9ac387c73b15715929557a6227e0a8112f4d99717ad82fdcdf8d1fe18ad5ea9b502ed559bd7b44f73381475034b481eeb6ab1c9a"; + version = "6.2"; }; "lshort-japanese" = { revision = 36207; @@ -21298,12 +21508,12 @@ tl: { # no indentation version = "0.2"; }; "lua-visual-debug" = { - revision = 49634; + revision = 57349; stripPrefix = 0; - sha512.run = "2b809e240570105b46f361ffcc031719f4afcdba45d14b4e51d4cbca10a7d189b385c00c9b277180bed4ceae45b8ad58e2145ac6f8de5d0568ff5f86b67c2cc5"; - sha512.doc = "814f650ce8505338b41a91e1e7e55872f1f35252ed5f1c3c74f73379b4c60c62e40d48a2cc5eab62b4a726db29fce70761ad7a2a0a17b7d5019859fcd72098f5"; + sha512.run = "f98f686ab3d03e48e377ebec624297f858be03097ed66b6448e82869942ce87f8d1699e4dffa9fc3294a3a8a79a2f547efe0e006eb132ba77eabb714e31d8b40"; + sha512.doc = "dc1deb6a514397c745001c5635d5205f03b44cefb43d6618f83a2314453928141ed9591b5ad8539db96998901981f20ffc80f89b4b7d5532abf736cb9ae0bdb3"; hasRunfiles = true; - version = "0.7"; + version = "0.8"; }; "luabibentry" = { revision = 55777; @@ -21444,13 +21654,13 @@ tl: { # no indentation version = "1.1"; }; "lualibs" = { - revision = 56259; + revision = 57277; stripPrefix = 0; - sha512.run = "bd43f1752b80c18abe12fe34134c8df328e45db3cfeb7a717280bddce543c36ecbedd1c005faad72987ed114bebace499b18287767ed1f9c2fae078d328422a5"; - sha512.doc = "19693085ebf60832de8137807c015087130705b8b90d25fe6b709f73f2cb836fee7e21fd29b3a89b9a2b31292e148b0b6f44b1f75324ab472c22269909890402"; - sha512.source = "21aa116488a057400212e0bd2f5994561fa2c2c1ca0adc1b80dfa4a107a3b019064f6242379214b96ddfdcc12c8cf9ab0feaba883817c52dc4044f4c287c283c"; + sha512.run = "ccdbde1b5b9abd3478e3912ff20b1639c3504f06433eb10cb174a3a413642629ad9eb0ecb3fc7dfe3ee1e7e2dac2e552dd86de98bd89e3a65bc6736bedf181af"; + sha512.doc = "4d3771a5cee5a1ef7a7a7d3d88cf44020563c8bf50328bd6cea42a8ddc731da294e6b300ed9318030b00f0ccecc0de8667382d41727dc02353e68fe635d0aa19"; + sha512.source = "f504562bce245c51567eb54963de87702a4651b73bce71144d2dbd91e6f9894c5d20fc43ae7a7d68c92995f6cc077bcf76875fea7309a09b288e6bdde2d55222"; hasRunfiles = true; - version = "2.72"; + version = "2.73"; }; "luamesh" = { revision = 55475; @@ -21461,24 +21671,24 @@ tl: { # no indentation version = "0.6"; }; "luamplib" = { - revision = 53904; + revision = 57266; stripPrefix = 0; - sha512.run = "fbb99aa90563e6cce2e5e9c417f739868130f8a2dd9875fba8a44e3f92e94643f2a9446cf686f222067c5aec66e5199eb5fc134458d2a72f2fa8bc949ed51a1d"; - sha512.doc = "e0568e3547253f6dc9d12f927c3d7025454520ec8611ede49497f80a6354518d07eb9d300208fa4a8173b068ce65904f45c071d0fea5bfb3bfe8de1d29e6a0ec"; - sha512.source = "3a00f23c25b683b9c8949a7cb4841fa92babc470d40f756898c68fe2ed82e090cd7cca2dfaa4fa7894d7a4ea96ce5db5936ed2b1d509af118cdf039ea7a8e7a3"; + sha512.run = "031db09bdfdc98fc7b0016c5fd3254545eff1aaeab5fb9b75dddc15550a2027f1b1c8878dbf2aad91e85b81bd83ebfcfd8ff3b0c0324d9f8d9bb25209b9bddac"; + sha512.doc = "a50f02149ecd45c7cac42c74b581743db01bf689bf67647886c37df5058cd1c0eb12f4ac4d7a85619cc6cab66090a523265ce4ad503c7e3fab3512934846c845"; + sha512.source = "77cfe57ac556db077cc9d90fecbcf23d46a115172bbc687f9d2b902ee720eb404105ef09aa0ec7ecf6ef5785a4e11a21663568a10539f6057418c62745e2e51c"; hasRunfiles = true; - version = "2.20.5"; + version = "2.20.6"; }; "luaotfload" = { - revision = 56269; + revision = 57274; deps."lm" = tl."lm"; deps."lua-alt-getopt" = tl."lua-alt-getopt"; deps."lualibs" = tl."lualibs"; - sha512.run = "e915714444f7ba08d0e89f7eb32664604b4612e17e8e0111f69b98d363463a2d6a4aebcdb63e3e6368f8c84b4ddbf44c60c20f45ebef1b500e921c821ca1cf79"; - sha512.doc = "4f228bf21cb6b6470006fbab8b40b5c17b80d45121f5b0a485b999b705806499fe2c466baa2de9a57bd033268103b67fc10fd9fbb4a0a8ee310b63ea76fcd00f"; - sha512.source = "6d3031b65304d40805895a810b450119af78e174ee8f883a4b3a139ac3e8b569b0108ff4fea3056236a9b43f91549512fc3bf07a0a03f4d122ab7f1fc941d710"; + sha512.run = "bcb7ed2e9f43869bc688a015eed9fe4dc2d461d3fd88b13127b7eabdf7735a7f2963033c9008ffa92ba2ba22f43b9318f3feeb1684fbfed8f98ffcf3ccb80070"; + sha512.doc = "749a19ca6a24da022749f49b4304aba729b374ff772fdee3de6f4563497c701f55c66036a49c70dd3aeb8418f36e07fc49ad63878f069edd3de4cd22c7414539"; + sha512.source = "65a16fa2461a415f063a4adaa939dcfce6824fe929eced5af3dadc66907cb6a009500132798db48fa59dd7ce8ffc24437a2736beea260518d223f0428cb9f199"; hasRunfiles = true; - version = "3.15"; + version = "3.16"; }; "luapackageloader" = { revision = 54779; @@ -21547,14 +21757,14 @@ tl: { # no indentation version = "1.3"; }; "luatexja" = { - revision = 56594; + revision = 57316; stripPrefix = 0; deps."luatexbase" = tl."luatexbase"; - sha512.run = "fe1dfb500f521ed9d4483a1d68d04809ccf522f22653a96bb986ae5cf12db4e83066c023e9eb428f773140230e3e465daa0ec43d330c4626e59cec03719c737c"; - sha512.doc = "ff4ac33a13a07ecb5f12fce341a4d722a62acb85b6ac33171bd3b573c44cd24af0e296a24f44a3a6f6c8a6a01071c65aad1865ca2b42c27b47c3c21bf4e6a2be"; - sha512.source = "7e78d256ca58d27fe0b31905c8345d99d637910ad32dc4beed8f0d113af3bb890a800103916a748cbb143ef06c7bda47da287bca48b473079e753fad8c04ef29"; + sha512.run = "10ec5e05c3a24b37d95cb26f53afddc0b2f988e6bf25b55275e1d524fdf9308b1309168b88a8b30087e8a79555fcd99d14c3dc3e268c7c1ccd6de080091deddf"; + sha512.doc = "b89d4e091e378a8b76c289ee9aa20cdee8a10a8d1eb6536dabcc88137b9f17c70c93e1cd4d9f1ab09e64ee4e4268d4f556d65a0ec5ba98af0b9842610a55a772"; + sha512.source = "2d77ee37710f8ffaafb39aae2eea53efe64d9b5acd8ee28ae41e8311c98ca321bf562f09ea7c1df9bea536abbba00ac6acfb9b082edb7d410eae28c14ed5aba1"; hasRunfiles = true; - version = "20201005.0"; + version = "20210103.0"; }; "luatexko" = { revision = 55969; @@ -21591,20 +21801,20 @@ tl: { # no indentation version = "0.1g"; }; "luaxml" = { - revision = 55891; + revision = 57183; stripPrefix = 0; - sha512.run = "5b380b50ae7d2e8a96e23def259f28696805c280629234e1c88172ee2550f78b3919f1895be60df7abfcf46ca7a33dbb413b4eab0418070a5072982a7c4324ca"; - sha512.doc = "adc6cc1b6b81219ab7d1dd4a45c8df4a6103f33e0ed5c93312e439fd0a953122f6e3df5ff3a2202970416c9db625078a6488954cbaec22189a757f4a45346f69"; + sha512.run = "53c98fe9b23a51e57244d73e5a4c572a14f130da4ee34c441d953d4ec0f3f18900df9f522d7710fc2b1ad25dda672c8d4c49e29e2a0b764c8df542fac024c40a"; + sha512.doc = "9985335dfb4b95482f685af3df692b8763815cf38439743dac4d993fe215a27fbbc08e1193f46a19535ef3a210540b57ba10f1a6fb0f66b4c6e5789354cfb4a0"; hasRunfiles = true; - version = "0.1m"; + version = "0.1n"; }; "lwarp" = { - revision = 56584; - sha512.run = "e5986b58e1a8629310a9b9bc451ad65c37f94c2f63ccddcec35f8857489b364cf90c1bbd410011ee24eb8f4004658e099b940d54fba6ac5673d55de67fbf40a8"; - sha512.doc = "ee5e8ef3feaaa70941219833997634d00ef01d704211ebd81e2e78a472800423728ad8a2b111aa49a489fae86ddbae17c445685fdd4c34f1f49782e5d791c4e2"; - sha512.source = "1235cb6c13122595e5c94e2a9b1bab193478aaf782a08cac9d97cead1fc02528686625cdbe7cf239038a978adbf3c569bd51d1db6f6c1866cc92133278593436"; + revision = 57217; + sha512.run = "fd540625da2dae954e27a5577edd73affdca126a30c86b3450629474023b26b412edd6919deb27353075c552b54feae1ae0d06eae1a0d000d423daf820f2f73b"; + sha512.doc = "347ea74a5fb83bd2c1fb5114a6711960a1dfadcade6a7228732132bd184c43063c425e4ff4d2fc8d19bdaee90f2cc95d3bd8322a3d6ae24ca926147001d061e3"; + sha512.source = "04e6447b0f09cfddb697e917008db4119749d0fd4fa5b7bb4b82e8c5b24a6350013a6b056d46bde7893918ef33f12847520aa508e9d4fbcb30c943352c78f5ee"; hasRunfiles = true; - version = "0.892"; + version = "0.894"; }; "lxfonts" = { revision = 32354; @@ -21855,13 +22065,13 @@ tl: { # no indentation hasRunfiles = true; }; "marathi" = { - revision = 56099; + revision = 56781; stripPrefix = 0; - sha512.run = "4ceb6ad6392742da2bf2b6a2ea5d909c5d12793586da4626b901132c7e2cf2174e159990318ef96ef82c687a7ee101a17293484503ed51353ce6afb1b1124d66"; - sha512.doc = "43d3a5d4b9abe7b35ed2dd0a3ce9352bbd492e7e52b4fa5dbbac53f111f20c310f5c6703d78980faf0c997a00a4cc9337a0e5a0ef3b69533a1aeecb4575d751f"; - sha512.source = "5a1e86466d03541305827c1dd31bc178099adc47ec23082b82a5708493a16c3a2c02291db22b8bcebf94c1db6d107dc4073ad6b8d8854201c6def2faefaea03c"; + sha512.run = "2e76c85b62b77d6c06583bb2c32004d56e667e59b9421aea092b1a8e70557ccdd81b9bde7b6642880abf7ee0e2c9c786d64be7d47f599876c542328541ffdd7a"; + sha512.doc = "578f82df4421539ac07f19bd78f521ef1b529c8cf07021519ac1faebad92dcfb61cecefad485adb7b5d2b204ef0131898030bf5c96b85a27d4b96ab272dcdebb"; + sha512.source = "bd4a298971ba46d991d84f6def53e7ba60669f2047109d3b8491e6aa956788431fd65e30479b4c2d8048059991f37f462f6728079ceeb9aaecfe64eb34a227e2"; hasRunfiles = true; - version = "1.4"; + version = "1.5"; }; "marcellus" = { revision = 56016; @@ -22181,12 +22391,12 @@ tl: { # no indentation version = "0.4"; }; "mcf2graph" = { - revision = 56217; + revision = 57310; stripPrefix = 0; - sha512.run = "4905ad4033c29884811f0ef2da7da18be259904f41fda3f6d3145c7dca3f490ee317faffcac30a643ee04465ce3180025e8687dc878c713fc1623e341e95934b"; - sha512.doc = "65759a94b05106edb4cf8453b47694c8baf4bfd68b7165bbbd57979881384e7a0862d4d14b8d3650e7a2dafaf46744059ee9a393f53f67565b75396a7b532209"; + sha512.run = "84b6d52b4d742a576a30f70bfaa0e000269a774edabaaadc200e09abb464ac6a109288f39bd8bf06ecd2347583b36e11d9b1834983a3280977163d731f5be05c"; + sha512.doc = "82df67f90a41a7ab131409e1ac57f9a98e8be3bf95fd1457632e39ad5a2191a0e00a1e9eca36c334d7669b87e02939d3612b6d4b0814ef7a9163f92624119e0c"; hasRunfiles = true; - version = "4.52"; + version = "4.55"; }; "mcite" = { revision = 18173; @@ -22206,13 +22416,13 @@ tl: { # no indentation version = "1.2"; }; "mcmthesis" = { - revision = 53513; + revision = 57333; stripPrefix = 0; - sha512.run = "5768d3d07c88c186c9b1937efb3b4fb21cdb1cf9b05cf653657f34839e812c0072b0b0a24f05fc24cb29fe084fe8d26a099481c8b753e99c08b481957635470f"; - sha512.doc = "5bcea5b94809ebf47416a9638112979d47a64aaf7ec02e1729bd8004f7159383f2c07db03164f44fc450548a80a7905569aaddd0fbf89775f3e1f894bffb20ee"; - sha512.source = "23016bb72ae6eb43af0903440fefcd59d0a3b3b7d23afe5a834f1497d4cfdb62b88ecf78232909a33efef3f15370efe116e193f9904b9aca9385c282773e1548"; + sha512.run = "128de0bf3c8f5ddd7ad5b456d92ee434573bee9e7df028799991068802c0997330ad6a3c8b0d295db7d9eac9e7540d5159cf5ef037ccb1e54cf95dc31c8cceec"; + sha512.doc = "d93bc6ec219a32ec688933f598042a04f0f7642dc875291ba2437085349e4e697107d2a4bed2c22b2abd3f00009d92fcc01930060ba38aef3444fdbbfed811d1"; + sha512.source = "dc9cb93c8975fa3e7d50e9067dc39c29875f6086a4dbfe657ca77e38feca4af419eac429ed97df41d442ee016f7f6205cbd1aaefd2a2e734af7ca2ea4c79344d"; hasRunfiles = true; - version = "6.3"; + version = "6.3.1"; }; "mdframed" = { revision = 31075; @@ -22372,13 +22582,13 @@ tl: { # no indentation version = "0.1"; }; "menukeys" = { - revision = 41823; + revision = 57172; stripPrefix = 0; - sha512.run = "690a07e343a3358179b271fb51b33f6b9dd952fead758405bdbdea9afc8d410d1bc72a15557d90d0699f26dcf7e51a6df3aec1ddb7ca752f5088de46dd5b7711"; - sha512.doc = "4b962d91d637a69f7443fb6ac4a94fe63901a7fe7a2d880eed320314ac6114c341add9e589547649331f123d9bd3af7830c19f83389581a936c67fd0dfc4424f"; - sha512.source = "35b57df92bf1eeb8ecec107c913ee8be0c84d27c2f98e7f2c7ee42b182905d3da1ac0e0969056d4d5db849c47d6953a8d2c6555259dc37fbcc432df4dd0e3808"; + sha512.run = "4e046853dcf7daa04a1375e19f35219b65177479807420d8bdb2e4449324b9fd38a17535e170b46a64de7a975fd0ca39c3150014ccfcc80f544f57475483727e"; + sha512.doc = "9ee80a77fabaabb1b29826e2d54dfcacdff7b758bcda83559d694a76cee579d4815e346c314d224001844c64cad40f04980d7dc09a45918a664f8cf76723b91d"; + sha512.source = "e4c6817611e5dd8f33e0e9f5771ae6f7c04b76d49002e6fcc466090cf5423ad4335d2d5d144817c6a03518f338256ca383e0b0df88947087c98f60f07f3dbe6e"; hasRunfiles = true; - version = "1.5"; + version = "1.6.1"; }; "mercatormap" = { revision = 56060; @@ -22461,10 +22671,10 @@ tl: { # no indentation version = "0.91"; }; "metapost" = { - revision = 56291; + revision = 57271; deps."kpathsea" = tl."kpathsea"; - sha512.run = "a1d4f231a7f6e2e0329e5cbac27dc7ad65992704018848288cf3b8943ff8dec154cf76f6ffde081d18283f73438e7c7c4fc41569651d0c9b6218b2f5490a14ee"; - sha512.doc = "f3a3c5f6afe186602b7648cad5dc0874df88a6b5c847c454da4088efe3a240dbf93aebd9780b9aec37ac9d5c53e6af30b5d69aa00ab96adfc6553573692f1b21"; + sha512.run = "50f2bc7ff49104e7b320b944e8f9793ec91be31e3abb4e6f702ee8d6a5d5f886709378421b2b1375660c1a80dd168e8e841afd2719b3c53f26d35d3c46ad9d63"; + sha512.doc = "d7ae54803d27f28f83134f14b4be66965484b96d89527ebcaa732f3d162a365177127e0b20606358e3e731236f1e4864bff134b9d3eb5ab7712000064f2353fc"; hasRunfiles = true; }; "metapost-colorbrewer" = { @@ -22559,11 +22769,11 @@ tl: { # no indentation version = "1.05"; }; "mf2pt1" = { - revision = 33802; - sha512.run = "87a90bdf45883da1291d8ef5a21e6f7fa51480f9933b92ad4a87384037de991ce36b47c238f822d466238f4bca6aa41a123c76a34f9f6efc2e43a2104f85182e"; - sha512.doc = "8e672808d60133e8a06bfd7350b1f9f5a4b1e706e565382b015f8eb9dbdb6da246b12815388f445fec87e63305381717d817c1eaae7762fd7b8043c89e1f2401"; + revision = 57018; + sha512.run = "87df5858f4a383f4915d469479460d55a6975a841d31b9993c9e3c9af422965d5eb869eac82c2dda968c17160e96c794ce85760c56d3d931d09fd13425d3c508"; + sha512.doc = "5320e1d724fde19f8c0c1b85902e57609e938243baadd00edb8294867a1df792ac2f72bcd1bf7350f4a9efab1563c9fea4361e423079b1f75ab9ecdbf2da4b90"; hasRunfiles = true; - version = "2.5a"; + version = "2.6"; }; "mfirstuc" = { revision = 45803; @@ -22688,13 +22898,13 @@ tl: { # no indentation version = "1.1"; }; "microtype" = { - revision = 52853; + revision = 57096; stripPrefix = 0; - sha512.run = "eba24c7a1e0f18e5d559d559745cecc9398630e4491b5c71f695e0e6893e74a87171e6cddaca8345e99ddb63558ad2a712822819c17fe1c20684e043adde4fdf"; - sha512.doc = "b0222af67733ff7e11717388d10e0b57fbeca805c85844360ce70bfc3b5d0c18157a12fb40156edddc263b8970c9b172d3fd4a1210450efc250aa05334d2c5b7"; - sha512.source = "638efade6088401e90aed764f47927b28d8840dd4e8fa1db2d1ca160a746e0633ae5da9f4e9947fde49ae2288fdf48dd37e7771b4e0011d10c2066a9cf4fb4ed"; + sha512.run = "5851f12f20b323578d718eda8692022823ff3ce24ae4eaaca265e45773dc5d0229adf4bb8ecb32d9f790123f883ba322d25956ad2c245d919f5de7dcc626df92"; + sha512.doc = "8180be5d0fb14dc25289bac9aa2589bcfff519b44e1812b23a1974d05288a28fba03b6007b5c8ed4cb8235cce38bc56e8c78e6db54bd6f0ff10e50741327b425"; + sha512.source = "3cc2aea22dedfdfb92fc1c7cc6710772f52bb012962646766b191f1235a151e617b433153ce9ffada1e07411859b12d17a0ebd904320f89193afeaa46a2e121a"; hasRunfiles = true; - version = "2.7d"; + version = "2.8"; }; "microtype-de" = { revision = 54080; @@ -22828,13 +23038,13 @@ tl: { # no indentation version = "1.8f"; }; "mismath" = { - revision = 53245; + revision = 56949; stripPrefix = 0; - sha512.run = "0bf6eea83401374473c001b3ec6a39c70d14551983a89fafdab854b12000d7806b76bbf10fd3fc393d5e7bee0880bb9fff9087da274b643a1123c128d708e22c"; - sha512.doc = "359a86cc49554c0efbb932b0cc8e7698582b01fdd7935d88d50a754d91bbc7bd8d69ab3cbb18a81ce89c3614fa5a22ff27bcdacecaee1dce3adf35be9dd119d3"; - sha512.source = "bdf6b92a81afceff6705e7ce4aac5b50de44dff45b84043638c807ebec3435d732e1dfcbb91118e1963eb7e585d6f22188be75abfa5b34c14af3c5e7f0e42046"; + sha512.run = "68bfec9f2b2d88d248416c43368831f76a8b5700252cd2adb4b7dbc0ca05d66243d1e8c8f587bc39da32f3f0db00be60a7f07047af2484ec9227055325a62922"; + sha512.doc = "70d308ce935a64573b9b9e96b0cb158518a61748c05ab79d9abb0445043ee3343b18d5babe5c3436f42d1e277cb374fbf40c470e85ab99dcf8da841bf0918bd8"; + sha512.source = "938131fb63838e1ab7e2cae20d037c3cc24d22e152cad295c227e7fe12a3b4cfb2ccdaa0a1b3753c63071d253ebbb8f26c2ed7fa1056d4de517317c3fb3bee34"; hasRunfiles = true; - version = "1.7"; + version = "1.8"; }; "missaali" = { revision = 54512; @@ -22882,13 +23092,13 @@ tl: { # no indentation hasRunfiles = true; }; "mlacls" = { - revision = 56166; + revision = 56878; stripPrefix = 0; - sha512.run = "42846f4ffe7176efac7f6f4755954452f99d7337b4e967ada72b0eb087714d5cc4a4ed1de3e90d3132a7626d9e3d457fad7f09452c95cde655b0d5fa516d05cc"; - sha512.doc = "12e6c4253c3318a21a0af476f4e8b22950ffe6b84f1316b08d0e30fe2bee0a3f42b363cde58b7267b6a3270b9ac6594b8ebeff14f988fa187965a83b9668b88a"; - sha512.source = "f06b5402113cf66070b48e607fa277e2da20007fa751fe9a86304eb93075985a9d80151689c2e16ba4a1b22568ea779756185baa5c519a94c9e05cfc20fa747e"; + sha512.run = "08ca934862fed7674f4b8a77ffbc1e42a043777e6baf8b1cf52ce6cde912899bf92d74df52bb35dc6cde64711b8d375266695d1eb4cb301204d90ad27fbc2a86"; + sha512.doc = "687c4beca93574ee7687d7586eda818d94538782acb9b7cca98ddfae6921af5c53ade7b87a72006d8271bb517d02c7a5575043ad8c94e4894d53c58e2c6f6d0f"; + sha512.source = "46d2f1929f334932409e3a9e04a698424ebba99337c4ce48d4dd2c8d63f828ad9c7b81dc4e550e69ef5ba2d17d359a0e1e4360db7175ecca63456aa1c1213c56"; hasRunfiles = true; - version = "0.8"; + version = "0.9"; }; "mleftright" = { revision = 53021; @@ -22909,26 +23119,40 @@ tl: { # no indentation version = "0.6a"; }; "mltex" = { - revision = 56548; + revision = 57186; + deps."atbegshi" = tl."atbegshi"; + deps."atveryend" = tl."atveryend"; deps."babel" = tl."babel"; deps."cm" = tl."cm"; deps."dehyph" = tl."dehyph"; + deps."everyshi" = tl."everyshi"; deps."firstaid" = tl."firstaid"; deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; deps."knuth-lib" = tl."knuth-lib"; + deps."l3backend" = tl."l3backend"; deps."l3kernel" = tl."l3kernel"; deps."l3packages" = tl."l3packages"; deps."latex" = tl."latex"; deps."latex-fonts" = tl."latex-fonts"; deps."latexconfig" = tl."latexconfig"; deps."plain" = tl."plain"; + deps."tex-ini-files" = tl."tex-ini-files"; deps."unicode-data" = tl."unicode-data"; - sha512.run = "14caee4bf5ef1ff939e00b93d244290f83c732cc857981d7e64b93a9be16b996ef034c4c88126075c73dede1508dc3ee6988bae3b084a79f484f2493080f6d0c"; - sha512.doc = "9c73b1c0fd3e9bb88d0ffa7dac2c308c3a9811a6111cbdcde56206cb40dd3b78dd1301831bf57afaa30fd55611a9c94e892d4279c0c4141bf2dbde73e9f0cb29"; + sha512.run = "0b3fe440055cc4c943fe8cdee93997718a3625782c5b2962cb514011f2038ad14518f7cffc55dee41f0a57f7401b8f2f493631a2b9cbeb806ae75ae80269f3b5"; + sha512.doc = "a3b962871878f3f34c2d419fa9ae1c27518f3901212796d32649b5524f49fa103a71f46403726b9568ac358ab98afe7b23356a0f2d2d8592c0b84cfc186d5f53"; hasRunfiles = true; version = "2.2"; }; +"mluexercise" = { + revision = 56927; + stripPrefix = 0; + sha512.run = "9af80a432fdcafefdabe9697cdfc16dcdee9f6a15d85d3e15774860e94bd579ad523c370b289e823f82372dfaead086ae0ed175fcdc51cafa53bd98076a8664c"; + sha512.doc = "bafd00d7a14ddafeccdfb2bb4df613dc0ad6428445722b29ba6875d0dbc3feea9ab5ff86d8e7799f4a907840c584c2e37cb54e89b5d978e67b8f7e4b7fc7ef51"; + sha512.source = "aebb67b8257f675b1237a362ae5ddb523d983717056915db5e482da90fd5674d7620aadc9b81b2667c9e78ad590b2cf670463eada81154f379e5693f411bc3a6"; + hasRunfiles = true; + version = "2.0"; +}; "mmap" = { revision = 15878; stripPrefix = 0; @@ -23015,12 +23239,12 @@ tl: { # no indentation version = "4.2"; }; "modiagram" = { - revision = 52589; + revision = 56886; stripPrefix = 0; - sha512.run = "aee09f61375cde8fd2ad80099fc42234a4ba787b212cf8f5e5e28a09480bcda5c307bc3e2b0e027b18666808debaa2f5215d3e98f9cd816b9f31192b30f5993b"; - sha512.doc = "d07402a534917ec27c6415503c73ea5b680515a223d41d2f16ceddbf6805c61c29404d4628cec21cb15ec8e8cf3ac62c5756744fe5eb0545e9381d001d05a3e8"; + sha512.run = "3da30c6f2759d1beebc0f33c61846343b505da9527f2a34ad7e622958802cfd08e1da9ca297003330451aa913b45c872b4eed4cad3f5bf5f8e597a2b0800a09f"; + sha512.doc = "cc0513fdca073761b8f6f9e34c826af2de587c9c6ef47bbe54b45e60427c5536a2c4743e2c187a9b089eeefe82359962d1081f5dd66fad9072e4c7adcb580763"; hasRunfiles = true; - version = "0.3"; + version = "0.3a"; }; "modref" = { revision = 15878; @@ -23092,13 +23316,13 @@ tl: { # no indentation version = "1.03"; }; "moodle" = { - revision = 39367; + revision = 57334; stripPrefix = 0; - sha512.run = "839db4d5082703e0b6d5516b6ec3c18b4fa4b449e732904569e839028bc3f7e27def83c56eb9929f65b0527cec9b180fd743aa3d0df2194aa6372922582173ce"; - sha512.doc = "9448341e5c33054a39f6990b4f7942f45fbbd884cd5691fa8c0b82fa1b3f9cfc887a02edadcb0df0a7a62c53c9f4b20496db5e6e9ecca4bd6ce8bddf2749a71d"; - sha512.source = "332251d2357ce64268a1bddf7e77f28f7cf4be10846da84c1512bb39eb804e671f38aea4843af0f1357307869794029c259a52f6ab62d96736fb691436d841c4"; + sha512.run = "50b712781d14be099022f093f98f7725c2e80932e05f23da4f04a8a68f2a99e2c5526166b1cb9a2b3f4cdb7170cfd925bb1166a3d919d1645eb9c0c64c7a5cef"; + sha512.doc = "d3d3d7a05e98295af949f98c728eda7970df9370e1e45d32dae4daebade3e3777b8db3ecf0bd9d648884448407966e642a2a697577559cfbbec5f64dd3877494"; + sha512.source = "5feaff9520731afe0a6c078ab153f1f0d5c6f9f0f6b90cf90d1645d4d5b9ccecf7bd7a716d8f5e44d689119ff286ca9f57034901719418d1ddedcbb60b0489dd"; hasRunfiles = true; - version = "0.5"; + version = "0.8"; }; "moreenum" = { revision = 24479; @@ -23241,10 +23465,10 @@ tl: { # no indentation version = "1.5"; }; "mptopdf" = { - revision = 54276; + revision = 57347; deps."plain" = tl."plain"; - sha512.run = "54c2ff5a18827c1c41783bfdf034ef7ee265ef23dab283f03724781d98d6cd1aa8eaddf24b3d409947f6be58aa736ffb714c4a3f4d024691c7e2f16b3bc032a0"; - sha512.doc = "de67e891cc8825f9de1de134d71d39bc8da37f0d4818228b32adfe698370314f3e457b75204d7719053c1de7691bbab5b323d63c4fb08ab9a03a6b97e3db6609"; + sha512.run = "69181f1facef413b4e2317180f8dba551fe40bb06e6af8d9378319d8cd3fdec985241e632f19888f32b70f16a40d11c66581f7e3c409bc38b7cfad3733cba2fd"; + sha512.doc = "f0cbd95500324a6b5ca835d62065c83028241e0ce5fa35a313458dc30e6726a21a6d1c267669627061d23f2dd7d7397f471581021e03c817c281cb6efa1d2769"; hasRunfiles = true; }; "mptrees" = { @@ -23256,11 +23480,11 @@ tl: { # no indentation version = "17.06"; }; "ms" = { - revision = 51784; + revision = 57002; stripPrefix = 0; - sha512.run = "883832298e0135980808249f5af0b28e3dad7941f401e3ac031cd558b9c6b895bde1f5dc459de9f4c5f6ae41d6a6aac08137be09f9a91b26761399868ac7457a"; - sha512.doc = "adc189823e89d6cd90369497dc4468b72a36af808eb2c8d6738b3a00082335f139ecc54ad6b601a027b6961890b5bb6975e46d1de26a1e0ac7dfc9e8766fa6f1"; - sha512.source = "41bdc589f6553ca981a7f0e7340f4e1163396a12acb1b7210fb5e9efc83924961d0e04f8ae1aa10b0db3266f63d4cdfa4f52d59f7624c321dfe0bda53ec6776e"; + sha512.run = "c8d9761b6bf47d53346b8e9e7d6a9899275417942c637cba776a4b897c19345e65731b6d842899f1d3d658618580dee7daa6e568c1e1e2293047a1603aad0bf4"; + sha512.doc = "650de14d399fff8efe00564db21625bd2914901951736d127be23ef290be5f10c8f1e077ce11c8262975a39b92d6ddceeabd8c90c7200d012950f28f1e1afad8"; + sha512.source = "8534e3d8d7049955da808a5a03a713aa7459f898f0fdee6ec002292b982a23245ba987b3521ccc8fccd495482e70bf050e03fa4d040f942fa70cfc3bb317a52c"; hasRunfiles = true; }; "msc" = { @@ -23321,6 +23545,15 @@ tl: { # no indentation sha512.source = "bbbd79aef8db604e5349cfcac7fceed96d8b2570cbdb455b36f96d99e52660562b6d84bdb5a9e1a4c9ff32c9199867f491e91f96758635ca800ad5b69039b120"; hasRunfiles = true; }; +"muling" = { + revision = 56991; + stripPrefix = 0; + sha512.run = "d5b89d93bb67e46618a30e5bdbc988a6849a7cbfee84f4486cf4557e750ae53f64aad188f74b1a96b1dfbaddfaea3a6a0380bd955ce79ebeb095fe1a54194e5a"; + sha512.doc = "ce1e2ac1e50e164bba6ff3911fe9ecb8f85ff2930f21f21e6721e153ffdc9c81798857cfe73c62f783f8909a644efd9f5a048565e054b0543973c4625d96976f"; + sha512.source = "877f34b070dd1549f649ce99a322f7221c9dcdaae5aa80ab36c6e340285ac9ebea09e9496ec87e6d881608f30d9d7b24faff6f8671f57a2b18ff96a127a30311"; + hasRunfiles = true; + version = "0.2"; +}; "multenum" = { revision = 21775; stripPrefix = 0; @@ -23435,13 +23668,13 @@ tl: { # no indentation version = "1.0"; }; "multirow" = { - revision = 51278; + revision = 57314; stripPrefix = 0; - sha512.run = "61a072b45e6caac673ae4e5df536f12ba0bcefb3457099a0a03c73f5177bf94b1f0da056f622d3963e07dd82fc1f18eaf892f2205ad34e221963a07a9458cccb"; - sha512.doc = "ae7b86866d6271f99bbda77e1df62276383b3759f59c30c86eaee3a5e14e0633dee081bcbb39fc9e52a5f4afe43ab0357aaeb11d81560a7c1c671d8773de742f"; - sha512.source = "fa10c678e843835d7d6ca2081ecbaf3a5347eee25da109e0db85be9422c2d0e8d2844e7e66784761f0877ed52f860bf1242aa05ab3015e6698891f3629fdc377"; + sha512.run = "5193e06d94390aa692b025eb1865ca76db7628a97518d36e42b630b47270b58c71ebff90eb3ccb9ca92ddb421a2b7f91207479b0130560be767668b2c1569ea6"; + sha512.doc = "293c2026118b824be7cb8d6a298d8ac1c7c0d005247737038dbe36daea7834dfcd8fb027385ba2fe55a04e32370e4e2b8cdf8ead127ebc38b0581ee97bb7dfe0"; + sha512.source = "fab2e95812d614914c1776ea15ff97654595a8d75b8a4e33daf277f69a3faaf4a86dd9718f190e52ceb9c06b538efbfe6395e8050b594f0f047dfb746b044461"; hasRunfiles = true; - version = "2.5"; + version = "2.6"; }; "munich" = { revision = 15878; @@ -23482,12 +23715,12 @@ tl: { # no indentation version = "1.2.2"; }; "musixtex" = { - revision = 54431; - sha512.run = "e6b86fccd628293534edf4687ea87b7b45d2ead29d6bcb3d0d5bfaea9c14fd0cd0559af4bda2400791d789f72ef59234f56479343509d65174ffbbe6339158d3"; - sha512.doc = "53c05e91b19e9a53f5f8b57c9295261e22d34dcdc97d2d007d534dc3f05a20ab54619ecf0a8584ad52f8b61b65558a2e0eab4c590875b7c4785f97931baaf40a"; - sha512.source = "c59e464486c3f81d4cb97a30c096b8cab312d60ffac0f0d2f2cfc82527b1f92990ae16ca03989a4cec59bf01f4225a179cd8298fb3529eb08fb916892352a366"; + revision = 57353; + sha512.run = "890faab60e994520b74081e0709217549d4d91bf0d9cd28bf8b08d33b474edd584b1af8810bd9e8f1899e9de9ab88f4091594ce3ad25671312856b1870711a51"; + sha512.doc = "65380d56ef9403c633f3459192f21191912065d2a6b34efcba1c002dcf836353be7a6c532f66a11478002f34e2f53c35ae9e7d705ff716fb9c4f929dbbd82490"; + sha512.source = "bc2d254ec56217edc6f5fb75229f0484ed8ae494da9dace2e86f494670e49bbc60b962d59397c0dc1ef40e7633cc97c9f75b4ab26ee7ff528fb8169b4e625660"; hasRunfiles = true; - version = "1.30"; + version = "1.31"; }; "musixtex-fonts" = { revision = 37762; @@ -23570,6 +23803,13 @@ tl: { # no indentation hasRunfiles = true; version = "1.5.6"; }; +"mylatex" = { + revision = 56751; + stripPrefix = 0; + sha512.run = "b7ffebb46952c41818081cc14545d429fa65e376a2214d0ed41b56cea05cb1d3146d87513b4a701825b01bcf1ab268cefe6e9d709cb627dbe7b95daaf439d509"; + sha512.doc = "791cce1eb8370e62642b64389b26a91af563ca875268039ffa978cd07a743b999573199f1a3851ee65f8118cb462ab5d5c658118a735875db90eb8482246e889"; + hasRunfiles = true; +}; "mylatexformat" = { revision = 21392; stripPrefix = 0; @@ -23614,13 +23854,13 @@ tl: { # no indentation version = "0.7"; }; "nameauth" = { - revision = 53940; + revision = 56995; stripPrefix = 0; - sha512.run = "847d9562465a4b1a8d126b2f35acafc9c2121ad7dc2ff6cea5ffa4edd744baef0710192bd196fa8f11f9972f5ea57db1df7ec2b533cbd473dcd241a1f9ed3794"; - sha512.doc = "4a57f0325184b04c59e9686d64c2361cc139000ecdf9517cf56f2f9023d4c8942ea7104524583eb8b8bff1bcfe9f2da9b26342b5df146ff5974c5d70c037948c"; - sha512.source = "2daa93fc8a1177cb1667f8b654399f6e90ef79e29130a2a802ecb976c2b5a7478484af6c207eeae8cf350d300cd43115196db8d199637bf5390d7282911b865c"; + sha512.run = "95be72c8782dd946dccf8bef5aaf64ad7711056953045deed6ef4e207845ee3464cbbb5cd645d7779e1b2baafb9067fef22e817c3da808f45e29bc2a18ee6fb1"; + sha512.doc = "d057b83a631f43944bdd7f7dfe87ebaadae37d38a47fb27d0da3f440e73bd54a6b758ec4ade9913f72ae2018e5de4d922c9e103b91efa8812222bd45a135ce75"; + sha512.source = "43cdf2f0683611534a65ab4c313a5506e9b3c0bc05d57ce01f013d9d390c3abf9c34d6f45b4918e7222b4f2b151c4d537a035fd46a3b6814c49d27e56a2da3a4"; hasRunfiles = true; - version = "3.4"; + version = "3.5"; }; "namedef" = { revision = 55881; @@ -23791,12 +24031,12 @@ tl: { # no indentation version = "2.0"; }; "newcomputermodern" = { - revision = 56419; + revision = 57309; stripPrefix = 0; - sha512.run = "1e2071c050c5d83c30be99ca00d2aac216a67d31acfe19528307947542bff56104a376e0405478b42ea1e0438dd94e068cd29b5b146d6606ca8639b600dc0c1e"; - sha512.doc = "d7d00258a36842d7f518505aa803a7efd557f754cf85bee5ee9bf7a9a721522be1b858fc9da0c70881831a5eae0f78481bfdaec9e0654eb84eb32e5ac38b90a6"; + sha512.run = "224ed498d10dfb5a855f94e8cb605b7664d9f4f0624ecc5a813ad8a899a29da613026428def92f3e36bfe25a69eef043330cffdd23ea537050d7e15f8afe1564"; + sha512.doc = "7a75899ee918d4a80d9b1f6d9f0c242671c86710d119511f1345d979f412dc426164ae93ade55dfe474aeb24d8ab462d16e904573f57911cb4dbb0aafc60c04f"; hasRunfiles = true; - version = "2.31"; + version = "2.34"; }; "newenviron" = { revision = 29331; @@ -23834,12 +24074,12 @@ tl: { # no indentation version = "9.4"; }; "newpx" = { - revision = 55619; + revision = 56845; stripPrefix = 0; - sha512.run = "4f2b5dad4cbf34e4f836b9a1c5a4c639e8ef7815894ba6299fe9da1718000ecd3f6802d434efe86f2d5e0b00523b0f32305adb965af79813e0aa2cae95b89348"; - sha512.doc = "1a438ebc99bf20ac2d4776e1b60ef0545dd6c1c74e568bbf2d89ae3d8e115060fed467db92305f7086764efd38a7c97b71a52b8e855b174b14c2e85a37f09254"; + sha512.run = "7dbbfd4e3e32b0c5a303ecfeb776793c1b1eeaa13b934e9e02ffbce49ca6d6409f5b920dac798a3abd52ddc87eab7ec9937060f3ddcbff5023005a6cce363899"; + sha512.doc = "49e38fe4adf7291e3c174c9bf91f1f48ebe22639c542cd4fc707bce846e6fbb38a8bd0ed8a459c5dd61de314cb1a8a24aece5efc1f3febd5b0ac467c3051e3fe"; hasRunfiles = true; - version = "1.413"; + version = "1.414"; }; "newsletr" = { revision = 15878; @@ -23858,13 +24098,13 @@ tl: { # no indentation version = "1.0"; }; "newtx" = { - revision = 56384; + revision = 57192; stripPrefix = 0; deps."kastrup" = tl."kastrup"; - sha512.run = "e7e6044ad539556834004525fc6ea51e2b5de9e20c3c862c0eef2006fc2852141914c99841509f30fd63e6710d3b1e1790756b2cf3bd35090d9cac108a33bc10"; - sha512.doc = "4928447c1382918e6facf5cfcc0b3fd50e3a1d07b61125a2a6ad0f799526e6bd720b9383ab8588945061b98036879a8251454c4d34a11ee46fc4c43b1e4d1b8a"; + sha512.run = "24077fe936a3466e58e0df7b3e13580c896d5adddd1e81617cebeb3175a9c1f8f9f1bc4ac9b4956e2d253fb75a12edd2ad9592cf71ab63a9bcc75a2424dbf181"; + sha512.doc = "907434ec4719730ec6829f9a2396070fd5b050420de81d6f173eac5aedc143a85b1ef4bb1c89153201309937d5c793d98211b77a6b0decfa438b2f554bd836eb"; hasRunfiles = true; - version = "1.630"; + version = "1.640"; }; "newtxsf" = { revision = 56527; @@ -23901,13 +24141,13 @@ tl: { # no indentation version = "1.1"; }; "newverbs" = { - revision = 56247; + revision = 57349; stripPrefix = 0; - sha512.run = "a28b12fc2741b5e467f95194d447df1da76cee1c63b66fc7d057406624e4c06f693e82f721cb355e469838d4ec96a14c4b26f64de094dbd1f0873c1e2e2b5751"; - sha512.doc = "7f868f5c76c3339005b0033d4777b6c166a9f7482327155e59e15d338ad387dea30df13a070d80d4bc935ea112db9c826f9597dfbbbd6a13b4f3ff4ee196496c"; - sha512.source = "6674e96c603d7f9b5dc4dc61bf1173498d4fb4e568b0c1fa08a34f7b8be214c11e932f16dd1f6adb3867e0d4daaf3970850e8adcc1af7e4f3061ce961d35ff28"; + sha512.run = "6a6216b524f4e1d7b2624ac81ee3659574da20b7c548148f91442b27977ef6c3797f6747b62d47a3db339d5005dfe0773d88d7afdd13d071199f87b41603af7b"; + sha512.doc = "72717e810564fb09db3fbd658c3c7c0cbe50abda9f6f9bb111191046cec568f8a83ed2aad3741f73bc933b6eefc9bc0ce58ef086828e0b7d07f9e0dfd2136ff1"; + sha512.source = "052dae2308f92e904649b41778ad16853e73d31da50853b0e14901f9f73f4b06b6987ba9e4119d29102320ee54c9a1fbeaee39cb872143ef673637a5074d499f"; hasRunfiles = true; - version = "1.5"; + version = "1.6"; }; "nextpage" = { revision = 15878; @@ -23949,13 +24189,13 @@ tl: { # no indentation hasRunfiles = true; }; "nicematrix" = { - revision = 56574; + revision = 57352; stripPrefix = 0; - sha512.run = "5e98840803c3736bfdd413be148696604faf1248afe0cb6abc80cdca9c8f88d334f54f26a43e2fc674e4ee97b1fbacb66366aba3f79b5cc9005563212e550ee5"; - sha512.doc = "26ca8493ec64c5a4a1211d42d6a4db40e6f22eaeb8febca5bbbeefc0ed42e7c72e0761dc7993ef2d0312d295cb911813a96b2cec77081854939cec4c5964046f"; - sha512.source = "ed00d9558fcc15266c6907731f96c3bef924c30bf8409d14cf88092dd76f1c0df3f3a750984eb3d6ed0537659a6cf5e84aff867a8ffe0724596bbe453ea201a1"; + sha512.run = "d92856d1776fab4b877c575100b61b2bb9514dc50971f36acd14faa513e7eb0ea07f9931b393d176ed2def3eaa854d4de5f71536a8eefadb3cfb62b73a96fda9"; + sha512.doc = "033981751ab3f0bed9a635f943a013327c3d5b412a9babe72ea64b49c5e99255a287c02870340656b4bc88c630f3bfbd2a22aecd67f0ecb0199c8ec76999968e"; + sha512.source = "b7bf6249f08a92d09c31c0c58f4772dd5dd2d04c7f08d6fd3d8c2fdb1b4d2e118baf5e489dc6d0daf7536c5ac6fa446f12efd6d5bc100e70c23b4a6b02ed180f"; hasRunfiles = true; - version = "5.4"; + version = "5.9"; }; "nicetext" = { revision = 38914; @@ -24059,13 +24299,13 @@ tl: { # no indentation version = "1.0"; }; "nodetree" = { - revision = 56532; + revision = 56742; stripPrefix = 0; - sha512.run = "024245c0d86766f354032d27159f7add43b3ed7b7b3e0be698fa57c6cd76259a632d57a3da8f598bdbf5e2cae850ae932cc517645897708a2cafa80b447872c9"; - sha512.doc = "f93e97278395b379e6fcd8ed3791b0eff1d02fd0b11f5ef51a98a2eaac569a193322ab20639a5de4a5ae5bd5a239500dfcc6627069375eba97367948eb6194be"; - sha512.source = "73f7491750f8100a1758ddf2625aa80973374eb42bf44cca06d6aa851603c879996e7cc202e027a96e1af787f1c5a9f112376a05d51d67a7c40779e66a1595d1"; + sha512.run = "315216d397894f9b49109c4749dd91953d4bde0c220c37eebdf762f2427bed4f5bc9657a7088a479c78832fd7dfebbbec1b09e25b0a2f5600505a8d5cc58869c"; + sha512.doc = "2a20d35c7a1f01657455b239916ad7c9fbdda81aac26d1cfd01d9c4e193ed75d02ee30dc884fef6df722042c3096fe350f6e29b73c00a3edbf4d2a85d364a1de"; + sha512.source = "579e92f7185814a062cc74619641a3010b55c3e21fa2a8cc13d402b50db4ab5ba05527174a90361521d13e483a87b73758c4c52068b6e94d8e73d8aea76a88d4"; hasRunfiles = true; - version = "2.1"; + version = "2.2"; }; "noindentafter" = { revision = 35709; @@ -24093,13 +24333,13 @@ tl: { # no indentation version = "1.2"; }; "nomencl" = { - revision = 54080; + revision = 57263; stripPrefix = 0; - sha512.run = "afc93122b5bf8dbcac2eaf61c4e90792107249cdbcea44e0067d704b35756d44c249df4e6924f1a74b68dc7ed753467a73db687b9ab38ec965a5722348b7b3c8"; - sha512.doc = "17ff56c02b4bc66cbbad73cdd05e254fafc4b44dbd45bb7e749c0e9f25a8dc3c6f4a4e82690a5dc13558b52f1dd679235cf78b15aac22825db1c7a2cf9308c48"; - sha512.source = "6561f296ccef879ed95011bddc7472b1f6049e262e2ba16a996ca703aa665fb2c3f186271a1256c509fdc10db407a20acc87ad13b30edd1249a14e49bb02512a"; + sha512.run = "f63b053f8d95a58e2d8ec5d42177f13bdaa49f6cec710e166a96f45187b51cbe12b34c68918c0ec42b12250ecf1af80f5dbb83f4161b2d0dc94d51ccf218391b"; + sha512.doc = "cf29a353af0a32e41d18087d3ae9c8447d52cb0f95dabfbde01150d15637022d53a8576c362bd7489e8110cdc5dc1892159652d67e61f165f25a78b64d8e095c"; + sha512.source = "e64dc93929ebdf9716208bc51af759003b7e3263a95d58dab5bfe740a71c966d4f51d561e4cf2d82f90bf3e081b4cb0c7a50a1e0a657d2b33b3a065a2e88a557"; hasRunfiles = true; - version = "5.4"; + version = "5.5"; }; "nomentbl" = { revision = 16549; @@ -24225,12 +24465,12 @@ tl: { # no indentation hasRunfiles = true; }; "notomath" = { - revision = 56050; + revision = 57177; stripPrefix = 0; - sha512.run = "e3c3d3774f43a15661a6141f9d7c86f67bc4e5b696c19352c01e6a10e42645632651f8b74e4a8e5019d410392b75e8030d4ffdbe771015326db8b385cbe98572"; - sha512.doc = "4f0a09d5e458090c586bfcfd3d34054ffbe96f248cf8f6303bfc50cf2f9b4426280e9f913c224f8f6190317d2307a2d7e3385eebc7c075ed858d8be928f333ce"; + sha512.run = "cfcc20cee5c36055658d79a345b33dc24605c7b11131fe3b3db9c148b0e0df514316a296e6404976487b20528362d13474e41fae8c04458652dbba0295327d9a"; + sha512.doc = "0a65bf4e4cf30687391c7634512458b8f0baa3b959887aab267ca17a6d03aa491e5f8c4c7e65ca03aed2976c7a735e909cf8b8fe22f6de7203b73d4a57e5ab16"; hasRunfiles = true; - version = "1.00"; + version = "1.01"; }; "novel" = { revision = 54512; @@ -24274,13 +24514,13 @@ tl: { # no indentation version = "2.01a"; }; "ntgclass" = { - revision = 53882; + revision = 56959; stripPrefix = 0; - sha512.run = "c92ad04449f1cc888b80d0f5a6baf318bbf2f743f5131f8c3fafb263f88a2f9df2037c1e8172806a41dbfb96d447c1e55c949e99745a60073431f4affc27cba0"; - sha512.doc = "18703b1ddaf9fbfebb2a546bc8e63f5e15958c6f07087d936a0751786f5fc620011654649999c815c3cc0e78a04c6efac736e1f36708ec858438770c27e9398d"; - sha512.source = "1ce750624629809e1a13ff91be63584528c5d7a85f44304ea21b1beb6a01363d7727c1ff1268c1c373e3d0132b0e6701e3cf65c3be7ea01848fd08578581c90b"; + sha512.run = "bb1cd3532f91bde7768a027d51216bd56c8401cbcec4996587760e3289d892d2f1d4efe834d55146026ecab413b04d1f4e8e132a53e3b6f925f4aaf0bc1124f9"; + sha512.doc = "a58debb1c6a07c63dfb45ea6647db75bb09217a2c7680318cd6ee56575dfde985ae88ba361ea9ed1adb26ecea430e851599ccfa900292e4847b70e02eff65887"; + sha512.source = "989942960e4cc5320f3bc877cecec195dca4f8263b3de1b0d2a233adedef0380cabc5d017cb256ff8c46889df8878bc68a855a754cdc8b9dd0cd6a7b05242c08"; hasRunfiles = true; - version = "2.1d"; + version = "2.1e"; }; "nth" = { revision = 54252; @@ -24370,12 +24610,12 @@ tl: { # no indentation version = "1.39"; }; "numspell" = { - revision = 45441; + revision = 56912; stripPrefix = 0; - sha512.run = "bf6d58521c82638b9f9e93fd5314db075fddd4cb249d7e8fe8b605581ed19414d259eef98a4f205d497fe4b9c552427ac202c0c0b5810e81ce1bf7ea903ec3ae"; - sha512.doc = "6f3f26985e8c656fd68fa716fcd3ffbdc890da7cd0797934351b4d128444eeff4b2f2adb05210fe45fdd627c0da22716153aa8ebaf4b5d7644235ed8b6c2b507"; + sha512.run = "e3731b00f027319e67ece82e727fde32be4fd80ba508b173f54f89edab3fdf5a98148ea925f68039adec2c09fa7d2284d1809d5a95aebd0e0d364f1b8b82b698"; + sha512.doc = "368b5af91cf3d8142bd243d42a6f3f939a2172aa4837487b78de51caa5ff5801123af307c14aa7b66a32fa791268503bc7ed6ed1cc7ddbaf59c84a57914d615c"; hasRunfiles = true; - version = "1.2"; + version = "1.4"; }; "nwejm" = { revision = 54392; @@ -24534,12 +24774,12 @@ tl: { # no indentation version = "1.00"; }; "oldstandard" = { - revision = 55359; + revision = 57213; stripPrefix = 0; - sha512.run = "5643f4697ad2e3aa8acc85c9ef7de993681c584340d3b09431cf05210c36457dd4bec07b8ae4e9c5890891412060f725e037b825d344c7e0ec5ba17ad44e6253"; - sha512.doc = "b70897b4d5bdff4514fe43dd06d016e6ed56b8ad29ec68ef3b76091ed37344ec954abd55041214226560c1fff13a52aa1a0d251612a10310b92587972aa15dd7"; + sha512.run = "848400b102d5ba0ceb56c4d50c65482bf5b3c468f4ed71d0ead25f0612d54552150bf467b50ca5686028797a25e46db195307ba0764473ce520e14e93403140b"; + sha512.doc = "13d73f373b75de8be6e013595eb257ad4f2cb601f56ce5ee57a16cb427068ae597f3fb802b781f9c60e5e1e502f253b09ec3d2740355929ccb236a1d55ae1933"; hasRunfiles = true; - version = "2.5"; + version = "2.6"; }; "oldstyle" = { revision = 15878; @@ -24630,7 +24870,7 @@ tl: { # no indentation version = "1.0"; }; "optex" = { - revision = 55655; + revision = 57197; deps."amsfonts" = tl."amsfonts"; deps."cm" = tl."cm"; deps."ec" = tl."ec"; @@ -24638,10 +24878,10 @@ tl: { # no indentation deps."lm" = tl."lm"; deps."luatex" = tl."luatex"; deps."rsfs" = tl."rsfs"; - sha512.run = "3231c87a4ef894a7ef934eb57d69794f31c0ea371417fe066ab0df4ea4069d151155e72fd3422f1b4091d1a789e8739e429dd78b75c64d77702b8ca85d5c397a"; - sha512.doc = "1b5c6741b70d4212973635b26121dc432bcca676cb42a6c946c43909c70f8bf201aced0e9cd2266bca4c8e7cddc5f3200f59a48c2f4d69ea8fd6c261b6b11d6f"; + sha512.run = "ac605b244ff6440f4e590b83ed14648354468021123e832bcc1f07d07cbbf35ea2facacf7c8b6c13b8d5f571514ade94747bc3f216261377fa47f2d7c8a5bc39"; + sha512.doc = "e6015799a9854606474f30f7dbeb5089cd5eeb0f3a9813cc03d907ce652b51b52d9f17f0dfbffe7316eb0db877ef733b331990fdc54d439c5f911140aa647d1d"; hasRunfiles = true; - version = "0.15"; + version = "0.18"; }; "optidef" = { revision = 50941; @@ -24667,6 +24907,15 @@ tl: { # no indentation hasRunfiles = true; version = "1.0"; }; +"orcidlink" = { + revision = 56976; + stripPrefix = 0; + sha512.run = "542f61e6b025f4ced8a8d6f352dceed72c7a1726cd345185fc016fe9555dca6788f12e16ad714c5cc8216bbe6fea8160604c015b2401d4b2b0df2e02e4bb3846"; + sha512.doc = "851a2e20013f01c2bc71ed3974e347251f73d30641b5ff5e162ed068ae717814c5cc00980b04e83008153c7e14e139ee9f6401a5001d49ec9d1570ed8a644f35"; + sha512.source = "fc0f7f0abacacff6a893fe3eba8f90610b3020d36ddea15f07b0ae4f35c87d75f5946c2fc9e167dbcd8041dfa6c0cf9a31c76f3f14b4ba98c90a7c711ef64e22"; + hasRunfiles = true; + version = "1.0.2"; +}; "ordinalpt" = { revision = 15878; stripPrefix = 0; @@ -24691,6 +24940,13 @@ tl: { # no indentation hasRunfiles = true; version = "1.7"; }; +"oswald" = { + revision = 57253; + stripPrefix = 0; + sha512.run = "faa9493780681b7485a642e45cfbb71e81ca408e2e65acd77b22f0655a0d98598558e4557737fa0615794eedaa42cd8ccf9bd04323b55a39db6251f52b11897c"; + sha512.doc = "e20776527a53c7da8a07d3c08314768cb3c0e2bcdbae90b30e7407c95546f1187f65fbcb8a52915ca3b1d26ffad2191733f26b9f105403ec574ab4912bcae915"; + hasRunfiles = true; +}; "ot-tableau" = { revision = 44889; stripPrefix = 0; @@ -24729,10 +24985,10 @@ tl: { # no indentation hasRunfiles = true; }; "oup-authoring-template" = { - revision = 56594; + revision = 57349; stripPrefix = 0; - sha512.run = "52d8c2aab996e2a068032086e1fb057b9feccf9469bbdb7c5b9819975ffe74974ba8a7aef8dd221898ca81c647ebd82e2bcf45ecc9832b26aa64cb413971c68d"; - sha512.doc = "817ad802170495066f3985b11320abf136572ca03fff8040b31f274907f5665d9906de2194d2959eb5b2a781b2266c740e883085134b65f158a33f8ba1a78e0f"; + sha512.run = "a74ceccc072a75c9f1f5ae906c5766a8bc8bdb459987c655f529ada87b609361e91d542679776c70a4d77941e3fefb0c2933b3003a4679f4f33f354c25277a93"; + sha512.doc = "25b5aa90b6143a4913c29a72b81513306d03af2ee988c83a9f591e735cb40a6f63a3eb51d1bd9bfe64daaaf8a2ef4ae280cac833c67c1fe9745f22fc6d2d8a19"; hasRunfiles = true; version = "1.0"; }; @@ -24959,13 +25215,13 @@ tl: { # no indentation hasRunfiles = true; }; "paresse" = { - revision = 56598; + revision = 56621; stripPrefix = 0; - sha512.run = "34d307329e04d1c2ba29363fbcbb76d31280ecc13384d171a216fdd8df3201da8a84f54e3fea97b4fc97f23a690ea70c8a75726b132936c0742a3e83a6b2cd41"; - sha512.doc = "2e1df81de22eb486134319ff822e4ed2642e6427cb7a6e442e9dc231d0cc44e7ccf6bd72b2fd940d37315e45ba59e87edf6fe849d0890f8f5f6c0db884b21573"; - sha512.source = "4048d419d91e8e8e4c64b4a0e0683369e6ed5517197b9047413b4e70d8f8ad172296caaa37ed5a4ea24e480d26b415c66faaad31a720a02d467eaf28e2983094"; + sha512.run = "7be25fc749a18d1cabc6ee720cef15b89e323d4e07716b63aa49a5eb4c89208f730513491a7b6740069f0daec3015ada3d673aed6407b21a8a1ae1dd09f60d7b"; + sha512.doc = "cb01df5ac56c7cbeab0cbfdb99950ddbe58cb432885702b2212c89c654cb2a88536be20a4abfdda5321f2cb36e8528fdbe2b96a129eb8afa2c1e969c0f22398f"; + sha512.source = "50f683ae5a7d46faa5740766e01a7637e9e1f149b6763e48ed0029814add723b551d76fae9baabf562b1bc5268ed015b7619fced2492478b2be2ec4c4f63f57f"; hasRunfiles = true; - version = "5.0"; + version = "5.0.1"; }; "parnotes" = { revision = 51720; @@ -25117,6 +25373,15 @@ tl: { # no indentation hasRunfiles = true; version = "5.0"; }; +"pbalance" = { + revision = 57161; + stripPrefix = 0; + sha512.run = "7db75e950aca473dffc3d3efb419bbe33b5f04d1a0295a73de3d7385883d576f46bf377554ffaef44608cc8c6df3f3594bd0a0e5ed7ca649c7ced5c5834192db"; + sha512.doc = "98828ffca4f1e4dab5b51e45028058cff1af38cedb05f1b0a201bff1ddb508374da6fb0d77ff4d14bdef6ec04a468435dd9870ce0f1e34685fb982f21c982e79"; + sha512.source = "21236f5d7cc9a64472d9f214777331d3b230773d134b0ed5a83d1a3dd21c2d4a76df78f42824012d4edaabfeab612684fa2577bac3bd4070ed2b5956d19272dd"; + hasRunfiles = true; + version = "1.0.1"; +}; "pbibtex-base" = { revision = 40986; stripPrefix = 0; @@ -25216,9 +25481,9 @@ tl: { # no indentation version = "1.15"; }; "pdfjam" = { - revision = 52857; - sha512.run = "9515d6156948df018b5c775e0882912aea5231ba73a30c5dbd33c258542a6afa936eaf9a366a0d498faf231e4e5ebe7485ad928c78114ddb9399b6f26f48c5ea"; - sha512.doc = "b2d6f867ed37f8f3443e0a88b2e1547ef755756409ea0f25e0982410394807f40a7b0bbb89d56e6bddd8fd65607d43bb28ff7bed6751fcabecb284ed1c2aee89"; + revision = 56991; + sha512.run = "1b1084859a811861e60e27186d67d267d3740152331f50fdbe67ce7226a76b4db24d79b674e6511d2f3de9a711da3369c565d781614f5d0c1a8021bc1ac18827"; + sha512.doc = "a29c09a2e843188135265aaec690e09cd08fe29076a0378b308ec0e48aa7936ba0edfa7d6ad3ac808ec334bb5c2793a32d8ef625f4ad9b3fea40d4db567cae56"; hasRunfiles = true; version = "3.03"; }; @@ -25247,13 +25512,13 @@ tl: { # no indentation version = "0.92"; }; "pdfoverlay" = { - revision = 52627; + revision = 56803; stripPrefix = 0; - sha512.run = "089e33b32284fa775bd8a5e9b47604f5639060928f54397f775103823822eab11640660a982ff8229e8c1d63baaa26086bc144f2160401fc25855015638c5f0b"; - sha512.doc = "e4d21dee8c619fc301a75637f2f5fe8279e4deba63f627d153d47a90ee0cc19031547631acad2e9936aae456c330a7242aac9540a0b5c217ae7fbbfa2b15a29d"; - sha512.source = "ac11650b32810ab9b1b05892d301b089eb6bb81304720ea258d7ad7efccc036528dd2acf5b0d0eb8666a238e4c01557c60d86571cbfb083475904c52f6a2c5fe"; + sha512.run = "8d18271d6c0738ade2f16a4adcabaee8b94a0cbe30a526e71e7a255ab0edc7146b660cf253991622c11c027778446f1c29e3871e71dda2ed9a5a05890c40be4f"; + sha512.doc = "47768bc52cd654275b751e7522cfaf28f66960002215036671bbe27db6ae63152e31a7ed2c372e7a63272bd97a26fddbd9fc18c5ccf0aa43744162da8517f1f7"; + sha512.source = "bbbc147cfad53a18327c53b640d0da125674ac33bd841fdece54e472763b75f34ca32e69cb53fc001a16d806778def2083eec70298dcf92bf51b99233094c3aa"; hasRunfiles = true; - version = "1.1"; + version = "1.2"; }; "pdfpagediff" = { revision = 37946; @@ -25277,12 +25542,12 @@ tl: { # no indentation version = "0.5q"; }; "pdfpc" = { - revision = 55536; + revision = 57181; stripPrefix = 0; - sha512.run = "13ac7327ea2efbafd7e6babb80ebf092b7435adeed1bf82228daebaa2bfa1aa84f840c517a842127deae42cb9debcbf4837d90d2ecae7e3d9c7c26eeb15e6255"; - sha512.doc = "830fe7ac4066f9cd8ab68c2cac02420b8034ccc9cb87004ca7178d760d736abbd128490b61488d88777efcfa49490811a62982500db8cdafb70014f2da45d582"; + sha512.run = "44e2b5c47109809345d1f3b981e9f505e1b01d27e39b9e29d0eb314fdaf40d096f3a39e5a3ade261c4772fdbea7930b73d9b45d5d23d5d379ed8c1488571660a"; + sha512.doc = "2d2fbeca36a35bac5301ce2e4e88a5e23de5f45d591d786ff7e6aab8b7d29197d87c29115485115391c9017ab66d76ed96d3721691479e7ab8055be52bc70709"; hasRunfiles = true; - version = "0.4.0"; + version = "0.5.1"; }; "pdfpc-movie" = { revision = 48245; @@ -25401,11 +25666,11 @@ tl: { # no indentation version = "1.6.3"; }; "pdfxup" = { - revision = 55656; - sha512.run = "95571c2914ccbc305331dbb0ad6f0deb6a393f22ed56c55da9936f4c39054c076b8136237d8f2479d7522b68e9c47978de950c4133370a3feff6f2f45b2992dd"; - sha512.doc = "4c532ca5731b8515c73a0bdc5355e9c1286a6e52f9c14b964454bb4331f22446ec0d189976d85b8df024441cf5cd21d74c77aaaccd94758a415cce1bcbc1cc6d"; + revision = 57166; + sha512.run = "c000299a0f21b6fbc60e23ac163c55414e939f5542006a1508e8f5e143fb64cd40b8b57e986c07d99e4bec8e9f1d0d325955b4d34af08ba73a58f77c1a0d442a"; + sha512.doc = "9ffaa67a311531694f67a88cf41266858ba1d92a6d390fec2885a30a734922a48f4afe390eb6b3ea980c7ac79ff67f0d393927f7bdf3ad0bd3d30e64fd098d96"; hasRunfiles = true; - version = "1.60"; + version = "2.00"; }; "pecha" = { revision = 15878; @@ -25493,7 +25758,7 @@ tl: { # no indentation version = "r36"; }; "pgf" = { - revision = 56512; + revision = 57240; stripPrefix = 0; deps."atveryend" = tl."atveryend"; deps."fp" = tl."fp"; @@ -25501,11 +25766,11 @@ tl: { # no indentation deps."ms" = tl."ms"; deps."pdftexcmds" = tl."pdftexcmds"; deps."xcolor" = tl."xcolor"; - sha512.run = "7c60057a60eb038aec5df5db9695ded7e5397666ad9f7fab62bc5ebb975dcf989708f0bbc1cb84a64319136f88b4b1178de3fc7d2e1ad23bace4501e4f0de100"; - sha512.doc = "b9dcdabfe05ec6663871666e4aad38a6d60933cab0d9b0d3d2af1e119335cdfcf4c8179c350340bf83cf2839f96a080edc675adc6d876e6594813d50381f025c"; - sha512.source = "48b1b38739d9c7e18a5e363ea92f26e0b786f4f1053f5f9dae9dcee27521a945cc7c7f31d626099c1933626c62e786f9d228463501026e9d87bedd38e21847b8"; + sha512.run = "da45fe7a5b4e9aacf39c64da1596a30ceffc8751ceb6543b20f6d3f2134da75eff7684a72ce15fee9d1e4404efcf98d9fd3354d9c178caa3881a735be87c9073"; + sha512.doc = "697cc2e2503f3d71cd751530e1e9d8c9ada584690b212f03b7a15808b9f973de532dbbc144ef924b4e806d849cabe2850d1ae802c51b073d84e567349c29fb90"; + sha512.source = "2fc269eea7ef0c9ee04e15961494f4efa6c12a03a6c0a269a400d031fe154796c67ad96e22efc4ae077a87c38802471b4e0add5e1187249a2b939f8e8fe13d77"; hasRunfiles = true; - version = "3.1.6a"; + version = "3.1.8b"; }; "pgf-blur" = { revision = 54512; @@ -25608,11 +25873,12 @@ tl: { # no indentation version = "1.20"; }; "pgfopts" = { - revision = 34573; + revision = 56615; stripPrefix = 0; - sha512.run = "39b29273305a894c37bbb8f2edc899eb69cabed78623ec5ac66d6a75fd7d6b344c1fe4813f56383acd1c51acdd099fcaf3e97af294c5fd63ffe47e25e9cb9caa"; - sha512.doc = "8c5df446fe33e40503caeb8740becb28b3328490fb6aac2cf858645a5d896681d6448e5160cd32e7220c164838fb65dcfd85a22a6c6b9205511f6055f23dcabf"; - sha512.source = "ba4043a5ecaf21c1afc3328160c6832b67103a9b9c278665f0ebd91f21d842f85eb70e7a2d7385d66f9910006205d59042aafc994a2eb62762f3dfb5917c10f6"; + deps."pgf" = tl."pgf"; + sha512.run = "7d672d626428c37fa749a810c57be43c6102e1325a6d3e16c57bc560b6d65a57bae94e619a73f3e0efb46ce7b4783d05a6e98c64b1e90c6e0f94f1dd9acd676f"; + sha512.doc = "ff82e0502fdeefe6afe90aad4e7615de9be4ef8e2e6a69e7a537202af77aed00c0895269ceed3d38e0f34345efbdd771d22b0c8759fcb46ff8e91ce639dcd21d"; + sha512.source = "758da1f3daa0ef888b484ea657fdd4384102868e4eee543bc97e73f103b67c367277f5c00efd06a2080f9ac3fb82c909cd30f641363120e70357450179dab6c5"; hasRunfiles = true; version = "2.1a"; }; @@ -25731,13 +25997,13 @@ tl: { # no indentation version = "1.2"; }; "philosophersimprint" = { - revision = 41788; + revision = 56954; stripPrefix = 0; - sha512.run = "05f9639dbc34d0fd653f2609c581df2e50825cd61af7eaca55f03fddee2b0bf1c0c6bb3258fe10265cdadf0d8371d351aa143327a07f3739defb4ca3ca9b4f16"; - sha512.doc = "45bf6648cf92ee58d35847845094614884ad300d5ae745a57bc036d72bf7a1cf8dc7596daab8c606266c717b0114727072298f91b61e92c40dd180bfeb678a3b"; - sha512.source = "9522941d5b9fdeb2eec1f3f91bdb6649da45ba930ccf11599e532352170279f67e40779b9af5d46a4dece5b14ca2ef421280ea31eec24b686db6a9a4f2709a93"; + sha512.run = "8b4a1b9bebf971b0963fd20c01807d5d541a978b88a1b07bdb950c1e39fcb20b8750cc0c78bb97d663c00bac2a714fa95f0a088a1c84f371261d236c941cec4a"; + sha512.doc = "9c6d1f01b2e815c4c33c4e95be40d1a7819568bbf22edacc202c3346ac4f7373ce4b6e8316ed194a32551f07296628d1d8f971ea856ddc33c1d964efd6388d4f"; + sha512.source = "12c557b2f273c06ccdc322195340e10f50d54986ec8aea4ac103a173c9a31514d5fbce39413472fd530f0c41a21e1e5d7fb5ba03b8dd3008efb8056adc22dbee"; hasRunfiles = true; - version = "1.4"; + version = "1.5"; }; "phonenumbers" = { revision = 51933; @@ -25805,10 +26071,10 @@ tl: { # no indentation version = "1.0"; }; "picinpar" = { - revision = 20374; + revision = 57349; stripPrefix = 0; - sha512.run = "9706ae1d10df99327d4778ec538ffc9aec465a04382b0732005d25660f452dda539b736be50a271c9be623a823be113696471da6c2d482dbf8a269af7c1143c2"; - sha512.doc = "73b28f87550924b208b48ca9a066861e02b1a8360151ad89609e6d8c36a772192f174befd87fb02b65e92370fec332fca5d67a2e84e97c7549b86825384dcf34"; + sha512.run = "e6c7beec7eb6beac3ddf2621adc68ffa90eb24d0df02b8be23de1c1c59ffc76709307116c9d305db3735cd5c1cb2276ad11f9ce4c9fc171f67ce95293264f4d3"; + sha512.doc = "0e79c8b6b93fd8e424504286d1010879c52e83c2f216c55e34d28dfb94ead43d43c750e637be938c9b6337e6b8e07f6b6a34271cc93db3ece846d5e4d55671d7"; hasRunfiles = true; version = "1.2a"; }; @@ -25937,12 +26203,12 @@ tl: { # no indentation version = "0.7.0"; }; "pkuthss" = { - revision = 54512; + revision = 56838; stripPrefix = 0; - sha512.run = "b311d7519c761f42ab5e45c4d8dbd800ce6e9b36118c738301ee58ba4b776f31731be0f4a9b15195a1827584ba464847ad9f68cb5e5cf1715bb9b354a63f1cba"; - sha512.doc = "0e761ae1f6ee318021ad5de11ba354181bd6aea7d7df4bfbe4a20723ee6d7078751cbb74f0acfa3039274120a976eb7a2a4b0a4208ef5add17f4bc25867405eb"; + sha512.run = "5c788b191a0910098fa99dc602456621e82b18bb154f863a287dce24a02c55c2af89583836874aad7ac586b971461636482481cee9c9e9cc9511a503d8fbe86f"; + sha512.doc = "a5e8421992285f670676e21ba766d054c96933d7b79de1fd8d3de7e5310f529da3db82454aedd2bb890f07e592f06d280a01539349cb2da9d8084bf9840e710a"; hasRunfiles = true; - version = "1.8.2"; + version = "1.8.3"; }; "pl" = { revision = 36012; @@ -26037,11 +26303,12 @@ tl: { # no indentation version = "0.1"; }; "platex" = { - revision = 56582; + revision = 57186; deps."atbegshi" = tl."atbegshi"; deps."atveryend" = tl."atveryend"; deps."babel" = tl."babel"; deps."cm" = tl."cm"; + deps."everyshi" = tl."everyshi"; deps."firstaid" = tl."firstaid"; deps."hyphen-base" = tl."hyphen-base"; deps."l3backend" = tl."l3backend"; @@ -26050,21 +26317,20 @@ tl: { # no indentation deps."latex" = tl."latex"; deps."latex-base-dev" = tl."latex-base-dev"; deps."latex-fonts" = tl."latex-fonts"; - deps."ms" = tl."ms"; deps."ptex" = tl."ptex"; deps."ptex-fonts" = tl."ptex-fonts"; deps."tex-ini-files" = tl."tex-ini-files"; deps."unicode-data" = tl."unicode-data"; - sha512.run = "cd3497755c0de21fdc3ac8641209f18493226f9000e9b9aebdef2e287e7343225495b3bfd54e7226b8fb45d69a77bed6a3534011da052bfadac96e4a8e0621b2"; - sha512.doc = "71e142cf280de0157df824f75c7b0b59bbba3436ae2ac2d74124372d46ae47a1b2a477ec10bed4f7e10f0a62587713fcd7504a87bf7deb3a7e6c216ec5c2c2f8"; - sha512.source = "0adf7a4a01a56f4e1755e1680d2dfbab4b900c93de5603d256c478333b6601ce08f58aab920b0c5aa1dce026f8493c5c4d1814106898c93a1ba46d3f8b906dc5"; + sha512.run = "f3c9bc21a559c81a4c8d41e15217d0c4364cd356a9c8c71a3bc603a38a20116e89f24cd91267422e76e5b386e989f9277f611d463083ece758e15fa4c2ce667a"; + sha512.doc = "03780b761451754e85186259b21e265bf1a7ef8c9ac9f2a3368042be635df130ad2a80929179b5c9b5a861861fcee154f1ed9712e9ac4dd7e44ec3f9c2405888"; + sha512.source = "11095a028b2d53692300e1beff7165c2fdc26657d102a92a9fa11da8d323485966c47c70cc8affeb9df3da76b3bbe40a600e38356d1659a3361982201ba4604a"; hasRunfiles = true; }; "platex-tools" = { - revision = 56451; + revision = 56661; stripPrefix = 0; - sha512.run = "826f3b18d6624afb6097d15b29b2fa48a8177c0bf81b5608b90cb6b0ee092181facc6814afa3b2659d9f4c30cf64a837fe54ba12f0e8b9b33a343bd5b94aa414"; - sha512.doc = "be1e37396366b32141bc5751906c707b1c40f83d6e4b8c27e1cae99cf738ab7f0ba57ef0c2e3b31b6367fe466e3d106dde9051e0c523408296edc76f15f53f30"; + sha512.run = "1821edb26aea01156fa0d3619837d27a72d61613dac0fff39d86cc48c04fbdbae5bb25cf22ac74875e7fd5de6cb5d900b655045fdb15970d66af25bea8372ccd"; + sha512.doc = "6fbf99e5b83b0f04c382a87d543ab187b14865a1ae3523bca86d28e586b932fbc35a823bd2d12d8bc3a268ed35b7005b939ae93ec0566d8f9bcec88420154de9"; hasRunfiles = true; }; "platexcheat" = { @@ -26075,12 +26341,12 @@ tl: { # no indentation version = "3.1"; }; "plautopatch" = { - revision = 56452; + revision = 57011; stripPrefix = 0; - sha512.run = "4720b0f0434438bffa80422973825d1d2677aadf158a9a6ddbbf92377bdad4005e37ad58202bc49f15739a4c8d8e3de5c60dc0318b236ceccd12fb0a8c10b2e9"; - sha512.doc = "652220d9bf383c58da2a94bfe9a8b202c2e0474a19ae882af4adc29bf2d827a1de228e765218dfa9c32485597e102d8bbe931954107cd1dbe81cd14553a5c2ff"; + sha512.run = "3751a0c14ef0101a114875887065e2e5c70e06f83415b08103fee2dd003c6039062e87786b737d831b574f512a607f670c5d4c54cfa22556c105260bda110391"; + sha512.doc = "f873db8451ec707ab7f94a31a4734e1636cfd4b68f16925fb4aa9c70261d8f367aeb46177bfcba292ce658086db0775bf52245ad8d153f68347b25f1fbeebfc2"; hasRunfiles = true; - version = "0.9j"; + version = "0.9m"; }; "play" = { revision = 15878; @@ -26112,6 +26378,15 @@ tl: { # no indentation hasRunfiles = true; version = "0.07a"; }; +"plimsoll" = { + revision = 56605; + stripPrefix = 0; + sha512.run = "c0b44cf022ca470767d296af1ad80b2d5ede92adb22635f7ef34b9fa81ec523f769dfbfa6a78005a46bd9a4886507fa7b3a4f761bcb8f686dbf736e3ad92676e"; + sha512.doc = "9ee880e89387986e228f357f59981b18fa8565d60e88d6f1b15c4109f9f7f20108c447fb995f0edaf64723ac37635b56cb5d097e93e0374a0f64adda4215eed5"; + sha512.source = "2967c9b53daaeba02405da837050a53c69b725da8daeba1d6a9c58dbef0387628aa6dceb07815c5bb0d2cc37c6a1b66f5c64037ad33d74e1179dc3fc0f0431a5"; + hasRunfiles = true; + version = "1"; +}; "plipsum" = { revision = 30353; stripPrefix = 0; @@ -26146,13 +26421,13 @@ tl: { # no indentation version = "3.0"; }; "pm-isomath" = { - revision = 55711; + revision = 56868; stripPrefix = 0; - sha512.run = "30d5661e06082d77e40123724ea390a76cb25d76a15c234dfb23cc5b79b357d86a4091484ddfb3109026a6677cea41f0f80dfe051bf34a6ef002ceeba4fd5c79"; - sha512.doc = "e8497850203dd2943990a7d744aff1ef88860836de5fceb6c994d89aa13aea93f586fef61649f6d257d101f2f54d6d442c07ad6d9f377aa695fba82bfaa27385"; - sha512.source = "16eae51b5991c2b59cfd889c5fd024134cc2e15358fc9892cb6d14cef047e1660820b26c7a957fa8fd63bdfac93a4f5c04dec6af27eb0d6b97626c8c4d8a900f"; + sha512.run = "095ed443c74eb0693331a6ca3c736f61ed5c34314e207cd379e26e523507f48c160671136b36dcbcb287bc1165da8223048e18261a4312ef07c129b79ad57ecf"; + sha512.doc = "7c5ee2ad9ee1cfcb8e6766de6a0aca29524dade913bd32e54fee1f5645934fb9840764b98542ed31bb94560f6589c5a074c2b3dadd59b7f20515fbc47c8ad981"; + sha512.source = "3f69521a43a3fe5821904adc9c15d7dcb993b1bc8f86c2ea7ff5729945b45af955c47a89e54b031b596d47fc83bf983b6eb18f15e5b1ef3a97786b2e5b80975d"; hasRunfiles = true; - version = "1.0.06"; + version = "1.0.07"; }; "pmboxdraw" = { revision = 53046; @@ -26262,7 +26537,7 @@ tl: { # no indentation version = "1.101"; }; "polyglossia" = { - revision = 56594; + revision = 57098; stripPrefix = 0; deps."etoolbox" = tl."etoolbox"; deps."filehook" = tl."filehook"; @@ -26270,11 +26545,11 @@ tl: { # no indentation deps."iftex" = tl."iftex"; deps."makecmds" = tl."makecmds"; deps."xkeyval" = tl."xkeyval"; - sha512.run = "e1b5bfa9db72d2109d1efcc5b8252b820df187377e04984fc8f537b018efc16b89f98f982031d431a81681cbba76e02e725452342578c766219af4c70e9eb3e7"; - sha512.doc = "b0087ddf99e1c8134ed9529f5b5fb511aaae51ffe5f84ec2252dc5e56276591fec9d460864039dd0520a28b37a89f4bad5625e056b10e435754e8b31e1f7de4d"; - sha512.source = "38f8e00dd65248f90cf63877b75ba664695911fc2209088bd035b18afe3e0f677b3c4bdc530260619c9796d0d6d04f2aa8f6903bb0ba7f6450521de851c82dca"; + sha512.run = "3dcecdaa957e21a3d66aeea9379548e6e51d5d72143a9d1160cfa2742d36f7d5d04d4e4afcc04ca12e84f2c71f328e528f16115418b25996a762e73bb463d975"; + sha512.doc = "e19e864c189fbf815b3a0c0b9b2ac03daa1da0d0bc6471ed2b82355b253c7ff5147ad65cfce53e2b52adc7931df5f99f59923f4f02704533c5dcdf1de90cff85"; + sha512.source = "b15e8404baad0e3be832919a1746379661b94677125319853c17ea0bb00090d136eaa5a32062be7889f13506b3b76d1d0371b906f05b32fdca9f96c738255fd1"; hasRunfiles = true; - version = "1.49"; + version = "1.51"; }; "polynom" = { revision = 44832; @@ -26386,6 +26661,15 @@ tl: { # no indentation hasRunfiles = true; version = "2.0.3"; }; +"prelim2e" = { + revision = 57000; + stripPrefix = 0; + sha512.run = "9f9fa79056db5be108c3b34b2ad61d964ba35fc1b6f7e9375c9e2ccbf66cd2028ef9e6689751c90c9ca236719ed1a001ae26753305fa3454bd88650cb12ae82c"; + sha512.doc = "196640bfbf73f3f269f5b27f024f4c1e677b61b6cc452d796f025196786c166f60bd2f41ad83ac6cc6b9eca56778a07b77af05fc68f05330f14c92cf391bbbc2"; + sha512.source = "1f2629a45183a026fe7bb3c83baa96ccf437846f902b5075fc210e47b6e3b99e81e5983bdcf617ba7bcdea60851154cb70bee3abe227420b5cc3c5a65e631973"; + hasRunfiles = true; + version = "2.00"; +}; "preprint" = { revision = 30447; stripPrefix = 0; @@ -26429,13 +26713,13 @@ tl: { # no indentation version = "3.0"; }; "preview" = { - revision = 52590; + revision = 56708; stripPrefix = 0; - sha512.run = "176ec9db33dd9d95583216b4003921842df3e2eb76ceef40abe3a6f39daac058fa9807ddd2f2b789d011b415473b88d15f60916828317d30b65c8ceeb5d45422"; - sha512.doc = "b6834905bc34836b33970933cb8a7b1a94a8d030e0da112a3092ea3ba3abe1fe1ec248aca3fd362eef653df5b05ebe7b2aa04338e721edcbd4358ae83b034566"; - sha512.source = "c4d3f247edc4235ae2a4fa6ac6d0a8cba2f6f6b56b650b3fdb9c8b585d9f7dc9549aed6b5f072c7a89a6baf31ff4f3a5ad08dada4ffc8dd6d0e748644fb087ba"; + sha512.run = "8a582c5e78e5a4ef28d3857e397d62579be41f4445a3b0ea1ea76b9080997e5eb23f2bb90197237101d03fccc8cd53c8a3263d19385dac4b63161a568528b017"; + sha512.doc = "d6edac136429cc1d0af86381812c798d72e15b0e33cc0dec643e86fc5a323df057bfe196293381f2d85644f6784cb97bd7a612828ce829d0d8baa57a51f00bce"; + sha512.source = "f9e6df7cc6c5649e103832477218237d4008e66707a229680448a05a058d5b9ee47775c96466068723a6cdba362a17420d3154d69535c7b3b65c1e752e6654e7"; hasRunfiles = true; - version = "12.2"; + version = "12.3"; }; "prftree" = { revision = 54080; @@ -26445,6 +26729,14 @@ tl: { # no indentation hasRunfiles = true; version = "1.6"; }; +"principia" = { + revision = 56773; + stripPrefix = 0; + sha512.run = "6b66ca93b0d8d0892df056608b2f3805e23cf0c503ffeab6cf30b0420250f8cae91a0dad06eba4bbd72fd524925d4f7ae926916c51715eb9dbb63b6c1534b154"; + sha512.doc = "cf3ba4c336b47274f13868a09805a339f9b343a93ca0830a110b8354e83d60ab83d794e880a3d9b65d053ea52bcf5d6021a65c3145c75a7e5f5dfb706d96e662"; + hasRunfiles = true; + version = "1.1"; +}; "printlen" = { revision = 19847; stripPrefix = 0; @@ -26718,12 +27010,12 @@ tl: { # no indentation version = "1.10"; }; "pst-3dplot" = { - revision = 56043; + revision = 56758; stripPrefix = 0; - sha512.run = "687b4c42fe942f7c873b840c2ddfc943ced0ad6f3bb5953a16b9eb23d90ec1680f346f98636460bf1fc4fef9bb3ef3b4b348cabdd809ae96e665c38d0486bbd7"; - sha512.doc = "9590cda23271fd116566f5a4431d94cf9dd6df32a8188dd5eb0829e986c2e1f549dd5b4719f4756de7eb581f8981322d4c9e940143c61d9c908be164315d7985"; + sha512.run = "6b12d6273f5025b4afbb1adac35e73f60a1ca6430b24c40c145af1a50e35150a34cc70ff14e9904caff34be6955146f358f4231785aa8b7ff662978a846857f2"; + sha512.doc = "615081d1b54074e8cff1dfc9eadee490526fa22673204fe8f37554474cf89688507989c8701e3633275558165fe91e6684624ebcb0c2b2983cb38c5a2d55d014"; hasRunfiles = true; - version = "2.05"; + version = "2.06"; }; "pst-abspos" = { revision = 15878; @@ -27230,12 +27522,12 @@ tl: { # no indentation version = "0.3b"; }; "pst-pdf" = { - revision = 52819; - sha512.run = "e262eb62c86631aeb04bd4268672fcdb7da5eb458d91cfaf78ed668e0afe585bada46bccd9eaaa7374e23d9efb79106ab7ffde1ff879993a7138475b8f8d6599"; - sha512.doc = "d16ca8328cdc79dc6c3488a68a537ace21d2f124604b69c79be6860d9913c8eac3d3093b9fcf03a17dbfe184a73c168a13d2e5a54056fe076e0e01941740f4a7"; - sha512.source = "67286e2f38bb3c88d48f0cde11494a64e0bc751d65b997ae50f4f50df980ad396b58e1eb37e544d050b52b691bc9fedaa0a15018d8d1836b22e3dff6253f942e"; + revision = 56622; + sha512.run = "5f5850f0e908bf6b10977bf616aa82ce05d1f0afd4127b5db14379a510ca62614a3552cc85ec0136805fb479201c817442872f9d1074fa6cc1367f41403476e1"; + sha512.doc = "eb5013040f3774e81d019c0010e8fb507d22cb2fb9c74e75f2c14aa0e4edd20245ddaaa3744fec7204c607b5f6329425f8f2b6e09bd153e6df6a3ae39d1e1625"; + sha512.source = "1c353ad8d3b62fd5e5bb8746f69f00b8df2c7b53dd558ec8b24d571b1fe84fdab02daa4d7193f67a258c7390d50f25cd5270578d742b085634980eefc744b09e"; hasRunfiles = true; - version = "1.2e"; + version = "1.2f"; }; "pst-pdgr" = { revision = 45875; @@ -27564,15 +27856,12 @@ tl: { # no indentation hasRunfiles = true; }; "ptex-fontmaps" = { - revision = 54473; - deps."arphic-ttf" = tl."arphic-ttf"; - deps."baekmuk" = tl."baekmuk"; - deps."haranoaji" = tl."haranoaji"; - sha512.run = "7e37ae074eaaea59387edb85169cc2cf8ed48b4cd1268d528b7cd2647d91a25b77a67f9ed2f8c91dc177c18ffeb237b92069071887e4b0065abab45cb22208ac"; - sha512.doc = "795c03ae0d6440f4bce215a1f116af73dcd1c4165fe0312235a5b6b9e63f78f9c8dc70a9672a9c74c4edb394202a760c02578e4b4b78f836b286f74d5bb171df"; - sha512.source = "42caef22cb254c1be2f0af0cfc7c416b58efa101c959a15ca1eca802869a1102e2d8d8a9800a0957285e3a338a4afbdc7bb95d37204340fb07966829b0fca04d"; + revision = 57239; + sha512.run = "168de4ff3435d1148bb718b15953dfa79172c6829e95824d998d9fff193c27f7677ae014ba54c507840b9b630dea12168f9a70d30a4cead922a461a52e63d8ab"; + sha512.doc = "42e7f0eeab1000b2c49d714c40405e008cc7b08648bdac1bac8f5459bc64eb3fd6fb526fabbbc2c7774a1b12abd37396e389e7c90351eba92a5aeef53ac3e558"; + sha512.source = "f7875a39315715c60069521903a103e5ab12ec52970ee00f3b95a498075d39e68d6f5b12373b4b31f6681a31561d740b584a65ba566d1db5ffadefdb620cf1da"; hasRunfiles = true; - version = "20200217.0"; + version = "20201227.0"; }; "ptex-fonts" = { revision = 46940; @@ -27582,10 +27871,10 @@ tl: { # no indentation hasRunfiles = true; }; "ptex-manual" = { - revision = 54450; + revision = 57128; stripPrefix = 0; - sha512.run = "8f79b2eaac03b1a2450389aa58aa9a893a8c73fb0f77d73b10878e2acfa9e822284bd42de0086aa7a19fe0faeab26e1907a20528e5dd0f5949a9310dcd58929d"; - sha512.doc = "004944f1c2959bf6a7ec264b8972e66eaa703c79916df24e83da7dfe945b96e5e7deedd22444308cab3e0731aa2a5cfdebc82f44f3e5ca947938eff3051fe78c"; + sha512.run = "ea2bc5648ea4dfee37b9df34ed786ff2fd400644defa7b2623435d4e448161b8bf45f07d5d2caf18bf280008d5e4253a4ad2f62dc88375500b635bab1c201491"; + sha512.doc = "162b7d40353fc0c892b257170cb5a335930936c776ff4b5bb91fa41d27a859d43bcedaa053aa5c2ca7d732993212c470670e1abfa4b1149c0867cdcb4b68011f"; }; "ptex2pdf" = { revision = 55219; @@ -27649,6 +27938,14 @@ tl: { # no indentation hasRunfiles = true; version = "1.1"; }; +"puyotikz" = { + revision = 57254; + stripPrefix = 0; + sha512.run = "635d17a49a905c99e895df3e777eed02f4c5e91a38d083e57890cd13c927bc68098d5f0864d6e32b2585d288091d15e5cc1303e04e26b2267d7e78a07f77ea0d"; + sha512.doc = "64750274694fa8c7fc792d6f5ba19ab756366eb87668469aa6da9df74f4f7bc571772cc6a406f7c3453f306f36516aca9c2444ce126ff4968d1cc49d2c4585db"; + hasRunfiles = true; + version = "1.0.1"; +}; "pwebmac" = { revision = 56383; stripPrefix = 0; @@ -27698,10 +27995,10 @@ tl: { # no indentation version = "1.0"; }; "pxjahyper" = { - revision = 56573; + revision = 56662; stripPrefix = 0; - sha512.run = "8e0d6170b7a581100aea33f1780a0449a5894b43ff12bb9bb1d3b6213b8a2a33c5dd7e74e2894ae6a58f7ca56008f4b9a7192775cc3518c0326a6b953b31260d"; - sha512.doc = "b251f5de00df4ec6f7b69023e6bb33ba35453e5c2b92acc969d59ee0d44e82b8e1845c2d1efce71b75d610d3463154fde2bd4b7a299bfa01c3af30b78e27682e"; + sha512.run = "21fe7aa128154a4e6086ca8e8a14f3130278517277c47a46beaaa0e2c6a53e691060ad00868fe4e38105c63688fb4e10a5fd1f920bd8fd4fb102a2215ec97d45"; + sha512.doc = "e39ffa2b648e3005dffb32d06db950ed72dd5a6b2cd75f63e57a58ede9bdaaf4adc5349027ca6e077a39b1e35f7679b199aaad7d22f19c8858876382764c8eac"; hasRunfiles = true; version = "0.6"; }; @@ -27755,11 +28052,11 @@ tl: { # no indentation version = "0.6"; }; "pygmentex" = { - revision = 34996; - sha512.run = "d6e6327d0bce32aafb4be5a30eae63ab0418506367a4a18305f2fa45156b27911bf2cb945289323839c82bfacd6d8d3a588a302bff1cfc29911cf7d761d83cc9"; - sha512.doc = "effc3db243edd25d4aecf7c2de6eeeaa18ff085f6304bc390ee0276c07d7672d17202d8832a012e9fedcf3bbd16771aaf78a4262366744f5a27266693fb0e87d"; + revision = 57190; + sha512.run = "6dc3ca792953c15b2777457b62a08c8d3b0275df8f8da9442590f61b64cc0640ddeebd7190375dfdb8d4bbc8582ed6da5ab7035bb0ff6617a27c2ddc0824d523"; + sha512.doc = "a4ef61d97ea11b6595ab94b68697091b88d4b1b83a150f7faf30863ef91e7d1681662410d7c45bad9426644b554fa078979d0a3b3c8baa11a6714d49b811f5d1"; hasRunfiles = true; - version = "0.8"; + version = "0.10"; }; "python" = { revision = 27064; @@ -27882,12 +28179,12 @@ tl: { # no indentation version = "0.9.6"; }; "quantumarticle" = { - revision = 54080; + revision = 56862; stripPrefix = 0; - sha512.run = "b51f05fef8e15ef25692066bbae15e4b73c44f4fa42cd5b4fbd274314f6ea0c0d490f0ce709834063998d156d64bcd22698e7da635dac1fb7ab09de0c42510b1"; - sha512.doc = "5157726c7805ede45bc89e974b46ea09447d6eed19a9ec818a43a7609e28df15aa031d64259d3df8fe347e1564d0896ed6ec434d3b77908ff14d23d7cf333832"; + sha512.run = "2d06c5ba42e81ff65171a37ad78e6bc8331bb4eb294056d6955bd1cc48e8c257c6eccf1055772147f6435094b934ea6792ea638c9eca58e94f3c1e387ecf3375"; + sha512.doc = "6de1d9d40a6055f5e7282b532c6f4078d749620fc720c9d23841f5a335bd7bf5d37017ee82fff8f91811b2ea32b8792936592de20c9e48001bbc942f673f09d7"; hasRunfiles = true; - version = "5.0"; + version = "5.1"; }; "quattrocento" = { revision = 56020; @@ -27913,13 +28210,13 @@ tl: { # no indentation version = "1.0"; }; "quotchap" = { - revision = 51591; + revision = 56926; stripPrefix = 0; - sha512.run = "df77f5d148beb1b70d0d2683c1be2a1b556ff1fdd90e109a29fb222b5eadb5008dcd1bee4e36cbeabf484fe90cfbc7bd07f87d40a70cc0675fe18b9019ed712c"; - sha512.doc = "b705fe959bdc23b5633f850831fe7b8a5261e55cc7cf71e75f4b626cd6a35201f0dbcbcdefe1994c5b4eeeb6d914cb07a5f335a165835b26a45d256772613403"; - sha512.source = "d1aceae7227bd9080cbbd015fd2e3954e12330bd33ae06a6b98c9c63717a30796034d8bfc5dc1cd30ad07b2e55425ab2cd71e9145100dff87d98a11b11a84ce3"; + sha512.run = "7d94162630e53133b79e33b60abb7c4664d3e486da611e37d48593757f39b0526831cedd0c236ce9b4d8ffc85b35734acadc98236435345180b999d7ea68c1f9"; + sha512.doc = "e2fa71ee21ad019ef785a3c74ddab5f232d3a6d1e9fcdcedb34c216eb5e6d44abbafcaae5d1c4557bc1e4aae92561a75ba2c3723707328a12cdb6ff4c1b72dbf"; + sha512.source = "eed36464f1b04852e8af08c5fd91c42ccccbbaeccad565e6f338ed5c87b003b2dd1704e1dad0ce0e49651461b637e8ed613399a0ae8122081e9084e47704665a"; hasRunfiles = true; - version = "1.2"; + version = "1.3"; }; "quoting" = { revision = 32818; @@ -27940,12 +28237,12 @@ tl: { # no indentation version = "1.0"; }; "quran" = { - revision = 55530; + revision = 56684; stripPrefix = 0; - sha512.run = "2537ed4fc565e4f6f1504901f5e470e928b0e0693712df79baf310886a133cba69990046d82e50f7af824e4e9b0c2c8abee8d8db41aaf0d36c3cf89b0b76ead9"; - sha512.doc = "0f64e7c7f3390f5b8e5dfc4d3babd93f88d26cb7371b73dc7e4849892039eff5946616c779d56bb56c873872306d424068f2cca26eef1e8584da6e3c99aa2683"; + sha512.run = "2fd7a6547c41da0d41514a83359ede8ff5668cba61b7f2a0d98daa26d12fdc795b01c0e3f8590af8698c20038b5adf1b26ec4bd206f164fdc7e1bec71627f6d4"; + sha512.doc = "6279cf0224a7d97fcce72a4ffdb63f40840ebbcd8fb5c18e4ea6d7d331fb875f8a5e6e96f2b913b08e2454c291d71aeb7c2acea7a809d6536379677c11d6feaa"; hasRunfiles = true; - version = "1.7a"; + version = "1.8"; }; "quran-de" = { revision = 54191; @@ -28132,6 +28429,15 @@ tl: { # no indentation hasRunfiles = true; version = "0.3d"; }; +"realtranspose" = { + revision = 56623; + stripPrefix = 0; + sha512.run = "413eb0a65d79521c81417afdb2d7f0ed8bc625d107d2fa19db84ae04a1f27f2da8f07fea27139dee411e1850d8646d63412eb581b08a9c4dd69c886457027cd1"; + sha512.doc = "a2382dcfa84f3a2773ef6cfdd5a10bf23cd541927e2844419d75be6206ff5b42f37243ab2157ed5765c0f9c090340b6b75b35271157daa3440ee9d81ecdff9b7"; + sha512.source = "5fd124830f8e5e29cc9b1a2ef967a21c2065d183bb8ae1560b95e66b09d1248b8bb6a65e6321651c23d309c2508c05629c2b7740e8c57e4130d2f06b99347097"; + hasRunfiles = true; + version = "1.1"; +}; "rec-thy" = { revision = 55427; stripPrefix = 0; @@ -28267,13 +28573,13 @@ tl: { # no indentation version = "1.0h"; }; "reledmac" = { - revision = 56423; + revision = 57182; stripPrefix = 0; - sha512.run = "d3060776c444f292580157d7c4eabe9727624b38abc52b5fdb90b4fab8d7cfc48b508302aeff8ef5b1f7224613898839a80e5ce47fa02be889214e30114f64e1"; - sha512.doc = "91bc61458e584e0c2020d435c91c79e3d2cda8f357bc9d335a6054b59a0f7b14c4a989cf9086cd19d4c539e66d48a3918ae2d29688044627a66e56d6b7b86a5f"; - sha512.source = "fa5fb2fce8b6a648c2931bdd5ab998e29d5f654a7306d2ae2d32e303f85e1b8005c32bd88ba4735d95f1d9a91b144f39e087415334056877dbaa8ffbbe36ccbe"; + sha512.run = "ef0d0e5e36768e71b31dff43f5c67666946901e5420c9b94776526262793cccb8f890f17693c6a96a90fa697c738e0e6f0d19cee6e9126d1509536311d4b2084"; + sha512.doc = "90c66da0d277201d6955868ed39a16d4810a3f77062a7c7cff369a3d2529e4a9d09c24a4857d1fbdb8ce62cbd51c49cde2d6af474fe6cd072847213400aec98b"; + sha512.source = "2cbd05c957456c916799ec6a3a25b197ca42f8b0291f9128ca38ea3c9eb0d5399af3140c8d8352cc033117c63f8b468db025ec214b956c05917887902dd6debb"; hasRunfiles = true; - version = "2.34.5"; + version = "2.35.1"; }; "relenc" = { revision = 22050; @@ -28345,13 +28651,13 @@ tl: { # no indentation version = "1.35"; }; "rest-api" = { - revision = 55643; + revision = 57068; stripPrefix = 0; - sha512.run = "800bba664ba22f42e7a2152064809af8caf45316b4b6e22b6f4aa40a8dedc6f70c636bfde52e5ac7979ae122d1e1561903f06d2cb3da2b42caf0e8e09c278304"; - sha512.doc = "4514cc0fb0af136783257d4587b29112a38fd07a5c33f461ca9d0ef8f9fb6a10eff189c02eed5c8f7ed2de49c8b2d25a47628687125217677271a80db272b0e7"; - sha512.source = "167bcb6de80f699afc12ed6a0616edb63e0d063f875f9ecfff1942ee7fa3141c3a740c3cbae14bed1234c7247b488e999fa41acc77d3d9bb2da11de4de1c5be1"; + sha512.run = "a5a8f299d6feaaf4079e4a99fb84bdf7752016c92aaca0d0060692c13a7656c230e611e06bdb805712e7427d2e6cb599b96bee77e0c51ed769c4bc49cec32f1d"; + sha512.doc = "b823828c122f971101a161168cfbd489985c159278de80db86647b0c0adff207747b6877795ca97b27f541c7907aff90213feee61d4b039dffbb8b7514923e54"; + sha512.source = "2869854fc933ed536ef425d8418303e3558ed8e0b3681c2d7042e1386b0069dcf70286ee732e0f8ace19cf6965e3bb046caa0384ce1423e1c71d9591012e5a10"; hasRunfiles = true; - version = "1.3"; + version = "1.4"; }; "resumecls" = { revision = 54815; @@ -28453,13 +28759,13 @@ tl: { # no indentation hasRunfiles = true; }; "rmathbr" = { - revision = 40415; + revision = 57173; stripPrefix = 0; - sha512.run = "71ad547496a4159f2ac609bd695bd3a38879dad118cc18bc58d8fc4c5a8da3d77abc609a0638584495dbb77bdf2078a30ac82f2534bfdf5b620d056b20aa7a8b"; - sha512.doc = "ab1b89d94e5fe92023ccfad1264aa38dac9be485d2717b4afb82a441e6bd8eb5813892c20c33a65741f62e6a8c4bbd3e3c778fe86f7d0da72080d51476f49a38"; - sha512.source = "255ef1cae8a42e34e11e1cc4b8599afe1f166208bef00372d89ab34baa55d3fcba298e01bc2d639568135c66e77e7fe62e558a6e3ba38485dde387ad76e0da4c"; + sha512.run = "d1394e40203bc7a0adffd26587870ad4aca0faaff6226047cedd5ece5e55e6a99e56829a38ce40b6736c1f9a03b9bc4b337a0e4f9eadf0617ddc385a60372176"; + sha512.doc = "e7c8d4f198399ac35e51a0d1c2c6ec420c746768de362a8179c0208325a45b11a8ba6445c2b7a433e7689e677505e3baa4b87d48a749bea5f3243d10f43deb83"; + sha512.source = "44e4859933c2a5f664feb1bd40ce1e51da845fed56b8594d3fcbbc814654c80b18d20760db3c2690fbfa74233523e4e8492471415154942cd2666cc52837a98f"; hasRunfiles = true; - version = "1.0.3"; + version = "1.1.1"; }; "rmpage" = { revision = 54080; @@ -28499,6 +28805,14 @@ tl: { # no indentation sha512.source = "d89d02dd79142344334678f2d8ec4f34eb825532e8be9260cd08a43b28e1aa94ff5655c1c1eadb2f9a365e51693f6195a4851e1420072c867d8b2c0f1cbcbbb4"; hasRunfiles = true; }; +"rojud" = { + revision = 56895; + stripPrefix = 0; + sha512.run = "cd7065dc6a916941a0fd05ea342d29499b6f7496d1934e06c49e7ea1a99c5be5cd515bbcbc2b5935ff8132adcc7b94e653d55de967700410ace55697f6fc156e"; + sha512.doc = "fb9c9f00433ba959ad8f7b5acc93b1e7b0db1cffec96b7c988eeaaae89ceecc815071a1e21f78d36279e529f4e9095602b1887d3c5d4164494be502cf4a19873"; + hasRunfiles = true; + version = "1.2"; +}; "romanbar" = { revision = 25005; stripPrefix = 0; @@ -28918,13 +29232,13 @@ tl: { # no indentation version = "1.5"; }; "schemata" = { - revision = 54326; + revision = 57057; stripPrefix = 0; - sha512.run = "a2a5d5d4665d0ab72a57f868acc5f212650268682458caa4c82e1be01456596bc5b9e876565b6ea35b47e7fa521be8ef42db68897925648a0c28d5cef3a63eb6"; - sha512.doc = "cb4c1d4c2cc64056058cf4da0fb0af81cb93971486c1fb573c0f1a00df46f7ec1426669c2860d312772f3a1fa4701ad95453e8281194955413a2edd038ce999e"; - sha512.source = "72b4edc889166c8770867c45454eb738c239f34d67a29de28517843882011c1e885c3ab201d00bc485c85e8705577340ee5c71853b9c2c2449f04e0537c24d6e"; + sha512.run = "9338ce1959b058e03fad1ce16dc5aef04587d047a515d785fa3fda528d90f366e367d0e6e1be8badf283d968a9e5c9c9bdf2195417011508d338f149688157f6"; + sha512.doc = "21cea587af8a4267ee31a4c2542d52513f463e2d396911da33e92aa94f36db01cfa1e168accb3bbc6fe6c54b7c15ae3fe611c05cc4e9db1284914305e2eb0596"; + sha512.source = "f9b17fe6450ec13e8e585efcaae03a5e20f47ce61fb52bf847d3fa2eab19417986ff205df9986cf8926f215a8d9b41be8171bf6e45ec6c7b93c0fe08ad072549"; hasRunfiles = true; - version = "1.1"; + version = "1.3"; }; "scheme-basic" = { revision = 54191; @@ -29202,12 +29516,12 @@ tl: { # no indentation sha512.run = "44bc102582ef5f6e0499efde6d3190b86988def41aa062a6239075b9371f6c9deef91e4f2bb299b3cc831dbcee9289fafd4c1c6d2a55a747d340fb580ae918e3"; }; "scholax" = { - revision = 55400; + revision = 57178; stripPrefix = 0; - sha512.run = "0023d97820f5bb525411525bdb2b07ed77ebb4fcce63a658768bd23a82c9ab06afa823f86127f742ed1789f6231bc4bd4abf1dd6142c92e147230e2ccd19ad8e"; - sha512.doc = "6c9d902af034e6e7dd82c9db64e5c74a3d696d75b87581e00e8b94cd21bb72b4ca701c07e1d45ac677db631b0aa4a9a7f9a5b163d985bb2e1ccc8723994c270e"; + sha512.run = "7b515c99016c587f6929077d10efeca0e46555b79dce5790d61905e1ab7f76b1cda7d1122d8d25557f5a03a98fd70c2615dee2f25fb182d786875e267fd913e4"; + sha512.doc = "da152b0ef3367b2d150601e5c8f9912b4a10ade27bea004500bf9a5f8652785029c79956a3f616bacb2d9908f5223d19bfc82dfb56c95b40bd3d7f71958473be"; hasRunfiles = true; - version = "1.026"; + version = "1.029"; }; "schooldocs" = { revision = 55838; @@ -29219,12 +29533,12 @@ tl: { # no indentation version = "1.0"; }; "schule" = { - revision = 48471; + revision = 56683; stripPrefix = 0; - sha512.run = "8f59d31e7bebb741a7c23c2559f0e90979df2d7ed1482d3dc09a1f5fd95ba7ee358e3acfd5bcfe0a708d36cecd4e36b226db4addcb007168789311758a444bc9"; - sha512.doc = "dbc4cb7922524e2a73c56861ebac5487b508016107bc7c2a104d93edafa816f27f84a142bd0d228aed008f85ba7aab53b694771a001657ac068db169b87b72b1"; + sha512.run = "7125beaddb825fca0c9ff686ab97fbe7cb3744b74bde693107e26fc2797ac9bd29146683174ac6d7703370cf7f5f09809165b2f371c56a8b27ae0de8980ab467"; + sha512.doc = "11aa5b1eb25301e61f2438f4607cfba35721dcbb0904ce3fdb923f69f71b1f1e1ebc3a50706b09e306e2b9197194a3c6ebb12a1fa7dc27b94686df11be3501c2"; hasRunfiles = true; - version = "0.8.1"; + version = "0.8.2"; }; "schulmathematik" = { revision = 53815; @@ -29337,12 +29651,12 @@ tl: { # no indentation version = "0.1"; }; "scrlttr2copy" = { - revision = 39734; + revision = 56733; stripPrefix = 0; - sha512.run = "7aa7ac841d667e627056ed0ef3e55368f580e9d8a35a35239780b12d0a18534086844009ba1dc40a1b6ef29ad64d06e1e2e8ffef216e89c15e684975acd87192"; - sha512.doc = "08e87246b20cc0ea9ed30cd74993aa2af520d8b01878e1f54c802b5beef4347c087ec36f32220581eefe933a524c813ec30b3235989453ff8b7be93ac35b725d"; + sha512.run = "5b2f1c1c86a8b3df5bb4d5edfc002ff80449d2cdcf6ec7aea3732d0ba8e6bcaa105675f9f37dd5280d3b9061400d8edc0c67460ac9f1541159484aa51b851fc2"; + sha512.doc = "04728375909e27e0814f9c2dee14697711ceba7b132ee6de63f257e2a6c3eff11a8e808d7929bbd0c9346b459afec57dd62d523314381c0c19a5e2b8b3650f20"; hasRunfiles = true; - version = "0.1d"; + version = "0.3a"; }; "scsnowman" = { revision = 54080; @@ -29466,13 +29780,13 @@ tl: { # no indentation version = "0.302"; }; "semantex" = { - revision = 56585; + revision = 56863; stripPrefix = 0; deps."semtex" = tl."semtex"; - sha512.run = "480b165a88b0917e6d87e0471438ebed20788d53abb1f52dea80d3d3c0b0e05a3bb78990e9a66afd076a27fb3ec0524a070ed4ee3ace27b5658f9823637f4e07"; - sha512.doc = "261eec5a77ad195c8af13be9ba8bee89df307b1f4e03c05be5d7ad6262db083713bcb2e6fbde298e95e0099653212cc2789723ac0d7f51f8c9ac25e85e33b974"; + sha512.run = "d09b5dc2e6b8031c03b59254b442a8c5502cacd2d24c91f47ae6243cf5908062e79ab0e7a521c2208848ae7f9acb147716cd8a399b362a91a5cfdec87e213814"; + sha512.doc = "829286b336f1d05afa9561d3937fa526b6062b03950b3f350fb4fc586f45fa253d93939b6432685a08c967eb85c053d07c6fe3e08126869ef63fb43bd0acd992"; hasRunfiles = true; - version = "0.461"; + version = "0.463"; }; "semantic" = { revision = 15878; @@ -29497,6 +29811,15 @@ tl: { # no indentation sha512.doc = "ef0c85ca5e86a17d59c03255d679d54cc8fb36eec02c8546f29e1c514408559788d1dbe3ac7565224b320b71e9ad77979b1092fb0f098a1c48c3a7093b72b172"; hasRunfiles = true; }; +"semesterplanner" = { + revision = 56841; + stripPrefix = 0; + sha512.run = "26c7b18796dee2f703f22ace3aae21b38f98d9250b1896a3cfe5214b42551ae3fe4accd9e8bf905109c05169370317608e23363f4bb512e794cfaa528b645119"; + sha512.doc = "32c29aad8acf63e60f07262930f267a295daf9498621c48f0b9697fe31e4dffc63c8992b5c5f60b1d61188de893421906aa3abf160a79c6dd5429eca87c03fb1"; + sha512.source = "709556569a5defa5240781ac1bcac0af6e9cacc0016d6ff057a4414a67c69cf8d11a17c716748dfdc81fc31c2bdee230c9c4adb7c4978ccba20b7330db47ea81"; + hasRunfiles = true; + version = "1.0"; +}; "seminar" = { revision = 34011; stripPrefix = 0; @@ -29916,12 +30239,12 @@ tl: { # no indentation hasRunfiles = true; }; "simplebnf" = { - revision = 53370; + revision = 56761; stripPrefix = 0; - sha512.run = "452c83082541e5e1c41687f9a6191f5bc86241454c34f3dd775671019a3e5ddcc22f7c6b2203f7b07aa549a5a84b2047af89ecad9a4ce43075d89fb490653acd"; - sha512.doc = "8e47242ee6423bdf2c2222a10f4197a615e59bd6514a14b1d3c657b9669dcf2be312c334f8b98459d9953ff36d3584b0b47c25c82e2c23979a738f9aa9ba82e9"; + sha512.run = "f306851371767da793a60cb604776aa7f537401a3dcbdca899b347d090baee3d3e6d28550f8d95a287e722a92550137f9241d2c207d955b47fe0b392a44b5ed8"; + sha512.doc = "cd4c3786d953669b53e9a3b5f6e13591ed67efcfbda7eac37f3e7c3709a8b6599f3e9f363e91658019fc03b91c4ed190ed40c81cc9e935bee697a77b51f4238a"; hasRunfiles = true; - version = "0.1.0"; + version = "0.2.0"; }; "simplecd" = { revision = 29260; @@ -30040,13 +30363,21 @@ tl: { # no indentation version = "0.52"; }; "skdoc" = { - revision = 56183; + revision = 56950; stripPrefix = 0; - sha512.run = "1f5d5a78e50ecbd21aa462659dc259403d877fe1f09eff6f0c81515adc091f20e562b572b30a207c8efa701881ba4a4736c532003a01d2578f9ae35636eb9833"; - sha512.doc = "785463688da548e082422a70223758d9ef80d51de5d1c862c3ae4e8f482843acfa7ae9d9ae5652668f3f732f64ed83bb46f03ef0f958c8b390f9c389deb9cdc8"; - sha512.source = "ba52139b687fde6cf94eb09e9f53b70982767642073511d9095ade3d7b1b4e1cc82e1de7c2e1ea05cda4935eecf8e5f6e0797077ca1cdfe646d56992ba1c0cad"; + sha512.run = "d00944f58e9842c0d1841b73fb1936dc14655f07d51c60140581d597a93a0e9ce9fe65941cc343979e549620edec6a8339cca6089df068d932e1344556c3449c"; + sha512.doc = "481e590c14396f3318999524157f8e5a8dafd0b6f553414d3ee09cb0dec6d356c2b422b6598b613ec4d29b35f27a59024dc9e5bcb49ea2643205f37c616788d6"; + sha512.source = "70343ccef329a3dce81aca0c0253b42450e7eae4560b58d69d9f12d7ef32d25023d5f09208f22f7d65414a089d2992c28079dfb708ab701803cb42fe41480691"; hasRunfiles = true; - version = "1.5c"; + version = "1.5d"; +}; +"skeldoc" = { + revision = 57315; + stripPrefix = 0; + sha512.run = "45f922b11e2bc7eda71173fd41514da5742477d47a2ab1baeebdb7f1ef936e3c5216a70fd4fd390dab9ca94f6e27d343da735f3848455f0e54aef3e3b2d69857"; + sha512.doc = "c2728c436730877fa0b191d89805e42b544ef94eb0261f551022189fe2b9befc03dcc863295ba9f27a202ad901c9e607db839113df49b4d190f5cf55a890e943"; + hasRunfiles = true; + version = "0.1.1"; }; "skeycommand" = { revision = 24652; @@ -30064,6 +30395,14 @@ tl: { # no indentation hasRunfiles = true; version = "1.3"; }; +"skills" = { + revision = 56734; + stripPrefix = 0; + sha512.run = "0719d385343a79a261409a07d659c0fba4f861e69b082278b1442a12408bc3601de789575fdf566ce280a2699dc10b28aada80d490396498fa9a6bbc8d064eb9"; + sha512.doc = "9b2339a50fbc759d9e5bc907a4d8dca2f06293d5a5f38602213a859dfc34da1715105b2b5a46e82a23f71b741e4db713b0044f345767a1f87c32526b57fb0103"; + hasRunfiles = true; + version = "1.0.0"; +}; "skmath" = { revision = 52411; stripPrefix = 0; @@ -30140,21 +30479,21 @@ tl: { # no indentation version = "1.2"; }; "snapshot" = { - revision = 55064; + revision = 56735; stripPrefix = 0; - sha512.run = "ca5986d7b5a2a69693d6796d1b10ff767814a9405465beb09bf2954800b7b01adabb8944e623cb028372d64462099af345cbba3471005fe35ea6e542f0952596"; - sha512.doc = "a7c5ba3f2acbfd07cc2eff958ccf0788b0f87654ae102fccd1ec908c2b0b72eb2a90158704f5cecf1e8921c97f5d3f8b97f75328aaeec5d15b480fde6861c13c"; - sha512.source = "04e6a3c06250c4fa70f3dab1f740338e164467f3ca9d3f094a4b281487bf8df3141704d6f9ffa32f22fc8913068bad11f3b98fbd3d50b13fd6ac403c0d362d13"; + sha512.run = "2b9bba924070f81319758c4b8a8e85533ff5099e901598248d5a645aba249e7158587e7d90072d3e8fa4d544d09f800b94aa415117683a8bb8c6d7ff642c313d"; + sha512.doc = "b1dda7b3fa9195e5d0e425a4b7facc75f8737446b65b29cd5f3c954dad348055c8544968b3c68f9b2256e8d827ae73b54b765d23b958abc383bef072d9eacfe7"; + sha512.source = "ae57330c3c69e82c638e07ca7d2d011838a85ae79f3f16fcb8909076f375da51f2b1d3487aadf55cf93306c035099397fa826a7bd9654e6756cde66d2138b15b"; hasRunfiles = true; - version = "2.13"; + version = "2.14"; }; "snotez" = { - revision = 30355; + revision = 57147; stripPrefix = 0; - sha512.run = "e1e6ecfd64a317745fba39643c70ef5a71719e3c4ed3644569ab7a4a549a44eb58d1fd1d77608fd455282124d0e7372a364f95f7b67de192b1cfca1a9644086a"; - sha512.doc = "6ab47280669285be6cd72e2027b939ab2c2e2df7c910b5775dcf02b570ba558a3c89832a45d65cf1a8a649dad67606a2d2fe3d4e477de67098dce497f0c2beec"; + sha512.run = "f55e6af23e02c4a56827b405cefff308087be9a78c1c171b4d8a20d9669cff44d43cb60f522694708b39b8b010576ab0ea6ad2d2355f5b9113ba9e19ef913a87"; + sha512.doc = "b68442cfbe57907bf3bd1843cfd4006fc3fd0947d5ff06c18afa50d206f4f2890f7e804f55bb9a3c4f16677deca81f3fc41c75bcc5fa4d55e4aec23a644a86ec"; hasRunfiles = true; - version = "0.3"; + version = "0.5a"; }; "songbook" = { revision = 18136; @@ -30251,13 +30590,13 @@ tl: { # no indentation version = "1.4"; }; "spacingtricks" = { - revision = 52063; + revision = 56840; stripPrefix = 0; - sha512.run = "6dddc3f6b839c16902a590184955cb1f220fc5d1d2c2accaf4bebb70ceba0f446ffb5cee8c8649261d22df79e556016361550570b04f22c3d61644db2d188034"; - sha512.doc = "bd416ed7ba7dd3023be779ce3d67d1534fbcecf49c36c5b97ab29006f182e77f2882b0c0646da559b6132a40d97723414912bdb920804c5c1bf40facdb0a8c52"; - sha512.source = "5ab93bfc21fc3bd52cd5721c4c7160ed200f39bd8546a6ad84779a1af0d09b3cde0202dbe1230e2f16918ea43708109dc556f363ced43c7b0072671d8d494197"; + sha512.run = "9cb9ef080cb14f9a4c7004221cdf8f3d5b90a74ba90a37960b6efa3a33aed501a68e2d8ae23d3262e8fb17816e4565e26722b78e1caa14b7455199e52d8fd3cd"; + sha512.doc = "d5ab0e38687f00099830015bc469060e6e7a96ef5a199b0352e4a6ce82d50ff6df0b04de20bd683a03d9980a3c45c63905043177fd8ca9cf1f009e978d5dc12f"; + sha512.source = "dcdc75265a9cf0131cf90beae018f35a54fdd201a641368c5380f82258e7c1bb5a680d1b104146c886df56f148921db0ca304063b2cc9532b0aa32b3288812c7"; hasRunfiles = true; - version = "1.2"; + version = "1.3"; }; "spalign" = { revision = 42225; @@ -30293,10 +30632,10 @@ tl: { # no indentation version = "1.2"; }; "spectral" = { - revision = 56153; + revision = 57296; stripPrefix = 0; - sha512.run = "e6cb5c7284b42a1ae9b3b2cccffcbae0ce5ce395dbbbb1584e271181d78836c933f470a8b86543acd290c3085a9fe01e4090d66f4eff52b4e1be4d3adbb93395"; - sha512.doc = "414d277326ae8526820e4a21e387034f093632960982f655729919f9df6a06beece7eb3fc95ca91c6a86f724d9d481b91b76eb4a12891f28d3bde405f9f3650b"; + sha512.run = "46f6aba88425deb74e921ceafa578e9e8c467a5f9ada72b1372f6e70957946adb56bb05700a839249b2387472f4059a2dfbf4b83cb9979a4936442dac5c9258c"; + sha512.doc = "6166a19151b57d2fe23833a5583b838fff6af01d96c1056bd79532af45efa8cb58f75d9c2993c7512f69fc7716d746d16de8bc5b2143cb07790cd19997bba5bc"; hasRunfiles = true; }; "spectralsequences" = { @@ -30521,6 +30860,12 @@ tl: { # no indentation hasRunfiles = true; version = "1.04"; }; +"startlatex2e" = { + revision = 56809; + stripPrefix = 0; + sha512.run = "e8946fbe61c9c52a3fe5cc7b6b4adfdd8a90312fc146f331f0dff774e819ed1a789ad047c2587816b7b8568f4a520b2c0600a4b39ff3586254bfb6f15db28b79"; + sha512.doc = "767c9defb727f206c8e2090a1501e8435bf77859b6546690c7a8d1cb6481ae4c576346449fe760423eaf126858e521b020404cbe84ab2f02c95f07e1af8f93c5"; +}; "statex" = { revision = 20306; stripPrefix = 0; @@ -30618,12 +30963,20 @@ tl: { # no indentation version = "11a"; }; "step" = { - revision = 53731; + revision = 57307; stripPrefix = 0; - sha512.run = "dab392c9d8182e0d06605b82f123223d6bc811291f0b6ee2c35b75a21f868a5e249a330a2c0876dd1e4fa6395e11000d0f6db687aa85e1eaf1058e933fa72160"; - sha512.doc = "2f862061aa868cb2a74766270b42685f5625adfe42c46c6fb83d7d0efe5bccca2843275e9b68d11610174de193f0f754d976d64c11ee27fab0d128e63b0aa964"; + sha512.run = "d1f19415ceeefb879a3b4017fa286e5e5806e193fc75159b515fe21a9a6093c6a95d04e2e2e3c7ee457edb8ad717b88043c58727fb3924cb192e05aec12c5c07"; + sha512.doc = "bbf49f36bf7588c83e237d58d49ff7453c368cbe7e3a32c431944a2249c0dd75c2c1081d10bc2279e0836384602268ad163ffa3eb7108cd28a6c510a18f001c5"; hasRunfiles = true; - version = "2.0.3"; + version = "2.0.5"; +}; +"stepgreek" = { + revision = 57074; + stripPrefix = 0; + sha512.run = "c322bb089a887b36c4008502160f0970ff2ca33f05391010adc38c12726b2079085bb1775934597fa1758effee14eda76647b886644971e7c40a451154e446f9"; + sha512.doc = "c3f4c2b1ea06a012ba4d5f5ca72faa0a6c1b4ae5c132b17bda0b6bb895f34e555724f93cd791fad8c6ff846027dbedd723f874ae1e772de95c64bf54f5fa0265"; + hasRunfiles = true; + version = "3.0b1"; }; "stex" = { revision = 50489; @@ -30634,12 +30987,12 @@ tl: { # no indentation hasRunfiles = true; }; "stickstoo" = { - revision = 54512; + revision = 57193; stripPrefix = 0; - sha512.run = "f4539fa4c7cef2b69a595bc202e7e49294473556538e9258c27502217e397cdf6eb0395a7afd70ef70e9c784a46b324ae4952b1d14ada4a3116b72e594756af4"; - sha512.doc = "098345e6d2fca73d375bf0a170309bc32a611863728b13ef717d99e08368cbd16d173564e28bd5aaa9057301aed1207cd5388a8db1b69fae737fd8c361337faa"; + sha512.run = "5da4a3d412ee4c015e0f15939edf71bd8dd16f218ca3d8d236cb071554af2dac9fb4e71de4b18626578134e94262582dfb62071c1cc4af5ef2fb6111b6430d92"; + sha512.doc = "0a36ffbe112993a90054e3ba413725abb4259e10a3f439eff694c05ce8b99592e7d1001fda13cf49d1ce0e89f388e1726962b58e74e13eea4b918ee85303b24a"; hasRunfiles = true; - version = "1.033"; + version = "1.034"; }; "stix" = { revision = 54512; @@ -30710,13 +31063,13 @@ tl: { # no indentation version = "1.12"; }; "stringstrings" = { - revision = 36203; + revision = 57097; stripPrefix = 0; - sha512.run = "8ed9dc3bbc869f06126280a4dfab23da73b57a9c5c1058dd9764e2bece26840ad37637d4e83aa84e6d9a17d92095803788697b8d325bca7fd57c7135ade7cbf1"; - sha512.doc = "fd794606d8eb3a9ab27957268aae1b35b89c1bfc1b3d5602290797a6eda8551e14471d35fd85cc6d0561a1e74523a36450c958a0cf5881d42742eabf085bc794"; - sha512.source = "79d8d86c7c3695b8d821bd1bf5400b5195c753877f8aa6c24094acc87d91ba8b58b086b760e87acc6e1d4b7e3898c7530f40567f626cb3b002ee7064c636359a"; + sha512.run = "fbc29bbf65e7d4a1fd367b03490f73bf44349427f6c1a7e826135ee9092c9b592a4cf23454919e0bcc74dc59d3a6ad072dea16096e4850780ff295dc3caacc48"; + sha512.doc = "1779de4af914b69ab258bc1f69a807c12f750e5919936c78ace4496f86200bfc4c3146dffbb27ac5977c2e8d41ec8d0139cf2a2560ba7c627dacd70b34cc69ea"; + sha512.source = "94cf26d431d3638f769166c999e3dff156bd37e02a7099129f1259b7259be95896b694a64fea657aefce22f3a1e98ec2bbbf0f6f85171ccf977068ddafbb8078"; hasRunfiles = true; - version = "1.23"; + version = "1.24"; }; "structmech" = { revision = 47859; @@ -30735,13 +31088,13 @@ tl: { # no indentation version = "2.3c-0-g7d3fc5b"; }; "sttools" = { - revision = 43684; + revision = 56774; stripPrefix = 0; - sha512.run = "acc5c6b470d1e5fd96eaebf3792b3c2402a8fe4a07409328878313cfbaa1e0febc758ae75c6d736e9320f6a332c67f7d6898c761b9c5e30f6658e9049df889b3"; - sha512.doc = "15292806d0f8f4a0364076fa225b7d914a4ae88935e08f87a46978f5a561405f6fe4dc2d471c974c85b369e57bcdc00a5a4759d66d296610713d858dcdd4da34"; - sha512.source = "b22286c3e7b1bc31247fd52e0c64a5f3dddf35e69c2af8e2a617530a24f82e9504f9f0db82d3cd1c57bae61aba526d941636aa32f498ccb3b06983e6e5f511fe"; + sha512.run = "d9707fc22ad26d291288debdb2d9bb492175dade76ed398c3c0ffd1d4ba256d8c691bc2fb9d537ff01af4de7bf1352d4b1f62cc6c54afa8c02eea8b69185382b"; + sha512.doc = "b32bd4fa10599b3ace5bc8e1b2dae79750aace26a98806de275fdd358554b6f26fde48c9e7b0fbb108de0a771728a68f6c09fa9c568a5e2fce7b9aaa1fb1f58f"; + sha512.source = "56a096fbc8f28a0ea2f1ef31ebf277204319eaf6fb9bfcbd5449d24b2689a111f192ee1c723adcf8800c9ca2069c934cde8d0bdefae473e6eced2b043b7fd8d8"; hasRunfiles = true; - version = "2.0"; + version = "2.1"; }; "stubs" = { revision = 19440; @@ -30835,13 +31188,14 @@ tl: { # no indentation version = "2.1.5"; }; "subfiles" = { - revision = 56291; + revision = 56977; stripPrefix = 0; - sha512.run = "97d7baa174b71b76161f5df79844d6fb76f03bd108c6152146c0257c6a6a019608bc35ac95393fe034ac15198cc52925f294b2a417501179a0e3e59a01346070"; - sha512.doc = "d18ad89705a0dd1c6c8ab3c7e4c2755f1f3d447811da53e0b0894083cd9b422b1c78f030ad56a678d9553231082f86c14ce6ce9ee8f83bc256b05fe144fffa5b"; - sha512.source = "76cbafa28b75979dfab0f00d31d3c7ffeb17240cf60cd465457d97da70f4a98fc600bea04cf01642593ef1a7c843262aed9f45331971f04a58dac3891f0c44f4"; + deps."import" = tl."import"; + sha512.run = "8f842b0debcae3110f0a4b2f59047cd55c2726d128bf3e159f2745a4b8a645c3f8471fe218ca34c32f2b35d42d1c5023a25f09fc3bf0c1a4f0c33197776b1cec"; + sha512.doc = "f54f52c5cee01b7ae8e01bff5a4d828b5c6708c31f2cf40d7e83c8a91c4c597945695dd7062b6088d3f91f7a9858e3227c850d658ae7a7bf94392e00e3eaf9c7"; + sha512.source = "2623a0ec244722c1e3194d9ff1237305c1b7bf8c3baf6f60edd69b165bbd5ea83fb73ad23bf9aac1937b4ecf1059754e798eb2c97f7bab5d550fabbe84b752c0"; hasRunfiles = true; - version = "2.0"; + version = "2.2"; }; "subfloat" = { revision = 29349; @@ -30911,13 +31265,13 @@ tl: { # no indentation version = "1.0a"; }; "suftesi" = { - revision = 55669; + revision = 57196; stripPrefix = 0; - sha512.run = "50fe43276eb3d2af661bd552d7e3cfb76552337a298040c0f2024f767a8b81793dc6f5abb41a997674987ac9f6573dec517b03f1a2d0065a4953c98a25bf4a07"; - sha512.doc = "f6e398837eab6df3612577bc59b56f2eb18a4298d121f34c716aaa3e338fdf690ddc74b9e9f91671953e3680b31fc0842cfc007785413fad33974c7a23c69fd8"; - sha512.source = "601f33a2b8d66f9300d8d7d49b66d39cc1996f4298ff7b3bfa9292744808dd730e4a3b802c233becf8469e212b6bb54f3082d043e8670e719fa6ee23978523ea"; + sha512.run = "c958210ead2ebbda3350b8255ffab0acd1eed0b4f17c94b5abe31902660bcc296190a749fcaa2b2a9e786bcd1e3dd969723d0e9310c7e7f87a5b7fdb48be3e42"; + sha512.doc = "c059b70e4245212526a5a8ee112a27450fa71a7fe86dd012c78dc82e25aa9fe31b9fa131cab62d265b05a4bfb6a6682fa6f7c2d0e4b746caf4aa880ee507a9e6"; + sha512.source = "85f7189e7b13f76d828e4596f55c9d5eb14fbcf667e1e9a3a3f696ce8cfc8dd31e9004afffe21748273364a8fca20bd7adef9ccbeb56d0aa959284d15eb2bba4"; hasRunfiles = true; - version = "2.9.10"; + version = "2.9.11"; }; "sugconf" = { revision = 15878; @@ -30951,13 +31305,13 @@ tl: { # no indentation hasRunfiles = true; }; "svg" = { - revision = 56475; + revision = 57010; stripPrefix = 0; - sha512.run = "d004a25b7b836ab9ac3011c3160fad8d7b35fca5a3748800ab10d2ab6c7a08833461b72346e80329add288759fc468914c4f3133a1e30314e5e60a74e26db3bd"; - sha512.doc = "a03754d3f939c595ab65af88999c2fd37cde6c317f019ebb5d1191d505126b03f9e9aa4b305d76c47bcb73cde8e98c238c8b43160293b9532353604e6f8700b4"; - sha512.source = "d0b7b0783c30beae687f984de3a7453b29e4ff589c97acda1105e98f9e2581cecba5ee34e75b245c043a5ac7112af854b419f91b1abe361a11128ae0416d6192"; + sha512.run = "fd2c051969ea85b2e5c2818292128044038003456f8019efc3c6decb7e811f3eeeed6f3505cb661ee2b4768fa7715f5b3aff4583124d6cc99fef5c5f6a2fed77"; + sha512.doc = "84f35fd26786e57a8eea08af996d6edc93116529ab364e2b2e23ea6826748435d8487264438f7ff6b44b6d6975e0f18b1f27599e0e554b3d664055296e8fb0d7"; + sha512.source = "834958e4f8a0d8102ff88af0c499455c9bdcf61b0bd2795e25a07507c55ad6e7a5bcd131bbac48e463bd93b4bf49dee9aebe46a8999d75c24218a332814d5974"; hasRunfiles = true; - version = "2.02i"; + version = "2.02k"; }; "svg-inkscape" = { revision = 32199; @@ -31024,6 +31378,15 @@ tl: { # no indentation sha512.doc = "a3db201554a0b828cfc72d47a22b777fd7b44b25c361a4d8f032cc62658780628e83f6eabfbf342b867fda335c1ddc228347f5fc66651193c8229e0bc6e46f67"; hasRunfiles = true; }; +"swfigure" = { + revision = 57213; + stripPrefix = 0; + sha512.run = "128965eab86a5028904bb2486c7adfead525ccc26a912cd4f69b63a11e18fadb3f8b0f42a9ba3e8296952afd3be0be052fa721a0edd6df320827acda82e6271a"; + sha512.doc = "968b87d733ec7bfabab4a7996482c54b184e8e46c8f5e30078e9c8957923c2fda3f136b65d5b1be392b62fce5fd1e016066dd86d42da3e43997b04a723a491fd"; + sha512.source = "fa34afb85d7380539e283d5f1aca26468c31b6d631d28618a3cde73e3bfa493a3106f4321a5cbe172d86ef547165fc255f02f44957b28abf15c1b08d36e72952"; + hasRunfiles = true; + version = "0.9.18"; +}; "swimgraf" = { revision = 25446; stripPrefix = 0; @@ -31052,11 +31415,11 @@ tl: { # no indentation hasRunfiles = true; }; "sympytexpackage" = { - revision = 45818; + revision = 57090; stripPrefix = 0; - sha512.run = "14813cf24b562ed135e6d5a0078306f0687cd464915ecc17e61df0bb5d9900d7110e8338c469d4d55664b2fecd1eeb6bb4f359b11fb2a07bad72a442b7698842"; - sha512.doc = "c4e7e386852b3acd071d1addea10435985e7722dfffd4933ac2c3821b5a75e8c9500f5c42bb6b3e2315bd06b8d3e2ad12423c2c43547bb51b2f59bd982d7dfd3"; - sha512.source = "7dfa3975f5c042f7196ef6a76e31b79caeca4101026afc53aed719239e7ce701a7917e733bb77297b569333adccab6b5bc7149befdd6eed4f09d46ea38684579"; + sha512.run = "9a1fa177703dbed088861ff47e5b53f3c0f433abe15d471d181368c52e0cdae7350090ce5cb3c25d4ca816d1132eb009359977ada3f3c0b5c3b80bc0873f8110"; + sha512.doc = "0013c9c1e21f70e36e6b30f12d777f9f78b727ee1beb2f893133248fffb75f0bc4523c0787c0e292f197ce1c01b5f37b34c33ae97ed713bd900848657d803c59"; + sha512.source = "45df3251efd8a8e5669f72b83fc8c07c9df777ec90bdae9b8a92ff3c1875fe623574365f69162cc4c2f89e4fc7ea32dd1ac0ce164ee804799496be25466a12bc"; hasRunfiles = true; version = "0.3"; }; @@ -31080,6 +31443,14 @@ tl: { # no indentation sha512.doc = "7d0754c08081abc9867d0d40fc910ae5f8b34518004bf698dddc184f0b514d75a7feb3085870cf8322b3d6f3bc4c32ab50acdaeb56b574bf41604a18c23a6656"; hasRunfiles = true; }; +"syntaxdi" = { + revision = 56685; + stripPrefix = 0; + sha512.run = "79d5df672a25ed58919b7e054be992986edc8484348388d5eb318dfa99fc55ad3c452d6924c857c1bfb46361d59fe1d4e38cf84c9cfecd241f7d0c9d184f7995"; + sha512.doc = "a7c370c6b6c3877098e5cb216c4e82d382dfba0627de6abbca8f4e1bc6f94f53f11bac7456be213fa632d501dbabe910ef94680cb2cb20549c292ec5ffe79451"; + hasRunfiles = true; + version = "0.8.2"; +}; "syntrace" = { revision = 15878; stripPrefix = 0; @@ -31241,11 +31612,12 @@ tl: { # no indentation version = "1.4"; }; "tabu" = { - revision = 49707; + revision = 56615; stripPrefix = 0; - sha512.run = "b5ee526ac9f68edba34784ed646557b8b1b28a0192c5acefa81dab5a637050798c4a7410589ff98549b2a29e30686c518d2f319144c7e4fb2ab1464d56d2fac6"; - sha512.doc = "b7cb976e6908f219d50bb3e30dc7874b3c9843c8c36bc59cfb909fd54472c4767e914889cb4f50b4ad426176764a09633254e05d271daaaefe0b0beef80161e9"; - sha512.source = "0684c272a9dabb794a0dbb3900006abe2b0997b6e3335668d058bd9195a6661ee523bb7324ec2e98a7cbfa88416310ec2427c1abcf01986ad1e07a1008bd506b"; + deps."varwidth" = tl."varwidth"; + sha512.run = "cee6894fac19a98293402b714cc52eaf8ec0b9965a8e9ab9f5125388a2e4709e5d33063286eac9e45a3470f551d1aeeb41d09623b5dddd6563c1c462c2582ba3"; + sha512.doc = "9e10613a8ca8b29d61ab5a394ece8e25e0e8abea4b7a70b01382935650c86e9554712635c78f3b097afc5f9560cef2fceb984b383826e206233c28144f332c2f"; + sha512.source = "7b88f0fee52dead2555b4dcc11699ff167207f210f663faccccc1f951e40a53a5a572840c43070d4f86bd183c5e0d9e456c548013160a39264bcda10e71ca49d"; hasRunfiles = true; version = "2.9"; }; @@ -31375,12 +31747,12 @@ tl: { # no indentation version = "2.40"; }; "tcolorbox" = { - revision = 56480; + revision = 56610; stripPrefix = 0; - sha512.run = "316879b98b72f6de49a754eb06e45811d543f2a666d97710d67cdd7b5e700b3994651ddd486d0f661ba6b6851569421c7d75295ce04717f59980096f8f69a4dd"; - sha512.doc = "b52d85403473020b20ff44d5ade3c2325f629ff0fd947082dc93c796e1deff82449532c059583d6f5444ffba98e809cd6d452ce22e6e7db61702798428dfd483"; + sha512.run = "70647656ee420fcb3c832e8552c2340229b0586a638f7c55404f96f20dcb3e8fd2c561a44ece09e6f507a3c4e2be189aa4cb3a3c4d8bc338ca4396e5d4b9416d"; + sha512.doc = "5ec6c748b48b0166555437e0f75203e616e43a8b15787890b00d36df7c86de1971d2a876c5e7228f60f9ccd2e14c7b30ec061f35127a76f6194722c7103c9c0f"; hasRunfiles = true; - version = "4.41"; + version = "4.42"; }; "tdclock" = { revision = 33043; @@ -31547,13 +31919,13 @@ tl: { # no indentation version = "1"; }; "teubner" = { - revision = 40197; + revision = 56956; stripPrefix = 0; - sha512.run = "196c611d9a1f8231541a345a71bb45279715a748a8ef624865c076a8f346f8ac9a7be636feed01130d98445f8fa032ea8f22ff4f4194ae45efa0073231d5cc41"; - sha512.doc = "3714dd9003e03f0758031dce6dbd5a3840b2d9fee53382fdc66e99d4baaba153694c88fa5afc8e2ffd4af64e210a7e65e2a663baaeed7d96c0800a3fb08cc983"; - sha512.source = "667dc5669ddda08eb3f100a501d3d5f3822c8bf1f58d51356fbd51bba3a98b53c47df32243e5733e8da4d136074b8e4c29caed91cb6c5d349079ed1387f3de82"; + sha512.run = "efccacf859896fceb752c0326c99512066779111503a654e2ae48a673bc832fd2c88608843ea1383d1bfd981a3e07c565e1c61a19043efbd91c4a0ab90939472"; + sha512.doc = "191e7cd08cec3620cdd274a85c32d0071a74b8b4b102838ed7c2fc8ce4f4d2bd20570dc181549e4743fadf4a663313b1761a6da6c7e04bb54033c7038ec554b4"; + sha512.source = "6301aad96ee81cb82372f4ac827b3b02db8b0ff0808caeec797d9984e545903b7f13e49a52e06afcd3d9995d1392ab74e5ac8df817172d3f2ca723f30d9b731c"; hasRunfiles = true; - version = "4.8"; + version = "5.0"; }; "tex" = { revision = 56291; @@ -31643,10 +32015,10 @@ tl: { # no indentation hasRunfiles = true; }; "tex-refs" = { - revision = 44131; + revision = 57349; stripPrefix = 0; - sha512.run = "12ce34f2173ddb5be885b174a6be708fb47822cdd34e05ffcf6f17cb28ccfc32528206c9e73373a6f68a5f3987cb9e244c5093539f14db3a4eab0daf8ff7fbaf"; - sha512.doc = "318f2872f308b2f22d96af2a553d9e13b60e1f6ffc1cbdf44e123fb2ca82423ff8bb7aba524f0e8570b8086ef85833cb11070d7848b3212b87ae0046405c1a5a"; + sha512.run = "aa03714a0ebb90c7431935608851c504080f8985db3bbba98cbfa9b957e0a3fbb87de8e0119bfdcc996d664aa46bb943c6f90b36c4408a42f14fcc8387508df6"; + sha512.doc = "f033d8d8bfafdece7b79c8417bce19dde484adbaa958497c0b4426448e6ebbfe8dcda07a34c336c3abe038447ea9e5177bce4660c9b8be36b0f94d02fc7a41d5"; version = "0.4.8"; }; "tex-virtual-academy-pl" = { @@ -31656,16 +32028,16 @@ tl: { # no indentation sha512.doc = "aa73261fb0ffdbb7cdbf85df354490a72bd95e4d98e4a497e98666e6f5533a7f05a7132533db044ba993d86e03fc21825bc6fa7f262e5a0bcdb6de8114d38eee"; }; "tex4ebook" = { - revision = 56291; - sha512.run = "d55f39a6e7d528a0085eb8e3c56b31b71cc399dff0f97f46f73d362e460b4998cc69e3d52b2b8f2ea7d57fd9f495be58a1072d1deaf50a6b77ffa55598ed30eb"; - sha512.doc = "98e031478e7f9bc08c2837d172f4e7e8d9df8202fd2ff4737356d4f2384b0841518497834c4695bcf5fc9176f70df819e38378deb60321d97fbec4e5bbc845ad"; + revision = 56878; + sha512.run = "9ef3a2b820f1f7015b61b8cff017affbf8cdc07fb1d4c39f629e46e2457a08875dd83252526e75465ec75a42d6580b7ec75b085455e5ba62dd14dd13a898a8f2"; + sha512.doc = "0a01620564aa41d076a998910eff5a1fc45b7a0f2a3b2f606191e1442c49ed6685c8ac51a099834da2765de030d2f099a79fd03d6aebe08f78837f18638bc9d2"; hasRunfiles = true; - version = "0.3b"; + version = "0.3c"; }; "tex4ht" = { - revision = 56601; - sha512.run = "6b64db1d0732fb2f8e54950a7147a4f85cd19067efd1ca4be2c5ec69eaf48cf4bbe324a78a6f9b6f6d0489597c77e1a7835e583018a1a5af5dcf4f76cdd72f88"; - sha512.doc = "487e1db18d843e1c283c2fe26761d941aef1edf7ff696557ddde45adf498d66d6f90f4e597a79b9f7a6a467c4887ae6e6dc566605602ec318853e58db4d023b1"; + revision = 57348; + sha512.run = "341481505d1dfe7013df6df04b257826a54c64364885100b35b92db839a4877aba4835bad9fc5c30e924de01d8729cdc606a3a54d602cc6b16c95312db158394"; + sha512.doc = "36417937a23fa3f3de091c717ab0dcdbef63a3954d238240e2cf275acaeeba84361113a6727bd19e8a51d90afab66304059c3c3a50ef8e72f29127a8e0f51080"; hasRunfiles = true; }; "texapi" = { @@ -31766,17 +32138,17 @@ tl: { # no indentation version = "0.1"; }; "texinfo" = { - revision = 55833; + revision = 56777; stripPrefix = 0; - sha512.run = "3ff0c13b5713df9ca112f7625e0fd2add2a4de5ec5209aa19f35d45d0373418e89e38483ed9f1ce7cf73bd73c215e9f04044888e5ca0cc8283df9e04b264d2ea"; + sha512.run = "d6e9bfbb2df017fe05f62028e28d837bbed63a19fc0d4b56c4b717e8386324314d40f4c7d64f0379ef0bf9142ddcdb365566b5b05720fd02151ca0647c986937"; hasRunfiles = true; version = "5.1"; }; "texlive-common" = { - revision = 56460; + revision = 57339; stripPrefix = 0; - sha512.run = "e3416fc60057ae5a8c9d8e08a27d5ec91f22bc15ae767068980f56f01435615b7aa8cf0d4585d9a719777cd4a784ca82402a1f5b5fbcb3559380b4826e4b0f5c"; - sha512.doc = "3f9c68c9823aef62fa679c247790704febedcfe0b45f2a3fddb588e85919214567fd9afd27f2123e9931e586fbd2b748ecdd141471b39bb2a82afce238200e42"; + sha512.run = "196156b586b808882f75a5c06e224804e0fd8899ca284a0e50f6fbd8b3563584f00013577d8347da0682582cf29ab0798e36a71fbc2ad8a616335c72f70406e5"; + sha512.doc = "54f72e1aa3e4e2c4384ddcef42649519db85be0fddf170b1d3988bfa9cba8025f8bba0d57b69f978dbb59d6fd142af81b8fae765d591958fdce9c7b51e4254b6"; }; "texlive-cz" = { revision = 54496; @@ -31785,15 +32157,15 @@ tl: { # no indentation sha512.doc = "ecfc4149bddfb665c6f48e65b719cc3d2240d0be151bec94676a188da08a203e84443b4c8e77590476c3194fae55ea23753a248c6f60ddd0b27895dea703a219"; }; "texlive-de" = { - revision = 54604; + revision = 57223; stripPrefix = 0; - sha512.run = "29e24971280fae6675d7531bb538fd7cd8f9a0d5ea2a2fceac79b563b8c046fd760dcb1da6ca6c39e8f262c025158391a262cdd6cada739034e39558d5b4cadc"; - sha512.doc = "ee0e8cfd65a4ef9771b54b6ebbedfaf3854452fe76f889af98e6bc3bdc14fd009a13d484d658c2b4ff67dd1bc23ebe33b3669d26b6a1ede9801f3f43d58a8004"; + sha512.run = "e0cd9ddb94d90668dae30df9368ae1e724c37f44237d1a4a807439086d23f07040c8d34f2d177559c0776478487c7f863c3c1a51549005c8e7ba59520869fb25"; + sha512.doc = "14073090ad0d3e834f4f7d07455732d35f82b84b7070a54f1df09b46c057e2c80ca704fa2e956fa713b430660cd69d28854c0a3f59cc043ad49ff25e6bf6eba0"; }; "texlive-docindex" = { - revision = 56593; - sha512.run = "173e31439332ea688b0ae817dbc5160fa355bc6c5049e78aa1666847a868dc2bc111652f0dcb7f4a64a00c252f8ffc0274b731713af4c763b92eee3cb3d6004b"; - sha512.doc = "46c8eeade7d0a51bf75b21711bdddb7de815f29c82195d479e934696ef596282b0a1e2a36d5f1169b28f9b49f4e3a78ef00f17ca4d6906cca28daae6000516a2"; + revision = 57339; + sha512.run = "9c978b6362cbd159c6e8fa02ffca98d6f815528c1ae5393019a4a1ef5512aff2977cc91c078404f4c7a4a1991022d07dea6eaab805a7aa25fcb3795531a295b5"; + sha512.doc = "cc3e60ccc7d26bcccfcd96b45e053ad08fb6bf865ce7549dc95e8155f0802e5ee0bc048916ccb429ad1fb537e3ea4e50444f9cbd60e824807cfc226a771b9df9"; }; "texlive-en" = { revision = 54755; @@ -31826,8 +32198,8 @@ tl: { # no indentation sha512.doc = "04dde56c7da52ecb10d94508effeb715fdd8abd95e3db301e5bce469d9db6a76a52268c3bb06d6800cb28a177570b22f90d2482bb5333eff82cd1f9c378a7cf6"; }; "texlive-msg-translations" = { - revision = 56471; - sha512.run = "7b7571932366f6cede88d2b4091cdb8f2ad9037b889e9efae591d9603c700fc11a82e495a14690d33687a5ba7cfd658e86a45c4adcf4141bd680f4095deeb9ef"; + revision = 57063; + sha512.run = "435ae1fedddc3556b55f4be2a131d1de2789785accbc06b0659f93435fbeda99afb80bf57d002d4da7bdb1b6b2b06dc030fadcd757e864929976c3d45a7d6619"; hasRunfiles = true; }; "texlive-pl" = { @@ -31843,9 +32215,9 @@ tl: { # no indentation sha512.doc = "32ab76462c2bab0979029ee9eabd3ddfacebc791083276369dca96c11e3a594358145c4325f088f30966d7cb6482cf708c4b226d6cf0a4c990bda12ba660fd88"; }; "texlive-scripts" = { - revision = 56579; - sha512.run = "eac71dbab40aaa375650d15b51c6ce646b418a3c07a3603a5dd02079bdaed0d7cf4926f1bca69dac567c49c3d766da16c7abde200ddc021f3530f75619978df4"; - sha512.doc = "7d423b4727501048627fa1bf1bf2a558d60e77a03aac1f808cab176ae4fd500029653ca9f09ebcf5f6165af24f4739206217ca25675a5360de8e892aab42c01c"; + revision = 57344; + sha512.run = "d903448e0f0381e55bcfe6a00c446d5b9c66dba9d90af61cbfac64277e512c70c037534080a973f064b44a3938ac01d7ff2a835d47f593905930f4d4d8443bf7"; + sha512.doc = "d0748c5cf97d864ce667dd43b50196ff1e16cb9e6bb442a35c6d418b231a0c9c8b57f52bc4e1d452dff0e58917a95dcfe22868dc211cd0c16757cf1b8016562b"; hasRunfiles = true; }; "texlive-scripts-extra" = { @@ -31905,11 +32277,11 @@ tl: { # no indentation version = "0.2.0"; }; "texnegar" = { - revision = 56215; + revision = 56742; stripPrefix = 0; - sha512.run = "ea05aed87a09be31df532f15bf38c22e4fa0c19860921192d42bed49729de932731bb429115a8448bb05421e9ba69342f86bec61fac5d84a2fd2eaf7e01c0e5c"; - sha512.doc = "bf4d0c943e209477ee36b89457687353a9c60f78c554b2a46dc3a9d7f72d645594f807a4ac59c331303d9993b235b79a6a4febcc305d217c6673b2ce7df39405"; - sha512.source = "63efdcad942c40ce156dab0b720b5fc727b0f0c25ccc4b0a2cafbde86dd09c497326fb1dba85249b9e943608f72fea8ea4ae29ab45a66dd49f1c210094268283"; + sha512.run = "0865a25dd321367903caa20dd3679ea26c41259a434c7b58a30ab86df9ce3091736512bc315f0684d2fb59108daa8a3fcbac8d440ec6c034628d27fd7eae197b"; + sha512.doc = "bbf1a6934b000a1f41b61d4377869a470c3fb7a89d528c8f118e987fbe1fdd2bf1615b8422d5ff1d55a6626e9b14400b2710dc9eca4c26bca3a41ce37894e3e5"; + sha512.source = "37cfd0a3b018c09c4a320c5be47af494fa84c876d5f3fa4c3d23c174d1065a19e72494c61a07decf503d10f24786f595d56d49b6464a52cf5f518b938a1d6fc0"; hasRunfiles = true; version = "0.1b"; }; @@ -32145,13 +32517,13 @@ tl: { # no indentation hasRunfiles = true; }; "thesis-ekf" = { - revision = 55662; + revision = 57207; stripPrefix = 0; - sha512.run = "7c50f0bfb5d38cb5dcedd7927b6bc9b3c39e0b3f35627c522c7f96f4f19f2744815d9571cfbf8e63bd1ce21e1d59ed3fcd6d015aaee1bb39b1c90a38ae5a40be"; - sha512.doc = "963b98d0537919d97d254176c6b4a368b70c23b1841002f4ced8a8a2a3536b67717d276206a38414ed2da511d111caf6468b3d333e6f3917053fa3c5c9ab22fe"; - sha512.source = "ee4a96c69819bde61c0be220cb61973c1f4c1ac8ebcbb1595cd5fdc7f10988d3a1c14b175eb4b12370984b60c93c4f44e59c41750f168917645a2b27d2150496"; + sha512.run = "34f9f72bd8ef813c0ef6a01956304ef99f8a0fecf17786f9aa51fc6aac4655f5a76aa030509379699f6dcbe6a7245cd1d01f2fd0df8fd3bc77e5f8ddaa0ffb8c"; + sha512.doc = "48989f4df56a2820c048651831b598fd3c956ffb2733a9d3e8a68891e7c410a72425ba3a32a4a0ecd6f7640f7054d85016c7c9dd129ad59849588cdc09547548"; + sha512.source = "45c2329fa7994a119e1c8c2d3e777b4ab1083496c538edcda3382d2321a4b7cea97daddde8efd75bad12b79d95d635f45bd79f1db682a384ef320d4b000c1ec1"; hasRunfiles = true; - version = "4.0"; + version = "4.1"; }; "thesis-gwu" = { revision = 54287; @@ -32286,13 +32658,13 @@ tl: { # no indentation version = "0.1"; }; "thuthesis" = { - revision = 56305; + revision = 56659; stripPrefix = 0; - sha512.run = "fb7efc08f75995cf1598ddf6c7c9c18fb23110fab75cd3d2c2412f2b1b0788a03673db76339b01ef97a539eddefc69d371a50b947bbdba94e011aba9c9c39edd"; - sha512.doc = "839ba4e7ef67c769e89f4f26882487a999d77da4de4c37f90e0814b57db0a43f4f527fe12b7077fac85d9ffc7e5ca77bc9026ebc1e89f3cb480e9be4cbcaa4bd"; - sha512.source = "608175b2b46369d59b108e1d0c1bdc0e4677c56bae5ca9b0fd7a98c078fe25952f3265ca2d85cc785a4cd548b3dcf2ad8764908f485268e471c8c210ea9ee89a"; + sha512.run = "0d95c02814b57c503d1cdab1094caa8d44288f400f333547a2cbb0d75f9158d7c262ce6ca7d103ef46db5eb116dab9198b227c138dfe98e13cfe4a99f831a054"; + sha512.doc = "85b211be8449a5d280db6a427e36ff8dd6daf66d2f8c07e1e99d9faf656a00b8fba1315ee8b919ee7c37527c2291004aa267cd385269e518fba507a3f1b7a793"; + sha512.source = "c360eec95b59cbb77b9ef51b454b48bcee07763ea733c187c0f8c5a39f4052d744f5b3c17ad7fc786539b0190bd03e906f487462ece32661f45a7ecd42ccedda"; hasRunfiles = true; - version = "7.0.0"; + version = "7.1.0"; }; "ticket" = { revision = 42280; @@ -32324,6 +32696,14 @@ tl: { # no indentation sha512.doc = "0fd9bde0f12ddf5a4bf6e2e1df66a9aafa42e81cd945b41e09e8d289c57b04faddd303a415c36239e6686be90f06e8a7cc794ea50d17ec54f1e25703314257da"; hasRunfiles = true; }; +"tikz-among-us" = { + revision = 56820; + stripPrefix = 0; + sha512.run = "70eb06187c5146c9238e2074acdc39df7b40b9bef3cf34cd820d925ed482df07a1b3042b3f83e6cece15eefda4d28b483888c1b9628a55fb57cc0788ca263746"; + sha512.doc = "c272447fed242f2d6539c665684732b0953587924e4b921872bc420ea09a2c178779903c5f44ca72bf7a310ac03c6367fb5e801f4c30000406dd93c8a43098ab"; + hasRunfiles = true; + version = "1.1.0"; +}; "tikz-bayesnet" = { revision = 38295; stripPrefix = 0; @@ -32365,10 +32745,12 @@ tl: { # no indentation version = "1.1.0"; }; "tikz-feynman" = { - revision = 39582; + revision = 56615; stripPrefix = 0; - sha512.run = "1a1ebc5d2f2eca4e5dd16ce744774add9b8f5b4c3124dee46f0366f43a59b188b0873939d2b68ff0d679f3e52f1a6bc387ab81c363912024efd0eb4110e2ba27"; - sha512.doc = "b3e90aa1d8476aed01faef977b75f4e3450cab121d457eca0bb254075c1e2ed58fe15196ab0d923906dcf6af4f78bc76d6053343f6444c8294bf7d5bbceb3cd1"; + deps."iftex" = tl."iftex"; + deps."pgfopts" = tl."pgfopts"; + sha512.run = "34c147e6ee16643e99d2c8fa789b39aea6f3b9ae7de93fd5c65d1b0daca1e9514d484b5b38892a0cffa1aeedcd405df0bc6621bf68e587311bc9fe45205c29fc"; + sha512.doc = "ae0510a7971538fe458d83d4da4c78f7d607c7a1298344a139c02c49985f9005f6a81ab15f9dc621929d70d634c2cec4189ac4a2955e994611247af0c96986f3"; hasRunfiles = true; version = "1.1.0"; }; @@ -32521,12 +32903,12 @@ tl: { # no indentation version = "0.7f"; }; "tikz-trackschematic" = { - revision = 53754; + revision = 57300; stripPrefix = 0; - sha512.run = "5e00ec05ccd6c6900d8919efc35afc54051a25f8f57812fc476ab6a28f4cc194eb4887699e6353b15b76a68de799fcf9c96c4018ddfcf75d7fb889d998a6055c"; - sha512.doc = "ded12f30baf163ea465531960745af6ab473ff59e21c579e2c58151b61d2aa8d9b04a29d580a8ed86e88dc1a11a98b7d9dbec9d853bbd8a7556c0b3d634a2947"; + sha512.run = "3936b79ad3e687002ea2d52ef03bcd468518bf67e24a9e6eb83e9c5379bc244dadb3acbefd3bbfdaa84a5811f32b89a7bdca2bde4861ef6bda2021e7ee289828"; + sha512.doc = "0fd357b0e571c0bb9b0954338ab45147748574143c01c413700d7bda39d0171f037eb207770fbde9b366618fe60f5cff82d17900295ec14322373f2fe0f919ea"; hasRunfiles = true; - version = "0.5.1"; + version = "0.6"; }; "tikz-truchet" = { revision = 50020; @@ -32562,12 +32944,12 @@ tl: { # no indentation version = "1.0"; }; "tikzlings" = { - revision = 54838; + revision = 57065; stripPrefix = 0; - sha512.run = "f729a5ddd2318f78f7c18b5d22c35e31908644202d365cea821f94f0ecf32f6e1b4f48e056d7346ea825f5f39664a49590e6d70934b0e58e942a82a2908f59ed"; - sha512.doc = "fe8d9c9da1c9f9b2561388a64e5a531fa0d716db57a1512046ea49e94c5898b0908ee7434825a8c9edbe4fc3d7245a7a9050f7a0d9e08c7a3d51c52ce4772f68"; + sha512.run = "7a40509b00bef9ae0bf340e7bb5ae6509d9b17ca1902829912e33247067fc8d0349bc494df747052a00688d26ae43261f202e2d75f6830447c6f891b47028ae8"; + sha512.doc = "7473801c56837199ad2b1b4934b9c723489bb0f0ca831a802b6d4ded218df2f7dfd354c04c5ed81be4820f4118f54a60febc0293b7525f590d1673581ef8aef8"; hasRunfiles = true; - version = "0.3"; + version = "0.4"; }; "tikzmark" = { revision = 52293; @@ -33135,12 +33517,12 @@ tl: { # no indentation sha512.doc = "ae2f1aa60162512287f15c770a465c2e39abe1fa5d1223d96c524dc81bf065d62f307893d22dfc06fc50da8d63d817ed60c8f07fd4fede984b6febe9c8b7b710"; }; "translations" = { - revision = 54929; + revision = 56889; stripPrefix = 0; - sha512.run = "266840c17d98e67173b6d30c33ad5a8f281198f214174e63a741e53f0b52a92ff91e577dbe4075125dec5373dfaf95d8bd583fa20992d3d971f4e37f90928574"; - sha512.doc = "4dc935b51f06489f68602e91a7c67875cbc1ce4f3bb91158160057f9b6b2528272d8e9258fa6f9a2cd8729acf60e20cba855239a4b3a6a67a9aef1831f7c0263"; + sha512.run = "32ddc7d2d79734605f4cfc34fe7de5753392eea42dcb338301f14d453a81cbf2def0967a903c7d5db09c3d12fb9c5adb9736580f0c3b3efd60a4af44109ff1b4"; + sha512.doc = "81f4aa459b55a567e5585a3b4dbc83a2b9031c3d78e0dfacbb825672f704bba442e98aeacecfc326900b230e4edab873b47555da24c2f5c41a641bd0c5d3880d"; hasRunfiles = true; - version = "1.8b"; + version = "1.9"; }; "translator" = { revision = 56052; @@ -33248,15 +33630,15 @@ tl: { # no indentation version = "1.0"; }; "tuda-ci" = { - revision = 56594; + revision = 56921; stripPrefix = 0; - sha512.run = "9b91e0cf986b2ad57eb481dcfaeb4dd6458ea0080fb426bc62e1d0b7a19d06f7136bd97ac7627de54b23dc1bd43e6ca2907743e2a6d71b6771d70e8f2e182a24"; - sha512.doc = "56a10a7b200ad240c1721a7208ab814f9063fa2d6e676138410080fa58082b043486aaa89d7289c1ea7acdcc35465214e1f10fc3dbe9b98e0a7544bb885530c7"; + sha512.run = "da22e5de9085e794f62b437c44865c766412f8311c787bd236c6038a96216428de469ca3fd3300ccaf2ad61a17099705645d6bc5850cf50d3a62eabc8d89ed04"; + sha512.doc = "4ed12173409c1a27ce3700b024247e841e153719971ecf3e8e088eaffb53362e6d974b43227820c167f901a268bb5e91a78f73b5272285820a8dd6b3a926d7a9"; hasRunfiles = true; - version = "3.04"; + version = "3.08"; }; "tudscr" = { - revision = 56481; + revision = 56909; stripPrefix = 0; deps."cbfonts" = tl."cbfonts"; deps."environ" = tl."environ"; @@ -33273,11 +33655,11 @@ tl: { # no indentation deps."trimspaces" = tl."trimspaces"; deps."xcolor" = tl."xcolor"; deps."xpatch" = tl."xpatch"; - sha512.run = "bb58cf1988e3660e3bf684f6f9025e87abc4c1c95dcfe88cc1540381362c4d0ea5eea70971d1937a0257afee850ec9ce6b7b52518ac0f3aaa14c1e04e03b81c7"; - sha512.doc = "b587fe479e1efce354398bf723cffabbcc8c07bc24106bf720186fcc66a091b2ba318a0d21c6755437b0e949621805f6b53f536a5e1fb4cf21bd4d3fb983138e"; - sha512.source = "cfb0a8a6dc094989149386b545ebd1d52303aca0a7ab71c21775d288362321adc08662ba0c06b0da683b67ec667d73ffc3fc1bf473196ef03d6f380ea83201eb"; + sha512.run = "38c93ccfe8521a355ab9c0bccf6a9ba4e4a803397d8ac59cfbea118d13ffde5c70e300a44d339df72f3b8f591ff568baf0b86cde882b8990f1f42d4b74e5821a"; + sha512.doc = "f84f8c0422a25e07475918fedb39d9427a2ee7174720c82fdadd23bb5549e1183c28ce11ce3d6e84e93184010ff6caa50e6b33ef08a96d235ac5bc7c672ec901"; + sha512.source = "102690681db659a244bcd56baf8fb5d49063ce183f3ded0108e750cb45f16cb312bba9a70dda56fb4ab2cf22a74c63ab6b429cb841318309f908b1eacf8bcb58"; hasRunfiles = true; - version = "2.06j"; + version = "2.06k"; }; "tufte-latex" = { revision = 37649; @@ -33294,13 +33676,13 @@ tl: { # no indentation version = "3.5.2"; }; "tugboat" = { - revision = 54261; + revision = 56942; stripPrefix = 0; - sha512.run = "1365beb024d47ea6875839920a1b74c53ed29e835937573dc179359a6f02bcb28f46b901e47a2b7b8541ae076b2fae7d98c760d1cc93897648a0d7014ea097ff"; - sha512.doc = "6b4dd305ef9b9d2cf870ad2096be6c6733e094f98c7e12f19eea4197fcdb84343a6b79ddf57ab4edc9585709d09d000f438e17e8779c1f1bc4012ec13f3bfcbd"; - sha512.source = "086926280261fc8bfc994c33acfef8855d8ad55130fc4883960cea6071c81b2ce5928b5550e9c220dc42f2ab7b03097bc78cdbc900168534b72180ddec0bb1cb"; + sha512.run = "1a58d5dbb3c68ae1abc78265f5583943dbbe673efe5fe81aaa4f5b66e18afe573a2e135637e24b0026d68de994a143d2d9ea172c1bfebf4adb15927abf5f74de"; + sha512.doc = "7db84d7657506ef2837eae7a8658c64cb0c6e6d58d5638f7abd936670166c0e75c6822f9deb6ab5916ef0d51f25a3bbfc76f0906c086dd6edb703140b68d72e5"; + sha512.source = "9cf55ebca59c961ec144fe53d73dc01501b8f621716d20655661c133afbfa2b4e4e4169868d9f419f968787bdce3f6fadf66084dafcd542cb505aa1f7acb4e3b"; hasRunfiles = true; - version = "2.23"; + version = "2.24"; }; "tugboat-plain" = { revision = 51373; @@ -33499,10 +33881,10 @@ tl: { # no indentation hasRunfiles = true; }; "uafthesis" = { - revision = 29349; + revision = 57349; stripPrefix = 0; - sha512.run = "3f8146ae2cddcc8f136c7dad5cd926919d4d81a2b43038fcce55620c6c240326123b6f48c32504b44cbbd9b62aa3a61cd80f5b85c9890ecddef9d96342cc0eb7"; - sha512.doc = "bb1e0fddf66350187d8507b34811c0c1ea84fbf0c6cd3e9eeaec8ef6c7111fa2ad1eb4d805df01fa6bed58030056ddf0b2b4305ad821e696fa6de977cff46c98"; + sha512.run = "52e0fde63c966392a235239725e2db7cea70a300837cf53003f961d32f54787d8c4e70ee76577889ea543f884ed5ec281b345bc9e83872e5a131e55429f7afe0"; + sha512.doc = "92c2a15a214f42a9dad8c0c50a67c68d037980b813e8ea4f6067341628f19f51de36a20b0e0d8fc49acbdf6ff026a729dc86e65dd4b8fa148a541d9535db0f85"; hasRunfiles = true; version = "12.12"; }; @@ -33768,10 +34150,10 @@ tl: { # no indentation version = "2.1"; }; "undergradmath" = { - revision = 42926; + revision = 57286; stripPrefix = 0; - sha512.run = "1fa7b30670ff888b7b848b756b960690489aa7ea12e5cc5cc97b56061cc91c2fc4bb2ab0a3a2eaf13177baf760edf8bd7f222dbe02cc16ad7b53f57b4b4340fc"; - sha512.doc = "5dfa5955c7e9ed8fe89f6ccfb4517e699861b95619fc2013631d457938d64bd56bf34718c29b154a46b8519ec61bb102963668b13bb414a3a7ab35b748a981c7"; + sha512.run = "948d0f0ac20a63fb0c6de8003c572c11704d2016d2ddea6674f58742e997021d709d51806b5acb4716c79539b96086758814f4f5d303a257768c8716821e8451"; + sha512.doc = "6300a5d0781bae331091cfc8007e974ed3534ec3672dedc080c8e118e8526c98206438a6841d50d2e642e8d6c7859cabae14e140c211bc8175e7f9d1cba0ddfe"; }; "underlin" = { revision = 15878; @@ -33852,12 +34234,12 @@ tl: { # no indentation version = "0.01"; }; "unicode-data" = { - revision = 54758; + revision = 56768; stripPrefix = 0; - sha512.run = "ed05f1e6d7bdcaa1af1f4de575ca7e8495bdcb4682368e4e014a0d44dacb5c3221e66a3b73d946d1a7c5c3f3e36ad3b2d78d6f3d0e35affe926dfcb80f2a22f2"; - sha512.doc = "42511daaa2e1f7f9aa5cbcd12091dabbf8d6d4a030ec6808d06dd43d6c9c1b74684207f99ed6e87a5f279c73d3d76d5c65a150b0e7a4aa252e8118f512ddc3eb"; + sha512.run = "f966d643732bc6d9743d54cb2981e6420dd5bc33a3c2f43bf17f2f14afdfccf0ddd8068a13ce9547d60c8ee77559834f3cce97df8bd5d7252eebf978a3429b0c"; + sha512.doc = "1093c6e78d8f8716cec8ed34444d5e95628c2d0be4b61cb3dae72563b2e3acfc1596b5e25dd8c101dbc8ffe15b7483a198c30f459eb76418381be3dc6caadbef"; hasRunfiles = true; - version = "1.13"; + version = "1.14"; }; "unicode-math" = { revision = 56594; @@ -33878,6 +34260,14 @@ tl: { # no indentation hasRunfiles = true; version = "1.2"; }; +"uninormalize" = { + revision = 57257; + stripPrefix = 0; + sha512.run = "b9b0e91a61d99005be4f37d2e5aababf70729c60d959cc57295a7197b5e360ed183bb9cd80bbb287508bf584db48f061bcbb25c6a5bfd0936923b106d9962f60"; + sha512.doc = "804c2e70ff09a677c30f531db5605512453506ab83dce8f9dab4bfbb5602f8605376becc8f65cf375b28c9d6d35ad9f3a92d6f185697e2e9f9d367638d58fb56"; + hasRunfiles = true; + version = "0.1"; +}; "uniquecounter" = { revision = 53162; stripPrefix = 0; @@ -33954,12 +34344,12 @@ tl: { # no indentation hasRunfiles = true; }; "univie-ling" = { - revision = 55664; + revision = 56913; stripPrefix = 0; - sha512.run = "d72eea1b32aad88f34ebf20c40bac851ada821a1262386e5b0426a68ccf8e6ac8c4abf4ca1dec9ace44c4a4f4aa2f868cdefccad9b6ed07200272d23e5623ba4"; - sha512.doc = "58c284ab2c8b77d73fcf69d8dfceb2040b6d27068a98b7b21867fbf258f11920e0f2d0f027275f8e95f4d1c77906fef9fa56c8ab29ceed5a62007bfbee6f3cab"; + sha512.run = "d4c0a0d760fc6d9c5fb2a56a7040b37a2fd5e20c13761374fb8e83763e0e01090ba3079a589cd6544c707148c17c389e377598f420d73cb942da591ddeffb943"; + sha512.doc = "ded1f91665ad5a8e13bdbc5b01fad86f73efa77d144b946f8049fa6876b26cf237f645250137899e06d93bb19117120be9fd8d9651857bcc0a19df49ce87b664"; hasRunfiles = true; - version = "1.12"; + version = "1.13"; }; "unizgklasa" = { revision = 51647; @@ -34019,11 +34409,12 @@ tl: { # no indentation hasRunfiles = true; }; "uplatex" = { - revision = 56548; + revision = 57186; deps."atbegshi" = tl."atbegshi"; deps."atveryend" = tl."atveryend"; deps."babel" = tl."babel"; deps."cm" = tl."cm"; + deps."everyshi" = tl."everyshi"; deps."firstaid" = tl."firstaid"; deps."hyphen-base" = tl."hyphen-base"; deps."l3backend" = tl."l3backend"; @@ -34032,15 +34423,14 @@ tl: { # no indentation deps."latex" = tl."latex"; deps."latex-base-dev" = tl."latex-base-dev"; deps."latex-fonts" = tl."latex-fonts"; - deps."ms" = tl."ms"; deps."platex" = tl."platex"; deps."tex-ini-files" = tl."tex-ini-files"; deps."unicode-data" = tl."unicode-data"; deps."uptex" = tl."uptex"; deps."uptex-fonts" = tl."uptex-fonts"; - sha512.run = "3e7613e0de1d38ac64903fd16648d17624efe5f5ff32e50e84d58a1315cdea3017ea845e962fb6e9e2e276a6b7d77960ba93da95e5c792df560877f629da8b40"; - sha512.doc = "f84129ccbc081938e4ea01a70edad624fbbaf00d97f4bb665836baf2b622880cdfdc552a3c7071e27c7d1d102c44918df7727cd49c38fdbb84ab99b52cf0e461"; - sha512.source = "93d3a54b7af909f6ef1a8cbac752e6870ffaaef844eaaedf526449b109cbd553777869536cc5102127a057a115fd73488efeb1cea98655b1d037dece4292b79d"; + sha512.run = "e3fe867719f3e9dffba2d93de857e96e7db105c02aafb7cb5484fb19f4862c4e84a658930bd236dfd3693d829bf312c57665a554622b0aace50ed20ef14fd968"; + sha512.doc = "e0fceb0b765482e8979efc04be549e19e49fd8c2118ae039ee0792c3eb49bb4fc4f7b9f1deaf6aa3ee39cca5957a875c8cfab78a16e566860c171ba151e51b81"; + sha512.source = "2c2ae9a74d4ef567e2683c47c6661deaa9ebf85ba348a9cd0c138f49f2cacdcd59a419dc8a0f1378e68d960cbab31bff90b65e4cb6b83053cd4b50d887ea6b3e"; hasRunfiles = true; }; "upmethodology" = { @@ -34082,10 +34472,10 @@ tl: { # no indentation sha512.doc = "7da25d9527ea65993d9c530d6149f1385b41b8573a106f7812ad4b4d29caf7191d6248b0f104e6f41da86a83a25c59a0f7dbdc1a8f1a9e40e0ae234ca794943d"; }; "uptex-base" = { - revision = 56489; + revision = 56832; stripPrefix = 0; - sha512.run = "f4ee4a59f772851c8bb47968cdf0791d70875efdd929ae682b6987599d6c6bdd9388e287b44ab2bf864f7b5c9800edd78559953299b57e29689946be6def592c"; - sha512.doc = "12a8f25aeb59b6202977d8661b3bbbd6253d58e05ab60dc408245a9becfadd9048a147b96b9e78821b7fb8ce8f89abefb5f5e20be2fe776fa1e9fc6adad437f1"; + sha512.run = "ad62a640e04807f62f9efdd67720f57c7dbab0190fcfea7a82109f4f8223138b8d413c49e878c70ea04f733576828a4bdf475ebd1b6ed471268cb21bbfaebfae"; + sha512.doc = "dbfd62df1619e9a5814fde01796203180f77fdd48fe603cc1fb6701b2c2763d507eaf9925d2555a9fa6281e9dbf35c7218a9f888d325b628bc2d8036bb393637"; hasRunfiles = true; }; "uptex-fonts" = { @@ -34179,12 +34569,13 @@ tl: { # no indentation version = "1.0"; }; "ut-thesis" = { - revision = 38269; + revision = 57349; stripPrefix = 0; - sha512.run = "06a8933b03e02bd092a09843686d518ab58a47a4821bcafbe9568eebbe6d4e72e7815752016200ba5d68ab193408847c9f0a784bae9a65af4d1ad06b501c03f1"; - sha512.doc = "13dcfbd7dfe45a4d1fa0e2ad8a06bda30cf5a76c993e6a6614d4fcf18964f5d44072c9c75acb6739b8df977590fd2c55aa193a2c88665e38a4e54e4411ca85b6"; + sha512.run = "3fdb252a0630b0a2c568adbbcf74cec52f717c7a886d4141bcf6b5b3e8023be99d17b59290c8fc1291364d8b71668bf6cc37718898151e5a795760668907a880"; + sha512.doc = "2a59fe984f3d72a1876d732db9275fc49a3df55572788b3773a4a74baed7263558706c31fc4aba305a2f914381b4a3388589d4df800c6dfcd8732ac5e0f130af"; + sha512.source = "3c1301d7e71c3ca780173df44bd3a1ed893d63eec44f7cdf2ff372618e29c492a554e9baacefdbeaa49115bb442b6216e2a44f8a2595986014d0b40501013593"; hasRunfiles = true; - version = "2.1"; + version = "3.0.0a"; }; "utexasthesis" = { revision = 48648; @@ -34208,6 +34599,14 @@ tl: { # no indentation sha512.doc = "cd438089d90faa0e9144d23adb78ce91d85b80ce084cb92511cc23882c675cb654cb704aebeb623bb29c70b764c8a0ab19915607664895c457c583f376c1088e"; hasRunfiles = true; }; +"utfsym" = { + revision = 56729; + stripPrefix = 0; + sha512.run = "cbc9203663a121f2c421d07bf630831db438aa74c6d6ca95d3d7d7f5a5736db351e0fea5fb269ed2b02eaaec5d85de52f2f9ca90d753d41ca9da7328c6af2326"; + sha512.doc = "3b90dd9075fa3b4602e76593b90603ff4022a003599d12297bcb482fc28995ac204de1908baef9e4506a0bba82edf09dbf6314dd7034808aaf7aa38af3bee6d7"; + hasRunfiles = true; + version = "0.8.3"; +}; "utopia" = { revision = 15878; stripPrefix = 0; @@ -34310,12 +34709,12 @@ tl: { # no indentation version = "1.0.1"; }; "vdmlisting" = { - revision = 29944; + revision = 56905; stripPrefix = 0; - sha512.run = "58cab8cd7d23326b39e76a91db1bdb0b0cc9e1e6bf457d151af39a4c94886f623b8178de835e673118d5b797510d6f2fe5f97f6c0c8b5bcf679b9158ded3c941"; - sha512.doc = "a71b798d364f429c4894db38863301c1601ba7f2bbb2cf8e4394b48c5b7e3541cefcf915ca52860c0c55744ac2aa8fad82ea66142ed2fbfa81c05da211f04f74"; + sha512.run = "4c4b5deda36fab8ac8cadfea2093da188284cb26eb9874f27ffbedab1235d4e7bdf48e977a714fb33f0ef2c5cf4c0b92c14767c565efa6842cabf451af51c1de"; + sha512.doc = "fcd476e8ae2db61e3a71b1dd4bffae34e6eedaa409dc3434179ca66bafa2dc4b5790bd06bf90db609f91c682d2b7bf9d5effa893e5fb914c26c20acf67f8b22a"; hasRunfiles = true; - version = "1.0"; + version = "1.1"; }; "velthuis" = { revision = 55475; @@ -34391,13 +34790,13 @@ tl: { # no indentation version = "1.2"; }; "verifica" = { - revision = 53722; + revision = 56625; stripPrefix = 0; - sha512.run = "7fbb232e4d732df813520c0a4085540bd5b16ca5cb4a68ad3fdffec8de273d821bbcc6304cb74fd06d30ea8f30e50475074c183ca96c9d46c32e818249f7cc45"; - sha512.doc = "822e444c7657427dde2b3a51b3f2f42f6088e66933e51d1533782ae76f2e8de31d2cf1c5e7824e3d90600a971f253a7eb84e0dd0c874446cc0bc0b914e0a691f"; - sha512.source = "a3418fecbaf2775b3aef2db90603dc64b0a2be211f02010d62e3c73517334d2628a68b17f911b3ea257f3cf439b5bf1f8360e97f5c3ea6ad0d7605ce904922b0"; + sha512.run = "8c3258fdf2040e00495b56605f88160b5179743a7ae3abc6334e734ba9f1fb122bf2e4847fd9a577c1221c9e22dcfa650f15612d7a005b3719ce6c92df180bb3"; + sha512.doc = "de41df53ca78cabf7ab3f672dd00c0042cfd8a71219d694985c18aeffa045dcd37c7b999058d7edf6a2348d83c9ae27d1e242f17a91d43b61f2b873ee2d157ef"; + sha512.source = "85e46be6f8ee729753362243492c7946166049ebd0a89f0871bb9308e6803f5ef9416c30fe380be4961aa466a03afd9541d09e5920a196550582d326a6de8b9f"; hasRunfiles = true; - version = "1.2"; + version = "1.3"; }; "verifiche" = { revision = 55777; @@ -34694,10 +35093,10 @@ tl: { # no indentation version = "1.01"; }; "windycity" = { - revision = 56492; + revision = 56911; stripPrefix = 0; - sha512.run = "0545b92bb12e732f7db8a1f56621fce9ad85991c7ff7686ab467dc964b80355a5783eac1c41bd7e24faf9026a0f0025a952668d24563844015b56a05e6190ca7"; - sha512.doc = "42e4f754fccbcca5b5d4e685e1ad6106dd1c2695b5ab317c429da384ff9f4f1af6555d701f4e2ba1e55a399faebda5d77eb368d7eb6845d0b011146dfbda00c5"; + sha512.run = "26f30ba28b11ed7b95f34c24daa8d9a66473b6138e9b8ca8f815174bad88cad01108000c97998ed48fcde64be525b6f888ed1732bcad6c3a7f582005af7ce565"; + sha512.doc = "97d0cd506e158d2f26e25577f684f1cc5ce05f01a351abdab2a9f6eab3f7b674c80ad509a7371e4b5ad06895308639b665de89c8ff9739e63eae7f8298728855"; hasRunfiles = true; }; "withargs" = { @@ -34815,12 +35214,12 @@ tl: { # no indentation hasRunfiles = true; }; "xcharter" = { - revision = 56391; + revision = 57009; stripPrefix = 0; - sha512.run = "55e129c487cbdd022aa76092f106882b6e761acecf35e12a5ad6f13118bcd88c46de0e1f0b0a0a5df3a9ce508c5897d1353775a7df202790c5c978a2ec370933"; - sha512.doc = "dfc951e9260a64b4a6624f1f0500b1827b3c283c04db28e59be1e8c6e4415928a92ea257a8956402e3ceef15a593fb8450d18fdc47039c3cd5f6032277912497"; + sha512.run = "aa2b679b4396f52297dbd288d9f8aef74c83dc6f4532b1b72781f0544524152e840ac5359064c2a39b2550afcd2ffc43ca5c6009a813a202a486f2ef62e3ba6d"; + sha512.doc = "7273a77b41ee407fc7fd7ccdea9e8755c1c78939e6a6a8c147710c7049b81f1cd46d6a67751fa273340e7c9f9246d98481df24d337228c62065d1fa9dbfee40a"; hasRunfiles = true; - version = "1.209"; + version = "1.213"; }; "xcite" = { revision = 53486; @@ -34942,13 +35341,13 @@ tl: { # no indentation version = "1.0"; }; "xecjk" = { - revision = 56166; + revision = 56711; stripPrefix = 0; - sha512.run = "78f63927c6509c135219c16ac29f0c39e6b6441c48389bb496611cc8cff85d84e2f1209df680bddb78ebdef9c65ca44c0c32dd1981f09906281f0c30121ffaf5"; - sha512.doc = "4ce8a0bfdcbb697fb8eb67be86f75f13bd021cdfc65cca04cfd6a71a702b43af69630d14ca2431ace6c4dd50eaa19e6da5887ef53d71072223451fa063996afa"; - sha512.source = "3333e91f348e7df2e7376830747c6f3f118e93ce4cb9bee83468c0a8bf1100616435128456dc87efa62acaaa0e02635b80e3b6dcb0fe4cacaac1b24526b334ce"; + sha512.run = "6a318c27555cd58be7f3f8893ef4345f37b619cab2088a0ce5627000eb8375724a1e3e8df741cff2558143ad58a3d336d67aac4ff2dd8ca226b223ec103f9d3d"; + sha512.doc = "72446201ddef073b1b37686ecd0ff7569db34d3240b549b5e9ac2c5e6fbcd7e64a070afdc6ee40e83a4d95172cce37da092e463e4c55e5f293b92c39cd4817a3"; + sha512.source = "32c1905ffe53dca84509cf51fd4f2b2eff1ca1d03e97bc1f03009d236e476f8d8573ef3267e6466eb63e18b70207ba62558afcd1a64d9a1af79a7a6cfe5c050f"; hasRunfiles = true; - version = "3.8.5"; + version = "3.8.6"; }; "xecolor" = { revision = 29660; @@ -34984,24 +35383,25 @@ tl: { # no indentation version = "0.3"; }; "xelatex-dev" = { - revision = 56548; + revision = 57186; deps."atbegshi" = tl."atbegshi"; deps."atveryend" = tl."atveryend"; deps."babel" = tl."babel"; deps."cm" = tl."cm"; + deps."everyshi" = tl."everyshi"; deps."firstaid" = tl."firstaid"; deps."hyphen-base" = tl."hyphen-base"; deps."l3backend" = tl."l3backend"; deps."l3kernel" = tl."l3kernel"; deps."l3packages" = tl."l3packages"; + deps."latex" = tl."latex"; deps."latex-base-dev" = tl."latex-base-dev"; deps."latex-fonts" = tl."latex-fonts"; deps."lm" = tl."lm"; - deps."ms" = tl."ms"; deps."tex-ini-files" = tl."tex-ini-files"; deps."unicode-data" = tl."unicode-data"; deps."xetex" = tl."xetex"; - sha512.run = "71284d60c86af780209a149efd5cbdafd90f19546046995b42569dbe5709799c1dcb7a15a593b18126801a46c4251f37b7afb7cb7e8d9ab1b41275459334c751"; + sha512.run = "93df696d59d088bf5808b5dfe0ad6a834b65252dfe1f06cdc0d2f446a57b97751c08464e58be40ac042cc508d5f846696561d6524bbb84234af11fd3b7c61d00"; }; "xellipsis" = { revision = 47546; @@ -35048,13 +35448,17 @@ tl: { # no indentation version = "2.0a"; }; "xetex" = { - revision = 56548; + revision = 57186; + deps."atbegshi" = tl."atbegshi"; + deps."atveryend" = tl."atveryend"; deps."babel" = tl."babel"; deps."cm" = tl."cm"; deps."dvipdfmx" = tl."dvipdfmx"; deps."etex" = tl."etex"; + deps."everyshi" = tl."everyshi"; deps."firstaid" = tl."firstaid"; deps."hyphen-base" = tl."hyphen-base"; + deps."l3backend" = tl."l3backend"; deps."l3kernel" = tl."l3kernel"; deps."l3packages" = tl."l3packages"; deps."latex" = tl."latex"; @@ -35064,8 +35468,8 @@ tl: { # no indentation deps."tex-ini-files" = tl."tex-ini-files"; deps."unicode-data" = tl."unicode-data"; deps."xetexconfig" = tl."xetexconfig"; - sha512.run = "a1468b805c3211ae4827c4e5ec54231b482ab43f5d58c1252e31bf009d4ea796d3f3a6f7336284e5f2a44daee0e0145e8c2c0e6f87b7e55c46333ce8068ea06e"; - sha512.doc = "4b9af8ba74489d3b40750369fa5a2e2f30706890905e22b1bf25e3f0f4d67c3bd11489770d931a9e36df243824f26d2cb0e5832b79e78b4cf52162e510c5f4bd"; + sha512.run = "60acec44d673f73ff7fb6291a8f7bbc2ae4329cb587f010378359ce8c89a28e810d3312a3ab379b4dcb0be67c3ae1186ee4290ef30456d2583313a4e9ecd9d52"; + sha512.doc = "254560a4bb4a2296d469d6b31163ba31a41cd48d309cf7492d070134e34ad6031c30cf98b3e63c0ab27863b63cda7fcd130f1c11cc47ef3fc3ed7afe669c0f60"; hasRunfiles = true; }; "xetex-devanagari" = { @@ -35229,29 +35633,29 @@ tl: { # no indentation version = "1.0.1"; }; "xkeyval" = { - revision = 35741; + revision = 57006; stripPrefix = 0; - sha512.run = "5d49a32326057d18ebb2bf25d29e06362c23d9a2f9df5058457fd84c9faebb545316c502a7baa19073abdd661e9497255cbcb938684dd006b0c10ba7c957c627"; - sha512.doc = "a2c51df068c738d598c472143af901392d181db37bb416a2e406ad1d65c6679e428efc1281256edcbd04bf6a64ffd23dd568bed007ea278362ae7378f5371a03"; - sha512.source = "6764eee7ff0c7649a4f6b809753134dd047ab6bfc3ba1bf16e5ae0fef2df0f3b40cd83b662cde002954ce705e8f8ee5950da36b38b2ee6533e6b089e3a32bf20"; + sha512.run = "39ae2a2d595c6808aab31a1f97caf31418e8aad6c05bec8812b0fca4a69c19eeb88e559940f952309f69a4b2d6342cce804f7d4d2b6270878be51c9b3cdf4ee1"; + sha512.doc = "58a64143df3ca2cfd5b8260dbe5df4900586d3131f7914ea1da9b0a8f53c84e2ce49a6e36c03be3c3a508b4a9f26e61c167c600e73105709d6f36b2acdb6bd2e"; + sha512.source = "ba88cb7ecf4e7cf2b3f125c989199abccf8cea300ba291f3dc9ce0f5259534b75bea6af23770e4d772c264eff9267530ce5759b62c33ea5bf998b97996ec2d52"; hasRunfiles = true; - version = "2.7a"; + version = "2.8"; }; "xlop" = { - revision = 54936; + revision = 56910; stripPrefix = 0; - sha512.run = "616697adfe84cc937830738b58108c511a1f21b95d814ab70d88c43e6022c263b0df2a855600977e6006803677cc3d69d4f0408f89a4b21e7e497b23574c20ab"; - sha512.doc = "e242468b910c0a9cfd3521eecb25423cf1f34b7fdddd3e7538201a6537755e00f4189e7fd636e154a04aa18fcff7c3b11169c4f4448f68eafd6d05cbe630840c"; + sha512.run = "6d1ebe5d3870a07175b5c07840dd2170f2309790d1b828df69b716aa83db1a35ff70d265a33d8fc0f6ebe0c4385b7fccee8445ab93b2649d3b27bb65e41f87d5"; + sha512.doc = "9e1cdf96a23bd468c2e4f358ade19c509685563376d5a7ffedf5cfc122138b14d1075c7ae8c8a00261f789d4010a9df7dd5b1e6a9db5bc7efb067168e7866540"; hasRunfiles = true; - version = "0.27"; + version = "0.28"; }; "xltabular" = { - revision = 55561; + revision = 56855; stripPrefix = 0; - sha512.run = "090fa8d3b10f979b12a1dd1f90bd71382307d9c75864f44b35483fddcb3e304e7651c066c202ffd4497e08fe0c854ea93435b159787f9d857a9e5ff826ba733f"; - sha512.doc = "9b80c2bd979030046c6d88f52c0951c6cade5388ecc477ac7ad867cb4220c0571374b47f2094a27f414805b8015b29a62573d9fa25ad57d411e831d6f4d7d0db"; + sha512.run = "6e49b4a2adc351394bf5ab5cc04d532c36196919a4de8be1ecdcc22c6f226a2d035987df9aa70144d701d9fdeae1dfa07280458a934e289a5d1b5976b2be3ce1"; + sha512.doc = "daa1f1ee3092d545b3949afa781e40a576a8a3ab1c20e40237d83c14455fcece353dee03161ed1725d3f54c8963ba94c683ae0874a8668c8e5c27ad3b58f227b"; hasRunfiles = true; - version = "0.2d"; + version = "0.2e"; }; "xltxtra" = { revision = 56594; @@ -35264,10 +35668,14 @@ tl: { # no indentation version = "0.7"; }; "xmltex" = { - revision = 54498; + revision = 57186; + deps."atbegshi" = tl."atbegshi"; + deps."atveryend" = tl."atveryend"; deps."babel" = tl."babel"; deps."cm" = tl."cm"; deps."dehyph" = tl."dehyph"; + deps."everyshi" = tl."everyshi"; + deps."firstaid" = tl."firstaid"; deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; deps."l3backend" = tl."l3backend"; @@ -35281,8 +35689,8 @@ tl: { # no indentation deps."tex-ini-files" = tl."tex-ini-files"; deps."unicode-data" = tl."unicode-data"; deps."xmltexconfig" = tl."xmltexconfig"; - sha512.run = "0fd2ab53c983706e42c33804e886f20956a08410e0e32976fb956cecf224c9ed397cb7ceb8aa9b717e3459084d597d715363752a346322f9c04e16acc86c9e46"; - sha512.doc = "51f8a23a2f59a079909d580a8587d1a403bc0fc75b13adda212cca8fb9f58d8f19debbf53783eada1e80389d8556b742f62f575712eb5fa15f90e4c9933ede8c"; + sha512.run = "e98a3ab9986d63d2605c87463bb32835d8ffcdd93f577b642da8e8f2447b6a74363c3a5799808c35f2e4b099af2789698ea471e04457a31ba8753ec4762e0ead"; + sha512.doc = "340859a95a102759494222e0cbf19b7f851c44d4cfeac77cee178b69f576151021de53c32ffb8dcb8ed911dae2eecaac943941481b5cccdfb5302bb8291724fb"; hasRunfiles = true; version = "0.8"; }; @@ -35301,6 +35709,15 @@ tl: { # no indentation hasRunfiles = true; version = "2.2"; }; +"xmuthesis" = { + revision = 56614; + stripPrefix = 0; + sha512.run = "3c9bdbd54cb99bddb9356586a1ba16d8e0ebe10d0120f6d6e7ae1c60375a41ce9ae9c01eded07b122aa323ddcb0e3ed9c68f6da6e716915f523e77bb343ee665"; + sha512.doc = "07e9b8eeaa864efbe6fb8e1c54e183a65f177b81454a2abc049e2efef8fae1d61a208273fd3cecb9d8bb8d601266f1c4897939c52d43fb5dff92ecdd3855c322"; + sha512.source = "9f3eaaac30cc9f396a3e33f6216b56485c27eb2f855b511642204025c27b40a529aa6dd1952c753a1fd50474ee6c5ef020f859dcc71e07ece39df090ed7ef46a"; + hasRunfiles = true; + version = "0.4.1"; +}; "xnewcommand" = { revision = 15878; stripPrefix = 0; @@ -35360,13 +35777,13 @@ tl: { # no indentation version = "1.2a"; }; "xpinyin" = { - revision = 54959; + revision = 56709; stripPrefix = 0; - sha512.run = "7212843681fd11e08bd7474194348f78cb56cb74421fae5020a7cab8afd766718e9d5ed0672dec3272498b186f4f9b79a774d4de5026345df033ef5f1e68313c"; - sha512.doc = "edecda1ff3c1ac3a1c6b563da9a36ee0ae41ac1b9952c994ece387cc0985e045efb80d50b8fd251fb8a6167fcfc6b154b1f08ad7aed1ce1c12a8907bd7d954e4"; - sha512.source = "8bde3970eed2f31970218d7ba6a7ac74d47ae51d3d6ba70f9e66a80a061518ee8aac1e1914b32468f1aa11e7d7ac3b0c3b1d27907d17111776c2a4d97d0a4203"; + sha512.run = "94ea16ea9d649e28094173862ce5e31c655acef0c21dcd03a6f7d3f5463cdca15da7ea9b4408d539900a7c2d55a7418f4fac8defbe914bcad8c4a58f6e1bdb4d"; + sha512.doc = "58715c5eb8e0e336bf6de29b47760eedc27802fd82bb120ce37a6502eeb00c8b8230503d660e687131d8312be93a72dc6b2dc15b89cb82d46be5f5b7200a91e9"; + sha512.source = "edf759656775c8e8f1b3953949d0d1b1d3d34a165b51781d4748034e5a8d3ff19650a4e9a2d7397156f0f77104b5513c61ac84afaf7634a49c52044ee8c03bc5"; hasRunfiles = true; - version = "2.8"; + version = "2.9"; }; "xprintlen" = { revision = 35928; @@ -35454,12 +35871,12 @@ tl: { # no indentation version = "0.981"; }; "xurl" = { - revision = 53538; + revision = 57265; stripPrefix = 0; - sha512.run = "c034606febfdf397774f51f5057fb12243e5fbcd6ff8c9aa1fe60fa2643b5cdfe6c36558e5a4398e7c38c0da520ffeb53a930fda983b79c9d41fb31b74d6ad25"; - sha512.doc = "6c8833dcbec24d6b336b6dff58558ce4c38de22032f24d7510db85e987c83b2cd2089bc1a5b414ac82987bd8387dadf3456f0ca3885607285834688fafd29175"; + sha512.run = "51251afe43f9b175e4afd901f10edd63bad590b0591f117d423866ed1a82e2c0ab35dee7e03250c331f8a8605f9c6ba8357e93ef0aa80d40dc03379bde24dd1c"; + sha512.doc = "df7e35d13f340c44813e0656c36148b92319a7099ae47eb02513d33834b642528eff2e81299aa670c2a4572e78c830d48c83b46996700e9fb568db16b84f1e57"; hasRunfiles = true; - version = "0.09"; + version = "0.09a"; }; "xwatermark" = { revision = 28090; @@ -35543,13 +35960,13 @@ tl: { # no indentation hasRunfiles = true; }; "yathesis" = { - revision = 55578; + revision = 56667; stripPrefix = 0; - sha512.run = "6568c02322bed6aa694089977c81d3f86d9cc184fd75afbb23a1b41021dd304f36ba9e5809c233ef9b0b04709f7e98d77b526569d8dc134de527985093b8b50a"; - sha512.doc = "9212f8068e78c12e315f2fad35ace56881d7c4ba8436bed2312fd37083ffbba6fea408df29f7b88578ddadbc3697416726f21395c56ca1dc71d60e80c8cc6456"; - sha512.source = "e8960ed6c320f403d84eec1be5fa4b2c459715f315623c7384538dd91369e65ba848e6e41e796f3bde7c29618f8ce80b785b05ac841e87c66bd7e359fba25a3c"; + sha512.run = "e0caca0434238bcc76c8da3f9c59ecd412618d9bd64d0085782a54dfd63ef1f4f37089a362d97182a645624f92a616814bbb908fb11f3c859793546a9240b629"; + sha512.doc = "be719c2eaecaa6773b68a1497b6819d0d3e3d4f08887351ffab7a9089167d5ef268d55386c644c8fb9fdf5141baf7203755cbc4e5892fc47b269ccb654796e77"; + sha512.source = "ff6674724d8c12dd8e78244330cd42fe934038cf6f026e0463209a99f65cd7b23c33e4aa053592350509afa7daa1058674db862975609abc33f1f4f5db74a593"; hasRunfiles = true; - version = "1.0.3"; + version = "1.0.4"; }; "yax" = { revision = 54080; @@ -35642,12 +36059,12 @@ tl: { # no indentation hasRunfiles = true; }; "yquant" = { - revision = 56189; + revision = 56830; stripPrefix = 0; - sha512.run = "acee12495068caed7b37268700dabd4d753495dacae3c91e2d932081af326ef46f1575b5b4a8b29a08767b25c64c8195aaef4d4132813a7177762c7ac6fdf796"; - sha512.doc = "c8d299c28e32670222473bba56dc8d11b8e6f843f5714d62dba36ef4d8cf1a43dca1fcc8bc213d67a7a0cda5d792d23c51ec74256157b07a819d7087b75d2951"; + sha512.run = "b0227b4573dc18aeaa6563afad2bfcff8190a3cbb63c3ef8406755b117035b1c8d7665c4998ef10ec81cc0619b30382a04be0cf9a8d43861ce3fa17f910b4f7d"; + sha512.doc = "06aa69f822908763495da04ca1e5dd1913ccf84c92d9eb56fc616a5b3d11ad85307cf3aec8370f7badf61677081b9dc8c26ded52fd282d4fdfa6cfb6f6b24dd4"; hasRunfiles = true; - version = "0.3.2"; + version = "0.3.3"; }; "ytableau" = { revision = 27430; @@ -35761,13 +36178,13 @@ tl: { # no indentation version = "1.0"; }; "zref" = { - revision = 55327; + revision = 56611; stripPrefix = 0; - sha512.run = "ab36a4be0c9fd15b9b8c6ec1b726deb6e7a3a3974d4c50fec9712aa34ce5f719a67903807e0781574872d56d62e27ee8bce73a87b4be4393bb9e9ba44e256719"; - sha512.doc = "42f84e5df57b2032a0e6ba3acb1d509f6eae7742ac7e3ad1e8952c60d13e38482b63498e40aa9f1830e023569edc957421b481a84dde697893e914911661d7c7"; - sha512.source = "03d16a0069569f08a6b564c50948ae813ffe56839876e6e05bef2f5aa10703dda88209c34432bbf0913afd95d3437ec71e9288858d60ae9d0ad015f71df5d253"; + sha512.run = "f64604e9308278b34347bcbcaed39b500371c575082311c1fb28bf6bd7db26fc2d2e3d3e8843e3a195fd22050450bffb18c3e8b64a54f0787c1122ac3901ad2f"; + sha512.doc = "928c54696572694b1fc7712a0f8357851c18d83bf723c6f03a9f784dfbd123b2c886593bc95de0d3b7f8109e1d0b3a52cc6ef1a877c0506130e7c5d96b046a67"; + sha512.source = "82e6c4210453e9f7adfd93673aa2e7dfbf2c39e938b9ad0d2309ea59b53259d1d1d9b05924f2f6f9f64ba29ecdbda8e074527923fdfd1551a42b1057450b2fc5"; hasRunfiles = true; - version = "2.31"; + version = "2.32"; }; "zwgetfdate" = { revision = 15878; diff --git a/pkgs/tools/typesetting/tikzit/default.nix b/pkgs/tools/typesetting/tikzit/default.nix index 76b9b285d153..29fd21ed31fe 100644 --- a/pkgs/tools/typesetting/tikzit/default.nix +++ b/pkgs/tools/typesetting/tikzit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, mkDerivation, fetchFromGitHub, qmake, qttools, qtbase, poppler, flex, bison }: +{ lib, stdenv, mkDerivation, fetchFromGitHub, qmake, qttools, qtbase, poppler, flex, bison }: mkDerivation { pname = "tikzit"; @@ -17,7 +17,7 @@ mkDerivation { # src/data/tikzlexer.l:29:10: fatal error: tikzparser.parser.hpp: No such file or directory enableParallelBuilding = false; - meta = with stdenv.lib; { + meta = with lib; { description = "A graphical tool for rapidly creating graphs and diagrams using PGF/TikZ"; longDescription = '' TikZiT is a simple GUI editor for graphs and string diagrams. diff --git a/pkgs/tools/typesetting/xmlroff/default.nix b/pkgs/tools/typesetting/xmlroff/default.nix index eb026e5557eb..d214b24b80b3 100644 --- a/pkgs/tools/typesetting/xmlroff/default.nix +++ b/pkgs/tools/typesetting/xmlroff/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , autoreconfHook , gtk2 , libxml2 @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { substituteInPlace Makefile --replace "docs" "" # docs target wants to download from network ''; - meta = with stdenv.lib; { + meta = with lib; { description = "XSL Formatter"; homepage = "http://xmlroff.org/"; platforms = platforms.unix; diff --git a/pkgs/tools/video/atomicparsley/default.nix b/pkgs/tools/video/atomicparsley/default.nix index 2f7e4d97cbba..7f3bdcb1bd66 100644 --- a/pkgs/tools/video/atomicparsley/default.nix +++ b/pkgs/tools/video/atomicparsley/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, zlib, Cocoa }: +{ lib, stdenv, fetchFromGitHub, cmake, zlib, Cocoa }: stdenv.mkDerivation rec { pname = "atomicparsley"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A CLI program for reading, parsing and setting metadata into MPEG-4 files"; homepage = "https://github.com/wez/atomicparsley"; license = licenses.gpl2Plus; diff --git a/pkgs/tools/video/bento4/default.nix b/pkgs/tools/video/bento4/default.nix index 87585caebfb5..d096f834ba1b 100644 --- a/pkgs/tools/video/bento4/default.nix +++ b/pkgs/tools/video/bento4/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , cmake }: stdenv.mkDerivation rec { @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { find -maxdepth 1 -executable -type f -exec mv --target-directory="$out/bin" {} \; ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Full-featured MP4 format and MPEG DASH library and tools"; homepage = "http://bento4.com"; license = licenses.gpl2Plus; diff --git a/pkgs/tools/video/dvgrab/default.nix b/pkgs/tools/video/dvgrab/default.nix index 9077d34614df..7f9be8bb616d 100644 --- a/pkgs/tools/video/dvgrab/default.nix +++ b/pkgs/tools/video/dvgrab/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, stdenv, libunwind, libraw1394, libjpeg, libiec61883, libdv +{ fetchFromGitHub, lib, stdenv, libunwind, libraw1394, libjpeg, libiec61883, libdv , libavc1394, pkgconfig, autoreconfHook }: stdenv.mkDerivation { @@ -20,7 +20,7 @@ stdenv.mkDerivation { autoreconfHook pkgconfig ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Receive and store audio & video over IEEE1394"; longDescription = '' diff --git a/pkgs/tools/video/gopro/default.nix b/pkgs/tools/video/gopro/default.nix index 9979b224868a..9aa20a786dd2 100644 --- a/pkgs/tools/video/gopro/default.nix +++ b/pkgs/tools/video/gopro/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , ffmpeg_3 , imagemagick , makeWrapper @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Command line interface for processing media filmed on GoPro HERO 3, 4, 5, 6, and 7 cameras"; homepage = "https://github.com/KonradIT/gopro-linux"; platforms = platforms.linux; diff --git a/pkgs/tools/video/mjpegtools/default.nix b/pkgs/tools/video/mjpegtools/default.nix index 6c74aab95731..801d8c564c18 100644 --- a/pkgs/tools/video/mjpegtools/default.nix +++ b/pkgs/tools/video/mjpegtools/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "lib" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A suite of programs for processing MPEG or MJPEG video"; homepage = "http://mjpeg.sourceforge.net/"; license = licenses.gpl2; diff --git a/pkgs/tools/video/svt-av1/default.nix b/pkgs/tools/video/svt-av1/default.nix new file mode 100644 index 000000000000..38c16fadcb82 --- /dev/null +++ b/pkgs/tools/video/svt-av1/default.nix @@ -0,0 +1,24 @@ +{ lib, stdenv, fetchFromGitHub, cmake, nasm }: + +stdenv.mkDerivation rec { + pname = "svt-av1"; + version = "0.8.6"; + + src = fetchFromGitHub { + owner = "AOMediaCodec"; + repo = "SVT-AV1"; + rev = "v${version}"; + sha256 = "1wzamg89azi1f93wxvdy7silsgklckc754ca066k33drvyacicyw"; + }; + + nativeBuildInputs = [ cmake nasm ]; + + meta = with lib; { + description = "AV1-compliant encoder/decoder library core"; + homepage = "https://github.com/AOMediaCodec/SVT-AV1"; + license = licenses.bsd2; + platforms = platforms.unix; + broken = stdenv.isAarch64; # undefined reference to `cpuinfo_arm_linux_init' + maintainers = with maintainers; [ chiiruno ]; + }; +} diff --git a/pkgs/tools/video/untrunc-anthwlock/default.nix b/pkgs/tools/video/untrunc-anthwlock/default.nix index 126952850936..632f8c41463d 100644 --- a/pkgs/tools/video/untrunc-anthwlock/default.nix +++ b/pkgs/tools/video/untrunc-anthwlock/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ffmpeg, libui }: +{ lib, stdenv, fetchFromGitHub, ffmpeg, libui }: stdenv.mkDerivation { pname = "untrunc-anthwlock"; @@ -26,7 +26,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Restore a truncated mp4/mov (improved version of ponchio/untrunc)"; homepage = "https://github.com/anthwlock/untrunc"; license = licenses.gpl2; diff --git a/pkgs/tools/video/untrunc/default.nix b/pkgs/tools/video/untrunc/default.nix index 1918f4e59745..3ef025f5875c 100644 --- a/pkgs/tools/video/untrunc/default.nix +++ b/pkgs/tools/video/untrunc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, gcc, libav_12, fetchFromGitHub }: +{ lib, stdenv, gcc, libav_12, fetchFromGitHub }: stdenv.mkDerivation { pname = "untrunc"; @@ -30,7 +30,7 @@ stdenv.mkDerivation { -I$libavConfiguredSrc -lavformat -lavcodec -lavutil ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Restore a damaged (truncated) mp4, m4v, mov, 3gp video from a similar, undamaged video"; license = licenses.gpl2; homepage = "https://github.com/ponchio/untrunc"; diff --git a/pkgs/tools/video/yamdi/default.nix b/pkgs/tools/video/yamdi/default.nix index 28861887ed2a..32620fe98c5a 100644 --- a/pkgs/tools/video/yamdi/default.nix +++ b/pkgs/tools/video/yamdi/default.nix @@ -1,5 +1,5 @@ { - stdenv, + lib, stdenv, fetchurl, }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { install -D {,$out/share/man/}man1/yamdi.1 ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Yet Another MetaData Injector for FLV"; homepage = "http://yamdi.sourceforge.net/"; license = licenses.bsd3; diff --git a/pkgs/tools/virtualization/amazon-ecs-cli/default.nix b/pkgs/tools/virtualization/amazon-ecs-cli/default.nix index bd63481054c3..012546160e09 100644 --- a/pkgs/tools/virtualization/amazon-ecs-cli/default.nix +++ b/pkgs/tools/virtualization/amazon-ecs-cli/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl}: +{ lib, stdenv, fetchurl}: stdenv.mkDerivation rec { pname = "amazon-ecs-cli"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { chmod +x $out/bin/ecs-cli ''; # */ - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ECS_CLI.html"; description = "The Amazon ECS command line interface"; longDescription = "The Amazon Elastic Container Service (Amazon ECS) command line interface (CLI) provides high-level commands to simplify creating, updating, and monitoring clusters and tasks from a local development environment."; diff --git a/pkgs/tools/virtualization/awless/default.nix b/pkgs/tools/virtualization/awless/default.nix index f051fd12ab3b..3faf90ab4ac6 100644 --- a/pkgs/tools/virtualization/awless/default.nix +++ b/pkgs/tools/virtualization/awless/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "awless"; @@ -13,7 +13,7 @@ buildGoPackage rec { sha256 = "187i21yrm10r3f5naj3jl0rmydr5dkhmdhxs90hhf8hjp59a89kg"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/wallix/awless/"; description = "A Mighty CLI for AWS"; platforms = with platforms; linux ++ darwin; diff --git a/pkgs/tools/virtualization/awsebcli/default.nix b/pkgs/tools/virtualization/awsebcli/default.nix index 00f8ed89a2bf..fa8e96def24a 100644 --- a/pkgs/tools/virtualization/awsebcli/default.nix +++ b/pkgs/tools/virtualization/awsebcli/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python3, glibcLocales }: +{ lib, stdenv, python3, glibcLocales }: let localPython = python3.override { @@ -87,7 +87,7 @@ in with localPython.pkgs; buildPythonApplication rec { mv $out/bin/eb_completion.bash $out/share/bash-completion/completions/ ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://aws.amazon.com/elasticbeanstalk/"; description = "A command line interface for Elastic Beanstalk"; maintainers = with maintainers; [ eqyiel ]; diff --git a/pkgs/tools/virtualization/distrobuilder/default.nix b/pkgs/tools/virtualization/distrobuilder/default.nix index 6ad8c355ee29..ccdd80fb37c5 100644 --- a/pkgs/tools/virtualization/distrobuilder/default.nix +++ b/pkgs/tools/virtualization/distrobuilder/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgconfig, buildGoPackage, fetchFromGitHub +{ lib, stdenv, pkgconfig, buildGoPackage, fetchFromGitHub , makeWrapper, coreutils, gnupg, gnutar, squashfsTools, debootstrap }: @@ -27,7 +27,7 @@ buildGoPackage rec { ''; nativeBuildInputs = [ pkgconfig makeWrapper ]; - meta = with stdenv.lib; { + meta = with lib; { description = "System container image builder for LXC and LXD"; homepage = "https://github.com/lxc/distrobuilder"; license = licenses.asl20; diff --git a/pkgs/tools/virtualization/google-compute-engine-oslogin/default.nix b/pkgs/tools/virtualization/google-compute-engine-oslogin/default.nix index ea58eb4c6b83..4d34cd50b1e7 100644 --- a/pkgs/tools/virtualization/google-compute-engine-oslogin/default.nix +++ b/pkgs/tools/virtualization/google-compute-engine-oslogin/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { inherit (nixosTests) google-oslogin; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/GoogleCloudPlatform/compute-image-packages"; description = "OS Login Guest Environment for Google Compute Engine"; license = licenses.asl20; diff --git a/pkgs/tools/virtualization/marathonctl/default.nix b/pkgs/tools/virtualization/marathonctl/default.nix index 20b461fa3465..6f036795e720 100644 --- a/pkgs/tools/virtualization/marathonctl/default.nix +++ b/pkgs/tools/virtualization/marathonctl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage { pname = "marathonctl-unstable"; @@ -15,7 +15,7 @@ buildGoPackage { sha256 = "1fcc54hwpa8s3kz4gn26mc6nrv6zjrw869331nvm47khi23gpmxw"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/shoenig/marathonctl"; description = "CLI tool for Marathon"; license = licenses.mit; diff --git a/pkgs/tools/virtualization/nixos-shell/default.nix b/pkgs/tools/virtualization/nixos-shell/default.nix index d529986c5d46..f0657f4638b1 100644 --- a/pkgs/tools/virtualization/nixos-shell/default.nix +++ b/pkgs/tools/virtualization/nixos-shell/default.nix @@ -1,4 +1,4 @@ -{ stdenv, nix, fetchFromGitHub, makeWrapper }: +{ lib, stdenv, nix, fetchFromGitHub, makeWrapper }: stdenv.mkDerivation rec { pname = "nixos-shell"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { installFlags = [ "PREFIX=${placeholder "out"}" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Spawns lightweight nixos vms in a shell"; inherit (src.meta) homepage; license = licenses.mit; diff --git a/pkgs/tools/virtualization/shipyard/default.nix b/pkgs/tools/virtualization/shipyard/default.nix new file mode 100644 index 000000000000..e3017e98a070 --- /dev/null +++ b/pkgs/tools/virtualization/shipyard/default.nix @@ -0,0 +1,29 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "shipyard"; + version = "0.1.17"; + + src = fetchFromGitHub { + rev = "v${version}"; + owner = "shipyard-run"; + repo = pname; + sha256 = "13cp7qpxchnyxdm26xwdcp557nj16f4h8vlj0p4h79z5g7pcklln"; + }; + vendorSha256 = "0gib9s09lz91wawbms9zq4wc5k6bdxfzpxm8q92h0bsjw1bj1hzs"; + + buildFlagsArray = [ + "-ldflags=-s -w -X main.version=${version}" + ]; + + # Tests require a large variety of tools and resources to run including + # Kubernetes, Docker, and GCC. + doCheck = false; + + meta = with lib; { + description = "Shipyard is a tool for building modern cloud native development environments"; + homepage = "https://shipyard.run"; + license = licenses.mpl20; + maintainers = with maintainers; [ cpcloud ]; + }; +} diff --git a/pkgs/tools/virtualization/udocker/default.nix b/pkgs/tools/virtualization/udocker/default.nix index 00771b917501..c971dfcb1bd0 100644 --- a/pkgs/tools/virtualization/udocker/default.nix +++ b/pkgs/tools/virtualization/udocker/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, proot, patchelf, fakechroot, runc, simplejson, pycurl, coreutils, nose, mock, buildPythonApplication }: +{ lib, stdenv, fetchFromGitHub, proot, patchelf, fakechroot, runc, simplejson, pycurl, coreutils, nose, mock, buildPythonApplication }: buildPythonApplication rec { @@ -31,7 +31,7 @@ buildPythonApplication rec { NOSE_EXCLUDE=test_03_create_repo,test_04_is_repo,test_02__get_group_from_host nosetests -v tests/unit_tests.py ''; - meta = with stdenv.lib; { + meta = with lib; { description = "basic user tool to execute simple docker containers in user space without root privileges"; homepage = "https://indigo-dc.gitbooks.io/udocker"; license = licenses.asl20; diff --git a/pkgs/tools/wayland/wayland-utils/default.nix b/pkgs/tools/wayland/wayland-utils/default.nix index 23629309e52e..5c07081099c6 100644 --- a/pkgs/tools/wayland/wayland-utils/default.nix +++ b/pkgs/tools/wayland/wayland-utils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , meson, pkg-config, ninja , wayland, wayland-protocols }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson pkg-config ninja wayland ]; buildInputs = [ wayland wayland-protocols ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Wayland utilities (wayland-info)"; longDescription = '' A collection of Wayland related utilities: diff --git a/pkgs/tools/wayland/wlsunset/default.nix b/pkgs/tools/wayland/wlsunset/default.nix index 2993f990aad5..692ddd37cf39 100644 --- a/pkgs/tools/wayland/wlsunset/default.nix +++ b/pkgs/tools/wayland/wlsunset/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, meson, pkg-config, ninja, wayland +{ lib, stdenv, fetchurl, meson, pkg-config, ninja, wayland , wayland-protocols }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson pkg-config ninja wayland ]; buildInputs = [ wayland wayland-protocols ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Day/night gamma adjustments for Wayland"; longDescription = '' Day/night gamma adjustments for Wayland compositors supporting diff --git a/pkgs/tools/wayland/wshowkeys/default.nix b/pkgs/tools/wayland/wshowkeys/default.nix index 0db02990c036..1c095ca297a6 100644 --- a/pkgs/tools/wayland/wshowkeys/default.nix +++ b/pkgs/tools/wayland/wshowkeys/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , meson, pkg-config, wayland, ninja , cairo, libinput, pango, wayland-protocols, libxkbcommon }: @@ -18,7 +18,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ meson pkg-config wayland ninja ]; buildInputs = [ cairo libinput pango wayland-protocols libxkbcommon ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Displays keys being pressed on a Wayland session"; longDescription = '' Displays keypresses on screen on supported Wayland compositors (requires diff --git a/pkgs/tools/wayland/wtype/default.nix b/pkgs/tools/wayland/wtype/default.nix index a1c4744318e3..3476f3abcdaa 100644 --- a/pkgs/tools/wayland/wtype/default.nix +++ b/pkgs/tools/wayland/wtype/default.nix @@ -10,15 +10,15 @@ , wayland }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "wtype"; - version = "2020-09-14"; + version = "0.3"; src = fetchFromGitHub { owner = "atx"; repo = "wtype"; - rev = "74071228dea4047157ae82960a2541ecc431e4a1"; - sha256 = "1ncspxpnbwv1vkfmxs58q7aykjb6skaa1pg5sw5h798pss5j80rd"; + rev = "v${version}"; + hash = "sha256-8q2PxI3ItR4tsP/KOiSlqnuK4ZSe7OdekheolEFVmys="; }; nativeBuildInputs = [ meson ninja pkg-config wayland ]; diff --git a/pkgs/tools/wayland/ydotool/default.nix b/pkgs/tools/wayland/ydotool/default.nix index d8b6ad4ff87c..eaa93daf3cf8 100644 --- a/pkgs/tools/wayland/ydotool/default.nix +++ b/pkgs/tools/wayland/ydotool/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, cmake, boost, libevdevplus, libuinputplus }: +{ lib, stdenv, fetchFromGitHub, pkgconfig, cmake, boost, libevdevplus, libuinputplus }: stdenv.mkDerivation rec { pname = "ydotool"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { boost libevdevplus libuinputplus ]; - meta = with stdenv.lib; { + meta = with lib; { inherit (src.meta) homepage; description = "Generic Linux command-line automation tool"; license = licenses.mit; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 6e5da1bf34ec..fa0149c5789a 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -78,6 +78,7 @@ mapAliases ({ bittorrentSync = throw "bittorrentSync has been deprecated by resilio-sync."; # added 2019-06-03 bittorrentSync14 = throw "bittorrentSync14 has been deprecated by resilio-sync."; # added 2019-06-03 bittorrentSync20 = throw "bittorrentSync20 has been deprecated by resilio-sync."; # added 2019-06-03 + bs1770gain = throw "bs1770gain has been removed from nixpkgs, as it had no maintainer or reverse dependencies."; # added 2021-01-02 btc1 = throw "btc1 has been removed, it was abandoned by upstream"; # added 2020-11-03 buildPerlPackage = perlPackages.buildPerlPackage; # added 2018-10-12 buildGo112Package = throw "buildGo112Package has been removed"; # added 2020-04-26 @@ -141,7 +142,13 @@ mapAliases ({ emacsPackagesGen = emacsPackagesFor; # added 2018-08-18 emacsPackagesNgGen = emacsPackagesFor; # added 2018-08-18 emacsPackagesNgFor = emacsPackagesFor; # added 2019-08-07 - emacsPackagesNg = emacsPackages; # added 2019-08-07 + emacsPackagesNg = emacs.pkgs; # added 2019-08-07 + emacs26Packages = emacs26.pkgs; # added 2020-12-18 + emacs27Packages = emacs27.pkgs; # added 2020-12-18 + emacs26WithPackages = emacs26.pkgs.withPackages; # added 2020-12-18 + emacs27WithPackages = emacs27.pkgs.withPackages; # added 2020-12-18 + emacsWithPackages = emacs.pkgs.withPackages; # added 2020-12-18 + emacsPackages = emacs.pkgs; # added 2020-12-18 emby = throw "The Emby derivation has been removed, see jellyfin instead for a free software fork."; # added 2019-05-01 enblendenfuse = enblend-enfuse; # 2015-09-30 evolution_data_server = evolution-data-server; # added 2018-02-25 @@ -157,6 +164,7 @@ mapAliases ({ firefoxWrapper = firefox; # 2015-09 firestr = throw "firestr has been removed."; # added 2019-12-08 + fish-foreign-env = throw "fish-foreign-env has been replaced with fishPlugins.foreign-env"; # added 2020-12-29, modified 2021-01-10 flameGraph = flamegraph; # added 2018-04-25 flvtool2 = throw "flvtool2 has been removed."; # added 2020-11-03 foldingathome = fahclient; # added 2020-09-03 @@ -208,6 +216,7 @@ mapAliases ({ }; gnustep-make = gnustep.make; # added 2016-7-6 gnupg20 = throw "gnupg20 has been removed from nixpkgs as upstream dropped support on 2017-12-31";# added 2020-07-12 + gnuvd = throw "gnuvd was removed because the backend service is missing"; # added 2020-01-14 go_1_12 = throw "go_1_12 has been removed"; # added 2020-04-26 go-pup = pup; # added 2017-12-19 gobjectIntrospection = gobject-introspection; # added 2018-12-02 @@ -282,7 +291,7 @@ mapAliases ({ libgnome_keyring3 = libgnome-keyring3; # added 2018-02-25 libgumbo = gumbo; # added 2018-01-21 libGL_driver = mesa.drivers; # added 2019-05-28 - libintlOrEmpty = stdenv.lib.optional (!stdenv.isLinux || stdenv.hostPlatform.libc != "glibc") gettext; # added 2018-03-14 + libintlOrEmpty = lib.optional (!stdenv.isLinux || stdenv.hostPlatform.libc != "glibc") gettext; # added 2018-03-14 libjpeg_drop = libjpeg_original; # added 2020-06-05 libjson_rpc_cpp = libjson-rpc-cpp; # added 2017-02-28 liblapackWithoutAtlas = lapack-reference; # added 2018-11-05 @@ -664,6 +673,7 @@ mapAliases ({ uberwriter = apostrophe; # added 2020-04-23 ubootBeagleboneBlack = ubootAmx335xEVM; # added 2020-01-21 ucsFonts = ucs-fonts; # added 2016-07-15 + ufraw = throw "ufraw is unmaintained and has been removed from nixpkgs. Its successor, nufraw, doesn't seem to be stable enough. Consider using Darktable for now."; # 2020-01-11 ultrastardx-beta = ultrastardx; # added 2017-08-12 unicorn-emu = unicorn; # added 2020-10-29 unifiStable = unifi6; # added 2020-12-28 @@ -792,12 +802,17 @@ mapAliases ({ gcc-snapshot = throw "gcc-snapshot: Marked as broken for >2 years, additionally this 'snapshot' pointed to a fairly old one from gcc7."; + todolist = throw "todolist is now ultralist."; # added 2020-12-27 + /* Cleanup before 21.03 */ riot-desktop = throw "riot-desktop is now element-desktop!"; riot-web = throw "riot-web is now element-web"; ant-dracula-theme = throw "ant-dracula-theme is now dracula-theme, and theme name is Dracula instead of Ant-Dracula."; + /* Added 2021-01-02 */ + ttyrec = ovh-ttyrec; + /* If these are in the scope of all-packages.nix, they cause collisions between mixed versions of qt. See: https://github.com/NixOS/nixpkgs/pull/101369 */ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d7c9bf7f5370..ed9ed3535946 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -120,6 +120,10 @@ in { deps = [ autoconf264 automake111x gettext libtool ]; } ../build-support/setup-hooks/autoreconf.sh; + autoreconfHook269 = makeSetupHook + { deps = [ autoconf269 automake gettext libtool ]; } + ../build-support/setup-hooks/autoreconf.sh; + autoPatchelfHook = makeSetupHook { name = "auto-patchelf-hook"; } ../build-support/setup-hooks/auto-patchelf.sh; @@ -204,6 +208,8 @@ in cpu-x = callPackage ../applications/misc/cpu-x { }; + crow-translate = libsForQt5.callPackage ../applications/misc/crow-translate { }; + dhallToNix = callPackage ../build-support/dhall-to-nix.nix { inherit dhall-nix; }; @@ -247,7 +253,9 @@ in archiver = callPackage ../applications/misc/archiver { }; # It segfaults if it uses qt5.15 - digitalbitbox = libsForQt514.callPackage ../applications/misc/digitalbitbox { }; + digitalbitbox = libsForQt514.callPackage ../applications/misc/digitalbitbox { + autoreconfHook = buildPackages.autoreconfHook269; + }; gretl = callPackage ../applications/science/math/gretl { }; @@ -492,7 +500,7 @@ in mkShell = callPackage ../build-support/mkshell { }; - nixBufferBuilders = import ../build-support/emacs/buffer.nix { inherit (pkgs) lib writeText; inherit (emacsPackages) inherit-local; }; + nixBufferBuilders = import ../build-support/emacs/buffer.nix { inherit (pkgs) lib writeText; inherit (emacs.pkgs) inherit-local; }; nix-gitignore = callPackage ../build-support/nix-gitignore { }; @@ -724,6 +732,8 @@ in foot = callPackage ../applications/terminal-emulators/foot { }; + germinal = callPackage ../applications/terminal-emulators/germinal { }; + guake = callPackage ../applications/terminal-emulators/guake { }; havoc = callPackage ../applications/terminal-emulators/havoc { }; @@ -805,7 +815,9 @@ in wayst = callPackage ../applications/terminal-emulators/wayst { }; - wezterm = callPackage ../applications/terminal-emulators/wezterm { }; + wezterm = callPackage ../applications/terminal-emulators/wezterm { + inherit (darwin.apple_sdk.frameworks) Cocoa CoreGraphics Foundation; + }; x3270 = callPackage ../applications/terminal-emulators/x3270 { }; @@ -821,6 +833,8 @@ in alpine-make-vm-image = callPackage ../tools/virtualization/alpine-make-vm-image { }; + amazon-ec2-utils = callPackage ../tools/admin/amazon-ec2-utils { }; + amazon-ecs-cli = callPackage ../tools/virtualization/amazon-ecs-cli { }; amber = callPackage ../tools/text/amber { @@ -893,14 +907,14 @@ in apitrace = libsForQt514.callPackage ../applications/graphics/apitrace {}; + argtable = callPackage ../development/libraries/argtable { }; + arguments = callPackage ../development/libraries/arguments { }; argus = callPackage ../tools/networking/argus {}; argus-clients = callPackage ../tools/networking/argus-clients {}; - argtable = callPackage ../tools/misc/argtable {}; - argyllcms = callPackage ../tools/graphics/argyllcms {}; arp-scan = callPackage ../tools/misc/arp-scan { }; @@ -961,6 +975,8 @@ in aws-google-auth = python3Packages.callPackage ../tools/admin/aws-google-auth { }; + aws-nuke = callPackage ../tools/admin/aws-nuke { }; + aws-okta = callPackage ../tools/security/aws-okta { }; aws-rotate-key = callPackage ../tools/admin/aws-rotate-key { }; @@ -981,6 +997,8 @@ in berglas = callPackage ../tools/admin/berglas/default.nix { }; + betterdiscordctl = callPackage ../tools/misc/betterdiscordctl { }; + brakeman = callPackage ../development/tools/analysis/brakeman { }; brewtarget = libsForQt514.callPackage ../applications/misc/brewtarget { } ; @@ -1021,7 +1039,9 @@ in apg = callPackage ../tools/security/apg { }; - apt-dater = callPackage ../tools/package-management/apt-dater { }; + apt-dater = callPackage ../tools/package-management/apt-dater { + autoreconfHook = buildPackages.autoreconfHook269; + }; autorevision = callPackage ../tools/misc/autorevision { }; @@ -1163,6 +1183,8 @@ in doona = callPackage ../tools/security/doona { }; + droidcam = callPackage ../applications/video/droidcam { }; + ecdsautils = callPackage ../tools/security/ecdsautils { }; sedutil = callPackage ../tools/security/sedutil { }; @@ -1265,6 +1287,8 @@ in google-amber = callPackage ../tools/graphics/amber { }; + hakrawler = callPackage ../tools/security/hakrawler { }; + hime = callPackage ../tools/inputmethods/hime {}; hostctl = callPackage ../tools/system/hostctl { }; @@ -1392,6 +1416,8 @@ in novacomd = callPackage ../development/mobile/webos/novacomd.nix { }; }; + apprise = with python3Packages; toPythonApplication apprise; + aria2 = callPackage ../tools/networking/aria2 { inherit (darwin.apple_sdk.frameworks) Security; inherit (python3Packages) sphinx; @@ -1474,6 +1500,10 @@ in babeld = callPackage ../tools/networking/babeld { }; + babelfish = callPackage ../shells/fish/babelfish.nix { }; + + badchars = python3Packages.callPackage ../tools/security/badchars { }; + badvpn = callPackage ../tools/networking/badvpn {}; barcode = callPackage ../tools/graphics/barcode {}; @@ -1614,6 +1644,8 @@ in boot = callPackage ../development/tools/build-managers/boot { }; + bowtie = callPackage ../applications/science/biology/bowtie { }; + bowtie2 = callPackage ../applications/science/biology/bowtie2 { }; boxfs = callPackage ../tools/filesystems/boxfs { }; @@ -1804,6 +1836,8 @@ in cloud-init = python3.pkgs.callPackage ../tools/virtualization/cloud-init { }; + cloudbrute = callPackage ../tools/security/cloudbrute { }; + cloudflared = callPackage ../applications/networking/cloudflared { }; cloudmonkey = callPackage ../tools/virtualization/cloudmonkey { }; @@ -2006,6 +2040,8 @@ in discocss = callPackage ../tools/misc/discocss { }; + disfetch = callPackage ../tools/misc/disfetch { }; + disk-filltest = callPackage ../tools/system/disk-filltest { }; diskscan = callPackage ../tools/misc/diskscan { }; @@ -2219,6 +2255,8 @@ in gdrive = callPackage ../applications/networking/gdrive { }; + gdu = callPackage ../tools/system/gdu { }; + go-chromecast = callPackage ../applications/video/go-chromecast { }; go-rice = callPackage ../tools/misc/go.rice {}; @@ -2342,6 +2380,8 @@ in inchi = callPackage ../development/libraries/inchi {}; + icon-slicer = callPackage ../tools/X11/icon-slicer { }; + ifm = callPackage ../tools/graphics/ifm {}; ink = callPackage ../tools/misc/ink { }; @@ -2362,6 +2402,8 @@ in kapacitor = callPackage ../servers/monitoring/kapacitor { }; + kaldi = callPackage ../tools/audio/kaldi { }; + kisslicer = callPackage ../tools/misc/kisslicer { }; klaus = with python3Packages; toPythonApplication klaus; @@ -2464,8 +2506,14 @@ in monetdb = callPackage ../servers/sql/monetdb { }; + monado = callPackage ../applications/graphics/monado { + inherit (gst_all_1) gstreamer gst-plugins-base; + }; + mons = callPackage ../tools/misc/mons {}; + monsoon = callPackage ../tools/security/monsoon {}; + mousetweaks = callPackage ../applications/accessibility/mousetweaks { inherit (pkgs.xorg) libX11 libXtst libXfixes; }; @@ -2484,6 +2532,8 @@ in mpd-mpris = callPackage ../tools/audio/mpd-mpris { }; + mpris-scrobbler = callPackage ../tools/audio/mpris-scrobbler { }; + mq-cli = callPackage ../tools/system/mq-cli { }; nextdns = callPackage ../applications/networking/nextdns { }; @@ -2600,8 +2650,12 @@ in shell-hist = callPackage ../tools/misc/shell-hist { }; + shellhub-agent = callPackage ../applications/networking/shellhub-agent { }; + simdjson = callPackage ../development/libraries/simdjson { }; + shipyard = callPackage ../tools/virtualization/shipyard { }; + simg2img = callPackage ../tools/filesystems/simg2img { }; simplenes = callPackage ../misc/emulators/simplenes { }; @@ -2644,6 +2698,8 @@ in syslogng_incubator = callPackage ../tools/system/syslog-ng-incubator { }; + svt-av1 = callPackage ../tools/video/svt-av1 { }; + inherit (callPackages ../servers/rainloop { }) rainloop-community rainloop-standard; @@ -2844,6 +2900,8 @@ in bup = callPackage ../tools/backup/bup { }; + bupstash = callPackage ../tools/backup/bupstash { }; + burp = callPackage ../tools/backup/burp { }; buku = callPackage ../applications/misc/buku { }; @@ -2980,6 +3038,8 @@ in cmt = callPackage ../applications/audio/cmt {}; + crlfuzz = callPackage ../tools/security/crlfuzz {}; + hedgedoc = callPackage ../servers/web-apps/hedgedoc { }; colord = callPackage ../tools/misc/colord { }; @@ -3046,6 +3106,8 @@ in evdevremapkeys = callPackage ../tools/inputmethods/evdevremapkeys { }; + evscript = callPackage ../tools/inputmethods/evscript { }; + gebaar-libinput = callPackage ../tools/inputmethods/gebaar-libinput { }; libpinyin = callPackage ../development/libraries/libpinyin { }; @@ -3514,7 +3576,9 @@ in duc = callPackage ../tools/misc/duc { }; - duff = callPackage ../tools/filesystems/duff { }; + duff = callPackage ../tools/filesystems/duff { + autoreconfHook = buildPackages.autoreconfHook269; + }; dumptorrent = callPackage ../tools/misc/dumptorrent { }; @@ -3578,7 +3642,9 @@ in eflite = callPackage ../applications/audio/eflite {}; - eid-mw = callPackage ../tools/security/eid-mw { }; + eid-mw = callPackage ../tools/security/eid-mw { + autoreconfHook = buildPackages.autoreconfHook269; + }; epubcheck = callPackage ../tools/text/epubcheck { }; @@ -3759,6 +3825,10 @@ in emem = callPackage ../applications/misc/emem { }; + emulsion = callPackage ../applications/graphics/emulsion { + inherit (darwin.apple_sdk.frameworks) AppKit CoreGraphics CoreServices Foundation OpenGL; + }; + emv = callPackage ../tools/misc/emv { }; enblend-enfuse = callPackage ../tools/graphics/enblend-enfuse { }; @@ -3892,6 +3962,24 @@ in chewing-editor = libsForQt5.callPackage ../applications/misc/chewing-editor { }; + fcitx5 = libsForQt5.callPackage ../tools/inputmethods/fcitx5 { }; + + fcitx5-with-addons = libsForQt5.callPackage ../tools/inputmethods/fcitx5/with-addons.nix { }; + + fcitx5-chinese-addons = libsForQt5.callPackage ../tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix { }; + + fcitx5-configtool = libsForQt5.callPackage ../tools/inputmethods/fcitx5/fcitx5-configtool.nix { }; + + fcitx5-lua = callPackage ../tools/inputmethods/fcitx5/fcitx5-lua.nix { }; + + fcitx5-gtk = callPackage ../tools/inputmethods/fcitx5/fcitx5-gtk.nix { }; + + fcitx5-rime = callPackage ../tools/inputmethods/fcitx5/fcitx5-rime.nix { }; + + fcitx5-table-extra = callPackage ../tools/inputmethods/fcitx5/fcitx5-table-extra.nix { }; + + fcitx5-table-other = callPackage ../tools/inputmethods/fcitx5/fcitx5-table-other.nix { }; + fcppt = callPackage ../development/libraries/fcppt { }; fcrackzip = callPackage ../tools/security/fcrackzip { }; @@ -4074,6 +4162,8 @@ in freedroidrpg = callPackage ../games/freedroidrpg { }; + freenukum = callPackage ../games/freenukum { }; + freebind = callPackage ../tools/networking/freebind { }; freeipmi = callPackage ../tools/system/freeipmi {}; @@ -4290,7 +4380,9 @@ in gmvault = callPackage ../tools/networking/gmvault { }; - gnash = callPackage ../misc/gnash { }; + gnash = callPackage ../misc/gnash { + autoreconfHook = buildPackages.autoreconfHook269; + }; gnirehtet = callPackage ../tools/networking/gnirehtet { }; @@ -4353,8 +4445,6 @@ in gnutar = callPackage ../tools/archivers/gnutar { }; - gnuvd = callPackage ../tools/misc/gnuvd { }; - goaccess = callPackage ../tools/misc/goaccess { }; gocryptfs = callPackage ../tools/filesystems/gocryptfs { }; @@ -4526,10 +4616,14 @@ in gsmartcontrol = callPackage ../tools/misc/gsmartcontrol { }; - gsmlib = callPackage ../development/libraries/gsmlib { }; + gsmlib = callPackage ../development/libraries/gsmlib { + autoreconfHook = buildPackages.autoreconfHook269; + }; gssdp = callPackage ../development/libraries/gssdp { }; + grype = callPackage ../tools/security/grype { }; + gt5 = callPackage ../tools/system/gt5 { }; gtest = callPackage ../development/libraries/gtest { }; @@ -5002,6 +5096,8 @@ in jnettop = callPackage ../tools/networking/jnettop { }; + jumpnbump = callPackage ../games/jumpnbump { }; + junkie = callPackage ../tools/networking/junkie { }; just = callPackage ../development/tools/just { }; @@ -5044,10 +5140,14 @@ in jsduck = callPackage ../development/tools/jsduck { }; + json-schema-for-humans = with python3Packages; toPythonApplication json-schema-for-humans; + jtc = callPackage ../development/tools/jtc { }; jumpapp = callPackage ../tools/X11/jumpapp {}; + jove = callPackage ../applications/editors/jove {}; + jucipp = callPackage ../applications/editors/jucipp { }; jugglinglab = callPackage ../tools/misc/jugglinglab { }; @@ -5175,6 +5275,8 @@ in ldc = callPackage ../development/compilers/ldc { }; + ldgallery = callPackage ../tools/graphics/ldgallery { }; + lbreakout2 = callPackage ../games/lbreakout2 { }; lefthook = gitAndTools.lefthook; @@ -5197,9 +5299,13 @@ in libcloudproviders = callPackage ../development/libraries/libcloudproviders { }; - libcoap = callPackage ../applications/networking/libcoap {}; + libcoap = callPackage ../applications/networking/libcoap { + autoconf = buildPackages.autoconf269; + }; - libcryptui = callPackage ../development/libraries/libcryptui { }; + libcryptui = callPackage ../development/libraries/libcryptui { + autoreconfHook = buildPackages.autoreconfHook269; + }; libsmartcols = callPackage ../development/libraries/libsmartcols { }; @@ -5267,6 +5373,10 @@ in kristall = libsForQt5.callPackage ../applications/networking/browsers/kristall { }; + lagrange = callPackage ../applications/networking/browsers/lagrange { + inherit (darwin.apple_sdk.frameworks) AppKit; + }; + kzipmix = pkgsi686Linux.callPackage ../tools/compression/kzipmix { }; ma1sd = callPackage ../servers/ma1sd { }; @@ -5442,6 +5552,8 @@ in ldapvi = callPackage ../tools/misc/ldapvi { }; + ldeep = python3Packages.callPackage ../tools/security/ldeep { }; + ldns = callPackage ../development/libraries/ldns { }; leafpad = callPackage ../applications/editors/leafpad { }; @@ -5589,6 +5701,8 @@ in linuxquota = callPackage ../tools/misc/linuxquota { }; + liquidctl = with python3Packages; toPythonApplication liquidctl; + localtime = callPackage ../tools/system/localtime { }; logcheck = callPackage ../tools/system/logcheck { }; @@ -5625,7 +5739,9 @@ in lv = callPackage ../tools/text/lv { }; - lxc = callPackage ../os-specific/linux/lxc { }; + lxc = callPackage ../os-specific/linux/lxc { + autoreconfHook = buildPackages.autoreconfHook269; + }; lxcfs = callPackage ../os-specific/linux/lxcfs { }; lxd = callPackage ../tools/admin/lxd { }; @@ -5774,6 +5890,8 @@ in microdnf = callPackage ../tools/package-management/microdnf { }; + microplane = callPackage ../tools/misc/microplane { }; + microserver = callPackage ../servers/microserver { }; midisheetmusic = callPackage ../applications/audio/midisheetmusic { }; @@ -6085,12 +6203,18 @@ in # with different versions we pin Go for all versions. nomad_0_11 = callPackage ../applications/networking/cluster/nomad/0.11.nix { buildGoPackage = buildGo114Package; + inherit (linuxPackages) nvidia_x11; + nvidiaGpuSupport = config.cudaSupport or false; }; nomad_0_12 = callPackage ../applications/networking/cluster/nomad/0.12.nix { buildGoPackage = buildGo114Package; + inherit (linuxPackages) nvidia_x11; + nvidiaGpuSupport = config.cudaSupport or false; }; nomad_1_0 = callPackage ../applications/networking/cluster/nomad/1.0.nix { buildGoPackage = buildGo115Package; + inherit (linuxPackages) nvidia_x11; + nvidiaGpuSupport = config.cudaSupport or false; }; notable = callPackage ../applications/misc/notable { }; @@ -6219,6 +6343,8 @@ in nzbget = callPackage ../tools/networking/nzbget { }; + nzbhydra2 = callPackage ../servers/nzbhydra2 { }; + oathToolkit = callPackage ../tools/security/oath-toolkit { }; oatpp = callPackage ../development/libraries/oatpp { }; @@ -6398,7 +6524,9 @@ in opn2bankeditor = callPackage ../tools/audio/opl3bankeditor/opn2bankeditor.nix { }; - orangefs = callPackage ../tools/filesystems/orangefs { }; + orangefs = callPackage ../tools/filesystems/orangefs { + autoreconfHook = buildPackages.autoreconfHook269; + }; os-prober = callPackage ../tools/misc/os-prober {}; @@ -6420,6 +6548,8 @@ in overmind = callPackage ../applications/misc/overmind { }; + ovh-ttyrec = callPackage ../tools/misc/ovh-ttyrec { }; + owncloud-client = libsForQt514.callPackage ../applications/networking/owncloud-client { }; oxidized = callPackage ../tools/admin/oxidized { }; @@ -6472,7 +6602,9 @@ in parastoo-fonts = callPackage ../data/fonts/parastoo-fonts { }; - parcellite = callPackage ../tools/misc/parcellite { }; + parcellite = callPackage ../tools/misc/parcellite { + autoreconfHook = buildPackages.autoreconfHook269; + }; patchutils = callPackage ../tools/text/patchutils { }; @@ -6525,6 +6657,8 @@ in pbzip2 = callPackage ../tools/compression/pbzip2 { }; + pcimem = callPackage ../os-specific/linux/pcimem { }; + pciutils = callPackage ../tools/system/pciutils { }; pcsclite = callPackage ../tools/security/pcsclite { @@ -6611,11 +6745,11 @@ in libcap = if stdenv.isDarwin then null else libcap; }; - pinentry-curses = (stdenv.lib.getOutput "curses" pinentry); - pinentry-emacs = (stdenv.lib.getOutput "emacs" pinentry); - pinentry-gtk2 = (stdenv.lib.getOutput "gtk2" pinentry); - pinentry-qt = (stdenv.lib.getOutput "qt" pinentry); - pinentry-gnome = (stdenv.lib.getOutput "gnome3" pinentry); + pinentry-curses = (lib.getOutput "curses" pinentry); + pinentry-emacs = (lib.getOutput "emacs" pinentry); + pinentry-gtk2 = (lib.getOutput "gtk2" pinentry); + pinentry-qt = (lib.getOutput "qt" pinentry); + pinentry-gnome = (lib.getOutput "gnome3" pinentry); pinentry_mac = callPackage ../tools/security/pinentry/mac.nix { inherit (darwin.apple_sdk.frameworks) Cocoa; @@ -6655,6 +6789,8 @@ in playbar2 = libsForQt5.callPackage ../applications/audio/playbar2 { }; + plujain-ramp = callPackage ../applications/audio/plujain-ramp { }; + plex = callPackage ../servers/plex { }; plexRaw = callPackage ../servers/plex/raw.nix { }; @@ -6766,6 +6902,8 @@ in openssl = openssl_1_0_2; }; + psw = callPackage ../tools/misc/psw { }; + pws = callPackage ../tools/misc/pws { }; cntlm = callPackage ../tools/networking/cntlm { }; @@ -6950,6 +7088,7 @@ in rdma-core = callPackage ../os-specific/linux/rdma-core { }; + rdrview = callPackage ../tools/networking/rdrview {}; real_time_config_quick_scan = callPackage ../applications/audio/real_time_config_quick_scan { }; @@ -7037,6 +7176,9 @@ in rescuetime = libsForQt5.callPackage ../applications/misc/rescuetime { }; + inherit (callPackage ../development/misc/resholve { }) + resholve resholvePackage; + reuse = callPackage ../tools/package-management/reuse { }; rewritefs = callPackage ../os-specific/linux/rewritefs { }; @@ -7353,6 +7495,8 @@ in # aka., pgp-tools signing-party = callPackage ../tools/security/signing-party { }; + signumone-ks = callPackage ../applications/misc/signumone-ks { }; + silc_client = callPackage ../applications/networking/instant-messengers/silc-client { }; silc_server = callPackage ../servers/silc-server { }; @@ -7510,6 +7654,8 @@ in solaar = callPackage ../applications/misc/solaar {}; + solanum = callPackage ../servers/irc/solanum {}; + sourceHighlight = callPackage ../tools/text/source-highlight { }; spacebar = callPackage ../os-specific/darwin/spacebar { @@ -7603,6 +7749,8 @@ in stabber = callPackage ../misc/stabber { }; + staticjinja = with python3.pkgs; toPythonApplication staticjinja; + stress = callPackage ../tools/system/stress { }; stress-ng = callPackage ../tools/system/stress-ng { }; @@ -7629,6 +7777,8 @@ in su = shadow.su; + subjs = callPackage ../tools/security/subjs { }; + subsonic = callPackage ../servers/misc/subsonic { }; subfinder = callPackage ../tools/networking/subfinder { }; @@ -7652,8 +7802,9 @@ in sysbench = callPackage ../development/tools/misc/sysbench {}; system-config-printer = callPackage ../tools/misc/system-config-printer { + autoreconfHook = buildPackages.autoreconfHook269; libxml2 = libxml2Python; - }; + }; systembus-notify = callPackage ../applications/misc/systembus-notify { }; @@ -7679,6 +7830,10 @@ in tabnine = callPackage ../development/tools/tabnine { }; + tab-rs = callPackage ../tools/misc/tab-rs { + inherit (darwin.apple_sdk.frameworks) IOKit; + }; + t1utils = callPackage ../tools/misc/t1utils { }; talkfilters = callPackage ../misc/talkfilters {}; @@ -7797,7 +7952,7 @@ in tikzit = libsForQt5.callPackage ../tools/typesetting/tikzit { }; - tinc_pre = callPackage ../tools/networking/tinc/pre.nix {}; + tinc_pre = callPackage ../tools/networking/tinc/pre.nix { }; tinycbor = callPackage ../development/libraries/tinycbor { }; @@ -7805,13 +7960,13 @@ in tinyemu = callPackage ../applications/virtualization/tinyemu { }; - tinyfecvpn = callPackage ../tools/networking/tinyfecvpn {}; + tinyfecvpn = callPackage ../tools/networking/tinyfecvpn { }; tinyobjloader = callPackage ../development/libraries/tinyobjloader { }; tinyprog = callPackage ../development/tools/misc/tinyprog { }; - tinyproxy = callPackage ../tools/networking/tinyproxy {}; + tinyproxy = callPackage ../tools/networking/tinyproxy { }; tio = callPackage ../tools/misc/tio { }; @@ -7938,7 +8093,9 @@ in ttf2pt1 = callPackage ../tools/misc/ttf2pt1 { }; - ttfautohint = libsForQt5.callPackage ../tools/misc/ttfautohint { }; + ttfautohint = libsForQt5.callPackage ../tools/misc/ttfautohint { + autoreconfHook = buildPackages.autoreconfHook269; + }; ttfautohint-nox = ttfautohint.override { enableGUI = false; }; tty-clock = callPackage ../tools/misc/tty-clock { }; @@ -7947,8 +8104,6 @@ in ttyplot = callPackage ../tools/misc/ttyplot { }; - ttyrec = callPackage ../tools/misc/ttyrec { }; - ttygif = callPackage ../tools/misc/ttygif { }; ttylog = callPackage ../tools/misc/ttylog { }; @@ -8005,10 +8160,6 @@ in udptunnel = callPackage ../tools/networking/udptunnel { }; - ufraw = callPackage ../applications/graphics/ufraw { - stdenv = gcc6Stdenv; # doesn't build with gcc7 - }; - uftrace = callPackage ../development/tools/uftrace { }; uget = callPackage ../tools/networking/uget { }; @@ -8055,6 +8206,8 @@ in urlview = callPackage ../applications/misc/urlview {}; + urn-timer = callPackage ../tools/misc/urn-timer { }; + ursadb = callPackage ../servers/ursadb {}; usbmuxd = callPackage ../tools/misc/usbmuxd {}; @@ -8099,7 +8252,9 @@ in verilator = callPackage ../applications/science/electronics/verilator {}; - verilog = callPackage ../applications/science/electronics/verilog {}; + verilog = callPackage ../applications/science/electronics/verilog { + autoconf = buildPackages.autoconf269; + }; versus = callPackage ../applications/networking/versus { }; @@ -8208,6 +8363,7 @@ in watchman = callPackage ../development/tools/watchman { inherit (darwin.apple_sdk.frameworks) CoreServices; + autoconf = buildPackages.autoconf269; }; wavefunctioncollapse = callPackage ../tools/graphics/wavefunctioncollapse {}; @@ -8230,12 +8386,18 @@ in whipper = callPackage ../applications/audio/whipper { }; + whitebophir = callPackage ../servers/web-apps/whitebophir { }; + whois = callPackage ../tools/networking/whois { }; + wifish = callPackage ../tools/networking/wifish { }; + wifite2 = callPackage ../tools/networking/wifite2 { }; wimboot = callPackage ../tools/misc/wimboot { }; + wire = callPackage ../development/tools/wire { }; + wireguard-tools = callPackage ../tools/networking/wireguard-tools { }; woff2 = callPackage ../development/web/woff2 { }; @@ -8330,7 +8492,9 @@ in uhttpmock = callPackage ../development/libraries/uhttpmock { }; - uim = callPackage ../tools/inputmethods/uim { }; + uim = callPackage ../tools/inputmethods/uim { + autoconf = buildPackages.autoconf269; + }; uhub = callPackage ../servers/uhub { }; @@ -8413,6 +8577,8 @@ in urjtag = callPackage ../tools/misc/urjtag { }; + urlhunter = callPackage ../tools/security/urlhunter { }; + urlwatch = callPackage ../tools/networking/urlwatch { }; valum = callPackage ../development/web/valum { }; @@ -8524,6 +8690,7 @@ in # It needs a cross compiler for mipsel to build the firmware it will # load into the Ben Nanonote gccCross = pkgsCross.ben-nanonote.buildPackages.gccCrossStageStatic; + autoconf = buildPackages.autoconf269; }; clipnotify = callPackage ../tools/misc/clipnotify { }; @@ -8651,7 +8818,9 @@ in zbackup = callPackage ../tools/backup/zbackup {}; - zbar = libsForQt5.callPackage ../tools/graphics/zbar { }; + zbar = libsForQt5.callPackage ../tools/graphics/zbar { + autoreconfHook = buildPackages.autoreconfHook269; + }; zdelta = callPackage ../tools/compression/zdelta { }; @@ -8768,7 +8937,9 @@ in fish = callPackage ../shells/fish { }; - fish-foreign-env = callPackage ../shells/fish/fish-foreign-env { }; + wrapFish = callPackage ../shells/fish/wrapper.nix { }; + + fishPlugins = recurseIntoAttrs (callPackage ../shells/fish/plugins { }); ion = callPackage ../shells/ion { inherit (darwin) Security; @@ -8786,6 +8957,8 @@ in oil = callPackage ../shells/oil { }; + oksh = callPackage ../shells/oksh { }; + pash = callPackage ../shells/pash { }; tcsh = callPackage ../shells/tcsh { }; @@ -8942,12 +9115,14 @@ in gmp-static = gmp.override { withStatic = true; }; }; + cakelisp = callPackage ../development/compilers/cakelisp { }; + ciao = callPackage ../development/compilers/ciao { }; colm = callPackage ../development/compilers/colm { }; colmap = libsForQt514.callPackage ../applications/science/misc/colmap { }; - colmapWithCuda = colmap.override { cudaSupport = true; }; + colmapWithCuda = colmap.override { cudaSupport = true; cudatoolkit = cudatoolkit_11; }; chickenPackages_4 = callPackage ../development/compilers/chicken/4 { }; chickenPackages_5 = callPackage ../development/compilers/chicken/5 { }; @@ -9044,7 +9219,7 @@ in mkdir -p "$rsrc/lib" ln -s "${cc}/lib" "$rsrc/include" echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags - '' + stdenv.lib.optionalString (stdenv.targetPlatform.isLinux && !(stdenv.targetPlatform.useLLVM or false)) '' + '' + lib.optionalString (stdenv.targetPlatform.isLinux && !(stdenv.targetPlatform.useLLVM or false)) '' echo "--gcc-toolchain=${gccForLibs}" >> $out/nix-support/cc-cflags ''; }; @@ -9119,10 +9294,10 @@ in gccFun = callPackage (if (with stdenv.targetPlatform; isVc4 || libc == "relibc") then ../development/compilers/gcc/6 - else ../development/compilers/gcc/9); + else ../development/compilers/gcc/10); gcc = if (with stdenv.targetPlatform; isVc4 || libc == "relibc") - then gcc6 else gcc9; - + then gcc6 else + if stdenv.targetPlatform.isAarch64 then gcc9 else gcc10; gcc-unwrapped = gcc.cc; gccStdenv = if stdenv.cc.isGNU then stdenv else stdenv.override { @@ -9577,6 +9752,13 @@ in buildPackages = buildPackages // { stdenv = gcc8Stdenv; }; }); + go_2-dev = callPackage ../development/compilers/go/2-dev.nix ({ + inherit (darwin.apple_sdk.frameworks) Security Foundation; + } // lib.optionalAttrs stdenv.isAarch64 { + stdenv = gcc8Stdenv; + buildPackages = buildPackages // { stdenv = gcc8Stdenv; }; + }); + go = go_1_15; go-repo-root = callPackage ../development/tools/go-repo-root { }; @@ -9608,14 +9790,14 @@ in # package. Wishing we could merge it into one irony package, to avoid this issue, # but its emacs-side expression is autogenerated, and we can't hook into it (other # than peek into its version). - inherit (emacsPackages.melpaStablePackages) irony; + inherit (emacs.pkgs.melpaStablePackages) irony; }; hugs = callPackage ../development/interpreters/hugs { }; openjfx11 = callPackage ../development/compilers/openjdk/openjfx/11.nix { }; - openjfx14 = callPackage ../development/compilers/openjdk/openjfx/14.nix { }; + openjfx15 = callPackage ../development/compilers/openjdk/openjfx/15.nix { }; openjdk8-bootstrap = if adoptopenjdk-hotspot-bin-8.meta.available then @@ -9665,21 +9847,27 @@ in else openjdk11.override { headless = true; }; - openjdk14-bootstrap = - if adoptopenjdk-hotspot-bin-13.meta.available then - adoptopenjdk-hotspot-bin-13 + openjdk15-bootstrap = + if adoptopenjdk-hotspot-bin-14.meta.available then + adoptopenjdk-hotspot-bin-14 else - /* adoptopenjdk not available for i686, so fall back to our old builds of 12 & 13 for bootstrapping */ - callPackage ../development/compilers/openjdk/13.nix { + /* adoptopenjdk not available for i686, so fall back to our old builds of 12, 13, & 14 for bootstrapping */ + callPackage ../development/compilers/openjdk/14.nix { openjfx = openjfx11; /* need this despite next line :-( */ enableJavaFX = false; headless = true; inherit (gnome2) GConf gnome_vfs; - openjdk13-bootstrap = callPackage ../development/compilers/openjdk/12.nix { + openjdk14-bootstrap = callPackage ../development/compilers/openjdk/13.nix { openjfx = openjfx11; /* need this despite next line :-( */ enableJavaFX = false; headless = true; inherit (gnome2) GConf gnome_vfs; + openjdk13-bootstrap = callPackage ../development/compilers/openjdk/12.nix { + openjfx = openjfx11; /* need this despite next line :-( */ + enableJavaFX = false; + headless = true; + inherit (gnome2) GConf gnome_vfs; + }; }; }; @@ -9687,27 +9875,27 @@ in jdk11_headless = openjdk11_headless; /* Latest JDK */ - openjdk14 = + openjdk15 = if stdenv.isDarwin then callPackage ../development/compilers/openjdk/darwin { } else callPackage ../development/compilers/openjdk { - openjfx = openjfx14; + openjfx = openjfx15; inherit (gnome2) GConf gnome_vfs; }; - openjdk14_headless = + openjdk15_headless = if stdenv.isDarwin then - openjdk14 + openjdk15 else - openjdk14.override { headless = true; }; + openjdk15.override { headless = true; }; - jdk14 = openjdk14; - jdk14_headless = openjdk14_headless; + jdk15 = openjdk15; + jdk15_headless = openjdk15_headless; /* default JDK */ - jdk = jdk14; + jdk = jdk15; # Since the introduction of the Java Platform Module System in Java 9, Java # no longer ships a separate JRE package. @@ -9716,13 +9904,13 @@ in # 'jre_minimal' to build a bespoke JRE containing only the modules you need. # # For a general-purpose system, 'jre' defaults to the full JDK: - jre = jdk14; - jre_headless = jdk14_headless; + jre = jdk15; + jre_headless = jdk15_headless; jre_minimal = callPackage ../development/compilers/openjdk/jre.nix { }; - openjdk = openjdk14; - openjdk_headless = openjdk14_headless; + openjdk = openjdk15; + openjdk_headless = openjdk15_headless; inherit (callPackages ../development/compilers/graalvm { gcc = if stdenv.targetPlatform.isDarwin then gcc8 else gcc; @@ -9874,7 +10062,17 @@ in llvm_6 = llvmPackages_6.llvm; llvm_5 = llvmPackages_5.llvm; - llvmPackages = recurseIntoAttrs llvmPackages_7; + llvmPackages = recurseIntoAttrs (with targetPlatform; + if isDarwin then + llvmPackages_7 + else if isFreeBSD then + llvmPackages_7 + else if isLinux then + llvmPackages_7 + else if isWasm then + llvmPackages_8 + else + llvmPackages_latest); llvmPackages_5 = callPackage ../development/compilers/llvm/5 { inherit (stdenvAdapters) overrideCC; @@ -9916,7 +10114,7 @@ in inherit (stdenvAdapters) overrideCC; buildLlvmTools = buildPackages.llvmPackages_11.tools; targetLlvmLibraries = targetPackages.llvmPackages_11.libraries; - } // stdenv.lib.optionalAttrs (stdenv.hostPlatform.isi686 && buildPackages.stdenv.cc.isGNU) { + } // lib.optionalAttrs (stdenv.hostPlatform.isi686 && buildPackages.stdenv.cc.isGNU) { stdenv = gcc7Stdenv; }); @@ -10002,9 +10200,14 @@ in nrpl = callPackage ../development/tools/nrpl { }; + nimlsp = callPackage ../development/tools/misc/nimlsp { }; + neko = callPackage ../development/compilers/neko { }; - nextpnr = libsForQt5.callPackage ../development/compilers/nextpnr { + nextpnr = callPackage ../development/compilers/nextpnr { }; + + nextpnrWithGui = libsForQt5.callPackage ../development/compilers/nextpnr { + enableGui = true; inherit (darwin.apple_sdk.frameworks) OpenGL; }; @@ -10219,6 +10422,7 @@ in cargo-watch = callPackage ../development/tools/rust/cargo-watch { inherit (darwin.apple_sdk.frameworks) CoreServices; }; + cargo-wipe = callPackage ../development/tools/rust/cargo-wipe { }; cargo-xbuild = callPackage ../development/tools/rust/cargo-xbuild { }; cargo-generate = callPackage ../development/tools/rust/cargo-generate { inherit (darwin.apple_sdk.frameworks) Security; @@ -10281,7 +10485,9 @@ in solc = callPackage ../development/compilers/solc { }; - souffle = callPackage ../development/compilers/souffle { }; + souffle = callPackage ../development/compilers/souffle { + autoreconfHook = buildPackages.autoreconfHook269; + }; spasm-ng = callPackage ../development/compilers/spasm-ng { }; @@ -10305,6 +10511,12 @@ in swift = callPackage ../development/compilers/swift { }; + symbiflow-vtr = callPackage ../development/compilers/symbiflow-vtr { }; + + symbiflow-yosys = callPackage ../development/compilers/symbiflow-yosys { }; + + symbiflow-yosys-plugins = callPackage ../development/compilers/symbiflow-yosys-plugins { }; + swiProlog = callPackage ../development/compilers/swi-prolog { inherit (darwin.apple_sdk.frameworks) Security; jdk = openjdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 @@ -10357,6 +10569,8 @@ in vala_0_48 vala; + vyper = with python3Packages; toPythonApplication vyper; + wcc = callPackage ../development/compilers/wcc { }; wla-dx = callPackage ../development/compilers/wla-dx { }; @@ -10373,7 +10587,7 @@ in # want the C++ library to be explicitly chosen by the caller, and null by # default. libcxx ? null - , extraPackages ? stdenv.lib.optional (cc.isGNU or false && stdenv.targetPlatform.isMinGW) threadsCross + , extraPackages ? lib.optional (cc.isGNU or false && stdenv.targetPlatform.isMinGW) threadsCross , ... } @ extraArgs: callPackage ../build-support/cc-wrapper (let self = { @@ -10475,7 +10689,7 @@ in dhall-text = haskell.lib.justStaticExecutables haskellPackages.dhall-text; - dhallPackages = callPackages ./dhall-packages.nix { }; + dhallPackages = callPackage ./dhall-packages.nix { }; duktape = callPackage ../development/interpreters/duktape { }; @@ -10673,6 +10887,8 @@ in polyml56 = callPackage ../development/compilers/polyml/5.6.nix { }; polyml57 = callPackage ../development/compilers/polyml/5.7.nix { }; + prjxray-tools = callPackage ../development/compilers/prjxray-tools { }; + pure = callPackage ../development/interpreters/pure { /*llvm = llvm_35;*/ }; @@ -10840,6 +11056,7 @@ in inherit (callPackage ../development/interpreters/ruby { inherit (darwin) libiconv libobjc libunwind; inherit (darwin.apple_sdk.frameworks) Foundation; + autoreconfHook = buildPackages.autoreconfHook269; bison = buildPackages.bison_3_5; }) ruby_2_5 @@ -10868,7 +11085,7 @@ in spidermonkey_1_8_5 = callPackage ../development/interpreters/spidermonkey/1.8.5.nix { }; spidermonkey_38 = callPackage ../development/interpreters/spidermonkey/38.nix ({ inherit (darwin) libobjc; - } // (stdenv.lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { + } // (lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4' })); spidermonkey_60 = callPackage ../development/interpreters/spidermonkey/60.nix { }; @@ -11059,12 +11276,14 @@ in autobuild = callPackage ../development/tools/misc/autobuild { }; - autoconf = callPackage ../development/tools/misc/autoconf { }; + autoconf = autoconf270; autoconf-archive = callPackage ../development/tools/misc/autoconf-archive { }; autoconf213 = callPackage ../development/tools/misc/autoconf/2.13.nix { }; autoconf264 = callPackage ../development/tools/misc/autoconf/2.64.nix { }; + autoconf269 = callPackage ../development/tools/misc/autoconf/2.69.nix { }; + autoconf270 = callPackage ../development/tools/misc/autoconf { }; autocutsel = callPackage ../tools/X11/autocutsel{ }; @@ -11299,6 +11518,8 @@ in cloudfoundry-cli = callPackage ../development/tools/cloudfoundry-cli { }; + clpm = callPackage ../development/tools/clpm {}; + coan = callPackage ../development/tools/analysis/coan { }; compile-daemon = callPackage ../development/tools/compile-daemon { }; @@ -11556,6 +11777,7 @@ in fswatch = callPackage ../development/tools/misc/fswatch { inherit (darwin.apple_sdk.frameworks) CoreServices; + autoreconfHook = buildPackages.autoreconfHook269; }; fujprog = callPackage ../development/tools/misc/fujprog { @@ -11724,6 +11946,8 @@ in jbake = callPackage ../development/tools/jbake { }; + jbang = callPackage ../development/tools/jbang { }; + jikespg = callPackage ../development/tools/parsing/jikespg { }; jenkins = callPackage ../development/tools/continuous-integration/jenkins { }; @@ -11915,7 +12139,9 @@ in opengrok = callPackage ../development/tools/misc/opengrok { }; - openocd = callPackage ../development/tools/misc/openocd { }; + openocd = callPackage ../development/tools/misc/openocd { + autoreconfHook = buildPackages.autoreconfHook269; + }; oprofile = callPackage ../development/tools/profiling/oprofile { libiberty_static = libiberty.override { staticBuild = true; }; @@ -12220,6 +12446,8 @@ in terraformer = callPackage ../development/tools/misc/terraformer { }; + terrascan = callPackage ../tools/security/terrascan { }; + texinfo413 = callPackage ../development/tools/misc/texinfo/4.13a.nix { }; texinfo4 = texinfo413; texinfo5 = callPackage ../development/tools/misc/texinfo/5.2.nix { }; @@ -12246,8 +12474,6 @@ in todoist-electron = callPackage ../applications/misc/todoist-electron { }; - todolist = callPackage ../applications/misc/todolist { }; - travis = callPackage ../development/tools/misc/travis { }; tree-sitter = callPackage ../development/tools/parsing/tree-sitter { @@ -12258,6 +12484,8 @@ in ttyd = callPackage ../servers/ttyd { }; + turbogit = callPackage ../development/tools/turbogit { }; + tweak = callPackage ../applications/editors/tweak { }; tychus = callPackage ../development/tools/tychus { @@ -12322,6 +12550,8 @@ in xc3sprog = callPackage ../development/tools/misc/xc3sprog { }; + xcb-imdkit = callPackage ../development/libraries/xcb-imdkit { }; + xcodebuild = callPackage ../development/tools/xcbuild/wrapper.nix { inherit (darwin.apple_sdk.frameworks) CoreServices CoreGraphics ImageIO; }; @@ -12446,7 +12676,7 @@ in arrayfire = callPackage ../development/libraries/arrayfire {}; arrow-cpp = callPackage ../development/libraries/arrow-cpp ({ - } // stdenv.lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { + } // lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { stdenv = overrideCC stdenv buildPackages.gcc6; # hidden symbol `__divmoddi4' }); @@ -12479,10 +12709,16 @@ in inherit (darwin.apple_sdk.frameworks) AudioUnit CoreServices; }; + aws-c-cal = callPackage ../development/libraries/aws-c-cal { + inherit (darwin.apple_sdk.frameworks) Security; + }; + aws-c-common = callPackage ../development/libraries/aws-c-common { }; aws-c-event-stream = callPackage ../development/libraries/aws-c-event-stream { }; + aws-c-io = callPackage ../development/libraries/aws-c-io { }; + aws-checksums = callPackage ../development/libraries/aws-checksums { }; aws-sdk-cpp = callPackage ../development/libraries/aws-sdk-cpp { @@ -12513,9 +12749,13 @@ in belle-sip = callPackage ../development/libraries/belle-sip { }; - libbfd = callPackage ../development/libraries/libbfd { }; + libbfd = callPackage ../development/libraries/libbfd { + autoreconfHook = buildPackages.autoreconfHook269; + }; - libopcodes = callPackage ../development/libraries/libopcodes { }; + libopcodes = callPackage ../development/libraries/libopcodes { + autoreconfHook = buildPackages.autoreconfHook269; + }; bicpl = callPackage ../development/libraries/science/biology/bicpl { }; @@ -12776,7 +13016,9 @@ in inherit suidHelper serviceDirectories apparmor; }; - dee = callPackage ../development/libraries/dee { }; + dee = callPackage ../development/libraries/dee { + autoreconfHook = buildPackages.autoreconfHook269; + }; dhex = callPackage ../applications/editors/dhex { }; @@ -12886,6 +13128,7 @@ in inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-libav; + autoreconfHook = buildPackages.autoreconfHook269; }; fcgi = callPackage ../development/libraries/fcgi { }; @@ -12916,6 +13159,7 @@ in ffmpeg = ffmpeg_4; ffmpeg-full = callPackage ../development/libraries/ffmpeg-full { + svt-av1 = if stdenv.isAarch64 then null else svt-av1; # The following need to be fixed on Darwin libjack2 = if stdenv.isDarwin then null else libjack2; libmodplug = if stdenv.isDarwin then null else libmodplug; @@ -13014,6 +13258,8 @@ in funambol = callPackage ../development/libraries/funambol { }; + gamenetworkingsockets = callPackage ../development/libraries/gamenetworkingsockets { }; + gamin = callPackage ../development/libraries/gamin { }; fam = gamin; # added 2018-04-25 @@ -13080,6 +13326,7 @@ in gdal = callPackage ../development/libraries/gdal { pythonPackages = python3Packages; + autoreconfHook = buildPackages.autoreconfHook269; }; gdal_1_11 = callPackage ../development/libraries/gdal/gdal-1_11.nix { }; @@ -13126,10 +13373,16 @@ in gle = callPackage ../development/libraries/gle { }; - glew = callPackage ../development/libraries/glew { }; - glew110 = callPackage ../development/libraries/glew/1.10.nix { - inherit (darwin.apple_sdk.frameworks) AGL; + glew = callPackage ../development/libraries/glew { + inherit (darwin.apple_sdk.frameworks) OpenGL; }; + glew110 = callPackage ../development/libraries/glew/1.10.nix { + inherit (darwin.apple_sdk.frameworks) AGL OpenGL; + }; + glew-egl = glew.overrideAttrs (oldAttrs: { + pname = "glew-egl"; + makeFlags = oldAttrs.makeFlags ++ [ "SYSTEM=linux-egl" ]; + }); glfw = glfw3; glfw2 = callPackage ../development/libraries/glfw/2.x.nix { }; @@ -13298,6 +13551,7 @@ in gnutls = callPackage ../development/libraries/gnutls/default.nix { inherit (darwin.apple_sdk.frameworks) Security; util-linux = util-linuxMinimal; # break the cyclic dependency + autoconf = buildPackages.autoconf269; }; gnutls-kdh = callPackage ../development/libraries/gnutls-kdh/3.5.nix { @@ -13480,6 +13734,7 @@ in heimdal = callPackage ../development/libraries/kerberos/heimdal.nix { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security SystemConfiguration; + autoreconfHook = buildPackages.autoreconfHook269; }; libheimdal = heimdal; @@ -13499,11 +13754,12 @@ in hdt = callPackage ../misc/hdt {}; - herqq = libsForQt514.callPackage ../development/libraries/herqq { }; + herqq = libsForQt5.callPackage ../development/libraries/herqq { }; hidapi = callPackage ../development/libraries/hidapi { # TODO: remove once `udev` is `systemdMinimal` everywhere. udev = systemdMinimal; + autoreconfHook = buildPackages.autoreconfHook269; }; highfive = callPackage ../development/libraries/highfive { }; @@ -13516,7 +13772,9 @@ in hiredis-vip = callPackage ../development/libraries/hiredis-vip { }; - hivex = callPackage ../development/libraries/hivex { }; + hivex = callPackage ../development/libraries/hivex { + autoreconfHook = buildPackages.autoreconfHook269; + }; hound = callPackage ../development/tools/misc/hound { }; @@ -13563,42 +13821,42 @@ in icu58 = callPackage (import ../development/libraries/icu/58.nix fetchurl) ({ nativeBuildRoot = buildPackages.icu58.override { buildRootOnly = true; }; } // - (stdenv.lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { + (lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4' })); icu59 = callPackage ../development/libraries/icu/59.nix ({ nativeBuildRoot = buildPackages.icu59.override { buildRootOnly = true; }; - } // (stdenv.lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { + } // (lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4' })); icu60 = callPackage ../development/libraries/icu/60.nix ({ nativeBuildRoot = buildPackages.icu60.override { buildRootOnly = true; }; - } // (stdenv.lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { + } // (lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4' })); icu63 = callPackage ../development/libraries/icu/63.nix ({ nativeBuildRoot = buildPackages.icu63.override { buildRootOnly = true; }; - } // (stdenv.lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { + } // (lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4' })); icu64 = callPackage ../development/libraries/icu/64.nix ({ nativeBuildRoot = buildPackages.icu64.override { buildRootOnly = true; }; - } // (stdenv.lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { + } // (lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4' })); icu65 = callPackage ../development/libraries/icu/65.nix ({ nativeBuildRoot = buildPackages.icu65.override { buildRootOnly = true; }; - } // (stdenv.lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { + } // (lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4' })); icu66 = callPackage ../development/libraries/icu/66.nix ({ nativeBuildRoot = buildPackages.icu66.override { buildRootOnly = true; }; - } // (stdenv.lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { + } // (lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4' })); icu67 = callPackage ../development/libraries/icu/67.nix ({ nativeBuildRoot = buildPackages.icu67.override { buildRootOnly = true; }; - } // (stdenv.lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { + } // (lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4' })); @@ -13793,6 +14051,8 @@ in lib3mf = callPackage ../development/libraries/lib3mf { }; + libAfterImage = callPackage ../development/libraries/libAfterImage { }; + libaacs = callPackage ../development/libraries/libaacs { }; libaal = callPackage ../development/libraries/libaal { }; @@ -13831,7 +14091,9 @@ in libayatana-appindicator-gtk3 = libayatana-appindicator.override { gtkVersion = "3"; }; libayatana-appindicator = callPackage ../development/libraries/libayatana-appindicator { }; - libarchive = callPackage ../development/libraries/libarchive { }; + libarchive = callPackage ../development/libraries/libarchive { + autoreconfHook = buildPackages.autoreconfHook269; + }; libasr = callPackage ../development/libraries/libasr { }; @@ -14065,7 +14327,9 @@ in libe57format = callPackage ../development/libraries/libe57format { }; - libeatmydata = callPackage ../development/libraries/libeatmydata { }; + libeatmydata = callPackage ../development/libraries/libeatmydata { + autoreconfHook = buildPackages.autoreconfHook269; + }; libeb = callPackage ../development/libraries/libeb { }; @@ -14246,15 +14510,22 @@ in libgpiod = callPackage ../development/libraries/libgpiod { }; - libgpod = callPackage ../development/libraries/libgpod { }; + libgpod = callPackage ../development/libraries/libgpod { + autoreconfHook = buildPackages.autoreconfHook269; + }; libgssglue = callPackage ../development/libraries/libgssglue { }; libgudev = callPackage ../development/libraries/libgudev { }; libguestfs-appliance = callPackage ../development/libraries/libguestfs/appliance.nix {}; - libguestfs = callPackage ../development/libraries/libguestfs { }; - libguestfs-with-appliance = libguestfs.override { appliance = libguestfs-appliance; }; + libguestfs = callPackage ../development/libraries/libguestfs { + autoreconfHook = buildPackages.autoreconfHook264; + }; + libguestfs-with-appliance = libguestfs.override { + appliance = libguestfs-appliance; + autoreconfHook = buildPackages.autoreconfHook264; + }; libhangul = callPackage ../development/libraries/libhangul { }; @@ -14431,6 +14702,8 @@ in libimagequant = callPackage ../development/libraries/libimagequant {}; + libime = callPackage ../development/libraries/libime { }; + libinfinity = callPackage ../development/libraries/libinfinity { }; libinput = callPackage ../development/libraries/libinput { @@ -14453,23 +14726,14 @@ in libjpeg_original = callPackage ../development/libraries/libjpeg { }; # also known as libturbojpeg - libjpeg_turbo = callPackage ../development/libraries/libjpeg-turbo (lib.optionalAttrs stdenv.isDarwin { - # cmake 3.19.1 has a bug. So far only noticed with this package. - # https://github.com/NixOS/nixpkgs/issues/105854 - cmake = cmake.overrideAttrs(oldAttrs: { - patches = oldAttrs.patches ++ [ - (fetchpatch { - url = "https://gitlab.kitware.com/cmake/cmake/-/commit/fcabf4a47e0c441ff80fad8f34e388b16738bd33.patch"; - sha256 = "bVrjY8omtAEKe8G76hGtmO54LKJvhx3RTW6OF6Y7rsU="; - }) - ]; - }); - }); + libjpeg_turbo = callPackage ../development/libraries/libjpeg-turbo { }; libjpeg = libjpeg_turbo; libjreen = callPackage ../development/libraries/libjreen { }; - libjson-rpc-cpp = callPackage ../development/libraries/libjson-rpc-cpp { }; + libjson-rpc-cpp = callPackage ../development/libraries/libjson-rpc-cpp { + libmicrohttpd = libmicrohttpd_0_9_72; + }; libkate = callPackage ../development/libraries/libkate { }; @@ -14492,6 +14756,7 @@ in libmatchbox = callPackage ../development/libraries/libmatchbox { }; libmatheval = callPackage ../development/libraries/libmatheval { + autoconf = buildPackages.autoconf269; guile = guile_2_0; }; @@ -14507,6 +14772,7 @@ in libmicrohttpd_0_9_70 = callPackage ../development/libraries/libmicrohttpd/0.9.70.nix { }; libmicrohttpd_0_9_71 = callPackage ../development/libraries/libmicrohttpd/0.9.71.nix { }; + libmicrohttpd_0_9_72 = callPackage ../development/libraries/libmicrohttpd/0.9.72.nix { }; libmicrohttpd = libmicrohttpd_0_9_71; libmikmod = callPackage ../development/libraries/libmikmod { @@ -14675,6 +14941,8 @@ in libs3 = callPackage ../development/libraries/libs3 { }; + libschrift = callPackage ../development/libraries/libschrift { }; + libsearpc = callPackage ../development/libraries/libsearpc { }; libsigcxx = callPackage ../development/libraries/libsigcxx { }; @@ -14826,6 +15094,8 @@ in inherit (darwin.apple_sdk.frameworks) ApplicationServices CoreServices; }; + libuvc = callPackage ../development/libraries/libuvc { }; + libv4l = lowPrio (v4l-utils.override { withUtils = false; }); @@ -15047,7 +15317,7 @@ in libGLU = mesa_glu; mesa = callPackage ../development/libraries/mesa { - llvmPackages = llvmPackages_9; + llvmPackages = llvmPackages_latest; inherit (darwin.apple_sdk.frameworks) OpenGL; inherit (darwin.apple_sdk.libs) Xplugin; }; @@ -15414,6 +15684,8 @@ in pdf2xml = callPackage ../development/libraries/pdf2xml {} ; + pe-parse = callPackage ../development/libraries/pe-parse { }; + inherit (callPackage ../development/libraries/physfs { }) physfs_2 physfs; @@ -15515,6 +15787,8 @@ in gnupth = callPackage ../development/libraries/pth { }; pth = if stdenv.hostPlatform.isMusl then npth else gnupth; + pslib = callPackage ../development/libraries/pslib { }; + pstreams = callPackage ../development/libraries/pstreams {}; pugixml = callPackage ../development/libraries/pugixml { }; @@ -15669,9 +15943,9 @@ in inherit (kdeApplications.override { libsForQt5 = self; }) libkdcraw libkexiv2 libkipi libkomparediff2 libksane libkcddb akonadi-contacts - akonadi-calendar akonadi-notes akonadi-search kidentitymanagement kontactinterface - kldap akonadi akregator ark bomber bovo dolphin dragon elisa ffmpegthumbs filelight - granatier gwenview k3b kaddressbook kalzium kapptemplate kapman kate katomic + akonadi-calendar akonadi-notes akonadi-search kaccounts-integration kidentitymanagement + kontactinterface kldap akonadi akregator ark bomber bovo dolphin dragon elisa ffmpegthumbs + filelight granatier gwenview k3b kaddressbook kalzium kapptemplate kapman kate katomic kblackbox kblocks kbounce kcachegrind kcalc kcharselect kcolorchooser kdenlive kdf kdialog kdiamond keditbookmarks kfind kfloppy kget kgpg khelpcenter kig kigo killbots kitinerary kleopatra klettres klines kmag kmail kmines kmix kmplot @@ -15694,6 +15968,8 @@ in fcitx-qt5 = callPackage ../tools/inputmethods/fcitx/fcitx-qt5.nix { }; + fcitx5-qt = callPackage ../tools/inputmethods/fcitx5/fcitx5-qt.nix { }; + qgpgme = callPackage ../development/libraries/gpgme { }; grantlee = callPackage ../development/libraries/grantlee/5 { }; @@ -15819,6 +16095,8 @@ in # Not a library, but we do want it to be built for every qt version there # is, to allow users to choose the right build if needed. sddm = callPackage ../applications/display-managers/sddm { }; + + signond = callPackage ../development/libraries/signond {}; }; qtEnv = qt5.env; @@ -15965,7 +16243,9 @@ in sbc = callPackage ../development/libraries/sbc { }; - schroedinger = callPackage ../development/libraries/schroedinger { }; + schroedinger = callPackage ../development/libraries/schroedinger { + autoreconfHook = buildPackages.autoreconfHook269; + }; SDL = callPackage ../development/libraries/SDL ({ inherit (darwin.apple_sdk.frameworks) OpenGL CoreAudio CoreServices AudioUnit Kernel Cocoa; @@ -16032,6 +16312,8 @@ in graphite2 = callPackage ../development/libraries/silgraphite/graphite2.nix {}; + s2n = callPackage ../development/libraries/s2n { }; + simavr = callPackage ../development/tools/simavr { avrgcc = pkgsCross.avr.buildPackages.gcc; avrlibc = pkgsCross.avr.libcCross; @@ -16245,11 +16527,15 @@ in steghide = callPackage ../tools/security/steghide {}; + stegseek = callPackage ../tools/security/stegseek {}; + stlport = callPackage ../development/libraries/stlport { }; streamlink = callPackage ../applications/video/streamlink { pythonPackages = python3Packages; }; streamlink-twitch-gui-bin = callPackage ../applications/video/streamlink-twitch-gui/bin.nix {}; + sub-batch = callPackage ../applications/video/sub-batch { }; + subdl = callPackage ../applications/video/subdl { }; subtitleeditor = callPackage ../applications/video/subtitleeditor { enchant = enchant1; }; @@ -16295,9 +16581,7 @@ in taglib-sharp = callPackage ../development/libraries/taglib-sharp { }; - talloc = callPackage ../development/libraries/talloc { - wafHook = wafHook.override { python = python3; }; - }; + talloc = callPackage ../development/libraries/talloc { }; tclap = callPackage ../development/libraries/tclap {}; @@ -16380,10 +16664,14 @@ in totem-pl-parser = callPackage ../development/libraries/totem-pl-parser { }; - tpm2-tss = callPackage ../development/libraries/tpm2-tss { }; + tpm2-tss = callPackage ../development/libraries/tpm2-tss { + autoreconfHook = buildPackages.autoreconfHook269; + }; tremor = callPackage ../development/libraries/tremor { }; + trillian = callPackage ../tools/misc/trillian { }; + twolame = callPackage ../development/libraries/twolame { }; udns = callPackage ../development/libraries/udns { }; @@ -16482,6 +16770,7 @@ in vte_290 = callPackage ../development/libraries/vte/2.90.nix { }; vtk_7 = libsForQt515.callPackage ../development/libraries/vtk/7.x.nix { + stdenv = gcc9Stdenv; inherit (darwin) libobjc; inherit (darwin.apple_sdk.libs) xpc; inherit (darwin.apple_sdk.frameworks) Cocoa CoreServices DiskArbitration @@ -16489,6 +16778,7 @@ in CoreText IOSurface ImageIO OpenGL GLUT; }; vtk_8 = libsForQt515.callPackage ../development/libraries/vtk/8.x.nix { + stdenv = gcc9Stdenv; inherit (darwin) libobjc; inherit (darwin.apple_sdk.libs) xpc; inherit (darwin.apple_sdk.frameworks) Cocoa CoreServices DiskArbitration @@ -17051,7 +17341,9 @@ in cayley = callPackage ../servers/cayley { }; - charybdis = callPackage ../servers/irc/charybdis { }; + charybdis = callPackage ../servers/irc/charybdis { + autoreconfHook = buildPackages.autoreconfHook269; + }; clamsmtp = callPackage ../servers/mail/clamsmtp { }; @@ -17176,11 +17468,14 @@ in gofish = callPackage ../servers/gopher/gofish { }; grafana = callPackage ../servers/monitoring/grafana { }; + grafanaPlugins = dontRecurseIntoAttrs (callPackage ../servers/monitoring/grafana/plugins { }); grafana-loki = callPackage ../servers/monitoring/loki { }; grafana_reporter = callPackage ../servers/monitoring/grafana-reporter { }; + grafana-image-renderer = callPackage ../servers/monitoring/grafana-image-renderer { }; + gerbera = callPackage ../servers/gerbera {}; gobetween = callPackage ../servers/gobetween { }; @@ -17432,9 +17727,13 @@ in inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit Cocoa; }; - pulseaudio = callPackage ../servers/pulseaudio { + pulseaudio = callPackage ../servers/pulseaudio ({ inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit Cocoa; - }; + } // lib.optionalAttrs stdenv.isDarwin { + # Default autoreconfHook (2.70) fails on darwin, + # with "configure: error: *** Compiler does not support -std=gnu11" + autoreconfHook = buildPackages.autoreconfHook269; + }); qpaeq = libsForQt5.callPackage ../servers/pulseaudio/qpaeq.nix { }; @@ -17492,9 +17791,6 @@ in }; mariadb = callPackage ../servers/sql/mariadb { - # As per mariadb's cmake, "static jemalloc_pic.a can only be used up to jemalloc 4". - # https://jira.mariadb.org/browse/MDEV-15034 - jemalloc450 = jemalloc450.override ({ disableInitExecTls = true; }); inherit (darwin) cctools; inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices; }; @@ -17552,7 +17848,7 @@ in mysql80 = callPackage ../servers/sql/mysql/8.0.x.nix { inherit (darwin) cctools developer_cmds; inherit (darwin.apple_sdk.frameworks) CoreServices; - boost = boost169; # Configure checks for specific version. + boost = boost173; # Configure checks for specific version. protobuf = protobuf3_7; }; @@ -17653,6 +17949,7 @@ in prometheus-apcupsd-exporter = callPackage ../servers/monitoring/prometheus/apcupsd-exporter.nix { }; prometheus-aws-s3-exporter = callPackage ../servers/monitoring/prometheus/aws-s3-exporter.nix { }; prometheus-bind-exporter = callPackage ../servers/monitoring/prometheus/bind-exporter.nix { }; + prometheus-bird-exporter = callPackage ../servers/monitoring/prometheus/bird-exporter.nix { }; prometheus-blackbox-exporter = callPackage ../servers/monitoring/prometheus/blackbox-exporter.nix { }; prometheus-collectd-exporter = callPackage ../servers/monitoring/prometheus/collectd-exporter.nix { }; prometheus-cups-exporter = callPackage ../servers/monitoring/prometheus/cups-exporter.nix { }; @@ -17683,6 +17980,7 @@ in prometheus-redis-exporter = callPackage ../servers/monitoring/prometheus/redis-exporter.nix { }; prometheus-rabbitmq-exporter = callPackage ../servers/monitoring/prometheus/rabbitmq-exporter.nix { }; prometheus-rtl_433-exporter = callPackage ../servers/monitoring/prometheus/rtl_433-exporter.nix { }; + prometheus-smokeping-prober = callPackage ../servers/monitoring/prometheus/smokeping-prober.nix { }; prometheus-snmp-exporter = callPackage ../servers/monitoring/prometheus/snmp-exporter.nix { }; prometheus-sql-exporter = callPackage ../servers/monitoring/prometheus/sql-exporter.nix { }; prometheus-tor-exporter = callPackage ../servers/monitoring/prometheus/tor-exporter.nix { }; @@ -17869,7 +18167,9 @@ in tomcat_mysql_jdbc = callPackage ../servers/http/tomcat/jdbc/mysql { }; - torque = callPackage ../servers/computing/torque { }; + torque = callPackage ../servers/computing/torque { + autoreconfHook = buildPackages.autoreconfHook269; + }; tt-rss = callPackage ../servers/tt-rss { }; tt-rss-plugin-ff-instagram = callPackage ../servers/tt-rss/plugin-ff-instagram { }; @@ -18159,6 +18459,8 @@ in dstat = callPackage ../os-specific/linux/dstat { }; + erofs-utils = callPackage ../os-specific/linux/erofs-utils { }; + # unstable until the first 1.x release fscrypt-experimental = callPackage ../os-specific/linux/fscrypt { }; fscryptctl-experimental = callPackage ../os-specific/linux/fscryptctl { }; @@ -18609,9 +18911,9 @@ in hyperv-daemons = callPackage ../os-specific/linux/hyperv-daemons { }; - e1000e = if stdenv.lib.versionOlder kernel.version "4.10" then callPackage ../os-specific/linux/e1000e {} else null; + e1000e = if lib.versionOlder kernel.version "4.10" then callPackage ../os-specific/linux/e1000e {} else null; - intel-speed-select = if stdenv.lib.versionAtLeast kernel.version "5.3" then callPackage ../os-specific/linux/intel-speed-select { } else null; + intel-speed-select = if lib.versionAtLeast kernel.version "5.3" then callPackage ../os-specific/linux/intel-speed-select { } else null; ixgbevf = callPackage ../os-specific/linux/ixgbevf {}; @@ -18692,14 +18994,14 @@ 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; + oci-seccomp-bpf-hook = if 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; + phc-intel = if lib.versionAtLeast kernel.version "4.10" then callPackage ../os-specific/linux/phc-intel { } else null; # Disable for kernels 4.15 and above due to compatibility issues - prl-tools = if stdenv.lib.versionOlder kernel.version "4.15" then callPackage ../os-specific/linux/prl-tools { } else null; + prl-tools = if lib.versionOlder kernel.version "4.15" then callPackage ../os-specific/linux/prl-tools { } else null; sch_cake = callPackage ../os-specific/linux/sch_cake { }; @@ -18819,7 +19121,7 @@ in # Hardened Linux hardenedLinuxPackagesFor = kernel': overrides: let # Note: We use this hack since the hardened patches can lag behind and we don't want to delay updates: - linux_latest_for_hardened = pkgs.linux_5_9; + linux_latest_for_hardened = pkgs.linux_5_10; kernel = (if kernel' == pkgs.linux_latest then linux_latest_for_hardened else kernel').override overrides; in linuxPackagesFor (kernel.override { structuredExtraConfig = import ../os-specific/linux/kernel/hardened/config.nix { @@ -18830,7 +19132,7 @@ in kernelPatches.tag_hardened kernelPatches.hardened.${kernel.meta.branch} ]; - modDirVersionArg = kernel.modDirVersion + "-hardened"; + modDirVersionArg = kernel.modDirVersion + (kernelPatches.hardened.${kernel.meta.branch}).extra + "-hardened"; isHardened = true; }); @@ -18920,6 +19222,8 @@ in libsmbios = callPackage ../os-specific/linux/libsmbios { }; + libsurvive = callPackage ../development/libraries/libsurvive { }; + lm_sensors = callPackage ../os-specific/linux/lm-sensors { }; lockdep = callPackage ../os-specific/linux/lockdep { }; @@ -19207,6 +19511,8 @@ in raspberrypi-eeprom = callPackage ../os-specific/linux/raspberrypi-eeprom {}; + raspberrypi-armstubs = callPackage ../os-specific/linux/firmware/raspberrypi/armstubs.nix {}; + regionset = callPackage ../os-specific/linux/regionset { }; rfkill_udev = callPackage ../os-specific/linux/rfkill/udev.nix { }; @@ -19392,6 +19698,8 @@ in ubootRaspberryPi2 ubootRaspberryPi3_32bit ubootRaspberryPi3_64bit + ubootRaspberryPi4_32bit + ubootRaspberryPi4_64bit ubootRaspberryPiZero ubootRock64 ubootRockPi4 @@ -19835,6 +20143,10 @@ in kopia = callPackage ../tools/backup/kopia { }; + kora-icon-theme = callPackage ../data/icons/kora-icon-theme { + inherit (kdeFrameworks) breeze-icons; + }; + koreader = callPackage ../applications/misc/koreader {}; lato = callPackage ../data/fonts/lato {}; @@ -20014,6 +20326,8 @@ in open-sans = callPackage ../data/fonts/open-sans { }; + openzone-cursors = callPackage ../data/themes/openzone { }; + orbitron = callPackage ../data/fonts/orbitron { }; orion = callPackage ../data/themes/orion {}; @@ -20076,6 +20390,8 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; + prjxray-db = callPackage ../data/misc/prjxray-db { }; + profont = callPackage ../data/fonts/profont { inherit (buildPackages.xorg) mkfontscale; }; @@ -20111,6 +20427,8 @@ in sweet = callPackage ../data/themes/sweet { }; + symbiflow-arch-defs = callPackage ../data/misc/symbiflow-arch-defs { }; + mime-types = callPackage ../data/misc/mime-types { }; shared-mime-info = callPackage ../data/misc/shared-mime-info { }; @@ -20282,6 +20600,8 @@ in ultimate-oldschool-pc-font-pack = callPackage ../data/fonts/ultimate-oldschool-pc-font-pack { }; + ultralist = callPackage ../applications/misc/ultralist { }; + undefined-medium = callPackage ../data/fonts/undefined-medium { }; uni-vga = callPackage ../data/fonts/uni-vga @@ -20385,6 +20705,8 @@ in masterpdfeditor = libsForQt5.callPackage ../applications/misc/masterpdfeditor { }; + masterpdfeditor4 = libsForQt5.callPackage ../applications/misc/masterpdfeditor4 { }; + aeolus = callPackage ../applications/audio/aeolus { }; aewan = callPackage ../applications/editors/aewan { }; @@ -20450,6 +20772,8 @@ in appeditor = callPackage ../applications/misc/appeditor { }; + appgate-sdp = callPackage ../applications/networking/appgate-sdp { }; + apostrophe = callPackage ../applications/editors/apostrophe { pythonPackages = python3Packages; }; @@ -20594,7 +20918,7 @@ in bevelbar = callPackage ../applications/window-managers/bevelbar { }; - bibletime = libsForQt514.callPackage ../applications/misc/bibletime { }; + bibletime = libsForQt5.callPackage ../applications/misc/bibletime { }; bino3d = libsForQt5.callPackage ../applications/video/bino3d { glew = glew110; @@ -20627,9 +20951,8 @@ in bitwig-studio2 = callPackage ../applications/audio/bitwig-studio/bitwig-studio2.nix { inherit (pkgs) bitwig-studio1; }; - bitwig-studio3 = callPackage ../applications/audio/bitwig-studio/bitwig-studio3.nix { - inherit (pkgs) bitwig-studio1; - }; + bitwig-studio3 = callPackage ../applications/audio/bitwig-studio/bitwig-studio3.nix { }; + bitwig-studio = bitwig-studio3; bgpdump = callPackage ../tools/networking/bgpdump { }; @@ -20680,8 +21003,6 @@ in bristol = callPackage ../applications/audio/bristol { }; - bs1770gain = callPackage ../applications/audio/bs1770gain { }; - bjumblr = callPackage ../applications/audio/bjumblr { }; bschaffl = callPackage ../applications/audio/bschaffl { }; @@ -20918,7 +21239,7 @@ in dablin = callPackage ../applications/radio/dablin { }; darcs = haskell.lib.overrideCabal (haskell.lib.justStaticExecutables haskellPackages.darcs) (drv: { - configureFlags = (stdenv.lib.remove "-flibrary" drv.configureFlags or []) ++ ["-f-library"]; + configureFlags = (lib.remove "-flibrary" drv.configureFlags or []) ++ ["-f-library"]; }); darktable = callPackage ../applications/graphics/darktable { @@ -20955,7 +21276,7 @@ in dfasma = libsForQt5.callPackage ../applications/audio/dfasma { }; - dfilemanager = libsForQt514.callPackage ../applications/misc/dfilemanager { }; + dfilemanager = libsForQt5.callPackage ../applications/misc/dfilemanager { }; dia = callPackage ../applications/graphics/dia { inherit (pkgs.gnome2) libart_lgpl libgnomeui; @@ -20989,11 +21310,10 @@ in }; inherit (callPackage ../applications/virtualization/docker {}) - docker_18_09 - docker_19_03; + docker_20_10; - docker = docker_19_03; - docker-edge = docker_19_03; + docker = docker_20_10; + docker-edge = docker_20_10; docker-proxy = callPackage ../applications/virtualization/docker/proxy.nix { }; @@ -21103,14 +21423,16 @@ in elf-dissector = libsForQt5.callPackage ../applications/misc/elf-dissector { }; - elinks = callPackage ../applications/networking/browsers/elinks { }; + elfx86exts = callPackage ../applications/misc/elfx86exts { }; + + elinks = callPackage ../applications/networking/browsers/elinks { + autoreconfHook = buildPackages.autoreconfHook269; + }; elvis = callPackage ../applications/editors/elvis { }; emacs = emacs27; - emacsPackages = emacs27Packages; emacs-nox = emacs27-nox; - emacsWithPackages = emacsPackages.emacsWithPackages; emacs27 = callPackage ../applications/editors/emacs/27.nix { # use override to enable additional features @@ -21177,15 +21499,10 @@ in inherit autoconf automake editorconfig-core-c git libffi libpng pkgconfig poppler rtags w3m zlib substituteAll rustPlatform cmake llvmPackages - libtool zeromq openssl; + libtool zeromq openssl ott; }; }; - emacs26Packages = dontRecurseIntoAttrs (emacsPackagesFor emacs26); - emacs27Packages = dontRecurseIntoAttrs (emacsPackagesFor emacs27); - emacs26WithPackages = emacs26Packages.emacsWithPackages; - emacs27WithPackages = emacs27Packages.emacsWithPackages; - inherit (gnome3) empathy; enhanced-ctorrent = callPackage ../applications/networking/enhanced-ctorrent { }; @@ -21229,10 +21546,12 @@ in etherape = callPackage ../applications/networking/sniffers/etherape { }; - evilpixie = libsForQt514.callPackage ../applications/graphics/evilpixie { }; + evilpixie = libsForQt5.callPackage ../applications/graphics/evilpixie { }; exercism = callPackage ../applications/misc/exercism { }; + expenses = callPackage ../applications/misc/expenses { }; + go-libp2p-daemon = callPackage ../servers/go-libp2p-daemon { }; go-motion = callPackage ../development/tools/go-motion { }; @@ -21347,14 +21666,20 @@ in fritzing = libsForQt5.callPackage ../applications/science/electronics/fritzing { }; - fsv = callPackage ../applications/misc/fsv { }; + fsv = callPackage ../applications/misc/fsv { + autoreconfHook = buildPackages.autoreconfHook269; + }; - ft2-clone = callPackage ../applications/audio/ft2-clone { }; + ft2-clone = callPackage ../applications/audio/ft2-clone { + inherit (darwin.apple_sdk.frameworks) CoreAudio CoreMIDI CoreServices Cocoa; + }; fvwm = callPackage ../applications/window-managers/fvwm { }; ganttproject-bin = callPackage ../applications/misc/ganttproject-bin { }; + gaucheBootstrap = callPackage ../development/interpreters/gauche/boot.nix { }; + gauche = callPackage ../development/interpreters/gauche { }; gcal = callPackage ../applications/misc/gcal { }; @@ -21368,7 +21693,7 @@ in geoipupdate = callPackage ../applications/misc/geoipupdate/default.nix { }; - ghostwriter = libsForQt514.callPackage ../applications/editors/ghostwriter { }; + ghostwriter = libsForQt5.callPackage ../applications/editors/ghostwriter { }; gitweb = callPackage ../applications/version-management/git-and-tools/gitweb { }; @@ -21541,12 +21866,16 @@ in wireshark = callPackage ../applications/networking/sniffers/wireshark { inherit (darwin.apple_sdk.frameworks) ApplicationServices SystemConfiguration; + libpcap = libpcap.override { withBluez = stdenv.isLinux; }; }; wireshark-qt = wireshark; # The GTK UI is deprecated by upstream. You probably want the QT version. wireshark-gtk = throw "wireshark-gtk is not supported anymore. Use wireshark-qt or wireshark-cli instead."; - wireshark-cli = wireshark.override { withQt = false; }; + wireshark-cli = wireshark.override { + withQt = false; + libpcap = libpcap.override { withBluez = stdenv.isLinux; }; + }; sngrep = callPackage ../applications/networking/sniffers/sngrep {}; @@ -21564,7 +21893,6 @@ in callPackage = pkgs.newScope { inherit (rustPackages) cargo rustc; libpng = libpng_apng; - python = python2; gnused = gnused_422; inherit (darwin.apple_sdk.frameworks) CoreMedia ExceptionHandling Kerberos AVFoundation MediaToolbox @@ -21693,6 +22021,7 @@ in getxbook = callPackage ../applications/misc/getxbook { }; gimp = callPackage ../applications/graphics/gimp { + autoreconfHook = buildPackages.autoreconfHook269; gegl = gegl_0_4; lcms = lcms2; inherit (darwin.apple_sdk.frameworks) AppKit Cocoa; @@ -21728,7 +22057,9 @@ in gitolite = callPackage ../applications/version-management/gitolite { }; - gitoxide = callPackage ../applications/version-management/gitoxide { }; + gitoxide = callPackage ../applications/version-management/gitoxide { + inherit (darwin.apple_sdk.frameworks) Security; + }; inherit (gnome3) gitg; @@ -21774,7 +22105,7 @@ in manul = callPackage ../development/tools/manul { }; - mindforger = libsForQt514.callPackage ../applications/editors/mindforger { }; + mindforger = libsForQt5.callPackage ../applications/editors/mindforger { }; mi2ly = callPackage ../applications/audio/mi2ly {}; @@ -21844,6 +22175,8 @@ in java = if stdenv.isLinux then jre else jdk; }; + qrcodegen = callPackage ../development/libraries/qrcodegen { }; + qrencode = callPackage ../development/libraries/qrencode { }; geeqie = callPackage ../applications/graphics/geeqie { }; @@ -21943,12 +22276,17 @@ in heimer = libsForQt5.callPackage ../applications/misc/heimer { }; hello = callPackage ../applications/misc/hello { }; + + hello-wayland = callPackage ../applications/graphics/hello-wayland { }; + hello-unfree = callPackage ../applications/misc/hello-unfree { }; helmholtz = callPackage ../applications/audio/pd-plugins/helmholtz { }; heme = callPackage ../applications/editors/heme { }; + herbe = callPackage ../applications/misc/herbe { }; + herbstluftwm = callPackage ../applications/window-managers/herbstluftwm { asciidoc = asciidoc-full; }; @@ -22092,6 +22430,8 @@ in tiramisu = callPackage ../applications/misc/tiramisu { }; + rootbar = callPackage ../applications/misc/rootbar {}; + waybar = callPackage ../applications/misc/waybar {}; hikari = callPackage ../applications/window-managers/hikari { }; @@ -22339,6 +22679,8 @@ in jdupes = callPackage ../tools/misc/jdupes { }; + jed = callPackage ../applications/editors/jed { }; + jedit = callPackage ../applications/editors/jedit { }; jgmenu = callPackage ../applications/misc/jgmenu { }; @@ -22593,6 +22935,7 @@ in libreoffice-still = lowPrio (callPackage ../applications/office/libreoffice/wrapper.nix { libreoffice = callPackage ../applications/office/libreoffice (libreoffice-args // { + stdenv = gcc9Stdenv; # Fails in multiple ways with gcc10 icu = icu64; variant = "still"; jdk = jdk8; @@ -22803,14 +23146,15 @@ in mercurialFull = appendToName "full" (pkgs.mercurial.override { guiSupport = true; }); - # Needs qtwebkit which is broken on qt5.15 - merkaartor = libsForQt514.callPackage ../applications/misc/merkaartor { }; + merkaartor = libsForQt5.callPackage ../applications/misc/merkaartor { }; meshlab = libsForQt5.callPackage ../applications/graphics/meshlab { }; metersLv2 = callPackage ../applications/audio/meters_lv2 { }; - mhwaveedit = callPackage ../applications/audio/mhwaveedit {}; + mhwaveedit = callPackage ../applications/audio/mhwaveedit { + autoreconfHook = buildPackages.autoreconfHook269; + }; michabo = libsForQt5.callPackage ../applications/misc/michabo { }; @@ -22913,6 +23257,7 @@ in mopidy-mpd mopidy-mpris mopidy-musicbox-webclient + mopidy-scrobbler mopidy-somafm mopidy-soundcloud mopidy-spotify @@ -23033,7 +23378,9 @@ in else null; }; - mup = callPackage ../applications/audio/mup { }; + mup = callPackage ../applications/audio/mup { + autoreconfHook = buildPackages.autoreconfHook269; + }; # TODO: we should probably merge these 2 musescore = @@ -23231,6 +23578,7 @@ in msmtp = callPackage ../applications/networking/msmtp { inherit (darwin.apple_sdk.frameworks) Security; + autoreconfHook = buildPackages.autoreconfHook269; }; imapfilter = callPackage ../applications/networking/mailreaders/imapfilter.nix { @@ -23301,7 +23649,7 @@ in nedit = callPackage ../applications/editors/nedit { }; - ngt = callPackage ../development/libraries/ngt { enableAVX = false; }; + ngt = callPackage ../development/libraries/ngt { }; nheko = libsForQt5.callPackage ../applications/networking/instant-messengers/nheko { }; @@ -23322,6 +23670,12 @@ in muchsync = callPackage ../applications/networking/mailreaders/notmuch/muchsync.nix { }; + nufraw = callPackage ../applications/graphics/nufraw/default.nix { }; + + nufraw-thumbnailer = callPackage ../applications/graphics/nufraw/default.nix { + addThumbnailer = true; + }; + notmuch-addrlookup = callPackage ../applications/networking/mailreaders/notmuch-addrlookup { }; nova-filters = callPackage ../applications/audio/nova-filters { }; @@ -23334,6 +23688,8 @@ in inherit (gnome2) libglade; }; + oberon-risc-emu = callPackage ../misc/emulators/oberon-risc-emu { }; + obs-studio = libsForQt5.callPackage ../applications/video/obs-studio { }; obs-wlrobs = callPackage ../applications/video/obs-studio/wlrobs.nix { }; @@ -23917,6 +24273,10 @@ in recode = callPackage ../tools/text/recode { }; + reddsaver = callPackage ../applications/misc/reddsaver { + inherit (darwin.apple_sdk.frameworks) Security; + }; + rednotebook = python3Packages.callPackage ../applications/editors/rednotebook { }; remotebox = callPackage ../applications/virtualization/remotebox { }; @@ -23937,7 +24297,9 @@ in rkdeveloptool = callPackage ../misc/rkdeveloptool { }; - rofi-unwrapped = callPackage ../applications/misc/rofi { }; + rofi-unwrapped = callPackage ../applications/misc/rofi { + autoreconfHook = buildPackages.autoreconfHook269; + }; rofi = callPackage ../applications/misc/rofi/wrapper.nix { }; rofi-pass = callPackage ../tools/security/pass/rofi-pass.nix { }; @@ -24005,7 +24367,7 @@ in scribusUnstable = libsForQt5.callPackage ../applications/office/scribus/unstable.nix { }; - seafile-client = libsForQt514.callPackage ../applications/networking/seafile-client { }; + seafile-client = libsForQt5.callPackage ../applications/networking/seafile-client { }; sent = callPackage ../applications/misc/sent { }; @@ -24211,7 +24573,9 @@ in soxr = callPackage ../applications/misc/audio/soxr { }; - spek = callPackage ../applications/audio/spek { }; + spek = callPackage ../applications/audio/spek { + autoreconfHook = buildPackages.autoreconfHook269; + }; spotify-unwrapped = callPackage ../applications/audio/spotify { libgcrypt = libgcrypt_1_5; @@ -24243,7 +24607,9 @@ in sslyze = with python3Packages; toPythonApplication sslyze; - ssr = callPackage ../applications/audio/soundscape-renderer {}; + ssr = callPackage ../applications/audio/soundscape-renderer { + autoreconfHook = buildPackages.autoreconfHook269; + }; ssrc = callPackage ../applications/audio/ssrc { }; @@ -24378,6 +24744,8 @@ in taskell = haskell.lib.justStaticExecutables haskellPackages.taskell; + tap-plugins = callPackage ../applications/audio/tap-plugins { }; + taskjuggler = callPackage ../applications/misc/taskjuggler { }; tabula = callPackage ../applications/misc/tabula { }; @@ -24386,6 +24754,8 @@ in taskwarrior = callPackage ../applications/misc/taskwarrior { }; + taskwarrior-tui = callPackage ../applications/misc/taskwarrior-tui { }; + dstask = callPackage ../applications/misc/dstask { }; tasksh = callPackage ../applications/misc/tasksh { }; @@ -24633,7 +25003,9 @@ in vbindiff = callPackage ../applications/editors/vbindiff { }; - vcprompt = callPackage ../applications/version-management/vcprompt { }; + vcprompt = callPackage ../applications/version-management/vcprompt { + autoconf = buildPackages.autoconf269; + }; vcs = callPackage ../applications/video/vcs { }; @@ -24841,6 +25213,8 @@ in vym = qt5.callPackage ../applications/misc/vym { }; + wad = python3Packages.callPackage ../tools/security/wad { }; + waon = callPackage ../applications/audio/waon { }; w3m = callPackage ../applications/networking/browsers/w3m { }; @@ -24922,6 +25296,8 @@ in weston = callPackage ../applications/window-managers/weston { pipewire = pipewire_0_2; }; + wio = callPackage ../applications/window-managers/wio { }; + whitebox-tools = callPackage ../applications/gis/whitebox-tools { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -25096,7 +25472,9 @@ in gtk = gtk2; }; - x11basic = callPackage ../development/compilers/x11basic { }; + x11basic = callPackage ../development/compilers/x11basic { + autoconf = buildPackages.autoconf269; + }; x11vnc = callPackage ../tools/X11/x11vnc { }; @@ -25307,7 +25685,11 @@ in xrestop = callPackage ../tools/X11/xrestop { }; - xsd = callPackage ../development/libraries/xsd { }; + xrgears = callPackage ../applications/graphics/xrgears { }; + + xsd = callPackage ../development/libraries/xsd { + stdenv = gcc9Stdenv; + }; xscope = callPackage ../applications/misc/xscope { }; @@ -25403,7 +25785,9 @@ in zeronet = callPackage ../applications/networking/p2p/zeronet { }; - zexy = callPackage ../applications/audio/pd-plugins/zexy { }; + zexy = callPackage ../applications/audio/pd-plugins/zexy { + autoconf = buildPackages.autoconf269; + }; zgrviewer = callPackage ../applications/graphics/zgrviewer {}; @@ -25434,7 +25818,19 @@ in zscroll = callPackage ../applications/misc/zscroll {}; - zynaddsubfx = callPackage ../applications/audio/zynaddsubfx { }; + zynaddsubfx = zyn-fusion; + + zynaddsubfx-fltk = callPackage ../applications/audio/zynaddsubfx { + guiModule = "fltk"; + }; + + zynaddsubfx-ntk = callPackage ../applications/audio/zynaddsubfx { + guiModule = "ntk"; + }; + + zyn-fusion = callPackage ../applications/audio/zynaddsubfx { + guiModule = "zest"; + }; ### BLOCKCHAINS / CRYPTOCURRENCIES / WALLETS @@ -25488,6 +25884,8 @@ in dogecoin = callPackage ../applications/blockchains/dogecoin.nix { boost = boost165; withGui = true; }; dogecoind = callPackage ../applications/blockchains/dogecoin.nix { boost = boost165; withGui = false; }; + electrs = callPackage ../applications/blockchains/electrs.nix { }; + ergo = callPackage ../applications/blockchains/ergo { }; exodus = callPackage ../applications/blockchains/exodus { }; @@ -25508,6 +25906,8 @@ in lnd = callPackage ../applications/blockchains/lnd.nix { }; + lndconnect = callPackage ../applications/blockchains/lndconnect { }; + monero = callPackage ../applications/blockchains/monero { inherit (darwin.apple_sdk.frameworks) CoreData IOKit PCSC; boost = boost17x; @@ -25527,7 +25927,10 @@ in nbxplorer = callPackage ../applications/blockchains/nbxplorer { }; pivx = libsForQt5.callPackage ../applications/blockchains/pivx.nix { withGui = true; }; - pivxd = callPackage ../applications/blockchains/pivx.nix { withGui = false; }; + pivxd = callPackage ../applications/blockchains/pivx.nix { + withGui = false; + autoreconfHook = buildPackages.autoreconfHook269; + }; ethabi = callPackage ../applications/blockchains/ethabi.nix { }; @@ -25676,6 +26079,10 @@ in chocolateDoom = callPackage ../games/chocolate-doom { }; + clonehero-unwrapped = pkgs.callPackage ../games/clonehero { }; + + clonehero = pkgs.callPackage ../games/clonehero/fhs-wrapper.nix { }; + crispyDoom = callPackage ../games/crispy-doom { }; cri-o = callPackage ../applications/virtualization/cri-o/wrapper.nix { }; @@ -25728,6 +26135,8 @@ in displaycal = callPackage ../applications/graphics/displaycal {}; + domination = callPackage ../games/domination { }; + drumkv1 = libsForQt5.callPackage ../applications/audio/drumkv1 { }; duckmarines = callPackage ../games/duckmarines { love = love_0_10; }; @@ -25806,7 +26215,10 @@ in freecell-solver = callPackage ../games/freecell-solver { }; - freeciv = callPackage ../games/freeciv { qt5 = qt514; }; + freeciv = callPackage ../games/freeciv { + autoreconfHook = buildPackages.autoreconfHook269; + qt5 = qt514; + }; freeciv_gtk = freeciv.override { gtkClient = true; @@ -25989,6 +26401,7 @@ in megaglest = callPackage ../games/megaglest {}; mindustry = callPackage ../games/mindustry { }; + mindustry-wayland = callPackage ../games/mindustry { glew = glew-egl; }; mindustry-server = callPackage ../games/mindustry { enableClient = false; @@ -26262,13 +26675,16 @@ in }; # solarus and solarus-quest-editor must use the same version of Qt. - solarus = libsForQt514.callPackage ../games/solarus { }; - solarus-quest-editor = libsForQt514.callPackage ../development/tools/solarus-quest-editor { }; + solarus = libsForQt5.callPackage ../games/solarus { }; + solarus-quest-editor = libsForQt5.callPackage ../development/tools/solarus-quest-editor { }; + + soldat-unstable = callPackage ../games/soldat-unstable { }; # You still can override by passing more arguments. space-orbit = callPackage ../games/space-orbit { }; spring = callPackage ../games/spring { + asciidoc = asciidoc-full; boost = boost155; }; @@ -26586,6 +27002,7 @@ in tilingnome = callPackage ../desktops/gnome-3/extensions/tilingnome { }; timepp = callPackage ../desktops/gnome-3/extensions/timepp { }; topicons-plus = callPackage ../desktops/gnome-3/extensions/topicons-plus { }; + unite-shell = callPackage ../desktops/gnome-3/extensions/unite-shell { }; window-corner-preview = callPackage ../desktops/gnome-3/extensions/window-corner-preview { }; window-is-ready-remover = callPackage ../desktops/gnome-3/extensions/window-is-ready-remover { }; workspace-matrix = callPackage ../desktops/gnome-3/extensions/workspace-matrix { }; @@ -26644,6 +27061,8 @@ in let mkPlasma5 = import ../desktops/plasma-5; attrs = { + # ATTN: The Qt version used in the NixOS Plasma module must be updated + # whenever this changes! inherit libsForQt5; inherit lib fetchurl; gconf = gnome2.GConf; @@ -26752,6 +27171,8 @@ in dcm2niix = callPackage ../applications/science/biology/dcm2niix { }; + deepsea = callPackage ../tools/security/deepsea { }; + deeptools = callPackage ../applications/science/biology/deeptools { python = python3; }; delly = callPackage ../applications/science/biology/delly { }; @@ -26770,6 +27191,8 @@ in exonerate = callPackage ../applications/science/biology/exonerate { }; + fastp = callPackage ../applications/science/biology/fastp { }; + hisat2 = callPackage ../applications/science/biology/hisat2 { }; htslib = callPackage ../development/libraries/science/biology/htslib { }; @@ -26784,7 +27207,9 @@ in neuron-version = neuron.version; }; - kallisto = callPackage ../applications/science/biology/kallisto { }; + kallisto = callPackage ../applications/science/biology/kallisto { + autoconf = buildPackages.autoconf269; + }; kssd = callPackage ../applications/science/biology/kssd { }; @@ -27142,7 +27567,7 @@ in cadical = callPackage ../applications/science/logic/cadical {}; inherit (callPackage ./coq-packages.nix { - inherit (ocaml-ng) ocamlPackages_4_05 ocamlPackages_4_09; + inherit (ocaml-ng) ocamlPackages_4_05 ocamlPackages_4_09 ocamlPackages_4_10; }) mkCoqPackages coqPackages_8_5 coq_8_5 coqPackages_8_6 coq_8_6 @@ -27207,7 +27632,7 @@ in ifstat-legacy = callPackage ../tools/networking/ifstat-legacy { }; isabelle = callPackage ../applications/science/logic/isabelle { - polyml = stdenv.lib.overrideDerivation polyml (attrs: { + polyml = lib.overrideDerivation polyml (attrs: { configureFlags = [ "--enable-intinf-as-int" "--with-gmp" "--disable-shared" ]; }); @@ -27354,6 +27779,8 @@ in csxcad = callPackage ../applications/science/electronics/csxcad { }; + diylc = callPackage ../applications/science/electronics/diylc { }; + flatcam = callPackage ../applications/science/electronics/flatcam { }; fparser = callPackage ../applications/science/electronics/fparser { }; @@ -27453,6 +27880,7 @@ in mxnet = callPackage ../applications/science/math/mxnet { inherit (linuxPackages) nvidia_x11; + stdenv = gcc9Stdenv; }; wxmaxima = callPackage ../applications/science/math/wxmaxima { wxGTK = wxGTK30; }; @@ -27501,6 +27929,7 @@ in boinc = callPackage ../applications/science/misc/boinc { }; celestia = callPackage ../applications/science/astronomy/celestia { + autoreconfHook = buildPackages.autoreconfHook269; lua = lua5_1; inherit (pkgs.gnome2) gtkglext; }; @@ -27814,6 +28243,8 @@ in fahcontrol = callPackage ../applications/science/misc/foldingathome/control.nix {}; fahviewer = callPackage ../applications/science/misc/foldingathome/viewer.nix {}; + foma = callPackage ../tools/misc/foma { }; + foo2zjs = callPackage ../misc/drivers/foo2zjs {}; foomatic-filters = callPackage ../misc/drivers/foomatic-filters {}; @@ -28263,6 +28694,8 @@ in OSCAR = qt5.callPackage ../applications/misc/OSCAR { }; + pcem = callPackage ../misc/emulators/pcem { }; + pgmanage = callPackage ../applications/misc/pgmanage { }; pgadmin = callPackage ../applications/misc/pgadmin { @@ -28453,6 +28886,8 @@ in snscrape = with python3Packages; toPythonApplication snscrape; + soundmodem = callPackage ../applications/radio/soundmodem {}; + soundOfSorting = callPackage ../misc/sound-of-sorting { }; sourceAndTags = callPackage ../misc/source-and-tags { @@ -28469,6 +28904,8 @@ in sqsh = callPackage ../development/tools/sqsh { }; + sumneko-lua-language-server = callPackage ../development/tools/sumneko-lua-language-server { }; + go-swag = callPackage ../development/tools/go-swag { }; go-swagger = callPackage ../development/tools/go-swagger { }; @@ -28533,6 +28970,8 @@ in ssh-audit = callPackage ../tools/security/ssh-audit { }; + autocpu-freq = callPackage ../tools/system/autocpu-freq { }; + thermald = callPackage ../tools/system/thermald { }; throttled = callPackage ../tools/system/throttled { }; @@ -28583,6 +29022,8 @@ in giflib = giflib_4_1; }; + ViennaRNA = callPackage ../applications/science/molecular-dynamics/viennarna { }; + viewnior = callPackage ../applications/graphics/viewnior { }; vimUtils = callPackage ../misc/vim-plugins/vim-utils.nix { }; @@ -28609,6 +29050,8 @@ in inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly; }; + vsh = callPackage ../tools/misc/vsh { }; + vttest = callPackage ../tools/misc/vttest { }; wacomtablet = libsForQt5.callPackage ../tools/misc/wacomtablet { }; @@ -28956,7 +29399,7 @@ in apeClex = callPackage ../applications/misc/ape/apeclex.nix { }; # Unix tools - unixtools = recurseIntoAttrs (callPackages ./unix-tools.nix { }); + unixtools = recurseIntoAttrs (callPackages ./unixtools.nix { }); inherit (unixtools) hexdump ps logger eject umount mount wall hostname more sysctl getconf getent locale killall xxd watch; @@ -28993,6 +29436,8 @@ in gcc-armhf-embedded = pkgsCross.armhf-embedded.buildPackages.gcc; }; + new-session-manager = callPackage ../applications/audio/new-session-manager { }; + newlib = callPackage ../development/misc/newlib { }; newlibCross = callPackage ../development/misc/newlib { stdenv = crossLibcStdenv; diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix index 14399d7ac954..52268276a033 100644 --- a/pkgs/top-level/beam-packages.nix +++ b/pkgs/top-level/beam-packages.nix @@ -1,4 +1,4 @@ -{ callPackage, wxGTK30, openssl_1_0_2 }: +{ callPackage, wxGTK30, openssl_1_0_2, buildPackages }: rec { lib = callPackage ../development/beam-modules/lib.nix {}; @@ -20,6 +20,7 @@ rec { wxGTK = wxGTK30; # Can be enabled since the bug has been fixed in https://github.com/erlang/otp/pull/2508 parallelBuild = true; + autoconf = buildPackages.autoconf269; }; erlangR23_odbc = erlangR23.override { odbcSupport = true; }; erlangR23_javac = erlangR23.override { javacSupport = true; }; @@ -33,6 +34,7 @@ rec { wxGTK = wxGTK30; # Can be enabled since the bug has been fixed in https://github.com/erlang/otp/pull/2508 parallelBuild = true; + autoconf = buildPackages.autoconf269; }; erlangR22_odbc = erlangR22.override { odbcSupport = true; }; erlangR22_javac = erlangR22.override { javacSupport = true; }; @@ -44,6 +46,7 @@ rec { # R21 erlangR21 = lib.callErlang ../development/interpreters/erlang/R21.nix { wxGTK = wxGTK30; + autoconf = buildPackages.autoconf269; }; erlangR21_odbc = erlangR21.override { odbcSupport = true; }; erlangR21_javac = erlangR21.override { javacSupport = true; }; @@ -55,6 +58,7 @@ rec { # R20 erlangR20 = lib.callErlang ../development/interpreters/erlang/R20.nix { wxGTK = wxGTK30; + autoconf = buildPackages.autoconf269; }; erlangR20_odbc = erlangR20.override { odbcSupport = true; }; erlangR20_javac = erlangR20.override { javacSupport = true; }; @@ -67,6 +71,7 @@ rec { erlangR19 = lib.callErlang ../development/interpreters/erlang/R19.nix { wxGTK = wxGTK30; openssl = openssl_1_0_2; + autoconf = buildPackages.autoconf269; }; erlangR19_odbc = erlangR19.override { odbcSupport = true; }; erlangR19_javac = erlangR19.override { javacSupport = true; }; @@ -79,6 +84,7 @@ rec { erlangR18 = lib.callErlang ../development/interpreters/erlang/R18.nix { wxGTK = wxGTK30; openssl = openssl_1_0_2; + autoconf = buildPackages.autoconf269; }; erlangR18_odbc = erlangR18.override { odbcSupport = true; }; erlangR18_javac = erlangR18.override { javacSupport = true; }; @@ -89,6 +95,7 @@ rec { # Basho fork, using custom builder. erlang_basho_R16B02 = lib.callErlang ../development/interpreters/erlang/R16B02-basho.nix { + autoconf = buildPackages.autoconf269; }; erlang_basho_R16B02_odbc = erlang_basho_R16B02.override { odbcSupport = true; diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index aa7b3c35b82e..c67d489de628 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -1,13 +1,15 @@ { lib, callPackage, newScope, recurseIntoAttrs, ocamlPackages_4_05, ocamlPackages_4_09 -, compcert -}: - +, ocamlPackages_4_10, compcert +}@args: +let lib = import ../build-support/coq/extra-lib.nix {inherit (args) lib;}; in let mkCoqPackages' = self: coq: let callPackage = self.callPackage; in { - inherit coq; + inherit coq lib; coqPackages = self; + mkCoqDerivation = callPackage ../build-support/coq {}; + contribs = recurseIntoAttrs (callPackage ../development/coq-modules/contribs {}); @@ -22,6 +24,7 @@ let coq-elpi = callPackage ../development/coq-modules/coq-elpi {}; coq-ext-lib = callPackage ../development/coq-modules/coq-ext-lib {}; coq-haskell = callPackage ../development/coq-modules/coq-haskell { }; + coqeal = callPackage ../development/coq-modules/coqeal {}; coqhammer = callPackage ../development/coq-modules/coqhammer {}; coqprime = callPackage ../development/coq-modules/coqprime {}; coquelicot = callPackage ../development/coq-modules/coquelicot {}; @@ -39,19 +42,20 @@ let iris = callPackage ../development/coq-modules/iris {}; ltac2 = callPackage ../development/coq-modules/ltac2 {}; math-classes = callPackage ../development/coq-modules/math-classes { }; - inherit (callPackage ../development/coq-modules/mathcomp {}) - mathcomp_ mathcomp-config - mathcomp ssreflect - mathcomp-ssreflect mathcomp-fingroup mathcomp-algebra - mathcomp-solvable mathcomp-field mathcomp-character - ; - inherit (callPackage ../development/coq-modules/mathcomp/extra.nix { }) - mathcomp-extra-override mathcomp-extra-config mathcomp-extra - current-mathcomp-extra mathcomp-extra-fast mathcomp-extra-all - mathcomp-finmap mathcomp-bigenough mathcomp-real-closed - mathcomp-analysis multinomials coqeal - ; + mathcomp = callPackage ../development/coq-modules/mathcomp {}; + ssreflect = self.mathcomp.ssreflect; + mathcomp-ssreflect = self.mathcomp.ssreflect; + mathcomp-fingroup = self.mathcomp.fingroup; + mathcomp-algebra = self.mathcomp.algebra; + mathcomp-solvable = self.mathcomp.solvable; + mathcomp-field = self.mathcomp.field; + mathcomp-character = self.mathcomp.character; + mathcomp-analysis = callPackage ../development/coq-modules/mathcomp-analysis {}; + mathcomp-finmap = callPackage ../development/coq-modules/mathcomp-finmap {}; + mathcomp-bigenough = callPackage ../development/coq-modules/mathcomp-bigenough {}; + mathcomp-real-closed = callPackage ../development/coq-modules/mathcomp-real-closed {}; metalib = callPackage ../development/coq-modules/metalib { }; + multinomials = callPackage ../development/coq-modules/multinomials {}; paco = callPackage ../development/coq-modules/paco {}; paramcoq = callPackage ../development/coq-modules/paramcoq {}; QuickChick = callPackage ../development/coq-modules/QuickChick {}; @@ -64,23 +68,22 @@ let VST = callPackage ../development/coq-modules/VST { compcert = compcert.override { version = "3.7"; }; }; - - filterPackages = filterCoqPackages; + filterPackages = doesFilter: if doesFilter then filterCoqPackages self else self; }; - filterCoqPackages = coq: set: + filterCoqPackages = set: lib.listToAttrs ( - lib.concatMap (name: - let v = set.${name}; in - let p = v.compatibleCoqVersions or (_: true); in - lib.optional (p coq.coq-version) - (lib.nameValuePair name ( - if lib.isAttrs v && v.recurseForDerivations or false - then filterCoqPackages coq v - else v)) + lib.concatMap (name: let v = set.${name} or null; in + lib.optional (! v.meta.coqFilter or false) + (lib.nameValuePair name ( + if lib.isAttrs v && v.recurseForDerivations or false + then filterCoqPackages v + else v)) ) (lib.attrNames set) ); - + mkCoq = version: callPackage ../applications/science/logic/coq { + inherit version ocamlPackages_4_05 ocamlPackages_4_09 ocamlPackages_4_10; + }; in rec { /* The function `mkCoqPackages` takes as input a derivation for Coq and produces @@ -93,41 +96,17 @@ in rec { */ mkCoqPackages = coq: let self = lib.makeScope newScope (lib.flip mkCoqPackages' coq); in - if coq.dontFilter or false then self else filterCoqPackages coq self; + self.filterPackages (! coq.dontFilter or false); - coq_8_5 = callPackage ../applications/science/logic/coq { - ocamlPackages = ocamlPackages_4_05; - version = "8.5pl3"; - }; - coq_8_6 = callPackage ../applications/science/logic/coq { - ocamlPackages = ocamlPackages_4_05; - version = "8.6.1"; - }; - coq_8_7 = callPackage ../applications/science/logic/coq { - ocamlPackages = ocamlPackages_4_09; - version = "8.7.2"; - }; - coq_8_8 = callPackage ../applications/science/logic/coq { - ocamlPackages = ocamlPackages_4_09; - version = "8.8.2"; - }; - coq_8_9 = callPackage ../applications/science/logic/coq { - ocamlPackages = ocamlPackages_4_09; - version = "8.9.1"; - }; - coq_8_10 = callPackage ../applications/science/logic/coq { - ocamlPackages = ocamlPackages_4_09; - version = "8.10.2"; - }; - coq_8_11 = callPackage ../applications/science/logic/coq { - version = "8.11.2"; - }; - coq_8_12 = callPackage ../applications/science/logic/coq { - version = "8.12.2"; - }; - coq_8_13 = callPackage ../applications/science/logic/coq { - version = "8.13+beta1"; - }; + coq_8_5 = mkCoq "8.5"; + coq_8_6 = mkCoq "8.6"; + coq_8_7 = mkCoq "8.7"; + coq_8_8 = mkCoq "8.8"; + coq_8_9 = mkCoq "8.9"; + coq_8_10 = mkCoq "8.10"; + coq_8_11 = mkCoq "8.11"; + coq_8_12 = mkCoq "8.12"; + coq_8_13 = mkCoq "8.13"; coqPackages_8_5 = mkCoqPackages coq_8_5; coqPackages_8_6 = mkCoqPackages coq_8_6; diff --git a/pkgs/top-level/dhall-packages.nix b/pkgs/top-level/dhall-packages.nix index c1c2c5f0e3bb..5a3fb04748d0 100644 --- a/pkgs/top-level/dhall-packages.nix +++ b/pkgs/top-level/dhall-packages.nix @@ -19,6 +19,7 @@ let in { inherit + callPackage buildDhallPackage buildDhallGitHubPackage buildDhallDirectoryPackage diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix index 9c659e655e93..91c1549a3b0f 100644 --- a/pkgs/top-level/dotnet-packages.nix +++ b/pkgs/top-level/dotnet-packages.nix @@ -1,4 +1,5 @@ { stdenv +, lib , pkgs , buildDotnetPackage , fetchurl @@ -363,7 +364,7 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { echo 'au BufRead,BufNewFile *.bpl set filetype=boogie' > $vimdir/ftdetect/bpl.vim ''; - meta = with stdenv.lib; { + meta = with lib; { description = "An intermediate verification language"; homepage = "https://github.com/boogie-org/boogie"; longDescription = '' @@ -437,7 +438,7 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { rm -f $out/lib/dotnet/${baseName}/dafny{,-server} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A programming language with built-in specification constructs"; homepage = "https://research.microsoft.com/dafny"; maintainers = with maintainers; [ layus ]; @@ -477,9 +478,9 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { meta = { description = "Excel-DNA is an independent project to integrate .NET into Excel"; homepage = "https://excel-dna.net/"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ obadz ]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ obadz ]; + platforms = with lib.platforms; linux; }; }; @@ -506,9 +507,9 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { meta = { description = "This library implements helper functions to assist and modify the Excel-DNA function registration"; homepage = "https://github.com/Excel-DNA/Registration"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ obadz ]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ obadz ]; + platforms = with lib.platforms; linux; }; }; @@ -540,9 +541,9 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { meta = { description = "ExtCore is an extended core library for F#"; homepage = "https://github.com/jack-pappas/ExtCore"; - license = stdenv.lib.licenses.asl20; - maintainers = with stdenv.lib.maintainers; [ obadz ]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ obadz ]; + platforms = with lib.platforms; linux; broken = true; }; }; @@ -576,9 +577,9 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { service for rich editing or 'intellisense' features for editors. ''; homepage = "https://github.com/fsharp/FSharp.AutoComplete"; - license = stdenv.lib.licenses.asl20; - maintainers = with stdenv.lib.maintainers; [ obadz ]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ obadz ]; + platforms = with lib.platforms; linux; }; }; @@ -603,9 +604,9 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { meta = { description = "The F# compiler services package is a component derived from the F# compiler source code that exposes additional functionality for implementing F# language bindings"; homepage = "https://fsharp.github.io/FSharp.Compiler.Service/"; - license = stdenv.lib.licenses.asl20; - maintainers = with stdenv.lib.maintainers; [ obadz ]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ obadz ]; + platforms = with lib.platforms; linux; }; }; @@ -647,9 +648,9 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { meta = { description = "F# Data: Library for Data Access"; homepage = "https://fsharp.github.io/FSharp.Data/"; - license = stdenv.lib.licenses.asl20; - maintainers = with stdenv.lib.maintainers; [ obadz ]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ obadz ]; + platforms = with lib.platforms; linux; }; }; @@ -679,9 +680,9 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { # meta = { # description = "FSharpx.Extras is a collection of libraries and tools for use with F#"; # homepage = "https://fsprojects.github.io/FSharpx.Extras/"; - # license = stdenv.lib.licenses.asl20; - # maintainers = with stdenv.lib.maintainers; [ obadz ]; - # platforms = with stdenv.lib.platforms; linux; + # license = lib.licenses.asl20; + # maintainers = with lib.maintainers; [ obadz ]; + # platforms = with lib.platforms; linux; # }; # }; @@ -724,7 +725,7 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { outputFiles = [ "GitVersionTree/bin/Release/*" ]; exeFiles = [ "GitVersionTree.exe" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A tool to help visualize git revisions and branches"; homepage = "https://github.com/crc8/GitVersionTree"; license = licenses.gpl2; @@ -751,9 +752,9 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { meta = { description = "Math.NET Numerics is an opensource numerical library for .Net, Silverlight and Mono"; homepage = "https://numerics.mathdotnet.com/"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ obadz ]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ obadz ]; + platforms = with lib.platforms; linux; }; }; @@ -785,7 +786,7 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { A generic framework for creating extensible applications, and for creating libraries which extend those applications. ''; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }; }; @@ -840,9 +841,9 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { # meta = { # description = "F# addin for MonoDevelop 5.9"; # homepage = "https://github.com/fsharp/fsharpbinding/tree/5.9"; - # license = stdenv.lib.licenses.asl20; - # maintainers = with stdenv.lib.maintainers; [ obadz ]; - # platforms = with stdenv.lib.platforms; linux; + # license = lib.licenses.asl20; + # maintainers = with lib.maintainers; [ obadz ]; + # platforms = with lib.platforms; linux; # }; # }; @@ -872,9 +873,9 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { meta = { description = "A callback-based program option parser for C#"; homepage = "http://www.ndesk.org/Options"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ obadz ]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ obadz ]; + platforms = with lib.platforms; linux; }; }; @@ -939,9 +940,9 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { meta = { description = "A command-line tool for manipulating F# project files"; homepage = "https://github.com/kjnilsson/projekt"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ obadz ]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ obadz ]; + platforms = with lib.platforms; linux; }; }; @@ -967,9 +968,9 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { meta = { description = "A declarative CLI argument/XML configuration parser for F# applications"; homepage = "https://nessos.github.io/UnionArgParser/"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ obadz ]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ obadz ]; + platforms = with lib.platforms; linux; }; }; diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index 8075b7da4f5c..d0bb7c56d99c 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -82,5 +82,6 @@ in lib.makeScope newScope (self: lib.makeOverridable ({ // { inherit emacs melpaBuild trivialBuild; emacsWithPackages = emacsWithPackages self; + withPackages = emacsWithPackages self; }) ) {}) diff --git a/pkgs/top-level/emscripten-packages.nix b/pkgs/top-level/emscripten-packages.nix index ceb2d5e16f70..ff6360970043 100644 --- a/pkgs/top-level/emscripten-packages.nix +++ b/pkgs/top-level/emscripten-packages.nix @@ -178,7 +178,7 @@ rec { echo "================= /testing zlib using node =================" ''; - postPatch = pkgs.stdenv.lib.optionalString pkgs.stdenv.isDarwin '' + postPatch = pkgs.lib.optionalString pkgs.stdenv.isDarwin '' substituteInPlace configure \ --replace '/usr/bin/libtool' 'ar' \ --replace 'AR="libtool"' 'AR="ar"' \ diff --git a/pkgs/top-level/haxe-packages.nix b/pkgs/top-level/haxe-packages.nix index 06b82a478a87..66faa6f7cdbc 100644 --- a/pkgs/top-level/haxe-packages.nix +++ b/pkgs/top-level/haxe-packages.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchzip, fetchFromGitHub, haxe, neko, jdk, mono }: +{ stdenv, lib, fetchzip, fetchFromGitHub, haxe, neko, jdk, mono }: let self = haxePackages; haxePackages = with self; { - withCommas = stdenv.lib.replaceChars ["."] [","]; + withCommas = lib.replaceChars ["."] [","]; # simulate "haxelib dev $libname ." simulateHaxelibDev = libname: '' @@ -53,21 +53,21 @@ let meta = { homepage = "http://lib.haxe.org/p/${libname}"; - license = stdenv.lib.licenses.bsd2; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.bsd2; + platforms = lib.platforms.all; description = throw "please write meta.description"; } // attrs.meta; }); hxcpp = buildHaxeLib rec { libname = "hxcpp"; - version = "3.4.64"; - sha256 = "04gyjm6wqmsm0ifcfkxmq1yv8xrfzys3z5ajqnvvjrnks807mw8q"; + version = "4.1.15"; + sha256 = "1ybxcvwi4655563fjjgy6xv5c78grjxzadmi3l1ghds48k1rh50p"; postFixup = '' for f in $out/lib/haxe/${withCommas libname}/${withCommas version}/{,project/libs/nekoapi/}bin/Linux{,64}/*; do chmod +w "$f" patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) "$f" || true - patchelf --set-rpath ${ stdenv.lib.makeLibraryPath [ stdenv.cc.cc ] } "$f" || true + patchelf --set-rpath ${ lib.makeLibraryPath [ stdenv.cc.cc ] } "$f" || true done ''; meta.description = "Runtime support library for the Haxe C++ backend"; @@ -110,8 +110,8 @@ let installPhase = installLibHaxe { inherit libname version; }; meta = { homepage = "http://lib.haxe.org/p/${libname}"; - license = stdenv.lib.licenses.bsd2; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.bsd2; + platforms = lib.platforms.all; description = "Extern definitions for node.js 6.9"; }; }; diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index d2410e2eef3a..550c5bbd63b5 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -32,7 +32,7 @@ let callPackage = pkgs.newScope self; - requiredLuaModules = drvs: with stdenv.lib; let + requiredLuaModules = drvs: with lib; let modules = filter hasLuaModule drvs; in unique ([lua] ++ modules ++ concatLists (catAttrs "requiredLuaModules" modules)); @@ -123,7 +123,7 @@ with self; { ); ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Lightweight UNIX I/O and POSIX binding for Lua"; homepage = "https://www.gitano.org.uk/luxio/"; license = licenses.mit; @@ -151,7 +151,7 @@ with self; { printf "package.path = '$out/lib/lua/${lua.luaversion}/?/init.lua;' .. package.path\nreturn require((...) .. '.init')\n" > $out/lib/lua/${lua.luaversion}/vicious.lua ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A modular widget library for the awesome window manager"; homepage = "https://github.com/Mic92/vicious"; license = licenses.gpl2; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 06ca7b01fae7..b123658a3ffb 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -117,7 +117,6 @@ let bin_prot_p4 = callPackage ../development/ocaml-modules/bin_prot { }; bisect_ppx = callPackage ../development/ocaml-modules/bisect_ppx { }; - bisect_ppx-ocamlbuild = callPackage ../development/ocaml-modules/bisect_ppx-ocamlbuild { }; ocaml_cairo = callPackage ../development/ocaml-modules/ocaml-cairo { }; @@ -429,6 +428,8 @@ let irmin = callPackage ../development/ocaml-modules/irmin { }; + irmin-chunk = callPackage ../development/ocaml-modules/irmin/chunk.nix { }; + irmin-fs = callPackage ../development/ocaml-modules/irmin/fs.nix { }; irmin-git = callPackage ../development/ocaml-modules/irmin/git.nix { }; @@ -567,6 +568,10 @@ let inherit (pkgs) gnuplot; }; + mew = callPackage ../development/ocaml-modules/mew { }; + + mew_vi = callPackage ../development/ocaml-modules/mew_vi { }; + mezzo = callPackage ../development/compilers/mezzo { }; minisat = callPackage ../development/ocaml-modules/minisat { }; @@ -579,6 +584,8 @@ let mirage-block-ramdisk = callPackage ../development/ocaml-modules/mirage-block-ramdisk { }; + mirage-block-unix = callPackage ../development/ocaml-modules/mirage-block-unix { }; + mirage-bootvar-unix = callPackage ../development/ocaml-modules/mirage-bootvar-unix { }; mirage-channel = callPackage ../development/ocaml-modules/mirage-channel { }; @@ -597,6 +604,8 @@ let mirage-crypto-rng = callPackage ../development/ocaml-modules/mirage-crypto/rng.nix { }; + mirage-crypto-rng-async = callPackage ../development/ocaml-modules/mirage-crypto/rng-async.nix { }; + mirage-crypto-rng-mirage = callPackage ../development/ocaml-modules/mirage-crypto/rng-mirage.nix { }; mirage-device = callPackage ../development/ocaml-modules/mirage-device { }; @@ -842,6 +851,8 @@ let posix-types = callPackage ../development/ocaml-modules/posix/types.nix { }; + ppx_bitstring = callPackage ../development/ocaml-modules/bitstring/ppx.nix { }; + ppxfind = callPackage ../development/ocaml-modules/ppxfind { }; ppxlib = callPackage ../development/ocaml-modules/ppxlib { }; @@ -912,10 +923,7 @@ let pprint = callPackage ../development/ocaml-modules/pprint { }; - ppx_blob = - if lib.versionAtLeast ocaml.version "4.02" - then callPackage ../development/ocaml-modules/ppx_blob {} - else null; + ppx_blob = callPackage ../development/ocaml-modules/ppx_blob { }; ppx_cstruct = callPackage ../development/ocaml-modules/cstruct/ppx.nix {}; @@ -1018,6 +1026,8 @@ let topkg = callPackage ../development/ocaml-modules/topkg { }; + trie = callPackage ../development/ocaml-modules/trie { }; + tsdl = callPackage ../development/ocaml-modules/tsdl { }; twt = callPackage ../development/ocaml-modules/twt { }; diff --git a/pkgs/top-level/packages-config.nix b/pkgs/top-level/packages-config.nix index 52ad7aecd284..d0a71c43a962 100644 --- a/pkgs/top-level/packages-config.nix +++ b/pkgs/top-level/packages-config.nix @@ -34,8 +34,8 @@ "nvidiaPackages" "sourceHanPackages" "atomPackages" - "emacs26Packages" - "emacs27Packages" + "emacs26.pkgs" + "emacs27.pkgs" "steamPackages" "ut2004Packages" "zeroadPackages" diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 02fee95980c9..6440d01b45de 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6,15 +6,15 @@ be almost as much code as the function itself. */ { config -, stdenv, buildPackages, pkgs +, stdenv, lib, buildPackages, pkgs , fetchurl, fetchgit, fetchpatch, fetchFromGitHub , perl, overrides, buildPerl, shortenPerlShebang }: # cpan2nix assumes that perl-packages.nix will be used only with perl 5.30.3 or above -assert stdenv.lib.versionAtLeast perl.version "5.30.3"; +assert lib.versionAtLeast perl.version "5.30.3"; let - inherit (stdenv.lib) maintainers; + inherit (lib) maintainers teams; self = _self // (overrides pkgs); _self = with self; { @@ -27,8 +27,8 @@ let hasPerlModule = drv: drv ? perlModule ; requiredPerlModules = drvs: let - modules = stdenv.lib.filter hasPerlModule drvs; - in stdenv.lib.unique ([perl] ++ modules ++ stdenv.lib.concatLists (stdenv.lib.catAttrs "requiredPerlModules" modules)); + modules = lib.filter hasPerlModule drvs; + in lib.unique ([perl] ++ modules ++ lib.concatLists (lib.catAttrs "requiredPerlModules" modules)); # Convert derivation to a perl module. toPerlModule = drv: @@ -77,7 +77,7 @@ let makePerlPath [ pkgs.perlPackages.libnet ] => "/nix/store/n0m1fk9c960d8wlrs62sncnadygqqc6y-perl-Net-SMTP-1.25/lib/perl5/site_perl" */ - makePerlPath = stdenv.lib.makeSearchPathOutput "lib" perl.libPrefix; + makePerlPath = lib.makeSearchPathOutput "lib" perl.libPrefix; /* Construct a perl search path recursively including all dependencies (such as $PERL5LIB) @@ -86,7 +86,7 @@ let makeFullPerlPath [ pkgs.perlPackages.CGI ] => "/nix/store/fddivfrdc1xql02h9q500fpnqy12c74n-perl-CGI-4.38/lib/perl5/site_perl:/nix/store/8hsvdalmsxqkjg0c5ifigpf31vc4vsy2-perl-HTML-Parser-3.72/lib/perl5/site_perl:/nix/store/zhc7wh0xl8hz3y3f71nhlw1559iyvzld-perl-HTML-Tagset-3.20/lib/perl5/site_perl" */ - makeFullPerlPath = deps: makePerlPath (stdenv.lib.misc.closePropagation deps); + makeFullPerlPath = deps: makePerlPath (lib.misc.closePropagation deps); ack = buildPerlPackage { @@ -100,16 +100,16 @@ let outputs = ["out" "man"]; - nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin shortenPerlShebang; + nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; propagatedBuildInputs = [ FileNext ]; - postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.isDarwin '' shortenPerlShebang $out/bin/ack ''; # tests fails on nixos and hydra because of different purity issues doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "A grep-like tool tailored to working with large trees of source code"; homepage = "https://beyondgrep.com"; license = licenses.artistic2; @@ -129,14 +129,14 @@ let AlgorithmC3 = buildPerlPackage { pname = "Algorithm-C3"; - version = "0.10"; + version = "0.11"; src = fetchurl { - url = "mirror://cpan/authors/id/H/HA/HAARG/Algorithm-C3-0.10.tar.gz"; - sha256 = "01hlcaxndls86bl92rkd3fvf9pfa3inxqaimv88bxs95803kmkss"; + url = "mirror://cpan/authors/id/H/HA/HAARG/Algorithm-C3-0.11.tar.gz"; + sha256 = "02ck52cf0yyk57354rd1rp5l0kbfwi1pvg2lh3jadvjxfrkq9x5a"; }; meta = { description = "A module for merging hierarchies using the C3 algorithm"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -150,6 +150,20 @@ let buildInputs = [ pkgs.unzip ]; }; + AlgorithmLCSS = buildPerlPackage { + pname = "Algorithm-LCSS"; + version = "0.01"; + src = fetchurl { + url = "mirror://cpan/authors/id/J/JF/JFREEMAN/Algorithm-LCSS-0.01.tar.gz"; + sha256 = "0y0zc3sq283zpv67vy7a3h3dyvjn5svjxwknanmp38a2g36fyz3i"; + }; + propagatedBuildInputs = [ AlgorithmDiff ]; + meta = { + license = with lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.sgo ]; + }; + }; + AlgorithmMerge = buildPerlPackage { pname = "Algorithm-Merge"; version = "0.08"; @@ -162,16 +176,16 @@ let AlienBuild = buildPerlPackage { pname = "Alien-Build"; - version = "2.29"; + version = "2.37"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PL/PLICEASE/Alien-Build-2.29.tar.gz"; - sha256 = "0wx1czv14dhfkd9nwa3y2g2gy8fx041hdmckhkhb1ly46ral4d4f"; + url = "mirror://cpan/authors/id/P/PL/PLICEASE/Alien-Build-2.37.tar.gz"; + sha256 = "0lgdr4d4hpv9q6i8lzs5lrilrwj8zm1cxzxwdgvl69j8k2zbq01h"; }; propagatedBuildInputs = [ CaptureTiny FFICheckLib FileWhich Filechdir PathTiny PkgConfig ]; buildInputs = [ DevelHide Test2Suite ]; meta = { description = "Build external dependencies for use in CPAN"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -186,22 +200,22 @@ let buildInputs = [ pkgs.gmp Alienm4 DevelChecklib IOSocketSSL MojoDOM58 NetSSLeay SortVersions Test2Suite URI ]; meta = { description = "Alien package for the GNU Multiple Precision library."; - license = with stdenv.lib.licenses; [ lgpl3Plus ]; + license = with lib.licenses; [ lgpl3Plus ]; }; }; AlienLibxml2 = buildPerlPackage { pname = "Alien-Libxml2"; - version = "0.16"; + version = "0.17"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PL/PLICEASE/Alien-Libxml2-0.16.tar.gz"; - sha256 = "15rvllspikyr8412v8dpl2f2w5vxnjgnddnkz378sy2g0mc6mw2n"; + url = "mirror://cpan/authors/id/P/PL/PLICEASE/Alien-Libxml2-0.17.tar.gz"; + sha256 = "1cwdqspbq0r0bmw0079z4qzc7chs5aw6jdf3699nxhxmy1255d3k"; }; propagatedBuildInputs = [ AlienBuild ]; buildInputs = [ pkgs.libxml2 MojoDOM58 SortVersions Test2Suite URI ]; meta = { description = "Install the C libxml2 library on your system"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -224,7 +238,7 @@ let }; meta = { description = "Lets your class/object say it works like something else"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -245,7 +259,7 @@ let meta = { description = "Get, Build and Use SDL libraries"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -284,7 +298,7 @@ let buildInputs = [ pkgs.gnum4 Alienpatch IOSocketSSL MojoDOM58 NetSSLeay SortVersions Test2Suite URI ]; meta = { description = "Find or build GNU m4"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -299,7 +313,7 @@ let buildInputs = [ IOSocketSSL MojoDOM58 NetSSLeay SortVersions Test2Suite URI ]; meta = { description = "Find or build patch"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -314,7 +328,7 @@ let meta = { homepage = "https://github.com/danaj/Alt-Crypt-RSA-BigInt"; description = "RSA public-key cryptosystem, using Math::BigInt"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.sgo ]; }; }; @@ -328,7 +342,7 @@ let }; buildInputs = [ CanaryStability ]; meta = { - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -342,7 +356,7 @@ let propagatedBuildInputs = [ AnyEvent IOAIO ]; meta = { description = "Truly asynchronous file and directory I/O"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -358,7 +372,7 @@ let meta = { homepage = "https://github.com/potyl/perl-AnyEvent-CacheDNS"; description = "Simple DNS resolver with caching"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -394,7 +408,7 @@ let propagatedBuildInputs = [ AnyEvent JSONXS ]; meta = { description = "Communicate with the i3 window manager"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -409,7 +423,7 @@ let propagatedBuildInputs = [ AnyEvent DevelGlobalDestruction FileShareDir ListMoreUtils NetAMQP Readonly namespaceclean ]; meta = { description = "An asynchronous and multi channel Perl AMQP client"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -453,7 +467,7 @@ let meta = { homepage = "https://github.com/mschout/apache-authcookie"; description = "Perl Authentication and Authorization via cookies"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -471,21 +485,21 @@ let meta = { homepage = "https://github.com/kazeburo/Apache-LogFormat-Compiler"; description = "Compile a log format string to perl-code"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; ApacheSession = buildPerlModule { pname = "Apache-Session"; - version = "1.93"; + version = "1.94"; src = fetchurl { - url = "mirror://cpan/authors/id/C/CH/CHORNY/Apache-Session-1.93.tar.gz"; - sha256 = "8e5a4882ac8ec657d1018d74d3ba37854e2688a41ddd0e1d73955ea59f276e8d"; + url = "mirror://cpan/authors/id/C/CH/CHORNY/Apache-Session-1.94.tar.gz"; + sha256 = "17z9cdsk3vxah1dlix1pi68dlnjplymf4bdqwn50psdgk5lbfsgy"; }; buildInputs = [ TestDeep TestException ]; meta = { description = "A persistence framework for session data"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -499,7 +513,7 @@ let doCheck = false; meta = { description = "Test.pm wrapper with helpers for testing Apache"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }; }; @@ -535,7 +549,7 @@ let ''; meta = { description = "A container for functions of the ClusterSSH programs"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; homepage = "https://github.com/duncs/clusterssh/wiki"; }; }; @@ -552,7 +566,7 @@ let meta = { homepage = "https://github.com/rjbs/App-Cmd"; description = "Write command line apps with less suffering"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -578,7 +592,7 @@ let }; meta = { description = "pack your dependencies onto your script file"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -592,42 +606,42 @@ let meta = { homepage = "https://github.com/miyagawa/cpanminus"; description = "Get, unpack, build and install modules from CPAN"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; Appcpm = buildPerlModule { pname = "App-cpm"; - version = "0.996"; + version = "0.997000"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SK/SKAJI/App-cpm-0.996.tar.gz"; - sha256 = "5684535511e5abc0aa8eb6105b13f5759b5d03b6808f30149508358b0a11f595"; + url = "mirror://cpan/authors/id/S/SK/SKAJI/App-cpm-0.997000.tar.gz"; + sha256 = "6bf25a25dfb2331dee623d5cc3d030d9be647e7c766e82196a383f16b92e419f"; }; buildInputs = [ ModuleBuildTiny ]; - propagatedBuildInputs = [ CPANCommonIndex CPANDistnameInfo ClassTiny CommandRunner ExtUtilsInstallPaths FileCopyRecursive Filepushd HTTPTinyish MenloLegacy ModuleCPANfile ParallelPipes locallib ]; - nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin shortenPerlShebang; - postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + propagatedBuildInputs = [ CPANCommonIndex CPANDistnameInfo ClassTiny CommandRunner ExtUtilsInstall ExtUtilsInstallPaths FileCopyRecursive Filepushd HTTPTinyish MenloLegacy ModuleCPANfile ParsePMFile ParallelPipes locallib ]; + nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; + postInstall = lib.optionalString stdenv.isDarwin '' shortenPerlShebang $out/bin/cpm ''; meta = { homepage = "https://github.com/skaji/cpm"; description = "A fast CPAN module installer"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.zakame ]; }; }; Applify = buildPerlPackage { pname = "Applify"; - version = "0.21"; + version = "0.22"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/Applify-0.21.tar.gz"; - sha256 = "e34bc64c12c42369af6db7d17e3e20059b9d97ed50f8e487bf610008525eb84d"; + url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/Applify-0.22.tar.gz"; + sha256 = "0y644rr7gl49awn27xj556q9i86fddkkn26gnfn52wm19d7aa94a"; }; meta = { homepage = "https://github.com/jhthorsen/applify"; description = "Write object oriented scripts with ease"; - license = stdenv.lib.licenses.artistic2; + license = lib.licenses.artistic2; maintainers = [ maintainers.sgo ]; }; }; @@ -641,16 +655,16 @@ let }; buildInputs = [ PodParser ]; propagatedBuildInputs = [ AppPackager FileLoadLines IOString ImageInfo PDFAPI2 StringInterpolateNamed TextLayout ] - ++ stdenv.lib.optional (!stdenv.isDarwin) [ Wx ]; - nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin shortenPerlShebang; - postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + ++ lib.optional (!stdenv.isDarwin) [ Wx ]; + nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; + postInstall = lib.optionalString stdenv.isDarwin '' shortenPerlShebang $out/bin/chordpro rm $out/bin/wxchordpro # Wx not supported on darwin ''; meta = { homepage = "http://www.chordpro.org"; description = "A lyrics and chords formatting program"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -663,16 +677,16 @@ let }; meta = { description = "Abstraction for Packagers"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; Appperlbrew = buildPerlModule { pname = "App-perlbrew"; - version = "0.88"; + version = "0.89"; src = fetchurl { - url = "mirror://cpan/authors/id/G/GU/GUGOD/App-perlbrew-0.88.tar.gz"; - sha256 = "08aj77i7bh4nhilz16axp4zfv0zg66za2c4i0rcwfg3qxgxbcrzs"; + url = "mirror://cpan/authors/id/G/GU/GUGOD/App-perlbrew-0.89.tar.gz"; + sha256 = "00krymnsvz5qx7fkn4hpfqlgrqmbkbf45f9jr3vl4yqcyrsmiyhg"; }; buildInputs = [ pkgs.curl FileWhich IOAll ModuleBuildTiny PathClass TestException TestNoWarnings TestOutput TestSpec TestTempDirTiny ]; propagatedBuildInputs = [ CPANPerlReleases CaptureTiny DevelPatchPerl PodParser locallib ]; @@ -681,7 +695,7 @@ let meta = { description = "Manage perl installations in your $HOME"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }; }; @@ -696,7 +710,7 @@ let buildInputs = [ ExtUtilsMakeMakerCPANfile TestUseAllModules ]; meta = { description = "simple CPAN package extractor"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -713,7 +727,7 @@ let meta = { homepage = "https://sqitch.org/"; description = "Sane database change management"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }; }; @@ -730,7 +744,7 @@ let ''; meta = { description = "A command that computes simple statistics"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; homepage = "https://github.com/nferraz/st"; maintainers = [ maintainers.eelco ]; }; @@ -748,16 +762,16 @@ let doCheck = false; meta = { description = "Define validation through subroutine attributes"; - license = stdenv.lib.licenses.artistic2; + license = lib.licenses.artistic2; }; }; ArrayCompare = buildPerlModule { pname = "Array-Compare"; - version = "3.0.3"; + version = "3.0.7"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DA/DAVECROSS/Array-Compare-v3.0.3.tar.gz"; - sha256 = "13hn913cj7vswh5yy7gxpmhzrwmwknkc73qn7bhw0x7gx757rav2"; + url = "mirror://cpan/authors/id/D/DA/DAVECROSS/Array-Compare-v3.0.7.tar.gz"; + sha256 = "1p2kv4p2p5i6a665ax4b8iq1wal4x0g259yv32cc2ypbk7v11qs4"; }; buildInputs = [ TestNoWarnings ]; @@ -774,7 +788,7 @@ let propagatedBuildInputs = [ AlgorithmDiff ClassAccessor ]; meta = { description = "Find the differences between two arrays"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -790,7 +804,7 @@ let meta = { homepage = "https://github.com/dwburke/perl-Array-FIFO"; description = "A Simple limitable FIFO array, with sum and average methods"; - license = stdenv.lib.licenses.artistic2; + license = lib.licenses.artistic2; }; }; @@ -803,7 +817,7 @@ let }; meta = { description = "ping a huge number of servers in several seconds"; - license = with stdenv.lib.licenses; [ artistic2 ]; + license = with lib.licenses; [ artistic2 ]; }; }; @@ -817,7 +831,7 @@ let meta = { description = "Module for manipulations of cpio archives"; # See https://rt.cpan.org/Public/Bug/Display.html?id=43597#txn-569710 - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -830,7 +844,7 @@ let }; meta = { description = "Generic archive extracting mechanism"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -843,16 +857,16 @@ let }; meta = { description = "Manipulates TAR archives"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; ArchiveTarWrapper = buildPerlPackage { pname = "Archive-Tar-Wrapper"; - version = "0.37"; + version = "0.38"; src = fetchurl { - url = "mirror://cpan/authors/id/A/AR/ARFREITAS/Archive-Tar-Wrapper-0.37.tar.gz"; - sha256 = "0b1hi3zfnq487kfg514kr595j9w8x6wxddy3zlpqcxgiv90zlv3y"; + url = "mirror://cpan/authors/id/A/AR/ARFREITAS/Archive-Tar-Wrapper-0.38.tar.gz"; + sha256 = "0ymknznhk5ky7f835l0l5wfkx8kl0vfm0hvhijvgyp5rm3dd1wqr"; }; propagatedBuildInputs = [ FileWhich IPCRun LogLog4perl ]; meta = { @@ -870,7 +884,7 @@ let buildInputs = [ TestMockModule ]; meta = { description = "Provide an interface to ZIP archive files"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -884,7 +898,7 @@ let meta = { homepage = "https://github.com/timj/perl-Astro-FITS-Header/tree/master"; description = "Object-oriented interface to FITS HDUs"; - license = stdenv.lib.licenses.free; + license = lib.licenses.free; }; }; @@ -900,7 +914,7 @@ let NIX_CFLAGS_LINK = "-L${pkgs.zlib.out}/lib -lz"; meta = { description = "Fast C metadata and tag reader for all common audio file formats"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; }; }; @@ -911,11 +925,11 @@ let url = "mirror://cpan/authors/id/Z/ZE/ZEFRAM/Authen-DecHpwd-2.007.tar.gz"; sha256 = "f43a93bb02b41f7327d92f9e963b69505f67350a52e8f50796f98afc4fb3f177"; }; - perlPreHook = stdenv.lib.optionalString stdenv.isi686 "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local' + perlPreHook = lib.optionalString stdenv.isi686 "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local' propagatedBuildInputs = [ DataInteger DigestCRC ScalarString ]; meta = { description = "DEC VMS password hashing"; - license = stdenv.lib.licenses.gpl1Plus; + license = lib.licenses.gpl1Plus; }; }; @@ -929,7 +943,7 @@ let propagatedBuildInputs = [ ClassAccessor CryptPasswdMD5 DigestSHA1 IOLockedFile ]; meta = { description = "Interface to read and modify Apache .htpasswd files"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -944,7 +958,7 @@ let propagatedBuildInputs = [ pkgs.libkrb5 ]; meta = { description = "XS bindings for Kerberos 5"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; buildInputs = [ DevelChecklib FileWhich PkgConfig ]; }; @@ -973,7 +987,7 @@ let ''; meta = { description = "Perl extension for MIT Kerberos 5 admin interface"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }; }; @@ -992,7 +1006,7 @@ let ''; meta = { description = "Generate Tickets (Signed HTTP Cookies) for mod_auth_pubtkt protected websites"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -1008,7 +1022,7 @@ let meta = { homepage = "https://github.com/oalders/authen-oath"; description = "OATH One Time Passwords"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.sgo ]; }; }; @@ -1023,22 +1037,22 @@ let propagatedBuildInputs = [ AuthenDecHpwd CryptDES CryptEksblowfish CryptMySQL CryptPasswdMD5 CryptUnixCryptXS DataEntropy DigestMD4 ModuleRuntime ]; meta = { description = "Hashed passwords/passphrases as objects"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; AuthenRadius = buildPerlPackage { pname = "Authen-Radius"; - version = "0.31"; + version = "0.32"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PO/PORTAONE/Authen-Radius-0.31.tar.gz"; - sha256 = "bb5191484188ac7d6e281eb199d16c4e09fb0090af7c2187aa275c454c1fc012"; + url = "mirror://cpan/authors/id/P/PO/PORTAONE/Authen-Radius-0.32.tar.gz"; + sha256 = "0h0p4djscwixpbgbxrs9vsyx1vl7cm9r4j15cx11hfn86yc8y83v"; }; buildInputs = [ TestNoWarnings ]; propagatedBuildInputs = [ DataHexDump NetIP ]; meta = { description = "Provide simple Radius client facilities "; - license = with stdenv.lib.licenses; [ artistic2 ]; + license = with lib.licenses; [ artistic2 ]; }; }; @@ -1052,7 +1066,7 @@ let propagatedBuildInputs = [ DigestHMAC ]; meta = { description = "SASL Authentication framework"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -1067,7 +1081,7 @@ let propagatedBuildInputs = [ UnicodeStringprep ]; meta = { description = "A Stringprep Profile for User Names and Passwords (RFC 4013)"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.sgo ]; }; }; @@ -1084,7 +1098,7 @@ let meta = { homepage = "https://github.com/dagolden/Authen-SCRAM"; description = "Salted Challenge Response Authentication Mechanism (RFC 5802)"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; maintainers = [ maintainers.sgo ]; }; }; @@ -1099,7 +1113,7 @@ let propagatedBuildInputs = [ ClassAccessor ClassDataInheritable CryptPasswdMD5 ParamsValidate ]; meta = { description = "Simple Authentication"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -1113,7 +1127,7 @@ let propagatedBuildInputs = [ AuthenSimple ]; meta = { description = "Simple Passwd authentication"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -1127,7 +1141,7 @@ let propagatedBuildInputs = [ ScopeGuard ]; meta = { description = "Call methods on native types"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; buildInputs = [ IPCSystemSimple TestFatal ]; }; @@ -1157,7 +1171,7 @@ let ''; homepage = "http://www.aarontrevena.co.uk/opensource/autodia/"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; }; buildInputs = [ DBI ]; }; @@ -1171,7 +1185,7 @@ let }; meta = { description = "Lexically disable autovivification"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -1186,7 +1200,7 @@ let meta = { homepage = "https://github.com/rurban/perl-compiler"; description = "Perl compiler"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; doCheck = false; /* test fails */ }; @@ -1200,7 +1214,7 @@ let }; meta = { description = "B::COW additional B helpers to check COW status"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -1226,17 +1240,17 @@ let propagatedBuildInputs = [ ClassAccessor YAMLSyck ]; meta = { description = "Client to communicate with beanstalkd server"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; BerkeleyDB = buildPerlPackage { pname = "BerkeleyDB"; - version = "0.63"; + version = "0.64"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PM/PMQS/BerkeleyDB-0.63.tar.gz"; - sha256 = "1lh2a75cy85hqxlridk862nwzhrp762h74vy27hcbfgb4a6r62by"; + url = "mirror://cpan/authors/id/P/PM/PMQS/BerkeleyDB-0.64.tar.gz"; + sha256 = "0jvllgyk7ai8zxziaxpxar0n2054y01dq3qn40xc86lwakl8ap2k"; }; preConfigure = '' @@ -1255,7 +1269,7 @@ let propagatedBuildInputs = [ ModuleImplementation SubExporterProgressive ]; meta = { description = "Execute code after a scope finished compilation"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -1269,7 +1283,7 @@ let buildInputs = [ ExtUtilsDepends ]; meta = { description = "Wrap OP check callbacks"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -1292,7 +1306,7 @@ let }; meta = { description = "Lists of reserved barewords and symbol names"; - license = with stdenv.lib.licenses; [ artistic1 gpl2 ]; + license = with lib.licenses; [ artistic1 gpl2 ]; }; }; @@ -1306,7 +1320,7 @@ let meta = { homepage = "https://github.com/ingydotnet/boolean-pm"; description = "Boolean support for Perl"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -1337,7 +1351,7 @@ let meta = { homepage = "https://metacpan.org/release/Bot-Training"; description = "Plain text training material for bots like Hailo and AI::MegaHAL"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -1353,7 +1367,7 @@ let meta = { homepage = "https://metacpan.org/release/Bot-Training-MegaHAL"; description = "Provide megahal.trn via Bot::Training"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -1369,7 +1383,7 @@ let meta = { homepage = "https://metacpan.org/release/Bot-Training-StarCraft"; description = "Provide starcraft.trn via Bot::Training"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -1381,9 +1395,9 @@ let sha256 = "0g8c7825ng2m0yz5sy6838rvfdl8j3vm29524wjgf66ccfhgn74x"; }; meta = { - maintainers = [ maintainers.limeytexan ]; + maintainers = teams.deshaw.members; description = "BSD process resource limit and priority functions"; - license = stdenv.lib.licenses.artistic2; + license = lib.licenses.artistic2; }; }; @@ -1398,7 +1412,7 @@ let buildInputs = [ ExtUtilsDepends ]; meta = { description = "Helper functions for op tree manipulation"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -1425,7 +1439,7 @@ let propagatedBuildInputs = [ BusinessISBNData ]; meta = { description = "Parse and validate ISBNs"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -1438,7 +1452,7 @@ let }; meta = { description = "Data pack for Business::ISBN"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -1452,7 +1466,7 @@ let propagatedBuildInputs = [ TieCycle ]; meta = { description = "Work with International Standard Music Numbers"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -1465,7 +1479,7 @@ let }; meta = { description = "Work with International Standard Serial Numbers"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -1479,7 +1493,7 @@ let propagatedBuildInputs = [ CryptRandomSeed MathRandomISAAC ]; meta = { description = "Perl extension to generate cryptographically-secure random bytes"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.sgo ]; }; }; @@ -1493,7 +1507,7 @@ let }; meta = { description = "A tiny Perl extension to generate cryptographically-secure random bytes"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.sgo ]; }; }; @@ -1511,11 +1525,12 @@ let CacheFastMmap = buildPerlPackage { pname = "Cache-FastMmap"; - version = "1.49"; + version = "1.54"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RO/ROBM/Cache-FastMmap-1.49.tar.gz"; - sha256 = "1azz66d4syk6b6gc95drkglajvf8igiy3449hpsm444inis9mscm"; + url = "mirror://cpan/authors/id/R/RO/ROBM/Cache-FastMmap-1.54.tar.gz"; + sha256 = "0lkrsr582h714jpmh5dv4szz5f7rm466xqxbavj7l9w0p40f4him"; }; + buildInputs = [ TestDeep ]; }; CacheKyotoTycoon = buildPerlModule { @@ -1529,7 +1544,7 @@ let buildInputs = [ FileWhich TestRequires TestSharedFork TestTCP ]; meta = { description = "KyotoTycoon client library"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -1553,7 +1568,7 @@ let }; meta = { description = "Perl client for B, in C language"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -1577,22 +1592,22 @@ let }; meta = { description = "A lightweight cache with timed expiration"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; Cairo = buildPerlPackage { pname = "Cairo"; - version = "1.107"; + version = "1.108"; src = fetchurl { - url = "mirror://cpan/authors/id/X/XA/XAOC/Cairo-1.107.tar.gz"; - sha256 = "0sg1gf1f2pjq7pji0zsv4rbi3bzpsx82z98k7yqxafzrvlkf27ay"; + url = "mirror://cpan/authors/id/X/XA/XAOC/Cairo-1.108.tar.gz"; + sha256 = "1nh5iya63q6j2w0cdi24x2ygpi8k8wwccnbh8cisnx8nqmywnhk0"; }; buildInputs = [ pkgs.cairo ]; meta = { homepage = "http://gtk2-perl.sourceforge.net/"; description = "Perl interface to the cairo 2D vector graphics library"; - license = stdenv.lib.licenses.lgpl21Plus; + license = lib.licenses.lgpl21Plus; }; propagatedBuildInputs = [ ExtUtilsDepends ExtUtilsPkgConfig ]; }; @@ -1607,7 +1622,7 @@ let buildInputs = [ pkgs.cairo ]; meta = { description = "Integrate Cairo into the Glib type system"; - license = stdenv.lib.licenses.lgpl21Plus; + license = lib.licenses.lgpl21Plus; }; propagatedBuildInputs = [ Cairo Glib ]; }; @@ -1621,7 +1636,7 @@ let }; meta = { description = "Sanity-check calling context"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.sgo ]; }; }; @@ -1656,7 +1671,7 @@ let sha256 = "a5c91c62cf95fcb868f60eab5c832908f6905221013fea2bce3ff57046d7b6ea"; }; meta = { - license = stdenv.lib.licenses.gpl1Plus; + license = lib.licenses.gpl1Plus; }; }; @@ -1679,7 +1694,7 @@ let }; meta = { description = "Capture STDOUT and STDERR from Perl, XS or external programs"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }; }; @@ -1692,7 +1707,7 @@ let }; meta = { description = "Warns and dies noisily with stack backtraces"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; buildInputs = [ TestBase ]; }; @@ -1710,14 +1725,14 @@ let CarpAssertMore = buildPerlPackage { pname = "Carp-Assert-More"; - version = "1.20"; + version = "1.24"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PE/PETDANCE/Carp-Assert-More-1.20.tar.gz"; - sha256 = "16jnhdjgfwymrc5fki4xlf1rlziszf9k6q0245g976124k708ac5"; + url = "mirror://cpan/authors/id/P/PE/PETDANCE/Carp-Assert-More-1.24.tar.gz"; + sha256 = "0axjfl1hp7s4lcfxjj41zcp397dzhjqzd95innzxnz914xkc2p5s"; }; propagatedBuildInputs = [ CarpAssert ]; meta = { - license = stdenv.lib.licenses.artistic2; + license = lib.licenses.artistic2; }; buildInputs = [ TestException ]; }; @@ -1731,7 +1746,7 @@ let }; meta = { description = "Report errors from perspective of caller of a \"clan\" of modules"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -1746,7 +1761,7 @@ let meta = { homepage = "https://github.com/perl-carton/carton"; description = "Perl module dependency manager (aka Bundler for Perl)"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -1760,7 +1775,7 @@ let propagatedBuildInputs = [ CatalystRuntime DataVisitor ]; meta = { description = "Sensible default end action"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; buildInputs = [ HTTPRequestAsCGI ]; }; @@ -1776,7 +1791,7 @@ let propagatedBuildInputs = [ CatalystRuntime URIFind ]; meta = { description = "Automated REST Method Dispatching"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -1791,7 +1806,7 @@ let propagatedBuildInputs = [ CatalystPluginAuthentication ClassAccessor DataUUID StringEscape ]; meta = { description = "HTTP Basic and Digest authentication"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -1816,7 +1831,7 @@ let propagatedBuildInputs = [ CatalystModelDBICSchema CatalystPluginAuthentication ]; meta = { description = "A storage class for Catalyst Authentication using DBIx::Class"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; buildInputs = [ TestWarn ]; }; @@ -1832,7 +1847,7 @@ let buildInputs = [ TestMore TestMockObject TestException NetLDAPServerTest ]; meta = { description= "Authentication from an LDAP Directory"; - license = with stdenv.lib.licenses; [ artistic1 ]; + license = with lib.licenses; [ artistic1 ]; }; }; @@ -1846,7 +1861,7 @@ let propagatedBuildInputs = [ CatalystRuntime ]; meta = { description = "Moose role to create only one instance of component per context"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -1861,7 +1876,7 @@ let propagatedBuildInputs = [ CatalystComponentInstancePerContext HTMLFormFuMultiForm RegexpAssemble ]; meta = { description = "Catalyst integration for HTML::FormFu"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; doCheck = false; /* fails with 'open3: exec of .. perl .. failed: Argument list too long at .../TAP/Parser/Iterator/Process.pm line 165.' */ }; @@ -1877,23 +1892,23 @@ let propagatedBuildInputs = [ CatalystPluginStaticSimple ClassAccessor FileSlurp JSONXS ListMoreUtils PodPOMViewTOC XMLSimple ]; meta = { description = "Serves PODs right from your Catalyst application"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }; }; CatalystDevel = buildPerlPackage { pname = "Catalyst-Devel"; - version = "1.41"; + version = "1.42"; src = fetchurl { - url = "mirror://cpan/authors/id/H/HA/HAARG/Catalyst-Devel-1.41.tar.gz"; - sha256 = "9a4a7ab9266aed8b11f399e9859b7ff42615de1d6c7ee76505ed0cae0fce0ae5"; + url = "mirror://cpan/authors/id/H/HA/HAARG/Catalyst-Devel-1.42.tar.gz"; + sha256 = "1gcaqivyxwsdq87v9za1ijjibh6llirzqsbpwjbw1f5mravg1iky"; }; - buildInputs = [ TestFatal ]; + buildInputs = [ FileShareDirInstall TestFatal ]; propagatedBuildInputs = [ CatalystActionRenderView CatalystPluginConfigLoader CatalystPluginStaticSimple ConfigGeneral FileChangeNotify FileCopyRecursive ModuleInstall TemplateToolkit ]; meta = { homepage = "http://wiki.catalystframework.org/wiki/"; description = "Catalyst Development Tools"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -1907,7 +1922,7 @@ let propagatedBuildInputs = [ CatalystRuntime ]; meta = { description = "Regex DispatchType"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -1920,7 +1935,7 @@ let }; meta = { description = "The Catalyst developer's manual"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -1935,23 +1950,23 @@ let propagatedBuildInputs = [ CatalystComponentInstancePerContext CatalystXComponentTraits DBIxClassSchemaLoader MooseXMarkAsMethods MooseXNonMoose MooseXTypesLoadableClass TieIxHash ]; meta = { description = "DBIx::Class::Schema Model Class"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; CatalystRuntime = buildPerlPackage { pname = "Catalyst-Runtime"; - version = "5.90126"; + version = "5.90128"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JJ/JJNAPIORK/Catalyst-Runtime-5.90126.tar.gz"; - sha256 = "66f08334bf8b70049e77c0dcafd741c568e6f1341b2ffbb531a93833638d3986"; + url = "mirror://cpan/authors/id/H/HA/HAARG/Catalyst-Runtime-5.90128.tar.gz"; + sha256 = "1yb0caagdrl7c1ldkwaz6w2qpgj8wcibzhqh6yscarjzmw6kppx6"; }; buildInputs = [ TestFatal TypeTiny ]; propagatedBuildInputs = [ CGISimple CGIStruct ClassC3AdoptNEXT DataDump HTTPBody ModulePluggable MooseXEmulateClassAccessorFast MooseXGetopt MooseXMethodAttributes MooseXRoleWithOverloading PathClass PerlIOutf8_strict PlackMiddlewareFixMissingBodyInRedirect PlackMiddlewareMethodOverride PlackMiddlewareRemoveRedundantBody PlackMiddlewareReverseProxy PlackTestExternalServer SafeIsa StringRewritePrefix TaskWeaken TextSimpleTable TreeSimpleVisitorFactory URIws ]; meta = { homepage = "http://wiki.catalystframework.org/wiki/"; description = "The Catalyst Framework Runtime"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -1965,7 +1980,7 @@ let propagatedBuildInputs = [ CatalystRuntime DateTime ]; meta = { description = "Request logging from within Catalyst"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -1980,7 +1995,7 @@ let propagatedBuildInputs = [ CatalystPluginSession ]; meta = { description = "Infrastructure plugin for the Catalyst authentication framework"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2006,7 +2021,7 @@ let propagatedBuildInputs = [ CatalystPluginAuthentication SetObject UNIVERSALisa ]; meta = { description = "Role based authorization for Catalyst based on Catalyst::Plugin::Authentication"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2021,7 +2036,7 @@ let propagatedBuildInputs = [ CatalystRuntime ]; meta = { description = "Flexible caching support for Catalyst"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2036,7 +2051,7 @@ let propagatedBuildInputs = [ ClassAccessor HTTPMessage MROCompat ]; meta = { description = "HTTP/1.1 cache validators for Catalyst"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2073,7 +2088,7 @@ let propagatedBuildInputs = [ CatalystRuntime DataFormValidator ]; meta = { description = "Data::FormValidator"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2086,7 +2101,7 @@ let }; propagatedBuildInputs = [ CatalystPluginFormValidator FormValidatorSimple ]; meta = { - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2100,7 +2115,7 @@ let propagatedBuildInputs = [ ClassAccessor LogHandler MROCompat ]; meta = { description = "Catalyst Plugin for Log::Handler"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2115,7 +2130,7 @@ let propagatedBuildInputs = [ CatalystRuntime ObjectSignature ]; meta = { description = "Generic Session plugin - ties together server side storage and client side state required to maintain session data"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2129,7 +2144,7 @@ let propagatedBuildInputs = [ CatalystPluginSession ]; meta = { description = "Per-session custom expiry times"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2163,7 +2178,7 @@ let propagatedBuildInputs = [ CacheCache CatalystPluginSession ClassDataInheritable ]; meta = { description = "File storage backend for session data"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2178,7 +2193,7 @@ let buildInputs = [ CatalystActionREST TestWarnings TimeOut URISmartURI ]; meta = { description = "Configurable URIs for Catalyst"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2192,7 +2207,7 @@ let propagatedBuildInputs = [ CatalystRuntime ]; meta = { description = "Display a stack trace on the debug screen"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2207,7 +2222,7 @@ let propagatedBuildInputs = [ CatalystRuntime MIMETypes MooseXTypes ]; meta = { description = "Make serving static pages painless"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2221,7 +2236,7 @@ let propagatedBuildInputs = [ CatalystRuntime strictures ]; meta = { description = "Handle passing of status messages between screens of a web application"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2236,7 +2251,7 @@ let propagatedBuildInputs = [ CatalystRuntime TextCSV ]; meta = { description = "CSV view class"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2249,7 +2264,7 @@ let }; buildInputs = [ CatalystRuntime TestLongString TestSimple13 TestWWWMechanize TestWWWMechanizeCatalyst TextCSV XMLSimple ]; meta = { - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2263,7 +2278,7 @@ let propagatedBuildInputs = [ CatalystRuntime ]; meta = { description = "JSON view for your data"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2277,7 +2292,7 @@ let propagatedBuildInputs = [ CatalystRuntime ClassAccessor TemplateTimer ]; meta = { description = "Template View Class"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2312,7 +2327,7 @@ let propagatedBuildInputs = [ Moose URI namespaceautoclean ]; meta = { description = "Replace request base with value passed by HTTP proxy"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2331,22 +2346,23 @@ let propagatedBuildInputs = [ CatalystRuntime MooseXTypes PodParser Starman ]; meta = { description = "Replace the development server with Starman"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; CDB_File = buildPerlPackage { pname = "CDB_File"; - version = "1.02"; + version = "1.05"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TO/TODDR/CDB_File-1.02.tar.gz"; - sha256 = "a0ae46916a190dd746be9fb11cda51cfb27dfec0f21e15e1ec2773dadc50c05f"; + url = "mirror://cpan/authors/id/T/TO/TODDR/CDB_File-1.05.tar.gz"; + sha256 = "0jzbm59b9q51k00djr1b8c4vjvjkwb577r946vi5s09rasfq8r45"; }; meta = { homepage = "https://github.com/toddr/CDB_File"; description = "Perl extension for access to cdb databases"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; + buildInputs = [ TestFatal TestWarnings ]; propagatedBuildInputs = [ BCOW ]; }; @@ -2361,7 +2377,7 @@ let buildInputs = [ LogAnyAdapterLog4perl LogLog4perl TestDeep TestException TestLWPUserAgent TestPod ]; meta = { description = "a data toolkit"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; homepage = "https://github.com/LibreCat/Catmandu"; }; }; @@ -2375,7 +2391,7 @@ let }; meta = { description = "Get the CDDB info for an audio cd"; - license = stdenv.lib.licenses.artistic1; + license = lib.licenses.artistic1; maintainers = [ maintainers.endgame ]; }; }; @@ -2389,23 +2405,23 @@ let }; meta = { description = "Parse a CDDB/freedb data file"; - license = stdenv.lib.licenses.artistic1; + license = lib.licenses.artistic1; }; }; CGI = buildPerlPackage { pname = "CGI"; - version = "4.50"; + version = "4.51"; src = fetchurl { - url = "mirror://cpan/authors/id/L/LE/LEEJO/CGI-4.50.tar.gz"; - sha256 = "d8c7a2143352842a9b4962c314ee7e0385273c8b9d8314dcbd04a09c008eef46"; + url = "mirror://cpan/authors/id/L/LE/LEEJO/CGI-4.51.tar.gz"; + sha256 = "02k0p8zwbn0fz9r39rg8jvbmky8fwdg6kznklzk557rg07kiblhb"; }; buildInputs = [ TestDeep TestNoWarnings TestWarn ]; propagatedBuildInputs = [ HTMLParser ]; meta = { description = "Handle Common Gateway Interface requests and responses"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2420,7 +2436,7 @@ let buildInputs = [ CGI CaptureTiny ModuleBuildTiny SubIdentify Switch TestNoWarnings TestRequires TryTiny ]; meta = { description = "Compile .cgi scripts to a code reference like ModPerl::Registry"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; homepage = "https://github.com/miyagawa/CGI-Compile"; }; }; @@ -2446,7 +2462,7 @@ let meta = { homepage = "https://github.com/tokuhirom/p5-cgi-emulate-psgi"; description = "PSGI adapter for CGI"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2473,7 +2489,7 @@ let propagatedBuildInputs = [ CGI FCGI ]; doCheck = false; meta = { - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2497,7 +2513,7 @@ let }; meta = { description = "A lightweight CGI form processing package"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2511,7 +2527,7 @@ let propagatedBuildInputs = [ CGI ]; meta = { description = "Adapt CGI.pm to the PSGI protocol"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2535,7 +2551,7 @@ let propagatedBuildInputs = [ IOStringy ]; meta = { description = "A Simple totally OO CGI interface that is CGI.pm compliant"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; buildInputs = [ TestException TestNoWarnings ]; }; @@ -2550,7 +2566,7 @@ let buildInputs = [ TestDeep ]; meta = { description = "Build structures from CGI data"; - license = stdenv.lib.licenses.bsd2; + license = lib.licenses.bsd2; }; }; @@ -2569,7 +2585,7 @@ let propagatedBuildInputs = [ CarpAssert ClassLoad DataUUID DigestJHash HashMoreUtils JSONMaybeXS ListMoreUtils LogAny Moo MooXTypesMooseLikeNumeric StringRewritePrefix TaskWeaken TimeDuration TimeDurationParse ]; meta = { description = "Unified cache handling interface"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2583,7 +2599,7 @@ let propagatedBuildInputs = [ GD ]; meta = { description = "A series of charting modules"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2596,7 +2612,7 @@ let }; meta = { description = "Package for creating Cisco IPPhone XML objects"; - license = with stdenv.lib.licenses; [ artistic1 ]; + license = with lib.licenses; [ artistic1 ]; }; }; @@ -2610,7 +2626,7 @@ let meta = { homepage = "https://metacpan.org/pod/CLASS"; description = "Alias for __PACKAGE__"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.sgo ]; }; }; @@ -2623,7 +2639,7 @@ let sha256 = "07215zzr4ydf49832vn54i3gf2q5b97lydkv8j56wb2svvjs64mz"; }; meta = { - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2648,7 +2664,7 @@ let propagatedBuildInputs = [ ModuleRuntime ]; meta = { description = "Lets you build groups of accessors"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2661,7 +2677,7 @@ let }; meta = { description = "A minimalistic variant of Class::Accessor"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2674,7 +2690,7 @@ let }; meta = { description = "Run-time load a class the first time you call a method in it"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2690,15 +2706,15 @@ let ClassC3 = buildPerlPackage { pname = "Class-C3"; - version = "0.34"; + version = "0.35"; src = fetchurl { - url = "mirror://cpan/authors/id/H/HA/HAARG/Class-C3-0.34.tar.gz"; - sha256 = "1dcibc31v5jwmi6hsdzi7c5ag1sb4wp3kxkibc889qrdj7jm12sd"; + url = "mirror://cpan/authors/id/H/HA/HAARG/Class-C3-0.35.tar.gz"; + sha256 = "0gp3czp6y0jxx4448kz37f7gdxq4vw514bvc0l98rk4glvqkq1c4"; }; propagatedBuildInputs = [ AlgorithmC3 ]; meta = { description = "A pragma to use the C3 method resolution order algorithm"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2713,7 +2729,7 @@ let propagatedBuildInputs = [ MROCompat ]; meta = { description = "Make NEXT suck less"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2727,7 +2743,7 @@ let buildInputs = [ TestException ]; propagatedBuildInputs = [ ClassC3 ClassInspector MROCompat ]; meta = { - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2750,7 +2766,7 @@ let propagatedBuildInputs = [ ParamsValidate ]; meta = { description = "Glues object frameworks together transparently"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2781,8 +2797,8 @@ let }; meta = { description = "Base class for hierarchally ordered objects"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.limeytexan ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = teams.deshaw.members; }; }; @@ -2804,7 +2820,7 @@ let }; meta = { description = "Provide utility methods for factory classes"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2817,7 +2833,7 @@ let }; meta = { description = "another class and object builder"; - license = with stdenv.lib.licenses; [ artistic1 ]; + license = with lib.licenses; [ artistic1 ]; }; }; @@ -2830,7 +2846,7 @@ let }; meta = { description = "Get information about a class and its structure"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2863,7 +2879,7 @@ let }; meta = { description = "Load modules and create objects on demand"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2891,7 +2907,7 @@ let prePatch = "rm configure"; meta = { description = "A module for creating generic methods"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2906,7 +2922,7 @@ let meta = { homepage = "https://github.com/moose/Class-Method-Modifiers"; description = "Provides Moose-like method modifiers"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2920,7 +2936,7 @@ let propagatedBuildInputs = [ ParamsClassify ]; meta = { description = "Dynamic class mixing"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2934,16 +2950,16 @@ let propagatedBuildInputs = [ DevelStackTrace ]; meta = { description = "A smart return value object"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; ClassSingleton = buildPerlPackage { pname = "Class-Singleton"; - version = "1.5"; + version = "1.6"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHAY/Class-Singleton-1.5.tar.gz"; - sha256 = "0y7ngrjf551bjgmijp5rsidbkq6c8hb5lmy2jcqq0fify020s8iq"; + url = "mirror://cpan/authors/id/S/SH/SHAY/Class-Singleton-1.6.tar.gz"; + sha256 = "1942j9g0b4c88nvs3jghh3y31mlhbpwrx35xdcb2jaaiv7q17fi7"; }; }; @@ -2965,7 +2981,7 @@ let }; meta = { description = "Minimalist class construction"; - license = with stdenv.lib.licenses; [ asl20 ]; + license = with lib.licenses; [ asl20 ]; homepage = "https://github.com/dagolden/Class-Tiny"; }; }; @@ -2982,7 +2998,7 @@ let meta = { homepage = "https://github.com/moose/Class-Load"; description = "A working (require \"Class::Name\") and more"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2998,7 +3014,7 @@ let meta = { homepage = "https://github.com/moose/Class-Load-XS"; description = "XS implementation of parts of Class::Load"; - license = stdenv.lib.licenses.artistic2; + license = lib.licenses.artistic2; }; }; @@ -3021,7 +3037,7 @@ let }; meta = { description = "Support for creating standard 'inside-out' classes"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3034,7 +3050,7 @@ let }; propagatedBuildInputs = [ ClassStd ]; checkInputs = [ TestPod TestPodCoverage ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Faster but less secure than Class::Std"; license = with licenses; [ artistic1 gpl1Plus ]; }; @@ -3061,7 +3077,7 @@ let propagatedBuildInputs = [ CarpAssert ClassDataInheritable ClassISA ]; meta = { description = "Base class for virtual base classes"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3074,7 +3090,7 @@ let }; meta = { description = "Generate fast XS accessors without runtime compilation"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3090,7 +3106,7 @@ let meta = { homepage = "https://github.com/reyjrar/CLI-Helpers"; description = "Subroutines for making simple command line scripts"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }; }; @@ -3103,7 +3119,7 @@ let }; meta = { description = "Clipboard - Copy and Paste with any OS"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; propagatedBuildInputs = [ CGI ]; # Disable test on darwin because MacPasteboard fails when not logged in interactively. @@ -3123,7 +3139,7 @@ let }; meta = { description = "Recursively copy Perl datatypes"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; buildInputs = [ BCOW ]; }; @@ -3138,19 +3154,19 @@ let buildInputs = [ Clone ClonePP TestWithoutModule ]; meta = { description = "Choose appropriate clone utility"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; ClonePP = buildPerlPackage { pname = "Clone-PP"; - version = "1.07"; + version = "1.08"; src = fetchurl { - url = "mirror://cpan/authors/id/N/NE/NEILB/Clone-PP-1.07.tar.gz"; - sha256 = "15dkhqvih6rx9dnngfwwljcm9s8afb0nbyl2vdvhd8frnw4y31dz"; + url = "mirror://cpan/authors/id/N/NE/NEILB/Clone-PP-1.08.tar.gz"; + sha256 = "0y7m25fksiavzg4xj4cm9zkz8rmnk4iqy7lm01m4nmyqlna3082p"; }; meta = { - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3165,7 +3181,7 @@ let buildInputs = [ TestClass TestClassMost TestDeep TestDifferences TestException TestFatal TestMost TestWarn TestWarnings librelative ]; meta = { description = "Engine for tidyall, your all-in-one code tidier and validator"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3179,7 +3195,7 @@ let propagatedBuildInputs = [ CodeTidyAll TextAligner ]; meta = { description = "TidyAll plugin to sort and align Moose-style attributes"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3195,7 +3211,7 @@ let meta = { homepage = "https://github.com/skaji/Command-Runner"; description = "Run external commands and Perl code refs"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.zakame ]; }; }; @@ -3209,7 +3225,7 @@ let }; meta = { description = "Implements some sane defaults for Perl programs"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3222,7 +3238,7 @@ let }; meta = { description = "Interface to Bzip2 compression library"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3241,7 +3257,7 @@ let meta = { description = "Low-Level Interface to bzip2 compression library"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3267,7 +3283,7 @@ let doCheck = !stdenv.isDarwin; meta = { - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3290,21 +3306,21 @@ let propagatedBuildInputs = [ ModulePluggable ]; meta = { description = "Load configuration from different file formats, transparently"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; ConfigAutoConf = buildPerlPackage { pname = "Config-AutoConf"; - version = "0.318"; + version = "0.319"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RE/REHSACK/Config-AutoConf-0.318.tar.gz"; - sha256 = "0d5bxsax2x3xy8bgqrbzs0562x7bpglan8m23hjxw0rhxkz31j9k"; + url = "mirror://cpan/authors/id/R/RE/REHSACK/Config-AutoConf-0.319.tar.gz"; + sha256 = "0gm3l0qyrgiia67lsmzjfb6ihgbdx1lidli7w47lq9jk4v66ckrh"; }; propagatedBuildInputs = [ CaptureTiny ]; meta = { description = "A module to implement some of AutoConf macros in pure perl"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3316,7 +3332,7 @@ let sha256 = "1bbg3wp0xcpj04cmm86j1x0j5968jqi5s2c87qs7dgmap1vzk6qa"; }; meta = { - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3331,7 +3347,7 @@ let propagatedBuildInputs = [ Moo MooXTypesMooseLike ]; meta = { description = "Git-compatible config file parsing"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3345,7 +3361,7 @@ let meta = { homepage = "https://github.com/schweikert/Config-Grammar"; description = "A grammar-based, user-friendly config parser"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3360,7 +3376,7 @@ let meta = { homepage = "https://github.com/rjbs/Config-INI"; description = "Simple .ini-file format"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3375,7 +3391,7 @@ let buildInputs = [ TestDeep ]; meta = { description = "Load (and optionally decrypt via GnuPG) user/pass identity information "; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; homepage = "https://github.com/dagolden/Config-Identity"; }; }; @@ -3390,8 +3406,8 @@ let propagatedBuildInputs = [ IOStringy ]; meta = { description = "A module for reading .ini-style configuration files"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.limeytexan ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = teams.deshaw.members; }; }; @@ -3406,7 +3422,7 @@ let propagatedBuildInputs = [ ConfigAny ]; meta = { description = "Load a configuration directory tree containing YAML, JSON, XML, Perl, INI or Config::General files"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3421,7 +3437,7 @@ let buildInputs = [ TestException YAML ]; meta = { description = "Layered configuration, because configs are like ogres"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3437,7 +3453,7 @@ let meta = { homepage = "https://github.com/rjbs/Config-MVP"; description = "Multivalue-property package-oriented configuration"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3452,7 +3468,7 @@ let meta = { homepage = "https://github.com/rjbs/Config-MVP-Reader-INI"; description = "An MVP config reader for .ini files"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3465,7 +3481,7 @@ let }; meta = { description = "Read and write property files"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3515,16 +3531,16 @@ let doCheck = false; meta = { description = "Simple, versioned access to configuration data"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; Connector = buildPerlPackage { pname = "Connector"; - version = "1.32"; + version = "1.35"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MR/MRSCOTTY/Connector-1.32.tar.gz"; - sha256 = "c108ce559fa48faf95d01eb6bae9c14ecef49386f89c4aa2c2ce5edf9fd0ca14"; + url = "mirror://cpan/authors/id/M/MR/MRSCOTTY/Connector-1.35.tar.gz"; + sha256 = "0jnwcvjibywdfq4x5n3np9fxvpsgqq6vjpn72sfa2xfdwrp7dna1"; }; buildInputs = [ ConfigMerge ConfigStd ConfigVersioned DBDSQLite DBI IOSocketSSL JSON LWP LWPProtocolHttps ProcSafeExec TemplateToolkit YAML ]; propagatedBuildInputs = [ LogLog4perl Moose ]; @@ -3535,7 +3551,7 @@ let ''; meta = { description = "A generic connection to a hierarchical-structured data set"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3550,7 +3566,7 @@ let buildInputs = [ ModuleBuildTiny TestFatal ]; meta = { description = "Facility for creating read-only scalars, arrays, and hashes"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3563,7 +3579,7 @@ let }; meta = { description = "Convert binary octets into ASCII armoured messages"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.sgo ]; }; }; @@ -3588,7 +3604,7 @@ let meta = { homepage = "https://metacpan.org/pod/Convert::Base32"; description = "Encoding and decoding of base32 strings"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.sgo ]; }; }; @@ -3602,7 +3618,7 @@ let }; meta = { description = "Functions for converting to/from bencoded strings"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3617,7 +3633,7 @@ let propagatedBuildInputs = [ ListUtilsBy ModulePluggable ]; meta = { description = "Color space conversions and named lookups"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3630,7 +3646,7 @@ let }; meta = { description = "Perl module for uuencode and uudecode"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3653,7 +3669,7 @@ let }; meta = { description = "Create automatic curried method call closures for any class or object"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3688,7 +3704,7 @@ let meta = { homepage = "https://github.com/kazeburo/Cookie-Baker"; description = "Cookie string generator / parser"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3726,7 +3742,7 @@ let buildInputs = [ TestSharedFork TestTCP ]; meta = { description = "Coro based PSGI web server"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3740,7 +3756,7 @@ let propagatedBuildInputs = [ ArchiveZip CPANChecksums CPANPerlReleases Expect FileHomeDir LWP LogLog4perl ModuleBuild TermReadKey YAML YAMLLibYAML YAMLSyck ]; meta = { description = "Query, download and build perl modules from CPAN sites"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3751,30 +3767,30 @@ let url = "mirror://cpan/authors/id/R/RJ/RJBS/CPAN-Mini-1.111016.tar.gz"; sha256 = "5a297afc3e367ad80811464d4eb7e4dd3caff8ba499cdd2b558f6279443a7657"; }; - nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin shortenPerlShebang; + nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; propagatedBuildInputs = [ FileHomeDir LWPProtocolHttps ]; - postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.isDarwin '' shortenPerlShebang $out/bin/minicpan ''; meta = { homepage = "https://github.com/rjbs/CPAN-Mini"; description = "Create a minimal mirror of CPAN"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.sgo ]; }; }; CpanelJSONXS = buildPerlPackage { pname = "Cpanel-JSON-XS"; - version = "4.17"; + version = "4.25"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RU/RURBAN/Cpanel-JSON-XS-4.17.tar.gz"; - sha256 = "fa80ae47caa9beee6db9b12df2c04482e98df1d62041a114ccd82b681a8706fb"; + url = "mirror://cpan/authors/id/R/RU/RURBAN/Cpanel-JSON-XS-4.25.tar.gz"; + sha256 = "061940vyj9y3rzwq47z2a3f5i5rfpa90ccz7fgz228zr7njkvfpr"; }; meta = { description = "CPanel fork of JSON::XS, fast and correct serializing"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3787,7 +3803,7 @@ let }; meta = { description = "Read and write Changes files"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3800,7 +3816,7 @@ let }; propagatedBuildInputs = [ CompressBzip2 DataCompare ModuleSignature ]; meta = { - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3816,7 +3832,7 @@ let meta = { homepage = "https://github.com/Perl-Toolchain-Gang/CPAN-Common-Index"; description = "Common library for searching CPAN modules, authors and distributions"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }; }; @@ -3829,7 +3845,7 @@ let }; meta = { description = "Extract distribution name and version from a distribution filename"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3843,21 +3859,21 @@ let buildInputs = [ TestDeep ]; meta = { description = "Verify requirements in a CPAN::Meta object"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; CPANPerlReleases = buildPerlPackage { pname = "CPAN-Perl-Releases"; - version = "5.20200820"; + version = "5.20201120"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BI/BINGOS/CPAN-Perl-Releases-5.20200820.tar.gz"; - sha256 = "07vsbsxygdbv0nk9389ng3jdsl1d3yk1z54xdci1gpy0lghbij70"; + url = "mirror://cpan/authors/id/B/BI/BINGOS/CPAN-Perl-Releases-5.20201120.tar.gz"; + sha256 = "1qsjm26556kqxyvj85c7j37mh2xw78fm3i7f58mpqkfawxip4q3k"; }; meta = { homepage = "https://github.com/bingos/cpan-perl-releases"; description = "Mapping Perl releases on CPAN to the location of the tarballs"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3872,7 +3888,7 @@ let meta = { homepage = "https://github.com/jib/cpanplus-devel"; description = "Ameliorated interface to the CPAN"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3887,7 +3903,7 @@ let meta = { homepage = "https://github.com/rjbs/cpan-uploader"; description = "Upload things to the CPAN"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3909,7 +3925,7 @@ let }; meta = { description = "CAST5 block cipher in pure Perl"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.sgo ]; }; }; @@ -3938,7 +3954,7 @@ let ]; meta = { description = "Generate shared secret using elliptic-curve Diffie-Hellman function"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3961,7 +3977,7 @@ let propagatedBuildInputs = [ CryptDES ]; meta = { description = "Triple-DES EDE encryption/decryption"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.sgo ]; }; }; @@ -3998,7 +4014,7 @@ let propagatedBuildInputs = [ DataBuffer DigestSHA1 FileWhich ]; meta = { description = "DSA Signatures and Key Generation"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.sgo ]; }; }; @@ -4010,9 +4026,9 @@ let url = "mirror://cpan/authors/id/A/AP/APPEL/Crypt-ECB-2.22.tar.gz"; sha256 = "f5af62e908cd31a34b2b813135a0718016fd003ffa0021ffbdd84c50158267aa"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Use block ciphers using ECB mode"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -4024,7 +4040,7 @@ let sha256 = "3cc7126d5841107237a9be2dc5c7fbc167cf3c4b4ce34678a8448b850757014c"; }; propagatedBuildInputs = [ ClassMix ]; - perlPreHook = stdenv.lib.optionalString (stdenv.isi686 || stdenv.isDarwin) "export LD=$CC"; + perlPreHook = lib.optionalString (stdenv.isi686 || stdenv.isDarwin) "export LD=$CC"; }; CryptFormat = buildPerlPackage { @@ -4037,7 +4053,7 @@ let buildInputs = [ TestException TestFailWarnings ]; meta = { description = "Conversion utilities for encryption applications"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.sgo ]; }; }; @@ -4061,7 +4077,7 @@ let propagatedBuildInputs = [ CryptX JSON ]; meta = { description = "JSON Web Token"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -4084,7 +4100,7 @@ let buildInputs = [ pkgs.unzip ModuleBuildTiny ]; propagatedBuildInputs = [ ConvertASN1 ]; meta = { - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -4099,7 +4115,7 @@ let meta = { homepage = "https://github.com/danaj/Crypt-Random-Seed"; description = "Provide strong randomness for seeding"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.sgo ]; }; }; @@ -4114,7 +4130,7 @@ let propagatedBuildInputs = [ ClassLoader MathPari StatisticsChiSquare ]; meta = { description = "Interface to /dev/random and /dev/urandom"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -4129,7 +4145,7 @@ let propagatedBuildInputs = [ CaptureTiny ModuleFind Moo SubExporter TypeTiny namespaceclean ]; meta = { description = "Get weak or strong random data from pluggable sources"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -4143,7 +4159,7 @@ let meta = { homepage = "https://github.com/danaj/Crypt-Random-TESHA2"; description = "Random numbers using timer/schedule entropy, aka userspace voodoo entropy"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -4167,15 +4183,15 @@ let CryptRIPEMD160 = buildPerlPackage { pname = "Crypt-RIPEMD160"; - version = "0.06"; + version = "0.08"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TO/TODDR/Crypt-RIPEMD160-0.06.tar.gz"; - sha256 = "ea64a1e9eb42f3d79855a392e7cca6b86e8e0bcc9aabcc5efa5fa32415b67dba"; + url = "mirror://cpan/authors/id/T/TO/TODDR/Crypt-RIPEMD160-0.08.tar.gz"; + sha256 = "0cmj620kfg08yvh81bq1sbabdyyc3g9pc6vlngxdxjgn0xvcil9l"; }; meta = { homepage = "https://wiki.github.com/toddr/Crypt-RIPEMD160"; description = "Perl extension for the RIPEMD-160 Hash function"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.sgo ]; }; }; @@ -4188,15 +4204,15 @@ let sha256 = "93ebdfaaefcfe9ab683f0121c85f24475d8197f0bcec46018219e4111434dde3"; }; propagatedBuildInputs = [ DigestSHA1 ]; - perlPreHook = stdenv.lib.optionalString (stdenv.isi686 || stdenv.isDarwin) "export LD=$CC"; + perlPreHook = lib.optionalString (stdenv.isi686 || stdenv.isDarwin) "export LD=$CC"; }; CryptRijndael = buildPerlPackage { pname = "Crypt-Rijndael"; - version = "1.14"; + version = "1.15"; src = fetchurl { - url = "mirror://cpan/authors/id/L/LE/LEONT/Crypt-Rijndael-1.14.tar.gz"; - sha256 = "03l5nwq97a8q9na4dpd4m3r7vrwpranx225vw8xm40w7zvgw6lb4"; + url = "mirror://cpan/authors/id/L/LE/LEONT/Crypt-Rijndael-1.15.tar.gz"; + sha256 = "0qs1b6ma4sj0ip5d8544fzgc1bbankc4qlmznp8hay8dk5arp650"; }; }; @@ -4218,7 +4234,7 @@ let }; meta = { description = "Provide non blocking randomness"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.sgo ]; }; }; @@ -4234,7 +4250,7 @@ let perlPreHook = "export LD=$CC"; meta = { description = "Scrypt password based key derivation function"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; homepage = "https://github.com/DCIT/perl-Crypt-ScryptKDF"; maintainers = [ maintainers.sgo ]; }; @@ -4261,21 +4277,21 @@ let meta = { homepage = "https://metacpan.org/release/Crypt-Sodium"; description = "Perl bindings for libsodium (NaCL)"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.sgo ]; }; }; CryptTwofish = buildPerlPackage { pname = "Crypt-Twofish"; - version = "2.17"; + version = "2.18"; src = fetchurl { - url = "mirror://cpan/authors/id/A/AM/AMS/Crypt-Twofish-2.17.tar.gz"; - sha256 = "eed502012f0c63927a1a32e3154071cc81175d1992a893ec41f183b6e3e5d758"; + url = "mirror://cpan/authors/id/A/AM/AMS/Crypt-Twofish-2.18.tar.gz"; + sha256 = "00fms8v94wr3lmn1nqjcfw30p5scsyr4s3dah8ijm5w7c5fmb0aq"; }; meta = { description = "The Twofish Encryption Algorithm"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.sgo ]; }; }; @@ -4294,15 +4310,15 @@ let buildInputs = [ TestException ]; propagatedBuildInputs = [ AltCryptRSABigInt CryptCAST5_PP CryptDES_EDE3 CryptDSA CryptIDEA CryptRIPEMD160 CryptRijndael CryptTwofish FileHomeDir LWP ]; - nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin shortenPerlShebang; - postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; + postInstall = lib.optionalString stdenv.isDarwin '' shortenPerlShebang $out/bin/pgplet ''; meta = { homepage = "https://github.com/btrott/Crypt-OpenPGP"; description = "Pure-Perl OpenPGP implementation"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.sgo ]; }; doCheck = false; /* test fails with 'No random source available!' */ @@ -4317,7 +4333,7 @@ let }; NIX_CFLAGS_COMPILE = "-I${pkgs.openssl.dev}/include"; NIX_CFLAGS_LINK = "-L${pkgs.openssl.out}/lib -lcrypto"; - meta = with stdenv.lib; { + meta = with lib; { description = "Perl wrapper around OpenSSL's AES library"; license = with licenses; [ artistic1 gpl1Plus ]; }; @@ -4343,7 +4359,7 @@ let }; meta = { description = "Guess OpenSSL include path"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; homepage = "https://github.com/akiym/Crypt-OpenSSL-Guess"; }; }; @@ -4385,7 +4401,7 @@ let meta = { homepage = "https://github.com/dsully/perl-crypt-openssl-x509"; description = "Perl extension to OpenSSL's X509 API"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.sgo ]; }; }; @@ -4402,7 +4418,7 @@ let meta = { homepage = "https://metacpan.org/release/Crypt-PBKDF2"; description = "The PBKDF2 password hash algorithm"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.sgo ]; }; }; @@ -4419,7 +4435,7 @@ let propagatedBuildInputs = [ BytesRandomSecureTiny ClassAccessor ConvertASN1 CryptFormat MathProvablePrime SymbolGet TryTiny ]; meta = { description = "Cryptography in pure Perl"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.sgo ]; }; }; @@ -4436,7 +4452,7 @@ let meta = { description = "Minimal Ed25519 bindings"; - license = stdenv.lib.licenses.artistic2; + license = lib.licenses.artistic2; maintainers = [ maintainers.thoughtpolice ]; }; buildInputs = [ CanaryStability ]; @@ -4472,10 +4488,10 @@ let url = "mirror://cpan/authors/id/G/GT/GTERMARS/CSS-Minifier-XS-0.09.tar.gz"; sha256 = "1myswrmh0sqp5xjpp03x45z8arfmgkjx0srl3r6kjsyzl1zrk9l8"; }; - perlPreHook = stdenv.lib.optionalString (stdenv.isi686 || stdenv.isDarwin) "export LD=$CC"; + perlPreHook = lib.optionalString (stdenv.isi686 || stdenv.isDarwin) "export LD=$CC"; meta = { description = "XS based CSS minifier"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -4495,16 +4511,16 @@ let Curses = buildPerlPackage { pname = "Curses"; - version = "1.36"; + version = "1.37"; src = fetchurl { - url = "mirror://cpan/authors/id/G/GI/GIRAFFED/Curses-1.36.tar.gz"; - sha256 = "0r6xd9wr0c25rr28zixhqipak575zqsfb7r7f2693i9il1dpj554"; + url = "mirror://cpan/authors/id/G/GI/GIRAFFED/Curses-1.37.tar.gz"; + sha256 = "086vaj4wh5473hbp5f4amk6l0yzm66yxdcd2znz5pcqrmpiplw3l"; }; propagatedBuildInputs = [ pkgs.ncurses ]; NIX_CFLAGS_LINK = "-lncurses"; meta = { description = "Perl bindings to ncurses"; - license = stdenv.lib.licenses.artistic1; + license = lib.licenses.artistic1; }; }; @@ -4517,7 +4533,7 @@ let }; meta = { description = "curses based OO user interface framework"; - license = stdenv.lib.licenses.artistic1; + license = lib.licenses.artistic1; }; propagatedBuildInputs = [ Curses TermReadKey ]; }; @@ -4531,7 +4547,7 @@ let }; meta = { description = "Crypto toolkit"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -4544,7 +4560,7 @@ let }; meta = { description = "Temporary changing working directory (chdir)"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; buildInputs = [ TestRequires ]; }; @@ -4559,7 +4575,7 @@ let buildInputs = [ TestRequires ]; meta = { description = "Polymorphic data cloning"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -4582,7 +4598,7 @@ let }; meta = { description = "Pretty printing of data structures"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -4595,7 +4611,7 @@ let }; meta = { description = "Less indentation and newlines plus sub deparsing"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -4628,7 +4644,7 @@ let propagatedBuildInputs = [ DateCalc EmailValid FileMMagic ImageSize MIMETypes RegexpCommon ]; meta = { description = "Validates user input (usually from an HTML form) based on input profile"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; buildInputs = [ CGI ]; }; @@ -4644,7 +4660,7 @@ let meta = { homepage = "https://github.com/rjbs/Data-GUID"; description = "Globally unique identifiers"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -4670,7 +4686,7 @@ let }; meta = { description = "Make binary data human-readable"; - license = with stdenv.lib.licenses; [ artistic1 gpl2 ]; + license = with lib.licenses; [ artistic1 gpl2 ]; }; }; @@ -4695,7 +4711,7 @@ let propagatedBuildInputs = [ ClassReturnValue TextvFileasData ]; meta = { description = "Generates iCalendar (RFC 2445) calendar files"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -4709,7 +4725,7 @@ let buildInputs = [ TestBits ]; meta = { description = "Pack and unpack big-endian IEEE754 floats and doubles"; - license = with stdenv.lib.licenses; [ artistic2 ]; + license = with lib.licenses; [ artistic2 ]; }; }; @@ -4733,7 +4749,7 @@ let meta = { homepage = "https://github.com/msgpack/msgpack-perl"; description = "MessagePack serializing/deserializing"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.sgo ]; }; }; @@ -4749,7 +4765,7 @@ let meta = { homepage = "https://github.com/rjbs/data-optlist"; description = "Parse and validate simple name/value option pairs"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -4774,7 +4790,7 @@ let buildInputs = [ ClassAccessor DataPage TestException ]; meta = { description = "change long page list to be shorter and well navigate"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -4799,7 +4815,7 @@ let meta = { homepage = "https://github.com/mattp-/Data-Perl"; description = "Base classes wrapping fundamental Perl data types"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -4813,7 +4829,7 @@ let propagatedBuildInputs = [ ClonePP FileHomeDir PackageStash SortNaturally ]; meta = { description = "colored pretty-print of Perl data structures and objects"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -4828,7 +4844,7 @@ let meta = { homepage = "https://github.com/rjbs/data-section"; description = "Read multiple hunks of data out of your DATA section"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; buildInputs = [ TestFailWarnings ]; }; @@ -4842,7 +4858,7 @@ let }; meta = { description = "Modules that serialize data structures"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -4856,7 +4872,7 @@ let buildInputs = [ TestDeep ]; propagatedBuildInputs = [ ClassAccessor ]; meta = { - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -4869,7 +4885,7 @@ let }; propagatedBuildInputs = [ DataPage MathRound ]; meta = { - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -4884,7 +4900,7 @@ let propagatedBuildInputs = [ Moose PathClass namespaceclean ]; meta = { description = "N at a time iteration API"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -4898,7 +4914,7 @@ let buildInputs = [ TestPod ]; meta = { description = "Change nature of data within a structure"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -4923,7 +4939,7 @@ let meta = { homepage = "https://metacpan.org/release/Data-ULID"; description = "Universally Unique Lexicographically Sortable Identifier"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ sgo ]; }; }; @@ -4945,10 +4961,10 @@ let sha256 = "1x662pqjg9p0wcigi7pwf969b2ymk66ncm2vd5dfm5i08pdkjpf3"; }; buildInputs = [ HashUtilFieldHashCompat ModuleBuildXSUtil ScopeGuard TestException ]; - perlPreHook = stdenv.lib.optionalString stdenv.isi686 "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local' + perlPreHook = lib.optionalString stdenv.isi686 "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local' meta = { description = "A selection of utilities for data and data types"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; homepage = "https://github.com/gfx/Perl-Data-Util"; }; }; @@ -4961,7 +4977,7 @@ let sha256 = "51c9efbf8423853616eaa24841e4d1996b2db0036900617fb1dbc76c75a1f360"; }; meta = { - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -4985,7 +5001,7 @@ let propagatedBuildInputs = [ MathRandomMTAuto ]; meta = { description = "Fast random UUID generator using the Mersenne Twister algorithm"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }; }; @@ -5000,7 +5016,7 @@ let propagatedBuildInputs = [ NetDomainTLD ]; meta = { description = "Domain and host name validation"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -5015,7 +5031,7 @@ let propagatedBuildInputs = [ NetAddrIP ]; meta = { description = "IPv4 and IPv6 validation methods"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -5029,7 +5045,7 @@ let propagatedBuildInputs = [ DataValidateDomain DataValidateIP ]; meta = { description = "Common URL validation methods"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -5068,10 +5084,10 @@ let DateManip = buildPerlPackage { pname = "Date-Manip"; - version = "6.82"; + version = "6.83"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SB/SBECK/Date-Manip-6.82.tar.gz"; - sha256 = "0ak72kpydwhq2z03mhdfwm3ganddzb8gawzh6crpsjvb9kwvr5ps"; + url = "mirror://cpan/authors/id/S/SB/SBECK/Date-Manip-6.83.tar.gz"; + sha256 = "1ylrj6g1sccnyd5k0dq3xl3l40y1jgcbpcb3jnjj5hknv3hv54gl"; }; # for some reason, parsing /etc/localtime does not work anymore - make sure that the fallback "/bin/date +%Z" will work patchPhase = '' @@ -5092,22 +5108,22 @@ let sha256 = "29a1926314ce1681a312d6155c29590c771ddacf91b7485873ce449ef209dd04"; }; meta = { - license = with stdenv.lib.licenses; [ artistic1 gpl2Plus ]; + license = with lib.licenses; [ artistic1 gpl2Plus ]; }; }; DateTime = buildPerlPackage { pname = "DateTime"; - version = "1.52"; + version = "1.54"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-1.52.tar.gz"; - sha256 = "1z1xpifh2kpyw7rlc8ivg9rl0qmabjq979gjp0s9agdjf9hqp0k7"; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-1.54.tar.gz"; + sha256 = "1rxjagwmkdlmksz1cbxwx2ad51pv5q7dri2djqkz44q7j1nxlbmi"; }; buildInputs = [ CPANMetaCheck TestFatal TestWarnings ]; propagatedBuildInputs = [ DateTimeLocale DateTimeTimeZone ]; meta = { description = "A date and time object"; - license = stdenv.lib.licenses.artistic2; + license = lib.licenses.artistic2; }; }; @@ -5120,7 +5136,7 @@ let }; meta = { description = "Dates in the Julian calendar"; - license = stdenv.lib.licenses.artistic2; + license = lib.licenses.artistic2; }; propagatedBuildInputs = [ DateTime ]; }; @@ -5135,7 +5151,7 @@ let propagatedBuildInputs = [ DateTimeEventRecurrence ]; meta = { description = "DateTime rfc2445 recurrences"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -5159,7 +5175,7 @@ let propagatedBuildInputs = [ DateTimeFormatStrptime ParamsValidate ]; meta = { description = "Create DateTime parser classes and objects"; - license = stdenv.lib.licenses.artistic2; + license = lib.licenses.artistic2; }; }; @@ -5173,7 +5189,7 @@ let propagatedBuildInputs = [ DateTime TimeDate ]; meta = { description = "Parses Date::Parse compatible formats"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -5187,7 +5203,7 @@ let propagatedBuildInputs = [ DateTimeFormatBuilder ListMoreUtils ModulePluggable ]; meta = { description = "Flexibly parse strings and turn them into DateTime objects"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; buildInputs = [ TestException TestMockTime TestNoWarnings ]; }; @@ -5202,7 +5218,7 @@ let propagatedBuildInputs = [ DateTime HTTPDate ]; meta = { description = "Date conversion routines"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -5216,21 +5232,21 @@ let propagatedBuildInputs = [ DateTimeEventICal ]; meta = { description = "Parse and format iCal datetime and duration strings"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; DateTimeFormatISO8601 = buildPerlPackage { pname = "DateTime-Format-ISO8601"; - version = "0.14"; + version = "0.15"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-Format-ISO8601-0.14.tar.gz"; - sha256 = "1ssy41d7g1kgrdlhnz1vr7rhxspmnhzx1hkdmrf11ca293kq7r47"; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-Format-ISO8601-0.15.tar.gz"; + sha256 = "1afslsr2axkamdfjqk6i3w092hp20dznqffk4lgpxmxrd31ni5ql"; }; propagatedBuildInputs = [ DateTimeFormatBuilder ]; meta = { description = "Parses ISO8601 formats"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; buildInputs = [ Test2Suite ]; }; @@ -5245,22 +5261,22 @@ let propagatedBuildInputs = [ DateTime ParamsValidate ]; meta = { description = "Convert between DateTime and RFC2822/822 formats"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; DateTimeFormatNatural = buildPerlModule { pname = "DateTime-Format-Natural"; - version = "1.10"; + version = "1.11"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SC/SCHUBIGER/DateTime-Format-Natural-1.10.tar.gz"; - sha256 = "0ahia58vs5f8ymskain1a6vl6b4fhkar1cmakq5q92zzhvmgx6z1"; + url = "mirror://cpan/authors/id/S/SC/SCHUBIGER/DateTime-Format-Natural-1.11.tar.gz"; + sha256 = "0lj5yh1k4dl06p9ydyscd4ic330w8ygz88m38bhzlbz42kxv13vk"; }; buildInputs = [ ModuleUtil TestMockTime ]; propagatedBuildInputs = [ Clone DateTime ListMoreUtils ParamsValidate boolean ]; meta = { description = "Create machine readable date/time with natural parsing logic"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -5274,7 +5290,7 @@ let propagatedBuildInputs = [ DateTimeFormatBuilder ]; meta = { description = "Parse and format MySQL dates and times"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -5288,7 +5304,7 @@ let propagatedBuildInputs = [ DateTimeFormatBuilder ]; meta = { description = "Parse and format PostgreSQL dates and times"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; buildInputs = [ ModuleBuildTiny ]; }; @@ -5304,7 +5320,7 @@ let propagatedBuildInputs = [ DateTime ]; meta = { description = "Parse and format strp and strf time patterns"; - license = stdenv.lib.licenses.artistic2; + license = lib.licenses.artistic2; }; }; @@ -5318,7 +5334,7 @@ let propagatedBuildInputs = [ DateTimeFormatBuilder ]; meta = { description = "Parse and format SQLite dates and times"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -5332,7 +5348,7 @@ let propagatedBuildInputs = [ DateTime ]; meta = { description = "Parse and format W3CDTF datetime strings"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -5347,7 +5363,7 @@ let propagatedBuildInputs = [ FileShareDir ParamsValidationCompiler Specio namespaceautoclean ]; meta = { description = "Localization support for DateTime.pm"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -5361,22 +5377,22 @@ let propagatedBuildInputs = [ DateTime ParamsValidate SetInfinite ]; meta = { description = "DateTime set objects"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; DateTimeTimeZone = buildPerlPackage { pname = "DateTime-TimeZone"; - version = "2.39"; + version = "2.44"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-TimeZone-2.39.tar.gz"; - sha256 = "65a49083bf465b42c6a65df575efaceb87b5ba5a997d4e91e6ddba57190c8fca"; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-TimeZone-2.44.tar.gz"; + sha256 = "09j5rqid1mv0cgm1vc89l2anbb3q8w4bzlm7sqrkiz9dk82x8gap"; }; buildInputs = [ TestFatal TestRequires ]; propagatedBuildInputs = [ ClassSingleton ParamsValidationCompiler Specio namespaceautoclean ]; meta = { description = "Time zone object base class and factory"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -5392,7 +5408,7 @@ let doCheck = false; meta = { description = "Parse a date/time string using the best method available"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -5406,7 +5422,7 @@ let propagatedBuildInputs = [ ClassISA DevelStackTrace StringUtil TermReadKey TextTabularDisplay TieIxHash ]; meta = { description = "A collection of handy debugging routines for displaying the values of variables with a minimum of coding"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -5420,7 +5436,7 @@ let propagatedBuildInputs = [ PadWalker ]; meta = { description = "Meatier versions of C"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -5433,7 +5449,7 @@ let }; meta = { description = "check that a command is available"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; homepage = "https://github.com/tokuhirom/Devel-CheckBin"; }; }; @@ -5448,7 +5464,7 @@ let buildInputs = [ ModuleBuildTiny ]; meta = { description = "Check the compiler's availability"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; homepage = "https://github.com/tokuhirom/Devel-CheckCompiler"; }; }; @@ -5465,10 +5481,10 @@ let DevelCheckOS = buildPerlPackage { pname = "Devel-CheckOS"; - version = "1.83"; + version = "1.85"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DC/DCANTRELL/Devel-CheckOS-1.83.tar.gz"; - sha256 = "b20fb5ab55d2cf8539fdc7268d77cdbf944408e620c4969023e687ddd28c9972"; + url = "mirror://cpan/authors/id/D/DC/DCANTRELL/Devel-CheckOS-1.85.tar.gz"; + sha256 = "1jjqwrx8mydyhqwwjlgimribz0yq0b6q66xnr6mgvyn63pdajhvg"; }; propagatedBuildInputs = [ FileFindRule ]; }; @@ -5483,22 +5499,22 @@ let meta = { homepage = "https://metacpan.org/release/Devel-Leak"; description = "Utility for looking for perl objects that are not reclaimed"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; # According to Debian + license = with lib.licenses; [ artistic1 gpl1Plus ]; # According to Debian }; }; DevelPatchPerl = buildPerlPackage { pname = "Devel-PatchPerl"; - version = "2.00"; + version = "2.04"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BI/BINGOS/Devel-PatchPerl-2.00.tar.gz"; - sha256 = "07yy02v86ia7j8qbn46jqan8c8d6xdqigvv5a4wmkqwln7jxmhrr"; + url = "mirror://cpan/authors/id/B/BI/BINGOS/Devel-PatchPerl-2.04.tar.gz"; + sha256 = "1q8xhz2sdlz2266pjl8j9vcixbhcaxsprmvsx56ra998miayc42p"; }; propagatedBuildInputs = [ Filepushd ModulePluggable ]; meta = { homepage = "https://github.com/bingos/devel-patchperl"; description = "Patch perl source a la Devel::PPPort's buildperl.pl"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -5512,20 +5528,20 @@ let buildInputs = [ TestFatal ]; meta = { description = "obtain the REFCNT value of a referent"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; DevelPPPort = buildPerlPackage { pname = "Devel-PPPort"; - version = "3.60"; + version = "3.62"; src = fetchurl { - url = "mirror://cpan/authors/id/A/AT/ATOOMIC/Devel-PPPort-3.60.tar.gz"; - sha256 = "0c7f36d2c63e1bbe4fd9670f3b093a207175068764884b9d67ea27aed6c07ea6"; + url = "mirror://cpan/authors/id/A/AT/ATOOMIC/Devel-PPPort-3.62.tar.gz"; + sha256 = "16w1mmx304bhql27mgy0l1qjwjr86vn7j0133i0hln9fdz2097gi"; }; meta = { description = "Perl/Pollution/Portability"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -5538,7 +5554,7 @@ let }; meta = { description = "Print out each line before it is executed (like sh -x)"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }; }; @@ -5553,7 +5569,7 @@ let propagatedBuildInputs = [ DeviceOUI Moose ]; meta = { description = "Handle hardware MAC Addresses (EUI-48 and EUI-64)"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.sgo ]; }; }; @@ -5570,27 +5586,27 @@ let propagatedBuildInputs = [ ClassAccessorGrouped LWP SubExporter ]; meta = { description = "Resolve an Organizationally Unique Identifier"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.sgo ]; }; }; DBDCSV = buildPerlPackage { pname = "DBD-CSV"; - version = "0.55"; + version = "0.56"; src = fetchurl { - url = "mirror://cpan/authors/id/H/HM/HMBRAND/DBD-CSV-0.55.tgz"; - sha256 = "4670028e46df9a3c2791740445e8a4c82840b6667cee5dd796bc5a6ad9266ddb"; + url = "mirror://cpan/authors/id/H/HM/HMBRAND/DBD-CSV-0.56.tgz"; + sha256 = "16rhgchwlnnvjklca0d4sa3lmlj29zc0iwclk41y5fz6kg8c2qjs"; }; propagatedBuildInputs = [ DBI SQLStatement TextCSV_XS ]; }; DBDMock = buildPerlModule { pname = "DBD-Mock"; - version = "1.55"; + version = "1.58"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JL/JLCOOPER/DBD-Mock-1.55.tar.gz"; - sha256 = "827ca7a363eca8d1d4912decc920eb55ef8e8173e0f756808e2ed304f0dad20c"; + url = "mirror://cpan/authors/id/J/JL/JLCOOPER/DBD-Mock-1.58.tar.gz"; + sha256 = "0g67r5i5qad5knjph4ybfpqxabgi2h7svpl3pgjrc4qh4h0vy7mv"; }; propagatedBuildInputs = [ DBI ]; buildInputs = [ ModuleBuildTiny TestException ]; @@ -5622,7 +5638,7 @@ let preCheck = "rm t/65_db_config.t"; # do not run failing tests - meta = with stdenv.lib; { + meta = with lib; { description = "Self Contained SQLite RDBMS in a DBI Driver"; license = with licenses; [ artistic1 gpl1Plus ]; platforms = platforms.unix; @@ -5641,7 +5657,7 @@ let meta = { homepage = "https://github.com/gooddata/DBD-MariaDB"; description = "MariaDB and MySQL driver for the Perl5 Database Interface (DBI)"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.sgo ]; }; }; @@ -5677,7 +5693,7 @@ let buildInputs = [ pkgs.oracle-instantclient TestNoWarnings ]; propagatedBuildInputs = [ DBI ]; - postBuild = stdenv.lib.optionalString stdenv.isDarwin '' + postBuild = lib.optionalString stdenv.isDarwin '' install_name_tool -add_rpath "${pkgs.oracle-instantclient.lib}/lib" blib/arch/auto/DBD/Oracle/Oracle.bundle ''; }; @@ -5701,8 +5717,8 @@ let meta = { description = "DBI PostgreSQL interface"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - platforms = stdenv.lib.platforms.unix; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + platforms = lib.platforms.unix; }; }; @@ -5725,11 +5741,11 @@ let DBFile = buildPerlPackage { pname = "DB_File"; - version = "1.853"; + version = "1.855"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PM/PMQS/DB_File-1.853.tar.gz"; - sha256 = "1y967si45vj0skip1hnhicbv9da29fv6qcfwnsbnvj06n36mkj6h"; + url = "mirror://cpan/authors/id/P/PM/PMQS/DB_File-1.855.tar.gz"; + sha256 = "0q599h7g4jkzks5dxf1zifx9k7l9vif26r2dlgkzxkg6bfif5zyr"; }; preConfigure = '' @@ -5749,7 +5765,7 @@ let url = "mirror://cpan/authors/id/T/TI/TIMB/DBI-1.643.tar.gz"; sha256 = "8a2b993db560a2c373c174ee976a51027dd780ec766ae17620c20393d2e836fa"; }; - postInstall = stdenv.lib.optionalString (perl ? crossVersion) '' + postInstall = lib.optionalString (perl ? crossVersion) '' mkdir -p $out/${perl.libPrefix}/cross_perl/${perl.version}/DBI cat > $out/${perl.libPrefix}/cross_perl/${perl.version}/DBI.pm <catfile(\$path, \$cc\[0\]) \. \$Config{_exe};@my \$compiler = File::Spec->catfile(\$path, \$cc\[0\]) \. (\$^O eq 'cygwin' ? \"\" : \$Config{_exe});@" inc/Devel/CheckLib.pm ''; makeMakerFlags = "EXPATLIBPATH=${pkgs.expat.out}/lib EXPATINCPATH=${pkgs.expat.dev}/include"; @@ -23115,7 +23168,7 @@ let buildInputs = [ TestRequires ]; meta = { description = "Lightweight pure-perl XML Parser (based on regexps)"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -23130,7 +23183,7 @@ let propagatedBuildInputs = [ XMLParser ]; meta = { description = "Modules for parsing and evaluating XPath statements"; - license = stdenv.lib.licenses.artistic2; + license = lib.licenses.artistic2; }; }; @@ -23166,23 +23219,23 @@ let # disable tests that require network preCheck = "rm t/{26-xmlrpc.t,37-mod_xmlrpc.t}"; meta = { - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; description = "Client and server implementation of XML-RPC protocol"; }; }; XMLRSS = buildPerlModule { pname = "XML-RSS"; - version = "1.61"; + version = "1.62"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHLOMIF/XML-RSS-1.61.tar.gz"; - sha256 = "fa6fe7ce5d31800a2bd414ef39da48c7f2b26b073a3c1f0d677bda26e840c90d"; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/XML-RSS-1.62.tar.gz"; + sha256 = "0klb8ghd405pdkmn25lp3i4j2lfydz8w581sk51p3zy788s0c9yk"; }; propagatedBuildInputs = [ DateTimeFormatMail DateTimeFormatW3CDTF XMLParser ]; meta = { homepage = "http://perl-rss.sourceforge.net/"; description = "Creates and updates RSS files"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -23209,7 +23262,7 @@ let meta = { description = "Base class for SAX Drivers and Filters"; homepage = "https://github.com/grantm/XML-SAX-Base"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -23225,7 +23278,7 @@ let installTargets = [ "pure_install" ]; meta = { description = "SAX Driver for Expat"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -23240,7 +23293,7 @@ let meta = { homepage = "https://github.com/perigrin/xml-sax-writer"; description = "SAX2 XML Writer"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -23274,7 +23327,7 @@ let propagatedBuildInputs = [ XMLParser ]; meta = { description = "Simplified interface to XML::Parser"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -23288,7 +23341,7 @@ let propagatedBuildInputs = [ LWP ]; meta = { description = "Pure Perl implementation for parsing/writing XML documents"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -23322,10 +23375,10 @@ let XMLWriter = buildPerlPackage { pname = "XML-Writer"; - version = "0.625"; + version = "0.900"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JO/JOSEPHW/XML-Writer-0.625.tar.gz"; - sha256 = "1gjzs570i67ywbv967g8ylb5sg59clwmyrl2yix3jl70dhn55070"; + url = "mirror://cpan/authors/id/J/JO/JOSEPHW/XML-Writer-0.900.tar.gz"; + sha256 = "07qd806kcs7si7qakx3x5p68xq2jdmkxdrns987kaayg7syzbj3k"; }; }; @@ -23339,7 +23392,7 @@ let buildInputs = [ ExtUtilsDepends TestFatal TestSimple13 ]; meta = { description = "XS pointer backed objects using sv_magic"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -23351,10 +23404,10 @@ let sha256 = "99a1bdda3ffa67514adb6aa189c902fa78dca41d778a42ae7079f604a045ac43"; }; buildInputs = [ TestFatal ]; - perlPreHook = stdenv.lib.optionalString stdenv.isDarwin "export LD=$CC"; + perlPreHook = lib.optionalString stdenv.isDarwin "export LD=$CC"; meta = { description = "XS functions to assist in parsing sub-like syntax"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.zakame ]; }; }; @@ -23369,7 +23422,7 @@ let propagatedBuildInputs = [ YAMLPP ]; meta = { description = "See Your Data in the Nude"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; homepage = "https://github.com/ingydotnet/xxx-pm"; }; }; @@ -23387,21 +23440,21 @@ let meta = { homepage = "https://github.com/ingydotnet/yaml-pm"; description = "YAML Ain't Markup Language (tm)"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; YAMLSyck = buildPerlPackage { pname = "YAML-Syck"; - version = "1.32"; + version = "1.34"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TO/TODDR/YAML-Syck-1.32.tar.gz"; - sha256 = "1fz9r9vvsmjkzvcbznxw65b319vkmwzd0ck09q9nwip00gn907fv"; + url = "mirror://cpan/authors/id/T/TO/TODDR/YAML-Syck-1.34.tar.gz"; + sha256 = "0na1wg3d7ykzy5i44w6i1s37ymq6x0cvcc9gzvmri9xxmv65d4fc"; }; - perlPreHook = stdenv.lib.optionalString stdenv.isDarwin "export LD=$CC"; + perlPreHook = lib.optionalString stdenv.isDarwin "export LD=$CC"; meta = { description = "Fast, lightweight YAML loader and dumper"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }; }; @@ -23425,15 +23478,15 @@ let YAMLPP = buildPerlPackage { pname = "YAML-PP"; - version = "0.025"; + version = "0.026"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TI/TINITA/YAML-PP-0.025.tar.gz"; - sha256 = "1v579a874b98l8kj0sk2qk8ydcgqlzlrvcs2yc77s1xnxay15b0m"; + url = "mirror://cpan/authors/id/T/TI/TINITA/YAML-PP-0.026.tar.gz"; + sha256 = "1ss5b8ny00pvg6bfx562hy7z5hj02w1yh224qpn6dsgk3ikqx1ab"; }; buildInputs = [ TestDeep TestWarn ]; meta = { description = "YAML Framework"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -23449,11 +23502,11 @@ let meta = { homepage = "https://github.com/mikegrb/WebService-Linode"; description = "Perl Interface to the Linode.com API"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; -} // stdenv.lib.optionalAttrs (config.allowAliases or true) { +} // lib.optionalAttrs (config.allowAliases or true) { autodie = null; # part of Perl AutoLoader = null; # part of Perl 5.22 constant = null; # part of Perl 5.22 diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index cc8ba346ae56..cb3cfdf7651d 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -78,7 +78,15 @@ lib.makeScope pkgs.newScope (self: with self; { mongodb = callPackage ../development/php-packages/mongodb { }; - oci8 = callPackage ../development/php-packages/oci8 { }; + oci8 = callPackage ../development/php-packages/oci8 ({ + version = "2.2.0"; + sha256 = "0jhivxj1nkkza4h23z33y7xhffii60d7dr51h1czjk10qywl7pyd"; + } // lib.optionalAttrs (lib.versionAtLeast php.version "8.0") { + version = "3.0.1"; + sha256 = "108ds92620dih5768z19hi0jxfa7wfg5hdvyyvpapir87c0ap914"; + }); + + pdlib = callPackage ../development/php-packages/pdlib { }; pcov = callPackage ../development/php-packages/pcov { }; @@ -302,7 +310,7 @@ lib.makeScope pkgs.newScope (self: with self; { }) ]; postPhpize = ''substituteInPlace configure --replace 'as_fn_error $? "Cannot locate header file libintl.h" "$LINENO" 5' ':' ''; - configureFlags = "--with-gettext=${gettext}"; } + configureFlags = [ "--with-gettext=${gettext}" ]; } { name = "gmp"; buildInputs = [ gmp ]; configureFlags = [ "--with-gmp=${gmp.dev}" ]; } @@ -388,10 +396,7 @@ lib.makeScope pkgs.newScope (self: with self; { buildInputs = [ pcre' ] ++ lib.optionals (lib.versionAtLeast php.version "8.0") [ valgrind.dev ]; - # HAVE_OPCACHE_FILE_CACHE is defined in config.h, which is - # included from ZendAccelerator.h, but ZendAccelerator.h is - # included after the ifdef... - patches = [] ++ lib.optional (lib.versionAtLeast php.version "8.0") [ ../development/interpreters/php/fix-opcache-configure.patch ] ++lib.optional (lib.versionOlder php.version "7.4") [ + patches = [] ++ lib.optional (lib.versionOlder php.version "7.4") [ (pkgs.writeText "zend_file_cache_config.patch" '' --- a/ext/opcache/zend_file_cache.c +++ b/ext/opcache/zend_file_cache.c diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9f1c6192bba9..fe514945aa87 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8,10 +8,11 @@ { pkgs , stdenv +, lib , python }: -with pkgs.lib; +with lib; self: @@ -64,7 +65,7 @@ let # Create a PYTHONPATH from a list of derivations. This function recurses into the items to find derivations # providing Python modules. - makePythonPath = drvs: stdenv.lib.makeSearchPath python.sitePackages (requiredPythonModules drvs); + makePythonPath = drvs: lib.makeSearchPath python.sitePackages (requiredPythonModules drvs); removePythonPrefix = name: removePrefix namePrefix name; @@ -167,9 +168,15 @@ in { adb-shell = callPackage ../development/python-modules/adb-shell { }; + adblock = callPackage ../development/python-modules/adblock { + inherit (pkgs.darwin.apple_sdk.frameworks) CoreFoundation Security; + }; + addic7ed-cli = callPackage ../development/python-modules/addic7ed-cli { }; - adguardhome= callPackage ../development/python-modules/adguardhome { }; + adguardhome = callPackage ../development/python-modules/adguardhome { }; + + advantage-air = callPackage ../development/python-modules/advantage-air { }; aenum = callPackage ../development/python-modules/aenum { }; @@ -205,6 +212,8 @@ in { aioftp = callPackage ../development/python-modules/aioftp { }; + aioguardian = callPackage ../development/python-modules/aioguardian { }; + aioh2 = callPackage ../development/python-modules/aioh2 { }; aioharmony = callPackage ../development/python-modules/aioharmony { }; @@ -221,6 +230,10 @@ in { aiohttp-swagger = callPackage ../development/python-modules/aiohttp-swagger { }; + aioitertools = callPackage ../development/python-modules/aioitertools { }; + + aiobotocore = callPackage ../development/python-modules/aiobotocore { }; + aiohue = callPackage ../development/python-modules/aiohue { }; aioimaplib = callPackage ../development/python-modules/aioimaplib { }; @@ -229,16 +242,22 @@ in { aiokafka = callPackage ../development/python-modules/aiokafka { }; + aiokef = callPackage ../development/python-modules/aiokef { }; + aiolifx = callPackage ../development/python-modules/aiolifx { }; aiolifx-effects = callPackage ../development/python-modules/aiolifx-effects { }; + aiomultiprocess = callPackage ../development/python-modules/aiomultiprocess { }; + aiomysql = callPackage ../development/python-modules/aiomysql { }; aionotify = callPackage ../development/python-modules/aionotify { }; aioprocessing = callPackage ../development/python-modules/aioprocessing { }; + aiopulse = callPackage ../development/python-modules/aiopulse { }; + aioredis = callPackage ../development/python-modules/aioredis { }; aioresponses = callPackage ../development/python-modules/aioresponses { }; @@ -251,12 +270,18 @@ in { aiosqlite = callPackage ../development/python-modules/aiosqlite { }; + aiostream = callPackage ../development/python-modules/aiostream { }; + aiounifi = callPackage ../development/python-modules/aiounifi { }; aiounittest = callPackage ../development/python-modules/aiounittest { }; + aiowinreg = callPackage ../development/python-modules/aiowinreg { }; + aiozeroconf = callPackage ../development/python-modules/aiozeroconf { }; + airly = callPackage ../development/python-modules/airly { }; + ajpy = callPackage ../development/python-modules/ajpy { }; alabaster = callPackage ../development/python-modules/alabaster { }; @@ -279,6 +304,8 @@ in { amazon_kclpy = callPackage ../development/python-modules/amazon_kclpy { }; + ambiclimate = callPackage ../development/python-modules/ambiclimate { }; + amply = callPackage ../development/python-modules/amply { }; amqp = callPackage ../development/python-modules/amqp { }; @@ -357,6 +384,8 @@ in { arabic-reshaper = callPackage ../development/python-modules/arabic-reshaper { }; + archinfo = callPackage ../development/python-modules/archinfo { }; + area = callPackage ../development/python-modules/area { }; arelle = callPackage ../development/python-modules/arelle { gui = true; }; @@ -431,6 +460,8 @@ in { async_generator = callPackage ../development/python-modules/async_generator { }; + asyncio-dgram = callPackage ../development/python-modules/asyncio-dgram { }; + asyncio-throttle = callPackage ../development/python-modules/asyncio-throttle { }; asyncpg = callPackage ../development/python-modules/asyncpg { }; @@ -445,6 +476,10 @@ in { async-upnp-client = callPackage ../development/python-modules/async-upnp-client { }; + asyncwhois = callPackage ../development/python-modules/asyncwhois { }; + + asysocks = callPackage ../development/python-modules/asysocks { }; + atlassian-python-api = callPackage ../development/python-modules/atlassian-python-api { }; atom = callPackage ../development/python-modules/atom { }; @@ -498,6 +533,8 @@ in { av = callPackage ../development/python-modules/av { inherit (pkgs) pkgconfig; }; + avea = callPackage ../development/python-modules/avea { }; + avro3k = callPackage ../development/python-modules/avro3k { }; avro = callPackage ../development/python-modules/avro { }; @@ -506,6 +543,8 @@ in { awesome-slugify = callPackage ../development/python-modules/awesome-slugify { }; + awesomeversion = callPackage ../development/python-modules/awesomeversion { }; + awkward0 = callPackage ../development/python-modules/awkward0 { }; awkward = callPackage ../development/python-modules/awkward { }; @@ -597,6 +636,8 @@ in { azure-mgmt-cosmosdb = callPackage ../development/python-modules/azure-mgmt-cosmosdb { }; + azure-mgmt-databoxedge = callPackage ../development/python-modules/azure-mgmt-databoxedge { }; + azure-mgmt-datafactory = callPackage ../development/python-modules/azure-mgmt-datafactory { }; azure-mgmt-datalake-analytics = callPackage ../development/python-modules/azure-mgmt-datalake-analytics { }; @@ -760,6 +801,8 @@ in { backports_csv = callPackage ../development/python-modules/backports_csv { }; + backports-datetime-fromisoformat = callPackage ../development/python-modules/backports-datetime-fromisoformat { }; + backports_functools_lru_cache = callPackage ../development/python-modules/backports_functools_lru_cache { }; backports_lzma = callPackage ../development/python-modules/backports_lzma { }; @@ -870,6 +913,8 @@ in { bitarray = callPackage ../development/python-modules/bitarray { }; + bitbox02 = callPackage ../development/python-modules/bitbox02 { }; + bitbucket_api = callPackage ../development/python-modules/bitbucket-api { }; bitbucket-cli = callPackage ../development/python-modules/bitbucket-cli { }; @@ -910,6 +955,8 @@ in { blivet = callPackage ../development/python-modules/blivet { }; + blockchain = callPackage ../development/python-modules/blockchain { }; + blockdiag = callPackage ../development/python-modules/blockdiag { }; blockdiagcontrib-cisco = throw "blockdiagcontrib-cisco is not compatible with blockdiag 2.0.0 and has been removed."; # Added 2020-11-29 @@ -1110,8 +1157,12 @@ in { cement = callPackage ../development/python-modules/cement { }; + connect-box = callPackage ../development/python-modules/connect_box { }; + cerberus = callPackage ../development/python-modules/cerberus { }; + cert-chain-resolver = callPackage ../development/python-modules/cert-chain-resolver { }; + certbot = callPackage ../development/python-modules/certbot { }; certbot-dns-cloudflare = callPackage ../development/python-modules/certbot-dns-cloudflare { }; @@ -1249,6 +1300,8 @@ in { cloudpickle = callPackage ../development/python-modules/cloudpickle { }; + cloudscraper = callPackage ../development/python-modules/cloudscraper { }; + clustershell = callPackage ../development/python-modules/clustershell { }; cma = callPackage ../development/python-modules/cma { }; @@ -1307,6 +1360,8 @@ in { colour = callPackage ../development/python-modules/colour { }; + commandparse = callPackage ../development/python-modules/commandparse { }; + CommonMark = callPackage ../development/python-modules/commonmark { }; compiledb = callPackage ../development/python-modules/compiledb { }; @@ -1326,6 +1381,8 @@ in { confluent-kafka = callPackage ../development/python-modules/confluent-kafka { }; + confuse = callPackage ../development/python-modules/confuse { }; + connexion = callPackage ../development/python-modules/connexion { }; consonance = callPackage ../development/python-modules/consonance { }; @@ -1356,6 +1413,8 @@ in { cornice = callPackage ../development/python-modules/cornice { }; + coronavirus = callPackage ../development/python-modules/coronavirus { }; + cot = callPackage ../development/python-modules/cot { }; covCore = callPackage ../development/python-modules/cov-core { }; @@ -1536,6 +1595,8 @@ in { dbus-python = callPackage ../development/python-modules/dbus { inherit (pkgs) dbus pkgconfig; }; + dbutils = callPackage ../development/python-modules/dbutils { }; + dcmstack = callPackage ../development/python-modules/dcmstack { }; ddt = callPackage ../development/python-modules/ddt { }; @@ -1787,6 +1848,8 @@ in { dm-sonnet = callPackage ../development/python-modules/dm-sonnet { }; + dnachisel = callPackage ../development/python-modules/dnachisel { }; + dnslib = callPackage ../development/python-modules/dnslib { }; dnspython = if isPy3k then @@ -1850,6 +1913,8 @@ in { dropbox = callPackage ../development/python-modules/dropbox { }; + ds-store = callPackage ../development/python-modules/ds-store { }; + ds4drv = callPackage ../development/python-modules/ds4drv { inherit (pkgs) fetchFromGitHub bluez; }; dtopt = callPackage ../development/python-modules/dtopt { }; @@ -2035,6 +2100,8 @@ in { fastcache = callPackage ../development/python-modules/fastcache { }; + fastdiff = callPackage ../development/python-modules/fastdiff { }; + fastdtw = callPackage ../development/python-modules/fastdtw { }; fastecdsa = callPackage ../development/python-modules/fastecdsa { }; @@ -2117,6 +2184,8 @@ in { fitbit = callPackage ../development/python-modules/fitbit { }; + fixerio = callPackage ../development/python-modules/fixerio { }; + fixtures = callPackage ../development/python-modules/fixtures { }; flake8-blind-except = callPackage ../development/python-modules/flake8-blind-except { }; @@ -2133,6 +2202,8 @@ in { flaky = callPackage ../development/python-modules/flaky { }; + flametree = callPackage ../development/python-modules/flametree { }; + flammkuchen = callPackage ../development/python-modules/flammkuchen { }; flask-admin = callPackage ../development/python-modules/flask-admin { }; @@ -2368,6 +2439,8 @@ in { genanki = callPackage ../development/python-modules/genanki { }; + genome-collector = callPackage ../development/python-modules/genome-collector { }; + genpy = callPackage ../development/python-modules/genpy { }; genshi = callPackage ../development/python-modules/genshi { }; @@ -2436,6 +2509,8 @@ in { glances = throw "glances has moved to pkgs.glances"; # added 2020-20-28 + glances-api = callPackage ../development/python-modules/glances-api { }; + glasgow = callPackage ../development/python-modules/glasgow { }; glob2 = callPackage ../development/python-modules/glob2 { }; @@ -2464,7 +2539,7 @@ in { goocalendar = callPackage ../development/python-modules/goocalendar { }; - google_api_core = callPackage ../development/python-modules/google_api_core { }; + google-api-core = callPackage ../development/python-modules/google-api-core { }; google_api_python_client = let google_api_python_client = callPackage ../development/python-modules/google-api-python-client { }; @@ -2481,9 +2556,9 @@ in { googleapis_common_protos = callPackage ../development/python-modules/googleapis_common_protos { }; - google_apputils = callPackage ../development/python-modules/google_apputils { }; + google-apputils = callPackage ../development/python-modules/google-apputils { }; - google_auth = callPackage ../development/python-modules/google_auth { }; + google-auth = callPackage ../development/python-modules/google-auth { }; google-auth-httplib2 = callPackage ../development/python-modules/google-auth-httplib2 { }; @@ -2491,79 +2566,81 @@ in { google-cloud-access-context-manager = callPackage ../development/python-modules/google-cloud-access-context-manager { }; - google_cloud_asset = callPackage ../development/python-modules/google_cloud_asset { }; + google-cloud-asset = callPackage ../development/python-modules/google-cloud-asset { }; - google_cloud_automl = callPackage ../development/python-modules/google_cloud_automl { }; + google-cloud-automl = callPackage ../development/python-modules/google-cloud-automl { }; - google_cloud_bigquery = callPackage ../development/python-modules/google_cloud_bigquery { }; + google-cloud-bigquery = callPackage ../development/python-modules/google-cloud-bigquery { }; - google_cloud_bigquery_datatransfer = callPackage ../development/python-modules/google_cloud_bigquery_datatransfer { }; + google-cloud-bigquery-datatransfer = callPackage ../development/python-modules/google-cloud-bigquery-datatransfer { }; - google_cloud_bigtable = callPackage ../development/python-modules/google_cloud_bigtable { }; + google-cloud-bigtable = callPackage ../development/python-modules/google-cloud-bigtable { }; - google_cloud_container = callPackage ../development/python-modules/google_cloud_container { }; + google-cloud-container = callPackage ../development/python-modules/google-cloud-container { }; - google_cloud_core = callPackage ../development/python-modules/google_cloud_core { }; + google-cloud-core = callPackage ../development/python-modules/google-cloud-core { }; - google_cloud_dataproc = callPackage ../development/python-modules/google_cloud_dataproc { }; + google-cloud-dataproc = callPackage ../development/python-modules/google-cloud-dataproc { }; - google_cloud_datastore = callPackage ../development/python-modules/google_cloud_datastore { }; + google-cloud-datastore = callPackage ../development/python-modules/google-cloud-datastore { }; - google_cloud_dlp = callPackage ../development/python-modules/google_cloud_dlp { }; + google-cloud-dlp = callPackage ../development/python-modules/google-cloud-dlp { }; - google_cloud_dns = callPackage ../development/python-modules/google_cloud_dns { }; + google-cloud-dns = callPackage ../development/python-modules/google-cloud-dns { }; - google_cloud_error_reporting = callPackage ../development/python-modules/google_cloud_error_reporting { }; + google-cloud-error-reporting = callPackage ../development/python-modules/google-cloud-error-reporting { }; - google_cloud_firestore = callPackage ../development/python-modules/google_cloud_firestore { }; + google-cloud-firestore = callPackage ../development/python-modules/google-cloud-firestore { }; google-cloud-iam = callPackage ../development/python-modules/google-cloud-iam { }; - google_cloud_iot = callPackage ../development/python-modules/google_cloud_iot { }; + google-cloud-iot = callPackage ../development/python-modules/google-cloud-iot { }; - google_cloud_kms = callPackage ../development/python-modules/google_cloud_kms { }; + google-cloud-kms = callPackage ../development/python-modules/google-cloud-kms { }; - google_cloud_language = callPackage ../development/python-modules/google_cloud_language { }; + google-cloud-language = callPackage ../development/python-modules/google-cloud-language { }; - google_cloud_logging = callPackage ../development/python-modules/google_cloud_logging { }; + google-cloud-logging = callPackage ../development/python-modules/google-cloud-logging { }; - google_cloud_monitoring = callPackage ../development/python-modules/google_cloud_monitoring { }; + google-cloud-monitoring = callPackage ../development/python-modules/google-cloud-monitoring { }; google-cloud-org-policy = callPackage ../development/python-modules/google-cloud-org-policy { }; - google_cloud_pubsub = callPackage ../development/python-modules/google_cloud_pubsub { }; + google-cloud-os-config = callPackage ../development/python-modules/google-cloud-os-config { }; - google_cloud_redis = callPackage ../development/python-modules/google_cloud_redis { }; + google-cloud-pubsub = callPackage ../development/python-modules/google-cloud-pubsub { }; - google_cloud_resource_manager = callPackage ../development/python-modules/google_cloud_resource_manager { }; + google-cloud-redis = callPackage ../development/python-modules/google-cloud-redis { }; - google_cloud_runtimeconfig = callPackage ../development/python-modules/google_cloud_runtimeconfig { }; + google-cloud-resource-manager = callPackage ../development/python-modules/google-cloud-resource-manager { }; - google_cloud_secret_manager = callPackage ../development/python-modules/google_cloud_secret_manager { }; + google-cloud-runtimeconfig = callPackage ../development/python-modules/google-cloud-runtimeconfig { }; - google_cloud_securitycenter = callPackage ../development/python-modules/google_cloud_securitycenter { }; + google-cloud-secret-manager = callPackage ../development/python-modules/google-cloud-secret-manager { }; - google_cloud_spanner = callPackage ../development/python-modules/google_cloud_spanner { }; + google-cloud-securitycenter = callPackage ../development/python-modules/google-cloud-securitycenter { }; - google_cloud_speech = callPackage ../development/python-modules/google_cloud_speech { }; + google-cloud-spanner = callPackage ../development/python-modules/google-cloud-spanner { }; - google_cloud_storage = callPackage ../development/python-modules/google_cloud_storage { }; + google-cloud-speech = callPackage ../development/python-modules/google-cloud-speech { }; - google_cloud_tasks = callPackage ../development/python-modules/google_cloud_tasks { }; + google-cloud-storage = callPackage ../development/python-modules/google-cloud-storage { }; - google_cloud_testutils = callPackage ../development/python-modules/google_cloud_testutils { }; + google-cloud-tasks = callPackage ../development/python-modules/google-cloud-tasks { }; - google_cloud_texttospeech = callPackage ../development/python-modules/google_cloud_texttospeech { }; + google-cloud-testutils = callPackage ../development/python-modules/google-cloud-testutils { }; - google_cloud_trace = callPackage ../development/python-modules/google_cloud_trace { }; + google-cloud-texttospeech = callPackage ../development/python-modules/google-cloud-texttospeech { }; - google_cloud_translate = callPackage ../development/python-modules/google_cloud_translate { }; + google-cloud-trace = callPackage ../development/python-modules/google-cloud-trace { }; - google_cloud_videointelligence = callPackage ../development/python-modules/google_cloud_videointelligence { }; + google-cloud-translate = callPackage ../development/python-modules/google-cloud-translate { }; - google_cloud_vision = callPackage ../development/python-modules/google_cloud_vision { }; + google-cloud-videointelligence = callPackage ../development/python-modules/google-cloud-videointelligence { }; - google_cloud_websecurityscanner = callPackage ../development/python-modules/google_cloud_websecurityscanner { }; + google-cloud-vision = callPackage ../development/python-modules/google-cloud-vision { }; + + google-cloud-websecurityscanner = callPackage ../development/python-modules/google-cloud-websecurityscanner { }; google-compute-engine = callPackage ../tools/virtualization/google-compute-engine { }; @@ -2583,7 +2660,7 @@ in { google-pasta = callPackage ../development/python-modules/google-pasta { }; - google_resumable_media = callPackage ../development/python-modules/google_resumable_media { }; + google-resumable-media = callPackage ../development/python-modules/google-resumable-media { }; googletrans = callPackage ../development/python-modules/googletrans { }; @@ -2625,8 +2702,12 @@ in { graph_nets = callPackage ../development/python-modules/graph_nets { }; + graphene = callPackage ../development/python-modules/graphene { }; + graphql-core = callPackage ../development/python-modules/graphql-core { }; + graphql-relay = callPackage ../development/python-modules/graphql-relay { }; + graphql-server-core = callPackage ../development/python-modules/graphql-server-core { }; graph-tool = callPackage ../development/python-modules/graph-tool/2.x.x.nix { inherit (pkgs) pkg-config; }; @@ -2700,6 +2781,8 @@ in { guzzle_sphinx_theme = callPackage ../development/python-modules/guzzle_sphinx_theme { }; + gviz-api = callPackage ../development/python-modules/gviz-api {}; + gwyddion = disabledIf isPy3k (toPythonModule (pkgs.gwyddion.override { pythonSupport = true; pythonPackages = self; @@ -2785,6 +2868,8 @@ in { hocr-tools = callPackage ../development/python-modules/hocr-tools { }; + hole = callPackage ../development/python-modules/hole { }; + holidays = callPackage ../development/python-modules/holidays { }; holoviews = callPackage ../development/python-modules/holoviews { }; @@ -2820,8 +2905,6 @@ in { html-sanitizer = callPackage ../development/python-modules/html-sanitizer { }; - htmltreediff = callPackage ../development/python-modules/htmltreediff { }; - HTSeq = callPackage ../development/python-modules/HTSeq { }; httmock = callPackage ../development/python-modules/httmock { }; @@ -2873,6 +2956,8 @@ in { hydra-check = callPackage ../development/python-modules/hydra-check { }; + hydrawiser = callPackage ../development/python-modules/hydrawiser { }; + hypchat = callPackage ../development/python-modules/hypchat { }; hyperframe = callPackage ../development/python-modules/hyperframe { }; @@ -2906,6 +2991,8 @@ in { icecream = callPackage ../development/python-modules/icecream { }; + icmplib = callPackage ../development/python-modules/icmplib { }; + ics = callPackage ../development/python-modules/ics { }; identify = callPackage ../development/python-modules/identify { }; @@ -3160,6 +3247,10 @@ in { joblib = callPackage ../development/python-modules/joblib { }; + johnnycanencrypt = callPackage ../development/python-modules/johnnycanencrypt { + inherit (pkgs.darwin.apple_sdk.frameworks) PCSC; + }; + josepy = callPackage ../development/python-modules/josepy { }; journalwatch = callPackage ../tools/system/journalwatch { inherit (self) systemd pytest; }; @@ -3186,6 +3277,8 @@ in { json-merge-patch = callPackage ../development/python-modules/json-merge-patch { }; + json-schema-for-humans = callPackage ../development/python-modules/json-schema-for-humans { }; + jsonnet = buildPythonPackage { inherit (pkgs.jsonnet) name src; }; jsonpatch = callPackage ../development/python-modules/jsonpatch { }; @@ -3381,9 +3474,13 @@ in { lazy-object-proxy = callPackage ../development/python-modules/lazy-object-proxy { }; + ldap = callPackage ../development/python-modules/ldap { + inherit (pkgs) openldap cyrus_sasl; + }; + ldap3 = callPackage ../development/python-modules/ldap3 { }; - ldap = callPackage ../development/python-modules/ldap { inherit (pkgs) openldap cyrus_sasl; }; + ldapdomaindump = callPackage ../development/python-modules/ldapdomaindump { }; ldappool = callPackage ../development/python-modules/ldappool { }; @@ -3572,6 +3669,8 @@ in { linuxfd = callPackage ../development/python-modules/linuxfd { }; + liquidctl = callPackage ../development/python-modules/liquidctl { }; + lirc = disabledIf isPy27 (toPythonModule (pkgs.lirc.override { python3 = python; })); littleutils = callPackage ../development/python-modules/littleutils { }; @@ -3592,7 +3691,9 @@ in { llvm = pkgs.llvm_9; }; # llvmlite always requires a specific version of llvm. - lmdb = callPackage ../development/python-modules/lmdb { }; + lmdb = callPackage ../development/python-modules/lmdb { + inherit (pkgs) lmdb; + }; lml = callPackage ../development/python-modules/lml { }; @@ -3630,6 +3731,8 @@ in { lsi = callPackage ../development/python-modules/lsi { }; + lsassy = callPackage ../development/python-modules/lsassy { }; + ludios_wpull = callPackage ../development/python-modules/ludios_wpull { }; luftdaten = callPackage ../development/python-modules/luftdaten { }; @@ -3713,6 +3816,8 @@ in { manuel = callPackage ../development/python-modules/manuel { }; + manticore = callPackage ../development/python-modules/manticore { inherit (pkgs) z3; }; + mapbox = callPackage ../development/python-modules/mapbox { }; mapsplotlib = callPackage ../development/python-modules/mapsplotlib { }; @@ -3798,6 +3903,8 @@ in { mechanize = callPackage ../development/python-modules/mechanize { }; + mediafile = callPackage ../development/python-modules/mediafile { }; + meinheld = callPackage ../development/python-modules/meinheld { }; meld3 = callPackage ../development/python-modules/meld3 { }; @@ -3841,6 +3948,10 @@ in { minidb = callPackage ../development/python-modules/minidb { }; + minidump = callPackage ../development/python-modules/minidump { }; + + minikerberos = callPackage ../development/python-modules/minikerberos { }; + minimock = callPackage ../development/python-modules/minimock { }; mininet-python = (toPythonModule (pkgs.mininet.override { inherit python; })).py; @@ -3987,6 +4098,8 @@ in { msgpack-numpy = callPackage ../development/python-modules/msgpack-numpy { }; + msldap = callPackage ../development/python-modules/msldap { }; + mss = callPackage ../development/python-modules/mss { }; msrestazure = callPackage ../development/python-modules/msrestazure { }; @@ -3997,6 +4110,8 @@ in { mt-940 = callPackage ../development/python-modules/mt-940 { }; + mulpyplexer = callPackage ../development/python-modules/mulpyplexer { }; + multidict = callPackage ../development/python-modules/multidict { }; multi_key_dict = callPackage ../development/python-modules/multi_key_dict { }; @@ -4119,6 +4234,8 @@ in { netcdf4 = callPackage ../development/python-modules/netcdf4 { }; + netdata = callPackage ../development/python-modules/netdata { }; + netdisco = callPackage ../development/python-modules/netdisco { }; netifaces = callPackage ../development/python-modules/netifaces { }; @@ -4193,6 +4310,8 @@ in { noise = callPackage ../development/python-modules/noise { }; + noiseprotocol = callPackage ../development/python-modules/noiseprotocol { }; + nose2 = callPackage ../development/python-modules/nose2 { }; nose = callPackage ../development/python-modules/nose { }; @@ -4353,6 +4472,8 @@ in { openrouteservice = callPackage ../development/python-modules/openrouteservice/default.nix { }; + opensensemap-api = callPackage ../development/python-modules/opensensemap-api { }; + opentimestamps = callPackage ../development/python-modules/opentimestamps { }; opentracing = callPackage ../development/python-modules/opentracing { }; @@ -4671,7 +4792,7 @@ in { inherit (pkgs.libsForQt5) soqt; }; - pkgconfig = callPackage ../development/python-modules/pkgconfig { inherit (pkgs) pkgconfig; }; + pkgconfig = callPackage ../development/python-modules/pkgconfig { inherit (pkgs) pkg-config; }; pkginfo = callPackage ../development/python-modules/pkginfo { }; @@ -4679,10 +4800,14 @@ in { pysbd = callPackage ../development/python-modules/pysbd { }; + python-codon-tables = callPackage ../development/python-modules/python-codon-tables { }; + python-csxcad = callPackage ../development/python-modules/python-csxcad { }; python-openems = callPackage ../development/python-modules/python-openems { }; + python-prjxray = callPackage ../development/python-modules/python-prjxray { }; + python-tado = callPackage ../development/python-modules/python-tado { }; pkutils = callPackage ../development/python-modules/pkutils { }; @@ -4747,6 +4872,8 @@ in { pooch = callPackage ../development/python-modules/pooch { }; + poolsense = callPackage ../development/python-modules/poolsense { }; + poppler-qt5 = callPackage ../development/python-modules/poppler-qt5 { inherit (pkgs.qt5) qtbase; inherit (pkgs.libsForQt5) poppler; @@ -4815,6 +4942,8 @@ in { else callPackage ../development/python-modules/prettytable/1.nix { }; + primer3 = callPackage ../development/python-modules/primer3 { }; + priority = callPackage ../development/python-modules/priority { }; prison = callPackage ../development/python-modules/prison { }; @@ -4954,6 +5083,8 @@ in { pyannotate = callPackage ../development/python-modules/pyannotate { }; + pyarlo = callPackage ../development/python-modules/pyarlo { }; + pyarrow = callPackage ../development/python-modules/pyarrow { inherit (pkgs) arrow-cpp cmake pkgconfig; }; pyasn1 = callPackage ../development/python-modules/pyasn1 { }; @@ -5083,6 +5214,8 @@ in { pydenticon = callPackage ../development/python-modules/pydenticon { }; + pydexcom = callPackage ../development/python-modules/pydexcom { }; + pydicom = callPackage ../development/python-modules/pydicom { }; pydispatcher = callPackage ../development/python-modules/pydispatcher { }; @@ -5125,6 +5258,8 @@ in { pyerfa = callPackage ../development/python-modules/pyerfa { }; + pyevmasm = callPackage ../development/python-modules/pyevmasm { }; + pyexcel = callPackage ../development/python-modules/pyexcel { }; pyexcelerator = callPackage ../development/python-modules/pyexcelerator { }; @@ -5151,8 +5286,12 @@ in { pyfftw = callPackage ../development/python-modules/pyfftw { }; + pyfido = callPackage ../development/python-modules/pyfido { }; + pyfiglet = callPackage ../development/python-modules/pyfiglet { }; + pyfnip = callPackage ../development/python-modules/pyfnip { }; + pyflakes = callPackage ../development/python-modules/pyflakes { }; pyfma = callPackage ../development/python-modules/pyfma { }; @@ -5255,6 +5394,8 @@ in { pyhs100 = callPackage ../development/python-modules/pyhs100 { }; + pyi2cflash = callPackage ../development/python-modules/pyi2cflash { }; + pyicloud = callPackage ../development/python-modules/pyicloud { }; PyICU = callPackage ../development/python-modules/pyicu { }; @@ -5263,8 +5404,12 @@ in { pyinputevent = callPackage ../development/python-modules/pyinputevent { }; + pyinsteon = callPackage ../development/python-modules/pyinsteon { }; + pyipp = callPackage ../development/python-modules/pyipp { }; + pyiqvia = callPackage ../development/python-modules/pyiqvia { }; + pyjet = callPackage ../development/python-modules/pyjet { }; pyjks = callPackage ../development/python-modules/pyjks { }; @@ -5285,10 +5430,14 @@ in { pykickstart = callPackage ../development/python-modules/pykickstart { }; + pykira = callPackage ../development/python-modules/pykira { }; + pykka = callPackage ../development/python-modules/pykka { }; pykwalify = callPackage ../development/python-modules/pykwalify { }; + pylacrosse = callPackage ../development/python-modules/pylacrosse { }; + pylama = callPackage ../development/python-modules/pylama { }; pylast = callPackage ../development/python-modules/pylast { }; @@ -5337,8 +5486,12 @@ in { pyls-mypy = callPackage ../development/python-modules/pyls-mypy { }; + pyls-spyder = callPackage ../development/python-modules/pyls-spyder { }; + PyLTI = callPackage ../development/python-modules/pylti { }; + pylutron = callPackage ../development/python-modules/pylutron { }; + pymacaroons = callPackage ../development/python-modules/pymacaroons { }; pymaging = callPackage ../development/python-modules/pymaging { }; @@ -5367,6 +5520,8 @@ in { pymetno = callPackage ../development/python-modules/pymetno { }; + pymodbus = callPackage ../development/python-modules/pymodbus { }; + pymongo = callPackage ../development/python-modules/pymongo { }; pympler = callPackage ../development/python-modules/pympler { }; @@ -5385,6 +5540,8 @@ in { PyMVGLive = callPackage ../development/python-modules/pymvglive { }; + pymyq = callPackage ../development/python-modules/pymyq { }; + pymysql = callPackage ../development/python-modules/pymysql { }; pymysqlsa = callPackage ../development/python-modules/pymysqlsa { }; @@ -5440,8 +5597,12 @@ in { pyopengl = callPackage ../development/python-modules/pyopengl { }; + pyopengl-accelerate = callPackage ../development/python-modules/pyopengl-accelerate { }; + pyopenssl = callPackage ../development/python-modules/pyopenssl { }; + pyopnsense = callPackage ../development/python-modules/pyopnsense { }; + pyosf = callPackage ../development/python-modules/pyosf { }; pyosmium = callPackage ../development/python-modules/pyosmium { }; @@ -5469,6 +5630,8 @@ in { pypcap = callPackage ../development/python-modules/pypcap { }; + pypck = callPackage ../development/python-modules/pypck { }; + pypdf2 = callPackage ../development/python-modules/pypdf2 { }; pyPdf = callPackage ../development/python-modules/pypdf { }; @@ -5503,6 +5666,8 @@ in { pypugjs = callPackage ../development/python-modules/pypugjs { }; + pypykatz = callPackage ../development/python-modules/pypykatz { }; + pyqrcode = callPackage ../development/python-modules/pyqrcode { }; pyqt4 = callPackage ../development/python-modules/pyqt/4.x.nix { inherit (pkgs) pkgconfig; }; @@ -5676,6 +5841,8 @@ in { pyspice = callPackage ../development/python-modules/pyspice { }; + pyspiflash = callPackage ../development/python-modules/pyspiflash { }; + pyspinel = callPackage ../development/python-modules/pyspinel { }; pyspotify = callPackage ../development/python-modules/pyspotify { }; @@ -5684,6 +5851,10 @@ in { pysptk = callPackage ../development/python-modules/pysptk { }; + pysqlcipher3 = callPackage ../development/python-modules/pysqlcipher3 { + inherit (pkgs) sqlcipher; + }; + pysqlite = callPackage ../development/python-modules/pysqlite { }; pysqueezebox = callPackage ../development/python-modules/pysqueezebox { }; @@ -5762,6 +5933,7 @@ in { pytest-black = callPackage ../development/python-modules/pytest-black { }; + pytest-cache = self.pytestcache; # added 2021-01-04 pytestcache = callPackage ../development/python-modules/pytestcache { }; pytest-catchlog = callPackage ../development/python-modules/pytest-catchlog { }; @@ -5772,6 +5944,7 @@ in { pytest-click = callPackage ../development/python-modules/pytest-click { }; + pytest-cov = self.pytestcov; # self 2021-01-04 pytestcov = callPackage ../development/python-modules/pytest-cov { }; pytest-cram = callPackage ../development/python-modules/pytest-cram { }; @@ -5808,8 +5981,6 @@ in { pytest-helpers-namespace = callPackage ../development/python-modules/pytest-helpers-namespace { }; - pyopengl-accelerate = callPackage ../development/python-modules/pyopengl-accelerate { }; - pytest-html = callPackage ../development/python-modules/pytest-html { }; pytest-httpbin = callPackage ../development/python-modules/pytest-httpbin { }; @@ -5837,6 +6008,7 @@ in { pytest-pep257 = callPackage ../development/python-modules/pytest-pep257 { }; + pytest-pep8 = self.pytestpep8; # added 2021-01-04 pytestpep8 = throw "pytestpep8 was removed because it is abandoned and no longer compatible with pytest v6.0"; # added 2020-12-10 pytest-pylint = callPackage ../development/python-modules/pytest-pylint { }; @@ -5845,6 +6017,7 @@ in { pytest-qt = callPackage ../development/python-modules/pytest-qt { }; + pytest-quickcheck = self.pytestquickcheck; pytestquickcheck = callPackage ../development/python-modules/pytest-quickcheck { }; pytest-raisesregexp = callPackage ../development/python-modules/pytest-raisesregexp { }; @@ -5861,6 +6034,7 @@ in { pytest-rerunfailures = callPackage ../development/python-modules/pytest-rerunfailures { }; + pytest-runner = self.pytestrunner; # added 2021-01-04 pytestrunner = callPackage ../development/python-modules/pytestrunner { }; pytest-sanic = callPackage ../development/python-modules/pytest-sanic { }; @@ -5869,6 +6043,8 @@ in { pytest-services = callPackage ../development/python-modules/pytest-services { }; + pytest-snapshot = callPackage ../development/python-modules/pytest-snapshot { }; + pytest-shutil = callPackage ../development/python-modules/pytest-shutil { }; pytest-socket = callPackage ../development/python-modules/pytest-socket { }; @@ -5897,6 +6073,7 @@ in { pytest-watch = callPackage ../development/python-modules/pytest-watch { }; + pytest-xdist = self.pytest_xdist; # added 2021-01-04 pytest_xdist = if isPy27 then callPackage ../development/python-modules/pytest-xdist/1.nix { } else @@ -5973,7 +6150,10 @@ in { pythonIRClib = callPackage ../development/python-modules/pythonirclib { }; - pythonix = callPackage ../development/python-modules/pythonix { inherit (pkgs) meson pkgconfig; }; + pythonix = callPackage ../development/python-modules/pythonix { + inherit (pkgs) pkg-config; + meson = pkgs.meson.override { python3 = self.python; }; + }; python-jenkins = callPackage ../development/python-modules/python-jenkins { }; @@ -6019,6 +6199,8 @@ in { python-multipart = callPackage ../development/python-modules/python-multipart { }; + python-mystrom = callPackage ../development/python-modules/python-mystrom { }; + python-nest = callPackage ../development/python-modules/python-nest { }; pythonnet = callPackage @@ -6038,6 +6220,8 @@ in { python-olm = callPackage ../development/python-modules/python-olm { }; + python-opendata-transport = callPackage ../development/python-modules/python-opendata-transport { }; + python_openzwave = callPackage ../development/python-modules/python_openzwave { inherit (pkgs) pkgconfig; }; python-otr = callPackage ../development/python-modules/python-otr { }; @@ -6107,10 +6291,16 @@ in { python-vlc = callPackage ../development/python-modules/python-vlc { }; + python-whois = callPackage ../development/python-modules/python-whois { }; + python-wifi = callPackage ../development/python-modules/python-wifi { }; python-xmp-toolkit = callPackage ../development/python-modules/python-xmp-toolkit { }; + pyeverlights = callPackage ../development/python-modules/pyeverlights { }; + + pytile = callPackage ../development/python-modules/pytile { }; + pytimeparse = callPackage ../development/python-modules/pytimeparse { }; pytmx = callPackage ../development/python-modules/pytmx { }; @@ -6178,6 +6368,8 @@ in { pyvcf = callPackage ../development/python-modules/pyvcf { }; + pyvera = callPackage ../development/python-modules/pyvera { }; + pyviz-comms = callPackage ../development/python-modules/pyviz-comms { }; pyvips = callPackage ../development/python-modules/pyvips { @@ -6205,8 +6397,12 @@ in { pywick = callPackage ../development/python-modules/pywick { }; + pywilight = callPackage ../development/python-modules/pywilight { }; + pywinrm = callPackage ../development/python-modules/pywinrm { }; + pywizlight = callPackage ../development/python-modules/pywizlight { }; + pyxattr = let pyxattr' = callPackage ../development/python-modules/pyxattr { }; pyxattr_2 = pyxattr'.overridePythonAttrs (oldAttrs: rec { @@ -6222,6 +6418,8 @@ in { pyxdg = callPackage ../development/python-modules/pyxdg { }; + pyxeoma = callPackage ../development/python-modules/pyxeoma { }; + pyxl3 = callPackage ../development/python-modules/pyxl3 { }; pyxml = disabledIf isPy3k (callPackage ../development/python-modules/pyxml { }); @@ -6238,6 +6436,8 @@ in { qdarkstyle = callPackage ../development/python-modules/qdarkstyle { }; + qdldl = callPackage ../development/python-modules/qdldl { }; + qds_sdk = callPackage ../development/python-modules/qds_sdk { }; qimage2ndarray = callPackage ../development/python-modules/qimage2ndarray { }; @@ -6345,6 +6545,8 @@ in { reedsolo = callPackage ../development/python-modules/reedsolo { }; + reflink = callPackage ../development/python-modules/reflink { }; + regex = callPackage ../development/python-modules/regex { }; regional = callPackage ../development/python-modules/regional { }; @@ -6600,6 +6802,8 @@ in { schema = callPackage ../development/python-modules/schema { }; + schiene = callPackage ../development/python-modules/schiene { }; + scikit-bio = callPackage ../development/python-modules/scikit-bio { }; scikit-build = callPackage ../development/python-modules/scikit-build { }; @@ -6746,6 +6950,7 @@ in { setuptools-rust = callPackage ../development/python-modules/setuptools-rust { }; + setuptools-scm = self.setuptools_scm; # added 2021-01-04 setuptools_scm = callPackage ../development/python-modules/setuptools_scm { }; setuptools-scm-git-archive = callPackage ../development/python-modules/setuptools-scm-git-archive { }; @@ -6883,6 +7088,8 @@ in { snapperGUI = callPackage ../development/python-modules/snappergui { }; + snapshottest = callPackage ../development/python-modules/snapshottest { }; + sniffio = callPackage ../development/python-modules/sniffio { }; snitun = callPackage ../development/python-modules/snitun { }; @@ -7092,7 +7299,9 @@ in { stack-data = callPackage ../development/python-modules/stack-data { }; - starlette = callPackage ../development/python-modules/starlette { }; + starlette = callPackage ../development/python-modules/starlette { + inherit (pkgs.darwin.apple_sdk.frameworks) ApplicationServices; + }; staticjinja = callPackage ../development/python-modules/staticjinja { }; @@ -7102,6 +7311,8 @@ in { statsmodels = callPackage ../development/python-modules/statsmodels { }; + stdiomask = callPackage ../development/python-modules/stdiomask { }; + stem = callPackage ../development/python-modules/stem { }; stevedore = callPackage ../development/python-modules/stevedore { }; @@ -7140,6 +7351,8 @@ in { stytra = callPackage ../development/python-modules/stytra { }; + subarulink = callPackage ../development/python-modules/subarulink { }; + subdownloader = callPackage ../development/python-modules/subdownloader { }; subliminal = callPackage ../development/python-modules/subliminal { }; @@ -7184,6 +7397,8 @@ in { sybil = callPackage ../development/python-modules/sybil { }; + symbiflow-fasm = callPackage ../development/python-modules/symbiflow-fasm { }; + symengine = callPackage ../development/python-modules/symengine { symengine = pkgs.symengine; }; sympy = if isPy3k then @@ -7236,64 +7451,46 @@ in { tenacity = callPackage ../development/python-modules/tenacity { }; + tensorboard-plugin-profile = callPackage ../development/python-modules/tensorboard-plugin-profile { }; + + tensorboard-plugin-wit = callPackage ../development/python-modules/tensorboard-plugin-wit {}; + tensorboardx = callPackage ../development/python-modules/tensorboardx { }; - tensorflow-bin_1 = callPackage ../development/python-modules/tensorflow/1/bin.nix { + tensorflow-bin_2 = callPackage ../development/python-modules/tensorflow/bin.nix { cudaSupport = pkgs.config.cudaSupport or false; inherit (pkgs.linuxPackages) nvidia_x11; - cudatoolkit = pkgs.cudatoolkit_10; - cudnn = pkgs.cudnn_cudatoolkit_10; + cudatoolkit = pkgs.cudatoolkit_11_0; + cudnn = pkgs.cudnn_cudatoolkit_11_0; }; - 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; - }; + tensorflow-bin = self.tensorflow-bin_2; - tensorflow-bin = self.tensorflow-bin_1; - - tensorflow-build_1 = callPackage ../development/python-modules/tensorflow/1 { + tensorflow-build_2 = callPackage ../development/python-modules/tensorflow { 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; - inherit (pkgs) flatbuffers; - }; - - tensorflow-build_2 = callPackage ../development/python-modules/tensorflow/2 { - cudaSupport = pkgs.config.cudaSupport or false; - cudatoolkit = pkgs.cudatoolkit_11; - cudnn = pkgs.cudnn_cudatoolkit_11; + cudatoolkit = pkgs.cudatoolkit_11_0; + cudnn = pkgs.cudnn_cudatoolkit_11_0; nccl = pkgs.nccl_cudatoolkit_11; - openssl = pkgs.openssl_1_1; inherit (pkgs.darwin.apple_sdk.frameworks) Foundation Security; - inherit (pkgs) flatbuffers; + flatbuffers-core = pkgs.flatbuffers; + flatbuffers-python = self.flatbuffers; + lmdb-core = pkgs.lmdb; }; - tensorflow-build = self.tensorflow-build_1; + tensorflow-build = self.tensorflow-build_2; - tensorflow-estimator_1 = callPackage ../development/python-modules/tensorflow-estimator/1 { }; + tensorflow-estimator_2 = callPackage ../development/python-modules/tensorflow-estimator { }; - tensorflow-estimator_2 = callPackage ../development/python-modules/tensorflow-estimator/2 { }; - - tensorflow-estimator = self.tensorflow-estimator_1; + tensorflow-estimator = self.tensorflow-estimator_2; tensorflow-probability = callPackage ../development/python-modules/tensorflow-probability { }; - tensorflow = self.tensorflow_1; - tensorflow_1 = self.tensorflow-build_1; + tensorflow = self.tensorflow_2; tensorflow_2 = self.tensorflow-build_2; - tensorflow-tensorboard_1 = callPackage ../development/python-modules/tensorflow-tensorboard/1 { }; + tensorflow-tensorboard_2 = callPackage ../development/python-modules/tensorflow-tensorboard { }; - tensorflow-tensorboard_2 = callPackage ../development/python-modules/tensorflow-tensorboard/2 { }; - - tensorflow-tensorboard = self.tensorflow-tensorboard_1; + tensorflow-tensorboard = self.tensorflow-tensorboard_2; tensorflowWithCuda = self.tensorflow.override { cudaSupport = true; }; @@ -7309,6 +7506,8 @@ in { termstyle = callPackage ../development/python-modules/termstyle { }; + teslajsonpy = callPackage ../development/python-modules/teslajsonpy { }; + tess = callPackage ../development/python-modules/tess { }; tesserocr = callPackage ../development/python-modules/tesserocr { }; @@ -7317,6 +7516,8 @@ in { textfsm = callPackage ../development/python-modules/textfsm { }; + textx = callPackage ../development/python-modules/textx { }; + testpath = callPackage ../development/python-modules/testpath { }; testrepository = callPackage ../development/python-modules/testrepository { }; @@ -7363,6 +7564,8 @@ in { threadpoolctl = callPackage ../development/python-modules/threadpoolctl { }; + three-merge = callPackage ../development/python-modules/three-merge { }; + thrift = callPackage ../development/python-modules/thrift { }; thumbor = callPackage ../development/python-modules/thumbor { }; @@ -7411,6 +7614,8 @@ in { tls-parser = callPackage ../development/python-modules/tls-parser { }; + tmb = callPackage ../development/python-modules/tmb { }; + tmdb3 = callPackage ../development/python-modules/tmdb3 { }; todoist = callPackage ../development/python-modules/todoist { }; @@ -7514,6 +7719,8 @@ in { tubeup = callPackage ../development/python-modules/tubeup { }; + tumpa = callPackage ../development/python-modules/tumpa { }; + tvdb_api = callPackage ../development/python-modules/tvdb_api { }; tvnamer = callPackage ../development/python-modules/tvnamer { }; @@ -7626,6 +7833,8 @@ in { unifi = callPackage ../development/python-modules/unifi { }; + unifiled = callPackage ../development/python-modules/unifiled { }; + units = callPackage ../development/python-modules/units { }; unittest2 = callPackage ../development/python-modules/unittest2 { }; @@ -7728,6 +7937,8 @@ in { vidstab = callPackage ../development/python-modules/vidstab { }; + ViennaRNA = toPythonModule pkgs.ViennaRNA; + viewstate = callPackage ../development/python-modules/viewstate { }; vine = callPackage ../development/python-modules/vine { }; @@ -7752,6 +7963,8 @@ in { vobject = callPackage ../development/python-modules/vobject { }; + volkszaehler = callPackage ../development/python-modules/volkszaehler { }; + voluptuous = callPackage ../development/python-modules/voluptuous { }; voluptuous-serialize = callPackage ../development/python-modules/voluptuous-serialize { }; @@ -7782,6 +7995,8 @@ in { vxi11 = callPackage ../development/python-modules/vxi11 { }; + vyper = callPackage ../development/compilers/vyper { }; + w3lib = callPackage ../development/python-modules/w3lib { }; wadllib = callPackage ../development/python-modules/wadllib { }; @@ -7800,6 +8015,10 @@ in { wasabi = callPackage ../development/python-modules/wasabi { }; + wasm = callPackage ../development/python-modules/wasm { }; + + wasmer = callPackage ../development/python-modules/wasmer { }; + watchdog = callPackage ../development/python-modules/watchdog { }; WazeRouteCalculator = callPackage ../development/python-modules/WazeRouteCalculator { }; @@ -7836,6 +8055,8 @@ in { webtest = callPackage ../development/python-modules/webtest { }; + webthing = callPackage ../development/python-modules/webthing { }; + werkzeug = callPackage ../development/python-modules/werkzeug { }; west = callPackage ../development/python-modules/west { }; @@ -7852,12 +8073,18 @@ in { whitenoise = callPackage ../development/python-modules/whitenoise { }; + whois = callPackage ../development/python-modules/whois { }; + whoosh = callPackage ../development/python-modules/whoosh { }; widgetsnbextension = callPackage ../development/python-modules/widgetsnbextension { }; willow = callPackage ../development/python-modules/willow { }; + winacl = callPackage ../development/python-modules/winacl { }; + + winsspi = callPackage ../development/python-modules/winsspi { }; + wled = callPackage ../development/python-modules/wled { }; word2vec = callPackage ../development/python-modules/word2vec { }; @@ -7937,6 +8164,8 @@ in { xattr = callPackage ../development/python-modules/xattr { }; + xc-fasm = callPackage ../development/python-modules/xc-fasm { }; + xcaplib = callPackage ../development/python-modules/xcaplib { }; xcffib = callPackage ../development/python-modules/xcffib { }; @@ -7955,6 +8184,8 @@ in { xkcdpass = callPackage ../development/python-modules/xkcdpass { }; + xknx = callPackage ../development/python-modules/xknx { }; + xlib = callPackage ../development/python-modules/xlib { }; xlrd = callPackage ../development/python-modules/xlrd { }; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index cacc77fea30d..5fc6e91b3118 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -173,13 +173,8 @@ let in { # Lightweight distribution and test inherit (bootstrap) dist test; - # Test a full stdenv bootstrap from the bootstrap tools definition - # Temporarily disabled. The darwin bootstrap is transitioning the - # structure of bootstrap tools. The tools that are generated as - # part of the current package set cannot be unpacked in the same - # way as the tools used by the current package set. - # inherit (bootstrap.test-pkgs) stdenv; + inherit (bootstrap.test-pkgs) stdenv; }; }; diff --git a/pkgs/top-level/static.nix b/pkgs/top-level/static.nix index 6720a019cbce..b3fe7bf8c94f 100644 --- a/pkgs/top-level/static.nix +++ b/pkgs/top-level/static.nix @@ -50,15 +50,6 @@ self: super: let # ++ optional (super.stdenv.hostPlatform.libc == "glibc") ((flip overrideInStdenv) [ self.stdenv.glibc.static ]) ; - # Force everything to link statically. - haskellStaticAdapter = self: super: { - mkDerivation = attrs: super.mkDerivation (attrs // { - enableSharedLibraries = false; - enableSharedExecutables = false; - enableStaticLibraries = true; - }); - }; - removeUnknownConfigureFlags = f: with self.lib; remove "--disable-shared" (remove "--enable-static" f); @@ -102,223 +93,27 @@ in { clangStdenv = foldl (flip id) super.clangStdenv staticAdapters; libcxxStdenv = foldl (flip id) super.libcxxStdenv staticAdapters; - haskell = super.haskell // { - packageOverrides = composeExtensions - (super.haskell.packageOverrides or (_: _: {})) - haskellStaticAdapter; - }; - - nghttp2 = super.nghttp2.override { - enableApp = false; - }; - - ncurses = super.ncurses.override { - enableStatic = true; - }; - libxml2 = super.libxml2.override ({ - enableShared = false; - enableStatic = true; - } // optionalAttrs super.stdenv.hostPlatform.isDarwin { - pythonSupport = false; - }); zlib = super.zlib.override { - static = true; - shared = false; - splitStaticOutput = false; - # Don’t use new stdenv zlib because # it doesn’t like the --disable-shared flag stdenv = super.stdenv; }; - xz = super.xz.override { - enableStatic = true; - }; - busybox = super.busybox.override { - enableStatic = true; - }; - libiberty = super.libiberty.override { - staticBuild = true; - }; - libpfm = super.libpfm.override { - enableShared = false; - }; - ipmitool = super.ipmitool.override { - static = true; - }; - neon = super.neon.override { - static = true; - shared = false; - }; - fmt = super.fmt.override { - enableShared = false; - }; - gifsicle = super.gifsicle.override { - static = true; - }; - bzip2 = super.bzip2.override { - linkStatic = true; - }; - optipng = super.optipng.override { - static = true; - }; - openblas = super.openblas.override { - enableStatic = true; - enableShared = false; - }; - mkl = super.mkl.override { enableStatic = true; }; - nix = super.nix.override { enableStatic = true; }; - nixUnstable = super.nixUnstable.override { enableStatic = true; }; - openssl = (super.openssl_1_1.override { static = true; }).overrideAttrs (o: { + openssl = super.openssl_1_1.overrideAttrs (o: { # OpenSSL doesn't like the `--enable-static` / `--disable-shared` flags. configureFlags = (removeUnknownConfigureFlags o.configureFlags); }); - arrow-cpp = super.arrow-cpp.override { - enableShared = false; - }; boost = super.boost.override { - enableStatic = true; - enableShared = false; - # Don’t use new stdenv for boost because it doesn’t like the # --disable-shared flag stdenv = super.stdenv; }; - thrift = super.thrift.override { - static = true; - twisted = null; - }; - gmp = super.gmp.override { - withStatic = true; - }; - gflags = super.gflags.override { - enableShared = false; - }; - cdo = super.cdo.override { - enable_all_static = true; - }; - gsm = super.gsm.override { - staticSupport = true; - }; - crc32c = super.crc32c.override { - staticOnly = true; - }; - parted = super.parted.override { - enableStatic = true; - }; - libiconvReal = super.libiconvReal.override { - enableShared = false; - enableStatic = true; - }; perl = super.perl.override { # Don’t use new stdenv zlib because # it doesn’t like the --disable-shared flag stdenv = super.stdenv; }; - woff2 = super.woff2.override { - static = true; - }; - snappy = super.snappy.override { - static = true; - }; - lz4 = super.lz4.override { - enableShared = false; - enableStatic = true; - }; - libressl = super.libressl.override { - buildShared = false; - }; - libjpeg_turbo = super.libjpeg_turbo.override { - enableStatic = true; - enableShared = false; - }; - - darwin = super.darwin // { - libiconv = super.darwin.libiconv.override { - enableShared = false; - enableStatic = true; - }; - }; - - kmod = super.kmod.override { - withStatic = true; - }; - - curl = super.curl.override { - # a very sad story: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=439039 - gssSupport = false; - }; - - e2fsprogs = super.e2fsprogs.override { - shared = false; - }; - - brotli = super.brotli.override { - staticOnly = true; - }; - - zstd = super.zstd.override { - static = true; - }; - - llvmPackages_8 = super.llvmPackages_8 // { - libraries = super.llvmPackages_8.libraries // rec { - libcxxabi = super.llvmPackages_8.libraries.libcxxabi.override { - enableShared = false; - }; - libcxx = super.llvmPackages_8.libraries.libcxx.override { - enableShared = false; - inherit libcxxabi; - }; - libunwind = super.llvmPackages_8.libraries.libunwind.override { - enableShared = false; - }; - }; - }; ocaml-ng = self.lib.mapAttrs (_: set: if set ? overrideScope' then set.overrideScope' ocamlStaticAdapter else set ) super.ocaml-ng; - - python27 = super.python27.override { static = true; }; - python36 = super.python36.override { static = true; }; - python37 = super.python37.override { static = true; }; - python38 = super.python38.override { static = true; }; - python39 = super.python39.override { static = true; }; - python3Minimal = super.python3Minimal.override { static = true; }; - - # Note: -static doesn’t work on darwin - libev = super.libev.override { static = !super.stdenv.hostPlatform.isDarwin; }; - - libexecinfo = super.libexecinfo.override { enableShared = false; }; - - tree-sitter = super.tree-sitter.override { - enableShared = false; - enableStatic = true; - }; - - xorg = super.xorg.overrideScope' (xorgself: xorgsuper: { - libX11 = xorgsuper.libX11.overrideAttrs (attrs: { - depsBuildBuild = attrs.depsBuildBuild ++ [ (self.buildPackages.stdenv.cc.libc.static or null) ]; - }); - xauth = xorgsuper.xauth.overrideAttrs (attrs: { - # missing transitive dependencies - preConfigure = attrs.preConfigure or "" + '' - export NIX_CFLAGS_LINK="$NIX_CFLAGS_LINK -lxcb -lXau -lXdmcp" - ''; - }); - xdpyinfo = xorgsuper.xdpyinfo.overrideAttrs (attrs: { - # missing transitive dependencies - preConfigure = attrs.preConfigure or "" + '' - export NIX_CFLAGS_LINK="$NIX_CFLAGS_LINK -lXau -lXdmcp" - ''; - }); - libxcb = xorgsuper.libxcb.overrideAttrs (attrs: { - configureFlags = attrs.configureFlags ++ [ "--disable-shared" ]; - }); - libXi= xorgsuper.libXi.overrideAttrs (attrs: { - configureFlags = attrs.configureFlags ++ [ "--disable-shared" ]; - }); - }); - - libcap = super.libcap.override { pam = null; }; } diff --git a/pkgs/top-level/unix-tools.nix b/pkgs/top-level/unixtools.nix similarity index 100% rename from pkgs/top-level/unix-tools.nix rename to pkgs/top-level/unixtools.nix